changeset 18507:a7d694b63e3d

merge of '70232e190a2c640678a9ec7142bf9b1a9a2876aa' and '9f6c0c35506dcec2752c2c36f0de87326c33e6c4'
author Sadrul Habib Chowdhury <imadil@gmail.com>
date Fri, 13 Jul 2007 00:03:15 +0000
parents 9f029b7208f1 (current diff) 791796702043 (diff)
children 902685705e4e
files
diffstat 13 files changed, 15123 insertions(+), 13192 deletions(-) [+]
line wrap: on
line diff
--- a/configure.ac	Thu Jul 12 23:57:56 2007 +0000
+++ b/configure.ac	Fri Jul 13 00:03:15 2007 +0000
@@ -1147,7 +1147,7 @@
 			dnl # no prefix given, so we look for the correct dbus system paths.
 			dnl # if a prefix is given, we use it.
 
-			serviceprefixes="$datadir $libdir /usr/share /usr/local/share"
+			serviceprefixes="$prefix/share $prefix/lib /usr/share /usr/local/share"
 			DBUS_SERVICES_DIR=""
 
 			for d in $serviceprefixes ; do
--- a/libpurple/conversation.c	Thu Jul 12 23:57:56 2007 +0000
+++ b/libpurple/conversation.c	Fri Jul 13 00:03:15 2007 +0000
@@ -2064,7 +2064,7 @@
 	 * Register signals
 	 **********************************************************************/
 	purple_signal_register(handle, "writing-im-msg",
-						 purple_marshal_BOOLEAN__POINTER_POINTER_POINTER_POINTER_POINTER,
+						 purple_marshal_BOOLEAN__POINTER_POINTER_POINTER_POINTER_UINT,
 						 purple_value_new(PURPLE_TYPE_BOOLEAN), 5,
 						 purple_value_new(PURPLE_TYPE_SUBTYPE,
 										PURPLE_SUBTYPE_ACCOUNT),
@@ -2124,7 +2124,7 @@
 						 purple_value_new(PURPLE_TYPE_UINT));
 
 	purple_signal_register(handle, "writing-chat-msg",
-						 purple_marshal_BOOLEAN__POINTER_POINTER_POINTER_POINTER_POINTER,
+						 purple_marshal_BOOLEAN__POINTER_POINTER_POINTER_POINTER_UINT,
 						 purple_value_new(PURPLE_TYPE_BOOLEAN), 5,
 						 purple_value_new(PURPLE_TYPE_SUBTYPE,
 										PURPLE_SUBTYPE_ACCOUNT),
--- a/libpurple/signals.c	Thu Jul 12 23:57:56 2007 +0000
+++ b/libpurple/signals.c	Fri Jul 13 00:03:15 2007 +0000
@@ -932,6 +932,25 @@
 }
 
 void
+purple_marshal_BOOLEAN__POINTER_POINTER_POINTER_POINTER_UINT(
+		PurpleCallback cb, va_list args, void *data, void **return_val)
+{
+	gboolean ret_val;
+	void *arg1 = va_arg(args, void *);
+	void *arg2 = va_arg(args, void *);
+	void *arg3 = va_arg(args, void *);
+	void *arg4 = va_arg(args, void *);
+	guint arg5 = va_arg(args, guint);
+
+	ret_val =
+		((gboolean (*)(void *, void *, void *, void *, guint, void *))cb)(
+			arg1, arg2, arg3, arg4, arg5, data);
+
+	if (return_val != NULL)
+		*return_val = GINT_TO_POINTER(ret_val);
+}
+
+void
 purple_marshal_BOOLEAN__INT_POINTER(PurpleCallback cb, va_list args, void *data,
                                   void **return_val)
 {
--- a/libpurple/signals.h	Thu Jul 12 23:57:56 2007 +0000
+++ b/libpurple/signals.h	Fri Jul 13 00:03:15 2007 +0000
@@ -323,6 +323,8 @@
 		PurpleCallback cb, va_list args, void *data, void **return_val);
 void purple_marshal_BOOLEAN__POINTER_POINTER_POINTER_POINTER_POINTER(
 		PurpleCallback cb, va_list args, void *data, void **return_val);
+void purple_marshal_BOOLEAN__POINTER_POINTER_POINTER_POINTER_UINT(
+		PurpleCallback cb, va_list args, void *data, void **return_val);
 
 void purple_marshal_BOOLEAN__INT_POINTER(
 		PurpleCallback cb, va_list args, void *data, void **return_val);
--- a/libpurple/util.c	Thu Jul 12 23:57:56 2007 +0000
+++ b/libpurple/util.c	Fri Jul 13 00:03:15 2007 +0000
@@ -1337,6 +1337,7 @@
 {
 	GString *xhtml = NULL;
 	GString *plain = NULL;
+	GString *url = NULL;
 	GList *tags = NULL, *tag;
 	const char *c = html;
 
@@ -1364,6 +1365,10 @@
 						struct purple_parse_tag *pt = tags->data;
 						if(xhtml)
 							g_string_append_printf(xhtml, "</%s>", pt->dest_tag);
+						if(plain && !strcmp(pt->src_tag, "a")) {
+							/* if this is a link, we have to add the url to the plaintext, too */
+							g_string_append_printf(plain, " <%s>", g_strstrip(url->str));
+						}
 						if(tags == tag)
 							break;
 						tags = g_list_remove(tags, pt);
@@ -1389,7 +1394,6 @@
 					}
 				}
 			} else { /* opening tag */
-				ALLOW_TAG("a");
 				ALLOW_TAG("blockquote");
 				ALLOW_TAG("cite");
 				ALLOW_TAG("div");
@@ -1413,7 +1417,7 @@
 				ALLOW_TAG("span");
 				ALLOW_TAG("strong");
 				ALLOW_TAG("ul");
-				ALLOW_TAG("img");
+
 				
 				/* we skip <HR> because it's not legal in XHTML-IM.  However,
 				 * we still want to send something sensible, so we put a
@@ -1431,40 +1435,6 @@
 						plain = g_string_append_c(plain, '\n');
 					continue;
 				}
-				if(!g_ascii_strncasecmp(c, "<img", 4) && (*(c+4) == '>' || *(c+4) == ' ')) {
-					const char *p = c;
-					GString *src = NULL;
-					struct purple_parse_tag *pt;
-					while(*p && *p != '>') {
-						if(!g_ascii_strncasecmp(p, "src=", strlen("src="))) {
-							const char *q = p + strlen("src=");
-							src = g_string_new("");
-							if(*q == '\'' || *q == '\"')
-								q++;
-							while(*q && *q != '\"' && *q != '\'' && *q != ' ') {
-								src = g_string_append_c(src, *q);
-								q++;
-							}
-							p = q;
-						}
-						p++;
-					}
-					if ((c = strchr(c, '>')) != NULL)
-						c++;
-					else
-						c = p;
-					pt = g_new0(struct purple_parse_tag, 1);
-					pt->src_tag = "img";
-					pt->dest_tag = "img";
-					tags = g_list_prepend(tags, pt);
-					if(xhtml && src && src->len)
-						g_string_append_printf(xhtml, "<img src='%s' alt=''>", g_strstrip(src->str));
-					else
-						pt->ignore = TRUE;
-					if (src)
-						g_string_free(src, TRUE);
-					continue;
-				}
 				if(!g_ascii_strncasecmp(c, "<b>", 3) || !g_ascii_strncasecmp(c, "<bold>", strlen("<bold>"))) {
 					struct purple_parse_tag *pt = g_new0(struct purple_parse_tag, 1);
 					pt->src_tag = *(c+2) == '>' ? "b" : "bold";
@@ -1515,6 +1485,80 @@
 						xhtml = g_string_append(xhtml, "<span style='vertical-align:super;'>");
 					continue;
 				}
+				if(!g_ascii_strncasecmp(c, "<img", 4) && (*(c+4) == '>' || *(c+4) == ' ')) {
+					const char *p = c;
+					GString *src = NULL, *alt = NULL;
+					while(*p && *p != '>') {
+						if(!g_ascii_strncasecmp(p, "src=", strlen("src="))) {
+							const char *q = p + strlen("src=");
+							src = g_string_new("");
+							if(*q == '\'' || *q == '\"')
+								q++;
+							while(*q && *q != '\"' && *q != '\'' && *q != ' ') {
+								src = g_string_append_c(src, *q);
+								q++;
+							}
+							p = q;
+						} else if(!g_ascii_strncasecmp(p, "alt=", strlen("alt="))) {
+							const char *q = p + strlen("alt=");
+							alt = g_string_new("");
+							if(*q == '\'' || *q == '\"')
+								q++;
+							while(*q && *q != '\"' && *q != '\'' && *q != ' ') {
+								alt = g_string_append_c(alt, *q);
+								q++;
+							}
+							p = q;
+						}
+						p++;
+					}
+					if ((c = strchr(c, '>')) != NULL)
+						c++;
+					else
+						c = p;
+					/* src and alt are required! */
+					if(src && xhtml)
+						g_string_append_printf(xhtml, "<img src='%s' alt='%s' />", g_strstrip(src->str), alt ? alt->str : "");
+					if(alt) {
+						if(plain)
+							plain = g_string_append(plain, alt->str);
+						if(!src && xhtml)
+							xhtml = g_string_append(xhtml, alt->str);
+					}
+					g_string_free(alt, TRUE);
+					g_string_free(src, TRUE);
+					continue;
+				}
+				if(!g_ascii_strncasecmp(c, "<a", 2) && (*(c+2) == '>' || *(c+2) == ' ')) {
+					const char *p = c;
+					struct purple_parse_tag *pt;
+					while(*p && *p != '>') {
+						if(!g_ascii_strncasecmp(p, "href=", strlen("href="))) {
+							const char *q = p + strlen("href=");
+							g_string_free(url, TRUE);
+							url = g_string_new("");
+							if(*q == '\'' || *q == '\"')
+								q++;
+							while(*q && *q != '\"' && *q != '\'' && *q != ' ') {
+								url = g_string_append_c(url, *q);
+								q++;
+							}
+							p = q;
+						}
+						p++;
+					}
+					if ((c = strchr(c, '>')) != NULL)
+						c++;
+					else
+						c = p;
+					pt = g_new0(struct purple_parse_tag, 1);
+					pt->src_tag = "a";
+					pt->dest_tag = "a";
+					tags = g_list_prepend(tags, pt);
+					if(xhtml)
+						g_string_append_printf(xhtml, "<a href='%s'>", g_strstrip(url->str));
+					continue;
+				}
 				if(!g_ascii_strncasecmp(c, "<font", 5) && (*(c+5) == '>' || *(c+5) == ' ')) {
 					const char *p = c;
 					GString *style = g_string_new("");
@@ -1696,6 +1740,7 @@
 		*xhtml_out = g_string_free(xhtml, FALSE);
 	if(plain_out)
 		*plain_out = g_string_free(plain, FALSE);
+	g_string_free(url, TRUE);
 }
 
 /* The following are probably reasonable changes:
--- a/pidgin/gtklog.c	Thu Jul 12 23:57:56 2007 +0000
+++ b/pidgin/gtklog.c	Fri Jul 13 00:03:15 2007 +0000
@@ -172,7 +172,32 @@
 
 #ifdef _WIN32
 	if (resp == GTK_RESPONSE_HELP) {
-		char *logdir = g_build_filename(purple_user_dir(), "logs", NULL);
+		GtkTreeSelection *sel;
+		GtkTreeIter iter;
+		GtkTreeModel *model;
+		PurpleLog *log = NULL;
+		char *logdir;
+
+		if (ht != NULL)
+			lv = g_hash_table_lookup(log_viewers, ht);
+		model = GTK_TREE_MODEL(lv->treestore);
+
+		sel = gtk_tree_view_get_selection(GTK_TREE_VIEW(lv->treeview));
+		if (gtk_tree_selection_get_selected(sel, &model, &iter)) {
+			GValue val;
+
+			val.g_type = 0;
+			gtk_tree_model_get_value (model, &iter, 1, &val);
+			log = g_value_get_pointer(&val);
+			g_value_unset(&val);
+		}
+
+
+		if (log == NULL)
+			logdir = g_build_filename(purple_user_dir(), "logs", NULL);
+		else
+			logdir = purple_log_get_log_dir(log->type, log->name, log->account);
+
 		winpidgin_shell_execute(logdir, "explore", NULL);
 		g_free(logdir);
 		return;
@@ -368,7 +393,7 @@
 	gpointer *data;
 
 	iter = g_new(GtkTreeIter, 1);
-	sel = gtk_tree_view_get_selection(GTK_TREE_VIEW(lv));
+	sel = gtk_tree_view_get_selection(GTK_TREE_VIEW(lv->treeview));
 	if (!gtk_tree_selection_get_selected(sel, NULL, iter))
 	{
 		return FALSE;
--- a/po/ChangeLog	Thu Jul 12 23:57:56 2007 +0000
+++ b/po/ChangeLog	Fri Jul 13 00:03:15 2007 +0000
@@ -1,6 +1,8 @@
 Pidgin and Finch: The Pimpin' Penguin IM Clients That're Good for the Soul
 
 version 2.1.0
+	* Finnish translation updated (Timo Jyrinki)
+	* French translation updated (Éric Boumaour)
 	* Galician translation updated (Mar Castro)
 	* German translation updated (Bjoern Voigt)
 	* Hebrew translation updated (Shalom Craimer)
@@ -11,6 +13,7 @@
 	* Portuguese (Brazilian) win32 translation updated (Mauricio de
 	  L R Collares Neto)
 	* Slovenian translation updated (Martin Srebotnjak)
+	* Spanish translation updated (Javier Fernandez-Sanguino Peña)
 
 version 2.0.2
 	* Chinese (Traditional) translation updated (Ambrose C. Li)
--- a/po/de.po	Thu Jul 12 23:57:56 2007 +0000
+++ b/po/de.po	Fri Jul 13 00:03:15 2007 +0000
@@ -7,13 +7,14 @@
 #
 # This file is distributed under the same license as the Pidgin package.
 #
+# Bjoern Voigt <bjoern@cs.tu-berlin.de>, 2007.
 msgid ""
 msgstr ""
 "Project-Id-Version: de\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-06-14 23:46+0200\n"
-"PO-Revision-Date: 2007-06-14 18:38+0200\n"
-"Last-Translator: Jochen Kemnade <kemnade@gmail.com>\n"
+"POT-Creation-Date: 2007-07-09 09:35+0200\n"
+"PO-Revision-Date: 2007-07-12 14:41+0200\n"
+"Last-Translator: Bjoern Voigt <bjoern@cs.tu-berlin.de>\n"
 "Language-Team: Deutsch <de@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -21,12 +22,19 @@
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: KBabel 1.11.4\n"
 
-#: ../finch/finch.c:180
+#. Translators may want to transliterate the name.
+#. It is not to be translated.
+#: ../finch/finch.c:70 ../finch/finch.c:298 ../finch/finch.c:327
+#: ../finch/finch.c:404
+msgid "Finch"
+msgstr "Finch"
+
+#: ../finch/finch.c:204
 #, 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:182
+#: ../finch/finch.c:206
 #, c-format
 msgid ""
 "%s\n"
@@ -47,13 +55,7 @@
 "  -n, --nologin       nicht automatisch anmelden\n"
 "  -v, --version       zeigt aktuelle Version und beendet das Programm\n"
 
-#. Translators may want to transliterate the name.
-#. It is not to be translated.
-#: ../finch/finch.c:274 ../finch/finch.c:303
-msgid "Finch"
-msgstr "Finch"
-
-#: ../finch/finch.c:301 ../pidgin/gtkmain.c:682
+#: ../finch/finch.c:325 ../pidgin/gtkmain.c:708
 #, c-format
 msgid ""
 "%s encountered errors migrating your settings from %s to %s. Please "
@@ -65,95 +67,103 @@
 "Migration per Hand. Bitte melden Sie diesen Fehler auf http://developer."
 "pidgin.im"
 
-#: ../finch/gntaccount.c:119 ../finch/gntblist.c:290 ../finch/gntblist.c:415
-#: ../finch/gntblist.c:428 ../finch/gntplugin.c:181 ../finch/gntplugin.c:225
-#: ../finch/gntstatus.c:294 ../finch/gntstatus.c:302
-#: ../libpurple/protocols/jabber/buddy.c:1426
+#: ../finch/gntaccount.c:122 ../finch/gntaccount.c:477 ../finch/gntblist.c:298
+#: ../finch/gntblist.c:423 ../finch/gntblist.c:436 ../finch/gntplugin.c:185
+#: ../finch/gntplugin.c:233 ../finch/gntstatus.c:297 ../finch/gntstatus.c:305
+#: ../libpurple/protocols/jabber/buddy.c:1464
 #: ../libpurple/protocols/jabber/chat.c:677
 #: ../libpurple/protocols/jabber/chat.c:688
-#: ../libpurple/protocols/jabber/jabber.c:1235
-#: ../libpurple/protocols/qq/group_join.c:326
+#: ../libpurple/protocols/jabber/jabber.c:1227
+#: ../libpurple/protocols/qq/group_join.c:328
 #: ../libpurple/protocols/silc/ops.c:57 ../libpurple/protocols/silc/ops.c:1456
 #: ../libpurple/protocols/silc10/ops.c:1451
 msgid "Error"
 msgstr "Fehler"
 
-#: ../finch/gntaccount.c:119
+#: ../finch/gntaccount.c:122
 msgid "Account was not added"
 msgstr "Konto wurde nicht hinzugefügt"
 
-#: ../finch/gntaccount.c:120
+#: ../finch/gntaccount.c:123
 msgid "Screenname of an account must be non-empty."
 msgstr "Benutzername eines Kontos darf nicht leer sein."
 
-#: ../finch/gntaccount.c:423
+#: ../finch/gntaccount.c:430
 msgid "New mail notifications"
 msgstr "Benachrichtigung über neue Mails"
 
-#: ../finch/gntaccount.c:433
+#: ../finch/gntaccount.c:440
 msgid "Remember password"
 msgstr "Passwort speichern"
 
-#: ../finch/gntaccount.c:474 ../pidgin/gtkaccount.c:1478
-#: ../pidgin/gtkblist.c:3996
+#: ../finch/gntaccount.c:478
+msgid "There's no protocol plugins installed."
+msgstr "Es sind keine Protokoll-Plugins installiert."
+
+#: ../finch/gntaccount.c:479
+msgid "(You probably forgot to 'make install'.)"
+msgstr "(Sie haben wahrscheinlich vergessen 'make install' aufzurufen.)"
+
+#: ../finch/gntaccount.c:489 ../pidgin/gtkaccount.c:1473
+#: ../pidgin/gtkblist.c:4014
 msgid "Modify Account"
 msgstr "Konto bearbeiten"
 
-#: ../finch/gntaccount.c:474
+#: ../finch/gntaccount.c:489
 msgid "New Account"
 msgstr "Neues Konto"
 
-#: ../finch/gntaccount.c:500 ../pidgin/gtkft.c:695
+#: ../finch/gntaccount.c:514 ../pidgin/gtkft.c:695
 msgid "Protocol:"
 msgstr "Protokoll:"
 
-#: ../finch/gntaccount.c:508
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:295
+#: ../finch/gntaccount.c:522
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:291
 msgid "Screen name:"
 msgstr "Benutzername:"
 
-#: ../finch/gntaccount.c:521
+#: ../finch/gntaccount.c:535
 msgid "Password:"
 msgstr "Passwort:"
 
-#: ../finch/gntaccount.c:531
+#: ../finch/gntaccount.c:545
 msgid "Alias:"
 msgstr "Alias:"
 
 #. Cancel button
 #. Cancel
-#: ../finch/gntaccount.c:554 ../finch/gntaccount.c:617
-#: ../finch/gntaccount.c:853 ../finch/gntblist.c:334 ../finch/gntblist.c:403
-#: ../finch/gntblist.c:438 ../finch/gntblist.c:770 ../finch/gntblist.c:967
-#: ../finch/gntblist.c:1063 ../finch/gntblist.c:2160 ../finch/gntplugin.c:360
-#: ../finch/gntpounce.c:456 ../finch/gntpounce.c:654 ../finch/gntprefs.c:246
-#: ../finch/gntstatus.c:142 ../finch/gntstatus.c:475 ../finch/gntstatus.c:600
+#: ../finch/gntaccount.c:568 ../finch/gntaccount.c:631
+#: ../finch/gntaccount.c:875 ../finch/gntblist.c:342 ../finch/gntblist.c:411
+#: ../finch/gntblist.c:446 ../finch/gntblist.c:793 ../finch/gntblist.c:995
+#: ../finch/gntblist.c:1091 ../finch/gntblist.c:2197 ../finch/gntplugin.c:378
+#: ../finch/gntpounce.c:456 ../finch/gntpounce.c:654 ../finch/gntprefs.c:264
+#: ../finch/gntstatus.c:143 ../finch/gntstatus.c:478 ../finch/gntstatus.c:603
 #: ../libpurple/account.c:984 ../libpurple/account.c:1234
-#: ../libpurple/account.c:1269 ../libpurple/conversation.c:1168
+#: ../libpurple/account.c:1269 ../libpurple/conversation.c:1173
 #: ../libpurple/plugins/buddynote.c:51 ../libpurple/protocols/gg/gg.c:502
 #: ../libpurple/protocols/gg/gg.c:661 ../libpurple/protocols/gg/gg.c:798
 #: ../libpurple/protocols/gg/gg.c:879
-#: ../libpurple/protocols/jabber/buddy.c:584
-#: ../libpurple/protocols/jabber/buddy.c:1788
-#: ../libpurple/protocols/jabber/buddy.c:1824
+#: ../libpurple/protocols/jabber/buddy.c:588
+#: ../libpurple/protocols/jabber/buddy.c:1826
+#: ../libpurple/protocols/jabber/buddy.c:1862
 #: ../libpurple/protocols/jabber/chat.c:786
 #: ../libpurple/protocols/jabber/jabber.c:882
-#: ../libpurple/protocols/jabber/jabber.c:1390
+#: ../libpurple/protocols/jabber/jabber.c:1384
 #: ../libpurple/protocols/jabber/si.c:868
 #: ../libpurple/protocols/jabber/xdata.c:337
 #: ../libpurple/protocols/msn/msn.c:259 ../libpurple/protocols/msn/msn.c:276
 #: ../libpurple/protocols/msn/msn.c:293 ../libpurple/protocols/msn/msn.c:310
 #: ../libpurple/protocols/msn/msn.c:331
-#: ../libpurple/protocols/oscar/oscar.c:6071
+#: ../libpurple/protocols/oscar/oscar.c:6073
 #: ../libpurple/protocols/oscar/peer.c:1023
 #: ../libpurple/protocols/qq/buddy_info.c:484
 #: ../libpurple/protocols/qq/buddy_opt.c:214
 #: ../libpurple/protocols/qq/buddy_opt.c:409
 #: ../libpurple/protocols/qq/group.c:124
-#: ../libpurple/protocols/qq/group_join.c:138
-#: ../libpurple/protocols/qq/group_join.c:363
-#: ../libpurple/protocols/qq/group_opt.c:143
-#: ../libpurple/protocols/qq/group_opt.c:398
+#: ../libpurple/protocols/qq/group_join.c:140
+#: ../libpurple/protocols/qq/group_join.c:365
+#: ../libpurple/protocols/qq/group_opt.c:144
+#: ../libpurple/protocols/qq/group_opt.c:399
 #: ../libpurple/protocols/qq/sys_msg.c:115
 #: ../libpurple/protocols/qq/sys_msg.c:174
 #: ../libpurple/protocols/qq/sys_msg.c:269
@@ -181,158 +191,160 @@
 #: ../libpurple/protocols/silc10/silc.c:942
 #: ../libpurple/protocols/yahoo/yahoo.c:989
 #: ../libpurple/protocols/yahoo/yahoo.c:3248
-#: ../libpurple/protocols/yahoo/yahoo.c:3259 ../pidgin/gtkaccount.c:1916
-#: ../pidgin/gtkaccount.c:2514 ../pidgin/gtkblist.c:5889
-#: ../pidgin/gtkdialogs.c:724 ../pidgin/gtkdialogs.c:871
-#: ../pidgin/gtkdialogs.c:963 ../pidgin/gtkdialogs.c:983
-#: ../pidgin/gtkdialogs.c:1007 ../pidgin/gtkdialogs.c:1029
-#: ../pidgin/gtkdialogs.c:1077 ../pidgin/gtkdialogs.c:1118
-#: ../pidgin/gtkdialogs.c:1174 ../pidgin/gtkdialogs.c:1213
-#: ../pidgin/gtkdialogs.c:1240 ../pidgin/gtkimhtmltoolbar.c:423
-#: ../pidgin/gtklog.c:302 ../pidgin/gtkplugin.c:288 ../pidgin/gtkpounce.c:1102
-#: ../pidgin/gtkprivacy.c:566 ../pidgin/gtkprivacy.c:582
-#: ../pidgin/gtkprivacy.c:607 ../pidgin/gtkprivacy.c:621
-#: ../pidgin/gtkrequest.c:270 ../pidgin/gtksavedstatuses.c:337
+#: ../libpurple/protocols/yahoo/yahoo.c:3259 ../pidgin/gtkaccount.c:1908
+#: ../pidgin/gtkaccount.c:2502 ../pidgin/gtkblist.c:5915
+#: ../pidgin/gtkdialogs.c:725 ../pidgin/gtkdialogs.c:863
+#: ../pidgin/gtkdialogs.c:955 ../pidgin/gtkdialogs.c:975
+#: ../pidgin/gtkdialogs.c:999 ../pidgin/gtkdialogs.c:1021
+#: ../pidgin/gtkdialogs.c:1069 ../pidgin/gtkdialogs.c:1110
+#: ../pidgin/gtkdialogs.c:1166 ../pidgin/gtkdialogs.c:1205
+#: ../pidgin/gtkdialogs.c:1232 ../pidgin/gtkimhtmltoolbar.c:425
+#: ../pidgin/gtklog.c:302 ../pidgin/gtkplugin.c:288 ../pidgin/gtkpounce.c:1115
+#: ../pidgin/gtkprivacy.c:562 ../pidgin/gtkprivacy.c:578
+#: ../pidgin/gtkprivacy.c:603 ../pidgin/gtkprivacy.c:617
+#: ../pidgin/gtkrequest.c:270 ../pidgin/gtksavedstatuses.c:344
+#: ../pidgin/gtkstatusbox.c:1582
 msgid "Cancel"
 msgstr "Abbrechen"
 
 #. Save button
 #. Save
-#: ../finch/gntaccount.c:558 ../finch/gntplugin.c:360 ../finch/gntpounce.c:462
-#: ../finch/gntprefs.c:246 ../finch/gntstatus.c:478 ../finch/gntstatus.c:588
+#: ../finch/gntaccount.c:572 ../finch/gntplugin.c:378 ../finch/gntpounce.c:462
+#: ../finch/gntprefs.c:264 ../finch/gntstatus.c:481 ../finch/gntstatus.c:591
 #: ../libpurple/account.c:1268 ../libpurple/plugins/buddynote.c:50
-#: ../libpurple/protocols/jabber/buddy.c:583 ../pidgin/gtkdebug.c:748
+#: ../libpurple/protocols/jabber/buddy.c:587 ../pidgin/gtkdebug.c:748
 #: ../pidgin/gtkrequest.c:276
 msgid "Save"
 msgstr "Speichern"
 
-#: ../finch/gntaccount.c:611 ../pidgin/gtkaccount.c:1908
-#: ../pidgin/gtksavedstatuses.c:328
+#: ../finch/gntaccount.c:625 ../pidgin/gtkaccount.c:1900
+#: ../pidgin/gtksavedstatuses.c:332 ../pidgin/gtkstatusbox.c:1576
 #, c-format
 msgid "Are you sure you want to delete %s?"
 msgstr "Wollen Sie %s wirklich löschen?"
 
-#: ../finch/gntaccount.c:614
+#: ../finch/gntaccount.c:628
 msgid "Delete Account"
 msgstr "Konto löschen"
 
 #. Delete button
-#: ../finch/gntaccount.c:616 ../finch/gntaccount.c:683
-#: ../finch/gntpounce.c:653 ../finch/gntpounce.c:714 ../finch/gntstatus.c:141
-#: ../finch/gntstatus.c:204 ../pidgin/gtkaccount.c:1915 ../pidgin/gtklog.c:301
-#: ../pidgin/gtkpounce.c:1101 ../pidgin/gtkrequest.c:273
-#: ../pidgin/gtksavedstatuses.c:336
+#: ../finch/gntaccount.c:630 ../finch/gntaccount.c:699
+#: ../finch/gntpounce.c:653 ../finch/gntpounce.c:715 ../finch/gntstatus.c:142
+#: ../finch/gntstatus.c:207 ../pidgin/gtkaccount.c:1907 ../pidgin/gtklog.c:301
+#: ../pidgin/gtkpounce.c:1114 ../pidgin/gtkrequest.c:273
+#: ../pidgin/gtksavedstatuses.c:343 ../pidgin/gtkstatusbox.c:1581
 msgid "Delete"
 msgstr "Löschen"
 
-#: ../finch/gntaccount.c:646 ../finch/gntblist.c:2065 ../finch/gntui.c:76
-#: ../pidgin/gtkaccount.c:2340 ../pidgin/gtkdocklet.c:522
+#: ../finch/gntaccount.c:662 ../finch/gntblist.c:2103 ../finch/gntui.c:77
+#: ../pidgin/gtkaccount.c:2328 ../pidgin/gtkdocklet.c:522
 msgid "Accounts"
 msgstr "Konten"
 
-#: ../finch/gntaccount.c:652
+#: ../finch/gntaccount.c:668
 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:675 ../finch/gntaccount.c:852 ../finch/gntblist.c:333
-#: ../finch/gntblist.c:403 ../finch/gntblist.c:438 ../finch/gntnotify.c:369
-#: ../finch/gntpounce.c:699 ../finch/gntstatus.c:194
+#: ../finch/gntaccount.c:691 ../finch/gntaccount.c:874 ../finch/gntblist.c:341
+#: ../finch/gntblist.c:411 ../finch/gntblist.c:446 ../finch/gntnotify.c:379
+#: ../finch/gntpounce.c:700 ../finch/gntstatus.c:197
 #: ../libpurple/protocols/gg/gg.c:878 ../libpurple/protocols/qq/sys_msg.c:116
 #: ../libpurple/protocols/qq/sys_msg.c:175
 #: ../libpurple/protocols/qq/sys_msg.c:270
 #: ../libpurple/protocols/sametime/sametime.c:5486
 #: ../libpurple/protocols/silc/chat.c:615
-#: ../libpurple/protocols/silc10/chat.c:599 ../pidgin/gtkaccount.c:2513
-#: ../pidgin/gtkblist.c:5888 ../pidgin/gtkconv.c:1687
+#: ../libpurple/protocols/silc10/chat.c:599 ../pidgin/gtkaccount.c:2501
+#: ../pidgin/gtkblist.c:5914 ../pidgin/gtkconv.c:1652
 #: ../pidgin/gtkrequest.c:274
 msgid "Add"
 msgstr "Hinzufügen"
 
 #. Modify button
-#: ../finch/gntaccount.c:679 ../finch/gntpounce.c:706
+#: ../finch/gntaccount.c:695 ../finch/gntpounce.c:707
 msgid "Modify"
 msgstr "Bearbeiten"
 
-#: ../finch/gntaccount.c:775 ../pidgin/gtkaccount.c:2460
+#: ../finch/gntaccount.c:797 ../pidgin/gtkaccount.c:2448
 #, 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:848 ../pidgin/gtkaccount.c:2512
+#: ../finch/gntaccount.c:870 ../pidgin/gtkaccount.c:2500
 msgid "Add buddy to your list?"
 msgstr "Benutzer zu Ihrer Buddy-Liste hinzufügen?"
 
-#: ../finch/gntaccount.c:902 ../pidgin/gtkaccount.c:2564
+#: ../finch/gntaccount.c:924 ../pidgin/gtkaccount.c:2552
 #, 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:922 ../finch/gntaccount.c:929
-#: ../pidgin/gtkaccount.c:2587 ../pidgin/gtkaccount.c:2593
+#: ../finch/gntaccount.c:949 ../finch/gntaccount.c:952
+#: ../finch/gntaccount.c:979 ../pidgin/gtkaccount.c:2575
+#: ../pidgin/gtkaccount.c:2581
 msgid "Authorize buddy?"
 msgstr "Buddy autorisieren?"
 
-#: ../finch/gntaccount.c:926 ../finch/gntaccount.c:933
-#: ../pidgin/gtkaccount.c:2588 ../pidgin/gtkaccount.c:2594
+#: ../finch/gntaccount.c:956 ../finch/gntaccount.c:983
+#: ../pidgin/gtkaccount.c:2576 ../pidgin/gtkaccount.c:2582
 msgid "Authorize"
 msgstr "Autorisieren"
 
-#: ../finch/gntaccount.c:927 ../finch/gntaccount.c:934
-#: ../pidgin/gtkaccount.c:2589 ../pidgin/gtkaccount.c:2595
+#: ../finch/gntaccount.c:957 ../finch/gntaccount.c:984
+#: ../pidgin/gtkaccount.c:2577 ../pidgin/gtkaccount.c:2583
 msgid "Deny"
 msgstr "Sperren"
 
-#: ../finch/gntblist.c:279
+#: ../finch/gntblist.c:287
 msgid "You must provide a screename for the buddy."
 msgstr "Sie müssen einen Benutzernamen für den Buddy angeben."
 
-#: ../finch/gntblist.c:281
+#: ../finch/gntblist.c:289
 msgid "You must provide a group."
 msgstr "Sie müssen eine Gruppe angeben."
 
-#: ../finch/gntblist.c:283
+#: ../finch/gntblist.c:291
 msgid "You must select an account."
 msgstr "Sie müssen ein Konto auswählen."
 
-#: ../finch/gntblist.c:285
+#: ../finch/gntblist.c:293
 msgid "The selected account is not online."
 msgstr "Das gewählte Konto ist nicht online."
 
-#: ../finch/gntblist.c:290
+#: ../finch/gntblist.c:298
 msgid "Error adding buddy"
 msgstr "Fehler beim Hinzufügen des Buddys"
 
-#: ../finch/gntblist.c:315 ../libpurple/protocols/oscar/oscar.c:2863
-#: ../pidgin/gtkaccount.c:1991 ../pidgin/gtksavedstatuses.c:924
+#: ../finch/gntblist.c:323 ../libpurple/protocols/oscar/oscar.c:2864
+#: ../pidgin/gtkaccount.c:1983 ../pidgin/gtksavedstatuses.c:979
 msgid "Screen Name"
 msgstr "Benutzername"
 
-#: ../finch/gntblist.c:318 ../finch/gntblist.c:395 ../finch/gntblist.c:1211
+#: ../finch/gntblist.c:326 ../finch/gntblist.c:403 ../finch/gntblist.c:1239
 #: ../libpurple/protocols/msn/msn.c:1364
 #: ../libpurple/protocols/silc/chat.c:606
 #: ../libpurple/protocols/silc10/chat.c:590
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:680
 #: ../libpurple/protocols/zephyr/zephyr.c:788
-#: ../libpurple/protocols/zephyr/zephyr.c:1207 ../pidgin/gtkdialogs.c:982
-#: ../pidgin/gtkdialogs.c:1006 ../pidgin/gtkdialogs.c:1028
+#: ../libpurple/protocols/zephyr/zephyr.c:1207 ../pidgin/gtkdialogs.c:974
+#: ../pidgin/gtkdialogs.c:998 ../pidgin/gtkdialogs.c:1020
 #: ../pidgin/gtkrequest.c:277
 msgid "Alias"
 msgstr "Alias"
 
-#: ../finch/gntblist.c:321 ../finch/gntblist.c:398
+#: ../finch/gntblist.c:329 ../finch/gntblist.c:406
 msgid "Group"
 msgstr "Gruppe"
 
-#: ../finch/gntblist.c:325 ../finch/gntblist.c:386 ../finch/gntblist.c:1261
-#: ../finch/gntnotify.c:171 ../finch/gntstatus.c:566
+#: ../finch/gntblist.c:333 ../finch/gntblist.c:394 ../finch/gntblist.c:1291
+#: ../finch/gntnotify.c:173 ../finch/gntstatus.c:569
 #: ../libpurple/plugins/idle.c:153 ../libpurple/plugins/idle.c:190
-#: ../pidgin/gtkblist.c:2975 ../pidgin/gtknotify.c:482
-#: ../pidgin/gtkpounce.c:1269 ../pidgin/plugins/gevolution/gevolution.c:443
+#: ../pidgin/gtkblist.c:2974 ../pidgin/gtknotify.c:482
+#: ../pidgin/gtkpounce.c:1282 ../pidgin/plugins/gevolution/gevolution.c:443
 msgid "Account"
 msgstr "Konto"
 
-#: ../finch/gntblist.c:331 ../finch/gntblist.c:819
+#: ../finch/gntblist.c:339 ../finch/gntblist.c:842
 #: ../libpurple/protocols/silc/buddy.c:725
 #: ../libpurple/protocols/silc/buddy.c:1027
 #: ../libpurple/protocols/silc/buddy.c:1072
@@ -341,178 +353,174 @@
 #: ../libpurple/protocols/silc10/buddy.c:1033
 #: ../libpurple/protocols/silc10/buddy.c:1080
 #: ../libpurple/protocols/silc10/buddy.c:1180
-#: ../libpurple/protocols/yahoo/yahoo.c:3161 ../pidgin/gtkblist.c:5394
-#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:447
+#: ../libpurple/protocols/yahoo/yahoo.c:3161 ../pidgin/gtkblist.c:5420
+#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:445
 msgid "Add Buddy"
 msgstr "Buddy hinzufügen"
 
-#: ../finch/gntblist.c:331
+#: ../finch/gntblist.c:339
 msgid "Please enter buddy information."
 msgstr "Bitte Buddy-Informationen angeben."
 
-#: ../finch/gntblist.c:358 ../libpurple/blist.c:1192
+#: ../finch/gntblist.c:366 ../libpurple/blist.c:1190
 msgid "Chats"
 msgstr "Chats"
 
 #. Extract their Name and put it in
-#: ../finch/gntblist.c:392 ../libpurple/protocols/jabber/jabber.c:813
+#: ../finch/gntblist.c:400 ../libpurple/protocols/jabber/jabber.c:813
 #: ../libpurple/protocols/msn/msn.c:1553 ../libpurple/protocols/msn/msn.c:1618
 #: ../libpurple/protocols/msn/msn.c:1645
 #: ../libpurple/protocols/qq/buddy_info.c:44 ../pidgin/gtkplugin.c:581
-#: ../pidgin/gtkroomlist.c:621
+#: ../pidgin/gtkroomlist.c:617
 #: ../pidgin/plugins/gevolution/add_buddy_dialog.c:132
 #: ../pidgin/plugins/gevolution/assoc-buddy.c:123
 msgid "Name"
 msgstr "Name"
 
-#: ../finch/gntblist.c:401 ../finch/gntblist.c:821 ../pidgin/gtkblist.c:5774
+#: ../finch/gntblist.c:409 ../finch/gntblist.c:844 ../pidgin/gtkblist.c:5800
 msgid "Add Chat"
 msgstr "Chat hinzufügen"
 
-#: ../finch/gntblist.c:402
+#: ../finch/gntblist.c:410
 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:415 ../finch/gntblist.c:428
+#: ../finch/gntblist.c:423 ../finch/gntblist.c:436
 msgid "Error adding group"
 msgstr "Fehler beim Hinzufügen der Gruppe"
 
-#: ../finch/gntblist.c:416
+#: ../finch/gntblist.c:424
 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:429
+#: ../finch/gntblist.c:437
 msgid "A group with the name already exists."
 msgstr "Es gibt schon eine Gruppe mit diesem Namen."
 
-#: ../finch/gntblist.c:436 ../finch/gntblist.c:823
+#: ../finch/gntblist.c:444 ../finch/gntblist.c:846
 #: ../libpurple/protocols/sametime/sametime.c:5396
-#: ../libpurple/protocols/sametime/sametime.c:5484 ../pidgin/gtkblist.c:5885
+#: ../libpurple/protocols/sametime/sametime.c:5484 ../pidgin/gtkblist.c:5911
 msgid "Add Group"
 msgstr "Gruppe hinzufügen"
 
-#: ../finch/gntblist.c:436
+#: ../finch/gntblist.c:444
 msgid "Enter the name of the group"
 msgstr "Bitte geben Sie den Namen der Gruppe ein"
 
-#: ../finch/gntblist.c:769
+#: ../finch/gntblist.c:792
 msgid "Edit Chat"
 msgstr "Chat bearbeiten"
 
-#: ../finch/gntblist.c:769
+#: ../finch/gntblist.c:792
 msgid "Please Update the necessary fields."
 msgstr "Bitte aktualisieren Sie die erforderlichen Felder."
 
-#: ../finch/gntblist.c:770 ../finch/gntstatus.c:199
+#: ../finch/gntblist.c:793 ../finch/gntstatus.c:202
 msgid "Edit"
 msgstr "Bearbeiten"
 
-#: ../finch/gntblist.c:786
+#: ../finch/gntblist.c:809
 msgid "Auto-join"
 msgstr "Automatisch beitreten"
 
-#: ../finch/gntblist.c:795
+#: ../finch/gntblist.c:818
 msgid "Edit Settings"
 msgstr "Einstellungen bearbeiten"
 
-#: ../finch/gntblist.c:833 ../finch/gntconv.c:317 ../pidgin/gtkblist.c:277
-#: ../pidgin/gtkconv.c:682 ../pidgin/gtkdialogs.c:830
+#: ../finch/gntblist.c:854 ../pidgin/gtkutils.c:920
 msgid "Information"
 msgstr "Information"
 
-#: ../finch/gntblist.c:833 ../finch/gntconv.c:317 ../pidgin/gtkblist.c:277
-#: ../pidgin/gtkconv.c:682 ../pidgin/gtkdialogs.c:830
+#: ../finch/gntblist.c:854 ../pidgin/gtkutils.c:920
 msgid "Retrieving..."
 msgstr "Empfange..."
 
-#: ../finch/gntblist.c:866 ../finch/gntconv.c:418
+#: ../finch/gntblist.c:894 ../finch/gntconv.c:407
 #: ../libpurple/protocols/silc/chat.c:899
 #: ../libpurple/protocols/silc10/chat.c:883
 msgid "Get Info"
 msgstr "Benutzer-Info"
 
-#: ../finch/gntblist.c:870
+#: ../finch/gntblist.c:898
 msgid "Add Buddy Pounce"
 msgstr "Buddy-Alarm hinzufügen"
 
 #. if (q_bud && is_online(q_bud->status)) {
-#: ../finch/gntblist.c:877 ../finch/gntconv.c:430
+#: ../finch/gntblist.c:905 ../finch/gntconv.c:419
 #: ../libpurple/protocols/jabber/si.c:868
 #: ../libpurple/protocols/oscar/oscar.c:654 ../libpurple/protocols/qq/qq.c:585
-#: ../pidgin/gtkconv.c:1635
+#: ../pidgin/gtkconv.c:1600
 msgid "Send File"
 msgstr "Datei versenden"
 
-#: ../finch/gntblist.c:881
+#: ../finch/gntblist.c:909
 msgid "View Log"
 msgstr "Mitschnitt anzeigen"
 
-#: ../finch/gntblist.c:962
+#: ../finch/gntblist.c:990
 #, c-format
 msgid "Please enter the new name for %s"
 msgstr "Bitte geben Sie den neuen Namen für %s ein"
 
-#: ../finch/gntblist.c:964 ../finch/gntblist.c:1211
+#: ../finch/gntblist.c:992 ../finch/gntblist.c:1239
 msgid "Rename"
 msgstr "Umbenennen"
 
-#: ../finch/gntblist.c:964
+#: ../finch/gntblist.c:992
 msgid "Set Alias"
 msgstr "Alias setzen"
 
-#: ../finch/gntblist.c:965
+#: ../finch/gntblist.c:993
 msgid "Enter empty string to reset the name."
 msgstr "Geben Sie eine leere Zeichenkette ein, um den Namen zurückzusetzen."
 
-#: ../finch/gntblist.c:1041
+#: ../finch/gntblist.c:1069
 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:1049
+msgstr "Wenn Sie diesen Kontakt löschen, löschen Sie auch alle Buddys in dem Kontakt"
+
+#: ../finch/gntblist.c:1077
 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:1054
+msgstr "Wenn Sie diese Gruppe löschen, löschen Sie auch alle Buddys in der Gruppe"
+
+#: ../finch/gntblist.c:1082
 #, 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:1057
+#: ../finch/gntblist.c:1085
 msgid "Confirm Remove"
 msgstr "Entfernen bestätigen"
 
-#: ../finch/gntblist.c:1062 ../finch/gntblist.c:1213 ../finch/gntft.c:223
-#: ../pidgin/gtkconv.c:1684 ../pidgin/gtkrequest.c:275
-#: ../pidgin/gtkstatusbox.c:261
+#: ../finch/gntblist.c:1090 ../finch/gntblist.c:1241 ../finch/gntft.c:224
+#: ../pidgin/gtkconv.c:1649 ../pidgin/gtkrequest.c:275
+#: ../pidgin/gtkstatusbox.c:263
 msgid "Remove"
 msgstr "Entfernen"
 
 #. Buddy List
-#: ../finch/gntblist.c:1187 ../finch/gntblist.c:2237 ../finch/gntprefs.c:240
-#: ../finch/gntui.c:77 ../pidgin/gtkblist.c:4240
+#: ../finch/gntblist.c:1215 ../finch/gntblist.c:2282 ../finch/gntprefs.c:257
+#: ../finch/gntui.c:78 ../pidgin/gtkblist.c:4256
 #: ../pidgin/plugins/win32/winprefs/winprefs.c:330
 msgid "Buddy List"
 msgstr "Buddy-Liste"
 
-#: ../finch/gntblist.c:1218
+#: ../finch/gntblist.c:1246
 msgid "Place tagged"
 msgstr "Stelle markiert"
 
-#: ../finch/gntblist.c:1223
+#: ../finch/gntblist.c:1251
 msgid "Toggle Tag"
 msgstr "Markierung umkehren"
 
 #. General
-#: ../finch/gntblist.c:1256 ../libpurple/protocols/gg/gg.c:632
-#: ../libpurple/protocols/gg/gg.c:1045 ../libpurple/protocols/gg/gg.c:1120
-#: ../libpurple/protocols/gg/gg.c:2204
+#: ../finch/gntblist.c:1286 ../libpurple/protocols/gg/gg.c:632
+#: ../libpurple/protocols/gg/gg.c:1045 ../libpurple/protocols/gg/gg.c:1118
+#: ../libpurple/protocols/gg/gg.c:2202
 #: ../libpurple/protocols/jabber/buddy.c:274
-#: ../libpurple/protocols/jabber/buddy.c:818
-#: ../libpurple/protocols/jabber/buddy.c:1589
-#: ../libpurple/protocols/jabber/buddy.c:1771
+#: ../libpurple/protocols/jabber/buddy.c:856
+#: ../libpurple/protocols/jabber/buddy.c:1627
+#: ../libpurple/protocols/jabber/buddy.c:1809
 #: ../libpurple/protocols/jabber/jabber.c:823
 #: ../libpurple/protocols/msn/msn.c:1372 ../libpurple/protocols/msn/msn.c:1556
 #: ../libpurple/protocols/qq/buddy_info.c:43
@@ -524,25 +532,29 @@
 #: ../libpurple/protocols/silc10/ops.c:1036
 #: ../libpurple/protocols/silc10/ops.c:1179
 #: ../libpurple/protocols/silc10/ops.c:1328
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1042 ../pidgin/gtkblist.c:2999
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1042 ../pidgin/gtkblist.c:2998
 msgid "Nickname"
 msgstr "Spitzname"
 
 #. Idle stuff
-#: ../finch/gntblist.c:1276 ../finch/gntprefs.c:243
+#: ../finch/gntblist.c:1306 ../finch/gntprefs.c:260
 #: ../libpurple/protocols/bonjour/bonjour.c:314
-#: ../libpurple/protocols/jabber/buddy.c:643
-#: ../libpurple/protocols/jabber/buddy.c:683
+#: ../libpurple/protocols/jabber/buddy.c:647
+#: ../libpurple/protocols/jabber/buddy.c:687
 #: ../libpurple/protocols/msn/msn.c:516 ../libpurple/protocols/msn/state.c:32
 #: ../libpurple/protocols/novell/novell.c:2825
-#: ../libpurple/protocols/oscar/oscar.c:2887
+#: ../libpurple/protocols/oscar/oscar.c:2888
 #: ../libpurple/protocols/yahoo/yahoo.c:2915
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:686 ../pidgin/gtkblist.c:3026
-#: ../pidgin/gtkblist.c:3419 ../pidgin/gtkprefs.c:1848
+#: ../pidgin/gtkblist.c:3435 ../pidgin/gtkprefs.c:1918
 msgid "Idle"
 msgstr "Untätig"
 
-#: ../finch/gntblist.c:1365
+#: ../finch/gntblist.c:1319
+msgid "On Mobile"
+msgstr "Am Handy"
+
+#: ../finch/gntblist.c:1399
 #, c-format
 msgid ""
 "Online: %d\n"
@@ -551,12 +563,12 @@
 "Online: %d\n"
 "Gesamt: %d"
 
-#: ../finch/gntblist.c:1374
+#: ../finch/gntblist.c:1408
 #, c-format
 msgid "Account: %s (%s)"
 msgstr "Konto: %s (%s)"
 
-#: ../finch/gntblist.c:1386
+#: ../finch/gntblist.c:1420
 #, c-format
 msgid ""
 "\n"
@@ -565,49 +577,47 @@
 "\n"
 "Zuletzt gesehen: vor %s"
 
-#: ../finch/gntblist.c:1651 ../pidgin/gtkdocklet.c:470
-#: ../pidgin/gtkstatusbox.c:1064
+#: ../finch/gntblist.c:1686 ../pidgin/gtkdocklet.c:470
+#: ../pidgin/gtkstatusbox.c:1070
 msgid "New..."
 msgstr "Neu..."
 
-#: ../finch/gntblist.c:1658 ../pidgin/gtkdocklet.c:471
-#: ../pidgin/gtkstatusbox.c:1065
+#: ../finch/gntblist.c:1693 ../pidgin/gtkdocklet.c:471
+#: ../pidgin/gtkstatusbox.c:1071
 msgid "Saved..."
 msgstr "Gespeichert..."
 
-#: ../finch/gntblist.c:2033 ../finch/gntplugin.c:244 ../finch/gntui.c:81
+#: ../finch/gntblist.c:2071 ../finch/gntplugin.c:254 ../finch/gntui.c:82
 #: ../pidgin/gtkdocklet.c:523 ../pidgin/gtkplugin.c:530
 msgid "Plugins"
 msgstr "Plugins"
 
-#: ../finch/gntblist.c:2141 ../pidgin/gtkdialogs.c:705
-#: ../pidgin/gtkdialogs.c:852 ../pidgin/gtkdialogs.c:933
+#: ../finch/gntblist.c:2178 ../pidgin/gtkdialogs.c:706
+#: ../pidgin/gtkdialogs.c:844 ../pidgin/gtkdialogs.c:925
 msgid "_Name"
 msgstr "_Name"
 
-#: ../finch/gntblist.c:2146 ../pidgin/gtkdialogs.c:710
-#: ../pidgin/gtkdialogs.c:857 ../pidgin/gtkdialogs.c:938
+#: ../finch/gntblist.c:2183 ../pidgin/gtkdialogs.c:711
+#: ../pidgin/gtkdialogs.c:849 ../pidgin/gtkdialogs.c:930
 msgid "_Account"
 msgstr "_Konto"
 
-#: ../finch/gntblist.c:2154 ../pidgin/gtkdialogs.c:718
+#: ../finch/gntblist.c:2191 ../pidgin/gtkdialogs.c:719
 msgid "New Instant Message"
 msgstr "Neue Sofortnachricht"
 
-#: ../finch/gntblist.c:2156 ../pidgin/gtkdialogs.c:720
-msgid ""
-"Please enter the screen name or alias of the person you would like to IM."
-msgstr ""
-"Bitte geben Sie den Benutzernamen der Person ein, mit der Sie chatten wollen."
-
-#: ../finch/gntblist.c:2159 ../finch/gntnotify.c:77 ../libpurple/account.c:983
+#: ../finch/gntblist.c:2193 ../pidgin/gtkdialogs.c:721
+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:2196 ../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:1389
+#: ../libpurple/protocols/jabber/jabber.c:1383
 #: ../libpurple/protocols/jabber/xdata.c:336
 #: ../libpurple/protocols/msn/msn.c:258 ../libpurple/protocols/msn/msn.c:275
 #: ../libpurple/protocols/msn/msn.c:292 ../libpurple/protocols/msn/msn.c:309
-#: ../libpurple/protocols/oscar/oscar.c:6070
+#: ../libpurple/protocols/oscar/oscar.c:6072
 #: ../libpurple/protocols/silc/buddy.c:454
 #: ../libpurple/protocols/silc/buddy.c:1190
 #: ../libpurple/protocols/silc/chat.c:447
@@ -626,48 +636,52 @@
 #: ../libpurple/protocols/silc10/silc.c:735
 #: ../libpurple/protocols/yahoo/yahoo.c:988
 #: ../libpurple/protocols/yahoo/yahoo.c:3247
-#: ../libpurple/protocols/yahoo/yahoo.c:3258 ../pidgin/gtkblist.c:3995
-#: ../pidgin/gtkdialogs.c:723 ../pidgin/gtkdialogs.c:870
-#: ../pidgin/gtkdialogs.c:962 ../pidgin/gtkrequest.c:269
+#: ../libpurple/protocols/yahoo/yahoo.c:3258 ../pidgin/gtkblist.c:4013
+#: ../pidgin/gtkdialogs.c:724 ../pidgin/gtkdialogs.c:862
+#: ../pidgin/gtkdialogs.c:954 ../pidgin/gtkrequest.c:269
 msgid "OK"
 msgstr "OK"
 
 #. Create the "Options" frame.
-#: ../finch/gntblist.c:2179 ../finch/gntpounce.c:444 ../pidgin/gtkpounce.c:778
+#: ../finch/gntblist.c:2216 ../finch/gntpounce.c:444 ../pidgin/gtkpounce.c:791
 msgid "Options"
 msgstr "Optionen"
 
-#: ../finch/gntblist.c:2185
+#: ../finch/gntblist.c:2222
 msgid "Send IM..."
 msgstr "Nachricht senden..."
 
-#: ../finch/gntblist.c:2189
+#: ../finch/gntblist.c:2226
+msgid "Show empty groups"
+msgstr "Zeige leere Gruppen"
+
+#: ../finch/gntblist.c:2232
 msgid "Show offline buddies"
 msgstr "Zeige Offline-Buddys"
 
-#: ../finch/gntblist.c:2195
+#: ../finch/gntblist.c:2238
 msgid "Sort by status"
 msgstr "Nach Status sortieren"
 
-#: ../finch/gntblist.c:2199
+#: ../finch/gntblist.c:2242
 msgid "Sort alphabetically"
 msgstr "Alphabetisch sortieren"
 
-#: ../finch/gntblist.c:2203
+#: ../finch/gntblist.c:2246
 msgid "Sort by log size"
 msgstr "Nach Größe der Logs sortieren"
 
-#: ../finch/gntconn.c:109
+#: ../finch/gntconn.c:110
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../finch/gntconn.c:112
+#: ../finch/gntconn.c:113
 #, c-format
 msgid "%s disconnected."
 msgstr "%s abgemeldet."
 
-#: ../finch/gntconn.c:113
+#: ../finch/gntconn.c:114
 #, c-format
 msgid ""
 "%s\n"
@@ -680,47 +694,41 @@
 "Finch wird nicht versuchen, das Konto wieder zu verbinden bis Sie den Fehler "
 "behoben und das Konto wieder aktiviert haben."
 
-#: ../finch/gntconv.c:116
+#: ../finch/gntconv.c:117
 msgid "No such command."
 msgstr "Es gibt kein solches Kommando."
 
-#: ../finch/gntconv.c:120 ../pidgin/gtkconv.c:513
+#: ../finch/gntconv.c:121 ../pidgin/gtkconv.c:493
 msgid "Syntax Error:  You typed the wrong number of arguments to that command."
-msgstr ""
-"Syntaxfehler:  Sie übergaben dem Kommando eine falsche Anzahl von Argumenten."
-
-#: ../finch/gntconv.c:125 ../pidgin/gtkconv.c:518
+msgstr "Syntaxfehler:  Sie übergaben dem Kommando eine falsche Anzahl von Argumenten."
+
+#: ../finch/gntconv.c:126 ../pidgin/gtkconv.c:499
 msgid "Your command failed for an unknown reason."
 msgstr "Ihre Kommando scheiterte aus einem unbekannten Grund."
 
-#: ../finch/gntconv.c:130 ../pidgin/gtkconv.c:524
+#: ../finch/gntconv.c:131 ../pidgin/gtkconv.c:506
 msgid "That command only works in chats, not IMs."
 msgstr "Dieses Kommando funktioniert nur in Chats, nicht bei IMs."
 
-#: ../finch/gntconv.c:133 ../pidgin/gtkconv.c:527
+#: ../finch/gntconv.c:134 ../pidgin/gtkconv.c:509
 msgid "That command only works in IMs, not chats."
 msgstr "Dieses Kommando funktioniert nur bei IMs, nicht bei Chats."
 
-#: ../finch/gntconv.c:137 ../pidgin/gtkconv.c:531
+#: ../finch/gntconv.c:138 ../pidgin/gtkconv.c:514
 msgid "That command doesn't work on this protocol."
 msgstr "Dieses Kommando funktioniert nicht in diesem Protokoll."
 
-#: ../finch/gntconv.c:144
-msgid "Commands are not supported yet. Message was NOT sent."
-msgstr ""
-"Kommandos werden noch nicht unterstützt. Nachricht wurde NICHT gesendet."
-
-#: ../finch/gntconv.c:230
+#: ../finch/gntconv.c:224
 #, c-format
 msgid "%s (%s -- %s)"
 msgstr "%s (%s -- %s)"
 
-#: ../finch/gntconv.c:253
+#: ../finch/gntconv.c:247
 #, c-format
 msgid "%s [%s]"
 msgstr "%s [%s]"
 
-#: ../finch/gntconv.c:258 ../finch/gntconv.c:619
+#: ../finch/gntconv.c:252 ../finch/gntconv.c:647
 #, c-format
 msgid ""
 "\n"
@@ -729,48 +737,48 @@
 "\n"
 "%s tippt gerade..."
 
-#: ../finch/gntconv.c:277
+#: ../finch/gntconv.c:271
 msgid "You have left this chat."
 msgstr "Sie haben diesen Chat verlassen."
 
-#: ../finch/gntconv.c:353
+#: ../finch/gntconv.c:342
 msgid "Send To"
 msgstr "Senden an"
 
-#: ../finch/gntconv.c:397
+#: ../finch/gntconv.c:386
 msgid "Conversation"
 msgstr "Unterhaltung"
 
-#: ../finch/gntconv.c:403
+#: ../finch/gntconv.c:392
 msgid "Clear Scrollback"
 msgstr "Gesprächsfenster leeren"
 
-#: ../finch/gntconv.c:407 ../finch/gntprefs.c:178
+#: ../finch/gntconv.c:396 ../finch/gntprefs.c:190
 msgid "Show Timestamps"
 msgstr "Zeige Zeitstempel"
 
-#: ../finch/gntconv.c:423
+#: ../finch/gntconv.c:412
 msgid "Add Buddy Pounce..."
 msgstr "Buddy-Alarm hinzufügen..."
 
-#: ../finch/gntconv.c:586
+#: ../finch/gntconv.c:614
 msgid "<AUTO-REPLY> "
 msgstr "<AUTO-REPLY> "
 
 #. Print the list of users in the room
-#: ../finch/gntconv.c:702
+#: ../finch/gntconv.c:735
 msgid "List of users:\n"
 msgstr "Liste der Benutzer:\n"
 
-#: ../finch/gntconv.c:847 ../pidgin/gtkconv.c:394
+#: ../finch/gntconv.c:880 ../pidgin/gtkconv.c:336
 msgid "Supported debug options are:  version"
 msgstr "Unterstützte Debug-Optionen sind:  version"
 
-#: ../finch/gntconv.c:882 ../pidgin/gtkconv.c:430
+#: ../finch/gntconv.c:915 ../pidgin/gtkconv.c:385
 msgid "No such command (in this context)."
 msgstr "Kein solches Kommando (in diesem Kontext)."
 
-#: ../finch/gntconv.c:885 ../pidgin/gtkconv.c:433
+#: ../finch/gntconv.c:918 ../pidgin/gtkconv.c:388
 msgid ""
 "Use \"/help &lt;command&gt;\" for help on a specific command.\n"
 "The following commands are available in this context:\n"
@@ -779,7 +787,7 @@
 "zu erhalten.\n"
 "Die folgenden Kommandos sind in diesem Kontext verfügbar:\n"
 
-#: ../finch/gntconv.c:943 ../pidgin/gtkconv.c:7211
+#: ../finch/gntconv.c:976 ../pidgin/gtkconv.c:7201
 msgid ""
 "say &lt;message&gt;:  Send a message normally as if you weren't using a "
 "command."
@@ -787,13 +795,13 @@
 "say &lt;Nachricht&gt;:  Sendet eine Nachricht genau so, als wenn Sie die "
 "Nachricht ohne ein Kommando absenden."
 
-#: ../finch/gntconv.c:946 ../pidgin/gtkconv.c:7214
+#: ../finch/gntconv.c:979 ../pidgin/gtkconv.c:7204
 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:949 ../pidgin/gtkconv.c:7217
+#: ../finch/gntconv.c:982 ../pidgin/gtkconv.c:7207
 msgid ""
 "debug &lt;option&gt;:  Send various debug information to the current "
 "conversation."
@@ -801,43 +809,43 @@
 "debug &lt;Option&gt;:  Verschiedene Debugging-Informationen zur aktuellen "
 "Unterhaltung senden."
 
-#: ../finch/gntconv.c:952 ../pidgin/gtkconv.c:7220
+#: ../finch/gntconv.c:985 ../pidgin/gtkconv.c:7210
 msgid "clear: Clears the conversation scrollback."
 msgstr "clear: Leert das Gesprächsfenster."
 
-#: ../finch/gntconv.c:955 ../pidgin/gtkconv.c:7223
+#: ../finch/gntconv.c:988 ../pidgin/gtkconv.c:7216
 msgid "help &lt;command&gt;:  Help on a specific command."
 msgstr "help &lt;Kommando&gt;:  Hilfe zu einem bestimmten Kommando."
 
-#: ../finch/gntconv.c:958
+#: ../finch/gntconv.c:991
 msgid "users:  Show the list of users in the chat."
 msgstr "users:  Liste der Benutzer im Chat anzeigen."
 
-#: ../finch/gntconv.c:963
+#: ../finch/gntconv.c:996
 msgid "plugins: Show the plugins window."
 msgstr "plugins: Plugin-Fenster anzeigen."
 
-#: ../finch/gntconv.c:966
+#: ../finch/gntconv.c:999
 msgid "buddylist: Show the buddylist."
 msgstr "buddylist: Die Kontaktliste anzeigen."
 
-#: ../finch/gntconv.c:969
+#: ../finch/gntconv.c:1002
 msgid "accounts: Show the accounts window."
 msgstr "accounts: Das Konten-Fenster anzeigen."
 
-#: ../finch/gntconv.c:972
+#: ../finch/gntconv.c:1005
 msgid "debugwin: Show the debug window."
 msgstr "debugwin: Das Debugging-Fenster anzeigen."
 
-#: ../finch/gntconv.c:975
+#: ../finch/gntconv.c:1008
 msgid "prefs: Show the preference window."
 msgstr "prefs: Das Einstellungs-Fenster anzeigen."
 
-#: ../finch/gntconv.c:978
+#: ../finch/gntconv.c:1011
 msgid "statuses: Show the savedstatuses window."
 msgstr "statuses: Das Fenster mit gespeicherten Status-Infos anzeigen."
 
-#: ../finch/gntdebug.c:230 ../finch/gntui.c:79 ../pidgin/gtkdebug.c:694
+#: ../finch/gntdebug.c:234 ../finch/gntui.c:80 ../pidgin/gtkdebug.c:694
 msgid "Debug Window"
 msgstr "Debug-Fenster"
 
@@ -845,15 +853,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:251 ../pidgin/gtkdebug.c:753
+#: ../finch/gntdebug.c:255 ../pidgin/gtkdebug.c:753
 msgid "Clear"
 msgstr "Leeren"
 
-#: ../finch/gntdebug.c:257
+#: ../finch/gntdebug.c:261
 msgid "Filter: "
 msgstr "Filter: "
 
-#: ../finch/gntdebug.c:261 ../pidgin/gtkdebug.c:762
+#: ../finch/gntdebug.c:265 ../pidgin/gtkdebug.c:762
 msgid "Pause"
 msgstr "Pause"
 
@@ -862,176 +870,177 @@
 msgid "File Transfers - %d%% of %d files"
 msgstr "Dateiübertragungen - %d%% von %d Dateien"
 
-#: ../finch/gntft.c:122 ../finch/gntft.c:194 ../finch/gntui.c:80
-#: ../pidgin/gtkft.c:233 ../pidgin/gtkft.c:763
+#. Create the window.
+#: ../finch/gntft.c:122 ../finch/gntft.c:195 ../finch/gntui.c:81
+#: ../pidgin/gtkft.c:233 ../pidgin/gtkft.c:761
 msgid "File Transfers"
 msgstr "Dateiübertragungen"
 
-#: ../finch/gntft.c:197 ../pidgin/gtkft.c:644
+#: ../finch/gntft.c:198 ../pidgin/gtkft.c:644
 msgid "Progress"
 msgstr "Fortschritt"
 
-#: ../finch/gntft.c:197 ../pidgin/gtkft.c:651
+#: ../finch/gntft.c:198 ../pidgin/gtkft.c:651
 msgid "Filename"
 msgstr "Dateiname"
 
-#: ../finch/gntft.c:197 ../pidgin/gtkft.c:658
+#: ../finch/gntft.c:198 ../pidgin/gtkft.c:658
 msgid "Size"
 msgstr "Größe"
 
-#: ../finch/gntft.c:197
+#: ../finch/gntft.c:198
 msgid "Speed"
 msgstr "Geschwindigkeit"
 
-#: ../finch/gntft.c:197 ../pidgin/gtkft.c:665
+#: ../finch/gntft.c:198 ../pidgin/gtkft.c:665
 msgid "Remaining"
 msgstr "Verbleibend"
 
 #. XXX: Use of ggp_str_to_uin() is an ugly hack!
-#: ../finch/gntft.c:197 ../finch/gntstatus.c:537 ../finch/gntstatus.c:566
+#: ../finch/gntft.c:198 ../finch/gntstatus.c:540 ../finch/gntstatus.c:569
 #: ../libpurple/protocols/bonjour/bonjour.c:318
-#: ../libpurple/protocols/gg/gg.c:1034 ../libpurple/protocols/gg/gg.c:1573
-#: ../libpurple/protocols/gg/gg.c:1581
-#: ../libpurple/protocols/jabber/buddy.c:634
+#: ../libpurple/protocols/gg/gg.c:1034 ../libpurple/protocols/gg/gg.c:1571
+#: ../libpurple/protocols/gg/gg.c:1579
 #: ../libpurple/protocols/jabber/buddy.c:638
-#: ../libpurple/protocols/jabber/buddy.c:673
-#: ../libpurple/protocols/jabber/jabber.c:1220
+#: ../libpurple/protocols/jabber/buddy.c:642
+#: ../libpurple/protocols/jabber/buddy.c:677
+#: ../libpurple/protocols/jabber/jabber.c:1212
 #: ../libpurple/protocols/msn/msn.c:515
 #: ../libpurple/protocols/novell/novell.c:2835
 #: ../libpurple/protocols/oscar/oscar.c:821
 #: ../libpurple/protocols/oscar/oscar.c:826
 #: ../libpurple/protocols/oscar/oscar.c:828
 #: ../libpurple/protocols/oscar/oscar.c:2676
-#: ../libpurple/protocols/oscar/oscar.c:3793
+#: ../libpurple/protocols/oscar/oscar.c:3794
 #: ../libpurple/protocols/sametime/sametime.c:3263
 #: ../libpurple/protocols/sametime/sametime.c:4150
 #: ../libpurple/protocols/yahoo/yahoo.c:3066 ../pidgin/gtkblist.c:3070
 #: ../pidgin/gtkblist.c:3083 ../pidgin/gtkblist.c:3085
-#: ../pidgin/gtksavedstatuses.c:943 ../pidgin/gtksavedstatuses.c:1090
+#: ../pidgin/gtksavedstatuses.c:998 ../pidgin/gtksavedstatuses.c:1143
 msgid "Status"
 msgstr "Status"
 
-#: ../finch/gntft.c:207
+#: ../finch/gntft.c:208
 msgid "Close this window when all transfers finish"
 msgstr "Schließe dieses Fenster, wenn alle Übertragungen abgeschlossen sind"
 
-#: ../finch/gntft.c:214
+#: ../finch/gntft.c:215
 msgid "Clear finished transfers"
 msgstr "Entferne komplette Übertragungen"
 
-#: ../finch/gntft.c:228
+#: ../finch/gntft.c:229
 msgid "Stop"
 msgstr "Stopp"
 
 #. Close button
-#: ../finch/gntft.c:233 ../finch/gntnotify.c:179 ../finch/gntplugin.c:205
-#: ../finch/gntplugin.c:291 ../finch/gntpounce.c:722 ../finch/gntstatus.c:209
+#: ../finch/gntft.c:234 ../finch/gntnotify.c:181 ../finch/gntplugin.c:209
+#: ../finch/gntplugin.c:309 ../finch/gntpounce.c:723 ../finch/gntstatus.c:212
 #: ../libpurple/protocols/msn/msn.c:375 ../libpurple/protocols/silc/util.c:382
-#: ../libpurple/protocols/silc10/util.c:377 ../pidgin/gtkaccount.c:2487
+#: ../libpurple/protocols/silc10/util.c:377 ../pidgin/gtkaccount.c:2475
 #: ../pidgin/gtkrequest.c:272
 msgid "Close"
 msgstr "Schließen"
 
-#: ../finch/gntft.c:299 ../pidgin/gtkft.c:168 ../pidgin/gtkft.c:975
+#: ../finch/gntft.c:302 ../pidgin/gtkft.c:168 ../pidgin/gtkft.c:972
 msgid "Waiting for transfer to begin"
 msgstr "Warte auf den Beginn der Dateiübertragung"
 
-#: ../finch/gntft.c:366 ../pidgin/gtkft.c:165 ../pidgin/gtkft.c:1056
+#: ../finch/gntft.c:369 ../pidgin/gtkft.c:165 ../pidgin/gtkft.c:1053
 msgid "Canceled"
 msgstr "Abgebrochen"
 
-#: ../finch/gntft.c:368 ../pidgin/gtkft.c:1058
+#: ../finch/gntft.c:371 ../pidgin/gtkft.c:1055
 msgid "Failed"
 msgstr "Gescheitert"
 
-#: ../finch/gntft.c:414 ../pidgin/gtkft.c:133
-#, c-format
-msgid "%.2f KB/s"
+#: ../finch/gntft.c:417 ../pidgin/gtkft.c:133
+#, c-format
+msgid "%.2f KiB/s"
 msgstr "%.2f KB/s"
 
-#: ../finch/gntft.c:425 ../finch/gntft.c:426 ../pidgin/gtkft.c:162
-#: ../pidgin/gtkft.c:1118
+#: ../finch/gntft.c:428 ../finch/gntft.c:429 ../pidgin/gtkft.c:162
+#: ../pidgin/gtkft.c:1115
 msgid "Finished"
 msgstr "Fertig"
 
-#: ../finch/gntft.c:428 ../libpurple/protocols/msn/session.c:347
+#: ../finch/gntft.c:431 ../libpurple/protocols/msn/session.c:347
 msgid "Transferring"
 msgstr "Übertragung"
 
-#: ../finch/gntnotify.c:162
+#: ../finch/gntnotify.c:164
 msgid "Emails"
 msgstr "E-Mails"
 
-#: ../finch/gntnotify.c:168 ../finch/gntnotify.c:222
+#: ../finch/gntnotify.c:170 ../finch/gntnotify.c:224
 msgid "You have mail!"
 msgstr "Sie haben Post!"
 
-#: ../finch/gntnotify.c:171 ../libpurple/protocols/jabber/jabber.c:1180
-msgid "From"
-msgstr "Von"
-
-#: ../finch/gntnotify.c:171 ../pidgin/gtknotify.c:496
+#: ../finch/gntnotify.c:173 ../pidgin/gtknotify.c:489
+msgid "Sender"
+msgstr "Sender"
+
+#: ../finch/gntnotify.c:173 ../pidgin/gtknotify.c:496
 msgid "Subject"
 msgstr "Betreff"
 
-#: ../finch/gntnotify.c:198
+#: ../finch/gntnotify.c:200
 #, c-format
 msgid "%s (%s) has %d new message."
 msgid_plural "%s (%s) has %d new messages."
 msgstr[0] "%s (%s) hat %d neue Nachricht."
 msgstr[1] "%s (%s) hat %d neue Nachrichten."
 
-#: ../finch/gntnotify.c:222 ../pidgin/gtknotify.c:335
+#: ../finch/gntnotify.c:224 ../pidgin/gtknotify.c:335
 msgid "New Mail"
 msgstr "Neue Mail"
 
-#: ../finch/gntnotify.c:287 ../pidgin/gtknotify.c:920
+#: ../finch/gntnotify.c:289 ../pidgin/gtknotify.c:916
 #, c-format
 msgid "Info for %s"
 msgstr "Info über %s"
 
-#: ../finch/gntnotify.c:288 ../libpurple/protocols/toc/toc.c:476
-#: ../pidgin/gtknotify.c:921
+#: ../finch/gntnotify.c:290 ../libpurple/protocols/toc/toc.c:476
+#: ../pidgin/gtknotify.c:917
 msgid "Buddy Information"
 msgstr "Buddy-Information"
 
-#: ../finch/gntnotify.c:366
+#: ../finch/gntnotify.c:376
 msgid "Continue"
 msgstr "Fortfahren"
 
-#: ../finch/gntnotify.c:372 ../pidgin/gtkconv.c:1663 ../pidgin/gtkdebug.c:834
+#: ../finch/gntnotify.c:382 ../pidgin/gtkconv.c:1628 ../pidgin/gtkdebug.c:834
 msgid "Info"
 msgstr "Info"
 
-#: ../finch/gntnotify.c:375 ../pidgin/gtkconv.c:1624
+#: ../finch/gntnotify.c:385 ../pidgin/gtkconv.c:1589
 msgid "IM"
 msgstr "Nachricht"
 
-#: ../finch/gntnotify.c:378
+#: ../finch/gntnotify.c:388
 msgid "Join"
 msgstr "Betreten"
 
-#: ../finch/gntnotify.c:381 ../libpurple/protocols/sametime/sametime.c:3473
+#: ../finch/gntnotify.c:391 ../libpurple/protocols/sametime/sametime.c:3473
 msgid "Invite"
 msgstr "Einladen"
 
-#: ../finch/gntnotify.c:384
+#: ../finch/gntnotify.c:394
 msgid "(none)"
 msgstr "(kein)"
 
-#: ../finch/gntplugin.c:73 ../finch/gntplugin.c:82
+#: ../finch/gntplugin.c:74 ../finch/gntplugin.c:83
 msgid "ERROR"
 msgstr "FEHLER"
 
-#: ../finch/gntplugin.c:73
+#: ../finch/gntplugin.c:74
 msgid "loading plugin failed"
 msgstr "Laden des Plugins fehlgeschlagen"
 
-#: ../finch/gntplugin.c:82
+#: ../finch/gntplugin.c:83
 msgid "unloading plugin failed"
 msgstr "Entladen des Plugins fehlgeschlagen"
 
-#: ../finch/gntplugin.c:124
+#: ../finch/gntplugin.c:128
 #, c-format
 msgid ""
 "Name: %s\n"
@@ -1048,36 +1057,42 @@
 "Website: %s\n"
 "Dateiname: %s\n"
 
-#: ../finch/gntplugin.c:182
+#: ../finch/gntplugin.c:186
 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:226
+#: ../finch/gntplugin.c:234
 msgid "No configuration options for this plugin."
 msgstr "Keine Einstellungsoptionen für dieses Plugin."
 
-#: ../finch/gntplugin.c:249
+#: ../finch/gntplugin.c:259
 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:296
+#: ../finch/gntplugin.c:314
 msgid "Configure Plugin"
 msgstr "Plugin konfigurieren"
 
-#: ../finch/gntplugin.c:352 ../finch/gntplugin.c:359 ../finch/gntprefs.c:245
-#: ../finch/gntui.c:82 ../pidgin/gtkdocklet.c:524 ../pidgin/gtkprefs.c:1992
+#. copy the preferences to tmp values...
+#. * I liked "take affect immediately" Oh well :-(
+#. (that should have been "effect," right?)
+#. Back to instant-apply! I win!  BU-HAHAHA!
+#. Create the window
+#: ../finch/gntplugin.c:370 ../finch/gntplugin.c:377 ../finch/gntprefs.c:263
+#: ../finch/gntui.c:83 ../pidgin/gtkdocklet.c:524 ../pidgin/gtkprefs.c:2060
 msgid "Preferences"
 msgstr "Einstellungen"
 
-#: ../finch/gntpounce.c:180 ../pidgin/gtkpounce.c:253
+#: ../finch/gntpounce.c:180 ../pidgin/gtkpounce.c:255
 msgid "Please enter a buddy to pounce."
 msgstr "Bitte Buddy zum Alarmieren angeben."
 
-#: ../finch/gntpounce.c:325 ../pidgin/gtkpounce.c:507
+#. Create the window.
+#: ../finch/gntpounce.c:325 ../pidgin/gtkpounce.c:516
 msgid "New Buddy Pounce"
 msgstr "Neuer Buddy-Alarm"
 
-#: ../finch/gntpounce.c:325 ../pidgin/gtkpounce.c:507
+#: ../finch/gntpounce.c:325 ../pidgin/gtkpounce.c:516
 msgid "Edit Buddy Pounce"
 msgstr "Buddy-Alarm bearbeiten"
 
@@ -1086,7 +1101,7 @@
 msgstr "Bei wem alarmieren"
 
 #. Account:
-#: ../finch/gntpounce.c:333 ../finch/gntstatus.c:446
+#: ../finch/gntpounce.c:333 ../finch/gntstatus.c:449
 msgid "Account:"
 msgstr "Konto:"
 
@@ -1095,7 +1110,7 @@
 msgstr "Buddy-Name:"
 
 #. Create the "Pounce When Buddy..." frame.
-#: ../finch/gntpounce.c:371 ../pidgin/gtkpounce.c:577
+#: ../finch/gntpounce.c:371 ../pidgin/gtkpounce.c:586
 msgid "Pounce When Buddy..."
 msgstr "Alarm, wenn Buddy..."
 
@@ -1140,7 +1155,7 @@
 msgstr "eine Nachricht sendet"
 
 #. Create the "Action" frame.
-#: ../finch/gntpounce.c:411 ../pidgin/gtkpounce.c:638
+#: ../finch/gntpounce.c:411 ../pidgin/gtkpounce.c:647
 msgid "Action"
 msgstr "Aktion"
 
@@ -1168,188 +1183,204 @@
 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:1282
+#: ../finch/gntpounce.c:447 ../pidgin/gtkpounce.c:1295
 msgid "Recurring"
 msgstr "Wiederkehrend"
 
-#: ../finch/gntpounce.c:649 ../pidgin/gtkpounce.c:1097
+#: ../finch/gntpounce.c:649 ../pidgin/gtkpounce.c:1110
 #, 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:682 ../finch/gntui.c:78 ../pidgin/gtkpounce.c:1329
+#: ../finch/gntpounce.c:683 ../finch/gntui.c:79 ../pidgin/gtkpounce.c:1339
 msgid "Buddy Pounces"
 msgstr "Buddy-Alarm"
 
-#: ../finch/gntpounce.c:794 ../pidgin/gtkpounce.c:1456
+#: ../finch/gntpounce.c:795 ../pidgin/gtkpounce.c:1466
 #, c-format
 msgid "%s has started typing to you (%s)"
 msgstr "%s hat begonnen Ihnen zu schreiben (%s)"
 
-#: ../finch/gntpounce.c:796 ../pidgin/gtkpounce.c:1458
+#: ../finch/gntpounce.c:797 ../pidgin/gtkpounce.c:1468
 #, c-format
 msgid "%s has paused while typing to you (%s)"
 msgstr "%s hat beim Schreiben an Sie (%s) angehalten"
 
-#: ../finch/gntpounce.c:798 ../pidgin/gtkpounce.c:1460
+#: ../finch/gntpounce.c:799 ../pidgin/gtkpounce.c:1470
 #, c-format
 msgid "%s has signed on (%s)"
 msgstr "%s hat sich angemeldet (%s)"
 
-#: ../finch/gntpounce.c:800 ../pidgin/gtkpounce.c:1462
+#: ../finch/gntpounce.c:801 ../pidgin/gtkpounce.c:1472
 #, c-format
 msgid "%s has returned from being idle (%s)"
 msgstr "%s ist nicht mehr inaktiv (%s)"
 
-#: ../finch/gntpounce.c:802 ../pidgin/gtkpounce.c:1464
+#: ../finch/gntpounce.c:803 ../pidgin/gtkpounce.c:1474
 #, c-format
 msgid "%s has returned from being away (%s)"
 msgstr "%s ist wieder anwesend (%s)"
 
-#: ../finch/gntpounce.c:804 ../pidgin/gtkpounce.c:1466
+#: ../finch/gntpounce.c:805 ../pidgin/gtkpounce.c:1476
 #, c-format
 msgid "%s has stopped typing to you (%s)"
 msgstr "%s hat aufgehört, Ihnen zu schreiben (%s)"
 
-#: ../finch/gntpounce.c:806 ../pidgin/gtkpounce.c:1468
+#: ../finch/gntpounce.c:807 ../pidgin/gtkpounce.c:1478
 #, c-format
 msgid "%s has signed off (%s)"
 msgstr "%s hat sich abgemeldet (%s)"
 
-#: ../finch/gntpounce.c:808 ../pidgin/gtkpounce.c:1470
+#: ../finch/gntpounce.c:809 ../pidgin/gtkpounce.c:1480
 #, c-format
 msgid "%s has become idle (%s)"
 msgstr "%s wurde untätig (%s)"
 
-#: ../finch/gntpounce.c:810 ../pidgin/gtkpounce.c:1472
+#: ../finch/gntpounce.c:811 ../pidgin/gtkpounce.c:1482
 #, c-format
 msgid "%s has gone away. (%s)"
 msgstr "%s ist abwesend. (%s)"
 
-#: ../finch/gntpounce.c:812 ../pidgin/gtkpounce.c:1474
+#: ../finch/gntpounce.c:813 ../pidgin/gtkpounce.c:1484
 #, c-format
 msgid "%s has sent you a message. (%s)"
 msgstr "%s hat Ihnen eine Nachricht gesendet. (%s)"
 
-#: ../finch/gntpounce.c:813 ../pidgin/gtkpounce.c:1475
+#: ../finch/gntpounce.c:814 ../pidgin/gtkpounce.c:1485
 msgid "Unknown pounce event. Please report this!"
 msgstr "Unbekanntes Alarm-Ereignis. Bitte berichten Sie dieses Problem!"
 
-#: ../finch/gntprefs.c:79
+#: ../finch/gntprefs.c:91
 msgid "Based on keyboard use"
 msgstr "Abhängig von Tastaturbenutzung"
 
-#: ../finch/gntprefs.c:81 ../pidgin/gtkprefs.c:1853
+#: ../finch/gntprefs.c:93 ../pidgin/gtkprefs.c:1923
 msgid "From last sent message"
 msgstr "Von letzter gesendeter Nachricht"
 
-#: ../finch/gntprefs.c:83 ../pidgin/gtkprefs.c:820 ../pidgin/gtkprefs.c:829
-#: ../pidgin/gtkprefs.c:1852 ../pidgin/gtkprefs.c:1866
+#: ../finch/gntprefs.c:95 ../pidgin/gtkprefs.c:897 ../pidgin/gtkprefs.c:906
+#: ../pidgin/gtkprefs.c:1922 ../pidgin/gtkprefs.c:1936
 #: ../pidgin/plugins/win32/winprefs/winprefs.c:337
 msgid "Never"
 msgstr "Niemals"
 
-#: ../finch/gntprefs.c:171
+#: ../finch/gntprefs.c:183
 msgid "Show Idle Time"
 msgstr "Zeige Untätigkeitszeiten"
 
-#: ../finch/gntprefs.c:172
+#: ../finch/gntprefs.c:184
 msgid "Show Offline Buddies"
 msgstr "Zeige Offline-Buddys"
 
-#: ../finch/gntprefs.c:179
+#: ../finch/gntprefs.c:191
 msgid "Notify buddies when you are typing"
 msgstr "Buddys benachrichtigen, wenn Sie ihnen schreiben"
 
-#: ../finch/gntprefs.c:185
+#: ../finch/gntprefs.c:197
 msgid "Log format"
 msgstr "Mitschnitt-Format"
 
-#: ../finch/gntprefs.c:186
+#: ../finch/gntprefs.c:198
 msgid "Log IMs"
 msgstr "IMs mitschneiden"
 
-#: ../finch/gntprefs.c:187
+#: ../finch/gntprefs.c:199
 msgid "Log chats"
 msgstr "Chats mitschneiden"
 
-#: ../finch/gntprefs.c:188
+#: ../finch/gntprefs.c:200
 msgid "Log status change events"
 msgstr "Statusveränderungen mitschneiden"
 
+#: ../finch/gntprefs.c:206
+msgid "Report Idle time"
+msgstr "Inaktivitätszeiten anzeigen"
+
+#: ../finch/gntprefs.c:207
+msgid "Change status when idle"
+msgstr "Ändere Status, wenn inaktiv"
+
+#: ../finch/gntprefs.c:208
+msgid "Minutes before changing status"
+msgstr "Minuten, bevor Status geändert wird"
+
+#: ../finch/gntprefs.c:209
+msgid "Change status to"
+msgstr "Ändere Status zu"
+
 #. Conversations
-#: ../finch/gntprefs.c:241 ../pidgin/gtkprefs.c:915 ../pidgin/gtkprefs.c:1956
+#: ../finch/gntprefs.c:258 ../pidgin/gtkprefs.c:992 ../pidgin/gtkprefs.c:2026
 #: ../pidgin/plugins/win32/winprefs/winprefs.c:344
 msgid "Conversations"
 msgstr "Unterhaltungen"
 
-#: ../finch/gntprefs.c:242 ../pidgin/gtkprefs.c:1392 ../pidgin/gtkprefs.c:1967
+#: ../finch/gntprefs.c:259 ../pidgin/gtkprefs.c:1462 ../pidgin/gtkprefs.c:2037
 msgid "Logging"
 msgstr "Mitschnitt"
 
-#: ../finch/gntrequest.c:532
+#: ../finch/gntrequest.c:563
 msgid "Not implemented yet."
 msgstr "Noch nicht implementiert."
 
-#: ../finch/gntrequest.c:597 ../pidgin/gtkrequest.c:1530
-#: ../pidgin/gtkrequest.c:1576
+#: ../finch/gntrequest.c:635 ../pidgin/gtkrequest.c:1526
+#: ../pidgin/gtkrequest.c:1572
 msgid "Save File..."
 msgstr "Datei speichern..."
 
-#: ../finch/gntrequest.c:597 ../pidgin/gtkrequest.c:1531
-#: ../pidgin/gtkrequest.c:1577
+#: ../finch/gntrequest.c:635 ../pidgin/gtkrequest.c:1527
+#: ../pidgin/gtkrequest.c:1573
 msgid "Open File..."
 msgstr "Datei öffnen..."
 
-#: ../finch/gntstatus.c:135
+#: ../finch/gntstatus.c:136
 #, c-format
 msgid "Are you sure you want to delete \"%s\""
 msgstr "Wollen Sie \"%s\" wirklich löschen"
 
-#: ../finch/gntstatus.c:138
+#: ../finch/gntstatus.c:139
 msgid "Delete Status"
 msgstr "Status löschen"
 
-#: ../finch/gntstatus.c:170 ../pidgin/gtksavedstatuses.c:557
+#: ../finch/gntstatus.c:174 ../pidgin/gtksavedstatuses.c:596
 msgid "Saved Statuses"
 msgstr "Gespeicherter Status"
 
-#: ../finch/gntstatus.c:177 ../finch/gntstatus.c:529
+#: ../finch/gntstatus.c:181 ../finch/gntstatus.c:532
 #: ../libpurple/protocols/jabber/buddy.c:286
-#: ../libpurple/protocols/jabber/buddy.c:935
+#: ../libpurple/protocols/jabber/buddy.c:973
 #: ../libpurple/protocols/novell/novell.c:1484
-#: ../pidgin/gtksavedstatuses.c:464
+#: ../pidgin/gtksavedstatuses.c:499
 msgid "Title"
 msgstr "Titel"
 
-#: ../finch/gntstatus.c:177 ../pidgin/gtksavedstatuses.c:479
+#: ../finch/gntstatus.c:181 ../pidgin/gtksavedstatuses.c:514
 msgid "Type"
 msgstr "Typ"
 
-#: ../finch/gntstatus.c:177 ../finch/gntstatus.c:554 ../finch/gntstatus.c:566
+#: ../finch/gntstatus.c:181 ../finch/gntstatus.c:557 ../finch/gntstatus.c:569
 #: ../libpurple/protocols/bonjour/bonjour.c:247
 #: ../libpurple/protocols/bonjour/bonjour.c:254
 #: ../libpurple/protocols/bonjour/bonjour.c:320
-#: ../libpurple/protocols/gg/gg.c:1072 ../libpurple/protocols/gg/gg.c:1576
-#: ../libpurple/protocols/gg/gg.c:1594 ../libpurple/protocols/gg/gg.c:1604
-#: ../libpurple/protocols/gg/gg.c:1610 ../libpurple/protocols/gg/gg.c:1619
-#: ../libpurple/protocols/gg/gg.c:1624 ../libpurple/protocols/irc/irc.c:234
-#: ../libpurple/protocols/jabber/jabber.c:1252
-#: ../libpurple/protocols/jabber/jabber.c:1262
-#: ../libpurple/protocols/jabber/jabber.c:1272
-#: ../libpurple/protocols/jabber/jabber.c:1282
-#: ../libpurple/protocols/jabber/jabber.c:1292
-#: ../libpurple/protocols/jabber/jabber.c:1304
+#: ../libpurple/protocols/gg/gg.c:1072 ../libpurple/protocols/gg/gg.c:1574
+#: ../libpurple/protocols/gg/gg.c:1592 ../libpurple/protocols/gg/gg.c:1602
+#: ../libpurple/protocols/gg/gg.c:1608 ../libpurple/protocols/gg/gg.c:1617
+#: ../libpurple/protocols/gg/gg.c:1622 ../libpurple/protocols/irc/irc.c:234
+#: ../libpurple/protocols/jabber/jabber.c:1244
+#: ../libpurple/protocols/jabber/jabber.c:1254
+#: ../libpurple/protocols/jabber/jabber.c:1264
+#: ../libpurple/protocols/jabber/jabber.c:1274
+#: ../libpurple/protocols/jabber/jabber.c:1284
+#: ../libpurple/protocols/jabber/jabber.c:1296
 #: ../libpurple/protocols/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:5531
-#: ../libpurple/protocols/oscar/oscar.c:5749
-#: ../libpurple/protocols/oscar/oscar.c:5763
-#: ../libpurple/protocols/oscar/oscar.c:5779
-#: ../libpurple/protocols/oscar/oscar.c:5786
-#: ../libpurple/protocols/oscar/oscar.c:5793
+#: ../libpurple/protocols/oscar/oscar.c:5533
+#: ../libpurple/protocols/oscar/oscar.c:5751
+#: ../libpurple/protocols/oscar/oscar.c:5765
+#: ../libpurple/protocols/oscar/oscar.c:5781
+#: ../libpurple/protocols/oscar/oscar.c:5788
+#: ../libpurple/protocols/oscar/oscar.c:5795
 #: ../libpurple/protocols/sametime/sametime.c:3286
 #: ../libpurple/protocols/sametime/sametime.c:3292
 #: ../libpurple/protocols/sametime/sametime.c:3298
@@ -1360,57 +1391,57 @@
 #: ../libpurple/protocols/yahoo/yahoo.c:3494
 #: ../libpurple/protocols/yahoo/yahoo.c:3500
 #: ../libpurple/protocols/zephyr/zephyr.c:2337
-#: ../pidgin/gtksavedstatuses.c:490 ../pidgin/gtksavedstatuses.c:954
+#: ../pidgin/gtksavedstatuses.c:525 ../pidgin/gtksavedstatuses.c:1009
 msgid "Message"
 msgstr "Nachricht"
 
 #. Use
-#: ../finch/gntstatus.c:189 ../finch/gntstatus.c:583
+#: ../finch/gntstatus.c:192 ../finch/gntstatus.c:586
 msgid "Use"
 msgstr "Benutzen"
 
-#: ../finch/gntstatus.c:294
+#: ../finch/gntstatus.c:297
 msgid "Invalid title"
 msgstr "Ungültige Bezeichnung"
 
-#: ../finch/gntstatus.c:295
+#: ../finch/gntstatus.c:298
 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:302
+#: ../finch/gntstatus.c:305
 msgid "Duplicate title"
 msgstr "Doppelte Bezeichnung"
 
-#: ../finch/gntstatus.c:303
+#: ../finch/gntstatus.c:306
 msgid "Please enter a different title for the status."
 msgstr "Bitte geben sie eine andere Bezeichnung für den Status ein."
 
-#: ../finch/gntstatus.c:443
+#: ../finch/gntstatus.c:446
 msgid "Substatus"
 msgstr "Unter-Status"
 
-#: ../finch/gntstatus.c:454 ../pidgin/gtkft.c:698
+#: ../finch/gntstatus.c:457 ../pidgin/gtkft.c:698
 msgid "Status:"
 msgstr "Status:"
 
-#: ../finch/gntstatus.c:469
+#: ../finch/gntstatus.c:472
 msgid "Message:"
 msgstr "Nachricht:"
 
-#: ../finch/gntstatus.c:518
+#: ../finch/gntstatus.c:521
 msgid "Edit Status"
 msgstr "Status bearbeiten"
 
-#: ../finch/gntstatus.c:560
+#: ../finch/gntstatus.c:563
 msgid "Use different status for following accounts"
 msgstr "Benutze einen anderen Status für die folgenden Konten"
 
 #. Save & Use
-#: ../finch/gntstatus.c:594
+#: ../finch/gntstatus.c:597
 msgid "Save & Use"
 msgstr "Speichern & Übernehmen"
 
-#: ../finch/gntui.c:83
+#: ../finch/gntui.c:84
 msgid "Statuses"
 msgstr "Status-Meldungen"
 
@@ -1573,12 +1604,12 @@
 msgstr "Fehlendes Protokoll-Plugin für %s"
 
 #: ../libpurple/account.c:1012 ../libpurple/connection.c:107
-#: ../pidgin/gtkblist.c:3992
+#: ../pidgin/gtkblist.c:4010
 msgid "Connection Error"
 msgstr "Verbindungsfehler"
 
 #: ../libpurple/account.c:1170 ../libpurple/protocols/gg/gg.c:702
-#: ../libpurple/protocols/jabber/jabber.c:1342
+#: ../libpurple/protocols/jabber/jabber.c:1334
 msgid "New passwords do not match."
 msgstr "Die neuen Passwörter stimmen nicht überein."
 
@@ -1617,22 +1648,22 @@
 msgstr "Benutzer-Info setzen"
 
 #: ../libpurple/account.c:1744 ../libpurple/protocols/gg/gg.c:1012
-#: ../libpurple/protocols/jabber/buddy.c:638
-#: ../libpurple/protocols/jabber/buddy.c:1424
-#: ../libpurple/protocols/jabber/buddy.c:1441
+#: ../libpurple/protocols/jabber/buddy.c:642
+#: ../libpurple/protocols/jabber/buddy.c:1462
+#: ../libpurple/protocols/jabber/buddy.c:1479
 #: ../libpurple/protocols/novell/novell.c:2831
 #: ../libpurple/protocols/qq/qq.c:230 ../pidgin/gtkft.c:159
 msgid "Unknown"
 msgstr "Unbekannt"
 
-#: ../libpurple/blist.c:523 ../libpurple/blist.c:1291
-#: ../libpurple/blist.c:1520 ../libpurple/protocols/jabber/roster.c:68
-#: ../pidgin/gtkblist.c:5284 ../pidgin/plugins/gevolution/gevo-util.c:64
+#: ../libpurple/blist.c:521 ../libpurple/blist.c:1289
+#: ../libpurple/blist.c:1518 ../libpurple/protocols/jabber/roster.c:68
+#: ../pidgin/gtkblist.c:5310 ../pidgin/plugins/gevolution/gevo-util.c:64
 #: ../pidgin/plugins/gevolution/gevolution.c:96
 msgid "Buddies"
 msgstr "Buddys"
 
-#: ../libpurple/blist.c:550
+#: ../libpurple/blist.c:548
 msgid "buddy list"
 msgstr "Buddy-Liste"
 
@@ -1651,84 +1682,84 @@
 msgstr "+++ %s hat sich abgemeldet"
 
 #: ../libpurple/connection.c:440 ../libpurple/plugin.c:282
-#: ../libpurple/protocols/jabber/buddy.c:1712
+#: ../libpurple/protocols/jabber/buddy.c:1750
 #: ../libpurple/protocols/msn/servconn.c:139
 #: ../libpurple/protocols/msn/session.c:322
 msgid "Unknown error"
 msgstr "Unbekannter Fehler"
 
-#: ../libpurple/conversation.c:165
+#: ../libpurple/conversation.c:170
 msgid "Unable to send message: The message is too large."
 msgstr "Nachricht kann nicht gesendet werden: Sie ist zu groß."
 
-#: ../libpurple/conversation.c:168 ../libpurple/conversation.c:181
+#: ../libpurple/conversation.c:173 ../libpurple/conversation.c:186
 #, c-format
 msgid "Unable to send message to %s."
 msgstr "Kann die Nachricht an %s nicht senden."
 
-#: ../libpurple/conversation.c:169
+#: ../libpurple/conversation.c:174
 msgid "The message is too large."
 msgstr "Die Nachricht ist zu lang."
 
-#: ../libpurple/conversation.c:178 ../libpurple/protocols/bonjour/jabber.c:283
-#: ../libpurple/protocols/bonjour/jabber.c:325
+#: ../libpurple/conversation.c:183 ../libpurple/protocols/bonjour/jabber.c:284
+#: ../libpurple/protocols/bonjour/jabber.c:326
 msgid "Unable to send message."
 msgstr "Nachricht kann nicht gesendet werden."
 
-#: ../libpurple/conversation.c:1164
+#: ../libpurple/conversation.c:1169
 msgid "Send Message"
 msgstr "Nachricht senden"
 
-#: ../libpurple/conversation.c:1167
+#: ../libpurple/conversation.c:1172
 msgid "_Send Message"
 msgstr "Nachricht _senden"
 
-#: ../libpurple/conversation.c:1572
+#: ../libpurple/conversation.c:1578
 #, c-format
 msgid "%s entered the room."
 msgstr "%s hat den Raum betreten."
 
-#: ../libpurple/conversation.c:1575
+#: ../libpurple/conversation.c:1581
 #, c-format
 msgid "%s [<I>%s</I>] entered the room."
 msgstr "%s [<I>%s</I>] hat den Raum betreten."
 
-#: ../libpurple/conversation.c:1682
+#: ../libpurple/conversation.c:1691
 #, c-format
 msgid "You are now known as %s"
 msgstr "Sie heißen jetzt %s"
 
-#: ../libpurple/conversation.c:1702
+#: ../libpurple/conversation.c:1711
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s heißt jetzt %s"
 
-#: ../libpurple/conversation.c:1775
+#: ../libpurple/conversation.c:1786
 #, c-format
 msgid "%s left the room."
 msgstr "%s hat den Raum verlassen."
 
-#: ../libpurple/conversation.c:1778
+#: ../libpurple/conversation.c:1789
 #, c-format
 msgid "%s left the room (%s)."
 msgstr "%s hat den Raum verlassen (%s)."
 
-#: ../libpurple/dbus-server.c:578
+#: ../libpurple/dbus-server.c:584
 #, c-format
 msgid "Failed to get connection: %s"
 msgstr "Kann keine Verbindung herstellen: %s"
 
-#: ../libpurple/dbus-server.c:590
+#: ../libpurple/dbus-server.c:596
 #, c-format
 msgid "Failed to get name: %s"
 msgstr "Kann den Namen nicht bekommen: %s"
 
-#: ../libpurple/dbus-server.c:603
+#: ../libpurple/dbus-server.c:610
 #, c-format
 msgid "Failed to get serv name: %s"
 msgstr "Kann den Serv-Namen nicht bekommen: %s"
 
-#: ../libpurple/dbus-server.h:83
+#: ../libpurple/dbus-server.h:84
 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"
 
@@ -1781,7 +1812,7 @@
 msgid "Unknown reason"
 msgstr "Unbekannter Grund"
 
-#: ../libpurple/ft.c:204
+#: ../libpurple/ft.c:207
 #, c-format
 msgid ""
 "Error reading %s: \n"
@@ -1790,7 +1821,7 @@
 "Fehler beim Empfangen von %s: \n"
 "%s.\n"
 
-#: ../libpurple/ft.c:208
+#: ../libpurple/ft.c:211
 #, c-format
 msgid ""
 "Error writing %s: \n"
@@ -1799,7 +1830,7 @@
 "Fehler beim Senden von %s: \n"
 "%s.\n"
 
-#: ../libpurple/ft.c:212
+#: ../libpurple/ft.c:215
 #, c-format
 msgid ""
 "Error accessing %s: \n"
@@ -1808,40 +1839,39 @@
 "Fehler beim Zugriff auf %s: \n"
 "%s.\n"
 
-#: ../libpurple/ft.c:248
+#: ../libpurple/ft.c:251
 msgid "Directory is not writable."
 msgstr "Verzeichnis ist nicht schreibbar."
 
-#: ../libpurple/ft.c:263
+#: ../libpurple/ft.c:266
 msgid "Cannot send a file of 0 bytes."
 msgstr "Kann keine Datei mit 0 Bytes senden."
 
-#: ../libpurple/ft.c:273
+#: ../libpurple/ft.c:276
 msgid "Cannot send a directory."
 msgstr "Kann kein Verzeichnis senden."
 
-#: ../libpurple/ft.c:282
+#: ../libpurple/ft.c:285
 #, c-format
 msgid "%s is not a regular file. Cowardly refusing to overwrite it.\n"
-msgstr ""
-"%s ist keine reguläre Datei. Pidgin wird die Datei nicht überschreiben.\n"
-
-#: ../libpurple/ft.c:342
+msgstr "%s ist keine reguläre Datei. Pidgin wird die Datei nicht überschreiben.\n"
+
+#: ../libpurple/ft.c:345
 #, c-format
 msgid "%s wants to send you %s (%s)"
 msgstr "%s möchte Ihnen %s (%s) senden"
 
-#: ../libpurple/ft.c:349
+#: ../libpurple/ft.c:352
 #, c-format
 msgid "%s wants to send you a file"
 msgstr "%s möchte Ihnen eine Datei senden"
 
-#: ../libpurple/ft.c:392
+#: ../libpurple/ft.c:395
 #, c-format
 msgid "Accept file transfer request from %s?"
 msgstr "Akzeptieren Sie die Dateiübertragung von %s?"
 
-#: ../libpurple/ft.c:396
+#: ../libpurple/ft.c:399
 #, c-format
 msgid ""
 "A file is available for download from:\n"
@@ -1852,60 +1882,60 @@
 "Remote-Computer: %s\n"
 "Remote-Port: %d"
 
-#: ../libpurple/ft.c:431
+#: ../libpurple/ft.c:434
 #, c-format
 msgid "%s is offering to send file %s"
 msgstr "%s bietet an, die Datei %s zu senden"
 
-#: ../libpurple/ft.c:483
+#: ../libpurple/ft.c:486
 #, c-format
 msgid "%s is not a valid filename.\n"
 msgstr "%s ist kein gültiger Dateiname.\n"
 
-#: ../libpurple/ft.c:504
+#: ../libpurple/ft.c:507
 #, c-format
 msgid "Offering to send %s to %s"
 msgstr "Angebot zum Senden von %s an %s"
 
-#: ../libpurple/ft.c:516
+#: ../libpurple/ft.c:519
 #, c-format
 msgid "Starting transfer of %s from %s"
 msgstr "Starte die Dateiübertragung von %s von %s"
 
-#: ../libpurple/ft.c:670
+#: ../libpurple/ft.c:680
 #, c-format
 msgid "Transfer of file %s complete"
 msgstr "Übertragung der Datei %s ist komplett"
 
-#: ../libpurple/ft.c:673
+#: ../libpurple/ft.c:683
 msgid "File transfer complete"
 msgstr "Dateiübertragung ist komplett"
 
-#: ../libpurple/ft.c:1091
+#: ../libpurple/ft.c:1101
 #, c-format
 msgid "You canceled the transfer of %s"
 msgstr "Sie haben die Dateiübertragung von %s abgebrochen"
 
-#: ../libpurple/ft.c:1096
+#: ../libpurple/ft.c:1106
 msgid "File transfer cancelled"
 msgstr "Dateiübertragung wurde abgebrochen"
 
-#: ../libpurple/ft.c:1154
+#: ../libpurple/ft.c:1164
 #, c-format
 msgid "%s canceled the transfer of %s"
 msgstr "%s hat die Übertragung von %s abgebrochen"
 
-#: ../libpurple/ft.c:1159
+#: ../libpurple/ft.c:1169
 #, c-format
 msgid "%s canceled the file transfer"
 msgstr "%s hat die Datenübertragung abgebrochen"
 
-#: ../libpurple/ft.c:1216
+#: ../libpurple/ft.c:1226
 #, c-format
 msgid "File transfer to %s failed."
 msgstr "Dateiübertragung an %s wurde abgebrochen."
 
-#: ../libpurple/ft.c:1218
+#: ../libpurple/ft.c:1228
 #, c-format
 msgid "File transfer from %s failed."
 msgstr "Dateiübertragung von %s wurde abgebrochen."
@@ -2082,31 +2112,31 @@
 msgid "Whether the specified command should handle \"ymsgr\" URLs"
 msgstr "Legt fest, ob das angegebene Kommado \"ymsrg\"-URLs verarbeiten soll"
 
-#: ../libpurple/log.c:181
+#: ../libpurple/log.c:182
 msgid "<b><font color=\"red\">The logger has no read function</font></b>"
 msgstr "<b><font color=\"red\">Der Logger hat keine Lesefunktion</font></b>"
 
-#: ../libpurple/log.c:593
+#: ../libpurple/log.c:597
 msgid "HTML"
 msgstr "HTML"
 
-#: ../libpurple/log.c:607
+#: ../libpurple/log.c:611
 msgid "Plain text"
 msgstr "Einfacher Text"
 
-#: ../libpurple/log.c:621
+#: ../libpurple/log.c:625
 msgid "Old flat format"
 msgstr "Altes \"flaches\" format"
 
-#: ../libpurple/log.c:732
+#: ../libpurple/log.c:837
 msgid "Logging of this conversation failed."
 msgstr "Mitschnitt der Unterhaltung fehlgeschlagen."
 
-#: ../libpurple/log.c:1175
+#: ../libpurple/log.c:1280
 msgid "XML"
 msgstr "XML"
 
-#: ../libpurple/log.c:1251
+#: ../libpurple/log.c:1364
 #, c-format
 msgid ""
 "<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
@@ -2115,7 +2145,7 @@
 "<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
 "REPLY&gt;:</b></font> %s<br/>\n"
 
-#: ../libpurple/log.c:1253
+#: ../libpurple/log.c:1366
 #, c-format
 msgid ""
 "<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
@@ -2124,17 +2154,16 @@
 "<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
 "REPLY&gt;:</b></font> %s<br/>\n"
 
-#: ../libpurple/log.c:1311 ../libpurple/log.c:1444
+#: ../libpurple/log.c:1424 ../libpurple/log.c:1557
 msgid "<font color=\"red\"><b>Unable to find log path!</b></font>"
-msgstr ""
-"<font color=\"red\"><b>Kann den Mitschnitt-Pfad nicht finden!</b></font>"
-
-#: ../libpurple/log.c:1323 ../libpurple/log.c:1453
+msgstr "<font color=\"red\"><b>Kann den Mitschnitt-Pfad nicht finden!</b></font>"
+
+#: ../libpurple/log.c:1436 ../libpurple/log.c:1566
 #, c-format
 msgid "<font color=\"red\"><b>Could not read file: %s</b></font>"
 msgstr "<font color=\"red\"><b>Kann folgende Datei nicht lesen: %s</b></font>"
 
-#: ../libpurple/log.c:1385
+#: ../libpurple/log.c:1498
 #, c-format
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr "(%s) %s <AUTO-REPLY>: %s\n"
@@ -2230,10 +2259,10 @@
 #: ../libpurple/protocols/oscar/oscar.c:1458
 #: ../libpurple/protocols/oscar/oscar.c:2251
 #: ../libpurple/protocols/oscar/oscar.c:2298
-#: ../libpurple/protocols/oscar/oscar.c:5863
-#: ../libpurple/protocols/oscar/oscar.c:5918
-#: ../libpurple/protocols/oscar/oscar.c:6144
-#: ../libpurple/protocols/oscar/oscar.c:6214 ../libpurple/request.h:1387
+#: ../libpurple/protocols/oscar/oscar.c:5865
+#: ../libpurple/protocols/oscar/oscar.c:5920
+#: ../libpurple/protocols/oscar/oscar.c:6146
+#: ../libpurple/protocols/oscar/oscar.c:6216 ../libpurple/request.h:1387
 #: ../libpurple/request.h:1397
 msgid "_Cancel"
 msgstr "A_bbrechen"
@@ -2250,12 +2279,12 @@
 msgid "Auto Reject"
 msgstr "Auto-Ablehnen"
 
-#: ../libpurple/plugins/autoaccept.c:184
+#: ../libpurple/plugins/autoaccept.c:185
 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:214
+#: ../libpurple/plugins/autoaccept.c:215
 msgid ""
 "Path to save the files in\n"
 "(Please provide the full path)"
@@ -2263,11 +2292,11 @@
 "Pfad in denen die Dateien gespeichert werden sollen\n"
 "(Bitte geben Sie den vollständigen Pfad an)"
 
-#: ../libpurple/plugins/autoaccept.c:219
+#: ../libpurple/plugins/autoaccept.c:220
 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:223
+#: ../libpurple/plugins/autoaccept.c:224
 msgid ""
 "Notify with a popup when an autoaccepted file transfer is complete\n"
 "(only when there's no conversation with the sender)"
@@ -2310,8 +2339,7 @@
 #. *< summary
 #: ../libpurple/plugins/buddynote.c:93 ../pidgin/plugins/gtkbuddynote.c:74
 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."
+msgstr "Gibt die Möglichkeit, Notizen für Buddys auf Ihrer Buddy-Liste zu speichern."
 
 #. *< type
 #. *< ui_requirement
@@ -2409,8 +2437,7 @@
 
 #: ../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"
+msgstr "Erlaubt Ihnen manuell zu konfigurieren, wie lange Sie untätig sein wollen"
 
 #. *< type
 #. *< ui_requirement
@@ -2504,7 +2531,7 @@
 #. * offset is way off.  The user should never really see it, but
 #. * it's here just in case.  The parens are to make it clear it's
 #. * not a real timezone.
-#: ../libpurple/plugins/log_reader.c:497
+#: ../libpurple/plugins/log_reader.c:492
 msgid "(UTC)"
 msgstr "(UTC)"
 
@@ -2552,58 +2579,66 @@
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
-#: ../libpurple/plugins/log_reader.c:1989
-#: ../libpurple/plugins/log_reader.c:2098
+#: ../libpurple/plugins/log_reader.c:2344
+#: ../libpurple/plugins/log_reader.c:2467
 msgid "Adium"
 msgstr "Adium"
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
-#: ../libpurple/plugins/log_reader.c:2002
-#: ../libpurple/plugins/log_reader.c:2103
+#: ../libpurple/plugins/log_reader.c:2357
+#: ../libpurple/plugins/log_reader.c:2472
 msgid "Fire"
 msgstr "Fire"
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
-#: ../libpurple/plugins/log_reader.c:2014
-#: ../libpurple/plugins/log_reader.c:2107
+#: ../libpurple/plugins/log_reader.c:2369
+#: ../libpurple/plugins/log_reader.c:2476
 msgid "Messenger Plus!"
 msgstr "Messenger Plus!"
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
-#: ../libpurple/plugins/log_reader.c:2027
-#: ../libpurple/plugins/log_reader.c:2112
+#: ../libpurple/plugins/log_reader.c:2383
+#: ../libpurple/plugins/log_reader.c:2481
+msgid "QIP"
+msgstr "QIP"
+
+#. The names of IM clients are marked for translation at the request of
+#. translators who wanted to transliterate them.  Many translators
+#. choose to leave them alone.  Choose what's best for your language.
+#: ../libpurple/plugins/log_reader.c:2395
+#: ../libpurple/plugins/log_reader.c:2485
 msgid "MSN Messenger"
 msgstr "MSN-Messenger"
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
-#: ../libpurple/plugins/log_reader.c:2039
-#: ../libpurple/plugins/log_reader.c:2116
+#: ../libpurple/plugins/log_reader.c:2407
+#: ../libpurple/plugins/log_reader.c:2489
 msgid "Trillian"
 msgstr "Trillian"
 
 #. Add general preferences.
-#: ../libpurple/plugins/log_reader.c:2080
+#: ../libpurple/plugins/log_reader.c:2449
 msgid "General Log Reading Configuration"
 msgstr "Allgemeine Mitschnittseinstellungen"
 
-#: ../libpurple/plugins/log_reader.c:2084
+#: ../libpurple/plugins/log_reader.c:2453
 msgid "Fast size calculations"
 msgstr "Schnelle Größenberechnung"
 
-#: ../libpurple/plugins/log_reader.c:2088
+#: ../libpurple/plugins/log_reader.c:2457
 msgid "Use name heuristics"
 msgstr "Benutze Namensheuristiken"
 
 #. Add Log Directory preferences.
-#: ../libpurple/plugins/log_reader.c:2094
+#: ../libpurple/plugins/log_reader.c:2463
 msgid "Log Directory"
 msgstr "Mitschnittverzeichnis"
 
@@ -2613,21 +2648,21 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/log_reader.c:2145
+#: ../libpurple/plugins/log_reader.c:2518
 msgid "Log Reader"
 msgstr "Mitschnittsbetrachter"
 
 #. *< name
 #. *< version
 #. * summary
-#: ../libpurple/plugins/log_reader.c:2149
+#: ../libpurple/plugins/log_reader.c:2522
 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:2153
+#: ../libpurple/plugins/log_reader.c:2526
 msgid ""
 "When viewing logs, this plugin will include logs from other IM clients. "
 "Currently, this includes Adium, MSN Messenger, and Trillian.\n"
@@ -2976,8 +3011,7 @@
 msgstr "Kann nicht auf eingehende IM-Verbindungen hören\n"
 
 #: ../libpurple/protocols/bonjour/bonjour.c:137
-msgid ""
-"Unable to establish connection with the local mDNS server.  Is it running?"
+msgid "Unable to establish connection with the local mDNS server.  Is it running?"
 msgstr "Keine Verbindung zum lokalen mDNS-Server. Ist er aktiviert?"
 
 #. get_yahoo_status_from_purple_status() returns YAHOO_STATUS_CUSTOM for
@@ -2986,17 +3020,17 @@
 #: ../libpurple/protocols/bonjour/bonjour.c:294
 #: ../libpurple/protocols/gg/gg.c:1009 ../libpurple/protocols/irc/irc.c:530
 #: ../libpurple/protocols/irc/msgs.c:310
-#: ../libpurple/protocols/jabber/buddy.c:1434
+#: ../libpurple/protocols/jabber/buddy.c:1472
 #: ../libpurple/protocols/novell/novell.c:2819
 #: ../libpurple/protocols/oscar/oscar.c:733
-#: ../libpurple/protocols/oscar/oscar.c:4544
-#: ../libpurple/protocols/oscar/oscar.c:5609
+#: ../libpurple/protocols/oscar/oscar.c:4545
+#: ../libpurple/protocols/oscar/oscar.c:5611
 #: ../libpurple/protocols/qq/qq.c:180 ../libpurple/protocols/silc/buddy.c:1476
 #: ../libpurple/protocols/silc10/buddy.c:1476
 #: ../libpurple/protocols/yahoo/yahoo.c:3397
 #: ../libpurple/protocols/yahoo/yahoo.c:3470 ../libpurple/status.c:157
-#: ../pidgin/gtkdocklet.c:442 ../pidgin/gtkprefs.c:1862
-#: ../pidgin/gtkstatusbox.c:1052
+#: ../pidgin/gtkdocklet.c:442 ../pidgin/gtkprefs.c:1932
+#: ../pidgin/gtkstatusbox.c:1056
 msgid "Away"
 msgstr "Abwesend"
 
@@ -3064,32 +3098,32 @@
 msgid "Bonjour"
 msgstr "Bonjour"
 
-#: ../libpurple/protocols/bonjour/jabber.c:394
+#: ../libpurple/protocols/bonjour/jabber.c:395
 #, c-format
 msgid "%s has closed the conversation."
 msgstr "%s hat das Gespräch beendet."
 
-#: ../libpurple/protocols/bonjour/jabber.c:440
-#: ../libpurple/protocols/bonjour/jabber.c:653
-#: ../libpurple/protocols/bonjour/jabber.c:678
+#: ../libpurple/protocols/bonjour/jabber.c:441
+#: ../libpurple/protocols/bonjour/jabber.c:654
+#: ../libpurple/protocols/bonjour/jabber.c:679
 msgid "Unable to send the message, the conversation couldn't be started."
 msgstr ""
 "Die Nachricht kann nicht gesendet werden, das Gespräch kann nicht gestartet "
 "werden."
 
-#: ../libpurple/protocols/bonjour/jabber.c:574
+#: ../libpurple/protocols/bonjour/jabber.c:575
 msgid "Cannot open socket"
 msgstr "Kann die Socket nicht öffnen"
 
-#: ../libpurple/protocols/bonjour/jabber.c:582
+#: ../libpurple/protocols/bonjour/jabber.c:583
 msgid "Error setting socket options"
 msgstr "Fehler beim Setzen der Socket-Optionen"
 
-#: ../libpurple/protocols/bonjour/jabber.c:606
+#: ../libpurple/protocols/bonjour/jabber.c:607
 msgid "Could not bind socket to port"
 msgstr "Kann die Socket nicht an den Port binden"
 
-#: ../libpurple/protocols/bonjour/jabber.c:614
+#: ../libpurple/protocols/bonjour/jabber.c:615
 msgid "Could not listen on socket"
 msgstr "Kann nicht an der Socket hören"
 
@@ -3167,7 +3201,7 @@
 
 #: ../libpurple/protocols/gg/gg.c:477 ../libpurple/protocols/gg/gg.c:770
 #: ../libpurple/protocols/jabber/jabber.c:807
-#: ../libpurple/protocols/jabber/jabber.c:1377
+#: ../libpurple/protocols/jabber/jabber.c:1369
 msgid "Password"
 msgstr "Passwort"
 
@@ -3192,10 +3226,10 @@
 msgstr "Bitte füllen sie die folgenden Felder aus"
 
 #: ../libpurple/protocols/gg/gg.c:637 ../libpurple/protocols/gg/gg.c:1049
-#: ../libpurple/protocols/gg/gg.c:1123
+#: ../libpurple/protocols/gg/gg.c:1121
 #: ../libpurple/protocols/jabber/jabber.c:843
-#: ../libpurple/protocols/oscar/oscar.c:3802
-#: ../libpurple/protocols/oscar/oscar.c:3815
+#: ../libpurple/protocols/oscar/oscar.c:3803
+#: ../libpurple/protocols/oscar/oscar.c:3816
 #: ../libpurple/protocols/qq/buddy_info.c:49
 msgid "City"
 msgstr "Stadt"
@@ -3205,7 +3239,7 @@
 msgstr "Geburtsjahr"
 
 #: ../libpurple/protocols/gg/gg.c:645 ../libpurple/protocols/msn/msn.c:1558
-#: ../libpurple/protocols/oscar/oscar.c:3745
+#: ../libpurple/protocols/oscar/oscar.c:3746
 #: ../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
@@ -3218,14 +3252,14 @@
 msgstr "Männlich oder weiblich"
 
 #: ../libpurple/protocols/gg/gg.c:647
-#: ../libpurple/protocols/oscar/oscar.c:3745
+#: ../libpurple/protocols/oscar/oscar.c:3746
 #: ../libpurple/protocols/qq/buddy_info.c:83
 #: ../libpurple/protocols/qq/qq.c:224
 msgid "Male"
 msgstr "Männlich"
 
 #: ../libpurple/protocols/gg/gg.c:648
-#: ../libpurple/protocols/oscar/oscar.c:3745
+#: ../libpurple/protocols/oscar/oscar.c:3746
 #: ../libpurple/protocols/qq/buddy_info.c:84
 #: ../libpurple/protocols/qq/qq.c:227
 msgid "Female"
@@ -3269,8 +3303,7 @@
 
 #: ../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: "
+msgstr "Bitte geben Sie Ihr aktuelles und Ihr neues Passwort für folgende UIN ein: "
 
 #: ../libpurple/protocols/gg/gg.c:794 ../libpurple/protocols/gg/gg.c:795
 msgid "Change Gadu-Gadu Password"
@@ -3286,148 +3319,148 @@
 msgstr "Zum Chat hinzufügen..."
 
 #: ../libpurple/protocols/gg/gg.c:1003
-#: ../libpurple/protocols/jabber/buddy.c:1428
+#: ../libpurple/protocols/jabber/buddy.c:1466
 #: ../libpurple/protocols/novell/novell.c:2828
 #: ../libpurple/protocols/oscar/oscar.c:828
-#: ../libpurple/protocols/oscar/oscar.c:5581
+#: ../libpurple/protocols/oscar/oscar.c:5583
 #: ../libpurple/protocols/qq/qq.c:170 ../libpurple/protocols/qq/qq.c:177
 #: ../libpurple/protocols/yahoo/yahoo.c:2917 ../libpurple/status.c:153
-#: ../pidgin/gtkblist.c:3070 ../pidgin/gtkblist.c:3398
-#: ../pidgin/gtkdocklet.c:450 ../pidgin/gtkstatusbox.c:1054
+#: ../pidgin/gtkblist.c:3070 ../pidgin/gtkblist.c:3411
+#: ../pidgin/gtkdocklet.c:450 ../pidgin/gtkstatusbox.c:1059
 msgid "Offline"
 msgstr "Offline"
 
 #: ../libpurple/protocols/gg/gg.c:1006
-#: ../libpurple/protocols/jabber/buddy.c:1430
+#: ../libpurple/protocols/jabber/buddy.c:1468
 #: ../libpurple/protocols/msn/state.c:29 ../libpurple/protocols/msn/state.c:30
 #: ../libpurple/protocols/msn/state.c:37 ../libpurple/protocols/msn/state.c:38
 #: ../libpurple/protocols/novell/novell.c:2816
 #: ../libpurple/protocols/yahoo/yahoo.c:2919 ../libpurple/status.c:154
-#: ../pidgin/gtkdocklet.c:438 ../pidgin/gtkstatusbox.c:1051
+#: ../pidgin/gtkdocklet.c:438 ../pidgin/gtkstatusbox.c:1055
 msgid "Available"
 msgstr "Verfügbar"
 
-#: ../libpurple/protocols/gg/gg.c:1038 ../libpurple/protocols/gg/gg.c:1114
+#: ../libpurple/protocols/gg/gg.c:1038 ../libpurple/protocols/gg/gg.c:1112
 #: ../libpurple/protocols/oscar/oscar.c:2675
-#: ../libpurple/protocols/oscar/oscar.c:3712
+#: ../libpurple/protocols/oscar/oscar.c:3713
 msgid "UIN"
 msgstr "UIN"
 
-#: ../libpurple/protocols/gg/gg.c:1041 ../libpurple/protocols/gg/gg.c:1117
-#: ../libpurple/protocols/jabber/buddy.c:1585
-#: ../libpurple/protocols/jabber/buddy.c:1761
-#: ../libpurple/protocols/oscar/oscar.c:3723
+#: ../libpurple/protocols/gg/gg.c:1041 ../libpurple/protocols/gg/gg.c:1115
+#: ../libpurple/protocols/jabber/buddy.c:1623
+#: ../libpurple/protocols/jabber/buddy.c:1799
+#: ../libpurple/protocols/oscar/oscar.c:3724
 #: ../libpurple/protocols/silc/ops.c:990
 #: ../libpurple/protocols/silc10/ops.c:1024
 msgid "First Name"
 msgstr "Vorname"
 
-#: ../libpurple/protocols/gg/gg.c:1054 ../libpurple/protocols/gg/gg.c:1126
+#: ../libpurple/protocols/gg/gg.c:1054 ../libpurple/protocols/gg/gg.c:1124
 msgid "Birth Year"
 msgstr "Geburtsjahr"
 
-#: ../libpurple/protocols/gg/gg.c:1108 ../libpurple/protocols/gg/gg.c:1177
-#: ../libpurple/protocols/oscar/oscar.c:3924
+#: ../libpurple/protocols/gg/gg.c:1106 ../libpurple/protocols/gg/gg.c:1175
+#: ../libpurple/protocols/oscar/oscar.c:3925
 msgid "Unable to display the search results."
 msgstr "Kann Suchergebnisse nicht anzeigen."
 
-#: ../libpurple/protocols/gg/gg.c:1168
+#: ../libpurple/protocols/gg/gg.c:1166
 msgid "Gadu-Gadu Public Directory"
 msgstr "Öffentliches Gadu-Gadu-Verzeichnis"
 
-#: ../libpurple/protocols/gg/gg.c:1169
+#: ../libpurple/protocols/gg/gg.c:1167
 msgid "Search results"
 msgstr "Suchergebnisse"
 
-#: ../libpurple/protocols/gg/gg.c:1212
+#: ../libpurple/protocols/gg/gg.c:1210
 msgid "No matching users found"
 msgstr "Keine entsprechenden Benutzer gefunden"
 
-#: ../libpurple/protocols/gg/gg.c:1213
+#: ../libpurple/protocols/gg/gg.c:1211
 msgid "There are no users matching your search criteria."
 msgstr "Es gibt keine Benutzer, die Ihrer Anfrage entsprechen."
 
-#: ../libpurple/protocols/gg/gg.c:1307 ../libpurple/protocols/gg/gg.c:1460
+#: ../libpurple/protocols/gg/gg.c:1305 ../libpurple/protocols/gg/gg.c:1458
 msgid "Unable to read socket"
 msgstr "Socket kann nicht gelesen werden"
 
-#: ../libpurple/protocols/gg/gg.c:1392
+#: ../libpurple/protocols/gg/gg.c:1390
 msgid "Buddy list downloaded"
 msgstr "Buddy-Liste heruntergeladen"
 
-#: ../libpurple/protocols/gg/gg.c:1393
+#: ../libpurple/protocols/gg/gg.c:1391
 msgid "Your buddy list was downloaded from the server."
 msgstr "Ihre Buddy-Liste wurde von Server geladen."
 
-#: ../libpurple/protocols/gg/gg.c:1400
+#: ../libpurple/protocols/gg/gg.c:1398
 msgid "Buddy list uploaded"
 msgstr "Buddy-Liste hochgeladen"
 
-#: ../libpurple/protocols/gg/gg.c:1401
+#: ../libpurple/protocols/gg/gg.c:1399
 msgid "Your buddy list was stored on the server."
 msgstr "Ihre Buddy-Liste wurde auf dem Server gespeichert."
 
-#: ../libpurple/protocols/gg/gg.c:1506 ../libpurple/protocols/gg/gg.c:1712
+#: ../libpurple/protocols/gg/gg.c:1504 ../libpurple/protocols/gg/gg.c:1710
 msgid "Connection failed."
 msgstr "Verbindung fehlgeschlagen."
 
-#: ../libpurple/protocols/gg/gg.c:1618 ../libpurple/protocols/msn/msn.c:531
+#: ../libpurple/protocols/gg/gg.c:1616 ../libpurple/protocols/msn/msn.c:531
 msgid "Blocked"
 msgstr "Blockiert"
 
-#: ../libpurple/protocols/gg/gg.c:1641
+#: ../libpurple/protocols/gg/gg.c:1639
 msgid "Add to chat"
 msgstr "Zum Chat hinzufügen"
 
-#: ../libpurple/protocols/gg/gg.c:1650
+#: ../libpurple/protocols/gg/gg.c:1648
 msgid "Unblock"
 msgstr "Sperrung aufheben"
 
-#: ../libpurple/protocols/gg/gg.c:1654
+#: ../libpurple/protocols/gg/gg.c:1652
 msgid "Block"
 msgstr "Sperren"
 
-#: ../libpurple/protocols/gg/gg.c:1671
+#: ../libpurple/protocols/gg/gg.c:1669
 msgid "Chat _name:"
 msgstr "Chat_name:"
 
-#: ../libpurple/protocols/gg/gg.c:1911
+#: ../libpurple/protocols/gg/gg.c:1909
 msgid "Chat error"
 msgstr "Chatfehler"
 
-#: ../libpurple/protocols/gg/gg.c:1912
+#: ../libpurple/protocols/gg/gg.c:1910
 msgid "This chat name is already in use"
 msgstr "Dieser Chatname existiert bereits"
 
-#: ../libpurple/protocols/gg/gg.c:1995
+#: ../libpurple/protocols/gg/gg.c:1993
 msgid "Not connected to the server."
 msgstr "Nicht mit dem Server verbunden."
 
-#: ../libpurple/protocols/gg/gg.c:2018
+#: ../libpurple/protocols/gg/gg.c:2016
 msgid "Find buddies..."
 msgstr "Finde Buddys..."
 
-#: ../libpurple/protocols/gg/gg.c:2024
+#: ../libpurple/protocols/gg/gg.c:2022
 msgid "Change password..."
 msgstr "Passwort ändern..."
 
-#: ../libpurple/protocols/gg/gg.c:2030
+#: ../libpurple/protocols/gg/gg.c:2028
 msgid "Upload buddylist to Server"
 msgstr "Buddy-Liste zum Server hochladen"
 
-#: ../libpurple/protocols/gg/gg.c:2034
+#: ../libpurple/protocols/gg/gg.c:2032
 msgid "Download buddylist from Server"
 msgstr "Buddy-Liste vom Server herunterladen"
 
-#: ../libpurple/protocols/gg/gg.c:2038
+#: ../libpurple/protocols/gg/gg.c:2036
 msgid "Delete buddylist from Server"
 msgstr "Löschen der Buddy-Liste vom Server"
 
-#: ../libpurple/protocols/gg/gg.c:2042
+#: ../libpurple/protocols/gg/gg.c:2040
 msgid "Save buddylist to file..."
 msgstr "Buddy-Liste in Datei speichern..."
 
-#: ../libpurple/protocols/gg/gg.c:2046
+#: ../libpurple/protocols/gg/gg.c:2044
 msgid "Load buddylist from file..."
 msgstr "Buddy-Liste aus Datei laden..."
 
@@ -3442,16 +3475,16 @@
 #. id
 #. name
 #. version
-#: ../libpurple/protocols/gg/gg.c:2150
+#: ../libpurple/protocols/gg/gg.c:2148
 msgid "Gadu-Gadu Protocol Plugin"
 msgstr "Gadu-Gadu-Protokoll-Plugin"
 
 #. summary
-#: ../libpurple/protocols/gg/gg.c:2151
+#: ../libpurple/protocols/gg/gg.c:2149
 msgid "Polish popular IM"
 msgstr "Beliebter polnischer IM-Dienst"
 
-#: ../libpurple/protocols/gg/gg.c:2205
+#: ../libpurple/protocols/gg/gg.c:2203
 msgid "Gadu-Gadu User"
 msgstr "Gadu-Gadu-Benutzer"
 
@@ -3479,9 +3512,9 @@
 
 #: ../libpurple/protocols/irc/dcc_send.c:296
 #: ../libpurple/protocols/irc/dcc_send.c:337
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:268
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:277
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:290
+#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:269
+#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:278
+#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:291
 msgid "File Transfer Failed"
 msgstr "Dateiübertragung gescheitert"
 
@@ -3522,7 +3555,7 @@
 msgstr "_Kanal:"
 
 #: ../libpurple/protocols/irc/irc.c:267
-#: ../libpurple/protocols/jabber/chat.c:59 ../pidgin/gtkaccount.c:523
+#: ../libpurple/protocols/jabber/chat.c:59 ../pidgin/gtkaccount.c:526
 msgid "_Password:"
 msgstr "_Passwort:"
 
@@ -3532,7 +3565,7 @@
 
 #. connect to the server
 #: ../libpurple/protocols/irc/irc.c:319
-#: ../libpurple/protocols/jabber/jabber.c:1048
+#: ../libpurple/protocols/jabber/jabber.c:1046
 #: ../libpurple/protocols/msn/session.c:345
 #: ../libpurple/protocols/novell/novell.c:2182
 #: ../libpurple/protocols/oscar/oscar.c:1288
@@ -3540,7 +3573,7 @@
 #: ../libpurple/protocols/sametime/sametime.c:3723
 #: ../libpurple/protocols/simple/simple.c:1671
 #: ../libpurple/protocols/yahoo/yahoo.c:2762
-#: ../libpurple/protocols/zephyr/zephyr.c:1621 ../pidgin/gtkstatusbox.c:659
+#: ../libpurple/protocols/zephyr/zephyr.c:1621 ../pidgin/gtkstatusbox.c:661
 msgid "Connecting"
 msgstr "Verbindungsaufbau"
 
@@ -3578,7 +3611,7 @@
 #: ../libpurple/protocols/irc/irc.c:775
 #: ../libpurple/protocols/silc/chat.c:1412
 #: ../libpurple/protocols/silc10/chat.c:1426
-#: ../libpurple/protocols/yahoo/yahoochat.c:1438
+#: ../libpurple/protocols/yahoo/yahoochat.c:1401
 msgid "Users"
 msgstr "Benutzer"
 
@@ -3588,7 +3621,7 @@
 #: ../libpurple/protocols/silc/ops.c:1389
 #: ../libpurple/protocols/silc10/chat.c:1429
 #: ../libpurple/protocols/silc10/ops.c:1382
-#: ../libpurple/protocols/yahoo/yahoochat.c:1447
+#: ../libpurple/protocols/yahoo/yahoochat.c:1410
 msgid "Topic"
 msgstr "Thema"
 
@@ -3600,19 +3633,19 @@
 #. *< id
 #. *< name
 #. *< version
-#: ../libpurple/protocols/irc/irc.c:915
+#: ../libpurple/protocols/irc/irc.c:916
 msgid "IRC Protocol Plugin"
 msgstr "IRC-Protokoll-Plugin"
 
 #. *  summary
-#: ../libpurple/protocols/irc/irc.c:916
+#: ../libpurple/protocols/irc/irc.c:917
 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:941 ../libpurple/protocols/irc/msgs.c:323
+#: ../libpurple/protocols/irc/irc.c:942 ../libpurple/protocols/irc/msgs.c:323
 #: ../libpurple/protocols/msn/msn.c:2154
-#: ../libpurple/protocols/oscar/oscar.c:6648
+#: ../libpurple/protocols/oscar/oscar.c:6650
 #: ../libpurple/protocols/qq/qq.c:756
 #: ../libpurple/protocols/sametime/sametime.c:5727
 #: ../libpurple/protocols/silc/ops.c:1249
@@ -3625,21 +3658,21 @@
 msgstr "Server"
 
 #. port to connect to
-#: ../libpurple/protocols/irc/irc.c:944 ../libpurple/protocols/msn/msn.c:2159
-#: ../libpurple/protocols/oscar/oscar.c:6651
+#: ../libpurple/protocols/irc/irc.c:945 ../libpurple/protocols/msn/msn.c:2159
+#: ../libpurple/protocols/oscar/oscar.c:6653
 #: ../libpurple/protocols/qq/qq.c:759
 #: ../libpurple/protocols/sametime/sametime.c:5732
-#: ../libpurple/protocols/silc/silc.c:1917
-#: ../libpurple/protocols/silc10/silc.c:1859
+#: ../libpurple/protocols/silc/silc.c:1918
+#: ../libpurple/protocols/silc10/silc.c:1861
 #: ../libpurple/protocols/toc/toc.c:2331
 msgid "Port"
 msgstr "Port"
 
-#: ../libpurple/protocols/irc/irc.c:947
+#: ../libpurple/protocols/irc/irc.c:948
 msgid "Encodings"
 msgstr "Kodierungen"
 
-#: ../libpurple/protocols/irc/irc.c:950 ../libpurple/protocols/irc/msgs.c:316
+#: ../libpurple/protocols/irc/irc.c:951 ../libpurple/protocols/irc/msgs.c:316
 #: ../libpurple/protocols/jabber/jabber.c:803
 #: ../libpurple/protocols/silc/buddy.c:1539
 #: ../libpurple/protocols/silc/ops.c:1197
@@ -3656,7 +3689,7 @@
 msgid "Username"
 msgstr "Benutzer"
 
-#: ../libpurple/protocols/irc/irc.c:953 ../libpurple/protocols/irc/msgs.c:317
+#: ../libpurple/protocols/irc/irc.c:954 ../libpurple/protocols/irc/msgs.c:317
 #: ../libpurple/protocols/silc/silc.c:1009
 #: ../libpurple/protocols/silc10/silc.c:920
 msgid "Real name"
@@ -3666,7 +3699,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:961
+#: ../libpurple/protocols/irc/irc.c:962
 msgid "Use SSL"
 msgstr "Benutze SSL"
 
@@ -3697,7 +3730,7 @@
 msgstr " <i>(identifiziert)</i>"
 
 #: ../libpurple/protocols/irc/msgs.c:303
-#: ../libpurple/protocols/oscar/oscar.c:3713
+#: ../libpurple/protocols/oscar/oscar.c:3714
 #: ../libpurple/protocols/silc/ops.c:1418
 #: ../libpurple/protocols/silc10/ops.c:1414
 msgid "Nick"
@@ -3980,7 +4013,7 @@
 msgstr "names [Kanal]:  Listet die Benutzer im aktuellen Kanal auf."
 
 #: ../libpurple/protocols/irc/parse.c:137
-#: ../libpurple/protocols/jabber/jabber.c:1819
+#: ../libpurple/protocols/jabber/jabber.c:1813
 msgid "nick &lt;new nickname&gt;:  Change your nickname."
 msgstr "nick &lt;new nickname&gt;:  Ihren Spitznamen ändern."
 
@@ -4058,8 +4091,7 @@
 
 #: ../libpurple/protocols/irc/parse.c:150
 msgid "umode &lt;+|-&gt;&lt;A-Za-z&gt;:  Set or unset a user mode."
-msgstr ""
-"umode &lt;+|-&gt;&lt;A-Za-z&gt;:  Benutzermodus setzen oder zurücknehmen."
+msgstr "umode &lt;+|-&gt;&lt;A-Za-z&gt;:  Benutzermodus setzen oder zurücknehmen."
 
 #: ../libpurple/protocols/irc/parse.c:151
 msgid "version [nick]: send CTCP VERSION request to a user"
@@ -4088,8 +4120,7 @@
 
 #: ../libpurple/protocols/irc/parse.c:155
 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."
+msgstr "whowas &lt;Nick&gt;:  Informationen zu einem abgemeldeten Benutzer abrufen."
 
 #: ../libpurple/protocols/irc/parse.c:465
 #, c-format
@@ -4178,7 +4209,7 @@
 msgstr "SASL-Fehler"
 
 #: ../libpurple/protocols/jabber/buddy.c:271
-#: ../libpurple/protocols/jabber/buddy.c:787
+#: ../libpurple/protocols/jabber/buddy.c:825
 #: ../libpurple/protocols/sametime/sametime.c:4128
 #: ../libpurple/protocols/silc/ops.c:986
 #: ../libpurple/protocols/silc10/ops.c:1020
@@ -4186,14 +4217,14 @@
 msgstr "Vollständiger Name"
 
 #: ../libpurple/protocols/jabber/buddy.c:272
-#: ../libpurple/protocols/jabber/buddy.c:800
+#: ../libpurple/protocols/jabber/buddy.c:838
 #: ../libpurple/protocols/silc/ops.c:998
 #: ../libpurple/protocols/silc10/ops.c:1032
 msgid "Family Name"
 msgstr "Nachname"
 
 #: ../libpurple/protocols/jabber/buddy.c:273
-#: ../libpurple/protocols/jabber/buddy.c:804
+#: ../libpurple/protocols/jabber/buddy.c:842
 msgid "Given Name"
 msgstr "Vorname"
 
@@ -4203,47 +4234,47 @@
 msgstr "URL"
 
 #: ../libpurple/protocols/jabber/buddy.c:276
-#: ../libpurple/protocols/jabber/buddy.c:856
+#: ../libpurple/protocols/jabber/buddy.c:894
 msgid "Street Address"
 msgstr "Straße"
 
 #: ../libpurple/protocols/jabber/buddy.c:277
-#: ../libpurple/protocols/jabber/buddy.c:852
+#: ../libpurple/protocols/jabber/buddy.c:890
 msgid "Extended Address"
 msgstr "Erweiterte Adresse"
 
 #: ../libpurple/protocols/jabber/buddy.c:278
-#: ../libpurple/protocols/jabber/buddy.c:860
+#: ../libpurple/protocols/jabber/buddy.c:898
 msgid "Locality"
 msgstr "Ort"
 
 #: ../libpurple/protocols/jabber/buddy.c:279
-#: ../libpurple/protocols/jabber/buddy.c:864
+#: ../libpurple/protocols/jabber/buddy.c:902
 msgid "Region"
 msgstr "Region"
 
 #: ../libpurple/protocols/jabber/buddy.c:280
-#: ../libpurple/protocols/jabber/buddy.c:868
+#: ../libpurple/protocols/jabber/buddy.c:906
 msgid "Postal Code"
 msgstr "Postleitzahl"
 
 #: ../libpurple/protocols/jabber/buddy.c:281
-#: ../libpurple/protocols/jabber/buddy.c:873
+#: ../libpurple/protocols/jabber/buddy.c:911
 #: ../libpurple/protocols/silc/silc.c:1015
 #: ../libpurple/protocols/silc10/silc.c:926
 msgid "Country"
 msgstr "Land"
 
 #: ../libpurple/protocols/jabber/buddy.c:282
-#: ../libpurple/protocols/jabber/buddy.c:884
-#: ../libpurple/protocols/jabber/buddy.c:891
+#: ../libpurple/protocols/jabber/buddy.c:922
+#: ../libpurple/protocols/jabber/buddy.c:929
 msgid "Telephone"
 msgstr "Telefon"
 
 #: ../libpurple/protocols/jabber/buddy.c:283
-#: ../libpurple/protocols/jabber/buddy.c:902
-#: ../libpurple/protocols/jabber/buddy.c:910
-#: ../libpurple/protocols/jabber/buddy.c:1591
+#: ../libpurple/protocols/jabber/buddy.c:940
+#: ../libpurple/protocols/jabber/buddy.c:948
+#: ../libpurple/protocols/jabber/buddy.c:1629
 #: ../libpurple/protocols/silc/ops.c:1041
 #: ../libpurple/protocols/silc/util.c:555
 #: ../libpurple/protocols/silc10/ops.c:1075
@@ -4253,40 +4284,40 @@
 msgstr "E-Mail"
 
 #: ../libpurple/protocols/jabber/buddy.c:284
-#: ../libpurple/protocols/jabber/buddy.c:925
+#: ../libpurple/protocols/jabber/buddy.c:963
 msgid "Organization Name"
 msgstr "Name der Organisation"
 
 #: ../libpurple/protocols/jabber/buddy.c:285
-#: ../libpurple/protocols/jabber/buddy.c:929
+#: ../libpurple/protocols/jabber/buddy.c:967
 msgid "Organization Unit"
 msgstr "Organisationseinheit"
 
 #: ../libpurple/protocols/jabber/buddy.c:287
-#: ../libpurple/protocols/jabber/buddy.c:938
+#: ../libpurple/protocols/jabber/buddy.c:976
 msgid "Role"
 msgstr "Funktion"
 
 #: ../libpurple/protocols/jabber/buddy.c:288
-#: ../libpurple/protocols/jabber/buddy.c:821
+#: ../libpurple/protocols/jabber/buddy.c:859
 #: ../libpurple/protocols/msn/msn.c:1627
-#: ../libpurple/protocols/oscar/oscar.c:3762
+#: ../libpurple/protocols/oscar/oscar.c:3763
 msgid "Birthday"
 msgstr "Geburtstag"
 
 #: ../libpurple/protocols/jabber/buddy.c:289
-#: ../libpurple/protocols/jabber/buddy.c:941
+#: ../libpurple/protocols/jabber/buddy.c:979
 #: ../libpurple/protocols/jabber/chat.c:775 ../pidgin/gtkblist.c:3081
-#: ../pidgin/gtkprefs.c:680
+#: ../pidgin/gtkprefs.c:738
 msgid "Description"
 msgstr "Beschreibung"
 
-#: ../libpurple/protocols/jabber/buddy.c:578
-#: ../libpurple/protocols/jabber/buddy.c:579
+#: ../libpurple/protocols/jabber/buddy.c:582
+#: ../libpurple/protocols/jabber/buddy.c:583
 msgid "Edit XMPP vCard"
 msgstr "XMPP-vCard bearbeiten"
 
-#: ../libpurple/protocols/jabber/buddy.c:580
+#: ../libpurple/protocols/jabber/buddy.c:584
 msgid ""
 "All items below are optional. Enter only the information with which you feel "
 "comfortable."
@@ -4294,116 +4325,116 @@
 "Die folgenden Punkte sind optional. Geben Sie nur die Informationen an, die "
 "Sie angeben möchten."
 
-#: ../libpurple/protocols/jabber/buddy.c:651
-#: ../libpurple/protocols/jabber/buddy.c:692
+#: ../libpurple/protocols/jabber/buddy.c:655
+#: ../libpurple/protocols/jabber/buddy.c:696
 msgid "Client"
 msgstr "Client"
 
-#: ../libpurple/protocols/jabber/buddy.c:655
-#: ../libpurple/protocols/jabber/buddy.c:696
+#: ../libpurple/protocols/jabber/buddy.c:659
+#: ../libpurple/protocols/jabber/buddy.c:700
 msgid "Operating System"
 msgstr "Betriebssystem"
 
-#: ../libpurple/protocols/jabber/buddy.c:665
-#: ../libpurple/protocols/jabber/libxmpp.c:198
+#: ../libpurple/protocols/jabber/buddy.c:669
+#: ../libpurple/protocols/jabber/libxmpp.c:202
 #: ../libpurple/protocols/jabber/si.c:853
 msgid "Resource"
 msgstr "Ressource"
 
-#: ../libpurple/protocols/jabber/buddy.c:667
-#: ../libpurple/protocols/jabber/jabber.c:1251
-#: ../libpurple/protocols/jabber/jabber.c:1261
-#: ../libpurple/protocols/jabber/jabber.c:1271
-#: ../libpurple/protocols/jabber/jabber.c:1281
-#: ../libpurple/protocols/jabber/jabber.c:1291
+#: ../libpurple/protocols/jabber/buddy.c:671
+#: ../libpurple/protocols/jabber/jabber.c:1243
+#: ../libpurple/protocols/jabber/jabber.c:1253
+#: ../libpurple/protocols/jabber/jabber.c:1263
+#: ../libpurple/protocols/jabber/jabber.c:1273
+#: ../libpurple/protocols/jabber/jabber.c:1283
 msgid "Priority"
 msgstr "Priorität"
 
-#: ../libpurple/protocols/jabber/buddy.c:808
+#: ../libpurple/protocols/jabber/buddy.c:846
 #: ../libpurple/protocols/silc/ops.c:994
 #: ../libpurple/protocols/silc10/ops.c:1028
 msgid "Middle Name"
 msgstr "Zweiter Name"
 
-#: ../libpurple/protocols/jabber/buddy.c:841
+#: ../libpurple/protocols/jabber/buddy.c:879
 #: ../libpurple/protocols/jabber/jabber.c:838
-#: ../libpurple/protocols/oscar/oscar.c:3801
-#: ../libpurple/protocols/oscar/oscar.c:3814
+#: ../libpurple/protocols/oscar/oscar.c:3802
+#: ../libpurple/protocols/oscar/oscar.c:3815
 #: ../libpurple/protocols/qq/buddy_info.c:56
 #: ../libpurple/protocols/silc/ops.c:1030
 #: ../libpurple/protocols/silc10/ops.c:1064
 msgid "Address"
 msgstr "Adresse"
 
-#: ../libpurple/protocols/jabber/buddy.c:848
+#: ../libpurple/protocols/jabber/buddy.c:886
 msgid "P.O. Box"
 msgstr "Postfach"
 
-#: ../libpurple/protocols/jabber/buddy.c:962
+#: ../libpurple/protocols/jabber/buddy.c:1000
 msgid "Photo"
 msgstr "Foto"
 
-#: ../libpurple/protocols/jabber/buddy.c:962
+#: ../libpurple/protocols/jabber/buddy.c:1000
 msgid "Logo"
 msgstr "Logo"
 
-#: ../libpurple/protocols/jabber/buddy.c:1371
+#: ../libpurple/protocols/jabber/buddy.c:1409
 msgid "Un-hide From"
 msgstr "Sichtbar von"
 
-#: ../libpurple/protocols/jabber/buddy.c:1375
+#: ../libpurple/protocols/jabber/buddy.c:1413
 msgid "Temporarily Hide From"
 msgstr "Temporär versteckt von"
 
 #. && NOT ME
-#: ../libpurple/protocols/jabber/buddy.c:1383
+#: ../libpurple/protocols/jabber/buddy.c:1421
 msgid "Cancel Presence Notification"
 msgstr "Abbrechen der Anwesenheitsbenachrichtigung"
 
-#: ../libpurple/protocols/jabber/buddy.c:1390
+#: ../libpurple/protocols/jabber/buddy.c:1428
 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:1399
+#: ../libpurple/protocols/jabber/buddy.c:1437
 msgid "Unsubscribe"
 msgstr "Abbestellen"
 
-#: ../libpurple/protocols/jabber/buddy.c:1432
-#: ../libpurple/protocols/jabber/jabber.c:1260
+#: ../libpurple/protocols/jabber/buddy.c:1470
+#: ../libpurple/protocols/jabber/jabber.c:1252
 msgid "Chatty"
 msgstr "Gesprächig"
 
-#: ../libpurple/protocols/jabber/buddy.c:1436 ../libpurple/status.c:158
+#: ../libpurple/protocols/jabber/buddy.c:1474
 msgid "Extended Away"
 msgstr "Abwesend (erweitert)"
 
-#: ../libpurple/protocols/jabber/buddy.c:1438
-#: ../libpurple/protocols/jabber/jabber.c:1290
+#: ../libpurple/protocols/jabber/buddy.c:1476
+#: ../libpurple/protocols/jabber/jabber.c:1282
 #: ../libpurple/protocols/oscar/oscar.c:727
-#: ../libpurple/protocols/oscar/oscar.c:5785
+#: ../libpurple/protocols/oscar/oscar.c:5787
 #: ../libpurple/protocols/sametime/sametime.c:3297
 msgid "Do Not Disturb"
 msgstr "Nicht stören"
 
-#: ../libpurple/protocols/jabber/buddy.c:1583
+#: ../libpurple/protocols/jabber/buddy.c:1621
 msgid "JID"
 msgstr "JID"
 
-#: ../libpurple/protocols/jabber/buddy.c:1587
-#: ../libpurple/protocols/jabber/buddy.c:1766
-#: ../libpurple/protocols/oscar/oscar.c:3724
+#: ../libpurple/protocols/jabber/buddy.c:1625
+#: ../libpurple/protocols/jabber/buddy.c:1804
+#: ../libpurple/protocols/oscar/oscar.c:3725
 msgid "Last Name"
 msgstr "Nachname"
 
-#: ../libpurple/protocols/jabber/buddy.c:1619
+#: ../libpurple/protocols/jabber/buddy.c:1657
 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:1694
+#: ../libpurple/protocols/jabber/buddy.c:1732
 msgid ""
 "Find a contact by entering the search criteria in the given fields. Note: "
 "Each field supports wild card searches (%)"
@@ -4411,71 +4442,71 @@
 "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:1714
+#: ../libpurple/protocols/jabber/buddy.c:1752
 msgid "Directory Query Failed"
 msgstr "Verzeichnisanfrage gescheitert"
 
-#: ../libpurple/protocols/jabber/buddy.c:1715
+#: ../libpurple/protocols/jabber/buddy.c:1753
 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:1749
+#: ../libpurple/protocols/jabber/buddy.c:1787
 #, c-format
 msgid "Server Instructions: %s"
 msgstr "Anleitung vom Server: %s"
 
-#: ../libpurple/protocols/jabber/buddy.c:1756
+#: ../libpurple/protocols/jabber/buddy.c:1794
 msgid "Fill in one or more fields to search for any matching XMPP users."
 msgstr ""
 "Füllen sie ein oder mehrere Felder aus, um nach entsprechenden XMPP-"
 "Benutzern zu suchen."
 
-#: ../libpurple/protocols/jabber/buddy.c:1776
+#: ../libpurple/protocols/jabber/buddy.c:1814
 #: ../libpurple/protocols/novell/novell.c:1488
-#: ../libpurple/protocols/oscar/oscar.c:3727
-#: ../libpurple/protocols/oscar/oscar.c:3736
+#: ../libpurple/protocols/oscar/oscar.c:3728
+#: ../libpurple/protocols/oscar/oscar.c:3737
 msgid "E-Mail Address"
 msgstr "E-Mail-Adresse"
 
-#: ../libpurple/protocols/jabber/buddy.c:1785
-#: ../libpurple/protocols/jabber/buddy.c:1786
+#: ../libpurple/protocols/jabber/buddy.c:1823
+#: ../libpurple/protocols/jabber/buddy.c:1824
 msgid "Search for XMPP users"
 msgstr "Suche nach XMPP-Benutzern"
 
 #. "Search"
-#: ../libpurple/protocols/jabber/buddy.c:1787
+#: ../libpurple/protocols/jabber/buddy.c:1825
 #: ../libpurple/protocols/qq/group.c:123
-#: ../libpurple/protocols/qq/group_im.c:145
+#: ../libpurple/protocols/qq/group_im.c:147
 #: ../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:5611
-#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:473
-#: ../pidgin/plugins/gevolution/assoc-buddy.c:358
+#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:470
+#: ../pidgin/plugins/gevolution/assoc-buddy.c:356
 msgid "Search"
 msgstr "Suchen"
 
-#: ../libpurple/protocols/jabber/buddy.c:1802
+#: ../libpurple/protocols/jabber/buddy.c:1840
 msgid "Invalid Directory"
 msgstr "Ungültiges Verzeichnis"
 
-#: ../libpurple/protocols/jabber/buddy.c:1819
+#: ../libpurple/protocols/jabber/buddy.c:1857
 msgid "Enter a User Directory"
 msgstr "Geben Sie ein Benutzerverzeichnis ein"
 
-#: ../libpurple/protocols/jabber/buddy.c:1820
+#: ../libpurple/protocols/jabber/buddy.c:1858
 msgid "Select a user directory to search"
 msgstr "Wählen Sie ein Benutzerverzeichnis zum Suchen"
 
-#: ../libpurple/protocols/jabber/buddy.c:1823
+#: ../libpurple/protocols/jabber/buddy.c:1861
 msgid "Search Directory"
 msgstr "Suche im Verzeichnis"
 
 #: ../libpurple/protocols/jabber/chat.c:41
-#: ../libpurple/protocols/oscar/oscar.c:5271
-#: ../libpurple/protocols/yahoo/yahoochat.c:999
+#: ../libpurple/protocols/oscar/oscar.c:5273
+#: ../libpurple/protocols/yahoo/yahoochat.c:962
 msgid "_Room:"
 msgstr "_Raum:"
 
@@ -4540,8 +4571,7 @@
 
 #: ../libpurple/protocols/jabber/chat.c:627
 msgid "Nick changing not supported in non-MUC chatrooms"
-msgstr ""
-"Die Änderung des Nick-Namens wird in nicht-MUC Chaträumen nicht unterstützt"
+msgstr "Die Änderung des Nick-Namens wird in nicht-MUC Chaträumen nicht unterstützt"
 
 #: ../libpurple/protocols/jabber/chat.c:678
 #: ../libpurple/protocols/jabber/chat.c:689
@@ -4617,7 +4647,7 @@
 msgstr "Registrierung erfolgreich"
 
 #: ../libpurple/protocols/jabber/jabber.c:653
-#: ../libpurple/protocols/jabber/jabber.c:1530
+#: ../libpurple/protocols/jabber/jabber.c:1524
 msgid "Unknown Error"
 msgstr "Unbekannter Fehler"
 
@@ -4632,8 +4662,8 @@
 msgstr "Schon registriert"
 
 #: ../libpurple/protocols/jabber/jabber.c:848
-#: ../libpurple/protocols/oscar/oscar.c:3803
-#: ../libpurple/protocols/oscar/oscar.c:3816
+#: ../libpurple/protocols/oscar/oscar.c:3804
+#: ../libpurple/protocols/oscar/oscar.c:3817
 msgid "State"
 msgstr "Provinz/Bundesland"
 
@@ -4667,358 +4697,362 @@
 msgstr "Registrierung eines neuen XMPP-Kontos"
 
 #. Register button
-#: ../libpurple/protocols/jabber/jabber.c:881 ../pidgin/gtkaccount.c:1526
+#: ../libpurple/protocols/jabber/jabber.c:881 ../pidgin/gtkaccount.c:1518
 msgid "Register"
 msgstr "Registrieren"
 
-#: ../libpurple/protocols/jabber/jabber.c:1052
+#: ../libpurple/protocols/jabber/jabber.c:1050
 msgid "Initializing Stream"
 msgstr "Initialisiere den Stream"
 
-#: ../libpurple/protocols/jabber/jabber.c:1057
+#: ../libpurple/protocols/jabber/jabber.c:1055
 #: ../libpurple/protocols/msn/session.c:351
 msgid "Authenticating"
 msgstr "Authentifizierung"
 
-#: ../libpurple/protocols/jabber/jabber.c:1066
+#: ../libpurple/protocols/jabber/jabber.c:1064
 msgid "Re-initializing Stream"
 msgstr "Initialisiere Stream nochmal"
 
-#: ../libpurple/protocols/jabber/jabber.c:1134
-#: ../libpurple/protocols/jabber/jabber.c:1508
-#: ../libpurple/protocols/jabber/jabber.c:1549
-#: ../libpurple/protocols/jabber/jabber.c:1585
+#: ../libpurple/protocols/jabber/jabber.c:1126
+#: ../libpurple/protocols/jabber/jabber.c:1502
+#: ../libpurple/protocols/jabber/jabber.c:1543
+#: ../libpurple/protocols/jabber/jabber.c:1579
 #: ../libpurple/protocols/oscar/oscar.c:826
-#: ../libpurple/protocols/oscar/oscar.c:5579
+#: ../libpurple/protocols/oscar/oscar.c:5581
 msgid "Not Authorized"
 msgstr "Nicht autorisiert"
 
-#: ../libpurple/protocols/jabber/jabber.c:1176
+#: ../libpurple/protocols/jabber/jabber.c:1168
 msgid "Both"
 msgstr "Beide"
 
-#: ../libpurple/protocols/jabber/jabber.c:1178
+#: ../libpurple/protocols/jabber/jabber.c:1170
 msgid "From (To pending)"
 msgstr "Von (zu den offenen)"
 
-#: ../libpurple/protocols/jabber/jabber.c:1183
+#: ../libpurple/protocols/jabber/jabber.c:1172
+msgid "From"
+msgstr "Von"
+
+#: ../libpurple/protocols/jabber/jabber.c:1175
 msgid "To"
 msgstr "Zu"
 
-#: ../libpurple/protocols/jabber/jabber.c:1185
+#: ../libpurple/protocols/jabber/jabber.c:1177
 msgid "None (To pending)"
 msgstr "Kein (zu den offenen)"
 
-#: ../libpurple/protocols/jabber/jabber.c:1187
+#: ../libpurple/protocols/jabber/jabber.c:1179
 #: ../pidgin/plugins/gevolution/eds-utils.c:73
 #: ../pidgin/plugins/gevolution/eds-utils.c:86
 msgid "None"
 msgstr "Kein"
 
-#: ../libpurple/protocols/jabber/jabber.c:1190
+#: ../libpurple/protocols/jabber/jabber.c:1182
 msgid "Subscription"
 msgstr "Abonnement"
 
-#: ../libpurple/protocols/jabber/jabber.c:1320
+#: ../libpurple/protocols/jabber/jabber.c:1312
 msgid "Password Changed"
 msgstr "Passwort geändert"
 
-#: ../libpurple/protocols/jabber/jabber.c:1321
+#: ../libpurple/protocols/jabber/jabber.c:1313
 msgid "Your password has been changed."
 msgstr "Ihr Passwort wurde geändert."
 
-#: ../libpurple/protocols/jabber/jabber.c:1325
-#: ../libpurple/protocols/jabber/jabber.c:1326
+#: ../libpurple/protocols/jabber/jabber.c:1317
+#: ../libpurple/protocols/jabber/jabber.c:1318
 msgid "Error changing password"
 msgstr "Fehler beim Ändern des Passworts"
 
-#: ../libpurple/protocols/jabber/jabber.c:1382
+#: ../libpurple/protocols/jabber/jabber.c:1375
 msgid "Password (again)"
 msgstr "Passwort (nochmal)"
 
-#: ../libpurple/protocols/jabber/jabber.c:1387
-#: ../libpurple/protocols/jabber/jabber.c:1388
+#: ../libpurple/protocols/jabber/jabber.c:1381
+#: ../libpurple/protocols/jabber/jabber.c:1382
 msgid "Change XMPP Password"
 msgstr "XMPP-Passwort ändern"
 
-#: ../libpurple/protocols/jabber/jabber.c:1388
+#: ../libpurple/protocols/jabber/jabber.c:1382
 msgid "Please enter your new password"
 msgstr "Bitte geben Sie Ihr neues Passwort ein"
 
-#: ../libpurple/protocols/jabber/jabber.c:1400
-#: ../libpurple/protocols/oscar/oscar.c:6365
+#: ../libpurple/protocols/jabber/jabber.c:1394
+#: ../libpurple/protocols/oscar/oscar.c:6367
 #: ../libpurple/protocols/silc/silc.c:1093
 #: ../libpurple/protocols/silc10/silc.c:1004
 msgid "Set User Info..."
 msgstr "Benutzer-Info setzen..."
 
 #. if (js->protocol_options & CHANGE_PASSWORD) {
-#: ../libpurple/protocols/jabber/jabber.c:1405
-#: ../libpurple/protocols/oscar/oscar.c:6376
+#: ../libpurple/protocols/jabber/jabber.c:1399
+#: ../libpurple/protocols/oscar/oscar.c:6378
 #: ../libpurple/protocols/silc/silc.c:1089
 #: ../libpurple/protocols/silc10/silc.c:1000
 msgid "Change Password..."
 msgstr "Passwort ändern..."
 
 #. }
-#: ../libpurple/protocols/jabber/jabber.c:1410
+#: ../libpurple/protocols/jabber/jabber.c:1404
 msgid "Search for Users..."
 msgstr "Suche nach Benutzern..."
 
+#: ../libpurple/protocols/jabber/jabber.c:1482
+msgid "Bad Request"
+msgstr "Falsche Anfrage"
+
+#: ../libpurple/protocols/jabber/jabber.c:1484
+msgid "Conflict"
+msgstr "Konflikt"
+
+#: ../libpurple/protocols/jabber/jabber.c:1486
+msgid "Feature Not Implemented"
+msgstr "Feature nicht implementiert"
+
 #: ../libpurple/protocols/jabber/jabber.c:1488
-msgid "Bad Request"
-msgstr "Falsche Anfrage"
+msgid "Forbidden"
+msgstr "Verboten"
 
 #: ../libpurple/protocols/jabber/jabber.c:1490
-msgid "Conflict"
-msgstr "Konflikt"
+msgid "Gone"
+msgstr "Gegangen"
 
 #: ../libpurple/protocols/jabber/jabber.c:1492
-msgid "Feature Not Implemented"
-msgstr "Feature nicht implementiert"
-
-#: ../libpurple/protocols/jabber/jabber.c:1494
-msgid "Forbidden"
-msgstr "Verboten"
-
-#: ../libpurple/protocols/jabber/jabber.c:1496
-msgid "Gone"
-msgstr "Gegangen"
-
-#: ../libpurple/protocols/jabber/jabber.c:1498
-#: ../libpurple/protocols/jabber/jabber.c:1575
+#: ../libpurple/protocols/jabber/jabber.c:1569
 msgid "Internal Server Error"
 msgstr "Interner Server-Fehler"
 
-#: ../libpurple/protocols/jabber/jabber.c:1500
+#: ../libpurple/protocols/jabber/jabber.c:1494
 msgid "Item Not Found"
 msgstr "Eintrag nicht gefunden"
 
-#: ../libpurple/protocols/jabber/jabber.c:1502
+#: ../libpurple/protocols/jabber/jabber.c:1496
 msgid "Malformed XMPP ID"
 msgstr "Falsche XMPP-ID"
 
-#: ../libpurple/protocols/jabber/jabber.c:1504
+#: ../libpurple/protocols/jabber/jabber.c:1498
 msgid "Not Acceptable"
 msgstr "Nicht akzeptabel"
 
-#: ../libpurple/protocols/jabber/jabber.c:1506
+#: ../libpurple/protocols/jabber/jabber.c:1500
 msgid "Not Allowed"
 msgstr "Nicht erlaubt"
 
-#: ../libpurple/protocols/jabber/jabber.c:1510
+#: ../libpurple/protocols/jabber/jabber.c:1504
 msgid "Payment Required"
 msgstr "Bezahlung erforderlich"
 
-#: ../libpurple/protocols/jabber/jabber.c:1512
+#: ../libpurple/protocols/jabber/jabber.c:1506
 msgid "Recipient Unavailable"
 msgstr "Empfänger nicht verfügbar"
 
-#: ../libpurple/protocols/jabber/jabber.c:1516
+#: ../libpurple/protocols/jabber/jabber.c:1510
 msgid "Registration Required"
 msgstr "Registrierung erforderlich"
 
-#: ../libpurple/protocols/jabber/jabber.c:1518
+#: ../libpurple/protocols/jabber/jabber.c:1512
 msgid "Remote Server Not Found"
 msgstr "Remote-Server nicht gefunden"
 
-#: ../libpurple/protocols/jabber/jabber.c:1520
+#: ../libpurple/protocols/jabber/jabber.c:1514
 msgid "Remote Server Timeout"
 msgstr "Zeitüberschreitung beim Remote-Server"
 
-#: ../libpurple/protocols/jabber/jabber.c:1522
+#: ../libpurple/protocols/jabber/jabber.c:1516
 msgid "Server Overloaded"
 msgstr "Server überlastet"
 
-#: ../libpurple/protocols/jabber/jabber.c:1524
+#: ../libpurple/protocols/jabber/jabber.c:1518
 msgid "Service Unavailable"
 msgstr "Dienst nicht erreichbar"
 
-#: ../libpurple/protocols/jabber/jabber.c:1526
+#: ../libpurple/protocols/jabber/jabber.c:1520
 msgid "Subscription Required"
 msgstr "Abonnement erforderlich"
 
-#: ../libpurple/protocols/jabber/jabber.c:1528
+#: ../libpurple/protocols/jabber/jabber.c:1522
 msgid "Unexpected Request"
 msgstr "Unerwartete Anfrage"
 
-#: ../libpurple/protocols/jabber/jabber.c:1535
+#: ../libpurple/protocols/jabber/jabber.c:1529
 msgid "Authorization Aborted"
 msgstr "Autorisierung abgebrochen"
 
-#: ../libpurple/protocols/jabber/jabber.c:1537
+#: ../libpurple/protocols/jabber/jabber.c:1531
 msgid "Incorrect encoding in authorization"
 msgstr "Falsche Kodierung in der Autorisierung"
 
-#: ../libpurple/protocols/jabber/jabber.c:1540
+#: ../libpurple/protocols/jabber/jabber.c:1534
 msgid "Invalid authzid"
 msgstr "Ungültige authzid"
 
-#: ../libpurple/protocols/jabber/jabber.c:1543
+#: ../libpurple/protocols/jabber/jabber.c:1537
 msgid "Invalid Authorization Mechanism"
 msgstr "Falscher Autorisierungsmechanismus"
 
-#: ../libpurple/protocols/jabber/jabber.c:1546
+#: ../libpurple/protocols/jabber/jabber.c:1540
 msgid "Authorization mechanism too weak"
 msgstr "Autorisierungsmechanismus zu schwach"
 
-#: ../libpurple/protocols/jabber/jabber.c:1551
+#: ../libpurple/protocols/jabber/jabber.c:1545
 msgid "Temporary Authentication Failure"
 msgstr "Temporärer Authentifizierungsfehler"
 
-#: ../libpurple/protocols/jabber/jabber.c:1554
+#: ../libpurple/protocols/jabber/jabber.c:1548
 msgid "Authentication Failure"
 msgstr "Authentifizierungsfehler"
 
-#: ../libpurple/protocols/jabber/jabber.c:1560
+#: ../libpurple/protocols/jabber/jabber.c:1554
 msgid "Bad Format"
 msgstr "Schlechtes Format"
 
-#: ../libpurple/protocols/jabber/jabber.c:1562
+#: ../libpurple/protocols/jabber/jabber.c:1556
 msgid "Bad Namespace Prefix"
 msgstr "Falsches Namensraum-Präfix"
 
-#: ../libpurple/protocols/jabber/jabber.c:1565
+#: ../libpurple/protocols/jabber/jabber.c:1559
 msgid "Resource Conflict"
 msgstr "Ressourcenkonflikt"
 
-#: ../libpurple/protocols/jabber/jabber.c:1567
+#: ../libpurple/protocols/jabber/jabber.c:1561
 #: ../libpurple/protocols/silc/silc.c:244
 #: ../libpurple/protocols/silc10/ops.c:1720
 msgid "Connection Timeout"
 msgstr "Verbindungsabbruch wegen Zeitüberschreitung"
 
-#: ../libpurple/protocols/jabber/jabber.c:1569
+#: ../libpurple/protocols/jabber/jabber.c:1563
 msgid "Host Gone"
 msgstr "Server hat sich verabschiedet"
 
-#: ../libpurple/protocols/jabber/jabber.c:1571
+#: ../libpurple/protocols/jabber/jabber.c:1565
 msgid "Host Unknown"
 msgstr "Rechner unbekannt"
 
+#: ../libpurple/protocols/jabber/jabber.c:1567
+msgid "Improper Addressing"
+msgstr "Falsche Adressierung"
+
+#: ../libpurple/protocols/jabber/jabber.c:1571
+msgid "Invalid ID"
+msgstr "Ungültige ID"
+
 #: ../libpurple/protocols/jabber/jabber.c:1573
-msgid "Improper Addressing"
-msgstr "Falsche Adressierung"
-
-#: ../libpurple/protocols/jabber/jabber.c:1577
-msgid "Invalid ID"
-msgstr "Ungültige ID"
-
-#: ../libpurple/protocols/jabber/jabber.c:1579
 msgid "Invalid Namespace"
 msgstr "Ungültiger Namenraum"
 
-#: ../libpurple/protocols/jabber/jabber.c:1581
+#: ../libpurple/protocols/jabber/jabber.c:1575
 msgid "Invalid XML"
 msgstr "Ungültiges XML"
 
-#: ../libpurple/protocols/jabber/jabber.c:1583
+#: ../libpurple/protocols/jabber/jabber.c:1577
 msgid "Non-matching Hosts"
 msgstr "Nicht-passender Rechner"
 
-#: ../libpurple/protocols/jabber/jabber.c:1587
+#: ../libpurple/protocols/jabber/jabber.c:1581
 msgid "Policy Violation"
 msgstr "Richtlinien-Verletzung"
 
-#: ../libpurple/protocols/jabber/jabber.c:1589
+#: ../libpurple/protocols/jabber/jabber.c:1583
 msgid "Remote Connection Failed"
 msgstr "Entfernte Verbindung fehlgeschlagen"
 
-#: ../libpurple/protocols/jabber/jabber.c:1591
+#: ../libpurple/protocols/jabber/jabber.c:1585
 msgid "Resource Constraint"
 msgstr "Eingeschränkte Ressourcen"
 
-#: ../libpurple/protocols/jabber/jabber.c:1593
+#: ../libpurple/protocols/jabber/jabber.c:1587
 msgid "Restricted XML"
 msgstr "Eingeschränktes XML"
 
-#: ../libpurple/protocols/jabber/jabber.c:1595
+#: ../libpurple/protocols/jabber/jabber.c:1589
 msgid "See Other Host"
 msgstr "Siehe anderer Rechner"
 
-#: ../libpurple/protocols/jabber/jabber.c:1597
+#: ../libpurple/protocols/jabber/jabber.c:1591
 msgid "System Shutdown"
 msgstr "Herunterfahren des Systems"
 
-#: ../libpurple/protocols/jabber/jabber.c:1599
+#: ../libpurple/protocols/jabber/jabber.c:1593
 msgid "Undefined Condition"
 msgstr "Undefinierte Bedingung"
 
-#: ../libpurple/protocols/jabber/jabber.c:1601
+#: ../libpurple/protocols/jabber/jabber.c:1595
 msgid "Unsupported Encoding"
 msgstr "Kodierung wird nicht unterstützt"
 
-#: ../libpurple/protocols/jabber/jabber.c:1603
+#: ../libpurple/protocols/jabber/jabber.c:1597
 msgid "Unsupported Stanza Type"
 msgstr "Nicht-unterstützter Blocktyp"
 
-#: ../libpurple/protocols/jabber/jabber.c:1605
+#: ../libpurple/protocols/jabber/jabber.c:1599
 msgid "Unsupported Version"
 msgstr "Nicht-unterstützte Version"
 
-#: ../libpurple/protocols/jabber/jabber.c:1607
+#: ../libpurple/protocols/jabber/jabber.c:1601
 msgid "XML Not Well Formed"
 msgstr "XML ist nicht „wohlgeformt“"
 
-#: ../libpurple/protocols/jabber/jabber.c:1609
+#: ../libpurple/protocols/jabber/jabber.c:1603
 msgid "Stream Error"
 msgstr "Stream-Fehler"
 
-#: ../libpurple/protocols/jabber/jabber.c:1676
+#: ../libpurple/protocols/jabber/jabber.c:1670
 #, c-format
 msgid "Unable to ban user %s"
 msgstr "Kann den Benutzer %s nicht verbannen"
 
-#: ../libpurple/protocols/jabber/jabber.c:1696
+#: ../libpurple/protocols/jabber/jabber.c:1690
 #, c-format
 msgid "Unknown affiliation: \"%s\""
 msgstr "Unbekannte Zugehörigkeit: „%s“"
 
-#: ../libpurple/protocols/jabber/jabber.c:1701
+#: ../libpurple/protocols/jabber/jabber.c:1695
 #, c-format
 msgid "Unable to affiliate user %s as \"%s\""
 msgstr "Kann den Benutzer %s nicht zu „%s“ zuordnen"
 
-#: ../libpurple/protocols/jabber/jabber.c:1720
+#: ../libpurple/protocols/jabber/jabber.c:1714
 #, c-format
 msgid "Unknown role: \"%s\""
 msgstr "Unbekannte Rolle: „%s“"
 
-#: ../libpurple/protocols/jabber/jabber.c:1727
+#: ../libpurple/protocols/jabber/jabber.c:1721
 #, 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:1780
+#: ../libpurple/protocols/jabber/jabber.c:1774
 #, c-format
 msgid "Unable to kick user %s"
 msgstr "Kann den Benutzer %s nicht herauswerfen"
 
-#: ../libpurple/protocols/jabber/jabber.c:1811
+#: ../libpurple/protocols/jabber/jabber.c:1805
 msgid "config:  Configure a chat room."
 msgstr "config:  Konfiguriere einen Chatraum."
 
-#: ../libpurple/protocols/jabber/jabber.c:1815
+#: ../libpurple/protocols/jabber/jabber.c:1809
 msgid "configure:  Configure a chat room."
 msgstr "configure:  Konfiguriere einen Chatraum."
 
-#: ../libpurple/protocols/jabber/jabber.c:1824
+#: ../libpurple/protocols/jabber/jabber.c:1818
 msgid "part [room]:  Leave the room."
 msgstr "part [Raum]:  Verlasse den Raum."
 
+#: ../libpurple/protocols/jabber/jabber.c:1823
+msgid "register:  Register with a chat room."
+msgstr "register:  Für einen Chatraum anmelden."
+
 #: ../libpurple/protocols/jabber/jabber.c:1829
-msgid "register:  Register with a chat room."
-msgstr "register:  Für einen Chatraum anmelden."
-
-#: ../libpurple/protocols/jabber/jabber.c:1835
 msgid "topic [new topic]:  View or change the topic."
 msgstr "topic [neues Thema]:  Thema ändern oder anzeigen."
 
-#: ../libpurple/protocols/jabber/jabber.c:1841
+#: ../libpurple/protocols/jabber/jabber.c:1835
 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:1847
+#: ../libpurple/protocols/jabber/jabber.c:1841
 msgid ""
 "affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Set a user's "
 "affiliation with the room."
@@ -5026,7 +5060,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:1853
+#: ../libpurple/protocols/jabber/jabber.c:1847
 msgid ""
 "role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: Set a user's "
 "role in the room."
@@ -5034,22 +5068,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:1859
+#: ../libpurple/protocols/jabber/jabber.c:1853
 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:1865
+msgstr "invite &lt;Benutzer&gt; [Nachricht]:  Lade einen Benutzer in den Raum ein."
+
+#: ../libpurple/protocols/jabber/jabber.c:1859
 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:1871
+#: ../libpurple/protocols/jabber/jabber.c:1865
 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:1876
-msgid ""
-"msg &lt;user&gt; &lt;message&gt;:  Send a private message to another user."
+#: ../libpurple/protocols/jabber/jabber.c:1870
+msgid "msg &lt;user&gt; &lt;message&gt;:  Send a private message to another user."
 msgstr ""
 "msg &lt;Benutzer&gt; &lt;Nachricht&gt;:  Sendet eine private Nachricht an "
 "einen anderen Benutzer."
@@ -5064,33 +5096,33 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/jabber/libxmpp.c:166
-#: ../libpurple/protocols/jabber/libxmpp.c:168
+#: ../libpurple/protocols/jabber/libxmpp.c:169
+#: ../libpurple/protocols/jabber/libxmpp.c:171
 msgid "XMPP Protocol Plugin"
 msgstr "XMPP-Protokoll-Plugin"
 
 #. Translators: 'domain' is used here in the context of Internet domains, e.g. pidgin.im
-#: ../libpurple/protocols/jabber/libxmpp.c:195 ../pidgin/gtkaccount.c:505
+#: ../libpurple/protocols/jabber/libxmpp.c:198 ../pidgin/gtkaccount.c:508
 msgid "Domain"
 msgstr "Domain"
 
-#: ../libpurple/protocols/jabber/libxmpp.c:201
+#: ../libpurple/protocols/jabber/libxmpp.c:206
 msgid "Force old (port 5223) SSL"
 msgstr "Erzwinge altes SSL (Port 5223)"
 
-#: ../libpurple/protocols/jabber/libxmpp.c:206
+#: ../libpurple/protocols/jabber/libxmpp.c:211
 msgid "Allow plaintext auth over unencrypted streams"
 msgstr "Erlaube Klartext-Authentifikation über einen unverschlüsselten Kanal"
 
-#: ../libpurple/protocols/jabber/libxmpp.c:211
+#: ../libpurple/protocols/jabber/libxmpp.c:216
 #: ../libpurple/protocols/simple/simple.c:1856
 msgid "Connect port"
 msgstr "Verbindungsport"
 
 #. Account options
-#: ../libpurple/protocols/jabber/libxmpp.c:215
-#: ../libpurple/protocols/silc/silc.c:1913
-#: ../libpurple/protocols/silc10/silc.c:1855 ../pidgin/gtkaccount.c:835
+#: ../libpurple/protocols/jabber/libxmpp.c:220
+#: ../libpurple/protocols/silc/silc.c:1914
+#: ../libpurple/protocols/silc10/silc.c:1857 ../pidgin/gtkaccount.c:837
 msgid "Connect server"
 msgstr "Verbindungsserver"
 
@@ -5132,16 +5164,16 @@
 msgid "XML Parse error"
 msgstr "Fehler bei Einlesen von XML-Daten"
 
-#: ../libpurple/protocols/jabber/presence.c:279
+#: ../libpurple/protocols/jabber/presence.c:290
 msgid "Unknown Error in presence"
 msgstr "Unbekannter Fehlercode"
 
-#: ../libpurple/protocols/jabber/presence.c:353
-#: ../libpurple/protocols/jabber/presence.c:354
+#: ../libpurple/protocols/jabber/presence.c:364
+#: ../libpurple/protocols/jabber/presence.c:365
 msgid "Create New Room"
 msgstr "Einen neuen Chat-Raum erstellen"
 
-#: ../libpurple/protocols/jabber/presence.c:355
+#: ../libpurple/protocols/jabber/presence.c:366
 msgid ""
 "You are creating a new room.  Would you like to configure it, or accept the "
 "default settings?"
@@ -5149,20 +5181,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:372
 msgid "_Configure Room"
 msgstr "Raum _konfigurieren"
 
-#: ../libpurple/protocols/jabber/presence.c:362
+#: ../libpurple/protocols/jabber/presence.c:373
 msgid "_Accept Defaults"
 msgstr "Standards _akzeptieren"
 
-#: ../libpurple/protocols/jabber/presence.c:398
+#: ../libpurple/protocols/jabber/presence.c:409
 #, c-format
 msgid "Error in chat %s"
 msgstr "Fehler im Chat %s"
 
-#: ../libpurple/protocols/jabber/presence.c:401
+#: ../libpurple/protocols/jabber/presence.c:412
 #, c-format
 msgid "Error joining chat %s"
 msgstr "Fehler beim Betreten des Chats %s"
@@ -5193,14 +5225,12 @@
 #: ../libpurple/protocols/jabber/si.c:836
 #, c-format
 msgid "Unable to send file to %s, not subscribed to user presence"
-msgstr ""
-"Kann die Datei nicht an %s senden, Anwesenheit des Benutzers nicht abonniert"
+msgstr "Kann die Datei nicht an %s senden, Anwesenheit des Benutzers nicht abonniert"
 
 #: ../libpurple/protocols/jabber/si.c:851
 #, c-format
 msgid "Please select which resource of %s you would like to send a file to"
-msgstr ""
-"Bitte wählen Sie, welcher Ressource von %s Sie eine Datei schicken möchten"
+msgstr "Bitte wählen Sie, welcher Ressource von %s Sie eine Datei schicken möchten"
 
 #: ../libpurple/protocols/jabber/si.c:867
 msgid "Select a Resource"
@@ -5308,8 +5338,7 @@
 
 #: ../libpurple/protocols/msn/error.c:103
 msgid "Tried to add a user to a group that doesn't exist"
-msgstr ""
-"Versuchte einen Benutzer zu einer nichtexistierenden Gruppe hinzuzufügen"
+msgstr "Versuchte einen Benutzer zu einer nichtexistierenden Gruppe hinzuzufügen"
 
 #: ../libpurple/protocols/msn/error.c:107
 msgid "Switchboard failed"
@@ -5607,12 +5636,12 @@
 msgstr "Fehler beim Empfangen des Profils"
 
 #: ../libpurple/protocols/msn/msn.c:1550 ../pidgin/plugins/convcolors.c:309
-#: ../pidgin/plugins/pidginrc.c:448
+#: ../pidgin/plugins/pidginrc.c:366
 msgid "General"
 msgstr "Allgemein"
 
 #: ../libpurple/protocols/msn/msn.c:1557
-#: ../libpurple/protocols/oscar/oscar.c:3768
+#: ../libpurple/protocols/oscar/oscar.c:3769
 #: ../libpurple/protocols/qq/buddy_info.c:45
 #: ../libpurple/protocols/qq/qq.c:219
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1057
@@ -5708,7 +5737,7 @@
 msgstr "Telefon 2 (privat)"
 
 #: ../libpurple/protocols/msn/msn.c:1622
-#: ../libpurple/protocols/oscar/oscar.c:3806
+#: ../libpurple/protocols/oscar/oscar.c:3807
 msgid "Home Address"
 msgstr "Privatadresse"
 
@@ -5744,7 +5773,7 @@
 msgstr "Beruf"
 
 #: ../libpurple/protocols/msn/msn.c:1647
-#: ../libpurple/protocols/oscar/oscar.c:3827
+#: ../libpurple/protocols/oscar/oscar.c:3828
 msgid "Company"
 msgstr "Firma"
 
@@ -5766,7 +5795,7 @@
 msgstr "Telefon 2 (geschäftlich)"
 
 #: ../libpurple/protocols/msn/msn.c:1652
-#: ../libpurple/protocols/oscar/oscar.c:3819
+#: ../libpurple/protocols/oscar/oscar.c:3820
 msgid "Work Address"
 msgstr "Adresse (geschäftlich)"
 
@@ -5878,8 +5907,8 @@
 #: ../libpurple/protocols/qq/udp_proxy_s5.c:268
 #: ../libpurple/protocols/qq/udp_proxy_s5.c:302
 #: ../libpurple/protocols/qq/udp_proxy_s5.c:332
-#: ../libpurple/protocols/yahoo/yahoochat.c:1357
-#: ../libpurple/protocols/yahoo/yahoochat.c:1383
+#: ../libpurple/protocols/yahoo/yahoochat.c:1320
+#: ../libpurple/protocols/yahoo/yahoochat.c:1346
 msgid "Unable to connect"
 msgstr "Verbindung nicht möglich"
 
@@ -5993,7 +6022,7 @@
 msgstr "Fehler beim Verarbeiten von HTTP."
 
 #: ../libpurple/protocols/msn/session.c:307
-#: ../libpurple/protocols/oscar/oscar.c:3480
+#: ../libpurple/protocols/oscar/oscar.c:3481
 #: ../libpurple/protocols/yahoo/yahoo.c:202
 msgid "You have signed on from another location."
 msgstr "Sie haben sich von einem anderen Ort angemeldet."
@@ -6014,8 +6043,7 @@
 msgstr "Kann nicht authentifizieren: %s"
 
 #: ../libpurple/protocols/msn/session.c:325
-msgid ""
-"Your MSN buddy list is temporarily unavailable. Please wait and try again."
+msgid "Your MSN buddy list is temporarily unavailable. Please wait and try again."
 msgstr ""
 "Ihre MSN-Buddy-Liste ist temporär nicht verfügbar. Bitte warten Sie und "
 "versuchen Sie es später nochmal."
@@ -6081,7 +6109,7 @@
 
 #: ../libpurple/protocols/msn/switchboard.c:424
 msgid ""
-"Message could not be sent because we wer unable to establish a session with "
+"Message could not be sent because we were unable to establish a session with "
 "the server. This is likely a server problem, try again in a few minutes:"
 msgstr ""
 "Nachricht konnte nicht gesendet werden, da keine Verbindung mit dem Server "
@@ -6089,8 +6117,7 @@
 "versuchen Sie es in ein paar Minuten erneut:"
 
 #: ../libpurple/protocols/msn/switchboard.c:431
-msgid ""
-"Message could not be sent because an error with the switchboard occurred:"
+msgid "Message could not be sent because an error with the switchboard occurred:"
 msgstr ""
 "Nachricht konnte nicht gesendet werden, da ein Fehler mit dem Switchboard "
 "aufgetreten ist:"
@@ -6211,8 +6238,7 @@
 msgid ""
 "Your account has been disabled because too many incorrect passwords were "
 "entered"
-msgstr ""
-"Ihr Konto wurde wegen zu vielen falsch eingegebenen Passworten gesperrt"
+msgstr "Ihr Konto wurde wegen zu vielen falsch eingegebenen Passworten gesperrt"
 
 #: ../libpurple/protocols/novell/nmuser.c:1931
 msgid "You cannot add the same person twice to a conversation"
@@ -6242,8 +6268,7 @@
 msgid ""
 "This evaluation version does not allow more than ten users to log in at one "
 "time"
-msgstr ""
-"Diese Evaluationsversion erlaubt nicht mehr als 10 Benutzer gleichzeitig"
+msgstr "Diese Evaluationsversion erlaubt nicht mehr als 10 Benutzer gleichzeitig"
 
 #: ../libpurple/protocols/novell/nmuser.c:1953
 msgid "The user is either offline or you are blocked"
@@ -6293,8 +6318,7 @@
 #: ../libpurple/protocols/novell/novell.c:537
 #, c-format
 msgid "Unable to send message. Could not create the conference (%s)."
-msgstr ""
-"Kann die Nachricht nicht senden. Kann die Konferenz nicht erstellen (%s)."
+msgstr "Kann die Nachricht nicht senden. Kann die Konferenz nicht erstellen (%s)."
 
 #: ../libpurple/protocols/novell/novell.c:584
 #, c-format
@@ -6344,8 +6368,7 @@
 #: ../libpurple/protocols/novell/novell.c:1647
 #, c-format
 msgid "Unable to change server side privacy settings (%s)."
-msgstr ""
-"Kann die serverseitigen Einstellungen zur Privatsphäre nicht ändern (%s)."
+msgstr "Kann die serverseitigen Einstellungen zur Privatsphäre nicht ändern (%s)."
 
 #: ../libpurple/protocols/novell/novell.c:1012
 #, c-format
@@ -6438,8 +6461,7 @@
 
 #: ../libpurple/protocols/novell/novell.c:2069
 #, c-format
-msgid ""
-"%s appears to be offline and did not receive the message that you just sent."
+msgid "%s appears to be offline and did not receive the message that you just sent."
 msgstr ""
 "%s scheint offline zu sein und hat die Nachricht, die Sie gerade gesendet "
 "haben, nicht empfangen."
@@ -6569,13 +6591,11 @@
 
 #: ../libpurple/protocols/oscar/odc.c:47
 msgid "Received invalid data on connection with remote user."
-msgstr ""
-"Ungültige Daten in der Verbindung mit dem entfernten Benutzer empfangen."
+msgstr "Ungültige Daten in der Verbindung mit dem entfernten Benutzer empfangen."
 
 #: ../libpurple/protocols/oscar/odc.c:49
 msgid "Could not establish a connection with the remote user."
-msgstr ""
-"Die Verbindung mit dem entfernten Benutzer konnte nicht hergestellt werden."
+msgstr "Die Verbindung mit dem entfernten Benutzer konnte nicht hergestellt werden."
 
 #: ../libpurple/protocols/oscar/odc.c:560
 msgid "Direct IM established"
@@ -6705,9 +6725,9 @@
 "Client.)"
 
 #. Label
-#: ../libpurple/protocols/oscar/oscar.c:639 ../pidgin/gtkutils.c:2310
-#: ../pidgin/gtkutils.c:2340
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:338
+#: ../libpurple/protocols/oscar/oscar.c:639 ../pidgin/gtkutils.c:2353
+#: ../pidgin/gtkutils.c:2383
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:334
 msgid "Buddy Icon"
 msgstr "Buddy-Icon"
 
@@ -6728,7 +6748,7 @@
 msgstr "Chat"
 
 #: ../libpurple/protocols/oscar/oscar.c:651
-#: ../libpurple/protocols/oscar/oscar.c:5987
+#: ../libpurple/protocols/oscar/oscar.c:5989
 msgid "Get File"
 msgstr "Datei abrufen"
 
@@ -6801,17 +6821,17 @@
 msgstr "Kamera"
 
 #: ../libpurple/protocols/oscar/oscar.c:725
-#: ../libpurple/protocols/oscar/oscar.c:5757
+#: ../libpurple/protocols/oscar/oscar.c:5759
 msgid "Free For Chat"
 msgstr "Bereit zum Chatten"
 
 #: ../libpurple/protocols/oscar/oscar.c:729
-#: ../libpurple/protocols/oscar/oscar.c:5792
+#: ../libpurple/protocols/oscar/oscar.c:5794
 msgid "Not Available"
 msgstr "Nicht verfügbar"
 
 #: ../libpurple/protocols/oscar/oscar.c:731
-#: ../libpurple/protocols/oscar/oscar.c:5778
+#: ../libpurple/protocols/oscar/oscar.c:5780
 msgid "Occupied"
 msgstr "Beschäftigt"
 
@@ -6821,7 +6841,7 @@
 
 #: ../libpurple/protocols/oscar/oscar.c:737 ../libpurple/protocols/qq/qq.c:183
 #: ../libpurple/protocols/yahoo/yahoo.c:2913 ../libpurple/status.c:156
-#: ../pidgin/gtkdocklet.c:446 ../pidgin/gtkstatusbox.c:1053
+#: ../pidgin/gtkdocklet.c:446 ../pidgin/gtkstatusbox.c:1058
 msgid "Invisible"
 msgstr "Unsichtbar"
 
@@ -6830,13 +6850,13 @@
 msgstr "Online"
 
 #: ../libpurple/protocols/oscar/oscar.c:838
-#: ../libpurple/protocols/oscar/oscar.c:3720
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:697 ../pidgin/gtkprefs.c:1052
+#: ../libpurple/protocols/oscar/oscar.c:3721
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:697 ../pidgin/gtkprefs.c:1121
 msgid "IP Address"
 msgstr "IP-Adresse"
 
 #: ../libpurple/protocols/oscar/oscar.c:845
-#: ../libpurple/protocols/oscar/oscar.c:2866
+#: ../libpurple/protocols/oscar/oscar.c:2867
 msgid "Warning Level"
 msgstr "Warnstufe"
 
@@ -6879,13 +6899,13 @@
 #, c-format
 msgid ""
 "Unable to login: Could not sign on as %s because the screen name is "
-"invalid.  Screen names must either start with a letter and contain only "
-"letters, numbers and spaces, or contain only numbers."
+"invalid.  Screen names must be a valid email address, or start with a letter "
+"and contain only letters, numbers and spaces, or contain only numbers."
 msgstr ""
 "Anmeldung fehlgeschlagen: Sie konnten nicht als %s angemeldet werden, da der "
-"Benutzername fehlerhaft ist.  Benutzernamen können entweder mit einem "
-"Buchstaben beginnen und können dann Buchstaben, Ziffern und Leerzeichen "
-"enthalten oder sie bestehen nur aus Ziffern."
+"Benutzername fehlerhaft ist.  Benutzernamen müssen gültige E-Mail-Adressen "
+"sein oder mit einem Buchstaben beginnen und nur Buchstaben, Ziffern und "
+"Leerzeichen enthalten oder nur aus Ziffern bestehen."
 
 #: ../libpurple/protocols/oscar/oscar.c:1346
 #: ../libpurple/protocols/yahoo/yahoo.c:1934
@@ -6921,8 +6941,7 @@
 #: ../libpurple/protocols/oscar/oscar.c:1372
 #, 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"
+msgstr "Die Client-Version, die Sie nutzen ist zu alt. Bitte updaten Sie unter %s"
 
 #: ../libpurple/protocols/oscar/oscar.c:1412
 msgid "Could Not Connect"
@@ -6950,8 +6969,8 @@
 #: ../libpurple/protocols/oscar/oscar.c:1457
 #: ../libpurple/protocols/oscar/oscar.c:2250
 #: ../libpurple/protocols/oscar/oscar.c:2297
-#: ../libpurple/protocols/oscar/oscar.c:5862
-#: ../libpurple/protocols/oscar/oscar.c:6143 ../libpurple/request.h:1387
+#: ../libpurple/protocols/oscar/oscar.c:5864
+#: ../libpurple/protocols/oscar/oscar.c:6145 ../libpurple/request.h:1387
 msgid "_OK"
 msgstr "_OK"
 
@@ -6973,8 +6992,7 @@
 #: ../libpurple/protocols/oscar/oscar.c:1627
 #, 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."
+msgstr "Sie wurden in kurzer Zeit abgemeldet.  Überprüfen Sie %s wegen Updates."
 
 #: ../libpurple/protocols/oscar/oscar.c:1630
 msgid "Unable to get a valid login hash."
@@ -7005,7 +7023,7 @@
 #: ../libpurple/protocols/oscar/oscar.c:2289
 #: ../libpurple/protocols/oscar/oscar.c:2296
 #: ../libpurple/protocols/oscar/oscar.c:2423
-#: ../libpurple/protocols/oscar/oscar.c:5240
+#: ../libpurple/protocols/oscar/oscar.c:5242
 #: ../libpurple/protocols/yahoo/yahoo.c:987
 msgid "No reason given."
 msgstr "Kein Grund angegeben."
@@ -7098,23 +7116,19 @@
 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] "Sie haben %hu Nachricht von %s nicht erhalten, da sie ungültig war."
-msgstr[1] ""
-"Sie haben %hu Nachrichten von %s nicht erhalten, da sie ungültig waren."
+msgstr[1] "Sie haben %hu Nachrichten von %s nicht erhalten, da sie ungültig waren."
 
 #: ../libpurple/protocols/oscar/oscar.c:2581
 #, 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] "Sie haben %hu Nachricht von %s nicht erhalten, da sie zu groß war."
-msgstr[1] ""
-"Sie haben %hu Nachrichten von %s nicht erhalten, da sie zu groß waren."
+msgstr[1] "Sie haben %hu Nachrichten von %s nicht erhalten, da sie zu groß waren."
 
 #: ../libpurple/protocols/oscar/oscar.c:2590
 #, c-format
-msgid ""
-"You missed %hu message from %s because the rate limit has been exceeded."
-msgid_plural ""
-"You missed %hu messages from %s because the rate limit has been exceeded."
+msgid "You missed %hu message from %s because the rate limit has been exceeded."
+msgid_plural "You missed %hu messages from %s because the rate limit has been exceeded."
 msgstr[0] ""
 "Sie haben %hu Nachricht von %s nicht erhalten, da die Senderate "
 "überschritten wurde."
@@ -7126,28 +7140,22 @@
 #, 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] ""
-"Sie haben %hu Nachricht von %s nicht erhalten, da er/sie zu boshaft war."
-msgstr[1] ""
-"Sie haben %hu Nachrichten von %s nicht erhalten,/sie zu boshaft war."
+msgstr[0] "Sie haben %hu Nachricht von %s nicht erhalten, da er/sie zu boshaft war."
+msgstr[1] "Sie haben %hu Nachrichten von %s nicht erhalten,/sie zu boshaft war."
 
 #: ../libpurple/protocols/oscar/oscar.c:2608
 #, 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] ""
-"Sie haben %hu Nachricht von %s nicht erhalten, da Sie zu boshaft sind."
-msgstr[1] ""
-"Sie haben %hu Nachrichten von %s nicht erhalten, da Sie zu boshaft sind."
+msgstr[0] "Sie haben %hu Nachricht von %s nicht erhalten, da Sie zu boshaft sind."
+msgstr[1] "Sie haben %hu Nachrichten von %s nicht erhalten, da Sie zu boshaft sind."
 
 #: ../libpurple/protocols/oscar/oscar.c:2617
 #, c-format
 msgid "You missed %hu message from %s for an unknown reason."
 msgid_plural "You missed %hu messages from %s for an unknown reason."
-msgstr[0] ""
-"Sie haben %hu Nachricht von %s aus unbekannten Gründen nicht erhalten."
-msgstr[1] ""
-"Sie haben %hu Nachrichten von %s aus unbekannten Gründen nicht erhalten."
+msgstr[0] "Sie haben %hu Nachricht von %s aus unbekannten Gründen nicht erhalten."
+msgstr[1] "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:2772
@@ -7157,8 +7165,7 @@
 
 #: ../libpurple/protocols/oscar/oscar.c:2772
 #: ../libpurple/protocols/oscar/oscar.c:2777
-#: ../libpurple/protocols/oscar/oscar.c:2839
-#: ../libpurple/protocols/oscar/oscar.c:2843
+#: ../libpurple/protocols/oscar/oscar.c:2841
 msgid "Unknown reason."
 msgstr "Unbekannter Grund."
 
@@ -7168,43 +7175,38 @@
 msgid "Unable to send message to %s:"
 msgstr "Kann die Nachricht an %s nicht senden:"
 
-#: ../libpurple/protocols/oscar/oscar.c:2839
+#: ../libpurple/protocols/oscar/oscar.c:2841
 #, c-format
 msgid "User information not available: %s"
 msgstr "Benutzerinformation nicht verfügbar: %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2842
-#, c-format
-msgid "User information for %s unavailable:"
-msgstr "Benutzerinformation für %s nicht verfügbar:"
-
-#: ../libpurple/protocols/oscar/oscar.c:2871
+#: ../libpurple/protocols/oscar/oscar.c:2872
 msgid "Online Since"
 msgstr "Online seit"
 
-#: ../libpurple/protocols/oscar/oscar.c:2876
+#: ../libpurple/protocols/oscar/oscar.c:2877
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1161
 msgid "Member Since"
 msgstr "Mitglied seit"
 
-#: ../libpurple/protocols/oscar/oscar.c:2881
+#: ../libpurple/protocols/oscar/oscar.c:2882
 msgid "Capabilities"
 msgstr "Fähigkeiten"
 
-#: ../libpurple/protocols/oscar/oscar.c:2911
+#: ../libpurple/protocols/oscar/oscar.c:2912
 msgid "Available Message"
 msgstr "Verfügbarkeitsnachricht"
 
-#: ../libpurple/protocols/oscar/oscar.c:2939
+#: ../libpurple/protocols/oscar/oscar.c:2940
 msgid "Profile"
 msgstr "Profil"
 
-#: ../libpurple/protocols/oscar/oscar.c:3019
+#: ../libpurple/protocols/oscar/oscar.c:3020
 msgid "Your AIM connection may be lost."
 msgstr "Ihre AIM-Verbindung könnte unterbrochen sein."
 
 #. The conversion failed!
-#: ../libpurple/protocols/oscar/oscar.c:3207
+#: ../libpurple/protocols/oscar/oscar.c:3208
 msgid ""
 "[Unable to display a message from this user because it contained invalid "
 "characters.]"
@@ -7212,7 +7214,7 @@
 "[Kann die Nachricht von diesem Benutzer nicht anzeigen, da sie ungültige "
 "Zeichen enthält.]"
 
-#: ../libpurple/protocols/oscar/oscar.c:3410
+#: ../libpurple/protocols/oscar/oscar.c:3411
 msgid ""
 "The last action you attempted could not be performed because you are over "
 "the rate limit. Please wait 10 seconds and try again."
@@ -7221,88 +7223,88 @@
 "Senderate überschritten wurde. Bitte warten Sie 10 Sekunden und versuchen "
 "Sie es erneut."
 
-#: ../libpurple/protocols/oscar/oscar.c:3482
+#: ../libpurple/protocols/oscar/oscar.c:3483
 msgid "You have been signed off for an unknown reason."
 msgstr "Sie wurden aus einem unbekannten Grund abgemeldet."
 
-#: ../libpurple/protocols/oscar/oscar.c:3495
+#: ../libpurple/protocols/oscar/oscar.c:3496
 #: ../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:3742
+#: ../libpurple/protocols/oscar/oscar.c:3743
 #: ../libpurple/protocols/silc/util.c:585
 #: ../libpurple/protocols/silc10/util.c:581
 msgid "Mobile Phone"
 msgstr "Handynummer"
 
-#: ../libpurple/protocols/oscar/oscar.c:3772
+#: ../libpurple/protocols/oscar/oscar.c:3773
 msgid "Personal Web Page"
 msgstr "Persönliche Webseite"
 
-#: ../libpurple/protocols/oscar/oscar.c:3796
+#: ../libpurple/protocols/oscar/oscar.c:3797
 #: ../libpurple/protocols/qq/buddy_info.c:40
 msgid "Additional Information"
 msgstr "Zusätzliche Informationen"
 
-#: ../libpurple/protocols/oscar/oscar.c:3804
-#: ../libpurple/protocols/oscar/oscar.c:3817
+#: ../libpurple/protocols/oscar/oscar.c:3805
+#: ../libpurple/protocols/oscar/oscar.c:3818
 msgid "Zip Code"
 msgstr "PLZ"
 
-#: ../libpurple/protocols/oscar/oscar.c:3828
+#: ../libpurple/protocols/oscar/oscar.c:3829
 msgid "Division"
 msgstr "Abteilung"
 
-#: ../libpurple/protocols/oscar/oscar.c:3829
+#: ../libpurple/protocols/oscar/oscar.c:3830
 msgid "Position"
 msgstr "Position"
 
-#: ../libpurple/protocols/oscar/oscar.c:3831
+#: ../libpurple/protocols/oscar/oscar.c:3832
 msgid "Web Page"
 msgstr "Webseite"
 
-#: ../libpurple/protocols/oscar/oscar.c:3834
+#: ../libpurple/protocols/oscar/oscar.c:3835
 msgid "Work Information"
 msgstr "Information (Arbeit)"
 
-#: ../libpurple/protocols/oscar/oscar.c:3890
+#: ../libpurple/protocols/oscar/oscar.c:3891
 msgid "Pop-Up Message"
 msgstr "Pop-Up Nachricht"
 
-#: ../libpurple/protocols/oscar/oscar.c:3930
+#: ../libpurple/protocols/oscar/oscar.c:3931
 #, 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:3935
+#: ../libpurple/protocols/oscar/oscar.c:3936
 msgid "Screen name"
 msgstr "Benutzername"
 
-#: ../libpurple/protocols/oscar/oscar.c:3961
+#: ../libpurple/protocols/oscar/oscar.c:3962
 #, 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:3982
+#: ../libpurple/protocols/oscar/oscar.c:3983
 #, 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:3984
+#: ../libpurple/protocols/oscar/oscar.c:3985
 msgid "Account Confirmation Requested"
 msgstr "Kontobestätigung wurde angefragt"
 
-#: ../libpurple/protocols/oscar/oscar.c:4015
+#: ../libpurple/protocols/oscar/oscar.c:4016
 msgid "Error Changing Account Info"
 msgstr "Fehler beim Ändern der Konten-Information"
 
-#: ../libpurple/protocols/oscar/oscar.c:4018
+#: ../libpurple/protocols/oscar/oscar.c:4019
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
@@ -7311,14 +7313,14 @@
 "Fehler 0x%04x: Kann den Benutzernamen nicht formatieren, weil der Name vom "
 "Original abweicht."
 
-#: ../libpurple/protocols/oscar/oscar.c:4021
+#: ../libpurple/protocols/oscar/oscar.c:4022
 #, 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:4024
+#: ../libpurple/protocols/oscar/oscar.c:4025
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
@@ -7327,7 +7329,7 @@
 "Fehler 0x%04x: Kann den Benutzernamen nicht formatieren, weil der Name zu "
 "lang ist."
 
-#: ../libpurple/protocols/oscar/oscar.c:4027
+#: ../libpurple/protocols/oscar/oscar.c:4028
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change e-mail address because there is already a "
@@ -7336,7 +7338,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:4030
+#: ../libpurple/protocols/oscar/oscar.c:4031
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change e-mail address because the given address has "
@@ -7345,7 +7347,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:4033
+#: ../libpurple/protocols/oscar/oscar.c:4034
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change e-mail address because the given address is "
@@ -7354,32 +7356,31 @@
 "Fehler 0x%04x: Kann die E-Mail-Adresse nicht ändern, weil die angegebene "
 "Adresse falsch ist."
 
-#: ../libpurple/protocols/oscar/oscar.c:4036
+#: ../libpurple/protocols/oscar/oscar.c:4037
 #, c-format
 msgid "Error 0x%04x: Unknown error."
 msgstr "Fehler 0x%04x: Unbekannter Fehler."
 
-#: ../libpurple/protocols/oscar/oscar.c:4046
+#: ../libpurple/protocols/oscar/oscar.c:4047
 #, 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:4048
+#: ../libpurple/protocols/oscar/oscar.c:4049
 msgid "Account Info"
 msgstr "Konto-Info"
 
-#: ../libpurple/protocols/oscar/oscar.c:4220
-msgid ""
-"Your IM Image was not sent. You must be Direct Connected to send IM Images."
+#: ../libpurple/protocols/oscar/oscar.c:4221
+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:4486
+#: ../libpurple/protocols/oscar/oscar.c:4487
 msgid "Unable to set AIM profile."
 msgstr "Kann das AIM-Profil nicht setzen."
 
-#: ../libpurple/protocols/oscar/oscar.c:4487
+#: ../libpurple/protocols/oscar/oscar.c:4488
 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 "
@@ -7389,7 +7390,7 @@
 "Anmeldeprozedur abgeschlossen war. Das Profil bleibt ungesetzt. Versuchen "
 "Sie es wieder, wenn Sie vollständig verbunden sind."
 
-#: ../libpurple/protocols/oscar/oscar.c:4501
+#: ../libpurple/protocols/oscar/oscar.c:4502
 #, c-format
 msgid ""
 "The maximum profile length of %d byte has been exceeded.  It has been "
@@ -7404,11 +7405,11 @@
 "Die maximale Profilgröße von %d Bytes wurde überschritten.  Es wurde für Sie "
 "abgeschnitten."
 
-#: ../libpurple/protocols/oscar/oscar.c:4506
+#: ../libpurple/protocols/oscar/oscar.c:4507
 msgid "Profile too long."
 msgstr "Profil zu lang."
 
-#: ../libpurple/protocols/oscar/oscar.c:4551
+#: ../libpurple/protocols/oscar/oscar.c:4552
 #, c-format
 msgid ""
 "The maximum away message length of %d byte has been exceeded.  It has been "
@@ -7423,33 +7424,33 @@
 "Die Abwesenheitsnachricht hat die maximale Größe von %d Bytes "
 "überschritten.  Sie wurde für Sie abgeschnitten."
 
-#: ../libpurple/protocols/oscar/oscar.c:4556
+#: ../libpurple/protocols/oscar/oscar.c:4557
 msgid "Away message too long."
 msgstr "Abwesenheitsmitteilungen zu lang."
 
-#: ../libpurple/protocols/oscar/oscar.c:4625
+#: ../libpurple/protocols/oscar/oscar.c:4626
 #, c-format
 msgid ""
 "Could not add the buddy %s because the screen name is invalid.  Screen names "
-"must either start with a letter and contain only letters, numbers and "
-"spaces, or contain only numbers."
+"must be a valid email address, or start with a letter and contain only "
+"letters, numbers and spaces, or contain only numbers."
 msgstr ""
 "Konnte den Buddy %s nicht hinzufügen, da der Benutzername falsch ist.  "
-"Benutzernamen können entweder mit einem Buchstaben beginnen und können dann "
-"Buchstaben, Ziffern und Leerzeichen enthalten oder sie bestehen nur aus "
-"Ziffern."
-
-#: ../libpurple/protocols/oscar/oscar.c:4627
-#: ../libpurple/protocols/oscar/oscar.c:5050
-#: ../libpurple/protocols/oscar/oscar.c:5064
+"Benutzernamen müssen gültige E-Mail-Adressen sein oder mit einem Buchstaben "
+"beginnen und nur Buchstaben, Ziffern und Leerzeichen enthalten oder nur aus "
+"Ziffern bestehen."
+
+#: ../libpurple/protocols/oscar/oscar.c:4628
+#: ../libpurple/protocols/oscar/oscar.c:5051
+#: ../libpurple/protocols/oscar/oscar.c:5066
 msgid "Unable To Add"
 msgstr "Kann nicht hinzufügen"
 
-#: ../libpurple/protocols/oscar/oscar.c:4731
+#: ../libpurple/protocols/oscar/oscar.c:4732
 msgid "Unable To Retrieve Buddy List"
 msgstr "Konnte Buddy-Liste nicht laden"
 
-#: ../libpurple/protocols/oscar/oscar.c:4732
+#: ../libpurple/protocols/oscar/oscar.c:4733
 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."
@@ -7458,16 +7459,16 @@
 "versenden. Ihre Buddy-Liste ist nicht verloren und wird wahrscheinlich in "
 "ein paar Stunden wieder verfügbar sein."
 
-#: ../libpurple/protocols/oscar/oscar.c:4936
 #: ../libpurple/protocols/oscar/oscar.c:4937
-#: ../libpurple/protocols/oscar/oscar.c:4942
-#: ../libpurple/protocols/oscar/oscar.c:5118
-#: ../libpurple/protocols/oscar/oscar.c:5119
-#: ../libpurple/protocols/oscar/oscar.c:5124
+#: ../libpurple/protocols/oscar/oscar.c:4938
+#: ../libpurple/protocols/oscar/oscar.c:4943
+#: ../libpurple/protocols/oscar/oscar.c:5120
+#: ../libpurple/protocols/oscar/oscar.c:5121
+#: ../libpurple/protocols/oscar/oscar.c:5126
 msgid "Orphans"
 msgstr "Waisen"
 
-#: ../libpurple/protocols/oscar/oscar.c:5048
+#: ../libpurple/protocols/oscar/oscar.c:5049
 #, c-format
 msgid ""
 "Could not add the buddy %s because you have too many buddies in your buddy "
@@ -7476,23 +7477,17 @@
 "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:5048
-#: ../libpurple/protocols/oscar/oscar.c:5062
+#: ../libpurple/protocols/oscar/oscar.c:5049
+#: ../libpurple/protocols/oscar/oscar.c:5064
 msgid "(no name)"
 msgstr "(kein Name)"
 
-#: ../libpurple/protocols/oscar/oscar.c:5062
-#, c-format
-msgid ""
-"Could not add the buddy %s for an unknown reason.  The most common reason "
-"for this is that you have the maximum number of allowed buddies in your "
-"buddy list."
-msgstr ""
-"Konnte den Buddy %s aus unbekannten Gründen nicht hinzufügen. Der häufigste "
-"Grund dafür ist, dass Sie die maximale Zahl erlaubter Buddy in Ihrer Buddy-"
-"Liste überschritten haben."
-
-#: ../libpurple/protocols/oscar/oscar.c:5155
+#: ../libpurple/protocols/oscar/oscar.c:5063
+#, c-format
+msgid "Could not add the buddy %s for an unknown reason."
+msgstr "Konnte den Buddy %s aus einem unbekannten Grund nicht hinzufügen."
+
+#: ../libpurple/protocols/oscar/oscar.c:5157
 #, c-format
 msgid ""
 "The user %s has given you permission to add you to their buddy list.  Do you "
@@ -7501,24 +7496,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:5163
+#: ../libpurple/protocols/oscar/oscar.c:5165
 msgid "Authorization Given"
 msgstr "Autorisierung wurde gegeben"
 
 #. Granted
-#: ../libpurple/protocols/oscar/oscar.c:5236
+#: ../libpurple/protocols/oscar/oscar.c:5238
 #, 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:5237
+#: ../libpurple/protocols/oscar/oscar.c:5239
 msgid "Authorization Granted"
 msgstr "Autorisierung erteilt"
 
 #. Denied
-#: ../libpurple/protocols/oscar/oscar.c:5240
+#: ../libpurple/protocols/oscar/oscar.c:5242
 #, c-format
 msgid ""
 "The user %s has denied your request to add them to your buddy list for the "
@@ -7529,53 +7524,53 @@
 "Liste hinzufügen zu dürfen, und zwar aus folgendem Grund:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:5241
+#: ../libpurple/protocols/oscar/oscar.c:5243
 msgid "Authorization Denied"
 msgstr "Autorisierung abgelehnt"
 
-#: ../libpurple/protocols/oscar/oscar.c:5277
+#: ../libpurple/protocols/oscar/oscar.c:5279
 #: ../libpurple/protocols/toc/toc.c:1371
 msgid "_Exchange:"
 msgstr "A_ustausch:"
 
-#: ../libpurple/protocols/oscar/oscar.c:5317
+#: ../libpurple/protocols/oscar/oscar.c:5319
 msgid "Invalid chat name specified."
 msgstr "Ungültiger Chat-Name angegeben."
 
-#: ../libpurple/protocols/oscar/oscar.c:5386
+#: ../libpurple/protocols/oscar/oscar.c:5388
 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:5546
-#: ../libpurple/protocols/oscar/oscar.c:5551
+#: ../libpurple/protocols/oscar/oscar.c:5548
+#: ../libpurple/protocols/oscar/oscar.c:5553
 msgid "Away Message"
 msgstr "Abwesenheitsnachricht"
 
-#: ../libpurple/protocols/oscar/oscar.c:5551
+#: ../libpurple/protocols/oscar/oscar.c:5553
 msgid "<i>(retrieving)</i>"
 msgstr "<i>(empfange)</i>"
 
-#: ../libpurple/protocols/oscar/oscar.c:5751
+#: ../libpurple/protocols/oscar/oscar.c:5753
 msgid "iTunes Music Store Link"
 msgstr "iTunes Music Store Link"
 
-#: ../libpurple/protocols/oscar/oscar.c:5859
+#: ../libpurple/protocols/oscar/oscar.c:5861
 #, c-format
 msgid "Buddy Comment for %s"
 msgstr "Buddy-Kommentar für %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:5860
+#: ../libpurple/protocols/oscar/oscar.c:5862
 msgid "Buddy Comment:"
 msgstr "Buddy-Kommentar:"
 
-#: ../libpurple/protocols/oscar/oscar.c:5907
+#: ../libpurple/protocols/oscar/oscar.c:5909
 #, 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:5911
+#: ../libpurple/protocols/oscar/oscar.c:5913
 msgid ""
 "Because this reveals your IP address, it may be considered a security risk.  "
 "Do you wish to continue?"
@@ -7583,65 +7578,66 @@
 "Da dies Ihre IP-Adresse sichtbar macht, kann es als Sicherheitsrisiko "
 "betrachtet werden. Möchten Sie fortfahren?"
 
-#: ../libpurple/protocols/oscar/oscar.c:5917
+#: ../libpurple/protocols/oscar/oscar.c:5919
+#: ../libpurple/protocols/oscar/peer.c:1022
 msgid "C_onnect"
 msgstr "V_erbinden"
 
-#: ../libpurple/protocols/oscar/oscar.c:5952
+#: ../libpurple/protocols/oscar/oscar.c:5954
 msgid "Get AIM Info"
 msgstr "AIM-Info"
 
-#: ../libpurple/protocols/oscar/oscar.c:5958
+#: ../libpurple/protocols/oscar/oscar.c:5960
 msgid "Edit Buddy Comment"
 msgstr "Buddy-Kommentar bearbeiten"
 
-#: ../libpurple/protocols/oscar/oscar.c:5966
+#: ../libpurple/protocols/oscar/oscar.c:5968
 msgid "Get Status Msg"
 msgstr "Abwesenheitsmitteilung abrufen"
 
-#: ../libpurple/protocols/oscar/oscar.c:5979
+#: ../libpurple/protocols/oscar/oscar.c:5981
 msgid "Direct IM"
 msgstr "Direkte Nachricht"
 
-#: ../libpurple/protocols/oscar/oscar.c:6001
+#: ../libpurple/protocols/oscar/oscar.c:6003
 msgid "Re-request Authorization"
 msgstr "Nochmal nach Autorisierung fragen"
 
-#: ../libpurple/protocols/oscar/oscar.c:6060
+#: ../libpurple/protocols/oscar/oscar.c:6062
 msgid "Require authorization"
 msgstr "Autorisierung erforderlich"
 
-#: ../libpurple/protocols/oscar/oscar.c:6063
+#: ../libpurple/protocols/oscar/oscar.c:6065
 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:6068
+#: ../libpurple/protocols/oscar/oscar.c:6070
 msgid "ICQ Privacy Options"
 msgstr "ICQ Privatsphärenoptionen"
 
-#: ../libpurple/protocols/oscar/oscar.c:6087
+#: ../libpurple/protocols/oscar/oscar.c:6089
 msgid "The new formatting is invalid."
 msgstr "Die neue Formatierung ist ungültig."
 
-#: ../libpurple/protocols/oscar/oscar.c:6088
+#: ../libpurple/protocols/oscar/oscar.c:6090
 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:6141
+#: ../libpurple/protocols/oscar/oscar.c:6143
 msgid "Change Address To:"
 msgstr "Ändere die Adresse zu:"
 
-#: ../libpurple/protocols/oscar/oscar.c:6187
+#: ../libpurple/protocols/oscar/oscar.c:6189
 msgid "<i>you are not waiting for authorization</i>"
 msgstr "<i>Sie warten derzeit auf keine Autorisierungen</i>"
 
-#: ../libpurple/protocols/oscar/oscar.c:6190
+#: ../libpurple/protocols/oscar/oscar.c:6192
 msgid "You are awaiting authorization from the following buddies"
 msgstr "Sie warten auf Autorisierung von den folgenden Buddys"
 
-#: ../libpurple/protocols/oscar/oscar.c:6191
+#: ../libpurple/protocols/oscar/oscar.c:6193
 msgid ""
 "You can re-request authorization from these buddies by right-clicking on "
 "them and selecting \"Re-request Authorization.\""
@@ -7650,73 +7646,73 @@
 "den Buddy mit einem Rechtsklick anklicken und „Nochmal nach Autorisierung "
 "fragen“ auswählen."
 
-#: ../libpurple/protocols/oscar/oscar.c:6208
+#: ../libpurple/protocols/oscar/oscar.c:6210
 msgid "Find Buddy by E-Mail"
 msgstr "Suche Buddys nach E-Mail-Adresse"
 
-#: ../libpurple/protocols/oscar/oscar.c:6209
+#: ../libpurple/protocols/oscar/oscar.c:6211
 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:6210
+#: ../libpurple/protocols/oscar/oscar.c:6212
 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:6213
+#: ../libpurple/protocols/oscar/oscar.c:6215
 msgid "_Search"
 msgstr "_Suchen"
 
-#: ../libpurple/protocols/oscar/oscar.c:6371
+#: ../libpurple/protocols/oscar/oscar.c:6373
 msgid "Set User Info (URL)..."
 msgstr "Benutzer-Info (URL) setzen..."
 
-#: ../libpurple/protocols/oscar/oscar.c:6382
+#: ../libpurple/protocols/oscar/oscar.c:6384
 msgid "Change Password (URL)"
 msgstr "Ändere Passwort (URL)"
 
-#: ../libpurple/protocols/oscar/oscar.c:6386
+#: ../libpurple/protocols/oscar/oscar.c:6388
 msgid "Configure IM Forwarding (URL)"
 msgstr "Konfiguriere IM-Weiterleitung (URL)"
 
 #. ICQ actions
-#: ../libpurple/protocols/oscar/oscar.c:6396
+#: ../libpurple/protocols/oscar/oscar.c:6398
 msgid "Set Privacy Options..."
 msgstr "Privatsphärenoptionen setzen..."
 
 #. AIM actions
-#: ../libpurple/protocols/oscar/oscar.c:6403
+#: ../libpurple/protocols/oscar/oscar.c:6405
 msgid "Confirm Account"
 msgstr "Konto bestätigen"
 
-#: ../libpurple/protocols/oscar/oscar.c:6407
+#: ../libpurple/protocols/oscar/oscar.c:6409
 msgid "Display Currently Registered E-Mail Address"
 msgstr "Zeige die aktuell registrierte E-Mail-Adresse"
 
-#: ../libpurple/protocols/oscar/oscar.c:6411
+#: ../libpurple/protocols/oscar/oscar.c:6413
 msgid "Change Currently Registered E-Mail Address..."
 msgstr "Ändere die aktuell registrierte E-Mail-Adresse..."
 
-#: ../libpurple/protocols/oscar/oscar.c:6418
+#: ../libpurple/protocols/oscar/oscar.c:6420
 msgid "Show Buddies Awaiting Authorization"
 msgstr "Zeige Buddys, von denen Sie Autorisierung erwarten"
 
-#: ../libpurple/protocols/oscar/oscar.c:6424
+#: ../libpurple/protocols/oscar/oscar.c:6426
 msgid "Search for Buddy by E-Mail Address..."
 msgstr "Suche Buddys nach E-Mail-Adresse..."
 
-#: ../libpurple/protocols/oscar/oscar.c:6429
+#: ../libpurple/protocols/oscar/oscar.c:6431
 msgid "Search for Buddy by Information"
 msgstr "Suche Buddy nach Information"
 
-#: ../libpurple/protocols/oscar/oscar.c:6497
+#: ../libpurple/protocols/oscar/oscar.c:6499
 msgid "Use recent buddies group"
 msgstr "Benutze neueste Gruppe"
 
-#: ../libpurple/protocols/oscar/oscar.c:6500
+#: ../libpurple/protocols/oscar/oscar.c:6502
 msgid "Show how long you have been idle"
 msgstr "Anzeigen, wie lange ich untätig war"
 
-#: ../libpurple/protocols/oscar/oscar.c:6655
+#: ../libpurple/protocols/oscar/oscar.c:6657
 msgid ""
 "Always use ICQ proxy server for file transfers\n"
 "(slower, but does not reveal your IP address)"
@@ -7753,10 +7749,6 @@
 "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:1022
-msgid "_Connect"
-msgstr "_Verbinden"
-
 #: ../libpurple/protocols/qq/buddy_info.c:39
 msgid "Primary Information"
 msgstr "Primäre Informationen"
@@ -7938,13 +7930,13 @@
 
 # c-format
 #: ../libpurple/protocols/qq/buddy_opt.c:208
-#: ../libpurple/protocols/qq/group_opt.c:135
+#: ../libpurple/protocols/qq/group_opt.c:136
 #, c-format
 msgid "You rejected %d's request"
 msgstr "Sie haben die Anfrage von %d abgelehnt"
 
 #: ../libpurple/protocols/qq/buddy_opt.c:209
-#: ../libpurple/protocols/qq/group_opt.c:136
+#: ../libpurple/protocols/qq/group_opt.c:137
 msgid "Input your reason:"
 msgstr "Geben Sie Ihren Grund an:"
 
@@ -7954,13 +7946,13 @@
 
 #. title
 #: ../libpurple/protocols/qq/buddy_opt.c:213
-#: ../libpurple/protocols/qq/group_opt.c:140
+#: ../libpurple/protocols/qq/group_opt.c:141
 msgid "Sorry, you are not my type..."
 msgstr "Tut mir Leid, du bist nicht mein Typ..."
 
 #: ../libpurple/protocols/qq/buddy_opt.c:214
-#: ../libpurple/protocols/qq/group_im.c:142
-#: ../libpurple/protocols/qq/group_opt.c:126
+#: ../libpurple/protocols/qq/group_im.c:144
+#: ../libpurple/protocols/qq/group_opt.c:127
 #: ../libpurple/protocols/qq/sys_msg.c:91
 #: ../libpurple/protocols/qq/sys_msg.c:249
 msgid "Reject"
@@ -7984,13 +7976,13 @@
 msgstr "Benutzer %d benötigt Authentifizierung"
 
 #: ../libpurple/protocols/qq/buddy_opt.c:404
-#: ../libpurple/protocols/qq/group_join.c:134
+#: ../libpurple/protocols/qq/group_join.c:136
 msgid "Input request here"
 msgstr "Anfrage hier eingeben"
 
 #. 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
+#: ../libpurple/protocols/qq/group_join.c:137
 msgid "Would you be my friend?"
 msgstr "Möchten Sie mein Freund sein?"
 
@@ -7998,8 +7990,8 @@
 #. masked
 #. hint
 #: ../libpurple/protocols/qq/buddy_opt.c:406
-#: ../libpurple/protocols/qq/group_join.c:136
-#: ../libpurple/protocols/qq/group_opt.c:142
+#: ../libpurple/protocols/qq/group_join.c:138
+#: ../libpurple/protocols/qq/group_opt.c:143
 msgid "Send"
 msgstr "Senden"
 
@@ -8048,59 +8040,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:124
+#: ../libpurple/protocols/qq/group_im.c:126
 #, 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:125
-#: ../libpurple/protocols/qq/group_im.c:179
+#: ../libpurple/protocols/qq/group_im.c:127
+#: ../libpurple/protocols/qq/group_im.c:181
 #: ../libpurple/protocols/qq/sys_msg.c:195
 #, c-format
 msgid "Reason: %s"
 msgstr "Grund: %s"
 
-#: ../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
+#: ../libpurple/protocols/qq/group_im.c:136
+#: ../libpurple/protocols/qq/group_im.c:183
+#: ../libpurple/protocols/qq/group_im.c:223
+#: ../libpurple/protocols/qq/group_im.c:258
+#: ../libpurple/protocols/qq/group_im.c:292
+#: ../libpurple/protocols/qq/group_join.c:233
+#: ../libpurple/protocols/qq/group_join.c:359
+#: ../libpurple/protocols/qq/group_opt.c:235
+#: ../libpurple/protocols/qq/group_opt.c:305
+#: ../libpurple/protocols/qq/group_opt.c:391
 msgid "QQ Qun Operation"
 msgstr "QQ-Qun-Operation"
 
-#: ../libpurple/protocols/qq/group_im.c:139
-#: ../libpurple/protocols/qq/group_opt.c:127
+#: ../libpurple/protocols/qq/group_im.c:141
+#: ../libpurple/protocols/qq/group_opt.c:128
 #: ../libpurple/protocols/qq/sys_msg.c:92
 #: ../libpurple/protocols/qq/sys_msg.c:251
 msgid "Approve"
 msgstr "Akzeptieren"
 
-#: ../libpurple/protocols/qq/group_im.c:178
+#: ../libpurple/protocols/qq/group_im.c:180
 #, 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:219
+#: ../libpurple/protocols/qq/group_im.c:221
 #, 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:255
+#: ../libpurple/protocols/qq/group_im.c:257
 #, c-format
 msgid "You [%d] has exit group \"%d\""
 msgstr "Sie [%d] haben die Gruppe \"%d\" verlassen"
 
-#: ../libpurple/protocols/qq/group_im.c:289
+#: ../libpurple/protocols/qq/group_im.c:291
 #, 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:290
+#: ../libpurple/protocols/qq/group_im.c:292
 msgid "This group has been added to your buddy list"
 msgstr "Diese Gruppe wurde Ihrer Buddy-Liste hinzugefügt"
 
@@ -8124,31 +8116,31 @@
 msgid "Unknown status"
 msgstr "Unbekannter Status"
 
-#: ../libpurple/protocols/qq/group_join.c:80
+#: ../libpurple/protocols/qq/group_join.c:82
 msgid "This group does not allow others to join"
 msgstr "Dieser Gruppe können andere nicht beitreten"
 
-#: ../libpurple/protocols/qq/group_join.c:231
+#: ../libpurple/protocols/qq/group_join.c:233
 msgid "You have successfully exited the group"
 msgstr "Sie haben die Gruppe verlassen"
 
-#: ../libpurple/protocols/qq/group_join.c:255
+#: ../libpurple/protocols/qq/group_join.c:257
 msgid "QQ Group Auth"
 msgstr "QQ-Gruppenauthentifikation"
 
-#: ../libpurple/protocols/qq/group_join.c:256
+#: ../libpurple/protocols/qq/group_join.c:258
 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:327
+#: ../libpurple/protocols/qq/group_join.c:329
 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:358
+#: ../libpurple/protocols/qq/group_join.c:360
 msgid "Are you sure to exit this Qun?"
 msgstr "Wollen Sie dieses Qun wirklich verlassen?"
 
-#: ../libpurple/protocols/qq/group_join.c:360
+#: ../libpurple/protocols/qq/group_join.c:362
 msgid ""
 "Note, if you are the creator, \n"
 "this operation will eventually remove this Qun."
@@ -8156,61 +8148,60 @@
 "Beachten Sie, dass diese Operation den Qun entfernen könnte, \n"
 "wenn Sie der Ersteller sind."
 
-#: ../libpurple/protocols/qq/group_join.c:365
+#: ../libpurple/protocols/qq/group_join.c:367
 msgid "Go ahead"
 msgstr "Fortfahren"
 
-#: ../libpurple/protocols/qq/group_network.c:90
+#: ../libpurple/protocols/qq/group_network.c:92
 #, c-format
 msgid "Code [0x%02X]: %s"
 msgstr "Code [0x%02X]: %s"
 
-#: ../libpurple/protocols/qq/group_network.c:91
+#: ../libpurple/protocols/qq/group_network.c:93
 msgid "Group Operation Error"
 msgstr "Gruppenoperationsfehler"
 
 #. we wanna see window
-#: ../libpurple/protocols/qq/group_opt.c:123
+#: ../libpurple/protocols/qq/group_opt.c:124
 #: ../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:234
+#: ../libpurple/protocols/qq/group_opt.c:235
 msgid "You have successfully modify Qun member"
 msgstr "Sie haben die Qun-Mitgliedschaft erfolgreich modifiziert"
 
-#: ../libpurple/protocols/qq/group_opt.c:304
+#: ../libpurple/protocols/qq/group_opt.c:305
 msgid "You have successfully modify Qun information"
 msgstr "Sie haben die Qun-Information erfolgreich modifiziert"
 
-#: ../libpurple/protocols/qq/group_opt.c:391
+#: ../libpurple/protocols/qq/group_opt.c:392
 msgid "You have successfully created a Qun"
 msgstr "Sie haben einen Qun angelegt"
 
-#: ../libpurple/protocols/qq/group_opt.c:393
+#: ../libpurple/protocols/qq/group_opt.c:394
 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:397
+#: ../libpurple/protocols/qq/group_opt.c:398
 msgid "Setup"
 msgstr "Setup"
 
-#: ../libpurple/protocols/qq/im.c:430
+#: ../libpurple/protocols/qq/im.c:432
 msgid "System Message"
 msgstr "Systemnachricht"
 
-#: ../libpurple/protocols/qq/im.c:574
+#: ../libpurple/protocols/qq/im.c:576
 msgid "Server ACK"
 msgstr "Server-ACK"
 
-#: ../libpurple/protocols/qq/im.c:574
-msgid "Send IM fail\n"
-msgstr "Nachrichtenzustellung fehlgeschlagen\n"
-
-#: ../libpurple/protocols/qq/keep_alive.c:85
+#: ../libpurple/protocols/qq/im.c:576
+msgid "Failed to send IM."
+msgstr "Senden der Nachricht fehlgeschlagen."
+
+#: ../libpurple/protocols/qq/keep_alive.c:87
 msgid "Keep alive error, seems connection lost!"
-msgstr ""
-"\"Keep-alive\"-Fehler, wahrscheinlich ist die Verbindung zusammengebrochen!"
+msgstr "\"Keep-alive\"-Fehler, wahrscheinlich ist die Verbindung zusammengebrochen!"
 
 #: ../libpurple/protocols/qq/login_logout.c:408
 msgid "Request login token error!"
@@ -8222,8 +8213,8 @@
 
 #. we didn't successfully connect. tdt->toc_fd is valid here
 #: ../libpurple/protocols/qq/qq.c:139 ../libpurple/protocols/toc/toc.c:173
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:108
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:188
+#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:109
+#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:189
 #: ../libpurple/protocols/yahoo/ycht.c:549
 msgid "Unable to connect."
 msgstr "Verbindung nicht möglich."
@@ -8364,27 +8355,27 @@
 msgid "Unable to read from socket"
 msgstr "Socket kann nicht gelesen werden"
 
-#: ../libpurple/protocols/qq/send_file.c:706
+#: ../libpurple/protocols/qq/send_file.c:707
 #, c-format
 msgid "%d has declined the file %s"
 msgstr "%d hat die Datei %s abgelehnt"
 
-#: ../libpurple/protocols/qq/send_file.c:709
-#: ../libpurple/protocols/qq/send_file.c:738
+#: ../libpurple/protocols/qq/send_file.c:710
+#: ../libpurple/protocols/qq/send_file.c:739
 msgid "File Send"
 msgstr "Dateiübertragung"
 
-#: ../libpurple/protocols/qq/send_file.c:735
+#: ../libpurple/protocols/qq/send_file.c:736
 #, c-format
 msgid "%d canceled the transfer of %s"
 msgstr "%d hat die Übertragung von %s abgebrochen"
 
-#: ../libpurple/protocols/qq/sendqueue.c:122
+#: ../libpurple/protocols/qq/sendqueue.c:123
 msgid "Connection lost"
 msgstr "Verbindung verloren"
 
 #. cancel login progress
-#: ../libpurple/protocols/qq/sendqueue.c:130
+#: ../libpurple/protocols/qq/sendqueue.c:131
 msgid "Login failed, no reply"
 msgstr "Anmeldung fehlgeschlagen, keine Antwort"
 
@@ -8507,10 +8498,8 @@
 
 #: ../libpurple/protocols/sametime/sametime.c:1645
 #, c-format
-msgid ""
-"A Sametime administrator has issued the following announcement on server %s"
-msgstr ""
-"Ein Sametime-Administrator hat die folgende Ankündigung auf Server %s gemacht"
+msgid "A Sametime administrator has issued the following announcement on server %s"
+msgstr "Ein Sametime-Administrator hat die folgende Ankündigung auf Server %s gemacht"
 
 #: ../libpurple/protocols/sametime/sametime.c:1650
 msgid "Sametime Administrator Announcement"
@@ -8630,7 +8619,7 @@
 msgid "Send TEST Announcement"
 msgstr "Sende TEST-Nachricht"
 
-#: ../libpurple/protocols/sametime/sametime.c:3586 ../pidgin/gtkconv.c:4290
+#: ../libpurple/protocols/sametime/sametime.c:3586 ../pidgin/gtkconv.c:4275
 msgid "Topic:"
 msgstr "Thema:"
 
@@ -8655,7 +8644,7 @@
 msgid "No Sametime Community Server Specified"
 msgstr "Kein Sametime-Community Server angegeben"
 
-#: ../libpurple/protocols/sametime/sametime.c:3644 ../pidgin/gtkblist.c:3997
+#: ../libpurple/protocols/sametime/sametime.c:3644 ../pidgin/gtkblist.c:4015
 msgid "Connect"
 msgstr "Verbinden"
 
@@ -8835,7 +8824,8 @@
 "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:5538 ../pidgin/gtknotify.c:722
+#. Create the window
+#: ../libpurple/protocols/sametime/sametime.c:5538 ../pidgin/gtknotify.c:719
 msgid "Search Results"
 msgstr "Suchergebnisse"
 
@@ -9530,8 +9520,7 @@
 #: ../libpurple/protocols/silc/chat.c:743
 #: ../libpurple/protocols/silc10/chat.c:727
 msgid "Set user limit on channel. Set to zero to reset user limit."
-msgstr ""
-"Setze Benutzerlimit auf dem Kanal. Wählen Sie 0, um das Limit aufzuheben."
+msgstr "Setze Benutzerlimit auf dem Kanal. Wählen Sie 0, um das Limit aufzuheben."
 
 #: ../libpurple/protocols/silc/chat.c:907
 #: ../libpurple/protocols/silc10/chat.c:891
@@ -9596,8 +9585,7 @@
 #: ../libpurple/protocols/silc/chat.c:1045
 #: ../libpurple/protocols/silc10/chat.c:1102
 #, c-format
-msgid ""
-"You have to join the %s channel before you are able to join the private group"
+msgid "You have to join the %s channel before you are able to join the private group"
 msgstr ""
 "Sie müssen den Kanal %s betreten, bevor Sie die private Gruppe betreten "
 "können"
@@ -9674,7 +9662,7 @@
 msgstr "Schlüsselaustausch ist fehlgeschlagen"
 
 #: ../libpurple/protocols/silc/ft.c:114
-msgid "Connection timedout"
+msgid "Connection timed out"
 msgstr "Verbindungsabbruch wegen Zeitüberschreitung"
 
 #: ../libpurple/protocols/silc/ft.c:118
@@ -10072,8 +10060,7 @@
 
 #: ../libpurple/protocols/silc/silc.c:238
 #: ../libpurple/protocols/silc10/ops.c:1714
-msgid ""
-"Resuming detached session failed. Press Reconnect to create new connection."
+msgid "Resuming detached session failed. Press Reconnect to create new connection."
 msgstr ""
 "Das Fortsetzen der angehaltenen Sitzung ist fehlgeschlagen. Bitte drücken "
 "Sie „Neu Verbinden“, um eine neue Verbindung zu erzeugen."
@@ -10116,7 +10103,7 @@
 
 #: ../libpurple/protocols/silc/silc.c:445
 msgid "Error loading SILC key pair"
-msgstr "Fehler beim Laden des SILC-Schlüsselpaares..."
+msgstr "Fehler beim Laden des SILC-Schlüsselpaares"
 
 #: ../libpurple/protocols/silc/silc.c:739
 #: ../libpurple/protocols/silc10/silc.c:650
@@ -10124,7 +10111,7 @@
 msgstr "Ihre momentane Stimmung"
 
 #: ../libpurple/protocols/silc/silc.c:741
-#: ../libpurple/protocols/silc10/silc.c:652 ../pidgin/gtkprefs.c:1566
+#: ../libpurple/protocols/silc10/silc.c:652 ../pidgin/gtkprefs.c:1636
 msgid "Normal"
 msgstr "Normal"
 
@@ -10354,8 +10341,7 @@
 #: ../libpurple/protocols/silc/silc.c:1666
 #: ../libpurple/protocols/silc10/silc.c:1595
 msgid "join &lt;channel&gt; [&lt;password&gt;]:  Join a chat on this network"
-msgstr ""
-"join &lt;Kanal&gt; [&lt;Passwort&gt;]:  Betrete einen Chat in diesem Netzwerk"
+msgstr "join &lt;Kanal&gt; [&lt;Passwort&gt;]:  Betrete einen Chat in diesem Netzwerk"
 
 #: ../libpurple/protocols/silc/silc.c:1670
 #: ../libpurple/protocols/silc10/silc.c:1599
@@ -10438,14 +10424,12 @@
 #: ../libpurple/protocols/silc/silc.c:1724
 #: ../libpurple/protocols/silc10/silc.c:1653
 msgid "umode &lt;usermodes&gt;:  Set your modes in the network"
-msgstr ""
-"umode &lt;Benutzeroptionen&gt;:  Setze Ihre Benutzeroptionen im Netzwerk"
+msgstr "umode &lt;Benutzeroptionen&gt;:  Setze Ihre Benutzeroptionen im Netzwerk"
 
 #: ../libpurple/protocols/silc/silc.c:1728
 #: ../libpurple/protocols/silc10/silc.c:1657
 msgid "oper &lt;nick&gt; [-pubkey]:  Get server operator privileges"
-msgstr ""
-"oper &lt;Nick&gt; [-pubkey]:  Privilegien des Server-Operators verlangen"
+msgstr "oper &lt;Nick&gt; [-pubkey]:  Privilegien des Server-Operators verlangen"
 
 #: ../libpurple/protocols/silc/silc.c:1732
 #: ../libpurple/protocols/silc10/silc.c:1661
@@ -10513,68 +10497,68 @@
 #. *< name
 #. *< version
 #. *  summary
-#: ../libpurple/protocols/silc/silc.c:1875
-#: ../libpurple/protocols/silc10/silc.c:1817
+#: ../libpurple/protocols/silc/silc.c:1876
+#: ../libpurple/protocols/silc10/silc.c:1819
 msgid "SILC Protocol Plugin"
 msgstr "SILC-Protokoll-Plugin"
 
 #. *  description
-#: ../libpurple/protocols/silc/silc.c:1877
-#: ../libpurple/protocols/silc10/silc.c:1819
+#: ../libpurple/protocols/silc/silc.c:1878
+#: ../libpurple/protocols/silc10/silc.c:1821
 msgid "Secure Internet Live Conferencing (SILC) Protocol"
 msgstr "Sichere Internet Live Konferenz (SILC) Protokoll"
 
-#: ../libpurple/protocols/silc/silc.c:1909
-#: ../libpurple/protocols/silc10/silc.c:1851 ../pidgin/gtkprefs.c:1959
+#: ../libpurple/protocols/silc/silc.c:1910
+#: ../libpurple/protocols/silc10/silc.c:1853 ../pidgin/gtkprefs.c:2029
 msgid "Network"
 msgstr "Netzwerk"
 
-#: ../libpurple/protocols/silc/silc.c:1920
-#: ../libpurple/protocols/silc10/silc.c:1862
+#: ../libpurple/protocols/silc/silc.c:1921
+#: ../libpurple/protocols/silc10/silc.c:1864
 msgid "Public Key file"
 msgstr "Öffentlicher Schlüssel (Datei)"
 
-#: ../libpurple/protocols/silc/silc.c:1924
-#: ../libpurple/protocols/silc10/silc.c:1866
+#: ../libpurple/protocols/silc/silc.c:1925
+#: ../libpurple/protocols/silc10/silc.c:1868
 msgid "Private Key file"
 msgstr "Privater Schlüssel (Datei)"
 
-#: ../libpurple/protocols/silc/silc.c:1934
-#: ../libpurple/protocols/silc10/silc.c:1876
+#: ../libpurple/protocols/silc/silc.c:1935
+#: ../libpurple/protocols/silc10/silc.c:1878
 msgid "Cipher"
 msgstr "Verschlüsselung"
 
-#: ../libpurple/protocols/silc/silc.c:1944
-#: ../libpurple/protocols/silc10/silc.c:1886
+#: ../libpurple/protocols/silc/silc.c:1945
+#: ../libpurple/protocols/silc10/silc.c:1888
 msgid "HMAC"
 msgstr "HMAC"
 
-#: ../libpurple/protocols/silc/silc.c:1947
+#: ../libpurple/protocols/silc/silc.c:1948
 msgid "Use Perfect Forward Secrecy"
 msgstr "Benutze perfekt fortgesetzte Geheimhaltung (PFS)"
 
-#: ../libpurple/protocols/silc/silc.c:1951
-#: ../libpurple/protocols/silc10/silc.c:1889
+#: ../libpurple/protocols/silc/silc.c:1952
+#: ../libpurple/protocols/silc10/silc.c:1891
 msgid "Public key authentication"
 msgstr "Authentifizierung mit öffentlichem Schlüssel"
 
-#: ../libpurple/protocols/silc/silc.c:1954
-#: ../libpurple/protocols/silc10/silc.c:1892
+#: ../libpurple/protocols/silc/silc.c:1955
+#: ../libpurple/protocols/silc10/silc.c:1894
 msgid "Block IMs without Key Exchange"
 msgstr "Blockiere IMs ohne Schlüsselaustausch"
 
-#: ../libpurple/protocols/silc/silc.c:1957
-#: ../libpurple/protocols/silc10/silc.c:1895
+#: ../libpurple/protocols/silc/silc.c:1958
+#: ../libpurple/protocols/silc10/silc.c:1897
 msgid "Block messages to whiteboard"
 msgstr "Blockiere Nachrichten zum Whiteboard"
 
-#: ../libpurple/protocols/silc/silc.c:1960
-#: ../libpurple/protocols/silc10/silc.c:1898
+#: ../libpurple/protocols/silc/silc.c:1961
+#: ../libpurple/protocols/silc10/silc.c:1900
 msgid "Automatically open whiteboard"
 msgstr "Whiteboard automatisch öffnen"
 
-#: ../libpurple/protocols/silc/silc.c:1963
-#: ../libpurple/protocols/silc10/silc.c:1901
+#: ../libpurple/protocols/silc/silc.c:1964
+#: ../libpurple/protocols/silc10/silc.c:1903
 msgid "Digitally sign and verify all messages"
 msgstr "Alle IM-Nachrichten digital unterschreiben und überprüfen"
 
@@ -10730,18 +10714,15 @@
 
 #: ../libpurple/protocols/silc10/ops.c:1934
 msgid "Failure: Remote does not trust/support your public key"
-msgstr ""
-"Fehler: Die entfernte Seite vertraut Ihrem öffentlichen Schlüssel nicht"
+msgstr "Fehler: Die entfernte Seite vertraut Ihrem öffentlichen Schlüssel nicht"
 
 #: ../libpurple/protocols/silc10/ops.c:1937
 msgid "Failure: Remote does not support proposed KE group"
-msgstr ""
-"Fehler: Entferntes Programm unterstützt nicht die vorgeschlagen KE-Gruppe"
+msgstr "Fehler: Entferntes Programm unterstützt nicht die vorgeschlagen KE-Gruppe"
 
 #: ../libpurple/protocols/silc10/ops.c:1940
 msgid "Failure: Remote does not support proposed cipher"
-msgstr ""
-"Fehler: Entferntes Programm unterstützt die vorgeschlagene Cipher nicht"
+msgstr "Fehler: Entferntes Programm unterstützt die vorgeschlagene Cipher nicht"
 
 #: ../libpurple/protocols/silc10/ops.c:1943
 msgid "Failure: Remote does not support proposed PKCS"
@@ -10749,8 +10730,7 @@
 
 #: ../libpurple/protocols/silc10/ops.c:1946
 msgid "Failure: Remote does not support proposed hash function"
-msgstr ""
-"Fehler: Entferntes Programm unterstützt die vorgeschlagen Hashfunktion nicht"
+msgstr "Fehler: Entferntes Programm unterstützt die vorgeschlagen Hashfunktion nicht"
 
 #: ../libpurple/protocols/silc10/ops.c:1949
 msgid "Failure: Remote does not support proposed HMAC"
@@ -11009,15 +10989,14 @@
 
 #: ../libpurple/protocols/toc/toc.c:792
 msgid "TOC has come back from its pause. You may now send messages again."
-msgstr ""
-"TOC ist von seiner Pause zurückgekehrt. Sie können wieder Nachrichten senden."
+msgstr "TOC ist von seiner Pause zurückgekehrt. Sie können wieder Nachrichten senden."
 
 #: ../libpurple/protocols/toc/toc.c:995
 msgid "Password Change Successful"
 msgstr "Passwortänderung erfolgreich"
 
-#: ../libpurple/protocols/toc/toc.c:1366 ../pidgin/gtkblist.c:5493
-#: ../pidgin/gtkblist.c:5847
+#: ../libpurple/protocols/toc/toc.c:1366 ../pidgin/gtkblist.c:5519
+#: ../pidgin/gtkblist.c:5873
 msgid "_Group:"
 msgstr "_Gruppe:"
 
@@ -11047,8 +11026,7 @@
 
 #: ../libpurple/protocols/toc/toc.c:2075
 msgid "Could not write file header.  The file will not be transferred."
-msgstr ""
-"Konnte keinen Datei-Header schreiben. Die Datei wurde nicht übermittelt."
+msgstr "Konnte keinen Datei-Header schreiben. Die Datei wurde nicht übermittelt."
 
 #: ../libpurple/protocols/toc/toc.c:2175
 msgid "Save As..."
@@ -11148,8 +11126,7 @@
 
 #: ../libpurple/protocols/yahoo/yahoo.c:1955
 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."
+msgstr "Ihr Konto ist gesperrt. Bitte melden Sie sich auf der Yahoo! Webseite an."
 
 #: ../libpurple/protocols/yahoo/yahoo.c:1958
 #, c-format
@@ -11182,8 +11159,8 @@
 #: ../libpurple/protocols/yahoo/yahoo.c:2684
 #: ../libpurple/protocols/yahoo/yahoo.c:2787
 #: ../libpurple/protocols/yahoo/yahoo.c:2797
-#: ../libpurple/protocols/yahoo/yahoochat.c:1455
-#: ../libpurple/protocols/yahoo/yahoochat.c:1525
+#: ../libpurple/protocols/yahoo/yahoochat.c:1418
+#: ../libpurple/protocols/yahoo/yahoochat.c:1488
 #: ../libpurple/protocols/yahoo/ycht.c:585
 msgid "Connection problem"
 msgstr "Verbindungsfehler"
@@ -11381,9 +11358,9 @@
 msgid "Sent Doodle request."
 msgstr "Doodle-Anfrage senden."
 
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:269
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:278
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:291
+#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:270
+#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:279
+#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:292
 msgid "Unable to establish file descriptor."
 msgstr "Konnte Dateibeschreibung nicht erstellen."
 
@@ -11487,35 +11464,35 @@
 msgid "The user's profile is empty."
 msgstr "Das Profil des Benutzers ist leer."
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:203
+#: ../libpurple/protocols/yahoo/yahoochat.c:204
 #, 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
+#: ../libpurple/protocols/yahoo/yahoochat.c:206
 msgid "Invitation Rejected"
 msgstr "Einladung zurückgewiesen"
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:361
+#: ../libpurple/protocols/yahoo/yahoochat.c:362
 msgid "Failed to join chat"
 msgstr "Der Chat kann nicht betreten werden"
 
 #. -6
-#: ../libpurple/protocols/yahoo/yahoochat.c:364
+#: ../libpurple/protocols/yahoo/yahoochat.c:365
 msgid "Unknown room"
 msgstr "Unbekannter Raum"
 
 #. -15
-#: ../libpurple/protocols/yahoo/yahoochat.c:367
+#: ../libpurple/protocols/yahoo/yahoochat.c:368
 msgid "Maybe the room is full"
 msgstr "Vielleicht ist der Raum voll"
 
 #. -35
-#: ../libpurple/protocols/yahoo/yahoochat.c:370
+#: ../libpurple/protocols/yahoo/yahoochat.c:371
 msgid "Not available"
 msgstr "Nicht verfügbar"
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:374
+#: ../libpurple/protocols/yahoo/yahoochat.c:375
 msgid ""
 "Unknown error. You may need to logout and wait five minutes before being "
 "able to rejoin a chatroom"
@@ -11523,38 +11500,38 @@
 "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
+#: ../libpurple/protocols/yahoo/yahoochat.c:453
 #, c-format
 msgid "You are now chatting in %s."
 msgstr "Sie chatten jetzt in %s."
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:627
+#: ../libpurple/protocols/yahoo/yahoochat.c:628
 msgid "Failed to join buddy in chat"
 msgstr "Es gelang nicht, den Buddy in dem Chat zu holen"
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:628
+#: ../libpurple/protocols/yahoo/yahoochat.c:629
 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
+#: ../libpurple/protocols/yahoo/yahoochat.c:1320
+#: ../libpurple/protocols/yahoo/yahoochat.c:1346
 msgid "Fetching the room list failed."
 msgstr "Abrufen der Raumliste gescheitert."
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:1441
+#: ../libpurple/protocols/yahoo/yahoochat.c:1404
 msgid "Voices"
 msgstr "Stimmen"
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:1444
+#: ../libpurple/protocols/yahoo/yahoochat.c:1407
 msgid "Webcams"
 msgstr "Webcams"
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:1455
-#: ../libpurple/protocols/yahoo/yahoochat.c:1525
+#: ../libpurple/protocols/yahoo/yahoochat.c:1418
+#: ../libpurple/protocols/yahoo/yahoochat.c:1488
 msgid "Unable to fetch room list."
 msgstr "Kamm die Raumliste nicht abrufen."
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:1518
+#: ../libpurple/protocols/yahoo/yahoochat.c:1481
 msgid "User Rooms"
 msgstr "Benutzerräume"
 
@@ -11638,13 +11615,11 @@
 
 #: ../libpurple/protocols/zephyr/zephyr.c:2705
 msgid "inst &lt;instance&gt;: Set the instance to be used on this class"
-msgstr ""
-"inst &lt;Instanz&gt;: Setze die Instanz, die für diese Klasse benutzt wird"
+msgstr "inst &lt;Instanz&gt;: Setze die Instanz, die für diese Klasse benutzt wird"
 
 #: ../libpurple/protocols/zephyr/zephyr.c:2710
 msgid "topic &lt;instance&gt;: Set the instance to be used on this class"
-msgstr ""
-"topic &lt;Instanz&gt;: Setze die Instanz, die für diese Klasse benutzt wird"
+msgstr "topic &lt;Instanz&gt;: Setze die Instanz, die für diese Klasse benutzt wird"
 
 #: ../libpurple/protocols/zephyr/zephyr.c:2716
 msgid "sub &lt;class&gt; &lt;instance&gt; &lt;recipient&gt;: Join a new chat"
@@ -11653,8 +11628,7 @@
 "betreten"
 
 #: ../libpurple/protocols/zephyr/zephyr.c:2721
-msgid ""
-"zi &lt;instance&gt;: Send a message to &lt;message,<i>instance</i>,*&gt;"
+msgid "zi &lt;instance&gt;: Send a message to &lt;message,<i>instance</i>,*&gt;"
 msgstr ""
 "zi &lt;Instanz&gt;: Sende eine Nachricht an &lt;Nachricht,<i>Instanz</i>,"
 "*&gt;"
@@ -11685,8 +11659,7 @@
 
 #: ../libpurple/protocols/zephyr/zephyr.c:2744
 msgid "zc &lt;class&gt;: Send a message to &lt;<i>class</i>,PERSONAL,*&gt;"
-msgstr ""
-"zc &lt;Klasse&gt;: Sendet eine Nachricht an &lt;<i>Klasse</i>,PERSONAL,*&gt;"
+msgstr "zc &lt;Klasse&gt;: Sendet eine Nachricht an &lt;<i>Klasse</i>,PERSONAL,*&gt;"
 
 #: ../libpurple/protocols/zephyr/zephyr.c:2850
 msgid "Resubscribe"
@@ -11767,8 +11740,7 @@
 #: ../libpurple/proxy.c:778
 #, c-format
 msgid "Access denied: HTTP proxy server forbids port %d tunneling."
-msgstr ""
-"Zugriff verboten: Der HTTP-Proxy-Server verbietet das Tunneling über Port %d."
+msgstr "Zugriff verboten: Der HTTP-Proxy-Server verbietet das Tunneling über Port %d."
 
 #: ../libpurple/proxy.c:995
 #, c-format
@@ -11800,11 +11772,11 @@
 #. *
 #. * The default message to use when the user becomes auto-away.
 #.
-#: ../libpurple/savedstatuses.c:46
+#: ../libpurple/savedstatuses.c:47
 msgid "I'm not here right now"
 msgstr "Ich bin gerade nicht hier"
 
-#: ../libpurple/savedstatuses.c:532
+#: ../libpurple/savedstatuses.c:534
 msgid "saved statuses"
 msgstr "gespeicherter Status"
 
@@ -11813,7 +11785,7 @@
 msgid "%s is now known as %s.\n"
 msgstr "%s heißt jetzt %s.\n"
 
-#: ../libpurple/server.c:679
+#: ../libpurple/server.c:680
 #, c-format
 msgid ""
 "%s has invited %s to the chat room %s:\n"
@@ -11822,12 +11794,12 @@
 "%s hat %s in den Chatraum %s eingeladen:\n"
 "%s"
 
-#: ../libpurple/server.c:684
+#: ../libpurple/server.c:685
 #, 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:688
+#: ../libpurple/server.c:689
 msgid "Accept chat invitation?"
 msgstr "Akzeptieren Sie die Chat-Einladung?"
 
@@ -11835,9 +11807,13 @@
 msgid "Unset"
 msgstr "Nicht gesetzt"
 
-#: ../libpurple/status.c:155
-msgid "Unavailable"
-msgstr "Unerreichbar"
+#: ../libpurple/status.c:155 ../pidgin/gtkstatusbox.c:1057
+msgid "Do not disturb"
+msgstr "Nicht stören"
+
+#: ../libpurple/status.c:158
+msgid "Extended away"
+msgstr "Abwesend (erweitert)"
 
 #: ../libpurple/status.c:159
 msgid "Mobile"
@@ -11878,17 +11854,17 @@
 msgid "+++ %s became unidle"
 msgstr "+++ %s wurde tätig"
 
-#: ../libpurple/util.c:682
+#: ../libpurple/util.c:717
 #, c-format
 msgid "%x %X"
 msgstr "%x %X"
 
-#: ../libpurple/util.c:2586
+#: ../libpurple/util.c:2646
 #, c-format
 msgid "Error Reading %s"
 msgstr "Fehler beim Lesen von %s"
 
-#: ../libpurple/util.c:2587
+#: ../libpurple/util.c:2647
 #, c-format
 msgid ""
 "An error was encountered reading your %s.  They have not been loaded, and "
@@ -11897,67 +11873,67 @@
 "Beim Einlesen Ihrer %s trat ein Fehler auf.  Die Liste wurde nicht geladen "
 "und die alte Datei wurde in %s~ umbenannt."
 
-#: ../libpurple/util.c:3060
+#: ../libpurple/util.c:3147
 msgid "Calculating..."
 msgstr "Berechne..."
 
-#: ../libpurple/util.c:3063
+#: ../libpurple/util.c:3150
 msgid "Unknown."
 msgstr "Unbekannt."
 
-#: ../libpurple/util.c:3089
+#: ../libpurple/util.c:3176
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] "%d Sekunde"
 msgstr[1] "%d Sekunden"
 
-#: ../libpurple/util.c:3101
+#: ../libpurple/util.c:3188
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] "%d Tag"
 msgstr[1] "%d Tage"
 
-#: ../libpurple/util.c:3109
+#: ../libpurple/util.c:3196
 #, c-format
 msgid "%s, %d hour"
 msgid_plural "%s, %d hours"
 msgstr[0] "%s, %d Stunde"
 msgstr[1] "%s, %d Stunden"
 
-#: ../libpurple/util.c:3115
+#: ../libpurple/util.c:3202
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d Stunde"
 msgstr[1] "%d Stunden"
 
-#: ../libpurple/util.c:3123
+#: ../libpurple/util.c:3210
 #, c-format
 msgid "%s, %d minute"
 msgid_plural "%s, %d minutes"
 msgstr[0] "%s, %d Minute"
 msgstr[1] "%s, %d Minuten"
 
-#: ../libpurple/util.c:3129
+#: ../libpurple/util.c:3216
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d Minute"
 msgstr[1] "%d Minuten"
 
-#: ../libpurple/util.c:3389
+#: ../libpurple/util.c:3476
 #, c-format
 msgid "Could not open %s: Redirected too many times"
 msgstr "Konnte %s nicht öffnen: Zu oft weitergeleitet"
 
-#: ../libpurple/util.c:3426 ../libpurple/util.c:3721
+#: ../libpurple/util.c:3513 ../libpurple/util.c:3808
 #, c-format
 msgid "Unable to connect to %s"
 msgstr "Verbindung zu %s nicht möglich"
 
-#: ../libpurple/util.c:3549
+#: ../libpurple/util.c:3636
 #, c-format
 msgid ""
 "Unable to allocate enough memory to hold the contents from %s.  The web "
@@ -11966,17 +11942,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:3584
+#: ../libpurple/util.c:3671
 #, c-format
 msgid "Error reading from %s: %s"
 msgstr "Fehler beim Lesen von %s: %s"
 
-#: ../libpurple/util.c:3615
+#: ../libpurple/util.c:3702
 #, c-format
 msgid "Error writing to %s: %s"
 msgstr "Fehler beim Schreiben von %s: %s"
 
-#: ../libpurple/util.c:3640
+#: ../libpurple/util.c:3727
 #, c-format
 msgid "Unable to connect to %s: %s"
 msgstr "Verbindung zu %s nicht möglich: %s"
@@ -12014,59 +11990,59 @@
 msgid "Screen _name:"
 msgstr "Benutzer_name:"
 
-#: ../pidgin/gtkaccount.c:528
+#: ../pidgin/gtkaccount.c:531
 msgid "_Local alias:"
 msgstr "Lokaler _Alias:"
 
-#: ../pidgin/gtkaccount.c:532
+#: ../pidgin/gtkaccount.c:535
 msgid "Remember pass_word"
 msgstr "Pass_wort speichern"
 
 #. Build the user options frame.
-#: ../pidgin/gtkaccount.c:590
+#: ../pidgin/gtkaccount.c:593
 msgid "User Options"
 msgstr "Benutzereinstellungen"
 
-#: ../pidgin/gtkaccount.c:603
+#: ../pidgin/gtkaccount.c:606
 msgid "New _mail notifications"
 msgstr "Benachrichtigung über neue _Mails"
 
 #. Buddy icon
-#: ../pidgin/gtkaccount.c:608
+#: ../pidgin/gtkaccount.c:611
 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:728
+#: ../pidgin/gtkaccount.c:731
 #, c-format
 msgid "%s Options"
 msgstr "%s Einstellungen"
 
-#: ../pidgin/gtkaccount.c:934
+#: ../pidgin/gtkaccount.c:936
 msgid "Use GNOME Proxy Settings"
 msgstr "Benutze GNOME-Proxy-Einstellungen"
 
-#: ../pidgin/gtkaccount.c:935
+#: ../pidgin/gtkaccount.c:937
 msgid "Use Global Proxy Settings"
 msgstr "Benutze globale Proxy-Einstellungen"
 
-#: ../pidgin/gtkaccount.c:941
+#: ../pidgin/gtkaccount.c:943
 msgid "No Proxy"
 msgstr "Kein Proxy"
 
-#: ../pidgin/gtkaccount.c:947
+#: ../pidgin/gtkaccount.c:949
 msgid "HTTP"
 msgstr "HTTP"
 
-#: ../pidgin/gtkaccount.c:953
+#: ../pidgin/gtkaccount.c:955
 msgid "SOCKS 4"
 msgstr "SOCKS 4"
 
-#: ../pidgin/gtkaccount.c:959
+#: ../pidgin/gtkaccount.c:961
 msgid "SOCKS 5"
 msgstr "SOCKS 5"
 
-#: ../pidgin/gtkaccount.c:965 ../pidgin/gtkprefs.c:1137
+#: ../pidgin/gtkaccount.c:967 ../pidgin/gtkprefs.c:1206
 msgid "Use Environmental Settings"
 msgstr "Benutze Umgebungsvariablen"
 
@@ -12075,61 +12051,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:1004
+#: ../pidgin/gtkaccount.c:1006
 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:1007
+#: ../pidgin/gtkaccount.c:1009
 msgid "you can see the butterflies mating"
 msgstr "Sie können den Schmetterlingen beim Paaren zusehen"
 
-#: ../pidgin/gtkaccount.c:1028
+#: ../pidgin/gtkaccount.c:1030
 msgid "Proxy Options"
 msgstr "Proxy-Optionen"
 
-#: ../pidgin/gtkaccount.c:1042 ../pidgin/gtkprefs.c:1131
+#: ../pidgin/gtkaccount.c:1044 ../pidgin/gtkprefs.c:1200
 msgid "Proxy _type:"
 msgstr "Proxy-_Typ:"
 
-#: ../pidgin/gtkaccount.c:1051 ../pidgin/gtkprefs.c:1152
+#: ../pidgin/gtkaccount.c:1053 ../pidgin/gtkprefs.c:1221
 msgid "_Host:"
 msgstr "_Host:"
 
-#: ../pidgin/gtkaccount.c:1055 ../pidgin/gtkprefs.c:1170
+#: ../pidgin/gtkaccount.c:1057 ../pidgin/gtkprefs.c:1239
 msgid "_Port:"
 msgstr "_Port:"
 
-#: ../pidgin/gtkaccount.c:1063
+#: ../pidgin/gtkaccount.c:1065
 msgid "_Username:"
 msgstr "_Benutzer:"
 
-#: ../pidgin/gtkaccount.c:1070 ../pidgin/gtkprefs.c:1207
+#: ../pidgin/gtkaccount.c:1072 ../pidgin/gtkprefs.c:1276
 msgid "Pa_ssword:"
 msgstr "P_asswort:"
 
-#: ../pidgin/gtkaccount.c:1476
+#: ../pidgin/gtkaccount.c:1473
 msgid "Add Account"
 msgstr "Konto hinzufügen"
 
-#: ../pidgin/gtkaccount.c:1500
+#: ../pidgin/gtkaccount.c:1492
 msgid "_Basic"
 msgstr "_Einfach"
 
-#: ../pidgin/gtkaccount.c:1511
+#: ../pidgin/gtkaccount.c:1503
 msgid "_Advanced"
 msgstr "_Erweitert"
 
 # Aktiv
-#: ../pidgin/gtkaccount.c:1983 ../pidgin/gtkplugin.c:568
+#: ../pidgin/gtkaccount.c:1975 ../pidgin/gtkplugin.c:568
 msgid "Enabled"
 msgstr "Aktiv"
 
-#: ../pidgin/gtkaccount.c:2011
+#: ../pidgin/gtkaccount.c:2003
 msgid "Protocol"
 msgstr "Protokoll"
 
-#: ../pidgin/gtkaccount.c:2212
+#: ../pidgin/gtkaccount.c:2204
 #, c-format
 msgid ""
 "<span size='larger' weight='bold'>Welcome to %s!</span>\n"
@@ -12153,11 +12129,11 @@
 "Kontaktlistenfenster zu diesem Dialog zurückkehren und Konten hinzufügen, "
 "bearbeiten oder löschen"
 
-#: ../pidgin/gtkblist.c:727
+#: ../pidgin/gtkblist.c:763
 msgid "Join a Chat"
 msgstr "Chat betreten"
 
-#: ../pidgin/gtkblist.c:748
+#: ../pidgin/gtkblist.c:784
 msgid ""
 "Please enter the appropriate information about the chat you would like to "
 "join.\n"
@@ -12166,211 +12142,219 @@
 "wollen.\n"
 
 #. Set up stuff for the account box
-#: ../pidgin/gtkblist.c:759 ../pidgin/gtkblist.c:5441
-#: ../pidgin/gtkblist.c:5808 ../pidgin/gtkpounce.c:531
-#: ../pidgin/gtkroomlist.c:399
+#: ../pidgin/gtkblist.c:795 ../pidgin/gtkblist.c:5467
+#: ../pidgin/gtkblist.c:5834 ../pidgin/gtkpounce.c:540
+#: ../pidgin/gtkroomlist.c:395
 msgid "_Account:"
 msgstr "_Konto:"
 
-#: ../pidgin/gtkblist.c:1048 ../pidgin/gtkprivacy.c:606
-#: ../pidgin/gtkprivacy.c:620
+#: ../pidgin/gtkblist.c:1084 ../pidgin/gtkprivacy.c:602
+#: ../pidgin/gtkprivacy.c:616
 msgid "_Block"
 msgstr "_Sperren"
 
-#: ../pidgin/gtkblist.c:1048
+#: ../pidgin/gtkblist.c:1084
 msgid "Un_block"
 msgstr "_Sperrung aufheben"
 
-#: ../pidgin/gtkblist.c:1099
+#: ../pidgin/gtkblist.c:1135
 msgid "Get _Info"
 msgstr "_Info abrufen"
 
-#: ../pidgin/gtkblist.c:1102 ../pidgin/pidginstock.c:84
+#: ../pidgin/gtkblist.c:1138 ../pidgin/pidginstock.c:84
 msgid "I_M"
 msgstr "I_M"
 
-#: ../pidgin/gtkblist.c:1108
+#: ../pidgin/gtkblist.c:1144
 msgid "_Send File"
 msgstr "Datei ver_senden"
 
-#: ../pidgin/gtkblist.c:1115
+#: ../pidgin/gtkblist.c:1151
 msgid "Add Buddy _Pounce"
 msgstr "B_uddy-Alarm hinzufügen"
 
-#: ../pidgin/gtkblist.c:1119 ../pidgin/gtkblist.c:1123
-#: ../pidgin/gtkblist.c:1225 ../pidgin/gtkblist.c:1248
+#: ../pidgin/gtkblist.c:1155 ../pidgin/gtkblist.c:1159
+#: ../pidgin/gtkblist.c:1262 ../pidgin/gtkblist.c:1285
 msgid "View _Log"
 msgstr "Mi_tschnitt anzeigen"
 
-#: ../pidgin/gtkblist.c:1135 ../pidgin/gtkblist.c:1144
-#: ../pidgin/gtkblist.c:1233 ../pidgin/gtkblist.c:1254
+#: ../pidgin/gtkblist.c:1171 ../pidgin/gtkblist.c:1180
+#: ../pidgin/gtkblist.c:1270 ../pidgin/gtkblist.c:1291
 msgid "_Alias..."
 msgstr "_Alias..."
 
-#: ../pidgin/gtkblist.c:1138 ../pidgin/gtkblist.c:1146
-#: ../pidgin/gtkblist.c:1235 ../pidgin/gtkblist.c:1256
+#: ../pidgin/gtkblist.c:1174 ../pidgin/gtkblist.c:1182
+#: ../pidgin/gtkblist.c:1272 ../pidgin/gtkblist.c:1293
 msgid "_Remove"
 msgstr "_Entfernen"
 
-#: ../pidgin/gtkblist.c:1195
+#: ../pidgin/gtkblist.c:1232
 msgid "Add a _Buddy"
 msgstr "Buddy _hinzufügen"
 
-#: ../pidgin/gtkblist.c:1198
+#: ../pidgin/gtkblist.c:1235
 msgid "Add a C_hat"
 msgstr "C_hat hinzufügen"
 
-#: ../pidgin/gtkblist.c:1201
+#: ../pidgin/gtkblist.c:1238
 msgid "_Delete Group"
 msgstr "Gruppe _löschen"
 
-#: ../pidgin/gtkblist.c:1203
+#: ../pidgin/gtkblist.c:1240
 msgid "_Rename"
 msgstr "_Umbenennen"
 
 #. join button
-#: ../pidgin/gtkblist.c:1221 ../pidgin/gtkroomlist.c:306
-#: ../pidgin/gtkroomlist.c:463 ../pidgin/pidginstock.c:82
+#: ../pidgin/gtkblist.c:1258 ../pidgin/gtkroomlist.c:306
+#: ../pidgin/gtkroomlist.c:459 ../pidgin/pidginstock.c:82
 msgid "_Join"
 msgstr "_Betreten"
 
-#: ../pidgin/gtkblist.c:1223
+#: ../pidgin/gtkblist.c:1260
 msgid "Auto-Join"
 msgstr "Automatisch beitreten"
 
-#: ../pidgin/gtkblist.c:1261 ../pidgin/gtkblist.c:1284
+#: ../pidgin/gtkblist.c:1298 ../pidgin/gtkblist.c:1321
 msgid "_Collapse"
 msgstr "_Zusammenklappen"
 
-#: ../pidgin/gtkblist.c:1289
+#: ../pidgin/gtkblist.c:1326
 msgid "_Expand"
 msgstr "A_usklappen"
 
-#: ../pidgin/gtkblist.c:1534 ../pidgin/gtkblist.c:1546
-#: ../pidgin/gtkblist.c:4543 ../pidgin/gtkblist.c:4553
+#: ../pidgin/gtkblist.c:1571 ../pidgin/gtkblist.c:1583
+#: ../pidgin/gtkblist.c:4561 ../pidgin/gtkblist.c:4571
 msgid "/Tools/Mute Sounds"
 msgstr "/Werkzeuge/Stummschalten"
 
-#: ../pidgin/gtkblist.c:2006 ../pidgin/gtkconv.c:4650
-#: ../pidgin/gtkpounce.c:423
-msgid ""
-"You are not currently signed on with an account that can add that buddy."
+#: ../pidgin/gtkblist.c:2043 ../pidgin/gtkconv.c:4605
+#: ../pidgin/gtkpounce.c:429
+msgid "You are not currently signed on with an account that can add that buddy."
 msgstr ""
 "Sie sind im Moment nicht mit einem Konto angemeldet, welches benutzt werden "
 "kann, um diesen Buddy hinzuzufügen."
 
 #. Buddies menu
-#: ../pidgin/gtkblist.c:2846
+#: ../pidgin/gtkblist.c:2838
 msgid "/_Buddies"
 msgstr "/_Buddys"
 
-#: ../pidgin/gtkblist.c:2847
+#: ../pidgin/gtkblist.c:2839
 msgid "/Buddies/New Instant _Message..."
 msgstr "/Buddys/_Neue Sofortnachricht..."
 
-#: ../pidgin/gtkblist.c:2848
+#: ../pidgin/gtkblist.c:2840
 msgid "/Buddies/Join a _Chat..."
 msgstr "/Buddys/Einen _Chat betreten..."
 
-#: ../pidgin/gtkblist.c:2849
+#: ../pidgin/gtkblist.c:2841
 msgid "/Buddies/Get User _Info..."
 msgstr "/Buddys/B_enutzer-Info abrufen..."
 
-#: ../pidgin/gtkblist.c:2850
+#: ../pidgin/gtkblist.c:2842
 msgid "/Buddies/View User _Log..."
 msgstr "/Buddys/Benutzer-_Mitschnitt ansehen..."
 
-#: ../pidgin/gtkblist.c:2852
+#: ../pidgin/gtkblist.c:2844
 msgid "/Buddies/Show _Offline Buddies"
 msgstr "/Buddys/Zeige _Offline-Buddys"
 
-#: ../pidgin/gtkblist.c:2853
+#: ../pidgin/gtkblist.c:2845
 msgid "/Buddies/Show _Empty Groups"
 msgstr "/Buddys/Zeige _leere Gruppen"
 
+#: ../pidgin/gtkblist.c:2846
+msgid "/Buddies/Show Buddy _Details"
+msgstr "/Buddys/Zeige Buddy-_Details"
+
+#: ../pidgin/gtkblist.c:2847
+msgid "/Buddies/Show Idle _Times"
+msgstr "/Buddys/Zeige Untätigkeitszei_ten"
+
+#: ../pidgin/gtkblist.c:2848
+msgid "/Buddies/_Sort Buddies"
+msgstr "/Buddys/Buddys _sortieren"
+
+#: ../pidgin/gtkblist.c:2850
+msgid "/Buddies/_Add Buddy..."
+msgstr "/Buddys/B_uddy hinzufügen..."
+
+#: ../pidgin/gtkblist.c:2851
+msgid "/Buddies/Add C_hat..."
+msgstr "/Buddys/C_hat hinzufügen..."
+
+#: ../pidgin/gtkblist.c:2852
+msgid "/Buddies/Add _Group..."
+msgstr "/Buddys/_Gruppe hinzufügen..."
+
 #: ../pidgin/gtkblist.c:2854
-msgid "/Buddies/Show Buddy _Details"
-msgstr "/Buddys/Zeige Buddy-_Details"
-
-#: ../pidgin/gtkblist.c:2855
-msgid "/Buddies/Show Idle _Times"
-msgstr "/Buddys/Zeige Untätigkeitszei_ten"
-
-#: ../pidgin/gtkblist.c:2856
-msgid "/Buddies/_Sort Buddies"
-msgstr "/Buddys/Buddys _sortieren"
-
-#: ../pidgin/gtkblist.c:2858
-msgid "/Buddies/_Add Buddy..."
-msgstr "/Buddys/B_uddy hinzufügen..."
-
-#: ../pidgin/gtkblist.c:2859
-msgid "/Buddies/Add C_hat..."
-msgstr "/Buddys/C_hat hinzufügen..."
-
-#: ../pidgin/gtkblist.c:2860
-msgid "/Buddies/Add _Group..."
-msgstr "/Buddys/_Gruppe hinzufügen..."
-
-#: ../pidgin/gtkblist.c:2862
-msgid "/Buddies/_About Pidgin"
-msgstr "/Buddys/Über _Pidgin"
-
-#: ../pidgin/gtkblist.c:2863
 msgid "/Buddies/_Quit"
 msgstr "/Buddys/_Beenden"
 
 #. Accounts menu
-#: ../pidgin/gtkblist.c:2866
+#: ../pidgin/gtkblist.c:2857
 msgid "/_Accounts"
 msgstr "/_Konten"
 
-#: ../pidgin/gtkblist.c:2867 ../pidgin/gtkblist.c:6506
+#: ../pidgin/gtkblist.c:2858 ../pidgin/gtkblist.c:6532
 msgid "/Accounts/Add\\/Edit"
 msgstr "/Konten/Hinzufügen\\/Ändern"
 
 #. Tools
-#: ../pidgin/gtkblist.c:2870
+#: ../pidgin/gtkblist.c:2861
 msgid "/_Tools"
 msgstr "/_Werkzeuge"
 
-#: ../pidgin/gtkblist.c:2871
+#: ../pidgin/gtkblist.c:2862
 msgid "/Tools/Buddy _Pounces"
 msgstr "/Werkzeuge/Buddy-_Alarm"
 
-#: ../pidgin/gtkblist.c:2872
+#: ../pidgin/gtkblist.c:2863
 msgid "/Tools/Plu_gins"
 msgstr "/Werkzeuge/Plu_gins"
 
-#: ../pidgin/gtkblist.c:2873
+#: ../pidgin/gtkblist.c:2864
 msgid "/Tools/Pr_eferences"
 msgstr "/Werkzeuge/_Einstellungen"
 
-#: ../pidgin/gtkblist.c:2874
+#: ../pidgin/gtkblist.c:2865
 msgid "/Tools/Pr_ivacy"
 msgstr "/Werkzeuge/Pri_vatsphäre"
 
-#: ../pidgin/gtkblist.c:2876
+#: ../pidgin/gtkblist.c:2867
 msgid "/Tools/_File Transfers"
 msgstr "/Werkzeuge/_Dateiübertragungen"
 
-#: ../pidgin/gtkblist.c:2877
+#: ../pidgin/gtkblist.c:2868
 msgid "/Tools/R_oom List"
 msgstr "/Werkzeuge/Chat_räume"
 
-#: ../pidgin/gtkblist.c:2878
+#: ../pidgin/gtkblist.c:2869
 msgid "/Tools/System _Log"
 msgstr "/Werkzeuge/_System-Mitschnitt"
 
-#: ../pidgin/gtkblist.c:2879
-msgid "/Tools/_Debug Window"
-msgstr "/Werkzeuge/_Debug-Fenster"
-
-#: ../pidgin/gtkblist.c:2881
+#: ../pidgin/gtkblist.c:2871
 msgid "/Tools/Mute _Sounds"
 msgstr "/Werkzeuge/_Stummschalten"
 
-#: ../pidgin/gtkblist.c:2909
+#. Help
+#: ../pidgin/gtkblist.c:2873
+msgid "/_Help"
+msgstr "/_Hilfe"
+
+#: ../pidgin/gtkblist.c:2874
+msgid "/Help/Online _Help"
+msgstr "/Hilfe/Online-_Hilfe"
+
+#: ../pidgin/gtkblist.c:2875
+msgid "/Help/_Debug Window"
+msgstr "/Hilfe/_Debug-Fenster"
+
+#: ../pidgin/gtkblist.c:2877 ../pidgin/gtkblist.c:2879
+msgid "/Help/_About"
+msgstr "/Hilfe/Ü_ber"
+
+#: ../pidgin/gtkblist.c:2908
 #, c-format
 msgid ""
 "\n"
@@ -12379,7 +12363,7 @@
 "\n"
 "<b>Konto:</b> %s"
 
-#: ../pidgin/gtkblist.c:2987
+#: ../pidgin/gtkblist.c:2986
 msgid "Buddy Alias"
 msgstr "Buddy-Alias"
 
@@ -12403,103 +12387,108 @@
 msgid "Rockin'"
 msgstr "Abgefahren"
 
-#: ../pidgin/gtkblist.c:3414
+#: ../pidgin/gtkblist.c:3428
+#, c-format
+msgid "Idle %dd %dh %02dm"
+msgstr "Untätig %dd %dh %02dm"
+
+#: ../pidgin/gtkblist.c:3430
 #, c-format
 msgid "Idle %dh %02dm"
 msgstr "Untätig %dh %02dm"
 
-#: ../pidgin/gtkblist.c:3416
+#: ../pidgin/gtkblist.c:3432
 #, c-format
 msgid "Idle %dm"
 msgstr "Untätig %dm"
 
-#: ../pidgin/gtkblist.c:3561
+#: ../pidgin/gtkblist.c:3577
 msgid "/Buddies/New Instant Message..."
-msgstr "/Buddys/_Neue Sofortnachricht..."
-
-#: ../pidgin/gtkblist.c:3562 ../pidgin/gtkblist.c:3595
+msgstr "/Buddys/Neue Sofortnachricht..."
+
+#: ../pidgin/gtkblist.c:3578 ../pidgin/gtkblist.c:3611
 msgid "/Buddies/Join a Chat..."
 msgstr "/Buddys/Chat betreten..."
 
-#: ../pidgin/gtkblist.c:3563
+#: ../pidgin/gtkblist.c:3579
 msgid "/Buddies/Get User Info..."
-msgstr "/Buddys/B_enutzer-Info abrufen..."
-
-#: ../pidgin/gtkblist.c:3564
+msgstr "/Buddys/Benutzer-Info abrufen..."
+
+#: ../pidgin/gtkblist.c:3580
 msgid "/Buddies/Add Buddy..."
-msgstr "/Buddys/B_uddy hinzufügen..."
-
-#: ../pidgin/gtkblist.c:3565 ../pidgin/gtkblist.c:3598
+msgstr "/Buddys/Buddy hinzufügen..."
+
+#: ../pidgin/gtkblist.c:3581 ../pidgin/gtkblist.c:3614
 msgid "/Buddies/Add Chat..."
-msgstr "/Buddys/C_hat hinzufügen..."
-
-#: ../pidgin/gtkblist.c:3566
+msgstr "/Buddys/Chat hinzufügen..."
+
+#: ../pidgin/gtkblist.c:3582
 msgid "/Buddies/Add Group..."
 msgstr "/Buddys/Gruppe hinzufügen..."
 
-#: ../pidgin/gtkblist.c:3601
+#: ../pidgin/gtkblist.c:3617
 msgid "/Tools/Privacy"
 msgstr "/Werkzeuge/Privatsphäre"
 
-#: ../pidgin/gtkblist.c:3604
+#: ../pidgin/gtkblist.c:3620
 msgid "/Tools/Room List"
 msgstr "/Werkzeuge/Chaträume"
 
-#: ../pidgin/gtkblist.c:3701 ../pidgin/gtkdocklet.c:153
+#: ../pidgin/gtkblist.c:3717 ../pidgin/gtkdocklet.c:153
 #, 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:3781
+#: ../pidgin/gtkblist.c:3797
 msgid "Manually"
 msgstr "Manuell"
 
-#: ../pidgin/gtkblist.c:3783
+#: ../pidgin/gtkblist.c:3799
 msgid "Alphabetically"
 msgstr "Alphabetisch"
 
-#: ../pidgin/gtkblist.c:3784
+#: ../pidgin/gtkblist.c:3800
 msgid "By status"
 msgstr "Nach Status"
 
-#: ../pidgin/gtkblist.c:3785
+#: ../pidgin/gtkblist.c:3801
 msgid "By log size"
 msgstr "Nach Größe der Logs"
 
-#: ../pidgin/gtkblist.c:3987 ../pidgin/gtkconn.c:178
+#: ../pidgin/gtkblist.c:4005 ../pidgin/gtkconn.c:178
 #, c-format
 msgid "%s disconnected"
 msgstr "%s abgemeldet"
 
-#: ../pidgin/gtkblist.c:3997
+#: ../pidgin/gtkblist.c:4015
 msgid "Re-enable Account"
 msgstr "Konten reaktivieren"
 
-#: ../pidgin/gtkblist.c:4021
+#: ../pidgin/gtkblist.c:4039
 #, c-format
 msgid "<span color=\"red\">%s disconnected: %s</span>"
 msgstr "<span color=\"red\">%s abgemeldet: %s</span>"
 
-#: ../pidgin/gtkblist.c:4173
+#: ../pidgin/gtkblist.c:4191
 msgid "<b>Username:</b>"
 msgstr "<b>Benutzername:</b>"
 
-#: ../pidgin/gtkblist.c:4180
+#: ../pidgin/gtkblist.c:4198
 msgid "<b>Password:</b>"
 msgstr "<b>Passwort:</b>"
 
-#: ../pidgin/gtkblist.c:4191
+#: ../pidgin/gtkblist.c:4209
 msgid "_Login"
 msgstr "_Anmelden"
 
-#: ../pidgin/gtkblist.c:4276
+#: ../pidgin/gtkblist.c:4292
 msgid "/Accounts"
 msgstr "/Konten"
 
 #. Translators: Please maintain the use of -> and <- to refer to menu heirarchy
-#: ../pidgin/gtkblist.c:4290
+#: ../pidgin/gtkblist.c:4306
 #, c-format
 msgid ""
 "<span weight='bold' size='larger'>Welcome to %s!</span>\n"
@@ -12518,23 +12507,23 @@
 #. set the Show Offline Buddies option. must be done
 #. * after the treeview or faceprint gets mad. -Robot101
 #.
-#: ../pidgin/gtkblist.c:4537
+#: ../pidgin/gtkblist.c:4555
 msgid "/Buddies/Show Offline Buddies"
 msgstr "/Buddys/Zeige Offline-Buddys"
 
-#: ../pidgin/gtkblist.c:4540
+#: ../pidgin/gtkblist.c:4558
 msgid "/Buddies/Show Empty Groups"
 msgstr "/Buddys/Zeige leere Gruppen"
 
-#: ../pidgin/gtkblist.c:4546
+#: ../pidgin/gtkblist.c:4564
 msgid "/Buddies/Show Buddy Details"
 msgstr "/Buddys/Zeige Buddy-Details"
 
-#: ../pidgin/gtkblist.c:4549
+#: ../pidgin/gtkblist.c:4567
 msgid "/Buddies/Show Idle Times"
 msgstr "/Buddys/Zeige Untätigkeitszeiten"
 
-#: ../pidgin/gtkblist.c:5418
+#: ../pidgin/gtkblist.c:5444
 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. "
@@ -12546,25 +12535,25 @@
 "immer es möglich ist.\n"
 
 #. End of account box
-#: ../pidgin/gtkblist.c:5453
+#: ../pidgin/gtkblist.c:5479
 msgid "_Screen name:"
 msgstr "_Benutzername:"
 
-#: ../pidgin/gtkblist.c:5475 ../pidgin/gtkblist.c:5829
+#: ../pidgin/gtkblist.c:5501 ../pidgin/gtkblist.c:5855
 msgid "A_lias:"
 msgstr "A_lias:"
 
-#: ../pidgin/gtkblist.c:5741
+#: ../pidgin/gtkblist.c:5767
 msgid "This protocol does not support chat rooms."
 msgstr "Dieses Protokoll unterstützt keine Chaträume."
 
-#: ../pidgin/gtkblist.c:5757
+#: ../pidgin/gtkblist.c:5783
 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:5798
+#: ../pidgin/gtkblist.c:5824
 msgid ""
 "Please enter an alias, and the appropriate information about the chat you "
 "would like to add to your buddy list.\n"
@@ -12572,41 +12561,41 @@
 "Bitte geben Sie einen Alias und geeignete Informationen über den Chat ein, "
 "den Sie in Ihre Buddy-Liste aufnehmen wollen.\n"
 
-#: ../pidgin/gtkblist.c:5886
+#: ../pidgin/gtkblist.c:5912
 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:6526
+#: ../pidgin/gtkblist.c:6552
 msgid "<PurpleMain>/Accounts/"
 msgstr "<PurpleMain>/Konten"
 
-#: ../pidgin/gtkblist.c:6550
+#: ../pidgin/gtkblist.c:6576
 msgid "_Edit Account"
 msgstr "Konto _bearbeiten"
 
-#: ../pidgin/gtkblist.c:6563 ../pidgin/gtkconv.c:3024
+#: ../pidgin/gtkblist.c:6589 ../pidgin/gtkconv.c:2983
 msgid "No actions available"
 msgstr "Keine Aktionen verfügbar"
 
-#: ../pidgin/gtkblist.c:6571
+#: ../pidgin/gtkblist.c:6597
 msgid "_Disable"
 msgstr "_Deaktivieren"
 
-#: ../pidgin/gtkblist.c:6583
+#: ../pidgin/gtkblist.c:6609
 msgid "Enable Account"
 msgstr "Konten aktivieren"
 
-#: ../pidgin/gtkblist.c:6589
+#: ../pidgin/gtkblist.c:6615
 msgid "<PurpleMain>/Accounts/Enable Account"
 msgstr "<PurpleMain>/Konten/Konto aktivieren"
 
-#: ../pidgin/gtkblist.c:6638
+#: ../pidgin/gtkblist.c:6664
 msgid "/Tools"
 msgstr "/Werkzeuge"
 
-#: ../pidgin/gtkblist.c:6708
+#: ../pidgin/gtkblist.c:6734
 msgid "/Buddies/Sort Buddies"
-msgstr "/Buddys/Buddys _sortieren"
+msgstr "/Buddys/Buddys sortieren"
 
 #: ../pidgin/gtkconn.c:179
 #, c-format
@@ -12621,23 +12610,26 @@
 "%s wird nicht versuchen, das Konto wieder zu verbinden bis Sie den Fehler "
 "behoben und das Konto wieder aktiviert haben."
 
-#: ../pidgin/gtkconv.c:793 ../pidgin/gtkconv.c:819
+#: ../pidgin/gtkconv.c:486
+msgid "Unknown command."
+msgstr "Unbekanntes Kommando."
+
+#: ../pidgin/gtkconv.c:758 ../pidgin/gtkconv.c:784
 msgid "That buddy is not on the same protocol as this chat."
 msgstr "Der Buddy hat nicht das gleiche Protokoll wie dieser Chat."
 
-#: ../pidgin/gtkconv.c:813
-msgid ""
-"You are not currently signed on with an account that can invite that buddy."
+#: ../pidgin/gtkconv.c:778
+msgid "You are not currently signed on with an account that can invite that buddy."
 msgstr ""
 "Sie sind im Moment nicht mit einem Konto angemeldet, welches benutzt werden "
 "kann, um diesen Buddy einzuladen."
 
-#: ../pidgin/gtkconv.c:866
+#: ../pidgin/gtkconv.c:831
 msgid "Invite Buddy Into Chat Room"
 msgstr "Buddy in einen Chatraum einladen"
 
 #. Put our happy label in it.
-#: ../pidgin/gtkconv.c:896
+#: ../pidgin/gtkconv.c:861
 msgid ""
 "Please enter the name of the user you wish to invite, along with an optional "
 "invite message."
@@ -12645,372 +12637,378 @@
 "Bitte geben Sie den Benutzernamen der Person ein, die Sie einladen möchten "
 "zusammen mit einer optionalen Einladungsnachricht."
 
-#: ../pidgin/gtkconv.c:917
+#: ../pidgin/gtkconv.c:882
 msgid "_Buddy:"
 msgstr "_Buddy:"
 
-#: ../pidgin/gtkconv.c:937 ../pidgin/gtksavedstatuses.c:1141
-#: ../pidgin/gtksavedstatuses.c:1477
+#: ../pidgin/gtkconv.c:902 ../pidgin/gtksavedstatuses.c:1193
+#: ../pidgin/gtksavedstatuses.c:1525
 msgid "_Message:"
 msgstr "_Nachricht:"
 
-#: ../pidgin/gtkconv.c:994 ../pidgin/gtkconv.c:2548 ../pidgin/gtkdebug.c:218
+#: ../pidgin/gtkconv.c:959 ../pidgin/gtkconv.c:2507 ../pidgin/gtkdebug.c:218
 #: ../pidgin/gtkft.c:542
 msgid "Unable to open file."
 msgstr "Konnte die Datei nicht öffnen."
 
-#: ../pidgin/gtkconv.c:1000
+#: ../pidgin/gtkconv.c:965
 #, c-format
 msgid "<h1>Conversation with %s</h1>\n"
 msgstr "<h1>Unterhaltung mit %s</h1>\n"
 
-#: ../pidgin/gtkconv.c:1036
+#: ../pidgin/gtkconv.c:1001
 msgid "Save Conversation"
 msgstr "Unterhaltung speichern"
 
-#: ../pidgin/gtkconv.c:1185 ../pidgin/gtkdebug.c:166 ../pidgin/gtkdebug.c:742
+#: ../pidgin/gtkconv.c:1150 ../pidgin/gtkdebug.c:166 ../pidgin/gtkdebug.c:742
 msgid "Find"
 msgstr "Suchen"
 
-#: ../pidgin/gtkconv.c:1211 ../pidgin/gtkdebug.c:194
+#: ../pidgin/gtkconv.c:1176 ../pidgin/gtkdebug.c:194
 msgid "_Search for:"
 msgstr "_Suche nach:"
 
-#: ../pidgin/gtkconv.c:1394
+#: ../pidgin/gtkconv.c:1359
 msgid "Logging started. Future messages in this conversation will be logged."
 msgstr ""
 "Mitschnitt gestartet. Zukünftige Nachrichten dieser Unterhaltung werden "
 "mitgeschnitten."
 
-#: ../pidgin/gtkconv.c:1402
-msgid ""
-"Logging stopped. Future messages in this conversation will not be logged."
+#: ../pidgin/gtkconv.c:1367
+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:1650
+#: ../pidgin/gtkconv.c:1615
 msgid "Un-Ignore"
 msgstr "Nicht Ignorieren"
 
-#: ../pidgin/gtkconv.c:1653
+#: ../pidgin/gtkconv.c:1618
 msgid "Ignore"
 msgstr "Ignorieren"
 
-#: ../pidgin/gtkconv.c:1673
+#: ../pidgin/gtkconv.c:1638
 msgid "Get Away Message"
 msgstr "Neue Abwesenheitsnachricht abholen"
 
-#: ../pidgin/gtkconv.c:1696
+#: ../pidgin/gtkconv.c:1661
 msgid "Last said"
 msgstr "Zuletzt gesagt"
 
-#: ../pidgin/gtkconv.c:2556
+#: ../pidgin/gtkconv.c:2515
 msgid "Unable to save icon file to disk."
 msgstr "Kann Icon-Datei nicht auf die Festplatte speichern."
 
-#: ../pidgin/gtkconv.c:2607
+#: ../pidgin/gtkconv.c:2566
 msgid "Save Icon"
 msgstr "Icon speichern"
 
-#: ../pidgin/gtkconv.c:2659
+#: ../pidgin/gtkconv.c:2618
 msgid "Animate"
 msgstr "Animieren"
 
-#: ../pidgin/gtkconv.c:2664
+#: ../pidgin/gtkconv.c:2623
 msgid "Hide Icon"
 msgstr "Icon verbergen"
 
-#: ../pidgin/gtkconv.c:2667
+#: ../pidgin/gtkconv.c:2626
 msgid "Save Icon As..."
 msgstr "Icon speichern unter..."
 
-#: ../pidgin/gtkconv.c:2671
+#: ../pidgin/gtkconv.c:2630
 msgid "Set Custom Icon..."
 msgstr "Setze benutzerdefiniertes Icon..."
 
-#: ../pidgin/gtkconv.c:2684
+#: ../pidgin/gtkconv.c:2643
 msgid "Remove Custom Icon"
 msgstr "Benutzerdefiniertes Icon entfernen"
 
 #. Conversation menu
-#: ../pidgin/gtkconv.c:2826
+#: ../pidgin/gtkconv.c:2785
 msgid "/_Conversation"
 msgstr "/_Unterhaltung"
 
-#: ../pidgin/gtkconv.c:2828
+#: ../pidgin/gtkconv.c:2787
 msgid "/Conversation/New Instant _Message..."
 msgstr "/Unterhaltung/_Neue Sofortnachricht..."
 
-#: ../pidgin/gtkconv.c:2833
+#: ../pidgin/gtkconv.c:2792
 msgid "/Conversation/_Find..."
 msgstr "/Unterhaltung/_Finden..."
 
-#: ../pidgin/gtkconv.c:2835
+#: ../pidgin/gtkconv.c:2794
 msgid "/Conversation/View _Log"
 msgstr "/Unterhaltung/Betrachte _Mitschnitt"
 
-#: ../pidgin/gtkconv.c:2836
+#: ../pidgin/gtkconv.c:2795
 msgid "/Conversation/_Save As..."
 msgstr "/Unterhaltung/_Speichern als..."
 
-#: ../pidgin/gtkconv.c:2838
+#: ../pidgin/gtkconv.c:2797
 msgid "/Conversation/Clea_r Scrollback"
 msgstr "/Unterhaltung/_Leeren"
 
-#: ../pidgin/gtkconv.c:2842
+#: ../pidgin/gtkconv.c:2801
 msgid "/Conversation/Se_nd File..."
 msgstr "/Unterhaltung/Datei _senden..."
 
-#: ../pidgin/gtkconv.c:2843
+#: ../pidgin/gtkconv.c:2802
 msgid "/Conversation/Add Buddy _Pounce..."
 msgstr "/Unterhaltung/Buddy-Alar_m hinzufügen..."
 
-#: ../pidgin/gtkconv.c:2845
+#: ../pidgin/gtkconv.c:2804
 msgid "/Conversation/_Get Info"
 msgstr "/Unterhaltung/B_enutzer-Info abrufen"
 
-#: ../pidgin/gtkconv.c:2847
+#: ../pidgin/gtkconv.c:2806
 msgid "/Conversation/In_vite..."
 msgstr "/Unterhaltung/_Einladen..."
 
-#: ../pidgin/gtkconv.c:2849
+#: ../pidgin/gtkconv.c:2808
 msgid "/Conversation/M_ore"
 msgstr "/Unterhaltung/M_ehr"
 
-#: ../pidgin/gtkconv.c:2853
+#: ../pidgin/gtkconv.c:2812
 msgid "/Conversation/Al_ias..."
 msgstr "/Unterhaltung/Al_ias..."
 
-#: ../pidgin/gtkconv.c:2855
+#: ../pidgin/gtkconv.c:2814
 msgid "/Conversation/_Block..."
 msgstr "/Unterhaltung/_Blockieren..."
 
-#: ../pidgin/gtkconv.c:2857
+#: ../pidgin/gtkconv.c:2816
 msgid "/Conversation/_Unblock..."
 msgstr "/Unterhaltung/_Entsperren..."
 
-#: ../pidgin/gtkconv.c:2859
+#: ../pidgin/gtkconv.c:2818
 msgid "/Conversation/_Add..."
 msgstr "/Unterhaltung/_Hinzufügen..."
 
-#: ../pidgin/gtkconv.c:2861
+#: ../pidgin/gtkconv.c:2820
 msgid "/Conversation/_Remove..."
 msgstr "/Unterhaltung/_Entfernen..."
 
-#: ../pidgin/gtkconv.c:2866
+#: ../pidgin/gtkconv.c:2825
 msgid "/Conversation/Insert Lin_k..."
 msgstr "/Unterhaltung/Lin_k einfügen..."
 
-#: ../pidgin/gtkconv.c:2868
+#: ../pidgin/gtkconv.c:2827
 msgid "/Conversation/Insert Imag_e..."
 msgstr "/Unterhaltung/Bil_d einfügen..."
 
-#: ../pidgin/gtkconv.c:2874
+#: ../pidgin/gtkconv.c:2833
 msgid "/Conversation/_Close"
 msgstr "/Unterhaltung/S_chließen"
 
 #. Options
-#: ../pidgin/gtkconv.c:2878
+#: ../pidgin/gtkconv.c:2837
 msgid "/_Options"
 msgstr "/_Optionen"
 
-#: ../pidgin/gtkconv.c:2879
+#: ../pidgin/gtkconv.c:2838
 msgid "/Options/Enable _Logging"
 msgstr "/Optionen/Schalte _Mitschnitt ein"
 
-#: ../pidgin/gtkconv.c:2880
+#: ../pidgin/gtkconv.c:2839
 msgid "/Options/Enable _Sounds"
 msgstr "/Optionen/Schalte _Klänge ein"
 
-#: ../pidgin/gtkconv.c:2881
+#: ../pidgin/gtkconv.c:2840
 msgid "/Options/Show Buddy _Icon"
 msgstr "/Optionen/Buddy-_Icon anzeigen"
 
-#: ../pidgin/gtkconv.c:2883
+#: ../pidgin/gtkconv.c:2842
 msgid "/Options/Show Formatting _Toolbars"
 msgstr "/Optionen/Zeige _Werkzeugleisten für Formatierung"
 
-#: ../pidgin/gtkconv.c:2884
+#: ../pidgin/gtkconv.c:2843
 msgid "/Options/Show Ti_mestamps"
 msgstr "/Optionen/Zeige Zeitste_mpel"
 
-#: ../pidgin/gtkconv.c:2960
+#: ../pidgin/gtkconv.c:2919
 msgid "/Conversation/More"
 msgstr "/Unterhaltung/Mehr"
 
+#: ../pidgin/gtkconv.c:3027
+msgid "/Options"
+msgstr "/Optionen"
+
 #. The menubar has been deactivated. Make sure the 'More' submenu is regenerated next time
 #. * the 'Conversation' menu pops up.
 #. Make sure the 'Conversation -> More' menuitems are regenerated whenever
 #. * the 'Conversation' menu pops up because the entries can change after the
 #. * conversation is created.
-#: ../pidgin/gtkconv.c:3048 ../pidgin/gtkconv.c:3080
+#: ../pidgin/gtkconv.c:3062 ../pidgin/gtkconv.c:3094
 msgid "/Conversation"
 msgstr "/Unterhaltung"
 
-#: ../pidgin/gtkconv.c:3088
+#: ../pidgin/gtkconv.c:3102
 msgid "/Conversation/View Log"
 msgstr "/Unterhaltung/Betrachte Mitschnitt"
 
-#: ../pidgin/gtkconv.c:3094
+#: ../pidgin/gtkconv.c:3108
 msgid "/Conversation/Send File..."
 msgstr "/Unterhaltung/Datei senden ..."
 
-#: ../pidgin/gtkconv.c:3098
+#: ../pidgin/gtkconv.c:3112
 msgid "/Conversation/Add Buddy Pounce..."
 msgstr "/Unterhaltung/Buddy-Alarm hinzufügen..."
 
-#: ../pidgin/gtkconv.c:3104
+#: ../pidgin/gtkconv.c:3118
 msgid "/Conversation/Get Info"
 msgstr "/Unterhaltung/Info abrufen"
 
-#: ../pidgin/gtkconv.c:3108
+#: ../pidgin/gtkconv.c:3122
 msgid "/Conversation/Invite..."
 msgstr "/Unterhaltung/Einladen ..."
 
-#: ../pidgin/gtkconv.c:3114
+#: ../pidgin/gtkconv.c:3128
 msgid "/Conversation/Alias..."
 msgstr "/Unterhaltung/Alias..."
 
-#: ../pidgin/gtkconv.c:3118
+#: ../pidgin/gtkconv.c:3132
 msgid "/Conversation/Block..."
 msgstr "/Unterhaltung/Blockieren..."
 
-#: ../pidgin/gtkconv.c:3122
+#: ../pidgin/gtkconv.c:3136
 msgid "/Conversation/Unblock..."
 msgstr "/Unterhaltung/Entsperren..."
 
-#: ../pidgin/gtkconv.c:3126
+#: ../pidgin/gtkconv.c:3140
 msgid "/Conversation/Add..."
 msgstr "/Unterhaltung/Hinzufügen..."
 
-#: ../pidgin/gtkconv.c:3130
+#: ../pidgin/gtkconv.c:3144
 msgid "/Conversation/Remove..."
 msgstr "/Unterhaltung/Entfernen..."
 
-#: ../pidgin/gtkconv.c:3136
+#: ../pidgin/gtkconv.c:3150
 msgid "/Conversation/Insert Link..."
 msgstr "/Unterhaltung/Link einfügen..."
 
-#: ../pidgin/gtkconv.c:3140
+#: ../pidgin/gtkconv.c:3154
 msgid "/Conversation/Insert Image..."
 msgstr "/Unterhaltung/Bild einfügen..."
 
-#: ../pidgin/gtkconv.c:3146
+#: ../pidgin/gtkconv.c:3160
 msgid "/Options/Enable Logging"
 msgstr "/Optionen/Schalte Mitschnitt ein"
 
-#: ../pidgin/gtkconv.c:3149
+#: ../pidgin/gtkconv.c:3163
 msgid "/Options/Enable Sounds"
 msgstr "/Optionen/Schalte Klänge ein"
 
-#: ../pidgin/gtkconv.c:3162
+#: ../pidgin/gtkconv.c:3176
 msgid "/Options/Show Formatting Toolbars"
 msgstr "/Optionen/Zeige Werkzeugleisten für Formatierung"
 
-#: ../pidgin/gtkconv.c:3165
+#: ../pidgin/gtkconv.c:3179
 msgid "/Options/Show Timestamps"
 msgstr "/Optionen/Zeige Zeitstempel"
 
-#: ../pidgin/gtkconv.c:3168
+#: ../pidgin/gtkconv.c:3182
 msgid "/Options/Show Buddy Icon"
 msgstr "/Optionen/Zeige Buddy-Icon"
 
-#: ../pidgin/gtkconv.c:3252 ../pidgin/gtkconv.c:3294
+#: ../pidgin/gtkconv.c:3266 ../pidgin/gtkconv.c:3308
 msgid "User is typing..."
 msgstr "Benutzer tippt gerade..."
 
-#: ../pidgin/gtkconv.c:3297
+#: ../pidgin/gtkconv.c:3311
 msgid "User has typed something and stopped"
 msgstr "Benutzer hat etwas getippt und wartet nun"
 
 #. Build the Send To menu
-#: ../pidgin/gtkconv.c:3479
+#: ../pidgin/gtkconv.c:3493
 msgid "_Send To"
 msgstr "_Senden an"
 
-#: ../pidgin/gtkconv.c:4193
+#: ../pidgin/gtkconv.c:4207
 msgid "_Send"
 msgstr "Ab_schicken"
 
 #. Setup the label telling how many people are in the room.
-#: ../pidgin/gtkconv.c:4344
+#: ../pidgin/gtkconv.c:4311
 msgid "0 people in room"
 msgstr "0 Personen im Raum"
 
-#: ../pidgin/gtkconv.c:5536 ../pidgin/gtkconv.c:5657
+#: ../pidgin/gtkconv.c:5499 ../pidgin/gtkconv.c:5620
 #, 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:6231 ../pidgin/gtkstatusbox.c:657
+#: ../pidgin/gtkconv.c:6219 ../pidgin/gtkstatusbox.c:659
 msgid "Typing"
 msgstr "Tippt gerade"
 
-#: ../pidgin/gtkconv.c:6237
+#: ../pidgin/gtkconv.c:6225
 msgid "Stopped Typing"
 msgstr "Tippen gestoppt"
 
-#: ../pidgin/gtkconv.c:6242
+#: ../pidgin/gtkconv.c:6230
 msgid "Nick Said"
 msgstr "Spitzname gesagt"
 
-#: ../pidgin/gtkconv.c:6247 ../pidgin/gtkdocklet.c:492
+#: ../pidgin/gtkconv.c:6235 ../pidgin/gtkdocklet.c:492
 msgid "Unread Messages"
 msgstr "Ungelesene Nachrichten"
 
-#: ../pidgin/gtkconv.c:6252
+#: ../pidgin/gtkconv.c:6240
 msgid "New Event"
 msgstr "Neue Ereignisse"
 
-#: ../pidgin/gtkconv.c:7384
+#: ../pidgin/gtkconv.c:7213
+msgid "clear: Clears all conversation scrollbacks."
+msgstr "clear: Leert alle Gesprächsfenster."
+
+#: ../pidgin/gtkconv.c:7377
 msgid "Confirm close"
 msgstr "Schließen bestätigen"
 
-#: ../pidgin/gtkconv.c:7416
+#: ../pidgin/gtkconv.c:7409
 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:7938
+msgstr "Sie haben ungelesene Nachrichten. Wollen Sie das Fenster wirklich schließen?"
+
+#: ../pidgin/gtkconv.c:7976
 msgid "Close other tabs"
 msgstr "Andere Reiter schließen"
 
-#: ../pidgin/gtkconv.c:7944
+#: ../pidgin/gtkconv.c:7982
 msgid "Close all tabs"
 msgstr "Alle Reiter schließen"
 
-#: ../pidgin/gtkconv.c:7952
+#: ../pidgin/gtkconv.c:7990
 msgid "Detach this tab"
 msgstr "Diesen Reiter ablösen"
 
-#: ../pidgin/gtkconv.c:7958
+#: ../pidgin/gtkconv.c:7996
 msgid "Close this tab"
 msgstr "Diesen Reiter schließen"
 
-#: ../pidgin/gtkconv.c:8344
+#: ../pidgin/gtkconv.c:8442
 msgid "Close conversation"
 msgstr "Unterhaltung schließen"
 
-#: ../pidgin/gtkconv.c:8867
+#: ../pidgin/gtkconv.c:8966
 msgid "Last created window"
 msgstr "Letztes erstelltes Fenster"
 
-#: ../pidgin/gtkconv.c:8869
+#: ../pidgin/gtkconv.c:8968
 msgid "Separate IM and Chat windows"
 msgstr "Getrennte IM- und Chat-Fenster"
 
-#: ../pidgin/gtkconv.c:8871 ../pidgin/gtkprefs.c:1340
+#: ../pidgin/gtkconv.c:8970 ../pidgin/gtkprefs.c:1410
 msgid "New window"
 msgstr "Neues Fenster"
 
-#: ../pidgin/gtkconv.c:8873
+#: ../pidgin/gtkconv.c:8972
 msgid "By group"
 msgstr "Nach Gruppe"
 
-#: ../pidgin/gtkconv.c:8875
+#: ../pidgin/gtkconv.c:8974
 msgid "By account"
 msgstr "Nach Konto"
 
@@ -13275,6 +13273,7 @@
 msgstr "Kannada-Übersetzungsteam"
 
 #: ../pidgin/gtkdialogs.c:168 ../pidgin/gtkdialogs.c:232
+#: ../pidgin/gtkdialogs.c:233
 msgid "Korean"
 msgstr "Koreanisch"
 
@@ -13283,13 +13282,13 @@
 msgid "Kurdish"
 msgstr "Kurdisch"
 
-#: ../pidgin/gtkdialogs.c:172 ../pidgin/gtkdialogs.c:233
-#: ../pidgin/gtkdialogs.c:234
+#: ../pidgin/gtkdialogs.c:172 ../pidgin/gtkdialogs.c:234
+#: ../pidgin/gtkdialogs.c:235
 msgid "Lithuanian"
 msgstr "Litauisch"
 
 #: ../pidgin/gtkdialogs.c:173 ../pidgin/gtkdialogs.c:174
-#: ../pidgin/gtkdialogs.c:235
+#: ../pidgin/gtkdialogs.c:236
 msgid "Macedonian"
 msgstr "Makedonisch"
 
@@ -13310,7 +13309,7 @@
 msgstr "Norwegisch"
 
 #: ../pidgin/gtkdialogs.c:179 ../pidgin/gtkdialogs.c:180
-#: ../pidgin/gtkdialogs.c:181 ../pidgin/gtkdialogs.c:236
+#: ../pidgin/gtkdialogs.c:181 ../pidgin/gtkdialogs.c:237
 msgid "Polish"
 msgstr "Polnisch"
 
@@ -13330,18 +13329,18 @@
 msgid "Romanian"
 msgstr "Rumänisch"
 
-#: ../pidgin/gtkdialogs.c:186 ../pidgin/gtkdialogs.c:237
-#: ../pidgin/gtkdialogs.c:238
+#: ../pidgin/gtkdialogs.c:186 ../pidgin/gtkdialogs.c:238
+#: ../pidgin/gtkdialogs.c:239
 msgid "Russian"
 msgstr "Russisch"
 
 #: ../pidgin/gtkdialogs.c:187 ../pidgin/gtkdialogs.c:188
-#: ../pidgin/gtkdialogs.c:239 ../pidgin/gtkdialogs.c:240
-#: ../pidgin/gtkdialogs.c:241
+#: ../pidgin/gtkdialogs.c:240 ../pidgin/gtkdialogs.c:241
+#: ../pidgin/gtkdialogs.c:242
 msgid "Slovak"
 msgstr "Slowakisch"
 
-#: ../pidgin/gtkdialogs.c:189 ../pidgin/gtkdialogs.c:242
+#: ../pidgin/gtkdialogs.c:189 ../pidgin/gtkdialogs.c:243
 msgid "Slovenian"
 msgstr "Slowenisch"
 
@@ -13353,7 +13352,7 @@
 msgid "Serbian"
 msgstr "Serbisch"
 
-#: ../pidgin/gtkdialogs.c:193 ../pidgin/gtkdialogs.c:243
+#: ../pidgin/gtkdialogs.c:193 ../pidgin/gtkdialogs.c:244
 msgid "Swedish"
 msgstr "Schwedisch"
 
@@ -13369,7 +13368,7 @@
 msgid "Thai"
 msgstr "Thailändisch"
 
-#: ../pidgin/gtkdialogs.c:197 ../pidgin/gtkdialogs.c:244
+#: ../pidgin/gtkdialogs.c:197 ../pidgin/gtkdialogs.c:245
 msgid "Turkish"
 msgstr "Türkisch"
 
@@ -13381,7 +13380,7 @@
 msgid "T.M.Thanh and the Gnome-Vi Team"
 msgstr "T.M.Thanh und das Gnome-Vi Team"
 
-#: ../pidgin/gtkdialogs.c:199 ../pidgin/gtkdialogs.c:245
+#: ../pidgin/gtkdialogs.c:199 ../pidgin/gtkdialogs.c:246
 msgid "Simplified Chinese"
 msgstr "Vereinfachtes Chinesisch"
 
@@ -13391,7 +13390,7 @@
 msgstr "Hong Kong Chinesisch"
 
 #: ../pidgin/gtkdialogs.c:203 ../pidgin/gtkdialogs.c:204
-#: ../pidgin/gtkdialogs.c:246
+#: ../pidgin/gtkdialogs.c:247
 msgid "Traditional Chinese"
 msgstr "Traditionelles Chinesisch"
 
@@ -13399,12 +13398,12 @@
 msgid "Amharic"
 msgstr "Amharisch"
 
-#: ../pidgin/gtkdialogs.c:331
+#: ../pidgin/gtkdialogs.c:332
 #, c-format
 msgid "About %s"
 msgstr "Über %s"
 
-#: ../pidgin/gtkdialogs.c:369
+#: ../pidgin/gtkdialogs.c:370
 #, c-format
 msgid ""
 "%s is a graphical modular messaging client based on libpurple which is "
@@ -13426,43 +13425,43 @@
 "geschützt.  Die Datei 'COPYRIGHT' enthält die komplette Liste der "
 "Mitwirkenden.  Wir übernehmen keine Haftung für dieses Programm.<BR><BR>"
 
-#: ../pidgin/gtkdialogs.c:384
+#: ../pidgin/gtkdialogs.c:385
 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:389
+#: ../pidgin/gtkdialogs.c:390
 msgid "Current Developers"
 msgstr "Aktuelle Entwickler"
 
-#: ../pidgin/gtkdialogs.c:404
+#: ../pidgin/gtkdialogs.c:405
 msgid "Crazy Patch Writers"
 msgstr "Verrückte Patchschreiber"
 
-#: ../pidgin/gtkdialogs.c:419
+#: ../pidgin/gtkdialogs.c:420
 msgid "Retired Developers"
 msgstr "Zurückgetretene Entwickler"
 
-#: ../pidgin/gtkdialogs.c:434
+#: ../pidgin/gtkdialogs.c:435
 msgid "Artists"
 msgstr "Künstler"
 
-#: ../pidgin/gtkdialogs.c:449
+#: ../pidgin/gtkdialogs.c:450
 msgid "Current Translators"
 msgstr "Aktuelle Übersetzer"
 
-#: ../pidgin/gtkdialogs.c:469
+#: ../pidgin/gtkdialogs.c:470
 msgid "Past Translators"
 msgstr "Frühere Übersetzer"
 
-#: ../pidgin/gtkdialogs.c:487
+#: ../pidgin/gtkdialogs.c:488
 msgid "Debugging Information"
 msgstr "Debugging-Information"
 
-#: ../pidgin/gtkdialogs.c:865
+#: ../pidgin/gtkdialogs.c:857
 msgid "Get User Info"
 msgstr "Benutzer-Info abrufen"
 
-#: ../pidgin/gtkdialogs.c:867
+#: ../pidgin/gtkdialogs.c:859
 msgid ""
 "Please enter the screen name or alias of the person whose info you would "
 "like to view."
@@ -13470,11 +13469,11 @@
 "Bitte geben Sie den Benutzernamen oder den Alias der Person ein, deren Info "
 "Sie sehen möchten."
 
-#: ../pidgin/gtkdialogs.c:957
+#: ../pidgin/gtkdialogs.c:949
 msgid "View User Log"
 msgstr "Benutzer-Mitschnitt anzeigen"
 
-#: ../pidgin/gtkdialogs.c:959
+#: ../pidgin/gtkdialogs.c:951
 msgid ""
 "Please enter the screen name or alias of the person whose log you would like "
 "to view."
@@ -13482,32 +13481,32 @@
 "Bitte geben Sie den Benutzernamen der Person ein, deren Mitschnitt Sie sehen "
 "möchten."
 
-#: ../pidgin/gtkdialogs.c:979
+#: ../pidgin/gtkdialogs.c:971
 msgid "Alias Contact"
 msgstr "Kontakt-Alias"
 
-#: ../pidgin/gtkdialogs.c:980
+#: ../pidgin/gtkdialogs.c:972
 msgid "Enter an alias for this contact."
 msgstr "Geben Sie einen Alias für diesen Kontakt ein."
 
-#: ../pidgin/gtkdialogs.c:1002
+#: ../pidgin/gtkdialogs.c:994
 #, c-format
 msgid "Enter an alias for %s."
 msgstr "Geben Sie einen Alias %s ein."
 
-#: ../pidgin/gtkdialogs.c:1004
+#: ../pidgin/gtkdialogs.c:996
 msgid "Alias Buddy"
 msgstr "Alias für Buddy"
 
-#: ../pidgin/gtkdialogs.c:1025
+#: ../pidgin/gtkdialogs.c:1017
 msgid "Alias Chat"
 msgstr "Chat-Alias"
 
-#: ../pidgin/gtkdialogs.c:1026
+#: ../pidgin/gtkdialogs.c:1018
 msgid "Enter an alias for this chat."
 msgstr "Geben Sie einen Alias für diesen Chat ein."
 
-#: ../pidgin/gtkdialogs.c:1065
+#: ../pidgin/gtkdialogs.c:1057
 #, c-format
 msgid ""
 "You are about to remove the contact containing %s and %d other buddy from "
@@ -13522,15 +13521,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:1073
+#: ../pidgin/gtkdialogs.c:1065
 msgid "Remove Contact"
 msgstr "Kontakt entfernen"
 
-#: ../pidgin/gtkdialogs.c:1076
+#: ../pidgin/gtkdialogs.c:1068
 msgid "_Remove Contact"
 msgstr "_Kontakt entfernen"
 
-#: ../pidgin/gtkdialogs.c:1107
+#: ../pidgin/gtkdialogs.c:1099
 #, c-format
 msgid ""
 "You are about to merge the group called %s into the group called %s. Do you "
@@ -13539,15 +13538,15 @@
 "Sie sind dabei, die Gruppe %s in die Gruppe %s einzufügen. Möchten Sie "
 "fortfahren?"
 
-#: ../pidgin/gtkdialogs.c:1114
+#: ../pidgin/gtkdialogs.c:1106
 msgid "Merge Groups"
 msgstr "Gruppe zusammenführen"
 
-#: ../pidgin/gtkdialogs.c:1117
+#: ../pidgin/gtkdialogs.c:1109
 msgid "_Merge Groups"
 msgstr "_Gruppen zusammenführen"
 
-#: ../pidgin/gtkdialogs.c:1167
+#: ../pidgin/gtkdialogs.c:1159
 #, c-format
 msgid ""
 "You are about to remove the group %s and all its members from your buddy "
@@ -13556,31 +13555,30 @@
 "Sie sind dabei, die Gruppe %s und alle darin enthaltenen Mitglieder aus "
 "Ihrer Buddy-Liste zu entfernen. Möchten Sie fortfahren?"
 
-#: ../pidgin/gtkdialogs.c:1170
+#: ../pidgin/gtkdialogs.c:1162
 msgid "Remove Group"
 msgstr "Gruppe entfernen"
 
-#: ../pidgin/gtkdialogs.c:1173
+#: ../pidgin/gtkdialogs.c:1165
 msgid "_Remove Group"
 msgstr "_Gruppe entfernen"
 
-#: ../pidgin/gtkdialogs.c:1206
-#, c-format
-msgid ""
-"You are about to remove %s from your buddy list.  Do you want to continue?"
+#: ../pidgin/gtkdialogs.c:1198
+#, c-format
+msgid "You are about to remove %s from your buddy list.  Do you want to continue?"
 msgstr ""
 "Sie sind dabei, %s aus Ihrer Buddy-Liste zu entfernen. Möchten Sie "
 "fortfahren?"
 
-#: ../pidgin/gtkdialogs.c:1209
+#: ../pidgin/gtkdialogs.c:1201
 msgid "Remove Buddy"
 msgstr "Buddy entfernen"
 
-#: ../pidgin/gtkdialogs.c:1212
+#: ../pidgin/gtkdialogs.c:1204
 msgid "_Remove Buddy"
 msgstr "Buddy _entfernen"
 
-#: ../pidgin/gtkdialogs.c:1233
+#: ../pidgin/gtkdialogs.c:1225
 #, c-format
 msgid ""
 "You are about to remove the chat %s from your buddy list.  Do you want to "
@@ -13589,11 +13587,11 @@
 "Sie sind dabei, den Chat %s aus Ihrer Buddy-Liste zu entfernen. Möchten Sie "
 "fortfahren?"
 
-#: ../pidgin/gtkdialogs.c:1236
+#: ../pidgin/gtkdialogs.c:1228
 msgid "Remove Chat"
 msgstr "Chat Entfernen"
 
-#: ../pidgin/gtkdialogs.c:1239
+#: ../pidgin/gtkdialogs.c:1231
 msgid "_Remove Chat"
 msgstr "Chat _entfernen"
 
@@ -13688,67 +13686,66 @@
 msgid "Time Remaining:"
 msgstr "Verbleibende Zeit:"
 
-#: ../pidgin/gtkft.c:786
+#: ../pidgin/gtkft.c:783
 msgid "Close this window when all transfers _finish"
 msgstr "S_chließe dieses Fenster, wenn alle Übertragungen abgeschlossen sind"
 
-#: ../pidgin/gtkft.c:796
+#: ../pidgin/gtkft.c:793
 msgid "C_lear finished transfers"
 msgstr "_Entferne komplette Übertragungen"
 
 #. "Download Details" arrow
-#: ../pidgin/gtkft.c:805
+#: ../pidgin/gtkft.c:802
 msgid "File transfer _details"
 msgstr "Dateiübertragungs-_Details"
 
 #. Pause button
-#: ../pidgin/gtkft.c:835 ../pidgin/pidginstock.c:89
+#: ../pidgin/gtkft.c:832 ../pidgin/pidginstock.c:89
 msgid "_Pause"
 msgstr "_Pause"
 
 #. Resume button
-#: ../pidgin/gtkft.c:845
+#: ../pidgin/gtkft.c:842
 msgid "_Resume"
 msgstr "Fo_rtsetzen"
 
-#: ../pidgin/gtkimhtml.c:796
+#: ../pidgin/gtkimhtml.c:795
 msgid "Paste as Plain _Text"
 msgstr "Einfügen als normaler _Text"
 
-#: ../pidgin/gtkimhtml.c:813
+#: ../pidgin/gtkimhtml.c:812
 msgid "_Reset formatting"
 msgstr "Formatierung _zurücksetzen"
 
-#: ../pidgin/gtkimhtml.c:1309
+#: ../pidgin/gtkimhtml.c:1349
 msgid "Hyperlink color"
 msgstr "Hyperlink-Farbe"
 
-#: ../pidgin/gtkimhtml.c:1310
+#: ../pidgin/gtkimhtml.c:1350
 msgid "Color to draw hyperlinks."
 msgstr "Farbe zum Darstellen von Hyperlinks."
 
-#: ../pidgin/gtkimhtml.c:1313
+#: ../pidgin/gtkimhtml.c:1353
 msgid "Hyperlink prelight color"
 msgstr "Hyperlink-Farbe"
 
-#: ../pidgin/gtkimhtml.c:1314
+#: ../pidgin/gtkimhtml.c:1354
 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:1530
+msgstr "Farbe zum Darstellen von Hyperlinks, wenn sich die Maus darüber befindet."
+
+#: ../pidgin/gtkimhtml.c:1575
 msgid "_Copy E-Mail Address"
 msgstr "Kopiere _E-Mail-Adresse"
 
-#: ../pidgin/gtkimhtml.c:1542
+#: ../pidgin/gtkimhtml.c:1587
 msgid "_Open Link in Browser"
 msgstr "Ö_ffne Link im Browser"
 
-#: ../pidgin/gtkimhtml.c:1552
+#: ../pidgin/gtkimhtml.c:1597
 msgid "_Copy Link Location"
 msgstr "_Kopiere den Link"
 
-#: ../pidgin/gtkimhtml.c:3227
+#: ../pidgin/gtkimhtml.c:3341
 msgid ""
 "<span size='larger' weight='bold'>Unrecognized file type</span>\n"
 "\n"
@@ -13758,7 +13755,7 @@
 "\n"
 "Verwende Standard (PNG)."
 
-#: ../pidgin/gtkimhtml.c:3230
+#: ../pidgin/gtkimhtml.c:3344
 msgid ""
 "Unrecognized file type\n"
 "\n"
@@ -13768,7 +13765,7 @@
 "\n"
 "Verwende Standard (PNG)."
 
-#: ../pidgin/gtkimhtml.c:3259
+#: ../pidgin/gtkimhtml.c:3373
 #, c-format
 msgid ""
 "<span size='larger' weight='bold'>Error saving image</span>\n"
@@ -13779,7 +13776,7 @@
 "\n"
 "%s"
 
-#: ../pidgin/gtkimhtml.c:3262
+#: ../pidgin/gtkimhtml.c:3376
 #, c-format
 msgid ""
 "Error saving image\n"
@@ -13790,35 +13787,35 @@
 "\n"
 "%s"
 
-#: ../pidgin/gtkimhtml.c:3340 ../pidgin/gtkimhtml.c:3352
+#: ../pidgin/gtkimhtml.c:3454 ../pidgin/gtkimhtml.c:3466
 msgid "Save Image"
 msgstr "Bild speichern"
 
-#: ../pidgin/gtkimhtml.c:3380
+#: ../pidgin/gtkimhtml.c:3494
 msgid "_Save Image..."
 msgstr "Bild _speichern..."
 
-#: ../pidgin/gtkimhtmltoolbar.c:151
+#: ../pidgin/gtkimhtmltoolbar.c:153
 msgid "Select Font"
 msgstr "Schriftart wählen"
 
-#: ../pidgin/gtkimhtmltoolbar.c:230
+#: ../pidgin/gtkimhtmltoolbar.c:232
 msgid "Select Text Color"
 msgstr "Textfarbe auswählen"
 
-#: ../pidgin/gtkimhtmltoolbar.c:309
+#: ../pidgin/gtkimhtmltoolbar.c:311
 msgid "Select Background Color"
 msgstr "Hintergrundfarbe auswählen"
 
-#: ../pidgin/gtkimhtmltoolbar.c:398
+#: ../pidgin/gtkimhtmltoolbar.c:400
 msgid "_URL"
 msgstr "_URL"
 
-#: ../pidgin/gtkimhtmltoolbar.c:406
+#: ../pidgin/gtkimhtmltoolbar.c:408
 msgid "_Description"
 msgstr "_Beschreibung"
 
-#: ../pidgin/gtkimhtmltoolbar.c:409
+#: ../pidgin/gtkimhtmltoolbar.c:411
 msgid ""
 "Please enter the URL and description of the link that you want to insert. "
 "The description is optional."
@@ -13826,83 +13823,91 @@
 "Bitte geben Sie die URL und die Beschreibung des Links an, den Sie einfügen "
 "möchten. Die Beschreibung ist optional."
 
-#: ../pidgin/gtkimhtmltoolbar.c:413
+#: ../pidgin/gtkimhtmltoolbar.c:415
 msgid "Please enter the URL of the link that you want to insert."
 msgstr "Bitte geben Sie die URL des Links an, den Sie einfügen möchten."
 
-#: ../pidgin/gtkimhtmltoolbar.c:418
+#: ../pidgin/gtkimhtmltoolbar.c:420
 msgid "Insert Link"
 msgstr "Link einfügen"
 
-#: ../pidgin/gtkimhtmltoolbar.c:422
+#: ../pidgin/gtkimhtmltoolbar.c:424 ../pidgin/gtkimhtmltoolbar.c:1155
 msgid "_Insert"
 msgstr "_Einfügen"
 
-#: ../pidgin/gtkimhtmltoolbar.c:491
+#: ../pidgin/gtkimhtmltoolbar.c:493
 #, c-format
 msgid "Failed to store image: %s\n"
 msgstr "Speichern des Bildes fehlgeschlagen: %s\n"
 
-#: ../pidgin/gtkimhtmltoolbar.c:517 ../pidgin/gtkimhtmltoolbar.c:527
+#: ../pidgin/gtkimhtmltoolbar.c:519 ../pidgin/gtkimhtmltoolbar.c:529
 msgid "Insert Image"
 msgstr "Bild einfügen"
 
-#: ../pidgin/gtkimhtmltoolbar.c:725
+#: ../pidgin/gtkimhtmltoolbar.c:740
 msgid "This theme has no available smileys."
 msgstr "Dieses Thema verfügt über keine Smileys."
 
 #. show everything
-#: ../pidgin/gtkimhtmltoolbar.c:739
+#: ../pidgin/gtkimhtmltoolbar.c:757
 msgid "Smile!"
 msgstr "Lächeln!"
 
-#: ../pidgin/gtkimhtmltoolbar.c:926 ../pidgin/plugins/convcolors.c:287
-msgid "Bold"
-msgstr "Fett"
-
-#: ../pidgin/gtkimhtmltoolbar.c:937 ../pidgin/plugins/convcolors.c:294
-msgid "Italic"
-msgstr "Kursiv"
-
-#: ../pidgin/gtkimhtmltoolbar.c:948 ../pidgin/plugins/convcolors.c:301
-msgid "Underline"
-msgstr "Unterstrichen"
-
-#: ../pidgin/gtkimhtmltoolbar.c:964
-msgid "Larger font size"
-msgstr "Größere Schrift"
-
-#: ../pidgin/gtkimhtmltoolbar.c:976
-msgid "Smaller font size"
-msgstr "Kleinere Schrift"
-
-#: ../pidgin/gtkimhtmltoolbar.c:993
-msgid "Font face"
-msgstr "Schriftart"
-
-#: ../pidgin/gtkimhtmltoolbar.c:1005
-msgid "Foreground font color"
-msgstr "Vordergrund-Schriftfarbe"
-
-#: ../pidgin/gtkimhtmltoolbar.c:1017
-msgid "Background color"
-msgstr "Hintergrundfarbe"
-
-#: ../pidgin/gtkimhtmltoolbar.c:1033
-msgid "Reset formatting"
-msgstr "Formatierung zurücksetzen"
-
-#: ../pidgin/gtkimhtmltoolbar.c:1048
-msgid "Insert link"
-msgstr "Link einfügen"
-
-#: ../pidgin/gtkimhtmltoolbar.c:1058
-msgid "Insert image"
-msgstr "Bild einfügen"
+#: ../pidgin/gtkimhtmltoolbar.c:1064
+msgid "_Bold"
+msgstr "_Fett"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1065
+msgid "_Italic"
+msgstr "_Kursiv"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1066
+msgid "_Underline"
+msgstr "_Unterstrichen"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1067
+msgid "_Larger"
+msgstr "_Größer"
 
 #: ../pidgin/gtkimhtmltoolbar.c:1069
-msgid "Insert smiley"
-msgstr "Smiley einfügen"
+msgid "_Normal"
+msgstr "_Normal"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1071
+msgid "_Smaller"
+msgstr "K_leiner"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1072
+msgid "_Font face"
+msgstr "_Schriftart"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1073
+msgid "_Foreground color"
+msgstr "_Vordergrundfarbe"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1074
+msgid "_Background color"
+msgstr "_Hintergrundfarbe"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1100
+msgid "_Font"
+msgstr "_Schrift"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1135
+msgid "_Reset font"
+msgstr "Schrift _zurücksetzen"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1162
+msgid "_Smiley"
+msgstr "_Smiley"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1168
+msgid "_Image"
+msgstr "_Bild"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1174
+msgid "_Link"
+msgstr "_Link"
 
 #: ../pidgin/gtklog.c:267
 #, c-format
@@ -13962,8 +13967,7 @@
 "Sofortnachrichten mitschneiden“ aktiviert ist."
 
 #: ../pidgin/gtklog.c:531
-msgid ""
-"Chats will only be logged if the \"Log all chats\" preference is enabled."
+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."
@@ -13995,12 +13999,12 @@
 msgid "System Log"
 msgstr "System-Mitschnitt"
 
-#: ../pidgin/gtkmain.c:368
+#: ../pidgin/gtkmain.c:385
 #, 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:370
+#: ../pidgin/gtkmain.c:387
 #, c-format
 msgid ""
 "%s %s\n"
@@ -14009,6 +14013,7 @@
 "  -c, --config=DIR    use DIR for config files\n"
 "  -d, --debug         print debugging messages to stdout\n"
 "  -h, --help          display this help and exit\n"
+"  -m, --multiple      do not ensure single instance\n"
 "  -n, --nologin       don't automatically login\n"
 "  -l, --login[=NAME]  automatically login (optional argument NAME specifies\n"
 "                      account(s) to use, separated by commas)\n"
@@ -14020,14 +14025,14 @@
 "  -c, --config=VERZ   benutze VERZ als Konfigurationsverzeichnis\n"
 "  -d, --debug         drucke Debugging-Meldungen nach stdout\n"
 "  -h, --help          zeigt diese Hilfe und beendet das Programm\n"
+"  -m, --multiple      mehrere Instanzen erlauben\n"
 "  -n, --nologin       nicht automatisch anmelden\n"
 "  -l, --login[=NAME]  automatische Anmeldung (optionales Argument \n"
-"                      NAME bestimmt\n"
-"                      Konto/Konten, die benutzt werden sollen, \n"
-"                      getrennt durch Kommata)\n"
+"                      NAME bestimmt Konto(n), die benutzt werden \n"
+"                      sollen, getrennt durch Kommata)\n"
 "  -v, --version       zeigt aktuelle Version und beendet das Programm\n"
 
-#: ../pidgin/gtkmain.c:490
+#: ../pidgin/gtkmain.c:511
 #, c-format
 msgid ""
 "%s has segfaulted and attempted to dump a core file.\n"
@@ -14036,7 +14041,7 @@
 "\n"
 "If you can reproduce the crash, please notify the developers\n"
 "by reporting a bug at:\n"
-"%snewticket/\n"
+"%ssimpleticket/\n"
 "\n"
 "Please make sure to specify what you were doing at the time\n"
 "and post the backtrace from the core file.  If you do not know\n"
@@ -14054,7 +14059,7 @@
 "\n"
 "Wenn Sie den Absturz reproduzieren können, informieren Sie \n"
 "bitte die Entwickler mit einem Fehlerbericht auf:\n"
-"%snewticket/\n"
+"%ssimpleticket/\n"
 "\n"
 "Bitte geben Sie unbedingt an, was Sie getan haben als der \n"
 "Fehler aufgetreten ist, und posten Sie den Backtrace aus \n"
@@ -14067,6 +14072,12 @@
 "für Sean und Luke über andere Protokolle finden Sie unter \n"
 "%swiki/DeveloperPages\n"
 
+#. Translators may want to transliterate the name.
+#. It is not to be translated.
+#: ../pidgin/gtkmain.c:697 ../pidgin/pidgin.h:50
+msgid "Pidgin"
+msgstr "Pidgin"
+
 #: ../pidgin/gtknotify.c:343
 msgid "Open All Messages"
 msgstr "Alle Nachrichten öffnen"
@@ -14075,10 +14086,6 @@
 msgid "<span weight=\"bold\" size=\"larger\">You have mail!</span>"
 msgstr "<span weight=\"bold\" size=\"larger\">Sie haben Post!</span>"
 
-#: ../pidgin/gtknotify.c:489
-msgid "Sender"
-msgstr "Sender"
-
 #: ../pidgin/gtknotify.c:515
 #, c-format
 msgid "%s has %d new message."
@@ -14093,26 +14100,24 @@
 msgstr[0] "<b>Sie haben %d neue E-Mail.</b>"
 msgstr[1] "<b>Sie haben %d neue E-Mails.</b>"
 
-#: ../pidgin/gtknotify.c:969
+#: ../pidgin/gtknotify.c:965
 #, c-format
 msgid "The browser command \"%s\" is invalid."
 msgstr "Das Browser-Kommando „%s“ ist falsch."
 
-#: ../pidgin/gtknotify.c:971 ../pidgin/gtknotify.c:983
-#: ../pidgin/gtknotify.c:996 ../pidgin/gtknotify.c:1124
+#: ../pidgin/gtknotify.c:967 ../pidgin/gtknotify.c:979
+#: ../pidgin/gtknotify.c:992 ../pidgin/gtknotify.c:1120
 msgid "Unable to open URL"
 msgstr "Kann die URL nicht öffnen"
 
-#: ../pidgin/gtknotify.c:981 ../pidgin/gtknotify.c:994
+#: ../pidgin/gtknotify.c:977 ../pidgin/gtknotify.c:990
 #, c-format
 msgid "Error launching \"%s\": %s"
 msgstr "Fehler beim Aufruf von „%s“: %s"
 
-#: ../pidgin/gtknotify.c:1125
-msgid ""
-"The 'Manual' browser command has been chosen, but no command has been set."
-msgstr ""
-"Das benutzerdefinierte Browserkommando wurde ausgewählt, aber nicht gesetzt."
+#: ../pidgin/gtknotify.c:1121
+msgid "The 'Manual' browser command has been chosen, but no command has been set."
+msgstr "Das benutzerdefinierte Browserkommando wurde ausgewählt, aber nicht gesetzt."
 
 #: ../pidgin/gtkplugin.c:264
 msgid "The following plugins will be unloaded."
@@ -14156,108 +14161,117 @@
 msgid "<b>Plugin Details</b>"
 msgstr "<b>Plugin-Details</b>"
 
-#: ../pidgin/gtkpounce.c:155
+#: ../pidgin/gtkpounce.c:156
 msgid "Select a file"
 msgstr "Wählen Sie eine Datei"
 
 #. Create the "Pounce on Whom" frame.
-#: ../pidgin/gtkpounce.c:524
+#: ../pidgin/gtkpounce.c:533
 msgid "Pounce on Whom"
 msgstr "Bei wem alarmieren"
 
-#: ../pidgin/gtkpounce.c:551
+#: ../pidgin/gtkpounce.c:560
 msgid "_Buddy name:"
 msgstr "_Buddy-Name:"
 
-#: ../pidgin/gtkpounce.c:585
+#: ../pidgin/gtkpounce.c:594
 msgid "Si_gns on"
 msgstr "_sich anmeldet"
 
-#: ../pidgin/gtkpounce.c:587
+#: ../pidgin/gtkpounce.c:596
 msgid "Signs o_ff"
 msgstr "sich abmel_det"
 
-#: ../pidgin/gtkpounce.c:589
+#: ../pidgin/gtkpounce.c:598
 msgid "Goes a_way"
 msgstr "_hinausgeht"
 
-#: ../pidgin/gtkpounce.c:591
+#: ../pidgin/gtkpounce.c:600
 msgid "Ret_urns from away"
 msgstr "wi_eder anwesend ist"
 
-#: ../pidgin/gtkpounce.c:593
+#: ../pidgin/gtkpounce.c:602
 msgid "Becomes _idle"
 msgstr "_untätig wird"
 
-#: ../pidgin/gtkpounce.c:595
+#: ../pidgin/gtkpounce.c:604
 msgid "Is no longer i_dle"
 msgstr "nicht meh_r untätig ist"
 
-#: ../pidgin/gtkpounce.c:597
+#: ../pidgin/gtkpounce.c:606
 msgid "Starts _typing"
 msgstr "zu _tippen beginnt"
 
-#: ../pidgin/gtkpounce.c:599
+#: ../pidgin/gtkpounce.c:608
 msgid "P_auses while typing"
 msgstr "beim Tippen an_hält"
 
-#: ../pidgin/gtkpounce.c:601
+#: ../pidgin/gtkpounce.c:610
 msgid "Stops t_yping"
 msgstr "aufhört _zu tippen"
 
-#: ../pidgin/gtkpounce.c:603
+#: ../pidgin/gtkpounce.c:612
 msgid "Sends a _message"
 msgstr "eine _Nachricht sendet"
 
-#: ../pidgin/gtkpounce.c:646
+#: ../pidgin/gtkpounce.c:655
 msgid "Ope_n an IM window"
 msgstr "Gesprächsfenster ö_ffnen"
 
-#: ../pidgin/gtkpounce.c:648
+#: ../pidgin/gtkpounce.c:657
 msgid "_Pop up a notification"
 msgstr "_Popup-Benachrichtigung"
 
-#: ../pidgin/gtkpounce.c:650
+#: ../pidgin/gtkpounce.c:659
 msgid "Send a _message"
 msgstr "_Nachricht senden"
 
-#: ../pidgin/gtkpounce.c:652
-msgid "E_xecute a command"
-msgstr "Befeh_l ausführen"
-
-#: ../pidgin/gtkpounce.c:654
-msgid "P_lay a sound"
-msgstr "einen _Klang abspielen"
-
-#: ../pidgin/gtkpounce.c:659
-msgid "Brows_e..."
-msgstr "Aus_wählen..."
-
 #: ../pidgin/gtkpounce.c:661
+msgid "E_xecute a command"
+msgstr "Befeh_l ausführen"
+
+#: ../pidgin/gtkpounce.c:663
+msgid "P_lay a sound"
+msgstr "einen _Klang abspielen"
+
+#: ../pidgin/gtkpounce.c:669
+msgid "Brows_e..."
+msgstr "Aus_wählen..."
+
+#: ../pidgin/gtkpounce.c:671
 msgid "Br_owse..."
 msgstr "Aus_wählen..."
 
-#: ../pidgin/gtkpounce.c:662
+#: ../pidgin/gtkpounce.c:672
 msgid "Pre_view"
 msgstr "_Vorschau"
 
-#: ../pidgin/gtkpounce.c:786
+#: ../pidgin/gtkpounce.c:799
 msgid "P_ounce only when my status is not Available"
 msgstr "Nur _alarmieren, wenn ich nicht verfügbar bin"
 
-#: ../pidgin/gtkpounce.c:791
+#: ../pidgin/gtkpounce.c:804
 msgid "_Recurring"
 msgstr "_Wiederkehrend"
 
-#: ../pidgin/gtkpounce.c:1247
+#: ../pidgin/gtkpounce.c:1260
 msgid "Pounce Target"
 msgstr "Alarm-Ziel"
 
-#: ../pidgin/gtkprefs.c:509
+#: ../pidgin/gtkprefs.c:385
+#: ../pidgin/pixmaps/emotes/default/22/default.theme.in.h:1
+msgid "Default"
+msgstr "Standard"
+
+#: ../pidgin/gtkprefs.c:516
 msgid "Smiley theme failed to unpack."
 msgstr "Smiley-Thema konnte nicht entpackt werden."
 
-#: ../pidgin/gtkprefs.c:638
+#: ../pidgin/gtkprefs.c:643
+msgid "Install Theme"
+msgstr "Thema installieren"
+
+#: ../pidgin/gtkprefs.c:696
 msgid ""
 "Select a smiley theme that you would like to use from the list below. New "
 "themes can be installed by dragging and dropping them onto the theme list."
@@ -14265,255 +14279,259 @@
 "Wählen Sie das zu benutzende Smilie-Thema aus der untenstehenden Liste. Neue "
 "Themen können durch Ziehen in die Themenliste installiert werden."
 
-#: ../pidgin/gtkprefs.c:673
+#: ../pidgin/gtkprefs.c:731
 msgid "Icon"
 msgstr "Icon"
 
-#: ../pidgin/gtkprefs.c:816
+#: ../pidgin/gtkprefs.c:893
 msgid "System Tray Icon"
 msgstr "Kontrollleisten-Icon"
 
-#: ../pidgin/gtkprefs.c:817
+#: ../pidgin/gtkprefs.c:894
 msgid "_Show system tray icon:"
 msgstr "Kontrollleisten-Icon _anzeigen:"
 
-#: ../pidgin/gtkprefs.c:819 ../pidgin/gtkprefs.c:831 ../pidgin/gtkprefs.c:1686
+#: ../pidgin/gtkprefs.c:896 ../pidgin/gtkprefs.c:908 ../pidgin/gtkprefs.c:1756
 #: ../pidgin/plugins/timestamp_format.c:42
 #: ../pidgin/plugins/timestamp_format.c:51
 #: ../pidgin/plugins/win32/winprefs/winprefs.c:338
 msgid "Always"
 msgstr "Immer"
 
-#: ../pidgin/gtkprefs.c:821
+#: ../pidgin/gtkprefs.c:898
 msgid "On unread messages"
 msgstr "Bei ungelesenen Nachrichten"
 
-#: ../pidgin/gtkprefs.c:826
+#: ../pidgin/gtkprefs.c:903
 msgid "Conversation Window Hiding"
 msgstr "Gesprächsfenster verstecken"
 
-#: ../pidgin/gtkprefs.c:827
+#: ../pidgin/gtkprefs.c:904
 msgid "_Hide new IM conversations:"
 msgstr "_Neue IM-Gespräche verstecken:"
 
-#: ../pidgin/gtkprefs.c:830 ../pidgin/gtkprefs.c:1867
+#: ../pidgin/gtkprefs.c:907 ../pidgin/gtkprefs.c:1937
 msgid "When away"
 msgstr "Bei Abwesenheit"
 
 #. All the tab options!
-#: ../pidgin/gtkprefs.c:838
+#: ../pidgin/gtkprefs.c:915
 msgid "Tabs"
 msgstr "Reiter"
 
-#: ../pidgin/gtkprefs.c:840
+#: ../pidgin/gtkprefs.c:917
 msgid "Show IMs and chats in _tabbed windows"
 msgstr "IMs und Chats in _Reiter-Fenstern anzeigen"
 
-#: ../pidgin/gtkprefs.c:854
+#: ../pidgin/gtkprefs.c:931
 msgid "Show close b_utton on tabs"
 msgstr "_Beenden-Button in Reitern zeigen"
 
-#: ../pidgin/gtkprefs.c:857
+#: ../pidgin/gtkprefs.c:934
 msgid "_Placement:"
 msgstr "_Platzierung:"
 
-#: ../pidgin/gtkprefs.c:859
+#: ../pidgin/gtkprefs.c:936
 msgid "Top"
 msgstr "Oben"
 
-#: ../pidgin/gtkprefs.c:860
+#: ../pidgin/gtkprefs.c:937
 msgid "Bottom"
 msgstr "Unten"
 
-#: ../pidgin/gtkprefs.c:861
+#: ../pidgin/gtkprefs.c:938
 msgid "Left"
 msgstr "Links"
 
-#: ../pidgin/gtkprefs.c:862
+#: ../pidgin/gtkprefs.c:939
 msgid "Right"
 msgstr "Rechts"
 
-#: ../pidgin/gtkprefs.c:864
+#: ../pidgin/gtkprefs.c:941
 msgid "Left Vertical"
 msgstr "Links vertikal"
 
-#: ../pidgin/gtkprefs.c:865
+#: ../pidgin/gtkprefs.c:942
 msgid "Right Vertical"
 msgstr "Rechts vertikal"
 
-#: ../pidgin/gtkprefs.c:872
+#: ../pidgin/gtkprefs.c:949
 msgid "N_ew conversations:"
 msgstr "N_eue Unterhaltungen:"
 
-#: ../pidgin/gtkprefs.c:917
+#: ../pidgin/gtkprefs.c:994
 msgid "Show _formatting on incoming messages"
 msgstr "Zeige _Formatierung bei ankommenden Nachrichten"
 
-#: ../pidgin/gtkprefs.c:920
+#: ../pidgin/gtkprefs.c:997
 msgid "Show buddy _icons"
 msgstr "Buddy-_Icons anzeigen"
 
-#: ../pidgin/gtkprefs.c:922
+#: ../pidgin/gtkprefs.c:999
 msgid "Enable buddy ic_on animation"
 msgstr "Buddy-Icon-_Animation aktivieren"
 
-#: ../pidgin/gtkprefs.c:929
+#: ../pidgin/gtkprefs.c:1006
 msgid "_Notify buddies that you are typing to them"
 msgstr "Buddys be_nachrichtigen, dass Sie ihnen schreiben"
 
-#: ../pidgin/gtkprefs.c:932
+#: ../pidgin/gtkprefs.c:1009
 msgid "Highlight _misspelled words"
 msgstr "_Falsch geschriebene Wörter hervorheben"
 
-#: ../pidgin/gtkprefs.c:936
+#: ../pidgin/gtkprefs.c:1013
 msgid "Use smooth-scrolling"
 msgstr "Weiches Scrollen aktivieren"
 
-#: ../pidgin/gtkprefs.c:939
+#: ../pidgin/gtkprefs.c:1016
 msgid "F_lash window when IMs are received"
 msgstr "_Fenster blinkt, wenn Nachrichten empfangen werden"
 
-#: ../pidgin/gtkprefs.c:943
+#: ../pidgin/gtkprefs.c:1018
+msgid "Minimi_ze new conversation windows"
+msgstr "Neue Gesprächsfenster mi_nimieren"
+
+#: ../pidgin/gtkprefs.c:1022
 msgid "Font"
 msgstr "Schriftart"
 
-#: ../pidgin/gtkprefs.c:945
+#: ../pidgin/gtkprefs.c:1024
 msgid "Use document font from _theme"
 msgstr "Benutze Dokumentenschriftart des _Themas"
 
-#: ../pidgin/gtkprefs.c:947
+#: ../pidgin/gtkprefs.c:1026
 msgid "Use font from _theme"
 msgstr "Benutze Schriftart des _Themas"
 
-#: ../pidgin/gtkprefs.c:949
+#: ../pidgin/gtkprefs.c:1028
 msgid "Conversation _font:"
 msgstr "Gesprächsschri_ftart:"
 
-#: ../pidgin/gtkprefs.c:962
+#: ../pidgin/gtkprefs.c:1041
 msgid "Default Formatting"
 msgstr "Standard-Formatierung"
 
-#: ../pidgin/gtkprefs.c:978
+#: ../pidgin/gtkprefs.c:1057
 msgid ""
 "This is how your outgoing message text will appear when you use protocols "
-"that support formatting. :)"
-msgstr ""
-"So wird der ausgehende Nachrichtentext aussehen, wenn Sie ein Protokoll "
-"benutzen, welches Formatierung unterstützt. :)"
-
-#: ../pidgin/gtkprefs.c:1054
+"that support formatting."
+msgstr ""
+"So wird der ausgehende Nachrichtentext aussehen, wenn Sie "
+"Protokollebenutzen, die Formatierung unterstützen."
+
+#: ../pidgin/gtkprefs.c:1123
 msgid "ST_UN server:"
 msgstr "ST_UN Server:"
 
-#: ../pidgin/gtkprefs.c:1066
+#: ../pidgin/gtkprefs.c:1135
 msgid "<span style=\"italic\">Example: stunserver.org</span>"
 msgstr "<span style=\"italic\">Beispiel: stunserver.org</span>"
 
-#: ../pidgin/gtkprefs.c:1070
+#: ../pidgin/gtkprefs.c:1139
 msgid "_Autodetect IP address"
 msgstr "IP-Adresse _automatisch erkennen"
 
-#: ../pidgin/gtkprefs.c:1079
+#: ../pidgin/gtkprefs.c:1148
 msgid "Public _IP:"
 msgstr "Öffentliche _IP:"
 
-#: ../pidgin/gtkprefs.c:1108
+#: ../pidgin/gtkprefs.c:1177
 msgid "Ports"
 msgstr "Ports"
 
-#: ../pidgin/gtkprefs.c:1111
+#: ../pidgin/gtkprefs.c:1180
 msgid "_Manually specify range of ports to listen on"
 msgstr "Port-Bereich, auf dem gehört werden soll, _manuell bestimmen"
 
-#: ../pidgin/gtkprefs.c:1114
+#: ../pidgin/gtkprefs.c:1183
 msgid "_Start port:"
 msgstr "_Start-Port:"
 
-#: ../pidgin/gtkprefs.c:1121
+#: ../pidgin/gtkprefs.c:1190
 msgid "_End port:"
 msgstr "_End-Port:"
 
-#: ../pidgin/gtkprefs.c:1129
+#: ../pidgin/gtkprefs.c:1198
 msgid "Proxy Server"
 msgstr "Proxy-Server"
 
-#: ../pidgin/gtkprefs.c:1133
+#: ../pidgin/gtkprefs.c:1202
 msgid "No proxy"
 msgstr "Kein Proxy"
 
-#: ../pidgin/gtkprefs.c:1189
+#: ../pidgin/gtkprefs.c:1258
 msgid "_User:"
 msgstr "_Benutzer:"
 
-#: ../pidgin/gtkprefs.c:1253
+#: ../pidgin/gtkprefs.c:1323
 msgid "Seamonkey"
 msgstr "Seamonkey"
 
-#: ../pidgin/gtkprefs.c:1254
+#: ../pidgin/gtkprefs.c:1324
 msgid "Opera"
 msgstr "Opera"
 
-#: ../pidgin/gtkprefs.c:1255
+#: ../pidgin/gtkprefs.c:1325
 msgid "Netscape"
 msgstr "Netscape"
 
-#: ../pidgin/gtkprefs.c:1256
+#: ../pidgin/gtkprefs.c:1326
 msgid "Mozilla"
 msgstr "Mozilla"
 
-#: ../pidgin/gtkprefs.c:1257
+#: ../pidgin/gtkprefs.c:1327
 msgid "Konqueror"
 msgstr "Konqueror"
 
-#: ../pidgin/gtkprefs.c:1258
+#: ../pidgin/gtkprefs.c:1328
 msgid "GNOME Default"
 msgstr "GNOME-Standard"
 
-#: ../pidgin/gtkprefs.c:1259
+#: ../pidgin/gtkprefs.c:1329
 msgid "Galeon"
 msgstr "Galeon"
 
-#: ../pidgin/gtkprefs.c:1260
+#: ../pidgin/gtkprefs.c:1330
 msgid "Firefox"
 msgstr "Firefox"
 
-#: ../pidgin/gtkprefs.c:1261
+#: ../pidgin/gtkprefs.c:1331
 msgid "Firebird"
 msgstr "Firebird"
 
-#: ../pidgin/gtkprefs.c:1262
+#: ../pidgin/gtkprefs.c:1332
 msgid "Epiphany"
 msgstr "Epiphany"
 
-#: ../pidgin/gtkprefs.c:1271
+#: ../pidgin/gtkprefs.c:1341
 msgid "Manual"
 msgstr "Manuell"
 
-#: ../pidgin/gtkprefs.c:1324
+#: ../pidgin/gtkprefs.c:1394
 msgid "Browser Selection"
 msgstr "Browserauswahl"
 
-#: ../pidgin/gtkprefs.c:1328
+#: ../pidgin/gtkprefs.c:1398
 msgid "_Browser:"
 msgstr "_Browser:"
 
-#: ../pidgin/gtkprefs.c:1336
+#: ../pidgin/gtkprefs.c:1406
 msgid "_Open link in:"
 msgstr "Ö_ffne Link in:"
 
-#: ../pidgin/gtkprefs.c:1338
+#: ../pidgin/gtkprefs.c:1408
 msgid "Browser default"
 msgstr "Standard-Browser"
 
-#: ../pidgin/gtkprefs.c:1339
+#: ../pidgin/gtkprefs.c:1409
 msgid "Existing window"
 msgstr "Existierendes Fenster"
 
-#: ../pidgin/gtkprefs.c:1341
+#: ../pidgin/gtkprefs.c:1411
 msgid "New tab"
 msgstr "Neuer Reiter"
 
-#: ../pidgin/gtkprefs.c:1355
+#: ../pidgin/gtkprefs.c:1425
 #, c-format
 msgid ""
 "_Manual:\n"
@@ -14522,80 +14540,80 @@
 "_Manuell:\n"
 "(%s für die URL)"
 
-#: ../pidgin/gtkprefs.c:1395
+#: ../pidgin/gtkprefs.c:1465
 msgid "Log _format:"
 msgstr "Mitschnitt-_Format:"
 
-#: ../pidgin/gtkprefs.c:1400
+#: ../pidgin/gtkprefs.c:1470
 msgid "Log all _instant messages"
 msgstr "_Schneide alle Sofortnachrichten mit"
 
-#: ../pidgin/gtkprefs.c:1402
+#: ../pidgin/gtkprefs.c:1472
 msgid "Log all c_hats"
 msgstr "Alle C_hats mitschneiden"
 
-#: ../pidgin/gtkprefs.c:1404
+#: ../pidgin/gtkprefs.c:1474
 msgid "Log all _status changes to system log"
 msgstr "Schneide alle _Statusveränderungen im System-Mitschnitt mit"
 
-#: ../pidgin/gtkprefs.c:1512 ../pidgin/gtkprefs.c:1601
-#: ../pidgin/gtkprefs.c:1795
+#: ../pidgin/gtkprefs.c:1582 ../pidgin/gtkprefs.c:1671
+#: ../pidgin/gtkprefs.c:1865
 msgid "(default)"
 msgstr "(Standard)"
 
-#: ../pidgin/gtkprefs.c:1550
+#: ../pidgin/gtkprefs.c:1620
 msgid "Sound Selection"
 msgstr "Sound-Auswahl"
 
-#: ../pidgin/gtkprefs.c:1560
+#: ../pidgin/gtkprefs.c:1630
 msgid "Quietest"
 msgstr "Am leisesten"
 
-#: ../pidgin/gtkprefs.c:1562
+#: ../pidgin/gtkprefs.c:1632
 msgid "Quieter"
 msgstr "Leiser"
 
-#: ../pidgin/gtkprefs.c:1564
+#: ../pidgin/gtkprefs.c:1634
 msgid "Quiet"
 msgstr "Leise"
 
-#: ../pidgin/gtkprefs.c:1568
+#: ../pidgin/gtkprefs.c:1638
 msgid "Loud"
 msgstr "Laut"
 
-#: ../pidgin/gtkprefs.c:1570
+#: ../pidgin/gtkprefs.c:1640
 msgid "Louder"
 msgstr "Lauter"
 
-#: ../pidgin/gtkprefs.c:1572
+#: ../pidgin/gtkprefs.c:1642
 msgid "Loudest"
 msgstr "Am lautesten"
 
-#: ../pidgin/gtkprefs.c:1635
+#: ../pidgin/gtkprefs.c:1705
 msgid "Sound Method"
 msgstr "Sound-Ausgabesystem"
 
-#: ../pidgin/gtkprefs.c:1636
+#: ../pidgin/gtkprefs.c:1706
 msgid "_Method:"
 msgstr "_Methode:"
 
-#: ../pidgin/gtkprefs.c:1638
+#: ../pidgin/gtkprefs.c:1708
 msgid "Console beep"
 msgstr "Konsolen-Lautsprecher"
 
-#: ../pidgin/gtkprefs.c:1640
+#: ../pidgin/gtkprefs.c:1710
 msgid "Automatic"
 msgstr "Automatisch"
 
-#: ../pidgin/gtkprefs.c:1644
+#: ../pidgin/gtkprefs.c:1714
 msgid "Command"
 msgstr "Kommando"
 
-#: ../pidgin/gtkprefs.c:1645
+#: ../pidgin/gtkprefs.c:1715
 msgid "No sounds"
 msgstr "Keine Klänge"
 
-#: ../pidgin/gtkprefs.c:1653
+#: ../pidgin/gtkprefs.c:1723
 #, c-format
 msgid ""
 "Sound c_ommand:\n"
@@ -14604,118 +14622,118 @@
 "Sound-_Abspielbefehl:\n"
 "(%s für den Dateinamen)"
 
-#: ../pidgin/gtkprefs.c:1679
+#: ../pidgin/gtkprefs.c:1749
 msgid "Sound Options"
 msgstr "Sound-Einstellungen"
 
-#: ../pidgin/gtkprefs.c:1680
+#: ../pidgin/gtkprefs.c:1750
 msgid "Sounds when conversation has _focus"
 msgstr "Klang, wenn das Gespräch den _Fokus hat"
 
-#: ../pidgin/gtkprefs.c:1682
+#: ../pidgin/gtkprefs.c:1752
 msgid "Enable sounds:"
 msgstr "Klänge aktivieren:"
 
-#: ../pidgin/gtkprefs.c:1684
+#: ../pidgin/gtkprefs.c:1754
 msgid "Only when available"
 msgstr "Nur wenn anwesend"
 
-#: ../pidgin/gtkprefs.c:1685
+#: ../pidgin/gtkprefs.c:1755
 msgid "Only when not available"
 msgstr "Nur wenn nicht verfügbar"
 
-#: ../pidgin/gtkprefs.c:1693
+#: ../pidgin/gtkprefs.c:1763
 msgid "Volume:"
 msgstr "Lautstärke:"
 
-#: ../pidgin/gtkprefs.c:1721
+#: ../pidgin/gtkprefs.c:1791
 msgid "Sound Events"
 msgstr "Sound-Ereignisse"
 
-#: ../pidgin/gtkprefs.c:1773
+#: ../pidgin/gtkprefs.c:1843
 msgid "Play"
 msgstr "Abspielen"
 
-#: ../pidgin/gtkprefs.c:1780
+#: ../pidgin/gtkprefs.c:1850
 msgid "Event"
 msgstr "Ereignis"
 
-#: ../pidgin/gtkprefs.c:1799
+#: ../pidgin/gtkprefs.c:1869
 msgid "Test"
 msgstr "Testen"
 
-#: ../pidgin/gtkprefs.c:1803
+#: ../pidgin/gtkprefs.c:1873
 msgid "Reset"
 msgstr "Zurücksetzen"
 
-#: ../pidgin/gtkprefs.c:1807
+#: ../pidgin/gtkprefs.c:1877
 msgid "Choose..."
 msgstr "Auswählen..."
 
-#: ../pidgin/gtkprefs.c:1850
+#: ../pidgin/gtkprefs.c:1920
 msgid "_Report idle time:"
 msgstr "Inaktivitätszei_ten anzeigen:"
 
-#: ../pidgin/gtkprefs.c:1855
+#: ../pidgin/gtkprefs.c:1925
 msgid "Based on keyboard or mouse use"
 msgstr "Abhängig von Tastatur- oder Mausbenutzung"
 
-#: ../pidgin/gtkprefs.c:1864
+#: ../pidgin/gtkprefs.c:1934
 msgid "_Auto-reply:"
 msgstr "A_utomatische Antwort:"
 
-#: ../pidgin/gtkprefs.c:1868
+#: ../pidgin/gtkprefs.c:1938
 msgid "When both away and idle"
 msgstr "Wenn abwesend und untätig"
 
 #. Auto-away stuff
-#: ../pidgin/gtkprefs.c:1874
+#: ../pidgin/gtkprefs.c:1944
 msgid "Auto-away"
 msgstr "Automatisch abwesend"
 
-#: ../pidgin/gtkprefs.c:1876
+#: ../pidgin/gtkprefs.c:1946
 msgid "Change status when _idle"
 msgstr "Ändere Status, wenn _inaktiv"
 
-#: ../pidgin/gtkprefs.c:1880
+#: ../pidgin/gtkprefs.c:1950
 msgid "_Minutes before changing status:"
 msgstr "_Minuten, bevor auf abwesend gesetzt wird:"
 
-#: ../pidgin/gtkprefs.c:1888
+#: ../pidgin/gtkprefs.c:1958
 msgid "Change _status to:"
 msgstr "Ändere _Status zu:"
 
 #
 #. Signon status stuff
-#: ../pidgin/gtkprefs.c:1909
+#: ../pidgin/gtkprefs.c:1979
 msgid "Status at Startup"
 msgstr "Status beim Start"
 
-#: ../pidgin/gtkprefs.c:1911
+#: ../pidgin/gtkprefs.c:1981
 msgid "Use status from last _exit at startup"
 msgstr "Status beim Neu_start wiederherstellen"
 
-#: ../pidgin/gtkprefs.c:1917
+#: ../pidgin/gtkprefs.c:1987
 msgid "Status to a_pply at startup:"
 msgstr "Beim Starten folgenden Status _benutzen:"
 
-#: ../pidgin/gtkprefs.c:1955
+#: ../pidgin/gtkprefs.c:2025
 msgid "Interface"
 msgstr "Schnittstelle"
 
-#: ../pidgin/gtkprefs.c:1957
+#: ../pidgin/gtkprefs.c:2027
 msgid "Smiley Themes"
 msgstr "Smiley-Themen"
 
-#: ../pidgin/gtkprefs.c:1958
+#: ../pidgin/gtkprefs.c:2028
 msgid "Sounds"
 msgstr "Klänge"
 
-#: ../pidgin/gtkprefs.c:1964
+#: ../pidgin/gtkprefs.c:2034
 msgid "Browser"
 msgstr "Browser"
 
-#: ../pidgin/gtkprefs.c:1968
+#: ../pidgin/gtkprefs.c:2038
 msgid "Status / Idle"
 msgstr "Status / Untätig"
 
@@ -14725,8 +14743,7 @@
 
 #: ../pidgin/gtkprivacy.c:80
 msgid "Allow only the users on my buddy list"
-msgstr ""
-"Nur den Benutzern in meiner Buddy-Liste erlauben mir Nachrichten zu senden"
+msgstr "Nur den Benutzern in meiner Buddy-Liste erlauben mir Nachrichten zu senden"
 
 #: ../pidgin/gtkprivacy.c:81
 msgid "Allow only the users below"
@@ -14740,68 +14757,67 @@
 msgid "Block only the users below"
 msgstr "Blockiere nur die untenstehenden Benutzer"
 
-#: ../pidgin/gtkprivacy.c:372
+#: ../pidgin/gtkprivacy.c:369
 msgid "Privacy"
 msgstr "Privatsphäre"
 
-#: ../pidgin/gtkprivacy.c:385
+#: ../pidgin/gtkprivacy.c:381
 msgid "Changes to privacy settings take effect immediately."
 msgstr "Einstellungen bzgl. der Privatsphäre werden sofort wirksam."
 
 #. "Set privacy for:" label
-#: ../pidgin/gtkprivacy.c:397
+#: ../pidgin/gtkprivacy.c:393
 msgid "Set privacy for:"
 msgstr "Setze Privatsphäre für:"
 
-#: ../pidgin/gtkprivacy.c:560 ../pidgin/gtkprivacy.c:577
+#: ../pidgin/gtkprivacy.c:556 ../pidgin/gtkprivacy.c:573
 msgid "Permit User"
 msgstr "Benutzer erlauben"
 
-#: ../pidgin/gtkprivacy.c:561
+#: ../pidgin/gtkprivacy.c:557
 msgid "Type a user you permit to contact you."
 msgstr ""
 "Geben Sie einen Benutzer ein, dem Sie erlauben, Ihnen Nachrichten zu "
 "schicken."
 
-#: ../pidgin/gtkprivacy.c:562
+#: ../pidgin/gtkprivacy.c:558
 msgid "Please enter the name of the user you wish to be able to contact you."
 msgstr ""
 "Bitte geben Sie den Namen des Benutzers ein, dem Sie erlauben möchten, Ihnen "
 "Nachrichten zu schicken."
 
-#: ../pidgin/gtkprivacy.c:565 ../pidgin/gtkprivacy.c:581
+#: ../pidgin/gtkprivacy.c:561 ../pidgin/gtkprivacy.c:577
 msgid "_Permit"
 msgstr "_Zulassen"
 
-#: ../pidgin/gtkprivacy.c:571
+#: ../pidgin/gtkprivacy.c:567
 #, c-format
 msgid "Allow %s to contact you?"
 msgstr "Erlaube %s, Ihnen Nachrichten zu schreiben?"
 
-#: ../pidgin/gtkprivacy.c:573
+#: ../pidgin/gtkprivacy.c:569
 #, 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:602 ../pidgin/gtkprivacy.c:616
+#: ../pidgin/gtkprivacy.c:598 ../pidgin/gtkprivacy.c:612
 msgid "Block User"
 msgstr "Benutzer blockieren"
 
-#: ../pidgin/gtkprivacy.c:603
+#: ../pidgin/gtkprivacy.c:599
 msgid "Type a user to block."
 msgstr "Geben Sie einen Benutzer ein, den Sie blockieren wollen."
 
-#: ../pidgin/gtkprivacy.c:604
+#: ../pidgin/gtkprivacy.c:600
 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:612
+msgstr "Bitte geben Sie den Namen des Benutzers ein, den Sie blockieren wollen."
+
+#: ../pidgin/gtkprivacy.c:608
 #, c-format
 msgid "Block %s?"
 msgstr "%s sperren?"
 
-#: ../pidgin/gtkprivacy.c:614
+#: ../pidgin/gtkprivacy.c:610
 #, c-format
 msgid "Are you sure you want to block %s?"
 msgstr "Sie Sie sicher, dass Sie %s blockieren wollen?"
@@ -14810,78 +14826,78 @@
 msgid "Apply"
 msgstr "Anwenden"
 
-#: ../pidgin/gtkrequest.c:1482
+#: ../pidgin/gtkrequest.c:1478
 msgid "That file already exists"
 msgstr "Diese Datei existiert bereits"
 
-#: ../pidgin/gtkrequest.c:1483
+#: ../pidgin/gtkrequest.c:1479
 msgid "Would you like to overwrite it?"
 msgstr "Möchten Sie sie überschreiben?"
 
-#: ../pidgin/gtkrequest.c:1486
+#: ../pidgin/gtkrequest.c:1482
 msgid "Overwrite"
 msgstr "Überschreiben"
 
-#: ../pidgin/gtkrequest.c:1487
+#: ../pidgin/gtkrequest.c:1483
 msgid "Choose New Name"
 msgstr "Einen neuen Namen wählen"
 
-#: ../pidgin/gtkrequest.c:1625 ../pidgin/gtkrequest.c:1639
+#: ../pidgin/gtkrequest.c:1621 ../pidgin/gtkrequest.c:1635
 msgid "Select Folder..."
 msgstr "Ordner auswählen..."
 
-#: ../pidgin/gtkroomlist.c:376
+#. Create the window.
+#: ../pidgin/gtkroomlist.c:374
 msgid "Room List"
 msgstr "Raumliste"
 
 #. list button
-#: ../pidgin/gtkroomlist.c:446
+#: ../pidgin/gtkroomlist.c:442
 msgid "_Get List"
 msgstr "_Liste abrufen"
 
 #. add button
-#: ../pidgin/gtkroomlist.c:454
+#: ../pidgin/gtkroomlist.c:450
 msgid "_Add Chat"
 msgstr "Chat _hinzufügen"
 
-#: ../pidgin/gtksavedstatuses.c:331
+#: ../pidgin/gtksavedstatuses.c:336
 msgid "Are you sure you want to delete the selected saved statuses?"
-msgstr ""
-"Sind Sie sicher, dass Sie die gewählten Statusmeldungen löschen wollen?"
+msgstr "Sind Sie sicher, dass Sie die gewählten Statusmeldungen löschen wollen?"
 
 #. Use button
-#: ../pidgin/gtksavedstatuses.c:580 ../pidgin/gtksavedstatuses.c:1213
+#: ../pidgin/gtksavedstatuses.c:619 ../pidgin/gtksavedstatuses.c:1265
 msgid "_Use"
 msgstr "Über_nehmen"
 
-#: ../pidgin/gtksavedstatuses.c:726
+#: ../pidgin/gtksavedstatuses.c:779
 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:914
+#: ../pidgin/gtksavedstatuses.c:969
 msgid "Different"
 msgstr "Anders"
 
-#: ../pidgin/gtksavedstatuses.c:1106
+#: ../pidgin/gtksavedstatuses.c:1158
 msgid "_Title:"
 msgstr "_Bezeichnung:"
 
-#: ../pidgin/gtksavedstatuses.c:1125 ../pidgin/gtksavedstatuses.c:1446
+#: ../pidgin/gtksavedstatuses.c:1177 ../pidgin/gtksavedstatuses.c:1494
 msgid "_Status:"
 msgstr "_Status:"
 
 #. Different status message expander
-#: ../pidgin/gtksavedstatuses.c:1157
+#: ../pidgin/gtksavedstatuses.c:1209
 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:1273
 msgid "Sa_ve & Use"
 msgstr "S_peichern & Übernehmen"
 
 #
-#: ../pidgin/gtksavedstatuses.c:1427
+#: ../pidgin/gtksavedstatuses.c:1477
 #, c-format
 msgid "Status for %s"
 msgstr "Status für %s"
@@ -14934,42 +14950,41 @@
 msgid "GStreamer failed to initialize."
 msgstr "GStreamer konnte nicht initialisiert werden."
 
-#: ../pidgin/gtkstatusbox.c:661
+#: ../pidgin/gtkstatusbox.c:663
 msgid "Waiting for network connection"
 msgstr "Warte auf Netzwerkverbindung"
 
-#: ../pidgin/gtkutils.c:593
+#: ../pidgin/gtkutils.c:627
 msgid "Google Talk"
 msgstr "Google Talk"
 
-#: ../pidgin/gtkutils.c:1309 ../pidgin/gtkutils.c:1332
+#: ../pidgin/gtkutils.c:1378 ../pidgin/gtkutils.c:1401
 #, c-format
 msgid "The following error has occurred loading %s: %s"
 msgstr "Beim Laden von %s ist folgender Fehler aufgetreten: %s"
 
-#: ../pidgin/gtkutils.c:1312 ../pidgin/gtkutils.c:1334
+#: ../pidgin/gtkutils.c:1381 ../pidgin/gtkutils.c:1403
 msgid "Failed to load image"
 msgstr "Laden des Bildes fehlgeschlagen"
 
-#: ../pidgin/gtkutils.c:1408
+#: ../pidgin/gtkutils.c:1477
 #, c-format
 msgid "Cannot send folder %s."
 msgstr "Kann Verzeichnis %s nicht senden."
 
-#: ../pidgin/gtkutils.c:1409
+#: ../pidgin/gtkutils.c:1478
 #, c-format
 msgid ""
 "%s cannot transfer a folder. You will need to send the files within "
 "individually."
-msgstr ""
-"%s kann keine Verzeichnisse übertragen. Bitte senden sie die Dateien einzeln."
-
-#: ../pidgin/gtkutils.c:1441 ../pidgin/gtkutils.c:1453
-#: ../pidgin/gtkutils.c:1460
+msgstr "%s kann keine Verzeichnisse übertragen. Bitte senden sie die Dateien einzeln."
+
+#: ../pidgin/gtkutils.c:1510 ../pidgin/gtkutils.c:1522
+#: ../pidgin/gtkutils.c:1529
 msgid "You have dragged an image"
 msgstr "Sie haben ein Bild gewählt"
 
-#: ../pidgin/gtkutils.c:1442
+#: ../pidgin/gtkutils.c:1511
 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."
@@ -14977,23 +14992,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:1448 ../pidgin/gtkutils.c:1468
+#: ../pidgin/gtkutils.c:1517 ../pidgin/gtkutils.c:1537
 msgid "Set as buddy icon"
 msgstr "Als Buddy-Icons verwenden"
 
-#: ../pidgin/gtkutils.c:1449 ../pidgin/gtkutils.c:1469
+#: ../pidgin/gtkutils.c:1518 ../pidgin/gtkutils.c:1538
 msgid "Send image file"
 msgstr "Bilddatei senden"
 
-#: ../pidgin/gtkutils.c:1450 ../pidgin/gtkutils.c:1469
+#: ../pidgin/gtkutils.c:1519 ../pidgin/gtkutils.c:1538
 msgid "Insert in message"
 msgstr "In Nachricht einfügen"
 
-#: ../pidgin/gtkutils.c:1454
+#: ../pidgin/gtkutils.c:1523
 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:1461
+#: ../pidgin/gtkutils.c:1530
 msgid ""
 "You can send this image as a file transfer, or use it as the buddy icon for "
 "this user."
@@ -15001,7 +15016,7 @@
 "Sie können dieses Bild als Dateiübertragung senden oder es als Buddy-Icon "
 "für diesen Benutzer verwenden."
 
-#: ../pidgin/gtkutils.c:1462
+#: ../pidgin/gtkutils.c:1531
 msgid ""
 "You can insert this image into this message, or use it as the buddy icon for "
 "this user"
@@ -15014,11 +15029,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:1520
+#: ../pidgin/gtkutils.c:1589
 msgid "Cannot send launcher"
 msgstr "Kann Verknüpfung nicht senden"
 
-#: ../pidgin/gtkutils.c:1520
+#: ../pidgin/gtkutils.c:1589
 msgid ""
 "You dragged a desktop launcher. Most likely you wanted to send whatever this "
 "launcher points to instead of this launcher itself."
@@ -15026,7 +15041,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:2268
+#: ../pidgin/gtkutils.c:2311
 #, c-format
 msgid ""
 "<b>File:</b> %s\n"
@@ -15037,47 +15052,39 @@
 "<b>Dateigröße:</b> %s\n"
 "<b>Bildgröße:</b> %dx%d"
 
-#: ../pidgin/gtkutils.c:2564
+#: ../pidgin/gtkutils.c:2607
 #, 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:2566
+msgstr "Die Datei '%s' ist zu groß für %s.  Bitte versuchen Sie ein kleineres Bild.\n"
+
+#: ../pidgin/gtkutils.c:2609
 msgid "Icon Error"
 msgstr "Icon-Fehler"
 
-#: ../pidgin/gtkutils.c:2567
+#: ../pidgin/gtkutils.c:2610
 msgid "Could not set icon"
 msgstr "Konnte das Icon nicht setzen"
 
-#: ../pidgin/gtkutils.c:2667
+#: ../pidgin/gtkutils.c:2710
 #, c-format
 msgid "Failed to open file '%s': %s"
 msgstr "Öffnen der Datei '%s' fehlgeschlagen: %s"
 
-#: ../pidgin/gtkutils.c:2716
-#, c-format
-msgid ""
-"Failed to load image '%s': reason not known, probably a corrupt image file"
+#: ../pidgin/gtkutils.c:2759
+#, c-format
+msgid "Failed to load image '%s': reason not known, probably a corrupt image file"
 msgstr ""
 "Bild '%s' konnte nicht geladen werden: Grund unbekannt, vermutlich eine "
 "korrupte Bilddatei"
 
-#: ../pidgin/gtkwhiteboard.c:760 ../pidgin/gtkwhiteboard.c:779
+#: ../pidgin/gtkwhiteboard.c:754 ../pidgin/gtkwhiteboard.c:773
 msgid "Save File"
 msgstr "Datei speichern"
 
-#: ../pidgin/gtkwhiteboard.c:867
+#: ../pidgin/gtkwhiteboard.c:861
 msgid "Select color"
 msgstr "Farbe auswählen"
 
-#. Translators may want to transliterate the name.
-#. It is not to be translated.
-#: ../pidgin/pidgin.h:50
-msgid "Pidgin"
-msgstr "Pidgin"
-
 #: ../pidgin/pidginstock.c:81
 msgid "_Alias"
 msgstr "Alia_s"
@@ -15102,10 +15109,6 @@
 msgid "_Open Mail"
 msgstr "Mail ö_ffnen"
 
-#: ../pidgin/pixmaps/emotes/default/22/default.theme.in.h:1
-msgid "Default"
-msgstr "Standard"
-
 #: ../pidgin/pixmaps/emotes/default/22/default.theme.in.h:2
 msgid "Pidgin smileys"
 msgstr "Pidgin-Smileys"
@@ -15160,18 +15163,18 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/cap/cap.c:934
+#: ../pidgin/plugins/cap/cap.c:935
 msgid "Contact Availability Prediction"
 msgstr "Kontakt-Verfügbarkeits-Vorhersage"
 
 #. *< name
 #. *< version
-#: ../pidgin/plugins/cap/cap.c:936
+#: ../pidgin/plugins/cap/cap.c:937
 msgid "Contact Availability Prediction plugin."
 msgstr "Kontakt-Verfügbarkeits-Vorhersage-Plugin."
 
 #. *  summary
-#: ../pidgin/plugins/cap/cap.c:937
+#: ../pidgin/plugins/cap/cap.c:938
 msgid ""
 "The contact availability plugin (cap) is used to display statistical "
 "information about buddies in a users contact list."
@@ -15234,8 +15237,7 @@
 #. *< version
 #. *< summary
 #: ../pidgin/plugins/contact_priority.c:190
-msgid ""
-"Allows for controlling the values associated with different buddy states."
+msgid "Allows for controlling the values associated with different buddy states."
 msgstr ""
 "Erlaubt die Anpassung der Werte, die mit den verschiedenen Buddy-Zuständen "
 "verbunden sind."
@@ -15278,11 +15280,23 @@
 msgid "Received Messages"
 msgstr "Empfangene Nachrichten"
 
-#: ../pidgin/plugins/convcolors.c:210 ../pidgin/plugins/pidginrc.c:320
+#: ../pidgin/plugins/convcolors.c:210 ../pidgin/plugins/pidginrc.c:251
 #, c-format
 msgid "Select Color for %s"
 msgstr "Textfarbe für %s auswählen"
 
+#: ../pidgin/plugins/convcolors.c:287
+msgid "Bold"
+msgstr "Fett"
+
+#: ../pidgin/plugins/convcolors.c:294
+msgid "Italic"
+msgstr "Kursiv"
+
+#: ../pidgin/plugins/convcolors.c:301
+msgid "Underline"
+msgstr "Unterstrichen"
+
 #: ../pidgin/plugins/convcolors.c:310
 msgid "Ignore incoming format"
 msgstr "Eingehendes Format ignorieren"
@@ -15403,31 +15417,31 @@
 msgstr "Sofortnachrichten"
 
 #. Add the label.
-#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:460
+#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:457
 msgid "Select a person from your address book below, or add a new person."
 msgstr ""
 "Wählen Sie eine Person aus Ihrem Adressbuch unten aus oder fügen Sie eine "
 "neue Person hinzu."
 
-#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:554
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:307
+#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:551
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:303
 msgid "Group:"
 msgstr "Gruppe:"
 
 #. "New Person" button
-#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:580
-#: ../pidgin/plugins/gevolution/assoc-buddy.c:469
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:251
+#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:577
+#: ../pidgin/plugins/gevolution/assoc-buddy.c:467
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:249
 msgid "New Person"
 msgstr "Neue Person"
 
 #. "Select Buddy" button
-#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:597
+#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:594
 msgid "Select Buddy"
 msgstr "Buddy auswählen"
 
 #. Add the label.
-#: ../pidgin/plugins/gevolution/assoc-buddy.c:345
+#: ../pidgin/plugins/gevolution/assoc-buddy.c:343
 msgid ""
 "Select a person from your address book to add this buddy to, or create a new "
 "person."
@@ -15436,12 +15450,12 @@
 "werden soll oder erstellen Sie einen neuen Kontakt."
 
 #. Add the expander
-#: ../pidgin/plugins/gevolution/assoc-buddy.c:433
+#: ../pidgin/plugins/gevolution/assoc-buddy.c:431
 msgid "User _details"
 msgstr "Benutzer_details"
 
 #. "Associate Buddy" button
-#: ../pidgin/plugins/gevolution/assoc-buddy.c:486
+#: ../pidgin/plugins/gevolution/assoc-buddy.c:484
 msgid "_Associate Buddy"
 msgstr "_Assoziiere den Buddy"
 
@@ -15497,34 +15511,33 @@
 msgid "Provides integration with Evolution."
 msgstr "Erlaubt die Integration mit Evolution."
 
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:267
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:263
 msgid "Please enter the person's information below."
 msgstr "Bitte geben Sie die Informationen zu der Person unten ein."
 
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:271
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:267
 msgid "Please enter the buddy's screen name and account type below."
-msgstr ""
-"Geben Sie bitte den Benutzernamen des Buddys und den Kontentyp unten ein."
-
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:291
+msgstr "Geben Sie bitte den Benutzernamen des Buddys und den Kontentyp unten ein."
+
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:287
 msgid "Account type:"
 msgstr "Kontotyp:"
 
 #. Optional Information section
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:315
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:311
 msgid "Optional information:"
 msgstr "Optionale Informationen:"
 
 # old strings
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:350
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:346
 msgid "First name:"
 msgstr "Vorname:"
 
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:362
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:358
 msgid "Last name:"
 msgstr "Nachname:"
 
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:382
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:378
 msgid "E-mail:"
 msgstr "E-Mail:"
 
@@ -15551,10 +15564,10 @@
 #, c-format
 msgid ""
 "\n"
-"Buddy Note: %s"
+"<b>Buddy Note</b>: %s"
 msgstr ""
 "\n"
-"Buddy-Notiz: %s"
+"<b>Buddy-Notizen</b>: %s"
 
 #: ../pidgin/plugins/history.c:188
 msgid "History"
@@ -15598,8 +15611,7 @@
 
 #: ../pidgin/plugins/markerline.c:25 ../pidgin/plugins/markerline.c:26
 msgid "Draw a line to indicate new messages in a conversation."
-msgstr ""
-"Eine Linie zeichnen um neue Nachrichten in einer Unterhaltung anzuzeigen."
+msgstr "Eine Linie zeichnen um neue Nachrichten in einer Unterhaltung anzuzeigen."
 
 #: ../pidgin/plugins/markerline.c:246
 msgid "Draw Markerline in "
@@ -15836,24 +15848,24 @@
 msgid "Notify Dialog"
 msgstr "Benachrichtigungsdialog"
 
-#: ../pidgin/plugins/pidginrc.c:322
+#: ../pidgin/plugins/pidginrc.c:253
 msgid "Select Color"
 msgstr "Farbe auswählen"
 
-#: ../pidgin/plugins/pidginrc.c:361
+#: ../pidgin/plugins/pidginrc.c:300
+msgid "Select Interface Font"
+msgstr "Schriftart wählen"
+
+#: ../pidgin/plugins/pidginrc.c:303
 #, c-format
 msgid "Select Font for %s"
 msgstr "Schriftart für %s wählen"
 
-#: ../pidgin/plugins/pidginrc.c:398
-msgid "Select Interface Font"
-msgstr "Schriftart wählen"
-
-#: ../pidgin/plugins/pidginrc.c:453
+#: ../pidgin/plugins/pidginrc.c:371
 msgid "GTK+ Interface Font"
 msgstr "GTK+ Schrift"
 
-#: ../pidgin/plugins/pidginrc.c:473
+#: ../pidgin/plugins/pidginrc.c:391
 msgid "GTK+ Text Shortcut Theme"
 msgstr "GTK+ Text Shortcut-Thema"
 
@@ -15877,36 +15889,36 @@
 #. widget_bool_widgets[i]);
 #. }
 #.
-#: ../pidgin/plugins/pidginrc.c:510
+#: ../pidgin/plugins/pidginrc.c:428
 msgid "Interface colors"
 msgstr "UI-Farben"
 
-#: ../pidgin/plugins/pidginrc.c:534
+#: ../pidgin/plugins/pidginrc.c:452
 msgid "Widget Sizes"
 msgstr "Widget-Größen"
 
-#: ../pidgin/plugins/pidginrc.c:555
+#: ../pidgin/plugins/pidginrc.c:473
 msgid "Fonts"
 msgstr "Schrift"
 
-#: ../pidgin/plugins/pidginrc.c:578
-msgid "Tools"
-msgstr "Werkzeuge"
-
-#: ../pidgin/plugins/pidginrc.c:583
+#: ../pidgin/plugins/pidginrc.c:497
+msgid "Gtkrc File Tools"
+msgstr "Gtkrc-Datei-Werkzeuge"
+
+#: ../pidgin/plugins/pidginrc.c:502
 #, c-format
 msgid "Write settings to %s%sgtkrc-2.0"
 msgstr "Schreibe Einstellungen nach %s%sgtkrc-2.0"
 
-#: ../pidgin/plugins/pidginrc.c:591
+#: ../pidgin/plugins/pidginrc.c:511
 msgid "Re-read gtkrc files"
 msgstr "Neueinlesen der gtkrc-Dateien"
 
-#: ../pidgin/plugins/pidginrc.c:624
+#: ../pidgin/plugins/pidginrc.c:544
 msgid "Pidgin GTK+ Theme Control"
 msgstr "Pidgin GTK+ Themenkontrolle"
 
-#: ../pidgin/plugins/pidginrc.c:626 ../pidgin/plugins/pidginrc.c:627
+#: ../pidgin/plugins/pidginrc.c:546 ../pidgin/plugins/pidginrc.c:547
 msgid "Provides access to commonly used gtkrc settings."
 msgstr "Erlaubt den Zugriff auf häufig benutzte gtkrc-Einstellungen."
 
@@ -15931,17 +15943,17 @@
 #, c-format
 msgid ""
 "You are using %s version %s.  The current version is %s.  You can get it "
-"from <a href=\""
+"from <a href=\"%s\">%s</a><hr>"
 msgstr ""
 "Sie verwenden %s Version %s.  Die aktuelle Version ist %s.Download unter <a "
-"href=\""
-
-#: ../pidgin/plugins/relnot.c:78
+"href=\"%s\">%s</a><hr>"
+
+#: ../pidgin/plugins/relnot.c:79
 #, c-format
 msgid "<b>ChangeLog:</b><br>%s"
 msgstr "<b>Änderungen:</b><br>%s"
 
-#: ../pidgin/plugins/relnot.c:83 ../pidgin/plugins/relnot.c:84
+#: ../pidgin/plugins/relnot.c:84 ../pidgin/plugins/relnot.c:85
 msgid "New Version Available"
 msgstr "Neue Version verfügbar"
 
@@ -15951,19 +15963,19 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/relnot.c:142
+#: ../pidgin/plugins/relnot.c:143
 msgid "Release Notification"
 msgstr "Release-Benachrichtigung"
 
 #. *< name
 #. *< version
 #. *  summary
-#: ../pidgin/plugins/relnot.c:145
+#: ../pidgin/plugins/relnot.c:146
 msgid "Checks periodically for new releases."
 msgstr "Prüft regelmäßig, ob neue Versionen verfügbar sind."
 
 #. *  description
-#: ../pidgin/plugins/relnot.c:147
+#: ../pidgin/plugins/relnot.c:148
 msgid ""
 "Checks periodically for new releases and notifies the user with the "
 "ChangeLog."
@@ -15971,72 +15983,70 @@
 "Prüft regelmäßig, ob neue Versionen verfügbar sind und zeigt die Änderungen "
 "an."
 
-#: ../pidgin/plugins/spellchk.c:1965
+#: ../pidgin/plugins/spellchk.c:1962
 msgid "Duplicate Correction"
 msgstr "Duplikat-Korrektur"
 
-#: ../pidgin/plugins/spellchk.c:1966
+#: ../pidgin/plugins/spellchk.c:1963
 msgid "The specified word already exists in the correction list."
 msgstr "Das angegebene Wort ist bereits in der Korrekturliste enthalten."
 
-#: ../pidgin/plugins/spellchk.c:2180
+#: ../pidgin/plugins/spellchk.c:2177
 msgid "Text Replacements"
 msgstr "Text-Ersetzung"
 
-#: ../pidgin/plugins/spellchk.c:2203
+#: ../pidgin/plugins/spellchk.c:2200
 msgid "You type"
 msgstr "Sie tippen"
 
-#: ../pidgin/plugins/spellchk.c:2217
+#: ../pidgin/plugins/spellchk.c:2214
 msgid "You send"
 msgstr "Sie senden"
 
-#: ../pidgin/plugins/spellchk.c:2231
+#: ../pidgin/plugins/spellchk.c:2228
 msgid "Whole words only"
 msgstr "Nur ganze Wörter"
 
-#: ../pidgin/plugins/spellchk.c:2243
+#: ../pidgin/plugins/spellchk.c:2240
 msgid "Case sensitive"
 msgstr "Groß-/Kleinschreibung beachten"
 
-#: ../pidgin/plugins/spellchk.c:2269
+#: ../pidgin/plugins/spellchk.c:2266
 msgid "Add a new text replacement"
 msgstr "Fügen Sie eine neue Textersetzung hinzu"
 
-#: ../pidgin/plugins/spellchk.c:2285
+#: ../pidgin/plugins/spellchk.c:2282
 msgid "You _type:"
 msgstr "Sie _tippen:"
 
-#: ../pidgin/plugins/spellchk.c:2302
+#: ../pidgin/plugins/spellchk.c:2299
 msgid "You _send:"
 msgstr "Sie _senden:"
 
 #. Created here so it can be passed to whole_words_button_toggled.
-#: ../pidgin/plugins/spellchk.c:2314
+#: ../pidgin/plugins/spellchk.c:2311
 msgid "_Exact case match (uncheck for automatic case handling)"
-msgstr ""
-"_Genaue Groß-/Kleinschreibung (deaktivieren für automatische Behandlung)"
-
-#: ../pidgin/plugins/spellchk.c:2316
+msgstr "_Genaue Groß-/Kleinschreibung (deaktivieren für automatische Behandlung)"
+
+#: ../pidgin/plugins/spellchk.c:2313
 msgid "Only replace _whole words"
 msgstr "Ersetze nur ganze _Wörter"
 
-#: ../pidgin/plugins/spellchk.c:2341
+#: ../pidgin/plugins/spellchk.c:2338
 msgid "General Text Replacement Options"
 msgstr "Allgemeine Textersetzungsoptionen"
 
-#: ../pidgin/plugins/spellchk.c:2342
+#: ../pidgin/plugins/spellchk.c:2339
 msgid "Enable replacement of last word on send"
 msgstr "Ersetzung des letztes Worts beim Senden"
 
-#: ../pidgin/plugins/spellchk.c:2373
+#: ../pidgin/plugins/spellchk.c:2370
 msgid "Text replacement"
 msgstr "Textersetzung"
 
-#: ../pidgin/plugins/spellchk.c:2375 ../pidgin/plugins/spellchk.c:2376
+#: ../pidgin/plugins/spellchk.c:2372 ../pidgin/plugins/spellchk.c:2373
 msgid "Replaces text in outgoing messages according to user-defined rules."
-msgstr ""
-"Ersetzt Text in ausgehenden Nachrichten durch benutzerdefinierte Regeln."
+msgstr "Ersetzt Text in ausgehenden Nachrichten durch benutzerdefinierte Regeln."
 
 #. *< type
 #. *< ui_requirement
@@ -16044,7 +16054,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/ticker/ticker.c:77 ../pidgin/plugins/ticker/ticker.c:355
+#: ../pidgin/plugins/ticker/ticker.c:74 ../pidgin/plugins/ticker/ticker.c:354
 msgid "Buddy Ticker"
 msgstr "Buddy-Ticker"
 
@@ -16052,7 +16062,7 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../pidgin/plugins/ticker/ticker.c:358 ../pidgin/plugins/ticker/ticker.c:360
+#: ../pidgin/plugins/ticker/ticker.c:357 ../pidgin/plugins/ticker/ticker.c:359
 msgid "A horizontal scrolling version of the buddy list."
 msgstr "Zeigt die Buddy-Liste als tickerähnliche Laufschrift."
 
@@ -16138,44 +16148,44 @@
 "Dieses Plugin erlaubt es dem Benutzer die Zeitstempel in Unterhaltungen und "
 "im Mitschnitt anzupassen."
 
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:183
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:569
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:616
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:174
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:589
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:636
 msgid "Opacity:"
 msgstr "Durchlässigkeit:"
 
 #. IM Convo trans options
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:533
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:553
 msgid "IM Conversation Windows"
 msgstr "IM Gesprächsfenster"
 
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:534
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:554
 msgid "_IM window transparency"
 msgstr "_IM Fenstertransparenz"
 
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:548
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:568
 msgid "_Show slider bar in IM window"
 msgstr "Zeige _Schiebebalken im IM-Fenster"
 
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:555
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:575
 msgid "Remove IM window transparency on focus"
 msgstr "Transparenz des Unterhaltungsfensters beim Aktivieren aufheben"
 
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:558
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:606
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:578
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:626
 msgid "Always on top"
 msgstr "Immer im Vordergrund"
 
 #. Buddy List trans options
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:590
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:610
 msgid "Buddy List Window"
 msgstr "Buddy-Listen-Fenster"
 
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:591
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:611
 msgid "_Buddy List window transparency"
 msgstr "Transparenz des _Buddy-Listen-Fensters"
 
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:604
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:624
 msgid "Remove Buddy List window transparency on focus"
 msgstr "Transparenz des Buddy-Listen-Fensters beim Aktivieren aufheben"
 
@@ -16185,19 +16195,19 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:664
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:684
 msgid "Transparency"
 msgstr "Transparenz"
 
 #. *< name
 #. *< version
 #. *  summary
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:667
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:687
 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:669
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:689
 msgid ""
 "This plugin enables variable alpha transparency on conversation windows and "
 "the buddy list.\n"
@@ -16250,12 +16260,10 @@
 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 ""
-"Bietet spezielle Optionen für Windows-Pidgin, wie Buddy-Listen-Docking."
-
-#: ../pidgin/plugins/xmppconsole.c:666
+msgid "Provides options specific to Pidgin for Windows , such as buddy list docking."
+msgstr "Bietet spezielle Optionen für Windows-Pidgin, wie Buddy-Listen-Docking."
+
+#: ../pidgin/plugins/xmppconsole.c:667
 msgid "<font color='#777777'>Logged out.</font>"
 msgstr "<font color='#777777'>Abgemeldet.</font>"
 
@@ -16265,40 +16273,40 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/xmppconsole.c:746 ../pidgin/plugins/xmppconsole.c:842
-#: ../pidgin/plugins/xmppconsole.c:861
+#: ../pidgin/plugins/xmppconsole.c:746 ../pidgin/plugins/xmppconsole.c:841
+#: ../pidgin/plugins/xmppconsole.c:860
 msgid "XMPP Console"
 msgstr "XMPP-Konsole"
 
-#: ../pidgin/plugins/xmppconsole.c:754
+#: ../pidgin/plugins/xmppconsole.c:753
 msgid "Account: "
 msgstr "Konto: "
 
-#: ../pidgin/plugins/xmppconsole.c:781
+#: ../pidgin/plugins/xmppconsole.c:780
 msgid "<font color='#777777'>Not connected to XMPP</font>"
 msgstr "<font color='#777777'>Nicht mit XMPP verbunden</font>"
 
-#: ../pidgin/plugins/xmppconsole.c:791
+#: ../pidgin/plugins/xmppconsole.c:790
 msgid "Insert an <iq/> stanza."
 msgstr "Einen <iq/> Block einfügen."
 
-#: ../pidgin/plugins/xmppconsole.c:800
+#: ../pidgin/plugins/xmppconsole.c:799
 msgid "Insert a <presence/> stanza."
 msgstr "Einen <presence/> Block einfügen."
 
-#: ../pidgin/plugins/xmppconsole.c:809
+#: ../pidgin/plugins/xmppconsole.c:808
 msgid "Insert a <message/> stanza."
 msgstr "Einen <message/> Block einfügen."
 
 #. *< name
 #. *< version
 #. *  summary
-#: ../pidgin/plugins/xmppconsole.c:864
+#: ../pidgin/plugins/xmppconsole.c:863
 msgid "Send and receive raw XMPP stanzas."
 msgstr "Sendet und empfängt RAW-XMPP-Blöcke."
 
 #. *  description
-#: ../pidgin/plugins/xmppconsole.c:866
+#: ../pidgin/plugins/xmppconsole.c:865
 msgid "This plugin is useful for debbuging XMPP servers or clients."
-msgstr ""
-"Dieses Plugin ist nützlich zur Fehlersuche in XMPP-Servern oder -Clients."
+msgstr "Dieses Plugin ist nützlich zur Fehlersuche in XMPP-Servern oder -Clients."
+
--- a/po/es.po	Thu Jul 12 23:57:56 2007 +0000
+++ b/po/es.po	Fri Jul 13 00:03:15 2007 +0000
@@ -53,8 +53,8 @@
 msgstr ""
 "Project-Id-Version: Gaim\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-05-22 00:04-0400\n"
-"PO-Revision-Date: 2007-05-23 00:06+0200\n"
+"POT-Creation-Date: 2007-06-18 03:21-0400\n"
+"PO-Revision-Date: 2007-06-18 21:51+0200\n"
 "Last-Translator: Javier Fernández-Sanguino <jfs@debian.org>\n"
 "Language-Team:  Spanish team <es@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -62,12 +62,12 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
-#: ../finch/finch.c:180
+#: ../finch/finch.c:184
 #, c-format
 msgid "%s. Try `%s -h' for more information.\n"
 msgstr "%s. Intente `%s -h' para más información.\n"
 
-#: ../finch/finch.c:182
+#: ../finch/finch.c:186
 #, c-format
 msgid ""
 "%s\n"
@@ -92,98 +92,101 @@
 
 #. Translators may want to transliterate the name.
 #. It is not to be translated.
-#: ../finch/finch.c:274 ../finch/finch.c:303
+#: ../finch/finch.c:278 ../finch/finch.c:307
 msgid "Finch"
 msgstr "Finch"
 
-#: ../finch/finch.c:301 ../pidgin/gtkmain.c:685
+#: ../finch/finch.c:305 ../pidgin/gtkmain.c:689
 #, 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 se encontró con errors al migrar su configuración de %s a %s. Investigue el problema y complete la migración de forma manual. Por favor, informe de este error en http://developer.pidgin.im"
-
-#: ../finch/gntaccount.c:119 ../finch/gntblist.c:288 ../finch/gntblist.c:413
-#: ../finch/gntblist.c:426 ../finch/gntplugin.c:181 ../finch/gntplugin.c:225
+msgstr ""
+"%s se encontró con errors al migrar su configuración de %s a %s. Investigue "
+"el problema y complete la migración de forma manual. Por favor, informe de "
+"este error en http://developer.pidgin.im"
+
+#: ../finch/gntaccount.c:121 ../finch/gntblist.c:296 ../finch/gntblist.c:421
+#: ../finch/gntblist.c:434 ../finch/gntplugin.c:184 ../finch/gntplugin.c:228
 #: ../finch/gntstatus.c:294 ../finch/gntstatus.c:302
-#: ../libpurple/protocols/jabber/buddy.c:1426
+#: ../libpurple/protocols/jabber/buddy.c:1460
 #: ../libpurple/protocols/jabber/chat.c:677
 #: ../libpurple/protocols/jabber/chat.c:688
-#: ../libpurple/protocols/jabber/jabber.c:1229
+#: ../libpurple/protocols/jabber/jabber.c:1225
 #: ../libpurple/protocols/qq/group_join.c:326
-#: ../libpurple/protocols/silc/ops.c:1451
+#: ../libpurple/protocols/silc/ops.c:57 ../libpurple/protocols/silc/ops.c:1456
+#: ../libpurple/protocols/silc10/ops.c:1451
 msgid "Error"
 msgstr "Error"
 
-#: ../finch/gntaccount.c:119
+#: ../finch/gntaccount.c:121
 msgid "Account was not added"
 msgstr "No se ha añadido la cuenta"
 
-#: ../finch/gntaccount.c:120
+#: ../finch/gntaccount.c:122
 msgid "Screenname of an account must be non-empty."
 msgstr "El nombre de usuario de una cuenta no puede estar vacío."
 
-#: ../finch/gntaccount.c:423 ../pidgin/gtkaccount.c:590
+#: ../finch/gntaccount.c:429
 msgid "New mail notifications"
 msgstr "Notificaciones de correo nuevo"
 
-#: ../finch/gntaccount.c:433 ../pidgin/gtkaccount.c:519
+#: ../finch/gntaccount.c:439
 msgid "Remember password"
 msgstr "Recordar contraseña"
 
-#: ../finch/gntaccount.c:474 ../pidgin/gtkaccount.c:1456
-#: ../pidgin/gtkblist.c:3965
+#: ../finch/gntaccount.c:480 ../pidgin/gtkaccount.c:1473
+#: ../pidgin/gtkblist.c:4002
 msgid "Modify Account"
 msgstr "Modificar cuenta"
 
-#: ../finch/gntaccount.c:474
+#: ../finch/gntaccount.c:480
 msgid "New Account"
 msgstr "Nueva cuenta"
 
-#: ../finch/gntaccount.c:500 ../pidgin/gtkaccount.c:427 ../pidgin/gtkft.c:695
+#: ../finch/gntaccount.c:506 ../pidgin/gtkft.c:695
 msgid "Protocol:"
 msgstr "Protocolo:"
 
-#: ../finch/gntaccount.c:508 ../pidgin/gtkaccount.c:435
-#: ../pidgin/gtkblist.c:5389
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:295
+#: ../finch/gntaccount.c:514
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:291
 msgid "Screen name:"
 msgstr "Nombre de usuario:"
 
-#: ../finch/gntaccount.c:521 ../pidgin/gtkaccount.c:510
+#: ../finch/gntaccount.c:527
 msgid "Password:"
 msgstr "Contraseña:"
 
-#: ../finch/gntaccount.c:531 ../pidgin/gtkblist.c:5410
-#: ../pidgin/gtkblist.c:5773
+#: ../finch/gntaccount.c:537
 msgid "Alias:"
 msgstr "Apodo:"
 
 #. Cancel button
 #. Cancel
-#: ../finch/gntaccount.c:554 ../finch/gntaccount.c:617
-#: ../finch/gntaccount.c:838 ../finch/gntblist.c:332 ../finch/gntblist.c:401
-#: ../finch/gntblist.c:436 ../finch/gntblist.c:768 ../finch/gntblist.c:965
-#: ../finch/gntblist.c:1061 ../finch/gntblist.c:2155 ../finch/gntplugin.c:360
+#: ../finch/gntaccount.c:560 ../finch/gntaccount.c:623
+#: ../finch/gntaccount.c:865 ../finch/gntblist.c:340 ../finch/gntblist.c:409
+#: ../finch/gntblist.c:444 ../finch/gntblist.c:785 ../finch/gntblist.c:987
+#: ../finch/gntblist.c:1083 ../finch/gntblist.c:2180 ../finch/gntplugin.c:363
 #: ../finch/gntpounce.c:456 ../finch/gntpounce.c:654 ../finch/gntprefs.c:246
 #: ../finch/gntstatus.c:142 ../finch/gntstatus.c:475 ../finch/gntstatus.c:600
 #: ../libpurple/account.c:984 ../libpurple/account.c:1234
-#: ../libpurple/account.c:1269 ../libpurple/conversation.c:1168
+#: ../libpurple/account.c:1269 ../libpurple/conversation.c:1173
 #: ../libpurple/plugins/buddynote.c:51 ../libpurple/protocols/gg/gg.c:502
 #: ../libpurple/protocols/gg/gg.c:661 ../libpurple/protocols/gg/gg.c:798
 #: ../libpurple/protocols/gg/gg.c:879
 #: ../libpurple/protocols/jabber/buddy.c:584
-#: ../libpurple/protocols/jabber/buddy.c:1788
-#: ../libpurple/protocols/jabber/buddy.c:1824
+#: ../libpurple/protocols/jabber/buddy.c:1822
+#: ../libpurple/protocols/jabber/buddy.c:1858
 #: ../libpurple/protocols/jabber/chat.c:786
-#: ../libpurple/protocols/jabber/jabber.c:878
-#: ../libpurple/protocols/jabber/jabber.c:1384
+#: ../libpurple/protocols/jabber/jabber.c:882
+#: ../libpurple/protocols/jabber/jabber.c:1380
+#: ../libpurple/protocols/jabber/si.c:868
 #: ../libpurple/protocols/jabber/xdata.c:337
 #: ../libpurple/protocols/msn/msn.c:259 ../libpurple/protocols/msn/msn.c:276
 #: ../libpurple/protocols/msn/msn.c:293 ../libpurple/protocols/msn/msn.c:310
 #: ../libpurple/protocols/msn/msn.c:331
-#: ../libpurple/protocols/oscar/oscar.c:6004
+#: ../libpurple/protocols/oscar/oscar.c:6072
 #: ../libpurple/protocols/oscar/peer.c:1023
 #: ../libpurple/protocols/qq/buddy_info.c:484
 #: ../libpurple/protocols/qq/buddy_opt.c:214
@@ -202,368 +205,387 @@
 #: ../libpurple/protocols/sametime/sametime.c:5397
 #: ../libpurple/protocols/sametime/sametime.c:5487
 #: ../libpurple/protocols/sametime/sametime.c:5612
-#: ../libpurple/protocols/silc/buddy.c:468
-#: ../libpurple/protocols/silc/buddy.c:1084
-#: ../libpurple/protocols/silc/buddy.c:1189
-#: ../libpurple/protocols/silc/chat.c:600
-#: ../libpurple/protocols/silc/chat.c:730
-#: ../libpurple/protocols/silc/ops.c:1913
-#: ../libpurple/protocols/silc/silc.c:744
-#: ../libpurple/protocols/silc/silc.c:950
-#: ../libpurple/protocols/yahoo/yahoo.c:987
-#: ../libpurple/protocols/yahoo/yahoo.c:3231
-#: ../libpurple/protocols/yahoo/yahoo.c:3242 ../pidgin/gtkaccount.c:1894
-#: ../pidgin/gtkaccount.c:2485 ../pidgin/gtkblist.c:5829
-#: ../pidgin/gtkdialogs.c:725 ../pidgin/gtkdialogs.c:863
-#: ../pidgin/gtkdialogs.c:955 ../pidgin/gtkdialogs.c:975
-#: ../pidgin/gtkdialogs.c:999 ../pidgin/gtkdialogs.c:1021
-#: ../pidgin/gtkdialogs.c:1069 ../pidgin/gtkdialogs.c:1110
-#: ../pidgin/gtkdialogs.c:1166 ../pidgin/gtkdialogs.c:1205
-#: ../pidgin/gtkdialogs.c:1232 ../pidgin/gtkimhtmltoolbar.c:419
-#: ../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
+#: ../libpurple/protocols/silc/buddy.c:455
+#: ../libpurple/protocols/silc/buddy.c:1076
+#: ../libpurple/protocols/silc/buddy.c:1191
+#: ../libpurple/protocols/silc/chat.c:616
+#: ../libpurple/protocols/silc/chat.c:746
+#: ../libpurple/protocols/silc/ops.c:1816
+#: ../libpurple/protocols/silc/silc.c:823
+#: ../libpurple/protocols/silc/silc.c:1031
+#: ../libpurple/protocols/silc10/buddy.c:468
+#: ../libpurple/protocols/silc10/buddy.c:1084
+#: ../libpurple/protocols/silc10/buddy.c:1189
+#: ../libpurple/protocols/silc10/chat.c:600
+#: ../libpurple/protocols/silc10/chat.c:730
+#: ../libpurple/protocols/silc10/ops.c:1904
+#: ../libpurple/protocols/silc10/silc.c:736
+#: ../libpurple/protocols/silc10/silc.c:942
+#: ../libpurple/protocols/yahoo/yahoo.c:989
+#: ../libpurple/protocols/yahoo/yahoo.c:3248
+#: ../libpurple/protocols/yahoo/yahoo.c:3259 ../pidgin/gtkaccount.c:1908
+#: ../pidgin/gtkaccount.c:2502 ../pidgin/gtkblist.c:5894
+#: ../pidgin/gtkdialogs.c:724 ../pidgin/gtkdialogs.c:862
+#: ../pidgin/gtkdialogs.c:954 ../pidgin/gtkdialogs.c:974
+#: ../pidgin/gtkdialogs.c:998 ../pidgin/gtkdialogs.c:1020
+#: ../pidgin/gtkdialogs.c:1068 ../pidgin/gtkdialogs.c:1109
+#: ../pidgin/gtkdialogs.c:1165 ../pidgin/gtkdialogs.c:1204
+#: ../pidgin/gtkdialogs.c:1231 ../pidgin/gtkimhtmltoolbar.c:423
+#: ../pidgin/gtklog.c:302 ../pidgin/gtkplugin.c:288 ../pidgin/gtkpounce.c:1115
+#: ../pidgin/gtkprivacy.c:562 ../pidgin/gtkprivacy.c:578
+#: ../pidgin/gtkprivacy.c:603 ../pidgin/gtkprivacy.c:617
 #: ../pidgin/gtkrequest.c:270 ../pidgin/gtksavedstatuses.c:337
 msgid "Cancel"
 msgstr "Cancelar"
 
 #. Save button
 #. Save
-#: ../finch/gntaccount.c:558 ../finch/gntplugin.c:360 ../finch/gntpounce.c:462
+#: ../finch/gntaccount.c:564 ../finch/gntplugin.c:363 ../finch/gntpounce.c:462
 #: ../finch/gntprefs.c:246 ../finch/gntstatus.c:478 ../finch/gntstatus.c:588
 #: ../libpurple/account.c:1268 ../libpurple/plugins/buddynote.c:50
-#: ../libpurple/protocols/jabber/buddy.c:583 ../pidgin/gtkdebug.c:747
+#: ../libpurple/protocols/jabber/buddy.c:583 ../pidgin/gtkdebug.c:748
 #: ../pidgin/gtkrequest.c:276
 msgid "Save"
 msgstr "Guardar"
 
-#: ../finch/gntaccount.c:611 ../pidgin/gtkaccount.c:1886
+#: ../finch/gntaccount.c:617 ../pidgin/gtkaccount.c:1900
 #: ../pidgin/gtksavedstatuses.c:328
 #, c-format
 msgid "Are you sure you want to delete %s?"
 msgstr "¿Seguro que quiere borrar a %s?"
 
-#: ../finch/gntaccount.c:614
+#: ../finch/gntaccount.c:620
 msgid "Delete Account"
 msgstr "Borrar cuenta"
 
 #. Delete button
-#: ../finch/gntaccount.c:616 ../finch/gntaccount.c:683
+#: ../finch/gntaccount.c:622 ../finch/gntaccount.c:689
 #: ../finch/gntpounce.c:653 ../finch/gntpounce.c:714 ../finch/gntstatus.c:141
-#: ../finch/gntstatus.c:204 ../pidgin/gtkaccount.c:1893 ../pidgin/gtklog.c:301
-#: ../pidgin/gtkpounce.c:1101 ../pidgin/gtkrequest.c:273
+#: ../finch/gntstatus.c:204 ../pidgin/gtkaccount.c:1907 ../pidgin/gtklog.c:301
+#: ../pidgin/gtkpounce.c:1114 ../pidgin/gtkrequest.c:273
 #: ../pidgin/gtksavedstatuses.c:336
 msgid "Delete"
 msgstr "Borrar"
 
-#: ../finch/gntaccount.c:646 ../finch/gntblist.c:2060 ../finch/gntui.c:76
-#: ../pidgin/gtkaccount.c:2311 ../pidgin/gtkdocklet.c:522
+#: ../finch/gntaccount.c:652 ../finch/gntblist.c:2085 ../finch/gntui.c:76
+#: ../pidgin/gtkaccount.c:2328 ../pidgin/gtkdocklet.c:522
 msgid "Accounts"
 msgstr "Cuentas"
 
-#: ../finch/gntaccount.c:652
+#: ../finch/gntaccount.c:658
 msgid "You can enable/disable accounts from the following list."
 msgstr "Puede (desh)habilitar cuentas de la lista a continuación."
 
 #. Add button
-#: ../finch/gntaccount.c:675 ../finch/gntaccount.c:837 ../finch/gntblist.c:331
-#: ../finch/gntblist.c:401 ../finch/gntblist.c:436 ../finch/gntnotify.c:369
+#: ../finch/gntaccount.c:681 ../finch/gntaccount.c:864 ../finch/gntblist.c:339
+#: ../finch/gntblist.c:409 ../finch/gntblist.c:444 ../finch/gntnotify.c:370
 #: ../finch/gntpounce.c:699 ../finch/gntstatus.c:194
 #: ../libpurple/protocols/gg/gg.c:878 ../libpurple/protocols/qq/sys_msg.c:116
 #: ../libpurple/protocols/qq/sys_msg.c:175
 #: ../libpurple/protocols/qq/sys_msg.c:270
 #: ../libpurple/protocols/sametime/sametime.c:5486
-#: ../libpurple/protocols/silc/chat.c:599 ../pidgin/gtkaccount.c:2484
-#: ../pidgin/gtkblist.c:5828 ../pidgin/gtkconv.c:1651
+#: ../libpurple/protocols/silc/chat.c:615
+#: ../libpurple/protocols/silc10/chat.c:599 ../pidgin/gtkaccount.c:2501
+#: ../pidgin/gtkblist.c:5893 ../pidgin/gtkconv.c:1652
 #: ../pidgin/gtkrequest.c:274
 msgid "Add"
 msgstr "Añadir"
 
 #. Modify button
-#: ../finch/gntaccount.c:679 ../finch/gntpounce.c:706
+#: ../finch/gntaccount.c:685 ../finch/gntpounce.c:706
 msgid "Modify"
 msgstr "Modificar"
 
-#: ../finch/gntaccount.c:760 ../pidgin/gtkaccount.c:2431
+#: ../finch/gntaccount.c:787 ../pidgin/gtkaccount.c:2448
 #, c-format
 msgid "%s%s%s%s has made %s his or her buddy%s%s"
 msgstr "%s%s%s%s ha hecho a %s su amigo o amiga%s%s"
 
-#: ../finch/gntaccount.c:833 ../pidgin/gtkaccount.c:2483
+#: ../finch/gntaccount.c:860 ../pidgin/gtkaccount.c:2500
 msgid "Add buddy to your list?"
 msgstr "¿Desea añadir el amigo a su lista?"
 
-#: ../finch/gntaccount.c:887 ../pidgin/gtkaccount.c:2535
+#: ../finch/gntaccount.c:914 ../pidgin/gtkaccount.c:2552
 #, c-format
 msgid "%s%s%s%s wants to add %s to his or her buddy list%s%s"
 msgstr "%s%s%s%s quiere añadir a %s a su lista de amigos%s%s."
 
-#: ../finch/gntaccount.c:907 ../finch/gntaccount.c:914
-#: ../pidgin/gtkaccount.c:2558 ../pidgin/gtkaccount.c:2564
+#: ../finch/gntaccount.c:939 ../finch/gntaccount.c:942
+#: ../finch/gntaccount.c:969 ../pidgin/gtkaccount.c:2575
+#: ../pidgin/gtkaccount.c:2581
 msgid "Authorize buddy?"
 msgstr "¿Autorizar al amigo?"
 
-#: ../finch/gntaccount.c:911 ../finch/gntaccount.c:918
-#: ../pidgin/gtkaccount.c:2559 ../pidgin/gtkaccount.c:2565
+#: ../finch/gntaccount.c:946 ../finch/gntaccount.c:973
+#: ../pidgin/gtkaccount.c:2576 ../pidgin/gtkaccount.c:2582
 msgid "Authorize"
 msgstr "Autorizar"
 
-#: ../finch/gntaccount.c:912 ../finch/gntaccount.c:919
-#: ../pidgin/gtkaccount.c:2560 ../pidgin/gtkaccount.c:2566
+#: ../finch/gntaccount.c:947 ../finch/gntaccount.c:974
+#: ../pidgin/gtkaccount.c:2577 ../pidgin/gtkaccount.c:2583
 msgid "Deny"
 msgstr "Denegar"
 
-#: ../finch/gntblist.c:278
+#: ../finch/gntblist.c:285
 msgid "You must provide a screename for the buddy."
 msgstr "Debe dar un nombre de usuario para el amigo."
 
-#: ../finch/gntblist.c:280
+#: ../finch/gntblist.c:287
 msgid "You must provide a group."
 msgstr "Debe indicar un grupo."
 
-#: ../finch/gntblist.c:282
+#: ../finch/gntblist.c:289
 msgid "You must select an account."
 msgstr "Debe seleccionar una cuenta."
 
-#: ../finch/gntblist.c:284
+#: ../finch/gntblist.c:291
 msgid "The selected account is not online."
 msgstr "La cuenta seleccionada no está conectada."
 
-#: ../finch/gntblist.c:288
+#: ../finch/gntblist.c:296
 msgid "Error adding buddy"
 msgstr "Error al añadir al amigo"
 
-#: ../finch/gntblist.c:313 ../libpurple/protocols/oscar/oscar.c:2843
-#: ../pidgin/gtkaccount.c:1969 ../pidgin/gtksavedstatuses.c:924
+#: ../finch/gntblist.c:321 ../libpurple/protocols/oscar/oscar.c:2864
+#: ../pidgin/gtkaccount.c:1983 ../pidgin/gtksavedstatuses.c:921
 msgid "Screen Name"
 msgstr "Nombre de usuario"
 
-#: ../finch/gntblist.c:316 ../finch/gntblist.c:393 ../finch/gntblist.c:1209
-#: ../libpurple/protocols/msn/msn.c:1359
-#: ../libpurple/protocols/silc/chat.c:590
+#: ../finch/gntblist.c:324 ../finch/gntblist.c:401 ../finch/gntblist.c:1231
+#: ../libpurple/protocols/msn/msn.c:1364
+#: ../libpurple/protocols/silc/chat.c:606
+#: ../libpurple/protocols/silc10/chat.c:590
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:680
 #: ../libpurple/protocols/zephyr/zephyr.c:788
-#: ../libpurple/protocols/zephyr/zephyr.c:1207 ../pidgin/gtkdialogs.c:974
-#: ../pidgin/gtkdialogs.c:998 ../pidgin/gtkdialogs.c:1020
+#: ../libpurple/protocols/zephyr/zephyr.c:1207 ../pidgin/gtkdialogs.c:973
+#: ../pidgin/gtkdialogs.c:997 ../pidgin/gtkdialogs.c:1019
 #: ../pidgin/gtkrequest.c:277
 msgid "Alias"
 msgstr "Apodo"
 
-#: ../finch/gntblist.c:319 ../finch/gntblist.c:396
+#: ../finch/gntblist.c:327 ../finch/gntblist.c:404
 msgid "Group"
 msgstr "Grupo"
 
-#: ../finch/gntblist.c:323 ../finch/gntblist.c:384 ../finch/gntblist.c:1259
-#: ../finch/gntnotify.c:171 ../finch/gntstatus.c:566
+#: ../finch/gntblist.c:331 ../finch/gntblist.c:392 ../finch/gntblist.c:1281
+#: ../finch/gntnotify.c:172 ../finch/gntstatus.c:566
 #: ../libpurple/plugins/idle.c:153 ../libpurple/plugins/idle.c:190
-#: ../pidgin/gtkblist.c:2965 ../pidgin/gtknotify.c:476
-#: ../pidgin/gtkpounce.c:1269 ../pidgin/plugins/gevolution/gevolution.c:444
+#: ../pidgin/gtkblist.c:2979 ../pidgin/gtknotify.c:482
+#: ../pidgin/gtkpounce.c:1282 ../pidgin/plugins/gevolution/gevolution.c:443
 msgid "Account"
 msgstr "Cuenta"
 
-#: ../finch/gntblist.c:329 ../finch/gntblist.c:817
-#: ../libpurple/protocols/silc/buddy.c:737
-#: ../libpurple/protocols/silc/buddy.c:1033
-#: ../libpurple/protocols/silc/buddy.c:1080
-#: ../libpurple/protocols/silc/buddy.c:1180
-#: ../libpurple/protocols/yahoo/yahoo.c:3144 ../pidgin/gtkblist.c:5343
-#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:447
+#: ../finch/gntblist.c:337 ../finch/gntblist.c:834
+#: ../libpurple/protocols/silc/buddy.c:725
+#: ../libpurple/protocols/silc/buddy.c:1027
+#: ../libpurple/protocols/silc/buddy.c:1072
+#: ../libpurple/protocols/silc/buddy.c:1182
+#: ../libpurple/protocols/silc10/buddy.c:737
+#: ../libpurple/protocols/silc10/buddy.c:1033
+#: ../libpurple/protocols/silc10/buddy.c:1080
+#: ../libpurple/protocols/silc10/buddy.c:1180
+#: ../libpurple/protocols/yahoo/yahoo.c:3161 ../pidgin/gtkblist.c:5399
+#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:445
 msgid "Add Buddy"
 msgstr "Añadir amigo"
 
-#: ../finch/gntblist.c:329
+#: ../finch/gntblist.c:337
 msgid "Please enter buddy information."
 msgstr "Introduzca la información del amigo."
 
-#: ../finch/gntblist.c:356 ../libpurple/blist.c:1192
+#: ../finch/gntblist.c:364 ../libpurple/blist.c:1190
 msgid "Chats"
 msgstr "Chats"
 
 #. Extract their Name and put it in
-#: ../finch/gntblist.c:390 ../libpurple/protocols/jabber/jabber.c:809
-#: ../libpurple/protocols/msn/msn.c:1532 ../libpurple/protocols/msn/msn.c:1597
-#: ../libpurple/protocols/msn/msn.c:1624
+#: ../finch/gntblist.c:398 ../libpurple/protocols/jabber/jabber.c:813
+#: ../libpurple/protocols/msn/msn.c:1553 ../libpurple/protocols/msn/msn.c:1618
+#: ../libpurple/protocols/msn/msn.c:1645
 #: ../libpurple/protocols/qq/buddy_info.c:44 ../pidgin/gtkplugin.c:581
-#: ../pidgin/gtkroomlist.c:621
+#: ../pidgin/gtkroomlist.c:617
 #: ../pidgin/plugins/gevolution/add_buddy_dialog.c:132
 #: ../pidgin/plugins/gevolution/assoc-buddy.c:123
 msgid "Name"
 msgstr "Nombre"
 
-#: ../finch/gntblist.c:399 ../finch/gntblist.c:819 ../pidgin/gtkblist.c:5719
+#: ../finch/gntblist.c:407 ../finch/gntblist.c:836 ../pidgin/gtkblist.c:5779
 msgid "Add Chat"
 msgstr "Añadir chat"
 
-#: ../finch/gntblist.c:400
+#: ../finch/gntblist.c:408
 msgid "You can edit more information from the context menu later."
 msgstr ""
 "Puede editar más información más adelante a través del menú contextual."
 
-#: ../finch/gntblist.c:413 ../finch/gntblist.c:426
+#: ../finch/gntblist.c:421 ../finch/gntblist.c:434
 msgid "Error adding group"
 msgstr "Error al añadir al grupo"
 
-#: ../finch/gntblist.c:414
+#: ../finch/gntblist.c:422
 msgid "You must give a name for the group to add."
 msgstr "Debe dar un nombre al grupo a añadir."
 
-#: ../finch/gntblist.c:427
+#: ../finch/gntblist.c:435
 msgid "A group with the name already exists."
 msgstr "Ya existe un grupo con ese nombre"
 
-#: ../finch/gntblist.c:434 ../finch/gntblist.c:821
+#: ../finch/gntblist.c:442 ../finch/gntblist.c:838
 #: ../libpurple/protocols/sametime/sametime.c:5396
-#: ../libpurple/protocols/sametime/sametime.c:5484 ../pidgin/gtkblist.c:5825
+#: ../libpurple/protocols/sametime/sametime.c:5484 ../pidgin/gtkblist.c:5890
 msgid "Add Group"
 msgstr "Añadir grupo"
 
-#: ../finch/gntblist.c:434
+#: ../finch/gntblist.c:442
 msgid "Enter the name of the group"
 msgstr "Introduzca el nombre del grupo"
 
-#: ../finch/gntblist.c:767
+#: ../finch/gntblist.c:784
 msgid "Edit Chat"
 msgstr "Editar chat"
 
-#: ../finch/gntblist.c:767
+#: ../finch/gntblist.c:784
 msgid "Please Update the necessary fields."
 msgstr "Por favor Actualice los campos necesarios."
 
-#: ../finch/gntblist.c:768 ../finch/gntstatus.c:199
+#: ../finch/gntblist.c:785 ../finch/gntstatus.c:199
 msgid "Edit"
 msgstr "Editar"
 
-#: ../finch/gntblist.c:784
+#: ../finch/gntblist.c:801
 msgid "Auto-join"
 msgstr "Conectarse automáticamente"
 
-#: ../finch/gntblist.c:793
+#: ../finch/gntblist.c:810
 msgid "Edit Settings"
 msgstr "Editar configuración"
 
-#: ../finch/gntblist.c:831 ../finch/gntconv.c:317 ../pidgin/gtkblist.c:278
-#: ../pidgin/gtkconv.c:677
+#: ../finch/gntblist.c:846 ../pidgin/gtkutils.c:919
 msgid "Information"
 msgstr "Información"
 
-#: ../finch/gntblist.c:831 ../finch/gntconv.c:317 ../pidgin/gtkblist.c:278
-#: ../pidgin/gtkconv.c:677
+#: ../finch/gntblist.c:846 ../pidgin/gtkutils.c:919
 msgid "Retrieving..."
 msgstr "Obteniendo..."
 
 # No se traduce como «Obtener Información» porque sino hace muy grande el 
 # botón que utiliza este texto y, consecuentemente, la pantalla de Gaim, jfs
-#: ../finch/gntblist.c:864 ../finch/gntconv.c:418
-#: ../libpurple/protocols/silc/chat.c:883
+#: ../finch/gntblist.c:886 ../finch/gntconv.c:413
+#: ../libpurple/protocols/silc/chat.c:899
+#: ../libpurple/protocols/silc10/chat.c:883
 msgid "Get Info"
 msgstr "Info"
 
-#: ../finch/gntblist.c:868
+#: ../finch/gntblist.c:890
 msgid "Add Buddy Pounce"
 msgstr "Añadir aviso de amigo"
 
 #. if (q_bud && is_online(q_bud->status)) {
-#: ../finch/gntblist.c:875 ../finch/gntconv.c:430
-#: ../libpurple/protocols/oscar/oscar.c:636 ../libpurple/protocols/qq/qq.c:585
-#: ../pidgin/gtkconv.c:1599
+#: ../finch/gntblist.c:897 ../finch/gntconv.c:425
+#: ../libpurple/protocols/jabber/si.c:868
+#: ../libpurple/protocols/oscar/oscar.c:654 ../libpurple/protocols/qq/qq.c:585
+#: ../pidgin/gtkconv.c:1600
 msgid "Send File"
 msgstr "Enviar archivo"
 
-#: ../finch/gntblist.c:879
+#: ../finch/gntblist.c:901
 msgid "View Log"
 msgstr "Ver registro"
 
-#: ../finch/gntblist.c:960
+#: ../finch/gntblist.c:982
 #, c-format
 msgid "Please enter the new name for %s"
 msgstr "Introduzca el nuevo nombre para %s"
 
-#: ../finch/gntblist.c:962 ../finch/gntblist.c:1209
+#: ../finch/gntblist.c:984 ../finch/gntblist.c:1231
 msgid "Rename"
 msgstr "Renombrar"
 
-#: ../finch/gntblist.c:962
+#: ../finch/gntblist.c:984
 msgid "Set Alias"
 msgstr "Fijar el apodo"
 
-#: ../finch/gntblist.c:963
+#: ../finch/gntblist.c:985
 msgid "Enter empty string to reset the name."
 msgstr "Introduzca una cadena vacía para resetear el nombre."
 
-#: ../finch/gntblist.c:1039
+#: ../finch/gntblist.c:1061
 msgid "Removing this contact will also remove all the buddies in the contact"
 msgstr ""
 "Si elimina este contacto también eliminará a todos los amigos en el contacto"
 
-#: ../finch/gntblist.c:1047
+#: ../finch/gntblist.c:1069
 msgid "Removing this group will also remove all the buddies in the group"
 msgstr "Si elimina este grupo también eliminará a todos los amigos en el grupo"
 
-#: ../finch/gntblist.c:1052
+#: ../finch/gntblist.c:1074
 #, c-format
 msgid "Are you sure you want to remove %s?"
 msgstr "¿Está seguro que quiere borrar a %s?"
 
 #. XXX: anything to do with the returned ui-handle?
-#: ../finch/gntblist.c:1055
+#: ../finch/gntblist.c:1077
 msgid "Confirm Remove"
 msgstr "Confirmar borrado"
 
-#: ../finch/gntblist.c:1060 ../finch/gntblist.c:1211 ../finch/gntft.c:223
-#: ../pidgin/gtkblist.c:1135 ../pidgin/gtkconv.c:1648
-#: ../pidgin/gtkrequest.c:275 ../pidgin/gtkstatusbox.c:261
+#: ../finch/gntblist.c:1082 ../finch/gntblist.c:1233 ../finch/gntft.c:223
+#: ../pidgin/gtkconv.c:1649 ../pidgin/gtkrequest.c:275
+#: ../pidgin/gtkstatusbox.c:261
 msgid "Remove"
 msgstr "Quitar"
 
 #. Buddy List
-#: ../finch/gntblist.c:1185 ../finch/gntblist.c:2232 ../finch/gntprefs.c:240
-#: ../finch/gntui.c:77 ../pidgin/gtkblist.c:4209
+#: ../finch/gntblist.c:1207 ../finch/gntblist.c:2257 ../finch/gntprefs.c:240
+#: ../finch/gntui.c:77 ../pidgin/gtkblist.c:4244
 #: ../pidgin/plugins/win32/winprefs/winprefs.c:330
 msgid "Buddy List"
 msgstr "Lista de amigos"
 
-#: ../finch/gntblist.c:1216
+#: ../finch/gntblist.c:1238
 msgid "Place tagged"
 msgstr "Lugares marcados"
 
-#: ../finch/gntblist.c:1221
+#: ../finch/gntblist.c:1243
 msgid "Toggle Tag"
 msgstr "Cambiar marca"
 
 #. General
-#: ../finch/gntblist.c:1254 ../libpurple/protocols/gg/gg.c:632
+#: ../finch/gntblist.c:1276 ../libpurple/protocols/gg/gg.c:632
 #: ../libpurple/protocols/gg/gg.c:1045 ../libpurple/protocols/gg/gg.c:1120
 #: ../libpurple/protocols/gg/gg.c:2204
 #: ../libpurple/protocols/jabber/buddy.c:274
-#: ../libpurple/protocols/jabber/buddy.c:818
-#: ../libpurple/protocols/jabber/buddy.c:1589
-#: ../libpurple/protocols/jabber/buddy.c:1771
-#: ../libpurple/protocols/jabber/jabber.c:819
-#: ../libpurple/protocols/msn/msn.c:1367 ../libpurple/protocols/msn/msn.c:1535
+#: ../libpurple/protocols/jabber/buddy.c:852
+#: ../libpurple/protocols/jabber/buddy.c:1623
+#: ../libpurple/protocols/jabber/buddy.c:1805
+#: ../libpurple/protocols/jabber/jabber.c:823
+#: ../libpurple/protocols/msn/msn.c:1372 ../libpurple/protocols/msn/msn.c:1556
 #: ../libpurple/protocols/qq/buddy_info.c:43
 #: ../libpurple/protocols/silc/buddy.c:1535
-#: ../libpurple/protocols/silc/ops.c:1036
-#: ../libpurple/protocols/silc/ops.c:1179
-#: ../libpurple/protocols/silc/ops.c:1328
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1042 ../pidgin/gtkblist.c:2989
+#: ../libpurple/protocols/silc/ops.c:1002
+#: ../libpurple/protocols/silc/ops.c:1186
+#: ../libpurple/protocols/silc/ops.c:1322
+#: ../libpurple/protocols/silc10/buddy.c:1535
+#: ../libpurple/protocols/silc10/ops.c:1036
+#: ../libpurple/protocols/silc10/ops.c:1179
+#: ../libpurple/protocols/silc10/ops.c:1328
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1042 ../pidgin/gtkblist.c:3003
 msgid "Nickname"
 msgstr "Apodo"
 
 #. Idle stuff
-#: ../finch/gntblist.c:1274 ../finch/gntprefs.c:243
-#: ../libpurple/protocols/bonjour/bonjour.c:322
+#: ../finch/gntblist.c:1296 ../finch/gntprefs.c:243
+#: ../libpurple/protocols/bonjour/bonjour.c:314
 #: ../libpurple/protocols/jabber/buddy.c:643
 #: ../libpurple/protocols/jabber/buddy.c:683
 #: ../libpurple/protocols/msn/msn.c:516 ../libpurple/protocols/msn/state.c:32
 #: ../libpurple/protocols/novell/novell.c:2825
-#: ../libpurple/protocols/oscar/oscar.c:2867
-#: ../libpurple/protocols/yahoo/yahoo.c:2898
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:686 ../pidgin/gtkblist.c:3009
-#: ../pidgin/gtkblist.c:3399 ../pidgin/gtkprefs.c:1809
+#: ../libpurple/protocols/oscar/oscar.c:2888
+#: ../libpurple/protocols/yahoo/yahoo.c:2915
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:686 ../pidgin/gtkblist.c:3030
+#: ../pidgin/gtkblist.c:3423 ../pidgin/gtkprefs.c:1838
 msgid "Idle"
 msgstr "Está inactivo"
 
-#: ../finch/gntblist.c:1363
+#: ../finch/gntblist.c:1385
 #, c-format
 msgid ""
 "Online: %d\n"
@@ -572,12 +594,12 @@
 "En línea: %d\n"
 "Total: %d"
 
-#: ../finch/gntblist.c:1372
+#: ../finch/gntblist.c:1394
 #, c-format
 msgid "Account: %s (%s)"
 msgstr "Cuenta: %s (%s)"
 
-#: ../finch/gntblist.c:1384
+#: ../finch/gntblist.c:1406
 #, c-format
 msgid ""
 "\n"
@@ -586,143 +608,143 @@
 "\n"
 "Visto por última vez: hace %s"
 
-#: ../finch/gntblist.c:1649 ../pidgin/gtkdocklet.c:470
+#: ../finch/gntblist.c:1671 ../pidgin/gtkdocklet.c:470
 #: ../pidgin/gtkstatusbox.c:1064
 msgid "New..."
 msgstr "Nuevo..."
 
-#: ../finch/gntblist.c:1656 ../pidgin/gtkdocklet.c:471
+#: ../finch/gntblist.c:1678 ../pidgin/gtkdocklet.c:471
 #: ../pidgin/gtkstatusbox.c:1065
 msgid "Saved..."
 msgstr "Guardado..."
 
-#: ../finch/gntblist.c:2028 ../finch/gntplugin.c:244 ../finch/gntui.c:81
+#: ../finch/gntblist.c:2053 ../finch/gntplugin.c:247 ../finch/gntui.c:81
 #: ../pidgin/gtkdocklet.c:523 ../pidgin/gtkplugin.c:530
 msgid "Plugins"
 msgstr "Complementos"
 
-#: ../finch/gntblist.c:2136 ../pidgin/gtkdialogs.c:706
-#: ../pidgin/gtkdialogs.c:844 ../pidgin/gtkdialogs.c:925
+#: ../finch/gntblist.c:2161 ../pidgin/gtkdialogs.c:705
+#: ../pidgin/gtkdialogs.c:843 ../pidgin/gtkdialogs.c:924
 msgid "_Name"
 msgstr "_Nombre"
 
-#: ../finch/gntblist.c:2141 ../pidgin/gtkdialogs.c:711
-#: ../pidgin/gtkdialogs.c:849 ../pidgin/gtkdialogs.c:930
+#: ../finch/gntblist.c:2166 ../pidgin/gtkdialogs.c:710
+#: ../pidgin/gtkdialogs.c:848 ../pidgin/gtkdialogs.c:929
 msgid "_Account"
 msgstr "_Cuenta"
 
-#: ../finch/gntblist.c:2149 ../pidgin/gtkdialogs.c:719
+#: ../finch/gntblist.c:2174 ../pidgin/gtkdialogs.c:718
 msgid "New Instant Message"
 msgstr "Mensaje instantáneo nuevo"
 
-#: ../finch/gntblist.c:2151 ../pidgin/gtkdialogs.c:721
+#: ../finch/gntblist.c:2176 ../pidgin/gtkdialogs.c:720
 msgid ""
 "Please enter the screen name or alias of the person you would like to IM."
 msgstr ""
 "Introduzca el nombre de usuario o apodo de la persona con la que quiere "
 "comunicarse."
 
-#: ../finch/gntblist.c:2154 ../finch/gntconn.c:48 ../finch/gntnotify.c:77
-#: ../libpurple/account.c:983 ../libpurple/account.c:1233
-#: ../libpurple/protocols/gg/gg.c:501 ../libpurple/protocols/gg/gg.c:660
-#: ../libpurple/protocols/gg/gg.c:797
-#: ../libpurple/protocols/jabber/jabber.c:1383
+#: ../finch/gntblist.c:2179 ../finch/gntnotify.c:78 ../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:258 ../libpurple/protocols/msn/msn.c:275
 #: ../libpurple/protocols/msn/msn.c:292 ../libpurple/protocols/msn/msn.c:309
-#: ../libpurple/protocols/oscar/oscar.c:6003
-#: ../libpurple/protocols/silc/buddy.c:467
-#: ../libpurple/protocols/silc/buddy.c:1188
-#: ../libpurple/protocols/silc/chat.c:425
-#: ../libpurple/protocols/silc/chat.c:464
-#: ../libpurple/protocols/silc/chat.c:729
-#: ../libpurple/protocols/silc/ops.c:1297
-#: ../libpurple/protocols/silc/ops.c:1912
-#: ../libpurple/protocols/silc/silc.c:743
-#: ../libpurple/protocols/yahoo/yahoo.c:986
-#: ../libpurple/protocols/yahoo/yahoo.c:3230
-#: ../libpurple/protocols/yahoo/yahoo.c:3241 ../pidgin/gtkblist.c:3964
-#: ../pidgin/gtkdialogs.c:724 ../pidgin/gtkdialogs.c:862
-#: ../pidgin/gtkdialogs.c:954 ../pidgin/gtkrequest.c:269
+#: ../libpurple/protocols/oscar/oscar.c:6071
+#: ../libpurple/protocols/silc/buddy.c:454
+#: ../libpurple/protocols/silc/buddy.c:1190
+#: ../libpurple/protocols/silc/chat.c:447
+#: ../libpurple/protocols/silc/chat.c:482
+#: ../libpurple/protocols/silc/chat.c:745
+#: ../libpurple/protocols/silc/ops.c:1291
+#: ../libpurple/protocols/silc/ops.c:1815
+#: ../libpurple/protocols/silc/silc.c:822
+#: ../libpurple/protocols/silc10/buddy.c:467
+#: ../libpurple/protocols/silc10/buddy.c:1188
+#: ../libpurple/protocols/silc10/chat.c:425
+#: ../libpurple/protocols/silc10/chat.c:464
+#: ../libpurple/protocols/silc10/chat.c:729
+#: ../libpurple/protocols/silc10/ops.c:1297
+#: ../libpurple/protocols/silc10/ops.c:1903
+#: ../libpurple/protocols/silc10/silc.c:735
+#: ../libpurple/protocols/yahoo/yahoo.c:988
+#: ../libpurple/protocols/yahoo/yahoo.c:3247
+#: ../libpurple/protocols/yahoo/yahoo.c:3258 ../pidgin/gtkblist.c:4001
+#: ../pidgin/gtkdialogs.c:723 ../pidgin/gtkdialogs.c:861
+#: ../pidgin/gtkdialogs.c:953 ../pidgin/gtkrequest.c:269
 msgid "OK"
 msgstr "Aceptar"
 
 #. Create the "Options" frame.
-#: ../finch/gntblist.c:2174 ../finch/gntpounce.c:444 ../pidgin/gtkpounce.c:778
+#: ../finch/gntblist.c:2199 ../finch/gntpounce.c:444 ../pidgin/gtkpounce.c:791
 msgid "Options"
 msgstr "Opciones"
 
-#: ../finch/gntblist.c:2180
+#: ../finch/gntblist.c:2205
 msgid "Send IM..."
 msgstr "Enviar MI..."
 
-#: ../finch/gntblist.c:2184
+#: ../finch/gntblist.c:2209
 msgid "Show offline buddies"
 msgstr "Mostrar amigos desconectados"
 
-#: ../finch/gntblist.c:2190
+#: ../finch/gntblist.c:2215
 msgid "Sort by status"
 msgstr "Ordenar por estado"
 
-#: ../finch/gntblist.c:2194
+#: ../finch/gntblist.c:2219
 msgid "Sort alphabetically"
 msgstr "Ordenar alfabéticamente"
 
-#: ../finch/gntblist.c:2198
+#: ../finch/gntblist.c:2223
 msgid "Sort by log size"
 msgstr "Ordenar por tamaño de registro"
 
-#: ../finch/gntconn.c:38
+#: ../finch/gntconn.c:109
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../finch/gntconn.c:41
+#: ../finch/gntconn.c:112
 #, c-format
 msgid "%s disconnected."
 msgstr "%s se ha desconectado."
 
-#: ../finch/gntconn.c:42
-#, c-format
-msgid ""
-"%s was disconnected due to the following error:\n"
-"%s"
-msgstr ""
-"%s se ha desconectado por el siguiente error:\n"
-"%s"
-
-#: ../finch/gntconn.c:45 ../libpurple/account.c:1012
-#: ../libpurple/connection.c:107 ../pidgin/gtkblist.c:3961
-msgid "Connection Error"
-msgstr "Error de conexión"
-
-#: ../finch/gntconn.c:49 ../libpurple/protocols/sametime/sametime.c:3644
-#: ../pidgin/gtkblist.c:3966
-msgid "Connect"
-msgstr "Conectar"
+#: ../finch/gntconn.c:113
+#, c-format
+msgid ""
+"%s\n"
+"\n"
+"Finch will not attempt to reconnect the account until you correct the error "
+"and re-enable the account."
+msgstr ""
+"%s\n"
+"\n"
+"Finch no intentará reconectarse a esta cuenta hasta que corrija el error y reactive la cuenta."
 
 #: ../finch/gntconv.c:116
 msgid "No such command."
 msgstr "No existe esa orden."
 
-#: ../finch/gntconv.c:120 ../pidgin/gtkconv.c:508
+#: ../finch/gntconv.c:120 ../pidgin/gtkconv.c:480
 msgid "Syntax Error:  You typed the wrong number of arguments to that command."
 msgstr ""
 "Error sintáctico:  Vd. no escribió suficientes argumentos para esa orden."
 
-#: ../finch/gntconv.c:125 ../pidgin/gtkconv.c:513
+#: ../finch/gntconv.c:125 ../pidgin/gtkconv.c:486
 msgid "Your command failed for an unknown reason."
 msgstr "Su orden ha fallado por motivos desconocidos."
 
-#: ../finch/gntconv.c:130 ../pidgin/gtkconv.c:519
+#: ../finch/gntconv.c:130 ../pidgin/gtkconv.c:493
 msgid "That command only works in chats, not IMs."
 msgstr "Esa orden sólo funciona en chats, no en MIs."
 
-#: ../finch/gntconv.c:133 ../pidgin/gtkconv.c:522
+#: ../finch/gntconv.c:133 ../pidgin/gtkconv.c:496
 msgid "That command only works in IMs, not chats."
 msgstr "Esa orden sólo funciona en MIs, no en chats."
 
-#: ../finch/gntconv.c:137 ../pidgin/gtkconv.c:526
+#: ../finch/gntconv.c:137 ../pidgin/gtkconv.c:501
 msgid "That command doesn't work on this protocol."
 msgstr "Esa orden no funciona en este protocolo."
 
@@ -740,7 +762,7 @@
 msgid "%s [%s]"
 msgstr "%s [%s]"
 
-#: ../finch/gntconv.c:258 ../finch/gntconv.c:619
+#: ../finch/gntconv.c:258 ../finch/gntconv.c:625
 #, c-format
 msgid ""
 "\n"
@@ -753,44 +775,44 @@
 msgid "You have left this chat."
 msgstr "Ha dejado este chat"
 
-#: ../finch/gntconv.c:353
+#: ../finch/gntconv.c:348
 msgid "Send To"
 msgstr "Enviar a"
 
-#: ../finch/gntconv.c:397
+#: ../finch/gntconv.c:392
 msgid "Conversation"
 msgstr "Conversación"
 
-#: ../finch/gntconv.c:403
+#: ../finch/gntconv.c:398
 msgid "Clear Scrollback"
-msgstr "Limpiar deslizable"
-
-#: ../finch/gntconv.c:407 ../finch/gntprefs.c:178
+msgstr "Limpiar histórico"
+
+#: ../finch/gntconv.c:402 ../finch/gntprefs.c:178
 msgid "Show Timestamps"
 msgstr "Mostrar marcas de tiempo"
 
-#: ../finch/gntconv.c:423
+#: ../finch/gntconv.c:418
 msgid "Add Buddy Pounce..."
 msgstr "Añadir aviso de amigo..."
 
-#: ../finch/gntconv.c:586
+#: ../finch/gntconv.c:592
 msgid "<AUTO-REPLY> "
 msgstr "<RESPUESTA AUTOMÁTICA> "
 
 #. Print the list of users in the room
-#: ../finch/gntconv.c:702
+#: ../finch/gntconv.c:713
 msgid "List of users:\n"
 msgstr "Lista de usuarios:\n"
 
-#: ../finch/gntconv.c:847 ../pidgin/gtkconv.c:389
+#: ../finch/gntconv.c:858 ../pidgin/gtkconv.c:336
 msgid "Supported debug options are:  version"
 msgstr "Las opciones de depuración soportadas son:  version"
 
-#: ../finch/gntconv.c:882 ../pidgin/gtkconv.c:425
+#: ../finch/gntconv.c:893 ../pidgin/gtkconv.c:372
 msgid "No such command (in this context)."
 msgstr "No existe esa orden (en este contexto)."
 
-#: ../finch/gntconv.c:885 ../pidgin/gtkconv.c:428
+#: ../finch/gntconv.c:896 ../pidgin/gtkconv.c:375
 msgid ""
 "Use \"/help &lt;command&gt;\" for help on a specific command.\n"
 "The following commands are available in this context:\n"
@@ -798,7 +820,7 @@
 "Utilice \"/help &lt;orden&gt;\" para obtener ayuda de una orden concreta.\n"
 "Las siguientes órdenes están disponibles en este contexto:\n"
 
-#: ../finch/gntconv.c:943 ../pidgin/gtkconv.c:7085
+#: ../finch/gntconv.c:954 ../pidgin/gtkconv.c:7129
 msgid ""
 "say &lt;message&gt;:  Send a message normally as if you weren't using a "
 "command."
@@ -806,12 +828,12 @@
 "say &lt;mensaje;gt;:  Enviar un mensaje como si no se estuviera utilizando "
 "una orden."
 
-#: ../finch/gntconv.c:946 ../pidgin/gtkconv.c:7088
+#: ../finch/gntconv.c:957 ../pidgin/gtkconv.c:7132
 msgid "me &lt;action&gt;:  Send an IRC style action to a buddy or chat."
 msgstr ""
 "me &lt;acción&gt;: enviar una acción estilo IRC a un amigo o a un chat."
 
-#: ../finch/gntconv.c:949 ../pidgin/gtkconv.c:7091
+#: ../finch/gntconv.c:960 ../pidgin/gtkconv.c:7135
 msgid ""
 "debug &lt;option&gt;:  Send various debug information to the current "
 "conversation."
@@ -819,43 +841,43 @@
 "debug &lt;opción&gt;: Enviar información de depuración sobre la conversación "
 "actual."
 
-#: ../finch/gntconv.c:952 ../pidgin/gtkconv.c:7094
+#: ../finch/gntconv.c:963 ../pidgin/gtkconv.c:7138
 msgid "clear: Clears the conversation scrollback."
 msgstr "clear: limpia el histórico de la ventana de conversación."
 
-#: ../finch/gntconv.c:955 ../pidgin/gtkconv.c:7097
+#: ../finch/gntconv.c:966 ../pidgin/gtkconv.c:7141
 msgid "help &lt;command&gt;:  Help on a specific command."
 msgstr "help &lt;orden&gt;:  Recibir ayuda sobre una orden concreta."
 
-#: ../finch/gntconv.c:958
+#: ../finch/gntconv.c:969
 msgid "users:  Show the list of users in the chat."
 msgstr "users: Muestra la lista de usuarios en el chat."
 
-#: ../finch/gntconv.c:963
+#: ../finch/gntconv.c:974
 msgid "plugins: Show the plugins window."
 msgstr "plugins: Mostrar la ventana de complementos."
 
-#: ../finch/gntconv.c:966
+#: ../finch/gntconv.c:977
 msgid "buddylist: Show the buddylist."
 msgstr "buddylist: Mostrar la lista de amigos."
 
-#: ../finch/gntconv.c:969
+#: ../finch/gntconv.c:980
 msgid "accounts: Show the accounts window."
 msgstr "accounts: Muestra la ventana de cuentas."
 
-#: ../finch/gntconv.c:972
+#: ../finch/gntconv.c:983
 msgid "debugwin: Show the debug window."
 msgstr "debugwin: Muestra la ventana de depuración."
 
-#: ../finch/gntconv.c:975
+#: ../finch/gntconv.c:986
 msgid "prefs: Show the preference window."
 msgstr "prefs: Muestra la ventana de preferencias."
 
-#: ../finch/gntconv.c:978
+#: ../finch/gntconv.c:989
 msgid "statuses: Show the savedstatuses window."
 msgstr "status: Muestra la ventana «savedstatuses»."
 
-#: ../finch/gntdebug.c:230 ../finch/gntui.c:79 ../pidgin/gtkdebug.c:693
+#: ../finch/gntdebug.c:230 ../finch/gntui.c:79 ../pidgin/gtkdebug.c:694
 msgid "Debug Window"
 msgstr "Ventana de depuración"
 
@@ -863,7 +885,7 @@
 #. * it's necessary to make the width of the debug window resizable ... like I said,
 #. * it doesn't make sense. The bug is likely in the packing in gntbox.c.
 #.
-#: ../finch/gntdebug.c:251 ../pidgin/gtkdebug.c:752
+#: ../finch/gntdebug.c:251 ../pidgin/gtkdebug.c:753
 msgid "Clear"
 msgstr "Limpiar"
 
@@ -871,7 +893,7 @@
 msgid "Filter: "
 msgstr "Filtro: "
 
-#: ../finch/gntdebug.c:261 ../pidgin/gtkdebug.c:761
+#: ../finch/gntdebug.c:261 ../pidgin/gtkdebug.c:762
 msgid "Pause"
 msgstr "Pausar"
 
@@ -880,8 +902,9 @@
 msgid "File Transfers - %d%% of %d files"
 msgstr "Trasferencias de archivo - %d%% de %d archivos"
 
+#. Create the window.
 #: ../finch/gntft.c:122 ../finch/gntft.c:194 ../finch/gntui.c:80
-#: ../pidgin/gtkft.c:233 ../pidgin/gtkft.c:763
+#: ../pidgin/gtkft.c:233 ../pidgin/gtkft.c:761
 msgid "File Transfers"
 msgstr "Transferencia de archivos"
 
@@ -907,25 +930,25 @@
 
 #. XXX: Use of ggp_str_to_uin() is an ugly hack!
 #: ../finch/gntft.c:197 ../finch/gntstatus.c:537 ../finch/gntstatus.c:566
-#: ../libpurple/protocols/bonjour/bonjour.c:326
+#: ../libpurple/protocols/bonjour/bonjour.c:318
 #: ../libpurple/protocols/gg/gg.c:1034 ../libpurple/protocols/gg/gg.c:1573
 #: ../libpurple/protocols/gg/gg.c:1581
 #: ../libpurple/protocols/jabber/buddy.c:634
 #: ../libpurple/protocols/jabber/buddy.c:638
 #: ../libpurple/protocols/jabber/buddy.c:673
-#: ../libpurple/protocols/jabber/jabber.c:1214
+#: ../libpurple/protocols/jabber/jabber.c:1210
 #: ../libpurple/protocols/msn/msn.c:515
 #: ../libpurple/protocols/novell/novell.c:2835
-#: ../libpurple/protocols/oscar/oscar.c:803
-#: ../libpurple/protocols/oscar/oscar.c:808
-#: ../libpurple/protocols/oscar/oscar.c:810
-#: ../libpurple/protocols/oscar/oscar.c:2656
-#: ../libpurple/protocols/oscar/oscar.c:3767
+#: ../libpurple/protocols/oscar/oscar.c:821
+#: ../libpurple/protocols/oscar/oscar.c:826
+#: ../libpurple/protocols/oscar/oscar.c:828
+#: ../libpurple/protocols/oscar/oscar.c:2676
+#: ../libpurple/protocols/oscar/oscar.c:3794
 #: ../libpurple/protocols/sametime/sametime.c:3263
 #: ../libpurple/protocols/sametime/sametime.c:4150
-#: ../libpurple/protocols/yahoo/yahoo.c:3049 ../pidgin/gtkblist.c:3053
-#: ../pidgin/gtkblist.c:3066 ../pidgin/gtkblist.c:3068
-#: ../pidgin/gtksavedstatuses.c:943 ../pidgin/gtksavedstatuses.c:1090
+#: ../libpurple/protocols/yahoo/yahoo.c:3066 ../pidgin/gtkblist.c:3074
+#: ../pidgin/gtkblist.c:3087 ../pidgin/gtkblist.c:3089
+#: ../pidgin/gtksavedstatuses.c:940 ../pidgin/gtksavedstatuses.c:1085
 msgid "Status"
 msgstr "Estado"
 
@@ -942,97 +965,98 @@
 msgstr "Parar"
 
 #. Close button
-#: ../finch/gntft.c:233 ../finch/gntnotify.c:179 ../finch/gntplugin.c:205
-#: ../finch/gntplugin.c:291 ../finch/gntpounce.c:722 ../finch/gntstatus.c:209
-#: ../libpurple/protocols/msn/msn.c:375 ../libpurple/protocols/silc/util.c:377
-#: ../pidgin/gtkaccount.c:2458 ../pidgin/gtkrequest.c:272
+#: ../finch/gntft.c:233 ../finch/gntnotify.c:180 ../finch/gntplugin.c:208
+#: ../finch/gntplugin.c:294 ../finch/gntpounce.c:722 ../finch/gntstatus.c:209
+#: ../libpurple/protocols/msn/msn.c:375 ../libpurple/protocols/silc/util.c:382
+#: ../libpurple/protocols/silc10/util.c:377 ../pidgin/gtkaccount.c:2475
+#: ../pidgin/gtkrequest.c:272
 msgid "Close"
 msgstr "Cerrar"
 
-#: ../finch/gntft.c:299 ../pidgin/gtkft.c:168 ../pidgin/gtkft.c:975
+#: ../finch/gntft.c:299 ../pidgin/gtkft.c:168 ../pidgin/gtkft.c:972
 msgid "Waiting for transfer to begin"
 msgstr "Esperando el comienzo de la transferencia"
 
-#: ../finch/gntft.c:366 ../pidgin/gtkft.c:165 ../pidgin/gtkft.c:1056
+#: ../finch/gntft.c:366 ../pidgin/gtkft.c:165 ../pidgin/gtkft.c:1053
 msgid "Canceled"
 msgstr "Cancelado"
 
-#: ../finch/gntft.c:368 ../pidgin/gtkft.c:1058
+#: ../finch/gntft.c:368 ../pidgin/gtkft.c:1055
 msgid "Failed"
 msgstr "Falló"
 
 #: ../finch/gntft.c:414 ../pidgin/gtkft.c:133
 #, c-format
-msgid "%.2f KB/s"
+msgid "%.2f KiB/s"
 msgstr "%.2f KiB/s"
 
 #: ../finch/gntft.c:425 ../finch/gntft.c:426 ../pidgin/gtkft.c:162
-#: ../pidgin/gtkft.c:1118
+#: ../pidgin/gtkft.c:1115
 msgid "Finished"
 msgstr "Terminado"
 
-#: ../finch/gntft.c:428 ../libpurple/protocols/msn/session.c:346
+#: ../finch/gntft.c:428 ../libpurple/protocols/msn/session.c:347
 msgid "Transferring"
 msgstr "Transfiriendo"
 
-#: ../finch/gntnotify.c:162
+#: ../finch/gntnotify.c:163
 msgid "Emails"
 msgstr "Correos"
 
-#: ../finch/gntnotify.c:168 ../finch/gntnotify.c:222
+#: ../finch/gntnotify.c:169 ../finch/gntnotify.c:223
 msgid "You have mail!"
 msgstr "¡Tiene correo!"
 
-#: ../finch/gntnotify.c:171 ../libpurple/protocols/jabber/jabber.c:1174
-msgid "From"
-msgstr "De"
-
-#: ../finch/gntnotify.c:171 ../pidgin/gtknotify.c:490
+#: ../finch/gntnotify.c:172 ../pidgin/gtknotify.c:489
+msgid "Sender"
+msgstr "Remitente"
+
+#: ../finch/gntnotify.c:172 ../pidgin/gtknotify.c:496
 msgid "Subject"
 msgstr "Asunto"
 
-#: ../finch/gntnotify.c:198
+#: ../finch/gntnotify.c:199
 #, c-format
 msgid "%s (%s) has %d new message."
 msgid_plural "%s (%s) has %d new messages."
 msgstr[0] "%s (%s) tiene %d mensaje nuevo."
 msgstr[1] "%s (%s) tiene %d nuevos mensajes."
 
-#: ../finch/gntnotify.c:222 ../pidgin/gtknotify.c:329
+#: ../finch/gntnotify.c:223 ../pidgin/gtknotify.c:335
 msgid "New Mail"
 msgstr "Nuevo correo"
 
-#: ../finch/gntnotify.c:287 ../pidgin/gtknotify.c:906
+#: ../finch/gntnotify.c:288 ../pidgin/gtknotify.c:916
 #, c-format
 msgid "Info for %s"
 msgstr "Información sobre %s:"
 
-#: ../finch/gntnotify.c:288 ../libpurple/protocols/toc/toc.c:476
-#: ../pidgin/gtknotify.c:907
+#: ../finch/gntnotify.c:289 ../libpurple/protocols/toc/toc.c:476
+#: ../pidgin/gtknotify.c:917
 msgid "Buddy Information"
 msgstr "Información de amigos"
 
-#: ../finch/gntnotify.c:366
+#: ../finch/gntnotify.c:367
 msgid "Continue"
 msgstr "Continuar"
 
-#: ../finch/gntnotify.c:372 ../pidgin/gtkconv.c:1627 ../pidgin/gtkdebug.c:833
+#: ../finch/gntnotify.c:373 ../pidgin/gtkconv.c:1628 ../pidgin/gtkdebug.c:834
 msgid "Info"
 msgstr "Info"
 
-#: ../finch/gntnotify.c:375 ../pidgin/gtkconv.c:1588
+#: ../finch/gntnotify.c:376 ../pidgin/gtkconv.c:1589
 msgid "IM"
 msgstr "MI"
 
-#: ../finch/gntnotify.c:378
+#: ../finch/gntnotify.c:379
 msgid "Join"
 msgstr "Unirse"
 
-#: ../finch/gntnotify.c:381 ../libpurple/protocols/sametime/sametime.c:3473
+#: ../finch/gntnotify.c:382 ../libpurple/protocols/sametime/sametime.c:3473
 msgid "Invite"
 msgstr "Invitar"
 
-#: ../finch/gntnotify.c:384
+#: ../finch/gntnotify.c:385
 msgid "(none)"
 msgstr "(ninguno)"
 
@@ -1048,7 +1072,7 @@
 msgid "unloading plugin failed"
 msgstr "falló la descarga del complemento"
 
-#: ../finch/gntplugin.c:124
+#: ../finch/gntplugin.c:127
 #, c-format
 msgid ""
 "Name: %s\n"
@@ -1065,36 +1089,42 @@
 "Sitio web: %s\n"
 "Nombre de fichero: %s\n"
 
-#: ../finch/gntplugin.c:182
+#: ../finch/gntplugin.c:185
 msgid "Plugin need to be loaded before you can configure it."
 msgstr "Debe cargar el complemento antes de poder configurarlo."
 
-#: ../finch/gntplugin.c:226
+#: ../finch/gntplugin.c:229
 msgid "No configuration options for this plugin."
 msgstr "No hay opciones de configuración para este complemento."
 
-#: ../finch/gntplugin.c:249
+#: ../finch/gntplugin.c:252
 msgid "You can (un)load plugins from the following list."
 msgstr "Puede (des)cargar complementos de la lista mostrada a continuación."
 
-#: ../finch/gntplugin.c:296
+#: ../finch/gntplugin.c:299
 msgid "Configure Plugin"
 msgstr "Configurar complemento"
 
-#: ../finch/gntplugin.c:352 ../finch/gntplugin.c:359 ../finch/gntprefs.c:245
-#: ../finch/gntui.c:82 ../pidgin/gtkdocklet.c:524 ../pidgin/gtkprefs.c:1953
+#. copy the preferences to tmp values...
+#. * I liked "take affect immediately" Oh well :-(
+#. (that should have been "effect," right?)
+#. Back to instant-apply! I win!  BU-HAHAHA!
+#. Create the window
+#: ../finch/gntplugin.c:355 ../finch/gntplugin.c:362 ../finch/gntprefs.c:245
+#: ../finch/gntui.c:82 ../pidgin/gtkdocklet.c:524 ../pidgin/gtkprefs.c:1980
 msgid "Preferences"
 msgstr "Preferencias"
 
-#: ../finch/gntpounce.c:180 ../pidgin/gtkpounce.c:253
+#: ../finch/gntpounce.c:180 ../pidgin/gtkpounce.c:255
 msgid "Please enter a buddy to pounce."
 msgstr "Indique el amigo del que avisar."
 
-#: ../finch/gntpounce.c:325 ../pidgin/gtkpounce.c:507
+#. Create the window.
+#: ../finch/gntpounce.c:325 ../pidgin/gtkpounce.c:516
 msgid "New Buddy Pounce"
 msgstr "Nuevo aviso de amigo"
 
-#: ../finch/gntpounce.c:325 ../pidgin/gtkpounce.c:507
+#: ../finch/gntpounce.c:325 ../pidgin/gtkpounce.c:516
 msgid "Edit Buddy Pounce"
 msgstr "Editar aviso de amigo"
 
@@ -1103,9 +1133,7 @@
 msgstr "Avisar a quién"
 
 #. Account:
-#. Set up stuff for the account box
-#: ../finch/gntpounce.c:333 ../finch/gntstatus.c:446 ../pidgin/gtkblist.c:5437
-#: ../pidgin/gtkblist.c:5753
+#: ../finch/gntpounce.c:333 ../finch/gntstatus.c:446
 msgid "Account:"
 msgstr "Cuenta:"
 
@@ -1114,7 +1142,7 @@
 msgstr "Nombre del amigo:"
 
 #. Create the "Pounce When Buddy..." frame.
-#: ../finch/gntpounce.c:371 ../pidgin/gtkpounce.c:577
+#: ../finch/gntpounce.c:371 ../pidgin/gtkpounce.c:586
 msgid "Pounce When Buddy..."
 msgstr "Avisar cuando un amigo..."
 
@@ -1159,7 +1187,7 @@
 msgstr "Envía un mensaje"
 
 #. Create the "Action" frame.
-#: ../finch/gntpounce.c:411 ../pidgin/gtkpounce.c:638
+#: ../finch/gntpounce.c:411 ../pidgin/gtkpounce.c:647
 msgid "Action"
 msgstr "Acción"
 
@@ -1187,70 +1215,70 @@
 msgid "Pounce only when my status is not available"
 msgstr "Sólo avisar cuando mi estado es «no disponible»"
 
-#: ../finch/gntpounce.c:447 ../pidgin/gtkpounce.c:1282
+#: ../finch/gntpounce.c:447 ../pidgin/gtkpounce.c:1295
 msgid "Recurring"
 msgstr "Recurrente"
 
-#: ../finch/gntpounce.c:649 ../pidgin/gtkpounce.c:1097
+#: ../finch/gntpounce.c:649 ../pidgin/gtkpounce.c:1110
 #, c-format
 msgid "Are you sure you want to delete the pounce on %s for %s?"
 msgstr "¿Está seguro que desea borrar el aviso en %s para %s?"
 
-#: ../finch/gntpounce.c:682 ../finch/gntui.c:78 ../pidgin/gtkpounce.c:1329
+#: ../finch/gntpounce.c:682 ../finch/gntui.c:78 ../pidgin/gtkpounce.c:1339
 msgid "Buddy Pounces"
 msgstr "Avisos de amigos"
 
-#: ../finch/gntpounce.c:794 ../pidgin/gtkpounce.c:1456
+#: ../finch/gntpounce.c:794 ../pidgin/gtkpounce.c:1466
 #, c-format
 msgid "%s has started typing to you (%s)"
 msgstr "%s ha comenzado a escribirle algo (%s)"
 
-#: ../finch/gntpounce.c:796 ../pidgin/gtkpounce.c:1458
+#: ../finch/gntpounce.c:796 ../pidgin/gtkpounce.c:1468
 #, c-format
 msgid "%s has paused while typing to you (%s)"
 msgstr "%s ha parado mientras le escribía algo (%s)"
 
-#: ../finch/gntpounce.c:798 ../pidgin/gtkpounce.c:1460
+#: ../finch/gntpounce.c:798 ../pidgin/gtkpounce.c:1470
 #, c-format
 msgid "%s has signed on (%s)"
 msgstr "%s se ha conectado (%s)"
 
-#: ../finch/gntpounce.c:800 ../pidgin/gtkpounce.c:1462
+#: ../finch/gntpounce.c:800 ../pidgin/gtkpounce.c:1472
 #, c-format
 msgid "%s has returned from being idle (%s)"
 msgstr "%s volvió de su inactividad (%s)"
 
-#: ../finch/gntpounce.c:802 ../pidgin/gtkpounce.c:1464
+#: ../finch/gntpounce.c:802 ../pidgin/gtkpounce.c:1474
 #, c-format
 msgid "%s has returned from being away (%s)"
 msgstr "%s ha dejado de estar ausente (%s)"
 
-#: ../finch/gntpounce.c:804 ../pidgin/gtkpounce.c:1466
+#: ../finch/gntpounce.c:804 ../pidgin/gtkpounce.c:1476
 #, c-format
 msgid "%s has stopped typing to you (%s)"
 msgstr "%s ha dejado de escribirle (%s)"
 
-#: ../finch/gntpounce.c:806 ../pidgin/gtkpounce.c:1468
+#: ../finch/gntpounce.c:806 ../pidgin/gtkpounce.c:1478
 #, c-format
 msgid "%s has signed off (%s)"
 msgstr "%s se ha desconectado (%s)"
 
-#: ../finch/gntpounce.c:808 ../pidgin/gtkpounce.c:1470
+#: ../finch/gntpounce.c:808 ../pidgin/gtkpounce.c:1480
 #, c-format
 msgid "%s has become idle (%s)"
 msgstr "%s está inactivo (%s)"
 
-#: ../finch/gntpounce.c:810 ../pidgin/gtkpounce.c:1472
+#: ../finch/gntpounce.c:810 ../pidgin/gtkpounce.c:1482
 #, c-format
 msgid "%s has gone away. (%s)"
 msgstr "%s se ha marchado. (%s)"
 
-#: ../finch/gntpounce.c:812 ../pidgin/gtkpounce.c:1474
+#: ../finch/gntpounce.c:812 ../pidgin/gtkpounce.c:1484
 #, c-format
 msgid "%s has sent you a message. (%s)"
 msgstr "%s le ha enviado un mensaje. (%s)"
 
-#: ../finch/gntpounce.c:813 ../pidgin/gtkpounce.c:1475
+#: ../finch/gntpounce.c:813 ../pidgin/gtkpounce.c:1485
 msgid "Unknown pounce event. Please report this!"
 msgstr "Evento de aviso desconocido. ¡Por favor, informe de esto! "
 
@@ -1258,12 +1286,12 @@
 msgid "Based on keyboard use"
 msgstr "Basado en el uso del teclado"
 
-#: ../finch/gntprefs.c:81 ../pidgin/gtkprefs.c:1814
+#: ../finch/gntprefs.c:81 ../pidgin/gtkprefs.c:1843
 msgid "From last sent message"
 msgstr "Del último mensaje enviado"
 
 #: ../finch/gntprefs.c:83 ../pidgin/gtkprefs.c:820 ../pidgin/gtkprefs.c:829
-#: ../pidgin/gtkprefs.c:1813 ../pidgin/gtkprefs.c:1827
+#: ../pidgin/gtkprefs.c:1842 ../pidgin/gtkprefs.c:1856
 #: ../pidgin/plugins/win32/winprefs/winprefs.c:337
 msgid "Never"
 msgstr "Nunca"
@@ -1297,12 +1325,12 @@
 msgstr "Registrar los eventos de cambios de estado"
 
 #. Conversations
-#: ../finch/gntprefs.c:241 ../pidgin/gtkprefs.c:898 ../pidgin/gtkprefs.c:1917
+#: ../finch/gntprefs.c:241 ../pidgin/gtkprefs.c:915 ../pidgin/gtkprefs.c:1946
 #: ../pidgin/plugins/win32/winprefs/winprefs.c:344
 msgid "Conversations"
 msgstr "Conversaciones"
 
-#: ../finch/gntprefs.c:242 ../pidgin/gtkprefs.c:1355 ../pidgin/gtkprefs.c:1928
+#: ../finch/gntprefs.c:242 ../pidgin/gtkprefs.c:1382 ../pidgin/gtkprefs.c:1957
 msgid "Logging"
 msgstr "Registro"
 
@@ -1310,13 +1338,13 @@
 msgid "Not implemented yet."
 msgstr "No implementado aún."
 
-#: ../finch/gntrequest.c:597 ../pidgin/gtkrequest.c:1529
-#: ../pidgin/gtkrequest.c:1575
+#: ../finch/gntrequest.c:597 ../pidgin/gtkrequest.c:1526
+#: ../pidgin/gtkrequest.c:1572
 msgid "Save File..."
 msgstr "Enviar archivo.."
 
-#: ../finch/gntrequest.c:597 ../pidgin/gtkrequest.c:1530
-#: ../pidgin/gtkrequest.c:1576
+#: ../finch/gntrequest.c:597 ../pidgin/gtkrequest.c:1527
+#: ../pidgin/gtkrequest.c:1573
 msgid "Open File..."
 msgstr "Abrir archivo..."
 
@@ -1329,13 +1357,13 @@
 msgid "Delete Status"
 msgstr "Borrar estado"
 
-#: ../finch/gntstatus.c:170 ../pidgin/gtksavedstatuses.c:557
+#: ../finch/gntstatus.c:170 ../pidgin/gtksavedstatuses.c:554
 msgid "Saved Statuses"
 msgstr "Estados guardados"
 
 #: ../finch/gntstatus.c:177 ../finch/gntstatus.c:529
 #: ../libpurple/protocols/jabber/buddy.c:286
-#: ../libpurple/protocols/jabber/buddy.c:935
+#: ../libpurple/protocols/jabber/buddy.c:969
 #: ../libpurple/protocols/novell/novell.c:1484
 #: ../pidgin/gtksavedstatuses.c:464
 msgid "Title"
@@ -1346,39 +1374,40 @@
 msgstr "Tipo"
 
 #: ../finch/gntstatus.c:177 ../finch/gntstatus.c:554 ../finch/gntstatus.c:566
-#: ../libpurple/protocols/bonjour/bonjour.c:258
-#: ../libpurple/protocols/bonjour/bonjour.c:265
-#: ../libpurple/protocols/bonjour/bonjour.c:328
+#: ../libpurple/protocols/bonjour/bonjour.c:247
+#: ../libpurple/protocols/bonjour/bonjour.c:254
+#: ../libpurple/protocols/bonjour/bonjour.c:320
 #: ../libpurple/protocols/gg/gg.c:1072 ../libpurple/protocols/gg/gg.c:1576
 #: ../libpurple/protocols/gg/gg.c:1594 ../libpurple/protocols/gg/gg.c:1604
 #: ../libpurple/protocols/gg/gg.c:1610 ../libpurple/protocols/gg/gg.c:1619
 #: ../libpurple/protocols/gg/gg.c:1624 ../libpurple/protocols/irc/irc.c:234
-#: ../libpurple/protocols/jabber/jabber.c:1246
-#: ../libpurple/protocols/jabber/jabber.c:1256
-#: ../libpurple/protocols/jabber/jabber.c:1266
-#: ../libpurple/protocols/jabber/jabber.c:1276
-#: ../libpurple/protocols/jabber/jabber.c:1286
-#: ../libpurple/protocols/jabber/jabber.c:1298
+#: ../libpurple/protocols/jabber/jabber.c: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:5464
-#: ../libpurple/protocols/oscar/oscar.c:5682
-#: ../libpurple/protocols/oscar/oscar.c:5696
-#: ../libpurple/protocols/oscar/oscar.c:5712
-#: ../libpurple/protocols/oscar/oscar.c:5719
-#: ../libpurple/protocols/oscar/oscar.c:5726
+#: ../libpurple/protocols/oscar/oscar.c:5532
+#: ../libpurple/protocols/oscar/oscar.c:5750
+#: ../libpurple/protocols/oscar/oscar.c:5764
+#: ../libpurple/protocols/oscar/oscar.c:5780
+#: ../libpurple/protocols/oscar/oscar.c:5787
+#: ../libpurple/protocols/oscar/oscar.c:5794
 #: ../libpurple/protocols/sametime/sametime.c:3286
 #: ../libpurple/protocols/sametime/sametime.c:3292
 #: ../libpurple/protocols/sametime/sametime.c:3298
 #: ../libpurple/protocols/sametime/sametime.c:3377
 #: ../libpurple/protocols/silc/buddy.c:1551
+#: ../libpurple/protocols/silc10/buddy.c:1551
 #: ../libpurple/protocols/simple/simple.c:246
-#: ../libpurple/protocols/yahoo/yahoo.c:3477
-#: ../libpurple/protocols/yahoo/yahoo.c:3483
+#: ../libpurple/protocols/yahoo/yahoo.c:3494
+#: ../libpurple/protocols/yahoo/yahoo.c:3500
 #: ../libpurple/protocols/zephyr/zephyr.c:2337
-#: ../pidgin/gtksavedstatuses.c:490 ../pidgin/gtksavedstatuses.c:954
+#: ../pidgin/gtksavedstatuses.c:490 ../pidgin/gtksavedstatuses.c:951
 msgid "Message"
 msgstr "Mensaje"
 
@@ -1591,8 +1620,13 @@
 msgid "Missing protocol plugin for %s"
 msgstr "Falta el complemento de protocolo para %s"
 
+#: ../libpurple/account.c:1012 ../libpurple/connection.c:107
+#: ../pidgin/gtkblist.c:3998
+msgid "Connection Error"
+msgstr "Error de conexión"
+
 #: ../libpurple/account.c:1170 ../libpurple/protocols/gg/gg.c:702
-#: ../libpurple/protocols/jabber/jabber.c:1336
+#: ../libpurple/protocols/jabber/jabber.c:1332
 msgid "New passwords do not match."
 msgstr "Las nuevas contraseñas no coinciden."
 
@@ -1632,21 +1666,21 @@
 
 #: ../libpurple/account.c:1744 ../libpurple/protocols/gg/gg.c:1012
 #: ../libpurple/protocols/jabber/buddy.c:638
-#: ../libpurple/protocols/jabber/buddy.c:1424
-#: ../libpurple/protocols/jabber/buddy.c:1441
+#: ../libpurple/protocols/jabber/buddy.c:1458
+#: ../libpurple/protocols/jabber/buddy.c:1475
 #: ../libpurple/protocols/novell/novell.c:2831
 #: ../libpurple/protocols/qq/qq.c:230 ../pidgin/gtkft.c:159
 msgid "Unknown"
 msgstr "Desconocido"
 
-#: ../libpurple/blist.c:523 ../libpurple/blist.c:1291
-#: ../libpurple/blist.c:1520 ../libpurple/protocols/jabber/roster.c:68
-#: ../pidgin/gtkblist.c:5233 ../pidgin/plugins/gevolution/gevolution.c:97
+#: ../libpurple/blist.c:521 ../libpurple/blist.c:1289
+#: ../libpurple/blist.c:1518 ../libpurple/protocols/jabber/roster.c:68
+#: ../pidgin/gtkblist.c:5289 ../pidgin/plugins/gevolution/gevolution.c:96
 #: ../pidgin/plugins/gevolution/gevo-util.c:64
 msgid "Buddies"
 msgstr "Amigos"
 
-#: ../libpurple/blist.c:550
+#: ../libpurple/blist.c:548
 msgid "buddy list"
 msgstr "lista de amigos"
 
@@ -1665,85 +1699,88 @@
 msgstr "+++ %s se ha desconectado"
 
 #: ../libpurple/connection.c:440 ../libpurple/plugin.c:282
-#: ../libpurple/protocols/jabber/buddy.c:1712
+#: ../libpurple/protocols/jabber/buddy.c:1746
 #: ../libpurple/protocols/msn/servconn.c:139
-#: ../libpurple/protocols/msn/session.c:321
+#: ../libpurple/protocols/msn/session.c:322
 msgid "Unknown error"
 msgstr "Error desconocido"
 
-#: ../libpurple/conversation.c:165
+#: ../libpurple/conversation.c:170
 msgid "Unable to send message: The message is too large."
 msgstr "No se pudo enviar el mensaje: es demasiado grande."
 
-#: ../libpurple/conversation.c:168 ../libpurple/conversation.c:181
+#: ../libpurple/conversation.c:173 ../libpurple/conversation.c:186
 #, c-format
 msgid "Unable to send message to %s."
 msgstr "No se pudo enviar el mensaje a %s."
 
-#: ../libpurple/conversation.c:169
+#: ../libpurple/conversation.c:174
 msgid "The message is too large."
 msgstr "El mensaje es demasiado largo"
 
-#: ../libpurple/conversation.c:178
+#: ../libpurple/conversation.c:183 ../libpurple/protocols/bonjour/jabber.c:283
+#: ../libpurple/protocols/bonjour/jabber.c:325
 msgid "Unable to send message."
 msgstr "No se pudo enviar el mensaje."
 
-#: ../libpurple/conversation.c:1164
+#: ../libpurple/conversation.c:1169
 msgid "Send Message"
 msgstr "Enviar un mensaje"
 
-#: ../libpurple/conversation.c:1167
+#: ../libpurple/conversation.c:1172
 msgid "_Send Message"
 msgstr "Enviar un _mensaje"
 
-#: ../libpurple/conversation.c:1570
+#: ../libpurple/conversation.c:1577
 #, c-format
 msgid "%s entered the room."
 msgstr "%s ha entrado en la sala."
 
-#: ../libpurple/conversation.c:1573
+#: ../libpurple/conversation.c:1580
 #, c-format
 msgid "%s [<I>%s</I>] entered the room."
 msgstr "%s [<I>%s</I>] ha entrado en la sala."
 
-#: ../libpurple/conversation.c:1678
+#: ../libpurple/conversation.c:1689
 #, c-format
 msgid "You are now known as %s"
 msgstr "Vd. ahora se llama %s"
 
-#: ../libpurple/conversation.c:1698
+#: ../libpurple/conversation.c:1709
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s ahora se llama %s"
 
-#: ../libpurple/conversation.c:1771
+#: ../libpurple/conversation.c:1784
 #, c-format
 msgid "%s left the room."
 msgstr "%s ha salido de la sala."
 
-#: ../libpurple/conversation.c:1774
+#: ../libpurple/conversation.c:1787
 #, c-format
 msgid "%s left the room (%s)."
 msgstr "%s ha salido de la sala (%s)."
 
-#: ../libpurple/dbus-server.c:578
+#: ../libpurple/dbus-server.c:584
 #, c-format
 msgid "Failed to get connection: %s"
 msgstr "No se pudo obtener la conexión: %s"
 
-#: ../libpurple/dbus-server.c:590
+#: ../libpurple/dbus-server.c:596
 #, c-format
 msgid "Failed to get name: %s"
 msgstr "No se pudo obtener un nombre: %s"
 
-#: ../libpurple/dbus-server.c:603
+#: ../libpurple/dbus-server.c:610
 #, c-format
 msgid "Failed to get serv name: %s"
 msgstr "No se pudo obtener el nombre del servidor: %s"
 
 #: ../libpurple/dbus-server.h:83
 msgid "Purple's D-BUS server is not running for the reason listed below"
-msgstr "El servidor D-BUS de Purple no está ejecutándose por la razón indicada a continuación"
+msgstr ""
+"El servidor D-BUS de Purple no está ejecutándose por la razón indicada a "
+"continuación"
 
 #: ../libpurple/desktopitem.c:286 ../libpurple/desktopitem.c:877
 msgid "No name"
@@ -1794,7 +1831,7 @@
 msgid "Unknown reason"
 msgstr "Razón desconocida"
 
-#: ../libpurple/ft.c:204
+#: ../libpurple/ft.c:207
 #, c-format
 msgid ""
 "Error reading %s: \n"
@@ -1803,7 +1840,7 @@
 "Error al leer %s: \n"
 "%s.\n"
 
-#: ../libpurple/ft.c:208
+#: ../libpurple/ft.c:211
 #, c-format
 msgid ""
 "Error writing %s: \n"
@@ -1812,7 +1849,7 @@
 "Error al escribir %s: \n"
 "%s.\n"
 
-#: ../libpurple/ft.c:212
+#: ../libpurple/ft.c:215
 #, c-format
 msgid ""
 "Error accessing %s: \n"
@@ -1821,39 +1858,39 @@
 "Error al acceder a %s: \n"
 "%s.\n"
 
-#: ../libpurple/ft.c:248
+#: ../libpurple/ft.c:251
 msgid "Directory is not writable."
 msgstr "No se puede escribir en el directorio."
 
-#: ../libpurple/ft.c:263
+#: ../libpurple/ft.c:266
 msgid "Cannot send a file of 0 bytes."
 msgstr "No se puede enviar un archivo de 0 bytes."
 
-#: ../libpurple/ft.c:273
+#: ../libpurple/ft.c:276
 msgid "Cannot send a directory."
 msgstr "No se puede enviar un directorio."
 
-#: ../libpurple/ft.c:282
+#: ../libpurple/ft.c:285
 #, c-format
 msgid "%s is not a regular file. Cowardly refusing to overwrite it.\n"
 msgstr "%s no es un archivo normal. No se sobreescribirá.\n"
 
-#: ../libpurple/ft.c:342
+#: ../libpurple/ft.c:345
 #, c-format
 msgid "%s wants to send you %s (%s)"
 msgstr "%s quiere enviarle %s (%s)"
 
-#: ../libpurple/ft.c:349
+#: ../libpurple/ft.c:352
 #, c-format
 msgid "%s wants to send you a file"
 msgstr "%s quiere enviarle un fichero"
 
-#: ../libpurple/ft.c:392
+#: ../libpurple/ft.c:395
 #, c-format
 msgid "Accept file transfer request from %s?"
 msgstr "¿Aceptar solicitud de transferencia de archivo de %s?"
 
-#: ../libpurple/ft.c:396
+#: ../libpurple/ft.c:399
 #, c-format
 msgid ""
 "A file is available for download from:\n"
@@ -1864,60 +1901,60 @@
 "Servidor remoto: %s\n"
 "Puerto remoto: %d"
 
-#: ../libpurple/ft.c:431
+#: ../libpurple/ft.c:434
 #, c-format
 msgid "%s is offering to send file %s"
 msgstr "%s se ofrece a enviarle el archivo %s"
 
-#: ../libpurple/ft.c:483
+#: ../libpurple/ft.c:486
 #, c-format
 msgid "%s is not a valid filename.\n"
 msgstr "%s no es un nombre de archivo válido.\n"
 
-#: ../libpurple/ft.c:504
+#: ../libpurple/ft.c:507
 #, c-format
 msgid "Offering to send %s to %s"
 msgstr "Se ofrece enviar %s a %s"
 
-#: ../libpurple/ft.c:516
+#: ../libpurple/ft.c:519
 #, c-format
 msgid "Starting transfer of %s from %s"
 msgstr "Comienza la transferencia de %s de %s"
 
-#: ../libpurple/ft.c:670
+#: ../libpurple/ft.c:680
 #, c-format
 msgid "Transfer of file %s complete"
 msgstr "Se ha completado la transferencia de %s"
 
-#: ../libpurple/ft.c:673
+#: ../libpurple/ft.c:683
 msgid "File transfer complete"
 msgstr "Transferencia de archivos completa"
 
-#: ../libpurple/ft.c:1091
+#: ../libpurple/ft.c:1101
 #, c-format
 msgid "You canceled the transfer of %s"
 msgstr "Vd. canceló la transferencia de %s"
 
-#: ../libpurple/ft.c:1096
+#: ../libpurple/ft.c:1106
 msgid "File transfer cancelled"
 msgstr "Transferencia de archivos cancelada"
 
-#: ../libpurple/ft.c:1154
+#: ../libpurple/ft.c:1164
 #, c-format
 msgid "%s canceled the transfer of %s"
 msgstr "%s canceló la transferencia de %s"
 
-#: ../libpurple/ft.c:1159
+#: ../libpurple/ft.c:1169
 #, c-format
 msgid "%s canceled the file transfer"
 msgstr "%s canceló la transferencia de archivos"
 
-#: ../libpurple/ft.c:1216
+#: ../libpurple/ft.c:1226
 #, c-format
 msgid "File transfer to %s failed."
 msgstr "Falló la transferencia del archivo a %s."
 
-#: ../libpurple/ft.c:1218
+#: ../libpurple/ft.c:1228
 #, c-format
 msgid "File transfer from %s failed."
 msgstr "Falló la transferencia del archivo de %s."
@@ -2094,32 +2131,32 @@
 msgid "Whether the specified command should handle \"ymsgr\" URLs"
 msgstr "Si la orden debería gestionar URLs «ymsgr»"
 
-#: ../libpurple/log.c:181
+#: ../libpurple/log.c:182
 msgid "<b><font color=\"red\">The logger has no read function</font></b>"
 msgstr ""
 "<b><font color=\"red\">El registro no tiene función de lectura</font></b>"
 
-#: ../libpurple/log.c:593
+#: ../libpurple/log.c:597
 msgid "HTML"
 msgstr "HTML"
 
-#: ../libpurple/log.c:607
+#: ../libpurple/log.c:611
 msgid "Plain text"
 msgstr "En claro"
 
-#: ../libpurple/log.c:621
+#: ../libpurple/log.c:625
 msgid "Old flat format"
 msgstr "Formato antiguo plano"
 
-#: ../libpurple/log.c:732
+#: ../libpurple/log.c:837
 msgid "Logging of this conversation failed."
 msgstr "No se pudo registrar esta conversación."
 
-#: ../libpurple/log.c:1175
+#: ../libpurple/log.c:1280
 msgid "XML"
 msgstr "XML"
 
-#: ../libpurple/log.c:1251
+#: ../libpurple/log.c:1364
 #, c-format
 msgid ""
 "<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
@@ -2128,7 +2165,7 @@
 "<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;RESPUESTA "
 "AUTOMÁTICA&gt;:</b></font> %s<br/>\n"
 
-#: ../libpurple/log.c:1253
+#: ../libpurple/log.c:1366
 #, c-format
 msgid ""
 "<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
@@ -2137,17 +2174,17 @@
 "<font color=\"#A82F2f\"><font size=\"2\">(%s)</font> <b>%s &lt;RESPUESTA "
 "AUTOMÁTICA&gt;:</b></font> %s<br/>\n"
 
-#: ../libpurple/log.c:1311 ../libpurple/log.c:1444
+#: ../libpurple/log.c:1424 ../libpurple/log.c:1557
 msgid "<font color=\"red\"><b>Unable to find log path!</b></font>"
 msgstr ""
 "<font color=\"red\"><b>¡No se pudo encontrar la ruta del registro!</b></font>"
 
-#: ../libpurple/log.c:1323 ../libpurple/log.c:1453
+#: ../libpurple/log.c:1436 ../libpurple/log.c:1566
 #, c-format
 msgid "<font color=\"red\"><b>Could not read file: %s</b></font>"
 msgstr "<font color=\"red\"><b>No se pudo leer el archivo: %s</b></font>"
 
-#: ../libpurple/log.c:1385
+#: ../libpurple/log.c:1498
 #, c-format
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr "(%s) %s <RESPUESTA AUTOMÁTICA>: %s\n"
@@ -2244,13 +2281,13 @@
 
 #: ../libpurple/plugins/autoaccept.c:165 ../libpurple/plugins/idle.c:170
 #: ../libpurple/plugins/idle.c:204 ../libpurple/plugins/idle.c:230
-#: ../libpurple/protocols/oscar/oscar.c:1440
-#: ../libpurple/protocols/oscar/oscar.c:2231
-#: ../libpurple/protocols/oscar/oscar.c:2278
-#: ../libpurple/protocols/oscar/oscar.c:5796
-#: ../libpurple/protocols/oscar/oscar.c:5851
-#: ../libpurple/protocols/oscar/oscar.c:6077
-#: ../libpurple/protocols/oscar/oscar.c:6147 ../libpurple/request.h:1387
+#: ../libpurple/protocols/oscar/oscar.c:1458
+#: ../libpurple/protocols/oscar/oscar.c:2251
+#: ../libpurple/protocols/oscar/oscar.c:2298
+#: ../libpurple/protocols/oscar/oscar.c:5864
+#: ../libpurple/protocols/oscar/oscar.c:5919
+#: ../libpurple/protocols/oscar/oscar.c:6145
+#: ../libpurple/protocols/oscar/oscar.c:6215 ../libpurple/request.h:1387
 #: ../libpurple/request.h:1397
 msgid "_Cancel"
 msgstr "_Cancelar"
@@ -2295,8 +2332,8 @@
 "ficheros autoaceptada\n"
 "(sólo cuando no hay ya una conversación con el que la envía)"
 
-#: ../libpurple/plugins/buddynote.c:46 ../libpurple/protocols/msn/msn.c:1608
-#: ../libpurple/protocols/msn/msn.c:1638
+#: ../libpurple/plugins/buddynote.c:46 ../libpurple/protocols/msn/msn.c:1629
+#: ../libpurple/protocols/msn/msn.c:1659
 msgid "Notes"
 msgstr "Notas"
 
@@ -2304,7 +2341,7 @@
 msgid "Enter your notes below..."
 msgstr "Introduzca sus notas a continuación..."
 
-#: ../libpurple/plugins/buddynote.c:62
+#: ../libpurple/plugins/buddynote.c:65
 msgid "Edit Notes..."
 msgstr "Editar las notas..."
 
@@ -2316,18 +2353,18 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/buddynote.c:87
+#: ../libpurple/plugins/buddynote.c:90
 msgid "Buddy Notes"
 msgstr "Notas de amigos"
 
 #. *< name
 #. *< version
-#: ../libpurple/plugins/buddynote.c:89
+#: ../libpurple/plugins/buddynote.c:92
 msgid "Store notes on particular buddies."
 msgstr "Guardar las notas de amigos concretos."
 
 #. *< summary
-#: ../libpurple/plugins/buddynote.c:90
+#: ../libpurple/plugins/buddynote.c:93
 msgid "Adds the option to store notes for buddies on your buddy list."
 msgstr ""
 "Añade la opción de guardar notas sobre los amigos en su lista de amigos."
@@ -2526,30 +2563,30 @@
 msgid "(UTC)"
 msgstr "(TCU)"
 
-#: ../libpurple/plugins/log_reader.c:1552
+#: ../libpurple/plugins/log_reader.c:1580
 msgid "User is offline."
 msgstr "El usuario no está conectado."
 
-#: ../libpurple/plugins/log_reader.c:1558
+#: ../libpurple/plugins/log_reader.c:1586
 msgid "Auto-response sent:"
 msgstr "_Enviar respuesta automática:"
 
-#: ../libpurple/plugins/log_reader.c:1568
-#: ../libpurple/plugins/log_reader.c:1571
+#: ../libpurple/plugins/log_reader.c:1596
+#: ../libpurple/plugins/log_reader.c:1599
 #: ../libpurple/plugins/statenotify.c:80
 #, c-format
 msgid "%s has signed off."
 msgstr "%s se ha desconectado."
 
-#: ../libpurple/plugins/log_reader.c:1585
+#: ../libpurple/plugins/log_reader.c:1613
 msgid "One or more messages may have been undeliverable."
 msgstr "Uno o más mensajes puede no haber llegado a destino."
 
-#: ../libpurple/plugins/log_reader.c:1595
+#: ../libpurple/plugins/log_reader.c:1623
 msgid "You were disconnected from the server."
 msgstr "Ha sido desconectado del servidor."
 
-#: ../libpurple/plugins/log_reader.c:1603
+#: ../libpurple/plugins/log_reader.c:1631
 msgid ""
 "You are currently disconnected. Messages will not be received unless you are "
 "logged in."
@@ -2557,70 +2594,70 @@
 "Actualmente está desconectado. No podrá recibir mensajes a menos que se "
 "conecte."
 
-#: ../libpurple/plugins/log_reader.c:1618
+#: ../libpurple/plugins/log_reader.c:1646
 msgid "Message could not be sent because the maximum length was exceeded."
 msgstr ""
 "No se pudo enviar el mensaje porque excede la longitud máxima permitida."
 
-#: ../libpurple/plugins/log_reader.c:1623
+#: ../libpurple/plugins/log_reader.c:1651
 msgid "Message could not be sent."
 msgstr "No se envió su mensaje."
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
-#: ../libpurple/plugins/log_reader.c:1976
-#: ../libpurple/plugins/log_reader.c:2085
+#: ../libpurple/plugins/log_reader.c:1996
+#: ../libpurple/plugins/log_reader.c:2105
 msgid "Adium"
 msgstr "Adium"
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
-#: ../libpurple/plugins/log_reader.c:1989
-#: ../libpurple/plugins/log_reader.c:2090
+#: ../libpurple/plugins/log_reader.c:2009
+#: ../libpurple/plugins/log_reader.c:2110
 msgid "Fire"
 msgstr "Fire"
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
-#: ../libpurple/plugins/log_reader.c:2001
-#: ../libpurple/plugins/log_reader.c:2094
+#: ../libpurple/plugins/log_reader.c:2021
+#: ../libpurple/plugins/log_reader.c:2114
 msgid "Messenger Plus!"
 msgstr "Messenger Plus!"
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
-#: ../libpurple/plugins/log_reader.c:2014
-#: ../libpurple/plugins/log_reader.c:2099
+#: ../libpurple/plugins/log_reader.c:2034
+#: ../libpurple/plugins/log_reader.c:2119
 msgid "MSN Messenger"
 msgstr "MSN Messenger"
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
-#: ../libpurple/plugins/log_reader.c:2026
-#: ../libpurple/plugins/log_reader.c:2103
+#: ../libpurple/plugins/log_reader.c:2046
+#: ../libpurple/plugins/log_reader.c:2123
 msgid "Trillian"
 msgstr "Trillian"
 
 #. Add general preferences.
-#: ../libpurple/plugins/log_reader.c:2067
+#: ../libpurple/plugins/log_reader.c:2087
 msgid "General Log Reading Configuration"
 msgstr "Configuración general de lectura del registro"
 
-#: ../libpurple/plugins/log_reader.c:2071
+#: ../libpurple/plugins/log_reader.c:2091
 msgid "Fast size calculations"
 msgstr "Cálculos de tamaño rápido"
 
-#: ../libpurple/plugins/log_reader.c:2075
+#: ../libpurple/plugins/log_reader.c:2095
 msgid "Use name heuristics"
 msgstr "Utilizar heurísticos de nombres"
 
 #. Add Log Directory preferences.
-#: ../libpurple/plugins/log_reader.c:2081
+#: ../libpurple/plugins/log_reader.c:2101
 msgid "Log Directory"
 msgstr "Directorio de registro"
 
@@ -2630,19 +2667,19 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/log_reader.c:2132
+#: ../libpurple/plugins/log_reader.c:2152
 msgid "Log Reader"
 msgstr "Lector de registro"
 
 #. *< name
 #. *< version
 #. * summary
-#: ../libpurple/plugins/log_reader.c:2136
+#: ../libpurple/plugins/log_reader.c:2156
 msgid "Includes other IM clients' logs in the log viewer."
 msgstr "Incluir otros registros de clientes de MI en el visor de registro."
 
 #. * description
-#: ../libpurple/plugins/log_reader.c:2140
+#: ../libpurple/plugins/log_reader.c:2160
 msgid ""
 "When viewing logs, this plugin will include logs from other IM clients. "
 "Currently, this includes Adium, MSN Messenger, and Trillian.\n"
@@ -2732,9 +2769,11 @@
 #: ../libpurple/protocols/msn/dialog.c:133
 #: ../libpurple/protocols/msn/msn.c:522 ../libpurple/protocols/msn/msn.c:532
 #: ../libpurple/protocols/novell/novell.c:1917
-#: ../libpurple/protocols/silc/buddy.c:314
-#: ../libpurple/protocols/silc/pk.c:119 ../libpurple/protocols/silc/wb.c:304
-#: ../pidgin/gtkrequest.c:267
+#: ../libpurple/protocols/silc/buddy.c:317
+#: ../libpurple/protocols/silc/pk.c:113 ../libpurple/protocols/silc/wb.c:304
+#: ../libpurple/protocols/silc10/buddy.c:314
+#: ../libpurple/protocols/silc10/pk.c:119
+#: ../libpurple/protocols/silc10/wb.c:304 ../pidgin/gtkrequest.c:267
 msgid "Yes"
 msgstr "Sí"
 
@@ -2742,9 +2781,11 @@
 #: ../libpurple/protocols/msn/dialog.c:134
 #: ../libpurple/protocols/msn/msn.c:522 ../libpurple/protocols/msn/msn.c:532
 #: ../libpurple/protocols/novell/novell.c:1918
-#: ../libpurple/protocols/silc/buddy.c:315
-#: ../libpurple/protocols/silc/pk.c:120 ../libpurple/protocols/silc/wb.c:305
-#: ../pidgin/gtkrequest.c:268
+#: ../libpurple/protocols/silc/buddy.c:318
+#: ../libpurple/protocols/silc/pk.c:114 ../libpurple/protocols/silc/wb.c:305
+#: ../libpurple/protocols/silc10/buddy.c:315
+#: ../libpurple/protocols/silc10/pk.c:120
+#: ../libpurple/protocols/silc10/wb.c:305 ../pidgin/gtkrequest.c:268
 msgid "No"
 msgstr "No"
 
@@ -2785,7 +2826,10 @@
 msgid ""
 "Causes conversation windows to appear as other users begin to message you.  "
 "This works for AIM, ICQ, XMPP, Sametime, and Yahoo!"
-msgstr "Hace que aparezcan las ventanas de conversación cuando un usuario empieza a enviarle un mensaje. Esto funciona con AIM, ICQ, Jabber, XMPP, Sametime y Yahoo!"
+msgstr ""
+"Hace que aparezcan las ventanas de conversación cuando un usuario empieza a "
+"enviarle un mensaje. Esto funciona con AIM, ICQ, Jabber, XMPP, Sametime y "
+"Yahoo!"
 
 #: ../libpurple/plugins/psychic.c:72
 msgid "You feel a disturbance in the force..."
@@ -2869,7 +2913,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/ssl/ssl-gnutls.c:263
+#: ../libpurple/plugins/ssl/ssl-gnutls.c:275
 msgid "GNUTLS"
 msgstr "GNUTLS"
 
@@ -2877,8 +2921,8 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/plugins/ssl/ssl-gnutls.c:266
-#: ../libpurple/plugins/ssl/ssl-gnutls.c:268
+#: ../libpurple/plugins/ssl/ssl-gnutls.c:278
+#: ../libpurple/plugins/ssl/ssl-gnutls.c:280
 msgid "Provides SSL support through GNUTLS."
 msgstr "Proporciona soporte SSL a través de GNUTLS."
 
@@ -2888,7 +2932,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/ssl/ssl-nss.c:415
+#: ../libpurple/plugins/ssl/ssl-nss.c:423
 msgid "NSS"
 msgstr "NSS"
 
@@ -2896,8 +2940,8 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/plugins/ssl/ssl-nss.c:418
-#: ../libpurple/plugins/ssl/ssl-nss.c:420
+#: ../libpurple/plugins/ssl/ssl-nss.c:426
+#: ../libpurple/plugins/ssl/ssl-nss.c:428
 msgid "Provides SSL support through Mozilla NSS."
 msgstr "Proporciona soporte SSL a través del NSS de Mozilla."
 
@@ -2973,7 +3017,7 @@
 msgid "Provides support for loading Tcl plugins"
 msgstr "Provee soporte para cargar complementos Tcl"
 
-#: ../libpurple/plugins/tcl/tcl.c:495
+#: ../libpurple/plugins/tcl/tcl.c:507
 msgid ""
 "Unable to detect ActiveTCL installation. If you wish to use TCL plugins, "
 "install ActiveTCL from http://www.activestate.com\n"
@@ -2982,11 +3026,11 @@
 "http://www.activestate.com si desea utilizar los complementos TCL\n"
 
 #. Send a message about the connection error
-#: ../libpurple/protocols/bonjour/bonjour.c:113
+#: ../libpurple/protocols/bonjour/bonjour.c:112
 msgid "Unable to listen for incoming IM connections\n"
 msgstr "No se pudieron escuchar las conexiones MI entrantes\n"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:148
+#: ../libpurple/protocols/bonjour/bonjour.c:137
 msgid ""
 "Unable to establish connection with the local mDNS server.  Is it running?"
 msgstr ""
@@ -2996,18 +3040,19 @@
 #. get_yahoo_status_from_purple_status() returns YAHOO_STATUS_CUSTOM for
 #. * the generic away state (YAHOO_STATUS_TYPE_AWAY) with no message
 #. Away stuff
-#: ../libpurple/protocols/bonjour/bonjour.c:302
+#: ../libpurple/protocols/bonjour/bonjour.c:294
 #: ../libpurple/protocols/gg/gg.c:1009 ../libpurple/protocols/irc/irc.c:530
 #: ../libpurple/protocols/irc/msgs.c:310
-#: ../libpurple/protocols/jabber/buddy.c:1434
+#: ../libpurple/protocols/jabber/buddy.c:1468
 #: ../libpurple/protocols/novell/novell.c:2819
-#: ../libpurple/protocols/oscar/oscar.c:715
-#: ../libpurple/protocols/oscar/oscar.c:4497
-#: ../libpurple/protocols/oscar/oscar.c:5542
+#: ../libpurple/protocols/oscar/oscar.c:733
+#: ../libpurple/protocols/oscar/oscar.c:4545
+#: ../libpurple/protocols/oscar/oscar.c:5610
 #: ../libpurple/protocols/qq/qq.c:180 ../libpurple/protocols/silc/buddy.c:1476
-#: ../libpurple/protocols/yahoo/yahoo.c:3380
-#: ../libpurple/protocols/yahoo/yahoo.c:3453 ../libpurple/status.c:157
-#: ../pidgin/gtkdocklet.c:442 ../pidgin/gtkprefs.c:1823
+#: ../libpurple/protocols/silc10/buddy.c:1476
+#: ../libpurple/protocols/yahoo/yahoo.c:3397
+#: ../libpurple/protocols/yahoo/yahoo.c:3470 ../libpurple/status.c:157
+#: ../pidgin/gtkdocklet.c:442 ../pidgin/gtkprefs.c:1852
 #: ../pidgin/gtkstatusbox.c:1052
 msgid "Away"
 msgstr "Ausente"
@@ -3022,86 +3067,91 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/bonjour/bonjour.c:431
-#: ../libpurple/protocols/bonjour/bonjour.c:433
+#: ../libpurple/protocols/bonjour/bonjour.c:425
+#: ../libpurple/protocols/bonjour/bonjour.c:427
 msgid "Bonjour Protocol Plugin"
 msgstr "Complemento de protocolo Bonjour"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:476
-#: ../libpurple/protocols/bonjour/bonjour.c:483
-#: ../libpurple/protocols/bonjour/bonjour.c:541
+#: ../libpurple/protocols/bonjour/bonjour.c:470
+#: ../libpurple/protocols/bonjour/bonjour.c:477
+#: ../libpurple/protocols/bonjour/bonjour.c:535
 msgid "Purple Person"
 msgstr "Persona morada"
 
 #. Creating the user splits
-#: ../libpurple/protocols/bonjour/bonjour.c:589
-#: ../libpurple/protocols/silc/silc.c:926
+#: ../libpurple/protocols/bonjour/bonjour.c:583
+#: ../libpurple/protocols/silc/silc.c:1007
+#: ../libpurple/protocols/silc10/silc.c:918
 msgid "Hostname"
 msgstr "Servidor"
 
 #. Creating the options for the protocol
-#: ../libpurple/protocols/bonjour/bonjour.c:593
+#: ../libpurple/protocols/bonjour/bonjour.c:587
 #: ../libpurple/protocols/gg/gg.c:627
-#: ../libpurple/protocols/jabber/jabber.c:824
+#: ../libpurple/protocols/jabber/jabber.c:828
 msgid "First name"
 msgstr "Nombre:"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:596
+#: ../libpurple/protocols/bonjour/bonjour.c:590
 #: ../libpurple/protocols/gg/gg.c:622
-#: ../libpurple/protocols/jabber/jabber.c:829
+#: ../libpurple/protocols/jabber/jabber.c:833
 msgid "Last name"
 msgstr "Apellidos:"
 
+#: ../libpurple/protocols/bonjour/bonjour.c:593
+#: ../libpurple/protocols/gg/gg.c:472
+#: ../libpurple/protocols/jabber/jabber.c:818
+#: ../libpurple/protocols/silc/silc.c:770
+#: ../libpurple/protocols/silc/silc.c:1011
+#: ../libpurple/protocols/silc10/silc.c:681
+#: ../libpurple/protocols/silc10/silc.c:922
+msgid "E-mail"
+msgstr "Correo electrónico"
+
+#: ../libpurple/protocols/bonjour/bonjour.c:596
+msgid "AIM Account"
+msgstr "Cuenta AIM"
+
 #: ../libpurple/protocols/bonjour/bonjour.c:599
-#: ../libpurple/protocols/gg/gg.c:472
-#: ../libpurple/protocols/jabber/jabber.c:814
-#: ../libpurple/protocols/silc/silc.c:689
-#: ../libpurple/protocols/silc/silc.c:930
-msgid "E-mail"
-msgstr "Correo electrónico"
-
-#: ../libpurple/protocols/bonjour/bonjour.c:602
-msgid "AIM Account"
-msgstr "Cuenta AIM"
-
-#: ../libpurple/protocols/bonjour/bonjour.c:605
 msgid "XMPP Account"
 msgstr "Cuenta XMPP"
 
-#: ../libpurple/protocols/bonjour/bonjour.h:35
+#: ../libpurple/protocols/bonjour/bonjour.h:33
 msgid "Bonjour"
 msgstr "Bonjour"
 
-#: ../libpurple/protocols/bonjour/jabber.c:374
+#: ../libpurple/protocols/bonjour/jabber.c:394
 #, c-format
 msgid "%s has closed the conversation."
 msgstr "%s ha cerrado la conversación."
 
-#: ../libpurple/protocols/bonjour/jabber.c:461
+#: ../libpurple/protocols/bonjour/jabber.c:440
+#: ../libpurple/protocols/bonjour/jabber.c:653
+#: ../libpurple/protocols/bonjour/jabber.c:678
+msgid "Unable to send the message, the conversation couldn't be started."
+msgstr "No se pudo enviar el mensaje, no se pudo iniciar la conversación."
+
+#: ../libpurple/protocols/bonjour/jabber.c:574
 msgid "Cannot open socket"
 msgstr "No se pudo abrir el socket"
 
-#: ../libpurple/protocols/bonjour/jabber.c:469
+#: ../libpurple/protocols/bonjour/jabber.c:582
 msgid "Error setting socket options"
 msgstr "Error al establecer las opciones del socket"
 
-#: ../libpurple/protocols/bonjour/jabber.c:493
+#: ../libpurple/protocols/bonjour/jabber.c:606
 msgid "Could not bind socket to port"
 msgstr "No se pudo vincular el socket al puerto"
 
-#: ../libpurple/protocols/bonjour/jabber.c:501
+#: ../libpurple/protocols/bonjour/jabber.c:614
 msgid "Could not listen on socket"
 msgstr "No se pudo escuchar en el socket"
 
-#: ../libpurple/protocols/bonjour/jabber.c:599
-msgid "Unable to send the message, the conversation couldn't be started."
-msgstr "No se pudo enviar el mensaje, no se pudo iniciar la conversación."
-
-#: ../libpurple/protocols/gg/gg.c:76 ../libpurple/proxy.c:1800
+#: ../libpurple/protocols/gg/gg.c:76 ../libpurple/proxy.c:1812
 msgid "Invalid proxy settings"
 msgstr "Configuración inválida de proxy"
 
-#: ../libpurple/protocols/gg/gg.c:77 ../libpurple/proxy.c:1800
+#: ../libpurple/protocols/gg/gg.c:77 ../libpurple/proxy.c:1812
 msgid ""
 "Either the host name or port number specified for your given proxy type is "
 "invalid."
@@ -3173,8 +3223,8 @@
 msgstr "¡Se completó el registro con éxito!"
 
 #: ../libpurple/protocols/gg/gg.c:477 ../libpurple/protocols/gg/gg.c:770
-#: ../libpurple/protocols/jabber/jabber.c:803
-#: ../libpurple/protocols/jabber/jabber.c:1371
+#: ../libpurple/protocols/jabber/jabber.c:807
+#: ../libpurple/protocols/jabber/jabber.c:1367
 msgid "Password"
 msgstr "Contraseña"
 
@@ -3200,9 +3250,9 @@
 
 #: ../libpurple/protocols/gg/gg.c:637 ../libpurple/protocols/gg/gg.c:1049
 #: ../libpurple/protocols/gg/gg.c:1123
-#: ../libpurple/protocols/jabber/jabber.c:839
-#: ../libpurple/protocols/oscar/oscar.c:3776
-#: ../libpurple/protocols/oscar/oscar.c:3789
+#: ../libpurple/protocols/jabber/jabber.c:843
+#: ../libpurple/protocols/oscar/oscar.c:3803
+#: ../libpurple/protocols/oscar/oscar.c:3816
 #: ../libpurple/protocols/qq/buddy_info.c:49
 msgid "City"
 msgstr "Ciudad"
@@ -3211,8 +3261,8 @@
 msgid "Year of birth"
 msgstr "Año de nacimiento"
 
-#: ../libpurple/protocols/gg/gg.c:645 ../libpurple/protocols/msn/msn.c:1537
-#: ../libpurple/protocols/oscar/oscar.c:3719
+#: ../libpurple/protocols/gg/gg.c:645 ../libpurple/protocols/msn/msn.c:1558
+#: ../libpurple/protocols/oscar/oscar.c:3746
 #: ../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
@@ -3225,14 +3275,14 @@
 msgstr "Hombre o mujer"
 
 #: ../libpurple/protocols/gg/gg.c:647
-#: ../libpurple/protocols/oscar/oscar.c:3719
+#: ../libpurple/protocols/oscar/oscar.c:3746
 #: ../libpurple/protocols/qq/buddy_info.c:83
 #: ../libpurple/protocols/qq/qq.c:224
 msgid "Male"
 msgstr "Hombre"
 
 #: ../libpurple/protocols/gg/gg.c:648
-#: ../libpurple/protocols/oscar/oscar.c:3719
+#: ../libpurple/protocols/oscar/oscar.c:3746
 #: ../libpurple/protocols/qq/buddy_info.c:84
 #: ../libpurple/protocols/qq/qq.c:227
 msgid "Female"
@@ -3292,38 +3342,39 @@
 msgstr "Añadir al chat"
 
 #: ../libpurple/protocols/gg/gg.c:1003
-#: ../libpurple/protocols/jabber/buddy.c:1428
+#: ../libpurple/protocols/jabber/buddy.c:1462
 #: ../libpurple/protocols/novell/novell.c:2828
-#: ../libpurple/protocols/oscar/oscar.c:810
-#: ../libpurple/protocols/oscar/oscar.c:5514
+#: ../libpurple/protocols/oscar/oscar.c:828
+#: ../libpurple/protocols/oscar/oscar.c:5582
 #: ../libpurple/protocols/qq/qq.c:170 ../libpurple/protocols/qq/qq.c:177
-#: ../libpurple/protocols/yahoo/yahoo.c:2900 ../libpurple/status.c:153
-#: ../pidgin/gtkblist.c:3053 ../pidgin/gtkblist.c:3378
+#: ../libpurple/protocols/yahoo/yahoo.c:2917 ../libpurple/status.c:153
+#: ../pidgin/gtkblist.c:3074 ../pidgin/gtkblist.c:3402
 #: ../pidgin/gtkdocklet.c:450 ../pidgin/gtkstatusbox.c:1054
 msgid "Offline"
 msgstr "Desconectado"
 
 #: ../libpurple/protocols/gg/gg.c:1006
-#: ../libpurple/protocols/jabber/buddy.c:1430
+#: ../libpurple/protocols/jabber/buddy.c:1464
 #: ../libpurple/protocols/msn/state.c:29 ../libpurple/protocols/msn/state.c:30
 #: ../libpurple/protocols/msn/state.c:37 ../libpurple/protocols/msn/state.c:38
 #: ../libpurple/protocols/novell/novell.c:2816
-#: ../libpurple/protocols/yahoo/yahoo.c:2902 ../libpurple/status.c:154
+#: ../libpurple/protocols/yahoo/yahoo.c:2919 ../libpurple/status.c:154
 #: ../pidgin/gtkdocklet.c:438 ../pidgin/gtkstatusbox.c:1051
 msgid "Available"
 msgstr "Disponible"
 
 #: ../libpurple/protocols/gg/gg.c:1038 ../libpurple/protocols/gg/gg.c:1114
-#: ../libpurple/protocols/oscar/oscar.c:2655
-#: ../libpurple/protocols/oscar/oscar.c:3686
+#: ../libpurple/protocols/oscar/oscar.c:2675
+#: ../libpurple/protocols/oscar/oscar.c:3713
 msgid "UIN"
 msgstr "UIN"
 
 #: ../libpurple/protocols/gg/gg.c:1041 ../libpurple/protocols/gg/gg.c:1117
-#: ../libpurple/protocols/jabber/buddy.c:1585
-#: ../libpurple/protocols/jabber/buddy.c:1761
-#: ../libpurple/protocols/oscar/oscar.c:3697
-#: ../libpurple/protocols/silc/ops.c:1024
+#: ../libpurple/protocols/jabber/buddy.c:1619
+#: ../libpurple/protocols/jabber/buddy.c:1795
+#: ../libpurple/protocols/oscar/oscar.c:3724
+#: ../libpurple/protocols/silc/ops.c:990
+#: ../libpurple/protocols/silc10/ops.c:1024
 msgid "First Name"
 msgstr "Nombre"
 
@@ -3332,7 +3383,7 @@
 msgstr "Año de nacimiento"
 
 #: ../libpurple/protocols/gg/gg.c:1108 ../libpurple/protocols/gg/gg.c:1177
-#: ../libpurple/protocols/oscar/oscar.c:3898
+#: ../libpurple/protocols/oscar/oscar.c:3925
 msgid "Unable to display the search results."
 msgstr "No se pueden mostrar los resultados de la búsqueda."
 
@@ -3461,21 +3512,24 @@
 msgstr "Usuario de Gadu-Gadu"
 
 #: ../libpurple/protocols/irc/cmds.c:43
-#: ../libpurple/protocols/silc/silc.c:1577
+#: ../libpurple/protocols/silc/silc.c:1637
+#: ../libpurple/protocols/silc10/silc.c:1566
 #, c-format
 msgid "Unknown command: %s"
 msgstr "Orden desconocida: %s"
 
 #: ../libpurple/protocols/irc/cmds.c:503
 #: ../libpurple/protocols/jabber/chat.c:591
-#: ../libpurple/protocols/silc/silc.c:1285
+#: ../libpurple/protocols/silc/silc.c:1345
+#: ../libpurple/protocols/silc10/silc.c:1274
 #, c-format
 msgid "current topic is: %s"
 msgstr "el tema actual es: %s"
 
 #: ../libpurple/protocols/irc/cmds.c:507
 #: ../libpurple/protocols/jabber/chat.c:595
-#: ../libpurple/protocols/silc/silc.c:1289
+#: ../libpurple/protocols/silc/silc.c:1349
+#: ../libpurple/protocols/silc10/silc.c:1278
 msgid "No topic is set"
 msgstr "No hay tema establecido"
 
@@ -3519,11 +3573,12 @@
 msgstr "Ver MOTD"
 
 #: ../libpurple/protocols/irc/irc.c:261 ../libpurple/protocols/silc/chat.c:33
+#: ../libpurple/protocols/silc10/chat.c:33
 msgid "_Channel:"
 msgstr "_Canal:"
 
 #: ../libpurple/protocols/irc/irc.c:267
-#: ../libpurple/protocols/jabber/chat.c:59
+#: ../libpurple/protocols/jabber/chat.c:59 ../pidgin/gtkaccount.c:526
 msgid "_Password:"
 msgstr "Contra_seña:"
 
@@ -3533,21 +3588,21 @@
 
 #. connect to the server
 #: ../libpurple/protocols/irc/irc.c:319
-#: ../libpurple/protocols/jabber/jabber.c:1044
-#: ../libpurple/protocols/msn/session.c:344
+#: ../libpurple/protocols/jabber/jabber.c:1046
+#: ../libpurple/protocols/msn/session.c:345
 #: ../libpurple/protocols/novell/novell.c:2182
-#: ../libpurple/protocols/oscar/oscar.c:1270
+#: ../libpurple/protocols/oscar/oscar.c:1288
 #: ../libpurple/protocols/qq/qq.c:136
 #: ../libpurple/protocols/sametime/sametime.c:3723
 #: ../libpurple/protocols/simple/simple.c:1671
-#: ../libpurple/protocols/yahoo/yahoo.c:2745
+#: ../libpurple/protocols/yahoo/yahoo.c:2762
 #: ../libpurple/protocols/zephyr/zephyr.c:1621 ../pidgin/gtkstatusbox.c:659
 msgid "Connecting"
 msgstr "Conectando"
 
 #: ../libpurple/protocols/irc/irc.c:327
-#: ../libpurple/protocols/jabber/jabber.c:599
-#: ../libpurple/protocols/jabber/jabber.c:946
+#: ../libpurple/protocols/jabber/jabber.c:603
+#: ../libpurple/protocols/jabber/jabber.c:950
 msgid "SSL support unavailable"
 msgstr "Soporte SSL no disponible"
 
@@ -3558,18 +3613,17 @@
 msgstr "No se pudo crear el socket"
 
 #: ../libpurple/protocols/irc/irc.c:416
-#: ../libpurple/protocols/jabber/jabber.c:466
-#: ../libpurple/protocols/oscar/oscar.c:1266
+#: ../libpurple/protocols/oscar/oscar.c:1284
 msgid "Couldn't connect to host"
 msgstr "No se pudo conectar al servidor"
 
 #: ../libpurple/protocols/irc/irc.c:438
-#: ../libpurple/protocols/jabber/jabber.c:495
+#: ../libpurple/protocols/jabber/jabber.c:499
 msgid "Connection Failed"
 msgstr "Falló la conexión"
 
 #: ../libpurple/protocols/irc/irc.c:441
-#: ../libpurple/protocols/jabber/jabber.c:498
+#: ../libpurple/protocols/jabber/jabber.c:502
 msgid "SSL Handshake Failed"
 msgstr "Se produjo un fallo en la negociación SSL"
 
@@ -3578,15 +3632,18 @@
 msgstr "Error de lectura"
 
 #: ../libpurple/protocols/irc/irc.c:775
-#: ../libpurple/protocols/silc/chat.c:1426
+#: ../libpurple/protocols/silc/chat.c:1412
+#: ../libpurple/protocols/silc10/chat.c:1426
 #: ../libpurple/protocols/yahoo/yahoochat.c:1438
 msgid "Users"
 msgstr "Usuarios"
 
 #: ../libpurple/protocols/irc/irc.c:778
 #: ../libpurple/protocols/sametime/sametime.c:3374
-#: ../libpurple/protocols/silc/chat.c:1429
-#: ../libpurple/protocols/silc/ops.c:1382
+#: ../libpurple/protocols/silc/chat.c:1415
+#: ../libpurple/protocols/silc/ops.c:1389
+#: ../libpurple/protocols/silc10/chat.c:1429
+#: ../libpurple/protocols/silc10/ops.c:1382
 #: ../libpurple/protocols/yahoo/yahoochat.c:1447
 msgid "Topic"
 msgstr "Tema"
@@ -3599,55 +3656,65 @@
 #. *< id
 #. *< name
 #. *< version
-#: ../libpurple/protocols/irc/irc.c:915
+#: ../libpurple/protocols/irc/irc.c:916
 msgid "IRC Protocol Plugin"
 msgstr "Complemento de protocolo IRC"
 
 #. *  summary
-#: ../libpurple/protocols/irc/irc.c:916
+#: ../libpurple/protocols/irc/irc.c:917
 msgid "The IRC Protocol Plugin that Sucks Less"
 msgstr "Complemento de protocolo IRC menos malo"
 
 #. host to connect to
-#: ../libpurple/protocols/irc/irc.c:941 ../libpurple/protocols/irc/msgs.c:323
-#: ../libpurple/protocols/msn/msn.c:2130
-#: ../libpurple/protocols/oscar/oscar.c:6581
+#: ../libpurple/protocols/irc/irc.c:942 ../libpurple/protocols/irc/msgs.c:323
+#: ../libpurple/protocols/msn/msn.c:2154
+#: ../libpurple/protocols/oscar/oscar.c:6649
 #: ../libpurple/protocols/qq/qq.c:756
 #: ../libpurple/protocols/sametime/sametime.c:5727
-#: ../libpurple/protocols/silc/ops.c:1244
-#: ../libpurple/protocols/silc/ops.c:1347
+#: ../libpurple/protocols/silc/ops.c:1249
+#: ../libpurple/protocols/silc/ops.c:1341
+#: ../libpurple/protocols/silc10/ops.c:1244
+#: ../libpurple/protocols/silc10/ops.c:1347
 #: ../libpurple/protocols/simple/simple.c:1850
 #: ../libpurple/protocols/toc/toc.c:2327
 msgid "Server"
 msgstr "Servidor"
 
 #. port to connect to
-#: ../libpurple/protocols/irc/irc.c:944 ../libpurple/protocols/msn/msn.c:2135
-#: ../libpurple/protocols/oscar/oscar.c:6584
+#: ../libpurple/protocols/irc/irc.c:945 ../libpurple/protocols/msn/msn.c:2159
+#: ../libpurple/protocols/oscar/oscar.c:6652
 #: ../libpurple/protocols/qq/qq.c:759
 #: ../libpurple/protocols/sametime/sametime.c:5732
-#: ../libpurple/protocols/silc/silc.c:1870
+#: ../libpurple/protocols/silc/silc.c:1918
+#: ../libpurple/protocols/silc10/silc.c:1861
 #: ../libpurple/protocols/toc/toc.c:2331
 msgid "Port"
 msgstr "Puerto"
 
-#: ../libpurple/protocols/irc/irc.c:947
+#: ../libpurple/protocols/irc/irc.c:948
 msgid "Encodings"
 msgstr "Codificaciones"
 
-#: ../libpurple/protocols/irc/irc.c:950 ../libpurple/protocols/irc/msgs.c:316
-#: ../libpurple/protocols/jabber/jabber.c:799
+#: ../libpurple/protocols/irc/irc.c:951 ../libpurple/protocols/irc/msgs.c:316
+#: ../libpurple/protocols/jabber/jabber.c:803
 #: ../libpurple/protocols/silc/buddy.c:1539
-#: ../libpurple/protocols/silc/ops.c:1191
-#: ../libpurple/protocols/silc/ops.c:1194
-#: ../libpurple/protocols/silc/ops.c:1340
-#: ../libpurple/protocols/silc/ops.c:1343
-#: ../libpurple/protocols/silc/silc.c:924
+#: ../libpurple/protocols/silc/ops.c:1197
+#: ../libpurple/protocols/silc/ops.c:1200
+#: ../libpurple/protocols/silc/ops.c:1334
+#: ../libpurple/protocols/silc/ops.c:1337
+#: ../libpurple/protocols/silc/silc.c:1005
+#: ../libpurple/protocols/silc10/buddy.c:1539
+#: ../libpurple/protocols/silc10/ops.c:1191
+#: ../libpurple/protocols/silc10/ops.c:1194
+#: ../libpurple/protocols/silc10/ops.c:1340
+#: ../libpurple/protocols/silc10/ops.c:1343
+#: ../libpurple/protocols/silc10/silc.c:916
 msgid "Username"
 msgstr "Nombre de usuario"
 
-#: ../libpurple/protocols/irc/irc.c:953 ../libpurple/protocols/irc/msgs.c:317
-#: ../libpurple/protocols/silc/silc.c:928
+#: ../libpurple/protocols/irc/irc.c:954 ../libpurple/protocols/irc/msgs.c:317
+#: ../libpurple/protocols/silc/silc.c:1009
+#: ../libpurple/protocols/silc10/silc.c:920
 msgid "Real name"
 msgstr "Nombre real"
 
@@ -3655,7 +3722,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:961
+#: ../libpurple/protocols/irc/irc.c:962
 msgid "Use SSL"
 msgstr "Usar SSL"
 
@@ -3687,13 +3754,15 @@
 msgstr " <i>(identificado)</i>"
 
 #: ../libpurple/protocols/irc/msgs.c:303
-#: ../libpurple/protocols/oscar/oscar.c:3687
-#: ../libpurple/protocols/silc/ops.c:1414
+#: ../libpurple/protocols/oscar/oscar.c:3714
+#: ../libpurple/protocols/silc/ops.c:1418
+#: ../libpurple/protocols/silc10/ops.c:1414
 msgid "Nick"
 msgstr "Apodo"
 
 #: ../libpurple/protocols/irc/msgs.c:329
-#: ../libpurple/protocols/silc/ops.c:1272
+#: ../libpurple/protocols/silc/ops.c:1268
+#: ../libpurple/protocols/silc10/ops.c:1272
 msgid "Currently on"
 msgstr "Actualmente en"
 
@@ -3713,98 +3782,99 @@
 msgid "Glorious"
 msgstr "Glorioso"
 
-#: ../libpurple/protocols/irc/msgs.c:417
+#: ../libpurple/protocols/irc/msgs.c:420
 #, c-format
 msgid "%s has changed the topic to: %s"
 msgstr "%s ha cambiado el tema a: %s"
 
-#: ../libpurple/protocols/irc/msgs.c:419
+#: ../libpurple/protocols/irc/msgs.c:422
 #, c-format
 msgid "%s has cleared the topic."
 msgstr "%s ha borrado el tema."
 
-#: ../libpurple/protocols/irc/msgs.c:427
+#: ../libpurple/protocols/irc/msgs.c:430
 #, c-format
 msgid "The topic for %s is: %s"
 msgstr "El tema de %s es: %s"
 
-#: ../libpurple/protocols/irc/msgs.c:445
+#: ../libpurple/protocols/irc/msgs.c:448
 #, c-format
 msgid "Unknown message '%s'"
 msgstr "Mensaje desconocido '%s'"
 
-#: ../libpurple/protocols/irc/msgs.c:446
+#: ../libpurple/protocols/irc/msgs.c:449
 msgid "Unknown message"
 msgstr "Mensaje desconocido"
 
-#: ../libpurple/protocols/irc/msgs.c:446
+#: ../libpurple/protocols/irc/msgs.c:449
 msgid "The IRC server received a message it did not understand."
 msgstr "El servidor IRC ha recibido un mensaje que no pudo entender."
 
-#: ../libpurple/protocols/irc/msgs.c:467
+#: ../libpurple/protocols/irc/msgs.c:470
 #, c-format
 msgid "Users on %s: %s"
 msgstr "Usuarios en %s: %s"
 
-#: ../libpurple/protocols/irc/msgs.c:572
+#: ../libpurple/protocols/irc/msgs.c:575
 msgid "Time Response"
 msgstr "Respuesta de hora"
 
-#: ../libpurple/protocols/irc/msgs.c:573
+#: ../libpurple/protocols/irc/msgs.c:576
 msgid "The IRC server's local time is:"
 msgstr "La hora local del servidor de IRC es:"
 
-#: ../libpurple/protocols/irc/msgs.c:584
+#: ../libpurple/protocols/irc/msgs.c:587
 msgid "No such channel"
 msgstr "No existe ese canal"
 
 #. does this happen?
-#: ../libpurple/protocols/irc/msgs.c:595
+#: ../libpurple/protocols/irc/msgs.c:598
 msgid "no such channel"
 msgstr "no existe el canal"
 
-#: ../libpurple/protocols/irc/msgs.c:598
+#: ../libpurple/protocols/irc/msgs.c:601
 msgid "User is not logged in"
 msgstr "El usuario no está conectado"
 
-#: ../libpurple/protocols/irc/msgs.c:603
+#: ../libpurple/protocols/irc/msgs.c:606
 msgid "No such nick or channel"
 msgstr "No existe el apodo o canal"
 
-#: ../libpurple/protocols/irc/msgs.c:623
+#: ../libpurple/protocols/irc/msgs.c:626
 msgid "Could not send"
 msgstr "No se pudo enviar"
 
-#: ../libpurple/protocols/irc/msgs.c:679
+#: ../libpurple/protocols/irc/msgs.c:682
 #, c-format
 msgid "Joining %s requires an invitation."
 msgstr "Para unirse a %s es necesaria una invitación."
 
-#: ../libpurple/protocols/irc/msgs.c:680
+#: ../libpurple/protocols/irc/msgs.c:683
 msgid "Invitation only"
 msgstr "Sólo con invitación"
 
-#: ../libpurple/protocols/irc/msgs.c:792
+#: ../libpurple/protocols/irc/msgs.c:795
 #, c-format
 msgid "You have been kicked by %s: (%s)"
 msgstr "Ha sido expulsado por %s: (%s)"
 
 #. Remove user from channel
-#: ../libpurple/protocols/irc/msgs.c:797 ../libpurple/protocols/silc/ops.c:720
+#: ../libpurple/protocols/irc/msgs.c:800 ../libpurple/protocols/silc/ops.c:699
+#: ../libpurple/protocols/silc10/ops.c:720
 #, c-format
 msgid "Kicked by %s (%s)"
 msgstr "Expulsado por %s (%s)"
 
-#: ../libpurple/protocols/irc/msgs.c:820
+#: ../libpurple/protocols/irc/msgs.c:823
 #, c-format
 msgid "mode (%s %s) by %s"
 msgstr "modo (%s %s) por %s"
 
-#: ../libpurple/protocols/irc/msgs.c:905 ../libpurple/protocols/irc/msgs.c:906
+#: ../libpurple/protocols/irc/msgs.c:908 ../libpurple/protocols/irc/msgs.c:909
 msgid "Invalid nickname"
 msgstr "Apodo inválido"
 
-#: ../libpurple/protocols/irc/msgs.c:907
+#: ../libpurple/protocols/irc/msgs.c:910
 msgid ""
 "Your selected nickname was rejected by the server.  It probably contains "
 "invalid characters."
@@ -3812,7 +3882,7 @@
 "El servidor rechazó el nombre que escogió para su cuenta. Es posible que "
 "incluya caracteres inválidos."
 
-#: ../libpurple/protocols/irc/msgs.c:912
+#: ../libpurple/protocols/irc/msgs.c:915
 msgid ""
 "Your selected account name was rejected by the server.  It probably contains "
 "invalid characters."
@@ -3820,43 +3890,44 @@
 "El servidor rechazó el nombre que escogió para su cuenta. Es posible que "
 "incluya caracteres inválidos."
 
-#: ../libpurple/protocols/irc/msgs.c:951
+#: ../libpurple/protocols/irc/msgs.c:954
 msgid "Cannot change nick"
 msgstr "No se puede cambiar el alias"
 
-#: ../libpurple/protocols/irc/msgs.c:951
+#: ../libpurple/protocols/irc/msgs.c:954
 msgid "Could not change nick"
 msgstr "No se pudo cambiar el alias"
 
-#: ../libpurple/protocols/irc/msgs.c:972
+#: ../libpurple/protocols/irc/msgs.c:975
 #, c-format
 msgid "You have parted the channel%s%s"
 msgstr "Ha abandonado el canal %s%s"
 
-#: ../libpurple/protocols/irc/msgs.c:1014
+#: ../libpurple/protocols/irc/msgs.c:1017
 msgid "Error: invalid PONG from server"
 msgstr "Error: PONG inválido del servidor"
 
-#: ../libpurple/protocols/irc/msgs.c:1016
+#: ../libpurple/protocols/irc/msgs.c:1019
 #, c-format
 msgid "PING reply -- Lag: %lu seconds"
 msgstr "Respuesta PING -- Retraso: %lu segundos"
 
-#: ../libpurple/protocols/irc/msgs.c:1097
+#: ../libpurple/protocols/irc/msgs.c:1110
 #, c-format
 msgid "Cannot join %s: Registration is required."
 msgstr "No se pudo unir a %s: es necesario registrarse"
 
-#: ../libpurple/protocols/irc/msgs.c:1098
-#: ../libpurple/protocols/silc/ops.c:1128
+#: ../libpurple/protocols/irc/msgs.c:1111
+#: ../libpurple/protocols/silc/ops.c:1093
+#: ../libpurple/protocols/silc10/ops.c:1128
 msgid "Cannot join channel"
 msgstr "No se puede unir al canal"
 
-#: ../libpurple/protocols/irc/msgs.c:1132
+#: ../libpurple/protocols/irc/msgs.c:1145
 msgid "Nick or channel is temporarily unavailable."
 msgstr "El apodo o el canal están temporalmente no disponibles."
 
-#: ../libpurple/protocols/irc/msgs.c:1144
+#: ../libpurple/protocols/irc/msgs.c:1157
 #, c-format
 msgid "Wallops from %s"
 msgstr "Mensajes globales de %s"
@@ -3965,7 +4036,7 @@
 "names [canal]:  Obtener la lista de los usuarios que están en el canal."
 
 #: ../libpurple/protocols/irc/parse.c:137
-#: ../libpurple/protocols/jabber/jabber.c:1813
+#: ../libpurple/protocols/jabber/jabber.c:1809
 msgid "nick &lt;new nickname&gt;:  Change your nickname."
 msgstr "nick &lt;nuevo apodo&gt;:  Cambia su apodo."
 
@@ -4073,23 +4144,25 @@
 
 #: ../libpurple/protocols/irc/parse.c:155
 msgid "whowas &lt;nick&gt;: Get information on a user that has logged off."
-msgstr "whowas &lt;apodo&gt;:  Obtiene información de un usuario que se ha desconectado."
-
-#: ../libpurple/protocols/irc/parse.c:449
+msgstr ""
+"whowas &lt;apodo&gt;:  Obtiene información de un usuario que se ha "
+"desconectado."
+
+#: ../libpurple/protocols/irc/parse.c:465
 #, c-format
 msgid "Reply time from %s: %lu seconds"
 msgstr "Tiempo de respuesta de %s: %lu segundos"
 
-#: ../libpurple/protocols/irc/parse.c:450
+#: ../libpurple/protocols/irc/parse.c:466
 msgid "PONG"
 msgstr "PONG"
 
-#: ../libpurple/protocols/irc/parse.c:450
+#: ../libpurple/protocols/irc/parse.c:466
 msgid "CTCP PING reply"
 msgstr "Respuesta a PING CTCP"
 
-#: ../libpurple/protocols/irc/parse.c:561
-#: ../libpurple/protocols/irc/parse.c:565 ../libpurple/protocols/toc/toc.c:191
+#: ../libpurple/protocols/irc/parse.c:577
+#: ../libpurple/protocols/irc/parse.c:581 ../libpurple/protocols/toc/toc.c:191
 #: ../libpurple/protocols/toc/toc.c:694 ../libpurple/protocols/toc/toc.c:710
 #: ../libpurple/protocols/toc/toc.c:786
 msgid "Disconnected."
@@ -4110,7 +4183,9 @@
 msgid ""
 "%s requires plaintext authentication over an unencrypted connection.  Allow "
 "this and continue authentication?"
-msgstr "%s solicita autenticación en claro sobre un canal no cifrado. ¿Desea permitir ésto y continuar con el proceso de autenticación?"
+msgstr ""
+"%s solicita autenticación en claro sobre un canal no cifrado. ¿Desea "
+"permitir ésto y continuar con el proceso de autenticación?"
 
 #: ../libpurple/protocols/jabber/auth.c:296
 #: ../libpurple/protocols/jabber/auth.c:297
@@ -4130,10 +4205,10 @@
 #. This should never happen!
 #: ../libpurple/protocols/jabber/auth.c:437
 #: ../libpurple/protocols/jabber/auth.c:533
-#: ../libpurple/protocols/jabber/auth.c:714
-#: ../libpurple/protocols/jabber/auth.c:848
-#: ../libpurple/protocols/jabber/auth.c:873
-#: ../libpurple/protocols/jabber/auth.c:892
+#: ../libpurple/protocols/jabber/auth.c:748
+#: ../libpurple/protocols/jabber/auth.c:889
+#: ../libpurple/protocols/jabber/auth.c:914
+#: ../libpurple/protocols/jabber/auth.c:933
 #: ../libpurple/protocols/jabber/jabber.c:115
 msgid "Invalid response from server."
 msgstr "Respuesta inválida del servidor."
@@ -4146,109 +4221,115 @@
 "El servidor solicita autenticación en claro sobre un canal no cifrado. "
 "¿Permitir ésto y continuar con el proceso de autenticación?"
 
-#: ../libpurple/protocols/jabber/auth.c:735
+#: ../libpurple/protocols/jabber/auth.c:769
+#: ../libpurple/protocols/jabber/auth.c:792
 msgid "Invalid challenge from server"
 msgstr "Desafío inválido del servidor"
 
-#: ../libpurple/protocols/jabber/auth.c:823
+#: ../libpurple/protocols/jabber/auth.c:864
 msgid "SASL error"
 msgstr "Error de SASL"
 
 #: ../libpurple/protocols/jabber/buddy.c:271
-#: ../libpurple/protocols/jabber/buddy.c:787
+#: ../libpurple/protocols/jabber/buddy.c:821
 #: ../libpurple/protocols/sametime/sametime.c:4128
-#: ../libpurple/protocols/silc/ops.c:1020
+#: ../libpurple/protocols/silc/ops.c:986
+#: ../libpurple/protocols/silc10/ops.c:1020
 msgid "Full Name"
 msgstr "Nombre completo"
 
 #: ../libpurple/protocols/jabber/buddy.c:272
-#: ../libpurple/protocols/jabber/buddy.c:800
-#: ../libpurple/protocols/silc/ops.c:1032
+#: ../libpurple/protocols/jabber/buddy.c:834
+#: ../libpurple/protocols/silc/ops.c:998
+#: ../libpurple/protocols/silc10/ops.c:1032
 msgid "Family Name"
 msgstr "Apellidos"
 
 #: ../libpurple/protocols/jabber/buddy.c:273
-#: ../libpurple/protocols/jabber/buddy.c:804
+#: ../libpurple/protocols/jabber/buddy.c:838
 msgid "Given Name"
 msgstr "Nombre propio"
 
 #: ../libpurple/protocols/jabber/buddy.c:275
-#: ../libpurple/protocols/jabber/jabber.c:859
+#: ../libpurple/protocols/jabber/jabber.c:863
 msgid "URL"
 msgstr "URL"
 
 #: ../libpurple/protocols/jabber/buddy.c:276
-#: ../libpurple/protocols/jabber/buddy.c:856
+#: ../libpurple/protocols/jabber/buddy.c:890
 msgid "Street Address"
 msgstr "Calle"
 
 #: ../libpurple/protocols/jabber/buddy.c:277
-#: ../libpurple/protocols/jabber/buddy.c:852
+#: ../libpurple/protocols/jabber/buddy.c:886
 msgid "Extended Address"
 msgstr "Dirección extendida"
 
 #: ../libpurple/protocols/jabber/buddy.c:278
-#: ../libpurple/protocols/jabber/buddy.c:860
+#: ../libpurple/protocols/jabber/buddy.c:894
 msgid "Locality"
 msgstr "Localidad"
 
 #: ../libpurple/protocols/jabber/buddy.c:279
-#: ../libpurple/protocols/jabber/buddy.c:864
+#: ../libpurple/protocols/jabber/buddy.c:898
 msgid "Region"
 msgstr "Región"
 
 #: ../libpurple/protocols/jabber/buddy.c:280
-#: ../libpurple/protocols/jabber/buddy.c:868
+#: ../libpurple/protocols/jabber/buddy.c:902
 msgid "Postal Code"
 msgstr "Código postal"
 
 #: ../libpurple/protocols/jabber/buddy.c:281
-#: ../libpurple/protocols/jabber/buddy.c:873
-#: ../libpurple/protocols/silc/silc.c:934
+#: ../libpurple/protocols/jabber/buddy.c:907
+#: ../libpurple/protocols/silc/silc.c:1015
+#: ../libpurple/protocols/silc10/silc.c:926
 msgid "Country"
 msgstr "País"
 
 #: ../libpurple/protocols/jabber/buddy.c:282
-#: ../libpurple/protocols/jabber/buddy.c:884
-#: ../libpurple/protocols/jabber/buddy.c:891
+#: ../libpurple/protocols/jabber/buddy.c:918
+#: ../libpurple/protocols/jabber/buddy.c:925
 msgid "Telephone"
 msgstr "Teléfono"
 
 #: ../libpurple/protocols/jabber/buddy.c:283
-#: ../libpurple/protocols/jabber/buddy.c:902
-#: ../libpurple/protocols/jabber/buddy.c:910
-#: ../libpurple/protocols/jabber/buddy.c:1591
-#: ../libpurple/protocols/silc/ops.c:1075
-#: ../libpurple/protocols/silc/util.c:551
+#: ../libpurple/protocols/jabber/buddy.c:936
+#: ../libpurple/protocols/jabber/buddy.c:944
+#: ../libpurple/protocols/jabber/buddy.c:1625
+#: ../libpurple/protocols/silc/ops.c:1041
+#: ../libpurple/protocols/silc/util.c:555
+#: ../libpurple/protocols/silc10/ops.c:1075
+#: ../libpurple/protocols/silc10/util.c:551
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1037
 msgid "E-Mail"
 msgstr "Correo electrónico"
 
 #: ../libpurple/protocols/jabber/buddy.c:284
-#: ../libpurple/protocols/jabber/buddy.c:925
+#: ../libpurple/protocols/jabber/buddy.c:959
 msgid "Organization Name"
 msgstr "Nombre de la organización"
 
 #: ../libpurple/protocols/jabber/buddy.c:285
-#: ../libpurple/protocols/jabber/buddy.c:929
+#: ../libpurple/protocols/jabber/buddy.c:963
 msgid "Organization Unit"
 msgstr "Grupo de trabajo"
 
 #: ../libpurple/protocols/jabber/buddy.c:287
-#: ../libpurple/protocols/jabber/buddy.c:938
+#: ../libpurple/protocols/jabber/buddy.c:972
 msgid "Role"
 msgstr "Rol"
 
 #: ../libpurple/protocols/jabber/buddy.c:288
-#: ../libpurple/protocols/jabber/buddy.c:821
-#: ../libpurple/protocols/msn/msn.c:1606
-#: ../libpurple/protocols/oscar/oscar.c:3736
+#: ../libpurple/protocols/jabber/buddy.c:855
+#: ../libpurple/protocols/msn/msn.c:1627
+#: ../libpurple/protocols/oscar/oscar.c:3763
 msgid "Birthday"
 msgstr "Cumpleaños"
 
 #: ../libpurple/protocols/jabber/buddy.c:289
-#: ../libpurple/protocols/jabber/buddy.c:941
-#: ../libpurple/protocols/jabber/chat.c:775 ../pidgin/gtkblist.c:3064
+#: ../libpurple/protocols/jabber/buddy.c:975
+#: ../libpurple/protocols/jabber/chat.c:775 ../pidgin/gtkblist.c:3085
 #: ../pidgin/gtkprefs.c:680
 msgid "Description"
 msgstr "Descripción"
@@ -4277,102 +4358,105 @@
 msgstr "Sistema operativo"
 
 #: ../libpurple/protocols/jabber/buddy.c:665
-#: ../libpurple/protocols/jabber/libxmpp.c:198
+#: ../libpurple/protocols/jabber/libxmpp.c:201
+#: ../libpurple/protocols/jabber/si.c:853
 msgid "Resource"
 msgstr "Recurso"
 
 #: ../libpurple/protocols/jabber/buddy.c:667
-#: ../libpurple/protocols/jabber/jabber.c:1245
-#: ../libpurple/protocols/jabber/jabber.c:1255
-#: ../libpurple/protocols/jabber/jabber.c:1265
-#: ../libpurple/protocols/jabber/jabber.c:1275
-#: ../libpurple/protocols/jabber/jabber.c:1285
+#: ../libpurple/protocols/jabber/jabber.c: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 "Prioridad"
 
-#: ../libpurple/protocols/jabber/buddy.c:808
-#: ../libpurple/protocols/silc/ops.c:1028
+#: ../libpurple/protocols/jabber/buddy.c:842
+#: ../libpurple/protocols/silc/ops.c:994
+#: ../libpurple/protocols/silc10/ops.c:1028
 msgid "Middle Name"
 msgstr "Nombre medio"
 
-#: ../libpurple/protocols/jabber/buddy.c:841
-#: ../libpurple/protocols/jabber/jabber.c:834
-#: ../libpurple/protocols/oscar/oscar.c:3775
-#: ../libpurple/protocols/oscar/oscar.c:3788
+#: ../libpurple/protocols/jabber/buddy.c:875
+#: ../libpurple/protocols/jabber/jabber.c:838
+#: ../libpurple/protocols/oscar/oscar.c:3802
+#: ../libpurple/protocols/oscar/oscar.c:3815
 #: ../libpurple/protocols/qq/buddy_info.c:56
-#: ../libpurple/protocols/silc/ops.c:1064
+#: ../libpurple/protocols/silc/ops.c:1030
+#: ../libpurple/protocols/silc10/ops.c:1064
 msgid "Address"
 msgstr "Dirección"
 
-#: ../libpurple/protocols/jabber/buddy.c:848
+#: ../libpurple/protocols/jabber/buddy.c:882
 msgid "P.O. Box"
 msgstr "Código postal"
 
-#: ../libpurple/protocols/jabber/buddy.c:962
+#: ../libpurple/protocols/jabber/buddy.c:996
 msgid "Photo"
 msgstr "Foto"
 
-#: ../libpurple/protocols/jabber/buddy.c:962
+#: ../libpurple/protocols/jabber/buddy.c:996
 msgid "Logo"
 msgstr "Logotipo"
 
-#: ../libpurple/protocols/jabber/buddy.c:1371
+#: ../libpurple/protocols/jabber/buddy.c:1405
 msgid "Un-hide From"
 msgstr "No ocultarse de"
 
-#: ../libpurple/protocols/jabber/buddy.c:1375
+#: ../libpurple/protocols/jabber/buddy.c:1409
 msgid "Temporarily Hide From"
 msgstr "Ocultarse temporalmente de"
 
 #. && NOT ME
-#: ../libpurple/protocols/jabber/buddy.c:1383
+#: ../libpurple/protocols/jabber/buddy.c:1417
 msgid "Cancel Presence Notification"
 msgstr "Cancelar notificación de presencia"
 
-#: ../libpurple/protocols/jabber/buddy.c:1390
+#: ../libpurple/protocols/jabber/buddy.c:1424
 msgid "(Re-)Request authorization"
 msgstr "Volver a pedir autorización"
 
 #. if(NOT ME)
 #. shouldn't this just happen automatically when the buddy is
 #. removed?
-#: ../libpurple/protocols/jabber/buddy.c:1399
+#: ../libpurple/protocols/jabber/buddy.c:1433
 msgid "Unsubscribe"
 msgstr "De-suscribir"
 
-#: ../libpurple/protocols/jabber/buddy.c:1432
-#: ../libpurple/protocols/jabber/jabber.c:1254
+#: ../libpurple/protocols/jabber/buddy.c:1466
+#: ../libpurple/protocols/jabber/jabber.c:1250
 msgid "Chatty"
 msgstr "Hablador"
 
-#: ../libpurple/protocols/jabber/buddy.c:1436 ../libpurple/status.c:158
+#: ../libpurple/protocols/jabber/buddy.c:1470 ../libpurple/status.c:158
 msgid "Extended Away"
 msgstr "Ausencia extendida"
 
-#: ../libpurple/protocols/jabber/buddy.c:1438
-#: ../libpurple/protocols/jabber/jabber.c:1284
-#: ../libpurple/protocols/oscar/oscar.c:709
-#: ../libpurple/protocols/oscar/oscar.c:5718
+#: ../libpurple/protocols/jabber/buddy.c:1472
+#: ../libpurple/protocols/jabber/jabber.c:1280
+#: ../libpurple/protocols/oscar/oscar.c:727
+#: ../libpurple/protocols/oscar/oscar.c:5786
 #: ../libpurple/protocols/sametime/sametime.c:3297
 msgid "Do Not Disturb"
 msgstr "No molestar"
 
-#: ../libpurple/protocols/jabber/buddy.c:1583
+#: ../libpurple/protocols/jabber/buddy.c:1617
 msgid "JID"
 msgstr "JID"
 
-#: ../libpurple/protocols/jabber/buddy.c:1587
-#: ../libpurple/protocols/jabber/buddy.c:1766
-#: ../libpurple/protocols/oscar/oscar.c:3698
+#: ../libpurple/protocols/jabber/buddy.c:1621
+#: ../libpurple/protocols/jabber/buddy.c:1800
+#: ../libpurple/protocols/oscar/oscar.c:3725
 msgid "Last Name"
 msgstr "Apellidos"
 
-#: ../libpurple/protocols/jabber/buddy.c:1619
+#: ../libpurple/protocols/jabber/buddy.c:1653
 msgid "The following are the results of your search"
 msgstr "Éstos son los resultados de su búsqueda"
 
 #. current comment from Jabber User Directory users.jabber.org
-#: ../libpurple/protocols/jabber/buddy.c:1694
+#: ../libpurple/protocols/jabber/buddy.c:1728
 msgid ""
 "Find a contact by entering the search criteria in the given fields. Note: "
 "Each field supports wild card searches (%)"
@@ -4380,68 +4464,70 @@
 "Encuentra un contacto al introducir los criterios de búsqueda en los campos "
 "proporcionados. Nota: puede hacer búsquedas con comodines (%) en cada campo."
 
-#: ../libpurple/protocols/jabber/buddy.c:1714
+#: ../libpurple/protocols/jabber/buddy.c:1748
 msgid "Directory Query Failed"
 msgstr "Falló la consulta al directorio"
 
-#: ../libpurple/protocols/jabber/buddy.c:1715
+#: ../libpurple/protocols/jabber/buddy.c:1749
 msgid "Could not query the directory server."
 msgstr "No se pudo consultar con el servidor de directorio."
 
 #. Try to translate the message (see static message
 #. list in jabber_user_dir_comments[])
-#: ../libpurple/protocols/jabber/buddy.c:1749
+#: ../libpurple/protocols/jabber/buddy.c:1783
 #, c-format
 msgid "Server Instructions: %s"
 msgstr "Instrucciones del servidor: %s"
 
-#: ../libpurple/protocols/jabber/buddy.c:1756
+#: ../libpurple/protocols/jabber/buddy.c:1790
 msgid "Fill in one or more fields to search for any matching XMPP users."
-msgstr "Rellene uno o más de los campos mostrados a continuación para buscar a un usuario XMPP cuyos datos coincidan."
-
-#: ../libpurple/protocols/jabber/buddy.c:1776
+msgstr ""
+"Rellene uno o más de los campos mostrados a continuación para buscar a un "
+"usuario XMPP cuyos datos coincidan."
+
+#: ../libpurple/protocols/jabber/buddy.c:1810
 #: ../libpurple/protocols/novell/novell.c:1488
-#: ../libpurple/protocols/oscar/oscar.c:3701
-#: ../libpurple/protocols/oscar/oscar.c:3710
+#: ../libpurple/protocols/oscar/oscar.c:3728
+#: ../libpurple/protocols/oscar/oscar.c:3737
 msgid "E-Mail Address"
 msgstr "Dirección de correo electrónico"
 
-#: ../libpurple/protocols/jabber/buddy.c:1785
-#: ../libpurple/protocols/jabber/buddy.c:1786
+#: ../libpurple/protocols/jabber/buddy.c:1819
+#: ../libpurple/protocols/jabber/buddy.c:1820
 msgid "Search for XMPP users"
 msgstr "Buscar un usuario XMPP"
 
 #. "Search"
-#: ../libpurple/protocols/jabber/buddy.c:1787
+#: ../libpurple/protocols/jabber/buddy.c:1821
 #: ../libpurple/protocols/qq/group.c:123
 #: ../libpurple/protocols/qq/group_im.c:145
 #: ../libpurple/protocols/qq/sys_msg.c:176
 #: ../libpurple/protocols/qq/sys_msg.c:253
 #: ../libpurple/protocols/qq/sys_msg.c:271
 #: ../libpurple/protocols/sametime/sametime.c:5611
-#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:473
-#: ../pidgin/plugins/gevolution/assoc-buddy.c:358
+#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:470
+#: ../pidgin/plugins/gevolution/assoc-buddy.c:356
 msgid "Search"
 msgstr "Buscar"
 
-#: ../libpurple/protocols/jabber/buddy.c:1802
+#: ../libpurple/protocols/jabber/buddy.c:1836
 msgid "Invalid Directory"
 msgstr "Directorio inválido"
 
-#: ../libpurple/protocols/jabber/buddy.c:1819
+#: ../libpurple/protocols/jabber/buddy.c:1853
 msgid "Enter a User Directory"
 msgstr "Introduzca un directorio de usuario"
 
-#: ../libpurple/protocols/jabber/buddy.c:1820
+#: ../libpurple/protocols/jabber/buddy.c:1854
 msgid "Select a user directory to search"
 msgstr "Selecciona un directorio de usuario donde buscar"
 
-#: ../libpurple/protocols/jabber/buddy.c:1823
+#: ../libpurple/protocols/jabber/buddy.c:1857
 msgid "Search Directory"
 msgstr "Buscar en el directorio"
 
 #: ../libpurple/protocols/jabber/chat.c:41
-#: ../libpurple/protocols/oscar/oscar.c:5224
+#: ../libpurple/protocols/oscar/oscar.c:5272
 #: ../libpurple/protocols/yahoo/yahoochat.c:999
 msgid "_Room:"
 msgstr "_Sala:"
@@ -4511,7 +4597,8 @@
 
 #: ../libpurple/protocols/jabber/chat.c:678
 #: ../libpurple/protocols/jabber/chat.c:689
-#: ../libpurple/protocols/silc/ops.c:1451
+#: ../libpurple/protocols/silc/ops.c:1456
+#: ../libpurple/protocols/silc10/ops.c:1451
 msgid "Error retrieving room list"
 msgstr "Error al obtener la lista de salas"
 
@@ -4546,426 +4633,448 @@
 msgid "Read Error"
 msgstr "Error de lectura"
 
-#: ../libpurple/protocols/jabber/jabber.c:519
+#: ../libpurple/protocols/jabber/jabber.c:467
+#: ../libpurple/protocols/oscar/flap_connection.c:386
+#: ../libpurple/protocols/yahoo/yahoo.c:2381
+#: ../libpurple/protocols/yahoo/yahoo.c:2413
+#, c-format
+msgid ""
+"Could not establish a connection with the server:\n"
+"%s"
+msgstr ""
+"No se pudo establecer una conexión con el servidor:\n"
+"%s"
+
+#: ../libpurple/protocols/jabber/jabber.c:523
 msgid "Unable to create socket"
 msgstr "No se pudo crear el socket"
 
-#: ../libpurple/protocols/jabber/jabber.c:564
-#: ../libpurple/protocols/jabber/jabber.c:914
+#: ../libpurple/protocols/jabber/jabber.c:568
+#: ../libpurple/protocols/jabber/jabber.c:918
 msgid "Invalid XMPP ID"
 msgstr "XMPP ID no válido"
 
-#: ../libpurple/protocols/jabber/jabber.c:569
+#: ../libpurple/protocols/jabber/jabber.c:573
 msgid "Invalid XMPP ID. Domain must be set."
 msgstr "XMPP ID inválido. Debe establecerse el dominio."
 
-#: ../libpurple/protocols/jabber/jabber.c:640
+#: ../libpurple/protocols/jabber/jabber.c:644
 #, c-format
 msgid "Registration of %s@%s successful"
 msgstr "Registro de %s@%s efectuado con éxito"
 
-#: ../libpurple/protocols/jabber/jabber.c:642
-#: ../libpurple/protocols/jabber/jabber.c:643
+#: ../libpurple/protocols/jabber/jabber.c:646
+#: ../libpurple/protocols/jabber/jabber.c:647
 msgid "Registration Successful"
 msgstr "Éxito en el registro"
 
-#: ../libpurple/protocols/jabber/jabber.c:649
-#: ../libpurple/protocols/jabber/jabber.c:1524
+#: ../libpurple/protocols/jabber/jabber.c:653
+#: ../libpurple/protocols/jabber/jabber.c:1520
 msgid "Unknown Error"
 msgstr "Error desconocido"
 
-#: ../libpurple/protocols/jabber/jabber.c:651
-#: ../libpurple/protocols/jabber/jabber.c:652
+#: ../libpurple/protocols/jabber/jabber.c:655
+#: ../libpurple/protocols/jabber/jabber.c:656
 msgid "Registration Failed"
 msgstr "Falló el registro"
 
-#: ../libpurple/protocols/jabber/jabber.c:767
-#: ../libpurple/protocols/jabber/jabber.c:768
+#: ../libpurple/protocols/jabber/jabber.c:771
+#: ../libpurple/protocols/jabber/jabber.c:772
 msgid "Already Registered"
 msgstr "Ya está registrado"
 
-#: ../libpurple/protocols/jabber/jabber.c:844
-#: ../libpurple/protocols/oscar/oscar.c:3777
-#: ../libpurple/protocols/oscar/oscar.c:3790
+#: ../libpurple/protocols/jabber/jabber.c:848
+#: ../libpurple/protocols/oscar/oscar.c:3804
+#: ../libpurple/protocols/oscar/oscar.c:3817
 msgid "State"
 msgstr "Estado"
 
-#: ../libpurple/protocols/jabber/jabber.c:849
+#: ../libpurple/protocols/jabber/jabber.c:853
 msgid "Postal code"
 msgstr "Código postal"
 
-#: ../libpurple/protocols/jabber/jabber.c:854
-#: ../libpurple/protocols/silc/ops.c:1069
-#: ../libpurple/protocols/silc/silc.c:691
-#: ../libpurple/protocols/silc/util.c:553
+#: ../libpurple/protocols/jabber/jabber.c:858
+#: ../libpurple/protocols/silc/ops.c:1035
+#: ../libpurple/protocols/silc/silc.c:772
+#: ../libpurple/protocols/silc/util.c:557
+#: ../libpurple/protocols/silc10/ops.c:1069
+#: ../libpurple/protocols/silc10/silc.c:683
+#: ../libpurple/protocols/silc10/util.c:553
 msgid "Phone"
 msgstr "Teléfono"
 
-#: ../libpurple/protocols/jabber/jabber.c:864
+#: ../libpurple/protocols/jabber/jabber.c:868
 msgid "Date"
 msgstr "Fecha"
 
-#: ../libpurple/protocols/jabber/jabber.c:872
+#: ../libpurple/protocols/jabber/jabber.c:876
 msgid "Please fill out the information below to register your new account."
 msgstr ""
 "Por favor, rellene la información abajo indicada para registrar su nueva "
 "cuenta."
 
-#: ../libpurple/protocols/jabber/jabber.c:875
-#: ../libpurple/protocols/jabber/jabber.c:876
+#: ../libpurple/protocols/jabber/jabber.c:879
+#: ../libpurple/protocols/jabber/jabber.c:880
 msgid "Register New XMPP Account"
 msgstr "Registrando cuenta nueva de XMPP"
 
 #. Register button
-#: ../libpurple/protocols/jabber/jabber.c:877 ../pidgin/gtkaccount.c:1504
+#: ../libpurple/protocols/jabber/jabber.c:881 ../pidgin/gtkaccount.c:1518
 msgid "Register"
 msgstr "Registrar"
 
-#: ../libpurple/protocols/jabber/jabber.c:1048
+#: ../libpurple/protocols/jabber/jabber.c:1050
 msgid "Initializing Stream"
 msgstr "Inicializando flujo"
 
-#: ../libpurple/protocols/jabber/jabber.c:1053
-#: ../libpurple/protocols/msn/session.c:350
+#: ../libpurple/protocols/jabber/jabber.c:1055
+#: ../libpurple/protocols/msn/session.c:351
 msgid "Authenticating"
 msgstr "Autenticando"
 
-#: ../libpurple/protocols/jabber/jabber.c:1062
+#: ../libpurple/protocols/jabber/jabber.c:1064
 msgid "Re-initializing Stream"
 msgstr "Reinicializando flujo"
 
-#: ../libpurple/protocols/jabber/jabber.c:1128
-#: ../libpurple/protocols/jabber/jabber.c:1502
-#: ../libpurple/protocols/jabber/jabber.c:1543
-#: ../libpurple/protocols/jabber/jabber.c:1579
-#: ../libpurple/protocols/oscar/oscar.c:808
-#: ../libpurple/protocols/oscar/oscar.c:5512
+#: ../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:826
+#: ../libpurple/protocols/oscar/oscar.c:5580
 msgid "Not Authorized"
 msgstr "No autorizado"
 
-#: ../libpurple/protocols/jabber/jabber.c:1170
+#: ../libpurple/protocols/jabber/jabber.c:1166
 msgid "Both"
 msgstr "Ambos"
 
-#: ../libpurple/protocols/jabber/jabber.c:1172
+#: ../libpurple/protocols/jabber/jabber.c:1168
 msgid "From (To pending)"
 msgstr "Desde (Destino pendiente)"
 
-#: ../libpurple/protocols/jabber/jabber.c:1177
+#: ../libpurple/protocols/jabber/jabber.c:1170
+msgid "From"
+msgstr "De"
+
+#: ../libpurple/protocols/jabber/jabber.c:1173
 msgid "To"
 msgstr "A"
 
-#: ../libpurple/protocols/jabber/jabber.c:1179
+#: ../libpurple/protocols/jabber/jabber.c:1175
 msgid "None (To pending)"
 msgstr "Nadie (Destino pendiente)"
 
-#: ../libpurple/protocols/jabber/jabber.c:1181
+#: ../libpurple/protocols/jabber/jabber.c:1177
 #: ../pidgin/plugins/gevolution/eds-utils.c:73
 #: ../pidgin/plugins/gevolution/eds-utils.c:86
 msgid "None"
 msgstr "Ninguno"
 
-#: ../libpurple/protocols/jabber/jabber.c:1184
+#: ../libpurple/protocols/jabber/jabber.c:1180
 msgid "Subscription"
 msgstr "Subscripción"
 
-#: ../libpurple/protocols/jabber/jabber.c:1314
+#: ../libpurple/protocols/jabber/jabber.c:1310
 msgid "Password Changed"
 msgstr "Contraseña modificada"
 
-#: ../libpurple/protocols/jabber/jabber.c:1315
+#: ../libpurple/protocols/jabber/jabber.c:1311
 msgid "Your password has been changed."
 msgstr "Su contraseña ha sido modificada."
 
-#: ../libpurple/protocols/jabber/jabber.c:1319
-#: ../libpurple/protocols/jabber/jabber.c:1320
+#: ../libpurple/protocols/jabber/jabber.c:1315
+#: ../libpurple/protocols/jabber/jabber.c:1316
 msgid "Error changing password"
 msgstr "Error al cambiar la contraseña"
 
-#: ../libpurple/protocols/jabber/jabber.c:1376
+#: ../libpurple/protocols/jabber/jabber.c:1372
 msgid "Password (again)"
 msgstr "Contraseña (de nuevo)"
 
-#: ../libpurple/protocols/jabber/jabber.c:1381
-#: ../libpurple/protocols/jabber/jabber.c:1382
+#: ../libpurple/protocols/jabber/jabber.c:1377
+#: ../libpurple/protocols/jabber/jabber.c:1378
 msgid "Change XMPP Password"
 msgstr "Cambiar contraseña XMPP"
 
-#: ../libpurple/protocols/jabber/jabber.c:1382
+#: ../libpurple/protocols/jabber/jabber.c:1378
 msgid "Please enter your new password"
 msgstr "Por favor, indique su nueva contraseña"
 
-#: ../libpurple/protocols/jabber/jabber.c:1394
-#: ../libpurple/protocols/oscar/oscar.c:6298
-#: ../libpurple/protocols/silc/silc.c:1015
+#: ../libpurple/protocols/jabber/jabber.c:1390
+#: ../libpurple/protocols/oscar/oscar.c:6366
+#: ../libpurple/protocols/silc/silc.c:1093
+#: ../libpurple/protocols/silc10/silc.c:1004
 msgid "Set User Info..."
 msgstr "Establecer su información de usuario..."
 
 #. if (js->protocol_options & CHANGE_PASSWORD) {
-#: ../libpurple/protocols/jabber/jabber.c:1399
-#: ../libpurple/protocols/oscar/oscar.c:6309
-#: ../libpurple/protocols/silc/silc.c:1011
+#: ../libpurple/protocols/jabber/jabber.c:1395
+#: ../libpurple/protocols/oscar/oscar.c:6377
+#: ../libpurple/protocols/silc/silc.c:1089
+#: ../libpurple/protocols/silc10/silc.c:1000
 msgid "Change Password..."
 msgstr "Cambiar su contraseña..."
 
 #. }
-#: ../libpurple/protocols/jabber/jabber.c:1404
+#: ../libpurple/protocols/jabber/jabber.c:1400
 msgid "Search for Users..."
 msgstr "Buscar usuarios..."
 
-#: ../libpurple/protocols/jabber/jabber.c:1482
+#: ../libpurple/protocols/jabber/jabber.c:1478
 msgid "Bad Request"
 msgstr "Solicitud errónea"
 
-#: ../libpurple/protocols/jabber/jabber.c:1484
+#: ../libpurple/protocols/jabber/jabber.c:1480
 msgid "Conflict"
 msgstr "Conflicto"
 
-#: ../libpurple/protocols/jabber/jabber.c:1486
+#: ../libpurple/protocols/jabber/jabber.c:1482
 msgid "Feature Not Implemented"
 msgstr "Funcionalidad no implementada"
 
-#: ../libpurple/protocols/jabber/jabber.c:1488
+#: ../libpurple/protocols/jabber/jabber.c:1484
 msgid "Forbidden"
 msgstr "Prohibido"
 
-#: ../libpurple/protocols/jabber/jabber.c:1490
+#: ../libpurple/protocols/jabber/jabber.c:1486
 msgid "Gone"
 msgstr "Se fue"
 
-#: ../libpurple/protocols/jabber/jabber.c:1492
-#: ../libpurple/protocols/jabber/jabber.c:1569
+#: ../libpurple/protocols/jabber/jabber.c:1488
+#: ../libpurple/protocols/jabber/jabber.c:1565
 msgid "Internal Server Error"
 msgstr "Error interno del servidor"
 
-#: ../libpurple/protocols/jabber/jabber.c:1494
+#: ../libpurple/protocols/jabber/jabber.c:1490
 msgid "Item Not Found"
 msgstr "Elemento no encontrado"
 
+#: ../libpurple/protocols/jabber/jabber.c:1492
+msgid "Malformed XMPP ID"
+msgstr "ID de XMPP malformado"
+
+#: ../libpurple/protocols/jabber/jabber.c:1494
+msgid "Not Acceptable"
+msgstr "No aceptable"
+
 #: ../libpurple/protocols/jabber/jabber.c:1496
-msgid "Malformed XMPP ID"
-msgstr "ID de XMPP malformado"
-
-#: ../libpurple/protocols/jabber/jabber.c:1498
-msgid "Not Acceptable"
-msgstr "No aceptable"
+msgid "Not Allowed"
+msgstr "No permitido"
 
 #: ../libpurple/protocols/jabber/jabber.c:1500
-msgid "Not Allowed"
-msgstr "No permitido"
-
-#: ../libpurple/protocols/jabber/jabber.c:1504
 msgid "Payment Required"
 msgstr "Pago necesario"
 
-#: ../libpurple/protocols/jabber/jabber.c:1506
+#: ../libpurple/protocols/jabber/jabber.c:1502
 msgid "Recipient Unavailable"
 msgstr "Destinatario no disponible"
 
-#: ../libpurple/protocols/jabber/jabber.c:1510
+#: ../libpurple/protocols/jabber/jabber.c:1506
 msgid "Registration Required"
 msgstr "Registro necesario"
 
-#: ../libpurple/protocols/jabber/jabber.c:1512
+#: ../libpurple/protocols/jabber/jabber.c:1508
 msgid "Remote Server Not Found"
 msgstr "No se encontró el servidor remoto"
 
-#: ../libpurple/protocols/jabber/jabber.c:1514
+#: ../libpurple/protocols/jabber/jabber.c:1510
 msgid "Remote Server Timeout"
 msgstr "Expiró el tiempo del servidor remoto"
 
-#: ../libpurple/protocols/jabber/jabber.c:1516
+#: ../libpurple/protocols/jabber/jabber.c:1512
 msgid "Server Overloaded"
 msgstr "Servidor sobrecargado"
 
-#: ../libpurple/protocols/jabber/jabber.c:1518
+#: ../libpurple/protocols/jabber/jabber.c:1514
 msgid "Service Unavailable"
 msgstr "Servicio no disponible"
 
-#: ../libpurple/protocols/jabber/jabber.c:1520
+#: ../libpurple/protocols/jabber/jabber.c:1516
 msgid "Subscription Required"
 msgstr "Subscripción necesaria"
 
-#: ../libpurple/protocols/jabber/jabber.c:1522
+#: ../libpurple/protocols/jabber/jabber.c:1518
 msgid "Unexpected Request"
 msgstr "Solicitud no esperada"
 
-#: ../libpurple/protocols/jabber/jabber.c:1529
+#: ../libpurple/protocols/jabber/jabber.c:1525
 msgid "Authorization Aborted"
 msgstr "Autorización interrumpida"
 
-#: ../libpurple/protocols/jabber/jabber.c:1531
+#: ../libpurple/protocols/jabber/jabber.c:1527
 msgid "Incorrect encoding in authorization"
 msgstr "Codificación incorrecta en la autorización"
 
-#: ../libpurple/protocols/jabber/jabber.c:1534
+#: ../libpurple/protocols/jabber/jabber.c:1530
 msgid "Invalid authzid"
 msgstr "Authzid inválido"
 
-#: ../libpurple/protocols/jabber/jabber.c:1537
+#: ../libpurple/protocols/jabber/jabber.c:1533
 msgid "Invalid Authorization Mechanism"
 msgstr "Mecanismo de autorización inválido"
 
-#: ../libpurple/protocols/jabber/jabber.c:1540
+#: ../libpurple/protocols/jabber/jabber.c:1536
 msgid "Authorization mechanism too weak"
 msgstr "Mecanismo de autorización demasiado débil"
 
-#: ../libpurple/protocols/jabber/jabber.c:1545
+#: ../libpurple/protocols/jabber/jabber.c:1541
 msgid "Temporary Authentication Failure"
 msgstr "Falló temporal de la autenticación"
 
-#: ../libpurple/protocols/jabber/jabber.c:1548
+#: ../libpurple/protocols/jabber/jabber.c:1544
 msgid "Authentication Failure"
 msgstr "Falló de autenticación"
 
-#: ../libpurple/protocols/jabber/jabber.c:1554
+#: ../libpurple/protocols/jabber/jabber.c:1550
 msgid "Bad Format"
 msgstr "Formato erróneo"
 
-#: ../libpurple/protocols/jabber/jabber.c:1556
+#: ../libpurple/protocols/jabber/jabber.c:1552
 msgid "Bad Namespace Prefix"
 msgstr "Prefijo del espacio de nombres erróneo"
 
-#: ../libpurple/protocols/jabber/jabber.c:1559
+#: ../libpurple/protocols/jabber/jabber.c:1555
 msgid "Resource Conflict"
 msgstr "Conflicto de recursos"
 
-#: ../libpurple/protocols/jabber/jabber.c:1561
-#: ../libpurple/protocols/silc/ops.c:1729
+#: ../libpurple/protocols/jabber/jabber.c:1557
+#: ../libpurple/protocols/silc/silc.c:244
+#: ../libpurple/protocols/silc10/ops.c:1720
 msgid "Connection Timeout"
 msgstr "Expiró la conexión"
 
-#: ../libpurple/protocols/jabber/jabber.c:1563
+#: ../libpurple/protocols/jabber/jabber.c:1559
 msgid "Host Gone"
 msgstr "Servidor desaparecido"
 
-#: ../libpurple/protocols/jabber/jabber.c:1565
+#: ../libpurple/protocols/jabber/jabber.c:1561
 msgid "Host Unknown"
 msgstr "Servidor desconocido"
 
-#: ../libpurple/protocols/jabber/jabber.c:1567
+#: ../libpurple/protocols/jabber/jabber.c:1563
 msgid "Improper Addressing"
 msgstr "Direccionamiento incorrecto"
 
-#: ../libpurple/protocols/jabber/jabber.c:1571
+#: ../libpurple/protocols/jabber/jabber.c:1567
 msgid "Invalid ID"
 msgstr "ID no válido"
 
+#: ../libpurple/protocols/jabber/jabber.c:1569
+msgid "Invalid Namespace"
+msgstr "Espacio de nombres no válido"
+
+#: ../libpurple/protocols/jabber/jabber.c:1571
+msgid "Invalid XML"
+msgstr "XML inválido"
+
 #: ../libpurple/protocols/jabber/jabber.c:1573
-msgid "Invalid Namespace"
-msgstr "Espacio de nombres no válido"
-
-#: ../libpurple/protocols/jabber/jabber.c:1575
-msgid "Invalid XML"
-msgstr "XML inválido"
+msgid "Non-matching Hosts"
+msgstr "No existen servidores coincidentes"
 
 #: ../libpurple/protocols/jabber/jabber.c:1577
-msgid "Non-matching Hosts"
-msgstr "No existen servidores coincidentes"
+msgid "Policy Violation"
+msgstr "Violación de la política"
+
+#: ../libpurple/protocols/jabber/jabber.c:1579
+msgid "Remote Connection Failed"
+msgstr "Falló la conexión remota"
 
 #: ../libpurple/protocols/jabber/jabber.c:1581
-msgid "Policy Violation"
-msgstr "Violación de la política"
+msgid "Resource Constraint"
+msgstr "Restricción de recursos"
 
 #: ../libpurple/protocols/jabber/jabber.c:1583
-msgid "Remote Connection Failed"
-msgstr "Falló la conexión remota"
+msgid "Restricted XML"
+msgstr "XML restringido"
 
 #: ../libpurple/protocols/jabber/jabber.c:1585
-msgid "Resource Constraint"
-msgstr "Restricción de recursos"
+msgid "See Other Host"
+msgstr "Ver otros servidores"
 
 #: ../libpurple/protocols/jabber/jabber.c:1587
-msgid "Restricted XML"
-msgstr "XML restringido"
-
-#: ../libpurple/protocols/jabber/jabber.c:1589
-msgid "See Other Host"
-msgstr "Ver otros servidores"
-
-#: ../libpurple/protocols/jabber/jabber.c:1591
 msgid "System Shutdown"
 msgstr "Parada del sistema"
 
-#: ../libpurple/protocols/jabber/jabber.c:1593
+#: ../libpurple/protocols/jabber/jabber.c:1589
 msgid "Undefined Condition"
 msgstr "Condición no definida"
 
+#: ../libpurple/protocols/jabber/jabber.c:1591
+msgid "Unsupported Encoding"
+msgstr "Codificación no soportada"
+
+#: ../libpurple/protocols/jabber/jabber.c:1593
+msgid "Unsupported Stanza Type"
+msgstr "Tipo de «stanza» no soportado"
+
 #: ../libpurple/protocols/jabber/jabber.c:1595
-msgid "Unsupported Encoding"
-msgstr "Codificación no soportada"
+msgid "Unsupported Version"
+msgstr "Versión no soportada"
 
 #: ../libpurple/protocols/jabber/jabber.c:1597
-msgid "Unsupported Stanza Type"
-msgstr "Tipo de «stanza» no soportado"
+msgid "XML Not Well Formed"
+msgstr "XML malformado"
 
 #: ../libpurple/protocols/jabber/jabber.c:1599
-msgid "Unsupported Version"
-msgstr "Versión no soportada"
-
-#: ../libpurple/protocols/jabber/jabber.c:1601
-msgid "XML Not Well Formed"
-msgstr "XML malformado"
-
-#: ../libpurple/protocols/jabber/jabber.c:1603
 msgid "Stream Error"
 msgstr "Error de flujo"
 
-#: ../libpurple/protocols/jabber/jabber.c:1670
+#: ../libpurple/protocols/jabber/jabber.c:1666
 #, c-format
 msgid "Unable to ban user %s"
 msgstr "No puede echar al usuario %s"
 
-#: ../libpurple/protocols/jabber/jabber.c:1690
+#: ../libpurple/protocols/jabber/jabber.c:1686
 #, c-format
 msgid "Unknown affiliation: \"%s\""
 msgstr "Afiliación desconocida: \"%s\""
 
-#: ../libpurple/protocols/jabber/jabber.c:1695
+#: ../libpurple/protocols/jabber/jabber.c:1691
 #, c-format
 msgid "Unable to affiliate user %s as \"%s\""
 msgstr "No se pudo afiliar al usuario %s como \"%s\""
 
-#: ../libpurple/protocols/jabber/jabber.c:1714
+#: ../libpurple/protocols/jabber/jabber.c:1710
 #, c-format
 msgid "Unknown role: \"%s\""
 msgstr "Rol desconocido: \"%s\""
 
-#: ../libpurple/protocols/jabber/jabber.c:1721
+#: ../libpurple/protocols/jabber/jabber.c:1717
 #, c-format
 msgid "Unable to set role \"%s\" for user: %s"
 msgstr "No se pudo establecer el rol \"%s\" para el usuario: %s"
 
-#: ../libpurple/protocols/jabber/jabber.c:1774
+#: ../libpurple/protocols/jabber/jabber.c:1770
 #, c-format
 msgid "Unable to kick user %s"
 msgstr "No puede expulsar al usuario %s"
 
-#: ../libpurple/protocols/jabber/jabber.c:1805
+#: ../libpurple/protocols/jabber/jabber.c:1801
 msgid "config:  Configure a chat room."
 msgstr "config:  Configurar una sala de chat."
 
-#: ../libpurple/protocols/jabber/jabber.c:1809
+#: ../libpurple/protocols/jabber/jabber.c:1805
 msgid "configure:  Configure a chat room."
 msgstr "configure:  Configurar una sala de chat"
 
-#: ../libpurple/protocols/jabber/jabber.c:1818
+#: ../libpurple/protocols/jabber/jabber.c:1814
 msgid "part [room]:  Leave the room."
 msgstr "part [habitación]:  Abandonar la habitación."
 
-#: ../libpurple/protocols/jabber/jabber.c:1823
+#: ../libpurple/protocols/jabber/jabber.c:1819
 msgid "register:  Register with a chat room."
 msgstr "register:  Registrarse en una sala de chat."
 
-#: ../libpurple/protocols/jabber/jabber.c:1829
+#: ../libpurple/protocols/jabber/jabber.c:1825
 msgid "topic [new topic]:  View or change the topic."
 msgstr "topic [nuevo tema]:  Mostrar o cambiar el tema."
 
-#: ../libpurple/protocols/jabber/jabber.c:1835
+#: ../libpurple/protocols/jabber/jabber.c:1831
 msgid "ban &lt;user&gt; [room]:  Ban a user from the room."
 msgstr "ban &lt;usuario&gt; [sala]:  Echar a un usuario de la sala."
 
-#: ../libpurple/protocols/jabber/jabber.c:1841
+#: ../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."
@@ -4973,7 +5082,7 @@
 "affiliate &lt;usuario&gt; &lt;owner|admin|member|outcast|none&gt;: definir "
 "la afiliación de un usuario a la sala."
 
-#: ../libpurple/protocols/jabber/jabber.c:1847
+#: ../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."
@@ -4981,20 +5090,20 @@
 "rol &lt;usuario&gt; &lt;moderator|participant|visitor|none&gt;: Definir el "
 "rol de un usuario en la sala."
 
-#: ../libpurple/protocols/jabber/jabber.c:1853
+#: ../libpurple/protocols/jabber/jabber.c:1849
 msgid "invite &lt;user&gt; [message]:  Invite a user to the room."
 msgstr "invite &lt;usuario&gt; [mensaje]:  Invitar a un usuario a la sala."
 
-#: ../libpurple/protocols/jabber/jabber.c:1859
+#: ../libpurple/protocols/jabber/jabber.c:1855
 msgid "join: &lt;room&gt; [server]:  Join a chat on this server."
 msgstr ""
 "join: &lt;sala&gt; [servidor]:  Unirse a una sala en el servidor indicado."
 
-#: ../libpurple/protocols/jabber/jabber.c:1865
+#: ../libpurple/protocols/jabber/jabber.c:1861
 msgid "kick &lt;user&gt; [room]:  Kick a user from the room."
 msgstr "kick &lt;usuario&gt; [sala]:  Echar a un usuario de la sala."
 
-#: ../libpurple/protocols/jabber/jabber.c:1870
+#: ../libpurple/protocols/jabber/jabber.c:1866
 msgid ""
 "msg &lt;user&gt; &lt;message&gt;:  Send a private message to another user."
 msgstr ""
@@ -5010,32 +5119,33 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/jabber/libxmpp.c:166
 #: ../libpurple/protocols/jabber/libxmpp.c:168
+#: ../libpurple/protocols/jabber/libxmpp.c:170
 msgid "XMPP Protocol Plugin"
 msgstr "Complemento de protocolo XMPP"
 
 #. Translators: 'domain' is used here in the context of Internet domains, e.g. pidgin.im
-#: ../libpurple/protocols/jabber/libxmpp.c:195
+#: ../libpurple/protocols/jabber/libxmpp.c:197 ../pidgin/gtkaccount.c:508
 msgid "Domain"
 msgstr "Dominio"
 
-#: ../libpurple/protocols/jabber/libxmpp.c:201
+#: ../libpurple/protocols/jabber/libxmpp.c:205
 msgid "Force old (port 5223) SSL"
 msgstr "Forzar SSL antiguo (puerto 5323)"
 
-#: ../libpurple/protocols/jabber/libxmpp.c:206
+#: ../libpurple/protocols/jabber/libxmpp.c:210
 msgid "Allow plaintext auth over unencrypted streams"
 msgstr "Permitir autenticación en claro sobre canales no cifrados"
 
-#: ../libpurple/protocols/jabber/libxmpp.c:211
+#: ../libpurple/protocols/jabber/libxmpp.c:215
 #: ../libpurple/protocols/simple/simple.c:1856
 msgid "Connect port"
 msgstr "Puerto de conexión"
 
 #. Account options
-#: ../libpurple/protocols/jabber/libxmpp.c:215
-#: ../libpurple/protocols/silc/silc.c:1866
+#: ../libpurple/protocols/jabber/libxmpp.c:219
+#: ../libpurple/protocols/silc/silc.c:1914
+#: ../libpurple/protocols/silc10/silc.c:1857 ../pidgin/gtkaccount.c:837
 msgid "Connect server"
 msgstr "Conectar con el servidor"
 
@@ -5068,7 +5178,7 @@
 msgid "XMPP Message Error"
 msgstr "Mensaje de error de XMPP"
 
-#: ../libpurple/protocols/jabber/message.c:350
+#: ../libpurple/protocols/jabber/message.c:359
 #, c-format
 msgid " (Code %s)"
 msgstr " (Código %s)"
@@ -5077,16 +5187,16 @@
 msgid "XML Parse error"
 msgstr "Error de tratamiento XML"
 
-#: ../libpurple/protocols/jabber/presence.c:278
+#: ../libpurple/protocols/jabber/presence.c:290
 msgid "Unknown Error in presence"
 msgstr "Error desconocido en presencia"
 
-#: ../libpurple/protocols/jabber/presence.c:352
-#: ../libpurple/protocols/jabber/presence.c:353
+#: ../libpurple/protocols/jabber/presence.c:364
+#: ../libpurple/protocols/jabber/presence.c:365
 msgid "Create New Room"
 msgstr "Crear una sala nueva"
 
-#: ../libpurple/protocols/jabber/presence.c:354
+#: ../libpurple/protocols/jabber/presence.c:366
 msgid ""
 "You are creating a new room.  Would you like to configure it, or accept the "
 "default settings?"
@@ -5094,36 +5204,63 @@
 "Va a crear una sala nueva. ¿Desea configurarla o aceptar los valores por "
 "omisión?"
 
-#: ../libpurple/protocols/jabber/presence.c:360
+#: ../libpurple/protocols/jabber/presence.c:372
 msgid "_Configure Room"
 msgstr "_Configurar sala"
 
-#: ../libpurple/protocols/jabber/presence.c:361
+#: ../libpurple/protocols/jabber/presence.c:373
 msgid "_Accept Defaults"
 msgstr "_Aceptar valores por omisión"
 
-#: ../libpurple/protocols/jabber/presence.c:398
+#: ../libpurple/protocols/jabber/presence.c:409
 #, c-format
 msgid "Error in chat %s"
 msgstr "Error en el chat %s"
 
-#: ../libpurple/protocols/jabber/presence.c:401
+#: ../libpurple/protocols/jabber/presence.c:412
 #, c-format
 msgid "Error joining chat %s"
 msgstr "Error al unirse al chat %s"
 
-#: ../libpurple/protocols/jabber/si.c:765
+#: ../libpurple/protocols/jabber/si.c:769
 #, c-format
 msgid "Unable to send file to %s, user does not support file transfers"
 msgstr ""
 "No se pudo enviar el archivo a %s, el usuario no soporta transferencias de "
 "archivos"
 
-#: ../libpurple/protocols/jabber/si.c:766
-#: ../libpurple/protocols/jabber/si.c:767
+#: ../libpurple/protocols/jabber/si.c:770
+#: ../libpurple/protocols/jabber/si.c:771
+#: ../libpurple/protocols/jabber/si.c:839
 msgid "File Send Failed"
 msgstr "Fallo en el envío del archivo"
 
+#: ../libpurple/protocols/jabber/si.c:832
+#, c-format
+msgid "Unable to send file to %s, invalid JID"
+msgstr "No se pudo enviar el archivo a %s, JID inválido"
+
+#: ../libpurple/protocols/jabber/si.c:834
+#, c-format
+msgid "Unable to send file to %s, user is not online"
+msgstr "No se pudo enviar el archivo a %s, el usuario no está conectado"
+
+#: ../libpurple/protocols/jabber/si.c:836
+#, c-format
+msgid "Unable to send file to %s, not subscribed to user presence"
+msgstr ""
+"No se pudo enviar el archivo a %s, no está suscrito a la presencia del "
+"usuario"
+
+#: ../libpurple/protocols/jabber/si.c:851
+#, c-format
+msgid "Please select which resource of %s you would like to send a file to"
+msgstr "Elija el recurso de %s al que quiere enviar un archivo"
+
+#: ../libpurple/protocols/jabber/si.c:867
+msgid "Select a Resource"
+msgstr "Seleccione un recurso"
+
 #: ../libpurple/protocols/msn/dialog.c:110
 #, c-format
 msgid "Buddy list synchronization issue in %s (%s)"
@@ -5344,9 +5481,10 @@
 msgstr "Servidor muy ocupado"
 
 #: ../libpurple/protocols/msn/error.c:222
-#: ../libpurple/protocols/oscar/oscar.c:1363
-#: ../libpurple/protocols/silc/ops.c:1718 ../libpurple/protocols/toc/toc.c:728
-#: ../libpurple/proxy.c:1351
+#: ../libpurple/protocols/oscar/oscar.c:1381
+#: ../libpurple/protocols/silc/silc.c:233
+#: ../libpurple/protocols/silc10/ops.c:1709
+#: ../libpurple/protocols/toc/toc.c:728 ../libpurple/proxy.c:1363
 msgid "Authentication failed"
 msgstr "Falló la autenticación"
 
@@ -5445,8 +5583,8 @@
 msgstr "Le tiene"
 
 #: ../libpurple/protocols/msn/msn.c:551 ../libpurple/protocols/msn/state.c:33
-#: ../libpurple/protocols/yahoo/yahoo.c:2878
-#: ../libpurple/protocols/yahoo/yahoo.c:3487
+#: ../libpurple/protocols/yahoo/yahoo.c:2895
+#: ../libpurple/protocols/yahoo/yahoo.c:3504
 msgid "Be Right Back"
 msgstr "Vuelvo enseguida"
 
@@ -5454,21 +5592,23 @@
 #: ../libpurple/protocols/novell/novell.c:2822
 #: ../libpurple/protocols/novell/novell.c:2952
 #: ../libpurple/protocols/silc/buddy.c:1480
-#: ../libpurple/protocols/silc/silc.c:47
-#: ../libpurple/protocols/yahoo/yahoo.c:2880
-#: ../libpurple/protocols/yahoo/yahoo.c:3490
+#: ../libpurple/protocols/silc/silc.c:56
+#: ../libpurple/protocols/silc10/buddy.c:1480
+#: ../libpurple/protocols/silc10/silc.c:47
+#: ../libpurple/protocols/yahoo/yahoo.c:2897
+#: ../libpurple/protocols/yahoo/yahoo.c:3507
 msgid "Busy"
 msgstr "Ocupado"
 
 #: ../libpurple/protocols/msn/msn.c:559
-#: ../libpurple/protocols/yahoo/yahoo.c:2888
-#: ../libpurple/protocols/yahoo/yahoo.c:3502
+#: ../libpurple/protocols/yahoo/yahoo.c:2905
+#: ../libpurple/protocols/yahoo/yahoo.c:3519
 msgid "On the Phone"
 msgstr "Al teléfono"
 
 #: ../libpurple/protocols/msn/msn.c:563
-#: ../libpurple/protocols/yahoo/yahoo.c:2892
-#: ../libpurple/protocols/yahoo/yahoo.c:3508
+#: ../libpurple/protocols/yahoo/yahoo.c:2909
+#: ../libpurple/protocols/yahoo/yahoo.c:3525
 msgid "Out to Lunch"
 msgstr "Salí a comer"
 
@@ -5519,31 +5659,31 @@
 msgid "Failed to connect to server."
 msgstr "No se pudo conectar al servidor."
 
-#: ../libpurple/protocols/msn/msn.c:1458 ../libpurple/protocols/msn/msn.c:1803
+#: ../libpurple/protocols/msn/msn.c:1479 ../libpurple/protocols/msn/msn.c:1827
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:784
 msgid "Error retrieving profile"
 msgstr "Error al obtener el perfil"
 
-#: ../libpurple/protocols/msn/msn.c:1529 ../pidgin/plugins/convcolors.c:309
-#: ../pidgin/plugins/pidginrc.c:448
+#: ../libpurple/protocols/msn/msn.c:1550 ../pidgin/plugins/convcolors.c:309
+#: ../pidgin/plugins/pidginrc.c:366
 msgid "General"
 msgstr "General"
 
-#: ../libpurple/protocols/msn/msn.c:1536
-#: ../libpurple/protocols/oscar/oscar.c:3742
+#: ../libpurple/protocols/msn/msn.c:1557
+#: ../libpurple/protocols/oscar/oscar.c:3769
 #: ../libpurple/protocols/qq/buddy_info.c:45
 #: ../libpurple/protocols/qq/qq.c:219
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1057
 msgid "Age"
 msgstr "Edad"
 
-#: ../libpurple/protocols/msn/msn.c:1538
+#: ../libpurple/protocols/msn/msn.c:1559
 #: ../libpurple/protocols/qq/buddy_info.c:51
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1072
 msgid "Occupation"
 msgstr "Ocupación"
 
-#: ../libpurple/protocols/msn/msn.c:1539
+#: ../libpurple/protocols/msn/msn.c:1560
 #: ../libpurple/protocols/novell/novell.c:1478
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1052
 #: ../libpurple/protocols/zephyr/zephyr.c:798
@@ -5551,188 +5691,190 @@
 msgid "Location"
 msgstr "Ubicación"
 
-#: ../libpurple/protocols/msn/msn.c:1544 ../libpurple/protocols/msn/msn.c:1736
-#: ../libpurple/protocols/msn/msn.c:1742 ../libpurple/protocols/msn/msn.c:1749
+#: ../libpurple/protocols/msn/msn.c:1565 ../libpurple/protocols/msn/msn.c:1757
+#: ../libpurple/protocols/msn/msn.c:1763 ../libpurple/protocols/msn/msn.c:1770
 msgid "Hobbies and Interests"
 msgstr "Aficiones e intereses"
 
-#: ../libpurple/protocols/msn/msn.c:1550 ../libpurple/protocols/msn/msn.c:1670
-#: ../libpurple/protocols/msn/msn.c:1676 ../libpurple/protocols/msn/msn.c:1683
-#: ../libpurple/protocols/msn/msn.c:1691 ../libpurple/protocols/msn/msn.c:1698
+#: ../libpurple/protocols/msn/msn.c:1571 ../libpurple/protocols/msn/msn.c:1691
+#: ../libpurple/protocols/msn/msn.c:1697 ../libpurple/protocols/msn/msn.c:1704
+#: ../libpurple/protocols/msn/msn.c:1712 ../libpurple/protocols/msn/msn.c:1719
 msgid "A Little About Me"
 msgstr "Un poco sobre mí"
 
-#: ../libpurple/protocols/msn/msn.c:1567
+#: ../libpurple/protocols/msn/msn.c:1588
 msgid "Social"
 msgstr "Social"
 
-#: ../libpurple/protocols/msn/msn.c:1569
+#: ../libpurple/protocols/msn/msn.c:1590
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1062
 msgid "Marital Status"
 msgstr "Estado civil"
 
-#: ../libpurple/protocols/msn/msn.c:1570
+#: ../libpurple/protocols/msn/msn.c:1591
 msgid "Interests"
 msgstr "Aficiones"
 
-#: ../libpurple/protocols/msn/msn.c:1571
+#: ../libpurple/protocols/msn/msn.c:1592
 msgid "Pets"
 msgstr "Mascotas"
 
-#: ../libpurple/protocols/msn/msn.c:1572
+#: ../libpurple/protocols/msn/msn.c:1593
 msgid "Hometown"
 msgstr "Ciudad donde vive"
 
-#: ../libpurple/protocols/msn/msn.c:1573
+#: ../libpurple/protocols/msn/msn.c:1594
 msgid "Places Lived"
 msgstr "Lugares donde he vivido"
 
-#: ../libpurple/protocols/msn/msn.c:1574
+#: ../libpurple/protocols/msn/msn.c:1595
 msgid "Fashion"
 msgstr "Moda"
 
-#: ../libpurple/protocols/msn/msn.c:1575
+#: ../libpurple/protocols/msn/msn.c:1596
 msgid "Humor"
 msgstr "Humor"
 
-#: ../libpurple/protocols/msn/msn.c:1576
+#: ../libpurple/protocols/msn/msn.c:1597
 msgid "Music"
 msgstr "Música"
 
-#: ../libpurple/protocols/msn/msn.c:1577 ../libpurple/protocols/msn/msn.c:1758
-#: ../libpurple/protocols/msn/msn.c:1764
+#: ../libpurple/protocols/msn/msn.c:1598 ../libpurple/protocols/msn/msn.c:1779
+#: ../libpurple/protocols/msn/msn.c:1785
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1114
 msgid "Favorite Quote"
 msgstr "Cita preferida"
 
-#: ../libpurple/protocols/msn/msn.c:1594
+#: ../libpurple/protocols/msn/msn.c:1615
 msgid "Contact Info"
 msgstr "Información del contacto"
 
-#: ../libpurple/protocols/msn/msn.c:1595
+#: ../libpurple/protocols/msn/msn.c:1616
 msgid "Personal"
 msgstr "Personal"
 
-#: ../libpurple/protocols/msn/msn.c:1598
+#: ../libpurple/protocols/msn/msn.c:1619
 msgid "Significant Other"
 msgstr "Otra persona importante"
 
-#: ../libpurple/protocols/msn/msn.c:1599
+#: ../libpurple/protocols/msn/msn.c:1620
 msgid "Home Phone"
 msgstr "Teléfono de casa"
 
-#: ../libpurple/protocols/msn/msn.c:1600
+#: ../libpurple/protocols/msn/msn.c:1621
 msgid "Home Phone 2"
 msgstr "Teléfono de casa (2)"
 
-#: ../libpurple/protocols/msn/msn.c:1601
-#: ../libpurple/protocols/oscar/oscar.c:3780
+#: ../libpurple/protocols/msn/msn.c:1622
+#: ../libpurple/protocols/oscar/oscar.c:3807
 msgid "Home Address"
 msgstr "Domicilio"
 
-#: ../libpurple/protocols/msn/msn.c:1602
+#: ../libpurple/protocols/msn/msn.c:1623
 msgid "Personal Mobile"
 msgstr "Móvil personal"
 
-#: ../libpurple/protocols/msn/msn.c:1603
+#: ../libpurple/protocols/msn/msn.c:1624
 msgid "Home Fax"
 msgstr "Fax personal"
 
-#: ../libpurple/protocols/msn/msn.c:1604
+#: ../libpurple/protocols/msn/msn.c:1625
 msgid "Personal E-Mail"
 msgstr "Correo-e personal"
 
-#: ../libpurple/protocols/msn/msn.c:1605
+#: ../libpurple/protocols/msn/msn.c:1626
 msgid "Personal IM"
 msgstr "MI personal"
 
-#: ../libpurple/protocols/msn/msn.c:1607
+#: ../libpurple/protocols/msn/msn.c:1628
 msgid "Anniversary"
 msgstr "Aniversario"
 
 #. Business
-#: ../libpurple/protocols/msn/msn.c:1623
+#: ../libpurple/protocols/msn/msn.c:1644
 msgid "Work"
 msgstr "Trabajo"
 
 # Prefiero esto a "Título laboral" que puede ser ambiguo, jfs
-#: ../libpurple/protocols/msn/msn.c:1625
-#: ../libpurple/protocols/silc/ops.c:1044
+#: ../libpurple/protocols/msn/msn.c:1646
+#: ../libpurple/protocols/silc/ops.c:1010
+#: ../libpurple/protocols/silc10/ops.c:1044
 msgid "Job Title"
 msgstr "Trabajo"
 
-#: ../libpurple/protocols/msn/msn.c:1626
-#: ../libpurple/protocols/oscar/oscar.c:3801
+#: ../libpurple/protocols/msn/msn.c:1647
+#: ../libpurple/protocols/oscar/oscar.c:3828
 msgid "Company"
 msgstr "Compañía"
 
-#: ../libpurple/protocols/msn/msn.c:1627
+#: ../libpurple/protocols/msn/msn.c:1648
 #: ../libpurple/protocols/novell/novell.c:1480
 msgid "Department"
 msgstr "Departamento"
 
-#: ../libpurple/protocols/msn/msn.c:1628
+#: ../libpurple/protocols/msn/msn.c:1649
 msgid "Profession"
 msgstr "Profesión"
 
-#: ../libpurple/protocols/msn/msn.c:1629
+#: ../libpurple/protocols/msn/msn.c:1650
 msgid "Work Phone"
 msgstr "Teléfono del trabajo"
 
-#: ../libpurple/protocols/msn/msn.c:1630
+#: ../libpurple/protocols/msn/msn.c:1651
 msgid "Work Phone 2"
 msgstr "Teléfono del trabajo (2)"
 
-#: ../libpurple/protocols/msn/msn.c:1631
-#: ../libpurple/protocols/oscar/oscar.c:3793
+#: ../libpurple/protocols/msn/msn.c:1652
+#: ../libpurple/protocols/oscar/oscar.c:3820
 msgid "Work Address"
 msgstr "Dirección del trabajo"
 
 # El latinoamérica se prefiere 'Celular', creo, jfs
-#: ../libpurple/protocols/msn/msn.c:1632
+#: ../libpurple/protocols/msn/msn.c:1653
 msgid "Work Mobile"
 msgstr "Móvil del trabajo"
 
-#: ../libpurple/protocols/msn/msn.c:1633
+#: ../libpurple/protocols/msn/msn.c:1654
 msgid "Work Pager"
 msgstr "Buscapersonas del trabajo"
 
-#: ../libpurple/protocols/msn/msn.c:1634
+#: ../libpurple/protocols/msn/msn.c:1655
 msgid "Work Fax"
 msgstr "Fax del trabajo"
 
-#: ../libpurple/protocols/msn/msn.c:1635
+#: ../libpurple/protocols/msn/msn.c:1656
 msgid "Work E-Mail"
 msgstr "Correo-e del trabajo"
 
-#: ../libpurple/protocols/msn/msn.c:1636
+#: ../libpurple/protocols/msn/msn.c:1657
 msgid "Work IM"
 msgstr "MI del trabajo"
 
-#: ../libpurple/protocols/msn/msn.c:1637
+#: ../libpurple/protocols/msn/msn.c:1658
 msgid "Start Date"
 msgstr "Fecha inicial"
 
-#: ../libpurple/protocols/msn/msn.c:1707 ../libpurple/protocols/msn/msn.c:1713
-#: ../libpurple/protocols/msn/msn.c:1720 ../libpurple/protocols/msn/msn.c:1727
+#: ../libpurple/protocols/msn/msn.c:1728 ../libpurple/protocols/msn/msn.c:1734
+#: ../libpurple/protocols/msn/msn.c:1741 ../libpurple/protocols/msn/msn.c:1748
 msgid "Favorite Things"
 msgstr "Cosas preferidas"
 
-#: ../libpurple/protocols/msn/msn.c:1772
+#: ../libpurple/protocols/msn/msn.c:1793
 msgid "Last Updated"
 msgstr "Actualizado por última vez"
 
-#: ../libpurple/protocols/msn/msn.c:1783
+#: ../libpurple/protocols/msn/msn.c:1804
 #: ../libpurple/protocols/qq/buddy_info.c:60
-#: ../libpurple/protocols/silc/ops.c:1060
+#: ../libpurple/protocols/silc/ops.c:1026
+#: ../libpurple/protocols/silc10/ops.c:1060
 msgid "Homepage"
 msgstr "Página personal"
 
-#: ../libpurple/protocols/msn/msn.c:1804
+#: ../libpurple/protocols/msn/msn.c:1828
 msgid "The user has not created a public profile."
 msgstr "El usuario no ha creado un perfil público."
 
-#: ../libpurple/protocols/msn/msn.c:1805
+#: ../libpurple/protocols/msn/msn.c:1829
 msgid ""
 "MSN reported not being able to find the user's profile. This either means "
 "that the user does not exist, or that the user exists but has not created a "
@@ -5742,7 +5884,7 @@
 "que o bien el usuario no existe o que el usuario existe pero no ha creado un "
 "perfil público."
 
-#: ../libpurple/protocols/msn/msn.c:1809
+#: ../libpurple/protocols/msn/msn.c:1833
 msgid ""
 "Could not find any information in the user's profile. The user most likely "
 "does not exist."
@@ -5750,7 +5892,7 @@
 "No se pudo encontrar información en el perfil de usuario. Es probable que el "
 "usuario no exista."
 
-#: ../libpurple/protocols/msn/msn.c:1817
+#: ../libpurple/protocols/msn/msn.c:1841
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1216
 msgid "Profile URL"
 msgstr "URL del perfil"
@@ -5765,19 +5907,19 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/msn/msn.c:2103 ../libpurple/protocols/msn/msn.c:2105
+#: ../libpurple/protocols/msn/msn.c:2127 ../libpurple/protocols/msn/msn.c:2129
 msgid "MSN Protocol Plugin"
 msgstr "Complemento de protocolo MSN"
 
-#: ../libpurple/protocols/msn/msn.c:2139
+#: ../libpurple/protocols/msn/msn.c:2163
 msgid "Use HTTP Method"
 msgstr "Usar método HTTP"
 
-#: ../libpurple/protocols/msn/msn.c:2144
+#: ../libpurple/protocols/msn/msn.c:2168
 msgid "Show custom smileys"
 msgstr "Mostrar emoticonos a medida"
 
-#: ../libpurple/protocols/msn/msn.c:2152
+#: ../libpurple/protocols/msn/msn.c:2176
 msgid "nudge: nudge a user to get their attention"
 msgstr "nudge: Avisar a un contacto para llamar su atención"
 
@@ -5808,7 +5950,7 @@
 
 #: ../libpurple/protocols/msn/notification.c:184
 #: ../libpurple/protocols/msn/notification.c:532
-#: ../libpurple/protocols/msn/session.c:329
+#: ../libpurple/protocols/msn/session.c:330
 msgid "Unknown error."
 msgstr "Error desconocido."
 
@@ -5846,15 +5988,15 @@
 msgid "Service Temporarily Unavailable."
 msgstr "Servicio no disponible temporalmente."
 
-#: ../libpurple/protocols/msn/notification.c:840
+#: ../libpurple/protocols/msn/notification.c:851
 msgid "Unable to rename group"
 msgstr "No se pudo cambiar el nombre del grupo"
 
-#: ../libpurple/protocols/msn/notification.c:895
+#: ../libpurple/protocols/msn/notification.c:906
 msgid "Unable to delete group"
 msgstr "No se pudo borrar el grupo"
 
-#: ../libpurple/protocols/msn/notification.c:1321
+#: ../libpurple/protocols/msn/notification.c:1325
 #, c-format
 msgid ""
 "The MSN server will shut down for maintenance in %d minute. You will "
@@ -5911,7 +6053,7 @@
 msgstr "Error en el análisis HTTP."
 
 #: ../libpurple/protocols/msn/session.c:307
-#: ../libpurple/protocols/oscar/oscar.c:3454
+#: ../libpurple/protocols/oscar/oscar.c:3481
 #: ../libpurple/protocols/yahoo/yahoo.c:202
 msgid "You have signed on from another location."
 msgstr "Ha conectado desde otra ubicación."
@@ -5926,36 +6068,36 @@
 msgid "The MSN servers are going down temporarily."
 msgstr "Los servidores de MSN van a sufrir un apagado temporal."
 
-#: ../libpurple/protocols/msn/session.c:319
+#: ../libpurple/protocols/msn/session.c:320
 #, c-format
 msgid "Unable to authenticate: %s"
 msgstr "No se pudo autenticar: %s"
 
-#: ../libpurple/protocols/msn/session.c:324
+#: ../libpurple/protocols/msn/session.c:325
 msgid ""
 "Your MSN buddy list is temporarily unavailable. Please wait and try again."
 msgstr ""
 "Su lista de amigos MSN está indisponible temporalmente. Por favor, espere y "
 "vuelva a intentarlo más tarde."
 
-#: ../libpurple/protocols/msn/session.c:345
-#: ../libpurple/protocols/msn/session.c:347
+#: ../libpurple/protocols/msn/session.c:346
+#: ../libpurple/protocols/msn/session.c:348
 msgid "Handshaking"
 msgstr "Negociación"
 
-#: ../libpurple/protocols/msn/session.c:348
+#: ../libpurple/protocols/msn/session.c:349
 msgid "Starting authentication"
 msgstr "Empezando la autenticación"
 
-#: ../libpurple/protocols/msn/session.c:349
+#: ../libpurple/protocols/msn/session.c:350
 msgid "Getting cookie"
 msgstr "Obteniendo una cookie"
 
-#: ../libpurple/protocols/msn/session.c:351
+#: ../libpurple/protocols/msn/session.c:352
 msgid "Sending cookie"
 msgstr "Enviando cookie"
 
-#: ../libpurple/protocols/msn/session.c:352
+#: ../libpurple/protocols/msn/session.c:353
 msgid "Retrieving buddy list"
 msgstr "Recuperando lista de amigos"
 
@@ -5995,15 +6137,21 @@
 
 #: ../libpurple/protocols/msn/switchboard.c:424
 msgid ""
+"Message could not be sent because we were unable to establish a session with "
+"the server. This is likely a server problem, try again in a few minutes:"
+msgstr "No se pudo enviar el mensaje porque no se pudo establecer una sesión con el servidor. Es posible que se trate de un error del servidor, vuelva a intentarlo en unos minutos."
+
+#: ../libpurple/protocols/msn/switchboard.c:431
+msgid ""
 "Message could not be sent because an error with the switchboard occurred:"
 msgstr ""
 "No se pudo enviar el mensaje porque se produjo un error con el «switchboard»:"
 
-#: ../libpurple/protocols/msn/switchboard.c:432
+#: ../libpurple/protocols/msn/switchboard.c:439
 msgid "Message may have not been sent because an unknown error occurred:"
 msgstr "No se pudo enviar el mensaje porque se produjo un error desconocido:"
 
-#: ../libpurple/protocols/msn/switchboard.c:956
+#: ../libpurple/protocols/msn/switchboard.c:963
 #, c-format
 msgid "%s just sent you a Nudge!"
 msgstr "¡%s le acaba de dar un codazo!"
@@ -6386,19 +6534,19 @@
 msgstr "Puerto del servidor"
 
 #: ../libpurple/protocols/oscar/flap_connection.c:379
-#: ../libpurple/protocols/yahoo/yahoo.c:2290
-#: ../libpurple/protocols/yahoo/yahoo.c:2449
+#: ../libpurple/protocols/yahoo/yahoo.c:2292
+#: ../libpurple/protocols/yahoo/yahoo.c:2459
 #: ../libpurple/protocols/yahoo/ycht.c:481 ../libpurple/proxy.c:580
-#: ../libpurple/proxy.c:1085 ../libpurple/proxy.c:1196
-#: ../libpurple/proxy.c:1296 ../libpurple/proxy.c:1424
+#: ../libpurple/proxy.c:1099 ../libpurple/proxy.c:1208
+#: ../libpurple/proxy.c:1308 ../libpurple/proxy.c:1436
 msgid "Server closed the connection."
 msgstr "El servidor ha cerrado la conexión."
 
 #: ../libpurple/protocols/oscar/flap_connection.c:381
-#: ../libpurple/protocols/yahoo/yahoo.c:2284
-#: ../libpurple/protocols/yahoo/yahoo.c:2443 ../libpurple/proxy.c:592
-#: ../libpurple/proxy.c:1097 ../libpurple/proxy.c:1208
-#: ../libpurple/proxy.c:1308 ../libpurple/proxy.c:1436
+#: ../libpurple/protocols/yahoo/yahoo.c:2286
+#: ../libpurple/protocols/yahoo/yahoo.c:2453 ../libpurple/proxy.c:592
+#: ../libpurple/proxy.c:1111 ../libpurple/proxy.c:1220
+#: ../libpurple/proxy.c:1320 ../libpurple/proxy.c:1448
 #, c-format
 msgid ""
 "Lost connection with server:\n"
@@ -6408,21 +6556,12 @@
 "%s"
 
 #: ../libpurple/protocols/oscar/flap_connection.c:384
-#: ../libpurple/proxy.c:1114 ../libpurple/proxy.c:1221
-#: ../libpurple/proxy.c:1320 ../libpurple/proxy.c:1392
-#: ../libpurple/proxy.c:1449
+#: ../libpurple/proxy.c:1128 ../libpurple/proxy.c:1233
+#: ../libpurple/proxy.c:1332 ../libpurple/proxy.c:1404
+#: ../libpurple/proxy.c:1461
 msgid "Received invalid data on connection with server."
 msgstr "Se recibieron datos inválidos al conectarse al servidor."
 
-#: ../libpurple/protocols/oscar/flap_connection.c:386
-#, c-format
-msgid ""
-"Could not establish a connection with the server:\n"
-"%s"
-msgstr ""
-"No se pudo establecer una conexión con el servidor:\n"
-"%s"
-
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -6454,7 +6593,7 @@
 msgstr "Complemento de protocolo ICQ"
 
 #: ../libpurple/protocols/oscar/libicq.c:147
-#: ../libpurple/protocols/yahoo/yahoo.c:4094
+#: ../libpurple/protocols/yahoo/yahoo.c:4111
 #: ../libpurple/protocols/zephyr/zephyr.c:2997
 msgid "Encoding"
 msgstr "Codificación"
@@ -6585,7 +6724,7 @@
 msgid "Not while on AOL"
 msgstr "No mientras esté en AOL"
 
-#: ../libpurple/protocols/oscar/oscar.c:330
+#: ../libpurple/protocols/oscar/oscar.c:348
 msgid ""
 "(There was an error receiving this message.  The buddy you are speaking with "
 "is probably using a different encoding than expected.  If you know what "
@@ -6597,7 +6736,7 @@
 "Puede indicar su codificación en las opciones de cuenta avanzadas para AIM/"
 "ICQ si sabe que codificación está utilizando.)"
 
-#: ../libpurple/protocols/oscar/oscar.c:439
+#: ../libpurple/protocols/oscar/oscar.c:457
 #, c-format
 msgid ""
 "(There was an error receiving this message.  Either you and %s have "
@@ -6608,144 +6747,146 @@
 "defectuosa.)"
 
 #. Label
-#: ../libpurple/protocols/oscar/oscar.c:621 ../pidgin/gtkutils.c:2386
-#: ../pidgin/gtkutils.c:2416
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:338
+#: ../libpurple/protocols/oscar/oscar.c:639 ../pidgin/gtkutils.c:2321
+#: ../pidgin/gtkutils.c:2351
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:334
 msgid "Buddy Icon"
 msgstr "Icono de amigo"
 
-#: ../libpurple/protocols/oscar/oscar.c:624
+#: ../libpurple/protocols/oscar/oscar.c:642
 msgid "Voice"
 msgstr "Voz"
 
-#: ../libpurple/protocols/oscar/oscar.c:627
+#: ../libpurple/protocols/oscar/oscar.c:645
 msgid "AIM Direct IM"
 msgstr "MI Directo AIM"
 
-#: ../libpurple/protocols/oscar/oscar.c:630
-#: ../libpurple/protocols/silc/silc.c:687
-#: ../libpurple/protocols/silc/util.c:549
+#: ../libpurple/protocols/oscar/oscar.c:648
+#: ../libpurple/protocols/silc/silc.c:768
+#: ../libpurple/protocols/silc/util.c:553
+#: ../libpurple/protocols/silc10/silc.c:679
+#: ../libpurple/protocols/silc10/util.c:549
 msgid "Chat"
 msgstr "Charlar"
 
-#: ../libpurple/protocols/oscar/oscar.c:633
-#: ../libpurple/protocols/oscar/oscar.c:5920
+#: ../libpurple/protocols/oscar/oscar.c:651
+#: ../libpurple/protocols/oscar/oscar.c:5988
 msgid "Get File"
 msgstr "Recibir archivo"
 
-#: ../libpurple/protocols/oscar/oscar.c:640
+#: ../libpurple/protocols/oscar/oscar.c:658
 msgid "Games"
 msgstr "Juegos"
 
-#: ../libpurple/protocols/oscar/oscar.c:643
+#: ../libpurple/protocols/oscar/oscar.c:661
 msgid "Add-Ins"
 msgstr "Extensiones"
 
-#: ../libpurple/protocols/oscar/oscar.c:646
+#: ../libpurple/protocols/oscar/oscar.c:664
 msgid "Send Buddy List"
 msgstr "Enviar lista de amigos"
 
-#: ../libpurple/protocols/oscar/oscar.c:649
+#: ../libpurple/protocols/oscar/oscar.c:667
 msgid "ICQ Direct Connect"
 msgstr "Conexión directa ICQ"
 
-#: ../libpurple/protocols/oscar/oscar.c:652
+#: ../libpurple/protocols/oscar/oscar.c:670
 msgid "AP User"
 msgstr "Usuario de AP"
 
-#: ../libpurple/protocols/oscar/oscar.c:655
+#: ../libpurple/protocols/oscar/oscar.c:673
 msgid "ICQ RTF"
 msgstr "ICQ RTF"
 
-#: ../libpurple/protocols/oscar/oscar.c:658
+#: ../libpurple/protocols/oscar/oscar.c:676
 msgid "Nihilist"
 msgstr "Nihilista"
 
-#: ../libpurple/protocols/oscar/oscar.c:661
+#: ../libpurple/protocols/oscar/oscar.c:679
 msgid "ICQ Server Relay"
 msgstr "ICQ Server Relay"
 
-#: ../libpurple/protocols/oscar/oscar.c:664
+#: ../libpurple/protocols/oscar/oscar.c:682
 msgid "Old ICQ UTF8"
 msgstr "Antiguo ICQ UTF8"
 
-#: ../libpurple/protocols/oscar/oscar.c:667
+#: ../libpurple/protocols/oscar/oscar.c:685
 msgid "Trillian Encryption"
 msgstr "Cifrado Trillian"
 
-#: ../libpurple/protocols/oscar/oscar.c:670
+#: ../libpurple/protocols/oscar/oscar.c:688
 msgid "ICQ UTF8"
 msgstr "ICQ UTF8"
 
-#: ../libpurple/protocols/oscar/oscar.c:673
+#: ../libpurple/protocols/oscar/oscar.c:691
 msgid "Hiptop"
 msgstr "Hiptop"
 
-#: ../libpurple/protocols/oscar/oscar.c:676
+#: ../libpurple/protocols/oscar/oscar.c:694
 msgid "Security Enabled"
 msgstr "Seguridad activada"
 
-#: ../libpurple/protocols/oscar/oscar.c:679
+#: ../libpurple/protocols/oscar/oscar.c:697
 msgid "Video Chat"
 msgstr "Video chat"
 
-#: ../libpurple/protocols/oscar/oscar.c:683
+#: ../libpurple/protocols/oscar/oscar.c:701
 msgid "iChat AV"
 msgstr "iChat AV"
 
-#: ../libpurple/protocols/oscar/oscar.c:686
+#: ../libpurple/protocols/oscar/oscar.c:704
 msgid "Live Video"
 msgstr "Vídeo en tiempo real"
 
-#: ../libpurple/protocols/oscar/oscar.c:689
+#: ../libpurple/protocols/oscar/oscar.c:707
 msgid "Camera"
 msgstr "Cámara"
 
-#: ../libpurple/protocols/oscar/oscar.c:707
-#: ../libpurple/protocols/oscar/oscar.c:5690
+#: ../libpurple/protocols/oscar/oscar.c:725
+#: ../libpurple/protocols/oscar/oscar.c:5758
 msgid "Free For Chat"
 msgstr "Disponible para conversar"
 
-#: ../libpurple/protocols/oscar/oscar.c:711
-#: ../libpurple/protocols/oscar/oscar.c:5725
+#: ../libpurple/protocols/oscar/oscar.c:729
+#: ../libpurple/protocols/oscar/oscar.c:5793
 msgid "Not Available"
 msgstr "No disponible"
 
-#: ../libpurple/protocols/oscar/oscar.c:713
-#: ../libpurple/protocols/oscar/oscar.c:5711
+#: ../libpurple/protocols/oscar/oscar.c:731
+#: ../libpurple/protocols/oscar/oscar.c:5779
 msgid "Occupied"
 msgstr "Ocupado"
 
-#: ../libpurple/protocols/oscar/oscar.c:717
+#: ../libpurple/protocols/oscar/oscar.c:735
 msgid "Web Aware"
 msgstr "Capacidad web"
 
-#: ../libpurple/protocols/oscar/oscar.c:719 ../libpurple/protocols/qq/qq.c:183
-#: ../libpurple/protocols/yahoo/yahoo.c:2896 ../libpurple/status.c:156
+#: ../libpurple/protocols/oscar/oscar.c:737 ../libpurple/protocols/qq/qq.c:183
+#: ../libpurple/protocols/yahoo/yahoo.c:2913 ../libpurple/status.c:156
 #: ../pidgin/gtkdocklet.c:446 ../pidgin/gtkstatusbox.c:1053
 msgid "Invisible"
 msgstr "Invisible"
 
-#: ../libpurple/protocols/oscar/oscar.c:721
+#: ../libpurple/protocols/oscar/oscar.c:739
 msgid "Online"
 msgstr "Conectado"
 
-#: ../libpurple/protocols/oscar/oscar.c:820
-#: ../libpurple/protocols/oscar/oscar.c:3694
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:697 ../pidgin/gtkprefs.c:1015
+#: ../libpurple/protocols/oscar/oscar.c:838
+#: ../libpurple/protocols/oscar/oscar.c:3721
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:697 ../pidgin/gtkprefs.c:1042
 msgid "IP Address"
 msgstr "Dirección IP"
 
-#: ../libpurple/protocols/oscar/oscar.c:827
-#: ../libpurple/protocols/oscar/oscar.c:2846
+#: ../libpurple/protocols/oscar/oscar.c:845
+#: ../libpurple/protocols/oscar/oscar.c:2867
 msgid "Warning Level"
 msgstr "Niveles de aviso"
 
-#: ../libpurple/protocols/oscar/oscar.c:837
+#: ../libpurple/protocols/oscar/oscar.c:855
 msgid "Buddy Comment"
 msgstr "Comentario de amigo"
 
-#: ../libpurple/protocols/oscar/oscar.c:977
+#: ../libpurple/protocols/oscar/oscar.c:995
 #, c-format
 msgid ""
 "Could not connect to authentication server:\n"
@@ -6754,7 +6895,7 @@
 "No se pudo conectar al servidor de autenticación:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:985
+#: ../libpurple/protocols/oscar/oscar.c:1003
 #, c-format
 msgid ""
 "Could not connect to BOS server:\n"
@@ -6763,20 +6904,20 @@
 "No se pudo conectar al servidor BOS:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:1025
+#: ../libpurple/protocols/oscar/oscar.c:1043
 msgid "Screen name sent"
 msgstr "Se ha enviado el nombre de usuario"
 
-#: ../libpurple/protocols/oscar/oscar.c:1030
+#: ../libpurple/protocols/oscar/oscar.c:1048
 msgid "Connection established, cookie sent"
 msgstr "Conexión establecida, cookie enviada"
 
 #. TODO: Don't call this with ssi
-#: ../libpurple/protocols/oscar/oscar.c:1059
+#: ../libpurple/protocols/oscar/oscar.c:1077
 msgid "Finalizing connection"
 msgstr "Terminando la conexión"
 
-#: ../libpurple/protocols/oscar/oscar.c:1243
+#: ../libpurple/protocols/oscar/oscar.c:1261
 #, c-format
 msgid ""
 "Unable to login: Could not sign on as %s because the screen name is "
@@ -6787,30 +6928,30 @@
 "no es válido. Los nombres de usuario deben empezar con letras y sólo pueden "
 "contener letras, números y espacios, o contener sólo números."
 
-#: ../libpurple/protocols/oscar/oscar.c:1328
-#: ../libpurple/protocols/yahoo/yahoo.c:1932
+#: ../libpurple/protocols/oscar/oscar.c:1346
+#: ../libpurple/protocols/yahoo/yahoo.c:1934
 msgid "Invalid screen name."
 msgstr "Nombre de usuario no válido"
 
-#: ../libpurple/protocols/oscar/oscar.c:1335
+#: ../libpurple/protocols/oscar/oscar.c:1353
 #: ../libpurple/protocols/qq/login_logout.c:483
 #: ../libpurple/protocols/simple/simple.c:1037
-#: ../libpurple/protocols/yahoo/yahoo.c:1950
+#: ../libpurple/protocols/yahoo/yahoo.c:1952
 msgid "Incorrect password."
 msgstr "Contraseña incorrecta."
 
-#: ../libpurple/protocols/oscar/oscar.c:1340
+#: ../libpurple/protocols/oscar/oscar.c:1358
 msgid "Your account is currently suspended."
 msgstr "Su cuenta está deshabilitada actualmente."
 
 #. service temporarily unavailable
-#: ../libpurple/protocols/oscar/oscar.c:1344
+#: ../libpurple/protocols/oscar/oscar.c:1362
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr ""
 "El servicio de Mensajería Instantáneo AOL está temporalmente no disponible."
 
-#: ../libpurple/protocols/oscar/oscar.c:1349
-#: ../libpurple/protocols/oscar/oscar.c:1360
+#: ../libpurple/protocols/oscar/oscar.c:1367
+#: ../libpurple/protocols/oscar/oscar.c:1378
 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."
@@ -6819,46 +6960,46 @@
 "inténtelo de nuevo. Si sigue intentándolo, necesitará esperar incluso más "
 "tiempo."
 
-#: ../libpurple/protocols/oscar/oscar.c:1354
+#: ../libpurple/protocols/oscar/oscar.c:1372
 #, c-format
 msgid "The client version you are using is too old. Please upgrade at %s"
 msgstr ""
 "La versión del cliente que usa es demasiado antigua. Por favor, actualícela "
 "en %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:1394
+#: ../libpurple/protocols/oscar/oscar.c:1412
 msgid "Could Not Connect"
 msgstr "No se pudo conectar"
 
-#: ../libpurple/protocols/oscar/oscar.c:1399
+#: ../libpurple/protocols/oscar/oscar.c:1417
 msgid "Received authorization"
 msgstr "Se recibió la autorización"
 
-#: ../libpurple/protocols/oscar/oscar.c:1422
+#: ../libpurple/protocols/oscar/oscar.c:1440
 msgid "The SecurID key entered is invalid."
 msgstr "La clave SecurID que se ha introducido no es válida."
 
-#: ../libpurple/protocols/oscar/oscar.c:1436
+#: ../libpurple/protocols/oscar/oscar.c:1454
 msgid "Enter SecurID"
 msgstr "Introduzca SecurID"
 
-#: ../libpurple/protocols/oscar/oscar.c:1437
+#: ../libpurple/protocols/oscar/oscar.c:1455
 msgid "Enter the 6 digit number from the digital display."
 msgstr "Introduzca el dígito de seis números que aparece en la pantalla."
 
 #. *
 #. * A wrapper for purple_request_action() that uses @c OK and @c Cancel buttons.
 #.
-#: ../libpurple/protocols/oscar/oscar.c:1439
-#: ../libpurple/protocols/oscar/oscar.c:2230
-#: ../libpurple/protocols/oscar/oscar.c:2277
-#: ../libpurple/protocols/oscar/oscar.c:5795
-#: ../libpurple/protocols/oscar/oscar.c:6076 ../libpurple/request.h:1387
+#: ../libpurple/protocols/oscar/oscar.c:1457
+#: ../libpurple/protocols/oscar/oscar.c:2250
+#: ../libpurple/protocols/oscar/oscar.c:2297
+#: ../libpurple/protocols/oscar/oscar.c:5863
+#: ../libpurple/protocols/oscar/oscar.c:6144 ../libpurple/request.h:1387
 msgid "_OK"
 msgstr "_Aceptar"
 
-#: ../libpurple/protocols/oscar/oscar.c:1478
-#: ../libpurple/protocols/oscar/oscar.c:1521
+#: ../libpurple/protocols/oscar/oscar.c:1496
+#: ../libpurple/protocols/oscar/oscar.c:1539
 #, c-format
 msgid ""
 "You may be disconnected shortly.  You may want to use TOC until this is "
@@ -6867,53 +7008,53 @@
 "Quizá sea desconectado en breve.  Puede querer usar TOC hasta que esto se "
 "resuelva.  Compruebe %s para novedades."
 
-#: ../libpurple/protocols/oscar/oscar.c:1481
-#: ../libpurple/protocols/oscar/oscar.c:1524
+#: ../libpurple/protocols/oscar/oscar.c:1499
+#: ../libpurple/protocols/oscar/oscar.c:1542
 msgid "Unable to get a valid AIM login hash."
 msgstr "No se pudo obtener un «hash» de conexión a AIM válido."
 
-#: ../libpurple/protocols/oscar/oscar.c:1610
+#: ../libpurple/protocols/oscar/oscar.c:1627
 #, c-format
 msgid "You may be disconnected shortly.  Check %s for updates."
 msgstr "Quizá sea desconectado en breve.  Compruebe %s para novedades."
 
-#: ../libpurple/protocols/oscar/oscar.c:1613
+#: ../libpurple/protocols/oscar/oscar.c:1630
 msgid "Unable to get a valid login hash."
 msgstr "No se pudo un «hash» de conexión válido."
 
-#: ../libpurple/protocols/oscar/oscar.c:1639
+#: ../libpurple/protocols/oscar/oscar.c:1659
 msgid "Password sent"
 msgstr "Contraseña enviada"
 
-#: ../libpurple/protocols/oscar/oscar.c:1695
+#: ../libpurple/protocols/oscar/oscar.c:1715
 msgid "Unable to initialize connection"
 msgstr "No se pudo inicializar la conexión"
 
-#: ../libpurple/protocols/oscar/oscar.c:2200
+#: ../libpurple/protocols/oscar/oscar.c:2220
 msgid "Please authorize me so I can add you to my buddy list."
 msgstr "Por favor, autoríceme para que pueda añadirle a mi lista de amigos."
 
-#: ../libpurple/protocols/oscar/oscar.c:2228
+#: ../libpurple/protocols/oscar/oscar.c:2248
 msgid "Authorization Request Message:"
 msgstr "Mensaje de solicitud de autorización:"
 
-#: ../libpurple/protocols/oscar/oscar.c:2229
+#: ../libpurple/protocols/oscar/oscar.c:2249
 msgid "Please authorize me!"
 msgstr "¡Por favor, autoríceme!"
 
-#: ../libpurple/protocols/oscar/oscar.c:2269
-#: ../libpurple/protocols/oscar/oscar.c:2276
-#: ../libpurple/protocols/oscar/oscar.c:2403
-#: ../libpurple/protocols/oscar/oscar.c:5193
-#: ../libpurple/protocols/yahoo/yahoo.c:985
+#: ../libpurple/protocols/oscar/oscar.c:2289
+#: ../libpurple/protocols/oscar/oscar.c:2296
+#: ../libpurple/protocols/oscar/oscar.c:2423
+#: ../libpurple/protocols/oscar/oscar.c:5241
+#: ../libpurple/protocols/yahoo/yahoo.c:987
 msgid "No reason given."
 msgstr "No se indicó una razón."
 
-#: ../libpurple/protocols/oscar/oscar.c:2275
+#: ../libpurple/protocols/oscar/oscar.c:2295
 msgid "Authorization Denied Message:"
 msgstr "Mensaje de autorización denegada:"
 
-#: ../libpurple/protocols/oscar/oscar.c:2403
+#: ../libpurple/protocols/oscar/oscar.c:2423
 #, c-format
 msgid ""
 "The user %u has denied your request to add them to your buddy list for the "
@@ -6924,18 +7065,18 @@
 "la siguiente razón:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2404
+#: ../libpurple/protocols/oscar/oscar.c:2424
 msgid "ICQ authorization denied."
 msgstr "Autorización ICQ denegada."
 
 #. Someone has granted you authorization
-#: ../libpurple/protocols/oscar/oscar.c:2411
+#: ../libpurple/protocols/oscar/oscar.c:2431
 #, c-format
 msgid "The user %u has granted your request to add them to your buddy list."
 msgstr ""
 "El usuario %u ha autorizado su petición de añadirlo a su lista de amigos."
 
-#: ../libpurple/protocols/oscar/oscar.c:2419
+#: ../libpurple/protocols/oscar/oscar.c:2439
 #, c-format
 msgid ""
 "You have received a special message\n"
@@ -6948,7 +7089,7 @@
 "De: %s [%s]\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2427
+#: ../libpurple/protocols/oscar/oscar.c:2447
 #, c-format
 msgid ""
 "You have received an ICQ page\n"
@@ -6961,7 +7102,7 @@
 "De: %s [%s]\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2435
+#: ../libpurple/protocols/oscar/oscar.c:2455
 #, c-format
 msgid ""
 "You have received an ICQ e-mail from %s [%s]\n"
@@ -6974,38 +7115,38 @@
 "El mensaje es:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2456
+#: ../libpurple/protocols/oscar/oscar.c:2476
 #, c-format
 msgid "ICQ user %u has sent you a buddy: %s (%s)"
 msgstr "El usuario ICQ %u le ha enviado un amigo: %s (%s)"
 
-#: ../libpurple/protocols/oscar/oscar.c:2462
+#: ../libpurple/protocols/oscar/oscar.c:2482
 msgid "Do you want to add this buddy to your buddy list?"
 msgstr "¿Desea añadir este amigo a su lista de amigos?"
 
-#: ../libpurple/protocols/oscar/oscar.c:2467 ../pidgin/gtkroomlist.c:308
+#: ../libpurple/protocols/oscar/oscar.c:2487 ../pidgin/gtkroomlist.c:308
 msgid "_Add"
 msgstr "_Añadir"
 
-#: ../libpurple/protocols/oscar/oscar.c:2468
+#: ../libpurple/protocols/oscar/oscar.c:2488
 msgid "_Decline"
 msgstr "_Rehusar"
 
-#: ../libpurple/protocols/oscar/oscar.c:2552
+#: ../libpurple/protocols/oscar/oscar.c:2572
 #, 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] "Usted perdió %hu mensaje de %s porque no era válido."
 msgstr[1] "Se perdieron %hu mensajes de %s porque porque no eran válidos."
 
-#: ../libpurple/protocols/oscar/oscar.c:2561
+#: ../libpurple/protocols/oscar/oscar.c:2581
 #, 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] "Se perdió %hu mensaje de %s porque era demasiado largo."
 msgstr[1] "Se perdieron %hu mensajes de %s porque eran demasiado largos."
 
-#: ../libpurple/protocols/oscar/oscar.c:2570
+#: ../libpurple/protocols/oscar/oscar.c:2590
 #, c-format
 msgid ""
 "You missed %hu message from %s because the rate limit has been exceeded."
@@ -7015,21 +7156,21 @@
 msgstr[1] ""
 "Se perdieron %hu mensajes de %s porque fueron mandados demasiado rápido."
 
-#: ../libpurple/protocols/oscar/oscar.c:2579
+#: ../libpurple/protocols/oscar/oscar.c:2599
 #, 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] "Se perdió %hu mensaje de %s porque el/ella es muy malvado/a."
 msgstr[1] "Se perdieron %hu mensajes de %s porque el/ella es muy malvado/a."
 
-#: ../libpurple/protocols/oscar/oscar.c:2588
+#: ../libpurple/protocols/oscar/oscar.c:2608
 #, 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] "Se perdió %hu mensaje de %s porque usted es muy malvado/a."
 msgstr[1] "Se perdieron %hu mensajes de %s porque usted es muy malvado/a."
 
-#: ../libpurple/protocols/oscar/oscar.c:2597
+#: ../libpurple/protocols/oscar/oscar.c:2617
 #, 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."
@@ -7037,61 +7178,55 @@
 msgstr[1] "Se perdieron %hu mensajes de %s por motivos desconocidos."
 
 #. Data is assumed to be the destination sn
-#: ../libpurple/protocols/oscar/oscar.c:2752
+#: ../libpurple/protocols/oscar/oscar.c:2772
 #, c-format
 msgid "Unable to send message: %s"
 msgstr "No se pudo enviar el mensaje: %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2752
-#: ../libpurple/protocols/oscar/oscar.c:2757
-#: ../libpurple/protocols/oscar/oscar.c:2819
-#: ../libpurple/protocols/oscar/oscar.c:2823
+#: ../libpurple/protocols/oscar/oscar.c:2772
+#: ../libpurple/protocols/oscar/oscar.c:2777
+#: ../libpurple/protocols/oscar/oscar.c:2841
 msgid "Unknown reason."
 msgstr "Razón desconocida."
 
-#: ../libpurple/protocols/oscar/oscar.c:2755
+#: ../libpurple/protocols/oscar/oscar.c:2775
 #: ../libpurple/protocols/sametime/sametime.c:2409
 #, c-format
 msgid "Unable to send message to %s:"
 msgstr "No se pudo enviar el mensaje a %s:"
 
-#: ../libpurple/protocols/oscar/oscar.c:2819
+#: ../libpurple/protocols/oscar/oscar.c:2841
 #, c-format
 msgid "User information not available: %s"
 msgstr "Información de usuario de no disponible: %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2822
-#, c-format
-msgid "User information for %s unavailable:"
-msgstr "Información de usuario de %s no disponible:"
-
-#: ../libpurple/protocols/oscar/oscar.c:2851
+#: ../libpurple/protocols/oscar/oscar.c:2872
 msgid "Online Since"
 msgstr "Conectado desde"
 
-#: ../libpurple/protocols/oscar/oscar.c:2856
+#: ../libpurple/protocols/oscar/oscar.c:2877
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1161
 msgid "Member Since"
 msgstr "Miembro desde"
 
-#: ../libpurple/protocols/oscar/oscar.c:2861
+#: ../libpurple/protocols/oscar/oscar.c:2882
 msgid "Capabilities"
 msgstr "Capacidades"
 
-#: ../libpurple/protocols/oscar/oscar.c:2891
+#: ../libpurple/protocols/oscar/oscar.c:2912
 msgid "Available Message"
 msgstr "Mensajes disponibles"
 
-#: ../libpurple/protocols/oscar/oscar.c:2917
+#: ../libpurple/protocols/oscar/oscar.c:2940
 msgid "Profile"
 msgstr "Perfil"
 
-#: ../libpurple/protocols/oscar/oscar.c:2994
+#: ../libpurple/protocols/oscar/oscar.c:3020
 msgid "Your AIM connection may be lost."
 msgstr "Su conexión AIM puede haberse perdido."
 
 #. The conversion failed!
-#: ../libpurple/protocols/oscar/oscar.c:3181
+#: ../libpurple/protocols/oscar/oscar.c:3208
 msgid ""
 "[Unable to display a message from this user because it contained invalid "
 "characters.]"
@@ -7099,7 +7234,7 @@
 "[No se pudo mostrar un mensaje de este usuario porque contenía caracteres "
 "inválidos.]"
 
-#: ../libpurple/protocols/oscar/oscar.c:3384
+#: ../libpurple/protocols/oscar/oscar.c:3411
 msgid ""
 "The last action you attempted could not be performed because you are over "
 "the rate limit. Please wait 10 seconds and try again."
@@ -7108,85 +7243,86 @@
 "límite en la tasa de envío de mensajes. Por favor, espere 10 segundos y "
 "vuelva a intentarlo."
 
-#: ../libpurple/protocols/oscar/oscar.c:3456
+#: ../libpurple/protocols/oscar/oscar.c:3483
 msgid "You have been signed off for an unknown reason."
 msgstr "Ha sido desconectado por motivos desconocidos."
 
-#: ../libpurple/protocols/oscar/oscar.c:3469
+#: ../libpurple/protocols/oscar/oscar.c:3496
 #: ../libpurple/protocols/toc/toc.c:977
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "Ha sido desconectado de la sala de chat %s."
 
-#: ../libpurple/protocols/oscar/oscar.c:3716
-#: ../libpurple/protocols/silc/util.c:581
+#: ../libpurple/protocols/oscar/oscar.c:3743
+#: ../libpurple/protocols/silc/util.c:585
+#: ../libpurple/protocols/silc10/util.c:581
 msgid "Mobile Phone"
 msgstr "Teléfono móvil"
 
-#: ../libpurple/protocols/oscar/oscar.c:3746
+#: ../libpurple/protocols/oscar/oscar.c:3773
 msgid "Personal Web Page"
 msgstr "Página web personal"
 
-#: ../libpurple/protocols/oscar/oscar.c:3770
+#: ../libpurple/protocols/oscar/oscar.c:3797
 #: ../libpurple/protocols/qq/buddy_info.c:40
 msgid "Additional Information"
 msgstr "Información adicional"
 
-#: ../libpurple/protocols/oscar/oscar.c:3778
-#: ../libpurple/protocols/oscar/oscar.c:3791
+#: ../libpurple/protocols/oscar/oscar.c:3805
+#: ../libpurple/protocols/oscar/oscar.c:3818
 msgid "Zip Code"
 msgstr "Código postal"
 
-#: ../libpurple/protocols/oscar/oscar.c:3802
+#: ../libpurple/protocols/oscar/oscar.c:3829
 msgid "Division"
 msgstr "Sección"
 
-#: ../libpurple/protocols/oscar/oscar.c:3803
+#: ../libpurple/protocols/oscar/oscar.c:3830
 msgid "Position"
 msgstr "Cargo"
 
-#: ../libpurple/protocols/oscar/oscar.c:3805
+#: ../libpurple/protocols/oscar/oscar.c:3832
 msgid "Web Page"
 msgstr "Página web"
 
-#: ../libpurple/protocols/oscar/oscar.c:3808
+#: ../libpurple/protocols/oscar/oscar.c:3835
 msgid "Work Information"
 msgstr "Información de trabajo"
 
-#: ../libpurple/protocols/oscar/oscar.c:3864
+#: ../libpurple/protocols/oscar/oscar.c:3891
 msgid "Pop-Up Message"
 msgstr "Mensaje emergente"
 
-#: ../libpurple/protocols/oscar/oscar.c:3904
+#: ../libpurple/protocols/oscar/oscar.c:3931
 #, c-format
 msgid "The following screen name is associated with %s"
 msgid_plural "The following screen names are associated with %s"
 msgstr[0] "El siguiente nombre de usuario está asociado a %s"
 msgstr[1] "Los siguientes nombres de usuarios están asociados a %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:3909
+#: ../libpurple/protocols/oscar/oscar.c:3936
 msgid "Screen name"
 msgstr "Nombre de usuario"
 
-#: ../libpurple/protocols/oscar/oscar.c:3935
+#: ../libpurple/protocols/oscar/oscar.c:3962
 #, c-format
 msgid "No results found for e-mail address %s"
 msgstr "No se encontraron resultados para la dirección de correo %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:3956
+#: ../libpurple/protocols/oscar/oscar.c:3983
 #, c-format
 msgid "You should receive an e-mail asking to confirm %s."
 msgstr "Debería recibir un mensaje solicitando confirmación de %s."
 
-#: ../libpurple/protocols/oscar/oscar.c:3958
+#: ../libpurple/protocols/oscar/oscar.c:3985
 msgid "Account Confirmation Requested"
 msgstr "Confirmación de cuenta solicitada"
 
-#: ../libpurple/protocols/oscar/oscar.c:3989
+#: ../libpurple/protocols/oscar/oscar.c:4016
 msgid "Error Changing Account Info"
 msgstr "Error cambiando la información de la cuenta"
 
-#: ../libpurple/protocols/oscar/oscar.c:3992
+#: ../libpurple/protocols/oscar/oscar.c:4019
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
@@ -7195,14 +7331,14 @@
 "Error 0x%04x: No se puede dar formato al nombre de usuario porque el nombre "
 "de usuario solicitado difiere del original."
 
-#: ../libpurple/protocols/oscar/oscar.c:3995
+#: ../libpurple/protocols/oscar/oscar.c:4022
 #, c-format
 msgid "Error 0x%04x: Unable to format screen name because it is invalid."
 msgstr ""
 "Error 0x%04x: No se puede dar formato al nombre de usuario porque es "
 "inválido."
 
-#: ../libpurple/protocols/oscar/oscar.c:3998
+#: ../libpurple/protocols/oscar/oscar.c:4025
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
@@ -7211,7 +7347,7 @@
 "Error 0x%04x: No se puede dar formato al nombre de usuario porque el nombre "
 "de usuario solicitado es demasiado largo."
 
-#: ../libpurple/protocols/oscar/oscar.c:4001
+#: ../libpurple/protocols/oscar/oscar.c:4028
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change e-mail address because there is already a "
@@ -7220,7 +7356,7 @@
 "Error 0x%04x: No se puede cambiar la dirección de correo electrónico porque "
 "ya existe una solicitud pendiente para este nombre de usuario."
 
-#: ../libpurple/protocols/oscar/oscar.c:4004
+#: ../libpurple/protocols/oscar/oscar.c:4031
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change e-mail address because the given address has "
@@ -7229,7 +7365,7 @@
 "Error 0x%04x: No se puede cambiar la dirección de correo electrónico porque "
 "la dirección dada ya tiene demasiados nombres de usuarios asociados."
 
-#: ../libpurple/protocols/oscar/oscar.c:4007
+#: ../libpurple/protocols/oscar/oscar.c:4034
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change e-mail address because the given address is "
@@ -7238,32 +7374,32 @@
 "Error 0x%04x: No se puede cambiar la dirección de correo electrónico porque "
 "la dirección dada es inválida."
 
-#: ../libpurple/protocols/oscar/oscar.c:4010
+#: ../libpurple/protocols/oscar/oscar.c:4037
 #, c-format
 msgid "Error 0x%04x: Unknown error."
 msgstr "Error 0x%04x: Error desconocido."
 
-#: ../libpurple/protocols/oscar/oscar.c:4020
+#: ../libpurple/protocols/oscar/oscar.c:4047
 #, c-format
 msgid "The e-mail address for %s is %s"
 msgstr "La dirección de correo electrónico para %s es %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:4022
+#: ../libpurple/protocols/oscar/oscar.c:4049
 msgid "Account Info"
 msgstr "Información de la cuenta"
 
-#: ../libpurple/protocols/oscar/oscar.c:4194
+#: ../libpurple/protocols/oscar/oscar.c:4221
 msgid ""
 "Your IM Image was not sent. You must be Direct Connected to send IM Images."
 msgstr ""
 "No se ha enviado su imagen MI. Debe estar directamente conectado para enviar "
 "imágenes IM."
 
-#: ../libpurple/protocols/oscar/oscar.c:4439
+#: ../libpurple/protocols/oscar/oscar.c:4487
 msgid "Unable to set AIM profile."
 msgstr "No se pudo establecer el perfil AIM."
 
-#: ../libpurple/protocols/oscar/oscar.c:4440
+#: ../libpurple/protocols/oscar/oscar.c:4488
 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 "
@@ -7273,7 +7409,7 @@
 "conexión se haya completado.  Su perfil quedará sin cambiar, inténtelo "
 "nuevamente cuando ya esté conectado completamente."
 
-#: ../libpurple/protocols/oscar/oscar.c:4454
+#: ../libpurple/protocols/oscar/oscar.c:4502
 #, c-format
 msgid ""
 "The maximum profile length of %d byte has been exceeded.  It has been "
@@ -7286,11 +7422,11 @@
 msgstr[1] ""
 "Se ha excedido el tamaño máximo de perfil de %d bytes. Se ha truncado."
 
-#: ../libpurple/protocols/oscar/oscar.c:4459
+#: ../libpurple/protocols/oscar/oscar.c:4507
 msgid "Profile too long."
 msgstr "Perfil demasiado largo."
 
-#: ../libpurple/protocols/oscar/oscar.c:4504
+#: ../libpurple/protocols/oscar/oscar.c:4552
 #, c-format
 msgid ""
 "The maximum away message length of %d byte has been exceeded.  It has been "
@@ -7305,11 +7441,11 @@
 "Se excedió el límite de %d bytes de longitud en el mensaje de ausencia. Se "
 "ha truncado."
 
-#: ../libpurple/protocols/oscar/oscar.c:4509
+#: ../libpurple/protocols/oscar/oscar.c:4557
 msgid "Away message too long."
 msgstr "Mensaje de ausencia demasiado largo"
 
-#: ../libpurple/protocols/oscar/oscar.c:4578
+#: ../libpurple/protocols/oscar/oscar.c:4626
 #, c-format
 msgid ""
 "Could not add the buddy %s because the screen name is invalid.  Screen names "
@@ -7320,17 +7456,17 @@
 "nombres de usuario deben empezar con letras y sólo pueden contener letras, "
 "números y espacios, o contener sólo números."
 
-#: ../libpurple/protocols/oscar/oscar.c:4580
-#: ../libpurple/protocols/oscar/oscar.c:5003
-#: ../libpurple/protocols/oscar/oscar.c:5017
+#: ../libpurple/protocols/oscar/oscar.c:4628
+#: ../libpurple/protocols/oscar/oscar.c:5051
+#: ../libpurple/protocols/oscar/oscar.c:5065
 msgid "Unable To Add"
 msgstr "No se pudo añadir"
 
-#: ../libpurple/protocols/oscar/oscar.c:4684
+#: ../libpurple/protocols/oscar/oscar.c:4732
 msgid "Unable To Retrieve Buddy List"
 msgstr "No se ha podido obtener la lista de amigos"
 
-#: ../libpurple/protocols/oscar/oscar.c:4685
+#: ../libpurple/protocols/oscar/oscar.c:4733
 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."
@@ -7339,16 +7475,16 @@
 "de AIM. No se ha perdido la lista de amigos, seguramente volverá a estar "
 "disponible en unas horas."
 
-#: ../libpurple/protocols/oscar/oscar.c:4889
-#: ../libpurple/protocols/oscar/oscar.c:4890
-#: ../libpurple/protocols/oscar/oscar.c:4895
-#: ../libpurple/protocols/oscar/oscar.c:5071
-#: ../libpurple/protocols/oscar/oscar.c:5072
-#: ../libpurple/protocols/oscar/oscar.c:5077
+#: ../libpurple/protocols/oscar/oscar.c:4937
+#: ../libpurple/protocols/oscar/oscar.c:4938
+#: ../libpurple/protocols/oscar/oscar.c:4943
+#: ../libpurple/protocols/oscar/oscar.c:5119
+#: ../libpurple/protocols/oscar/oscar.c:5120
+#: ../libpurple/protocols/oscar/oscar.c:5125
 msgid "Orphans"
 msgstr "Huérfanos"
 
-#: ../libpurple/protocols/oscar/oscar.c:5001
+#: ../libpurple/protocols/oscar/oscar.c:5049
 #, c-format
 msgid ""
 "Could not add the buddy %s because you have too many buddies in your buddy "
@@ -7357,12 +7493,12 @@
 "No se ha podido añadir al amigo %s porque hay demasiados contactos en la "
 "lista de amigos. Por favor, elimine uno y vuelva a probar."
 
-#: ../libpurple/protocols/oscar/oscar.c:5001
-#: ../libpurple/protocols/oscar/oscar.c:5015
+#: ../libpurple/protocols/oscar/oscar.c:5049
+#: ../libpurple/protocols/oscar/oscar.c:5063
 msgid "(no name)"
 msgstr "(sin nombre)"
 
-#: ../libpurple/protocols/oscar/oscar.c:5015
+#: ../libpurple/protocols/oscar/oscar.c:5063
 #, c-format
 msgid ""
 "Could not add the buddy %s for an unknown reason.  The most common reason "
@@ -7373,7 +7509,7 @@
 "habitual es que ha llegado al máximo número de amigos permitidos en su lista "
 "de amigos."
 
-#: ../libpurple/protocols/oscar/oscar.c:5108
+#: ../libpurple/protocols/oscar/oscar.c:5156
 #, c-format
 msgid ""
 "The user %s has given you permission to add you to their buddy list.  Do you "
@@ -7382,23 +7518,23 @@
 "El usuario %s le ha dado a usted permiso para añadirle a su lista de "
 "amigos.  ¿Desea hacerlo?"
 
-#: ../libpurple/protocols/oscar/oscar.c:5116
+#: ../libpurple/protocols/oscar/oscar.c:5164
 msgid "Authorization Given"
 msgstr "Autorización otorgada"
 
 #. Granted
-#: ../libpurple/protocols/oscar/oscar.c:5189
+#: ../libpurple/protocols/oscar/oscar.c:5237
 #, c-format
 msgid "The user %s has granted your request to add them to your buddy list."
 msgstr ""
 "El usuario %s ha autorizado su solicitud de añadirlo a su lista de amigos."
 
-#: ../libpurple/protocols/oscar/oscar.c:5190
+#: ../libpurple/protocols/oscar/oscar.c:5238
 msgid "Authorization Granted"
 msgstr "Autorización aceptada"
 
 #. Denied
-#: ../libpurple/protocols/oscar/oscar.c:5193
+#: ../libpurple/protocols/oscar/oscar.c:5241
 #, c-format
 msgid ""
 "The user %s has denied your request to add them to your buddy list for the "
@@ -7409,52 +7545,52 @@
 "la siguiente razón:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:5194
+#: ../libpurple/protocols/oscar/oscar.c:5242
 msgid "Authorization Denied"
 msgstr "Autorización denegada"
 
-#: ../libpurple/protocols/oscar/oscar.c:5230
+#: ../libpurple/protocols/oscar/oscar.c:5278
 #: ../libpurple/protocols/toc/toc.c:1371
 msgid "_Exchange:"
 msgstr "_Intercambio:"
 
-#: ../libpurple/protocols/oscar/oscar.c:5270
+#: ../libpurple/protocols/oscar/oscar.c:5318
 msgid "Invalid chat name specified."
 msgstr "Se especificó un nombre de chat no válido."
 
-#: ../libpurple/protocols/oscar/oscar.c:5340
+#: ../libpurple/protocols/oscar/oscar.c:5387
 msgid "Your IM Image was not sent. You cannot send IM Images in AIM chats."
 msgstr ""
 "No se ha enviado su imagen MI. No se pueden enviar imágenes IM en chats AIM."
 
-#: ../libpurple/protocols/oscar/oscar.c:5479
-#: ../libpurple/protocols/oscar/oscar.c:5484
+#: ../libpurple/protocols/oscar/oscar.c:5547
+#: ../libpurple/protocols/oscar/oscar.c:5552
 msgid "Away Message"
 msgstr "Mensajes de ausencia"
 
-#: ../libpurple/protocols/oscar/oscar.c:5484
+#: ../libpurple/protocols/oscar/oscar.c:5552
 msgid "<i>(retrieving)</i>"
 msgstr " <i>(obteniendo)</i>"
 
-#: ../libpurple/protocols/oscar/oscar.c:5684
+#: ../libpurple/protocols/oscar/oscar.c:5752
 msgid "iTunes Music Store Link"
 msgstr "Enlace a la tienda de música de iTunes"
 
-#: ../libpurple/protocols/oscar/oscar.c:5792
+#: ../libpurple/protocols/oscar/oscar.c:5860
 #, c-format
 msgid "Buddy Comment for %s"
 msgstr "Comentario de amigo para %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:5793
+#: ../libpurple/protocols/oscar/oscar.c:5861
 msgid "Buddy Comment:"
 msgstr "Comentario de amigo:"
 
-#: ../libpurple/protocols/oscar/oscar.c:5840
+#: ../libpurple/protocols/oscar/oscar.c:5908
 #, c-format
 msgid "You have selected to open a Direct IM connection with %s."
 msgstr "Usted pidió abrir una conexión MI directa con %s."
 
-#: ../libpurple/protocols/oscar/oscar.c:5844
+#: ../libpurple/protocols/oscar/oscar.c:5912
 msgid ""
 "Because this reveals your IP address, it may be considered a security risk.  "
 "Do you wish to continue?"
@@ -7462,66 +7598,66 @@
 "Puede considerarse como un riesgo a su privacidad  ya que hacer ésto revela "
 "su dirección IP. ¿Quiere continuar?"
 
-#: ../libpurple/protocols/oscar/oscar.c:5850
+#: ../libpurple/protocols/oscar/oscar.c:5918
 msgid "C_onnect"
 msgstr "C_onectar"
 
 # TBD - comprobar si esto afecta al botón en pantalla
-#: ../libpurple/protocols/oscar/oscar.c:5885
+#: ../libpurple/protocols/oscar/oscar.c:5953
 msgid "Get AIM Info"
 msgstr "Info"
 
-#: ../libpurple/protocols/oscar/oscar.c:5891
+#: ../libpurple/protocols/oscar/oscar.c:5959
 msgid "Edit Buddy Comment"
 msgstr "Editar comentario de amigo"
 
-#: ../libpurple/protocols/oscar/oscar.c:5899
+#: ../libpurple/protocols/oscar/oscar.c:5967
 msgid "Get Status Msg"
 msgstr "Obtener msj de estado"
 
-#: ../libpurple/protocols/oscar/oscar.c:5912
+#: ../libpurple/protocols/oscar/oscar.c:5980
 msgid "Direct IM"
 msgstr "MI directo"
 
-#: ../libpurple/protocols/oscar/oscar.c:5934
+#: ../libpurple/protocols/oscar/oscar.c:6002
 msgid "Re-request Authorization"
 msgstr "Solicitar autorización otra vez"
 
-#: ../libpurple/protocols/oscar/oscar.c:5993
+#: ../libpurple/protocols/oscar/oscar.c:6061
 msgid "Require authorization"
 msgstr "Solicitar autorización"
 
-#: ../libpurple/protocols/oscar/oscar.c:5996
+#: ../libpurple/protocols/oscar/oscar.c:6064
 msgid "Web aware (enabling this will cause you to receive SPAM!)"
 msgstr "Capacidad web (¡si activa esto hará que recibe SPAM!)"
 
-#: ../libpurple/protocols/oscar/oscar.c:6001
+#: ../libpurple/protocols/oscar/oscar.c:6069
 msgid "ICQ Privacy Options"
 msgstr "Opciones de privacidad de ICQ"
 
-#: ../libpurple/protocols/oscar/oscar.c:6020
+#: ../libpurple/protocols/oscar/oscar.c:6088
 msgid "The new formatting is invalid."
 msgstr "El nuevo formato es inválido."
 
-#: ../libpurple/protocols/oscar/oscar.c:6021
+#: ../libpurple/protocols/oscar/oscar.c:6089
 msgid "Screen name formatting can change only capitalization and whitespace."
 msgstr ""
 "El formato del nombre de usuario sólo puede cambiar en la capitalización y "
 "espacios en blanco."
 
-#: ../libpurple/protocols/oscar/oscar.c:6074
+#: ../libpurple/protocols/oscar/oscar.c:6142
 msgid "Change Address To:"
 msgstr "Cambiar dirección a:"
 
-#: ../libpurple/protocols/oscar/oscar.c:6120
+#: ../libpurple/protocols/oscar/oscar.c:6188
 msgid "<i>you are not waiting for authorization</i>"
 msgstr "<i>usted no está esperando autorización</i>"
 
-#: ../libpurple/protocols/oscar/oscar.c:6123
+#: ../libpurple/protocols/oscar/oscar.c:6191
 msgid "You are awaiting authorization from the following buddies"
 msgstr "En espera de la autorización de los siguientes amigos"
 
-#: ../libpurple/protocols/oscar/oscar.c:6124
+#: ../libpurple/protocols/oscar/oscar.c:6192
 msgid ""
 "You can re-request authorization from these buddies by right-clicking on "
 "them and selecting \"Re-request Authorization.\""
@@ -7529,74 +7665,74 @@
 "Puede volver a pedir autorización a estos amigos apretando el botón derecho "
 "del ratón sobre ellos y escogiendo «Solicitar autorización otra vez.»"
 
-#: ../libpurple/protocols/oscar/oscar.c:6141
+#: ../libpurple/protocols/oscar/oscar.c:6209
 msgid "Find Buddy by E-Mail"
 msgstr "Buscar un amigo en base a su correo electrónico"
 
-#: ../libpurple/protocols/oscar/oscar.c:6142
+#: ../libpurple/protocols/oscar/oscar.c:6210
 msgid "Search for a buddy by e-mail address"
 msgstr "Buscar amigo por la dirección correo electrónico"
 
-#: ../libpurple/protocols/oscar/oscar.c:6143
+#: ../libpurple/protocols/oscar/oscar.c:6211
 msgid "Type the e-mail address of the buddy you are searching for."
 msgstr ""
 "Escriba la dirección de correo electrónico del amigo que está buscando."
 
-#: ../libpurple/protocols/oscar/oscar.c:6146
+#: ../libpurple/protocols/oscar/oscar.c:6214
 msgid "_Search"
 msgstr "_Buscar"
 
-#: ../libpurple/protocols/oscar/oscar.c:6304
+#: ../libpurple/protocols/oscar/oscar.c:6372
 msgid "Set User Info (URL)..."
 msgstr "Establecer su información de usuario (URL)..."
 
-#: ../libpurple/protocols/oscar/oscar.c:6315
+#: ../libpurple/protocols/oscar/oscar.c:6383
 msgid "Change Password (URL)"
 msgstr "Cambiar su contraseña (URL)"
 
-#: ../libpurple/protocols/oscar/oscar.c:6319
+#: ../libpurple/protocols/oscar/oscar.c:6387
 msgid "Configure IM Forwarding (URL)"
 msgstr "Configurar reenvío de MI (URL)"
 
 #. ICQ actions
-#: ../libpurple/protocols/oscar/oscar.c:6329
+#: ../libpurple/protocols/oscar/oscar.c:6397
 msgid "Set Privacy Options..."
 msgstr "Configurar las opciones de privacidad..."
 
 #. AIM actions
-#: ../libpurple/protocols/oscar/oscar.c:6336
+#: ../libpurple/protocols/oscar/oscar.c:6404
 msgid "Confirm Account"
 msgstr "Confirmar cuenta"
 
-#: ../libpurple/protocols/oscar/oscar.c:6340
+#: ../libpurple/protocols/oscar/oscar.c:6408
 msgid "Display Currently Registered E-Mail Address"
 msgstr "Mostrar direcciones de correo registradas actualmente"
 
-#: ../libpurple/protocols/oscar/oscar.c:6344
+#: ../libpurple/protocols/oscar/oscar.c:6412
 msgid "Change Currently Registered E-Mail Address..."
 msgstr "Cambiar la dirección de correo registrada actualmente..."
 
-#: ../libpurple/protocols/oscar/oscar.c:6351
+#: ../libpurple/protocols/oscar/oscar.c:6419
 msgid "Show Buddies Awaiting Authorization"
 msgstr "Mostrar amigos pendientes de autorización"
 
-#: ../libpurple/protocols/oscar/oscar.c:6357
+#: ../libpurple/protocols/oscar/oscar.c:6425
 msgid "Search for Buddy by E-Mail Address..."
 msgstr "Buscar un amigo por correo electrónico..."
 
-#: ../libpurple/protocols/oscar/oscar.c:6362
-msgid "Search for Buddy by Information"
-msgstr "Buscar un amigo a través de su información"
-
 #: ../libpurple/protocols/oscar/oscar.c:6430
+msgid "Search for Buddy by Information"
+msgstr "Buscar un amigo a través de su información"
+
+#: ../libpurple/protocols/oscar/oscar.c:6498
 msgid "Use recent buddies group"
 msgstr "Usar grupo de amigos reciente"
 
-#: ../libpurple/protocols/oscar/oscar.c:6433
+#: ../libpurple/protocols/oscar/oscar.c:6501
 msgid "Show how long you have been idle"
 msgstr "Mostrar cuánto tiempo se ha estado inactivo"
 
-#: ../libpurple/protocols/oscar/oscar.c:6588
+#: ../libpurple/protocols/oscar/oscar.c:6656
 msgid ""
 "Always use ICQ proxy server for file transfers\n"
 "(slower, but does not reveal your IP address)"
@@ -7808,7 +7944,8 @@
 msgid ""
 "Setting custom faces is not currently supported. Please choose an image from "
 "%s."
-msgstr "No se puede fijar una cara a medida. Por favor, escoja una imagen de %s."
+msgstr ""
+"No se puede fijar una cara a medida. Por favor, escoja una imagen de %s."
 
 #: ../libpurple/protocols/qq/buddy_info.c:577
 #: ../libpurple/protocols/qq/buddy_info.c:590
@@ -8101,13 +8238,7 @@
 msgstr "No pudo conectarse, compruebe el registro de depuración"
 
 #. we didn't successfully connect. tdt->toc_fd is valid here
-#. TODO: Include error_message in the message below
 #: ../libpurple/protocols/qq/qq.c:139 ../libpurple/protocols/toc/toc.c:173
-#: ../libpurple/protocols/yahoo/yahoo.c:2378
-#: ../libpurple/protocols/yahoo/yahoo.c:2406
-#: ../libpurple/protocols/yahoo/yahoo.c:2513
-#: ../libpurple/protocols/yahoo/yahoo.c:2534
-#: ../libpurple/protocols/yahoo/yahoo.c:2618
 #: ../libpurple/protocols/yahoo/yahoo_filexfer.c:108
 #: ../libpurple/protocols/yahoo/yahoo_filexfer.c:188
 #: ../libpurple/protocols/yahoo/ycht.c:549
@@ -8517,7 +8648,7 @@
 msgid "Send TEST Announcement"
 msgstr "Enviar anuncio de prueba"
 
-#: ../libpurple/protocols/sametime/sametime.c:3586 ../pidgin/gtkconv.c:4177
+#: ../libpurple/protocols/sametime/sametime.c:3586 ../pidgin/gtkconv.c:4266
 msgid "Topic:"
 msgstr "Tema:"
 
@@ -8542,6 +8673,10 @@
 msgid "No Sametime Community Server Specified"
 msgstr "No se ha especificado un servidor de comunidad «Sametime»"
 
+#: ../libpurple/protocols/sametime/sametime.c:3644 ../pidgin/gtkblist.c:4003
+msgid "Connect"
+msgstr "Conectar"
+
 #: ../libpurple/protocols/sametime/sametime.c:4135
 #, c-format
 msgid "Unknown (0x%04x)<br>"
@@ -8720,7 +8855,8 @@
 "a continuación. Puede añadir estos usuarios a su lista de amigos o enviarles "
 "mensajes con los botones de acciones mostrados abajo."
 
-#: ../libpurple/protocols/sametime/sametime.c:5538 ../pidgin/gtknotify.c:716
+#. Create the window
+#: ../libpurple/protocols/sametime/sametime.c:5538 ../pidgin/gtknotify.c:719
 msgid "Search Results"
 msgstr "Resultados de la búsqueda"
 
@@ -8781,60 +8917,85 @@
 msgstr "Ocultar identidad de cliente"
 
 #: ../libpurple/protocols/silc/buddy.c:52
-#: ../libpurple/protocols/silc/buddy.c:421
-#: ../libpurple/protocols/silc/buddy.c:546
-#: ../libpurple/protocols/silc/buddy.c:712
-#: ../libpurple/protocols/silc/ft.c:338
+#: ../libpurple/protocols/silc/buddy.c:410
+#: ../libpurple/protocols/silc/buddy.c:538
+#: ../libpurple/protocols/silc/buddy.c:700
+#: ../libpurple/protocols/silc/ft.c:423
+#: ../libpurple/protocols/silc10/buddy.c:52
+#: ../libpurple/protocols/silc10/buddy.c:421
+#: ../libpurple/protocols/silc10/buddy.c:546
+#: ../libpurple/protocols/silc10/buddy.c:712
+#: ../libpurple/protocols/silc10/ft.c:338
 #, c-format
 msgid "User %s is not present in the network"
 msgstr "El usuario %s no está disponible en la red"
 
 #: ../libpurple/protocols/silc/buddy.c:53
+#: ../libpurple/protocols/silc/buddy.c:110
 #: ../libpurple/protocols/silc/buddy.c:115
-#: ../libpurple/protocols/silc/buddy.c:120
+#: ../libpurple/protocols/silc/buddy.c:119
 #: ../libpurple/protocols/silc/buddy.c:124
 #: ../libpurple/protocols/silc/buddy.c:129
 #: ../libpurple/protocols/silc/buddy.c:134
-#: ../libpurple/protocols/silc/buddy.c:139
-#: ../libpurple/protocols/silc/buddy.c:257
+#: ../libpurple/protocols/silc/buddy.c:254
+#: ../libpurple/protocols/silc10/buddy.c:53
+#: ../libpurple/protocols/silc10/buddy.c:115
+#: ../libpurple/protocols/silc10/buddy.c:120
+#: ../libpurple/protocols/silc10/buddy.c:124
+#: ../libpurple/protocols/silc10/buddy.c:129
+#: ../libpurple/protocols/silc10/buddy.c:134
+#: ../libpurple/protocols/silc10/buddy.c:139
+#: ../libpurple/protocols/silc10/buddy.c:257
 msgid "Key Agreement"
 msgstr "Acuerdo de claves"
 
 #: ../libpurple/protocols/silc/buddy.c:54
+#: ../libpurple/protocols/silc10/buddy.c:54
 msgid "Cannot perform the key agreement"
 msgstr "No se pudo establecer el acuerdo de claves"
 
-#: ../libpurple/protocols/silc/buddy.c:116
+#: ../libpurple/protocols/silc/buddy.c:111
+#: ../libpurple/protocols/silc10/buddy.c:116
 msgid "Error occurred during key agreement"
 msgstr "Se produjo un error durante el acuerdo de claves"
 
-#: ../libpurple/protocols/silc/buddy.c:120
+#: ../libpurple/protocols/silc/buddy.c:115
+#: ../libpurple/protocols/silc10/buddy.c:120
 msgid "Key Agreement failed"
 msgstr "Falló el acuerdo de claves"
 
-#: ../libpurple/protocols/silc/buddy.c:125
+#: ../libpurple/protocols/silc/buddy.c:120
+#: ../libpurple/protocols/silc10/buddy.c:125
 msgid "Timeout during key agreement"
 msgstr "Expiró el tiempo durante el acuerdo de claves"
 
+#: ../libpurple/protocols/silc/buddy.c:125
+#: ../libpurple/protocols/silc10/buddy.c:130
+msgid "Key agreement was aborted"
+msgstr "Se interrumpió el acuerdo de claves"
+
 #: ../libpurple/protocols/silc/buddy.c:130
-msgid "Key agreement was aborted"
-msgstr "Se interrumpió el acuerdo de claves"
-
-#: ../libpurple/protocols/silc/buddy.c:135
+#: ../libpurple/protocols/silc10/buddy.c:135
 msgid "Key agreement is already started"
 msgstr "Ya se ha iniciado el acuerdo de claves"
 
-#: ../libpurple/protocols/silc/buddy.c:140
+#: ../libpurple/protocols/silc/buddy.c:135
+#: ../libpurple/protocols/silc10/buddy.c:140
 msgid "Key agreement cannot be started with yourself"
 msgstr "No puede comenzar el acuerdo de claves consigo mismo"
 
-#: ../libpurple/protocols/silc/buddy.c:258
-#: ../libpurple/protocols/silc/buddy.c:389
-#: ../libpurple/protocols/silc/buddy.c:514
+#: ../libpurple/protocols/silc/buddy.c:255
+#: ../libpurple/protocols/silc/buddy.c:383
+#: ../libpurple/protocols/silc/buddy.c:497
+#: ../libpurple/protocols/silc/buddy.c:508
+#: ../libpurple/protocols/silc10/buddy.c:258
+#: ../libpurple/protocols/silc10/buddy.c:389
+#: ../libpurple/protocols/silc10/buddy.c:514
 msgid "The remote user is not present in the network any more"
 msgstr "El usuario remoto ya no está activo dentro de la red"
 
-#: ../libpurple/protocols/silc/buddy.c:295
+#: ../libpurple/protocols/silc/buddy.c:298
+#: ../libpurple/protocols/silc10/buddy.c:295
 #, c-format
 msgid ""
 "Key agreement request received from %s. Would you like to perform the key "
@@ -8843,7 +9004,8 @@
 "Se ha recibido una solicitud de acuerdo de claves de %s. ¿Desea realizar el "
 "intercambio de claves?"
 
-#: ../libpurple/protocols/silc/buddy.c:299
+#: ../libpurple/protocols/silc/buddy.c:302
+#: ../libpurple/protocols/silc10/buddy.c:299
 #, c-format
 msgid ""
 "The remote user is waiting key agreement on:\n"
@@ -8854,69 +9016,99 @@
 "Servidor remoto: %s\n"
 "Puerto remoto: %d"
 
-#: ../libpurple/protocols/silc/buddy.c:312
+#: ../libpurple/protocols/silc/buddy.c:315
+#: ../libpurple/protocols/silc10/buddy.c:312
 msgid "Key Agreement Request"
 msgstr "Solicitud de acuerdo de claves"
 
-#: ../libpurple/protocols/silc/buddy.c:388
-#: ../libpurple/protocols/silc/buddy.c:423
-#: ../libpurple/protocols/silc/buddy.c:465
+#: ../libpurple/protocols/silc/buddy.c:382
+#: ../libpurple/protocols/silc/buddy.c:412
+#: ../libpurple/protocols/silc/buddy.c:452
+#: ../libpurple/protocols/silc10/buddy.c:388
+#: ../libpurple/protocols/silc10/buddy.c:423
+#: ../libpurple/protocols/silc10/buddy.c:465
 msgid "IM With Password"
 msgstr "MI con contraseña"
 
-#: ../libpurple/protocols/silc/buddy.c:424
+#: ../libpurple/protocols/silc/buddy.c:413
+#: ../libpurple/protocols/silc10/buddy.c:424
 msgid "Cannot set IM key"
 msgstr "No se pudo establecer la clave MI"
 
-#: ../libpurple/protocols/silc/buddy.c:466
+#: ../libpurple/protocols/silc/buddy.c:453
+#: ../libpurple/protocols/silc10/buddy.c:466
 msgid "Set IM Password"
 msgstr "Establecer contraseña MI"
 
-#: ../libpurple/protocols/silc/buddy.c:513
-#: ../libpurple/protocols/silc/buddy.c:548
-#: ../libpurple/protocols/silc/ops.c:1494
-#: ../libpurple/protocols/silc/ops.c:1505
+#: ../libpurple/protocols/silc/buddy.c:496
+#: ../libpurple/protocols/silc/buddy.c:507
+#: ../libpurple/protocols/silc/buddy.c:540
+#: ../libpurple/protocols/silc/ops.c:1499
+#: ../libpurple/protocols/silc/ops.c:1510
+#: ../libpurple/protocols/silc10/buddy.c:513
+#: ../libpurple/protocols/silc10/buddy.c:548
+#: ../libpurple/protocols/silc10/ops.c:1494
+#: ../libpurple/protocols/silc10/ops.c:1505
 msgid "Get Public Key"
 msgstr "Obtener clave pública"
 
-#: ../libpurple/protocols/silc/buddy.c:549
-#: ../libpurple/protocols/silc/ops.c:1495
-#: ../libpurple/protocols/silc/ops.c:1506
+#: ../libpurple/protocols/silc/buddy.c:541
+#: ../libpurple/protocols/silc/ops.c:1500
+#: ../libpurple/protocols/silc/ops.c:1511
+#: ../libpurple/protocols/silc10/buddy.c:549
+#: ../libpurple/protocols/silc10/ops.c:1495
+#: ../libpurple/protocols/silc10/ops.c:1506
 msgid "Cannot fetch the public key"
 msgstr "No se pudo obtener la clave pública"
 
-#: ../libpurple/protocols/silc/buddy.c:635
-#: ../libpurple/protocols/silc/buddy.c:1654
+#: ../libpurple/protocols/silc/buddy.c:622
+#: ../libpurple/protocols/silc/buddy.c:1655
+#: ../libpurple/protocols/silc10/buddy.c:635
+#: ../libpurple/protocols/silc10/buddy.c:1654
 msgid "Show Public Key"
 msgstr "Mostrar clave pública"
 
-#: ../libpurple/protocols/silc/buddy.c:636
-#: ../libpurple/protocols/silc/buddy.c:1033
+#: ../libpurple/protocols/silc/buddy.c:623
+#: ../libpurple/protocols/silc/buddy.c:1027
 #: ../libpurple/protocols/silc/chat.c:237
+#: ../libpurple/protocols/silc10/buddy.c:636
+#: ../libpurple/protocols/silc10/buddy.c:1033
+#: ../libpurple/protocols/silc10/chat.c:237
 msgid "Could not load public key"
 msgstr "No se pudo cargar la clave pública"
 
-#: ../libpurple/protocols/silc/buddy.c:713
-#: ../libpurple/protocols/silc/ops.c:1087
-#: ../libpurple/protocols/silc/ops.c:1159
-#: ../libpurple/protocols/silc/ops.c:1294
-#: ../libpurple/protocols/silc/ops.c:1295
-#: ../libpurple/protocols/silc/ops.c:1313
+#: ../libpurple/protocols/silc/buddy.c:701
+#: ../libpurple/protocols/silc/ops.c:1053
+#: ../libpurple/protocols/silc/ops.c:1168
+#: ../libpurple/protocols/silc/ops.c:1288
+#: ../libpurple/protocols/silc/ops.c:1289
+#: ../libpurple/protocols/silc/ops.c:1307
+#: ../libpurple/protocols/silc10/buddy.c:713
+#: ../libpurple/protocols/silc10/ops.c:1087
+#: ../libpurple/protocols/silc10/ops.c:1159
+#: ../libpurple/protocols/silc10/ops.c:1294
+#: ../libpurple/protocols/silc10/ops.c:1295
+#: ../libpurple/protocols/silc10/ops.c:1313
 msgid "User Information"
 msgstr "Información de usuario"
 
-#: ../libpurple/protocols/silc/buddy.c:714
-#: ../libpurple/protocols/silc/ops.c:1160
-#: ../libpurple/protocols/silc/ops.c:1314
+#: ../libpurple/protocols/silc/buddy.c:702
+#: ../libpurple/protocols/silc/ops.c:1169
+#: ../libpurple/protocols/silc/ops.c:1308
+#: ../libpurple/protocols/silc10/buddy.c:714
+#: ../libpurple/protocols/silc10/ops.c:1160
+#: ../libpurple/protocols/silc10/ops.c:1314
 msgid "Cannot get user information"
 msgstr "No se pudo obtener la información del usuario %s"
 
-#: ../libpurple/protocols/silc/buddy.c:735
+#: ../libpurple/protocols/silc/buddy.c:723
+#: ../libpurple/protocols/silc10/buddy.c:735
 #, c-format
 msgid "The %s buddy is not trusted"
 msgstr "No se confía en el amigo %s"
 
-#: ../libpurple/protocols/silc/buddy.c:738
+#: ../libpurple/protocols/silc/buddy.c:726
+#: ../libpurple/protocols/silc10/buddy.c:738
 msgid ""
 "You cannot receive buddy notifications until you import his/her public key.  "
 "You can use the Get Public Key command to get the public key."
@@ -8925,16 +9117,19 @@
 "pública. Puede utilizar la orden \"Obtener clave pública\" para importarla."
 
 #. Open file selector to select the public key.
-#: ../libpurple/protocols/silc/buddy.c:1067
+#: ../libpurple/protocols/silc/buddy.c:1059
+#: ../libpurple/protocols/silc10/buddy.c:1067
 msgid "Open..."
 msgstr "Abrir..."
 
-#: ../libpurple/protocols/silc/buddy.c:1078
+#: ../libpurple/protocols/silc/buddy.c:1070
+#: ../libpurple/protocols/silc10/buddy.c:1078
 #, c-format
 msgid "The %s buddy is not present in the network"
 msgstr "No se encuentra al amigo %s en la red"
 
-#: ../libpurple/protocols/silc/buddy.c:1081
+#: ../libpurple/protocols/silc/buddy.c:1073
+#: ../libpurple/protocols/silc10/buddy.c:1081
 msgid ""
 "To add the buddy you must import his/her public key. Press Import to import "
 "a public key."
@@ -8942,15 +9137,18 @@
 "Para añadir al amigo debe importar su clave pública. Pulse «Importar» para "
 "importar una clave pública."
 
-#: ../libpurple/protocols/silc/buddy.c:1085
+#: ../libpurple/protocols/silc/buddy.c:1077
+#: ../libpurple/protocols/silc10/buddy.c:1085
 msgid "_Import..."
 msgstr "_Importar..."
 
-#: ../libpurple/protocols/silc/buddy.c:1181
+#: ../libpurple/protocols/silc/buddy.c:1183
+#: ../libpurple/protocols/silc10/buddy.c:1181
 msgid "Select correct user"
 msgstr "Seleccione el usuario correcto"
 
-#: ../libpurple/protocols/silc/buddy.c:1183
+#: ../libpurple/protocols/silc/buddy.c:1185
+#: ../libpurple/protocols/silc10/buddy.c:1183
 msgid ""
 "More than one user was found with the same public key. Select the correct "
 "user from the list to add to the buddy list."
@@ -8958,7 +9156,8 @@
 "Se ha encontrado más de un usuario con la misma clave pública. Seleccione el "
 "usuario que desea añadir a su lista de amigos de la lista mostrada."
 
-#: ../libpurple/protocols/silc/buddy.c:1185
+#: ../libpurple/protocols/silc/buddy.c:1187
+#: ../libpurple/protocols/silc10/buddy.c:1185
 msgid ""
 "More than one user was found with the same name. Select the correct user "
 "from the list to add to the buddy list."
@@ -8967,237 +9166,318 @@
 "usuario que desea añadir a su lista de amigos de la listas mostrada."
 
 #: ../libpurple/protocols/silc/buddy.c:1474
+#: ../libpurple/protocols/silc10/buddy.c:1474
 msgid "Detached"
 msgstr "Desligado"
 
 #: ../libpurple/protocols/silc/buddy.c:1478
-#: ../libpurple/protocols/silc/silc.c:49
+#: ../libpurple/protocols/silc/silc.c:58
+#: ../libpurple/protocols/silc10/buddy.c:1478
+#: ../libpurple/protocols/silc10/silc.c:49
 msgid "Indisposed"
 msgstr "Indispuesto"
 
 #: ../libpurple/protocols/silc/buddy.c:1482
-#: ../libpurple/protocols/silc/silc.c:51
+#: ../libpurple/protocols/silc/silc.c:60
+#: ../libpurple/protocols/silc10/buddy.c:1482
+#: ../libpurple/protocols/silc10/silc.c:51
 msgid "Wake Me Up"
 msgstr "Despiértame"
 
 #: ../libpurple/protocols/silc/buddy.c:1484
-#: ../libpurple/protocols/silc/silc.c:43
+#: ../libpurple/protocols/silc/silc.c:52
+#: ../libpurple/protocols/silc10/buddy.c:1484
+#: ../libpurple/protocols/silc10/silc.c:43
 msgid "Hyper Active"
 msgstr "Hiper-activo"
 
 #: ../libpurple/protocols/silc/buddy.c:1486
+#: ../libpurple/protocols/silc10/buddy.c:1486
 msgid "Robot"
 msgstr "Robot"
 
 #: ../libpurple/protocols/silc/buddy.c:1493
-#: ../libpurple/protocols/silc/silc.c:662
-#: ../libpurple/protocols/silc/util.c:512
+#: ../libpurple/protocols/silc/silc.c:743
+#: ../libpurple/protocols/silc/util.c:516
+#: ../libpurple/protocols/silc10/buddy.c:1493
+#: ../libpurple/protocols/silc10/silc.c:654
+#: ../libpurple/protocols/silc10/util.c:512
 msgid "Happy"
 msgstr "Feliz"
 
 #: ../libpurple/protocols/silc/buddy.c:1495
-#: ../libpurple/protocols/silc/silc.c:664
-#: ../libpurple/protocols/silc/util.c:514
+#: ../libpurple/protocols/silc/silc.c:745
+#: ../libpurple/protocols/silc/util.c:518
+#: ../libpurple/protocols/silc10/buddy.c:1495
+#: ../libpurple/protocols/silc10/silc.c:656
+#: ../libpurple/protocols/silc10/util.c:514
 msgid "Sad"
 msgstr "Triste"
 
 #: ../libpurple/protocols/silc/buddy.c:1497
-#: ../libpurple/protocols/silc/silc.c:666
-#: ../libpurple/protocols/silc/util.c:516
+#: ../libpurple/protocols/silc/silc.c:747
+#: ../libpurple/protocols/silc/util.c:520
+#: ../libpurple/protocols/silc10/buddy.c:1497
+#: ../libpurple/protocols/silc10/silc.c:658
+#: ../libpurple/protocols/silc10/util.c:516
 msgid "Angry"
 msgstr "Furioso"
 
 #: ../libpurple/protocols/silc/buddy.c:1499
-#: ../libpurple/protocols/silc/silc.c:668
-#: ../libpurple/protocols/silc/util.c:518
+#: ../libpurple/protocols/silc/silc.c:749
+#: ../libpurple/protocols/silc/util.c:522
+#: ../libpurple/protocols/silc10/buddy.c:1499
+#: ../libpurple/protocols/silc10/silc.c:660
+#: ../libpurple/protocols/silc10/util.c:518
 msgid "Jealous"
 msgstr "Celoso"
 
 #: ../libpurple/protocols/silc/buddy.c:1501
-#: ../libpurple/protocols/silc/silc.c:670
-#: ../libpurple/protocols/silc/util.c:520
+#: ../libpurple/protocols/silc/silc.c:751
+#: ../libpurple/protocols/silc/util.c:524
+#: ../libpurple/protocols/silc10/buddy.c:1501
+#: ../libpurple/protocols/silc10/silc.c:662
+#: ../libpurple/protocols/silc10/util.c:520
 msgid "Ashamed"
 msgstr "Avergonzado"
 
 #: ../libpurple/protocols/silc/buddy.c:1503
-#: ../libpurple/protocols/silc/silc.c:672
-#: ../libpurple/protocols/silc/util.c:522
+#: ../libpurple/protocols/silc/silc.c:753
+#: ../libpurple/protocols/silc/util.c:526
+#: ../libpurple/protocols/silc10/buddy.c:1503
+#: ../libpurple/protocols/silc10/silc.c:664
+#: ../libpurple/protocols/silc10/util.c:522
 msgid "Invincible"
 msgstr "Invencible"
 
 #: ../libpurple/protocols/silc/buddy.c:1505
-#: ../libpurple/protocols/silc/util.c:524
+#: ../libpurple/protocols/silc/util.c:528
+#: ../libpurple/protocols/silc10/buddy.c:1505
+#: ../libpurple/protocols/silc10/util.c:524
 msgid "In Love"
 msgstr "Enamorado"
 
 #: ../libpurple/protocols/silc/buddy.c:1507
-#: ../libpurple/protocols/silc/silc.c:676
-#: ../libpurple/protocols/silc/util.c:526
+#: ../libpurple/protocols/silc/silc.c:757
+#: ../libpurple/protocols/silc/util.c:530
+#: ../libpurple/protocols/silc10/buddy.c:1507
+#: ../libpurple/protocols/silc10/silc.c:668
+#: ../libpurple/protocols/silc10/util.c:526
 msgid "Sleepy"
 msgstr "Dormido"
 
 #: ../libpurple/protocols/silc/buddy.c:1509
-#: ../libpurple/protocols/silc/silc.c:678
-#: ../libpurple/protocols/silc/util.c:528
+#: ../libpurple/protocols/silc/silc.c:759
+#: ../libpurple/protocols/silc/util.c:532
+#: ../libpurple/protocols/silc10/buddy.c:1509
+#: ../libpurple/protocols/silc10/silc.c:670
+#: ../libpurple/protocols/silc10/util.c:528
 msgid "Bored"
 msgstr "Aburrido"
 
 #: ../libpurple/protocols/silc/buddy.c:1511
-#: ../libpurple/protocols/silc/silc.c:680
-#: ../libpurple/protocols/silc/util.c:530
+#: ../libpurple/protocols/silc/silc.c:761
+#: ../libpurple/protocols/silc/util.c:534
+#: ../libpurple/protocols/silc10/buddy.c:1511
+#: ../libpurple/protocols/silc10/silc.c:672
+#: ../libpurple/protocols/silc10/util.c:530
 msgid "Excited"
 msgstr "Excitado"
 
 #: ../libpurple/protocols/silc/buddy.c:1513
-#: ../libpurple/protocols/silc/silc.c:682
-#: ../libpurple/protocols/silc/util.c:532
+#: ../libpurple/protocols/silc/silc.c:763
+#: ../libpurple/protocols/silc/util.c:536
+#: ../libpurple/protocols/silc10/buddy.c:1513
+#: ../libpurple/protocols/silc10/silc.c:674
+#: ../libpurple/protocols/silc10/util.c:532
 msgid "Anxious"
 msgstr "Ansioso"
 
 #: ../libpurple/protocols/silc/buddy.c:1545
-#: ../libpurple/protocols/silc/ops.c:1202
+#: ../libpurple/protocols/silc/ops.c:1207
+#: ../libpurple/protocols/silc10/buddy.c:1545
+#: ../libpurple/protocols/silc10/ops.c:1202
 msgid "User Modes"
 msgstr "Modos de usuario"
 
 #: ../libpurple/protocols/silc/buddy.c:1557
-#: ../libpurple/protocols/silc/ops.c:1207
+#: ../libpurple/protocols/silc/ops.c:1212
+#: ../libpurple/protocols/silc10/buddy.c:1557
+#: ../libpurple/protocols/silc10/ops.c:1207
 msgid "Mood"
 msgstr "Ánimo"
 
 #: ../libpurple/protocols/silc/buddy.c:1562
-#: ../libpurple/protocols/silc/ops.c:1219
+#: ../libpurple/protocols/silc/ops.c:1224
+#: ../libpurple/protocols/silc10/buddy.c:1562
+#: ../libpurple/protocols/silc10/ops.c:1219
 msgid "Preferred Contact"
 msgstr "Contacto preferido"
 
 #: ../libpurple/protocols/silc/buddy.c:1567
-#: ../libpurple/protocols/silc/ops.c:1224
+#: ../libpurple/protocols/silc/ops.c:1229
+#: ../libpurple/protocols/silc10/buddy.c:1567
+#: ../libpurple/protocols/silc10/ops.c:1224
 msgid "Preferred Language"
 msgstr "Idioma preferido"
 
 #: ../libpurple/protocols/silc/buddy.c:1572
-#: ../libpurple/protocols/silc/ops.c:1229
+#: ../libpurple/protocols/silc/ops.c:1234
+#: ../libpurple/protocols/silc10/buddy.c:1572
+#: ../libpurple/protocols/silc10/ops.c:1229
 msgid "Device"
 msgstr "Dispositivo"
 
 #: ../libpurple/protocols/silc/buddy.c:1577
-#: ../libpurple/protocols/silc/ops.c:1234
-#: ../libpurple/protocols/silc/silc.c:730
-#: ../libpurple/protocols/silc/silc.c:732
+#: ../libpurple/protocols/silc/ops.c:1239
+#: ../libpurple/protocols/silc10/buddy.c:1577
+#: ../libpurple/protocols/silc10/ops.c:1234
+#: ../libpurple/protocols/silc10/silc.c:722
+#: ../libpurple/protocols/silc10/silc.c:724
 msgid "Timezone"
 msgstr "Zona horaria"
 
 #: ../libpurple/protocols/silc/buddy.c:1582
-#: ../libpurple/protocols/silc/ops.c:1239
+#: ../libpurple/protocols/silc/ops.c:1244
+#: ../libpurple/protocols/silc10/buddy.c:1582
+#: ../libpurple/protocols/silc10/ops.c:1239
 msgid "Geolocation"
 msgstr "Localización"
 
-#: ../libpurple/protocols/silc/buddy.c:1636
+#: ../libpurple/protocols/silc/buddy.c:1638
+#: ../libpurple/protocols/silc10/buddy.c:1636
 msgid "Reset IM Key"
 msgstr "Borrar la clave MI"
 
-#: ../libpurple/protocols/silc/buddy.c:1642
+#: ../libpurple/protocols/silc/buddy.c:1643
+#: ../libpurple/protocols/silc10/buddy.c:1642
 msgid "IM with Key Exchange"
 msgstr "MI con intercambio de claves"
 
-#: ../libpurple/protocols/silc/buddy.c:1647
+#: ../libpurple/protocols/silc/buddy.c:1648
+#: ../libpurple/protocols/silc10/buddy.c:1647
 msgid "IM with Password"
 msgstr "MI con contraseña"
 
-#: ../libpurple/protocols/silc/buddy.c:1660
+#: ../libpurple/protocols/silc/buddy.c:1661
+#: ../libpurple/protocols/silc10/buddy.c:1660
 msgid "Get Public Key..."
 msgstr "Obtener clave pública..."
 
-#: ../libpurple/protocols/silc/buddy.c:1667
-#: ../libpurple/protocols/silc/ops.c:1624
+#: ../libpurple/protocols/silc/buddy.c:1668
+#: ../libpurple/protocols/silc/ops.c:1608
+#: ../libpurple/protocols/silc10/buddy.c:1667
+#: ../libpurple/protocols/silc10/ops.c:1624
 msgid "Kill User"
 msgstr "Matar usuario"
 
-#: ../libpurple/protocols/silc/buddy.c:1677
-#: ../libpurple/protocols/silc/chat.c:977
+#: ../libpurple/protocols/silc/buddy.c:1678
+#: ../libpurple/protocols/silc/chat.c:993
+#: ../libpurple/protocols/silc10/buddy.c:1677
+#: ../libpurple/protocols/silc10/chat.c:977
 msgid "Draw On Whiteboard"
 msgstr "Escribir en la pizarra"
 
 #: ../libpurple/protocols/silc/chat.c:39
+#: ../libpurple/protocols/silc10/chat.c:39
 msgid "_Passphrase:"
 msgstr "Contra_seña:"
 
 #: ../libpurple/protocols/silc/chat.c:80
+#: ../libpurple/protocols/silc10/chat.c:80
 #, c-format
 msgid "Channel %s does not exist in the network"
 msgstr "No existe el canal %s en la red"
 
 #: ../libpurple/protocols/silc/chat.c:81
-#: ../libpurple/protocols/silc/chat.c:174
+#: ../libpurple/protocols/silc/chat.c:175
+#: ../libpurple/protocols/silc10/chat.c:81
+#: ../libpurple/protocols/silc10/chat.c:174
 msgid "Channel Information"
 msgstr "Información de canal"
 
 #: ../libpurple/protocols/silc/chat.c:82
+#: ../libpurple/protocols/silc10/chat.c:82
 msgid "Cannot get channel information"
 msgstr "No se pudo cambiar la información del canal"
 
 #: ../libpurple/protocols/silc/chat.c:119
+#: ../libpurple/protocols/silc10/chat.c:119
 #, c-format
 msgid "<b>Channel Name:</b> %s"
 msgstr "<b>Nombre del canal:</b> %s"
 
 #: ../libpurple/protocols/silc/chat.c:122
+#: ../libpurple/protocols/silc10/chat.c:122
 #, c-format
 msgid "<br><b>User Count:</b> %d"
 msgstr "<br><b>Número de usuarios:</b> %d"
 
 #: ../libpurple/protocols/silc/chat.c:129
+#: ../libpurple/protocols/silc10/chat.c:129
 #, c-format
 msgid "<br><b>Channel Founder:</b> %s"
 msgstr "<br><b>Fundador del canal</b>: %s"
 
 #: ../libpurple/protocols/silc/chat.c:138
+#: ../libpurple/protocols/silc10/chat.c:138
 #, c-format
 msgid "<br><b>Channel Cipher:</b> %s"
 msgstr "<br><b>Cifrado del canal:</b> %s"
 
 #. Definition of HMAC: http://en.wikipedia.org/wiki/HMAC
-#: ../libpurple/protocols/silc/chat.c:142
+#: ../libpurple/protocols/silc/chat.c:143
+#: ../libpurple/protocols/silc10/chat.c:142
 #, c-format
 msgid "<br><b>Channel HMAC:</b> %s"
 msgstr "<br><b>HMAC de canal:</b> %s"
 
-#: ../libpurple/protocols/silc/chat.c:147
+#: ../libpurple/protocols/silc/chat.c:148
+#: ../libpurple/protocols/silc10/chat.c:147
 #, c-format
 msgid "<br><b>Channel Topic:</b><br>%s"
 msgstr "<br><b>Tema del canal:</b><br>%s"
 
-#: ../libpurple/protocols/silc/chat.c:152
+#: ../libpurple/protocols/silc/chat.c:153
+#: ../libpurple/protocols/silc10/chat.c:152
 msgid "<br><b>Channel Modes:</b> "
 msgstr "<br><b>Modos del canal:</b> "
 
-#: ../libpurple/protocols/silc/chat.c:165
+#: ../libpurple/protocols/silc/chat.c:166
+#: ../libpurple/protocols/silc10/chat.c:165
 #, c-format
 msgid "<br><b>Founder Key Fingerprint:</b><br>%s"
 msgstr "<br><b>Huella dactilar del fundador:</b><br>%s"
 
-#: ../libpurple/protocols/silc/chat.c:166
+#: ../libpurple/protocols/silc/chat.c:167
+#: ../libpurple/protocols/silc10/chat.c:166
 #, c-format
 msgid "<br><b>Founder Key Babbleprint:</b><br>%s"
 msgstr "<br><b>Huella Babble del fundador:</b><br>%s"
 
 #: ../libpurple/protocols/silc/chat.c:236
+#: ../libpurple/protocols/silc10/chat.c:236
 msgid "Add Channel Public Key"
 msgstr "Añadir clave pública del canal"
 
 #. Add new public key
-#: ../libpurple/protocols/silc/chat.c:291
+#: ../libpurple/protocols/silc/chat.c:304
+#: ../libpurple/protocols/silc10/chat.c:291
 msgid "Open Public Key..."
 msgstr "Abrir clave pública..."
 
-#: ../libpurple/protocols/silc/chat.c:401
+#: ../libpurple/protocols/silc/chat.c:423
+#: ../libpurple/protocols/silc10/chat.c:401
 msgid "Channel Passphrase"
 msgstr "Contraseña del canal"
 
-#: ../libpurple/protocols/silc/chat.c:408
+#: ../libpurple/protocols/silc/chat.c:430
+#: ../libpurple/protocols/silc10/chat.c:408
 msgid "Channel Public Keys List"
 msgstr "Lista de claves públicas del canal"
 
-#: ../libpurple/protocols/silc/chat.c:413
+#: ../libpurple/protocols/silc/chat.c:435
+#: ../libpurple/protocols/silc10/chat.c:413
 msgid ""
 "Channel authentication is used to secure the channel from unauthorized "
 "access. The authentication may be based on passphrase and digital "
@@ -9211,338 +9491,451 @@
 "conectarse los usuarios que estén en la lista de claves públicas si se "
 "utilizan claves públicas para el acceso."
 
-#: ../libpurple/protocols/silc/chat.c:422
-#: ../libpurple/protocols/silc/chat.c:423
-#: ../libpurple/protocols/silc/chat.c:461
-#: ../libpurple/protocols/silc/chat.c:462
-#: ../libpurple/protocols/silc/chat.c:911
+#: ../libpurple/protocols/silc/chat.c:444
+#: ../libpurple/protocols/silc/chat.c:445
+#: ../libpurple/protocols/silc/chat.c:479
+#: ../libpurple/protocols/silc/chat.c:480
+#: ../libpurple/protocols/silc/chat.c:927
+#: ../libpurple/protocols/silc10/chat.c:422
+#: ../libpurple/protocols/silc10/chat.c:423
+#: ../libpurple/protocols/silc10/chat.c:461
+#: ../libpurple/protocols/silc10/chat.c:462
+#: ../libpurple/protocols/silc10/chat.c:911
 msgid "Channel Authentication"
 msgstr "Autenticación de canal"
 
-#: ../libpurple/protocols/silc/chat.c:424
-#: ../libpurple/protocols/silc/chat.c:463
+#: ../libpurple/protocols/silc/chat.c:446
+#: ../libpurple/protocols/silc/chat.c:481
+#: ../libpurple/protocols/silc10/chat.c:424
+#: ../libpurple/protocols/silc10/chat.c:463
 msgid "Add / Remove"
 msgstr "Añadir / Quitar"
 
-#: ../libpurple/protocols/silc/chat.c:581
+#: ../libpurple/protocols/silc/chat.c:597
+#: ../libpurple/protocols/silc10/chat.c:581
 msgid "Group Name"
 msgstr "Nombre de grupo"
 
-#: ../libpurple/protocols/silc/chat.c:585
-#: ../libpurple/protocols/silc/ops.c:1910
-#: ../libpurple/protocols/silc/silc.c:939
+#: ../libpurple/protocols/silc/chat.c:601
+#: ../libpurple/protocols/silc/ops.c:1813
+#: ../libpurple/protocols/silc/silc.c:1020
+#: ../libpurple/protocols/silc10/chat.c:585
+#: ../libpurple/protocols/silc10/ops.c:1901
+#: ../libpurple/protocols/silc10/silc.c:931
 msgid "Passphrase"
 msgstr "Contraseña"
 
-#: ../libpurple/protocols/silc/chat.c:596
+#: ../libpurple/protocols/silc/chat.c:612
+#: ../libpurple/protocols/silc10/chat.c:596
 #, c-format
 msgid "Please enter the %s channel private group name and passphrase."
 msgstr ""
 "Por favor, indique el nombre del grupo de canales privados %s y una "
 "contraseña."
 
-#: ../libpurple/protocols/silc/chat.c:598
+#: ../libpurple/protocols/silc/chat.c:614
+#: ../libpurple/protocols/silc10/chat.c:598
 msgid "Add Channel Private Group"
 msgstr "Añadir grupo de canales privados"
 
-#: ../libpurple/protocols/silc/chat.c:726
+#: ../libpurple/protocols/silc/chat.c:742
+#: ../libpurple/protocols/silc10/chat.c:726
 msgid "User Limit"
 msgstr "Límite de usuarios"
 
-#: ../libpurple/protocols/silc/chat.c:727
+#: ../libpurple/protocols/silc/chat.c:743
+#: ../libpurple/protocols/silc10/chat.c:727
 msgid "Set user limit on channel. Set to zero to reset user limit."
 msgstr ""
 "Fijar un limite de usuarios en el canal. Poner a cero para quitar el límite "
 "de usuarios."
 
-#: ../libpurple/protocols/silc/chat.c:891
+#: ../libpurple/protocols/silc/chat.c:907
+#: ../libpurple/protocols/silc10/chat.c:891
 msgid "Invite List"
 msgstr "Lista de invitados"
 
-#: ../libpurple/protocols/silc/chat.c:896
+#: ../libpurple/protocols/silc/chat.c:912
+#: ../libpurple/protocols/silc10/chat.c:896
 msgid "Ban List"
 msgstr "Lista de expulsados"
 
-#: ../libpurple/protocols/silc/chat.c:904
+#: ../libpurple/protocols/silc/chat.c:920
+#: ../libpurple/protocols/silc10/chat.c:904
 msgid "Add Private Group"
 msgstr "Añadir grupo privado"
 
-#: ../libpurple/protocols/silc/chat.c:917
+#: ../libpurple/protocols/silc/chat.c:933
+#: ../libpurple/protocols/silc10/chat.c:917
 msgid "Reset Permanent"
 msgstr "Borrado permanente"
 
-#: ../libpurple/protocols/silc/chat.c:922
+#: ../libpurple/protocols/silc/chat.c:938
+#: ../libpurple/protocols/silc10/chat.c:922
 msgid "Set Permanent"
 msgstr "Fijar permanente"
 
-#: ../libpurple/protocols/silc/chat.c:930
+#: ../libpurple/protocols/silc/chat.c:946
+#: ../libpurple/protocols/silc10/chat.c:930
 msgid "Set User Limit"
 msgstr "Establecer límite de usuarios"
 
-#: ../libpurple/protocols/silc/chat.c:936
+#: ../libpurple/protocols/silc/chat.c:952
+#: ../libpurple/protocols/silc10/chat.c:936
 msgid "Reset Topic Restriction"
 msgstr "Quitar restricciones de temas"
 
-#: ../libpurple/protocols/silc/chat.c:941
+#: ../libpurple/protocols/silc/chat.c:957
+#: ../libpurple/protocols/silc10/chat.c:941
 msgid "Set Topic Restriction"
 msgstr "Establecer restricciones de tema"
 
-#: ../libpurple/protocols/silc/chat.c:948
+#: ../libpurple/protocols/silc/chat.c:964
+#: ../libpurple/protocols/silc10/chat.c:948
 msgid "Reset Private Channel"
 msgstr "Limpiar canal privado"
 
-#: ../libpurple/protocols/silc/chat.c:953
+#: ../libpurple/protocols/silc/chat.c:969
+#: ../libpurple/protocols/silc10/chat.c:953
 msgid "Set Private Channel"
 msgstr "Establecer canal privado"
 
-#: ../libpurple/protocols/silc/chat.c:960
+#: ../libpurple/protocols/silc/chat.c:976
+#: ../libpurple/protocols/silc10/chat.c:960
 msgid "Reset Secret Channel"
 msgstr "Limpiar canal secreto"
 
-#: ../libpurple/protocols/silc/chat.c:965
+#: ../libpurple/protocols/silc/chat.c:981
+#: ../libpurple/protocols/silc10/chat.c:965
 msgid "Set Secret Channel"
 msgstr "Establecer canal secreto"
 
-# Banned puede ser expulsar o censurar, prefiero expulsar. jfs.
-#: ../libpurple/protocols/silc/chat.c:1039
-#, c-format
-msgid "You are channel founder on <I>%s</I>"
-msgstr "Vd. es fundador del canal en <I>%s</I>."
-
-#: ../libpurple/protocols/silc/chat.c:1043
-#, c-format
-msgid "Channel founder on <I>%s</I> is <I>%s</I>"
-msgstr "El fundador del canal en <I>%s</I> es <I>%s</I>"
-
-#: ../libpurple/protocols/silc/chat.c:1102
+#: ../libpurple/protocols/silc/chat.c:1045
+#: ../libpurple/protocols/silc10/chat.c:1102
 #, c-format
 msgid ""
 "You have to join the %s channel before you are able to join the private group"
 msgstr "Tiene que unirse al canal %s antes de poder unirse al grupo privado"
 
-#: ../libpurple/protocols/silc/chat.c:1104
+#: ../libpurple/protocols/silc/chat.c:1047
+#: ../libpurple/protocols/silc10/chat.c:1104
 msgid "Join Private Group"
 msgstr "Unirse a un grupo privado"
 
-#: ../libpurple/protocols/silc/chat.c:1105
+#: ../libpurple/protocols/silc/chat.c:1048
+#: ../libpurple/protocols/silc10/chat.c:1105
 msgid "Cannot join private group"
 msgstr "No se pudo unir a un grupo privado"
 
-#: ../libpurple/protocols/silc/chat.c:1299
-#: ../libpurple/protocols/silc/silc.c:1148
+#: ../libpurple/protocols/silc/chat.c:1260
+#: ../libpurple/protocols/silc/silc.c:1217
+#: ../libpurple/protocols/silc10/chat.c:1299
+#: ../libpurple/protocols/silc10/silc.c:1137
 msgid "Call Command"
 msgstr "Orden de llamada"
 
-#: ../libpurple/protocols/silc/chat.c:1299
-#: ../libpurple/protocols/silc/silc.c:1148
+#: ../libpurple/protocols/silc/chat.c:1260
+#: ../libpurple/protocols/silc/silc.c:1218
+#: ../libpurple/protocols/silc10/chat.c:1299
+#: ../libpurple/protocols/silc10/silc.c:1137
 msgid "Cannot call command"
 msgstr "No se pudo llamar la orden"
 
-#: ../libpurple/protocols/silc/chat.c:1300
-#: ../libpurple/protocols/silc/silc.c:1149
+#: ../libpurple/protocols/silc/chat.c:1261
+#: ../libpurple/protocols/silc/silc.c:1219
+#: ../libpurple/protocols/silc10/chat.c:1300
+#: ../libpurple/protocols/silc10/silc.c:1138
 msgid "Unknown command"
 msgstr "Orden desconocida"
 
-#: ../libpurple/protocols/silc/ft.c:89 ../libpurple/protocols/silc/ft.c:92
-#: ../libpurple/protocols/silc/ft.c:96 ../libpurple/protocols/silc/ft.c:100
-#: ../libpurple/protocols/silc/ft.c:104 ../libpurple/protocols/silc/ft.c:205
-#: ../libpurple/protocols/silc/ft.c:210 ../libpurple/protocols/silc/ft.c:215
-#: ../libpurple/protocols/silc/ft.c:221 ../libpurple/protocols/silc/ft.c:340
+#: ../libpurple/protocols/silc/ft.c:85 ../libpurple/protocols/silc/ft.c:101
+#: ../libpurple/protocols/silc/ft.c:104 ../libpurple/protocols/silc/ft.c:108
+#: ../libpurple/protocols/silc/ft.c:112 ../libpurple/protocols/silc/ft.c:116
+#: ../libpurple/protocols/silc/ft.c:120 ../libpurple/protocols/silc/ft.c:272
+#: ../libpurple/protocols/silc/ft.c:277 ../libpurple/protocols/silc/ft.c:282
+#: ../libpurple/protocols/silc/ft.c:288 ../libpurple/protocols/silc/ft.c:425
+#: ../libpurple/protocols/silc10/ft.c:89 ../libpurple/protocols/silc10/ft.c:92
+#: ../libpurple/protocols/silc10/ft.c:96
+#: ../libpurple/protocols/silc10/ft.c:100
+#: ../libpurple/protocols/silc10/ft.c:104
+#: ../libpurple/protocols/silc10/ft.c:205
+#: ../libpurple/protocols/silc10/ft.c:210
+#: ../libpurple/protocols/silc10/ft.c:215
+#: ../libpurple/protocols/silc10/ft.c:221
+#: ../libpurple/protocols/silc10/ft.c:340
 msgid "Secure File Transfer"
 msgstr "Transferencia segura de archivos"
 
-#: ../libpurple/protocols/silc/ft.c:90 ../libpurple/protocols/silc/ft.c:93
-#: ../libpurple/protocols/silc/ft.c:97 ../libpurple/protocols/silc/ft.c:101
-#: ../libpurple/protocols/silc/ft.c:105
+#: ../libpurple/protocols/silc/ft.c:86 ../libpurple/protocols/silc/ft.c:102
+#: ../libpurple/protocols/silc/ft.c:105 ../libpurple/protocols/silc/ft.c:109
+#: ../libpurple/protocols/silc/ft.c:113 ../libpurple/protocols/silc/ft.c:117
+#: ../libpurple/protocols/silc/ft.c:121 ../libpurple/protocols/silc10/ft.c:90
+#: ../libpurple/protocols/silc10/ft.c:93 ../libpurple/protocols/silc10/ft.c:97
+#: ../libpurple/protocols/silc10/ft.c:101
+#: ../libpurple/protocols/silc10/ft.c:105
 msgid "Error during file transfer"
 msgstr "Se produjo un error durante la transferencia de archivos"
 
-#: ../libpurple/protocols/silc/ft.c:94
+#: ../libpurple/protocols/silc/ft.c:87
+msgid "Remote disconnected"
+msgstr "Se ha desconectado el remoto"
+
+#: ../libpurple/protocols/silc/ft.c:106 ../libpurple/protocols/silc10/ft.c:94
 msgid "Permission denied"
 msgstr "Permiso denegado"
 
-#: ../libpurple/protocols/silc/ft.c:98
+#: ../libpurple/protocols/silc/ft.c:110 ../libpurple/protocols/silc10/ft.c:98
 msgid "Key agreement failed"
 msgstr "Falló el acuerdo de claves"
 
-#: ../libpurple/protocols/silc/ft.c:102
+#: ../libpurple/protocols/silc/ft.c:114
+msgid "Connection timed out"
+msgstr "Expiró la conexión"
+
+#: ../libpurple/protocols/silc/ft.c:118
+msgid "Creating connection failed"
+msgstr "Falló la creación de la conexión"
+
+#: ../libpurple/protocols/silc/ft.c:122 ../libpurple/protocols/silc10/ft.c:102
 msgid "File transfer session does not exist"
 msgstr "La sesión de transferencia de archivos no existe"
 
-#: ../libpurple/protocols/silc/ft.c:206
+#: ../libpurple/protocols/silc/ft.c:273 ../libpurple/protocols/silc10/ft.c:206
 msgid "No file transfer session active"
 msgstr "No hay ninguna sesión de transferencia de archivos activa"
 
-#: ../libpurple/protocols/silc/ft.c:211
+#: ../libpurple/protocols/silc/ft.c:278 ../libpurple/protocols/silc10/ft.c:211
 msgid "File transfer already started"
 msgstr "Ya se ha iniciado la transferencia de archivos"
 
-#: ../libpurple/protocols/silc/ft.c:216
+#: ../libpurple/protocols/silc/ft.c:283 ../libpurple/protocols/silc10/ft.c:216
 msgid "Could not perform key agreement for file transfer"
 msgstr ""
 "No se pudo realizar el acuerdo de claves para realizar la transferencia de "
 "archivos."
 
-#: ../libpurple/protocols/silc/ft.c:222
+#: ../libpurple/protocols/silc/ft.c:289 ../libpurple/protocols/silc10/ft.c:222
 msgid "Could not start the file transfer"
 msgstr "No se pudo comenzar la transferencia de archivos."
 
-#: ../libpurple/protocols/silc/ft.c:341
+#: ../libpurple/protocols/silc/ft.c:426 ../libpurple/protocols/silc10/ft.c:341
 msgid "Cannot send file"
 msgstr "No se puede enviar el archivo."
 
-#: ../libpurple/protocols/silc/ops.c:554 ../libpurple/protocols/silc/ops.c:563
-#: ../libpurple/protocols/silc/ops.c:572
+#: ../libpurple/protocols/silc/ops.c:57
+msgid "Error occurred"
+msgstr "Se produjo un error"
+
+#: ../libpurple/protocols/silc/ops.c:533 ../libpurple/protocols/silc/ops.c:542
+#: ../libpurple/protocols/silc/ops.c:551
+#: ../libpurple/protocols/silc10/ops.c:554
+#: ../libpurple/protocols/silc10/ops.c:563
+#: ../libpurple/protocols/silc10/ops.c:572
 #, c-format
 msgid "%s has changed the topic of <I>%s</I> to: %s"
 msgstr "%s ha cambiado el tema a de <I>%s</I> a: %s"
 
-#: ../libpurple/protocols/silc/ops.c:638
+#: ../libpurple/protocols/silc/ops.c:617
+#: ../libpurple/protocols/silc10/ops.c:638
 #, c-format
 msgid "<I>%s</I> set channel <I>%s</I> modes to: %s"
 msgstr "<I>%s</I> fijo los modos del canal <I>%s</I> a: %s"
 
-#: ../libpurple/protocols/silc/ops.c:642
+#: ../libpurple/protocols/silc/ops.c:621
+#: ../libpurple/protocols/silc10/ops.c:642
 #, c-format
 msgid "<I>%s</I> removed all channel <I>%s</I> modes"
 msgstr "<I>%s</I> quitó todos los modos del canal <I>%s</I>"
 
-#: ../libpurple/protocols/silc/ops.c:675
+#: ../libpurple/protocols/silc/ops.c:654
+#: ../libpurple/protocols/silc10/ops.c:675
 #, c-format
 msgid "<I>%s</I> set <I>%s's</I> modes to: %s"
 msgstr "<I>%s</I> fijo los modos del usuario <I>%s</I> a: %s"
 
-#: ../libpurple/protocols/silc/ops.c:683
+#: ../libpurple/protocols/silc/ops.c:662
+#: ../libpurple/protocols/silc10/ops.c:683
 #, c-format
 msgid "<I>%s</I> removed all <I>%s's</I> modes"
 msgstr "<I>%s</I> quitó todos los modos del usuario <I>%s<I>"
 
-#: ../libpurple/protocols/silc/ops.c:712
+#: ../libpurple/protocols/silc/ops.c:691
+#: ../libpurple/protocols/silc10/ops.c:712
 #, c-format
 msgid "You have been kicked off <I>%s</I> by <I>%s</I> (%s)"
 msgstr "Ha sido expulsado de <I>%s</I> por %s (%s)"
 
-#: ../libpurple/protocols/silc/ops.c:742 ../libpurple/protocols/silc/ops.c:747
-#: ../libpurple/protocols/silc/ops.c:752
+#: ../libpurple/protocols/silc/ops.c:718 ../libpurple/protocols/silc/ops.c:723
+#: ../libpurple/protocols/silc/ops.c:728
+#: ../libpurple/protocols/silc10/ops.c:742
+#: ../libpurple/protocols/silc10/ops.c:747
+#: ../libpurple/protocols/silc10/ops.c:752
 #, c-format
 msgid "You have been killed by %s (%s)"
 msgstr "Ha sido expulsado por %s (%s)"
 
-#: ../libpurple/protocols/silc/ops.c:773 ../libpurple/protocols/silc/ops.c:778
-#: ../libpurple/protocols/silc/ops.c:783
+#: ../libpurple/protocols/silc/ops.c:749 ../libpurple/protocols/silc/ops.c:754
+#: ../libpurple/protocols/silc/ops.c:759
+#: ../libpurple/protocols/silc10/ops.c:773
+#: ../libpurple/protocols/silc10/ops.c:778
+#: ../libpurple/protocols/silc10/ops.c:783
 #, c-format
 msgid "Killed by %s (%s)"
 msgstr "Expulsado por %s (%s)"
 
-#: ../libpurple/protocols/silc/ops.c:829
+#: ../libpurple/protocols/silc/ops.c:796
+#: ../libpurple/protocols/silc10/ops.c:829
 msgid "Server signoff"
 msgstr "Desconectado por el servidor"
 
-#: ../libpurple/protocols/silc/ops.c:1017
+#: ../libpurple/protocols/silc/ops.c:983
+#: ../libpurple/protocols/silc10/ops.c:1017
 msgid "Personal Information"
 msgstr "Información personal"
 
-#: ../libpurple/protocols/silc/ops.c:1040
+#: ../libpurple/protocols/silc/ops.c:1006
+#: ../libpurple/protocols/silc10/ops.c:1040
 msgid "Birth Day"
 msgstr "Cumpleaños"
 
-#: ../libpurple/protocols/silc/ops.c:1048
+#: ../libpurple/protocols/silc/ops.c:1014
+#: ../libpurple/protocols/silc10/ops.c:1048
 msgid "Job Role"
 msgstr "Rol laboral"
 
-#: ../libpurple/protocols/silc/ops.c:1052
-#: ../libpurple/protocols/silc/silc.c:932
+#: ../libpurple/protocols/silc/ops.c:1018
+#: ../libpurple/protocols/silc/silc.c:1013
+#: ../libpurple/protocols/silc10/ops.c:1052
+#: ../libpurple/protocols/silc10/silc.c:924
 msgid "Organization"
 msgstr "Organización"
 
-#: ../libpurple/protocols/silc/ops.c:1056
+#: ../libpurple/protocols/silc/ops.c:1022
+#: ../libpurple/protocols/silc10/ops.c:1056
 msgid "Unit"
 msgstr "Unidad"
 
-#: ../libpurple/protocols/silc/ops.c:1080
+#: ../libpurple/protocols/silc/ops.c:1046
+#: ../libpurple/protocols/silc10/ops.c:1080
 msgid "Note"
 msgstr "Nota"
 
-#: ../libpurple/protocols/silc/ops.c:1128
+#: ../libpurple/protocols/silc/ops.c:1093
+#: ../libpurple/protocols/silc10/ops.c:1128
 msgid "Join Chat"
 msgstr "Unirse a un chat"
 
-#: ../libpurple/protocols/silc/ops.c:1183
-#: ../libpurple/protocols/silc/ops.c:1332
+# Banned puede ser expulsar o censurar, prefiero expulsar. jfs.
+#: ../libpurple/protocols/silc/ops.c:1127
+#: ../libpurple/protocols/silc10/chat.c:1039
+#, c-format
+msgid "You are channel founder on <I>%s</I>"
+msgstr "Vd. es fundador del canal en <I>%s</I>."
+
+#: ../libpurple/protocols/silc/ops.c:1131
+#: ../libpurple/protocols/silc10/chat.c:1043
+#, c-format
+msgid "Channel founder on <I>%s</I> is <I>%s</I>"
+msgstr "El fundador del canal en <I>%s</I> es <I>%s</I>"
+
+#: ../libpurple/protocols/silc/ops.c:1190
+#: ../libpurple/protocols/silc/ops.c:1326
+#: ../libpurple/protocols/silc10/ops.c:1183
+#: ../libpurple/protocols/silc10/ops.c:1332
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1047
 msgid "Real Name"
 msgstr "Nombre real"
 
-#: ../libpurple/protocols/silc/ops.c:1213
+#: ../libpurple/protocols/silc/ops.c:1218
+#: ../libpurple/protocols/silc10/ops.c:1213
 msgid "Status Text"
 msgstr "Texto de estado"
 
-#: ../libpurple/protocols/silc/ops.c:1285
-#: ../libpurple/protocols/silc/ops.c:1357
+#: ../libpurple/protocols/silc/ops.c:1279
+#: ../libpurple/protocols/silc/ops.c:1351
+#: ../libpurple/protocols/silc10/ops.c:1285
+#: ../libpurple/protocols/silc10/ops.c:1357
 msgid "Public Key Fingerprint"
 msgstr "Huella digital de la clave pública"
 
-#: ../libpurple/protocols/silc/ops.c:1286
-#: ../libpurple/protocols/silc/ops.c:1358
+#: ../libpurple/protocols/silc/ops.c:1280
+#: ../libpurple/protocols/silc/ops.c:1352
+#: ../libpurple/protocols/silc10/ops.c:1286
+#: ../libpurple/protocols/silc10/ops.c:1358
 msgid "Public Key Babbleprint"
 msgstr "Huella babble de la clave pública"
 
-#: ../libpurple/protocols/silc/ops.c:1298
+#: ../libpurple/protocols/silc/ops.c:1292
+#: ../libpurple/protocols/silc10/ops.c:1298
 msgid "_More..."
 msgstr "_Más..."
 
-#: ../libpurple/protocols/silc/ops.c:1371
-#: ../libpurple/protocols/silc/silc.c:999
+#: ../libpurple/protocols/silc/ops.c:1369
+#: ../libpurple/protocols/silc/silc.c:1077
+#: ../libpurple/protocols/silc10/ops.c:1371
+#: ../libpurple/protocols/silc10/silc.c:988
 msgid "Detach From Server"
 msgstr "Desligar del servidor"
 
-#: ../libpurple/protocols/silc/ops.c:1371
+#: ../libpurple/protocols/silc/ops.c:1369
+#: ../libpurple/protocols/silc10/ops.c:1371
 msgid "Cannot detach"
 msgstr "No se puede desligar"
 
-#: ../libpurple/protocols/silc/ops.c:1382
+#: ../libpurple/protocols/silc/ops.c:1389
+#: ../libpurple/protocols/silc10/ops.c:1382
 msgid "Cannot set topic"
 msgstr "No se puede cambiar el tema"
 
-#: ../libpurple/protocols/silc/ops.c:1414
+#: ../libpurple/protocols/silc/ops.c:1418
+#: ../libpurple/protocols/silc10/ops.c:1414
 msgid "Failed to change nickname"
 msgstr "No se pudo cambiar el alias"
 
-#: ../libpurple/protocols/silc/ops.c:1462
+#: ../libpurple/protocols/silc/ops.c:1467
+#: ../libpurple/protocols/silc10/ops.c:1462
 msgid "Roomlist"
 msgstr "Lista de salas"
 
-#: ../libpurple/protocols/silc/ops.c:1462
+#: ../libpurple/protocols/silc/ops.c:1467
+#: ../libpurple/protocols/silc10/ops.c:1462
 msgid "Cannot get room list"
 msgstr "No se pudo obtener la lista de salas"
 
-#: ../libpurple/protocols/silc/ops.c:1507
+#: ../libpurple/protocols/silc/ops.c:1468
+msgid "Network is empty"
+msgstr "La red está vacía"
+
+#: ../libpurple/protocols/silc/ops.c:1512
+#: ../libpurple/protocols/silc10/ops.c:1507
 msgid "No public key was received"
 msgstr "No se ha recibido una clave pública"
 
-#: ../libpurple/protocols/silc/ops.c:1519
-#: ../libpurple/protocols/silc/ops.c:1532
+#: ../libpurple/protocols/silc/ops.c:1524
+#: ../libpurple/protocols/silc/ops.c:1537
+#: ../libpurple/protocols/silc10/ops.c:1519
+#: ../libpurple/protocols/silc10/ops.c:1532
 msgid "Server Information"
 msgstr "Información del servidor"
 
-#: ../libpurple/protocols/silc/ops.c:1520
+#: ../libpurple/protocols/silc/ops.c:1525
+#: ../libpurple/protocols/silc10/ops.c:1520
 msgid "Cannot get server information"
 msgstr "No se pudo obtener la información del servidor"
 
-#: ../libpurple/protocols/silc/ops.c:1549
-#: ../libpurple/protocols/silc/ops.c:1558
+#: ../libpurple/protocols/silc/ops.c:1548
+#: ../libpurple/protocols/silc10/ops.c:1549
+#: ../libpurple/protocols/silc10/ops.c:1558
 msgid "Server Statistics"
 msgstr "Estadísticas del servidor"
 
-#: ../libpurple/protocols/silc/ops.c:1550
+#: ../libpurple/protocols/silc/ops.c:1549
+#: ../libpurple/protocols/silc10/ops.c:1550
 msgid "Cannot get server statistics"
 msgstr "No se pudieron obtener las estadísticas del servidor"
 
-#: ../libpurple/protocols/silc/ops.c:1559
-msgid "No server statistics available"
-msgstr "No se disponen de estadísticas del servidor"
-
-#: ../libpurple/protocols/silc/ops.c:1581
+#: ../libpurple/protocols/silc/ops.c:1556
+#: ../libpurple/protocols/silc10/ops.c:1581
 #, c-format
 msgid ""
 "Local server start time: %s\n"
@@ -9577,108 +9970,66 @@
 "Operadores de servidor en total: %d\n"
 "Operadores de encaminadores en total: %d\n"
 
-#: ../libpurple/protocols/silc/ops.c:1604
+#: ../libpurple/protocols/silc/ops.c:1588
+#: ../libpurple/protocols/silc10/ops.c:1604
 msgid "Network Statistics"
 msgstr "Estadísticas de red"
 
-#: ../libpurple/protocols/silc/ops.c:1612
-#: ../libpurple/protocols/silc/ops.c:1617
+#: ../libpurple/protocols/silc/ops.c:1596
+#: ../libpurple/protocols/silc/ops.c:1601
+#: ../libpurple/protocols/silc10/ops.c:1612
+#: ../libpurple/protocols/silc10/ops.c:1617
 msgid "Ping"
 msgstr "Ping"
 
-#: ../libpurple/protocols/silc/ops.c:1612
+#: ../libpurple/protocols/silc/ops.c:1596
+#: ../libpurple/protocols/silc10/ops.c:1612
 msgid "Ping failed"
 msgstr "Falló el ping"
 
-#: ../libpurple/protocols/silc/ops.c:1617
+#: ../libpurple/protocols/silc/ops.c:1601
+#: ../libpurple/protocols/silc10/ops.c:1617
 msgid "Ping reply received from server"
 msgstr "Se recibió una respuesta al ping del servidor"
 
-#: ../libpurple/protocols/silc/ops.c:1625
+#: ../libpurple/protocols/silc/ops.c:1609
+#: ../libpurple/protocols/silc10/ops.c:1625
 msgid "Could not kill user"
 msgstr "No se pudo expulsar al usuario"
 
-#: ../libpurple/protocols/silc/ops.c:1709
-msgid "Error during connecting to SILC Server"
-msgstr "Se produjo un error durante la conexión al servidor SILC"
-
-#: ../libpurple/protocols/silc/ops.c:1714
-msgid "Key Exchange failed"
-msgstr "Falló el intercambio de claves"
-
-#: ../libpurple/protocols/silc/ops.c:1723
-msgid ""
-"Resuming detached session failed. Press Reconnect to create new connection."
-msgstr ""
-"Se produjo un fallo al retomar la sesión desligada. Pulse «Reconectar» para "
-"crear una nueva conexión."
-
-#: ../libpurple/protocols/silc/ops.c:1758
-msgid "Disconnected by server"
-msgstr "Desconectado por el servidor"
-
-#: ../libpurple/protocols/silc/ops.c:1820
-#: ../libpurple/protocols/silc/ops.c:1867
-#: ../libpurple/protocols/silc/silc.c:182
+#: ../libpurple/protocols/silc/ops.c:1648
+msgid "WATCH"
+msgstr "AÑADIR"
+
+#: ../libpurple/protocols/silc/ops.c:1648
+msgid "Cannot watch user"
+msgstr "No se puede añadir al usuario"
+
+#: ../libpurple/protocols/silc/ops.c:1724
+#: ../libpurple/protocols/silc/ops.c:1775
+#: ../libpurple/protocols/silc/silc.c:277
+#: ../libpurple/protocols/silc10/ops.c:1811
+#: ../libpurple/protocols/silc10/ops.c:1858
+#: ../libpurple/protocols/silc10/silc.c:190
 msgid "Resuming session"
 msgstr "Reanudando la sesión"
 
-#: ../libpurple/protocols/silc/ops.c:1822
+#: ../libpurple/protocols/silc/ops.c:1726
+#: ../libpurple/protocols/silc10/ops.c:1813
 msgid "Authenticating connection"
 msgstr "Autenticando la conexión"
 
-#: ../libpurple/protocols/silc/ops.c:1869
+#: ../libpurple/protocols/silc/ops.c:1777
+#: ../libpurple/protocols/silc10/ops.c:1860
 msgid "Verifying server public key"
 msgstr "Comprobando la clave pública del servidor"
 
-#: ../libpurple/protocols/silc/ops.c:1911
+#: ../libpurple/protocols/silc/ops.c:1814
+#: ../libpurple/protocols/silc10/ops.c:1902
 msgid "Passphrase required"
 msgstr "Se necesita una contraseña"
 
-#: ../libpurple/protocols/silc/ops.c:1940
-msgid "Failure: Version mismatch, upgrade your client"
-msgstr ""
-"Fallo: Existe una diferencia en las versiones, por favor, actualice su "
-"cliente"
-
-#: ../libpurple/protocols/silc/ops.c:1943
-msgid "Failure: Remote does not trust/support your public key"
-msgstr "Fallo: El servidor remoto no soporta/confía en su clave pública"
-
-#: ../libpurple/protocols/silc/ops.c:1946
-msgid "Failure: Remote does not support proposed KE group"
-msgstr "Fallo: El servidor remoto no soporta el grupo de IC propuesto"
-
-#: ../libpurple/protocols/silc/ops.c:1949
-msgid "Failure: Remote does not support proposed cipher"
-msgstr ""
-"Fallo: El servidor remoto no soporta los sistemas de cifrado propuestos"
-
-#: ../libpurple/protocols/silc/ops.c:1952
-msgid "Failure: Remote does not support proposed PKCS"
-msgstr "Fallo: El servidor remoto no soporta los PKCS propuestos"
-
-#: ../libpurple/protocols/silc/ops.c:1955
-msgid "Failure: Remote does not support proposed hash function"
-msgstr "Fallo: El servidor remoto no soporta la función de hash propuesta"
-
-#: ../libpurple/protocols/silc/ops.c:1958
-msgid "Failure: Remote does not support proposed HMAC"
-msgstr "Fallo: El servidor remoto no soporta el HMAC propuesto"
-
-#: ../libpurple/protocols/silc/ops.c:1960
-msgid "Failure: Incorrect signature"
-msgstr "Fallo: Firma incorrecta"
-
-#: ../libpurple/protocols/silc/ops.c:1962
-msgid "Failure: Invalid cookie"
-msgstr "Fallo: Cookie inválida"
-
-#: ../libpurple/protocols/silc/ops.c:1973
-msgid "Failure: Authentication failed"
-msgstr "Fallo: Falló la autenticación"
-
-#: ../libpurple/protocols/silc/pk.c:104
+#: ../libpurple/protocols/silc/pk.c:98 ../libpurple/protocols/silc10/pk.c:104
 #, c-format
 msgid ""
 "Received %s's public key. Your local copy does not match this key. Would you "
@@ -9687,12 +10038,12 @@
 "Se recibió la clave pública de %s. Su copia local no coincide con esta "
 "clave. ¿Desea aceptar la clave pública de todas formas?"
 
-#: ../libpurple/protocols/silc/pk.c:109
+#: ../libpurple/protocols/silc/pk.c:103 ../libpurple/protocols/silc10/pk.c:109
 #, c-format
 msgid "Received %s's public key. Would you like to accept this public key?"
 msgstr "Se recibió la clave pública de %s. ¿Desea aceptar esta clave pública?"
 
-#: ../libpurple/protocols/silc/pk.c:113
+#: ../libpurple/protocols/silc/pk.c:107 ../libpurple/protocols/silc10/pk.c:113
 #, c-format
 msgid ""
 "Fingerprint and babbleprint for the %s key are:\n"
@@ -9705,73 +10056,100 @@
 "%s\n"
 "%s\n"
 
-#: ../libpurple/protocols/silc/pk.c:116 ../libpurple/protocols/silc/pk.c:142
+#: ../libpurple/protocols/silc/pk.c:110 ../libpurple/protocols/silc/pk.c:139
+#: ../libpurple/protocols/silc10/pk.c:116
+#: ../libpurple/protocols/silc10/pk.c:142
 msgid "Verify Public Key"
 msgstr "Verificar la clave pública"
 
-#: ../libpurple/protocols/silc/pk.c:121
+#: ../libpurple/protocols/silc/pk.c:115 ../libpurple/protocols/silc10/pk.c:121
 msgid "_View..."
 msgstr "_Ver..."
 
-#: ../libpurple/protocols/silc/pk.c:143
+#: ../libpurple/protocols/silc/pk.c:140 ../libpurple/protocols/silc10/pk.c:143
 msgid "Unsupported public key type"
 msgstr "Tipo de clave pública no soportada"
 
-#: ../libpurple/protocols/silc/silc.c:153
+#: ../libpurple/protocols/silc/silc.c:217
+#: ../libpurple/protocols/silc10/ops.c:1749
+msgid "Disconnected by server"
+msgstr "Desconectado por el servidor"
+
+#: ../libpurple/protocols/silc/silc.c:224
+#: ../libpurple/protocols/silc10/ops.c:1700
+msgid "Error during connecting to SILC Server"
+msgstr "Se produjo un error durante la conexión al servidor SILC"
+
+#: ../libpurple/protocols/silc/silc.c:229
+#: ../libpurple/protocols/silc10/ops.c:1705
+msgid "Key Exchange failed"
+msgstr "Falló el intercambio de claves"
+
+#: ../libpurple/protocols/silc/silc.c:238
+#: ../libpurple/protocols/silc10/ops.c:1714
+msgid ""
+"Resuming detached session failed. Press Reconnect to create new connection."
+msgstr ""
+"Se produjo un fallo al retomar la sesión desligada. Pulse «Reconectar» para "
+"crear una nueva conexión."
+
+#: ../libpurple/protocols/silc/silc.c:265
+#: ../libpurple/protocols/silc/silc.c:311
+#: ../libpurple/protocols/silc10/silc.c:161
 msgid "Connection failed"
 msgstr "Falló la conexión"
 
-#: ../libpurple/protocols/silc/silc.c:174
-msgid "Cannot initialize SILC Client connection"
-msgstr "No se pudo inicializar al conexión del cliente SILC"
-
-#: ../libpurple/protocols/silc/silc.c:185
+#: ../libpurple/protocols/silc/silc.c:280
+#: ../libpurple/protocols/silc10/silc.c:193
 msgid "Performing key exchange"
 msgstr "Realizando intercambio de claves"
 
-#: ../libpurple/protocols/silc/silc.c:271
+#. Progress
+#: ../libpurple/protocols/silc/silc.c:343
+#: ../libpurple/protocols/silc10/silc.c:325
+msgid "Connecting to SILC Server"
+msgstr "Conectando con el servidor SILC"
+
+#: ../libpurple/protocols/silc/silc.c:352
+msgid "Could not load SILC key pair"
+msgstr "No se pudo cargar la clave pública SILC"
+
+#: ../libpurple/protocols/silc/silc.c:366
+#: ../libpurple/protocols/silc10/silc.c:355
+msgid "Unable to create connection"
+msgstr "No se pudo crear la conexión"
+
+#: ../libpurple/protocols/silc/silc.c:395
+#: ../libpurple/protocols/silc10/silc.c:267
 msgid "Out of memory"
 msgstr "Sin memoria"
 
-#: ../libpurple/protocols/silc/silc.c:294
-msgid "John Noname"
-msgstr "Pepe sin nombre"
-
-#: ../libpurple/protocols/silc/silc.c:317
+#: ../libpurple/protocols/silc/silc.c:438
+#: ../libpurple/protocols/silc10/silc.c:313
 msgid "Cannot initialize SILC protocol"
 msgstr "No se pudo inicializar el protocolo SILC"
 
-#: ../libpurple/protocols/silc/silc.c:324
-msgid "Cannot find/access ~/.silc directory"
-msgstr "No se puede encontrar o acceder al directorio ~/.silc"
-
-#. Progress
-#: ../libpurple/protocols/silc/silc.c:329
-msgid "Connecting to SILC Server"
-msgstr "Conectando con el servidor SILC"
-
-#: ../libpurple/protocols/silc/silc.c:338
-#, c-format
-msgid "Could not load SILC key pair: %s"
-msgstr "No se pudo cargar la clave pública SILC: %s"
-
-#: ../libpurple/protocols/silc/silc.c:359
-msgid "Unable to create connection"
-msgstr "No se pudo crear la conexión"
-
-#: ../libpurple/protocols/silc/silc.c:658
+#: ../libpurple/protocols/silc/silc.c:445
+msgid "Error loading SILC key pair"
+msgstr "Error al cargar el par de claves SILC"
+
+#: ../libpurple/protocols/silc/silc.c:739
+#: ../libpurple/protocols/silc10/silc.c:650
 msgid "Your Current Mood"
 msgstr "Su estado de ánimo actual"
 
-#: ../libpurple/protocols/silc/silc.c:660 ../pidgin/gtkprefs.c:1529
+#: ../libpurple/protocols/silc/silc.c:741
+#: ../libpurple/protocols/silc10/silc.c:652 ../pidgin/gtkprefs.c:1556
 msgid "Normal"
 msgstr "Normal"
 
-#: ../libpurple/protocols/silc/silc.c:674
+#: ../libpurple/protocols/silc/silc.c:755
+#: ../libpurple/protocols/silc10/silc.c:666
 msgid "In love"
 msgstr "Enamorado"
 
-#: ../libpurple/protocols/silc/silc.c:685
+#: ../libpurple/protocols/silc/silc.c:766
+#: ../libpurple/protocols/silc10/silc.c:677
 msgid ""
 "\n"
 "Your Preferred Contact Methods"
@@ -9779,46 +10157,63 @@
 "\n"
 "Sus métodos de contacto preferidos"
 
-#: ../libpurple/protocols/silc/silc.c:693
-#: ../libpurple/protocols/silc/util.c:557
+#: ../libpurple/protocols/silc/silc.c:774
+#: ../libpurple/protocols/silc/util.c:561
+#: ../libpurple/protocols/silc10/silc.c:685
+#: ../libpurple/protocols/silc10/util.c:557
 msgid "SMS"
 msgstr "SMS"
 
-#: ../libpurple/protocols/silc/silc.c:695
-#: ../libpurple/protocols/silc/util.c:559
+#: ../libpurple/protocols/silc/silc.c:776
+#: ../libpurple/protocols/silc/util.c:563
+#: ../libpurple/protocols/silc10/silc.c:687
+#: ../libpurple/protocols/silc10/util.c:559
 msgid "MMS"
 msgstr "MMS"
 
-#: ../libpurple/protocols/silc/silc.c:697
+#: ../libpurple/protocols/silc/silc.c:778
+#: ../libpurple/protocols/silc10/silc.c:689
 msgid "Video conferencing"
 msgstr "Video conferencia"
 
-#: ../libpurple/protocols/silc/silc.c:702
+#: ../libpurple/protocols/silc/silc.c:783
+#: ../libpurple/protocols/silc10/silc.c:694
 msgid "Your Current Status"
 msgstr "Su estado actual"
 
-#: ../libpurple/protocols/silc/silc.c:709
+#: ../libpurple/protocols/silc/silc.c:790
+#: ../libpurple/protocols/silc10/silc.c:701
 msgid "Online Services"
 msgstr "Servicios en línea"
 
-#: ../libpurple/protocols/silc/silc.c:712
+#: ../libpurple/protocols/silc/silc.c:793
+#: ../libpurple/protocols/silc10/silc.c:704
 msgid "Let others see what services you are using"
 msgstr "Permitir que otros consulten qué servicios está utilizando"
 
-#: ../libpurple/protocols/silc/silc.c:718
+#: ../libpurple/protocols/silc/silc.c:799
+#: ../libpurple/protocols/silc10/silc.c:710
 msgid "Let others see what computer you are using"
 msgstr "Permitir que otros consulten qué ordenador está utilizando"
 
-#: ../libpurple/protocols/silc/silc.c:725
+#: ../libpurple/protocols/silc/silc.c:806
+#: ../libpurple/protocols/silc10/silc.c:717
 msgid "Your VCard File"
 msgstr "Su archivo VCard"
 
-#: ../libpurple/protocols/silc/silc.c:737
-#: ../libpurple/protocols/silc/silc.c:738
+#: ../libpurple/protocols/silc/silc.c:812
+msgid "Timezone (UTC)"
+msgstr "Zona horaria (UTC)"
+
+#: ../libpurple/protocols/silc/silc.c:816
+#: ../libpurple/protocols/silc/silc.c:817
+#: ../libpurple/protocols/silc10/silc.c:729
+#: ../libpurple/protocols/silc10/silc.c:730
 msgid "User Online Status Attributes"
 msgstr "Atributos del estado del usuario en línea"
 
-#: ../libpurple/protocols/silc/silc.c:739
+#: ../libpurple/protocols/silc/silc.c:818
+#: ../libpurple/protocols/silc10/silc.c:731
 msgid ""
 "You can let other users see your online status information and your personal "
 "information. Please fill the information you would like other users to see "
@@ -9828,173 +10223,217 @@
 "línea así como su información personal. Por favor, rellene la información "
 "que desea que otros usuarios vean de vd."
 
-#: ../libpurple/protocols/silc/silc.c:780
-#: ../libpurple/protocols/silc/silc.c:786
-#: ../libpurple/protocols/silc/silc.c:1426
+#: ../libpurple/protocols/silc/silc.c:859
+#: ../libpurple/protocols/silc/silc.c:865
+#: ../libpurple/protocols/silc/silc.c:1486
+#: ../libpurple/protocols/silc10/silc.c:772
+#: ../libpurple/protocols/silc10/silc.c:778
+#: ../libpurple/protocols/silc10/silc.c:1415
 msgid "Message of the Day"
 msgstr "Mensaje del día"
 
-#: ../libpurple/protocols/silc/silc.c:780
+#: ../libpurple/protocols/silc/silc.c:859
+#: ../libpurple/protocols/silc10/silc.c:772
 msgid "No Message of the Day available"
 msgstr "No hay disponible un mensaje del día"
 
-#: ../libpurple/protocols/silc/silc.c:781
-#: ../libpurple/protocols/silc/silc.c:1421
+#: ../libpurple/protocols/silc/silc.c:860
+#: ../libpurple/protocols/silc/silc.c:1481
+#: ../libpurple/protocols/silc10/silc.c:773
+#: ../libpurple/protocols/silc10/silc.c:1410
 msgid "There is no Message of the Day associated with this connection"
 msgstr "No hay un mensaje del día asociado con esta conexión"
 
-#: ../libpurple/protocols/silc/silc.c:832
-#: ../libpurple/protocols/silc/silc.c:876
-#: ../libpurple/protocols/silc/silc.c:947
-#: ../libpurple/protocols/silc/silc.c:948
+#: ../libpurple/protocols/silc/silc.c:911
+#: ../libpurple/protocols/silc/silc.c:957
+#: ../libpurple/protocols/silc/silc.c:1028
+#: ../libpurple/protocols/silc/silc.c:1029
+#: ../libpurple/protocols/silc10/silc.c:824
+#: ../libpurple/protocols/silc10/silc.c:868
+#: ../libpurple/protocols/silc10/silc.c:939
+#: ../libpurple/protocols/silc10/silc.c:940
 msgid "Create New SILC Key Pair"
 msgstr "Crear nuevo par de claves SILC"
 
-#: ../libpurple/protocols/silc/silc.c:832
+#: ../libpurple/protocols/silc/silc.c:911
+#: ../libpurple/protocols/silc10/silc.c:824
 msgid "Passphrases do not match"
 msgstr "Las contraseñas no coinciden."
 
-#: ../libpurple/protocols/silc/silc.c:876
+#: ../libpurple/protocols/silc/silc.c:957
+#: ../libpurple/protocols/silc10/silc.c:868
 msgid "Key Pair Generation failed"
 msgstr "Falló la generación de claves"
 
-#: ../libpurple/protocols/silc/silc.c:915
+#: ../libpurple/protocols/silc/silc.c:996
+#: ../libpurple/protocols/silc10/silc.c:907
 msgid "Key length"
 msgstr "Longitud de clave"
 
-#: ../libpurple/protocols/silc/silc.c:917
+#: ../libpurple/protocols/silc/silc.c:998
+#: ../libpurple/protocols/silc10/silc.c:909
 msgid "Public key file"
 msgstr "Fichero de clave pública"
 
-#: ../libpurple/protocols/silc/silc.c:919
+#: ../libpurple/protocols/silc/silc.c:1000
+#: ../libpurple/protocols/silc10/silc.c:911
 msgid "Private key file"
 msgstr "Fichero de clave privada"
 
-#: ../libpurple/protocols/silc/silc.c:942
+#: ../libpurple/protocols/silc/silc.c:1023
+#: ../libpurple/protocols/silc10/silc.c:934
 msgid "Passphrase (retype)"
 msgstr "Contraseña (escribir de nuevo)"
 
-#: ../libpurple/protocols/silc/silc.c:949
+#: ../libpurple/protocols/silc/silc.c:1030
+#: ../libpurple/protocols/silc10/silc.c:941
 msgid "Generate Key Pair"
 msgstr "Generar par de claves"
 
-#: ../libpurple/protocols/silc/silc.c:994
+#: ../libpurple/protocols/silc/silc.c:1073
+#: ../libpurple/protocols/silc10/silc.c:984
 msgid "Online Status"
 msgstr "Estado en línea"
 
-#: ../libpurple/protocols/silc/silc.c:1003
+#: ../libpurple/protocols/silc/silc.c:1081
+#: ../libpurple/protocols/silc10/silc.c:992
 msgid "View Message of the Day"
 msgstr "Mostrar mensaje del día"
 
-#: ../libpurple/protocols/silc/silc.c:1007
+#: ../libpurple/protocols/silc/silc.c:1085
+#: ../libpurple/protocols/silc10/silc.c:996
 msgid "Create SILC Key Pair..."
 msgstr "Crear par de claves SILC..."
 
-#: ../libpurple/protocols/silc/silc.c:1106
+#: ../libpurple/protocols/silc/silc.c:1177
+#: ../libpurple/protocols/silc10/silc.c:1095
 #, c-format
 msgid "User <I>%s</I> is not present in the network"
 msgstr "El usuario <I>%s</I> no está en la red"
 
-#: ../libpurple/protocols/silc/silc.c:1297
+#: ../libpurple/protocols/silc/silc.c:1357
+#: ../libpurple/protocols/silc10/silc.c:1286
 msgid "Topic too long"
 msgstr "Tema demasiado largo"
 
-#: ../libpurple/protocols/silc/silc.c:1378
+#: ../libpurple/protocols/silc/silc.c:1438
+#: ../libpurple/protocols/silc10/silc.c:1367
 msgid "You must specify a nick"
 msgstr "Debe especificar un apodo"
 
-#: ../libpurple/protocols/silc/silc.c:1480
+#: ../libpurple/protocols/silc/silc.c:1540
+#: ../libpurple/protocols/silc10/silc.c:1469
 #, c-format
 msgid "channel %s not found"
 msgstr "no se ha encontrado el canal %s"
 
-#: ../libpurple/protocols/silc/silc.c:1485
+#: ../libpurple/protocols/silc/silc.c:1545
+#: ../libpurple/protocols/silc10/silc.c:1474
 #, c-format
 msgid "channel modes for %s: %s"
 msgstr "los modos del canal de %s son: %s"
 
 # Banned puede ser expulsar o censurar, prefiero expulsar. jfs.
-#: ../libpurple/protocols/silc/silc.c:1487
+#: ../libpurple/protocols/silc/silc.c:1547
+#: ../libpurple/protocols/silc10/silc.c:1476
 #, c-format
 msgid "no channel modes are set on %s"
 msgstr "no se han definido modos de canal para %s"
 
-#: ../libpurple/protocols/silc/silc.c:1500
+#: ../libpurple/protocols/silc/silc.c:1560
+#: ../libpurple/protocols/silc10/silc.c:1489
 #, c-format
 msgid "Failed to set cmodes for %s"
 msgstr "No se pudieron fijar los modos de canal para %s"
 
-#: ../libpurple/protocols/silc/silc.c:1530
+#: ../libpurple/protocols/silc/silc.c:1590
+#: ../libpurple/protocols/silc10/silc.c:1519
 #, c-format
 msgid "Unknown command: %s, (may be a client bug)"
 msgstr "Orden desconocida: %s, (puede ser un error del cliente)"
 
-#: ../libpurple/protocols/silc/silc.c:1593
+#: ../libpurple/protocols/silc/silc.c:1653
+#: ../libpurple/protocols/silc10/silc.c:1582
 msgid "part [channel]:  Leave the chat"
 msgstr "part [canal]:  Abandonar un chat"
 
-#: ../libpurple/protocols/silc/silc.c:1597
+#: ../libpurple/protocols/silc/silc.c:1657
+#: ../libpurple/protocols/silc10/silc.c:1586
 msgid "leave [channel]:  Leave the chat"
 msgstr "leave [canal]:  Abandonar un chat"
 
-#: ../libpurple/protocols/silc/silc.c:1601
+#: ../libpurple/protocols/silc/silc.c:1661
+#: ../libpurple/protocols/silc10/silc.c:1590
 msgid "topic [&lt;new topic&gt;]:  View or change the topic"
 msgstr "topic [&lt;nuevo tema&gt;]:  Ver o cambiar el tema"
 
-#: ../libpurple/protocols/silc/silc.c:1606
+#: ../libpurple/protocols/silc/silc.c:1666
+#: ../libpurple/protocols/silc10/silc.c:1595
 msgid "join &lt;channel&gt; [&lt;password&gt;]:  Join a chat on this network"
 msgstr "join &lt;canal&gt; [&lt;contraseña&gt;:  Unirse a un chat en esta red"
 
-#: ../libpurple/protocols/silc/silc.c:1610
+#: ../libpurple/protocols/silc/silc.c:1670
+#: ../libpurple/protocols/silc10/silc.c:1599
 msgid "list:  List channels on this network"
 msgstr "list:  Mostrar los canales en esta red"
 
-#: ../libpurple/protocols/silc/silc.c:1614
+#: ../libpurple/protocols/silc/silc.c:1674
+#: ../libpurple/protocols/silc10/silc.c:1603
 msgid "whois &lt;nick&gt;:  View nick's information"
 msgstr "whois &lt;apodo&gt;:  Mostrar información del apodo"
 
-#: ../libpurple/protocols/silc/silc.c:1618
+#: ../libpurple/protocols/silc/silc.c:1678
+#: ../libpurple/protocols/silc10/silc.c:1607
 #: ../libpurple/protocols/zephyr/zephyr.c:2685
 msgid "msg &lt;nick&gt; &lt;message&gt;:  Send a private message to a user"
 msgstr ""
 "msg &lt;apodo&gt; &lt;mensaje&gt;:  Enviar un mensaje privado a un usuario"
 
-#: ../libpurple/protocols/silc/silc.c:1622
+#: ../libpurple/protocols/silc/silc.c:1682
+#: ../libpurple/protocols/silc10/silc.c:1611
 msgid "query &lt;nick&gt; [&lt;message&gt;]:  Send a private message to a user"
 msgstr ""
 "query &lt;apodo&gt; [&lt;mensaje&gt;]:  Enviar un mensaje privado al usuario"
 
-#: ../libpurple/protocols/silc/silc.c:1626
+#: ../libpurple/protocols/silc/silc.c:1686
+#: ../libpurple/protocols/silc10/silc.c:1615
 msgid "motd:  View the server's Message Of The Day"
 msgstr "motd:  Mostrar el mensaje del día del servidor"
 
-#: ../libpurple/protocols/silc/silc.c:1630
+#: ../libpurple/protocols/silc/silc.c:1690
+#: ../libpurple/protocols/silc10/silc.c:1619
 msgid "detach:  Detach this session"
 msgstr "detach:  Desligar esta sesión"
 
-#: ../libpurple/protocols/silc/silc.c:1634
+#: ../libpurple/protocols/silc/silc.c:1694
+#: ../libpurple/protocols/silc10/silc.c:1623
 msgid "quit [message]:  Disconnect from the server, with an optional message"
 msgstr ""
 "quit [mensaje]:  Desconecta del servidor actual opcionalmente indicando un "
 "mensaje"
 
-#: ../libpurple/protocols/silc/silc.c:1638
+#: ../libpurple/protocols/silc/silc.c:1698
+#: ../libpurple/protocols/silc10/silc.c:1627
 msgid "call &lt;command&gt;:  Call any silc client command"
 msgstr "call &lt;orden&gt;:  Ejecutar una orden cualquiera del cliente SILC"
 
-#: ../libpurple/protocols/silc/silc.c:1644
+#: ../libpurple/protocols/silc/silc.c:1704
+#: ../libpurple/protocols/silc10/silc.c:1633
 msgid "kill &lt;nick&gt; [-pubkey|&lt;reason&gt;]:  Kill nick"
 msgstr "kill &lt;nick&gt; [-pubkey|%lt;razón%gt;]:  Matar un alias"
 
-#: ../libpurple/protocols/silc/silc.c:1648
+#: ../libpurple/protocols/silc/silc.c:1708
+#: ../libpurple/protocols/silc10/silc.c:1637
 msgid "nick &lt;newnick&gt;:  Change your nickname"
 msgstr "nick &lt;nuevo apodo&gt;:  Cambia su apodo"
 
-#: ../libpurple/protocols/silc/silc.c:1652
+#: ../libpurple/protocols/silc/silc.c:1712
+#: ../libpurple/protocols/silc10/silc.c:1641
 msgid "whowas &lt;nick&gt;:  View nick's information"
 msgstr "whowas &lt;apodo&gt;:  Mostrar información del apodo"
 
-#: ../libpurple/protocols/silc/silc.c:1656
+#: ../libpurple/protocols/silc/silc.c:1716
+#: ../libpurple/protocols/silc10/silc.c:1645
 msgid ""
 "cmode &lt;channel&gt; [+|-&lt;modes&gt;] [arguments]:  Change or display "
 "channel modes"
@@ -10002,7 +10441,8 @@
 "cmode &lt;canal&gt; [+|&lt;modos-&gt;] [argumentos]:  Cambia o muestra los "
 "modos del canal"
 
-#: ../libpurple/protocols/silc/silc.c:1660
+#: ../libpurple/protocols/silc/silc.c:1720
+#: ../libpurple/protocols/silc10/silc.c:1649
 msgid ""
 "cumode &lt;channel&gt; +|-&lt;modes&gt; &lt;nick&gt;:  Change nick's modes "
 "on channel"
@@ -10010,15 +10450,18 @@
 "cumode &lt;canal&gt; +|-&lt;modos&gt &lt;apodo&gt;:  Cambia los modos del "
 "usuario o del canal"
 
-#: ../libpurple/protocols/silc/silc.c:1664
+#: ../libpurple/protocols/silc/silc.c:1724
+#: ../libpurple/protocols/silc10/silc.c:1653
 msgid "umode &lt;usermodes&gt;:  Set your modes in the network"
 msgstr "umode &lt;modos_usuario&gt;:  Establecer sus modos en la red"
 
-#: ../libpurple/protocols/silc/silc.c:1668
+#: ../libpurple/protocols/silc/silc.c:1728
+#: ../libpurple/protocols/silc10/silc.c:1657
 msgid "oper &lt;nick&gt; [-pubkey]:  Get server operator privileges"
 msgstr "oper &lt;nick&gt; [-pubkey]:  Establece privilegios de operador"
 
-#: ../libpurple/protocols/silc/silc.c:1672
+#: ../libpurple/protocols/silc/silc.c:1732
+#: ../libpurple/protocols/silc10/silc.c:1661
 msgid ""
 "invite &lt;channel&gt; [-|+]&lt;nick&gt;:  invite nick or add/remove from "
 "channel invite list"
@@ -10026,39 +10469,47 @@
 "invite &lt;canal&gt; [-|+]&lt;apodo&gt;:   invita a un apodo o añade/elimina "
 "el apodo de la lista de invitados para el canal"
 
-#: ../libpurple/protocols/silc/silc.c:1676
+#: ../libpurple/protocols/silc/silc.c:1736
+#: ../libpurple/protocols/silc10/silc.c:1665
 msgid "kick &lt;channel&gt; &lt;nick&gt; [comment]:  Kick client from channel"
 msgstr ""
 "kick &lt;canal&gt; &lt;apodo&gt; [comentario]:  Echar a un cliente del canal"
 
-#: ../libpurple/protocols/silc/silc.c:1680
+#: ../libpurple/protocols/silc/silc.c:1740
+#: ../libpurple/protocols/silc10/silc.c:1669
 msgid "info [server]:  View server administrative details"
 msgstr "info [servidor]:  Consulta detalles administrativos del servidor"
 
-#: ../libpurple/protocols/silc/silc.c:1684
+#: ../libpurple/protocols/silc/silc.c:1744
+#: ../libpurple/protocols/silc10/silc.c:1673
 msgid "ban [&lt;channel&gt; +|-&lt;nick&gt;]:  Ban client from channel"
 msgstr "ban [&lt;canal&gt; +|-&lt;apodo&gt;]:  Expulsar a un cliente del canal"
 
-#: ../libpurple/protocols/silc/silc.c:1688
+#: ../libpurple/protocols/silc/silc.c:1748
+#: ../libpurple/protocols/silc10/silc.c:1677
 msgid "getkey &lt;nick|server&gt;:  Retrieve client's or server's public key"
 msgstr ""
 "getkey &lt;apodo|servidor&gt;:  Obtiene la clave pública del servidor o del "
 "cliente"
 
-#: ../libpurple/protocols/silc/silc.c:1692
+#: ../libpurple/protocols/silc/silc.c:1752
+#: ../libpurple/protocols/silc10/silc.c:1681
 msgid "stats:  View server and network statistics"
 msgstr "stats:  Muestra las estadísticas del servidor y de la red"
 
-#: ../libpurple/protocols/silc/silc.c:1696
+#: ../libpurple/protocols/silc/silc.c:1756
+#: ../libpurple/protocols/silc10/silc.c:1685
 msgid "ping:  Send PING to the connected server"
 msgstr "ping:  Enviar un PING al servidor al que está conectado"
 
-#: ../libpurple/protocols/silc/silc.c:1701
+#: ../libpurple/protocols/silc/silc.c:1761
+#: ../libpurple/protocols/silc10/silc.c:1690
 msgid "users &lt;channel&gt;:  List users in channel"
 msgstr ""
 "users &lt;canal&gt;:  Obtiene la lista de los usuarios que están en el canal"
 
-#: ../libpurple/protocols/silc/silc.c:1705
+#: ../libpurple/protocols/silc/silc.c:1765
+#: ../libpurple/protocols/silc10/silc.c:1694
 msgid ""
 "names [-count|-ops|-halfops|-voices|-normal] &lt;channel(s)&gt;:  List "
 "specific users in channel(s)"
@@ -10075,116 +10526,142 @@
 #. *< name
 #. *< version
 #. *  summary
-#: ../libpurple/protocols/silc/silc.c:1828
+#: ../libpurple/protocols/silc/silc.c:1876
+#: ../libpurple/protocols/silc10/silc.c:1819
 msgid "SILC Protocol Plugin"
 msgstr "Complemento de protocolo SILC"
 
 #. *  description
-#: ../libpurple/protocols/silc/silc.c:1830
+#: ../libpurple/protocols/silc/silc.c:1878
+#: ../libpurple/protocols/silc10/silc.c:1821
 msgid "Secure Internet Live Conferencing (SILC) Protocol"
 msgstr "Protocolo de Conferencia segura en vivo en Internet (SILC)"
 
-#: ../libpurple/protocols/silc/silc.c:1862 ../pidgin/gtkprefs.c:1920
+#: ../libpurple/protocols/silc/silc.c:1910
+#: ../libpurple/protocols/silc10/silc.c:1853 ../pidgin/gtkprefs.c:1949
 msgid "Network"
 msgstr "Red"
 
-#: ../libpurple/protocols/silc/silc.c:1873
+#: ../libpurple/protocols/silc/silc.c:1921
+#: ../libpurple/protocols/silc10/silc.c:1864
 msgid "Public Key file"
 msgstr "Fichero de clave pública"
 
-#: ../libpurple/protocols/silc/silc.c:1877
+#: ../libpurple/protocols/silc/silc.c:1925
+#: ../libpurple/protocols/silc10/silc.c:1868
 msgid "Private Key file"
 msgstr "Fichero de clave privada"
 
-#: ../libpurple/protocols/silc/silc.c:1887
+#: ../libpurple/protocols/silc/silc.c:1935
+#: ../libpurple/protocols/silc10/silc.c:1878
 msgid "Cipher"
 msgstr "Cifrado"
 
-#: ../libpurple/protocols/silc/silc.c:1897
+#: ../libpurple/protocols/silc/silc.c:1945
+#: ../libpurple/protocols/silc10/silc.c:1888
 msgid "HMAC"
 msgstr "HMAC"
 
-#: ../libpurple/protocols/silc/silc.c:1900
+#
+#: ../libpurple/protocols/silc/silc.c:1948
+msgid "Use Perfect Forward Secrecy"
+msgstr "Utilizar «Confidencialidad directa perfecta»"
+
+#: ../libpurple/protocols/silc/silc.c:1952
+#: ../libpurple/protocols/silc10/silc.c:1891
 msgid "Public key authentication"
 msgstr "Autenticación de clave pública"
 
-#: ../libpurple/protocols/silc/silc.c:1903
-msgid "Reject watching by other users"
-msgstr "Impedir que otros usuarios miren"
-
-#: ../libpurple/protocols/silc/silc.c:1906
-msgid "Block invites"
-msgstr "Bloquear invitaciones"
-
-#: ../libpurple/protocols/silc/silc.c:1909
+#: ../libpurple/protocols/silc/silc.c:1955
+#: ../libpurple/protocols/silc10/silc.c:1894
 msgid "Block IMs without Key Exchange"
 msgstr "Bloquear MIs que no hagan un intercambio de claves"
 
-#: ../libpurple/protocols/silc/silc.c:1912
-msgid "Reject online status attribute requests"
-msgstr "Rechazar solicitudes de los atributos del estado en línea"
-
-#: ../libpurple/protocols/silc/silc.c:1915
+#: ../libpurple/protocols/silc/silc.c:1958
+#: ../libpurple/protocols/silc10/silc.c:1897
 msgid "Block messages to whiteboard"
 msgstr "Bloquear mensajes a la pizarra"
 
-#: ../libpurple/protocols/silc/silc.c:1918
+#: ../libpurple/protocols/silc/silc.c:1961
+#: ../libpurple/protocols/silc10/silc.c:1900
 msgid "Automatically open whiteboard"
 msgstr "Abrir la pizarra automáticamente"
 
-#: ../libpurple/protocols/silc/silc.c:1921
+#: ../libpurple/protocols/silc/silc.c:1964
+#: ../libpurple/protocols/silc10/silc.c:1903
 msgid "Digitally sign and verify all messages"
 msgstr "Firmar digitalmente todos los mensajes instantáneos"
 
 #: ../libpurple/protocols/silc/util.c:207
-#: ../libpurple/protocols/silc/util.c:247
+#: ../libpurple/protocols/silc/util.c:249
+#: ../libpurple/protocols/silc10/util.c:207
+#: ../libpurple/protocols/silc10/util.c:247
 msgid "Creating SILC key pair..."
 msgstr "Creando el par de claves SILC..."
 
+#: ../libpurple/protocols/silc/util.c:215
+#: ../libpurple/protocols/silc/util.c:257
+msgid "Cannot create SILC key pair\n"
+msgstr "No se pudo crear el par de claves SILC\n"
+
 #. Hint for translators: Please check the tabulator width here and in
 #. the next strings (short strings: 2 tabs, longer strings 1 tab,
 #. sum: 3 tabs or 24 characters)
-#: ../libpurple/protocols/silc/util.c:355
+#: ../libpurple/protocols/silc/util.c:358
+#: ../libpurple/protocols/silc10/util.c:355
 #, c-format
 msgid "Real Name: \t%s\n"
 msgstr "Nombre real: \t%s\n"
 
-#: ../libpurple/protocols/silc/util.c:357
+#: ../libpurple/protocols/silc/util.c:360
+#: ../libpurple/protocols/silc10/util.c:357
 #, c-format
 msgid "User Name: \t%s\n"
 msgstr "Nombre de usuario: \t%s\n"
 
-#: ../libpurple/protocols/silc/util.c:359
+#: ../libpurple/protocols/silc/util.c:362
+#: ../libpurple/protocols/silc10/util.c:359
 #, c-format
 msgid "E-Mail: \t\t%s\n"
 msgstr "Correo electrónico:     %s\n"
 
-#: ../libpurple/protocols/silc/util.c:361
+#: ../libpurple/protocols/silc/util.c:364
+#: ../libpurple/protocols/silc10/util.c:361
 #, c-format
 msgid "Host Name: \t%s\n"
 msgstr "Nombre de servidor: \t%s\n"
 
-#: ../libpurple/protocols/silc/util.c:363
+#: ../libpurple/protocols/silc/util.c:366
+#: ../libpurple/protocols/silc10/util.c:363
 #, c-format
 msgid "Organization: \t%s\n"
 msgstr "Organización: \t%s\n"
 
-#: ../libpurple/protocols/silc/util.c:365
+#: ../libpurple/protocols/silc/util.c:368
+#: ../libpurple/protocols/silc10/util.c:365
 #, c-format
 msgid "Country: \t%s\n"
 msgstr "País: \t%s\n"
 
-#: ../libpurple/protocols/silc/util.c:366
+#: ../libpurple/protocols/silc/util.c:369
+#: ../libpurple/protocols/silc10/util.c:366
 #, c-format
 msgid "Algorithm: \t%s\n"
 msgstr "Algoritmo:      %s\n"
 
-#: ../libpurple/protocols/silc/util.c:367
+#: ../libpurple/protocols/silc/util.c:370
+#: ../libpurple/protocols/silc10/util.c:367
 #, c-format
 msgid "Key Length: \t%d bits\n"
 msgstr "Longitud de clave: \t%d bits\n"
 
-#: ../libpurple/protocols/silc/util.c:369
+#: ../libpurple/protocols/silc/util.c:372
+#, c-format
+msgid "Version: \t%s\n"
+msgstr "Versión: \t%s\n"
+
+#: ../libpurple/protocols/silc/util.c:374
+#: ../libpurple/protocols/silc10/util.c:369
 #, c-format
 msgid ""
 "Public Key Fingerprint:\n"
@@ -10195,7 +10672,8 @@
 "%s\n"
 "\n"
 
-#: ../libpurple/protocols/silc/util.c:370
+#: ../libpurple/protocols/silc/util.c:375
+#: ../libpurple/protocols/silc10/util.c:370
 #, c-format
 msgid ""
 "Public Key Babbleprint:\n"
@@ -10204,37 +10682,44 @@
 "Huella babble de la clave pública:\n"
 "%s"
 
-#: ../libpurple/protocols/silc/util.c:374
-#: ../libpurple/protocols/silc/util.c:375
+#: ../libpurple/protocols/silc/util.c:379
+#: ../libpurple/protocols/silc/util.c:380
+#: ../libpurple/protocols/silc10/util.c:374
+#: ../libpurple/protocols/silc10/util.c:375
 msgid "Public Key Information"
 msgstr "Información de clave pública"
 
-#: ../libpurple/protocols/silc/util.c:555
+#: ../libpurple/protocols/silc/util.c:559
+#: ../libpurple/protocols/silc10/util.c:555
 msgid "Paging"
 msgstr "Enviar"
 
-#: ../libpurple/protocols/silc/util.c:561
+#: ../libpurple/protocols/silc/util.c:565
+#: ../libpurple/protocols/silc10/util.c:561
 msgid "Video Conferencing"
 msgstr "Video conferencia"
 
-#: ../libpurple/protocols/silc/util.c:579
+#: ../libpurple/protocols/silc/util.c:583
+#: ../libpurple/protocols/silc10/util.c:579
 msgid "Computer"
 msgstr "Ordenador"
 
-#: ../libpurple/protocols/silc/util.c:583
+#: ../libpurple/protocols/silc/util.c:587
+#: ../libpurple/protocols/silc10/util.c:583
 msgid "PDA"
 msgstr "PDA"
 
-#: ../libpurple/protocols/silc/util.c:585
+#: ../libpurple/protocols/silc/util.c:589
+#: ../libpurple/protocols/silc10/util.c:585
 msgid "Terminal"
 msgstr "Terminal"
 
-#: ../libpurple/protocols/silc/wb.c:284
+#: ../libpurple/protocols/silc/wb.c:284 ../libpurple/protocols/silc10/wb.c:284
 #, c-format
 msgid "%s sent message to whiteboard. Would you like to open the whiteboard?"
 msgstr "%s envió un mensaje a la pizarra. ¿Quiere abrir la pizarra?"
 
-#: ../libpurple/protocols/silc/wb.c:288
+#: ../libpurple/protocols/silc/wb.c:288 ../libpurple/protocols/silc10/wb.c:288
 #, c-format
 msgid ""
 "%s sent message to whiteboard on %s channel. Would you like to open the "
@@ -10242,10 +10727,74 @@
 msgstr ""
 "%s envió un mensaje a la pizarra del canal %s. ¿Quiere abrir la pizarra?"
 
-#: ../libpurple/protocols/silc/wb.c:302
+#: ../libpurple/protocols/silc/wb.c:302 ../libpurple/protocols/silc10/wb.c:302
 msgid "Whiteboard"
 msgstr "Pizarra"
 
+#: ../libpurple/protocols/silc10/ops.c:1559
+msgid "No server statistics available"
+msgstr "No se disponen de estadísticas del servidor"
+
+#: ../libpurple/protocols/silc10/ops.c:1931
+msgid "Failure: Version mismatch, upgrade your client"
+msgstr ""
+"Fallo: Existe una diferencia en las versiones, por favor, actualice su "
+"cliente"
+
+#: ../libpurple/protocols/silc10/ops.c:1934
+msgid "Failure: Remote does not trust/support your public key"
+msgstr "Fallo: El servidor remoto no soporta/confía en su clave pública"
+
+#: ../libpurple/protocols/silc10/ops.c:1937
+msgid "Failure: Remote does not support proposed KE group"
+msgstr "Fallo: El servidor remoto no soporta el grupo de IC propuesto"
+
+#: ../libpurple/protocols/silc10/ops.c:1940
+msgid "Failure: Remote does not support proposed cipher"
+msgstr ""
+"Fallo: El servidor remoto no soporta los sistemas de cifrado propuestos"
+
+#: ../libpurple/protocols/silc10/ops.c:1943
+msgid "Failure: Remote does not support proposed PKCS"
+msgstr "Fallo: El servidor remoto no soporta los PKCS propuestos"
+
+#: ../libpurple/protocols/silc10/ops.c:1946
+msgid "Failure: Remote does not support proposed hash function"
+msgstr "Fallo: El servidor remoto no soporta la función de hash propuesta"
+
+#: ../libpurple/protocols/silc10/ops.c:1949
+msgid "Failure: Remote does not support proposed HMAC"
+msgstr "Fallo: El servidor remoto no soporta el HMAC propuesto"
+
+#: ../libpurple/protocols/silc10/ops.c:1951
+msgid "Failure: Incorrect signature"
+msgstr "Fallo: Firma incorrecta"
+
+#: ../libpurple/protocols/silc10/ops.c:1953
+msgid "Failure: Invalid cookie"
+msgstr "Fallo: Cookie inválida"
+
+#: ../libpurple/protocols/silc10/ops.c:1964
+msgid "Failure: Authentication failed"
+msgstr "Fallo: Falló la autenticación"
+
+#: ../libpurple/protocols/silc10/silc.c:182
+msgid "Cannot initialize SILC Client connection"
+msgstr "No se pudo inicializar al conexión del cliente SILC"
+
+#: ../libpurple/protocols/silc10/silc.c:290
+msgid "John Noname"
+msgstr "Pepe sin nombre"
+
+#: ../libpurple/protocols/silc10/silc.c:320
+msgid "Cannot find/access ~/.silc directory"
+msgstr "No se puede encontrar o acceder al directorio ~/.silc"
+
+#: ../libpurple/protocols/silc10/silc.c:334
+#, c-format
+msgid "Could not load SILC key pair: %s"
+msgstr "No se pudo cargar la clave pública SILC: %s"
+
 #. TODO: do we really want to disconnect on a failure to write?
 #: ../libpurple/protocols/simple/simple.c:416
 msgid "Could not write"
@@ -10475,7 +11024,8 @@
 msgid "Password Change Successful"
 msgstr "La contraseña se ha cambiado con éxito"
 
-#: ../libpurple/protocols/toc/toc.c:1366
+#: ../libpurple/protocols/toc/toc.c:1366 ../pidgin/gtkblist.c:5498
+#: ../pidgin/gtkblist.c:5852
 msgid "_Group:"
 msgstr "_Grupo:"
 
@@ -10538,32 +11088,32 @@
 msgid "TOC Protocol Plugin"
 msgstr "Complemento de protocolo TOC"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:808
+#: ../libpurple/protocols/yahoo/yahoo.c:810
 msgid "Your Yahoo! message did not get sent."
 msgstr "Su mensaje Yahoo! no se envió."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:878
+#: ../libpurple/protocols/yahoo/yahoo.c:880
 #, c-format
 msgid "%s just sent you a Buzz!"
 msgstr "¡%s le acaba de dar un codazo!"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:925
+#: ../libpurple/protocols/yahoo/yahoo.c:927
 #, c-format
 msgid "Yahoo! system message for %s:"
 msgstr "Mensaje del sistema Yahoo! para %s:"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:984
+#: ../libpurple/protocols/yahoo/yahoo.c:986
 msgid "Authorization denied message:"
 msgstr "Mensaje de autorización denegada:"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1065
+#: ../libpurple/protocols/yahoo/yahoo.c:1067
 #, c-format
 msgid "%s has (retroactively) denied your request to add them to your list."
 msgstr ""
 "El usuario %s ha rechazado su solicitud de añadirlo a su lista de amigos (de "
 "forma retroactiva)."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1068
+#: ../libpurple/protocols/yahoo/yahoo.c:1070
 #, c-format
 msgid ""
 "%s has (retroactively) denied your request to add them to your list for the "
@@ -10572,11 +11122,11 @@
 "El usuario %s ha negado (de forma retroactiva) su solicitud de añadirlo a su "
 "lista de amigos por la siguiente razón: %s."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1071
+#: ../libpurple/protocols/yahoo/yahoo.c:1073
 msgid "Add buddy rejected"
 msgstr "Se rechazó la adición del amigo"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1822
+#: ../libpurple/protocols/yahoo/yahoo.c:1824
 #, c-format
 msgid ""
 "The Yahoo server has requested the use of an unrecognized authentication "
@@ -10587,11 +11137,11 @@
 "desconocido. Posiblemente no sea capaz de conectarse a Yahoo. Compruebe %s "
 "para ver si existe una actualización."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1825
+#: ../libpurple/protocols/yahoo/yahoo.c:1827
 msgid "Failed Yahoo! Authentication"
 msgstr "Falló la autenticación en Yahoo!"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1891
+#: ../libpurple/protocols/yahoo/yahoo.c:1893
 #, c-format
 msgid ""
 "You have tried to ignore %s, but the user is on your buddy list.  Clicking "
@@ -10600,154 +11150,172 @@
 "Ha intentado ignorar a %s, pero el usuario está en su lista de amigos. Si "
 "selecciona «Sí» se le eliminará y se ignorará a este amigo."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1894
+#: ../libpurple/protocols/yahoo/yahoo.c:1896
 msgid "Ignore buddy?"
 msgstr "¿Ignorar amigo?"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1953
+#: ../libpurple/protocols/yahoo/yahoo.c:1955
 msgid "Your account is locked, please log in to the Yahoo! website."
 msgstr ""
 "Su cuenta está bloqueada. Por favor, conéctese al servidor de web de Yahoo!"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1956
+#: ../libpurple/protocols/yahoo/yahoo.c:1958
 #, c-format
 msgid "Unknown error number %d. Logging into the Yahoo! website may fix this."
 msgstr ""
 "Error desconocido número %d. Si se conecta al servidor de web de Yahoo! es "
 "posible que ésto se arregle."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2010
+#: ../libpurple/protocols/yahoo/yahoo.c:2012
 #, c-format
 msgid "Could not add buddy %s to group %s to the server list on account %s."
 msgstr ""
 "No se pudo añadir al amigo %s al grupo %s de la lista en el servidor para la "
 "cuenta %s."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2013
+#: ../libpurple/protocols/yahoo/yahoo.c:2015
 msgid "Could not add buddy to server list"
 msgstr "No se pudo añadir el amigo a la lista del servidor"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2132
+#: ../libpurple/protocols/yahoo/yahoo.c:2134
 #, c-format
 msgid "[ Audible %s/%s/%s.swf ] %s"
 msgstr "[ Audible %s/%s/%s.swf ] %s"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2464
+#: ../libpurple/protocols/yahoo/yahoo.c:2474
 msgid "Received unexpected HTTP response from server."
 msgstr "Se recibió una respuesta HTTP del servidor que no se esperaba."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2488
-#: ../libpurple/protocols/yahoo/yahoo.c:2667
-#: ../libpurple/protocols/yahoo/yahoo.c:2770
-#: ../libpurple/protocols/yahoo/yahoo.c:2780
+#: ../libpurple/protocols/yahoo/yahoo.c:2498
+#: ../libpurple/protocols/yahoo/yahoo.c:2684
+#: ../libpurple/protocols/yahoo/yahoo.c:2787
+#: ../libpurple/protocols/yahoo/yahoo.c:2797
 #: ../libpurple/protocols/yahoo/yahoochat.c:1455
 #: ../libpurple/protocols/yahoo/yahoochat.c:1525
 #: ../libpurple/protocols/yahoo/ycht.c:585
 msgid "Connection problem"
 msgstr "Error de conexión"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2882
-#: ../libpurple/protocols/yahoo/yahoo.c:3493
+#: ../libpurple/protocols/yahoo/yahoo.c:2524
+#, c-format
+msgid ""
+"Lost connection with %s:\n"
+"%s"
+msgstr ""
+"Se perdió la conexión con %s:\n"
+"%s"
+
+#: ../libpurple/protocols/yahoo/yahoo.c:2549
+#, c-format
+msgid ""
+"Could not establish a connection with %s:\n"
+"%s"
+msgstr ""
+"No se pudo establecer una conexión con %s:\n"
+"%s"
+
+#: ../libpurple/protocols/yahoo/yahoo.c:2899
+#: ../libpurple/protocols/yahoo/yahoo.c:3510
 msgid "Not at Home"
 msgstr "Fuera de casa"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2884
-#: ../libpurple/protocols/yahoo/yahoo.c:3496
+#: ../libpurple/protocols/yahoo/yahoo.c:2901
+#: ../libpurple/protocols/yahoo/yahoo.c:3513
 msgid "Not at Desk"
 msgstr "Lejos del escritorio"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2886
-#: ../libpurple/protocols/yahoo/yahoo.c:3499
+#: ../libpurple/protocols/yahoo/yahoo.c:2903
+#: ../libpurple/protocols/yahoo/yahoo.c:3516
 msgid "Not in Office"
 msgstr "Fuera de la oficina"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2890
-#: ../libpurple/protocols/yahoo/yahoo.c:3505
+#: ../libpurple/protocols/yahoo/yahoo.c:2907
+#: ../libpurple/protocols/yahoo/yahoo.c:3522
 msgid "On Vacation"
 msgstr "De vacaciones"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2894
-#: ../libpurple/protocols/yahoo/yahoo.c:3511
+#: ../libpurple/protocols/yahoo/yahoo.c:2911
+#: ../libpurple/protocols/yahoo/yahoo.c:3528
 msgid "Stepped Out"
 msgstr "Ha abandonado"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2987
-#: ../libpurple/protocols/yahoo/yahoo.c:3017
+#: ../libpurple/protocols/yahoo/yahoo.c:3004
+#: ../libpurple/protocols/yahoo/yahoo.c:3034
 msgid "Not on server list"
 msgstr "No está en la lista del servidor"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3034
-#: ../libpurple/protocols/yahoo/yahoo.c:3092
+#: ../libpurple/protocols/yahoo/yahoo.c:3051
+#: ../libpurple/protocols/yahoo/yahoo.c:3109
 msgid "Appear Online"
 msgstr "Parecer conectado"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3037
-#: ../libpurple/protocols/yahoo/yahoo.c:3113
+#: ../libpurple/protocols/yahoo/yahoo.c:3054
+#: ../libpurple/protocols/yahoo/yahoo.c:3130
 msgid "Appear Permanently Offline"
 msgstr "Parecer siempre desconectado"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3055
+#: ../libpurple/protocols/yahoo/yahoo.c:3072
 msgid "Presence"
 msgstr "Presencia"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3098
+#: ../libpurple/protocols/yahoo/yahoo.c:3115
 msgid "Appear Offline"
 msgstr "Parecer desconectado"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3107
+#: ../libpurple/protocols/yahoo/yahoo.c:3124
 msgid "Don't Appear Permanently Offline"
 msgstr "No parecer siempre desconectado"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3155
+#: ../libpurple/protocols/yahoo/yahoo.c:3172
 msgid "Join in Chat"
 msgstr "Unirse a un chat"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3161
+#: ../libpurple/protocols/yahoo/yahoo.c:3178
 msgid "Initiate Conference"
 msgstr "Iniciar conferencia"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3189
+#: ../libpurple/protocols/yahoo/yahoo.c:3206
 msgid "Presence Settings"
 msgstr "Usar configuración del entorno"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3195
+#: ../libpurple/protocols/yahoo/yahoo.c:3212
 msgid "Start Doodling"
 msgstr "Comenzar una sesión de Doodle"
 
 #. XXX Typo: This should be _("Activate which ID?") - fix after string freeze is over
-#: ../libpurple/protocols/yahoo/yahoo.c:3228
+#: ../libpurple/protocols/yahoo/yahoo.c:3245
 msgid "Active which ID?"
 msgstr "¿Qué ID quiere activar?"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3239
+#: ../libpurple/protocols/yahoo/yahoo.c:3256
 msgid "Join who in chat?"
 msgstr "¿Juntarse con quién en un chat?"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3251
+#: ../libpurple/protocols/yahoo/yahoo.c:3268
 msgid "Activate ID..."
 msgstr "Activar ID..."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3255
+#: ../libpurple/protocols/yahoo/yahoo.c:3272
 msgid "Join User in Chat..."
 msgstr "Juntarse con un usuario en un chat..."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3762
+#: ../libpurple/protocols/yahoo/yahoo.c:3779
 msgid "You have just sent a Buzz!"
 msgstr "¡Acaba de dar un codazo!"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3821
+#: ../libpurple/protocols/yahoo/yahoo.c:3838
 msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
 msgstr "join: &lt;sala&gt;:  Unirse a una sala en la red de Yahoo."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3826
+#: ../libpurple/protocols/yahoo/yahoo.c:3843
 msgid "list: List rooms on the Yahoo network"
 msgstr "list:  Mostrar los canales de la red Yahoo"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3830
+#: ../libpurple/protocols/yahoo/yahoo.c:3847
 msgid "buzz: Buzz a user to get their attention"
 msgstr "buzz: Dar un codazo a un usuario para llamar su atención"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3834
+#: ../libpurple/protocols/yahoo/yahoo.c:3851
 msgid "doodle: Request user to start a Doodle session"
 msgstr "doodle: Solicitar al usuario el comienzo de una sesión Doodle"
 
@@ -10761,56 +11329,56 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/yahoo/yahoo.c:4042
-#: ../libpurple/protocols/yahoo/yahoo.c:4044
+#: ../libpurple/protocols/yahoo/yahoo.c:4059
+#: ../libpurple/protocols/yahoo/yahoo.c:4061
 msgid "Yahoo Protocol Plugin"
 msgstr "Complemento de protocolo Yahoo"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4067
+#: ../libpurple/protocols/yahoo/yahoo.c:4084
 msgid "Yahoo Japan"
 msgstr "Yahoo Japón"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4070
+#: ../libpurple/protocols/yahoo/yahoo.c:4087
 msgid "Pager server"
 msgstr "Servidor buscapersonas"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4073
+#: ../libpurple/protocols/yahoo/yahoo.c:4090
 msgid "Japan Pager server"
 msgstr "Servidor de buscapersonas japonés"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4076
+#: ../libpurple/protocols/yahoo/yahoo.c:4093
 msgid "Pager port"
 msgstr "Puerto del buscapersonas"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4079
+#: ../libpurple/protocols/yahoo/yahoo.c:4096
 msgid "File transfer server"
 msgstr "Servidor de transferencia de archivos"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4082
+#: ../libpurple/protocols/yahoo/yahoo.c:4099
 msgid "Japan file transfer server"
 msgstr "Servidor de transferencia de archivos japonés"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4085
+#: ../libpurple/protocols/yahoo/yahoo.c:4102
 msgid "File transfer port"
 msgstr "Puerto de transferencia de archivos"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4088
+#: ../libpurple/protocols/yahoo/yahoo.c:4105
 msgid "Chat room locale"
 msgstr "Localización de la sala de chat"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4091
+#: ../libpurple/protocols/yahoo/yahoo.c:4108
 msgid "Ignore conference and chatroom invitations"
 msgstr "Ignorar las invitaciones a salas de conferencias o chat"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4099
+#: ../libpurple/protocols/yahoo/yahoo.c:4116
 msgid "Chat room list URL"
 msgstr "Url de lista de salas de chat"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4102
+#: ../libpurple/protocols/yahoo/yahoo.c:4119
 msgid "Yahoo Chat server"
 msgstr "Servidor de chat de Yahoo"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4105
+#: ../libpurple/protocols/yahoo/yahoo.c:4122
 msgid "Yahoo Chat port"
 msgstr "Puerto de chat de Yahoo"
 
@@ -10900,7 +11468,7 @@
 msgstr "No se pudo establecer el descriptor de archivo."
 
 #. TODO: what to do here - do we really have to disconnect?
-#: ../libpurple/protocols/yahoo/yahoo_packet.c:289
+#: ../libpurple/protocols/yahoo/yahoo_packet.c:302
 msgid "Write Error"
 msgstr "Error de escritura"
 
@@ -11177,7 +11745,7 @@
 msgstr "Exposición"
 
 #: ../libpurple/proxy.c:458 ../libpurple/proxy.c:877 ../libpurple/proxy.c:1032
-#: ../libpurple/proxy.c:1588
+#: ../libpurple/proxy.c:1600
 #, c-format
 msgid ""
 "Unable to create socket:\n"
@@ -11208,7 +11776,7 @@
 msgid "Error resolving %s"
 msgstr "Error al resolver %s"
 
-#: ../libpurple/proxy.c:1685
+#: ../libpurple/proxy.c:1697
 msgid "Could not resolve host name"
 msgstr "No se pudo resolver el nombre de equipo"
 
@@ -11246,7 +11814,7 @@
 msgid "%s is now known as %s.\n"
 msgstr "%s ahora se llama %s.\n"
 
-#: ../libpurple/server.c:679
+#: ../libpurple/server.c:680
 #, c-format
 msgid ""
 "%s has invited %s to the chat room %s:\n"
@@ -11255,12 +11823,12 @@
 "%s ha invitado a %s a la sala de chat %s:\n"
 "%s"
 
-#: ../libpurple/server.c:684
+#: ../libpurple/server.c:685
 #, c-format
 msgid "%s has invited %s to the chat room %s\n"
 msgstr "%s ha invitado a %s a la sala de chat %s\n"
 
-#: ../libpurple/server.c:688
+#: ../libpurple/server.c:689
 msgid "Accept chat invitation?"
 msgstr "¿Aceptar la invitación de chat?"
 
@@ -11302,27 +11870,27 @@
 msgid "%s became unidle"
 msgstr "%s ahora está activo"
 
-#: ../libpurple/status.c:1312
+#: ../libpurple/status.c:1313
 #, c-format
 msgid "+++ %s became idle"
 msgstr "+++ %s ahora está inactivo"
 
-#: ../libpurple/status.c:1314
+#: ../libpurple/status.c:1315
 #, c-format
 msgid "+++ %s became unidle"
 msgstr "+++ %s ahora está activo"
 
-#: ../libpurple/util.c:681
+#: ../libpurple/util.c:708
 #, c-format
 msgid "%x %X"
 msgstr "%x %X"
 
-#: ../libpurple/util.c:2553
+#: ../libpurple/util.c:2637
 #, c-format
 msgid "Error Reading %s"
 msgstr "Error al leer %s"
 
-#: ../libpurple/util.c:2554
+#: ../libpurple/util.c:2638
 #, c-format
 msgid ""
 "An error was encountered reading your %s.  They have not been loaded, and "
@@ -11331,62 +11899,67 @@
 "Se ha encontrado un error al leer su %s. No se ha cargado, y el archivo "
 "antiguo se ha renombrado a %s~."
 
-#: ../libpurple/util.c:3024
+#: ../libpurple/util.c:3138
 msgid "Calculating..."
 msgstr "Calculando..."
 
-#: ../libpurple/util.c:3027
+#: ../libpurple/util.c:3141
 msgid "Unknown."
 msgstr "Desconocido."
 
-#: ../libpurple/util.c:3053
+#: ../libpurple/util.c:3167
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] "%d segundo"
 msgstr[1] "%d segundos"
 
-#: ../libpurple/util.c:3065
+#: ../libpurple/util.c:3179
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] "%d día"
 msgstr[1] "%d días"
 
-#: ../libpurple/util.c:3073
+#: ../libpurple/util.c:3187
 #, c-format
 msgid "%s, %d hour"
 msgid_plural "%s, %d hours"
 msgstr[0] "%s, %d hora"
 msgstr[1] "%s, %d horas"
 
-#: ../libpurple/util.c:3079
+#: ../libpurple/util.c:3193
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d hora"
 msgstr[1] "%d horas"
 
-#: ../libpurple/util.c:3087
+#: ../libpurple/util.c:3201
 #, c-format
 msgid "%s, %d minute"
 msgid_plural "%s, %d minutes"
 msgstr[0] "%s, %d minuto"
 msgstr[1] "%s, %d minutos"
 
-#: ../libpurple/util.c:3093
+#: ../libpurple/util.c:3207
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d minuto"
 msgstr[1] "%d minutos"
 
-#: ../libpurple/util.c:3362 ../libpurple/util.c:3660
+#: ../libpurple/util.c:3467
+#, c-format
+msgid "Could not open %s: Redirected too many times"
+msgstr "No se pudo abrir %s: se produjeron demasiadas redirecciones"
+
+#: ../libpurple/util.c:3504 ../libpurple/util.c:3799
 #, c-format
 msgid "Unable to connect to %s"
 msgstr "No se pudo conectar a %s"
 
-#: ../libpurple/util.c:3488
+#: ../libpurple/util.c:3627
 #, c-format
 msgid ""
 "Unable to allocate enough memory to hold the contents from %s.  The web "
@@ -11395,17 +11968,17 @@
 "No se pudo obtener suficiente memoria para mantener los contenidos de %s. Es "
 "posible que el servidor web esté intentando algo con malas intenciones."
 
-#: ../libpurple/util.c:3523
+#: ../libpurple/util.c:3662
 #, c-format
 msgid "Error reading from %s: %s"
 msgstr "Error al leer de %s: %s"
 
-#: ../libpurple/util.c:3554
+#: ../libpurple/util.c:3693
 #, c-format
 msgid "Error writing to %s: %s"
 msgstr "Error al escribir a %s: %s"
 
-#: ../libpurple/util.c:3579
+#: ../libpurple/util.c:3718
 #, c-format
 msgid "Unable to connect to %s: %s"
 msgstr "No se pudo conectar a %s: %s"
@@ -11431,55 +12004,71 @@
 msgstr "La orientación en el área de notificación."
 
 #. Build the login options frame.
-#: ../pidgin/gtkaccount.c:406
+#: ../pidgin/gtkaccount.c:409
 msgid "Login Options"
 msgstr "Opciones de conexión"
 
-#: ../pidgin/gtkaccount.c:515
-msgid "Local alias:"
-msgstr "Apodo local:"
+#: ../pidgin/gtkaccount.c:430
+msgid "Pro_tocol:"
+msgstr "Pro_tocolo:"
+
+#: ../pidgin/gtkaccount.c:441
+msgid "Screen _name:"
+msgstr "_Nombre de usuario:"
+
+#: ../pidgin/gtkaccount.c:531
+msgid "_Local alias:"
+msgstr "Apodo _local:"
+
+#: ../pidgin/gtkaccount.c:535
+msgid "Remember pass_word"
+msgstr "Recordar _contraseña"
 
 #. Build the user options frame.
-#: ../pidgin/gtkaccount.c:577
+#: ../pidgin/gtkaccount.c:593
 msgid "User Options"
 msgstr "Opciones de usuario"
 
+#: ../pidgin/gtkaccount.c:606
+msgid "New _mail notifications"
+msgstr "Notificaciones de _correo nuevo"
+
 #. Buddy icon
-#: ../pidgin/gtkaccount.c:595
-msgid "Use this buddy icon for this account:"
-msgstr "Utilizar este icono de amigo para esta cuenta:"
+#: ../pidgin/gtkaccount.c:611
+msgid "Use this buddy _icon for this account:"
+msgstr "Utilizar este _icono de amigo para esta cuenta:"
 
 #. Build the protocol options frame.
-#: ../pidgin/gtkaccount.c:715
+#: ../pidgin/gtkaccount.c:731
 #, c-format
 msgid "%s Options"
 msgstr "Opciones de %s"
 
-#: ../pidgin/gtkaccount.c:912
+#: ../pidgin/gtkaccount.c:936
 msgid "Use GNOME Proxy Settings"
 msgstr "Usar configuración del proxy de GNOME"
 
-#: ../pidgin/gtkaccount.c:913
+#: ../pidgin/gtkaccount.c:937
 msgid "Use Global Proxy Settings"
 msgstr "Usar configuración global del proxy"
 
-#: ../pidgin/gtkaccount.c:919
+#: ../pidgin/gtkaccount.c:943
 msgid "No Proxy"
 msgstr "Sin proxy"
 
-#: ../pidgin/gtkaccount.c:925
+#: ../pidgin/gtkaccount.c:949
 msgid "HTTP"
 msgstr "HTTP"
 
-#: ../pidgin/gtkaccount.c:931
+#: ../pidgin/gtkaccount.c:955
 msgid "SOCKS 4"
 msgstr "SOCKS 4"
 
-#: ../pidgin/gtkaccount.c:937
+#: ../pidgin/gtkaccount.c:961
 msgid "SOCKS 5"
 msgstr "SOCKS 5"
 
-#: ../pidgin/gtkaccount.c:943 ../pidgin/gtkprefs.c:1100
+#: ../pidgin/gtkaccount.c:967 ../pidgin/gtkprefs.c:1127
 msgid "Use Environmental Settings"
 msgstr "Usar configuración del entorno"
 
@@ -11488,60 +12077,60 @@
 #. A) your network is really slow and you have nothing better to do than
 #. look at butterflies.
 #. B)You are looking really closely at something that shouldn't matter.
-#: ../pidgin/gtkaccount.c:982
+#: ../pidgin/gtkaccount.c:1006
 msgid "If you look real closely"
 msgstr "Si miras de cerca"
 
 #. This is an easter egg. See the comment on the previous line in the source.
-#: ../pidgin/gtkaccount.c:985
+#: ../pidgin/gtkaccount.c:1009
 msgid "you can see the butterflies mating"
 msgstr "puedes ver a las mariposas apareándose"
 
-#: ../pidgin/gtkaccount.c:1006
+#: ../pidgin/gtkaccount.c:1030
 msgid "Proxy Options"
 msgstr "Opciones del proxy"
 
-#: ../pidgin/gtkaccount.c:1020 ../pidgin/gtkprefs.c:1094
+#: ../pidgin/gtkaccount.c:1044 ../pidgin/gtkprefs.c:1121
 msgid "Proxy _type:"
 msgstr "_Tipo de proxy:"
 
-#: ../pidgin/gtkaccount.c:1029 ../pidgin/gtkprefs.c:1115
+#: ../pidgin/gtkaccount.c:1053 ../pidgin/gtkprefs.c:1142
 msgid "_Host:"
 msgstr "_Servidor:"
 
-#: ../pidgin/gtkaccount.c:1033 ../pidgin/gtkprefs.c:1133
+#: ../pidgin/gtkaccount.c:1057 ../pidgin/gtkprefs.c:1160
 msgid "_Port:"
 msgstr "_Puerto:"
 
-#: ../pidgin/gtkaccount.c:1041
+#: ../pidgin/gtkaccount.c:1065
 msgid "_Username:"
 msgstr "Nombre de _usuario:"
 
-#: ../pidgin/gtkaccount.c:1048 ../pidgin/gtkprefs.c:1170
+#: ../pidgin/gtkaccount.c:1072 ../pidgin/gtkprefs.c:1197
 msgid "Pa_ssword:"
 msgstr "_Contraseña:"
 
-#: ../pidgin/gtkaccount.c:1454
+#: ../pidgin/gtkaccount.c:1473
 msgid "Add Account"
 msgstr "Añadir cuenta"
 
-#: ../pidgin/gtkaccount.c:1478
+#: ../pidgin/gtkaccount.c:1492
 msgid "_Basic"
 msgstr "_Básica"
 
-#: ../pidgin/gtkaccount.c:1489
+#: ../pidgin/gtkaccount.c:1503
 msgid "_Advanced"
 msgstr "_Avanzadas"
 
-#: ../pidgin/gtkaccount.c:1961 ../pidgin/gtkplugin.c:568
+#: ../pidgin/gtkaccount.c:1975 ../pidgin/gtkplugin.c:568
 msgid "Enabled"
 msgstr "Habilitado"
 
-#: ../pidgin/gtkaccount.c:1989
+#: ../pidgin/gtkaccount.c:2003
 msgid "Protocol"
 msgstr "Protocolo"
 
-#: ../pidgin/gtkaccount.c:2183
+#: ../pidgin/gtkaccount.c:2204
 #, c-format
 msgid ""
 "<span size='larger' weight='bold'>Welcome to %s!</span>\n"
@@ -11561,231 +12150,229 @@
 "cuenta. Si quiere que %s se conecte a múltiples cuentas de MI, deberá pulsar "
 "<b>Añadir</b> otra vez para configurarlas todas."
 
-#: ../pidgin/gtkblist.c:724
+#: ../pidgin/gtkblist.c:727
 msgid "Join a Chat"
 msgstr "Unirse a un chat"
 
-#: ../pidgin/gtkblist.c:745
+#: ../pidgin/gtkblist.c:748
 msgid ""
 "Please enter the appropriate information about the chat you would like to "
 "join.\n"
 msgstr "Introduzca la información apropiada del chat al que desearía unirse.\n"
 
-#: ../pidgin/gtkblist.c:756 ../pidgin/gtkpounce.c:531
-#: ../pidgin/gtkroomlist.c:399
+#. Set up stuff for the account box
+#: ../pidgin/gtkblist.c:759 ../pidgin/gtkblist.c:5446
+#: ../pidgin/gtkblist.c:5813 ../pidgin/gtkpounce.c:540
+#: ../pidgin/gtkroomlist.c:395
 msgid "_Account:"
 msgstr "_Cuenta:"
 
-#: ../pidgin/gtkblist.c:1045 ../pidgin/gtkprivacy.c:606
-#: ../pidgin/gtkprivacy.c:620
+#: ../pidgin/gtkblist.c:1048 ../pidgin/gtkprivacy.c:602
+#: ../pidgin/gtkprivacy.c:616
 msgid "_Block"
 msgstr "_Bloquear"
 
-#: ../pidgin/gtkblist.c:1045
+#: ../pidgin/gtkblist.c:1048
 msgid "Un_block"
 msgstr "Des_bloquear"
 
-#: ../pidgin/gtkblist.c:1096
+#: ../pidgin/gtkblist.c:1099
 msgid "Get _Info"
 msgstr "Obtener _información"
 
-#: ../pidgin/gtkblist.c:1099 ../pidgin/pidginstock.c:84
+#: ../pidgin/gtkblist.c:1102 ../pidgin/pidginstock.c:84
 msgid "I_M"
 msgstr "_MI"
 
-#: ../pidgin/gtkblist.c:1105
+#: ../pidgin/gtkblist.c:1108
 msgid "_Send File"
 msgstr "_Enviar archivo"
 
-#: ../pidgin/gtkblist.c:1112
+#: ../pidgin/gtkblist.c:1115
 msgid "Add Buddy _Pounce"
 msgstr "Añadir _aviso de amigo"
 
-#: ../pidgin/gtkblist.c:1116 ../pidgin/gtkblist.c:1120
-#: ../pidgin/gtkblist.c:1222 ../pidgin/gtkblist.c:1245
+#: ../pidgin/gtkblist.c:1119 ../pidgin/gtkblist.c:1123
+#: ../pidgin/gtkblist.c:1226 ../pidgin/gtkblist.c:1249
 msgid "View _Log"
 msgstr "Ver _registro"
 
-#: ../pidgin/gtkblist.c:1132
-msgid "Alias..."
-msgstr "_Apodo..."
-
-#: ../pidgin/gtkblist.c:1141 ../pidgin/gtkblist.c:1230
-#: ../pidgin/gtkblist.c:1251
+#: ../pidgin/gtkblist.c:1135 ../pidgin/gtkblist.c:1144
+#: ../pidgin/gtkblist.c:1234 ../pidgin/gtkblist.c:1255
 msgid "_Alias..."
 msgstr "_Apodo..."
 
-#: ../pidgin/gtkblist.c:1143 ../pidgin/gtkblist.c:1232
-#: ../pidgin/gtkblist.c:1253
+#: ../pidgin/gtkblist.c:1138 ../pidgin/gtkblist.c:1146
+#: ../pidgin/gtkblist.c:1236 ../pidgin/gtkblist.c:1257
 msgid "_Remove"
 msgstr "Elimina_r"
 
-#: ../pidgin/gtkblist.c:1192
+#: ../pidgin/gtkblist.c:1196
 msgid "Add a _Buddy"
 msgstr "Añadir un _amigo"
 
-#: ../pidgin/gtkblist.c:1195
+#: ../pidgin/gtkblist.c:1199
 msgid "Add a C_hat"
 msgstr "Añadir un _chat"
 
-#: ../pidgin/gtkblist.c:1198
+#: ../pidgin/gtkblist.c:1202
 msgid "_Delete Group"
 msgstr "_Eliminar grupo"
 
-#: ../pidgin/gtkblist.c:1200
+#: ../pidgin/gtkblist.c:1204
 msgid "_Rename"
 msgstr "_Renombrar"
 
 #. join button
-#: ../pidgin/gtkblist.c:1218 ../pidgin/gtkroomlist.c:306
-#: ../pidgin/gtkroomlist.c:463 ../pidgin/pidginstock.c:82
+#: ../pidgin/gtkblist.c:1222 ../pidgin/gtkroomlist.c:306
+#: ../pidgin/gtkroomlist.c:459 ../pidgin/pidginstock.c:82
 msgid "_Join"
 msgstr "_Unirse"
 
-#: ../pidgin/gtkblist.c:1220
+#: ../pidgin/gtkblist.c:1224
 msgid "Auto-Join"
 msgstr "Conectarse automáticamente"
 
-#: ../pidgin/gtkblist.c:1258 ../pidgin/gtkblist.c:1281
+#: ../pidgin/gtkblist.c:1262 ../pidgin/gtkblist.c:1285
 msgid "_Collapse"
 msgstr "_Contraer"
 
-#: ../pidgin/gtkblist.c:1286
+#: ../pidgin/gtkblist.c:1290
 msgid "_Expand"
 msgstr "_Expandir"
 
-#: ../pidgin/gtkblist.c:1531 ../pidgin/gtkblist.c:1543
-#: ../pidgin/gtkblist.c:4511 ../pidgin/gtkblist.c:4521
+#: ../pidgin/gtkblist.c:1535 ../pidgin/gtkblist.c:1547
+#: ../pidgin/gtkblist.c:4547 ../pidgin/gtkblist.c:4557
 msgid "/Tools/Mute Sounds"
 msgstr "/Herramientas/Sin sonido"
 
-#: ../pidgin/gtkblist.c:2003 ../pidgin/gtkconv.c:4535
-#: ../pidgin/gtkpounce.c:423
+#: ../pidgin/gtkblist.c:2007 ../pidgin/gtkconv.c:4564
+#: ../pidgin/gtkpounce.c:429
 msgid ""
 "You are not currently signed on with an account that can add that buddy."
 msgstr "No está conectado con ninguna cuenta que pueda añadir a ese amigo."
 
 #. Buddies menu
-#: ../pidgin/gtkblist.c:2832
+#: ../pidgin/gtkblist.c:2847
 msgid "/_Buddies"
 msgstr "/A_migos"
 
-#: ../pidgin/gtkblist.c:2833
+#: ../pidgin/gtkblist.c:2848
 msgid "/Buddies/New Instant _Message..."
 msgstr "/Amigos/Mensaje _instantáneo nuevo..."
 
-#: ../pidgin/gtkblist.c:2834
+#: ../pidgin/gtkblist.c:2849
 msgid "/Buddies/Join a _Chat..."
 msgstr "/Amigos/Unirse a un _chat..."
 
-#: ../pidgin/gtkblist.c:2835
+#: ../pidgin/gtkblist.c:2850
 msgid "/Buddies/Get User _Info..."
 msgstr "/Amigos/Obtener _información del usuario..."
 
-#: ../pidgin/gtkblist.c:2836
+#: ../pidgin/gtkblist.c:2851
 msgid "/Buddies/View User _Log..."
 msgstr "/Amigos/Ver _registro del usuario..."
 
-#: ../pidgin/gtkblist.c:2838
+#: ../pidgin/gtkblist.c:2853
 msgid "/Buddies/Show _Offline Buddies"
 msgstr "/Amigos/Mostrar amigos _desconectados"
 
-#: ../pidgin/gtkblist.c:2839
+#: ../pidgin/gtkblist.c:2854
 msgid "/Buddies/Show _Empty Groups"
 msgstr "/Amigos/Mostrar grupos _vacíos"
 
-#: ../pidgin/gtkblist.c:2840
+#: ../pidgin/gtkblist.c:2855
 msgid "/Buddies/Show Buddy _Details"
 msgstr "/Amigos/Mostrar _detalles de amigo"
 
-#: ../pidgin/gtkblist.c:2841
+#: ../pidgin/gtkblist.c:2856
 msgid "/Buddies/Show Idle _Times"
 msgstr "/Amigos/Mostrar _tiempo de inactividad"
 
-#: ../pidgin/gtkblist.c:2842
+#: ../pidgin/gtkblist.c:2857
 msgid "/Buddies/_Sort Buddies"
 msgstr "/Amigos/_Ordenar amigos"
 
-#: ../pidgin/gtkblist.c:2844
+#: ../pidgin/gtkblist.c:2859
 msgid "/Buddies/_Add Buddy..."
 msgstr "/Amigos/_Añadir un amigo..."
 
-#: ../pidgin/gtkblist.c:2845
+#: ../pidgin/gtkblist.c:2860
 msgid "/Buddies/Add C_hat..."
 msgstr "/Amigos/Añadir un _chat..."
 
-#: ../pidgin/gtkblist.c:2846
+#: ../pidgin/gtkblist.c:2861
 msgid "/Buddies/Add _Group..."
 msgstr "/Amigos/Añadir _grupo..."
 
-#: ../pidgin/gtkblist.c:2848
+#: ../pidgin/gtkblist.c:2863
 msgid "/Buddies/_Quit"
 msgstr "/Amigos/_Salir"
 
 #. Accounts menu
-#: ../pidgin/gtkblist.c:2851
+#: ../pidgin/gtkblist.c:2866
 msgid "/_Accounts"
 msgstr "/_Cuentas"
 
-#: ../pidgin/gtkblist.c:2852 ../pidgin/gtkblist.c:6446
+#: ../pidgin/gtkblist.c:2867 ../pidgin/gtkblist.c:6511
 msgid "/Accounts/Add\\/Edit"
 msgstr "/Cuentas/Añadir\\/Editar"
 
 #. Tools
-#: ../pidgin/gtkblist.c:2855
+#: ../pidgin/gtkblist.c:2870
 msgid "/_Tools"
 msgstr "/_Herramientas"
 
-#: ../pidgin/gtkblist.c:2856
+#: ../pidgin/gtkblist.c:2871
 msgid "/Tools/Buddy _Pounces"
 msgstr "/Herramientas/_Aviso de amigo"
 
-#: ../pidgin/gtkblist.c:2857
+#: ../pidgin/gtkblist.c:2872
 msgid "/Tools/Plu_gins"
 msgstr "/Herramientas/Com_plementos"
 
-#: ../pidgin/gtkblist.c:2858
+#: ../pidgin/gtkblist.c:2873
 msgid "/Tools/Pr_eferences"
 msgstr "/Herramientas/Pr_eferencias"
 
-#: ../pidgin/gtkblist.c:2859
+#: ../pidgin/gtkblist.c:2874
 msgid "/Tools/Pr_ivacy"
 msgstr "/Herramientas/Pri_vacidad"
 
-#: ../pidgin/gtkblist.c:2861
+#: ../pidgin/gtkblist.c:2876
 msgid "/Tools/_File Transfers"
 msgstr "/Herramientas/_Transferencias de archivos"
 
-#: ../pidgin/gtkblist.c:2862
+#: ../pidgin/gtkblist.c:2877
 msgid "/Tools/R_oom List"
 msgstr "/Herramientas/_Lista de salas"
 
-#: ../pidgin/gtkblist.c:2863
+#: ../pidgin/gtkblist.c:2878
 msgid "/Tools/System _Log"
 msgstr "/Herramientas/_Registro del sistema"
 
-#: ../pidgin/gtkblist.c:2865
+#: ../pidgin/gtkblist.c:2880
 msgid "/Tools/Mute _Sounds"
 msgstr "/Herramientas/_Sin sonido"
 
 #. Help
-#: ../pidgin/gtkblist.c:2868
+#: ../pidgin/gtkblist.c:2882
 msgid "/_Help"
 msgstr "/_Ayuda"
 
-#: ../pidgin/gtkblist.c:2869
+#: ../pidgin/gtkblist.c:2883
 msgid "/Help/Online _Help"
 msgstr "/Ayuda/Ayuda en _línea"
 
-#: ../pidgin/gtkblist.c:2870
+#: ../pidgin/gtkblist.c:2884
 msgid "/Help/_Debug Window"
 msgstr "/Ayuda/Ventana de _depuración"
 
-#: ../pidgin/gtkblist.c:2871
+#: ../pidgin/gtkblist.c:2885
 msgid "/Help/_About"
 msgstr "/Ayuda/_Acerca de"
 
-#: ../pidgin/gtkblist.c:2899
+#: ../pidgin/gtkblist.c:2913
 #, c-format
 msgid ""
 "\n"
@@ -11794,127 +12381,127 @@
 "\n"
 "<b>Cuenta:</b> %s"
 
-#: ../pidgin/gtkblist.c:2977
+#: ../pidgin/gtkblist.c:2991
 msgid "Buddy Alias"
 msgstr "Apodo de amigo"
 
-#: ../pidgin/gtkblist.c:2998
+#: ../pidgin/gtkblist.c:3019
 msgid "Logged In"
 msgstr "Conectado"
 
-#: ../pidgin/gtkblist.c:3044
+#: ../pidgin/gtkblist.c:3065
 msgid "Last Seen"
 msgstr "Visto por última vez"
 
-#: ../pidgin/gtkblist.c:3064
+#: ../pidgin/gtkblist.c:3085
 msgid "Spooky"
 msgstr "Asustadizo"
 
-#: ../pidgin/gtkblist.c:3066
+#: ../pidgin/gtkblist.c:3087
 msgid "Awesome"
 msgstr "Genial"
 
-#: ../pidgin/gtkblist.c:3068
+#: ../pidgin/gtkblist.c:3089
 msgid "Rockin'"
 msgstr "Rock'n'roleando"
 
-#: ../pidgin/gtkblist.c:3394
+#: ../pidgin/gtkblist.c:3418
 #, c-format
 msgid "Idle %dh %02dm"
 msgstr "Inactivo %dh %02dm"
 
-#: ../pidgin/gtkblist.c:3396
+#: ../pidgin/gtkblist.c:3420
 #, c-format
 msgid "Idle %dm"
 msgstr "Inactivo %dm"
 
-#: ../pidgin/gtkblist.c:3533
+#: ../pidgin/gtkblist.c:3565
 msgid "/Buddies/New Instant Message..."
 msgstr "/Amigos/Nuevo mensaje instantáneo..."
 
-#: ../pidgin/gtkblist.c:3534 ../pidgin/gtkblist.c:3567
+#: ../pidgin/gtkblist.c:3566 ../pidgin/gtkblist.c:3599
 msgid "/Buddies/Join a Chat..."
 msgstr "/Amigos/Unirse a un chat..."
 
-#: ../pidgin/gtkblist.c:3535
+#: ../pidgin/gtkblist.c:3567
 msgid "/Buddies/Get User Info..."
 msgstr "/Amigos/Obtener información del usuario..."
 
-#: ../pidgin/gtkblist.c:3536
+#: ../pidgin/gtkblist.c:3568
 msgid "/Buddies/Add Buddy..."
 msgstr "/Amigos/Añadir un amigo..."
 
-#: ../pidgin/gtkblist.c:3537 ../pidgin/gtkblist.c:3570
+#: ../pidgin/gtkblist.c:3569 ../pidgin/gtkblist.c:3602
 msgid "/Buddies/Add Chat..."
 msgstr "/Amigos/Añadir un chat..."
 
-#: ../pidgin/gtkblist.c:3538
+#: ../pidgin/gtkblist.c:3570
 msgid "/Buddies/Add Group..."
 msgstr "/Amigos/Añadir un grupo..."
 
-#: ../pidgin/gtkblist.c:3573
+#: ../pidgin/gtkblist.c:3605
 msgid "/Tools/Privacy"
 msgstr "/Herramientas/Privacidad"
 
-#: ../pidgin/gtkblist.c:3576
+#: ../pidgin/gtkblist.c:3608
 msgid "/Tools/Room List"
 msgstr "/Herramientas/Lista de salas"
 
-#: ../pidgin/gtkblist.c:3673 ../pidgin/gtkdocklet.c:153
+#: ../pidgin/gtkblist.c:3705 ../pidgin/gtkdocklet.c:153
 #, c-format
 msgid "%d unread message from %s\n"
 msgid_plural "%d unread messages from %s\n"
 msgstr[0] "%d mensaje sin leer de %s\n"
 msgstr[1] "%d mensajes sin leer de %s\n"
 
-#: ../pidgin/gtkblist.c:3750
+#: ../pidgin/gtkblist.c:3785
 msgid "Manually"
 msgstr "Manualmente"
 
-#: ../pidgin/gtkblist.c:3752
+#: ../pidgin/gtkblist.c:3787
 msgid "Alphabetically"
 msgstr "Alfabéticamente"
 
-#: ../pidgin/gtkblist.c:3753
+#: ../pidgin/gtkblist.c:3788
 msgid "By status"
 msgstr "Por estado"
 
-#: ../pidgin/gtkblist.c:3754
+#: ../pidgin/gtkblist.c:3789
 msgid "By log size"
 msgstr "Por tamaño de registro"
 
-#: ../pidgin/gtkblist.c:3956 ../pidgin/gtkconn.c:178
+#: ../pidgin/gtkblist.c:3993 ../pidgin/gtkconn.c:178
 #, c-format
 msgid "%s disconnected"
 msgstr "%s se ha desconectado"
 
-#: ../pidgin/gtkblist.c:3966
+#: ../pidgin/gtkblist.c:4003
 msgid "Re-enable Account"
 msgstr "Reactivar cuenta"
 
-#: ../pidgin/gtkblist.c:3990
+#: ../pidgin/gtkblist.c:4027
 #, c-format
 msgid "<span color=\"red\">%s disconnected: %s</span>"
 msgstr "<span color=\"red\">%s se ha desconectado: %s</span>"
 
-#: ../pidgin/gtkblist.c:4142
+#: ../pidgin/gtkblist.c:4179
 msgid "<b>Username:</b>"
 msgstr "<b>Nombre de usuario:</b>"
 
-#: ../pidgin/gtkblist.c:4149
+#: ../pidgin/gtkblist.c:4186
 msgid "<b>Password:</b>"
 msgstr "<b>Contraseña:</b>"
 
-#: ../pidgin/gtkblist.c:4160
+#: ../pidgin/gtkblist.c:4197
 msgid "_Login"
 msgstr "_Entrada"
 
-#: ../pidgin/gtkblist.c:4245
+#: ../pidgin/gtkblist.c:4280
 msgid "/Accounts"
 msgstr "/Cuentas"
 
 #. Translators: Please maintain the use of -> and <- to refer to menu heirarchy
-#: ../pidgin/gtkblist.c:4259
+#: ../pidgin/gtkblist.c:4294
 #, c-format
 msgid ""
 "<span weight='bold' size='larger'>Welcome to %s!</span>\n"
@@ -11933,23 +12520,23 @@
 #. set the Show Offline Buddies option. must be done
 #. * after the treeview or faceprint gets mad. -Robot101
 #.
-#: ../pidgin/gtkblist.c:4505
+#: ../pidgin/gtkblist.c:4541
 msgid "/Buddies/Show Offline Buddies"
 msgstr "/Amigos/Mostrar amigos desconectados"
 
-#: ../pidgin/gtkblist.c:4508
+#: ../pidgin/gtkblist.c:4544
 msgid "/Buddies/Show Empty Groups"
 msgstr "/Amigos/Mostrar grupos vacíos"
 
-#: ../pidgin/gtkblist.c:4514
+#: ../pidgin/gtkblist.c:4550
 msgid "/Buddies/Show Buddy Details"
 msgstr "/Amigos/Mostrar detalles de amigo"
 
-#: ../pidgin/gtkblist.c:4517
+#: ../pidgin/gtkblist.c:4553
 msgid "/Buddies/Show Idle Times"
 msgstr "/Amigos/Mostrar tiempos de inactividad"
 
-#: ../pidgin/gtkblist.c:5367
+#: ../pidgin/gtkblist.c:5423
 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. "
@@ -11960,17 +12547,20 @@
 "sobrenombre se mostrará en lugar del nombre de usuario siempre que sea "
 "posible.\n"
 
-#: ../pidgin/gtkblist.c:5427 ../pidgin/gtkblist.c:5788
-#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:554
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:307
-msgid "Group:"
-msgstr "Grupo:"
-
-#: ../pidgin/gtkblist.c:5686
+#. End of account box
+#: ../pidgin/gtkblist.c:5458
+msgid "_Screen name:"
+msgstr "Nombre de _usuario:"
+
+#: ../pidgin/gtkblist.c:5480 ../pidgin/gtkblist.c:5834
+msgid "A_lias:"
+msgstr "_Apodo:"
+
+#: ../pidgin/gtkblist.c:5746
 msgid "This protocol does not support chat rooms."
 msgstr "Este protocolo no está soportado en las habitaciones de chats."
 
-#: ../pidgin/gtkblist.c:5702
+#: ../pidgin/gtkblist.c:5762
 msgid ""
 "You are not currently signed on with any protocols that have the ability to "
 "chat."
@@ -11978,7 +12568,7 @@
 "No está conectado con ninguna cuenta que tenga la capacidad de acceder a "
 "chats."
 
-#: ../pidgin/gtkblist.c:5743
+#: ../pidgin/gtkblist.c:5803
 msgid ""
 "Please enter an alias, and the appropriate information about the chat you "
 "would like to add to your buddy list.\n"
@@ -11986,39 +12576,39 @@
 "Introduzca el apodo, y la información que crea conveniente del chat que "
 "desearía añadir en la lista de amigos.\n"
 
-#: ../pidgin/gtkblist.c:5826
+#: ../pidgin/gtkblist.c:5891
 msgid "Please enter the name of the group to be added."
 msgstr "Introduzca el nombre del grupo a añadir."
 
-#: ../pidgin/gtkblist.c:6466
+#: ../pidgin/gtkblist.c:6531
 msgid "<PurpleMain>/Accounts/"
 msgstr "<PurpleMain>/Cuentas/"
 
-#: ../pidgin/gtkblist.c:6490
+#: ../pidgin/gtkblist.c:6555
 msgid "_Edit Account"
 msgstr "_Editar cuenta"
 
-#: ../pidgin/gtkblist.c:6503 ../pidgin/gtkconv.c:2923
+#: ../pidgin/gtkblist.c:6568 ../pidgin/gtkconv.c:2973
 msgid "No actions available"
 msgstr "No hay acciones disponibles"
 
-#: ../pidgin/gtkblist.c:6511
+#: ../pidgin/gtkblist.c:6576
 msgid "_Disable"
 msgstr "_Deshabilitar"
 
-#: ../pidgin/gtkblist.c:6523
+#: ../pidgin/gtkblist.c:6588
 msgid "Enable Account"
 msgstr "Habilitar cuenta"
 
-#: ../pidgin/gtkblist.c:6529
+#: ../pidgin/gtkblist.c:6594
 msgid "<PurpleMain>/Accounts/Enable Account"
 msgstr "<PurpleMain>/Cuentas/Activar cuenta"
 
-#: ../pidgin/gtkblist.c:6578
+#: ../pidgin/gtkblist.c:6643
 msgid "/Tools"
 msgstr "/Herramientas"
 
-#: ../pidgin/gtkblist.c:6648
+#: ../pidgin/gtkblist.c:6713
 msgid "/Buddies/Sort Buddies"
 msgstr "/Amigos/Ordenar amigos"
 
@@ -12035,22 +12625,26 @@
 "%s no intentará reconectarse a esta cuenta hasta que corrija el error y "
 "reactive la cuenta."
 
-#: ../pidgin/gtkconv.c:788 ../pidgin/gtkconv.c:814
+#: ../pidgin/gtkconv.c:473
+msgid "Unknown command."
+msgstr "Orden desconocida."
+
+#: ../pidgin/gtkconv.c:758 ../pidgin/gtkconv.c:784
 msgid "That buddy is not on the same protocol as this chat."
 msgstr "Ese amigo no utiliza el mismo protocolo que este chat."
 
-#: ../pidgin/gtkconv.c:808
+#: ../pidgin/gtkconv.c:778
 msgid ""
 "You are not currently signed on with an account that can invite that buddy."
 msgstr ""
 "No está conectado con ninguna cuenta con la que pueda invitar a ese amigo."
 
-#: ../pidgin/gtkconv.c:861
+#: ../pidgin/gtkconv.c:831
 msgid "Invite Buddy Into Chat Room"
 msgstr "Invitar a un amigo a la sala de chat"
 
 #. Put our happy label in it.
-#: ../pidgin/gtkconv.c:891
+#: ../pidgin/gtkconv.c:861
 msgid ""
 "Please enter the name of the user you wish to invite, along with an optional "
 "invite message."
@@ -12058,415 +12652,435 @@
 "Introduzca el nombre de usuario al que desea invitar, junto con un mensaje "
 "de invitación opcional."
 
-#: ../pidgin/gtkconv.c:912
+#: ../pidgin/gtkconv.c:882
 msgid "_Buddy:"
 msgstr "_Amigo:"
 
-#: ../pidgin/gtkconv.c:932 ../pidgin/gtksavedstatuses.c:1142
-#: ../pidgin/gtksavedstatuses.c:1478
+#: ../pidgin/gtkconv.c:902 ../pidgin/gtksavedstatuses.c:1135
+#: ../pidgin/gtksavedstatuses.c:1467
 msgid "_Message:"
 msgstr "_Mensaje:"
 
-#: ../pidgin/gtkconv.c:989 ../pidgin/gtkconv.c:2499 ../pidgin/gtkdebug.c:217
+#: ../pidgin/gtkconv.c:959 ../pidgin/gtkconv.c:2497 ../pidgin/gtkdebug.c:218
 #: ../pidgin/gtkft.c:542
 msgid "Unable to open file."
 msgstr "No se pudo leer el archivo."
 
-#: ../pidgin/gtkconv.c:995
+#: ../pidgin/gtkconv.c:965
 #, c-format
 msgid "<h1>Conversation with %s</h1>\n"
 msgstr "<h1>Conversaciones con %s</h1>\n"
 
-#: ../pidgin/gtkconv.c:1031
+#: ../pidgin/gtkconv.c:1001
 msgid "Save Conversation"
 msgstr "Guardar conversación"
 
-#: ../pidgin/gtkconv.c:1180 ../pidgin/gtkdebug.c:165 ../pidgin/gtkdebug.c:741
+#: ../pidgin/gtkconv.c:1150 ../pidgin/gtkdebug.c:166 ../pidgin/gtkdebug.c:742
 msgid "Find"
 msgstr "Buscar"
 
-#: ../pidgin/gtkconv.c:1206 ../pidgin/gtkdebug.c:193
+#: ../pidgin/gtkconv.c:1176 ../pidgin/gtkdebug.c:194
 msgid "_Search for:"
 msgstr "Término a _buscar:"
 
-#: ../pidgin/gtkconv.c:1358
+#: ../pidgin/gtkconv.c:1359
 msgid "Logging started. Future messages in this conversation will be logged."
 msgstr ""
 "Se inició el registro. A partir de ahora se registrarán todos los mensajes "
 "de esta conversación."
 
-#: ../pidgin/gtkconv.c:1366
+#: ../pidgin/gtkconv.c:1367
 msgid ""
 "Logging stopped. Future messages in this conversation will not be logged."
 msgstr ""
 "Se ha parado el registro. No se registrarán mensajes de esta conversación de "
 "ahora en adelante."
 
-#: ../pidgin/gtkconv.c:1614
+#: ../pidgin/gtkconv.c:1615
 msgid "Un-Ignore"
 msgstr "No ignorar"
 
-#: ../pidgin/gtkconv.c:1617
+#: ../pidgin/gtkconv.c:1618
 msgid "Ignore"
 msgstr "Ignorar"
 
-#: ../pidgin/gtkconv.c:1637
+#: ../pidgin/gtkconv.c:1638
 msgid "Get Away Message"
 msgstr "Mensaje de ausencia"
 
-#: ../pidgin/gtkconv.c:1660
+#: ../pidgin/gtkconv.c:1661
 msgid "Last said"
 msgstr "Dicho la última vez"
 
-#: ../pidgin/gtkconv.c:2507
+#: ../pidgin/gtkconv.c:2505
 msgid "Unable to save icon file to disk."
 msgstr "No se pudo salvar el archivo de iconos al disco."
 
-#: ../pidgin/gtkconv.c:2558
+#: ../pidgin/gtkconv.c:2556
 msgid "Save Icon"
 msgstr "Guardar icono"
 
-#: ../pidgin/gtkconv.c:2610
+#: ../pidgin/gtkconv.c:2608
 msgid "Animate"
 msgstr "Animar"
 
-#: ../pidgin/gtkconv.c:2615
+#: ../pidgin/gtkconv.c:2613
 msgid "Hide Icon"
 msgstr "Ocultar icono"
 
-#: ../pidgin/gtkconv.c:2618
+#: ../pidgin/gtkconv.c:2616
 msgid "Save Icon As..."
 msgstr "Guardar icono como..."
 
-#: ../pidgin/gtkconv.c:2622
+#: ../pidgin/gtkconv.c:2620
 msgid "Set Custom Icon..."
 msgstr "Configurar icono personalizado..."
 
-#: ../pidgin/gtkconv.c:2635
+#: ../pidgin/gtkconv.c:2633
 msgid "Remove Custom Icon"
 msgstr "Eliminar icono personalizado"
 
 #. Conversation menu
-#: ../pidgin/gtkconv.c:2777
+#: ../pidgin/gtkconv.c:2775
 msgid "/_Conversation"
 msgstr "/_Conversación"
 
-#: ../pidgin/gtkconv.c:2779
+#: ../pidgin/gtkconv.c:2777
 msgid "/Conversation/New Instant _Message..."
 msgstr "/Conversación/Mensaje _instantáneo nuevo..."
 
-#: ../pidgin/gtkconv.c:2784
+#: ../pidgin/gtkconv.c:2782
 msgid "/Conversation/_Find..."
 msgstr "/Conversación/_Buscar..."
 
-#: ../pidgin/gtkconv.c:2786
+#: ../pidgin/gtkconv.c:2784
 msgid "/Conversation/View _Log"
 msgstr "/Conversación/Ver _historial"
 
-#: ../pidgin/gtkconv.c:2787
+#: ../pidgin/gtkconv.c:2785
 msgid "/Conversation/_Save As..."
 msgstr "/Conversación/_Guardar como..."
 
-#: ../pidgin/gtkconv.c:2789
+#: ../pidgin/gtkconv.c:2787
 msgid "/Conversation/Clea_r Scrollback"
 msgstr "/Conversación/Limpia_r deslizable"
 
-#: ../pidgin/gtkconv.c:2793
+#: ../pidgin/gtkconv.c:2791
 msgid "/Conversation/Se_nd File..."
 msgstr "/Conversación/_Enviar archivo..."
 
-#: ../pidgin/gtkconv.c:2794
+#: ../pidgin/gtkconv.c:2792
 msgid "/Conversation/Add Buddy _Pounce..."
 msgstr "/Conversación/Añadir _aviso de amigo..."
 
+#: ../pidgin/gtkconv.c:2794
+msgid "/Conversation/_Get Info"
+msgstr "/Conversación/_Obtener información"
+
 #: ../pidgin/gtkconv.c:2796
-msgid "/Conversation/_Get Info"
-msgstr "/Conversación/_Obtener información"
-
-#: ../pidgin/gtkconv.c:2798
 msgid "/Conversation/In_vite..."
 msgstr "/Conversación/In_vitar..."
 
-#: ../pidgin/gtkconv.c:2800
+#: ../pidgin/gtkconv.c:2798
 msgid "/Conversation/M_ore"
 msgstr "/Conversación/_Más"
 
-#: ../pidgin/gtkconv.c:2804
+#: ../pidgin/gtkconv.c:2802
 msgid "/Conversation/Al_ias..."
 msgstr "/Conversación/A_podo..."
 
+#: ../pidgin/gtkconv.c:2804
+msgid "/Conversation/_Block..."
+msgstr "/Conversación/_Bloquear..."
+
 #: ../pidgin/gtkconv.c:2806
-msgid "/Conversation/_Block..."
-msgstr "/Conversación/_Bloquear..."
+msgid "/Conversation/_Unblock..."
+msgstr "/Conversación/_Desbloquear..."
 
 #: ../pidgin/gtkconv.c:2808
-msgid "/Conversation/_Unblock..."
-msgstr "/Conversación/_Desbloquear..."
+msgid "/Conversation/_Add..."
+msgstr "/Conversación/_Añadir..."
 
 #: ../pidgin/gtkconv.c:2810
-msgid "/Conversation/_Add..."
-msgstr "/Conversación/_Añadir..."
-
-#: ../pidgin/gtkconv.c:2812
 msgid "/Conversation/_Remove..."
 msgstr "/Conversación/Elimina_r..."
 
+#: ../pidgin/gtkconv.c:2815
+msgid "/Conversation/Insert Lin_k..."
+msgstr "/Conversación/Insertar en_lace..."
+
 #: ../pidgin/gtkconv.c:2817
+msgid "/Conversation/Insert Imag_e..."
+msgstr "/Conversación/Insertar imag_en..."
+
+#: ../pidgin/gtkconv.c:2823
 msgid "/Conversation/_Close"
 msgstr "/Conversación/_Cerrar"
 
 #. Options
-#: ../pidgin/gtkconv.c:2821
+#: ../pidgin/gtkconv.c:2827
 msgid "/_Options"
 msgstr "/_Opciones"
 
-#: ../pidgin/gtkconv.c:2822
+#: ../pidgin/gtkconv.c:2828
 msgid "/Options/Enable _Logging"
 msgstr "/Opciones/_Habilitar registro"
 
-#: ../pidgin/gtkconv.c:2823
+#: ../pidgin/gtkconv.c:2829
 msgid "/Options/Enable _Sounds"
 msgstr "/Opciones/Habilitar _sonidos"
 
-#: ../pidgin/gtkconv.c:2824
+#: ../pidgin/gtkconv.c:2830
 msgid "/Options/Show Buddy _Icon"
 msgstr "/Opciones/Mostrar _iconos de los amigos"
 
-#: ../pidgin/gtkconv.c:2826
+#: ../pidgin/gtkconv.c:2832
 msgid "/Options/Show Formatting _Toolbars"
 msgstr "/Opciones/Mostrar _barras de formato"
 
-#: ../pidgin/gtkconv.c:2827
+#: ../pidgin/gtkconv.c:2833
 msgid "/Options/Show Ti_mestamps"
 msgstr "/Opciones/Mostrar _marcas de tiempo"
 
-#: ../pidgin/gtkconv.c:2902
+#: ../pidgin/gtkconv.c:2909
 msgid "/Conversation/More"
 msgstr "/Conversación/Más"
 
+#: ../pidgin/gtkconv.c:3017
+msgid "/Options"
+msgstr "/Opciones"
+
 #. The menubar has been deactivated. Make sure the 'More' submenu is regenerated next time
 #. * the 'Conversation' menu pops up.
 #. Make sure the 'Conversation -> More' menuitems are regenerated whenever
 #. * the 'Conversation' menu pops up because the entries can change after the
 #. * conversation is created.
-#: ../pidgin/gtkconv.c:2947 ../pidgin/gtkconv.c:2979
+#: ../pidgin/gtkconv.c:3052 ../pidgin/gtkconv.c:3084
 msgid "/Conversation"
 msgstr "/Conversación"
 
-#: ../pidgin/gtkconv.c:2987
+#: ../pidgin/gtkconv.c:3092
 msgid "/Conversation/View Log"
 msgstr "/Conversación/Ver registro"
 
-#: ../pidgin/gtkconv.c:2993
+#: ../pidgin/gtkconv.c:3098
 msgid "/Conversation/Send File..."
 msgstr "/Conversación/Enviar archivo..."
 
-#: ../pidgin/gtkconv.c:2997
+#: ../pidgin/gtkconv.c:3102
 msgid "/Conversation/Add Buddy Pounce..."
 msgstr "/Conversación/Añadir aviso de amigo..."
 
-#: ../pidgin/gtkconv.c:3003
+#: ../pidgin/gtkconv.c:3108
 msgid "/Conversation/Get Info"
 msgstr "/Conversación/Obtener información"
 
-#: ../pidgin/gtkconv.c:3007
+#: ../pidgin/gtkconv.c:3112
 msgid "/Conversation/Invite..."
 msgstr "/Conversación/Invitar..."
 
-#: ../pidgin/gtkconv.c:3013
+#: ../pidgin/gtkconv.c:3118
 msgid "/Conversation/Alias..."
 msgstr "/Conversación/Apodo..."
 
-#: ../pidgin/gtkconv.c:3017
+#: ../pidgin/gtkconv.c:3122
 msgid "/Conversation/Block..."
 msgstr "/Conversación/Bloquear..."
 
-#: ../pidgin/gtkconv.c:3021
+#: ../pidgin/gtkconv.c:3126
 msgid "/Conversation/Unblock..."
 msgstr "/Conversación/Desbloquear..."
 
-#: ../pidgin/gtkconv.c:3025
+#: ../pidgin/gtkconv.c:3130
 msgid "/Conversation/Add..."
 msgstr "/Conversación/Añadir..."
 
-#: ../pidgin/gtkconv.c:3029
+#: ../pidgin/gtkconv.c:3134
 msgid "/Conversation/Remove..."
 msgstr "/Conversación/Eliminar..."
 
-#: ../pidgin/gtkconv.c:3033
+#: ../pidgin/gtkconv.c:3140
+msgid "/Conversation/Insert Link..."
+msgstr "/Opciones/Insertar enlace..."
+
+#: ../pidgin/gtkconv.c:3144
+msgid "/Conversation/Insert Image..."
+msgstr "/Opciones/Insertar imagen..."
+
+#: ../pidgin/gtkconv.c:3150
 msgid "/Options/Enable Logging"
 msgstr "/Opciones/_Habilitar registro"
 
-#: ../pidgin/gtkconv.c:3036
+#: ../pidgin/gtkconv.c:3153
 msgid "/Options/Enable Sounds"
 msgstr "/Opciones/Habilitar _sonidos"
 
-#: ../pidgin/gtkconv.c:3049
+#: ../pidgin/gtkconv.c:3166
 msgid "/Options/Show Formatting Toolbars"
 msgstr "/Opciones/Mostrar barras de formato"
 
-#: ../pidgin/gtkconv.c:3052
+#: ../pidgin/gtkconv.c:3169
 msgid "/Options/Show Timestamps"
 msgstr "/Opciones/Mostrar marcas de tiempo"
 
-#: ../pidgin/gtkconv.c:3055
+#: ../pidgin/gtkconv.c:3172
 msgid "/Options/Show Buddy Icon"
 msgstr "/Opciones/Mostrar _iconos de los amigos"
 
-#: ../pidgin/gtkconv.c:3139 ../pidgin/gtkconv.c:3181
+#: ../pidgin/gtkconv.c:3256 ../pidgin/gtkconv.c:3298
 msgid "User is typing..."
 msgstr "El usuario está escribiendo..."
 
-#: ../pidgin/gtkconv.c:3184
+#: ../pidgin/gtkconv.c:3301
 msgid "User has typed something and stopped"
 msgstr "El usuario ha escrito algo y ha parado"
 
 #. Build the Send To menu
-#: ../pidgin/gtkconv.c:3366
+#: ../pidgin/gtkconv.c:3483
 msgid "_Send To"
 msgstr "_Enviar a"
 
-#: ../pidgin/gtkconv.c:4080
+#: ../pidgin/gtkconv.c:4197
 msgid "_Send"
 msgstr "_Enviar"
 
 #. Setup the label telling how many people are in the room.
-#: ../pidgin/gtkconv.c:4229
+#: ../pidgin/gtkconv.c:4304
 msgid "0 people in room"
 msgstr "0 personas en la conversación"
 
-#: ../pidgin/gtkconv.c:5421 ../pidgin/gtkconv.c:5542
+#: ../pidgin/gtkconv.c:5452 ../pidgin/gtkconv.c:5573
 #, c-format
 msgid "%d person in room"
 msgid_plural "%d people in room"
 msgstr[0] "%d persona en la conversación"
 msgstr[1] "%d personas en la conversación"
 
-#: ../pidgin/gtkconv.c:6108 ../pidgin/gtkstatusbox.c:657
+#: ../pidgin/gtkconv.c:6149 ../pidgin/gtkstatusbox.c:657
 msgid "Typing"
 msgstr "Tecleando"
 
-#: ../pidgin/gtkconv.c:6114
+#: ../pidgin/gtkconv.c:6155
 msgid "Stopped Typing"
 msgstr "Deja de escribi_r"
 
-#: ../pidgin/gtkconv.c:6119
+#: ../pidgin/gtkconv.c:6160
 msgid "Nick Said"
 msgstr "Apodo dijo"
 
-#: ../pidgin/gtkconv.c:6124 ../pidgin/gtkdocklet.c:492
+#: ../pidgin/gtkconv.c:6165 ../pidgin/gtkdocklet.c:492
 msgid "Unread Messages"
 msgstr "Mensajes sin leer"
 
-#: ../pidgin/gtkconv.c:6129
+#: ../pidgin/gtkconv.c:6170
 msgid "New Event"
 msgstr "Nuevo acontecimiento"
 
-#: ../pidgin/gtkconv.c:7258
+#: ../pidgin/gtkconv.c:7302
 msgid "Confirm close"
 msgstr "Confirmar cierre"
 
-#: ../pidgin/gtkconv.c:7290
+#: ../pidgin/gtkconv.c:7334
 msgid "You have unread messages. Are you sure you want to close the window?"
 msgstr "Tiene mensajes sin leer. ¿Está seguro que quiere cerrar la ventana?"
 
-#: ../pidgin/gtkconv.c:7807
+#: ../pidgin/gtkconv.c:7856
 msgid "Close other tabs"
 msgstr "Cerrar otras solapas"
 
-#: ../pidgin/gtkconv.c:7813
+#: ../pidgin/gtkconv.c:7862
 msgid "Close all tabs"
 msgstr "Cerrar todas las solapas"
 
-#: ../pidgin/gtkconv.c:7821
+#: ../pidgin/gtkconv.c:7870
 msgid "Detach this tab"
 msgstr "Despegar esta solapa"
 
-#: ../pidgin/gtkconv.c:7827
+#: ../pidgin/gtkconv.c:7876
 msgid "Close this tab"
 msgstr "Cerrar esta solapa"
 
-#: ../pidgin/gtkconv.c:8211
+#: ../pidgin/gtkconv.c:8274
 msgid "Close conversation"
 msgstr "Cerrar conversación"
 
-#: ../pidgin/gtkconv.c:8732
+#: ../pidgin/gtkconv.c:8797
 msgid "Last created window"
 msgstr "Última ventana creada"
 
-#: ../pidgin/gtkconv.c:8734
+#: ../pidgin/gtkconv.c:8799
 msgid "Separate IM and Chat windows"
 msgstr "Separar ventanas de MIs y chats"
 
-#: ../pidgin/gtkconv.c:8736 ../pidgin/gtkprefs.c:1303
+#: ../pidgin/gtkconv.c:8801 ../pidgin/gtkprefs.c:1330
 msgid "New window"
 msgstr "Ventana nueva"
 
-#: ../pidgin/gtkconv.c:8738
+#: ../pidgin/gtkconv.c:8803
 msgid "By group"
 msgstr "Por grupo"
 
-#: ../pidgin/gtkconv.c:8740
+#: ../pidgin/gtkconv.c:8805
 msgid "By account"
 msgstr "Por cuenta"
 
-#: ../pidgin/gtkdebug.c:232
+#: ../pidgin/gtkdebug.c:233
 msgid "Save Debug Log"
 msgstr "Guardar registro de depuración"
 
-#: ../pidgin/gtkdebug.c:580
+#: ../pidgin/gtkdebug.c:581
 msgid "Invert"
 msgstr "Invertir"
 
-#: ../pidgin/gtkdebug.c:583
+#: ../pidgin/gtkdebug.c:584
 msgid "Highlight matches"
 msgstr "Resaltar coincidencias"
 
-#: ../pidgin/gtkdebug.c:650
+#: ../pidgin/gtkdebug.c:651
 msgid "_Icon Only"
 msgstr "Sólo _icono"
 
-#: ../pidgin/gtkdebug.c:651
+#: ../pidgin/gtkdebug.c:652
 msgid "_Text Only"
 msgstr "Sólo _texto"
 
-#: ../pidgin/gtkdebug.c:652
+#: ../pidgin/gtkdebug.c:653
 msgid "_Both Icon & Text"
 msgstr "_Tanto iconos como texto"
 
-#: ../pidgin/gtkdebug.c:773
+#: ../pidgin/gtkdebug.c:774
 msgid "Filter"
 msgstr "Filtro"
 
-#: ../pidgin/gtkdebug.c:792
+#: ../pidgin/gtkdebug.c:793
 msgid "Right click for more options."
 msgstr "Pulsar el botón derecho para más opciones."
 
-#: ../pidgin/gtkdebug.c:822
+#: ../pidgin/gtkdebug.c:823
 msgid "Level "
 msgstr "Nivel "
 
-#: ../pidgin/gtkdebug.c:823 ../pidgin/gtkdebug.c:829
+#: ../pidgin/gtkdebug.c:824 ../pidgin/gtkdebug.c:830
 msgid "Select the debug filter level."
 msgstr "Seleccione el nivel del filtro de depuración."
 
-#: ../pidgin/gtkdebug.c:831
+#: ../pidgin/gtkdebug.c:832
 msgid "All"
 msgstr "Todos"
 
-#: ../pidgin/gtkdebug.c:832
+#: ../pidgin/gtkdebug.c:833
 msgid "Misc"
 msgstr "Misceláneo"
 
-#: ../pidgin/gtkdebug.c:834
+#: ../pidgin/gtkdebug.c:835
 msgid "Warning"
 msgstr "Advertencia"
 
-#: ../pidgin/gtkdebug.c:835
+#: ../pidgin/gtkdebug.c:836
 msgid "Error "
 msgstr "Error "
 
-#: ../pidgin/gtkdebug.c:836
+#: ../pidgin/gtkdebug.c:837
 msgid "Fatal Error"
 msgstr "Error fatal"
 
@@ -12480,8 +13094,8 @@
 #: ../pidgin/gtkdialogs.c:79 ../pidgin/gtkdialogs.c:80
 #: ../pidgin/gtkdialogs.c:81 ../pidgin/gtkdialogs.c:82
 #: ../pidgin/gtkdialogs.c:83 ../pidgin/gtkdialogs.c:84
-#: ../pidgin/gtkdialogs.c:87 ../pidgin/gtkdialogs.c:88
-#: ../pidgin/gtkdialogs.c:89
+#: ../pidgin/gtkdialogs.c:85 ../pidgin/gtkdialogs.c:88
+#: ../pidgin/gtkdialogs.c:89 ../pidgin/gtkdialogs.c:90
 msgid "developer"
 msgstr "desarrollador"
 
@@ -12489,11 +13103,11 @@
 msgid "developer & webmaster"
 msgstr "desarrollador y webmaster"
 
-#: ../pidgin/gtkdialogs.c:85
+#: ../pidgin/gtkdialogs.c:86
 msgid "support"
 msgstr "soporte"
 
-#: ../pidgin/gtkdialogs.c:86
+#: ../pidgin/gtkdialogs.c:87
 msgid "support/QA"
 msgstr "soporte/QA"
 
@@ -12532,7 +13146,7 @@
 msgstr "Árabe"
 
 #: ../pidgin/gtkdialogs.c:125 ../pidgin/gtkdialogs.c:126
-#: ../pidgin/gtkdialogs.c:209
+#: ../pidgin/gtkdialogs.c:211
 msgid "Bulgarian"
 msgstr "Búlgaro"
 
@@ -12545,8 +13159,8 @@
 msgid "Bosnian"
 msgstr "Bosnio"
 
-#: ../pidgin/gtkdialogs.c:132 ../pidgin/gtkdialogs.c:210
-#: ../pidgin/gtkdialogs.c:211
+#: ../pidgin/gtkdialogs.c:132 ../pidgin/gtkdialogs.c:212
+#: ../pidgin/gtkdialogs.c:213
 msgid "Catalan"
 msgstr "Catalán"
 
@@ -12554,7 +13168,7 @@
 msgid "Valencian-Catalan"
 msgstr "Valenciano-Catalán"
 
-#: ../pidgin/gtkdialogs.c:135 ../pidgin/gtkdialogs.c:212
+#: ../pidgin/gtkdialogs.c:135 ../pidgin/gtkdialogs.c:214
 msgid "Czech"
 msgstr "Checo"
 
@@ -12563,7 +13177,7 @@
 msgstr "Danés"
 
 #: ../pidgin/gtkdialogs.c:138 ../pidgin/gtkdialogs.c:139
-#: ../pidgin/gtkdialogs.c:213
+#: ../pidgin/gtkdialogs.c:215
 msgid "German"
 msgstr "Alemán"
 
@@ -12592,9 +13206,9 @@
 msgid "Esperanto"
 msgstr "Esperanto"
 
-#: ../pidgin/gtkdialogs.c:149 ../pidgin/gtkdialogs.c:214
-#: ../pidgin/gtkdialogs.c:215 ../pidgin/gtkdialogs.c:216
-#: ../pidgin/gtkdialogs.c:217
+#: ../pidgin/gtkdialogs.c:149 ../pidgin/gtkdialogs.c:216
+#: ../pidgin/gtkdialogs.c:217 ../pidgin/gtkdialogs.c:218
+#: ../pidgin/gtkdialogs.c:219
 msgid "Spanish"
 msgstr "Español"
 
@@ -12607,14 +13221,14 @@
 msgid "Persian"
 msgstr "Persa"
 
-#: ../pidgin/gtkdialogs.c:155 ../pidgin/gtkdialogs.c:218
-#: ../pidgin/gtkdialogs.c:219
+#: ../pidgin/gtkdialogs.c:155 ../pidgin/gtkdialogs.c:220
+#: ../pidgin/gtkdialogs.c:221
 msgid "Finnish"
 msgstr "Finlandés"
 
-#: ../pidgin/gtkdialogs.c:156 ../pidgin/gtkdialogs.c:220
-#: ../pidgin/gtkdialogs.c:221 ../pidgin/gtkdialogs.c:222
-#: ../pidgin/gtkdialogs.c:223
+#: ../pidgin/gtkdialogs.c:156 ../pidgin/gtkdialogs.c:222
+#: ../pidgin/gtkdialogs.c:223 ../pidgin/gtkdialogs.c:224
+#: ../pidgin/gtkdialogs.c:225
 msgid "French"
 msgstr "Francés"
 
@@ -12630,7 +13244,7 @@
 msgid "Gujarati Language Team"
 msgstr "Grupo de traducción al Gujarati"
 
-#: ../pidgin/gtkdialogs.c:160 ../pidgin/gtkdialogs.c:224
+#: ../pidgin/gtkdialogs.c:160 ../pidgin/gtkdialogs.c:226
 msgid "Hebrew"
 msgstr "Hebreo"
 
@@ -12646,16 +13260,16 @@
 msgid "Indonesian"
 msgstr "Indonesio"
 
-#: ../pidgin/gtkdialogs.c:164 ../pidgin/gtkdialogs.c:225
+#: ../pidgin/gtkdialogs.c:164 ../pidgin/gtkdialogs.c:227
 msgid "Italian"
 msgstr "Italiano"
 
-#: ../pidgin/gtkdialogs.c:165 ../pidgin/gtkdialogs.c:226
-#: ../pidgin/gtkdialogs.c:227 ../pidgin/gtkdialogs.c:228
+#: ../pidgin/gtkdialogs.c:165 ../pidgin/gtkdialogs.c:228
+#: ../pidgin/gtkdialogs.c:229 ../pidgin/gtkdialogs.c:230
 msgid "Japanese"
 msgstr "Japonés"
 
-#: ../pidgin/gtkdialogs.c:166 ../pidgin/gtkdialogs.c:229
+#: ../pidgin/gtkdialogs.c:166 ../pidgin/gtkdialogs.c:231
 msgid "Georgian"
 msgstr "Georgiano"
 
@@ -12671,7 +13285,7 @@
 msgid "Kannada Translation team"
 msgstr "Grupo de traducción al kannada"
 
-#: ../pidgin/gtkdialogs.c:168 ../pidgin/gtkdialogs.c:230
+#: ../pidgin/gtkdialogs.c:168 ../pidgin/gtkdialogs.c:232
 msgid "Korean"
 msgstr "Coreano"
 
@@ -12680,127 +13294,129 @@
 msgid "Kurdish"
 msgstr "Kurdo"
 
-#: ../pidgin/gtkdialogs.c:172 ../pidgin/gtkdialogs.c:231
-#: ../pidgin/gtkdialogs.c:232
+#: ../pidgin/gtkdialogs.c:172 ../pidgin/gtkdialogs.c:233
+#: ../pidgin/gtkdialogs.c:234
 msgid "Lithuanian"
 msgstr "Lituano"
 
-#: ../pidgin/gtkdialogs.c:173
+#: ../pidgin/gtkdialogs.c:173 ../pidgin/gtkdialogs.c:174
+#: ../pidgin/gtkdialogs.c:235
 msgid "Macedonian"
 msgstr "Macedonio"
 
-#: ../pidgin/gtkdialogs.c:174
+#: ../pidgin/gtkdialogs.c:175
 msgid "Bokmål Norwegian"
 msgstr "Noruego Bokmål"
 
-#: ../pidgin/gtkdialogs.c:175
+#: ../pidgin/gtkdialogs.c:176
 msgid "Nepali"
 msgstr "Nepalés"
 
-#: ../pidgin/gtkdialogs.c:176
+#: ../pidgin/gtkdialogs.c:177
 msgid "Dutch, Flemish"
 msgstr "Danés, Flamenco"
 
-#: ../pidgin/gtkdialogs.c:177
+#: ../pidgin/gtkdialogs.c:178
 msgid "Norwegian"
 msgstr "Noruego"
 
-#: ../pidgin/gtkdialogs.c:178 ../pidgin/gtkdialogs.c:179
-#: ../pidgin/gtkdialogs.c:180 ../pidgin/gtkdialogs.c:233
+#: ../pidgin/gtkdialogs.c:179 ../pidgin/gtkdialogs.c:180
+#: ../pidgin/gtkdialogs.c:181 ../pidgin/gtkdialogs.c:236
 msgid "Polish"
 msgstr "Polaco"
 
-#: ../pidgin/gtkdialogs.c:181
+#: ../pidgin/gtkdialogs.c:182
 msgid "Portuguese"
 msgstr "Portugués"
 
-#: ../pidgin/gtkdialogs.c:182
+#: ../pidgin/gtkdialogs.c:183
 msgid "Portuguese-Brazil"
 msgstr "Portugués brasileño"
 
-#: ../pidgin/gtkdialogs.c:183
+#: ../pidgin/gtkdialogs.c:184
 msgid "Pashto"
 msgstr "Afgano"
 
-#: ../pidgin/gtkdialogs.c:184
+#: ../pidgin/gtkdialogs.c:185
 msgid "Romanian"
 msgstr "Rumano"
 
-#: ../pidgin/gtkdialogs.c:185 ../pidgin/gtkdialogs.c:234
-#: ../pidgin/gtkdialogs.c:235
+#: ../pidgin/gtkdialogs.c:186 ../pidgin/gtkdialogs.c:237
+#: ../pidgin/gtkdialogs.c:238
 msgid "Russian"
 msgstr "Ruso"
 
-#: ../pidgin/gtkdialogs.c:186 ../pidgin/gtkdialogs.c:187
-#: ../pidgin/gtkdialogs.c:236 ../pidgin/gtkdialogs.c:237
-#: ../pidgin/gtkdialogs.c:238
+#: ../pidgin/gtkdialogs.c:187 ../pidgin/gtkdialogs.c:188
+#: ../pidgin/gtkdialogs.c:239 ../pidgin/gtkdialogs.c:240
+#: ../pidgin/gtkdialogs.c:241
 msgid "Slovak"
 msgstr "Eslovaco"
 
-#: ../pidgin/gtkdialogs.c:188 ../pidgin/gtkdialogs.c:239
+#: ../pidgin/gtkdialogs.c:189 ../pidgin/gtkdialogs.c:242
 msgid "Slovenian"
 msgstr "Esloveno"
 
-#: ../pidgin/gtkdialogs.c:189
+#: ../pidgin/gtkdialogs.c:190
 msgid "Albanian"
 msgstr "Albanés"
 
-#: ../pidgin/gtkdialogs.c:190 ../pidgin/gtkdialogs.c:191
+#: ../pidgin/gtkdialogs.c:191 ../pidgin/gtkdialogs.c:192
 msgid "Serbian"
 msgstr "Serbio"
 
-#: ../pidgin/gtkdialogs.c:192 ../pidgin/gtkdialogs.c:240
+#: ../pidgin/gtkdialogs.c:193 ../pidgin/gtkdialogs.c:243
 msgid "Swedish"
 msgstr "Sueco"
 
-#: ../pidgin/gtkdialogs.c:193
-msgid "Tamil"
-msgstr "Tamil"
-
 #: ../pidgin/gtkdialogs.c:194
+msgid "Tamil"
+msgstr "Tamil"
+
+#: ../pidgin/gtkdialogs.c:195
 msgid "Telugu"
 msgstr "Telugu"
 
-#: ../pidgin/gtkdialogs.c:195
+#: ../pidgin/gtkdialogs.c:196
 msgid "Thai"
 msgstr "Thai"
 
-#: ../pidgin/gtkdialogs.c:196
+#: ../pidgin/gtkdialogs.c:197 ../pidgin/gtkdialogs.c:244
 msgid "Turkish"
 msgstr "Turco"
 
-#: ../pidgin/gtkdialogs.c:197
+#: ../pidgin/gtkdialogs.c:198
 msgid "Vietnamese"
 msgstr "Vietnamita"
 
-#: ../pidgin/gtkdialogs.c:197
+#: ../pidgin/gtkdialogs.c:198
 msgid "T.M.Thanh and the Gnome-Vi Team"
 msgstr "T.M.Thanh y el equipo Gnome-Vi"
 
-#: ../pidgin/gtkdialogs.c:198 ../pidgin/gtkdialogs.c:241
+#: ../pidgin/gtkdialogs.c:199 ../pidgin/gtkdialogs.c:245
 msgid "Simplified Chinese"
 msgstr "Chino simplificado"
 
-#: ../pidgin/gtkdialogs.c:199 ../pidgin/gtkdialogs.c:200
+#: ../pidgin/gtkdialogs.c:200 ../pidgin/gtkdialogs.c:201
+#: ../pidgin/gtkdialogs.c:202
 msgid "Hong Kong Chinese"
 msgstr "Chino de Hong Kong"
 
-#: ../pidgin/gtkdialogs.c:201 ../pidgin/gtkdialogs.c:202
-#: ../pidgin/gtkdialogs.c:242
+#: ../pidgin/gtkdialogs.c:203 ../pidgin/gtkdialogs.c:204
+#: ../pidgin/gtkdialogs.c:246
 msgid "Traditional Chinese"
 msgstr "Chino tradicional"
 
 # Amhario
-#: ../pidgin/gtkdialogs.c:208
+#: ../pidgin/gtkdialogs.c:210
 msgid "Amharic"
 msgstr "Amhárico"
 
-#: ../pidgin/gtkdialogs.c:327
+#: ../pidgin/gtkdialogs.c:331
 #, c-format
 msgid "About %s"
 msgstr "Acerca de %s"
 
-#: ../pidgin/gtkdialogs.c:365
+#: ../pidgin/gtkdialogs.c:369
 #, c-format
 msgid ""
 "%s is a graphical modular messaging client based on libpurple which is "
@@ -12811,50 +13427,55 @@
 "is contained in the 'COPYING' file distributed with %s.  %s is copyrighted "
 "by its contributors.  See the 'COPYRIGHT' file for the complete list of "
 "contributors.  We provide no warranty for this program.<BR><BR>"
-msgstr "%s es un cliente de mensajería modular basado en libpurple capaz de conectarse a AIM, MSN, Yahoo!, XMPP, ICQ, IRC, SILC, SIP/SIMPLE, Novell GroupWise, Lotus Sametime, Bonjour, Zephyr, Gadu-Gadu y QQ todos al mismo tiempo. Está escrito utilizando GTK+.<BR><BR>Puede modificar y redistribuir este programa bajo los términos de la GPL (versión 2 o posterior). Se incluye una copia de la licencia GPL en el archivo «COPYING» que se distribuye con %s. Las personas que han contribuido a %s tienen los derechos de copia. Lea el archivo «COPYRIGHT» si desea consultar la lista completa de personas que han contribuido. Este programa se distribuye sin ninguna garantía.<BR><BR>"
-
-#: ../pidgin/gtkdialogs.c:381
-msgid "<FONT SIZE=\"4\">IRC:</FONT> #pidgin-win32 on irc.freenode.net<BR><BR>"
-msgstr ""
-"<FONT SIZE=\"4\">IRC:</FONT> canal #pidgin-win32 en irc.freenode.net<BR><BR>"
+msgstr ""
+"%s es un cliente de mensajería modular basado en libpurple capaz de "
+"conectarse a AIM, MSN, Yahoo!, XMPP, ICQ, IRC, SILC, SIP/SIMPLE, Novell "
+"GroupWise, Lotus Sametime, Bonjour, Zephyr, Gadu-Gadu y QQ todos al mismo "
+"tiempo. Está escrito utilizando GTK+.<BR><BR>Puede modificar y redistribuir "
+"este programa bajo los términos de la GPL (versión 2 o posterior). Se "
+"incluye una copia de la licencia GPL en el archivo «COPYING» que se "
+"distribuye con %s. Las personas que han contribuido a %s tienen los derechos "
+"de copia. Lea el archivo «COPYRIGHT» si desea consultar la lista completa de "
+"personas que han contribuido. Este programa se distribuye sin ninguna "
+"garantía.<BR><BR>"
 
 #: ../pidgin/gtkdialogs.c:384
 msgid "<FONT SIZE=\"4\">IRC:</FONT> #pidgin on irc.freenode.net<BR><BR>"
 msgstr "<FONT SIZE=\"4\">IRC:</FONT> canal #pidgin en irc.freenode.net<BR><BR>"
 
-#: ../pidgin/gtkdialogs.c:390
+#: ../pidgin/gtkdialogs.c:389
 msgid "Current Developers"
 msgstr "Desarrolladores actuales"
 
-#: ../pidgin/gtkdialogs.c:405
+#: ../pidgin/gtkdialogs.c:404
 msgid "Crazy Patch Writers"
 msgstr "Locos escritores de parches"
 
-#: ../pidgin/gtkdialogs.c:420
+#: ../pidgin/gtkdialogs.c:419
 msgid "Retired Developers"
 msgstr "Desarrolladores retirados"
 
-#: ../pidgin/gtkdialogs.c:435
+#: ../pidgin/gtkdialogs.c:434
 msgid "Artists"
 msgstr "Artistas"
 
-#: ../pidgin/gtkdialogs.c:450
+#: ../pidgin/gtkdialogs.c:449
 msgid "Current Translators"
 msgstr "Traductores actuales"
 
-#: ../pidgin/gtkdialogs.c:470
+#: ../pidgin/gtkdialogs.c:469
 msgid "Past Translators"
 msgstr "Traductores anteriores"
 
-#: ../pidgin/gtkdialogs.c:488
+#: ../pidgin/gtkdialogs.c:487
 msgid "Debugging Information"
 msgstr "Información de depuración"
 
-#: ../pidgin/gtkdialogs.c:857
+#: ../pidgin/gtkdialogs.c:856
 msgid "Get User Info"
 msgstr "Obtener datos del usuario"
 
-#: ../pidgin/gtkdialogs.c:859
+#: ../pidgin/gtkdialogs.c:858
 msgid ""
 "Please enter the screen name or alias of the person whose info you would "
 "like to view."
@@ -12862,11 +13483,11 @@
 "Introduzca el nombre de usuario o el apodo de la persona de la cual quiere "
 "ver información."
 
-#: ../pidgin/gtkdialogs.c:949
+#: ../pidgin/gtkdialogs.c:948
 msgid "View User Log"
 msgstr "Ver registro de usuario"
 
-#: ../pidgin/gtkdialogs.c:951
+#: ../pidgin/gtkdialogs.c:950
 msgid ""
 "Please enter the screen name or alias of the person whose log you would like "
 "to view."
@@ -12874,32 +13495,32 @@
 "Introduzca el nombre de usuario o el apodo de la persona de la cual quiere "
 "ver información de registro."
 
-#: ../pidgin/gtkdialogs.c:971
+#: ../pidgin/gtkdialogs.c:970
 msgid "Alias Contact"
 msgstr "Apodo para contacto"
 
-#: ../pidgin/gtkdialogs.c:972
+#: ../pidgin/gtkdialogs.c:971
 msgid "Enter an alias for this contact."
 msgstr "Introduzca un apodo para este contacto."
 
-#: ../pidgin/gtkdialogs.c:994
+#: ../pidgin/gtkdialogs.c:993
 #, c-format
 msgid "Enter an alias for %s."
 msgstr "Introduzca un alias para %s."
 
-#: ../pidgin/gtkdialogs.c:996
+#: ../pidgin/gtkdialogs.c:995
 msgid "Alias Buddy"
 msgstr "Apodo de amigo"
 
-#: ../pidgin/gtkdialogs.c:1017
+#: ../pidgin/gtkdialogs.c:1016
 msgid "Alias Chat"
 msgstr "Apodo en el chat"
 
-#: ../pidgin/gtkdialogs.c:1018
+#: ../pidgin/gtkdialogs.c:1017
 msgid "Enter an alias for this chat."
 msgstr "Introduzca un apodo para este chat."
 
-#: ../pidgin/gtkdialogs.c:1057
+#: ../pidgin/gtkdialogs.c:1056
 #, c-format
 msgid ""
 "You are about to remove the contact containing %s and %d other buddy from "
@@ -12914,15 +13535,15 @@
 "Está a punto de borrar los contactos que contiene a %s y a otros %d amigos "
 "de su lista de amigos. ¿Desea continuar?"
 
-#: ../pidgin/gtkdialogs.c:1065
+#: ../pidgin/gtkdialogs.c:1064
 msgid "Remove Contact"
 msgstr "Eliminar contacto"
 
-#: ../pidgin/gtkdialogs.c:1068
+#: ../pidgin/gtkdialogs.c:1067
 msgid "_Remove Contact"
 msgstr "_Eliminar contacto"
 
-#: ../pidgin/gtkdialogs.c:1099
+#: ../pidgin/gtkdialogs.c:1098
 #, c-format
 msgid ""
 "You are about to merge the group called %s into the group called %s. Do you "
@@ -12931,15 +13552,15 @@
 "Está a punto de fusionar el grupo llamado %s con el grupo llamado %s. ¿Desea "
 "continuar?"
 
-#: ../pidgin/gtkdialogs.c:1106
+#: ../pidgin/gtkdialogs.c:1105
 msgid "Merge Groups"
 msgstr "Fusionar grupos"
 
-#: ../pidgin/gtkdialogs.c:1109
+#: ../pidgin/gtkdialogs.c:1108
 msgid "_Merge Groups"
 msgstr "_Fusionar grupos"
 
-#: ../pidgin/gtkdialogs.c:1159
+#: ../pidgin/gtkdialogs.c:1158
 #, c-format
 msgid ""
 "You are about to remove the group %s and all its members from your buddy "
@@ -12948,29 +13569,29 @@
 "Está a punto de borrar el grupo %s junto con todos sus miembros de la lista "
 "de amigos. ¿Desea continuar?"
 
-#: ../pidgin/gtkdialogs.c:1162
+#: ../pidgin/gtkdialogs.c:1161
 msgid "Remove Group"
 msgstr "Eliminar grupo"
 
-#: ../pidgin/gtkdialogs.c:1165
+#: ../pidgin/gtkdialogs.c:1164
 msgid "_Remove Group"
 msgstr "_Eliminar grupo"
 
-#: ../pidgin/gtkdialogs.c:1198
+#: ../pidgin/gtkdialogs.c:1197
 #, c-format
 msgid ""
 "You are about to remove %s from your buddy list.  Do you want to continue?"
 msgstr "Está a punto eliminar a %s de su lista de amigos. ¿Desea continuar?"
 
-#: ../pidgin/gtkdialogs.c:1201
+#: ../pidgin/gtkdialogs.c:1200
 msgid "Remove Buddy"
 msgstr "Eliminar amigo"
 
-#: ../pidgin/gtkdialogs.c:1204
+#: ../pidgin/gtkdialogs.c:1203
 msgid "_Remove Buddy"
 msgstr "_Eliminar amigo"
 
-#: ../pidgin/gtkdialogs.c:1225
+#: ../pidgin/gtkdialogs.c:1224
 #, c-format
 msgid ""
 "You are about to remove the chat %s from your buddy list.  Do you want to "
@@ -12978,11 +13599,11 @@
 msgstr ""
 "Está a punto de eliminar el chat %s de su lista de amigos. ¿Desea continuar?"
 
-#: ../pidgin/gtkdialogs.c:1228
+#: ../pidgin/gtkdialogs.c:1227
 msgid "Remove Chat"
 msgstr "Eliminar chat"
 
-#: ../pidgin/gtkdialogs.c:1231
+#: ../pidgin/gtkdialogs.c:1230
 msgid "_Remove Chat"
 msgstr "_Eliminar chat"
 
@@ -13078,66 +13699,66 @@
 msgid "Time Remaining:"
 msgstr "Tiempo restante:"
 
-#: ../pidgin/gtkft.c:786
+#: ../pidgin/gtkft.c:783
 msgid "Close this window when all transfers _finish"
 msgstr "Cerrar esta ventana cuando todas las transferencias _terminen"
 
-#: ../pidgin/gtkft.c:796
+#: ../pidgin/gtkft.c:793
 msgid "C_lear finished transfers"
 msgstr "_Limpiar transferencias terminadas"
 
 #. "Download Details" arrow
-#: ../pidgin/gtkft.c:805
+#: ../pidgin/gtkft.c:802
 msgid "File transfer _details"
 msgstr "_Detalles de la transferencia de archivos"
 
 #. Pause button
-#: ../pidgin/gtkft.c:835 ../pidgin/pidginstock.c:89
+#: ../pidgin/gtkft.c:832 ../pidgin/pidginstock.c:89
 msgid "_Pause"
 msgstr "_Pausar"
 
 #. Resume button
-#: ../pidgin/gtkft.c:845
+#: ../pidgin/gtkft.c:842
 msgid "_Resume"
 msgstr "_Continuar"
 
-#: ../pidgin/gtkimhtml.c:792
+#: ../pidgin/gtkimhtml.c:803
 msgid "Paste as Plain _Text"
 msgstr "Pe_gar como texto en claro"
 
-#: ../pidgin/gtkimhtml.c:809
+#: ../pidgin/gtkimhtml.c:820
 msgid "_Reset formatting"
 msgstr "_Limpiar formato"
 
-#: ../pidgin/gtkimhtml.c:1295
+#: ../pidgin/gtkimhtml.c:1356
 msgid "Hyperlink color"
 msgstr "Color de hiperenlace"
 
-#: ../pidgin/gtkimhtml.c:1296
+#: ../pidgin/gtkimhtml.c:1357
 msgid "Color to draw hyperlinks."
 msgstr "Color para dibujar hiperenlaces."
 
-#: ../pidgin/gtkimhtml.c:1299
+#: ../pidgin/gtkimhtml.c:1360
 msgid "Hyperlink prelight color"
 msgstr "Color de hiperenlace pre-iluminado"
 
-#: ../pidgin/gtkimhtml.c:1300
+#: ../pidgin/gtkimhtml.c:1361
 msgid "Color to draw hyperlinks when mouse is over them."
 msgstr "Color para dibujar hiperenlaces cuando el ratón esté encima."
 
-#: ../pidgin/gtkimhtml.c:1516
+#: ../pidgin/gtkimhtml.c:1582
 msgid "_Copy E-Mail Address"
 msgstr "_Copiar dirección de correo electrónico"
 
-#: ../pidgin/gtkimhtml.c:1528
+#: ../pidgin/gtkimhtml.c:1594
 msgid "_Open Link in Browser"
 msgstr "_Abrir enlace en navegador"
 
-#: ../pidgin/gtkimhtml.c:1538
+#: ../pidgin/gtkimhtml.c:1604
 msgid "_Copy Link Location"
 msgstr "_Copiar destino del enlace"
 
-#: ../pidgin/gtkimhtml.c:3211
+#: ../pidgin/gtkimhtml.c:3348
 msgid ""
 "<span size='larger' weight='bold'>Unrecognized file type</span>\n"
 "\n"
@@ -13147,7 +13768,7 @@
 "\n"
 "Tomando PNG por omisión."
 
-#: ../pidgin/gtkimhtml.c:3214
+#: ../pidgin/gtkimhtml.c:3351
 msgid ""
 "Unrecognized file type\n"
 "\n"
@@ -13157,7 +13778,7 @@
 "\n"
 "Tomando PNG por omisión."
 
-#: ../pidgin/gtkimhtml.c:3227
+#: ../pidgin/gtkimhtml.c:3380
 #, c-format
 msgid ""
 "<span size='larger' weight='bold'>Error saving image</span>\n"
@@ -13169,7 +13790,7 @@
 "\n"
 "%s"
 
-#: ../pidgin/gtkimhtml.c:3230
+#: ../pidgin/gtkimhtml.c:3383
 #, c-format
 msgid ""
 "Error saving image\n"
@@ -13180,35 +13801,35 @@
 "\n"
 "%s"
 
-#: ../pidgin/gtkimhtml.c:3310 ../pidgin/gtkimhtml.c:3322
+#: ../pidgin/gtkimhtml.c:3461 ../pidgin/gtkimhtml.c:3473
 msgid "Save Image"
 msgstr "Guardar imagen"
 
-#: ../pidgin/gtkimhtml.c:3350
+#: ../pidgin/gtkimhtml.c:3501
 msgid "_Save Image..."
 msgstr "_Guardar imagen..."
 
-#: ../pidgin/gtkimhtmltoolbar.c:147
+#: ../pidgin/gtkimhtmltoolbar.c:151
 msgid "Select Font"
 msgstr "Seleccionar tipografía"
 
-#: ../pidgin/gtkimhtmltoolbar.c:226
+#: ../pidgin/gtkimhtmltoolbar.c:230
 msgid "Select Text Color"
 msgstr "Seleccionar el color del texto"
 
-#: ../pidgin/gtkimhtmltoolbar.c:305
+#: ../pidgin/gtkimhtmltoolbar.c:309
 msgid "Select Background Color"
 msgstr "Seleccionar el color de fondo"
 
-#: ../pidgin/gtkimhtmltoolbar.c:394
+#: ../pidgin/gtkimhtmltoolbar.c:398
 msgid "_URL"
 msgstr "_URL"
 
-#: ../pidgin/gtkimhtmltoolbar.c:402
+#: ../pidgin/gtkimhtmltoolbar.c:406
 msgid "_Description"
 msgstr "_Descripción"
 
-#: ../pidgin/gtkimhtmltoolbar.c:405
+#: ../pidgin/gtkimhtmltoolbar.c:409
 msgid ""
 "Please enter the URL and description of the link that you want to insert. "
 "The description is optional."
@@ -13216,84 +13837,91 @@
 "Introduzca el URL y la descripción del enlace que quiere insertar. La "
 "descripción es opcional."
 
-#: ../pidgin/gtkimhtmltoolbar.c:409
+#: ../pidgin/gtkimhtmltoolbar.c:413
 msgid "Please enter the URL of the link that you want to insert."
 msgstr "Introduzca el URL del enlace que quiere insertar."
 
-#: ../pidgin/gtkimhtmltoolbar.c:414
+#: ../pidgin/gtkimhtmltoolbar.c:418
 msgid "Insert Link"
 msgstr "Insertar enlace"
 
-#: ../pidgin/gtkimhtmltoolbar.c:418
+#: ../pidgin/gtkimhtmltoolbar.c:422 ../pidgin/gtkimhtmltoolbar.c:1137
 msgid "_Insert"
 msgstr "_Insertar"
 
-#: ../pidgin/gtkimhtmltoolbar.c:487
+#: ../pidgin/gtkimhtmltoolbar.c:491
 #, c-format
 msgid "Failed to store image: %s\n"
 msgstr "No se pudo almacenar la imagen: %s\n"
 
-#: ../pidgin/gtkimhtmltoolbar.c:513 ../pidgin/gtkimhtmltoolbar.c:523
+#: ../pidgin/gtkimhtmltoolbar.c:517 ../pidgin/gtkimhtmltoolbar.c:527
 msgid "Insert Image"
 msgstr "Insertar imagen"
 
-#: ../pidgin/gtkimhtmltoolbar.c:721
+#: ../pidgin/gtkimhtmltoolbar.c:725
 msgid "This theme has no available smileys."
 msgstr "Este tema no tiene emoticonos disponibles."
 
 #. show everything
-#: ../pidgin/gtkimhtmltoolbar.c:735
+#: ../pidgin/gtkimhtmltoolbar.c:739
 msgid "Smile!"
 msgstr "¡Sonría!"
 
-#: ../pidgin/gtkimhtmltoolbar.c:922 ../pidgin/plugins/convcolors.c:287
-msgid "Bold"
-msgstr "Negrita"
-
-#: ../pidgin/gtkimhtmltoolbar.c:933 ../pidgin/plugins/convcolors.c:294
-msgid "Italic"
-msgstr "Cursiva"
-
-#: ../pidgin/gtkimhtmltoolbar.c:944 ../pidgin/plugins/convcolors.c:301
-msgid "Underline"
-msgstr "Subrayado"
-
-#: ../pidgin/gtkimhtmltoolbar.c:960
-msgid "Larger font size"
-msgstr "Tamaño de tipografía mayor"
-
-#: ../pidgin/gtkimhtmltoolbar.c:972
-msgid "Smaller font size"
-msgstr "Tamaño de tipografía menor"
-
-#: ../pidgin/gtkimhtmltoolbar.c:989
-msgid "Font face"
-msgstr "Estilo de tipografía"
-
-#: ../pidgin/gtkimhtmltoolbar.c:1001
-msgid "Foreground font color"
-msgstr "Color del texto"
-
-#: ../pidgin/gtkimhtmltoolbar.c:1013
-msgid "Background color"
-msgstr "Color de fondo"
-
-#: ../pidgin/gtkimhtmltoolbar.c:1029
-msgid "Reset formatting"
-msgstr "Limpiar formato"
-
-#: ../pidgin/gtkimhtmltoolbar.c:1044
-msgid "Insert link"
-msgstr "Insertar enlace"
+#: ../pidgin/gtkimhtmltoolbar.c:1046
+msgid "_Bold"
+msgstr "_Negrita"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1047
+msgid "_Italic"
+msgstr "_Cursiva"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1048
+msgid "_Underline"
+msgstr "S_ubrayado"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1049
+msgid "_Larger"
+msgstr "_Grande"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1051
+msgid "_Normal"
+msgstr "_Normal"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1053
+msgid "_Smaller"
+msgstr "_Pequeña"
 
 #: ../pidgin/gtkimhtmltoolbar.c:1054
-msgid "Insert image"
-msgstr "Insertar imagen"
-
-# No estoy muy seguro de usar emoticono, quizás «smiley» sería más apropiado
-#: ../pidgin/gtkimhtmltoolbar.c:1065
-msgid "Insert smiley"
-msgstr "Insertar emoticono"
+msgid "_Font face"
+msgstr "_Estilo de tipografía"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1055
+msgid "_Foreground color"
+msgstr "Color del _primer plano"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1056
+msgid "_Background color"
+msgstr "Color de _fondo"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1082
+msgid "_Font"
+msgstr "_Tipografía"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1117
+msgid "_Reset font"
+msgstr "_Restaurar tipografía"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1144
+msgid "_Smiley"
+msgstr "_Emoticono"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1150
+msgid "_Image"
+msgstr "_Imagen"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1156
+msgid "_Link"
+msgstr "_Enlace"
 
 #: ../pidgin/gtklog.c:267
 #, c-format
@@ -13386,12 +14014,12 @@
 msgid "System Log"
 msgstr "Registro del Sistema"
 
-#: ../pidgin/gtkmain.c:373
+#: ../pidgin/gtkmain.c:368
 #, c-format
 msgid "%s %s. Try `%s -h' for more information.\n"
 msgstr "%s %s. Intente `%s -h' para más información.\n"
 
-#: ../pidgin/gtkmain.c:375
+#: ../pidgin/gtkmain.c:370
 #, c-format
 msgid ""
 "%s %s\n"
@@ -13400,6 +14028,7 @@
 "  -c, --config=DIR    use DIR for config files\n"
 "  -d, --debug         print debugging messages to stdout\n"
 "  -h, --help          display this help and exit\n"
+"  -m, --multiple      do not ensure single instance\n"
 "  -n, --nologin       don't automatically login\n"
 "  -l, --login[=NAME]  automatically login (optional argument NAME specifies\n"
 "                      account(s) to use, separated by commas)\n"
@@ -13408,18 +14037,16 @@
 "%s %s\n"
 "Modo de uso: %s [OPCIÓN]...\n"
 "\n"
-"  -c, --config=DIR     utilizar el directorio DIR para los ficheros de "
-"configuración\n"
-"  -d, --debug          imprimir mensajes de depuración en la salida "
-"estándar\n"
+"  -c, --config=DIR     utilizar el directorio DIR para los ficheros de configuración\n"
+"  -d, --debug          imprimir mensajes de depuración en la salida estándar\n"
 "  -h, --help           mostrar este mensaje y salir\n"
+"  -m, --multiple       no asegurarse de que hay sólo una instancia\n"
 "  -n, --nologin        no conectarse de forma automática\n"
-"  -l, --login[=NOMBRE] conectarse de forma automática (el argumento opción "
-"NOMBRE\n"
+"  -l, --login[=NOMBRE] conectarse de forma automática (el argumento opción NOMBRE\n"
 "                       indica la(s) cuenta(s) a usar, separadas por comas)\n"
 "  -v, --version        mostrar la versión actual y salir\n"
 
-#: ../pidgin/gtkmain.c:493
+#: ../pidgin/gtkmain.c:494
 #, c-format
 msgid ""
 "%s has segfaulted and attempted to dump a core file.\n"
@@ -13458,48 +14085,50 @@
 "contactar con Sean o Luke a través de otros protocolos en\n"
 "%swiki/DeveloperPages\n"
 
-#: ../pidgin/gtknotify.c:337
+#. Translators may want to transliterate the name.
+#. It is not to be translated.
+#: ../pidgin/gtkmain.c:858 ../pidgin/pidgin.h:50
+msgid "Pidgin"
+msgstr "Pidgin"
+
+#: ../pidgin/gtknotify.c:343
 msgid "Open All Messages"
 msgstr "Abrir todos los mensajes"
 
-#: ../pidgin/gtknotify.c:389
+#: ../pidgin/gtknotify.c:395
 msgid "<span weight=\"bold\" size=\"larger\">You have mail!</span>"
 msgstr "<span weight=\"bold\" size=\"larger\">¡Tiene correo!</span>"
 
-#: ../pidgin/gtknotify.c:483
-msgid "Sender"
-msgstr "Remitente"
-
-#: ../pidgin/gtknotify.c:509
+#: ../pidgin/gtknotify.c:515
 #, c-format
 msgid "%s has %d new message."
 msgid_plural "%s has %d new messages."
 msgstr[0] "%s tiene %d mensaje nuevo."
 msgstr[1] "%s tiene %d nuevos mensajes."
 
-#: ../pidgin/gtknotify.c:520
+#: ../pidgin/gtknotify.c:526
 #, c-format
 msgid "<b>You have %d new e-mail.</b>"
 msgid_plural "<b>You have %d new e-mails.</b>"
 msgstr[0] "<b>Tiene %d nuevo correo.</b>"
 msgstr[1] "<b>Tiene %d nuevos correos.</b>"
 
-#: ../pidgin/gtknotify.c:951
+#: ../pidgin/gtknotify.c:965
 #, c-format
 msgid "The browser command \"%s\" is invalid."
 msgstr "La orden de navegador «%s» no es válida."
 
-#: ../pidgin/gtknotify.c:953 ../pidgin/gtknotify.c:965
-#: ../pidgin/gtknotify.c:978 ../pidgin/gtknotify.c:1106
+#: ../pidgin/gtknotify.c:967 ../pidgin/gtknotify.c:979
+#: ../pidgin/gtknotify.c:992 ../pidgin/gtknotify.c:1120
 msgid "Unable to open URL"
 msgstr "No se pudo abrir la URL"
 
-#: ../pidgin/gtknotify.c:963 ../pidgin/gtknotify.c:976
+#: ../pidgin/gtknotify.c:977 ../pidgin/gtknotify.c:990
 #, c-format
 msgid "Error launching \"%s\": %s"
 msgstr "Error al lanzar «%s»: %s"
 
-#: ../pidgin/gtknotify.c:1107
+#: ../pidgin/gtknotify.c:1121
 msgid ""
 "The 'Manual' browser command has been chosen, but no command has been set."
 msgstr ""
@@ -13548,102 +14177,102 @@
 msgid "<b>Plugin Details</b>"
 msgstr "<b>Detalles del complemento</b>"
 
-#: ../pidgin/gtkpounce.c:155
+#: ../pidgin/gtkpounce.c:156
 msgid "Select a file"
 msgstr "Seleccione un archivo"
 
 #. Create the "Pounce on Whom" frame.
-#: ../pidgin/gtkpounce.c:524
+#: ../pidgin/gtkpounce.c:533
 msgid "Pounce on Whom"
 msgstr "A quién avisar"
 
-#: ../pidgin/gtkpounce.c:551
+#: ../pidgin/gtkpounce.c:560
 msgid "_Buddy name:"
 msgstr "Nombre del _amigo:"
 
-#: ../pidgin/gtkpounce.c:585
+#: ../pidgin/gtkpounce.c:594
 msgid "Si_gns on"
 msgstr "Se _conecta"
 
-#: ../pidgin/gtkpounce.c:587
+#: ../pidgin/gtkpounce.c:596
 msgid "Signs o_ff"
 msgstr "Se _desconecta"
 
-#: ../pidgin/gtkpounce.c:589
+#: ../pidgin/gtkpounce.c:598
 msgid "Goes a_way"
 msgstr "Se _ausenta"
 
-#: ../pidgin/gtkpounce.c:591
+#: ../pidgin/gtkpounce.c:600
 msgid "Ret_urns from away"
 msgstr "_Deja de estar ausente"
 
-#: ../pidgin/gtkpounce.c:593
+#: ../pidgin/gtkpounce.c:602
 msgid "Becomes _idle"
 msgstr "Está _inactivo"
 
-#: ../pidgin/gtkpounce.c:595
+#: ../pidgin/gtkpounce.c:604
 msgid "Is no longer i_dle"
 msgstr "Ya no está i_nactivo."
 
-#: ../pidgin/gtkpounce.c:597
+#: ../pidgin/gtkpounce.c:606
 msgid "Starts _typing"
 msgstr "Empieza a _escribir"
 
-#: ../pidgin/gtkpounce.c:599
+#: ../pidgin/gtkpounce.c:608
 msgid "P_auses while typing"
 msgstr "Se _pausa mientras escribe"
 
-#: ../pidgin/gtkpounce.c:601
+#: ../pidgin/gtkpounce.c:610
 msgid "Stops t_yping"
 msgstr "Deja de escribi_r"
 
-#: ../pidgin/gtkpounce.c:603
+#: ../pidgin/gtkpounce.c:612
 msgid "Sends a _message"
 msgstr "Envía un _mensaje"
 
-#: ../pidgin/gtkpounce.c:646
+#: ../pidgin/gtkpounce.c:655
 msgid "Ope_n an IM window"
 msgstr "_Abrir una ventana de MI"
 
-#: ../pidgin/gtkpounce.c:648
+#: ../pidgin/gtkpounce.c:657
 msgid "_Pop up a notification"
 msgstr "_Notificación con una ventana emergente"
 
-#: ../pidgin/gtkpounce.c:650
+#: ../pidgin/gtkpounce.c:659
 msgid "Send a _message"
 msgstr "Enviar un _mensaje"
 
-#: ../pidgin/gtkpounce.c:652
+#: ../pidgin/gtkpounce.c:661
 msgid "E_xecute a command"
 msgstr "E_jecutar una orden"
 
-#: ../pidgin/gtkpounce.c:654
+#: ../pidgin/gtkpounce.c:663
 msgid "P_lay a sound"
 msgstr "Re_producir un sonido"
 
 # Examinar puede ser también válido, comprobar, jfs.
-#: ../pidgin/gtkpounce.c:659
+#: ../pidgin/gtkpounce.c:669
 msgid "Brows_e..."
 msgstr "_Navegar..."
 
 # Examinar puede ser también válido, comprobar, jfs.
-#: ../pidgin/gtkpounce.c:661
+#: ../pidgin/gtkpounce.c:671
 msgid "Br_owse..."
 msgstr "_Navegar..."
 
-#: ../pidgin/gtkpounce.c:662
+#: ../pidgin/gtkpounce.c:672
 msgid "Pre_view"
 msgstr "Pre_visualizar"
 
-#: ../pidgin/gtkpounce.c:786
-msgid "P_ounce only when my status is not available"
-msgstr "Sólo _avisar cuando mi estado no está disponible"
-
-#: ../pidgin/gtkpounce.c:791
+#: ../pidgin/gtkpounce.c:799
+msgid "P_ounce only when my status is not Available"
+msgstr "Sólo _avisar cuando mi estado no sea Disponible"
+
+#: ../pidgin/gtkpounce.c:804
 msgid "_Recurring"
 msgstr "_Recurrente"
 
-#: ../pidgin/gtkpounce.c:1247
+#: ../pidgin/gtkpounce.c:1260
 msgid "Pounce Target"
 msgstr "Objetivo a avisar"
 
@@ -13671,7 +14300,7 @@
 msgid "_Show system tray icon:"
 msgstr "_Mostrar icono del área de notificación del sistema:"
 
-#: ../pidgin/gtkprefs.c:819 ../pidgin/gtkprefs.c:831 ../pidgin/gtkprefs.c:1648
+#: ../pidgin/gtkprefs.c:819 ../pidgin/gtkprefs.c:831 ../pidgin/gtkprefs.c:1676
 #: ../pidgin/plugins/timestamp_format.c:42
 #: ../pidgin/plugins/timestamp_format.c:51
 #: ../pidgin/plugins/win32/winprefs/winprefs.c:338
@@ -13690,7 +14319,7 @@
 msgid "_Hide new IM conversations:"
 msgstr "_Ocultar nuevas conversaciones MI:"
 
-#: ../pidgin/gtkprefs.c:830 ../pidgin/gtkprefs.c:1828
+#: ../pidgin/gtkprefs.c:830 ../pidgin/gtkprefs.c:1857
 msgid "When away"
 msgstr "Cuando estoy fuera"
 
@@ -13739,39 +14368,55 @@
 msgid "N_ew conversations:"
 msgstr "_Nuevas conversaciones:"
 
-#: ../pidgin/gtkprefs.c:900
+#: ../pidgin/gtkprefs.c:917
 msgid "Show _formatting on incoming messages"
 msgstr "Mostrar el _formato de los mensajes entrantes"
 
-#: ../pidgin/gtkprefs.c:903
+#: ../pidgin/gtkprefs.c:920
 msgid "Show buddy _icons"
 msgstr "Mostrar _iconos de los amigos"
 
-#: ../pidgin/gtkprefs.c:905
+#: ../pidgin/gtkprefs.c:922
 msgid "Enable buddy ic_on animation"
 msgstr "Habilitar animaciones en los i_conos de amigos"
 
-#: ../pidgin/gtkprefs.c:912
+#: ../pidgin/gtkprefs.c:929
 msgid "_Notify buddies that you are typing to them"
 msgstr "_Notificar a los amigos cuando les esté escribiendo"
 
-#: ../pidgin/gtkprefs.c:915
+#: ../pidgin/gtkprefs.c:932
 msgid "Highlight _misspelled words"
 msgstr "_Resaltar las faltas de ortografía"
 
-#: ../pidgin/gtkprefs.c:919
+#: ../pidgin/gtkprefs.c:936
 msgid "Use smooth-scrolling"
 msgstr "Utilizar paginado suave"
 
-#: ../pidgin/gtkprefs.c:922
+#: ../pidgin/gtkprefs.c:939
 msgid "F_lash window when IMs are received"
 msgstr "_Destello de ventana cuando se reciben MIs"
 
-#: ../pidgin/gtkprefs.c:925
+#: ../pidgin/gtkprefs.c:943
+msgid "Font"
+msgstr "Tipografía"
+
+#: ../pidgin/gtkprefs.c:945
+msgid "Use document font from _theme"
+msgstr "Utilizar la tipografía de documento del _tema"
+
+#: ../pidgin/gtkprefs.c:947
+msgid "Use font from _theme"
+msgstr "Utilizar la tipografía del _tema"
+
+#: ../pidgin/gtkprefs.c:949
+msgid "Conversation _font:"
+msgstr "Tipografía para las conversaciones:"
+
+#: ../pidgin/gtkprefs.c:962
 msgid "Default Formatting"
 msgstr "Formato por omisión"
 
-#: ../pidgin/gtkprefs.c:941
+#: ../pidgin/gtkprefs.c:978
 msgid ""
 "This is how your outgoing message text will appear when you use protocols "
 "that support formatting. :)"
@@ -13779,119 +14424,119 @@
 "Así se verá el texto de sus mensajes salientes cuando utilice protocolos que "
 "soportan formatos. :)"
 
-#: ../pidgin/gtkprefs.c:1017
+#: ../pidgin/gtkprefs.c:1044
 msgid "ST_UN server:"
 msgstr "Servidor ST_UN:"
 
-#: ../pidgin/gtkprefs.c:1029
+#: ../pidgin/gtkprefs.c:1056
 msgid "<span style=\"italic\">Example: stunserver.org</span>"
 msgstr "<span style=\"italic\">Ejemplo: stunserver.org</span>"
 
-#: ../pidgin/gtkprefs.c:1033
+#: ../pidgin/gtkprefs.c:1060
 msgid "_Autodetect IP address"
 msgstr "_Auto detectar la dirección IP"
 
-#: ../pidgin/gtkprefs.c:1042
+#: ../pidgin/gtkprefs.c:1069
 msgid "Public _IP:"
 msgstr "_IP pública:"
 
-#: ../pidgin/gtkprefs.c:1071
+#: ../pidgin/gtkprefs.c:1098
 msgid "Ports"
 msgstr "Puertos"
 
-#: ../pidgin/gtkprefs.c:1074
+#: ../pidgin/gtkprefs.c:1101
 msgid "_Manually specify range of ports to listen on"
 msgstr "Especificar _manualmente el rango de puertos en el que se escuchará"
 
-#: ../pidgin/gtkprefs.c:1077
+#: ../pidgin/gtkprefs.c:1104
 msgid "_Start port:"
 msgstr "Puerto _inicial:"
 
-#: ../pidgin/gtkprefs.c:1084
+#: ../pidgin/gtkprefs.c:1111
 msgid "_End port:"
 msgstr "Puerto _final:"
 
-#: ../pidgin/gtkprefs.c:1092
+#: ../pidgin/gtkprefs.c:1119
 msgid "Proxy Server"
 msgstr "Servidor proxy"
 
-#: ../pidgin/gtkprefs.c:1096
+#: ../pidgin/gtkprefs.c:1123
 msgid "No proxy"
 msgstr "Sin proxy"
 
-#: ../pidgin/gtkprefs.c:1152
+#: ../pidgin/gtkprefs.c:1179
 msgid "_User:"
 msgstr "_Usuario:"
 
-#: ../pidgin/gtkprefs.c:1216
+#: ../pidgin/gtkprefs.c:1243
 msgid "Seamonkey"
 msgstr "Seamonkey"
 
-#: ../pidgin/gtkprefs.c:1217
+#: ../pidgin/gtkprefs.c:1244
 msgid "Opera"
 msgstr "Opera"
 
-#: ../pidgin/gtkprefs.c:1218
+#: ../pidgin/gtkprefs.c:1245
 msgid "Netscape"
 msgstr "Netscape"
 
-#: ../pidgin/gtkprefs.c:1219
+#: ../pidgin/gtkprefs.c:1246
 msgid "Mozilla"
 msgstr "Mozilla"
 
-#: ../pidgin/gtkprefs.c:1220
+#: ../pidgin/gtkprefs.c:1247
 msgid "Konqueror"
 msgstr "Konqueror"
 
-#: ../pidgin/gtkprefs.c:1221
+#: ../pidgin/gtkprefs.c:1248
 msgid "GNOME Default"
 msgstr "Valores por omisión de Gnome"
 
-#: ../pidgin/gtkprefs.c:1222
+#: ../pidgin/gtkprefs.c:1249
 msgid "Galeon"
 msgstr "Galeon"
 
-#: ../pidgin/gtkprefs.c:1223
+#: ../pidgin/gtkprefs.c:1250
 msgid "Firefox"
 msgstr "Firefox"
 
-#: ../pidgin/gtkprefs.c:1224
+#: ../pidgin/gtkprefs.c:1251
 msgid "Firebird"
 msgstr "Firebird"
 
-#: ../pidgin/gtkprefs.c:1225
+#: ../pidgin/gtkprefs.c:1252
 msgid "Epiphany"
 msgstr "Epiphany"
 
-#: ../pidgin/gtkprefs.c:1234
+#: ../pidgin/gtkprefs.c:1261
 msgid "Manual"
 msgstr "Manual"
 
-#: ../pidgin/gtkprefs.c:1287
+#: ../pidgin/gtkprefs.c:1314
 msgid "Browser Selection"
 msgstr "Selección de navegador"
 
-#: ../pidgin/gtkprefs.c:1291
+#: ../pidgin/gtkprefs.c:1318
 msgid "_Browser:"
 msgstr "_Navegador:"
 
-#: ../pidgin/gtkprefs.c:1299
+#: ../pidgin/gtkprefs.c:1326
 msgid "_Open link in:"
 msgstr "_Abrir enlace en:"
 
-#: ../pidgin/gtkprefs.c:1301
+#: ../pidgin/gtkprefs.c:1328
 msgid "Browser default"
 msgstr "Navegador por omisión"
 
-#: ../pidgin/gtkprefs.c:1302
+#: ../pidgin/gtkprefs.c:1329
 msgid "Existing window"
 msgstr "Ventana existente"
 
-#: ../pidgin/gtkprefs.c:1304
+#: ../pidgin/gtkprefs.c:1331
 msgid "New tab"
 msgstr "Nueva solapa"
 
-#: ../pidgin/gtkprefs.c:1318
+#: ../pidgin/gtkprefs.c:1345
 #, c-format
 msgid ""
 "_Manual:\n"
@@ -13900,80 +14545,80 @@
 "_Manual:\n"
 "(%s para URL)"
 
-#: ../pidgin/gtkprefs.c:1358
+#: ../pidgin/gtkprefs.c:1385
 msgid "Log _format:"
 msgstr "Formato de _registro:"
 
-#: ../pidgin/gtkprefs.c:1363
+#: ../pidgin/gtkprefs.c:1390
 msgid "Log all _instant messages"
 msgstr "Registrar todos los mensajes _instantáneos"
 
-#: ../pidgin/gtkprefs.c:1365
+#: ../pidgin/gtkprefs.c:1392
 msgid "Log all c_hats"
 msgstr "Registrar todas las _charlas"
 
-#: ../pidgin/gtkprefs.c:1367
+#: ../pidgin/gtkprefs.c:1394
 msgid "Log all _status changes to system log"
 msgstr "Registrar todos los cambios de _estado en el registro del sistema"
 
-#: ../pidgin/gtkprefs.c:1475 ../pidgin/gtkprefs.c:1564
-#: ../pidgin/gtkprefs.c:1756
+#: ../pidgin/gtkprefs.c:1502 ../pidgin/gtkprefs.c:1591
+#: ../pidgin/gtkprefs.c:1785
 msgid "(default)"
 msgstr "(por omisión)"
 
-#: ../pidgin/gtkprefs.c:1513
+#: ../pidgin/gtkprefs.c:1540
 msgid "Sound Selection"
 msgstr "Selección de sonido"
 
-#: ../pidgin/gtkprefs.c:1523
+#: ../pidgin/gtkprefs.c:1550
 msgid "Quietest"
 msgstr "El más silencioso"
 
-#: ../pidgin/gtkprefs.c:1525
+#: ../pidgin/gtkprefs.c:1552
 msgid "Quieter"
 msgstr "Más silencioso"
 
-#: ../pidgin/gtkprefs.c:1527
+#: ../pidgin/gtkprefs.c:1554
 msgid "Quiet"
 msgstr "Silencio"
 
-#: ../pidgin/gtkprefs.c:1531
+#: ../pidgin/gtkprefs.c:1558
 msgid "Loud"
 msgstr "Ruidoso"
 
-#: ../pidgin/gtkprefs.c:1533
+#: ../pidgin/gtkprefs.c:1560
 msgid "Louder"
 msgstr "Más ruidoso"
 
-#: ../pidgin/gtkprefs.c:1535
+#: ../pidgin/gtkprefs.c:1562
 msgid "Loudest"
 msgstr "El más ruidoso"
 
-#: ../pidgin/gtkprefs.c:1598
+#: ../pidgin/gtkprefs.c:1625
 msgid "Sound Method"
 msgstr "Método para reproducir sonidos"
 
-#: ../pidgin/gtkprefs.c:1599
+#: ../pidgin/gtkprefs.c:1626
 msgid "_Method:"
 msgstr "_Método:"
 
-#: ../pidgin/gtkprefs.c:1601
+#: ../pidgin/gtkprefs.c:1628
 msgid "Console beep"
 msgstr "Timbre de la consola"
 
-#: ../pidgin/gtkprefs.c:1603
+#: ../pidgin/gtkprefs.c:1630
 msgid "Automatic"
 msgstr "Automático"
 
-#: ../pidgin/gtkprefs.c:1606
+#: ../pidgin/gtkprefs.c:1634
 msgid "Command"
 msgstr "Comando"
 
-#: ../pidgin/gtkprefs.c:1607
+#: ../pidgin/gtkprefs.c:1635
 msgid "No sounds"
 msgstr "Sin sonido"
 
-#: ../pidgin/gtkprefs.c:1615
+#: ../pidgin/gtkprefs.c:1643
 #, c-format
 msgid ""
 "Sound c_ommand:\n"
@@ -13982,117 +14627,117 @@
 "_Comando para sonido:\n"
 "(%s para nombre de archivo)"
 
-#: ../pidgin/gtkprefs.c:1641
+#: ../pidgin/gtkprefs.c:1669
 msgid "Sound Options"
 msgstr "Opciones de sonido"
 
-#: ../pidgin/gtkprefs.c:1642
+#: ../pidgin/gtkprefs.c:1670
 msgid "Sounds when conversation has _focus"
 msgstr "Suena cuando la conversación obtiene el _foco"
 
-#: ../pidgin/gtkprefs.c:1644
+#: ../pidgin/gtkprefs.c:1672
 msgid "Enable sounds:"
 msgstr "Habilitar sonidos:"
 
-#: ../pidgin/gtkprefs.c:1646
+#: ../pidgin/gtkprefs.c:1674
 msgid "Only when available"
 msgstr "Sólo cuando estoy disponible"
 
-#: ../pidgin/gtkprefs.c:1647
+#: ../pidgin/gtkprefs.c:1675
 msgid "Only when not available"
 msgstr "Sólo cuando no estoy disponible"
 
-#: ../pidgin/gtkprefs.c:1655
+#: ../pidgin/gtkprefs.c:1683
 msgid "Volume:"
 msgstr "Volumen:"
 
-#: ../pidgin/gtkprefs.c:1683
+#: ../pidgin/gtkprefs.c:1711
 msgid "Sound Events"
 msgstr "Eventos de sonido"
 
-#: ../pidgin/gtkprefs.c:1734
+#: ../pidgin/gtkprefs.c:1763
 msgid "Play"
 msgstr "Reproducir"
 
-#: ../pidgin/gtkprefs.c:1741
+#: ../pidgin/gtkprefs.c:1770
 msgid "Event"
 msgstr "Acontecimiento"
 
-#: ../pidgin/gtkprefs.c:1760
+#: ../pidgin/gtkprefs.c:1789
 msgid "Test"
 msgstr "Probar"
 
-#: ../pidgin/gtkprefs.c:1764
+#: ../pidgin/gtkprefs.c:1793
 msgid "Reset"
 msgstr "Restablecer"
 
-#: ../pidgin/gtkprefs.c:1768
+#: ../pidgin/gtkprefs.c:1797
 msgid "Choose..."
 msgstr "Seleccionar..."
 
-#: ../pidgin/gtkprefs.c:1811
+#: ../pidgin/gtkprefs.c:1840
 msgid "_Report idle time:"
 msgstr "Mostrar el _tiempo de inactividad"
 
-#: ../pidgin/gtkprefs.c:1816
+#: ../pidgin/gtkprefs.c:1845
 msgid "Based on keyboard or mouse use"
 msgstr "Basado en teclado o en uso de ratón"
 
-#: ../pidgin/gtkprefs.c:1825
+#: ../pidgin/gtkprefs.c:1854
 msgid "_Auto-reply:"
 msgstr "Respuesta _automática:"
 
-#: ../pidgin/gtkprefs.c:1829
+#: ../pidgin/gtkprefs.c:1858
 msgid "When both away and idle"
 msgstr "Cuando está ausente e inactivo"
 
 #. Auto-away stuff
-#: ../pidgin/gtkprefs.c:1835
+#: ../pidgin/gtkprefs.c:1864
 msgid "Auto-away"
 msgstr "Auto-ausencia"
 
-#: ../pidgin/gtkprefs.c:1837
+#: ../pidgin/gtkprefs.c:1866
 msgid "Change status when _idle"
 msgstr "Cambiar el estado cuando esté _inactivo"
 
-#: ../pidgin/gtkprefs.c:1841
+#: ../pidgin/gtkprefs.c:1870
 msgid "_Minutes before changing status:"
 msgstr "_Minutos antes de cambiar el estado:"
 
-#: ../pidgin/gtkprefs.c:1849
+#: ../pidgin/gtkprefs.c:1878
 msgid "Change _status to:"
 msgstr "Cambiar _estado a:"
 
 #. Signon status stuff
-#: ../pidgin/gtkprefs.c:1870
+#: ../pidgin/gtkprefs.c:1899
 msgid "Status at Startup"
 msgstr "Estado al arrancar"
 
-#: ../pidgin/gtkprefs.c:1872
+#: ../pidgin/gtkprefs.c:1901
 msgid "Use status from last _exit at startup"
 msgstr "Utilizar el estado de mi última _salida al empezar"
 
-#: ../pidgin/gtkprefs.c:1878
+#: ../pidgin/gtkprefs.c:1907
 msgid "Status to a_pply at startup:"
 msgstr "Estado a _aplicar al empezar:"
 
-#: ../pidgin/gtkprefs.c:1916
+#: ../pidgin/gtkprefs.c:1945
 msgid "Interface"
 msgstr "Interfaz"
 
-#: ../pidgin/gtkprefs.c:1918
+#: ../pidgin/gtkprefs.c:1947
 msgid "Smiley Themes"
 msgstr "Temas de emoticonos"
 
-#: ../pidgin/gtkprefs.c:1919
+#: ../pidgin/gtkprefs.c:1948
 msgid "Sounds"
 msgstr "Sonidos"
 
-#: ../pidgin/gtkprefs.c:1925
+#: ../pidgin/gtkprefs.c:1954
 msgid "Browser"
 msgstr "Navegador"
 
-#: ../pidgin/gtkprefs.c:1929
+#: ../pidgin/gtkprefs.c:1958
 msgid "Status / Idle"
 msgstr "Estado / Inactivo"
 
@@ -14116,65 +14761,65 @@
 msgid "Block only the users below"
 msgstr "Bloquear sólo los siguientes usuarios"
 
-#: ../pidgin/gtkprivacy.c:372
+#: ../pidgin/gtkprivacy.c:369
 msgid "Privacy"
 msgstr "Privacidad"
 
-#: ../pidgin/gtkprivacy.c:385
+#: ../pidgin/gtkprivacy.c:381
 msgid "Changes to privacy settings take effect immediately."
 msgstr ""
 "Los cambios a la configuración de privacidad tienen efecto inmediatamente."
 
 #. "Set privacy for:" label
-#: ../pidgin/gtkprivacy.c:397
+#: ../pidgin/gtkprivacy.c:393
 msgid "Set privacy for:"
 msgstr "Establecer privacidad para:"
 
-#: ../pidgin/gtkprivacy.c:560 ../pidgin/gtkprivacy.c:577
+#: ../pidgin/gtkprivacy.c:556 ../pidgin/gtkprivacy.c:573
 msgid "Permit User"
 msgstr "Permitir al usuario"
 
-#: ../pidgin/gtkprivacy.c:561
+#: ../pidgin/gtkprivacy.c:557
 msgid "Type a user you permit to contact you."
 msgstr "Escriba un usuario al que le permita contactar con vd."
 
-#: ../pidgin/gtkprivacy.c:562
+#: ../pidgin/gtkprivacy.c:558
 msgid "Please enter the name of the user you wish to be able to contact you."
 msgstr ""
 "Introduzca el nombre de usuario al que quiere permitir que contacte con vd."
 
-#: ../pidgin/gtkprivacy.c:565 ../pidgin/gtkprivacy.c:581
+#: ../pidgin/gtkprivacy.c:561 ../pidgin/gtkprivacy.c:577
 msgid "_Permit"
 msgstr "_Permitir"
 
-#: ../pidgin/gtkprivacy.c:571
+#: ../pidgin/gtkprivacy.c:567
 #, c-format
 msgid "Allow %s to contact you?"
 msgstr "¿Permitir a %s contactar con vd.?"
 
-#: ../pidgin/gtkprivacy.c:573
+#: ../pidgin/gtkprivacy.c:569
 #, c-format
 msgid "Are you sure you wish to allow %s to contact you?"
 msgstr "¿Está seguro que quiere permitir que %s le contacte?"
 
-#: ../pidgin/gtkprivacy.c:602 ../pidgin/gtkprivacy.c:616
+#: ../pidgin/gtkprivacy.c:598 ../pidgin/gtkprivacy.c:612
 msgid "Block User"
 msgstr "Bloquear al usuario"
 
-#: ../pidgin/gtkprivacy.c:603
+#: ../pidgin/gtkprivacy.c:599
 msgid "Type a user to block."
 msgstr "Escriba un usuario a bloquear."
 
-#: ../pidgin/gtkprivacy.c:604
+#: ../pidgin/gtkprivacy.c:600
 msgid "Please enter the name of the user you wish to block."
 msgstr "Introduzca el nombre del grupo a bloquear."
 
-#: ../pidgin/gtkprivacy.c:612
+#: ../pidgin/gtkprivacy.c:608
 #, c-format
 msgid "Block %s?"
 msgstr "¿Bloquear a %s?"
 
-#: ../pidgin/gtkprivacy.c:614
+#: ../pidgin/gtkprivacy.c:610
 #, c-format
 msgid "Are you sure you want to block %s?"
 msgstr "¿Está seguro de que quiere bloquear a %s?"
@@ -14183,37 +14828,38 @@
 msgid "Apply"
 msgstr "Aplicar"
 
-#: ../pidgin/gtkrequest.c:1481
+#: ../pidgin/gtkrequest.c:1478
 msgid "That file already exists"
 msgstr "Ese archivo ya existe"
 
+#: ../pidgin/gtkrequest.c:1479
+msgid "Would you like to overwrite it?"
+msgstr "¿Quiere sobreescribirlo?"
+
 #: ../pidgin/gtkrequest.c:1482
-msgid "Would you like to overwrite it?"
-msgstr "¿Quiere sobreescribirlo?"
-
-#: ../pidgin/gtkrequest.c:1485
 msgid "Overwrite"
 msgstr "Sobreescribir"
 
-#: ../pidgin/gtkrequest.c:1486
+#: ../pidgin/gtkrequest.c:1483
 msgid "Choose New Name"
 msgstr "Elegir un nuevo nombre"
 
-#: ../pidgin/gtkrequest.c:1624 ../pidgin/gtkrequest.c:1638
+#: ../pidgin/gtkrequest.c:1621 ../pidgin/gtkrequest.c:1635
 msgid "Select Folder..."
 msgstr "Seleccionar carpeta..."
 
-#: ../pidgin/gtkroomlist.c:376
+#. Create the window.
+#: ../pidgin/gtkroomlist.c:374
 msgid "Room List"
 msgstr "Lista de salas"
 
 #. list button
-#: ../pidgin/gtkroomlist.c:446
+#: ../pidgin/gtkroomlist.c:442
 msgid "_Get List"
 msgstr "_Obtener la lista"
 
 #. add button
-#: ../pidgin/gtkroomlist.c:454
+#: ../pidgin/gtkroomlist.c:450
 msgid "_Add Chat"
 msgstr "_Añadir chat"
 
@@ -14222,37 +14868,37 @@
 msgstr "¿Está seguro que desea borrar los estados guardados y seleccionados?"
 
 #. Use button
-#: ../pidgin/gtksavedstatuses.c:580 ../pidgin/gtksavedstatuses.c:1214
+#: ../pidgin/gtksavedstatuses.c:577 ../pidgin/gtksavedstatuses.c:1207
 msgid "_Use"
 msgstr "_Usar"
 
-#: ../pidgin/gtksavedstatuses.c:726
+#: ../pidgin/gtksavedstatuses.c:723
 msgid "Title already in use.  You must choose a unique title."
 msgstr "Ya se está utilizando ese título. Debe elegir un título único."
 
-#: ../pidgin/gtksavedstatuses.c:914
+#: ../pidgin/gtksavedstatuses.c:911
 msgid "Different"
 msgstr "Diferente"
 
-#: ../pidgin/gtksavedstatuses.c:1107
+#: ../pidgin/gtksavedstatuses.c:1100
 msgid "_Title:"
 msgstr "_Título:"
 
-#: ../pidgin/gtksavedstatuses.c:1126 ../pidgin/gtksavedstatuses.c:1447
+#: ../pidgin/gtksavedstatuses.c:1119 ../pidgin/gtksavedstatuses.c:1436
 msgid "_Status:"
 msgstr "E_stado:"
 
 #. Different status message expander
-#: ../pidgin/gtksavedstatuses.c:1158
+#: ../pidgin/gtksavedstatuses.c:1151
 msgid "Use a _different status for some accounts"
 msgstr "Usar un estado _diferente para algunas cuentas"
 
 #. Save & Use button
-#: ../pidgin/gtksavedstatuses.c:1222
+#: ../pidgin/gtksavedstatuses.c:1215
 msgid "Sa_ve & Use"
 msgstr "Gua_rdar y usar"
 
-#: ../pidgin/gtksavedstatuses.c:1428
+#: ../pidgin/gtksavedstatuses.c:1419
 #, c-format
 msgid "Status for %s"
 msgstr "Estado de %s"
@@ -14309,37 +14955,39 @@
 msgid "Waiting for network connection"
 msgstr "Esperando la conexión a la red"
 
-#: ../pidgin/gtkutils.c:516
+#: ../pidgin/gtkutils.c:627
 msgid "Google Talk"
 msgstr "Google Talk"
 
-#: ../pidgin/gtkutils.c:1372 ../pidgin/gtkutils.c:1395
+#: ../pidgin/gtkutils.c:1346 ../pidgin/gtkutils.c:1369
 #, c-format
 msgid "The following error has occurred loading %s: %s"
 msgstr "Se ha producido el siguiente error al cargar %s: %s"
 
-#: ../pidgin/gtkutils.c:1375 ../pidgin/gtkutils.c:1397
+#: ../pidgin/gtkutils.c:1349 ../pidgin/gtkutils.c:1371
 msgid "Failed to load image"
 msgstr "No se pudo cargar la imagen"
 
-#: ../pidgin/gtkutils.c:1471
+#: ../pidgin/gtkutils.c:1445
 #, c-format
 msgid "Cannot send folder %s."
 msgstr "No se puede enviar la carpeta %s."
 
-#: ../pidgin/gtkutils.c:1472
+#: ../pidgin/gtkutils.c:1446
 #, c-format
 msgid ""
 "%s cannot transfer a folder. You will need to send the files within "
 "individually."
-msgstr "%s no puede transferir una carpeta. Tendrá que enviar los archivos que contiene individualmente."
-
-#: ../pidgin/gtkutils.c:1504 ../pidgin/gtkutils.c:1516
-#: ../pidgin/gtkutils.c:1523
+msgstr ""
+"%s no puede transferir una carpeta. Tendrá que enviar los archivos que "
+"contiene individualmente."
+
+#: ../pidgin/gtkutils.c:1478 ../pidgin/gtkutils.c:1490
+#: ../pidgin/gtkutils.c:1497
 msgid "You have dragged an image"
 msgstr "Ha arrastrado una imagen"
 
-#: ../pidgin/gtkutils.c:1505
+#: ../pidgin/gtkutils.c:1479
 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."
@@ -14347,31 +14995,29 @@
 "Puede enviar esta imagen como una transferencia de archivo, introducirla en "
 "el mensaje, o usarla como icono de amigo para este usuario."
 
-#: ../pidgin/gtkutils.c:1511 ../pidgin/gtkutils.c:1532
+#: ../pidgin/gtkutils.c:1485 ../pidgin/gtkutils.c:1505
 msgid "Set as buddy icon"
 msgstr "Establecer como icono de amigo"
 
-#: ../pidgin/gtkutils.c:1512 ../pidgin/gtkutils.c:1533
+#: ../pidgin/gtkutils.c:1486 ../pidgin/gtkutils.c:1506
 msgid "Send image file"
 msgstr "Enviar archivo de imagen"
 
-#: ../pidgin/gtkutils.c:1513 ../pidgin/gtkutils.c:1533
+#: ../pidgin/gtkutils.c:1487 ../pidgin/gtkutils.c:1506
 msgid "Insert in message"
 msgstr "Insertar en el mensaje"
 
-#: ../pidgin/gtkutils.c:1517
+#: ../pidgin/gtkutils.c:1491
 msgid "Would you like to set it as the buddy icon for this user?"
 msgstr "¿Desea establecerla como el icono de amigo para este usuario?"
 
-#: ../pidgin/gtkutils.c:1524
-msgid ""
-"You can send this image as a file transfer or embed it into this message, or "
-"use it as the buddy icon for this user."
-msgstr ""
-"Puede enviar esta imagen como una transferencia de archivo, o introducirla "
-"en este mensaje, o usarla como icono de amigo para este usuario."
-
-#: ../pidgin/gtkutils.c:1526
+#: ../pidgin/gtkutils.c:1498
+msgid ""
+"You can send this image as a file transfer, or use it as the buddy icon for "
+"this user."
+msgstr "Puede enviar esta imagen como una transferencia de archivo, o usarla como icono de amigo para este usuario."
+
+#: ../pidgin/gtkutils.c:1499
 msgid ""
 "You can insert this image into this message, or use it as the buddy icon for "
 "this user"
@@ -14384,11 +15030,11 @@
 #. * send.  The only logical one is "Application," but do we really want to send a binary and nothing else?
 #. * Probably not.  I'll just give an error and return.
 #. The original patch sent the icon used by the launcher.  That's probably wrong
-#: ../pidgin/gtkutils.c:1584
+#: ../pidgin/gtkutils.c:1557
 msgid "Cannot send launcher"
 msgstr "No se puede enviar un lanzador"
 
-#: ../pidgin/gtkutils.c:1584
+#: ../pidgin/gtkutils.c:1557
 msgid ""
 "You dragged a desktop launcher. Most likely you wanted to send whatever this "
 "launcher points to instead of this launcher itself."
@@ -14396,7 +15042,7 @@
 "Vd. arrastró un lanzador de escritorio. Lo más probable es que quiera enviar "
 "a lo que apunta el lanzador más que el lanzador en sí."
 
-#: ../pidgin/gtkutils.c:2344
+#: ../pidgin/gtkutils.c:2279
 #, c-format
 msgid ""
 "<b>File:</b> %s\n"
@@ -14407,27 +15053,27 @@
 "<b>Tamaño de archivo:</b> %s\n"
 "<b>Tamaño de imagen:</b> %dx%d"
 
-#: ../pidgin/gtkutils.c:2640
+#: ../pidgin/gtkutils.c:2575
 #, c-format
 msgid "The file '%s' is too large for %s.  Please try a smaller image.\n"
 msgstr ""
 "El fichero «%s» es demasiado grande para %s. Intente utilizar una imagen más "
 "pequeña.\n"
 
-#: ../pidgin/gtkutils.c:2642
+#: ../pidgin/gtkutils.c:2577
 msgid "Icon Error"
 msgstr "Error en icono"
 
-#: ../pidgin/gtkutils.c:2643
+#: ../pidgin/gtkutils.c:2578
 msgid "Could not set icon"
 msgstr "No se pudo fijar el icono"
 
-#: ../pidgin/gtkutils.c:2743
+#: ../pidgin/gtkutils.c:2678
 #, c-format
 msgid "Failed to open file '%s': %s"
 msgstr "No se pudo abrir el archivo «%s»: %s"
 
-#: ../pidgin/gtkutils.c:2792
+#: ../pidgin/gtkutils.c:2727
 #, c-format
 msgid ""
 "Failed to load image '%s': reason not known, probably a corrupt image file"
@@ -14435,20 +15081,14 @@
 "Se produjo un fallo al cargar la imagen «%s»: razón desconocida, "
 "posiblemente se trata de un archivo de imagen dañado"
 
-#: ../pidgin/gtkwhiteboard.c:760 ../pidgin/gtkwhiteboard.c:779
+#: ../pidgin/gtkwhiteboard.c:754 ../pidgin/gtkwhiteboard.c:773
 msgid "Save File"
 msgstr "Guardar archivo"
 
-#: ../pidgin/gtkwhiteboard.c:867
+#: ../pidgin/gtkwhiteboard.c:861
 msgid "Select color"
 msgstr "Seleccionar el color"
 
-#. Translators may want to transliterate the name.
-#. It is not to be translated.
-#: ../pidgin/pidgin.h:50
-msgid "Pidgin"
-msgstr "Pidgin"
-
 #: ../pidgin/pidginstock.c:81
 msgid "_Alias"
 msgstr "_Apodo:"
@@ -14473,6 +15113,26 @@
 msgid "_Open Mail"
 msgstr "_Abrir correo"
 
+#: ../pidgin/pixmaps/emotes/default/22/default.theme.in.h:1
+msgid "Default"
+msgstr "(por omisión)"
+
+#: ../pidgin/pixmaps/emotes/default/22/default.theme.in.h:2
+msgid "Pidgin smileys"
+msgstr "Emoticonos de Pidgin"
+
+#: ../pidgin/pixmaps/emotes/none/none.theme.in.h:1
+msgid "Penguin Pimps"
+msgstr "Pinguinos bonitos"
+
+#: ../pidgin/pixmaps/emotes/none/none.theme.in.h:2
+msgid "Selecting this disables graphical emoticons."
+msgstr "Si selecciona esta opción deshabilitará los emoticonos gráficos."
+
+#: ../pidgin/pixmaps/emotes/none/none.theme.in.h:3
+msgid "none"
+msgstr "ninguno"
+
 #: ../pidgin/plugins/cap/cap.c:449
 msgid "Display Statistics"
 msgstr "Mostrar estadísticas"
@@ -14511,18 +15171,18 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/cap/cap.c:934
+#: ../pidgin/plugins/cap/cap.c:935
 msgid "Contact Availability Prediction"
 msgstr "Predicción de disponibilidad de contactos"
 
 #. *< name
 #. *< version
-#: ../pidgin/plugins/cap/cap.c:936
+#: ../pidgin/plugins/cap/cap.c:937
 msgid "Contact Availability Prediction plugin."
 msgstr "Complemento de predicción de disponibilidad de contactos."
 
 #. *  summary
-#: ../pidgin/plugins/cap/cap.c:937
+#: ../pidgin/plugins/cap/cap.c:938
 msgid ""
 "The contact availability plugin (cap) is used to display statistical "
 "information about buddies in a users contact list."
@@ -14629,11 +15289,23 @@
 msgid "Received Messages"
 msgstr "Mensajes recibidos"
 
-#: ../pidgin/plugins/convcolors.c:210 ../pidgin/plugins/pidginrc.c:320
+#: ../pidgin/plugins/convcolors.c:210 ../pidgin/plugins/pidginrc.c:251
 #, c-format
 msgid "Select Color for %s"
 msgstr "Seleccionar el color para %s"
 
+#: ../pidgin/plugins/convcolors.c:287
+msgid "Bold"
+msgstr "Negrita"
+
+#: ../pidgin/plugins/convcolors.c:294
+msgid "Italic"
+msgstr "Cursiva"
+
+#: ../pidgin/plugins/convcolors.c:301
+msgid "Underline"
+msgstr "Subrayado"
+
 #: ../pidgin/plugins/convcolors.c:310
 msgid "Ignore incoming format"
 msgstr "Ignorar formato entrante"
@@ -14659,7 +15331,9 @@
 msgid ""
 "Note: The preference for \"New conversations\" must be set to \"By "
 "conversation count\"."
-msgstr "Nota: La opción para «Nuevas conversaciones» debe fijarse «Por número de conversaciones»."
+msgstr ""
+"Nota: La opción para «Nuevas conversaciones» debe fijarse «Por número de "
+"conversaciones»."
 
 #: ../pidgin/plugins/extplacement.c:111
 msgid "Number of conversations per window"
@@ -14753,26 +15427,31 @@
 msgstr "Mensajería Instantáneos"
 
 #. Add the label.
-#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:460
+#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:457
 msgid "Select a person from your address book below, or add a new person."
 msgstr ""
 "Seleccione una persona de su agenda mostrada abajo, o añada una nueva "
 "persona."
 
+#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:551
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:303
+msgid "Group:"
+msgstr "Grupo:"
+
 #. "New Person" button
-#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:580
-#: ../pidgin/plugins/gevolution/assoc-buddy.c:469
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:251
+#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:577
+#: ../pidgin/plugins/gevolution/assoc-buddy.c:467
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:249
 msgid "New Person"
 msgstr "Nueva persona"
 
 #. "Select Buddy" button
-#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:597
+#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:594
 msgid "Select Buddy"
 msgstr "Seleccionar amigo"
 
 #. Add the label.
-#: ../pidgin/plugins/gevolution/assoc-buddy.c:345
+#: ../pidgin/plugins/gevolution/assoc-buddy.c:343
 msgid ""
 "Select a person from your address book to add this buddy to, or create a new "
 "person."
@@ -14781,43 +15460,43 @@
 "nueva persona."
 
 #. Add the expander
-#: ../pidgin/plugins/gevolution/assoc-buddy.c:433
+#: ../pidgin/plugins/gevolution/assoc-buddy.c:431
 msgid "User _details"
 msgstr "_Detalles del usuario"
 
 #. "Associate Buddy" button
-#: ../pidgin/plugins/gevolution/assoc-buddy.c:486
+#: ../pidgin/plugins/gevolution/assoc-buddy.c:484
 msgid "_Associate Buddy"
 msgstr "_Asociar amigo"
 
-#: ../pidgin/plugins/gevolution/gevolution.c:239
-#: ../pidgin/plugins/gevolution/gevolution.c:245
+#: ../pidgin/plugins/gevolution/gevolution.c:238
+#: ../pidgin/plugins/gevolution/gevolution.c:244
 msgid "Unable to send e-mail"
 msgstr "No se pudo enviar el correo electrónico"
 
-#: ../pidgin/plugins/gevolution/gevolution.c:240
+#: ../pidgin/plugins/gevolution/gevolution.c:239
 msgid "The evolution executable was not found in the PATH."
 msgstr "No se encontró el ejecutable de Evolution en la ruta."
 
-#: ../pidgin/plugins/gevolution/gevolution.c:246
+#: ../pidgin/plugins/gevolution/gevolution.c:245
 msgid "An e-mail address was not found for this buddy."
 msgstr "No se ha encontrado una dirección de correo para este amigo."
 
-#: ../pidgin/plugins/gevolution/gevolution.c:272
+#: ../pidgin/plugins/gevolution/gevolution.c:271
 msgid "Add to Address Book"
 msgstr "Añadir a la agenda"
 
-#: ../pidgin/plugins/gevolution/gevolution.c:284
+#: ../pidgin/plugins/gevolution/gevolution.c:283
 msgid "Send E-Mail"
 msgstr "Enviar correo electrónico"
 
 #. Configuration frame
-#: ../pidgin/plugins/gevolution/gevolution.c:411
+#: ../pidgin/plugins/gevolution/gevolution.c:410
 msgid "Evolution Integration Configuration"
 msgstr "Configuración de la integración con Evolution"
 
 #. Label
-#: ../pidgin/plugins/gevolution/gevolution.c:414
+#: ../pidgin/plugins/gevolution/gevolution.c:413
 msgid "Select all accounts that buddies should be auto-added to."
 msgstr ""
 "Seleccione todas las cuentas a los que los amigos se añadirán de forma "
@@ -14829,7 +15508,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/gevolution/gevolution.c:526
+#: ../pidgin/plugins/gevolution/gevolution.c:525
 msgid "Evolution Integration"
 msgstr "Integración con Evolution"
 
@@ -14837,38 +15516,38 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../pidgin/plugins/gevolution/gevolution.c:529
-#: ../pidgin/plugins/gevolution/gevolution.c:531
+#: ../pidgin/plugins/gevolution/gevolution.c:528
+#: ../pidgin/plugins/gevolution/gevolution.c:530
 msgid "Provides integration with Evolution."
 msgstr "Ofrece integración con Evolution."
 
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:267
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:263
 msgid "Please enter the person's information below."
 msgstr "Introduzca la información de la persona a continuación."
 
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:271
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:267
 msgid "Please enter the buddy's screen name and account type below."
 msgstr ""
 "Introduzca el nombre de usuario de su amigo y el tipo de cuenta más abajo."
 
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:291
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:287
 msgid "Account type:"
 msgstr "Tipo de cuenta:"
 
 #. Optional Information section
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:315
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:311
 msgid "Optional information:"
 msgstr "Información opcional:"
 
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:350
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:346
 msgid "First name:"
 msgstr "Nombre:"
 
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:362
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:358
 msgid "Last name:"
 msgstr "Apellidos:"
 
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:382
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:378
 msgid "E-mail:"
 msgstr "Correo electrónico:"
 
@@ -15173,24 +15852,24 @@
 msgid "Notify Dialog"
 msgstr "Diálogo de notificación"
 
-#: ../pidgin/plugins/pidginrc.c:322
+#: ../pidgin/plugins/pidginrc.c:253
 msgid "Select Color"
 msgstr "Seleccionar el color"
 
-#: ../pidgin/plugins/pidginrc.c:361
+#: ../pidgin/plugins/pidginrc.c:300
+msgid "Select Interface Font"
+msgstr "Seleccionar tipografía de la interfaz"
+
+#: ../pidgin/plugins/pidginrc.c:303
 #, c-format
 msgid "Select Font for %s"
 msgstr "Seleccionar tipografía para %s"
 
-#: ../pidgin/plugins/pidginrc.c:398
-msgid "Select Interface Font"
-msgstr "Seleccionar tipografía de la interfaz"
-
-#: ../pidgin/plugins/pidginrc.c:453
+#: ../pidgin/plugins/pidginrc.c:371
 msgid "GTK+ Interface Font"
 msgstr "Tipografía de la interfaz GTK+"
 
-#: ../pidgin/plugins/pidginrc.c:473
+#: ../pidgin/plugins/pidginrc.c:391
 msgid "GTK+ Text Shortcut Theme"
 msgstr "Tema de atajos de teclado GTK+"
 
@@ -15214,36 +15893,36 @@
 #. widget_bool_widgets[i]);
 #. }
 #.
-#: ../pidgin/plugins/pidginrc.c:510
+#: ../pidgin/plugins/pidginrc.c:428
 msgid "Interface colors"
 msgstr "Colores de la interfaz"
 
-#: ../pidgin/plugins/pidginrc.c:534
+#: ../pidgin/plugins/pidginrc.c:452
 msgid "Widget Sizes"
 msgstr "Tamaño de los controles"
 
-#: ../pidgin/plugins/pidginrc.c:555
+#: ../pidgin/plugins/pidginrc.c:473
 msgid "Fonts"
 msgstr "Tipografía"
 
-#: ../pidgin/plugins/pidginrc.c:578
-msgid "Tools"
-msgstr "Herramientas"
-
-#: ../pidgin/plugins/pidginrc.c:583
+#: ../pidgin/plugins/pidginrc.c:497
+msgid "Gtkrc File Tools"
+msgstr "Herramientas de ficheros Gtkrc"
+
+#: ../pidgin/plugins/pidginrc.c:502
 #, c-format
 msgid "Write settings to %s%sgtkrc-2.0"
 msgstr "Escribir la configuración en %s%sgtkrc-2.0"
 
-#: ../pidgin/plugins/pidginrc.c:591
+#: ../pidgin/plugins/pidginrc.c:511
 msgid "Re-read gtkrc files"
 msgstr "Volver a leer archivos de configuración gtkrc"
 
-#: ../pidgin/plugins/pidginrc.c:624
+#: ../pidgin/plugins/pidginrc.c:544
 msgid "Pidgin GTK+ Theme Control"
 msgstr "Control de tema GTK+ de Pidgin"
 
-#: ../pidgin/plugins/pidginrc.c:626 ../pidgin/plugins/pidginrc.c:627
+#: ../pidgin/plugins/pidginrc.c:546 ../pidgin/plugins/pidginrc.c:547
 msgid "Provides access to commonly used gtkrc settings."
 msgstr ""
 "Da acceso a los parámetros de configuración de gtkrc que se utilizan "
@@ -15261,32 +15940,24 @@
 msgid ""
 "Lets you send raw input to text-based protocols (XMPP, MSN, IRC, TOC). Hit "
 "'Enter' in the entry box to send. Watch the debug window."
-msgstr "Le permite enviar datos en bruto a protocolos basados en texto (XMPP, MSN, IRC,  TOC). Pulse «Intro» en la caja de entrada para enviarlo. Observe la ventana de depuración."
+msgstr ""
+"Le permite enviar datos en bruto a protocolos basados en texto (XMPP, MSN, "
+"IRC,  TOC). Pulse «Intro» en la caja de entrada para enviarlo. Observe la "
+"ventana de depuración."
 
 #: ../pidgin/plugins/relnot.c:71
 #, c-format
-msgid "You are using %s version %s.  The current version is %s.<hr>"
-msgstr "Usted está utilizado la versión de %s %s. La versión actual es %s.<hr>"
-
-#: ../pidgin/plugins/relnot.c:77
-#, c-format
-msgid ""
-"<b>ChangeLog:</b>\n"
-"%s<br><br>"
-msgstr ""
-"<b>Registro de cambios:</b>\n"
-"%s<br><br>"
-
-#: ../pidgin/plugins/relnot.c:82
-#, c-format
-msgid ""
-"You can get version %s from:<br><a href=\"http://pidgin.im/\">http://pidgin."
-"im</a>."
-msgstr ""
-"Puede obtener la versión %s de:<br><a href=\"http://pidgin.im/\">http://"
-"pidgin.im</a>."
-
-#: ../pidgin/plugins/relnot.c:86 ../pidgin/plugins/relnot.c:87
+msgid ""
+"You are using %s version %s.  The current version is %s.  You can get it "
+"from <a href=\"%s\">%s</a><hr>"
+msgstr "Usted está utilizado %s, versión %s. La versión actual es %s. Puede obtenerla de <a href=\"%s\">%s</a><hr>"
+
+#: ../pidgin/plugins/relnot.c:79
+#, c-format
+msgid "<b>ChangeLog:</b><br>%s"
+msgstr "<b>Registro de cambios:</b><br>%s"
+
+#: ../pidgin/plugins/relnot.c:84 ../pidgin/plugins/relnot.c:85
 msgid "New Version Available"
 msgstr "Nueva versión disponible"
 
@@ -15296,19 +15967,19 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/relnot.c:145
+#: ../pidgin/plugins/relnot.c:143
 msgid "Release Notification"
 msgstr "Notificación de versiones"
 
 #. *< name
 #. *< version
 #. *  summary
-#: ../pidgin/plugins/relnot.c:148
+#: ../pidgin/plugins/relnot.c:146
 msgid "Checks periodically for new releases."
 msgstr "Comprueba periódicamente la existencia de nuevas versiones."
 
 #. *  description
-#: ../pidgin/plugins/relnot.c:150
+#: ../pidgin/plugins/relnot.c:148
 msgid ""
 "Checks periodically for new releases and notifies the user with the "
 "ChangeLog."
@@ -15391,7 +16062,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/ticker/ticker.c:77 ../pidgin/plugins/ticker/ticker.c:355
+#: ../pidgin/plugins/ticker/ticker.c:74 ../pidgin/plugins/ticker/ticker.c:354
 msgid "Buddy Ticker"
 msgstr "Deslizante de amigos"
 
@@ -15399,7 +16070,7 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../pidgin/plugins/ticker/ticker.c:358 ../pidgin/plugins/ticker/ticker.c:360
+#: ../pidgin/plugins/ticker/ticker.c:357 ../pidgin/plugins/ticker/ticker.c:359
 msgid "A horizontal scrolling version of the buddy list."
 msgstr "Una versión horizontal deslizante de la lista de amigos."
 
@@ -15606,7 +16277,7 @@
 "Contiene las opciones específicas al Pidgin de Windows como el apilado de la "
 "lista de amigos."
 
-#: ../pidgin/plugins/xmppconsole.c:665
+#: ../pidgin/plugins/xmppconsole.c:667
 msgid "<font color='#777777'>Logged out.</font>"
 msgstr "<font color='#777777'>Desconectado.</font>"
 
@@ -15616,7 +16287,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/xmppconsole.c:745 ../pidgin/plugins/xmppconsole.c:841
+#: ../pidgin/plugins/xmppconsole.c:746 ../pidgin/plugins/xmppconsole.c:841
 #: ../pidgin/plugins/xmppconsole.c:860
 msgid "XMPP Console"
 msgstr "Consola XMPP"
@@ -15653,6 +16324,77 @@
 msgid "This plugin is useful for debbuging XMPP servers or clients."
 msgstr "Este complemento es útil para depurar clientes o servidores XMPP."
 
+#~ msgid "User information for %s unavailable:"
+#~ msgstr "Información de usuario de %s no disponible:"
+
+#~ msgid "/Buddies/_About Pidgin"
+#~ msgstr "/Amigos/_Acerca de Pidgin"
+
+#~ msgid "Larger font size"
+#~ msgstr "Tamaño de tipografía mayor"
+
+#~ msgid "Smaller font size"
+#~ msgstr "Tamaño de tipografía menor"
+
+#~ msgid "Reset formatting"
+#~ msgstr "Limpiar formato"
+
+#~ msgid "Insert link"
+#~ msgstr "Insertar enlace"
+
+#~ msgid "Insert image"
+#~ msgstr "Insertar imagen"
+
+# No estoy muy seguro de usar emoticono, quizás «smiley» sería más apropiado
+#~ msgid "Insert smiley"
+#~ msgstr "Insertar emoticono"
+
+#~ msgid "Tools"
+#~ msgstr "Herramientas"
+
+#~ msgid "</a><hr>"
+#~ msgstr "</a><hr>"
+
+#~ msgid ""
+#~ "%s was disconnected due to the following error:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "%s se ha desconectado por el siguiente error:\n"
+#~ "%s"
+
+#~ msgid "Reject watching by other users"
+#~ msgstr "Impedir que otros usuarios miren"
+
+#~ msgid "Block invites"
+#~ msgstr "Bloquear invitaciones"
+
+#~ msgid "Reject online status attribute requests"
+#~ msgstr "Rechazar solicitudes de los atributos del estado en línea"
+
+#~ msgid "Alias..."
+#~ msgstr "_Apodo..."
+
+#~ msgid ""
+#~ "<FONT SIZE=\"4\">IRC:</FONT> #pidgin-win32 on irc.freenode.net<BR><BR>"
+#~ msgstr ""
+#~ "<FONT SIZE=\"4\">IRC:</FONT> canal #pidgin-win32 en irc.freenode."
+#~ "net<BR><BR>"
+
+#~ msgid ""
+#~ "You can send this image as a file transfer or embed it into this message, "
+#~ "or use it as the buddy icon for this user."
+#~ msgstr ""
+#~ "Puede enviar esta imagen como una transferencia de archivo, o "
+#~ "introducirla en este mensaje, o usarla como icono de amigo para este "
+#~ "usuario."
+
+#~ msgid ""
+#~ "You can get version %s from:<br><a href=\"http://pidgin.im/\">http://"
+#~ "pidgin.im</a>."
+#~ msgstr ""
+#~ "Puede obtener la versión %s de:<br><a href=\"http://pidgin.im/\">http://"
+#~ "pidgin.im</a>."
+
 #~ msgid "Toggle offline buddies"
 #~ msgstr "Mostrar amigos desconectados"
 
@@ -15801,18 +16543,6 @@
 #~ msgid "Gaim Internet Messenger"
 #~ msgstr "Gaim - cliente de mensajería de Internet"
 
-#~ msgid "/Conversation/Insert Lin_k..."
-#~ msgstr "/Conversación/Insertar en_lace..."
-
-#~ msgid "/Conversation/Insert Imag_e..."
-#~ msgstr "/Conversación/Insertar imag_en..."
-
-#~ msgid "/Conversation/Insert Link..."
-#~ msgstr "/Opciones/Insertar enlace..."
-
-#~ msgid "/Conversation/Insert Image..."
-#~ msgstr "/Opciones/Insertar imagen..."
-
 #~ msgid "<FONT SIZE=\"4\">IRC:</FONT> #wingaim on irc.freenode.net<BR><BR>"
 #~ msgstr ""
 #~ "<FONT SIZE=\"4\">IRC:</FONT> canal #wingaim en irc.freenode.net<BR><BR>"
@@ -16127,9 +16857,6 @@
 #~ msgid "Selection"
 #~ msgstr "Selección"
 
-#~ msgid "Select a number"
-#~ msgstr "Seleccione un número"
-
 #~ msgid "Faces"
 #~ msgstr "Caras"
 
@@ -16151,9 +16878,6 @@
 #~ msgid "Please wait for new version"
 #~ msgstr "Por favor, espere a una nueva versión"
 
-#~ msgid "Connection timeout!"
-#~ msgstr "¡Expiró la conexión!"
-
 #~ msgid "User info is not updated"
 #~ msgstr "La información del usuario no está actualizada"
 
@@ -18093,12 +18817,6 @@
 #~ msgid "Style"
 #~ msgstr "Estilo"
 
-#~ msgid "_Bold"
-#~ msgstr "_Negrita"
-
-#~ msgid "_Underline"
-#~ msgstr "S_ubrayado"
-
 #~ msgid "_Strikethrough"
 #~ msgstr "_Tachado"
 
--- a/po/fi.po	Thu Jul 12 23:57:56 2007 +0000
+++ b/po/fi.po	Fri Jul 13 00:03:15 2007 +0000
@@ -10,8 +10,8 @@
 msgstr ""
 "Project-Id-Version: Pidgin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-06-11 15:25+0300\n"
-"PO-Revision-Date: 2007-06-11 15:25+0300\n"
+"POT-Creation-Date: 2007-07-12 17:13+0300\n"
+"PO-Revision-Date: 2007-07-12 17:13+0300\n"
 "Last-Translator: Timo Jyrinki <timo.jyrinki@iki.fi>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -19,12 +19,19 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
-#: ../finch/finch.c:180
+#. Translators may want to transliterate the name.
+#. It is not to be translated.
+#: ../finch/finch.c:70 ../finch/finch.c:298 ../finch/finch.c:327
+#: ../finch/finch.c:404
+msgid "Finch"
+msgstr "Finch"
+
+#: ../finch/finch.c:204
 #, c-format
 msgid "%s. Try `%s -h' for more information.\n"
 msgstr "%s. Kirjoita \"%s -h\" saadaksesi lisää tietoja.\n"
 
-#: ../finch/finch.c:182
+#: ../finch/finch.c:206
 #, c-format
 msgid ""
 "%s\n"
@@ -45,13 +52,7 @@
 "  -n, --nologin       älä kirjaudu automaattisesti\n"
 "  -v, --version       näytä nykyinen versionumero ja poistu\n"
 
-#. Translators may want to transliterate the name.
-#. It is not to be translated.
-#: ../finch/finch.c:274 ../finch/finch.c:303
-msgid "Finch"
-msgstr "Finch"
-
-#: ../finch/finch.c:301 ../pidgin/gtkmain.c:688
+#: ../finch/finch.c:325 ../pidgin/gtkmain.c:708
 #, c-format
 msgid ""
 "%s encountered errors migrating your settings from %s to %s. Please "
@@ -62,95 +63,103 @@
 "Tutki asiaa ja suorita asetusten siirto käsin. Ilmoita tästä ongelmasta "
 "osoitteessa http://developer.pidgin.im/"
 
-#: ../finch/gntaccount.c:119 ../finch/gntblist.c:290 ../finch/gntblist.c:415
-#: ../finch/gntblist.c:428 ../finch/gntplugin.c:181 ../finch/gntplugin.c:225
-#: ../finch/gntstatus.c:294 ../finch/gntstatus.c:302
-#: ../libpurple/protocols/jabber/buddy.c:1426
+#: ../finch/gntaccount.c:122 ../finch/gntaccount.c:477 ../finch/gntblist.c:299
+#: ../finch/gntblist.c:424 ../finch/gntblist.c:437 ../finch/gntplugin.c:185
+#: ../finch/gntplugin.c:233 ../finch/gntstatus.c:297 ../finch/gntstatus.c:305
+#: ../libpurple/protocols/jabber/buddy.c:1464
 #: ../libpurple/protocols/jabber/chat.c:677
 #: ../libpurple/protocols/jabber/chat.c:688
-#: ../libpurple/protocols/jabber/jabber.c:1235
-#: ../libpurple/protocols/qq/group_join.c:326
+#: ../libpurple/protocols/jabber/jabber.c:1227
+#: ../libpurple/protocols/qq/group_join.c:328
 #: ../libpurple/protocols/silc/ops.c:57 ../libpurple/protocols/silc/ops.c:1456
 #: ../libpurple/protocols/silc10/ops.c:1451
 msgid "Error"
 msgstr "Virhe"
 
-#: ../finch/gntaccount.c:119
+#: ../finch/gntaccount.c:122
 msgid "Account was not added"
 msgstr "Käyttäjätiliä ei lisätty"
 
-#: ../finch/gntaccount.c:120
+#: ../finch/gntaccount.c:123
 msgid "Screenname of an account must be non-empty."
 msgstr "Käyttäjätilin näyttönimi ei voi olla tyhjä."
 
-#: ../finch/gntaccount.c:423
+#: ../finch/gntaccount.c:430
 msgid "New mail notifications"
 msgstr "Ilmoita uudesta sähköpostista"
 
-#: ../finch/gntaccount.c:433
+#: ../finch/gntaccount.c:440
 msgid "Remember password"
 msgstr "Muista salasana"
 
-#: ../finch/gntaccount.c:474 ../pidgin/gtkaccount.c:1478
-#: ../pidgin/gtkblist.c:3983
+#: ../finch/gntaccount.c:478
+msgid "There's no protocol plugins installed."
+msgstr "Yhteyskäytäntöliitännäisiä ei ole asennettu."
+
+#: ../finch/gntaccount.c:479
+msgid "(You probably forgot to 'make install'.)"
+msgstr "(Unohdit luultavasti suorittaa \"make install\".)"
+
+#: ../finch/gntaccount.c:489 ../pidgin/gtkaccount.c:1473
+#: ../pidgin/gtkblist.c:4014
 msgid "Modify Account"
 msgstr "Muokkaa tiliä"
 
-#: ../finch/gntaccount.c:474
+#: ../finch/gntaccount.c:489
 msgid "New Account"
 msgstr "Uusi tili"
 
-#: ../finch/gntaccount.c:500 ../pidgin/gtkft.c:695
+#: ../finch/gntaccount.c:514 ../pidgin/gtkft.c:695
 msgid "Protocol:"
 msgstr "Yhteyskäytäntö:"
 
-#: ../finch/gntaccount.c:508
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:295
+#: ../finch/gntaccount.c:522
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:291
 msgid "Screen name:"
 msgstr "Näyttönimi:"
 
-#: ../finch/gntaccount.c:521
+#: ../finch/gntaccount.c:535
 msgid "Password:"
 msgstr "Salasana:"
 
-#: ../finch/gntaccount.c:531
+#: ../finch/gntaccount.c:545
 msgid "Alias:"
 msgstr "Alias:"
 
 #. Cancel button
 #. Cancel
-#: ../finch/gntaccount.c:554 ../finch/gntaccount.c:617
-#: ../finch/gntaccount.c:853 ../finch/gntblist.c:334 ../finch/gntblist.c:403
-#: ../finch/gntblist.c:438 ../finch/gntblist.c:770 ../finch/gntblist.c:967
-#: ../finch/gntblist.c:1063 ../finch/gntblist.c:2160 ../finch/gntplugin.c:360
-#: ../finch/gntpounce.c:456 ../finch/gntpounce.c:654 ../finch/gntprefs.c:246
-#: ../finch/gntstatus.c:142 ../finch/gntstatus.c:475 ../finch/gntstatus.c:600
+#: ../finch/gntaccount.c:568 ../finch/gntaccount.c:631
+#: ../finch/gntaccount.c:875 ../finch/gntblist.c:343 ../finch/gntblist.c:412
+#: ../finch/gntblist.c:447 ../finch/gntblist.c:794 ../finch/gntblist.c:996
+#: ../finch/gntblist.c:1092 ../finch/gntblist.c:2198 ../finch/gntplugin.c:378
+#: ../finch/gntpounce.c:456 ../finch/gntpounce.c:654 ../finch/gntprefs.c:264
+#: ../finch/gntstatus.c:143 ../finch/gntstatus.c:478 ../finch/gntstatus.c:603
 #: ../libpurple/account.c:984 ../libpurple/account.c:1234
-#: ../libpurple/account.c:1269 ../libpurple/conversation.c:1168
+#: ../libpurple/account.c:1269 ../libpurple/conversation.c:1173
 #: ../libpurple/plugins/buddynote.c:51 ../libpurple/protocols/gg/gg.c:502
 #: ../libpurple/protocols/gg/gg.c:661 ../libpurple/protocols/gg/gg.c:798
 #: ../libpurple/protocols/gg/gg.c:879
-#: ../libpurple/protocols/jabber/buddy.c:584
-#: ../libpurple/protocols/jabber/buddy.c:1788
-#: ../libpurple/protocols/jabber/buddy.c:1824
+#: ../libpurple/protocols/jabber/buddy.c:588
+#: ../libpurple/protocols/jabber/buddy.c:1826
+#: ../libpurple/protocols/jabber/buddy.c:1862
 #: ../libpurple/protocols/jabber/chat.c:786
 #: ../libpurple/protocols/jabber/jabber.c:882
-#: ../libpurple/protocols/jabber/jabber.c:1390
+#: ../libpurple/protocols/jabber/jabber.c:1384
 #: ../libpurple/protocols/jabber/si.c:868
 #: ../libpurple/protocols/jabber/xdata.c:337
 #: ../libpurple/protocols/msn/msn.c:259 ../libpurple/protocols/msn/msn.c:276
 #: ../libpurple/protocols/msn/msn.c:293 ../libpurple/protocols/msn/msn.c:310
 #: ../libpurple/protocols/msn/msn.c:331
-#: ../libpurple/protocols/oscar/oscar.c:6046
+#: ../libpurple/protocols/oscar/oscar.c:6073
 #: ../libpurple/protocols/oscar/peer.c:1023
 #: ../libpurple/protocols/qq/buddy_info.c:484
 #: ../libpurple/protocols/qq/buddy_opt.c:214
 #: ../libpurple/protocols/qq/buddy_opt.c:409
 #: ../libpurple/protocols/qq/group.c:124
-#: ../libpurple/protocols/qq/group_join.c:138
-#: ../libpurple/protocols/qq/group_join.c:363
-#: ../libpurple/protocols/qq/group_opt.c:143
-#: ../libpurple/protocols/qq/group_opt.c:398
+#: ../libpurple/protocols/qq/group_join.c:140
+#: ../libpurple/protocols/qq/group_join.c:365
+#: ../libpurple/protocols/qq/group_opt.c:144
+#: ../libpurple/protocols/qq/group_opt.c:399
 #: ../libpurple/protocols/qq/sys_msg.c:115
 #: ../libpurple/protocols/qq/sys_msg.c:174
 #: ../libpurple/protocols/qq/sys_msg.c:269
@@ -178,159 +187,161 @@
 #: ../libpurple/protocols/silc10/silc.c:942
 #: ../libpurple/protocols/yahoo/yahoo.c:989
 #: ../libpurple/protocols/yahoo/yahoo.c:3248
-#: ../libpurple/protocols/yahoo/yahoo.c:3259 ../pidgin/gtkaccount.c:1916
-#: ../pidgin/gtkaccount.c:2514 ../pidgin/gtkblist.c:5863
-#: ../pidgin/gtkdialogs.c:724 ../pidgin/gtkdialogs.c:871
-#: ../pidgin/gtkdialogs.c:963 ../pidgin/gtkdialogs.c:983
-#: ../pidgin/gtkdialogs.c:1007 ../pidgin/gtkdialogs.c:1029
-#: ../pidgin/gtkdialogs.c:1077 ../pidgin/gtkdialogs.c:1118
-#: ../pidgin/gtkdialogs.c:1174 ../pidgin/gtkdialogs.c:1213
-#: ../pidgin/gtkdialogs.c:1240 ../pidgin/gtkimhtmltoolbar.c:423
-#: ../pidgin/gtklog.c:302 ../pidgin/gtkplugin.c:288 ../pidgin/gtkpounce.c:1102
-#: ../pidgin/gtkprivacy.c:566 ../pidgin/gtkprivacy.c:582
-#: ../pidgin/gtkprivacy.c:607 ../pidgin/gtkprivacy.c:621
-#: ../pidgin/gtkrequest.c:270 ../pidgin/gtksavedstatuses.c:337
+#: ../libpurple/protocols/yahoo/yahoo.c:3259 ../pidgin/gtkaccount.c:1908
+#: ../pidgin/gtkaccount.c:2501 ../pidgin/gtkblist.c:5915
+#: ../pidgin/gtkdialogs.c:727 ../pidgin/gtkdialogs.c:865
+#: ../pidgin/gtkdialogs.c:957 ../pidgin/gtkdialogs.c:977
+#: ../pidgin/gtkdialogs.c:1001 ../pidgin/gtkdialogs.c:1023
+#: ../pidgin/gtkdialogs.c:1071 ../pidgin/gtkdialogs.c:1112
+#: ../pidgin/gtkdialogs.c:1168 ../pidgin/gtkdialogs.c:1207
+#: ../pidgin/gtkdialogs.c:1234 ../pidgin/gtkimhtmltoolbar.c:425
+#: ../pidgin/gtklog.c:327 ../pidgin/gtkplugin.c:288 ../pidgin/gtkpounce.c:1115
+#: ../pidgin/gtkprivacy.c:562 ../pidgin/gtkprivacy.c:578
+#: ../pidgin/gtkprivacy.c:603 ../pidgin/gtkprivacy.c:617
+#: ../pidgin/gtkrequest.c:270 ../pidgin/gtksavedstatuses.c:344
+#: ../pidgin/gtkstatusbox.c:1582
 msgid "Cancel"
 msgstr "Peru"
 
 #. Save button
 #. Save
-#: ../finch/gntaccount.c:558 ../finch/gntplugin.c:360 ../finch/gntpounce.c:462
-#: ../finch/gntprefs.c:246 ../finch/gntstatus.c:478 ../finch/gntstatus.c:588
+#: ../finch/gntaccount.c:572 ../finch/gntplugin.c:378 ../finch/gntpounce.c:462
+#: ../finch/gntprefs.c:264 ../finch/gntstatus.c:481 ../finch/gntstatus.c:591
 #: ../libpurple/account.c:1268 ../libpurple/plugins/buddynote.c:50
-#: ../libpurple/protocols/jabber/buddy.c:583 ../pidgin/gtkdebug.c:748
+#: ../libpurple/protocols/jabber/buddy.c:587 ../pidgin/gtkdebug.c:748
 #: ../pidgin/gtkrequest.c:276
 msgid "Save"
 msgstr "Tallenna"
 
-#: ../finch/gntaccount.c:611 ../pidgin/gtkaccount.c:1908
-#: ../pidgin/gtksavedstatuses.c:328
+#: ../finch/gntaccount.c:625 ../pidgin/gtkaccount.c:1900
+#: ../pidgin/gtksavedstatuses.c:332 ../pidgin/gtkstatusbox.c:1576
 #, c-format
 msgid "Are you sure you want to delete %s?"
 msgstr "Haluatko varmasti poistaa %s:n?"
 
-#: ../finch/gntaccount.c:614
+#: ../finch/gntaccount.c:628
 msgid "Delete Account"
 msgstr "Poista tili"
 
 #. Delete button
-#: ../finch/gntaccount.c:616 ../finch/gntaccount.c:683
-#: ../finch/gntpounce.c:653 ../finch/gntpounce.c:714 ../finch/gntstatus.c:141
-#: ../finch/gntstatus.c:204 ../pidgin/gtkaccount.c:1915 ../pidgin/gtklog.c:301
-#: ../pidgin/gtkpounce.c:1101 ../pidgin/gtkrequest.c:273
-#: ../pidgin/gtksavedstatuses.c:336
+#: ../finch/gntaccount.c:630 ../finch/gntaccount.c:699
+#: ../finch/gntpounce.c:653 ../finch/gntpounce.c:715 ../finch/gntstatus.c:142
+#: ../finch/gntstatus.c:207 ../pidgin/gtkaccount.c:1907 ../pidgin/gtklog.c:326
+#: ../pidgin/gtkpounce.c:1114 ../pidgin/gtkrequest.c:273
+#: ../pidgin/gtksavedstatuses.c:343 ../pidgin/gtkstatusbox.c:1581
 msgid "Delete"
 msgstr "Poista"
 
-#: ../finch/gntaccount.c:646 ../finch/gntblist.c:2065 ../finch/gntui.c:76
-#: ../pidgin/gtkaccount.c:2340 ../pidgin/gtkdocklet.c:522
+#: ../finch/gntaccount.c:662 ../finch/gntblist.c:2104 ../finch/gntui.c:77
+#: ../pidgin/gtkaccount.c:2327 ../pidgin/gtkdocklet.c:522
 msgid "Accounts"
 msgstr "Käyttäjätilit"
 
-#: ../finch/gntaccount.c:652
+#: ../finch/gntaccount.c:668
 msgid "You can enable/disable accounts from the following list."
 msgstr ""
 "Voit ottaa käyttöön/pois käytöstä käyttäjätilejä seuraavasta luettelosta."
 
 #. Add button
-#: ../finch/gntaccount.c:675 ../finch/gntaccount.c:852 ../finch/gntblist.c:333
-#: ../finch/gntblist.c:403 ../finch/gntblist.c:438 ../finch/gntnotify.c:369
-#: ../finch/gntpounce.c:699 ../finch/gntstatus.c:194
+#: ../finch/gntaccount.c:691 ../finch/gntaccount.c:874 ../finch/gntblist.c:342
+#: ../finch/gntblist.c:412 ../finch/gntblist.c:447 ../finch/gntnotify.c:379
+#: ../finch/gntpounce.c:700 ../finch/gntstatus.c:197
 #: ../libpurple/protocols/gg/gg.c:878 ../libpurple/protocols/qq/sys_msg.c:116
 #: ../libpurple/protocols/qq/sys_msg.c:175
 #: ../libpurple/protocols/qq/sys_msg.c:270
 #: ../libpurple/protocols/sametime/sametime.c:5486
 #: ../libpurple/protocols/silc/chat.c:615
-#: ../libpurple/protocols/silc10/chat.c:599 ../pidgin/gtkaccount.c:2513
-#: ../pidgin/gtkblist.c:5862 ../pidgin/gtkconv.c:1686
+#: ../libpurple/protocols/silc10/chat.c:599 ../pidgin/gtkaccount.c:2500
+#: ../pidgin/gtkblist.c:5914 ../pidgin/gtkconv.c:1651
 #: ../pidgin/gtkrequest.c:274
 msgid "Add"
 msgstr "Lisää"
 
 #. Modify button
-#: ../finch/gntaccount.c:679 ../finch/gntpounce.c:706
+#: ../finch/gntaccount.c:695 ../finch/gntpounce.c:707
 msgid "Modify"
 msgstr "Muokkaa"
 
-#: ../finch/gntaccount.c:775 ../pidgin/gtkaccount.c:2460
+#: ../finch/gntaccount.c:797 ../pidgin/gtkaccount.c:2447
 #, c-format
 msgid "%s%s%s%s has made %s his or her buddy%s%s"
 msgstr "%s%s%s%s on tehnyt käyttäjästä %s tuttavansa%s%s"
 
-#: ../finch/gntaccount.c:848 ../pidgin/gtkaccount.c:2512
+#: ../finch/gntaccount.c:870 ../pidgin/gtkaccount.c:2499
 msgid "Add buddy to your list?"
 msgstr "Lisää tuttava listalle?"
 
-#: ../finch/gntaccount.c:902 ../pidgin/gtkaccount.c:2564
+#: ../finch/gntaccount.c:924 ../pidgin/gtkaccount.c:2551
 #, c-format
 msgid "%s%s%s%s wants to add %s to his or her buddy list%s%s"
 msgstr "%s%s%s%s haluaa lisätä käyttäjän %s tuttavalistalleen%s%s"
 
-#: ../finch/gntaccount.c:922 ../finch/gntaccount.c:929
-#: ../pidgin/gtkaccount.c:2587 ../pidgin/gtkaccount.c:2593
+#: ../finch/gntaccount.c:949 ../finch/gntaccount.c:952
+#: ../finch/gntaccount.c:979 ../pidgin/gtkaccount.c:2574
+#: ../pidgin/gtkaccount.c:2580
 msgid "Authorize buddy?"
 msgstr "Valtuuta tuttava?"
 
-#: ../finch/gntaccount.c:926 ../finch/gntaccount.c:933
-#: ../pidgin/gtkaccount.c:2588 ../pidgin/gtkaccount.c:2594
+#: ../finch/gntaccount.c:956 ../finch/gntaccount.c:983
+#: ../pidgin/gtkaccount.c:2575 ../pidgin/gtkaccount.c:2581
 msgid "Authorize"
 msgstr "Valtuuta"
 
-#: ../finch/gntaccount.c:927 ../finch/gntaccount.c:934
-#: ../pidgin/gtkaccount.c:2589 ../pidgin/gtkaccount.c:2595
+#: ../finch/gntaccount.c:957 ../finch/gntaccount.c:984
+#: ../pidgin/gtkaccount.c:2576 ../pidgin/gtkaccount.c:2582
 msgid "Deny"
 msgstr "Kiellä"
 
-#: ../finch/gntblist.c:279
+#: ../finch/gntblist.c:288
 msgid "You must provide a screename for the buddy."
 msgstr "Tuttavan näyttönimi on annettava."
 
-#: ../finch/gntblist.c:281
+#: ../finch/gntblist.c:290
 msgid "You must provide a group."
 msgstr "Ryhmä on määritettävä."
 
-#: ../finch/gntblist.c:283
+#: ../finch/gntblist.c:292
 msgid "You must select an account."
 msgstr "Käyttäjätili täytyy valita."
 
-#: ../finch/gntblist.c:285
+#: ../finch/gntblist.c:294
 msgid "The selected account is not online."
 msgstr "Valittu käyttäjätili ei ole linjoilla."
 
-#: ../finch/gntblist.c:290
+#: ../finch/gntblist.c:299
 msgid "Error adding buddy"
 msgstr "Virhe lisättäessä tuttavaa"
 
-#: ../finch/gntblist.c:315 ../libpurple/protocols/oscar/oscar.c:2844
-#: ../pidgin/gtkaccount.c:1991 ../pidgin/gtksavedstatuses.c:924
+#: ../finch/gntblist.c:324 ../libpurple/protocols/oscar/oscar.c:2864
+#: ../pidgin/gtkaccount.c:1983 ../pidgin/gtksavedstatuses.c:979
 msgid "Screen Name"
 msgstr "Näyttönimi"
 
-#: ../finch/gntblist.c:318 ../finch/gntblist.c:395 ../finch/gntblist.c:1211
+#: ../finch/gntblist.c:327 ../finch/gntblist.c:404 ../finch/gntblist.c:1240
 #: ../libpurple/protocols/msn/msn.c:1364
 #: ../libpurple/protocols/silc/chat.c:606
 #: ../libpurple/protocols/silc10/chat.c:590
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:680
 #: ../libpurple/protocols/zephyr/zephyr.c:788
-#: ../libpurple/protocols/zephyr/zephyr.c:1207 ../pidgin/gtkdialogs.c:982
-#: ../pidgin/gtkdialogs.c:1006 ../pidgin/gtkdialogs.c:1028
+#: ../libpurple/protocols/zephyr/zephyr.c:1207 ../pidgin/gtkdialogs.c:976
+#: ../pidgin/gtkdialogs.c:1000 ../pidgin/gtkdialogs.c:1022
 #: ../pidgin/gtkrequest.c:277
 msgid "Alias"
 msgstr "Alias"
 
-#: ../finch/gntblist.c:321 ../finch/gntblist.c:398
+#: ../finch/gntblist.c:330 ../finch/gntblist.c:407
 msgid "Group"
 msgstr "Ryhmä"
 
-#: ../finch/gntblist.c:325 ../finch/gntblist.c:386 ../finch/gntblist.c:1261
-#: ../finch/gntnotify.c:171 ../finch/gntstatus.c:566
+#: ../finch/gntblist.c:334 ../finch/gntblist.c:395 ../finch/gntblist.c:1292
+#: ../finch/gntnotify.c:173 ../finch/gntstatus.c:569
 #: ../libpurple/plugins/idle.c:153 ../libpurple/plugins/idle.c:190
-#: ../pidgin/gtkblist.c:2965 ../pidgin/gtknotify.c:476
-#: ../pidgin/gtkpounce.c:1269 ../pidgin/plugins/gevolution/gevolution.c:443
+#: ../pidgin/gtkblist.c:2974 ../pidgin/gtknotify.c:482
+#: ../pidgin/gtkpounce.c:1282 ../pidgin/plugins/gevolution/gevolution.c:443
 msgid "Account"
 msgstr "Tili"
 
-#: ../finch/gntblist.c:331 ../finch/gntblist.c:819
+#: ../finch/gntblist.c:340 ../finch/gntblist.c:843
 #: ../libpurple/protocols/silc/buddy.c:725
 #: ../libpurple/protocols/silc/buddy.c:1027
 #: ../libpurple/protocols/silc/buddy.c:1072
@@ -339,176 +350,174 @@
 #: ../libpurple/protocols/silc10/buddy.c:1033
 #: ../libpurple/protocols/silc10/buddy.c:1080
 #: ../libpurple/protocols/silc10/buddy.c:1180
-#: ../libpurple/protocols/yahoo/yahoo.c:3161 ../pidgin/gtkblist.c:5368
-#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:447
+#: ../libpurple/protocols/yahoo/yahoo.c:3161 ../pidgin/gtkblist.c:5420
+#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:445
 msgid "Add Buddy"
 msgstr "Lisää tuttava"
 
-#: ../finch/gntblist.c:331
+#: ../finch/gntblist.c:340
 msgid "Please enter buddy information."
 msgstr "Syötä tuttavan tiedot."
 
-#: ../finch/gntblist.c:358 ../libpurple/blist.c:1192
+#: ../finch/gntblist.c:367 ../libpurple/blist.c:1190
 msgid "Chats"
 msgstr "Ryhmäkeskustelut"
 
 #. Extract their Name and put it in
-#: ../finch/gntblist.c:392 ../libpurple/protocols/jabber/jabber.c:813
+#: ../finch/gntblist.c:401 ../libpurple/protocols/jabber/jabber.c:813
 #: ../libpurple/protocols/msn/msn.c:1553 ../libpurple/protocols/msn/msn.c:1618
 #: ../libpurple/protocols/msn/msn.c:1645
 #: ../libpurple/protocols/qq/buddy_info.c:44 ../pidgin/gtkplugin.c:581
-#: ../pidgin/gtkroomlist.c:621
+#: ../pidgin/gtkroomlist.c:617
 #: ../pidgin/plugins/gevolution/add_buddy_dialog.c:132
 #: ../pidgin/plugins/gevolution/assoc-buddy.c:123
 msgid "Name"
 msgstr "Nimi"
 
-#: ../finch/gntblist.c:401 ../finch/gntblist.c:821 ../pidgin/gtkblist.c:5748
+#: ../finch/gntblist.c:410 ../finch/gntblist.c:845 ../pidgin/gtkblist.c:5800
 msgid "Add Chat"
 msgstr "Lisää ryhmäkeskustelu"
 
-#: ../finch/gntblist.c:402
+#: ../finch/gntblist.c:411
 msgid "You can edit more information from the context menu later."
 msgstr "Voit muokata lisää tietoja myöhemmin pikavalikosta."
 
-#: ../finch/gntblist.c:415 ../finch/gntblist.c:428
+#: ../finch/gntblist.c:424 ../finch/gntblist.c:437
 msgid "Error adding group"
 msgstr "Virhe lisättäessä ryhmää"
 
-#: ../finch/gntblist.c:416
+#: ../finch/gntblist.c:425
 msgid "You must give a name for the group to add."
 msgstr "Lisättävän ryhmän nimi on annettava."
 
-#: ../finch/gntblist.c:429
+#: ../finch/gntblist.c:438
 msgid "A group with the name already exists."
 msgstr "Valitun niminen ryhmä on jo olemassa"
 
-#: ../finch/gntblist.c:436 ../finch/gntblist.c:823
+#: ../finch/gntblist.c:445 ../finch/gntblist.c:847
 #: ../libpurple/protocols/sametime/sametime.c:5396
-#: ../libpurple/protocols/sametime/sametime.c:5484 ../pidgin/gtkblist.c:5859
+#: ../libpurple/protocols/sametime/sametime.c:5484 ../pidgin/gtkblist.c:5911
 msgid "Add Group"
 msgstr "Lisää ryhmä"
 
-#: ../finch/gntblist.c:436
+#: ../finch/gntblist.c:445
 msgid "Enter the name of the group"
 msgstr "Anna ryhmän nimi"
 
-#: ../finch/gntblist.c:769
+#: ../finch/gntblist.c:793
 msgid "Edit Chat"
 msgstr "Muokkaa ryhmäkeskustelua"
 
-#: ../finch/gntblist.c:769
+#: ../finch/gntblist.c:793
 msgid "Please Update the necessary fields."
 msgstr "Päivitä vaaditut kentät."
 
-#: ../finch/gntblist.c:770 ../finch/gntstatus.c:199
+#: ../finch/gntblist.c:794 ../finch/gntstatus.c:202
 msgid "Edit"
 msgstr "Muokkaa"
 
-#: ../finch/gntblist.c:786
+#: ../finch/gntblist.c:810
 msgid "Auto-join"
 msgstr "Liity automaattisesti"
 
-#: ../finch/gntblist.c:795
+#: ../finch/gntblist.c:819
 msgid "Edit Settings"
 msgstr "Muokkaa asetuksia"
 
-#: ../finch/gntblist.c:833 ../finch/gntconv.c:317 ../pidgin/gtkblist.c:276
-#: ../pidgin/gtkconv.c:681 ../pidgin/gtkdialogs.c:830
+#: ../finch/gntblist.c:855 ../pidgin/gtkutils.c:926
 msgid "Information"
 msgstr "Tiedot"
 
-#: ../finch/gntblist.c:833 ../finch/gntconv.c:317 ../pidgin/gtkblist.c:276
-#: ../pidgin/gtkconv.c:681 ../pidgin/gtkdialogs.c:830
+#: ../finch/gntblist.c:855 ../pidgin/gtkutils.c:926
 msgid "Retrieving..."
 msgstr "Haetaan..."
 
-#: ../finch/gntblist.c:866 ../finch/gntconv.c:418
+#: ../finch/gntblist.c:895 ../finch/gntconv.c:407
 #: ../libpurple/protocols/silc/chat.c:899
 #: ../libpurple/protocols/silc10/chat.c:883
 msgid "Get Info"
 msgstr "Hae tiedot"
 
-#: ../finch/gntblist.c:870
+#: ../finch/gntblist.c:899
 msgid "Add Buddy Pounce"
 msgstr "Lisää tuttavailmoitin"
 
 #. if (q_bud && is_online(q_bud->status)) {
-#: ../finch/gntblist.c:877 ../finch/gntconv.c:430
+#: ../finch/gntblist.c:906 ../finch/gntconv.c:419
 #: ../libpurple/protocols/jabber/si.c:868
-#: ../libpurple/protocols/oscar/oscar.c:636 ../libpurple/protocols/qq/qq.c:585
-#: ../pidgin/gtkconv.c:1634
+#: ../libpurple/protocols/oscar/oscar.c:654 ../libpurple/protocols/qq/qq.c:585
+#: ../pidgin/gtkconv.c:1599
 msgid "Send File"
 msgstr "Lähetä tiedosto"
 
-#: ../finch/gntblist.c:881
+#: ../finch/gntblist.c:910
 msgid "View Log"
 msgstr "Näytä loki"
 
-#: ../finch/gntblist.c:962
+#: ../finch/gntblist.c:991
 #, c-format
 msgid "Please enter the new name for %s"
 msgstr "Anna uusi nimi kohteelle %s"
 
-#: ../finch/gntblist.c:964 ../finch/gntblist.c:1211
+#: ../finch/gntblist.c:993 ../finch/gntblist.c:1240
 msgid "Rename"
 msgstr "Nimeä uudelleen"
 
-#: ../finch/gntblist.c:964
+#: ../finch/gntblist.c:993
 msgid "Set Alias"
 msgstr "Aseta lempinimi"
 
-#: ../finch/gntblist.c:965
+#: ../finch/gntblist.c:994
 msgid "Enter empty string to reset the name."
 msgstr "Syötä tyhjä merkkijono palauttaaksesi oletusnimen."
 
-#: ../finch/gntblist.c:1041
+#: ../finch/gntblist.c:1070
 msgid "Removing this contact will also remove all the buddies in the contact"
 msgstr "Kontaktin poistaminen poistaa myös kaikki kontaktissa olevat tuttavat"
 
-#: ../finch/gntblist.c:1049
+#: ../finch/gntblist.c:1078
 msgid "Removing this group will also remove all the buddies in the group"
 msgstr "Ryhmän poistaminen poistaa myös kaikki ryhmässä olevat tuttavat"
 
-#: ../finch/gntblist.c:1054
+#: ../finch/gntblist.c:1083
 #, c-format
 msgid "Are you sure you want to remove %s?"
 msgstr "Haluatko varmasti poistaa %s:n?"
 
 #. XXX: anything to do with the returned ui-handle?
-#: ../finch/gntblist.c:1057
+#: ../finch/gntblist.c:1086
 msgid "Confirm Remove"
 msgstr "Vahvista poistaminen"
 
-#: ../finch/gntblist.c:1062 ../finch/gntblist.c:1213 ../finch/gntft.c:223
-#: ../pidgin/gtkconv.c:1683 ../pidgin/gtkrequest.c:275
-#: ../pidgin/gtkstatusbox.c:261
+#: ../finch/gntblist.c:1091 ../finch/gntblist.c:1242 ../finch/gntft.c:224
+#: ../pidgin/gtkconv.c:1648 ../pidgin/gtkrequest.c:275
+#: ../pidgin/gtkstatusbox.c:263
 msgid "Remove"
 msgstr "Poista"
 
 #. Buddy List
-#: ../finch/gntblist.c:1187 ../finch/gntblist.c:2237 ../finch/gntprefs.c:240
-#: ../finch/gntui.c:77 ../pidgin/gtkblist.c:4227
+#: ../finch/gntblist.c:1216 ../finch/gntblist.c:2283 ../finch/gntprefs.c:257
+#: ../finch/gntui.c:78 ../pidgin/gtkblist.c:4256
 #: ../pidgin/plugins/win32/winprefs/winprefs.c:330
 msgid "Buddy List"
 msgstr "Tuttavalista"
 
-#: ../finch/gntblist.c:1218
+#: ../finch/gntblist.c:1247
 msgid "Place tagged"
 msgstr "Paikka merkitty"
 
-#: ../finch/gntblist.c:1223
+#: ../finch/gntblist.c:1252
 msgid "Toggle Tag"
 msgstr "Merkitse/poista merkintä"
 
 #. General
-#: ../finch/gntblist.c:1256 ../libpurple/protocols/gg/gg.c:632
-#: ../libpurple/protocols/gg/gg.c:1045 ../libpurple/protocols/gg/gg.c:1120
-#: ../libpurple/protocols/gg/gg.c:2204
+#: ../finch/gntblist.c:1287 ../libpurple/protocols/gg/gg.c:632
+#: ../libpurple/protocols/gg/gg.c:1045 ../libpurple/protocols/gg/gg.c:1118
+#: ../libpurple/protocols/gg/gg.c:2202
 #: ../libpurple/protocols/jabber/buddy.c:274
-#: ../libpurple/protocols/jabber/buddy.c:818
-#: ../libpurple/protocols/jabber/buddy.c:1589
-#: ../libpurple/protocols/jabber/buddy.c:1771
+#: ../libpurple/protocols/jabber/buddy.c:856
+#: ../libpurple/protocols/jabber/buddy.c:1627
+#: ../libpurple/protocols/jabber/buddy.c:1809
 #: ../libpurple/protocols/jabber/jabber.c:823
 #: ../libpurple/protocols/msn/msn.c:1372 ../libpurple/protocols/msn/msn.c:1556
 #: ../libpurple/protocols/qq/buddy_info.c:43
@@ -520,25 +529,29 @@
 #: ../libpurple/protocols/silc10/ops.c:1036
 #: ../libpurple/protocols/silc10/ops.c:1179
 #: ../libpurple/protocols/silc10/ops.c:1328
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1042 ../pidgin/gtkblist.c:2989
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1042 ../pidgin/gtkblist.c:2998
 msgid "Nickname"
 msgstr "Kutsumanimi"
 
 #. Idle stuff
-#: ../finch/gntblist.c:1276 ../finch/gntprefs.c:243
+#: ../finch/gntblist.c:1307 ../finch/gntprefs.c:260
 #: ../libpurple/protocols/bonjour/bonjour.c:314
-#: ../libpurple/protocols/jabber/buddy.c:643
-#: ../libpurple/protocols/jabber/buddy.c:683
+#: ../libpurple/protocols/jabber/buddy.c:647
+#: ../libpurple/protocols/jabber/buddy.c:687
 #: ../libpurple/protocols/msn/msn.c:516 ../libpurple/protocols/msn/state.c:32
 #: ../libpurple/protocols/novell/novell.c:2825
-#: ../libpurple/protocols/oscar/oscar.c:2868
+#: ../libpurple/protocols/oscar/oscar.c:2888
 #: ../libpurple/protocols/yahoo/yahoo.c:2915
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:686 ../pidgin/gtkblist.c:3016
-#: ../pidgin/gtkblist.c:3409 ../pidgin/gtkprefs.c:1848
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:686 ../pidgin/gtkblist.c:3026
+#: ../pidgin/gtkblist.c:3435 ../pidgin/gtkprefs.c:1918
 msgid "Idle"
 msgstr "Jouten"
 
-#: ../finch/gntblist.c:1365
+#: ../finch/gntblist.c:1320
+msgid "On Mobile"
+msgstr "Liikkeellä"
+
+#: ../finch/gntblist.c:1400
 #, c-format
 msgid ""
 "Online: %d\n"
@@ -547,12 +560,12 @@
 "Kirjautuneena: %d\n"
 "Yhteensä: %d"
 
-#: ../finch/gntblist.c:1374
+#: ../finch/gntblist.c:1409
 #, c-format
 msgid "Account: %s (%s)"
 msgstr "Tili: %s (%s)"
 
-#: ../finch/gntblist.c:1386
+#: ../finch/gntblist.c:1421
 #, c-format
 msgid ""
 "\n"
@@ -561,50 +574,50 @@
 "\n"
 "Viimeksi nähty: %s sitten"
 
-#: ../finch/gntblist.c:1651 ../pidgin/gtkdocklet.c:470
-#: ../pidgin/gtkstatusbox.c:1064
+#: ../finch/gntblist.c:1687 ../pidgin/gtkdocklet.c:470
+#: ../pidgin/gtkstatusbox.c:1070
 msgid "New..."
 msgstr "Uusi..."
 
-#: ../finch/gntblist.c:1658 ../pidgin/gtkdocklet.c:471
-#: ../pidgin/gtkstatusbox.c:1065
+#: ../finch/gntblist.c:1694 ../pidgin/gtkdocklet.c:471
+#: ../pidgin/gtkstatusbox.c:1071
 msgid "Saved..."
 msgstr "Tallennettu..."
 
-#: ../finch/gntblist.c:2033 ../finch/gntplugin.c:244 ../finch/gntui.c:81
+#: ../finch/gntblist.c:2072 ../finch/gntplugin.c:254 ../finch/gntui.c:82
 #: ../pidgin/gtkdocklet.c:523 ../pidgin/gtkplugin.c:530
 msgid "Plugins"
 msgstr "Liitännäiset"
 
-#: ../finch/gntblist.c:2141 ../pidgin/gtkdialogs.c:705
-#: ../pidgin/gtkdialogs.c:852 ../pidgin/gtkdialogs.c:933
+#: ../finch/gntblist.c:2179 ../pidgin/gtkdialogs.c:708
+#: ../pidgin/gtkdialogs.c:846 ../pidgin/gtkdialogs.c:927
 msgid "_Name"
 msgstr "_Nimi"
 
-#: ../finch/gntblist.c:2146 ../pidgin/gtkdialogs.c:710
-#: ../pidgin/gtkdialogs.c:857 ../pidgin/gtkdialogs.c:938
+#: ../finch/gntblist.c:2184 ../pidgin/gtkdialogs.c:713
+#: ../pidgin/gtkdialogs.c:851 ../pidgin/gtkdialogs.c:932
 msgid "_Account"
 msgstr "_Käyttäjätili"
 
-#: ../finch/gntblist.c:2154 ../pidgin/gtkdialogs.c:718
+#: ../finch/gntblist.c:2192 ../pidgin/gtkdialogs.c:721
 msgid "New Instant Message"
 msgstr "Uusi pikaviesti"
 
-#: ../finch/gntblist.c:2156 ../pidgin/gtkdialogs.c:720
+#: ../finch/gntblist.c:2194 ../pidgin/gtkdialogs.c:723
 msgid ""
 "Please enter the screen name or alias of the person you would like to IM."
 msgstr ""
 "Syötä sen henkilön näyttönimi tai lempinimi, jolle haluat lähettää "
 "pikaviestin."
 
-#: ../finch/gntblist.c:2159 ../finch/gntnotify.c:77 ../libpurple/account.c:983
+#: ../finch/gntblist.c:2197 ../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:1389
+#: ../libpurple/protocols/jabber/jabber.c:1383
 #: ../libpurple/protocols/jabber/xdata.c:336
 #: ../libpurple/protocols/msn/msn.c:258 ../libpurple/protocols/msn/msn.c:275
 #: ../libpurple/protocols/msn/msn.c:292 ../libpurple/protocols/msn/msn.c:309
-#: ../libpurple/protocols/oscar/oscar.c:6045
+#: ../libpurple/protocols/oscar/oscar.c:6072
 #: ../libpurple/protocols/silc/buddy.c:454
 #: ../libpurple/protocols/silc/buddy.c:1190
 #: ../libpurple/protocols/silc/chat.c:447
@@ -623,48 +636,52 @@
 #: ../libpurple/protocols/silc10/silc.c:735
 #: ../libpurple/protocols/yahoo/yahoo.c:988
 #: ../libpurple/protocols/yahoo/yahoo.c:3247
-#: ../libpurple/protocols/yahoo/yahoo.c:3258 ../pidgin/gtkblist.c:3982
-#: ../pidgin/gtkdialogs.c:723 ../pidgin/gtkdialogs.c:870
-#: ../pidgin/gtkdialogs.c:962 ../pidgin/gtkrequest.c:269
+#: ../libpurple/protocols/yahoo/yahoo.c:3258 ../pidgin/gtkblist.c:4013
+#: ../pidgin/gtkdialogs.c:726 ../pidgin/gtkdialogs.c:864
+#: ../pidgin/gtkdialogs.c:956 ../pidgin/gtkrequest.c:269
 msgid "OK"
 msgstr "OK"
 
 #. Create the "Options" frame.
-#: ../finch/gntblist.c:2179 ../finch/gntpounce.c:444 ../pidgin/gtkpounce.c:778
+#: ../finch/gntblist.c:2217 ../finch/gntpounce.c:444 ../pidgin/gtkpounce.c:791
 msgid "Options"
 msgstr "Valinnat"
 
-#: ../finch/gntblist.c:2185
+#: ../finch/gntblist.c:2223
 msgid "Send IM..."
 msgstr "Lähetä pikaviesti..."
 
-#: ../finch/gntblist.c:2189
+#: ../finch/gntblist.c:2227
+msgid "Show empty groups"
+msgstr "Näytä tyhjät ryhmät"
+
+#: ../finch/gntblist.c:2233
 msgid "Show offline buddies"
 msgstr "Näytä poissa linjoilta olevat tuttavat"
 
-#: ../finch/gntblist.c:2195
+#: ../finch/gntblist.c:2239
 msgid "Sort by status"
 msgstr "Lajittele tilan mukaan"
 
-#: ../finch/gntblist.c:2199
+#: ../finch/gntblist.c:2243
 msgid "Sort alphabetically"
 msgstr "Lajittele aakkosittain"
 
-#: ../finch/gntblist.c:2203
+#: ../finch/gntblist.c:2247
 msgid "Sort by log size"
 msgstr "Lajittele lokin koon mukaan"
 
-#: ../finch/gntconn.c:109
+#: ../finch/gntconn.c:110
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../finch/gntconn.c:112
+#: ../finch/gntconn.c:113
 #, c-format
 msgid "%s disconnected."
 msgstr "Yhteys katkennut kohteeseen %s."
 
-#: ../finch/gntconn.c:113
+#: ../finch/gntconn.c:114
 #, c-format
 msgid ""
 "%s\n"
@@ -677,46 +694,42 @@
 "Finch ei yritä uudelleenyhdistää käyttäjätiliä kunnes korjaat virheen ja "
 "otat tilin uudelleen käyttöön."
 
-#: ../finch/gntconv.c:116
+#: ../finch/gntconv.c:117
 msgid "No such command."
 msgstr "Sellaista komentoa ei ole."
 
-#: ../finch/gntconv.c:120 ../pidgin/gtkconv.c:512
+#: ../finch/gntconv.c:121 ../pidgin/gtkconv.c:492
 msgid "Syntax Error:  You typed the wrong number of arguments to that command."
 msgstr ""
 "Syntaksivirhe: Syötit väärän määrän argumentteja kyseiselle komennolle."
 
-#: ../finch/gntconv.c:125 ../pidgin/gtkconv.c:517
+#: ../finch/gntconv.c:126 ../pidgin/gtkconv.c:498
 msgid "Your command failed for an unknown reason."
 msgstr "Komento epäonnistui tuntemattomasta syystä."
 
-#: ../finch/gntconv.c:130 ../pidgin/gtkconv.c:523
+#: ../finch/gntconv.c:131 ../pidgin/gtkconv.c:505
 msgid "That command only works in chats, not IMs."
 msgstr "Komento toimii vain ryhmäkeskusteluissa, ei pikaviesteissä."
 
-#: ../finch/gntconv.c:133 ../pidgin/gtkconv.c:526
+#: ../finch/gntconv.c:134 ../pidgin/gtkconv.c:508
 msgid "That command only works in IMs, not chats."
 msgstr "Komento toimii vain pikaviesteissä, ei ryhmäkeskusteluissa."
 
-#: ../finch/gntconv.c:137 ../pidgin/gtkconv.c:530
+#: ../finch/gntconv.c:138 ../pidgin/gtkconv.c:513
 msgid "That command doesn't work on this protocol."
 msgstr "Tämä komento ei toimi tälle yhteyskäytännölle."
 
-#: ../finch/gntconv.c:144
-msgid "Commands are not supported yet. Message was NOT sent."
-msgstr "Komentoja ei tueta vielä. Viestiä EI lähetetty."
-
-#: ../finch/gntconv.c:230
+#: ../finch/gntconv.c:224
 #, c-format
 msgid "%s (%s -- %s)"
 msgstr "%s (%s -- %s)"
 
-#: ../finch/gntconv.c:253
+#: ../finch/gntconv.c:247
 #, c-format
 msgid "%s [%s]"
 msgstr "%s [%s]"
 
-#: ../finch/gntconv.c:258 ../finch/gntconv.c:619
+#: ../finch/gntconv.c:252 ../finch/gntconv.c:647
 #, c-format
 msgid ""
 "\n"
@@ -725,48 +738,48 @@
 "\n"
 "%s kirjoittaa..."
 
-#: ../finch/gntconv.c:277
+#: ../finch/gntconv.c:271
 msgid "You have left this chat."
 msgstr "Olet poistunut tästä keskustelusta."
 
-#: ../finch/gntconv.c:353
+#: ../finch/gntconv.c:342
 msgid "Send To"
 msgstr "Lähetä käyttäjälle"
 
-#: ../finch/gntconv.c:397
+#: ../finch/gntconv.c:386
 msgid "Conversation"
 msgstr "Keskustelu"
 
-#: ../finch/gntconv.c:403
+#: ../finch/gntconv.c:392
 msgid "Clear Scrollback"
 msgstr "Tyhjennä takaisinvieritys"
 
-#: ../finch/gntconv.c:407 ../finch/gntprefs.c:178
+#: ../finch/gntconv.c:396 ../finch/gntprefs.c:190
 msgid "Show Timestamps"
 msgstr "Näytä aikaleimat"
 
-#: ../finch/gntconv.c:423
+#: ../finch/gntconv.c:412
 msgid "Add Buddy Pounce..."
 msgstr "Lisää tuttavailmoitin..."
 
-#: ../finch/gntconv.c:586
+#: ../finch/gntconv.c:614
 msgid "<AUTO-REPLY> "
 msgstr "<AUTOMAATTIVASTAUS> "
 
 #. Print the list of users in the room
-#: ../finch/gntconv.c:702
+#: ../finch/gntconv.c:735
 msgid "List of users:\n"
 msgstr "Luettelo käyttäjistä:\n"
 
-#: ../finch/gntconv.c:847 ../pidgin/gtkconv.c:393
+#: ../finch/gntconv.c:880 ../pidgin/gtkconv.c:335
 msgid "Supported debug options are:  version"
 msgstr "Tuetut vianjäljitysvalinnat ovat: versio"
 
-#: ../finch/gntconv.c:882 ../pidgin/gtkconv.c:429
+#: ../finch/gntconv.c:915 ../pidgin/gtkconv.c:384
 msgid "No such command (in this context)."
 msgstr "Komento ei saatavilla (tässä kontekstissa)."
 
-#: ../finch/gntconv.c:885 ../pidgin/gtkconv.c:432
+#: ../finch/gntconv.c:918 ../pidgin/gtkconv.c:387
 msgid ""
 "Use \"/help &lt;command&gt;\" for help on a specific command.\n"
 "The following commands are available in this context:\n"
@@ -774,7 +787,7 @@
 "Kirjoita \"/help &lt;komento&gt;\" saadaksesi ohjeen tietystä komennosta.\n"
 "Seuraavat komennot ovat saatavilla tässä kontekstissa:\n"
 
-#: ../finch/gntconv.c:943 ../pidgin/gtkconv.c:7171
+#: ../finch/gntconv.c:976 ../pidgin/gtkconv.c:7198
 msgid ""
 "say &lt;message&gt;:  Send a message normally as if you weren't using a "
 "command."
@@ -782,56 +795,56 @@
 "say &lt;viesti&gt;: Lähetä viesti normaalisti, niin kuin et olisi "
 "käyttämässä komentoa."
 
-#: ../finch/gntconv.c:946 ../pidgin/gtkconv.c:7174
+#: ../finch/gntconv.c:979 ../pidgin/gtkconv.c:7201
 msgid "me &lt;action&gt;:  Send an IRC style action to a buddy or chat."
 msgstr ""
 "me &lt;toiminta&gt;: Lähetä IRC-tyylinen toiminta tuttavalle tai "
 "keskusteluun."
 
-#: ../finch/gntconv.c:949 ../pidgin/gtkconv.c:7177
+#: ../finch/gntconv.c:982 ../pidgin/gtkconv.c:7204
 msgid ""
 "debug &lt;option&gt;:  Send various debug information to the current "
 "conversation."
 msgstr ""
 "debug &lt;valinta&gt;: Lähetä eri debug-tietoja senhetkiseen keskusteluun."
 
-#: ../finch/gntconv.c:952 ../pidgin/gtkconv.c:7180
+#: ../finch/gntconv.c:985 ../pidgin/gtkconv.c:7207
 msgid "clear: Clears the conversation scrollback."
 msgstr "clear: Tyhjentää keskustelun"
 
-#: ../finch/gntconv.c:955 ../pidgin/gtkconv.c:7183
+#: ../finch/gntconv.c:988 ../pidgin/gtkconv.c:7213
 msgid "help &lt;command&gt;:  Help on a specific command."
 msgstr "help &lt;komento&gt;: Ohje tietylle komennolle."
 
-#: ../finch/gntconv.c:958
+#: ../finch/gntconv.c:991
 msgid "users:  Show the list of users in the chat."
 msgstr "users:  Näytä luettelo keskustelussa olevista käyttäjistä"
 
-#: ../finch/gntconv.c:963
+#: ../finch/gntconv.c:996
 msgid "plugins: Show the plugins window."
 msgstr "plugins: Näytä liitännäiset-ikkuna."
 
-#: ../finch/gntconv.c:966
+#: ../finch/gntconv.c:999
 msgid "buddylist: Show the buddylist."
 msgstr "buddylist: Näytä tuttavaluettelo."
 
-#: ../finch/gntconv.c:969
+#: ../finch/gntconv.c:1002
 msgid "accounts: Show the accounts window."
 msgstr "accounts: Näytä käyttäjätilit-ikkuna."
 
-#: ../finch/gntconv.c:972
+#: ../finch/gntconv.c:1005
 msgid "debugwin: Show the debug window."
 msgstr "debugwin: Näytä virheenjäljitysikkuna."
 
-#: ../finch/gntconv.c:975
+#: ../finch/gntconv.c:1008
 msgid "prefs: Show the preference window."
 msgstr "prefs: Näytä asetukset-ikkuna."
 
-#: ../finch/gntconv.c:978
+#: ../finch/gntconv.c:1011
 msgid "statuses: Show the savedstatuses window."
 msgstr "statuses: Näytä tallennetut tilat -ikkuna"
 
-#: ../finch/gntdebug.c:230 ../finch/gntui.c:79 ../pidgin/gtkdebug.c:694
+#: ../finch/gntdebug.c:234 ../finch/gntui.c:80 ../pidgin/gtkdebug.c:694
 msgid "Debug Window"
 msgstr "Virheenjäljitysikkuna"
 
@@ -839,15 +852,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:251 ../pidgin/gtkdebug.c:753
+#: ../finch/gntdebug.c:255 ../pidgin/gtkdebug.c:753
 msgid "Clear"
 msgstr "Tyhjennä"
 
-#: ../finch/gntdebug.c:257
+#: ../finch/gntdebug.c:261
 msgid "Filter: "
 msgstr "Suodatin: "
 
-#: ../finch/gntdebug.c:261 ../pidgin/gtkdebug.c:762
+#: ../finch/gntdebug.c:265 ../pidgin/gtkdebug.c:762
 msgid "Pause"
 msgstr "Tauko"
 
@@ -856,176 +869,177 @@
 msgid "File Transfers - %d%% of %d files"
 msgstr "Tiedostonsiirrrot - tiedosto %d%% / %d"
 
-#: ../finch/gntft.c:122 ../finch/gntft.c:194 ../finch/gntui.c:80
-#: ../pidgin/gtkft.c:233 ../pidgin/gtkft.c:763
+#. Create the window.
+#: ../finch/gntft.c:122 ../finch/gntft.c:195 ../finch/gntui.c:81
+#: ../pidgin/gtkft.c:233 ../pidgin/gtkft.c:761
 msgid "File Transfers"
 msgstr "Tiedostonsiirrot"
 
-#: ../finch/gntft.c:197 ../pidgin/gtkft.c:644
+#: ../finch/gntft.c:198 ../pidgin/gtkft.c:644
 msgid "Progress"
 msgstr "Valmiina"
 
-#: ../finch/gntft.c:197 ../pidgin/gtkft.c:651
+#: ../finch/gntft.c:198 ../pidgin/gtkft.c:651
 msgid "Filename"
 msgstr "Tiedoston nimi"
 
-#: ../finch/gntft.c:197 ../pidgin/gtkft.c:658
+#: ../finch/gntft.c:198 ../pidgin/gtkft.c:658
 msgid "Size"
 msgstr "Koko"
 
-#: ../finch/gntft.c:197
+#: ../finch/gntft.c:198
 msgid "Speed"
 msgstr "Nopeus"
 
-#: ../finch/gntft.c:197 ../pidgin/gtkft.c:665
+#: ../finch/gntft.c:198 ../pidgin/gtkft.c:665
 msgid "Remaining"
 msgstr "Jäljellä"
 
 #. XXX: Use of ggp_str_to_uin() is an ugly hack!
-#: ../finch/gntft.c:197 ../finch/gntstatus.c:537 ../finch/gntstatus.c:566
+#: ../finch/gntft.c:198 ../finch/gntstatus.c:540 ../finch/gntstatus.c:569
 #: ../libpurple/protocols/bonjour/bonjour.c:318
-#: ../libpurple/protocols/gg/gg.c:1034 ../libpurple/protocols/gg/gg.c:1573
-#: ../libpurple/protocols/gg/gg.c:1581
-#: ../libpurple/protocols/jabber/buddy.c:634
+#: ../libpurple/protocols/gg/gg.c:1034 ../libpurple/protocols/gg/gg.c:1571
+#: ../libpurple/protocols/gg/gg.c:1579
 #: ../libpurple/protocols/jabber/buddy.c:638
-#: ../libpurple/protocols/jabber/buddy.c:673
-#: ../libpurple/protocols/jabber/jabber.c:1220
+#: ../libpurple/protocols/jabber/buddy.c:642
+#: ../libpurple/protocols/jabber/buddy.c:677
+#: ../libpurple/protocols/jabber/jabber.c:1212
 #: ../libpurple/protocols/msn/msn.c:515
 #: ../libpurple/protocols/novell/novell.c:2835
-#: ../libpurple/protocols/oscar/oscar.c:803
-#: ../libpurple/protocols/oscar/oscar.c:808
-#: ../libpurple/protocols/oscar/oscar.c:810
-#: ../libpurple/protocols/oscar/oscar.c:2657
-#: ../libpurple/protocols/oscar/oscar.c:3768
+#: ../libpurple/protocols/oscar/oscar.c:821
+#: ../libpurple/protocols/oscar/oscar.c:826
+#: ../libpurple/protocols/oscar/oscar.c:828
+#: ../libpurple/protocols/oscar/oscar.c:2676
+#: ../libpurple/protocols/oscar/oscar.c:3794
 #: ../libpurple/protocols/sametime/sametime.c:3263
 #: ../libpurple/protocols/sametime/sametime.c:4150
-#: ../libpurple/protocols/yahoo/yahoo.c:3066 ../pidgin/gtkblist.c:3060
-#: ../pidgin/gtkblist.c:3073 ../pidgin/gtkblist.c:3075
-#: ../pidgin/gtksavedstatuses.c:943 ../pidgin/gtksavedstatuses.c:1090
+#: ../libpurple/protocols/yahoo/yahoo.c:3066 ../pidgin/gtkblist.c:3070
+#: ../pidgin/gtkblist.c:3083 ../pidgin/gtkblist.c:3085
+#: ../pidgin/gtksavedstatuses.c:998 ../pidgin/gtksavedstatuses.c:1143
 msgid "Status"
 msgstr "Tila"
 
-#: ../finch/gntft.c:207
+#: ../finch/gntft.c:208
 msgid "Close this window when all transfers finish"
 msgstr "Sulje tämä ikkuna kun kaikki siirrot ovat valmiita"
 
-#: ../finch/gntft.c:214
+#: ../finch/gntft.c:215
 msgid "Clear finished transfers"
 msgstr "Poista valmiit siirrot"
 
-#: ../finch/gntft.c:228
+#: ../finch/gntft.c:229
 msgid "Stop"
 msgstr "Pysäytä"
 
 #. Close button
-#: ../finch/gntft.c:233 ../finch/gntnotify.c:179 ../finch/gntplugin.c:205
-#: ../finch/gntplugin.c:291 ../finch/gntpounce.c:722 ../finch/gntstatus.c:209
+#: ../finch/gntft.c:234 ../finch/gntnotify.c:181 ../finch/gntplugin.c:209
+#: ../finch/gntplugin.c:309 ../finch/gntpounce.c:723 ../finch/gntstatus.c:212
 #: ../libpurple/protocols/msn/msn.c:375 ../libpurple/protocols/silc/util.c:382
-#: ../libpurple/protocols/silc10/util.c:377 ../pidgin/gtkaccount.c:2487
+#: ../libpurple/protocols/silc10/util.c:377 ../pidgin/gtkaccount.c:2474
 #: ../pidgin/gtkrequest.c:272
 msgid "Close"
 msgstr "Sulje"
 
-#: ../finch/gntft.c:299 ../pidgin/gtkft.c:168 ../pidgin/gtkft.c:975
+#: ../finch/gntft.c:302 ../pidgin/gtkft.c:168 ../pidgin/gtkft.c:972
 msgid "Waiting for transfer to begin"
 msgstr "Odotetaan lähetyksen alkamista"
 
-#: ../finch/gntft.c:366 ../pidgin/gtkft.c:165 ../pidgin/gtkft.c:1056
+#: ../finch/gntft.c:369 ../pidgin/gtkft.c:165 ../pidgin/gtkft.c:1053
 msgid "Canceled"
 msgstr "Peruutettu"
 
-#: ../finch/gntft.c:368 ../pidgin/gtkft.c:1058
+#: ../finch/gntft.c:371 ../pidgin/gtkft.c:1055
 msgid "Failed"
 msgstr "Epäonnistunut"
 
-#: ../finch/gntft.c:414 ../pidgin/gtkft.c:133
-#, c-format
-msgid "%.2f KB/s"
-msgstr "%.2f kt/s"
-
-#: ../finch/gntft.c:425 ../finch/gntft.c:426 ../pidgin/gtkft.c:162
-#: ../pidgin/gtkft.c:1118
+#: ../finch/gntft.c:417 ../pidgin/gtkft.c:133
+#, c-format
+msgid "%.2f KiB/s"
+msgstr "%.2f KiB/s"
+
+#: ../finch/gntft.c:428 ../finch/gntft.c:429 ../pidgin/gtkft.c:162
+#: ../pidgin/gtkft.c:1115
 msgid "Finished"
 msgstr "Valmis"
 
-#: ../finch/gntft.c:428 ../libpurple/protocols/msn/session.c:347
+#: ../finch/gntft.c:431 ../libpurple/protocols/msn/session.c:347
 msgid "Transferring"
 msgstr "Siirtää"
 
-#: ../finch/gntnotify.c:162
+#: ../finch/gntnotify.c:164
 msgid "Emails"
 msgstr "Sähköpostit"
 
-#: ../finch/gntnotify.c:168 ../finch/gntnotify.c:222
+#: ../finch/gntnotify.c:170 ../finch/gntnotify.c:224
 msgid "You have mail!"
 msgstr "Sinulle on postia."
 
-#: ../finch/gntnotify.c:171 ../libpurple/protocols/jabber/jabber.c:1180
-msgid "From"
+#: ../finch/gntnotify.c:173 ../pidgin/gtknotify.c:489
+msgid "Sender"
 msgstr "Lähettäjä"
 
-#: ../finch/gntnotify.c:171 ../pidgin/gtknotify.c:490
+#: ../finch/gntnotify.c:173 ../pidgin/gtknotify.c:496
 msgid "Subject"
 msgstr "Aihe"
 
-#: ../finch/gntnotify.c:198
+#: ../finch/gntnotify.c:200
 #, c-format
 msgid "%s (%s) has %d new message."
 msgid_plural "%s (%s) has %d new messages."
 msgstr[0] "%s (%s): %d uusi viesti."
 msgstr[1] "%s (%s): %d uutta viestiä."
 
-#: ../finch/gntnotify.c:222 ../pidgin/gtknotify.c:329
+#: ../finch/gntnotify.c:224 ../pidgin/gtknotify.c:335
 msgid "New Mail"
 msgstr "Uusi sähköposti"
 
-#: ../finch/gntnotify.c:287 ../pidgin/gtknotify.c:906
+#: ../finch/gntnotify.c:289 ../pidgin/gtknotify.c:916
 #, c-format
 msgid "Info for %s"
 msgstr "%s tiedot"
 
-#: ../finch/gntnotify.c:288 ../libpurple/protocols/toc/toc.c:476
-#: ../pidgin/gtknotify.c:907
+#: ../finch/gntnotify.c:290 ../libpurple/protocols/toc/toc.c:476
+#: ../pidgin/gtknotify.c:917
 msgid "Buddy Information"
 msgstr "Tuttavan tiedot"
 
-#: ../finch/gntnotify.c:366
+#: ../finch/gntnotify.c:376
 msgid "Continue"
 msgstr "Jatka"
 
-#: ../finch/gntnotify.c:372 ../pidgin/gtkconv.c:1662 ../pidgin/gtkdebug.c:834
+#: ../finch/gntnotify.c:382 ../pidgin/gtkconv.c:1627 ../pidgin/gtkdebug.c:834
 msgid "Info"
 msgstr "Tiedot"
 
-#: ../finch/gntnotify.c:375 ../pidgin/gtkconv.c:1623
+#: ../finch/gntnotify.c:385 ../pidgin/gtkconv.c:1588
 msgid "IM"
 msgstr "Pikaviesti"
 
-#: ../finch/gntnotify.c:378
+#: ../finch/gntnotify.c:388
 msgid "Join"
 msgstr "Liity"
 
-#: ../finch/gntnotify.c:381 ../libpurple/protocols/sametime/sametime.c:3473
+#: ../finch/gntnotify.c:391 ../libpurple/protocols/sametime/sametime.c:3473
 msgid "Invite"
 msgstr "Kutsu"
 
-#: ../finch/gntnotify.c:384
+#: ../finch/gntnotify.c:394
 msgid "(none)"
 msgstr "(ei mitään)"
 
-#: ../finch/gntplugin.c:73 ../finch/gntplugin.c:82
+#: ../finch/gntplugin.c:74 ../finch/gntplugin.c:83
 msgid "ERROR"
 msgstr "VIRHE"
 
-#: ../finch/gntplugin.c:73
+#: ../finch/gntplugin.c:74
 msgid "loading plugin failed"
 msgstr "liitännäisen lataus epäonnistui"
 
-#: ../finch/gntplugin.c:82
+#: ../finch/gntplugin.c:83
 msgid "unloading plugin failed"
 msgstr "liitännäisen poistaminen käytöstä epäonnistui"
 
-#: ../finch/gntplugin.c:124
+#: ../finch/gntplugin.c:128
 #, c-format
 msgid ""
 "Name: %s\n"
@@ -1042,38 +1056,44 @@
 "Sivusto: %s\n"
 "Tiedostonimi: %s\n"
 
-#: ../finch/gntplugin.c:182
+#: ../finch/gntplugin.c:186
 msgid "Plugin need to be loaded before you can configure it."
 msgstr ""
 "Liitännäinen tulee olla käytössä ennen kuin sen asetuksia voidaan muuttaa."
 
-#: ../finch/gntplugin.c:226
+#: ../finch/gntplugin.c:234
 msgid "No configuration options for this plugin."
 msgstr "Tälle liitännäiselle ei ole asetuksia."
 
-#: ../finch/gntplugin.c:249
+#: ../finch/gntplugin.c:259
 msgid "You can (un)load plugins from the following list."
 msgstr ""
 "Voit ottaa käyttöön/pois käytöstä liitännäisiä seuraavasta luettelosta."
 
-#: ../finch/gntplugin.c:296
+#: ../finch/gntplugin.c:314
 msgid "Configure Plugin"
 msgstr "Liitännäisen asetukset"
 
-#: ../finch/gntplugin.c:352 ../finch/gntplugin.c:359 ../finch/gntprefs.c:245
-#: ../finch/gntui.c:82 ../pidgin/gtkdocklet.c:524 ../pidgin/gtkprefs.c:1992
+#. copy the preferences to tmp values...
+#. * I liked "take affect immediately" Oh well :-(
+#. (that should have been "effect," right?)
+#. Back to instant-apply! I win!  BU-HAHAHA!
+#. Create the window
+#: ../finch/gntplugin.c:370 ../finch/gntplugin.c:377 ../finch/gntprefs.c:263
+#: ../finch/gntui.c:83 ../pidgin/gtkdocklet.c:524 ../pidgin/gtkprefs.c:2060
 msgid "Preferences"
 msgstr "Asetukset"
 
-#: ../finch/gntpounce.c:180 ../pidgin/gtkpounce.c:253
+#: ../finch/gntpounce.c:180 ../pidgin/gtkpounce.c:255
 msgid "Please enter a buddy to pounce."
 msgstr "Syötä ilmoitettava tuttava."
 
-#: ../finch/gntpounce.c:325 ../pidgin/gtkpounce.c:507
+#. Create the window.
+#: ../finch/gntpounce.c:325 ../pidgin/gtkpounce.c:516
 msgid "New Buddy Pounce"
 msgstr "Uusi tuttavailmoitin"
 
-#: ../finch/gntpounce.c:325 ../pidgin/gtkpounce.c:507
+#: ../finch/gntpounce.c:325 ../pidgin/gtkpounce.c:516
 msgid "Edit Buddy Pounce"
 msgstr "Muokkaa tuttavailmoitinta"
 
@@ -1082,7 +1102,7 @@
 msgstr "Kenestä ilmoitetaan"
 
 #. Account:
-#: ../finch/gntpounce.c:333 ../finch/gntstatus.c:446
+#: ../finch/gntpounce.c:333 ../finch/gntstatus.c:449
 msgid "Account:"
 msgstr "Käyttäjätili:"
 
@@ -1091,7 +1111,7 @@
 msgstr "Tuttavan nimi:"
 
 #. Create the "Pounce When Buddy..." frame.
-#: ../finch/gntpounce.c:371 ../pidgin/gtkpounce.c:577
+#: ../finch/gntpounce.c:371 ../pidgin/gtkpounce.c:586
 msgid "Pounce When Buddy..."
 msgstr "Ilmoita kun tuttava..."
 
@@ -1136,7 +1156,7 @@
 msgstr "lähettää viestin"
 
 #. Create the "Action" frame.
-#: ../finch/gntpounce.c:411 ../pidgin/gtkpounce.c:638
+#: ../finch/gntpounce.c:411 ../pidgin/gtkpounce.c:647
 msgid "Action"
 msgstr "Toiminto"
 
@@ -1164,188 +1184,204 @@
 msgid "Pounce only when my status is not available"
 msgstr "Ilmoita vain kun tilani on \"tavoittamattomissa\""
 
-#: ../finch/gntpounce.c:447 ../pidgin/gtkpounce.c:1282
+#: ../finch/gntpounce.c:447 ../pidgin/gtkpounce.c:1295
 msgid "Recurring"
 msgstr "Toistuva"
 
-#: ../finch/gntpounce.c:649 ../pidgin/gtkpounce.c:1097
+#: ../finch/gntpounce.c:649 ../pidgin/gtkpounce.c:1110
 #, c-format
 msgid "Are you sure you want to delete the pounce on %s for %s?"
 msgstr "Haluatko varmasti poistaa ilmoituksen %s käyttäjältä %s?"
 
-#: ../finch/gntpounce.c:682 ../finch/gntui.c:78 ../pidgin/gtkpounce.c:1329
+#: ../finch/gntpounce.c:683 ../finch/gntui.c:79 ../pidgin/gtkpounce.c:1339
 msgid "Buddy Pounces"
 msgstr "Tuttavailmoittimet"
 
-#: ../finch/gntpounce.c:794 ../pidgin/gtkpounce.c:1456
+#: ../finch/gntpounce.c:795 ../pidgin/gtkpounce.c:1466
 #, c-format
 msgid "%s has started typing to you (%s)"
 msgstr "%s alkoi kirjoittaa sinulle (%s)"
 
-#: ../finch/gntpounce.c:796 ../pidgin/gtkpounce.c:1458
+#: ../finch/gntpounce.c:797 ../pidgin/gtkpounce.c:1468
 #, c-format
 msgid "%s has paused while typing to you (%s)"
 msgstr "%s keskeytti kirjoittamisen sinulle (%s)"
 
-#: ../finch/gntpounce.c:798 ../pidgin/gtkpounce.c:1460
+#: ../finch/gntpounce.c:799 ../pidgin/gtkpounce.c:1470
 #, c-format
 msgid "%s has signed on (%s)"
 msgstr "%s on kirjautunut sisään (%s)"
 
-#: ../finch/gntpounce.c:800 ../pidgin/gtkpounce.c:1462
+#: ../finch/gntpounce.c:801 ../pidgin/gtkpounce.c:1472
 #, c-format
 msgid "%s has returned from being idle (%s)"
 msgstr "%s on palannut oltuaan jouten (%s)"
 
-#: ../finch/gntpounce.c:802 ../pidgin/gtkpounce.c:1464
+#: ../finch/gntpounce.c:803 ../pidgin/gtkpounce.c:1474
 #, c-format
 msgid "%s has returned from being away (%s)"
 msgstr "%s on palannut oltuaan poissa (%s)"
 
-#: ../finch/gntpounce.c:804 ../pidgin/gtkpounce.c:1466
+#: ../finch/gntpounce.c:805 ../pidgin/gtkpounce.c:1476
 #, c-format
 msgid "%s has stopped typing to you (%s)"
 msgstr "%s on lopettanut kirjoittamisen sinulle (%s)"
 
-#: ../finch/gntpounce.c:806 ../pidgin/gtkpounce.c:1468
+#: ../finch/gntpounce.c:807 ../pidgin/gtkpounce.c:1478
 #, c-format
 msgid "%s has signed off (%s)"
 msgstr "%s on kirjautunut ulos (%s)"
 
-#: ../finch/gntpounce.c:808 ../pidgin/gtkpounce.c:1470
+#: ../finch/gntpounce.c:809 ../pidgin/gtkpounce.c:1480
 #, c-format
 msgid "%s has become idle (%s)"
 msgstr "%s on jouten (%s)"
 
-#: ../finch/gntpounce.c:810 ../pidgin/gtkpounce.c:1472
+#: ../finch/gntpounce.c:811 ../pidgin/gtkpounce.c:1482
 #, c-format
 msgid "%s has gone away. (%s)"
 msgstr "%s on poissa. (%s)"
 
-#: ../finch/gntpounce.c:812 ../pidgin/gtkpounce.c:1474
+#: ../finch/gntpounce.c:813 ../pidgin/gtkpounce.c:1484
 #, c-format
 msgid "%s has sent you a message. (%s)"
 msgstr "%s on lähettämässä sinulle viestiä. (%s)"
 
-#: ../finch/gntpounce.c:813 ../pidgin/gtkpounce.c:1475
+#: ../finch/gntpounce.c:814 ../pidgin/gtkpounce.c:1485
 msgid "Unknown pounce event. Please report this!"
 msgstr "Tuntematon ilmoitinviesti. Raportoi tästä!"
 
-#: ../finch/gntprefs.c:79
+#: ../finch/gntprefs.c:91
 msgid "Based on keyboard use"
 msgstr "Perustuen näppäimistön käyttöön"
 
-#: ../finch/gntprefs.c:81 ../pidgin/gtkprefs.c:1853
+#: ../finch/gntprefs.c:93 ../pidgin/gtkprefs.c:1923
 msgid "From last sent message"
 msgstr "Viimeisestä lähetetystä viestistä"
 
-#: ../finch/gntprefs.c:83 ../pidgin/gtkprefs.c:820 ../pidgin/gtkprefs.c:829
-#: ../pidgin/gtkprefs.c:1852 ../pidgin/gtkprefs.c:1866
+#: ../finch/gntprefs.c:95 ../pidgin/gtkprefs.c:897 ../pidgin/gtkprefs.c:906
+#: ../pidgin/gtkprefs.c:1922 ../pidgin/gtkprefs.c:1936
 #: ../pidgin/plugins/win32/winprefs/winprefs.c:337
 msgid "Never"
 msgstr "Ei koskaan"
 
-#: ../finch/gntprefs.c:171
+#: ../finch/gntprefs.c:183
 msgid "Show Idle Time"
 msgstr "Näytä joutenoloaika"
 
-#: ../finch/gntprefs.c:172
+#: ../finch/gntprefs.c:184
 msgid "Show Offline Buddies"
 msgstr "Näytä poissaolevat tuttavat"
 
-#: ../finch/gntprefs.c:179
+#: ../finch/gntprefs.c:191
 msgid "Notify buddies when you are typing"
 msgstr "Ilmoita tuttaville kun kirjoitat heille"
 
-#: ../finch/gntprefs.c:185
+#: ../finch/gntprefs.c:197
 msgid "Log format"
 msgstr "Lokin muoto"
 
-#: ../finch/gntprefs.c:186
+#: ../finch/gntprefs.c:198
 msgid "Log IMs"
 msgstr "Kirjaa pikaviestit"
 
-#: ../finch/gntprefs.c:187
+#: ../finch/gntprefs.c:199
 msgid "Log chats"
 msgstr "Kirjaa ryhmäkeskustelut"
 
-#: ../finch/gntprefs.c:188
+#: ../finch/gntprefs.c:200
 msgid "Log status change events"
 msgstr "Kirjaa tilamuutokset"
 
+#: ../finch/gntprefs.c:206
+msgid "Report Idle time"
+msgstr "Ilmoita joutenoloaika"
+
+#: ../finch/gntprefs.c:207
+msgid "Change status when idle"
+msgstr "Vaihda tila, kun ollaan jouten"
+
+#: ../finch/gntprefs.c:208
+msgid "Minutes before changing status"
+msgstr "Minuutteja ennen tilan asetusta"
+
+#: ../finch/gntprefs.c:209
+msgid "Change status to"
+msgstr "Vaihda tila seuraavaksi"
+
 #. Conversations
-#: ../finch/gntprefs.c:241 ../pidgin/gtkprefs.c:915 ../pidgin/gtkprefs.c:1956
+#: ../finch/gntprefs.c:258 ../pidgin/gtkprefs.c:992 ../pidgin/gtkprefs.c:2026
 #: ../pidgin/plugins/win32/winprefs/winprefs.c:344
 msgid "Conversations"
 msgstr "Keskustelut"
 
-#: ../finch/gntprefs.c:242 ../pidgin/gtkprefs.c:1392 ../pidgin/gtkprefs.c:1967
+#: ../finch/gntprefs.c:259 ../pidgin/gtkprefs.c:1462 ../pidgin/gtkprefs.c:2037
 msgid "Logging"
 msgstr "Kirjataan lokiin"
 
-#: ../finch/gntrequest.c:532
+#: ../finch/gntrequest.c:563
 msgid "Not implemented yet."
 msgstr "Ominaisuutta ei ole vielä toteutettu."
 
-#: ../finch/gntrequest.c:597 ../pidgin/gtkrequest.c:1530
-#: ../pidgin/gtkrequest.c:1576
+#: ../finch/gntrequest.c:635 ../pidgin/gtkrequest.c:1526
+#: ../pidgin/gtkrequest.c:1572
 msgid "Save File..."
 msgstr "Tallenna tiedosto..."
 
-#: ../finch/gntrequest.c:597 ../pidgin/gtkrequest.c:1531
-#: ../pidgin/gtkrequest.c:1577
+#: ../finch/gntrequest.c:635 ../pidgin/gtkrequest.c:1527
+#: ../pidgin/gtkrequest.c:1573
 msgid "Open File..."
 msgstr "Avaa tiedosto..."
 
-#: ../finch/gntstatus.c:135
+#: ../finch/gntstatus.c:136
 #, c-format
 msgid "Are you sure you want to delete \"%s\""
 msgstr "Haluatko varmasti poistaa kohteen \"%s\""
 
-#: ../finch/gntstatus.c:138
+#: ../finch/gntstatus.c:139
 msgid "Delete Status"
 msgstr "Poista tila"
 
-#: ../finch/gntstatus.c:170 ../pidgin/gtksavedstatuses.c:557
+#: ../finch/gntstatus.c:174 ../pidgin/gtksavedstatuses.c:596
 msgid "Saved Statuses"
 msgstr "Tallennetut tilat"
 
-#: ../finch/gntstatus.c:177 ../finch/gntstatus.c:529
+#: ../finch/gntstatus.c:181 ../finch/gntstatus.c:532
 #: ../libpurple/protocols/jabber/buddy.c:286
-#: ../libpurple/protocols/jabber/buddy.c:935
+#: ../libpurple/protocols/jabber/buddy.c:973
 #: ../libpurple/protocols/novell/novell.c:1484
-#: ../pidgin/gtksavedstatuses.c:464
+#: ../pidgin/gtksavedstatuses.c:499
 msgid "Title"
 msgstr "Otsikko"
 
-#: ../finch/gntstatus.c:177 ../pidgin/gtksavedstatuses.c:479
+#: ../finch/gntstatus.c:181 ../pidgin/gtksavedstatuses.c:514
 msgid "Type"
 msgstr "Tyyppi"
 
-#: ../finch/gntstatus.c:177 ../finch/gntstatus.c:554 ../finch/gntstatus.c:566
+#: ../finch/gntstatus.c:181 ../finch/gntstatus.c:557 ../finch/gntstatus.c:569
 #: ../libpurple/protocols/bonjour/bonjour.c:247
 #: ../libpurple/protocols/bonjour/bonjour.c:254
 #: ../libpurple/protocols/bonjour/bonjour.c:320
-#: ../libpurple/protocols/gg/gg.c:1072 ../libpurple/protocols/gg/gg.c:1576
-#: ../libpurple/protocols/gg/gg.c:1594 ../libpurple/protocols/gg/gg.c:1604
-#: ../libpurple/protocols/gg/gg.c:1610 ../libpurple/protocols/gg/gg.c:1619
-#: ../libpurple/protocols/gg/gg.c:1624 ../libpurple/protocols/irc/irc.c:234
-#: ../libpurple/protocols/jabber/jabber.c:1252
-#: ../libpurple/protocols/jabber/jabber.c:1262
-#: ../libpurple/protocols/jabber/jabber.c:1272
-#: ../libpurple/protocols/jabber/jabber.c:1282
-#: ../libpurple/protocols/jabber/jabber.c:1292
-#: ../libpurple/protocols/jabber/jabber.c:1304
+#: ../libpurple/protocols/gg/gg.c:1072 ../libpurple/protocols/gg/gg.c:1574
+#: ../libpurple/protocols/gg/gg.c:1592 ../libpurple/protocols/gg/gg.c:1602
+#: ../libpurple/protocols/gg/gg.c:1608 ../libpurple/protocols/gg/gg.c:1617
+#: ../libpurple/protocols/gg/gg.c:1622 ../libpurple/protocols/irc/irc.c:234
+#: ../libpurple/protocols/jabber/jabber.c:1244
+#: ../libpurple/protocols/jabber/jabber.c:1254
+#: ../libpurple/protocols/jabber/jabber.c:1264
+#: ../libpurple/protocols/jabber/jabber.c:1274
+#: ../libpurple/protocols/jabber/jabber.c:1284
+#: ../libpurple/protocols/jabber/jabber.c:1296
 #: ../libpurple/protocols/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:5506
-#: ../libpurple/protocols/oscar/oscar.c:5724
-#: ../libpurple/protocols/oscar/oscar.c:5738
-#: ../libpurple/protocols/oscar/oscar.c:5754
-#: ../libpurple/protocols/oscar/oscar.c:5761
-#: ../libpurple/protocols/oscar/oscar.c:5768
+#: ../libpurple/protocols/oscar/oscar.c:5533
+#: ../libpurple/protocols/oscar/oscar.c:5751
+#: ../libpurple/protocols/oscar/oscar.c:5765
+#: ../libpurple/protocols/oscar/oscar.c:5781
+#: ../libpurple/protocols/oscar/oscar.c:5788
+#: ../libpurple/protocols/oscar/oscar.c:5795
 #: ../libpurple/protocols/sametime/sametime.c:3286
 #: ../libpurple/protocols/sametime/sametime.c:3292
 #: ../libpurple/protocols/sametime/sametime.c:3298
@@ -1356,57 +1392,57 @@
 #: ../libpurple/protocols/yahoo/yahoo.c:3494
 #: ../libpurple/protocols/yahoo/yahoo.c:3500
 #: ../libpurple/protocols/zephyr/zephyr.c:2337
-#: ../pidgin/gtksavedstatuses.c:490 ../pidgin/gtksavedstatuses.c:954
+#: ../pidgin/gtksavedstatuses.c:525 ../pidgin/gtksavedstatuses.c:1009
 msgid "Message"
 msgstr "Viesti"
 
 #. Use
-#: ../finch/gntstatus.c:189 ../finch/gntstatus.c:583
+#: ../finch/gntstatus.c:192 ../finch/gntstatus.c:586
 msgid "Use"
 msgstr "Käytä"
 
-#: ../finch/gntstatus.c:294
+#: ../finch/gntstatus.c:297
 msgid "Invalid title"
 msgstr "Epäkelpo otsikko"
 
-#: ../finch/gntstatus.c:295
+#: ../finch/gntstatus.c:298
 msgid "Please enter a non-empty title for the status."
 msgstr "Tilan otsikko ei voi olla tyhjä."
 
-#: ../finch/gntstatus.c:302
+#: ../finch/gntstatus.c:305
 msgid "Duplicate title"
 msgstr "Otsikon toisinto"
 
-#: ../finch/gntstatus.c:303
+#: ../finch/gntstatus.c:306
 msgid "Please enter a different title for the status."
 msgstr "Anna toinen otsikko tilalle."
 
-#: ../finch/gntstatus.c:443
+#: ../finch/gntstatus.c:446
 msgid "Substatus"
 msgstr "Alatila"
 
-#: ../finch/gntstatus.c:454 ../pidgin/gtkft.c:698
+#: ../finch/gntstatus.c:457 ../pidgin/gtkft.c:698
 msgid "Status:"
 msgstr "Tila:"
 
-#: ../finch/gntstatus.c:469
+#: ../finch/gntstatus.c:472
 msgid "Message:"
 msgstr "Viesti:"
 
-#: ../finch/gntstatus.c:518
+#: ../finch/gntstatus.c:521
 msgid "Edit Status"
 msgstr "Muokkaa tilaa"
 
-#: ../finch/gntstatus.c:560
+#: ../finch/gntstatus.c:563
 msgid "Use different status for following accounts"
 msgstr "Käytä eri tilaa seuraaville käyttäjätileille"
 
 #. Save & Use
-#: ../finch/gntstatus.c:594
+#: ../finch/gntstatus.c:597
 msgid "Save & Use"
 msgstr "Tallenna ja käytä"
 
-#: ../finch/gntui.c:83
+#: ../finch/gntui.c:84
 msgid "Statuses"
 msgstr "Tilat"
 
@@ -1569,12 +1605,12 @@
 msgstr "%s-yhteyskäytäntöliitännäinen puuttuu"
 
 #: ../libpurple/account.c:1012 ../libpurple/connection.c:107
-#: ../pidgin/gtkblist.c:3979
+#: ../pidgin/gtkblist.c:4010
 msgid "Connection Error"
 msgstr "Yhteysvirhe"
 
 #: ../libpurple/account.c:1170 ../libpurple/protocols/gg/gg.c:702
-#: ../libpurple/protocols/jabber/jabber.c:1342
+#: ../libpurple/protocols/jabber/jabber.c:1334
 msgid "New passwords do not match."
 msgstr "Uudet salasanat eivät täsmää."
 
@@ -1613,22 +1649,22 @@
 msgstr "Aseta käyttäjätiedot"
 
 #: ../libpurple/account.c:1744 ../libpurple/protocols/gg/gg.c:1012
-#: ../libpurple/protocols/jabber/buddy.c:638
-#: ../libpurple/protocols/jabber/buddy.c:1424
-#: ../libpurple/protocols/jabber/buddy.c:1441
+#: ../libpurple/protocols/jabber/buddy.c:642
+#: ../libpurple/protocols/jabber/buddy.c:1462
+#: ../libpurple/protocols/jabber/buddy.c:1479
 #: ../libpurple/protocols/novell/novell.c:2831
 #: ../libpurple/protocols/qq/qq.c:230 ../pidgin/gtkft.c:159
 msgid "Unknown"
 msgstr "Tuntematon"
 
-#: ../libpurple/blist.c:523 ../libpurple/blist.c:1291
-#: ../libpurple/blist.c:1520 ../libpurple/protocols/jabber/roster.c:68
-#: ../pidgin/gtkblist.c:5258 ../pidgin/plugins/gevolution/gevolution.c:96
+#: ../libpurple/blist.c:521 ../libpurple/blist.c:1289
+#: ../libpurple/blist.c:1518 ../libpurple/protocols/jabber/roster.c:68
+#: ../pidgin/gtkblist.c:5310 ../pidgin/plugins/gevolution/gevolution.c:96
 #: ../pidgin/plugins/gevolution/gevo-util.c:64
 msgid "Buddies"
 msgstr "Tuttavat"
 
-#: ../libpurple/blist.c:550
+#: ../libpurple/blist.c:548
 msgid "buddy list"
 msgstr "tuttavalista"
 
@@ -1647,85 +1683,85 @@
 msgstr "+++ %s kirjautui ulos"
 
 #: ../libpurple/connection.c:440 ../libpurple/plugin.c:282
-#: ../libpurple/protocols/jabber/buddy.c:1712
+#: ../libpurple/protocols/jabber/buddy.c:1750
 #: ../libpurple/protocols/msn/servconn.c:139
 #: ../libpurple/protocols/msn/session.c:322
 msgid "Unknown error"
 msgstr "Tuntematon virhe"
 
-#: ../libpurple/conversation.c:165
+#: ../libpurple/conversation.c:170
 msgid "Unable to send message: The message is too large."
 msgstr "Viestiä ei voitu lähettää: viesti on liian suuri."
 
-#: ../libpurple/conversation.c:168 ../libpurple/conversation.c:181
+#: ../libpurple/conversation.c:173 ../libpurple/conversation.c:186
 #, c-format
 msgid "Unable to send message to %s."
 msgstr "Viestiä ei voitu lähettää käyttäjälle %s."
 
-#: ../libpurple/conversation.c:169
+#: ../libpurple/conversation.c:174
 msgid "The message is too large."
 msgstr "Viesti on liian suuri."
 
-#: ../libpurple/conversation.c:178 ../libpurple/protocols/bonjour/jabber.c:283
-#: ../libpurple/protocols/bonjour/jabber.c:325
+#: ../libpurple/conversation.c:183 ../libpurple/protocols/bonjour/jabber.c:284
+#: ../libpurple/protocols/bonjour/jabber.c:326
 msgid "Unable to send message."
 msgstr "Viestiä ei voitu lähettää."
 
-#: ../libpurple/conversation.c:1164
+#: ../libpurple/conversation.c:1169
 msgid "Send Message"
 msgstr "Lähetä viesti"
 
-#: ../libpurple/conversation.c:1167
+#: ../libpurple/conversation.c:1172
 msgid "_Send Message"
 msgstr "_Lähetä viesti"
 
-#: ../libpurple/conversation.c:1572
+#: ../libpurple/conversation.c:1578
 #, c-format
 msgid "%s entered the room."
 msgstr "%s saapui huoneeseen."
 
-#: ../libpurple/conversation.c:1575
+#: ../libpurple/conversation.c:1581
 #, c-format
 msgid "%s [<I>%s</I>] entered the room."
 msgstr "%s [<I>%s</I>] saapui huoneeseen."
 
-#: ../libpurple/conversation.c:1682
+#: ../libpurple/conversation.c:1691
 #, c-format
 msgid "You are now known as %s"
 msgstr "Olet nyt nimeltäsi %s"
 
-#: ../libpurple/conversation.c:1702
+#: ../libpurple/conversation.c:1711
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s on nyt nimeltään %s"
 
-#: ../libpurple/conversation.c:1775
+#: ../libpurple/conversation.c:1786
 #, c-format
 msgid "%s left the room."
 msgstr "%s poistui huoneesta."
 
-#: ../libpurple/conversation.c:1778
+#: ../libpurple/conversation.c:1789
 #, c-format
 msgid "%s left the room (%s)."
 msgstr "%s poistui huoneesta (%s)."
 
-#: ../libpurple/dbus-server.c:578
+#: ../libpurple/dbus-server.c:584
 #, c-format
 msgid "Failed to get connection: %s"
 msgstr "Yhteyden saaminen epäonnistui: %s"
 
 # c-format
-#: ../libpurple/dbus-server.c:590
+#: ../libpurple/dbus-server.c:596
 #, c-format
 msgid "Failed to get name: %s"
 msgstr "Nimen saaminen epäonnistui: %s"
 
-#: ../libpurple/dbus-server.c:603
+#: ../libpurple/dbus-server.c:610
 #, c-format
 msgid "Failed to get serv name: %s"
 msgstr "Palvelinnimen saaminen epäonnistui: %s"
 
-#: ../libpurple/dbus-server.h:83
+#: ../libpurple/dbus-server.h:84
 msgid "Purple's D-BUS server is not running for the reason listed below"
 msgstr "Purplen D-BUS-palvelin ei ole käynnissä alla mainitusta syystä"
 
@@ -1778,7 +1814,7 @@
 msgid "Unknown reason"
 msgstr "Tuntematon syy"
 
-#: ../libpurple/ft.c:204
+#: ../libpurple/ft.c:207
 #, c-format
 msgid ""
 "Error reading %s: \n"
@@ -1787,7 +1823,7 @@
 "Virhe luettaessa %s:  \n"
 "%s.\n"
 
-#: ../libpurple/ft.c:208
+#: ../libpurple/ft.c:211
 #, c-format
 msgid ""
 "Error writing %s: \n"
@@ -1796,7 +1832,7 @@
 "Virhe kirjoitettaessa %s: \n"
 "%s.\n"
 
-#: ../libpurple/ft.c:212
+#: ../libpurple/ft.c:215
 #, c-format
 msgid ""
 "Error accessing %s: \n"
@@ -1805,39 +1841,39 @@
 "Virhe käytettäessä tiedostoa %s: \n"
 "%s.\n"
 
-#: ../libpurple/ft.c:248
+#: ../libpurple/ft.c:251
 msgid "Directory is not writable."
 msgstr "Kansioon ei ole kirjoitusoikeuksia."
 
-#: ../libpurple/ft.c:263
+#: ../libpurple/ft.c:266
 msgid "Cannot send a file of 0 bytes."
 msgstr "Ei voida lähettää tiedostoa, jonka koko on 0 tavua."
 
-#: ../libpurple/ft.c:273
+#: ../libpurple/ft.c:276
 msgid "Cannot send a directory."
 msgstr "Ei voida lähettää kansiota."
 
-#: ../libpurple/ft.c:282
+#: ../libpurple/ft.c:285
 #, c-format
 msgid "%s is not a regular file. Cowardly refusing to overwrite it.\n"
 msgstr "%s ei ole tavallinen tiedosto. Ei suostuta ylikirjoittamaan sitä.\n"
 
-#: ../libpurple/ft.c:342
+#: ../libpurple/ft.c:345
 #, c-format
 msgid "%s wants to send you %s (%s)"
 msgstr "%s on lähettämässä sinulle %s (%s)"
 
-#: ../libpurple/ft.c:349
+#: ../libpurple/ft.c:352
 #, c-format
 msgid "%s wants to send you a file"
 msgstr "Käyttäjä %s tahtoo lähettää sinulle tiedoston"
 
-#: ../libpurple/ft.c:392
+#: ../libpurple/ft.c:395
 #, c-format
 msgid "Accept file transfer request from %s?"
 msgstr "Hyväksytäänkö tiedostonsiirtopyyntö käyttäjältä %s?"
 
-#: ../libpurple/ft.c:396
+#: ../libpurple/ft.c:399
 #, c-format
 msgid ""
 "A file is available for download from:\n"
@@ -1848,60 +1884,60 @@
 "Etäkone: %s\n"
 "Portti: %d"
 
-#: ../libpurple/ft.c:431
+#: ../libpurple/ft.c:434
 #, c-format
 msgid "%s is offering to send file %s"
 msgstr "%s tarjoaa tiedostoa %s"
 
-#: ../libpurple/ft.c:483
+#: ../libpurple/ft.c:486
 #, c-format
 msgid "%s is not a valid filename.\n"
 msgstr "%s ei ole kelvollinen tiedostonimi.\n"
 
-#: ../libpurple/ft.c:504
+#: ../libpurple/ft.c:507
 #, c-format
 msgid "Offering to send %s to %s"
 msgstr "Tarjotaan tiedostoa %s lähetettäväksi käyttäjälle %s."
 
-#: ../libpurple/ft.c:516
+#: ../libpurple/ft.c:519
 #, c-format
 msgid "Starting transfer of %s from %s"
 msgstr "Aloitetaan tiedoston %s siirto käyttäjältä %s"
 
-#: ../libpurple/ft.c:670
+#: ../libpurple/ft.c:680
 #, c-format
 msgid "Transfer of file %s complete"
 msgstr "Tiedoston %s siirto valmis"
 
-#: ../libpurple/ft.c:673
+#: ../libpurple/ft.c:683
 msgid "File transfer complete"
 msgstr "Tiedostonsiirto valmis"
 
-#: ../libpurple/ft.c:1091
+#: ../libpurple/ft.c:1101
 #, c-format
 msgid "You canceled the transfer of %s"
 msgstr "Peruutit tiedoston %s siirron"
 
-#: ../libpurple/ft.c:1096
+#: ../libpurple/ft.c:1106
 msgid "File transfer cancelled"
 msgstr "Tiedostonsiirto peruutettu"
 
-#: ../libpurple/ft.c:1154
+#: ../libpurple/ft.c:1164
 #, c-format
 msgid "%s canceled the transfer of %s"
 msgstr "%s peruutti tiedoston %s siirron"
 
-#: ../libpurple/ft.c:1159
+#: ../libpurple/ft.c:1169
 #, c-format
 msgid "%s canceled the file transfer"
 msgstr "Käyttäjä %s peruutti tiedostonsiirron"
 
-#: ../libpurple/ft.c:1216
+#: ../libpurple/ft.c:1226
 #, c-format
 msgid "File transfer to %s failed."
 msgstr "Tiedostonsiirto käyttäjälle %s epäonnistui."
 
-#: ../libpurple/ft.c:1218
+#: ../libpurple/ft.c:1228
 #, c-format
 msgid "File transfer from %s failed."
 msgstr "Tiedostonsiirto käyttäjältä %s epäonnistui."
@@ -2078,31 +2114,31 @@
 msgid "Whether the specified command should handle \"ymsgr\" URLs"
 msgstr "Määritellyn komennon tulee käsitellä \"ymsgr\"-URLt"
 
-#: ../libpurple/log.c:181
+#: ../libpurple/log.c:182
 msgid "<b><font color=\"red\">The logger has no read function</font></b>"
 msgstr "<b><font color=\"red\">Lokilla ei ole read-funktiota</font></b>"
 
-#: ../libpurple/log.c:593
+#: ../libpurple/log.c:597
 msgid "HTML"
 msgstr "HTML"
 
-#: ../libpurple/log.c:607
+#: ../libpurple/log.c:611
 msgid "Plain text"
 msgstr "Teksti"
 
-#: ../libpurple/log.c:621
+#: ../libpurple/log.c:625
 msgid "Old flat format"
 msgstr "Vanha tasainen muoto"
 
-#: ../libpurple/log.c:732
+#: ../libpurple/log.c:837
 msgid "Logging of this conversation failed."
 msgstr "Tämän keskustelun kirjaaminen lokiin epäonnistui."
 
-#: ../libpurple/log.c:1175
+#: ../libpurple/log.c:1280
 msgid "XML"
 msgstr "XML"
 
-#: ../libpurple/log.c:1251
+#: ../libpurple/log.c:1364
 #, c-format
 msgid ""
 "<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
@@ -2111,7 +2147,7 @@
 "<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;"
 "AUTOMAATTIVASTAUS&gt;:</b></font> %s<br/>\n"
 
-#: ../libpurple/log.c:1253
+#: ../libpurple/log.c:1366
 #, c-format
 msgid ""
 "<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
@@ -2120,16 +2156,16 @@
 "<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;"
 "AUTOMAATTIVASTAUS&gt;:</b></font> %s<br/>\n"
 
-#: ../libpurple/log.c:1311 ../libpurple/log.c:1444
+#: ../libpurple/log.c:1424 ../libpurple/log.c:1557
 msgid "<font color=\"red\"><b>Unable to find log path!</b></font>"
 msgstr "<font color=\"red\"><b>Lokin hakemistopolkua ei löydy!</b></font>"
 
-#: ../libpurple/log.c:1323 ../libpurple/log.c:1453
+#: ../libpurple/log.c:1436 ../libpurple/log.c:1566
 #, c-format
 msgid "<font color=\"red\"><b>Could not read file: %s</b></font>"
 msgstr "<font color=\"red\"><b>Ei voitu lukea tiedostoa: %s</b></font>"
 
-#: ../libpurple/log.c:1385
+#: ../libpurple/log.c:1498
 #, c-format
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr "(%s) %s <AUTOMAATTIVASTAUS>: %s\n"
@@ -2221,13 +2257,13 @@
 
 #: ../libpurple/plugins/autoaccept.c:165 ../libpurple/plugins/idle.c:170
 #: ../libpurple/plugins/idle.c:204 ../libpurple/plugins/idle.c:230
-#: ../libpurple/protocols/oscar/oscar.c:1440
-#: ../libpurple/protocols/oscar/oscar.c:2232
-#: ../libpurple/protocols/oscar/oscar.c:2279
-#: ../libpurple/protocols/oscar/oscar.c:5838
-#: ../libpurple/protocols/oscar/oscar.c:5893
-#: ../libpurple/protocols/oscar/oscar.c:6119
-#: ../libpurple/protocols/oscar/oscar.c:6189 ../libpurple/request.h:1387
+#: ../libpurple/protocols/oscar/oscar.c:1458
+#: ../libpurple/protocols/oscar/oscar.c:2251
+#: ../libpurple/protocols/oscar/oscar.c:2298
+#: ../libpurple/protocols/oscar/oscar.c:5865
+#: ../libpurple/protocols/oscar/oscar.c:5920
+#: ../libpurple/protocols/oscar/oscar.c:6146
+#: ../libpurple/protocols/oscar/oscar.c:6216 ../libpurple/request.h:1387
 #: ../libpurple/request.h:1397
 msgid "_Cancel"
 msgstr "_Peru"
@@ -2244,12 +2280,12 @@
 msgid "Auto Reject"
 msgstr "Hylkää automaattisesti"
 
-#: ../libpurple/plugins/autoaccept.c:184
+#: ../libpurple/plugins/autoaccept.c:185
 msgid "Autoaccept File Transfers..."
 msgstr "Tiedostonsiirtojen automaattihyväksyminen..."
 
 #. XXX: Is there a better way than this? There really should be.
-#: ../libpurple/plugins/autoaccept.c:214
+#: ../libpurple/plugins/autoaccept.c:215
 msgid ""
 "Path to save the files in\n"
 "(Please provide the full path)"
@@ -2257,11 +2293,11 @@
 "Polku johon tiedostot tallennetaan\n"
 "(Anna koko polku)"
 
-#: ../libpurple/plugins/autoaccept.c:219
+#: ../libpurple/plugins/autoaccept.c:220
 msgid "Automatically reject from users not in buddy list"
 msgstr "Hylkää automaattisesti käyttäjiltä jotka eivät ole tuttavalistassa"
 
-#: ../libpurple/plugins/autoaccept.c:223
+#: ../libpurple/plugins/autoaccept.c:224
 msgid ""
 "Notify with a popup when an autoaccepted file transfer is complete\n"
 "(only when there's no conversation with the sender)"
@@ -2279,7 +2315,7 @@
 msgid "Enter your notes below..."
 msgstr "Kirjoita merkintäsi alle..."
 
-#: ../libpurple/plugins/buddynote.c:62
+#: ../libpurple/plugins/buddynote.c:65
 msgid "Edit Notes..."
 msgstr "Muokkaa merkintöjä..."
 
@@ -2291,18 +2327,18 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/buddynote.c:87
+#: ../libpurple/plugins/buddynote.c:90
 msgid "Buddy Notes"
 msgstr "Tuttavamerkinnät"
 
 #. *< name
 #. *< version
-#: ../libpurple/plugins/buddynote.c:89
+#: ../libpurple/plugins/buddynote.c:92
 msgid "Store notes on particular buddies."
 msgstr "Tallenna merkintöjä tiettyjen tuttavien kohdalle."
 
 #. *< summary
-#: ../libpurple/plugins/buddynote.c:90
+#: ../libpurple/plugins/buddynote.c:93
 msgid "Adds the option to store notes for buddies on your buddy list."
 msgstr ""
 "Lisää valinnan merkintöjen tallentamiseen tuttavalistallasi oleville "
@@ -2496,7 +2532,7 @@
 #. * offset is way off.  The user should never really see it, but
 #. * it's here just in case.  The parens are to make it clear it's
 #. * not a real timezone.
-#: ../libpurple/plugins/log_reader.c:497
+#: ../libpurple/plugins/log_reader.c:492
 msgid "(UTC)"
 msgstr "(UTC)"
 
@@ -2542,58 +2578,66 @@
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
-#: ../libpurple/plugins/log_reader.c:1989
-#: ../libpurple/plugins/log_reader.c:2098
+#: ../libpurple/plugins/log_reader.c:2344
+#: ../libpurple/plugins/log_reader.c:2467
 msgid "Adium"
 msgstr "Adium"
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
-#: ../libpurple/plugins/log_reader.c:2002
-#: ../libpurple/plugins/log_reader.c:2103
+#: ../libpurple/plugins/log_reader.c:2357
+#: ../libpurple/plugins/log_reader.c:2472
 msgid "Fire"
 msgstr "Fire"
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
-#: ../libpurple/plugins/log_reader.c:2014
-#: ../libpurple/plugins/log_reader.c:2107
+#: ../libpurple/plugins/log_reader.c:2369
+#: ../libpurple/plugins/log_reader.c:2476
 msgid "Messenger Plus!"
 msgstr "Messenger Plus!"
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
-#: ../libpurple/plugins/log_reader.c:2027
-#: ../libpurple/plugins/log_reader.c:2112
+#: ../libpurple/plugins/log_reader.c:2383
+#: ../libpurple/plugins/log_reader.c:2481
+msgid "QIP"
+msgstr "QIP"
+
+#. The names of IM clients are marked for translation at the request of
+#. translators who wanted to transliterate them.  Many translators
+#. choose to leave them alone.  Choose what's best for your language.
+#: ../libpurple/plugins/log_reader.c:2395
+#: ../libpurple/plugins/log_reader.c:2485
 msgid "MSN Messenger"
 msgstr "MSN Messenger"
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
-#: ../libpurple/plugins/log_reader.c:2039
-#: ../libpurple/plugins/log_reader.c:2116
+#: ../libpurple/plugins/log_reader.c:2407
+#: ../libpurple/plugins/log_reader.c:2489
 msgid "Trillian"
 msgstr "Trillian"
 
 #. Add general preferences.
-#: ../libpurple/plugins/log_reader.c:2080
+#: ../libpurple/plugins/log_reader.c:2449
 msgid "General Log Reading Configuration"
 msgstr "Yleiset lokikatselimen asetukset"
 
-#: ../libpurple/plugins/log_reader.c:2084
+#: ../libpurple/plugins/log_reader.c:2453
 msgid "Fast size calculations"
 msgstr "Nopeat koon laskemiset"
 
-#: ../libpurple/plugins/log_reader.c:2088
+#: ../libpurple/plugins/log_reader.c:2457
 msgid "Use name heuristics"
 msgstr "Käytä nimiheuristiikkaa"
 
 #. Add Log Directory preferences.
-#: ../libpurple/plugins/log_reader.c:2094
+#: ../libpurple/plugins/log_reader.c:2463
 msgid "Log Directory"
 msgstr "Lokihakemisto"
 
@@ -2603,19 +2647,19 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/log_reader.c:2145
+#: ../libpurple/plugins/log_reader.c:2518
 msgid "Log Reader"
 msgstr "Lokikatselin"
 
 #. *< name
 #. *< version
 #. * summary
-#: ../libpurple/plugins/log_reader.c:2149
+#: ../libpurple/plugins/log_reader.c:2522
 msgid "Includes other IM clients' logs in the log viewer."
 msgstr "Sisällyttää muiden pikaviestinohjelmien lokit lokikatselimeen."
 
 #. * description
-#: ../libpurple/plugins/log_reader.c:2153
+#: ../libpurple/plugins/log_reader.c:2526
 msgid ""
 "When viewing logs, this plugin will include logs from other IM clients. "
 "Currently, this includes Adium, MSN Messenger, and Trillian.\n"
@@ -2979,17 +3023,17 @@
 #: ../libpurple/protocols/bonjour/bonjour.c:294
 #: ../libpurple/protocols/gg/gg.c:1009 ../libpurple/protocols/irc/irc.c:530
 #: ../libpurple/protocols/irc/msgs.c:310
-#: ../libpurple/protocols/jabber/buddy.c:1434
+#: ../libpurple/protocols/jabber/buddy.c:1472
 #: ../libpurple/protocols/novell/novell.c:2819
-#: ../libpurple/protocols/oscar/oscar.c:715
-#: ../libpurple/protocols/oscar/oscar.c:4519
-#: ../libpurple/protocols/oscar/oscar.c:5584
+#: ../libpurple/protocols/oscar/oscar.c:733
+#: ../libpurple/protocols/oscar/oscar.c:4545
+#: ../libpurple/protocols/oscar/oscar.c:5611
 #: ../libpurple/protocols/qq/qq.c:180 ../libpurple/protocols/silc/buddy.c:1476
 #: ../libpurple/protocols/silc10/buddy.c:1476
 #: ../libpurple/protocols/yahoo/yahoo.c:3397
 #: ../libpurple/protocols/yahoo/yahoo.c:3470 ../libpurple/status.c:157
-#: ../pidgin/gtkdocklet.c:442 ../pidgin/gtkprefs.c:1862
-#: ../pidgin/gtkstatusbox.c:1052
+#: ../pidgin/gtkdocklet.c:442 ../pidgin/gtkprefs.c:1932
+#: ../pidgin/gtkstatusbox.c:1056
 msgid "Away"
 msgstr "Poissa"
 
@@ -3056,30 +3100,30 @@
 msgid "Bonjour"
 msgstr "Bonjour"
 
-#: ../libpurple/protocols/bonjour/jabber.c:394
+#: ../libpurple/protocols/bonjour/jabber.c:395
 #, c-format
 msgid "%s has closed the conversation."
 msgstr "%s on sulkenut keskustelun."
 
-#: ../libpurple/protocols/bonjour/jabber.c:440
-#: ../libpurple/protocols/bonjour/jabber.c:653
-#: ../libpurple/protocols/bonjour/jabber.c:678
+#: ../libpurple/protocols/bonjour/jabber.c:441
+#: ../libpurple/protocols/bonjour/jabber.c:654
+#: ../libpurple/protocols/bonjour/jabber.c:679
 msgid "Unable to send the message, the conversation couldn't be started."
 msgstr "Viestiä ei voida lähettää, keskustelua ei voitu aloittaa."
 
-#: ../libpurple/protocols/bonjour/jabber.c:574
+#: ../libpurple/protocols/bonjour/jabber.c:575
 msgid "Cannot open socket"
 msgstr "Pistoketta ei voida avata"
 
-#: ../libpurple/protocols/bonjour/jabber.c:582
+#: ../libpurple/protocols/bonjour/jabber.c:583
 msgid "Error setting socket options"
 msgstr "Virhe asetettaessa pistokevalintoja"
 
-#: ../libpurple/protocols/bonjour/jabber.c:606
+#: ../libpurple/protocols/bonjour/jabber.c:607
 msgid "Could not bind socket to port"
 msgstr "Ei voitu liittää pistoketta porttiin"
 
-#: ../libpurple/protocols/bonjour/jabber.c:614
+#: ../libpurple/protocols/bonjour/jabber.c:615
 msgid "Could not listen on socket"
 msgstr "Ei voitu kuunnella pistoketta"
 
@@ -3158,7 +3202,7 @@
 
 #: ../libpurple/protocols/gg/gg.c:477 ../libpurple/protocols/gg/gg.c:770
 #: ../libpurple/protocols/jabber/jabber.c:807
-#: ../libpurple/protocols/jabber/jabber.c:1377
+#: ../libpurple/protocols/jabber/jabber.c:1369
 msgid "Password"
 msgstr "Salasana"
 
@@ -3183,10 +3227,10 @@
 msgstr "Täytä seuraavat kentät"
 
 #: ../libpurple/protocols/gg/gg.c:637 ../libpurple/protocols/gg/gg.c:1049
-#: ../libpurple/protocols/gg/gg.c:1123
+#: ../libpurple/protocols/gg/gg.c:1121
 #: ../libpurple/protocols/jabber/jabber.c:843
-#: ../libpurple/protocols/oscar/oscar.c:3777
-#: ../libpurple/protocols/oscar/oscar.c:3790
+#: ../libpurple/protocols/oscar/oscar.c:3803
+#: ../libpurple/protocols/oscar/oscar.c:3816
 #: ../libpurple/protocols/qq/buddy_info.c:49
 msgid "City"
 msgstr "Paikkakunta"
@@ -3196,7 +3240,7 @@
 msgstr "Syntymävuosi"
 
 #: ../libpurple/protocols/gg/gg.c:645 ../libpurple/protocols/msn/msn.c:1558
-#: ../libpurple/protocols/oscar/oscar.c:3720
+#: ../libpurple/protocols/oscar/oscar.c:3746
 #: ../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
@@ -3209,14 +3253,14 @@
 msgstr "Mies vai nainen"
 
 #: ../libpurple/protocols/gg/gg.c:647
-#: ../libpurple/protocols/oscar/oscar.c:3720
+#: ../libpurple/protocols/oscar/oscar.c:3746
 #: ../libpurple/protocols/qq/buddy_info.c:83
 #: ../libpurple/protocols/qq/qq.c:224
 msgid "Male"
 msgstr "Mies"
 
 #: ../libpurple/protocols/gg/gg.c:648
-#: ../libpurple/protocols/oscar/oscar.c:3720
+#: ../libpurple/protocols/oscar/oscar.c:3746
 #: ../libpurple/protocols/qq/buddy_info.c:84
 #: ../libpurple/protocols/qq/qq.c:227
 msgid "Female"
@@ -3276,148 +3320,148 @@
 msgstr "Lisää ryhmäkeskusteluun..."
 
 #: ../libpurple/protocols/gg/gg.c:1003
-#: ../libpurple/protocols/jabber/buddy.c:1428
+#: ../libpurple/protocols/jabber/buddy.c:1466
 #: ../libpurple/protocols/novell/novell.c:2828
-#: ../libpurple/protocols/oscar/oscar.c:810
-#: ../libpurple/protocols/oscar/oscar.c:5556
+#: ../libpurple/protocols/oscar/oscar.c:828
+#: ../libpurple/protocols/oscar/oscar.c:5583
 #: ../libpurple/protocols/qq/qq.c:170 ../libpurple/protocols/qq/qq.c:177
 #: ../libpurple/protocols/yahoo/yahoo.c:2917 ../libpurple/status.c:153
-#: ../pidgin/gtkblist.c:3060 ../pidgin/gtkblist.c:3388
-#: ../pidgin/gtkdocklet.c:450 ../pidgin/gtkstatusbox.c:1054
+#: ../pidgin/gtkblist.c:3070 ../pidgin/gtkblist.c:3411
+#: ../pidgin/gtkdocklet.c:450 ../pidgin/gtkstatusbox.c:1059
 msgid "Offline"
 msgstr "Poissa linjoilta"
 
 #: ../libpurple/protocols/gg/gg.c:1006
-#: ../libpurple/protocols/jabber/buddy.c:1430
+#: ../libpurple/protocols/jabber/buddy.c:1468
 #: ../libpurple/protocols/msn/state.c:29 ../libpurple/protocols/msn/state.c:30
 #: ../libpurple/protocols/msn/state.c:37 ../libpurple/protocols/msn/state.c:38
 #: ../libpurple/protocols/novell/novell.c:2816
 #: ../libpurple/protocols/yahoo/yahoo.c:2919 ../libpurple/status.c:154
-#: ../pidgin/gtkdocklet.c:438 ../pidgin/gtkstatusbox.c:1051
+#: ../pidgin/gtkdocklet.c:438 ../pidgin/gtkstatusbox.c:1055
 msgid "Available"
 msgstr "Tavoitettavissa"
 
-#: ../libpurple/protocols/gg/gg.c:1038 ../libpurple/protocols/gg/gg.c:1114
-#: ../libpurple/protocols/oscar/oscar.c:2656
-#: ../libpurple/protocols/oscar/oscar.c:3687
+#: ../libpurple/protocols/gg/gg.c:1038 ../libpurple/protocols/gg/gg.c:1112
+#: ../libpurple/protocols/oscar/oscar.c:2675
+#: ../libpurple/protocols/oscar/oscar.c:3713
 msgid "UIN"
 msgstr "UIN"
 
-#: ../libpurple/protocols/gg/gg.c:1041 ../libpurple/protocols/gg/gg.c:1117
-#: ../libpurple/protocols/jabber/buddy.c:1585
-#: ../libpurple/protocols/jabber/buddy.c:1761
-#: ../libpurple/protocols/oscar/oscar.c:3698
+#: ../libpurple/protocols/gg/gg.c:1041 ../libpurple/protocols/gg/gg.c:1115
+#: ../libpurple/protocols/jabber/buddy.c:1623
+#: ../libpurple/protocols/jabber/buddy.c:1799
+#: ../libpurple/protocols/oscar/oscar.c:3724
 #: ../libpurple/protocols/silc/ops.c:990
 #: ../libpurple/protocols/silc10/ops.c:1024
 msgid "First Name"
 msgstr "Etunimi"
 
-#: ../libpurple/protocols/gg/gg.c:1054 ../libpurple/protocols/gg/gg.c:1126
+#: ../libpurple/protocols/gg/gg.c:1054 ../libpurple/protocols/gg/gg.c:1124
 msgid "Birth Year"
 msgstr "Syntymävuosi"
 
-#: ../libpurple/protocols/gg/gg.c:1108 ../libpurple/protocols/gg/gg.c:1177
-#: ../libpurple/protocols/oscar/oscar.c:3899
+#: ../libpurple/protocols/gg/gg.c:1106 ../libpurple/protocols/gg/gg.c:1175
+#: ../libpurple/protocols/oscar/oscar.c:3925
 msgid "Unable to display the search results."
 msgstr "Ei voida näyttää hakutuloksia."
 
-#: ../libpurple/protocols/gg/gg.c:1168
+#: ../libpurple/protocols/gg/gg.c:1166
 msgid "Gadu-Gadu Public Directory"
 msgstr "Gadu-Gadun julkinen hakemisto"
 
-#: ../libpurple/protocols/gg/gg.c:1169
+#: ../libpurple/protocols/gg/gg.c:1167
 msgid "Search results"
 msgstr "Hakutulokset"
 
-#: ../libpurple/protocols/gg/gg.c:1212
+#: ../libpurple/protocols/gg/gg.c:1210
 msgid "No matching users found"
 msgstr "Käyttäjistä ei löytynyt osumia"
 
-#: ../libpurple/protocols/gg/gg.c:1213
+#: ../libpurple/protocols/gg/gg.c:1211
 msgid "There are no users matching your search criteria."
 msgstr "Hakuvalintojasi vastaavia käyttäjiä ei ole."
 
-#: ../libpurple/protocols/gg/gg.c:1307 ../libpurple/protocols/gg/gg.c:1460
+#: ../libpurple/protocols/gg/gg.c:1305 ../libpurple/protocols/gg/gg.c:1458
 msgid "Unable to read socket"
 msgstr "Ei kyetty lukemaan pistoketta"
 
-#: ../libpurple/protocols/gg/gg.c:1392
+#: ../libpurple/protocols/gg/gg.c:1390
 msgid "Buddy list downloaded"
 msgstr "Tuttavalista ladattu"
 
-#: ../libpurple/protocols/gg/gg.c:1393
+#: ../libpurple/protocols/gg/gg.c:1391
 msgid "Your buddy list was downloaded from the server."
 msgstr "Tuttavalistasi ladattiin palvelimelta."
 
-#: ../libpurple/protocols/gg/gg.c:1400
+#: ../libpurple/protocols/gg/gg.c:1398
 msgid "Buddy list uploaded"
 msgstr "Tuttavalista lähetettiin"
 
-#: ../libpurple/protocols/gg/gg.c:1401
+#: ../libpurple/protocols/gg/gg.c:1399
 msgid "Your buddy list was stored on the server."
 msgstr "Tuttavalistasi tallennettiin palvelimelle."
 
-#: ../libpurple/protocols/gg/gg.c:1506 ../libpurple/protocols/gg/gg.c:1712
+#: ../libpurple/protocols/gg/gg.c:1504 ../libpurple/protocols/gg/gg.c:1710
 msgid "Connection failed."
 msgstr "Yhteys epäonnistui."
 
-#: ../libpurple/protocols/gg/gg.c:1618 ../libpurple/protocols/msn/msn.c:531
+#: ../libpurple/protocols/gg/gg.c:1616 ../libpurple/protocols/msn/msn.c:531
 msgid "Blocked"
 msgstr "Estetty"
 
-#: ../libpurple/protocols/gg/gg.c:1641
+#: ../libpurple/protocols/gg/gg.c:1639
 msgid "Add to chat"
 msgstr "Lisää ryhmäkeskusteluun"
 
-#: ../libpurple/protocols/gg/gg.c:1650
+#: ../libpurple/protocols/gg/gg.c:1648
 msgid "Unblock"
 msgstr "Poista esto"
 
-#: ../libpurple/protocols/gg/gg.c:1654
+#: ../libpurple/protocols/gg/gg.c:1652
 msgid "Block"
 msgstr "Estä"
 
-#: ../libpurple/protocols/gg/gg.c:1671
+#: ../libpurple/protocols/gg/gg.c:1669
 msgid "Chat _name:"
 msgstr "Keskustelunimi:"
 
-#: ../libpurple/protocols/gg/gg.c:1911
+#: ../libpurple/protocols/gg/gg.c:1909
 msgid "Chat error"
 msgstr "Keskusteluvirhe"
 
-#: ../libpurple/protocols/gg/gg.c:1912
+#: ../libpurple/protocols/gg/gg.c:1910
 msgid "This chat name is already in use"
 msgstr "Tämä keskustelunimi on jo käytössä"
 
-#: ../libpurple/protocols/gg/gg.c:1995
+#: ../libpurple/protocols/gg/gg.c:1993
 msgid "Not connected to the server."
 msgstr "Ei yhdistettynä palvelimeen."
 
-#: ../libpurple/protocols/gg/gg.c:2018
+#: ../libpurple/protocols/gg/gg.c:2016
 msgid "Find buddies..."
 msgstr "Etsi tuttavia..."
 
-#: ../libpurple/protocols/gg/gg.c:2024
+#: ../libpurple/protocols/gg/gg.c:2022
 msgid "Change password..."
 msgstr "Vaihda salasana..."
 
-#: ../libpurple/protocols/gg/gg.c:2030
+#: ../libpurple/protocols/gg/gg.c:2028
 msgid "Upload buddylist to Server"
 msgstr "Vie tuttavalista palvelimelle"
 
-#: ../libpurple/protocols/gg/gg.c:2034
+#: ../libpurple/protocols/gg/gg.c:2032
 msgid "Download buddylist from Server"
 msgstr "Tuo tuttavalista palvelimelta"
 
-#: ../libpurple/protocols/gg/gg.c:2038
+#: ../libpurple/protocols/gg/gg.c:2036
 msgid "Delete buddylist from Server"
 msgstr "Poista tuttavalista palvelimelta"
 
-#: ../libpurple/protocols/gg/gg.c:2042
+#: ../libpurple/protocols/gg/gg.c:2040
 msgid "Save buddylist to file..."
 msgstr "Vie tuttavalista tiedostoon..."
 
-#: ../libpurple/protocols/gg/gg.c:2046
+#: ../libpurple/protocols/gg/gg.c:2044
 msgid "Load buddylist from file..."
 msgstr "Tuo tuttavalista tiedostosta..."
 
@@ -3432,16 +3476,16 @@
 #. id
 #. name
 #. version
-#: ../libpurple/protocols/gg/gg.c:2150
+#: ../libpurple/protocols/gg/gg.c:2148
 msgid "Gadu-Gadu Protocol Plugin"
 msgstr "Gadu-Gadu-yhteyskäytäntöliitännäinen"
 
 #. summary
-#: ../libpurple/protocols/gg/gg.c:2151
+#: ../libpurple/protocols/gg/gg.c:2149
 msgid "Polish popular IM"
 msgstr "Puolalainen suosittu pikaviestin"
 
-#: ../libpurple/protocols/gg/gg.c:2205
+#: ../libpurple/protocols/gg/gg.c:2203
 msgid "Gadu-Gadu User"
 msgstr "Gadu-Gadu-käyttäjä"
 
@@ -3469,9 +3513,9 @@
 
 #: ../libpurple/protocols/irc/dcc_send.c:296
 #: ../libpurple/protocols/irc/dcc_send.c:337
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:268
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:277
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:290
+#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:269
+#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:278
+#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:291
 msgid "File Transfer Failed"
 msgstr "Tiedostonsiirto epäonnistui"
 
@@ -3512,7 +3556,7 @@
 msgstr "_Kanava:"
 
 #: ../libpurple/protocols/irc/irc.c:267
-#: ../libpurple/protocols/jabber/chat.c:59 ../pidgin/gtkaccount.c:523
+#: ../libpurple/protocols/jabber/chat.c:59 ../pidgin/gtkaccount.c:526
 msgid "_Password:"
 msgstr "_Salasana:"
 
@@ -3522,15 +3566,15 @@
 
 #. connect to the server
 #: ../libpurple/protocols/irc/irc.c:319
-#: ../libpurple/protocols/jabber/jabber.c:1048
+#: ../libpurple/protocols/jabber/jabber.c:1046
 #: ../libpurple/protocols/msn/session.c:345
 #: ../libpurple/protocols/novell/novell.c:2182
-#: ../libpurple/protocols/oscar/oscar.c:1270
+#: ../libpurple/protocols/oscar/oscar.c:1288
 #: ../libpurple/protocols/qq/qq.c:136
 #: ../libpurple/protocols/sametime/sametime.c:3723
 #: ../libpurple/protocols/simple/simple.c:1671
 #: ../libpurple/protocols/yahoo/yahoo.c:2762
-#: ../libpurple/protocols/zephyr/zephyr.c:1621 ../pidgin/gtkstatusbox.c:659
+#: ../libpurple/protocols/zephyr/zephyr.c:1621 ../pidgin/gtkstatusbox.c:661
 msgid "Connecting"
 msgstr "Yhdistetään"
 
@@ -3547,7 +3591,7 @@
 msgstr "Pistokkeen luominen epäonnistui"
 
 #: ../libpurple/protocols/irc/irc.c:416
-#: ../libpurple/protocols/oscar/oscar.c:1266
+#: ../libpurple/protocols/oscar/oscar.c:1284
 msgid "Couldn't connect to host"
 msgstr "Yhteyttä isäntään ei voitu muodostaa"
 
@@ -3568,7 +3612,7 @@
 #: ../libpurple/protocols/irc/irc.c:775
 #: ../libpurple/protocols/silc/chat.c:1412
 #: ../libpurple/protocols/silc10/chat.c:1426
-#: ../libpurple/protocols/yahoo/yahoochat.c:1438
+#: ../libpurple/protocols/yahoo/yahoochat.c:1401
 msgid "Users"
 msgstr "Käyttäjät"
 
@@ -3578,7 +3622,7 @@
 #: ../libpurple/protocols/silc/ops.c:1389
 #: ../libpurple/protocols/silc10/chat.c:1429
 #: ../libpurple/protocols/silc10/ops.c:1382
-#: ../libpurple/protocols/yahoo/yahoochat.c:1447
+#: ../libpurple/protocols/yahoo/yahoochat.c:1410
 msgid "Topic"
 msgstr "Aihe"
 
@@ -3590,19 +3634,19 @@
 #. *< id
 #. *< name
 #. *< version
-#: ../libpurple/protocols/irc/irc.c:915
+#: ../libpurple/protocols/irc/irc.c:916
 msgid "IRC Protocol Plugin"
 msgstr "IRC-yhteyskäytäntöliitännäinen"
 
 #. *  summary
-#: ../libpurple/protocols/irc/irc.c:916
+#: ../libpurple/protocols/irc/irc.c:917
 msgid "The IRC Protocol Plugin that Sucks Less"
 msgstr "IRC-yhteyskäytäntöliitännäinen joka on vähemmän huono..."
 
 #. host to connect to
-#: ../libpurple/protocols/irc/irc.c:941 ../libpurple/protocols/irc/msgs.c:323
+#: ../libpurple/protocols/irc/irc.c:942 ../libpurple/protocols/irc/msgs.c:323
 #: ../libpurple/protocols/msn/msn.c:2154
-#: ../libpurple/protocols/oscar/oscar.c:6623
+#: ../libpurple/protocols/oscar/oscar.c:6650
 #: ../libpurple/protocols/qq/qq.c:756
 #: ../libpurple/protocols/sametime/sametime.c:5727
 #: ../libpurple/protocols/silc/ops.c:1249
@@ -3615,21 +3659,21 @@
 msgstr "Palvelin"
 
 #. port to connect to
-#: ../libpurple/protocols/irc/irc.c:944 ../libpurple/protocols/msn/msn.c:2159
-#: ../libpurple/protocols/oscar/oscar.c:6626
+#: ../libpurple/protocols/irc/irc.c:945 ../libpurple/protocols/msn/msn.c:2159
+#: ../libpurple/protocols/oscar/oscar.c:6653
 #: ../libpurple/protocols/qq/qq.c:759
 #: ../libpurple/protocols/sametime/sametime.c:5732
-#: ../libpurple/protocols/silc/silc.c:1917
-#: ../libpurple/protocols/silc10/silc.c:1859
+#: ../libpurple/protocols/silc/silc.c:1918
+#: ../libpurple/protocols/silc10/silc.c:1861
 #: ../libpurple/protocols/toc/toc.c:2331
 msgid "Port"
 msgstr "Portti"
 
-#: ../libpurple/protocols/irc/irc.c:947
+#: ../libpurple/protocols/irc/irc.c:948
 msgid "Encodings"
 msgstr "Merkistöt"
 
-#: ../libpurple/protocols/irc/irc.c:950 ../libpurple/protocols/irc/msgs.c:316
+#: ../libpurple/protocols/irc/irc.c:951 ../libpurple/protocols/irc/msgs.c:316
 #: ../libpurple/protocols/jabber/jabber.c:803
 #: ../libpurple/protocols/silc/buddy.c:1539
 #: ../libpurple/protocols/silc/ops.c:1197
@@ -3646,7 +3690,7 @@
 msgid "Username"
 msgstr "Käyttäjänimi"
 
-#: ../libpurple/protocols/irc/irc.c:953 ../libpurple/protocols/irc/msgs.c:317
+#: ../libpurple/protocols/irc/irc.c:954 ../libpurple/protocols/irc/msgs.c:317
 #: ../libpurple/protocols/silc/silc.c:1009
 #: ../libpurple/protocols/silc10/silc.c:920
 msgid "Real name"
@@ -3656,7 +3700,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:961
+#: ../libpurple/protocols/irc/irc.c:962
 msgid "Use SSL"
 msgstr "Käytä SSL:ää"
 
@@ -3687,7 +3731,7 @@
 msgstr "<i>(tunnistettu)</i>"
 
 #: ../libpurple/protocols/irc/msgs.c:303
-#: ../libpurple/protocols/oscar/oscar.c:3688
+#: ../libpurple/protocols/oscar/oscar.c:3714
 #: ../libpurple/protocols/silc/ops.c:1418
 #: ../libpurple/protocols/silc10/ops.c:1414
 msgid "Nick"
@@ -3968,7 +4012,7 @@
 msgstr "names [kanava]: Listaa kanavalla olevat käyttäjät."
 
 #: ../libpurple/protocols/irc/parse.c:137
-#: ../libpurple/protocols/jabber/jabber.c:1819
+#: ../libpurple/protocols/jabber/jabber.c:1813
 msgid "nick &lt;new nickname&gt;:  Change your nickname."
 msgstr "nick &lt;uusi nimi&gt;: Muuta nimesi."
 
@@ -4159,7 +4203,7 @@
 msgstr "SASL-virhe"
 
 #: ../libpurple/protocols/jabber/buddy.c:271
-#: ../libpurple/protocols/jabber/buddy.c:787
+#: ../libpurple/protocols/jabber/buddy.c:825
 #: ../libpurple/protocols/sametime/sametime.c:4128
 #: ../libpurple/protocols/silc/ops.c:986
 #: ../libpurple/protocols/silc10/ops.c:1020
@@ -4167,14 +4211,14 @@
 msgstr "Koko nimi"
 
 #: ../libpurple/protocols/jabber/buddy.c:272
-#: ../libpurple/protocols/jabber/buddy.c:800
+#: ../libpurple/protocols/jabber/buddy.c:838
 #: ../libpurple/protocols/silc/ops.c:998
 #: ../libpurple/protocols/silc10/ops.c:1032
 msgid "Family Name"
 msgstr "Sukunimi"
 
 #: ../libpurple/protocols/jabber/buddy.c:273
-#: ../libpurple/protocols/jabber/buddy.c:804
+#: ../libpurple/protocols/jabber/buddy.c:842
 msgid "Given Name"
 msgstr "Etunimi"
 
@@ -4184,47 +4228,47 @@
 msgstr "URL"
 
 #: ../libpurple/protocols/jabber/buddy.c:276
-#: ../libpurple/protocols/jabber/buddy.c:856
+#: ../libpurple/protocols/jabber/buddy.c:894
 msgid "Street Address"
 msgstr "Katuosoite"
 
 #: ../libpurple/protocols/jabber/buddy.c:277
-#: ../libpurple/protocols/jabber/buddy.c:852
+#: ../libpurple/protocols/jabber/buddy.c:890
 msgid "Extended Address"
 msgstr "Laajennettu osoite"
 
 #: ../libpurple/protocols/jabber/buddy.c:278
-#: ../libpurple/protocols/jabber/buddy.c:860
+#: ../libpurple/protocols/jabber/buddy.c:898
 msgid "Locality"
 msgstr "Alue"
 
 #: ../libpurple/protocols/jabber/buddy.c:279
-#: ../libpurple/protocols/jabber/buddy.c:864
+#: ../libpurple/protocols/jabber/buddy.c:902
 msgid "Region"
 msgstr "Seutu"
 
 #: ../libpurple/protocols/jabber/buddy.c:280
-#: ../libpurple/protocols/jabber/buddy.c:868
+#: ../libpurple/protocols/jabber/buddy.c:906
 msgid "Postal Code"
 msgstr "Postinumero"
 
 #: ../libpurple/protocols/jabber/buddy.c:281
-#: ../libpurple/protocols/jabber/buddy.c:873
+#: ../libpurple/protocols/jabber/buddy.c:911
 #: ../libpurple/protocols/silc/silc.c:1015
 #: ../libpurple/protocols/silc10/silc.c:926
 msgid "Country"
 msgstr "Maa"
 
 #: ../libpurple/protocols/jabber/buddy.c:282
-#: ../libpurple/protocols/jabber/buddy.c:884
-#: ../libpurple/protocols/jabber/buddy.c:891
+#: ../libpurple/protocols/jabber/buddy.c:922
+#: ../libpurple/protocols/jabber/buddy.c:929
 msgid "Telephone"
 msgstr "Puhelin"
 
 #: ../libpurple/protocols/jabber/buddy.c:283
-#: ../libpurple/protocols/jabber/buddy.c:902
-#: ../libpurple/protocols/jabber/buddy.c:910
-#: ../libpurple/protocols/jabber/buddy.c:1591
+#: ../libpurple/protocols/jabber/buddy.c:940
+#: ../libpurple/protocols/jabber/buddy.c:948
+#: ../libpurple/protocols/jabber/buddy.c:1629
 #: ../libpurple/protocols/silc/ops.c:1041
 #: ../libpurple/protocols/silc/util.c:555
 #: ../libpurple/protocols/silc10/ops.c:1075
@@ -4234,40 +4278,40 @@
 msgstr "Sähköposti"
 
 #: ../libpurple/protocols/jabber/buddy.c:284
-#: ../libpurple/protocols/jabber/buddy.c:925
+#: ../libpurple/protocols/jabber/buddy.c:963
 msgid "Organization Name"
 msgstr "Organisaation nimi"
 
 #: ../libpurple/protocols/jabber/buddy.c:285
-#: ../libpurple/protocols/jabber/buddy.c:929
+#: ../libpurple/protocols/jabber/buddy.c:967
 msgid "Organization Unit"
 msgstr "Organisaatioyksikkö"
 
 #: ../libpurple/protocols/jabber/buddy.c:287
-#: ../libpurple/protocols/jabber/buddy.c:938
+#: ../libpurple/protocols/jabber/buddy.c:976
 msgid "Role"
 msgstr "Asema"
 
 #: ../libpurple/protocols/jabber/buddy.c:288
-#: ../libpurple/protocols/jabber/buddy.c:821
+#: ../libpurple/protocols/jabber/buddy.c:859
 #: ../libpurple/protocols/msn/msn.c:1627
-#: ../libpurple/protocols/oscar/oscar.c:3737
+#: ../libpurple/protocols/oscar/oscar.c:3763
 msgid "Birthday"
 msgstr "Syntymäpäivä"
 
 #: ../libpurple/protocols/jabber/buddy.c:289
-#: ../libpurple/protocols/jabber/buddy.c:941
-#: ../libpurple/protocols/jabber/chat.c:775 ../pidgin/gtkblist.c:3071
-#: ../pidgin/gtkprefs.c:680
+#: ../libpurple/protocols/jabber/buddy.c:979
+#: ../libpurple/protocols/jabber/chat.c:775 ../pidgin/gtkblist.c:3081
+#: ../pidgin/gtkprefs.c:738
 msgid "Description"
 msgstr "Kuvaus"
 
-#: ../libpurple/protocols/jabber/buddy.c:578
-#: ../libpurple/protocols/jabber/buddy.c:579
+#: ../libpurple/protocols/jabber/buddy.c:582
+#: ../libpurple/protocols/jabber/buddy.c:583
 msgid "Edit XMPP vCard"
 msgstr "Muokkaa XMPP-vCardia"
 
-#: ../libpurple/protocols/jabber/buddy.c:580
+#: ../libpurple/protocols/jabber/buddy.c:584
 msgid ""
 "All items below are optional. Enter only the information with which you feel "
 "comfortable."
@@ -4275,116 +4319,116 @@
 "Kaikki allaolevat kentät ovat valinnaisia. Kirjoita vain tiedot, joiden "
 "luovuttamista pidät sopivana."
 
-#: ../libpurple/protocols/jabber/buddy.c:651
-#: ../libpurple/protocols/jabber/buddy.c:692
+#: ../libpurple/protocols/jabber/buddy.c:655
+#: ../libpurple/protocols/jabber/buddy.c:696
 msgid "Client"
 msgstr "Asiakasohjelma"
 
-#: ../libpurple/protocols/jabber/buddy.c:655
-#: ../libpurple/protocols/jabber/buddy.c:696
+#: ../libpurple/protocols/jabber/buddy.c:659
+#: ../libpurple/protocols/jabber/buddy.c:700
 msgid "Operating System"
 msgstr "Käyttöjärjestelmä"
 
-#: ../libpurple/protocols/jabber/buddy.c:665
-#: ../libpurple/protocols/jabber/libxmpp.c:198
+#: ../libpurple/protocols/jabber/buddy.c:669
+#: ../libpurple/protocols/jabber/libxmpp.c:202
 #: ../libpurple/protocols/jabber/si.c:853
 msgid "Resource"
 msgstr "Sijainti"
 
-#: ../libpurple/protocols/jabber/buddy.c:667
-#: ../libpurple/protocols/jabber/jabber.c:1251
-#: ../libpurple/protocols/jabber/jabber.c:1261
-#: ../libpurple/protocols/jabber/jabber.c:1271
-#: ../libpurple/protocols/jabber/jabber.c:1281
-#: ../libpurple/protocols/jabber/jabber.c:1291
+#: ../libpurple/protocols/jabber/buddy.c:671
+#: ../libpurple/protocols/jabber/jabber.c:1243
+#: ../libpurple/protocols/jabber/jabber.c:1253
+#: ../libpurple/protocols/jabber/jabber.c:1263
+#: ../libpurple/protocols/jabber/jabber.c:1273
+#: ../libpurple/protocols/jabber/jabber.c:1283
 msgid "Priority"
 msgstr "Tärkeys"
 
-#: ../libpurple/protocols/jabber/buddy.c:808
+#: ../libpurple/protocols/jabber/buddy.c:846
 #: ../libpurple/protocols/silc/ops.c:994
 #: ../libpurple/protocols/silc10/ops.c:1028
 msgid "Middle Name"
 msgstr "Muut etunimet"
 
-#: ../libpurple/protocols/jabber/buddy.c:841
+#: ../libpurple/protocols/jabber/buddy.c:879
 #: ../libpurple/protocols/jabber/jabber.c:838
-#: ../libpurple/protocols/oscar/oscar.c:3776
-#: ../libpurple/protocols/oscar/oscar.c:3789
+#: ../libpurple/protocols/oscar/oscar.c:3802
+#: ../libpurple/protocols/oscar/oscar.c:3815
 #: ../libpurple/protocols/qq/buddy_info.c:56
 #: ../libpurple/protocols/silc/ops.c:1030
 #: ../libpurple/protocols/silc10/ops.c:1064
 msgid "Address"
 msgstr "Osoite"
 
-#: ../libpurple/protocols/jabber/buddy.c:848
+#: ../libpurple/protocols/jabber/buddy.c:886
 msgid "P.O. Box"
 msgstr "Postilokero"
 
-#: ../libpurple/protocols/jabber/buddy.c:962
+#: ../libpurple/protocols/jabber/buddy.c:1000
 msgid "Photo"
 msgstr "Valokuva"
 
-#: ../libpurple/protocols/jabber/buddy.c:962
+#: ../libpurple/protocols/jabber/buddy.c:1000
 msgid "Logo"
 msgstr "Logo"
 
-#: ../libpurple/protocols/jabber/buddy.c:1371
+#: ../libpurple/protocols/jabber/buddy.c:1409
 msgid "Un-hide From"
 msgstr "\"Tule esiin\""
 
-#: ../libpurple/protocols/jabber/buddy.c:1375
+#: ../libpurple/protocols/jabber/buddy.c:1413
 msgid "Temporarily Hide From"
 msgstr "Piiloudu väliaikaisesti tuttavalta"
 
 #. && NOT ME
-#: ../libpurple/protocols/jabber/buddy.c:1383
+#: ../libpurple/protocols/jabber/buddy.c:1421
 msgid "Cancel Presence Notification"
 msgstr "Peru paikallaoloilmoitus"
 
-#: ../libpurple/protocols/jabber/buddy.c:1390
+#: ../libpurple/protocols/jabber/buddy.c:1428
 msgid "(Re-)Request authorization"
 msgstr "Pyydä valtuutusta uudelleen"
 
 #. if(NOT ME)
 #. shouldn't this just happen automatically when the buddy is
 #. removed?
-#: ../libpurple/protocols/jabber/buddy.c:1399
+#: ../libpurple/protocols/jabber/buddy.c:1437
 msgid "Unsubscribe"
 msgstr "Poista listalta"
 
-#: ../libpurple/protocols/jabber/buddy.c:1432
-#: ../libpurple/protocols/jabber/jabber.c:1260
+#: ../libpurple/protocols/jabber/buddy.c:1470
+#: ../libpurple/protocols/jabber/jabber.c:1252
 msgid "Chatty"
 msgstr "Juttelutuulella"
 
-#: ../libpurple/protocols/jabber/buddy.c:1436 ../libpurple/status.c:158
+#: ../libpurple/protocols/jabber/buddy.c:1474
 msgid "Extended Away"
 msgstr "Pidennetty poissaolo"
 
-#: ../libpurple/protocols/jabber/buddy.c:1438
-#: ../libpurple/protocols/jabber/jabber.c:1290
-#: ../libpurple/protocols/oscar/oscar.c:709
-#: ../libpurple/protocols/oscar/oscar.c:5760
+#: ../libpurple/protocols/jabber/buddy.c:1476
+#: ../libpurple/protocols/jabber/jabber.c:1282
+#: ../libpurple/protocols/oscar/oscar.c:727
+#: ../libpurple/protocols/oscar/oscar.c:5787
 #: ../libpurple/protocols/sametime/sametime.c:3297
 msgid "Do Not Disturb"
 msgstr "Älä häiritse"
 
-#: ../libpurple/protocols/jabber/buddy.c:1583
+#: ../libpurple/protocols/jabber/buddy.c:1621
 msgid "JID"
 msgstr "JID"
 
-#: ../libpurple/protocols/jabber/buddy.c:1587
-#: ../libpurple/protocols/jabber/buddy.c:1766
-#: ../libpurple/protocols/oscar/oscar.c:3699
+#: ../libpurple/protocols/jabber/buddy.c:1625
+#: ../libpurple/protocols/jabber/buddy.c:1804
+#: ../libpurple/protocols/oscar/oscar.c:3725
 msgid "Last Name"
 msgstr "Sukunimi"
 
-#: ../libpurple/protocols/jabber/buddy.c:1619
+#: ../libpurple/protocols/jabber/buddy.c:1657
 msgid "The following are the results of your search"
 msgstr "Hakutulokset"
 
 #. current comment from Jabber User Directory users.jabber.org
-#: ../libpurple/protocols/jabber/buddy.c:1694
+#: ../libpurple/protocols/jabber/buddy.c:1732
 msgid ""
 "Find a contact by entering the search criteria in the given fields. Note: "
 "Each field supports wild card searches (%)"
@@ -4392,69 +4436,69 @@
 "Etsi henkilöä syöttämällä hakukriteerit kenttiin. Huom: jokainen kenttä "
 "tukee jokerimerkkejä (%)"
 
-#: ../libpurple/protocols/jabber/buddy.c:1714
+#: ../libpurple/protocols/jabber/buddy.c:1752
 msgid "Directory Query Failed"
 msgstr "Hakemistohaku epäonnistui"
 
-#: ../libpurple/protocols/jabber/buddy.c:1715
+#: ../libpurple/protocols/jabber/buddy.c:1753
 msgid "Could not query the directory server."
 msgstr "Ei voitu hakea hakemistopalvelimelta."
 
 #. Try to translate the message (see static message
 #. list in jabber_user_dir_comments[])
-#: ../libpurple/protocols/jabber/buddy.c:1749
+#: ../libpurple/protocols/jabber/buddy.c:1787
 #, c-format
 msgid "Server Instructions: %s"
 msgstr "Palvelimen ohjeet: %s"
 
-#: ../libpurple/protocols/jabber/buddy.c:1756
+#: ../libpurple/protocols/jabber/buddy.c:1794
 msgid "Fill in one or more fields to search for any matching XMPP users."
 msgstr "Täytä yksi tai useampia kentistä etsiäksesi XMPP-käyttäjiä."
 
-#: ../libpurple/protocols/jabber/buddy.c:1776
+#: ../libpurple/protocols/jabber/buddy.c:1814
 #: ../libpurple/protocols/novell/novell.c:1488
-#: ../libpurple/protocols/oscar/oscar.c:3702
-#: ../libpurple/protocols/oscar/oscar.c:3711
+#: ../libpurple/protocols/oscar/oscar.c:3728
+#: ../libpurple/protocols/oscar/oscar.c:3737
 msgid "E-Mail Address"
 msgstr "Sähköpostiosoite"
 
-#: ../libpurple/protocols/jabber/buddy.c:1785
-#: ../libpurple/protocols/jabber/buddy.c:1786
+#: ../libpurple/protocols/jabber/buddy.c:1823
+#: ../libpurple/protocols/jabber/buddy.c:1824
 msgid "Search for XMPP users"
 msgstr "Etsi XMPP-käyttäjiä"
 
 #. "Search"
-#: ../libpurple/protocols/jabber/buddy.c:1787
+#: ../libpurple/protocols/jabber/buddy.c:1825
 #: ../libpurple/protocols/qq/group.c:123
-#: ../libpurple/protocols/qq/group_im.c:145
+#: ../libpurple/protocols/qq/group_im.c:147
 #: ../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:5611
-#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:473
-#: ../pidgin/plugins/gevolution/assoc-buddy.c:358
+#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:470
+#: ../pidgin/plugins/gevolution/assoc-buddy.c:356
 msgid "Search"
 msgstr "Etsi"
 
-#: ../libpurple/protocols/jabber/buddy.c:1802
+#: ../libpurple/protocols/jabber/buddy.c:1840
 msgid "Invalid Directory"
 msgstr "Virheellinen kansio"
 
-#: ../libpurple/protocols/jabber/buddy.c:1819
+#: ../libpurple/protocols/jabber/buddy.c:1857
 msgid "Enter a User Directory"
 msgstr "Syötä käyttäjähakemisto"
 
-#: ../libpurple/protocols/jabber/buddy.c:1820
+#: ../libpurple/protocols/jabber/buddy.c:1858
 msgid "Select a user directory to search"
 msgstr "Valitse käyttäjähakemisto, josta haetaan"
 
-#: ../libpurple/protocols/jabber/buddy.c:1823
+#: ../libpurple/protocols/jabber/buddy.c:1861
 msgid "Search Directory"
 msgstr "Etsi hakemistosta"
 
 #: ../libpurple/protocols/jabber/chat.c:41
-#: ../libpurple/protocols/oscar/oscar.c:5246
-#: ../libpurple/protocols/yahoo/yahoochat.c:999
+#: ../libpurple/protocols/oscar/oscar.c:5273
+#: ../libpurple/protocols/yahoo/yahoochat.c:962
 msgid "_Room:"
 msgstr "_Huone:"
 
@@ -4595,7 +4639,7 @@
 msgstr "Rekisteröinti onnistui"
 
 #: ../libpurple/protocols/jabber/jabber.c:653
-#: ../libpurple/protocols/jabber/jabber.c:1530
+#: ../libpurple/protocols/jabber/jabber.c:1524
 msgid "Unknown Error"
 msgstr "Tuntematon virhe"
 
@@ -4610,8 +4654,8 @@
 msgstr "Valmiiksi rekisteröity"
 
 #: ../libpurple/protocols/jabber/jabber.c:848
-#: ../libpurple/protocols/oscar/oscar.c:3778
-#: ../libpurple/protocols/oscar/oscar.c:3791
+#: ../libpurple/protocols/oscar/oscar.c:3804
+#: ../libpurple/protocols/oscar/oscar.c:3817
 msgid "State"
 msgstr "Lääni"
 
@@ -4643,358 +4687,362 @@
 msgstr "Rekisteröi uusi XMPP-tili"
 
 #. Register button
-#: ../libpurple/protocols/jabber/jabber.c:881 ../pidgin/gtkaccount.c:1526
+#: ../libpurple/protocols/jabber/jabber.c:881 ../pidgin/gtkaccount.c:1518
 msgid "Register"
 msgstr "Rekisteröi"
 
-#: ../libpurple/protocols/jabber/jabber.c:1052
+#: ../libpurple/protocols/jabber/jabber.c:1050
 msgid "Initializing Stream"
 msgstr "Alustetaan datavirtaa"
 
-#: ../libpurple/protocols/jabber/jabber.c:1057
+#: ../libpurple/protocols/jabber/jabber.c:1055
 #: ../libpurple/protocols/msn/session.c:351
 msgid "Authenticating"
 msgstr "Todennetaan"
 
-#: ../libpurple/protocols/jabber/jabber.c:1066
+#: ../libpurple/protocols/jabber/jabber.c:1064
 msgid "Re-initializing Stream"
 msgstr "Uudelleenalustetaan datavirtaa"
 
-#: ../libpurple/protocols/jabber/jabber.c:1134
-#: ../libpurple/protocols/jabber/jabber.c:1508
-#: ../libpurple/protocols/jabber/jabber.c:1549
-#: ../libpurple/protocols/jabber/jabber.c:1585
-#: ../libpurple/protocols/oscar/oscar.c:808
-#: ../libpurple/protocols/oscar/oscar.c:5554
+#: ../libpurple/protocols/jabber/jabber.c:1126
+#: ../libpurple/protocols/jabber/jabber.c:1502
+#: ../libpurple/protocols/jabber/jabber.c:1543
+#: ../libpurple/protocols/jabber/jabber.c:1579
+#: ../libpurple/protocols/oscar/oscar.c:826
+#: ../libpurple/protocols/oscar/oscar.c:5581
 msgid "Not Authorized"
 msgstr "Ei valtuuksia"
 
-#: ../libpurple/protocols/jabber/jabber.c:1176
+#: ../libpurple/protocols/jabber/jabber.c:1168
 msgid "Both"
 msgstr "molemmille"
 
-#: ../libpurple/protocols/jabber/jabber.c:1178
+#: ../libpurple/protocols/jabber/jabber.c:1170
 msgid "From (To pending)"
 msgstr "vain sinulle (odottaa lupaa)"
 
-#: ../libpurple/protocols/jabber/jabber.c:1183
+#: ../libpurple/protocols/jabber/jabber.c:1172
+msgid "From"
+msgstr "Lähettäjä"
+
+#: ../libpurple/protocols/jabber/jabber.c:1175
 msgid "To"
 msgstr "vain sinulta"
 
-#: ../libpurple/protocols/jabber/jabber.c:1185
+#: ../libpurple/protocols/jabber/jabber.c:1177
 msgid "None (To pending)"
 msgstr "Ei mitään (odottaa lupaa)"
 
-#: ../libpurple/protocols/jabber/jabber.c:1187
+#: ../libpurple/protocols/jabber/jabber.c:1179
 #: ../pidgin/plugins/gevolution/eds-utils.c:73
 #: ../pidgin/plugins/gevolution/eds-utils.c:86
 msgid "None"
 msgstr "Ei mitään"
 
-#: ../libpurple/protocols/jabber/jabber.c:1190
+#: ../libpurple/protocols/jabber/jabber.c:1182
 msgid "Subscription"
 msgstr "Tilailmoitus"
 
-#: ../libpurple/protocols/jabber/jabber.c:1320
+#: ../libpurple/protocols/jabber/jabber.c:1312
 msgid "Password Changed"
 msgstr "Salasana muutettu"
 
-#: ../libpurple/protocols/jabber/jabber.c:1321
+#: ../libpurple/protocols/jabber/jabber.c:1313
 msgid "Your password has been changed."
 msgstr "Salasana vaihdettu"
 
-#: ../libpurple/protocols/jabber/jabber.c:1325
-#: ../libpurple/protocols/jabber/jabber.c:1326
+#: ../libpurple/protocols/jabber/jabber.c:1317
+#: ../libpurple/protocols/jabber/jabber.c:1318
 msgid "Error changing password"
 msgstr "Virhe vaihdettaessa salasanaa"
 
-#: ../libpurple/protocols/jabber/jabber.c:1382
+#: ../libpurple/protocols/jabber/jabber.c:1375
 msgid "Password (again)"
 msgstr "Salasana (uudelleen)"
 
-#: ../libpurple/protocols/jabber/jabber.c:1387
-#: ../libpurple/protocols/jabber/jabber.c:1388
+#: ../libpurple/protocols/jabber/jabber.c:1381
+#: ../libpurple/protocols/jabber/jabber.c:1382
 msgid "Change XMPP Password"
 msgstr "Vaihda XMPP-salasana"
 
-#: ../libpurple/protocols/jabber/jabber.c:1388
+#: ../libpurple/protocols/jabber/jabber.c:1382
 msgid "Please enter your new password"
 msgstr "Anna uusi salasanasi"
 
-#: ../libpurple/protocols/jabber/jabber.c:1400
-#: ../libpurple/protocols/oscar/oscar.c:6340
+#: ../libpurple/protocols/jabber/jabber.c:1394
+#: ../libpurple/protocols/oscar/oscar.c:6367
 #: ../libpurple/protocols/silc/silc.c:1093
 #: ../libpurple/protocols/silc10/silc.c:1004
 msgid "Set User Info..."
 msgstr "Aseta käyttäjätiedot..."
 
 #. if (js->protocol_options & CHANGE_PASSWORD) {
-#: ../libpurple/protocols/jabber/jabber.c:1405
-#: ../libpurple/protocols/oscar/oscar.c:6351
+#: ../libpurple/protocols/jabber/jabber.c:1399
+#: ../libpurple/protocols/oscar/oscar.c:6378
 #: ../libpurple/protocols/silc/silc.c:1089
 #: ../libpurple/protocols/silc10/silc.c:1000
 msgid "Change Password..."
 msgstr "Vaihda salasana..."
 
 #. }
-#: ../libpurple/protocols/jabber/jabber.c:1410
+#: ../libpurple/protocols/jabber/jabber.c:1404
 msgid "Search for Users..."
 msgstr "Etsi käyttäjiä..."
 
+#: ../libpurple/protocols/jabber/jabber.c:1482
+msgid "Bad Request"
+msgstr "Virheellinen pyyntö"
+
+#: ../libpurple/protocols/jabber/jabber.c:1484
+msgid "Conflict"
+msgstr "Ristiriita"
+
+#: ../libpurple/protocols/jabber/jabber.c:1486
+msgid "Feature Not Implemented"
+msgstr "Ominaisuutta ei ole implementoitu."
+
 #: ../libpurple/protocols/jabber/jabber.c:1488
-msgid "Bad Request"
-msgstr "Virheellinen pyyntö"
+msgid "Forbidden"
+msgstr "Estetty"
 
 #: ../libpurple/protocols/jabber/jabber.c:1490
-msgid "Conflict"
-msgstr "Ristiriita"
+msgid "Gone"
+msgstr "Poistunut"
 
 #: ../libpurple/protocols/jabber/jabber.c:1492
-msgid "Feature Not Implemented"
-msgstr "Ominaisuutta ei ole implementoitu."
-
-#: ../libpurple/protocols/jabber/jabber.c:1494
-msgid "Forbidden"
-msgstr "Estetty"
-
-#: ../libpurple/protocols/jabber/jabber.c:1496
-msgid "Gone"
-msgstr "Poistunut"
-
-#: ../libpurple/protocols/jabber/jabber.c:1498
-#: ../libpurple/protocols/jabber/jabber.c:1575
+#: ../libpurple/protocols/jabber/jabber.c:1569
 msgid "Internal Server Error"
 msgstr "Sisäinen palvelinvirhe"
 
-#: ../libpurple/protocols/jabber/jabber.c:1500
+#: ../libpurple/protocols/jabber/jabber.c:1494
 msgid "Item Not Found"
 msgstr "Kohdetta ei löytynyt"
 
-#: ../libpurple/protocols/jabber/jabber.c:1502
+#: ../libpurple/protocols/jabber/jabber.c:1496
 msgid "Malformed XMPP ID"
 msgstr "Muodoltaan virheellinen XMPP-ID"
 
-#: ../libpurple/protocols/jabber/jabber.c:1504
+#: ../libpurple/protocols/jabber/jabber.c:1498
 msgid "Not Acceptable"
 msgstr "Ei kelvollinen"
 
-#: ../libpurple/protocols/jabber/jabber.c:1506
+#: ../libpurple/protocols/jabber/jabber.c:1500
 msgid "Not Allowed"
 msgstr "Ei sallittu"
 
-#: ../libpurple/protocols/jabber/jabber.c:1510
+#: ../libpurple/protocols/jabber/jabber.c:1504
 msgid "Payment Required"
 msgstr "Vaatii maksun"
 
-#: ../libpurple/protocols/jabber/jabber.c:1512
+#: ../libpurple/protocols/jabber/jabber.c:1506
 msgid "Recipient Unavailable"
 msgstr "Vastaanottaja ei saatavilla."
 
-#: ../libpurple/protocols/jabber/jabber.c:1516
+#: ../libpurple/protocols/jabber/jabber.c:1510
 msgid "Registration Required"
 msgstr "Vaatii rekisteröinnin"
 
-#: ../libpurple/protocols/jabber/jabber.c:1518
+#: ../libpurple/protocols/jabber/jabber.c:1512
 msgid "Remote Server Not Found"
 msgstr "Palvelinta ei löytynyt"
 
-#: ../libpurple/protocols/jabber/jabber.c:1520
+#: ../libpurple/protocols/jabber/jabber.c:1514
 msgid "Remote Server Timeout"
 msgstr "Palvelin aikakatkaisi"
 
-#: ../libpurple/protocols/jabber/jabber.c:1522
+#: ../libpurple/protocols/jabber/jabber.c:1516
 msgid "Server Overloaded"
 msgstr "Palvelin ylikuormitettu"
 
-#: ../libpurple/protocols/jabber/jabber.c:1524
+#: ../libpurple/protocols/jabber/jabber.c:1518
 msgid "Service Unavailable"
 msgstr "Palvelu ei käytettävissä"
 
-#: ../libpurple/protocols/jabber/jabber.c:1526
+#: ../libpurple/protocols/jabber/jabber.c:1520
 msgid "Subscription Required"
 msgstr "Vaatii tilailmoitukset"
 
-#: ../libpurple/protocols/jabber/jabber.c:1528
+#: ../libpurple/protocols/jabber/jabber.c:1522
 msgid "Unexpected Request"
 msgstr "Odottamaton pyyntö"
 
-#: ../libpurple/protocols/jabber/jabber.c:1535
+#: ../libpurple/protocols/jabber/jabber.c:1529
 msgid "Authorization Aborted"
 msgstr "Valtuutus keskeytetty"
 
-#: ../libpurple/protocols/jabber/jabber.c:1537
+#: ../libpurple/protocols/jabber/jabber.c:1531
 msgid "Incorrect encoding in authorization"
 msgstr "Väärä merkistö valtuutusviestissä"
 
-#: ../libpurple/protocols/jabber/jabber.c:1540
+#: ../libpurple/protocols/jabber/jabber.c:1534
 msgid "Invalid authzid"
 msgstr "Epäkelpo authzid"
 
-#: ../libpurple/protocols/jabber/jabber.c:1543
+#: ../libpurple/protocols/jabber/jabber.c:1537
 msgid "Invalid Authorization Mechanism"
 msgstr "Epäkelpo tunnistautumismekanismi"
 
-#: ../libpurple/protocols/jabber/jabber.c:1546
+#: ../libpurple/protocols/jabber/jabber.c:1540
 msgid "Authorization mechanism too weak"
 msgstr "Tunnistautumismekanismi liian heikko"
 
-#: ../libpurple/protocols/jabber/jabber.c:1551
+#: ../libpurple/protocols/jabber/jabber.c:1545
 msgid "Temporary Authentication Failure"
 msgstr "Väliaikainen todennusvirhe"
 
-#: ../libpurple/protocols/jabber/jabber.c:1554
+#: ../libpurple/protocols/jabber/jabber.c:1548
 msgid "Authentication Failure"
 msgstr "Todennus epäonnistui"
 
-#: ../libpurple/protocols/jabber/jabber.c:1560
+#: ../libpurple/protocols/jabber/jabber.c:1554
 msgid "Bad Format"
 msgstr "Väärä muoto"
 
-#: ../libpurple/protocols/jabber/jabber.c:1562
+#: ../libpurple/protocols/jabber/jabber.c:1556
 msgid "Bad Namespace Prefix"
 msgstr "Väärä nimiavaruuden etuliite"
 
-#: ../libpurple/protocols/jabber/jabber.c:1565
+#: ../libpurple/protocols/jabber/jabber.c:1559
 msgid "Resource Conflict"
 msgstr "Sijaintikonflikti"
 
-#: ../libpurple/protocols/jabber/jabber.c:1567
+#: ../libpurple/protocols/jabber/jabber.c:1561
 #: ../libpurple/protocols/silc/silc.c:244
 #: ../libpurple/protocols/silc10/ops.c:1720
 msgid "Connection Timeout"
 msgstr "Ei yhteyttä määräajassa"
 
-#: ../libpurple/protocols/jabber/jabber.c:1569
+#: ../libpurple/protocols/jabber/jabber.c:1563
 msgid "Host Gone"
 msgstr "Verkkoisäntä kadonnut"
 
-#: ../libpurple/protocols/jabber/jabber.c:1571
+#: ../libpurple/protocols/jabber/jabber.c:1565
 msgid "Host Unknown"
 msgstr "Tuntematon isäntä"
 
+#: ../libpurple/protocols/jabber/jabber.c:1567
+msgid "Improper Addressing"
+msgstr "Vääränlainen osoitus"
+
+#: ../libpurple/protocols/jabber/jabber.c:1571
+msgid "Invalid ID"
+msgstr "Epäkelpo ID"
+
 #: ../libpurple/protocols/jabber/jabber.c:1573
-msgid "Improper Addressing"
-msgstr "Vääränlainen osoitus"
-
-#: ../libpurple/protocols/jabber/jabber.c:1577
-msgid "Invalid ID"
-msgstr "Epäkelpo ID"
-
-#: ../libpurple/protocols/jabber/jabber.c:1579
 msgid "Invalid Namespace"
 msgstr "Väärä nimiavaruus"
 
-#: ../libpurple/protocols/jabber/jabber.c:1581
+#: ../libpurple/protocols/jabber/jabber.c:1575
 msgid "Invalid XML"
 msgstr "Epäkelpo XML"
 
-#: ../libpurple/protocols/jabber/jabber.c:1583
+#: ../libpurple/protocols/jabber/jabber.c:1577
 msgid "Non-matching Hosts"
 msgstr "Verkkoisännät eivät täsmää"
 
-#: ../libpurple/protocols/jabber/jabber.c:1587
+#: ../libpurple/protocols/jabber/jabber.c:1581
 msgid "Policy Violation"
 msgstr "Menettelykäytäntörikkomus"
 
-#: ../libpurple/protocols/jabber/jabber.c:1589
+#: ../libpurple/protocols/jabber/jabber.c:1583
 msgid "Remote Connection Failed"
 msgstr "Etäyhteydessä yhteydessä virhe"
 
-#: ../libpurple/protocols/jabber/jabber.c:1591
+#: ../libpurple/protocols/jabber/jabber.c:1585
 msgid "Resource Constraint"
 msgstr "Sijaintirajoite"
 
-#: ../libpurple/protocols/jabber/jabber.c:1593
+#: ../libpurple/protocols/jabber/jabber.c:1587
 msgid "Restricted XML"
 msgstr "Rajoitettu XML"
 
-#: ../libpurple/protocols/jabber/jabber.c:1595
+#: ../libpurple/protocols/jabber/jabber.c:1589
 msgid "See Other Host"
 msgstr "Etsi toinen isäntä"
 
-#: ../libpurple/protocols/jabber/jabber.c:1597
+#: ../libpurple/protocols/jabber/jabber.c:1591
 msgid "System Shutdown"
 msgstr "Järjestelmän alasajo"
 
-#: ../libpurple/protocols/jabber/jabber.c:1599
+#: ../libpurple/protocols/jabber/jabber.c:1593
 msgid "Undefined Condition"
 msgstr "Määrittelemätön tila"
 
-#: ../libpurple/protocols/jabber/jabber.c:1601
+#: ../libpurple/protocols/jabber/jabber.c:1595
 msgid "Unsupported Encoding"
 msgstr "Merkistöä ei tueta"
 
-#: ../libpurple/protocols/jabber/jabber.c:1603
+#: ../libpurple/protocols/jabber/jabber.c:1597
 msgid "Unsupported Stanza Type"
 msgstr "Säkeistötyyppiä(stanza type) ei tuettu"
 
-#: ../libpurple/protocols/jabber/jabber.c:1605
+#: ../libpurple/protocols/jabber/jabber.c:1599
 msgid "Unsupported Version"
 msgstr "Versiota ei tueta"
 
-#: ../libpurple/protocols/jabber/jabber.c:1607
+#: ../libpurple/protocols/jabber/jabber.c:1601
 msgid "XML Not Well Formed"
 msgstr "Huonosti muotoiltua XML:ää"
 
-#: ../libpurple/protocols/jabber/jabber.c:1609
+#: ../libpurple/protocols/jabber/jabber.c:1603
 msgid "Stream Error"
 msgstr "Datavirtavirhe"
 
-#: ../libpurple/protocols/jabber/jabber.c:1676
+#: ../libpurple/protocols/jabber/jabber.c:1670
 #, c-format
 msgid "Unable to ban user %s"
 msgstr "Ei voitu kieltää käyttäjää %s."
 
-#: ../libpurple/protocols/jabber/jabber.c:1696
+#: ../libpurple/protocols/jabber/jabber.c:1690
 #, c-format
 msgid "Unknown affiliation: \"%s\""
 msgstr "Tuntematon kytkös: \"%s\""
 
-#: ../libpurple/protocols/jabber/jabber.c:1701
+#: ../libpurple/protocols/jabber/jabber.c:1695
 #, c-format
 msgid "Unable to affiliate user %s as \"%s\""
 msgstr "Ei voitua tehdä käyttäjälle %s kytköstä \"%s\""
 
-#: ../libpurple/protocols/jabber/jabber.c:1720
+#: ../libpurple/protocols/jabber/jabber.c:1714
 #, c-format
 msgid "Unknown role: \"%s\""
 msgstr "Tuntematon rooli: \"%s\""
 
-#: ../libpurple/protocols/jabber/jabber.c:1727
+#: ../libpurple/protocols/jabber/jabber.c:1721
 #, c-format
 msgid "Unable to set role \"%s\" for user: %s"
 msgstr "Ei voitu asettaa roolia \"%s\" käyttäjälle: %s"
 
-#: ../libpurple/protocols/jabber/jabber.c:1780
+#: ../libpurple/protocols/jabber/jabber.c:1774
 #, c-format
 msgid "Unable to kick user %s"
 msgstr "Ei voitu potkaista käyttäjää %s ulos."
 
-#: ../libpurple/protocols/jabber/jabber.c:1811
+#: ../libpurple/protocols/jabber/jabber.c:1805
 msgid "config:  Configure a chat room."
 msgstr "config: Configuroi ryhmäkeskusteluhuone."
 
-#: ../libpurple/protocols/jabber/jabber.c:1815
+#: ../libpurple/protocols/jabber/jabber.c:1809
 msgid "configure:  Configure a chat room."
 msgstr "configure: Configuroi ryhmäkeskusteluhuone."
 
-#: ../libpurple/protocols/jabber/jabber.c:1824
+#: ../libpurple/protocols/jabber/jabber.c:1818
 msgid "part [room]:  Leave the room."
 msgstr "part [huone]: Poistu huoneesta."
 
+#: ../libpurple/protocols/jabber/jabber.c:1823
+msgid "register:  Register with a chat room."
+msgstr "register: Rekisteröidy ryhmäkeskusteluhuoneeseen."
+
 #: ../libpurple/protocols/jabber/jabber.c:1829
-msgid "register:  Register with a chat room."
-msgstr "register: Rekisteröidy ryhmäkeskusteluhuoneeseen."
-
-#: ../libpurple/protocols/jabber/jabber.c:1835
 msgid "topic [new topic]:  View or change the topic."
 msgstr "topic [uusi aihe]: Näytä tai vaihda aihe."
 
-#: ../libpurple/protocols/jabber/jabber.c:1841
+#: ../libpurple/protocols/jabber/jabber.c:1835
 msgid "ban &lt;user&gt; [room]:  Ban a user from the room."
 msgstr "ban &lt;käyttäjä&gt; [huone]: Kiellä käyttäjä huoneesta."
 
-#: ../libpurple/protocols/jabber/jabber.c:1847
+#: ../libpurple/protocols/jabber/jabber.c:1841
 msgid ""
 "affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Set a user's "
 "affiliation with the room."
@@ -5002,7 +5050,7 @@
 "affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Aseta "
 "käyttäjän käyttäjäluokka tälle huoneelle."
 
-#: ../libpurple/protocols/jabber/jabber.c:1853
+#: ../libpurple/protocols/jabber/jabber.c:1847
 msgid ""
 "role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: Set a user's "
 "role in the room."
@@ -5010,20 +5058,20 @@
 "role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: Aseta "
 "käyttäjän rooli huoneessa."
 
-#: ../libpurple/protocols/jabber/jabber.c:1859
+#: ../libpurple/protocols/jabber/jabber.c:1853
 msgid "invite &lt;user&gt; [message]:  Invite a user to the room."
 msgstr "invite &lt;käyttäjä&gt; [viesti]: Kutsu käyttäjä huoneeseen."
 
-#: ../libpurple/protocols/jabber/jabber.c:1865
+#: ../libpurple/protocols/jabber/jabber.c:1859
 msgid "join: &lt;room&gt; [server]:  Join a chat on this server."
 msgstr ""
 "join: &lt;huone&gt; [palvelin]: Liity ryhmäkeskusteluun tällä palvelimella."
 
-#: ../libpurple/protocols/jabber/jabber.c:1871
+#: ../libpurple/protocols/jabber/jabber.c:1865
 msgid "kick &lt;user&gt; [room]:  Kick a user from the room."
 msgstr "kick &lt;käyttäjä&gt; [huone]: Potkaise käyttäjä ulos huoneesta."
 
-#: ../libpurple/protocols/jabber/jabber.c:1876
+#: ../libpurple/protocols/jabber/jabber.c:1870
 msgid ""
 "msg &lt;user&gt; &lt;message&gt;:  Send a private message to another user."
 msgstr ""
@@ -5039,33 +5087,33 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/jabber/libxmpp.c:166
-#: ../libpurple/protocols/jabber/libxmpp.c:168
+#: ../libpurple/protocols/jabber/libxmpp.c:169
+#: ../libpurple/protocols/jabber/libxmpp.c:171
 msgid "XMPP Protocol Plugin"
 msgstr "XMPP-yhteyskäytäntöliitännäinen"
 
 #. Translators: 'domain' is used here in the context of Internet domains, e.g. pidgin.im
-#: ../libpurple/protocols/jabber/libxmpp.c:195 ../pidgin/gtkaccount.c:505
+#: ../libpurple/protocols/jabber/libxmpp.c:198 ../pidgin/gtkaccount.c:508
 msgid "Domain"
 msgstr "Palvelin"
 
-#: ../libpurple/protocols/jabber/libxmpp.c:201
+#: ../libpurple/protocols/jabber/libxmpp.c:206
 msgid "Force old (port 5223) SSL"
 msgstr "Käytä vanhaa (portti 5223) SSL:ää"
 
-#: ../libpurple/protocols/jabber/libxmpp.c:206
+#: ../libpurple/protocols/jabber/libxmpp.c:211
 msgid "Allow plaintext auth over unencrypted streams"
 msgstr "Salli salaamaton tunnistautuminen salaamattoman yhteyden yli"
 
-#: ../libpurple/protocols/jabber/libxmpp.c:211
+#: ../libpurple/protocols/jabber/libxmpp.c:216
 #: ../libpurple/protocols/simple/simple.c:1856
 msgid "Connect port"
 msgstr "Yhdistä porttiin"
 
 #. Account options
-#: ../libpurple/protocols/jabber/libxmpp.c:215
-#: ../libpurple/protocols/silc/silc.c:1913
-#: ../libpurple/protocols/silc10/silc.c:1855 ../pidgin/gtkaccount.c:835
+#: ../libpurple/protocols/jabber/libxmpp.c:220
+#: ../libpurple/protocols/silc/silc.c:1914
+#: ../libpurple/protocols/silc10/silc.c:1857 ../pidgin/gtkaccount.c:837
 msgid "Connect server"
 msgstr "Yhdistä palvelimeen"
 
@@ -5107,16 +5155,16 @@
 msgid "XML Parse error"
 msgstr "Virhe XML-jäsennyksessä"
 
-#: ../libpurple/protocols/jabber/presence.c:279
+#: ../libpurple/protocols/jabber/presence.c:290
 msgid "Unknown Error in presence"
 msgstr "Tuntematon virhe tavoitettavuudessa"
 
-#: ../libpurple/protocols/jabber/presence.c:353
-#: ../libpurple/protocols/jabber/presence.c:354
+#: ../libpurple/protocols/jabber/presence.c:364
+#: ../libpurple/protocols/jabber/presence.c:365
 msgid "Create New Room"
 msgstr "Luo uusi huone"
 
-#: ../libpurple/protocols/jabber/presence.c:355
+#: ../libpurple/protocols/jabber/presence.c:366
 msgid ""
 "You are creating a new room.  Would you like to configure it, or accept the "
 "default settings?"
@@ -5124,20 +5172,20 @@
 "Olet luomassa uutta huonetta. Haluatko muuttaa asetuksia vai käytetäänkö "
 "oletusasetuksia?"
 
-#: ../libpurple/protocols/jabber/presence.c:361
+#: ../libpurple/protocols/jabber/presence.c:372
 msgid "_Configure Room"
 msgstr "_Aseta huoneen asetuksia"
 
-#: ../libpurple/protocols/jabber/presence.c:362
+#: ../libpurple/protocols/jabber/presence.c:373
 msgid "_Accept Defaults"
 msgstr "_Hyväksy oletusasetukset"
 
-#: ../libpurple/protocols/jabber/presence.c:399
+#: ../libpurple/protocols/jabber/presence.c:409
 #, c-format
 msgid "Error in chat %s"
 msgstr "Virhe ryhmäkeskustelussa: %s"
 
-#: ../libpurple/protocols/jabber/presence.c:402
+#: ../libpurple/protocols/jabber/presence.c:412
 #, c-format
 msgid "Error joining chat %s"
 msgstr "Virhe liityttäessä ryhmäkeskusteluun %s"
@@ -5395,7 +5443,7 @@
 msgstr "Palvelimella liikaa ruuhkaa "
 
 #: ../libpurple/protocols/msn/error.c:222
-#: ../libpurple/protocols/oscar/oscar.c:1363
+#: ../libpurple/protocols/oscar/oscar.c:1381
 #: ../libpurple/protocols/silc/silc.c:233
 #: ../libpurple/protocols/silc10/ops.c:1709
 #: ../libpurple/protocols/toc/toc.c:728 ../libpurple/proxy.c:1363
@@ -5577,12 +5625,12 @@
 msgstr "Virhe haettaessa profiilia"
 
 #: ../libpurple/protocols/msn/msn.c:1550 ../pidgin/plugins/convcolors.c:309
-#: ../pidgin/plugins/pidginrc.c:448
+#: ../pidgin/plugins/pidginrc.c:366
 msgid "General"
 msgstr "Yleinen"
 
 #: ../libpurple/protocols/msn/msn.c:1557
-#: ../libpurple/protocols/oscar/oscar.c:3743
+#: ../libpurple/protocols/oscar/oscar.c:3769
 #: ../libpurple/protocols/qq/buddy_info.c:45
 #: ../libpurple/protocols/qq/qq.c:219
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1057
@@ -5678,7 +5726,7 @@
 msgstr "Kotipuhelin 2"
 
 #: ../libpurple/protocols/msn/msn.c:1622
-#: ../libpurple/protocols/oscar/oscar.c:3781
+#: ../libpurple/protocols/oscar/oscar.c:3807
 msgid "Home Address"
 msgstr "Kotiosoite"
 
@@ -5714,7 +5762,7 @@
 msgstr "Tehtävänimike"
 
 #: ../libpurple/protocols/msn/msn.c:1647
-#: ../libpurple/protocols/oscar/oscar.c:3802
+#: ../libpurple/protocols/oscar/oscar.c:3828
 msgid "Company"
 msgstr "Yritys"
 
@@ -5736,7 +5784,7 @@
 msgstr "Työpuhelin 2"
 
 #: ../libpurple/protocols/msn/msn.c:1652
-#: ../libpurple/protocols/oscar/oscar.c:3794
+#: ../libpurple/protocols/oscar/oscar.c:3820
 msgid "Work Address"
 msgstr "Työosoite"
 
@@ -5847,8 +5895,8 @@
 #: ../libpurple/protocols/qq/udp_proxy_s5.c:268
 #: ../libpurple/protocols/qq/udp_proxy_s5.c:302
 #: ../libpurple/protocols/qq/udp_proxy_s5.c:332
-#: ../libpurple/protocols/yahoo/yahoochat.c:1357
-#: ../libpurple/protocols/yahoo/yahoochat.c:1383
+#: ../libpurple/protocols/yahoo/yahoochat.c:1320
+#: ../libpurple/protocols/yahoo/yahoochat.c:1346
 msgid "Unable to connect"
 msgstr "Yhteyden muodostaminen epäonnistui"
 
@@ -5960,7 +6008,7 @@
 msgstr "Virhe jäsennettäessä HTTP:tä."
 
 #: ../libpurple/protocols/msn/session.c:307
-#: ../libpurple/protocols/oscar/oscar.c:3455
+#: ../libpurple/protocols/oscar/oscar.c:3481
 #: ../libpurple/protocols/yahoo/yahoo.c:202
 msgid "You have signed on from another location."
 msgstr "Olet kirjautunut sisään toisesta paikasta."
@@ -6041,7 +6089,7 @@
 
 #: ../libpurple/protocols/msn/switchboard.c:424
 msgid ""
-"Message could not be sent because we wer unable to establish a session with "
+"Message could not be sent because we were unable to establish a session with "
 "the server. This is likely a server problem, try again in a few minutes:"
 msgstr ""
 "Viestiä ei voitu lähettää koska istuntoa palvelimen kanssa ei voitu "
@@ -6629,7 +6677,7 @@
 msgid "Not while on AOL"
 msgstr "Ei kun AOL on käytössä"
 
-#: ../libpurple/protocols/oscar/oscar.c:330
+#: ../libpurple/protocols/oscar/oscar.c:348
 msgid ""
 "(There was an error receiving this message.  The buddy you are speaking with "
 "is probably using a different encoding than expected.  If you know what "
@@ -6641,7 +6689,7 @@
 "merkistöä hän käyttää, voit määritellä sen AIM/ICQ-käyttäjätilisi "
 "lisäasetuksissa.)"
 
-#: ../libpurple/protocols/oscar/oscar.c:439
+#: ../libpurple/protocols/oscar/oscar.c:457
 #, c-format
 msgid ""
 "(There was an error receiving this message.  Either you and %s have "
@@ -6652,21 +6700,21 @@
 "asiakasohjelma.)"
 
 #. Label
-#: ../libpurple/protocols/oscar/oscar.c:621 ../pidgin/gtkutils.c:2309
-#: ../pidgin/gtkutils.c:2339
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:338
+#: ../libpurple/protocols/oscar/oscar.c:639 ../pidgin/gtkutils.c:2359
+#: ../pidgin/gtkutils.c:2389
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:334
 msgid "Buddy Icon"
 msgstr "Tuttavakuvake"
 
-#: ../libpurple/protocols/oscar/oscar.c:624
+#: ../libpurple/protocols/oscar/oscar.c:642
 msgid "Voice"
 msgstr "Ääni"
 
-#: ../libpurple/protocols/oscar/oscar.c:627
+#: ../libpurple/protocols/oscar/oscar.c:645
 msgid "AIM Direct IM"
 msgstr "AIM:n suora pikaviesti"
 
-#: ../libpurple/protocols/oscar/oscar.c:630
+#: ../libpurple/protocols/oscar/oscar.c:648
 #: ../libpurple/protocols/silc/silc.c:768
 #: ../libpurple/protocols/silc/util.c:553
 #: ../libpurple/protocols/silc10/silc.c:679
@@ -6674,124 +6722,124 @@
 msgid "Chat"
 msgstr "Keskustelu"
 
-#: ../libpurple/protocols/oscar/oscar.c:633
-#: ../libpurple/protocols/oscar/oscar.c:5962
+#: ../libpurple/protocols/oscar/oscar.c:651
+#: ../libpurple/protocols/oscar/oscar.c:5989
 msgid "Get File"
 msgstr "Vastaanota tiedosto"
 
-#: ../libpurple/protocols/oscar/oscar.c:640
+#: ../libpurple/protocols/oscar/oscar.c:658
 msgid "Games"
 msgstr "Pelit"
 
-#: ../libpurple/protocols/oscar/oscar.c:643
+#: ../libpurple/protocols/oscar/oscar.c:661
 msgid "Add-Ins"
 msgstr "Lisäykset"
 
-#: ../libpurple/protocols/oscar/oscar.c:646
+#: ../libpurple/protocols/oscar/oscar.c:664
 msgid "Send Buddy List"
 msgstr "Lähetä tuttavalista"
 
-#: ../libpurple/protocols/oscar/oscar.c:649
+#: ../libpurple/protocols/oscar/oscar.c:667
 msgid "ICQ Direct Connect"
 msgstr "ICQ-suorayhteys"
 
-#: ../libpurple/protocols/oscar/oscar.c:652
+#: ../libpurple/protocols/oscar/oscar.c:670
 msgid "AP User"
 msgstr "AP-käyttäjä"
 
-#: ../libpurple/protocols/oscar/oscar.c:655
+#: ../libpurple/protocols/oscar/oscar.c:673
 msgid "ICQ RTF"
 msgstr "ICQ RTF"
 
-#: ../libpurple/protocols/oscar/oscar.c:658
+#: ../libpurple/protocols/oscar/oscar.c:676
 msgid "Nihilist"
 msgstr "Nihilistinen"
 
-#: ../libpurple/protocols/oscar/oscar.c:661
-msgid "ICQ Server Relay"
-msgstr "ICQ-palvelimen välitys"
-
-#: ../libpurple/protocols/oscar/oscar.c:664
-msgid "Old ICQ UTF8"
-msgstr "Vanha ICQ UTF8"
-
-#: ../libpurple/protocols/oscar/oscar.c:667
-msgid "Trillian Encryption"
-msgstr "Trillian-salaus"
-
-#: ../libpurple/protocols/oscar/oscar.c:670
-msgid "ICQ UTF8"
-msgstr "ICQ UTF8"
-
-#: ../libpurple/protocols/oscar/oscar.c:673
-msgid "Hiptop"
-msgstr "Hiptop"
-
-#: ../libpurple/protocols/oscar/oscar.c:676
-msgid "Security Enabled"
-msgstr "Turvatoimet käytössä"
-
 #: ../libpurple/protocols/oscar/oscar.c:679
+msgid "ICQ Server Relay"
+msgstr "ICQ-palvelimen välitys"
+
+#: ../libpurple/protocols/oscar/oscar.c:682
+msgid "Old ICQ UTF8"
+msgstr "Vanha ICQ UTF8"
+
+#: ../libpurple/protocols/oscar/oscar.c:685
+msgid "Trillian Encryption"
+msgstr "Trillian-salaus"
+
+#: ../libpurple/protocols/oscar/oscar.c:688
+msgid "ICQ UTF8"
+msgstr "ICQ UTF8"
+
+#: ../libpurple/protocols/oscar/oscar.c:691
+msgid "Hiptop"
+msgstr "Hiptop"
+
+#: ../libpurple/protocols/oscar/oscar.c:694
+msgid "Security Enabled"
+msgstr "Turvatoimet käytössä"
+
+#: ../libpurple/protocols/oscar/oscar.c:697
 msgid "Video Chat"
 msgstr "Videokeskustelu"
 
-#: ../libpurple/protocols/oscar/oscar.c:683
+#: ../libpurple/protocols/oscar/oscar.c:701
 msgid "iChat AV"
 msgstr "iChat AV"
 
-#: ../libpurple/protocols/oscar/oscar.c:686
+#: ../libpurple/protocols/oscar/oscar.c:704
 msgid "Live Video"
 msgstr "Live-video"
 
-#: ../libpurple/protocols/oscar/oscar.c:689
+#: ../libpurple/protocols/oscar/oscar.c:707
 msgid "Camera"
 msgstr "Kamera"
 
-#: ../libpurple/protocols/oscar/oscar.c:707
-#: ../libpurple/protocols/oscar/oscar.c:5732
+#: ../libpurple/protocols/oscar/oscar.c:725
+#: ../libpurple/protocols/oscar/oscar.c:5759
 msgid "Free For Chat"
 msgstr "Vapaana keskusteluun"
 
-#: ../libpurple/protocols/oscar/oscar.c:711
-#: ../libpurple/protocols/oscar/oscar.c:5767
+#: ../libpurple/protocols/oscar/oscar.c:729
+#: ../libpurple/protocols/oscar/oscar.c:5794
 msgid "Not Available"
 msgstr "Ei tavoittevissa"
 
-#: ../libpurple/protocols/oscar/oscar.c:713
-#: ../libpurple/protocols/oscar/oscar.c:5753
+#: ../libpurple/protocols/oscar/oscar.c:731
+#: ../libpurple/protocols/oscar/oscar.c:5780
 msgid "Occupied"
 msgstr "Varattu"
 
-#: ../libpurple/protocols/oscar/oscar.c:717
+#: ../libpurple/protocols/oscar/oscar.c:735
 msgid "Web Aware"
 msgstr "Net-tietoinen"
 
-#: ../libpurple/protocols/oscar/oscar.c:719 ../libpurple/protocols/qq/qq.c:183
+#: ../libpurple/protocols/oscar/oscar.c:737 ../libpurple/protocols/qq/qq.c:183
 #: ../libpurple/protocols/yahoo/yahoo.c:2913 ../libpurple/status.c:156
-#: ../pidgin/gtkdocklet.c:446 ../pidgin/gtkstatusbox.c:1053
+#: ../pidgin/gtkdocklet.c:446 ../pidgin/gtkstatusbox.c:1058
 msgid "Invisible"
 msgstr "Näkymätön"
 
-#: ../libpurple/protocols/oscar/oscar.c:721
+#: ../libpurple/protocols/oscar/oscar.c:739
 msgid "Online"
 msgstr "Linjoilla"
 
-#: ../libpurple/protocols/oscar/oscar.c:820
-#: ../libpurple/protocols/oscar/oscar.c:3695
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:697 ../pidgin/gtkprefs.c:1052
+#: ../libpurple/protocols/oscar/oscar.c:838
+#: ../libpurple/protocols/oscar/oscar.c:3721
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:697 ../pidgin/gtkprefs.c:1121
 msgid "IP Address"
 msgstr "IP-osoite"
 
-#: ../libpurple/protocols/oscar/oscar.c:827
-#: ../libpurple/protocols/oscar/oscar.c:2847
+#: ../libpurple/protocols/oscar/oscar.c:845
+#: ../libpurple/protocols/oscar/oscar.c:2867
 msgid "Warning Level"
 msgstr "Varoitustaso"
 
-#: ../libpurple/protocols/oscar/oscar.c:837
+#: ../libpurple/protocols/oscar/oscar.c:855
 msgid "Buddy Comment"
 msgstr "Tuttavakommentti"
 
-#: ../libpurple/protocols/oscar/oscar.c:977
+#: ../libpurple/protocols/oscar/oscar.c:995
 #, c-format
 msgid ""
 "Could not connect to authentication server:\n"
@@ -6800,7 +6848,7 @@
 "Ei saatu yhteyttä todentamispalvelimeen:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:985
+#: ../libpurple/protocols/oscar/oscar.c:1003
 #, c-format
 msgid ""
 "Could not connect to BOS server:\n"
@@ -6809,53 +6857,54 @@
 "Ei saatu yhteyttä BOS-palvelimeen:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:1025
+#: ../libpurple/protocols/oscar/oscar.c:1043
 msgid "Screen name sent"
 msgstr "Näyttönimi lähetetty"
 
-#: ../libpurple/protocols/oscar/oscar.c:1030
+#: ../libpurple/protocols/oscar/oscar.c:1048
 msgid "Connection established, cookie sent"
 msgstr "Yhteys muodostettu, eväste lähetetty"
 
 #. TODO: Don't call this with ssi
-#: ../libpurple/protocols/oscar/oscar.c:1059
+#: ../libpurple/protocols/oscar/oscar.c:1077
 msgid "Finalizing connection"
 msgstr "Viimeistellään yhteyttä"
 
-#: ../libpurple/protocols/oscar/oscar.c:1243
+#: ../libpurple/protocols/oscar/oscar.c:1261
 #, c-format
 msgid ""
 "Unable to login: Could not sign on as %s because the screen name is "
-"invalid.  Screen names must either start with a letter and contain only "
-"letters, numbers and spaces, or contain only numbers."
+"invalid.  Screen names must be a valid email address, or start with a letter "
+"and contain only letters, numbers and spaces, or contain only numbers."
 msgstr ""
 "Ei voitu kirjautua: Ei voitu kirjautua käyttäjänä %s koska näyttönimi on "
-"virheellinen. Näyttönimien tulee alkaa joko kirjaimella ja sisältää vain "
-"kirjaimia, numeroita ja välilyöntejä tai sisältää vain numeroita."
-
-#: ../libpurple/protocols/oscar/oscar.c:1328
+"virheellinen. Näyttönimen tulee olla oikea sähköpostiosoite, tai alkaa "
+"kirjaimella ja sisältää vain kirjaimia, numeroita ja välilyöntejä, tai "
+"sisältää vain numeroita."
+
+#: ../libpurple/protocols/oscar/oscar.c:1346
 #: ../libpurple/protocols/yahoo/yahoo.c:1934
 msgid "Invalid screen name."
 msgstr "Epäkelpo näyttöjänimi."
 
-#: ../libpurple/protocols/oscar/oscar.c:1335
+#: ../libpurple/protocols/oscar/oscar.c:1353
 #: ../libpurple/protocols/qq/login_logout.c:483
 #: ../libpurple/protocols/simple/simple.c:1037
 #: ../libpurple/protocols/yahoo/yahoo.c:1952
 msgid "Incorrect password."
 msgstr "Virheellinen salasana."
 
-#: ../libpurple/protocols/oscar/oscar.c:1340
+#: ../libpurple/protocols/oscar/oscar.c:1358
 msgid "Your account is currently suspended."
 msgstr "Käyttäjätilisi palvelu on parhaillaan keskeytetty."
 
 #. service temporarily unavailable
-#: ../libpurple/protocols/oscar/oscar.c:1344
+#: ../libpurple/protocols/oscar/oscar.c:1362
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr "AOL-pikaviestipalvelu ei tilapäisesti ole käytössä."
 
-#: ../libpurple/protocols/oscar/oscar.c:1349
-#: ../libpurple/protocols/oscar/oscar.c:1360
+#: ../libpurple/protocols/oscar/oscar.c:1367
+#: ../libpurple/protocols/oscar/oscar.c:1378
 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."
@@ -6864,44 +6913,44 @@
 "ja yritä uudelleen. Jos jatkat yrittämistä, joudut odottamaan vielä "
 "pidempään."
 
-#: ../libpurple/protocols/oscar/oscar.c:1354
+#: ../libpurple/protocols/oscar/oscar.c:1372
 #, c-format
 msgid "The client version you are using is too old. Please upgrade at %s"
 msgstr "Asiakasohjelmasi versio on liian vanha. Päivitä osoitteessa %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:1394
+#: ../libpurple/protocols/oscar/oscar.c:1412
 msgid "Could Not Connect"
 msgstr "Yhteyttä ei voitu muodostaa"
 
-#: ../libpurple/protocols/oscar/oscar.c:1399
+#: ../libpurple/protocols/oscar/oscar.c:1417
 msgid "Received authorization"
 msgstr "Saatiin lupa"
 
-#: ../libpurple/protocols/oscar/oscar.c:1422
+#: ../libpurple/protocols/oscar/oscar.c:1440
 msgid "The SecurID key entered is invalid."
 msgstr "Syötetty SecurID-avain on virheellinen."
 
-#: ../libpurple/protocols/oscar/oscar.c:1436
+#: ../libpurple/protocols/oscar/oscar.c:1454
 msgid "Enter SecurID"
 msgstr "Syötä SecurID"
 
-#: ../libpurple/protocols/oscar/oscar.c:1437
+#: ../libpurple/protocols/oscar/oscar.c:1455
 msgid "Enter the 6 digit number from the digital display."
 msgstr "Syötä 6 numeroinen luku digitaaliselta näytöltä."
 
 #. *
 #. * A wrapper for purple_request_action() that uses @c OK and @c Cancel buttons.
 #.
-#: ../libpurple/protocols/oscar/oscar.c:1439
-#: ../libpurple/protocols/oscar/oscar.c:2231
-#: ../libpurple/protocols/oscar/oscar.c:2278
-#: ../libpurple/protocols/oscar/oscar.c:5837
-#: ../libpurple/protocols/oscar/oscar.c:6118 ../libpurple/request.h:1387
+#: ../libpurple/protocols/oscar/oscar.c:1457
+#: ../libpurple/protocols/oscar/oscar.c:2250
+#: ../libpurple/protocols/oscar/oscar.c:2297
+#: ../libpurple/protocols/oscar/oscar.c:5864
+#: ../libpurple/protocols/oscar/oscar.c:6145 ../libpurple/request.h:1387
 msgid "_OK"
 msgstr "_OK"
 
-#: ../libpurple/protocols/oscar/oscar.c:1478
-#: ../libpurple/protocols/oscar/oscar.c:1521
+#: ../libpurple/protocols/oscar/oscar.c:1496
+#: ../libpurple/protocols/oscar/oscar.c:1539
 #, c-format
 msgid ""
 "You may be disconnected shortly.  You may want to use TOC until this is "
@@ -6910,53 +6959,53 @@
 "Yhteytesi saatetaan katkaista kohta. Saatat haluta käyttää TOC-"
 "yhteyskäytäntöä kunnes tämä on korjattu. Tarkista päivitykset: %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:1481
-#: ../libpurple/protocols/oscar/oscar.c:1524
+#: ../libpurple/protocols/oscar/oscar.c:1499
+#: ../libpurple/protocols/oscar/oscar.c:1542
 msgid "Unable to get a valid AIM login hash."
 msgstr "Kelvollista AIM-sisäänkirjautumistiivistettä ei saatu."
 
-#: ../libpurple/protocols/oscar/oscar.c:1609
+#: ../libpurple/protocols/oscar/oscar.c:1627
 #, c-format
 msgid "You may be disconnected shortly.  Check %s for updates."
 msgstr "Yhteytesi saatetaan katkaista kohta. Tarkista päivitykset: %s."
 
-#: ../libpurple/protocols/oscar/oscar.c:1612
+#: ../libpurple/protocols/oscar/oscar.c:1630
 msgid "Unable to get a valid login hash."
 msgstr "Kelvollista sisäänkirjautumistiivistettä ei saatu."
 
-#: ../libpurple/protocols/oscar/oscar.c:1641
+#: ../libpurple/protocols/oscar/oscar.c:1659
 msgid "Password sent"
 msgstr "Salasana lähetetty"
 
-#: ../libpurple/protocols/oscar/oscar.c:1697
+#: ../libpurple/protocols/oscar/oscar.c:1715
 msgid "Unable to initialize connection"
 msgstr "Yhteyden luominen epäonnistui"
 
-#: ../libpurple/protocols/oscar/oscar.c:2201
+#: ../libpurple/protocols/oscar/oscar.c:2220
 msgid "Please authorize me so I can add you to my buddy list."
 msgstr "Valtuuttaisitko minut, jotta voin lisätä sinut tuttavalistalleni?"
 
-#: ../libpurple/protocols/oscar/oscar.c:2229
+#: ../libpurple/protocols/oscar/oscar.c:2248
 msgid "Authorization Request Message:"
 msgstr "Valtuutuksen pyyntöviesti:"
 
-#: ../libpurple/protocols/oscar/oscar.c:2230
+#: ../libpurple/protocols/oscar/oscar.c:2249
 msgid "Please authorize me!"
 msgstr "Voisitko valtuuttaa minut?"
 
-#: ../libpurple/protocols/oscar/oscar.c:2270
-#: ../libpurple/protocols/oscar/oscar.c:2277
-#: ../libpurple/protocols/oscar/oscar.c:2404
-#: ../libpurple/protocols/oscar/oscar.c:5215
+#: ../libpurple/protocols/oscar/oscar.c:2289
+#: ../libpurple/protocols/oscar/oscar.c:2296
+#: ../libpurple/protocols/oscar/oscar.c:2423
+#: ../libpurple/protocols/oscar/oscar.c:5242
 #: ../libpurple/protocols/yahoo/yahoo.c:987
 msgid "No reason given."
 msgstr "Syytä ei annettu."
 
-#: ../libpurple/protocols/oscar/oscar.c:2276
+#: ../libpurple/protocols/oscar/oscar.c:2295
 msgid "Authorization Denied Message:"
 msgstr "Valtuutuspyyntö evätty:"
 
-#: ../libpurple/protocols/oscar/oscar.c:2404
+#: ../libpurple/protocols/oscar/oscar.c:2423
 #, c-format
 msgid ""
 "The user %u has denied your request to add them to your buddy list for the "
@@ -6967,17 +7016,17 @@
 "syystä:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2405
+#: ../libpurple/protocols/oscar/oscar.c:2424
 msgid "ICQ authorization denied."
 msgstr "ICQ-valtuutus evätty."
 
 #. Someone has granted you authorization
-#: ../libpurple/protocols/oscar/oscar.c:2412
+#: ../libpurple/protocols/oscar/oscar.c:2431
 #, c-format
 msgid "The user %u has granted your request to add them to your buddy list."
 msgstr "Käyttäjä %u on hyväksynyt pyyntösi lisätä hänet tuttavalistallesi."
 
-#: ../libpurple/protocols/oscar/oscar.c:2420
+#: ../libpurple/protocols/oscar/oscar.c:2439
 #, c-format
 msgid ""
 "You have received a special message\n"
@@ -6990,7 +7039,7 @@
 "Lähettäjä: %s [%s]\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2428
+#: ../libpurple/protocols/oscar/oscar.c:2447
 #, c-format
 msgid ""
 "You have received an ICQ page\n"
@@ -7003,7 +7052,7 @@
 "Lähettäjä: %s [%s]\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2436
+#: ../libpurple/protocols/oscar/oscar.c:2455
 #, c-format
 msgid ""
 "You have received an ICQ e-mail from %s [%s]\n"
@@ -7016,38 +7065,38 @@
 "Viesti on:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2457
+#: ../libpurple/protocols/oscar/oscar.c:2476
 #, c-format
 msgid "ICQ user %u has sent you a buddy: %s (%s)"
 msgstr "ICQ-käyttäjä %u on lähettänyt sinulle tuttavan: %s (%s)"
 
-#: ../libpurple/protocols/oscar/oscar.c:2463
+#: ../libpurple/protocols/oscar/oscar.c:2482
 msgid "Do you want to add this buddy to your buddy list?"
 msgstr "Haluatko lisätä hänet tuttavalistallesi?"
 
-#: ../libpurple/protocols/oscar/oscar.c:2468 ../pidgin/gtkroomlist.c:308
+#: ../libpurple/protocols/oscar/oscar.c:2487 ../pidgin/gtkroomlist.c:308
 msgid "_Add"
 msgstr "_Lisää"
 
-#: ../libpurple/protocols/oscar/oscar.c:2469
+#: ../libpurple/protocols/oscar/oscar.c:2488
 msgid "_Decline"
 msgstr "_Kieltäydy"
 
-#: ../libpurple/protocols/oscar/oscar.c:2553
+#: ../libpurple/protocols/oscar/oscar.c:2572
 #, c-format
 msgid "You missed %hu message from %s because it was invalid."
 msgid_plural "You missed %hu messages from %s because they were invalid."
 msgstr[0] "Et saanut %hu viestiä %s:lta koska se oli epäkelpo."
 msgstr[1] "Et saanut %hu viestiä %s:lta koska ne olivat epäkelpoja."
 
-#: ../libpurple/protocols/oscar/oscar.c:2562
+#: ../libpurple/protocols/oscar/oscar.c:2581
 #, c-format
 msgid "You missed %hu message from %s because it was too large."
 msgid_plural "You missed %hu messages from %s because they were too large."
 msgstr[0] "Et saanut %hu viestiä %s:lta koska se oli liian suuri."
 msgstr[1] "Et saanut %hu viestiä %s:lta koska ne olivat liian suuria."
 
-#: ../libpurple/protocols/oscar/oscar.c:2571
+#: ../libpurple/protocols/oscar/oscar.c:2590
 #, c-format
 msgid ""
 "You missed %hu message from %s because the rate limit has been exceeded."
@@ -7056,21 +7105,21 @@
 msgstr[0] "Et saanut %hu viestiä %s:lta koska taajuusraja ylittyi."
 msgstr[1] "Et saanut %hu viestiä %s:lta koska taajuusraja ylittyi."
 
-#: ../libpurple/protocols/oscar/oscar.c:2580
+#: ../libpurple/protocols/oscar/oscar.c:2599
 #, c-format
 msgid "You missed %hu message from %s because he/she was too evil."
 msgid_plural "You missed %hu messages from %s because he/she was too evil."
 msgstr[0] "Et saanut %hu viestiä %s:lta koska hän on liian hirveä."
 msgstr[1] "Et saanut %hu viestiä %s:lta koska hän on liian hirveä."
 
-#: ../libpurple/protocols/oscar/oscar.c:2589
+#: ../libpurple/protocols/oscar/oscar.c:2608
 #, c-format
 msgid "You missed %hu message from %s because you are too evil."
 msgid_plural "You missed %hu messages from %s because you are too evil."
 msgstr[0] "Et saanut %hu viestiä %s:lta koska olet liian hirveä."
 msgstr[1] "Et saanut %hu viestiä %s:lta koska olet liian hirveä."
 
-#: ../libpurple/protocols/oscar/oscar.c:2598
+#: ../libpurple/protocols/oscar/oscar.c:2617
 #, 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."
@@ -7078,61 +7127,55 @@
 msgstr[1] "Et saanut %hu viestiä %s:lta tuntemattomasta syystä."
 
 #. Data is assumed to be the destination sn
-#: ../libpurple/protocols/oscar/oscar.c:2753
+#: ../libpurple/protocols/oscar/oscar.c:2772
 #, c-format
 msgid "Unable to send message: %s"
 msgstr "Viestiä ei voitu lähettää: %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2753
-#: ../libpurple/protocols/oscar/oscar.c:2758
-#: ../libpurple/protocols/oscar/oscar.c:2820
-#: ../libpurple/protocols/oscar/oscar.c:2824
+#: ../libpurple/protocols/oscar/oscar.c:2772
+#: ../libpurple/protocols/oscar/oscar.c:2777
+#: ../libpurple/protocols/oscar/oscar.c:2841
 msgid "Unknown reason."
 msgstr "Tuntematon syy."
 
-#: ../libpurple/protocols/oscar/oscar.c:2756
+#: ../libpurple/protocols/oscar/oscar.c:2775
 #: ../libpurple/protocols/sametime/sametime.c:2409
 #, c-format
 msgid "Unable to send message to %s:"
 msgstr "Viestiä ei voitu lähettää käyttäjälle %s."
 
-#: ../libpurple/protocols/oscar/oscar.c:2820
+#: ../libpurple/protocols/oscar/oscar.c:2841
 #, c-format
 msgid "User information not available: %s"
 msgstr "Käyttäjätiedot eivät ole saatavilla: %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2823
-#, c-format
-msgid "User information for %s unavailable:"
-msgstr "%s:n käyttäjätiedot eivät ole saatavilla"
-
-#: ../libpurple/protocols/oscar/oscar.c:2852
+#: ../libpurple/protocols/oscar/oscar.c:2872
 msgid "Online Since"
 msgstr "Kirjautunut"
 
-#: ../libpurple/protocols/oscar/oscar.c:2857
+#: ../libpurple/protocols/oscar/oscar.c:2877
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1161
 msgid "Member Since"
 msgstr "Rekisteröitynyt"
 
-#: ../libpurple/protocols/oscar/oscar.c:2862
+#: ../libpurple/protocols/oscar/oscar.c:2882
 msgid "Capabilities"
 msgstr "Kyvyt"
 
-#: ../libpurple/protocols/oscar/oscar.c:2892
+#: ../libpurple/protocols/oscar/oscar.c:2912
 msgid "Available Message"
 msgstr "Paikallaoloviesti"
 
-#: ../libpurple/protocols/oscar/oscar.c:2918
+#: ../libpurple/protocols/oscar/oscar.c:2940
 msgid "Profile"
 msgstr "Profiili"
 
-#: ../libpurple/protocols/oscar/oscar.c:2995
+#: ../libpurple/protocols/oscar/oscar.c:3020
 msgid "Your AIM connection may be lost."
 msgstr "AIM-yhteytesi saattaa olla katkennut."
 
 #. The conversion failed!
-#: ../libpurple/protocols/oscar/oscar.c:3182
+#: ../libpurple/protocols/oscar/oscar.c:3208
 msgid ""
 "[Unable to display a message from this user because it contained invalid "
 "characters.]"
@@ -7140,7 +7183,7 @@
 "[Ei voitu näyttää viestiä tältä käyttäjältä koska se sisälsi epäkelpoja "
 "merkkejä.]"
 
-#: ../libpurple/protocols/oscar/oscar.c:3385
+#: ../libpurple/protocols/oscar/oscar.c:3411
 msgid ""
 "The last action you attempted could not be performed because you are over "
 "the rate limit. Please wait 10 seconds and try again."
@@ -7148,86 +7191,86 @@
 "Viimeistä viestiä ei lähetetty koska olet ylittänyt taajuusrajan. Odota 10 "
 "sekuntia ja yritä uudelleen."
 
-#: ../libpurple/protocols/oscar/oscar.c:3457
+#: ../libpurple/protocols/oscar/oscar.c:3483
 msgid "You have been signed off for an unknown reason."
 msgstr "Yhteytesi on katkaistu tuntemattomasta syystä."
 
-#: ../libpurple/protocols/oscar/oscar.c:3470
+#: ../libpurple/protocols/oscar/oscar.c:3496
 #: ../libpurple/protocols/toc/toc.c:977
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "Yhteytesi keskusteluhuoneeseen %s on katkennut."
 
-#: ../libpurple/protocols/oscar/oscar.c:3717
+#: ../libpurple/protocols/oscar/oscar.c:3743
 #: ../libpurple/protocols/silc/util.c:585
 #: ../libpurple/protocols/silc10/util.c:581
 msgid "Mobile Phone"
 msgstr "Matkapuhelin"
 
-#: ../libpurple/protocols/oscar/oscar.c:3747
+#: ../libpurple/protocols/oscar/oscar.c:3773
 msgid "Personal Web Page"
 msgstr "Henkilökohtainen kotisivu"
 
-#: ../libpurple/protocols/oscar/oscar.c:3771
+#: ../libpurple/protocols/oscar/oscar.c:3797
 #: ../libpurple/protocols/qq/buddy_info.c:40
 msgid "Additional Information"
 msgstr "Lisätiedot"
 
-#: ../libpurple/protocols/oscar/oscar.c:3779
-#: ../libpurple/protocols/oscar/oscar.c:3792
+#: ../libpurple/protocols/oscar/oscar.c:3805
+#: ../libpurple/protocols/oscar/oscar.c:3818
 msgid "Zip Code"
 msgstr "Postinumero"
 
-#: ../libpurple/protocols/oscar/oscar.c:3803
+#: ../libpurple/protocols/oscar/oscar.c:3829
 msgid "Division"
 msgstr "Osasto"
 
-#: ../libpurple/protocols/oscar/oscar.c:3804
+#: ../libpurple/protocols/oscar/oscar.c:3830
 msgid "Position"
 msgstr "Asema"
 
-#: ../libpurple/protocols/oscar/oscar.c:3806
+#: ../libpurple/protocols/oscar/oscar.c:3832
 msgid "Web Page"
 msgstr "Kotisivu"
 
-#: ../libpurple/protocols/oscar/oscar.c:3809
+#: ../libpurple/protocols/oscar/oscar.c:3835
 msgid "Work Information"
 msgstr "Työtiedot"
 
-#: ../libpurple/protocols/oscar/oscar.c:3865
+#: ../libpurple/protocols/oscar/oscar.c:3891
 msgid "Pop-Up Message"
 msgstr "Ponnahdusviesti"
 
-#: ../libpurple/protocols/oscar/oscar.c:3905
+#: ../libpurple/protocols/oscar/oscar.c:3931
 #, c-format
 msgid "The following screen name is associated with %s"
 msgid_plural "The following screen names are associated with %s"
 msgstr[0] "Seuraava näyttönimi on assosioitu %s kanssa"
 msgstr[1] "Seuraavat näyttönimet on assosioitu %s kanssa"
 
-#: ../libpurple/protocols/oscar/oscar.c:3910
+#: ../libpurple/protocols/oscar/oscar.c:3936
 msgid "Screen name"
 msgstr "Näyttönimi"
 
-#: ../libpurple/protocols/oscar/oscar.c:3936
+#: ../libpurple/protocols/oscar/oscar.c:3962
 #, c-format
 msgid "No results found for e-mail address %s"
 msgstr "Ei hakutuloksia sähköpostiosoitteelle %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:3957
+#: ../libpurple/protocols/oscar/oscar.c:3983
 #, c-format
 msgid "You should receive an e-mail asking to confirm %s."
 msgstr "Sinun tulisi saada sähköpostiviesti %s:n varmistusta varten."
 
-#: ../libpurple/protocols/oscar/oscar.c:3959
+#: ../libpurple/protocols/oscar/oscar.c:3985
 msgid "Account Confirmation Requested"
 msgstr "Tilin varmistusta pyydetty"
 
-#: ../libpurple/protocols/oscar/oscar.c:3990
+#: ../libpurple/protocols/oscar/oscar.c:4016
 msgid "Error Changing Account Info"
 msgstr "Virhe muutettaessa käyttäjätilin tietoja"
 
-#: ../libpurple/protocols/oscar/oscar.c:3993
+#: ../libpurple/protocols/oscar/oscar.c:4019
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
@@ -7236,14 +7279,14 @@
 "Virhe 0x%04x: Näyttönimeä ei voi muotoilla koska pyydetty näyttönimi eroaa "
 "alkuperäisestä."
 
-#: ../libpurple/protocols/oscar/oscar.c:3996
+#: ../libpurple/protocols/oscar/oscar.c:4022
 #, c-format
 msgid "Error 0x%04x: Unable to format screen name because it is invalid."
 msgstr ""
 "Virhe 0x%04x: Näyttönimeä ei voi muotoilla koska pyydetty näyttönimi on "
 "virheellinen."
 
-#: ../libpurple/protocols/oscar/oscar.c:3999
+#: ../libpurple/protocols/oscar/oscar.c:4025
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
@@ -7252,7 +7295,7 @@
 "Virhe 0x%04x: Näyttönimeä ei voi muotoilla koska pyydetty näyttönimi on "
 "liian pitkä."
 
-#: ../libpurple/protocols/oscar/oscar.c:4002
+#: ../libpurple/protocols/oscar/oscar.c:4028
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change e-mail address because there is already a "
@@ -7261,7 +7304,7 @@
 "Virhe 0x%04x: Sähköpostiosoitetta ei voida muuttaa koska tälle näyttönimelle "
 "on jo käsittelemätön muutospyyntö."
 
-#: ../libpurple/protocols/oscar/oscar.c:4005
+#: ../libpurple/protocols/oscar/oscar.c:4031
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change e-mail address because the given address has "
@@ -7270,7 +7313,7 @@
 "Virhe 0x%04x: Sähköpostiosoitetta ei voida muuttaa koska annettu osoite on "
 "assosioitu liian moneen näyttönimeen."
 
-#: ../libpurple/protocols/oscar/oscar.c:4008
+#: ../libpurple/protocols/oscar/oscar.c:4034
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change e-mail address because the given address is "
@@ -7279,32 +7322,32 @@
 "Virhe 0x%04x: Sähköpostiosoitetta ei voida muuttaa koska annettu osoite on "
 "virheellinen."
 
-#: ../libpurple/protocols/oscar/oscar.c:4011
+#: ../libpurple/protocols/oscar/oscar.c:4037
 #, c-format
 msgid "Error 0x%04x: Unknown error."
 msgstr "Virhe 0x%04x: Tuntematon virhe."
 
-#: ../libpurple/protocols/oscar/oscar.c:4021
+#: ../libpurple/protocols/oscar/oscar.c:4047
 #, c-format
 msgid "The e-mail address for %s is %s"
 msgstr "%s:n sähköpostiosoite on %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:4023
+#: ../libpurple/protocols/oscar/oscar.c:4049
 msgid "Account Info"
 msgstr "Tilin tiedot"
 
-#: ../libpurple/protocols/oscar/oscar.c:4195
+#: ../libpurple/protocols/oscar/oscar.c:4221
 msgid ""
 "Your IM Image was not sent. You must be Direct Connected to send IM Images."
 msgstr ""
 "Pikaviesti kuvaasi ei lähetetty. Sinun tulee käyttää suorayhteyttä "
 "lähettääksesi pikaviestikuvia."
 
-#: ../libpurple/protocols/oscar/oscar.c:4461
+#: ../libpurple/protocols/oscar/oscar.c:4487
 msgid "Unable to set AIM profile."
 msgstr "AIM-profiilia ei saatu asetettua."
 
-#: ../libpurple/protocols/oscar/oscar.c:4462
+#: ../libpurple/protocols/oscar/oscar.c:4488
 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 "
@@ -7314,7 +7357,7 @@
 "suoritettua loppuun. Profiilia ei asetettu. Yritä asettaa se kun "
 "kirjautuminen on suoritettu."
 
-#: ../libpurple/protocols/oscar/oscar.c:4476
+#: ../libpurple/protocols/oscar/oscar.c:4502
 #, c-format
 msgid ""
 "The maximum profile length of %d byte has been exceeded.  It has been "
@@ -7327,11 +7370,11 @@
 msgstr[1] ""
 "Maksimi profiilin koko %d tavua ylitetty.  Se on nyt lyhennetty puolestasi."
 
-#: ../libpurple/protocols/oscar/oscar.c:4481
+#: ../libpurple/protocols/oscar/oscar.c:4507
 msgid "Profile too long."
 msgstr "Profiili on liian pitkä."
 
-#: ../libpurple/protocols/oscar/oscar.c:4526
+#: ../libpurple/protocols/oscar/oscar.c:4552
 #, c-format
 msgid ""
 "The maximum away message length of %d byte has been exceeded.  It has been "
@@ -7346,32 +7389,32 @@
 "Maksimi poissaoloviestin koko %d tavua ylitetty. Viesti lyhennettiin "
 "puolestasi."
 
-#: ../libpurple/protocols/oscar/oscar.c:4531
+#: ../libpurple/protocols/oscar/oscar.c:4557
 msgid "Away message too long."
 msgstr "Poissaoloviesti on liian pitkä."
 
-#: ../libpurple/protocols/oscar/oscar.c:4600
+#: ../libpurple/protocols/oscar/oscar.c:4626
 #, c-format
 msgid ""
 "Could not add the buddy %s because the screen name is invalid.  Screen names "
-"must either start with a letter and contain only letters, numbers and "
-"spaces, or contain only numbers."
-msgstr ""
-"Ei voitu lisätä tuttavaa %s koska näyttönimi on virheellinen. Näyttönimen \n"
-"tulee alkaa joko kirjaimella ja sisältää vain kirjaimia, numeroita ja \n"
-"välilyöntejä tai sisältää vain numeroita."
-
-#: ../libpurple/protocols/oscar/oscar.c:4602
-#: ../libpurple/protocols/oscar/oscar.c:5025
-#: ../libpurple/protocols/oscar/oscar.c:5039
+"must be a valid email address, or start with a letter and contain only "
+"letters, numbers and spaces, or contain only numbers."
+msgstr ""
+"Ei voitu lisätä tuttavaa %s koska näyttönimi on virheellinen. Näyttönimen "
+"tulee olla oikea sähköpostiosoite, tai alkaa kirjaimella ja sisältää vain "
+"kirjaimia, numeroita ja välilyöntejä, tai sisältää vain numeroita."
+
+#: ../libpurple/protocols/oscar/oscar.c:4628
+#: ../libpurple/protocols/oscar/oscar.c:5051
+#: ../libpurple/protocols/oscar/oscar.c:5066
 msgid "Unable To Add"
 msgstr "Lisääminen epäonnistui"
 
-#: ../libpurple/protocols/oscar/oscar.c:4706
+#: ../libpurple/protocols/oscar/oscar.c:4732
 msgid "Unable To Retrieve Buddy List"
 msgstr "Tuttavalistan nouto ei onnistunut"
 
-#: ../libpurple/protocols/oscar/oscar.c:4707
+#: ../libpurple/protocols/oscar/oscar.c:4733
 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."
@@ -7379,16 +7422,16 @@
 "Tuttavalistan hakeminen AIM-pavelimelta epäonnistui. Tuttavalistasi ei ole "
 "kadonnut, se tulee luultavasti saataville muutamassa tunnissa."
 
-#: ../libpurple/protocols/oscar/oscar.c:4911
-#: ../libpurple/protocols/oscar/oscar.c:4912
-#: ../libpurple/protocols/oscar/oscar.c:4917
-#: ../libpurple/protocols/oscar/oscar.c:5093
-#: ../libpurple/protocols/oscar/oscar.c:5094
-#: ../libpurple/protocols/oscar/oscar.c:5099
+#: ../libpurple/protocols/oscar/oscar.c:4937
+#: ../libpurple/protocols/oscar/oscar.c:4938
+#: ../libpurple/protocols/oscar/oscar.c:4943
+#: ../libpurple/protocols/oscar/oscar.c:5120
+#: ../libpurple/protocols/oscar/oscar.c:5121
+#: ../libpurple/protocols/oscar/oscar.c:5126
 msgid "Orphans"
 msgstr "Orvot"
 
-#: ../libpurple/protocols/oscar/oscar.c:5023
+#: ../libpurple/protocols/oscar/oscar.c:5049
 #, c-format
 msgid ""
 "Could not add the buddy %s because you have too many buddies in your buddy "
@@ -7397,22 +7440,17 @@
 "Ei voitu lisätä tuttavaa %s koska listallasi on liian monta tuttavaa. Ole "
 "hyvä ja poista joku ja yritä uudelleen."
 
-#: ../libpurple/protocols/oscar/oscar.c:5023
-#: ../libpurple/protocols/oscar/oscar.c:5037
+#: ../libpurple/protocols/oscar/oscar.c:5049
+#: ../libpurple/protocols/oscar/oscar.c:5064
 msgid "(no name)"
 msgstr "(nimetön)"
 
-#: ../libpurple/protocols/oscar/oscar.c:5037
-#, c-format
-msgid ""
-"Could not add the buddy %s for an unknown reason.  The most common reason "
-"for this is that you have the maximum number of allowed buddies in your "
-"buddy list."
-msgstr ""
-"Ei voitu lisätä tuttavaa %s tuntemattomasta syystä. Yleisin syy tälle on se "
-"että listasi maksimituttavamäärä on ylittynyt."
-
-#: ../libpurple/protocols/oscar/oscar.c:5130
+#: ../libpurple/protocols/oscar/oscar.c:5063
+#, c-format
+msgid "Could not add the buddy %s for an unknown reason."
+msgstr "Tuttavaa %s ei voitu lisätä tuntemattomasta syystä."
+
+#: ../libpurple/protocols/oscar/oscar.c:5157
 #, c-format
 msgid ""
 "The user %s has given you permission to add you to their buddy list.  Do you "
@@ -7421,22 +7459,22 @@
 "Käyttäjä %s on antanut sinulle oikeuden lisätä itsesi hänen "
 "tuttavalistalleen. Haluatko lisätä hänet omallesi?"
 
-#: ../libpurple/protocols/oscar/oscar.c:5138
+#: ../libpurple/protocols/oscar/oscar.c:5165
 msgid "Authorization Given"
 msgstr "Valtuutus annettu"
 
 #. Granted
-#: ../libpurple/protocols/oscar/oscar.c:5211
+#: ../libpurple/protocols/oscar/oscar.c:5238
 #, c-format
 msgid "The user %s has granted your request to add them to your buddy list."
 msgstr "Käyttäjä %s on hyväksynyt pyyntösi lisätä hänet tuttavalistallesi."
 
-#: ../libpurple/protocols/oscar/oscar.c:5212
+#: ../libpurple/protocols/oscar/oscar.c:5239
 msgid "Authorization Granted"
 msgstr "Valtuutus hyväksytty"
 
 #. Denied
-#: ../libpurple/protocols/oscar/oscar.c:5215
+#: ../libpurple/protocols/oscar/oscar.c:5242
 #, c-format
 msgid ""
 "The user %s has denied your request to add them to your buddy list for the "
@@ -7447,53 +7485,53 @@
 "syystä:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:5216
+#: ../libpurple/protocols/oscar/oscar.c:5243
 msgid "Authorization Denied"
 msgstr "Valtuutus evätty"
 
-#: ../libpurple/protocols/oscar/oscar.c:5252
+#: ../libpurple/protocols/oscar/oscar.c:5279
 #: ../libpurple/protocols/toc/toc.c:1371
 msgid "_Exchange:"
 msgstr "_Vaihto:"
 
-#: ../libpurple/protocols/oscar/oscar.c:5292
+#: ../libpurple/protocols/oscar/oscar.c:5319
 msgid "Invalid chat name specified."
 msgstr "Virheellinen ryhmäkeskustelun nimi annettu."
 
-#: ../libpurple/protocols/oscar/oscar.c:5361
+#: ../libpurple/protocols/oscar/oscar.c:5388
 msgid "Your IM Image was not sent. You cannot send IM Images in AIM chats."
 msgstr ""
 "Pikaviestikuvaasi ei lähetetty. Et voi lähettää pikaviestikuvia AIM- "
 "ryhmäkeskustelussa."
 
-#: ../libpurple/protocols/oscar/oscar.c:5521
-#: ../libpurple/protocols/oscar/oscar.c:5526
+#: ../libpurple/protocols/oscar/oscar.c:5548
+#: ../libpurple/protocols/oscar/oscar.c:5553
 msgid "Away Message"
 msgstr "Poissaoloviesti"
 
-#: ../libpurple/protocols/oscar/oscar.c:5526
+#: ../libpurple/protocols/oscar/oscar.c:5553
 msgid "<i>(retrieving)</i>"
 msgstr "<i>(vastaanotetaan)</i>"
 
-#: ../libpurple/protocols/oscar/oscar.c:5726
+#: ../libpurple/protocols/oscar/oscar.c:5753
 msgid "iTunes Music Store Link"
 msgstr "iTunes-musiikkikauppalinkki"
 
-#: ../libpurple/protocols/oscar/oscar.c:5834
+#: ../libpurple/protocols/oscar/oscar.c:5861
 #, c-format
 msgid "Buddy Comment for %s"
 msgstr "Tuttavakommentti käyttäjälle %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:5835
+#: ../libpurple/protocols/oscar/oscar.c:5862
 msgid "Buddy Comment:"
 msgstr "Kommentti"
 
-#: ../libpurple/protocols/oscar/oscar.c:5882
+#: ../libpurple/protocols/oscar/oscar.c:5909
 #, c-format
 msgid "You have selected to open a Direct IM connection with %s."
 msgstr "Olet päättänyt avata suoran pikaviestiyhteyden %s:n kanssa."
 
-#: ../libpurple/protocols/oscar/oscar.c:5886
+#: ../libpurple/protocols/oscar/oscar.c:5913
 msgid ""
 "Because this reveals your IP address, it may be considered a security risk.  "
 "Do you wish to continue?"
@@ -7501,65 +7539,66 @@
 "Koska tämä paljastaa IP-osoitteesi, sitä voidaan pitää turvallisuusriskinä.  "
 "Haluatko jatkaa?"
 
-#: ../libpurple/protocols/oscar/oscar.c:5892
+#: ../libpurple/protocols/oscar/oscar.c:5919
+#: ../libpurple/protocols/oscar/peer.c:1022
 msgid "C_onnect"
 msgstr "Y_hdistä"
 
-#: ../libpurple/protocols/oscar/oscar.c:5927
+#: ../libpurple/protocols/oscar/oscar.c:5954
 msgid "Get AIM Info"
 msgstr "Hae AIM-tiedot"
 
-#: ../libpurple/protocols/oscar/oscar.c:5933
+#: ../libpurple/protocols/oscar/oscar.c:5960
 msgid "Edit Buddy Comment"
 msgstr "Muokkaa kommenttia"
 
-#: ../libpurple/protocols/oscar/oscar.c:5941
+#: ../libpurple/protocols/oscar/oscar.c:5968
 msgid "Get Status Msg"
 msgstr "Hae tilaviesti"
 
-#: ../libpurple/protocols/oscar/oscar.c:5954
+#: ../libpurple/protocols/oscar/oscar.c:5981
 msgid "Direct IM"
 msgstr "Suora pikaviesti"
 
-#: ../libpurple/protocols/oscar/oscar.c:5976
+#: ../libpurple/protocols/oscar/oscar.c:6003
 msgid "Re-request Authorization"
 msgstr "Pyydä valtuutus uudelleen"
 
-#: ../libpurple/protocols/oscar/oscar.c:6035
+#: ../libpurple/protocols/oscar/oscar.c:6062
 msgid "Require authorization"
 msgstr "Pyydä valtuutusta"
 
-#: ../libpurple/protocols/oscar/oscar.c:6038
+#: ../libpurple/protocols/oscar/oscar.c:6065
 msgid "Web aware (enabling this will cause you to receive SPAM!)"
 msgstr "Web-tietoinen (tämän käyttö altistaa sinut roskaposteille)"
 
-#: ../libpurple/protocols/oscar/oscar.c:6043
+#: ../libpurple/protocols/oscar/oscar.c:6070
 msgid "ICQ Privacy Options"
 msgstr "ICQ-yksityisyysvalinnat"
 
-#: ../libpurple/protocols/oscar/oscar.c:6062
+#: ../libpurple/protocols/oscar/oscar.c:6089
 msgid "The new formatting is invalid."
 msgstr "Uusi muotoilu on virheellinen."
 
-#: ../libpurple/protocols/oscar/oscar.c:6063
+#: ../libpurple/protocols/oscar/oscar.c:6090
 msgid "Screen name formatting can change only capitalization and whitespace."
 msgstr ""
 "Näyttönimen muotoilu voi vaikuttaa ainoastaan alkukirjaimeen sekä "
 "välilyönteihin."
 
-#: ../libpurple/protocols/oscar/oscar.c:6116
+#: ../libpurple/protocols/oscar/oscar.c:6143
 msgid "Change Address To:"
 msgstr "Vaihda osoite:"
 
-#: ../libpurple/protocols/oscar/oscar.c:6162
+#: ../libpurple/protocols/oscar/oscar.c:6189
 msgid "<i>you are not waiting for authorization</i>"
 msgstr "<i>Et odota valtuutusta</i>"
 
-#: ../libpurple/protocols/oscar/oscar.c:6165
+#: ../libpurple/protocols/oscar/oscar.c:6192
 msgid "You are awaiting authorization from the following buddies"
 msgstr "Odotat valtuutusta seuraavilta tuttavilta"
 
-#: ../libpurple/protocols/oscar/oscar.c:6166
+#: ../libpurple/protocols/oscar/oscar.c:6193
 msgid ""
 "You can re-request authorization from these buddies by right-clicking on "
 "them and selecting \"Re-request Authorization.\""
@@ -7567,73 +7606,73 @@
 "Voit pyytää valtuutuksen uudelleen näiltä tuttavilta napsauttamalla oikeaa "
 "nappia heihin ja valitsemalla \"Pyydä valtuutus uudelleen\"."
 
-#: ../libpurple/protocols/oscar/oscar.c:6183
+#: ../libpurple/protocols/oscar/oscar.c:6210
 msgid "Find Buddy by E-Mail"
 msgstr "Etsi tuttava sähköpostiosoitteen perusteella"
 
-#: ../libpurple/protocols/oscar/oscar.c:6184
+#: ../libpurple/protocols/oscar/oscar.c:6211
 msgid "Search for a buddy by e-mail address"
 msgstr "Etsi tuttava sähköpostiosoitteen perusteella"
 
-#: ../libpurple/protocols/oscar/oscar.c:6185
+#: ../libpurple/protocols/oscar/oscar.c:6212
 msgid "Type the e-mail address of the buddy you are searching for."
 msgstr "Syötä etsimäsi tuttavan sähköpostiosoite."
 
-#: ../libpurple/protocols/oscar/oscar.c:6188
+#: ../libpurple/protocols/oscar/oscar.c:6215
 msgid "_Search"
 msgstr "_Etsi"
 
-#: ../libpurple/protocols/oscar/oscar.c:6346
+#: ../libpurple/protocols/oscar/oscar.c:6373
 msgid "Set User Info (URL)..."
 msgstr "Aseta käyttäjätiedot (URL)..."
 
-#: ../libpurple/protocols/oscar/oscar.c:6357
+#: ../libpurple/protocols/oscar/oscar.c:6384
 msgid "Change Password (URL)"
 msgstr "Vaihda salasana (URL)"
 
-#: ../libpurple/protocols/oscar/oscar.c:6361
+#: ../libpurple/protocols/oscar/oscar.c:6388
 msgid "Configure IM Forwarding (URL)"
 msgstr "Aseta pikaviestien edelleenlähetys (URL)"
 
 #. ICQ actions
-#: ../libpurple/protocols/oscar/oscar.c:6371
+#: ../libpurple/protocols/oscar/oscar.c:6398
 msgid "Set Privacy Options..."
 msgstr "Aseta yksityisyysvalinnat..."
 
 #. AIM actions
-#: ../libpurple/protocols/oscar/oscar.c:6378
+#: ../libpurple/protocols/oscar/oscar.c:6405
 msgid "Confirm Account"
 msgstr "Vahvista tili"
 
-#: ../libpurple/protocols/oscar/oscar.c:6382
+#: ../libpurple/protocols/oscar/oscar.c:6409
 msgid "Display Currently Registered E-Mail Address"
 msgstr "Näytä tällä hetkellä rekisteröity sähköpostiosoite"
 
-#: ../libpurple/protocols/oscar/oscar.c:6386
+#: ../libpurple/protocols/oscar/oscar.c:6413
 msgid "Change Currently Registered E-Mail Address..."
 msgstr "Muuta tällä hetkellä rekisteröityä sähköpostiosoitetta..."
 
-#: ../libpurple/protocols/oscar/oscar.c:6393
+#: ../libpurple/protocols/oscar/oscar.c:6420
 msgid "Show Buddies Awaiting Authorization"
 msgstr "Näytä tuttavat jotka odottavat valtuutusta"
 
-#: ../libpurple/protocols/oscar/oscar.c:6399
+#: ../libpurple/protocols/oscar/oscar.c:6426
 msgid "Search for Buddy by E-Mail Address..."
 msgstr "Etsi tuttavaa sähköpostiosoitteen perusteella..."
 
-#: ../libpurple/protocols/oscar/oscar.c:6404
+#: ../libpurple/protocols/oscar/oscar.c:6431
 msgid "Search for Buddy by Information"
 msgstr "Etsi tuttavaa tietojen perusteella"
 
-#: ../libpurple/protocols/oscar/oscar.c:6472
+#: ../libpurple/protocols/oscar/oscar.c:6499
 msgid "Use recent buddies group"
 msgstr "Käytä viimeaikaisten tuttavien ryhmää"
 
-#: ../libpurple/protocols/oscar/oscar.c:6475
+#: ../libpurple/protocols/oscar/oscar.c:6502
 msgid "Show how long you have been idle"
 msgstr "Näyttää kuinka kauan olet ollut jouten."
 
-#: ../libpurple/protocols/oscar/oscar.c:6630
+#: ../libpurple/protocols/oscar/oscar.c:6657
 msgid ""
 "Always use ICQ proxy server for file transfers\n"
 "(slower, but does not reveal your IP address)"
@@ -7671,10 +7710,6 @@
 "lähetettäessä kuvia. Koska IP-osoitteesi paljastuu, tätä voi pitää "
 "yksityisyysriskinä."
 
-#: ../libpurple/protocols/oscar/peer.c:1022
-msgid "_Connect"
-msgstr "_Yhdistä"
-
 #: ../libpurple/protocols/qq/buddy_info.c:39
 msgid "Primary Information"
 msgstr "Ensisijaiset tiedot"
@@ -7854,13 +7889,13 @@
 msgstr "Epäkelpo QQ-kuva (face)"
 
 #: ../libpurple/protocols/qq/buddy_opt.c:208
-#: ../libpurple/protocols/qq/group_opt.c:135
+#: ../libpurple/protocols/qq/group_opt.c:136
 #, c-format
 msgid "You rejected %d's request"
 msgstr "Kieltäydyit %d:n pyynnöstä"
 
 #: ../libpurple/protocols/qq/buddy_opt.c:209
-#: ../libpurple/protocols/qq/group_opt.c:136
+#: ../libpurple/protocols/qq/group_opt.c:137
 msgid "Input your reason:"
 msgstr "Anna syy:"
 
@@ -7870,13 +7905,13 @@
 
 #. title
 #: ../libpurple/protocols/qq/buddy_opt.c:213
-#: ../libpurple/protocols/qq/group_opt.c:140
+#: ../libpurple/protocols/qq/group_opt.c:141
 msgid "Sorry, you are not my type..."
 msgstr "Pahoittelut, en ole kiinnostunut..."
 
 #: ../libpurple/protocols/qq/buddy_opt.c:214
-#: ../libpurple/protocols/qq/group_im.c:142
-#: ../libpurple/protocols/qq/group_opt.c:126
+#: ../libpurple/protocols/qq/group_im.c:144
+#: ../libpurple/protocols/qq/group_opt.c:127
 #: ../libpurple/protocols/qq/sys_msg.c:91
 #: ../libpurple/protocols/qq/sys_msg.c:249
 msgid "Reject"
@@ -7900,13 +7935,13 @@
 msgstr "Käyttäjä %d tarvitsee valtuutuksen"
 
 #: ../libpurple/protocols/qq/buddy_opt.c:404
-#: ../libpurple/protocols/qq/group_join.c:134
+#: ../libpurple/protocols/qq/group_join.c:136
 msgid "Input request here"
 msgstr "Anna syy tähän"
 
 #. 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
+#: ../libpurple/protocols/qq/group_join.c:137
 msgid "Would you be my friend?"
 msgstr "Haluaisitko olla kaverini?"
 
@@ -7914,8 +7949,8 @@
 #. masked
 #. hint
 #: ../libpurple/protocols/qq/buddy_opt.c:406
-#: ../libpurple/protocols/qq/group_join.c:136
-#: ../libpurple/protocols/qq/group_opt.c:142
+#: ../libpurple/protocols/qq/group_join.c:138
+#: ../libpurple/protocols/qq/group_opt.c:143
 msgid "Send"
 msgstr "Lähetä"
 
@@ -7964,59 +7999,59 @@
 msgid "You can only search for permanent QQ groups\n"
 msgstr "Voit etsiä vain pysyviä QQ-ryhmiä\n"
 
-#: ../libpurple/protocols/qq/group_im.c:124
+#: ../libpurple/protocols/qq/group_im.c:126
 #, c-format
 msgid "User %d applied to join group %d"
 msgstr "Käyttäjä %d haki ryhmän %d jäsenyyttä"
 
-#: ../libpurple/protocols/qq/group_im.c:125
-#: ../libpurple/protocols/qq/group_im.c:179
+#: ../libpurple/protocols/qq/group_im.c:127
+#: ../libpurple/protocols/qq/group_im.c:181
 #: ../libpurple/protocols/qq/sys_msg.c:195
 #, c-format
 msgid "Reason: %s"
 msgstr "Syy: %s"
 
-#: ../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
+#: ../libpurple/protocols/qq/group_im.c:136
+#: ../libpurple/protocols/qq/group_im.c:183
+#: ../libpurple/protocols/qq/group_im.c:223
+#: ../libpurple/protocols/qq/group_im.c:258
+#: ../libpurple/protocols/qq/group_im.c:292
+#: ../libpurple/protocols/qq/group_join.c:233
+#: ../libpurple/protocols/qq/group_join.c:359
+#: ../libpurple/protocols/qq/group_opt.c:235
+#: ../libpurple/protocols/qq/group_opt.c:305
+#: ../libpurple/protocols/qq/group_opt.c:391
 msgid "QQ Qun Operation"
 msgstr "QQ Qun -toiminta"
 
-#: ../libpurple/protocols/qq/group_im.c:139
-#: ../libpurple/protocols/qq/group_opt.c:127
+#: ../libpurple/protocols/qq/group_im.c:141
+#: ../libpurple/protocols/qq/group_opt.c:128
 #: ../libpurple/protocols/qq/sys_msg.c:92
 #: ../libpurple/protocols/qq/sys_msg.c:251
 msgid "Approve"
 msgstr "Hyväksy"
 
-#: ../libpurple/protocols/qq/group_im.c:178
+#: ../libpurple/protocols/qq/group_im.c:180
 #, c-format
 msgid "You request to join group %d has been rejected by admin %d"
 msgstr "Pyyntösi liittyä ryhmään %d evättiin ylläpitäjän %d toimesta"
 
-#: ../libpurple/protocols/qq/group_im.c:219
+#: ../libpurple/protocols/qq/group_im.c:221
 #, c-format
 msgid "You request to join group %d has been approved by admin %d"
 msgstr "Pyyntösi liittyä ryhmään %d hyväksyttiin ylläpitäjän %d toimesta"
 
-#: ../libpurple/protocols/qq/group_im.c:255
+#: ../libpurple/protocols/qq/group_im.c:257
 #, c-format
 msgid "You [%d] has exit group \"%d\""
 msgstr "Sinä (%d) olet poistunut ryhmästä \"%d\""
 
-#: ../libpurple/protocols/qq/group_im.c:289
+#: ../libpurple/protocols/qq/group_im.c:291
 #, c-format
 msgid "You [%d] has been added by group \"%d\""
 msgstr "Sinä (%d) olet lisätty ryhmään \"%d\""
 
-#: ../libpurple/protocols/qq/group_im.c:290
+#: ../libpurple/protocols/qq/group_im.c:292
 msgid "This group has been added to your buddy list"
 msgstr "Tämä ryhmä on lisätty tuttavalistallesi"
 
@@ -8040,31 +8075,31 @@
 msgid "Unknown status"
 msgstr "Tuntematon tila"
 
-#: ../libpurple/protocols/qq/group_join.c:80
+#: ../libpurple/protocols/qq/group_join.c:82
 msgid "This group does not allow others to join"
 msgstr "Tämä ryhmä ei salli muiden liittyä"
 
-#: ../libpurple/protocols/qq/group_join.c:231
+#: ../libpurple/protocols/qq/group_join.c:233
 msgid "You have successfully exited the group"
 msgstr "Ryhmästä poistuminen onnistui"
 
-#: ../libpurple/protocols/qq/group_join.c:255
+#: ../libpurple/protocols/qq/group_join.c:257
 msgid "QQ Group Auth"
 msgstr "QQ-ryhmän valtuutus"
 
-#: ../libpurple/protocols/qq/group_join.c:256
+#: ../libpurple/protocols/qq/group_join.c:258
 msgid "Your authorization operation has been accepted by the QQ server"
 msgstr "QQ-palvelin on hyväksynyt valtuutustoimintosi"
 
-#: ../libpurple/protocols/qq/group_join.c:327
+#: ../libpurple/protocols/qq/group_join.c:329
 msgid "You inputted a group id outside the acceptable range"
 msgstr "Olet syöttänyt hyväksyttävän skaalan ulkopuolisen ryhmätunnisteen (ID)"
 
-#: ../libpurple/protocols/qq/group_join.c:358
+#: ../libpurple/protocols/qq/group_join.c:360
 msgid "Are you sure to exit this Qun?"
 msgstr "Haluatko varmasti poistua tästä Qun:sta?"
 
-#: ../libpurple/protocols/qq/group_join.c:360
+#: ../libpurple/protocols/qq/group_join.c:362
 msgid ""
 "Note, if you are the creator, \n"
 "this operation will eventually remove this Qun."
@@ -8072,60 +8107,61 @@
 "Huomaa, että olet samalla Qun:n luoja, \n"
 "Tämä toiminto poistaa lopulta tämän Qun:n."
 
-#: ../libpurple/protocols/qq/group_join.c:365
+#: ../libpurple/protocols/qq/group_join.c:367
 msgid "Go ahead"
 msgstr "Jatka"
 
-#: ../libpurple/protocols/qq/group_network.c:90
+#: ../libpurple/protocols/qq/group_network.c:92
 #, c-format
 msgid "Code [0x%02X]: %s"
 msgstr "Koodi [0x%02X]: %s"
 
-#: ../libpurple/protocols/qq/group_network.c:91
+#: ../libpurple/protocols/qq/group_network.c:93
 msgid "Group Operation Error"
 msgstr "Ryhmätoimintovirhe"
 
 #. we wanna see window
-#: ../libpurple/protocols/qq/group_opt.c:123
+#: ../libpurple/protocols/qq/group_opt.c:124
 #: ../libpurple/protocols/qq/sys_msg.c:88
 msgid "Do you wanna approve the request?"
 msgstr "Haluatko hyväksyä pyynnön?"
 
-#: ../libpurple/protocols/qq/group_opt.c:234
+#: ../libpurple/protocols/qq/group_opt.c:235
 msgid "You have successfully modify Qun member"
 msgstr "Qun-jäsentä muokattu onnistuneesti"
 
-#: ../libpurple/protocols/qq/group_opt.c:304
+#: ../libpurple/protocols/qq/group_opt.c:305
 msgid "You have successfully modify Qun information"
 msgstr "Qun-tietojen muokkaus onnistui"
 
-#: ../libpurple/protocols/qq/group_opt.c:391
+#: ../libpurple/protocols/qq/group_opt.c:392
 msgid "You have successfully created a Qun"
 msgstr "Qun:n luonti onnistui"
 
-#: ../libpurple/protocols/qq/group_opt.c:393
+#: ../libpurple/protocols/qq/group_opt.c:394
 msgid "Would you like to set up the Qun details now?"
 msgstr "Haluatko asettaa Qun:n yksityiskohdat nyt?"
 
-#: ../libpurple/protocols/qq/group_opt.c:397
+#: ../libpurple/protocols/qq/group_opt.c:398
 msgid "Setup"
 msgstr "Asetukset"
 
-#: ../libpurple/protocols/qq/im.c:430
+#: ../libpurple/protocols/qq/im.c:432
 msgid "System Message"
 msgstr "Järjestelmäviesti"
 
-#: ../libpurple/protocols/qq/im.c:574
+#: ../libpurple/protocols/qq/im.c:576
 msgid "Server ACK"
 msgstr "Palvelimen \"ACK\""
 
-#: ../libpurple/protocols/qq/im.c:574
-msgid "Send IM fail\n"
-msgstr "Pikaviestin lähetys epäonnistui\n"
-
-#: ../libpurple/protocols/qq/keep_alive.c:85
+# c-format
+#: ../libpurple/protocols/qq/im.c:576
+msgid "Failed to send IM."
+msgstr "Viestin lähettäminen epäonnistui."
+
+#: ../libpurple/protocols/qq/keep_alive.c:87
 msgid "Keep alive error, seems connection lost!"
-msgstr "Keepalive-virhe, yhteys vaikutta katkenneen."
+msgstr "Keepalive-virhe, yhteys vaikuttaa katkenneen."
 
 #: ../libpurple/protocols/qq/login_logout.c:408
 msgid "Request login token error!"
@@ -8137,8 +8173,8 @@
 
 #. we didn't successfully connect. tdt->toc_fd is valid here
 #: ../libpurple/protocols/qq/qq.c:139 ../libpurple/protocols/toc/toc.c:173
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:108
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:188
+#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:109
+#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:189
 #: ../libpurple/protocols/yahoo/ycht.c:549
 msgid "Unable to connect."
 msgstr "Yhteyden muodostaminen epäonnistui."
@@ -8279,27 +8315,27 @@
 msgid "Unable to read from socket"
 msgstr "Ei kyetty lukemaan pistoketta"
 
-#: ../libpurple/protocols/qq/send_file.c:706
+#: ../libpurple/protocols/qq/send_file.c:707
 #, c-format
 msgid "%d has declined the file %s"
 msgstr "%d on kieltäytynyt tiedostosta %s"
 
-#: ../libpurple/protocols/qq/send_file.c:709
-#: ../libpurple/protocols/qq/send_file.c:738
+#: ../libpurple/protocols/qq/send_file.c:710
+#: ../libpurple/protocols/qq/send_file.c:739
 msgid "File Send"
 msgstr "Tiedoston lähetys"
 
-#: ../libpurple/protocols/qq/send_file.c:735
+#: ../libpurple/protocols/qq/send_file.c:736
 #, c-format
 msgid "%d canceled the transfer of %s"
 msgstr "%d peruutti tiedoston %s siirron"
 
-#: ../libpurple/protocols/qq/sendqueue.c:122
+#: ../libpurple/protocols/qq/sendqueue.c:123
 msgid "Connection lost"
 msgstr "Yhteys katkesi"
 
 #. cancel login progress
-#: ../libpurple/protocols/qq/sendqueue.c:130
+#: ../libpurple/protocols/qq/sendqueue.c:131
 msgid "Login failed, no reply"
 msgstr "Kirjautuminen epäonnistui, ei vastausta"
 
@@ -8544,7 +8580,7 @@
 msgid "Send TEST Announcement"
 msgstr "Lähetä TEST-ilmoitus"
 
-#: ../libpurple/protocols/sametime/sametime.c:3586 ../pidgin/gtkconv.c:4250
+#: ../libpurple/protocols/sametime/sametime.c:3586 ../pidgin/gtkconv.c:4274
 msgid "Topic:"
 msgstr "Aihe:"
 
@@ -8569,7 +8605,7 @@
 msgid "No Sametime Community Server Specified"
 msgstr "Sametime-yhteisöpalvelinta ei ole määritelty"
 
-#: ../libpurple/protocols/sametime/sametime.c:3644 ../pidgin/gtkblist.c:3984
+#: ../libpurple/protocols/sametime/sametime.c:3644 ../pidgin/gtkblist.c:4015
 msgid "Connect"
 msgstr "Yhdistä"
 
@@ -8748,7 +8784,8 @@
 "lisätä nämä käyttäjät tuttavalistallesi tai lähettää heille viestejä alla "
 "olevilla painikkeilla."
 
-#: ../libpurple/protocols/sametime/sametime.c:5538 ../pidgin/gtknotify.c:716
+#. Create the window
+#: ../libpurple/protocols/sametime/sametime.c:5538 ../pidgin/gtknotify.c:719
 msgid "Search Results"
 msgstr "Hakutulokset"
 
@@ -9577,7 +9614,7 @@
 msgstr "Avain sopimus epäonnistui"
 
 #: ../libpurple/protocols/silc/ft.c:114
-msgid "Connection timedout"
+msgid "Connection timed out"
 msgstr "Ei yhteyttä määräajassa"
 
 #: ../libpurple/protocols/silc/ft.c:118
@@ -10024,7 +10061,7 @@
 msgstr "Tämänhetkinen mielialasi"
 
 #: ../libpurple/protocols/silc/silc.c:741
-#: ../libpurple/protocols/silc10/silc.c:652 ../pidgin/gtkprefs.c:1566
+#: ../libpurple/protocols/silc10/silc.c:652 ../pidgin/gtkprefs.c:1636
 msgid "Normal"
 msgstr "Normaali"
 
@@ -10404,68 +10441,68 @@
 #. *< name
 #. *< version
 #. *  summary
-#: ../libpurple/protocols/silc/silc.c:1875
-#: ../libpurple/protocols/silc10/silc.c:1817
+#: ../libpurple/protocols/silc/silc.c:1876
+#: ../libpurple/protocols/silc10/silc.c:1819
 msgid "SILC Protocol Plugin"
 msgstr "SILC-yhteyskäytäntöliitännäinen"
 
 #. *  description
-#: ../libpurple/protocols/silc/silc.c:1877
-#: ../libpurple/protocols/silc10/silc.c:1819
+#: ../libpurple/protocols/silc/silc.c:1878
+#: ../libpurple/protocols/silc10/silc.c:1821
 msgid "Secure Internet Live Conferencing (SILC) Protocol"
 msgstr "Secure Internet Live Conferencing (SILC) -yhteyskäytäntö"
 
-#: ../libpurple/protocols/silc/silc.c:1909
-#: ../libpurple/protocols/silc10/silc.c:1851 ../pidgin/gtkprefs.c:1959
+#: ../libpurple/protocols/silc/silc.c:1910
+#: ../libpurple/protocols/silc10/silc.c:1853 ../pidgin/gtkprefs.c:2029
 msgid "Network"
 msgstr "Verkko"
 
-#: ../libpurple/protocols/silc/silc.c:1920
-#: ../libpurple/protocols/silc10/silc.c:1862
+#: ../libpurple/protocols/silc/silc.c:1921
+#: ../libpurple/protocols/silc10/silc.c:1864
 msgid "Public Key file"
 msgstr "Julkinen avaintiedosto"
 
-#: ../libpurple/protocols/silc/silc.c:1924
-#: ../libpurple/protocols/silc10/silc.c:1866
+#: ../libpurple/protocols/silc/silc.c:1925
+#: ../libpurple/protocols/silc10/silc.c:1868
 msgid "Private Key file"
 msgstr "Yksityinen avaintiedosto"
 
-#: ../libpurple/protocols/silc/silc.c:1934
-#: ../libpurple/protocols/silc10/silc.c:1876
+#: ../libpurple/protocols/silc/silc.c:1935
+#: ../libpurple/protocols/silc10/silc.c:1878
 msgid "Cipher"
 msgstr "Salaus"
 
-#: ../libpurple/protocols/silc/silc.c:1944
-#: ../libpurple/protocols/silc10/silc.c:1886
+#: ../libpurple/protocols/silc/silc.c:1945
+#: ../libpurple/protocols/silc10/silc.c:1888
 msgid "HMAC"
 msgstr "HMAC"
 
-#: ../libpurple/protocols/silc/silc.c:1947
+#: ../libpurple/protocols/silc/silc.c:1948
 msgid "Use Perfect Forward Secrecy"
 msgstr "Käytä täydellistä jatkosalaisuutta (PFS)"
 
-#: ../libpurple/protocols/silc/silc.c:1951
-#: ../libpurple/protocols/silc10/silc.c:1889
+#: ../libpurple/protocols/silc/silc.c:1952
+#: ../libpurple/protocols/silc10/silc.c:1891
 msgid "Public key authentication"
 msgstr "Julkisella avaimella todentaminen"
 
-#: ../libpurple/protocols/silc/silc.c:1954
-#: ../libpurple/protocols/silc10/silc.c:1892
+#: ../libpurple/protocols/silc/silc.c:1955
+#: ../libpurple/protocols/silc10/silc.c:1894
 msgid "Block IMs without Key Exchange"
 msgstr "Estä pikaviestit ilman avaintenvaihtoa"
 
-#: ../libpurple/protocols/silc/silc.c:1957
-#: ../libpurple/protocols/silc10/silc.c:1895
+#: ../libpurple/protocols/silc/silc.c:1958
+#: ../libpurple/protocols/silc10/silc.c:1897
 msgid "Block messages to whiteboard"
 msgstr "Estä viestit kirjoitustaululle"
 
-#: ../libpurple/protocols/silc/silc.c:1960
-#: ../libpurple/protocols/silc10/silc.c:1898
+#: ../libpurple/protocols/silc/silc.c:1961
+#: ../libpurple/protocols/silc10/silc.c:1900
 msgid "Automatically open whiteboard"
 msgstr "Avaa kirjoitustaulu automaattisesti"
 
-#: ../libpurple/protocols/silc/silc.c:1963
-#: ../libpurple/protocols/silc10/silc.c:1901
+#: ../libpurple/protocols/silc/silc.c:1964
+#: ../libpurple/protocols/silc10/silc.c:1903
 msgid "Digitally sign and verify all messages"
 msgstr "Allekirjoita ja tarkista kaikki viestit digitaalisesti"
 
@@ -10897,8 +10934,8 @@
 msgid "Password Change Successful"
 msgstr "Salasanan vaihto onnistui"
 
-#: ../libpurple/protocols/toc/toc.c:1366 ../pidgin/gtkblist.c:5467
-#: ../pidgin/gtkblist.c:5821
+#: ../libpurple/protocols/toc/toc.c:1366 ../pidgin/gtkblist.c:5519
+#: ../pidgin/gtkblist.c:5873
 msgid "_Group:"
 msgstr "_Ryhmä:"
 
@@ -11060,8 +11097,8 @@
 #: ../libpurple/protocols/yahoo/yahoo.c:2684
 #: ../libpurple/protocols/yahoo/yahoo.c:2787
 #: ../libpurple/protocols/yahoo/yahoo.c:2797
-#: ../libpurple/protocols/yahoo/yahoochat.c:1455
-#: ../libpurple/protocols/yahoo/yahoochat.c:1525
+#: ../libpurple/protocols/yahoo/yahoochat.c:1418
+#: ../libpurple/protocols/yahoo/yahoochat.c:1488
 #: ../libpurple/protocols/yahoo/ycht.c:585
 msgid "Connection problem"
 msgstr "Yhteysvirhe"
@@ -11252,35 +11289,35 @@
 msgid "Yahoo Chat port"
 msgstr "Yahoo-ryhmäkeskustelupalvelimen portti"
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:203
+#: ../libpurple/protocols/yahoo/yahoochat.c:204
 #, c-format
 msgid "%s declined your conference invitation to room \"%s\" because \"%s\"."
 msgstr "%s kieltäytyi kutsustasi huoneeseen \"%s\" koska \"%s\"."
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:205
+#: ../libpurple/protocols/yahoo/yahoochat.c:206
 msgid "Invitation Rejected"
 msgstr "Kutsusta kieltäydytty"
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:361
+#: ../libpurple/protocols/yahoo/yahoochat.c:362
 msgid "Failed to join chat"
 msgstr "Ryhmäkeskusteluun liittyminen epäonnistui"
 
 #. -6
-#: ../libpurple/protocols/yahoo/yahoochat.c:364
+#: ../libpurple/protocols/yahoo/yahoochat.c:365
 msgid "Unknown room"
 msgstr "Tuntematon huone"
 
 #. -15
-#: ../libpurple/protocols/yahoo/yahoochat.c:367
+#: ../libpurple/protocols/yahoo/yahoochat.c:368
 msgid "Maybe the room is full"
 msgstr "Ehkä huone on täynnä"
 
 #. -35
-#: ../libpurple/protocols/yahoo/yahoochat.c:370
+#: ../libpurple/protocols/yahoo/yahoochat.c:371
 msgid "Not available"
 msgstr "Ei olemassa"
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:374
+#: ../libpurple/protocols/yahoo/yahoochat.c:375
 msgid ""
 "Unknown error. You may need to logout and wait five minutes before being "
 "able to rejoin a chatroom"
@@ -11288,38 +11325,38 @@
 "Tuntematon virhe. Voi olla että sinun pitää kirjautua ulos ja odottaa viisi "
 "minuuttia ennen uudelleenliittymistä keskusteluhuoneeseen"
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:452
+#: ../libpurple/protocols/yahoo/yahoochat.c:453
 #, c-format
 msgid "You are now chatting in %s."
 msgstr "Olet nyt keskustelemassa huoneessa %s"
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:627
+#: ../libpurple/protocols/yahoo/yahoochat.c:628
 msgid "Failed to join buddy in chat"
 msgstr "Liittyminen tuttavan seuraan keskusteluhuoneeseen epäonnistui"
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:628
+#: ../libpurple/protocols/yahoo/yahoochat.c:629
 msgid "Maybe they're not in a chat?"
 msgstr "Ehkä he eivät ole ryhmäkeskustelussa?"
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:1357
-#: ../libpurple/protocols/yahoo/yahoochat.c:1383
+#: ../libpurple/protocols/yahoo/yahoochat.c:1320
+#: ../libpurple/protocols/yahoo/yahoochat.c:1346
 msgid "Fetching the room list failed."
 msgstr "Huonelistan haku epäonnistui."
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:1441
+#: ../libpurple/protocols/yahoo/yahoochat.c:1404
 msgid "Voices"
 msgstr "Äänet"
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:1444
+#: ../libpurple/protocols/yahoo/yahoochat.c:1407
 msgid "Webcams"
 msgstr "Web-kamerat"
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:1455
-#: ../libpurple/protocols/yahoo/yahoochat.c:1525
+#: ../libpurple/protocols/yahoo/yahoochat.c:1418
+#: ../libpurple/protocols/yahoo/yahoochat.c:1488
 msgid "Unable to fetch room list."
 msgstr "Huonelistaa ei voida hakea."
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:1518
+#: ../libpurple/protocols/yahoo/yahoochat.c:1481
 msgid "User Rooms"
 msgstr "Käyttäjän huoneet"
 
@@ -11330,9 +11367,9 @@
 msgid "Sent Doodle request."
 msgstr "Lähetä piirtelypyyntö (doodle)."
 
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:269
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:278
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:291
+#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:270
+#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:279
+#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:292
 msgid "Unable to establish file descriptor."
 msgstr "Ei kyetty muodostamaan tiedostokahvaa."
 
@@ -11671,11 +11708,11 @@
 #. *
 #. * The default message to use when the user becomes auto-away.
 #.
-#: ../libpurple/savedstatuses.c:46
+#: ../libpurple/savedstatuses.c:47
 msgid "I'm not here right now"
 msgstr "En ole täällä juuri nyt"
 
-#: ../libpurple/savedstatuses.c:532
+#: ../libpurple/savedstatuses.c:534
 msgid "saved statuses"
 msgstr "tallennetut tilat"
 
@@ -11684,7 +11721,7 @@
 msgid "%s is now known as %s.\n"
 msgstr "%s on nyt nimeltään %s.\n"
 
-#: ../libpurple/server.c:679
+#: ../libpurple/server.c:680
 #, c-format
 msgid ""
 "%s has invited %s to the chat room %s:\n"
@@ -11693,12 +11730,12 @@
 "Käyttäjä %s on kutsunut käyttäjän %s keskusteluhuoneeseen %s:\n"
 "%s"
 
-#: ../libpurple/server.c:684
+#: ../libpurple/server.c:685
 #, c-format
 msgid "%s has invited %s to the chat room %s\n"
 msgstr "Käyttäjä %s on kutsunut käyttäjän %s keskusteluhuoneeseen %s\n"
 
-#: ../libpurple/server.c:688
+#: ../libpurple/server.c:689
 msgid "Accept chat invitation?"
 msgstr "Hyväksy ryhmäkeskustelukutsu?"
 
@@ -11706,9 +11743,13 @@
 msgid "Unset"
 msgstr "Poista asetus"
 
-#: ../libpurple/status.c:155
-msgid "Unavailable"
-msgstr "Tavoittamattomissa"
+#: ../libpurple/status.c:155 ../pidgin/gtkstatusbox.c:1057
+msgid "Do not disturb"
+msgstr "Älä häiritse"
+
+#: ../libpurple/status.c:158
+msgid "Extended away"
+msgstr "Pidennetty poissaolo"
 
 #: ../libpurple/status.c:159
 msgid "Mobile"
@@ -11749,17 +11790,17 @@
 msgid "+++ %s became unidle"
 msgstr "+++ %s on aktiivinen"
 
-#: ../libpurple/util.c:682
+#: ../libpurple/util.c:717
 #, c-format
 msgid "%x %X"
 msgstr "%x %X"
 
-#: ../libpurple/util.c:2586
+#: ../libpurple/util.c:2691
 #, c-format
 msgid "Error Reading %s"
 msgstr "Virhe luettaessa %s"
 
-#: ../libpurple/util.c:2587
+#: ../libpurple/util.c:2692
 #, c-format
 msgid ""
 "An error was encountered reading your %s.  They have not been loaded, and "
@@ -11768,67 +11809,67 @@
 "%s:n lukemisessa tapahtui virhe. Niitä ei ladattu ja vanha tiedosto on "
 "nimetty uudelleen nimellä %s~."
 
-#: ../libpurple/util.c:3060
+#: ../libpurple/util.c:3192
 msgid "Calculating..."
 msgstr "Lasketaan..."
 
-#: ../libpurple/util.c:3063
+#: ../libpurple/util.c:3195
 msgid "Unknown."
 msgstr "Tuntematon."
 
-#: ../libpurple/util.c:3089
+#: ../libpurple/util.c:3221
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] "%d sekunti"
 msgstr[1] "%d sekuntia"
 
-#: ../libpurple/util.c:3101
+#: ../libpurple/util.c:3233
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] "%d päivä"
 msgstr[1] "%d päivää"
 
-#: ../libpurple/util.c:3109
+#: ../libpurple/util.c:3241
 #, c-format
 msgid "%s, %d hour"
 msgid_plural "%s, %d hours"
 msgstr[0] "%s, %d tunti"
 msgstr[1] "%s, %d tuntia"
 
-#: ../libpurple/util.c:3115
+#: ../libpurple/util.c:3247
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d tunti"
 msgstr[1] "%d tuntia"
 
-#: ../libpurple/util.c:3123
+#: ../libpurple/util.c:3255
 #, c-format
 msgid "%s, %d minute"
 msgid_plural "%s, %d minutes"
 msgstr[0] "%s, %d minuutti"
 msgstr[1] "%s, %d minuuttia"
 
-#: ../libpurple/util.c:3129
+#: ../libpurple/util.c:3261
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d minuutti"
 msgstr[1] "%d minuuttia"
 
-#: ../libpurple/util.c:3389
+#: ../libpurple/util.c:3521
 #, c-format
 msgid "Could not open %s: Redirected too many times"
 msgstr "%s:n avaaminen epäonnistui: uudelleenohjattu liian monta kertaa"
 
-#: ../libpurple/util.c:3426 ../libpurple/util.c:3721
+#: ../libpurple/util.c:3558 ../libpurple/util.c:3853
 #, c-format
 msgid "Unable to connect to %s"
 msgstr "Kohteeseen %s ei kyetty muodostamaan yhteyttä"
 
-#: ../libpurple/util.c:3549
+#: ../libpurple/util.c:3681
 #, c-format
 msgid ""
 "Unable to allocate enough memory to hold the contents from %s.  The web "
@@ -11837,17 +11878,17 @@
 "Ei voitu varata riittävästi muistia säilyttämään kohteen %s sisältö. "
 "Verkkopalvelin voi olla yrittämässä tehdä jotain pahantahtoista."
 
-#: ../libpurple/util.c:3584
+#: ../libpurple/util.c:3716
 #, c-format
 msgid "Error reading from %s: %s"
 msgstr "Virhe luettaessa kohteesta %s: %s"
 
-#: ../libpurple/util.c:3615
+#: ../libpurple/util.c:3747
 #, c-format
 msgid "Error writing to %s: %s"
 msgstr "Virhe kirjoitettaessa kohteseen %s: %s"
 
-#: ../libpurple/util.c:3640
+#: ../libpurple/util.c:3772
 #, c-format
 msgid "Unable to connect to %s: %s"
 msgstr "Ei voitu yhdistää kohteeseen %s: %s"
@@ -11885,59 +11926,59 @@
 msgid "Screen _name:"
 msgstr "Näyttö_nimi:"
 
-#: ../pidgin/gtkaccount.c:528
+#: ../pidgin/gtkaccount.c:531
 msgid "_Local alias:"
 msgstr "Paika_llinen lempinimi:"
 
-#: ../pidgin/gtkaccount.c:532
+#: ../pidgin/gtkaccount.c:535
 msgid "Remember pass_word"
 msgstr "Muista _salasana"
 
 #. Build the user options frame.
-#: ../pidgin/gtkaccount.c:590
+#: ../pidgin/gtkaccount.c:593
 msgid "User Options"
 msgstr "Käyttäjän valinnat"
 
-#: ../pidgin/gtkaccount.c:603
+#: ../pidgin/gtkaccount.c:606
 msgid "New _mail notifications"
 msgstr "Il_moita uudesta sähköpostista"
 
 #. Buddy icon
-#: ../pidgin/gtkaccount.c:608
+#: ../pidgin/gtkaccount.c:611
 msgid "Use this buddy _icon for this account:"
 msgstr "Käytä tätä tuttavakuvaketta tälle käyttäjät_ilille:"
 
 #. Build the protocol options frame.
-#: ../pidgin/gtkaccount.c:728
+#: ../pidgin/gtkaccount.c:731
 #, c-format
 msgid "%s Options"
 msgstr "%s-valinnat"
 
-#: ../pidgin/gtkaccount.c:934
+#: ../pidgin/gtkaccount.c:936
 msgid "Use GNOME Proxy Settings"
 msgstr "Käytä GNOMEn välipalvelinasetuksia"
 
-#: ../pidgin/gtkaccount.c:935
+#: ../pidgin/gtkaccount.c:937
 msgid "Use Global Proxy Settings"
 msgstr "Käytä yleisiä välipalvelinasetuksia"
 
-#: ../pidgin/gtkaccount.c:941
+#: ../pidgin/gtkaccount.c:943
 msgid "No Proxy"
 msgstr "Ei välipalvelinta"
 
-#: ../pidgin/gtkaccount.c:947
+#: ../pidgin/gtkaccount.c:949
 msgid "HTTP"
 msgstr "HTTP"
 
-#: ../pidgin/gtkaccount.c:953
+#: ../pidgin/gtkaccount.c:955
 msgid "SOCKS 4"
 msgstr "SOCKS 4"
 
-#: ../pidgin/gtkaccount.c:959
+#: ../pidgin/gtkaccount.c:961
 msgid "SOCKS 5"
 msgstr "SOCKS 5"
 
-#: ../pidgin/gtkaccount.c:965 ../pidgin/gtkprefs.c:1137
+#: ../pidgin/gtkaccount.c:967 ../pidgin/gtkprefs.c:1206
 msgid "Use Environmental Settings"
 msgstr "Käytä ympäristöasetuksia"
 
@@ -11946,60 +11987,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:1004
+#: ../pidgin/gtkaccount.c:1006
 msgid "If you look real closely"
 msgstr "Jos katsot todella tarkkaan"
 
 #. This is an easter egg. See the comment on the previous line in the source.
-#: ../pidgin/gtkaccount.c:1007
+#: ../pidgin/gtkaccount.c:1009
 msgid "you can see the butterflies mating"
 msgstr "voit nähdä perhosten parittelevan"
 
-#: ../pidgin/gtkaccount.c:1028
+#: ../pidgin/gtkaccount.c:1030
 msgid "Proxy Options"
 msgstr "Välipalvelinvalinnat"
 
-#: ../pidgin/gtkaccount.c:1042 ../pidgin/gtkprefs.c:1131
+#: ../pidgin/gtkaccount.c:1044 ../pidgin/gtkprefs.c:1200
 msgid "Proxy _type:"
 msgstr "Välipalvelimen _tyyppi:"
 
-#: ../pidgin/gtkaccount.c:1051 ../pidgin/gtkprefs.c:1152
+#: ../pidgin/gtkaccount.c:1053 ../pidgin/gtkprefs.c:1221
 msgid "_Host:"
 msgstr "P_alvelin:"
 
-#: ../pidgin/gtkaccount.c:1055 ../pidgin/gtkprefs.c:1170
+#: ../pidgin/gtkaccount.c:1057 ../pidgin/gtkprefs.c:1239
 msgid "_Port:"
 msgstr "_Portti:"
 
-#: ../pidgin/gtkaccount.c:1063
+#: ../pidgin/gtkaccount.c:1065
 msgid "_Username:"
 msgstr "_Käyttäjänimi:"
 
-#: ../pidgin/gtkaccount.c:1070 ../pidgin/gtkprefs.c:1207
+#: ../pidgin/gtkaccount.c:1072 ../pidgin/gtkprefs.c:1276
 msgid "Pa_ssword:"
 msgstr "_Salasana:"
 
-#: ../pidgin/gtkaccount.c:1476
+#: ../pidgin/gtkaccount.c:1473
 msgid "Add Account"
 msgstr "Lisää tili"
 
-#: ../pidgin/gtkaccount.c:1500
+#: ../pidgin/gtkaccount.c:1492
 msgid "_Basic"
 msgstr "_Perus"
 
-#: ../pidgin/gtkaccount.c:1511
+#: ../pidgin/gtkaccount.c:1503
 msgid "_Advanced"
 msgstr "_Lisäasetukset"
 
-#: ../pidgin/gtkaccount.c:1983 ../pidgin/gtkplugin.c:568
+#: ../pidgin/gtkaccount.c:1975 ../pidgin/gtkplugin.c:568
 msgid "Enabled"
 msgstr "Käytössä"
 
-#: ../pidgin/gtkaccount.c:2011
+#: ../pidgin/gtkaccount.c:2003
 msgid "Protocol"
 msgstr "Yhteyskäytäntö"
 
-#: ../pidgin/gtkaccount.c:2212
+#: ../pidgin/gtkaccount.c:2203
 #, c-format
 msgid ""
 "<span size='larger' weight='bold'>Welcome to %s!</span>\n"
@@ -12022,104 +12063,104 @@
 "Voit palata tähän ikkunaan lisäämään, muokkaamaan tai poistamaan tilejä "
 "valitsemalla <b>Käyttäjätilit->Lisää/muokkaa</b> Tuttavalista-ikkunassa."
 
-#: ../pidgin/gtkblist.c:717
+#: ../pidgin/gtkblist.c:763
 msgid "Join a Chat"
 msgstr "Liity ryhmäkeskusteluun"
 
-#: ../pidgin/gtkblist.c:738
+#: ../pidgin/gtkblist.c:784
 msgid ""
 "Please enter the appropriate information about the chat you would like to "
 "join.\n"
 msgstr "Syötä tiedot ryhmäkeskustelusta, johon haluaisit liittyä.\n"
 
 #. Set up stuff for the account box
-#: ../pidgin/gtkblist.c:749 ../pidgin/gtkblist.c:5415
-#: ../pidgin/gtkblist.c:5782 ../pidgin/gtkpounce.c:531
-#: ../pidgin/gtkroomlist.c:399
+#: ../pidgin/gtkblist.c:795 ../pidgin/gtkblist.c:5467
+#: ../pidgin/gtkblist.c:5834 ../pidgin/gtkpounce.c:540
+#: ../pidgin/gtkroomlist.c:395
 msgid "_Account:"
 msgstr "_Käyttäjätili:"
 
-#: ../pidgin/gtkblist.c:1038 ../pidgin/gtkprivacy.c:606
-#: ../pidgin/gtkprivacy.c:620
+#: ../pidgin/gtkblist.c:1084 ../pidgin/gtkprivacy.c:602
+#: ../pidgin/gtkprivacy.c:616
 msgid "_Block"
 msgstr "_Estä"
 
-#: ../pidgin/gtkblist.c:1038
+#: ../pidgin/gtkblist.c:1084
 msgid "Un_block"
 msgstr "_Poista esto"
 
-#: ../pidgin/gtkblist.c:1089
+#: ../pidgin/gtkblist.c:1135
 msgid "Get _Info"
 msgstr "Hae _tiedot"
 
-#: ../pidgin/gtkblist.c:1092 ../pidgin/pidginstock.c:84
+#: ../pidgin/gtkblist.c:1138 ../pidgin/pidginstock.c:84
 msgid "I_M"
 msgstr "_Pikaviesti"
 
-#: ../pidgin/gtkblist.c:1098
+#: ../pidgin/gtkblist.c:1144
 msgid "_Send File"
 msgstr "_Lähetä tiedosto"
 
-#: ../pidgin/gtkblist.c:1105
+#: ../pidgin/gtkblist.c:1151
 msgid "Add Buddy _Pounce"
 msgstr "Lisää tuttava_ilmoitin"
 
-#: ../pidgin/gtkblist.c:1109 ../pidgin/gtkblist.c:1113
-#: ../pidgin/gtkblist.c:1215 ../pidgin/gtkblist.c:1238
+#: ../pidgin/gtkblist.c:1155 ../pidgin/gtkblist.c:1159
+#: ../pidgin/gtkblist.c:1262 ../pidgin/gtkblist.c:1285
 msgid "View _Log"
 msgstr "Näytä _loki"
 
-#: ../pidgin/gtkblist.c:1125 ../pidgin/gtkblist.c:1134
-#: ../pidgin/gtkblist.c:1223 ../pidgin/gtkblist.c:1244
+#: ../pidgin/gtkblist.c:1171 ../pidgin/gtkblist.c:1180
+#: ../pidgin/gtkblist.c:1270 ../pidgin/gtkblist.c:1291
 msgid "_Alias..."
 msgstr "_Alias..."
 
-#: ../pidgin/gtkblist.c:1128 ../pidgin/gtkblist.c:1136
-#: ../pidgin/gtkblist.c:1225 ../pidgin/gtkblist.c:1246
+#: ../pidgin/gtkblist.c:1174 ../pidgin/gtkblist.c:1182
+#: ../pidgin/gtkblist.c:1272 ../pidgin/gtkblist.c:1293
 msgid "_Remove"
 msgstr "_Poista"
 
-#: ../pidgin/gtkblist.c:1185
+#: ../pidgin/gtkblist.c:1232
 msgid "Add a _Buddy"
 msgstr "Lisää _tuttava"
 
-#: ../pidgin/gtkblist.c:1188
+#: ../pidgin/gtkblist.c:1235
 msgid "Add a C_hat"
 msgstr "Lisää _ryhmäkeskustelu"
 
-#: ../pidgin/gtkblist.c:1191
+#: ../pidgin/gtkblist.c:1238
 msgid "_Delete Group"
 msgstr "_Poista ryhmä"
 
-#: ../pidgin/gtkblist.c:1193
+#: ../pidgin/gtkblist.c:1240
 msgid "_Rename"
 msgstr "Nimeä _uudelleen"
 
 #. join button
-#: ../pidgin/gtkblist.c:1211 ../pidgin/gtkroomlist.c:306
-#: ../pidgin/gtkroomlist.c:463 ../pidgin/pidginstock.c:82
+#: ../pidgin/gtkblist.c:1258 ../pidgin/gtkroomlist.c:306
+#: ../pidgin/gtkroomlist.c:459 ../pidgin/pidginstock.c:82
 msgid "_Join"
 msgstr "_Liity"
 
-#: ../pidgin/gtkblist.c:1213
+#: ../pidgin/gtkblist.c:1260
 msgid "Auto-Join"
 msgstr "Liity automaattisesti"
 
-#: ../pidgin/gtkblist.c:1251 ../pidgin/gtkblist.c:1274
+#: ../pidgin/gtkblist.c:1298 ../pidgin/gtkblist.c:1321
 msgid "_Collapse"
 msgstr "_Pienennä"
 
-#: ../pidgin/gtkblist.c:1279
+#: ../pidgin/gtkblist.c:1326
 msgid "_Expand"
 msgstr "_Laajenna"
 
-#: ../pidgin/gtkblist.c:1524 ../pidgin/gtkblist.c:1536
-#: ../pidgin/gtkblist.c:4529 ../pidgin/gtkblist.c:4539
+#: ../pidgin/gtkblist.c:1571 ../pidgin/gtkblist.c:1583
+#: ../pidgin/gtkblist.c:4561 ../pidgin/gtkblist.c:4571
 msgid "/Tools/Mute Sounds"
 msgstr "/Työkalut/Vaimenna äänet"
 
-#: ../pidgin/gtkblist.c:1996 ../pidgin/gtkconv.c:4610
-#: ../pidgin/gtkpounce.c:423
+#: ../pidgin/gtkblist.c:2043 ../pidgin/gtkconv.c:4602
+#: ../pidgin/gtkpounce.c:429
 msgid ""
 "You are not currently signed on with an account that can add that buddy."
 msgstr ""
@@ -12127,117 +12168,126 @@
 "tuttavan."
 
 #. Buddies menu
-#: ../pidgin/gtkblist.c:2836
+#: ../pidgin/gtkblist.c:2838
 msgid "/_Buddies"
 msgstr "/_Tuttavat"
 
-#: ../pidgin/gtkblist.c:2837
-msgid "/Buddies/New Instant _Message..."
-msgstr "/Tuttavat/Uusi _pikaviesti..."
-
-#: ../pidgin/gtkblist.c:2838
-msgid "/Buddies/Join a _Chat..."
-msgstr "/Tuttavat/Liity _ryhmäkeskusteluun..."
-
 #: ../pidgin/gtkblist.c:2839
+msgid "/Buddies/New Instant _Message..."
+msgstr "/Tuttavat/Uusi _pikaviesti..."
+
+#: ../pidgin/gtkblist.c:2840
+msgid "/Buddies/Join a _Chat..."
+msgstr "/Tuttavat/Liity _ryhmäkeskusteluun..."
+
+#: ../pidgin/gtkblist.c:2841
 msgid "/Buddies/Get User _Info..."
 msgstr "/Tuttavat/Hae _käyttäjätiedot..."
 
-#: ../pidgin/gtkblist.c:2840
+#: ../pidgin/gtkblist.c:2842
 msgid "/Buddies/View User _Log..."
 msgstr "/Tuttavat/Näytä käyttäjä_loki..."
 
-#: ../pidgin/gtkblist.c:2842
-msgid "/Buddies/Show _Offline Buddies"
-msgstr "/Tuttavat/Näytä poissaolevat tuttavat"
-
-#: ../pidgin/gtkblist.c:2843
-msgid "/Buddies/Show _Empty Groups"
-msgstr "/Tuttavat/Näytä tyhjät ryhmät"
-
 #: ../pidgin/gtkblist.c:2844
+msgid "/Buddies/Show _Offline Buddies"
+msgstr "/Tuttavat/Näytä poissaolevat tuttavat"
+
+#: ../pidgin/gtkblist.c:2845
+msgid "/Buddies/Show _Empty Groups"
+msgstr "/Tuttavat/Näytä tyhjät ryhmät"
+
+#: ../pidgin/gtkblist.c:2846
 msgid "/Buddies/Show Buddy _Details"
 msgstr "/Tuttavat/Näytä tuttavien tiedot"
 
-#: ../pidgin/gtkblist.c:2845
+#: ../pidgin/gtkblist.c:2847
 msgid "/Buddies/Show Idle _Times"
 msgstr "/Tuttavat/Näytä _joutenoloajat"
 
-#: ../pidgin/gtkblist.c:2846
+#: ../pidgin/gtkblist.c:2848
 msgid "/Buddies/_Sort Buddies"
 msgstr "/Tuttavat/L_ajittele tuttavat"
 
-#: ../pidgin/gtkblist.c:2848
+#: ../pidgin/gtkblist.c:2850
 msgid "/Buddies/_Add Buddy..."
 msgstr "/Tuttavat/_Lisää tuttava..."
 
-#: ../pidgin/gtkblist.c:2849
+#: ../pidgin/gtkblist.c:2851
 msgid "/Buddies/Add C_hat..."
 msgstr "/Tuttavat/Lisää ryhmäkeskustelu..."
 
-#: ../pidgin/gtkblist.c:2850
+#: ../pidgin/gtkblist.c:2852
 msgid "/Buddies/Add _Group..."
 msgstr "/Tuttavat/Lisää _ryhmä..."
 
-#: ../pidgin/gtkblist.c:2852
-msgid "/Buddies/_About Pidgin"
-msgstr "/Tuttavat/Tietoj_a Pidginistä"
-
-#: ../pidgin/gtkblist.c:2853
+#: ../pidgin/gtkblist.c:2854
 msgid "/Buddies/_Quit"
 msgstr "/Tuttavat/_Lopeta"
 
 #. Accounts menu
-#: ../pidgin/gtkblist.c:2856
+#: ../pidgin/gtkblist.c:2857
 msgid "/_Accounts"
 msgstr "/_Käyttäjätilit"
 
-#: ../pidgin/gtkblist.c:2857 ../pidgin/gtkblist.c:6480
+#: ../pidgin/gtkblist.c:2858 ../pidgin/gtkblist.c:6532
 msgid "/Accounts/Add\\/Edit"
 msgstr "/Käyttäjätilit/Lisää\\/muokkaa"
 
 #. Tools
-#: ../pidgin/gtkblist.c:2860
+#: ../pidgin/gtkblist.c:2861
 msgid "/_Tools"
 msgstr "/T_yökalut"
 
-#: ../pidgin/gtkblist.c:2861
+#: ../pidgin/gtkblist.c:2862
 msgid "/Tools/Buddy _Pounces"
 msgstr "/Työkalut/Tuttava_ilmoittimet"
 
-#: ../pidgin/gtkblist.c:2862
+#: ../pidgin/gtkblist.c:2863
 msgid "/Tools/Plu_gins"
 msgstr "/Työkalut/_Liitännäiset"
 
-#: ../pidgin/gtkblist.c:2863
-msgid "/Tools/Pr_eferences"
-msgstr "/Työkalut/A_setukset"
-
 #: ../pidgin/gtkblist.c:2864
+msgid "/Tools/Pr_eferences"
+msgstr "/Työkalut/A_setukset"
+
+#: ../pidgin/gtkblist.c:2865
 msgid "/Tools/Pr_ivacy"
 msgstr "/Työkalut/Yks_ityisyys"
 
-#: ../pidgin/gtkblist.c:2866
-msgid "/Tools/_File Transfers"
-msgstr "/Työkalut/_Tiedostonsiirrot..."
-
 #: ../pidgin/gtkblist.c:2867
-msgid "/Tools/R_oom List"
-msgstr "/Työkalut/Huone_lista"
+msgid "/Tools/_File Transfers"
+msgstr "/Työkalut/_Tiedostonsiirrot..."
 
 #: ../pidgin/gtkblist.c:2868
+msgid "/Tools/R_oom List"
+msgstr "/Työkalut/Huone_lista"
+
+#: ../pidgin/gtkblist.c:2869
 msgid "/Tools/System _Log"
 msgstr "/Työkalut/Järjestelmä_loki"
 
-#: ../pidgin/gtkblist.c:2869
-msgid "/Tools/_Debug Window"
-msgstr "/Työkalut/_Virheenjäljitysikkuna"
-
 #: ../pidgin/gtkblist.c:2871
 msgid "/Tools/Mute _Sounds"
 msgstr "/Työkalut/Vaimenna _äänet"
 
-#: ../pidgin/gtkblist.c:2899
+#. Help
+#: ../pidgin/gtkblist.c:2873
+msgid "/_Help"
+msgstr "/O_hje"
+
+#: ../pidgin/gtkblist.c:2874
+msgid "/Help/Online _Help"
+msgstr "/Ohje/O_hjeita verkossa"
+
+#: ../pidgin/gtkblist.c:2875
+msgid "/Help/_Debug Window"
+msgstr "/Ohje/_Virheenjäljitysikkuna"
+
+#: ../pidgin/gtkblist.c:2877 ../pidgin/gtkblist.c:2879
+msgid "/Help/_About"
+msgstr "/Ohje/Tietoj_a"
+
+#: ../pidgin/gtkblist.c:2908
 #, c-format
 msgid ""
 "\n"
@@ -12246,127 +12296,132 @@
 "\n"
 "<b>Käyttäjätili:</b> %s"
 
-#: ../pidgin/gtkblist.c:2977
+#: ../pidgin/gtkblist.c:2986
 msgid "Buddy Alias"
 msgstr "Tuttavan lempinimi"
 
-#: ../pidgin/gtkblist.c:3005
+#: ../pidgin/gtkblist.c:3015
 msgid "Logged In"
-msgstr "Kirjautui sisään"
-
-#: ../pidgin/gtkblist.c:3051
+msgstr "Kirjautumisesta aikaa"
+
+#: ../pidgin/gtkblist.c:3061
 msgid "Last Seen"
-msgstr "Viimeksi nähty"
-
-#: ../pidgin/gtkblist.c:3071
+msgstr "Näkemisestä aikaa"
+
+#: ../pidgin/gtkblist.c:3081
 msgid "Spooky"
 msgstr "Aavemainen"
 
-#: ../pidgin/gtkblist.c:3073
+#: ../pidgin/gtkblist.c:3083
 msgid "Awesome"
 msgstr "Mahtava"
 
-#: ../pidgin/gtkblist.c:3075
+#: ../pidgin/gtkblist.c:3085
 msgid "Rockin'"
 msgstr "Rokkaava"
 
-#: ../pidgin/gtkblist.c:3404
+#: ../pidgin/gtkblist.c:3428
+#, c-format
+msgid "Idle %dd %dh %02dm"
+msgstr "Jouten %dd %dh %02dm"
+
+#: ../pidgin/gtkblist.c:3430
 #, c-format
 msgid "Idle %dh %02dm"
-msgstr "Jouten %dt %02dm"
-
-#: ../pidgin/gtkblist.c:3406
+msgstr "Jouten %dh %02dm"
+
+#: ../pidgin/gtkblist.c:3432
 #, c-format
 msgid "Idle %dm"
 msgstr "Jouten %dm"
 
-#: ../pidgin/gtkblist.c:3551
+#: ../pidgin/gtkblist.c:3577
 msgid "/Buddies/New Instant Message..."
 msgstr "/Tuttavat/Uusi pikaviesti..."
 
-#: ../pidgin/gtkblist.c:3552 ../pidgin/gtkblist.c:3585
+#: ../pidgin/gtkblist.c:3578 ../pidgin/gtkblist.c:3611
 msgid "/Buddies/Join a Chat..."
 msgstr "/Tuttavat/Liity ryhmäkeskusteluun..."
 
-#: ../pidgin/gtkblist.c:3553
+#: ../pidgin/gtkblist.c:3579
 msgid "/Buddies/Get User Info..."
 msgstr "/Tuttavat/Hae käyttäjätiedot..."
 
-#: ../pidgin/gtkblist.c:3554
+#: ../pidgin/gtkblist.c:3580
 msgid "/Buddies/Add Buddy..."
 msgstr "/Tuttavat/Lisää tuttava..."
 
-#: ../pidgin/gtkblist.c:3555 ../pidgin/gtkblist.c:3588
+#: ../pidgin/gtkblist.c:3581 ../pidgin/gtkblist.c:3614
 msgid "/Buddies/Add Chat..."
 msgstr "/Tuttavat/Lisää ryhmäkeskustelu..."
 
-#: ../pidgin/gtkblist.c:3556
+#: ../pidgin/gtkblist.c:3582
 msgid "/Buddies/Add Group..."
 msgstr "/Tuttavat/Lisää ryhmä..."
 
-#: ../pidgin/gtkblist.c:3591
+#: ../pidgin/gtkblist.c:3617
 msgid "/Tools/Privacy"
 msgstr "/Työkalut/Yksityisyys"
 
-#: ../pidgin/gtkblist.c:3594
+#: ../pidgin/gtkblist.c:3620
 msgid "/Tools/Room List"
 msgstr "/Työkalut/Huonelista"
 
-#: ../pidgin/gtkblist.c:3691 ../pidgin/gtkdocklet.c:153
+#: ../pidgin/gtkblist.c:3717 ../pidgin/gtkdocklet.c:153
 #, c-format
 msgid "%d unread message from %s\n"
 msgid_plural "%d unread messages from %s\n"
 msgstr[0] "%d lukematon viesti käyttäjältä %s\n"
 msgstr[1] "%d lukematonta viestiä käyttäjältä %s\n"
 
-#: ../pidgin/gtkblist.c:3768
+#: ../pidgin/gtkblist.c:3797
 msgid "Manually"
 msgstr "Käsin"
 
-#: ../pidgin/gtkblist.c:3770
+#: ../pidgin/gtkblist.c:3799
 msgid "Alphabetically"
 msgstr "Aakkosittain"
 
-#: ../pidgin/gtkblist.c:3771
+#: ../pidgin/gtkblist.c:3800
 msgid "By status"
 msgstr "Tilan mukaan"
 
-#: ../pidgin/gtkblist.c:3772
+#: ../pidgin/gtkblist.c:3801
 msgid "By log size"
 msgstr "Lokin koon mukaan"
 
-#: ../pidgin/gtkblist.c:3974 ../pidgin/gtkconn.c:178
+#: ../pidgin/gtkblist.c:4005 ../pidgin/gtkconn.c:178
 #, c-format
 msgid "%s disconnected"
 msgstr "Yhteys katkennut kohteeseen %s"
 
-#: ../pidgin/gtkblist.c:3984
+#: ../pidgin/gtkblist.c:4015
 msgid "Re-enable Account"
 msgstr "Ota tili uudelleen käyttöön"
 
-#: ../pidgin/gtkblist.c:4008
+#: ../pidgin/gtkblist.c:4039
 #, c-format
 msgid "<span color=\"red\">%s disconnected: %s</span>"
 msgstr "<span color=\"red\">%s kirjautui ulos: %s</span>"
 
-#: ../pidgin/gtkblist.c:4160
+#: ../pidgin/gtkblist.c:4191
 msgid "<b>Username:</b>"
 msgstr "<b>Käyttäjänimi:</b>"
 
-#: ../pidgin/gtkblist.c:4167
+#: ../pidgin/gtkblist.c:4198
 msgid "<b>Password:</b>"
 msgstr "<b>Salasana:</b>"
 
-#: ../pidgin/gtkblist.c:4178
+#: ../pidgin/gtkblist.c:4209
 msgid "_Login"
 msgstr "_Sisäänkirjautuminen"
 
-#: ../pidgin/gtkblist.c:4263
+#: ../pidgin/gtkblist.c:4292
 msgid "/Accounts"
 msgstr "/Käyttäjätilit"
 
 #. Translators: Please maintain the use of -> and <- to refer to menu heirarchy
-#: ../pidgin/gtkblist.c:4277
+#: ../pidgin/gtkblist.c:4306
 #, c-format
 msgid ""
 "<span weight='bold' size='larger'>Welcome to %s!</span>\n"
@@ -12385,23 +12440,23 @@
 #. set the Show Offline Buddies option. must be done
 #. * after the treeview or faceprint gets mad. -Robot101
 #.
-#: ../pidgin/gtkblist.c:4523
+#: ../pidgin/gtkblist.c:4555
 msgid "/Buddies/Show Offline Buddies"
 msgstr "/Tuttavat/Näytä poissaolevat tuttavat"
 
-#: ../pidgin/gtkblist.c:4526
+#: ../pidgin/gtkblist.c:4558
 msgid "/Buddies/Show Empty Groups"
 msgstr "/Tuttavat/Näytä tyhjät ryhmät"
 
-#: ../pidgin/gtkblist.c:4532
+#: ../pidgin/gtkblist.c:4564
 msgid "/Buddies/Show Buddy Details"
 msgstr "/Tuttavat/Näytä tuttavien tiedot"
 
-#: ../pidgin/gtkblist.c:4535
+#: ../pidgin/gtkblist.c:4567
 msgid "/Buddies/Show Idle Times"
 msgstr "/Tuttavat/Näytä joutenoloajat"
 
-#: ../pidgin/gtkblist.c:5392
+#: ../pidgin/gtkblist.c:5444
 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. "
@@ -12412,19 +12467,19 @@
 "aina kuin mahdollista.\n"
 
 #. End of account box
-#: ../pidgin/gtkblist.c:5427
+#: ../pidgin/gtkblist.c:5479
 msgid "_Screen name:"
 msgstr "_Näyttönimi:"
 
-#: ../pidgin/gtkblist.c:5449 ../pidgin/gtkblist.c:5803
+#: ../pidgin/gtkblist.c:5501 ../pidgin/gtkblist.c:5855
 msgid "A_lias:"
 msgstr "A_lias:"
 
-#: ../pidgin/gtkblist.c:5715
+#: ../pidgin/gtkblist.c:5767
 msgid "This protocol does not support chat rooms."
 msgstr "Tämä yhteyskäytäntö ei tue keskusteluhuoneita."
 
-#: ../pidgin/gtkblist.c:5731
+#: ../pidgin/gtkblist.c:5783
 msgid ""
 "You are not currently signed on with any protocols that have the ability to "
 "chat."
@@ -12432,7 +12487,7 @@
 "Et ole kirjautuneena millään yhteyskäytännöllä jolla voisi käyttää "
 "ryhmäkeskustelua."
 
-#: ../pidgin/gtkblist.c:5772
+#: ../pidgin/gtkblist.c:5824
 msgid ""
 "Please enter an alias, and the appropriate information about the chat you "
 "would like to add to your buddy list.\n"
@@ -12440,39 +12495,39 @@
 "Anna lempinimi, ja tiedot ryhmäkeskustelusta jonka haluat lisätä "
 "tuttavalistalle.\n"
 
-#: ../pidgin/gtkblist.c:5860
+#: ../pidgin/gtkblist.c:5912
 msgid "Please enter the name of the group to be added."
 msgstr "Anna lisättävän ryhmän nimi."
 
-#: ../pidgin/gtkblist.c:6500
+#: ../pidgin/gtkblist.c:6552
 msgid "<PurpleMain>/Accounts/"
 msgstr "<PurpleMain>/Käyttäjätilit/"
 
-#: ../pidgin/gtkblist.c:6524
+#: ../pidgin/gtkblist.c:6576
 msgid "_Edit Account"
 msgstr "_Muokkaa käyttäjätiliä"
 
-#: ../pidgin/gtkblist.c:6537 ../pidgin/gtkconv.c:2984
+#: ../pidgin/gtkblist.c:6589 ../pidgin/gtkconv.c:2982
 msgid "No actions available"
 msgstr "Ei toimintoja saatavilla."
 
-#: ../pidgin/gtkblist.c:6545
+#: ../pidgin/gtkblist.c:6597
 msgid "_Disable"
 msgstr "_Poista käytöstä"
 
-#: ../pidgin/gtkblist.c:6557
+#: ../pidgin/gtkblist.c:6609
 msgid "Enable Account"
 msgstr "Ota tili käyttöön"
 
-#: ../pidgin/gtkblist.c:6563
+#: ../pidgin/gtkblist.c:6615
 msgid "<PurpleMain>/Accounts/Enable Account"
 msgstr "<PurpleMain>/Käyttäjätilit/Ota tili käyttöön"
 
-#: ../pidgin/gtkblist.c:6612
+#: ../pidgin/gtkblist.c:6664
 msgid "/Tools"
 msgstr "/Työkalut"
 
-#: ../pidgin/gtkblist.c:6682
+#: ../pidgin/gtkblist.c:6734
 msgid "/Buddies/Sort Buddies"
 msgstr "/Tuttavat/Lajittele tuttavat"
 
@@ -12489,317 +12544,325 @@
 "%s ei yritä uudelleenyhdistää käyttäjätiliä kunnes korjaat virheen ja otat "
 "tilin uudelleen käyttöön."
 
-#: ../pidgin/gtkconv.c:792 ../pidgin/gtkconv.c:818
+#: ../pidgin/gtkconv.c:485
+msgid "Unknown command."
+msgstr "Tuntematon komento."
+
+#: ../pidgin/gtkconv.c:757 ../pidgin/gtkconv.c:783
 msgid "That buddy is not on the same protocol as this chat."
 msgstr "Tuttava ei käytä samaa yhteyskäytäntöä kuin tämä ryhmäkeskustelu."
 
-#: ../pidgin/gtkconv.c:812
+#: ../pidgin/gtkconv.c:777
 msgid ""
 "You are not currently signed on with an account that can invite that buddy."
 msgstr ""
 "Et ole kirjautuneena millään käyttäjätilillä jolla voisi kutsua tämän "
 "tuttavan."
 
-#: ../pidgin/gtkconv.c:865
+#: ../pidgin/gtkconv.c:830
 msgid "Invite Buddy Into Chat Room"
 msgstr "Kutsu tuttava keskusteluhuoneeseen"
 
 #. Put our happy label in it.
-#: ../pidgin/gtkconv.c:895
+#: ../pidgin/gtkconv.c:860
 msgid ""
 "Please enter the name of the user you wish to invite, along with an optional "
 "invite message."
 msgstr "Anna kutsuttavan käyttäjän nimi sekä vapaaehtoinen viesti."
 
-#: ../pidgin/gtkconv.c:916
+#: ../pidgin/gtkconv.c:881
 msgid "_Buddy:"
 msgstr "_Tuttava:"
 
-#: ../pidgin/gtkconv.c:936 ../pidgin/gtksavedstatuses.c:1141
-#: ../pidgin/gtksavedstatuses.c:1477
+#: ../pidgin/gtkconv.c:901 ../pidgin/gtksavedstatuses.c:1193
+#: ../pidgin/gtksavedstatuses.c:1525
 msgid "_Message:"
 msgstr "_Viesti:"
 
-#: ../pidgin/gtkconv.c:993 ../pidgin/gtkconv.c:2542 ../pidgin/gtkdebug.c:218
+#: ../pidgin/gtkconv.c:958 ../pidgin/gtkconv.c:2506 ../pidgin/gtkdebug.c:218
 #: ../pidgin/gtkft.c:542
 msgid "Unable to open file."
 msgstr "Tiedoston avaaminen epäonnistui."
 
-#: ../pidgin/gtkconv.c:999
+#: ../pidgin/gtkconv.c:964
 #, c-format
 msgid "<h1>Conversation with %s</h1>\n"
 msgstr "<h1>Keskustelu käyttäjän %s kanssa</h1>\n"
 
-#: ../pidgin/gtkconv.c:1035
+#: ../pidgin/gtkconv.c:1000
 msgid "Save Conversation"
 msgstr "Tallenna keskustelu"
 
-#: ../pidgin/gtkconv.c:1184 ../pidgin/gtkdebug.c:166 ../pidgin/gtkdebug.c:742
+#: ../pidgin/gtkconv.c:1149 ../pidgin/gtkdebug.c:166 ../pidgin/gtkdebug.c:742
 msgid "Find"
 msgstr "Etsi"
 
-#: ../pidgin/gtkconv.c:1210 ../pidgin/gtkdebug.c:194
+#: ../pidgin/gtkconv.c:1175 ../pidgin/gtkdebug.c:194
 msgid "_Search for:"
 msgstr "_Haettava termi:"
 
-#: ../pidgin/gtkconv.c:1393
+#: ../pidgin/gtkconv.c:1358
 msgid "Logging started. Future messages in this conversation will be logged."
 msgstr ""
 "Kirjaaminen lokiin aloitettu. Tämän keskustelun viestit kirjataan nyt lokiin."
 
-#: ../pidgin/gtkconv.c:1401
+#: ../pidgin/gtkconv.c:1366
 msgid ""
 "Logging stopped. Future messages in this conversation will not be logged."
 msgstr ""
 "Kirjaaminen lokiin lopetettu. Tämän keskustelun viestejä ei enää kirjata "
 "lokiin."
 
-#: ../pidgin/gtkconv.c:1649
+#: ../pidgin/gtkconv.c:1614
 msgid "Un-Ignore"
 msgstr "Huomioi"
 
-#: ../pidgin/gtkconv.c:1652
+#: ../pidgin/gtkconv.c:1617
 msgid "Ignore"
 msgstr "Jätä huomiotta"
 
-#: ../pidgin/gtkconv.c:1672
+#: ../pidgin/gtkconv.c:1637
 msgid "Get Away Message"
 msgstr "Hae poissaoloviesti"
 
-#: ../pidgin/gtkconv.c:1695
+#: ../pidgin/gtkconv.c:1660
 msgid "Last said"
 msgstr "Viimeksi sanottu"
 
-#: ../pidgin/gtkconv.c:2550
+#: ../pidgin/gtkconv.c:2514
 msgid "Unable to save icon file to disk."
 msgstr "Kuvaketiedostoa ei voida tallentaa levylle."
 
-#: ../pidgin/gtkconv.c:2601
+#: ../pidgin/gtkconv.c:2565
 msgid "Save Icon"
 msgstr "Tallenna kuvake"
 
-#: ../pidgin/gtkconv.c:2653
+#: ../pidgin/gtkconv.c:2617
 msgid "Animate"
 msgstr "Animoi"
 
-#: ../pidgin/gtkconv.c:2658
+#: ../pidgin/gtkconv.c:2622
 msgid "Hide Icon"
 msgstr "Piilota kuvake"
 
-#: ../pidgin/gtkconv.c:2661
+#: ../pidgin/gtkconv.c:2625
 msgid "Save Icon As..."
 msgstr "Tallenna kuvake nimellä..."
 
-#: ../pidgin/gtkconv.c:2665
+#: ../pidgin/gtkconv.c:2629
 msgid "Set Custom Icon..."
 msgstr "Aseta oma kuvake..."
 
-#: ../pidgin/gtkconv.c:2678
+#: ../pidgin/gtkconv.c:2642
 msgid "Remove Custom Icon"
 msgstr "Poista oma kuvake"
 
 #. Conversation menu
-#: ../pidgin/gtkconv.c:2820
+#: ../pidgin/gtkconv.c:2784
 msgid "/_Conversation"
 msgstr "/_Keskustelu"
 
-#: ../pidgin/gtkconv.c:2822
+#: ../pidgin/gtkconv.c:2786
 msgid "/Conversation/New Instant _Message..."
 msgstr "/Keskustelu/Uusi _pikaviesti..."
 
-#: ../pidgin/gtkconv.c:2827
+#: ../pidgin/gtkconv.c:2791
 msgid "/Conversation/_Find..."
 msgstr "/Keskustelu/_Etsi..."
 
-#: ../pidgin/gtkconv.c:2829
+#: ../pidgin/gtkconv.c:2793
 msgid "/Conversation/View _Log"
 msgstr "/Keskustelu/Näytä l_oki..."
 
-#: ../pidgin/gtkconv.c:2830
+#: ../pidgin/gtkconv.c:2794
 msgid "/Conversation/_Save As..."
 msgstr "/Keskustelu/_Tallenna nimellä..."
 
-#: ../pidgin/gtkconv.c:2832
+#: ../pidgin/gtkconv.c:2796
 msgid "/Conversation/Clea_r Scrollback"
 msgstr "/Keskustelu/T_yhjennä takaisinvieritys"
 
-#: ../pidgin/gtkconv.c:2836
+#: ../pidgin/gtkconv.c:2800
 msgid "/Conversation/Se_nd File..."
 msgstr "/Keskustelu/_Lähetä tiedosto..."
 
-#: ../pidgin/gtkconv.c:2837
+#: ../pidgin/gtkconv.c:2801
 msgid "/Conversation/Add Buddy _Pounce..."
 msgstr "/Keskustelu/Lisää tuttava_ilmoitin..."
 
-#: ../pidgin/gtkconv.c:2839
+#: ../pidgin/gtkconv.c:2803
 msgid "/Conversation/_Get Info"
 msgstr "/Keskustelu/_Hae tiedot..."
 
-#: ../pidgin/gtkconv.c:2841
+#: ../pidgin/gtkconv.c:2805
 msgid "/Conversation/In_vite..."
 msgstr "/Keskustelu/Kut_su..."
 
-#: ../pidgin/gtkconv.c:2843
+#: ../pidgin/gtkconv.c:2807
 msgid "/Conversation/M_ore"
 msgstr "/Keskustelu/Lis_ää"
 
-#: ../pidgin/gtkconv.c:2847
+#: ../pidgin/gtkconv.c:2811
 msgid "/Conversation/Al_ias..."
 msgstr "/Keskustelu/_Alias..."
 
-#: ../pidgin/gtkconv.c:2849
+#: ../pidgin/gtkconv.c:2813
 msgid "/Conversation/_Block..."
 msgstr "/Keskustelu/E_stä..."
 
-#: ../pidgin/gtkconv.c:2851
+#: ../pidgin/gtkconv.c:2815
 msgid "/Conversation/_Unblock..."
 msgstr "/Keskustelu/Poista est_o..."
 
-#: ../pidgin/gtkconv.c:2853
+#: ../pidgin/gtkconv.c:2817
 msgid "/Conversation/_Add..."
 msgstr "/Keskustelu/_Lisää..."
 
-#: ../pidgin/gtkconv.c:2855
+#: ../pidgin/gtkconv.c:2819
 msgid "/Conversation/_Remove..."
 msgstr "/Keskustelu/_Poista..."
 
-#: ../pidgin/gtkconv.c:2860
+#: ../pidgin/gtkconv.c:2824
 msgid "/Conversation/Insert Lin_k..."
 msgstr "/Keskustelu/Lisää lin_kki..."
 
-#: ../pidgin/gtkconv.c:2862
+#: ../pidgin/gtkconv.c:2826
 msgid "/Conversation/Insert Imag_e..."
 msgstr "/Keskustelu/Liitä _kuva..."
 
-#: ../pidgin/gtkconv.c:2868
+#: ../pidgin/gtkconv.c:2832
 msgid "/Conversation/_Close"
 msgstr "/Keskustelu/_Sulje"
 
 #. Options
-#: ../pidgin/gtkconv.c:2872
+#: ../pidgin/gtkconv.c:2836
 msgid "/_Options"
 msgstr "/_Valinnat"
 
-#: ../pidgin/gtkconv.c:2873
+#: ../pidgin/gtkconv.c:2837
 msgid "/Options/Enable _Logging"
 msgstr "/Valinnat/_Lokiinkirjaus"
 
-#: ../pidgin/gtkconv.c:2874
+#: ../pidgin/gtkconv.c:2838
 msgid "/Options/Enable _Sounds"
 msgstr "/Valinnat/S_oita merkkiäänet"
 
-#: ../pidgin/gtkconv.c:2875
+#: ../pidgin/gtkconv.c:2839
 msgid "/Options/Show Buddy _Icon"
 msgstr "/Valinnat/Näytä tuttava_kuvake"
 
-#: ../pidgin/gtkconv.c:2877
+#: ../pidgin/gtkconv.c:2841
 msgid "/Options/Show Formatting _Toolbars"
 msgstr "/Valinnat/Näytä muokkaus-_työkalurivit"
 
-#: ../pidgin/gtkconv.c:2878
+#: ../pidgin/gtkconv.c:2842
 msgid "/Options/Show Ti_mestamps"
 msgstr "/Valinnat/Näytä aika_leima"
 
-#: ../pidgin/gtkconv.c:2954
+#: ../pidgin/gtkconv.c:2918
 msgid "/Conversation/More"
 msgstr "/Keskustelu/Lisää"
 
+#: ../pidgin/gtkconv.c:3026
+msgid "/Options"
+msgstr "/Valinnat"
+
 #. The menubar has been deactivated. Make sure the 'More' submenu is regenerated next time
 #. * the 'Conversation' menu pops up.
 #. Make sure the 'Conversation -> More' menuitems are regenerated whenever
 #. * the 'Conversation' menu pops up because the entries can change after the
 #. * conversation is created.
-#: ../pidgin/gtkconv.c:3008 ../pidgin/gtkconv.c:3040
+#: ../pidgin/gtkconv.c:3061 ../pidgin/gtkconv.c:3093
 msgid "/Conversation"
 msgstr "/Keskustelu"
 
-#: ../pidgin/gtkconv.c:3048
+#: ../pidgin/gtkconv.c:3101
 msgid "/Conversation/View Log"
 msgstr "/Keskustelu/Näytä loki..."
 
-#: ../pidgin/gtkconv.c:3054
+#: ../pidgin/gtkconv.c:3107
 msgid "/Conversation/Send File..."
 msgstr "/Keskustelu/Lähetä tiedosto..."
 
-#: ../pidgin/gtkconv.c:3058
+#: ../pidgin/gtkconv.c:3111
 msgid "/Conversation/Add Buddy Pounce..."
 msgstr "/Keskustelu/Lisää tuttavailmoitin..."
 
-#: ../pidgin/gtkconv.c:3064
+#: ../pidgin/gtkconv.c:3117
 msgid "/Conversation/Get Info"
 msgstr "/Keskustelu/Hae tiedot..."
 
-#: ../pidgin/gtkconv.c:3068
+#: ../pidgin/gtkconv.c:3121
 msgid "/Conversation/Invite..."
 msgstr "/Keskustelu/Kutsu..."
 
-#: ../pidgin/gtkconv.c:3074
+#: ../pidgin/gtkconv.c:3127
 msgid "/Conversation/Alias..."
 msgstr "/Keskustelu/Alias..."
 
-#: ../pidgin/gtkconv.c:3078
+#: ../pidgin/gtkconv.c:3131
 msgid "/Conversation/Block..."
 msgstr "/Keskustelu/Estä..."
 
-#: ../pidgin/gtkconv.c:3082
+#: ../pidgin/gtkconv.c:3135
 msgid "/Conversation/Unblock..."
 msgstr "/Keskustelu/Poista esto..."
 
-#: ../pidgin/gtkconv.c:3086
+#: ../pidgin/gtkconv.c:3139
 msgid "/Conversation/Add..."
 msgstr "/Keskustelu/Lisää..."
 
-#: ../pidgin/gtkconv.c:3090
+#: ../pidgin/gtkconv.c:3143
 msgid "/Conversation/Remove..."
 msgstr "/Keskustelu/Poista..."
 
-#: ../pidgin/gtkconv.c:3096
+#: ../pidgin/gtkconv.c:3149
 msgid "/Conversation/Insert Link..."
 msgstr "/Keskustelu/Lisää linkki..."
 
-#: ../pidgin/gtkconv.c:3100
+#: ../pidgin/gtkconv.c:3153
 msgid "/Conversation/Insert Image..."
 msgstr "/Keskustelu/Lisää kuva..."
 
-#: ../pidgin/gtkconv.c:3106
+#: ../pidgin/gtkconv.c:3159
 msgid "/Options/Enable Logging"
 msgstr "/Valinnat/Lokiinkirjaus"
 
-#: ../pidgin/gtkconv.c:3109
+#: ../pidgin/gtkconv.c:3162
 msgid "/Options/Enable Sounds"
 msgstr "/Valinnat/Soita merkkiäänet"
 
-#: ../pidgin/gtkconv.c:3122
+#: ../pidgin/gtkconv.c:3175
 msgid "/Options/Show Formatting Toolbars"
 msgstr "/Valinnat/Näytä muokkaustyökalurivit"
 
-#: ../pidgin/gtkconv.c:3125
+#: ../pidgin/gtkconv.c:3178
 msgid "/Options/Show Timestamps"
 msgstr "/Valinnat/Näytä aikaleima"
 
-#: ../pidgin/gtkconv.c:3128
+#: ../pidgin/gtkconv.c:3181
 msgid "/Options/Show Buddy Icon"
 msgstr "/Valinnat/Näytä tuttava_kuvake"
 
-#: ../pidgin/gtkconv.c:3212 ../pidgin/gtkconv.c:3254
+#: ../pidgin/gtkconv.c:3265 ../pidgin/gtkconv.c:3307
 msgid "User is typing..."
 msgstr "Käyttäjä kirjoittaa..."
 
-#: ../pidgin/gtkconv.c:3257
+#: ../pidgin/gtkconv.c:3310
 msgid "User has typed something and stopped"
 msgstr "Käyttäjä kirjoitti jotain ja keskeytti"
 
 #. Build the Send To menu
-#: ../pidgin/gtkconv.c:3439
+#: ../pidgin/gtkconv.c:3492
 msgid "_Send To"
 msgstr "_Lähetä käyttäjälle"
 
-#: ../pidgin/gtkconv.c:4153
+#: ../pidgin/gtkconv.c:4206
 msgid "_Send"
 msgstr "_Lähetä"
 
 #. Setup the label telling how many people are in the room.
-#: ../pidgin/gtkconv.c:4304
+#: ../pidgin/gtkconv.c:4310
 msgid "0 people in room"
 msgstr "0 ihmistä huoneessa"
 
@@ -12810,72 +12873,76 @@
 msgstr[0] "%d ihminen huoneessa"
 msgstr[1] "%d ihmistä huoneessa"
 
-#: ../pidgin/gtkconv.c:6191 ../pidgin/gtkstatusbox.c:657
+#: ../pidgin/gtkconv.c:6216 ../pidgin/gtkstatusbox.c:659
 msgid "Typing"
 msgstr "Kirjoittaa"
 
-#: ../pidgin/gtkconv.c:6197
+#: ../pidgin/gtkconv.c:6222
 msgid "Stopped Typing"
 msgstr "Lopetti kirjoittamisen"
 
-#: ../pidgin/gtkconv.c:6202
+#: ../pidgin/gtkconv.c:6227
 msgid "Nick Said"
 msgstr "Sanoi"
 
-#: ../pidgin/gtkconv.c:6207 ../pidgin/gtkdocklet.c:492
+#: ../pidgin/gtkconv.c:6232 ../pidgin/gtkdocklet.c:492
 msgid "Unread Messages"
 msgstr "Lukemattomat viestit"
 
-#: ../pidgin/gtkconv.c:6212
+#: ../pidgin/gtkconv.c:6237
 msgid "New Event"
 msgstr "Uusi tapahtuma"
 
-#: ../pidgin/gtkconv.c:7344
+#: ../pidgin/gtkconv.c:7210
+msgid "clear: Clears all conversation scrollbacks."
+msgstr "clear: Tyhjentää kaikki keskustelut"
+
+#: ../pidgin/gtkconv.c:7374
 msgid "Confirm close"
 msgstr "Vahvista sulkeminen"
 
-#: ../pidgin/gtkconv.c:7376
+#: ../pidgin/gtkconv.c:7406
 msgid "You have unread messages. Are you sure you want to close the window?"
 msgstr ""
 "Sinulla on lukemattomia viestejä. Haluatko varmasti sulkea tämän ikkunan?"
 
-#: ../pidgin/gtkconv.c:7898
+#: ../pidgin/gtkconv.c:7967
 msgid "Close other tabs"
 msgstr "Sulje muut välilehdet"
 
-#: ../pidgin/gtkconv.c:7904
+#: ../pidgin/gtkconv.c:7973
 msgid "Close all tabs"
 msgstr "Sulje kaikki välilehdet"
 
-#: ../pidgin/gtkconv.c:7912
+#: ../pidgin/gtkconv.c:7981
 msgid "Detach this tab"
 msgstr "Irrota tämä välilehti"
 
-#: ../pidgin/gtkconv.c:7918
+#: ../pidgin/gtkconv.c:7987
 msgid "Close this tab"
 msgstr "Sulje tämä välilehti"
 
-#: ../pidgin/gtkconv.c:8304
+#: ../pidgin/gtkconv.c:8433
 msgid "Close conversation"
 msgstr "Sulje keskustelu"
 
-#: ../pidgin/gtkconv.c:8827
+#: ../pidgin/gtkconv.c:8957
 msgid "Last created window"
 msgstr "Viimeksi luotu ikkuna"
 
-#: ../pidgin/gtkconv.c:8829
+#: ../pidgin/gtkconv.c:8959
 msgid "Separate IM and Chat windows"
 msgstr "Näytä pikaviestit ja ryhmäkeskustelut eri ikkunoissa"
 
-#: ../pidgin/gtkconv.c:8831 ../pidgin/gtkprefs.c:1340
+#: ../pidgin/gtkconv.c:8961 ../pidgin/gtkprefs.c:1410
 msgid "New window"
 msgstr "Uusi ikkuna"
 
-#: ../pidgin/gtkconv.c:8833
+#: ../pidgin/gtkconv.c:8963
 msgid "By group"
 msgstr "Ryhmän mukaan"
 
-#: ../pidgin/gtkconv.c:8835
+#: ../pidgin/gtkconv.c:8965
 msgid "By account"
 msgstr "Tilin mukaan"
 
@@ -13000,7 +13067,7 @@
 msgstr "arabia"
 
 #: ../pidgin/gtkdialogs.c:125 ../pidgin/gtkdialogs.c:126
-#: ../pidgin/gtkdialogs.c:211
+#: ../pidgin/gtkdialogs.c:213
 msgid "Bulgarian"
 msgstr "bulgaria"
 
@@ -13013,8 +13080,8 @@
 msgid "Bosnian"
 msgstr "bosnia"
 
-#: ../pidgin/gtkdialogs.c:132 ../pidgin/gtkdialogs.c:212
-#: ../pidgin/gtkdialogs.c:213
+#: ../pidgin/gtkdialogs.c:132 ../pidgin/gtkdialogs.c:214
+#: ../pidgin/gtkdialogs.c:215
 msgid "Catalan"
 msgstr "katalaani"
 
@@ -13022,7 +13089,7 @@
 msgid "Valencian-Catalan"
 msgstr "valencian katalaani"
 
-#: ../pidgin/gtkdialogs.c:135 ../pidgin/gtkdialogs.c:214
+#: ../pidgin/gtkdialogs.c:135 ../pidgin/gtkdialogs.c:216
 msgid "Czech"
 msgstr "tšekki"
 
@@ -13031,7 +13098,7 @@
 msgstr "tanska"
 
 #: ../pidgin/gtkdialogs.c:138 ../pidgin/gtkdialogs.c:139
-#: ../pidgin/gtkdialogs.c:215
+#: ../pidgin/gtkdialogs.c:217
 msgid "German"
 msgstr "saksa"
 
@@ -13060,9 +13127,9 @@
 msgid "Esperanto"
 msgstr "esperanto"
 
-#: ../pidgin/gtkdialogs.c:149 ../pidgin/gtkdialogs.c:216
-#: ../pidgin/gtkdialogs.c:217 ../pidgin/gtkdialogs.c:218
-#: ../pidgin/gtkdialogs.c:219
+#: ../pidgin/gtkdialogs.c:149 ../pidgin/gtkdialogs.c:218
+#: ../pidgin/gtkdialogs.c:219 ../pidgin/gtkdialogs.c:220
+#: ../pidgin/gtkdialogs.c:221
 msgid "Spanish"
 msgstr "espanja"
 
@@ -13075,201 +13142,206 @@
 msgid "Persian"
 msgstr "persia"
 
-#: ../pidgin/gtkdialogs.c:155 ../pidgin/gtkdialogs.c:220
-#: ../pidgin/gtkdialogs.c:221
+#: ../pidgin/gtkdialogs.c:155 ../pidgin/gtkdialogs.c:222
+#: ../pidgin/gtkdialogs.c:223
 msgid "Finnish"
 msgstr "suomi"
 
-#: ../pidgin/gtkdialogs.c:156 ../pidgin/gtkdialogs.c:222
-#: ../pidgin/gtkdialogs.c:223 ../pidgin/gtkdialogs.c:224
-#: ../pidgin/gtkdialogs.c:225
+#: ../pidgin/gtkdialogs.c:156 ../pidgin/gtkdialogs.c:224
+#: ../pidgin/gtkdialogs.c:225 ../pidgin/gtkdialogs.c:226
+#: ../pidgin/gtkdialogs.c:227
 msgid "French"
 msgstr "ranska"
 
-#: ../pidgin/gtkdialogs.c:157
+#: ../pidgin/gtkdialogs.c:157 ../pidgin/gtkdialogs.c:158
 msgid "Galician"
 msgstr "galego"
 
-#: ../pidgin/gtkdialogs.c:158 ../pidgin/gtkdialogs.c:159
+#: ../pidgin/gtkdialogs.c:159 ../pidgin/gtkdialogs.c:160
 msgid "Gujarati"
 msgstr "gudžarati"
 
-#: ../pidgin/gtkdialogs.c:159
+#: ../pidgin/gtkdialogs.c:160
 msgid "Gujarati Language Team"
 msgstr "Gujaratin kääntäjäryhmä"
 
-#: ../pidgin/gtkdialogs.c:160 ../pidgin/gtkdialogs.c:226
+#: ../pidgin/gtkdialogs.c:161 ../pidgin/gtkdialogs.c:228
 msgid "Hebrew"
 msgstr "heprea"
 
-#: ../pidgin/gtkdialogs.c:161
+#: ../pidgin/gtkdialogs.c:162
 msgid "Hindi"
 msgstr "hindi"
 
-#: ../pidgin/gtkdialogs.c:162
+#: ../pidgin/gtkdialogs.c:163
 msgid "Hungarian"
 msgstr "unkari"
 
-#: ../pidgin/gtkdialogs.c:163
+#: ../pidgin/gtkdialogs.c:164
 msgid "Indonesian"
 msgstr "indonesia"
 
-#: ../pidgin/gtkdialogs.c:164 ../pidgin/gtkdialogs.c:227
+#: ../pidgin/gtkdialogs.c:165 ../pidgin/gtkdialogs.c:229
 msgid "Italian"
 msgstr "italia"
 
-#: ../pidgin/gtkdialogs.c:165 ../pidgin/gtkdialogs.c:228
-#: ../pidgin/gtkdialogs.c:229 ../pidgin/gtkdialogs.c:230
+#: ../pidgin/gtkdialogs.c:166 ../pidgin/gtkdialogs.c:230
+#: ../pidgin/gtkdialogs.c:231 ../pidgin/gtkdialogs.c:232
 msgid "Japanese"
 msgstr "japani"
 
-#: ../pidgin/gtkdialogs.c:166 ../pidgin/gtkdialogs.c:231
+#: ../pidgin/gtkdialogs.c:167 ../pidgin/gtkdialogs.c:233
 msgid "Georgian"
 msgstr "georgia"
 
-#: ../pidgin/gtkdialogs.c:166
+#: ../pidgin/gtkdialogs.c:167
 msgid "Ubuntu Georgian Translators"
 msgstr "Ubuntun georgian kääntäjät"
 
-#: ../pidgin/gtkdialogs.c:167
+#: ../pidgin/gtkdialogs.c:168
 msgid "Kannada"
 msgstr "kannada"
 
-#: ../pidgin/gtkdialogs.c:167
+#: ../pidgin/gtkdialogs.c:168
 msgid "Kannada Translation team"
 msgstr "Kannadan kääntäjäryhmä"
 
-#: ../pidgin/gtkdialogs.c:168 ../pidgin/gtkdialogs.c:232
+#: ../pidgin/gtkdialogs.c:169 ../pidgin/gtkdialogs.c:234
+#: ../pidgin/gtkdialogs.c:235
 msgid "Korean"
 msgstr "korea"
 
-#: ../pidgin/gtkdialogs.c:169 ../pidgin/gtkdialogs.c:170
-#: ../pidgin/gtkdialogs.c:171
+#: ../pidgin/gtkdialogs.c:170 ../pidgin/gtkdialogs.c:171
+#: ../pidgin/gtkdialogs.c:172
 msgid "Kurdish"
 msgstr "kurdi"
 
-#: ../pidgin/gtkdialogs.c:172 ../pidgin/gtkdialogs.c:233
-#: ../pidgin/gtkdialogs.c:234
+#: ../pidgin/gtkdialogs.c:173 ../pidgin/gtkdialogs.c:236
+#: ../pidgin/gtkdialogs.c:237
 msgid "Lithuanian"
 msgstr "liettua"
 
-#: ../pidgin/gtkdialogs.c:173 ../pidgin/gtkdialogs.c:174
-#: ../pidgin/gtkdialogs.c:235
+#: ../pidgin/gtkdialogs.c:174 ../pidgin/gtkdialogs.c:175
+#: ../pidgin/gtkdialogs.c:238
 msgid "Macedonian"
 msgstr "makedonia"
 
-#: ../pidgin/gtkdialogs.c:175
+#: ../pidgin/gtkdialogs.c:176
 msgid "Bokmål Norwegian"
 msgstr "kirjanorja"
 
-#: ../pidgin/gtkdialogs.c:176
+#: ../pidgin/gtkdialogs.c:177
 msgid "Nepali"
 msgstr "nepal"
 
-#: ../pidgin/gtkdialogs.c:177
+#: ../pidgin/gtkdialogs.c:178
 msgid "Dutch, Flemish"
 msgstr "hollanti, flaami"
 
-#: ../pidgin/gtkdialogs.c:178
+#: ../pidgin/gtkdialogs.c:179
 msgid "Norwegian"
 msgstr "norja"
 
-#: ../pidgin/gtkdialogs.c:179 ../pidgin/gtkdialogs.c:180
-#: ../pidgin/gtkdialogs.c:181 ../pidgin/gtkdialogs.c:236
+#: ../pidgin/gtkdialogs.c:180
+msgid "Norwegian Nynorsk"
+msgstr "norja (uusnorja)"
+
+#: ../pidgin/gtkdialogs.c:181 ../pidgin/gtkdialogs.c:182
+#: ../pidgin/gtkdialogs.c:183 ../pidgin/gtkdialogs.c:239
 msgid "Polish"
 msgstr "puola"
 
-#: ../pidgin/gtkdialogs.c:182
+#: ../pidgin/gtkdialogs.c:184
 msgid "Portuguese"
 msgstr "portugali"
 
-#: ../pidgin/gtkdialogs.c:183
-msgid "Portuguese-Brazil"
-msgstr "portugali (brasilialainen)"
-
-#: ../pidgin/gtkdialogs.c:184
-msgid "Pashto"
-msgstr "paštu"
-
 #: ../pidgin/gtkdialogs.c:185
+msgid "Portuguese-Brazil"
+msgstr "portugali (brasilialainen)"
+
+#: ../pidgin/gtkdialogs.c:186
+msgid "Pashto"
+msgstr "paštu"
+
+#: ../pidgin/gtkdialogs.c:187
 msgid "Romanian"
 msgstr "romania"
 
-#: ../pidgin/gtkdialogs.c:186 ../pidgin/gtkdialogs.c:237
-#: ../pidgin/gtkdialogs.c:238
+#: ../pidgin/gtkdialogs.c:188 ../pidgin/gtkdialogs.c:240
+#: ../pidgin/gtkdialogs.c:241
 msgid "Russian"
 msgstr "venäjä"
 
-#: ../pidgin/gtkdialogs.c:187 ../pidgin/gtkdialogs.c:188
-#: ../pidgin/gtkdialogs.c:239 ../pidgin/gtkdialogs.c:240
-#: ../pidgin/gtkdialogs.c:241
+#: ../pidgin/gtkdialogs.c:189 ../pidgin/gtkdialogs.c:190
+#: ../pidgin/gtkdialogs.c:242 ../pidgin/gtkdialogs.c:243
+#: ../pidgin/gtkdialogs.c:244
 msgid "Slovak"
 msgstr "slovakki"
 
-#: ../pidgin/gtkdialogs.c:189 ../pidgin/gtkdialogs.c:242
+#: ../pidgin/gtkdialogs.c:191 ../pidgin/gtkdialogs.c:245
 msgid "Slovenian"
 msgstr "sloveeni"
 
-#: ../pidgin/gtkdialogs.c:190
+#: ../pidgin/gtkdialogs.c:192
 msgid "Albanian"
 msgstr "albania"
 
-#: ../pidgin/gtkdialogs.c:191 ../pidgin/gtkdialogs.c:192
+#: ../pidgin/gtkdialogs.c:193 ../pidgin/gtkdialogs.c:194
 msgid "Serbian"
 msgstr "serbia"
 
-#: ../pidgin/gtkdialogs.c:193 ../pidgin/gtkdialogs.c:243
+#: ../pidgin/gtkdialogs.c:195 ../pidgin/gtkdialogs.c:246
 msgid "Swedish"
 msgstr "ruotsi"
 
-#: ../pidgin/gtkdialogs.c:194
+#: ../pidgin/gtkdialogs.c:196
 msgid "Tamil"
 msgstr "tamil"
 
-#: ../pidgin/gtkdialogs.c:195
+#: ../pidgin/gtkdialogs.c:197
 msgid "Telugu"
 msgstr "telugu"
 
-#: ../pidgin/gtkdialogs.c:196
+#: ../pidgin/gtkdialogs.c:198
 msgid "Thai"
 msgstr "thai"
 
-#: ../pidgin/gtkdialogs.c:197 ../pidgin/gtkdialogs.c:244
+#: ../pidgin/gtkdialogs.c:199 ../pidgin/gtkdialogs.c:247
 msgid "Turkish"
 msgstr "turkki"
 
-#: ../pidgin/gtkdialogs.c:198
+#: ../pidgin/gtkdialogs.c:200
 msgid "Vietnamese"
 msgstr "vietnam"
 
-#: ../pidgin/gtkdialogs.c:198
+#: ../pidgin/gtkdialogs.c:200
 msgid "T.M.Thanh and the Gnome-Vi Team"
 msgstr "T.M Thanh ja Gnomen Vi-työryhmä"
 
-#: ../pidgin/gtkdialogs.c:199 ../pidgin/gtkdialogs.c:245
+#: ../pidgin/gtkdialogs.c:201 ../pidgin/gtkdialogs.c:248
 msgid "Simplified Chinese"
 msgstr "kiina (yksinkertaistettu)"
 
-#: ../pidgin/gtkdialogs.c:200 ../pidgin/gtkdialogs.c:201
-#: ../pidgin/gtkdialogs.c:202
+#: ../pidgin/gtkdialogs.c:202 ../pidgin/gtkdialogs.c:203
+#: ../pidgin/gtkdialogs.c:204
 msgid "Hong Kong Chinese"
 msgstr "Hong Kongin kiina"
 
-#: ../pidgin/gtkdialogs.c:203 ../pidgin/gtkdialogs.c:204
-#: ../pidgin/gtkdialogs.c:246
+#: ../pidgin/gtkdialogs.c:205 ../pidgin/gtkdialogs.c:206
+#: ../pidgin/gtkdialogs.c:249
 msgid "Traditional Chinese"
 msgstr "kiina (perinteinen)"
 
-#: ../pidgin/gtkdialogs.c:210
+#: ../pidgin/gtkdialogs.c:212
 msgid "Amharic"
 msgstr "amhara"
 
-#: ../pidgin/gtkdialogs.c:331
+#: ../pidgin/gtkdialogs.c:334
 #, c-format
 msgid "About %s"
 msgstr "Tietoja %sistä"
 
-#: ../pidgin/gtkdialogs.c:369
+#: ../pidgin/gtkdialogs.c:372
 #, c-format
 msgid ""
 "%s is a graphical modular messaging client based on libpurple which is "
@@ -13292,86 +13364,86 @@
 "osallistuneista löytyy \"COPYRIGHT\"-tiedostosta. Tekijät eivät anna "
 "ohjelmalle minkäänlaista takuuta.<BR><BR>"
 
-#: ../pidgin/gtkdialogs.c:384
+#: ../pidgin/gtkdialogs.c:387
 msgid "<FONT SIZE=\"4\">IRC:</FONT> #pidgin on irc.freenode.net<BR><BR>"
 msgstr ""
 "<FONT SIZE=\"4\">IRC:</FONT> #pidgin palvelimella irc.freenode.net<BR><BR>"
 
-#: ../pidgin/gtkdialogs.c:389
+#: ../pidgin/gtkdialogs.c:392
 msgid "Current Developers"
 msgstr "Nykyiset kehittäjät"
 
-#: ../pidgin/gtkdialogs.c:404
+#: ../pidgin/gtkdialogs.c:407
 msgid "Crazy Patch Writers"
 msgstr "Villit korjauspäivitysten kirjoittajat"
 
-#: ../pidgin/gtkdialogs.c:419
+#: ../pidgin/gtkdialogs.c:422
 msgid "Retired Developers"
 msgstr "Lopettaneet kehittäjät"
 
-#: ../pidgin/gtkdialogs.c:434
+#: ../pidgin/gtkdialogs.c:437
 msgid "Artists"
 msgstr "Graafikot"
 
-#: ../pidgin/gtkdialogs.c:449
+#: ../pidgin/gtkdialogs.c:452
 msgid "Current Translators"
 msgstr "Nykyiset kielenkääntäjät"
 
-#: ../pidgin/gtkdialogs.c:469
+#: ../pidgin/gtkdialogs.c:472
 msgid "Past Translators"
 msgstr "Aikaisemmat kielenkääntäjät"
 
-#: ../pidgin/gtkdialogs.c:487
+#: ../pidgin/gtkdialogs.c:490
 msgid "Debugging Information"
 msgstr "Virheenjäljitystietoja"
 
-#: ../pidgin/gtkdialogs.c:865
+#: ../pidgin/gtkdialogs.c:859
 msgid "Get User Info"
 msgstr "Hae käyttäjätiedot"
 
-#: ../pidgin/gtkdialogs.c:867
+#: ../pidgin/gtkdialogs.c:861
 msgid ""
 "Please enter the screen name or alias of the person whose info you would "
 "like to view."
 msgstr ""
 "Syötä sen henkilön näyttönimi tai lempinimi, jonka tiedot haluat nähdä."
 
-#: ../pidgin/gtkdialogs.c:957
+#: ../pidgin/gtkdialogs.c:951
 msgid "View User Log"
 msgstr "Näytä käyttäjäloki"
 
-#: ../pidgin/gtkdialogs.c:959
+#: ../pidgin/gtkdialogs.c:953
 msgid ""
 "Please enter the screen name or alias of the person whose log you would like "
 "to view."
 msgstr "Syötä sen henkilön näyttönimi jonka lokia haluat katsella."
 
-#: ../pidgin/gtkdialogs.c:979
+#: ../pidgin/gtkdialogs.c:973
 msgid "Alias Contact"
 msgstr "Anna kontaktiryhmälle lempinimi"
 
-#: ../pidgin/gtkdialogs.c:980
+#: ../pidgin/gtkdialogs.c:974
 msgid "Enter an alias for this contact."
 msgstr "Anna lempinimi tälle kontaktiryhmälle."
 
-#: ../pidgin/gtkdialogs.c:1002
+#: ../pidgin/gtkdialogs.c:996
 #, c-format
 msgid "Enter an alias for %s."
 msgstr "Anna %s:n lempinimi."
 
-#: ../pidgin/gtkdialogs.c:1004
+#: ../pidgin/gtkdialogs.c:998
 msgid "Alias Buddy"
 msgstr "Anna tuttavalle lempinimi"
 
-#: ../pidgin/gtkdialogs.c:1025
+#: ../pidgin/gtkdialogs.c:1019
 msgid "Alias Chat"
 msgstr "Anna ryhmäkeskustelulle lempinimi"
 
-#: ../pidgin/gtkdialogs.c:1026
+#: ../pidgin/gtkdialogs.c:1020
 msgid "Enter an alias for this chat."
 msgstr "Syötä lempinimi tälle ryhmäkeskustelulle."
 
-#: ../pidgin/gtkdialogs.c:1065
+#: ../pidgin/gtkdialogs.c:1059
 #, c-format
 msgid ""
 "You are about to remove the contact containing %s and %d other buddy from "
@@ -13386,30 +13458,30 @@
 "Olet poistamassa kontaktin, jossa on %s sekä %d muuta tuttavaa "
 "tuttavalistaltasi.  Haluatko jatkaa?"
 
-#: ../pidgin/gtkdialogs.c:1073
+#: ../pidgin/gtkdialogs.c:1067
 msgid "Remove Contact"
 msgstr "Poista kontakti"
 
-#: ../pidgin/gtkdialogs.c:1076
+#: ../pidgin/gtkdialogs.c:1070
 msgid "_Remove Contact"
 msgstr "_Poista kontakti"
 
-#: ../pidgin/gtkdialogs.c:1107
+#: ../pidgin/gtkdialogs.c:1101
 #, c-format
 msgid ""
 "You are about to merge the group called %s into the group called %s. Do you "
 "want to continue?"
 msgstr "Olet yhdistämässä ryhmää \"%s\" ryhmään \"%s\".  Haluatko jatkaa?"
 
-#: ../pidgin/gtkdialogs.c:1114
+#: ../pidgin/gtkdialogs.c:1108
 msgid "Merge Groups"
 msgstr "Yhdistä ryhmät"
 
-#: ../pidgin/gtkdialogs.c:1117
+#: ../pidgin/gtkdialogs.c:1111
 msgid "_Merge Groups"
 msgstr "_Yhdistä ryhmät"
 
-#: ../pidgin/gtkdialogs.c:1167
+#: ../pidgin/gtkdialogs.c:1161
 #, c-format
 msgid ""
 "You are about to remove the group %s and all its members from your buddy "
@@ -13417,29 +13489,29 @@
 msgstr ""
 "Olet poistamassa ryhmää nimeltä \"%s\" tuttavalistaltasi.  Haluatko jatkaa?"
 
-#: ../pidgin/gtkdialogs.c:1170
+#: ../pidgin/gtkdialogs.c:1164
 msgid "Remove Group"
 msgstr "Poista ryhmä"
 
-#: ../pidgin/gtkdialogs.c:1173
+#: ../pidgin/gtkdialogs.c:1167
 msgid "_Remove Group"
 msgstr "_Poista ryhmä"
 
-#: ../pidgin/gtkdialogs.c:1206
+#: ../pidgin/gtkdialogs.c:1200
 #, c-format
 msgid ""
 "You are about to remove %s from your buddy list.  Do you want to continue?"
 msgstr "Olet poistamassa \"%s\":n tuttavalistaltasi.  Haluatko jatkaa?"
 
-#: ../pidgin/gtkdialogs.c:1209
+#: ../pidgin/gtkdialogs.c:1203
 msgid "Remove Buddy"
 msgstr "Poista tuttava"
 
-#: ../pidgin/gtkdialogs.c:1212
+#: ../pidgin/gtkdialogs.c:1206
 msgid "_Remove Buddy"
 msgstr "_Poista tuttava"
 
-#: ../pidgin/gtkdialogs.c:1233
+#: ../pidgin/gtkdialogs.c:1227
 #, c-format
 msgid ""
 "You are about to remove the chat %s from your buddy list.  Do you want to "
@@ -13448,11 +13520,11 @@
 "Olet poistamassa ryhmäkeskustelun nimeltä \"%s\" tuttavalistaltasi. Haluatko "
 "jatkaa?"
 
-#: ../pidgin/gtkdialogs.c:1236
+#: ../pidgin/gtkdialogs.c:1230
 msgid "Remove Chat"
 msgstr "Poista ryhmäkeskustelu"
 
-#: ../pidgin/gtkdialogs.c:1239
+#: ../pidgin/gtkdialogs.c:1233
 msgid "_Remove Chat"
 msgstr "_Poista ryhmäkeskustelu"
 
@@ -13547,66 +13619,66 @@
 msgid "Time Remaining:"
 msgstr "Aikaa jäljellä:"
 
-#: ../pidgin/gtkft.c:786
+#: ../pidgin/gtkft.c:783
 msgid "Close this window when all transfers _finish"
 msgstr "Sulje tämä ikkuna kun kaikki siirrot ovat _valmiita"
 
-#: ../pidgin/gtkft.c:796
+#: ../pidgin/gtkft.c:793
 msgid "C_lear finished transfers"
 msgstr "_Poista valmiit siirrot"
 
 #. "Download Details" arrow
-#: ../pidgin/gtkft.c:805
+#: ../pidgin/gtkft.c:802
 msgid "File transfer _details"
 msgstr "Tiedostonsiirron yksityiskohdat"
 
 #. Pause button
-#: ../pidgin/gtkft.c:835 ../pidgin/pidginstock.c:89
+#: ../pidgin/gtkft.c:832 ../pidgin/pidginstock.c:89
 msgid "_Pause"
 msgstr "_Tauko"
 
 #. Resume button
-#: ../pidgin/gtkft.c:845
+#: ../pidgin/gtkft.c:842
 msgid "_Resume"
 msgstr "_Jatka"
 
-#: ../pidgin/gtkimhtml.c:796
+#: ../pidgin/gtkimhtml.c:795
 msgid "Paste as Plain _Text"
 msgstr "Liimaa pelkkänä _tekstinä"
 
-#: ../pidgin/gtkimhtml.c:813
+#: ../pidgin/gtkimhtml.c:812
 msgid "_Reset formatting"
 msgstr "_Poista muotoilu"
 
-#: ../pidgin/gtkimhtml.c:1309
+#: ../pidgin/gtkimhtml.c:1349
 msgid "Hyperlink color"
 msgstr "Hyperlinkin väri"
 
-#: ../pidgin/gtkimhtml.c:1310
+#: ../pidgin/gtkimhtml.c:1350
 msgid "Color to draw hyperlinks."
 msgstr "Väri jolla piirretään hyperlinkit"
 
-#: ../pidgin/gtkimhtml.c:1313
+#: ../pidgin/gtkimhtml.c:1353
 msgid "Hyperlink prelight color"
 msgstr "Hyperlinkin ensiväri"
 
-#: ../pidgin/gtkimhtml.c:1314
+#: ../pidgin/gtkimhtml.c:1354
 msgid "Color to draw hyperlinks when mouse is over them."
 msgstr "Väri jolla piirretään hyperlinkit kun hiiren kursori on niiden päällä."
 
-#: ../pidgin/gtkimhtml.c:1530
+#: ../pidgin/gtkimhtml.c:1575
 msgid "_Copy E-Mail Address"
 msgstr "_Kopioi sähköpostiosoite"
 
-#: ../pidgin/gtkimhtml.c:1542
+#: ../pidgin/gtkimhtml.c:1587
 msgid "_Open Link in Browser"
 msgstr "_Avaa linkki selaimessa"
 
-#: ../pidgin/gtkimhtml.c:1552
+#: ../pidgin/gtkimhtml.c:1597
 msgid "_Copy Link Location"
 msgstr "_Kopioi linkin osoite"
 
-#: ../pidgin/gtkimhtml.c:3227
+#: ../pidgin/gtkimhtml.c:3341
 msgid ""
 "<span size='larger' weight='bold'>Unrecognized file type</span>\n"
 "\n"
@@ -13616,7 +13688,7 @@
 "\n"
 "Oletetaan PNG-kuvaksi."
 
-#: ../pidgin/gtkimhtml.c:3230
+#: ../pidgin/gtkimhtml.c:3344
 msgid ""
 "Unrecognized file type\n"
 "\n"
@@ -13626,7 +13698,7 @@
 "\n"
 "Oletetaan PNG-kuvaksi."
 
-#: ../pidgin/gtkimhtml.c:3259
+#: ../pidgin/gtkimhtml.c:3373
 #, c-format
 msgid ""
 "<span size='larger' weight='bold'>Error saving image</span>\n"
@@ -13637,7 +13709,7 @@
 "\n"
 "%s"
 
-#: ../pidgin/gtkimhtml.c:3262
+#: ../pidgin/gtkimhtml.c:3376
 #, c-format
 msgid ""
 "Error saving image\n"
@@ -13648,35 +13720,35 @@
 "\n"
 "%s"
 
-#: ../pidgin/gtkimhtml.c:3340 ../pidgin/gtkimhtml.c:3352
+#: ../pidgin/gtkimhtml.c:3454 ../pidgin/gtkimhtml.c:3466
 msgid "Save Image"
 msgstr "Tallenna kuva"
 
-#: ../pidgin/gtkimhtml.c:3380
+#: ../pidgin/gtkimhtml.c:3494
 msgid "_Save Image..."
 msgstr "_Tallenna kuva nimellä..."
 
-#: ../pidgin/gtkimhtmltoolbar.c:151
+#: ../pidgin/gtkimhtmltoolbar.c:153
 msgid "Select Font"
 msgstr "Valitse kirjasin"
 
-#: ../pidgin/gtkimhtmltoolbar.c:230
+#: ../pidgin/gtkimhtmltoolbar.c:232
 msgid "Select Text Color"
 msgstr "Valitse tekstin väri"
 
-#: ../pidgin/gtkimhtmltoolbar.c:309
+#: ../pidgin/gtkimhtmltoolbar.c:311
 msgid "Select Background Color"
 msgstr "Valitse taustaväri"
 
-#: ../pidgin/gtkimhtmltoolbar.c:398
+#: ../pidgin/gtkimhtmltoolbar.c:400
 msgid "_URL"
 msgstr "_URL"
 
-#: ../pidgin/gtkimhtmltoolbar.c:406
+#: ../pidgin/gtkimhtmltoolbar.c:408
 msgid "_Description"
 msgstr "_Kuvaus"
 
-#: ../pidgin/gtkimhtmltoolbar.c:409
+#: ../pidgin/gtkimhtmltoolbar.c:411
 msgid ""
 "Please enter the URL and description of the link that you want to insert. "
 "The description is optional."
@@ -13684,85 +13756,93 @@
 "Syötä URL, jonka haluat liittää, sekä sen kuvaus. \n"
 "Kuvaus on valinnainen."
 
-#: ../pidgin/gtkimhtmltoolbar.c:413
+#: ../pidgin/gtkimhtmltoolbar.c:415
 msgid "Please enter the URL of the link that you want to insert."
 msgstr "Syötä URL jonka haluat liittää."
 
-#: ../pidgin/gtkimhtmltoolbar.c:418
+#: ../pidgin/gtkimhtmltoolbar.c:420
 msgid "Insert Link"
 msgstr "Lisää linkki"
 
-#: ../pidgin/gtkimhtmltoolbar.c:422
+#: ../pidgin/gtkimhtmltoolbar.c:424 ../pidgin/gtkimhtmltoolbar.c:1155
 msgid "_Insert"
 msgstr "_Lisää"
 
-#: ../pidgin/gtkimhtmltoolbar.c:491
+#: ../pidgin/gtkimhtmltoolbar.c:493
 #, c-format
 msgid "Failed to store image: %s\n"
 msgstr "Kuvan tallennus epäonnistui: %s\n"
 
-#: ../pidgin/gtkimhtmltoolbar.c:517 ../pidgin/gtkimhtmltoolbar.c:527
+#: ../pidgin/gtkimhtmltoolbar.c:519 ../pidgin/gtkimhtmltoolbar.c:529
 msgid "Insert Image"
 msgstr "Liitä kuva"
 
-#: ../pidgin/gtkimhtmltoolbar.c:725
+#: ../pidgin/gtkimhtmltoolbar.c:740
 msgid "This theme has no available smileys."
 msgstr "Tälle teemalle ei ole saatavissa hymiöitä."
 
 #. show everything
-#: ../pidgin/gtkimhtmltoolbar.c:739
+#: ../pidgin/gtkimhtmltoolbar.c:757
 msgid "Smile!"
 msgstr "Hymyile!"
 
-#: ../pidgin/gtkimhtmltoolbar.c:926 ../pidgin/plugins/convcolors.c:287
-msgid "Bold"
-msgstr "Lihavoi"
-
-#: ../pidgin/gtkimhtmltoolbar.c:937 ../pidgin/plugins/convcolors.c:294
-msgid "Italic"
-msgstr "Kursivoi"
-
-#: ../pidgin/gtkimhtmltoolbar.c:948 ../pidgin/plugins/convcolors.c:301
-msgid "Underline"
-msgstr "Alleviivaa"
-
-#: ../pidgin/gtkimhtmltoolbar.c:964
-msgid "Larger font size"
-msgstr "Suurempi kirjasinkoko"
-
-#: ../pidgin/gtkimhtmltoolbar.c:976
-msgid "Smaller font size"
-msgstr "Pienempi kirjasinkoko"
-
-#: ../pidgin/gtkimhtmltoolbar.c:993
-msgid "Font face"
-msgstr "Kirjasintyyppi"
-
-#: ../pidgin/gtkimhtmltoolbar.c:1005
-msgid "Foreground font color"
-msgstr "Kirjasimen etualaväri"
-
-#: ../pidgin/gtkimhtmltoolbar.c:1017
-msgid "Background color"
-msgstr "Taustaväri"
-
-#: ../pidgin/gtkimhtmltoolbar.c:1033
-msgid "Reset formatting"
-msgstr "Poista muotoilu"
-
-#: ../pidgin/gtkimhtmltoolbar.c:1048
-msgid "Insert link"
-msgstr "Lisää linkki"
-
-#: ../pidgin/gtkimhtmltoolbar.c:1058
-msgid "Insert image"
-msgstr "Liitä kuva"
+#: ../pidgin/gtkimhtmltoolbar.c:1064
+msgid "_Bold"
+msgstr "_Lihavoi"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1065
+msgid "_Italic"
+msgstr "_Kursivoi"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1066
+msgid "_Underline"
+msgstr "_Alleviivaa"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1067
+msgid "_Larger"
+msgstr "_Isompi"
 
 #: ../pidgin/gtkimhtmltoolbar.c:1069
-msgid "Insert smiley"
-msgstr "Lisää hymiö"
-
-#: ../pidgin/gtklog.c:267
+msgid "_Normal"
+msgstr "_Normaali"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1071
+msgid "_Smaller"
+msgstr "_Pienempi"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1072
+msgid "_Font face"
+msgstr "Ki_rjasintyyppi"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1073
+msgid "_Foreground color"
+msgstr "Kirjasimen _etualaväri"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1074
+msgid "_Background color"
+msgstr "_Taustaväri"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1100
+msgid "_Font"
+msgstr "Ki_rjasin"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1135
+msgid "_Reset font"
+msgstr "_Poista muotoilu"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1162
+msgid "_Smiley"
+msgstr "_Hymiö"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1168
+msgid "_Image"
+msgstr "Ku_va"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1174
+msgid "_Link"
+msgstr "_Linkki"
+
+#: ../pidgin/gtklog.c:292
 #, c-format
 msgid ""
 "Are you sure you want to permanently delete the log of the conversation with "
@@ -13771,7 +13851,7 @@
 "Haluatko varmasti poistaa käyttäjän %s kanssa käydyn viestilokin joka alkoi %"
 "s?"
 
-#: ../pidgin/gtklog.c:278
+#: ../pidgin/gtklog.c:303
 #, c-format
 msgid ""
 "Are you sure you want to permanently delete the log of the conversation in %"
@@ -13779,29 +13859,29 @@
 msgstr ""
 "Haluatko varmasti poistaa kohteessa %s käydyn viestilokin joka alkoi %s?"
 
-#: ../pidgin/gtklog.c:283
+#: ../pidgin/gtklog.c:308
 #, c-format
 msgid ""
 "Are you sure you want to permanently delete the system log which started at %"
 "s?"
 msgstr "Haluatko varmasti poistaa järjestelmälokin joka alkoi %s?"
 
-#: ../pidgin/gtklog.c:427
+#: ../pidgin/gtklog.c:452
 #, c-format
 msgid "<span size='larger' weight='bold'>Conversation in %s on %s</span>"
 msgstr "<span size='larger' weight='bold'>Keskustelu huoneessa %s: %s</span>"
 
-#: ../pidgin/gtklog.c:430
+#: ../pidgin/gtklog.c:455
 #, c-format
 msgid "<span size='larger' weight='bold'>Conversation with %s on %s</span>"
 msgstr ""
 "<span size='larger' weight='bold'>Keskustelu käyttäjän %s kanssa %s</span>"
 
-#: ../pidgin/gtklog.c:477
+#: ../pidgin/gtklog.c:502
 msgid "%B %Y"
 msgstr "%B %Y"
 
-#: ../pidgin/gtklog.c:524
+#: ../pidgin/gtklog.c:549
 msgid ""
 "System events will only be logged if the \"Log all status changes to system "
 "log\" preference is enabled."
@@ -13809,7 +13889,7 @@
 "Järjestelmätapahtumat kirjataan lokiin vain jos \"Kirjaa kaikki "
 "tilamuutokset järjestelmälokiin\" on asetettu."
 
-#: ../pidgin/gtklog.c:528
+#: ../pidgin/gtklog.c:553
 msgid ""
 "Instant messages will only be logged if the \"Log all instant messages\" "
 "preference is enabled."
@@ -13817,46 +13897,46 @@
 "Pikaviestit kirjataan lokiin vain jos \"Kirjaa kaikki pikaviestit lokiin\" "
 "on asetettu."
 
-#: ../pidgin/gtklog.c:531
+#: ../pidgin/gtklog.c:556
 msgid ""
 "Chats will only be logged if the \"Log all chats\" preference is enabled."
 msgstr ""
 "Ryhmäkeskustelut kirjataan lokiin vain jos \"Kirjaa kaikki ryhmäkeskustelut "
 "lokiin\" on asetettu."
 
-#: ../pidgin/gtklog.c:535
+#: ../pidgin/gtklog.c:560
 msgid "No logs were found"
 msgstr "Lokeja ei löytynyt"
 
 #. Steal the "HELP" response and use it to trigger browsing to the logs folder
-#: ../pidgin/gtklog.c:550
+#: ../pidgin/gtklog.c:575
 msgid "_Browse logs folder"
 msgstr "_Selaa lokikansiota"
 
-#: ../pidgin/gtklog.c:614
+#: ../pidgin/gtklog.c:639
 msgid "Total log size:"
 msgstr "Lokin kokonaiskoko:"
 
-#: ../pidgin/gtklog.c:683
+#: ../pidgin/gtklog.c:708
 #, c-format
 msgid "Conversations in %s"
 msgstr "Keskustelut paikassa %s"
 
-#: ../pidgin/gtklog.c:691 ../pidgin/gtklog.c:753
+#: ../pidgin/gtklog.c:716 ../pidgin/gtklog.c:778
 #, c-format
 msgid "Conversations with %s"
 msgstr "Keskustelut käyttäjän %s kanssa"
 
-#: ../pidgin/gtklog.c:778
+#: ../pidgin/gtklog.c:803
 msgid "System Log"
 msgstr "Järjestelmäloki"
 
-#: ../pidgin/gtkmain.c:373
+#: ../pidgin/gtkmain.c:385
 #, c-format
 msgid "%s %s. Try `%s -h' for more information.\n"
 msgstr "%s %s. Kirjoita \"%s -h\" saadaksesi lisää tietoja.\n"
 
-#: ../pidgin/gtkmain.c:375
+#: ../pidgin/gtkmain.c:387
 #, c-format
 msgid ""
 "%s %s\n"
@@ -13865,6 +13945,7 @@
 "  -c, --config=DIR    use DIR for config files\n"
 "  -d, --debug         print debugging messages to stdout\n"
 "  -h, --help          display this help and exit\n"
+"  -m, --multiple      do not ensure single instance\n"
 "  -n, --nologin       don't automatically login\n"
 "  -l, --login[=NAME]  automatically login (optional argument NAME specifies\n"
 "                      account(s) to use, separated by commas)\n"
@@ -13876,12 +13957,13 @@
 "  -c, --config=HAK    käytä hakemistoa HAK asetustiedostoille\n"
 "  -d, --debug         kirjoita virheenjäljitysviestit putkeen stdout\n"
 "  -h, --help          näytä tämä ohje ja poistu\n"
+"  -m, --multiple      älä pitäydy vain yhdessä instanssissa\n"
 "  -n, --nologin       älä kirjaudu automaattisesti\n"
 "  -l, --login[=NIMI]  kirjaudu automaattisesti (valinnainen NIMI \n"
 "                      määrittelee käytettävät tilit pilkuin eroteltuina)\n"
 "  -v, --version       näytä nykyinen versionumero ja poistu\n"
 
-#: ../pidgin/gtkmain.c:496
+#: ../pidgin/gtkmain.c:511
 #, c-format
 msgid ""
 "%s has segfaulted and attempted to dump a core file.\n"
@@ -13890,7 +13972,7 @@
 "\n"
 "If you can reproduce the crash, please notify the developers\n"
 "by reporting a bug at:\n"
-"%snewticket/\n"
+"%ssimpleticket/\n"
 "\n"
 "Please make sure to specify what you were doing at the time\n"
 "and post the backtrace from the core file.  If you do not know\n"
@@ -13908,7 +13990,7 @@
 "\n"
 "Jos voit toistaa ongelman, ilmoita siitä \n"
 "kehittäjille raportoimalla virheestä osoitteessa:\n"
-"%snewticket/\n"
+"%ssimpleticket/\n"
 "\n"
 "Varmista että kerrot mitä teit vian ilmetessä ja lähetä myös\n"
 "pinolistaus muistivedostiedostosta. Jos et tiedä kuinka\n"
@@ -13920,48 +14002,50 @@
 "ovat osoitteessa\n"
 "%swiki/DeveloperPages\n"
 
-#: ../pidgin/gtknotify.c:337
+#. Translators may want to transliterate the name.
+#. It is not to be translated.
+#: ../pidgin/gtkmain.c:697 ../pidgin/pidgin.h:50
+msgid "Pidgin"
+msgstr "Pidgin"
+
+#: ../pidgin/gtknotify.c:343
 msgid "Open All Messages"
 msgstr "Avaa kaikki viestit"
 
-#: ../pidgin/gtknotify.c:389
+#: ../pidgin/gtknotify.c:395
 msgid "<span weight=\"bold\" size=\"larger\">You have mail!</span>"
 msgstr "<span weight=\"bold\" size=\"larger\">Sinulle on postia!</span>"
 
-#: ../pidgin/gtknotify.c:483
-msgid "Sender"
-msgstr "Lähettäjä"
-
-#: ../pidgin/gtknotify.c:509
+#: ../pidgin/gtknotify.c:515
 #, c-format
 msgid "%s has %d new message."
 msgid_plural "%s has %d new messages."
 msgstr[0] "%s:lla on %d uusi viesti."
 msgstr[1] "%s:lla on %d uutta viestiä."
 
-#: ../pidgin/gtknotify.c:520
+#: ../pidgin/gtknotify.c:526
 #, c-format
 msgid "<b>You have %d new e-mail.</b>"
 msgid_plural "<b>You have %d new e-mails.</b>"
 msgstr[0] "<b>Sinulla on %d uusi sähköposti.</b>"
 msgstr[1] "<b>Sinulla on %d uutta sähköpostia.</b>"
 
-#: ../pidgin/gtknotify.c:951
+#: ../pidgin/gtknotify.c:965
 #, c-format
 msgid "The browser command \"%s\" is invalid."
 msgstr "Selainkomento \"%s\" on virheellinen."
 
-#: ../pidgin/gtknotify.c:953 ../pidgin/gtknotify.c:965
-#: ../pidgin/gtknotify.c:978 ../pidgin/gtknotify.c:1106
+#: ../pidgin/gtknotify.c:967 ../pidgin/gtknotify.c:979
+#: ../pidgin/gtknotify.c:992 ../pidgin/gtknotify.c:1120
 msgid "Unable to open URL"
 msgstr "URL:n avaaminen epäonnistui"
 
-#: ../pidgin/gtknotify.c:963 ../pidgin/gtknotify.c:976
+#: ../pidgin/gtknotify.c:977 ../pidgin/gtknotify.c:990
 #, c-format
 msgid "Error launching \"%s\": %s"
 msgstr "Virhe käynnistettäessä \"%s\": %s"
 
-#: ../pidgin/gtknotify.c:1107
+#: ../pidgin/gtknotify.c:1121
 msgid ""
 "The 'Manual' browser command has been chosen, but no command has been set."
 msgstr "Oma selainkomento -asetus valittu, mutta komentoa ei ole asetettu."
@@ -14008,108 +14092,117 @@
 msgid "<b>Plugin Details</b>"
 msgstr "<b>Liitännäisen yksityiskohdat</b>"
 
-#: ../pidgin/gtkpounce.c:155
+#: ../pidgin/gtkpounce.c:156
 msgid "Select a file"
 msgstr "Valitse tiedosto"
 
 #. Create the "Pounce on Whom" frame.
-#: ../pidgin/gtkpounce.c:524
+#: ../pidgin/gtkpounce.c:533
 msgid "Pounce on Whom"
 msgstr "Kenestä ilmoitetaan"
 
-#: ../pidgin/gtkpounce.c:551
+#: ../pidgin/gtkpounce.c:560
 msgid "_Buddy name:"
 msgstr "_Tuttavan nimi:"
 
-#: ../pidgin/gtkpounce.c:585
+#: ../pidgin/gtkpounce.c:594
 msgid "Si_gns on"
 msgstr "_kirjautuu sisään"
 
-#: ../pidgin/gtkpounce.c:587
+#: ../pidgin/gtkpounce.c:596
 msgid "Signs o_ff"
 msgstr "kirjautuu _ulos"
 
-#: ../pidgin/gtkpounce.c:589
+#: ../pidgin/gtkpounce.c:598
 msgid "Goes a_way"
 msgstr "poi_stuu"
 
-#: ../pidgin/gtkpounce.c:591
+#: ../pidgin/gtkpounce.c:600
 msgid "Ret_urns from away"
 msgstr "_palaa"
 
-#: ../pidgin/gtkpounce.c:593
+#: ../pidgin/gtkpounce.c:602
 msgid "Becomes _idle"
 msgstr "on _jouten"
 
-#: ../pidgin/gtkpounce.c:595
+#: ../pidgin/gtkpounce.c:604
 msgid "Is no longer i_dle"
 msgstr "ei enää ole j_outen"
 
-#: ../pidgin/gtkpounce.c:597
+#: ../pidgin/gtkpounce.c:606
 msgid "Starts _typing"
 msgstr "_alkaa kirjoittaa"
 
-#: ../pidgin/gtkpounce.c:599
+#: ../pidgin/gtkpounce.c:608
 msgid "P_auses while typing"
 msgstr "_keskeyttää kirjoittamisen"
 
-#: ../pidgin/gtkpounce.c:601
+#: ../pidgin/gtkpounce.c:610
 msgid "Stops t_yping"
 msgstr "lope_ttaa kirjoittamisen"
 
-#: ../pidgin/gtkpounce.c:603
+#: ../pidgin/gtkpounce.c:612
 msgid "Sends a _message"
 msgstr "lähettää _viestin"
 
-#: ../pidgin/gtkpounce.c:646
+#: ../pidgin/gtkpounce.c:655
 msgid "Ope_n an IM window"
 msgstr "Avaa pikav_iesti-ikkuna"
 
-#: ../pidgin/gtkpounce.c:648
+#: ../pidgin/gtkpounce.c:657
 msgid "_Pop up a notification"
 msgstr "_Ponnahdusilmoitus"
 
-#: ../pidgin/gtkpounce.c:650
+#: ../pidgin/gtkpounce.c:659
 msgid "Send a _message"
 msgstr "Lähetä _viesti"
 
-#: ../pidgin/gtkpounce.c:652
-msgid "E_xecute a command"
-msgstr "Suorita _komento"
-
-#: ../pidgin/gtkpounce.c:654
-msgid "P_lay a sound"
-msgstr "S_oita ääni"
-
-#: ../pidgin/gtkpounce.c:659
-msgid "Brows_e..."
-msgstr "_Selaa"
-
 #: ../pidgin/gtkpounce.c:661
+msgid "E_xecute a command"
+msgstr "Suorita _komento"
+
+#: ../pidgin/gtkpounce.c:663
+msgid "P_lay a sound"
+msgstr "S_oita ääni"
+
+#: ../pidgin/gtkpounce.c:669
+msgid "Brows_e..."
+msgstr "_Selaa"
+
+#: ../pidgin/gtkpounce.c:671
 msgid "Br_owse..."
 msgstr "S_elaa"
 
-#: ../pidgin/gtkpounce.c:662
+#: ../pidgin/gtkpounce.c:672
 msgid "Pre_view"
 msgstr "_Esikatselu"
 
-#: ../pidgin/gtkpounce.c:786
+#: ../pidgin/gtkpounce.c:799
 msgid "P_ounce only when my status is not Available"
 msgstr "I_lmoita vain kun tilani on \"tavoittamattomissa\""
 
-#: ../pidgin/gtkpounce.c:791
+#: ../pidgin/gtkpounce.c:804
 msgid "_Recurring"
 msgstr "_Toistuva"
 
-#: ../pidgin/gtkpounce.c:1247
+#: ../pidgin/gtkpounce.c:1260
 msgid "Pounce Target"
 msgstr "Ilmoituksen kohde"
 
-#: ../pidgin/gtkprefs.c:509
+#: ../pidgin/gtkprefs.c:385
+#: ../pidgin/pixmaps/emotes/default/22/default.theme.in.h:1
+msgid "Default"
+msgstr "Oletus"
+
+#: ../pidgin/gtkprefs.c:516
 msgid "Smiley theme failed to unpack."
 msgstr "Hymiöteeman purkaminen epäonnistui."
 
-#: ../pidgin/gtkprefs.c:638
+#: ../pidgin/gtkprefs.c:643
+msgid "Install Theme"
+msgstr "Asenna teema"
+
+#: ../pidgin/gtkprefs.c:696
 msgid ""
 "Select a smiley theme that you would like to use from the list below. New "
 "themes can be installed by dragging and dropping them onto the theme list."
@@ -14117,255 +14210,259 @@
 "Valitse haluamasi hymiöteema alla olevasta listasta. Uudet teemat voi "
 "asentaa vedä&pudota-menetelmällä pudottamalla ne teemalistaan."
 
-#: ../pidgin/gtkprefs.c:673
+#: ../pidgin/gtkprefs.c:731
 msgid "Icon"
 msgstr "Kuvake"
 
-#: ../pidgin/gtkprefs.c:816
+#: ../pidgin/gtkprefs.c:893
 msgid "System Tray Icon"
 msgstr "Tarjotinkuvake"
 
-#: ../pidgin/gtkprefs.c:817
+#: ../pidgin/gtkprefs.c:894
 msgid "_Show system tray icon:"
 msgstr "_Näytä tarjotinkuvake:"
 
-#: ../pidgin/gtkprefs.c:819 ../pidgin/gtkprefs.c:831 ../pidgin/gtkprefs.c:1686
+#: ../pidgin/gtkprefs.c:896 ../pidgin/gtkprefs.c:908 ../pidgin/gtkprefs.c:1756
 #: ../pidgin/plugins/timestamp_format.c:42
 #: ../pidgin/plugins/timestamp_format.c:51
 #: ../pidgin/plugins/win32/winprefs/winprefs.c:338
 msgid "Always"
 msgstr "Aina"
 
-#: ../pidgin/gtkprefs.c:821
+#: ../pidgin/gtkprefs.c:898
 msgid "On unread messages"
 msgstr "Kun lukemattomia viestejä"
 
-#: ../pidgin/gtkprefs.c:826
+#: ../pidgin/gtkprefs.c:903
 msgid "Conversation Window Hiding"
 msgstr "Keskusteluikkunan piilottaminen"
 
-#: ../pidgin/gtkprefs.c:827
+#: ../pidgin/gtkprefs.c:904
 msgid "_Hide new IM conversations:"
 msgstr "_Piilota uudet pikaviestikeskustelut:"
 
-#: ../pidgin/gtkprefs.c:830 ../pidgin/gtkprefs.c:1867
+#: ../pidgin/gtkprefs.c:907 ../pidgin/gtkprefs.c:1937
 msgid "When away"
 msgstr "Poissaollessa"
 
 #. All the tab options!
-#: ../pidgin/gtkprefs.c:838
+#: ../pidgin/gtkprefs.c:915
 msgid "Tabs"
 msgstr "Välilehdet"
 
-#: ../pidgin/gtkprefs.c:840
+#: ../pidgin/gtkprefs.c:917
 msgid "Show IMs and chats in _tabbed windows"
 msgstr "Näytä pikaviestit ja ryhmäkeskustelut _jaetuissa ikkunoissa"
 
-#: ../pidgin/gtkprefs.c:854
+#: ../pidgin/gtkprefs.c:931
 msgid "Show close b_utton on tabs"
 msgstr "Näytä _sulkemispainikkeet välilehdissä"
 
-#: ../pidgin/gtkprefs.c:857
+#: ../pidgin/gtkprefs.c:934
 msgid "_Placement:"
 msgstr "_Asettelu:"
 
-#: ../pidgin/gtkprefs.c:859
+#: ../pidgin/gtkprefs.c:936
 msgid "Top"
 msgstr "Ylhäällä"
 
-#: ../pidgin/gtkprefs.c:860
+#: ../pidgin/gtkprefs.c:937
 msgid "Bottom"
 msgstr "Alhaalla"
 
-#: ../pidgin/gtkprefs.c:861
+#: ../pidgin/gtkprefs.c:938
 msgid "Left"
 msgstr "Vasemmalla"
 
-#: ../pidgin/gtkprefs.c:862
+#: ../pidgin/gtkprefs.c:939
 msgid "Right"
 msgstr "Oikealla"
 
-#: ../pidgin/gtkprefs.c:864
+#: ../pidgin/gtkprefs.c:941
 msgid "Left Vertical"
 msgstr "Vasemmalla pystysuuntaisesti"
 
-#: ../pidgin/gtkprefs.c:865
+#: ../pidgin/gtkprefs.c:942
 msgid "Right Vertical"
 msgstr "Oikealla pystysuuntaisesti"
 
-#: ../pidgin/gtkprefs.c:872
+#: ../pidgin/gtkprefs.c:949
 msgid "N_ew conversations:"
 msgstr "_Uudet keskustelut:"
 
-#: ../pidgin/gtkprefs.c:917
+#: ../pidgin/gtkprefs.c:994
 msgid "Show _formatting on incoming messages"
 msgstr "Näytä _muotoilu tulevissa viesteissä"
 
-#: ../pidgin/gtkprefs.c:920
+#: ../pidgin/gtkprefs.c:997
 msgid "Show buddy _icons"
 msgstr "Näytä tuttavien _kuvakkeet"
 
-#: ../pidgin/gtkprefs.c:922
+#: ../pidgin/gtkprefs.c:999
 msgid "Enable buddy ic_on animation"
 msgstr "Näytä tuttavakuvakkeen a_nimaatio"
 
-#: ../pidgin/gtkprefs.c:929
+#: ../pidgin/gtkprefs.c:1006
 msgid "_Notify buddies that you are typing to them"
 msgstr "Ilmoita tuttaville kun _kirjoitat heille"
 
-#: ../pidgin/gtkprefs.c:932
+#: ../pidgin/gtkprefs.c:1009
 msgid "Highlight _misspelled words"
 msgstr "Korosta _väärinkirjoitetut sanat"
 
-#: ../pidgin/gtkprefs.c:936
+#: ../pidgin/gtkprefs.c:1013
 msgid "Use smooth-scrolling"
 msgstr "Käytä portaatonta tekstinvieritystä"
 
-#: ../pidgin/gtkprefs.c:939
+#: ../pidgin/gtkprefs.c:1016
 msgid "F_lash window when IMs are received"
 msgstr "_Vilkuta ikkunaa pikaviestien saapuessa"
 
-#: ../pidgin/gtkprefs.c:943
+#: ../pidgin/gtkprefs.c:1018
+msgid "Minimi_ze new conversation windows"
+msgstr "Piene_nnä uudet keskusteluikkunat"
+
+#: ../pidgin/gtkprefs.c:1022
 msgid "Font"
 msgstr "Kirjasin"
 
-#: ../pidgin/gtkprefs.c:945
+#: ../pidgin/gtkprefs.c:1024
 msgid "Use document font from _theme"
 msgstr "Käytä asiakirjojen kirjasinta _teemasta"
 
-#: ../pidgin/gtkprefs.c:947
+#: ../pidgin/gtkprefs.c:1026
 msgid "Use font from _theme"
 msgstr "Käytä kirjasinta _teemasta"
 
-#: ../pidgin/gtkprefs.c:949
+#: ../pidgin/gtkprefs.c:1028
 msgid "Conversation _font:"
 msgstr "Keskustelujen _kirjasin:"
 
-#: ../pidgin/gtkprefs.c:962
+#: ../pidgin/gtkprefs.c:1041
 msgid "Default Formatting"
 msgstr "Oletusmuotoilu"
 
-#: ../pidgin/gtkprefs.c:978
+#: ../pidgin/gtkprefs.c:1057
 msgid ""
 "This is how your outgoing message text will appear when you use protocols "
-"that support formatting. :)"
+"that support formatting."
 msgstr ""
 "Tältä ulosmenevä viesti näyttää kun käytät yhteyskäytäntöä joka tukee "
-"muotoiluja. :)"
-
-#: ../pidgin/gtkprefs.c:1054
+"muotoiluja."
+
+#: ../pidgin/gtkprefs.c:1123
 msgid "ST_UN server:"
 msgstr "ST_UN-palvelin:"
 
-#: ../pidgin/gtkprefs.c:1066
+#: ../pidgin/gtkprefs.c:1135
 msgid "<span style=\"italic\">Example: stunserver.org</span>"
 msgstr "<span style=\"italic\">Esimerkki: stunserver.org</span>"
 
-#: ../pidgin/gtkprefs.c:1070
+#: ../pidgin/gtkprefs.c:1139
 msgid "_Autodetect IP address"
 msgstr "_Hae IP-osoite automaattisesti"
 
-#: ../pidgin/gtkprefs.c:1079
+#: ../pidgin/gtkprefs.c:1148
 msgid "Public _IP:"
 msgstr "Julkinen _IP:"
 
-#: ../pidgin/gtkprefs.c:1108
+#: ../pidgin/gtkprefs.c:1177
 msgid "Ports"
 msgstr "Portit"
 
-#: ../pidgin/gtkprefs.c:1111
+#: ../pidgin/gtkprefs.c:1180
 msgid "_Manually specify range of ports to listen on"
 msgstr "_Aseta kuunneltava porttialue"
 
-#: ../pidgin/gtkprefs.c:1114
+#: ../pidgin/gtkprefs.c:1183
 msgid "_Start port:"
 msgstr "_Ensimmäinen portti:"
 
-#: ../pidgin/gtkprefs.c:1121
+#: ../pidgin/gtkprefs.c:1190
 msgid "_End port:"
 msgstr "Viimeinen _portti:"
 
-#: ../pidgin/gtkprefs.c:1129
+#: ../pidgin/gtkprefs.c:1198
 msgid "Proxy Server"
 msgstr "Välipalvelin"
 
-#: ../pidgin/gtkprefs.c:1133
+#: ../pidgin/gtkprefs.c:1202
 msgid "No proxy"
 msgstr "Ei välipalvelinta"
 
-#: ../pidgin/gtkprefs.c:1189
+#: ../pidgin/gtkprefs.c:1258
 msgid "_User:"
 msgstr "_Käyttäjä:"
 
-#: ../pidgin/gtkprefs.c:1253
+#: ../pidgin/gtkprefs.c:1323
 msgid "Seamonkey"
 msgstr "Seamonkey"
 
-#: ../pidgin/gtkprefs.c:1254
+#: ../pidgin/gtkprefs.c:1324
 msgid "Opera"
 msgstr "Opera"
 
-#: ../pidgin/gtkprefs.c:1255
+#: ../pidgin/gtkprefs.c:1325
 msgid "Netscape"
 msgstr "Netscape"
 
-#: ../pidgin/gtkprefs.c:1256
+#: ../pidgin/gtkprefs.c:1326
 msgid "Mozilla"
 msgstr "Mozilla"
 
-#: ../pidgin/gtkprefs.c:1257
+#: ../pidgin/gtkprefs.c:1327
 msgid "Konqueror"
 msgstr "Konqueror"
 
-#: ../pidgin/gtkprefs.c:1258
+#: ../pidgin/gtkprefs.c:1328
 msgid "GNOME Default"
 msgstr "Gnomen oletus"
 
-#: ../pidgin/gtkprefs.c:1259
+#: ../pidgin/gtkprefs.c:1329
 msgid "Galeon"
 msgstr "Galeon"
 
-#: ../pidgin/gtkprefs.c:1260
+#: ../pidgin/gtkprefs.c:1330
 msgid "Firefox"
 msgstr "Firefox"
 
-#: ../pidgin/gtkprefs.c:1261
+#: ../pidgin/gtkprefs.c:1331
 msgid "Firebird"
 msgstr "Firebird"
 
-#: ../pidgin/gtkprefs.c:1262
+#: ../pidgin/gtkprefs.c:1332
 msgid "Epiphany"
 msgstr "Epiphany"
 
-#: ../pidgin/gtkprefs.c:1271
+#: ../pidgin/gtkprefs.c:1341
 msgid "Manual"
 msgstr "Oma komento"
 
-#: ../pidgin/gtkprefs.c:1324
+#: ../pidgin/gtkprefs.c:1394
 msgid "Browser Selection"
 msgstr "Selaimen valinta"
 
-#: ../pidgin/gtkprefs.c:1328
+#: ../pidgin/gtkprefs.c:1398
 msgid "_Browser:"
 msgstr "_Selain:"
 
-#: ../pidgin/gtkprefs.c:1336
+#: ../pidgin/gtkprefs.c:1406
 msgid "_Open link in:"
 msgstr "_Avaa linkki:"
 
-#: ../pidgin/gtkprefs.c:1338
+#: ../pidgin/gtkprefs.c:1408
 msgid "Browser default"
 msgstr "Selaimen oletus"
 
-#: ../pidgin/gtkprefs.c:1339
+#: ../pidgin/gtkprefs.c:1409
 msgid "Existing window"
 msgstr "Olemassaolevaan ikkunaan"
 
-#: ../pidgin/gtkprefs.c:1341
+#: ../pidgin/gtkprefs.c:1411
 msgid "New tab"
 msgstr "Uuteen välilehteen"
 
-#: ../pidgin/gtkprefs.c:1355
+#: ../pidgin/gtkprefs.c:1425
 #, c-format
 msgid ""
 "_Manual:\n"
@@ -14374,80 +14471,80 @@
 "_Komento:\n"
 "(URL:ksi %s)"
 
-#: ../pidgin/gtkprefs.c:1395
+#: ../pidgin/gtkprefs.c:1465
 msgid "Log _format:"
 msgstr "Lokin _muoto:"
 
-#: ../pidgin/gtkprefs.c:1400
+#: ../pidgin/gtkprefs.c:1470
 msgid "Log all _instant messages"
 msgstr "Kirjaa kaikki pikaviestit _lokiin"
 
-#: ../pidgin/gtkprefs.c:1402
+#: ../pidgin/gtkprefs.c:1472
 msgid "Log all c_hats"
 msgstr "Kirjaa kaikki ryhmä_keskustelut lokiin"
 
-#: ../pidgin/gtkprefs.c:1404
+#: ../pidgin/gtkprefs.c:1474
 msgid "Log all _status changes to system log"
 msgstr "Kirjaa kaikki _tilamuutokset järjestelmälokiin"
 
-#: ../pidgin/gtkprefs.c:1512 ../pidgin/gtkprefs.c:1601
-#: ../pidgin/gtkprefs.c:1795
+#: ../pidgin/gtkprefs.c:1582 ../pidgin/gtkprefs.c:1671
+#: ../pidgin/gtkprefs.c:1865
 msgid "(default)"
 msgstr "(oletus)"
 
-#: ../pidgin/gtkprefs.c:1550
+#: ../pidgin/gtkprefs.c:1620
 msgid "Sound Selection"
 msgstr "Äänivalinta"
 
-#: ../pidgin/gtkprefs.c:1560
+#: ../pidgin/gtkprefs.c:1630
 msgid "Quietest"
 msgstr "Hiljaisin"
 
-#: ../pidgin/gtkprefs.c:1562
+#: ../pidgin/gtkprefs.c:1632
 msgid "Quieter"
 msgstr "Hiljaisempi"
 
-#: ../pidgin/gtkprefs.c:1564
+#: ../pidgin/gtkprefs.c:1634
 msgid "Quiet"
 msgstr "Hiljainen"
 
-#: ../pidgin/gtkprefs.c:1568
+#: ../pidgin/gtkprefs.c:1638
 msgid "Loud"
 msgstr "Äänekäs"
 
-#: ../pidgin/gtkprefs.c:1570
+#: ../pidgin/gtkprefs.c:1640
 msgid "Louder"
 msgstr "Äänekkäämpi"
 
-#: ../pidgin/gtkprefs.c:1572
+#: ../pidgin/gtkprefs.c:1642
 msgid "Loudest"
 msgstr "Äänekkäin"
 
-#: ../pidgin/gtkprefs.c:1635
+#: ../pidgin/gtkprefs.c:1705
 msgid "Sound Method"
 msgstr "Äänimenetelmä"
 
-#: ../pidgin/gtkprefs.c:1636
+#: ../pidgin/gtkprefs.c:1706
 msgid "_Method:"
 msgstr "_Menetelmä:"
 
-#: ../pidgin/gtkprefs.c:1638
+#: ../pidgin/gtkprefs.c:1708
 msgid "Console beep"
 msgstr "Konsoliäänimerkki"
 
-#: ../pidgin/gtkprefs.c:1640
+#: ../pidgin/gtkprefs.c:1710
 msgid "Automatic"
 msgstr "Automaattinen"
 
-#: ../pidgin/gtkprefs.c:1644
+#: ../pidgin/gtkprefs.c:1714
 msgid "Command"
 msgstr "Komento"
 
-#: ../pidgin/gtkprefs.c:1645
+#: ../pidgin/gtkprefs.c:1715
 msgid "No sounds"
 msgstr "Ei ääniä"
 
-#: ../pidgin/gtkprefs.c:1653
+#: ../pidgin/gtkprefs.c:1723
 #, c-format
 msgid ""
 "Sound c_ommand:\n"
@@ -14456,117 +14553,117 @@
 "Äänik_omento:\n"
 "(%s tiedostonimeksi)"
 
-#: ../pidgin/gtkprefs.c:1679
+#: ../pidgin/gtkprefs.c:1749
 msgid "Sound Options"
 msgstr "Äänivalinnat"
 
-#: ../pidgin/gtkprefs.c:1680
+#: ../pidgin/gtkprefs.c:1750
 msgid "Sounds when conversation has _focus"
 msgstr "Äänet kun keskusteluikkuna on _aktiivinen"
 
-#: ../pidgin/gtkprefs.c:1682
+#: ../pidgin/gtkprefs.c:1752
 msgid "Enable sounds:"
 msgstr "Ota äänet käyttöön:"
 
-#: ../pidgin/gtkprefs.c:1684
+#: ../pidgin/gtkprefs.c:1754
 msgid "Only when available"
 msgstr "Kun tavoitettavissa"
 
-#: ../pidgin/gtkprefs.c:1685
+#: ../pidgin/gtkprefs.c:1755
 msgid "Only when not available"
 msgstr "Kun tavoittamattomissa"
 
-#: ../pidgin/gtkprefs.c:1693
+#: ../pidgin/gtkprefs.c:1763
 msgid "Volume:"
 msgstr "Äänenvoimakkuus:"
 
-#: ../pidgin/gtkprefs.c:1721
+#: ../pidgin/gtkprefs.c:1791
 msgid "Sound Events"
 msgstr "Äänitapahtumat"
 
-#: ../pidgin/gtkprefs.c:1773
+#: ../pidgin/gtkprefs.c:1843
 msgid "Play"
 msgstr "Soita"
 
-#: ../pidgin/gtkprefs.c:1780
+#: ../pidgin/gtkprefs.c:1850
 msgid "Event"
 msgstr "Tapahtuma"
 
-#: ../pidgin/gtkprefs.c:1799
+#: ../pidgin/gtkprefs.c:1869
 msgid "Test"
 msgstr "Kokeile"
 
-#: ../pidgin/gtkprefs.c:1803
+#: ../pidgin/gtkprefs.c:1873
 msgid "Reset"
 msgstr "Nollaa"
 
-#: ../pidgin/gtkprefs.c:1807
+#: ../pidgin/gtkprefs.c:1877
 msgid "Choose..."
 msgstr "Valitse..."
 
-#: ../pidgin/gtkprefs.c:1850
+#: ../pidgin/gtkprefs.c:1920
 msgid "_Report idle time:"
 msgstr "_Ilmoita joutenoloaika:"
 
-#: ../pidgin/gtkprefs.c:1855
+#: ../pidgin/gtkprefs.c:1925
 msgid "Based on keyboard or mouse use"
 msgstr "Perustuen näppäimistön tai hiiren käyttöön"
 
-#: ../pidgin/gtkprefs.c:1864
+#: ../pidgin/gtkprefs.c:1934
 msgid "_Auto-reply:"
 msgstr "_Automaattivastaus:"
 
-#: ../pidgin/gtkprefs.c:1868
+#: ../pidgin/gtkprefs.c:1938
 msgid "When both away and idle"
 msgstr "Poissa ja jouten ollessa"
 
 #. Auto-away stuff
-#: ../pidgin/gtkprefs.c:1874
+#: ../pidgin/gtkprefs.c:1944
 msgid "Auto-away"
 msgstr "Automaattinen poissaoloasetus"
 
-#: ../pidgin/gtkprefs.c:1876
+#: ../pidgin/gtkprefs.c:1946
 msgid "Change status when _idle"
 msgstr "Vaihda tila, kun ollaan _jouten"
 
-#: ../pidgin/gtkprefs.c:1880
+#: ../pidgin/gtkprefs.c:1950
 msgid "_Minutes before changing status:"
 msgstr "_Minuutteja ennen tilan asetusta:"
 
-#: ../pidgin/gtkprefs.c:1888
+#: ../pidgin/gtkprefs.c:1958
 msgid "Change _status to:"
 msgstr "Vaihda tila seuraavaksi:"
 
 #. Signon status stuff
-#: ../pidgin/gtkprefs.c:1909
+#: ../pidgin/gtkprefs.c:1979
 msgid "Status at Startup"
 msgstr "Tila käynnistettäessä"
 
-#: ../pidgin/gtkprefs.c:1911
+#: ../pidgin/gtkprefs.c:1981
 msgid "Use status from last _exit at startup"
 msgstr "Käytä viimeksi poistuttaessa ollutta tilaa"
 
-#: ../pidgin/gtkprefs.c:1917
+#: ../pidgin/gtkprefs.c:1987
 msgid "Status to a_pply at startup:"
 msgstr "Tila jota _käytetään käynnistettäessä:"
 
-#: ../pidgin/gtkprefs.c:1955
+#: ../pidgin/gtkprefs.c:2025
 msgid "Interface"
 msgstr "Käyttöliittymä"
 
-#: ../pidgin/gtkprefs.c:1957
+#: ../pidgin/gtkprefs.c:2027
 msgid "Smiley Themes"
 msgstr "Hymiöteemat"
 
-#: ../pidgin/gtkprefs.c:1958
+#: ../pidgin/gtkprefs.c:2028
 msgid "Sounds"
 msgstr "Äänet"
 
-#: ../pidgin/gtkprefs.c:1964
+#: ../pidgin/gtkprefs.c:2034
 msgid "Browser"
 msgstr "Selain"
 
-#: ../pidgin/gtkprefs.c:1968
+#: ../pidgin/gtkprefs.c:2038
 msgid "Status / Idle"
 msgstr "Tila / jouten"
 
@@ -14590,63 +14687,63 @@
 msgid "Block only the users below"
 msgstr "Estä vain allaolevat käyttäjät"
 
-#: ../pidgin/gtkprivacy.c:372
+#: ../pidgin/gtkprivacy.c:369
 msgid "Privacy"
 msgstr "Yksityisyys"
 
-#: ../pidgin/gtkprivacy.c:385
+#: ../pidgin/gtkprivacy.c:381
 msgid "Changes to privacy settings take effect immediately."
 msgstr "Muutokset yksityisyysasetuksiin tulevat voimaan heti."
 
 #. "Set privacy for:" label
-#: ../pidgin/gtkprivacy.c:397
+#: ../pidgin/gtkprivacy.c:393
 msgid "Set privacy for:"
 msgstr "Yksityisyysasetukset tilille:"
 
-#: ../pidgin/gtkprivacy.c:560 ../pidgin/gtkprivacy.c:577
+#: ../pidgin/gtkprivacy.c:556 ../pidgin/gtkprivacy.c:573
 msgid "Permit User"
 msgstr "Salli käyttäjä"
 
-#: ../pidgin/gtkprivacy.c:561
+#: ../pidgin/gtkprivacy.c:557
 msgid "Type a user you permit to contact you."
 msgstr "Kirjoita tuttavan nimi jonka valtuutat ottamaan yhteyttä sinuun."
 
-#: ../pidgin/gtkprivacy.c:562
+#: ../pidgin/gtkprivacy.c:558
 msgid "Please enter the name of the user you wish to be able to contact you."
 msgstr "Syötä käyttäjän nimi, jonka tahdot voivan ottaa sinuun yhteyttä."
 
-#: ../pidgin/gtkprivacy.c:565 ../pidgin/gtkprivacy.c:581
+#: ../pidgin/gtkprivacy.c:561 ../pidgin/gtkprivacy.c:577
 msgid "_Permit"
 msgstr "_Salli"
 
-#: ../pidgin/gtkprivacy.c:571
+#: ../pidgin/gtkprivacy.c:567
 #, c-format
 msgid "Allow %s to contact you?"
 msgstr "Sallitaanko %s:n yhteydenotot?"
 
-#: ../pidgin/gtkprivacy.c:573
+#: ../pidgin/gtkprivacy.c:569
 #, c-format
 msgid "Are you sure you wish to allow %s to contact you?"
 msgstr "Sallitaanko varmasti %s:n yhteydenotot?"
 
-#: ../pidgin/gtkprivacy.c:602 ../pidgin/gtkprivacy.c:616
+#: ../pidgin/gtkprivacy.c:598 ../pidgin/gtkprivacy.c:612
 msgid "Block User"
 msgstr "Estä käyttäjää"
 
-#: ../pidgin/gtkprivacy.c:603
+#: ../pidgin/gtkprivacy.c:599
 msgid "Type a user to block."
 msgstr "Kirjoita estettävä käyttäjä."
 
-#: ../pidgin/gtkprivacy.c:604
+#: ../pidgin/gtkprivacy.c:600
 msgid "Please enter the name of the user you wish to block."
 msgstr "Kirjoita käyttäjän nimi jonka tahdot estää ottamasta yhteyttä."
 
-#: ../pidgin/gtkprivacy.c:612
+#: ../pidgin/gtkprivacy.c:608
 #, c-format
 msgid "Block %s?"
 msgstr "Estetäänkö %s?"
 
-#: ../pidgin/gtkprivacy.c:614
+#: ../pidgin/gtkprivacy.c:610
 #, c-format
 msgid "Are you sure you want to block %s?"
 msgstr "Haluatko varmasti estää %s?"
@@ -14655,76 +14752,77 @@
 msgid "Apply"
 msgstr "Toteuta"
 
-#: ../pidgin/gtkrequest.c:1482
+#: ../pidgin/gtkrequest.c:1478
 msgid "That file already exists"
 msgstr "Tiedosto on jo olemassa"
 
-#: ../pidgin/gtkrequest.c:1483
+#: ../pidgin/gtkrequest.c:1479
 msgid "Would you like to overwrite it?"
 msgstr "Haluatko korvata sen?"
 
-#: ../pidgin/gtkrequest.c:1486
+#: ../pidgin/gtkrequest.c:1482
 msgid "Overwrite"
 msgstr "Korvaa"
 
-#: ../pidgin/gtkrequest.c:1487
+#: ../pidgin/gtkrequest.c:1483
 msgid "Choose New Name"
 msgstr "Valitse uusi nimi"
 
-#: ../pidgin/gtkrequest.c:1625 ../pidgin/gtkrequest.c:1639
+#: ../pidgin/gtkrequest.c:1621 ../pidgin/gtkrequest.c:1635
 msgid "Select Folder..."
 msgstr "Valitse kansio..."
 
-#: ../pidgin/gtkroomlist.c:376
+#. Create the window.
+#: ../pidgin/gtkroomlist.c:374
 msgid "Room List"
 msgstr "Huonelista"
 
 #. list button
-#: ../pidgin/gtkroomlist.c:446
+#: ../pidgin/gtkroomlist.c:442
 msgid "_Get List"
 msgstr "_Hae lista"
 
 #. add button
-#: ../pidgin/gtkroomlist.c:454
+#: ../pidgin/gtkroomlist.c:450
 msgid "_Add Chat"
 msgstr "_Lisää ryhmäkeskustelu"
 
-#: ../pidgin/gtksavedstatuses.c:331
+#: ../pidgin/gtksavedstatuses.c:336
 msgid "Are you sure you want to delete the selected saved statuses?"
 msgstr "Haluatko varmasti poistaa valitut tallenetut tilat?"
 
 #. Use button
-#: ../pidgin/gtksavedstatuses.c:580 ../pidgin/gtksavedstatuses.c:1213
+#: ../pidgin/gtksavedstatuses.c:619 ../pidgin/gtksavedstatuses.c:1265
 msgid "_Use"
 msgstr "_Käytä"
 
-#: ../pidgin/gtksavedstatuses.c:726
+#: ../pidgin/gtksavedstatuses.c:779
 msgid "Title already in use.  You must choose a unique title."
 msgstr "Otsikko on käytössä. Sinun täytyy valita yksilöllinen otsikko."
 
-#: ../pidgin/gtksavedstatuses.c:914
+#: ../pidgin/gtksavedstatuses.c:969
 msgid "Different"
 msgstr "Eriävyys"
 
-#: ../pidgin/gtksavedstatuses.c:1106
+#: ../pidgin/gtksavedstatuses.c:1158
 msgid "_Title:"
 msgstr "_Otsikko"
 
-#: ../pidgin/gtksavedstatuses.c:1125 ../pidgin/gtksavedstatuses.c:1446
+#: ../pidgin/gtksavedstatuses.c:1177 ../pidgin/gtksavedstatuses.c:1494
 msgid "_Status:"
 msgstr "_Tila:"
 
 #. Different status message expander
-#: ../pidgin/gtksavedstatuses.c:1157
+#: ../pidgin/gtksavedstatuses.c:1209
 msgid "Use a _different status for some accounts"
 msgstr "Käytä eri tilaa joillekin käyttäjätileille"
 
 #. Save & Use button
-#: ../pidgin/gtksavedstatuses.c:1221
+#: ../pidgin/gtksavedstatuses.c:1273
 msgid "Sa_ve & Use"
 msgstr "Tallenna ja _käytä"
 
-#: ../pidgin/gtksavedstatuses.c:1427
+#: ../pidgin/gtksavedstatuses.c:1477
 #, c-format
 msgid "Status for %s"
 msgstr "%s:n tila"
@@ -14777,29 +14875,29 @@
 msgid "GStreamer failed to initialize."
 msgstr "GStreameria ei voitu alustaa."
 
-#: ../pidgin/gtkstatusbox.c:661
+#: ../pidgin/gtkstatusbox.c:663
 msgid "Waiting for network connection"
 msgstr "Odotetaan verkkoyhteyttä"
 
-#: ../pidgin/gtkutils.c:593
+#: ../pidgin/gtkutils.c:627
 msgid "Google Talk"
 msgstr "Google Talk"
 
-#: ../pidgin/gtkutils.c:1309 ../pidgin/gtkutils.c:1332
+#: ../pidgin/gtkutils.c:1384 ../pidgin/gtkutils.c:1407
 #, c-format
 msgid "The following error has occurred loading %s: %s"
 msgstr "Seuraava virhe esiintyi ladattaessa komponenttia %s: %s"
 
-#: ../pidgin/gtkutils.c:1312 ../pidgin/gtkutils.c:1334
+#: ../pidgin/gtkutils.c:1387 ../pidgin/gtkutils.c:1409
 msgid "Failed to load image"
 msgstr "Kuvan avaus epäonnistui"
 
-#: ../pidgin/gtkutils.c:1408
+#: ../pidgin/gtkutils.c:1483
 #, c-format
 msgid "Cannot send folder %s."
 msgstr "Ei voida lähettää kansiota %s."
 
-#: ../pidgin/gtkutils.c:1409
+#: ../pidgin/gtkutils.c:1484
 #, c-format
 msgid ""
 "%s cannot transfer a folder. You will need to send the files within "
@@ -14808,12 +14906,12 @@
 "%s ei voi siirtää kansiota. Kansion sisältämät tiedostot täytyy lähettää "
 "erikseen."
 
-#: ../pidgin/gtkutils.c:1441 ../pidgin/gtkutils.c:1453
-#: ../pidgin/gtkutils.c:1460
+#: ../pidgin/gtkutils.c:1516 ../pidgin/gtkutils.c:1528
+#: ../pidgin/gtkutils.c:1535
 msgid "You have dragged an image"
 msgstr "Olet raahannut kuvan"
 
-#: ../pidgin/gtkutils.c:1442
+#: ../pidgin/gtkutils.c:1517
 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."
@@ -14821,23 +14919,23 @@
 "Voit lähettää tämän kuvan tiedostonsiirtona, sisällyttää sen tähän viestiin "
 "tai käyttää sitä tuttavakuvakkeena tälle käyttäjälle."
 
-#: ../pidgin/gtkutils.c:1448 ../pidgin/gtkutils.c:1468
+#: ../pidgin/gtkutils.c:1523 ../pidgin/gtkutils.c:1543
 msgid "Set as buddy icon"
 msgstr "Aseta tuttavakuvakkeeksi"
 
-#: ../pidgin/gtkutils.c:1449 ../pidgin/gtkutils.c:1469
+#: ../pidgin/gtkutils.c:1524 ../pidgin/gtkutils.c:1544
 msgid "Send image file"
 msgstr "Lähetä kuvatiedosto"
 
-#: ../pidgin/gtkutils.c:1450 ../pidgin/gtkutils.c:1469
+#: ../pidgin/gtkutils.c:1525 ../pidgin/gtkutils.c:1544
 msgid "Insert in message"
 msgstr "Liitä viestiin"
 
-#: ../pidgin/gtkutils.c:1454
+#: ../pidgin/gtkutils.c:1529
 msgid "Would you like to set it as the buddy icon for this user?"
 msgstr "Haluatko asettaa sen tuttavakuvakkeeksi tälle käyttäjälle?"
 
-#: ../pidgin/gtkutils.c:1461
+#: ../pidgin/gtkutils.c:1536
 msgid ""
 "You can send this image as a file transfer, or use it as the buddy icon for "
 "this user."
@@ -14845,7 +14943,7 @@
 "Voit lähettää tämän kuvan tiedostonsiirtona tai käyttää sitä "
 "tuttavakuvakkeena tälle käyttäjälle."
 
-#: ../pidgin/gtkutils.c:1462
+#: ../pidgin/gtkutils.c:1537
 msgid ""
 "You can insert this image into this message, or use it as the buddy icon for "
 "this user"
@@ -14858,11 +14956,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:1520
+#: ../pidgin/gtkutils.c:1595
 msgid "Cannot send launcher"
 msgstr "Ei voida lähettää käynnistintä"
 
-#: ../pidgin/gtkutils.c:1520
+#: ../pidgin/gtkutils.c:1595
 msgid ""
 "You dragged a desktop launcher. Most likely you wanted to send whatever this "
 "launcher points to instead of this launcher itself."
@@ -14870,7 +14968,7 @@
 "Raahasit työpöytäkäynnistimen. Luultavasti halusit lähettää tiedoston johon "
 "käynnistin osoittaa, käynnistimen itsensä sijaan."
 
-#: ../pidgin/gtkutils.c:2267
+#: ../pidgin/gtkutils.c:2317
 #, c-format
 msgid ""
 "<b>File:</b> %s\n"
@@ -14881,25 +14979,25 @@
 "<b>Tiedoston koko:</b> %s\n"
 "<b>Kuvan koko:</b> %d × %d"
 
-#: ../pidgin/gtkutils.c:2563
+#: ../pidgin/gtkutils.c:2613
 #, c-format
 msgid "The file '%s' is too large for %s.  Please try a smaller image.\n"
 msgstr "Tiedosto \"%s\" on liian suuri \"%s\":lle. Kokeile pienempää kuvaa.\n"
 
-#: ../pidgin/gtkutils.c:2565
+#: ../pidgin/gtkutils.c:2615
 msgid "Icon Error"
 msgstr "Kuvakevirhe"
 
-#: ../pidgin/gtkutils.c:2566
+#: ../pidgin/gtkutils.c:2616
 msgid "Could not set icon"
 msgstr "Kuvaketta ei voitu asettaa"
 
-#: ../pidgin/gtkutils.c:2666
+#: ../pidgin/gtkutils.c:2716
 #, c-format
 msgid "Failed to open file '%s': %s"
 msgstr "Ei voitu avata tiedostoa \"%s\": %s"
 
-#: ../pidgin/gtkutils.c:2715
+#: ../pidgin/gtkutils.c:2765
 #, c-format
 msgid ""
 "Failed to load image '%s': reason not known, probably a corrupt image file"
@@ -14907,20 +15005,14 @@
 "Ei voitu ladata kuvaa \"%s\": syy ei ole tiedossa, mahdollisesti vioittunut "
 "kuvatiedosto"
 
-#: ../pidgin/gtkwhiteboard.c:760 ../pidgin/gtkwhiteboard.c:779
+#: ../pidgin/gtkwhiteboard.c:754 ../pidgin/gtkwhiteboard.c:773
 msgid "Save File"
 msgstr "Tallenna tiedosto"
 
-#: ../pidgin/gtkwhiteboard.c:867
+#: ../pidgin/gtkwhiteboard.c:861
 msgid "Select color"
 msgstr "Valitse väri"
 
-#. Translators may want to transliterate the name.
-#. It is not to be translated.
-#: ../pidgin/pidgin.h:50
-msgid "Pidgin"
-msgstr "Pidgin"
-
 #: ../pidgin/pidginstock.c:81
 msgid "_Alias"
 msgstr "_Alias"
@@ -14945,10 +15037,6 @@
 msgid "_Open Mail"
 msgstr "_Avaa sähköposti"
 
-#: ../pidgin/pixmaps/emotes/default/22/default.theme.in.h:1
-msgid "Default"
-msgstr "Oletus"
-
 #: ../pidgin/pixmaps/emotes/default/22/default.theme.in.h:2
 msgid "Pidgin smileys"
 msgstr "Pidgin-hymiöt"
@@ -15003,18 +15091,18 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/cap/cap.c:934
+#: ../pidgin/plugins/cap/cap.c:935
 msgid "Contact Availability Prediction"
 msgstr "Tuttavan paikallaolon ennustus"
 
 #. *< name
 #. *< version
-#: ../pidgin/plugins/cap/cap.c:936
+#: ../pidgin/plugins/cap/cap.c:937
 msgid "Contact Availability Prediction plugin."
 msgstr "Tuttavan paikallaolon ennustava liitännäinen."
 
 #. *  summary
-#: ../pidgin/plugins/cap/cap.c:937
+#: ../pidgin/plugins/cap/cap.c:938
 msgid ""
 "The contact availability plugin (cap) is used to display statistical "
 "information about buddies in a users contact list."
@@ -15117,11 +15205,23 @@
 msgid "Received Messages"
 msgstr "Vastaanotetut viestit"
 
-#: ../pidgin/plugins/convcolors.c:210 ../pidgin/plugins/pidginrc.c:320
+#: ../pidgin/plugins/convcolors.c:210 ../pidgin/plugins/pidginrc.c:251
 #, c-format
 msgid "Select Color for %s"
 msgstr "Valitse %s:n väri"
 
+#: ../pidgin/plugins/convcolors.c:287
+msgid "Bold"
+msgstr "Lihavoi"
+
+#: ../pidgin/plugins/convcolors.c:294
+msgid "Italic"
+msgstr "Kursivoi"
+
+#: ../pidgin/plugins/convcolors.c:301
+msgid "Underline"
+msgstr "Alleviivaa"
+
 #: ../pidgin/plugins/convcolors.c:310
 msgid "Ignore incoming format"
 msgstr "Älä välitä sisääntulevien viestien muotoiluista"
@@ -15242,29 +15342,29 @@
 msgstr "Pikaviestintä"
 
 #. Add the label.
-#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:460
+#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:457
 msgid "Select a person from your address book below, or add a new person."
 msgstr "Valitse henkilö allaolevasta osoitekirjasta, tai lisää uusi henkilö."
 
-#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:554
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:307
+#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:551
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:303
 msgid "Group:"
 msgstr "Ryhmä:"
 
 #. "New Person" button
-#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:580
-#: ../pidgin/plugins/gevolution/assoc-buddy.c:469
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:251
+#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:577
+#: ../pidgin/plugins/gevolution/assoc-buddy.c:467
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:249
 msgid "New Person"
 msgstr "Uusi henkilö"
 
 #. "Select Buddy" button
-#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:597
+#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:594
 msgid "Select Buddy"
 msgstr "Valitse tuttava"
 
 #. Add the label.
-#: ../pidgin/plugins/gevolution/assoc-buddy.c:345
+#: ../pidgin/plugins/gevolution/assoc-buddy.c:343
 msgid ""
 "Select a person from your address book to add this buddy to, or create a new "
 "person."
@@ -15273,12 +15373,12 @@
 "henkilö."
 
 #. Add the expander
-#: ../pidgin/plugins/gevolution/assoc-buddy.c:433
+#: ../pidgin/plugins/gevolution/assoc-buddy.c:431
 msgid "User _details"
 msgstr "Käyttäjän tiedot"
 
 #. "Associate Buddy" button
-#: ../pidgin/plugins/gevolution/assoc-buddy.c:486
+#: ../pidgin/plugins/gevolution/assoc-buddy.c:484
 msgid "_Associate Buddy"
 msgstr "_Yhdistä tuttava"
 
@@ -15332,32 +15432,32 @@
 msgid "Provides integration with Evolution."
 msgstr "Mahdollistaa integroinnin Evolutionin kanssa."
 
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:267
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:263
 msgid "Please enter the person's information below."
 msgstr "Syötä henkilön tiedot alle."
 
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:271
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:267
 msgid "Please enter the buddy's screen name and account type below."
 msgstr "Syötä tuttavan näyttönimi ja käyttäjätilin tyyppi alle."
 
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:291
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:287
 msgid "Account type:"
 msgstr "Käyttäjätilin tyyppi:"
 
 #. Optional Information section
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:315
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:311
 msgid "Optional information:"
 msgstr "Valinnaisia tietoja:"
 
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:350
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:346
 msgid "First name:"
 msgstr "Etunimi:"
 
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:362
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:358
 msgid "Last name:"
 msgstr "Sukunimi:"
 
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:382
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:378
 msgid "E-mail:"
 msgstr "Sähköposti:"
 
@@ -15656,24 +15756,24 @@
 msgid "Notify Dialog"
 msgstr "Huomautusvalintaikunna"
 
-#: ../pidgin/plugins/pidginrc.c:322
+#: ../pidgin/plugins/pidginrc.c:253
 msgid "Select Color"
 msgstr "Valitse väri"
 
-#: ../pidgin/plugins/pidginrc.c:361
+#: ../pidgin/plugins/pidginrc.c:300
+msgid "Select Interface Font"
+msgstr "Valitse käyttöliittymän kirjasin"
+
+#: ../pidgin/plugins/pidginrc.c:303
 #, c-format
 msgid "Select Font for %s"
 msgstr "Valitse %s:n kirjasin"
 
-#: ../pidgin/plugins/pidginrc.c:398
-msgid "Select Interface Font"
-msgstr "Valitse käyttöliittymän kirjasin"
-
-#: ../pidgin/plugins/pidginrc.c:453
+#: ../pidgin/plugins/pidginrc.c:371
 msgid "GTK+ Interface Font"
 msgstr "GTK+-käyttöliittymän kirjasin"
 
-#: ../pidgin/plugins/pidginrc.c:473
+#: ../pidgin/plugins/pidginrc.c:391
 msgid "GTK+ Text Shortcut Theme"
 msgstr "GTK+-tekstioikopolkuteema"
 
@@ -15697,36 +15797,36 @@
 #. widget_bool_widgets[i]);
 #. }
 #.
-#: ../pidgin/plugins/pidginrc.c:510
+#: ../pidgin/plugins/pidginrc.c:428
 msgid "Interface colors"
 msgstr "Käyttöliittymän värit"
 
-#: ../pidgin/plugins/pidginrc.c:534
+#: ../pidgin/plugins/pidginrc.c:452
 msgid "Widget Sizes"
 msgstr "Säädinkoot"
 
-#: ../pidgin/plugins/pidginrc.c:555
+#: ../pidgin/plugins/pidginrc.c:473
 msgid "Fonts"
 msgstr "Kirjasimet"
 
-#: ../pidgin/plugins/pidginrc.c:578
-msgid "Tools"
-msgstr "Työkalut"
-
-#: ../pidgin/plugins/pidginrc.c:583
+#: ../pidgin/plugins/pidginrc.c:497
+msgid "Gtkrc File Tools"
+msgstr "Gtkrc-tiedostotyökalut"
+
+#: ../pidgin/plugins/pidginrc.c:502
 #, c-format
 msgid "Write settings to %s%sgtkrc-2.0"
 msgstr "Kirjoita asetukset tiedostoon %s%sgtkrc-2.0"
 
-#: ../pidgin/plugins/pidginrc.c:591
+#: ../pidgin/plugins/pidginrc.c:511
 msgid "Re-read gtkrc files"
 msgstr "Lue uudelleen gtkrc-tiedostot"
 
-#: ../pidgin/plugins/pidginrc.c:624
+#: ../pidgin/plugins/pidginrc.c:544
 msgid "Pidgin GTK+ Theme Control"
 msgstr "Pidgin GTK+-teemanhallinta"
 
-#: ../pidgin/plugins/pidginrc.c:626 ../pidgin/plugins/pidginrc.c:627
+#: ../pidgin/plugins/pidginrc.c:546 ../pidgin/plugins/pidginrc.c:547
 msgid "Provides access to commonly used gtkrc settings."
 msgstr "Antaa pääsyn usein käytettyihin gtkrc-asetuksiin."
 
@@ -15753,17 +15853,17 @@
 #, c-format
 msgid ""
 "You are using %s version %s.  The current version is %s.  You can get it "
-"from <a href=\""
+"from <a href=\"%s\">%s</a><hr>"
 msgstr ""
 "Käyttämäsi %s-versio on %s. Nykyinen versio on %s. Se löytyy osoitteesta <a "
-"href=\""
-
-#: ../pidgin/plugins/relnot.c:78
+"href=\"%s\">%s</a><hr>"
+
+#: ../pidgin/plugins/relnot.c:79
 #, c-format
 msgid "<b>ChangeLog:</b><br>%s"
 msgstr "<b>Muutosloki:</b><br>%s"
 
-#: ../pidgin/plugins/relnot.c:83 ../pidgin/plugins/relnot.c:84
+#: ../pidgin/plugins/relnot.c:84 ../pidgin/plugins/relnot.c:85
 msgid "New Version Available"
 msgstr "Uusi versio saatavilla"
 
@@ -15773,19 +15873,19 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/relnot.c:142
+#: ../pidgin/plugins/relnot.c:143
 msgid "Release Notification"
 msgstr "Julkaisuilmoitus"
 
 #. *< name
 #. *< version
 #. *  summary
-#: ../pidgin/plugins/relnot.c:145
+#: ../pidgin/plugins/relnot.c:146
 msgid "Checks periodically for new releases."
 msgstr "Tarkistaa määräajoin onko uusi Pidgin-versio julkaistu."
 
 #. *  description
-#: ../pidgin/plugins/relnot.c:147
+#: ../pidgin/plugins/relnot.c:148
 msgid ""
 "Checks periodically for new releases and notifies the user with the "
 "ChangeLog."
@@ -15793,70 +15893,70 @@
 "Tarkistaa määräajoin onko uusi Pidgin-versio julkaistu ja huomauttaa "
 "käyttäjää näyttämällä muutoslokin."
 
-#: ../pidgin/plugins/spellchk.c:1965
+#: ../pidgin/plugins/spellchk.c:1962
 msgid "Duplicate Correction"
 msgstr "Korjauksen toisinto"
 
-#: ../pidgin/plugins/spellchk.c:1966
+#: ../pidgin/plugins/spellchk.c:1963
 msgid "The specified word already exists in the correction list."
 msgstr "Määritetty sana on jo korjauslistassa."
 
-#: ../pidgin/plugins/spellchk.c:2180
+#: ../pidgin/plugins/spellchk.c:2177
 msgid "Text Replacements"
 msgstr "Tekstin korvaus"
 
-#: ../pidgin/plugins/spellchk.c:2203
+#: ../pidgin/plugins/spellchk.c:2200
 msgid "You type"
 msgstr "Kirjoitettu"
 
-#: ../pidgin/plugins/spellchk.c:2217
+#: ../pidgin/plugins/spellchk.c:2214
 msgid "You send"
 msgstr "Lähetetty"
 
-#: ../pidgin/plugins/spellchk.c:2231
+#: ../pidgin/plugins/spellchk.c:2228
 msgid "Whole words only"
 msgstr "Vain kokonaiset sanat"
 
-#: ../pidgin/plugins/spellchk.c:2243
+#: ../pidgin/plugins/spellchk.c:2240
 msgid "Case sensitive"
 msgstr "Sama kirjainkoko"
 
-#: ../pidgin/plugins/spellchk.c:2269
+#: ../pidgin/plugins/spellchk.c:2266
 msgid "Add a new text replacement"
 msgstr "Lisää uusi korvausehto"
 
-#: ../pidgin/plugins/spellchk.c:2285
+#: ../pidgin/plugins/spellchk.c:2282
 msgid "You _type:"
 msgstr "_Kirjoitettu:"
 
-#: ../pidgin/plugins/spellchk.c:2302
+#: ../pidgin/plugins/spellchk.c:2299
 msgid "You _send:"
 msgstr "_Lähetetty:"
 
 #. Created here so it can be passed to whole_words_button_toggled.
-#: ../pidgin/plugins/spellchk.c:2314
+#: ../pidgin/plugins/spellchk.c:2311
 msgid "_Exact case match (uncheck for automatic case handling)"
 msgstr ""
 "_Ehdoton kirjainkoon täsmäys (poista valinta jos haluat automaattisen "
 "kirjainkoon hallinnan)"
 
-#: ../pidgin/plugins/spellchk.c:2316
+#: ../pidgin/plugins/spellchk.c:2313
 msgid "Only replace _whole words"
 msgstr "Korvaa vain _kokonaiset sanat"
 
-#: ../pidgin/plugins/spellchk.c:2341
+#: ../pidgin/plugins/spellchk.c:2338
 msgid "General Text Replacement Options"
 msgstr "Tekstin korvauksen yleiset valinnat"
 
-#: ../pidgin/plugins/spellchk.c:2342
+#: ../pidgin/plugins/spellchk.c:2339
 msgid "Enable replacement of last word on send"
 msgstr "Salli viimeisen sanan korvaus lähetettäessä"
 
-#: ../pidgin/plugins/spellchk.c:2373
+#: ../pidgin/plugins/spellchk.c:2370
 msgid "Text replacement"
 msgstr "Tekstin korvaus"
 
-#: ../pidgin/plugins/spellchk.c:2375 ../pidgin/plugins/spellchk.c:2376
+#: ../pidgin/plugins/spellchk.c:2372 ../pidgin/plugins/spellchk.c:2373
 msgid "Replaces text in outgoing messages according to user-defined rules."
 msgstr "Korvaa lähetetettävän tekstin käyttäjän määritelmän mukaan."
 
@@ -15866,7 +15966,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/ticker/ticker.c:77 ../pidgin/plugins/ticker/ticker.c:355
+#: ../pidgin/plugins/ticker/ticker.c:74 ../pidgin/plugins/ticker/ticker.c:354
 msgid "Buddy Ticker"
 msgstr "Rullaava tuttavataulu"
 
@@ -15874,7 +15974,7 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../pidgin/plugins/ticker/ticker.c:358 ../pidgin/plugins/ticker/ticker.c:360
+#: ../pidgin/plugins/ticker/ticker.c:357 ../pidgin/plugins/ticker/ticker.c:359
 msgid "A horizontal scrolling version of the buddy list."
 msgstr "Vaakatasossa rullaava versio tuttavalistasta."
 
@@ -15960,48 +16060,48 @@
 "Tämä liitännäinen mahdollistaa keskustelu- ja lokiviestien aikaleimamuotojen "
 "muokkaamisen."
 
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:183
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:569
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:616
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:174
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:589
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:636
 msgid "Opacity:"
 msgstr "Peitto:"
 
 #. IM Convo trans options
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:533
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:553
 msgid "IM Conversation Windows"
 msgstr "Pikaviesti-ikkunat"
 
 # NOTE source: gimp + google
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:534
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:554
 msgid "_IM window transparency"
 msgstr "_Pikaviesti-ikkunan läpinäkyvyys"
 
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:548
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:568
 msgid "_Show slider bar in IM window"
 msgstr "_Näytä vierityspalkki pikaviesti-ikkunassa"
 
 # NOTE source: gimp + google
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:555
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:575
 msgid "Remove IM window transparency on focus"
 msgstr "Poista pikaviesti-ikkunan läpinäkyvyys sen ollessa kohdistettuna"
 
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:558
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:606
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:578
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:626
 msgid "Always on top"
 msgstr "Aina päällimmäisenä"
 
 #. Buddy List trans options
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:590
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:610
 msgid "Buddy List Window"
 msgstr "Tuttavalistaikkuna"
 
 # NOTE source: gimp + google
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:591
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:611
 msgid "_Buddy List window transparency"
 msgstr "_Tuttavalistaikkunan läpinäkyvyys"
 
 # NOTE source: gimp + google
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:604
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:624
 msgid "Remove Buddy List window transparency on focus"
 msgstr "Poista tuttavalistaikkunan läpinäkyvyys sen ollessa kohdistettuna"
 
@@ -16012,19 +16112,19 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:664
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:684
 msgid "Transparency"
 msgstr "Läpinäkyvyys"
 
 #. *< name
 #. *< version
 #. *  summary
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:667
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:687
 msgid "Variable Transparency for the buddy list and conversations."
 msgstr "Vaihteleva läpinäkyvyys tuttavalistalle ja keskusteluille."
 
 #. *  description
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:669
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:689
 msgid ""
 "This plugin enables variable alpha transparency on conversation windows and "
 "the buddy list.\n"
@@ -16083,7 +16183,7 @@
 "Tarjoaa Windows Pidgin -sidonnaisia valintoja, kuten tuttavalistan "
 "telakoinnin."
 
-#: ../pidgin/plugins/xmppconsole.c:666
+#: ../pidgin/plugins/xmppconsole.c:667
 msgid "<font color='#777777'>Logged out.</font>"
 msgstr "<font color='#777777'>Kirjauduttu ulos.</font>"
 
@@ -16093,45 +16193,92 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/xmppconsole.c:746 ../pidgin/plugins/xmppconsole.c:842
-#: ../pidgin/plugins/xmppconsole.c:861
+#: ../pidgin/plugins/xmppconsole.c:746 ../pidgin/plugins/xmppconsole.c:841
+#: ../pidgin/plugins/xmppconsole.c:860
 msgid "XMPP Console"
 msgstr "XMPP-pääte"
 
-#: ../pidgin/plugins/xmppconsole.c:754
+#: ../pidgin/plugins/xmppconsole.c:753
 msgid "Account: "
 msgstr "Käyttäjätili: "
 
-#: ../pidgin/plugins/xmppconsole.c:781
+#: ../pidgin/plugins/xmppconsole.c:780
 msgid "<font color='#777777'>Not connected to XMPP</font>"
 msgstr "<font color='#777777'>Ei yhdistetty XMPP:hen</font>"
 
-#: ../pidgin/plugins/xmppconsole.c:791
+#: ../pidgin/plugins/xmppconsole.c:790
 msgid "Insert an <iq/> stanza."
 msgstr "Lisää <iq/>-lohko."
 
-#: ../pidgin/plugins/xmppconsole.c:800
+#: ../pidgin/plugins/xmppconsole.c:799
 msgid "Insert a <presence/> stanza."
 msgstr "Lisää <presence/>-lohko."
 
-#: ../pidgin/plugins/xmppconsole.c:809
+#: ../pidgin/plugins/xmppconsole.c:808
 msgid "Insert a <message/> stanza."
 msgstr "Lisää <message/>-lohko."
 
 #. *< name
 #. *< version
 #. *  summary
-#: ../pidgin/plugins/xmppconsole.c:864
+#: ../pidgin/plugins/xmppconsole.c:863
 msgid "Send and receive raw XMPP stanzas."
 msgstr "Lähetä ja vastaanota XMPP-raakalohkoja."
 
 #. *  description
-#: ../pidgin/plugins/xmppconsole.c:866
+#: ../pidgin/plugins/xmppconsole.c:865
 msgid "This plugin is useful for debbuging XMPP servers or clients."
 msgstr ""
 "Tätä liitännäistä voidaan käyttää XMPP-palvelimien tai -asiakasohjelmien "
 "virheenjäljitykseen."
 
+#~ msgid "Commands are not supported yet. Message was NOT sent."
+#~ msgstr "Komentoja ei tueta vielä. Viestiä EI lähetetty."
+
+#~ msgid "User information for %s unavailable:"
+#~ msgstr "%s:n käyttäjätiedot eivät ole saatavilla"
+
+#~ msgid ""
+#~ "Could not add the buddy %s for an unknown reason.  The most common reason "
+#~ "for this is that you have the maximum number of allowed buddies in your "
+#~ "buddy list."
+#~ msgstr ""
+#~ "Ei voitu lisätä tuttavaa %s tuntemattomasta syystä. Yleisin syy tälle on "
+#~ "se että listasi maksimituttavamäärä on ylittynyt."
+
+#~ msgid "_Connect"
+#~ msgstr "_Yhdistä"
+
+#~ msgid "Send IM fail\n"
+#~ msgstr "Pikaviestin lähetys epäonnistui\n"
+
+#~ msgid "Unavailable"
+#~ msgstr "Tavoittamattomissa"
+
+#~ msgid "/Buddies/_About Pidgin"
+#~ msgstr "/Tuttavat/Tietoj_a Pidginistä"
+
+#~ msgid "Larger font size"
+#~ msgstr "Suurempi kirjasinkoko"
+
+#~ msgid "Smaller font size"
+#~ msgstr "Pienempi kirjasinkoko"
+
+#~ msgid "Reset formatting"
+#~ msgstr "Poista muotoilu"
+
+#~ msgid "Insert link"
+#~ msgstr "Lisää linkki"
+
+#~ msgid "Insert image"
+#~ msgstr "Liitä kuva"
+
+#~ msgid "Insert smiley"
+#~ msgstr "Lisää hymiö"
+
+#~ msgid "Tools"
+#~ msgstr "Työkalut"
+
 #~ msgid "Reject watching by other users"
 #~ msgstr "Evää katsominen toisilta käyttäjiltä"
 
@@ -16151,15 +16298,6 @@
 #~ msgid "Alias..."
 #~ msgstr "Alias..."
 
-#~ msgid "/_Help"
-#~ msgstr "/O_hje"
-
-#~ msgid "/Help/Online _Help"
-#~ msgstr "/Ohje/O_hjeita verkossa"
-
-#~ msgid "/Help/_About"
-#~ msgstr "/Ohje/Tietoj_a"
-
 #~ msgid ""
 #~ "<FONT SIZE=\"4\">IRC:</FONT> #pidgin-win32 on irc.freenode.net<BR><BR>"
 #~ msgstr ""
@@ -17808,9 +17946,6 @@
 #~ msgid "Burmese"
 #~ msgstr "burma"
 
-#~ msgid "Norwegian (Nynorsk)"
-#~ msgstr "norja (uusnorja)"
-
 #~ msgid "Punjabi"
 #~ msgstr "punjabi"
 
--- a/po/fr.po	Thu Jul 12 23:57:56 2007 +0000
+++ b/po/fr.po	Fri Jul 13 00:03:15 2007 +0000
@@ -21,8 +21,8 @@
 msgstr ""
 "Project-Id-Version: Pidgin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-05-22 00:04-0400\n"
-"PO-Revision-Date: 2007-05-22 19:31+0200\n"
+"POT-Creation-Date: 2007-07-12 03:22-0400\n"
+"PO-Revision-Date: 2007-07-12 18:19+0200\n"
 "Last-Translator: Éric Boumaour <zongo_fr@users.sourceforge.net>\n"
 "Language-Team: fr <fr@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -30,12 +30,19 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n>1;\n"
 
-#: ../finch/finch.c:180
+#. Translators may want to transliterate the name.
+#. It is not to be translated.
+#: ../finch/finch.c:70 ../finch/finch.c:298 ../finch/finch.c:327
+#: ../finch/finch.c:404
+msgid "Finch"
+msgstr "Finch"
+
+#: ../finch/finch.c:204
 #, c-format
 msgid "%s. Try `%s -h' for more information.\n"
 msgstr "%s. « %s -h » pour plus d'informations.\n"
 
-#: ../finch/finch.c:182
+#: ../finch/finch.c:206
 #, c-format
 msgid ""
 "%s\n"
@@ -57,112 +64,114 @@
 "  -n, --nologin       ne se connecte pas automatiquement au lancement\n"
 "  -v, --version       affiche le numéro de la version actuelle\n"
 
-#. Translators may want to transliterate the name.
-#. It is not to be translated.
-#: ../finch/finch.c:274 ../finch/finch.c:303
-msgid "Finch"
-msgstr "Finch"
-
-#: ../finch/finch.c:301 ../pidgin/gtkmain.c:685
+#: ../finch/finch.c:325 ../pidgin/gtkmain.c:708
 #, 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 ""
-"Des erreurs sont survenues lors de la migration des préférences %s de %s vers %s. "
-"Veuillez investiguer et terminer la migration à la main. Reportez cette erreur "
-"sur http://developer.pidgin.im"
-
-#: ../finch/gntaccount.c:119 ../finch/gntblist.c:288 ../finch/gntblist.c:413
-#: ../finch/gntblist.c:426 ../finch/gntplugin.c:181 ../finch/gntplugin.c:225
-#: ../finch/gntstatus.c:294 ../finch/gntstatus.c:302
-#: ../libpurple/protocols/jabber/buddy.c:1426
+"Des erreurs sont survenues lors de la migration des préférences %s de %s "
+"vers %s. Veuillez investiguer et terminer la migration à la main. Reportez "
+"cette erreur sur http://developer.pidgin.im"
+
+#: ../finch/gntaccount.c:122 ../finch/gntaccount.c:477 ../finch/gntblist.c:299
+#: ../finch/gntblist.c:424 ../finch/gntblist.c:437 ../finch/gntplugin.c:185
+#: ../finch/gntplugin.c:233 ../finch/gntstatus.c:297 ../finch/gntstatus.c:305
+#: ../libpurple/protocols/jabber/buddy.c:1464
 #: ../libpurple/protocols/jabber/chat.c:677
 #: ../libpurple/protocols/jabber/chat.c:688
-#: ../libpurple/protocols/jabber/jabber.c:1229
-#: ../libpurple/protocols/qq/group_join.c:326
-#: ../libpurple/protocols/silc/ops.c:1451
+#: ../libpurple/protocols/jabber/jabber.c:1227
+#: ../libpurple/protocols/qq/group_join.c:328
+#: ../libpurple/protocols/silc/ops.c:57 ../libpurple/protocols/silc/ops.c:1456
+#: ../libpurple/protocols/silc10/ops.c:1451
 msgid "Error"
 msgstr "Erreur"
 
-#: ../finch/gntaccount.c:119
+#: ../finch/gntaccount.c:122
 msgid "Account was not added"
 msgstr "Le compte n'a pas été ajouté."
 
-#: ../finch/gntaccount.c:120
+#: ../finch/gntaccount.c:123
 msgid "Screenname of an account must be non-empty."
 msgstr "Le nom d'utilisateur d'un compte ne doit pas être vide."
 
-#: ../finch/gntaccount.c:423 ../pidgin/gtkaccount.c:590
+#: ../finch/gntaccount.c:430
 msgid "New mail notifications"
 msgstr "Avertir des nouveaux courriers"
 
-#: ../finch/gntaccount.c:433 ../pidgin/gtkaccount.c:519
+#: ../finch/gntaccount.c:440
 msgid "Remember password"
 msgstr "Mémoriser le mot de passe"
 
-#: ../finch/gntaccount.c:474 ../pidgin/gtkaccount.c:1456
-#: ../pidgin/gtkblist.c:3965
+#: ../finch/gntaccount.c:478
+msgid "There's no protocol plugins installed."
+msgstr "Aucun plugin de protocole n'est installé."
+
+#: ../finch/gntaccount.c:479
+msgid "(You probably forgot to 'make install'.)"
+msgstr "(Vous avez peut-être oublié de faire un « make install »)"
+
+#: ../finch/gntaccount.c:489 ../pidgin/gtkaccount.c:1473
+#: ../pidgin/gtkblist.c:4014
 msgid "Modify Account"
 msgstr "Modification du compte"
 
-#: ../finch/gntaccount.c:474
+#: ../finch/gntaccount.c:489
 msgid "New Account"
 msgstr "Nouveau compte"
 
-#: ../finch/gntaccount.c:500 ../pidgin/gtkaccount.c:427 ../pidgin/gtkft.c:695
+#: ../finch/gntaccount.c:514 ../pidgin/gtkft.c:695
 msgid "Protocol:"
 msgstr "Protocole :"
 
-#: ../finch/gntaccount.c:508 ../pidgin/gtkaccount.c:435
-#: ../pidgin/gtkblist.c:5389
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:295
+#: ../finch/gntaccount.c:522
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:291
 msgid "Screen name:"
 msgstr "Nom d'utilisateur :"
 
-#: ../finch/gntaccount.c:521 ../pidgin/gtkaccount.c:510
+#: ../finch/gntaccount.c:535
 msgid "Password:"
 msgstr "Mot de passe :"
 
-#: ../finch/gntaccount.c:531 ../pidgin/gtkblist.c:5410
-#: ../pidgin/gtkblist.c:5773
+#: ../finch/gntaccount.c:545
 msgid "Alias:"
 msgstr "Alias :"
 
 #. Cancel button
 #. Cancel
-#: ../finch/gntaccount.c:554 ../finch/gntaccount.c:617
-#: ../finch/gntaccount.c:838 ../finch/gntblist.c:332 ../finch/gntblist.c:401
-#: ../finch/gntblist.c:436 ../finch/gntblist.c:768 ../finch/gntblist.c:965
-#: ../finch/gntblist.c:1061 ../finch/gntblist.c:2155 ../finch/gntplugin.c:360
-#: ../finch/gntpounce.c:456 ../finch/gntpounce.c:654 ../finch/gntprefs.c:246
-#: ../finch/gntstatus.c:142 ../finch/gntstatus.c:475 ../finch/gntstatus.c:600
+#: ../finch/gntaccount.c:568 ../finch/gntaccount.c:631
+#: ../finch/gntaccount.c:875 ../finch/gntblist.c:343 ../finch/gntblist.c:412
+#: ../finch/gntblist.c:447 ../finch/gntblist.c:794 ../finch/gntblist.c:996
+#: ../finch/gntblist.c:1092 ../finch/gntblist.c:2198 ../finch/gntplugin.c:378
+#: ../finch/gntpounce.c:456 ../finch/gntpounce.c:654 ../finch/gntprefs.c:264
+#: ../finch/gntstatus.c:143 ../finch/gntstatus.c:478 ../finch/gntstatus.c:603
 #: ../libpurple/account.c:984 ../libpurple/account.c:1234
-#: ../libpurple/account.c:1269 ../libpurple/conversation.c:1168
+#: ../libpurple/account.c:1269 ../libpurple/conversation.c:1173
 #: ../libpurple/plugins/buddynote.c:51 ../libpurple/protocols/gg/gg.c:502
 #: ../libpurple/protocols/gg/gg.c:661 ../libpurple/protocols/gg/gg.c:798
 #: ../libpurple/protocols/gg/gg.c:879
-#: ../libpurple/protocols/jabber/buddy.c:584
-#: ../libpurple/protocols/jabber/buddy.c:1788
-#: ../libpurple/protocols/jabber/buddy.c:1824
+#: ../libpurple/protocols/jabber/buddy.c:588
+#: ../libpurple/protocols/jabber/buddy.c:1826
+#: ../libpurple/protocols/jabber/buddy.c:1862
 #: ../libpurple/protocols/jabber/chat.c:786
-#: ../libpurple/protocols/jabber/jabber.c:878
+#: ../libpurple/protocols/jabber/jabber.c:882
 #: ../libpurple/protocols/jabber/jabber.c:1384
+#: ../libpurple/protocols/jabber/si.c:868
 #: ../libpurple/protocols/jabber/xdata.c:337
 #: ../libpurple/protocols/msn/msn.c:259 ../libpurple/protocols/msn/msn.c:276
 #: ../libpurple/protocols/msn/msn.c:293 ../libpurple/protocols/msn/msn.c:310
 #: ../libpurple/protocols/msn/msn.c:331
-#: ../libpurple/protocols/oscar/oscar.c:6004
+#: ../libpurple/protocols/oscar/oscar.c:6073
 #: ../libpurple/protocols/oscar/peer.c:1023
 #: ../libpurple/protocols/qq/buddy_info.c:484
 #: ../libpurple/protocols/qq/buddy_opt.c:214
 #: ../libpurple/protocols/qq/buddy_opt.c:409
 #: ../libpurple/protocols/qq/group.c:124
-#: ../libpurple/protocols/qq/group_join.c:138
-#: ../libpurple/protocols/qq/group_join.c:363
-#: ../libpurple/protocols/qq/group_opt.c:143
-#: ../libpurple/protocols/qq/group_opt.c:398
+#: ../libpurple/protocols/qq/group_join.c:140
+#: ../libpurple/protocols/qq/group_join.c:365
+#: ../libpurple/protocols/qq/group_opt.c:144
+#: ../libpurple/protocols/qq/group_opt.c:399
 #: ../libpurple/protocols/qq/sys_msg.c:115
 #: ../libpurple/protocols/qq/sys_msg.c:174
 #: ../libpurple/protocols/qq/sys_msg.c:269
@@ -172,365 +181,389 @@
 #: ../libpurple/protocols/sametime/sametime.c:5397
 #: ../libpurple/protocols/sametime/sametime.c:5487
 #: ../libpurple/protocols/sametime/sametime.c:5612
-#: ../libpurple/protocols/silc/buddy.c:468
-#: ../libpurple/protocols/silc/buddy.c:1084
-#: ../libpurple/protocols/silc/buddy.c:1189
-#: ../libpurple/protocols/silc/chat.c:600
-#: ../libpurple/protocols/silc/chat.c:730
-#: ../libpurple/protocols/silc/ops.c:1913
-#: ../libpurple/protocols/silc/silc.c:744
-#: ../libpurple/protocols/silc/silc.c:950
-#: ../libpurple/protocols/yahoo/yahoo.c:987
-#: ../libpurple/protocols/yahoo/yahoo.c:3231
-#: ../libpurple/protocols/yahoo/yahoo.c:3242 ../pidgin/gtkaccount.c:1894
-#: ../pidgin/gtkaccount.c:2485 ../pidgin/gtkblist.c:5829
-#: ../pidgin/gtkdialogs.c:725 ../pidgin/gtkdialogs.c:863
-#: ../pidgin/gtkdialogs.c:955 ../pidgin/gtkdialogs.c:975
-#: ../pidgin/gtkdialogs.c:999 ../pidgin/gtkdialogs.c:1021
-#: ../pidgin/gtkdialogs.c:1069 ../pidgin/gtkdialogs.c:1110
-#: ../pidgin/gtkdialogs.c:1166 ../pidgin/gtkdialogs.c:1205
-#: ../pidgin/gtkdialogs.c:1232 ../pidgin/gtkimhtmltoolbar.c:419
-#: ../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
+#: ../libpurple/protocols/silc/buddy.c:455
+#: ../libpurple/protocols/silc/buddy.c:1076
+#: ../libpurple/protocols/silc/buddy.c:1191
+#: ../libpurple/protocols/silc/chat.c:616
+#: ../libpurple/protocols/silc/chat.c:746
+#: ../libpurple/protocols/silc/ops.c:1816
+#: ../libpurple/protocols/silc/silc.c:823
+#: ../libpurple/protocols/silc/silc.c:1031
+#: ../libpurple/protocols/silc10/buddy.c:468
+#: ../libpurple/protocols/silc10/buddy.c:1084
+#: ../libpurple/protocols/silc10/buddy.c:1189
+#: ../libpurple/protocols/silc10/chat.c:600
+#: ../libpurple/protocols/silc10/chat.c:730
+#: ../libpurple/protocols/silc10/ops.c:1904
+#: ../libpurple/protocols/silc10/silc.c:736
+#: ../libpurple/protocols/silc10/silc.c:942
+#: ../libpurple/protocols/yahoo/yahoo.c:989
+#: ../libpurple/protocols/yahoo/yahoo.c:3248
+#: ../libpurple/protocols/yahoo/yahoo.c:3259 ../pidgin/gtkaccount.c:1908
+#: ../pidgin/gtkaccount.c:2501 ../pidgin/gtkblist.c:5915
+#: ../pidgin/gtkdialogs.c:727 ../pidgin/gtkdialogs.c:865
+#: ../pidgin/gtkdialogs.c:957 ../pidgin/gtkdialogs.c:977
+#: ../pidgin/gtkdialogs.c:1001 ../pidgin/gtkdialogs.c:1023
+#: ../pidgin/gtkdialogs.c:1071 ../pidgin/gtkdialogs.c:1112
+#: ../pidgin/gtkdialogs.c:1168 ../pidgin/gtkdialogs.c:1207
+#: ../pidgin/gtkdialogs.c:1234 ../pidgin/gtkimhtmltoolbar.c:425
+#: ../pidgin/gtklog.c:327 ../pidgin/gtkplugin.c:288 ../pidgin/gtkpounce.c:1115
+#: ../pidgin/gtkprivacy.c:562 ../pidgin/gtkprivacy.c:578
+#: ../pidgin/gtkprivacy.c:603 ../pidgin/gtkprivacy.c:617
+#: ../pidgin/gtkrequest.c:270 ../pidgin/gtksavedstatuses.c:344
+#: ../pidgin/gtkstatusbox.c:1582
 msgid "Cancel"
 msgstr "Annuler"
 
 #. Save button
 #. Save
-#: ../finch/gntaccount.c:558 ../finch/gntplugin.c:360 ../finch/gntpounce.c:462
-#: ../finch/gntprefs.c:246 ../finch/gntstatus.c:478 ../finch/gntstatus.c:588
+#: ../finch/gntaccount.c:572 ../finch/gntplugin.c:378 ../finch/gntpounce.c:462
+#: ../finch/gntprefs.c:264 ../finch/gntstatus.c:481 ../finch/gntstatus.c:591
 #: ../libpurple/account.c:1268 ../libpurple/plugins/buddynote.c:50
-#: ../libpurple/protocols/jabber/buddy.c:583 ../pidgin/gtkdebug.c:747
+#: ../libpurple/protocols/jabber/buddy.c:587 ../pidgin/gtkdebug.c:748
 #: ../pidgin/gtkrequest.c:276
 msgid "Save"
 msgstr "Enregistrer"
 
-#: ../finch/gntaccount.c:611 ../pidgin/gtkaccount.c:1886
-#: ../pidgin/gtksavedstatuses.c:328
+#: ../finch/gntaccount.c:625 ../pidgin/gtkaccount.c:1900
+#: ../pidgin/gtksavedstatuses.c:332 ../pidgin/gtkstatusbox.c:1576
 #, c-format
 msgid "Are you sure you want to delete %s?"
 msgstr "Êtes-vous sûr de vouloir supprimer %s ?"
 
-#: ../finch/gntaccount.c:614
+#: ../finch/gntaccount.c:628
 msgid "Delete Account"
 msgstr "Supprimer le compte"
 
 #. Delete button
-#: ../finch/gntaccount.c:616 ../finch/gntaccount.c:683
-#: ../finch/gntpounce.c:653 ../finch/gntpounce.c:714 ../finch/gntstatus.c:141
-#: ../finch/gntstatus.c:204 ../pidgin/gtkaccount.c:1893 ../pidgin/gtklog.c:301
-#: ../pidgin/gtkpounce.c:1101 ../pidgin/gtkrequest.c:273
-#: ../pidgin/gtksavedstatuses.c:336
+#: ../finch/gntaccount.c:630 ../finch/gntaccount.c:699
+#: ../finch/gntpounce.c:653 ../finch/gntpounce.c:715 ../finch/gntstatus.c:142
+#: ../finch/gntstatus.c:207 ../pidgin/gtkaccount.c:1907 ../pidgin/gtklog.c:326
+#: ../pidgin/gtkpounce.c:1114 ../pidgin/gtkrequest.c:273
+#: ../pidgin/gtksavedstatuses.c:343 ../pidgin/gtkstatusbox.c:1581
 msgid "Delete"
 msgstr "Supprimer"
 
-#: ../finch/gntaccount.c:646 ../finch/gntblist.c:2060 ../finch/gntui.c:76
-#: ../pidgin/gtkaccount.c:2311 ../pidgin/gtkdocklet.c:522
+#: ../finch/gntaccount.c:662 ../finch/gntblist.c:2104 ../finch/gntui.c:77
+#: ../pidgin/gtkaccount.c:2327 ../pidgin/gtkdocklet.c:522
 msgid "Accounts"
 msgstr "Comptes"
 
-#: ../finch/gntaccount.c:652
+#: ../finch/gntaccount.c:668
 msgid "You can enable/disable accounts from the following list."
 msgstr "Vous pouvez activer/désactiver les comptes de la liste suivante."
 
 #. Add button
-#: ../finch/gntaccount.c:675 ../finch/gntaccount.c:837 ../finch/gntblist.c:331
-#: ../finch/gntblist.c:401 ../finch/gntblist.c:436 ../finch/gntnotify.c:369
-#: ../finch/gntpounce.c:699 ../finch/gntstatus.c:194
+#: ../finch/gntaccount.c:691 ../finch/gntaccount.c:874 ../finch/gntblist.c:342
+#: ../finch/gntblist.c:412 ../finch/gntblist.c:447 ../finch/gntnotify.c:379
+#: ../finch/gntpounce.c:700 ../finch/gntstatus.c:197
 #: ../libpurple/protocols/gg/gg.c:878 ../libpurple/protocols/qq/sys_msg.c:116
 #: ../libpurple/protocols/qq/sys_msg.c:175
 #: ../libpurple/protocols/qq/sys_msg.c:270
 #: ../libpurple/protocols/sametime/sametime.c:5486
-#: ../libpurple/protocols/silc/chat.c:599 ../pidgin/gtkaccount.c:2484
-#: ../pidgin/gtkblist.c:5828 ../pidgin/gtkconv.c:1651
+#: ../libpurple/protocols/silc/chat.c:615
+#: ../libpurple/protocols/silc10/chat.c:599 ../pidgin/gtkaccount.c:2500
+#: ../pidgin/gtkblist.c:5914 ../pidgin/gtkconv.c:1651
 #: ../pidgin/gtkrequest.c:274
 msgid "Add"
 msgstr "Ajouter"
 
 #. Modify button
-#: ../finch/gntaccount.c:679 ../finch/gntpounce.c:706
+#: ../finch/gntaccount.c:695 ../finch/gntpounce.c:707
 msgid "Modify"
 msgstr "Modifier"
 
-#: ../finch/gntaccount.c:760 ../pidgin/gtkaccount.c:2431
+#: ../finch/gntaccount.c:797 ../pidgin/gtkaccount.c:2447
 #, c-format
 msgid "%s%s%s%s has made %s his or her buddy%s%s"
 msgstr "%s%s%s%s a fait de %s son contact%s%s"
 
-#: ../finch/gntaccount.c:833 ../pidgin/gtkaccount.c:2483
+#: ../finch/gntaccount.c:870 ../pidgin/gtkaccount.c:2499
 msgid "Add buddy to your list?"
 msgstr "Ajouter cet utilisateur à la liste de contacts ?"
 
-#: ../finch/gntaccount.c:887 ../pidgin/gtkaccount.c:2535
+#: ../finch/gntaccount.c:924 ../pidgin/gtkaccount.c:2551
 #, c-format
 msgid "%s%s%s%s wants to add %s to his or her buddy list%s%s"
 msgstr "%s%s%s%s veut ajouter %s à sa liste de contacts%s%s"
 
-#: ../finch/gntaccount.c:907 ../finch/gntaccount.c:914
-#: ../pidgin/gtkaccount.c:2558 ../pidgin/gtkaccount.c:2564
+#: ../finch/gntaccount.c:949 ../finch/gntaccount.c:952
+#: ../finch/gntaccount.c:979 ../pidgin/gtkaccount.c:2574
+#: ../pidgin/gtkaccount.c:2580
 msgid "Authorize buddy?"
 msgstr "Autoriser le contact ?"
 
-#: ../finch/gntaccount.c:911 ../finch/gntaccount.c:918
-#: ../pidgin/gtkaccount.c:2559 ../pidgin/gtkaccount.c:2565
+#: ../finch/gntaccount.c:956 ../finch/gntaccount.c:983
+#: ../pidgin/gtkaccount.c:2575 ../pidgin/gtkaccount.c:2581
 msgid "Authorize"
 msgstr "Autoriser"
 
-#: ../finch/gntaccount.c:912 ../finch/gntaccount.c:919
-#: ../pidgin/gtkaccount.c:2560 ../pidgin/gtkaccount.c:2566
+#: ../finch/gntaccount.c:957 ../finch/gntaccount.c:984
+#: ../pidgin/gtkaccount.c:2576 ../pidgin/gtkaccount.c:2582
 msgid "Deny"
 msgstr "Refuser"
 
-#: ../finch/gntblist.c:278
+#: ../finch/gntblist.c:288
 msgid "You must provide a screename for the buddy."
 msgstr "Vous devez fournir un nom d'utilisateur pour le contact."
 
-#: ../finch/gntblist.c:280
+#: ../finch/gntblist.c:290
 msgid "You must provide a group."
 msgstr "Vous devez fournir un groupe."
 
-#: ../finch/gntblist.c:282
+#: ../finch/gntblist.c:292
 msgid "You must select an account."
 msgstr "Vous devez choisir un compte."
 
-#: ../finch/gntblist.c:284
+#: ../finch/gntblist.c:294
 msgid "The selected account is not online."
 msgstr "Le compte choisi n'est pas activé."
 
-#: ../finch/gntblist.c:288
+#: ../finch/gntblist.c:299
 msgid "Error adding buddy"
 msgstr "Erreur à l'ajout du contact."
 
-#: ../finch/gntblist.c:313 ../libpurple/protocols/oscar/oscar.c:2843
-#: ../pidgin/gtkaccount.c:1969 ../pidgin/gtksavedstatuses.c:924
+#: ../finch/gntblist.c:324 ../libpurple/protocols/oscar/oscar.c:2864
+#: ../pidgin/gtkaccount.c:1983 ../pidgin/gtksavedstatuses.c:979
 msgid "Screen Name"
 msgstr "Nom d'utilisateur"
 
-#: ../finch/gntblist.c:316 ../finch/gntblist.c:393 ../finch/gntblist.c:1209
-#: ../libpurple/protocols/msn/msn.c:1359
-#: ../libpurple/protocols/silc/chat.c:590
+#: ../finch/gntblist.c:327 ../finch/gntblist.c:404 ../finch/gntblist.c:1240
+#: ../libpurple/protocols/msn/msn.c:1364
+#: ../libpurple/protocols/silc/chat.c:606
+#: ../libpurple/protocols/silc10/chat.c:590
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:680
 #: ../libpurple/protocols/zephyr/zephyr.c:788
-#: ../libpurple/protocols/zephyr/zephyr.c:1207 ../pidgin/gtkdialogs.c:974
-#: ../pidgin/gtkdialogs.c:998 ../pidgin/gtkdialogs.c:1020
+#: ../libpurple/protocols/zephyr/zephyr.c:1207 ../pidgin/gtkdialogs.c:976
+#: ../pidgin/gtkdialogs.c:1000 ../pidgin/gtkdialogs.c:1022
 #: ../pidgin/gtkrequest.c:277
 msgid "Alias"
 msgstr "Alias"
 
-#: ../finch/gntblist.c:319 ../finch/gntblist.c:396
+#: ../finch/gntblist.c:330 ../finch/gntblist.c:407
 msgid "Group"
 msgstr "Groupe"
 
-#: ../finch/gntblist.c:323 ../finch/gntblist.c:384 ../finch/gntblist.c:1259
-#: ../finch/gntnotify.c:171 ../finch/gntstatus.c:566
+#: ../finch/gntblist.c:334 ../finch/gntblist.c:395 ../finch/gntblist.c:1292
+#: ../finch/gntnotify.c:173 ../finch/gntstatus.c:569
 #: ../libpurple/plugins/idle.c:153 ../libpurple/plugins/idle.c:190
-#: ../pidgin/gtkblist.c:2965 ../pidgin/gtknotify.c:476
-#: ../pidgin/gtkpounce.c:1269 ../pidgin/plugins/gevolution/gevolution.c:444
+#: ../pidgin/gtkblist.c:2974 ../pidgin/gtknotify.c:482
+#: ../pidgin/gtkpounce.c:1282 ../pidgin/plugins/gevolution/gevolution.c:443
 msgid "Account"
 msgstr "Compte"
 
-#: ../finch/gntblist.c:329 ../finch/gntblist.c:817
-#: ../libpurple/protocols/silc/buddy.c:737
-#: ../libpurple/protocols/silc/buddy.c:1033
-#: ../libpurple/protocols/silc/buddy.c:1080
-#: ../libpurple/protocols/silc/buddy.c:1180
-#: ../libpurple/protocols/yahoo/yahoo.c:3144 ../pidgin/gtkblist.c:5343
-#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:447
+#: ../finch/gntblist.c:340 ../finch/gntblist.c:843
+#: ../libpurple/protocols/silc/buddy.c:725
+#: ../libpurple/protocols/silc/buddy.c:1027
+#: ../libpurple/protocols/silc/buddy.c:1072
+#: ../libpurple/protocols/silc/buddy.c:1182
+#: ../libpurple/protocols/silc10/buddy.c:737
+#: ../libpurple/protocols/silc10/buddy.c:1033
+#: ../libpurple/protocols/silc10/buddy.c:1080
+#: ../libpurple/protocols/silc10/buddy.c:1180
+#: ../libpurple/protocols/yahoo/yahoo.c:3161 ../pidgin/gtkblist.c:5420
+#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:445
 msgid "Add Buddy"
 msgstr "Ajouter le contact"
 
-#: ../finch/gntblist.c:329
+#: ../finch/gntblist.c:340
 msgid "Please enter buddy information."
 msgstr "Veuillez saisir les informations du contact."
 
-#: ../finch/gntblist.c:356 ../libpurple/blist.c:1192
+#: ../finch/gntblist.c:367 ../libpurple/blist.c:1190
 msgid "Chats"
 msgstr "Discussions"
 
 #. Extract their Name and put it in
-#: ../finch/gntblist.c:390 ../libpurple/protocols/jabber/jabber.c:809
-#: ../libpurple/protocols/msn/msn.c:1532 ../libpurple/protocols/msn/msn.c:1597
-#: ../libpurple/protocols/msn/msn.c:1624
+#: ../finch/gntblist.c:401 ../libpurple/protocols/jabber/jabber.c:813
+#: ../libpurple/protocols/msn/msn.c:1553 ../libpurple/protocols/msn/msn.c:1618
+#: ../libpurple/protocols/msn/msn.c:1645
 #: ../libpurple/protocols/qq/buddy_info.c:44 ../pidgin/gtkplugin.c:581
-#: ../pidgin/gtkroomlist.c:621
+#: ../pidgin/gtkroomlist.c:617
 #: ../pidgin/plugins/gevolution/add_buddy_dialog.c:132
 #: ../pidgin/plugins/gevolution/assoc-buddy.c:123
 msgid "Name"
 msgstr "Nom"
 
-#: ../finch/gntblist.c:399 ../finch/gntblist.c:819 ../pidgin/gtkblist.c:5719
+#: ../finch/gntblist.c:410 ../finch/gntblist.c:845 ../pidgin/gtkblist.c:5800
 msgid "Add Chat"
 msgstr "Ajouter la discussion"
 
-#: ../finch/gntblist.c:400
+#: ../finch/gntblist.c:411
 msgid "You can edit more information from the context menu later."
 msgstr ""
 "Vous pouvez modifier les informations plus tard grâce au menu contextuel."
 
-#: ../finch/gntblist.c:413 ../finch/gntblist.c:426
+#: ../finch/gntblist.c:424 ../finch/gntblist.c:437
 msgid "Error adding group"
 msgstr "Erreur à l'ajout d'un groupe."
 
-#: ../finch/gntblist.c:414
+#: ../finch/gntblist.c:425
 msgid "You must give a name for the group to add."
 msgstr "Vous devez fournir un nom pour le groupe à ajouter."
 
-#: ../finch/gntblist.c:427
+#: ../finch/gntblist.c:438
 msgid "A group with the name already exists."
 msgstr "Un groupe avec ce nom existe déjà."
 
-#: ../finch/gntblist.c:434 ../finch/gntblist.c:821
+#: ../finch/gntblist.c:445 ../finch/gntblist.c:847
 #: ../libpurple/protocols/sametime/sametime.c:5396
-#: ../libpurple/protocols/sametime/sametime.c:5484 ../pidgin/gtkblist.c:5825
+#: ../libpurple/protocols/sametime/sametime.c:5484 ../pidgin/gtkblist.c:5911
 msgid "Add Group"
 msgstr "Ajouter le groupe"
 
-#: ../finch/gntblist.c:434
+#: ../finch/gntblist.c:445
 msgid "Enter the name of the group"
 msgstr "Saisissez le nom du groupe"
 
-#: ../finch/gntblist.c:767
+#: ../finch/gntblist.c:793
 msgid "Edit Chat"
 msgstr "Modifier la discussion"
 
-#: ../finch/gntblist.c:767
+#: ../finch/gntblist.c:793
 msgid "Please Update the necessary fields."
 msgstr "Veuillez mettre à jour les champs nécessaires."
 
-#: ../finch/gntblist.c:768 ../finch/gntstatus.c:199
+#: ../finch/gntblist.c:794 ../finch/gntstatus.c:202
 msgid "Edit"
 msgstr "Modifier"
 
-#: ../finch/gntblist.c:784
+#: ../finch/gntblist.c:810
 msgid "Auto-join"
 msgstr "Connexion auto"
 
-#: ../finch/gntblist.c:793
+#: ../finch/gntblist.c:819
 msgid "Edit Settings"
 msgstr "Modifier les paramètres"
 
-#: ../finch/gntblist.c:831 ../finch/gntconv.c:317 ../pidgin/gtkblist.c:278
-#: ../pidgin/gtkconv.c:677
+#: ../finch/gntblist.c:855 ../pidgin/gtkutils.c:926
 msgid "Information"
 msgstr "Informations"
 
-#: ../finch/gntblist.c:831 ../finch/gntconv.c:317 ../pidgin/gtkblist.c:278
-#: ../pidgin/gtkconv.c:677
+#: ../finch/gntblist.c:855 ../pidgin/gtkutils.c:926
 msgid "Retrieving..."
 msgstr "Récupération en cours..."
 
-#: ../finch/gntblist.c:864 ../finch/gntconv.c:418
-#: ../libpurple/protocols/silc/chat.c:883
+#: ../finch/gntblist.c:895 ../finch/gntconv.c:407
+#: ../libpurple/protocols/silc/chat.c:899
+#: ../libpurple/protocols/silc10/chat.c:883
 msgid "Get Info"
 msgstr "Infos"
 
-#: ../finch/gntblist.c:868
+#: ../finch/gntblist.c:899
 msgid "Add Buddy Pounce"
 msgstr "Ajouter une alerte"
 
 #. if (q_bud && is_online(q_bud->status)) {
-#: ../finch/gntblist.c:875 ../finch/gntconv.c:430
-#: ../libpurple/protocols/oscar/oscar.c:636 ../libpurple/protocols/qq/qq.c:585
+#: ../finch/gntblist.c:906 ../finch/gntconv.c:419
+#: ../libpurple/protocols/jabber/si.c:868
+#: ../libpurple/protocols/oscar/oscar.c:654 ../libpurple/protocols/qq/qq.c:585
 #: ../pidgin/gtkconv.c:1599
 msgid "Send File"
 msgstr "Envoyer un fichier"
 
-#: ../finch/gntblist.c:879
+#: ../finch/gntblist.c:910
 msgid "View Log"
 msgstr "Voir les archives"
 
-#: ../finch/gntblist.c:960
+#: ../finch/gntblist.c:991
 #, c-format
 msgid "Please enter the new name for %s"
 msgstr "Saisissez le nouveau nom pour %s"
 
-#: ../finch/gntblist.c:962 ../finch/gntblist.c:1209
+#: ../finch/gntblist.c:993 ../finch/gntblist.c:1240
 msgid "Rename"
 msgstr "Renommer"
 
-#: ../finch/gntblist.c:962
+#: ../finch/gntblist.c:993
 msgid "Set Alias"
 msgstr "Alias"
 
-#: ../finch/gntblist.c:963
+#: ../finch/gntblist.c:994
 msgid "Enter empty string to reset the name."
 msgstr "Laissez la rubrique vide pour réinitialiser le nom."
 
-#: ../finch/gntblist.c:1039
+#: ../finch/gntblist.c:1070
 msgid "Removing this contact will also remove all the buddies in the contact"
 msgstr "Supprimer ce contact supprimera tous les noms d'utilisateur associés."
 
-#: ../finch/gntblist.c:1047
+#: ../finch/gntblist.c:1078
 msgid "Removing this group will also remove all the buddies in the group"
 msgstr "Supprimer ce groupe supprimera tous les contacts du groupe."
 
-#: ../finch/gntblist.c:1052
+#: ../finch/gntblist.c:1083
 #, c-format
 msgid "Are you sure you want to remove %s?"
 msgstr "Êtes-vous sûr de vouloir supprimer %s ?"
 
 #. XXX: anything to do with the returned ui-handle?
-#: ../finch/gntblist.c:1055
+#: ../finch/gntblist.c:1086
 msgid "Confirm Remove"
 msgstr "Confirmez la suppression"
 
-#: ../finch/gntblist.c:1060 ../finch/gntblist.c:1211 ../finch/gntft.c:223
-#: ../pidgin/gtkblist.c:1135 ../pidgin/gtkconv.c:1648
-#: ../pidgin/gtkrequest.c:275 ../pidgin/gtkstatusbox.c:261
+#: ../finch/gntblist.c:1091 ../finch/gntblist.c:1242 ../finch/gntft.c:224
+#: ../pidgin/gtkconv.c:1648 ../pidgin/gtkrequest.c:275
+#: ../pidgin/gtkstatusbox.c:263
 msgid "Remove"
 msgstr "Supprimer"
 
 #. Buddy List
-#: ../finch/gntblist.c:1185 ../finch/gntblist.c:2232 ../finch/gntprefs.c:240
-#: ../finch/gntui.c:77 ../pidgin/gtkblist.c:4209
+#: ../finch/gntblist.c:1216 ../finch/gntblist.c:2283 ../finch/gntprefs.c:257
+#: ../finch/gntui.c:78 ../pidgin/gtkblist.c:4256
 #: ../pidgin/plugins/win32/winprefs/winprefs.c:330
 msgid "Buddy List"
 msgstr "Liste de contacts"
 
-#: ../finch/gntblist.c:1216
+#: ../finch/gntblist.c:1247
 msgid "Place tagged"
 msgstr "Endroit marqué"
 
-#: ../finch/gntblist.c:1221
+#: ../finch/gntblist.c:1252
 msgid "Toggle Tag"
 msgstr "Basculer la marque"
 
 #. General
-#: ../finch/gntblist.c:1254 ../libpurple/protocols/gg/gg.c:632
-#: ../libpurple/protocols/gg/gg.c:1045 ../libpurple/protocols/gg/gg.c:1120
-#: ../libpurple/protocols/gg/gg.c:2204
+#: ../finch/gntblist.c:1287 ../libpurple/protocols/gg/gg.c:632
+#: ../libpurple/protocols/gg/gg.c:1045 ../libpurple/protocols/gg/gg.c:1118
+#: ../libpurple/protocols/gg/gg.c:2202
 #: ../libpurple/protocols/jabber/buddy.c:274
-#: ../libpurple/protocols/jabber/buddy.c:818
-#: ../libpurple/protocols/jabber/buddy.c:1589
-#: ../libpurple/protocols/jabber/buddy.c:1771
-#: ../libpurple/protocols/jabber/jabber.c:819
-#: ../libpurple/protocols/msn/msn.c:1367 ../libpurple/protocols/msn/msn.c:1535
+#: ../libpurple/protocols/jabber/buddy.c:856
+#: ../libpurple/protocols/jabber/buddy.c:1627
+#: ../libpurple/protocols/jabber/buddy.c:1809
+#: ../libpurple/protocols/jabber/jabber.c:823
+#: ../libpurple/protocols/msn/msn.c:1372 ../libpurple/protocols/msn/msn.c:1556
 #: ../libpurple/protocols/qq/buddy_info.c:43
 #: ../libpurple/protocols/silc/buddy.c:1535
-#: ../libpurple/protocols/silc/ops.c:1036
-#: ../libpurple/protocols/silc/ops.c:1179
-#: ../libpurple/protocols/silc/ops.c:1328
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1042 ../pidgin/gtkblist.c:2989
+#: ../libpurple/protocols/silc/ops.c:1002
+#: ../libpurple/protocols/silc/ops.c:1186
+#: ../libpurple/protocols/silc/ops.c:1322
+#: ../libpurple/protocols/silc10/buddy.c:1535
+#: ../libpurple/protocols/silc10/ops.c:1036
+#: ../libpurple/protocols/silc10/ops.c:1179
+#: ../libpurple/protocols/silc10/ops.c:1328
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1042 ../pidgin/gtkblist.c:2998
 msgid "Nickname"
 msgstr "Pseudonyme"
 
 #. Idle stuff
-#: ../finch/gntblist.c:1274 ../finch/gntprefs.c:243
-#: ../libpurple/protocols/bonjour/bonjour.c:322
-#: ../libpurple/protocols/jabber/buddy.c:643
-#: ../libpurple/protocols/jabber/buddy.c:683
+#: ../finch/gntblist.c:1307 ../finch/gntprefs.c:260
+#: ../libpurple/protocols/bonjour/bonjour.c:314
+#: ../libpurple/protocols/jabber/buddy.c:647
+#: ../libpurple/protocols/jabber/buddy.c:687
 #: ../libpurple/protocols/msn/msn.c:516 ../libpurple/protocols/msn/state.c:32
 #: ../libpurple/protocols/novell/novell.c:2825
-#: ../libpurple/protocols/oscar/oscar.c:2867
-#: ../libpurple/protocols/yahoo/yahoo.c:2898
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:686 ../pidgin/gtkblist.c:3009
-#: ../pidgin/gtkblist.c:3399 ../pidgin/gtkprefs.c:1809
+#: ../libpurple/protocols/oscar/oscar.c:2888
+#: ../libpurple/protocols/yahoo/yahoo.c:2915
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:686 ../pidgin/gtkblist.c:3026
+#: ../pidgin/gtkblist.c:3435 ../pidgin/gtkprefs.c:1918
 msgid "Idle"
 msgstr "Inactif"
 
-#: ../finch/gntblist.c:1363
+#: ../finch/gntblist.c:1320
+msgid "On Mobile"
+msgstr "Sur téléphone portable"
+
+#: ../finch/gntblist.c:1400
 #, c-format
 msgid ""
 "Online: %d\n"
@@ -539,12 +572,12 @@
 "Connectés : %d\n"
 "Total : %d"
 
-#: ../finch/gntblist.c:1372
+#: ../finch/gntblist.c:1409
 #, c-format
 msgid "Account: %s (%s)"
 msgstr "Compte : %s (%s)"
 
-#: ../finch/gntblist.c:1384
+#: ../finch/gntblist.c:1421
 #, c-format
 msgid ""
 "\n"
@@ -553,162 +586,162 @@
 "\n"
 "Vu récemment : il y a %s"
 
-#: ../finch/gntblist.c:1649 ../pidgin/gtkdocklet.c:470
-#: ../pidgin/gtkstatusbox.c:1064
+#: ../finch/gntblist.c:1687 ../pidgin/gtkdocklet.c:470
+#: ../pidgin/gtkstatusbox.c:1070
 msgid "New..."
 msgstr "Nouveau..."
 
-#: ../finch/gntblist.c:1656 ../pidgin/gtkdocklet.c:471
-#: ../pidgin/gtkstatusbox.c:1065
+#: ../finch/gntblist.c:1694 ../pidgin/gtkdocklet.c:471
+#: ../pidgin/gtkstatusbox.c:1071
 msgid "Saved..."
 msgstr "Sauvé..."
 
-#: ../finch/gntblist.c:2028 ../finch/gntplugin.c:244 ../finch/gntui.c:81
+#: ../finch/gntblist.c:2072 ../finch/gntplugin.c:254 ../finch/gntui.c:82
 #: ../pidgin/gtkdocklet.c:523 ../pidgin/gtkplugin.c:530
 msgid "Plugins"
 msgstr "Plugins"
 
-#: ../finch/gntblist.c:2136 ../pidgin/gtkdialogs.c:706
-#: ../pidgin/gtkdialogs.c:844 ../pidgin/gtkdialogs.c:925
+#: ../finch/gntblist.c:2179 ../pidgin/gtkdialogs.c:708
+#: ../pidgin/gtkdialogs.c:846 ../pidgin/gtkdialogs.c:927
 msgid "_Name"
 msgstr "_Nom"
 
-#: ../finch/gntblist.c:2141 ../pidgin/gtkdialogs.c:711
-#: ../pidgin/gtkdialogs.c:849 ../pidgin/gtkdialogs.c:930
+#: ../finch/gntblist.c:2184 ../pidgin/gtkdialogs.c:713
+#: ../pidgin/gtkdialogs.c:851 ../pidgin/gtkdialogs.c:932
 msgid "_Account"
 msgstr "C_ompte"
 
-#: ../finch/gntblist.c:2149 ../pidgin/gtkdialogs.c:719
+#: ../finch/gntblist.c:2192 ../pidgin/gtkdialogs.c:721
 msgid "New Instant Message"
 msgstr "Nouveau message"
 
-#: ../finch/gntblist.c:2151 ../pidgin/gtkdialogs.c:721
+#: ../finch/gntblist.c:2194 ../pidgin/gtkdialogs.c:723
 msgid ""
 "Please enter the screen name or alias of the person you would like to IM."
 msgstr ""
 "Saisissez le nom d'utilisateur ou l'alias du destinataire pour le message."
 
-#: ../finch/gntblist.c:2154 ../finch/gntconn.c:48 ../finch/gntnotify.c:77
-#: ../libpurple/account.c:983 ../libpurple/account.c:1233
-#: ../libpurple/protocols/gg/gg.c:501 ../libpurple/protocols/gg/gg.c:660
-#: ../libpurple/protocols/gg/gg.c:797
+#: ../finch/gntblist.c:2197 ../finch/gntnotify.c:79 ../libpurple/account.c:983
+#: ../libpurple/account.c:1233 ../libpurple/protocols/gg/gg.c:501
+#: ../libpurple/protocols/gg/gg.c:660 ../libpurple/protocols/gg/gg.c:797
 #: ../libpurple/protocols/jabber/jabber.c:1383
 #: ../libpurple/protocols/jabber/xdata.c:336
 #: ../libpurple/protocols/msn/msn.c:258 ../libpurple/protocols/msn/msn.c:275
 #: ../libpurple/protocols/msn/msn.c:292 ../libpurple/protocols/msn/msn.c:309
-#: ../libpurple/protocols/oscar/oscar.c:6003
-#: ../libpurple/protocols/silc/buddy.c:467
-#: ../libpurple/protocols/silc/buddy.c:1188
-#: ../libpurple/protocols/silc/chat.c:425
-#: ../libpurple/protocols/silc/chat.c:464
-#: ../libpurple/protocols/silc/chat.c:729
-#: ../libpurple/protocols/silc/ops.c:1297
-#: ../libpurple/protocols/silc/ops.c:1912
-#: ../libpurple/protocols/silc/silc.c:743
-#: ../libpurple/protocols/yahoo/yahoo.c:986
-#: ../libpurple/protocols/yahoo/yahoo.c:3230
-#: ../libpurple/protocols/yahoo/yahoo.c:3241 ../pidgin/gtkblist.c:3964
-#: ../pidgin/gtkdialogs.c:724 ../pidgin/gtkdialogs.c:862
-#: ../pidgin/gtkdialogs.c:954 ../pidgin/gtkrequest.c:269
+#: ../libpurple/protocols/oscar/oscar.c:6072
+#: ../libpurple/protocols/silc/buddy.c:454
+#: ../libpurple/protocols/silc/buddy.c:1190
+#: ../libpurple/protocols/silc/chat.c:447
+#: ../libpurple/protocols/silc/chat.c:482
+#: ../libpurple/protocols/silc/chat.c:745
+#: ../libpurple/protocols/silc/ops.c:1291
+#: ../libpurple/protocols/silc/ops.c:1815
+#: ../libpurple/protocols/silc/silc.c:822
+#: ../libpurple/protocols/silc10/buddy.c:467
+#: ../libpurple/protocols/silc10/buddy.c:1188
+#: ../libpurple/protocols/silc10/chat.c:425
+#: ../libpurple/protocols/silc10/chat.c:464
+#: ../libpurple/protocols/silc10/chat.c:729
+#: ../libpurple/protocols/silc10/ops.c:1297
+#: ../libpurple/protocols/silc10/ops.c:1903
+#: ../libpurple/protocols/silc10/silc.c:735
+#: ../libpurple/protocols/yahoo/yahoo.c:988
+#: ../libpurple/protocols/yahoo/yahoo.c:3247
+#: ../libpurple/protocols/yahoo/yahoo.c:3258 ../pidgin/gtkblist.c:4013
+#: ../pidgin/gtkdialogs.c:726 ../pidgin/gtkdialogs.c:864
+#: ../pidgin/gtkdialogs.c:956 ../pidgin/gtkrequest.c:269
 msgid "OK"
 msgstr "OK"
 
 #. Create the "Options" frame.
-#: ../finch/gntblist.c:2174 ../finch/gntpounce.c:444 ../pidgin/gtkpounce.c:778
+#: ../finch/gntblist.c:2217 ../finch/gntpounce.c:444 ../pidgin/gtkpounce.c:791
 msgid "Options"
 msgstr "Options"
 
-#: ../finch/gntblist.c:2180
+#: ../finch/gntblist.c:2223
 msgid "Send IM..."
 msgstr "Message..."
 
-#: ../finch/gntblist.c:2184
+#: ../finch/gntblist.c:2227
+msgid "Show empty groups"
+msgstr "Afficher les groupes vides"
+
+#: ../finch/gntblist.c:2233
 msgid "Show offline buddies"
 msgstr "Afficher les contacts déconnectés"
 
-#: ../finch/gntblist.c:2190
+#: ../finch/gntblist.c:2239
 msgid "Sort by status"
 msgstr "Tri par état"
 
-#: ../finch/gntblist.c:2194
+#: ../finch/gntblist.c:2243
 msgid "Sort alphabetically"
 msgstr "Tri alphabétique"
 
-#: ../finch/gntblist.c:2198
+#: ../finch/gntblist.c:2247
 msgid "Sort by log size"
 msgstr "Tri par la taille des archives"
 
-#: ../finch/gntconn.c:38
+#: ../finch/gntconn.c:110
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../finch/gntconn.c:41
+#: ../finch/gntconn.c:113
 #, c-format
 msgid "%s disconnected."
 msgstr "Déconnexion de %s."
 
-#: ../finch/gntconn.c:42
-#, c-format
-msgid ""
-"%s was disconnected due to the following error:\n"
-"%s"
-msgstr ""
-"L'erreur suivante a provoqué la déconnexion de %s :\n"
-"%s"
-
-#: ../finch/gntconn.c:45 ../libpurple/account.c:1012
-#: ../libpurple/connection.c:107 ../pidgin/gtkblist.c:3961
-msgid "Connection Error"
-msgstr "Erreur de connexion"
-
-#: ../finch/gntconn.c:49 ../libpurple/protocols/sametime/sametime.c:3644
-#: ../pidgin/gtkblist.c:3966
-msgid "Connect"
-msgstr "Connecter"
-
-#: ../finch/gntconv.c:116
+#: ../finch/gntconn.c:114
+#, c-format
+msgid ""
+"%s\n"
+"\n"
+"Finch will not attempt to reconnect the account until you correct the error "
+"and re-enable the account."
+msgstr ""
+"%s\n"
+"\n"
+"Finch n'essaiera pas de se reconnecter avec le compte tant que cette erreur ne "
+"sera pas corrigée et que vous n'aurez pas réactivé le compte."
+
+#: ../finch/gntconv.c:117
 msgid "No such command."
 msgstr "Cette commande n'existe pas."
 
-#: ../finch/gntconv.c:120 ../pidgin/gtkconv.c:508
+#: ../finch/gntconv.c:121 ../pidgin/gtkconv.c:492
 msgid "Syntax Error:  You typed the wrong number of arguments to that command."
 msgstr "Erreur de syntaxe : mauvais nombre d'arguments pour cette commande."
 
-#: ../finch/gntconv.c:125 ../pidgin/gtkconv.c:513
+#: ../finch/gntconv.c:126 ../pidgin/gtkconv.c:498
 msgid "Your command failed for an unknown reason."
 msgstr "La commande a échoué pour une raison inconnue."
 
-#: ../finch/gntconv.c:130 ../pidgin/gtkconv.c:519
+#: ../finch/gntconv.c:131 ../pidgin/gtkconv.c:505
 msgid "That command only works in chats, not IMs."
 msgstr ""
 "Cette commande fonctionne uniquement dans les discussions, pas les messages."
 
-#: ../finch/gntconv.c:133 ../pidgin/gtkconv.c:522
+#: ../finch/gntconv.c:134 ../pidgin/gtkconv.c:508
 msgid "That command only works in IMs, not chats."
 msgstr ""
 "Cette commande fonctionne uniquement dans les messages, pas les discussions."
 
-#: ../finch/gntconv.c:137 ../pidgin/gtkconv.c:526
+#: ../finch/gntconv.c:138 ../pidgin/gtkconv.c:513
 msgid "That command doesn't work on this protocol."
 msgstr "Cette commande ne fonctionne pas avec ce protocole."
 
-#: ../finch/gntconv.c:144
-msgid "Commands are not supported yet. Message was NOT sent."
-msgstr ""
-"Les commandes ne sont pas encore supportées. Le message n'a pas été envoyé."
-
-#: ../finch/gntconv.c:230
+#: ../finch/gntconv.c:224
 #, c-format
 msgid "%s (%s -- %s)"
 msgstr "%s (%s -- %s)"
 
-#: ../finch/gntconv.c:253
+#: ../finch/gntconv.c:247
 #, c-format
 msgid "%s [%s]"
 msgstr "%s [%s]"
 
-#: ../finch/gntconv.c:258 ../finch/gntconv.c:619
+#: ../finch/gntconv.c:252 ../finch/gntconv.c:647
 #, c-format
 msgid ""
 "\n"
@@ -717,48 +750,48 @@
 "\n"
 "%s est en train d'écrire..."
 
-#: ../finch/gntconv.c:277
+#: ../finch/gntconv.c:271
 msgid "You have left this chat."
 msgstr "Vous avez quitté la discussion."
 
-#: ../finch/gntconv.c:353
+#: ../finch/gntconv.c:342
 msgid "Send To"
 msgstr "Envoyer vers"
 
-#: ../finch/gntconv.c:397
+#: ../finch/gntconv.c:386
 msgid "Conversation"
 msgstr "Conversation"
 
-#: ../finch/gntconv.c:403
+#: ../finch/gntconv.c:392
 msgid "Clear Scrollback"
 msgstr "Effacer la conversation"
 
-#: ../finch/gntconv.c:407 ../finch/gntprefs.c:178
+#: ../finch/gntconv.c:396 ../finch/gntprefs.c:190
 msgid "Show Timestamps"
 msgstr "Afficher l'horodatage"
 
-#: ../finch/gntconv.c:423
+#: ../finch/gntconv.c:412
 msgid "Add Buddy Pounce..."
 msgstr "Ajouter une alerte..."
 
-#: ../finch/gntconv.c:586
+#: ../finch/gntconv.c:614
 msgid "<AUTO-REPLY> "
 msgstr "<Réponse automatique> "
 
 #. Print the list of users in the room
-#: ../finch/gntconv.c:702
+#: ../finch/gntconv.c:735
 msgid "List of users:\n"
 msgstr "Liste des utilisateurs :\n"
 
-#: ../finch/gntconv.c:847 ../pidgin/gtkconv.c:389
+#: ../finch/gntconv.c:880 ../pidgin/gtkconv.c:335
 msgid "Supported debug options are:  version"
 msgstr "Les options de débuggage supportées sont : version"
 
-#: ../finch/gntconv.c:882 ../pidgin/gtkconv.c:425
+#: ../finch/gntconv.c:915 ../pidgin/gtkconv.c:384
 msgid "No such command (in this context)."
 msgstr "Cette commande n'existe pas dans ce contexte."
 
-#: ../finch/gntconv.c:885 ../pidgin/gtkconv.c:428
+#: ../finch/gntconv.c:918 ../pidgin/gtkconv.c:387
 msgid ""
 "Use \"/help &lt;command&gt;\" for help on a specific command.\n"
 "The following commands are available in this context:\n"
@@ -767,7 +800,7 @@
 "spécifique.\n"
 "Les commandes disponibles dans le contexte actuel sont :\n"
 
-#: ../finch/gntconv.c:943 ../pidgin/gtkconv.c:7085
+#: ../finch/gntconv.c:976 ../pidgin/gtkconv.c:7198
 msgid ""
 "say &lt;message&gt;:  Send a message normally as if you weren't using a "
 "command."
@@ -775,13 +808,13 @@
 "say &lt;message&gt; : Envoyer un message comme si les commandes étaient "
 "désactivées."
 
-#: ../finch/gntconv.c:946 ../pidgin/gtkconv.c:7088
+#: ../finch/gntconv.c:979 ../pidgin/gtkconv.c:7201
 msgid "me &lt;action&gt;:  Send an IRC style action to a buddy or chat."
 msgstr ""
 "me &lt;action&gt; : Envoyer une action à la IRC à un contact ou une "
 "discussion."
 
-#: ../finch/gntconv.c:949 ../pidgin/gtkconv.c:7091
+#: ../finch/gntconv.c:982 ../pidgin/gtkconv.c:7204
 msgid ""
 "debug &lt;option&gt;:  Send various debug information to the current "
 "conversation."
@@ -789,44 +822,44 @@
 "debug &lt;option&gt; : Mettre en place des options de débuggage dans la "
 "conversation courante."
 
-#: ../finch/gntconv.c:952 ../pidgin/gtkconv.c:7094
+#: ../finch/gntconv.c:985 ../pidgin/gtkconv.c:7207
 msgid "clear: Clears the conversation scrollback."
 msgstr "clear : Effacer le contenu de la fenêtre de conversation."
 
-#: ../finch/gntconv.c:955 ../pidgin/gtkconv.c:7097
+#: ../finch/gntconv.c:988 ../pidgin/gtkconv.c:7213
 msgid "help &lt;command&gt;:  Help on a specific command."
 msgstr ""
 "help &lt;commande&gt; : Demander de l'aide sur une commande particulière."
 
-#: ../finch/gntconv.c:958
+#: ../finch/gntconv.c:991
 msgid "users:  Show the list of users in the chat."
 msgstr "users : Afficher la listes des utilisateurs dans le salon."
 
-#: ../finch/gntconv.c:963
+#: ../finch/gntconv.c:996
 msgid "plugins: Show the plugins window."
 msgstr "plugins : Afficher la fenêtre des plugins."
 
-#: ../finch/gntconv.c:966
+#: ../finch/gntconv.c:999
 msgid "buddylist: Show the buddylist."
 msgstr "buddylist : Afficher la liste de contacts."
 
-#: ../finch/gntconv.c:969
+#: ../finch/gntconv.c:1002
 msgid "accounts: Show the accounts window."
 msgstr "accounts : Afficher la fenêtre des comptes."
 
-#: ../finch/gntconv.c:972
+#: ../finch/gntconv.c:1005
 msgid "debugwin: Show the debug window."
 msgstr "debugwin : Afficher la fenêtre de débuggage."
 
-#: ../finch/gntconv.c:975
+#: ../finch/gntconv.c:1008
 msgid "prefs: Show the preference window."
 msgstr "prefs : Afficher la fenêtre des options."
 
-#: ../finch/gntconv.c:978
+#: ../finch/gntconv.c:1011
 msgid "statuses: Show the savedstatuses window."
 msgstr "statuses : Afficher la fenêtre des états sauvegardés."
 
-#: ../finch/gntdebug.c:230 ../finch/gntui.c:79 ../pidgin/gtkdebug.c:693
+#: ../finch/gntdebug.c:234 ../finch/gntui.c:80 ../pidgin/gtkdebug.c:694
 msgid "Debug Window"
 msgstr "Fenêtre de debug"
 
@@ -834,15 +867,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:251 ../pidgin/gtkdebug.c:752
+#: ../finch/gntdebug.c:255 ../pidgin/gtkdebug.c:753
 msgid "Clear"
 msgstr "Effacer"
 
-#: ../finch/gntdebug.c:257
+#: ../finch/gntdebug.c:261
 msgid "Filter: "
 msgstr "Filtrer : "
 
-#: ../finch/gntdebug.c:261 ../pidgin/gtkdebug.c:761
+#: ../finch/gntdebug.c:265 ../pidgin/gtkdebug.c:762
 msgid "Pause"
 msgstr "Pause"
 
@@ -851,175 +884,177 @@
 msgid "File Transfers - %d%% of %d files"
 msgstr "Transfert - %d%% de %d fichiers."
 
-#: ../finch/gntft.c:122 ../finch/gntft.c:194 ../finch/gntui.c:80
-#: ../pidgin/gtkft.c:233 ../pidgin/gtkft.c:763
+#. Create the window.
+#: ../finch/gntft.c:122 ../finch/gntft.c:195 ../finch/gntui.c:81
+#: ../pidgin/gtkft.c:233 ../pidgin/gtkft.c:761
 msgid "File Transfers"
 msgstr "Transferts de fichiers"
 
-#: ../finch/gntft.c:197 ../pidgin/gtkft.c:644
+#: ../finch/gntft.c:198 ../pidgin/gtkft.c:644
 msgid "Progress"
 msgstr "État"
 
-#: ../finch/gntft.c:197 ../pidgin/gtkft.c:651
+#: ../finch/gntft.c:198 ../pidgin/gtkft.c:651
 msgid "Filename"
 msgstr "Fichier"
 
-#: ../finch/gntft.c:197 ../pidgin/gtkft.c:658
+#: ../finch/gntft.c:198 ../pidgin/gtkft.c:658
 msgid "Size"
 msgstr "Taille"
 
-#: ../finch/gntft.c:197
+#: ../finch/gntft.c:198
 msgid "Speed"
 msgstr "Vitesse"
 
-#: ../finch/gntft.c:197 ../pidgin/gtkft.c:665
+#: ../finch/gntft.c:198 ../pidgin/gtkft.c:665
 msgid "Remaining"
 msgstr "Reste"
 
 #. XXX: Use of ggp_str_to_uin() is an ugly hack!
-#: ../finch/gntft.c:197 ../finch/gntstatus.c:537 ../finch/gntstatus.c:566
-#: ../libpurple/protocols/bonjour/bonjour.c:326
-#: ../libpurple/protocols/gg/gg.c:1034 ../libpurple/protocols/gg/gg.c:1573
-#: ../libpurple/protocols/gg/gg.c:1581
-#: ../libpurple/protocols/jabber/buddy.c:634
+#: ../finch/gntft.c:198 ../finch/gntstatus.c:540 ../finch/gntstatus.c:569
+#: ../libpurple/protocols/bonjour/bonjour.c:318
+#: ../libpurple/protocols/gg/gg.c:1034 ../libpurple/protocols/gg/gg.c:1571
+#: ../libpurple/protocols/gg/gg.c:1579
 #: ../libpurple/protocols/jabber/buddy.c:638
-#: ../libpurple/protocols/jabber/buddy.c:673
-#: ../libpurple/protocols/jabber/jabber.c:1214
+#: ../libpurple/protocols/jabber/buddy.c:642
+#: ../libpurple/protocols/jabber/buddy.c:677
+#: ../libpurple/protocols/jabber/jabber.c:1212
 #: ../libpurple/protocols/msn/msn.c:515
 #: ../libpurple/protocols/novell/novell.c:2835
-#: ../libpurple/protocols/oscar/oscar.c:803
-#: ../libpurple/protocols/oscar/oscar.c:808
-#: ../libpurple/protocols/oscar/oscar.c:810
-#: ../libpurple/protocols/oscar/oscar.c:2656
-#: ../libpurple/protocols/oscar/oscar.c:3767
+#: ../libpurple/protocols/oscar/oscar.c:821
+#: ../libpurple/protocols/oscar/oscar.c:826
+#: ../libpurple/protocols/oscar/oscar.c:828
+#: ../libpurple/protocols/oscar/oscar.c:2676
+#: ../libpurple/protocols/oscar/oscar.c:3794
 #: ../libpurple/protocols/sametime/sametime.c:3263
 #: ../libpurple/protocols/sametime/sametime.c:4150
-#: ../libpurple/protocols/yahoo/yahoo.c:3049 ../pidgin/gtkblist.c:3053
-#: ../pidgin/gtkblist.c:3066 ../pidgin/gtkblist.c:3068
-#: ../pidgin/gtksavedstatuses.c:943 ../pidgin/gtksavedstatuses.c:1090
+#: ../libpurple/protocols/yahoo/yahoo.c:3066 ../pidgin/gtkblist.c:3070
+#: ../pidgin/gtkblist.c:3083 ../pidgin/gtkblist.c:3085
+#: ../pidgin/gtksavedstatuses.c:998 ../pidgin/gtksavedstatuses.c:1143
 msgid "Status"
 msgstr "État"
 
-#: ../finch/gntft.c:207
+#: ../finch/gntft.c:208
 msgid "Close this window when all transfers finish"
 msgstr "Fermer cette fenêtre quand tous les transferts sont terminés"
 
-#: ../finch/gntft.c:214
+#: ../finch/gntft.c:215
 msgid "Clear finished transfers"
 msgstr "Effacer les transferts terminés"
 
-#: ../finch/gntft.c:228
+#: ../finch/gntft.c:229
 msgid "Stop"
 msgstr "Arrêter"
 
 #. Close button
-#: ../finch/gntft.c:233 ../finch/gntnotify.c:179 ../finch/gntplugin.c:205
-#: ../finch/gntplugin.c:291 ../finch/gntpounce.c:722 ../finch/gntstatus.c:209
-#: ../libpurple/protocols/msn/msn.c:375 ../libpurple/protocols/silc/util.c:377
-#: ../pidgin/gtkaccount.c:2458 ../pidgin/gtkrequest.c:272
+#: ../finch/gntft.c:234 ../finch/gntnotify.c:181 ../finch/gntplugin.c:209
+#: ../finch/gntplugin.c:309 ../finch/gntpounce.c:723 ../finch/gntstatus.c:212
+#: ../libpurple/protocols/msn/msn.c:375 ../libpurple/protocols/silc/util.c:382
+#: ../libpurple/protocols/silc10/util.c:377 ../pidgin/gtkaccount.c:2474
+#: ../pidgin/gtkrequest.c:272
 msgid "Close"
 msgstr "Fermer"
 
-#: ../finch/gntft.c:299 ../pidgin/gtkft.c:168 ../pidgin/gtkft.c:975
+#: ../finch/gntft.c:302 ../pidgin/gtkft.c:168 ../pidgin/gtkft.c:972
 msgid "Waiting for transfer to begin"
 msgstr "En attente de début de transfert"
 
-#: ../finch/gntft.c:366 ../pidgin/gtkft.c:165 ../pidgin/gtkft.c:1056
+#: ../finch/gntft.c:369 ../pidgin/gtkft.c:165 ../pidgin/gtkft.c:1053
 msgid "Canceled"
 msgstr "Annulé"
 
-#: ../finch/gntft.c:368 ../pidgin/gtkft.c:1058
+#: ../finch/gntft.c:371 ../pidgin/gtkft.c:1055
 msgid "Failed"
 msgstr "Échec"
 
-#: ../finch/gntft.c:414 ../pidgin/gtkft.c:133
-#, c-format
-msgid "%.2f KB/s"
+#: ../finch/gntft.c:417 ../pidgin/gtkft.c:133
+#, c-format
+msgid "%.2f KiB/s"
 msgstr "%.2f Ko/s"
 
-#: ../finch/gntft.c:425 ../finch/gntft.c:426 ../pidgin/gtkft.c:162
-#: ../pidgin/gtkft.c:1118
+#: ../finch/gntft.c:428 ../finch/gntft.c:429 ../pidgin/gtkft.c:162
+#: ../pidgin/gtkft.c:1115
 msgid "Finished"
 msgstr "Fini"
 
-#: ../finch/gntft.c:428 ../libpurple/protocols/msn/session.c:346
+#: ../finch/gntft.c:431 ../libpurple/protocols/msn/session.c:347
 msgid "Transferring"
 msgstr "Transfert"
 
-#: ../finch/gntnotify.c:162
+#: ../finch/gntnotify.c:164
 msgid "Emails"
 msgstr "Courriers électroniques"
 
-#: ../finch/gntnotify.c:168 ../finch/gntnotify.c:222
+#: ../finch/gntnotify.c:170 ../finch/gntnotify.c:224
 msgid "You have mail!"
 msgstr "Vous avez du courrier !"
 
-#: ../finch/gntnotify.c:171 ../libpurple/protocols/jabber/jabber.c:1174
-msgid "From"
-msgstr "De"
-
-#: ../finch/gntnotify.c:171 ../pidgin/gtknotify.c:490
+#: ../finch/gntnotify.c:173 ../pidgin/gtknotify.c:489
+msgid "Sender"
+msgstr "Expéditeur"
+
+#: ../finch/gntnotify.c:173 ../pidgin/gtknotify.c:496
 msgid "Subject"
 msgstr "Sujet"
 
-#: ../finch/gntnotify.c:198
+#: ../finch/gntnotify.c:200
 #, c-format
 msgid "%s (%s) has %d new message."
 msgid_plural "%s (%s) has %d new messages."
 msgstr[0] "%s (%s) a reçu %d nouveau message."
 msgstr[1] "%s (%s) a reçu %d nouveaux messages."
 
-#: ../finch/gntnotify.c:222 ../pidgin/gtknotify.c:329
+#: ../finch/gntnotify.c:224 ../pidgin/gtknotify.c:335
 msgid "New Mail"
 msgstr "Nouveau courrier"
 
-#: ../finch/gntnotify.c:287 ../pidgin/gtknotify.c:906
+#: ../finch/gntnotify.c:289 ../pidgin/gtknotify.c:916
 #, c-format
 msgid "Info for %s"
 msgstr "Informations pour %s"
 
-#: ../finch/gntnotify.c:288 ../libpurple/protocols/toc/toc.c:476
-#: ../pidgin/gtknotify.c:907
+#: ../finch/gntnotify.c:290 ../libpurple/protocols/toc/toc.c:476
+#: ../pidgin/gtknotify.c:917
 msgid "Buddy Information"
 msgstr "Informations sur le contact"
 
-#: ../finch/gntnotify.c:366
+#: ../finch/gntnotify.c:376
 msgid "Continue"
 msgstr "Continuer"
 
-#: ../finch/gntnotify.c:372 ../pidgin/gtkconv.c:1627 ../pidgin/gtkdebug.c:833
+#: ../finch/gntnotify.c:382 ../pidgin/gtkconv.c:1627 ../pidgin/gtkdebug.c:834
 msgid "Info"
 msgstr "Infos"
 
-#: ../finch/gntnotify.c:375 ../pidgin/gtkconv.c:1588
+#: ../finch/gntnotify.c:385 ../pidgin/gtkconv.c:1588
 msgid "IM"
 msgstr "Message"
 
-#: ../finch/gntnotify.c:378
+#: ../finch/gntnotify.c:388
 msgid "Join"
 msgstr "Discuter"
 
-#: ../finch/gntnotify.c:381 ../libpurple/protocols/sametime/sametime.c:3473
+#: ../finch/gntnotify.c:391 ../libpurple/protocols/sametime/sametime.c:3473
 msgid "Invite"
 msgstr "Inviter"
 
-#: ../finch/gntnotify.c:384
+#: ../finch/gntnotify.c:394
 msgid "(none)"
 msgstr "(aucun)"
 
-#: ../finch/gntplugin.c:73 ../finch/gntplugin.c:82
+#: ../finch/gntplugin.c:74 ../finch/gntplugin.c:83
 msgid "ERROR"
 msgstr "Erreur"
 
-#: ../finch/gntplugin.c:73
+#: ../finch/gntplugin.c:74
 msgid "loading plugin failed"
 msgstr "Échec du chargement du plugin."
 
-#: ../finch/gntplugin.c:82
+#: ../finch/gntplugin.c:83
 msgid "unloading plugin failed"
 msgstr "Échec du déchargement du plugin."
 
-#: ../finch/gntplugin.c:124
+#: ../finch/gntplugin.c:128
 #, c-format
 msgid ""
 "Name: %s\n"
@@ -1036,36 +1071,42 @@
 "Site web : %s\n"
 "Fichier : %s\n"
 
-#: ../finch/gntplugin.c:182
+#: ../finch/gntplugin.c:186
 msgid "Plugin need to be loaded before you can configure it."
 msgstr "Le plugin doit être chargé avant de pouvoir le configurer."
 
-#: ../finch/gntplugin.c:226
+#: ../finch/gntplugin.c:234
 msgid "No configuration options for this plugin."
 msgstr "Aucune option à configurer pour ce plugin."
 
-#: ../finch/gntplugin.c:249
+#: ../finch/gntplugin.c:259
 msgid "You can (un)load plugins from the following list."
 msgstr "Vous pouvez charger/décharger les plugins de la liste suivante."
 
-#: ../finch/gntplugin.c:296
+#: ../finch/gntplugin.c:314
 msgid "Configure Plugin"
 msgstr "Configurer le plugin"
 
-#: ../finch/gntplugin.c:352 ../finch/gntplugin.c:359 ../finch/gntprefs.c:245
-#: ../finch/gntui.c:82 ../pidgin/gtkdocklet.c:524 ../pidgin/gtkprefs.c:1953
+#. copy the preferences to tmp values...
+#. * I liked "take affect immediately" Oh well :-(
+#. (that should have been "effect," right?)
+#. Back to instant-apply! I win!  BU-HAHAHA!
+#. Create the window
+#: ../finch/gntplugin.c:370 ../finch/gntplugin.c:377 ../finch/gntprefs.c:263
+#: ../finch/gntui.c:83 ../pidgin/gtkdocklet.c:524 ../pidgin/gtkprefs.c:2060
 msgid "Preferences"
 msgstr "Préférences"
 
-#: ../finch/gntpounce.c:180 ../pidgin/gtkpounce.c:253
+#: ../finch/gntpounce.c:180 ../pidgin/gtkpounce.c:255
 msgid "Please enter a buddy to pounce."
 msgstr "Choisissez un contact pour la création d'une alerte"
 
-#: ../finch/gntpounce.c:325 ../pidgin/gtkpounce.c:507
+#. Create the window.
+#: ../finch/gntpounce.c:325 ../pidgin/gtkpounce.c:516
 msgid "New Buddy Pounce"
 msgstr "Nouvelle alerte"
 
-#: ../finch/gntpounce.c:325 ../pidgin/gtkpounce.c:507
+#: ../finch/gntpounce.c:325 ../pidgin/gtkpounce.c:516
 msgid "Edit Buddy Pounce"
 msgstr "Modifier une alerte"
 
@@ -1074,9 +1115,7 @@
 msgstr "Alerte pour"
 
 #. Account:
-#. Set up stuff for the account box
-#: ../finch/gntpounce.c:333 ../finch/gntstatus.c:446 ../pidgin/gtkblist.c:5437
-#: ../pidgin/gtkblist.c:5753
+#: ../finch/gntpounce.c:333 ../finch/gntstatus.c:449
 msgid "Account:"
 msgstr "Compte :"
 
@@ -1085,7 +1124,7 @@
 msgstr "Contact :"
 
 #. Create the "Pounce When Buddy..." frame.
-#: ../finch/gntpounce.c:371 ../pidgin/gtkpounce.c:577
+#: ../finch/gntpounce.c:371 ../pidgin/gtkpounce.c:586
 msgid "Pounce When Buddy..."
 msgstr "Déclenchement quand le contact..."
 
@@ -1130,7 +1169,7 @@
 msgstr "Envoi d'un message"
 
 #. Create the "Action" frame.
-#: ../finch/gntpounce.c:411 ../pidgin/gtkpounce.c:638
+#: ../finch/gntpounce.c:411 ../pidgin/gtkpounce.c:647
 msgid "Action"
 msgstr "Action"
 
@@ -1158,248 +1197,265 @@
 msgid "Pounce only when my status is not available"
 msgstr "Alerter uniquement quand mon état est non disponible"
 
-#: ../finch/gntpounce.c:447 ../pidgin/gtkpounce.c:1282
+#: ../finch/gntpounce.c:447 ../pidgin/gtkpounce.c:1295
 msgid "Recurring"
 msgstr "Récurrente"
 
-#: ../finch/gntpounce.c:649 ../pidgin/gtkpounce.c:1097
+#: ../finch/gntpounce.c:649 ../pidgin/gtkpounce.c:1110
 #, c-format
 msgid "Are you sure you want to delete the pounce on %s for %s?"
 msgstr "Êtes-vous sûr de vouloir supprimer l'alerte sur %s pour %s ?"
 
-#: ../finch/gntpounce.c:682 ../finch/gntui.c:78 ../pidgin/gtkpounce.c:1329
+#: ../finch/gntpounce.c:683 ../finch/gntui.c:79 ../pidgin/gtkpounce.c:1339
 msgid "Buddy Pounces"
 msgstr "Alertes"
 
-#: ../finch/gntpounce.c:794 ../pidgin/gtkpounce.c:1456
+#: ../finch/gntpounce.c:795 ../pidgin/gtkpounce.c:1466
 #, c-format
 msgid "%s has started typing to you (%s)"
 msgstr "%s est en train de vous écrire (%s)"
 
-#: ../finch/gntpounce.c:796 ../pidgin/gtkpounce.c:1458
+#: ../finch/gntpounce.c:797 ../pidgin/gtkpounce.c:1468
 #, c-format
 msgid "%s has paused while typing to you (%s)"
 msgstr "%s a fait une pause dans la saisie du message (%s)"
 
-#: ../finch/gntpounce.c:798 ../pidgin/gtkpounce.c:1460
+#: ../finch/gntpounce.c:799 ../pidgin/gtkpounce.c:1470
 #, c-format
 msgid "%s has signed on (%s)"
 msgstr "%s vient de se connecter (%s)"
 
-#: ../finch/gntpounce.c:800 ../pidgin/gtkpounce.c:1462
+#: ../finch/gntpounce.c:801 ../pidgin/gtkpounce.c:1472
 #, c-format
 msgid "%s has returned from being idle (%s)"
 msgstr "%s n'est plus inactif (%s)"
 
-#: ../finch/gntpounce.c:802 ../pidgin/gtkpounce.c:1464
+#: ../finch/gntpounce.c:803 ../pidgin/gtkpounce.c:1474
 #, c-format
 msgid "%s has returned from being away (%s)"
 msgstr "%s n'est plus absent (%s)"
 
-#: ../finch/gntpounce.c:804 ../pidgin/gtkpounce.c:1466
+#: ../finch/gntpounce.c:805 ../pidgin/gtkpounce.c:1476
 #, c-format
 msgid "%s has stopped typing to you (%s)"
 msgstr "%s a arrêté de vous écrire (%s)"
 
-#: ../finch/gntpounce.c:806 ../pidgin/gtkpounce.c:1468
+#: ../finch/gntpounce.c:807 ../pidgin/gtkpounce.c:1478
 #, c-format
 msgid "%s has signed off (%s)"
 msgstr "%s vient de se déconnecter (%s)"
 
-#: ../finch/gntpounce.c:808 ../pidgin/gtkpounce.c:1470
+#: ../finch/gntpounce.c:809 ../pidgin/gtkpounce.c:1480
 #, c-format
 msgid "%s has become idle (%s)"
 msgstr "%s est devenu inactif (%s)"
 
-#: ../finch/gntpounce.c:810 ../pidgin/gtkpounce.c:1472
+#: ../finch/gntpounce.c:811 ../pidgin/gtkpounce.c:1482
 #, c-format
 msgid "%s has gone away. (%s)"
 msgstr "%s est passé absent (%s)"
 
-#: ../finch/gntpounce.c:812 ../pidgin/gtkpounce.c:1474
+#: ../finch/gntpounce.c:813 ../pidgin/gtkpounce.c:1484
 #, c-format
 msgid "%s has sent you a message. (%s)"
 msgstr "%s vous a envoyé un message. (%s)"
 
-#: ../finch/gntpounce.c:813 ../pidgin/gtkpounce.c:1475
+#: ../finch/gntpounce.c:814 ../pidgin/gtkpounce.c:1485
 msgid "Unknown pounce event. Please report this!"
 msgstr "Évènement d'alerte inconnu. Veuillez reporter cette erreur."
 
-#: ../finch/gntprefs.c:79
+#: ../finch/gntprefs.c:91
 msgid "Based on keyboard use"
 msgstr "Selon l'activité du clavier"
 
-#: ../finch/gntprefs.c:81 ../pidgin/gtkprefs.c:1814
+#: ../finch/gntprefs.c:93 ../pidgin/gtkprefs.c:1923
 msgid "From last sent message"
 msgstr "Depuis le dernier message envoyé"
 
-#: ../finch/gntprefs.c:83 ../pidgin/gtkprefs.c:820 ../pidgin/gtkprefs.c:829
-#: ../pidgin/gtkprefs.c:1813 ../pidgin/gtkprefs.c:1827
+#: ../finch/gntprefs.c:95 ../pidgin/gtkprefs.c:897 ../pidgin/gtkprefs.c:906
+#: ../pidgin/gtkprefs.c:1922 ../pidgin/gtkprefs.c:1936
 #: ../pidgin/plugins/win32/winprefs/winprefs.c:337
 msgid "Never"
 msgstr "Jamais"
 
-#: ../finch/gntprefs.c:171
+#: ../finch/gntprefs.c:183
 msgid "Show Idle Time"
 msgstr "Afficher les temps d'inactivité"
 
-#: ../finch/gntprefs.c:172
+#: ../finch/gntprefs.c:184
 msgid "Show Offline Buddies"
 msgstr "Afficher les contacts déconnectés"
 
-#: ../finch/gntprefs.c:179
+#: ../finch/gntprefs.c:191
 msgid "Notify buddies when you are typing"
 msgstr "Notifier les contacts que vous êtes en train de leur écrire"
 
-#: ../finch/gntprefs.c:185
+#: ../finch/gntprefs.c:197
 msgid "Log format"
 msgstr "Format des archives"
 
-#: ../finch/gntprefs.c:186
+#: ../finch/gntprefs.c:198
 msgid "Log IMs"
 msgstr "Archiver les messages"
 
-#: ../finch/gntprefs.c:187
+#: ../finch/gntprefs.c:199
 msgid "Log chats"
 msgstr "Archiver les discussions"
 
-#: ../finch/gntprefs.c:188
+#: ../finch/gntprefs.c:200
 msgid "Log status change events"
 msgstr "Archiver les changements d'état"
 
+#: ../finch/gntprefs.c:206
+msgid "Report Idle time"
+msgstr "Rapporter le temps d'inactivité"
+
+#: ../finch/gntprefs.c:207
+msgid "Change status when idle"
+msgstr "Changer d'état lorsque inactif"
+
+#: ../finch/gntprefs.c:208
+msgid "Minutes before changing status"
+msgstr "Minutes avant de changer d'état"
+
+#: ../finch/gntprefs.c:209
+msgid "Change status to"
+msgstr "Changer l'état en"
+
 #. Conversations
-#: ../finch/gntprefs.c:241 ../pidgin/gtkprefs.c:898 ../pidgin/gtkprefs.c:1917
+#: ../finch/gntprefs.c:258 ../pidgin/gtkprefs.c:992 ../pidgin/gtkprefs.c:2026
 #: ../pidgin/plugins/win32/winprefs/winprefs.c:344
 msgid "Conversations"
 msgstr "Conversations"
 
-#: ../finch/gntprefs.c:242 ../pidgin/gtkprefs.c:1355 ../pidgin/gtkprefs.c:1928
+#: ../finch/gntprefs.c:259 ../pidgin/gtkprefs.c:1462 ../pidgin/gtkprefs.c:2037
 msgid "Logging"
 msgstr "Archivage"
 
-#: ../finch/gntrequest.c:532
+#: ../finch/gntrequest.c:563
 msgid "Not implemented yet."
 msgstr "Fonction non implémentée."
 
-#: ../finch/gntrequest.c:597 ../pidgin/gtkrequest.c:1529
-#: ../pidgin/gtkrequest.c:1575
+#: ../finch/gntrequest.c:635 ../pidgin/gtkrequest.c:1526
+#: ../pidgin/gtkrequest.c:1572
 msgid "Save File..."
 msgstr "Sauver le fichier..."
 
-#: ../finch/gntrequest.c:597 ../pidgin/gtkrequest.c:1530
-#: ../pidgin/gtkrequest.c:1576
+#: ../finch/gntrequest.c:635 ../pidgin/gtkrequest.c:1527
+#: ../pidgin/gtkrequest.c:1573
 msgid "Open File..."
 msgstr "Ouvrir un fichier..."
 
-#: ../finch/gntstatus.c:135
+#: ../finch/gntstatus.c:136
 #, c-format
 msgid "Are you sure you want to delete \"%s\""
 msgstr "Êtes-vous sûr de vouloir supprimer « %s » ?"
 
-#: ../finch/gntstatus.c:138
+#: ../finch/gntstatus.c:139
 msgid "Delete Status"
 msgstr "Supprimer un état"
 
-#: ../finch/gntstatus.c:170 ../pidgin/gtksavedstatuses.c:557
+#: ../finch/gntstatus.c:174 ../pidgin/gtksavedstatuses.c:596
 msgid "Saved Statuses"
 msgstr "États prédéfinis"
 
-#: ../finch/gntstatus.c:177 ../finch/gntstatus.c:529
+#: ../finch/gntstatus.c:181 ../finch/gntstatus.c:532
 #: ../libpurple/protocols/jabber/buddy.c:286
-#: ../libpurple/protocols/jabber/buddy.c:935
+#: ../libpurple/protocols/jabber/buddy.c:973
 #: ../libpurple/protocols/novell/novell.c:1484
-#: ../pidgin/gtksavedstatuses.c:464
+#: ../pidgin/gtksavedstatuses.c:499
 msgid "Title"
 msgstr "Titre"
 
-#: ../finch/gntstatus.c:177 ../pidgin/gtksavedstatuses.c:479
+#: ../finch/gntstatus.c:181 ../pidgin/gtksavedstatuses.c:514
 msgid "Type"
 msgstr "Type"
 
-#: ../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:1072 ../libpurple/protocols/gg/gg.c:1576
-#: ../libpurple/protocols/gg/gg.c:1594 ../libpurple/protocols/gg/gg.c:1604
-#: ../libpurple/protocols/gg/gg.c:1610 ../libpurple/protocols/gg/gg.c:1619
-#: ../libpurple/protocols/gg/gg.c:1624 ../libpurple/protocols/irc/irc.c:234
-#: ../libpurple/protocols/jabber/jabber.c:1246
-#: ../libpurple/protocols/jabber/jabber.c:1256
-#: ../libpurple/protocols/jabber/jabber.c:1266
-#: ../libpurple/protocols/jabber/jabber.c:1276
-#: ../libpurple/protocols/jabber/jabber.c:1286
-#: ../libpurple/protocols/jabber/jabber.c:1298
+#: ../finch/gntstatus.c:181 ../finch/gntstatus.c:557 ../finch/gntstatus.c:569
+#: ../libpurple/protocols/bonjour/bonjour.c:247
+#: ../libpurple/protocols/bonjour/bonjour.c:254
+#: ../libpurple/protocols/bonjour/bonjour.c:320
+#: ../libpurple/protocols/gg/gg.c:1072 ../libpurple/protocols/gg/gg.c:1574
+#: ../libpurple/protocols/gg/gg.c:1592 ../libpurple/protocols/gg/gg.c:1602
+#: ../libpurple/protocols/gg/gg.c:1608 ../libpurple/protocols/gg/gg.c:1617
+#: ../libpurple/protocols/gg/gg.c:1622 ../libpurple/protocols/irc/irc.c:234
+#: ../libpurple/protocols/jabber/jabber.c:1244
+#: ../libpurple/protocols/jabber/jabber.c:1254
+#: ../libpurple/protocols/jabber/jabber.c:1264
+#: ../libpurple/protocols/jabber/jabber.c:1274
+#: ../libpurple/protocols/jabber/jabber.c:1284
+#: ../libpurple/protocols/jabber/jabber.c:1296
 #: ../libpurple/protocols/novell/novell.c:2838
 #: ../libpurple/protocols/novell/novell.c:2941
 #: ../libpurple/protocols/novell/novell.c:2947
 #: ../libpurple/protocols/novell/novell.c:2953
-#: ../libpurple/protocols/oscar/oscar.c:5464
-#: ../libpurple/protocols/oscar/oscar.c:5682
-#: ../libpurple/protocols/oscar/oscar.c:5696
-#: ../libpurple/protocols/oscar/oscar.c:5712
-#: ../libpurple/protocols/oscar/oscar.c:5719
-#: ../libpurple/protocols/oscar/oscar.c:5726
+#: ../libpurple/protocols/oscar/oscar.c:5533
+#: ../libpurple/protocols/oscar/oscar.c:5751
+#: ../libpurple/protocols/oscar/oscar.c:5765
+#: ../libpurple/protocols/oscar/oscar.c:5781
+#: ../libpurple/protocols/oscar/oscar.c:5788
+#: ../libpurple/protocols/oscar/oscar.c:5795
 #: ../libpurple/protocols/sametime/sametime.c:3286
 #: ../libpurple/protocols/sametime/sametime.c:3292
 #: ../libpurple/protocols/sametime/sametime.c:3298
 #: ../libpurple/protocols/sametime/sametime.c:3377
 #: ../libpurple/protocols/silc/buddy.c:1551
+#: ../libpurple/protocols/silc10/buddy.c:1551
 #: ../libpurple/protocols/simple/simple.c:246
-#: ../libpurple/protocols/yahoo/yahoo.c:3477
-#: ../libpurple/protocols/yahoo/yahoo.c:3483
+#: ../libpurple/protocols/yahoo/yahoo.c:3494
+#: ../libpurple/protocols/yahoo/yahoo.c:3500
 #: ../libpurple/protocols/zephyr/zephyr.c:2337
-#: ../pidgin/gtksavedstatuses.c:490 ../pidgin/gtksavedstatuses.c:954
+#: ../pidgin/gtksavedstatuses.c:525 ../pidgin/gtksavedstatuses.c:1009
 msgid "Message"
 msgstr "Message"
 
 #. Use
-#: ../finch/gntstatus.c:189 ../finch/gntstatus.c:583
+#: ../finch/gntstatus.c:192 ../finch/gntstatus.c:586
 msgid "Use"
 msgstr "Utiliser"
 
-#: ../finch/gntstatus.c:294
+#: ../finch/gntstatus.c:297
 msgid "Invalid title"
 msgstr "Titre non valide"
 
-#: ../finch/gntstatus.c:295
+#: ../finch/gntstatus.c:298
 msgid "Please enter a non-empty title for the status."
 msgstr "Saisissez un titre non vide pour l'état."
 
-#: ../finch/gntstatus.c:302
+#: ../finch/gntstatus.c:305
 msgid "Duplicate title"
 msgstr "Titre en double"
 
-#: ../finch/gntstatus.c:303
+#: ../finch/gntstatus.c:306
 msgid "Please enter a different title for the status."
 msgstr "Saisissez un titre différent pour cet état."
 
-#: ../finch/gntstatus.c:443
+#: ../finch/gntstatus.c:446
 msgid "Substatus"
 msgstr "Sous-état"
 
-#: ../finch/gntstatus.c:454 ../pidgin/gtkft.c:698
+#: ../finch/gntstatus.c:457 ../pidgin/gtkft.c:698
 msgid "Status:"
 msgstr "État :"
 
-#: ../finch/gntstatus.c:469
+#: ../finch/gntstatus.c:472
 msgid "Message:"
 msgstr "Message :"
 
-#: ../finch/gntstatus.c:518
+#: ../finch/gntstatus.c:521
 msgid "Edit Status"
 msgstr "Modifier l'état"
 
-#: ../finch/gntstatus.c:560
+#: ../finch/gntstatus.c:563
 msgid "Use different status for following accounts"
 msgstr "Utiliser un état différent pour les comptes suivants"
 
 #. Save & Use
-#: ../finch/gntstatus.c:594
+#: ../finch/gntstatus.c:597
 msgid "Save & Use"
 msgstr "Enregistrer et utiliser"
 
-#: ../finch/gntui.c:83
+#: ../finch/gntui.c:84
 msgid "Statuses"
 msgstr "États"
 
@@ -1561,8 +1617,13 @@
 msgid "Missing protocol plugin for %s"
 msgstr "Plugin pour le protocole %s manquant"
 
+#: ../libpurple/account.c:1012 ../libpurple/connection.c:107
+#: ../pidgin/gtkblist.c:4010
+msgid "Connection Error"
+msgstr "Erreur de connexion"
+
 #: ../libpurple/account.c:1170 ../libpurple/protocols/gg/gg.c:702
-#: ../libpurple/protocols/jabber/jabber.c:1336
+#: ../libpurple/protocols/jabber/jabber.c:1334
 msgid "New passwords do not match."
 msgstr "Les nouveaux mots de passe diffèrent"
 
@@ -1601,22 +1662,22 @@
 msgstr "Modifier les informations"
 
 #: ../libpurple/account.c:1744 ../libpurple/protocols/gg/gg.c:1012
-#: ../libpurple/protocols/jabber/buddy.c:638
-#: ../libpurple/protocols/jabber/buddy.c:1424
-#: ../libpurple/protocols/jabber/buddy.c:1441
+#: ../libpurple/protocols/jabber/buddy.c:642
+#: ../libpurple/protocols/jabber/buddy.c:1462
+#: ../libpurple/protocols/jabber/buddy.c:1479
 #: ../libpurple/protocols/novell/novell.c:2831
 #: ../libpurple/protocols/qq/qq.c:230 ../pidgin/gtkft.c:159
 msgid "Unknown"
 msgstr "Inconnu"
 
-#: ../libpurple/blist.c:523 ../libpurple/blist.c:1291
-#: ../libpurple/blist.c:1520 ../libpurple/protocols/jabber/roster.c:68
-#: ../pidgin/gtkblist.c:5233 ../pidgin/plugins/gevolution/gevolution.c:97
+#: ../libpurple/blist.c:521 ../libpurple/blist.c:1289
+#: ../libpurple/blist.c:1518 ../libpurple/protocols/jabber/roster.c:68
+#: ../pidgin/gtkblist.c:5310 ../pidgin/plugins/gevolution/gevolution.c:96
 #: ../pidgin/plugins/gevolution/gevo-util.c:64
 msgid "Buddies"
 msgstr "Contacts"
 
-#: ../libpurple/blist.c:550
+#: ../libpurple/blist.c:548
 msgid "buddy list"
 msgstr "Liste de contacts"
 
@@ -1635,83 +1696,84 @@
 msgstr "+++ %s a quitté"
 
 #: ../libpurple/connection.c:440 ../libpurple/plugin.c:282
-#: ../libpurple/protocols/jabber/buddy.c:1712
+#: ../libpurple/protocols/jabber/buddy.c:1750
 #: ../libpurple/protocols/msn/servconn.c:139
-#: ../libpurple/protocols/msn/session.c:321
+#: ../libpurple/protocols/msn/session.c:322
 msgid "Unknown error"
 msgstr "Erreur inconnue"
 
-#: ../libpurple/conversation.c:165
+#: ../libpurple/conversation.c:170
 msgid "Unable to send message: The message is too large."
 msgstr "Impossible d'envoyer le message : trop gros"
 
-#: ../libpurple/conversation.c:168 ../libpurple/conversation.c:181
+#: ../libpurple/conversation.c:173 ../libpurple/conversation.c:186
 #, c-format
 msgid "Unable to send message to %s."
 msgstr "Impossible d'envoyer le message vers %s."
 
-#: ../libpurple/conversation.c:169
+#: ../libpurple/conversation.c:174
 msgid "The message is too large."
 msgstr "Message trop long"
 
-#: ../libpurple/conversation.c:178
+#: ../libpurple/conversation.c:183 ../libpurple/protocols/bonjour/jabber.c:284
+#: ../libpurple/protocols/bonjour/jabber.c:326
 msgid "Unable to send message."
 msgstr "Impossible d'envoyer le message"
 
-#: ../libpurple/conversation.c:1164
+#: ../libpurple/conversation.c:1169
 msgid "Send Message"
 msgstr "Envoyer un message"
 
-#: ../libpurple/conversation.c:1167
+#: ../libpurple/conversation.c:1172
 msgid "_Send Message"
 msgstr "Envoyer un _message"
 
-#: ../libpurple/conversation.c:1570
+#: ../libpurple/conversation.c:1578
 #, c-format
 msgid "%s entered the room."
 msgstr "%s est entré dans le salon"
 
-#: ../libpurple/conversation.c:1573
+#: ../libpurple/conversation.c:1581
 #, c-format
 msgid "%s [<I>%s</I>] entered the room."
 msgstr "%s [<I>%s</I>] est entré dans le salon"
 
-#: ../libpurple/conversation.c:1678
+#: ../libpurple/conversation.c:1691
 #, c-format
 msgid "You are now known as %s"
 msgstr "Vous êtes désormais connu sous le nom de %s"
 
-#: ../libpurple/conversation.c:1698
+#: ../libpurple/conversation.c:1711
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s est désormais connu sous le nom de %s"
 
-#: ../libpurple/conversation.c:1771
+#: ../libpurple/conversation.c:1786
 #, c-format
 msgid "%s left the room."
 msgstr "%s a quitté le salon"
 
-#: ../libpurple/conversation.c:1774
+#: ../libpurple/conversation.c:1789
 #, c-format
 msgid "%s left the room (%s)."
 msgstr "%s a quitté le salon (%s)"
 
-#: ../libpurple/dbus-server.c:578
+#: ../libpurple/dbus-server.c:584
 #, c-format
 msgid "Failed to get connection: %s"
 msgstr "Impossible de récupérer une connexion : %s"
 
-#: ../libpurple/dbus-server.c:590
+#: ../libpurple/dbus-server.c:596
 #, c-format
 msgid "Failed to get name: %s"
 msgstr "Impossible de récupérer le nom : %s"
 
-#: ../libpurple/dbus-server.c:603
+#: ../libpurple/dbus-server.c:610
 #, c-format
 msgid "Failed to get serv name: %s"
 msgstr "Impossible de récupérer le nom de serveur : %s"
 
-#: ../libpurple/dbus-server.h:83
+#: ../libpurple/dbus-server.h:84
 msgid "Purple's D-BUS server is not running for the reason listed below"
 msgstr "Le serveur D-BUS de Purple ne tourne pas pour les raisons suivantes"
 
@@ -1764,7 +1826,7 @@
 msgid "Unknown reason"
 msgstr "Raison inconnue"
 
-#: ../libpurple/ft.c:204
+#: ../libpurple/ft.c:207
 #, c-format
 msgid ""
 "Error reading %s: \n"
@@ -1773,7 +1835,7 @@
 "Erreur à la lecture de « %s » :\n"
 "%s\n"
 
-#: ../libpurple/ft.c:208
+#: ../libpurple/ft.c:211
 #, c-format
 msgid ""
 "Error writing %s: \n"
@@ -1782,7 +1844,7 @@
 "Erreur à l'écriture de « %s » :\n"
 "%s\n"
 
-#: ../libpurple/ft.c:212
+#: ../libpurple/ft.c:215
 #, c-format
 msgid ""
 "Error accessing %s: \n"
@@ -1791,41 +1853,41 @@
 "Erreur lors de l'accès à « %s » :\n"
 "%s\n"
 
-#: ../libpurple/ft.c:248
+#: ../libpurple/ft.c:251
 msgid "Directory is not writable."
 msgstr "Impossible d'écrire dans le dossier."
 
-#: ../libpurple/ft.c:263
+#: ../libpurple/ft.c:266
 msgid "Cannot send a file of 0 bytes."
 msgstr "Impossible d'envoyer un fichier de taille nulle."
 
-#: ../libpurple/ft.c:273
+#: ../libpurple/ft.c:276
 msgid "Cannot send a directory."
 msgstr "Impossible d'envoyer un dossier."
 
-#: ../libpurple/ft.c:282
+#: ../libpurple/ft.c:285
 #, c-format
 msgid "%s is not a regular file. Cowardly refusing to overwrite it.\n"
 msgstr ""
 "« %s » n'est pas un fichier régulier. Je refuse lâchement d'écraser ce "
 "fichier.\n"
 
-#: ../libpurple/ft.c:342
+#: ../libpurple/ft.c:345
 #, c-format
 msgid "%s wants to send you %s (%s)"
 msgstr "%s veut vous envoyer %s (%s)"
 
-#: ../libpurple/ft.c:349
+#: ../libpurple/ft.c:352
 #, c-format
 msgid "%s wants to send you a file"
 msgstr "%s veut vous envoyer un fichier"
 
-#: ../libpurple/ft.c:392
+#: ../libpurple/ft.c:395
 #, c-format
 msgid "Accept file transfer request from %s?"
 msgstr "Accepter la demande de transfert de %s ?"
 
-#: ../libpurple/ft.c:396
+#: ../libpurple/ft.c:399
 #, c-format
 msgid ""
 "A file is available for download from:\n"
@@ -1836,60 +1898,60 @@
 "Hôte distant : %s\n"
 "Port distant : %d"
 
-#: ../libpurple/ft.c:431
+#: ../libpurple/ft.c:434
 #, c-format
 msgid "%s is offering to send file %s"
 msgstr "%s propose de vous envoyer le fichier %s"
 
-#: ../libpurple/ft.c:483
+#: ../libpurple/ft.c:486
 #, c-format
 msgid "%s is not a valid filename.\n"
 msgstr "%s n'est pas un nom de fichier valide\n"
 
-#: ../libpurple/ft.c:504
+#: ../libpurple/ft.c:507
 #, c-format
 msgid "Offering to send %s to %s"
 msgstr "Proposition d'envoyer « %s » à %s"
 
-#: ../libpurple/ft.c:516
+#: ../libpurple/ft.c:519
 #, c-format
 msgid "Starting transfer of %s from %s"
 msgstr "Démarrage du transfert de %s depuis %s."
 
-#: ../libpurple/ft.c:670
+#: ../libpurple/ft.c:680
 #, c-format
 msgid "Transfer of file %s complete"
 msgstr "Transfert du fichier « %s » terminé"
 
-#: ../libpurple/ft.c:673
+#: ../libpurple/ft.c:683
 msgid "File transfer complete"
 msgstr "Transfert de fichier terminé"
 
-#: ../libpurple/ft.c:1091
+#: ../libpurple/ft.c:1101
 #, c-format
 msgid "You canceled the transfer of %s"
 msgstr "Vous avez a annulé le transfert de « %s »"
 
-#: ../libpurple/ft.c:1096
+#: ../libpurple/ft.c:1106
 msgid "File transfer cancelled"
 msgstr "Transfert de fichier annulé"
 
-#: ../libpurple/ft.c:1154
+#: ../libpurple/ft.c:1164
 #, c-format
 msgid "%s canceled the transfer of %s"
 msgstr "%s a annulé le transfert de « %s »"
 
-#: ../libpurple/ft.c:1159
+#: ../libpurple/ft.c:1169
 #, c-format
 msgid "%s canceled the file transfer"
 msgstr "%s a annulé le transfert du fichier"
 
-#: ../libpurple/ft.c:1216
+#: ../libpurple/ft.c:1226
 #, c-format
 msgid "File transfer to %s failed."
 msgstr "Échec du transfert vers %s."
 
-#: ../libpurple/ft.c:1218
+#: ../libpurple/ft.c:1228
 #, c-format
 msgid "File transfer from %s failed."
 msgstr "Échec du transfert depuis %s."
@@ -2066,32 +2128,32 @@
 msgid "Whether the specified command should handle \"ymsgr\" URLs"
 msgstr "La commande décrite doit gérer les URL en « ymsgr »"
 
-#: ../libpurple/log.c:181
+#: ../libpurple/log.c:182
 msgid "<b><font color=\"red\">The logger has no read function</font></b>"
 msgstr ""
 "<b><font color\"=red\">L'archiveur n'a pas de fonction de lecture</font></b>"
 
-#: ../libpurple/log.c:593
+#: ../libpurple/log.c:597
 msgid "HTML"
 msgstr "HTML"
 
-#: ../libpurple/log.c:607
+#: ../libpurple/log.c:611
 msgid "Plain text"
 msgstr "Texte en clair"
 
-#: ../libpurple/log.c:621
+#: ../libpurple/log.c:625
 msgid "Old flat format"
 msgstr "Texte à plat"
 
-#: ../libpurple/log.c:732
+#: ../libpurple/log.c:837
 msgid "Logging of this conversation failed."
 msgstr "Échec de l'archivage de cette conversation."
 
-#: ../libpurple/log.c:1175
+#: ../libpurple/log.c:1280
 msgid "XML"
 msgstr "XML"
 
-#: ../libpurple/log.c:1251
+#: ../libpurple/log.c:1364
 #, c-format
 msgid ""
 "<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
@@ -2100,7 +2162,7 @@
 "<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;Réponse "
 "automatique&gt;&nbsp;:</b></font> %s<br/>\n"
 
-#: ../libpurple/log.c:1253
+#: ../libpurple/log.c:1366
 #, c-format
 msgid ""
 "<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
@@ -2109,18 +2171,18 @@
 "<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;Réponse "
 "automatique&gt;&nbsp;:</b></font> %s<br/>\n"
 
-#: ../libpurple/log.c:1311 ../libpurple/log.c:1444
+#: ../libpurple/log.c:1424 ../libpurple/log.c:1557
 msgid "<font color=\"red\"><b>Unable to find log path!</b></font>"
 msgstr ""
 "<font color=\"red\"><b>Impossible de trouver le dossier des archives</b></"
 "font>"
 
-#: ../libpurple/log.c:1323 ../libpurple/log.c:1453
+#: ../libpurple/log.c:1436 ../libpurple/log.c:1566
 #, c-format
 msgid "<font color=\"red\"><b>Could not read file: %s</b></font>"
 msgstr "<font color=\"red\"><b>Impossible de lire le fichier %s</b></font>"
 
-#: ../libpurple/log.c:1385
+#: ../libpurple/log.c:1498
 #, c-format
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr "(%s) %s <Réponse automatique> : %s\n"
@@ -2213,13 +2275,13 @@
 
 #: ../libpurple/plugins/autoaccept.c:165 ../libpurple/plugins/idle.c:170
 #: ../libpurple/plugins/idle.c:204 ../libpurple/plugins/idle.c:230
-#: ../libpurple/protocols/oscar/oscar.c:1440
-#: ../libpurple/protocols/oscar/oscar.c:2231
-#: ../libpurple/protocols/oscar/oscar.c:2278
-#: ../libpurple/protocols/oscar/oscar.c:5796
-#: ../libpurple/protocols/oscar/oscar.c:5851
-#: ../libpurple/protocols/oscar/oscar.c:6077
-#: ../libpurple/protocols/oscar/oscar.c:6147 ../libpurple/request.h:1387
+#: ../libpurple/protocols/oscar/oscar.c:1458
+#: ../libpurple/protocols/oscar/oscar.c:2251
+#: ../libpurple/protocols/oscar/oscar.c:2298
+#: ../libpurple/protocols/oscar/oscar.c:5865
+#: ../libpurple/protocols/oscar/oscar.c:5920
+#: ../libpurple/protocols/oscar/oscar.c:6146
+#: ../libpurple/protocols/oscar/oscar.c:6216 ../libpurple/request.h:1387
 #: ../libpurple/request.h:1397
 msgid "_Cancel"
 msgstr "_Annuler"
@@ -2236,12 +2298,12 @@
 msgid "Auto Reject"
 msgstr "Refuser automatiquement"
 
-#: ../libpurple/plugins/autoaccept.c:184
+#: ../libpurple/plugins/autoaccept.c:185
 msgid "Autoaccept File Transfers..."
 msgstr "Accepter automatiquement les transferts de fichier..."
 
 #. XXX: Is there a better way than this? There really should be.
-#: ../libpurple/plugins/autoaccept.c:214
+#: ../libpurple/plugins/autoaccept.c:215
 msgid ""
 "Path to save the files in\n"
 "(Please provide the full path)"
@@ -2249,12 +2311,12 @@
 "Dossier où placer les fichiers\n"
 "(Veuillez fournir le chemin complet)"
 
-#: ../libpurple/plugins/autoaccept.c:219
+#: ../libpurple/plugins/autoaccept.c:220
 msgid "Automatically reject from users not in buddy list"
 msgstr ""
 "Refuser automatiquement si l'utilisateur n'est pas dans ma liste de contacts"
 
-#: ../libpurple/plugins/autoaccept.c:223
+#: ../libpurple/plugins/autoaccept.c:224
 msgid ""
 "Notify with a popup when an autoaccepted file transfer is complete\n"
 "(only when there's no conversation with the sender)"
@@ -2263,8 +2325,8 @@
 "terminé\n"
 "(seulement quand aucune conversation n'est ouverte avec l'expéditeur)"
 
-#: ../libpurple/plugins/buddynote.c:46 ../libpurple/protocols/msn/msn.c:1608
-#: ../libpurple/protocols/msn/msn.c:1638
+#: ../libpurple/plugins/buddynote.c:46 ../libpurple/protocols/msn/msn.c:1629
+#: ../libpurple/protocols/msn/msn.c:1659
 msgid "Notes"
 msgstr "Notes"
 
@@ -2272,7 +2334,7 @@
 msgid "Enter your notes below..."
 msgstr "Saisissez vos commentaires ci-dessous..."
 
-#: ../libpurple/plugins/buddynote.c:62
+#: ../libpurple/plugins/buddynote.c:65
 msgid "Edit Notes..."
 msgstr "Modifier les commentaires..."
 
@@ -2284,18 +2346,18 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/buddynote.c:87
+#: ../libpurple/plugins/buddynote.c:90
 msgid "Buddy Notes"
 msgstr "Commentaires de contacts"
 
 #. *< name
 #. *< version
-#: ../libpurple/plugins/buddynote.c:89
+#: ../libpurple/plugins/buddynote.c:92
 msgid "Store notes on particular buddies."
 msgstr "Permet d'ajouter des commentaires sur les contacts."
 
 #. *< summary
-#: ../libpurple/plugins/buddynote.c:90
+#: ../libpurple/plugins/buddynote.c:93
 msgid "Adds the option to store notes for buddies on your buddy list."
 msgstr "Permet d'ajouter des commentaires sur les contacts de votre liste."
 
@@ -2491,34 +2553,34 @@
 #. * offset is way off.  The user should never really see it, but
 #. * it's here just in case.  The parens are to make it clear it's
 #. * not a real timezone.
-#: ../libpurple/plugins/log_reader.c:497
+#: ../libpurple/plugins/log_reader.c:492
 msgid "(UTC)"
 msgstr "(UTC)"
 
-#: ../libpurple/plugins/log_reader.c:1552
+#: ../libpurple/plugins/log_reader.c:1573
 msgid "User is offline."
 msgstr "L'utilisateur est déconnecté."
 
-#: ../libpurple/plugins/log_reader.c:1558
+#: ../libpurple/plugins/log_reader.c:1579
 msgid "Auto-response sent:"
 msgstr "Réponse automatique envoyée :"
 
-#: ../libpurple/plugins/log_reader.c:1568
-#: ../libpurple/plugins/log_reader.c:1571
+#: ../libpurple/plugins/log_reader.c:1589
+#: ../libpurple/plugins/log_reader.c:1592
 #: ../libpurple/plugins/statenotify.c:80
 #, c-format
 msgid "%s has signed off."
 msgstr "%s vient de se déconnecter."
 
-#: ../libpurple/plugins/log_reader.c:1585
+#: ../libpurple/plugins/log_reader.c:1606
 msgid "One or more messages may have been undeliverable."
 msgstr "Un ou plusieurs messages ne sont peut-être pas arrivés à destination."
 
-#: ../libpurple/plugins/log_reader.c:1595
+#: ../libpurple/plugins/log_reader.c:1616
 msgid "You were disconnected from the server."
 msgstr "Vous avez été déconnecté du serveur"
 
-#: ../libpurple/plugins/log_reader.c:1603
+#: ../libpurple/plugins/log_reader.c:1624
 msgid ""
 "You are currently disconnected. Messages will not be received unless you are "
 "logged in."
@@ -2526,70 +2588,78 @@
 "Vous êtes actuellement déconnecté. Vous ne pouvez pas recevoir de messages à "
 "moins de vous connecter."
 
-#: ../libpurple/plugins/log_reader.c:1618
+#: ../libpurple/plugins/log_reader.c:1639
 msgid "Message could not be sent because the maximum length was exceeded."
 msgstr ""
 "Le message n'a pas pu être envoyé car la taille maximale a été dépassée."
 
-#: ../libpurple/plugins/log_reader.c:1623
+#: ../libpurple/plugins/log_reader.c:1644
 msgid "Message could not be sent."
 msgstr "Le message n'a pas pu être envoyé."
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
-#: ../libpurple/plugins/log_reader.c:1976
-#: ../libpurple/plugins/log_reader.c:2085
+#: ../libpurple/plugins/log_reader.c:2344
+#: ../libpurple/plugins/log_reader.c:2467
 msgid "Adium"
 msgstr "Adium"
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
-#: ../libpurple/plugins/log_reader.c:1989
-#: ../libpurple/plugins/log_reader.c:2090
+#: ../libpurple/plugins/log_reader.c:2357
+#: ../libpurple/plugins/log_reader.c:2472
 msgid "Fire"
 msgstr "Fire"
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
-#: ../libpurple/plugins/log_reader.c:2001
-#: ../libpurple/plugins/log_reader.c:2094
+#: ../libpurple/plugins/log_reader.c:2369
+#: ../libpurple/plugins/log_reader.c:2476
 msgid "Messenger Plus!"
 msgstr "Messenger Plus!"
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
-#: ../libpurple/plugins/log_reader.c:2014
-#: ../libpurple/plugins/log_reader.c:2099
+#: ../libpurple/plugins/log_reader.c:2383
+#: ../libpurple/plugins/log_reader.c:2481
+msgid "QIP"
+msgstr "QIP"
+
+#. The names of IM clients are marked for translation at the request of
+#. translators who wanted to transliterate them.  Many translators
+#. choose to leave them alone.  Choose what's best for your language.
+#: ../libpurple/plugins/log_reader.c:2395
+#: ../libpurple/plugins/log_reader.c:2485
 msgid "MSN Messenger"
 msgstr "MSN Messenger"
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
-#: ../libpurple/plugins/log_reader.c:2026
-#: ../libpurple/plugins/log_reader.c:2103
+#: ../libpurple/plugins/log_reader.c:2407
+#: ../libpurple/plugins/log_reader.c:2489
 msgid "Trillian"
 msgstr "Trillian"
 
 #. Add general preferences.
-#: ../libpurple/plugins/log_reader.c:2067
+#: ../libpurple/plugins/log_reader.c:2449
 msgid "General Log Reading Configuration"
 msgstr "Configuration du lecteur d'archives générales."
 
-#: ../libpurple/plugins/log_reader.c:2071
+#: ../libpurple/plugins/log_reader.c:2453
 msgid "Fast size calculations"
 msgstr "Calcul rapide de la taille"
 
-#: ../libpurple/plugins/log_reader.c:2075
+#: ../libpurple/plugins/log_reader.c:2457
 msgid "Use name heuristics"
 msgstr "Utiliser une heuristique sur les noms"
 
 #. Add Log Directory preferences.
-#: ../libpurple/plugins/log_reader.c:2081
+#: ../libpurple/plugins/log_reader.c:2463
 msgid "Log Directory"
 msgstr "Dossier des archives"
 
@@ -2599,21 +2669,21 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/log_reader.c:2132
+#: ../libpurple/plugins/log_reader.c:2518
 msgid "Log Reader"
 msgstr "Lecteur d'archives"
 
 #. *< name
 #. *< version
 #. * summary
-#: ../libpurple/plugins/log_reader.c:2136
+#: ../libpurple/plugins/log_reader.c:2522
 msgid "Includes other IM clients' logs in the log viewer."
 msgstr ""
 "Inclut les archives d'autres clients de messagerie dans le lecteur "
 "d'archives."
 
 #. * description
-#: ../libpurple/plugins/log_reader.c:2140
+#: ../libpurple/plugins/log_reader.c:2526
 msgid ""
 "When viewing logs, this plugin will include logs from other IM clients. "
 "Currently, this includes Adium, MSN Messenger, and Trillian.\n"
@@ -2705,9 +2775,11 @@
 #: ../libpurple/protocols/msn/dialog.c:133
 #: ../libpurple/protocols/msn/msn.c:522 ../libpurple/protocols/msn/msn.c:532
 #: ../libpurple/protocols/novell/novell.c:1917
-#: ../libpurple/protocols/silc/buddy.c:314
-#: ../libpurple/protocols/silc/pk.c:119 ../libpurple/protocols/silc/wb.c:304
-#: ../pidgin/gtkrequest.c:267
+#: ../libpurple/protocols/silc/buddy.c:317
+#: ../libpurple/protocols/silc/pk.c:113 ../libpurple/protocols/silc/wb.c:304
+#: ../libpurple/protocols/silc10/buddy.c:314
+#: ../libpurple/protocols/silc10/pk.c:119
+#: ../libpurple/protocols/silc10/wb.c:304 ../pidgin/gtkrequest.c:267
 msgid "Yes"
 msgstr "Oui"
 
@@ -2715,9 +2787,11 @@
 #: ../libpurple/protocols/msn/dialog.c:134
 #: ../libpurple/protocols/msn/msn.c:522 ../libpurple/protocols/msn/msn.c:532
 #: ../libpurple/protocols/novell/novell.c:1918
-#: ../libpurple/protocols/silc/buddy.c:315
-#: ../libpurple/protocols/silc/pk.c:120 ../libpurple/protocols/silc/wb.c:305
-#: ../pidgin/gtkrequest.c:268
+#: ../libpurple/protocols/silc/buddy.c:318
+#: ../libpurple/protocols/silc/pk.c:114 ../libpurple/protocols/silc/wb.c:305
+#: ../libpurple/protocols/silc10/buddy.c:315
+#: ../libpurple/protocols/silc10/pk.c:120
+#: ../libpurple/protocols/silc10/wb.c:305 ../pidgin/gtkrequest.c:268
 msgid "No"
 msgstr "Non"
 
@@ -2844,7 +2918,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/ssl/ssl-gnutls.c:263
+#: ../libpurple/plugins/ssl/ssl-gnutls.c:275
 msgid "GNUTLS"
 msgstr "GNUTLS"
 
@@ -2852,8 +2926,8 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/plugins/ssl/ssl-gnutls.c:266
-#: ../libpurple/plugins/ssl/ssl-gnutls.c:268
+#: ../libpurple/plugins/ssl/ssl-gnutls.c:278
+#: ../libpurple/plugins/ssl/ssl-gnutls.c:280
 msgid "Provides SSL support through GNUTLS."
 msgstr "Fournit le support SSL grâce à la bibliothèque GNUTLS"
 
@@ -2863,7 +2937,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/ssl/ssl-nss.c:415
+#: ../libpurple/plugins/ssl/ssl-nss.c:423
 msgid "NSS"
 msgstr "NSS"
 
@@ -2871,8 +2945,8 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/plugins/ssl/ssl-nss.c:418
-#: ../libpurple/plugins/ssl/ssl-nss.c:420
+#: ../libpurple/plugins/ssl/ssl-nss.c:426
+#: ../libpurple/plugins/ssl/ssl-nss.c:428
 msgid "Provides SSL support through Mozilla NSS."
 msgstr "Fournit le support SSL grâce à la bibliothèque NSS"
 
@@ -2948,7 +3022,7 @@
 msgid "Provides support for loading Tcl plugins"
 msgstr "Permet de charger des plugins Tcl"
 
-#: ../libpurple/plugins/tcl/tcl.c:495
+#: ../libpurple/plugins/tcl/tcl.c:507
 msgid ""
 "Unable to detect ActiveTCL installation. If you wish to use TCL plugins, "
 "install ActiveTCL from http://www.activestate.com\n"
@@ -2958,11 +3032,11 @@
 "activestate.com\n"
 
 #. Send a message about the connection error
-#: ../libpurple/protocols/bonjour/bonjour.c:113
+#: ../libpurple/protocols/bonjour/bonjour.c:112
 msgid "Unable to listen for incoming IM connections\n"
 msgstr "Impossible d'attendre des connexions rentrantes de messages.\n"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:148
+#: ../libpurple/protocols/bonjour/bonjour.c:137
 msgid ""
 "Unable to establish connection with the local mDNS server.  Is it running?"
 msgstr ""
@@ -2972,19 +3046,20 @@
 #. get_yahoo_status_from_purple_status() returns YAHOO_STATUS_CUSTOM for
 #. * the generic away state (YAHOO_STATUS_TYPE_AWAY) with no message
 #. Away stuff
-#: ../libpurple/protocols/bonjour/bonjour.c:302
+#: ../libpurple/protocols/bonjour/bonjour.c:294
 #: ../libpurple/protocols/gg/gg.c:1009 ../libpurple/protocols/irc/irc.c:530
 #: ../libpurple/protocols/irc/msgs.c:310
-#: ../libpurple/protocols/jabber/buddy.c:1434
+#: ../libpurple/protocols/jabber/buddy.c:1472
 #: ../libpurple/protocols/novell/novell.c:2819
-#: ../libpurple/protocols/oscar/oscar.c:715
-#: ../libpurple/protocols/oscar/oscar.c:4497
-#: ../libpurple/protocols/oscar/oscar.c:5542
+#: ../libpurple/protocols/oscar/oscar.c:733
+#: ../libpurple/protocols/oscar/oscar.c:4545
+#: ../libpurple/protocols/oscar/oscar.c:5611
 #: ../libpurple/protocols/qq/qq.c:180 ../libpurple/protocols/silc/buddy.c:1476
-#: ../libpurple/protocols/yahoo/yahoo.c:3380
-#: ../libpurple/protocols/yahoo/yahoo.c:3453 ../libpurple/status.c:157
-#: ../pidgin/gtkdocklet.c:442 ../pidgin/gtkprefs.c:1823
-#: ../pidgin/gtkstatusbox.c:1052
+#: ../libpurple/protocols/silc10/buddy.c:1476
+#: ../libpurple/protocols/yahoo/yahoo.c:3397
+#: ../libpurple/protocols/yahoo/yahoo.c:3470 ../libpurple/status.c:157
+#: ../pidgin/gtkdocklet.c:442 ../pidgin/gtkprefs.c:1932
+#: ../pidgin/gtkstatusbox.c:1056
 msgid "Away"
 msgstr "Absent"
 
@@ -2998,87 +3073,92 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/bonjour/bonjour.c:431
-#: ../libpurple/protocols/bonjour/bonjour.c:433
+#: ../libpurple/protocols/bonjour/bonjour.c:425
+#: ../libpurple/protocols/bonjour/bonjour.c:427
 msgid "Bonjour Protocol Plugin"
 msgstr "Plugin pour le protocole Bonjour"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:476
-#: ../libpurple/protocols/bonjour/bonjour.c:483
-#: ../libpurple/protocols/bonjour/bonjour.c:541
+#: ../libpurple/protocols/bonjour/bonjour.c:470
+#: ../libpurple/protocols/bonjour/bonjour.c:477
+#: ../libpurple/protocols/bonjour/bonjour.c:535
 msgid "Purple Person"
 msgstr "Personne Purple"
 
 #. Creating the user splits
-#: ../libpurple/protocols/bonjour/bonjour.c:589
-#: ../libpurple/protocols/silc/silc.c:926
+#: ../libpurple/protocols/bonjour/bonjour.c:583
+#: ../libpurple/protocols/silc/silc.c:1007
+#: ../libpurple/protocols/silc10/silc.c:918
 msgid "Hostname"
 msgstr "Nom d'hôte :"
 
 #. Creating the options for the protocol
-#: ../libpurple/protocols/bonjour/bonjour.c:593
+#: ../libpurple/protocols/bonjour/bonjour.c:587
 #: ../libpurple/protocols/gg/gg.c:627
-#: ../libpurple/protocols/jabber/jabber.c:824
+#: ../libpurple/protocols/jabber/jabber.c:828
 msgid "First name"
 msgstr "Prénom :"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:596
+#: ../libpurple/protocols/bonjour/bonjour.c:590
 #: ../libpurple/protocols/gg/gg.c:622
-#: ../libpurple/protocols/jabber/jabber.c:829
+#: ../libpurple/protocols/jabber/jabber.c:833
 msgid "Last name"
 msgstr "Nom :"
 
+#: ../libpurple/protocols/bonjour/bonjour.c:593
+#: ../libpurple/protocols/gg/gg.c:472
+#: ../libpurple/protocols/jabber/jabber.c:818
+#: ../libpurple/protocols/silc/silc.c:770
+#: ../libpurple/protocols/silc/silc.c:1011
+#: ../libpurple/protocols/silc10/silc.c:681
+#: ../libpurple/protocols/silc10/silc.c:922
+msgid "E-mail"
+msgstr "Adresse électronique"
+
+#: ../libpurple/protocols/bonjour/bonjour.c:596
+msgid "AIM Account"
+msgstr "Compte AIM"
+
 #: ../libpurple/protocols/bonjour/bonjour.c:599
-#: ../libpurple/protocols/gg/gg.c:472
-#: ../libpurple/protocols/jabber/jabber.c:814
-#: ../libpurple/protocols/silc/silc.c:689
-#: ../libpurple/protocols/silc/silc.c:930
-msgid "E-mail"
-msgstr "Adresse électronique"
-
-#: ../libpurple/protocols/bonjour/bonjour.c:602
-msgid "AIM Account"
-msgstr "Compte AIM"
-
-#: ../libpurple/protocols/bonjour/bonjour.c:605
 msgid "XMPP Account"
 msgstr "Compte XMPP"
 
-#: ../libpurple/protocols/bonjour/bonjour.h:35
+#: ../libpurple/protocols/bonjour/bonjour.h:33
 msgid "Bonjour"
 msgstr "Bonjour"
 
-#: ../libpurple/protocols/bonjour/jabber.c:374
+#: ../libpurple/protocols/bonjour/jabber.c:395
 #, c-format
 msgid "%s has closed the conversation."
 msgstr "%s a fermé la conversation."
 
-#: ../libpurple/protocols/bonjour/jabber.c:461
-msgid "Cannot open socket"
-msgstr "Impossible d'ouvrir la connexion."
-
-#: ../libpurple/protocols/bonjour/jabber.c:469
-msgid "Error setting socket options"
-msgstr "Erreur à la mise en place des paramètres de la connexion."
-
-#: ../libpurple/protocols/bonjour/jabber.c:493
-msgid "Could not bind socket to port"
-msgstr "Impossible d'affecter un port à la connexion."
-
-#: ../libpurple/protocols/bonjour/jabber.c:501
-msgid "Could not listen on socket"
-msgstr "Impossible de se mettre en écoute sur la connexion."
-
-#: ../libpurple/protocols/bonjour/jabber.c:599
+#: ../libpurple/protocols/bonjour/jabber.c:441
+#: ../libpurple/protocols/bonjour/jabber.c:654
+#: ../libpurple/protocols/bonjour/jabber.c:679
 msgid "Unable to send the message, the conversation couldn't be started."
 msgstr ""
 "Impossible d'envoyer le message, la conversation n'a pas pu être commencée."
 
-#: ../libpurple/protocols/gg/gg.c:76 ../libpurple/proxy.c:1800
+#: ../libpurple/protocols/bonjour/jabber.c:575
+msgid "Cannot open socket"
+msgstr "Impossible d'ouvrir la connexion."
+
+#: ../libpurple/protocols/bonjour/jabber.c:583
+msgid "Error setting socket options"
+msgstr "Erreur à la mise en place des paramètres de la connexion."
+
+#: ../libpurple/protocols/bonjour/jabber.c:607
+msgid "Could not bind socket to port"
+msgstr "Impossible d'affecter un port à la connexion."
+
+#: ../libpurple/protocols/bonjour/jabber.c:615
+msgid "Could not listen on socket"
+msgstr "Impossible de se mettre en écoute sur la connexion."
+
+#: ../libpurple/protocols/gg/gg.c:76 ../libpurple/proxy.c:1812
 msgid "Invalid proxy settings"
 msgstr "Paramètres du serveur mandataire incorrects"
 
-#: ../libpurple/protocols/gg/gg.c:77 ../libpurple/proxy.c:1800
+#: ../libpurple/protocols/gg/gg.c:77 ../libpurple/proxy.c:1812
 msgid ""
 "Either the host name or port number specified for your given proxy type is "
 "invalid."
@@ -3147,8 +3227,8 @@
 msgstr "Inscription effectuée."
 
 #: ../libpurple/protocols/gg/gg.c:477 ../libpurple/protocols/gg/gg.c:770
-#: ../libpurple/protocols/jabber/jabber.c:803
-#: ../libpurple/protocols/jabber/jabber.c:1371
+#: ../libpurple/protocols/jabber/jabber.c:807
+#: ../libpurple/protocols/jabber/jabber.c:1369
 msgid "Password"
 msgstr "Mot de passe"
 
@@ -3173,10 +3253,10 @@
 msgstr "Veuillez renseigner les rubriques suivantes"
 
 #: ../libpurple/protocols/gg/gg.c:637 ../libpurple/protocols/gg/gg.c:1049
-#: ../libpurple/protocols/gg/gg.c:1123
-#: ../libpurple/protocols/jabber/jabber.c:839
-#: ../libpurple/protocols/oscar/oscar.c:3776
-#: ../libpurple/protocols/oscar/oscar.c:3789
+#: ../libpurple/protocols/gg/gg.c:1121
+#: ../libpurple/protocols/jabber/jabber.c:843
+#: ../libpurple/protocols/oscar/oscar.c:3803
+#: ../libpurple/protocols/oscar/oscar.c:3816
 #: ../libpurple/protocols/qq/buddy_info.c:49
 msgid "City"
 msgstr "Localité"
@@ -3185,8 +3265,8 @@
 msgid "Year of birth"
 msgstr "Année de naissance"
 
-#: ../libpurple/protocols/gg/gg.c:645 ../libpurple/protocols/msn/msn.c:1537
-#: ../libpurple/protocols/oscar/oscar.c:3719
+#: ../libpurple/protocols/gg/gg.c:645 ../libpurple/protocols/msn/msn.c:1558
+#: ../libpurple/protocols/oscar/oscar.c:3746
 #: ../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
@@ -3199,14 +3279,14 @@
 msgstr "Homme ou femme"
 
 #: ../libpurple/protocols/gg/gg.c:647
-#: ../libpurple/protocols/oscar/oscar.c:3719
+#: ../libpurple/protocols/oscar/oscar.c:3746
 #: ../libpurple/protocols/qq/buddy_info.c:83
 #: ../libpurple/protocols/qq/qq.c:224
 msgid "Male"
 msgstr "Homme"
 
 #: ../libpurple/protocols/gg/gg.c:648
-#: ../libpurple/protocols/oscar/oscar.c:3719
+#: ../libpurple/protocols/oscar/oscar.c:3746
 #: ../libpurple/protocols/qq/buddy_info.c:84
 #: ../libpurple/protocols/qq/qq.c:227
 msgid "Female"
@@ -3267,147 +3347,148 @@
 msgstr "Ajouter à la discussion..."
 
 #: ../libpurple/protocols/gg/gg.c:1003
-#: ../libpurple/protocols/jabber/buddy.c:1428
+#: ../libpurple/protocols/jabber/buddy.c:1466
 #: ../libpurple/protocols/novell/novell.c:2828
-#: ../libpurple/protocols/oscar/oscar.c:810
-#: ../libpurple/protocols/oscar/oscar.c:5514
+#: ../libpurple/protocols/oscar/oscar.c:828
+#: ../libpurple/protocols/oscar/oscar.c:5583
 #: ../libpurple/protocols/qq/qq.c:170 ../libpurple/protocols/qq/qq.c:177
-#: ../libpurple/protocols/yahoo/yahoo.c:2900 ../libpurple/status.c:153
-#: ../pidgin/gtkblist.c:3053 ../pidgin/gtkblist.c:3378
-#: ../pidgin/gtkdocklet.c:450 ../pidgin/gtkstatusbox.c:1054
+#: ../libpurple/protocols/yahoo/yahoo.c:2917 ../libpurple/status.c:153
+#: ../pidgin/gtkblist.c:3070 ../pidgin/gtkblist.c:3411
+#: ../pidgin/gtkdocklet.c:450 ../pidgin/gtkstatusbox.c:1059
 msgid "Offline"
 msgstr "Déconnecté"
 
 #: ../libpurple/protocols/gg/gg.c:1006
-#: ../libpurple/protocols/jabber/buddy.c:1430
+#: ../libpurple/protocols/jabber/buddy.c:1468
 #: ../libpurple/protocols/msn/state.c:29 ../libpurple/protocols/msn/state.c:30
 #: ../libpurple/protocols/msn/state.c:37 ../libpurple/protocols/msn/state.c:38
 #: ../libpurple/protocols/novell/novell.c:2816
-#: ../libpurple/protocols/yahoo/yahoo.c:2902 ../libpurple/status.c:154
-#: ../pidgin/gtkdocklet.c:438 ../pidgin/gtkstatusbox.c:1051
+#: ../libpurple/protocols/yahoo/yahoo.c:2919 ../libpurple/status.c:154
+#: ../pidgin/gtkdocklet.c:438 ../pidgin/gtkstatusbox.c:1055
 msgid "Available"
 msgstr "Disponible"
 
-#: ../libpurple/protocols/gg/gg.c:1038 ../libpurple/protocols/gg/gg.c:1114
-#: ../libpurple/protocols/oscar/oscar.c:2655
-#: ../libpurple/protocols/oscar/oscar.c:3686
+#: ../libpurple/protocols/gg/gg.c:1038 ../libpurple/protocols/gg/gg.c:1112
+#: ../libpurple/protocols/oscar/oscar.c:2675
+#: ../libpurple/protocols/oscar/oscar.c:3713
 msgid "UIN"
 msgstr "UIN"
 
-#: ../libpurple/protocols/gg/gg.c:1041 ../libpurple/protocols/gg/gg.c:1117
-#: ../libpurple/protocols/jabber/buddy.c:1585
-#: ../libpurple/protocols/jabber/buddy.c:1761
-#: ../libpurple/protocols/oscar/oscar.c:3697
-#: ../libpurple/protocols/silc/ops.c:1024
+#: ../libpurple/protocols/gg/gg.c:1041 ../libpurple/protocols/gg/gg.c:1115
+#: ../libpurple/protocols/jabber/buddy.c:1623
+#: ../libpurple/protocols/jabber/buddy.c:1799
+#: ../libpurple/protocols/oscar/oscar.c:3724
+#: ../libpurple/protocols/silc/ops.c:990
+#: ../libpurple/protocols/silc10/ops.c:1024
 msgid "First Name"
 msgstr "Prénom"
 
-#: ../libpurple/protocols/gg/gg.c:1054 ../libpurple/protocols/gg/gg.c:1126
+#: ../libpurple/protocols/gg/gg.c:1054 ../libpurple/protocols/gg/gg.c:1124
 msgid "Birth Year"
 msgstr "Année de naissance"
 
-#: ../libpurple/protocols/gg/gg.c:1108 ../libpurple/protocols/gg/gg.c:1177
-#: ../libpurple/protocols/oscar/oscar.c:3898
+#: ../libpurple/protocols/gg/gg.c:1106 ../libpurple/protocols/gg/gg.c:1175
+#: ../libpurple/protocols/oscar/oscar.c:3925
 msgid "Unable to display the search results."
 msgstr "Impossible d'afficher les résultats de la recherche."
 
-#: ../libpurple/protocols/gg/gg.c:1168
+#: ../libpurple/protocols/gg/gg.c:1166
 msgid "Gadu-Gadu Public Directory"
 msgstr "Annuaire public Gadu-Gadu"
 
-#: ../libpurple/protocols/gg/gg.c:1169
+#: ../libpurple/protocols/gg/gg.c:1167
 msgid "Search results"
 msgstr "Résultats de la recherche"
 
-#: ../libpurple/protocols/gg/gg.c:1212
+#: ../libpurple/protocols/gg/gg.c:1210
 msgid "No matching users found"
 msgstr "Aucun utilisateur correspondant trouvé."
 
-#: ../libpurple/protocols/gg/gg.c:1213
+#: ../libpurple/protocols/gg/gg.c:1211
 msgid "There are no users matching your search criteria."
 msgstr "Il n'y a pas d'utilisateur qui vérifie votre critère de recherche."
 
-#: ../libpurple/protocols/gg/gg.c:1307 ../libpurple/protocols/gg/gg.c:1460
+#: ../libpurple/protocols/gg/gg.c:1305 ../libpurple/protocols/gg/gg.c:1458
 msgid "Unable to read socket"
 msgstr "Impossible de lire le socket"
 
-#: ../libpurple/protocols/gg/gg.c:1392
+#: ../libpurple/protocols/gg/gg.c:1390
 msgid "Buddy list downloaded"
 msgstr "Liste de contacts téléchargée"
 
-#: ../libpurple/protocols/gg/gg.c:1393
+#: ../libpurple/protocols/gg/gg.c:1391
 msgid "Your buddy list was downloaded from the server."
 msgstr "Votre liste de contacts à été récupérée depuis le serveur."
 
-#: ../libpurple/protocols/gg/gg.c:1400
+#: ../libpurple/protocols/gg/gg.c:1398
 msgid "Buddy list uploaded"
 msgstr "Liste de contacts envoyée"
 
-#: ../libpurple/protocols/gg/gg.c:1401
+#: ../libpurple/protocols/gg/gg.c:1399
 msgid "Your buddy list was stored on the server."
 msgstr "Votre liste de contacts à été stockée sur le serveur."
 
-#: ../libpurple/protocols/gg/gg.c:1506 ../libpurple/protocols/gg/gg.c:1712
+#: ../libpurple/protocols/gg/gg.c:1504 ../libpurple/protocols/gg/gg.c:1710
 msgid "Connection failed."
 msgstr "Échec de la connexion"
 
-#: ../libpurple/protocols/gg/gg.c:1618 ../libpurple/protocols/msn/msn.c:531
+#: ../libpurple/protocols/gg/gg.c:1616 ../libpurple/protocols/msn/msn.c:531
 msgid "Blocked"
 msgstr "Bloqué"
 
-#: ../libpurple/protocols/gg/gg.c:1641
+#: ../libpurple/protocols/gg/gg.c:1639
 msgid "Add to chat"
 msgstr "Ajouter à la discussion"
 
-#: ../libpurple/protocols/gg/gg.c:1650
+#: ../libpurple/protocols/gg/gg.c:1648
 msgid "Unblock"
 msgstr "Débloquer"
 
-#: ../libpurple/protocols/gg/gg.c:1654
+#: ../libpurple/protocols/gg/gg.c:1652
 msgid "Block"
 msgstr "Bloquer"
 
-#: ../libpurple/protocols/gg/gg.c:1671
+#: ../libpurple/protocols/gg/gg.c:1669
 msgid "Chat _name:"
 msgstr "_Nom de la discussion :"
 
-#: ../libpurple/protocols/gg/gg.c:1911
+#: ../libpurple/protocols/gg/gg.c:1909
 msgid "Chat error"
 msgstr "Erreur de discussion"
 
-#: ../libpurple/protocols/gg/gg.c:1912
+#: ../libpurple/protocols/gg/gg.c:1910
 msgid "This chat name is already in use"
 msgstr "Ce nom de discussion est déjà utilisé."
 
-#: ../libpurple/protocols/gg/gg.c:1995
+#: ../libpurple/protocols/gg/gg.c:1993
 msgid "Not connected to the server."
 msgstr "Vous n'êtes pas connecté au serveur."
 
-#: ../libpurple/protocols/gg/gg.c:2018
+#: ../libpurple/protocols/gg/gg.c:2016
 msgid "Find buddies..."
 msgstr "Trouver des contacts..."
 
-#: ../libpurple/protocols/gg/gg.c:2024
+#: ../libpurple/protocols/gg/gg.c:2022
 msgid "Change password..."
 msgstr "Changer de mot de passe..."
 
-#: ../libpurple/protocols/gg/gg.c:2030
+#: ../libpurple/protocols/gg/gg.c:2028
 msgid "Upload buddylist to Server"
 msgstr "Envoyer la liste de contacts sur le serveur"
 
-#: ../libpurple/protocols/gg/gg.c:2034
+#: ../libpurple/protocols/gg/gg.c:2032
 msgid "Download buddylist from Server"
 msgstr "Récupérer la liste de contacts du serveur"
 
-#: ../libpurple/protocols/gg/gg.c:2038
+#: ../libpurple/protocols/gg/gg.c:2036
 msgid "Delete buddylist from Server"
 msgstr "Effacer la liste de contacts du serveur"
 
-#: ../libpurple/protocols/gg/gg.c:2042
+#: ../libpurple/protocols/gg/gg.c:2040
 msgid "Save buddylist to file..."
 msgstr "Sauver la liste de contacts dans un fichier..."
 
-#: ../libpurple/protocols/gg/gg.c:2046
+#: ../libpurple/protocols/gg/gg.c:2044
 msgid "Load buddylist from file..."
 msgstr "Charger la liste de contacts depuis un fichier..."
 
@@ -3422,43 +3503,46 @@
 #. id
 #. name
 #. version
-#: ../libpurple/protocols/gg/gg.c:2150
+#: ../libpurple/protocols/gg/gg.c:2148
 msgid "Gadu-Gadu Protocol Plugin"
 msgstr "Plugin pour le protocole Gadu-Gadu"
 
 #. summary
-#: ../libpurple/protocols/gg/gg.c:2151
+#: ../libpurple/protocols/gg/gg.c:2149
 msgid "Polish popular IM"
 msgstr "Messagerie polonaise populaire"
 
-#: ../libpurple/protocols/gg/gg.c:2205
+#: ../libpurple/protocols/gg/gg.c:2203
 msgid "Gadu-Gadu User"
 msgstr "Utilisateur Gadu-Gadu"
 
 #: ../libpurple/protocols/irc/cmds.c:43
-#: ../libpurple/protocols/silc/silc.c:1577
+#: ../libpurple/protocols/silc/silc.c:1637
+#: ../libpurple/protocols/silc10/silc.c:1566
 #, c-format
 msgid "Unknown command: %s"
 msgstr "Commande inconnue : %s"
 
 #: ../libpurple/protocols/irc/cmds.c:503
 #: ../libpurple/protocols/jabber/chat.c:591
-#: ../libpurple/protocols/silc/silc.c:1285
+#: ../libpurple/protocols/silc/silc.c:1345
+#: ../libpurple/protocols/silc10/silc.c:1274
 #, c-format
 msgid "current topic is: %s"
 msgstr "Le sujet courant est : %s"
 
 #: ../libpurple/protocols/irc/cmds.c:507
 #: ../libpurple/protocols/jabber/chat.c:595
-#: ../libpurple/protocols/silc/silc.c:1289
+#: ../libpurple/protocols/silc/silc.c:1349
+#: ../libpurple/protocols/silc10/silc.c:1278
 msgid "No topic is set"
 msgstr "Pas de sujet"
 
 #: ../libpurple/protocols/irc/dcc_send.c:296
 #: ../libpurple/protocols/irc/dcc_send.c:337
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:268
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:277
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:290
+#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:269
+#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:278
+#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:291
 msgid "File Transfer Failed"
 msgstr "Échec du transfert de fichier."
 
@@ -3494,11 +3578,12 @@
 msgstr "Voir le message du jour"
 
 #: ../libpurple/protocols/irc/irc.c:261 ../libpurple/protocols/silc/chat.c:33
+#: ../libpurple/protocols/silc10/chat.c:33
 msgid "_Channel:"
 msgstr "_Salon :"
 
 #: ../libpurple/protocols/irc/irc.c:267
-#: ../libpurple/protocols/jabber/chat.c:59
+#: ../libpurple/protocols/jabber/chat.c:59 ../pidgin/gtkaccount.c:526
 msgid "_Password:"
 msgstr "Mot de _passe :"
 
@@ -3508,21 +3593,21 @@
 
 #. connect to the server
 #: ../libpurple/protocols/irc/irc.c:319
-#: ../libpurple/protocols/jabber/jabber.c:1044
-#: ../libpurple/protocols/msn/session.c:344
+#: ../libpurple/protocols/jabber/jabber.c:1046
+#: ../libpurple/protocols/msn/session.c:345
 #: ../libpurple/protocols/novell/novell.c:2182
-#: ../libpurple/protocols/oscar/oscar.c:1270
+#: ../libpurple/protocols/oscar/oscar.c:1288
 #: ../libpurple/protocols/qq/qq.c:136
 #: ../libpurple/protocols/sametime/sametime.c:3723
 #: ../libpurple/protocols/simple/simple.c:1671
-#: ../libpurple/protocols/yahoo/yahoo.c:2745
-#: ../libpurple/protocols/zephyr/zephyr.c:1621 ../pidgin/gtkstatusbox.c:659
+#: ../libpurple/protocols/yahoo/yahoo.c:2762
+#: ../libpurple/protocols/zephyr/zephyr.c:1621 ../pidgin/gtkstatusbox.c:661
 msgid "Connecting"
 msgstr "Connexion en cours"
 
 #: ../libpurple/protocols/irc/irc.c:327
-#: ../libpurple/protocols/jabber/jabber.c:599
-#: ../libpurple/protocols/jabber/jabber.c:946
+#: ../libpurple/protocols/jabber/jabber.c:603
+#: ../libpurple/protocols/jabber/jabber.c:950
 msgid "SSL support unavailable"
 msgstr "Support SSL non disponible"
 
@@ -3533,18 +3618,17 @@
 msgstr "Impossible de créer le socket"
 
 #: ../libpurple/protocols/irc/irc.c:416
-#: ../libpurple/protocols/jabber/jabber.c:466
-#: ../libpurple/protocols/oscar/oscar.c:1266
+#: ../libpurple/protocols/oscar/oscar.c:1284
 msgid "Couldn't connect to host"
 msgstr "Impossible de se connecter à l'hôte"
 
 #: ../libpurple/protocols/irc/irc.c:438
-#: ../libpurple/protocols/jabber/jabber.c:495
+#: ../libpurple/protocols/jabber/jabber.c:499
 msgid "Connection Failed"
 msgstr "Échec de la connexion"
 
 #: ../libpurple/protocols/irc/irc.c:441
-#: ../libpurple/protocols/jabber/jabber.c:498
+#: ../libpurple/protocols/jabber/jabber.c:502
 msgid "SSL Handshake Failed"
 msgstr "Échec de la poignée de main SSL"
 
@@ -3553,16 +3637,19 @@
 msgstr "Erreur de lecture"
 
 #: ../libpurple/protocols/irc/irc.c:775
-#: ../libpurple/protocols/silc/chat.c:1426
-#: ../libpurple/protocols/yahoo/yahoochat.c:1438
+#: ../libpurple/protocols/silc/chat.c:1412
+#: ../libpurple/protocols/silc10/chat.c:1426
+#: ../libpurple/protocols/yahoo/yahoochat.c:1401
 msgid "Users"
 msgstr "Utilisateurs"
 
 #: ../libpurple/protocols/irc/irc.c:778
 #: ../libpurple/protocols/sametime/sametime.c:3374
-#: ../libpurple/protocols/silc/chat.c:1429
-#: ../libpurple/protocols/silc/ops.c:1382
-#: ../libpurple/protocols/yahoo/yahoochat.c:1447
+#: ../libpurple/protocols/silc/chat.c:1415
+#: ../libpurple/protocols/silc/ops.c:1389
+#: ../libpurple/protocols/silc10/chat.c:1429
+#: ../libpurple/protocols/silc10/ops.c:1382
+#: ../libpurple/protocols/yahoo/yahoochat.c:1410
 msgid "Topic"
 msgstr "Sujet"
 
@@ -3574,55 +3661,65 @@
 #. *< id
 #. *< name
 #. *< version
-#: ../libpurple/protocols/irc/irc.c:915
+#: ../libpurple/protocols/irc/irc.c:916
 msgid "IRC Protocol Plugin"
 msgstr "Plugin pour le protocole IRC"
 
 #. *  summary
-#: ../libpurple/protocols/irc/irc.c:916
+#: ../libpurple/protocols/irc/irc.c:917
 msgid "The IRC Protocol Plugin that Sucks Less"
 msgstr "Plugin qui pue moins pour le protocole IRC"
 
 #. host to connect to
-#: ../libpurple/protocols/irc/irc.c:941 ../libpurple/protocols/irc/msgs.c:323
-#: ../libpurple/protocols/msn/msn.c:2130
-#: ../libpurple/protocols/oscar/oscar.c:6581
+#: ../libpurple/protocols/irc/irc.c:942 ../libpurple/protocols/irc/msgs.c:323
+#: ../libpurple/protocols/msn/msn.c:2154
+#: ../libpurple/protocols/oscar/oscar.c:6650
 #: ../libpurple/protocols/qq/qq.c:756
 #: ../libpurple/protocols/sametime/sametime.c:5727
-#: ../libpurple/protocols/silc/ops.c:1244
-#: ../libpurple/protocols/silc/ops.c:1347
+#: ../libpurple/protocols/silc/ops.c:1249
+#: ../libpurple/protocols/silc/ops.c:1341
+#: ../libpurple/protocols/silc10/ops.c:1244
+#: ../libpurple/protocols/silc10/ops.c:1347
 #: ../libpurple/protocols/simple/simple.c:1850
 #: ../libpurple/protocols/toc/toc.c:2327
 msgid "Server"
 msgstr "Serveur"
 
 #. port to connect to
-#: ../libpurple/protocols/irc/irc.c:944 ../libpurple/protocols/msn/msn.c:2135
-#: ../libpurple/protocols/oscar/oscar.c:6584
+#: ../libpurple/protocols/irc/irc.c:945 ../libpurple/protocols/msn/msn.c:2159
+#: ../libpurple/protocols/oscar/oscar.c:6653
 #: ../libpurple/protocols/qq/qq.c:759
 #: ../libpurple/protocols/sametime/sametime.c:5732
-#: ../libpurple/protocols/silc/silc.c:1870
+#: ../libpurple/protocols/silc/silc.c:1918
+#: ../libpurple/protocols/silc10/silc.c:1861
 #: ../libpurple/protocols/toc/toc.c:2331
 msgid "Port"
 msgstr "Port"
 
-#: ../libpurple/protocols/irc/irc.c:947
+#: ../libpurple/protocols/irc/irc.c:948
 msgid "Encodings"
 msgstr "Codages"
 
-#: ../libpurple/protocols/irc/irc.c:950 ../libpurple/protocols/irc/msgs.c:316
-#: ../libpurple/protocols/jabber/jabber.c:799
+#: ../libpurple/protocols/irc/irc.c:951 ../libpurple/protocols/irc/msgs.c:316
+#: ../libpurple/protocols/jabber/jabber.c:803
 #: ../libpurple/protocols/silc/buddy.c:1539
-#: ../libpurple/protocols/silc/ops.c:1191
-#: ../libpurple/protocols/silc/ops.c:1194
-#: ../libpurple/protocols/silc/ops.c:1340
-#: ../libpurple/protocols/silc/ops.c:1343
-#: ../libpurple/protocols/silc/silc.c:924
+#: ../libpurple/protocols/silc/ops.c:1197
+#: ../libpurple/protocols/silc/ops.c:1200
+#: ../libpurple/protocols/silc/ops.c:1334
+#: ../libpurple/protocols/silc/ops.c:1337
+#: ../libpurple/protocols/silc/silc.c:1005
+#: ../libpurple/protocols/silc10/buddy.c:1539
+#: ../libpurple/protocols/silc10/ops.c:1191
+#: ../libpurple/protocols/silc10/ops.c:1194
+#: ../libpurple/protocols/silc10/ops.c:1340
+#: ../libpurple/protocols/silc10/ops.c:1343
+#: ../libpurple/protocols/silc10/silc.c:916
 msgid "Username"
 msgstr "Utilisateur"
 
-#: ../libpurple/protocols/irc/irc.c:953 ../libpurple/protocols/irc/msgs.c:317
-#: ../libpurple/protocols/silc/silc.c:928
+#: ../libpurple/protocols/irc/irc.c:954 ../libpurple/protocols/irc/msgs.c:317
+#: ../libpurple/protocols/silc/silc.c:1009
+#: ../libpurple/protocols/silc10/silc.c:920
 msgid "Real name"
 msgstr "Nom réel"
 
@@ -3630,7 +3727,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:961
+#: ../libpurple/protocols/irc/irc.c:962
 msgid "Use SSL"
 msgstr "Utiliser SSL"
 
@@ -3661,13 +3758,15 @@
 msgstr " <i>(identifié)</i>"
 
 #: ../libpurple/protocols/irc/msgs.c:303
-#: ../libpurple/protocols/oscar/oscar.c:3687
-#: ../libpurple/protocols/silc/ops.c:1414
+#: ../libpurple/protocols/oscar/oscar.c:3714
+#: ../libpurple/protocols/silc/ops.c:1418
+#: ../libpurple/protocols/silc10/ops.c:1414
 msgid "Nick"
 msgstr "Pseudonyme"
 
 #: ../libpurple/protocols/irc/msgs.c:329
-#: ../libpurple/protocols/silc/ops.c:1272
+#: ../libpurple/protocols/silc/ops.c:1268
+#: ../libpurple/protocols/silc10/ops.c:1272
 msgid "Currently on"
 msgstr "Actuellement dans"
 
@@ -3687,98 +3786,99 @@
 msgid "Glorious"
 msgstr "Glorieux"
 
-#: ../libpurple/protocols/irc/msgs.c:417
+#: ../libpurple/protocols/irc/msgs.c:420
 #, c-format
 msgid "%s has changed the topic to: %s"
 msgstr "%s a changé le sujet en : %s"
 
-#: ../libpurple/protocols/irc/msgs.c:419
+#: ../libpurple/protocols/irc/msgs.c:422
 #, c-format
 msgid "%s has cleared the topic."
 msgstr "%s a effacé le sujet."
 
-#: ../libpurple/protocols/irc/msgs.c:427
+#: ../libpurple/protocols/irc/msgs.c:430
 #, c-format
 msgid "The topic for %s is: %s"
 msgstr "Le sujet de %s est : %s"
 
-#: ../libpurple/protocols/irc/msgs.c:445
+#: ../libpurple/protocols/irc/msgs.c:448
 #, c-format
 msgid "Unknown message '%s'"
 msgstr "Message inconnu '%s'"
 
-#: ../libpurple/protocols/irc/msgs.c:446
+#: ../libpurple/protocols/irc/msgs.c:449
 msgid "Unknown message"
 msgstr "Message inconnu"
 
-#: ../libpurple/protocols/irc/msgs.c:446
+#: ../libpurple/protocols/irc/msgs.c:449
 msgid "The IRC server received a message it did not understand."
 msgstr "Un message a été envoyé que le serveur IRC ne comprend pas."
 
-#: ../libpurple/protocols/irc/msgs.c:467
+#: ../libpurple/protocols/irc/msgs.c:470
 #, c-format
 msgid "Users on %s: %s"
 msgstr "Utilisateurs dans %s : %s"
 
-#: ../libpurple/protocols/irc/msgs.c:572
+#: ../libpurple/protocols/irc/msgs.c:575
 msgid "Time Response"
 msgstr "Temps de réponse"
 
-#: ../libpurple/protocols/irc/msgs.c:573
+#: ../libpurple/protocols/irc/msgs.c:576
 msgid "The IRC server's local time is:"
 msgstr "L'heure locale du serveur IRC est :"
 
-#: ../libpurple/protocols/irc/msgs.c:584
+#: ../libpurple/protocols/irc/msgs.c:587
 msgid "No such channel"
 msgstr "Ce salon n'existe pas"
 
 #. does this happen?
-#: ../libpurple/protocols/irc/msgs.c:595
+#: ../libpurple/protocols/irc/msgs.c:598
 msgid "no such channel"
 msgstr "Ce salon n'existe pas"
 
-#: ../libpurple/protocols/irc/msgs.c:598
+#: ../libpurple/protocols/irc/msgs.c:601
 msgid "User is not logged in"
 msgstr "Utilisateur non connecté"
 
-#: ../libpurple/protocols/irc/msgs.c:603
+#: ../libpurple/protocols/irc/msgs.c:606
 msgid "No such nick or channel"
 msgstr "Ce pseudo ou salon n'existe pas"
 
-#: ../libpurple/protocols/irc/msgs.c:623
+#: ../libpurple/protocols/irc/msgs.c:626
 msgid "Could not send"
 msgstr "Impossible d'envoyer"
 
-#: ../libpurple/protocols/irc/msgs.c:679
+#: ../libpurple/protocols/irc/msgs.c:682
 #, c-format
 msgid "Joining %s requires an invitation."
 msgstr "Entrer dans %s nécessite une invitation"
 
-#: ../libpurple/protocols/irc/msgs.c:680
+#: ../libpurple/protocols/irc/msgs.c:683
 msgid "Invitation only"
 msgstr "Sur invitation seulement"
 
-#: ../libpurple/protocols/irc/msgs.c:792
+#: ../libpurple/protocols/irc/msgs.c:795
 #, c-format
 msgid "You have been kicked by %s: (%s)"
 msgstr "Vous avez été expulsé par %s (%s)"
 
 #. Remove user from channel
-#: ../libpurple/protocols/irc/msgs.c:797 ../libpurple/protocols/silc/ops.c:720
+#: ../libpurple/protocols/irc/msgs.c:800 ../libpurple/protocols/silc/ops.c:699
+#: ../libpurple/protocols/silc10/ops.c:720
 #, c-format
 msgid "Kicked by %s (%s)"
 msgstr "Expulsé par %s (%s)"
 
-#: ../libpurple/protocols/irc/msgs.c:820
+#: ../libpurple/protocols/irc/msgs.c:823
 #, c-format
 msgid "mode (%s %s) by %s"
 msgstr "mode (%s %s) par %s"
 
-#: ../libpurple/protocols/irc/msgs.c:905 ../libpurple/protocols/irc/msgs.c:906
+#: ../libpurple/protocols/irc/msgs.c:908 ../libpurple/protocols/irc/msgs.c:909
 msgid "Invalid nickname"
 msgstr "Pseudonyme non valide"
 
-#: ../libpurple/protocols/irc/msgs.c:907
+#: ../libpurple/protocols/irc/msgs.c:910
 msgid ""
 "Your selected nickname was rejected by the server.  It probably contains "
 "invalid characters."
@@ -3786,7 +3886,7 @@
 "Le pseudonyme choisi a été rejeté par le serveur. Il contenait probablement "
 "des caractères non valides."
 
-#: ../libpurple/protocols/irc/msgs.c:912
+#: ../libpurple/protocols/irc/msgs.c:915
 msgid ""
 "Your selected account name was rejected by the server.  It probably contains "
 "invalid characters."
@@ -3794,43 +3894,44 @@
 "Le nom de compte choisi a été rejeté par le serveur. Le nom contenait "
 "probablement des caractères non valides."
 
-#: ../libpurple/protocols/irc/msgs.c:951
+#: ../libpurple/protocols/irc/msgs.c:954
 msgid "Cannot change nick"
 msgstr "Impossible de changer de surnom"
 
-#: ../libpurple/protocols/irc/msgs.c:951
+#: ../libpurple/protocols/irc/msgs.c:954
 msgid "Could not change nick"
 msgstr "Impossible de changer de surnom"
 
-#: ../libpurple/protocols/irc/msgs.c:972
+#: ../libpurple/protocols/irc/msgs.c:975
 #, c-format
 msgid "You have parted the channel%s%s"
 msgstr "Vous avez quitté le salon %s%s"
 
-#: ../libpurple/protocols/irc/msgs.c:1014
+#: ../libpurple/protocols/irc/msgs.c:1017
 msgid "Error: invalid PONG from server"
 msgstr "PONG non valide du serveur"
 
-#: ../libpurple/protocols/irc/msgs.c:1016
+#: ../libpurple/protocols/irc/msgs.c:1019
 #, c-format
 msgid "PING reply -- Lag: %lu seconds"
 msgstr "Réponse au PING -- Lag : %lu secondes"
 
-#: ../libpurple/protocols/irc/msgs.c:1097
+#: ../libpurple/protocols/irc/msgs.c:1110
 #, c-format
 msgid "Cannot join %s: Registration is required."
 msgstr "Impossible d'entrer dans %s : un enregistrement est nécessaire."
 
-#: ../libpurple/protocols/irc/msgs.c:1098
-#: ../libpurple/protocols/silc/ops.c:1128
+#: ../libpurple/protocols/irc/msgs.c:1111
+#: ../libpurple/protocols/silc/ops.c:1093
+#: ../libpurple/protocols/silc10/ops.c:1128
 msgid "Cannot join channel"
 msgstr "Impossible d'entrer dans le salon"
 
-#: ../libpurple/protocols/irc/msgs.c:1132
+#: ../libpurple/protocols/irc/msgs.c:1145
 msgid "Nick or channel is temporarily unavailable."
 msgstr "Le pseudonyme ou le service est temporairement indisponible."
 
-#: ../libpurple/protocols/irc/msgs.c:1144
+#: ../libpurple/protocols/irc/msgs.c:1157
 #, c-format
 msgid "Wallops from %s"
 msgstr "Wallops de %s"
@@ -4047,23 +4148,24 @@
 #: ../libpurple/protocols/irc/parse.c:155
 msgid "whowas &lt;nick&gt;: Get information on a user that has logged off."
 msgstr ""
-"whowas &lt;pseudo&gt; : Récupérer des informations sur une personne déconnectée."
-
-#: ../libpurple/protocols/irc/parse.c:449
+"whowas &lt;pseudo&gt; : Récupérer des informations sur une personne "
+"déconnectée."
+
+#: ../libpurple/protocols/irc/parse.c:465
 #, c-format
 msgid "Reply time from %s: %lu seconds"
 msgstr "Temps de réponse de %s : %lu secondes"
 
-#: ../libpurple/protocols/irc/parse.c:450
+#: ../libpurple/protocols/irc/parse.c:466
 msgid "PONG"
 msgstr "PONG"
 
-#: ../libpurple/protocols/irc/parse.c:450
+#: ../libpurple/protocols/irc/parse.c:466
 msgid "CTCP PING reply"
 msgstr "Réponse au CTCP PING"
 
-#: ../libpurple/protocols/irc/parse.c:561
-#: ../libpurple/protocols/irc/parse.c:565 ../libpurple/protocols/toc/toc.c:191
+#: ../libpurple/protocols/irc/parse.c:577
+#: ../libpurple/protocols/irc/parse.c:581 ../libpurple/protocols/toc/toc.c:191
 #: ../libpurple/protocols/toc/toc.c:694 ../libpurple/protocols/toc/toc.c:710
 #: ../libpurple/protocols/toc/toc.c:786
 msgid "Disconnected."
@@ -4088,9 +4190,8 @@
 "%s requires plaintext authentication over an unencrypted connection.  Allow "
 "this and continue authentication?"
 msgstr ""
-"%s demande une authentification en texte clair au travers d'une "
-"connexion non cryptée. Voulez-vous autoriser ceci et continuer "
-"l'authentification ?"
+"%s demande une authentification en texte clair au travers d'une connexion "
+"non cryptée. Voulez-vous autoriser ceci et continuer l'authentification ?"
 
 #: ../libpurple/protocols/jabber/auth.c:296
 #: ../libpurple/protocols/jabber/auth.c:297
@@ -4110,10 +4211,10 @@
 #. This should never happen!
 #: ../libpurple/protocols/jabber/auth.c:437
 #: ../libpurple/protocols/jabber/auth.c:533
-#: ../libpurple/protocols/jabber/auth.c:714
-#: ../libpurple/protocols/jabber/auth.c:848
-#: ../libpurple/protocols/jabber/auth.c:873
-#: ../libpurple/protocols/jabber/auth.c:892
+#: ../libpurple/protocols/jabber/auth.c:748
+#: ../libpurple/protocols/jabber/auth.c:889
+#: ../libpurple/protocols/jabber/auth.c:914
+#: ../libpurple/protocols/jabber/auth.c:933
 #: ../libpurple/protocols/jabber/jabber.c:115
 msgid "Invalid response from server."
 msgstr "Réponse non valide du serveur"
@@ -4127,119 +4228,125 @@
 "connexion non cryptée. Voulez-vous autoriser ceci et continuer "
 "l'authentification ?"
 
-#: ../libpurple/protocols/jabber/auth.c:735
+#: ../libpurple/protocols/jabber/auth.c:769
+#: ../libpurple/protocols/jabber/auth.c:792
 msgid "Invalid challenge from server"
 msgstr "Demande d'accès non valide du serveur"
 
-#: ../libpurple/protocols/jabber/auth.c:823
+#: ../libpurple/protocols/jabber/auth.c:864
 msgid "SASL error"
 msgstr "Erreur SASL"
 
 #: ../libpurple/protocols/jabber/buddy.c:271
-#: ../libpurple/protocols/jabber/buddy.c:787
+#: ../libpurple/protocols/jabber/buddy.c:825
 #: ../libpurple/protocols/sametime/sametime.c:4128
-#: ../libpurple/protocols/silc/ops.c:1020
+#: ../libpurple/protocols/silc/ops.c:986
+#: ../libpurple/protocols/silc10/ops.c:1020
 msgid "Full Name"
 msgstr "Nom complet"
 
 #: ../libpurple/protocols/jabber/buddy.c:272
-#: ../libpurple/protocols/jabber/buddy.c:800
-#: ../libpurple/protocols/silc/ops.c:1032
+#: ../libpurple/protocols/jabber/buddy.c:838
+#: ../libpurple/protocols/silc/ops.c:998
+#: ../libpurple/protocols/silc10/ops.c:1032
 msgid "Family Name"
 msgstr "Nom de famille"
 
 #: ../libpurple/protocols/jabber/buddy.c:273
-#: ../libpurple/protocols/jabber/buddy.c:804
+#: ../libpurple/protocols/jabber/buddy.c:842
 msgid "Given Name"
 msgstr "Nom usuel"
 
 #: ../libpurple/protocols/jabber/buddy.c:275
-#: ../libpurple/protocols/jabber/jabber.c:859
+#: ../libpurple/protocols/jabber/jabber.c:863
 msgid "URL"
 msgstr "URL"
 
 #: ../libpurple/protocols/jabber/buddy.c:276
-#: ../libpurple/protocols/jabber/buddy.c:856
+#: ../libpurple/protocols/jabber/buddy.c:894
 msgid "Street Address"
 msgstr "Adresse"
 
 #: ../libpurple/protocols/jabber/buddy.c:277
-#: ../libpurple/protocols/jabber/buddy.c:852
+#: ../libpurple/protocols/jabber/buddy.c:890
 msgid "Extended Address"
 msgstr "Adresse (suite)"
 
 #: ../libpurple/protocols/jabber/buddy.c:278
-#: ../libpurple/protocols/jabber/buddy.c:860
+#: ../libpurple/protocols/jabber/buddy.c:898
 msgid "Locality"
 msgstr "Localité"
 
 #: ../libpurple/protocols/jabber/buddy.c:279
-#: ../libpurple/protocols/jabber/buddy.c:864
+#: ../libpurple/protocols/jabber/buddy.c:902
 msgid "Region"
 msgstr "Région"
 
 #: ../libpurple/protocols/jabber/buddy.c:280
-#: ../libpurple/protocols/jabber/buddy.c:868
+#: ../libpurple/protocols/jabber/buddy.c:906
 msgid "Postal Code"
 msgstr "Code postal"
 
 #: ../libpurple/protocols/jabber/buddy.c:281
-#: ../libpurple/protocols/jabber/buddy.c:873
-#: ../libpurple/protocols/silc/silc.c:934
+#: ../libpurple/protocols/jabber/buddy.c:911
+#: ../libpurple/protocols/silc/silc.c:1015
+#: ../libpurple/protocols/silc10/silc.c:926
 msgid "Country"
 msgstr "Pays"
 
 #: ../libpurple/protocols/jabber/buddy.c:282
-#: ../libpurple/protocols/jabber/buddy.c:884
-#: ../libpurple/protocols/jabber/buddy.c:891
+#: ../libpurple/protocols/jabber/buddy.c:922
+#: ../libpurple/protocols/jabber/buddy.c:929
 msgid "Telephone"
 msgstr "Téléphone"
 
 #: ../libpurple/protocols/jabber/buddy.c:283
-#: ../libpurple/protocols/jabber/buddy.c:902
-#: ../libpurple/protocols/jabber/buddy.c:910
-#: ../libpurple/protocols/jabber/buddy.c:1591
-#: ../libpurple/protocols/silc/ops.c:1075
-#: ../libpurple/protocols/silc/util.c:551
+#: ../libpurple/protocols/jabber/buddy.c:940
+#: ../libpurple/protocols/jabber/buddy.c:948
+#: ../libpurple/protocols/jabber/buddy.c:1629
+#: ../libpurple/protocols/silc/ops.c:1041
+#: ../libpurple/protocols/silc/util.c:555
+#: ../libpurple/protocols/silc10/ops.c:1075
+#: ../libpurple/protocols/silc10/util.c:551
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1037
 msgid "E-Mail"
 msgstr "Courriel"
 
 #: ../libpurple/protocols/jabber/buddy.c:284
-#: ../libpurple/protocols/jabber/buddy.c:925
+#: ../libpurple/protocols/jabber/buddy.c:963
 msgid "Organization Name"
 msgstr "Organisation"
 
 #: ../libpurple/protocols/jabber/buddy.c:285
-#: ../libpurple/protocols/jabber/buddy.c:929
+#: ../libpurple/protocols/jabber/buddy.c:967
 msgid "Organization Unit"
 msgstr "Service"
 
 #: ../libpurple/protocols/jabber/buddy.c:287
-#: ../libpurple/protocols/jabber/buddy.c:938
+#: ../libpurple/protocols/jabber/buddy.c:976
 msgid "Role"
 msgstr "Rôle"
 
 #: ../libpurple/protocols/jabber/buddy.c:288
-#: ../libpurple/protocols/jabber/buddy.c:821
-#: ../libpurple/protocols/msn/msn.c:1606
-#: ../libpurple/protocols/oscar/oscar.c:3736
+#: ../libpurple/protocols/jabber/buddy.c:859
+#: ../libpurple/protocols/msn/msn.c:1627
+#: ../libpurple/protocols/oscar/oscar.c:3763
 msgid "Birthday"
 msgstr "Date de naissance"
 
 #: ../libpurple/protocols/jabber/buddy.c:289
-#: ../libpurple/protocols/jabber/buddy.c:941
-#: ../libpurple/protocols/jabber/chat.c:775 ../pidgin/gtkblist.c:3064
-#: ../pidgin/gtkprefs.c:680
+#: ../libpurple/protocols/jabber/buddy.c:979
+#: ../libpurple/protocols/jabber/chat.c:775 ../pidgin/gtkblist.c:3081
+#: ../pidgin/gtkprefs.c:738
 msgid "Description"
 msgstr "Description"
 
-#: ../libpurple/protocols/jabber/buddy.c:578
-#: ../libpurple/protocols/jabber/buddy.c:579
+#: ../libpurple/protocols/jabber/buddy.c:582
+#: ../libpurple/protocols/jabber/buddy.c:583
 msgid "Edit XMPP vCard"
 msgstr "Modifier la carte de visite XMPP"
 
-#: ../libpurple/protocols/jabber/buddy.c:580
+#: ../libpurple/protocols/jabber/buddy.c:584
 msgid ""
 "All items below are optional. Enter only the information with which you feel "
 "comfortable."
@@ -4247,114 +4354,117 @@
 "Toutes les rubriques ci-dessous sont facultatives. Saisissez uniquement les "
 "informations que vous désirez rendre publiques."
 
-#: ../libpurple/protocols/jabber/buddy.c:651
-#: ../libpurple/protocols/jabber/buddy.c:692
+#: ../libpurple/protocols/jabber/buddy.c:655
+#: ../libpurple/protocols/jabber/buddy.c:696
 msgid "Client"
 msgstr "Client"
 
-#: ../libpurple/protocols/jabber/buddy.c:655
-#: ../libpurple/protocols/jabber/buddy.c:696
+#: ../libpurple/protocols/jabber/buddy.c:659
+#: ../libpurple/protocols/jabber/buddy.c:700
 msgid "Operating System"
 msgstr "Système d'exploitation"
 
-#: ../libpurple/protocols/jabber/buddy.c:665
-#: ../libpurple/protocols/jabber/libxmpp.c:198
+#: ../libpurple/protocols/jabber/buddy.c:669
+#: ../libpurple/protocols/jabber/libxmpp.c:202
+#: ../libpurple/protocols/jabber/si.c:853
 msgid "Resource"
 msgstr "Ressource"
 
-#: ../libpurple/protocols/jabber/buddy.c:667
-#: ../libpurple/protocols/jabber/jabber.c:1245
-#: ../libpurple/protocols/jabber/jabber.c:1255
-#: ../libpurple/protocols/jabber/jabber.c:1265
-#: ../libpurple/protocols/jabber/jabber.c:1275
-#: ../libpurple/protocols/jabber/jabber.c:1285
+#: ../libpurple/protocols/jabber/buddy.c:671
+#: ../libpurple/protocols/jabber/jabber.c:1243
+#: ../libpurple/protocols/jabber/jabber.c:1253
+#: ../libpurple/protocols/jabber/jabber.c:1263
+#: ../libpurple/protocols/jabber/jabber.c:1273
+#: ../libpurple/protocols/jabber/jabber.c:1283
 msgid "Priority"
 msgstr "Priorité"
 
-#: ../libpurple/protocols/jabber/buddy.c:808
-#: ../libpurple/protocols/silc/ops.c:1028
+#: ../libpurple/protocols/jabber/buddy.c:846
+#: ../libpurple/protocols/silc/ops.c:994
+#: ../libpurple/protocols/silc10/ops.c:1028
 msgid "Middle Name"
 msgstr "Deuxième prénom"
 
-#: ../libpurple/protocols/jabber/buddy.c:841
-#: ../libpurple/protocols/jabber/jabber.c:834
-#: ../libpurple/protocols/oscar/oscar.c:3775
-#: ../libpurple/protocols/oscar/oscar.c:3788
+#: ../libpurple/protocols/jabber/buddy.c:879
+#: ../libpurple/protocols/jabber/jabber.c:838
+#: ../libpurple/protocols/oscar/oscar.c:3802
+#: ../libpurple/protocols/oscar/oscar.c:3815
 #: ../libpurple/protocols/qq/buddy_info.c:56
-#: ../libpurple/protocols/silc/ops.c:1064
+#: ../libpurple/protocols/silc/ops.c:1030
+#: ../libpurple/protocols/silc10/ops.c:1064
 msgid "Address"
 msgstr "Adresse"
 
-#: ../libpurple/protocols/jabber/buddy.c:848
+#: ../libpurple/protocols/jabber/buddy.c:886
 msgid "P.O. Box"
 msgstr "Boîte postale"
 
-#: ../libpurple/protocols/jabber/buddy.c:962
+#: ../libpurple/protocols/jabber/buddy.c:1000
 msgid "Photo"
 msgstr "Photo"
 
-#: ../libpurple/protocols/jabber/buddy.c:962
+#: ../libpurple/protocols/jabber/buddy.c:1000
 msgid "Logo"
 msgstr "Logo"
 
-#: ../libpurple/protocols/jabber/buddy.c:1371
+#: ../libpurple/protocols/jabber/buddy.c:1409
 msgid "Un-hide From"
 msgstr "Se montrer à"
 
-#: ../libpurple/protocols/jabber/buddy.c:1375
+#: ../libpurple/protocols/jabber/buddy.c:1413
 msgid "Temporarily Hide From"
 msgstr "Se cacher de"
 
 #. && NOT ME
-#: ../libpurple/protocols/jabber/buddy.c:1383
+#: ../libpurple/protocols/jabber/buddy.c:1421
 msgid "Cancel Presence Notification"
 msgstr "Annuler la notification de présence"
 
-#: ../libpurple/protocols/jabber/buddy.c:1390
+#: ../libpurple/protocols/jabber/buddy.c:1428
 msgid "(Re-)Request authorization"
 msgstr "(Re-)Demander autorisation"
 
 #. if(NOT ME)
 #. shouldn't this just happen automatically when the buddy is
 #. removed?
-#: ../libpurple/protocols/jabber/buddy.c:1399
+#: ../libpurple/protocols/jabber/buddy.c:1437
 msgid "Unsubscribe"
 msgstr "Désinscription"
 
 # Repris du fr.po de gabber
-#: ../libpurple/protocols/jabber/buddy.c:1432
-#: ../libpurple/protocols/jabber/jabber.c:1254
+#: ../libpurple/protocols/jabber/buddy.c:1470
+#: ../libpurple/protocols/jabber/jabber.c:1252
 msgid "Chatty"
 msgstr "Bavard"
 
-#: ../libpurple/protocols/jabber/buddy.c:1436 ../libpurple/status.c:158
+#: ../libpurple/protocols/jabber/buddy.c:1474
 msgid "Extended Away"
 msgstr "Longue absence"
 
-#: ../libpurple/protocols/jabber/buddy.c:1438
-#: ../libpurple/protocols/jabber/jabber.c:1284
-#: ../libpurple/protocols/oscar/oscar.c:709
-#: ../libpurple/protocols/oscar/oscar.c:5718
+#: ../libpurple/protocols/jabber/buddy.c:1476
+#: ../libpurple/protocols/jabber/jabber.c:1282
+#: ../libpurple/protocols/oscar/oscar.c:727
+#: ../libpurple/protocols/oscar/oscar.c:5787
 #: ../libpurple/protocols/sametime/sametime.c:3297
 msgid "Do Not Disturb"
 msgstr "Ne pas déranger"
 
-#: ../libpurple/protocols/jabber/buddy.c:1583
+#: ../libpurple/protocols/jabber/buddy.c:1621
 msgid "JID"
 msgstr "JID"
 
-#: ../libpurple/protocols/jabber/buddy.c:1587
-#: ../libpurple/protocols/jabber/buddy.c:1766
-#: ../libpurple/protocols/oscar/oscar.c:3698
+#: ../libpurple/protocols/jabber/buddy.c:1625
+#: ../libpurple/protocols/jabber/buddy.c:1804
+#: ../libpurple/protocols/oscar/oscar.c:3725
 msgid "Last Name"
 msgstr "Nom"
 
-#: ../libpurple/protocols/jabber/buddy.c:1619
+#: ../libpurple/protocols/jabber/buddy.c:1657
 msgid "The following are the results of your search"
 msgstr "Voici les résultats de votre recherche."
 
 #. current comment from Jabber User Directory users.jabber.org
-#: ../libpurple/protocols/jabber/buddy.c:1694
+#: ../libpurple/protocols/jabber/buddy.c:1732
 msgid ""
 "Find a contact by entering the search criteria in the given fields. Note: "
 "Each field supports wild card searches (%)"
@@ -4362,69 +4472,69 @@
 "Recherchez un utilisateur en renseignant les rubriques ci-dessous. Note : on "
 "peut utiliser % comme joker dans chaque rubrique."
 
-#: ../libpurple/protocols/jabber/buddy.c:1714
+#: ../libpurple/protocols/jabber/buddy.c:1752
 msgid "Directory Query Failed"
 msgstr "Échec de la recherche dans l'annuaire"
 
-#: ../libpurple/protocols/jabber/buddy.c:1715
+#: ../libpurple/protocols/jabber/buddy.c:1753
 msgid "Could not query the directory server."
 msgstr "Impossible de parler au serveur annuaire."
 
 #. Try to translate the message (see static message
 #. list in jabber_user_dir_comments[])
-#: ../libpurple/protocols/jabber/buddy.c:1749
+#: ../libpurple/protocols/jabber/buddy.c:1787
 #, c-format
 msgid "Server Instructions: %s"
 msgstr "Instructions du serveur : %s"
 
-#: ../libpurple/protocols/jabber/buddy.c:1756
+#: ../libpurple/protocols/jabber/buddy.c:1794
 msgid "Fill in one or more fields to search for any matching XMPP users."
 msgstr "Saisissez un ou plusieurs critères de recherche d'utilisateurs XMPP."
 
-#: ../libpurple/protocols/jabber/buddy.c:1776
+#: ../libpurple/protocols/jabber/buddy.c:1814
 #: ../libpurple/protocols/novell/novell.c:1488
-#: ../libpurple/protocols/oscar/oscar.c:3701
-#: ../libpurple/protocols/oscar/oscar.c:3710
+#: ../libpurple/protocols/oscar/oscar.c:3728
+#: ../libpurple/protocols/oscar/oscar.c:3737
 msgid "E-Mail Address"
 msgstr "Adresse électronique"
 
-#: ../libpurple/protocols/jabber/buddy.c:1785
-#: ../libpurple/protocols/jabber/buddy.c:1786
+#: ../libpurple/protocols/jabber/buddy.c:1823
+#: ../libpurple/protocols/jabber/buddy.c:1824
 msgid "Search for XMPP users"
 msgstr "Rechercher un utilisateur XMPP"
 
 #. "Search"
-#: ../libpurple/protocols/jabber/buddy.c:1787
+#: ../libpurple/protocols/jabber/buddy.c:1825
 #: ../libpurple/protocols/qq/group.c:123
-#: ../libpurple/protocols/qq/group_im.c:145
+#: ../libpurple/protocols/qq/group_im.c:147
 #: ../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:5611
-#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:473
-#: ../pidgin/plugins/gevolution/assoc-buddy.c:358
+#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:470
+#: ../pidgin/plugins/gevolution/assoc-buddy.c:356
 msgid "Search"
 msgstr "Recherche"
 
-#: ../libpurple/protocols/jabber/buddy.c:1802
+#: ../libpurple/protocols/jabber/buddy.c:1840
 msgid "Invalid Directory"
 msgstr "Annuaire non valide"
 
-#: ../libpurple/protocols/jabber/buddy.c:1819
+#: ../libpurple/protocols/jabber/buddy.c:1857
 msgid "Enter a User Directory"
 msgstr "Saisissez un annuaire d'utilisateurs"
 
-#: ../libpurple/protocols/jabber/buddy.c:1820
+#: ../libpurple/protocols/jabber/buddy.c:1858
 msgid "Select a user directory to search"
 msgstr "Choisissez un annuaire d'utilisateurs pour la recherche"
 
-#: ../libpurple/protocols/jabber/buddy.c:1823
+#: ../libpurple/protocols/jabber/buddy.c:1861
 msgid "Search Directory"
 msgstr "Annuaire de recherche"
 
 #: ../libpurple/protocols/jabber/chat.c:41
-#: ../libpurple/protocols/oscar/oscar.c:5224
-#: ../libpurple/protocols/yahoo/yahoochat.c:999
+#: ../libpurple/protocols/oscar/oscar.c:5273
+#: ../libpurple/protocols/yahoo/yahoochat.c:962
 msgid "_Room:"
 msgstr "_Salon :"
 
@@ -4495,7 +4605,8 @@
 
 #: ../libpurple/protocols/jabber/chat.c:678
 #: ../libpurple/protocols/jabber/chat.c:689
-#: ../libpurple/protocols/silc/ops.c:1451
+#: ../libpurple/protocols/silc/ops.c:1456
+#: ../libpurple/protocols/silc10/ops.c:1451
 msgid "Error retrieving room list"
 msgstr "Erreur à la récupération de la liste des salons de discussions"
 
@@ -4530,143 +4641,162 @@
 msgid "Read Error"
 msgstr "Erreur de lecture"
 
-#: ../libpurple/protocols/jabber/jabber.c:519
+#: ../libpurple/protocols/jabber/jabber.c:467
+#: ../libpurple/protocols/oscar/flap_connection.c:386
+#: ../libpurple/protocols/yahoo/yahoo.c:2381
+#: ../libpurple/protocols/yahoo/yahoo.c:2413
+#, c-format
+msgid ""
+"Could not establish a connection with the server:\n"
+"%s"
+msgstr ""
+"Impossible de se connecter au serveur :\n"
+"%s"
+
+#: ../libpurple/protocols/jabber/jabber.c:523
 msgid "Unable to create socket"
 msgstr "Impossible de créer le socket."
 
-#: ../libpurple/protocols/jabber/jabber.c:564
-#: ../libpurple/protocols/jabber/jabber.c:914
+#: ../libpurple/protocols/jabber/jabber.c:568
+#: ../libpurple/protocols/jabber/jabber.c:918
 msgid "Invalid XMPP ID"
 msgstr "Identifiant XMPP non valide."
 
-#: ../libpurple/protocols/jabber/jabber.c:569
+#: ../libpurple/protocols/jabber/jabber.c:573
 msgid "Invalid XMPP ID. Domain must be set."
 msgstr "Identifiant XMPP non valide. Le domaine doit être saisi."
 
-#: ../libpurple/protocols/jabber/jabber.c:640
+#: ../libpurple/protocols/jabber/jabber.c:644
 #, c-format
 msgid "Registration of %s@%s successful"
 msgstr "Enregistrement de %s@%s réussi"
 
-#: ../libpurple/protocols/jabber/jabber.c:642
-#: ../libpurple/protocols/jabber/jabber.c:643
+#: ../libpurple/protocols/jabber/jabber.c:646
+#: ../libpurple/protocols/jabber/jabber.c:647
 msgid "Registration Successful"
 msgstr "Enregistrement auprès du serveur réussi"
 
-#: ../libpurple/protocols/jabber/jabber.c:649
+#: ../libpurple/protocols/jabber/jabber.c:653
 #: ../libpurple/protocols/jabber/jabber.c:1524
 msgid "Unknown Error"
 msgstr "Erreur inconnue"
 
-#: ../libpurple/protocols/jabber/jabber.c:651
-#: ../libpurple/protocols/jabber/jabber.c:652
+#: ../libpurple/protocols/jabber/jabber.c:655
+#: ../libpurple/protocols/jabber/jabber.c:656
 msgid "Registration Failed"
 msgstr "Erreur d'enregistrement"
 
-#: ../libpurple/protocols/jabber/jabber.c:767
-#: ../libpurple/protocols/jabber/jabber.c:768
+#: ../libpurple/protocols/jabber/jabber.c:771
+#: ../libpurple/protocols/jabber/jabber.c:772
 msgid "Already Registered"
 msgstr "Déjà enregistré"
 
-#: ../libpurple/protocols/jabber/jabber.c:844
-#: ../libpurple/protocols/oscar/oscar.c:3777
-#: ../libpurple/protocols/oscar/oscar.c:3790
+#: ../libpurple/protocols/jabber/jabber.c:848
+#: ../libpurple/protocols/oscar/oscar.c:3804
+#: ../libpurple/protocols/oscar/oscar.c:3817
 msgid "State"
 msgstr "État"
 
-#: ../libpurple/protocols/jabber/jabber.c:849
+#: ../libpurple/protocols/jabber/jabber.c:853
 msgid "Postal code"
 msgstr "Code postal"
 
-#: ../libpurple/protocols/jabber/jabber.c:854
-#: ../libpurple/protocols/silc/ops.c:1069
-#: ../libpurple/protocols/silc/silc.c:691
-#: ../libpurple/protocols/silc/util.c:553
+#: ../libpurple/protocols/jabber/jabber.c:858
+#: ../libpurple/protocols/silc/ops.c:1035
+#: ../libpurple/protocols/silc/silc.c:772
+#: ../libpurple/protocols/silc/util.c:557
+#: ../libpurple/protocols/silc10/ops.c:1069
+#: ../libpurple/protocols/silc10/silc.c:683
+#: ../libpurple/protocols/silc10/util.c:553
 msgid "Phone"
 msgstr "Téléphone"
 
-#: ../libpurple/protocols/jabber/jabber.c:864
+#: ../libpurple/protocols/jabber/jabber.c:868
 msgid "Date"
 msgstr "Date"
 
-#: ../libpurple/protocols/jabber/jabber.c:872
+#: ../libpurple/protocols/jabber/jabber.c:876
 msgid "Please fill out the information below to register your new account."
 msgstr ""
 "Veuillez remplir les information ci-dessous pour l'enregistrement du nouveau "
 "compte"
 
-#: ../libpurple/protocols/jabber/jabber.c:875
-#: ../libpurple/protocols/jabber/jabber.c:876
+#: ../libpurple/protocols/jabber/jabber.c:879
+#: ../libpurple/protocols/jabber/jabber.c:880
 msgid "Register New XMPP Account"
 msgstr "Enregistrer un nouveau compte XMPP"
 
 #. Register button
-#: ../libpurple/protocols/jabber/jabber.c:877 ../pidgin/gtkaccount.c:1504
+#: ../libpurple/protocols/jabber/jabber.c:881 ../pidgin/gtkaccount.c:1518
 msgid "Register"
 msgstr "S'enregistrer"
 
-#: ../libpurple/protocols/jabber/jabber.c:1048
+#: ../libpurple/protocols/jabber/jabber.c:1050
 msgid "Initializing Stream"
 msgstr "Initialisation du flux"
 
-#: ../libpurple/protocols/jabber/jabber.c:1053
-#: ../libpurple/protocols/msn/session.c:350
+#: ../libpurple/protocols/jabber/jabber.c:1055
+#: ../libpurple/protocols/msn/session.c:351
 msgid "Authenticating"
 msgstr "Authentification"
 
-#: ../libpurple/protocols/jabber/jabber.c:1062
+#: ../libpurple/protocols/jabber/jabber.c:1064
 msgid "Re-initializing Stream"
 msgstr "Réinitialisation du flux"
 
-#: ../libpurple/protocols/jabber/jabber.c:1128
+#: ../libpurple/protocols/jabber/jabber.c:1126
 #: ../libpurple/protocols/jabber/jabber.c:1502
 #: ../libpurple/protocols/jabber/jabber.c:1543
 #: ../libpurple/protocols/jabber/jabber.c:1579
-#: ../libpurple/protocols/oscar/oscar.c:808
-#: ../libpurple/protocols/oscar/oscar.c:5512
+#: ../libpurple/protocols/oscar/oscar.c:826
+#: ../libpurple/protocols/oscar/oscar.c:5581
 msgid "Not Authorized"
 msgstr "Non autorisé"
 
-#: ../libpurple/protocols/jabber/jabber.c:1170
+#: ../libpurple/protocols/jabber/jabber.c:1168
 msgid "Both"
 msgstr "Bidirectionnelle"
 
+#: ../libpurple/protocols/jabber/jabber.c:1170
+msgid "From (To pending)"
+msgstr "Source (Destination en attente)"
+
 #: ../libpurple/protocols/jabber/jabber.c:1172
-msgid "From (To pending)"
-msgstr "Source (Destination en attente)"
-
-#: ../libpurple/protocols/jabber/jabber.c:1177
+msgid "From"
+msgstr "De"
+
+#: ../libpurple/protocols/jabber/jabber.c:1175
 msgid "To"
 msgstr "Destination"
 
-#: ../libpurple/protocols/jabber/jabber.c:1179
+#: ../libpurple/protocols/jabber/jabber.c:1177
 msgid "None (To pending)"
 msgstr "Aucune (Destination en attente)"
 
-#: ../libpurple/protocols/jabber/jabber.c:1181
+#: ../libpurple/protocols/jabber/jabber.c:1179
 #: ../pidgin/plugins/gevolution/eds-utils.c:73
 #: ../pidgin/plugins/gevolution/eds-utils.c:86
 msgid "None"
 msgstr "Aucun"
 
-#: ../libpurple/protocols/jabber/jabber.c:1184
+#: ../libpurple/protocols/jabber/jabber.c:1182
 msgid "Subscription"
 msgstr "Inscription"
 
-#: ../libpurple/protocols/jabber/jabber.c:1314
+#: ../libpurple/protocols/jabber/jabber.c:1312
 msgid "Password Changed"
 msgstr "Mot de passe changé"
 
-#: ../libpurple/protocols/jabber/jabber.c:1315
+#: ../libpurple/protocols/jabber/jabber.c:1313
 msgid "Your password has been changed."
 msgstr "Le mot de passe a été modifié"
 
-#: ../libpurple/protocols/jabber/jabber.c:1319
-#: ../libpurple/protocols/jabber/jabber.c:1320
+#: ../libpurple/protocols/jabber/jabber.c:1317
+#: ../libpurple/protocols/jabber/jabber.c:1318
 msgid "Error changing password"
 msgstr "Erreur lors du changement du mot de passe"
 
-#: ../libpurple/protocols/jabber/jabber.c:1376
+#: ../libpurple/protocols/jabber/jabber.c:1375
 msgid "Password (again)"
 msgstr "Mot de passe (confirmation)"
 
@@ -4680,15 +4810,17 @@
 msgstr "Saisissez votre nouveau mot de passe"
 
 #: ../libpurple/protocols/jabber/jabber.c:1394
-#: ../libpurple/protocols/oscar/oscar.c:6298
-#: ../libpurple/protocols/silc/silc.c:1015
+#: ../libpurple/protocols/oscar/oscar.c:6367
+#: ../libpurple/protocols/silc/silc.c:1093
+#: ../libpurple/protocols/silc10/silc.c:1004
 msgid "Set User Info..."
 msgstr "Modifier les informations..."
 
 #. if (js->protocol_options & CHANGE_PASSWORD) {
 #: ../libpurple/protocols/jabber/jabber.c:1399
-#: ../libpurple/protocols/oscar/oscar.c:6309
-#: ../libpurple/protocols/silc/silc.c:1011
+#: ../libpurple/protocols/oscar/oscar.c:6378
+#: ../libpurple/protocols/silc/silc.c:1089
+#: ../libpurple/protocols/silc10/silc.c:1000
 msgid "Change Password..."
 msgstr "Changer de mot de passe..."
 
@@ -4815,7 +4947,8 @@
 msgstr "Conflit de ressource"
 
 #: ../libpurple/protocols/jabber/jabber.c:1561
-#: ../libpurple/protocols/silc/ops.c:1729
+#: ../libpurple/protocols/silc/silc.c:244
+#: ../libpurple/protocols/silc10/ops.c:1720
 msgid "Connection Timeout"
 msgstr "Connexion morte"
 
@@ -4995,32 +5128,33 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/jabber/libxmpp.c:166
-#: ../libpurple/protocols/jabber/libxmpp.c:168
+#: ../libpurple/protocols/jabber/libxmpp.c:169
+#: ../libpurple/protocols/jabber/libxmpp.c:171
 msgid "XMPP Protocol Plugin"
 msgstr "Plugin pour le protocole XMPP"
 
 #. Translators: 'domain' is used here in the context of Internet domains, e.g. pidgin.im
-#: ../libpurple/protocols/jabber/libxmpp.c:195
+#: ../libpurple/protocols/jabber/libxmpp.c:198 ../pidgin/gtkaccount.c:508
 msgid "Domain"
 msgstr "Domaine"
 
-#: ../libpurple/protocols/jabber/libxmpp.c:201
+#: ../libpurple/protocols/jabber/libxmpp.c:206
 msgid "Force old (port 5223) SSL"
 msgstr "Forcer l'ancien SSL (port 5223)"
 
-#: ../libpurple/protocols/jabber/libxmpp.c:206
+#: ../libpurple/protocols/jabber/libxmpp.c:211
 msgid "Allow plaintext auth over unencrypted streams"
 msgstr "Autoriser l'authentification en clair pour les flux cryptés"
 
-#: ../libpurple/protocols/jabber/libxmpp.c:211
+#: ../libpurple/protocols/jabber/libxmpp.c:216
 #: ../libpurple/protocols/simple/simple.c:1856
 msgid "Connect port"
 msgstr "Port de connexion"
 
 #. Account options
-#: ../libpurple/protocols/jabber/libxmpp.c:215
-#: ../libpurple/protocols/silc/silc.c:1866
+#: ../libpurple/protocols/jabber/libxmpp.c:220
+#: ../libpurple/protocols/silc/silc.c:1914
+#: ../libpurple/protocols/silc10/silc.c:1857 ../pidgin/gtkaccount.c:837
 msgid "Connect server"
 msgstr "Serveur de connexion"
 
@@ -5053,7 +5187,7 @@
 msgid "XMPP Message Error"
 msgstr "Erreur message XMPP"
 
-#: ../libpurple/protocols/jabber/message.c:350
+#: ../libpurple/protocols/jabber/message.c:359
 #, c-format
 msgid " (Code %s)"
 msgstr " (Code %s)"
@@ -5062,16 +5196,16 @@
 msgid "XML Parse error"
 msgstr "Erreur de lecture du XML"
 
-#: ../libpurple/protocols/jabber/presence.c:278
+#: ../libpurple/protocols/jabber/presence.c:290
 msgid "Unknown Error in presence"
 msgstr "Erreur inconnue"
 
-#: ../libpurple/protocols/jabber/presence.c:352
-#: ../libpurple/protocols/jabber/presence.c:353
+#: ../libpurple/protocols/jabber/presence.c:364
+#: ../libpurple/protocols/jabber/presence.c:365
 msgid "Create New Room"
 msgstr "Créer un nouveau salon"
 
-#: ../libpurple/protocols/jabber/presence.c:354
+#: ../libpurple/protocols/jabber/presence.c:366
 msgid ""
 "You are creating a new room.  Would you like to configure it, or accept the "
 "default settings?"
@@ -5079,36 +5213,64 @@
 "Vous créez un nouveau salon. Voulez-vous choisir ses paramètres ou utiliser "
 "ceux par défaut ?"
 
-#: ../libpurple/protocols/jabber/presence.c:360
+#: ../libpurple/protocols/jabber/presence.c:372
 msgid "_Configure Room"
 msgstr "_Configurer le salon"
 
-#: ../libpurple/protocols/jabber/presence.c:361
+#: ../libpurple/protocols/jabber/presence.c:373
 msgid "_Accept Defaults"
 msgstr "_Accepter les paramètres par défaut"
 
-#: ../libpurple/protocols/jabber/presence.c:398
+#: ../libpurple/protocols/jabber/presence.c:409
 #, c-format
 msgid "Error in chat %s"
 msgstr "Erreur dans la discussion %s"
 
-#: ../libpurple/protocols/jabber/presence.c:401
+#: ../libpurple/protocols/jabber/presence.c:412
 #, c-format
 msgid "Error joining chat %s"
 msgstr "Erreur lors de l'arrivée dans la discussion %s"
 
-#: ../libpurple/protocols/jabber/si.c:765
+#: ../libpurple/protocols/jabber/si.c:769
 #, c-format
 msgid "Unable to send file to %s, user does not support file transfers"
 msgstr ""
 "Impossible d'envoyer le fichier à %s, cet utilisateur ne supporte pas le "
 "transfert de fichiers"
 
-#: ../libpurple/protocols/jabber/si.c:766
-#: ../libpurple/protocols/jabber/si.c:767
+#: ../libpurple/protocols/jabber/si.c:770
+#: ../libpurple/protocols/jabber/si.c:771
+#: ../libpurple/protocols/jabber/si.c:839
 msgid "File Send Failed"
 msgstr "Échec d'envoi de fichier"
 
+#: ../libpurple/protocols/jabber/si.c:832
+#, c-format
+msgid "Unable to send file to %s, invalid JID"
+msgstr "Impossible d'envoyer le fichier à %s, JID non valide"
+
+#: ../libpurple/protocols/jabber/si.c:834
+#, c-format
+msgid "Unable to send file to %s, user is not online"
+msgstr ""
+"Impossible d'envoyer le fichier à %s, l'utilisateur n'est pas en ligne"
+
+#: ../libpurple/protocols/jabber/si.c:836
+#, c-format
+msgid "Unable to send file to %s, not subscribed to user presence"
+msgstr ""
+"Impossible d'envoyer le fichier à %s, pas d'inscription à la présence de l'utilisateur"
+
+#: ../libpurple/protocols/jabber/si.c:851
+#, c-format
+msgid "Please select which resource of %s you would like to send a file to"
+msgstr ""
+"Veuillez sélectionner parmi les resources de %s, à laquelle vous voulez envoyer un fichier"
+
+#: ../libpurple/protocols/jabber/si.c:867
+msgid "Select a Resource"
+msgstr "Choisissez une ressource"
+
 #: ../libpurple/protocols/msn/dialog.c:110
 #, c-format
 msgid "Buddy list synchronization issue in %s (%s)"
@@ -5325,9 +5487,10 @@
 msgstr "Serveur occupé"
 
 #: ../libpurple/protocols/msn/error.c:222
-#: ../libpurple/protocols/oscar/oscar.c:1363
-#: ../libpurple/protocols/silc/ops.c:1718 ../libpurple/protocols/toc/toc.c:728
-#: ../libpurple/proxy.c:1351
+#: ../libpurple/protocols/oscar/oscar.c:1381
+#: ../libpurple/protocols/silc/silc.c:233
+#: ../libpurple/protocols/silc10/ops.c:1709
+#: ../libpurple/protocols/toc/toc.c:728 ../libpurple/proxy.c:1363
 msgid "Authentication failed"
 msgstr "Échec de l'authentification"
 
@@ -5415,7 +5578,7 @@
 
 #: ../libpurple/protocols/msn/msn.c:372
 msgid "Send a mobile message."
-msgstr "Envoyer un message vers un téléphone portable"
+msgstr "Envoyer un message vers un téléphone portable."
 
 #: ../libpurple/protocols/msn/msn.c:374
 msgid "Page"
@@ -5426,30 +5589,32 @@
 msgstr "Vous êtes dans sa liste"
 
 #: ../libpurple/protocols/msn/msn.c:551 ../libpurple/protocols/msn/state.c:33
-#: ../libpurple/protocols/yahoo/yahoo.c:2878
-#: ../libpurple/protocols/yahoo/yahoo.c:3487
+#: ../libpurple/protocols/yahoo/yahoo.c:2895
+#: ../libpurple/protocols/yahoo/yahoo.c:3504
 msgid "Be Right Back"
-msgstr "Revient de suite"
+msgstr "Bientôt de retour"
 
 #: ../libpurple/protocols/msn/msn.c:555 ../libpurple/protocols/msn/state.c:31
 #: ../libpurple/protocols/novell/novell.c:2822
 #: ../libpurple/protocols/novell/novell.c:2952
 #: ../libpurple/protocols/silc/buddy.c:1480
-#: ../libpurple/protocols/silc/silc.c:47
-#: ../libpurple/protocols/yahoo/yahoo.c:2880
-#: ../libpurple/protocols/yahoo/yahoo.c:3490
+#: ../libpurple/protocols/silc/silc.c:56
+#: ../libpurple/protocols/silc10/buddy.c:1480
+#: ../libpurple/protocols/silc10/silc.c:47
+#: ../libpurple/protocols/yahoo/yahoo.c:2897
+#: ../libpurple/protocols/yahoo/yahoo.c:3507
 msgid "Busy"
 msgstr "Occupé"
 
 #: ../libpurple/protocols/msn/msn.c:559
-#: ../libpurple/protocols/yahoo/yahoo.c:2888
-#: ../libpurple/protocols/yahoo/yahoo.c:3502
+#: ../libpurple/protocols/yahoo/yahoo.c:2905
+#: ../libpurple/protocols/yahoo/yahoo.c:3519
 msgid "On the Phone"
 msgstr "Au téléphone"
 
 #: ../libpurple/protocols/msn/msn.c:563
-#: ../libpurple/protocols/yahoo/yahoo.c:2892
-#: ../libpurple/protocols/yahoo/yahoo.c:3508
+#: ../libpurple/protocols/yahoo/yahoo.c:2909
+#: ../libpurple/protocols/yahoo/yahoo.c:3525
 msgid "Out to Lunch"
 msgstr "Parti manger"
 
@@ -5500,31 +5665,31 @@
 msgid "Failed to connect to server."
 msgstr "Impossible de se connecter au serveur."
 
-#: ../libpurple/protocols/msn/msn.c:1458 ../libpurple/protocols/msn/msn.c:1803
+#: ../libpurple/protocols/msn/msn.c:1479 ../libpurple/protocols/msn/msn.c:1827
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:784
 msgid "Error retrieving profile"
 msgstr "Erreur à la récupération du profil."
 
-#: ../libpurple/protocols/msn/msn.c:1529 ../pidgin/plugins/convcolors.c:309
-#: ../pidgin/plugins/pidginrc.c:448
+#: ../libpurple/protocols/msn/msn.c:1550 ../pidgin/plugins/convcolors.c:309
+#: ../pidgin/plugins/pidginrc.c:366
 msgid "General"
 msgstr "Général"
 
-#: ../libpurple/protocols/msn/msn.c:1536
-#: ../libpurple/protocols/oscar/oscar.c:3742
+#: ../libpurple/protocols/msn/msn.c:1557
+#: ../libpurple/protocols/oscar/oscar.c:3769
 #: ../libpurple/protocols/qq/buddy_info.c:45
 #: ../libpurple/protocols/qq/qq.c:219
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1057
 msgid "Age"
 msgstr "Âge"
 
-#: ../libpurple/protocols/msn/msn.c:1538
+#: ../libpurple/protocols/msn/msn.c:1559
 #: ../libpurple/protocols/qq/buddy_info.c:51
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1072
 msgid "Occupation"
 msgstr "Occupation"
 
-#: ../libpurple/protocols/msn/msn.c:1539
+#: ../libpurple/protocols/msn/msn.c:1560
 #: ../libpurple/protocols/novell/novell.c:1478
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1052
 #: ../libpurple/protocols/zephyr/zephyr.c:798
@@ -5532,186 +5697,188 @@
 msgid "Location"
 msgstr "Localisation"
 
-#: ../libpurple/protocols/msn/msn.c:1544 ../libpurple/protocols/msn/msn.c:1736
-#: ../libpurple/protocols/msn/msn.c:1742 ../libpurple/protocols/msn/msn.c:1749
+#: ../libpurple/protocols/msn/msn.c:1565 ../libpurple/protocols/msn/msn.c:1757
+#: ../libpurple/protocols/msn/msn.c:1763 ../libpurple/protocols/msn/msn.c:1770
 msgid "Hobbies and Interests"
 msgstr "Passe-temps et intérêts"
 
-#: ../libpurple/protocols/msn/msn.c:1550 ../libpurple/protocols/msn/msn.c:1670
-#: ../libpurple/protocols/msn/msn.c:1676 ../libpurple/protocols/msn/msn.c:1683
-#: ../libpurple/protocols/msn/msn.c:1691 ../libpurple/protocols/msn/msn.c:1698
+#: ../libpurple/protocols/msn/msn.c:1571 ../libpurple/protocols/msn/msn.c:1691
+#: ../libpurple/protocols/msn/msn.c:1697 ../libpurple/protocols/msn/msn.c:1704
+#: ../libpurple/protocols/msn/msn.c:1712 ../libpurple/protocols/msn/msn.c:1719
 msgid "A Little About Me"
 msgstr "À propos de moi"
 
-#: ../libpurple/protocols/msn/msn.c:1567
+#: ../libpurple/protocols/msn/msn.c:1588
 msgid "Social"
 msgstr "Social"
 
-#: ../libpurple/protocols/msn/msn.c:1569
+#: ../libpurple/protocols/msn/msn.c:1590
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1062
 msgid "Marital Status"
 msgstr "État matrimonial"
 
-#: ../libpurple/protocols/msn/msn.c:1570
+#: ../libpurple/protocols/msn/msn.c:1591
 msgid "Interests"
 msgstr "Intérêts"
 
-#: ../libpurple/protocols/msn/msn.c:1571
+#: ../libpurple/protocols/msn/msn.c:1592
 msgid "Pets"
 msgstr "Animaux"
 
-#: ../libpurple/protocols/msn/msn.c:1572
+#: ../libpurple/protocols/msn/msn.c:1593
 msgid "Hometown"
 msgstr "Ville d'origine"
 
-#: ../libpurple/protocols/msn/msn.c:1573
+#: ../libpurple/protocols/msn/msn.c:1594
 msgid "Places Lived"
 msgstr "Précédents lieux de résidence"
 
-#: ../libpurple/protocols/msn/msn.c:1574
+#: ../libpurple/protocols/msn/msn.c:1595
 msgid "Fashion"
 msgstr "Mode"
 
-#: ../libpurple/protocols/msn/msn.c:1575
+#: ../libpurple/protocols/msn/msn.c:1596
 msgid "Humor"
 msgstr "Humour"
 
-#: ../libpurple/protocols/msn/msn.c:1576
+#: ../libpurple/protocols/msn/msn.c:1597
 msgid "Music"
 msgstr "Musique"
 
-#: ../libpurple/protocols/msn/msn.c:1577 ../libpurple/protocols/msn/msn.c:1758
-#: ../libpurple/protocols/msn/msn.c:1764
+#: ../libpurple/protocols/msn/msn.c:1598 ../libpurple/protocols/msn/msn.c:1779
+#: ../libpurple/protocols/msn/msn.c:1785
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1114
 msgid "Favorite Quote"
 msgstr "Citation préférée"
 
-#: ../libpurple/protocols/msn/msn.c:1594
+#: ../libpurple/protocols/msn/msn.c:1615
 msgid "Contact Info"
 msgstr "Infos du contact"
 
-#: ../libpurple/protocols/msn/msn.c:1595
+#: ../libpurple/protocols/msn/msn.c:1616
 msgid "Personal"
 msgstr "Personnel"
 
-#: ../libpurple/protocols/msn/msn.c:1598
+#: ../libpurple/protocols/msn/msn.c:1619
 msgid "Significant Other"
 msgstr "Compagnon/Compagne"
 
-#: ../libpurple/protocols/msn/msn.c:1599
+#: ../libpurple/protocols/msn/msn.c:1620
 msgid "Home Phone"
 msgstr "Téléphone personnel"
 
-#: ../libpurple/protocols/msn/msn.c:1600
+#: ../libpurple/protocols/msn/msn.c:1621
 msgid "Home Phone 2"
 msgstr "Téléphone personnel 2"
 
-#: ../libpurple/protocols/msn/msn.c:1601
-#: ../libpurple/protocols/oscar/oscar.c:3780
+#: ../libpurple/protocols/msn/msn.c:1622
+#: ../libpurple/protocols/oscar/oscar.c:3807
 msgid "Home Address"
 msgstr "Adresse personnelle"
 
-#: ../libpurple/protocols/msn/msn.c:1602
+#: ../libpurple/protocols/msn/msn.c:1623
 msgid "Personal Mobile"
 msgstr "Téléphone portable personnel"
 
-#: ../libpurple/protocols/msn/msn.c:1603
+#: ../libpurple/protocols/msn/msn.c:1624
 msgid "Home Fax"
 msgstr "Télécopie personnelle"
 
-#: ../libpurple/protocols/msn/msn.c:1604
+#: ../libpurple/protocols/msn/msn.c:1625
 msgid "Personal E-Mail"
 msgstr "Adresse électronique personnelle"
 
-#: ../libpurple/protocols/msn/msn.c:1605
+#: ../libpurple/protocols/msn/msn.c:1626
 msgid "Personal IM"
 msgstr "Messagerie instantanée"
 
-#: ../libpurple/protocols/msn/msn.c:1607
+#: ../libpurple/protocols/msn/msn.c:1628
 msgid "Anniversary"
 msgstr "Anniversaire"
 
 #. Business
-#: ../libpurple/protocols/msn/msn.c:1623
+#: ../libpurple/protocols/msn/msn.c:1644
 msgid "Work"
 msgstr "Professionnel"
 
-#: ../libpurple/protocols/msn/msn.c:1625
-#: ../libpurple/protocols/silc/ops.c:1044
+#: ../libpurple/protocols/msn/msn.c:1646
+#: ../libpurple/protocols/silc/ops.c:1010
+#: ../libpurple/protocols/silc10/ops.c:1044
 msgid "Job Title"
 msgstr "Position"
 
-#: ../libpurple/protocols/msn/msn.c:1626
-#: ../libpurple/protocols/oscar/oscar.c:3801
+#: ../libpurple/protocols/msn/msn.c:1647
+#: ../libpurple/protocols/oscar/oscar.c:3828
 msgid "Company"
 msgstr "Société"
 
-#: ../libpurple/protocols/msn/msn.c:1627
+#: ../libpurple/protocols/msn/msn.c:1648
 #: ../libpurple/protocols/novell/novell.c:1480
 msgid "Department"
 msgstr "Service"
 
-#: ../libpurple/protocols/msn/msn.c:1628
+#: ../libpurple/protocols/msn/msn.c:1649
 msgid "Profession"
 msgstr "Profession"
 
-#: ../libpurple/protocols/msn/msn.c:1629
+#: ../libpurple/protocols/msn/msn.c:1650
 msgid "Work Phone"
 msgstr "Téléphone professionnel"
 
-#: ../libpurple/protocols/msn/msn.c:1630
+#: ../libpurple/protocols/msn/msn.c:1651
 msgid "Work Phone 2"
 msgstr "Téléphone professionnel 2"
 
-#: ../libpurple/protocols/msn/msn.c:1631
-#: ../libpurple/protocols/oscar/oscar.c:3793
+#: ../libpurple/protocols/msn/msn.c:1652
+#: ../libpurple/protocols/oscar/oscar.c:3820
 msgid "Work Address"
 msgstr "Adresse professionnelle"
 
-#: ../libpurple/protocols/msn/msn.c:1632
+#: ../libpurple/protocols/msn/msn.c:1653
 msgid "Work Mobile"
 msgstr "Téléphone portable professionnel"
 
-#: ../libpurple/protocols/msn/msn.c:1633
+#: ../libpurple/protocols/msn/msn.c:1654
 msgid "Work Pager"
 msgstr "Bippeur professionnel"
 
-#: ../libpurple/protocols/msn/msn.c:1634
+#: ../libpurple/protocols/msn/msn.c:1655
 msgid "Work Fax"
 msgstr "Télécopie professionnelle"
 
-#: ../libpurple/protocols/msn/msn.c:1635
+#: ../libpurple/protocols/msn/msn.c:1656
 msgid "Work E-Mail"
 msgstr "Adresse électronique professionnelle"
 
-#: ../libpurple/protocols/msn/msn.c:1636
+#: ../libpurple/protocols/msn/msn.c:1657
 msgid "Work IM"
 msgstr "Messagerie instantanée professionnelle"
 
-#: ../libpurple/protocols/msn/msn.c:1637
+#: ../libpurple/protocols/msn/msn.c:1658
 msgid "Start Date"
 msgstr "Date d'embauche"
 
-#: ../libpurple/protocols/msn/msn.c:1707 ../libpurple/protocols/msn/msn.c:1713
-#: ../libpurple/protocols/msn/msn.c:1720 ../libpurple/protocols/msn/msn.c:1727
+#: ../libpurple/protocols/msn/msn.c:1728 ../libpurple/protocols/msn/msn.c:1734
+#: ../libpurple/protocols/msn/msn.c:1741 ../libpurple/protocols/msn/msn.c:1748
 msgid "Favorite Things"
 msgstr "Choses préférées"
 
-#: ../libpurple/protocols/msn/msn.c:1772
+#: ../libpurple/protocols/msn/msn.c:1793
 msgid "Last Updated"
 msgstr "Dernière mise à jour"
 
-#: ../libpurple/protocols/msn/msn.c:1783
+#: ../libpurple/protocols/msn/msn.c:1804
 #: ../libpurple/protocols/qq/buddy_info.c:60
-#: ../libpurple/protocols/silc/ops.c:1060
+#: ../libpurple/protocols/silc/ops.c:1026
+#: ../libpurple/protocols/silc10/ops.c:1060
 msgid "Homepage"
 msgstr "Page web"
 
-#: ../libpurple/protocols/msn/msn.c:1804
+#: ../libpurple/protocols/msn/msn.c:1828
 msgid "The user has not created a public profile."
 msgstr "L'utilisateur n'a pas créé de profil public"
 
-#: ../libpurple/protocols/msn/msn.c:1805
+#: ../libpurple/protocols/msn/msn.c:1829
 msgid ""
 "MSN reported not being able to find the user's profile. This either means "
 "that the user does not exist, or that the user exists but has not created a "
@@ -5720,7 +5887,7 @@
 "Impossible de récupérer le profil de l'utilisateur par MSN. Soit "
 "l'utilisateur n'existe pas, soit il n'a pas créé de profil public."
 
-#: ../libpurple/protocols/msn/msn.c:1809
+#: ../libpurple/protocols/msn/msn.c:1833
 msgid ""
 "Could not find any information in the user's profile. The user most likely "
 "does not exist."
@@ -5728,7 +5895,7 @@
 "Impossible de récupérer des informations sur le profil de l'utilisateur. Il "
 "est possible que cet utilisateur n'existe pas."
 
-#: ../libpurple/protocols/msn/msn.c:1817
+#: ../libpurple/protocols/msn/msn.c:1841
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1216
 msgid "Profile URL"
 msgstr "Lien du profil"
@@ -5743,19 +5910,19 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/msn/msn.c:2103 ../libpurple/protocols/msn/msn.c:2105
+#: ../libpurple/protocols/msn/msn.c:2127 ../libpurple/protocols/msn/msn.c:2129
 msgid "MSN Protocol Plugin"
 msgstr "Plugin pour le protocole MSN"
 
-#: ../libpurple/protocols/msn/msn.c:2139
+#: ../libpurple/protocols/msn/msn.c:2163
 msgid "Use HTTP Method"
 msgstr "Utiliser le protocole HTTP"
 
-#: ../libpurple/protocols/msn/msn.c:2144
+#: ../libpurple/protocols/msn/msn.c:2168
 msgid "Show custom smileys"
 msgstr "Afficher les frimousses personnalisées"
 
-#: ../libpurple/protocols/msn/msn.c:2152
+#: ../libpurple/protocols/msn/msn.c:2176
 msgid "nudge: nudge a user to get their attention"
 msgstr "nudge : donner un « Nudge » à un contact pour attirer son attention."
 
@@ -5774,8 +5941,8 @@
 #: ../libpurple/protocols/qq/udp_proxy_s5.c:268
 #: ../libpurple/protocols/qq/udp_proxy_s5.c:302
 #: ../libpurple/protocols/qq/udp_proxy_s5.c:332
-#: ../libpurple/protocols/yahoo/yahoochat.c:1357
-#: ../libpurple/protocols/yahoo/yahoochat.c:1383
+#: ../libpurple/protocols/yahoo/yahoochat.c:1320
+#: ../libpurple/protocols/yahoo/yahoochat.c:1346
 msgid "Unable to connect"
 msgstr "Impossible de se connecter"
 
@@ -5786,7 +5953,7 @@
 
 #: ../libpurple/protocols/msn/notification.c:184
 #: ../libpurple/protocols/msn/notification.c:532
-#: ../libpurple/protocols/msn/session.c:329
+#: ../libpurple/protocols/msn/session.c:330
 msgid "Unknown error."
 msgstr "Erreur inconnue"
 
@@ -5824,15 +5991,15 @@
 msgid "Service Temporarily Unavailable."
 msgstr "Service temporairement indisponible."
 
-#: ../libpurple/protocols/msn/notification.c:840
+#: ../libpurple/protocols/msn/notification.c:851
 msgid "Unable to rename group"
 msgstr "Impossible de renommer le groupe"
 
-#: ../libpurple/protocols/msn/notification.c:895
+#: ../libpurple/protocols/msn/notification.c:906
 msgid "Unable to delete group"
 msgstr "Impossible de supprimer le groupe"
 
-#: ../libpurple/protocols/msn/notification.c:1321
+#: ../libpurple/protocols/msn/notification.c:1325
 #, c-format
 msgid ""
 "The MSN server will shut down for maintenance in %d minute. You will "
@@ -5887,7 +6054,7 @@
 msgstr "Erreur à l'analyse du HTTP"
 
 #: ../libpurple/protocols/msn/session.c:307
-#: ../libpurple/protocols/oscar/oscar.c:3454
+#: ../libpurple/protocols/oscar/oscar.c:3481
 #: ../libpurple/protocols/yahoo/yahoo.c:202
 msgid "You have signed on from another location."
 msgstr "Vous venez de vous connecter depuis un autre endroit."
@@ -5902,36 +6069,36 @@
 msgid "The MSN servers are going down temporarily."
 msgstr "Les serveurs MSN sont coupés temporairement."
 
-#: ../libpurple/protocols/msn/session.c:319
+#: ../libpurple/protocols/msn/session.c:320
 #, c-format
 msgid "Unable to authenticate: %s"
 msgstr "Impossible de s'authentifier : %s"
 
-#: ../libpurple/protocols/msn/session.c:324
+#: ../libpurple/protocols/msn/session.c:325
 msgid ""
 "Your MSN buddy list is temporarily unavailable. Please wait and try again."
 msgstr ""
 "Votre liste de contacts MSN n'est pas disponible pour l'instant. Veuillez "
 "attendre un peu puis réessayer."
 
-#: ../libpurple/protocols/msn/session.c:345
-#: ../libpurple/protocols/msn/session.c:347
+#: ../libpurple/protocols/msn/session.c:346
+#: ../libpurple/protocols/msn/session.c:348
 msgid "Handshaking"
 msgstr "Poignée de main"
 
-#: ../libpurple/protocols/msn/session.c:348
+#: ../libpurple/protocols/msn/session.c:349
 msgid "Starting authentication"
 msgstr "Début d'authentification"
 
-#: ../libpurple/protocols/msn/session.c:349
+#: ../libpurple/protocols/msn/session.c:350
 msgid "Getting cookie"
 msgstr "Récupération du cookie"
 
-#: ../libpurple/protocols/msn/session.c:351
+#: ../libpurple/protocols/msn/session.c:352
 msgid "Sending cookie"
 msgstr "Envoi du cookie"
 
-#: ../libpurple/protocols/msn/session.c:352
+#: ../libpurple/protocols/msn/session.c:353
 msgid "Retrieving buddy list"
 msgstr "Récupération de la liste de contacts"
 
@@ -5970,16 +6137,25 @@
 
 #: ../libpurple/protocols/msn/switchboard.c:424
 msgid ""
+"Message could not be sent because we were unable to establish a session with "
+"the server. This is likely a server problem, try again in a few minutes:"
+msgstr ""
+"Impossible d'envoyer le message parce qu'il est impossible d'établir une "
+"session avec le serveur. C'est prrobablement un problème de serveur, "
+"veuillez essayez de nouveau dans quelques minutes :" 
+
+#: ../libpurple/protocols/msn/switchboard.c:431
+msgid ""
 "Message could not be sent because an error with the switchboard occurred:"
 msgstr ""
 "Impossible d'envoyer le message à cause d'une erreur du serveur "
 "standardiste :"
 
-#: ../libpurple/protocols/msn/switchboard.c:432
+#: ../libpurple/protocols/msn/switchboard.c:439
 msgid "Message may have not been sent because an unknown error occurred:"
 msgstr "Impossible d'envoyer le message à cause d'une erreur inconnue :"
 
-#: ../libpurple/protocols/msn/switchboard.c:956
+#: ../libpurple/protocols/msn/switchboard.c:963
 #, c-format
 msgid "%s just sent you a Nudge!"
 msgstr "%s vient de vous envoyer un « Nudge. »"
@@ -5987,12 +6163,12 @@
 #: ../libpurple/protocols/msn/userlist.c:250
 #, c-format
 msgid "%s has added you to his or her buddy list."
-msgstr "L'utilisateur %s vous à ajouté à sa liste de contacts."
+msgstr "L'utilisateur %s vous a ajouté à sa liste de contacts."
 
 #: ../libpurple/protocols/msn/userlist.c:319
 #, c-format
 msgid "%s has removed you from his or her buddy list."
-msgstr "L'utilisateur %s vous à supprimé de sa liste de contacts."
+msgstr "L'utilisateur %s vous a supprimé de sa liste de contacts."
 
 #: ../libpurple/protocols/msn/userlist.c:641
 #, c-format
@@ -6362,19 +6538,19 @@
 msgstr "Port du serveur"
 
 #: ../libpurple/protocols/oscar/flap_connection.c:379
-#: ../libpurple/protocols/yahoo/yahoo.c:2290
-#: ../libpurple/protocols/yahoo/yahoo.c:2449
+#: ../libpurple/protocols/yahoo/yahoo.c:2292
+#: ../libpurple/protocols/yahoo/yahoo.c:2459
 #: ../libpurple/protocols/yahoo/ycht.c:481 ../libpurple/proxy.c:580
-#: ../libpurple/proxy.c:1085 ../libpurple/proxy.c:1196
-#: ../libpurple/proxy.c:1296 ../libpurple/proxy.c:1424
+#: ../libpurple/proxy.c:1099 ../libpurple/proxy.c:1208
+#: ../libpurple/proxy.c:1308 ../libpurple/proxy.c:1436
 msgid "Server closed the connection."
 msgstr "Le serveur a fermé la connexion."
 
 #: ../libpurple/protocols/oscar/flap_connection.c:381
-#: ../libpurple/protocols/yahoo/yahoo.c:2284
-#: ../libpurple/protocols/yahoo/yahoo.c:2443 ../libpurple/proxy.c:592
-#: ../libpurple/proxy.c:1097 ../libpurple/proxy.c:1208
-#: ../libpurple/proxy.c:1308 ../libpurple/proxy.c:1436
+#: ../libpurple/protocols/yahoo/yahoo.c:2286
+#: ../libpurple/protocols/yahoo/yahoo.c:2453 ../libpurple/proxy.c:592
+#: ../libpurple/proxy.c:1111 ../libpurple/proxy.c:1220
+#: ../libpurple/proxy.c:1320 ../libpurple/proxy.c:1448
 #, c-format
 msgid ""
 "Lost connection with server:\n"
@@ -6384,21 +6560,12 @@
 "%s"
 
 #: ../libpurple/protocols/oscar/flap_connection.c:384
-#: ../libpurple/proxy.c:1114 ../libpurple/proxy.c:1221
-#: ../libpurple/proxy.c:1320 ../libpurple/proxy.c:1392
-#: ../libpurple/proxy.c:1449
+#: ../libpurple/proxy.c:1128 ../libpurple/proxy.c:1233
+#: ../libpurple/proxy.c:1332 ../libpurple/proxy.c:1404
+#: ../libpurple/proxy.c:1461
 msgid "Received invalid data on connection with server."
 msgstr "Données non valides reçues sur la connexion du serveur."
 
-#: ../libpurple/protocols/oscar/flap_connection.c:386
-#, c-format
-msgid ""
-"Could not establish a connection with the server:\n"
-"%s"
-msgstr ""
-"Impossible de se connecter au serveur :\n"
-"%s"
-
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -6430,7 +6597,7 @@
 msgstr "Plugin pour le protocole ICQ"
 
 #: ../libpurple/protocols/oscar/libicq.c:147
-#: ../libpurple/protocols/yahoo/yahoo.c:4094
+#: ../libpurple/protocols/yahoo/yahoo.c:4111
 #: ../libpurple/protocols/zephyr/zephyr.c:2997
 msgid "Encoding"
 msgstr "Codage"
@@ -6562,7 +6729,7 @@
 msgid "Not while on AOL"
 msgstr "Impossible sur AOL"
 
-#: ../libpurple/protocols/oscar/oscar.c:330
+#: ../libpurple/protocols/oscar/oscar.c:348
 msgid ""
 "(There was an error receiving this message.  The buddy you are speaking with "
 "is probably using a different encoding than expected.  If you know what "
@@ -6574,7 +6741,7 @@
 "utilise, vous pouvez le renseigner dans les options avancées de votre compte "
 "AIM/ICQ.)"
 
-#: ../libpurple/protocols/oscar/oscar.c:439
+#: ../libpurple/protocols/oscar/oscar.c:457
 #, c-format
 msgid ""
 "(There was an error receiving this message.  Either you and %s have "
@@ -6584,144 +6751,146 @@
 "des encodages différents ou le client de %s est défectueux.)"
 
 #. Label
-#: ../libpurple/protocols/oscar/oscar.c:621 ../pidgin/gtkutils.c:2386
-#: ../pidgin/gtkutils.c:2416
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:338
+#: ../libpurple/protocols/oscar/oscar.c:639 ../pidgin/gtkutils.c:2359
+#: ../pidgin/gtkutils.c:2389
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:334
 msgid "Buddy Icon"
 msgstr "Icône du contact"
 
-#: ../libpurple/protocols/oscar/oscar.c:624
+#: ../libpurple/protocols/oscar/oscar.c:642
 msgid "Voice"
 msgstr "Voix"
 
-#: ../libpurple/protocols/oscar/oscar.c:627
+#: ../libpurple/protocols/oscar/oscar.c:645
 msgid "AIM Direct IM"
 msgstr "Connexion directe AIM"
 
-#: ../libpurple/protocols/oscar/oscar.c:630
-#: ../libpurple/protocols/silc/silc.c:687
-#: ../libpurple/protocols/silc/util.c:549
+#: ../libpurple/protocols/oscar/oscar.c:648
+#: ../libpurple/protocols/silc/silc.c:768
+#: ../libpurple/protocols/silc/util.c:553
+#: ../libpurple/protocols/silc10/silc.c:679
+#: ../libpurple/protocols/silc10/util.c:549
 msgid "Chat"
 msgstr "Discussion"
 
-#: ../libpurple/protocols/oscar/oscar.c:633
-#: ../libpurple/protocols/oscar/oscar.c:5920
+#: ../libpurple/protocols/oscar/oscar.c:651
+#: ../libpurple/protocols/oscar/oscar.c:5989
 msgid "Get File"
 msgstr "Recevoir un fichier"
 
-#: ../libpurple/protocols/oscar/oscar.c:640
+#: ../libpurple/protocols/oscar/oscar.c:658
 msgid "Games"
 msgstr "Jeux"
 
-#: ../libpurple/protocols/oscar/oscar.c:643
+#: ../libpurple/protocols/oscar/oscar.c:661
 msgid "Add-Ins"
 msgstr "Modules"
 
-#: ../libpurple/protocols/oscar/oscar.c:646
+#: ../libpurple/protocols/oscar/oscar.c:664
 msgid "Send Buddy List"
 msgstr "Envoyer sa liste de contacts"
 
-#: ../libpurple/protocols/oscar/oscar.c:649
+#: ../libpurple/protocols/oscar/oscar.c:667
 msgid "ICQ Direct Connect"
 msgstr "Connexion directe ICQ"
 
-#: ../libpurple/protocols/oscar/oscar.c:652
+#: ../libpurple/protocols/oscar/oscar.c:670
 msgid "AP User"
 msgstr "Utilisateur AP"
 
-#: ../libpurple/protocols/oscar/oscar.c:655
+#: ../libpurple/protocols/oscar/oscar.c:673
 msgid "ICQ RTF"
 msgstr "RTF ICQ"
 
-#: ../libpurple/protocols/oscar/oscar.c:658
+#: ../libpurple/protocols/oscar/oscar.c:676
 msgid "Nihilist"
 msgstr "Nihiliste"
 
-#: ../libpurple/protocols/oscar/oscar.c:661
+#: ../libpurple/protocols/oscar/oscar.c:679
 msgid "ICQ Server Relay"
 msgstr "Relais de serveur ICQ"
 
-#: ../libpurple/protocols/oscar/oscar.c:664
+#: ../libpurple/protocols/oscar/oscar.c:682
 msgid "Old ICQ UTF8"
 msgstr "Ancien ICQ UTF8"
 
-#: ../libpurple/protocols/oscar/oscar.c:667
+#: ../libpurple/protocols/oscar/oscar.c:685
 msgid "Trillian Encryption"
 msgstr "Chiffrement Trillian"
 
-#: ../libpurple/protocols/oscar/oscar.c:670
+#: ../libpurple/protocols/oscar/oscar.c:688
 msgid "ICQ UTF8"
 msgstr "ICQ UTF8"
 
-#: ../libpurple/protocols/oscar/oscar.c:673
+#: ../libpurple/protocols/oscar/oscar.c:691
 msgid "Hiptop"
 msgstr "Hiptop"
 
-#: ../libpurple/protocols/oscar/oscar.c:676
+#: ../libpurple/protocols/oscar/oscar.c:694
 msgid "Security Enabled"
 msgstr "Sécurité activée"
 
-#: ../libpurple/protocols/oscar/oscar.c:679
+#: ../libpurple/protocols/oscar/oscar.c:697
 msgid "Video Chat"
 msgstr "Visioconférence"
 
-#: ../libpurple/protocols/oscar/oscar.c:683
+#: ../libpurple/protocols/oscar/oscar.c:701
 msgid "iChat AV"
 msgstr "Vidéo iChat"
 
-#: ../libpurple/protocols/oscar/oscar.c:686
+#: ../libpurple/protocols/oscar/oscar.c:704
 msgid "Live Video"
 msgstr "Live Video"
 
-#: ../libpurple/protocols/oscar/oscar.c:689
+#: ../libpurple/protocols/oscar/oscar.c:707
 msgid "Camera"
 msgstr "Caméra"
 
-#: ../libpurple/protocols/oscar/oscar.c:707
-#: ../libpurple/protocols/oscar/oscar.c:5690
+#: ../libpurple/protocols/oscar/oscar.c:725
+#: ../libpurple/protocols/oscar/oscar.c:5759
 msgid "Free For Chat"
 msgstr "Libre pour discuter"
 
-#: ../libpurple/protocols/oscar/oscar.c:711
-#: ../libpurple/protocols/oscar/oscar.c:5725
+#: ../libpurple/protocols/oscar/oscar.c:729
+#: ../libpurple/protocols/oscar/oscar.c:5794
 msgid "Not Available"
 msgstr "Non disponible"
 
-#: ../libpurple/protocols/oscar/oscar.c:713
-#: ../libpurple/protocols/oscar/oscar.c:5711
+#: ../libpurple/protocols/oscar/oscar.c:731
+#: ../libpurple/protocols/oscar/oscar.c:5780
 msgid "Occupied"
 msgstr "Occupé"
 
-#: ../libpurple/protocols/oscar/oscar.c:717
+#: ../libpurple/protocols/oscar/oscar.c:735
 msgid "Web Aware"
 msgstr "Sur internet"
 
-#: ../libpurple/protocols/oscar/oscar.c:719 ../libpurple/protocols/qq/qq.c:183
-#: ../libpurple/protocols/yahoo/yahoo.c:2896 ../libpurple/status.c:156
-#: ../pidgin/gtkdocklet.c:446 ../pidgin/gtkstatusbox.c:1053
+#: ../libpurple/protocols/oscar/oscar.c:737 ../libpurple/protocols/qq/qq.c:183
+#: ../libpurple/protocols/yahoo/yahoo.c:2913 ../libpurple/status.c:156
+#: ../pidgin/gtkdocklet.c:446 ../pidgin/gtkstatusbox.c:1058
 msgid "Invisible"
 msgstr "Invisible"
 
-#: ../libpurple/protocols/oscar/oscar.c:721
+#: ../libpurple/protocols/oscar/oscar.c:739
 msgid "Online"
 msgstr "En ligne"
 
-#: ../libpurple/protocols/oscar/oscar.c:820
-#: ../libpurple/protocols/oscar/oscar.c:3694
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:697 ../pidgin/gtkprefs.c:1015
+#: ../libpurple/protocols/oscar/oscar.c:838
+#: ../libpurple/protocols/oscar/oscar.c:3721
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:697 ../pidgin/gtkprefs.c:1121
 msgid "IP Address"
 msgstr "Adresse IP"
 
-#: ../libpurple/protocols/oscar/oscar.c:827
-#: ../libpurple/protocols/oscar/oscar.c:2846
+#: ../libpurple/protocols/oscar/oscar.c:845
+#: ../libpurple/protocols/oscar/oscar.c:2867
 msgid "Warning Level"
 msgstr "Niveau d'avertissement"
 
-#: ../libpurple/protocols/oscar/oscar.c:837
+#: ../libpurple/protocols/oscar/oscar.c:855
 msgid "Buddy Comment"
 msgstr "Commentaire"
 
-#: ../libpurple/protocols/oscar/oscar.c:977
+#: ../libpurple/protocols/oscar/oscar.c:995
 #, c-format
 msgid ""
 "Could not connect to authentication server:\n"
@@ -6730,7 +6899,7 @@
 "Impossible de se connecter au serveur d'authentification :\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:985
+#: ../libpurple/protocols/oscar/oscar.c:1003
 #, c-format
 msgid ""
 "Could not connect to BOS server:\n"
@@ -6739,53 +6908,54 @@
 "Impossible de se connecter au serveur BOS :\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:1025
+#: ../libpurple/protocols/oscar/oscar.c:1043
 msgid "Screen name sent"
 msgstr "Nom d'utilisateur envoyé"
 
-#: ../libpurple/protocols/oscar/oscar.c:1030
+#: ../libpurple/protocols/oscar/oscar.c:1048
 msgid "Connection established, cookie sent"
 msgstr "Connexion établie, cookie envoyé"
 
 #. TODO: Don't call this with ssi
-#: ../libpurple/protocols/oscar/oscar.c:1059
+#: ../libpurple/protocols/oscar/oscar.c:1077
 msgid "Finalizing connection"
 msgstr "Finalisation de la connexion"
 
-#: ../libpurple/protocols/oscar/oscar.c:1243
+#: ../libpurple/protocols/oscar/oscar.c:1261
 #, c-format
 msgid ""
 "Unable to login: Could not sign on as %s because the screen name is "
-"invalid.  Screen names must either start with a letter and contain only "
-"letters, numbers and spaces, or contain only numbers."
+"invalid.  Screen names must be a valid email address, or start with a letter "
+"and contain only letters, numbers and spaces, or contain only numbers."
 msgstr ""
 "Impossible de se connecter : le nom d'utilisateur %s est non valide. Les "
-"noms doivent soit commencer par une lettre et contenir uniquement des "
-"lettres, des chiffres et des espaces, soit contenir uniquement des chiffres."
-
-#: ../libpurple/protocols/oscar/oscar.c:1328
-#: ../libpurple/protocols/yahoo/yahoo.c:1932
+"noms doivent soit être une adresse électronique valide, soit commencer par "
+"une lettre et contenir uniquement des lettres, des chiffres et des espaces, "
+"soit contenir uniquement des chiffres."
+
+#: ../libpurple/protocols/oscar/oscar.c:1346
+#: ../libpurple/protocols/yahoo/yahoo.c:1934
 msgid "Invalid screen name."
 msgstr "Nom d'utilisateur non valide."
 
-#: ../libpurple/protocols/oscar/oscar.c:1335
+#: ../libpurple/protocols/oscar/oscar.c:1353
 #: ../libpurple/protocols/qq/login_logout.c:483
 #: ../libpurple/protocols/simple/simple.c:1037
-#: ../libpurple/protocols/yahoo/yahoo.c:1950
+#: ../libpurple/protocols/yahoo/yahoo.c:1952
 msgid "Incorrect password."
 msgstr "Mot de passe incorrect."
 
-#: ../libpurple/protocols/oscar/oscar.c:1340
+#: ../libpurple/protocols/oscar/oscar.c:1358
 msgid "Your account is currently suspended."
 msgstr "Votre compte est actuellement suspendu."
 
 #. service temporarily unavailable
-#: ../libpurple/protocols/oscar/oscar.c:1344
+#: ../libpurple/protocols/oscar/oscar.c:1362
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr "Le service est temporairement indisponible."
 
-#: ../libpurple/protocols/oscar/oscar.c:1349
-#: ../libpurple/protocols/oscar/oscar.c:1360
+#: ../libpurple/protocols/oscar/oscar.c:1367
+#: ../libpurple/protocols/oscar/oscar.c:1378
 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."
@@ -6794,46 +6964,46 @@
 "réessayez. Si vous persistez maintenant, il vous faudra attendre encore plus "
 "longtemps."
 
-#: ../libpurple/protocols/oscar/oscar.c:1354
+#: ../libpurple/protocols/oscar/oscar.c:1372
 #, c-format
 msgid "The client version you are using is too old. Please upgrade at %s"
 msgstr ""
 "La version du client que vous utilisez est trop ancienne. Veuillez la mettre "
 "à jour sur %s."
 
-#: ../libpurple/protocols/oscar/oscar.c:1394
+#: ../libpurple/protocols/oscar/oscar.c:1412
 msgid "Could Not Connect"
 msgstr "Impossible de se connecter."
 
-#: ../libpurple/protocols/oscar/oscar.c:1399
+#: ../libpurple/protocols/oscar/oscar.c:1417
 msgid "Received authorization"
 msgstr "Autorisation reçue."
 
-#: ../libpurple/protocols/oscar/oscar.c:1422
+#: ../libpurple/protocols/oscar/oscar.c:1440
 msgid "The SecurID key entered is invalid."
 msgstr "La clé SecurID saisie est non valide."
 
-#: ../libpurple/protocols/oscar/oscar.c:1436
+#: ../libpurple/protocols/oscar/oscar.c:1454
 msgid "Enter SecurID"
 msgstr "Saisissez votre SecurID"
 
-#: ../libpurple/protocols/oscar/oscar.c:1437
+#: ../libpurple/protocols/oscar/oscar.c:1455
 msgid "Enter the 6 digit number from the digital display."
 msgstr "Saisissez les 6 chiffres de l'affichage numérique."
 
 #. *
 #. * A wrapper for purple_request_action() that uses @c OK and @c Cancel buttons.
 #.
-#: ../libpurple/protocols/oscar/oscar.c:1439
-#: ../libpurple/protocols/oscar/oscar.c:2230
-#: ../libpurple/protocols/oscar/oscar.c:2277
-#: ../libpurple/protocols/oscar/oscar.c:5795
-#: ../libpurple/protocols/oscar/oscar.c:6076 ../libpurple/request.h:1387
+#: ../libpurple/protocols/oscar/oscar.c:1457
+#: ../libpurple/protocols/oscar/oscar.c:2250
+#: ../libpurple/protocols/oscar/oscar.c:2297
+#: ../libpurple/protocols/oscar/oscar.c:5864
+#: ../libpurple/protocols/oscar/oscar.c:6145 ../libpurple/request.h:1387
 msgid "_OK"
 msgstr "_OK"
 
-#: ../libpurple/protocols/oscar/oscar.c:1478
-#: ../libpurple/protocols/oscar/oscar.c:1521
+#: ../libpurple/protocols/oscar/oscar.c:1496
+#: ../libpurple/protocols/oscar/oscar.c:1539
 #, c-format
 msgid ""
 "You may be disconnected shortly.  You may want to use TOC until this is "
@@ -6842,54 +7012,54 @@
 "Vous risquez être déconnecté sous peu. Essayer d'utiliser TOC en attendant. "
 "Regardez %s pour plus d'informations."
 
-#: ../libpurple/protocols/oscar/oscar.c:1481
-#: ../libpurple/protocols/oscar/oscar.c:1524
+#: ../libpurple/protocols/oscar/oscar.c:1499
+#: ../libpurple/protocols/oscar/oscar.c:1542
 msgid "Unable to get a valid AIM login hash."
 msgstr "Impossible de récupérer un code de connexion AIM valide."
 
-#: ../libpurple/protocols/oscar/oscar.c:1610
+#: ../libpurple/protocols/oscar/oscar.c:1627
 #, c-format
 msgid "You may be disconnected shortly.  Check %s for updates."
 msgstr ""
 "Vous risquez être déconnecté sous peu. Consultez %s pour plus d'informations."
 
-#: ../libpurple/protocols/oscar/oscar.c:1613
+#: ../libpurple/protocols/oscar/oscar.c:1630
 msgid "Unable to get a valid login hash."
 msgstr "Impossible de récupérer un code de connexion valide."
 
-#: ../libpurple/protocols/oscar/oscar.c:1639
+#: ../libpurple/protocols/oscar/oscar.c:1659
 msgid "Password sent"
 msgstr "Mot de passe envoyé"
 
-#: ../libpurple/protocols/oscar/oscar.c:1695
+#: ../libpurple/protocols/oscar/oscar.c:1715
 msgid "Unable to initialize connection"
 msgstr "Impossible de créer une connexion."
 
-#: ../libpurple/protocols/oscar/oscar.c:2200
+#: ../libpurple/protocols/oscar/oscar.c:2220
 msgid "Please authorize me so I can add you to my buddy list."
 msgstr "Autorise moi pour que je t'ajoute à ma liste de contacts."
 
-#: ../libpurple/protocols/oscar/oscar.c:2228
+#: ../libpurple/protocols/oscar/oscar.c:2248
 msgid "Authorization Request Message:"
 msgstr "Message pour la demande d'autorisation :"
 
-#: ../libpurple/protocols/oscar/oscar.c:2229
+#: ../libpurple/protocols/oscar/oscar.c:2249
 msgid "Please authorize me!"
 msgstr "Autorise moi, s'il te plaît !"
 
-#: ../libpurple/protocols/oscar/oscar.c:2269
-#: ../libpurple/protocols/oscar/oscar.c:2276
-#: ../libpurple/protocols/oscar/oscar.c:2403
-#: ../libpurple/protocols/oscar/oscar.c:5193
-#: ../libpurple/protocols/yahoo/yahoo.c:985
+#: ../libpurple/protocols/oscar/oscar.c:2289
+#: ../libpurple/protocols/oscar/oscar.c:2296
+#: ../libpurple/protocols/oscar/oscar.c:2423
+#: ../libpurple/protocols/oscar/oscar.c:5242
+#: ../libpurple/protocols/yahoo/yahoo.c:987
 msgid "No reason given."
 msgstr "Pas de raison"
 
-#: ../libpurple/protocols/oscar/oscar.c:2275
+#: ../libpurple/protocols/oscar/oscar.c:2295
 msgid "Authorization Denied Message:"
 msgstr "Message de refus d'autorisation :"
 
-#: ../libpurple/protocols/oscar/oscar.c:2403
+#: ../libpurple/protocols/oscar/oscar.c:2423
 #, c-format
 msgid ""
 "The user %u has denied your request to add them to your buddy list for the "
@@ -6900,19 +7070,19 @@
 "contacts pour la raison suivante :\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2404
+#: ../libpurple/protocols/oscar/oscar.c:2424
 msgid "ICQ authorization denied."
 msgstr "Autorisation ICQ refusée"
 
 #. Someone has granted you authorization
-#: ../libpurple/protocols/oscar/oscar.c:2411
+#: ../libpurple/protocols/oscar/oscar.c:2431
 #, c-format
 msgid "The user %u has granted your request to add them to your buddy list."
 msgstr ""
-"L'utilisateur %u a accepté votre demande de le rajouter à votre liste de "
+"L'utilisateur %u a accepté votre demande de l'ajouter à votre liste de "
 "contacts."
 
-#: ../libpurple/protocols/oscar/oscar.c:2419
+#: ../libpurple/protocols/oscar/oscar.c:2439
 #, c-format
 msgid ""
 "You have received a special message\n"
@@ -6925,7 +7095,7 @@
 "De : %s [%s]\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2427
+#: ../libpurple/protocols/oscar/oscar.c:2447
 #, c-format
 msgid ""
 "You have received an ICQ page\n"
@@ -6938,7 +7108,7 @@
 "De : %s [%s]\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2435
+#: ../libpurple/protocols/oscar/oscar.c:2455
 #, c-format
 msgid ""
 "You have received an ICQ e-mail from %s [%s]\n"
@@ -6951,24 +7121,24 @@
 "Le message est :\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2456
+#: ../libpurple/protocols/oscar/oscar.c:2476
 #, c-format
 msgid "ICQ user %u has sent you a buddy: %s (%s)"
 msgstr "L'utilisateur ICQ %u vous a envoyé un contact : %s (%s)"
 
-#: ../libpurple/protocols/oscar/oscar.c:2462
+#: ../libpurple/protocols/oscar/oscar.c:2482
 msgid "Do you want to add this buddy to your buddy list?"
 msgstr "Voulez-vous l'ajouter à votre liste de contacts ?"
 
-#: ../libpurple/protocols/oscar/oscar.c:2467 ../pidgin/gtkroomlist.c:308
+#: ../libpurple/protocols/oscar/oscar.c:2487 ../pidgin/gtkroomlist.c:308
 msgid "_Add"
 msgstr "_Ajouter"
 
-#: ../libpurple/protocols/oscar/oscar.c:2468
+#: ../libpurple/protocols/oscar/oscar.c:2488
 msgid "_Decline"
 msgstr "_Décliner"
 
-#: ../libpurple/protocols/oscar/oscar.c:2552
+#: ../libpurple/protocols/oscar/oscar.c:2572
 #, 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."
@@ -6976,7 +7146,7 @@
 msgstr[1] ""
 "Vous avez raté %hu messages de %s car les messages étaient non valides."
 
-#: ../libpurple/protocols/oscar/oscar.c:2561
+#: ../libpurple/protocols/oscar/oscar.c:2581
 #, 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."
@@ -6984,7 +7154,7 @@
 msgstr[1] ""
 "Vous avez raté %hu messages de %s car les messages étaient trop gros."
 
-#: ../libpurple/protocols/oscar/oscar.c:2570
+#: ../libpurple/protocols/oscar/oscar.c:2590
 #, c-format
 msgid ""
 "You missed %hu message from %s because the rate limit has been exceeded."
@@ -6994,21 +7164,21 @@
 msgstr[1] ""
 "Vous avez raté %hu messages de %s car le quota limite a été dépassé."
 
-#: ../libpurple/protocols/oscar/oscar.c:2579
+#: ../libpurple/protocols/oscar/oscar.c:2599
 #, 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] "Vous avez raté %hu message de %s car l'envoyeur est trop méchant."
 msgstr[1] "Vous avez raté %hu messages de %s car l'envoyeur est trop méchant."
 
-#: ../libpurple/protocols/oscar/oscar.c:2588
+#: ../libpurple/protocols/oscar/oscar.c:2608
 #, 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] "Vous avez raté %hu message de %s car vous êtes trop méchant."
 msgstr[1] "Vous avez raté %hu messages de %s car vous êtes trop méchant."
 
-#: ../libpurple/protocols/oscar/oscar.c:2597
+#: ../libpurple/protocols/oscar/oscar.c:2617
 #, 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."
@@ -7016,61 +7186,55 @@
 msgstr[1] "Vous avez raté %hu messages de %s pour des raisons inconnues."
 
 #. Data is assumed to be the destination sn
-#: ../libpurple/protocols/oscar/oscar.c:2752
+#: ../libpurple/protocols/oscar/oscar.c:2772
 #, c-format
 msgid "Unable to send message: %s"
 msgstr "Impossible d'envoyer le message : %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2752
-#: ../libpurple/protocols/oscar/oscar.c:2757
-#: ../libpurple/protocols/oscar/oscar.c:2819
-#: ../libpurple/protocols/oscar/oscar.c:2823
+#: ../libpurple/protocols/oscar/oscar.c:2772
+#: ../libpurple/protocols/oscar/oscar.c:2777
+#: ../libpurple/protocols/oscar/oscar.c:2841
 msgid "Unknown reason."
 msgstr "Erreur inconnue"
 
-#: ../libpurple/protocols/oscar/oscar.c:2755
+#: ../libpurple/protocols/oscar/oscar.c:2775
 #: ../libpurple/protocols/sametime/sametime.c:2409
 #, c-format
 msgid "Unable to send message to %s:"
 msgstr "Impossible d'envoyer le message vers %s :"
 
-#: ../libpurple/protocols/oscar/oscar.c:2819
+#: ../libpurple/protocols/oscar/oscar.c:2841
 #, c-format
 msgid "User information not available: %s"
 msgstr "Les informations ne sont pas disponibles : %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2822
-#, c-format
-msgid "User information for %s unavailable:"
-msgstr "Les informations de %s ne sont pas disponibles :"
-
-#: ../libpurple/protocols/oscar/oscar.c:2851
+#: ../libpurple/protocols/oscar/oscar.c:2872
 msgid "Online Since"
 msgstr "En ligne depuis"
 
-#: ../libpurple/protocols/oscar/oscar.c:2856
+#: ../libpurple/protocols/oscar/oscar.c:2877
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1161
 msgid "Member Since"
 msgstr "Inscrit depuis"
 
-#: ../libpurple/protocols/oscar/oscar.c:2861
+#: ../libpurple/protocols/oscar/oscar.c:2882
 msgid "Capabilities"
 msgstr "Possibilités"
 
-#: ../libpurple/protocols/oscar/oscar.c:2891
+#: ../libpurple/protocols/oscar/oscar.c:2912
 msgid "Available Message"
 msgstr "Message de disponibilité"
 
-#: ../libpurple/protocols/oscar/oscar.c:2917
+#: ../libpurple/protocols/oscar/oscar.c:2940
 msgid "Profile"
 msgstr "Informations"
 
-#: ../libpurple/protocols/oscar/oscar.c:2994
+#: ../libpurple/protocols/oscar/oscar.c:3020
 msgid "Your AIM connection may be lost."
 msgstr "Votre connexion AIM risque d'être coupée"
 
 #. The conversion failed!
-#: ../libpurple/protocols/oscar/oscar.c:3181
+#: ../libpurple/protocols/oscar/oscar.c:3208
 msgid ""
 "[Unable to display a message from this user because it contained invalid "
 "characters.]"
@@ -7078,7 +7242,7 @@
 "[Impossible d'afficher un message de cet utilisateur car il contient des "
 "caractères non valides.]"
 
-#: ../libpurple/protocols/oscar/oscar.c:3384
+#: ../libpurple/protocols/oscar/oscar.c:3411
 msgid ""
 "The last action you attempted could not be performed because you are over "
 "the rate limit. Please wait 10 seconds and try again."
@@ -7086,85 +7250,86 @@
 "La dernière action n'a pas pu être effectuée car vous avez dépassé le quota "
 "limite. Veuillez attendre 10 secondes et réessayer."
 
-#: ../libpurple/protocols/oscar/oscar.c:3456
+#: ../libpurple/protocols/oscar/oscar.c:3483
 msgid "You have been signed off for an unknown reason."
 msgstr "Vous avez été déconnecté pour une raison inconnue."
 
-#: ../libpurple/protocols/oscar/oscar.c:3469
+#: ../libpurple/protocols/oscar/oscar.c:3496
 #: ../libpurple/protocols/toc/toc.c:977
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "Vous avez été déconnecté du salon %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:3716
-#: ../libpurple/protocols/silc/util.c:581
+#: ../libpurple/protocols/oscar/oscar.c:3743
+#: ../libpurple/protocols/silc/util.c:585
+#: ../libpurple/protocols/silc10/util.c:581
 msgid "Mobile Phone"
 msgstr "Numéro de téléphone portable"
 
-#: ../libpurple/protocols/oscar/oscar.c:3746
+#: ../libpurple/protocols/oscar/oscar.c:3773
 msgid "Personal Web Page"
 msgstr "Page web perso"
 
-#: ../libpurple/protocols/oscar/oscar.c:3770
+#: ../libpurple/protocols/oscar/oscar.c:3797
 #: ../libpurple/protocols/qq/buddy_info.c:40
 msgid "Additional Information"
 msgstr "Informations supplémentaires"
 
-#: ../libpurple/protocols/oscar/oscar.c:3778
-#: ../libpurple/protocols/oscar/oscar.c:3791
+#: ../libpurple/protocols/oscar/oscar.c:3805
+#: ../libpurple/protocols/oscar/oscar.c:3818
 msgid "Zip Code"
 msgstr "Code postal"
 
-#: ../libpurple/protocols/oscar/oscar.c:3802
+#: ../libpurple/protocols/oscar/oscar.c:3829
 msgid "Division"
 msgstr "Division"
 
-#: ../libpurple/protocols/oscar/oscar.c:3803
+#: ../libpurple/protocols/oscar/oscar.c:3830
 msgid "Position"
 msgstr "Poste"
 
-#: ../libpurple/protocols/oscar/oscar.c:3805
+#: ../libpurple/protocols/oscar/oscar.c:3832
 msgid "Web Page"
 msgstr "Page web"
 
-#: ../libpurple/protocols/oscar/oscar.c:3808
+#: ../libpurple/protocols/oscar/oscar.c:3835
 msgid "Work Information"
 msgstr "Informations professionnelles"
 
-#: ../libpurple/protocols/oscar/oscar.c:3864
+#: ../libpurple/protocols/oscar/oscar.c:3891
 msgid "Pop-Up Message"
 msgstr "Message en fenêtre"
 
-#: ../libpurple/protocols/oscar/oscar.c:3904
+#: ../libpurple/protocols/oscar/oscar.c:3931
 #, c-format
 msgid "The following screen name is associated with %s"
 msgid_plural "The following screen names are associated with %s"
 msgstr[0] "Le nom d'utilisateur suivant est associé à %s"
 msgstr[1] "Les noms d'utilisateur suivants sont associés à %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:3909
+#: ../libpurple/protocols/oscar/oscar.c:3936
 msgid "Screen name"
 msgstr "Nom d'utilisateur"
 
-#: ../libpurple/protocols/oscar/oscar.c:3935
+#: ../libpurple/protocols/oscar/oscar.c:3962
 #, c-format
 msgid "No results found for e-mail address %s"
 msgstr "Aucun résultat pour l'adresse électronique %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:3956
+#: ../libpurple/protocols/oscar/oscar.c:3983
 #, c-format
 msgid "You should receive an e-mail asking to confirm %s."
 msgstr "Vous devriez recevoir un courrier électronique pour confirmer %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:3958
+#: ../libpurple/protocols/oscar/oscar.c:3985
 msgid "Account Confirmation Requested"
 msgstr "Confirmation de compte demandée"
 
-#: ../libpurple/protocols/oscar/oscar.c:3989
+#: ../libpurple/protocols/oscar/oscar.c:4016
 msgid "Error Changing Account Info"
 msgstr "Erreur en changeant les informations du compte"
 
-#: ../libpurple/protocols/oscar/oscar.c:3992
+#: ../libpurple/protocols/oscar/oscar.c:4019
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
@@ -7173,14 +7338,14 @@
 "Erreur 0x%04x : Impossible d'afficher le nom d'utilisateur parce que la "
 "version demandée diffère de l'originale."
 
-#: ../libpurple/protocols/oscar/oscar.c:3995
+#: ../libpurple/protocols/oscar/oscar.c:4022
 #, c-format
 msgid "Error 0x%04x: Unable to format screen name because it is invalid."
 msgstr ""
 "Erreur 0x%04x : Impossible d'afficher le nom d'utilisateur parce qu'il est "
 "non valide."
 
-#: ../libpurple/protocols/oscar/oscar.c:3998
+#: ../libpurple/protocols/oscar/oscar.c:4025
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
@@ -7189,7 +7354,7 @@
 "Erreur 0x%04x : Impossible d'afficher le nom d'utilisateur parce que la "
 "version demandée est trop longue"
 
-#: ../libpurple/protocols/oscar/oscar.c:4001
+#: ../libpurple/protocols/oscar/oscar.c:4028
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change e-mail address because there is already a "
@@ -7198,7 +7363,7 @@
 "Erreur 0x%04x : Impossible de changer l'adresse électronique parce qu'il y a "
 "une requête en attente pour cet identifiant."
 
-#: ../libpurple/protocols/oscar/oscar.c:4004
+#: ../libpurple/protocols/oscar/oscar.c:4031
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change e-mail address because the given address has "
@@ -7207,7 +7372,7 @@
 "Erreur 0x%04x : Impossible de changer l'adresse électronique parce qu'il y a "
 "trop d'identifiants associés à cette adresse."
 
-#: ../libpurple/protocols/oscar/oscar.c:4007
+#: ../libpurple/protocols/oscar/oscar.c:4034
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change e-mail address because the given address is "
@@ -7216,32 +7381,32 @@
 "Erreur 0x%04x : Impossible de changer l'adresse électronique parce qu'elle "
 "est non valide."
 
-#: ../libpurple/protocols/oscar/oscar.c:4010
+#: ../libpurple/protocols/oscar/oscar.c:4037
 #, c-format
 msgid "Error 0x%04x: Unknown error."
 msgstr "Erreur 0x%04x : Erreur inconnue."
 
-#: ../libpurple/protocols/oscar/oscar.c:4020
+#: ../libpurple/protocols/oscar/oscar.c:4047
 #, c-format
 msgid "The e-mail address for %s is %s"
 msgstr "L'adresse électronique de %s est %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:4022
+#: ../libpurple/protocols/oscar/oscar.c:4049
 msgid "Account Info"
 msgstr "Infos du compte"
 
-#: ../libpurple/protocols/oscar/oscar.c:4194
+#: ../libpurple/protocols/oscar/oscar.c:4221
 msgid ""
 "Your IM Image was not sent. You must be Direct Connected to send IM Images."
 msgstr ""
 "Votre image instantanée n'a pas été envoyée. Vous devez utiliser une "
 "connexion directe pour envoyer des images."
 
-#: ../libpurple/protocols/oscar/oscar.c:4439
+#: ../libpurple/protocols/oscar/oscar.c:4487
 msgid "Unable to set AIM profile."
 msgstr "Impossible d'envoyer le profil AIM"
 
-#: ../libpurple/protocols/oscar/oscar.c:4440
+#: ../libpurple/protocols/oscar/oscar.c:4488
 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 "
@@ -7251,7 +7416,7 @@
 "connexion. Le profil n'a pas été changé. Réessayez une fois la connexion "
 "complète."
 
-#: ../libpurple/protocols/oscar/oscar.c:4454
+#: ../libpurple/protocols/oscar/oscar.c:4502
 #, c-format
 msgid ""
 "The maximum profile length of %d byte has been exceeded.  It has been "
@@ -7266,11 +7431,11 @@
 "La taille maximale de %d caractères du profil a été dépassée. Il a été "
 "tronqué automatiquement."
 
-#: ../libpurple/protocols/oscar/oscar.c:4459
+#: ../libpurple/protocols/oscar/oscar.c:4507
 msgid "Profile too long."
 msgstr "Profil trop long"
 
-#: ../libpurple/protocols/oscar/oscar.c:4504
+#: ../libpurple/protocols/oscar/oscar.c:4552
 #, c-format
 msgid ""
 "The maximum away message length of %d byte has been exceeded.  It has been "
@@ -7285,33 +7450,33 @@
 "La taille maximale de %d caractères pour le message d'absence a été "
 "dépassée. Il a été tronqué lors de la mise à jour."
 
-#: ../libpurple/protocols/oscar/oscar.c:4509
+#: ../libpurple/protocols/oscar/oscar.c:4557
 msgid "Away message too long."
 msgstr "Message d'absence trop long"
 
-#: ../libpurple/protocols/oscar/oscar.c:4578
+#: ../libpurple/protocols/oscar/oscar.c:4626
 #, c-format
 msgid ""
 "Could not add the buddy %s because the screen name is invalid.  Screen names "
-"must either start with a letter and contain only letters, numbers and "
-"spaces, or contain only numbers."
+"must be a valid email address, or start with a letter and contain only "
+"letters, numbers and spaces, or contain only numbers."
 msgstr ""
 "Impossible d'ajouter le contact %s car son nom d'utilisateur est non valide. "
-"Les noms des contacts doivent soit commencer par une lettre et contenir "
-"uniquement des lettres, des chiffres et des espaces, soit contenir "
-"uniquement des chiffres."
-
-#: ../libpurple/protocols/oscar/oscar.c:4580
-#: ../libpurple/protocols/oscar/oscar.c:5003
-#: ../libpurple/protocols/oscar/oscar.c:5017
+"Les noms des contacts doivent soit être une adresse électronique valide, soit "
+"commencer par une lettre et contenir uniquement des lettres, des chiffres et "
+"des espaces, soit contenir uniquement des chiffres."
+
+#: ../libpurple/protocols/oscar/oscar.c:4628
+#: ../libpurple/protocols/oscar/oscar.c:5051
+#: ../libpurple/protocols/oscar/oscar.c:5066
 msgid "Unable To Add"
 msgstr "Impossible d'ajouter"
 
-#: ../libpurple/protocols/oscar/oscar.c:4684
+#: ../libpurple/protocols/oscar/oscar.c:4732
 msgid "Unable To Retrieve Buddy List"
 msgstr "Impossible de récupérer la liste de contacts"
 
-#: ../libpurple/protocols/oscar/oscar.c:4685
+#: ../libpurple/protocols/oscar/oscar.c:4733
 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."
@@ -7320,41 +7485,35 @@
 "contacts. Elle n'est pas perdue et sera de nouveau disponible dans quelques "
 "temps."
 
-#: ../libpurple/protocols/oscar/oscar.c:4889
-#: ../libpurple/protocols/oscar/oscar.c:4890
-#: ../libpurple/protocols/oscar/oscar.c:4895
-#: ../libpurple/protocols/oscar/oscar.c:5071
-#: ../libpurple/protocols/oscar/oscar.c:5072
-#: ../libpurple/protocols/oscar/oscar.c:5077
+#: ../libpurple/protocols/oscar/oscar.c:4937
+#: ../libpurple/protocols/oscar/oscar.c:4938
+#: ../libpurple/protocols/oscar/oscar.c:4943
+#: ../libpurple/protocols/oscar/oscar.c:5120
+#: ../libpurple/protocols/oscar/oscar.c:5121
+#: ../libpurple/protocols/oscar/oscar.c:5126
 msgid "Orphans"
 msgstr "Orphelins"
 
-#: ../libpurple/protocols/oscar/oscar.c:5001
+#: ../libpurple/protocols/oscar/oscar.c:5049
 #, c-format
 msgid ""
 "Could not add the buddy %s because you have too many buddies in your buddy "
 "list.  Please remove one and try again."
 msgstr ""
-"Impossible de rajouter le contact %s parce qu'il y a trop de contacts dans "
+"Impossible d'ajouter le contact %s parce qu'il y a trop de contacts dans "
 "la liste. Supprimez un contact et réessayez."
 
-#: ../libpurple/protocols/oscar/oscar.c:5001
-#: ../libpurple/protocols/oscar/oscar.c:5015
+#: ../libpurple/protocols/oscar/oscar.c:5049
+#: ../libpurple/protocols/oscar/oscar.c:5064
 msgid "(no name)"
 msgstr "(pas de nom)"
 
-#: ../libpurple/protocols/oscar/oscar.c:5015
-#, c-format
-msgid ""
-"Could not add the buddy %s for an unknown reason.  The most common reason "
-"for this is that you have the maximum number of allowed buddies in your "
-"buddy list."
-msgstr ""
-"Impossible d'ajouter le contact %s pour une raison inconnue. La raison la "
-"plus probable est que le nombre maximum de contact a été atteint dans votre "
-"liste de contacts."
-
-#: ../libpurple/protocols/oscar/oscar.c:5108
+#: ../libpurple/protocols/oscar/oscar.c:5063
+#, c-format
+msgid "Could not add the buddy %s for an unknown reason."
+msgstr "Impossible d'ajouter le contact %s pour une raison inconnue."
+
+#: ../libpurple/protocols/oscar/oscar.c:5157
 #, c-format
 msgid ""
 "The user %s has given you permission to add you to their buddy list.  Do you "
@@ -7363,24 +7522,24 @@
 "L'utilisateur %s vous a autorisé à l'ajouter à votre liste de contacts. "
 "Voulez-vous le faire ?"
 
-#: ../libpurple/protocols/oscar/oscar.c:5116
+#: ../libpurple/protocols/oscar/oscar.c:5165
 msgid "Authorization Given"
 msgstr "Autorisation donnée"
 
 #. Granted
-#: ../libpurple/protocols/oscar/oscar.c:5189
+#: ../libpurple/protocols/oscar/oscar.c:5238
 #, c-format
 msgid "The user %s has granted your request to add them to your buddy list."
 msgstr ""
-"L'utilisateur %s a accepté votre demande de le rajouter à votre liste de "
+"L'utilisateur %s a accepté votre demande de l'ajouter à votre liste de "
 "contacts."
 
-#: ../libpurple/protocols/oscar/oscar.c:5190
+#: ../libpurple/protocols/oscar/oscar.c:5239
 msgid "Authorization Granted"
 msgstr "Autorisation accordée"
 
 #. Denied
-#: ../libpurple/protocols/oscar/oscar.c:5193
+#: ../libpurple/protocols/oscar/oscar.c:5242
 #, c-format
 msgid ""
 "The user %s has denied your request to add them to your buddy list for the "
@@ -7391,53 +7550,53 @@
 "contacts pour la raison suivante :\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:5194
+#: ../libpurple/protocols/oscar/oscar.c:5243
 msgid "Authorization Denied"
 msgstr "Autorisation refusée"
 
-#: ../libpurple/protocols/oscar/oscar.c:5230
+#: ../libpurple/protocols/oscar/oscar.c:5279
 #: ../libpurple/protocols/toc/toc.c:1371
 msgid "_Exchange:"
 msgstr "_Echange :"
 
-#: ../libpurple/protocols/oscar/oscar.c:5270
+#: ../libpurple/protocols/oscar/oscar.c:5319
 msgid "Invalid chat name specified."
 msgstr "Nom du salon de discussions non valide"
 
-#: ../libpurple/protocols/oscar/oscar.c:5340
+#: ../libpurple/protocols/oscar/oscar.c:5388
 msgid "Your IM Image was not sent. You cannot send IM Images in AIM chats."
 msgstr ""
 "Votre image instantanée n'a pas été envoyée. Vous ne pouvez pas envoyer "
 "d'images dans les discussions AIM."
 
-#: ../libpurple/protocols/oscar/oscar.c:5479
-#: ../libpurple/protocols/oscar/oscar.c:5484
+#: ../libpurple/protocols/oscar/oscar.c:5548
+#: ../libpurple/protocols/oscar/oscar.c:5553
 msgid "Away Message"
 msgstr "Message d'absence"
 
-#: ../libpurple/protocols/oscar/oscar.c:5484
+#: ../libpurple/protocols/oscar/oscar.c:5553
 msgid "<i>(retrieving)</i>"
 msgstr " <i>(en cours de récupération)</i>"
 
-#: ../libpurple/protocols/oscar/oscar.c:5684
+#: ../libpurple/protocols/oscar/oscar.c:5753
 msgid "iTunes Music Store Link"
 msgstr "Lien de l'iTunes Music Store"
 
-#: ../libpurple/protocols/oscar/oscar.c:5792
+#: ../libpurple/protocols/oscar/oscar.c:5861
 #, c-format
 msgid "Buddy Comment for %s"
 msgstr "Commentaire pour %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:5793
+#: ../libpurple/protocols/oscar/oscar.c:5862
 msgid "Buddy Comment:"
 msgstr "Commentaire :"
 
-#: ../libpurple/protocols/oscar/oscar.c:5840
+#: ../libpurple/protocols/oscar/oscar.c:5909
 #, c-format
 msgid "You have selected to open a Direct IM connection with %s."
 msgstr "Connexion directe avec %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:5844
+#: ../libpurple/protocols/oscar/oscar.c:5913
 msgid ""
 "Because this reveals your IP address, it may be considered a security risk.  "
 "Do you wish to continue?"
@@ -7445,65 +7604,66 @@
 "Cela révèle votre adresse IP et peut être considéré comme une faille de "
 "sécurité. Voulez-vous continuer ?"
 
-#: ../libpurple/protocols/oscar/oscar.c:5850
+#: ../libpurple/protocols/oscar/oscar.c:5919
+#: ../libpurple/protocols/oscar/peer.c:1022
 msgid "C_onnect"
 msgstr "_Connecter"
 
-#: ../libpurple/protocols/oscar/oscar.c:5885
+#: ../libpurple/protocols/oscar/oscar.c:5954
 msgid "Get AIM Info"
 msgstr "Récupérer les infos AIM"
 
-#: ../libpurple/protocols/oscar/oscar.c:5891
+#: ../libpurple/protocols/oscar/oscar.c:5960
 msgid "Edit Buddy Comment"
 msgstr "Modifier le commentaire"
 
-#: ../libpurple/protocols/oscar/oscar.c:5899
+#: ../libpurple/protocols/oscar/oscar.c:5968
 msgid "Get Status Msg"
 msgstr "Obtenir le message d'état"
 
-#: ../libpurple/protocols/oscar/oscar.c:5912
+#: ../libpurple/protocols/oscar/oscar.c:5981
 msgid "Direct IM"
 msgstr "Connexion directe"
 
-#: ../libpurple/protocols/oscar/oscar.c:5934
+#: ../libpurple/protocols/oscar/oscar.c:6003
 msgid "Re-request Authorization"
 msgstr "Redemander autorisation"
 
-#: ../libpurple/protocols/oscar/oscar.c:5993
+#: ../libpurple/protocols/oscar/oscar.c:6062
 msgid "Require authorization"
 msgstr "Demande d'autorisation"
 
-#: ../libpurple/protocols/oscar/oscar.c:5996
+#: ../libpurple/protocols/oscar/oscar.c:6065
 msgid "Web aware (enabling this will cause you to receive SPAM!)"
 msgstr "Sur le web (activer ceci vous fera recevoir du pourriel !)"
 
-#: ../libpurple/protocols/oscar/oscar.c:6001
+#: ../libpurple/protocols/oscar/oscar.c:6070
 msgid "ICQ Privacy Options"
 msgstr "Options de confidentialité ICQ"
 
-#: ../libpurple/protocols/oscar/oscar.c:6020
+#: ../libpurple/protocols/oscar/oscar.c:6089
 msgid "The new formatting is invalid."
 msgstr "Le nouvel affichage est non valide"
 
-#: ../libpurple/protocols/oscar/oscar.c:6021
+#: ../libpurple/protocols/oscar/oscar.c:6090
 msgid "Screen name formatting can change only capitalization and whitespace."
 msgstr ""
 "Le format d'affichage du nom d'utilisateur permet uniquement de changer les "
 "majuscules et les espaces."
 
-#: ../libpurple/protocols/oscar/oscar.c:6074
+#: ../libpurple/protocols/oscar/oscar.c:6143
 msgid "Change Address To:"
 msgstr "Nouvelle adresse :"
 
-#: ../libpurple/protocols/oscar/oscar.c:6120
+#: ../libpurple/protocols/oscar/oscar.c:6189
 msgid "<i>you are not waiting for authorization</i>"
 msgstr "<i>Vous n'attendez aucune autorisation</i>"
 
-#: ../libpurple/protocols/oscar/oscar.c:6123
+#: ../libpurple/protocols/oscar/oscar.c:6192
 msgid "You are awaiting authorization from the following buddies"
 msgstr "Vous attendez une autorisation des contacts suivants"
 
-#: ../libpurple/protocols/oscar/oscar.c:6124
+#: ../libpurple/protocols/oscar/oscar.c:6193
 msgid ""
 "You can re-request authorization from these buddies by right-clicking on "
 "them and selecting \"Re-request Authorization.\""
@@ -7511,73 +7671,73 @@
 "Vous pouvez redemander une autorisation de ces contacts en choisissant "
 "« Redemander autorisation » sur un clic droit du contact."
 
-#: ../libpurple/protocols/oscar/oscar.c:6141
+#: ../libpurple/protocols/oscar/oscar.c:6210
 msgid "Find Buddy by E-Mail"
 msgstr "Chercher un contact par adresse électronique"
 
-#: ../libpurple/protocols/oscar/oscar.c:6142
+#: ../libpurple/protocols/oscar/oscar.c:6211
 msgid "Search for a buddy by e-mail address"
 msgstr "Rechercher par adresse électronique"
 
-#: ../libpurple/protocols/oscar/oscar.c:6143
+#: ../libpurple/protocols/oscar/oscar.c:6212
 msgid "Type the e-mail address of the buddy you are searching for."
 msgstr "Saisissez l'adresse électronique du contact que vous cherchez"
 
-#: ../libpurple/protocols/oscar/oscar.c:6146
+#: ../libpurple/protocols/oscar/oscar.c:6215
 msgid "_Search"
 msgstr "_Recherche"
 
-#: ../libpurple/protocols/oscar/oscar.c:6304
+#: ../libpurple/protocols/oscar/oscar.c:6373
 msgid "Set User Info (URL)..."
 msgstr "Modifier les informations (URL)..."
 
-#: ../libpurple/protocols/oscar/oscar.c:6315
+#: ../libpurple/protocols/oscar/oscar.c:6384
 msgid "Change Password (URL)"
 msgstr "Changer de mot de passe (URL)"
 
-#: ../libpurple/protocols/oscar/oscar.c:6319
+#: ../libpurple/protocols/oscar/oscar.c:6388
 msgid "Configure IM Forwarding (URL)"
 msgstr "Configurer le transfert de message (URL)"
 
 #. ICQ actions
-#: ../libpurple/protocols/oscar/oscar.c:6329
+#: ../libpurple/protocols/oscar/oscar.c:6398
 msgid "Set Privacy Options..."
 msgstr "Changer les options de confidentialité..."
 
 #. AIM actions
-#: ../libpurple/protocols/oscar/oscar.c:6336
+#: ../libpurple/protocols/oscar/oscar.c:6405
 msgid "Confirm Account"
 msgstr "Confirmer le compte"
 
-#: ../libpurple/protocols/oscar/oscar.c:6340
+#: ../libpurple/protocols/oscar/oscar.c:6409
 msgid "Display Currently Registered E-Mail Address"
 msgstr "Afficher l'adresse courante enregistrée"
 
-#: ../libpurple/protocols/oscar/oscar.c:6344
+#: ../libpurple/protocols/oscar/oscar.c:6413
 msgid "Change Currently Registered E-Mail Address..."
 msgstr "Changer l'adresse courante enregistrée..."
 
-#: ../libpurple/protocols/oscar/oscar.c:6351
+#: ../libpurple/protocols/oscar/oscar.c:6420
 msgid "Show Buddies Awaiting Authorization"
 msgstr "Afficher les demandes d'autorisation"
 
-#: ../libpurple/protocols/oscar/oscar.c:6357
+#: ../libpurple/protocols/oscar/oscar.c:6426
 msgid "Search for Buddy by E-Mail Address..."
 msgstr "Chercher un contact par adresse électronique..."
 
-#: ../libpurple/protocols/oscar/oscar.c:6362
+#: ../libpurple/protocols/oscar/oscar.c:6431
 msgid "Search for Buddy by Information"
 msgstr "Chercher d'après les informations..."
 
-#: ../libpurple/protocols/oscar/oscar.c:6430
+#: ../libpurple/protocols/oscar/oscar.c:6499
 msgid "Use recent buddies group"
 msgstr "Utiliser le groupe de contacts récents"
 
-#: ../libpurple/protocols/oscar/oscar.c:6433
+#: ../libpurple/protocols/oscar/oscar.c:6502
 msgid "Show how long you have been idle"
 msgstr "Afficher temps d'inactivité"
 
-#: ../libpurple/protocols/oscar/oscar.c:6588
+#: ../libpurple/protocols/oscar/oscar.c:6657
 msgid ""
 "Always use ICQ proxy server for file transfers\n"
 "(slower, but does not reveal your IP address)"
@@ -7614,10 +7774,6 @@
 "d'images. Votre adresse IP sera révélée et ceci peut être considéré comme "
 "une faille de sécurité."
 
-#: ../libpurple/protocols/oscar/peer.c:1022
-msgid "_Connect"
-msgstr "_Connecter"
-
 #: ../libpurple/protocols/qq/buddy_info.c:39
 msgid "Primary Information"
 msgstr "Informations principales"
@@ -7798,13 +7954,13 @@
 msgstr "QQ Face non valide"
 
 #: ../libpurple/protocols/qq/buddy_opt.c:208
-#: ../libpurple/protocols/qq/group_opt.c:135
+#: ../libpurple/protocols/qq/group_opt.c:136
 #, c-format
 msgid "You rejected %d's request"
 msgstr "Vous avez rejeté la demande de %d."
 
 #: ../libpurple/protocols/qq/buddy_opt.c:209
-#: ../libpurple/protocols/qq/group_opt.c:136
+#: ../libpurple/protocols/qq/group_opt.c:137
 msgid "Input your reason:"
 msgstr "Saisissez votre raison :"
 
@@ -7814,13 +7970,13 @@
 
 #. title
 #: ../libpurple/protocols/qq/buddy_opt.c:213
-#: ../libpurple/protocols/qq/group_opt.c:140
+#: ../libpurple/protocols/qq/group_opt.c:141
 msgid "Sorry, you are not my type..."
 msgstr "Désolé, tu n'es pas mon genre..."
 
 #: ../libpurple/protocols/qq/buddy_opt.c:214
-#: ../libpurple/protocols/qq/group_im.c:142
-#: ../libpurple/protocols/qq/group_opt.c:126
+#: ../libpurple/protocols/qq/group_im.c:144
+#: ../libpurple/protocols/qq/group_opt.c:127
 #: ../libpurple/protocols/qq/sys_msg.c:91
 #: ../libpurple/protocols/qq/sys_msg.c:249
 msgid "Reject"
@@ -7844,13 +8000,13 @@
 msgstr "L'utilisateur %d demande une authentification."
 
 #: ../libpurple/protocols/qq/buddy_opt.c:404
-#: ../libpurple/protocols/qq/group_join.c:134
+#: ../libpurple/protocols/qq/group_join.c:136
 msgid "Input request here"
 msgstr "Saisissez votre demande"
 
 #. 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
+#: ../libpurple/protocols/qq/group_join.c:137
 msgid "Would you be my friend?"
 msgstr "Veux-tu être mon ami ?"
 
@@ -7858,8 +8014,8 @@
 #. masked
 #. hint
 #: ../libpurple/protocols/qq/buddy_opt.c:406
-#: ../libpurple/protocols/qq/group_join.c:136
-#: ../libpurple/protocols/qq/group_opt.c:142
+#: ../libpurple/protocols/qq/group_join.c:138
+#: ../libpurple/protocols/qq/group_opt.c:143
 msgid "Send"
 msgstr "Envoyer"
 
@@ -7908,63 +8064,63 @@
 msgid "You can only search for permanent QQ groups\n"
 msgstr "Vous ne pouvez cherche que les groupes QQ permanents.\n"
 
-#: ../libpurple/protocols/qq/group_im.c:124
+#: ../libpurple/protocols/qq/group_im.c:126
 #, c-format
 msgid "User %d applied to join group %d"
 msgstr "L'utilisateur %d demande à entrer dans le groupe %d."
 
-#: ../libpurple/protocols/qq/group_im.c:125
-#: ../libpurple/protocols/qq/group_im.c:179
+#: ../libpurple/protocols/qq/group_im.c:127
+#: ../libpurple/protocols/qq/group_im.c:181
 #: ../libpurple/protocols/qq/sys_msg.c:195
 #, c-format
 msgid "Reason: %s"
 msgstr "Raison : %s"
 
-#: ../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
+#: ../libpurple/protocols/qq/group_im.c:136
+#: ../libpurple/protocols/qq/group_im.c:183
+#: ../libpurple/protocols/qq/group_im.c:223
+#: ../libpurple/protocols/qq/group_im.c:258
+#: ../libpurple/protocols/qq/group_im.c:292
+#: ../libpurple/protocols/qq/group_join.c:233
+#: ../libpurple/protocols/qq/group_join.c:359
+#: ../libpurple/protocols/qq/group_opt.c:235
+#: ../libpurple/protocols/qq/group_opt.c:305
+#: ../libpurple/protocols/qq/group_opt.c:391
 msgid "QQ Qun Operation"
 msgstr "Opération QQ Qun"
 
-#: ../libpurple/protocols/qq/group_im.c:139
-#: ../libpurple/protocols/qq/group_opt.c:127
+#: ../libpurple/protocols/qq/group_im.c:141
+#: ../libpurple/protocols/qq/group_opt.c:128
 #: ../libpurple/protocols/qq/sys_msg.c:92
 #: ../libpurple/protocols/qq/sys_msg.c:251
 msgid "Approve"
 msgstr "Approuver"
 
-#: ../libpurple/protocols/qq/group_im.c:178
+#: ../libpurple/protocols/qq/group_im.c:180
 #, c-format
 msgid "You request to join group %d has been rejected by admin %d"
 msgstr ""
 "Votre demande pour entrer dans le groupe %d a été refusée par "
 "l'administrateur %d."
 
-#: ../libpurple/protocols/qq/group_im.c:219
+#: ../libpurple/protocols/qq/group_im.c:221
 #, c-format
 msgid "You request to join group %d has been approved by admin %d"
 msgstr ""
 "Votre demande pour entrer joindre le groupe %d a été acceptée par "
 "l'administrateur %d."
 
-#: ../libpurple/protocols/qq/group_im.c:255
+#: ../libpurple/protocols/qq/group_im.c:257
 #, c-format
 msgid "You [%d] has exit group \"%d\""
 msgstr "Vous (%d) avez quitté le groupe %d."
 
-#: ../libpurple/protocols/qq/group_im.c:289
+#: ../libpurple/protocols/qq/group_im.c:291
 #, c-format
 msgid "You [%d] has been added by group \"%d\""
 msgstr "Vous (%d) avez rejoint le groupe %d."
 
-#: ../libpurple/protocols/qq/group_im.c:290
+#: ../libpurple/protocols/qq/group_im.c:292
 msgid "This group has been added to your buddy list"
 msgstr "Ce groupe a été ajouté à votre liste de contacts."
 
@@ -7988,31 +8144,31 @@
 msgid "Unknown status"
 msgstr "État inconnu."
 
-#: ../libpurple/protocols/qq/group_join.c:80
+#: ../libpurple/protocols/qq/group_join.c:82
 msgid "This group does not allow others to join"
 msgstr "Ce groupe est fermé aux inscriptions."
 
-#: ../libpurple/protocols/qq/group_join.c:231
+#: ../libpurple/protocols/qq/group_join.c:233
 msgid "You have successfully exited the group"
 msgstr "Vous avez quitté ce groupe."
 
-#: ../libpurple/protocols/qq/group_join.c:255
+#: ../libpurple/protocols/qq/group_join.c:257
 msgid "QQ Group Auth"
 msgstr "Authentification QQ du groupe"
 
-#: ../libpurple/protocols/qq/group_join.c:256
+#: ../libpurple/protocols/qq/group_join.c:258
 msgid "Your authorization operation has been accepted by the QQ server"
 msgstr "Votre opération d'authentification a été acceptée par le serveur QQ."
 
-#: ../libpurple/protocols/qq/group_join.c:327
+#: ../libpurple/protocols/qq/group_join.c:329
 msgid "You inputted a group id outside the acceptable range"
 msgstr "Vous avez saisi un ID de groupe hors de l'intervalle autorisé."
 
-#: ../libpurple/protocols/qq/group_join.c:358
+#: ../libpurple/protocols/qq/group_join.c:360
 msgid "Are you sure to exit this Qun?"
 msgstr "Êtes-vous sûr de vouloir quitter ce Qun ?"
 
-#: ../libpurple/protocols/qq/group_join.c:360
+#: ../libpurple/protocols/qq/group_join.c:362
 msgid ""
 "Note, if you are the creator, \n"
 "this operation will eventually remove this Qun."
@@ -8020,58 +8176,58 @@
 "Note : si vous en êtes le créateur, \n"
 "cette opération peut supprimer ce Qun."
 
-#: ../libpurple/protocols/qq/group_join.c:365
+#: ../libpurple/protocols/qq/group_join.c:367
 msgid "Go ahead"
 msgstr "En avant"
 
-#: ../libpurple/protocols/qq/group_network.c:90
+#: ../libpurple/protocols/qq/group_network.c:92
 #, c-format
 msgid "Code [0x%02X]: %s"
 msgstr "Code [0x%02X] : %s"
 
-#: ../libpurple/protocols/qq/group_network.c:91
+#: ../libpurple/protocols/qq/group_network.c:93
 msgid "Group Operation Error"
 msgstr "Erreur sur une opération du groupe."
 
 #. we wanna see window
-#: ../libpurple/protocols/qq/group_opt.c:123
+#: ../libpurple/protocols/qq/group_opt.c:124
 #: ../libpurple/protocols/qq/sys_msg.c:88
 msgid "Do you wanna approve the request?"
 msgstr "Voulez-vous accepter cette demande ?"
 
-#: ../libpurple/protocols/qq/group_opt.c:234
+#: ../libpurple/protocols/qq/group_opt.c:235
 msgid "You have successfully modify Qun member"
 msgstr "Vous avez modifié la liste des membres du Qun."
 
-#: ../libpurple/protocols/qq/group_opt.c:304
+#: ../libpurple/protocols/qq/group_opt.c:305
 msgid "You have successfully modify Qun information"
 msgstr "Vous avez modifié les informations du Qun."
 
-#: ../libpurple/protocols/qq/group_opt.c:391
+#: ../libpurple/protocols/qq/group_opt.c:392
 msgid "You have successfully created a Qun"
 msgstr "Vous avez créé un Qun."
 
-#: ../libpurple/protocols/qq/group_opt.c:393
+#: ../libpurple/protocols/qq/group_opt.c:394
 msgid "Would you like to set up the Qun details now?"
 msgstr "Voulez-vous modifier les paramètres du Qun maintenant ?"
 
-#: ../libpurple/protocols/qq/group_opt.c:397
+#: ../libpurple/protocols/qq/group_opt.c:398
 msgid "Setup"
 msgstr "Options"
 
-#: ../libpurple/protocols/qq/im.c:430
+#: ../libpurple/protocols/qq/im.c:432
 msgid "System Message"
 msgstr "Message système"
 
-#: ../libpurple/protocols/qq/im.c:574
+#: ../libpurple/protocols/qq/im.c:576
 msgid "Server ACK"
 msgstr "Serveur ACK"
 
-#: ../libpurple/protocols/qq/im.c:574
-msgid "Send IM fail\n"
-msgstr "Échec à l'envoi d'un message.\n"
-
-#: ../libpurple/protocols/qq/keep_alive.c:85
+#: ../libpurple/protocols/qq/im.c:576
+msgid "Failed to send IM."
+msgstr "Impossible d'envoyer le message."
+
+#: ../libpurple/protocols/qq/keep_alive.c:87
 msgid "Keep alive error, seems connection lost!"
 msgstr "Erreur de connexion."
 
@@ -8085,15 +8241,9 @@
 "Impossible de se connecter, veuillez vérifier les messages de débuggage."
 
 #. we didn't successfully connect. tdt->toc_fd is valid here
-#. TODO: Include error_message in the message below
 #: ../libpurple/protocols/qq/qq.c:139 ../libpurple/protocols/toc/toc.c:173
-#: ../libpurple/protocols/yahoo/yahoo.c:2378
-#: ../libpurple/protocols/yahoo/yahoo.c:2406
-#: ../libpurple/protocols/yahoo/yahoo.c:2513
-#: ../libpurple/protocols/yahoo/yahoo.c:2534
-#: ../libpurple/protocols/yahoo/yahoo.c:2618
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:108
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:188
+#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:109
+#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:189
 #: ../libpurple/protocols/yahoo/ycht.c:549
 msgid "Unable to connect."
 msgstr "Impossible de se connecter"
@@ -8234,27 +8384,27 @@
 msgid "Unable to read from socket"
 msgstr "Impossible de lire le socket."
 
-#: ../libpurple/protocols/qq/send_file.c:706
+#: ../libpurple/protocols/qq/send_file.c:707
 #, c-format
 msgid "%d has declined the file %s"
 msgstr "%d a refusé le fichier %s"
 
-#: ../libpurple/protocols/qq/send_file.c:709
-#: ../libpurple/protocols/qq/send_file.c:738
+#: ../libpurple/protocols/qq/send_file.c:710
+#: ../libpurple/protocols/qq/send_file.c:739
 msgid "File Send"
 msgstr "Envoi de fichier"
 
-#: ../libpurple/protocols/qq/send_file.c:735
+#: ../libpurple/protocols/qq/send_file.c:736
 #, c-format
 msgid "%d canceled the transfer of %s"
 msgstr "%d a annulé le transfert de %s"
 
-#: ../libpurple/protocols/qq/sendqueue.c:122
+#: ../libpurple/protocols/qq/sendqueue.c:123
 msgid "Connection lost"
 msgstr "Connexion perdue."
 
 #. cancel login progress
-#: ../libpurple/protocols/qq/sendqueue.c:130
+#: ../libpurple/protocols/qq/sendqueue.c:131
 msgid "Login failed, no reply"
 msgstr "Échec à la connexion, aucune réponse."
 
@@ -8500,7 +8650,7 @@
 msgid "Send TEST Announcement"
 msgstr "Envoyer une proclamation TEST"
 
-#: ../libpurple/protocols/sametime/sametime.c:3586 ../pidgin/gtkconv.c:4177
+#: ../libpurple/protocols/sametime/sametime.c:3586 ../pidgin/gtkconv.c:4274
 msgid "Topic:"
 msgstr "Sujet :"
 
@@ -8525,6 +8675,10 @@
 msgid "No Sametime Community Server Specified"
 msgstr "Aucun serveur communautaire Sametime n'a été spécifié."
 
+#: ../libpurple/protocols/sametime/sametime.c:3644 ../pidgin/gtkblist.c:4015
+msgid "Connect"
+msgstr "Connecter"
+
 #: ../libpurple/protocols/sametime/sametime.c:4135
 #, c-format
 msgid "Unknown (0x%04x)<br>"
@@ -8699,7 +8853,8 @@
 "Vous pouvez ajouter ces utilisateurs à votre liste de contacts ou leur "
 "envoyer un message avec les boutons ci-dessous."
 
-#: ../libpurple/protocols/sametime/sametime.c:5538 ../pidgin/gtknotify.c:716
+#. Create the window
+#: ../libpurple/protocols/sametime/sametime.c:5538 ../pidgin/gtknotify.c:719
 msgid "Search Results"
 msgstr "Résultats de la recherche"
 
@@ -8760,67 +8915,93 @@
 msgstr "Cacher l'identité du client"
 
 #: ../libpurple/protocols/silc/buddy.c:52
-#: ../libpurple/protocols/silc/buddy.c:421
-#: ../libpurple/protocols/silc/buddy.c:546
-#: ../libpurple/protocols/silc/buddy.c:712
-#: ../libpurple/protocols/silc/ft.c:338
+#: ../libpurple/protocols/silc/buddy.c:410
+#: ../libpurple/protocols/silc/buddy.c:538
+#: ../libpurple/protocols/silc/buddy.c:700
+#: ../libpurple/protocols/silc/ft.c:423
+#: ../libpurple/protocols/silc10/buddy.c:52
+#: ../libpurple/protocols/silc10/buddy.c:421
+#: ../libpurple/protocols/silc10/buddy.c:546
+#: ../libpurple/protocols/silc10/buddy.c:712
+#: ../libpurple/protocols/silc10/ft.c:338
 #, c-format
 msgid "User %s is not present in the network"
 msgstr "L'utilisateur %s n'est pas sur le réseau"
 
 #: ../libpurple/protocols/silc/buddy.c:53
+#: ../libpurple/protocols/silc/buddy.c:110
 #: ../libpurple/protocols/silc/buddy.c:115
-#: ../libpurple/protocols/silc/buddy.c:120
+#: ../libpurple/protocols/silc/buddy.c:119
 #: ../libpurple/protocols/silc/buddy.c:124
 #: ../libpurple/protocols/silc/buddy.c:129
 #: ../libpurple/protocols/silc/buddy.c:134
-#: ../libpurple/protocols/silc/buddy.c:139
-#: ../libpurple/protocols/silc/buddy.c:257
+#: ../libpurple/protocols/silc/buddy.c:254
+#: ../libpurple/protocols/silc10/buddy.c:53
+#: ../libpurple/protocols/silc10/buddy.c:115
+#: ../libpurple/protocols/silc10/buddy.c:120
+#: ../libpurple/protocols/silc10/buddy.c:124
+#: ../libpurple/protocols/silc10/buddy.c:129
+#: ../libpurple/protocols/silc10/buddy.c:134
+#: ../libpurple/protocols/silc10/buddy.c:139
+#: ../libpurple/protocols/silc10/buddy.c:257
 msgid "Key Agreement"
 msgstr "Accord de clé"
 
 #: ../libpurple/protocols/silc/buddy.c:54
+#: ../libpurple/protocols/silc10/buddy.c:54
 msgid "Cannot perform the key agreement"
 msgstr "Impossible d'effectuer l'accord de clé"
 
-#: ../libpurple/protocols/silc/buddy.c:116
+#: ../libpurple/protocols/silc/buddy.c:111
+#: ../libpurple/protocols/silc10/buddy.c:116
 msgid "Error occurred during key agreement"
 msgstr "Erreur pendant l'accord de clé"
 
-#: ../libpurple/protocols/silc/buddy.c:120
+#: ../libpurple/protocols/silc/buddy.c:115
+#: ../libpurple/protocols/silc10/buddy.c:120
 msgid "Key Agreement failed"
 msgstr "Échec de l'accord de clé"
 
-#: ../libpurple/protocols/silc/buddy.c:125
+#: ../libpurple/protocols/silc/buddy.c:120
+#: ../libpurple/protocols/silc10/buddy.c:125
 msgid "Timeout during key agreement"
 msgstr "Connexion morte pendant l'accord de clé"
 
+#: ../libpurple/protocols/silc/buddy.c:125
+#: ../libpurple/protocols/silc10/buddy.c:130
+msgid "Key agreement was aborted"
+msgstr "Annulation de l'accord de clé"
+
 #: ../libpurple/protocols/silc/buddy.c:130
-msgid "Key agreement was aborted"
-msgstr "Annulation de l'accord de clé"
-
-#: ../libpurple/protocols/silc/buddy.c:135
+#: ../libpurple/protocols/silc10/buddy.c:135
 msgid "Key agreement is already started"
 msgstr "Accord de clé déjà commencé"
 
-#: ../libpurple/protocols/silc/buddy.c:140
+#: ../libpurple/protocols/silc/buddy.c:135
+#: ../libpurple/protocols/silc10/buddy.c:140
 msgid "Key agreement cannot be started with yourself"
 msgstr "L'accord de clé ne peut pas se faire sur soi-même"
 
-#: ../libpurple/protocols/silc/buddy.c:258
-#: ../libpurple/protocols/silc/buddy.c:389
-#: ../libpurple/protocols/silc/buddy.c:514
+#: ../libpurple/protocols/silc/buddy.c:255
+#: ../libpurple/protocols/silc/buddy.c:383
+#: ../libpurple/protocols/silc/buddy.c:497
+#: ../libpurple/protocols/silc/buddy.c:508
+#: ../libpurple/protocols/silc10/buddy.c:258
+#: ../libpurple/protocols/silc10/buddy.c:389
+#: ../libpurple/protocols/silc10/buddy.c:514
 msgid "The remote user is not present in the network any more"
 msgstr "Le correspondant n'est plus présent sur le réseau"
 
-#: ../libpurple/protocols/silc/buddy.c:295
+#: ../libpurple/protocols/silc/buddy.c:298
+#: ../libpurple/protocols/silc10/buddy.c:295
 #, c-format
 msgid ""
 "Key agreement request received from %s. Would you like to perform the key "
 "agreement?"
 msgstr "Accord de clé demandé par %s. Voulez-vous établir cet accord ?"
 
-#: ../libpurple/protocols/silc/buddy.c:299
+#: ../libpurple/protocols/silc/buddy.c:302
+#: ../libpurple/protocols/silc10/buddy.c:299
 #, c-format
 msgid ""
 "The remote user is waiting key agreement on:\n"
@@ -8831,69 +9012,99 @@
 "Hôte distant : %s\n"
 "Port distant : %d"
 
-#: ../libpurple/protocols/silc/buddy.c:312
+#: ../libpurple/protocols/silc/buddy.c:315
+#: ../libpurple/protocols/silc10/buddy.c:312
 msgid "Key Agreement Request"
 msgstr "Requête d'accord de clé"
 
-#: ../libpurple/protocols/silc/buddy.c:388
-#: ../libpurple/protocols/silc/buddy.c:423
-#: ../libpurple/protocols/silc/buddy.c:465
+#: ../libpurple/protocols/silc/buddy.c:382
+#: ../libpurple/protocols/silc/buddy.c:412
+#: ../libpurple/protocols/silc/buddy.c:452
+#: ../libpurple/protocols/silc10/buddy.c:388
+#: ../libpurple/protocols/silc10/buddy.c:423
+#: ../libpurple/protocols/silc10/buddy.c:465
 msgid "IM With Password"
 msgstr "Message avec mot de passe"
 
-#: ../libpurple/protocols/silc/buddy.c:424
+#: ../libpurple/protocols/silc/buddy.c:413
+#: ../libpurple/protocols/silc10/buddy.c:424
 msgid "Cannot set IM key"
 msgstr "Impossible de choisir la clé du message"
 
-#: ../libpurple/protocols/silc/buddy.c:466
+#: ../libpurple/protocols/silc/buddy.c:453
+#: ../libpurple/protocols/silc10/buddy.c:466
 msgid "Set IM Password"
 msgstr "Mot de passe du message"
 
-#: ../libpurple/protocols/silc/buddy.c:513
-#: ../libpurple/protocols/silc/buddy.c:548
-#: ../libpurple/protocols/silc/ops.c:1494
-#: ../libpurple/protocols/silc/ops.c:1505
+#: ../libpurple/protocols/silc/buddy.c:496
+#: ../libpurple/protocols/silc/buddy.c:507
+#: ../libpurple/protocols/silc/buddy.c:540
+#: ../libpurple/protocols/silc/ops.c:1499
+#: ../libpurple/protocols/silc/ops.c:1510
+#: ../libpurple/protocols/silc10/buddy.c:513
+#: ../libpurple/protocols/silc10/buddy.c:548
+#: ../libpurple/protocols/silc10/ops.c:1494
+#: ../libpurple/protocols/silc10/ops.c:1505
 msgid "Get Public Key"
 msgstr "Récupérer la clé publique"
 
-#: ../libpurple/protocols/silc/buddy.c:549
-#: ../libpurple/protocols/silc/ops.c:1495
-#: ../libpurple/protocols/silc/ops.c:1506
+#: ../libpurple/protocols/silc/buddy.c:541
+#: ../libpurple/protocols/silc/ops.c:1500
+#: ../libpurple/protocols/silc/ops.c:1511
+#: ../libpurple/protocols/silc10/buddy.c:549
+#: ../libpurple/protocols/silc10/ops.c:1495
+#: ../libpurple/protocols/silc10/ops.c:1506
 msgid "Cannot fetch the public key"
 msgstr "Impossible de récupérer la clé publique"
 
-#: ../libpurple/protocols/silc/buddy.c:635
-#: ../libpurple/protocols/silc/buddy.c:1654
+#: ../libpurple/protocols/silc/buddy.c:622
+#: ../libpurple/protocols/silc/buddy.c:1655
+#: ../libpurple/protocols/silc10/buddy.c:635
+#: ../libpurple/protocols/silc10/buddy.c:1654
 msgid "Show Public Key"
 msgstr "Afficher la clé publique"
 
-#: ../libpurple/protocols/silc/buddy.c:636
-#: ../libpurple/protocols/silc/buddy.c:1033
+#: ../libpurple/protocols/silc/buddy.c:623
+#: ../libpurple/protocols/silc/buddy.c:1027
 #: ../libpurple/protocols/silc/chat.c:237
+#: ../libpurple/protocols/silc10/buddy.c:636
+#: ../libpurple/protocols/silc10/buddy.c:1033
+#: ../libpurple/protocols/silc10/chat.c:237
 msgid "Could not load public key"
 msgstr "Impossible de charger la clé publique"
 
-#: ../libpurple/protocols/silc/buddy.c:713
-#: ../libpurple/protocols/silc/ops.c:1087
-#: ../libpurple/protocols/silc/ops.c:1159
-#: ../libpurple/protocols/silc/ops.c:1294
-#: ../libpurple/protocols/silc/ops.c:1295
-#: ../libpurple/protocols/silc/ops.c:1313
+#: ../libpurple/protocols/silc/buddy.c:701
+#: ../libpurple/protocols/silc/ops.c:1053
+#: ../libpurple/protocols/silc/ops.c:1168
+#: ../libpurple/protocols/silc/ops.c:1288
+#: ../libpurple/protocols/silc/ops.c:1289
+#: ../libpurple/protocols/silc/ops.c:1307
+#: ../libpurple/protocols/silc10/buddy.c:713
+#: ../libpurple/protocols/silc10/ops.c:1087
+#: ../libpurple/protocols/silc10/ops.c:1159
+#: ../libpurple/protocols/silc10/ops.c:1294
+#: ../libpurple/protocols/silc10/ops.c:1295
+#: ../libpurple/protocols/silc10/ops.c:1313
 msgid "User Information"
 msgstr "Informations"
 
-#: ../libpurple/protocols/silc/buddy.c:714
-#: ../libpurple/protocols/silc/ops.c:1160
-#: ../libpurple/protocols/silc/ops.c:1314
+#: ../libpurple/protocols/silc/buddy.c:702
+#: ../libpurple/protocols/silc/ops.c:1169
+#: ../libpurple/protocols/silc/ops.c:1308
+#: ../libpurple/protocols/silc10/buddy.c:714
+#: ../libpurple/protocols/silc10/ops.c:1160
+#: ../libpurple/protocols/silc10/ops.c:1314
 msgid "Cannot get user information"
 msgstr "Impossible de récupérer les informations"
 
-#: ../libpurple/protocols/silc/buddy.c:735
+#: ../libpurple/protocols/silc/buddy.c:723
+#: ../libpurple/protocols/silc10/buddy.c:735
 #, c-format
 msgid "The %s buddy is not trusted"
 msgstr "%s n'est pas un contact de confiance"
 
-#: ../libpurple/protocols/silc/buddy.c:738
+#: ../libpurple/protocols/silc/buddy.c:726
+#: ../libpurple/protocols/silc10/buddy.c:738
 msgid ""
 "You cannot receive buddy notifications until you import his/her public key.  "
 "You can use the Get Public Key command to get the public key."
@@ -8902,16 +9113,19 @@
 "clé publique. Utilisez « Récupérer clé publique » pour l'importer."
 
 #. Open file selector to select the public key.
-#: ../libpurple/protocols/silc/buddy.c:1067
+#: ../libpurple/protocols/silc/buddy.c:1059
+#: ../libpurple/protocols/silc10/buddy.c:1067
 msgid "Open..."
 msgstr "Ouvrir..."
 
-#: ../libpurple/protocols/silc/buddy.c:1078
+#: ../libpurple/protocols/silc/buddy.c:1070
+#: ../libpurple/protocols/silc10/buddy.c:1078
 #, c-format
 msgid "The %s buddy is not present in the network"
 msgstr "Le contact %s n'est pas présent sur le réseau"
 
-#: ../libpurple/protocols/silc/buddy.c:1081
+#: ../libpurple/protocols/silc/buddy.c:1073
+#: ../libpurple/protocols/silc10/buddy.c:1081
 msgid ""
 "To add the buddy you must import his/her public key. Press Import to import "
 "a public key."
@@ -8919,15 +9133,18 @@
 "Vous devez importer la clé publique d'un contact pour pouvoir l'ajouter à la "
 "liste de contacts. Choisissez « Importer » pour ce faire."
 
-#: ../libpurple/protocols/silc/buddy.c:1085
+#: ../libpurple/protocols/silc/buddy.c:1077
+#: ../libpurple/protocols/silc10/buddy.c:1085
 msgid "_Import..."
 msgstr "_Importer..."
 
-#: ../libpurple/protocols/silc/buddy.c:1181
+#: ../libpurple/protocols/silc/buddy.c:1183
+#: ../libpurple/protocols/silc10/buddy.c:1181
 msgid "Select correct user"
 msgstr "Choisissez un des utilisateurs"
 
-#: ../libpurple/protocols/silc/buddy.c:1183
+#: ../libpurple/protocols/silc/buddy.c:1185
+#: ../libpurple/protocols/silc10/buddy.c:1183
 msgid ""
 "More than one user was found with the same public key. Select the correct "
 "user from the list to add to the buddy list."
@@ -8935,7 +9152,8 @@
 "Plusieurs utilisateurs ont la même clé publique. Choisissez l'utilisateur "
 "que vous voulez ajouter à la liste de contacts."
 
-#: ../libpurple/protocols/silc/buddy.c:1185
+#: ../libpurple/protocols/silc/buddy.c:1187
+#: ../libpurple/protocols/silc10/buddy.c:1185
 msgid ""
 "More than one user was found with the same name. Select the correct user "
 "from the list to add to the buddy list."
@@ -8944,237 +9162,318 @@
 "voulez ajouter à la liste de contacts."
 
 #: ../libpurple/protocols/silc/buddy.c:1474
+#: ../libpurple/protocols/silc10/buddy.c:1474
 msgid "Detached"
 msgstr "Détaché"
 
 #: ../libpurple/protocols/silc/buddy.c:1478
-#: ../libpurple/protocols/silc/silc.c:49
+#: ../libpurple/protocols/silc/silc.c:58
+#: ../libpurple/protocols/silc10/buddy.c:1478
+#: ../libpurple/protocols/silc10/silc.c:49
 msgid "Indisposed"
 msgstr "Indisposé"
 
 #: ../libpurple/protocols/silc/buddy.c:1482
-#: ../libpurple/protocols/silc/silc.c:51
+#: ../libpurple/protocols/silc/silc.c:60
+#: ../libpurple/protocols/silc10/buddy.c:1482
+#: ../libpurple/protocols/silc10/silc.c:51
 msgid "Wake Me Up"
 msgstr "Réveillez moi"
 
 #: ../libpurple/protocols/silc/buddy.c:1484
-#: ../libpurple/protocols/silc/silc.c:43
+#: ../libpurple/protocols/silc/silc.c:52
+#: ../libpurple/protocols/silc10/buddy.c:1484
+#: ../libpurple/protocols/silc10/silc.c:43
 msgid "Hyper Active"
 msgstr "Hyperactif"
 
 #: ../libpurple/protocols/silc/buddy.c:1486
+#: ../libpurple/protocols/silc10/buddy.c:1486
 msgid "Robot"
 msgstr "Robot"
 
 #: ../libpurple/protocols/silc/buddy.c:1493
-#: ../libpurple/protocols/silc/silc.c:662
-#: ../libpurple/protocols/silc/util.c:512
+#: ../libpurple/protocols/silc/silc.c:743
+#: ../libpurple/protocols/silc/util.c:516
+#: ../libpurple/protocols/silc10/buddy.c:1493
+#: ../libpurple/protocols/silc10/silc.c:654
+#: ../libpurple/protocols/silc10/util.c:512
 msgid "Happy"
 msgstr "Heureux"
 
 #: ../libpurple/protocols/silc/buddy.c:1495
-#: ../libpurple/protocols/silc/silc.c:664
-#: ../libpurple/protocols/silc/util.c:514
+#: ../libpurple/protocols/silc/silc.c:745
+#: ../libpurple/protocols/silc/util.c:518
+#: ../libpurple/protocols/silc10/buddy.c:1495
+#: ../libpurple/protocols/silc10/silc.c:656
+#: ../libpurple/protocols/silc10/util.c:514
 msgid "Sad"
 msgstr "Triste"
 
 #: ../libpurple/protocols/silc/buddy.c:1497
-#: ../libpurple/protocols/silc/silc.c:666
-#: ../libpurple/protocols/silc/util.c:516
+#: ../libpurple/protocols/silc/silc.c:747
+#: ../libpurple/protocols/silc/util.c:520
+#: ../libpurple/protocols/silc10/buddy.c:1497
+#: ../libpurple/protocols/silc10/silc.c:658
+#: ../libpurple/protocols/silc10/util.c:516
 msgid "Angry"
 msgstr "En colère"
 
 #: ../libpurple/protocols/silc/buddy.c:1499
-#: ../libpurple/protocols/silc/silc.c:668
-#: ../libpurple/protocols/silc/util.c:518
+#: ../libpurple/protocols/silc/silc.c:749
+#: ../libpurple/protocols/silc/util.c:522
+#: ../libpurple/protocols/silc10/buddy.c:1499
+#: ../libpurple/protocols/silc10/silc.c:660
+#: ../libpurple/protocols/silc10/util.c:518
 msgid "Jealous"
 msgstr "Jaloux"
 
 #: ../libpurple/protocols/silc/buddy.c:1501
-#: ../libpurple/protocols/silc/silc.c:670
-#: ../libpurple/protocols/silc/util.c:520
+#: ../libpurple/protocols/silc/silc.c:751
+#: ../libpurple/protocols/silc/util.c:524
+#: ../libpurple/protocols/silc10/buddy.c:1501
+#: ../libpurple/protocols/silc10/silc.c:662
+#: ../libpurple/protocols/silc10/util.c:520
 msgid "Ashamed"
 msgstr "Honteux"
 
 #: ../libpurple/protocols/silc/buddy.c:1503
-#: ../libpurple/protocols/silc/silc.c:672
-#: ../libpurple/protocols/silc/util.c:522
+#: ../libpurple/protocols/silc/silc.c:753
+#: ../libpurple/protocols/silc/util.c:526
+#: ../libpurple/protocols/silc10/buddy.c:1503
+#: ../libpurple/protocols/silc10/silc.c:664
+#: ../libpurple/protocols/silc10/util.c:522
 msgid "Invincible"
 msgstr "Invincible"
 
 #: ../libpurple/protocols/silc/buddy.c:1505
-#: ../libpurple/protocols/silc/util.c:524
+#: ../libpurple/protocols/silc/util.c:528
+#: ../libpurple/protocols/silc10/buddy.c:1505
+#: ../libpurple/protocols/silc10/util.c:524
 msgid "In Love"
 msgstr "Amoureux"
 
 #: ../libpurple/protocols/silc/buddy.c:1507
-#: ../libpurple/protocols/silc/silc.c:676
-#: ../libpurple/protocols/silc/util.c:526
+#: ../libpurple/protocols/silc/silc.c:757
+#: ../libpurple/protocols/silc/util.c:530
+#: ../libpurple/protocols/silc10/buddy.c:1507
+#: ../libpurple/protocols/silc10/silc.c:668
+#: ../libpurple/protocols/silc10/util.c:526
 msgid "Sleepy"
 msgstr "Somnolant"
 
 #: ../libpurple/protocols/silc/buddy.c:1509
-#: ../libpurple/protocols/silc/silc.c:678
-#: ../libpurple/protocols/silc/util.c:528
+#: ../libpurple/protocols/silc/silc.c:759
+#: ../libpurple/protocols/silc/util.c:532
+#: ../libpurple/protocols/silc10/buddy.c:1509
+#: ../libpurple/protocols/silc10/silc.c:670
+#: ../libpurple/protocols/silc10/util.c:528
 msgid "Bored"
 msgstr "Ennuyé"
 
 #: ../libpurple/protocols/silc/buddy.c:1511
-#: ../libpurple/protocols/silc/silc.c:680
-#: ../libpurple/protocols/silc/util.c:530
+#: ../libpurple/protocols/silc/silc.c:761
+#: ../libpurple/protocols/silc/util.c:534
+#: ../libpurple/protocols/silc10/buddy.c:1511
+#: ../libpurple/protocols/silc10/silc.c:672
+#: ../libpurple/protocols/silc10/util.c:530
 msgid "Excited"
 msgstr "Excité"
 
 #: ../libpurple/protocols/silc/buddy.c:1513
-#: ../libpurple/protocols/silc/silc.c:682
-#: ../libpurple/protocols/silc/util.c:532
+#: ../libpurple/protocols/silc/silc.c:763
+#: ../libpurple/protocols/silc/util.c:536
+#: ../libpurple/protocols/silc10/buddy.c:1513
+#: ../libpurple/protocols/silc10/silc.c:674
+#: ../libpurple/protocols/silc10/util.c:532
 msgid "Anxious"
 msgstr "Anxieux"
 
 #: ../libpurple/protocols/silc/buddy.c:1545
-#: ../libpurple/protocols/silc/ops.c:1202
+#: ../libpurple/protocols/silc/ops.c:1207
+#: ../libpurple/protocols/silc10/buddy.c:1545
+#: ../libpurple/protocols/silc10/ops.c:1202
 msgid "User Modes"
 msgstr "Modes utilisateur"
 
 #: ../libpurple/protocols/silc/buddy.c:1557
-#: ../libpurple/protocols/silc/ops.c:1207
+#: ../libpurple/protocols/silc/ops.c:1212
+#: ../libpurple/protocols/silc10/buddy.c:1557
+#: ../libpurple/protocols/silc10/ops.c:1207
 msgid "Mood"
 msgstr "Humeur"
 
 #: ../libpurple/protocols/silc/buddy.c:1562
-#: ../libpurple/protocols/silc/ops.c:1219
+#: ../libpurple/protocols/silc/ops.c:1224
+#: ../libpurple/protocols/silc10/buddy.c:1562
+#: ../libpurple/protocols/silc10/ops.c:1219
 msgid "Preferred Contact"
 msgstr "Méthodes de contact préférées"
 
 #: ../libpurple/protocols/silc/buddy.c:1567
-#: ../libpurple/protocols/silc/ops.c:1224
+#: ../libpurple/protocols/silc/ops.c:1229
+#: ../libpurple/protocols/silc10/buddy.c:1567
+#: ../libpurple/protocols/silc10/ops.c:1224
 msgid "Preferred Language"
 msgstr "Langue préférée"
 
 #: ../libpurple/protocols/silc/buddy.c:1572
-#: ../libpurple/protocols/silc/ops.c:1229
+#: ../libpurple/protocols/silc/ops.c:1234
+#: ../libpurple/protocols/silc10/buddy.c:1572
+#: ../libpurple/protocols/silc10/ops.c:1229
 msgid "Device"
 msgstr "Appareil"
 
 #: ../libpurple/protocols/silc/buddy.c:1577
-#: ../libpurple/protocols/silc/ops.c:1234
-#: ../libpurple/protocols/silc/silc.c:730
-#: ../libpurple/protocols/silc/silc.c:732
+#: ../libpurple/protocols/silc/ops.c:1239
+#: ../libpurple/protocols/silc10/buddy.c:1577
+#: ../libpurple/protocols/silc10/ops.c:1234
+#: ../libpurple/protocols/silc10/silc.c:722
+#: ../libpurple/protocols/silc10/silc.c:724
 msgid "Timezone"
 msgstr "Fuseau horaire"
 
 #: ../libpurple/protocols/silc/buddy.c:1582
-#: ../libpurple/protocols/silc/ops.c:1239
+#: ../libpurple/protocols/silc/ops.c:1244
+#: ../libpurple/protocols/silc10/buddy.c:1582
+#: ../libpurple/protocols/silc10/ops.c:1239
 msgid "Geolocation"
 msgstr "Localisation"
 
-#: ../libpurple/protocols/silc/buddy.c:1636
+#: ../libpurple/protocols/silc/buddy.c:1638
+#: ../libpurple/protocols/silc10/buddy.c:1636
 msgid "Reset IM Key"
 msgstr "Remise à zéro de la clé de message"
 
-#: ../libpurple/protocols/silc/buddy.c:1642
+#: ../libpurple/protocols/silc/buddy.c:1643
+#: ../libpurple/protocols/silc10/buddy.c:1642
 msgid "IM with Key Exchange"
 msgstr "Message avec échange de clé"
 
-#: ../libpurple/protocols/silc/buddy.c:1647
+#: ../libpurple/protocols/silc/buddy.c:1648
+#: ../libpurple/protocols/silc10/buddy.c:1647
 msgid "IM with Password"
 msgstr "Message avec mot de passe"
 
-#: ../libpurple/protocols/silc/buddy.c:1660
+#: ../libpurple/protocols/silc/buddy.c:1661
+#: ../libpurple/protocols/silc10/buddy.c:1660
 msgid "Get Public Key..."
 msgstr "Récupérer la clé publique..."
 
-#: ../libpurple/protocols/silc/buddy.c:1667
-#: ../libpurple/protocols/silc/ops.c:1624
+#: ../libpurple/protocols/silc/buddy.c:1668
+#: ../libpurple/protocols/silc/ops.c:1608
+#: ../libpurple/protocols/silc10/buddy.c:1667
+#: ../libpurple/protocols/silc10/ops.c:1624
 msgid "Kill User"
 msgstr "Tuer l'utilisateur"
 
-#: ../libpurple/protocols/silc/buddy.c:1677
-#: ../libpurple/protocols/silc/chat.c:977
+#: ../libpurple/protocols/silc/buddy.c:1678
+#: ../libpurple/protocols/silc/chat.c:993
+#: ../libpurple/protocols/silc10/buddy.c:1677
+#: ../libpurple/protocols/silc10/chat.c:977
 msgid "Draw On Whiteboard"
 msgstr "Dessiner sur le tableau"
 
 #: ../libpurple/protocols/silc/chat.c:39
+#: ../libpurple/protocols/silc10/chat.c:39
 msgid "_Passphrase:"
 msgstr "_Phrase clé :"
 
 #: ../libpurple/protocols/silc/chat.c:80
+#: ../libpurple/protocols/silc10/chat.c:80
 #, c-format
 msgid "Channel %s does not exist in the network"
 msgstr "Le salon %s n'existe pas sur le réseau"
 
 #: ../libpurple/protocols/silc/chat.c:81
-#: ../libpurple/protocols/silc/chat.c:174
+#: ../libpurple/protocols/silc/chat.c:175
+#: ../libpurple/protocols/silc10/chat.c:81
+#: ../libpurple/protocols/silc10/chat.c:174
 msgid "Channel Information"
 msgstr "Informations du salon"
 
 #: ../libpurple/protocols/silc/chat.c:82
+#: ../libpurple/protocols/silc10/chat.c:82
 msgid "Cannot get channel information"
 msgstr "Impossible de récupérer les informations du salon"
 
 #: ../libpurple/protocols/silc/chat.c:119
+#: ../libpurple/protocols/silc10/chat.c:119
 #, c-format
 msgid "<b>Channel Name:</b> %s"
 msgstr "<b>Nom du salon :</b> %s"
 
 #: ../libpurple/protocols/silc/chat.c:122
+#: ../libpurple/protocols/silc10/chat.c:122
 #, c-format
 msgid "<br><b>User Count:</b> %d"
 msgstr "<br><b>Nombre d'utilisateurs :</b> %d"
 
 #: ../libpurple/protocols/silc/chat.c:129
+#: ../libpurple/protocols/silc10/chat.c:129
 #, c-format
 msgid "<br><b>Channel Founder:</b> %s"
 msgstr "<br><b>Fondateur du salon :</b> %s"
 
 #: ../libpurple/protocols/silc/chat.c:138
+#: ../libpurple/protocols/silc10/chat.c:138
 #, c-format
 msgid "<br><b>Channel Cipher:</b> %s"
 msgstr "<br><b>Phrase clé du salon :</b> %s"
 
 #. Definition of HMAC: http://en.wikipedia.org/wiki/HMAC
-#: ../libpurple/protocols/silc/chat.c:142
+#: ../libpurple/protocols/silc/chat.c:143
+#: ../libpurple/protocols/silc10/chat.c:142
 #, c-format
 msgid "<br><b>Channel HMAC:</b> %s"
 msgstr "<br><b>Clé HMAC du salon :</b> %s"
 
-#: ../libpurple/protocols/silc/chat.c:147
+#: ../libpurple/protocols/silc/chat.c:148
+#: ../libpurple/protocols/silc10/chat.c:147
 #, c-format
 msgid "<br><b>Channel Topic:</b><br>%s"
 msgstr "<br><b>Sujet :</b><br>%s"
 
-#: ../libpurple/protocols/silc/chat.c:152
+#: ../libpurple/protocols/silc/chat.c:153
+#: ../libpurple/protocols/silc10/chat.c:152
 msgid "<br><b>Channel Modes:</b> "
 msgstr "<br><b>Mode du salon :</b> "
 
-#: ../libpurple/protocols/silc/chat.c:165
+#: ../libpurple/protocols/silc/chat.c:166
+#: ../libpurple/protocols/silc10/chat.c:165
 #, c-format
 msgid "<br><b>Founder Key Fingerprint:</b><br>%s"
 msgstr "<br><b>Empreinte de clé publique du fondateur :</b><br>%s"
 
-#: ../libpurple/protocols/silc/chat.c:166
+#: ../libpurple/protocols/silc/chat.c:167
+#: ../libpurple/protocols/silc10/chat.c:166
 #, c-format
 msgid "<br><b>Founder Key Babbleprint:</b><br>%s"
 msgstr "<br><b>Babillage de clé publique du fondateur :</b><br>%s"
 
 #: ../libpurple/protocols/silc/chat.c:236
+#: ../libpurple/protocols/silc10/chat.c:236
 msgid "Add Channel Public Key"
 msgstr "Ajouter une clé publique au salon"
 
 #. Add new public key
-#: ../libpurple/protocols/silc/chat.c:291
+#: ../libpurple/protocols/silc/chat.c:304
+#: ../libpurple/protocols/silc10/chat.c:291
 msgid "Open Public Key..."
 msgstr "Ouvrir clé publique..."
 
-#: ../libpurple/protocols/silc/chat.c:401
+#: ../libpurple/protocols/silc/chat.c:423
+#: ../libpurple/protocols/silc10/chat.c:401
 msgid "Channel Passphrase"
 msgstr "Phrase clé du salon"
 
-#: ../libpurple/protocols/silc/chat.c:408
+#: ../libpurple/protocols/silc/chat.c:430
+#: ../libpurple/protocols/silc10/chat.c:408
 msgid "Channel Public Keys List"
 msgstr "Clés publiques du salon"
 
-#: ../libpurple/protocols/silc/chat.c:413
+#: ../libpurple/protocols/silc/chat.c:435
+#: ../libpurple/protocols/silc10/chat.c:413
 msgid ""
 "Channel authentication is used to secure the channel from unauthorized "
 "access. The authentication may be based on passphrase and digital "
@@ -9188,334 +9487,447 @@
 "pour entrer dans le salon. Si des clés publiques sont utilisées, seuls les "
 "utilisateurs de ces clés peuvent entrer dans le salon."
 
-#: ../libpurple/protocols/silc/chat.c:422
-#: ../libpurple/protocols/silc/chat.c:423
-#: ../libpurple/protocols/silc/chat.c:461
-#: ../libpurple/protocols/silc/chat.c:462
-#: ../libpurple/protocols/silc/chat.c:911
+#: ../libpurple/protocols/silc/chat.c:444
+#: ../libpurple/protocols/silc/chat.c:445
+#: ../libpurple/protocols/silc/chat.c:479
+#: ../libpurple/protocols/silc/chat.c:480
+#: ../libpurple/protocols/silc/chat.c:927
+#: ../libpurple/protocols/silc10/chat.c:422
+#: ../libpurple/protocols/silc10/chat.c:423
+#: ../libpurple/protocols/silc10/chat.c:461
+#: ../libpurple/protocols/silc10/chat.c:462
+#: ../libpurple/protocols/silc10/chat.c:911
 msgid "Channel Authentication"
 msgstr "Authentification du salon"
 
-#: ../libpurple/protocols/silc/chat.c:424
-#: ../libpurple/protocols/silc/chat.c:463
+#: ../libpurple/protocols/silc/chat.c:446
+#: ../libpurple/protocols/silc/chat.c:481
+#: ../libpurple/protocols/silc10/chat.c:424
+#: ../libpurple/protocols/silc10/chat.c:463
 msgid "Add / Remove"
 msgstr "Ajouter/Supprimer"
 
-#: ../libpurple/protocols/silc/chat.c:581
+#: ../libpurple/protocols/silc/chat.c:597
+#: ../libpurple/protocols/silc10/chat.c:581
 msgid "Group Name"
 msgstr "Nom du groupe"
 
-#: ../libpurple/protocols/silc/chat.c:585
-#: ../libpurple/protocols/silc/ops.c:1910
-#: ../libpurple/protocols/silc/silc.c:939
+#: ../libpurple/protocols/silc/chat.c:601
+#: ../libpurple/protocols/silc/ops.c:1813
+#: ../libpurple/protocols/silc/silc.c:1020
+#: ../libpurple/protocols/silc10/chat.c:585
+#: ../libpurple/protocols/silc10/ops.c:1901
+#: ../libpurple/protocols/silc10/silc.c:931
 msgid "Passphrase"
 msgstr "Phrase clé"
 
-#: ../libpurple/protocols/silc/chat.c:596
+#: ../libpurple/protocols/silc/chat.c:612
+#: ../libpurple/protocols/silc10/chat.c:596
 #, c-format
 msgid "Please enter the %s channel private group name and passphrase."
 msgstr "Saisissez le groupe privé et la phrase clé du salon %s"
 
-#: ../libpurple/protocols/silc/chat.c:598
+#: ../libpurple/protocols/silc/chat.c:614
+#: ../libpurple/protocols/silc10/chat.c:598
 msgid "Add Channel Private Group"
 msgstr "Ajouter un groupe privé au salon"
 
-#: ../libpurple/protocols/silc/chat.c:726
+#: ../libpurple/protocols/silc/chat.c:742
+#: ../libpurple/protocols/silc10/chat.c:726
 msgid "User Limit"
 msgstr "Limite d'utilisateurs"
 
-#: ../libpurple/protocols/silc/chat.c:727
+#: ../libpurple/protocols/silc/chat.c:743
+#: ../libpurple/protocols/silc10/chat.c:727
 msgid "Set user limit on channel. Set to zero to reset user limit."
 msgstr ""
 "Nombre d'utilisateurs maximum du salon. Zéro pour ne pas mettre de limite."
 
-#: ../libpurple/protocols/silc/chat.c:891
+#: ../libpurple/protocols/silc/chat.c:907
+#: ../libpurple/protocols/silc10/chat.c:891
 msgid "Invite List"
 msgstr "Liste d'invitations"
 
-#: ../libpurple/protocols/silc/chat.c:896
+#: ../libpurple/protocols/silc/chat.c:912
+#: ../libpurple/protocols/silc10/chat.c:896
 msgid "Ban List"
 msgstr "Liste des bannissements"
 
-#: ../libpurple/protocols/silc/chat.c:904
+#: ../libpurple/protocols/silc/chat.c:920
+#: ../libpurple/protocols/silc10/chat.c:904
 msgid "Add Private Group"
 msgstr "Nouveau groupe privé"
 
-#: ../libpurple/protocols/silc/chat.c:917
+#: ../libpurple/protocols/silc/chat.c:933
+#: ../libpurple/protocols/silc10/chat.c:917
 msgid "Reset Permanent"
 msgstr "Enlever le mode permanent"
 
-#: ../libpurple/protocols/silc/chat.c:922
+#: ../libpurple/protocols/silc/chat.c:938
+#: ../libpurple/protocols/silc10/chat.c:922
 msgid "Set Permanent"
 msgstr "Mettre le mode permanent"
 
-#: ../libpurple/protocols/silc/chat.c:930
+#: ../libpurple/protocols/silc/chat.c:946
+#: ../libpurple/protocols/silc10/chat.c:930
 msgid "Set User Limit"
 msgstr "Choisir la limite d'utilisateurs"
 
-#: ../libpurple/protocols/silc/chat.c:936
+#: ../libpurple/protocols/silc/chat.c:952
+#: ../libpurple/protocols/silc10/chat.c:936
 msgid "Reset Topic Restriction"
 msgstr "Enlever le mode sujet restreint"
 
-#: ../libpurple/protocols/silc/chat.c:941
+#: ../libpurple/protocols/silc/chat.c:957
+#: ../libpurple/protocols/silc10/chat.c:941
 msgid "Set Topic Restriction"
 msgstr "Mettre le mode sujet restreint"
 
-#: ../libpurple/protocols/silc/chat.c:948
+#: ../libpurple/protocols/silc/chat.c:964
+#: ../libpurple/protocols/silc10/chat.c:948
 msgid "Reset Private Channel"
 msgstr "Enlever le mode privé"
 
-#: ../libpurple/protocols/silc/chat.c:953
+#: ../libpurple/protocols/silc/chat.c:969
+#: ../libpurple/protocols/silc10/chat.c:953
 msgid "Set Private Channel"
 msgstr "Mettre le mode privé"
 
-#: ../libpurple/protocols/silc/chat.c:960
+#: ../libpurple/protocols/silc/chat.c:976
+#: ../libpurple/protocols/silc10/chat.c:960
 msgid "Reset Secret Channel"
 msgstr "Enlever le mode secret"
 
-#: ../libpurple/protocols/silc/chat.c:965
+#: ../libpurple/protocols/silc/chat.c:981
+#: ../libpurple/protocols/silc10/chat.c:965
 msgid "Set Secret Channel"
 msgstr "Mettre le mode secret"
 
-#: ../libpurple/protocols/silc/chat.c:1039
-#, c-format
-msgid "You are channel founder on <I>%s</I>"
-msgstr "Vous avez fondé le salon sur <I>%s</I>"
-
-#: ../libpurple/protocols/silc/chat.c:1043
-#, c-format
-msgid "Channel founder on <I>%s</I> is <I>%s</I>"
-msgstr "<I>%2$s</I> a fondé le salon sur <I>%1$s</I>"
-
-#: ../libpurple/protocols/silc/chat.c:1102
+#: ../libpurple/protocols/silc/chat.c:1045
+#: ../libpurple/protocols/silc10/chat.c:1102
 #, c-format
 msgid ""
 "You have to join the %s channel before you are able to join the private group"
 msgstr ""
 "Vous devez entrer dans le salon %s avant de pouvoir intégrer le groupe privé"
 
-#: ../libpurple/protocols/silc/chat.c:1104
+#: ../libpurple/protocols/silc/chat.c:1047
+#: ../libpurple/protocols/silc10/chat.c:1104
 msgid "Join Private Group"
 msgstr "Entrer dans un groupe privé"
 
-#: ../libpurple/protocols/silc/chat.c:1105
+#: ../libpurple/protocols/silc/chat.c:1048
+#: ../libpurple/protocols/silc10/chat.c:1105
 msgid "Cannot join private group"
 msgstr "Impossible d'entrer dans le groupe privé"
 
-#: ../libpurple/protocols/silc/chat.c:1299
-#: ../libpurple/protocols/silc/silc.c:1148
+#: ../libpurple/protocols/silc/chat.c:1260
+#: ../libpurple/protocols/silc/silc.c:1217
+#: ../libpurple/protocols/silc10/chat.c:1299
+#: ../libpurple/protocols/silc10/silc.c:1137
 msgid "Call Command"
 msgstr "Commande d'appel"
 
-#: ../libpurple/protocols/silc/chat.c:1299
-#: ../libpurple/protocols/silc/silc.c:1148
+#: ../libpurple/protocols/silc/chat.c:1260
+#: ../libpurple/protocols/silc/silc.c:1218
+#: ../libpurple/protocols/silc10/chat.c:1299
+#: ../libpurple/protocols/silc10/silc.c:1137
 msgid "Cannot call command"
 msgstr "Impossible de lancer la commande"
 
-#: ../libpurple/protocols/silc/chat.c:1300
-#: ../libpurple/protocols/silc/silc.c:1149
+#: ../libpurple/protocols/silc/chat.c:1261
+#: ../libpurple/protocols/silc/silc.c:1219
+#: ../libpurple/protocols/silc10/chat.c:1300
+#: ../libpurple/protocols/silc10/silc.c:1138
 msgid "Unknown command"
 msgstr "Commande inconnue"
 
-#: ../libpurple/protocols/silc/ft.c:89 ../libpurple/protocols/silc/ft.c:92
-#: ../libpurple/protocols/silc/ft.c:96 ../libpurple/protocols/silc/ft.c:100
-#: ../libpurple/protocols/silc/ft.c:104 ../libpurple/protocols/silc/ft.c:205
-#: ../libpurple/protocols/silc/ft.c:210 ../libpurple/protocols/silc/ft.c:215
-#: ../libpurple/protocols/silc/ft.c:221 ../libpurple/protocols/silc/ft.c:340
+#: ../libpurple/protocols/silc/ft.c:85 ../libpurple/protocols/silc/ft.c:101
+#: ../libpurple/protocols/silc/ft.c:104 ../libpurple/protocols/silc/ft.c:108
+#: ../libpurple/protocols/silc/ft.c:112 ../libpurple/protocols/silc/ft.c:116
+#: ../libpurple/protocols/silc/ft.c:120 ../libpurple/protocols/silc/ft.c:272
+#: ../libpurple/protocols/silc/ft.c:277 ../libpurple/protocols/silc/ft.c:282
+#: ../libpurple/protocols/silc/ft.c:288 ../libpurple/protocols/silc/ft.c:425
+#: ../libpurple/protocols/silc10/ft.c:89 ../libpurple/protocols/silc10/ft.c:92
+#: ../libpurple/protocols/silc10/ft.c:96
+#: ../libpurple/protocols/silc10/ft.c:100
+#: ../libpurple/protocols/silc10/ft.c:104
+#: ../libpurple/protocols/silc10/ft.c:205
+#: ../libpurple/protocols/silc10/ft.c:210
+#: ../libpurple/protocols/silc10/ft.c:215
+#: ../libpurple/protocols/silc10/ft.c:221
+#: ../libpurple/protocols/silc10/ft.c:340
 msgid "Secure File Transfer"
 msgstr "Transfert de fichier sécurisé"
 
-#: ../libpurple/protocols/silc/ft.c:90 ../libpurple/protocols/silc/ft.c:93
-#: ../libpurple/protocols/silc/ft.c:97 ../libpurple/protocols/silc/ft.c:101
-#: ../libpurple/protocols/silc/ft.c:105
+#: ../libpurple/protocols/silc/ft.c:86 ../libpurple/protocols/silc/ft.c:102
+#: ../libpurple/protocols/silc/ft.c:105 ../libpurple/protocols/silc/ft.c:109
+#: ../libpurple/protocols/silc/ft.c:113 ../libpurple/protocols/silc/ft.c:117
+#: ../libpurple/protocols/silc/ft.c:121 ../libpurple/protocols/silc10/ft.c:90
+#: ../libpurple/protocols/silc10/ft.c:93 ../libpurple/protocols/silc10/ft.c:97
+#: ../libpurple/protocols/silc10/ft.c:101
+#: ../libpurple/protocols/silc10/ft.c:105
 msgid "Error during file transfer"
 msgstr "Erreur pendant le transfert de fichier"
 
-#: ../libpurple/protocols/silc/ft.c:94
+#: ../libpurple/protocols/silc/ft.c:87
+msgid "Remote disconnected"
+msgstr "Correspondant déconnecté"
+
+#: ../libpurple/protocols/silc/ft.c:106 ../libpurple/protocols/silc10/ft.c:94
 msgid "Permission denied"
 msgstr "Permission refusée"
 
-#: ../libpurple/protocols/silc/ft.c:98
+#: ../libpurple/protocols/silc/ft.c:110 ../libpurple/protocols/silc10/ft.c:98
 msgid "Key agreement failed"
 msgstr "Échec de l'accord de clé"
 
-#: ../libpurple/protocols/silc/ft.c:102
+#: ../libpurple/protocols/silc/ft.c:114
+msgid "Connection timed out"
+msgstr "Délai de connexion dépassé"
+
+#: ../libpurple/protocols/silc/ft.c:118
+msgid "Creating connection failed"
+msgstr "Échec de la création de la connexion"
+
+#: ../libpurple/protocols/silc/ft.c:122 ../libpurple/protocols/silc10/ft.c:102
 msgid "File transfer session does not exist"
 msgstr "Session de transfert de fichier inexistante."
 
-#: ../libpurple/protocols/silc/ft.c:206
+#: ../libpurple/protocols/silc/ft.c:273 ../libpurple/protocols/silc10/ft.c:206
 msgid "No file transfer session active"
 msgstr "Aucune session de transfert de fichier active"
 
-#: ../libpurple/protocols/silc/ft.c:211
+#: ../libpurple/protocols/silc/ft.c:278 ../libpurple/protocols/silc10/ft.c:211
 msgid "File transfer already started"
 msgstr "Transfert de fichier déjà commencé"
 
-#: ../libpurple/protocols/silc/ft.c:216
+#: ../libpurple/protocols/silc/ft.c:283 ../libpurple/protocols/silc10/ft.c:216
 msgid "Could not perform key agreement for file transfer"
 msgstr "Impossible de faire l'accord de clé pour le transfert de fichier"
 
-#: ../libpurple/protocols/silc/ft.c:222
+#: ../libpurple/protocols/silc/ft.c:289 ../libpurple/protocols/silc10/ft.c:222
 msgid "Could not start the file transfer"
 msgstr "Impossible de commencer le transfert de fichier"
 
-#: ../libpurple/protocols/silc/ft.c:341
+#: ../libpurple/protocols/silc/ft.c:426 ../libpurple/protocols/silc10/ft.c:341
 msgid "Cannot send file"
 msgstr "Impossible d'envoyer le fichier"
 
+#: ../libpurple/protocols/silc/ops.c:57
+msgid "Error occurred"
+msgstr "Une erreur s'est produite"
+
 # c-format
-#: ../libpurple/protocols/silc/ops.c:554 ../libpurple/protocols/silc/ops.c:563
-#: ../libpurple/protocols/silc/ops.c:572
+#: ../libpurple/protocols/silc/ops.c:533 ../libpurple/protocols/silc/ops.c:542
+#: ../libpurple/protocols/silc/ops.c:551
+#: ../libpurple/protocols/silc10/ops.c:554
+#: ../libpurple/protocols/silc10/ops.c:563
+#: ../libpurple/protocols/silc10/ops.c:572
 #, c-format
 msgid "%s has changed the topic of <I>%s</I> to: %s"
 msgstr "%s a changé le sujet de <I>%s</I> en : %s"
 
-#: ../libpurple/protocols/silc/ops.c:638
+#: ../libpurple/protocols/silc/ops.c:617
+#: ../libpurple/protocols/silc10/ops.c:638
 #, c-format
 msgid "<I>%s</I> set channel <I>%s</I> modes to: %s"
 msgstr "<I>%s</I> change le mode de <I>%s</I> en : %s"
 
-#: ../libpurple/protocols/silc/ops.c:642
+#: ../libpurple/protocols/silc/ops.c:621
+#: ../libpurple/protocols/silc10/ops.c:642
 #, c-format
 msgid "<I>%s</I> removed all channel <I>%s</I> modes"
 msgstr "<I>%s</I> a supprimé tous les modes de <I>%s</I>"
 
-#: ../libpurple/protocols/silc/ops.c:675
+#: ../libpurple/protocols/silc/ops.c:654
+#: ../libpurple/protocols/silc10/ops.c:675
 #, c-format
 msgid "<I>%s</I> set <I>%s's</I> modes to: %s"
 msgstr "<I>%s</I> change le mode de <I>%s</I> en : %s"
 
-#: ../libpurple/protocols/silc/ops.c:683
+#: ../libpurple/protocols/silc/ops.c:662
+#: ../libpurple/protocols/silc10/ops.c:683
 #, c-format
 msgid "<I>%s</I> removed all <I>%s's</I> modes"
 msgstr "<I>%s</I> a supprimé tous les modes de <I>%s</I>"
 
-#: ../libpurple/protocols/silc/ops.c:712
+#: ../libpurple/protocols/silc/ops.c:691
+#: ../libpurple/protocols/silc10/ops.c:712
 #, c-format
 msgid "You have been kicked off <I>%s</I> by <I>%s</I> (%s)"
 msgstr "Vous avez été expulsé de <I>%s</I> par <I>%s</I> (%s)"
 
-#: ../libpurple/protocols/silc/ops.c:742 ../libpurple/protocols/silc/ops.c:747
-#: ../libpurple/protocols/silc/ops.c:752
+#: ../libpurple/protocols/silc/ops.c:718 ../libpurple/protocols/silc/ops.c:723
+#: ../libpurple/protocols/silc/ops.c:728
+#: ../libpurple/protocols/silc10/ops.c:742
+#: ../libpurple/protocols/silc10/ops.c:747
+#: ../libpurple/protocols/silc10/ops.c:752
 #, c-format
 msgid "You have been killed by %s (%s)"
 msgstr "Vous avez été tué par %s (%s)"
 
-#: ../libpurple/protocols/silc/ops.c:773 ../libpurple/protocols/silc/ops.c:778
-#: ../libpurple/protocols/silc/ops.c:783
+#: ../libpurple/protocols/silc/ops.c:749 ../libpurple/protocols/silc/ops.c:754
+#: ../libpurple/protocols/silc/ops.c:759
+#: ../libpurple/protocols/silc10/ops.c:773
+#: ../libpurple/protocols/silc10/ops.c:778
+#: ../libpurple/protocols/silc10/ops.c:783
 #, c-format
 msgid "Killed by %s (%s)"
 msgstr "Tué par %s (%s)"
 
-#: ../libpurple/protocols/silc/ops.c:829
+#: ../libpurple/protocols/silc/ops.c:796
+#: ../libpurple/protocols/silc10/ops.c:829
 msgid "Server signoff"
 msgstr "Déconnexion du serveur"
 
-#: ../libpurple/protocols/silc/ops.c:1017
+#: ../libpurple/protocols/silc/ops.c:983
+#: ../libpurple/protocols/silc10/ops.c:1017
 msgid "Personal Information"
 msgstr "Informations personnelles"
 
-#: ../libpurple/protocols/silc/ops.c:1040
+#: ../libpurple/protocols/silc/ops.c:1006
+#: ../libpurple/protocols/silc10/ops.c:1040
 msgid "Birth Day"
 msgstr "Date de naissance"
 
-#: ../libpurple/protocols/silc/ops.c:1048
+#: ../libpurple/protocols/silc/ops.c:1014
+#: ../libpurple/protocols/silc10/ops.c:1048
 msgid "Job Role"
 msgstr "Rôle"
 
-#: ../libpurple/protocols/silc/ops.c:1052
-#: ../libpurple/protocols/silc/silc.c:932
+#: ../libpurple/protocols/silc/ops.c:1018
+#: ../libpurple/protocols/silc/silc.c:1013
+#: ../libpurple/protocols/silc10/ops.c:1052
+#: ../libpurple/protocols/silc10/silc.c:924
 msgid "Organization"
 msgstr "Organisation"
 
-#: ../libpurple/protocols/silc/ops.c:1056
+#: ../libpurple/protocols/silc/ops.c:1022
+#: ../libpurple/protocols/silc10/ops.c:1056
 msgid "Unit"
 msgstr "Groupe"
 
-#: ../libpurple/protocols/silc/ops.c:1080
+#: ../libpurple/protocols/silc/ops.c:1046
+#: ../libpurple/protocols/silc10/ops.c:1080
 msgid "Note"
 msgstr "Commentaire"
 
-#: ../libpurple/protocols/silc/ops.c:1128
+#: ../libpurple/protocols/silc/ops.c:1093
+#: ../libpurple/protocols/silc10/ops.c:1128
 msgid "Join Chat"
 msgstr "Entrer dans une discussion"
 
-#: ../libpurple/protocols/silc/ops.c:1183
-#: ../libpurple/protocols/silc/ops.c:1332
+#: ../libpurple/protocols/silc/ops.c:1127
+#: ../libpurple/protocols/silc10/chat.c:1039
+#, c-format
+msgid "You are channel founder on <I>%s</I>"
+msgstr "Vous avez fondé le salon sur <I>%s</I>"
+
+#: ../libpurple/protocols/silc/ops.c:1131
+#: ../libpurple/protocols/silc10/chat.c:1043
+#, c-format
+msgid "Channel founder on <I>%s</I> is <I>%s</I>"
+msgstr "<I>%2$s</I> a fondé le salon sur <I>%1$s</I>"
+
+#: ../libpurple/protocols/silc/ops.c:1190
+#: ../libpurple/protocols/silc/ops.c:1326
+#: ../libpurple/protocols/silc10/ops.c:1183
+#: ../libpurple/protocols/silc10/ops.c:1332
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1047
 msgid "Real Name"
 msgstr "Nom réel"
 
-#: ../libpurple/protocols/silc/ops.c:1213
+#: ../libpurple/protocols/silc/ops.c:1218
+#: ../libpurple/protocols/silc10/ops.c:1213
 msgid "Status Text"
 msgstr "Texte d'état"
 
-#: ../libpurple/protocols/silc/ops.c:1285
-#: ../libpurple/protocols/silc/ops.c:1357
+#: ../libpurple/protocols/silc/ops.c:1279
+#: ../libpurple/protocols/silc/ops.c:1351
+#: ../libpurple/protocols/silc10/ops.c:1285
+#: ../libpurple/protocols/silc10/ops.c:1357
 msgid "Public Key Fingerprint"
 msgstr "Empreinte de clé publique"
 
-#: ../libpurple/protocols/silc/ops.c:1286
-#: ../libpurple/protocols/silc/ops.c:1358
+#: ../libpurple/protocols/silc/ops.c:1280
+#: ../libpurple/protocols/silc/ops.c:1352
+#: ../libpurple/protocols/silc10/ops.c:1286
+#: ../libpurple/protocols/silc10/ops.c:1358
 msgid "Public Key Babbleprint"
 msgstr "Babillage de clé publique"
 
-#: ../libpurple/protocols/silc/ops.c:1298
+#: ../libpurple/protocols/silc/ops.c:1292
+#: ../libpurple/protocols/silc10/ops.c:1298
 msgid "_More..."
 msgstr "_Plus..."
 
-#: ../libpurple/protocols/silc/ops.c:1371
-#: ../libpurple/protocols/silc/silc.c:999
+#: ../libpurple/protocols/silc/ops.c:1369
+#: ../libpurple/protocols/silc/silc.c:1077
+#: ../libpurple/protocols/silc10/ops.c:1371
+#: ../libpurple/protocols/silc10/silc.c:988
 msgid "Detach From Server"
 msgstr "Se détacher du serveur"
 
-#: ../libpurple/protocols/silc/ops.c:1371
+#: ../libpurple/protocols/silc/ops.c:1369
+#: ../libpurple/protocols/silc10/ops.c:1371
 msgid "Cannot detach"
 msgstr "Impossible de se détacher"
 
-#: ../libpurple/protocols/silc/ops.c:1382
+#: ../libpurple/protocols/silc/ops.c:1389
+#: ../libpurple/protocols/silc10/ops.c:1382
 msgid "Cannot set topic"
 msgstr "Impossible de changer le sujet"
 
-#: ../libpurple/protocols/silc/ops.c:1414
+#: ../libpurple/protocols/silc/ops.c:1418
+#: ../libpurple/protocols/silc10/ops.c:1414
 msgid "Failed to change nickname"
 msgstr "Impossible de changer de pseudo"
 
-#: ../libpurple/protocols/silc/ops.c:1462
+#: ../libpurple/protocols/silc/ops.c:1467
+#: ../libpurple/protocols/silc10/ops.c:1462
 msgid "Roomlist"
 msgstr "Liste des salons"
 
-#: ../libpurple/protocols/silc/ops.c:1462
+#: ../libpurple/protocols/silc/ops.c:1467
+#: ../libpurple/protocols/silc10/ops.c:1462
 msgid "Cannot get room list"
 msgstr "Impossible de récupérer la liste des salons"
 
-#: ../libpurple/protocols/silc/ops.c:1507
+#: ../libpurple/protocols/silc/ops.c:1468
+msgid "Network is empty"
+msgstr "Le réseau est vide"
+
+#: ../libpurple/protocols/silc/ops.c:1512
+#: ../libpurple/protocols/silc10/ops.c:1507
 msgid "No public key was received"
 msgstr "Aucune clé publique reçue"
 
-#: ../libpurple/protocols/silc/ops.c:1519
-#: ../libpurple/protocols/silc/ops.c:1532
+#: ../libpurple/protocols/silc/ops.c:1524
+#: ../libpurple/protocols/silc/ops.c:1537
+#: ../libpurple/protocols/silc10/ops.c:1519
+#: ../libpurple/protocols/silc10/ops.c:1532
 msgid "Server Information"
 msgstr "Informations du serveur"
 
-#: ../libpurple/protocols/silc/ops.c:1520
+#: ../libpurple/protocols/silc/ops.c:1525
+#: ../libpurple/protocols/silc10/ops.c:1520
 msgid "Cannot get server information"
 msgstr "Impossible de récupérer les informations du serveur"
 
-#: ../libpurple/protocols/silc/ops.c:1549
-#: ../libpurple/protocols/silc/ops.c:1558
+#: ../libpurple/protocols/silc/ops.c:1548
+#: ../libpurple/protocols/silc10/ops.c:1549
+#: ../libpurple/protocols/silc10/ops.c:1558
 msgid "Server Statistics"
 msgstr "Statistiques du serveur"
 
-#: ../libpurple/protocols/silc/ops.c:1550
+#: ../libpurple/protocols/silc/ops.c:1549
+#: ../libpurple/protocols/silc10/ops.c:1550
 msgid "Cannot get server statistics"
 msgstr "Impossible de récupérer les statistiques du serveur"
 
-#: ../libpurple/protocols/silc/ops.c:1559
-msgid "No server statistics available"
-msgstr "Aucune statistique du serveur disponible"
-
-#: ../libpurple/protocols/silc/ops.c:1581
+#: ../libpurple/protocols/silc/ops.c:1556
+#: ../libpurple/protocols/silc10/ops.c:1581
 #, c-format
 msgid ""
 "Local server start time: %s\n"
@@ -9550,109 +9962,66 @@
 "Nombre total d'opérateurs de serveurs: %d\n"
 "Nombre total d'opérateurs de routeurs: %d\n"
 
-#: ../libpurple/protocols/silc/ops.c:1604
+#: ../libpurple/protocols/silc/ops.c:1588
+#: ../libpurple/protocols/silc10/ops.c:1604
 msgid "Network Statistics"
 msgstr "Statistiques du réseau"
 
-#: ../libpurple/protocols/silc/ops.c:1612
-#: ../libpurple/protocols/silc/ops.c:1617
+#: ../libpurple/protocols/silc/ops.c:1596
+#: ../libpurple/protocols/silc/ops.c:1601
+#: ../libpurple/protocols/silc10/ops.c:1612
+#: ../libpurple/protocols/silc10/ops.c:1617
 msgid "Ping"
 msgstr "Ping"
 
-#: ../libpurple/protocols/silc/ops.c:1612
+#: ../libpurple/protocols/silc/ops.c:1596
+#: ../libpurple/protocols/silc10/ops.c:1612
 msgid "Ping failed"
 msgstr "Échec du ping"
 
-#: ../libpurple/protocols/silc/ops.c:1617
+#: ../libpurple/protocols/silc/ops.c:1601
+#: ../libpurple/protocols/silc10/ops.c:1617
 msgid "Ping reply received from server"
 msgstr "Réponse du ping par le serveur"
 
-#: ../libpurple/protocols/silc/ops.c:1625
+#: ../libpurple/protocols/silc/ops.c:1609
+#: ../libpurple/protocols/silc10/ops.c:1625
 msgid "Could not kill user"
 msgstr "Impossible de tuer l'utilisateur"
 
-#: ../libpurple/protocols/silc/ops.c:1709
-msgid "Error during connecting to SILC Server"
-msgstr "Erreur à la connexion au serveur SILC"
-
-#: ../libpurple/protocols/silc/ops.c:1714
-msgid "Key Exchange failed"
-msgstr "Échec de l'échange de clé"
-
-#: ../libpurple/protocols/silc/ops.c:1723
-msgid ""
-"Resuming detached session failed. Press Reconnect to create new connection."
-msgstr ""
-"Échec de la reprise de session détachée. Choisissez « Reconnexion » pour "
-"créer une nouvelle connexion."
-
-#: ../libpurple/protocols/silc/ops.c:1758
-msgid "Disconnected by server"
-msgstr "Déconnexion par le serveur"
-
-#: ../libpurple/protocols/silc/ops.c:1820
-#: ../libpurple/protocols/silc/ops.c:1867
-#: ../libpurple/protocols/silc/silc.c:182
+#: ../libpurple/protocols/silc/ops.c:1648
+msgid "WATCH"
+msgstr "VOIR"
+
+#: ../libpurple/protocols/silc/ops.c:1648
+msgid "Cannot watch user"
+msgstr "Impossible de voir l'utilisateur"
+
+#: ../libpurple/protocols/silc/ops.c:1724
+#: ../libpurple/protocols/silc/ops.c:1775
+#: ../libpurple/protocols/silc/silc.c:277
+#: ../libpurple/protocols/silc10/ops.c:1811
+#: ../libpurple/protocols/silc10/ops.c:1858
+#: ../libpurple/protocols/silc10/silc.c:190
 msgid "Resuming session"
 msgstr "Reprise de la session"
 
-#: ../libpurple/protocols/silc/ops.c:1822
+#: ../libpurple/protocols/silc/ops.c:1726
+#: ../libpurple/protocols/silc10/ops.c:1813
 msgid "Authenticating connection"
 msgstr "Authentification de la connexion"
 
-#: ../libpurple/protocols/silc/ops.c:1869
+#: ../libpurple/protocols/silc/ops.c:1777
+#: ../libpurple/protocols/silc10/ops.c:1860
 msgid "Verifying server public key"
 msgstr "Vérification de la clé publique du serveur"
 
-#: ../libpurple/protocols/silc/ops.c:1911
+#: ../libpurple/protocols/silc/ops.c:1814
+#: ../libpurple/protocols/silc10/ops.c:1902
 msgid "Passphrase required"
 msgstr "Phrase clé nécessaire"
 
-#: ../libpurple/protocols/silc/ops.c:1940
-msgid "Failure: Version mismatch, upgrade your client"
-msgstr "Échec : version incompatible, veuillez mettre à jour votre client"
-
-#: ../libpurple/protocols/silc/ops.c:1943
-msgid "Failure: Remote does not trust/support your public key"
-msgstr ""
-"Échec : le correspondant ne reconnaît pas ou ne fait pas confiance a votre "
-"clé publique"
-
-#: ../libpurple/protocols/silc/ops.c:1946
-msgid "Failure: Remote does not support proposed KE group"
-msgstr "Échec : le correspondant ne supporte pas le groupe KE proposé"
-
-#: ../libpurple/protocols/silc/ops.c:1949
-msgid "Failure: Remote does not support proposed cipher"
-msgstr ""
-"Échec : le correspondant ne supporte pas la méthode de chiffrement proposée"
-
-#: ../libpurple/protocols/silc/ops.c:1952
-msgid "Failure: Remote does not support proposed PKCS"
-msgstr "Échec : le correspondant ne supporte pas le PKCS proposé"
-
-#: ../libpurple/protocols/silc/ops.c:1955
-msgid "Failure: Remote does not support proposed hash function"
-msgstr ""
-"Échec : le correspondant ne supporte pas la fonction de hachage proposée"
-
-#: ../libpurple/protocols/silc/ops.c:1958
-msgid "Failure: Remote does not support proposed HMAC"
-msgstr "Échec : le correspondant ne supporte pas le HMAC proposé"
-
-#: ../libpurple/protocols/silc/ops.c:1960
-msgid "Failure: Incorrect signature"
-msgstr "Échec : signature incorrecte"
-
-#: ../libpurple/protocols/silc/ops.c:1962
-msgid "Failure: Invalid cookie"
-msgstr "Échec : cookie invalide"
-
-#: ../libpurple/protocols/silc/ops.c:1973
-msgid "Failure: Authentication failed"
-msgstr "Échec de l'authentification"
-
-#: ../libpurple/protocols/silc/pk.c:104
+#: ../libpurple/protocols/silc/pk.c:98 ../libpurple/protocols/silc10/pk.c:104
 #, c-format
 msgid ""
 "Received %s's public key. Your local copy does not match this key. Would you "
@@ -9661,12 +10030,12 @@
 "La clé reçue de %s ne correspond pas à votre copie locale de cette clé "
 "publique. Voulez-vous néanmoins accepter cette clé publique ?"
 
-#: ../libpurple/protocols/silc/pk.c:109
+#: ../libpurple/protocols/silc/pk.c:103 ../libpurple/protocols/silc10/pk.c:109
 #, c-format
 msgid "Received %s's public key. Would you like to accept this public key?"
 msgstr "Voulez-vous acceptez la clé publique reçue de %s ?"
 
-#: ../libpurple/protocols/silc/pk.c:113
+#: ../libpurple/protocols/silc/pk.c:107 ../libpurple/protocols/silc10/pk.c:113
 #, c-format
 msgid ""
 "Fingerprint and babbleprint for the %s key are:\n"
@@ -9679,73 +10048,100 @@
 "%s\n"
 "%s\n"
 
-#: ../libpurple/protocols/silc/pk.c:116 ../libpurple/protocols/silc/pk.c:142
+#: ../libpurple/protocols/silc/pk.c:110 ../libpurple/protocols/silc/pk.c:139
+#: ../libpurple/protocols/silc10/pk.c:116
+#: ../libpurple/protocols/silc10/pk.c:142
 msgid "Verify Public Key"
 msgstr "Vérifier la clé publique"
 
-#: ../libpurple/protocols/silc/pk.c:121
+#: ../libpurple/protocols/silc/pk.c:115 ../libpurple/protocols/silc10/pk.c:121
 msgid "_View..."
 msgstr "_Voir..."
 
-#: ../libpurple/protocols/silc/pk.c:143
+#: ../libpurple/protocols/silc/pk.c:140 ../libpurple/protocols/silc10/pk.c:143
 msgid "Unsupported public key type"
 msgstr "Type de clé publique non supporté"
 
-#: ../libpurple/protocols/silc/silc.c:153
+#: ../libpurple/protocols/silc/silc.c:217
+#: ../libpurple/protocols/silc10/ops.c:1749
+msgid "Disconnected by server"
+msgstr "Déconnexion par le serveur"
+
+#: ../libpurple/protocols/silc/silc.c:224
+#: ../libpurple/protocols/silc10/ops.c:1700
+msgid "Error during connecting to SILC Server"
+msgstr "Erreur à la connexion au serveur SILC"
+
+#: ../libpurple/protocols/silc/silc.c:229
+#: ../libpurple/protocols/silc10/ops.c:1705
+msgid "Key Exchange failed"
+msgstr "Échec de l'échange de clé"
+
+#: ../libpurple/protocols/silc/silc.c:238
+#: ../libpurple/protocols/silc10/ops.c:1714
+msgid ""
+"Resuming detached session failed. Press Reconnect to create new connection."
+msgstr ""
+"Échec de la reprise de session détachée. Choisissez « Reconnexion » pour "
+"créer une nouvelle connexion."
+
+#: ../libpurple/protocols/silc/silc.c:265
+#: ../libpurple/protocols/silc/silc.c:311
+#: ../libpurple/protocols/silc10/silc.c:161
 msgid "Connection failed"
 msgstr "Échec de la connexion"
 
-#: ../libpurple/protocols/silc/silc.c:174
-msgid "Cannot initialize SILC Client connection"
-msgstr "Impossible d'initialiser la connexion client SILC"
-
-#: ../libpurple/protocols/silc/silc.c:185
+#: ../libpurple/protocols/silc/silc.c:280
+#: ../libpurple/protocols/silc10/silc.c:193
 msgid "Performing key exchange"
 msgstr "Échange de clé en cours"
 
-#: ../libpurple/protocols/silc/silc.c:271
+#. Progress
+#: ../libpurple/protocols/silc/silc.c:343
+#: ../libpurple/protocols/silc10/silc.c:325
+msgid "Connecting to SILC Server"
+msgstr "Connexion au serveur SILC"
+
+#: ../libpurple/protocols/silc/silc.c:352
+msgid "Could not load SILC key pair"
+msgstr "Impossible de charger la paire de clés SILC"
+
+#: ../libpurple/protocols/silc/silc.c:366
+#: ../libpurple/protocols/silc10/silc.c:355
+msgid "Unable to create connection"
+msgstr "Impossible de créer une connexion."
+
+#: ../libpurple/protocols/silc/silc.c:395
+#: ../libpurple/protocols/silc10/silc.c:267
 msgid "Out of memory"
 msgstr "Pas assez de mémoire"
 
-#: ../libpurple/protocols/silc/silc.c:294
-msgid "John Noname"
-msgstr "Anne Onyme"
-
-#: ../libpurple/protocols/silc/silc.c:317
+#: ../libpurple/protocols/silc/silc.c:438
+#: ../libpurple/protocols/silc10/silc.c:313
 msgid "Cannot initialize SILC protocol"
 msgstr "Impossible d'initialiser le protocole SILC."
 
-#: ../libpurple/protocols/silc/silc.c:324
-msgid "Cannot find/access ~/.silc directory"
-msgstr "Impossible de trouver ou d'accéder au dossier ~/.silc"
-
-#. Progress
-#: ../libpurple/protocols/silc/silc.c:329
-msgid "Connecting to SILC Server"
-msgstr "Connexion au serveur SILC"
-
-#: ../libpurple/protocols/silc/silc.c:338
-#, c-format
-msgid "Could not load SILC key pair: %s"
-msgstr "Impossible de charger la paire de clés SILC : %s"
-
-#: ../libpurple/protocols/silc/silc.c:359
-msgid "Unable to create connection"
-msgstr "Impossible de créer une connexion."
-
-#: ../libpurple/protocols/silc/silc.c:658
+#: ../libpurple/protocols/silc/silc.c:445
+msgid "Error loading SILC key pair"
+msgstr "Erreur de chargement de la paire de clés SILC"
+
+#: ../libpurple/protocols/silc/silc.c:739
+#: ../libpurple/protocols/silc10/silc.c:650
 msgid "Your Current Mood"
 msgstr "Votre humeur actuelle"
 
-#: ../libpurple/protocols/silc/silc.c:660 ../pidgin/gtkprefs.c:1529
+#: ../libpurple/protocols/silc/silc.c:741
+#: ../libpurple/protocols/silc10/silc.c:652 ../pidgin/gtkprefs.c:1636
 msgid "Normal"
 msgstr "Normal"
 
-#: ../libpurple/protocols/silc/silc.c:674
+#: ../libpurple/protocols/silc/silc.c:755
+#: ../libpurple/protocols/silc10/silc.c:666
 msgid "In love"
 msgstr "Amoureux"
 
-#: ../libpurple/protocols/silc/silc.c:685
+#: ../libpurple/protocols/silc/silc.c:766
+#: ../libpurple/protocols/silc10/silc.c:677
 msgid ""
 "\n"
 "Your Preferred Contact Methods"
@@ -9753,46 +10149,63 @@
 "\n"
 "Vos méthodes de contact préférées"
 
-#: ../libpurple/protocols/silc/silc.c:693
-#: ../libpurple/protocols/silc/util.c:557
+#: ../libpurple/protocols/silc/silc.c:774
+#: ../libpurple/protocols/silc/util.c:561
+#: ../libpurple/protocols/silc10/silc.c:685
+#: ../libpurple/protocols/silc10/util.c:557
 msgid "SMS"
 msgstr "SMS"
 
-#: ../libpurple/protocols/silc/silc.c:695
-#: ../libpurple/protocols/silc/util.c:559
+#: ../libpurple/protocols/silc/silc.c:776
+#: ../libpurple/protocols/silc/util.c:563
+#: ../libpurple/protocols/silc10/silc.c:687
+#: ../libpurple/protocols/silc10/util.c:559
 msgid "MMS"
 msgstr "MMS"
 
-#: ../libpurple/protocols/silc/silc.c:697
+#: ../libpurple/protocols/silc/silc.c:778
+#: ../libpurple/protocols/silc10/silc.c:689
 msgid "Video conferencing"
 msgstr "Visioconférence"
 
-#: ../libpurple/protocols/silc/silc.c:702
+#: ../libpurple/protocols/silc/silc.c:783
+#: ../libpurple/protocols/silc10/silc.c:694
 msgid "Your Current Status"
 msgstr "Votre état actuel"
 
-#: ../libpurple/protocols/silc/silc.c:709
+#: ../libpurple/protocols/silc/silc.c:790
+#: ../libpurple/protocols/silc10/silc.c:701
 msgid "Online Services"
 msgstr "Services en ligne"
 
-#: ../libpurple/protocols/silc/silc.c:712
+#: ../libpurple/protocols/silc/silc.c:793
+#: ../libpurple/protocols/silc10/silc.c:704
 msgid "Let others see what services you are using"
 msgstr "Publier les services utilisés"
 
-#: ../libpurple/protocols/silc/silc.c:718
+#: ../libpurple/protocols/silc/silc.c:799
+#: ../libpurple/protocols/silc10/silc.c:710
 msgid "Let others see what computer you are using"
 msgstr "Publier l'ordinateur utilisé"
 
-#: ../libpurple/protocols/silc/silc.c:725
+#: ../libpurple/protocols/silc/silc.c:806
+#: ../libpurple/protocols/silc10/silc.c:717
 msgid "Your VCard File"
 msgstr "Votre carte de visite VCard"
 
-#: ../libpurple/protocols/silc/silc.c:737
-#: ../libpurple/protocols/silc/silc.c:738
+#: ../libpurple/protocols/silc/silc.c:812
+msgid "Timezone (UTC)"
+msgstr "Fuseau horaire (UTC)"
+
+#: ../libpurple/protocols/silc/silc.c:816
+#: ../libpurple/protocols/silc/silc.c:817
+#: ../libpurple/protocols/silc10/silc.c:729
+#: ../libpurple/protocols/silc10/silc.c:730
 msgid "User Online Status Attributes"
 msgstr "Attributs d'état utilisateur"
 
-#: ../libpurple/protocols/silc/silc.c:739
+#: ../libpurple/protocols/silc/silc.c:818
+#: ../libpurple/protocols/silc10/silc.c:731
 msgid ""
 "You can let other users see your online status information and your personal "
 "information. Please fill the information you would like other users to see "
@@ -9802,173 +10215,217 @@
 "vos informations personnelles. Veuillez saisir les informations que vous "
 "voulez publier."
 
-#: ../libpurple/protocols/silc/silc.c:780
-#: ../libpurple/protocols/silc/silc.c:786
-#: ../libpurple/protocols/silc/silc.c:1426
+#: ../libpurple/protocols/silc/silc.c:859
+#: ../libpurple/protocols/silc/silc.c:865
+#: ../libpurple/protocols/silc/silc.c:1486
+#: ../libpurple/protocols/silc10/silc.c:772
+#: ../libpurple/protocols/silc10/silc.c:778
+#: ../libpurple/protocols/silc10/silc.c:1415
 msgid "Message of the Day"
 msgstr "Message du jour"
 
-#: ../libpurple/protocols/silc/silc.c:780
+#: ../libpurple/protocols/silc/silc.c:859
+#: ../libpurple/protocols/silc10/silc.c:772
 msgid "No Message of the Day available"
 msgstr "Message du jour non disponible"
 
-#: ../libpurple/protocols/silc/silc.c:781
-#: ../libpurple/protocols/silc/silc.c:1421
+#: ../libpurple/protocols/silc/silc.c:860
+#: ../libpurple/protocols/silc/silc.c:1481
+#: ../libpurple/protocols/silc10/silc.c:773
+#: ../libpurple/protocols/silc10/silc.c:1410
 msgid "There is no Message of the Day associated with this connection"
 msgstr "Il n'y a pas de message du jour associé à cette connexion"
 
-#: ../libpurple/protocols/silc/silc.c:832
-#: ../libpurple/protocols/silc/silc.c:876
-#: ../libpurple/protocols/silc/silc.c:947
-#: ../libpurple/protocols/silc/silc.c:948
+#: ../libpurple/protocols/silc/silc.c:911
+#: ../libpurple/protocols/silc/silc.c:957
+#: ../libpurple/protocols/silc/silc.c:1028
+#: ../libpurple/protocols/silc/silc.c:1029
+#: ../libpurple/protocols/silc10/silc.c:824
+#: ../libpurple/protocols/silc10/silc.c:868
+#: ../libpurple/protocols/silc10/silc.c:939
+#: ../libpurple/protocols/silc10/silc.c:940
 msgid "Create New SILC Key Pair"
 msgstr "Créer une nouvelle paire de clés SILC"
 
-#: ../libpurple/protocols/silc/silc.c:832
+#: ../libpurple/protocols/silc/silc.c:911
+#: ../libpurple/protocols/silc10/silc.c:824
 msgid "Passphrases do not match"
 msgstr "Les phrases de passe diffèrent"
 
-#: ../libpurple/protocols/silc/silc.c:876
+#: ../libpurple/protocols/silc/silc.c:957
+#: ../libpurple/protocols/silc10/silc.c:868
 msgid "Key Pair Generation failed"
 msgstr "Échec de génération de la paire de clés"
 
-#: ../libpurple/protocols/silc/silc.c:915
+#: ../libpurple/protocols/silc/silc.c:996
+#: ../libpurple/protocols/silc10/silc.c:907
 msgid "Key length"
 msgstr "Longueur de clé"
 
-#: ../libpurple/protocols/silc/silc.c:917
+#: ../libpurple/protocols/silc/silc.c:998
+#: ../libpurple/protocols/silc10/silc.c:909
 msgid "Public key file"
 msgstr "Fichier de clé publique"
 
-#: ../libpurple/protocols/silc/silc.c:919
+#: ../libpurple/protocols/silc/silc.c:1000
+#: ../libpurple/protocols/silc10/silc.c:911
 msgid "Private key file"
 msgstr "Fichier de clé privée"
 
-#: ../libpurple/protocols/silc/silc.c:942
+#: ../libpurple/protocols/silc/silc.c:1023
+#: ../libpurple/protocols/silc10/silc.c:934
 msgid "Passphrase (retype)"
 msgstr "Mot de passe (pour vérification)"
 
-#: ../libpurple/protocols/silc/silc.c:949
+#: ../libpurple/protocols/silc/silc.c:1030
+#: ../libpurple/protocols/silc10/silc.c:941
 msgid "Generate Key Pair"
 msgstr "Générer une paire de clés"
 
-#: ../libpurple/protocols/silc/silc.c:994
+#: ../libpurple/protocols/silc/silc.c:1073
+#: ../libpurple/protocols/silc10/silc.c:984
 msgid "Online Status"
 msgstr "État en ligne"
 
-#: ../libpurple/protocols/silc/silc.c:1003
+#: ../libpurple/protocols/silc/silc.c:1081
+#: ../libpurple/protocols/silc10/silc.c:992
 msgid "View Message of the Day"
 msgstr "Voir le message du jour"
 
-#: ../libpurple/protocols/silc/silc.c:1007
+#: ../libpurple/protocols/silc/silc.c:1085
+#: ../libpurple/protocols/silc10/silc.c:996
 msgid "Create SILC Key Pair..."
 msgstr "Créer une paire de clés SILC..."
 
-#: ../libpurple/protocols/silc/silc.c:1106
+#: ../libpurple/protocols/silc/silc.c:1177
+#: ../libpurple/protocols/silc10/silc.c:1095
 #, c-format
 msgid "User <I>%s</I> is not present in the network"
 msgstr "<I>%s</I> n'est pas présent sur le réseau"
 
-#: ../libpurple/protocols/silc/silc.c:1297
+#: ../libpurple/protocols/silc/silc.c:1357
+#: ../libpurple/protocols/silc10/silc.c:1286
 msgid "Topic too long"
 msgstr "Sujet trop long"
 
-#: ../libpurple/protocols/silc/silc.c:1378
+#: ../libpurple/protocols/silc/silc.c:1438
+#: ../libpurple/protocols/silc10/silc.c:1367
 msgid "You must specify a nick"
 msgstr "Vous devez choisir un pseudo"
 
-#: ../libpurple/protocols/silc/silc.c:1480
+#: ../libpurple/protocols/silc/silc.c:1540
+#: ../libpurple/protocols/silc10/silc.c:1469
 #, c-format
 msgid "channel %s not found"
 msgstr "Salon %s non trouvée"
 
-#: ../libpurple/protocols/silc/silc.c:1485
+#: ../libpurple/protocols/silc/silc.c:1545
+#: ../libpurple/protocols/silc10/silc.c:1474
 #, c-format
 msgid "channel modes for %s: %s"
 msgstr "Le mode du salon %s est : %s"
 
-#: ../libpurple/protocols/silc/silc.c:1487
+#: ../libpurple/protocols/silc/silc.c:1547
+#: ../libpurple/protocols/silc10/silc.c:1476
 #, c-format
 msgid "no channel modes are set on %s"
 msgstr "Le salon %s n'a pas de mode spécifique."
 
-#: ../libpurple/protocols/silc/silc.c:1500
+#: ../libpurple/protocols/silc/silc.c:1560
+#: ../libpurple/protocols/silc10/silc.c:1489
 #, c-format
 msgid "Failed to set cmodes for %s"
 msgstr "Impossible de changer le cmode de %s"
 
-#: ../libpurple/protocols/silc/silc.c:1530
+#: ../libpurple/protocols/silc/silc.c:1590
+#: ../libpurple/protocols/silc10/silc.c:1519
 #, c-format
 msgid "Unknown command: %s, (may be a client bug)"
 msgstr "Commande inconnue : %s (cela peut être un bug de l'application)"
 
-#: ../libpurple/protocols/silc/silc.c:1593
+#: ../libpurple/protocols/silc/silc.c:1653
+#: ../libpurple/protocols/silc10/silc.c:1582
 msgid "part [channel]:  Leave the chat"
 msgstr "part [salon] : Quitter le salon."
 
-#: ../libpurple/protocols/silc/silc.c:1597
+#: ../libpurple/protocols/silc/silc.c:1657
+#: ../libpurple/protocols/silc10/silc.c:1586
 msgid "leave [channel]:  Leave the chat"
 msgstr "leave [salon] : Quitter le salon."
 
-#: ../libpurple/protocols/silc/silc.c:1601
+#: ../libpurple/protocols/silc/silc.c:1661
+#: ../libpurple/protocols/silc10/silc.c:1590
 msgid "topic [&lt;new topic&gt;]:  View or change the topic"
 msgstr "topic [nouveau sujet] : Voir ou changer le sujet du salon."
 
-#: ../libpurple/protocols/silc/silc.c:1606
+#: ../libpurple/protocols/silc/silc.c:1666
+#: ../libpurple/protocols/silc10/silc.c:1595
 msgid "join &lt;channel&gt; [&lt;password&gt;]:  Join a chat on this network"
 msgstr ""
 "join &lt;salon&gt; [mot de passe] : Entrer dans une discussion sur ce réseau."
 
-#: ../libpurple/protocols/silc/silc.c:1610
+#: ../libpurple/protocols/silc/silc.c:1670
+#: ../libpurple/protocols/silc10/silc.c:1599
 msgid "list:  List channels on this network"
 msgstr "list : Récupérer la liste des salons du réseau."
 
-#: ../libpurple/protocols/silc/silc.c:1614
+#: ../libpurple/protocols/silc/silc.c:1674
+#: ../libpurple/protocols/silc10/silc.c:1603
 msgid "whois &lt;nick&gt;:  View nick's information"
 msgstr "whois &lt;pseudo&gt; : Récupérer des informations sur une personne."
 
-#: ../libpurple/protocols/silc/silc.c:1618
+#: ../libpurple/protocols/silc/silc.c:1678
+#: ../libpurple/protocols/silc10/silc.c:1607
 #: ../libpurple/protocols/zephyr/zephyr.c:2685
 msgid "msg &lt;nick&gt; &lt;message&gt;:  Send a private message to a user"
 msgstr ""
 "msg &lt;pseudo&gt; &lt;message&gt; : Envoyer un message privé à une personne."
 
-#: ../libpurple/protocols/silc/silc.c:1622
+#: ../libpurple/protocols/silc/silc.c:1682
+#: ../libpurple/protocols/silc10/silc.c:1611
 msgid "query &lt;nick&gt; [&lt;message&gt;]:  Send a private message to a user"
 msgstr ""
 "msg &lt;pseudo&gt; &lt;message&gt; : Envoyer un message privé à une personne."
 
-#: ../libpurple/protocols/silc/silc.c:1626
+#: ../libpurple/protocols/silc/silc.c:1686
+#: ../libpurple/protocols/silc10/silc.c:1615
 msgid "motd:  View the server's Message Of The Day"
 msgstr "motd : Voir le message du jour du serveur."
 
-#: ../libpurple/protocols/silc/silc.c:1630
+#: ../libpurple/protocols/silc/silc.c:1690
+#: ../libpurple/protocols/silc10/silc.c:1619
 msgid "detach:  Detach this session"
 msgstr "detach : Détacher la session en cours."
 
-#: ../libpurple/protocols/silc/silc.c:1634
+#: ../libpurple/protocols/silc/silc.c:1694
+#: ../libpurple/protocols/silc10/silc.c:1623
 msgid "quit [message]:  Disconnect from the server, with an optional message"
 msgstr ""
 "quit [message] : Se déconnecter du serveur avec un message de départ "
 "facultatif."
 
-#: ../libpurple/protocols/silc/silc.c:1638
+#: ../libpurple/protocols/silc/silc.c:1698
+#: ../libpurple/protocols/silc10/silc.c:1627
 msgid "call &lt;command&gt;:  Call any silc client command"
 msgstr "call &lt;commande&gt; : Appeler une commande du client silc."
 
-#: ../libpurple/protocols/silc/silc.c:1644
+#: ../libpurple/protocols/silc/silc.c:1704
+#: ../libpurple/protocols/silc10/silc.c:1633
 msgid "kill &lt;nick&gt; [-pubkey|&lt;reason&gt;]:  Kill nick"
 msgstr "kill &lt;pseudo&gt; [-clépub|&lt;raison&gt;] : Tuer le pseudo."
 
-#: ../libpurple/protocols/silc/silc.c:1648
+#: ../libpurple/protocols/silc/silc.c:1708
+#: ../libpurple/protocols/silc10/silc.c:1637
 msgid "nick &lt;newnick&gt;:  Change your nickname"
 msgstr "nick &lt;nouveau pseudo&gt; : Changer de pseudonyme."
 
-#: ../libpurple/protocols/silc/silc.c:1652
+#: ../libpurple/protocols/silc/silc.c:1712
+#: ../libpurple/protocols/silc10/silc.c:1641
 msgid "whowas &lt;nick&gt;:  View nick's information"
 msgstr "whowas &lt;pseudo&gt; : Récupérer des informations sur une personne."
 
-#: ../libpurple/protocols/silc/silc.c:1656
+#: ../libpurple/protocols/silc/silc.c:1716
+#: ../libpurple/protocols/silc10/silc.c:1645
 msgid ""
 "cmode &lt;channel&gt; [+|-&lt;modes&gt;] [arguments]:  Change or display "
 "channel modes"
@@ -9976,7 +10433,8 @@
 "cmode &lt;salon&gt; [+|-&lt;modes&gt;] [arguments] : Changer ou afficher le "
 "mode d'un salon."
 
-#: ../libpurple/protocols/silc/silc.c:1660
+#: ../libpurple/protocols/silc/silc.c:1720
+#: ../libpurple/protocols/silc10/silc.c:1649
 msgid ""
 "cumode &lt;channel&gt; +|-&lt;modes&gt; &lt;nick&gt;:  Change nick's modes "
 "on channel"
@@ -9984,17 +10442,20 @@
 "cumode &lt;salon&gt; +|-&lt;modes&gt; &lt;pseudo&gt; : Changer le mode d'une "
 "personne sur un salon."
 
-#: ../libpurple/protocols/silc/silc.c:1664
+#: ../libpurple/protocols/silc/silc.c:1724
+#: ../libpurple/protocols/silc10/silc.c:1653
 msgid "umode &lt;usermodes&gt;:  Set your modes in the network"
 msgstr "umode &lt;modes utilisateur&gt; : Changer vos paramètres utilisateur."
 
-#: ../libpurple/protocols/silc/silc.c:1668
+#: ../libpurple/protocols/silc/silc.c:1728
+#: ../libpurple/protocols/silc10/silc.c:1657
 msgid "oper &lt;nick&gt; [-pubkey]:  Get server operator privileges"
 msgstr ""
 "oper &lt;pseudo&gt; [-clépub] : Obtenir le pouvoir d'opérateur sur le "
 "serveur."
 
-#: ../libpurple/protocols/silc/silc.c:1672
+#: ../libpurple/protocols/silc/silc.c:1732
+#: ../libpurple/protocols/silc10/silc.c:1661
 msgid ""
 "invite &lt;channel&gt; [-|+]&lt;nick&gt;:  invite nick or add/remove from "
 "channel invite list"
@@ -10002,38 +10463,46 @@
 "invite &lt;salon&gt; [-|+]&lt;pseudo&gt; : Inviter une personne, l'ajouter "
 "ou la supprimer de la liste d'invitations du salon."
 
-#: ../libpurple/protocols/silc/silc.c:1676
+#: ../libpurple/protocols/silc/silc.c:1736
+#: ../libpurple/protocols/silc10/silc.c:1665
 msgid "kick &lt;channel&gt; &lt;nick&gt; [comment]:  Kick client from channel"
 msgstr ""
 "kick &lt;salon&gt; &lt;pseudo&gt; [raison] : Expulser une personne du salon."
 
-#: ../libpurple/protocols/silc/silc.c:1680
+#: ../libpurple/protocols/silc/silc.c:1740
+#: ../libpurple/protocols/silc10/silc.c:1669
 msgid "info [server]:  View server administrative details"
 msgstr "info [serveur] : Voir les informations sur le serveur."
 
-#: ../libpurple/protocols/silc/silc.c:1684
+#: ../libpurple/protocols/silc/silc.c:1744
+#: ../libpurple/protocols/silc10/silc.c:1673
 msgid "ban [&lt;channel&gt; +|-&lt;nick&gt;]:  Ban client from channel"
 msgstr "ban [&lt;salon&gt; +|-&lt;pseudo&gt;] : Bannir une personne du salon."
 
-#: ../libpurple/protocols/silc/silc.c:1688
+#: ../libpurple/protocols/silc/silc.c:1748
+#: ../libpurple/protocols/silc10/silc.c:1677
 msgid "getkey &lt;nick|server&gt;:  Retrieve client's or server's public key"
 msgstr ""
 "getkey &lt;pseudo|serveur&gt; : Récupérer la clé publique d'une personne ou "
 "du serveur."
 
-#: ../libpurple/protocols/silc/silc.c:1692
+#: ../libpurple/protocols/silc/silc.c:1752
+#: ../libpurple/protocols/silc10/silc.c:1681
 msgid "stats:  View server and network statistics"
 msgstr "stats : Voir les statistiques du serveur et du réseau."
 
-#: ../libpurple/protocols/silc/silc.c:1696
+#: ../libpurple/protocols/silc/silc.c:1756
+#: ../libpurple/protocols/silc10/silc.c:1685
 msgid "ping:  Send PING to the connected server"
 msgstr "ping : Envoyer un PING au serveur."
 
-#: ../libpurple/protocols/silc/silc.c:1701
+#: ../libpurple/protocols/silc/silc.c:1761
+#: ../libpurple/protocols/silc10/silc.c:1690
 msgid "users &lt;channel&gt;:  List users in channel"
 msgstr "users &lt;salon&gt; : Récupérer la liste des personnes dans un salon."
 
-#: ../libpurple/protocols/silc/silc.c:1705
+#: ../libpurple/protocols/silc/silc.c:1765
+#: ../libpurple/protocols/silc10/silc.c:1694
 msgid ""
 "names [-count|-ops|-halfops|-voices|-normal] &lt;channel(s)&gt;:  List "
 "specific users in channel(s)"
@@ -10050,116 +10519,141 @@
 #. *< name
 #. *< version
 #. *  summary
-#: ../libpurple/protocols/silc/silc.c:1828
+#: ../libpurple/protocols/silc/silc.c:1876
+#: ../libpurple/protocols/silc10/silc.c:1819
 msgid "SILC Protocol Plugin"
 msgstr "Plugin pour le protocole SILC"
 
 #. *  description
-#: ../libpurple/protocols/silc/silc.c:1830
+#: ../libpurple/protocols/silc/silc.c:1878
+#: ../libpurple/protocols/silc10/silc.c:1821
 msgid "Secure Internet Live Conferencing (SILC) Protocol"
 msgstr "Protocole de conférences instantanées sécurisées"
 
-#: ../libpurple/protocols/silc/silc.c:1862 ../pidgin/gtkprefs.c:1920
+#: ../libpurple/protocols/silc/silc.c:1910
+#: ../libpurple/protocols/silc10/silc.c:1853 ../pidgin/gtkprefs.c:2029
 msgid "Network"
 msgstr "Réseau"
 
-#: ../libpurple/protocols/silc/silc.c:1873
+#: ../libpurple/protocols/silc/silc.c:1921
+#: ../libpurple/protocols/silc10/silc.c:1864
 msgid "Public Key file"
 msgstr "Fichier de clé publique"
 
-#: ../libpurple/protocols/silc/silc.c:1877
+#: ../libpurple/protocols/silc/silc.c:1925
+#: ../libpurple/protocols/silc10/silc.c:1868
 msgid "Private Key file"
 msgstr "Fichier de clé privée"
 
-#: ../libpurple/protocols/silc/silc.c:1887
+#: ../libpurple/protocols/silc/silc.c:1935
+#: ../libpurple/protocols/silc10/silc.c:1878
 msgid "Cipher"
 msgstr "Chiffre"
 
-#: ../libpurple/protocols/silc/silc.c:1897
+#: ../libpurple/protocols/silc/silc.c:1945
+#: ../libpurple/protocols/silc10/silc.c:1888
 msgid "HMAC"
 msgstr "HMAC"
 
-#: ../libpurple/protocols/silc/silc.c:1900
+#: ../libpurple/protocols/silc/silc.c:1948
+msgid "Use Perfect Forward Secrecy"
+msgstr "Utiliser PFS (Perfect Forward Secrecy)"
+
+#: ../libpurple/protocols/silc/silc.c:1952
+#: ../libpurple/protocols/silc10/silc.c:1891
 msgid "Public key authentication"
 msgstr "Authentification par clé publique"
 
-#: ../libpurple/protocols/silc/silc.c:1903
-msgid "Reject watching by other users"
-msgstr "Empêcher l'observation par les autres utilisateurs"
-
-#: ../libpurple/protocols/silc/silc.c:1906
-msgid "Block invites"
-msgstr "Bloquer les invitations"
-
-#: ../libpurple/protocols/silc/silc.c:1909
+#: ../libpurple/protocols/silc/silc.c:1955
+#: ../libpurple/protocols/silc10/silc.c:1894
 msgid "Block IMs without Key Exchange"
 msgstr "Bloquer les messages sans échange de clé"
 
-#: ../libpurple/protocols/silc/silc.c:1912
-msgid "Reject online status attribute requests"
-msgstr "Empêcher les demandes d'attributs d'état"
-
-#: ../libpurple/protocols/silc/silc.c:1915
+#: ../libpurple/protocols/silc/silc.c:1958
+#: ../libpurple/protocols/silc10/silc.c:1897
 msgid "Block messages to whiteboard"
 msgstr "Bloquer les messages au tableau"
 
-#: ../libpurple/protocols/silc/silc.c:1918
+#: ../libpurple/protocols/silc/silc.c:1961
+#: ../libpurple/protocols/silc10/silc.c:1900
 msgid "Automatically open whiteboard"
 msgstr "Ouvrir automatiquement le tableau"
 
-#: ../libpurple/protocols/silc/silc.c:1921
+#: ../libpurple/protocols/silc/silc.c:1964
+#: ../libpurple/protocols/silc10/silc.c:1903
 msgid "Digitally sign and verify all messages"
 msgstr "Signer numériquement et vérifier tous les messages"
 
 #: ../libpurple/protocols/silc/util.c:207
-#: ../libpurple/protocols/silc/util.c:247
+#: ../libpurple/protocols/silc/util.c:249
+#: ../libpurple/protocols/silc10/util.c:207
+#: ../libpurple/protocols/silc10/util.c:247
 msgid "Creating SILC key pair..."
 msgstr "Création de la paire de clés SILC..."
 
+#: ../libpurple/protocols/silc/util.c:215
+#: ../libpurple/protocols/silc/util.c:257
+msgid "Cannot create SILC key pair\n"
+msgstr "Impossible de créer la paire de clés SILC\n"
+
 #. Hint for translators: Please check the tabulator width here and in
 #. the next strings (short strings: 2 tabs, longer strings 1 tab,
 #. sum: 3 tabs or 24 characters)
-#: ../libpurple/protocols/silc/util.c:355
+#: ../libpurple/protocols/silc/util.c:358
+#: ../libpurple/protocols/silc10/util.c:355
 #, c-format
 msgid "Real Name: \t%s\n"
 msgstr "Nom réel : %s\n"
 
-#: ../libpurple/protocols/silc/util.c:357
+#: ../libpurple/protocols/silc/util.c:360
+#: ../libpurple/protocols/silc10/util.c:357
 #, c-format
 msgid "User Name: \t%s\n"
 msgstr "Nom d'utilisateur : %s\n"
 
-#: ../libpurple/protocols/silc/util.c:359
+#: ../libpurple/protocols/silc/util.c:362
+#: ../libpurple/protocols/silc10/util.c:359
 #, c-format
 msgid "E-Mail: \t\t%s\n"
 msgstr "Adresse électronique : %s\n"
 
-#: ../libpurple/protocols/silc/util.c:361
+#: ../libpurple/protocols/silc/util.c:364
+#: ../libpurple/protocols/silc10/util.c:361
 #, c-format
 msgid "Host Name: \t%s\n"
 msgstr "Nom d'hôte : %s\n"
 
-#: ../libpurple/protocols/silc/util.c:363
+#: ../libpurple/protocols/silc/util.c:366
+#: ../libpurple/protocols/silc10/util.c:363
 #, c-format
 msgid "Organization: \t%s\n"
 msgstr "Organisation : %s\n"
 
-#: ../libpurple/protocols/silc/util.c:365
+#: ../libpurple/protocols/silc/util.c:368
+#: ../libpurple/protocols/silc10/util.c:365
 #, c-format
 msgid "Country: \t%s\n"
 msgstr "Pays : %s\n"
 
-#: ../libpurple/protocols/silc/util.c:366
+#: ../libpurple/protocols/silc/util.c:369
+#: ../libpurple/protocols/silc10/util.c:366
 #, c-format
 msgid "Algorithm: \t%s\n"
 msgstr "Algorithme : %s\n"
 
-#: ../libpurple/protocols/silc/util.c:367
+#: ../libpurple/protocols/silc/util.c:370
+#: ../libpurple/protocols/silc10/util.c:367
 #, c-format
 msgid "Key Length: \t%d bits\n"
 msgstr "Longueur de clé : %d bits\n"
 
-#: ../libpurple/protocols/silc/util.c:369
+#: ../libpurple/protocols/silc/util.c:372
+#, c-format
+msgid "Version: \t%s\n"
+msgstr "Version : %s\n"
+
+#: ../libpurple/protocols/silc/util.c:374
+#: ../libpurple/protocols/silc10/util.c:369
 #, c-format
 msgid ""
 "Public Key Fingerprint:\n"
@@ -10170,7 +10664,8 @@
 "%s\n"
 "\n"
 
-#: ../libpurple/protocols/silc/util.c:370
+#: ../libpurple/protocols/silc/util.c:375
+#: ../libpurple/protocols/silc10/util.c:370
 #, c-format
 msgid ""
 "Public Key Babbleprint:\n"
@@ -10179,37 +10674,44 @@
 "Babillage de clé publique :\n"
 "%s"
 
-#: ../libpurple/protocols/silc/util.c:374
-#: ../libpurple/protocols/silc/util.c:375
+#: ../libpurple/protocols/silc/util.c:379
+#: ../libpurple/protocols/silc/util.c:380
+#: ../libpurple/protocols/silc10/util.c:374
+#: ../libpurple/protocols/silc10/util.c:375
 msgid "Public Key Information"
 msgstr "Informations sur la clé publique"
 
-#: ../libpurple/protocols/silc/util.c:555
+#: ../libpurple/protocols/silc/util.c:559
+#: ../libpurple/protocols/silc10/util.c:555
 msgid "Paging"
 msgstr "Bipeur"
 
-#: ../libpurple/protocols/silc/util.c:561
+#: ../libpurple/protocols/silc/util.c:565
+#: ../libpurple/protocols/silc10/util.c:561
 msgid "Video Conferencing"
 msgstr "Visioconférence"
 
-#: ../libpurple/protocols/silc/util.c:579
+#: ../libpurple/protocols/silc/util.c:583
+#: ../libpurple/protocols/silc10/util.c:579
 msgid "Computer"
 msgstr "Ordinateur"
 
-#: ../libpurple/protocols/silc/util.c:583
+#: ../libpurple/protocols/silc/util.c:587
+#: ../libpurple/protocols/silc10/util.c:583
 msgid "PDA"
 msgstr "PDA"
 
-#: ../libpurple/protocols/silc/util.c:585
+#: ../libpurple/protocols/silc/util.c:589
+#: ../libpurple/protocols/silc10/util.c:585
 msgid "Terminal"
 msgstr "Terminal"
 
-#: ../libpurple/protocols/silc/wb.c:284
+#: ../libpurple/protocols/silc/wb.c:284 ../libpurple/protocols/silc10/wb.c:284
 #, c-format
 msgid "%s sent message to whiteboard. Would you like to open the whiteboard?"
 msgstr "%s a envoyé un message sur le tableau. Voulez-vous ouvrir le tableau ?"
 
-#: ../libpurple/protocols/silc/wb.c:288
+#: ../libpurple/protocols/silc/wb.c:288 ../libpurple/protocols/silc10/wb.c:288
 #, c-format
 msgid ""
 "%s sent message to whiteboard on %s channel. Would you like to open the "
@@ -10218,10 +10720,75 @@
 "%s a envoyé un message sur le tableau du salon %s. Voulez-vous ouvrir le "
 "tableau ?"
 
-#: ../libpurple/protocols/silc/wb.c:302
+#: ../libpurple/protocols/silc/wb.c:302 ../libpurple/protocols/silc10/wb.c:302
 msgid "Whiteboard"
 msgstr "Tableau"
 
+#: ../libpurple/protocols/silc10/ops.c:1559
+msgid "No server statistics available"
+msgstr "Aucune statistique du serveur disponible"
+
+#: ../libpurple/protocols/silc10/ops.c:1931
+msgid "Failure: Version mismatch, upgrade your client"
+msgstr "Échec : version incompatible, veuillez mettre à jour votre client"
+
+#: ../libpurple/protocols/silc10/ops.c:1934
+msgid "Failure: Remote does not trust/support your public key"
+msgstr ""
+"Échec : le correspondant ne reconnaît pas ou ne fait pas confiance a votre "
+"clé publique"
+
+#: ../libpurple/protocols/silc10/ops.c:1937
+msgid "Failure: Remote does not support proposed KE group"
+msgstr "Échec : le correspondant ne supporte pas le groupe KE proposé"
+
+#: ../libpurple/protocols/silc10/ops.c:1940
+msgid "Failure: Remote does not support proposed cipher"
+msgstr ""
+"Échec : le correspondant ne supporte pas la méthode de chiffrement proposée"
+
+#: ../libpurple/protocols/silc10/ops.c:1943
+msgid "Failure: Remote does not support proposed PKCS"
+msgstr "Échec : le correspondant ne supporte pas le PKCS proposé"
+
+#: ../libpurple/protocols/silc10/ops.c:1946
+msgid "Failure: Remote does not support proposed hash function"
+msgstr ""
+"Échec : le correspondant ne supporte pas la fonction de hachage proposée"
+
+#: ../libpurple/protocols/silc10/ops.c:1949
+msgid "Failure: Remote does not support proposed HMAC"
+msgstr "Échec : le correspondant ne supporte pas le HMAC proposé"
+
+#: ../libpurple/protocols/silc10/ops.c:1951
+msgid "Failure: Incorrect signature"
+msgstr "Échec : signature incorrecte"
+
+#: ../libpurple/protocols/silc10/ops.c:1953
+msgid "Failure: Invalid cookie"
+msgstr "Échec : cookie invalide"
+
+#: ../libpurple/protocols/silc10/ops.c:1964
+msgid "Failure: Authentication failed"
+msgstr "Échec de l'authentification"
+
+#: ../libpurple/protocols/silc10/silc.c:182
+msgid "Cannot initialize SILC Client connection"
+msgstr "Impossible d'initialiser la connexion client SILC"
+
+#: ../libpurple/protocols/silc10/silc.c:290
+msgid "John Noname"
+msgstr "Anne Onyme"
+
+#: ../libpurple/protocols/silc10/silc.c:320
+msgid "Cannot find/access ~/.silc directory"
+msgstr "Impossible de trouver ou d'accéder au dossier ~/.silc"
+
+#: ../libpurple/protocols/silc10/silc.c:334
+#, c-format
+msgid "Could not load SILC key pair: %s"
+msgstr "Impossible de charger la paire de clés SILC : %s"
+
 #. TODO: do we really want to disconnect on a failure to write?
 #: ../libpurple/protocols/simple/simple.c:416
 msgid "Could not write"
@@ -10452,7 +11019,8 @@
 msgid "Password Change Successful"
 msgstr "Changement de mot de passe effectué."
 
-#: ../libpurple/protocols/toc/toc.c:1366
+#: ../libpurple/protocols/toc/toc.c:1366 ../pidgin/gtkblist.c:5519
+#: ../pidgin/gtkblist.c:5873
 msgid "_Group:"
 msgstr "_Groupe :"
 
@@ -10513,32 +11081,32 @@
 msgid "TOC Protocol Plugin"
 msgstr "Plugin pour le protocole TOC"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:808
+#: ../libpurple/protocols/yahoo/yahoo.c:810
 msgid "Your Yahoo! message did not get sent."
 msgstr "Votre message Yahoo! n'a pas été envoyé"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:878
+#: ../libpurple/protocols/yahoo/yahoo.c:880
 #, c-format
 msgid "%s just sent you a Buzz!"
 msgstr "%s vient de vous envoyer un « Buzz ! »"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:925
+#: ../libpurple/protocols/yahoo/yahoo.c:927
 #, c-format
 msgid "Yahoo! system message for %s:"
 msgstr "Message système Yahoo! pour %s :"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:984
+#: ../libpurple/protocols/yahoo/yahoo.c:986
 msgid "Authorization denied message:"
 msgstr "Message de refus d'autorisation :"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1065
+#: ../libpurple/protocols/yahoo/yahoo.c:1067
 #, c-format
 msgid "%s has (retroactively) denied your request to add them to your list."
 msgstr ""
-"L'utilisateur %s a (rétroactivement) refusé votre demande de le rajouter à "
+"L'utilisateur %s a (rétroactivement) refusé votre demande de l'ajouter à "
 "votre liste de contacts."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1068
+#: ../libpurple/protocols/yahoo/yahoo.c:1070
 #, c-format
 msgid ""
 "%s has (retroactively) denied your request to add them to your list for the "
@@ -10547,11 +11115,11 @@
 "L'utilisateur %s a (rétroactivement) refusé votre demande de l'ajouter à "
 "votre liste de contacts pour la raison suivante : %s"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1071
+#: ../libpurple/protocols/yahoo/yahoo.c:1073
 msgid "Add buddy rejected"
 msgstr "Ajout du contact refusé"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1822
+#: ../libpurple/protocols/yahoo/yahoo.c:1824
 #, c-format
 msgid ""
 "The Yahoo server has requested the use of an unrecognized authentication "
@@ -10563,11 +11131,11 @@
 "service Yahoo!. Vous pouvez vérifier qu'une mise à jour est disponible sur %"
 "s."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1825
+#: ../libpurple/protocols/yahoo/yahoo.c:1827
 msgid "Failed Yahoo! Authentication"
 msgstr "Échec de l'authentification Yahoo!"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1891
+#: ../libpurple/protocols/yahoo/yahoo.c:1893
 #, c-format
 msgid ""
 "You have tried to ignore %s, but the user is on your buddy list.  Clicking "
@@ -10576,154 +11144,172 @@
 "Vous voulez ignorer %s, mais cet utilisateur est dans votre liste de "
 "contacts. En choisissant « Oui » cela supprimera le contact et l'ignorera."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1894
+#: ../libpurple/protocols/yahoo/yahoo.c:1896
 msgid "Ignore buddy?"
 msgstr "Ignorer ce contact ?"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1953
+#: ../libpurple/protocols/yahoo/yahoo.c:1955
 msgid "Your account is locked, please log in to the Yahoo! website."
 msgstr ""
 "Votre compte est bloqué. Veuillez vous connecter par le site web Yahoo!."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1956
+#: ../libpurple/protocols/yahoo/yahoo.c:1958
 #, c-format
 msgid "Unknown error number %d. Logging into the Yahoo! website may fix this."
 msgstr ""
 "Erreur inconnue n°%d. Se connecter sur le site web Yahoo! peut corriger le "
 "problème."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2010
+#: ../libpurple/protocols/yahoo/yahoo.c:2012
 #, c-format
 msgid "Could not add buddy %s to group %s to the server list on account %s."
 msgstr ""
 "Impossible d'ajouter le contact %s au groupe %s sur la liste du serveur pour "
 "le compte %s."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2013
+#: ../libpurple/protocols/yahoo/yahoo.c:2015
 msgid "Could not add buddy to server list"
 msgstr "Impossible d'ajouter le contact sur la liste du serveur."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2132
+#: ../libpurple/protocols/yahoo/yahoo.c:2134
 #, c-format
 msgid "[ Audible %s/%s/%s.swf ] %s"
 msgstr "[ Audible %s/%s/%s.swf ] %s"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2464
+#: ../libpurple/protocols/yahoo/yahoo.c:2474
 msgid "Received unexpected HTTP response from server."
 msgstr "Réception d'un message HTTP non attendu du serveur."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2488
-#: ../libpurple/protocols/yahoo/yahoo.c:2667
-#: ../libpurple/protocols/yahoo/yahoo.c:2770
-#: ../libpurple/protocols/yahoo/yahoo.c:2780
-#: ../libpurple/protocols/yahoo/yahoochat.c:1455
-#: ../libpurple/protocols/yahoo/yahoochat.c:1525
+#: ../libpurple/protocols/yahoo/yahoo.c:2498
+#: ../libpurple/protocols/yahoo/yahoo.c:2684
+#: ../libpurple/protocols/yahoo/yahoo.c:2787
+#: ../libpurple/protocols/yahoo/yahoo.c:2797
+#: ../libpurple/protocols/yahoo/yahoochat.c:1418
+#: ../libpurple/protocols/yahoo/yahoochat.c:1488
 #: ../libpurple/protocols/yahoo/ycht.c:585
 msgid "Connection problem"
 msgstr "Problème de connexion"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2882
-#: ../libpurple/protocols/yahoo/yahoo.c:3493
+#: ../libpurple/protocols/yahoo/yahoo.c:2524
+#, c-format
+msgid ""
+"Lost connection with %s:\n"
+"%s"
+msgstr ""
+"Connexion perdue avec %s :\n"
+"%s"
+
+#: ../libpurple/protocols/yahoo/yahoo.c:2549
+#, c-format
+msgid ""
+"Could not establish a connection with %s:\n"
+"%s"
+msgstr ""
+"Impossible de se connecter avec %s :\n"
+"%s"
+
+#: ../libpurple/protocols/yahoo/yahoo.c:2899
+#: ../libpurple/protocols/yahoo/yahoo.c:3510
 msgid "Not at Home"
 msgstr "Pas à la maison"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2884
-#: ../libpurple/protocols/yahoo/yahoo.c:3496
+#: ../libpurple/protocols/yahoo/yahoo.c:2901
+#: ../libpurple/protocols/yahoo/yahoo.c:3513
 msgid "Not at Desk"
 msgstr "Pas au bureau"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2886
-#: ../libpurple/protocols/yahoo/yahoo.c:3499
+#: ../libpurple/protocols/yahoo/yahoo.c:2903
+#: ../libpurple/protocols/yahoo/yahoo.c:3516
 msgid "Not in Office"
 msgstr "Pas au travail"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2890
-#: ../libpurple/protocols/yahoo/yahoo.c:3505
+#: ../libpurple/protocols/yahoo/yahoo.c:2907
+#: ../libpurple/protocols/yahoo/yahoo.c:3522
 msgid "On Vacation"
 msgstr "En vacances"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2894
-#: ../libpurple/protocols/yahoo/yahoo.c:3511
+#: ../libpurple/protocols/yahoo/yahoo.c:2911
+#: ../libpurple/protocols/yahoo/yahoo.c:3528
 msgid "Stepped Out"
 msgstr "De sortie"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2987
-#: ../libpurple/protocols/yahoo/yahoo.c:3017
+#: ../libpurple/protocols/yahoo/yahoo.c:3004
+#: ../libpurple/protocols/yahoo/yahoo.c:3034
 msgid "Not on server list"
 msgstr "Pas dans la liste du serveur"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3034
-#: ../libpurple/protocols/yahoo/yahoo.c:3092
+#: ../libpurple/protocols/yahoo/yahoo.c:3051
+#: ../libpurple/protocols/yahoo/yahoo.c:3109
 msgid "Appear Online"
 msgstr "Apparaître connecté"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3037
-#: ../libpurple/protocols/yahoo/yahoo.c:3113
+#: ../libpurple/protocols/yahoo/yahoo.c:3054
+#: ../libpurple/protocols/yahoo/yahoo.c:3130
 msgid "Appear Permanently Offline"
 msgstr "Apparaître toujours déconnecté"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3055
+#: ../libpurple/protocols/yahoo/yahoo.c:3072
 msgid "Presence"
 msgstr "Présence"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3098
+#: ../libpurple/protocols/yahoo/yahoo.c:3115
 msgid "Appear Offline"
 msgstr "Invisible"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3107
+#: ../libpurple/protocols/yahoo/yahoo.c:3124
 msgid "Don't Appear Permanently Offline"
 msgstr "Ne pas apparaître toujours déconnecté"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3155
+#: ../libpurple/protocols/yahoo/yahoo.c:3172
 msgid "Join in Chat"
 msgstr "Entrer dans une discussion"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3161
+#: ../libpurple/protocols/yahoo/yahoo.c:3178
 msgid "Initiate Conference"
 msgstr "Lancer une conférence"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3189
+#: ../libpurple/protocols/yahoo/yahoo.c:3206
 msgid "Presence Settings"
 msgstr "Paramètres de présence"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3195
+#: ../libpurple/protocols/yahoo/yahoo.c:3212
 msgid "Start Doodling"
 msgstr "Commencer à griffonner"
 
 #. XXX Typo: This should be _("Activate which ID?") - fix after string freeze is over
-#: ../libpurple/protocols/yahoo/yahoo.c:3228
+#: ../libpurple/protocols/yahoo/yahoo.c:3245
 msgid "Active which ID?"
 msgstr "Activer quelle identité ?"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3239
+#: ../libpurple/protocols/yahoo/yahoo.c:3256
 msgid "Join who in chat?"
 msgstr "Qui joindre dans une discussion ?"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3251
+#: ../libpurple/protocols/yahoo/yahoo.c:3268
 msgid "Activate ID..."
 msgstr "Activer ID..."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3255
+#: ../libpurple/protocols/yahoo/yahoo.c:3272
 msgid "Join User in Chat..."
 msgstr "Joindre l'utilisateur dans une discussion..."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3762
+#: ../libpurple/protocols/yahoo/yahoo.c:3779
 msgid "You have just sent a Buzz!"
 msgstr "Vous venez d'envoyer un « Buzz ! »"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3821
+#: ../libpurple/protocols/yahoo/yahoo.c:3838
 msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
 msgstr "join &lt;room&gt; : Entrer dans une discussion sur le réseau Yahoo"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3826
+#: ../libpurple/protocols/yahoo/yahoo.c:3843
 msgid "list: List rooms on the Yahoo network"
 msgstr "list : Récupérer la liste des salons du réseau Yahoo."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3830
+#: ../libpurple/protocols/yahoo/yahoo.c:3847
 msgid "buzz: Buzz a user to get their attention"
 msgstr "buzz : Faire sonner chez un contact pour attirer son attention."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3834
+#: ../libpurple/protocols/yahoo/yahoo.c:3851
 msgid "doodle: Request user to start a Doodle session"
 msgstr "doodle : Envoie une demande pour un séance de griffonnage."
 
@@ -10737,89 +11323,89 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/yahoo/yahoo.c:4042
-#: ../libpurple/protocols/yahoo/yahoo.c:4044
+#: ../libpurple/protocols/yahoo/yahoo.c:4059
+#: ../libpurple/protocols/yahoo/yahoo.c:4061
 msgid "Yahoo Protocol Plugin"
 msgstr "Plugin pour le protocole Yahoo"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4067
+#: ../libpurple/protocols/yahoo/yahoo.c:4084
 msgid "Yahoo Japan"
 msgstr "Yahoo Japon"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4070
+#: ../libpurple/protocols/yahoo/yahoo.c:4087
 msgid "Pager server"
 msgstr "Serveur de texto"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4073
+#: ../libpurple/protocols/yahoo/yahoo.c:4090
 msgid "Japan Pager server"
 msgstr "Serveur japonais de texto"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4076
+#: ../libpurple/protocols/yahoo/yahoo.c:4093
 msgid "Pager port"
 msgstr "Port du pager"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4079
+#: ../libpurple/protocols/yahoo/yahoo.c:4096
 msgid "File transfer server"
 msgstr "Server de transfert de fichiers"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4082
+#: ../libpurple/protocols/yahoo/yahoo.c:4099
 msgid "Japan file transfer server"
 msgstr "Server japonais de transfert de fichiers"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4085
+#: ../libpurple/protocols/yahoo/yahoo.c:4102
 msgid "File transfer port"
 msgstr "Port de transfert de fichiers"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4088
+#: ../libpurple/protocols/yahoo/yahoo.c:4105
 msgid "Chat room locale"
 msgstr "Langue du salon de discussions"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4091
+#: ../libpurple/protocols/yahoo/yahoo.c:4108
 msgid "Ignore conference and chatroom invitations"
 msgstr "Ignorer les invitations aux conférences et salons de discussions"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4099
+#: ../libpurple/protocols/yahoo/yahoo.c:4116
 msgid "Chat room list URL"
 msgstr "URL de liste des salons de discussions"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4102
+#: ../libpurple/protocols/yahoo/yahoo.c:4119
 msgid "Yahoo Chat server"
 msgstr "Serveur Yahoo Chat"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4105
+#: ../libpurple/protocols/yahoo/yahoo.c:4122
 msgid "Yahoo Chat port"
 msgstr "Port Yahoo Chat"
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:203
+#: ../libpurple/protocols/yahoo/yahoochat.c:204
 #, c-format
 msgid "%s declined your conference invitation to room \"%s\" because \"%s\"."
 msgstr ""
 "%s a décliné votre invitation à la conférence « %s » pour la raison : %s"
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:205
+#: ../libpurple/protocols/yahoo/yahoochat.c:206
 msgid "Invitation Rejected"
 msgstr "Invitation refusée"
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:361
+#: ../libpurple/protocols/yahoo/yahoochat.c:362
 msgid "Failed to join chat"
 msgstr "Impossible d'entrer dans la discussion."
 
 #. -6
-#: ../libpurple/protocols/yahoo/yahoochat.c:364
+#: ../libpurple/protocols/yahoo/yahoochat.c:365
 msgid "Unknown room"
 msgstr "Salon de discussions inconnu"
 
 #. -15
-#: ../libpurple/protocols/yahoo/yahoochat.c:367
+#: ../libpurple/protocols/yahoo/yahoochat.c:368
 msgid "Maybe the room is full"
 msgstr "Le salon de discussions est peut-être plein"
 
 #. -35
-#: ../libpurple/protocols/yahoo/yahoochat.c:370
+#: ../libpurple/protocols/yahoo/yahoochat.c:371
 msgid "Not available"
 msgstr "Non disponible"
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:374
+#: ../libpurple/protocols/yahoo/yahoochat.c:375
 msgid ""
 "Unknown error. You may need to logout and wait five minutes before being "
 "able to rejoin a chatroom"
@@ -10827,38 +11413,38 @@
 "Erreur inconnue. Il vous faudra peut-être vous déconnecter et attendre cinq "
 "minutes avant de pouvoir retourner dans un salon de discussions."
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:452
+#: ../libpurple/protocols/yahoo/yahoochat.c:453
 #, c-format
 msgid "You are now chatting in %s."
 msgstr "Vous discutez dans %s"
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:627
+#: ../libpurple/protocols/yahoo/yahoochat.c:628
 msgid "Failed to join buddy in chat"
 msgstr "Impossible de joindre le contact dans la discussion"
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:628
+#: ../libpurple/protocols/yahoo/yahoochat.c:629
 msgid "Maybe they're not in a chat?"
 msgstr "Le contact n'est peut-être pas dans une discussion"
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:1357
-#: ../libpurple/protocols/yahoo/yahoochat.c:1383
+#: ../libpurple/protocols/yahoo/yahoochat.c:1320
+#: ../libpurple/protocols/yahoo/yahoochat.c:1346
 msgid "Fetching the room list failed."
 msgstr "Échec de récupération de la liste des salons de discussions"
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:1441
+#: ../libpurple/protocols/yahoo/yahoochat.c:1404
 msgid "Voices"
 msgstr "Voix"
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:1444
+#: ../libpurple/protocols/yahoo/yahoochat.c:1407
 msgid "Webcams"
 msgstr "Webcams"
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:1455
-#: ../libpurple/protocols/yahoo/yahoochat.c:1525
+#: ../libpurple/protocols/yahoo/yahoochat.c:1418
+#: ../libpurple/protocols/yahoo/yahoochat.c:1488
 msgid "Unable to fetch room list."
 msgstr "Impossible de récupérer la liste des salons"
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:1518
+#: ../libpurple/protocols/yahoo/yahoochat.c:1481
 msgid "User Rooms"
 msgstr "Salon de discussions utilisateur"
 
@@ -10869,14 +11455,14 @@
 msgid "Sent Doodle request."
 msgstr "Envoyer une demande Doodle."
 
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:269
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:278
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:291
+#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:270
+#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:279
+#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:292
 msgid "Unable to establish file descriptor."
 msgstr "Impossible de créer un descripteur de fichier"
 
 #. TODO: what to do here - do we really have to disconnect?
-#: ../libpurple/protocols/yahoo/yahoo_packet.c:289
+#: ../libpurple/protocols/yahoo/yahoo_packet.c:302
 msgid "Write Error"
 msgstr "Erreur d'écriture"
 
@@ -11160,7 +11746,7 @@
 msgstr "Exposition"
 
 #: ../libpurple/proxy.c:458 ../libpurple/proxy.c:877 ../libpurple/proxy.c:1032
-#: ../libpurple/proxy.c:1588
+#: ../libpurple/proxy.c:1600
 #, c-format
 msgid ""
 "Unable to create socket:\n"
@@ -11192,7 +11778,7 @@
 msgid "Error resolving %s"
 msgstr "Erreur à la résolution du nom %s."
 
-#: ../libpurple/proxy.c:1685
+#: ../libpurple/proxy.c:1697
 msgid "Could not resolve host name"
 msgstr "Impossible de résoudre le nom de l'hôte."
 
@@ -11217,11 +11803,11 @@
 #. *
 #. * The default message to use when the user becomes auto-away.
 #.
-#: ../libpurple/savedstatuses.c:46
+#: ../libpurple/savedstatuses.c:47
 msgid "I'm not here right now"
 msgstr "Je ne suis pas là pour l'instant."
 
-#: ../libpurple/savedstatuses.c:532
+#: ../libpurple/savedstatuses.c:534
 msgid "saved statuses"
 msgstr "saved statuses"
 
@@ -11230,7 +11816,7 @@
 msgid "%s is now known as %s.\n"
 msgstr "%s est désormais connu sous le nom de %s\n"
 
-#: ../libpurple/server.c:679
+#: ../libpurple/server.c:680
 #, c-format
 msgid ""
 "%s has invited %s to the chat room %s:\n"
@@ -11239,12 +11825,12 @@
 "%s a invité %s dans le salon de discussions %s :\n"
 "%s"
 
-#: ../libpurple/server.c:684
+#: ../libpurple/server.c:685
 #, c-format
 msgid "%s has invited %s to the chat room %s\n"
 msgstr "%s a invité %s dans le salon de discussions %s\n"
 
-#: ../libpurple/server.c:688
+#: ../libpurple/server.c:689
 msgid "Accept chat invitation?"
 msgstr "Accepter l'invitation à la discussion ?"
 
@@ -11252,9 +11838,13 @@
 msgid "Unset"
 msgstr "Enlever"
 
-#: ../libpurple/status.c:155
-msgid "Unavailable"
-msgstr "Non disponible"
+#: ../libpurple/status.c:155 ../pidgin/gtkstatusbox.c:1057
+msgid "Do not disturb"
+msgstr "Ne pas déranger"
+
+#: ../libpurple/status.c:158
+msgid "Extended away"
+msgstr "Longue absence"
 
 #: ../libpurple/status.c:159
 msgid "Mobile"
@@ -11285,27 +11875,27 @@
 msgid "%s became unidle"
 msgstr "%s n'est plus inactif."
 
-#: ../libpurple/status.c:1312
+#: ../libpurple/status.c:1313
 #, c-format
 msgid "+++ %s became idle"
 msgstr "+++ %s devient inactif."
 
-#: ../libpurple/status.c:1314
+#: ../libpurple/status.c:1315
 #, c-format
 msgid "+++ %s became unidle"
 msgstr "+++ %s devient actif."
 
-#: ../libpurple/util.c:681
+#: ../libpurple/util.c:717
 #, c-format
 msgid "%x %X"
 msgstr "%x %X"
 
-#: ../libpurple/util.c:2553
+#: ../libpurple/util.c:2691
 #, c-format
 msgid "Error Reading %s"
 msgstr "Erreur à la lecture de « %s »."
 
-#: ../libpurple/util.c:2554
+#: ../libpurple/util.c:2692
 #, c-format
 msgid ""
 "An error was encountered reading your %s.  They have not been loaded, and "
@@ -11314,62 +11904,67 @@
 "Une erreur est survenue à la lecture de « %s ». Il n'a pas été chargé et "
 "l'ancien fichier a été renommé « %s~ »."
 
-#: ../libpurple/util.c:3024
+#: ../libpurple/util.c:3192
 msgid "Calculating..."
 msgstr "Calcul en cours"
 
-#: ../libpurple/util.c:3027
+#: ../libpurple/util.c:3195
 msgid "Unknown."
 msgstr "Inconnu"
 
-#: ../libpurple/util.c:3053
+#: ../libpurple/util.c:3221
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] "%d seconde"
 msgstr[1] "%d secondes"
 
-#: ../libpurple/util.c:3065
+#: ../libpurple/util.c:3233
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] "%d jour"
 msgstr[1] "%d jours"
 
-#: ../libpurple/util.c:3073
+#: ../libpurple/util.c:3241
 #, c-format
 msgid "%s, %d hour"
 msgid_plural "%s, %d hours"
 msgstr[0] "%s, %d heure"
 msgstr[1] "%s, %d heures"
 
-#: ../libpurple/util.c:3079
+#: ../libpurple/util.c:3247
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d heure"
 msgstr[1] "%d heures"
 
-#: ../libpurple/util.c:3087
+#: ../libpurple/util.c:3255
 #, c-format
 msgid "%s, %d minute"
 msgid_plural "%s, %d minutes"
 msgstr[0] "%s, %d minute"
 msgstr[1] "%s, %d minutes"
 
-#: ../libpurple/util.c:3093
+#: ../libpurple/util.c:3261
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d minute"
 msgstr[1] "%d minutes"
 
-#: ../libpurple/util.c:3362 ../libpurple/util.c:3660
+#: ../libpurple/util.c:3521
+#, c-format
+msgid "Could not open %s: Redirected too many times"
+msgstr "Impossible d'ouvrir %s : Trop de redirections"
+
+#: ../libpurple/util.c:3558 ../libpurple/util.c:3853
 #, c-format
 msgid "Unable to connect to %s"
 msgstr "Impossible de se connecter à %s."
 
-#: ../libpurple/util.c:3488
+#: ../libpurple/util.c:3681
 #, c-format
 msgid ""
 "Unable to allocate enough memory to hold the contents from %s.  The web "
@@ -11378,17 +11973,17 @@
 "Impossible de réserver suffisamment de mémoire pour le contenu de %s. Il "
 "s'agit peut-être d'une attaque du serveur web."
 
-#: ../libpurple/util.c:3523
+#: ../libpurple/util.c:3716
 #, c-format
 msgid "Error reading from %s: %s"
 msgstr "Erreur à la lecture depuis %s : %s"
 
-#: ../libpurple/util.c:3554
+#: ../libpurple/util.c:3747
 #, c-format
 msgid "Error writing to %s: %s"
 msgstr "Erreur à l'écriture vers %s : %s"
 
-#: ../libpurple/util.c:3579
+#: ../libpurple/util.c:3772
 #, c-format
 msgid "Unable to connect to %s: %s"
 msgstr "Impossible de se connecter à %s : %s"
@@ -11414,55 +12009,71 @@
 msgstr "Orientation de l'espace de notification"
 
 #. Build the login options frame.
-#: ../pidgin/gtkaccount.c:406
+#: ../pidgin/gtkaccount.c:409
 msgid "Login Options"
 msgstr "Options de connexion"
 
-#: ../pidgin/gtkaccount.c:515
-msgid "Local alias:"
-msgstr "Alias local :"
+#: ../pidgin/gtkaccount.c:430
+msgid "Pro_tocol:"
+msgstr "Pro_tocole :"
+
+#: ../pidgin/gtkaccount.c:441
+msgid "Screen _name:"
+msgstr "_Nom d'utilisateur :"
+
+#: ../pidgin/gtkaccount.c:531
+msgid "_Local alias:"
+msgstr "Alias _local :"
+
+#: ../pidgin/gtkaccount.c:535
+msgid "Remember pass_word"
+msgstr "Mémoriser le mot de _passe"
 
 #. Build the user options frame.
-#: ../pidgin/gtkaccount.c:577
+#: ../pidgin/gtkaccount.c:593
 msgid "User Options"
 msgstr "Options de l'utilisateur"
 
+#: ../pidgin/gtkaccount.c:606
+msgid "New _mail notifications"
+msgstr "Avertir des nouveaux _courriers"
+
 #. Buddy icon
-#: ../pidgin/gtkaccount.c:595
-msgid "Use this buddy icon for this account:"
-msgstr "Utiliser cette icône pour ce compte :"
+#: ../pidgin/gtkaccount.c:611
+msgid "Use this buddy _icon for this account:"
+msgstr "Utiliser cette _icône pour ce compte :"
 
 #. Build the protocol options frame.
-#: ../pidgin/gtkaccount.c:715
+#: ../pidgin/gtkaccount.c:731
 #, c-format
 msgid "%s Options"
 msgstr "Options de %s"
 
-#: ../pidgin/gtkaccount.c:912
+#: ../pidgin/gtkaccount.c:936
 msgid "Use GNOME Proxy Settings"
 msgstr "Utiliser les paramètres mandataires de GNOME"
 
-#: ../pidgin/gtkaccount.c:913
+#: ../pidgin/gtkaccount.c:937
 msgid "Use Global Proxy Settings"
 msgstr "Utiliser les paramètres mandataires globaux"
 
-#: ../pidgin/gtkaccount.c:919
+#: ../pidgin/gtkaccount.c:943
 msgid "No Proxy"
 msgstr "Pas de serveur mandataire"
 
-#: ../pidgin/gtkaccount.c:925
+#: ../pidgin/gtkaccount.c:949
 msgid "HTTP"
 msgstr "HTTP"
 
-#: ../pidgin/gtkaccount.c:931
+#: ../pidgin/gtkaccount.c:955
 msgid "SOCKS 4"
 msgstr "SOCKS 4"
 
-#: ../pidgin/gtkaccount.c:937
+#: ../pidgin/gtkaccount.c:961
 msgid "SOCKS 5"
 msgstr "SOCKS 5"
 
-#: ../pidgin/gtkaccount.c:943 ../pidgin/gtkprefs.c:1100
+#: ../pidgin/gtkaccount.c:967 ../pidgin/gtkprefs.c:1206
 msgid "Use Environmental Settings"
 msgstr "Utiliser les paramètres d'environnement"
 
@@ -11471,60 +12082,60 @@
 #. A) your network is really slow and you have nothing better to do than
 #. look at butterflies.
 #. B)You are looking really closely at something that shouldn't matter.
-#: ../pidgin/gtkaccount.c:982
+#: ../pidgin/gtkaccount.c:1006
 msgid "If you look real closely"
 msgstr "Si on regarde de très près"
 
 #. This is an easter egg. See the comment on the previous line in the source.
-#: ../pidgin/gtkaccount.c:985
+#: ../pidgin/gtkaccount.c:1009
 msgid "you can see the butterflies mating"
 msgstr "on peut voir les papillons s'accoupler"
 
-#: ../pidgin/gtkaccount.c:1006
+#: ../pidgin/gtkaccount.c:1030
 msgid "Proxy Options"
 msgstr "Options du serveur mandataire"
 
-#: ../pidgin/gtkaccount.c:1020 ../pidgin/gtkprefs.c:1094
+#: ../pidgin/gtkaccount.c:1044 ../pidgin/gtkprefs.c:1200
 msgid "Proxy _type:"
 msgstr "_Type :"
 
-#: ../pidgin/gtkaccount.c:1029 ../pidgin/gtkprefs.c:1115
+#: ../pidgin/gtkaccount.c:1053 ../pidgin/gtkprefs.c:1221
 msgid "_Host:"
 msgstr "_Hôte :"
 
-#: ../pidgin/gtkaccount.c:1033 ../pidgin/gtkprefs.c:1133
+#: ../pidgin/gtkaccount.c:1057 ../pidgin/gtkprefs.c:1239
 msgid "_Port:"
 msgstr "_Port :"
 
-#: ../pidgin/gtkaccount.c:1041
+#: ../pidgin/gtkaccount.c:1065
 msgid "_Username:"
 msgstr "_Utilisateur :"
 
-#: ../pidgin/gtkaccount.c:1048 ../pidgin/gtkprefs.c:1170
+#: ../pidgin/gtkaccount.c:1072 ../pidgin/gtkprefs.c:1276
 msgid "Pa_ssword:"
 msgstr "_Mot de passe :"
 
-#: ../pidgin/gtkaccount.c:1454
+#: ../pidgin/gtkaccount.c:1473
 msgid "Add Account"
 msgstr "Ajouter un compte"
 
-#: ../pidgin/gtkaccount.c:1478
+#: ../pidgin/gtkaccount.c:1492
 msgid "_Basic"
 msgstr "_Essentiel"
 
-#: ../pidgin/gtkaccount.c:1489
+#: ../pidgin/gtkaccount.c:1503
 msgid "_Advanced"
 msgstr "_Avancé"
 
-#: ../pidgin/gtkaccount.c:1961 ../pidgin/gtkplugin.c:568
+#: ../pidgin/gtkaccount.c:1975 ../pidgin/gtkplugin.c:568
 msgid "Enabled"
 msgstr "Activé"
 
-#: ../pidgin/gtkaccount.c:1989
+#: ../pidgin/gtkaccount.c:2003
 msgid "Protocol"
 msgstr "Protocole"
 
-#: ../pidgin/gtkaccount.c:2183
+#: ../pidgin/gtkaccount.c:2203
 #, c-format
 msgid ""
 "<span size='larger' weight='bold'>Welcome to %s!</span>\n"
@@ -11548,11 +12159,11 @@
 "comptes, choisissez <b>Comptes->Modifier</b> dans le menu de la liste de "
 "contacts"
 
-#: ../pidgin/gtkblist.c:724
+#: ../pidgin/gtkblist.c:763
 msgid "Join a Chat"
 msgstr "Entrer dans une discussion"
 
-#: ../pidgin/gtkblist.c:745
+#: ../pidgin/gtkblist.c:784
 msgid ""
 "Please enter the appropriate information about the chat you would like to "
 "join.\n"
@@ -11560,221 +12171,219 @@
 "Saisissez les informations sur le salon de discussions dans lequel vous "
 "voulez entrer.\n"
 
-#: ../pidgin/gtkblist.c:756 ../pidgin/gtkpounce.c:531
-#: ../pidgin/gtkroomlist.c:399
+#. Set up stuff for the account box
+#: ../pidgin/gtkblist.c:795 ../pidgin/gtkblist.c:5467
+#: ../pidgin/gtkblist.c:5834 ../pidgin/gtkpounce.c:540
+#: ../pidgin/gtkroomlist.c:395
 msgid "_Account:"
 msgstr "C_ompte :"
 
-#: ../pidgin/gtkblist.c:1045 ../pidgin/gtkprivacy.c:606
-#: ../pidgin/gtkprivacy.c:620
+#: ../pidgin/gtkblist.c:1084 ../pidgin/gtkprivacy.c:602
+#: ../pidgin/gtkprivacy.c:616
 msgid "_Block"
 msgstr "_Bloquer"
 
-#: ../pidgin/gtkblist.c:1045
+#: ../pidgin/gtkblist.c:1084
 msgid "Un_block"
 msgstr "_Débloquer"
 
-#: ../pidgin/gtkblist.c:1096
+#: ../pidgin/gtkblist.c:1135
 msgid "Get _Info"
 msgstr "_Infos"
 
-#: ../pidgin/gtkblist.c:1099 ../pidgin/pidginstock.c:84
+#: ../pidgin/gtkblist.c:1138 ../pidgin/pidginstock.c:84
 msgid "I_M"
 msgstr "_Message"
 
-#: ../pidgin/gtkblist.c:1105
+#: ../pidgin/gtkblist.c:1144
 msgid "_Send File"
 msgstr "Envoyer un _fichier"
 
-#: ../pidgin/gtkblist.c:1112
+#: ../pidgin/gtkblist.c:1151
 msgid "Add Buddy _Pounce"
 msgstr "Ajouter une a_lerte"
 
-#: ../pidgin/gtkblist.c:1116 ../pidgin/gtkblist.c:1120
-#: ../pidgin/gtkblist.c:1222 ../pidgin/gtkblist.c:1245
+#: ../pidgin/gtkblist.c:1155 ../pidgin/gtkblist.c:1159
+#: ../pidgin/gtkblist.c:1262 ../pidgin/gtkblist.c:1285
 msgid "View _Log"
 msgstr "_Voir les archives"
 
-#: ../pidgin/gtkblist.c:1132
-msgid "Alias..."
-msgstr "Alias..."
-
-#: ../pidgin/gtkblist.c:1141 ../pidgin/gtkblist.c:1230
-#: ../pidgin/gtkblist.c:1251
+#: ../pidgin/gtkblist.c:1171 ../pidgin/gtkblist.c:1180
+#: ../pidgin/gtkblist.c:1270 ../pidgin/gtkblist.c:1291
 msgid "_Alias..."
 msgstr "_Alias..."
 
-#: ../pidgin/gtkblist.c:1143 ../pidgin/gtkblist.c:1232
-#: ../pidgin/gtkblist.c:1253
+#: ../pidgin/gtkblist.c:1174 ../pidgin/gtkblist.c:1182
+#: ../pidgin/gtkblist.c:1272 ../pidgin/gtkblist.c:1293
 msgid "_Remove"
 msgstr "_Supprimer"
 
-#: ../pidgin/gtkblist.c:1192
+#: ../pidgin/gtkblist.c:1232
 msgid "Add a _Buddy"
 msgstr "_Ajouter un contact"
 
-#: ../pidgin/gtkblist.c:1195
+#: ../pidgin/gtkblist.c:1235
 msgid "Add a C_hat"
 msgstr "Ajouter une d_iscussion"
 
-#: ../pidgin/gtkblist.c:1198
+#: ../pidgin/gtkblist.c:1238
 msgid "_Delete Group"
 msgstr "_Supprimer un groupe"
 
-#: ../pidgin/gtkblist.c:1200
+#: ../pidgin/gtkblist.c:1240
 msgid "_Rename"
 msgstr "_Renommer"
 
 #. join button
-#: ../pidgin/gtkblist.c:1218 ../pidgin/gtkroomlist.c:306
-#: ../pidgin/gtkroomlist.c:463 ../pidgin/pidginstock.c:82
+#: ../pidgin/gtkblist.c:1258 ../pidgin/gtkroomlist.c:306
+#: ../pidgin/gtkroomlist.c:459 ../pidgin/pidginstock.c:82
 msgid "_Join"
 msgstr "_Discuter"
 
-#: ../pidgin/gtkblist.c:1220
+#: ../pidgin/gtkblist.c:1260
 msgid "Auto-Join"
 msgstr "Rentrer auto"
 
-#: ../pidgin/gtkblist.c:1258 ../pidgin/gtkblist.c:1281
+#: ../pidgin/gtkblist.c:1298 ../pidgin/gtkblist.c:1321
 msgid "_Collapse"
 msgstr "Re_plier"
 
-#: ../pidgin/gtkblist.c:1286
+#: ../pidgin/gtkblist.c:1326
 msgid "_Expand"
 msgstr "_Etendre"
 
-#: ../pidgin/gtkblist.c:1531 ../pidgin/gtkblist.c:1543
-#: ../pidgin/gtkblist.c:4511 ../pidgin/gtkblist.c:4521
+#: ../pidgin/gtkblist.c:1571 ../pidgin/gtkblist.c:1583
+#: ../pidgin/gtkblist.c:4561 ../pidgin/gtkblist.c:4571
 msgid "/Tools/Mute Sounds"
 msgstr "/Outils/Silencieux"
 
-#: ../pidgin/gtkblist.c:2003 ../pidgin/gtkconv.c:4535
-#: ../pidgin/gtkpounce.c:423
+#: ../pidgin/gtkblist.c:2043 ../pidgin/gtkconv.c:4602
+#: ../pidgin/gtkpounce.c:429
 msgid ""
 "You are not currently signed on with an account that can add that buddy."
 msgstr "Il n'y a aucun compte actif permettant d'ajouter cet utilisateur."
 
 #. Buddies menu
-#: ../pidgin/gtkblist.c:2832
+#: ../pidgin/gtkblist.c:2838
 msgid "/_Buddies"
 msgstr "/_Contacts"
 
-#: ../pidgin/gtkblist.c:2833
+#: ../pidgin/gtkblist.c:2839
 msgid "/Buddies/New Instant _Message..."
 msgstr "/Contacts/Envoyer un _message..."
 
-#: ../pidgin/gtkblist.c:2834
+#: ../pidgin/gtkblist.c:2840
 msgid "/Buddies/Join a _Chat..."
 msgstr "/Contacts/_Entrer dans une discussion..."
 
-#: ../pidgin/gtkblist.c:2835
+#: ../pidgin/gtkblist.c:2841
 msgid "/Buddies/Get User _Info..."
 msgstr "/Contacts/Voir les _informations..."
 
-#: ../pidgin/gtkblist.c:2836
+#: ../pidgin/gtkblist.c:2842
 msgid "/Buddies/View User _Log..."
 msgstr "/Contacts/Voir les _archives..."
 
-#: ../pidgin/gtkblist.c:2838
+#: ../pidgin/gtkblist.c:2844
 msgid "/Buddies/Show _Offline Buddies"
 msgstr "/Contacts/Afficher les contacts _déconnectés"
 
-#: ../pidgin/gtkblist.c:2839
+#: ../pidgin/gtkblist.c:2845
 msgid "/Buddies/Show _Empty Groups"
 msgstr "/Contacts/Afficher les groupes _vides"
 
-#: ../pidgin/gtkblist.c:2840
+#: ../pidgin/gtkblist.c:2846
 msgid "/Buddies/Show Buddy _Details"
 msgstr "/Contacts/_Afficher les informations des contacts"
 
-#: ../pidgin/gtkblist.c:2841
+#: ../pidgin/gtkblist.c:2847
 msgid "/Buddies/Show Idle _Times"
 msgstr "/Contacts/Afficher les tem_ps d'inactivité"
 
-#: ../pidgin/gtkblist.c:2842
+#: ../pidgin/gtkblist.c:2848
 msgid "/Buddies/_Sort Buddies"
 msgstr "/Contacts/_Trier les contacts"
 
-#: ../pidgin/gtkblist.c:2844
+#: ../pidgin/gtkblist.c:2850
 msgid "/Buddies/_Add Buddy..."
 msgstr "/Contacts/Ajouter un _contact..."
 
-#: ../pidgin/gtkblist.c:2845
+#: ../pidgin/gtkblist.c:2851
 msgid "/Buddies/Add C_hat..."
 msgstr "/Contacts/Ajouter une _discussion..."
 
-#: ../pidgin/gtkblist.c:2846
+#: ../pidgin/gtkblist.c:2852
 msgid "/Buddies/Add _Group..."
 msgstr "/Contacts/Ajouter un _groupe..."
 
-#: ../pidgin/gtkblist.c:2848
+#: ../pidgin/gtkblist.c:2854
 msgid "/Buddies/_Quit"
 msgstr "/Contacts/_Quitter"
 
 #. Accounts menu
-#: ../pidgin/gtkblist.c:2851
+#: ../pidgin/gtkblist.c:2857
 msgid "/_Accounts"
 msgstr "/C_omptes"
 
-#: ../pidgin/gtkblist.c:2852 ../pidgin/gtkblist.c:6446
+#: ../pidgin/gtkblist.c:2858 ../pidgin/gtkblist.c:6532
 msgid "/Accounts/Add\\/Edit"
 msgstr "/Comptes/_Modifier"
 
 #. Tools
-#: ../pidgin/gtkblist.c:2855
+#: ../pidgin/gtkblist.c:2861
 msgid "/_Tools"
 msgstr "/_Outils"
 
-#: ../pidgin/gtkblist.c:2856
+#: ../pidgin/gtkblist.c:2862
 msgid "/Tools/Buddy _Pounces"
 msgstr "/Outils/_Alertes"
 
-#: ../pidgin/gtkblist.c:2857
+#: ../pidgin/gtkblist.c:2863
 msgid "/Tools/Plu_gins"
 msgstr "/Outils/Plu_gins"
 
-#: ../pidgin/gtkblist.c:2858
+#: ../pidgin/gtkblist.c:2864
 msgid "/Tools/Pr_eferences"
 msgstr "/Outils/_Préférences"
 
-#: ../pidgin/gtkblist.c:2859
+#: ../pidgin/gtkblist.c:2865
 msgid "/Tools/Pr_ivacy"
 msgstr "/Outils/_Filtres"
 
-#: ../pidgin/gtkblist.c:2861
+#: ../pidgin/gtkblist.c:2867
 msgid "/Tools/_File Transfers"
 msgstr "/Outils/_Transferts de fichier"
 
-#: ../pidgin/gtkblist.c:2862
+#: ../pidgin/gtkblist.c:2868
 msgid "/Tools/R_oom List"
 msgstr "/Outils/_Liste des salons de discussions"
 
-#: ../pidgin/gtkblist.c:2863
+#: ../pidgin/gtkblist.c:2869
 msgid "/Tools/System _Log"
 msgstr "/Outils/Voir les archives s_ystème"
 
-#: ../pidgin/gtkblist.c:2865
+#: ../pidgin/gtkblist.c:2871
 msgid "/Tools/Mute _Sounds"
 msgstr "/Outils/_Silencieux"
 
 #. Help
-#: ../pidgin/gtkblist.c:2868
+#: ../pidgin/gtkblist.c:2873
 msgid "/_Help"
 msgstr "/Aid_e"
 
-#: ../pidgin/gtkblist.c:2869
+#: ../pidgin/gtkblist.c:2874
 msgid "/Help/Online _Help"
 msgstr "/Aide/Aid_e en ligne"
 
-#: ../pidgin/gtkblist.c:2870
+#: ../pidgin/gtkblist.c:2875
 msgid "/Help/_Debug Window"
 msgstr "/Aide/Fenêtre de _debug"
 
-#: ../pidgin/gtkblist.c:2871
+#: ../pidgin/gtkblist.c:2877 ../pidgin/gtkblist.c:2879
 msgid "/Help/_About"
 msgstr "/Aide/À _propos de"
 
-#: ../pidgin/gtkblist.c:2899
+#: ../pidgin/gtkblist.c:2908
 #, c-format
 msgid ""
 "\n"
@@ -11783,127 +12392,132 @@
 "\n"
 "<b>Compte :</b> %s"
 
-#: ../pidgin/gtkblist.c:2977
+#: ../pidgin/gtkblist.c:2986
 msgid "Buddy Alias"
 msgstr "Pseudo du contact"
 
-#: ../pidgin/gtkblist.c:2998
+#: ../pidgin/gtkblist.c:3015
 msgid "Logged In"
 msgstr "Connecté"
 
-#: ../pidgin/gtkblist.c:3044
+#: ../pidgin/gtkblist.c:3061
 msgid "Last Seen"
 msgstr "Dernièrement vu"
 
-#: ../pidgin/gtkblist.c:3064
+#: ../pidgin/gtkblist.c:3081
 msgid "Spooky"
 msgstr "Étrange"
 
-#: ../pidgin/gtkblist.c:3066
+#: ../pidgin/gtkblist.c:3083
 msgid "Awesome"
 msgstr "Fabuleux"
 
-#: ../pidgin/gtkblist.c:3068
+#: ../pidgin/gtkblist.c:3085
 msgid "Rockin'"
 msgstr "Génial"
 
-#: ../pidgin/gtkblist.c:3394
+#: ../pidgin/gtkblist.c:3428
+#, c-format
+msgid "Idle %dd %dh %02dm"
+msgstr "Inactif %dj %dh %02dmin"
+
+#: ../pidgin/gtkblist.c:3430
 #, c-format
 msgid "Idle %dh %02dm"
-msgstr "Inactif %dh %02dm"
-
-#: ../pidgin/gtkblist.c:3396
+msgstr "Inactif %dh %02dmin"
+
+#: ../pidgin/gtkblist.c:3432
 #, c-format
 msgid "Idle %dm"
-msgstr "Inactif %dm"
-
-#: ../pidgin/gtkblist.c:3533
+msgstr "Inactif %dmin"
+
+#: ../pidgin/gtkblist.c:3577
 msgid "/Buddies/New Instant Message..."
 msgstr "/Contacts/Envoyer un message..."
 
-#: ../pidgin/gtkblist.c:3534 ../pidgin/gtkblist.c:3567
+#: ../pidgin/gtkblist.c:3578 ../pidgin/gtkblist.c:3611
 msgid "/Buddies/Join a Chat..."
 msgstr "/Contacts/Entrer dans une discussion..."
 
-#: ../pidgin/gtkblist.c:3535
+#: ../pidgin/gtkblist.c:3579
 msgid "/Buddies/Get User Info..."
 msgstr "/Contacts/Voir les informations..."
 
-#: ../pidgin/gtkblist.c:3536
+#: ../pidgin/gtkblist.c:3580
 msgid "/Buddies/Add Buddy..."
 msgstr "/Contacts/Ajouter un contact..."
 
-#: ../pidgin/gtkblist.c:3537 ../pidgin/gtkblist.c:3570
+#: ../pidgin/gtkblist.c:3581 ../pidgin/gtkblist.c:3614
 msgid "/Buddies/Add Chat..."
 msgstr "/Contacts/Ajouter une discussion..."
 
-#: ../pidgin/gtkblist.c:3538
+#: ../pidgin/gtkblist.c:3582
 msgid "/Buddies/Add Group..."
 msgstr "/Contacts/Ajouter un groupe..."
 
-#: ../pidgin/gtkblist.c:3573
+#: ../pidgin/gtkblist.c:3617
 msgid "/Tools/Privacy"
 msgstr "/Outils/Filtres"
 
-#: ../pidgin/gtkblist.c:3576
+#: ../pidgin/gtkblist.c:3620
 msgid "/Tools/Room List"
 msgstr "/Outils/Liste des salons de discussions"
 
-#: ../pidgin/gtkblist.c:3673 ../pidgin/gtkdocklet.c:153
+#: ../pidgin/gtkblist.c:3717 ../pidgin/gtkdocklet.c:153
 #, c-format
 msgid "%d unread message from %s\n"
 msgid_plural "%d unread messages from %s\n"
 msgstr[0] "%d message non lu de %s\n"
 msgstr[1] "%d messages non lus de %s\n"
 
-#: ../pidgin/gtkblist.c:3750
+#: ../pidgin/gtkblist.c:3797
 msgid "Manually"
 msgstr "Manuel"
 
-#: ../pidgin/gtkblist.c:3752
+#: ../pidgin/gtkblist.c:3799
 msgid "Alphabetically"
 msgstr "Alphabétique"
 
-#: ../pidgin/gtkblist.c:3753
+#: ../pidgin/gtkblist.c:3800
 msgid "By status"
 msgstr "Par état"
 
-#: ../pidgin/gtkblist.c:3754
+#: ../pidgin/gtkblist.c:3801
 msgid "By log size"
 msgstr "Par la taille des archives"
 
-#: ../pidgin/gtkblist.c:3956 ../pidgin/gtkconn.c:178
+#: ../pidgin/gtkblist.c:4005 ../pidgin/gtkconn.c:178
 #, c-format
 msgid "%s disconnected"
 msgstr "Déconnexion de %s"
 
-#: ../pidgin/gtkblist.c:3966
+#: ../pidgin/gtkblist.c:4015
 msgid "Re-enable Account"
 msgstr "Réactiver le compte"
 
-#: ../pidgin/gtkblist.c:3990
+#: ../pidgin/gtkblist.c:4039
 #, c-format
 msgid "<span color=\"red\">%s disconnected: %s</span>"
 msgstr "<span color=\"red\">%s déconnecté : %s</span>"
 
-#: ../pidgin/gtkblist.c:4142
+#: ../pidgin/gtkblist.c:4191
 msgid "<b>Username:</b>"
 msgstr "<b>Utilisateur :</b>"
 
-#: ../pidgin/gtkblist.c:4149
+#: ../pidgin/gtkblist.c:4198
 msgid "<b>Password:</b>"
 msgstr "<b>Mot de passe :</b>"
 
-#: ../pidgin/gtkblist.c:4160
+#: ../pidgin/gtkblist.c:4209
 msgid "_Login"
 msgstr "_Connexion"
 
-#: ../pidgin/gtkblist.c:4245
+#: ../pidgin/gtkblist.c:4292
 msgid "/Accounts"
 msgstr "/Comptes"
 
 #. Translators: Please maintain the use of -> and <- to refer to menu heirarchy
-#: ../pidgin/gtkblist.c:4259
+#: ../pidgin/gtkblist.c:4306
 #, c-format
 msgid ""
 "<span weight='bold' size='larger'>Welcome to %s!</span>\n"
@@ -11922,23 +12536,23 @@
 #. set the Show Offline Buddies option. must be done
 #. * after the treeview or faceprint gets mad. -Robot101
 #.
-#: ../pidgin/gtkblist.c:4505
+#: ../pidgin/gtkblist.c:4555
 msgid "/Buddies/Show Offline Buddies"
 msgstr "/Contacts/Afficher les contacts _déconnectés"
 
-#: ../pidgin/gtkblist.c:4508
+#: ../pidgin/gtkblist.c:4558
 msgid "/Buddies/Show Empty Groups"
 msgstr "/Contacts/Afficher les groupes vides"
 
-#: ../pidgin/gtkblist.c:4514
+#: ../pidgin/gtkblist.c:4564
 msgid "/Buddies/Show Buddy Details"
 msgstr "/Contacts/Afficher les informations des contacts"
 
-#: ../pidgin/gtkblist.c:4517
+#: ../pidgin/gtkblist.c:4567
 msgid "/Buddies/Show Idle Times"
 msgstr "/Contacts/Afficher les temps d'inactivité"
 
-#: ../pidgin/gtkblist.c:5367
+#: ../pidgin/gtkblist.c:5444
 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. "
@@ -11949,17 +12563,20 @@
 "contact. L'alias sera affiché à la place du nom d'utilisateur chaque fois "
 "que cela est possible.\n"
 
-#: ../pidgin/gtkblist.c:5427 ../pidgin/gtkblist.c:5788
-#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:554
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:307
-msgid "Group:"
-msgstr "Groupe :"
-
-#: ../pidgin/gtkblist.c:5686
+#. End of account box
+#: ../pidgin/gtkblist.c:5479
+msgid "_Screen name:"
+msgstr "_Nom d'utilisateur :"
+
+#: ../pidgin/gtkblist.c:5501 ../pidgin/gtkblist.c:5855
+msgid "A_lias:"
+msgstr "_Alias :"
+
+#: ../pidgin/gtkblist.c:5767
 msgid "This protocol does not support chat rooms."
 msgstr "Les salons de discussions ne sont pas supportés par ce protocole."
 
-#: ../pidgin/gtkblist.c:5702
+#: ../pidgin/gtkblist.c:5783
 msgid ""
 "You are not currently signed on with any protocols that have the ability to "
 "chat."
@@ -11967,7 +12584,7 @@
 "Vous n'avez pas de protocole disponible vous permettant d'entrer dans des "
 "salons de discussions."
 
-#: ../pidgin/gtkblist.c:5743
+#: ../pidgin/gtkblist.c:5824
 msgid ""
 "Please enter an alias, and the appropriate information about the chat you "
 "would like to add to your buddy list.\n"
@@ -11975,39 +12592,39 @@
 "Saisissez un alias et les informations nécessaires pour le salon de "
 "discussions que vous voulez ajouter dans la liste de contacts.\n"
 
-#: ../pidgin/gtkblist.c:5826
+#: ../pidgin/gtkblist.c:5912
 msgid "Please enter the name of the group to be added."
 msgstr "Saisissez le nom du groupe à ajouter"
 
-#: ../pidgin/gtkblist.c:6466
+#: ../pidgin/gtkblist.c:6552
 msgid "<PurpleMain>/Accounts/"
 msgstr "<PurpleMain>/Comptes/"
 
-#: ../pidgin/gtkblist.c:6490
+#: ../pidgin/gtkblist.c:6576
 msgid "_Edit Account"
 msgstr "Modifier le c_ompte"
 
-#: ../pidgin/gtkblist.c:6503 ../pidgin/gtkconv.c:2923
+#: ../pidgin/gtkblist.c:6589 ../pidgin/gtkconv.c:2982
 msgid "No actions available"
 msgstr "Aucune action disponible"
 
-#: ../pidgin/gtkblist.c:6511
+#: ../pidgin/gtkblist.c:6597
 msgid "_Disable"
 msgstr "_Désactiver"
 
-#: ../pidgin/gtkblist.c:6523
+#: ../pidgin/gtkblist.c:6609
 msgid "Enable Account"
 msgstr "Activer un compte"
 
-#: ../pidgin/gtkblist.c:6529
+#: ../pidgin/gtkblist.c:6615
 msgid "<PurpleMain>/Accounts/Enable Account"
 msgstr "<PurpleMain>/Comptes/Activer un compte"
 
-#: ../pidgin/gtkblist.c:6578
+#: ../pidgin/gtkblist.c:6664
 msgid "/Tools"
 msgstr "/Outils"
 
-#: ../pidgin/gtkblist.c:6648
+#: ../pidgin/gtkblist.c:6734
 msgid "/Buddies/Sort Buddies"
 msgstr "/Contacts/Trier les contacts"
 
@@ -12024,22 +12641,26 @@
 "%s n'essaiera pas de se reconnecter avec ce compte tant que cette erreur ne "
 "sera pas corrigée et que vous ne réactiviez pas le compte."
 
-#: ../pidgin/gtkconv.c:788 ../pidgin/gtkconv.c:814
+#: ../pidgin/gtkconv.c:485
+msgid "Unknown command."
+msgstr "Commande inconnue."
+
+#: ../pidgin/gtkconv.c:757 ../pidgin/gtkconv.c:783
 msgid "That buddy is not on the same protocol as this chat."
 msgstr ""
 "Ce contact n'utilise pas le même protocole que ce salon de discussions."
 
-#: ../pidgin/gtkconv.c:808
+#: ../pidgin/gtkconv.c:777
 msgid ""
 "You are not currently signed on with an account that can invite that buddy."
 msgstr "Il n'y a aucun compte actif vous permettant d'inviter ce contact."
 
-#: ../pidgin/gtkconv.c:861
+#: ../pidgin/gtkconv.c:830
 msgid "Invite Buddy Into Chat Room"
 msgstr "Inviter le contact dans une discussion"
 
 #. Put our happy label in it.
-#: ../pidgin/gtkconv.c:891
+#: ../pidgin/gtkconv.c:860
 msgid ""
 "Please enter the name of the user you wish to invite, along with an optional "
 "invite message."
@@ -12047,34 +12668,34 @@
 "Saisissez le nom de l'utilisateur que vous voulez inviter dans la "
 "discussion, ainsi qu'un message d'invitation facultatif."
 
-#: ../pidgin/gtkconv.c:912
+#: ../pidgin/gtkconv.c:881
 msgid "_Buddy:"
 msgstr "_Contact :"
 
-#: ../pidgin/gtkconv.c:932 ../pidgin/gtksavedstatuses.c:1142
-#: ../pidgin/gtksavedstatuses.c:1478
+#: ../pidgin/gtkconv.c:901 ../pidgin/gtksavedstatuses.c:1193
+#: ../pidgin/gtksavedstatuses.c:1525
 msgid "_Message:"
 msgstr "_Message :"
 
-#: ../pidgin/gtkconv.c:989 ../pidgin/gtkconv.c:2499 ../pidgin/gtkdebug.c:217
+#: ../pidgin/gtkconv.c:958 ../pidgin/gtkconv.c:2506 ../pidgin/gtkdebug.c:218
 #: ../pidgin/gtkft.c:542
 msgid "Unable to open file."
 msgstr "Impossible d'ouvrir le fichier."
 
-#: ../pidgin/gtkconv.c:995
+#: ../pidgin/gtkconv.c:964
 #, c-format
 msgid "<h1>Conversation with %s</h1>\n"
 msgstr "<h1>Conversation avec %s</h1>\n"
 
-#: ../pidgin/gtkconv.c:1031
+#: ../pidgin/gtkconv.c:1000
 msgid "Save Conversation"
 msgstr "Sauver la conversation"
 
-#: ../pidgin/gtkconv.c:1180 ../pidgin/gtkdebug.c:165 ../pidgin/gtkdebug.c:741
+#: ../pidgin/gtkconv.c:1149 ../pidgin/gtkdebug.c:166 ../pidgin/gtkdebug.c:742
 msgid "Find"
 msgstr "Chercher"
 
-#: ../pidgin/gtkconv.c:1206 ../pidgin/gtkdebug.c:193
+#: ../pidgin/gtkconv.c:1175 ../pidgin/gtkdebug.c:194
 msgid "_Search for:"
 msgstr "_Chercher : "
 
@@ -12107,357 +12728,381 @@
 msgid "Last said"
 msgstr "Dernières paroles"
 
-#: ../pidgin/gtkconv.c:2507
+#: ../pidgin/gtkconv.c:2514
 msgid "Unable to save icon file to disk."
 msgstr "Impossible de sauver l'icône sur le disque."
 
-#: ../pidgin/gtkconv.c:2558
+#: ../pidgin/gtkconv.c:2565
 msgid "Save Icon"
 msgstr "Enregistrer l'icône"
 
-#: ../pidgin/gtkconv.c:2610
+#: ../pidgin/gtkconv.c:2617
 msgid "Animate"
 msgstr "Animer"
 
-#: ../pidgin/gtkconv.c:2615
+#: ../pidgin/gtkconv.c:2622
 msgid "Hide Icon"
 msgstr "Cacher l'icône"
 
-#: ../pidgin/gtkconv.c:2618
+#: ../pidgin/gtkconv.c:2625
 msgid "Save Icon As..."
 msgstr "Enregistrer l'icône sous..."
 
-#: ../pidgin/gtkconv.c:2622
+#: ../pidgin/gtkconv.c:2629
 msgid "Set Custom Icon..."
 msgstr "Changer l'icône..."
 
-#: ../pidgin/gtkconv.c:2635
+#: ../pidgin/gtkconv.c:2642
 msgid "Remove Custom Icon"
 msgstr "Supprimer l'icône"
 
 #. Conversation menu
-#: ../pidgin/gtkconv.c:2777
+#: ../pidgin/gtkconv.c:2784
 msgid "/_Conversation"
 msgstr "/_Conversation"
 
-#: ../pidgin/gtkconv.c:2779
+#: ../pidgin/gtkconv.c:2786
 msgid "/Conversation/New Instant _Message..."
 msgstr "/Conversation/Envoyer un _message..."
 
-#: ../pidgin/gtkconv.c:2784
+#: ../pidgin/gtkconv.c:2791
 msgid "/Conversation/_Find..."
 msgstr "/Conversation/_Chercher..."
 
-#: ../pidgin/gtkconv.c:2786
+#: ../pidgin/gtkconv.c:2793
 msgid "/Conversation/View _Log"
 msgstr "/Conversation/_Voir les archives"
 
-#: ../pidgin/gtkconv.c:2787
+#: ../pidgin/gtkconv.c:2794
 msgid "/Conversation/_Save As..."
 msgstr "/Conversation/Enregistrer _sous..."
 
-#: ../pidgin/gtkconv.c:2789
-msgid "/Conversation/Clea_r Scrollback"
-msgstr "/Conversation/_Effacer la conversation"
-
-#: ../pidgin/gtkconv.c:2793
-msgid "/Conversation/Se_nd File..."
-msgstr "/Conversation/Envoyer un _fichier..."
-
-#: ../pidgin/gtkconv.c:2794
-msgid "/Conversation/Add Buddy _Pounce..."
-msgstr "/Conversation/Ajouter une _alerte..."
-
 #: ../pidgin/gtkconv.c:2796
+msgid "/Conversation/Clea_r Scrollback"
+msgstr "/Conversation/_Effacer la conversation"
+
+#: ../pidgin/gtkconv.c:2800
+msgid "/Conversation/Se_nd File..."
+msgstr "/Conversation/Envoyer un _fichier..."
+
+#: ../pidgin/gtkconv.c:2801
+msgid "/Conversation/Add Buddy _Pounce..."
+msgstr "/Conversation/Ajouter une _alerte..."
+
+#: ../pidgin/gtkconv.c:2803
 msgid "/Conversation/_Get Info"
 msgstr "/Conversation/Voir les _informations"
 
-#: ../pidgin/gtkconv.c:2798
+#: ../pidgin/gtkconv.c:2805
 msgid "/Conversation/In_vite..."
 msgstr "/Conversation/Invi_ter..."
 
-#: ../pidgin/gtkconv.c:2800
+#: ../pidgin/gtkconv.c:2807
 msgid "/Conversation/M_ore"
 msgstr "/Conversation/_Plus"
 
-#: ../pidgin/gtkconv.c:2804
+#: ../pidgin/gtkconv.c:2811
 msgid "/Conversation/Al_ias..."
 msgstr "/Conversation/_Donner un alias..."
 
-#: ../pidgin/gtkconv.c:2806
+#: ../pidgin/gtkconv.c:2813
 msgid "/Conversation/_Block..."
 msgstr "/Conversation/_Bloquer..."
 
-#: ../pidgin/gtkconv.c:2808
+#: ../pidgin/gtkconv.c:2815
 msgid "/Conversation/_Unblock..."
 msgstr "/Conversation/_Débloquer..."
 
-#: ../pidgin/gtkconv.c:2810
+#: ../pidgin/gtkconv.c:2817
 msgid "/Conversation/_Add..."
 msgstr "/Conversation/_Ajouter..."
 
-#: ../pidgin/gtkconv.c:2812
+#: ../pidgin/gtkconv.c:2819
 msgid "/Conversation/_Remove..."
 msgstr "/Conversation/_Supprimer..."
 
-#: ../pidgin/gtkconv.c:2817
+#: ../pidgin/gtkconv.c:2824
+msgid "/Conversation/Insert Lin_k..."
+msgstr "/Conversation/Insérer un _lien..."
+
+#: ../pidgin/gtkconv.c:2826
+msgid "/Conversation/Insert Imag_e..."
+msgstr "/Conversation/Insérer une ima_ge..."
+
+#: ../pidgin/gtkconv.c:2832
 msgid "/Conversation/_Close"
 msgstr "/Conversation/_Fermer"
 
 #. Options
-#: ../pidgin/gtkconv.c:2821
+#: ../pidgin/gtkconv.c:2836
 msgid "/_Options"
 msgstr "/_Options"
 
-#: ../pidgin/gtkconv.c:2822
+#: ../pidgin/gtkconv.c:2837
 msgid "/Options/Enable _Logging"
 msgstr "/Options/Activer l'_archivage"
 
-#: ../pidgin/gtkconv.c:2823
+#: ../pidgin/gtkconv.c:2838
 msgid "/Options/Enable _Sounds"
 msgstr "/Options/Activer les _sons"
 
-#: ../pidgin/gtkconv.c:2824
+#: ../pidgin/gtkconv.c:2839
 msgid "/Options/Show Buddy _Icon"
 msgstr "/Options/Afficher les _icônes des contacts"
 
-#: ../pidgin/gtkconv.c:2826
+#: ../pidgin/gtkconv.c:2841
 msgid "/Options/Show Formatting _Toolbars"
 msgstr "/Options/Afficher la _barre de style"
 
-#: ../pidgin/gtkconv.c:2827
+#: ../pidgin/gtkconv.c:2842
 msgid "/Options/Show Ti_mestamps"
 msgstr "/Options/Afficher l'_horodatage"
 
-#: ../pidgin/gtkconv.c:2902
+#: ../pidgin/gtkconv.c:2918
 msgid "/Conversation/More"
 msgstr "/Conversation/Plus"
 
+#: ../pidgin/gtkconv.c:3026
+msgid "/Options"
+msgstr "/Options"
+
 #. The menubar has been deactivated. Make sure the 'More' submenu is regenerated next time
 #. * the 'Conversation' menu pops up.
 #. Make sure the 'Conversation -> More' menuitems are regenerated whenever
 #. * the 'Conversation' menu pops up because the entries can change after the
 #. * conversation is created.
-#: ../pidgin/gtkconv.c:2947 ../pidgin/gtkconv.c:2979
+#: ../pidgin/gtkconv.c:3061 ../pidgin/gtkconv.c:3093
 msgid "/Conversation"
 msgstr "/Conversation"
 
-#: ../pidgin/gtkconv.c:2987
+#: ../pidgin/gtkconv.c:3101
 msgid "/Conversation/View Log"
 msgstr "/Conversation/Voir les archives"
 
-#: ../pidgin/gtkconv.c:2993
+#: ../pidgin/gtkconv.c:3107
 msgid "/Conversation/Send File..."
 msgstr "/Conversation/Envoyer un fichier..."
 
-#: ../pidgin/gtkconv.c:2997
+#: ../pidgin/gtkconv.c:3111
 msgid "/Conversation/Add Buddy Pounce..."
 msgstr "/Conversation/Ajouter une alerte..."
 
-#: ../pidgin/gtkconv.c:3003
+#: ../pidgin/gtkconv.c:3117
 msgid "/Conversation/Get Info"
 msgstr "/Conversation/Voir les informations"
 
-#: ../pidgin/gtkconv.c:3007
+#: ../pidgin/gtkconv.c:3121
 msgid "/Conversation/Invite..."
 msgstr "/Conversation/Inviter..."
 
-#: ../pidgin/gtkconv.c:3013
+#: ../pidgin/gtkconv.c:3127
 msgid "/Conversation/Alias..."
 msgstr "/Conversation/Donner un alias..."
 
-#: ../pidgin/gtkconv.c:3017
+#: ../pidgin/gtkconv.c:3131
 msgid "/Conversation/Block..."
 msgstr "/Conversation/Bloquer..."
 
-#: ../pidgin/gtkconv.c:3021
+#: ../pidgin/gtkconv.c:3135
 msgid "/Conversation/Unblock..."
 msgstr "/Conversation/Débloquer..."
 
-#: ../pidgin/gtkconv.c:3025
+#: ../pidgin/gtkconv.c:3139
 msgid "/Conversation/Add..."
 msgstr "/Conversation/Ajouter..."
 
-#: ../pidgin/gtkconv.c:3029
+#: ../pidgin/gtkconv.c:3143
 msgid "/Conversation/Remove..."
 msgstr "/Conversation/Supprimer..."
 
-#: ../pidgin/gtkconv.c:3033
+#: ../pidgin/gtkconv.c:3149
+msgid "/Conversation/Insert Link..."
+msgstr "/Conversation/Insérer un lien..."
+
+#: ../pidgin/gtkconv.c:3153
+msgid "/Conversation/Insert Image..."
+msgstr "/Conversation/Insérer une image..."
+
+#: ../pidgin/gtkconv.c:3159
 msgid "/Options/Enable Logging"
 msgstr "/Options/Activer l'archivage"
 
-#: ../pidgin/gtkconv.c:3036
+#: ../pidgin/gtkconv.c:3162
 msgid "/Options/Enable Sounds"
 msgstr "/Options/Activer les sons"
 
-#: ../pidgin/gtkconv.c:3049
+#: ../pidgin/gtkconv.c:3175
 msgid "/Options/Show Formatting Toolbars"
 msgstr "/Options/Afficher la barre de style"
 
-#: ../pidgin/gtkconv.c:3052
+#: ../pidgin/gtkconv.c:3178
 msgid "/Options/Show Timestamps"
 msgstr "/Options/Afficher l'horodatage"
 
-#: ../pidgin/gtkconv.c:3055
+#: ../pidgin/gtkconv.c:3181
 msgid "/Options/Show Buddy Icon"
 msgstr "/Options/Afficher l'icône des contacts"
 
-#: ../pidgin/gtkconv.c:3139 ../pidgin/gtkconv.c:3181
+#: ../pidgin/gtkconv.c:3265 ../pidgin/gtkconv.c:3307
 msgid "User is typing..."
 msgstr "L'utilisateur est en train d'écrire..."
 
-#: ../pidgin/gtkconv.c:3184
+#: ../pidgin/gtkconv.c:3310
 msgid "User has typed something and stopped"
 msgstr "L'utilisateur a écrit quelque chose et s'est arrêté"
 
 #. Build the Send To menu
-#: ../pidgin/gtkconv.c:3366
+#: ../pidgin/gtkconv.c:3492
 msgid "_Send To"
 msgstr "_Envoyer vers"
 
-#: ../pidgin/gtkconv.c:4080
+#: ../pidgin/gtkconv.c:4206
 msgid "_Send"
 msgstr "_Envoyer"
 
 #. Setup the label telling how many people are in the room.
-#: ../pidgin/gtkconv.c:4229
+#: ../pidgin/gtkconv.c:4310
 msgid "0 people in room"
 msgstr "Personne dans ce salon"
 
-#: ../pidgin/gtkconv.c:5421 ../pidgin/gtkconv.c:5542
+#: ../pidgin/gtkconv.c:5496 ../pidgin/gtkconv.c:5617
 #, c-format
 msgid "%d person in room"
 msgid_plural "%d people in room"
 msgstr[0] "%d personne dans le salon"
 msgstr[1] "%d personnes dans le salon"
 
-#: ../pidgin/gtkconv.c:6108 ../pidgin/gtkstatusbox.c:657
+#: ../pidgin/gtkconv.c:6216 ../pidgin/gtkstatusbox.c:659
 msgid "Typing"
 msgstr "En train d'écrire"
 
-#: ../pidgin/gtkconv.c:6114
+#: ../pidgin/gtkconv.c:6222
 msgid "Stopped Typing"
 msgstr "S'arrête d'écrire"
 
-#: ../pidgin/gtkconv.c:6119
+#: ../pidgin/gtkconv.c:6227
 msgid "Nick Said"
 msgstr "Votre pseudonyme apparaît"
 
-#: ../pidgin/gtkconv.c:6124 ../pidgin/gtkdocklet.c:492
+#: ../pidgin/gtkconv.c:6232 ../pidgin/gtkdocklet.c:492
 msgid "Unread Messages"
 msgstr "Messages non lus"
 
-#: ../pidgin/gtkconv.c:6129
+#: ../pidgin/gtkconv.c:6237
 msgid "New Event"
 msgstr "Nouvel évènement"
 
-#: ../pidgin/gtkconv.c:7258
+#: ../pidgin/gtkconv.c:7210
+msgid "clear: Clears all conversation scrollbacks."
+msgstr "clear : Effacer le contenu de la fenêtre de conversation."
+
+#: ../pidgin/gtkconv.c:7374
 msgid "Confirm close"
 msgstr "Confirmer la fermeture"
 
-#: ../pidgin/gtkconv.c:7290
+#: ../pidgin/gtkconv.c:7406
 msgid "You have unread messages. Are you sure you want to close the window?"
 msgstr ""
 "Vous n'avez pas lu certains messages. Êtes-vous sûr de vouloir fermer la "
 "fenêtre ?"
 
-#: ../pidgin/gtkconv.c:7807
+#: ../pidgin/gtkconv.c:7967
 msgid "Close other tabs"
 msgstr "Fermer les autres onglets"
 
-#: ../pidgin/gtkconv.c:7813
+#: ../pidgin/gtkconv.c:7973
 msgid "Close all tabs"
 msgstr "Fermer tous les onglets"
 
-#: ../pidgin/gtkconv.c:7821
+#: ../pidgin/gtkconv.c:7981
 msgid "Detach this tab"
 msgstr "Détacher cet onglet"
 
-#: ../pidgin/gtkconv.c:7827
+#: ../pidgin/gtkconv.c:7987
 msgid "Close this tab"
 msgstr "Fermer cet onglet"
 
-#: ../pidgin/gtkconv.c:8211
+#: ../pidgin/gtkconv.c:8433
 msgid "Close conversation"
 msgstr "Fermer la conversation"
 
-#: ../pidgin/gtkconv.c:8732
+#: ../pidgin/gtkconv.c:8957
 msgid "Last created window"
 msgstr "Dernière fenêtre ouverte"
 
-#: ../pidgin/gtkconv.c:8734
+#: ../pidgin/gtkconv.c:8959
 msgid "Separate IM and Chat windows"
 msgstr "Séparer les messages et les discussions"
 
-#: ../pidgin/gtkconv.c:8736 ../pidgin/gtkprefs.c:1303
+#: ../pidgin/gtkconv.c:8961 ../pidgin/gtkprefs.c:1410
 msgid "New window"
 msgstr "Nouvelle fenêtre"
 
-#: ../pidgin/gtkconv.c:8738
+#: ../pidgin/gtkconv.c:8963
 msgid "By group"
 msgstr "Par groupe"
 
-#: ../pidgin/gtkconv.c:8740
+#: ../pidgin/gtkconv.c:8965
 msgid "By account"
 msgstr "Par compte"
 
-#: ../pidgin/gtkdebug.c:232
+#: ../pidgin/gtkdebug.c:233
 msgid "Save Debug Log"
 msgstr "Enregistrer les archives de débuggage"
 
-#: ../pidgin/gtkdebug.c:580
+#: ../pidgin/gtkdebug.c:581
 msgid "Invert"
 msgstr "Inverser"
 
-#: ../pidgin/gtkdebug.c:583
+#: ../pidgin/gtkdebug.c:584
 msgid "Highlight matches"
 msgstr "Surligner les occurrences"
 
-#: ../pidgin/gtkdebug.c:650
+#: ../pidgin/gtkdebug.c:651
 msgid "_Icon Only"
 msgstr "_Icône seulement"
 
-#: ../pidgin/gtkdebug.c:651
+#: ../pidgin/gtkdebug.c:652
 msgid "_Text Only"
 msgstr "_Texte seulement"
 
-#: ../pidgin/gtkdebug.c:652
+#: ../pidgin/gtkdebug.c:653
 msgid "_Both Icon & Text"
 msgstr "À la fois texte _et icône"
 
-#: ../pidgin/gtkdebug.c:773
+#: ../pidgin/gtkdebug.c:774
 msgid "Filter"
 msgstr "Filtre"
 
-#: ../pidgin/gtkdebug.c:792
+#: ../pidgin/gtkdebug.c:793
 msgid "Right click for more options."
 msgstr "Clic droit pour afficher plus d'options."
 
-#: ../pidgin/gtkdebug.c:822
+#: ../pidgin/gtkdebug.c:823
 msgid "Level "
 msgstr "Niveau "
 
-#: ../pidgin/gtkdebug.c:823 ../pidgin/gtkdebug.c:829
+#: ../pidgin/gtkdebug.c:824 ../pidgin/gtkdebug.c:830
 msgid "Select the debug filter level."
 msgstr "Choisissez le niveau de filtre de débuggage."
 
-#: ../pidgin/gtkdebug.c:831
-msgid "All"
-msgstr "Tout"
-
 #: ../pidgin/gtkdebug.c:832
+msgid "All"
+msgstr "Tout"
+
+#: ../pidgin/gtkdebug.c:833
 msgid "Misc"
 msgstr "Divers"
 
-#: ../pidgin/gtkdebug.c:834
+#: ../pidgin/gtkdebug.c:835
 msgid "Warning"
 msgstr "Avertissement"
 
-#: ../pidgin/gtkdebug.c:835
+#: ../pidgin/gtkdebug.c:836
 msgid "Error "
 msgstr "Erreur "
 
-#: ../pidgin/gtkdebug.c:836
+#: ../pidgin/gtkdebug.c:837
 msgid "Fatal Error"
 msgstr "Erreur critique"
 
@@ -12471,8 +13116,8 @@
 #: ../pidgin/gtkdialogs.c:79 ../pidgin/gtkdialogs.c:80
 #: ../pidgin/gtkdialogs.c:81 ../pidgin/gtkdialogs.c:82
 #: ../pidgin/gtkdialogs.c:83 ../pidgin/gtkdialogs.c:84
-#: ../pidgin/gtkdialogs.c:87 ../pidgin/gtkdialogs.c:88
-#: ../pidgin/gtkdialogs.c:89
+#: ../pidgin/gtkdialogs.c:85 ../pidgin/gtkdialogs.c:88
+#: ../pidgin/gtkdialogs.c:89 ../pidgin/gtkdialogs.c:90
 msgid "developer"
 msgstr "codeur"
 
@@ -12480,11 +13125,11 @@
 msgid "developer & webmaster"
 msgstr "codeur et webmestre"
 
-#: ../pidgin/gtkdialogs.c:85
+#: ../pidgin/gtkdialogs.c:86
 msgid "support"
 msgstr "support"
 
-#: ../pidgin/gtkdialogs.c:86
+#: ../pidgin/gtkdialogs.c:87
 msgid "support/QA"
 msgstr "support/QA"
 
@@ -12522,7 +13167,7 @@
 msgstr "Arabe"
 
 #: ../pidgin/gtkdialogs.c:125 ../pidgin/gtkdialogs.c:126
-#: ../pidgin/gtkdialogs.c:209
+#: ../pidgin/gtkdialogs.c:213
 msgid "Bulgarian"
 msgstr "Bulgare"
 
@@ -12535,8 +13180,8 @@
 msgid "Bosnian"
 msgstr "Bosnien"
 
-#: ../pidgin/gtkdialogs.c:132 ../pidgin/gtkdialogs.c:210
-#: ../pidgin/gtkdialogs.c:211
+#: ../pidgin/gtkdialogs.c:132 ../pidgin/gtkdialogs.c:214
+#: ../pidgin/gtkdialogs.c:215
 msgid "Catalan"
 msgstr "Catalan"
 
@@ -12544,7 +13189,7 @@
 msgid "Valencian-Catalan"
 msgstr "Valencien-Catalan"
 
-#: ../pidgin/gtkdialogs.c:135 ../pidgin/gtkdialogs.c:212
+#: ../pidgin/gtkdialogs.c:135 ../pidgin/gtkdialogs.c:216
 msgid "Czech"
 msgstr "Tchèque"
 
@@ -12553,7 +13198,7 @@
 msgstr "Danois"
 
 #: ../pidgin/gtkdialogs.c:138 ../pidgin/gtkdialogs.c:139
-#: ../pidgin/gtkdialogs.c:213
+#: ../pidgin/gtkdialogs.c:217
 msgid "German"
 msgstr "Allemand"
 
@@ -12582,9 +13227,9 @@
 msgid "Esperanto"
 msgstr "Espéranto"
 
-#: ../pidgin/gtkdialogs.c:149 ../pidgin/gtkdialogs.c:214
-#: ../pidgin/gtkdialogs.c:215 ../pidgin/gtkdialogs.c:216
-#: ../pidgin/gtkdialogs.c:217
+#: ../pidgin/gtkdialogs.c:149 ../pidgin/gtkdialogs.c:218
+#: ../pidgin/gtkdialogs.c:219 ../pidgin/gtkdialogs.c:220
+#: ../pidgin/gtkdialogs.c:221
 msgid "Spanish"
 msgstr "Espagnol"
 
@@ -12597,199 +13242,206 @@
 msgid "Persian"
 msgstr "Persan"
 
-#: ../pidgin/gtkdialogs.c:155 ../pidgin/gtkdialogs.c:218
-#: ../pidgin/gtkdialogs.c:219
+#: ../pidgin/gtkdialogs.c:155 ../pidgin/gtkdialogs.c:222
+#: ../pidgin/gtkdialogs.c:223
 msgid "Finnish"
 msgstr "Finnois"
 
-#: ../pidgin/gtkdialogs.c:156 ../pidgin/gtkdialogs.c:220
-#: ../pidgin/gtkdialogs.c:221 ../pidgin/gtkdialogs.c:222
-#: ../pidgin/gtkdialogs.c:223
+#: ../pidgin/gtkdialogs.c:156 ../pidgin/gtkdialogs.c:224
+#: ../pidgin/gtkdialogs.c:225 ../pidgin/gtkdialogs.c:226
+#: ../pidgin/gtkdialogs.c:227
 msgid "French"
 msgstr "Français"
 
-#: ../pidgin/gtkdialogs.c:157
+#: ../pidgin/gtkdialogs.c:157 ../pidgin/gtkdialogs.c:158
 msgid "Galician"
 msgstr "Galicien"
 
-#: ../pidgin/gtkdialogs.c:158 ../pidgin/gtkdialogs.c:159
+#: ../pidgin/gtkdialogs.c:159 ../pidgin/gtkdialogs.c:160
 msgid "Gujarati"
 msgstr "Gujarâtî"
 
-#: ../pidgin/gtkdialogs.c:159
+#: ../pidgin/gtkdialogs.c:160
 msgid "Gujarati Language Team"
 msgstr "Équipe du langage gujarâtî"
 
-#: ../pidgin/gtkdialogs.c:160 ../pidgin/gtkdialogs.c:224
+#: ../pidgin/gtkdialogs.c:161 ../pidgin/gtkdialogs.c:228
 msgid "Hebrew"
 msgstr "Hébreu"
 
-#: ../pidgin/gtkdialogs.c:161
+#: ../pidgin/gtkdialogs.c:162
 msgid "Hindi"
 msgstr "Hindi"
 
-#: ../pidgin/gtkdialogs.c:162
+#: ../pidgin/gtkdialogs.c:163
 msgid "Hungarian"
 msgstr "Hongrois"
 
-#: ../pidgin/gtkdialogs.c:163
+#: ../pidgin/gtkdialogs.c:164
 msgid "Indonesian"
 msgstr "Indonésien"
 
-#: ../pidgin/gtkdialogs.c:164 ../pidgin/gtkdialogs.c:225
+#: ../pidgin/gtkdialogs.c:165 ../pidgin/gtkdialogs.c:229
 msgid "Italian"
 msgstr "Italien"
 
-#: ../pidgin/gtkdialogs.c:165 ../pidgin/gtkdialogs.c:226
-#: ../pidgin/gtkdialogs.c:227 ../pidgin/gtkdialogs.c:228
+#: ../pidgin/gtkdialogs.c:166 ../pidgin/gtkdialogs.c:230
+#: ../pidgin/gtkdialogs.c:231 ../pidgin/gtkdialogs.c:232
 msgid "Japanese"
 msgstr "Japonais"
 
-#: ../pidgin/gtkdialogs.c:166 ../pidgin/gtkdialogs.c:229
+#: ../pidgin/gtkdialogs.c:167 ../pidgin/gtkdialogs.c:233
 msgid "Georgian"
 msgstr "Géorgien"
 
-#: ../pidgin/gtkdialogs.c:166
+#: ../pidgin/gtkdialogs.c:167
 msgid "Ubuntu Georgian Translators"
 msgstr "Traducteurs géorgiens d'Ubuntu"
 
-#: ../pidgin/gtkdialogs.c:167
+#: ../pidgin/gtkdialogs.c:168
 msgid "Kannada"
 msgstr "Kannara"
 
-#: ../pidgin/gtkdialogs.c:167
+#: ../pidgin/gtkdialogs.c:168
 msgid "Kannada Translation team"
 msgstr "Équipe de traduction kannara"
 
-#: ../pidgin/gtkdialogs.c:168 ../pidgin/gtkdialogs.c:230
+#: ../pidgin/gtkdialogs.c:169 ../pidgin/gtkdialogs.c:234
+#: ../pidgin/gtkdialogs.c:235
 msgid "Korean"
 msgstr "Coréen"
 
-#: ../pidgin/gtkdialogs.c:169 ../pidgin/gtkdialogs.c:170
-#: ../pidgin/gtkdialogs.c:171
+#: ../pidgin/gtkdialogs.c:170 ../pidgin/gtkdialogs.c:171
+#: ../pidgin/gtkdialogs.c:172
 msgid "Kurdish"
 msgstr "Kurde"
 
-#: ../pidgin/gtkdialogs.c:172 ../pidgin/gtkdialogs.c:231
-#: ../pidgin/gtkdialogs.c:232
+#: ../pidgin/gtkdialogs.c:173 ../pidgin/gtkdialogs.c:236
+#: ../pidgin/gtkdialogs.c:237
 msgid "Lithuanian"
 msgstr "Lituanien"
 
-#: ../pidgin/gtkdialogs.c:173
+#: ../pidgin/gtkdialogs.c:174 ../pidgin/gtkdialogs.c:175
+#: ../pidgin/gtkdialogs.c:238
 msgid "Macedonian"
 msgstr "Macédonien"
 
-#: ../pidgin/gtkdialogs.c:174
+#: ../pidgin/gtkdialogs.c:176
 msgid "Bokmål Norwegian"
 msgstr "Norvégien bokmål"
 
-#: ../pidgin/gtkdialogs.c:175
+#: ../pidgin/gtkdialogs.c:177
 msgid "Nepali"
 msgstr "Népalais"
 
-#: ../pidgin/gtkdialogs.c:176
+#: ../pidgin/gtkdialogs.c:178
 msgid "Dutch, Flemish"
 msgstr "Hollandais, flamand"
 
-#: ../pidgin/gtkdialogs.c:177
+#: ../pidgin/gtkdialogs.c:179
 msgid "Norwegian"
 msgstr "Norvégien"
 
-#: ../pidgin/gtkdialogs.c:178 ../pidgin/gtkdialogs.c:179
-#: ../pidgin/gtkdialogs.c:180 ../pidgin/gtkdialogs.c:233
+#: ../pidgin/gtkdialogs.c:180
+msgid "Norwegian Nynorsk"
+msgstr "Norvégien (nynorsk)"
+
+#: ../pidgin/gtkdialogs.c:181 ../pidgin/gtkdialogs.c:182
+#: ../pidgin/gtkdialogs.c:183 ../pidgin/gtkdialogs.c:239
 msgid "Polish"
 msgstr "Polonais"
 
-#: ../pidgin/gtkdialogs.c:181
-msgid "Portuguese"
-msgstr "Portugais"
-
-#: ../pidgin/gtkdialogs.c:182
-msgid "Portuguese-Brazil"
-msgstr "Portugais brésilien"
-
-#: ../pidgin/gtkdialogs.c:183
-msgid "Pashto"
-msgstr "Pachto"
-
 #: ../pidgin/gtkdialogs.c:184
+msgid "Portuguese"
+msgstr "Portugais"
+
+#: ../pidgin/gtkdialogs.c:185
+msgid "Portuguese-Brazil"
+msgstr "Portugais brésilien"
+
+#: ../pidgin/gtkdialogs.c:186
+msgid "Pashto"
+msgstr "Pachto"
+
+#: ../pidgin/gtkdialogs.c:187
 msgid "Romanian"
 msgstr "Roumain"
 
-#: ../pidgin/gtkdialogs.c:185 ../pidgin/gtkdialogs.c:234
-#: ../pidgin/gtkdialogs.c:235
+#: ../pidgin/gtkdialogs.c:188 ../pidgin/gtkdialogs.c:240
+#: ../pidgin/gtkdialogs.c:241
 msgid "Russian"
 msgstr "Russe"
 
-#: ../pidgin/gtkdialogs.c:186 ../pidgin/gtkdialogs.c:187
-#: ../pidgin/gtkdialogs.c:236 ../pidgin/gtkdialogs.c:237
-#: ../pidgin/gtkdialogs.c:238
+#: ../pidgin/gtkdialogs.c:189 ../pidgin/gtkdialogs.c:190
+#: ../pidgin/gtkdialogs.c:242 ../pidgin/gtkdialogs.c:243
+#: ../pidgin/gtkdialogs.c:244
 msgid "Slovak"
 msgstr "Slovaque"
 
-#: ../pidgin/gtkdialogs.c:188 ../pidgin/gtkdialogs.c:239
+#: ../pidgin/gtkdialogs.c:191 ../pidgin/gtkdialogs.c:245
 msgid "Slovenian"
 msgstr "Slovène"
 
-#: ../pidgin/gtkdialogs.c:189
+#: ../pidgin/gtkdialogs.c:192
 msgid "Albanian"
 msgstr "Albanais"
 
-#: ../pidgin/gtkdialogs.c:190 ../pidgin/gtkdialogs.c:191
+#: ../pidgin/gtkdialogs.c:193 ../pidgin/gtkdialogs.c:194
 msgid "Serbian"
 msgstr "Serbe"
 
-#: ../pidgin/gtkdialogs.c:192 ../pidgin/gtkdialogs.c:240
+#: ../pidgin/gtkdialogs.c:195 ../pidgin/gtkdialogs.c:246
 msgid "Swedish"
 msgstr "Suédois"
 
-#: ../pidgin/gtkdialogs.c:193
+#: ../pidgin/gtkdialogs.c:196
 msgid "Tamil"
 msgstr "Tamoul"
 
-#: ../pidgin/gtkdialogs.c:194
+#: ../pidgin/gtkdialogs.c:197
 msgid "Telugu"
 msgstr "Télougou"
 
-#: ../pidgin/gtkdialogs.c:195
+#: ../pidgin/gtkdialogs.c:198
 msgid "Thai"
 msgstr "Thaï"
 
-#: ../pidgin/gtkdialogs.c:196
+#: ../pidgin/gtkdialogs.c:199 ../pidgin/gtkdialogs.c:247
 msgid "Turkish"
 msgstr "Turc"
 
-#: ../pidgin/gtkdialogs.c:197
+#: ../pidgin/gtkdialogs.c:200
 msgid "Vietnamese"
 msgstr "Vietnamien"
 
-#: ../pidgin/gtkdialogs.c:197
+#: ../pidgin/gtkdialogs.c:200
 msgid "T.M.Thanh and the Gnome-Vi Team"
 msgstr "T.M.Thanh et l'équipe Gnome-Vi"
 
-#: ../pidgin/gtkdialogs.c:198 ../pidgin/gtkdialogs.c:241
+#: ../pidgin/gtkdialogs.c:201 ../pidgin/gtkdialogs.c:248
 msgid "Simplified Chinese"
 msgstr "Chinois simplifié"
 
-#: ../pidgin/gtkdialogs.c:199 ../pidgin/gtkdialogs.c:200
+#: ../pidgin/gtkdialogs.c:202 ../pidgin/gtkdialogs.c:203
+#: ../pidgin/gtkdialogs.c:204
 msgid "Hong Kong Chinese"
 msgstr "Chinois de Hong-Kong"
 
-#: ../pidgin/gtkdialogs.c:201 ../pidgin/gtkdialogs.c:202
-#: ../pidgin/gtkdialogs.c:242
+#: ../pidgin/gtkdialogs.c:205 ../pidgin/gtkdialogs.c:206
+#: ../pidgin/gtkdialogs.c:249
 msgid "Traditional Chinese"
 msgstr "Chinois traditionnel"
 
-#: ../pidgin/gtkdialogs.c:208
+#: ../pidgin/gtkdialogs.c:212
 msgid "Amharic"
 msgstr "Amharique"
 
-#: ../pidgin/gtkdialogs.c:327
+#: ../pidgin/gtkdialogs.c:334
 #, c-format
 msgid "About %s"
 msgstr "À propos de %s"
 
-#: ../pidgin/gtkdialogs.c:365
+#: ../pidgin/gtkdialogs.c:372
 #, c-format
 msgid ""
 "%s is a graphical modular messaging client based on libpurple which is "
@@ -12802,57 +13454,52 @@
 "contributors.  We provide no warranty for this program.<BR><BR>"
 msgstr ""
 "%s est un client graphique de messagerie modulaire basé sur libpurple "
-"compatible avec AIM, MSN, Yahoo!, XMPP, ICQ, IRC, SILC, SIP/SIMPLE, "
-"Novell GroupWise, Lotus Sametime, Bonjour, Zephyr, Gadu-Gadu et QQ. "
-"Il est écrit avec Gtk+.<BR><BR>Vous pouvez modifier et redistribuer ce "
-"programme sous les conditions énoncées par la licence GNU GPL (version 2 "
-"ou ultérieure). Une copie de la licence GPL est dans le fichier « COPYING » "
-"fourni avec %s. Tous droits réservés par les collaborateurs de %s. Consultez "
-"le fichier « COPYRIGHT » pour avoir la liste complète des collaborateurs. "
-"Aucune garantie n'est fournie pour l'utilisation de ce programme.<BR><BR>"
-
-#: ../pidgin/gtkdialogs.c:381
-msgid "<FONT SIZE=\"4\">IRC:</FONT> #pidgin-win32 on irc.freenode.net<BR><BR>"
-msgstr ""
-"<FONT SIZE=\"4\">IRC :</FONT> #pidgin-win32 sur irc.freenode.net<BR><BR>"
-
-#: ../pidgin/gtkdialogs.c:384
+"compatible avec AIM, MSN, Yahoo!, XMPP, ICQ, IRC, SILC, SIP/SIMPLE, Novell "
+"GroupWise, Lotus Sametime, Bonjour, Zephyr, Gadu-Gadu et QQ. Il est écrit "
+"avec Gtk+.<BR><BR>Vous pouvez modifier et redistribuer ce programme sous les "
+"conditions énoncées par la licence GNU GPL (version 2 ou ultérieure). Une "
+"copie de la licence GPL est dans le fichier « COPYING » fourni avec %s. Tous "
+"droits réservés par les collaborateurs de %s. Consultez le fichier "
+"« COPYRIGHT » pour avoir la liste complète des collaborateurs. Aucune "
+"garantie n'est fournie pour l'utilisation de ce programme.<BR><BR>"
+
+#: ../pidgin/gtkdialogs.c:387
 msgid "<FONT SIZE=\"4\">IRC:</FONT> #pidgin on irc.freenode.net<BR><BR>"
 msgstr "<FONT SIZE=\"4\">IRC :</FONT> #pidgin sur irc.freenode.net<BR><BR>"
 
-#: ../pidgin/gtkdialogs.c:390
+#: ../pidgin/gtkdialogs.c:392
 msgid "Current Developers"
 msgstr "Codeurs"
 
-#: ../pidgin/gtkdialogs.c:405
+#: ../pidgin/gtkdialogs.c:407
 msgid "Crazy Patch Writers"
 msgstr "Patcheurs fous"
 
-#: ../pidgin/gtkdialogs.c:420
+#: ../pidgin/gtkdialogs.c:422
 msgid "Retired Developers"
 msgstr "Codeurs retraités"
 
-#: ../pidgin/gtkdialogs.c:435
+#: ../pidgin/gtkdialogs.c:437
 msgid "Artists"
 msgstr "Artistes"
 
-#: ../pidgin/gtkdialogs.c:450
+#: ../pidgin/gtkdialogs.c:452
 msgid "Current Translators"
 msgstr "Traducteurs"
 
-#: ../pidgin/gtkdialogs.c:470
+#: ../pidgin/gtkdialogs.c:472
 msgid "Past Translators"
 msgstr "Anciens traducteurs"
 
-#: ../pidgin/gtkdialogs.c:488
+#: ../pidgin/gtkdialogs.c:490
 msgid "Debugging Information"
 msgstr "Informations de debug"
 
-#: ../pidgin/gtkdialogs.c:857
+#: ../pidgin/gtkdialogs.c:859
 msgid "Get User Info"
 msgstr "Informations utilisateur"
 
-#: ../pidgin/gtkdialogs.c:859
+#: ../pidgin/gtkdialogs.c:861
 msgid ""
 "Please enter the screen name or alias of the person whose info you would "
 "like to view."
@@ -12860,11 +13507,11 @@
 "Saisissez le nom d'utilisateur ou l'alias de la personne dont vous voulez "
 "les informations."
 
-#: ../pidgin/gtkdialogs.c:949
+#: ../pidgin/gtkdialogs.c:951
 msgid "View User Log"
 msgstr "Voir les archives d'un contact"
 
-#: ../pidgin/gtkdialogs.c:951
+#: ../pidgin/gtkdialogs.c:953
 msgid ""
 "Please enter the screen name or alias of the person whose log you would like "
 "to view."
@@ -12872,32 +13519,32 @@
 "Saisissez le nom d'utilisateur ou l'alias de la personne dont vous voulez "
 "les archives."
 
-#: ../pidgin/gtkdialogs.c:971
+#: ../pidgin/gtkdialogs.c:973
 msgid "Alias Contact"
 msgstr "Donner un alias à un contact"
 
-#: ../pidgin/gtkdialogs.c:972
+#: ../pidgin/gtkdialogs.c:974
 msgid "Enter an alias for this contact."
 msgstr "Saisissez un alias pour ce contact"
 
-#: ../pidgin/gtkdialogs.c:994
+#: ../pidgin/gtkdialogs.c:996
 #, c-format
 msgid "Enter an alias for %s."
 msgstr "Saisissez un alias pour %s"
 
-#: ../pidgin/gtkdialogs.c:996
+#: ../pidgin/gtkdialogs.c:998
 msgid "Alias Buddy"
 msgstr "Donner un alias"
 
-#: ../pidgin/gtkdialogs.c:1017
+#: ../pidgin/gtkdialogs.c:1019
 msgid "Alias Chat"
 msgstr "Donner un alias à un salon de discussions"
 
-#: ../pidgin/gtkdialogs.c:1018
+#: ../pidgin/gtkdialogs.c:1020
 msgid "Enter an alias for this chat."
 msgstr "Saisissez un alias pour cette discussion"
 
-#: ../pidgin/gtkdialogs.c:1057
+#: ../pidgin/gtkdialogs.c:1059
 #, c-format
 msgid ""
 "You are about to remove the contact containing %s and %d other buddy from "
@@ -12912,15 +13559,15 @@
 "Vous allez supprimer le contact contenant %s et %d autres identifiants de "
 "votre liste de contacts. Voulez-vous continuer ?"
 
-#: ../pidgin/gtkdialogs.c:1065
+#: ../pidgin/gtkdialogs.c:1067
 msgid "Remove Contact"
 msgstr "Supprimer un contact"
 
-#: ../pidgin/gtkdialogs.c:1068
+#: ../pidgin/gtkdialogs.c:1070
 msgid "_Remove Contact"
 msgstr "_Supprimer le contact"
 
-#: ../pidgin/gtkdialogs.c:1099
+#: ../pidgin/gtkdialogs.c:1101
 #, c-format
 msgid ""
 "You are about to merge the group called %s into the group called %s. Do you "
@@ -12928,15 +13575,15 @@
 msgstr ""
 "Vous allez fusionner le groupe %s au groupe %s. Voulez-vous continuer ?"
 
-#: ../pidgin/gtkdialogs.c:1106
+#: ../pidgin/gtkdialogs.c:1108
 msgid "Merge Groups"
 msgstr "Fusionner des groupes"
 
-#: ../pidgin/gtkdialogs.c:1109
+#: ../pidgin/gtkdialogs.c:1111
 msgid "_Merge Groups"
 msgstr "_Fusionner les groupes"
 
-#: ../pidgin/gtkdialogs.c:1159
+#: ../pidgin/gtkdialogs.c:1161
 #, c-format
 msgid ""
 "You are about to remove the group %s and all its members from your buddy "
@@ -12945,30 +13592,30 @@
 "Vous allez supprimer le groupe %s et tous ses membres de votre liste de "
 "contacts. Voulez-vous continuer ?"
 
-#: ../pidgin/gtkdialogs.c:1162
+#: ../pidgin/gtkdialogs.c:1164
 msgid "Remove Group"
 msgstr "Supprimer un groupe"
 
-#: ../pidgin/gtkdialogs.c:1165
+#: ../pidgin/gtkdialogs.c:1167
 msgid "_Remove Group"
 msgstr "_Supprimer le groupe"
 
-#: ../pidgin/gtkdialogs.c:1198
+#: ../pidgin/gtkdialogs.c:1200
 #, c-format
 msgid ""
 "You are about to remove %s from your buddy list.  Do you want to continue?"
 msgstr ""
 "Vous allez supprimer %s de votre liste de contacts. Voulez-vous continuer ?"
 
-#: ../pidgin/gtkdialogs.c:1201
+#: ../pidgin/gtkdialogs.c:1203
 msgid "Remove Buddy"
 msgstr "Supprimer un contact"
 
-#: ../pidgin/gtkdialogs.c:1204
+#: ../pidgin/gtkdialogs.c:1206
 msgid "_Remove Buddy"
 msgstr "_Supprimer le contact"
 
-#: ../pidgin/gtkdialogs.c:1225
+#: ../pidgin/gtkdialogs.c:1227
 #, c-format
 msgid ""
 "You are about to remove the chat %s from your buddy list.  Do you want to "
@@ -12977,11 +13624,11 @@
 "Vous allez supprimer le salon de discussions %s de votre liste de contacts. "
 "Voulez-vous continuer ?"
 
-#: ../pidgin/gtkdialogs.c:1228
+#: ../pidgin/gtkdialogs.c:1230
 msgid "Remove Chat"
 msgstr "Supprimer un salon de discussions"
 
-#: ../pidgin/gtkdialogs.c:1231
+#: ../pidgin/gtkdialogs.c:1233
 msgid "_Remove Chat"
 msgstr "_Supprimer le salon"
 
@@ -13076,67 +13723,67 @@
 msgid "Time Remaining:"
 msgstr "Temps restant :"
 
-#: ../pidgin/gtkft.c:786
+#: ../pidgin/gtkft.c:783
 msgid "Close this window when all transfers _finish"
 msgstr "Fermer cette fenêtre quand tous les transferts sont _terminés"
 
-#: ../pidgin/gtkft.c:796
+#: ../pidgin/gtkft.c:793
 msgid "C_lear finished transfers"
 msgstr "_Effacer les transferts terminés"
 
 #. "Download Details" arrow
-#: ../pidgin/gtkft.c:805
+#: ../pidgin/gtkft.c:802
 msgid "File transfer _details"
 msgstr "_Détails du transfert"
 
 #. Pause button
-#: ../pidgin/gtkft.c:835 ../pidgin/pidginstock.c:89
+#: ../pidgin/gtkft.c:832 ../pidgin/pidginstock.c:89
 msgid "_Pause"
 msgstr "_Pause"
 
 #. Resume button
-#: ../pidgin/gtkft.c:845
+#: ../pidgin/gtkft.c:842
 msgid "_Resume"
 msgstr "_Reprise"
 
-#: ../pidgin/gtkimhtml.c:792
+#: ../pidgin/gtkimhtml.c:795
 msgid "Paste as Plain _Text"
 msgstr "Coller comme _texte seulement"
 
-#: ../pidgin/gtkimhtml.c:809
+#: ../pidgin/gtkimhtml.c:812
 msgid "_Reset formatting"
 msgstr "_Effacer le style"
 
-#: ../pidgin/gtkimhtml.c:1295
+#: ../pidgin/gtkimhtml.c:1349
 msgid "Hyperlink color"
 msgstr "Couleur des liens hypertextes"
 
-#: ../pidgin/gtkimhtml.c:1296
+#: ../pidgin/gtkimhtml.c:1350
 msgid "Color to draw hyperlinks."
 msgstr "Couleur pour afficher les liens hypertextes"
 
-#: ../pidgin/gtkimhtml.c:1299
+#: ../pidgin/gtkimhtml.c:1353
 msgid "Hyperlink prelight color"
 msgstr "Couleur de surlignage des liens hypertextes"
 
-#: ../pidgin/gtkimhtml.c:1300
+#: ../pidgin/gtkimhtml.c:1354
 msgid "Color to draw hyperlinks when mouse is over them."
 msgstr ""
 "Couleur pour afficher les liens hypertextes quand la souris les survole."
 
-#: ../pidgin/gtkimhtml.c:1516
+#: ../pidgin/gtkimhtml.c:1575
 msgid "_Copy E-Mail Address"
 msgstr "_Copier l'adresse électronique"
 
-#: ../pidgin/gtkimhtml.c:1528
+#: ../pidgin/gtkimhtml.c:1587
 msgid "_Open Link in Browser"
 msgstr "_Ouvrir le lien"
 
-#: ../pidgin/gtkimhtml.c:1538
+#: ../pidgin/gtkimhtml.c:1597
 msgid "_Copy Link Location"
 msgstr "_Copier l'adresse du lien"
 
-#: ../pidgin/gtkimhtml.c:3211
+#: ../pidgin/gtkimhtml.c:3341
 msgid ""
 "<span size='larger' weight='bold'>Unrecognized file type</span>\n"
 "\n"
@@ -13146,7 +13793,7 @@
 "\n"
 "PNG choisi par défaut"
 
-#: ../pidgin/gtkimhtml.c:3214
+#: ../pidgin/gtkimhtml.c:3344
 msgid ""
 "Unrecognized file type\n"
 "\n"
@@ -13156,7 +13803,7 @@
 "\n"
 "Le type PNG est utilisé par défaut."
 
-#: ../pidgin/gtkimhtml.c:3227
+#: ../pidgin/gtkimhtml.c:3373
 #, c-format
 msgid ""
 "<span size='larger' weight='bold'>Error saving image</span>\n"
@@ -13167,7 +13814,7 @@
 "\n"
 "%s"
 
-#: ../pidgin/gtkimhtml.c:3230
+#: ../pidgin/gtkimhtml.c:3376
 #, c-format
 msgid ""
 "Error saving image\n"
@@ -13178,35 +13825,35 @@
 "\n"
 "%s"
 
-#: ../pidgin/gtkimhtml.c:3310 ../pidgin/gtkimhtml.c:3322
+#: ../pidgin/gtkimhtml.c:3454 ../pidgin/gtkimhtml.c:3466
 msgid "Save Image"
 msgstr "Enregistrer l'image"
 
-#: ../pidgin/gtkimhtml.c:3350
+#: ../pidgin/gtkimhtml.c:3494
 msgid "_Save Image..."
 msgstr "Enregi_strer l'image..."
 
-#: ../pidgin/gtkimhtmltoolbar.c:147
+#: ../pidgin/gtkimhtmltoolbar.c:153
 msgid "Select Font"
 msgstr "Changer la police"
 
-#: ../pidgin/gtkimhtmltoolbar.c:226
+#: ../pidgin/gtkimhtmltoolbar.c:232
 msgid "Select Text Color"
 msgstr "Changer la couleur du texte"
 
-#: ../pidgin/gtkimhtmltoolbar.c:305
+#: ../pidgin/gtkimhtmltoolbar.c:311
 msgid "Select Background Color"
 msgstr "Changer la couleur du fond"
 
-#: ../pidgin/gtkimhtmltoolbar.c:394
+#: ../pidgin/gtkimhtmltoolbar.c:400
 msgid "_URL"
 msgstr "_URL"
 
-#: ../pidgin/gtkimhtmltoolbar.c:402
+#: ../pidgin/gtkimhtmltoolbar.c:408
 msgid "_Description"
 msgstr "_Description"
 
-#: ../pidgin/gtkimhtmltoolbar.c:405
+#: ../pidgin/gtkimhtmltoolbar.c:411
 msgid ""
 "Please enter the URL and description of the link that you want to insert. "
 "The description is optional."
@@ -13214,85 +13861,93 @@
 "Saisissez l'URL et la description du lien à inclure. La description est "
 "facultative."
 
-#: ../pidgin/gtkimhtmltoolbar.c:409
+#: ../pidgin/gtkimhtmltoolbar.c:415
 msgid "Please enter the URL of the link that you want to insert."
 msgstr "Saisissez l'URL du lien à insérer."
 
-#: ../pidgin/gtkimhtmltoolbar.c:414
+#: ../pidgin/gtkimhtmltoolbar.c:420
 msgid "Insert Link"
 msgstr "Insérer un lien"
 
-#: ../pidgin/gtkimhtmltoolbar.c:418
+#: ../pidgin/gtkimhtmltoolbar.c:424 ../pidgin/gtkimhtmltoolbar.c:1155
 msgid "_Insert"
 msgstr "_Insérer"
 
-#: ../pidgin/gtkimhtmltoolbar.c:487
+#: ../pidgin/gtkimhtmltoolbar.c:493
 #, c-format
 msgid "Failed to store image: %s\n"
 msgstr "Impossible de sauver l'image : %s\n"
 
-#: ../pidgin/gtkimhtmltoolbar.c:513 ../pidgin/gtkimhtmltoolbar.c:523
+#: ../pidgin/gtkimhtmltoolbar.c:519 ../pidgin/gtkimhtmltoolbar.c:529
 msgid "Insert Image"
 msgstr "Insérer une image"
 
-#: ../pidgin/gtkimhtmltoolbar.c:721
+#: ../pidgin/gtkimhtmltoolbar.c:740
 msgid "This theme has no available smileys."
 msgstr "Ce thème n'a pas de frimousses."
 
 #. show everything
-#: ../pidgin/gtkimhtmltoolbar.c:735
+#: ../pidgin/gtkimhtmltoolbar.c:757
 msgid "Smile!"
 msgstr "Souriez !"
 
-#: ../pidgin/gtkimhtmltoolbar.c:922 ../pidgin/plugins/convcolors.c:287
-msgid "Bold"
-msgstr "Gras"
-
-#: ../pidgin/gtkimhtmltoolbar.c:933 ../pidgin/plugins/convcolors.c:294
-msgid "Italic"
-msgstr "Italique"
-
-#: ../pidgin/gtkimhtmltoolbar.c:944 ../pidgin/plugins/convcolors.c:301
-msgid "Underline"
-msgstr "Souligné"
-
-#: ../pidgin/gtkimhtmltoolbar.c:960
-msgid "Larger font size"
-msgstr "Police plus grande"
-
-#: ../pidgin/gtkimhtmltoolbar.c:972
-msgid "Smaller font size"
-msgstr "Police plus petite"
-
-#: ../pidgin/gtkimhtmltoolbar.c:989
-msgid "Font face"
-msgstr "Type de police"
-
-#: ../pidgin/gtkimhtmltoolbar.c:1001
-msgid "Foreground font color"
-msgstr "Couleur du texte"
-
-#: ../pidgin/gtkimhtmltoolbar.c:1013
-msgid "Background color"
-msgstr "Couleur de fond"
-
-#: ../pidgin/gtkimhtmltoolbar.c:1029
-msgid "Reset formatting"
-msgstr "Effacer le style"
-
-#: ../pidgin/gtkimhtmltoolbar.c:1044
-msgid "Insert link"
-msgstr "Insérer un lien"
-
-#: ../pidgin/gtkimhtmltoolbar.c:1054
-msgid "Insert image"
-msgstr "Insérer une image"
+#: ../pidgin/gtkimhtmltoolbar.c:1064
+msgid "_Bold"
+msgstr "_Gras"
 
 #: ../pidgin/gtkimhtmltoolbar.c:1065
-msgid "Insert smiley"
-msgstr "Insérer une frimousse"
-
-#: ../pidgin/gtklog.c:267
+msgid "_Italic"
+msgstr "Itali_que"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1066
+msgid "_Underline"
+msgstr "_Souligné"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1067
+msgid "_Larger"
+msgstr "Plus g_rand"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1069
+msgid "_Normal"
+msgstr "_Normal"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1071
+msgid "_Smaller"
+msgstr "Pl_us petit"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1072
+msgid "_Font face"
+msgstr "T_ype de police"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1073
+msgid "_Foreground color"
+msgstr "Couleur du _texte"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1074
+msgid "_Background color"
+msgstr "Couleur de _fond"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1100
+msgid "_Font"
+msgstr "_Police"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1135
+msgid "_Reset font"
+msgstr "_Effacer le style"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1162
+msgid "_Smiley"
+msgstr "Fri_mousse"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1168
+msgid "_Image"
+msgstr "_Image"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1174
+msgid "_Link"
+msgstr "_Lien"
+
+#: ../pidgin/gtklog.c:292
 #, c-format
 msgid ""
 "Are you sure you want to permanently delete the log of the conversation with "
@@ -13301,7 +13956,7 @@
 "Êtes-vous sûr de vouloir supprimer les archives de la conversation avec %s "
 "datée du %s ?"
 
-#: ../pidgin/gtklog.c:278
+#: ../pidgin/gtklog.c:303
 #, c-format
 msgid ""
 "Are you sure you want to permanently delete the log of the conversation in %"
@@ -13310,28 +13965,28 @@
 "Êtes-vous sûr de vouloir supprimer les archives de la conversation dans %s "
 "datée du %s ?"
 
-#: ../pidgin/gtklog.c:283
+#: ../pidgin/gtklog.c:308
 #, c-format
 msgid ""
 "Are you sure you want to permanently delete the system log which started at %"
 "s?"
 msgstr "Êtes-vous sûr de vouloir supprimer les archives système datées du %s ?"
 
-#: ../pidgin/gtklog.c:427
+#: ../pidgin/gtklog.c:452
 #, c-format
 msgid "<span size='larger' weight='bold'>Conversation in %s on %s</span>"
 msgstr "<span size='larger' weight='bold'>Conversation dans %s le %s</span>"
 
-#: ../pidgin/gtklog.c:430
+#: ../pidgin/gtklog.c:455
 #, c-format
 msgid "<span size='larger' weight='bold'>Conversation with %s on %s</span>"
 msgstr "<span size='larger' weight='bold'>Conversation avec %s le %s</span>"
 
-#: ../pidgin/gtklog.c:477
+#: ../pidgin/gtklog.c:502
 msgid "%B %Y"
 msgstr "%B %Y"
 
-#: ../pidgin/gtklog.c:524
+#: ../pidgin/gtklog.c:549
 msgid ""
 "System events will only be logged if the \"Log all status changes to system "
 "log\" preference is enabled."
@@ -13339,7 +13994,7 @@
 "Les évènements système ne seront archivés que si l'option « Archiver tous "
 "les changements d'état dans les archives système » est activée."
 
-#: ../pidgin/gtklog.c:528
+#: ../pidgin/gtklog.c:553
 msgid ""
 "Instant messages will only be logged if the \"Log all instant messages\" "
 "preference is enabled."
@@ -13347,46 +14002,46 @@
 "Les messages individuels ne seront archivés que si l'option « Archiver tous "
 "les messages » est activée."
 
-#: ../pidgin/gtklog.c:531
+#: ../pidgin/gtklog.c:556
 msgid ""
 "Chats will only be logged if the \"Log all chats\" preference is enabled."
 msgstr ""
 "Les discussions en salon ne seront archivées que si l'option « Archiver "
 "toutes les discussions » est activée."
 
-#: ../pidgin/gtklog.c:535
+#: ../pidgin/gtklog.c:560
 msgid "No logs were found"
 msgstr "Aucune archive n'a été trouvée."
 
 #. Steal the "HELP" response and use it to trigger browsing to the logs folder
-#: ../pidgin/gtklog.c:550
+#: ../pidgin/gtklog.c:575
 msgid "_Browse logs folder"
 msgstr "_Parcourir le dossier des archives"
 
-#: ../pidgin/gtklog.c:614
+#: ../pidgin/gtklog.c:639
 msgid "Total log size:"
 msgstr "Taille totale des archives :"
 
-#: ../pidgin/gtklog.c:683
+#: ../pidgin/gtklog.c:708
 #, c-format
 msgid "Conversations in %s"
 msgstr "Conversations dans %s"
 
-#: ../pidgin/gtklog.c:691 ../pidgin/gtklog.c:753
+#: ../pidgin/gtklog.c:716 ../pidgin/gtklog.c:778
 #, c-format
 msgid "Conversations with %s"
 msgstr "Conversations avec %s"
 
-#: ../pidgin/gtklog.c:778
+#: ../pidgin/gtklog.c:803
 msgid "System Log"
 msgstr "Archives des messages système"
 
-#: ../pidgin/gtkmain.c:373
+#: ../pidgin/gtkmain.c:385
 #, c-format
 msgid "%s %s. Try `%s -h' for more information.\n"
 msgstr "%s %s. « %s -h » pour plus d'informations.\n"
 
-#: ../pidgin/gtkmain.c:375
+#: ../pidgin/gtkmain.c:387
 #, c-format
 msgid ""
 "%s %s\n"
@@ -13395,6 +14050,7 @@
 "  -c, --config=DIR    use DIR for config files\n"
 "  -d, --debug         print debugging messages to stdout\n"
 "  -h, --help          display this help and exit\n"
+"  -m, --multiple      do not ensure single instance\n"
 "  -n, --nologin       don't automatically login\n"
 "  -l, --login[=NAME]  automatically login (optional argument NAME specifies\n"
 "                      account(s) to use, separated by commas)\n"
@@ -13407,6 +14063,7 @@
 "REP\n"
 "  -d, --debug         affiche les messages de debug  sur la sortie standard\n"
 "  -h, --help          affiche ce texte d'aide\n"
+"  -m, --multiple      ne vérifie pas la présence d'une seule instance du programme\n"
 "  -n, --nologin       ne se connecte pas automatiquement au lancement\n"
 "  -l, --login[=NOM]   connexion automatique au lancement (l'argument NOM\n"
 "                      facultatif indique les comptes à utiliser, séparés "
@@ -13414,7 +14071,7 @@
 "                      des virgules)\n"
 "  -v, --version       affiche le numéro de la version actuelle\n"
 
-#: ../pidgin/gtkmain.c:493
+#: ../pidgin/gtkmain.c:511
 #, c-format
 msgid ""
 "%s has segfaulted and attempted to dump a core file.\n"
@@ -13423,7 +14080,7 @@
 "\n"
 "If you can reproduce the crash, please notify the developers\n"
 "by reporting a bug at:\n"
-"%snewticket/\n"
+"%ssimpleticket/\n"
 "\n"
 "Please make sure to specify what you were doing at the time\n"
 "and post the backtrace from the core file.  If you do not know\n"
@@ -13441,7 +14098,7 @@
 "\n"
 "Si vous pouvez reproduire ce plantage, veuillez en\n"
 "informer les développeurs en rapportant le problème sur\n"
-"%snewticket/\n"
+"%ssimpleticket/\n"
 "\n"
 "Veuillez bien préciser ce que vous faisiez à cet instant et\n"
 "attacher la pile d'appel (backtrace) obtenue depuis le fichier\n"
@@ -13455,48 +14112,50 @@
 "disponibles sur\n"
 "%swiki/DeveloperPages\n"
 
-#: ../pidgin/gtknotify.c:337
+#. Translators may want to transliterate the name.
+#. It is not to be translated.
+#: ../pidgin/gtkmain.c:697 ../pidgin/pidgin.h:50
+msgid "Pidgin"
+msgstr "Pidgin"
+
+#: ../pidgin/gtknotify.c:343
 msgid "Open All Messages"
 msgstr "Ouvrir tous les messages"
 
-#: ../pidgin/gtknotify.c:389
+#: ../pidgin/gtknotify.c:395
 msgid "<span weight=\"bold\" size=\"larger\">You have mail!</span>"
 msgstr "<span weight=\"bold\" size=\"larger\">Vous avez du courrier !</span>"
 
-#: ../pidgin/gtknotify.c:483
-msgid "Sender"
-msgstr "Expéditeur"
-
-#: ../pidgin/gtknotify.c:509
+#: ../pidgin/gtknotify.c:515
 #, c-format
 msgid "%s has %d new message."
 msgid_plural "%s has %d new messages."
 msgstr[0] "%s a reçu %d nouveau message."
 msgstr[1] "%s a reçu %d nouveaux messages."
 
-#: ../pidgin/gtknotify.c:520
+#: ../pidgin/gtknotify.c:526
 #, c-format
 msgid "<b>You have %d new e-mail.</b>"
 msgid_plural "<b>You have %d new e-mails.</b>"
 msgstr[0] "<b>Vous avez %d nouveau courrier.</b>"
 msgstr[1] "<b>Vous avez %d nouveaux courriers.</b>"
 
-#: ../pidgin/gtknotify.c:951
+#: ../pidgin/gtknotify.c:965
 #, c-format
 msgid "The browser command \"%s\" is invalid."
 msgstr "La commande « %s » pour le navigateur est non valide."
 
-#: ../pidgin/gtknotify.c:953 ../pidgin/gtknotify.c:965
-#: ../pidgin/gtknotify.c:978 ../pidgin/gtknotify.c:1106
+#: ../pidgin/gtknotify.c:967 ../pidgin/gtknotify.c:979
+#: ../pidgin/gtknotify.c:992 ../pidgin/gtknotify.c:1120
 msgid "Unable to open URL"
 msgstr "Impossible d'ouvrir l'URL"
 
-#: ../pidgin/gtknotify.c:963 ../pidgin/gtknotify.c:976
+#: ../pidgin/gtknotify.c:977 ../pidgin/gtknotify.c:990
 #, c-format
 msgid "Error launching \"%s\": %s"
 msgstr "Erreur au lancement de « %s » : %s"
 
-#: ../pidgin/gtknotify.c:1107
+#: ../pidgin/gtknotify.c:1121
 msgid ""
 "The 'Manual' browser command has been chosen, but no command has been set."
 msgstr ""
@@ -13545,108 +14204,117 @@
 msgid "<b>Plugin Details</b>"
 msgstr "<b>Informations sur le plugin</b>"
 
-#: ../pidgin/gtkpounce.c:155
+#: ../pidgin/gtkpounce.c:156
 msgid "Select a file"
 msgstr "Choisissez un fichier"
 
 #. Create the "Pounce on Whom" frame.
-#: ../pidgin/gtkpounce.c:524
+#: ../pidgin/gtkpounce.c:533
 msgid "Pounce on Whom"
 msgstr "Alerte sur"
 
-#: ../pidgin/gtkpounce.c:551
+#: ../pidgin/gtkpounce.c:560
 msgid "_Buddy name:"
 msgstr "_Contact :"
 
-#: ../pidgin/gtkpounce.c:585
+#: ../pidgin/gtkpounce.c:594
 msgid "Si_gns on"
 msgstr "Se _connecte"
 
-#: ../pidgin/gtkpounce.c:587
+#: ../pidgin/gtkpounce.c:596
 msgid "Signs o_ff"
 msgstr "Se _déconnecte"
 
-#: ../pidgin/gtkpounce.c:589
+#: ../pidgin/gtkpounce.c:598
 msgid "Goes a_way"
 msgstr "S'_absente"
 
-#: ../pidgin/gtkpounce.c:591
+#: ../pidgin/gtkpounce.c:600
 msgid "Ret_urns from away"
 msgstr "_Revient d'absence"
 
-#: ../pidgin/gtkpounce.c:593
+#: ../pidgin/gtkpounce.c:602
 msgid "Becomes _idle"
 msgstr "Devient _inactif"
 
-#: ../pidgin/gtkpounce.c:595
+#: ../pidgin/gtkpounce.c:604
 msgid "Is no longer i_dle"
 msgstr "N'est plus i_nactif"
 
-#: ../pidgin/gtkpounce.c:597
+#: ../pidgin/gtkpounce.c:606
 msgid "Starts _typing"
 msgstr "C_ommence à écrire"
 
-#: ../pidgin/gtkpounce.c:599
+#: ../pidgin/gtkpounce.c:608
 msgid "P_auses while typing"
 msgstr "_Pause pendant la saisie"
 
-#: ../pidgin/gtkpounce.c:601
+#: ../pidgin/gtkpounce.c:610
 msgid "Stops t_yping"
 msgstr "_S'arrête d'écrire"
 
-#: ../pidgin/gtkpounce.c:603
+#: ../pidgin/gtkpounce.c:612
 msgid "Sends a _message"
 msgstr "Envoi d'un _message"
 
-#: ../pidgin/gtkpounce.c:646
+#: ../pidgin/gtkpounce.c:655
 msgid "Ope_n an IM window"
 msgstr "Ouvrir une _fenêtre de conversation"
 
-#: ../pidgin/gtkpounce.c:648
+#: ../pidgin/gtkpounce.c:657
 msgid "_Pop up a notification"
 msgstr "Ouvrir une fenêtre de _notification"
 
-#: ../pidgin/gtkpounce.c:650
+#: ../pidgin/gtkpounce.c:659
 msgid "Send a _message"
 msgstr "Envoyer un _message"
 
-#: ../pidgin/gtkpounce.c:652
-msgid "E_xecute a command"
-msgstr "Exécuter une c_ommande"
-
-#: ../pidgin/gtkpounce.c:654
-msgid "P_lay a sound"
-msgstr "_Jouer un son"
-
-#: ../pidgin/gtkpounce.c:659
-msgid "Brows_e..."
-msgstr "Choisir..."
-
 #: ../pidgin/gtkpounce.c:661
+msgid "E_xecute a command"
+msgstr "Exécuter une c_ommande"
+
+#: ../pidgin/gtkpounce.c:663
+msgid "P_lay a sound"
+msgstr "_Jouer un son"
+
+#: ../pidgin/gtkpounce.c:669
+msgid "Brows_e..."
+msgstr "Choisir..."
+
+#: ../pidgin/gtkpounce.c:671
 msgid "Br_owse..."
 msgstr "Choisir..."
 
-#: ../pidgin/gtkpounce.c:662
+#: ../pidgin/gtkpounce.c:672
 msgid "Pre_view"
 msgstr "Pré_visualisation"
 
-#: ../pidgin/gtkpounce.c:786
-msgid "P_ounce only when my status is not available"
-msgstr "Alerter _uniquement quand mon état est non disponible"
-
-#: ../pidgin/gtkpounce.c:791
+#: ../pidgin/gtkpounce.c:799
+msgid "P_ounce only when my status is not Available"
+msgstr "Alerter _uniquement quand mon état n'est pas « Disponible »"
+
+#: ../pidgin/gtkpounce.c:804
 msgid "_Recurring"
 msgstr "_Récurrente"
 
-#: ../pidgin/gtkpounce.c:1247
+#: ../pidgin/gtkpounce.c:1260
 msgid "Pounce Target"
 msgstr "Cible de l'alerte"
 
-#: ../pidgin/gtkprefs.c:509
+#: ../pidgin/gtkprefs.c:385
+#: ../pidgin/pixmaps/emotes/default/22/default.theme.in.h:1
+msgid "Default"
+msgstr "Par défaut"
+
+#: ../pidgin/gtkprefs.c:516
 msgid "Smiley theme failed to unpack."
 msgstr "Le thème de frimousses n'a pas pu être déballé."
 
-#: ../pidgin/gtkprefs.c:638
+#: ../pidgin/gtkprefs.c:643
+msgid "Install Theme"
+msgstr "Installer un thème"
+
+#: ../pidgin/gtkprefs.c:696
 msgid ""
 "Select a smiley theme that you would like to use from the list below. New "
 "themes can be installed by dragging and dropping them onto the theme list."
@@ -13655,239 +14323,259 @@
 "dessous.  De nouveau thèmes peuvent être installés en les faisant glisser "
 "dans la liste des thèmes."
 
-#: ../pidgin/gtkprefs.c:673
+#: ../pidgin/gtkprefs.c:731
 msgid "Icon"
 msgstr "Icône"
 
-#: ../pidgin/gtkprefs.c:816
+#: ../pidgin/gtkprefs.c:893
 msgid "System Tray Icon"
 msgstr "Icône de notification"
 
-#: ../pidgin/gtkprefs.c:817
+#: ../pidgin/gtkprefs.c:894
 msgid "_Show system tray icon:"
 msgstr "_Afficher l'icône de notification :"
 
-#: ../pidgin/gtkprefs.c:819 ../pidgin/gtkprefs.c:831 ../pidgin/gtkprefs.c:1648
+#: ../pidgin/gtkprefs.c:896 ../pidgin/gtkprefs.c:908 ../pidgin/gtkprefs.c:1756
 #: ../pidgin/plugins/timestamp_format.c:42
 #: ../pidgin/plugins/timestamp_format.c:51
 #: ../pidgin/plugins/win32/winprefs/winprefs.c:338
 msgid "Always"
 msgstr "Toujours"
 
-#: ../pidgin/gtkprefs.c:821
+#: ../pidgin/gtkprefs.c:898
 msgid "On unread messages"
 msgstr "Quand des messages sont non lus"
 
-#: ../pidgin/gtkprefs.c:826
+#: ../pidgin/gtkprefs.c:903
 msgid "Conversation Window Hiding"
 msgstr "Quand la fenêtre de conversation est cachée"
 
-#: ../pidgin/gtkprefs.c:827
+#: ../pidgin/gtkprefs.c:904
 msgid "_Hide new IM conversations:"
 msgstr "_Cacher les nouvelles conversations :"
 
-#: ../pidgin/gtkprefs.c:830 ../pidgin/gtkprefs.c:1828
+#: ../pidgin/gtkprefs.c:907 ../pidgin/gtkprefs.c:1937
 msgid "When away"
 msgstr "Lorsque absent"
 
 #. All the tab options!
-#: ../pidgin/gtkprefs.c:838
+#: ../pidgin/gtkprefs.c:915
 msgid "Tabs"
 msgstr "Onglets"
 
-#: ../pidgin/gtkprefs.c:840
+#: ../pidgin/gtkprefs.c:917
 msgid "Show IMs and chats in _tabbed windows"
 msgstr "Afficher les messages et les discussions dans des fenêtres à _onglets"
 
-#: ../pidgin/gtkprefs.c:854
+#: ../pidgin/gtkprefs.c:931
 msgid "Show close b_utton on tabs"
 msgstr "Afficher le bouton de _fermeture sur les onglets"
 
-#: ../pidgin/gtkprefs.c:857
+#: ../pidgin/gtkprefs.c:934
 msgid "_Placement:"
 msgstr "_Position :"
 
-#: ../pidgin/gtkprefs.c:859
+#: ../pidgin/gtkprefs.c:936
 msgid "Top"
 msgstr "Haut"
 
-#: ../pidgin/gtkprefs.c:860
+#: ../pidgin/gtkprefs.c:937
 msgid "Bottom"
 msgstr "Bas"
 
-#: ../pidgin/gtkprefs.c:861
+#: ../pidgin/gtkprefs.c:938
 msgid "Left"
 msgstr "Gauche"
 
-#: ../pidgin/gtkprefs.c:862
+#: ../pidgin/gtkprefs.c:939
 msgid "Right"
 msgstr "Droite"
 
-#: ../pidgin/gtkprefs.c:864
+#: ../pidgin/gtkprefs.c:941
 msgid "Left Vertical"
 msgstr "Verticalement à gauche"
 
-#: ../pidgin/gtkprefs.c:865
+#: ../pidgin/gtkprefs.c:942
 msgid "Right Vertical"
 msgstr "Verticalement à droite"
 
-#: ../pidgin/gtkprefs.c:872
+#: ../pidgin/gtkprefs.c:949
 msgid "N_ew conversations:"
 msgstr "Nouvelles conversations :"
 
-#: ../pidgin/gtkprefs.c:900
+#: ../pidgin/gtkprefs.c:994
 msgid "Show _formatting on incoming messages"
 msgstr "Afficher le _style des messages reçus"
 
-#: ../pidgin/gtkprefs.c:903
+#: ../pidgin/gtkprefs.c:997
 msgid "Show buddy _icons"
 msgstr "Afficher les _icônes des contacts"
 
-#: ../pidgin/gtkprefs.c:905
+#: ../pidgin/gtkprefs.c:999
 msgid "Enable buddy ic_on animation"
 msgstr "Activer l'anima_tion de l'icône des contacts"
 
-#: ../pidgin/gtkprefs.c:912
+#: ../pidgin/gtkprefs.c:1006
 msgid "_Notify buddies that you are typing to them"
 msgstr "_Notifier les contacts que vous êtes en train de leur écrire"
 
-#: ../pidgin/gtkprefs.c:915
+#: ../pidgin/gtkprefs.c:1009
 msgid "Highlight _misspelled words"
 msgstr "Surligner les mots mal _orthographiés"
 
-#: ../pidgin/gtkprefs.c:919
+#: ../pidgin/gtkprefs.c:1013
 msgid "Use smooth-scrolling"
 msgstr "Utiliser le défilement progressif"
 
-#: ../pidgin/gtkprefs.c:922
+#: ../pidgin/gtkprefs.c:1016
 msgid "F_lash window when IMs are received"
 msgstr "_Faire clignoter la fenêtre sur la réception de messages"
 
-#: ../pidgin/gtkprefs.c:925
+#: ../pidgin/gtkprefs.c:1018
+msgid "Minimi_ze new conversation windows"
+msgstr "Rédu_ire la nouvelle fenêtre de conversation"
+
+#: ../pidgin/gtkprefs.c:1022
+msgid "Font"
+msgstr "Police"
+
+#: ../pidgin/gtkprefs.c:1024
+msgid "Use document font from _theme"
+msgstr "Utiliser la police de document du _thème"
+
+#: ../pidgin/gtkprefs.c:1026
+msgid "Use font from _theme"
+msgstr "Utiliser la police du thème"
+
+#: ../pidgin/gtkprefs.c:1028
+msgid "Conversation _font:"
+msgstr "Police des _conversations :"
+
+#: ../pidgin/gtkprefs.c:1041
 msgid "Default Formatting"
 msgstr "Style par défaut"
 
-#: ../pidgin/gtkprefs.c:941
+#: ../pidgin/gtkprefs.c:1057
 msgid ""
 "This is how your outgoing message text will appear when you use protocols "
-"that support formatting. :)"
+"that support formatting."
 msgstr ""
 "Le texte des messages envoyés apparaîtra comme ceci avec les protocoles "
-"supportant l'ajout du style. :)"
-
-#: ../pidgin/gtkprefs.c:1017
+"supportant l'ajout du style."
+
+#: ../pidgin/gtkprefs.c:1123
 msgid "ST_UN server:"
 msgstr "Serveur ST_UN :"
 
-#: ../pidgin/gtkprefs.c:1029
+#: ../pidgin/gtkprefs.c:1135
 msgid "<span style=\"italic\">Example: stunserver.org</span>"
 msgstr "<span style=\"italic\">Exemple : stunserver.org</span>"
 
-#: ../pidgin/gtkprefs.c:1033
+#: ../pidgin/gtkprefs.c:1139
 msgid "_Autodetect IP address"
 msgstr "_Détection auto de l'adresse IP"
 
-#: ../pidgin/gtkprefs.c:1042
+#: ../pidgin/gtkprefs.c:1148
 msgid "Public _IP:"
 msgstr "Adresse _IP publique :"
 
-#: ../pidgin/gtkprefs.c:1071
+#: ../pidgin/gtkprefs.c:1177
 msgid "Ports"
 msgstr "Ports"
 
-#: ../pidgin/gtkprefs.c:1074
+#: ../pidgin/gtkprefs.c:1180
 msgid "_Manually specify range of ports to listen on"
 msgstr "Spécifier _manuellement la plage de ports à écouter"
 
-#: ../pidgin/gtkprefs.c:1077
+#: ../pidgin/gtkprefs.c:1183
 msgid "_Start port:"
 msgstr "_Premier port : "
 
-#: ../pidgin/gtkprefs.c:1084
+#: ../pidgin/gtkprefs.c:1190
 msgid "_End port:"
 msgstr "_Dernier port :"
 
-#: ../pidgin/gtkprefs.c:1092
+#: ../pidgin/gtkprefs.c:1198
 msgid "Proxy Server"
 msgstr "Serveur mandataire"
 
-#: ../pidgin/gtkprefs.c:1096
+#: ../pidgin/gtkprefs.c:1202
 msgid "No proxy"
 msgstr "Aucun"
 
-#: ../pidgin/gtkprefs.c:1152
+#: ../pidgin/gtkprefs.c:1258
 msgid "_User:"
 msgstr "_Utilisateur :"
 
-#: ../pidgin/gtkprefs.c:1216
+#: ../pidgin/gtkprefs.c:1323
 msgid "Seamonkey"
 msgstr "Seamonkey"
 
-#: ../pidgin/gtkprefs.c:1217
+#: ../pidgin/gtkprefs.c:1324
 msgid "Opera"
 msgstr "Opéra"
 
-#: ../pidgin/gtkprefs.c:1218
+#: ../pidgin/gtkprefs.c:1325
 msgid "Netscape"
 msgstr "Netscape"
 
-#: ../pidgin/gtkprefs.c:1219
+#: ../pidgin/gtkprefs.c:1326
 msgid "Mozilla"
 msgstr "Mozilla"
 
-#: ../pidgin/gtkprefs.c:1220
+#: ../pidgin/gtkprefs.c:1327
 msgid "Konqueror"
 msgstr "Konqueror"
 
-#: ../pidgin/gtkprefs.c:1221
+#: ../pidgin/gtkprefs.c:1328
 msgid "GNOME Default"
 msgstr "Navigateur de Gnome"
 
-#: ../pidgin/gtkprefs.c:1222
+#: ../pidgin/gtkprefs.c:1329
 msgid "Galeon"
 msgstr "Galeon"
 
-#: ../pidgin/gtkprefs.c:1223
+#: ../pidgin/gtkprefs.c:1330
 msgid "Firefox"
 msgstr "Firefox"
 
-#: ../pidgin/gtkprefs.c:1224
+#: ../pidgin/gtkprefs.c:1331
 msgid "Firebird"
 msgstr "Firebird"
 
-#: ../pidgin/gtkprefs.c:1225
+#: ../pidgin/gtkprefs.c:1332
 msgid "Epiphany"
 msgstr "Epiphany"
 
-#: ../pidgin/gtkprefs.c:1234
+#: ../pidgin/gtkprefs.c:1341
 msgid "Manual"
 msgstr "Manuel"
 
-#: ../pidgin/gtkprefs.c:1287
+#: ../pidgin/gtkprefs.c:1394
 msgid "Browser Selection"
 msgstr "Choix du navigateur"
 
-#: ../pidgin/gtkprefs.c:1291
+#: ../pidgin/gtkprefs.c:1398
 msgid "_Browser:"
 msgstr "_Navigateur :"
 
-#: ../pidgin/gtkprefs.c:1299
+#: ../pidgin/gtkprefs.c:1406
 msgid "_Open link in:"
 msgstr "_Ouvrir les liens :"
 
-#: ../pidgin/gtkprefs.c:1301
+#: ../pidgin/gtkprefs.c:1408
 msgid "Browser default"
 msgstr "Laisser le navigateur choisir"
 
-#: ../pidgin/gtkprefs.c:1302
+#: ../pidgin/gtkprefs.c:1409
 msgid "Existing window"
 msgstr "Dans une fenêtre ouverte"
 
-#: ../pidgin/gtkprefs.c:1304
+#: ../pidgin/gtkprefs.c:1411
 msgid "New tab"
 msgstr "Dans un nouvel onglet"
 
-#: ../pidgin/gtkprefs.c:1318
+#: ../pidgin/gtkprefs.c:1425
 #, c-format
 msgid ""
 "_Manual:\n"
@@ -13896,80 +14584,80 @@
 "_Manuel :\n"
 "(%s pour l'URL)"
 
-#: ../pidgin/gtkprefs.c:1358
+#: ../pidgin/gtkprefs.c:1465
 msgid "Log _format:"
 msgstr "_Format des archives :"
 
-#: ../pidgin/gtkprefs.c:1363
+#: ../pidgin/gtkprefs.c:1470
 msgid "Log all _instant messages"
 msgstr "Archiver tous les _messages"
 
-#: ../pidgin/gtkprefs.c:1365
+#: ../pidgin/gtkprefs.c:1472
 msgid "Log all c_hats"
 msgstr "Archiver toutes les _discussions"
 
-#: ../pidgin/gtkprefs.c:1367
+#: ../pidgin/gtkprefs.c:1474
 msgid "Log all _status changes to system log"
 msgstr "Archiver tous les _changements d'état dans les archives système"
 
-#: ../pidgin/gtkprefs.c:1475 ../pidgin/gtkprefs.c:1564
-#: ../pidgin/gtkprefs.c:1756
+#: ../pidgin/gtkprefs.c:1582 ../pidgin/gtkprefs.c:1671
+#: ../pidgin/gtkprefs.c:1865
 msgid "(default)"
 msgstr "(défaut)"
 
-#: ../pidgin/gtkprefs.c:1513
+#: ../pidgin/gtkprefs.c:1620
 msgid "Sound Selection"
 msgstr "Choix des sons"
 
-#: ../pidgin/gtkprefs.c:1523
+#: ../pidgin/gtkprefs.c:1630
 msgid "Quietest"
 msgstr "Le plus silencieux"
 
-#: ../pidgin/gtkprefs.c:1525
+#: ../pidgin/gtkprefs.c:1632
 msgid "Quieter"
 msgstr "Très silencieux"
 
-#: ../pidgin/gtkprefs.c:1527
+#: ../pidgin/gtkprefs.c:1634
 msgid "Quiet"
 msgstr "Silencieux"
 
-#: ../pidgin/gtkprefs.c:1531
+#: ../pidgin/gtkprefs.c:1638
 msgid "Loud"
 msgstr "Fort"
 
-#: ../pidgin/gtkprefs.c:1533
+#: ../pidgin/gtkprefs.c:1640
 msgid "Louder"
 msgstr "Très fort"
 
-#: ../pidgin/gtkprefs.c:1535
+#: ../pidgin/gtkprefs.c:1642
 msgid "Loudest"
 msgstr "Le plus fort"
 
-#: ../pidgin/gtkprefs.c:1598
+#: ../pidgin/gtkprefs.c:1705
 msgid "Sound Method"
 msgstr "Sortie sonore"
 
-#: ../pidgin/gtkprefs.c:1599
+#: ../pidgin/gtkprefs.c:1706
 msgid "_Method:"
 msgstr "_Méthode :"
 
-#: ../pidgin/gtkprefs.c:1601
+#: ../pidgin/gtkprefs.c:1708
 msgid "Console beep"
 msgstr "Bip de console"
 
-#: ../pidgin/gtkprefs.c:1603
+#: ../pidgin/gtkprefs.c:1710
 msgid "Automatic"
 msgstr "Automatique"
 
-#: ../pidgin/gtkprefs.c:1606
+#: ../pidgin/gtkprefs.c:1714
 msgid "Command"
 msgstr "Commande"
 
-#: ../pidgin/gtkprefs.c:1607
+#: ../pidgin/gtkprefs.c:1715
 msgid "No sounds"
 msgstr "Pas de sons"
 
-#: ../pidgin/gtkprefs.c:1615
+#: ../pidgin/gtkprefs.c:1723
 #, c-format
 msgid ""
 "Sound c_ommand:\n"
@@ -13978,117 +14666,117 @@
 "_Commande à utiliser :\n"
 "(%s pour le nom de fichier)"
 
-#: ../pidgin/gtkprefs.c:1641
+#: ../pidgin/gtkprefs.c:1749
 msgid "Sound Options"
 msgstr "Options sonores"
 
-#: ../pidgin/gtkprefs.c:1642
+#: ../pidgin/gtkprefs.c:1750
 msgid "Sounds when conversation has _focus"
 msgstr "Jouer les sons quand la _fenêtre est active"
 
-#: ../pidgin/gtkprefs.c:1644
+#: ../pidgin/gtkprefs.c:1752
 msgid "Enable sounds:"
 msgstr "Activer les sons :"
 
-#: ../pidgin/gtkprefs.c:1646
+#: ../pidgin/gtkprefs.c:1754
 msgid "Only when available"
 msgstr "Seulement quand je suis disponible"
 
-#: ../pidgin/gtkprefs.c:1647
+#: ../pidgin/gtkprefs.c:1755
 msgid "Only when not available"
 msgstr "Seulement quand je ne suis pas disponible"
 
-#: ../pidgin/gtkprefs.c:1655
+#: ../pidgin/gtkprefs.c:1763
 msgid "Volume:"
 msgstr "Volume :"
 
-#: ../pidgin/gtkprefs.c:1683
+#: ../pidgin/gtkprefs.c:1791
 msgid "Sound Events"
 msgstr "Évènements sonores"
 
-#: ../pidgin/gtkprefs.c:1734
+#: ../pidgin/gtkprefs.c:1843
 msgid "Play"
 msgstr "Jouer"
 
-#: ../pidgin/gtkprefs.c:1741
+#: ../pidgin/gtkprefs.c:1850
 msgid "Event"
 msgstr "Évènement"
 
-#: ../pidgin/gtkprefs.c:1760
+#: ../pidgin/gtkprefs.c:1869
 msgid "Test"
 msgstr "Tester"
 
-#: ../pidgin/gtkprefs.c:1764
+#: ../pidgin/gtkprefs.c:1873
 msgid "Reset"
 msgstr "Remise à zéro"
 
-#: ../pidgin/gtkprefs.c:1768
+#: ../pidgin/gtkprefs.c:1877
 msgid "Choose..."
 msgstr "Choisir..."
 
-#: ../pidgin/gtkprefs.c:1811
+#: ../pidgin/gtkprefs.c:1920
 msgid "_Report idle time:"
 msgstr "_Rapporter le temps d'inactivité :"
 
-#: ../pidgin/gtkprefs.c:1816
+#: ../pidgin/gtkprefs.c:1925
 msgid "Based on keyboard or mouse use"
 msgstr "Selon l'activité du clavier ou de la souris"
 
-#: ../pidgin/gtkprefs.c:1825
+#: ../pidgin/gtkprefs.c:1934
 msgid "_Auto-reply:"
 msgstr "_Réponse automatique :"
 
-#: ../pidgin/gtkprefs.c:1829
+#: ../pidgin/gtkprefs.c:1938
 msgid "When both away and idle"
 msgstr "Lorsque absent et inactif"
 
 #. Auto-away stuff
-#: ../pidgin/gtkprefs.c:1835
+#: ../pidgin/gtkprefs.c:1944
 msgid "Auto-away"
 msgstr "Absence automatique"
 
-#: ../pidgin/gtkprefs.c:1837
+#: ../pidgin/gtkprefs.c:1946
 msgid "Change status when _idle"
 msgstr "Changer d'état lorsque _inactif"
 
-#: ../pidgin/gtkprefs.c:1841
+#: ../pidgin/gtkprefs.c:1950
 msgid "_Minutes before changing status:"
 msgstr "_Minutes avant de changer d'état :"
 
-#: ../pidgin/gtkprefs.c:1849
+#: ../pidgin/gtkprefs.c:1958
 msgid "Change _status to:"
 msgstr "_Changer l'état en :"
 
 #. Signon status stuff
-#: ../pidgin/gtkprefs.c:1870
+#: ../pidgin/gtkprefs.c:1979
 msgid "Status at Startup"
 msgstr "État au démarrage"
 
-#: ../pidgin/gtkprefs.c:1872
+#: ../pidgin/gtkprefs.c:1981
 msgid "Use status from last _exit at startup"
 msgstr "Utiliser l'état à la _fermeture"
 
-#: ../pidgin/gtkprefs.c:1878
+#: ../pidgin/gtkprefs.c:1987
 msgid "Status to a_pply at startup:"
 msgstr "État _utilisé au démarrage :"
 
-#: ../pidgin/gtkprefs.c:1916
+#: ../pidgin/gtkprefs.c:2025
 msgid "Interface"
 msgstr "Interface"
 
-#: ../pidgin/gtkprefs.c:1918
+#: ../pidgin/gtkprefs.c:2027
 msgid "Smiley Themes"
 msgstr "Thèmes des frimousses"
 
-#: ../pidgin/gtkprefs.c:1919
+#: ../pidgin/gtkprefs.c:2028
 msgid "Sounds"
 msgstr "Sons"
 
-#: ../pidgin/gtkprefs.c:1925
+#: ../pidgin/gtkprefs.c:2034
 msgid "Browser"
 msgstr "Navigateur"
 
-#: ../pidgin/gtkprefs.c:1929
+#: ../pidgin/gtkprefs.c:2038
 msgid "Status / Idle"
 msgstr "État / Inactivité"
 
@@ -14112,63 +14800,63 @@
 msgid "Block only the users below"
 msgstr "Bloquer les utilisateurs ci-dessous"
 
-#: ../pidgin/gtkprivacy.c:372
+#: ../pidgin/gtkprivacy.c:369
 msgid "Privacy"
 msgstr "Filtres"
 
-#: ../pidgin/gtkprivacy.c:385
+#: ../pidgin/gtkprivacy.c:381
 msgid "Changes to privacy settings take effect immediately."
 msgstr "Les changements prennent effet immédiatement."
 
 #. "Set privacy for:" label
-#: ../pidgin/gtkprivacy.c:397
+#: ../pidgin/gtkprivacy.c:393
 msgid "Set privacy for:"
 msgstr "Gérer les filtres pour :"
 
-#: ../pidgin/gtkprivacy.c:560 ../pidgin/gtkprivacy.c:577
+#: ../pidgin/gtkprivacy.c:556 ../pidgin/gtkprivacy.c:573
 msgid "Permit User"
 msgstr "Autoriser un utilisateur"
 
-#: ../pidgin/gtkprivacy.c:561
+#: ../pidgin/gtkprivacy.c:557
 msgid "Type a user you permit to contact you."
 msgstr "Personne à autoriser"
 
-#: ../pidgin/gtkprivacy.c:562
+#: ../pidgin/gtkprivacy.c:558
 msgid "Please enter the name of the user you wish to be able to contact you."
 msgstr "Saisissez le nom de l'utilisateur que vous autorisez à vous contacter"
 
-#: ../pidgin/gtkprivacy.c:565 ../pidgin/gtkprivacy.c:581
+#: ../pidgin/gtkprivacy.c:561 ../pidgin/gtkprivacy.c:577
 msgid "_Permit"
 msgstr "_Autoriser"
 
-#: ../pidgin/gtkprivacy.c:571
+#: ../pidgin/gtkprivacy.c:567
 #, c-format
 msgid "Allow %s to contact you?"
 msgstr "Permettre à %s de vous contacter ?"
 
-#: ../pidgin/gtkprivacy.c:573
+#: ../pidgin/gtkprivacy.c:569
 #, c-format
 msgid "Are you sure you wish to allow %s to contact you?"
 msgstr "Êtes-vous sûr de vouloir autoriser %s à vous contacter ?"
 
-#: ../pidgin/gtkprivacy.c:602 ../pidgin/gtkprivacy.c:616
+#: ../pidgin/gtkprivacy.c:598 ../pidgin/gtkprivacy.c:612
 msgid "Block User"
 msgstr "Bloquer un utilisateur"
 
-#: ../pidgin/gtkprivacy.c:603
+#: ../pidgin/gtkprivacy.c:599
 msgid "Type a user to block."
 msgstr "Personne à bloquer"
 
-#: ../pidgin/gtkprivacy.c:604
+#: ../pidgin/gtkprivacy.c:600
 msgid "Please enter the name of the user you wish to block."
 msgstr "Saisissez le nom de l'utilisateur que vous désirez bloquer"
 
-#: ../pidgin/gtkprivacy.c:612
+#: ../pidgin/gtkprivacy.c:608
 #, c-format
 msgid "Block %s?"
 msgstr "Bloquer %s ?"
 
-#: ../pidgin/gtkprivacy.c:614
+#: ../pidgin/gtkprivacy.c:610
 #, c-format
 msgid "Are you sure you want to block %s?"
 msgstr "Êtes-vous sûr de vouloir bloquer %s ?"
@@ -14177,76 +14865,77 @@
 msgid "Apply"
 msgstr "Appliquer"
 
-#: ../pidgin/gtkrequest.c:1481
+#: ../pidgin/gtkrequest.c:1478
 msgid "That file already exists"
 msgstr "Ce fichier existe déjà"
 
+#: ../pidgin/gtkrequest.c:1479
+msgid "Would you like to overwrite it?"
+msgstr "Voulez-vous l'écraser ?"
+
 #: ../pidgin/gtkrequest.c:1482
-msgid "Would you like to overwrite it?"
-msgstr "Voulez-vous l'écraser ?"
-
-#: ../pidgin/gtkrequest.c:1485
 msgid "Overwrite"
 msgstr "Écraser"
 
-#: ../pidgin/gtkrequest.c:1486
+#: ../pidgin/gtkrequest.c:1483
 msgid "Choose New Name"
 msgstr "Choisir un nouveau nom"
 
-#: ../pidgin/gtkrequest.c:1624 ../pidgin/gtkrequest.c:1638
+#: ../pidgin/gtkrequest.c:1621 ../pidgin/gtkrequest.c:1635
 msgid "Select Folder..."
 msgstr "Choisir un dossier..."
 
-#: ../pidgin/gtkroomlist.c:376
+#. Create the window.
+#: ../pidgin/gtkroomlist.c:374
 msgid "Room List"
 msgstr "Liste des salons de discussions"
 
 #. list button
-#: ../pidgin/gtkroomlist.c:446
+#: ../pidgin/gtkroomlist.c:442
 msgid "_Get List"
 msgstr "Récupérer la _liste"
 
 #. add button
-#: ../pidgin/gtkroomlist.c:454
+#: ../pidgin/gtkroomlist.c:450
 msgid "_Add Chat"
 msgstr "_Ajouter une discussion"
 
-#: ../pidgin/gtksavedstatuses.c:331
+#: ../pidgin/gtksavedstatuses.c:336
 msgid "Are you sure you want to delete the selected saved statuses?"
 msgstr "Êtes-vous sûr de vouloir supprimer les états sauvegardés choisis ?"
 
 #. Use button
-#: ../pidgin/gtksavedstatuses.c:580 ../pidgin/gtksavedstatuses.c:1214
+#: ../pidgin/gtksavedstatuses.c:619 ../pidgin/gtksavedstatuses.c:1265
 msgid "_Use"
 msgstr "_Utiliser"
 
-#: ../pidgin/gtksavedstatuses.c:726
+#: ../pidgin/gtksavedstatuses.c:779
 msgid "Title already in use.  You must choose a unique title."
 msgstr "Ce titre est déjà utilisé. Vous devez saisir un titre unique."
 
-#: ../pidgin/gtksavedstatuses.c:914
+#: ../pidgin/gtksavedstatuses.c:969
 msgid "Different"
 msgstr "Différent"
 
-#: ../pidgin/gtksavedstatuses.c:1107
+#: ../pidgin/gtksavedstatuses.c:1158
 msgid "_Title:"
 msgstr "_Titre :"
 
-#: ../pidgin/gtksavedstatuses.c:1126 ../pidgin/gtksavedstatuses.c:1447
+#: ../pidgin/gtksavedstatuses.c:1177 ../pidgin/gtksavedstatuses.c:1494
 msgid "_Status:"
 msgstr "É_tat :"
 
 #. Different status message expander
-#: ../pidgin/gtksavedstatuses.c:1158
+#: ../pidgin/gtksavedstatuses.c:1209
 msgid "Use a _different status for some accounts"
 msgstr "Utiliser un état _différent pour certains comptes"
 
 #. Save & Use button
-#: ../pidgin/gtksavedstatuses.c:1222
+#: ../pidgin/gtksavedstatuses.c:1273
 msgid "Sa_ve & Use"
 msgstr "Enregistrer _et utiliser"
 
-#: ../pidgin/gtksavedstatuses.c:1428
+#: ../pidgin/gtksavedstatuses.c:1477
 #, c-format
 msgid "Status for %s"
 msgstr "État pour %s"
@@ -14299,29 +14988,29 @@
 msgid "GStreamer failed to initialize."
 msgstr "GStreamer n'a pas pu être initialisé."
 
-#: ../pidgin/gtkstatusbox.c:661
+#: ../pidgin/gtkstatusbox.c:663
 msgid "Waiting for network connection"
 msgstr "En attente de connexion réseau."
 
-#: ../pidgin/gtkutils.c:516
+#: ../pidgin/gtkutils.c:627
 msgid "Google Talk"
 msgstr "Google Talk"
 
-#: ../pidgin/gtkutils.c:1372 ../pidgin/gtkutils.c:1395
+#: ../pidgin/gtkutils.c:1384 ../pidgin/gtkutils.c:1407
 #, c-format
 msgid "The following error has occurred loading %s: %s"
 msgstr "L'erreur suivante est survenue au chargement de %s : %s"
 
-#: ../pidgin/gtkutils.c:1375 ../pidgin/gtkutils.c:1397
+#: ../pidgin/gtkutils.c:1387 ../pidgin/gtkutils.c:1409
 msgid "Failed to load image"
 msgstr "Impossible de charger l'image."
 
-#: ../pidgin/gtkutils.c:1471
+#: ../pidgin/gtkutils.c:1483
 #, c-format
 msgid "Cannot send folder %s."
 msgstr "Impossible d'envoyer le dossier %s."
 
-#: ../pidgin/gtkutils.c:1472
+#: ../pidgin/gtkutils.c:1484
 #, c-format
 msgid ""
 "%s cannot transfer a folder. You will need to send the files within "
@@ -14330,12 +15019,12 @@
 "%s ne peut pas transférer les dossiers. Vous devez envoyer les fichiers du "
 "dossier individuellement."
 
-#: ../pidgin/gtkutils.c:1504 ../pidgin/gtkutils.c:1516
-#: ../pidgin/gtkutils.c:1523
+#: ../pidgin/gtkutils.c:1516 ../pidgin/gtkutils.c:1528
+#: ../pidgin/gtkutils.c:1535
 msgid "You have dragged an image"
 msgstr "Vous avez déposé une image."
 
-#: ../pidgin/gtkutils.c:1505
+#: ../pidgin/gtkutils.c:1517
 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."
@@ -14343,32 +15032,31 @@
 "Vous pouvez envoyer cette image à votre correspondant, l'incorporer dans ce "
 "message ou l'utiliser en tant qu'icône pour cet utilisateur."
 
-#: ../pidgin/gtkutils.c:1511 ../pidgin/gtkutils.c:1532
+#: ../pidgin/gtkutils.c:1523 ../pidgin/gtkutils.c:1543
 msgid "Set as buddy icon"
 msgstr "Utiliser comme icône"
 
-#: ../pidgin/gtkutils.c:1512 ../pidgin/gtkutils.c:1533
+#: ../pidgin/gtkutils.c:1524 ../pidgin/gtkutils.c:1544
 msgid "Send image file"
 msgstr "Envoyer l'image"
 
-#: ../pidgin/gtkutils.c:1513 ../pidgin/gtkutils.c:1533
+#: ../pidgin/gtkutils.c:1525 ../pidgin/gtkutils.c:1544
 msgid "Insert in message"
 msgstr "Insérer dans un message"
 
-#: ../pidgin/gtkutils.c:1517
+#: ../pidgin/gtkutils.c:1529
 msgid "Would you like to set it as the buddy icon for this user?"
 msgstr "Voulez-vous l'utiliser en tant qu'icône pour cette utilisateur ?"
 
-#: ../pidgin/gtkutils.c:1524
-msgid ""
-"You can send this image as a file transfer or embed it into this message, or "
-"use it as the buddy icon for this user."
-msgstr ""
-"Vous pouvez envoyer cette image à votre correspondant ou l'incorporer dans "
-"ce message; vous pouvez aussi l'utiliser en tant qu'icône pour cet "
-"utilisateur."
-
-#: ../pidgin/gtkutils.c:1526
+#: ../pidgin/gtkutils.c:1536
+msgid ""
+"You can send this image as a file transfer, or use it as the buddy icon for "
+"this user."
+msgstr ""
+"Vous pouvez envoyer cette image à votre correspondant ou l'utiliser en tant "
+"qu'icône pour cet utilisateur."
+
+#: ../pidgin/gtkutils.c:1537
 msgid ""
 "You can insert this image into this message, or use it as the buddy icon for "
 "this user"
@@ -14381,11 +15069,11 @@
 #. * send.  The only logical one is "Application," but do we really want to send a binary and nothing else?
 #. * Probably not.  I'll just give an error and return.
 #. The original patch sent the icon used by the launcher.  That's probably wrong
-#: ../pidgin/gtkutils.c:1584
+#: ../pidgin/gtkutils.c:1595
 msgid "Cannot send launcher"
 msgstr "Impossible d'envoyer ce lien."
 
-#: ../pidgin/gtkutils.c:1584
+#: ../pidgin/gtkutils.c:1595
 msgid ""
 "You dragged a desktop launcher. Most likely you wanted to send whatever this "
 "launcher points to instead of this launcher itself."
@@ -14393,7 +15081,7 @@
 "Vous avez déposé un lien du bureau. Vous vouliez probablement envoyer le "
 "fichier vers lequel pointe ce lien au lieu du lien."
 
-#: ../pidgin/gtkutils.c:2344
+#: ../pidgin/gtkutils.c:2317
 #, c-format
 msgid ""
 "<b>File:</b> %s\n"
@@ -14404,27 +15092,27 @@
 "<b>Taille du fichier :</b> %s\n"
 "<b>Taille de l'image :</b> %dx%d"
 
-#: ../pidgin/gtkutils.c:2640
+#: ../pidgin/gtkutils.c:2613
 #, c-format
 msgid "The file '%s' is too large for %s.  Please try a smaller image.\n"
 msgstr ""
 "Le fichier « %s » est trop gros pour %s. Veuillez choisir une image plus "
 "petite.\n"
 
-#: ../pidgin/gtkutils.c:2642
+#: ../pidgin/gtkutils.c:2615
 msgid "Icon Error"
 msgstr "Erreur d'icône"
 
-#: ../pidgin/gtkutils.c:2643
+#: ../pidgin/gtkutils.c:2616
 msgid "Could not set icon"
 msgstr "Impossible de changer d'icône."
 
-#: ../pidgin/gtkutils.c:2743
+#: ../pidgin/gtkutils.c:2716
 #, c-format
 msgid "Failed to open file '%s': %s"
 msgstr "Impossible d'ouvrir le fichier « %s » : %s"
 
-#: ../pidgin/gtkutils.c:2792
+#: ../pidgin/gtkutils.c:2765
 #, c-format
 msgid ""
 "Failed to load image '%s': reason not known, probably a corrupt image file"
@@ -14432,20 +15120,14 @@
 "Impossible de charger l'image « %s » : la raison est inconnue, le fichier "
 "est peut-être endommagé."
 
-#: ../pidgin/gtkwhiteboard.c:760 ../pidgin/gtkwhiteboard.c:779
+#: ../pidgin/gtkwhiteboard.c:754 ../pidgin/gtkwhiteboard.c:773
 msgid "Save File"
 msgstr "Sauver le fichier"
 
-#: ../pidgin/gtkwhiteboard.c:867
+#: ../pidgin/gtkwhiteboard.c:861
 msgid "Select color"
 msgstr "Choisir la couleur"
 
-#. Translators may want to transliterate the name.
-#. It is not to be translated.
-#: ../pidgin/pidgin.h:50
-msgid "Pidgin"
-msgstr "Pidgin"
-
 #: ../pidgin/pidginstock.c:81
 msgid "_Alias"
 msgstr "_Alias"
@@ -14470,6 +15152,22 @@
 msgid "_Open Mail"
 msgstr "_Ouvrir le courrier"
 
+#: ../pidgin/pixmaps/emotes/default/22/default.theme.in.h:2
+msgid "Pidgin smileys"
+msgstr "Frimousses de Pidgin"
+
+#: ../pidgin/pixmaps/emotes/none/none.theme.in.h:1
+msgid "Penguin Pimps"
+msgstr "Penguin Pimps"
+
+#: ../pidgin/pixmaps/emotes/none/none.theme.in.h:2
+msgid "Selecting this disables graphical emoticons."
+msgstr "Ce choix désactive les frimousses graphiques."
+
+#: ../pidgin/pixmaps/emotes/none/none.theme.in.h:3
+msgid "none"
+msgstr "aucun"
+
 #: ../pidgin/plugins/cap/cap.c:449
 msgid "Display Statistics"
 msgstr "Afficher les statistiques"
@@ -14508,18 +15206,18 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/cap/cap.c:934
+#: ../pidgin/plugins/cap/cap.c:935
 msgid "Contact Availability Prediction"
 msgstr "Prédiction de disponibilité"
 
 #. *< name
 #. *< version
-#: ../pidgin/plugins/cap/cap.c:936
+#: ../pidgin/plugins/cap/cap.c:937
 msgid "Contact Availability Prediction plugin."
 msgstr "Plugin de prédiction de disponibilité des contacts."
 
 #. *  summary
-#: ../pidgin/plugins/cap/cap.c:937
+#: ../pidgin/plugins/cap/cap.c:938
 msgid ""
 "The contact availability plugin (cap) is used to display statistical "
 "information about buddies in a users contact list."
@@ -14626,11 +15324,23 @@
 msgid "Received Messages"
 msgstr "Messages reçus"
 
-#: ../pidgin/plugins/convcolors.c:210 ../pidgin/plugins/pidginrc.c:320
+#: ../pidgin/plugins/convcolors.c:210 ../pidgin/plugins/pidginrc.c:251
 #, c-format
 msgid "Select Color for %s"
 msgstr "Choisissez la couleur pour %s"
 
+#: ../pidgin/plugins/convcolors.c:287
+msgid "Bold"
+msgstr "Gras"
+
+#: ../pidgin/plugins/convcolors.c:294
+msgid "Italic"
+msgstr "Italique"
+
+#: ../pidgin/plugins/convcolors.c:301
+msgid "Underline"
+msgstr "Souligné"
+
 #: ../pidgin/plugins/convcolors.c:310
 msgid "Ignore incoming format"
 msgstr "Ignorer les styles reçus"
@@ -14657,8 +15367,8 @@
 "Note: The preference for \"New conversations\" must be set to \"By "
 "conversation count\"."
 msgstr ""
-"Note : il faut choisir « Par nombre de conversations » pour la "
-"préférence pour « Nouvelles conversations »."
+"Note : il faut choisir « Par nombre de conversations » pour la préférence "
+"pour « Nouvelles conversations »."
 
 #: ../pidgin/plugins/extplacement.c:111
 msgid "Number of conversations per window"
@@ -14755,26 +15465,31 @@
 msgstr "Messagerie instantanée"
 
 #. Add the label.
-#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:460
+#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:457
 msgid "Select a person from your address book below, or add a new person."
 msgstr ""
 "Choisissez une personne dans votre carnet d'adresses ou créez une nouvelle "
 "personne."
 
+#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:551
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:303
+msgid "Group:"
+msgstr "Groupe :"
+
 #. "New Person" button
-#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:580
-#: ../pidgin/plugins/gevolution/assoc-buddy.c:469
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:251
+#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:577
+#: ../pidgin/plugins/gevolution/assoc-buddy.c:467
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:249
 msgid "New Person"
 msgstr "Nouvelle personne"
 
 #. "Select Buddy" button
-#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:597
+#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:594
 msgid "Select Buddy"
 msgstr "Choisir contact"
 
 #. Add the label.
-#: ../pidgin/plugins/gevolution/assoc-buddy.c:345
+#: ../pidgin/plugins/gevolution/assoc-buddy.c:343
 msgid ""
 "Select a person from your address book to add this buddy to, or create a new "
 "person."
@@ -14783,45 +15498,45 @@
 "ou créez une nouvelle personne."
 
 #. Add the expander
-#: ../pidgin/plugins/gevolution/assoc-buddy.c:433
+#: ../pidgin/plugins/gevolution/assoc-buddy.c:431
 msgid "User _details"
 msgstr "_Détails du contact"
 
 #. "Associate Buddy" button
-#: ../pidgin/plugins/gevolution/assoc-buddy.c:486
+#: ../pidgin/plugins/gevolution/assoc-buddy.c:484
 msgid "_Associate Buddy"
 msgstr "_Associer un contact"
 
+#: ../pidgin/plugins/gevolution/gevolution.c:238
+#: ../pidgin/plugins/gevolution/gevolution.c:244
+msgid "Unable to send e-mail"
+msgstr "Impossible d'envoyer un courrier électronique"
+
 #: ../pidgin/plugins/gevolution/gevolution.c:239
-#: ../pidgin/plugins/gevolution/gevolution.c:245
-msgid "Unable to send e-mail"
-msgstr "Impossible d'envoyer un courrier électronique"
-
-#: ../pidgin/plugins/gevolution/gevolution.c:240
 msgid "The evolution executable was not found in the PATH."
 msgstr ""
 "Le binaire « evolution » n'a pas été trouvé dans les dossiers par défaut du "
 "PATH."
 
-#: ../pidgin/plugins/gevolution/gevolution.c:246
+#: ../pidgin/plugins/gevolution/gevolution.c:245
 msgid "An e-mail address was not found for this buddy."
 msgstr "L'adresse électronique du contact n'a pas été trouvée."
 
-#: ../pidgin/plugins/gevolution/gevolution.c:272
+#: ../pidgin/plugins/gevolution/gevolution.c:271
 msgid "Add to Address Book"
 msgstr "Ajouter au carnet d'adresses"
 
-#: ../pidgin/plugins/gevolution/gevolution.c:284
+#: ../pidgin/plugins/gevolution/gevolution.c:283
 msgid "Send E-Mail"
 msgstr "Envoyer un courrier"
 
 #. Configuration frame
-#: ../pidgin/plugins/gevolution/gevolution.c:411
+#: ../pidgin/plugins/gevolution/gevolution.c:410
 msgid "Evolution Integration Configuration"
 msgstr "Configuration de l'intégration avec Evolution"
 
 #. Label
-#: ../pidgin/plugins/gevolution/gevolution.c:414
+#: ../pidgin/plugins/gevolution/gevolution.c:413
 msgid "Select all accounts that buddies should be auto-added to."
 msgstr ""
 "Choisissez tous les comptes dont les contacts seront automatiquement ajoutés."
@@ -14832,7 +15547,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/gevolution/gevolution.c:526
+#: ../pidgin/plugins/gevolution/gevolution.c:525
 msgid "Evolution Integration"
 msgstr "Intégration avec Evolution"
 
@@ -14840,37 +15555,37 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../pidgin/plugins/gevolution/gevolution.c:529
-#: ../pidgin/plugins/gevolution/gevolution.c:531
+#: ../pidgin/plugins/gevolution/gevolution.c:528
+#: ../pidgin/plugins/gevolution/gevolution.c:530
 msgid "Provides integration with Evolution."
 msgstr "Fournit une intégration avec Evolution."
 
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:263
+msgid "Please enter the person's information below."
+msgstr "Veuillez saisir les informations de la personne"
+
 #: ../pidgin/plugins/gevolution/new_person_dialog.c:267
-msgid "Please enter the person's information below."
-msgstr "Veuillez saisir les informations de la personne"
-
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:271
 msgid "Please enter the buddy's screen name and account type below."
 msgstr "Veuillez saisir le nom d'utilisateur et le type de compte du contact"
 
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:291
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:287
 msgid "Account type:"
 msgstr "Type de compte :"
 
 #. Optional Information section
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:315
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:311
 msgid "Optional information:"
 msgstr "Informations facultatives :"
 
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:350
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:346
 msgid "First name:"
 msgstr "Prénom :"
 
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:362
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:358
 msgid "Last name:"
 msgstr "Nom :"
 
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:382
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:378
 msgid "E-mail:"
 msgstr "Adresse électronique :"
 
@@ -15172,24 +15887,24 @@
 msgid "Notify Dialog"
 msgstr "Boite de message de notification"
 
-#: ../pidgin/plugins/pidginrc.c:322
+#: ../pidgin/plugins/pidginrc.c:253
 msgid "Select Color"
 msgstr "Choisissez la couleur"
 
-#: ../pidgin/plugins/pidginrc.c:361
+#: ../pidgin/plugins/pidginrc.c:300
+msgid "Select Interface Font"
+msgstr "Choisissez la police d'interface"
+
+#: ../pidgin/plugins/pidginrc.c:303
 #, c-format
 msgid "Select Font for %s"
 msgstr "Choisissez la police pour %s"
 
-#: ../pidgin/plugins/pidginrc.c:398
-msgid "Select Interface Font"
-msgstr "Choisissez la police d'interface"
-
-#: ../pidgin/plugins/pidginrc.c:453
+#: ../pidgin/plugins/pidginrc.c:371
 msgid "GTK+ Interface Font"
 msgstr "Police de l'interface GTK+"
 
-#: ../pidgin/plugins/pidginrc.c:473
+#: ../pidgin/plugins/pidginrc.c:391
 msgid "GTK+ Text Shortcut Theme"
 msgstr "Raccourci du thème GTK+"
 
@@ -15213,36 +15928,36 @@
 #. widget_bool_widgets[i]);
 #. }
 #.
-#: ../pidgin/plugins/pidginrc.c:510
+#: ../pidgin/plugins/pidginrc.c:428
 msgid "Interface colors"
 msgstr "Couleurs de l'interface"
 
-#: ../pidgin/plugins/pidginrc.c:534
+#: ../pidgin/plugins/pidginrc.c:452
 msgid "Widget Sizes"
 msgstr "Tailles des éléments"
 
-#: ../pidgin/plugins/pidginrc.c:555
+#: ../pidgin/plugins/pidginrc.c:473
 msgid "Fonts"
 msgstr "Polices"
 
-#: ../pidgin/plugins/pidginrc.c:578
-msgid "Tools"
-msgstr "Outils"
-
-#: ../pidgin/plugins/pidginrc.c:583
+#: ../pidgin/plugins/pidginrc.c:497
+msgid "Gtkrc File Tools"
+msgstr "Outils du fichier Gtkrc"
+
+#: ../pidgin/plugins/pidginrc.c:502
 #, c-format
 msgid "Write settings to %s%sgtkrc-2.0"
 msgstr "Écrire les préférences dans %s%sgtkrc-2.0"
 
-#: ../pidgin/plugins/pidginrc.c:591
+#: ../pidgin/plugins/pidginrc.c:511
 msgid "Re-read gtkrc files"
 msgstr "Relire les fichiers gtkrc"
 
-#: ../pidgin/plugins/pidginrc.c:624
+#: ../pidgin/plugins/pidginrc.c:544
 msgid "Pidgin GTK+ Theme Control"
 msgstr "Contrôle Pidgin du thème GTK+"
 
-#: ../pidgin/plugins/pidginrc.c:626 ../pidgin/plugins/pidginrc.c:627
+#: ../pidgin/plugins/pidginrc.c:546 ../pidgin/plugins/pidginrc.c:547
 msgid "Provides access to commonly used gtkrc settings."
 msgstr "Fournit un accès aux préférences couramment utilisés du fichier gtkrc."
 
@@ -15259,34 +15974,25 @@
 "Lets you send raw input to text-based protocols (XMPP, MSN, IRC, TOC). Hit "
 "'Enter' in the entry box to send. Watch the debug window."
 msgstr ""
-"Permet d'envoyer des données brutes aux protocoles en mode texte (XMPP, "
-"MSN, IRC, TOC). Tapez « Entrée » dans la boîte de saisie pour envoyer. "
-"Observez le résultat dans la fenêtre de debug."
+"Permet d'envoyer des données brutes aux protocoles en mode texte (XMPP, MSN, "
+"IRC, TOC). Tapez « Entrée » dans la boîte de saisie pour envoyer. Observez "
+"le résultat dans la fenêtre de debug."
 
 #: ../pidgin/plugins/relnot.c:71
 #, c-format
-msgid "You are using %s version %s.  The current version is %s.<hr>"
-msgstr "Vous utilisez %s version %s. La dernière version est %s.<hr>"
-
-#: ../pidgin/plugins/relnot.c:77
-#, c-format
-msgid ""
-"<b>ChangeLog:</b>\n"
-"%s<br><br>"
-msgstr ""
-"<b>Nouveautés :</b>\n"
-"%s<br><br>"
-
-#: ../pidgin/plugins/relnot.c:82
-#, c-format
-msgid ""
-"You can get version %s from:<br><a href=\"http://pidgin.im/\">http://pidgin."
-"im</a>."
-msgstr ""
-"Vous pouvez télécharger la version %s sur :<br><a href=\"http://pidgin.im/"
-"\">http://pidgin.im</a>."
-
-#: ../pidgin/plugins/relnot.c:86 ../pidgin/plugins/relnot.c:87
+msgid ""
+"You are using %s version %s.  The current version is %s.  You can get it "
+"from <a href=\"%s\">%s</a><hr>"
+msgstr ""
+"Vous utilisez %s version %s. La dernière version est %s. Vous pouvez la "
+"télécharger depuis <a href=\"%s\">%s</a><hr>"
+
+#: ../pidgin/plugins/relnot.c:79
+#, c-format
+msgid "<b>ChangeLog:</b><br>%s"
+msgstr "<b>Nouveautés :</b><br>%s"
+
+#: ../pidgin/plugins/relnot.c:84 ../pidgin/plugins/relnot.c:85
 msgid "New Version Available"
 msgstr "Nouvelle version disponible"
 
@@ -15296,19 +16002,19 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/relnot.c:145
+#: ../pidgin/plugins/relnot.c:143
 msgid "Release Notification"
 msgstr "Notification de nouvelle version"
 
 #. *< name
 #. *< version
 #. *  summary
-#: ../pidgin/plugins/relnot.c:148
+#: ../pidgin/plugins/relnot.c:146
 msgid "Checks periodically for new releases."
 msgstr "Vérifie périodiquement pour de nouvelles mises à jour."
 
 #. *  description
-#: ../pidgin/plugins/relnot.c:150
+#: ../pidgin/plugins/relnot.c:148
 msgid ""
 "Checks periodically for new releases and notifies the user with the "
 "ChangeLog."
@@ -15316,68 +16022,68 @@
 "Vérifie périodiquement pour de nouvelles versions et les annonce ainsi que "
 "les nouveautés dans ces mises à jour."
 
-#: ../pidgin/plugins/spellchk.c:1965
+#: ../pidgin/plugins/spellchk.c:1962
 msgid "Duplicate Correction"
 msgstr "Correction en double"
 
-#: ../pidgin/plugins/spellchk.c:1966
+#: ../pidgin/plugins/spellchk.c:1963
 msgid "The specified word already exists in the correction list."
 msgstr "Le mot existe déjà dans la liste de corrections."
 
-#: ../pidgin/plugins/spellchk.c:2180
+#: ../pidgin/plugins/spellchk.c:2177
 msgid "Text Replacements"
 msgstr "Substitutions de texte"
 
-#: ../pidgin/plugins/spellchk.c:2203
+#: ../pidgin/plugins/spellchk.c:2200
 msgid "You type"
 msgstr "Vous saisissez"
 
-#: ../pidgin/plugins/spellchk.c:2217
+#: ../pidgin/plugins/spellchk.c:2214
 msgid "You send"
 msgstr "Vous envoyez"
 
-#: ../pidgin/plugins/spellchk.c:2231
+#: ../pidgin/plugins/spellchk.c:2228
 msgid "Whole words only"
 msgstr "Mots entiers uniquement"
 
-#: ../pidgin/plugins/spellchk.c:2243
+#: ../pidgin/plugins/spellchk.c:2240
 msgid "Case sensitive"
 msgstr "Sensible à la casse"
 
-#: ../pidgin/plugins/spellchk.c:2269
+#: ../pidgin/plugins/spellchk.c:2266
 msgid "Add a new text replacement"
 msgstr "Ajouter une nouvelle substitution"
 
-#: ../pidgin/plugins/spellchk.c:2285
+#: ../pidgin/plugins/spellchk.c:2282
 msgid "You _type:"
 msgstr "Vous _saisissez :"
 
-#: ../pidgin/plugins/spellchk.c:2302
+#: ../pidgin/plugins/spellchk.c:2299
 msgid "You _send:"
 msgstr "Vous _envoyez :"
 
 #. Created here so it can be passed to whole_words_button_toggled.
-#: ../pidgin/plugins/spellchk.c:2314
+#: ../pidgin/plugins/spellchk.c:2311
 msgid "_Exact case match (uncheck for automatic case handling)"
 msgstr "Correspondance _parfaite uniquement (décoche la gestion automatique)"
 
-#: ../pidgin/plugins/spellchk.c:2316
+#: ../pidgin/plugins/spellchk.c:2313
 msgid "Only replace _whole words"
 msgstr "Remplace uniquement les mots _complets"
 
-#: ../pidgin/plugins/spellchk.c:2341
+#: ../pidgin/plugins/spellchk.c:2338
 msgid "General Text Replacement Options"
 msgstr "Options de substitutions globales de texte"
 
-#: ../pidgin/plugins/spellchk.c:2342
+#: ../pidgin/plugins/spellchk.c:2339
 msgid "Enable replacement of last word on send"
 msgstr "Permet la substitution des mots à l'envoi"
 
-#: ../pidgin/plugins/spellchk.c:2373
+#: ../pidgin/plugins/spellchk.c:2370
 msgid "Text replacement"
 msgstr "Substitutions de texte"
 
-#: ../pidgin/plugins/spellchk.c:2375 ../pidgin/plugins/spellchk.c:2376
+#: ../pidgin/plugins/spellchk.c:2372 ../pidgin/plugins/spellchk.c:2373
 msgid "Replaces text in outgoing messages according to user-defined rules."
 msgstr ""
 "Remplace le texte dans les messages envoyés grâce à des règles de "
@@ -15389,7 +16095,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/ticker/ticker.c:77 ../pidgin/plugins/ticker/ticker.c:355
+#: ../pidgin/plugins/ticker/ticker.c:74 ../pidgin/plugins/ticker/ticker.c:354
 msgid "Buddy Ticker"
 msgstr "Défilement des contacts"
 
@@ -15397,7 +16103,7 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../pidgin/plugins/ticker/ticker.c:358 ../pidgin/plugins/ticker/ticker.c:360
+#: ../pidgin/plugins/ticker/ticker.c:357 ../pidgin/plugins/ticker/ticker.c:359
 msgid "A horizontal scrolling version of the buddy list."
 msgstr "Une version horizontale avec défilement de la liste de contacts."
 
@@ -15483,44 +16189,44 @@
 "Permet à l'utilisateur de personnaliser dans les conversions et les archives "
 "la manière dont est affiché l'horodatage."
 
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:183
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:569
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:616
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:174
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:589
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:636
 msgid "Opacity:"
 msgstr "Opacité :"
 
 #. IM Convo trans options
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:533
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:553
 msgid "IM Conversation Windows"
 msgstr "Fenêtres de conversation"
 
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:534
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:554
 msgid "_IM window transparency"
 msgstr "Fenêtre de _conversation transparente"
 
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:548
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:568
 msgid "_Show slider bar in IM window"
 msgstr "Afficher la barre de défilement dans la fenêtre"
 
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:555
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:575
 msgid "Remove IM window transparency on focus"
 msgstr "Supprimer la transparence pour les fenêtres de conversation actives"
 
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:558
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:606
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:578
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:626
 msgid "Always on top"
 msgstr "Toujours en avant plan"
 
 #. Buddy List trans options
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:590
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:610
 msgid "Buddy List Window"
 msgstr "Fenêtre de la liste de contacts"
 
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:591
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:611
 msgid "_Buddy List window transparency"
 msgstr "Fenêtre de la liste de _contacts transparente"
 
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:604
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:624
 msgid "Remove Buddy List window transparency on focus"
 msgstr "Supprimer la transparence quand la liste des contacts est active"
 
@@ -15530,19 +16236,19 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:664
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:684
 msgid "Transparency"
 msgstr "Transparence"
 
 #. *< name
 #. *< version
 #. *  summary
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:667
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:687
 msgid "Variable Transparency for the buddy list and conversations."
 msgstr "Transparence variable pour la liste de contacts et les conversations."
 
 #. *  description
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:669
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:689
 msgid ""
 "This plugin enables variable alpha transparency on conversation windows and "
 "the buddy list.\n"
@@ -15601,7 +16307,7 @@
 "Fournit des options spécifiques à Pidgin Windows, tels que l'accrochage de "
 "la liste de contacts."
 
-#: ../pidgin/plugins/xmppconsole.c:665
+#: ../pidgin/plugins/xmppconsole.c:667
 msgid "<font color='#777777'>Logged out.</font>"
 msgstr "<font color='#777777'>Déconnecté.</font>"
 
@@ -15611,7 +16317,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/xmppconsole.c:745 ../pidgin/plugins/xmppconsole.c:841
+#: ../pidgin/plugins/xmppconsole.c:746 ../pidgin/plugins/xmppconsole.c:841
 #: ../pidgin/plugins/xmppconsole.c:860
 msgid "XMPP Console"
 msgstr "Console XMPP"
@@ -15648,6 +16354,92 @@
 msgid "This plugin is useful for debbuging XMPP servers or clients."
 msgstr "Ce plugin est utile pour débugger les clients ou serveurs XMPP."
 
+#~ msgid ""
+#~ "%s was disconnected due to the following error:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "L'erreur suivante a provoqué la déconnexion de %s :\n"
+#~ "%s"
+
+#~ msgid "Commands are not supported yet. Message was NOT sent."
+#~ msgstr ""
+#~ "Les commandes ne sont pas encore supportées. Le message n'a pas été "
+#~ "envoyé."
+
+#~ msgid "User information for %s unavailable:"
+#~ msgstr "Les informations de %s ne sont pas disponibles :"
+
+#~ msgid ""
+#~ "Could not add the buddy %s for an unknown reason.  The most common reason "
+#~ "for this is that you have the maximum number of allowed buddies in your "
+#~ "buddy list."
+#~ msgstr ""
+#~ "Impossible d'ajouter le contact %s pour une raison inconnue. La raison la "
+#~ "plus probable est que le nombre maximum de contact a été atteint dans "
+#~ "votre liste de contacts."
+
+#~ msgid "_Connect"
+#~ msgstr "_Connecter"
+
+#~ msgid "Send IM fail\n"
+#~ msgstr "Échec à l'envoi d'un message.\n"
+
+#~ msgid "Reject watching by other users"
+#~ msgstr "Empêcher l'observation par les autres utilisateurs"
+
+#~ msgid "Block invites"
+#~ msgstr "Bloquer les invitations"
+
+#~ msgid "Reject online status attribute requests"
+#~ msgstr "Empêcher les demandes d'attributs d'état"
+
+#~ msgid "Unavailable"
+#~ msgstr "Non disponible"
+
+#~ msgid "Alias..."
+#~ msgstr "Alias..."
+
+#~ msgid ""
+#~ "<FONT SIZE=\"4\">IRC:</FONT> #pidgin-win32 on irc.freenode.net<BR><BR>"
+#~ msgstr ""
+#~ "<FONT SIZE=\"4\">IRC :</FONT> #pidgin-win32 sur irc.freenode.net<BR><BR>"
+
+#~ msgid "Larger font size"
+#~ msgstr "Police plus grande"
+
+#~ msgid "Smaller font size"
+#~ msgstr "Police plus petite"
+
+#~ msgid "Reset formatting"
+#~ msgstr "Effacer le style"
+
+#~ msgid "Insert link"
+#~ msgstr "Insérer un lien"
+
+#~ msgid "Insert image"
+#~ msgstr "Insérer une image"
+
+#~ msgid "Insert smiley"
+#~ msgstr "Insérer une frimousse"
+
+#~ msgid ""
+#~ "You can send this image as a file transfer or embed it into this message, "
+#~ "or use it as the buddy icon for this user."
+#~ msgstr ""
+#~ "Vous pouvez envoyer cette image à votre correspondant ou l'incorporer "
+#~ "dans ce message; vous pouvez aussi l'utiliser en tant qu'icône pour cet "
+#~ "utilisateur."
+
+#~ msgid "Tools"
+#~ msgstr "Outils"
+
+#~ msgid ""
+#~ "You can get version %s from:<br><a href=\"http://pidgin.im/\">http://"
+#~ "pidgin.im</a>."
+#~ msgstr ""
+#~ "Vous pouvez télécharger la version %s sur :<br><a href=\"http://pidgin.im/"
+#~ "\">http://pidgin.im</a>."
+
 #~ msgid "Toggle offline buddies"
 #~ msgstr "Basculer l'affichage des contacts déconnectés"
 
@@ -15959,9 +16751,6 @@
 #~ msgid "Selection"
 #~ msgstr "Choix"
 
-#~ msgid "Select a number"
-#~ msgstr "Choisissez un numéro"
-
 #~ msgid "Faces"
 #~ msgstr "Figure"
 
@@ -15993,9 +16782,6 @@
 #~ msgid "The sending process of file[%s] has been canceled by buddy[%d]"
 #~ msgstr "L'envoi du fichier (%s) a été annulé par le contact (%d)."
 
-#~ msgid "Connection timeout!"
-#~ msgstr "Connexion morte."
-
 #~ msgid "User info is not updated"
 #~ msgstr "Les informations n'ont pas été mises à jour."
 
@@ -16255,9 +17041,6 @@
 #~ msgid "Burmese"
 #~ msgstr "Birman"
 
-#~ msgid "Norwegian (Nynorsk)"
-#~ msgstr "Norvégien (nynorsk)"
-
 #~ msgid "Punjabi"
 #~ msgstr "Panjâbî"
 
--- a/po/pt_BR.po	Thu Jul 12 23:57:56 2007 +0000
+++ b/po/pt_BR.po	Fri Jul 13 00:03:15 2007 +0000
@@ -7,8 +7,8 @@
 msgstr ""
 "Project-Id-Version: Pidgin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-06-13 22:50-0300\n"
-"PO-Revision-Date: 2007-06-13 22:36-0300\n"
+"POT-Creation-Date: 2007-07-12 09:38-0300\n"
+"PO-Revision-Date: 2007-07-12 09:37-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,19 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
-#: ../finch/finch.c:180
+#. Translators may want to transliterate the name.
+#. It is not to be translated.
+#: ../finch/finch.c:70 ../finch/finch.c:298 ../finch/finch.c:327
+#: ../finch/finch.c:404
+msgid "Finch"
+msgstr "Finch"
+
+#: ../finch/finch.c:204
 #, c-format
 msgid "%s. Try `%s -h' for more information.\n"
 msgstr "%s. Tente `%s -h' para mais informações.\n"
 
-#: ../finch/finch.c:182
+#: ../finch/finch.c:206
 #, c-format
 msgid ""
 "%s\n"
@@ -44,13 +51,7 @@
 "  -n, --nologin       não conecte automaticamente\n"
 "  -v, --version       exiba a versão atual e saia\n"
 
-#. Translators may want to transliterate the name.
-#. It is not to be translated.
-#: ../finch/finch.c:274 ../finch/finch.c:303
-msgid "Finch"
-msgstr "Finch"
-
-#: ../finch/finch.c:301 ../pidgin/gtkmain.c:682
+#: ../finch/finch.c:325 ../pidgin/gtkmain.c:708
 #, c-format
 msgid ""
 "%s encountered errors migrating your settings from %s to %s. Please "
@@ -61,95 +62,103 @@
 "investigar e completar a migração manualmente. Pedimos também que você "
 "relate este erro em http://developer.pidgin.im"
 
-#: ../finch/gntaccount.c:119 ../finch/gntblist.c:290 ../finch/gntblist.c:415
-#: ../finch/gntblist.c:428 ../finch/gntplugin.c:181 ../finch/gntplugin.c:225
-#: ../finch/gntstatus.c:294 ../finch/gntstatus.c:302
-#: ../libpurple/protocols/jabber/buddy.c:1426
+#: ../finch/gntaccount.c:122 ../finch/gntaccount.c:477 ../finch/gntblist.c:299
+#: ../finch/gntblist.c:424 ../finch/gntblist.c:437 ../finch/gntplugin.c:185
+#: ../finch/gntplugin.c:233 ../finch/gntstatus.c:297 ../finch/gntstatus.c:305
+#: ../libpurple/protocols/jabber/buddy.c:1464
 #: ../libpurple/protocols/jabber/chat.c:677
 #: ../libpurple/protocols/jabber/chat.c:688
-#: ../libpurple/protocols/jabber/jabber.c:1235
-#: ../libpurple/protocols/qq/group_join.c:326
+#: ../libpurple/protocols/jabber/jabber.c:1227
+#: ../libpurple/protocols/qq/group_join.c:328
 #: ../libpurple/protocols/silc/ops.c:57 ../libpurple/protocols/silc/ops.c:1456
 #: ../libpurple/protocols/silc10/ops.c:1451
 msgid "Error"
 msgstr "Erro"
 
-#: ../finch/gntaccount.c:119
+#: ../finch/gntaccount.c:122
 msgid "Account was not added"
 msgstr "A conta não foi adicionada"
 
-#: ../finch/gntaccount.c:120
+#: ../finch/gntaccount.c:123
 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
+#: ../finch/gntaccount.c:430
 msgid "New mail notifications"
 msgstr "Notificar ao receber novos emails"
 
-#: ../finch/gntaccount.c:433
+#: ../finch/gntaccount.c:440
 msgid "Remember password"
 msgstr "Lembrar senha"
 
-#: ../finch/gntaccount.c:474 ../pidgin/gtkaccount.c:1478
-#: ../pidgin/gtkblist.c:3996
+#: ../finch/gntaccount.c:478
+msgid "There's no protocol plugins installed."
+msgstr "Não há nenhum plugin de protocolo instalado."
+
+#: ../finch/gntaccount.c:479
+msgid "(You probably forgot to 'make install'.)"
+msgstr "(Provavelmente você esqueceu de digitar 'make install')"
+
+#: ../finch/gntaccount.c:489 ../pidgin/gtkaccount.c:1473
+#: ../pidgin/gtkblist.c:4014
 msgid "Modify Account"
 msgstr "Modificar conta"
 
-#: ../finch/gntaccount.c:474
+#: ../finch/gntaccount.c:489
 msgid "New Account"
 msgstr "Nova conta"
 
-#: ../finch/gntaccount.c:500 ../pidgin/gtkft.c:695
+#: ../finch/gntaccount.c:514 ../pidgin/gtkft.c:695
 msgid "Protocol:"
 msgstr "Protocolo:"
 
-#: ../finch/gntaccount.c:508
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:295
+#: ../finch/gntaccount.c:522
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:291
 msgid "Screen name:"
 msgstr "Nome de usuário:"
 
-#: ../finch/gntaccount.c:521
+#: ../finch/gntaccount.c:535
 msgid "Password:"
 msgstr "Senha:"
 
-#: ../finch/gntaccount.c:531
+#: ../finch/gntaccount.c:545
 msgid "Alias:"
 msgstr "Apelido:"
 
 #. Cancel button
 #. Cancel
-#: ../finch/gntaccount.c:554 ../finch/gntaccount.c:617
-#: ../finch/gntaccount.c:853 ../finch/gntblist.c:334 ../finch/gntblist.c:403
-#: ../finch/gntblist.c:438 ../finch/gntblist.c:770 ../finch/gntblist.c:967
-#: ../finch/gntblist.c:1063 ../finch/gntblist.c:2160 ../finch/gntplugin.c:360
-#: ../finch/gntpounce.c:456 ../finch/gntpounce.c:654 ../finch/gntprefs.c:246
-#: ../finch/gntstatus.c:142 ../finch/gntstatus.c:475 ../finch/gntstatus.c:600
+#: ../finch/gntaccount.c:568 ../finch/gntaccount.c:631
+#: ../finch/gntaccount.c:875 ../finch/gntblist.c:343 ../finch/gntblist.c:412
+#: ../finch/gntblist.c:447 ../finch/gntblist.c:794 ../finch/gntblist.c:996
+#: ../finch/gntblist.c:1092 ../finch/gntblist.c:2198 ../finch/gntplugin.c:378
+#: ../finch/gntpounce.c:456 ../finch/gntpounce.c:654 ../finch/gntprefs.c:264
+#: ../finch/gntstatus.c:143 ../finch/gntstatus.c:478 ../finch/gntstatus.c:603
 #: ../libpurple/account.c:984 ../libpurple/account.c:1234
-#: ../libpurple/account.c:1269 ../libpurple/conversation.c:1168
+#: ../libpurple/account.c:1269 ../libpurple/conversation.c:1173
 #: ../libpurple/plugins/buddynote.c:51 ../libpurple/protocols/gg/gg.c:502
 #: ../libpurple/protocols/gg/gg.c:661 ../libpurple/protocols/gg/gg.c:798
 #: ../libpurple/protocols/gg/gg.c:879
-#: ../libpurple/protocols/jabber/buddy.c:584
-#: ../libpurple/protocols/jabber/buddy.c:1788
-#: ../libpurple/protocols/jabber/buddy.c:1824
+#: ../libpurple/protocols/jabber/buddy.c:588
+#: ../libpurple/protocols/jabber/buddy.c:1826
+#: ../libpurple/protocols/jabber/buddy.c:1862
 #: ../libpurple/protocols/jabber/chat.c:786
 #: ../libpurple/protocols/jabber/jabber.c:882
-#: ../libpurple/protocols/jabber/jabber.c:1390
+#: ../libpurple/protocols/jabber/jabber.c:1384
 #: ../libpurple/protocols/jabber/si.c:868
 #: ../libpurple/protocols/jabber/xdata.c:337
 #: ../libpurple/protocols/msn/msn.c:259 ../libpurple/protocols/msn/msn.c:276
 #: ../libpurple/protocols/msn/msn.c:293 ../libpurple/protocols/msn/msn.c:310
 #: ../libpurple/protocols/msn/msn.c:331
-#: ../libpurple/protocols/oscar/oscar.c:6046
+#: ../libpurple/protocols/oscar/oscar.c:6073
 #: ../libpurple/protocols/oscar/peer.c:1023
 #: ../libpurple/protocols/qq/buddy_info.c:484
 #: ../libpurple/protocols/qq/buddy_opt.c:214
 #: ../libpurple/protocols/qq/buddy_opt.c:409
 #: ../libpurple/protocols/qq/group.c:124
-#: ../libpurple/protocols/qq/group_join.c:138
-#: ../libpurple/protocols/qq/group_join.c:363
-#: ../libpurple/protocols/qq/group_opt.c:143
-#: ../libpurple/protocols/qq/group_opt.c:398
+#: ../libpurple/protocols/qq/group_join.c:140
+#: ../libpurple/protocols/qq/group_join.c:365
+#: ../libpurple/protocols/qq/group_opt.c:144
+#: ../libpurple/protocols/qq/group_opt.c:399
 #: ../libpurple/protocols/qq/sys_msg.c:115
 #: ../libpurple/protocols/qq/sys_msg.c:174
 #: ../libpurple/protocols/qq/sys_msg.c:269
@@ -177,158 +186,160 @@
 #: ../libpurple/protocols/silc10/silc.c:942
 #: ../libpurple/protocols/yahoo/yahoo.c:989
 #: ../libpurple/protocols/yahoo/yahoo.c:3248
-#: ../libpurple/protocols/yahoo/yahoo.c:3259 ../pidgin/gtkaccount.c:1916
-#: ../pidgin/gtkaccount.c:2514 ../pidgin/gtkblist.c:5889
-#: ../pidgin/gtkdialogs.c:724 ../pidgin/gtkdialogs.c:871
-#: ../pidgin/gtkdialogs.c:963 ../pidgin/gtkdialogs.c:983
-#: ../pidgin/gtkdialogs.c:1007 ../pidgin/gtkdialogs.c:1029
-#: ../pidgin/gtkdialogs.c:1077 ../pidgin/gtkdialogs.c:1118
-#: ../pidgin/gtkdialogs.c:1174 ../pidgin/gtkdialogs.c:1213
-#: ../pidgin/gtkdialogs.c:1240 ../pidgin/gtkimhtmltoolbar.c:423
-#: ../pidgin/gtklog.c:302 ../pidgin/gtkplugin.c:288 ../pidgin/gtkpounce.c:1102
-#: ../pidgin/gtkprivacy.c:566 ../pidgin/gtkprivacy.c:582
-#: ../pidgin/gtkprivacy.c:607 ../pidgin/gtkprivacy.c:621
-#: ../pidgin/gtkrequest.c:270 ../pidgin/gtksavedstatuses.c:337
+#: ../libpurple/protocols/yahoo/yahoo.c:3259 ../pidgin/gtkaccount.c:1908
+#: ../pidgin/gtkaccount.c:2501 ../pidgin/gtkblist.c:5915
+#: ../pidgin/gtkdialogs.c:727 ../pidgin/gtkdialogs.c:865
+#: ../pidgin/gtkdialogs.c:957 ../pidgin/gtkdialogs.c:977
+#: ../pidgin/gtkdialogs.c:1001 ../pidgin/gtkdialogs.c:1023
+#: ../pidgin/gtkdialogs.c:1071 ../pidgin/gtkdialogs.c:1112
+#: ../pidgin/gtkdialogs.c:1168 ../pidgin/gtkdialogs.c:1207
+#: ../pidgin/gtkdialogs.c:1234 ../pidgin/gtkimhtmltoolbar.c:425
+#: ../pidgin/gtklog.c:327 ../pidgin/gtkplugin.c:288 ../pidgin/gtkpounce.c:1115
+#: ../pidgin/gtkprivacy.c:562 ../pidgin/gtkprivacy.c:578
+#: ../pidgin/gtkprivacy.c:603 ../pidgin/gtkprivacy.c:617
+#: ../pidgin/gtkrequest.c:270 ../pidgin/gtksavedstatuses.c:344
+#: ../pidgin/gtkstatusbox.c:1582
 msgid "Cancel"
 msgstr "Cancelar"
 
 #. Save button
 #. Save
-#: ../finch/gntaccount.c:558 ../finch/gntplugin.c:360 ../finch/gntpounce.c:462
-#: ../finch/gntprefs.c:246 ../finch/gntstatus.c:478 ../finch/gntstatus.c:588
+#: ../finch/gntaccount.c:572 ../finch/gntplugin.c:378 ../finch/gntpounce.c:462
+#: ../finch/gntprefs.c:264 ../finch/gntstatus.c:481 ../finch/gntstatus.c:591
 #: ../libpurple/account.c:1268 ../libpurple/plugins/buddynote.c:50
-#: ../libpurple/protocols/jabber/buddy.c:583 ../pidgin/gtkdebug.c:748
+#: ../libpurple/protocols/jabber/buddy.c:587 ../pidgin/gtkdebug.c:748
 #: ../pidgin/gtkrequest.c:276
 msgid "Save"
 msgstr "Salvar"
 
-#: ../finch/gntaccount.c:611 ../pidgin/gtkaccount.c:1908
-#: ../pidgin/gtksavedstatuses.c:328
+#: ../finch/gntaccount.c:625 ../pidgin/gtkaccount.c:1900
+#: ../pidgin/gtksavedstatuses.c:332 ../pidgin/gtkstatusbox.c:1576
 #, c-format
 msgid "Are you sure you want to delete %s?"
 msgstr "Você tem certeza de que deseja remover %s?"
 
-#: ../finch/gntaccount.c:614
+#: ../finch/gntaccount.c:628
 msgid "Delete Account"
 msgstr "Remover conta"
 
 #. Delete button
-#: ../finch/gntaccount.c:616 ../finch/gntaccount.c:683
-#: ../finch/gntpounce.c:653 ../finch/gntpounce.c:714 ../finch/gntstatus.c:141
-#: ../finch/gntstatus.c:204 ../pidgin/gtkaccount.c:1915 ../pidgin/gtklog.c:301
-#: ../pidgin/gtkpounce.c:1101 ../pidgin/gtkrequest.c:273
-#: ../pidgin/gtksavedstatuses.c:336
+#: ../finch/gntaccount.c:630 ../finch/gntaccount.c:699
+#: ../finch/gntpounce.c:653 ../finch/gntpounce.c:715 ../finch/gntstatus.c:142
+#: ../finch/gntstatus.c:207 ../pidgin/gtkaccount.c:1907 ../pidgin/gtklog.c:326
+#: ../pidgin/gtkpounce.c:1114 ../pidgin/gtkrequest.c:273
+#: ../pidgin/gtksavedstatuses.c:343 ../pidgin/gtkstatusbox.c:1581
 msgid "Delete"
 msgstr "Remover"
 
-#: ../finch/gntaccount.c:646 ../finch/gntblist.c:2065 ../finch/gntui.c:76
-#: ../pidgin/gtkaccount.c:2340 ../pidgin/gtkdocklet.c:522
+#: ../finch/gntaccount.c:662 ../finch/gntblist.c:2104 ../finch/gntui.c:77
+#: ../pidgin/gtkaccount.c:2327 ../pidgin/gtkdocklet.c:522
 msgid "Accounts"
 msgstr "Contas"
 
-#: ../finch/gntaccount.c:652
+#: ../finch/gntaccount.c:668
 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:675 ../finch/gntaccount.c:852 ../finch/gntblist.c:333
-#: ../finch/gntblist.c:403 ../finch/gntblist.c:438 ../finch/gntnotify.c:369
-#: ../finch/gntpounce.c:699 ../finch/gntstatus.c:194
+#: ../finch/gntaccount.c:691 ../finch/gntaccount.c:874 ../finch/gntblist.c:342
+#: ../finch/gntblist.c:412 ../finch/gntblist.c:447 ../finch/gntnotify.c:379
+#: ../finch/gntpounce.c:700 ../finch/gntstatus.c:197
 #: ../libpurple/protocols/gg/gg.c:878 ../libpurple/protocols/qq/sys_msg.c:116
 #: ../libpurple/protocols/qq/sys_msg.c:175
 #: ../libpurple/protocols/qq/sys_msg.c:270
 #: ../libpurple/protocols/sametime/sametime.c:5486
 #: ../libpurple/protocols/silc/chat.c:615
-#: ../libpurple/protocols/silc10/chat.c:599 ../pidgin/gtkaccount.c:2513
-#: ../pidgin/gtkblist.c:5888 ../pidgin/gtkconv.c:1687
+#: ../libpurple/protocols/silc10/chat.c:599 ../pidgin/gtkaccount.c:2500
+#: ../pidgin/gtkblist.c:5914 ../pidgin/gtkconv.c:1651
 #: ../pidgin/gtkrequest.c:274
 msgid "Add"
 msgstr "Adicionar"
 
 #. Modify button
-#: ../finch/gntaccount.c:679 ../finch/gntpounce.c:706
+#: ../finch/gntaccount.c:695 ../finch/gntpounce.c:707
 msgid "Modify"
 msgstr "Modificar"
 
-#: ../finch/gntaccount.c:775 ../pidgin/gtkaccount.c:2460
+#: ../finch/gntaccount.c:797 ../pidgin/gtkaccount.c:2447
 #, 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:848 ../pidgin/gtkaccount.c:2512
+#: ../finch/gntaccount.c:870 ../pidgin/gtkaccount.c:2499
 msgid "Add buddy to your list?"
 msgstr "Adicionar amigo à sua lista?"
 
-#: ../finch/gntaccount.c:902 ../pidgin/gtkaccount.c:2564
+#: ../finch/gntaccount.c:924 ../pidgin/gtkaccount.c:2551
 #, 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:922 ../finch/gntaccount.c:929
-#: ../pidgin/gtkaccount.c:2587 ../pidgin/gtkaccount.c:2593
+#: ../finch/gntaccount.c:949 ../finch/gntaccount.c:952
+#: ../finch/gntaccount.c:979 ../pidgin/gtkaccount.c:2574
+#: ../pidgin/gtkaccount.c:2580
 msgid "Authorize buddy?"
 msgstr "Autorizar amigo?"
 
-#: ../finch/gntaccount.c:926 ../finch/gntaccount.c:933
-#: ../pidgin/gtkaccount.c:2588 ../pidgin/gtkaccount.c:2594
+#: ../finch/gntaccount.c:956 ../finch/gntaccount.c:983
+#: ../pidgin/gtkaccount.c:2575 ../pidgin/gtkaccount.c:2581
 msgid "Authorize"
 msgstr "Autorizar"
 
-#: ../finch/gntaccount.c:927 ../finch/gntaccount.c:934
-#: ../pidgin/gtkaccount.c:2589 ../pidgin/gtkaccount.c:2595
+#: ../finch/gntaccount.c:957 ../finch/gntaccount.c:984
+#: ../pidgin/gtkaccount.c:2576 ../pidgin/gtkaccount.c:2582
 msgid "Deny"
 msgstr "Negar"
 
-#: ../finch/gntblist.c:279
+#: ../finch/gntblist.c:288
 msgid "You must provide a screename for the buddy."
 msgstr "Você precisa digitar um nome de usuário para o amigo."
 
-#: ../finch/gntblist.c:281
+#: ../finch/gntblist.c:290
 msgid "You must provide a group."
 msgstr "Você precisa digitar um grupo."
 
-#: ../finch/gntblist.c:283
+#: ../finch/gntblist.c:292
 msgid "You must select an account."
 msgstr "Você precisa selecionar uma conta."
 
-#: ../finch/gntblist.c:285
+#: ../finch/gntblist.c:294
 msgid "The selected account is not online."
 msgstr "A conta selecionada não está conectada."
 
-#: ../finch/gntblist.c:290
+#: ../finch/gntblist.c:299
 msgid "Error adding buddy"
 msgstr "Erro ao adicionar amigo"
 
-#: ../finch/gntblist.c:315 ../libpurple/protocols/oscar/oscar.c:2844
-#: ../pidgin/gtkaccount.c:1991 ../pidgin/gtksavedstatuses.c:924
+#: ../finch/gntblist.c:324 ../libpurple/protocols/oscar/oscar.c:2864
+#: ../pidgin/gtkaccount.c:1983 ../pidgin/gtksavedstatuses.c:979
 msgid "Screen Name"
 msgstr "Nome de usuário"
 
-#: ../finch/gntblist.c:318 ../finch/gntblist.c:395 ../finch/gntblist.c:1211
+#: ../finch/gntblist.c:327 ../finch/gntblist.c:404 ../finch/gntblist.c:1240
 #: ../libpurple/protocols/msn/msn.c:1364
 #: ../libpurple/protocols/silc/chat.c:606
 #: ../libpurple/protocols/silc10/chat.c:590
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:680
 #: ../libpurple/protocols/zephyr/zephyr.c:788
-#: ../libpurple/protocols/zephyr/zephyr.c:1207 ../pidgin/gtkdialogs.c:982
-#: ../pidgin/gtkdialogs.c:1006 ../pidgin/gtkdialogs.c:1028
+#: ../libpurple/protocols/zephyr/zephyr.c:1207 ../pidgin/gtkdialogs.c:976
+#: ../pidgin/gtkdialogs.c:1000 ../pidgin/gtkdialogs.c:1022
 #: ../pidgin/gtkrequest.c:277
 msgid "Alias"
 msgstr "Apelido"
 
-#: ../finch/gntblist.c:321 ../finch/gntblist.c:398
+#: ../finch/gntblist.c:330 ../finch/gntblist.c:407
 msgid "Group"
 msgstr "Grupo"
 
-#: ../finch/gntblist.c:325 ../finch/gntblist.c:386 ../finch/gntblist.c:1261
-#: ../finch/gntnotify.c:171 ../finch/gntstatus.c:566
+#: ../finch/gntblist.c:334 ../finch/gntblist.c:395 ../finch/gntblist.c:1292
+#: ../finch/gntnotify.c:173 ../finch/gntstatus.c:569
 #: ../libpurple/plugins/idle.c:153 ../libpurple/plugins/idle.c:190
-#: ../pidgin/gtkblist.c:2975 ../pidgin/gtknotify.c:476
-#: ../pidgin/gtkpounce.c:1269 ../pidgin/plugins/gevolution/gevolution.c:443
+#: ../pidgin/gtkblist.c:2974 ../pidgin/gtknotify.c:482
+#: ../pidgin/gtkpounce.c:1282 ../pidgin/plugins/gevolution/gevolution.c:443
 msgid "Account"
 msgstr "Conta"
 
-#: ../finch/gntblist.c:331 ../finch/gntblist.c:819
+#: ../finch/gntblist.c:340 ../finch/gntblist.c:843
 #: ../libpurple/protocols/silc/buddy.c:725
 #: ../libpurple/protocols/silc/buddy.c:1027
 #: ../libpurple/protocols/silc/buddy.c:1072
@@ -337,178 +348,176 @@
 #: ../libpurple/protocols/silc10/buddy.c:1033
 #: ../libpurple/protocols/silc10/buddy.c:1080
 #: ../libpurple/protocols/silc10/buddy.c:1180
-#: ../libpurple/protocols/yahoo/yahoo.c:3161 ../pidgin/gtkblist.c:5394
-#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:447
+#: ../libpurple/protocols/yahoo/yahoo.c:3161 ../pidgin/gtkblist.c:5420
+#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:445
 msgid "Add Buddy"
 msgstr "Adicionar amigo"
 
-#: ../finch/gntblist.c:331
+#: ../finch/gntblist.c:340
 msgid "Please enter buddy information."
 msgstr "Favor digitar as informações do amigo."
 
-#: ../finch/gntblist.c:358 ../libpurple/blist.c:1192
+#: ../finch/gntblist.c:367 ../libpurple/blist.c:1190
 msgid "Chats"
 msgstr "Bate-papos"
 
 #. Extract their Name and put it in
-#: ../finch/gntblist.c:392 ../libpurple/protocols/jabber/jabber.c:813
+#: ../finch/gntblist.c:401 ../libpurple/protocols/jabber/jabber.c:813
 #: ../libpurple/protocols/msn/msn.c:1553 ../libpurple/protocols/msn/msn.c:1618
 #: ../libpurple/protocols/msn/msn.c:1645
 #: ../libpurple/protocols/qq/buddy_info.c:44 ../pidgin/gtkplugin.c:581
-#: ../pidgin/gtkroomlist.c:621
+#: ../pidgin/gtkroomlist.c:617
 #: ../pidgin/plugins/gevolution/add_buddy_dialog.c:132
 #: ../pidgin/plugins/gevolution/assoc-buddy.c:123
 msgid "Name"
 msgstr "Nome"
 
-#: ../finch/gntblist.c:401 ../finch/gntblist.c:821 ../pidgin/gtkblist.c:5774
+#: ../finch/gntblist.c:410 ../finch/gntblist.c:845 ../pidgin/gtkblist.c:5800
 msgid "Add Chat"
 msgstr "Adicionar bate-papo"
 
-#: ../finch/gntblist.c:402
+#: ../finch/gntblist.c:411
 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:415 ../finch/gntblist.c:428
+#: ../finch/gntblist.c:424 ../finch/gntblist.c:437
 msgid "Error adding group"
 msgstr "Erro ao adicionar grupo."
 
-#: ../finch/gntblist.c:416
+#: ../finch/gntblist.c:425
 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:429
+#: ../finch/gntblist.c:438
 msgid "A group with the name already exists."
 msgstr "Um grupo com este nome já existe."
 
-#: ../finch/gntblist.c:436 ../finch/gntblist.c:823
+#: ../finch/gntblist.c:445 ../finch/gntblist.c:847
 #: ../libpurple/protocols/sametime/sametime.c:5396
-#: ../libpurple/protocols/sametime/sametime.c:5484 ../pidgin/gtkblist.c:5885
+#: ../libpurple/protocols/sametime/sametime.c:5484 ../pidgin/gtkblist.c:5911
 msgid "Add Group"
 msgstr "Criar grupo"
 
-#: ../finch/gntblist.c:436
+#: ../finch/gntblist.c:445
 msgid "Enter the name of the group"
 msgstr "Digite o nome do grupo"
 
-#: ../finch/gntblist.c:769
+#: ../finch/gntblist.c:793
 msgid "Edit Chat"
 msgstr "Modificar bate-papo"
 
-#: ../finch/gntblist.c:769
+#: ../finch/gntblist.c:793
 msgid "Please Update the necessary fields."
 msgstr "Favor atualizar os campos necessários."
 
-#: ../finch/gntblist.c:770 ../finch/gntstatus.c:199
+#: ../finch/gntblist.c:794 ../finch/gntstatus.c:202
 msgid "Edit"
 msgstr "Editar"
 
-#: ../finch/gntblist.c:786
+#: ../finch/gntblist.c:810
 msgid "Auto-join"
 msgstr "Entrar automaticamente"
 
-#: ../finch/gntblist.c:795
+#: ../finch/gntblist.c:819
 msgid "Edit Settings"
 msgstr "Modificar configurações"
 
-#: ../finch/gntblist.c:833 ../finch/gntconv.c:317 ../pidgin/gtkblist.c:277
-#: ../pidgin/gtkconv.c:682 ../pidgin/gtkdialogs.c:830
+#: ../finch/gntblist.c:855 ../pidgin/gtkutils.c:926
 msgid "Information"
 msgstr "Informações"
 
-#: ../finch/gntblist.c:833 ../finch/gntconv.c:317 ../pidgin/gtkblist.c:277
-#: ../pidgin/gtkconv.c:682 ../pidgin/gtkdialogs.c:830
+#: ../finch/gntblist.c:855 ../pidgin/gtkutils.c:926
 msgid "Retrieving..."
 msgstr "Obtendo..."
 
-#: ../finch/gntblist.c:866 ../finch/gntconv.c:418
+#: ../finch/gntblist.c:895 ../finch/gntconv.c:407
 #: ../libpurple/protocols/silc/chat.c:899
 #: ../libpurple/protocols/silc10/chat.c:883
 msgid "Get Info"
 msgstr "Ver info"
 
-#: ../finch/gntblist.c:870
+#: ../finch/gntblist.c:899
 msgid "Add Buddy Pounce"
 msgstr "Adicionar ação de usuário"
 
 #. if (q_bud && is_online(q_bud->status)) {
-#: ../finch/gntblist.c:877 ../finch/gntconv.c:430
+#: ../finch/gntblist.c:906 ../finch/gntconv.c:419
 #: ../libpurple/protocols/jabber/si.c:868
-#: ../libpurple/protocols/oscar/oscar.c:636 ../libpurple/protocols/qq/qq.c:585
-#: ../pidgin/gtkconv.c:1635
+#: ../libpurple/protocols/oscar/oscar.c:654 ../libpurple/protocols/qq/qq.c:585
+#: ../pidgin/gtkconv.c:1599
 msgid "Send File"
 msgstr "Enviar arquivo"
 
-#: ../finch/gntblist.c:881
+#: ../finch/gntblist.c:910
 msgid "View Log"
 msgstr "Ver log"
 
-#: ../finch/gntblist.c:962
+#: ../finch/gntblist.c:991
 #, c-format
 msgid "Please enter the new name for %s"
 msgstr "Favor digitar o novo nome para %s"
 
-#: ../finch/gntblist.c:964 ../finch/gntblist.c:1211
+#: ../finch/gntblist.c:993 ../finch/gntblist.c:1240
 msgid "Rename"
 msgstr "Renomear"
 
-#: ../finch/gntblist.c:964
+#: ../finch/gntblist.c:993
 msgid "Set Alias"
 msgstr "Definir apelido"
 
-#: ../finch/gntblist.c:965
+#: ../finch/gntblist.c:994
 msgid "Enter empty string to reset the name."
 msgstr "Para redefinir o nome, deixe o campo em branco."
 
-#: ../finch/gntblist.c:1041
+#: ../finch/gntblist.c:1070
 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:1049
+#: ../finch/gntblist.c:1078
 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:1054
+#: ../finch/gntblist.c:1083
 #, 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:1057
+#: ../finch/gntblist.c:1086
 msgid "Confirm Remove"
 msgstr "Confirmar remoção"
 
-#: ../finch/gntblist.c:1062 ../finch/gntblist.c:1213 ../finch/gntft.c:223
-#: ../pidgin/gtkconv.c:1684 ../pidgin/gtkrequest.c:275
-#: ../pidgin/gtkstatusbox.c:261
+#: ../finch/gntblist.c:1091 ../finch/gntblist.c:1242 ../finch/gntft.c:224
+#: ../pidgin/gtkconv.c:1648 ../pidgin/gtkrequest.c:275
+#: ../pidgin/gtkstatusbox.c:263
 msgid "Remove"
 msgstr "Remover"
 
 #. Buddy List
-#: ../finch/gntblist.c:1187 ../finch/gntblist.c:2237 ../finch/gntprefs.c:240
-#: ../finch/gntui.c:77 ../pidgin/gtkblist.c:4240
+#: ../finch/gntblist.c:1216 ../finch/gntblist.c:2283 ../finch/gntprefs.c:257
+#: ../finch/gntui.c:78 ../pidgin/gtkblist.c:4256
 #: ../pidgin/plugins/win32/winprefs/winprefs.c:330
 msgid "Buddy List"
 msgstr "Lista de amigos"
 
-#: ../finch/gntblist.c:1218
+#: ../finch/gntblist.c:1247
 msgid "Place tagged"
 msgstr "Local marcado"
 
-#: ../finch/gntblist.c:1223
+#: ../finch/gntblist.c:1252
 msgid "Toggle Tag"
 msgstr "(Des)ativar marca"
 
 #. General
-#: ../finch/gntblist.c:1256 ../libpurple/protocols/gg/gg.c:632
-#: ../libpurple/protocols/gg/gg.c:1045 ../libpurple/protocols/gg/gg.c:1120
-#: ../libpurple/protocols/gg/gg.c:2204
+#: ../finch/gntblist.c:1287 ../libpurple/protocols/gg/gg.c:632
+#: ../libpurple/protocols/gg/gg.c:1045 ../libpurple/protocols/gg/gg.c:1118
+#: ../libpurple/protocols/gg/gg.c:2202
 #: ../libpurple/protocols/jabber/buddy.c:274
-#: ../libpurple/protocols/jabber/buddy.c:818
-#: ../libpurple/protocols/jabber/buddy.c:1589
-#: ../libpurple/protocols/jabber/buddy.c:1771
+#: ../libpurple/protocols/jabber/buddy.c:856
+#: ../libpurple/protocols/jabber/buddy.c:1627
+#: ../libpurple/protocols/jabber/buddy.c:1809
 #: ../libpurple/protocols/jabber/jabber.c:823
 #: ../libpurple/protocols/msn/msn.c:1372 ../libpurple/protocols/msn/msn.c:1556
 #: ../libpurple/protocols/qq/buddy_info.c:43
@@ -520,25 +529,29 @@
 #: ../libpurple/protocols/silc10/ops.c:1036
 #: ../libpurple/protocols/silc10/ops.c:1179
 #: ../libpurple/protocols/silc10/ops.c:1328
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1042 ../pidgin/gtkblist.c:2999
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1042 ../pidgin/gtkblist.c:2998
 msgid "Nickname"
 msgstr "Apelido"
 
 #. Idle stuff
-#: ../finch/gntblist.c:1276 ../finch/gntprefs.c:243
+#: ../finch/gntblist.c:1307 ../finch/gntprefs.c:260
 #: ../libpurple/protocols/bonjour/bonjour.c:314
-#: ../libpurple/protocols/jabber/buddy.c:643
-#: ../libpurple/protocols/jabber/buddy.c:683
+#: ../libpurple/protocols/jabber/buddy.c:647
+#: ../libpurple/protocols/jabber/buddy.c:687
 #: ../libpurple/protocols/msn/msn.c:516 ../libpurple/protocols/msn/state.c:32
 #: ../libpurple/protocols/novell/novell.c:2825
-#: ../libpurple/protocols/oscar/oscar.c:2868
+#: ../libpurple/protocols/oscar/oscar.c:2888
 #: ../libpurple/protocols/yahoo/yahoo.c:2915
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:686 ../pidgin/gtkblist.c:3026
-#: ../pidgin/gtkblist.c:3419 ../pidgin/gtkprefs.c:1848
+#: ../pidgin/gtkblist.c:3435 ../pidgin/gtkprefs.c:1918
 msgid "Idle"
 msgstr "Inativo"
 
-#: ../finch/gntblist.c:1365
+#: ../finch/gntblist.c:1320
+msgid "On Mobile"
+msgstr "No celular"
+
+#: ../finch/gntblist.c:1400
 #, c-format
 msgid ""
 "Online: %d\n"
@@ -547,12 +560,12 @@
 "Conectados: %d\n"
 "Total: %d"
 
-#: ../finch/gntblist.c:1374
+#: ../finch/gntblist.c:1409
 #, c-format
 msgid "Account: %s (%s)"
 msgstr "Conta: %s (%s)"
 
-#: ../finch/gntblist.c:1386
+#: ../finch/gntblist.c:1421
 #, c-format
 msgid ""
 "\n"
@@ -561,50 +574,50 @@
 "\n"
 "Visto pela última vez: %s atrás"
 
-#: ../finch/gntblist.c:1651 ../pidgin/gtkdocklet.c:470
-#: ../pidgin/gtkstatusbox.c:1064
+#: ../finch/gntblist.c:1687 ../pidgin/gtkdocklet.c:470
+#: ../pidgin/gtkstatusbox.c:1070
 msgid "New..."
 msgstr "Novo..."
 
-#: ../finch/gntblist.c:1658 ../pidgin/gtkdocklet.c:471
-#: ../pidgin/gtkstatusbox.c:1065
+#: ../finch/gntblist.c:1694 ../pidgin/gtkdocklet.c:471
+#: ../pidgin/gtkstatusbox.c:1071
 msgid "Saved..."
 msgstr "Salvo..."
 
-#: ../finch/gntblist.c:2033 ../finch/gntplugin.c:244 ../finch/gntui.c:81
+#: ../finch/gntblist.c:2072 ../finch/gntplugin.c:254 ../finch/gntui.c:82
 #: ../pidgin/gtkdocklet.c:523 ../pidgin/gtkplugin.c:530
 msgid "Plugins"
 msgstr "Plugins"
 
-#: ../finch/gntblist.c:2141 ../pidgin/gtkdialogs.c:705
-#: ../pidgin/gtkdialogs.c:852 ../pidgin/gtkdialogs.c:933
+#: ../finch/gntblist.c:2179 ../pidgin/gtkdialogs.c:708
+#: ../pidgin/gtkdialogs.c:846 ../pidgin/gtkdialogs.c:927
 msgid "_Name"
 msgstr "_Nome"
 
-#: ../finch/gntblist.c:2146 ../pidgin/gtkdialogs.c:710
-#: ../pidgin/gtkdialogs.c:857 ../pidgin/gtkdialogs.c:938
+#: ../finch/gntblist.c:2184 ../pidgin/gtkdialogs.c:713
+#: ../pidgin/gtkdialogs.c:851 ../pidgin/gtkdialogs.c:932
 msgid "_Account"
 msgstr "_Conta"
 
-#: ../finch/gntblist.c:2154 ../pidgin/gtkdialogs.c:718
+#: ../finch/gntblist.c:2192 ../pidgin/gtkdialogs.c:721
 msgid "New Instant Message"
 msgstr "Nova mensagem instantânea"
 
-#: ../finch/gntblist.c:2156 ../pidgin/gtkdialogs.c:720
+#: ../finch/gntblist.c:2194 ../pidgin/gtkdialogs.c:723
 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:2159 ../finch/gntnotify.c:77 ../libpurple/account.c:983
+#: ../finch/gntblist.c:2197 ../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:1389
+#: ../libpurple/protocols/jabber/jabber.c:1383
 #: ../libpurple/protocols/jabber/xdata.c:336
 #: ../libpurple/protocols/msn/msn.c:258 ../libpurple/protocols/msn/msn.c:275
 #: ../libpurple/protocols/msn/msn.c:292 ../libpurple/protocols/msn/msn.c:309
-#: ../libpurple/protocols/oscar/oscar.c:6045
+#: ../libpurple/protocols/oscar/oscar.c:6072
 #: ../libpurple/protocols/silc/buddy.c:454
 #: ../libpurple/protocols/silc/buddy.c:1190
 #: ../libpurple/protocols/silc/chat.c:447
@@ -623,48 +636,52 @@
 #: ../libpurple/protocols/silc10/silc.c:735
 #: ../libpurple/protocols/yahoo/yahoo.c:988
 #: ../libpurple/protocols/yahoo/yahoo.c:3247
-#: ../libpurple/protocols/yahoo/yahoo.c:3258 ../pidgin/gtkblist.c:3995
-#: ../pidgin/gtkdialogs.c:723 ../pidgin/gtkdialogs.c:870
-#: ../pidgin/gtkdialogs.c:962 ../pidgin/gtkrequest.c:269
+#: ../libpurple/protocols/yahoo/yahoo.c:3258 ../pidgin/gtkblist.c:4013
+#: ../pidgin/gtkdialogs.c:726 ../pidgin/gtkdialogs.c:864
+#: ../pidgin/gtkdialogs.c:956 ../pidgin/gtkrequest.c:269
 msgid "OK"
 msgstr "OK"
 
 #. Create the "Options" frame.
-#: ../finch/gntblist.c:2179 ../finch/gntpounce.c:444 ../pidgin/gtkpounce.c:778
+#: ../finch/gntblist.c:2217 ../finch/gntpounce.c:444 ../pidgin/gtkpounce.c:791
 msgid "Options"
 msgstr "Opções"
 
-#: ../finch/gntblist.c:2185
+#: ../finch/gntblist.c:2223
 msgid "Send IM..."
 msgstr "Enviar MI..."
 
-#: ../finch/gntblist.c:2189
+#: ../finch/gntblist.c:2227
+msgid "Show empty groups"
+msgstr "Exibir grupos vazios"
+
+#: ../finch/gntblist.c:2233
 msgid "Show offline buddies"
 msgstr "Exibir amigos desconectados"
 
-#: ../finch/gntblist.c:2195
+#: ../finch/gntblist.c:2239
 msgid "Sort by status"
 msgstr "Ordenar por status"
 
-#: ../finch/gntblist.c:2199
+#: ../finch/gntblist.c:2243
 msgid "Sort alphabetically"
 msgstr "Ordenar alfabeticamente"
 
-#: ../finch/gntblist.c:2203
+#: ../finch/gntblist.c:2247
 msgid "Sort by log size"
 msgstr "Ordenar por tamanho do log"
 
-#: ../finch/gntconn.c:109
+#: ../finch/gntconn.c:110
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../finch/gntconn.c:112
+#: ../finch/gntconn.c:113
 #, c-format
 msgid "%s disconnected."
 msgstr "%s desconectado."
 
-#: ../finch/gntconn.c:113
+#: ../finch/gntconn.c:114
 #, c-format
 msgid ""
 "%s\n"
@@ -677,47 +694,43 @@
 "O Finch não tentará reconectar esta conta até que você corrija o erro e "
 "reative a mesma."
 
-#: ../finch/gntconv.c:116
+#: ../finch/gntconv.c:117
 msgid "No such command."
 msgstr "Comando inexistente."
 
-#: ../finch/gntconv.c:120 ../pidgin/gtkconv.c:513
+#: ../finch/gntconv.c:121 ../pidgin/gtkconv.c:492
 msgid "Syntax Error:  You typed the wrong number of arguments to that command."
 msgstr ""
 "Erro de sintaxe:  Você digitou um número incorreto de argumentos para este "
 "comando."
 
-#: ../finch/gntconv.c:125 ../pidgin/gtkconv.c:518
+#: ../finch/gntconv.c:126 ../pidgin/gtkconv.c:498
 msgid "Your command failed for an unknown reason."
 msgstr "Seu comando falhou por um motivo desconhecido."
 
-#: ../finch/gntconv.c:130 ../pidgin/gtkconv.c:524
+#: ../finch/gntconv.c:131 ../pidgin/gtkconv.c:505
 msgid "That command only works in chats, not IMs."
 msgstr "Este comando só funciona em bate-papos, não em conversas."
 
-#: ../finch/gntconv.c:133 ../pidgin/gtkconv.c:527
+#: ../finch/gntconv.c:134 ../pidgin/gtkconv.c:508
 msgid "That command only works in IMs, not chats."
 msgstr "Este comando só funciona em conversas, não em bate-papos."
 
-#: ../finch/gntconv.c:137 ../pidgin/gtkconv.c:531
+#: ../finch/gntconv.c:138 ../pidgin/gtkconv.c:513
 msgid "That command doesn't work on this protocol."
 msgstr "Este comando não funciona neste protocolo."
 
-#: ../finch/gntconv.c:144
-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:230
+#: ../finch/gntconv.c:224
 #, c-format
 msgid "%s (%s -- %s)"
 msgstr "%s (%s -- %s)"
 
-#: ../finch/gntconv.c:253
+#: ../finch/gntconv.c:247
 #, c-format
 msgid "%s [%s]"
 msgstr "%s [%s]"
 
-#: ../finch/gntconv.c:258 ../finch/gntconv.c:619
+#: ../finch/gntconv.c:252 ../finch/gntconv.c:647
 #, c-format
 msgid ""
 "\n"
@@ -726,48 +739,48 @@
 "\n"
 "%s está digitando..."
 
-#: ../finch/gntconv.c:277
+#: ../finch/gntconv.c:271
 msgid "You have left this chat."
 msgstr "Você saiu deste bate-papo."
 
-#: ../finch/gntconv.c:353
+#: ../finch/gntconv.c:342
 msgid "Send To"
 msgstr "Enviar para"
 
-#: ../finch/gntconv.c:397
+#: ../finch/gntconv.c:386
 msgid "Conversation"
 msgstr "Conversa"
 
-#: ../finch/gntconv.c:403
+#: ../finch/gntconv.c:392
 msgid "Clear Scrollback"
 msgstr "Limpar tela"
 
-#: ../finch/gntconv.c:407 ../finch/gntprefs.c:178
+#: ../finch/gntconv.c:396 ../finch/gntprefs.c:190
 msgid "Show Timestamps"
 msgstr "Exibir marcações de tempo"
 
-#: ../finch/gntconv.c:423
+#: ../finch/gntconv.c:412
 msgid "Add Buddy Pounce..."
 msgstr "Adicionar ação de usuário..."
 
-#: ../finch/gntconv.c:586
+#: ../finch/gntconv.c:614
 msgid "<AUTO-REPLY> "
 msgstr "<AUTO-RESPOSTA> "
 
 #. Print the list of users in the room
-#: ../finch/gntconv.c:702
+#: ../finch/gntconv.c:735
 msgid "List of users:\n"
 msgstr "Lista de usuários:\n"
 
-#: ../finch/gntconv.c:847 ../pidgin/gtkconv.c:394
+#: ../finch/gntconv.c:880 ../pidgin/gtkconv.c:335
 msgid "Supported debug options are:  version"
 msgstr "As opções de depuração suportadas são:  version"
 
-#: ../finch/gntconv.c:882 ../pidgin/gtkconv.c:430
+#: ../finch/gntconv.c:915 ../pidgin/gtkconv.c:384
 msgid "No such command (in this context)."
 msgstr "Comando inexistente (neste contexto)."
 
-#: ../finch/gntconv.c:885 ../pidgin/gtkconv.c:433
+#: ../finch/gntconv.c:918 ../pidgin/gtkconv.c:387
 msgid ""
 "Use \"/help &lt;command&gt;\" for help on a specific command.\n"
 "The following commands are available in this context:\n"
@@ -775,7 +788,7 @@
 "Use \"/help &lt;comando&gt;\" para ajuda com um comando específico.\n"
 "Os seguintes comandos estão disponíveis neste contexto:\n"
 
-#: ../finch/gntconv.c:943 ../pidgin/gtkconv.c:7211
+#: ../finch/gntconv.c:976 ../pidgin/gtkconv.c:7198
 msgid ""
 "say &lt;message&gt;:  Send a message normally as if you weren't using a "
 "command."
@@ -783,12 +796,12 @@
 "say &lt;mensagem&gt;:  Envia uma mensagem normalmente, como se você não "
 "estivesse usando um comando."
 
-#: ../finch/gntconv.c:946 ../pidgin/gtkconv.c:7214
+#: ../finch/gntconv.c:979 ../pidgin/gtkconv.c:7201
 msgid "me &lt;action&gt;:  Send an IRC style action to a buddy or chat."
 msgstr ""
 "me &lt;ação&gt;:  Envia uma ação do tipo do IRC para um amigo ou bate-papo."
 
-#: ../finch/gntconv.c:949 ../pidgin/gtkconv.c:7217
+#: ../finch/gntconv.c:982 ../pidgin/gtkconv.c:7204
 msgid ""
 "debug &lt;option&gt;:  Send various debug information to the current "
 "conversation."
@@ -796,43 +809,43 @@
 "debug &lt;opção&gt;:  Envia várias informações de depuração para a conversa "
 "atual."
 
-#: ../finch/gntconv.c:952 ../pidgin/gtkconv.c:7220
+#: ../finch/gntconv.c:985 ../pidgin/gtkconv.c:7207
 msgid "clear: Clears the conversation scrollback."
 msgstr "clear: Limpa a janela de conversa."
 
-#: ../finch/gntconv.c:955 ../pidgin/gtkconv.c:7223
+#: ../finch/gntconv.c:988 ../pidgin/gtkconv.c:7213
 msgid "help &lt;command&gt;:  Help on a specific command."
 msgstr "help &lt;comando&gt;:  Ajuda num comando específico."
 
-#: ../finch/gntconv.c:958
+#: ../finch/gntconv.c:991
 msgid "users:  Show the list of users in the chat."
 msgstr "users:  Exibe a lista dos usuários que estão no bate-papo."
 
-#: ../finch/gntconv.c:963
+#: ../finch/gntconv.c:996
 msgid "plugins: Show the plugins window."
 msgstr "plugins: Mostra a janela de plugins."
 
-#: ../finch/gntconv.c:966
+#: ../finch/gntconv.c:999
 msgid "buddylist: Show the buddylist."
 msgstr "buddylist: Mostra a lista de amigos."
 
-#: ../finch/gntconv.c:969
+#: ../finch/gntconv.c:1002
 msgid "accounts: Show the accounts window."
 msgstr "accounts: Mostra a janela de contas."
 
-#: ../finch/gntconv.c:972
+#: ../finch/gntconv.c:1005
 msgid "debugwin: Show the debug window."
 msgstr "debugwin: Mostra a janela de depuração."
 
-#: ../finch/gntconv.c:975
+#: ../finch/gntconv.c:1008
 msgid "prefs: Show the preference window."
 msgstr "prefs: Mostra a janela de preferências"
 
-#: ../finch/gntconv.c:978
+#: ../finch/gntconv.c:1011
 msgid "statuses: Show the savedstatuses window."
 msgstr "statuses: Mostra a janela de status salvos."
 
-#: ../finch/gntdebug.c:230 ../finch/gntui.c:79 ../pidgin/gtkdebug.c:694
+#: ../finch/gntdebug.c:234 ../finch/gntui.c:80 ../pidgin/gtkdebug.c:694
 msgid "Debug Window"
 msgstr "Janela de depuração"
 
@@ -840,15 +853,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:251 ../pidgin/gtkdebug.c:753
+#: ../finch/gntdebug.c:255 ../pidgin/gtkdebug.c:753
 msgid "Clear"
 msgstr "Limpar"
 
-#: ../finch/gntdebug.c:257
+#: ../finch/gntdebug.c:261
 msgid "Filter: "
 msgstr "Filtrar: "
 
-#: ../finch/gntdebug.c:261 ../pidgin/gtkdebug.c:762
+#: ../finch/gntdebug.c:265 ../pidgin/gtkdebug.c:762
 msgid "Pause"
 msgstr "Pausar"
 
@@ -857,176 +870,177 @@
 msgid "File Transfers - %d%% of %d files"
 msgstr "Transferências de arquivo - %d%% de %d arquivos"
 
-#: ../finch/gntft.c:122 ../finch/gntft.c:194 ../finch/gntui.c:80
-#: ../pidgin/gtkft.c:233 ../pidgin/gtkft.c:763
+#. Create the window.
+#: ../finch/gntft.c:122 ../finch/gntft.c:195 ../finch/gntui.c:81
+#: ../pidgin/gtkft.c:233 ../pidgin/gtkft.c:761
 msgid "File Transfers"
 msgstr "Transferências de arquivos"
 
-#: ../finch/gntft.c:197 ../pidgin/gtkft.c:644
+#: ../finch/gntft.c:198 ../pidgin/gtkft.c:644
 msgid "Progress"
 msgstr "Progresso"
 
-#: ../finch/gntft.c:197 ../pidgin/gtkft.c:651
+#: ../finch/gntft.c:198 ../pidgin/gtkft.c:651
 msgid "Filename"
 msgstr "Nome do arquivo"
 
-#: ../finch/gntft.c:197 ../pidgin/gtkft.c:658
+#: ../finch/gntft.c:198 ../pidgin/gtkft.c:658
 msgid "Size"
 msgstr "Tamanho"
 
-#: ../finch/gntft.c:197
+#: ../finch/gntft.c:198
 msgid "Speed"
 msgstr "Velocidade"
 
-#: ../finch/gntft.c:197 ../pidgin/gtkft.c:665
+#: ../finch/gntft.c:198 ../pidgin/gtkft.c:665
 msgid "Remaining"
 msgstr "Restante"
 
 #. XXX: Use of ggp_str_to_uin() is an ugly hack!
-#: ../finch/gntft.c:197 ../finch/gntstatus.c:537 ../finch/gntstatus.c:566
+#: ../finch/gntft.c:198 ../finch/gntstatus.c:540 ../finch/gntstatus.c:569
 #: ../libpurple/protocols/bonjour/bonjour.c:318
-#: ../libpurple/protocols/gg/gg.c:1034 ../libpurple/protocols/gg/gg.c:1573
-#: ../libpurple/protocols/gg/gg.c:1581
-#: ../libpurple/protocols/jabber/buddy.c:634
+#: ../libpurple/protocols/gg/gg.c:1034 ../libpurple/protocols/gg/gg.c:1571
+#: ../libpurple/protocols/gg/gg.c:1579
 #: ../libpurple/protocols/jabber/buddy.c:638
-#: ../libpurple/protocols/jabber/buddy.c:673
-#: ../libpurple/protocols/jabber/jabber.c:1220
+#: ../libpurple/protocols/jabber/buddy.c:642
+#: ../libpurple/protocols/jabber/buddy.c:677
+#: ../libpurple/protocols/jabber/jabber.c:1212
 #: ../libpurple/protocols/msn/msn.c:515
 #: ../libpurple/protocols/novell/novell.c:2835
-#: ../libpurple/protocols/oscar/oscar.c:803
-#: ../libpurple/protocols/oscar/oscar.c:808
-#: ../libpurple/protocols/oscar/oscar.c:810
-#: ../libpurple/protocols/oscar/oscar.c:2657
-#: ../libpurple/protocols/oscar/oscar.c:3768
+#: ../libpurple/protocols/oscar/oscar.c:821
+#: ../libpurple/protocols/oscar/oscar.c:826
+#: ../libpurple/protocols/oscar/oscar.c:828
+#: ../libpurple/protocols/oscar/oscar.c:2676
+#: ../libpurple/protocols/oscar/oscar.c:3794
 #: ../libpurple/protocols/sametime/sametime.c:3263
 #: ../libpurple/protocols/sametime/sametime.c:4150
 #: ../libpurple/protocols/yahoo/yahoo.c:3066 ../pidgin/gtkblist.c:3070
 #: ../pidgin/gtkblist.c:3083 ../pidgin/gtkblist.c:3085
-#: ../pidgin/gtksavedstatuses.c:943 ../pidgin/gtksavedstatuses.c:1090
+#: ../pidgin/gtksavedstatuses.c:998 ../pidgin/gtksavedstatuses.c:1143
 msgid "Status"
 msgstr "Status"
 
-#: ../finch/gntft.c:207
+#: ../finch/gntft.c:208
 msgid "Close this window when all transfers finish"
 msgstr "Feche esta janela quando todas as transferências terminarem"
 
-#: ../finch/gntft.c:214
+#: ../finch/gntft.c:215
 msgid "Clear finished transfers"
 msgstr "Limpar transferências concluídas"
 
-#: ../finch/gntft.c:228
+#: ../finch/gntft.c:229
 msgid "Stop"
 msgstr "Parar"
 
 #. Close button
-#: ../finch/gntft.c:233 ../finch/gntnotify.c:179 ../finch/gntplugin.c:205
-#: ../finch/gntplugin.c:291 ../finch/gntpounce.c:722 ../finch/gntstatus.c:209
+#: ../finch/gntft.c:234 ../finch/gntnotify.c:181 ../finch/gntplugin.c:209
+#: ../finch/gntplugin.c:309 ../finch/gntpounce.c:723 ../finch/gntstatus.c:212
 #: ../libpurple/protocols/msn/msn.c:375 ../libpurple/protocols/silc/util.c:382
-#: ../libpurple/protocols/silc10/util.c:377 ../pidgin/gtkaccount.c:2487
+#: ../libpurple/protocols/silc10/util.c:377 ../pidgin/gtkaccount.c:2474
 #: ../pidgin/gtkrequest.c:272
 msgid "Close"
 msgstr "Fechar"
 
-#: ../finch/gntft.c:299 ../pidgin/gtkft.c:168 ../pidgin/gtkft.c:975
+#: ../finch/gntft.c:302 ../pidgin/gtkft.c:168 ../pidgin/gtkft.c:972
 msgid "Waiting for transfer to begin"
 msgstr "Esperando o começo da transferência"
 
-#: ../finch/gntft.c:366 ../pidgin/gtkft.c:165 ../pidgin/gtkft.c:1056
+#: ../finch/gntft.c:369 ../pidgin/gtkft.c:165 ../pidgin/gtkft.c:1053
 msgid "Canceled"
 msgstr "Cancelada"
 
-#: ../finch/gntft.c:368 ../pidgin/gtkft.c:1058
+#: ../finch/gntft.c:371 ../pidgin/gtkft.c:1055
 msgid "Failed"
 msgstr "Falhou"
 
-#: ../finch/gntft.c:414 ../pidgin/gtkft.c:133
-#, c-format
-msgid "%.2f KB/s"
-msgstr "%.2f KB/s"
-
-#: ../finch/gntft.c:425 ../finch/gntft.c:426 ../pidgin/gtkft.c:162
-#: ../pidgin/gtkft.c:1118
+#: ../finch/gntft.c:417 ../pidgin/gtkft.c:133
+#, c-format
+msgid "%.2f KiB/s"
+msgstr "%.2f KiB/s"
+
+#: ../finch/gntft.c:428 ../finch/gntft.c:429 ../pidgin/gtkft.c:162
+#: ../pidgin/gtkft.c:1115
 msgid "Finished"
 msgstr "Concluída"
 
-#: ../finch/gntft.c:428 ../libpurple/protocols/msn/session.c:347
+#: ../finch/gntft.c:431 ../libpurple/protocols/msn/session.c:347
 msgid "Transferring"
 msgstr "Transferindo"
 
-#: ../finch/gntnotify.c:162
+#: ../finch/gntnotify.c:164
 msgid "Emails"
 msgstr "Emails"
 
-#: ../finch/gntnotify.c:168 ../finch/gntnotify.c:222
+#: ../finch/gntnotify.c:170 ../finch/gntnotify.c:224
 msgid "You have mail!"
 msgstr "Você tem email!"
 
-#: ../finch/gntnotify.c:171 ../libpurple/protocols/jabber/jabber.c:1180
-msgid "From"
-msgstr "De"
-
-#: ../finch/gntnotify.c:171 ../pidgin/gtknotify.c:490
+#: ../finch/gntnotify.c:173 ../pidgin/gtknotify.c:489
+msgid "Sender"
+msgstr "Remetente"
+
+#: ../finch/gntnotify.c:173 ../pidgin/gtknotify.c:496
 msgid "Subject"
 msgstr "Assunto"
 
-#: ../finch/gntnotify.c:198
+#: ../finch/gntnotify.c:200
 #, c-format
 msgid "%s (%s) has %d new message."
 msgid_plural "%s (%s) has %d new messages."
 msgstr[0] "%s (%s) tem %d nova mensagem."
 msgstr[1] "%s (%s) tem %d novas mensagens."
 
-#: ../finch/gntnotify.c:222 ../pidgin/gtknotify.c:329
+#: ../finch/gntnotify.c:224 ../pidgin/gtknotify.c:335
 msgid "New Mail"
 msgstr "Novo e-mail"
 
-#: ../finch/gntnotify.c:287 ../pidgin/gtknotify.c:906
+#: ../finch/gntnotify.c:289 ../pidgin/gtknotify.c:916
 #, c-format
 msgid "Info for %s"
 msgstr "Informações de %s:"
 
-#: ../finch/gntnotify.c:288 ../libpurple/protocols/toc/toc.c:476
-#: ../pidgin/gtknotify.c:907
+#: ../finch/gntnotify.c:290 ../libpurple/protocols/toc/toc.c:476
+#: ../pidgin/gtknotify.c:917
 msgid "Buddy Information"
 msgstr "Informações do amigo"
 
-#: ../finch/gntnotify.c:366
+#: ../finch/gntnotify.c:376
 msgid "Continue"
 msgstr "Continuar"
 
-#: ../finch/gntnotify.c:372 ../pidgin/gtkconv.c:1663 ../pidgin/gtkdebug.c:834
+#: ../finch/gntnotify.c:382 ../pidgin/gtkconv.c:1627 ../pidgin/gtkdebug.c:834
 msgid "Info"
 msgstr "Info"
 
-#: ../finch/gntnotify.c:375 ../pidgin/gtkconv.c:1624
+#: ../finch/gntnotify.c:385 ../pidgin/gtkconv.c:1588
 msgid "IM"
 msgstr "MI"
 
-#: ../finch/gntnotify.c:378
+#: ../finch/gntnotify.c:388
 msgid "Join"
 msgstr "Entrar"
 
-#: ../finch/gntnotify.c:381 ../libpurple/protocols/sametime/sametime.c:3473
+#: ../finch/gntnotify.c:391 ../libpurple/protocols/sametime/sametime.c:3473
 msgid "Invite"
 msgstr "Convidar"
 
-#: ../finch/gntnotify.c:384
+#: ../finch/gntnotify.c:394
 msgid "(none)"
 msgstr "(nome)"
 
-#: ../finch/gntplugin.c:73 ../finch/gntplugin.c:82
+#: ../finch/gntplugin.c:74 ../finch/gntplugin.c:83
 msgid "ERROR"
 msgstr "ERRO"
 
-#: ../finch/gntplugin.c:73
+#: ../finch/gntplugin.c:74
 msgid "loading plugin failed"
 msgstr "falha ao carregar o plugin"
 
-#: ../finch/gntplugin.c:82
+#: ../finch/gntplugin.c:83
 msgid "unloading plugin failed"
 msgstr "falha ao descarregar o plugin"
 
-#: ../finch/gntplugin.c:124
+#: ../finch/gntplugin.c:128
 #, c-format
 msgid ""
 "Name: %s\n"
@@ -1043,36 +1057,42 @@
 "Site da web: %s\n"
 "Nome do arquivo: %s\n"
 
-#: ../finch/gntplugin.c:182
+#: ../finch/gntplugin.c:186
 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:226
+#: ../finch/gntplugin.c:234
 msgid "No configuration options for this plugin."
 msgstr "Não há nenhuma opção de configuração para este plugin"
 
-#: ../finch/gntplugin.c:249
+#: ../finch/gntplugin.c:259
 msgid "You can (un)load plugins from the following list."
 msgstr "Você pode (des)ativar plugins a partir da lista abaixo."
 
-#: ../finch/gntplugin.c:296
+#: ../finch/gntplugin.c:314
 msgid "Configure Plugin"
 msgstr "Configurar plugin"
 
-#: ../finch/gntplugin.c:352 ../finch/gntplugin.c:359 ../finch/gntprefs.c:245
-#: ../finch/gntui.c:82 ../pidgin/gtkdocklet.c:524 ../pidgin/gtkprefs.c:1992
+#. copy the preferences to tmp values...
+#. * I liked "take affect immediately" Oh well :-(
+#. (that should have been "effect," right?)
+#. Back to instant-apply! I win!  BU-HAHAHA!
+#. Create the window
+#: ../finch/gntplugin.c:370 ../finch/gntplugin.c:377 ../finch/gntprefs.c:263
+#: ../finch/gntui.c:83 ../pidgin/gtkdocklet.c:524 ../pidgin/gtkprefs.c:2060
 msgid "Preferences"
 msgstr "Preferências"
 
-#: ../finch/gntpounce.c:180 ../pidgin/gtkpounce.c:253
+#: ../finch/gntpounce.c:180 ../pidgin/gtkpounce.c:255
 msgid "Please enter a buddy to pounce."
 msgstr "Favor digitar o amigo que terá a ação."
 
-#: ../finch/gntpounce.c:325 ../pidgin/gtkpounce.c:507
+#. Create the window.
+#: ../finch/gntpounce.c:325 ../pidgin/gtkpounce.c:516
 msgid "New Buddy Pounce"
 msgstr "Nova ação de usuário"
 
-#: ../finch/gntpounce.c:325 ../pidgin/gtkpounce.c:507
+#: ../finch/gntpounce.c:325 ../pidgin/gtkpounce.c:516
 msgid "Edit Buddy Pounce"
 msgstr "Editar ação de usuário"
 
@@ -1081,7 +1101,7 @@
 msgstr "Quem terá a ação"
 
 #. Account:
-#: ../finch/gntpounce.c:333 ../finch/gntstatus.c:446
+#: ../finch/gntpounce.c:333 ../finch/gntstatus.c:449
 msgid "Account:"
 msgstr "Conta:"
 
@@ -1090,7 +1110,7 @@
 msgstr "Nome do amigo:"
 
 #. Create the "Pounce When Buddy..." frame.
-#: ../finch/gntpounce.c:371 ../pidgin/gtkpounce.c:577
+#: ../finch/gntpounce.c:371 ../pidgin/gtkpounce.c:586
 msgid "Pounce When Buddy..."
 msgstr "Executar quando o amigo..."
 
@@ -1135,7 +1155,7 @@
 msgstr "Enviar uma mensagem"
 
 #. Create the "Action" frame.
-#: ../finch/gntpounce.c:411 ../pidgin/gtkpounce.c:638
+#: ../finch/gntpounce.c:411 ../pidgin/gtkpounce.c:647
 msgid "Action"
 msgstr "Ação"
 
@@ -1163,188 +1183,204 @@
 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:1282
+#: ../finch/gntpounce.c:447 ../pidgin/gtkpounce.c:1295
 msgid "Recurring"
 msgstr "Recorrente"
 
-#: ../finch/gntpounce.c:649 ../pidgin/gtkpounce.c:1097
+#: ../finch/gntpounce.c:649 ../pidgin/gtkpounce.c:1110
 #, 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:682 ../finch/gntui.c:78 ../pidgin/gtkpounce.c:1329
+#: ../finch/gntpounce.c:683 ../finch/gntui.c:79 ../pidgin/gtkpounce.c:1339
 msgid "Buddy Pounces"
 msgstr "Ações de usuário"
 
-#: ../finch/gntpounce.c:794 ../pidgin/gtkpounce.c:1456
+#: ../finch/gntpounce.c:795 ../pidgin/gtkpounce.c:1466
 #, c-format
 msgid "%s has started typing to you (%s)"
 msgstr "%s começou a digitar para você (%s)"
 
-#: ../finch/gntpounce.c:796 ../pidgin/gtkpounce.c:1458
+#: ../finch/gntpounce.c:797 ../pidgin/gtkpounce.c:1468
 #, c-format
 msgid "%s has paused while typing to you (%s)"
 msgstr "%s pausou ao digitar para você (%s)"
 
-#: ../finch/gntpounce.c:798 ../pidgin/gtkpounce.c:1460
+#: ../finch/gntpounce.c:799 ../pidgin/gtkpounce.c:1470
 #, c-format
 msgid "%s has signed on (%s)"
 msgstr "%s conectou (%s)"
 
-#: ../finch/gntpounce.c:800 ../pidgin/gtkpounce.c:1462
+#: ../finch/gntpounce.c:801 ../pidgin/gtkpounce.c:1472
 #, c-format
 msgid "%s has returned from being idle (%s)"
 msgstr "%s voltou do estado 'Inativo' (%s)"
 
-#: ../finch/gntpounce.c:802 ../pidgin/gtkpounce.c:1464
+#: ../finch/gntpounce.c:803 ../pidgin/gtkpounce.c:1474
 #, c-format
 msgid "%s has returned from being away (%s)"
 msgstr "%s voltou do estado 'Ausente' (%s)"
 
-#: ../finch/gntpounce.c:804 ../pidgin/gtkpounce.c:1466
+#: ../finch/gntpounce.c:805 ../pidgin/gtkpounce.c:1476
 #, c-format
 msgid "%s has stopped typing to you (%s)"
 msgstr "%s parou de digitar para você (%s)"
 
-#: ../finch/gntpounce.c:806 ../pidgin/gtkpounce.c:1468
+#: ../finch/gntpounce.c:807 ../pidgin/gtkpounce.c:1478
 #, c-format
 msgid "%s has signed off (%s)"
 msgstr "%s desconectou (%s)"
 
-#: ../finch/gntpounce.c:808 ../pidgin/gtkpounce.c:1470
+#: ../finch/gntpounce.c:809 ../pidgin/gtkpounce.c:1480
 #, c-format
 msgid "%s has become idle (%s)"
 msgstr "%s se tornou inativo (%s)"
 
-#: ../finch/gntpounce.c:810 ../pidgin/gtkpounce.c:1472
+#: ../finch/gntpounce.c:811 ../pidgin/gtkpounce.c:1482
 #, c-format
 msgid "%s has gone away. (%s)"
 msgstr "%s se tornou ausente. (%s)"
 
-#: ../finch/gntpounce.c:812 ../pidgin/gtkpounce.c:1474
+#: ../finch/gntpounce.c:813 ../pidgin/gtkpounce.c:1484
 #, c-format
 msgid "%s has sent you a message. (%s)"
 msgstr "%s te enviou uma mensagem. (%s)"
 
-#: ../finch/gntpounce.c:813 ../pidgin/gtkpounce.c:1475
+#: ../finch/gntpounce.c:814 ../pidgin/gtkpounce.c:1485
 msgid "Unknown pounce event. Please report this!"
 msgstr "Evento de ação desconhecido. Por favor reporte isso!"
 
-#: ../finch/gntprefs.c:79
+#: ../finch/gntprefs.c:91
 msgid "Based on keyboard use"
 msgstr "A partir do uso do teclado"
 
-#: ../finch/gntprefs.c:81 ../pidgin/gtkprefs.c:1853
+#: ../finch/gntprefs.c:93 ../pidgin/gtkprefs.c:1923
 msgid "From last sent message"
 msgstr "A partir da última mensagem enviada"
 
-#: ../finch/gntprefs.c:83 ../pidgin/gtkprefs.c:820 ../pidgin/gtkprefs.c:829
-#: ../pidgin/gtkprefs.c:1852 ../pidgin/gtkprefs.c:1866
+#: ../finch/gntprefs.c:95 ../pidgin/gtkprefs.c:897 ../pidgin/gtkprefs.c:906
+#: ../pidgin/gtkprefs.c:1922 ../pidgin/gtkprefs.c:1936
 #: ../pidgin/plugins/win32/winprefs/winprefs.c:337
 msgid "Never"
 msgstr "Nunca"
 
-#: ../finch/gntprefs.c:171
+#: ../finch/gntprefs.c:183
 msgid "Show Idle Time"
 msgstr "Exibir tempo de inatividade"
 
-#: ../finch/gntprefs.c:172
+#: ../finch/gntprefs.c:184
 msgid "Show Offline Buddies"
 msgstr "Exibir amigos desconectados"
 
-#: ../finch/gntprefs.c:179
+#: ../finch/gntprefs.c:191
 msgid "Notify buddies when you are typing"
 msgstr "Notificar amigos de que você está digitando"
 
-#: ../finch/gntprefs.c:185
+#: ../finch/gntprefs.c:197
 msgid "Log format"
 msgstr "Formato do log:"
 
-#: ../finch/gntprefs.c:186
+#: ../finch/gntprefs.c:198
 msgid "Log IMs"
 msgstr "Gravar MIs"
 
-#: ../finch/gntprefs.c:187
+#: ../finch/gntprefs.c:199
 msgid "Log chats"
 msgstr "Gravar bate-papos"
 
-#: ../finch/gntprefs.c:188
+#: ../finch/gntprefs.c:200
 msgid "Log status change events"
 msgstr "Gravar mudanças de status no log do sistema"
 
+#: ../finch/gntprefs.c:206
+msgid "Report Idle time"
+msgstr "Mostrar tempo de inatividade"
+
+#: ../finch/gntprefs.c:207
+msgid "Change status when idle"
+msgstr "Mudar status após inatividade"
+
+#: ../finch/gntprefs.c:208
+msgid "Minutes before changing status"
+msgstr "Minutos antes de alterar o status"
+
+#: ../finch/gntprefs.c:209
+msgid "Change status to"
+msgstr "Mudar status para"
+
 #. Conversations
-#: ../finch/gntprefs.c:241 ../pidgin/gtkprefs.c:915 ../pidgin/gtkprefs.c:1956
+#: ../finch/gntprefs.c:258 ../pidgin/gtkprefs.c:992 ../pidgin/gtkprefs.c:2026
 #: ../pidgin/plugins/win32/winprefs/winprefs.c:344
 msgid "Conversations"
 msgstr "Conversas"
 
-#: ../finch/gntprefs.c:242 ../pidgin/gtkprefs.c:1392 ../pidgin/gtkprefs.c:1967
+#: ../finch/gntprefs.c:259 ../pidgin/gtkprefs.c:1462 ../pidgin/gtkprefs.c:2037
 msgid "Logging"
 msgstr "Logs"
 
-#: ../finch/gntrequest.c:532
+#: ../finch/gntrequest.c:563
 msgid "Not implemented yet."
 msgstr "Ainda não implementado."
 
-#: ../finch/gntrequest.c:597 ../pidgin/gtkrequest.c:1530
-#: ../pidgin/gtkrequest.c:1576
+#: ../finch/gntrequest.c:635 ../pidgin/gtkrequest.c:1526
+#: ../pidgin/gtkrequest.c:1572
 msgid "Save File..."
 msgstr "Salvar arquivo..."
 
-#: ../finch/gntrequest.c:597 ../pidgin/gtkrequest.c:1531
-#: ../pidgin/gtkrequest.c:1577
+#: ../finch/gntrequest.c:635 ../pidgin/gtkrequest.c:1527
+#: ../pidgin/gtkrequest.c:1573
 msgid "Open File..."
 msgstr "Abrir arquivo..."
 
-#: ../finch/gntstatus.c:135
+#: ../finch/gntstatus.c:136
 #, c-format
 msgid "Are you sure you want to delete \"%s\""
 msgstr "Você tem certeza de que deseja remover \"%s\""
 
-#: ../finch/gntstatus.c:138
+#: ../finch/gntstatus.c:139
 msgid "Delete Status"
 msgstr "Remover status"
 
-#: ../finch/gntstatus.c:170 ../pidgin/gtksavedstatuses.c:557
+#: ../finch/gntstatus.c:174 ../pidgin/gtksavedstatuses.c:596
 msgid "Saved Statuses"
 msgstr "Status salvos"
 
-#: ../finch/gntstatus.c:177 ../finch/gntstatus.c:529
+#: ../finch/gntstatus.c:181 ../finch/gntstatus.c:532
 #: ../libpurple/protocols/jabber/buddy.c:286
-#: ../libpurple/protocols/jabber/buddy.c:935
+#: ../libpurple/protocols/jabber/buddy.c:973
 #: ../libpurple/protocols/novell/novell.c:1484
-#: ../pidgin/gtksavedstatuses.c:464
+#: ../pidgin/gtksavedstatuses.c:499
 msgid "Title"
 msgstr "Título"
 
-#: ../finch/gntstatus.c:177 ../pidgin/gtksavedstatuses.c:479
+#: ../finch/gntstatus.c:181 ../pidgin/gtksavedstatuses.c:514
 msgid "Type"
 msgstr "Tipo"
 
-#: ../finch/gntstatus.c:177 ../finch/gntstatus.c:554 ../finch/gntstatus.c:566
+#: ../finch/gntstatus.c:181 ../finch/gntstatus.c:557 ../finch/gntstatus.c:569
 #: ../libpurple/protocols/bonjour/bonjour.c:247
 #: ../libpurple/protocols/bonjour/bonjour.c:254
 #: ../libpurple/protocols/bonjour/bonjour.c:320
-#: ../libpurple/protocols/gg/gg.c:1072 ../libpurple/protocols/gg/gg.c:1576
-#: ../libpurple/protocols/gg/gg.c:1594 ../libpurple/protocols/gg/gg.c:1604
-#: ../libpurple/protocols/gg/gg.c:1610 ../libpurple/protocols/gg/gg.c:1619
-#: ../libpurple/protocols/gg/gg.c:1624 ../libpurple/protocols/irc/irc.c:234
-#: ../libpurple/protocols/jabber/jabber.c:1252
-#: ../libpurple/protocols/jabber/jabber.c:1262
-#: ../libpurple/protocols/jabber/jabber.c:1272
-#: ../libpurple/protocols/jabber/jabber.c:1282
-#: ../libpurple/protocols/jabber/jabber.c:1292
-#: ../libpurple/protocols/jabber/jabber.c:1304
+#: ../libpurple/protocols/gg/gg.c:1072 ../libpurple/protocols/gg/gg.c:1574
+#: ../libpurple/protocols/gg/gg.c:1592 ../libpurple/protocols/gg/gg.c:1602
+#: ../libpurple/protocols/gg/gg.c:1608 ../libpurple/protocols/gg/gg.c:1617
+#: ../libpurple/protocols/gg/gg.c:1622 ../libpurple/protocols/irc/irc.c:234
+#: ../libpurple/protocols/jabber/jabber.c:1244
+#: ../libpurple/protocols/jabber/jabber.c:1254
+#: ../libpurple/protocols/jabber/jabber.c:1264
+#: ../libpurple/protocols/jabber/jabber.c:1274
+#: ../libpurple/protocols/jabber/jabber.c:1284
+#: ../libpurple/protocols/jabber/jabber.c:1296
 #: ../libpurple/protocols/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:5506
-#: ../libpurple/protocols/oscar/oscar.c:5724
-#: ../libpurple/protocols/oscar/oscar.c:5738
-#: ../libpurple/protocols/oscar/oscar.c:5754
-#: ../libpurple/protocols/oscar/oscar.c:5761
-#: ../libpurple/protocols/oscar/oscar.c:5768
+#: ../libpurple/protocols/oscar/oscar.c:5533
+#: ../libpurple/protocols/oscar/oscar.c:5751
+#: ../libpurple/protocols/oscar/oscar.c:5765
+#: ../libpurple/protocols/oscar/oscar.c:5781
+#: ../libpurple/protocols/oscar/oscar.c:5788
+#: ../libpurple/protocols/oscar/oscar.c:5795
 #: ../libpurple/protocols/sametime/sametime.c:3286
 #: ../libpurple/protocols/sametime/sametime.c:3292
 #: ../libpurple/protocols/sametime/sametime.c:3298
@@ -1355,57 +1391,57 @@
 #: ../libpurple/protocols/yahoo/yahoo.c:3494
 #: ../libpurple/protocols/yahoo/yahoo.c:3500
 #: ../libpurple/protocols/zephyr/zephyr.c:2337
-#: ../pidgin/gtksavedstatuses.c:490 ../pidgin/gtksavedstatuses.c:954
+#: ../pidgin/gtksavedstatuses.c:525 ../pidgin/gtksavedstatuses.c:1009
 msgid "Message"
 msgstr "Mensagem:"
 
 #. Use
-#: ../finch/gntstatus.c:189 ../finch/gntstatus.c:583
+#: ../finch/gntstatus.c:192 ../finch/gntstatus.c:586
 msgid "Use"
 msgstr "Usar"
 
-#: ../finch/gntstatus.c:294
+#: ../finch/gntstatus.c:297
 msgid "Invalid title"
 msgstr "Título inválido"
 
-#: ../finch/gntstatus.c:295
+#: ../finch/gntstatus.c:298
 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:302
+#: ../finch/gntstatus.c:305
 msgid "Duplicate title"
 msgstr "Título duplicado duplicada"
 
-#: ../finch/gntstatus.c:303
+#: ../finch/gntstatus.c:306
 msgid "Please enter a different title for the status."
 msgstr "Favor digitar um título diferente para o status."
 
-#: ../finch/gntstatus.c:443
+#: ../finch/gntstatus.c:446
 msgid "Substatus"
 msgstr "Substatus"
 
-#: ../finch/gntstatus.c:454 ../pidgin/gtkft.c:698
+#: ../finch/gntstatus.c:457 ../pidgin/gtkft.c:698
 msgid "Status:"
 msgstr "Status:"
 
-#: ../finch/gntstatus.c:469
+#: ../finch/gntstatus.c:472
 msgid "Message:"
 msgstr "Mensagem:"
 
-#: ../finch/gntstatus.c:518
+#: ../finch/gntstatus.c:521
 msgid "Edit Status"
 msgstr "Editar status"
 
-#: ../finch/gntstatus.c:560
+#: ../finch/gntstatus.c:563
 msgid "Use different status for following accounts"
 msgstr "Usar status diferente para as seguintes contas"
 
 #. Save & Use
-#: ../finch/gntstatus.c:594
+#: ../finch/gntstatus.c:597
 msgid "Save & Use"
 msgstr "Salvar e usar"
 
-#: ../finch/gntui.c:83
+#: ../finch/gntui.c:84
 msgid "Statuses"
 msgstr "Status"
 
@@ -1567,12 +1603,12 @@
 msgstr "Plugin de protocolo faltando para %s"
 
 #: ../libpurple/account.c:1012 ../libpurple/connection.c:107
-#: ../pidgin/gtkblist.c:3992
+#: ../pidgin/gtkblist.c:4010
 msgid "Connection Error"
 msgstr "Erro de conexão"
 
 #: ../libpurple/account.c:1170 ../libpurple/protocols/gg/gg.c:702
-#: ../libpurple/protocols/jabber/jabber.c:1342
+#: ../libpurple/protocols/jabber/jabber.c:1334
 msgid "New passwords do not match."
 msgstr "Senhas novas não conferem."
 
@@ -1611,22 +1647,22 @@
 msgstr "Definir informações de usuário"
 
 #: ../libpurple/account.c:1744 ../libpurple/protocols/gg/gg.c:1012
-#: ../libpurple/protocols/jabber/buddy.c:638
-#: ../libpurple/protocols/jabber/buddy.c:1424
-#: ../libpurple/protocols/jabber/buddy.c:1441
+#: ../libpurple/protocols/jabber/buddy.c:642
+#: ../libpurple/protocols/jabber/buddy.c:1462
+#: ../libpurple/protocols/jabber/buddy.c:1479
 #: ../libpurple/protocols/novell/novell.c:2831
 #: ../libpurple/protocols/qq/qq.c:230 ../pidgin/gtkft.c:159
 msgid "Unknown"
 msgstr "Desconhecido"
 
-#: ../libpurple/blist.c:523 ../libpurple/blist.c:1291
-#: ../libpurple/blist.c:1520 ../libpurple/protocols/jabber/roster.c:68
-#: ../pidgin/gtkblist.c:5284 ../pidgin/plugins/gevolution/gevolution.c:96
+#: ../libpurple/blist.c:521 ../libpurple/blist.c:1289
+#: ../libpurple/blist.c:1518 ../libpurple/protocols/jabber/roster.c:68
+#: ../pidgin/gtkblist.c:5310 ../pidgin/plugins/gevolution/gevolution.c:96
 #: ../pidgin/plugins/gevolution/gevo-util.c:64
 msgid "Buddies"
 msgstr "Amigos"
 
-#: ../libpurple/blist.c:550
+#: ../libpurple/blist.c:548
 msgid "buddy list"
 msgstr "lista de amigos"
 
@@ -1645,84 +1681,84 @@
 msgstr "+++ %s desconectou"
 
 #: ../libpurple/connection.c:440 ../libpurple/plugin.c:282
-#: ../libpurple/protocols/jabber/buddy.c:1712
+#: ../libpurple/protocols/jabber/buddy.c:1750
 #: ../libpurple/protocols/msn/servconn.c:139
 #: ../libpurple/protocols/msn/session.c:322
 msgid "Unknown error"
 msgstr "Erro desconhecido"
 
-#: ../libpurple/conversation.c:165
+#: ../libpurple/conversation.c:170
 msgid "Unable to send message: The message is too large."
 msgstr "Não foi possível enviar mensagem: A mensagem é muito extensa."
 
-#: ../libpurple/conversation.c:168 ../libpurple/conversation.c:181
+#: ../libpurple/conversation.c:173 ../libpurple/conversation.c:186
 #, c-format
 msgid "Unable to send message to %s."
 msgstr "Não foi possível enviar mensagem para %s."
 
-#: ../libpurple/conversation.c:169
+#: ../libpurple/conversation.c:174
 msgid "The message is too large."
 msgstr "A mensagem é muito extensa."
 
-#: ../libpurple/conversation.c:178 ../libpurple/protocols/bonjour/jabber.c:283
-#: ../libpurple/protocols/bonjour/jabber.c:325
+#: ../libpurple/conversation.c:183 ../libpurple/protocols/bonjour/jabber.c:284
+#: ../libpurple/protocols/bonjour/jabber.c:326
 msgid "Unable to send message."
 msgstr "Não foi possível enviar mensagem."
 
-#: ../libpurple/conversation.c:1164
+#: ../libpurple/conversation.c:1169
 msgid "Send Message"
 msgstr "Enviar mensagem"
 
-#: ../libpurple/conversation.c:1167
+#: ../libpurple/conversation.c:1172
 msgid "_Send Message"
 msgstr "Envia_r mensagem"
 
-#: ../libpurple/conversation.c:1572
+#: ../libpurple/conversation.c:1578
 #, c-format
 msgid "%s entered the room."
 msgstr "%s entrou na sala."
 
-#: ../libpurple/conversation.c:1575
+#: ../libpurple/conversation.c:1581
 #, c-format
 msgid "%s [<I>%s</I>] entered the room."
 msgstr "%s [<I>%s</I>] entrou na sala."
 
-#: ../libpurple/conversation.c:1682
+#: ../libpurple/conversation.c:1691
 #, c-format
 msgid "You are now known as %s"
 msgstr "Você mudou seu apelido para %s"
 
-#: ../libpurple/conversation.c:1702
+#: ../libpurple/conversation.c:1711
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s mudou seu apelido para %s"
 
-#: ../libpurple/conversation.c:1775
+#: ../libpurple/conversation.c:1786
 #, c-format
 msgid "%s left the room."
 msgstr "%s saiu da sala."
 
-#: ../libpurple/conversation.c:1778
+#: ../libpurple/conversation.c:1789
 #, c-format
 msgid "%s left the room (%s)."
 msgstr "%s saiu da sala (%s)."
 
-#: ../libpurple/dbus-server.c:578
+#: ../libpurple/dbus-server.c:584
 #, c-format
 msgid "Failed to get connection: %s"
 msgstr "Falha ao obter conexão: %s"
 
-#: ../libpurple/dbus-server.c:590
+#: ../libpurple/dbus-server.c:596
 #, c-format
 msgid "Failed to get name: %s"
 msgstr "Falha ao obter nome: %s"
 
-#: ../libpurple/dbus-server.c:603
+#: ../libpurple/dbus-server.c:610
 #, c-format
 msgid "Failed to get serv name: %s"
 msgstr "Não foi possível obter nome do serv: %s"
 
-#: ../libpurple/dbus-server.h:83
+#: ../libpurple/dbus-server.h:84
 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"
 
@@ -1775,7 +1811,7 @@
 msgid "Unknown reason"
 msgstr "Motivo desconhecido"
 
-#: ../libpurple/ft.c:204
+#: ../libpurple/ft.c:207
 #, c-format
 msgid ""
 "Error reading %s: \n"
@@ -1784,7 +1820,7 @@
 "Erro ao ler %s: \n"
 "%s.\n"
 
-#: ../libpurple/ft.c:208
+#: ../libpurple/ft.c:211
 #, c-format
 msgid ""
 "Error writing %s: \n"
@@ -1793,7 +1829,7 @@
 "Erro ao gravar em %s: \n"
 "%s.\n"
 
-#: ../libpurple/ft.c:212
+#: ../libpurple/ft.c:215
 #, c-format
 msgid ""
 "Error accessing %s: \n"
@@ -1802,39 +1838,39 @@
 "Erro ao acessar %s: \n"
 "%s.\n"
 
-#: ../libpurple/ft.c:248
+#: ../libpurple/ft.c:251
 msgid "Directory is not writable."
 msgstr "O diretório não permite gravações."
 
-#: ../libpurple/ft.c:263
+#: ../libpurple/ft.c:266
 msgid "Cannot send a file of 0 bytes."
 msgstr "Não é possível enviar um arquivo de 0 bytes."
 
-#: ../libpurple/ft.c:273
+#: ../libpurple/ft.c:276
 msgid "Cannot send a directory."
 msgstr "Não foi possível enviar um diretório."
 
-#: ../libpurple/ft.c:282
+#: ../libpurple/ft.c:285
 #, c-format
 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:342
+#: ../libpurple/ft.c:345
 #, c-format
 msgid "%s wants to send you %s (%s)"
 msgstr "%s deseja lhe enviar %s (%s)"
 
-#: ../libpurple/ft.c:349
+#: ../libpurple/ft.c:352
 #, c-format
 msgid "%s wants to send you a file"
 msgstr "%s deseja lhe enviar um arquivo"
 
-#: ../libpurple/ft.c:392
+#: ../libpurple/ft.c:395
 #, c-format
 msgid "Accept file transfer request from %s?"
 msgstr "Aceitar pedido de transferência de arquivo de %s?"
 
-#: ../libpurple/ft.c:396
+#: ../libpurple/ft.c:399
 #, c-format
 msgid ""
 "A file is available for download from:\n"
@@ -1845,60 +1881,60 @@
 "Host remoto: %s\n"
 "Porta remota: %d"
 
-#: ../libpurple/ft.c:431
+#: ../libpurple/ft.c:434
 #, c-format
 msgid "%s is offering to send file %s"
 msgstr "%s está pedindo para enviar %s"
 
-#: ../libpurple/ft.c:483
+#: ../libpurple/ft.c:486
 #, c-format
 msgid "%s is not a valid filename.\n"
 msgstr "%s não é um nome de arquivo válido.\n"
 
-#: ../libpurple/ft.c:504
+#: ../libpurple/ft.c:507
 #, c-format
 msgid "Offering to send %s to %s"
 msgstr "Oferecendo o envio de %s para %s"
 
-#: ../libpurple/ft.c:516
+#: ../libpurple/ft.c:519
 #, c-format
 msgid "Starting transfer of %s from %s"
 msgstr "Iniciar transferência de %s a partir de %s"
 
-#: ../libpurple/ft.c:670
+#: ../libpurple/ft.c:680
 #, c-format
 msgid "Transfer of file %s complete"
 msgstr "Transferência de %s completa"
 
-#: ../libpurple/ft.c:673
+#: ../libpurple/ft.c:683
 msgid "File transfer complete"
 msgstr "Transferência de arquivo completa"
 
-#: ../libpurple/ft.c:1091
+#: ../libpurple/ft.c:1101
 #, c-format
 msgid "You canceled the transfer of %s"
 msgstr "Você cancelou a transferência de %s"
 
-#: ../libpurple/ft.c:1096
+#: ../libpurple/ft.c:1106
 msgid "File transfer cancelled"
 msgstr "Transferência de arquivo cancelada"
 
-#: ../libpurple/ft.c:1154
+#: ../libpurple/ft.c:1164
 #, c-format
 msgid "%s canceled the transfer of %s"
 msgstr "%s cancelou a transferência de %s"
 
-#: ../libpurple/ft.c:1159
+#: ../libpurple/ft.c:1169
 #, c-format
 msgid "%s canceled the file transfer"
 msgstr "%s cancelou a transferência de arquivo"
 
-#: ../libpurple/ft.c:1216
+#: ../libpurple/ft.c:1226
 #, c-format
 msgid "File transfer to %s failed."
 msgstr "Transferência de arquivo para %s falhou."
 
-#: ../libpurple/ft.c:1218
+#: ../libpurple/ft.c:1228
 #, c-format
 msgid "File transfer from %s failed."
 msgstr "Transferência de arquivo de %s falhou."
@@ -2075,32 +2111,32 @@
 msgid "Whether the specified command should handle \"ymsgr\" URLs"
 msgstr "Diz se o comando especificado deve ser associado a URLs \"ymsgr\""
 
-#: ../libpurple/log.c:181
+#: ../libpurple/log.c:182
 msgid "<b><font color=\"red\">The logger has no read function</font></b>"
 msgstr ""
 "<b><font color=\"red\">O gerador de log não tem funções de leitura</font></b>"
 
-#: ../libpurple/log.c:593
+#: ../libpurple/log.c:597
 msgid "HTML"
 msgstr "HTML"
 
-#: ../libpurple/log.c:607
+#: ../libpurple/log.c:611
 msgid "Plain text"
 msgstr "Texto puro"
 
-#: ../libpurple/log.c:621
+#: ../libpurple/log.c:625
 msgid "Old flat format"
 msgstr "Antigo formato linear"
 
-#: ../libpurple/log.c:732
+#: ../libpurple/log.c:837
 msgid "Logging of this conversation failed."
 msgstr "A gravação desta conversa falhou."
 
-#: ../libpurple/log.c:1175
+#: ../libpurple/log.c:1280
 msgid "XML"
 msgstr "XML"
 
-#: ../libpurple/log.c:1251
+#: ../libpurple/log.c:1364
 #, c-format
 msgid ""
 "<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
@@ -2109,7 +2145,7 @@
 "<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
 "RESPOSTA&gt;:</b></font> %s<br/>\n"
 
-#: ../libpurple/log.c:1253
+#: ../libpurple/log.c:1366
 #, c-format
 msgid ""
 "<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
@@ -2118,18 +2154,18 @@
 "<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
 "RESPOSTA&gt;:</b></font> %s<br/>\n"
 
-#: ../libpurple/log.c:1311 ../libpurple/log.c:1444
+#: ../libpurple/log.c:1424 ../libpurple/log.c:1557
 msgid "<font color=\"red\"><b>Unable to find log path!</b></font>"
 msgstr ""
 "<font color=\"red\"><b>Não foi possível encontrar o caminho do log!</b></"
 "font>"
 
-#: ../libpurple/log.c:1323 ../libpurple/log.c:1453
+#: ../libpurple/log.c:1436 ../libpurple/log.c:1566
 #, c-format
 msgid "<font color=\"red\"><b>Could not read file: %s</b></font>"
 msgstr "<font color=\"red\"><b>Não foi possível ler o arquivo: %s</b></font>"
 
-#: ../libpurple/log.c:1385
+#: ../libpurple/log.c:1498
 #, c-format
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr "(%s) %s <AUTO-RESPOSTA>: %s\n"
@@ -2224,13 +2260,13 @@
 
 #: ../libpurple/plugins/autoaccept.c:165 ../libpurple/plugins/idle.c:170
 #: ../libpurple/plugins/idle.c:204 ../libpurple/plugins/idle.c:230
-#: ../libpurple/protocols/oscar/oscar.c:1440
-#: ../libpurple/protocols/oscar/oscar.c:2232
-#: ../libpurple/protocols/oscar/oscar.c:2279
-#: ../libpurple/protocols/oscar/oscar.c:5838
-#: ../libpurple/protocols/oscar/oscar.c:5893
-#: ../libpurple/protocols/oscar/oscar.c:6119
-#: ../libpurple/protocols/oscar/oscar.c:6189 ../libpurple/request.h:1387
+#: ../libpurple/protocols/oscar/oscar.c:1458
+#: ../libpurple/protocols/oscar/oscar.c:2251
+#: ../libpurple/protocols/oscar/oscar.c:2298
+#: ../libpurple/protocols/oscar/oscar.c:5865
+#: ../libpurple/protocols/oscar/oscar.c:5920
+#: ../libpurple/protocols/oscar/oscar.c:6146
+#: ../libpurple/protocols/oscar/oscar.c:6216 ../libpurple/request.h:1387
 #: ../libpurple/request.h:1397
 msgid "_Cancel"
 msgstr "_Cancelar"
@@ -2247,12 +2283,12 @@
 msgid "Auto Reject"
 msgstr "Rejeitar automaticamente"
 
-#: ../libpurple/plugins/autoaccept.c:184
+#: ../libpurple/plugins/autoaccept.c:185
 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:214
+#: ../libpurple/plugins/autoaccept.c:215
 msgid ""
 "Path to save the files in\n"
 "(Please provide the full path)"
@@ -2260,13 +2296,13 @@
 "Caminho para salvar os arquivos\n"
 "(Favor digitar o caminho completo)"
 
-#: ../libpurple/plugins/autoaccept.c:219
+#: ../libpurple/plugins/autoaccept.c:220
 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:223
+#: ../libpurple/plugins/autoaccept.c:224
 msgid ""
 "Notify with a popup when an autoaccepted file transfer is complete\n"
 "(only when there's no conversation with the sender)"
@@ -2503,7 +2539,7 @@
 #. * offset is way off.  The user should never really see it, but
 #. * it's here just in case.  The parens are to make it clear it's
 #. * not a real timezone.
-#: ../libpurple/plugins/log_reader.c:497
+#: ../libpurple/plugins/log_reader.c:492
 msgid "(UTC)"
 msgstr "(Greenwich)"
 
@@ -2550,58 +2586,66 @@
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
-#: ../libpurple/plugins/log_reader.c:1989
-#: ../libpurple/plugins/log_reader.c:2098
+#: ../libpurple/plugins/log_reader.c:2344
+#: ../libpurple/plugins/log_reader.c:2467
 msgid "Adium"
 msgstr "Adium"
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
-#: ../libpurple/plugins/log_reader.c:2002
-#: ../libpurple/plugins/log_reader.c:2103
+#: ../libpurple/plugins/log_reader.c:2357
+#: ../libpurple/plugins/log_reader.c:2472
 msgid "Fire"
 msgstr "Fire"
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
-#: ../libpurple/plugins/log_reader.c:2014
-#: ../libpurple/plugins/log_reader.c:2107
+#: ../libpurple/plugins/log_reader.c:2369
+#: ../libpurple/plugins/log_reader.c:2476
 msgid "Messenger Plus!"
 msgstr "Messenger Plus!"
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
-#: ../libpurple/plugins/log_reader.c:2027
-#: ../libpurple/plugins/log_reader.c:2112
+#: ../libpurple/plugins/log_reader.c:2383
+#: ../libpurple/plugins/log_reader.c:2481
+msgid "QIP"
+msgstr "QIP"
+
+#. The names of IM clients are marked for translation at the request of
+#. translators who wanted to transliterate them.  Many translators
+#. choose to leave them alone.  Choose what's best for your language.
+#: ../libpurple/plugins/log_reader.c:2395
+#: ../libpurple/plugins/log_reader.c:2485
 msgid "MSN Messenger"
 msgstr "MSN Messenger"
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
-#: ../libpurple/plugins/log_reader.c:2039
-#: ../libpurple/plugins/log_reader.c:2116
+#: ../libpurple/plugins/log_reader.c:2407
+#: ../libpurple/plugins/log_reader.c:2489
 msgid "Trillian"
 msgstr "Trillian"
 
 #. Add general preferences.
-#: ../libpurple/plugins/log_reader.c:2080
+#: ../libpurple/plugins/log_reader.c:2449
 msgid "General Log Reading Configuration"
 msgstr "Configuração geral da leitura de logs"
 
-#: ../libpurple/plugins/log_reader.c:2084
+#: ../libpurple/plugins/log_reader.c:2453
 msgid "Fast size calculations"
 msgstr "Cálculos rápidos de tamanho"
 
-#: ../libpurple/plugins/log_reader.c:2088
+#: ../libpurple/plugins/log_reader.c:2457
 msgid "Use name heuristics"
 msgstr "Utilizar heurística de nome"
 
 #. Add Log Directory preferences.
-#: ../libpurple/plugins/log_reader.c:2094
+#: ../libpurple/plugins/log_reader.c:2463
 msgid "Log Directory"
 msgstr "Diretório de logs"
 
@@ -2611,20 +2655,20 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/log_reader.c:2145
+#: ../libpurple/plugins/log_reader.c:2518
 msgid "Log Reader"
 msgstr "Leitor de logs"
 
 #. *< name
 #. *< version
 #. * summary
-#: ../libpurple/plugins/log_reader.c:2149
+#: ../libpurple/plugins/log_reader.c:2522
 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:2153
+#: ../libpurple/plugins/log_reader.c:2526
 msgid ""
 "When viewing logs, this plugin will include logs from other IM clients. "
 "Currently, this includes Adium, MSN Messenger, and Trillian.\n"
@@ -2988,17 +3032,17 @@
 #: ../libpurple/protocols/bonjour/bonjour.c:294
 #: ../libpurple/protocols/gg/gg.c:1009 ../libpurple/protocols/irc/irc.c:530
 #: ../libpurple/protocols/irc/msgs.c:310
-#: ../libpurple/protocols/jabber/buddy.c:1434
+#: ../libpurple/protocols/jabber/buddy.c:1472
 #: ../libpurple/protocols/novell/novell.c:2819
-#: ../libpurple/protocols/oscar/oscar.c:715
-#: ../libpurple/protocols/oscar/oscar.c:4519
-#: ../libpurple/protocols/oscar/oscar.c:5584
+#: ../libpurple/protocols/oscar/oscar.c:733
+#: ../libpurple/protocols/oscar/oscar.c:4545
+#: ../libpurple/protocols/oscar/oscar.c:5611
 #: ../libpurple/protocols/qq/qq.c:180 ../libpurple/protocols/silc/buddy.c:1476
 #: ../libpurple/protocols/silc10/buddy.c:1476
 #: ../libpurple/protocols/yahoo/yahoo.c:3397
 #: ../libpurple/protocols/yahoo/yahoo.c:3470 ../libpurple/status.c:157
-#: ../pidgin/gtkdocklet.c:442 ../pidgin/gtkprefs.c:1862
-#: ../pidgin/gtkstatusbox.c:1052
+#: ../pidgin/gtkdocklet.c:442 ../pidgin/gtkprefs.c:1932
+#: ../pidgin/gtkstatusbox.c:1056
 msgid "Away"
 msgstr "Ausente"
 
@@ -3065,30 +3109,30 @@
 msgid "Bonjour"
 msgstr "Bonjour"
 
-#: ../libpurple/protocols/bonjour/jabber.c:394
+#: ../libpurple/protocols/bonjour/jabber.c:395
 #, c-format
 msgid "%s has closed the conversation."
 msgstr "%s fechou a conversa."
 
-#: ../libpurple/protocols/bonjour/jabber.c:440
-#: ../libpurple/protocols/bonjour/jabber.c:653
-#: ../libpurple/protocols/bonjour/jabber.c:678
+#: ../libpurple/protocols/bonjour/jabber.c:441
+#: ../libpurple/protocols/bonjour/jabber.c:654
+#: ../libpurple/protocols/bonjour/jabber.c:679
 msgid "Unable to send the message, the conversation couldn't be started."
 msgstr "Não foi possível enviar mensagem: a conversa não pôde ser iniciada."
 
-#: ../libpurple/protocols/bonjour/jabber.c:574
+#: ../libpurple/protocols/bonjour/jabber.c:575
 msgid "Cannot open socket"
 msgstr "Não foi possível abrir socket"
 
-#: ../libpurple/protocols/bonjour/jabber.c:582
+#: ../libpurple/protocols/bonjour/jabber.c:583
 msgid "Error setting socket options"
 msgstr "Erro ao definir as opções do socket"
 
-#: ../libpurple/protocols/bonjour/jabber.c:606
+#: ../libpurple/protocols/bonjour/jabber.c:607
 msgid "Could not bind socket to port"
 msgstr "Não foi possível vincular socket à porta"
 
-#: ../libpurple/protocols/bonjour/jabber.c:614
+#: ../libpurple/protocols/bonjour/jabber.c:615
 msgid "Could not listen on socket"
 msgstr "Não foi possível escutar no socket"
 
@@ -3168,7 +3212,7 @@
 
 #: ../libpurple/protocols/gg/gg.c:477 ../libpurple/protocols/gg/gg.c:770
 #: ../libpurple/protocols/jabber/jabber.c:807
-#: ../libpurple/protocols/jabber/jabber.c:1377
+#: ../libpurple/protocols/jabber/jabber.c:1369
 msgid "Password"
 msgstr "Senha"
 
@@ -3193,10 +3237,10 @@
 msgstr "Por favor, preencha os seguintes campos"
 
 #: ../libpurple/protocols/gg/gg.c:637 ../libpurple/protocols/gg/gg.c:1049
-#: ../libpurple/protocols/gg/gg.c:1123
+#: ../libpurple/protocols/gg/gg.c:1121
 #: ../libpurple/protocols/jabber/jabber.c:843
-#: ../libpurple/protocols/oscar/oscar.c:3777
-#: ../libpurple/protocols/oscar/oscar.c:3790
+#: ../libpurple/protocols/oscar/oscar.c:3803
+#: ../libpurple/protocols/oscar/oscar.c:3816
 #: ../libpurple/protocols/qq/buddy_info.c:49
 msgid "City"
 msgstr "Cidade"
@@ -3206,7 +3250,7 @@
 msgstr "Ano de nascimento"
 
 #: ../libpurple/protocols/gg/gg.c:645 ../libpurple/protocols/msn/msn.c:1558
-#: ../libpurple/protocols/oscar/oscar.c:3720
+#: ../libpurple/protocols/oscar/oscar.c:3746
 #: ../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
@@ -3219,14 +3263,14 @@
 msgstr "Homem ou mulher"
 
 #: ../libpurple/protocols/gg/gg.c:647
-#: ../libpurple/protocols/oscar/oscar.c:3720
+#: ../libpurple/protocols/oscar/oscar.c:3746
 #: ../libpurple/protocols/qq/buddy_info.c:83
 #: ../libpurple/protocols/qq/qq.c:224
 msgid "Male"
 msgstr "Masculino"
 
 #: ../libpurple/protocols/gg/gg.c:648
-#: ../libpurple/protocols/oscar/oscar.c:3720
+#: ../libpurple/protocols/oscar/oscar.c:3746
 #: ../libpurple/protocols/qq/buddy_info.c:84
 #: ../libpurple/protocols/qq/qq.c:227
 msgid "Female"
@@ -3286,148 +3330,148 @@
 msgstr "Adicionar ao bate-papo..."
 
 #: ../libpurple/protocols/gg/gg.c:1003
-#: ../libpurple/protocols/jabber/buddy.c:1428
+#: ../libpurple/protocols/jabber/buddy.c:1466
 #: ../libpurple/protocols/novell/novell.c:2828
-#: ../libpurple/protocols/oscar/oscar.c:810
-#: ../libpurple/protocols/oscar/oscar.c:5556
+#: ../libpurple/protocols/oscar/oscar.c:828
+#: ../libpurple/protocols/oscar/oscar.c:5583
 #: ../libpurple/protocols/qq/qq.c:170 ../libpurple/protocols/qq/qq.c:177
 #: ../libpurple/protocols/yahoo/yahoo.c:2917 ../libpurple/status.c:153
-#: ../pidgin/gtkblist.c:3070 ../pidgin/gtkblist.c:3398
-#: ../pidgin/gtkdocklet.c:450 ../pidgin/gtkstatusbox.c:1054
+#: ../pidgin/gtkblist.c:3070 ../pidgin/gtkblist.c:3411
+#: ../pidgin/gtkdocklet.c:450 ../pidgin/gtkstatusbox.c:1059
 msgid "Offline"
 msgstr "Desconectado"
 
 #: ../libpurple/protocols/gg/gg.c:1006
-#: ../libpurple/protocols/jabber/buddy.c:1430
+#: ../libpurple/protocols/jabber/buddy.c:1468
 #: ../libpurple/protocols/msn/state.c:29 ../libpurple/protocols/msn/state.c:30
 #: ../libpurple/protocols/msn/state.c:37 ../libpurple/protocols/msn/state.c:38
 #: ../libpurple/protocols/novell/novell.c:2816
 #: ../libpurple/protocols/yahoo/yahoo.c:2919 ../libpurple/status.c:154
-#: ../pidgin/gtkdocklet.c:438 ../pidgin/gtkstatusbox.c:1051
+#: ../pidgin/gtkdocklet.c:438 ../pidgin/gtkstatusbox.c:1055
 msgid "Available"
 msgstr "Disponível"
 
-#: ../libpurple/protocols/gg/gg.c:1038 ../libpurple/protocols/gg/gg.c:1114
-#: ../libpurple/protocols/oscar/oscar.c:2656
-#: ../libpurple/protocols/oscar/oscar.c:3687
+#: ../libpurple/protocols/gg/gg.c:1038 ../libpurple/protocols/gg/gg.c:1112
+#: ../libpurple/protocols/oscar/oscar.c:2675
+#: ../libpurple/protocols/oscar/oscar.c:3713
 msgid "UIN"
 msgstr "UIN"
 
-#: ../libpurple/protocols/gg/gg.c:1041 ../libpurple/protocols/gg/gg.c:1117
-#: ../libpurple/protocols/jabber/buddy.c:1585
-#: ../libpurple/protocols/jabber/buddy.c:1761
-#: ../libpurple/protocols/oscar/oscar.c:3698
+#: ../libpurple/protocols/gg/gg.c:1041 ../libpurple/protocols/gg/gg.c:1115
+#: ../libpurple/protocols/jabber/buddy.c:1623
+#: ../libpurple/protocols/jabber/buddy.c:1799
+#: ../libpurple/protocols/oscar/oscar.c:3724
 #: ../libpurple/protocols/silc/ops.c:990
 #: ../libpurple/protocols/silc10/ops.c:1024
 msgid "First Name"
 msgstr "Nome"
 
-#: ../libpurple/protocols/gg/gg.c:1054 ../libpurple/protocols/gg/gg.c:1126
+#: ../libpurple/protocols/gg/gg.c:1054 ../libpurple/protocols/gg/gg.c:1124
 msgid "Birth Year"
 msgstr "Ano de nascimento"
 
-#: ../libpurple/protocols/gg/gg.c:1108 ../libpurple/protocols/gg/gg.c:1177
-#: ../libpurple/protocols/oscar/oscar.c:3899
+#: ../libpurple/protocols/gg/gg.c:1106 ../libpurple/protocols/gg/gg.c:1175
+#: ../libpurple/protocols/oscar/oscar.c:3925
 msgid "Unable to display the search results."
 msgstr "Não foi possível exibir os resultados da busca."
 
-#: ../libpurple/protocols/gg/gg.c:1168
+#: ../libpurple/protocols/gg/gg.c:1166
 msgid "Gadu-Gadu Public Directory"
 msgstr "Páginas amarelas do Gadu-Gadu"
 
-#: ../libpurple/protocols/gg/gg.c:1169
+#: ../libpurple/protocols/gg/gg.c:1167
 msgid "Search results"
 msgstr "Resultados da busca"
 
-#: ../libpurple/protocols/gg/gg.c:1212
+#: ../libpurple/protocols/gg/gg.c:1210
 msgid "No matching users found"
 msgstr "Nenhum usuário compatível encontrado"
 
-#: ../libpurple/protocols/gg/gg.c:1213
+#: ../libpurple/protocols/gg/gg.c:1211
 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:1307 ../libpurple/protocols/gg/gg.c:1460
+#: ../libpurple/protocols/gg/gg.c:1305 ../libpurple/protocols/gg/gg.c:1458
 msgid "Unable to read socket"
 msgstr "Não foi possível ler do socket"
 
-#: ../libpurple/protocols/gg/gg.c:1392
+#: ../libpurple/protocols/gg/gg.c:1390
 msgid "Buddy list downloaded"
 msgstr "Lista de amigos transferida"
 
-#: ../libpurple/protocols/gg/gg.c:1393
+#: ../libpurple/protocols/gg/gg.c:1391
 msgid "Your buddy list was downloaded from the server."
 msgstr "Sua lista de amigos foi transferida do servidor."
 
-#: ../libpurple/protocols/gg/gg.c:1400
+#: ../libpurple/protocols/gg/gg.c:1398
 msgid "Buddy list uploaded"
 msgstr "Lista de amigos enviada"
 
-#: ../libpurple/protocols/gg/gg.c:1401
+#: ../libpurple/protocols/gg/gg.c:1399
 msgid "Your buddy list was stored on the server."
 msgstr "Sua lista de amigos foi guardada no servidor."
 
-#: ../libpurple/protocols/gg/gg.c:1506 ../libpurple/protocols/gg/gg.c:1712
+#: ../libpurple/protocols/gg/gg.c:1504 ../libpurple/protocols/gg/gg.c:1710
 msgid "Connection failed."
 msgstr "Falha na conexão."
 
-#: ../libpurple/protocols/gg/gg.c:1618 ../libpurple/protocols/msn/msn.c:531
+#: ../libpurple/protocols/gg/gg.c:1616 ../libpurple/protocols/msn/msn.c:531
 msgid "Blocked"
 msgstr "Bloqueado"
 
-#: ../libpurple/protocols/gg/gg.c:1641
+#: ../libpurple/protocols/gg/gg.c:1639
 msgid "Add to chat"
 msgstr "Adicionar ao bate-papo"
 
-#: ../libpurple/protocols/gg/gg.c:1650
+#: ../libpurple/protocols/gg/gg.c:1648
 msgid "Unblock"
 msgstr "Desbloquear"
 
-#: ../libpurple/protocols/gg/gg.c:1654
+#: ../libpurple/protocols/gg/gg.c:1652
 msgid "Block"
 msgstr "Bloquear"
 
-#: ../libpurple/protocols/gg/gg.c:1671
+#: ../libpurple/protocols/gg/gg.c:1669
 msgid "Chat _name:"
 msgstr "_Nome do bate-papo:"
 
-#: ../libpurple/protocols/gg/gg.c:1911
+#: ../libpurple/protocols/gg/gg.c:1909
 msgid "Chat error"
 msgstr "Erro no bate-papo"
 
-#: ../libpurple/protocols/gg/gg.c:1912
+#: ../libpurple/protocols/gg/gg.c:1910
 msgid "This chat name is already in use"
 msgstr "Este nome de bate-papo já está sendo utilizado"
 
-#: ../libpurple/protocols/gg/gg.c:1995
+#: ../libpurple/protocols/gg/gg.c:1993
 msgid "Not connected to the server."
 msgstr "Não conectado ao servidor."
 
-#: ../libpurple/protocols/gg/gg.c:2018
+#: ../libpurple/protocols/gg/gg.c:2016
 msgid "Find buddies..."
 msgstr "Encontrar amigos..."
 
-#: ../libpurple/protocols/gg/gg.c:2024
+#: ../libpurple/protocols/gg/gg.c:2022
 msgid "Change password..."
 msgstr "Alterar senha..."
 
-#: ../libpurple/protocols/gg/gg.c:2030
+#: ../libpurple/protocols/gg/gg.c:2028
 msgid "Upload buddylist to Server"
 msgstr "Enviar lista de amigos para o servidor"
 
-#: ../libpurple/protocols/gg/gg.c:2034
+#: ../libpurple/protocols/gg/gg.c:2032
 msgid "Download buddylist from Server"
 msgstr "Transferir lista de amigos do servidor"
 
-#: ../libpurple/protocols/gg/gg.c:2038
+#: ../libpurple/protocols/gg/gg.c:2036
 msgid "Delete buddylist from Server"
 msgstr "Remover lista de amigos do servidor"
 
-#: ../libpurple/protocols/gg/gg.c:2042
+#: ../libpurple/protocols/gg/gg.c:2040
 msgid "Save buddylist to file..."
 msgstr "Salvar lista de amigos para um arquivo..."
 
-#: ../libpurple/protocols/gg/gg.c:2046
+#: ../libpurple/protocols/gg/gg.c:2044
 msgid "Load buddylist from file..."
 msgstr "Carregar lista de amigos do arquivo.."
 
@@ -3442,16 +3486,16 @@
 #. id
 #. name
 #. version
-#: ../libpurple/protocols/gg/gg.c:2150
+#: ../libpurple/protocols/gg/gg.c:2148
 msgid "Gadu-Gadu Protocol Plugin"
 msgstr "Plugin do protocolo Gadu-Gadu"
 
 #. summary
-#: ../libpurple/protocols/gg/gg.c:2151
+#: ../libpurple/protocols/gg/gg.c:2149
 msgid "Polish popular IM"
 msgstr "Cliente de mensagens instantâneas popular na Polônia"
 
-#: ../libpurple/protocols/gg/gg.c:2205
+#: ../libpurple/protocols/gg/gg.c:2203
 msgid "Gadu-Gadu User"
 msgstr "Usuário do Gadu-Gadu"
 
@@ -3479,9 +3523,9 @@
 
 #: ../libpurple/protocols/irc/dcc_send.c:296
 #: ../libpurple/protocols/irc/dcc_send.c:337
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:268
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:277
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:290
+#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:269
+#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:278
+#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:291
 msgid "File Transfer Failed"
 msgstr "Transferência de arquivo falhou"
 
@@ -3522,7 +3566,7 @@
 msgstr "_Canal:"
 
 #: ../libpurple/protocols/irc/irc.c:267
-#: ../libpurple/protocols/jabber/chat.c:59 ../pidgin/gtkaccount.c:523
+#: ../libpurple/protocols/jabber/chat.c:59 ../pidgin/gtkaccount.c:526
 msgid "_Password:"
 msgstr "_Senha:"
 
@@ -3532,15 +3576,15 @@
 
 #. connect to the server
 #: ../libpurple/protocols/irc/irc.c:319
-#: ../libpurple/protocols/jabber/jabber.c:1048
+#: ../libpurple/protocols/jabber/jabber.c:1046
 #: ../libpurple/protocols/msn/session.c:345
 #: ../libpurple/protocols/novell/novell.c:2182
-#: ../libpurple/protocols/oscar/oscar.c:1270
+#: ../libpurple/protocols/oscar/oscar.c:1288
 #: ../libpurple/protocols/qq/qq.c:136
 #: ../libpurple/protocols/sametime/sametime.c:3723
 #: ../libpurple/protocols/simple/simple.c:1671
 #: ../libpurple/protocols/yahoo/yahoo.c:2762
-#: ../libpurple/protocols/zephyr/zephyr.c:1621 ../pidgin/gtkstatusbox.c:659
+#: ../libpurple/protocols/zephyr/zephyr.c:1621 ../pidgin/gtkstatusbox.c:661
 msgid "Connecting"
 msgstr "Conectando"
 
@@ -3557,7 +3601,7 @@
 msgstr "Não foi possível criar socket"
 
 #: ../libpurple/protocols/irc/irc.c:416
-#: ../libpurple/protocols/oscar/oscar.c:1266
+#: ../libpurple/protocols/oscar/oscar.c:1284
 msgid "Couldn't connect to host"
 msgstr "Não foi possível conectar ao host"
 
@@ -3578,7 +3622,7 @@
 #: ../libpurple/protocols/irc/irc.c:775
 #: ../libpurple/protocols/silc/chat.c:1412
 #: ../libpurple/protocols/silc10/chat.c:1426
-#: ../libpurple/protocols/yahoo/yahoochat.c:1438
+#: ../libpurple/protocols/yahoo/yahoochat.c:1401
 msgid "Users"
 msgstr "Usuários"
 
@@ -3588,7 +3632,7 @@
 #: ../libpurple/protocols/silc/ops.c:1389
 #: ../libpurple/protocols/silc10/chat.c:1429
 #: ../libpurple/protocols/silc10/ops.c:1382
-#: ../libpurple/protocols/yahoo/yahoochat.c:1447
+#: ../libpurple/protocols/yahoo/yahoochat.c:1410
 msgid "Topic"
 msgstr "Tópico"
 
@@ -3600,19 +3644,19 @@
 #. *< id
 #. *< name
 #. *< version
-#: ../libpurple/protocols/irc/irc.c:915
+#: ../libpurple/protocols/irc/irc.c:916
 msgid "IRC Protocol Plugin"
 msgstr "Plugin do protocolo IRC"
 
 #. *  summary
-#: ../libpurple/protocols/irc/irc.c:916
+#: ../libpurple/protocols/irc/irc.c:917
 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:941 ../libpurple/protocols/irc/msgs.c:323
+#: ../libpurple/protocols/irc/irc.c:942 ../libpurple/protocols/irc/msgs.c:323
 #: ../libpurple/protocols/msn/msn.c:2154
-#: ../libpurple/protocols/oscar/oscar.c:6623
+#: ../libpurple/protocols/oscar/oscar.c:6650
 #: ../libpurple/protocols/qq/qq.c:756
 #: ../libpurple/protocols/sametime/sametime.c:5727
 #: ../libpurple/protocols/silc/ops.c:1249
@@ -3625,21 +3669,21 @@
 msgstr "Servidor"
 
 #. port to connect to
-#: ../libpurple/protocols/irc/irc.c:944 ../libpurple/protocols/msn/msn.c:2159
-#: ../libpurple/protocols/oscar/oscar.c:6626
+#: ../libpurple/protocols/irc/irc.c:945 ../libpurple/protocols/msn/msn.c:2159
+#: ../libpurple/protocols/oscar/oscar.c:6653
 #: ../libpurple/protocols/qq/qq.c:759
 #: ../libpurple/protocols/sametime/sametime.c:5732
-#: ../libpurple/protocols/silc/silc.c:1917
-#: ../libpurple/protocols/silc10/silc.c:1859
+#: ../libpurple/protocols/silc/silc.c:1918
+#: ../libpurple/protocols/silc10/silc.c:1861
 #: ../libpurple/protocols/toc/toc.c:2331
 msgid "Port"
 msgstr "Porta"
 
-#: ../libpurple/protocols/irc/irc.c:947
+#: ../libpurple/protocols/irc/irc.c:948
 msgid "Encodings"
 msgstr "Codificações"
 
-#: ../libpurple/protocols/irc/irc.c:950 ../libpurple/protocols/irc/msgs.c:316
+#: ../libpurple/protocols/irc/irc.c:951 ../libpurple/protocols/irc/msgs.c:316
 #: ../libpurple/protocols/jabber/jabber.c:803
 #: ../libpurple/protocols/silc/buddy.c:1539
 #: ../libpurple/protocols/silc/ops.c:1197
@@ -3656,7 +3700,7 @@
 msgid "Username"
 msgstr "Nome do usuário"
 
-#: ../libpurple/protocols/irc/irc.c:953 ../libpurple/protocols/irc/msgs.c:317
+#: ../libpurple/protocols/irc/irc.c:954 ../libpurple/protocols/irc/msgs.c:317
 #: ../libpurple/protocols/silc/silc.c:1009
 #: ../libpurple/protocols/silc10/silc.c:920
 msgid "Real name"
@@ -3666,7 +3710,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:961
+#: ../libpurple/protocols/irc/irc.c:962
 msgid "Use SSL"
 msgstr "Usar SSL"
 
@@ -3697,7 +3741,7 @@
 msgstr " <i>(identificado)</i>"
 
 #: ../libpurple/protocols/irc/msgs.c:303
-#: ../libpurple/protocols/oscar/oscar.c:3688
+#: ../libpurple/protocols/oscar/oscar.c:3714
 #: ../libpurple/protocols/silc/ops.c:1418
 #: ../libpurple/protocols/silc10/ops.c:1414
 msgid "Nick"
@@ -3980,7 +4024,7 @@
 msgstr "names [canal]:  Lista os usuários que estão no canal atualmente."
 
 #: ../libpurple/protocols/irc/parse.c:137
-#: ../libpurple/protocols/jabber/jabber.c:1819
+#: ../libpurple/protocols/jabber/jabber.c:1813
 msgid "nick &lt;new nickname&gt;:  Change your nickname."
 msgstr "nick &lt;novo apelido&gt;:  Muda seu apelido."
 
@@ -4175,7 +4219,7 @@
 msgstr "Erro de SASL"
 
 #: ../libpurple/protocols/jabber/buddy.c:271
-#: ../libpurple/protocols/jabber/buddy.c:787
+#: ../libpurple/protocols/jabber/buddy.c:825
 #: ../libpurple/protocols/sametime/sametime.c:4128
 #: ../libpurple/protocols/silc/ops.c:986
 #: ../libpurple/protocols/silc10/ops.c:1020
@@ -4183,14 +4227,14 @@
 msgstr "Nome completo"
 
 #: ../libpurple/protocols/jabber/buddy.c:272
-#: ../libpurple/protocols/jabber/buddy.c:800
+#: ../libpurple/protocols/jabber/buddy.c:838
 #: ../libpurple/protocols/silc/ops.c:998
 #: ../libpurple/protocols/silc10/ops.c:1032
 msgid "Family Name"
 msgstr "Sobrenome"
 
 #: ../libpurple/protocols/jabber/buddy.c:273
-#: ../libpurple/protocols/jabber/buddy.c:804
+#: ../libpurple/protocols/jabber/buddy.c:842
 msgid "Given Name"
 msgstr "Nome"
 
@@ -4200,47 +4244,47 @@
 msgstr "URL"
 
 #: ../libpurple/protocols/jabber/buddy.c:276
-#: ../libpurple/protocols/jabber/buddy.c:856
+#: ../libpurple/protocols/jabber/buddy.c:894
 msgid "Street Address"
 msgstr "Endereço (Rua)"
 
 #: ../libpurple/protocols/jabber/buddy.c:277
-#: ../libpurple/protocols/jabber/buddy.c:852
+#: ../libpurple/protocols/jabber/buddy.c:890
 msgid "Extended Address"
 msgstr "Endereço (Complemento)"
 
 #: ../libpurple/protocols/jabber/buddy.c:278
-#: ../libpurple/protocols/jabber/buddy.c:860
+#: ../libpurple/protocols/jabber/buddy.c:898
 msgid "Locality"
 msgstr "Localidade"
 
 #: ../libpurple/protocols/jabber/buddy.c:279
-#: ../libpurple/protocols/jabber/buddy.c:864
+#: ../libpurple/protocols/jabber/buddy.c:902
 msgid "Region"
 msgstr "Região"
 
 #: ../libpurple/protocols/jabber/buddy.c:280
-#: ../libpurple/protocols/jabber/buddy.c:868
+#: ../libpurple/protocols/jabber/buddy.c:906
 msgid "Postal Code"
 msgstr "Código postal (CEP)"
 
 #: ../libpurple/protocols/jabber/buddy.c:281
-#: ../libpurple/protocols/jabber/buddy.c:873
+#: ../libpurple/protocols/jabber/buddy.c:911
 #: ../libpurple/protocols/silc/silc.c:1015
 #: ../libpurple/protocols/silc10/silc.c:926
 msgid "Country"
 msgstr "País"
 
 #: ../libpurple/protocols/jabber/buddy.c:282
-#: ../libpurple/protocols/jabber/buddy.c:884
-#: ../libpurple/protocols/jabber/buddy.c:891
+#: ../libpurple/protocols/jabber/buddy.c:922
+#: ../libpurple/protocols/jabber/buddy.c:929
 msgid "Telephone"
 msgstr "Telefone"
 
 #: ../libpurple/protocols/jabber/buddy.c:283
-#: ../libpurple/protocols/jabber/buddy.c:902
-#: ../libpurple/protocols/jabber/buddy.c:910
-#: ../libpurple/protocols/jabber/buddy.c:1591
+#: ../libpurple/protocols/jabber/buddy.c:940
+#: ../libpurple/protocols/jabber/buddy.c:948
+#: ../libpurple/protocols/jabber/buddy.c:1629
 #: ../libpurple/protocols/silc/ops.c:1041
 #: ../libpurple/protocols/silc/util.c:555
 #: ../libpurple/protocols/silc10/ops.c:1075
@@ -4250,40 +4294,40 @@
 msgstr "Email"
 
 #: ../libpurple/protocols/jabber/buddy.c:284
-#: ../libpurple/protocols/jabber/buddy.c:925
+#: ../libpurple/protocols/jabber/buddy.c:963
 msgid "Organization Name"
 msgstr "Nome da organização"
 
 #: ../libpurple/protocols/jabber/buddy.c:285
-#: ../libpurple/protocols/jabber/buddy.c:929
+#: ../libpurple/protocols/jabber/buddy.c:967
 msgid "Organization Unit"
 msgstr "Grupo de trabalho"
 
 #: ../libpurple/protocols/jabber/buddy.c:287
-#: ../libpurple/protocols/jabber/buddy.c:938
+#: ../libpurple/protocols/jabber/buddy.c:976
 msgid "Role"
 msgstr "Função"
 
 #: ../libpurple/protocols/jabber/buddy.c:288
-#: ../libpurple/protocols/jabber/buddy.c:821
+#: ../libpurple/protocols/jabber/buddy.c:859
 #: ../libpurple/protocols/msn/msn.c:1627
-#: ../libpurple/protocols/oscar/oscar.c:3737
+#: ../libpurple/protocols/oscar/oscar.c:3763
 msgid "Birthday"
 msgstr "Data de nascimento"
 
 #: ../libpurple/protocols/jabber/buddy.c:289
-#: ../libpurple/protocols/jabber/buddy.c:941
+#: ../libpurple/protocols/jabber/buddy.c:979
 #: ../libpurple/protocols/jabber/chat.c:775 ../pidgin/gtkblist.c:3081
-#: ../pidgin/gtkprefs.c:680
+#: ../pidgin/gtkprefs.c:738
 msgid "Description"
 msgstr "Descrição"
 
-#: ../libpurple/protocols/jabber/buddy.c:578
-#: ../libpurple/protocols/jabber/buddy.c:579
+#: ../libpurple/protocols/jabber/buddy.c:582
+#: ../libpurple/protocols/jabber/buddy.c:583
 msgid "Edit XMPP vCard"
 msgstr "Editar vCard do XMPP"
 
-#: ../libpurple/protocols/jabber/buddy.c:580
+#: ../libpurple/protocols/jabber/buddy.c:584
 msgid ""
 "All items below are optional. Enter only the information with which you feel "
 "comfortable."
@@ -4291,116 +4335,116 @@
 "Todos os itens a seguir são opcionais. Preencha apenas as informações que "
 "quiser."
 
-#: ../libpurple/protocols/jabber/buddy.c:651
-#: ../libpurple/protocols/jabber/buddy.c:692
+#: ../libpurple/protocols/jabber/buddy.c:655
+#: ../libpurple/protocols/jabber/buddy.c:696
 msgid "Client"
 msgstr "Cliente"
 
-#: ../libpurple/protocols/jabber/buddy.c:655
-#: ../libpurple/protocols/jabber/buddy.c:696
+#: ../libpurple/protocols/jabber/buddy.c:659
+#: ../libpurple/protocols/jabber/buddy.c:700
 msgid "Operating System"
 msgstr "Sistema operacional"
 
-#: ../libpurple/protocols/jabber/buddy.c:665
-#: ../libpurple/protocols/jabber/libxmpp.c:198
+#: ../libpurple/protocols/jabber/buddy.c:669
+#: ../libpurple/protocols/jabber/libxmpp.c:202
 #: ../libpurple/protocols/jabber/si.c:853
 msgid "Resource"
 msgstr "Recurso"
 
-#: ../libpurple/protocols/jabber/buddy.c:667
-#: ../libpurple/protocols/jabber/jabber.c:1251
-#: ../libpurple/protocols/jabber/jabber.c:1261
-#: ../libpurple/protocols/jabber/jabber.c:1271
-#: ../libpurple/protocols/jabber/jabber.c:1281
-#: ../libpurple/protocols/jabber/jabber.c:1291
+#: ../libpurple/protocols/jabber/buddy.c:671
+#: ../libpurple/protocols/jabber/jabber.c:1243
+#: ../libpurple/protocols/jabber/jabber.c:1253
+#: ../libpurple/protocols/jabber/jabber.c:1263
+#: ../libpurple/protocols/jabber/jabber.c:1273
+#: ../libpurple/protocols/jabber/jabber.c:1283
 msgid "Priority"
 msgstr "Prioridade"
 
-#: ../libpurple/protocols/jabber/buddy.c:808
+#: ../libpurple/protocols/jabber/buddy.c:846
 #: ../libpurple/protocols/silc/ops.c:994
 #: ../libpurple/protocols/silc10/ops.c:1028
 msgid "Middle Name"
 msgstr "Nome do meio"
 
-#: ../libpurple/protocols/jabber/buddy.c:841
+#: ../libpurple/protocols/jabber/buddy.c:879
 #: ../libpurple/protocols/jabber/jabber.c:838
-#: ../libpurple/protocols/oscar/oscar.c:3776
-#: ../libpurple/protocols/oscar/oscar.c:3789
+#: ../libpurple/protocols/oscar/oscar.c:3802
+#: ../libpurple/protocols/oscar/oscar.c:3815
 #: ../libpurple/protocols/qq/buddy_info.c:56
 #: ../libpurple/protocols/silc/ops.c:1030
 #: ../libpurple/protocols/silc10/ops.c:1064
 msgid "Address"
 msgstr "Endereço"
 
-#: ../libpurple/protocols/jabber/buddy.c:848
+#: ../libpurple/protocols/jabber/buddy.c:886
 msgid "P.O. Box"
 msgstr "Caixa postal"
 
-#: ../libpurple/protocols/jabber/buddy.c:962
+#: ../libpurple/protocols/jabber/buddy.c:1000
 msgid "Photo"
 msgstr "Foto"
 
-#: ../libpurple/protocols/jabber/buddy.c:962
+#: ../libpurple/protocols/jabber/buddy.c:1000
 msgid "Logo"
 msgstr "Logotipo"
 
-#: ../libpurple/protocols/jabber/buddy.c:1371
+#: ../libpurple/protocols/jabber/buddy.c:1409
 msgid "Un-hide From"
 msgstr "Não ocultar-se de"
 
-#: ../libpurple/protocols/jabber/buddy.c:1375
+#: ../libpurple/protocols/jabber/buddy.c:1413
 msgid "Temporarily Hide From"
 msgstr "Ocultar-se temporariamente de"
 
 #. && NOT ME
-#: ../libpurple/protocols/jabber/buddy.c:1383
+#: ../libpurple/protocols/jabber/buddy.c:1421
 msgid "Cancel Presence Notification"
 msgstr "Cancelar notificação de presença"
 
-#: ../libpurple/protocols/jabber/buddy.c:1390
+#: ../libpurple/protocols/jabber/buddy.c:1428
 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:1399
+#: ../libpurple/protocols/jabber/buddy.c:1437
 msgid "Unsubscribe"
 msgstr "Parar de monitorar a presença"
 
-#: ../libpurple/protocols/jabber/buddy.c:1432
-#: ../libpurple/protocols/jabber/jabber.c:1260
+#: ../libpurple/protocols/jabber/buddy.c:1470
+#: ../libpurple/protocols/jabber/jabber.c:1252
 msgid "Chatty"
 msgstr "Disponível para bate-papo"
 
-#: ../libpurple/protocols/jabber/buddy.c:1436 ../libpurple/status.c:158
+#: ../libpurple/protocols/jabber/buddy.c:1474
 msgid "Extended Away"
 msgstr "Ausente (estendido)"
 
-#: ../libpurple/protocols/jabber/buddy.c:1438
-#: ../libpurple/protocols/jabber/jabber.c:1290
-#: ../libpurple/protocols/oscar/oscar.c:709
-#: ../libpurple/protocols/oscar/oscar.c:5760
+#: ../libpurple/protocols/jabber/buddy.c:1476
+#: ../libpurple/protocols/jabber/jabber.c:1282
+#: ../libpurple/protocols/oscar/oscar.c:727
+#: ../libpurple/protocols/oscar/oscar.c:5787
 #: ../libpurple/protocols/sametime/sametime.c:3297
 msgid "Do Not Disturb"
 msgstr "Não perturbe"
 
-#: ../libpurple/protocols/jabber/buddy.c:1583
+#: ../libpurple/protocols/jabber/buddy.c:1621
 msgid "JID"
 msgstr "ID Jabber"
 
-#: ../libpurple/protocols/jabber/buddy.c:1587
-#: ../libpurple/protocols/jabber/buddy.c:1766
-#: ../libpurple/protocols/oscar/oscar.c:3699
+#: ../libpurple/protocols/jabber/buddy.c:1625
+#: ../libpurple/protocols/jabber/buddy.c:1804
+#: ../libpurple/protocols/oscar/oscar.c:3725
 msgid "Last Name"
 msgstr "Sobrenome"
 
-#: ../libpurple/protocols/jabber/buddy.c:1619
+#: ../libpurple/protocols/jabber/buddy.c:1657
 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:1694
+#: ../libpurple/protocols/jabber/buddy.c:1732
 msgid ""
 "Find a contact by entering the search criteria in the given fields. Note: "
 "Each field supports wild card searches (%)"
@@ -4408,71 +4452,71 @@
 "Encontre um contato digitando critérios de busca nos campos abaixo. Nota: "
 "Todos os campos suportam caracteres coringa (%)"
 
-#: ../libpurple/protocols/jabber/buddy.c:1714
+#: ../libpurple/protocols/jabber/buddy.c:1752
 msgid "Directory Query Failed"
 msgstr "A consulta ao serviço de diretório falhou"
 
-#: ../libpurple/protocols/jabber/buddy.c:1715
+#: ../libpurple/protocols/jabber/buddy.c:1753
 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:1749
+#: ../libpurple/protocols/jabber/buddy.c:1787
 #, c-format
 msgid "Server Instructions: %s"
 msgstr "Instruções do servidor: %s"
 
-#: ../libpurple/protocols/jabber/buddy.c:1756
+#: ../libpurple/protocols/jabber/buddy.c:1794
 msgid "Fill in one or more fields to search for any matching XMPP users."
 msgstr ""
 "Preencha um ou mais campos para procurar um usuário XMPP que satisfaça este "
 "critério."
 
-#: ../libpurple/protocols/jabber/buddy.c:1776
+#: ../libpurple/protocols/jabber/buddy.c:1814
 #: ../libpurple/protocols/novell/novell.c:1488
-#: ../libpurple/protocols/oscar/oscar.c:3702
-#: ../libpurple/protocols/oscar/oscar.c:3711
+#: ../libpurple/protocols/oscar/oscar.c:3728
+#: ../libpurple/protocols/oscar/oscar.c:3737
 msgid "E-Mail Address"
 msgstr "Endereço de e-mail"
 
-#: ../libpurple/protocols/jabber/buddy.c:1785
-#: ../libpurple/protocols/jabber/buddy.c:1786
+#: ../libpurple/protocols/jabber/buddy.c:1823
+#: ../libpurple/protocols/jabber/buddy.c:1824
 msgid "Search for XMPP users"
 msgstr "Procurar por usuários XMPP"
 
 #. "Search"
-#: ../libpurple/protocols/jabber/buddy.c:1787
+#: ../libpurple/protocols/jabber/buddy.c:1825
 #: ../libpurple/protocols/qq/group.c:123
-#: ../libpurple/protocols/qq/group_im.c:145
+#: ../libpurple/protocols/qq/group_im.c:147
 #: ../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:5611
-#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:473
-#: ../pidgin/plugins/gevolution/assoc-buddy.c:358
+#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:470
+#: ../pidgin/plugins/gevolution/assoc-buddy.c:356
 msgid "Search"
 msgstr "Procurar"
 
-#: ../libpurple/protocols/jabber/buddy.c:1802
+#: ../libpurple/protocols/jabber/buddy.c:1840
 msgid "Invalid Directory"
 msgstr "Diretório inválido"
 
-#: ../libpurple/protocols/jabber/buddy.c:1819
+#: ../libpurple/protocols/jabber/buddy.c:1857
 msgid "Enter a User Directory"
 msgstr "Digite um diretório de usuários"
 
-#: ../libpurple/protocols/jabber/buddy.c:1820
+#: ../libpurple/protocols/jabber/buddy.c:1858
 msgid "Select a user directory to search"
 msgstr "Selecione um diretório de usuários para procurar"
 
-#: ../libpurple/protocols/jabber/buddy.c:1823
+#: ../libpurple/protocols/jabber/buddy.c:1861
 msgid "Search Directory"
 msgstr "Diretório de busca"
 
 #: ../libpurple/protocols/jabber/chat.c:41
-#: ../libpurple/protocols/oscar/oscar.c:5246
-#: ../libpurple/protocols/yahoo/yahoochat.c:999
+#: ../libpurple/protocols/oscar/oscar.c:5273
+#: ../libpurple/protocols/yahoo/yahoochat.c:962
 msgid "_Room:"
 msgstr "Sa_la:"
 
@@ -4613,7 +4657,7 @@
 msgstr "Registro efetuado com sucesso"
 
 #: ../libpurple/protocols/jabber/jabber.c:653
-#: ../libpurple/protocols/jabber/jabber.c:1530
+#: ../libpurple/protocols/jabber/jabber.c:1524
 msgid "Unknown Error"
 msgstr "Erro desconhecido"
 
@@ -4628,8 +4672,8 @@
 msgstr "Já está registrado"
 
 #: ../libpurple/protocols/jabber/jabber.c:848
-#: ../libpurple/protocols/oscar/oscar.c:3778
-#: ../libpurple/protocols/oscar/oscar.c:3791
+#: ../libpurple/protocols/oscar/oscar.c:3804
+#: ../libpurple/protocols/oscar/oscar.c:3817
 msgid "State"
 msgstr "Estado"
 
@@ -4662,358 +4706,362 @@
 msgstr "Registrar nova conta do XMPP"
 
 #. Register button
-#: ../libpurple/protocols/jabber/jabber.c:881 ../pidgin/gtkaccount.c:1526
+#: ../libpurple/protocols/jabber/jabber.c:881 ../pidgin/gtkaccount.c:1518
 msgid "Register"
 msgstr "Registrar"
 
-#: ../libpurple/protocols/jabber/jabber.c:1052
+#: ../libpurple/protocols/jabber/jabber.c:1050
 msgid "Initializing Stream"
 msgstr "Inicializando fluxo"
 
-#: ../libpurple/protocols/jabber/jabber.c:1057
+#: ../libpurple/protocols/jabber/jabber.c:1055
 #: ../libpurple/protocols/msn/session.c:351
 msgid "Authenticating"
 msgstr "Autenticando"
 
-#: ../libpurple/protocols/jabber/jabber.c:1066
+#: ../libpurple/protocols/jabber/jabber.c:1064
 msgid "Re-initializing Stream"
 msgstr "Reinicializando fluxo"
 
-#: ../libpurple/protocols/jabber/jabber.c:1134
-#: ../libpurple/protocols/jabber/jabber.c:1508
-#: ../libpurple/protocols/jabber/jabber.c:1549
-#: ../libpurple/protocols/jabber/jabber.c:1585
-#: ../libpurple/protocols/oscar/oscar.c:808
-#: ../libpurple/protocols/oscar/oscar.c:5554
+#: ../libpurple/protocols/jabber/jabber.c:1126
+#: ../libpurple/protocols/jabber/jabber.c:1502
+#: ../libpurple/protocols/jabber/jabber.c:1543
+#: ../libpurple/protocols/jabber/jabber.c:1579
+#: ../libpurple/protocols/oscar/oscar.c:826
+#: ../libpurple/protocols/oscar/oscar.c:5581
 msgid "Not Authorized"
 msgstr "Não autorizado"
 
-#: ../libpurple/protocols/jabber/jabber.c:1176
+#: ../libpurple/protocols/jabber/jabber.c:1168
 msgid "Both"
 msgstr "Ambas"
 
-#: ../libpurple/protocols/jabber/jabber.c:1178
+#: ../libpurple/protocols/jabber/jabber.c:1170
 msgid "From (To pending)"
 msgstr "De (Para pendente)"
 
-#: ../libpurple/protocols/jabber/jabber.c:1183
+#: ../libpurple/protocols/jabber/jabber.c:1172
+msgid "From"
+msgstr "De"
+
+#: ../libpurple/protocols/jabber/jabber.c:1175
 msgid "To"
 msgstr "Para"
 
-#: ../libpurple/protocols/jabber/jabber.c:1185
+#: ../libpurple/protocols/jabber/jabber.c:1177
 msgid "None (To pending)"
 msgstr "Nenhuma (Para pendente)"
 
-#: ../libpurple/protocols/jabber/jabber.c:1187
+#: ../libpurple/protocols/jabber/jabber.c:1179
 #: ../pidgin/plugins/gevolution/eds-utils.c:73
 #: ../pidgin/plugins/gevolution/eds-utils.c:86
 msgid "None"
 msgstr "Nenhuma"
 
-#: ../libpurple/protocols/jabber/jabber.c:1190
+#: ../libpurple/protocols/jabber/jabber.c:1182
 msgid "Subscription"
 msgstr "Inscrição"
 
-#: ../libpurple/protocols/jabber/jabber.c:1320
+#: ../libpurple/protocols/jabber/jabber.c:1312
 msgid "Password Changed"
 msgstr "Senha alterada"
 
-#: ../libpurple/protocols/jabber/jabber.c:1321
+#: ../libpurple/protocols/jabber/jabber.c:1313
 msgid "Your password has been changed."
 msgstr "Sua senha foi alterada."
 
-#: ../libpurple/protocols/jabber/jabber.c:1325
-#: ../libpurple/protocols/jabber/jabber.c:1326
+#: ../libpurple/protocols/jabber/jabber.c:1317
+#: ../libpurple/protocols/jabber/jabber.c:1318
 msgid "Error changing password"
 msgstr "Erro ao mudar a senha"
 
-#: ../libpurple/protocols/jabber/jabber.c:1382
+#: ../libpurple/protocols/jabber/jabber.c:1375
 msgid "Password (again)"
 msgstr "Senha (novamente)"
 
-#: ../libpurple/protocols/jabber/jabber.c:1387
-#: ../libpurple/protocols/jabber/jabber.c:1388
+#: ../libpurple/protocols/jabber/jabber.c:1381
+#: ../libpurple/protocols/jabber/jabber.c:1382
 msgid "Change XMPP Password"
 msgstr "Alterar senha do XMPP"
 
-#: ../libpurple/protocols/jabber/jabber.c:1388
+#: ../libpurple/protocols/jabber/jabber.c:1382
 msgid "Please enter your new password"
 msgstr "Favor digitar sua nova senha"
 
-#: ../libpurple/protocols/jabber/jabber.c:1400
-#: ../libpurple/protocols/oscar/oscar.c:6340
+#: ../libpurple/protocols/jabber/jabber.c:1394
+#: ../libpurple/protocols/oscar/oscar.c:6367
 #: ../libpurple/protocols/silc/silc.c:1093
 #: ../libpurple/protocols/silc10/silc.c:1004
 msgid "Set User Info..."
 msgstr "Definir informações de usuário..."
 
 #. if (js->protocol_options & CHANGE_PASSWORD) {
-#: ../libpurple/protocols/jabber/jabber.c:1405
-#: ../libpurple/protocols/oscar/oscar.c:6351
+#: ../libpurple/protocols/jabber/jabber.c:1399
+#: ../libpurple/protocols/oscar/oscar.c:6378
 #: ../libpurple/protocols/silc/silc.c:1089
 #: ../libpurple/protocols/silc10/silc.c:1000
 msgid "Change Password..."
 msgstr "Alterar senha..."
 
 #. }
-#: ../libpurple/protocols/jabber/jabber.c:1410
+#: ../libpurple/protocols/jabber/jabber.c:1404
 msgid "Search for Users..."
 msgstr "Procurar por usuários..."
 
+#: ../libpurple/protocols/jabber/jabber.c:1482
+msgid "Bad Request"
+msgstr "Requisição inválida"
+
+#: ../libpurple/protocols/jabber/jabber.c:1484
+msgid "Conflict"
+msgstr "Conflito"
+
+#: ../libpurple/protocols/jabber/jabber.c:1486
+msgid "Feature Not Implemented"
+msgstr "Recurso não implementado"
+
 #: ../libpurple/protocols/jabber/jabber.c:1488
-msgid "Bad Request"
-msgstr "Requisição inválida"
+msgid "Forbidden"
+msgstr "Proibido"
 
 #: ../libpurple/protocols/jabber/jabber.c:1490
-msgid "Conflict"
-msgstr "Conflito"
+msgid "Gone"
+msgstr "Saiu"
 
 #: ../libpurple/protocols/jabber/jabber.c:1492
-msgid "Feature Not Implemented"
-msgstr "Recurso não implementado"
-
-#: ../libpurple/protocols/jabber/jabber.c:1494
-msgid "Forbidden"
-msgstr "Proibido"
-
-#: ../libpurple/protocols/jabber/jabber.c:1496
-msgid "Gone"
-msgstr "Saiu"
-
-#: ../libpurple/protocols/jabber/jabber.c:1498
-#: ../libpurple/protocols/jabber/jabber.c:1575
+#: ../libpurple/protocols/jabber/jabber.c:1569
 msgid "Internal Server Error"
 msgstr "Erro interno do servidor"
 
-#: ../libpurple/protocols/jabber/jabber.c:1500
+#: ../libpurple/protocols/jabber/jabber.c:1494
 msgid "Item Not Found"
 msgstr "Item não encontrado"
 
-#: ../libpurple/protocols/jabber/jabber.c:1502
+#: ../libpurple/protocols/jabber/jabber.c:1496
 msgid "Malformed XMPP ID"
 msgstr "ID do XMPP em formato inválido"
 
-#: ../libpurple/protocols/jabber/jabber.c:1504
+#: ../libpurple/protocols/jabber/jabber.c:1498
 msgid "Not Acceptable"
 msgstr "Não aceitável"
 
-#: ../libpurple/protocols/jabber/jabber.c:1506
+#: ../libpurple/protocols/jabber/jabber.c:1500
 msgid "Not Allowed"
 msgstr "Não permitido"
 
-#: ../libpurple/protocols/jabber/jabber.c:1510
+#: ../libpurple/protocols/jabber/jabber.c:1504
 msgid "Payment Required"
 msgstr "Pagamento requerido"
 
-#: ../libpurple/protocols/jabber/jabber.c:1512
+#: ../libpurple/protocols/jabber/jabber.c:1506
 msgid "Recipient Unavailable"
 msgstr "Destinatário indisponível"
 
-#: ../libpurple/protocols/jabber/jabber.c:1516
+#: ../libpurple/protocols/jabber/jabber.c:1510
 msgid "Registration Required"
 msgstr "Registro requerido"
 
-#: ../libpurple/protocols/jabber/jabber.c:1518
+#: ../libpurple/protocols/jabber/jabber.c:1512
 msgid "Remote Server Not Found"
 msgstr "Servidor remoto não encontrado"
 
-#: ../libpurple/protocols/jabber/jabber.c:1520
+#: ../libpurple/protocols/jabber/jabber.c:1514
 msgid "Remote Server Timeout"
 msgstr "Tempo limite esgotado ao conectar ao servidor remoto"
 
-#: ../libpurple/protocols/jabber/jabber.c:1522
+#: ../libpurple/protocols/jabber/jabber.c:1516
 msgid "Server Overloaded"
 msgstr "Servidor sobrecarregado"
 
-#: ../libpurple/protocols/jabber/jabber.c:1524
+#: ../libpurple/protocols/jabber/jabber.c:1518
 msgid "Service Unavailable"
 msgstr "Serviço indisponível"
 
-#: ../libpurple/protocols/jabber/jabber.c:1526
+#: ../libpurple/protocols/jabber/jabber.c:1520
 msgid "Subscription Required"
 msgstr "Inscrição requerida"
 
-#: ../libpurple/protocols/jabber/jabber.c:1528
+#: ../libpurple/protocols/jabber/jabber.c:1522
 msgid "Unexpected Request"
 msgstr "Requisição inesperada"
 
-#: ../libpurple/protocols/jabber/jabber.c:1535
+#: ../libpurple/protocols/jabber/jabber.c:1529
 msgid "Authorization Aborted"
 msgstr "Autorização abortada"
 
-#: ../libpurple/protocols/jabber/jabber.c:1537
+#: ../libpurple/protocols/jabber/jabber.c:1531
 msgid "Incorrect encoding in authorization"
 msgstr "Codificação da autorização incorreta"
 
-#: ../libpurple/protocols/jabber/jabber.c:1540
+#: ../libpurple/protocols/jabber/jabber.c:1534
 msgid "Invalid authzid"
 msgstr "Authzid inválido"
 
-#: ../libpurple/protocols/jabber/jabber.c:1543
+#: ../libpurple/protocols/jabber/jabber.c:1537
 msgid "Invalid Authorization Mechanism"
 msgstr "Mecanismo de autorização inválido"
 
-#: ../libpurple/protocols/jabber/jabber.c:1546
+#: ../libpurple/protocols/jabber/jabber.c:1540
 msgid "Authorization mechanism too weak"
 msgstr "Mecanismo de autenticação fraco demais"
 
-#: ../libpurple/protocols/jabber/jabber.c:1551
+#: ../libpurple/protocols/jabber/jabber.c:1545
 msgid "Temporary Authentication Failure"
 msgstr "Falha temporária na autenticação"
 
-#: ../libpurple/protocols/jabber/jabber.c:1554
+#: ../libpurple/protocols/jabber/jabber.c:1548
 msgid "Authentication Failure"
 msgstr "Falha na autenticação"
 
-#: ../libpurple/protocols/jabber/jabber.c:1560
+#: ../libpurple/protocols/jabber/jabber.c:1554
 msgid "Bad Format"
 msgstr "Formato inválido"
 
-#: ../libpurple/protocols/jabber/jabber.c:1562
+#: ../libpurple/protocols/jabber/jabber.c:1556
 msgid "Bad Namespace Prefix"
 msgstr "Prefixo de namespace inválido"
 
-#: ../libpurple/protocols/jabber/jabber.c:1565
+#: ../libpurple/protocols/jabber/jabber.c:1559
 msgid "Resource Conflict"
 msgstr "Conflito de recursos"
 
-#: ../libpurple/protocols/jabber/jabber.c:1567
+#: ../libpurple/protocols/jabber/jabber.c:1561
 #: ../libpurple/protocols/silc/silc.c:244
 #: ../libpurple/protocols/silc10/ops.c:1720
 msgid "Connection Timeout"
 msgstr "Tempo limite de conexão esgotado"
 
-#: ../libpurple/protocols/jabber/jabber.c:1569
+#: ../libpurple/protocols/jabber/jabber.c:1563
 msgid "Host Gone"
 msgstr "Host fora do ar"
 
-#: ../libpurple/protocols/jabber/jabber.c:1571
+#: ../libpurple/protocols/jabber/jabber.c:1565
 msgid "Host Unknown"
 msgstr "Host desconhecido"
 
+#: ../libpurple/protocols/jabber/jabber.c:1567
+msgid "Improper Addressing"
+msgstr "Endereçamento impróprio"
+
+#: ../libpurple/protocols/jabber/jabber.c:1571
+msgid "Invalid ID"
+msgstr "ID inválido"
+
 #: ../libpurple/protocols/jabber/jabber.c:1573
-msgid "Improper Addressing"
-msgstr "Endereçamento impróprio"
-
-#: ../libpurple/protocols/jabber/jabber.c:1577
-msgid "Invalid ID"
-msgstr "ID inválido"
-
-#: ../libpurple/protocols/jabber/jabber.c:1579
 msgid "Invalid Namespace"
 msgstr "Namespace inválido"
 
-#: ../libpurple/protocols/jabber/jabber.c:1581
+#: ../libpurple/protocols/jabber/jabber.c:1575
 msgid "Invalid XML"
 msgstr "XML inválido"
 
-#: ../libpurple/protocols/jabber/jabber.c:1583
+#: ../libpurple/protocols/jabber/jabber.c:1577
 msgid "Non-matching Hosts"
 msgstr "Hosts não compatíveis"
 
-#: ../libpurple/protocols/jabber/jabber.c:1587
+#: ../libpurple/protocols/jabber/jabber.c:1581
 msgid "Policy Violation"
 msgstr "Violação de normas"
 
-#: ../libpurple/protocols/jabber/jabber.c:1589
+#: ../libpurple/protocols/jabber/jabber.c:1583
 msgid "Remote Connection Failed"
 msgstr "Falha na conexão remota"
 
-#: ../libpurple/protocols/jabber/jabber.c:1591
+#: ../libpurple/protocols/jabber/jabber.c:1585
 msgid "Resource Constraint"
 msgstr "Limitação de recursos"
 
-#: ../libpurple/protocols/jabber/jabber.c:1593
+#: ../libpurple/protocols/jabber/jabber.c:1587
 msgid "Restricted XML"
 msgstr "XML restrito"
 
-#: ../libpurple/protocols/jabber/jabber.c:1595
+#: ../libpurple/protocols/jabber/jabber.c:1589
 msgid "See Other Host"
 msgstr "Ver outro host"
 
-#: ../libpurple/protocols/jabber/jabber.c:1597
+#: ../libpurple/protocols/jabber/jabber.c:1591
 msgid "System Shutdown"
 msgstr "Desligamento do sistema"
 
-#: ../libpurple/protocols/jabber/jabber.c:1599
+#: ../libpurple/protocols/jabber/jabber.c:1593
 msgid "Undefined Condition"
 msgstr "Condição indefinida"
 
-#: ../libpurple/protocols/jabber/jabber.c:1601
+#: ../libpurple/protocols/jabber/jabber.c:1595
 msgid "Unsupported Encoding"
 msgstr "Codificação não suportada"
 
-#: ../libpurple/protocols/jabber/jabber.c:1603
+#: ../libpurple/protocols/jabber/jabber.c:1597
 msgid "Unsupported Stanza Type"
 msgstr "Tipo de comando (Stanza) não suportado"
 
-#: ../libpurple/protocols/jabber/jabber.c:1605
+#: ../libpurple/protocols/jabber/jabber.c:1599
 msgid "Unsupported Version"
 msgstr "Versão não suportada"
 
-#: ../libpurple/protocols/jabber/jabber.c:1607
+#: ../libpurple/protocols/jabber/jabber.c:1601
 msgid "XML Not Well Formed"
 msgstr "XML mal-formado"
 
-#: ../libpurple/protocols/jabber/jabber.c:1609
+#: ../libpurple/protocols/jabber/jabber.c:1603
 msgid "Stream Error"
 msgstr "Erro no fluxo XML"
 
-#: ../libpurple/protocols/jabber/jabber.c:1676
+#: ../libpurple/protocols/jabber/jabber.c:1670
 #, c-format
 msgid "Unable to ban user %s"
 msgstr "Não foi possível banir usuário %s"
 
-#: ../libpurple/protocols/jabber/jabber.c:1696
+#: ../libpurple/protocols/jabber/jabber.c:1690
 #, c-format
 msgid "Unknown affiliation: \"%s\""
 msgstr "Filiação desconhecida: \"%s\""
 
-#: ../libpurple/protocols/jabber/jabber.c:1701
+#: ../libpurple/protocols/jabber/jabber.c:1695
 #, c-format
 msgid "Unable to affiliate user %s as \"%s\""
 msgstr "Não foi possível filiar usuário %s como \"%s\""
 
-#: ../libpurple/protocols/jabber/jabber.c:1720
+#: ../libpurple/protocols/jabber/jabber.c:1714
 #, c-format
 msgid "Unknown role: \"%s\""
 msgstr "Cargo desconhecido: \"%s\""
 
-#: ../libpurple/protocols/jabber/jabber.c:1727
+#: ../libpurple/protocols/jabber/jabber.c:1721
 #, c-format
 msgid "Unable to set role \"%s\" for user: %s"
 msgstr "Não foi possível definir cargo \"%s\" para o usuário: %s"
 
-#: ../libpurple/protocols/jabber/jabber.c:1780
+#: ../libpurple/protocols/jabber/jabber.c:1774
 #, c-format
 msgid "Unable to kick user %s"
 msgstr "Não foi possível convidar usuário (%s)."
 
-#: ../libpurple/protocols/jabber/jabber.c:1811
+#: ../libpurple/protocols/jabber/jabber.c:1805
 msgid "config:  Configure a chat room."
 msgstr "config:  Configura uma sala de bate-papo."
 
-#: ../libpurple/protocols/jabber/jabber.c:1815
+#: ../libpurple/protocols/jabber/jabber.c:1809
 msgid "configure:  Configure a chat room."
 msgstr "configure:  Configura uma sala de bate-papo."
 
-#: ../libpurple/protocols/jabber/jabber.c:1824
+#: ../libpurple/protocols/jabber/jabber.c:1818
 msgid "part [room]:  Leave the room."
 msgstr "part [sala]:  Sai da sala."
 
+#: ../libpurple/protocols/jabber/jabber.c:1823
+msgid "register:  Register with a chat room."
+msgstr "register:  Registra com uma sala de bate-papo."
+
 #: ../libpurple/protocols/jabber/jabber.c:1829
-msgid "register:  Register with a chat room."
-msgstr "register:  Registra com uma sala de bate-papo."
-
-#: ../libpurple/protocols/jabber/jabber.c:1835
 msgid "topic [new topic]:  View or change the topic."
 msgstr "topic [novo tópico]:  Ver ou mudar o tópico."
 
-#: ../libpurple/protocols/jabber/jabber.c:1841
+#: ../libpurple/protocols/jabber/jabber.c:1835
 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:1847
+#: ../libpurple/protocols/jabber/jabber.c:1841
 msgid ""
 "affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Set a user's "
 "affiliation with the room."
@@ -5021,7 +5069,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:1853
+#: ../libpurple/protocols/jabber/jabber.c:1847
 msgid ""
 "role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: Set a user's "
 "role in the room."
@@ -5029,19 +5077,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:1859
+#: ../libpurple/protocols/jabber/jabber.c:1853
 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:1865
+#: ../libpurple/protocols/jabber/jabber.c:1859
 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:1871
+#: ../libpurple/protocols/jabber/jabber.c:1865
 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:1876
+#: ../libpurple/protocols/jabber/jabber.c:1870
 msgid ""
 "msg &lt;user&gt; &lt;message&gt;:  Send a private message to another user."
 msgstr ""
@@ -5058,33 +5106,33 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/jabber/libxmpp.c:166
-#: ../libpurple/protocols/jabber/libxmpp.c:168
+#: ../libpurple/protocols/jabber/libxmpp.c:169
+#: ../libpurple/protocols/jabber/libxmpp.c:171
 msgid "XMPP Protocol Plugin"
 msgstr "Plugin do protocolo XMPP"
 
 #. Translators: 'domain' is used here in the context of Internet domains, e.g. pidgin.im
-#: ../libpurple/protocols/jabber/libxmpp.c:195 ../pidgin/gtkaccount.c:505
+#: ../libpurple/protocols/jabber/libxmpp.c:198 ../pidgin/gtkaccount.c:508
 msgid "Domain"
 msgstr "Domínio"
 
-#: ../libpurple/protocols/jabber/libxmpp.c:201
+#: ../libpurple/protocols/jabber/libxmpp.c:206
 msgid "Force old (port 5223) SSL"
 msgstr "Forçar SSL antigo (porta 5223)"
 
-#: ../libpurple/protocols/jabber/libxmpp.c:206
+#: ../libpurple/protocols/jabber/libxmpp.c:211
 msgid "Allow plaintext auth over unencrypted streams"
 msgstr "Permitir autenticação em texto puro sobre fluxos não-criptografados"
 
-#: ../libpurple/protocols/jabber/libxmpp.c:211
+#: ../libpurple/protocols/jabber/libxmpp.c:216
 #: ../libpurple/protocols/simple/simple.c:1856
 msgid "Connect port"
 msgstr "Porta de conexão"
 
 #. Account options
-#: ../libpurple/protocols/jabber/libxmpp.c:215
-#: ../libpurple/protocols/silc/silc.c:1913
-#: ../libpurple/protocols/silc10/silc.c:1855 ../pidgin/gtkaccount.c:835
+#: ../libpurple/protocols/jabber/libxmpp.c:220
+#: ../libpurple/protocols/silc/silc.c:1914
+#: ../libpurple/protocols/silc10/silc.c:1857 ../pidgin/gtkaccount.c:837
 msgid "Connect server"
 msgstr "Servidor de conexão"
 
@@ -5126,16 +5174,16 @@
 msgid "XML Parse error"
 msgstr "Erro ao processar XML"
 
-#: ../libpurple/protocols/jabber/presence.c:279
+#: ../libpurple/protocols/jabber/presence.c:290
 msgid "Unknown Error in presence"
 msgstr "Erro desconhecido na presença"
 
-#: ../libpurple/protocols/jabber/presence.c:353
-#: ../libpurple/protocols/jabber/presence.c:354
+#: ../libpurple/protocols/jabber/presence.c:364
+#: ../libpurple/protocols/jabber/presence.c:365
 msgid "Create New Room"
 msgstr "Criar nova sala"
 
-#: ../libpurple/protocols/jabber/presence.c:355
+#: ../libpurple/protocols/jabber/presence.c:366
 msgid ""
 "You are creating a new room.  Would you like to configure it, or accept the "
 "default settings?"
@@ -5143,20 +5191,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:372
 msgid "_Configure Room"
 msgstr "_Configurar sala"
 
-#: ../libpurple/protocols/jabber/presence.c:362
+#: ../libpurple/protocols/jabber/presence.c:373
 msgid "_Accept Defaults"
 msgstr "_Aceitar padrões"
 
-#: ../libpurple/protocols/jabber/presence.c:398
+#: ../libpurple/protocols/jabber/presence.c:409
 #, c-format
 msgid "Error in chat %s"
 msgstr "Erro no bate-papo %s"
 
-#: ../libpurple/protocols/jabber/presence.c:401
+#: ../libpurple/protocols/jabber/presence.c:412
 #, c-format
 msgid "Error joining chat %s"
 msgstr "Erro ao entrar no bate-papo %s"
@@ -5419,7 +5467,7 @@
 msgstr "Servidor ocupado demais"
 
 #: ../libpurple/protocols/msn/error.c:222
-#: ../libpurple/protocols/oscar/oscar.c:1363
+#: ../libpurple/protocols/oscar/oscar.c:1381
 #: ../libpurple/protocols/silc/silc.c:233
 #: ../libpurple/protocols/silc10/ops.c:1709
 #: ../libpurple/protocols/toc/toc.c:728 ../libpurple/proxy.c:1363
@@ -5603,12 +5651,12 @@
 msgstr "Erro ao obter perfil"
 
 #: ../libpurple/protocols/msn/msn.c:1550 ../pidgin/plugins/convcolors.c:309
-#: ../pidgin/plugins/pidginrc.c:448
+#: ../pidgin/plugins/pidginrc.c:366
 msgid "General"
 msgstr "Geral"
 
 #: ../libpurple/protocols/msn/msn.c:1557
-#: ../libpurple/protocols/oscar/oscar.c:3743
+#: ../libpurple/protocols/oscar/oscar.c:3769
 #: ../libpurple/protocols/qq/buddy_info.c:45
 #: ../libpurple/protocols/qq/qq.c:219
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1057
@@ -5704,7 +5752,7 @@
 msgstr "Telefone doméstico 2"
 
 #: ../libpurple/protocols/msn/msn.c:1622
-#: ../libpurple/protocols/oscar/oscar.c:3781
+#: ../libpurple/protocols/oscar/oscar.c:3807
 msgid "Home Address"
 msgstr "Endereço de casa"
 
@@ -5740,7 +5788,7 @@
 msgstr "Título de trabalho"
 
 #: ../libpurple/protocols/msn/msn.c:1647
-#: ../libpurple/protocols/oscar/oscar.c:3802
+#: ../libpurple/protocols/oscar/oscar.c:3828
 msgid "Company"
 msgstr "Empresa"
 
@@ -5762,7 +5810,7 @@
 msgstr "Telefone 2 do trabalho"
 
 #: ../libpurple/protocols/msn/msn.c:1652
-#: ../libpurple/protocols/oscar/oscar.c:3794
+#: ../libpurple/protocols/oscar/oscar.c:3820
 msgid "Work Address"
 msgstr "Endereço de trabalho"
 
@@ -5874,8 +5922,8 @@
 #: ../libpurple/protocols/qq/udp_proxy_s5.c:268
 #: ../libpurple/protocols/qq/udp_proxy_s5.c:302
 #: ../libpurple/protocols/qq/udp_proxy_s5.c:332
-#: ../libpurple/protocols/yahoo/yahoochat.c:1357
-#: ../libpurple/protocols/yahoo/yahoochat.c:1383
+#: ../libpurple/protocols/yahoo/yahoochat.c:1320
+#: ../libpurple/protocols/yahoo/yahoochat.c:1346
 msgid "Unable to connect"
 msgstr "Não foi possível conectar"
 
@@ -5987,7 +6035,7 @@
 msgstr "Erro ao processar HTTP."
 
 #: ../libpurple/protocols/msn/session.c:307
-#: ../libpurple/protocols/oscar/oscar.c:3455
+#: ../libpurple/protocols/oscar/oscar.c:3481
 #: ../libpurple/protocols/yahoo/yahoo.c:202
 msgid "You have signed on from another location."
 msgstr "Você conectou de outro local."
@@ -6071,7 +6119,7 @@
 
 #: ../libpurple/protocols/msn/switchboard.c:424
 msgid ""
-"Message could not be sent because we wer unable to establish a session with "
+"Message could not be sent because we were unable to establish a session with "
 "the server. This is likely a server problem, try again in a few minutes:"
 msgstr ""
 "A mensagem não pôde ser enviada porque não podemos estabelecer uma sessão "
@@ -6660,7 +6708,7 @@
 msgid "Not while on AOL"
 msgstr "Não enquanto estiver na AOL"
 
-#: ../libpurple/protocols/oscar/oscar.c:330
+#: ../libpurple/protocols/oscar/oscar.c:348
 msgid ""
 "(There was an error receiving this message.  The buddy you are speaking with "
 "is probably using a different encoding than expected.  If you know what "
@@ -6672,7 +6720,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:439
+#: ../libpurple/protocols/oscar/oscar.c:457
 #, c-format
 msgid ""
 "(There was an error receiving this message.  Either you and %s have "
@@ -6682,21 +6730,21 @@
 "codificações diferentes, ou %s usa um cliente com defeito.)"
 
 #. Label
-#: ../libpurple/protocols/oscar/oscar.c:621 ../pidgin/gtkutils.c:2310
-#: ../pidgin/gtkutils.c:2340
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:338
+#: ../libpurple/protocols/oscar/oscar.c:639 ../pidgin/gtkutils.c:2359
+#: ../pidgin/gtkutils.c:2389
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:334
 msgid "Buddy Icon"
 msgstr "Ícone de exibição"
 
-#: ../libpurple/protocols/oscar/oscar.c:624
+#: ../libpurple/protocols/oscar/oscar.c:642
 msgid "Voice"
 msgstr "Voz"
 
-#: ../libpurple/protocols/oscar/oscar.c:627
+#: ../libpurple/protocols/oscar/oscar.c:645
 msgid "AIM Direct IM"
 msgstr "Mensagem instantânea direta do AIM"
 
-#: ../libpurple/protocols/oscar/oscar.c:630
+#: ../libpurple/protocols/oscar/oscar.c:648
 #: ../libpurple/protocols/silc/silc.c:768
 #: ../libpurple/protocols/silc/util.c:553
 #: ../libpurple/protocols/silc10/silc.c:679
@@ -6704,124 +6752,124 @@
 msgid "Chat"
 msgstr "Bate-papo"
 
-#: ../libpurple/protocols/oscar/oscar.c:633
-#: ../libpurple/protocols/oscar/oscar.c:5962
+#: ../libpurple/protocols/oscar/oscar.c:651
+#: ../libpurple/protocols/oscar/oscar.c:5989
 msgid "Get File"
 msgstr "Receber arquivo"
 
-#: ../libpurple/protocols/oscar/oscar.c:640
+#: ../libpurple/protocols/oscar/oscar.c:658
 msgid "Games"
 msgstr "Jogos"
 
-#: ../libpurple/protocols/oscar/oscar.c:643
+#: ../libpurple/protocols/oscar/oscar.c:661
 msgid "Add-Ins"
 msgstr "Add-Ins"
 
-#: ../libpurple/protocols/oscar/oscar.c:646
+#: ../libpurple/protocols/oscar/oscar.c:664
 msgid "Send Buddy List"
 msgstr "Enviar lista de amigos"
 
-#: ../libpurple/protocols/oscar/oscar.c:649
+#: ../libpurple/protocols/oscar/oscar.c:667
 msgid "ICQ Direct Connect"
 msgstr "Conexão direta do ICQ"
 
-#: ../libpurple/protocols/oscar/oscar.c:652
+#: ../libpurple/protocols/oscar/oscar.c:670
 msgid "AP User"
 msgstr "Usuário AP"
 
-#: ../libpurple/protocols/oscar/oscar.c:655
+#: ../libpurple/protocols/oscar/oscar.c:673
 msgid "ICQ RTF"
 msgstr "ICQ RTF"
 
-#: ../libpurple/protocols/oscar/oscar.c:658
+#: ../libpurple/protocols/oscar/oscar.c:676
 msgid "Nihilist"
 msgstr "Niilista"
 
-#: ../libpurple/protocols/oscar/oscar.c:661
-msgid "ICQ Server Relay"
-msgstr "Relay do servidor ICQ"
-
-#: ../libpurple/protocols/oscar/oscar.c:664
-msgid "Old ICQ UTF8"
-msgstr "ICQ UTF8 antigo"
-
-#: ../libpurple/protocols/oscar/oscar.c:667
-msgid "Trillian Encryption"
-msgstr "Criptografia do Trillian"
-
-#: ../libpurple/protocols/oscar/oscar.c:670
-msgid "ICQ UTF8"
-msgstr "ICQ UTF8"
-
-#: ../libpurple/protocols/oscar/oscar.c:673
-msgid "Hiptop"
-msgstr "Hiptop"
-
-#: ../libpurple/protocols/oscar/oscar.c:676
-msgid "Security Enabled"
-msgstr "Segurança ativada"
-
 #: ../libpurple/protocols/oscar/oscar.c:679
+msgid "ICQ Server Relay"
+msgstr "Relay do servidor ICQ"
+
+#: ../libpurple/protocols/oscar/oscar.c:682
+msgid "Old ICQ UTF8"
+msgstr "ICQ UTF8 antigo"
+
+#: ../libpurple/protocols/oscar/oscar.c:685
+msgid "Trillian Encryption"
+msgstr "Criptografia do Trillian"
+
+#: ../libpurple/protocols/oscar/oscar.c:688
+msgid "ICQ UTF8"
+msgstr "ICQ UTF8"
+
+#: ../libpurple/protocols/oscar/oscar.c:691
+msgid "Hiptop"
+msgstr "Hiptop"
+
+#: ../libpurple/protocols/oscar/oscar.c:694
+msgid "Security Enabled"
+msgstr "Segurança ativada"
+
+#: ../libpurple/protocols/oscar/oscar.c:697
 msgid "Video Chat"
 msgstr "Bate-papo com vídeo"
 
-#: ../libpurple/protocols/oscar/oscar.c:683
+#: ../libpurple/protocols/oscar/oscar.c:701
 msgid "iChat AV"
 msgstr "AV do iChat"
 
-#: ../libpurple/protocols/oscar/oscar.c:686
+#: ../libpurple/protocols/oscar/oscar.c:704
 msgid "Live Video"
 msgstr "Vídeo ao vivo"
 
-#: ../libpurple/protocols/oscar/oscar.c:689
+#: ../libpurple/protocols/oscar/oscar.c:707
 msgid "Camera"
 msgstr "Câmera"
 
-#: ../libpurple/protocols/oscar/oscar.c:707
-#: ../libpurple/protocols/oscar/oscar.c:5732
+#: ../libpurple/protocols/oscar/oscar.c:725
+#: ../libpurple/protocols/oscar/oscar.c:5759
 msgid "Free For Chat"
 msgstr "Livre para conversa"
 
-#: ../libpurple/protocols/oscar/oscar.c:711
-#: ../libpurple/protocols/oscar/oscar.c:5767
+#: ../libpurple/protocols/oscar/oscar.c:729
+#: ../libpurple/protocols/oscar/oscar.c:5794
 msgid "Not Available"
 msgstr "Não disponível"
 
-#: ../libpurple/protocols/oscar/oscar.c:713
-#: ../libpurple/protocols/oscar/oscar.c:5753
+#: ../libpurple/protocols/oscar/oscar.c:731
+#: ../libpurple/protocols/oscar/oscar.c:5780
 msgid "Occupied"
 msgstr "Ocupado"
 
-#: ../libpurple/protocols/oscar/oscar.c:717
+#: ../libpurple/protocols/oscar/oscar.c:735
 msgid "Web Aware"
 msgstr "Permitir que outros vejam seu status pela Web"
 
-#: ../libpurple/protocols/oscar/oscar.c:719 ../libpurple/protocols/qq/qq.c:183
+#: ../libpurple/protocols/oscar/oscar.c:737 ../libpurple/protocols/qq/qq.c:183
 #: ../libpurple/protocols/yahoo/yahoo.c:2913 ../libpurple/status.c:156
-#: ../pidgin/gtkdocklet.c:446 ../pidgin/gtkstatusbox.c:1053
+#: ../pidgin/gtkdocklet.c:446 ../pidgin/gtkstatusbox.c:1058
 msgid "Invisible"
 msgstr "Invisível"
 
-#: ../libpurple/protocols/oscar/oscar.c:721
+#: ../libpurple/protocols/oscar/oscar.c:739
 msgid "Online"
 msgstr "Conectado"
 
-#: ../libpurple/protocols/oscar/oscar.c:820
-#: ../libpurple/protocols/oscar/oscar.c:3695
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:697 ../pidgin/gtkprefs.c:1052
+#: ../libpurple/protocols/oscar/oscar.c:838
+#: ../libpurple/protocols/oscar/oscar.c:3721
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:697 ../pidgin/gtkprefs.c:1121
 msgid "IP Address"
 msgstr "Endereço IP"
 
-#: ../libpurple/protocols/oscar/oscar.c:827
-#: ../libpurple/protocols/oscar/oscar.c:2847
+#: ../libpurple/protocols/oscar/oscar.c:845
+#: ../libpurple/protocols/oscar/oscar.c:2867
 msgid "Warning Level"
 msgstr "Nível de alerta"
 
-#: ../libpurple/protocols/oscar/oscar.c:837
+#: ../libpurple/protocols/oscar/oscar.c:855
 msgid "Buddy Comment"
 msgstr "Comentário do amigo"
 
-#: ../libpurple/protocols/oscar/oscar.c:977
+#: ../libpurple/protocols/oscar/oscar.c:995
 #, c-format
 msgid ""
 "Could not connect to authentication server:\n"
@@ -6830,7 +6878,7 @@
 "Não foi possível conectar ao servidor de autenticação:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:985
+#: ../libpurple/protocols/oscar/oscar.c:1003
 #, c-format
 msgid ""
 "Could not connect to BOS server:\n"
@@ -6839,53 +6887,54 @@
 "Não foi possível conectar ao servidor BOS:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:1025
+#: ../libpurple/protocols/oscar/oscar.c:1043
 msgid "Screen name sent"
 msgstr "Nome de usuário enviado"
 
-#: ../libpurple/protocols/oscar/oscar.c:1030
+#: ../libpurple/protocols/oscar/oscar.c:1048
 msgid "Connection established, cookie sent"
 msgstr "Conexão estabelecida, cookie enviado"
 
 #. TODO: Don't call this with ssi
-#: ../libpurple/protocols/oscar/oscar.c:1059
+#: ../libpurple/protocols/oscar/oscar.c:1077
 msgid "Finalizing connection"
 msgstr "Finalizando a conexão"
 
-#: ../libpurple/protocols/oscar/oscar.c:1243
+#: ../libpurple/protocols/oscar/oscar.c:1261
 #, c-format
 msgid ""
 "Unable to login: Could not sign on as %s because the screen name is "
-"invalid.  Screen names must either start with a letter and contain only "
-"letters, numbers and spaces, or contain only numbers."
+"invalid.  Screen names must be a valid email address, or start with a letter "
+"and contain only letters, numbers and spaces, or contain only numbers."
 msgstr ""
 "Não foi possível conectar como %s porque o nome de usuário é inválido. 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:1328
+"de usuário têm que ser um endereço de email válido, ou 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:1346
 #: ../libpurple/protocols/yahoo/yahoo.c:1934
 msgid "Invalid screen name."
 msgstr "Nome de usuário inválido."
 
-#: ../libpurple/protocols/oscar/oscar.c:1335
+#: ../libpurple/protocols/oscar/oscar.c:1353
 #: ../libpurple/protocols/qq/login_logout.c:483
 #: ../libpurple/protocols/simple/simple.c:1037
 #: ../libpurple/protocols/yahoo/yahoo.c:1952
 msgid "Incorrect password."
 msgstr "Senha incorreta."
 
-#: ../libpurple/protocols/oscar/oscar.c:1340
+#: ../libpurple/protocols/oscar/oscar.c:1358
 msgid "Your account is currently suspended."
 msgstr "Atualmente, sua conta está suspensa."
 
 #. service temporarily unavailable
-#: ../libpurple/protocols/oscar/oscar.c:1344
+#: ../libpurple/protocols/oscar/oscar.c:1362
 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:1349
-#: ../libpurple/protocols/oscar/oscar.c:1360
+#: ../libpurple/protocols/oscar/oscar.c:1367
+#: ../libpurple/protocols/oscar/oscar.c:1378
 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."
@@ -6894,46 +6943,46 @@
 "minutos e tente novamente. Se você continuar tentando, vai ter que esperar "
 "ainda mais."
 
-#: ../libpurple/protocols/oscar/oscar.c:1354
+#: ../libpurple/protocols/oscar/oscar.c:1372
 #, 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:1394
+#: ../libpurple/protocols/oscar/oscar.c:1412
 msgid "Could Not Connect"
 msgstr "Não foi possível conectar"
 
-#: ../libpurple/protocols/oscar/oscar.c:1399
+#: ../libpurple/protocols/oscar/oscar.c:1417
 msgid "Received authorization"
 msgstr "Autorização recebida"
 
-#: ../libpurple/protocols/oscar/oscar.c:1422
+#: ../libpurple/protocols/oscar/oscar.c:1440
 msgid "The SecurID key entered is invalid."
 msgstr "A chave SecurID digitada é inválida."
 
-#: ../libpurple/protocols/oscar/oscar.c:1436
+#: ../libpurple/protocols/oscar/oscar.c:1454
 msgid "Enter SecurID"
 msgstr "Digite o SecurID"
 
-#: ../libpurple/protocols/oscar/oscar.c:1437
+#: ../libpurple/protocols/oscar/oscar.c:1455
 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:1439
-#: ../libpurple/protocols/oscar/oscar.c:2231
-#: ../libpurple/protocols/oscar/oscar.c:2278
-#: ../libpurple/protocols/oscar/oscar.c:5837
-#: ../libpurple/protocols/oscar/oscar.c:6118 ../libpurple/request.h:1387
+#: ../libpurple/protocols/oscar/oscar.c:1457
+#: ../libpurple/protocols/oscar/oscar.c:2250
+#: ../libpurple/protocols/oscar/oscar.c:2297
+#: ../libpurple/protocols/oscar/oscar.c:5864
+#: ../libpurple/protocols/oscar/oscar.c:6145 ../libpurple/request.h:1387
 msgid "_OK"
 msgstr "_OK"
 
-#: ../libpurple/protocols/oscar/oscar.c:1478
-#: ../libpurple/protocols/oscar/oscar.c:1521
+#: ../libpurple/protocols/oscar/oscar.c:1496
+#: ../libpurple/protocols/oscar/oscar.c:1539
 #, c-format
 msgid ""
 "You may be disconnected shortly.  You may want to use TOC until this is "
@@ -6942,56 +6991,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:1481
-#: ../libpurple/protocols/oscar/oscar.c:1524
+#: ../libpurple/protocols/oscar/oscar.c:1499
+#: ../libpurple/protocols/oscar/oscar.c:1542
 msgid "Unable to get a valid AIM login hash."
 msgstr "Não foi possível conseguir um hash de conexão AIM válido."
 
-#: ../libpurple/protocols/oscar/oscar.c:1609
+#: ../libpurple/protocols/oscar/oscar.c:1627
 #, 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:1612
+#: ../libpurple/protocols/oscar/oscar.c:1630
 msgid "Unable to get a valid login hash."
 msgstr "Não foi possível conseguir um hash de conexão válido."
 
-#: ../libpurple/protocols/oscar/oscar.c:1641
+#: ../libpurple/protocols/oscar/oscar.c:1659
 msgid "Password sent"
 msgstr "Senha enviada"
 
-#: ../libpurple/protocols/oscar/oscar.c:1697
+#: ../libpurple/protocols/oscar/oscar.c:1715
 msgid "Unable to initialize connection"
 msgstr "Não foi possível inicializar conexão"
 
-#: ../libpurple/protocols/oscar/oscar.c:2201
+#: ../libpurple/protocols/oscar/oscar.c:2220
 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:2229
+#: ../libpurple/protocols/oscar/oscar.c:2248
 msgid "Authorization Request Message:"
 msgstr "Mensagem para pedido de autorização:"
 
-#: ../libpurple/protocols/oscar/oscar.c:2230
+#: ../libpurple/protocols/oscar/oscar.c:2249
 msgid "Please authorize me!"
 msgstr "Por favor me autorize!"
 
-#: ../libpurple/protocols/oscar/oscar.c:2270
-#: ../libpurple/protocols/oscar/oscar.c:2277
-#: ../libpurple/protocols/oscar/oscar.c:2404
-#: ../libpurple/protocols/oscar/oscar.c:5215
+#: ../libpurple/protocols/oscar/oscar.c:2289
+#: ../libpurple/protocols/oscar/oscar.c:2296
+#: ../libpurple/protocols/oscar/oscar.c:2423
+#: ../libpurple/protocols/oscar/oscar.c:5242
 #: ../libpurple/protocols/yahoo/yahoo.c:987
 msgid "No reason given."
 msgstr "Nenhum motivo foi dado."
 
-#: ../libpurple/protocols/oscar/oscar.c:2276
+#: ../libpurple/protocols/oscar/oscar.c:2295
 msgid "Authorization Denied Message:"
 msgstr "Mensagem de recusa de autorização:"
 
-#: ../libpurple/protocols/oscar/oscar.c:2404
+#: ../libpurple/protocols/oscar/oscar.c:2423
 #, c-format
 msgid ""
 "The user %u has denied your request to add them to your buddy list for the "
@@ -7002,18 +7051,18 @@
 "o seguinte motivo:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2405
+#: ../libpurple/protocols/oscar/oscar.c:2424
 msgid "ICQ authorization denied."
 msgstr "Autorização do ICQ negada."
 
 #. Someone has granted you authorization
-#: ../libpurple/protocols/oscar/oscar.c:2412
+#: ../libpurple/protocols/oscar/oscar.c:2431
 #, 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:2420
+#: ../libpurple/protocols/oscar/oscar.c:2439
 #, c-format
 msgid ""
 "You have received a special message\n"
@@ -7026,7 +7075,7 @@
 "De: %s [%s]\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2428
+#: ../libpurple/protocols/oscar/oscar.c:2447
 #, c-format
 msgid ""
 "You have received an ICQ page\n"
@@ -7039,7 +7088,7 @@
 "De: %s [%s]\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2436
+#: ../libpurple/protocols/oscar/oscar.c:2455
 #, c-format
 msgid ""
 "You have received an ICQ e-mail from %s [%s]\n"
@@ -7052,38 +7101,38 @@
 "A mensagem é: \n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2457
+#: ../libpurple/protocols/oscar/oscar.c:2476
 #, 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:2463
+#: ../libpurple/protocols/oscar/oscar.c:2482
 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:2468 ../pidgin/gtkroomlist.c:308
+#: ../libpurple/protocols/oscar/oscar.c:2487 ../pidgin/gtkroomlist.c:308
 msgid "_Add"
 msgstr "_Adicionar"
 
-#: ../libpurple/protocols/oscar/oscar.c:2469
+#: ../libpurple/protocols/oscar/oscar.c:2488
 msgid "_Decline"
 msgstr "_Rejeitar"
 
-#: ../libpurple/protocols/oscar/oscar.c:2553
+#: ../libpurple/protocols/oscar/oscar.c:2572
 #, 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:2562
+#: ../libpurple/protocols/oscar/oscar.c:2581
 #, 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:2571
+#: ../libpurple/protocols/oscar/oscar.c:2590
 #, c-format
 msgid ""
 "You missed %hu message from %s because the rate limit has been exceeded."
@@ -7094,21 +7143,21 @@
 msgstr[1] ""
 "Você perdeu %hu mensagens de %s porque o limite de freqüência foi excedido."
 
-#: ../libpurple/protocols/oscar/oscar.c:2580
+#: ../libpurple/protocols/oscar/oscar.c:2599
 #, 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:2589
+#: ../libpurple/protocols/oscar/oscar.c:2608
 #, 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:2598
+#: ../libpurple/protocols/oscar/oscar.c:2617
 #, 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."
@@ -7116,61 +7165,55 @@
 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:2753
+#: ../libpurple/protocols/oscar/oscar.c:2772
 #, c-format
 msgid "Unable to send message: %s"
 msgstr "Não foi possível enviar mensagem: %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2753
-#: ../libpurple/protocols/oscar/oscar.c:2758
-#: ../libpurple/protocols/oscar/oscar.c:2820
-#: ../libpurple/protocols/oscar/oscar.c:2824
+#: ../libpurple/protocols/oscar/oscar.c:2772
+#: ../libpurple/protocols/oscar/oscar.c:2777
+#: ../libpurple/protocols/oscar/oscar.c:2841
 msgid "Unknown reason."
 msgstr "Motivo desconhecido."
 
-#: ../libpurple/protocols/oscar/oscar.c:2756
+#: ../libpurple/protocols/oscar/oscar.c:2775
 #: ../libpurple/protocols/sametime/sametime.c:2409
 #, c-format
 msgid "Unable to send message to %s:"
 msgstr "Não foi possível enviar mensagem para %s:"
 
-#: ../libpurple/protocols/oscar/oscar.c:2820
+#: ../libpurple/protocols/oscar/oscar.c:2841
 #, c-format
 msgid "User information not available: %s"
 msgstr "Informação do usuário indisponível: %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2823
-#, c-format
-msgid "User information for %s unavailable:"
-msgstr "Informação do usuário %s indisponível:"
-
-#: ../libpurple/protocols/oscar/oscar.c:2852
+#: ../libpurple/protocols/oscar/oscar.c:2872
 msgid "Online Since"
 msgstr "Conectado desde"
 
-#: ../libpurple/protocols/oscar/oscar.c:2857
+#: ../libpurple/protocols/oscar/oscar.c:2877
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1161
 msgid "Member Since"
 msgstr "Membro desde"
 
-#: ../libpurple/protocols/oscar/oscar.c:2862
+#: ../libpurple/protocols/oscar/oscar.c:2882
 msgid "Capabilities"
 msgstr "Recursos"
 
-#: ../libpurple/protocols/oscar/oscar.c:2892
+#: ../libpurple/protocols/oscar/oscar.c:2912
 msgid "Available Message"
 msgstr "Mensagem de 'Disponível':"
 
-#: ../libpurple/protocols/oscar/oscar.c:2918
+#: ../libpurple/protocols/oscar/oscar.c:2940
 msgid "Profile"
 msgstr "Perfil"
 
-#: ../libpurple/protocols/oscar/oscar.c:2995
+#: ../libpurple/protocols/oscar/oscar.c:3020
 msgid "Your AIM connection may be lost."
 msgstr "Sua conexão AIM pode ter sido perdida."
 
 #. The conversion failed!
-#: ../libpurple/protocols/oscar/oscar.c:3182
+#: ../libpurple/protocols/oscar/oscar.c:3208
 msgid ""
 "[Unable to display a message from this user because it contained invalid "
 "characters.]"
@@ -7178,7 +7221,7 @@
 "[Não foi possível exibir uma mensagem deste usuário porque ela continha "
 "caracteres inválidos.]"
 
-#: ../libpurple/protocols/oscar/oscar.c:3385
+#: ../libpurple/protocols/oscar/oscar.c:3411
 msgid ""
 "The last action you attempted could not be performed because you are over "
 "the rate limit. Please wait 10 seconds and try again."
@@ -7186,86 +7229,86 @@
 "A última ação que você tentou não pôde ser executada porque você excedeu a "
 "taxa limite. Por favor espere 10 segundos e tente novamente."
 
-#: ../libpurple/protocols/oscar/oscar.c:3457
+#: ../libpurple/protocols/oscar/oscar.c:3483
 msgid "You have been signed off for an unknown reason."
 msgstr "Você foi desconectado por um motivo desconhecido."
 
-#: ../libpurple/protocols/oscar/oscar.c:3470
+#: ../libpurple/protocols/oscar/oscar.c:3496
 #: ../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:3717
+#: ../libpurple/protocols/oscar/oscar.c:3743
 #: ../libpurple/protocols/silc/util.c:585
 #: ../libpurple/protocols/silc10/util.c:581
 msgid "Mobile Phone"
 msgstr "Telefone móvel"
 
-#: ../libpurple/protocols/oscar/oscar.c:3747
+#: ../libpurple/protocols/oscar/oscar.c:3773
 msgid "Personal Web Page"
 msgstr "Página da web pessoal"
 
-#: ../libpurple/protocols/oscar/oscar.c:3771
+#: ../libpurple/protocols/oscar/oscar.c:3797
 #: ../libpurple/protocols/qq/buddy_info.c:40
 msgid "Additional Information"
 msgstr "Informações adicionais"
 
-#: ../libpurple/protocols/oscar/oscar.c:3779
-#: ../libpurple/protocols/oscar/oscar.c:3792
+#: ../libpurple/protocols/oscar/oscar.c:3805
+#: ../libpurple/protocols/oscar/oscar.c:3818
 msgid "Zip Code"
 msgstr "Código Postal (CEP)"
 
-#: ../libpurple/protocols/oscar/oscar.c:3803
+#: ../libpurple/protocols/oscar/oscar.c:3829
 msgid "Division"
 msgstr "Divisão"
 
-#: ../libpurple/protocols/oscar/oscar.c:3804
+#: ../libpurple/protocols/oscar/oscar.c:3830
 msgid "Position"
 msgstr "Posição"
 
-#: ../libpurple/protocols/oscar/oscar.c:3806
+#: ../libpurple/protocols/oscar/oscar.c:3832
 msgid "Web Page"
 msgstr "Página da web"
 
-#: ../libpurple/protocols/oscar/oscar.c:3809
+#: ../libpurple/protocols/oscar/oscar.c:3835
 msgid "Work Information"
 msgstr "Informações do trabalho"
 
-#: ../libpurple/protocols/oscar/oscar.c:3865
+#: ../libpurple/protocols/oscar/oscar.c:3891
 msgid "Pop-Up Message"
 msgstr "Mensagem pop-up"
 
-#: ../libpurple/protocols/oscar/oscar.c:3905
+#: ../libpurple/protocols/oscar/oscar.c:3931
 #, 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:3910
+#: ../libpurple/protocols/oscar/oscar.c:3936
 msgid "Screen name"
 msgstr "Nome de usuário"
 
-#: ../libpurple/protocols/oscar/oscar.c:3936
+#: ../libpurple/protocols/oscar/oscar.c:3962
 #, 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:3957
+#: ../libpurple/protocols/oscar/oscar.c:3983
 #, 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:3959
+#: ../libpurple/protocols/oscar/oscar.c:3985
 msgid "Account Confirmation Requested"
 msgstr "Confirmação de conta recebida"
 
-#: ../libpurple/protocols/oscar/oscar.c:3990
+#: ../libpurple/protocols/oscar/oscar.c:4016
 msgid "Error Changing Account Info"
 msgstr "Erro ao mudar informações da conta"
 
-#: ../libpurple/protocols/oscar/oscar.c:3993
+#: ../libpurple/protocols/oscar/oscar.c:4019
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
@@ -7274,13 +7317,13 @@
 "Erro 0x%04x: Não foi possível formatar nome de usuário pois o nome "
 "requisitado difere do original."
 
-#: ../libpurple/protocols/oscar/oscar.c:3996
+#: ../libpurple/protocols/oscar/oscar.c:4022
 #, c-format
 msgid "Error 0x%04x: Unable to format screen name because it is invalid."
 msgstr ""
 "Erro 0x%04x: Não foi possível formatar nome de usuário pois este é inválido."
 
-#: ../libpurple/protocols/oscar/oscar.c:3999
+#: ../libpurple/protocols/oscar/oscar.c:4025
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
@@ -7289,7 +7332,7 @@
 "Erro 0x%04x: Não foi possível formatar nome de usuário pois o nome "
 "requisitado é muito extenso."
 
-#: ../libpurple/protocols/oscar/oscar.c:4002
+#: ../libpurple/protocols/oscar/oscar.c:4028
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change e-mail address because there is already a "
@@ -7298,7 +7341,7 @@
 "Erro 0x%04x: Não foi possível mudar endereço de e-mail porque já existe um "
 "pedido pendente para esse nome de usuário."
 
-#: ../libpurple/protocols/oscar/oscar.c:4005
+#: ../libpurple/protocols/oscar/oscar.c:4031
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change e-mail address because the given address has "
@@ -7307,7 +7350,7 @@
 "Erro 0x%04x: Não foi possível mudar o endereço de e-mail porque este já "
 "possui muitos nomes de usuário associados a ele."
 
-#: ../libpurple/protocols/oscar/oscar.c:4008
+#: ../libpurple/protocols/oscar/oscar.c:4034
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change e-mail address because the given address is "
@@ -7316,32 +7359,32 @@
 "Erro 0x%04x: Não foi possível mudar o endereço de e-mail porque este é "
 "inválido."
 
-#: ../libpurple/protocols/oscar/oscar.c:4011
+#: ../libpurple/protocols/oscar/oscar.c:4037
 #, c-format
 msgid "Error 0x%04x: Unknown error."
 msgstr "Erro 0x%04x: Erro desconhecido."
 
-#: ../libpurple/protocols/oscar/oscar.c:4021
+#: ../libpurple/protocols/oscar/oscar.c:4047
 #, 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:4023
+#: ../libpurple/protocols/oscar/oscar.c:4049
 msgid "Account Info"
 msgstr "Informações da conta"
 
-#: ../libpurple/protocols/oscar/oscar.c:4195
+#: ../libpurple/protocols/oscar/oscar.c:4221
 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:4461
+#: ../libpurple/protocols/oscar/oscar.c:4487
 msgid "Unable to set AIM profile."
 msgstr "Não foi possível definir perfil AIM."
 
-#: ../libpurple/protocols/oscar/oscar.c:4462
+#: ../libpurple/protocols/oscar/oscar.c:4488
 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 "
@@ -7351,7 +7394,7 @@
 "procedimento de conexão ser concluído. Seu perfil continua o mesmo; tente "
 "defini-lo novamente quando você estiver totalmente conectado."
 
-#: ../libpurple/protocols/oscar/oscar.c:4476
+#: ../libpurple/protocols/oscar/oscar.c:4502
 #, c-format
 msgid ""
 "The maximum profile length of %d byte has been exceeded.  It has been "
@@ -7366,11 +7409,11 @@
 "O tamanho máximo de %d bytes do seu perfil foi excedido. Ele foi truncado "
 "para você."
 
-#: ../libpurple/protocols/oscar/oscar.c:4481
+#: ../libpurple/protocols/oscar/oscar.c:4507
 msgid "Profile too long."
 msgstr "Perfil muito extenso."
 
-#: ../libpurple/protocols/oscar/oscar.c:4526
+#: ../libpurple/protocols/oscar/oscar.c:4552
 #, c-format
 msgid ""
 "The maximum away message length of %d byte has been exceeded.  It has been "
@@ -7385,32 +7428,32 @@
 "O tamanho máximo de %d bytes da mensagem de ausência foi excedido. Ele foi "
 "truncado para você."
 
-#: ../libpurple/protocols/oscar/oscar.c:4531
+#: ../libpurple/protocols/oscar/oscar.c:4557
 msgid "Away message too long."
 msgstr "Mensagem de ausência muito extensa."
 
-#: ../libpurple/protocols/oscar/oscar.c:4600
+#: ../libpurple/protocols/oscar/oscar.c:4626
 #, c-format
 msgid ""
 "Could not add the buddy %s because the screen name is invalid.  Screen names "
-"must either start with a letter and contain only letters, numbers and "
-"spaces, or contain only numbers."
+"must be a valid email address, or start with a letter and contain only "
+"letters, numbers and spaces, or contain only numbers."
 msgstr ""
 "Não foi possível adicionar o amigo %s porque o nome de usuário é inválido. "
-"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:4602
-#: ../libpurple/protocols/oscar/oscar.c:5025
-#: ../libpurple/protocols/oscar/oscar.c:5039
+"Nomes de usuário têm que ser um email válido, começar com uma letra e conter "
+"apenas letras, números e espaços, ou conter apenas números."
+
+#: ../libpurple/protocols/oscar/oscar.c:4628
+#: ../libpurple/protocols/oscar/oscar.c:5051
+#: ../libpurple/protocols/oscar/oscar.c:5066
 msgid "Unable To Add"
 msgstr "Não foi possível adicionar"
 
-#: ../libpurple/protocols/oscar/oscar.c:4706
+#: ../libpurple/protocols/oscar/oscar.c:4732
 msgid "Unable To Retrieve Buddy List"
 msgstr "Não foi possível recuperar lista de amigos"
 
-#: ../libpurple/protocols/oscar/oscar.c:4707
+#: ../libpurple/protocols/oscar/oscar.c:4733
 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."
@@ -7419,16 +7462,16 @@
 "momento. Sua lista de amigos não foi perdida, e provavelmente estará "
 "disponível em algumas horas."
 
-#: ../libpurple/protocols/oscar/oscar.c:4911
-#: ../libpurple/protocols/oscar/oscar.c:4912
-#: ../libpurple/protocols/oscar/oscar.c:4917
-#: ../libpurple/protocols/oscar/oscar.c:5093
-#: ../libpurple/protocols/oscar/oscar.c:5094
-#: ../libpurple/protocols/oscar/oscar.c:5099
+#: ../libpurple/protocols/oscar/oscar.c:4937
+#: ../libpurple/protocols/oscar/oscar.c:4938
+#: ../libpurple/protocols/oscar/oscar.c:4943
+#: ../libpurple/protocols/oscar/oscar.c:5120
+#: ../libpurple/protocols/oscar/oscar.c:5121
+#: ../libpurple/protocols/oscar/oscar.c:5126
 msgid "Orphans"
 msgstr "Órfãos"
 
-#: ../libpurple/protocols/oscar/oscar.c:5023
+#: ../libpurple/protocols/oscar/oscar.c:5049
 #, c-format
 msgid ""
 "Could not add the buddy %s because you have too many buddies in your buddy "
@@ -7437,23 +7480,17 @@
 "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:5023
-#: ../libpurple/protocols/oscar/oscar.c:5037
+#: ../libpurple/protocols/oscar/oscar.c:5049
+#: ../libpurple/protocols/oscar/oscar.c:5064
 msgid "(no name)"
 msgstr "(sem nome)"
 
-#: ../libpurple/protocols/oscar/oscar.c:5037
-#, c-format
-msgid ""
-"Could not add the buddy %s for an unknown reason.  The most common reason "
-"for this is that you have the maximum number of allowed buddies in your "
-"buddy list."
-msgstr ""
-"Não foi possível adicionar o amigo %s por uma razão desconhecida. O motivo "
-"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:5130
+#: ../libpurple/protocols/oscar/oscar.c:5063
+#, c-format
+msgid "Could not add the buddy %s for an unknown reason."
+msgstr "Não foi possível adicionar o amigo %s por um motivo desconhecido."
+
+#: ../libpurple/protocols/oscar/oscar.c:5157
 #, c-format
 msgid ""
 "The user %s has given you permission to add you to their buddy list.  Do you "
@@ -7462,23 +7499,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:5138
+#: ../libpurple/protocols/oscar/oscar.c:5165
 msgid "Authorization Given"
 msgstr "Autorização concedida"
 
 #. Granted
-#: ../libpurple/protocols/oscar/oscar.c:5211
+#: ../libpurple/protocols/oscar/oscar.c:5238
 #, 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:5212
+#: ../libpurple/protocols/oscar/oscar.c:5239
 msgid "Authorization Granted"
 msgstr "Autorização concedida"
 
 #. Denied
-#: ../libpurple/protocols/oscar/oscar.c:5215
+#: ../libpurple/protocols/oscar/oscar.c:5242
 #, c-format
 msgid ""
 "The user %s has denied your request to add them to your buddy list for the "
@@ -7489,53 +7526,53 @@
 "seguinte motivo: \n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:5216
+#: ../libpurple/protocols/oscar/oscar.c:5243
 msgid "Authorization Denied"
 msgstr "Autorização negada"
 
-#: ../libpurple/protocols/oscar/oscar.c:5252
+#: ../libpurple/protocols/oscar/oscar.c:5279
 #: ../libpurple/protocols/toc/toc.c:1371
 msgid "_Exchange:"
 msgstr "_Troca:"
 
-#: ../libpurple/protocols/oscar/oscar.c:5292
+#: ../libpurple/protocols/oscar/oscar.c:5319
 msgid "Invalid chat name specified."
 msgstr "Nome de bate-papo inválido especificado."
 
-#: ../libpurple/protocols/oscar/oscar.c:5361
+#: ../libpurple/protocols/oscar/oscar.c:5388
 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:5521
-#: ../libpurple/protocols/oscar/oscar.c:5526
+#: ../libpurple/protocols/oscar/oscar.c:5548
+#: ../libpurple/protocols/oscar/oscar.c:5553
 msgid "Away Message"
 msgstr "Mensagem de ausência"
 
-#: ../libpurple/protocols/oscar/oscar.c:5526
+#: ../libpurple/protocols/oscar/oscar.c:5553
 msgid "<i>(retrieving)</i>"
 msgstr " <i>(obtendo)</i>"
 
-#: ../libpurple/protocols/oscar/oscar.c:5726
+#: ../libpurple/protocols/oscar/oscar.c:5753
 msgid "iTunes Music Store Link"
 msgstr "Link para a loja de música do iTunes"
 
-#: ../libpurple/protocols/oscar/oscar.c:5834
+#: ../libpurple/protocols/oscar/oscar.c:5861
 #, c-format
 msgid "Buddy Comment for %s"
 msgstr "Comentário do amigo %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:5835
+#: ../libpurple/protocols/oscar/oscar.c:5862
 msgid "Buddy Comment:"
 msgstr "Comentário do amigo:"
 
-#: ../libpurple/protocols/oscar/oscar.c:5882
+#: ../libpurple/protocols/oscar/oscar.c:5909
 #, 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:5886
+#: ../libpurple/protocols/oscar/oscar.c:5913
 msgid ""
 "Because this reveals your IP address, it may be considered a security risk.  "
 "Do you wish to continue?"
@@ -7543,65 +7580,66 @@
 "Por revelar seu endereço IP, isto pode ser considerado um risco de "
 "privacidade. Deseja continuar?"
 
-#: ../libpurple/protocols/oscar/oscar.c:5892
+#: ../libpurple/protocols/oscar/oscar.c:5919
+#: ../libpurple/protocols/oscar/peer.c:1022
 msgid "C_onnect"
 msgstr "C_onectar"
 
-#: ../libpurple/protocols/oscar/oscar.c:5927
+#: ../libpurple/protocols/oscar/oscar.c:5954
 msgid "Get AIM Info"
 msgstr "Ver informações do AIM"
 
-#: ../libpurple/protocols/oscar/oscar.c:5933
+#: ../libpurple/protocols/oscar/oscar.c:5960
 msgid "Edit Buddy Comment"
 msgstr "Editar comentário do amigo"
 
-#: ../libpurple/protocols/oscar/oscar.c:5941
+#: ../libpurple/protocols/oscar/oscar.c:5968
 msgid "Get Status Msg"
 msgstr "Ver mensagem de status"
 
-#: ../libpurple/protocols/oscar/oscar.c:5954
+#: ../libpurple/protocols/oscar/oscar.c:5981
 msgid "Direct IM"
 msgstr "Mensagem instantânea direta"
 
-#: ../libpurple/protocols/oscar/oscar.c:5976
+#: ../libpurple/protocols/oscar/oscar.c:6003
 msgid "Re-request Authorization"
 msgstr "Re-requisitar autorização"
 
-#: ../libpurple/protocols/oscar/oscar.c:6035
+#: ../libpurple/protocols/oscar/oscar.c:6062
 msgid "Require authorization"
 msgstr "Pedir autorização"
 
-#: ../libpurple/protocols/oscar/oscar.c:6038
+#: ../libpurple/protocols/oscar/oscar.c:6065
 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:6043
+#: ../libpurple/protocols/oscar/oscar.c:6070
 msgid "ICQ Privacy Options"
 msgstr "Opções de privacidade do ICQ"
 
-#: ../libpurple/protocols/oscar/oscar.c:6062
+#: ../libpurple/protocols/oscar/oscar.c:6089
 msgid "The new formatting is invalid."
 msgstr "A nova formatação é inválida."
 
-#: ../libpurple/protocols/oscar/oscar.c:6063
+#: ../libpurple/protocols/oscar/oscar.c:6090
 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:6116
+#: ../libpurple/protocols/oscar/oscar.c:6143
 msgid "Change Address To:"
 msgstr "Mudar endereço para:"
 
-#: ../libpurple/protocols/oscar/oscar.c:6162
+#: ../libpurple/protocols/oscar/oscar.c:6189
 msgid "<i>you are not waiting for authorization</i>"
 msgstr "<i>você não está esperando autorização</i>"
 
-#: ../libpurple/protocols/oscar/oscar.c:6165
+#: ../libpurple/protocols/oscar/oscar.c:6192
 msgid "You are awaiting authorization from the following buddies"
 msgstr "Você está esperando autorização dos seguintes amigos"
 
-#: ../libpurple/protocols/oscar/oscar.c:6166
+#: ../libpurple/protocols/oscar/oscar.c:6193
 msgid ""
 "You can re-request authorization from these buddies by right-clicking on "
 "them and selecting \"Re-request Authorization.\""
@@ -7609,73 +7647,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:6183
+#: ../libpurple/protocols/oscar/oscar.c:6210
 msgid "Find Buddy by E-Mail"
 msgstr "Encontrar amigo por e-mail"
 
-#: ../libpurple/protocols/oscar/oscar.c:6184
+#: ../libpurple/protocols/oscar/oscar.c:6211
 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:6185
+#: ../libpurple/protocols/oscar/oscar.c:6212
 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:6188
+#: ../libpurple/protocols/oscar/oscar.c:6215
 msgid "_Search"
 msgstr "_Procurar"
 
-#: ../libpurple/protocols/oscar/oscar.c:6346
+#: ../libpurple/protocols/oscar/oscar.c:6373
 msgid "Set User Info (URL)..."
 msgstr "Definir informações de usuário (URL)..."
 
-#: ../libpurple/protocols/oscar/oscar.c:6357
+#: ../libpurple/protocols/oscar/oscar.c:6384
 msgid "Change Password (URL)"
 msgstr "Mudar senha (URL)"
 
-#: ../libpurple/protocols/oscar/oscar.c:6361
+#: ../libpurple/protocols/oscar/oscar.c:6388
 msgid "Configure IM Forwarding (URL)"
 msgstr "Configurar encaminhamento de mensagens (URL)"
 
 #. ICQ actions
-#: ../libpurple/protocols/oscar/oscar.c:6371
+#: ../libpurple/protocols/oscar/oscar.c:6398
 msgid "Set Privacy Options..."
 msgstr "Definir opções de privacidade..."
 
 #. AIM actions
-#: ../libpurple/protocols/oscar/oscar.c:6378
+#: ../libpurple/protocols/oscar/oscar.c:6405
 msgid "Confirm Account"
 msgstr "Confirmar conta"
 
-#: ../libpurple/protocols/oscar/oscar.c:6382
+#: ../libpurple/protocols/oscar/oscar.c:6409
 msgid "Display Currently Registered E-Mail Address"
 msgstr "Mostrar o endereço de E-Mail registrado atualmente"
 
-#: ../libpurple/protocols/oscar/oscar.c:6386
+#: ../libpurple/protocols/oscar/oscar.c:6413
 msgid "Change Currently Registered E-Mail Address..."
 msgstr "Mudar o endereço de E-Mail registrado atualmente..."
 
-#: ../libpurple/protocols/oscar/oscar.c:6393
+#: ../libpurple/protocols/oscar/oscar.c:6420
 msgid "Show Buddies Awaiting Authorization"
 msgstr "Mostrar amigos esperando autorização"
 
-#: ../libpurple/protocols/oscar/oscar.c:6399
+#: ../libpurple/protocols/oscar/oscar.c:6426
 msgid "Search for Buddy by E-Mail Address..."
 msgstr "Procurar por amigos pelo endereço de E-Mail..."
 
-#: ../libpurple/protocols/oscar/oscar.c:6404
+#: ../libpurple/protocols/oscar/oscar.c:6431
 msgid "Search for Buddy by Information"
 msgstr "Procurar por amigos por informações"
 
-#: ../libpurple/protocols/oscar/oscar.c:6472
+#: ../libpurple/protocols/oscar/oscar.c:6499
 msgid "Use recent buddies group"
 msgstr "Mostrar grupo \"Amigos Recentes\""
 
-#: ../libpurple/protocols/oscar/oscar.c:6475
+#: ../libpurple/protocols/oscar/oscar.c:6502
 msgid "Show how long you have been idle"
 msgstr "Mostra por quanto tempo você esteve inativo"
 
-#: ../libpurple/protocols/oscar/oscar.c:6630
+#: ../libpurple/protocols/oscar/oscar.c:6657
 msgid ""
 "Always use ICQ proxy server for file transfers\n"
 "(slower, but does not reveal your IP address)"
@@ -7713,10 +7751,6 @@
 "para mensagens instantâneas com imagens. Por revelar seu IP, isto pode ser "
 "considerado um risco de privacidade."
 
-#: ../libpurple/protocols/oscar/peer.c:1022
-msgid "_Connect"
-msgstr "_Conectar"
-
 #: ../libpurple/protocols/qq/buddy_info.c:39
 msgid "Primary Information"
 msgstr "Informação primária"
@@ -7897,13 +7931,13 @@
 msgstr "Rosto do QQ"
 
 #: ../libpurple/protocols/qq/buddy_opt.c:208
-#: ../libpurple/protocols/qq/group_opt.c:135
+#: ../libpurple/protocols/qq/group_opt.c:136
 #, c-format
 msgid "You rejected %d's request"
 msgstr "Você rejeitou o pedido de %d"
 
 #: ../libpurple/protocols/qq/buddy_opt.c:209
-#: ../libpurple/protocols/qq/group_opt.c:136
+#: ../libpurple/protocols/qq/group_opt.c:137
 msgid "Input your reason:"
 msgstr "Digite seu motivo:"
 
@@ -7913,13 +7947,13 @@
 
 #. title
 #: ../libpurple/protocols/qq/buddy_opt.c:213
-#: ../libpurple/protocols/qq/group_opt.c:140
+#: ../libpurple/protocols/qq/group_opt.c:141
 msgid "Sorry, you are not my type..."
 msgstr "Desculpe, você não faz meu tipo..."
 
 #: ../libpurple/protocols/qq/buddy_opt.c:214
-#: ../libpurple/protocols/qq/group_im.c:142
-#: ../libpurple/protocols/qq/group_opt.c:126
+#: ../libpurple/protocols/qq/group_im.c:144
+#: ../libpurple/protocols/qq/group_opt.c:127
 #: ../libpurple/protocols/qq/sys_msg.c:91
 #: ../libpurple/protocols/qq/sys_msg.c:249
 msgid "Reject"
@@ -7943,13 +7977,13 @@
 msgstr "O usuário %d precisa de autenticação"
 
 #: ../libpurple/protocols/qq/buddy_opt.c:404
-#: ../libpurple/protocols/qq/group_join.c:134
+#: ../libpurple/protocols/qq/group_join.c:136
 msgid "Input request here"
 msgstr "Digite o pedido aqui"
 
 #. 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
+#: ../libpurple/protocols/qq/group_join.c:137
 msgid "Would you be my friend?"
 msgstr "Você quer ser meu amigo?"
 
@@ -7957,8 +7991,8 @@
 #. masked
 #. hint
 #: ../libpurple/protocols/qq/buddy_opt.c:406
-#: ../libpurple/protocols/qq/group_join.c:136
-#: ../libpurple/protocols/qq/group_opt.c:142
+#: ../libpurple/protocols/qq/group_join.c:138
+#: ../libpurple/protocols/qq/group_opt.c:143
 msgid "Send"
 msgstr "Enviar"
 
@@ -8007,59 +8041,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:124
+#: ../libpurple/protocols/qq/group_im.c:126
 #, 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:125
-#: ../libpurple/protocols/qq/group_im.c:179
+#: ../libpurple/protocols/qq/group_im.c:127
+#: ../libpurple/protocols/qq/group_im.c:181
 #: ../libpurple/protocols/qq/sys_msg.c:195
 #, c-format
 msgid "Reason: %s"
 msgstr "Motivo: %s"
 
-#: ../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
+#: ../libpurple/protocols/qq/group_im.c:136
+#: ../libpurple/protocols/qq/group_im.c:183
+#: ../libpurple/protocols/qq/group_im.c:223
+#: ../libpurple/protocols/qq/group_im.c:258
+#: ../libpurple/protocols/qq/group_im.c:292
+#: ../libpurple/protocols/qq/group_join.c:233
+#: ../libpurple/protocols/qq/group_join.c:359
+#: ../libpurple/protocols/qq/group_opt.c:235
+#: ../libpurple/protocols/qq/group_opt.c:305
+#: ../libpurple/protocols/qq/group_opt.c:391
 msgid "QQ Qun Operation"
 msgstr "Operação do Qun QQ"
 
-#: ../libpurple/protocols/qq/group_im.c:139
-#: ../libpurple/protocols/qq/group_opt.c:127
+#: ../libpurple/protocols/qq/group_im.c:141
+#: ../libpurple/protocols/qq/group_opt.c:128
 #: ../libpurple/protocols/qq/sys_msg.c:92
 #: ../libpurple/protocols/qq/sys_msg.c:251
 msgid "Approve"
 msgstr "Aprovar"
 
-#: ../libpurple/protocols/qq/group_im.c:178
+#: ../libpurple/protocols/qq/group_im.c:180
 #, 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:219
+#: ../libpurple/protocols/qq/group_im.c:221
 #, 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:255
+#: ../libpurple/protocols/qq/group_im.c:257
 #, c-format
 msgid "You [%d] has exit group \"%d\""
 msgstr "Você [%d] saiu do grupo \"%d\""
 
-#: ../libpurple/protocols/qq/group_im.c:289
+#: ../libpurple/protocols/qq/group_im.c:291
 #, 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:290
+#: ../libpurple/protocols/qq/group_im.c:292
 msgid "This group has been added to your buddy list"
 msgstr "Este grupo foi adicionado à sua lista de amigos."
 
@@ -8083,31 +8117,31 @@
 msgid "Unknown status"
 msgstr "Status desconhecido"
 
-#: ../libpurple/protocols/qq/group_join.c:80
+#: ../libpurple/protocols/qq/group_join.c:82
 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:231
+#: ../libpurple/protocols/qq/group_join.c:233
 msgid "You have successfully exited the group"
 msgstr "Você saiu do grupo com sucesso"
 
-#: ../libpurple/protocols/qq/group_join.c:255
+#: ../libpurple/protocols/qq/group_join.c:257
 msgid "QQ Group Auth"
 msgstr "Autorização de grupo do QQ"
 
-#: ../libpurple/protocols/qq/group_join.c:256
+#: ../libpurple/protocols/qq/group_join.c:258
 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:327
+#: ../libpurple/protocols/qq/group_join.c:329
 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:358
+#: ../libpurple/protocols/qq/group_join.c:360
 msgid "Are you sure to exit this Qun?"
 msgstr "Você tem certeza de que quer sair deste Qun?"
 
-#: ../libpurple/protocols/qq/group_join.c:360
+#: ../libpurple/protocols/qq/group_join.c:362
 msgid ""
 "Note, if you are the creator, \n"
 "this operation will eventually remove this Qun."
@@ -8115,58 +8149,58 @@
 "Observação: Se você for o criador,\n"
 "esta operação apagará este Qun."
 
-#: ../libpurple/protocols/qq/group_join.c:365
+#: ../libpurple/protocols/qq/group_join.c:367
 msgid "Go ahead"
 msgstr "Vá em frente"
 
-#: ../libpurple/protocols/qq/group_network.c:90
+#: ../libpurple/protocols/qq/group_network.c:92
 #, c-format
 msgid "Code [0x%02X]: %s"
 msgstr "Código [0x%02X]: %s"
 
-#: ../libpurple/protocols/qq/group_network.c:91
+#: ../libpurple/protocols/qq/group_network.c:93
 msgid "Group Operation Error"
 msgstr "Erro na operação de grupo"
 
 #. we wanna see window
-#: ../libpurple/protocols/qq/group_opt.c:123
+#: ../libpurple/protocols/qq/group_opt.c:124
 #: ../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:234
+#: ../libpurple/protocols/qq/group_opt.c:235
 msgid "You have successfully modify Qun member"
 msgstr "Você alterou o membro do Qun com sucesso"
 
-#: ../libpurple/protocols/qq/group_opt.c:304
+#: ../libpurple/protocols/qq/group_opt.c:305
 msgid "You have successfully modify Qun information"
 msgstr "Você alterou as informações do Qun com sucesso"
 
-#: ../libpurple/protocols/qq/group_opt.c:391
+#: ../libpurple/protocols/qq/group_opt.c:392
 msgid "You have successfully created a Qun"
 msgstr "Você criou um Qun com sucesso"
 
-#: ../libpurple/protocols/qq/group_opt.c:393
+#: ../libpurple/protocols/qq/group_opt.c:394
 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:397
+#: ../libpurple/protocols/qq/group_opt.c:398
 msgid "Setup"
 msgstr "Definir"
 
-#: ../libpurple/protocols/qq/im.c:430
+#: ../libpurple/protocols/qq/im.c:432
 msgid "System Message"
 msgstr "Mensagem do sistema"
 
-#: ../libpurple/protocols/qq/im.c:574
+#: ../libpurple/protocols/qq/im.c:576
 msgid "Server ACK"
 msgstr "ACK do servidor"
 
-#: ../libpurple/protocols/qq/im.c:574
-msgid "Send IM fail\n"
-msgstr "Falha ao enviar mensagem instantânea\n"
-
-#: ../libpurple/protocols/qq/keep_alive.c:85
+#: ../libpurple/protocols/qq/im.c:576
+msgid "Failed to send IM."
+msgstr "Falha ao enviar mensagem."
+
+#: ../libpurple/protocols/qq/keep_alive.c:87
 msgid "Keep alive error, seems connection lost!"
 msgstr "Erro ao manter conexão, parece que ela foi perdida!"
 
@@ -8180,8 +8214,8 @@
 
 #. we didn't successfully connect. tdt->toc_fd is valid here
 #: ../libpurple/protocols/qq/qq.c:139 ../libpurple/protocols/toc/toc.c:173
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:108
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:188
+#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:109
+#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:189
 #: ../libpurple/protocols/yahoo/ycht.c:549
 msgid "Unable to connect."
 msgstr "Não foi possível conectar."
@@ -8322,27 +8356,27 @@
 msgid "Unable to read from socket"
 msgstr "Não foi possível ler do socket"
 
-#: ../libpurple/protocols/qq/send_file.c:706
+#: ../libpurple/protocols/qq/send_file.c:707
 #, c-format
 msgid "%d has declined the file %s"
 msgstr "%d recusou o arquivo %s"
 
-#: ../libpurple/protocols/qq/send_file.c:709
-#: ../libpurple/protocols/qq/send_file.c:738
+#: ../libpurple/protocols/qq/send_file.c:710
+#: ../libpurple/protocols/qq/send_file.c:739
 msgid "File Send"
 msgstr "Envio de arquivo"
 
-#: ../libpurple/protocols/qq/send_file.c:735
+#: ../libpurple/protocols/qq/send_file.c:736
 #, c-format
 msgid "%d canceled the transfer of %s"
 msgstr "%d cancelou a transferência de %s"
 
-#: ../libpurple/protocols/qq/sendqueue.c:122
+#: ../libpurple/protocols/qq/sendqueue.c:123
 msgid "Connection lost"
 msgstr "Conexão perdida"
 
 #. cancel login progress
-#: ../libpurple/protocols/qq/sendqueue.c:130
+#: ../libpurple/protocols/qq/sendqueue.c:131
 msgid "Login failed, no reply"
 msgstr "Falha ao conectar: não houve resposta"
 
@@ -8588,7 +8622,7 @@
 msgid "Send TEST Announcement"
 msgstr "Enviar anúncio TEST"
 
-#: ../libpurple/protocols/sametime/sametime.c:3586 ../pidgin/gtkconv.c:4290
+#: ../libpurple/protocols/sametime/sametime.c:3586 ../pidgin/gtkconv.c:4274
 msgid "Topic:"
 msgstr "Tópico:"
 
@@ -8613,7 +8647,7 @@
 msgid "No Sametime Community Server Specified"
 msgstr "Nenhum servidor comunitário do Sametime especificado"
 
-#: ../libpurple/protocols/sametime/sametime.c:3644 ../pidgin/gtkblist.c:3997
+#: ../libpurple/protocols/sametime/sametime.c:3644 ../pidgin/gtkblist.c:4015
 msgid "Connect"
 msgstr "Conectar"
 
@@ -8792,7 +8826,8 @@
 "Você pode adicioná-los à lista de amigos ou enviá-los mensagens com os "
 "botões de ação abaixo."
 
-#: ../libpurple/protocols/sametime/sametime.c:5538 ../pidgin/gtknotify.c:716
+#. Create the window
+#: ../libpurple/protocols/sametime/sametime.c:5538 ../pidgin/gtknotify.c:719
 msgid "Search Results"
 msgstr "Resultados da procura"
 
@@ -9624,7 +9659,7 @@
 msgstr "Falha no acordo de chaves"
 
 #: ../libpurple/protocols/silc/ft.c:114
-msgid "Connection timedout"
+msgid "Connection timed out"
 msgstr "Tempo limite de conexão esgotado"
 
 #: ../libpurple/protocols/silc/ft.c:118
@@ -10071,7 +10106,7 @@
 msgstr "Seu humor atual"
 
 #: ../libpurple/protocols/silc/silc.c:741
-#: ../libpurple/protocols/silc10/silc.c:652 ../pidgin/gtkprefs.c:1566
+#: ../libpurple/protocols/silc10/silc.c:652 ../pidgin/gtkprefs.c:1636
 msgid "Normal"
 msgstr "Normal"
 
@@ -10458,70 +10493,70 @@
 #. *< name
 #. *< version
 #. *  summary
-#: ../libpurple/protocols/silc/silc.c:1875
-#: ../libpurple/protocols/silc10/silc.c:1817
+#: ../libpurple/protocols/silc/silc.c:1876
+#: ../libpurple/protocols/silc10/silc.c:1819
 msgid "SILC Protocol Plugin"
 msgstr "Plugin do protocolo SILC"
 
 #. *  description
-#: ../libpurple/protocols/silc/silc.c:1877
-#: ../libpurple/protocols/silc10/silc.c:1819
+#: ../libpurple/protocols/silc/silc.c:1878
+#: ../libpurple/protocols/silc10/silc.c:1821
 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:1909
-#: ../libpurple/protocols/silc10/silc.c:1851 ../pidgin/gtkprefs.c:1959
+#: ../libpurple/protocols/silc/silc.c:1910
+#: ../libpurple/protocols/silc10/silc.c:1853 ../pidgin/gtkprefs.c:2029
 msgid "Network"
 msgstr "Rede"
 
-#: ../libpurple/protocols/silc/silc.c:1920
-#: ../libpurple/protocols/silc10/silc.c:1862
+#: ../libpurple/protocols/silc/silc.c:1921
+#: ../libpurple/protocols/silc10/silc.c:1864
 msgid "Public Key file"
 msgstr "Arquivo da chave pública"
 
-#: ../libpurple/protocols/silc/silc.c:1924
-#: ../libpurple/protocols/silc10/silc.c:1866
+#: ../libpurple/protocols/silc/silc.c:1925
+#: ../libpurple/protocols/silc10/silc.c:1868
 msgid "Private Key file"
 msgstr "Arquivo da chave privada"
 
-#: ../libpurple/protocols/silc/silc.c:1934
-#: ../libpurple/protocols/silc10/silc.c:1876
+#: ../libpurple/protocols/silc/silc.c:1935
+#: ../libpurple/protocols/silc10/silc.c:1878
 msgid "Cipher"
 msgstr "Cifra"
 
-#: ../libpurple/protocols/silc/silc.c:1944
-#: ../libpurple/protocols/silc10/silc.c:1886
+#: ../libpurple/protocols/silc/silc.c:1945
+#: ../libpurple/protocols/silc10/silc.c:1888
 msgid "HMAC"
 msgstr "HMAC"
 
-#: ../libpurple/protocols/silc/silc.c:1947
+#: ../libpurple/protocols/silc/silc.c:1948
 msgid "Use Perfect Forward Secrecy"
 msgstr "Usar \"Perfect Forward Secrecy\""
 
-#: ../libpurple/protocols/silc/silc.c:1951
-#: ../libpurple/protocols/silc10/silc.c:1889
+#: ../libpurple/protocols/silc/silc.c:1952
+#: ../libpurple/protocols/silc10/silc.c:1891
 msgid "Public key authentication"
 msgstr "Autenticação via chave pública"
 
-#: ../libpurple/protocols/silc/silc.c:1954
-#: ../libpurple/protocols/silc10/silc.c:1892
+#: ../libpurple/protocols/silc/silc.c:1955
+#: ../libpurple/protocols/silc10/silc.c:1894
 msgid "Block IMs without Key Exchange"
 msgstr "Bloquear mensagens instantâneas sem troca de chaves"
 
-#: ../libpurple/protocols/silc/silc.c:1957
-#: ../libpurple/protocols/silc10/silc.c:1895
+#: ../libpurple/protocols/silc/silc.c:1958
+#: ../libpurple/protocols/silc10/silc.c:1897
 msgid "Block messages to whiteboard"
 msgstr "Bloquear mensagens no quadro de atividades"
 
-#: ../libpurple/protocols/silc/silc.c:1960
-#: ../libpurple/protocols/silc10/silc.c:1898
+#: ../libpurple/protocols/silc/silc.c:1961
+#: ../libpurple/protocols/silc10/silc.c:1900
 msgid "Automatically open whiteboard"
 msgstr "Expandir contatos _automaticamente"
 
-#: ../libpurple/protocols/silc/silc.c:1963
-#: ../libpurple/protocols/silc10/silc.c:1901
+#: ../libpurple/protocols/silc/silc.c:1964
+#: ../libpurple/protocols/silc10/silc.c:1903
 msgid "Digitally sign and verify all messages"
 msgstr "Assinar digitalmente e verificar todas as mensagens"
 
@@ -10958,8 +10993,8 @@
 msgid "Password Change Successful"
 msgstr "Mudança de senha efetuada com sucesso"
 
-#: ../libpurple/protocols/toc/toc.c:1366 ../pidgin/gtkblist.c:5493
-#: ../pidgin/gtkblist.c:5847
+#: ../libpurple/protocols/toc/toc.c:1366 ../pidgin/gtkblist.c:5519
+#: ../pidgin/gtkblist.c:5873
 msgid "_Group:"
 msgstr "_Grupo:"
 
@@ -11123,8 +11158,8 @@
 #: ../libpurple/protocols/yahoo/yahoo.c:2684
 #: ../libpurple/protocols/yahoo/yahoo.c:2787
 #: ../libpurple/protocols/yahoo/yahoo.c:2797
-#: ../libpurple/protocols/yahoo/yahoochat.c:1455
-#: ../libpurple/protocols/yahoo/yahoochat.c:1525
+#: ../libpurple/protocols/yahoo/yahoochat.c:1418
+#: ../libpurple/protocols/yahoo/yahoochat.c:1488
 #: ../libpurple/protocols/yahoo/ycht.c:585
 msgid "Connection problem"
 msgstr "Problema na conexão"
@@ -11316,36 +11351,36 @@
 msgid "Yahoo Chat port"
 msgstr "Porta de bate-papo do Yahoo"
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:203
+#: ../libpurple/protocols/yahoo/yahoochat.c:204
 #, c-format
 msgid "%s declined your conference invitation to room \"%s\" because \"%s\"."
 msgstr ""
 "%s rejeitou seu convite para uma conferência na sala \"%s\" porque \"%s\"."
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:205
+#: ../libpurple/protocols/yahoo/yahoochat.c:206
 msgid "Invitation Rejected"
 msgstr "Convite rejeitado"
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:361
+#: ../libpurple/protocols/yahoo/yahoochat.c:362
 msgid "Failed to join chat"
 msgstr "Falha ao entrar no bate-papo"
 
 #. -6
-#: ../libpurple/protocols/yahoo/yahoochat.c:364
+#: ../libpurple/protocols/yahoo/yahoochat.c:365
 msgid "Unknown room"
 msgstr "Sala desconhecida"
 
 #. -15
-#: ../libpurple/protocols/yahoo/yahoochat.c:367
+#: ../libpurple/protocols/yahoo/yahoochat.c:368
 msgid "Maybe the room is full"
 msgstr "Talvez a sala esteja cheia"
 
 #. -35
-#: ../libpurple/protocols/yahoo/yahoochat.c:370
+#: ../libpurple/protocols/yahoo/yahoochat.c:371
 msgid "Not available"
 msgstr "Não disponível"
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:374
+#: ../libpurple/protocols/yahoo/yahoochat.c:375
 msgid ""
 "Unknown error. You may need to logout and wait five minutes before being "
 "able to rejoin a chatroom"
@@ -11353,38 +11388,38 @@
 "Erro desconhecido. Você pode ter que desconectar e esperar cinco minutos "
 "antes de poder ingressar novamente numa sala de bate-papo"
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:452
+#: ../libpurple/protocols/yahoo/yahoochat.c:453
 #, c-format
 msgid "You are now chatting in %s."
 msgstr "Você está conversando em %s."
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:627
+#: ../libpurple/protocols/yahoo/yahoochat.c:628
 msgid "Failed to join buddy in chat"
 msgstr "Falha ao ingressar amigo no bate-papo"
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:628
+#: ../libpurple/protocols/yahoo/yahoochat.c:629
 msgid "Maybe they're not in a chat?"
 msgstr "Talvez eles não estejam em um bate-papo?"
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:1357
-#: ../libpurple/protocols/yahoo/yahoochat.c:1383
+#: ../libpurple/protocols/yahoo/yahoochat.c:1320
+#: ../libpurple/protocols/yahoo/yahoochat.c:1346
 msgid "Fetching the room list failed."
 msgstr "Falha ao obter a lista de salas."
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:1441
+#: ../libpurple/protocols/yahoo/yahoochat.c:1404
 msgid "Voices"
 msgstr "Vozes"
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:1444
+#: ../libpurple/protocols/yahoo/yahoochat.c:1407
 msgid "Webcams"
 msgstr "Webcams"
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:1455
-#: ../libpurple/protocols/yahoo/yahoochat.c:1525
+#: ../libpurple/protocols/yahoo/yahoochat.c:1418
+#: ../libpurple/protocols/yahoo/yahoochat.c:1488
 msgid "Unable to fetch room list."
 msgstr "Não foi possível obter lista de salas."
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:1518
+#: ../libpurple/protocols/yahoo/yahoochat.c:1481
 msgid "User Rooms"
 msgstr "Salas de usuário"
 
@@ -11395,9 +11430,9 @@
 msgid "Sent Doodle request."
 msgstr "Enviado pedido para desenhar."
 
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:269
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:278
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:291
+#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:270
+#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:279
+#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:292
 msgid "Unable to establish file descriptor."
 msgstr "Não foi possível estabelecer descritor de arquivo."
 
@@ -11739,11 +11774,11 @@
 #. *
 #. * The default message to use when the user becomes auto-away.
 #.
-#: ../libpurple/savedstatuses.c:46
+#: ../libpurple/savedstatuses.c:47
 msgid "I'm not here right now"
 msgstr "Não estou aqui no momento"
 
-#: ../libpurple/savedstatuses.c:532
+#: ../libpurple/savedstatuses.c:534
 msgid "saved statuses"
 msgstr "status salvos"
 
@@ -11752,7 +11787,7 @@
 msgid "%s is now known as %s.\n"
 msgstr "%s mudou seu apelido para %s.\n"
 
-#: ../libpurple/server.c:679
+#: ../libpurple/server.c:680
 #, c-format
 msgid ""
 "%s has invited %s to the chat room %s:\n"
@@ -11761,12 +11796,12 @@
 "%s convidou %s para a sala de bate-papo %s:\n"
 "%s"
 
-#: ../libpurple/server.c:684
+#: ../libpurple/server.c:685
 #, 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:688
+#: ../libpurple/server.c:689
 msgid "Accept chat invitation?"
 msgstr "Aceitar convite para bate-papo?"
 
@@ -11774,9 +11809,13 @@
 msgid "Unset"
 msgstr "Redefinir"
 
-#: ../libpurple/status.c:155
-msgid "Unavailable"
-msgstr "Indisponível"
+#: ../libpurple/status.c:155 ../pidgin/gtkstatusbox.c:1057
+msgid "Do not disturb"
+msgstr "Não perturbe"
+
+#: ../libpurple/status.c:158
+msgid "Extended away"
+msgstr "Ausente (estendido)"
 
 #: ../libpurple/status.c:159
 msgid "Mobile"
@@ -11817,17 +11856,17 @@
 msgid "+++ %s became unidle"
 msgstr "+++ %s voltou da inatividade"
 
-#: ../libpurple/util.c:682
+#: ../libpurple/util.c:717
 #, c-format
 msgid "%x %X"
 msgstr "%x %X"
 
-#: ../libpurple/util.c:2586
+#: ../libpurple/util.c:2691
 #, c-format
 msgid "Error Reading %s"
 msgstr "Erro ao ler %s"
 
-#: ../libpurple/util.c:2587
+#: ../libpurple/util.c:2692
 #, c-format
 msgid ""
 "An error was encountered reading your %s.  They have not been loaded, and "
@@ -11836,67 +11875,67 @@
 "Um erro foi encontrado ao processar sua %s. Eles(as) não foram carregados"
 "(as), e o antigo arquivo foi movido para %s~."
 
-#: ../libpurple/util.c:3060
+#: ../libpurple/util.c:3192
 msgid "Calculating..."
 msgstr "Calculando..."
 
-#: ../libpurple/util.c:3063
+#: ../libpurple/util.c:3195
 msgid "Unknown."
 msgstr "Desconhecido."
 
-#: ../libpurple/util.c:3089
+#: ../libpurple/util.c:3221
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] "%d segundo"
 msgstr[1] "%d segundos"
 
-#: ../libpurple/util.c:3101
+#: ../libpurple/util.c:3233
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] "%d dia"
 msgstr[1] "%d dias"
 
-#: ../libpurple/util.c:3109
+#: ../libpurple/util.c:3241
 #, c-format
 msgid "%s, %d hour"
 msgid_plural "%s, %d hours"
 msgstr[0] "%s, %d hora"
 msgstr[1] "%s, %d horas"
 
-#: ../libpurple/util.c:3115
+#: ../libpurple/util.c:3247
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d hora"
 msgstr[1] "%d horas"
 
-#: ../libpurple/util.c:3123
+#: ../libpurple/util.c:3255
 #, c-format
 msgid "%s, %d minute"
 msgid_plural "%s, %d minutes"
 msgstr[0] "%s, %d minuto"
 msgstr[1] "%s, %d minutos"
 
-#: ../libpurple/util.c:3129
+#: ../libpurple/util.c:3261
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d minuto"
 msgstr[1] "%d minutos"
 
-#: ../libpurple/util.c:3389
+#: ../libpurple/util.c:3521
 #, c-format
 msgid "Could not open %s: Redirected too many times"
 msgstr "Não foi possível abrir %s: Número excessivo de redirecionamentos"
 
-#: ../libpurple/util.c:3426 ../libpurple/util.c:3721
+#: ../libpurple/util.c:3558 ../libpurple/util.c:3853
 #, c-format
 msgid "Unable to connect to %s"
 msgstr "Não foi possível conectar a %s"
 
-#: ../libpurple/util.c:3549
+#: ../libpurple/util.c:3681
 #, c-format
 msgid ""
 "Unable to allocate enough memory to hold the contents from %s.  The web "
@@ -11905,17 +11944,17 @@
 "Não foi possível alocar memória suficiente para guardar o conteúdo de %s. O "
 "servidor da web pode estar tentando alguma operação mal-intencionada."
 
-#: ../libpurple/util.c:3584
+#: ../libpurple/util.c:3716
 #, c-format
 msgid "Error reading from %s: %s"
 msgstr "Erro ao ler de %s: %s"
 
-#: ../libpurple/util.c:3615
+#: ../libpurple/util.c:3747
 #, c-format
 msgid "Error writing to %s: %s"
 msgstr "Erro ao gravar em %s: %s"
 
-#: ../libpurple/util.c:3640
+#: ../libpurple/util.c:3772
 #, c-format
 msgid "Unable to connect to %s: %s"
 msgstr "Não foi possível conectar a %s: %s"
@@ -11953,59 +11992,59 @@
 msgid "Screen _name:"
 msgstr "_Nome de usuário:"
 
-#: ../pidgin/gtkaccount.c:528
+#: ../pidgin/gtkaccount.c:531
 msgid "_Local alias:"
 msgstr "Apelido _local:"
 
-#: ../pidgin/gtkaccount.c:532
+#: ../pidgin/gtkaccount.c:535
 msgid "Remember pass_word"
 msgstr "Lembrar _senha"
 
 #. Build the user options frame.
-#: ../pidgin/gtkaccount.c:590
+#: ../pidgin/gtkaccount.c:593
 msgid "User Options"
 msgstr "Opções do usuário"
 
-#: ../pidgin/gtkaccount.c:603
+#: ../pidgin/gtkaccount.c:606
 msgid "New _mail notifications"
 msgstr "Notificar ao receber novos e_mails"
 
 #. Buddy icon
-#: ../pidgin/gtkaccount.c:608
+#: ../pidgin/gtkaccount.c:611
 msgid "Use this buddy _icon for this account:"
 msgstr "Usar este _ícone de exibição para esta conta:"
 
 #. Build the protocol options frame.
-#: ../pidgin/gtkaccount.c:728
+#: ../pidgin/gtkaccount.c:731
 #, c-format
 msgid "%s Options"
 msgstr "Opções de %s"
 
-#: ../pidgin/gtkaccount.c:934
+#: ../pidgin/gtkaccount.c:936
 msgid "Use GNOME Proxy Settings"
 msgstr "Usar configurações de proxy do GNOME"
 
-#: ../pidgin/gtkaccount.c:935
+#: ../pidgin/gtkaccount.c:937
 msgid "Use Global Proxy Settings"
 msgstr "Usar configuração global de proxy"
 
-#: ../pidgin/gtkaccount.c:941
+#: ../pidgin/gtkaccount.c:943
 msgid "No Proxy"
 msgstr "Nenhum proxy"
 
-#: ../pidgin/gtkaccount.c:947
+#: ../pidgin/gtkaccount.c:949
 msgid "HTTP"
 msgstr "HTTP"
 
-#: ../pidgin/gtkaccount.c:953
+#: ../pidgin/gtkaccount.c:955
 msgid "SOCKS 4"
 msgstr "SOCKS 4"
 
-#: ../pidgin/gtkaccount.c:959
+#: ../pidgin/gtkaccount.c:961
 msgid "SOCKS 5"
 msgstr "SOCKS 5"
 
-#: ../pidgin/gtkaccount.c:965 ../pidgin/gtkprefs.c:1137
+#: ../pidgin/gtkaccount.c:967 ../pidgin/gtkprefs.c:1206
 msgid "Use Environmental Settings"
 msgstr "Usar configurações do ambiente"
 
@@ -12014,60 +12053,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:1004
+#: ../pidgin/gtkaccount.c:1006
 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:1007
+#: ../pidgin/gtkaccount.c:1009
 msgid "you can see the butterflies mating"
 msgstr "você pode ver as borboletas acasalando-se"
 
-#: ../pidgin/gtkaccount.c:1028
+#: ../pidgin/gtkaccount.c:1030
 msgid "Proxy Options"
 msgstr "Opções de proxy"
 
-#: ../pidgin/gtkaccount.c:1042 ../pidgin/gtkprefs.c:1131
+#: ../pidgin/gtkaccount.c:1044 ../pidgin/gtkprefs.c:1200
 msgid "Proxy _type:"
 msgstr "_Tipo de proxy:"
 
-#: ../pidgin/gtkaccount.c:1051 ../pidgin/gtkprefs.c:1152
+#: ../pidgin/gtkaccount.c:1053 ../pidgin/gtkprefs.c:1221
 msgid "_Host:"
 msgstr "_Host:"
 
-#: ../pidgin/gtkaccount.c:1055 ../pidgin/gtkprefs.c:1170
+#: ../pidgin/gtkaccount.c:1057 ../pidgin/gtkprefs.c:1239
 msgid "_Port:"
 msgstr "_Porta:"
 
-#: ../pidgin/gtkaccount.c:1063
+#: ../pidgin/gtkaccount.c:1065
 msgid "_Username:"
 msgstr "_Nome de usuário:"
 
-#: ../pidgin/gtkaccount.c:1070 ../pidgin/gtkprefs.c:1207
+#: ../pidgin/gtkaccount.c:1072 ../pidgin/gtkprefs.c:1276
 msgid "Pa_ssword:"
 msgstr "_Senha:"
 
-#: ../pidgin/gtkaccount.c:1476
+#: ../pidgin/gtkaccount.c:1473
 msgid "Add Account"
 msgstr "Adicionar conta"
 
-#: ../pidgin/gtkaccount.c:1500
+#: ../pidgin/gtkaccount.c:1492
 msgid "_Basic"
 msgstr "_Básico"
 
-#: ../pidgin/gtkaccount.c:1511
+#: ../pidgin/gtkaccount.c:1503
 msgid "_Advanced"
 msgstr "_Avançado"
 
-#: ../pidgin/gtkaccount.c:1983 ../pidgin/gtkplugin.c:568
+#: ../pidgin/gtkaccount.c:1975 ../pidgin/gtkplugin.c:568
 msgid "Enabled"
 msgstr "Ativado"
 
-#: ../pidgin/gtkaccount.c:2011
+#: ../pidgin/gtkaccount.c:2003
 msgid "Protocol"
 msgstr "Protocolo"
 
-#: ../pidgin/gtkaccount.c:2212
+#: ../pidgin/gtkaccount.c:2203
 #, c-format
 msgid ""
 "<span size='larger' weight='bold'>Welcome to %s!</span>\n"
@@ -12091,11 +12130,11 @@
 "Você pode voltar a esta janela para adicionar, alterar ou remover contas a "
 "partir do menu <b>Contas->Adicionar/Editar</b> na janela da Lista de Amigos"
 
-#: ../pidgin/gtkblist.c:727
+#: ../pidgin/gtkblist.c:763
 msgid "Join a Chat"
 msgstr "Entrar em um bate-papo"
 
-#: ../pidgin/gtkblist.c:748
+#: ../pidgin/gtkblist.c:784
 msgid ""
 "Please enter the appropriate information about the chat you would like to "
 "join.\n"
@@ -12104,210 +12143,219 @@
 "gostaria de entrar.\n"
 
 #. Set up stuff for the account box
-#: ../pidgin/gtkblist.c:759 ../pidgin/gtkblist.c:5441
-#: ../pidgin/gtkblist.c:5808 ../pidgin/gtkpounce.c:531
-#: ../pidgin/gtkroomlist.c:399
+#: ../pidgin/gtkblist.c:795 ../pidgin/gtkblist.c:5467
+#: ../pidgin/gtkblist.c:5834 ../pidgin/gtkpounce.c:540
+#: ../pidgin/gtkroomlist.c:395
 msgid "_Account:"
 msgstr "_Conta:"
 
-#: ../pidgin/gtkblist.c:1048 ../pidgin/gtkprivacy.c:606
-#: ../pidgin/gtkprivacy.c:620
+#: ../pidgin/gtkblist.c:1084 ../pidgin/gtkprivacy.c:602
+#: ../pidgin/gtkprivacy.c:616
 msgid "_Block"
 msgstr "_Bloquear"
 
-#: ../pidgin/gtkblist.c:1048
+#: ../pidgin/gtkblist.c:1084
 msgid "Un_block"
 msgstr "Des_bloquear"
 
-#: ../pidgin/gtkblist.c:1099
+#: ../pidgin/gtkblist.c:1135
 msgid "Get _Info"
 msgstr "Ver _info"
 
-#: ../pidgin/gtkblist.c:1102 ../pidgin/pidginstock.c:84
+#: ../pidgin/gtkblist.c:1138 ../pidgin/pidginstock.c:84
 msgid "I_M"
 msgstr "_MI"
 
-#: ../pidgin/gtkblist.c:1108
+#: ../pidgin/gtkblist.c:1144
 msgid "_Send File"
 msgstr "_Enviar arquivo"
 
-#: ../pidgin/gtkblist.c:1115
+#: ../pidgin/gtkblist.c:1151
 msgid "Add Buddy _Pounce"
 msgstr "Adicionar ação de _usuário"
 
-#: ../pidgin/gtkblist.c:1119 ../pidgin/gtkblist.c:1123
-#: ../pidgin/gtkblist.c:1225 ../pidgin/gtkblist.c:1248
+#: ../pidgin/gtkblist.c:1155 ../pidgin/gtkblist.c:1159
+#: ../pidgin/gtkblist.c:1262 ../pidgin/gtkblist.c:1285
 msgid "View _Log"
 msgstr "Ver _log"
 
-#: ../pidgin/gtkblist.c:1135 ../pidgin/gtkblist.c:1144
-#: ../pidgin/gtkblist.c:1233 ../pidgin/gtkblist.c:1254
+#: ../pidgin/gtkblist.c:1171 ../pidgin/gtkblist.c:1180
+#: ../pidgin/gtkblist.c:1270 ../pidgin/gtkblist.c:1291
 msgid "_Alias..."
 msgstr "_Apelidar..."
 
-#: ../pidgin/gtkblist.c:1138 ../pidgin/gtkblist.c:1146
-#: ../pidgin/gtkblist.c:1235 ../pidgin/gtkblist.c:1256
+#: ../pidgin/gtkblist.c:1174 ../pidgin/gtkblist.c:1182
+#: ../pidgin/gtkblist.c:1272 ../pidgin/gtkblist.c:1293
 msgid "_Remove"
 msgstr "_Remover"
 
-#: ../pidgin/gtkblist.c:1195
+#: ../pidgin/gtkblist.c:1232
 msgid "Add a _Buddy"
 msgstr "Adicionar um _amigo"
 
-#: ../pidgin/gtkblist.c:1198
+#: ../pidgin/gtkblist.c:1235
 msgid "Add a C_hat"
 msgstr "Adicionar um c_hat"
 
-#: ../pidgin/gtkblist.c:1201
+#: ../pidgin/gtkblist.c:1238
 msgid "_Delete Group"
 msgstr "_Remover grupo"
 
-#: ../pidgin/gtkblist.c:1203
+#: ../pidgin/gtkblist.c:1240
 msgid "_Rename"
 msgstr "_Renomear"
 
 #. join button
-#: ../pidgin/gtkblist.c:1221 ../pidgin/gtkroomlist.c:306
-#: ../pidgin/gtkroomlist.c:463 ../pidgin/pidginstock.c:82
+#: ../pidgin/gtkblist.c:1258 ../pidgin/gtkroomlist.c:306
+#: ../pidgin/gtkroomlist.c:459 ../pidgin/pidginstock.c:82
 msgid "_Join"
 msgstr "_Entrar"
 
-#: ../pidgin/gtkblist.c:1223
+#: ../pidgin/gtkblist.c:1260
 msgid "Auto-Join"
 msgstr "Entrar automaticamente"
 
-#: ../pidgin/gtkblist.c:1261 ../pidgin/gtkblist.c:1284
+#: ../pidgin/gtkblist.c:1298 ../pidgin/gtkblist.c:1321
 msgid "_Collapse"
 msgstr "Re_colher"
 
-#: ../pidgin/gtkblist.c:1289
+#: ../pidgin/gtkblist.c:1326
 msgid "_Expand"
 msgstr "_Expandir"
 
-#: ../pidgin/gtkblist.c:1534 ../pidgin/gtkblist.c:1546
-#: ../pidgin/gtkblist.c:4543 ../pidgin/gtkblist.c:4553
+#: ../pidgin/gtkblist.c:1571 ../pidgin/gtkblist.c:1583
+#: ../pidgin/gtkblist.c:4561 ../pidgin/gtkblist.c:4571
 msgid "/Tools/Mute Sounds"
 msgstr "/Ferramentas/Não tocar sons"
 
-#: ../pidgin/gtkblist.c:2006 ../pidgin/gtkconv.c:4650
-#: ../pidgin/gtkpounce.c:423
+#: ../pidgin/gtkblist.c:2043 ../pidgin/gtkconv.c:4602
+#: ../pidgin/gtkpounce.c:429
 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:2846
+#: ../pidgin/gtkblist.c:2838
 msgid "/_Buddies"
 msgstr "/_Amigos"
 
-#: ../pidgin/gtkblist.c:2847
+#: ../pidgin/gtkblist.c:2839
 msgid "/Buddies/New Instant _Message..."
 msgstr "/Amigos/Nova _mensagem instantânea..."
 
-#: ../pidgin/gtkblist.c:2848
+#: ../pidgin/gtkblist.c:2840
 msgid "/Buddies/Join a _Chat..."
 msgstr "/Amigos/Entrar em um _bate-papo..."
 
-#: ../pidgin/gtkblist.c:2849
+#: ../pidgin/gtkblist.c:2841
 msgid "/Buddies/Get User _Info..."
 msgstr "/Amigos/Ver _informações do usuário..."
 
-#: ../pidgin/gtkblist.c:2850
+#: ../pidgin/gtkblist.c:2842
 msgid "/Buddies/View User _Log..."
 msgstr "/Amigos/Ver _log do usuário..."
 
-#: ../pidgin/gtkblist.c:2852
+#: ../pidgin/gtkblist.c:2844
 msgid "/Buddies/Show _Offline Buddies"
 msgstr "/Amigos/Exibir amig_os desconectados"
 
-#: ../pidgin/gtkblist.c:2853
+#: ../pidgin/gtkblist.c:2845
 msgid "/Buddies/Show _Empty Groups"
 msgstr "/Amigos/Exibir grupos _vazios"
 
+#: ../pidgin/gtkblist.c:2846
+msgid "/Buddies/Show Buddy _Details"
+msgstr "/Amigos/Exibir _detalhes do amigo"
+
+#: ../pidgin/gtkblist.c:2847
+msgid "/Buddies/Show Idle _Times"
+msgstr "/Amigos/Exibir _tempos de inatividade"
+
+#: ../pidgin/gtkblist.c:2848
+msgid "/Buddies/_Sort Buddies"
+msgstr "/Amigos/Ordenar amigo_s"
+
+#: ../pidgin/gtkblist.c:2850
+msgid "/Buddies/_Add Buddy..."
+msgstr "/Amigos/_Adicionar amigo..."
+
+#: ../pidgin/gtkblist.c:2851
+msgid "/Buddies/Add C_hat..."
+msgstr "/Amigos/Adicionar bate-_papo..."
+
+#: ../pidgin/gtkblist.c:2852
+msgid "/Buddies/Add _Group..."
+msgstr "/Amigos/Adicionar _grupo..."
+
 #: ../pidgin/gtkblist.c:2854
-msgid "/Buddies/Show Buddy _Details"
-msgstr "/Amigos/Exibir _detalhes do amigo"
-
-#: ../pidgin/gtkblist.c:2855
-msgid "/Buddies/Show Idle _Times"
-msgstr "/Amigos/Exibir _tempos de inatividade"
-
-#: ../pidgin/gtkblist.c:2856
-msgid "/Buddies/_Sort Buddies"
-msgstr "/Amigos/Ordenar amigo_s"
-
-#: ../pidgin/gtkblist.c:2858
-msgid "/Buddies/_Add Buddy..."
-msgstr "/Amigos/_Adicionar amigo..."
-
-#: ../pidgin/gtkblist.c:2859
-msgid "/Buddies/Add C_hat..."
-msgstr "/Amigos/Adicionar bate-_papo..."
-
-#: ../pidgin/gtkblist.c:2860
-msgid "/Buddies/Add _Group..."
-msgstr "/Amigos/Adicionar _grupo..."
-
-#: ../pidgin/gtkblist.c:2862
-msgid "/Buddies/_About Pidgin"
-msgstr "/Amigos/_Sobre o Pidgin"
-
-#: ../pidgin/gtkblist.c:2863
 msgid "/Buddies/_Quit"
 msgstr "/Amigos/_Sair"
 
 #. Accounts menu
-#: ../pidgin/gtkblist.c:2866
+#: ../pidgin/gtkblist.c:2857
 msgid "/_Accounts"
 msgstr "/_Contas"
 
-#: ../pidgin/gtkblist.c:2867 ../pidgin/gtkblist.c:6506
+#: ../pidgin/gtkblist.c:2858 ../pidgin/gtkblist.c:6532
 msgid "/Accounts/Add\\/Edit"
 msgstr "/Contas/Adicionar\\/Editar"
 
 #. Tools
-#: ../pidgin/gtkblist.c:2870
+#: ../pidgin/gtkblist.c:2861
 msgid "/_Tools"
 msgstr "/_Ferramentas"
 
-#: ../pidgin/gtkblist.c:2871
+#: ../pidgin/gtkblist.c:2862
 msgid "/Tools/Buddy _Pounces"
 msgstr "/Ferramentas/Ações de _usuário"
 
-#: ../pidgin/gtkblist.c:2872
+#: ../pidgin/gtkblist.c:2863
 msgid "/Tools/Plu_gins"
 msgstr "/Ferramentas/Plu_gins"
 
-#: ../pidgin/gtkblist.c:2873
+#: ../pidgin/gtkblist.c:2864
 msgid "/Tools/Pr_eferences"
 msgstr "/Ferramentas/Pr_eferências"
 
-#: ../pidgin/gtkblist.c:2874
+#: ../pidgin/gtkblist.c:2865
 msgid "/Tools/Pr_ivacy"
 msgstr "/Ferramentas/Pr_ivacidade"
 
-#: ../pidgin/gtkblist.c:2876
+#: ../pidgin/gtkblist.c:2867
 msgid "/Tools/_File Transfers"
 msgstr "/Ferramentas/Transferências de arquivo"
 
-#: ../pidgin/gtkblist.c:2877
+#: ../pidgin/gtkblist.c:2868
 msgid "/Tools/R_oom List"
 msgstr "/Ferramentas/_Lista de salas"
 
-#: ../pidgin/gtkblist.c:2878
+#: ../pidgin/gtkblist.c:2869
 msgid "/Tools/System _Log"
 msgstr "/Ferramentas/Log do _sistema"
 
-#: ../pidgin/gtkblist.c:2879
-msgid "/Tools/_Debug Window"
-msgstr "/Ferramentas/Janela de _depuração"
-
-#: ../pidgin/gtkblist.c:2881
+#: ../pidgin/gtkblist.c:2871
 msgid "/Tools/Mute _Sounds"
 msgstr "/Ferramentas/Não tocar sons"
 
-#: ../pidgin/gtkblist.c:2909
+#. Help
+#: ../pidgin/gtkblist.c:2873
+msgid "/_Help"
+msgstr "/_Ajuda"
+
+#: ../pidgin/gtkblist.c:2874
+msgid "/Help/Online _Help"
+msgstr "/Ajuda/_Ajuda online"
+
+#: ../pidgin/gtkblist.c:2875
+msgid "/Help/_Debug Window"
+msgstr "/Ajuda/Janela de _depuração"
+
+#: ../pidgin/gtkblist.c:2877 ../pidgin/gtkblist.c:2879
+msgid "/Help/_About"
+msgstr "/Ajuda/_Sobre"
+
+#: ../pidgin/gtkblist.c:2908
 #, c-format
 msgid ""
 "\n"
@@ -12316,7 +12364,7 @@
 "\n"
 "<b>Conta:</b> %s"
 
-#: ../pidgin/gtkblist.c:2987
+#: ../pidgin/gtkblist.c:2986
 msgid "Buddy Alias"
 msgstr "Apelido do amigo"
 
@@ -12340,103 +12388,108 @@
 msgid "Rockin'"
 msgstr "Botando pra quebrar"
 
-#: ../pidgin/gtkblist.c:3414
+#: ../pidgin/gtkblist.c:3428
+#, c-format
+msgid "Idle %dd %dh %02dm"
+msgstr "Inativo por %dd %dh %02dm"
+
+#: ../pidgin/gtkblist.c:3430
 #, c-format
 msgid "Idle %dh %02dm"
 msgstr "Inativo por %dh %02dm"
 
-#: ../pidgin/gtkblist.c:3416
+#: ../pidgin/gtkblist.c:3432
 #, c-format
 msgid "Idle %dm"
 msgstr "Inativo por %dm"
 
-#: ../pidgin/gtkblist.c:3561
+#: ../pidgin/gtkblist.c:3577
 msgid "/Buddies/New Instant Message..."
 msgstr "/Amigos/Nova mensagem instantânea..."
 
-#: ../pidgin/gtkblist.c:3562 ../pidgin/gtkblist.c:3595
+#: ../pidgin/gtkblist.c:3578 ../pidgin/gtkblist.c:3611
 msgid "/Buddies/Join a Chat..."
 msgstr "/Amigos/Entrar em um bate-papo..."
 
-#: ../pidgin/gtkblist.c:3563
+#: ../pidgin/gtkblist.c:3579
 msgid "/Buddies/Get User Info..."
 msgstr "/Amigos/Ver informações do usuário..."
 
-#: ../pidgin/gtkblist.c:3564
+#: ../pidgin/gtkblist.c:3580
 msgid "/Buddies/Add Buddy..."
 msgstr "/Amigos/Adicionar amigo..."
 
-#: ../pidgin/gtkblist.c:3565 ../pidgin/gtkblist.c:3598
+#: ../pidgin/gtkblist.c:3581 ../pidgin/gtkblist.c:3614
 msgid "/Buddies/Add Chat..."
 msgstr "/Amigos/Adicionar bate-papo..."
 
-#: ../pidgin/gtkblist.c:3566
+#: ../pidgin/gtkblist.c:3582
 msgid "/Buddies/Add Group..."
 msgstr "/Amigos/Adicionar grupo..."
 
-#: ../pidgin/gtkblist.c:3601
+#: ../pidgin/gtkblist.c:3617
 msgid "/Tools/Privacy"
 msgstr "/Ferramentas/Privacidade"
 
-#: ../pidgin/gtkblist.c:3604
+#: ../pidgin/gtkblist.c:3620
 msgid "/Tools/Room List"
 msgstr "/Ferramentas/Lista de salas"
 
-#: ../pidgin/gtkblist.c:3701 ../pidgin/gtkdocklet.c:153
+#: ../pidgin/gtkblist.c:3717 ../pidgin/gtkdocklet.c:153
 #, c-format
 msgid "%d unread message from %s\n"
 msgid_plural "%d unread messages from %s\n"
 msgstr[0] "%d mensagem não lida de %s\n"
 msgstr[1] "%d mensagens não lidas de %s\n"
 
-#: ../pidgin/gtkblist.c:3781
+#: ../pidgin/gtkblist.c:3797
 msgid "Manually"
 msgstr "Manualmente"
 
-#: ../pidgin/gtkblist.c:3783
+#: ../pidgin/gtkblist.c:3799
 msgid "Alphabetically"
 msgstr "Alfabeticamente"
 
-#: ../pidgin/gtkblist.c:3784
+#: ../pidgin/gtkblist.c:3800
 msgid "By status"
 msgstr "Por status"
 
-#: ../pidgin/gtkblist.c:3785
+#: ../pidgin/gtkblist.c:3801
 msgid "By log size"
 msgstr "Por tamanho do log"
 
-#: ../pidgin/gtkblist.c:3987 ../pidgin/gtkconn.c:178
+#: ../pidgin/gtkblist.c:4005 ../pidgin/gtkconn.c:178
 #, c-format
 msgid "%s disconnected"
 msgstr "%s desconectado"
 
-#: ../pidgin/gtkblist.c:3997
+#: ../pidgin/gtkblist.c:4015
 msgid "Re-enable Account"
 msgstr "Re-ativar conta"
 
-#: ../pidgin/gtkblist.c:4021
+#: ../pidgin/gtkblist.c:4039
 #, c-format
 msgid "<span color=\"red\">%s disconnected: %s</span>"
 msgstr "<span color=\"red\">%s desconectado: %s</span>"
 
-#: ../pidgin/gtkblist.c:4173
+#: ../pidgin/gtkblist.c:4191
 msgid "<b>Username:</b>"
 msgstr "<b>Nome de usuário:</b>"
 
-#: ../pidgin/gtkblist.c:4180
+#: ../pidgin/gtkblist.c:4198
 msgid "<b>Password:</b>"
 msgstr "<b>Senha:</b>"
 
-#: ../pidgin/gtkblist.c:4191
+#: ../pidgin/gtkblist.c:4209
 msgid "_Login"
 msgstr "_Conectar"
 
-#: ../pidgin/gtkblist.c:4276
+#: ../pidgin/gtkblist.c:4292
 msgid "/Accounts"
 msgstr "/Contas"
 
 #. Translators: Please maintain the use of -> and <- to refer to menu heirarchy
-#: ../pidgin/gtkblist.c:4290
+#: ../pidgin/gtkblist.c:4306
 #, c-format
 msgid ""
 "<span weight='bold' size='larger'>Welcome to %s!</span>\n"
@@ -12455,23 +12508,23 @@
 #. set the Show Offline Buddies option. must be done
 #. * after the treeview or faceprint gets mad. -Robot101
 #.
-#: ../pidgin/gtkblist.c:4537
+#: ../pidgin/gtkblist.c:4555
 msgid "/Buddies/Show Offline Buddies"
 msgstr "/Amigos/Exibir amigos desconectados"
 
-#: ../pidgin/gtkblist.c:4540
+#: ../pidgin/gtkblist.c:4558
 msgid "/Buddies/Show Empty Groups"
 msgstr "/Amigos/Exibir grupos vazios"
 
-#: ../pidgin/gtkblist.c:4546
+#: ../pidgin/gtkblist.c:4564
 msgid "/Buddies/Show Buddy Details"
 msgstr "/Amigos/Exibir detalhes do amigo"
 
-#: ../pidgin/gtkblist.c:4549
+#: ../pidgin/gtkblist.c:4567
 msgid "/Buddies/Show Idle Times"
 msgstr "/Amigos/Exibir tempos de inatividade"
 
-#: ../pidgin/gtkblist.c:5418
+#: ../pidgin/gtkblist.c:5444
 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. "
@@ -12483,19 +12536,19 @@
 "possível.\n"
 
 #. End of account box
-#: ../pidgin/gtkblist.c:5453
+#: ../pidgin/gtkblist.c:5479
 msgid "_Screen name:"
 msgstr "Nome de _usuário:"
 
-#: ../pidgin/gtkblist.c:5475 ../pidgin/gtkblist.c:5829
+#: ../pidgin/gtkblist.c:5501 ../pidgin/gtkblist.c:5855
 msgid "A_lias:"
 msgstr "Ape_lido:"
 
-#: ../pidgin/gtkblist.c:5741
+#: ../pidgin/gtkblist.c:5767
 msgid "This protocol does not support chat rooms."
 msgstr "Este protocolo não suporta salas de bate-papo."
 
-#: ../pidgin/gtkblist.c:5757
+#: ../pidgin/gtkblist.c:5783
 msgid ""
 "You are not currently signed on with any protocols that have the ability to "
 "chat."
@@ -12503,7 +12556,7 @@
 "Atualmente, você não está conectado em nenhum protocolo que possui o recurso "
 "de bate-papo."
 
-#: ../pidgin/gtkblist.c:5798
+#: ../pidgin/gtkblist.c:5824
 msgid ""
 "Please enter an alias, and the appropriate information about the chat you "
 "would like to add to your buddy list.\n"
@@ -12511,39 +12564,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:5886
+#: ../pidgin/gtkblist.c:5912
 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:6526
+#: ../pidgin/gtkblist.c:6552
 msgid "<PurpleMain>/Accounts/"
 msgstr "<PurpleMain>/Contas/"
 
-#: ../pidgin/gtkblist.c:6550
+#: ../pidgin/gtkblist.c:6576
 msgid "_Edit Account"
 msgstr "_Editar conta"
 
-#: ../pidgin/gtkblist.c:6563 ../pidgin/gtkconv.c:3024
+#: ../pidgin/gtkblist.c:6589 ../pidgin/gtkconv.c:2982
 msgid "No actions available"
 msgstr "Nenhuma ação disponível"
 
-#: ../pidgin/gtkblist.c:6571
+#: ../pidgin/gtkblist.c:6597
 msgid "_Disable"
 msgstr "_Desativar"
 
-#: ../pidgin/gtkblist.c:6583
+#: ../pidgin/gtkblist.c:6609
 msgid "Enable Account"
 msgstr "Ativar conta"
 
-#: ../pidgin/gtkblist.c:6589
+#: ../pidgin/gtkblist.c:6615
 msgid "<PurpleMain>/Accounts/Enable Account"
 msgstr "<PurpleMain>/Contas/Ativar conta"
 
-#: ../pidgin/gtkblist.c:6638
+#: ../pidgin/gtkblist.c:6664
 msgid "/Tools"
 msgstr "/Ferramentas"
 
-#: ../pidgin/gtkblist.c:6708
+#: ../pidgin/gtkblist.c:6734
 msgid "/Buddies/Sort Buddies"
 msgstr "/Amigos/Ordenar amigos"
 
@@ -12560,21 +12613,25 @@
 "O %s não tentará reconectar esta conta até que você corrija o erro e reative "
 "a mesma."
 
-#: ../pidgin/gtkconv.c:793 ../pidgin/gtkconv.c:819
+#: ../pidgin/gtkconv.c:485
+msgid "Unknown command."
+msgstr "Comando desconhecido."
+
+#: ../pidgin/gtkconv.c:757 ../pidgin/gtkconv.c:783
 msgid "That buddy is not on the same protocol as this chat."
 msgstr "Este amigo não está usando o mesmo protocolo deste bate-papo."
 
-#: ../pidgin/gtkconv.c:813
+#: ../pidgin/gtkconv.c:777
 msgid ""
 "You are not currently signed on with an account that can invite that buddy."
 msgstr "Você não está conectado com uma conta que permita convidar este amigo."
 
-#: ../pidgin/gtkconv.c:866
+#: ../pidgin/gtkconv.c:830
 msgid "Invite Buddy Into Chat Room"
 msgstr "Convidar amigo para sala de bate-papo"
 
 #. Put our happy label in it.
-#: ../pidgin/gtkconv.c:896
+#: ../pidgin/gtkconv.c:860
 msgid ""
 "Please enter the name of the user you wish to invite, along with an optional "
 "invite message."
@@ -12582,372 +12639,380 @@
 "Favor digitar o nome do usuário que você gostaria de convidar, junto com uma "
 "mensagem de convite opcional."
 
-#: ../pidgin/gtkconv.c:917
+#: ../pidgin/gtkconv.c:881
 msgid "_Buddy:"
 msgstr "_Amigo:"
 
-#: ../pidgin/gtkconv.c:937 ../pidgin/gtksavedstatuses.c:1141
-#: ../pidgin/gtksavedstatuses.c:1477
+#: ../pidgin/gtkconv.c:901 ../pidgin/gtksavedstatuses.c:1193
+#: ../pidgin/gtksavedstatuses.c:1525
 msgid "_Message:"
 msgstr "_Mensagem:"
 
-#: ../pidgin/gtkconv.c:994 ../pidgin/gtkconv.c:2548 ../pidgin/gtkdebug.c:218
+#: ../pidgin/gtkconv.c:958 ../pidgin/gtkconv.c:2506 ../pidgin/gtkdebug.c:218
 #: ../pidgin/gtkft.c:542
 msgid "Unable to open file."
 msgstr "Não foi possível abrir arquivo."
 
-#: ../pidgin/gtkconv.c:1000
+#: ../pidgin/gtkconv.c:964
 #, c-format
 msgid "<h1>Conversation with %s</h1>\n"
 msgstr "<h1>Conversas com %s</h1>\n"
 
-#: ../pidgin/gtkconv.c:1036
+#: ../pidgin/gtkconv.c:1000
 msgid "Save Conversation"
 msgstr "Salvar conversa"
 
-#: ../pidgin/gtkconv.c:1185 ../pidgin/gtkdebug.c:166 ../pidgin/gtkdebug.c:742
+#: ../pidgin/gtkconv.c:1149 ../pidgin/gtkdebug.c:166 ../pidgin/gtkdebug.c:742
 msgid "Find"
 msgstr "Procurar"
 
-#: ../pidgin/gtkconv.c:1211 ../pidgin/gtkdebug.c:194
+#: ../pidgin/gtkconv.c:1175 ../pidgin/gtkdebug.c:194
 msgid "_Search for:"
 msgstr "_Procurar por:"
 
-#: ../pidgin/gtkconv.c:1394
+#: ../pidgin/gtkconv.c:1358
 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:1402
+#: ../pidgin/gtkconv.c:1366
 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:1650
+#: ../pidgin/gtkconv.c:1614
 msgid "Un-Ignore"
 msgstr "Des-ignorar"
 
-#: ../pidgin/gtkconv.c:1653
+#: ../pidgin/gtkconv.c:1617
 msgid "Ignore"
 msgstr "Ignorar"
 
-#: ../pidgin/gtkconv.c:1673
+#: ../pidgin/gtkconv.c:1637
 msgid "Get Away Message"
 msgstr "Obter mensagem de ausência"
 
-#: ../pidgin/gtkconv.c:1696
+#: ../pidgin/gtkconv.c:1660
 msgid "Last said"
 msgstr "Última mensagem"
 
-#: ../pidgin/gtkconv.c:2556
+#: ../pidgin/gtkconv.c:2514
 msgid "Unable to save icon file to disk."
 msgstr "Não foi possível salvar arquivo de ícone no disco."
 
-#: ../pidgin/gtkconv.c:2607
+#: ../pidgin/gtkconv.c:2565
 msgid "Save Icon"
 msgstr "Salvar ícone"
 
-#: ../pidgin/gtkconv.c:2659
+#: ../pidgin/gtkconv.c:2617
 msgid "Animate"
 msgstr "Animar"
 
-#: ../pidgin/gtkconv.c:2664
+#: ../pidgin/gtkconv.c:2622
 msgid "Hide Icon"
 msgstr "Ocultar ícone"
 
-#: ../pidgin/gtkconv.c:2667
+#: ../pidgin/gtkconv.c:2625
 msgid "Save Icon As..."
 msgstr "Salvar ícone como..."
 
-#: ../pidgin/gtkconv.c:2671
+#: ../pidgin/gtkconv.c:2629
 msgid "Set Custom Icon..."
 msgstr "Definir ícone personalizado..."
 
-#: ../pidgin/gtkconv.c:2684
+#: ../pidgin/gtkconv.c:2642
 msgid "Remove Custom Icon"
 msgstr "Remover ícone personalizado"
 
 #. Conversation menu
-#: ../pidgin/gtkconv.c:2826
+#: ../pidgin/gtkconv.c:2784
 msgid "/_Conversation"
 msgstr "/_Conversa"
 
-#: ../pidgin/gtkconv.c:2828
+#: ../pidgin/gtkconv.c:2786
 msgid "/Conversation/New Instant _Message..."
 msgstr "/Conversa/Nova _mensagem instantânea..."
 
-#: ../pidgin/gtkconv.c:2833
+#: ../pidgin/gtkconv.c:2791
 msgid "/Conversation/_Find..."
 msgstr "/Conversa/_Procurar..."
 
-#: ../pidgin/gtkconv.c:2835
+#: ../pidgin/gtkconv.c:2793
 msgid "/Conversation/View _Log"
 msgstr "/Conversa/Ver _log"
 
-#: ../pidgin/gtkconv.c:2836
+#: ../pidgin/gtkconv.c:2794
 msgid "/Conversation/_Save As..."
 msgstr "/Conversa/_Salvar como..."
 
-#: ../pidgin/gtkconv.c:2838
+#: ../pidgin/gtkconv.c:2796
 msgid "/Conversation/Clea_r Scrollback"
 msgstr "/Conversa/Limpa_r"
 
-#: ../pidgin/gtkconv.c:2842
+#: ../pidgin/gtkconv.c:2800
 msgid "/Conversation/Se_nd File..."
 msgstr "/Conversa/E_nviar arquivo..."
 
-#: ../pidgin/gtkconv.c:2843
+#: ../pidgin/gtkconv.c:2801
 msgid "/Conversation/Add Buddy _Pounce..."
 msgstr "/Conversa/Adicionar ação de _usuário..."
 
-#: ../pidgin/gtkconv.c:2845
+#: ../pidgin/gtkconv.c:2803
 msgid "/Conversation/_Get Info"
 msgstr "/Conversa/_Ver informações"
 
-#: ../pidgin/gtkconv.c:2847
+#: ../pidgin/gtkconv.c:2805
 msgid "/Conversation/In_vite..."
 msgstr "/Conversa/_Convidar..."
 
-#: ../pidgin/gtkconv.c:2849
+#: ../pidgin/gtkconv.c:2807
 msgid "/Conversation/M_ore"
 msgstr "/Conversa/M_ais"
 
-#: ../pidgin/gtkconv.c:2853
+#: ../pidgin/gtkconv.c:2811
 msgid "/Conversation/Al_ias..."
 msgstr "/Conversa/Apel_idar..."
 
-#: ../pidgin/gtkconv.c:2855
+#: ../pidgin/gtkconv.c:2813
 msgid "/Conversation/_Block..."
 msgstr "/Conversa/_Bloquear..."
 
-#: ../pidgin/gtkconv.c:2857
+#: ../pidgin/gtkconv.c:2815
 msgid "/Conversation/_Unblock..."
 msgstr "/Conversa/_Desbloquear..."
 
-#: ../pidgin/gtkconv.c:2859
+#: ../pidgin/gtkconv.c:2817
 msgid "/Conversation/_Add..."
 msgstr "/Conversa/A_dicionar..."
 
-#: ../pidgin/gtkconv.c:2861
+#: ../pidgin/gtkconv.c:2819
 msgid "/Conversation/_Remove..."
 msgstr "/Conversa/_Remover..."
 
-#: ../pidgin/gtkconv.c:2866
+#: ../pidgin/gtkconv.c:2824
 msgid "/Conversation/Insert Lin_k..."
 msgstr "/Conversa/Inserir lin_k..."
 
-#: ../pidgin/gtkconv.c:2868
+#: ../pidgin/gtkconv.c:2826
 msgid "/Conversation/Insert Imag_e..."
 msgstr "/Conversa/Inserir imag_em..."
 
-#: ../pidgin/gtkconv.c:2874
+#: ../pidgin/gtkconv.c:2832
 msgid "/Conversation/_Close"
 msgstr "/Conversa/_Fechar"
 
 #. Options
-#: ../pidgin/gtkconv.c:2878
+#: ../pidgin/gtkconv.c:2836
 msgid "/_Options"
 msgstr "/_Opções"
 
-#: ../pidgin/gtkconv.c:2879
+#: ../pidgin/gtkconv.c:2837
 msgid "/Options/Enable _Logging"
 msgstr "/Opções/Gravar _log"
 
-#: ../pidgin/gtkconv.c:2880
+#: ../pidgin/gtkconv.c:2838
 msgid "/Options/Enable _Sounds"
 msgstr "/Opções/Ativar _sons"
 
-#: ../pidgin/gtkconv.c:2881
+#: ../pidgin/gtkconv.c:2839
 msgid "/Options/Show Buddy _Icon"
 msgstr "/Options/Mostrar í_cones de amigos"
 
-#: ../pidgin/gtkconv.c:2883
+#: ../pidgin/gtkconv.c:2841
 msgid "/Options/Show Formatting _Toolbars"
 msgstr "/Opções/Mostrar barras de ferramen_tas de formatação"
 
-#: ../pidgin/gtkconv.c:2884
+#: ../pidgin/gtkconv.c:2842
 msgid "/Options/Show Ti_mestamps"
 msgstr "/Opções/_Mostrar marcações de tempo"
 
-#: ../pidgin/gtkconv.c:2960
+#: ../pidgin/gtkconv.c:2918
 msgid "/Conversation/More"
 msgstr "/Conversa/Mais"
 
+#: ../pidgin/gtkconv.c:3026
+msgid "/Options"
+msgstr "/Opções"
+
 #. The menubar has been deactivated. Make sure the 'More' submenu is regenerated next time
 #. * the 'Conversation' menu pops up.
 #. Make sure the 'Conversation -> More' menuitems are regenerated whenever
 #. * the 'Conversation' menu pops up because the entries can change after the
 #. * conversation is created.
-#: ../pidgin/gtkconv.c:3048 ../pidgin/gtkconv.c:3080
+#: ../pidgin/gtkconv.c:3061 ../pidgin/gtkconv.c:3093
 msgid "/Conversation"
 msgstr "/Conversa"
 
-#: ../pidgin/gtkconv.c:3088
+#: ../pidgin/gtkconv.c:3101
 msgid "/Conversation/View Log"
 msgstr "/Conversa/Ver log"
 
-#: ../pidgin/gtkconv.c:3094
+#: ../pidgin/gtkconv.c:3107
 msgid "/Conversation/Send File..."
 msgstr "/Conversa/Enviar arquivo..."
 
-#: ../pidgin/gtkconv.c:3098
+#: ../pidgin/gtkconv.c:3111
 msgid "/Conversation/Add Buddy Pounce..."
 msgstr "/Conversa/Adicionar ação de usuário..."
 
-#: ../pidgin/gtkconv.c:3104
+#: ../pidgin/gtkconv.c:3117
 msgid "/Conversation/Get Info"
 msgstr "/Conversa/Ver informações"
 
-#: ../pidgin/gtkconv.c:3108
+#: ../pidgin/gtkconv.c:3121
 msgid "/Conversation/Invite..."
 msgstr "/Conversa/Convidar..."
 
-#: ../pidgin/gtkconv.c:3114
+#: ../pidgin/gtkconv.c:3127
 msgid "/Conversation/Alias..."
 msgstr "/Conversa/Apelido..."
 
-#: ../pidgin/gtkconv.c:3118
+#: ../pidgin/gtkconv.c:3131
 msgid "/Conversation/Block..."
 msgstr "/Conversa/Bloquear..."
 
-#: ../pidgin/gtkconv.c:3122
+#: ../pidgin/gtkconv.c:3135
 msgid "/Conversation/Unblock..."
 msgstr "/Conversa/Desbloquear..."
 
-#: ../pidgin/gtkconv.c:3126
+#: ../pidgin/gtkconv.c:3139
 msgid "/Conversation/Add..."
 msgstr "/Conversa/Adicionar..."
 
-#: ../pidgin/gtkconv.c:3130
+#: ../pidgin/gtkconv.c:3143
 msgid "/Conversation/Remove..."
 msgstr "/Conversa/Remover..."
 
-#: ../pidgin/gtkconv.c:3136
+#: ../pidgin/gtkconv.c:3149
 msgid "/Conversation/Insert Link..."
 msgstr "/Conversa/Inserir link..."
 
-#: ../pidgin/gtkconv.c:3140
+#: ../pidgin/gtkconv.c:3153
 msgid "/Conversation/Insert Image..."
 msgstr "/Conversa/Inserir imagem..."
 
-#: ../pidgin/gtkconv.c:3146
+#: ../pidgin/gtkconv.c:3159
 msgid "/Options/Enable Logging"
 msgstr "/Opções/Gravar log"
 
-#: ../pidgin/gtkconv.c:3149
+#: ../pidgin/gtkconv.c:3162
 msgid "/Options/Enable Sounds"
 msgstr "/Opções/Ativar sons"
 
-#: ../pidgin/gtkconv.c:3162
+#: ../pidgin/gtkconv.c:3175
 msgid "/Options/Show Formatting Toolbars"
 msgstr "/Opções/Mostrar barras de ferramentas de formatação"
 
-#: ../pidgin/gtkconv.c:3165
+#: ../pidgin/gtkconv.c:3178
 msgid "/Options/Show Timestamps"
 msgstr "/Opções/Mostrar marcações de tempo"
 
-#: ../pidgin/gtkconv.c:3168
+#: ../pidgin/gtkconv.c:3181
 msgid "/Options/Show Buddy Icon"
 msgstr "/Options/Mostrar ícones de amigos"
 
-#: ../pidgin/gtkconv.c:3252 ../pidgin/gtkconv.c:3294
+#: ../pidgin/gtkconv.c:3265 ../pidgin/gtkconv.c:3307
 msgid "User is typing..."
 msgstr "O usuário está digitando..."
 
-#: ../pidgin/gtkconv.c:3297
+#: ../pidgin/gtkconv.c:3310
 msgid "User has typed something and stopped"
 msgstr "O usuário digitou algo e parou"
 
 #. Build the Send To menu
-#: ../pidgin/gtkconv.c:3479
+#: ../pidgin/gtkconv.c:3492
 msgid "_Send To"
 msgstr "_Enviar para"
 
-#: ../pidgin/gtkconv.c:4193
+#: ../pidgin/gtkconv.c:4206
 msgid "_Send"
 msgstr "_Enviar"
 
 #. Setup the label telling how many people are in the room.
-#: ../pidgin/gtkconv.c:4344
+#: ../pidgin/gtkconv.c:4310
 msgid "0 people in room"
 msgstr "0 pessoas na sala"
 
-#: ../pidgin/gtkconv.c:5536 ../pidgin/gtkconv.c:5657
+#: ../pidgin/gtkconv.c:5496 ../pidgin/gtkconv.c:5617
 #, 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:6231 ../pidgin/gtkstatusbox.c:657
+#: ../pidgin/gtkconv.c:6216 ../pidgin/gtkstatusbox.c:659
 msgid "Typing"
 msgstr "Digitando"
 
-#: ../pidgin/gtkconv.c:6237
+#: ../pidgin/gtkconv.c:6222
 msgid "Stopped Typing"
 msgstr "Parou de digitar"
 
-#: ../pidgin/gtkconv.c:6242
+#: ../pidgin/gtkconv.c:6227
 msgid "Nick Said"
 msgstr "Apelido mencionado"
 
-#: ../pidgin/gtkconv.c:6247 ../pidgin/gtkdocklet.c:492
+#: ../pidgin/gtkconv.c:6232 ../pidgin/gtkdocklet.c:492
 msgid "Unread Messages"
 msgstr "Mensagens não lidas"
 
-#: ../pidgin/gtkconv.c:6252
+#: ../pidgin/gtkconv.c:6237
 msgid "New Event"
 msgstr "Novo evento"
 
-#: ../pidgin/gtkconv.c:7384
+#: ../pidgin/gtkconv.c:7210
+msgid "clear: Clears all conversation scrollbacks."
+msgstr "clear: Limpa todas as janela de conversa."
+
+#: ../pidgin/gtkconv.c:7374
 msgid "Confirm close"
 msgstr "Confirmar fechamento"
 
-#: ../pidgin/gtkconv.c:7416
+#: ../pidgin/gtkconv.c:7406
 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:7938
+#: ../pidgin/gtkconv.c:7967
 msgid "Close other tabs"
 msgstr "Fechar as outras abas"
 
-#: ../pidgin/gtkconv.c:7944
+#: ../pidgin/gtkconv.c:7973
 msgid "Close all tabs"
 msgstr "Fechar todas as abas"
 
-#: ../pidgin/gtkconv.c:7952
+#: ../pidgin/gtkconv.c:7981
 msgid "Detach this tab"
 msgstr "Separar esta aba"
 
-#: ../pidgin/gtkconv.c:7958
+#: ../pidgin/gtkconv.c:7987
 msgid "Close this tab"
 msgstr "Fechar esta aba"
 
-#: ../pidgin/gtkconv.c:8344
+#: ../pidgin/gtkconv.c:8433
 msgid "Close conversation"
 msgstr "Fechar conversa"
 
-#: ../pidgin/gtkconv.c:8867
+#: ../pidgin/gtkconv.c:8957
 msgid "Last created window"
 msgstr "Última janela criada"
 
-#: ../pidgin/gtkconv.c:8869
+#: ../pidgin/gtkconv.c:8959
 msgid "Separate IM and Chat windows"
 msgstr "Separar janelas de MI e bate-papos"
 
-#: ../pidgin/gtkconv.c:8871 ../pidgin/gtkprefs.c:1340
+#: ../pidgin/gtkconv.c:8961 ../pidgin/gtkprefs.c:1410
 msgid "New window"
 msgstr "Nova janela"
 
-#: ../pidgin/gtkconv.c:8873
+#: ../pidgin/gtkconv.c:8963
 msgid "By group"
 msgstr "Por grupo"
 
-#: ../pidgin/gtkconv.c:8875
+#: ../pidgin/gtkconv.c:8965
 msgid "By account"
 msgstr "Por conta"
 
@@ -13072,7 +13137,7 @@
 msgstr "Árabe"
 
 #: ../pidgin/gtkdialogs.c:125 ../pidgin/gtkdialogs.c:126
-#: ../pidgin/gtkdialogs.c:211
+#: ../pidgin/gtkdialogs.c:213
 msgid "Bulgarian"
 msgstr "Búlgaro"
 
@@ -13085,8 +13150,8 @@
 msgid "Bosnian"
 msgstr "Bósnio"
 
-#: ../pidgin/gtkdialogs.c:132 ../pidgin/gtkdialogs.c:212
-#: ../pidgin/gtkdialogs.c:213
+#: ../pidgin/gtkdialogs.c:132 ../pidgin/gtkdialogs.c:214
+#: ../pidgin/gtkdialogs.c:215
 msgid "Catalan"
 msgstr "Catalão"
 
@@ -13094,7 +13159,7 @@
 msgid "Valencian-Catalan"
 msgstr "Valenciano-Catalão"
 
-#: ../pidgin/gtkdialogs.c:135 ../pidgin/gtkdialogs.c:214
+#: ../pidgin/gtkdialogs.c:135 ../pidgin/gtkdialogs.c:216
 msgid "Czech"
 msgstr "Tcheco"
 
@@ -13103,7 +13168,7 @@
 msgstr "Dinamarquês"
 
 #: ../pidgin/gtkdialogs.c:138 ../pidgin/gtkdialogs.c:139
-#: ../pidgin/gtkdialogs.c:215
+#: ../pidgin/gtkdialogs.c:217
 msgid "German"
 msgstr "Alemão"
 
@@ -13132,9 +13197,9 @@
 msgid "Esperanto"
 msgstr "Esperanto"
 
-#: ../pidgin/gtkdialogs.c:149 ../pidgin/gtkdialogs.c:216
-#: ../pidgin/gtkdialogs.c:217 ../pidgin/gtkdialogs.c:218
-#: ../pidgin/gtkdialogs.c:219
+#: ../pidgin/gtkdialogs.c:149 ../pidgin/gtkdialogs.c:218
+#: ../pidgin/gtkdialogs.c:219 ../pidgin/gtkdialogs.c:220
+#: ../pidgin/gtkdialogs.c:221
 msgid "Spanish"
 msgstr "Espanhol"
 
@@ -13147,201 +13212,206 @@
 msgid "Persian"
 msgstr "Persa"
 
-#: ../pidgin/gtkdialogs.c:155 ../pidgin/gtkdialogs.c:220
-#: ../pidgin/gtkdialogs.c:221
+#: ../pidgin/gtkdialogs.c:155 ../pidgin/gtkdialogs.c:222
+#: ../pidgin/gtkdialogs.c:223
 msgid "Finnish"
 msgstr "Finlandês"
 
-#: ../pidgin/gtkdialogs.c:156 ../pidgin/gtkdialogs.c:222
-#: ../pidgin/gtkdialogs.c:223 ../pidgin/gtkdialogs.c:224
-#: ../pidgin/gtkdialogs.c:225
+#: ../pidgin/gtkdialogs.c:156 ../pidgin/gtkdialogs.c:224
+#: ../pidgin/gtkdialogs.c:225 ../pidgin/gtkdialogs.c:226
+#: ../pidgin/gtkdialogs.c:227
 msgid "French"
 msgstr "Francês"
 
-#: ../pidgin/gtkdialogs.c:157
+#: ../pidgin/gtkdialogs.c:157 ../pidgin/gtkdialogs.c:158
 msgid "Galician"
 msgstr "Galego"
 
-#: ../pidgin/gtkdialogs.c:158 ../pidgin/gtkdialogs.c:159
+#: ../pidgin/gtkdialogs.c:159 ../pidgin/gtkdialogs.c:160
 msgid "Gujarati"
 msgstr "Guzerate"
 
-#: ../pidgin/gtkdialogs.c:159
+#: ../pidgin/gtkdialogs.c:160
 msgid "Gujarati Language Team"
 msgstr "Time de tradução do idioma Guzerate"
 
-#: ../pidgin/gtkdialogs.c:160 ../pidgin/gtkdialogs.c:226
+#: ../pidgin/gtkdialogs.c:161 ../pidgin/gtkdialogs.c:228
 msgid "Hebrew"
 msgstr "Hebraico"
 
-#: ../pidgin/gtkdialogs.c:161
+#: ../pidgin/gtkdialogs.c:162
 msgid "Hindi"
 msgstr "Hindu"
 
-#: ../pidgin/gtkdialogs.c:162
+#: ../pidgin/gtkdialogs.c:163
 msgid "Hungarian"
 msgstr "Húngaro"
 
-#: ../pidgin/gtkdialogs.c:163
+#: ../pidgin/gtkdialogs.c:164
 msgid "Indonesian"
 msgstr "Bahasa Indonésia"
 
-#: ../pidgin/gtkdialogs.c:164 ../pidgin/gtkdialogs.c:227
+#: ../pidgin/gtkdialogs.c:165 ../pidgin/gtkdialogs.c:229
 msgid "Italian"
 msgstr "Italiano"
 
-#: ../pidgin/gtkdialogs.c:165 ../pidgin/gtkdialogs.c:228
-#: ../pidgin/gtkdialogs.c:229 ../pidgin/gtkdialogs.c:230
+#: ../pidgin/gtkdialogs.c:166 ../pidgin/gtkdialogs.c:230
+#: ../pidgin/gtkdialogs.c:231 ../pidgin/gtkdialogs.c:232
 msgid "Japanese"
 msgstr "Japonês"
 
-#: ../pidgin/gtkdialogs.c:166 ../pidgin/gtkdialogs.c:231
+#: ../pidgin/gtkdialogs.c:167 ../pidgin/gtkdialogs.c:233
 msgid "Georgian"
 msgstr "Geórgio"
 
-#: ../pidgin/gtkdialogs.c:166
+#: ../pidgin/gtkdialogs.c:167
 msgid "Ubuntu Georgian Translators"
 msgstr "Tradutores do Ubuntu do idioma Geórgio"
 
-#: ../pidgin/gtkdialogs.c:167
+#: ../pidgin/gtkdialogs.c:168
 msgid "Kannada"
 msgstr "Canarês"
 
-#: ../pidgin/gtkdialogs.c:167
+#: ../pidgin/gtkdialogs.c:168
 msgid "Kannada Translation team"
 msgstr "Time de tradução do idioma Canarês"
 
-#: ../pidgin/gtkdialogs.c:168 ../pidgin/gtkdialogs.c:232
+#: ../pidgin/gtkdialogs.c:169 ../pidgin/gtkdialogs.c:234
+#: ../pidgin/gtkdialogs.c:235
 msgid "Korean"
 msgstr "Coreano"
 
-#: ../pidgin/gtkdialogs.c:169 ../pidgin/gtkdialogs.c:170
-#: ../pidgin/gtkdialogs.c:171
+#: ../pidgin/gtkdialogs.c:170 ../pidgin/gtkdialogs.c:171
+#: ../pidgin/gtkdialogs.c:172
 msgid "Kurdish"
 msgstr "Curdo"
 
-#: ../pidgin/gtkdialogs.c:172 ../pidgin/gtkdialogs.c:233
-#: ../pidgin/gtkdialogs.c:234
+#: ../pidgin/gtkdialogs.c:173 ../pidgin/gtkdialogs.c:236
+#: ../pidgin/gtkdialogs.c:237
 msgid "Lithuanian"
 msgstr "Lituano"
 
-#: ../pidgin/gtkdialogs.c:173 ../pidgin/gtkdialogs.c:174
-#: ../pidgin/gtkdialogs.c:235
+#: ../pidgin/gtkdialogs.c:174 ../pidgin/gtkdialogs.c:175
+#: ../pidgin/gtkdialogs.c:238
 msgid "Macedonian"
 msgstr "Macedônio"
 
-#: ../pidgin/gtkdialogs.c:175
+#: ../pidgin/gtkdialogs.c:176
 msgid "Bokmål Norwegian"
 msgstr "Dano-Norueguês"
 
-#: ../pidgin/gtkdialogs.c:176
+#: ../pidgin/gtkdialogs.c:177
 msgid "Nepali"
 msgstr "Nepalês"
 
-#: ../pidgin/gtkdialogs.c:177
+#: ../pidgin/gtkdialogs.c:178
 msgid "Dutch, Flemish"
 msgstr "Holandês, Flamengo"
 
-#: ../pidgin/gtkdialogs.c:178
+#: ../pidgin/gtkdialogs.c:179
 msgid "Norwegian"
 msgstr "Norueguês"
 
-#: ../pidgin/gtkdialogs.c:179 ../pidgin/gtkdialogs.c:180
-#: ../pidgin/gtkdialogs.c:181 ../pidgin/gtkdialogs.c:236
+#: ../pidgin/gtkdialogs.c:180
+msgid "Norwegian Nynorsk"
+msgstr "Novo norueguês"
+
+#: ../pidgin/gtkdialogs.c:181 ../pidgin/gtkdialogs.c:182
+#: ../pidgin/gtkdialogs.c:183 ../pidgin/gtkdialogs.c:239
 msgid "Polish"
 msgstr "Polonês"
 
-#: ../pidgin/gtkdialogs.c:182
+#: ../pidgin/gtkdialogs.c:184
 msgid "Portuguese"
 msgstr "Português"
 
-#: ../pidgin/gtkdialogs.c:183
-msgid "Portuguese-Brazil"
-msgstr "Português do Brasil"
-
-#: ../pidgin/gtkdialogs.c:184
-msgid "Pashto"
-msgstr "Afegão"
-
 #: ../pidgin/gtkdialogs.c:185
+msgid "Portuguese-Brazil"
+msgstr "Português do Brasil"
+
+#: ../pidgin/gtkdialogs.c:186
+msgid "Pashto"
+msgstr "Afegão"
+
+#: ../pidgin/gtkdialogs.c:187
 msgid "Romanian"
 msgstr "Romeno"
 
-#: ../pidgin/gtkdialogs.c:186 ../pidgin/gtkdialogs.c:237
-#: ../pidgin/gtkdialogs.c:238
+#: ../pidgin/gtkdialogs.c:188 ../pidgin/gtkdialogs.c:240
+#: ../pidgin/gtkdialogs.c:241
 msgid "Russian"
 msgstr "Russo"
 
-#: ../pidgin/gtkdialogs.c:187 ../pidgin/gtkdialogs.c:188
-#: ../pidgin/gtkdialogs.c:239 ../pidgin/gtkdialogs.c:240
-#: ../pidgin/gtkdialogs.c:241
+#: ../pidgin/gtkdialogs.c:189 ../pidgin/gtkdialogs.c:190
+#: ../pidgin/gtkdialogs.c:242 ../pidgin/gtkdialogs.c:243
+#: ../pidgin/gtkdialogs.c:244
 msgid "Slovak"
 msgstr "Eslovaco"
 
-#: ../pidgin/gtkdialogs.c:189 ../pidgin/gtkdialogs.c:242
+#: ../pidgin/gtkdialogs.c:191 ../pidgin/gtkdialogs.c:245
 msgid "Slovenian"
 msgstr "Esloveno"
 
-#: ../pidgin/gtkdialogs.c:190
+#: ../pidgin/gtkdialogs.c:192
 msgid "Albanian"
 msgstr "Albanês"
 
-#: ../pidgin/gtkdialogs.c:191 ../pidgin/gtkdialogs.c:192
+#: ../pidgin/gtkdialogs.c:193 ../pidgin/gtkdialogs.c:194
 msgid "Serbian"
 msgstr "Sérvio"
 
-#: ../pidgin/gtkdialogs.c:193 ../pidgin/gtkdialogs.c:243
+#: ../pidgin/gtkdialogs.c:195 ../pidgin/gtkdialogs.c:246
 msgid "Swedish"
 msgstr "Sueco"
 
-#: ../pidgin/gtkdialogs.c:194
+#: ../pidgin/gtkdialogs.c:196
 msgid "Tamil"
 msgstr "Tamil"
 
-#: ../pidgin/gtkdialogs.c:195
+#: ../pidgin/gtkdialogs.c:197
 msgid "Telugu"
 msgstr "Telugu"
 
-#: ../pidgin/gtkdialogs.c:196
+#: ../pidgin/gtkdialogs.c:198
 msgid "Thai"
 msgstr "Tailandês"
 
-#: ../pidgin/gtkdialogs.c:197 ../pidgin/gtkdialogs.c:244
+#: ../pidgin/gtkdialogs.c:199 ../pidgin/gtkdialogs.c:247
 msgid "Turkish"
 msgstr "Turco"
 
-#: ../pidgin/gtkdialogs.c:198
+#: ../pidgin/gtkdialogs.c:200
 msgid "Vietnamese"
 msgstr "Vietnamita"
 
-#: ../pidgin/gtkdialogs.c:198
+#: ../pidgin/gtkdialogs.c:200
 msgid "T.M.Thanh and the Gnome-Vi Team"
 msgstr "T.M.Thanh e o time do Gnome-Vi"
 
-#: ../pidgin/gtkdialogs.c:199 ../pidgin/gtkdialogs.c:245
+#: ../pidgin/gtkdialogs.c:201 ../pidgin/gtkdialogs.c:248
 msgid "Simplified Chinese"
 msgstr "Chinês Simplificado"
 
-#: ../pidgin/gtkdialogs.c:200 ../pidgin/gtkdialogs.c:201
-#: ../pidgin/gtkdialogs.c:202
+#: ../pidgin/gtkdialogs.c:202 ../pidgin/gtkdialogs.c:203
+#: ../pidgin/gtkdialogs.c:204
 msgid "Hong Kong Chinese"
 msgstr "Chinês de Hong Kong"
 
-#: ../pidgin/gtkdialogs.c:203 ../pidgin/gtkdialogs.c:204
-#: ../pidgin/gtkdialogs.c:246
+#: ../pidgin/gtkdialogs.c:205 ../pidgin/gtkdialogs.c:206
+#: ../pidgin/gtkdialogs.c:249
 msgid "Traditional Chinese"
 msgstr "Chinês Tradicional"
 
-#: ../pidgin/gtkdialogs.c:210
+#: ../pidgin/gtkdialogs.c:212
 msgid "Amharic"
 msgstr "Amhárico"
 
-#: ../pidgin/gtkdialogs.c:331
+#: ../pidgin/gtkdialogs.c:334
 #, c-format
 msgid "About %s"
 msgstr "Sobre o %s"
 
-#: ../pidgin/gtkdialogs.c:369
+#: ../pidgin/gtkdialogs.c:372
 #, c-format
 msgid ""
 "%s is a graphical modular messaging client based on libpurple which is "
@@ -13362,43 +13432,43 @@
 "contribuidoes. Veja o arquivo 'COPYRIGHT' para uma lista completa destes "
 "contribuidores. Não oferecemos nenhuma garantia para este programa.<BR><BR>"
 
-#: ../pidgin/gtkdialogs.c:384
+#: ../pidgin/gtkdialogs.c:387
 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:389
+#: ../pidgin/gtkdialogs.c:392
 msgid "Current Developers"
 msgstr "Desenvolvedores atuais"
 
-#: ../pidgin/gtkdialogs.c:404
+#: ../pidgin/gtkdialogs.c:407
 msgid "Crazy Patch Writers"
 msgstr "Escritores de patch malucos"
 
-#: ../pidgin/gtkdialogs.c:419
+#: ../pidgin/gtkdialogs.c:422
 msgid "Retired Developers"
 msgstr "Desenvolvedores aposentados"
 
-#: ../pidgin/gtkdialogs.c:434
+#: ../pidgin/gtkdialogs.c:437
 msgid "Artists"
 msgstr "Artistas"
 
-#: ../pidgin/gtkdialogs.c:449
+#: ../pidgin/gtkdialogs.c:452
 msgid "Current Translators"
 msgstr "Atuais tradutores"
 
-#: ../pidgin/gtkdialogs.c:469
+#: ../pidgin/gtkdialogs.c:472
 msgid "Past Translators"
 msgstr "Antigos tradutores"
 
-#: ../pidgin/gtkdialogs.c:487
+#: ../pidgin/gtkdialogs.c:490
 msgid "Debugging Information"
 msgstr "Informações de depuração"
 
-#: ../pidgin/gtkdialogs.c:865
+#: ../pidgin/gtkdialogs.c:859
 msgid "Get User Info"
 msgstr "Ver informações do usuário"
 
-#: ../pidgin/gtkdialogs.c:867
+#: ../pidgin/gtkdialogs.c:861
 msgid ""
 "Please enter the screen name or alias of the person whose info you would "
 "like to view."
@@ -13406,43 +13476,43 @@
 "Por favor digite o nome de usuário da pessoa cuja informação você gostaria "
 "de ver."
 
-#: ../pidgin/gtkdialogs.c:957
+#: ../pidgin/gtkdialogs.c:951
 msgid "View User Log"
 msgstr "Ver log do usuário"
 
-#: ../pidgin/gtkdialogs.c:959
+#: ../pidgin/gtkdialogs.c:953
 msgid ""
 "Please enter the screen name or alias of the person whose log you would like "
 "to view."
 msgstr ""
 "Por favor digite o nome de usuário da pessoa cujo log você gostaria de ver."
 
-#: ../pidgin/gtkdialogs.c:979
+#: ../pidgin/gtkdialogs.c:973
 msgid "Alias Contact"
 msgstr "Apelidar contato"
 
-#: ../pidgin/gtkdialogs.c:980
+#: ../pidgin/gtkdialogs.c:974
 msgid "Enter an alias for this contact."
 msgstr "Digite um apelido para este contato."
 
-#: ../pidgin/gtkdialogs.c:1002
+#: ../pidgin/gtkdialogs.c:996
 #, c-format
 msgid "Enter an alias for %s."
 msgstr "Digite um apelido para %s."
 
-#: ../pidgin/gtkdialogs.c:1004
+#: ../pidgin/gtkdialogs.c:998
 msgid "Alias Buddy"
 msgstr "Apelidar amigo"
 
-#: ../pidgin/gtkdialogs.c:1025
+#: ../pidgin/gtkdialogs.c:1019
 msgid "Alias Chat"
 msgstr "Apelidar bate-papo"
 
-#: ../pidgin/gtkdialogs.c:1026
+#: ../pidgin/gtkdialogs.c:1020
 msgid "Enter an alias for this chat."
 msgstr "Digite um apelido para este bate-papo."
 
-#: ../pidgin/gtkdialogs.c:1065
+#: ../pidgin/gtkdialogs.c:1059
 #, c-format
 msgid ""
 "You are about to remove the contact containing %s and %d other buddy from "
@@ -13457,15 +13527,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:1073
+#: ../pidgin/gtkdialogs.c:1067
 msgid "Remove Contact"
 msgstr "Remover contato"
 
-#: ../pidgin/gtkdialogs.c:1076
+#: ../pidgin/gtkdialogs.c:1070
 msgid "_Remove Contact"
 msgstr "_Remover contato"
 
-#: ../pidgin/gtkdialogs.c:1107
+#: ../pidgin/gtkdialogs.c:1101
 #, c-format
 msgid ""
 "You are about to merge the group called %s into the group called %s. Do you "
@@ -13474,15 +13544,15 @@
 "Você está prestes a mesclar o grupo %s com o grupo chamado %s. Deseja "
 "continuar?"
 
-#: ../pidgin/gtkdialogs.c:1114
+#: ../pidgin/gtkdialogs.c:1108
 msgid "Merge Groups"
 msgstr "Mesclar grupos"
 
-#: ../pidgin/gtkdialogs.c:1117
+#: ../pidgin/gtkdialogs.c:1111
 msgid "_Merge Groups"
 msgstr "_Mesclar grupos"
 
-#: ../pidgin/gtkdialogs.c:1167
+#: ../pidgin/gtkdialogs.c:1161
 #, c-format
 msgid ""
 "You are about to remove the group %s and all its members from your buddy "
@@ -13491,30 +13561,30 @@
 "Você está prestes a remover o grupo %s e todos os seus membros da sua lista "
 "de amigos. Deseja continuar?"
 
-#: ../pidgin/gtkdialogs.c:1170
+#: ../pidgin/gtkdialogs.c:1164
 msgid "Remove Group"
 msgstr "Remover grupo"
 
-#: ../pidgin/gtkdialogs.c:1173
+#: ../pidgin/gtkdialogs.c:1167
 msgid "_Remove Group"
 msgstr "_Remover grupo"
 
-#: ../pidgin/gtkdialogs.c:1206
+#: ../pidgin/gtkdialogs.c:1200
 #, 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:1209
+#: ../pidgin/gtkdialogs.c:1203
 msgid "Remove Buddy"
 msgstr "Remover amigo"
 
-#: ../pidgin/gtkdialogs.c:1212
+#: ../pidgin/gtkdialogs.c:1206
 msgid "_Remove Buddy"
 msgstr "_Remover amigo"
 
-#: ../pidgin/gtkdialogs.c:1233
+#: ../pidgin/gtkdialogs.c:1227
 #, c-format
 msgid ""
 "You are about to remove the chat %s from your buddy list.  Do you want to "
@@ -13523,11 +13593,11 @@
 "Você está prestes a remover o bate-papo %s da sua lista de amigos. Deseja "
 "continuar?"
 
-#: ../pidgin/gtkdialogs.c:1236
+#: ../pidgin/gtkdialogs.c:1230
 msgid "Remove Chat"
 msgstr "Remover bate-papo"
 
-#: ../pidgin/gtkdialogs.c:1239
+#: ../pidgin/gtkdialogs.c:1233
 msgid "_Remove Chat"
 msgstr "_Remover bate-papo"
 
@@ -13622,67 +13692,67 @@
 msgid "Time Remaining:"
 msgstr "Tempo restante:"
 
-#: ../pidgin/gtkft.c:786
+#: ../pidgin/gtkft.c:783
 msgid "Close this window when all transfers _finish"
 msgstr "_Feche esta janela quando todas as transferências terminarem"
 
-#: ../pidgin/gtkft.c:796
+#: ../pidgin/gtkft.c:793
 msgid "C_lear finished transfers"
 msgstr "Limpar transferências _concluídas"
 
 #. "Download Details" arrow
-#: ../pidgin/gtkft.c:805
+#: ../pidgin/gtkft.c:802
 msgid "File transfer _details"
 msgstr "_Detalhes da transferência"
 
 #. Pause button
-#: ../pidgin/gtkft.c:835 ../pidgin/pidginstock.c:89
+#: ../pidgin/gtkft.c:832 ../pidgin/pidginstock.c:89
 msgid "_Pause"
 msgstr "_Pausar"
 
 #. Resume button
-#: ../pidgin/gtkft.c:845
+#: ../pidgin/gtkft.c:842
 msgid "_Resume"
 msgstr "_Continuar"
 
-#: ../pidgin/gtkimhtml.c:796
+#: ../pidgin/gtkimhtml.c:795
 msgid "Paste as Plain _Text"
 msgstr "Colar como _texto puro"
 
-#: ../pidgin/gtkimhtml.c:813
+#: ../pidgin/gtkimhtml.c:812
 msgid "_Reset formatting"
 msgstr "Limpa_r formatação"
 
-#: ../pidgin/gtkimhtml.c:1309
+#: ../pidgin/gtkimhtml.c:1349
 msgid "Hyperlink color"
 msgstr "Cor do hyperlink"
 
-#: ../pidgin/gtkimhtml.c:1310
+#: ../pidgin/gtkimhtml.c:1350
 msgid "Color to draw hyperlinks."
 msgstr "Cor a ser usada para desenhar os hyperlinks."
 
-#: ../pidgin/gtkimhtml.c:1313
+#: ../pidgin/gtkimhtml.c:1353
 msgid "Hyperlink prelight color"
 msgstr "Cor do hyperlink sob o cursor"
 
-#: ../pidgin/gtkimhtml.c:1314
+#: ../pidgin/gtkimhtml.c:1354
 msgid "Color to draw hyperlinks when mouse is over them."
 msgstr ""
 "Cor a ser usada para desenhar os hyperlinks quando o mouse está sobre eles."
 
-#: ../pidgin/gtkimhtml.c:1530
+#: ../pidgin/gtkimhtml.c:1575
 msgid "_Copy E-Mail Address"
 msgstr "_Copiar endereço de e-mail"
 
-#: ../pidgin/gtkimhtml.c:1542
+#: ../pidgin/gtkimhtml.c:1587
 msgid "_Open Link in Browser"
 msgstr "_Abrir link no navegador"
 
-#: ../pidgin/gtkimhtml.c:1552
+#: ../pidgin/gtkimhtml.c:1597
 msgid "_Copy Link Location"
 msgstr "_Copiar endereço do link"
 
-#: ../pidgin/gtkimhtml.c:3227
+#: ../pidgin/gtkimhtml.c:3341
 msgid ""
 "<span size='larger' weight='bold'>Unrecognized file type</span>\n"
 "\n"
@@ -13692,7 +13762,7 @@
 "\n"
 "Usando o tipo padrão, PNG."
 
-#: ../pidgin/gtkimhtml.c:3230
+#: ../pidgin/gtkimhtml.c:3344
 msgid ""
 "Unrecognized file type\n"
 "\n"
@@ -13702,7 +13772,7 @@
 "\n"
 "Usando o tipo padrão, PNG."
 
-#: ../pidgin/gtkimhtml.c:3259
+#: ../pidgin/gtkimhtml.c:3373
 #, c-format
 msgid ""
 "<span size='larger' weight='bold'>Error saving image</span>\n"
@@ -13713,7 +13783,7 @@
 "\n"
 "%s"
 
-#: ../pidgin/gtkimhtml.c:3262
+#: ../pidgin/gtkimhtml.c:3376
 #, c-format
 msgid ""
 "Error saving image\n"
@@ -13724,35 +13794,35 @@
 "\n"
 "%s"
 
-#: ../pidgin/gtkimhtml.c:3340 ../pidgin/gtkimhtml.c:3352
+#: ../pidgin/gtkimhtml.c:3454 ../pidgin/gtkimhtml.c:3466
 msgid "Save Image"
 msgstr "Salvar imagem"
 
-#: ../pidgin/gtkimhtml.c:3380
+#: ../pidgin/gtkimhtml.c:3494
 msgid "_Save Image..."
 msgstr "_Salvar imagem..."
 
-#: ../pidgin/gtkimhtmltoolbar.c:151
+#: ../pidgin/gtkimhtmltoolbar.c:153
 msgid "Select Font"
 msgstr "Selecionar fonte"
 
-#: ../pidgin/gtkimhtmltoolbar.c:230
+#: ../pidgin/gtkimhtmltoolbar.c:232
 msgid "Select Text Color"
 msgstr "Selecionar cor do texto"
 
-#: ../pidgin/gtkimhtmltoolbar.c:309
+#: ../pidgin/gtkimhtmltoolbar.c:311
 msgid "Select Background Color"
 msgstr "Selecionar cor de fundo"
 
-#: ../pidgin/gtkimhtmltoolbar.c:398
+#: ../pidgin/gtkimhtmltoolbar.c:400
 msgid "_URL"
 msgstr "_URL"
 
-#: ../pidgin/gtkimhtmltoolbar.c:406
+#: ../pidgin/gtkimhtmltoolbar.c:408
 msgid "_Description"
 msgstr "_Descrição"
 
-#: ../pidgin/gtkimhtmltoolbar.c:409
+#: ../pidgin/gtkimhtmltoolbar.c:411
 msgid ""
 "Please enter the URL and description of the link that you want to insert. "
 "The description is optional."
@@ -13760,85 +13830,93 @@
 "Por favor digite a URL e a descrição do link que você gostaria de inserir.  "
 "A descrição é opcional."
 
-#: ../pidgin/gtkimhtmltoolbar.c:413
+#: ../pidgin/gtkimhtmltoolbar.c:415
 msgid "Please enter the URL of the link that you want to insert."
 msgstr "Por favor digite a URL do link que você gostaria de inserir."
 
-#: ../pidgin/gtkimhtmltoolbar.c:418
+#: ../pidgin/gtkimhtmltoolbar.c:420
 msgid "Insert Link"
 msgstr "Inserir link"
 
-#: ../pidgin/gtkimhtmltoolbar.c:422
+#: ../pidgin/gtkimhtmltoolbar.c:424 ../pidgin/gtkimhtmltoolbar.c:1155
 msgid "_Insert"
 msgstr "_Inserir"
 
-#: ../pidgin/gtkimhtmltoolbar.c:491
+#: ../pidgin/gtkimhtmltoolbar.c:493
 #, c-format
 msgid "Failed to store image: %s\n"
 msgstr "Não foi possível armazenar imagem: %s\n"
 
-#: ../pidgin/gtkimhtmltoolbar.c:517 ../pidgin/gtkimhtmltoolbar.c:527
+#: ../pidgin/gtkimhtmltoolbar.c:519 ../pidgin/gtkimhtmltoolbar.c:529
 msgid "Insert Image"
 msgstr "Inserir imagem"
 
-#: ../pidgin/gtkimhtmltoolbar.c:725
+#: ../pidgin/gtkimhtmltoolbar.c:740
 msgid "This theme has no available smileys."
 msgstr "Este tema não possui emoticons disponíveis."
 
 #. show everything
-#: ../pidgin/gtkimhtmltoolbar.c:739
+#: ../pidgin/gtkimhtmltoolbar.c:757
 msgid "Smile!"
 msgstr "Emoticon!"
 
-#: ../pidgin/gtkimhtmltoolbar.c:926 ../pidgin/plugins/convcolors.c:287
-msgid "Bold"
-msgstr "Negrito"
-
-#: ../pidgin/gtkimhtmltoolbar.c:937 ../pidgin/plugins/convcolors.c:294
-msgid "Italic"
-msgstr "Itálico"
-
-#: ../pidgin/gtkimhtmltoolbar.c:948 ../pidgin/plugins/convcolors.c:301
-msgid "Underline"
-msgstr "Sublinhado"
-
-#: ../pidgin/gtkimhtmltoolbar.c:964
-msgid "Larger font size"
-msgstr "Maior tamanho de fonte"
-
-#: ../pidgin/gtkimhtmltoolbar.c:976
-msgid "Smaller font size"
-msgstr "Menor tamanho de fonte"
-
-#: ../pidgin/gtkimhtmltoolbar.c:993
-msgid "Font face"
-msgstr "Fonte"
-
-#: ../pidgin/gtkimhtmltoolbar.c:1005
-msgid "Foreground font color"
-msgstr "Cor da fonte"
-
-#: ../pidgin/gtkimhtmltoolbar.c:1017
-msgid "Background color"
-msgstr "Cor do fundo"
-
-#: ../pidgin/gtkimhtmltoolbar.c:1033
-msgid "Reset formatting"
-msgstr "Limpar formatação"
-
-#: ../pidgin/gtkimhtmltoolbar.c:1048
-msgid "Insert link"
-msgstr "Inserir link"
-
-#: ../pidgin/gtkimhtmltoolbar.c:1058
-msgid "Insert image"
-msgstr "Inserir imagem"
+#: ../pidgin/gtkimhtmltoolbar.c:1064
+msgid "_Bold"
+msgstr "_Negrito"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1065
+msgid "_Italic"
+msgstr "_Itálico"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1066
+msgid "_Underline"
+msgstr "_Sublinhado"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1067
+msgid "_Larger"
+msgstr "_Maior"
 
 #: ../pidgin/gtkimhtmltoolbar.c:1069
-msgid "Insert smiley"
-msgstr "Inserir emoticon"
-
-#: ../pidgin/gtklog.c:267
+msgid "_Normal"
+msgstr "N_ormal"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1071
+msgid "_Smaller"
+msgstr "M_enor"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1072
+msgid "_Font face"
+msgstr "_Fonte"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1073
+msgid "_Foreground color"
+msgstr "_Cor da fonte"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1074
+msgid "_Background color"
+msgstr "Co_r do fundo"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1100
+msgid "_Font"
+msgstr "_Fonte"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1135
+msgid "_Reset font"
+msgstr "Limpa_r fonte"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1162
+msgid "_Smiley"
+msgstr "_Emoticon!"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1168
+msgid "_Image"
+msgstr "Ima_gem"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1174
+msgid "_Link"
+msgstr "_Link"
+
+#: ../pidgin/gtklog.c:292
 #, c-format
 msgid ""
 "Are you sure you want to permanently delete the log of the conversation with "
@@ -13847,7 +13925,7 @@
 "Você tem certeza de que deseja remover permanentemente o registro da "
 "conversa com %s, que começou às %s?"
 
-#: ../pidgin/gtklog.c:278
+#: ../pidgin/gtklog.c:303
 #, c-format
 msgid ""
 "Are you sure you want to permanently delete the log of the conversation in %"
@@ -13856,7 +13934,7 @@
 "Você tem certeza de que deseja remover permanentemente o registro da "
 "conversa em %s, que começou às %s?"
 
-#: ../pidgin/gtklog.c:283
+#: ../pidgin/gtklog.c:308
 #, c-format
 msgid ""
 "Are you sure you want to permanently delete the system log which started at %"
@@ -13865,21 +13943,21 @@
 "Você tem certeza de que deseja remover permanentemente o registro do sistema "
 "que começou às %s?"
 
-#: ../pidgin/gtklog.c:427
+#: ../pidgin/gtklog.c:452
 #, 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:430
+#: ../pidgin/gtklog.c:455
 #, 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:477
+#: ../pidgin/gtklog.c:502
 msgid "%B %Y"
 msgstr "%B %Y"
 
-#: ../pidgin/gtklog.c:524
+#: ../pidgin/gtklog.c:549
 msgid ""
 "System events will only be logged if the \"Log all status changes to system "
 "log\" preference is enabled."
@@ -13887,7 +13965,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:528
+#: ../pidgin/gtklog.c:553
 msgid ""
 "Instant messages will only be logged if the \"Log all instant messages\" "
 "preference is enabled."
@@ -13895,46 +13973,46 @@
 "As mensagens instantâneas somente serão gravadas se a preferência \"Gravar "
 "todas as mensagens instantâneas\" estiver ativada."
 
-#: ../pidgin/gtklog.c:531
+#: ../pidgin/gtklog.c:556
 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:535
+#: ../pidgin/gtklog.c:560
 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:550
+#: ../pidgin/gtklog.c:575
 msgid "_Browse logs folder"
 msgstr "_Navegar na pasta de logs"
 
-#: ../pidgin/gtklog.c:614
+#: ../pidgin/gtklog.c:639
 msgid "Total log size:"
 msgstr "Tamanho total do log:"
 
-#: ../pidgin/gtklog.c:683
+#: ../pidgin/gtklog.c:708
 #, c-format
 msgid "Conversations in %s"
 msgstr "Conversas no %s"
 
-#: ../pidgin/gtklog.c:691 ../pidgin/gtklog.c:753
+#: ../pidgin/gtklog.c:716 ../pidgin/gtklog.c:778
 #, c-format
 msgid "Conversations with %s"
 msgstr "Conversas com %s"
 
-#: ../pidgin/gtklog.c:778
+#: ../pidgin/gtklog.c:803
 msgid "System Log"
 msgstr "Log do sistema"
 
-#: ../pidgin/gtkmain.c:368
+#: ../pidgin/gtkmain.c:385
 #, 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:370
+#: ../pidgin/gtkmain.c:387
 #, c-format
 msgid ""
 "%s %s\n"
@@ -13943,6 +14021,7 @@
 "  -c, --config=DIR    use DIR for config files\n"
 "  -d, --debug         print debugging messages to stdout\n"
 "  -h, --help          display this help and exit\n"
+"  -m, --multiple      do not ensure single instance\n"
 "  -n, --nologin       don't automatically login\n"
 "  -l, --login[=NAME]  automatically login (optional argument NAME specifies\n"
 "                      account(s) to use, separated by commas)\n"
@@ -13955,12 +14034,13 @@
 "  -d, --debug         imprima mensagens de depuração para a saída padrão\n"
 "  -h, --help          exiba esta ajuda e saia\n"
 "  -n, --nologin       não conecte automaticamente\n"
+"  -m, --multiple      permitir uso simultâneo de mais de uma instância\n"
 "  -l, --login[=NAME]  conecte automaticamente (argumento opcional NOME\n"
 "                      especifica as contas a serem usadas, separadas por\n"
 "                      vírgula)\n"
 "  -v, --version       exiba a versão atual e saia\n"
 
-#: ../pidgin/gtkmain.c:490
+#: ../pidgin/gtkmain.c:511
 #, c-format
 msgid ""
 "%s has segfaulted and attempted to dump a core file.\n"
@@ -13969,7 +14049,7 @@
 "\n"
 "If you can reproduce the crash, please notify the developers\n"
 "by reporting a bug at:\n"
-"%snewticket/\n"
+"%ssimpleticket/\n"
 "\n"
 "Please make sure to specify what you were doing at the time\n"
 "and post the backtrace from the core file.  If you do not know\n"
@@ -13988,7 +14068,7 @@
 "\n"
 "Se você consegue fazer o erro ocorrer de novo, favor notificar os\n"
 "desenvolvedores do Pidgin reportando um bug em\n"
-"%snewticket/\n"
+"%ssimpleticket/\n"
 "\n"
 "Favor especificar o que você estava fazendo na hora em que o erro ocorreu\n"
 "e enviar o backtrace do arquivo de core.  Se você não sabe\n"
@@ -14000,48 +14080,50 @@
 "do Sean e do Luke em outros protocolos estão disponíveis em\n"
 "%swiki/DeveloperPages\n"
 
-#: ../pidgin/gtknotify.c:337
+#. Translators may want to transliterate the name.
+#. It is not to be translated.
+#: ../pidgin/gtkmain.c:697 ../pidgin/pidgin.h:50
+msgid "Pidgin"
+msgstr "Pidgin"
+
+#: ../pidgin/gtknotify.c:343
 msgid "Open All Messages"
 msgstr "Abrir todas as mensagens"
 
-#: ../pidgin/gtknotify.c:389
+#: ../pidgin/gtknotify.c:395
 msgid "<span weight=\"bold\" size=\"larger\">You have mail!</span>"
 msgstr "<span weight=\"bold\" size=\"larger\">Você tem e-mail!</span>"
 
-#: ../pidgin/gtknotify.c:483
-msgid "Sender"
-msgstr "Remetente"
-
-#: ../pidgin/gtknotify.c:509
+#: ../pidgin/gtknotify.c:515
 #, c-format
 msgid "%s has %d new message."
 msgid_plural "%s has %d new messages."
 msgstr[0] "%s tem %d nova mensagem."
 msgstr[1] "%s tem %d novas mensagens."
 
-#: ../pidgin/gtknotify.c:520
+#: ../pidgin/gtknotify.c:526
 #, c-format
 msgid "<b>You have %d new e-mail.</b>"
 msgid_plural "<b>You have %d new e-mails.</b>"
 msgstr[0] "<b>Você tem %d novo e-mail.</b>"
 msgstr[1] "<b>Você tem %d novos e-mails.</b>"
 
-#: ../pidgin/gtknotify.c:951
+#: ../pidgin/gtknotify.c:965
 #, c-format
 msgid "The browser command \"%s\" is invalid."
 msgstr "O comando de navegador \"%s\" é inválido."
 
-#: ../pidgin/gtknotify.c:953 ../pidgin/gtknotify.c:965
-#: ../pidgin/gtknotify.c:978 ../pidgin/gtknotify.c:1106
+#: ../pidgin/gtknotify.c:967 ../pidgin/gtknotify.c:979
+#: ../pidgin/gtknotify.c:992 ../pidgin/gtknotify.c:1120
 msgid "Unable to open URL"
 msgstr "Não foi possível abrir URL"
 
-#: ../pidgin/gtknotify.c:963 ../pidgin/gtknotify.c:976
+#: ../pidgin/gtknotify.c:977 ../pidgin/gtknotify.c:990
 #, c-format
 msgid "Error launching \"%s\": %s"
 msgstr "Erro ao executar \"%s\": %s"
 
-#: ../pidgin/gtknotify.c:1107
+#: ../pidgin/gtknotify.c:1121
 msgid ""
 "The 'Manual' browser command has been chosen, but no command has been set."
 msgstr ""
@@ -14090,108 +14172,117 @@
 msgid "<b>Plugin Details</b>"
 msgstr "<b>Detalhes do plugin</b>"
 
-#: ../pidgin/gtkpounce.c:155
+#: ../pidgin/gtkpounce.c:156
 msgid "Select a file"
 msgstr "Selecione um arquivo"
 
 #. Create the "Pounce on Whom" frame.
-#: ../pidgin/gtkpounce.c:524
+#: ../pidgin/gtkpounce.c:533
 msgid "Pounce on Whom"
 msgstr "Quem terá a ação"
 
-#: ../pidgin/gtkpounce.c:551
+#: ../pidgin/gtkpounce.c:560
 msgid "_Buddy name:"
 msgstr "_Nome do amigo:"
 
-#: ../pidgin/gtkpounce.c:585
+#: ../pidgin/gtkpounce.c:594
 msgid "Si_gns on"
 msgstr "_Conectar"
 
-#: ../pidgin/gtkpounce.c:587
+#: ../pidgin/gtkpounce.c:596
 msgid "Signs o_ff"
 msgstr "_Desconectar"
 
-#: ../pidgin/gtkpounce.c:589
+#: ../pidgin/gtkpounce.c:598
 msgid "Goes a_way"
 msgstr "O amigo ficar _ausente"
 
-#: ../pidgin/gtkpounce.c:591
+#: ../pidgin/gtkpounce.c:600
 msgid "Ret_urns from away"
 msgstr "Volta_r da ausência"
 
-#: ../pidgin/gtkpounce.c:593
+#: ../pidgin/gtkpounce.c:602
 msgid "Becomes _idle"
 msgstr "Tornar-se _inativo"
 
-#: ../pidgin/gtkpounce.c:595
+#: ../pidgin/gtkpounce.c:604
 msgid "Is no longer i_dle"
 msgstr "Não estiver mais i_nativo"
 
-#: ../pidgin/gtkpounce.c:597
+#: ../pidgin/gtkpounce.c:606
 msgid "Starts _typing"
 msgstr "C_omeçar a digitar"
 
-#: ../pidgin/gtkpounce.c:599
+#: ../pidgin/gtkpounce.c:608
 msgid "P_auses while typing"
 msgstr "P_ausar ao digitar"
 
-#: ../pidgin/gtkpounce.c:601
+#: ../pidgin/gtkpounce.c:610
 msgid "Stops t_yping"
 msgstr "Parar de di_gitar"
 
-#: ../pidgin/gtkpounce.c:603
+#: ../pidgin/gtkpounce.c:612
 msgid "Sends a _message"
 msgstr "En_viar uma mensagem"
 
-#: ../pidgin/gtkpounce.c:646
+#: ../pidgin/gtkpounce.c:655
 msgid "Ope_n an IM window"
 msgstr "Abrir uma jan_ela de MI"
 
-#: ../pidgin/gtkpounce.c:648
+#: ../pidgin/gtkpounce.c:657
 msgid "_Pop up a notification"
 msgstr "Exibir notificação _popup"
 
-#: ../pidgin/gtkpounce.c:650
+#: ../pidgin/gtkpounce.c:659
 msgid "Send a _message"
 msgstr "Envia_r uma mensagem"
 
-#: ../pidgin/gtkpounce.c:652
-msgid "E_xecute a command"
-msgstr "E_xecutar um comando"
-
-#: ../pidgin/gtkpounce.c:654
-msgid "P_lay a sound"
-msgstr "Tocar um _som"
-
-#: ../pidgin/gtkpounce.c:659
-msgid "Brows_e..."
-msgstr "Proc_urar..."
-
 #: ../pidgin/gtkpounce.c:661
+msgid "E_xecute a command"
+msgstr "E_xecutar um comando"
+
+#: ../pidgin/gtkpounce.c:663
+msgid "P_lay a sound"
+msgstr "Tocar um _som"
+
+#: ../pidgin/gtkpounce.c:669
+msgid "Brows_e..."
+msgstr "Proc_urar..."
+
+#: ../pidgin/gtkpounce.c:671
 msgid "Br_owse..."
 msgstr "Proc_urar..."
 
-#: ../pidgin/gtkpounce.c:662
+#: ../pidgin/gtkpounce.c:672
 msgid "Pre_view"
 msgstr "Pré-_visualizar"
 
-#: ../pidgin/gtkpounce.c:786
+#: ../pidgin/gtkpounce.c:799
 msgid "P_ounce only when my status is not Available"
 msgstr "_Executar apenas quando meu status não for Disponível"
 
-#: ../pidgin/gtkpounce.c:791
+#: ../pidgin/gtkpounce.c:804
 msgid "_Recurring"
 msgstr "_Recorrente"
 
-#: ../pidgin/gtkpounce.c:1247
+#: ../pidgin/gtkpounce.c:1260
 msgid "Pounce Target"
 msgstr "Alvo da ação"
 
-#: ../pidgin/gtkprefs.c:509
+#: ../pidgin/gtkprefs.c:385
+#: ../pidgin/pixmaps/emotes/default/22/default.theme.in.h:1
+msgid "Default"
+msgstr "Padrão"
+
+#: ../pidgin/gtkprefs.c:516
 msgid "Smiley theme failed to unpack."
 msgstr "O tema de emoticons não pôde ser descompactado."
 
-#: ../pidgin/gtkprefs.c:638
+#: ../pidgin/gtkprefs.c:643
+msgid "Install Theme"
+msgstr "Instalar tema"
+
+#: ../pidgin/gtkprefs.c:696
 msgid ""
 "Select a smiley theme that you would like to use from the list below. New "
 "themes can be installed by dragging and dropping them onto the theme list."
@@ -14199,255 +14290,259 @@
 "Selecione um tema de emoticons que você gostaria de usar da lista abaixo. "
 "Novos temas podem ser instalados arrastando e soltando-os na lista de temas."
 
-#: ../pidgin/gtkprefs.c:673
+#: ../pidgin/gtkprefs.c:731
 msgid "Icon"
 msgstr "Ícone"
 
-#: ../pidgin/gtkprefs.c:816
+#: ../pidgin/gtkprefs.c:893
 msgid "System Tray Icon"
 msgstr "Ícone da bandeja"
 
-#: ../pidgin/gtkprefs.c:817
+#: ../pidgin/gtkprefs.c:894
 msgid "_Show system tray icon:"
 msgstr "Mo_strar ícone da bandeja"
 
-#: ../pidgin/gtkprefs.c:819 ../pidgin/gtkprefs.c:831 ../pidgin/gtkprefs.c:1686
+#: ../pidgin/gtkprefs.c:896 ../pidgin/gtkprefs.c:908 ../pidgin/gtkprefs.c:1756
 #: ../pidgin/plugins/timestamp_format.c:42
 #: ../pidgin/plugins/timestamp_format.c:51
 #: ../pidgin/plugins/win32/winprefs/winprefs.c:338
 msgid "Always"
 msgstr "Sempre"
 
-#: ../pidgin/gtkprefs.c:821
+#: ../pidgin/gtkprefs.c:898
 msgid "On unread messages"
 msgstr "Para as mensagens não lidas"
 
-#: ../pidgin/gtkprefs.c:826
+#: ../pidgin/gtkprefs.c:903
 msgid "Conversation Window Hiding"
 msgstr "Quando esconder as janelas de conversa"
 
-#: ../pidgin/gtkprefs.c:827
+#: ../pidgin/gtkprefs.c:904
 msgid "_Hide new IM conversations:"
 msgstr "_Esconder novas conversas de MI:"
 
-#: ../pidgin/gtkprefs.c:830 ../pidgin/gtkprefs.c:1867
+#: ../pidgin/gtkprefs.c:907 ../pidgin/gtkprefs.c:1937
 msgid "When away"
 msgstr "Quando ausente"
 
 #. All the tab options!
-#: ../pidgin/gtkprefs.c:838
+#: ../pidgin/gtkprefs.c:915
 msgid "Tabs"
 msgstr "Abas"
 
-#: ../pidgin/gtkprefs.c:840
+#: ../pidgin/gtkprefs.c:917
 msgid "Show IMs and chats in _tabbed windows"
 msgstr "Mostrar mensagens instantâneas e bate-papos em janelas com _abas"
 
-#: ../pidgin/gtkprefs.c:854
+#: ../pidgin/gtkprefs.c:931
 msgid "Show close b_utton on tabs"
 msgstr "Mostrar o b_otão de fechar nas abas"
 
-#: ../pidgin/gtkprefs.c:857
+#: ../pidgin/gtkprefs.c:934
 msgid "_Placement:"
 msgstr "_Posicionamento:"
 
-#: ../pidgin/gtkprefs.c:859
+#: ../pidgin/gtkprefs.c:936
 msgid "Top"
 msgstr "Cima"
 
-#: ../pidgin/gtkprefs.c:860
+#: ../pidgin/gtkprefs.c:937
 msgid "Bottom"
 msgstr "Baixo"
 
-#: ../pidgin/gtkprefs.c:861
+#: ../pidgin/gtkprefs.c:938
 msgid "Left"
 msgstr "Esquerda"
 
-#: ../pidgin/gtkprefs.c:862
+#: ../pidgin/gtkprefs.c:939
 msgid "Right"
 msgstr "Direita"
 
-#: ../pidgin/gtkprefs.c:864
+#: ../pidgin/gtkprefs.c:941
 msgid "Left Vertical"
 msgstr "Vertical à esquerda"
 
-#: ../pidgin/gtkprefs.c:865
+#: ../pidgin/gtkprefs.c:942
 msgid "Right Vertical"
 msgstr "Vertical à direita"
 
-#: ../pidgin/gtkprefs.c:872
+#: ../pidgin/gtkprefs.c:949
 msgid "N_ew conversations:"
 msgstr "Novas conv_ersas:"
 
-#: ../pidgin/gtkprefs.c:917
+#: ../pidgin/gtkprefs.c:994
 msgid "Show _formatting on incoming messages"
 msgstr "Mostrar _formatação nas mensagens recebidas"
 
-#: ../pidgin/gtkprefs.c:920
+#: ../pidgin/gtkprefs.c:997
 msgid "Show buddy _icons"
 msgstr "Mostrar í_cones de amigos"
 
-#: ../pidgin/gtkprefs.c:922
+#: ../pidgin/gtkprefs.c:999
 msgid "Enable buddy ic_on animation"
 msgstr "Ativar animação nos íc_ones de amigos"
 
-#: ../pidgin/gtkprefs.c:929
+#: ../pidgin/gtkprefs.c:1006
 msgid "_Notify buddies that you are typing to them"
 msgstr "_Notificar amigos de que você está digitando para eles"
 
-#: ../pidgin/gtkprefs.c:932
+#: ../pidgin/gtkprefs.c:1009
 msgid "Highlight _misspelled words"
 msgstr "Realçar palavras _mal grafadas"
 
-#: ../pidgin/gtkprefs.c:936
+#: ../pidgin/gtkprefs.c:1013
 msgid "Use smooth-scrolling"
 msgstr "Usar rolagem suave"
 
-#: ../pidgin/gtkprefs.c:939
+#: ../pidgin/gtkprefs.c:1016
 msgid "F_lash window when IMs are received"
 msgstr "_Piscar a janela quando mensagens forem recebidas"
 
-#: ../pidgin/gtkprefs.c:943
+#: ../pidgin/gtkprefs.c:1018
+msgid "Minimi_ze new conversation windows"
+msgstr "Minimi_zar novas janelas de conversa"
+
+#: ../pidgin/gtkprefs.c:1022
 msgid "Font"
 msgstr "Fonte"
 
-#: ../pidgin/gtkprefs.c:945
+#: ../pidgin/gtkprefs.c:1024
 msgid "Use document font from _theme"
 msgstr "Usar a fonte de documento do _tema"
 
-#: ../pidgin/gtkprefs.c:947
+#: ../pidgin/gtkprefs.c:1026
 msgid "Use font from _theme"
 msgstr "Usar a fonte do _tema"
 
-#: ../pidgin/gtkprefs.c:949
+#: ../pidgin/gtkprefs.c:1028
 msgid "Conversation _font:"
 msgstr "_Fonte para as conversas:"
 
-#: ../pidgin/gtkprefs.c:962
+#: ../pidgin/gtkprefs.c:1041
 msgid "Default Formatting"
 msgstr "Formatação padrão"
 
-#: ../pidgin/gtkprefs.c:978
+#: ../pidgin/gtkprefs.c:1057
 msgid ""
 "This is how your outgoing message text will appear when you use protocols "
-"that support formatting. :)"
+"that support formatting."
 msgstr ""
 "Sua mensagem enviada aparecerá assim quando você usar protocolos que "
-"suportem formatação. :)"
-
-#: ../pidgin/gtkprefs.c:1054
+"suportem formatação."
+
+#: ../pidgin/gtkprefs.c:1123
 msgid "ST_UN server:"
 msgstr "_Servidor ST_UN:"
 
-#: ../pidgin/gtkprefs.c:1066
+#: ../pidgin/gtkprefs.c:1135
 msgid "<span style=\"italic\">Example: stunserver.org</span>"
 msgstr "<span style=\"italic\">Exemplo: stunserver.org</span>"
 
-#: ../pidgin/gtkprefs.c:1070
+#: ../pidgin/gtkprefs.c:1139
 msgid "_Autodetect IP address"
 msgstr "Detectar endereço IP _automaticamente"
 
-#: ../pidgin/gtkprefs.c:1079
+#: ../pidgin/gtkprefs.c:1148
 msgid "Public _IP:"
 msgstr "_IP público:"
 
-#: ../pidgin/gtkprefs.c:1108
+#: ../pidgin/gtkprefs.c:1177
 msgid "Ports"
 msgstr "Portas"
 
-#: ../pidgin/gtkprefs.c:1111
+#: ../pidgin/gtkprefs.c:1180
 msgid "_Manually specify range of ports to listen on"
 msgstr "Especificar _manualmente as portas a escutar"
 
-#: ../pidgin/gtkprefs.c:1114
+#: ../pidgin/gtkprefs.c:1183
 msgid "_Start port:"
 msgstr "Porta _inicial:"
 
-#: ../pidgin/gtkprefs.c:1121
+#: ../pidgin/gtkprefs.c:1190
 msgid "_End port:"
 msgstr "Porta _final:"
 
-#: ../pidgin/gtkprefs.c:1129
+#: ../pidgin/gtkprefs.c:1198
 msgid "Proxy Server"
 msgstr "Servidor proxy"
 
-#: ../pidgin/gtkprefs.c:1133
+#: ../pidgin/gtkprefs.c:1202
 msgid "No proxy"
 msgstr "Nenhum proxy"
 
-#: ../pidgin/gtkprefs.c:1189
+#: ../pidgin/gtkprefs.c:1258
 msgid "_User:"
 msgstr "_Usuário:"
 
-#: ../pidgin/gtkprefs.c:1253
+#: ../pidgin/gtkprefs.c:1323
 msgid "Seamonkey"
 msgstr "Seamonkey"
 
-#: ../pidgin/gtkprefs.c:1254
+#: ../pidgin/gtkprefs.c:1324
 msgid "Opera"
 msgstr "Opera"
 
-#: ../pidgin/gtkprefs.c:1255
+#: ../pidgin/gtkprefs.c:1325
 msgid "Netscape"
 msgstr "Netscape"
 
-#: ../pidgin/gtkprefs.c:1256
+#: ../pidgin/gtkprefs.c:1326
 msgid "Mozilla"
 msgstr "Mozilla"
 
-#: ../pidgin/gtkprefs.c:1257
+#: ../pidgin/gtkprefs.c:1327
 msgid "Konqueror"
 msgstr "Konqueror"
 
-#: ../pidgin/gtkprefs.c:1258
+#: ../pidgin/gtkprefs.c:1328
 msgid "GNOME Default"
 msgstr "Padrão do GNOME"
 
-#: ../pidgin/gtkprefs.c:1259
+#: ../pidgin/gtkprefs.c:1329
 msgid "Galeon"
 msgstr "Galeon"
 
-#: ../pidgin/gtkprefs.c:1260
+#: ../pidgin/gtkprefs.c:1330
 msgid "Firefox"
 msgstr "Firefox"
 
-#: ../pidgin/gtkprefs.c:1261
+#: ../pidgin/gtkprefs.c:1331
 msgid "Firebird"
 msgstr "Firebird"
 
-#: ../pidgin/gtkprefs.c:1262
+#: ../pidgin/gtkprefs.c:1332
 msgid "Epiphany"
 msgstr "Epiphany"
 
-#: ../pidgin/gtkprefs.c:1271
+#: ../pidgin/gtkprefs.c:1341
 msgid "Manual"
 msgstr "Manual"
 
-#: ../pidgin/gtkprefs.c:1324
+#: ../pidgin/gtkprefs.c:1394
 msgid "Browser Selection"
 msgstr "Seleção do navegador"
 
-#: ../pidgin/gtkprefs.c:1328
+#: ../pidgin/gtkprefs.c:1398
 msgid "_Browser:"
 msgstr "_Navegador:"
 
-#: ../pidgin/gtkprefs.c:1336
+#: ../pidgin/gtkprefs.c:1406
 msgid "_Open link in:"
 msgstr "_Abrir link no:"
 
-#: ../pidgin/gtkprefs.c:1338
+#: ../pidgin/gtkprefs.c:1408
 msgid "Browser default"
 msgstr "Navegador padrão"
 
-#: ../pidgin/gtkprefs.c:1339
+#: ../pidgin/gtkprefs.c:1409
 msgid "Existing window"
 msgstr "Janela existente"
 
-#: ../pidgin/gtkprefs.c:1341
+#: ../pidgin/gtkprefs.c:1411
 msgid "New tab"
 msgstr "Nova aba"
 
-#: ../pidgin/gtkprefs.c:1355
+#: ../pidgin/gtkprefs.c:1425
 #, c-format
 msgid ""
 "_Manual:\n"
@@ -14456,80 +14551,80 @@
 "_Manual:\n"
 "(%s para URL)"
 
-#: ../pidgin/gtkprefs.c:1395
+#: ../pidgin/gtkprefs.c:1465
 msgid "Log _format:"
 msgstr "_Formato do log:"
 
-#: ../pidgin/gtkprefs.c:1400
+#: ../pidgin/gtkprefs.c:1470
 msgid "Log all _instant messages"
 msgstr "_Gravar todas as mensagens instantâneas"
 
-#: ../pidgin/gtkprefs.c:1402
+#: ../pidgin/gtkprefs.c:1472
 msgid "Log all c_hats"
 msgstr "Gravar todos os _bate-papos"
 
-#: ../pidgin/gtkprefs.c:1404
+#: ../pidgin/gtkprefs.c:1474
 msgid "Log all _status changes to system log"
 msgstr "Gravar todos as mudanças de _status no log do sistema"
 
-#: ../pidgin/gtkprefs.c:1512 ../pidgin/gtkprefs.c:1601
-#: ../pidgin/gtkprefs.c:1795
+#: ../pidgin/gtkprefs.c:1582 ../pidgin/gtkprefs.c:1671
+#: ../pidgin/gtkprefs.c:1865
 msgid "(default)"
 msgstr "(padrão)"
 
-#: ../pidgin/gtkprefs.c:1550
+#: ../pidgin/gtkprefs.c:1620
 msgid "Sound Selection"
 msgstr "Seleção de som"
 
-#: ../pidgin/gtkprefs.c:1560
+#: ../pidgin/gtkprefs.c:1630
 msgid "Quietest"
 msgstr "Muito silencioso"
 
-#: ../pidgin/gtkprefs.c:1562
+#: ../pidgin/gtkprefs.c:1632
 msgid "Quieter"
 msgstr "Mais silencioso"
 
-#: ../pidgin/gtkprefs.c:1564
+#: ../pidgin/gtkprefs.c:1634
 msgid "Quiet"
 msgstr "Silencioso"
 
-#: ../pidgin/gtkprefs.c:1568
+#: ../pidgin/gtkprefs.c:1638
 msgid "Loud"
 msgstr "Alto"
 
-#: ../pidgin/gtkprefs.c:1570
+#: ../pidgin/gtkprefs.c:1640
 msgid "Louder"
 msgstr "Mais alto"
 
-#: ../pidgin/gtkprefs.c:1572
+#: ../pidgin/gtkprefs.c:1642
 msgid "Loudest"
 msgstr "Muito alto"
 
-#: ../pidgin/gtkprefs.c:1635
+#: ../pidgin/gtkprefs.c:1705
 msgid "Sound Method"
 msgstr "Método para reproduzir o som"
 
-#: ../pidgin/gtkprefs.c:1636
+#: ../pidgin/gtkprefs.c:1706
 msgid "_Method:"
 msgstr "_Método:"
 
-#: ../pidgin/gtkprefs.c:1638
+#: ../pidgin/gtkprefs.c:1708
 msgid "Console beep"
 msgstr "Bipe do console"
 
-#: ../pidgin/gtkprefs.c:1640
+#: ../pidgin/gtkprefs.c:1710
 msgid "Automatic"
 msgstr "Automático"
 
-#: ../pidgin/gtkprefs.c:1644
+#: ../pidgin/gtkprefs.c:1714
 msgid "Command"
 msgstr "Comando"
 
-#: ../pidgin/gtkprefs.c:1645
+#: ../pidgin/gtkprefs.c:1715
 msgid "No sounds"
 msgstr "Sem sons"
 
-#: ../pidgin/gtkprefs.c:1653
+#: ../pidgin/gtkprefs.c:1723
 #, c-format
 msgid ""
 "Sound c_ommand:\n"
@@ -14538,117 +14633,117 @@
 "C_omando do som:\n"
 "(%s para nome do arquivo)"
 
-#: ../pidgin/gtkprefs.c:1679
+#: ../pidgin/gtkprefs.c:1749
 msgid "Sound Options"
 msgstr "Opções de som"
 
-#: ../pidgin/gtkprefs.c:1680
+#: ../pidgin/gtkprefs.c:1750
 msgid "Sounds when conversation has _focus"
 msgstr "Emitir sons quando a janela da conversa _ganhar foco"
 
-#: ../pidgin/gtkprefs.c:1682
+#: ../pidgin/gtkprefs.c:1752
 msgid "Enable sounds:"
 msgstr "Ativar sons:"
 
-#: ../pidgin/gtkprefs.c:1684
+#: ../pidgin/gtkprefs.c:1754
 msgid "Only when available"
 msgstr "Somente quando disponível"
 
-#: ../pidgin/gtkprefs.c:1685
+#: ../pidgin/gtkprefs.c:1755
 msgid "Only when not available"
 msgstr "Somente quando não disponível"
 
-#: ../pidgin/gtkprefs.c:1693
+#: ../pidgin/gtkprefs.c:1763
 msgid "Volume:"
 msgstr "Volume:"
 
-#: ../pidgin/gtkprefs.c:1721
+#: ../pidgin/gtkprefs.c:1791
 msgid "Sound Events"
 msgstr "Eventos de som"
 
-#: ../pidgin/gtkprefs.c:1773
+#: ../pidgin/gtkprefs.c:1843
 msgid "Play"
 msgstr "Tocar"
 
-#: ../pidgin/gtkprefs.c:1780
+#: ../pidgin/gtkprefs.c:1850
 msgid "Event"
 msgstr "Evento"
 
-#: ../pidgin/gtkprefs.c:1799
+#: ../pidgin/gtkprefs.c:1869
 msgid "Test"
 msgstr "Testar"
 
-#: ../pidgin/gtkprefs.c:1803
+#: ../pidgin/gtkprefs.c:1873
 msgid "Reset"
 msgstr "Redefinir"
 
-#: ../pidgin/gtkprefs.c:1807
+#: ../pidgin/gtkprefs.c:1877
 msgid "Choose..."
 msgstr "Escolher..."
 
-#: ../pidgin/gtkprefs.c:1850
+#: ../pidgin/gtkprefs.c:1920
 msgid "_Report idle time:"
 msgstr "Mostrar _tempo de inatividade:"
 
-#: ../pidgin/gtkprefs.c:1855
+#: ../pidgin/gtkprefs.c:1925
 msgid "Based on keyboard or mouse use"
 msgstr "A partir do uso do mouse/teclado"
 
-#: ../pidgin/gtkprefs.c:1864
+#: ../pidgin/gtkprefs.c:1934
 msgid "_Auto-reply:"
 msgstr "_Auto-resposta:"
 
-#: ../pidgin/gtkprefs.c:1868
+#: ../pidgin/gtkprefs.c:1938
 msgid "When both away and idle"
 msgstr "Quando ausente e inativo"
 
 #. Auto-away stuff
-#: ../pidgin/gtkprefs.c:1874
+#: ../pidgin/gtkprefs.c:1944
 msgid "Auto-away"
 msgstr "Auto-ausente"
 
-#: ../pidgin/gtkprefs.c:1876
+#: ../pidgin/gtkprefs.c:1946
 msgid "Change status when _idle"
 msgstr "Mudar status após _inatividade"
 
-#: ../pidgin/gtkprefs.c:1880
+#: ../pidgin/gtkprefs.c:1950
 msgid "_Minutes before changing status:"
 msgstr "_Minutos antes de alterar o status:"
 
-#: ../pidgin/gtkprefs.c:1888
+#: ../pidgin/gtkprefs.c:1958
 msgid "Change _status to:"
 msgstr "Mudar status para:"
 
 #. Signon status stuff
-#: ../pidgin/gtkprefs.c:1909
+#: ../pidgin/gtkprefs.c:1979
 msgid "Status at Startup"
 msgstr "Status na inicialização"
 
-#: ../pidgin/gtkprefs.c:1911
+#: ../pidgin/gtkprefs.c:1981
 msgid "Use status from last _exit at startup"
 msgstr "Usar o s_tatus da última saída ao iniciar"
 
-#: ../pidgin/gtkprefs.c:1917
+#: ../pidgin/gtkprefs.c:1987
 msgid "Status to a_pply at startup:"
 msgstr "Status a a_plicar na inicialização:"
 
-#: ../pidgin/gtkprefs.c:1955
+#: ../pidgin/gtkprefs.c:2025
 msgid "Interface"
 msgstr "Interface"
 
-#: ../pidgin/gtkprefs.c:1957
+#: ../pidgin/gtkprefs.c:2027
 msgid "Smiley Themes"
 msgstr "Temas de emoticons"
 
-#: ../pidgin/gtkprefs.c:1958
+#: ../pidgin/gtkprefs.c:2028
 msgid "Sounds"
 msgstr "Sons"
 
-#: ../pidgin/gtkprefs.c:1964
+#: ../pidgin/gtkprefs.c:2034
 msgid "Browser"
 msgstr "Navegador"
 
-#: ../pidgin/gtkprefs.c:1968
+#: ../pidgin/gtkprefs.c:2038
 msgid "Status / Idle"
 msgstr "Status / Inativo"
 
@@ -14672,65 +14767,65 @@
 msgid "Block only the users below"
 msgstr "Bloquear apenas os usuários abaixo"
 
-#: ../pidgin/gtkprivacy.c:372
+#: ../pidgin/gtkprivacy.c:369
 msgid "Privacy"
 msgstr "Privacidade"
 
-#: ../pidgin/gtkprivacy.c:385
+#: ../pidgin/gtkprivacy.c:381
 msgid "Changes to privacy settings take effect immediately."
 msgstr ""
 "Mudanças nas configurações de privacidade entram em efeito imediatamente."
 
 #. "Set privacy for:" label
-#: ../pidgin/gtkprivacy.c:397
+#: ../pidgin/gtkprivacy.c:393
 msgid "Set privacy for:"
 msgstr "Definir privacidade para:"
 
-#: ../pidgin/gtkprivacy.c:560 ../pidgin/gtkprivacy.c:577
+#: ../pidgin/gtkprivacy.c:556 ../pidgin/gtkprivacy.c:573
 msgid "Permit User"
 msgstr "Permitir usuário"
 
-#: ../pidgin/gtkprivacy.c:561
+#: ../pidgin/gtkprivacy.c:557
 msgid "Type a user you permit to contact you."
 msgstr "Digite um usuário que você permite que o contate."
 
-#: ../pidgin/gtkprivacy.c:562
+#: ../pidgin/gtkprivacy.c:558
 msgid "Please enter the name of the user you wish to be able to contact you."
 msgstr ""
 "Favor digitar o nome do usuário que você gostaria que pudesse contatar você."
 
-#: ../pidgin/gtkprivacy.c:565 ../pidgin/gtkprivacy.c:581
+#: ../pidgin/gtkprivacy.c:561 ../pidgin/gtkprivacy.c:577
 msgid "_Permit"
 msgstr "_Permitir"
 
-#: ../pidgin/gtkprivacy.c:571
+#: ../pidgin/gtkprivacy.c:567
 #, c-format
 msgid "Allow %s to contact you?"
 msgstr "Permitir que %s te contate?"
 
-#: ../pidgin/gtkprivacy.c:573
+#: ../pidgin/gtkprivacy.c:569
 #, 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:602 ../pidgin/gtkprivacy.c:616
+#: ../pidgin/gtkprivacy.c:598 ../pidgin/gtkprivacy.c:612
 msgid "Block User"
 msgstr "Bloquear o usuário"
 
-#: ../pidgin/gtkprivacy.c:603
+#: ../pidgin/gtkprivacy.c:599
 msgid "Type a user to block."
 msgstr "Digite um usuário para bloquear."
 
-#: ../pidgin/gtkprivacy.c:604
+#: ../pidgin/gtkprivacy.c:600
 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:612
+#: ../pidgin/gtkprivacy.c:608
 #, c-format
 msgid "Block %s?"
 msgstr "Bloquear %s?"
 
-#: ../pidgin/gtkprivacy.c:614
+#: ../pidgin/gtkprivacy.c:610
 #, c-format
 msgid "Are you sure you want to block %s?"
 msgstr "Você tem certeza de que deseja bloquear %s?"
@@ -14739,78 +14834,79 @@
 msgid "Apply"
 msgstr "Aplicar"
 
-#: ../pidgin/gtkrequest.c:1482
+#: ../pidgin/gtkrequest.c:1478
 msgid "That file already exists"
 msgstr "Este arquivo já existe"
 
-#: ../pidgin/gtkrequest.c:1483
+#: ../pidgin/gtkrequest.c:1479
 msgid "Would you like to overwrite it?"
 msgstr "Você deseja sobrescrevê-lo?"
 
-#: ../pidgin/gtkrequest.c:1486
+#: ../pidgin/gtkrequest.c:1482
 msgid "Overwrite"
 msgstr "Sobrescrever"
 
-#: ../pidgin/gtkrequest.c:1487
+#: ../pidgin/gtkrequest.c:1483
 msgid "Choose New Name"
 msgstr "Escolher novo nome"
 
-#: ../pidgin/gtkrequest.c:1625 ../pidgin/gtkrequest.c:1639
+#: ../pidgin/gtkrequest.c:1621 ../pidgin/gtkrequest.c:1635
 msgid "Select Folder..."
 msgstr "Selecionar pasta..."
 
-#: ../pidgin/gtkroomlist.c:376
+#. Create the window.
+#: ../pidgin/gtkroomlist.c:374
 msgid "Room List"
 msgstr "Lista de salas"
 
 #. list button
-#: ../pidgin/gtkroomlist.c:446
+#: ../pidgin/gtkroomlist.c:442
 msgid "_Get List"
 msgstr "Ob_ter lista"
 
 #. add button
-#: ../pidgin/gtkroomlist.c:454
+#: ../pidgin/gtkroomlist.c:450
 msgid "_Add Chat"
 msgstr "_Adicionar bate-papo"
 
-#: ../pidgin/gtksavedstatuses.c:331
+#: ../pidgin/gtksavedstatuses.c:336
 msgid "Are you sure you want to delete the selected saved statuses?"
 msgstr "Você tem certeza de que deseja remover os status salvos selecionados?"
 
 #. Use button
-#: ../pidgin/gtksavedstatuses.c:580 ../pidgin/gtksavedstatuses.c:1213
+#: ../pidgin/gtksavedstatuses.c:619 ../pidgin/gtksavedstatuses.c:1265
 msgid "_Use"
 msgstr "_Usar"
 
-#: ../pidgin/gtksavedstatuses.c:726
+#: ../pidgin/gtksavedstatuses.c:779
 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:914
+#: ../pidgin/gtksavedstatuses.c:969
 msgid "Different"
 msgstr "Outro"
 
-#: ../pidgin/gtksavedstatuses.c:1106
+#: ../pidgin/gtksavedstatuses.c:1158
 msgid "_Title:"
 msgstr "_Título:"
 
-#: ../pidgin/gtksavedstatuses.c:1125 ../pidgin/gtksavedstatuses.c:1446
+#: ../pidgin/gtksavedstatuses.c:1177 ../pidgin/gtksavedstatuses.c:1494
 msgid "_Status:"
 msgstr "_Status:"
 
 #. Different status message expander
-#: ../pidgin/gtksavedstatuses.c:1157
+#: ../pidgin/gtksavedstatuses.c:1209
 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:1273
 msgid "Sa_ve & Use"
 msgstr "Sal_var e usar"
 
-#: ../pidgin/gtksavedstatuses.c:1427
+#: ../pidgin/gtksavedstatuses.c:1477
 #, c-format
 msgid "Status for %s"
 msgstr "Status de %s"
@@ -14863,29 +14959,29 @@
 msgid "GStreamer failed to initialize."
 msgstr "O GStreamer não pôde ser inicializado."
 
-#: ../pidgin/gtkstatusbox.c:661
+#: ../pidgin/gtkstatusbox.c:663
 msgid "Waiting for network connection"
 msgstr "Esperando pela conexão de rede"
 
-#: ../pidgin/gtkutils.c:593
+#: ../pidgin/gtkutils.c:627
 msgid "Google Talk"
 msgstr "Google Talk"
 
-#: ../pidgin/gtkutils.c:1309 ../pidgin/gtkutils.c:1332
+#: ../pidgin/gtkutils.c:1384 ../pidgin/gtkutils.c:1407
 #, c-format
 msgid "The following error has occurred loading %s: %s"
 msgstr "O seguinte erro ocorreu ao carregar %s: %s."
 
-#: ../pidgin/gtkutils.c:1312 ../pidgin/gtkutils.c:1334
+#: ../pidgin/gtkutils.c:1387 ../pidgin/gtkutils.c:1409
 msgid "Failed to load image"
 msgstr "Falha ao carregar imagem"
 
-#: ../pidgin/gtkutils.c:1408
+#: ../pidgin/gtkutils.c:1483
 #, c-format
 msgid "Cannot send folder %s."
 msgstr "Não foi possível enviar a pasta %s."
 
-#: ../pidgin/gtkutils.c:1409
+#: ../pidgin/gtkutils.c:1484
 #, c-format
 msgid ""
 "%s cannot transfer a folder. You will need to send the files within "
@@ -14894,12 +14990,12 @@
 "O %s não pode transferir uma pasta. Você terá que enviar os arquivos que "
 "estão dentro dela individualmente."
 
-#: ../pidgin/gtkutils.c:1441 ../pidgin/gtkutils.c:1453
-#: ../pidgin/gtkutils.c:1460
+#: ../pidgin/gtkutils.c:1516 ../pidgin/gtkutils.c:1528
+#: ../pidgin/gtkutils.c:1535
 msgid "You have dragged an image"
 msgstr "Você arrastou uma imagem"
 
-#: ../pidgin/gtkutils.c:1442
+#: ../pidgin/gtkutils.c:1517
 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."
@@ -14907,23 +15003,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:1448 ../pidgin/gtkutils.c:1468
+#: ../pidgin/gtkutils.c:1523 ../pidgin/gtkutils.c:1543
 msgid "Set as buddy icon"
 msgstr "Definir como ícone de amigo"
 
-#: ../pidgin/gtkutils.c:1449 ../pidgin/gtkutils.c:1469
+#: ../pidgin/gtkutils.c:1524 ../pidgin/gtkutils.c:1544
 msgid "Send image file"
 msgstr "Enviar arquivo de imagem"
 
-#: ../pidgin/gtkutils.c:1450 ../pidgin/gtkutils.c:1469
+#: ../pidgin/gtkutils.c:1525 ../pidgin/gtkutils.c:1544
 msgid "Insert in message"
 msgstr "Inserir na mensagem"
 
-#: ../pidgin/gtkutils.c:1454
+#: ../pidgin/gtkutils.c:1529
 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:1461
+#: ../pidgin/gtkutils.c:1536
 msgid ""
 "You can send this image as a file transfer, or use it as the buddy icon for "
 "this user."
@@ -14931,7 +15027,7 @@
 "Você pode usar esta imagem numa transferência de arquivo, ou usá-la como o "
 "ícone de amigo para este usuário."
 
-#: ../pidgin/gtkutils.c:1462
+#: ../pidgin/gtkutils.c:1537
 msgid ""
 "You can insert this image into this message, or use it as the buddy icon for "
 "this user"
@@ -14944,11 +15040,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:1520
+#: ../pidgin/gtkutils.c:1595
 msgid "Cannot send launcher"
 msgstr "Não é possível enviar atalhos"
 
-#: ../pidgin/gtkutils.c:1520
+#: ../pidgin/gtkutils.c:1595
 msgid ""
 "You dragged a desktop launcher. Most likely you wanted to send whatever this "
 "launcher points to instead of this launcher itself."
@@ -14956,7 +15052,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:2268
+#: ../pidgin/gtkutils.c:2317
 #, c-format
 msgid ""
 "<b>File:</b> %s\n"
@@ -14967,25 +15063,25 @@
 "<b>Tamanho do arquivo:</b> %s\n"
 "<b>Dimensões da imagem:</b> %dx%d"
 
-#: ../pidgin/gtkutils.c:2564
+#: ../pidgin/gtkutils.c:2613
 #, 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:2566
+#: ../pidgin/gtkutils.c:2615
 msgid "Icon Error"
 msgstr "Erro no ícone"
 
-#: ../pidgin/gtkutils.c:2567
+#: ../pidgin/gtkutils.c:2616
 msgid "Could not set icon"
 msgstr "Não foi possível definir o ícone"
 
-#: ../pidgin/gtkutils.c:2667
+#: ../pidgin/gtkutils.c:2716
 #, c-format
 msgid "Failed to open file '%s': %s"
 msgstr "Falha ao abrir arquivo '%s': %s"
 
-#: ../pidgin/gtkutils.c:2716
+#: ../pidgin/gtkutils.c:2765
 #, c-format
 msgid ""
 "Failed to load image '%s': reason not known, probably a corrupt image file"
@@ -14993,20 +15089,14 @@
 "Falha ao carregar imagem '%s': motivo desconhecido, provavelmente o arquivo "
 "de imagem está corrompido"
 
-#: ../pidgin/gtkwhiteboard.c:760 ../pidgin/gtkwhiteboard.c:779
+#: ../pidgin/gtkwhiteboard.c:754 ../pidgin/gtkwhiteboard.c:773
 msgid "Save File"
 msgstr "Salvar arquivo"
 
-#: ../pidgin/gtkwhiteboard.c:867
+#: ../pidgin/gtkwhiteboard.c:861
 msgid "Select color"
 msgstr "Selecionar cor"
 
-#. Translators may want to transliterate the name.
-#. It is not to be translated.
-#: ../pidgin/pidgin.h:50
-msgid "Pidgin"
-msgstr "Pidgin"
-
 #: ../pidgin/pidginstock.c:81
 msgid "_Alias"
 msgstr "_Apelido:"
@@ -15031,10 +15121,6 @@
 msgid "_Open Mail"
 msgstr "_Abrir e-mail"
 
-#: ../pidgin/pixmaps/emotes/default/22/default.theme.in.h:1
-msgid "Default"
-msgstr "Padrão"
-
 #: ../pidgin/pixmaps/emotes/default/22/default.theme.in.h:2
 msgid "Pidgin smileys"
 msgstr "Emoticons do Pidgin"
@@ -15089,18 +15175,18 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/cap/cap.c:934
+#: ../pidgin/plugins/cap/cap.c:935
 msgid "Contact Availability Prediction"
 msgstr "Previsão de disponibilidade do contato"
 
 #. *< name
 #. *< version
-#: ../pidgin/plugins/cap/cap.c:936
+#: ../pidgin/plugins/cap/cap.c:937
 msgid "Contact Availability Prediction plugin."
 msgstr "Plugin de previsão de disponibilidade do contato."
 
 #. *  summary
-#: ../pidgin/plugins/cap/cap.c:937
+#: ../pidgin/plugins/cap/cap.c:938
 msgid ""
 "The contact availability plugin (cap) is used to display statistical "
 "information about buddies in a users contact list."
@@ -15205,11 +15291,23 @@
 msgid "Received Messages"
 msgstr "Mensagens recebidas"
 
-#: ../pidgin/plugins/convcolors.c:210 ../pidgin/plugins/pidginrc.c:320
+#: ../pidgin/plugins/convcolors.c:210 ../pidgin/plugins/pidginrc.c:251
 #, c-format
 msgid "Select Color for %s"
 msgstr "Selecione a cor de %s"
 
+#: ../pidgin/plugins/convcolors.c:287
+msgid "Bold"
+msgstr "Negrito"
+
+#: ../pidgin/plugins/convcolors.c:294
+msgid "Italic"
+msgstr "Itálico"
+
+#: ../pidgin/plugins/convcolors.c:301
+msgid "Underline"
+msgstr "Sublinhado"
+
 #: ../pidgin/plugins/convcolors.c:310
 msgid "Ignore incoming format"
 msgstr "Ignorar formato original"
@@ -15334,31 +15432,31 @@
 msgstr "Mensagens instantâneas"
 
 #. Add the label.
-#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:460
+#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:457
 msgid "Select a person from your address book below, or add a new person."
 msgstr ""
 "Selecione uma pessoa do seu catálogo de endereços abaixo, ou adicione uma "
 "nova pessoa."
 
-#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:554
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:307
+#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:551
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:303
 msgid "Group:"
 msgstr "Grupo:"
 
 #. "New Person" button
-#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:580
-#: ../pidgin/plugins/gevolution/assoc-buddy.c:469
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:251
+#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:577
+#: ../pidgin/plugins/gevolution/assoc-buddy.c:467
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:249
 msgid "New Person"
 msgstr "Nova pessoa"
 
 #. "Select Buddy" button
-#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:597
+#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:594
 msgid "Select Buddy"
 msgstr "Selecionar amigo"
 
 #. Add the label.
-#: ../pidgin/plugins/gevolution/assoc-buddy.c:345
+#: ../pidgin/plugins/gevolution/assoc-buddy.c:343
 msgid ""
 "Select a person from your address book to add this buddy to, or create a new "
 "person."
@@ -15367,12 +15465,12 @@
 "a ela, ou crie uma nova pessoa."
 
 #. Add the expander
-#: ../pidgin/plugins/gevolution/assoc-buddy.c:433
+#: ../pidgin/plugins/gevolution/assoc-buddy.c:431
 msgid "User _details"
 msgstr "_Detalhes do usuário"
 
 #. "Associate Buddy" button
-#: ../pidgin/plugins/gevolution/assoc-buddy.c:486
+#: ../pidgin/plugins/gevolution/assoc-buddy.c:484
 msgid "_Associate Buddy"
 msgstr "_Associar amigo"
 
@@ -15427,32 +15525,32 @@
 msgid "Provides integration with Evolution."
 msgstr "Fornece integração com o Evolution."
 
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:267
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:263
 msgid "Please enter the person's information below."
 msgstr "Por favor, digite as informações da pessoa abaixo."
 
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:271
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:267
 msgid "Please enter the buddy's screen name and account type below."
 msgstr "Por favor digite o nome de usuário do amigo e o tipo de conta abaixo."
 
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:291
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:287
 msgid "Account type:"
 msgstr "Tipo da conta:"
 
 #. Optional Information section
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:315
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:311
 msgid "Optional information:"
 msgstr "Informações opcionais:"
 
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:350
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:346
 msgid "First name:"
 msgstr "Nome:"
 
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:362
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:358
 msgid "Last name:"
 msgstr "Sobrenome:"
 
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:382
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:378
 msgid "E-mail:"
 msgstr "E-mail:"
 
@@ -15753,24 +15851,24 @@
 msgid "Notify Dialog"
 msgstr "Diálogo de notificação"
 
-#: ../pidgin/plugins/pidginrc.c:322
+#: ../pidgin/plugins/pidginrc.c:253
 msgid "Select Color"
 msgstr "Selecionar cor"
 
-#: ../pidgin/plugins/pidginrc.c:361
+#: ../pidgin/plugins/pidginrc.c:300
+msgid "Select Interface Font"
+msgstr "Selecionar fonte da interface"
+
+#: ../pidgin/plugins/pidginrc.c:303
 #, c-format
 msgid "Select Font for %s"
 msgstr "Selecionar fonte de %s"
 
-#: ../pidgin/plugins/pidginrc.c:398
-msgid "Select Interface Font"
-msgstr "Selecionar fonte da interface"
-
-#: ../pidgin/plugins/pidginrc.c:453
+#: ../pidgin/plugins/pidginrc.c:371
 msgid "GTK+ Interface Font"
 msgstr "Fonte da interface do GTK+"
 
-#: ../pidgin/plugins/pidginrc.c:473
+#: ../pidgin/plugins/pidginrc.c:391
 msgid "GTK+ Text Shortcut Theme"
 msgstr "Tema de atalhos do GTK+"
 
@@ -15794,36 +15892,36 @@
 #. widget_bool_widgets[i]);
 #. }
 #.
-#: ../pidgin/plugins/pidginrc.c:510
+#: ../pidgin/plugins/pidginrc.c:428
 msgid "Interface colors"
 msgstr "_Cores da interface"
 
-#: ../pidgin/plugins/pidginrc.c:534
+#: ../pidgin/plugins/pidginrc.c:452
 msgid "Widget Sizes"
 msgstr "Tamanho dos controles"
 
-#: ../pidgin/plugins/pidginrc.c:555
+#: ../pidgin/plugins/pidginrc.c:473
 msgid "Fonts"
 msgstr "Fontes"
 
-#: ../pidgin/plugins/pidginrc.c:578
-msgid "Tools"
-msgstr "Ferramentas"
-
-#: ../pidgin/plugins/pidginrc.c:583
+#: ../pidgin/plugins/pidginrc.c:497
+msgid "Gtkrc File Tools"
+msgstr "Ferramentas do gtkrc"
+
+#: ../pidgin/plugins/pidginrc.c:502
 #, c-format
 msgid "Write settings to %s%sgtkrc-2.0"
 msgstr "Gravar configurações em %s%sgtkrc-2.0"
 
-#: ../pidgin/plugins/pidginrc.c:591
+#: ../pidgin/plugins/pidginrc.c:511
 msgid "Re-read gtkrc files"
 msgstr "Re-carregar arquivos gtkrc"
 
-#: ../pidgin/plugins/pidginrc.c:624
+#: ../pidgin/plugins/pidginrc.c:544
 msgid "Pidgin GTK+ Theme Control"
 msgstr "Controle do tema do GTK+ do Pidgin"
 
-#: ../pidgin/plugins/pidginrc.c:626 ../pidgin/plugins/pidginrc.c:627
+#: ../pidgin/plugins/pidginrc.c:546 ../pidgin/plugins/pidginrc.c:547
 msgid "Provides access to commonly used gtkrc settings."
 msgstr "Oferece acesso a configurações do gtkrc comumente utilizadas."
 
@@ -15848,17 +15946,17 @@
 #, c-format
 msgid ""
 "You are using %s version %s.  The current version is %s.  You can get it "
-"from <a href=\""
+"from <a href=\"%s\">%s</a><hr>"
 msgstr ""
 "Você está usando o %s, versão %s. A versão atual é a %s. Você pode obtê-la "
-"em <a href=\""
-
-#: ../pidgin/plugins/relnot.c:78
+"em <a href=\"%s\">%s</a><hr>"
+
+#: ../pidgin/plugins/relnot.c:79
 #, c-format
 msgid "<b>ChangeLog:</b><br>%s"
 msgstr "<b>Log de alterações:</b><br>%s"
 
-#: ../pidgin/plugins/relnot.c:83 ../pidgin/plugins/relnot.c:84
+#: ../pidgin/plugins/relnot.c:84 ../pidgin/plugins/relnot.c:85
 msgid "New Version Available"
 msgstr "Nova versão disponível"
 
@@ -15868,19 +15966,19 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/relnot.c:142
+#: ../pidgin/plugins/relnot.c:143
 msgid "Release Notification"
 msgstr "Notificação de nova versão"
 
 #. *< name
 #. *< version
 #. *  summary
-#: ../pidgin/plugins/relnot.c:145
+#: ../pidgin/plugins/relnot.c:146
 msgid "Checks periodically for new releases."
 msgstr "Verifica periodicamente por novas versões."
 
 #. *  description
-#: ../pidgin/plugins/relnot.c:147
+#: ../pidgin/plugins/relnot.c:148
 msgid ""
 "Checks periodically for new releases and notifies the user with the "
 "ChangeLog."
@@ -15888,69 +15986,69 @@
 "Verifica periodicamente por novas versões e notifica o usuário com a lista "
 "de alterações."
 
-#: ../pidgin/plugins/spellchk.c:1965
+#: ../pidgin/plugins/spellchk.c:1962
 msgid "Duplicate Correction"
 msgstr "Correção duplicada"
 
-#: ../pidgin/plugins/spellchk.c:1966
+#: ../pidgin/plugins/spellchk.c:1963
 msgid "The specified word already exists in the correction list."
 msgstr "A palavra especificada já existe na lista de correções."
 
-#: ../pidgin/plugins/spellchk.c:2180
+#: ../pidgin/plugins/spellchk.c:2177
 msgid "Text Replacements"
 msgstr "Substituição de texto"
 
-#: ../pidgin/plugins/spellchk.c:2203
+#: ../pidgin/plugins/spellchk.c:2200
 msgid "You type"
 msgstr "Você digita"
 
-#: ../pidgin/plugins/spellchk.c:2217
+#: ../pidgin/plugins/spellchk.c:2214
 msgid "You send"
 msgstr "Você envia"
 
-#: ../pidgin/plugins/spellchk.c:2231
+#: ../pidgin/plugins/spellchk.c:2228
 msgid "Whole words only"
 msgstr "Apenas palavras inteiras"
 
-#: ../pidgin/plugins/spellchk.c:2243
+#: ../pidgin/plugins/spellchk.c:2240
 msgid "Case sensitive"
 msgstr "Diferenciar capitalização"
 
-#: ../pidgin/plugins/spellchk.c:2269
+#: ../pidgin/plugins/spellchk.c:2266
 msgid "Add a new text replacement"
 msgstr "Inserir nova substituição de texto"
 
-#: ../pidgin/plugins/spellchk.c:2285
+#: ../pidgin/plugins/spellchk.c:2282
 msgid "You _type:"
 msgstr "Você _digita:"
 
-#: ../pidgin/plugins/spellchk.c:2302
+#: ../pidgin/plugins/spellchk.c:2299
 msgid "You _send:"
 msgstr "Você _envia:"
 
 #. Created here so it can be passed to whole_words_button_toggled.
-#: ../pidgin/plugins/spellchk.c:2314
+#: ../pidgin/plugins/spellchk.c:2311
 msgid "_Exact case match (uncheck for automatic case handling)"
 msgstr ""
 "Capitalização _exata (desmarque para tratar da capitalização automaticamente)"
 
-#: ../pidgin/plugins/spellchk.c:2316
+#: ../pidgin/plugins/spellchk.c:2313
 msgid "Only replace _whole words"
 msgstr "Apenas substituir palavras _inteiras"
 
-#: ../pidgin/plugins/spellchk.c:2341
+#: ../pidgin/plugins/spellchk.c:2338
 msgid "General Text Replacement Options"
 msgstr "Opções gerais de substituição de texto"
 
-#: ../pidgin/plugins/spellchk.c:2342
+#: ../pidgin/plugins/spellchk.c:2339
 msgid "Enable replacement of last word on send"
 msgstr "Ativar substituição da última palavra ao enviar"
 
-#: ../pidgin/plugins/spellchk.c:2373
+#: ../pidgin/plugins/spellchk.c:2370
 msgid "Text replacement"
 msgstr "Substituição de texto"
 
-#: ../pidgin/plugins/spellchk.c:2375 ../pidgin/plugins/spellchk.c:2376
+#: ../pidgin/plugins/spellchk.c:2372 ../pidgin/plugins/spellchk.c:2373
 msgid "Replaces text in outgoing messages according to user-defined rules."
 msgstr ""
 "Substitui texto nas mensagens enviadas de acordo com regras definidas pelo "
@@ -15962,7 +16060,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/ticker/ticker.c:77 ../pidgin/plugins/ticker/ticker.c:355
+#: ../pidgin/plugins/ticker/ticker.c:74 ../pidgin/plugins/ticker/ticker.c:354
 msgid "Buddy Ticker"
 msgstr "Monitor de amigos"
 
@@ -15970,7 +16068,7 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../pidgin/plugins/ticker/ticker.c:358 ../pidgin/plugins/ticker/ticker.c:360
+#: ../pidgin/plugins/ticker/ticker.c:357 ../pidgin/plugins/ticker/ticker.c:359
 msgid "A horizontal scrolling version of the buddy list."
 msgstr "Uma versão da lista de amigos que rola horizontalmente."
 
@@ -16057,44 +16155,44 @@
 "Este plugin permite ao usuário personalizar os formatos de marcação de tempo "
 "nas conversas e logs."
 
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:183
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:569
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:616
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:174
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:589
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:636
 msgid "Opacity:"
 msgstr "Opacidade:"
 
 #. IM Convo trans options
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:533
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:553
 msgid "IM Conversation Windows"
 msgstr "Janelas de conversa por mensagem instantânea"
 
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:534
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:554
 msgid "_IM window transparency"
 msgstr "Transparência da janela de _mensagem instantânea"
 
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:548
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:568
 msgid "_Show slider bar in IM window"
 msgstr "_Mostrar slider na janela de mensagem instantânea"
 
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:555
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:575
 msgid "Remove IM window transparency on focus"
 msgstr "Remover transparência da janela quando esta ganhar foco"
 
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:558
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:606
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:578
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:626
 msgid "Always on top"
 msgstr "Sempre no topo"
 
 #. Buddy List trans options
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:590
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:610
 msgid "Buddy List Window"
 msgstr "Janela da lista de amigos"
 
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:591
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:611
 msgid "_Buddy List window transparency"
 msgstr "Transparência da janela da _lista de amigos"
 
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:604
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:624
 msgid "Remove Buddy List window transparency on focus"
 msgstr "Remover a transparência da lista de amigos ao focá-la"
 
@@ -16104,19 +16202,19 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:664
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:684
 msgid "Transparency"
 msgstr "Transparência"
 
 #. *< name
 #. *< version
 #. *  summary
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:667
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:687
 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:669
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:689
 msgid ""
 "This plugin enables variable alpha transparency on conversation windows and "
 "the buddy list.\n"
@@ -16175,7 +16273,7 @@
 "Fornece opções específicas do Pidgin para Windows, como ancoramento da lista "
 "de amigos."
 
-#: ../pidgin/plugins/xmppconsole.c:666
+#: ../pidgin/plugins/xmppconsole.c:667
 msgid "<font color='#777777'>Logged out.</font>"
 msgstr "\"<font color='#777777'>Desconectado.</font>"
 
@@ -16185,39 +16283,39 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/xmppconsole.c:746 ../pidgin/plugins/xmppconsole.c:842
-#: ../pidgin/plugins/xmppconsole.c:861
+#: ../pidgin/plugins/xmppconsole.c:746 ../pidgin/plugins/xmppconsole.c:841
+#: ../pidgin/plugins/xmppconsole.c:860
 msgid "XMPP Console"
 msgstr "Console XMPP"
 
-#: ../pidgin/plugins/xmppconsole.c:754
+#: ../pidgin/plugins/xmppconsole.c:753
 msgid "Account: "
 msgstr "Conta: "
 
-#: ../pidgin/plugins/xmppconsole.c:781
+#: ../pidgin/plugins/xmppconsole.c:780
 msgid "<font color='#777777'>Not connected to XMPP</font>"
 msgstr "<font color='#777777'>Não conectado ao XMPP</font>"
 
-#: ../pidgin/plugins/xmppconsole.c:791
+#: ../pidgin/plugins/xmppconsole.c:790
 msgid "Insert an <iq/> stanza."
 msgstr "Inserir um comando (stanza) <iq/>"
 
-#: ../pidgin/plugins/xmppconsole.c:800
+#: ../pidgin/plugins/xmppconsole.c:799
 msgid "Insert a <presence/> stanza."
 msgstr "Inserir um comando (stanza) <presence/>"
 
-#: ../pidgin/plugins/xmppconsole.c:809
+#: ../pidgin/plugins/xmppconsole.c:808
 msgid "Insert a <message/> stanza."
 msgstr "Inserir um comando (stanza) <message/>"
 
 #. *< name
 #. *< version
 #. *  summary
-#: ../pidgin/plugins/xmppconsole.c:864
+#: ../pidgin/plugins/xmppconsole.c:863
 msgid "Send and receive raw XMPP stanzas."
 msgstr "Envia e recebe comandos (stanzas) do XMPP puros."
 
 #. *  description
-#: ../pidgin/plugins/xmppconsole.c:866
+#: ../pidgin/plugins/xmppconsole.c:865
 msgid "This plugin is useful for debbuging XMPP servers or clients."
 msgstr "Este plugin é útil para depurar servidores ou clientes XMPP."
--- a/po/sl.po	Thu Jul 12 23:57:56 2007 +0000
+++ b/po/sl.po	Fri Jul 13 00:03:15 2007 +0000
@@ -9,7 +9,7 @@
 "Project-Id-Version: Pidgin 2.1\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2004-09-08 00:02-0400\n"
-"PO-Revision-Date: 2007-06-15 11:09+0100\n"
+"PO-Revision-Date: 2007-07-12 20:10+0100\n"
 "Last-Translator: Martin Srebotnjak <miles@filmsi.net>\n"
 "Language-Team: Martin Srebotnjak <users@sl.openoffice.org>\n"
 "MIME-Version: 1.0\n"
@@ -20,12 +20,21 @@
 "X-Poedit-Country: SLOVENIA\n"
 "X-Poedit-SourceCharset: iso-8859-1\n"
 
-#: ../finch/finch.c:180
+#. Translators may want to transliterate the name.
+#. It is not to be translated.
+#: ../finch/finch.c:70
+#: ../finch/finch.c:298
+#: ../finch/finch.c:327
+#: ../finch/finch.c:404
+msgid "Finch"
+msgstr "Finch"
+
+#: ../finch/finch.c:204
 #, c-format
 msgid "%s. Try `%s -h' for more information.\n"
 msgstr "%s. Poskusite `%s -h' za več informacij.\n"
 
-#: ../finch/finch.c:182
+#: ../finch/finch.c:206
 #, c-format
 msgid ""
 "%s\n"
@@ -46,116 +55,118 @@
 "  -n, --nologin       brez samodejne prijave\n"
 "  -v, --version       izpiši trenutno različico in končaj program\n"
 
-#. Translators may want to transliterate the name.
-#. It is not to be translated.
-#: ../finch/finch.c:274
-#: ../finch/finch.c:303
-msgid "Finch"
-msgstr "Finch"
-
-#: ../finch/finch.c:301
-#: ../pidgin/gtkmain.c:682
+#: ../finch/finch.c:325
+#: ../pidgin/gtkmain.c:708
 #, 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 je naletel na napake pri migraciji vaših nastavitev iz %s v %s. Prosimo, raziščite in dokončajte migracijo ročno (s kopiranjem ustreznih datotek). Prosimo, da to napako javite na naslov http://developer.pidgin.im."
 
-#: ../finch/gntaccount.c:119
-#: ../finch/gntblist.c:290
-#: ../finch/gntblist.c:415
-#: ../finch/gntblist.c:428
-#: ../finch/gntplugin.c:181
-#: ../finch/gntplugin.c:225
-#: ../finch/gntstatus.c:294
-#: ../finch/gntstatus.c:302
-#: ../libpurple/protocols/jabber/buddy.c:1426
+#: ../finch/gntaccount.c:122
+#: ../finch/gntaccount.c:477
+#: ../finch/gntblist.c:299
+#: ../finch/gntblist.c:424
+#: ../finch/gntblist.c:437
+#: ../finch/gntplugin.c:185
+#: ../finch/gntplugin.c:233
+#: ../finch/gntstatus.c:297
+#: ../finch/gntstatus.c:305
+#: ../libpurple/protocols/jabber/buddy.c:1464
 #: ../libpurple/protocols/jabber/chat.c:677
 #: ../libpurple/protocols/jabber/chat.c:688
-#: ../libpurple/protocols/jabber/jabber.c:1235
-#: ../libpurple/protocols/qq/group_join.c:326
+#: ../libpurple/protocols/jabber/jabber.c:1227
+#: ../libpurple/protocols/qq/group_join.c:328
 #: ../libpurple/protocols/silc/ops.c:57
 #: ../libpurple/protocols/silc/ops.c:1456
 #: ../libpurple/protocols/silc10/ops.c:1451
 msgid "Error"
 msgstr "Napaka"
 
-#: ../finch/gntaccount.c:119
+#: ../finch/gntaccount.c:122
 msgid "Account was not added"
 msgstr "Račun ni bil dodan"
 
-#: ../finch/gntaccount.c:120
+#: ../finch/gntaccount.c:123
 msgid "Screenname of an account must be non-empty."
 msgstr "Pojavno ime računa ne sme biti prazno."
 
-#: ../finch/gntaccount.c:423
+#: ../finch/gntaccount.c:430
 msgid "New mail notifications"
 msgstr "Obveščanje o prispeli pošti"
 
-#: ../finch/gntaccount.c:433
+#: ../finch/gntaccount.c:440
 msgid "Remember password"
 msgstr "Zapomni si geslo"
 
-#: ../finch/gntaccount.c:474
-#: ../pidgin/gtkaccount.c:1478
-#: ../pidgin/gtkblist.c:4005
+#: ../finch/gntaccount.c:478
+msgid "There's no protocol plugins installed."
+msgstr "Vtičniki protokolov niso nameščeni."
+
+#: ../finch/gntaccount.c:479
+msgid "(You probably forgot to 'make install'.)"
+msgstr "(Najverjetneje ste pozabili na 'make install'.)"
+
+#: ../finch/gntaccount.c:489
+#: ../pidgin/gtkaccount.c:1473
+#: ../pidgin/gtkblist.c:4014
 msgid "Modify Account"
 msgstr "Spremeni račun"
 
-#: ../finch/gntaccount.c:474
+#: ../finch/gntaccount.c:489
 msgid "New Account"
 msgstr "Nov račun"
 
-#: ../finch/gntaccount.c:500
+#: ../finch/gntaccount.c:514
 #: ../pidgin/gtkft.c:695
 msgid "Protocol:"
 msgstr "Protokol:"
 
-#: ../finch/gntaccount.c:508
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:295
+#: ../finch/gntaccount.c:522
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:291
 msgid "Screen name:"
 msgstr "Zaslonsko ime:"
 
-#: ../finch/gntaccount.c:521
+#: ../finch/gntaccount.c:535
 msgid "Password:"
 msgstr "Geslo:"
 
-#: ../finch/gntaccount.c:531
+#: ../finch/gntaccount.c:545
 msgid "Alias:"
 msgstr "Psevdonim:"
 
 #. Cancel button
 #. Cancel
-#: ../finch/gntaccount.c:554
-#: ../finch/gntaccount.c:617
-#: ../finch/gntaccount.c:853
-#: ../finch/gntblist.c:334
-#: ../finch/gntblist.c:403
-#: ../finch/gntblist.c:438
-#: ../finch/gntblist.c:770
-#: ../finch/gntblist.c:967
-#: ../finch/gntblist.c:1063
-#: ../finch/gntblist.c:2160
-#: ../finch/gntplugin.c:360
+#: ../finch/gntaccount.c:568
+#: ../finch/gntaccount.c:631
+#: ../finch/gntaccount.c:875
+#: ../finch/gntblist.c:343
+#: ../finch/gntblist.c:412
+#: ../finch/gntblist.c:447
+#: ../finch/gntblist.c:794
+#: ../finch/gntblist.c:996
+#: ../finch/gntblist.c:1092
+#: ../finch/gntblist.c:2198
+#: ../finch/gntplugin.c:378
 #: ../finch/gntpounce.c:456
 #: ../finch/gntpounce.c:654
-#: ../finch/gntprefs.c:246
-#: ../finch/gntstatus.c:142
-#: ../finch/gntstatus.c:475
-#: ../finch/gntstatus.c:600
+#: ../finch/gntprefs.c:264
+#: ../finch/gntstatus.c:143
+#: ../finch/gntstatus.c:478
+#: ../finch/gntstatus.c:603
 #: ../libpurple/account.c:984
 #: ../libpurple/account.c:1234
 #: ../libpurple/account.c:1269
-#: ../libpurple/conversation.c:1168
+#: ../libpurple/conversation.c:1173
 #: ../libpurple/plugins/buddynote.c:51
 #: ../libpurple/protocols/gg/gg.c:502
 #: ../libpurple/protocols/gg/gg.c:661
 #: ../libpurple/protocols/gg/gg.c:798
 #: ../libpurple/protocols/gg/gg.c:879
-#: ../libpurple/protocols/jabber/buddy.c:584
-#: ../libpurple/protocols/jabber/buddy.c:1788
-#: ../libpurple/protocols/jabber/buddy.c:1824
+#: ../libpurple/protocols/jabber/buddy.c:588
+#: ../libpurple/protocols/jabber/buddy.c:1826
+#: ../libpurple/protocols/jabber/buddy.c:1862
 #: ../libpurple/protocols/jabber/chat.c:786
 #: ../libpurple/protocols/jabber/jabber.c:882
-#: ../libpurple/protocols/jabber/jabber.c:1390
+#: ../libpurple/protocols/jabber/jabber.c:1384
 #: ../libpurple/protocols/jabber/si.c:868
 #: ../libpurple/protocols/jabber/xdata.c:337
 #: ../libpurple/protocols/msn/msn.c:259
@@ -163,16 +174,16 @@
 #: ../libpurple/protocols/msn/msn.c:293
 #: ../libpurple/protocols/msn/msn.c:310
 #: ../libpurple/protocols/msn/msn.c:331
-#: ../libpurple/protocols/oscar/oscar.c:6071
+#: ../libpurple/protocols/oscar/oscar.c:6073
 #: ../libpurple/protocols/oscar/peer.c:1023
 #: ../libpurple/protocols/qq/buddy_info.c:484
 #: ../libpurple/protocols/qq/buddy_opt.c:214
 #: ../libpurple/protocols/qq/buddy_opt.c:409
 #: ../libpurple/protocols/qq/group.c:124
-#: ../libpurple/protocols/qq/group_join.c:138
-#: ../libpurple/protocols/qq/group_join.c:363
-#: ../libpurple/protocols/qq/group_opt.c:143
-#: ../libpurple/protocols/qq/group_opt.c:398
+#: ../libpurple/protocols/qq/group_join.c:140
+#: ../libpurple/protocols/qq/group_join.c:365
+#: ../libpurple/protocols/qq/group_opt.c:144
+#: ../libpurple/protocols/qq/group_opt.c:399
 #: ../libpurple/protocols/qq/sys_msg.c:115
 #: ../libpurple/protocols/qq/sys_msg.c:174
 #: ../libpurple/protocols/qq/sys_msg.c:269
@@ -201,96 +212,99 @@
 #: ../libpurple/protocols/yahoo/yahoo.c:989
 #: ../libpurple/protocols/yahoo/yahoo.c:3248
 #: ../libpurple/protocols/yahoo/yahoo.c:3259
-#: ../pidgin/gtkaccount.c:1916
-#: ../pidgin/gtkaccount.c:2514
-#: ../pidgin/gtkblist.c:5898
-#: ../pidgin/gtkdialogs.c:724
-#: ../pidgin/gtkdialogs.c:871
-#: ../pidgin/gtkdialogs.c:963
-#: ../pidgin/gtkdialogs.c:983
-#: ../pidgin/gtkdialogs.c:1007
-#: ../pidgin/gtkdialogs.c:1029
-#: ../pidgin/gtkdialogs.c:1077
-#: ../pidgin/gtkdialogs.c:1118
-#: ../pidgin/gtkdialogs.c:1174
-#: ../pidgin/gtkdialogs.c:1213
-#: ../pidgin/gtkdialogs.c:1240
-#: ../pidgin/gtkimhtmltoolbar.c:423
-#: ../pidgin/gtklog.c:302
+#: ../pidgin/gtkaccount.c:1908
+#: ../pidgin/gtkaccount.c:2501
+#: ../pidgin/gtkblist.c:5915
+#: ../pidgin/gtkdialogs.c:727
+#: ../pidgin/gtkdialogs.c:865
+#: ../pidgin/gtkdialogs.c:957
+#: ../pidgin/gtkdialogs.c:977
+#: ../pidgin/gtkdialogs.c:1001
+#: ../pidgin/gtkdialogs.c:1023
+#: ../pidgin/gtkdialogs.c:1071
+#: ../pidgin/gtkdialogs.c:1112
+#: ../pidgin/gtkdialogs.c:1168
+#: ../pidgin/gtkdialogs.c:1207
+#: ../pidgin/gtkdialogs.c:1234
+#: ../pidgin/gtkimhtmltoolbar.c:425
+#: ../pidgin/gtklog.c:327
 #: ../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/gtkpounce.c:1115
+#: ../pidgin/gtkprivacy.c:562
+#: ../pidgin/gtkprivacy.c:578
+#: ../pidgin/gtkprivacy.c:603
+#: ../pidgin/gtkprivacy.c:617
 #: ../pidgin/gtkrequest.c:270
-#: ../pidgin/gtksavedstatuses.c:337
+#: ../pidgin/gtksavedstatuses.c:344
+#: ../pidgin/gtkstatusbox.c:1582
 msgid "Cancel"
 msgstr "Prekliči"
 
 #. Save button
 #. Save
-#: ../finch/gntaccount.c:558
-#: ../finch/gntplugin.c:360
+#: ../finch/gntaccount.c:572
+#: ../finch/gntplugin.c:378
 #: ../finch/gntpounce.c:462
-#: ../finch/gntprefs.c:246
-#: ../finch/gntstatus.c:478
-#: ../finch/gntstatus.c:588
+#: ../finch/gntprefs.c:264
+#: ../finch/gntstatus.c:481
+#: ../finch/gntstatus.c:591
 #: ../libpurple/account.c:1268
 #: ../libpurple/plugins/buddynote.c:50
-#: ../libpurple/protocols/jabber/buddy.c:583
+#: ../libpurple/protocols/jabber/buddy.c:587
 #: ../pidgin/gtkdebug.c:748
 #: ../pidgin/gtkrequest.c:276
 msgid "Save"
 msgstr "Shrani"
 
-#: ../finch/gntaccount.c:611
-#: ../pidgin/gtkaccount.c:1908
-#: ../pidgin/gtksavedstatuses.c:328
+#: ../finch/gntaccount.c:625
+#: ../pidgin/gtkaccount.c:1900
+#: ../pidgin/gtksavedstatuses.c:332
+#: ../pidgin/gtkstatusbox.c:1576
 #, c-format
 msgid "Are you sure you want to delete %s?"
 msgstr "Ste prepričani, da želite izbrisati %s?"
 
-#: ../finch/gntaccount.c:614
+#: ../finch/gntaccount.c:628
 msgid "Delete Account"
 msgstr "Izbriši račun"
 
 #. Delete button
-#: ../finch/gntaccount.c:616
-#: ../finch/gntaccount.c:683
+#: ../finch/gntaccount.c:630
+#: ../finch/gntaccount.c:699
 #: ../finch/gntpounce.c:653
-#: ../finch/gntpounce.c:714
-#: ../finch/gntstatus.c:141
-#: ../finch/gntstatus.c:204
-#: ../pidgin/gtkaccount.c:1915
-#: ../pidgin/gtklog.c:301
-#: ../pidgin/gtkpounce.c:1101
+#: ../finch/gntpounce.c:715
+#: ../finch/gntstatus.c:142
+#: ../finch/gntstatus.c:207
+#: ../pidgin/gtkaccount.c:1907
+#: ../pidgin/gtklog.c:326
+#: ../pidgin/gtkpounce.c:1114
 #: ../pidgin/gtkrequest.c:273
-#: ../pidgin/gtksavedstatuses.c:336
+#: ../pidgin/gtksavedstatuses.c:343
+#: ../pidgin/gtkstatusbox.c:1581
 msgid "Delete"
 msgstr "Izbriši"
 
-#: ../finch/gntaccount.c:646
-#: ../finch/gntblist.c:2065
-#: ../finch/gntui.c:76
-#: ../pidgin/gtkaccount.c:2340
+#: ../finch/gntaccount.c:662
+#: ../finch/gntblist.c:2104
+#: ../finch/gntui.c:77
+#: ../pidgin/gtkaccount.c:2327
 #: ../pidgin/gtkdocklet.c:522
 msgid "Accounts"
 msgstr "Računi"
 
-#: ../finch/gntaccount.c:652
+#: ../finch/gntaccount.c:668
 msgid "You can enable/disable accounts from the following list."
 msgstr "Račune lahko omogočite ali onemogočite na naslednjem seznamu."
 
 #. Add button
-#: ../finch/gntaccount.c:675
-#: ../finch/gntaccount.c:852
-#: ../finch/gntblist.c:333
-#: ../finch/gntblist.c:403
-#: ../finch/gntblist.c:438
-#: ../finch/gntnotify.c:369
-#: ../finch/gntpounce.c:699
-#: ../finch/gntstatus.c:194
+#: ../finch/gntaccount.c:691
+#: ../finch/gntaccount.c:874
+#: ../finch/gntblist.c:342
+#: ../finch/gntblist.c:412
+#: ../finch/gntblist.c:447
+#: ../finch/gntnotify.c:379
+#: ../finch/gntpounce.c:700
+#: ../finch/gntstatus.c:197
 #: ../libpurple/protocols/gg/gg.c:878
 #: ../libpurple/protocols/qq/sys_msg.c:116
 #: ../libpurple/protocols/qq/sys_msg.c:175
@@ -298,121 +312,122 @@
 #: ../libpurple/protocols/sametime/sametime.c:5486
 #: ../libpurple/protocols/silc/chat.c:615
 #: ../libpurple/protocols/silc10/chat.c:599
-#: ../pidgin/gtkaccount.c:2513
-#: ../pidgin/gtkblist.c:5897
-#: ../pidgin/gtkconv.c:1687
+#: ../pidgin/gtkaccount.c:2500
+#: ../pidgin/gtkblist.c:5914
+#: ../pidgin/gtkconv.c:1651
 #: ../pidgin/gtkrequest.c:274
 msgid "Add"
 msgstr "Dodaj"
 
 #. Modify button
-#: ../finch/gntaccount.c:679
-#: ../finch/gntpounce.c:706
+#: ../finch/gntaccount.c:695
+#: ../finch/gntpounce.c:707
 msgid "Modify"
 msgstr "Spremeni"
 
-#: ../finch/gntaccount.c:775
-#: ../pidgin/gtkaccount.c:2460
+#: ../finch/gntaccount.c:797
+#: ../pidgin/gtkaccount.c:2447
 #, c-format
 msgid "%s%s%s%s has made %s his or her buddy%s%s"
 msgstr "%s%s%s%s je nastavil %s za svojega prijatelja%s%s"
 
-#: ../finch/gntaccount.c:848
-#: ../pidgin/gtkaccount.c:2512
+#: ../finch/gntaccount.c:870
+#: ../pidgin/gtkaccount.c:2499
 msgid "Add buddy to your list?"
 msgstr "Želite dodati prijatelja na seznam?"
 
-#: ../finch/gntaccount.c:902
-#: ../pidgin/gtkaccount.c:2564
+#: ../finch/gntaccount.c:924
+#: ../pidgin/gtkaccount.c:2551
 #, c-format
 msgid "%s%s%s%s wants to add %s to his or her buddy list%s%s"
 msgstr "Uporabnik %s%s%s%s želi dodati %s na svoj seznam prijateljev%s%s."
 
-#: ../finch/gntaccount.c:922
-#: ../finch/gntaccount.c:929
-#: ../pidgin/gtkaccount.c:2587
-#: ../pidgin/gtkaccount.c:2593
+#: ../finch/gntaccount.c:949
+#: ../finch/gntaccount.c:952
+#: ../finch/gntaccount.c:979
+#: ../pidgin/gtkaccount.c:2574
+#: ../pidgin/gtkaccount.c:2580
 msgid "Authorize buddy?"
 msgstr "Želite pooblastiti prijatelja?"
 
-#: ../finch/gntaccount.c:926
-#: ../finch/gntaccount.c:933
-#: ../pidgin/gtkaccount.c:2588
-#: ../pidgin/gtkaccount.c:2594
+#: ../finch/gntaccount.c:956
+#: ../finch/gntaccount.c:983
+#: ../pidgin/gtkaccount.c:2575
+#: ../pidgin/gtkaccount.c:2581
 msgid "Authorize"
 msgstr "Pooblasti"
 
-#: ../finch/gntaccount.c:927
-#: ../finch/gntaccount.c:934
-#: ../pidgin/gtkaccount.c:2589
-#: ../pidgin/gtkaccount.c:2595
+#: ../finch/gntaccount.c:957
+#: ../finch/gntaccount.c:984
+#: ../pidgin/gtkaccount.c:2576
+#: ../pidgin/gtkaccount.c:2582
 msgid "Deny"
 msgstr "Zavrni"
 
-#: ../finch/gntblist.c:279
+#: ../finch/gntblist.c:288
 msgid "You must provide a screename for the buddy."
 msgstr "Za prijatelja morate vnesti pojavno ime."
 
-#: ../finch/gntblist.c:281
+#: ../finch/gntblist.c:290
 msgid "You must provide a group."
 msgstr "Vnesti morate skupino."
 
-#: ../finch/gntblist.c:283
+#: ../finch/gntblist.c:292
 msgid "You must select an account."
 msgstr "Izberite račun."
 
-#: ../finch/gntblist.c:285
+#: ../finch/gntblist.c:294
 msgid "The selected account is not online."
 msgstr "Izbrani račun ni povezan."
 
-#: ../finch/gntblist.c:290
+#: ../finch/gntblist.c:299
 msgid "Error adding buddy"
 msgstr "Napaka pri dodajanju prijatelja"
 
-#: ../finch/gntblist.c:315
-#: ../libpurple/protocols/oscar/oscar.c:2863
-#: ../pidgin/gtkaccount.c:1991
-#: ../pidgin/gtksavedstatuses.c:924
+#: ../finch/gntblist.c:324
+#: ../libpurple/protocols/oscar/oscar.c:2864
+#: ../pidgin/gtkaccount.c:1983
+#: ../pidgin/gtksavedstatuses.c:979
 msgid "Screen Name"
 msgstr "Ime"
 
-#: ../finch/gntblist.c:318
-#: ../finch/gntblist.c:395
-#: ../finch/gntblist.c:1211
+#: ../finch/gntblist.c:327
+#: ../finch/gntblist.c:404
+#: ../finch/gntblist.c:1240
 #: ../libpurple/protocols/msn/msn.c:1364
 #: ../libpurple/protocols/silc/chat.c:606
 #: ../libpurple/protocols/silc10/chat.c:590
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:680
 #: ../libpurple/protocols/zephyr/zephyr.c:788
 #: ../libpurple/protocols/zephyr/zephyr.c:1207
-#: ../pidgin/gtkdialogs.c:982
-#: ../pidgin/gtkdialogs.c:1006
-#: ../pidgin/gtkdialogs.c:1028
+#: ../pidgin/gtkdialogs.c:976
+#: ../pidgin/gtkdialogs.c:1000
+#: ../pidgin/gtkdialogs.c:1022
 #: ../pidgin/gtkrequest.c:277
 msgid "Alias"
 msgstr "Psevdonim"
 
-#: ../finch/gntblist.c:321
-#: ../finch/gntblist.c:398
+#: ../finch/gntblist.c:330
+#: ../finch/gntblist.c:407
 msgid "Group"
 msgstr "Združi"
 
-#: ../finch/gntblist.c:325
-#: ../finch/gntblist.c:386
-#: ../finch/gntblist.c:1261
-#: ../finch/gntnotify.c:171
-#: ../finch/gntstatus.c:566
+#: ../finch/gntblist.c:334
+#: ../finch/gntblist.c:395
+#: ../finch/gntblist.c:1292
+#: ../finch/gntnotify.c:173
+#: ../finch/gntstatus.c:569
 #: ../libpurple/plugins/idle.c:153
 #: ../libpurple/plugins/idle.c:190
-#: ../pidgin/gtkblist.c:2984
+#: ../pidgin/gtkblist.c:2974
 #: ../pidgin/gtknotify.c:482
-#: ../pidgin/gtkpounce.c:1269
+#: ../pidgin/gtkpounce.c:1282
 #: ../pidgin/plugins/gevolution/gevolution.c:443
 msgid "Account"
 msgstr "Račun"
 
-#: ../finch/gntblist.c:331
-#: ../finch/gntblist.c:819
+#: ../finch/gntblist.c:340
+#: ../finch/gntblist.c:843
 #: ../libpurple/protocols/silc/buddy.c:725
 #: ../libpurple/protocols/silc/buddy.c:1027
 #: ../libpurple/protocols/silc/buddy.c:1072
@@ -422,204 +437,198 @@
 #: ../libpurple/protocols/silc10/buddy.c:1080
 #: ../libpurple/protocols/silc10/buddy.c:1180
 #: ../libpurple/protocols/yahoo/yahoo.c:3161
-#: ../pidgin/gtkblist.c:5403
-#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:447
+#: ../pidgin/gtkblist.c:5420
+#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:445
 msgid "Add Buddy"
 msgstr "Dodaj prijatelja"
 
-#: ../finch/gntblist.c:331
+#: ../finch/gntblist.c:340
 msgid "Please enter buddy information."
 msgstr "Prosimo, vnesite podatke o prijatelju."
 
-#: ../finch/gntblist.c:358
-#: ../libpurple/blist.c:1192
+#: ../finch/gntblist.c:367
+#: ../libpurple/blist.c:1190
 msgid "Chats"
 msgstr "Pomenki"
 
 #. Extract their Name and put it in
-#: ../finch/gntblist.c:392
+#: ../finch/gntblist.c:401
 #: ../libpurple/protocols/jabber/jabber.c:813
 #: ../libpurple/protocols/msn/msn.c:1553
 #: ../libpurple/protocols/msn/msn.c:1618
 #: ../libpurple/protocols/msn/msn.c:1645
 #: ../libpurple/protocols/qq/buddy_info.c:44
 #: ../pidgin/gtkplugin.c:581
-#: ../pidgin/gtkroomlist.c:621
+#: ../pidgin/gtkroomlist.c:617
 #: ../pidgin/plugins/gevolution/add_buddy_dialog.c:132
 #: ../pidgin/plugins/gevolution/assoc-buddy.c:123
 msgid "Name"
 msgstr "Ime"
 
-#: ../finch/gntblist.c:401
-#: ../finch/gntblist.c:821
-#: ../pidgin/gtkblist.c:5783
+#: ../finch/gntblist.c:410
+#: ../finch/gntblist.c:845
+#: ../pidgin/gtkblist.c:5800
 msgid "Add Chat"
 msgstr "Dodaj pomenek"
 
-#: ../finch/gntblist.c:402
+#: ../finch/gntblist.c:411
 msgid "You can edit more information from the context menu later."
 msgstr "Kasneje lahko še več podatkov uredite prek pojavnega menija."
 
-#: ../finch/gntblist.c:415
-#: ../finch/gntblist.c:428
+#: ../finch/gntblist.c:424
+#: ../finch/gntblist.c:437
 msgid "Error adding group"
 msgstr "Napaka pri dodajanju skupine"
 
-#: ../finch/gntblist.c:416
+#: ../finch/gntblist.c:425
 msgid "You must give a name for the group to add."
 msgstr "Vnesti morate ime skupine, ki jo želite dodati."
 
-#: ../finch/gntblist.c:429
+#: ../finch/gntblist.c:438
 msgid "A group with the name already exists."
 msgstr "Skupina s tem imenom že obstaja."
 
-#: ../finch/gntblist.c:436
-#: ../finch/gntblist.c:823
+#: ../finch/gntblist.c:445
+#: ../finch/gntblist.c:847
 #: ../libpurple/protocols/sametime/sametime.c:5396
 #: ../libpurple/protocols/sametime/sametime.c:5484
-#: ../pidgin/gtkblist.c:5894
+#: ../pidgin/gtkblist.c:5911
 msgid "Add Group"
 msgstr "Dodaj skupino"
 
-#: ../finch/gntblist.c:436
+#: ../finch/gntblist.c:445
 msgid "Enter the name of the group"
 msgstr "Vnesite ime skupine"
 
-#: ../finch/gntblist.c:769
+#: ../finch/gntblist.c:793
 msgid "Edit Chat"
 msgstr "Uredi pomenek"
 
-#: ../finch/gntblist.c:769
+#: ../finch/gntblist.c:793
 msgid "Please Update the necessary fields."
 msgstr "Prosimo, posodobite potrebna polja."
 
-#: ../finch/gntblist.c:770
-#: ../finch/gntstatus.c:199
+#: ../finch/gntblist.c:794
+#: ../finch/gntstatus.c:202
 msgid "Edit"
 msgstr "Uredi"
 
-#: ../finch/gntblist.c:786
+#: ../finch/gntblist.c:810
 msgid "Auto-join"
 msgstr "Samodejno spoji"
 
-#: ../finch/gntblist.c:795
+#: ../finch/gntblist.c:819
 msgid "Edit Settings"
 msgstr "Uredi nastavitve"
 
-#: ../finch/gntblist.c:833
-#: ../finch/gntconv.c:317
-#: ../pidgin/gtkblist.c:277
-#: ../pidgin/gtkconv.c:682
-#: ../pidgin/gtkdialogs.c:830
+#: ../finch/gntblist.c:855
+#: ../pidgin/gtkutils.c:926
 msgid "Information"
 msgstr "Podatki"
 
-#: ../finch/gntblist.c:833
-#: ../finch/gntconv.c:317
-#: ../pidgin/gtkblist.c:277
-#: ../pidgin/gtkconv.c:682
-#: ../pidgin/gtkdialogs.c:830
+#: ../finch/gntblist.c:855
+#: ../pidgin/gtkutils.c:926
 msgid "Retrieving..."
 msgstr "Pridobivanje poteka ..."
 
-#: ../finch/gntblist.c:866
-#: ../finch/gntconv.c:418
+#: ../finch/gntblist.c:895
+#: ../finch/gntconv.c:407
 #: ../libpurple/protocols/silc/chat.c:899
 #: ../libpurple/protocols/silc10/chat.c:883
 msgid "Get Info"
 msgstr "Informacije"
 
-#: ../finch/gntblist.c:870
+#: ../finch/gntblist.c:899
 msgid "Add Buddy Pounce"
 msgstr "Dodaj opozorilo prijatelju"
 
 #. if (q_bud && is_online(q_bud->status)) {
-#: ../finch/gntblist.c:877
-#: ../finch/gntconv.c:430
+#: ../finch/gntblist.c:906
+#: ../finch/gntconv.c:419
 #: ../libpurple/protocols/jabber/si.c:868
 #: ../libpurple/protocols/oscar/oscar.c:654
 #: ../libpurple/protocols/qq/qq.c:585
-#: ../pidgin/gtkconv.c:1635
+#: ../pidgin/gtkconv.c:1599
 msgid "Send File"
 msgstr "Pošlji datoteko"
 
-#: ../finch/gntblist.c:881
+#: ../finch/gntblist.c:910
 msgid "View Log"
 msgstr "Pokaži dnevnik"
 
-#: ../finch/gntblist.c:962
+#: ../finch/gntblist.c:991
 #, c-format
 msgid "Please enter the new name for %s"
 msgstr "Prosimo, vnesite novo ime za %s"
 
-#: ../finch/gntblist.c:964
-#: ../finch/gntblist.c:1211
+#: ../finch/gntblist.c:993
+#: ../finch/gntblist.c:1240
 msgid "Rename"
 msgstr "Preimenuj"
 
-#: ../finch/gntblist.c:964
+#: ../finch/gntblist.c:993
 msgid "Set Alias"
 msgstr "Nastavi psevdonim"
 
-#: ../finch/gntblist.c:965
+#: ../finch/gntblist.c:994
 msgid "Enter empty string to reset the name."
 msgstr "Vnesite prazen niz da ponastavite ime."
 
-#: ../finch/gntblist.c:1041
+#: ../finch/gntblist.c:1070
 msgid "Removing this contact will also remove all the buddies in the contact"
 msgstr "Z odstranitvijo tega stika boste odstranili tudi vse prijatelje iz stika"
 
-#: ../finch/gntblist.c:1049
+#: ../finch/gntblist.c:1078
 msgid "Removing this group will also remove all the buddies in the group"
 msgstr "Z odstranitvijo te skupine boste odstranili tudi vse prijatelje iz skupine"
 
-#: ../finch/gntblist.c:1054
+#: ../finch/gntblist.c:1083
 #, c-format
 msgid "Are you sure you want to remove %s?"
 msgstr "Ste prepričani, da želite odstraniti %s?"
 
 #. XXX: anything to do with the returned ui-handle?
-#: ../finch/gntblist.c:1057
+#: ../finch/gntblist.c:1086
 msgid "Confirm Remove"
 msgstr "Potrditev odstranitve"
 
-#: ../finch/gntblist.c:1062
-#: ../finch/gntblist.c:1213
-#: ../finch/gntft.c:223
-#: ../pidgin/gtkconv.c:1684
+#: ../finch/gntblist.c:1091
+#: ../finch/gntblist.c:1242
+#: ../finch/gntft.c:224
+#: ../pidgin/gtkconv.c:1648
 #: ../pidgin/gtkrequest.c:275
-#: ../pidgin/gtkstatusbox.c:261
+#: ../pidgin/gtkstatusbox.c:263
 msgid "Remove"
 msgstr "Odstrani"
 
 #. Buddy List
-#: ../finch/gntblist.c:1187
-#: ../finch/gntblist.c:2237
-#: ../finch/gntprefs.c:240
-#: ../finch/gntui.c:77
-#: ../pidgin/gtkblist.c:4249
+#: ../finch/gntblist.c:1216
+#: ../finch/gntblist.c:2283
+#: ../finch/gntprefs.c:257
+#: ../finch/gntui.c:78
+#: ../pidgin/gtkblist.c:4256
 #: ../pidgin/plugins/win32/winprefs/winprefs.c:330
 msgid "Buddy List"
 msgstr "Seznam prijateljev"
 
-#: ../finch/gntblist.c:1218
+#: ../finch/gntblist.c:1247
 msgid "Place tagged"
 msgstr "Označeno mesto"
 
-#: ../finch/gntblist.c:1223
+#: ../finch/gntblist.c:1252
 msgid "Toggle Tag"
 msgstr "Pokaži/skrij oznako"
 
 #. General
-#: ../finch/gntblist.c:1256
+#: ../finch/gntblist.c:1287
 #: ../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/gg/gg.c:1118
+#: ../libpurple/protocols/gg/gg.c:2202
 #: ../libpurple/protocols/jabber/buddy.c:274
-#: ../libpurple/protocols/jabber/buddy.c:818
-#: ../libpurple/protocols/jabber/buddy.c:1589
-#: ../libpurple/protocols/jabber/buddy.c:1771
+#: ../libpurple/protocols/jabber/buddy.c:856
+#: ../libpurple/protocols/jabber/buddy.c:1627
+#: ../libpurple/protocols/jabber/buddy.c:1809
 #: ../libpurple/protocols/jabber/jabber.c:823
 #: ../libpurple/protocols/msn/msn.c:1372
 #: ../libpurple/protocols/msn/msn.c:1556
@@ -633,43 +642,47 @@
 #: ../libpurple/protocols/silc10/ops.c:1179
 #: ../libpurple/protocols/silc10/ops.c:1328
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1042
-#: ../pidgin/gtkblist.c:3008
+#: ../pidgin/gtkblist.c:2998
 msgid "Nickname"
 msgstr "Vzdevek"
 
 #. Idle stuff
-#: ../finch/gntblist.c:1276
-#: ../finch/gntprefs.c:243
+#: ../finch/gntblist.c:1307
+#: ../finch/gntprefs.c:260
 #: ../libpurple/protocols/bonjour/bonjour.c:314
-#: ../libpurple/protocols/jabber/buddy.c:643
-#: ../libpurple/protocols/jabber/buddy.c:683
+#: ../libpurple/protocols/jabber/buddy.c:647
+#: ../libpurple/protocols/jabber/buddy.c:687
 #: ../libpurple/protocols/msn/msn.c:516
 #: ../libpurple/protocols/msn/state.c:32
 #: ../libpurple/protocols/novell/novell.c:2825
-#: ../libpurple/protocols/oscar/oscar.c:2887
+#: ../libpurple/protocols/oscar/oscar.c:2888
 #: ../libpurple/protocols/yahoo/yahoo.c:2915
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:686
-#: ../pidgin/gtkblist.c:3035
-#: ../pidgin/gtkblist.c:3428
-#: ../pidgin/gtkprefs.c:1848
+#: ../pidgin/gtkblist.c:3026
+#: ../pidgin/gtkblist.c:3435
+#: ../pidgin/gtkprefs.c:1918
 msgid "Idle"
 msgstr "Nedejaven"
 
-#: ../finch/gntblist.c:1365
+#: ../finch/gntblist.c:1320
+msgid "On Mobile"
+msgstr "Na mobilcu"
+
+#: ../finch/gntblist.c:1400
 #, c-format
 msgid ""
 "Online: %d\n"
 "Total: %d"
 msgstr ""
-"Online: %d\n"
-"Total: %d"
-
-#: ../finch/gntblist.c:1374
+"Povezanih: %d\n"
+"Skupaj: %d"
+
+#: ../finch/gntblist.c:1409
 #, c-format
 msgid "Account: %s (%s)"
 msgstr "Račun: %s (%s)"
 
-#: ../finch/gntblist.c:1386
+#: ../finch/gntblist.c:1421
 #, c-format
 msgid ""
 "\n"
@@ -678,64 +691,64 @@
 "\n"
 "Zadnjič viden: pred %s leti"
 
-#: ../finch/gntblist.c:1651
+#: ../finch/gntblist.c:1687
 #: ../pidgin/gtkdocklet.c:470
-#: ../pidgin/gtkstatusbox.c:1064
+#: ../pidgin/gtkstatusbox.c:1070
 msgid "New..."
 msgstr "Novo ..."
 
-#: ../finch/gntblist.c:1658
+#: ../finch/gntblist.c:1694
 #: ../pidgin/gtkdocklet.c:471
-#: ../pidgin/gtkstatusbox.c:1065
+#: ../pidgin/gtkstatusbox.c:1071
 msgid "Saved..."
 msgstr "Datoteka shranjena ..."
 
-#: ../finch/gntblist.c:2033
-#: ../finch/gntplugin.c:244
-#: ../finch/gntui.c:81
+#: ../finch/gntblist.c:2072
+#: ../finch/gntplugin.c:254
+#: ../finch/gntui.c:82
 #: ../pidgin/gtkdocklet.c:523
 #: ../pidgin/gtkplugin.c:530
 msgid "Plugins"
 msgstr "Vstavki"
 
-#: ../finch/gntblist.c:2141
-#: ../pidgin/gtkdialogs.c:705
-#: ../pidgin/gtkdialogs.c:852
-#: ../pidgin/gtkdialogs.c:933
+#: ../finch/gntblist.c:2179
+#: ../pidgin/gtkdialogs.c:708
+#: ../pidgin/gtkdialogs.c:846
+#: ../pidgin/gtkdialogs.c:927
 msgid "_Name"
 msgstr "_Ime"
 
-#: ../finch/gntblist.c:2146
-#: ../pidgin/gtkdialogs.c:710
-#: ../pidgin/gtkdialogs.c:857
-#: ../pidgin/gtkdialogs.c:938
+#: ../finch/gntblist.c:2184
+#: ../pidgin/gtkdialogs.c:713
+#: ../pidgin/gtkdialogs.c:851
+#: ../pidgin/gtkdialogs.c:932
 msgid "_Account"
 msgstr "_Račun"
 
-#: ../finch/gntblist.c:2154
-#: ../pidgin/gtkdialogs.c:718
+#: ../finch/gntblist.c:2192
+#: ../pidgin/gtkdialogs.c:721
 msgid "New Instant Message"
 msgstr "Novo neposredno sporočilo"
 
-#: ../finch/gntblist.c:2156
-#: ../pidgin/gtkdialogs.c:720
+#: ../finch/gntblist.c:2194
+#: ../pidgin/gtkdialogs.c:723
 msgid "Please enter the screen name or alias of the person you would like to IM."
 msgstr "Vnesite pojavno ime ali psevdonim osebe, ki ji želite poslati neposredno sporočilo."
 
-#: ../finch/gntblist.c:2159
-#: ../finch/gntnotify.c:77
+#: ../finch/gntblist.c:2197
+#: ../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:1389
+#: ../libpurple/protocols/jabber/jabber.c:1383
 #: ../libpurple/protocols/jabber/xdata.c:336
 #: ../libpurple/protocols/msn/msn.c:258
 #: ../libpurple/protocols/msn/msn.c:275
 #: ../libpurple/protocols/msn/msn.c:292
 #: ../libpurple/protocols/msn/msn.c:309
-#: ../libpurple/protocols/oscar/oscar.c:6070
+#: ../libpurple/protocols/oscar/oscar.c:6072
 #: ../libpurple/protocols/silc/buddy.c:454
 #: ../libpurple/protocols/silc/buddy.c:1190
 #: ../libpurple/protocols/silc/chat.c:447
@@ -755,52 +768,56 @@
 #: ../libpurple/protocols/yahoo/yahoo.c:988
 #: ../libpurple/protocols/yahoo/yahoo.c:3247
 #: ../libpurple/protocols/yahoo/yahoo.c:3258
-#: ../pidgin/gtkblist.c:4004
-#: ../pidgin/gtkdialogs.c:723
-#: ../pidgin/gtkdialogs.c:870
-#: ../pidgin/gtkdialogs.c:962
+#: ../pidgin/gtkblist.c:4013
+#: ../pidgin/gtkdialogs.c:726
+#: ../pidgin/gtkdialogs.c:864
+#: ../pidgin/gtkdialogs.c:956
 #: ../pidgin/gtkrequest.c:269
 msgid "OK"
 msgstr "V redu"
 
 #. Create the "Options" frame.
-#: ../finch/gntblist.c:2179
+#: ../finch/gntblist.c:2217
 #: ../finch/gntpounce.c:444
-#: ../pidgin/gtkpounce.c:778
+#: ../pidgin/gtkpounce.c:791
 msgid "Options"
 msgstr "Možnosti"
 
-#: ../finch/gntblist.c:2185
+#: ../finch/gntblist.c:2223
 msgid "Send IM..."
 msgstr "Pošllji sporočilo ..."
 
-#: ../finch/gntblist.c:2189
+#: ../finch/gntblist.c:2227
+msgid "Show empty groups"
+msgstr "Pokaži prazne skupine"
+
+#: ../finch/gntblist.c:2233
 msgid "Show offline buddies"
 msgstr "Prikaži nepovezane prijatelje"
 
-#: ../finch/gntblist.c:2195
+#: ../finch/gntblist.c:2239
 msgid "Sort by status"
 msgstr "Razvrsti po stanju"
 
-#: ../finch/gntblist.c:2199
+#: ../finch/gntblist.c:2243
 msgid "Sort alphabetically"
 msgstr "Razvrsti po abecedi"
 
-#: ../finch/gntblist.c:2203
+#: ../finch/gntblist.c:2247
 msgid "Sort by log size"
 msgstr "Razvrsti po obsegu dnevnika"
 
-#: ../finch/gntconn.c:109
+#: ../finch/gntconn.c:110
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../finch/gntconn.c:112
+#: ../finch/gntconn.c:113
 #, c-format
 msgid "%s disconnected."
 msgstr "%s se je odjavil."
 
-#: ../finch/gntconn.c:113
+#: ../finch/gntconn.c:114
 #, c-format
 msgid ""
 "%s\n"
@@ -811,51 +828,47 @@
 "\n"
 "Finch se ne bo poskušal ponovno prijaviti, dokler ne odpravite napake in ponovno omogočite povezovanje računa."
 
-#: ../finch/gntconv.c:116
+#: ../finch/gntconv.c:117
 msgid "No such command."
 msgstr "Ta ukaz ne obstaja."
 
-#: ../finch/gntconv.c:120
-#: ../pidgin/gtkconv.c:513
+#: ../finch/gntconv.c:121
+#: ../pidgin/gtkconv.c:492
 msgid "Syntax Error:  You typed the wrong number of arguments to that command."
 msgstr "Skladenjska napaka: vtipkali ste napačno število argumentov za ta ukaz."
 
-#: ../finch/gntconv.c:125
-#: ../pidgin/gtkconv.c:518
+#: ../finch/gntconv.c:126
+#: ../pidgin/gtkconv.c:498
 msgid "Your command failed for an unknown reason."
 msgstr "Vaš ukaz iz neznanega razloga ni uspel."
 
-#: ../finch/gntconv.c:130
-#: ../pidgin/gtkconv.c:524
+#: ../finch/gntconv.c:131
+#: ../pidgin/gtkconv.c:505
 msgid "That command only works in chats, not IMs."
 msgstr "Ta ukaz deluje samo v klepetih in ne v neposrednih sporočilih."
 
-#: ../finch/gntconv.c:133
-#: ../pidgin/gtkconv.c:527
+#: ../finch/gntconv.c:134
+#: ../pidgin/gtkconv.c:508
 msgid "That command only works in IMs, not chats."
 msgstr "Ta ukaz deluje samo v neposrednih sporočilih in ne v klepetih."
 
-#: ../finch/gntconv.c:137
-#: ../pidgin/gtkconv.c:531
+#: ../finch/gntconv.c:138
+#: ../pidgin/gtkconv.c:513
 msgid "That command doesn't work on this protocol."
 msgstr "Ta ukaz ne deluje na tem protokolu."
 
-#: ../finch/gntconv.c:144
-msgid "Commands are not supported yet. Message was NOT sent."
-msgstr "Ukazi trenutno še niso podprti. Sporočilo NI bilo poslano."
-
-#: ../finch/gntconv.c:230
+#: ../finch/gntconv.c:224
 #, c-format
 msgid "%s (%s -- %s)"
 msgstr "%s (%s -- %s)"
 
-#: ../finch/gntconv.c:253
+#: ../finch/gntconv.c:247
 #, c-format
 msgid "%s [%s]"
 msgstr "%s [%s]"
 
-#: ../finch/gntconv.c:258
-#: ../finch/gntconv.c:619
+#: ../finch/gntconv.c:252
+#: ../finch/gntconv.c:647
 #, c-format
 msgid ""
 "\n"
@@ -864,52 +877,52 @@
 "\n"
 "%s tipka ..."
 
-#: ../finch/gntconv.c:277
+#: ../finch/gntconv.c:271
 msgid "You have left this chat."
 msgstr "Ta klepet ste zapustili."
 
-#: ../finch/gntconv.c:353
+#: ../finch/gntconv.c:342
 msgid "Send To"
 msgstr "Pošlji k"
 
-#: ../finch/gntconv.c:397
+#: ../finch/gntconv.c:386
 msgid "Conversation"
 msgstr "Pogovor"
 
-#: ../finch/gntconv.c:403
+#: ../finch/gntconv.c:392
 msgid "Clear Scrollback"
 msgstr "Počisti pretekle izjave"
 
-#: ../finch/gntconv.c:407
-#: ../finch/gntprefs.c:178
+#: ../finch/gntconv.c:396
+#: ../finch/gntprefs.c:190
 msgid "Show Timestamps"
 msgstr "Pokaži časovne žige"
 
-#: ../finch/gntconv.c:423
+#: ../finch/gntconv.c:412
 msgid "Add Buddy Pounce..."
 msgstr "Dodaj opozorilo prijatelju ..."
 
-#: ../finch/gntconv.c:586
+#: ../finch/gntconv.c:614
 msgid "<AUTO-REPLY> "
 msgstr "<SAMODEJNI ODGOVOR>"
 
 #. Print the list of users in the room
-#: ../finch/gntconv.c:702
+#: ../finch/gntconv.c:735
 msgid "List of users:\n"
 msgstr "Seznam uporabnikov:\n"
 
-#: ../finch/gntconv.c:847
-#: ../pidgin/gtkconv.c:394
+#: ../finch/gntconv.c:880
+#: ../pidgin/gtkconv.c:335
 msgid "Supported debug options are:  version"
 msgstr "Podprte možnosti razhroščevanja:  različica"
 
-#: ../finch/gntconv.c:882
-#: ../pidgin/gtkconv.c:430
+#: ../finch/gntconv.c:915
+#: ../pidgin/gtkconv.c:384
 msgid "No such command (in this context)."
 msgstr "Tak ukaz ne obstaja (v tem sklopu)."
 
-#: ../finch/gntconv.c:885
-#: ../pidgin/gtkconv.c:433
+#: ../finch/gntconv.c:918
+#: ../pidgin/gtkconv.c:387
 msgid ""
 "Use \"/help &lt;command&gt;\" for help on a specific command.\n"
 "The following commands are available in this context:\n"
@@ -917,61 +930,61 @@
 "Uporabite \"&lt;ukaz&gt; /help\" za pomoč o določenem ukazu.\n"
 "V tem sklopu so na voljo naslednji ukazi:\n"
 
-#: ../finch/gntconv.c:943
-#: ../pidgin/gtkconv.c:7211
+#: ../finch/gntconv.c:976
+#: ../pidgin/gtkconv.c:7198
 msgid "say &lt;message&gt;:  Send a message normally as if you weren't using a command."
 msgstr "say &lt;sporočilo&gt;:  Pošlji sporočilo kot ponavadi, kot če ne bi uporabljal ukaza."
 
-#: ../finch/gntconv.c:946
-#: ../pidgin/gtkconv.c:7214
+#: ../finch/gntconv.c:979
+#: ../pidgin/gtkconv.c:7201
 msgid "me &lt;action&gt;:  Send an IRC style action to a buddy or chat."
 msgstr "me &lt;dejanje&gt;:  Pošlji prijatelju ali klepetu dejanje v slogu IRC-a."
 
-#: ../finch/gntconv.c:949
-#: ../pidgin/gtkconv.c:7217
+#: ../finch/gntconv.c:982
+#: ../pidgin/gtkconv.c:7204
 msgid "debug &lt;option&gt;:  Send various debug information to the current conversation."
 msgstr "razrošči &lt;možnost&gt;:  Trenutnim pomenkom pošlji različne informacije o razhroščevanju."
 
-#: ../finch/gntconv.c:952
-#: ../pidgin/gtkconv.c:7220
+#: ../finch/gntconv.c:985
+#: ../pidgin/gtkconv.c:7207
 msgid "clear: Clears the conversation scrollback."
 msgstr "clear: Počisti izpisane replike pomenka."
 
-#: ../finch/gntconv.c:955
-#: ../pidgin/gtkconv.c:7223
+#: ../finch/gntconv.c:988
+#: ../pidgin/gtkconv.c:7213
 msgid "help &lt;command&gt;:  Help on a specific command."
 msgstr "pomoč &lt;ukaz&gt;:  Pomoč o določenem ukazu."
 
-#: ../finch/gntconv.c:958
+#: ../finch/gntconv.c:991
 msgid "users:  Show the list of users in the chat."
 msgstr "users: Pokaži seznam uporabnikov v klepetu."
 
-#: ../finch/gntconv.c:963
+#: ../finch/gntconv.c:996
 msgid "plugins: Show the plugins window."
 msgstr "plugins: Pokaži okno vstavkov."
 
-#: ../finch/gntconv.c:966
+#: ../finch/gntconv.c:999
 msgid "buddylist: Show the buddylist."
 msgstr "buddylist: Pokaži seznam prijateljev."
 
-#: ../finch/gntconv.c:969
+#: ../finch/gntconv.c:1002
 msgid "accounts: Show the accounts window."
 msgstr "accounts: Pokaži okno računov."
 
-#: ../finch/gntconv.c:972
+#: ../finch/gntconv.c:1005
 msgid "debugwin: Show the debug window."
 msgstr "debugwin: Pokaži okno razhroščevanja."
 
-#: ../finch/gntconv.c:975
+#: ../finch/gntconv.c:1008
 msgid "prefs: Show the preference window."
 msgstr "prefs: Pokaži okno nastavitev."
 
-#: ../finch/gntconv.c:978
+#: ../finch/gntconv.c:1011
 msgid "statuses: Show the savedstatuses window."
 msgstr "statuses: Pokaži okno savedstatuses."
 
-#: ../finch/gntdebug.c:230
-#: ../finch/gntui.c:79
+#: ../finch/gntdebug.c:234
+#: ../finch/gntui.c:80
 #: ../pidgin/gtkdebug.c:694
 msgid "Debug Window"
 msgstr "Razhroščevalno okno"
@@ -980,16 +993,16 @@
 #. * it's necessary to make the width of the debug window resizable ... like I said,
 #. * it doesn't make sense. The bug is likely in the packing in gntbox.c.
 #.
-#: ../finch/gntdebug.c:251
+#: ../finch/gntdebug.c:255
 #: ../pidgin/gtkdebug.c:753
 msgid "Clear"
 msgstr "Počisti"
 
-#: ../finch/gntdebug.c:257
+#: ../finch/gntdebug.c:261
 msgid "Filter: "
 msgstr "Filter: "
 
-#: ../finch/gntdebug.c:261
+#: ../finch/gntdebug.c:265
 #: ../pidgin/gtkdebug.c:762
 msgid "Pause"
 msgstr "Premor"
@@ -1000,150 +1013,151 @@
 msgid "File Transfers - %d%% of %d files"
 msgstr "Prenosi datotek - %d%% od %d datotek"
 
+#. Create the window.
 #: ../finch/gntft.c:122
-#: ../finch/gntft.c:194
-#: ../finch/gntui.c:80
+#: ../finch/gntft.c:195
+#: ../finch/gntui.c:81
 #: ../pidgin/gtkft.c:233
-#: ../pidgin/gtkft.c:763
+#: ../pidgin/gtkft.c:761
 msgid "File Transfers"
 msgstr "Prenosi datotek"
 
-#: ../finch/gntft.c:197
+#: ../finch/gntft.c:198
 #: ../pidgin/gtkft.c:644
 msgid "Progress"
 msgstr "Potek"
 
-#: ../finch/gntft.c:197
+#: ../finch/gntft.c:198
 #: ../pidgin/gtkft.c:651
 msgid "Filename"
 msgstr "Datoteka"
 
-#: ../finch/gntft.c:197
+#: ../finch/gntft.c:198
 #: ../pidgin/gtkft.c:658
 msgid "Size"
 msgstr "Velikost"
 
-#: ../finch/gntft.c:197
+#: ../finch/gntft.c:198
 msgid "Speed"
 msgstr "Hitrost"
 
-#: ../finch/gntft.c:197
+#: ../finch/gntft.c:198
 #: ../pidgin/gtkft.c:665
 msgid "Remaining"
 msgstr "Preostanek"
 
 #. XXX: Use of ggp_str_to_uin() is an ugly hack!
-#: ../finch/gntft.c:197
-#: ../finch/gntstatus.c:537
-#: ../finch/gntstatus.c:566
+#: ../finch/gntft.c:198
+#: ../finch/gntstatus.c:540
+#: ../finch/gntstatus.c:569
 #: ../libpurple/protocols/bonjour/bonjour.c:318
 #: ../libpurple/protocols/gg/gg.c:1034
-#: ../libpurple/protocols/gg/gg.c:1573
-#: ../libpurple/protocols/gg/gg.c:1581
-#: ../libpurple/protocols/jabber/buddy.c:634
+#: ../libpurple/protocols/gg/gg.c:1571
+#: ../libpurple/protocols/gg/gg.c:1579
 #: ../libpurple/protocols/jabber/buddy.c:638
-#: ../libpurple/protocols/jabber/buddy.c:673
-#: ../libpurple/protocols/jabber/jabber.c:1220
+#: ../libpurple/protocols/jabber/buddy.c:642
+#: ../libpurple/protocols/jabber/buddy.c:677
+#: ../libpurple/protocols/jabber/jabber.c:1212
 #: ../libpurple/protocols/msn/msn.c:515
 #: ../libpurple/protocols/novell/novell.c:2835
 #: ../libpurple/protocols/oscar/oscar.c:821
 #: ../libpurple/protocols/oscar/oscar.c:826
 #: ../libpurple/protocols/oscar/oscar.c:828
 #: ../libpurple/protocols/oscar/oscar.c:2676
-#: ../libpurple/protocols/oscar/oscar.c:3793
+#: ../libpurple/protocols/oscar/oscar.c:3794
 #: ../libpurple/protocols/sametime/sametime.c:3263
 #: ../libpurple/protocols/sametime/sametime.c:4150
 #: ../libpurple/protocols/yahoo/yahoo.c:3066
-#: ../pidgin/gtkblist.c:3079
-#: ../pidgin/gtkblist.c:3092
-#: ../pidgin/gtkblist.c:3094
-#: ../pidgin/gtksavedstatuses.c:943
-#: ../pidgin/gtksavedstatuses.c:1090
+#: ../pidgin/gtkblist.c:3070
+#: ../pidgin/gtkblist.c:3083
+#: ../pidgin/gtkblist.c:3085
+#: ../pidgin/gtksavedstatuses.c:998
+#: ../pidgin/gtksavedstatuses.c:1143
 msgid "Status"
 msgstr "Stanje"
 
-#: ../finch/gntft.c:207
+#: ../finch/gntft.c:208
 msgid "Close this window when all transfers finish"
 msgstr "Zapri to okno po zaključku vseh prenosov"
 
-#: ../finch/gntft.c:214
+#: ../finch/gntft.c:215
 msgid "Clear finished transfers"
 msgstr "Počisti dokončane prenose"
 
-#: ../finch/gntft.c:228
+#: ../finch/gntft.c:229
 msgid "Stop"
 msgstr "Ustavi"
 
 #. Close button
-#: ../finch/gntft.c:233
-#: ../finch/gntnotify.c:179
-#: ../finch/gntplugin.c:205
-#: ../finch/gntplugin.c:291
-#: ../finch/gntpounce.c:722
-#: ../finch/gntstatus.c:209
+#: ../finch/gntft.c:234
+#: ../finch/gntnotify.c:181
+#: ../finch/gntplugin.c:209
+#: ../finch/gntplugin.c:309
+#: ../finch/gntpounce.c:723
+#: ../finch/gntstatus.c:212
 #: ../libpurple/protocols/msn/msn.c:375
 #: ../libpurple/protocols/silc/util.c:382
 #: ../libpurple/protocols/silc10/util.c:377
-#: ../pidgin/gtkaccount.c:2487
+#: ../pidgin/gtkaccount.c:2474
 #: ../pidgin/gtkrequest.c:272
 msgid "Close"
 msgstr "Zapri"
 
-#: ../finch/gntft.c:299
+#: ../finch/gntft.c:302
 #: ../pidgin/gtkft.c:168
-#: ../pidgin/gtkft.c:975
+#: ../pidgin/gtkft.c:972
 msgid "Waiting for transfer to begin"
 msgstr "Čakanje na začetek prenosa"
 
-#: ../finch/gntft.c:366
+#: ../finch/gntft.c:369
 #: ../pidgin/gtkft.c:165
-#: ../pidgin/gtkft.c:1056
+#: ../pidgin/gtkft.c:1053
 msgid "Canceled"
 msgstr "Preklicano"
 
-#: ../finch/gntft.c:368
-#: ../pidgin/gtkft.c:1058
+#: ../finch/gntft.c:371
+#: ../pidgin/gtkft.c:1055
 msgid "Failed"
 msgstr "Neuspeh"
 
-#: ../finch/gntft.c:414
+#: ../finch/gntft.c:417
 #: ../pidgin/gtkft.c:133
 #, c-format
-msgid "%.2f KB/s"
-msgstr "%.2f KB/s"
-
-#: ../finch/gntft.c:425
-#: ../finch/gntft.c:426
+msgid "%.2f KiB/s"
+msgstr "%.2f KiB/s"
+
+#: ../finch/gntft.c:428
+#: ../finch/gntft.c:429
 #: ../pidgin/gtkft.c:162
-#: ../pidgin/gtkft.c:1118
+#: ../pidgin/gtkft.c:1115
 msgid "Finished"
 msgstr "Končano"
 
-#: ../finch/gntft.c:428
+#: ../finch/gntft.c:431
 #: ../libpurple/protocols/msn/session.c:347
 msgid "Transferring"
 msgstr "Prenos je v teku"
 
-#: ../finch/gntnotify.c:162
+#: ../finch/gntnotify.c:164
 msgid "Emails"
 msgstr "E-naslovi"
 
-#: ../finch/gntnotify.c:168
-#: ../finch/gntnotify.c:222
+#: ../finch/gntnotify.c:170
+#: ../finch/gntnotify.c:224
 msgid "You have mail!"
 msgstr "Dobili ste pošto!"
 
-#: ../finch/gntnotify.c:171
-#: ../libpurple/protocols/jabber/jabber.c:1180
-msgid "From"
-msgstr "Od"
-
-#: ../finch/gntnotify.c:171
+#: ../finch/gntnotify.c:173
+#: ../pidgin/gtknotify.c:489
+msgid "Sender"
+msgstr "Pošiljatelj"
+
+#: ../finch/gntnotify.c:173
 #: ../pidgin/gtknotify.c:496
 msgid "Subject"
 msgstr "Zadeva"
 
-#: ../finch/gntnotify.c:198
+#: ../finch/gntnotify.c:200
 #, c-format
 msgid "%s (%s) has %d new message."
 msgid_plural "%s (%s) has %d new messages."
@@ -1152,65 +1166,65 @@
 msgstr[2] "%s (%s) ima %d novi sporočili."
 msgstr[3] "%s (%s) ima %d nova sporočila."
 
-#: ../finch/gntnotify.c:222
+#: ../finch/gntnotify.c:224
 #: ../pidgin/gtknotify.c:335
 msgid "New Mail"
 msgstr "Nova e-pošta"
 
-#: ../finch/gntnotify.c:287
-#: ../pidgin/gtknotify.c:920
+#: ../finch/gntnotify.c:289
+#: ../pidgin/gtknotify.c:916
 #, c-format
 msgid "Info for %s"
 msgstr "Podatki za %s"
 
-#: ../finch/gntnotify.c:288
+#: ../finch/gntnotify.c:290
 #: ../libpurple/protocols/toc/toc.c:476
-#: ../pidgin/gtknotify.c:921
+#: ../pidgin/gtknotify.c:917
 msgid "Buddy Information"
 msgstr "Informacije o prijatelju"
 
-#: ../finch/gntnotify.c:366
+#: ../finch/gntnotify.c:376
 msgid "Continue"
 msgstr "Nadaljuj"
 
-#: ../finch/gntnotify.c:372
-#: ../pidgin/gtkconv.c:1663
+#: ../finch/gntnotify.c:382
+#: ../pidgin/gtkconv.c:1627
 #: ../pidgin/gtkdebug.c:834
 msgid "Info"
 msgstr "Informacije"
 
-#: ../finch/gntnotify.c:375
-#: ../pidgin/gtkconv.c:1624
+#: ../finch/gntnotify.c:385
+#: ../pidgin/gtkconv.c:1588
 msgid "IM"
 msgstr "Sporoči"
 
-#: ../finch/gntnotify.c:378
+#: ../finch/gntnotify.c:388
 msgid "Join"
 msgstr "Pridruži se"
 
-#: ../finch/gntnotify.c:381
+#: ../finch/gntnotify.c:391
 #: ../libpurple/protocols/sametime/sametime.c:3473
 msgid "Invite"
 msgstr "Povabi"
 
-#: ../finch/gntnotify.c:384
+#: ../finch/gntnotify.c:394
 msgid "(none)"
 msgstr "(brez)"
 
-#: ../finch/gntplugin.c:73
-#: ../finch/gntplugin.c:82
+#: ../finch/gntplugin.c:74
+#: ../finch/gntplugin.c:83
 msgid "ERROR"
 msgstr "NAPAKA"
 
-#: ../finch/gntplugin.c:73
+#: ../finch/gntplugin.c:74
 msgid "loading plugin failed"
 msgstr "nalaganje vtičnika ni uspelo"
 
-#: ../finch/gntplugin.c:82
+#: ../finch/gntplugin.c:83
 msgid "unloading plugin failed"
 msgstr "izklop vtičnika ni uspel"
 
-#: ../finch/gntplugin.c:124
+#: ../finch/gntplugin.c:128
 #, c-format
 msgid ""
 "Name: %s\n"
@@ -1227,43 +1241,49 @@
 "Spletna stran: %s\n"
 "Ime datoteke: %s\n"
 
-#: ../finch/gntplugin.c:182
+#: ../finch/gntplugin.c:186
 msgid "Plugin need to be loaded before you can configure it."
 msgstr "Vtičnik je potrebno naložiti, preden ga lahko prilagodite."
 
-#: ../finch/gntplugin.c:226
+#: ../finch/gntplugin.c:234
 msgid "No configuration options for this plugin."
 msgstr "Za ta vtičnik ni nobenih nastavitev."
 
-#: ../finch/gntplugin.c:249
+#: ../finch/gntplugin.c:259
 msgid "You can (un)load plugins from the following list."
 msgstr "Vtičnike lahko naložite ali odstranite z naslednjega seznama."
 
-#: ../finch/gntplugin.c:296
+#: ../finch/gntplugin.c:314
 msgid "Configure Plugin"
 msgstr "Prilagodi vstavek"
 
-#: ../finch/gntplugin.c:352
-#: ../finch/gntplugin.c:359
-#: ../finch/gntprefs.c:245
-#: ../finch/gntui.c:82
+#. copy the preferences to tmp values...
+#. * I liked "take affect immediately" Oh well :-(
+#. (that should have been "effect," right?)
+#. Back to instant-apply! I win!  BU-HAHAHA!
+#. Create the window
+#: ../finch/gntplugin.c:370
+#: ../finch/gntplugin.c:377
+#: ../finch/gntprefs.c:263
+#: ../finch/gntui.c:83
 #: ../pidgin/gtkdocklet.c:524
-#: ../pidgin/gtkprefs.c:1992
+#: ../pidgin/gtkprefs.c:2060
 msgid "Preferences"
 msgstr "Nastavitve"
 
 #: ../finch/gntpounce.c:180
-#: ../pidgin/gtkpounce.c:253
+#: ../pidgin/gtkpounce.c:255
 msgid "Please enter a buddy to pounce."
 msgstr "Vnesite opozorilo prijatelja."
 
+#. Create the window.
 #: ../finch/gntpounce.c:325
-#: ../pidgin/gtkpounce.c:507
+#: ../pidgin/gtkpounce.c:516
 msgid "New Buddy Pounce"
 msgstr "Novo opozorilo prijatelja"
 
 #: ../finch/gntpounce.c:325
-#: ../pidgin/gtkpounce.c:507
+#: ../pidgin/gtkpounce.c:516
 msgid "Edit Buddy Pounce"
 msgstr "Uredi opozorilo prijatelja"
 
@@ -1273,7 +1293,7 @@
 
 #. Account:
 #: ../finch/gntpounce.c:333
-#: ../finch/gntstatus.c:446
+#: ../finch/gntstatus.c:449
 msgid "Account:"
 msgstr "Račun:"
 
@@ -1283,7 +1303,7 @@
 
 #. Create the "Pounce When Buddy..." frame.
 #: ../finch/gntpounce.c:371
-#: ../pidgin/gtkpounce.c:577
+#: ../pidgin/gtkpounce.c:586
 msgid "Pounce When Buddy..."
 msgstr "Opozori, ko se prijatelj ..."
 
@@ -1329,7 +1349,7 @@
 
 #. Create the "Action" frame.
 #: ../finch/gntpounce.c:411
-#: ../pidgin/gtkpounce.c:638
+#: ../pidgin/gtkpounce.c:647
 msgid "Action"
 msgstr "Dejanje"
 
@@ -1358,221 +1378,237 @@
 msgstr "Opozori le tedaj, ko moje stanje ni na voljo"
 
 #: ../finch/gntpounce.c:447
-#: ../pidgin/gtkpounce.c:1282
+#: ../pidgin/gtkpounce.c:1295
 msgid "Recurring"
 msgstr "Ponavljajoč"
 
 #: ../finch/gntpounce.c:649
-#: ../pidgin/gtkpounce.c:1097
+#: ../pidgin/gtkpounce.c:1110
 #, c-format
 msgid "Are you sure you want to delete the pounce on %s for %s?"
 msgstr "Ste prepričani, da želite izbrisati obvestilo o %s za %s?"
 
-#: ../finch/gntpounce.c:682
-#: ../finch/gntui.c:78
-#: ../pidgin/gtkpounce.c:1329
+#: ../finch/gntpounce.c:683
+#: ../finch/gntui.c:79
+#: ../pidgin/gtkpounce.c:1339
 msgid "Buddy Pounces"
 msgstr "Opozorila prijatelja"
 
-#: ../finch/gntpounce.c:794
-#: ../pidgin/gtkpounce.c:1456
+#: ../finch/gntpounce.c:795
+#: ../pidgin/gtkpounce.c:1466
 #, c-format
 msgid "%s has started typing to you (%s)"
 msgstr "%s vam (%s) je začel pisati"
 
-#: ../finch/gntpounce.c:796
-#: ../pidgin/gtkpounce.c:1458
+#: ../finch/gntpounce.c:797
+#: ../pidgin/gtkpounce.c:1468
 #, c-format
 msgid "%s has paused while typing to you (%s)"
 msgstr "%s je zastal, medtem ko vam je pisal (%s)"
 
-#: ../finch/gntpounce.c:798
-#: ../pidgin/gtkpounce.c:1460
+#: ../finch/gntpounce.c:799
+#: ../pidgin/gtkpounce.c:1470
 #, c-format
 msgid "%s has signed on (%s)"
 msgstr "%s se je prijavil na (%s)"
 
-#: ../finch/gntpounce.c:800
-#: ../pidgin/gtkpounce.c:1462
+#: ../finch/gntpounce.c:801
+#: ../pidgin/gtkpounce.c:1472
 #, c-format
 msgid "%s has returned from being idle (%s)"
 msgstr "%s je spet dejaven (%s)"
 
-#: ../finch/gntpounce.c:802
-#: ../pidgin/gtkpounce.c:1464
+#: ../finch/gntpounce.c:803
+#: ../pidgin/gtkpounce.c:1474
 #, c-format
 msgid "%s has returned from being away (%s)"
 msgstr "%s se je vrnil (%s)"
 
-#: ../finch/gntpounce.c:804
-#: ../pidgin/gtkpounce.c:1466
+#: ../finch/gntpounce.c:805
+#: ../pidgin/gtkpounce.c:1476
 #, c-format
 msgid "%s has stopped typing to you (%s)"
 msgstr "%s vam (%s) je prenehal pisati"
 
-#: ../finch/gntpounce.c:806
-#: ../pidgin/gtkpounce.c:1468
+#: ../finch/gntpounce.c:807
+#: ../pidgin/gtkpounce.c:1478
 #, c-format
 msgid "%s has signed off (%s)"
 msgstr "%s se je odjavil (%s)"
 
-#: ../finch/gntpounce.c:808
-#: ../pidgin/gtkpounce.c:1470
+#: ../finch/gntpounce.c:809
+#: ../pidgin/gtkpounce.c:1480
 #, c-format
 msgid "%s has become idle (%s)"
 msgstr "%s je postal nedejaven (%s)"
 
-#: ../finch/gntpounce.c:810
-#: ../pidgin/gtkpounce.c:1472
+#: ../finch/gntpounce.c:811
+#: ../pidgin/gtkpounce.c:1482
 #, c-format
 msgid "%s has gone away. (%s)"
 msgstr "%s je postal odsoten. (%s)"
 
-#: ../finch/gntpounce.c:812
-#: ../pidgin/gtkpounce.c:1474
+#: ../finch/gntpounce.c:813
+#: ../pidgin/gtkpounce.c:1484
 #, c-format
 msgid "%s has sent you a message. (%s)"
 msgstr "Uporabnik %s vam je poslal sporočilo. (%s)"
 
-#: ../finch/gntpounce.c:813
-#: ../pidgin/gtkpounce.c:1475
+#: ../finch/gntpounce.c:814
+#: ../pidgin/gtkpounce.c:1485
 msgid "Unknown pounce event. Please report this!"
 msgstr "Neznan dogodek opozorila. Poročajte o tem!"
 
-#: ../finch/gntprefs.c:79
+#: ../finch/gntprefs.c:91
 msgid "Based on keyboard use"
 msgstr "Glede na uporabo tipkovnice"
 
-#: ../finch/gntprefs.c:81
-#: ../pidgin/gtkprefs.c:1853
+#: ../finch/gntprefs.c:93
+#: ../pidgin/gtkprefs.c:1923
 msgid "From last sent message"
 msgstr "Od nazadnje poslanega sporočila"
 
-#: ../finch/gntprefs.c:83
-#: ../pidgin/gtkprefs.c:820
-#: ../pidgin/gtkprefs.c:829
-#: ../pidgin/gtkprefs.c:1852
-#: ../pidgin/gtkprefs.c:1866
+#: ../finch/gntprefs.c:95
+#: ../pidgin/gtkprefs.c:897
+#: ../pidgin/gtkprefs.c:906
+#: ../pidgin/gtkprefs.c:1922
+#: ../pidgin/gtkprefs.c:1936
 #: ../pidgin/plugins/win32/winprefs/winprefs.c:337
 msgid "Never"
 msgstr "nikoli"
 
-#: ../finch/gntprefs.c:171
+#: ../finch/gntprefs.c:183
 msgid "Show Idle Time"
 msgstr "Pokaži čas nedejavnosti"
 
-#: ../finch/gntprefs.c:172
+#: ../finch/gntprefs.c:184
 msgid "Show Offline Buddies"
 msgstr "Pokaži neprijavljene prijatelje"
 
-#: ../finch/gntprefs.c:179
+#: ../finch/gntprefs.c:191
 msgid "Notify buddies when you are typing"
 msgstr "Obvesti prijatelje, ko pišem"
 
-#: ../finch/gntprefs.c:185
+#: ../finch/gntprefs.c:197
 msgid "Log format"
 msgstr "Oblika dnevnika"
 
-#: ../finch/gntprefs.c:186
+#: ../finch/gntprefs.c:198
 msgid "Log IMs"
 msgstr "Beleži IM"
 
-#: ../finch/gntprefs.c:187
+#: ../finch/gntprefs.c:199
 msgid "Log chats"
 msgstr "Beleži klepete"
 
-#: ../finch/gntprefs.c:188
+#: ../finch/gntprefs.c:200
 msgid "Log status change events"
 msgstr "Beleži spremembe stanja"
 
+#: ../finch/gntprefs.c:206
+msgid "Report Idle time"
+msgstr "Poročaj o času nedejavnosti"
+
+#: ../finch/gntprefs.c:207
+msgid "Change status when idle"
+msgstr "Spremeni stanje ob nedejavnosti"
+
+#: ../finch/gntprefs.c:208
+msgid "Minutes before changing status"
+msgstr "Število minut pred spremembo stanja"
+
+#: ../finch/gntprefs.c:209
+msgid "Change status to"
+msgstr "Spremeni stanje v"
+
 #. Conversations
-#: ../finch/gntprefs.c:241
-#: ../pidgin/gtkprefs.c:915
-#: ../pidgin/gtkprefs.c:1956
+#: ../finch/gntprefs.c:258
+#: ../pidgin/gtkprefs.c:992
+#: ../pidgin/gtkprefs.c:2026
 #: ../pidgin/plugins/win32/winprefs/winprefs.c:344
 msgid "Conversations"
 msgstr "Pogovori"
 
-#: ../finch/gntprefs.c:242
-#: ../pidgin/gtkprefs.c:1392
-#: ../pidgin/gtkprefs.c:1967
+#: ../finch/gntprefs.c:259
+#: ../pidgin/gtkprefs.c:1462
+#: ../pidgin/gtkprefs.c:2037
 msgid "Logging"
 msgstr "Beleženje v dnevnik"
 
-#: ../finch/gntrequest.c:532
+#: ../finch/gntrequest.c:563
 msgid "Not implemented yet."
 msgstr "Še ni podprto."
 
-#: ../finch/gntrequest.c:597
-#: ../pidgin/gtkrequest.c:1530
-#: ../pidgin/gtkrequest.c:1576
+#: ../finch/gntrequest.c:635
+#: ../pidgin/gtkrequest.c:1526
+#: ../pidgin/gtkrequest.c:1572
 msgid "Save File..."
 msgstr "Shrani datoteko ..."
 
-#: ../finch/gntrequest.c:597
-#: ../pidgin/gtkrequest.c:1531
-#: ../pidgin/gtkrequest.c:1577
+#: ../finch/gntrequest.c:635
+#: ../pidgin/gtkrequest.c:1527
+#: ../pidgin/gtkrequest.c:1573
 msgid "Open File..."
 msgstr "Odpri datoteko ..."
 
-#: ../finch/gntstatus.c:135
+#: ../finch/gntstatus.c:136
 #, c-format
 msgid "Are you sure you want to delete \"%s\""
 msgstr "Ste prepričani, da želite izbrisati \"%s\"?"
 
-#: ../finch/gntstatus.c:138
+#: ../finch/gntstatus.c:139
 msgid "Delete Status"
 msgstr "Izbriši stanje"
 
-#: ../finch/gntstatus.c:170
-#: ../pidgin/gtksavedstatuses.c:557
+#: ../finch/gntstatus.c:174
+#: ../pidgin/gtksavedstatuses.c:596
 msgid "Saved Statuses"
 msgstr "Shranjena stanja"
 
-#: ../finch/gntstatus.c:177
-#: ../finch/gntstatus.c:529
+#: ../finch/gntstatus.c:181
+#: ../finch/gntstatus.c:532
 #: ../libpurple/protocols/jabber/buddy.c:286
-#: ../libpurple/protocols/jabber/buddy.c:935
+#: ../libpurple/protocols/jabber/buddy.c:973
 #: ../libpurple/protocols/novell/novell.c:1484
-#: ../pidgin/gtksavedstatuses.c:464
+#: ../pidgin/gtksavedstatuses.c:499
 msgid "Title"
 msgstr "Naziv"
 
-#: ../finch/gntstatus.c:177
-#: ../pidgin/gtksavedstatuses.c:479
+#: ../finch/gntstatus.c:181
+#: ../pidgin/gtksavedstatuses.c:514
 msgid "Type"
 msgstr "Vrsta"
 
-#: ../finch/gntstatus.c:177
-#: ../finch/gntstatus.c:554
-#: ../finch/gntstatus.c:566
+#: ../finch/gntstatus.c:181
+#: ../finch/gntstatus.c:557
+#: ../finch/gntstatus.c:569
 #: ../libpurple/protocols/bonjour/bonjour.c:247
 #: ../libpurple/protocols/bonjour/bonjour.c:254
 #: ../libpurple/protocols/bonjour/bonjour.c:320
 #: ../libpurple/protocols/gg/gg.c:1072
-#: ../libpurple/protocols/gg/gg.c:1576
-#: ../libpurple/protocols/gg/gg.c:1594
-#: ../libpurple/protocols/gg/gg.c:1604
-#: ../libpurple/protocols/gg/gg.c:1610
-#: ../libpurple/protocols/gg/gg.c:1619
-#: ../libpurple/protocols/gg/gg.c:1624
+#: ../libpurple/protocols/gg/gg.c:1574
+#: ../libpurple/protocols/gg/gg.c:1592
+#: ../libpurple/protocols/gg/gg.c:1602
+#: ../libpurple/protocols/gg/gg.c:1608
+#: ../libpurple/protocols/gg/gg.c:1617
+#: ../libpurple/protocols/gg/gg.c:1622
 #: ../libpurple/protocols/irc/irc.c:234
-#: ../libpurple/protocols/jabber/jabber.c:1252
-#: ../libpurple/protocols/jabber/jabber.c:1262
-#: ../libpurple/protocols/jabber/jabber.c:1272
-#: ../libpurple/protocols/jabber/jabber.c:1282
-#: ../libpurple/protocols/jabber/jabber.c:1292
-#: ../libpurple/protocols/jabber/jabber.c:1304
+#: ../libpurple/protocols/jabber/jabber.c:1244
+#: ../libpurple/protocols/jabber/jabber.c:1254
+#: ../libpurple/protocols/jabber/jabber.c:1264
+#: ../libpurple/protocols/jabber/jabber.c:1274
+#: ../libpurple/protocols/jabber/jabber.c:1284
+#: ../libpurple/protocols/jabber/jabber.c:1296
 #: ../libpurple/protocols/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:5531
-#: ../libpurple/protocols/oscar/oscar.c:5749
-#: ../libpurple/protocols/oscar/oscar.c:5763
-#: ../libpurple/protocols/oscar/oscar.c:5779
-#: ../libpurple/protocols/oscar/oscar.c:5786
-#: ../libpurple/protocols/oscar/oscar.c:5793
+#: ../libpurple/protocols/oscar/oscar.c:5533
+#: ../libpurple/protocols/oscar/oscar.c:5751
+#: ../libpurple/protocols/oscar/oscar.c:5765
+#: ../libpurple/protocols/oscar/oscar.c:5781
+#: ../libpurple/protocols/oscar/oscar.c:5788
+#: ../libpurple/protocols/oscar/oscar.c:5795
 #: ../libpurple/protocols/sametime/sametime.c:3286
 #: ../libpurple/protocols/sametime/sametime.c:3292
 #: ../libpurple/protocols/sametime/sametime.c:3298
@@ -1583,60 +1619,60 @@
 #: ../libpurple/protocols/yahoo/yahoo.c:3494
 #: ../libpurple/protocols/yahoo/yahoo.c:3500
 #: ../libpurple/protocols/zephyr/zephyr.c:2337
-#: ../pidgin/gtksavedstatuses.c:490
-#: ../pidgin/gtksavedstatuses.c:954
+#: ../pidgin/gtksavedstatuses.c:525
+#: ../pidgin/gtksavedstatuses.c:1009
 msgid "Message"
 msgstr "Sporočilo"
 
 #. Use
-#: ../finch/gntstatus.c:189
-#: ../finch/gntstatus.c:583
+#: ../finch/gntstatus.c:192
+#: ../finch/gntstatus.c:586
 msgid "Use"
 msgstr "Uporabi"
 
-#: ../finch/gntstatus.c:294
+#: ../finch/gntstatus.c:297
 msgid "Invalid title"
 msgstr "Neveljaven naslov"
 
-#: ../finch/gntstatus.c:295
+#: ../finch/gntstatus.c:298
 msgid "Please enter a non-empty title for the status."
 msgstr "Prosimo, vnesite neprazen naslov za stanje."
 
-#: ../finch/gntstatus.c:302
+#: ../finch/gntstatus.c:305
 msgid "Duplicate title"
 msgstr "Podvojen naslov"
 
-#: ../finch/gntstatus.c:303
+#: ../finch/gntstatus.c:306
 msgid "Please enter a different title for the status."
 msgstr "Vnesite drugačen naslov za stanje."
 
-#: ../finch/gntstatus.c:443
+#: ../finch/gntstatus.c:446
 msgid "Substatus"
 msgstr "Podstanje"
 
-#: ../finch/gntstatus.c:454
+#: ../finch/gntstatus.c:457
 #: ../pidgin/gtkft.c:698
 msgid "Status:"
 msgstr "Stanje:"
 
-#: ../finch/gntstatus.c:469
+#: ../finch/gntstatus.c:472
 msgid "Message:"
 msgstr "Sporočilo:"
 
-#: ../finch/gntstatus.c:518
+#: ../finch/gntstatus.c:521
 msgid "Edit Status"
 msgstr "Uredi stanje"
 
-#: ../finch/gntstatus.c:560
+#: ../finch/gntstatus.c:563
 msgid "Use different status for following accounts"
 msgstr "Za naslednje račune uporabi različno stanje"
 
 #. Save & Use
-#: ../finch/gntstatus.c:594
+#: ../finch/gntstatus.c:597
 msgid "Save & Use"
 msgstr "Shrani in uporabi"
 
-#: ../finch/gntui.c:83
+#: ../finch/gntui.c:84
 msgid "Statuses"
 msgstr "Stanja"
 
@@ -1798,13 +1834,13 @@
 
 #: ../libpurple/account.c:1012
 #: ../libpurple/connection.c:107
-#: ../pidgin/gtkblist.c:4001
+#: ../pidgin/gtkblist.c:4010
 msgid "Connection Error"
 msgstr "Napaka na povezavi"
 
 #: ../libpurple/account.c:1170
 #: ../libpurple/protocols/gg/gg.c:702
-#: ../libpurple/protocols/jabber/jabber.c:1342
+#: ../libpurple/protocols/jabber/jabber.c:1334
 msgid "New passwords do not match."
 msgstr "Novi gesli se ne ujemata."
 
@@ -1845,26 +1881,26 @@
 
 #: ../libpurple/account.c:1744
 #: ../libpurple/protocols/gg/gg.c:1012
-#: ../libpurple/protocols/jabber/buddy.c:638
-#: ../libpurple/protocols/jabber/buddy.c:1424
-#: ../libpurple/protocols/jabber/buddy.c:1441
+#: ../libpurple/protocols/jabber/buddy.c:642
+#: ../libpurple/protocols/jabber/buddy.c:1462
+#: ../libpurple/protocols/jabber/buddy.c:1479
 #: ../libpurple/protocols/novell/novell.c:2831
 #: ../libpurple/protocols/qq/qq.c:230
 #: ../pidgin/gtkft.c:159
 msgid "Unknown"
 msgstr "Neznan"
 
-#: ../libpurple/blist.c:523
-#: ../libpurple/blist.c:1291
-#: ../libpurple/blist.c:1520
+#: ../libpurple/blist.c:521
+#: ../libpurple/blist.c:1289
+#: ../libpurple/blist.c:1518
 #: ../libpurple/protocols/jabber/roster.c:68
-#: ../pidgin/gtkblist.c:5293
+#: ../pidgin/gtkblist.c:5310
 #: ../pidgin/plugins/gevolution/gevolution.c:96
 #: ../pidgin/plugins/gevolution/gevo-util.c:64
 msgid "Buddies"
 msgstr "Prijatelji"
 
-#: ../libpurple/blist.c:550
+#: ../libpurple/blist.c:548
 msgid "buddy list"
 msgstr "Seznam prijateljev"
 
@@ -1884,86 +1920,86 @@
 
 #: ../libpurple/connection.c:440
 #: ../libpurple/plugin.c:282
-#: ../libpurple/protocols/jabber/buddy.c:1712
+#: ../libpurple/protocols/jabber/buddy.c:1750
 #: ../libpurple/protocols/msn/servconn.c:139
 #: ../libpurple/protocols/msn/session.c:322
 msgid "Unknown error"
 msgstr "Neznana napaka"
 
-#: ../libpurple/conversation.c:165
+#: ../libpurple/conversation.c:170
 msgid "Unable to send message: The message is too large."
 msgstr "Sporočila ni mogoče poslati, ker je preveliko."
 
-#: ../libpurple/conversation.c:168
-#: ../libpurple/conversation.c:181
+#: ../libpurple/conversation.c:173
+#: ../libpurple/conversation.c:186
 #, c-format
 msgid "Unable to send message to %s."
 msgstr "Sporočila k %s ni mogoče poslati."
 
-#: ../libpurple/conversation.c:169
+#: ../libpurple/conversation.c:174
 msgid "The message is too large."
 msgstr "Sporočilo je preveliko."
 
-#: ../libpurple/conversation.c:178
-#: ../libpurple/protocols/bonjour/jabber.c:283
-#: ../libpurple/protocols/bonjour/jabber.c:325
+#: ../libpurple/conversation.c:183
+#: ../libpurple/protocols/bonjour/jabber.c:284
+#: ../libpurple/protocols/bonjour/jabber.c:326
 msgid "Unable to send message."
 msgstr "Sporočila ni mogoče poslati."
 
-#: ../libpurple/conversation.c:1164
+#: ../libpurple/conversation.c:1169
 msgid "Send Message"
 msgstr "Pošlji sporočilo"
 
-#: ../libpurple/conversation.c:1167
+#: ../libpurple/conversation.c:1172
 msgid "_Send Message"
 msgstr "_Pošlji sporočilo"
 
-#: ../libpurple/conversation.c:1572
+#: ../libpurple/conversation.c:1578
 #, c-format
 msgid "%s entered the room."
 msgstr "%s se nam pridružuje."
 
-#: ../libpurple/conversation.c:1575
+#: ../libpurple/conversation.c:1581
 #, c-format
 msgid "%s [<I>%s</I>] entered the room."
 msgstr "%s [<I>%s</I>] se nam pridružuje."
 
-#: ../libpurple/conversation.c:1682
+#: ../libpurple/conversation.c:1691
 #, c-format
 msgid "You are now known as %s"
 msgstr "Zdaj ste znani kot %s"
 
-#: ../libpurple/conversation.c:1702
+#: ../libpurple/conversation.c:1711
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s je zdaj poznan kot %s"
 
-#: ../libpurple/conversation.c:1775
+#: ../libpurple/conversation.c:1786
 #, c-format
 msgid "%s left the room."
 msgstr "%s nas je zapustil."
 
-#: ../libpurple/conversation.c:1778
+#: ../libpurple/conversation.c:1789
 #, c-format
 msgid "%s left the room (%s)."
 msgstr "%s nas je zapustil (%s)."
 
-#: ../libpurple/dbus-server.c:578
+#: ../libpurple/dbus-server.c:584
 #, c-format
 msgid "Failed to get connection: %s"
 msgstr "Povezave ni mogoče vzpostaviti: %s"
 
-#: ../libpurple/dbus-server.c:590
+#: ../libpurple/dbus-server.c:596
 #, c-format
 msgid "Failed to get name: %s"
 msgstr "Imena ni mogoče pridobiti: %s"
 
-#: ../libpurple/dbus-server.c:603
+#: ../libpurple/dbus-server.c:610
 #, c-format
 msgid "Failed to get serv name: %s"
 msgstr "Imena strežnika ni mogoče pridobiti: %s"
 
-#: ../libpurple/dbus-server.h:83
+#: ../libpurple/dbus-server.h:84
 msgid "Purple's D-BUS server is not running for the reason listed below"
 msgstr "Strežnik D-BUS za Purple ni zagnan zaradi zgoraj navedenih razlogov"
 
@@ -2019,7 +2055,7 @@
 msgid "Unknown reason"
 msgstr "Neznan razlog"
 
-#: ../libpurple/ft.c:204
+#: ../libpurple/ft.c:207
 #, c-format
 msgid ""
 "Error reading %s: \n"
@@ -2028,7 +2064,7 @@
 "Napaka pri branju %s: \n"
 "%s.\n"
 
-#: ../libpurple/ft.c:208
+#: ../libpurple/ft.c:211
 #, c-format
 msgid ""
 "Error writing %s: \n"
@@ -2037,7 +2073,7 @@
 "Napaka pri pisanju na strežnik %s: \n"
 "%s.\n"
 
-#: ../libpurple/ft.c:212
+#: ../libpurple/ft.c:215
 #, c-format
 msgid ""
 "Error accessing %s: \n"
@@ -2046,39 +2082,39 @@
 "Napaka pri dostopu do %s: \n"
 "%s.\n"
 
-#: ../libpurple/ft.c:248
+#: ../libpurple/ft.c:251
 msgid "Directory is not writable."
 msgstr "V mapo ni dovoljeno pisati."
 
-#: ../libpurple/ft.c:263
+#: ../libpurple/ft.c:266
 msgid "Cannot send a file of 0 bytes."
 msgstr "Datoteke z 0 bajti ni mogoče poslati."
 
-#: ../libpurple/ft.c:273
+#: ../libpurple/ft.c:276
 msgid "Cannot send a directory."
 msgstr "Mape ni mogoče poslati."
 
-#: ../libpurple/ft.c:282
+#: ../libpurple/ft.c:285
 #, c-format
 msgid "%s is not a regular file. Cowardly refusing to overwrite it.\n"
 msgstr "%s ni veljavna datoteka. Plašni program je ne želi prepisati.\n"
 
-#: ../libpurple/ft.c:342
+#: ../libpurple/ft.c:345
 #, c-format
 msgid "%s wants to send you %s (%s)"
 msgstr "%s vam želi poslati %s (%s)"
 
-#: ../libpurple/ft.c:349
+#: ../libpurple/ft.c:352
 #, c-format
 msgid "%s wants to send you a file"
 msgstr "%s vam želi poslati datoteko"
 
-#: ../libpurple/ft.c:392
+#: ../libpurple/ft.c:395
 #, c-format
 msgid "Accept file transfer request from %s?"
 msgstr "Sprejmete zahtevo po prenosu datoteke od %s?"
 
-#: ../libpurple/ft.c:396
+#: ../libpurple/ft.c:399
 #, c-format
 msgid ""
 "A file is available for download from:\n"
@@ -2089,60 +2125,60 @@
 "Oddaljen gostitelj: %s\n"
 "Oddaljena vrata: %d"
 
-#: ../libpurple/ft.c:431
+#: ../libpurple/ft.c:434
 #, c-format
 msgid "%s is offering to send file %s"
 msgstr "%s ponuja pošiljanje datoteke %s"
 
-#: ../libpurple/ft.c:483
+#: ../libpurple/ft.c:486
 #, c-format
 msgid "%s is not a valid filename.\n"
 msgstr "%s ni veljavna datoteka.\n"
 
-#: ../libpurple/ft.c:504
+#: ../libpurple/ft.c:507
 #, c-format
 msgid "Offering to send %s to %s"
 msgstr "Ponujeno pošiljanje sporočila %s k %s"
 
-#: ../libpurple/ft.c:516
+#: ../libpurple/ft.c:519
 #, c-format
 msgid "Starting transfer of %s from %s"
 msgstr "Začetek prenosa %s od %s"
 
-#: ../libpurple/ft.c:670
+#: ../libpurple/ft.c:680
 #, c-format
 msgid "Transfer of file %s complete"
 msgstr "Prenos datoteke %s je dokončan."
 
-#: ../libpurple/ft.c:673
+#: ../libpurple/ft.c:683
 msgid "File transfer complete"
 msgstr "Prenos datoteke je dokončan."
 
-#: ../libpurple/ft.c:1091
+#: ../libpurple/ft.c:1101
 #, c-format
 msgid "You canceled the transfer of %s"
 msgstr "Prekinili ste prenos %s"
 
-#: ../libpurple/ft.c:1096
+#: ../libpurple/ft.c:1106
 msgid "File transfer cancelled"
 msgstr "Prenos datoteke je preklican"
 
-#: ../libpurple/ft.c:1154
+#: ../libpurple/ft.c:1164
 #, c-format
 msgid "%s canceled the transfer of %s"
 msgstr "%s je prekinil prenos %s"
 
-#: ../libpurple/ft.c:1159
+#: ../libpurple/ft.c:1169
 #, c-format
 msgid "%s canceled the file transfer"
 msgstr "%s je prekinil prenos datoteke"
 
-#: ../libpurple/ft.c:1216
+#: ../libpurple/ft.c:1226
 #, c-format
 msgid "File transfer to %s failed."
 msgstr "Prenos datoteke do %s ni uspel."
 
-#: ../libpurple/ft.c:1218
+#: ../libpurple/ft.c:1228
 #, c-format
 msgid "File transfer from %s failed."
 msgstr "Prenos datoteke od %s ni uspel."
@@ -2283,52 +2319,52 @@
 msgid "Whether the specified command should handle \"ymsgr\" URLs"
 msgstr "Ali naj navedeni ukaz upravlja z URL-ji \"ymsgr\""
 
-#: ../libpurple/log.c:181
+#: ../libpurple/log.c:182
 msgid "<b><font color=\"red\">The logger has no read function</font></b>"
 msgstr "<b><font color=\"red\">Beleženje nima možnosti branja</font></b>"
 
-#: ../libpurple/log.c:593
+#: ../libpurple/log.c:597
 msgid "HTML"
 msgstr "HTML"
 
-#: ../libpurple/log.c:607
+#: ../libpurple/log.c:611
 msgid "Plain text"
 msgstr "Navadno besedilo"
 
-#: ../libpurple/log.c:621
+#: ../libpurple/log.c:625
 msgid "Old flat format"
 msgstr "Stari zapis"
 
-#: ../libpurple/log.c:732
+#: ../libpurple/log.c:837
 msgid "Logging of this conversation failed."
 msgstr "Beleženje tega pogovora v dnevnik ni uspelo."
 
-#: ../libpurple/log.c:1175
+#: ../libpurple/log.c:1280
 msgid "XML"
 msgstr "XML"
 
-#: ../libpurple/log.c:1251
+#: ../libpurple/log.c:1364
 #, c-format
 msgid "<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-REPLY&gt;:</b></font> %s<br/>\n"
 msgstr "<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;SAMODEJNI ODGOVOR&gt;:</b></font> %s<br/>\n"
 
-#: ../libpurple/log.c:1253
+#: ../libpurple/log.c:1366
 #, c-format
 msgid "<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-REPLY&gt;:</b></font> %s<br/>\n"
 msgstr "<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;SAMODEJNI ODGOVOR&gt;:</b></font> %s<br/>\n"
 
-#: ../libpurple/log.c:1311
-#: ../libpurple/log.c:1444
+#: ../libpurple/log.c:1424
+#: ../libpurple/log.c:1557
 msgid "<font color=\"red\"><b>Unable to find log path!</b></font>"
 msgstr "<font color=\"red\"><b>Ni mogoče najti poti do dnevnika!</b></font>"
 
-#: ../libpurple/log.c:1323
-#: ../libpurple/log.c:1453
+#: ../libpurple/log.c:1436
+#: ../libpurple/log.c:1566
 #, c-format
 msgid "<font color=\"red\"><b>Could not read file: %s</b></font>"
 msgstr "<font color=\"red\"><b>Ni mogoče brati datoteke: %s</b></font>"
 
-#: ../libpurple/log.c:1385
+#: ../libpurple/log.c:1498
 #, c-format
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr "(%s) %s <AUTO-REPLY>: %s\n"
@@ -2421,10 +2457,10 @@
 #: ../libpurple/protocols/oscar/oscar.c:1458
 #: ../libpurple/protocols/oscar/oscar.c:2251
 #: ../libpurple/protocols/oscar/oscar.c:2298
-#: ../libpurple/protocols/oscar/oscar.c:5863
-#: ../libpurple/protocols/oscar/oscar.c:5918
-#: ../libpurple/protocols/oscar/oscar.c:6144
-#: ../libpurple/protocols/oscar/oscar.c:6214
+#: ../libpurple/protocols/oscar/oscar.c:5865
+#: ../libpurple/protocols/oscar/oscar.c:5920
+#: ../libpurple/protocols/oscar/oscar.c:6146
+#: ../libpurple/protocols/oscar/oscar.c:6216
 #: ../libpurple/request.h:1387
 #: ../libpurple/request.h:1397
 msgid "_Cancel"
@@ -2442,12 +2478,12 @@
 msgid "Auto Reject"
 msgstr "Samodejno zavrni"
 
-#: ../libpurple/plugins/autoaccept.c:184
+#: ../libpurple/plugins/autoaccept.c:185
 msgid "Autoaccept File Transfers..."
 msgstr "Samodejni sprejem prenosa datotek ..."
 
 #. XXX: Is there a better way than this? There really should be.
-#: ../libpurple/plugins/autoaccept.c:214
+#: ../libpurple/plugins/autoaccept.c:215
 msgid ""
 "Path to save the files in\n"
 "(Please provide the full path)"
@@ -2455,11 +2491,11 @@
 "Pot za shranjevanje datotek\n"
 "(Prosimo, vnesite polno pot)"
 
-#: ../libpurple/plugins/autoaccept.c:219
+#: ../libpurple/plugins/autoaccept.c:220
 msgid "Automatically reject from users not in buddy list"
 msgstr "Samodejno zavrni uporabnikom, ki niso na seznamu prijateljev"
 
-#: ../libpurple/plugins/autoaccept.c:223
+#: ../libpurple/plugins/autoaccept.c:224
 msgid ""
 "Notify with a popup when an autoaccepted file transfer is complete\n"
 "(only when there's no conversation with the sender)"
@@ -2714,7 +2750,7 @@
 #. * offset is way off.  The user should never really see it, but
 #. * it's here just in case.  The parens are to make it clear it's
 #. * not a real timezone.
-#: ../libpurple/plugins/log_reader.c:497
+#: ../libpurple/plugins/log_reader.c:492
 msgid "(UTC)"
 msgstr "(UTC)"
 
@@ -2756,58 +2792,66 @@
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
-#: ../libpurple/plugins/log_reader.c:1989
-#: ../libpurple/plugins/log_reader.c:2098
+#: ../libpurple/plugins/log_reader.c:2344
+#: ../libpurple/plugins/log_reader.c:2467
 msgid "Adium"
 msgstr "Adium"
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
-#: ../libpurple/plugins/log_reader.c:2002
-#: ../libpurple/plugins/log_reader.c:2103
+#: ../libpurple/plugins/log_reader.c:2357
+#: ../libpurple/plugins/log_reader.c:2472
 msgid "Fire"
 msgstr "Fire"
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
-#: ../libpurple/plugins/log_reader.c:2014
-#: ../libpurple/plugins/log_reader.c:2107
+#: ../libpurple/plugins/log_reader.c:2369
+#: ../libpurple/plugins/log_reader.c:2476
 msgid "Messenger Plus!"
 msgstr "Messenger Plus!"
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
-#: ../libpurple/plugins/log_reader.c:2027
-#: ../libpurple/plugins/log_reader.c:2112
+#: ../libpurple/plugins/log_reader.c:2383
+#: ../libpurple/plugins/log_reader.c:2481
+msgid "QIP"
+msgstr "QIP"
+
+#. The names of IM clients are marked for translation at the request of
+#. translators who wanted to transliterate them.  Many translators
+#. choose to leave them alone.  Choose what's best for your language.
+#: ../libpurple/plugins/log_reader.c:2395
+#: ../libpurple/plugins/log_reader.c:2485
 msgid "MSN Messenger"
 msgstr "MSN Messenger"
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
-#: ../libpurple/plugins/log_reader.c:2039
-#: ../libpurple/plugins/log_reader.c:2116
+#: ../libpurple/plugins/log_reader.c:2407
+#: ../libpurple/plugins/log_reader.c:2489
 msgid "Trillian"
 msgstr "Trillian"
 
 #. Add general preferences.
-#: ../libpurple/plugins/log_reader.c:2080
+#: ../libpurple/plugins/log_reader.c:2449
 msgid "General Log Reading Configuration"
 msgstr "Splošne nastavitve ogledovanja dnevnika"
 
-#: ../libpurple/plugins/log_reader.c:2084
+#: ../libpurple/plugins/log_reader.c:2453
 msgid "Fast size calculations"
 msgstr "Hitri izračuni velikosti"
 
-#: ../libpurple/plugins/log_reader.c:2088
+#: ../libpurple/plugins/log_reader.c:2457
 msgid "Use name heuristics"
 msgstr "Uporabi hevristiko imena"
 
 #. Add Log Directory preferences.
-#: ../libpurple/plugins/log_reader.c:2094
+#: ../libpurple/plugins/log_reader.c:2463
 msgid "Log Directory"
 msgstr "Mapa dnevnika"
 
@@ -2817,19 +2861,19 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/log_reader.c:2145
+#: ../libpurple/plugins/log_reader.c:2518
 msgid "Log Reader"
 msgstr "Ogledovalnik dnevnika"
 
 #. *< name
 #. *< version
 #. * summary
-#: ../libpurple/plugins/log_reader.c:2149
+#: ../libpurple/plugins/log_reader.c:2522
 msgid "Includes other IM clients' logs in the log viewer."
 msgstr "Vključi dnevnike drugih odjemalcev neposrednih sporočil v ogledovalnik dnevnika."
 
 #. * description
-#: ../libpurple/plugins/log_reader.c:2153
+#: ../libpurple/plugins/log_reader.c:2526
 msgid ""
 "When viewing logs, this plugin will include logs from other IM clients. Currently, this includes Adium, MSN Messenger, and Trillian.\n"
 "\n"
@@ -3170,11 +3214,11 @@
 #: ../libpurple/protocols/gg/gg.c:1009
 #: ../libpurple/protocols/irc/irc.c:530
 #: ../libpurple/protocols/irc/msgs.c:310
-#: ../libpurple/protocols/jabber/buddy.c:1434
+#: ../libpurple/protocols/jabber/buddy.c:1472
 #: ../libpurple/protocols/novell/novell.c:2819
 #: ../libpurple/protocols/oscar/oscar.c:733
-#: ../libpurple/protocols/oscar/oscar.c:4544
-#: ../libpurple/protocols/oscar/oscar.c:5609
+#: ../libpurple/protocols/oscar/oscar.c:4545
+#: ../libpurple/protocols/oscar/oscar.c:5611
 #: ../libpurple/protocols/qq/qq.c:180
 #: ../libpurple/protocols/silc/buddy.c:1476
 #: ../libpurple/protocols/silc10/buddy.c:1476
@@ -3182,8 +3226,8 @@
 #: ../libpurple/protocols/yahoo/yahoo.c:3470
 #: ../libpurple/status.c:157
 #: ../pidgin/gtkdocklet.c:442
-#: ../pidgin/gtkprefs.c:1862
-#: ../pidgin/gtkstatusbox.c:1052
+#: ../pidgin/gtkprefs.c:1932
+#: ../pidgin/gtkstatusbox.c:1056
 msgid "Away"
 msgstr "Odsoten"
 
@@ -3250,30 +3294,30 @@
 msgid "Bonjour"
 msgstr "Bonjour"
 
-#: ../libpurple/protocols/bonjour/jabber.c:394
+#: ../libpurple/protocols/bonjour/jabber.c:395
 #, c-format
 msgid "%s has closed the conversation."
 msgstr "%s je zaprl pomenek."
 
-#: ../libpurple/protocols/bonjour/jabber.c:440
-#: ../libpurple/protocols/bonjour/jabber.c:653
-#: ../libpurple/protocols/bonjour/jabber.c:678
+#: ../libpurple/protocols/bonjour/jabber.c:441
+#: ../libpurple/protocols/bonjour/jabber.c:654
+#: ../libpurple/protocols/bonjour/jabber.c:679
 msgid "Unable to send the message, the conversation couldn't be started."
 msgstr "Sporočila ni mogoče poslati, pogovora ni mogoče začeti."
 
-#: ../libpurple/protocols/bonjour/jabber.c:574
+#: ../libpurple/protocols/bonjour/jabber.c:575
 msgid "Cannot open socket"
 msgstr "Vtičnice ni mogoče odpreti"
 
-#: ../libpurple/protocols/bonjour/jabber.c:582
+#: ../libpurple/protocols/bonjour/jabber.c:583
 msgid "Error setting socket options"
 msgstr "Napaka pri nastavljanju možnosti vtičnice"
 
-#: ../libpurple/protocols/bonjour/jabber.c:606
+#: ../libpurple/protocols/bonjour/jabber.c:607
 msgid "Could not bind socket to port"
 msgstr "Povezava vtičnice z vrati ni uspela"
 
-#: ../libpurple/protocols/bonjour/jabber.c:614
+#: ../libpurple/protocols/bonjour/jabber.c:615
 msgid "Could not listen on socket"
 msgstr "Poslušanje vtičnice ni možno"
 
@@ -3357,7 +3401,7 @@
 #: ../libpurple/protocols/gg/gg.c:477
 #: ../libpurple/protocols/gg/gg.c:770
 #: ../libpurple/protocols/jabber/jabber.c:807
-#: ../libpurple/protocols/jabber/jabber.c:1377
+#: ../libpurple/protocols/jabber/jabber.c:1369
 msgid "Password"
 msgstr "Geslo"
 
@@ -3387,10 +3431,10 @@
 
 #: ../libpurple/protocols/gg/gg.c:637
 #: ../libpurple/protocols/gg/gg.c:1049
-#: ../libpurple/protocols/gg/gg.c:1123
+#: ../libpurple/protocols/gg/gg.c:1121
 #: ../libpurple/protocols/jabber/jabber.c:843
-#: ../libpurple/protocols/oscar/oscar.c:3802
-#: ../libpurple/protocols/oscar/oscar.c:3815
+#: ../libpurple/protocols/oscar/oscar.c:3803
+#: ../libpurple/protocols/oscar/oscar.c:3816
 #: ../libpurple/protocols/qq/buddy_info.c:49
 msgid "City"
 msgstr "Kraj"
@@ -3401,7 +3445,7 @@
 
 #: ../libpurple/protocols/gg/gg.c:645
 #: ../libpurple/protocols/msn/msn.c:1558
-#: ../libpurple/protocols/oscar/oscar.c:3745
+#: ../libpurple/protocols/oscar/oscar.c:3746
 #: ../libpurple/protocols/qq/buddy_info.c:46
 #: ../libpurple/protocols/qq/qq.c:224
 #: ../libpurple/protocols/qq/qq.c:227
@@ -3416,14 +3460,14 @@
 msgstr "Moški ali ženska"
 
 #: ../libpurple/protocols/gg/gg.c:647
-#: ../libpurple/protocols/oscar/oscar.c:3745
+#: ../libpurple/protocols/oscar/oscar.c:3746
 #: ../libpurple/protocols/qq/buddy_info.c:83
 #: ../libpurple/protocols/qq/qq.c:224
 msgid "Male"
 msgstr "Moški"
 
 #: ../libpurple/protocols/gg/gg.c:648
-#: ../libpurple/protocols/oscar/oscar.c:3745
+#: ../libpurple/protocols/oscar/oscar.c:3746
 #: ../libpurple/protocols/qq/buddy_info.c:84
 #: ../libpurple/protocols/qq/qq.c:227
 msgid "Female"
@@ -3486,23 +3530,23 @@
 msgstr "Dodaj k pomenku ..."
 
 #: ../libpurple/protocols/gg/gg.c:1003
-#: ../libpurple/protocols/jabber/buddy.c:1428
+#: ../libpurple/protocols/jabber/buddy.c:1466
 #: ../libpurple/protocols/novell/novell.c:2828
 #: ../libpurple/protocols/oscar/oscar.c:828
-#: ../libpurple/protocols/oscar/oscar.c:5581
+#: ../libpurple/protocols/oscar/oscar.c:5583
 #: ../libpurple/protocols/qq/qq.c:170
 #: ../libpurple/protocols/qq/qq.c:177
 #: ../libpurple/protocols/yahoo/yahoo.c:2917
 #: ../libpurple/status.c:153
-#: ../pidgin/gtkblist.c:3079
-#: ../pidgin/gtkblist.c:3407
+#: ../pidgin/gtkblist.c:3070
+#: ../pidgin/gtkblist.c:3411
 #: ../pidgin/gtkdocklet.c:450
-#: ../pidgin/gtkstatusbox.c:1054
+#: ../pidgin/gtkstatusbox.c:1059
 msgid "Offline"
 msgstr "Brez povezave"
 
 #: ../libpurple/protocols/gg/gg.c:1006
-#: ../libpurple/protocols/jabber/buddy.c:1430
+#: ../libpurple/protocols/jabber/buddy.c:1468
 #: ../libpurple/protocols/msn/state.c:29
 #: ../libpurple/protocols/msn/state.c:30
 #: ../libpurple/protocols/msn/state.c:37
@@ -3511,138 +3555,138 @@
 #: ../libpurple/protocols/yahoo/yahoo.c:2919
 #: ../libpurple/status.c:154
 #: ../pidgin/gtkdocklet.c:438
-#: ../pidgin/gtkstatusbox.c:1051
+#: ../pidgin/gtkstatusbox.c:1055
 msgid "Available"
 msgstr "Na voljo"
 
 #: ../libpurple/protocols/gg/gg.c:1038
-#: ../libpurple/protocols/gg/gg.c:1114
+#: ../libpurple/protocols/gg/gg.c:1112
 #: ../libpurple/protocols/oscar/oscar.c:2675
-#: ../libpurple/protocols/oscar/oscar.c:3712
+#: ../libpurple/protocols/oscar/oscar.c:3713
 msgid "UIN"
 msgstr "UIN"
 
 #: ../libpurple/protocols/gg/gg.c:1041
-#: ../libpurple/protocols/gg/gg.c:1117
-#: ../libpurple/protocols/jabber/buddy.c:1585
-#: ../libpurple/protocols/jabber/buddy.c:1761
-#: ../libpurple/protocols/oscar/oscar.c:3723
+#: ../libpurple/protocols/gg/gg.c:1115
+#: ../libpurple/protocols/jabber/buddy.c:1623
+#: ../libpurple/protocols/jabber/buddy.c:1799
+#: ../libpurple/protocols/oscar/oscar.c:3724
 #: ../libpurple/protocols/silc/ops.c:990
 #: ../libpurple/protocols/silc10/ops.c:1024
 msgid "First Name"
 msgstr "Ime"
 
 #: ../libpurple/protocols/gg/gg.c:1054
-#: ../libpurple/protocols/gg/gg.c:1126
+#: ../libpurple/protocols/gg/gg.c:1124
 msgid "Birth Year"
 msgstr "Leto rojstva"
 
-#: ../libpurple/protocols/gg/gg.c:1108
-#: ../libpurple/protocols/gg/gg.c:1177
-#: ../libpurple/protocols/oscar/oscar.c:3924
+#: ../libpurple/protocols/gg/gg.c:1106
+#: ../libpurple/protocols/gg/gg.c:1175
+#: ../libpurple/protocols/oscar/oscar.c:3925
 msgid "Unable to display the search results."
 msgstr "Rezultatov iskanja ni mogoče izpisati."
 
-#: ../libpurple/protocols/gg/gg.c:1168
+#: ../libpurple/protocols/gg/gg.c:1166
 msgid "Gadu-Gadu Public Directory"
 msgstr "Javni imenik Gadu-Gadu"
 
-#: ../libpurple/protocols/gg/gg.c:1169
+#: ../libpurple/protocols/gg/gg.c:1167
 msgid "Search results"
 msgstr "Rezultati iskanja"
 
-#: ../libpurple/protocols/gg/gg.c:1212
+#: ../libpurple/protocols/gg/gg.c:1210
 msgid "No matching users found"
 msgstr "Ni najdenih uporabnikov"
 
-#: ../libpurple/protocols/gg/gg.c:1213
+#: ../libpurple/protocols/gg/gg.c:1211
 msgid "There are no users matching your search criteria."
 msgstr "Noben uporabnik ne ustreza iskalnim pogojem."
 
-#: ../libpurple/protocols/gg/gg.c:1307
-#: ../libpurple/protocols/gg/gg.c:1460
+#: ../libpurple/protocols/gg/gg.c:1305
+#: ../libpurple/protocols/gg/gg.c:1458
 msgid "Unable to read socket"
 msgstr "Ne morem brati vtičnice"
 
-#: ../libpurple/protocols/gg/gg.c:1392
+#: ../libpurple/protocols/gg/gg.c:1390
 msgid "Buddy list downloaded"
 msgstr "Seznam prijateljev prenesen"
 
-#: ../libpurple/protocols/gg/gg.c:1393
+#: ../libpurple/protocols/gg/gg.c:1391
 msgid "Your buddy list was downloaded from the server."
 msgstr "Vaš seznam prijateljev je bil prenesen s strežnika."
 
-#: ../libpurple/protocols/gg/gg.c:1400
+#: ../libpurple/protocols/gg/gg.c:1398
 msgid "Buddy list uploaded"
 msgstr "Seznam prijateljev prenesen"
 
-#: ../libpurple/protocols/gg/gg.c:1401
+#: ../libpurple/protocols/gg/gg.c:1399
 msgid "Your buddy list was stored on the server."
 msgstr "Seznam prijateljev je bil shranjen na strežniku."
 
-#: ../libpurple/protocols/gg/gg.c:1506
-#: ../libpurple/protocols/gg/gg.c:1712
+#: ../libpurple/protocols/gg/gg.c:1504
+#: ../libpurple/protocols/gg/gg.c:1710
 msgid "Connection failed."
 msgstr "Povezava ni uspela."
 
-#: ../libpurple/protocols/gg/gg.c:1618
+#: ../libpurple/protocols/gg/gg.c:1616
 #: ../libpurple/protocols/msn/msn.c:531
 msgid "Blocked"
 msgstr "Zavrnjeno"
 
-#: ../libpurple/protocols/gg/gg.c:1641
+#: ../libpurple/protocols/gg/gg.c:1639
 msgid "Add to chat"
 msgstr "Dodaj k pomenku"
 
-#: ../libpurple/protocols/gg/gg.c:1650
+#: ../libpurple/protocols/gg/gg.c:1648
 msgid "Unblock"
 msgstr "Prekliči zavrnitev"
 
-#: ../libpurple/protocols/gg/gg.c:1654
+#: ../libpurple/protocols/gg/gg.c:1652
 msgid "Block"
 msgstr "Zavrni"
 
-#: ../libpurple/protocols/gg/gg.c:1671
+#: ../libpurple/protocols/gg/gg.c:1669
 msgid "Chat _name:"
 msgstr "_Ime za klepet:"
 
-#: ../libpurple/protocols/gg/gg.c:1911
+#: ../libpurple/protocols/gg/gg.c:1909
 msgid "Chat error"
 msgstr "Napaka pri pomenku"
 
-#: ../libpurple/protocols/gg/gg.c:1912
+#: ../libpurple/protocols/gg/gg.c:1910
 msgid "This chat name is already in use"
 msgstr "Ime za pomenek že obstaja"
 
-#: ../libpurple/protocols/gg/gg.c:1995
+#: ../libpurple/protocols/gg/gg.c:1993
 msgid "Not connected to the server."
 msgstr "S strežnikom niste povezani."
 
-#: ../libpurple/protocols/gg/gg.c:2018
+#: ../libpurple/protocols/gg/gg.c:2016
 msgid "Find buddies..."
 msgstr "Poišči prijatelje ..."
 
-#: ../libpurple/protocols/gg/gg.c:2024
+#: ../libpurple/protocols/gg/gg.c:2022
 msgid "Change password..."
 msgstr "Spremeni geslo ..."
 
-#: ../libpurple/protocols/gg/gg.c:2030
+#: ../libpurple/protocols/gg/gg.c:2028
 msgid "Upload buddylist to Server"
 msgstr "Izvozi seznam prijateljev na strežnik"
 
-#: ../libpurple/protocols/gg/gg.c:2034
+#: ../libpurple/protocols/gg/gg.c:2032
 msgid "Download buddylist from Server"
 msgstr "Uvozi seznam prijateljev s strežnika"
 
-#: ../libpurple/protocols/gg/gg.c:2038
+#: ../libpurple/protocols/gg/gg.c:2036
 msgid "Delete buddylist from Server"
 msgstr "Izbriši seznam prijateljev na strežniku"
 
-#: ../libpurple/protocols/gg/gg.c:2042
+#: ../libpurple/protocols/gg/gg.c:2040
 msgid "Save buddylist to file..."
 msgstr "Shrani seznam prijateljev v datoteko ..."
 
-#: ../libpurple/protocols/gg/gg.c:2046
+#: ../libpurple/protocols/gg/gg.c:2044
 msgid "Load buddylist from file..."
 msgstr "Uvozi seznam prijateljev iz datoteke ..."
 
@@ -3657,16 +3701,16 @@
 #. id
 #. name
 #. version
-#: ../libpurple/protocols/gg/gg.c:2150
+#: ../libpurple/protocols/gg/gg.c:2148
 msgid "Gadu-Gadu Protocol Plugin"
 msgstr "Dodatek za protokol Gadu-Gadu"
 
 #. summary
-#: ../libpurple/protocols/gg/gg.c:2151
+#: ../libpurple/protocols/gg/gg.c:2149
 msgid "Polish popular IM"
 msgstr "Olepšaj priljubljen program za neposredno sporočanje"
 
-#: ../libpurple/protocols/gg/gg.c:2205
+#: ../libpurple/protocols/gg/gg.c:2203
 msgid "Gadu-Gadu User"
 msgstr "Uporabnik Gadu-Gadu"
 
@@ -3694,9 +3738,9 @@
 
 #: ../libpurple/protocols/irc/dcc_send.c:296
 #: ../libpurple/protocols/irc/dcc_send.c:337
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:268
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:277
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:290
+#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:269
+#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:278
+#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:291
 msgid "File Transfer Failed"
 msgstr "Prenos datoteke ni uspel"
 
@@ -3741,7 +3785,7 @@
 
 #: ../libpurple/protocols/irc/irc.c:267
 #: ../libpurple/protocols/jabber/chat.c:59
-#: ../pidgin/gtkaccount.c:523
+#: ../pidgin/gtkaccount.c:526
 msgid "_Password:"
 msgstr "_Geslo:"
 
@@ -3751,7 +3795,7 @@
 
 #. connect to the server
 #: ../libpurple/protocols/irc/irc.c:319
-#: ../libpurple/protocols/jabber/jabber.c:1048
+#: ../libpurple/protocols/jabber/jabber.c:1046
 #: ../libpurple/protocols/msn/session.c:345
 #: ../libpurple/protocols/novell/novell.c:2182
 #: ../libpurple/protocols/oscar/oscar.c:1288
@@ -3760,7 +3804,7 @@
 #: ../libpurple/protocols/simple/simple.c:1671
 #: ../libpurple/protocols/yahoo/yahoo.c:2762
 #: ../libpurple/protocols/zephyr/zephyr.c:1621
-#: ../pidgin/gtkstatusbox.c:659
+#: ../pidgin/gtkstatusbox.c:661
 msgid "Connecting"
 msgstr "Povezovanje"
 
@@ -3799,7 +3843,7 @@
 #: ../libpurple/protocols/irc/irc.c:775
 #: ../libpurple/protocols/silc/chat.c:1412
 #: ../libpurple/protocols/silc10/chat.c:1426
-#: ../libpurple/protocols/yahoo/yahoochat.c:1438
+#: ../libpurple/protocols/yahoo/yahoochat.c:1401
 msgid "Users"
 msgstr "Uporabniki"
 
@@ -3809,7 +3853,7 @@
 #: ../libpurple/protocols/silc/ops.c:1389
 #: ../libpurple/protocols/silc10/chat.c:1429
 #: ../libpurple/protocols/silc10/ops.c:1382
-#: ../libpurple/protocols/yahoo/yahoochat.c:1447
+#: ../libpurple/protocols/yahoo/yahoochat.c:1410
 msgid "Topic"
 msgstr "Tema"
 
@@ -3821,20 +3865,20 @@
 #. *< id
 #. *< name
 #. *< version
-#: ../libpurple/protocols/irc/irc.c:915
+#: ../libpurple/protocols/irc/irc.c:916
 msgid "IRC Protocol Plugin"
 msgstr "Vstavek za protokol IRC"
 
 #. *  summary
-#: ../libpurple/protocols/irc/irc.c:916
+#: ../libpurple/protocols/irc/irc.c:917
 msgid "The IRC Protocol Plugin that Sucks Less"
 msgstr "Vstavek za protokol IRC, ki je manj beden"
 
 #. host to connect to
-#: ../libpurple/protocols/irc/irc.c:941
+#: ../libpurple/protocols/irc/irc.c:942
 #: ../libpurple/protocols/irc/msgs.c:323
 #: ../libpurple/protocols/msn/msn.c:2154
-#: ../libpurple/protocols/oscar/oscar.c:6648
+#: ../libpurple/protocols/oscar/oscar.c:6650
 #: ../libpurple/protocols/qq/qq.c:756
 #: ../libpurple/protocols/sametime/sametime.c:5727
 #: ../libpurple/protocols/silc/ops.c:1249
@@ -3847,22 +3891,22 @@
 msgstr "Strežnik"
 
 #. port to connect to
-#: ../libpurple/protocols/irc/irc.c:944
+#: ../libpurple/protocols/irc/irc.c:945
 #: ../libpurple/protocols/msn/msn.c:2159
-#: ../libpurple/protocols/oscar/oscar.c:6651
+#: ../libpurple/protocols/oscar/oscar.c:6653
 #: ../libpurple/protocols/qq/qq.c:759
 #: ../libpurple/protocols/sametime/sametime.c:5732
-#: ../libpurple/protocols/silc/silc.c:1917
-#: ../libpurple/protocols/silc10/silc.c:1859
+#: ../libpurple/protocols/silc/silc.c:1918
+#: ../libpurple/protocols/silc10/silc.c:1861
 #: ../libpurple/protocols/toc/toc.c:2331
 msgid "Port"
 msgstr "Vrata"
 
-#: ../libpurple/protocols/irc/irc.c:947
+#: ../libpurple/protocols/irc/irc.c:948
 msgid "Encodings"
 msgstr "Kodiranje znakov"
 
-#: ../libpurple/protocols/irc/irc.c:950
+#: ../libpurple/protocols/irc/irc.c:951
 #: ../libpurple/protocols/irc/msgs.c:316
 #: ../libpurple/protocols/jabber/jabber.c:803
 #: ../libpurple/protocols/silc/buddy.c:1539
@@ -3880,7 +3924,7 @@
 msgid "Username"
 msgstr "Uporabniško ime"
 
-#: ../libpurple/protocols/irc/irc.c:953
+#: ../libpurple/protocols/irc/irc.c:954
 #: ../libpurple/protocols/irc/msgs.c:317
 #: ../libpurple/protocols/silc/silc.c:1009
 #: ../libpurple/protocols/silc10/silc.c:920
@@ -3891,7 +3935,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:961
+#: ../libpurple/protocols/irc/irc.c:962
 msgid "Use SSL"
 msgstr "Uporabi SSL"
 
@@ -3922,7 +3966,7 @@
 msgstr " <i>(identified)</i>"
 
 #: ../libpurple/protocols/irc/msgs.c:303
-#: ../libpurple/protocols/oscar/oscar.c:3713
+#: ../libpurple/protocols/oscar/oscar.c:3714
 #: ../libpurple/protocols/silc/ops.c:1418
 #: ../libpurple/protocols/silc10/ops.c:1414
 msgid "Nick"
@@ -4155,7 +4199,7 @@
 msgstr "names [kanal]:  Seznam uporabnikov, ki so trenutno na kanalu."
 
 #: ../libpurple/protocols/irc/parse.c:137
-#: ../libpurple/protocols/jabber/jabber.c:1819
+#: ../libpurple/protocols/jabber/jabber.c:1813
 msgid "nick &lt;new nickname&gt;:  Change your nickname."
 msgstr "nick &lt;nov vzdevek&gt;:  Spremenite vaš vzdevek."
 
@@ -4307,7 +4351,7 @@
 msgstr "Napaka SASL"
 
 #: ../libpurple/protocols/jabber/buddy.c:271
-#: ../libpurple/protocols/jabber/buddy.c:787
+#: ../libpurple/protocols/jabber/buddy.c:825
 #: ../libpurple/protocols/sametime/sametime.c:4128
 #: ../libpurple/protocols/silc/ops.c:986
 #: ../libpurple/protocols/silc10/ops.c:1020
@@ -4315,14 +4359,14 @@
 msgstr "Polno ime"
 
 #: ../libpurple/protocols/jabber/buddy.c:272
-#: ../libpurple/protocols/jabber/buddy.c:800
+#: ../libpurple/protocols/jabber/buddy.c:838
 #: ../libpurple/protocols/silc/ops.c:998
 #: ../libpurple/protocols/silc10/ops.c:1032
 msgid "Family Name"
 msgstr "Družinsko ime"
 
 #: ../libpurple/protocols/jabber/buddy.c:273
-#: ../libpurple/protocols/jabber/buddy.c:804
+#: ../libpurple/protocols/jabber/buddy.c:842
 msgid "Given Name"
 msgstr "Ime"
 
@@ -4332,47 +4376,47 @@
 msgstr "URL"
 
 #: ../libpurple/protocols/jabber/buddy.c:276
-#: ../libpurple/protocols/jabber/buddy.c:856
+#: ../libpurple/protocols/jabber/buddy.c:894
 msgid "Street Address"
 msgstr "Naslov"
 
 #: ../libpurple/protocols/jabber/buddy.c:277
-#: ../libpurple/protocols/jabber/buddy.c:852
+#: ../libpurple/protocols/jabber/buddy.c:890
 msgid "Extended Address"
 msgstr "Naslov (dodatno)"
 
 #: ../libpurple/protocols/jabber/buddy.c:278
-#: ../libpurple/protocols/jabber/buddy.c:860
+#: ../libpurple/protocols/jabber/buddy.c:898
 msgid "Locality"
 msgstr "Okraj"
 
 #: ../libpurple/protocols/jabber/buddy.c:279
-#: ../libpurple/protocols/jabber/buddy.c:864
+#: ../libpurple/protocols/jabber/buddy.c:902
 msgid "Region"
 msgstr "Regija"
 
 #: ../libpurple/protocols/jabber/buddy.c:280
-#: ../libpurple/protocols/jabber/buddy.c:868
+#: ../libpurple/protocols/jabber/buddy.c:906
 msgid "Postal Code"
 msgstr "Poštna številka"
 
 #: ../libpurple/protocols/jabber/buddy.c:281
-#: ../libpurple/protocols/jabber/buddy.c:873
+#: ../libpurple/protocols/jabber/buddy.c:911
 #: ../libpurple/protocols/silc/silc.c:1015
 #: ../libpurple/protocols/silc10/silc.c:926
 msgid "Country"
 msgstr "Država"
 
 #: ../libpurple/protocols/jabber/buddy.c:282
-#: ../libpurple/protocols/jabber/buddy.c:884
-#: ../libpurple/protocols/jabber/buddy.c:891
+#: ../libpurple/protocols/jabber/buddy.c:922
+#: ../libpurple/protocols/jabber/buddy.c:929
 msgid "Telephone"
 msgstr "Telefon"
 
 #: ../libpurple/protocols/jabber/buddy.c:283
-#: ../libpurple/protocols/jabber/buddy.c:902
-#: ../libpurple/protocols/jabber/buddy.c:910
-#: ../libpurple/protocols/jabber/buddy.c:1591
+#: ../libpurple/protocols/jabber/buddy.c:940
+#: ../libpurple/protocols/jabber/buddy.c:948
+#: ../libpurple/protocols/jabber/buddy.c:1629
 #: ../libpurple/protocols/silc/ops.c:1041
 #: ../libpurple/protocols/silc/util.c:555
 #: ../libpurple/protocols/silc10/ops.c:1075
@@ -4382,221 +4426,220 @@
 msgstr "E-pošta"
 
 #: ../libpurple/protocols/jabber/buddy.c:284
-#: ../libpurple/protocols/jabber/buddy.c:925
+#: ../libpurple/protocols/jabber/buddy.c:963
 msgid "Organization Name"
 msgstr "Ime organizacije"
 
 #: ../libpurple/protocols/jabber/buddy.c:285
-#: ../libpurple/protocols/jabber/buddy.c:929
+#: ../libpurple/protocols/jabber/buddy.c:967
 msgid "Organization Unit"
 msgstr "Enota organizacije"
 
 #: ../libpurple/protocols/jabber/buddy.c:287
-#: ../libpurple/protocols/jabber/buddy.c:938
+#: ../libpurple/protocols/jabber/buddy.c:976
 msgid "Role"
 msgstr "Funkcija"
 
 #: ../libpurple/protocols/jabber/buddy.c:288
-#: ../libpurple/protocols/jabber/buddy.c:821
+#: ../libpurple/protocols/jabber/buddy.c:859
 #: ../libpurple/protocols/msn/msn.c:1627
-#: ../libpurple/protocols/oscar/oscar.c:3762
+#: ../libpurple/protocols/oscar/oscar.c:3763
 msgid "Birthday"
 msgstr "Rojstni dan"
 
 #: ../libpurple/protocols/jabber/buddy.c:289
-#: ../libpurple/protocols/jabber/buddy.c:941
+#: ../libpurple/protocols/jabber/buddy.c:979
 #: ../libpurple/protocols/jabber/chat.c:775
-#: ../pidgin/gtkblist.c:3090
-#: ../pidgin/gtkprefs.c:680
+#: ../pidgin/gtkblist.c:3081
+#: ../pidgin/gtkprefs.c:738
 msgid "Description"
 msgstr "Opis"
 
-#: ../libpurple/protocols/jabber/buddy.c:578
-#: ../libpurple/protocols/jabber/buddy.c:579
+#: ../libpurple/protocols/jabber/buddy.c:582
+#: ../libpurple/protocols/jabber/buddy.c:583
 msgid "Edit XMPP vCard"
 msgstr "Uredi vCard za XMPP"
 
-#: ../libpurple/protocols/jabber/buddy.c:580
+#: ../libpurple/protocols/jabber/buddy.c:584
 msgid "All items below are optional. Enter only the information with which you feel comfortable."
 msgstr "Vsa spodnja polja so izbirna. Vnesite samo informacije, ki jih želite."
 
-#: ../libpurple/protocols/jabber/buddy.c:651
-#: ../libpurple/protocols/jabber/buddy.c:692
-msgid "Client"
-msgstr "Odjemalec"
-
 #: ../libpurple/protocols/jabber/buddy.c:655
 #: ../libpurple/protocols/jabber/buddy.c:696
+msgid "Client"
+msgstr "Odjemalec"
+
+#: ../libpurple/protocols/jabber/buddy.c:659
+#: ../libpurple/protocols/jabber/buddy.c:700
 msgid "Operating System"
 msgstr "Operacijski sistem"
 
-#: ../libpurple/protocols/jabber/buddy.c:665
-#: ../libpurple/protocols/jabber/libxmpp.c:198
+#: ../libpurple/protocols/jabber/buddy.c:669
+#: ../libpurple/protocols/jabber/libxmpp.c:202
 #: ../libpurple/protocols/jabber/si.c:853
 msgid "Resource"
 msgstr "Vir"
 
-#: ../libpurple/protocols/jabber/buddy.c:667
-#: ../libpurple/protocols/jabber/jabber.c:1251
-#: ../libpurple/protocols/jabber/jabber.c:1261
-#: ../libpurple/protocols/jabber/jabber.c:1271
-#: ../libpurple/protocols/jabber/jabber.c:1281
-#: ../libpurple/protocols/jabber/jabber.c:1291
+#: ../libpurple/protocols/jabber/buddy.c:671
+#: ../libpurple/protocols/jabber/jabber.c:1243
+#: ../libpurple/protocols/jabber/jabber.c:1253
+#: ../libpurple/protocols/jabber/jabber.c:1263
+#: ../libpurple/protocols/jabber/jabber.c:1273
+#: ../libpurple/protocols/jabber/jabber.c:1283
 msgid "Priority"
 msgstr "Prednost stika"
 
-#: ../libpurple/protocols/jabber/buddy.c:808
+#: ../libpurple/protocols/jabber/buddy.c:846
 #: ../libpurple/protocols/silc/ops.c:994
 #: ../libpurple/protocols/silc10/ops.c:1028
 msgid "Middle Name"
 msgstr "Drugo ime"
 
-#: ../libpurple/protocols/jabber/buddy.c:841
+#: ../libpurple/protocols/jabber/buddy.c:879
 #: ../libpurple/protocols/jabber/jabber.c:838
-#: ../libpurple/protocols/oscar/oscar.c:3801
-#: ../libpurple/protocols/oscar/oscar.c:3814
+#: ../libpurple/protocols/oscar/oscar.c:3802
+#: ../libpurple/protocols/oscar/oscar.c:3815
 #: ../libpurple/protocols/qq/buddy_info.c:56
 #: ../libpurple/protocols/silc/ops.c:1030
 #: ../libpurple/protocols/silc10/ops.c:1064
 msgid "Address"
 msgstr "Naslov"
 
-#: ../libpurple/protocols/jabber/buddy.c:848
+#: ../libpurple/protocols/jabber/buddy.c:886
 msgid "P.O. Box"
 msgstr "Poštni nabiralnik"
 
-#: ../libpurple/protocols/jabber/buddy.c:962
+#: ../libpurple/protocols/jabber/buddy.c:1000
 msgid "Photo"
 msgstr "Fotografija"
 
-#: ../libpurple/protocols/jabber/buddy.c:962
+#: ../libpurple/protocols/jabber/buddy.c:1000
 msgid "Logo"
 msgstr "Logotip"
 
-#: ../libpurple/protocols/jabber/buddy.c:1371
+#: ../libpurple/protocols/jabber/buddy.c:1409
 msgid "Un-hide From"
 msgstr "Ne skrij pred"
 
-#: ../libpurple/protocols/jabber/buddy.c:1375
+#: ../libpurple/protocols/jabber/buddy.c:1413
 msgid "Temporarily Hide From"
 msgstr "Začasno skrij pred"
 
 #. && NOT ME
-#: ../libpurple/protocols/jabber/buddy.c:1383
+#: ../libpurple/protocols/jabber/buddy.c:1421
 msgid "Cancel Presence Notification"
 msgstr "Prekliči obvestilo o prisotnosti"
 
-#: ../libpurple/protocols/jabber/buddy.c:1390
+#: ../libpurple/protocols/jabber/buddy.c:1428
 msgid "(Re-)Request authorization"
 msgstr "Ponovno zahtevaj pooblastitev"
 
 #. if(NOT ME)
 #. shouldn't this just happen automatically when the buddy is
 #. removed?
-#: ../libpurple/protocols/jabber/buddy.c:1399
+#: ../libpurple/protocols/jabber/buddy.c:1437
 msgid "Unsubscribe"
 msgstr "Odjavi"
 
-#: ../libpurple/protocols/jabber/buddy.c:1432
-#: ../libpurple/protocols/jabber/jabber.c:1260
+#: ../libpurple/protocols/jabber/buddy.c:1470
+#: ../libpurple/protocols/jabber/jabber.c:1252
 msgid "Chatty"
 msgstr "Pomenek"
 
-#: ../libpurple/protocols/jabber/buddy.c:1436
-#: ../libpurple/status.c:158
+#: ../libpurple/protocols/jabber/buddy.c:1474
 msgid "Extended Away"
 msgstr "Odsotnost - Napredno"
 
-#: ../libpurple/protocols/jabber/buddy.c:1438
-#: ../libpurple/protocols/jabber/jabber.c:1290
+#: ../libpurple/protocols/jabber/buddy.c:1476
+#: ../libpurple/protocols/jabber/jabber.c:1282
 #: ../libpurple/protocols/oscar/oscar.c:727
-#: ../libpurple/protocols/oscar/oscar.c:5785
+#: ../libpurple/protocols/oscar/oscar.c:5787
 #: ../libpurple/protocols/sametime/sametime.c:3297
 msgid "Do Not Disturb"
 msgstr "Ne moti"
 
-#: ../libpurple/protocols/jabber/buddy.c:1583
+#: ../libpurple/protocols/jabber/buddy.c:1621
 msgid "JID"
 msgstr "JID"
 
-#: ../libpurple/protocols/jabber/buddy.c:1587
-#: ../libpurple/protocols/jabber/buddy.c:1766
-#: ../libpurple/protocols/oscar/oscar.c:3724
+#: ../libpurple/protocols/jabber/buddy.c:1625
+#: ../libpurple/protocols/jabber/buddy.c:1804
+#: ../libpurple/protocols/oscar/oscar.c:3725
 msgid "Last Name"
 msgstr "Priimek"
 
-#: ../libpurple/protocols/jabber/buddy.c:1619
+#: ../libpurple/protocols/jabber/buddy.c:1657
 msgid "The following are the results of your search"
 msgstr "To so rezultati vašega iskanja"
 
 #. current comment from Jabber User Directory users.jabber.org
-#: ../libpurple/protocols/jabber/buddy.c:1694
+#: ../libpurple/protocols/jabber/buddy.c:1732
 msgid "Find a contact by entering the search criteria in the given fields. Note: Each field supports wild card searches (%)"
 msgstr "Najdi stik z vnosom iskalnih kriterijev v dana polja. Opomba: vsa polja dovoljujejo iskanje z nadomestnimi znaki (%)."
 
-#: ../libpurple/protocols/jabber/buddy.c:1714
+#: ../libpurple/protocols/jabber/buddy.c:1752
 msgid "Directory Query Failed"
 msgstr "Povpraševanje po imeniku ni uspelo"
 
-#: ../libpurple/protocols/jabber/buddy.c:1715
+#: ../libpurple/protocols/jabber/buddy.c:1753
 msgid "Could not query the directory server."
 msgstr "Povpraševanje na strežniku z imenikom ni uspelo."
 
 #. Try to translate the message (see static message
 #. list in jabber_user_dir_comments[])
-#: ../libpurple/protocols/jabber/buddy.c:1749
+#: ../libpurple/protocols/jabber/buddy.c:1787
 #, c-format
 msgid "Server Instructions: %s"
 msgstr "Ukazi strežniku: %s"
 
-#: ../libpurple/protocols/jabber/buddy.c:1756
+#: ../libpurple/protocols/jabber/buddy.c:1794
 msgid "Fill in one or more fields to search for any matching XMPP users."
 msgstr "Izpolnite eno ali več polj za iskanje uporabnikov XMPP."
 
-#: ../libpurple/protocols/jabber/buddy.c:1776
+#: ../libpurple/protocols/jabber/buddy.c:1814
 #: ../libpurple/protocols/novell/novell.c:1488
-#: ../libpurple/protocols/oscar/oscar.c:3727
-#: ../libpurple/protocols/oscar/oscar.c:3736
+#: ../libpurple/protocols/oscar/oscar.c:3728
+#: ../libpurple/protocols/oscar/oscar.c:3737
 msgid "E-Mail Address"
 msgstr "E-naslov"
 
-#: ../libpurple/protocols/jabber/buddy.c:1785
-#: ../libpurple/protocols/jabber/buddy.c:1786
+#: ../libpurple/protocols/jabber/buddy.c:1823
+#: ../libpurple/protocols/jabber/buddy.c:1824
 msgid "Search for XMPP users"
 msgstr "Poišči uporabnike XMPP"
 
 #. "Search"
-#: ../libpurple/protocols/jabber/buddy.c:1787
+#: ../libpurple/protocols/jabber/buddy.c:1825
 #: ../libpurple/protocols/qq/group.c:123
-#: ../libpurple/protocols/qq/group_im.c:145
+#: ../libpurple/protocols/qq/group_im.c:147
 #: ../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:5611
-#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:473
-#: ../pidgin/plugins/gevolution/assoc-buddy.c:358
+#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:470
+#: ../pidgin/plugins/gevolution/assoc-buddy.c:356
 msgid "Search"
 msgstr "Išči"
 
-#: ../libpurple/protocols/jabber/buddy.c:1802
+#: ../libpurple/protocols/jabber/buddy.c:1840
 msgid "Invalid Directory"
 msgstr "Neveljaven imenik"
 
-#: ../libpurple/protocols/jabber/buddy.c:1819
+#: ../libpurple/protocols/jabber/buddy.c:1857
 msgid "Enter a User Directory"
 msgstr "Vnesite imenik uporabnikov"
 
-#: ../libpurple/protocols/jabber/buddy.c:1820
+#: ../libpurple/protocols/jabber/buddy.c:1858
 msgid "Select a user directory to search"
 msgstr "Izberite imenik za iskanje"
 
-#: ../libpurple/protocols/jabber/buddy.c:1823
+#: ../libpurple/protocols/jabber/buddy.c:1861
 msgid "Search Directory"
 msgstr "Imenik iskanja"
 
 #: ../libpurple/protocols/jabber/chat.c:41
-#: ../libpurple/protocols/oscar/oscar.c:5271
-#: ../libpurple/protocols/yahoo/yahoochat.c:999
+#: ../libpurple/protocols/oscar/oscar.c:5273
+#: ../libpurple/protocols/yahoo/yahoochat.c:962
 msgid "_Room:"
 msgstr "_Soba:"
 
@@ -4737,7 +4780,7 @@
 msgstr "Registracija uspela!"
 
 #: ../libpurple/protocols/jabber/jabber.c:653
-#: ../libpurple/protocols/jabber/jabber.c:1530
+#: ../libpurple/protocols/jabber/jabber.c:1524
 msgid "Unknown Error"
 msgstr "Neznana napaka"
 
@@ -4752,8 +4795,8 @@
 msgstr "Že registriran"
 
 #: ../libpurple/protocols/jabber/jabber.c:848
-#: ../libpurple/protocols/oscar/oscar.c:3803
-#: ../libpurple/protocols/oscar/oscar.c:3816
+#: ../libpurple/protocols/oscar/oscar.c:3804
+#: ../libpurple/protocols/oscar/oscar.c:3817
 msgid "State"
 msgstr "Zvezna država"
 
@@ -4786,379 +4829,383 @@
 
 #. Register button
 #: ../libpurple/protocols/jabber/jabber.c:881
-#: ../pidgin/gtkaccount.c:1526
+#: ../pidgin/gtkaccount.c:1518
 msgid "Register"
 msgstr "Registriraj se"
 
-#: ../libpurple/protocols/jabber/jabber.c:1052
+#: ../libpurple/protocols/jabber/jabber.c:1050
 msgid "Initializing Stream"
 msgstr "Inicializacija toka"
 
-#: ../libpurple/protocols/jabber/jabber.c:1057
+#: ../libpurple/protocols/jabber/jabber.c:1055
 #: ../libpurple/protocols/msn/session.c:351
 msgid "Authenticating"
 msgstr "Overovljanje"
 
-#: ../libpurple/protocols/jabber/jabber.c:1066
+#: ../libpurple/protocols/jabber/jabber.c:1064
 msgid "Re-initializing Stream"
 msgstr "Ponovna inicializacija toka"
 
-#: ../libpurple/protocols/jabber/jabber.c:1134
-#: ../libpurple/protocols/jabber/jabber.c:1508
-#: ../libpurple/protocols/jabber/jabber.c:1549
-#: ../libpurple/protocols/jabber/jabber.c:1585
+#: ../libpurple/protocols/jabber/jabber.c:1126
+#: ../libpurple/protocols/jabber/jabber.c:1502
+#: ../libpurple/protocols/jabber/jabber.c:1543
+#: ../libpurple/protocols/jabber/jabber.c:1579
 #: ../libpurple/protocols/oscar/oscar.c:826
-#: ../libpurple/protocols/oscar/oscar.c:5579
+#: ../libpurple/protocols/oscar/oscar.c:5581
 msgid "Not Authorized"
 msgstr "Nepooblaščeno"
 
-#: ../libpurple/protocols/jabber/jabber.c:1176
+#: ../libpurple/protocols/jabber/jabber.c:1168
 msgid "Both"
 msgstr "Oboje"
 
-#: ../libpurple/protocols/jabber/jabber.c:1178
+#: ../libpurple/protocols/jabber/jabber.c:1170
 msgid "From (To pending)"
 msgstr "Od (Za čakajoče)"
 
-#: ../libpurple/protocols/jabber/jabber.c:1183
+#: ../libpurple/protocols/jabber/jabber.c:1172
+msgid "From"
+msgstr "Od"
+
+#: ../libpurple/protocols/jabber/jabber.c:1175
 msgid "To"
 msgstr "Za"
 
-#: ../libpurple/protocols/jabber/jabber.c:1185
+#: ../libpurple/protocols/jabber/jabber.c:1177
 msgid "None (To pending)"
 msgstr "Brez (Za čakajoče)"
 
-#: ../libpurple/protocols/jabber/jabber.c:1187
+#: ../libpurple/protocols/jabber/jabber.c:1179
 #: ../pidgin/plugins/gevolution/eds-utils.c:73
 #: ../pidgin/plugins/gevolution/eds-utils.c:86
 msgid "None"
 msgstr "brez"
 
-#: ../libpurple/protocols/jabber/jabber.c:1190
+#: ../libpurple/protocols/jabber/jabber.c:1182
 msgid "Subscription"
 msgstr "Naročilo"
 
-#: ../libpurple/protocols/jabber/jabber.c:1320
+#: ../libpurple/protocols/jabber/jabber.c:1312
 msgid "Password Changed"
 msgstr "Geslo spremenjeno"
 
-#: ../libpurple/protocols/jabber/jabber.c:1321
+#: ../libpurple/protocols/jabber/jabber.c:1313
 msgid "Your password has been changed."
 msgstr "Vaše geslo je bilo spremenjeno."
 
-#: ../libpurple/protocols/jabber/jabber.c:1325
-#: ../libpurple/protocols/jabber/jabber.c:1326
+#: ../libpurple/protocols/jabber/jabber.c:1317
+#: ../libpurple/protocols/jabber/jabber.c:1318
 msgid "Error changing password"
 msgstr "Napaka pri spreminjanju gesla"
 
-#: ../libpurple/protocols/jabber/jabber.c:1382
+#: ../libpurple/protocols/jabber/jabber.c:1375
 msgid "Password (again)"
 msgstr "Novo geslo (ponovno)"
 
-#: ../libpurple/protocols/jabber/jabber.c:1387
-#: ../libpurple/protocols/jabber/jabber.c:1388
+#: ../libpurple/protocols/jabber/jabber.c:1381
+#: ../libpurple/protocols/jabber/jabber.c:1382
 msgid "Change XMPP Password"
 msgstr "Spremeni geslo XMPP"
 
-#: ../libpurple/protocols/jabber/jabber.c:1388
+#: ../libpurple/protocols/jabber/jabber.c:1382
 msgid "Please enter your new password"
 msgstr "Vnesite svoje novo geslo"
 
-#: ../libpurple/protocols/jabber/jabber.c:1400
-#: ../libpurple/protocols/oscar/oscar.c:6365
+#: ../libpurple/protocols/jabber/jabber.c:1394
+#: ../libpurple/protocols/oscar/oscar.c:6367
 #: ../libpurple/protocols/silc/silc.c:1093
 #: ../libpurple/protocols/silc10/silc.c:1004
 msgid "Set User Info..."
 msgstr "Nastavi informacije o uporabniku ..."
 
 #. if (js->protocol_options & CHANGE_PASSWORD) {
-#: ../libpurple/protocols/jabber/jabber.c:1405
-#: ../libpurple/protocols/oscar/oscar.c:6376
+#: ../libpurple/protocols/jabber/jabber.c:1399
+#: ../libpurple/protocols/oscar/oscar.c:6378
 #: ../libpurple/protocols/silc/silc.c:1089
 #: ../libpurple/protocols/silc10/silc.c:1000
 msgid "Change Password..."
 msgstr "Spremeni geslo ..."
 
 #. }
-#: ../libpurple/protocols/jabber/jabber.c:1410
+#: ../libpurple/protocols/jabber/jabber.c:1404
 msgid "Search for Users..."
 msgstr "Najdi uporabnike ..."
 
+#: ../libpurple/protocols/jabber/jabber.c:1482
+msgid "Bad Request"
+msgstr "Napačna zahteva"
+
+#: ../libpurple/protocols/jabber/jabber.c:1484
+msgid "Conflict"
+msgstr "Spor"
+
+#: ../libpurple/protocols/jabber/jabber.c:1486
+msgid "Feature Not Implemented"
+msgstr "Možnost ni uvedena"
+
 #: ../libpurple/protocols/jabber/jabber.c:1488
-msgid "Bad Request"
-msgstr "Napačna zahteva"
+msgid "Forbidden"
+msgstr "Prepovedano"
 
 #: ../libpurple/protocols/jabber/jabber.c:1490
-msgid "Conflict"
-msgstr "Spor"
+msgid "Gone"
+msgstr "Ni na voljo"
 
 #: ../libpurple/protocols/jabber/jabber.c:1492
-msgid "Feature Not Implemented"
-msgstr "Možnost ni uvedena"
-
-#: ../libpurple/protocols/jabber/jabber.c:1494
-msgid "Forbidden"
-msgstr "Prepovedano"
-
-#: ../libpurple/protocols/jabber/jabber.c:1496
-msgid "Gone"
-msgstr "Ni na voljo"
-
-#: ../libpurple/protocols/jabber/jabber.c:1498
-#: ../libpurple/protocols/jabber/jabber.c:1575
+#: ../libpurple/protocols/jabber/jabber.c:1569
 msgid "Internal Server Error"
 msgstr "Notranja napaka strežnika"
 
-#: ../libpurple/protocols/jabber/jabber.c:1500
+#: ../libpurple/protocols/jabber/jabber.c:1494
 msgid "Item Not Found"
 msgstr "Predmeta ni mogoče najti"
 
-#: ../libpurple/protocols/jabber/jabber.c:1502
+#: ../libpurple/protocols/jabber/jabber.c:1496
 msgid "Malformed XMPP ID"
 msgstr "Nepravilno oblikovan ID za XMPP"
 
-#: ../libpurple/protocols/jabber/jabber.c:1504
+#: ../libpurple/protocols/jabber/jabber.c:1498
 msgid "Not Acceptable"
 msgstr "Ni mogoče sprejeti"
 
-#: ../libpurple/protocols/jabber/jabber.c:1506
+#: ../libpurple/protocols/jabber/jabber.c:1500
 msgid "Not Allowed"
 msgstr "Ni dovoljeno"
 
-#: ../libpurple/protocols/jabber/jabber.c:1510
+#: ../libpurple/protocols/jabber/jabber.c:1504
 msgid "Payment Required"
 msgstr "Zahtevano plačilo"
 
-#: ../libpurple/protocols/jabber/jabber.c:1512
+#: ../libpurple/protocols/jabber/jabber.c:1506
 msgid "Recipient Unavailable"
 msgstr "Dobitnik ni na voljo"
 
-#: ../libpurple/protocols/jabber/jabber.c:1516
+#: ../libpurple/protocols/jabber/jabber.c:1510
 msgid "Registration Required"
 msgstr "Zahtevana registracija"
 
-#: ../libpurple/protocols/jabber/jabber.c:1518
+#: ../libpurple/protocols/jabber/jabber.c:1512
 msgid "Remote Server Not Found"
 msgstr "Oddaljenega strežnika ni mogoče najti"
 
-#: ../libpurple/protocols/jabber/jabber.c:1520
+#: ../libpurple/protocols/jabber/jabber.c:1514
 msgid "Remote Server Timeout"
 msgstr "Časovna omejitev oddaljenega strežnika je potekla"
 
-#: ../libpurple/protocols/jabber/jabber.c:1522
+#: ../libpurple/protocols/jabber/jabber.c:1516
 msgid "Server Overloaded"
 msgstr "Strežnik je preobremenjen"
 
-#: ../libpurple/protocols/jabber/jabber.c:1524
+#: ../libpurple/protocols/jabber/jabber.c:1518
 msgid "Service Unavailable"
 msgstr "Storitev ni dostopna"
 
-#: ../libpurple/protocols/jabber/jabber.c:1526
+#: ../libpurple/protocols/jabber/jabber.c:1520
 msgid "Subscription Required"
 msgstr "Zahtevano naročilo"
 
-#: ../libpurple/protocols/jabber/jabber.c:1528
+#: ../libpurple/protocols/jabber/jabber.c:1522
 msgid "Unexpected Request"
 msgstr "Nepričakovana zahteva"
 
-#: ../libpurple/protocols/jabber/jabber.c:1535
+#: ../libpurple/protocols/jabber/jabber.c:1529
 msgid "Authorization Aborted"
 msgstr "Pooblastitev prekinjena"
 
-#: ../libpurple/protocols/jabber/jabber.c:1537
+#: ../libpurple/protocols/jabber/jabber.c:1531
 msgid "Incorrect encoding in authorization"
 msgstr "Napačno kodiranje pri pooblastitvi"
 
-#: ../libpurple/protocols/jabber/jabber.c:1540
+#: ../libpurple/protocols/jabber/jabber.c:1534
 msgid "Invalid authzid"
 msgstr "Neveljaven ID pooblastila"
 
-#: ../libpurple/protocols/jabber/jabber.c:1543
+#: ../libpurple/protocols/jabber/jabber.c:1537
 msgid "Invalid Authorization Mechanism"
 msgstr "Neveljaven mehanizem pooblastil"
 
-#: ../libpurple/protocols/jabber/jabber.c:1546
+#: ../libpurple/protocols/jabber/jabber.c:1540
 msgid "Authorization mechanism too weak"
 msgstr "Prešibek mehanizem pooblastil"
 
-#: ../libpurple/protocols/jabber/jabber.c:1551
+#: ../libpurple/protocols/jabber/jabber.c:1545
 msgid "Temporary Authentication Failure"
 msgstr "Napaka začasne overovitve"
 
-#: ../libpurple/protocols/jabber/jabber.c:1554
+#: ../libpurple/protocols/jabber/jabber.c:1548
 msgid "Authentication Failure"
 msgstr "Napaka pri overovitvi"
 
-#: ../libpurple/protocols/jabber/jabber.c:1560
+#: ../libpurple/protocols/jabber/jabber.c:1554
 msgid "Bad Format"
 msgstr "Napačna oblika"
 
-#: ../libpurple/protocols/jabber/jabber.c:1562
+#: ../libpurple/protocols/jabber/jabber.c:1556
 msgid "Bad Namespace Prefix"
 msgstr "Napačna predpona imenskega prostora"
 
-#: ../libpurple/protocols/jabber/jabber.c:1565
+#: ../libpurple/protocols/jabber/jabber.c:1559
 msgid "Resource Conflict"
 msgstr "Spor vira"
 
-#: ../libpurple/protocols/jabber/jabber.c:1567
+#: ../libpurple/protocols/jabber/jabber.c:1561
 #: ../libpurple/protocols/silc/silc.c:244
 #: ../libpurple/protocols/silc10/ops.c:1720
 msgid "Connection Timeout"
 msgstr "Časovna omejitev povezave potekla"
 
-#: ../libpurple/protocols/jabber/jabber.c:1569
+#: ../libpurple/protocols/jabber/jabber.c:1563
 msgid "Host Gone"
 msgstr "Gostitelj ni na voljo"
 
-#: ../libpurple/protocols/jabber/jabber.c:1571
+#: ../libpurple/protocols/jabber/jabber.c:1565
 msgid "Host Unknown"
 msgstr "Neznan gostitelj"
 
+#: ../libpurple/protocols/jabber/jabber.c:1567
+msgid "Improper Addressing"
+msgstr "Neustrezno naslavljanje"
+
+#: ../libpurple/protocols/jabber/jabber.c:1571
+msgid "Invalid ID"
+msgstr "Neveljaven ID"
+
 #: ../libpurple/protocols/jabber/jabber.c:1573
-msgid "Improper Addressing"
-msgstr "Neustrezno naslavljanje"
-
-#: ../libpurple/protocols/jabber/jabber.c:1577
-msgid "Invalid ID"
-msgstr "Neveljaven ID"
-
-#: ../libpurple/protocols/jabber/jabber.c:1579
 msgid "Invalid Namespace"
 msgstr "Neveljaven imenski prostor"
 
-#: ../libpurple/protocols/jabber/jabber.c:1581
+#: ../libpurple/protocols/jabber/jabber.c:1575
 msgid "Invalid XML"
 msgstr "Neveljaven XML"
 
-#: ../libpurple/protocols/jabber/jabber.c:1583
+#: ../libpurple/protocols/jabber/jabber.c:1577
 msgid "Non-matching Hosts"
 msgstr "Neujemajoči gostitelji"
 
-#: ../libpurple/protocols/jabber/jabber.c:1587
+#: ../libpurple/protocols/jabber/jabber.c:1581
 msgid "Policy Violation"
 msgstr "Zloraba politike"
 
-#: ../libpurple/protocols/jabber/jabber.c:1589
+#: ../libpurple/protocols/jabber/jabber.c:1583
 msgid "Remote Connection Failed"
 msgstr "Oddaljena povezava ni uspela"
 
-#: ../libpurple/protocols/jabber/jabber.c:1591
+#: ../libpurple/protocols/jabber/jabber.c:1585
 msgid "Resource Constraint"
 msgstr "Zadrega vira"
 
-#: ../libpurple/protocols/jabber/jabber.c:1593
+#: ../libpurple/protocols/jabber/jabber.c:1587
 msgid "Restricted XML"
 msgstr "Omejen XML"
 
-#: ../libpurple/protocols/jabber/jabber.c:1595
+#: ../libpurple/protocols/jabber/jabber.c:1589
 msgid "See Other Host"
 msgstr "Glej druge gostitelje"
 
-#: ../libpurple/protocols/jabber/jabber.c:1597
+#: ../libpurple/protocols/jabber/jabber.c:1591
 msgid "System Shutdown"
 msgstr "Izklop sistema"
 
-#: ../libpurple/protocols/jabber/jabber.c:1599
+#: ../libpurple/protocols/jabber/jabber.c:1593
 msgid "Undefined Condition"
 msgstr "Nedoločen pogoj"
 
-#: ../libpurple/protocols/jabber/jabber.c:1601
+#: ../libpurple/protocols/jabber/jabber.c:1595
 msgid "Unsupported Encoding"
 msgstr "Nepodprto kodiranje"
 
-#: ../libpurple/protocols/jabber/jabber.c:1603
+#: ../libpurple/protocols/jabber/jabber.c:1597
 msgid "Unsupported Stanza Type"
 msgstr "Nepodprta vrsta vrstice"
 
-#: ../libpurple/protocols/jabber/jabber.c:1605
+#: ../libpurple/protocols/jabber/jabber.c:1599
 msgid "Unsupported Version"
 msgstr "Nepodprta različica"
 
-#: ../libpurple/protocols/jabber/jabber.c:1607
+#: ../libpurple/protocols/jabber/jabber.c:1601
 msgid "XML Not Well Formed"
 msgstr "Slabo oblikovan XML"
 
-#: ../libpurple/protocols/jabber/jabber.c:1609
+#: ../libpurple/protocols/jabber/jabber.c:1603
 msgid "Stream Error"
 msgstr "Napaka toka"
 
-#: ../libpurple/protocols/jabber/jabber.c:1676
+#: ../libpurple/protocols/jabber/jabber.c:1670
 #, c-format
 msgid "Unable to ban user %s"
 msgstr "Ni mogoče prepovedati uporabnika %s"
 
-#: ../libpurple/protocols/jabber/jabber.c:1696
+#: ../libpurple/protocols/jabber/jabber.c:1690
 #, c-format
 msgid "Unknown affiliation: \"%s\""
 msgstr "Neznana včlanitev: \"%s\""
 
-#: ../libpurple/protocols/jabber/jabber.c:1701
+#: ../libpurple/protocols/jabber/jabber.c:1695
 #, c-format
 msgid "Unable to affiliate user %s as \"%s\""
 msgstr "Uporabnika %s ni mogoče včlaniti kot \"%s\""
 
-#: ../libpurple/protocols/jabber/jabber.c:1720
+#: ../libpurple/protocols/jabber/jabber.c:1714
 #, c-format
 msgid "Unknown role: \"%s\""
 msgstr "Neznana vloga: \"%s\""
 
 #  Data is assumed to be the destination sn
-#: ../libpurple/protocols/jabber/jabber.c:1727
+#: ../libpurple/protocols/jabber/jabber.c:1721
 #, c-format
 msgid "Unable to set role \"%s\" for user: %s"
 msgstr "Ni moč določiti vloge \"%s\" za uporabnika: %s"
 
-#: ../libpurple/protocols/jabber/jabber.c:1780
+#: ../libpurple/protocols/jabber/jabber.c:1774
 #, c-format
 msgid "Unable to kick user %s"
 msgstr "Ni mogoče brcniti uporabnika %s"
 
-#: ../libpurple/protocols/jabber/jabber.c:1811
+#: ../libpurple/protocols/jabber/jabber.c:1805
 msgid "config:  Configure a chat room."
 msgstr "config:  Nastavi pogovorno sobo."
 
-#: ../libpurple/protocols/jabber/jabber.c:1815
+#: ../libpurple/protocols/jabber/jabber.c:1809
 msgid "configure:  Configure a chat room."
 msgstr "configure:  Nastavi pogovorno sobo."
 
-#: ../libpurple/protocols/jabber/jabber.c:1824
+#: ../libpurple/protocols/jabber/jabber.c:1818
 msgid "part [room]:  Leave the room."
 msgstr "part [soba]:  Zapusti sobo."
 
-#: ../libpurple/protocols/jabber/jabber.c:1829
+#: ../libpurple/protocols/jabber/jabber.c:1823
 msgid "register:  Register with a chat room."
 msgstr "register:  Registriraj se v pogovorno sobo."
 
+#: ../libpurple/protocols/jabber/jabber.c:1829
+msgid "topic [new topic]:  View or change the topic."
+msgstr "topic [nova tema]:  Oglej si ali spremeni temo."
+
 #: ../libpurple/protocols/jabber/jabber.c:1835
-msgid "topic [new topic]:  View or change the topic."
-msgstr "topic [nova tema]:  Oglej si ali spremeni temo."
-
-#: ../libpurple/protocols/jabber/jabber.c:1841
 msgid "ban &lt;user&gt; [room]:  Ban a user from the room."
 msgstr "ban &lt;uporabnik&gt; [soba]:  Prepovej uporabnika v sobi."
 
-#: ../libpurple/protocols/jabber/jabber.c:1847
+#: ../libpurple/protocols/jabber/jabber.c:1841
 msgid "affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Set a user's affiliation with the room."
 msgstr "affiliate &lt;uporabnik&gt; &lt;lastnik|skrbnik|član|izločenec|nihče&gt;: Nastavitev uporabnikovega statusa v sobi."
 
+#: ../libpurple/protocols/jabber/jabber.c:1847
+msgid "role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: Set a user's role in the room."
+msgstr "role &lt;uporabnik&gt; &lt;moderator|participant|visitor|none&gt;: Nastavitev uporabnikove vloge v sobi."
+
 #: ../libpurple/protocols/jabber/jabber.c:1853
-msgid "role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: Set a user's role in the room."
-msgstr "role &lt;uporabnik&gt; &lt;moderator|participant|visitor|none&gt;: Nastavitev uporabnikove vloge v sobi."
-
-#: ../libpurple/protocols/jabber/jabber.c:1859
 msgid "invite &lt;user&gt; [message]:  Invite a user to the room."
 msgstr "invite &lt;uporabnik&gt; [soba]:  Povabite uporabnika v sobo."
 
-#: ../libpurple/protocols/jabber/jabber.c:1865
+#: ../libpurple/protocols/jabber/jabber.c:1859
 msgid "join: &lt;room&gt; [server]:  Join a chat on this server."
 msgstr "join: &lt;soba&gt; [strežnik]:  Pridruži se pomenku na tem strežniku."
 
-#: ../libpurple/protocols/jabber/jabber.c:1871
+#: ../libpurple/protocols/jabber/jabber.c:1865
 msgid "kick &lt;user&gt; [room]:  Kick a user from the room."
 msgstr "kick &lt;uporabnik&gt; [soba]:  Brcni uporabnika iz sobe."
 
-#: ../libpurple/protocols/jabber/jabber.c:1876
+#: ../libpurple/protocols/jabber/jabber.c:1870
 msgid "msg &lt;user&gt; &lt;message&gt;:  Send a private message to another user."
 msgstr "msg &lt;uporabnik&gt; &lt;sporočilo&gt;:  Pošljite zasebno sporočilo drugemu uporabniku."
 
@@ -5172,35 +5219,35 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/jabber/libxmpp.c:166
-#: ../libpurple/protocols/jabber/libxmpp.c:168
+#: ../libpurple/protocols/jabber/libxmpp.c:169
+#: ../libpurple/protocols/jabber/libxmpp.c:171
 msgid "XMPP Protocol Plugin"
 msgstr "Vtičnik za protokol XMPP"
 
 #. Translators: 'domain' is used here in the context of Internet domains, e.g. pidgin.im
-#: ../libpurple/protocols/jabber/libxmpp.c:195
-#: ../pidgin/gtkaccount.c:505
+#: ../libpurple/protocols/jabber/libxmpp.c:198
+#: ../pidgin/gtkaccount.c:508
 msgid "Domain"
 msgstr "Domena"
 
-#: ../libpurple/protocols/jabber/libxmpp.c:201
+#: ../libpurple/protocols/jabber/libxmpp.c:206
 msgid "Force old (port 5223) SSL"
 msgstr "Vsili star SSL (vrata 5223)"
 
-#: ../libpurple/protocols/jabber/libxmpp.c:206
+#: ../libpurple/protocols/jabber/libxmpp.c:211
 msgid "Allow plaintext auth over unencrypted streams"
 msgstr "Dovoli overovitev z navadnim besedilom preko nešifriranih toka"
 
-#: ../libpurple/protocols/jabber/libxmpp.c:211
+#: ../libpurple/protocols/jabber/libxmpp.c:216
 #: ../libpurple/protocols/simple/simple.c:1856
 msgid "Connect port"
 msgstr "Poveži vrata"
 
 #. Account options
-#: ../libpurple/protocols/jabber/libxmpp.c:215
-#: ../libpurple/protocols/silc/silc.c:1913
-#: ../libpurple/protocols/silc10/silc.c:1855
-#: ../pidgin/gtkaccount.c:835
+#: ../libpurple/protocols/jabber/libxmpp.c:220
+#: ../libpurple/protocols/silc/silc.c:1914
+#: ../libpurple/protocols/silc10/silc.c:1857
+#: ../pidgin/gtkaccount.c:837
 msgid "Connect server"
 msgstr "Poveži se na strežnik"
 
@@ -5242,33 +5289,33 @@
 msgid "XML Parse error"
 msgstr "Napaka pri razčlenjevanu XML"
 
-#: ../libpurple/protocols/jabber/presence.c:279
+#: ../libpurple/protocols/jabber/presence.c:290
 msgid "Unknown Error in presence"
 msgstr "Prišlo je do neznane napake"
 
-#: ../libpurple/protocols/jabber/presence.c:353
-#: ../libpurple/protocols/jabber/presence.c:354
+#: ../libpurple/protocols/jabber/presence.c:364
+#: ../libpurple/protocols/jabber/presence.c:365
 msgid "Create New Room"
 msgstr "Ustvari novo sobo"
 
-#: ../libpurple/protocols/jabber/presence.c:355
+#: ../libpurple/protocols/jabber/presence.c:366
 msgid "You are creating a new room.  Would you like to configure it, or accept the default settings?"
 msgstr "Ustvarili boste novo sobo. Jo želite najprej nastaviti ali boste sprejeli privzete nastavitve?"
 
-#: ../libpurple/protocols/jabber/presence.c:361
+#: ../libpurple/protocols/jabber/presence.c:372
 msgid "_Configure Room"
 msgstr "_Nastavi sobo"
 
-#: ../libpurple/protocols/jabber/presence.c:362
+#: ../libpurple/protocols/jabber/presence.c:373
 msgid "_Accept Defaults"
 msgstr "_Sprejmi privzeto"
 
-#: ../libpurple/protocols/jabber/presence.c:398
+#: ../libpurple/protocols/jabber/presence.c:409
 #, c-format
 msgid "Error in chat %s"
 msgstr "Napaka v pomenku %s"
 
-#: ../libpurple/protocols/jabber/presence.c:401
+#: ../libpurple/protocols/jabber/presence.c:412
 #, c-format
 msgid "Error joining chat %s"
 msgstr "Napaka pri pridruževanju pomenku %s"
@@ -5699,12 +5746,12 @@
 
 #: ../libpurple/protocols/msn/msn.c:1550
 #: ../pidgin/plugins/convcolors.c:309
-#: ../pidgin/plugins/pidginrc.c:448
+#: ../pidgin/plugins/pidginrc.c:366
 msgid "General"
 msgstr "Splošno"
 
 #: ../libpurple/protocols/msn/msn.c:1557
-#: ../libpurple/protocols/oscar/oscar.c:3768
+#: ../libpurple/protocols/oscar/oscar.c:3769
 #: ../libpurple/protocols/qq/buddy_info.c:45
 #: ../libpurple/protocols/qq/qq.c:219
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1057
@@ -5806,7 +5853,7 @@
 msgstr "Domači telefon 2"
 
 #: ../libpurple/protocols/msn/msn.c:1622
-#: ../libpurple/protocols/oscar/oscar.c:3806
+#: ../libpurple/protocols/oscar/oscar.c:3807
 msgid "Home Address"
 msgstr "Domači naslov"
 
@@ -5842,7 +5889,7 @@
 msgstr "Naziv službe"
 
 #: ../libpurple/protocols/msn/msn.c:1647
-#: ../libpurple/protocols/oscar/oscar.c:3827
+#: ../libpurple/protocols/oscar/oscar.c:3828
 msgid "Company"
 msgstr "Podjetje"
 
@@ -5864,7 +5911,7 @@
 msgstr "Službeni telefon 2"
 
 #: ../libpurple/protocols/msn/msn.c:1652
-#: ../libpurple/protocols/oscar/oscar.c:3819
+#: ../libpurple/protocols/oscar/oscar.c:3820
 msgid "Work Address"
 msgstr "Službeni naslov"
 
@@ -5969,8 +6016,8 @@
 #: ../libpurple/protocols/qq/udp_proxy_s5.c:268
 #: ../libpurple/protocols/qq/udp_proxy_s5.c:302
 #: ../libpurple/protocols/qq/udp_proxy_s5.c:332
-#: ../libpurple/protocols/yahoo/yahoochat.c:1357
-#: ../libpurple/protocols/yahoo/yahoochat.c:1383
+#: ../libpurple/protocols/yahoo/yahoochat.c:1320
+#: ../libpurple/protocols/yahoo/yahoochat.c:1346
 msgid "Unable to connect"
 msgstr "Ni se mogoče povezati"
 
@@ -6080,7 +6127,7 @@
 msgstr "Napaka pri parsanju HTTP."
 
 #: ../libpurple/protocols/msn/session.c:307
-#: ../libpurple/protocols/oscar/oscar.c:3480
+#: ../libpurple/protocols/oscar/oscar.c:3481
 #: ../libpurple/protocols/yahoo/yahoo.c:202
 msgid "You have signed on from another location."
 msgstr "Prijavili ste se z druge lokacije."
@@ -6157,7 +6204,7 @@
 msgstr "Sporočila ni mogoče poslati, saj je poslano prehitro:"
 
 #: ../libpurple/protocols/msn/switchboard.c:424
-msgid "Message could not be sent because we wer unable to establish a session with the server. This is likely a server problem, try again in a few minutes:"
+msgid "Message could not be sent because we were unable to establish a session with the server. This is likely a server problem, try again in a few minutes:"
 msgstr "Sporočila ni mogoče poslati, ker ni bilo mogoče vzpostaviti seje s strežnikom. To je najverjetneje težava strežnika, poskusite znova v nekaj minutah:"
 
 #: ../libpurple/protocols/msn/switchboard.c:431
@@ -6733,9 +6780,9 @@
 
 #. Label
 #: ../libpurple/protocols/oscar/oscar.c:639
-#: ../pidgin/gtkutils.c:2310
-#: ../pidgin/gtkutils.c:2340
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:338
+#: ../pidgin/gtkutils.c:2359
+#: ../pidgin/gtkutils.c:2389
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:334
 msgid "Buddy Icon"
 msgstr "Ikona prijatelja"
 
@@ -6756,7 +6803,7 @@
 msgstr "Pomenek"
 
 #: ../libpurple/protocols/oscar/oscar.c:651
-#: ../libpurple/protocols/oscar/oscar.c:5987
+#: ../libpurple/protocols/oscar/oscar.c:5989
 msgid "Get File"
 msgstr "Sprejmi datoteko"
 
@@ -6829,17 +6876,17 @@
 msgstr "Kamera"
 
 #: ../libpurple/protocols/oscar/oscar.c:725
-#: ../libpurple/protocols/oscar/oscar.c:5757
+#: ../libpurple/protocols/oscar/oscar.c:5759
 msgid "Free For Chat"
 msgstr "Na voljo za pogovor"
 
 #: ../libpurple/protocols/oscar/oscar.c:729
-#: ../libpurple/protocols/oscar/oscar.c:5792
+#: ../libpurple/protocols/oscar/oscar.c:5794
 msgid "Not Available"
 msgstr "Ni na voljo"
 
 #: ../libpurple/protocols/oscar/oscar.c:731
-#: ../libpurple/protocols/oscar/oscar.c:5778
+#: ../libpurple/protocols/oscar/oscar.c:5780
 msgid "Occupied"
 msgstr "Zaseden"
 
@@ -6852,7 +6899,7 @@
 #: ../libpurple/protocols/yahoo/yahoo.c:2913
 #: ../libpurple/status.c:156
 #: ../pidgin/gtkdocklet.c:446
-#: ../pidgin/gtkstatusbox.c:1053
+#: ../pidgin/gtkstatusbox.c:1058
 msgid "Invisible"
 msgstr "Neviden"
 
@@ -6861,14 +6908,14 @@
 msgstr "Prisoten"
 
 #: ../libpurple/protocols/oscar/oscar.c:838
-#: ../libpurple/protocols/oscar/oscar.c:3720
+#: ../libpurple/protocols/oscar/oscar.c:3721
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:697
-#: ../pidgin/gtkprefs.c:1052
+#: ../pidgin/gtkprefs.c:1121
 msgid "IP Address"
 msgstr "Naslov IP"
 
 #: ../libpurple/protocols/oscar/oscar.c:845
-#: ../libpurple/protocols/oscar/oscar.c:2866
+#: ../libpurple/protocols/oscar/oscar.c:2867
 msgid "Warning Level"
 msgstr "Stopnja opozoril"
 
@@ -6909,8 +6956,8 @@
 
 #: ../libpurple/protocols/oscar/oscar.c:1261
 #, c-format
-msgid "Unable to login: Could not sign on as %s because the screen name is invalid.  Screen names must either start with a letter and contain only letters, numbers and spaces, or contain only numbers."
-msgstr "Prijava ni mogoča: ni se mogoče prijaviti kot %s, ker je pojavno ime neveljavno. Imena se morajo začeti s črko, vsebujejo lahko le črke, številke in presledke, lahko pa so tudi sestavljena iz samih števil."
+msgid "Unable to login: Could not sign on as %s because the screen name is invalid.  Screen names must be a valid email address, or start with a letter and contain only letters, numbers and spaces, or contain only numbers."
+msgstr "Prijava ni mogoča: ni se mogoče prijaviti kot %s, ker je pojavno ime neveljavno. Imena morajo biti veljaven e-poštni naslov ali se morajo začeti s črko in lahko vsebujejo le črke, številke in presledke ali pa so sestavljena zgolj iz števil."
 
 #: ../libpurple/protocols/oscar/oscar.c:1346
 #: ../libpurple/protocols/yahoo/yahoo.c:1934
@@ -6969,8 +7016,8 @@
 #: ../libpurple/protocols/oscar/oscar.c:1457
 #: ../libpurple/protocols/oscar/oscar.c:2250
 #: ../libpurple/protocols/oscar/oscar.c:2297
-#: ../libpurple/protocols/oscar/oscar.c:5862
-#: ../libpurple/protocols/oscar/oscar.c:6143
+#: ../libpurple/protocols/oscar/oscar.c:5864
+#: ../libpurple/protocols/oscar/oscar.c:6145
 #: ../libpurple/request.h:1387
 msgid "_OK"
 msgstr "V _redu"
@@ -7018,7 +7065,7 @@
 #: ../libpurple/protocols/oscar/oscar.c:2289
 #: ../libpurple/protocols/oscar/oscar.c:2296
 #: ../libpurple/protocols/oscar/oscar.c:2423
-#: ../libpurple/protocols/oscar/oscar.c:5240
+#: ../libpurple/protocols/oscar/oscar.c:5242
 #: ../libpurple/protocols/yahoo/yahoo.c:987
 msgid "No reason given."
 msgstr "Ni podanega razloga."
@@ -7166,8 +7213,7 @@
 
 #: ../libpurple/protocols/oscar/oscar.c:2772
 #: ../libpurple/protocols/oscar/oscar.c:2777
-#: ../libpurple/protocols/oscar/oscar.c:2839
-#: ../libpurple/protocols/oscar/oscar.c:2843
+#: ../libpurple/protocols/oscar/oscar.c:2841
 msgid "Unknown reason."
 msgstr "Neznan vzrok."
 
@@ -7177,101 +7223,96 @@
 msgid "Unable to send message to %s:"
 msgstr "Ni moč poslati sporočila k %s:"
 
-#: ../libpurple/protocols/oscar/oscar.c:2839
+#: ../libpurple/protocols/oscar/oscar.c:2841
 #, c-format
 msgid "User information not available: %s"
 msgstr "Podatki o uporabniku niso dostopni: %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2842
-#, c-format
-msgid "User information for %s unavailable:"
-msgstr "Podatki o uporabniku %s niso dostopni:"
-
-#: ../libpurple/protocols/oscar/oscar.c:2871
+#: ../libpurple/protocols/oscar/oscar.c:2872
 msgid "Online Since"
 msgstr "Na zvezi od"
 
-#: ../libpurple/protocols/oscar/oscar.c:2876
+#: ../libpurple/protocols/oscar/oscar.c:2877
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1161
 msgid "Member Since"
 msgstr "Član od"
 
-#: ../libpurple/protocols/oscar/oscar.c:2881
+#: ../libpurple/protocols/oscar/oscar.c:2882
 msgid "Capabilities"
 msgstr "Zmožnosti"
 
-#: ../libpurple/protocols/oscar/oscar.c:2911
+#: ../libpurple/protocols/oscar/oscar.c:2912
 msgid "Available Message"
 msgstr "Sporočilo o dosegljivosti"
 
-#: ../libpurple/protocols/oscar/oscar.c:2939
+#: ../libpurple/protocols/oscar/oscar.c:2940
 msgid "Profile"
 msgstr "Profil"
 
-#: ../libpurple/protocols/oscar/oscar.c:3019
+#: ../libpurple/protocols/oscar/oscar.c:3020
 msgid "Your AIM connection may be lost."
 msgstr "Vaša povezava z AIM je morda prekinjena."
 
 #. The conversion failed!
-#: ../libpurple/protocols/oscar/oscar.c:3207
+#: ../libpurple/protocols/oscar/oscar.c:3208
 msgid "[Unable to display a message from this user because it contained invalid characters.]"
 msgstr "[Ni mogoče prikazati sporočila tega uporabnika, ker vsebuje neveljavne znake.]"
 
-#: ../libpurple/protocols/oscar/oscar.c:3410
+#: ../libpurple/protocols/oscar/oscar.c:3411
 msgid "The last action you attempted could not be performed because you are over the rate limit. Please wait 10 seconds and try again."
 msgstr "Zadnjega dejanja, ki ste ga želeli izvesti, ni bilo mogoče izvesti, ker ste prekoračili dovoljeno pogostost. Prosim počakajte 10 sekund in poskusite znova."
 
-#: ../libpurple/protocols/oscar/oscar.c:3482
+#: ../libpurple/protocols/oscar/oscar.c:3483
 msgid "You have been signed off for an unknown reason."
 msgstr "Odjavljeni ste bili iz neznanega razloga."
 
-#: ../libpurple/protocols/oscar/oscar.c:3495
+#: ../libpurple/protocols/oscar/oscar.c:3496
 #: ../libpurple/protocols/toc/toc.c:977
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "Povezava do pogovorne sobe %s je bila prekinjena."
 
-#: ../libpurple/protocols/oscar/oscar.c:3742
+#: ../libpurple/protocols/oscar/oscar.c:3743
 #: ../libpurple/protocols/silc/util.c:585
 #: ../libpurple/protocols/silc10/util.c:581
 msgid "Mobile Phone"
 msgstr "Mobilni telefon"
 
-#: ../libpurple/protocols/oscar/oscar.c:3772
+#: ../libpurple/protocols/oscar/oscar.c:3773
 msgid "Personal Web Page"
 msgstr "Osebna spletna stran"
 
-#: ../libpurple/protocols/oscar/oscar.c:3796
+#: ../libpurple/protocols/oscar/oscar.c:3797
 #: ../libpurple/protocols/qq/buddy_info.c:40
 msgid "Additional Information"
 msgstr "Dodatne informacije"
 
-#: ../libpurple/protocols/oscar/oscar.c:3804
-#: ../libpurple/protocols/oscar/oscar.c:3817
+#: ../libpurple/protocols/oscar/oscar.c:3805
+#: ../libpurple/protocols/oscar/oscar.c:3818
 msgid "Zip Code"
 msgstr "Poštna številka"
 
-#: ../libpurple/protocols/oscar/oscar.c:3828
+#: ../libpurple/protocols/oscar/oscar.c:3829
 msgid "Division"
 msgstr "Oddelek"
 
-#: ../libpurple/protocols/oscar/oscar.c:3829
+#: ../libpurple/protocols/oscar/oscar.c:3830
 msgid "Position"
 msgstr "Delovno mesto"
 
-#: ../libpurple/protocols/oscar/oscar.c:3831
+#: ../libpurple/protocols/oscar/oscar.c:3832
 msgid "Web Page"
 msgstr "Spletna stran"
 
-#: ../libpurple/protocols/oscar/oscar.c:3834
+#: ../libpurple/protocols/oscar/oscar.c:3835
 msgid "Work Information"
 msgstr "Informacije o zaposlitvi"
 
-#: ../libpurple/protocols/oscar/oscar.c:3890
+#: ../libpurple/protocols/oscar/oscar.c:3891
 msgid "Pop-Up Message"
 msgstr "Pojavno sporočilo"
 
-#: ../libpurple/protocols/oscar/oscar.c:3930
+#: ../libpurple/protocols/oscar/oscar.c:3931
 #, c-format
 msgid "The following screen name is associated with %s"
 msgid_plural "The following screen names are associated with %s"
@@ -7280,85 +7321,85 @@
 msgstr[2] "Naslednji pojavni imeni sta povezani z %s"
 msgstr[3] "Naslednja pojavna imena so povezana z %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:3935
+#: ../libpurple/protocols/oscar/oscar.c:3936
 msgid "Screen name"
 msgstr "Pojavno ime"
 
-#: ../libpurple/protocols/oscar/oscar.c:3961
+#: ../libpurple/protocols/oscar/oscar.c:3962
 #, c-format
 msgid "No results found for e-mail address %s"
 msgstr "Za dani elektronski naslov %s ni zadetkov."
 
-#: ../libpurple/protocols/oscar/oscar.c:3982
+#: ../libpurple/protocols/oscar/oscar.c:3983
 #, c-format
 msgid "You should receive an e-mail asking to confirm %s."
 msgstr "Prejeti bi morali e-pošto, da potrdite %s. "
 
-#: ../libpurple/protocols/oscar/oscar.c:3984
+#: ../libpurple/protocols/oscar/oscar.c:3985
 msgid "Account Confirmation Requested"
 msgstr "Potrditev računa je bila zahtevana"
 
-#: ../libpurple/protocols/oscar/oscar.c:4015
+#: ../libpurple/protocols/oscar/oscar.c:4016
 msgid "Error Changing Account Info"
 msgstr "Napaka pri spreminjanju podatkov o računu"
 
-#: ../libpurple/protocols/oscar/oscar.c:4018
+#: ../libpurple/protocols/oscar/oscar.c:4019
 #, c-format
 msgid "Error 0x%04x: Unable to format screen name because the requested screen name differs from the original."
 msgstr "Napaka 0x%04x: Ni bilo mogoče oblikovati poimenovanja, ker se zahtevano pojavno ime razlikuje od izvirnega."
 
-#: ../libpurple/protocols/oscar/oscar.c:4021
+#: ../libpurple/protocols/oscar/oscar.c:4022
 #, c-format
 msgid "Error 0x%04x: Unable to format screen name because it is invalid."
 msgstr "Napaka 0x%04x: Ni bilo mogoče oblikovati pojavnega imena, ker je neveljavno."
 
-#: ../libpurple/protocols/oscar/oscar.c:4024
+#: ../libpurple/protocols/oscar/oscar.c:4025
 #, c-format
 msgid "Error 0x%04x: Unable to format screen name because the requested screen name is too long."
 msgstr "Napaka 0x%04x: Ni bilo mogoče oblikovati pojavnega imena, ker je zahtevano pojavno ime predolgo."
 
-#: ../libpurple/protocols/oscar/oscar.c:4027
+#: ../libpurple/protocols/oscar/oscar.c:4028
 #, c-format
 msgid "Error 0x%04x: Unable to change e-mail address because there is already a request pending for this screen name."
 msgstr "Napaka 0x%04x: E-naslova ni mogoče spremeniti, ker je na čakanju za to pojavno ime že en zahtevek."
 
-#: ../libpurple/protocols/oscar/oscar.c:4030
+#: ../libpurple/protocols/oscar/oscar.c:4031
 #, c-format
 msgid "Error 0x%04x: Unable to change e-mail address because the given address has too many screen names associated with it."
 msgstr "Napaka 0x%04x: E-naslova ni mogoče spremeniti, ker ima podani naslov že preveč računov."
 
-#: ../libpurple/protocols/oscar/oscar.c:4033
+#: ../libpurple/protocols/oscar/oscar.c:4034
 #, c-format
 msgid "Error 0x%04x: Unable to change e-mail address because the given address is invalid."
 msgstr "Napaka 0x%04x: E-naslova ni mogoče spremeniti, ker je podani naslov neveljaven."
 
-#: ../libpurple/protocols/oscar/oscar.c:4036
+#: ../libpurple/protocols/oscar/oscar.c:4037
 #, c-format
 msgid "Error 0x%04x: Unknown error."
 msgstr "Napaka 0x%04x: Neznana napaka."
 
-#: ../libpurple/protocols/oscar/oscar.c:4046
+#: ../libpurple/protocols/oscar/oscar.c:4047
 #, c-format
 msgid "The e-mail address for %s is %s"
 msgstr "Elektronski naslov za %s je %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:4048
+#: ../libpurple/protocols/oscar/oscar.c:4049
 msgid "Account Info"
 msgstr "Podatki o računu"
 
-#: ../libpurple/protocols/oscar/oscar.c:4220
+#: ../libpurple/protocols/oscar/oscar.c:4221
 msgid "Your IM Image was not sent. You must be Direct Connected to send IM Images."
 msgstr "Vaša slika IM ni bila poslana. Za pošiljanje slik IM morate biti \"neposredno povezani\"."
 
-#: ../libpurple/protocols/oscar/oscar.c:4486
+#: ../libpurple/protocols/oscar/oscar.c:4487
 msgid "Unable to set AIM profile."
 msgstr "Ni mogoče nastaviti AIM profila."
 
-#: ../libpurple/protocols/oscar/oscar.c:4487
+#: ../libpurple/protocols/oscar/oscar.c:4488
 msgid "You have probably requested to set your profile before the login procedure completed.  Your profile remains unset; try setting it again when you are fully connected."
 msgstr "Verjetno ste zahtevali, da spremenite svoj profil preden je bila prijava dokončana. Za zdaj je vaš profil nespremenjen; poskusite ponovno, ko boste zagotovo prijavljeni."
 
-#: ../libpurple/protocols/oscar/oscar.c:4501
+#: ../libpurple/protocols/oscar/oscar.c:4502
 #, c-format
 msgid "The maximum profile length of %d byte has been exceeded.  It has been truncated for you."
 msgid_plural "The maximum profile length of %d bytes has been exceeded.  It has been truncated for you."
@@ -7367,11 +7408,11 @@
 msgstr[2] "Največja dolžina profila %d bajta je bila presežena, zato je bil skrajšan."
 msgstr[3] "Največja dolžina profila %d bajte je bila presežena, zato je bil skrajšan."
 
-#: ../libpurple/protocols/oscar/oscar.c:4506
+#: ../libpurple/protocols/oscar/oscar.c:4507
 msgid "Profile too long."
 msgstr "Profil je predolg."
 
-#: ../libpurple/protocols/oscar/oscar.c:4551
+#: ../libpurple/protocols/oscar/oscar.c:4552
 #, c-format
 msgid "The maximum away message length of %d byte has been exceeded.  It has been truncated for you."
 msgid_plural "The maximum away message length of %d bytes has been exceeded.  It has been truncated for you."
@@ -7380,74 +7421,74 @@
 msgstr[2] "Največja dolžina sporočila odsotnosti %d bajta je bila presežena, zato je bilo sporočilo skrajšano."
 msgstr[3] "Največja dolžina sporočila odsotnosti %d bajte je bila presežena, zato je bilo sporočilo skrajšano."
 
-#: ../libpurple/protocols/oscar/oscar.c:4556
+#: ../libpurple/protocols/oscar/oscar.c:4557
 msgid "Away message too long."
 msgstr "Spo_ročilo o odsotnosti:"
 
-#: ../libpurple/protocols/oscar/oscar.c:4625
-#, c-format
-msgid "Could not add the buddy %s because the screen name is invalid.  Screen names must either start with a letter and contain only letters, numbers and spaces, or contain only numbers."
-msgstr "Ni mogoče dodati prijatelja %s, ker pojavno ime ni veljavno. Imena se morajo začeti s črko, vsebujejo lahko le črke, številke in presledke, lahko pa so tudi sestavljena iz samih števil."
-
-#: ../libpurple/protocols/oscar/oscar.c:4627
-#: ../libpurple/protocols/oscar/oscar.c:5050
-#: ../libpurple/protocols/oscar/oscar.c:5064
+#: ../libpurple/protocols/oscar/oscar.c:4626
+#, c-format
+msgid "Could not add the buddy %s because the screen name is invalid.  Screen names must be a valid email address, or start with a letter and contain only letters, numbers and spaces, or contain only numbers."
+msgstr "Ni mogoče dodati prijatelja %s, ker pojavno ime ni veljavno. Imena so lahko veljavni e-poštni naslovi, se morajo začeti s črko, vsebujejo lahko le črke, številke in presledke, lahko pa so tudi sestavljena iz samih števil."
+
+#: ../libpurple/protocols/oscar/oscar.c:4628
+#: ../libpurple/protocols/oscar/oscar.c:5051
+#: ../libpurple/protocols/oscar/oscar.c:5066
 msgid "Unable To Add"
 msgstr "Nemogoče dodati"
 
-#: ../libpurple/protocols/oscar/oscar.c:4731
+#: ../libpurple/protocols/oscar/oscar.c:4732
 msgid "Unable To Retrieve Buddy List"
 msgstr "Seznama prijateljev ni bilo mogoče pridobiti"
 
-#: ../libpurple/protocols/oscar/oscar.c:4732
+#: ../libpurple/protocols/oscar/oscar.c:4733
 msgid "The AIM servers were temporarily unable to send your buddy list.  Your buddy list is not lost, and will probably become available in a few hours."
 msgstr "Vašega seznama prijateljev z AIM strežnikov trenutno ni mogoče pridobiti. Vaš seznam prijateljev ni izgubljen, verjetno pa bo postal dosegljiv v nekaj urah."
 
-#: ../libpurple/protocols/oscar/oscar.c:4936
 #: ../libpurple/protocols/oscar/oscar.c:4937
-#: ../libpurple/protocols/oscar/oscar.c:4942
-#: ../libpurple/protocols/oscar/oscar.c:5118
-#: ../libpurple/protocols/oscar/oscar.c:5119
-#: ../libpurple/protocols/oscar/oscar.c:5124
+#: ../libpurple/protocols/oscar/oscar.c:4938
+#: ../libpurple/protocols/oscar/oscar.c:4943
+#: ../libpurple/protocols/oscar/oscar.c:5120
+#: ../libpurple/protocols/oscar/oscar.c:5121
+#: ../libpurple/protocols/oscar/oscar.c:5126
 msgid "Orphans"
 msgstr "Sirote"
 
-#: ../libpurple/protocols/oscar/oscar.c:5048
+#: ../libpurple/protocols/oscar/oscar.c:5049
 #, c-format
 msgid "Could not add the buddy %s because you have too many buddies in your buddy list.  Please remove one and try again."
 msgstr "Prijatelja %s ni bilo mogoče dodati, ker imate na seznamu preveč prijateljev. Prosim odstranite enega in poskusite ponovno."
 
-#: ../libpurple/protocols/oscar/oscar.c:5048
-#: ../libpurple/protocols/oscar/oscar.c:5062
+#: ../libpurple/protocols/oscar/oscar.c:5049
+#: ../libpurple/protocols/oscar/oscar.c:5064
 msgid "(no name)"
 msgstr "(brez imena)"
 
-#: ../libpurple/protocols/oscar/oscar.c:5062
-#, c-format
-msgid "Could not add the buddy %s for an unknown reason.  The most common reason for this is that you have the maximum number of allowed buddies in your buddy list."
-msgstr "Prijatelja %s iz neznanega razloga ni bilo mogoče dodati na seznam. Najpogostejši razlog za to je preveliko število prijateljev na vašem seznamu."
-
-#: ../libpurple/protocols/oscar/oscar.c:5155
+#: ../libpurple/protocols/oscar/oscar.c:5063
+#, c-format
+msgid "Could not add the buddy %s for an unknown reason."
+msgstr "Iz neznanega razloga prijatelja %s ni mogoče dodati."
+
+#: ../libpurple/protocols/oscar/oscar.c:5157
 #, c-format
 msgid "The user %s has given you permission to add you to their buddy list.  Do you want to add them?"
 msgstr "Uporabnik %s vam je dovolil, da ga dodate na svoj seznam prijateljev. Ali ga želite dodati?"
 
-#: ../libpurple/protocols/oscar/oscar.c:5163
+#: ../libpurple/protocols/oscar/oscar.c:5165
 msgid "Authorization Given"
 msgstr "Pooblastilo odobreno"
 
 #. Granted
-#: ../libpurple/protocols/oscar/oscar.c:5236
+#: ../libpurple/protocols/oscar/oscar.c:5238
 #, c-format
 msgid "The user %s has granted your request to add them to your buddy list."
 msgstr "Uporabnik %s je odobril zahtevo, da ga dodate na svoj seznam prijateljev."
 
-#: ../libpurple/protocols/oscar/oscar.c:5237
+#: ../libpurple/protocols/oscar/oscar.c:5239
 msgid "Authorization Granted"
 msgstr "Pooblastilo odobreno"
 
 #. Denied
-#: ../libpurple/protocols/oscar/oscar.c:5240
+#: ../libpurple/protocols/oscar/oscar.c:5242
 #, c-format
 msgid ""
 "The user %s has denied your request to add them to your buddy list for the following reason:\n"
@@ -7456,181 +7497,182 @@
 "Uporabnik %s je zavrnil vašo zahtevo, da ga dodate na svoj seznam prijateljev, ker:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:5241
+#: ../libpurple/protocols/oscar/oscar.c:5243
 msgid "Authorization Denied"
 msgstr "Pooblastilo zavrnjeno"
 
-#: ../libpurple/protocols/oscar/oscar.c:5277
+#: ../libpurple/protocols/oscar/oscar.c:5279
 #: ../libpurple/protocols/toc/toc.c:1371
 msgid "_Exchange:"
 msgstr "_Izmenjaj:"
 
-#: ../libpurple/protocols/oscar/oscar.c:5317
+#: ../libpurple/protocols/oscar/oscar.c:5319
 msgid "Invalid chat name specified."
 msgstr "Navedeno je neveljavno ime pomenka."
 
-#: ../libpurple/protocols/oscar/oscar.c:5386
+#: ../libpurple/protocols/oscar/oscar.c:5388
 msgid "Your IM Image was not sent. You cannot send IM Images in AIM chats."
 msgstr "Vaša slika IM ni bila poslana. Slik IM ne morete pošiljati v klepetih AIM."
 
-#: ../libpurple/protocols/oscar/oscar.c:5546
-#: ../libpurple/protocols/oscar/oscar.c:5551
+#: ../libpurple/protocols/oscar/oscar.c:5548
+#: ../libpurple/protocols/oscar/oscar.c:5553
 msgid "Away Message"
 msgstr "Sporočilo o odsotnosti"
 
-#: ../libpurple/protocols/oscar/oscar.c:5551
+#: ../libpurple/protocols/oscar/oscar.c:5553
 msgid "<i>(retrieving)</i>"
 msgstr "<i>(pridobivanje ...)</i>"
 
-#: ../libpurple/protocols/oscar/oscar.c:5751
+#: ../libpurple/protocols/oscar/oscar.c:5753
 msgid "iTunes Music Store Link"
 msgstr "Povezava na glasbeno trgovino iTunes"
 
-#: ../libpurple/protocols/oscar/oscar.c:5859
+#: ../libpurple/protocols/oscar/oscar.c:5861
 #, c-format
 msgid "Buddy Comment for %s"
 msgstr "Komentar o prijatelju %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:5860
+#: ../libpurple/protocols/oscar/oscar.c:5862
 msgid "Buddy Comment:"
 msgstr "Komentar prijatelja:"
 
-#: ../libpurple/protocols/oscar/oscar.c:5907
+#: ../libpurple/protocols/oscar/oscar.c:5909
 #, c-format
 msgid "You have selected to open a Direct IM connection with %s."
 msgstr "Izbrali ste neposredno povezovanje z %s."
 
-#: ../libpurple/protocols/oscar/oscar.c:5911
+#: ../libpurple/protocols/oscar/oscar.c:5913
 msgid "Because this reveals your IP address, it may be considered a security risk.  Do you wish to continue?"
 msgstr "Ker razkrije vaš naslov IP, lahko velja za kršitev zasebnosti. Želite nadaljevati?"
 
-#: ../libpurple/protocols/oscar/oscar.c:5917
+#: ../libpurple/protocols/oscar/oscar.c:5919
+#: ../libpurple/protocols/oscar/peer.c:1022
 msgid "C_onnect"
 msgstr "Po_veži se"
 
-#: ../libpurple/protocols/oscar/oscar.c:5952
+#: ../libpurple/protocols/oscar/oscar.c:5954
 msgid "Get AIM Info"
 msgstr "Dobi podatke AIM"
 
-#: ../libpurple/protocols/oscar/oscar.c:5958
+#: ../libpurple/protocols/oscar/oscar.c:5960
 msgid "Edit Buddy Comment"
 msgstr "Uredi komentar prijatelja"
 
-#: ../libpurple/protocols/oscar/oscar.c:5966
+#: ../libpurple/protocols/oscar/oscar.c:5968
 msgid "Get Status Msg"
 msgstr "Poizvedi o stanju"
 
-#: ../libpurple/protocols/oscar/oscar.c:5979
+#: ../libpurple/protocols/oscar/oscar.c:5981
 msgid "Direct IM"
 msgstr "Neposredni pogovor"
 
-#: ../libpurple/protocols/oscar/oscar.c:6001
+#: ../libpurple/protocols/oscar/oscar.c:6003
 msgid "Re-request Authorization"
 msgstr "Ponovno zahtevaj pooblastilo"
 
-#: ../libpurple/protocols/oscar/oscar.c:6060
+#: ../libpurple/protocols/oscar/oscar.c:6062
 msgid "Require authorization"
 msgstr "Zahtevaj pooblastilo"
 
-#: ../libpurple/protocols/oscar/oscar.c:6063
+#: ../libpurple/protocols/oscar/oscar.c:6065
 msgid "Web aware (enabling this will cause you to receive SPAM!)"
 msgstr "Spletno zaveden (s to funkcijo boste prejemali tudi SPAM!)"
 
-#: ../libpurple/protocols/oscar/oscar.c:6068
+#: ../libpurple/protocols/oscar/oscar.c:6070
 msgid "ICQ Privacy Options"
 msgstr "Možnosti zasebnosti ICQ"
 
-#: ../libpurple/protocols/oscar/oscar.c:6087
+#: ../libpurple/protocols/oscar/oscar.c:6089
 msgid "The new formatting is invalid."
 msgstr "Oblika novega zapisa je neveljavna."
 
-#: ../libpurple/protocols/oscar/oscar.c:6088
+#: ../libpurple/protocols/oscar/oscar.c:6090
 msgid "Screen name formatting can change only capitalization and whitespace."
 msgstr "Z oblikovanjem pojavnega imena lahko spreminjate samo velike črke in presledke."
 
-#: ../libpurple/protocols/oscar/oscar.c:6141
+#: ../libpurple/protocols/oscar/oscar.c:6143
 msgid "Change Address To:"
 msgstr "Spremeni naslov v:"
 
-#: ../libpurple/protocols/oscar/oscar.c:6187
+#: ../libpurple/protocols/oscar/oscar.c:6189
 msgid "<i>you are not waiting for authorization</i>"
 msgstr "<i>ne čakate na pooblastilo</i>"
 
-#: ../libpurple/protocols/oscar/oscar.c:6190
+#: ../libpurple/protocols/oscar/oscar.c:6192
 msgid "You are awaiting authorization from the following buddies"
 msgstr "Pričakujete pooblastila od naslednjih prijateljev"
 
-#: ../libpurple/protocols/oscar/oscar.c:6191
+#: ../libpurple/protocols/oscar/oscar.c:6193
 msgid "You can re-request authorization from these buddies by right-clicking on them and selecting \"Re-request Authorization.\""
 msgstr "Če želite, lahko ponovno zahtevate pooblastilo od teh prijateljev, tako da desno kliknete na njih in izberete \"Ponovno zahtevaj pooblastilo.\""
 
-#: ../libpurple/protocols/oscar/oscar.c:6208
+#: ../libpurple/protocols/oscar/oscar.c:6210
 msgid "Find Buddy by E-Mail"
 msgstr "Najdi prijatelja po e-pošti"
 
-#: ../libpurple/protocols/oscar/oscar.c:6209
+#: ../libpurple/protocols/oscar/oscar.c:6211
 msgid "Search for a buddy by e-mail address"
 msgstr "Išči prijatelje po naslovu e-pošte"
 
-#: ../libpurple/protocols/oscar/oscar.c:6210
+#: ../libpurple/protocols/oscar/oscar.c:6212
 msgid "Type the e-mail address of the buddy you are searching for."
 msgstr "Vnesite naslov e-pošte prijatelja, ki ga želite najti"
 
-#: ../libpurple/protocols/oscar/oscar.c:6213
+#: ../libpurple/protocols/oscar/oscar.c:6215
 msgid "_Search"
 msgstr "_Najdi"
 
-#: ../libpurple/protocols/oscar/oscar.c:6371
+#: ../libpurple/protocols/oscar/oscar.c:6373
 msgid "Set User Info (URL)..."
 msgstr "Nastavi informacije o uporabniku (URL) ..."
 
-#: ../libpurple/protocols/oscar/oscar.c:6382
+#: ../libpurple/protocols/oscar/oscar.c:6384
 msgid "Change Password (URL)"
 msgstr "Spremeni geslo (URL povezava)"
 
-#: ../libpurple/protocols/oscar/oscar.c:6386
+#: ../libpurple/protocols/oscar/oscar.c:6388
 msgid "Configure IM Forwarding (URL)"
 msgstr "Nastavi posredovanje sporočil (URL)"
 
 #. ICQ actions
-#: ../libpurple/protocols/oscar/oscar.c:6396
+#: ../libpurple/protocols/oscar/oscar.c:6398
 msgid "Set Privacy Options..."
 msgstr "Nastavi možnosti zasebnosti ..."
 
 #. AIM actions
-#: ../libpurple/protocols/oscar/oscar.c:6403
+#: ../libpurple/protocols/oscar/oscar.c:6405
 msgid "Confirm Account"
 msgstr "Potrdi račun"
 
-#: ../libpurple/protocols/oscar/oscar.c:6407
+#: ../libpurple/protocols/oscar/oscar.c:6409
 msgid "Display Currently Registered E-Mail Address"
 msgstr "Prikaži trenutno registriran e-naslov"
 
-#: ../libpurple/protocols/oscar/oscar.c:6411
+#: ../libpurple/protocols/oscar/oscar.c:6413
 msgid "Change Currently Registered E-Mail Address..."
 msgstr "Spremeni trenutno registriran e-naslov ..."
 
-#: ../libpurple/protocols/oscar/oscar.c:6418
+#: ../libpurple/protocols/oscar/oscar.c:6420
 msgid "Show Buddies Awaiting Authorization"
 msgstr "Pokaži prijatelje, ki čakajo na pooblastilo"
 
-#: ../libpurple/protocols/oscar/oscar.c:6424
+#: ../libpurple/protocols/oscar/oscar.c:6426
 msgid "Search for Buddy by E-Mail Address..."
 msgstr "Išči prijatelja po e-naslovu ..."
 
-#: ../libpurple/protocols/oscar/oscar.c:6429
+#: ../libpurple/protocols/oscar/oscar.c:6431
 msgid "Search for Buddy by Information"
 msgstr "Išči prijatelja po informaciji"
 
-#: ../libpurple/protocols/oscar/oscar.c:6497
+#: ../libpurple/protocols/oscar/oscar.c:6499
 msgid "Use recent buddies group"
 msgstr "Uporabi nedavno skupino prijateljev"
 
-#: ../libpurple/protocols/oscar/oscar.c:6500
+#: ../libpurple/protocols/oscar/oscar.c:6502
 msgid "Show how long you have been idle"
 msgstr "Prikaz časa vaše odsotnosti"
 
-#: ../libpurple/protocols/oscar/oscar.c:6655
+#: ../libpurple/protocols/oscar/oscar.c:6657
 msgid ""
 "Always use ICQ proxy server for file transfers\n"
 "(slower, but does not reveal your IP address)"
@@ -7661,10 +7703,6 @@
 msgid "This requires a direct connection between the two computers and is necessary for IM Images.  Because your IP address will be revealed, this may be considered a privacy risk."
 msgstr "To zahteva neposredno povezavo med dvema računalnikoma in je nujno potrebno za sporočanje s slikami. Ker bo razkrit naslov IP, sodi ta povezava med tveganja zasebnosti."
 
-#: ../libpurple/protocols/oscar/peer.c:1022
-msgid "_Connect"
-msgstr "_Poveži"
-
 #: ../libpurple/protocols/qq/buddy_info.c:39
 msgid "Primary Information"
 msgstr "Osnovni podatki"
@@ -7841,13 +7879,13 @@
 msgstr "Neveljaven obraz QQ"
 
 #: ../libpurple/protocols/qq/buddy_opt.c:208
-#: ../libpurple/protocols/qq/group_opt.c:135
+#: ../libpurple/protocols/qq/group_opt.c:136
 #, c-format
 msgid "You rejected %d's request"
 msgstr "Zahtevo uporabnika %d ste zavrnili."
 
 #: ../libpurple/protocols/qq/buddy_opt.c:209
-#: ../libpurple/protocols/qq/group_opt.c:136
+#: ../libpurple/protocols/qq/group_opt.c:137
 msgid "Input your reason:"
 msgstr "Vnesite svoj razlog:"
 
@@ -7857,13 +7895,13 @@
 
 #. title
 #: ../libpurple/protocols/qq/buddy_opt.c:213
-#: ../libpurple/protocols/qq/group_opt.c:140
+#: ../libpurple/protocols/qq/group_opt.c:141
 msgid "Sorry, you are not my type..."
 msgstr "Oprosti, nisi moj tip ..."
 
 #: ../libpurple/protocols/qq/buddy_opt.c:214
-#: ../libpurple/protocols/qq/group_im.c:142
-#: ../libpurple/protocols/qq/group_opt.c:126
+#: ../libpurple/protocols/qq/group_im.c:144
+#: ../libpurple/protocols/qq/group_opt.c:127
 #: ../libpurple/protocols/qq/sys_msg.c:91
 #: ../libpurple/protocols/qq/sys_msg.c:249
 msgid "Reject"
@@ -7887,13 +7925,13 @@
 msgstr "Uporabnik %d potrebuje avtentikacijo"
 
 #: ../libpurple/protocols/qq/buddy_opt.c:404
-#: ../libpurple/protocols/qq/group_join.c:134
+#: ../libpurple/protocols/qq/group_join.c:136
 msgid "Input request here"
 msgstr "Vnesite zahtevo tukaj"
 
 #. 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
+#: ../libpurple/protocols/qq/group_join.c:137
 msgid "Would you be my friend?"
 msgstr "Bi bil moj prijatelj?"
 
@@ -7901,8 +7939,8 @@
 #. masked
 #. hint
 #: ../libpurple/protocols/qq/buddy_opt.c:406
-#: ../libpurple/protocols/qq/group_join.c:136
-#: ../libpurple/protocols/qq/group_opt.c:142
+#: ../libpurple/protocols/qq/group_join.c:138
+#: ../libpurple/protocols/qq/group_opt.c:143
 msgid "Send"
 msgstr "Pošlji"
 
@@ -7951,59 +7989,59 @@
 msgid "You can only search for permanent QQ groups\n"
 msgstr "Iščete lahko samo stalne skupine QQ\n"
 
-#: ../libpurple/protocols/qq/group_im.c:124
+#: ../libpurple/protocols/qq/group_im.c:126
 #, c-format
 msgid "User %d applied to join group %d"
 msgstr "Uporabnik %d se je prijavil za članstvo v skupini %d"
 
-#: ../libpurple/protocols/qq/group_im.c:125
-#: ../libpurple/protocols/qq/group_im.c:179
+#: ../libpurple/protocols/qq/group_im.c:127
+#: ../libpurple/protocols/qq/group_im.c:181
 #: ../libpurple/protocols/qq/sys_msg.c:195
 #, c-format
 msgid "Reason: %s"
 msgstr "Razlog: %s"
 
-#: ../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
+#: ../libpurple/protocols/qq/group_im.c:136
+#: ../libpurple/protocols/qq/group_im.c:183
+#: ../libpurple/protocols/qq/group_im.c:223
+#: ../libpurple/protocols/qq/group_im.c:258
+#: ../libpurple/protocols/qq/group_im.c:292
+#: ../libpurple/protocols/qq/group_join.c:233
+#: ../libpurple/protocols/qq/group_join.c:359
+#: ../libpurple/protocols/qq/group_opt.c:235
+#: ../libpurple/protocols/qq/group_opt.c:305
+#: ../libpurple/protocols/qq/group_opt.c:391
 msgid "QQ Qun Operation"
 msgstr "Operacija QQ Qun"
 
-#: ../libpurple/protocols/qq/group_im.c:139
-#: ../libpurple/protocols/qq/group_opt.c:127
+#: ../libpurple/protocols/qq/group_im.c:141
+#: ../libpurple/protocols/qq/group_opt.c:128
 #: ../libpurple/protocols/qq/sys_msg.c:92
 #: ../libpurple/protocols/qq/sys_msg.c:251
 msgid "Approve"
 msgstr "Odobri"
 
-#: ../libpurple/protocols/qq/group_im.c:178
+#: ../libpurple/protocols/qq/group_im.c:180
 #, c-format
 msgid "You request to join group %d has been rejected by admin %d"
 msgstr "Vašo zahtevo za pridružitev skupini %d je zavrnil administrator %d"
 
-#: ../libpurple/protocols/qq/group_im.c:219
+#: ../libpurple/protocols/qq/group_im.c:221
 #, c-format
 msgid "You request to join group %d has been approved by admin %d"
 msgstr "Vašo zahtevo za pridružitev skupini %d je odobril administrator %d"
 
-#: ../libpurple/protocols/qq/group_im.c:255
+#: ../libpurple/protocols/qq/group_im.c:257
 #, c-format
 msgid "You [%d] has exit group \"%d\""
 msgstr "Zapustili ste [%d] skupino \"%d\""
 
-#: ../libpurple/protocols/qq/group_im.c:289
+#: ../libpurple/protocols/qq/group_im.c:291
 #, c-format
 msgid "You [%d] has been added by group \"%d\""
 msgstr "Dodani ste [%d] bili v skupino \"%d\""
 
-#: ../libpurple/protocols/qq/group_im.c:290
+#: ../libpurple/protocols/qq/group_im.c:292
 msgid "This group has been added to your buddy list"
 msgstr "Skupina je bila dodana na vaš seznam prijateljev."
 
@@ -8027,31 +8065,31 @@
 msgid "Unknown status"
 msgstr "Neznano stanje"
 
-#: ../libpurple/protocols/qq/group_join.c:80
+#: ../libpurple/protocols/qq/group_join.c:82
 msgid "This group does not allow others to join"
 msgstr "Ta skupina ne dovoljuje novih članov"
 
-#: ../libpurple/protocols/qq/group_join.c:231
+#: ../libpurple/protocols/qq/group_join.c:233
 msgid "You have successfully exited the group"
 msgstr "Uspešno ste zapustili skupino."
 
-#: ../libpurple/protocols/qq/group_join.c:255
+#: ../libpurple/protocols/qq/group_join.c:257
 msgid "QQ Group Auth"
 msgstr "Pooblaščanje skupine QQ"
 
-#: ../libpurple/protocols/qq/group_join.c:256
+#: ../libpurple/protocols/qq/group_join.c:258
 msgid "Your authorization operation has been accepted by the QQ server"
 msgstr "Strežnik QQ je sprejel vašo operacijo pooblaščanja."
 
-#: ../libpurple/protocols/qq/group_join.c:327
+#: ../libpurple/protocols/qq/group_join.c:329
 msgid "You inputted a group id outside the acceptable range"
 msgstr "Vnesli ste id skupine zunaj veljavnega obsega"
 
-#: ../libpurple/protocols/qq/group_join.c:358
+#: ../libpurple/protocols/qq/group_join.c:360
 msgid "Are you sure to exit this Qun?"
 msgstr "Ste prepričani, da želite zapustiti za Qun?"
 
-#: ../libpurple/protocols/qq/group_join.c:360
+#: ../libpurple/protocols/qq/group_join.c:362
 msgid ""
 "Note, if you are the creator, \n"
 "this operation will eventually remove this Qun."
@@ -8059,58 +8097,58 @@
 "Če ste ustvarjalec, upoštevajte: \n"
 "ta operacija bo spotoma odstranila ta Qun."
 
-#: ../libpurple/protocols/qq/group_join.c:365
+#: ../libpurple/protocols/qq/group_join.c:367
 msgid "Go ahead"
 msgstr "Pojdi"
 
-#: ../libpurple/protocols/qq/group_network.c:90
+#: ../libpurple/protocols/qq/group_network.c:92
 #, c-format
 msgid "Code [0x%02X]: %s"
 msgstr "Koda [0x%02X]: %s"
 
-#: ../libpurple/protocols/qq/group_network.c:91
+#: ../libpurple/protocols/qq/group_network.c:93
 msgid "Group Operation Error"
 msgstr "Napaka skupinske operacije"
 
 #. we wanna see window
-#: ../libpurple/protocols/qq/group_opt.c:123
+#: ../libpurple/protocols/qq/group_opt.c:124
 #: ../libpurple/protocols/qq/sys_msg.c:88
 msgid "Do you wanna approve the request?"
 msgstr "Želite odobriti zahtevo?"
 
-#: ../libpurple/protocols/qq/group_opt.c:234
+#: ../libpurple/protocols/qq/group_opt.c:235
 msgid "You have successfully modify Qun member"
 msgstr "Uspešno ste spremenili člana Qun"
 
-#: ../libpurple/protocols/qq/group_opt.c:304
+#: ../libpurple/protocols/qq/group_opt.c:305
 msgid "You have successfully modify Qun information"
 msgstr "Uspešno ste spremenili podatke Qun"
 
-#: ../libpurple/protocols/qq/group_opt.c:391
+#: ../libpurple/protocols/qq/group_opt.c:392
 msgid "You have successfully created a Qun"
 msgstr "Uspešno ste ustvarili Qun"
 
-#: ../libpurple/protocols/qq/group_opt.c:393
+#: ../libpurple/protocols/qq/group_opt.c:394
 msgid "Would you like to set up the Qun details now?"
 msgstr "Želite zdaj nastaviti podrobnosti Qun?"
 
-#: ../libpurple/protocols/qq/group_opt.c:397
+#: ../libpurple/protocols/qq/group_opt.c:398
 msgid "Setup"
 msgstr "Namestitev"
 
-#: ../libpurple/protocols/qq/im.c:430
+#: ../libpurple/protocols/qq/im.c:432
 msgid "System Message"
 msgstr "Sistemsko sporočilo"
 
-#: ../libpurple/protocols/qq/im.c:574
+#: ../libpurple/protocols/qq/im.c:576
 msgid "Server ACK"
 msgstr "Strežnik ACK"
 
-#: ../libpurple/protocols/qq/im.c:574
-msgid "Send IM fail\n"
-msgstr "Pošiljanje sporočila neuspešno\n"
-
-#: ../libpurple/protocols/qq/keep_alive.c:85
+#: ../libpurple/protocols/qq/im.c:576
+msgid "Failed to send IM."
+msgstr "Neposrednega sporočila ni bilo mogoče poslati."
+
+#: ../libpurple/protocols/qq/keep_alive.c:87
 msgid "Keep alive error, seems connection lost!"
 msgstr "Napaka ohranjanja aktivnosti, očitno je povezava izgubljena!"
 
@@ -8125,8 +8163,8 @@
 #. we didn't successfully connect. tdt->toc_fd is valid here
 #: ../libpurple/protocols/qq/qq.c:139
 #: ../libpurple/protocols/toc/toc.c:173
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:108
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:188
+#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:109
+#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:189
 #: ../libpurple/protocols/yahoo/ycht.c:549
 msgid "Unable to connect."
 msgstr "Ni se bilo mogoče povezati."
@@ -8269,27 +8307,27 @@
 msgid "Unable to read from socket"
 msgstr "Ni mogoče brati iz vtičnice"
 
-#: ../libpurple/protocols/qq/send_file.c:706
+#: ../libpurple/protocols/qq/send_file.c:707
 #, c-format
 msgid "%d has declined the file %s"
 msgstr "Uporabnik %d je zavrnil datoteko %s"
 
-#: ../libpurple/protocols/qq/send_file.c:709
-#: ../libpurple/protocols/qq/send_file.c:738
+#: ../libpurple/protocols/qq/send_file.c:710
+#: ../libpurple/protocols/qq/send_file.c:739
 msgid "File Send"
 msgstr "Datoteka poslana"
 
-#: ../libpurple/protocols/qq/send_file.c:735
+#: ../libpurple/protocols/qq/send_file.c:736
 #, c-format
 msgid "%d canceled the transfer of %s"
 msgstr "Uporabnik %d je prekinil prenos %s"
 
-#: ../libpurple/protocols/qq/sendqueue.c:122
+#: ../libpurple/protocols/qq/sendqueue.c:123
 msgid "Connection lost"
 msgstr "Povezava izgubljena"
 
 #. cancel login progress
-#: ../libpurple/protocols/qq/sendqueue.c:130
+#: ../libpurple/protocols/qq/sendqueue.c:131
 msgid "Login failed, no reply"
 msgstr "Prijava spodletela, ni odziva!"
 
@@ -8525,7 +8563,7 @@
 msgstr "Pošlji obvestilo TEST"
 
 #: ../libpurple/protocols/sametime/sametime.c:3586
-#: ../pidgin/gtkconv.c:4290
+#: ../pidgin/gtkconv.c:4274
 msgid "Topic:"
 msgstr "Tema:"
 
@@ -8547,7 +8585,7 @@
 msgstr "Strežnik Sametime Community ni naveden"
 
 #: ../libpurple/protocols/sametime/sametime.c:3644
-#: ../pidgin/gtkblist.c:4006
+#: ../pidgin/gtkblist.c:4015
 msgid "Connect"
 msgstr "Poveži se"
 
@@ -8697,8 +8735,9 @@
 msgid "The identifier '%s' may possibly refer to any of the following users. You may add these users to your buddy list or send them messages with the action buttons below."
 msgstr "Imenovalec '%s' se lahko nanaša na katerega koli od naštetih uporabnikov. Izberite ustreznega in ga dodajte na seznam prijateljev ali pa jim pošljite sporočila s spodnjimi gumbi."
 
+#. Create the window
 #: ../libpurple/protocols/sametime/sametime.c:5538
-#: ../pidgin/gtknotify.c:722
+#: ../pidgin/gtknotify.c:719
 msgid "Search Results"
 msgstr "Rezultati iskanja"
 
@@ -9504,7 +9543,7 @@
 msgstr "Pogodba ni uspela"
 
 #: ../libpurple/protocols/silc/ft.c:114
-msgid "Connection timedout"
+msgid "Connection timed out"
 msgstr "Časovna omejitev povezave potekla"
 
 #: ../libpurple/protocols/silc/ft.c:118
@@ -9960,7 +9999,7 @@
 
 #: ../libpurple/protocols/silc/silc.c:741
 #: ../libpurple/protocols/silc10/silc.c:652
-#: ../pidgin/gtkprefs.c:1566
+#: ../pidgin/gtkprefs.c:1636
 msgid "Normal"
 msgstr "Navadno"
 
@@ -10316,69 +10355,69 @@
 #. *< name
 #. *< version
 #. *  summary
-#: ../libpurple/protocols/silc/silc.c:1875
-#: ../libpurple/protocols/silc10/silc.c:1817
+#: ../libpurple/protocols/silc/silc.c:1876
+#: ../libpurple/protocols/silc10/silc.c:1819
 msgid "SILC Protocol Plugin"
 msgstr "Vstavek za protokol SILC"
 
 #. *  description
-#: ../libpurple/protocols/silc/silc.c:1877
-#: ../libpurple/protocols/silc10/silc.c:1819
+#: ../libpurple/protocols/silc/silc.c:1878
+#: ../libpurple/protocols/silc10/silc.c:1821
 msgid "Secure Internet Live Conferencing (SILC) Protocol"
 msgstr "Protokol SILC (Varen internetni konferenčni sistem v živo)"
 
-#: ../libpurple/protocols/silc/silc.c:1909
-#: ../libpurple/protocols/silc10/silc.c:1851
-#: ../pidgin/gtkprefs.c:1959
+#: ../libpurple/protocols/silc/silc.c:1910
+#: ../libpurple/protocols/silc10/silc.c:1853
+#: ../pidgin/gtkprefs.c:2029
 msgid "Network"
 msgstr "Omrežje"
 
-#: ../libpurple/protocols/silc/silc.c:1920
-#: ../libpurple/protocols/silc10/silc.c:1862
+#: ../libpurple/protocols/silc/silc.c:1921
+#: ../libpurple/protocols/silc10/silc.c:1864
 msgid "Public Key file"
 msgstr "Datoteka z javnim ključem"
 
-#: ../libpurple/protocols/silc/silc.c:1924
-#: ../libpurple/protocols/silc10/silc.c:1866
+#: ../libpurple/protocols/silc/silc.c:1925
+#: ../libpurple/protocols/silc10/silc.c:1868
 msgid "Private Key file"
 msgstr "Datoteka z zasebnim ključem"
 
-#: ../libpurple/protocols/silc/silc.c:1934
-#: ../libpurple/protocols/silc10/silc.c:1876
+#: ../libpurple/protocols/silc/silc.c:1935
+#: ../libpurple/protocols/silc10/silc.c:1878
 msgid "Cipher"
 msgstr "Cipher"
 
-#: ../libpurple/protocols/silc/silc.c:1944
-#: ../libpurple/protocols/silc10/silc.c:1886
+#: ../libpurple/protocols/silc/silc.c:1945
+#: ../libpurple/protocols/silc10/silc.c:1888
 msgid "HMAC"
 msgstr "HMAC"
 
-#: ../libpurple/protocols/silc/silc.c:1947
+#: ../libpurple/protocols/silc/silc.c:1948
 msgid "Use Perfect Forward Secrecy"
 msgstr "Uporabi popolno neposredno skrivnostnost"
 
-#: ../libpurple/protocols/silc/silc.c:1951
-#: ../libpurple/protocols/silc10/silc.c:1889
+#: ../libpurple/protocols/silc/silc.c:1952
+#: ../libpurple/protocols/silc10/silc.c:1891
 msgid "Public key authentication"
 msgstr "Overovitev javnega ključa"
 
-#: ../libpurple/protocols/silc/silc.c:1954
-#: ../libpurple/protocols/silc10/silc.c:1892
+#: ../libpurple/protocols/silc/silc.c:1955
+#: ../libpurple/protocols/silc10/silc.c:1894
 msgid "Block IMs without Key Exchange"
 msgstr "Zavrni neposredno sporočanje brez izmenjave ključev"
 
-#: ../libpurple/protocols/silc/silc.c:1957
-#: ../libpurple/protocols/silc10/silc.c:1895
+#: ../libpurple/protocols/silc/silc.c:1958
+#: ../libpurple/protocols/silc10/silc.c:1897
 msgid "Block messages to whiteboard"
 msgstr "Blokiraj sporočila na tablo"
 
-#: ../libpurple/protocols/silc/silc.c:1960
-#: ../libpurple/protocols/silc10/silc.c:1898
+#: ../libpurple/protocols/silc/silc.c:1961
+#: ../libpurple/protocols/silc10/silc.c:1900
 msgid "Automatically open whiteboard"
 msgstr "Samodejno odpri tablo"
 
-#: ../libpurple/protocols/silc/silc.c:1963
-#: ../libpurple/protocols/silc10/silc.c:1901
+#: ../libpurple/protocols/silc/silc.c:1964
+#: ../libpurple/protocols/silc10/silc.c:1903
 msgid "Digitally sign and verify all messages"
 msgstr "Digitalno podpiši in preveri vsa sporočila"
 
@@ -10804,8 +10843,8 @@
 msgstr "Sprememba gesla uspešna"
 
 #: ../libpurple/protocols/toc/toc.c:1366
-#: ../pidgin/gtkblist.c:5502
-#: ../pidgin/gtkblist.c:5856
+#: ../pidgin/gtkblist.c:5519
+#: ../pidgin/gtkblist.c:5873
 msgid "_Group:"
 msgstr "_Skupina:"
 
@@ -10951,8 +10990,8 @@
 #: ../libpurple/protocols/yahoo/yahoo.c:2684
 #: ../libpurple/protocols/yahoo/yahoo.c:2787
 #: ../libpurple/protocols/yahoo/yahoo.c:2797
-#: ../libpurple/protocols/yahoo/yahoochat.c:1455
-#: ../libpurple/protocols/yahoo/yahoochat.c:1525
+#: ../libpurple/protocols/yahoo/yahoochat.c:1418
+#: ../libpurple/protocols/yahoo/yahoochat.c:1488
 #: ../libpurple/protocols/yahoo/ycht.c:585
 msgid "Connection problem"
 msgstr "Težava s povezavo"
@@ -11143,70 +11182,70 @@
 msgid "Yahoo Chat port"
 msgstr "Vrata klepeta Yahoo"
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:203
+#: ../libpurple/protocols/yahoo/yahoochat.c:204
 #, c-format
 msgid "%s declined your conference invitation to room \"%s\" because \"%s\"."
 msgstr "%s je zavrnil vaše povabilo za pogovor v sobi \"%s\", ker \"%s\"."
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:205
+#: ../libpurple/protocols/yahoo/yahoochat.c:206
 msgid "Invitation Rejected"
 msgstr "Povabilo zavrnjeno"
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:361
+#: ../libpurple/protocols/yahoo/yahoochat.c:362
 msgid "Failed to join chat"
 msgstr "Pomenku se ni mogoče pridružiti"
 
 #. -6
-#: ../libpurple/protocols/yahoo/yahoochat.c:364
+#: ../libpurple/protocols/yahoo/yahoochat.c:365
 msgid "Unknown room"
 msgstr "Neznana soba"
 
 #. -15
-#: ../libpurple/protocols/yahoo/yahoochat.c:367
+#: ../libpurple/protocols/yahoo/yahoochat.c:368
 msgid "Maybe the room is full"
 msgstr "Morda je soba polna"
 
 #. -35
-#: ../libpurple/protocols/yahoo/yahoochat.c:370
+#: ../libpurple/protocols/yahoo/yahoochat.c:371
 msgid "Not available"
 msgstr "Ni na voljo"
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:374
+#: ../libpurple/protocols/yahoo/yahoochat.c:375
 msgid "Unknown error. You may need to logout and wait five minutes before being able to rejoin a chatroom"
 msgstr "Neznana napaka. Morda se boste morali odjaviti in počakati pet minut, preden se boste lahko ponovno pridružili klepetalnici"
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:452
+#: ../libpurple/protocols/yahoo/yahoochat.c:453
 #, c-format
 msgid "You are now chatting in %s."
 msgstr "Pogovarjate se v %s."
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:627
+#: ../libpurple/protocols/yahoo/yahoochat.c:628
 msgid "Failed to join buddy in chat"
 msgstr "Prijatelju se ni bilo mogoče pridružiti na pomenku"
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:628
+#: ../libpurple/protocols/yahoo/yahoochat.c:629
 msgid "Maybe they're not in a chat?"
 msgstr "Morda niso v pomenku?"
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:1357
-#: ../libpurple/protocols/yahoo/yahoochat.c:1383
+#: ../libpurple/protocols/yahoo/yahoochat.c:1320
+#: ../libpurple/protocols/yahoo/yahoochat.c:1346
 msgid "Fetching the room list failed."
 msgstr "Prejemanje seznama sob je spodletelo."
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:1441
+#: ../libpurple/protocols/yahoo/yahoochat.c:1404
 msgid "Voices"
 msgstr "Glasovi"
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:1444
+#: ../libpurple/protocols/yahoo/yahoochat.c:1407
 msgid "Webcams"
 msgstr "Spletne kamere"
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:1455
-#: ../libpurple/protocols/yahoo/yahoochat.c:1525
+#: ../libpurple/protocols/yahoo/yahoochat.c:1418
+#: ../libpurple/protocols/yahoo/yahoochat.c:1488
 msgid "Unable to fetch room list."
 msgstr "Ni mogoče prenesti seznama sob."
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:1518
+#: ../libpurple/protocols/yahoo/yahoochat.c:1481
 msgid "User Rooms"
 msgstr "Sobe uporabnikov"
 
@@ -11217,9 +11256,9 @@
 msgid "Sent Doodle request."
 msgstr "Pošlji zahtevo Doodle."
 
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:269
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:278
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:291
+#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:270
+#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:279
+#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:292
 msgid "Unable to establish file descriptor."
 msgstr "Opisa datoteke ni bilo mogoče vzpostaviti."
 
@@ -11520,11 +11559,11 @@
 #. *
 #. * The default message to use when the user becomes auto-away.
 #.
-#: ../libpurple/savedstatuses.c:46
+#: ../libpurple/savedstatuses.c:47
 msgid "I'm not here right now"
 msgstr "Trenutno nisem tukaj"
 
-#: ../libpurple/savedstatuses.c:532
+#: ../libpurple/savedstatuses.c:534
 msgid "saved statuses"
 msgstr "shranjena stanja"
 
@@ -11533,7 +11572,7 @@
 msgid "%s is now known as %s.\n"
 msgstr "%s je zdaj poznan kot %s.\n"
 
-#: ../libpurple/server.c:679
+#: ../libpurple/server.c:680
 #, c-format
 msgid ""
 "%s has invited %s to the chat room %s:\n"
@@ -11542,12 +11581,12 @@
 "Uporabnik %s vabi %s na pomenek v sobo %s:\n"
 "%s"
 
-#: ../libpurple/server.c:684
+#: ../libpurple/server.c:685
 #, c-format
 msgid "%s has invited %s to the chat room %s\n"
 msgstr "Uporabnik %s vabi %s na pomenek v sobo %s\n"
 
-#: ../libpurple/server.c:688
+#: ../libpurple/server.c:689
 msgid "Accept chat invitation?"
 msgstr "Sprejmi povabilo na pomenek?"
 
@@ -11556,12 +11595,17 @@
 msgstr "Nenastavljeno"
 
 #: ../libpurple/status.c:155
-msgid "Unavailable"
-msgstr "Nedostopen"
+#: ../pidgin/gtkstatusbox.c:1057
+msgid "Do not disturb"
+msgstr "Ne moti"
+
+#: ../libpurple/status.c:158
+msgid "Extended away"
+msgstr "Obsežneje odsoten"
 
 #: ../libpurple/status.c:159
 msgid "Mobile"
-msgstr "Mobilni telefon"
+msgstr "Mobilec"
 
 #: ../libpurple/status.c:608
 #, c-format
@@ -11598,30 +11642,30 @@
 msgid "+++ %s became unidle"
 msgstr "+++ %s je postal dejaven"
 
-#: ../libpurple/util.c:682
+#: ../libpurple/util.c:717
 #, c-format
 msgid "%x %X"
 msgstr "%x %X"
 
-#: ../libpurple/util.c:2586
+#: ../libpurple/util.c:2691
 #, c-format
 msgid "Error Reading %s"
 msgstr "Napaka pri branju %s"
 
-#: ../libpurple/util.c:2587
+#: ../libpurple/util.c:2692
 #, c-format
 msgid "An error was encountered reading your %s.  They have not been loaded, and the old file has been renamed to %s~."
 msgstr "Pri branju vašega %s je prišlo do napake, zato ni bil naložen. Stara datoteka se je preimenovala v %s~."
 
-#: ../libpurple/util.c:3060
+#: ../libpurple/util.c:3192
 msgid "Calculating..."
 msgstr "Preračunavanje ..."
 
-#: ../libpurple/util.c:3063
+#: ../libpurple/util.c:3195
 msgid "Unknown."
 msgstr "Neznano."
 
-#: ../libpurple/util.c:3089
+#: ../libpurple/util.c:3221
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
@@ -11630,7 +11674,7 @@
 msgstr[2] "%d sekundi"
 msgstr[3] "%d sekunde"
 
-#: ../libpurple/util.c:3101
+#: ../libpurple/util.c:3233
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
@@ -11639,7 +11683,7 @@
 msgstr[2] "%d dneva"
 msgstr[3] "%d dni"
 
-#: ../libpurple/util.c:3109
+#: ../libpurple/util.c:3241
 #, c-format
 msgid "%s, %d hour"
 msgid_plural "%s, %d hours"
@@ -11648,7 +11692,7 @@
 msgstr[2] "%s, %d uri"
 msgstr[3] "%s, %d ur"
 
-#: ../libpurple/util.c:3115
+#: ../libpurple/util.c:3247
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
@@ -11657,7 +11701,7 @@
 msgstr[2] "%d uri"
 msgstr[3] "%d ure"
 
-#: ../libpurple/util.c:3123
+#: ../libpurple/util.c:3255
 #, c-format
 msgid "%s, %d minute"
 msgid_plural "%s, %d minutes"
@@ -11666,7 +11710,7 @@
 msgstr[2] "%s, %d minuti"
 msgstr[3] "%s, %d minut"
 
-#: ../libpurple/util.c:3129
+#: ../libpurple/util.c:3261
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
@@ -11675,33 +11719,33 @@
 msgstr[2] "%d minuti"
 msgstr[3] "%d minut"
 
-#: ../libpurple/util.c:3389
+#: ../libpurple/util.c:3521
 #, c-format
 msgid "Could not open %s: Redirected too many times"
 msgstr "Ni mogoče odpreti %s: Prevečkrat preusmerjeno"
 
-#: ../libpurple/util.c:3426
-#: ../libpurple/util.c:3721
+#: ../libpurple/util.c:3558
+#: ../libpurple/util.c:3853
 #, c-format
 msgid "Unable to connect to %s"
 msgstr "Ni se mogoče povezati z %s."
 
-#: ../libpurple/util.c:3549
+#: ../libpurple/util.c:3681
 #, c-format
 msgid "Unable to allocate enough memory to hold the contents from %s.  The web server may be trying something malicious."
 msgstr "Za hrambo vsebine %s ni mogoče pridobiti zadostnega prostora. Spletni strežnik morda poskuša storiti nekaj sovražnega."
 
-#: ../libpurple/util.c:3584
+#: ../libpurple/util.c:3716
 #, c-format
 msgid "Error reading from %s: %s"
 msgstr "Napaka pri branju iz %s: %s"
 
-#: ../libpurple/util.c:3615
+#: ../libpurple/util.c:3747
 #, c-format
 msgid "Error writing to %s: %s"
 msgstr "Napaka pri pisanju v %s: %s"
 
-#: ../libpurple/util.c:3640
+#: ../libpurple/util.c:3772
 #, c-format
 msgid "Unable to connect to %s: %s"
 msgstr "Napaka pri povezovanju z %s: %s"
@@ -11739,60 +11783,60 @@
 msgid "Screen _name:"
 msgstr "Pojavno _ime:"
 
-#: ../pidgin/gtkaccount.c:528
+#: ../pidgin/gtkaccount.c:531
 msgid "_Local alias:"
 msgstr "_Krajevni psevdonim:"
 
-#: ../pidgin/gtkaccount.c:532
+#: ../pidgin/gtkaccount.c:535
 msgid "Remember pass_word"
 msgstr "Zapomni si _geslo"
 
 #. Build the user options frame.
-#: ../pidgin/gtkaccount.c:590
+#: ../pidgin/gtkaccount.c:593
 msgid "User Options"
 msgstr "Možnosti uporabnika"
 
-#: ../pidgin/gtkaccount.c:603
+#: ../pidgin/gtkaccount.c:606
 msgid "New _mail notifications"
 msgstr "_Obveščanje o prispeli pošti"
 
 #. Buddy icon
-#: ../pidgin/gtkaccount.c:608
+#: ../pidgin/gtkaccount.c:611
 msgid "Use this buddy _icon for this account:"
 msgstr "Za ta račun uporabi to _ikono prijatelja:"
 
 #. Build the protocol options frame.
-#: ../pidgin/gtkaccount.c:728
+#: ../pidgin/gtkaccount.c:731
 #, c-format
 msgid "%s Options"
 msgstr "%s Možnosti"
 
-#: ../pidgin/gtkaccount.c:934
+#: ../pidgin/gtkaccount.c:936
 msgid "Use GNOME Proxy Settings"
 msgstr "Uporabi nastavitve strežnikov proxy GNOME"
 
-#: ../pidgin/gtkaccount.c:935
+#: ../pidgin/gtkaccount.c:937
 msgid "Use Global Proxy Settings"
 msgstr "uporabljaj splošno nastavitev strežnikov proxy"
 
-#: ../pidgin/gtkaccount.c:941
+#: ../pidgin/gtkaccount.c:943
 msgid "No Proxy"
 msgstr "brez strežnika proxy"
 
-#: ../pidgin/gtkaccount.c:947
+#: ../pidgin/gtkaccount.c:949
 msgid "HTTP"
 msgstr "HTTP"
 
-#: ../pidgin/gtkaccount.c:953
+#: ../pidgin/gtkaccount.c:955
 msgid "SOCKS 4"
 msgstr "SOCKS4"
 
-#: ../pidgin/gtkaccount.c:959
+#: ../pidgin/gtkaccount.c:961
 msgid "SOCKS 5"
 msgstr "SOCKS5"
 
-#: ../pidgin/gtkaccount.c:965
-#: ../pidgin/gtkprefs.c:1137
+#: ../pidgin/gtkaccount.c:967
+#: ../pidgin/gtkprefs.c:1206
 msgid "Use Environmental Settings"
 msgstr "uporabi nastavitve okolja"
 
@@ -11801,65 +11845,65 @@
 #. 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:1004
+#: ../pidgin/gtkaccount.c:1006
 msgid "If you look real closely"
 msgstr "Če pogledate zelo pozorno,"
 
 #. This is an easter egg. See the comment on the previous line in the source.
-#: ../pidgin/gtkaccount.c:1007
+#: ../pidgin/gtkaccount.c:1009
 msgid "you can see the butterflies mating"
 msgstr "lahko opazite metulje, ki se parijo"
 
-#: ../pidgin/gtkaccount.c:1028
+#: ../pidgin/gtkaccount.c:1030
 msgid "Proxy Options"
 msgstr "Možnosti strežnika proxy"
 
-#: ../pidgin/gtkaccount.c:1042
-#: ../pidgin/gtkprefs.c:1131
+#: ../pidgin/gtkaccount.c:1044
+#: ../pidgin/gtkprefs.c:1200
 msgid "Proxy _type:"
 msgstr "Vrsta s_trežnika proxy:"
 
-#: ../pidgin/gtkaccount.c:1051
-#: ../pidgin/gtkprefs.c:1152
+#: ../pidgin/gtkaccount.c:1053
+#: ../pidgin/gtkprefs.c:1221
 msgid "_Host:"
 msgstr "_Strežnik:"
 
-#: ../pidgin/gtkaccount.c:1055
-#: ../pidgin/gtkprefs.c:1170
+#: ../pidgin/gtkaccount.c:1057
+#: ../pidgin/gtkprefs.c:1239
 msgid "_Port:"
 msgstr "_Vrata:"
 
-#: ../pidgin/gtkaccount.c:1063
+#: ../pidgin/gtkaccount.c:1065
 msgid "_Username:"
 msgstr "_Uporabniško ime:"
 
-#: ../pidgin/gtkaccount.c:1070
-#: ../pidgin/gtkprefs.c:1207
+#: ../pidgin/gtkaccount.c:1072
+#: ../pidgin/gtkprefs.c:1276
 msgid "Pa_ssword:"
 msgstr "Ge_slo:"
 
-#: ../pidgin/gtkaccount.c:1476
+#: ../pidgin/gtkaccount.c:1473
 msgid "Add Account"
 msgstr "Dodaj račun"
 
-#: ../pidgin/gtkaccount.c:1500
+#: ../pidgin/gtkaccount.c:1492
 msgid "_Basic"
 msgstr "_Osnovno"
 
-#: ../pidgin/gtkaccount.c:1511
+#: ../pidgin/gtkaccount.c:1503
 msgid "_Advanced"
 msgstr "N_apredno"
 
-#: ../pidgin/gtkaccount.c:1983
+#: ../pidgin/gtkaccount.c:1975
 #: ../pidgin/gtkplugin.c:568
 msgid "Enabled"
 msgstr "Omogočen"
 
-#: ../pidgin/gtkaccount.c:2011
+#: ../pidgin/gtkaccount.c:2003
 msgid "Protocol"
 msgstr "Protokol"
 
-#: ../pidgin/gtkaccount.c:2212
+#: ../pidgin/gtkaccount.c:2203
 #, c-format
 msgid ""
 "<span size='larger' weight='bold'>Welcome to %s!</span>\n"
@@ -11874,243 +11918,244 @@
 "\n"
 "Vedno se k temu oknu lahko vrnete in dodate, uredite ali odstranite račune z <b>Računi->Dodaj/Uredi</b> v oknu seznama prijateljev"
 
-#: ../pidgin/gtkblist.c:732
+#: ../pidgin/gtkblist.c:763
 msgid "Join a Chat"
 msgstr "Pridruži se pomenku"
 
-#: ../pidgin/gtkblist.c:753
+#: ../pidgin/gtkblist.c:784
 msgid "Please enter the appropriate information about the chat you would like to join.\n"
 msgstr "Vnesite ustrezne informacije o pomenku, ki se mu želite pridružiti.\n"
 
 #. Set up stuff for the account box
-#: ../pidgin/gtkblist.c:764
-#: ../pidgin/gtkblist.c:5450
-#: ../pidgin/gtkblist.c:5817
-#: ../pidgin/gtkpounce.c:531
-#: ../pidgin/gtkroomlist.c:399
+#: ../pidgin/gtkblist.c:795
+#: ../pidgin/gtkblist.c:5467
+#: ../pidgin/gtkblist.c:5834
+#: ../pidgin/gtkpounce.c:540
+#: ../pidgin/gtkroomlist.c:395
 msgid "_Account:"
 msgstr "_Račun:"
 
-#: ../pidgin/gtkblist.c:1053
-#: ../pidgin/gtkprivacy.c:606
-#: ../pidgin/gtkprivacy.c:620
+#: ../pidgin/gtkblist.c:1084
+#: ../pidgin/gtkprivacy.c:602
+#: ../pidgin/gtkprivacy.c:616
 msgid "_Block"
 msgstr "_Zavrni"
 
-#: ../pidgin/gtkblist.c:1053
+#: ../pidgin/gtkblist.c:1084
 msgid "Un_block"
 msgstr "Prekliči _zavrnitev"
 
-#: ../pidgin/gtkblist.c:1104
+#: ../pidgin/gtkblist.c:1135
 msgid "Get _Info"
 msgstr "_Informacije"
 
-#: ../pidgin/gtkblist.c:1107
+#: ../pidgin/gtkblist.c:1138
 #: ../pidgin/pidginstock.c:84
 msgid "I_M"
 msgstr "_Sporoči"
 
-#: ../pidgin/gtkblist.c:1113
+#: ../pidgin/gtkblist.c:1144
 msgid "_Send File"
 msgstr "_Pošlji datoteko"
 
-#: ../pidgin/gtkblist.c:1120
+#: ../pidgin/gtkblist.c:1151
 msgid "Add Buddy _Pounce"
 msgstr "Dodaj _opozorilo prijatelja"
 
-#: ../pidgin/gtkblist.c:1124
-#: ../pidgin/gtkblist.c:1128
-#: ../pidgin/gtkblist.c:1230
-#: ../pidgin/gtkblist.c:1253
+#: ../pidgin/gtkblist.c:1155
+#: ../pidgin/gtkblist.c:1159
+#: ../pidgin/gtkblist.c:1262
+#: ../pidgin/gtkblist.c:1285
 msgid "View _Log"
 msgstr "Pokaži _dnevnik"
 
-#: ../pidgin/gtkblist.c:1140
-#: ../pidgin/gtkblist.c:1149
-#: ../pidgin/gtkblist.c:1238
-#: ../pidgin/gtkblist.c:1259
+#: ../pidgin/gtkblist.c:1171
+#: ../pidgin/gtkblist.c:1180
+#: ../pidgin/gtkblist.c:1270
+#: ../pidgin/gtkblist.c:1291
 msgid "_Alias..."
 msgstr "Psevdo_nim ..."
 
-#: ../pidgin/gtkblist.c:1143
-#: ../pidgin/gtkblist.c:1151
-#: ../pidgin/gtkblist.c:1240
-#: ../pidgin/gtkblist.c:1261
+#: ../pidgin/gtkblist.c:1174
+#: ../pidgin/gtkblist.c:1182
+#: ../pidgin/gtkblist.c:1272
+#: ../pidgin/gtkblist.c:1293
 msgid "_Remove"
 msgstr "Odst_rani"
 
-#: ../pidgin/gtkblist.c:1200
+#: ../pidgin/gtkblist.c:1232
 msgid "Add a _Buddy"
 msgstr "Dodaj _prijatelja"
 
-#: ../pidgin/gtkblist.c:1203
+#: ../pidgin/gtkblist.c:1235
 msgid "Add a C_hat"
 msgstr "Dodaj po_menek"
 
-#: ../pidgin/gtkblist.c:1206
+#: ../pidgin/gtkblist.c:1238
 msgid "_Delete Group"
 msgstr "I_zbriši skupino"
 
-#: ../pidgin/gtkblist.c:1208
+#: ../pidgin/gtkblist.c:1240
 msgid "_Rename"
 msgstr "P_reimenuj"
 
 #. join button
-#: ../pidgin/gtkblist.c:1226
+#: ../pidgin/gtkblist.c:1258
 #: ../pidgin/gtkroomlist.c:306
-#: ../pidgin/gtkroomlist.c:463
+#: ../pidgin/gtkroomlist.c:459
 #: ../pidgin/pidginstock.c:82
 msgid "_Join"
 msgstr "_Pridruži se"
 
-#: ../pidgin/gtkblist.c:1228
+#: ../pidgin/gtkblist.c:1260
 msgid "Auto-Join"
 msgstr "Samodejno-pridruži"
 
-#: ../pidgin/gtkblist.c:1266
-#: ../pidgin/gtkblist.c:1289
+#: ../pidgin/gtkblist.c:1298
+#: ../pidgin/gtkblist.c:1321
 msgid "_Collapse"
 msgstr "_Strni"
 
-#: ../pidgin/gtkblist.c:1294
+#: ../pidgin/gtkblist.c:1326
 msgid "_Expand"
 msgstr "_Razširi"
 
-#: ../pidgin/gtkblist.c:1539
-#: ../pidgin/gtkblist.c:1551
-#: ../pidgin/gtkblist.c:4552
-#: ../pidgin/gtkblist.c:4562
+#: ../pidgin/gtkblist.c:1571
+#: ../pidgin/gtkblist.c:1583
+#: ../pidgin/gtkblist.c:4561
+#: ../pidgin/gtkblist.c:4571
 msgid "/Tools/Mute Sounds"
 msgstr "/Orodja/Utišaj zvoke"
 
-#: ../pidgin/gtkblist.c:2011
-#: ../pidgin/gtkconv.c:4650
-#: ../pidgin/gtkpounce.c:423
+#: ../pidgin/gtkblist.c:2043
+#: ../pidgin/gtkconv.c:4602
+#: ../pidgin/gtkpounce.c:429
 msgid "You are not currently signed on with an account that can add that buddy."
 msgstr "Trenutno niste prijavljeni z nobenim računom, ki lahko doda tega prijatelja."
 
 #. Buddies menu
-#: ../pidgin/gtkblist.c:2851
+#: ../pidgin/gtkblist.c:2838
 msgid "/_Buddies"
 msgstr "/_Prijatelji"
 
-#: ../pidgin/gtkblist.c:2852
+#: ../pidgin/gtkblist.c:2839
 msgid "/Buddies/New Instant _Message..."
 msgstr "/Prijatelji/Novo _neposredno sporočilo ..."
 
-#: ../pidgin/gtkblist.c:2853
+#: ../pidgin/gtkblist.c:2840
 msgid "/Buddies/Join a _Chat..."
 msgstr "/Prijatelji/Pridruži se _pomenku ..."
 
-#: ../pidgin/gtkblist.c:2854
+#: ../pidgin/gtkblist.c:2841
 msgid "/Buddies/Get User _Info..."
 msgstr "/Prijatelji/Informacije o _uporabniku ..."
 
-#: ../pidgin/gtkblist.c:2855
+#: ../pidgin/gtkblist.c:2842
 msgid "/Buddies/View User _Log..."
 msgstr "/Prijatelji/Po_kaži uporabnikov dnevnik ..."
 
-#: ../pidgin/gtkblist.c:2857
+#: ../pidgin/gtkblist.c:2844
 msgid "/Buddies/Show _Offline Buddies"
 msgstr "/Prijatelji/Pokaži prijatelje, ki niso na z_vezi"
 
-#: ../pidgin/gtkblist.c:2858
+#: ../pidgin/gtkblist.c:2845
 msgid "/Buddies/Show _Empty Groups"
 msgstr "/Prijatelji/Pokaži pra_zne skupine"
 
-#: ../pidgin/gtkblist.c:2859
+#: ../pidgin/gtkblist.c:2846
 msgid "/Buddies/Show Buddy _Details"
 msgstr "/Prijatelji/Pokaži p_odrobnosti prijateljev"
 
-#: ../pidgin/gtkblist.c:2860
+#: ../pidgin/gtkblist.c:2847
 msgid "/Buddies/Show Idle _Times"
 msgstr "/Prijatelji/Pokaži čase _nedejavnosti"
 
-#: ../pidgin/gtkblist.c:2861
+#: ../pidgin/gtkblist.c:2848
 msgid "/Buddies/_Sort Buddies"
 msgstr "/Prijatelji/Razvr_sti prijatelje"
 
-#: ../pidgin/gtkblist.c:2863
+#: ../pidgin/gtkblist.c:2850
 msgid "/Buddies/_Add Buddy..."
 msgstr "/Prijatelji/Dodaj p_rijatelja ..."
 
-#: ../pidgin/gtkblist.c:2864
+#: ../pidgin/gtkblist.c:2851
 msgid "/Buddies/Add C_hat..."
 msgstr "/Prijatelji/Dodaj p_omenek ..."
 
-#: ../pidgin/gtkblist.c:2865
+#: ../pidgin/gtkblist.c:2852
 msgid "/Buddies/Add _Group..."
 msgstr "/Prijatelji/Dodaj s_kupino ..."
 
-#: ../pidgin/gtkblist.c:2867
+#: ../pidgin/gtkblist.c:2854
 msgid "/Buddies/_Quit"
 msgstr "/Prijatelji/Iz_hod"
 
 #. Accounts menu
-#: ../pidgin/gtkblist.c:2870
+#: ../pidgin/gtkblist.c:2857
 msgid "/_Accounts"
 msgstr "/_Računi"
 
-#: ../pidgin/gtkblist.c:2871
-#: ../pidgin/gtkblist.c:6515
+#: ../pidgin/gtkblist.c:2858
+#: ../pidgin/gtkblist.c:6532
 msgid "/Accounts/Add\\/Edit"
 msgstr "/Računi/Dodaj\\/Uredi"
 
 #. Tools
-#: ../pidgin/gtkblist.c:2874
+#: ../pidgin/gtkblist.c:2861
 msgid "/_Tools"
 msgstr "/_Orodja"
 
-#: ../pidgin/gtkblist.c:2875
+#: ../pidgin/gtkblist.c:2862
 msgid "/Tools/Buddy _Pounces"
 msgstr "/Orodja/Opozorila pri_jateljev"
 
-#: ../pidgin/gtkblist.c:2876
+#: ../pidgin/gtkblist.c:2863
 msgid "/Tools/Plu_gins"
 msgstr "/Orodja/Vstav_ki"
 
-#: ../pidgin/gtkblist.c:2877
+#: ../pidgin/gtkblist.c:2864
 msgid "/Tools/Pr_eferences"
 msgstr "/Orodja/_Nastavitve"
 
-#: ../pidgin/gtkblist.c:2878
+#: ../pidgin/gtkblist.c:2865
 msgid "/Tools/Pr_ivacy"
 msgstr "/Orodja/_Zasebnost"
 
-#: ../pidgin/gtkblist.c:2880
+#: ../pidgin/gtkblist.c:2867
 msgid "/Tools/_File Transfers"
 msgstr "/Orodja/_Prenosi datotek"
 
-#: ../pidgin/gtkblist.c:2881
+#: ../pidgin/gtkblist.c:2868
 msgid "/Tools/R_oom List"
 msgstr "/Orodja/_Seznam sob"
 
-#: ../pidgin/gtkblist.c:2882
+#: ../pidgin/gtkblist.c:2869
 msgid "/Tools/System _Log"
 msgstr "/Orodja/Sistemski _dnevnik"
 
-#: ../pidgin/gtkblist.c:2884
+#: ../pidgin/gtkblist.c:2871
 msgid "/Tools/Mute _Sounds"
 msgstr "/Orodja/_Utišaj zvoke"
 
 #. Help
-#: ../pidgin/gtkblist.c:2887
+#: ../pidgin/gtkblist.c:2873
 msgid "/_Help"
 msgstr "/_Pomoč"
 
-#: ../pidgin/gtkblist.c:2888
+#: ../pidgin/gtkblist.c:2874
 msgid "/Help/Online _Help"
 msgstr "/Pomoč/Pomoč _na spletu"
 
-#: ../pidgin/gtkblist.c:2889
+#: ../pidgin/gtkblist.c:2875
 msgid "/Help/_Debug Window"
 msgstr "/Pomoč/Raz_hroščevalno okno"
 
-#: ../pidgin/gtkblist.c:2890
+#: ../pidgin/gtkblist.c:2877
+#: ../pidgin/gtkblist.c:2879
 msgid "/Help/_About"
 msgstr "/Pomoč/_O programu"
 
-#: ../pidgin/gtkblist.c:2918
+#: ../pidgin/gtkblist.c:2908
 #, c-format
 msgid ""
 "\n"
@@ -12119,75 +12164,80 @@
 "\n"
 "<b>Račun:</b> %s"
 
-#: ../pidgin/gtkblist.c:2996
+#: ../pidgin/gtkblist.c:2986
 msgid "Buddy Alias"
 msgstr "Psevdonim prijatelja"
 
-#: ../pidgin/gtkblist.c:3024
+#: ../pidgin/gtkblist.c:3015
 msgid "Logged In"
 msgstr "Prijavljeni"
 
-#: ../pidgin/gtkblist.c:3070
+#: ../pidgin/gtkblist.c:3061
 msgid "Last Seen"
 msgstr "Zadnjič viden"
 
-#: ../pidgin/gtkblist.c:3090
+#: ../pidgin/gtkblist.c:3081
 msgid "Spooky"
 msgstr "Strašljivo"
 
-#: ../pidgin/gtkblist.c:3092
+#: ../pidgin/gtkblist.c:3083
 msgid "Awesome"
 msgstr "Noro dobro"
 
-#: ../pidgin/gtkblist.c:3094
+#: ../pidgin/gtkblist.c:3085
 msgid "Rockin'"
 msgstr "Kulsko"
 
-#: ../pidgin/gtkblist.c:3423
+#: ../pidgin/gtkblist.c:3428
+#, c-format
+msgid "Idle %dd %dh %02dm"
+msgstr "Nedejaven %dd %dh %02dm"
+
+#: ../pidgin/gtkblist.c:3430
 #, c-format
 msgid "Idle %dh %02dm"
 msgstr "Nedejaven %dh %02dm"
 
-#: ../pidgin/gtkblist.c:3425
+#: ../pidgin/gtkblist.c:3432
 #, c-format
 msgid "Idle %dm"
 msgstr "Nedejaven %dm"
 
-#: ../pidgin/gtkblist.c:3570
+#: ../pidgin/gtkblist.c:3577
 msgid "/Buddies/New Instant Message..."
 msgstr "/Prijatelji/Novo neposredno sporočilo ..."
 
-#: ../pidgin/gtkblist.c:3571
-#: ../pidgin/gtkblist.c:3604
+#: ../pidgin/gtkblist.c:3578
+#: ../pidgin/gtkblist.c:3611
 msgid "/Buddies/Join a Chat..."
 msgstr "/Prijatelji/Pridruži se pomenku ..."
 
-#: ../pidgin/gtkblist.c:3572
+#: ../pidgin/gtkblist.c:3579
 msgid "/Buddies/Get User Info..."
 msgstr "/Prijatelji/Informacije o uporabniku ..."
 
-#: ../pidgin/gtkblist.c:3573
+#: ../pidgin/gtkblist.c:3580
 msgid "/Buddies/Add Buddy..."
 msgstr "/Prijatelji/Dodaj prijatelja ..."
 
-#: ../pidgin/gtkblist.c:3574
-#: ../pidgin/gtkblist.c:3607
+#: ../pidgin/gtkblist.c:3581
+#: ../pidgin/gtkblist.c:3614
 msgid "/Buddies/Add Chat..."
 msgstr "/Prijatelji/Dodaj pomenek ..."
 
-#: ../pidgin/gtkblist.c:3575
+#: ../pidgin/gtkblist.c:3582
 msgid "/Buddies/Add Group..."
 msgstr "/Prijatelji/Dodaj skupino ..."
 
-#: ../pidgin/gtkblist.c:3610
+#: ../pidgin/gtkblist.c:3617
 msgid "/Tools/Privacy"
 msgstr "/Orodja/Zasebnost"
 
-#: ../pidgin/gtkblist.c:3613
+#: ../pidgin/gtkblist.c:3620
 msgid "/Tools/Room List"
 msgstr "/Orodja/Seznam sob"
 
-#: ../pidgin/gtkblist.c:3710
+#: ../pidgin/gtkblist.c:3717
 #: ../pidgin/gtkdocklet.c:153
 #, c-format
 msgid "%d unread message from %s\n"
@@ -12197,55 +12247,55 @@
 msgstr[2] "%d neprebrani sporočili od %s\n"
 msgstr[3] "%d neprebrana sporočila od %s\n"
 
-#: ../pidgin/gtkblist.c:3790
+#: ../pidgin/gtkblist.c:3797
 msgid "Manually"
 msgstr "ročno"
 
-#: ../pidgin/gtkblist.c:3792
+#: ../pidgin/gtkblist.c:3799
 msgid "Alphabetically"
 msgstr "abecedno"
 
-#: ../pidgin/gtkblist.c:3793
+#: ../pidgin/gtkblist.c:3800
 msgid "By status"
 msgstr "po stanju"
 
-#: ../pidgin/gtkblist.c:3794
+#: ../pidgin/gtkblist.c:3801
 msgid "By log size"
 msgstr "po obsegu dnevnika"
 
-#: ../pidgin/gtkblist.c:3996
+#: ../pidgin/gtkblist.c:4005
 #: ../pidgin/gtkconn.c:178
 #, c-format
 msgid "%s disconnected"
 msgstr "%s se je odjavil"
 
-#: ../pidgin/gtkblist.c:4006
+#: ../pidgin/gtkblist.c:4015
 msgid "Re-enable Account"
 msgstr "Ponovno omogoči račun"
 
-#: ../pidgin/gtkblist.c:4030
+#: ../pidgin/gtkblist.c:4039
 #, c-format
 msgid "<span color=\"red\">%s disconnected: %s</span>"
 msgstr "<span color=\"red\">%s ni več povezan: %s</span>"
 
-#: ../pidgin/gtkblist.c:4182
+#: ../pidgin/gtkblist.c:4191
 msgid "<b>Username:</b>"
 msgstr "<b>Uporabniško ime:</b>"
 
-#: ../pidgin/gtkblist.c:4189
+#: ../pidgin/gtkblist.c:4198
 msgid "<b>Password:</b>"
 msgstr "<b>Geslo:</b>"
 
-#: ../pidgin/gtkblist.c:4200
+#: ../pidgin/gtkblist.c:4209
 msgid "_Login"
 msgstr "_Prijavi"
 
-#: ../pidgin/gtkblist.c:4285
+#: ../pidgin/gtkblist.c:4292
 msgid "/Accounts"
 msgstr "/Računi"
 
 #. Translators: Please maintain the use of -> and <- to refer to menu heirarchy
-#: ../pidgin/gtkblist.c:4299
+#: ../pidgin/gtkblist.c:4306
 #, c-format
 msgid ""
 "<span weight='bold' size='larger'>Welcome to %s!</span>\n"
@@ -12259,82 +12309,82 @@
 #. set the Show Offline Buddies option. must be done
 #. * after the treeview or faceprint gets mad. -Robot101
 #.
-#: ../pidgin/gtkblist.c:4546
+#: ../pidgin/gtkblist.c:4555
 msgid "/Buddies/Show Offline Buddies"
 msgstr "/Prijatelji/Pokaži prijatelje, ki niso na zvezi"
 
-#: ../pidgin/gtkblist.c:4549
+#: ../pidgin/gtkblist.c:4558
 msgid "/Buddies/Show Empty Groups"
 msgstr "/Prijatelji/Pokaži prazne skupine"
 
-#: ../pidgin/gtkblist.c:4555
+#: ../pidgin/gtkblist.c:4564
 msgid "/Buddies/Show Buddy Details"
 msgstr "/Prijatelji/Pokaži podrobnosti prijatelja"
 
-#: ../pidgin/gtkblist.c:4558
+#: ../pidgin/gtkblist.c:4567
 msgid "/Buddies/Show Idle Times"
 msgstr "/Prijatelji/Pokaži čase nedejavnosti"
 
-#: ../pidgin/gtkblist.c:5427
+#: ../pidgin/gtkblist.c:5444
 msgid "Please enter the screen name of the person you would like to add to your buddy list. You may optionally enter an alias, or nickname,  for the buddy. The alias will be displayed in place of the screen name whenever possible.\n"
 msgstr "Prosim, vnesite pojavno ime osebe, ki jo želite dodati vašemu seznamu prijateljev. Vnesete lahko tudi psevdonim ali vzdevek prijatelja. Kjer bo izvedljivo, bo namesto pojavnega imena prikazan vzdevek.\n"
 
 #. End of account box
-#: ../pidgin/gtkblist.c:5462
+#: ../pidgin/gtkblist.c:5479
 msgid "_Screen name:"
 msgstr "_Pojavno ime:"
 
-#: ../pidgin/gtkblist.c:5484
-#: ../pidgin/gtkblist.c:5838
+#: ../pidgin/gtkblist.c:5501
+#: ../pidgin/gtkblist.c:5855
 msgid "A_lias:"
 msgstr "Psev_donim:"
 
-#: ../pidgin/gtkblist.c:5750
+#: ../pidgin/gtkblist.c:5767
 msgid "This protocol does not support chat rooms."
 msgstr "Ta protokol ne podpira klepetalnic."
 
-#: ../pidgin/gtkblist.c:5766
+#: ../pidgin/gtkblist.c:5783
 msgid "You are not currently signed on with any protocols that have the ability to chat."
 msgstr "Trenutno niste prijavljeni na nobenem izmed protokolov, ki podpirajo pomenke."
 
-#: ../pidgin/gtkblist.c:5807
+#: ../pidgin/gtkblist.c:5824
 msgid "Please enter an alias, and the appropriate information about the chat you would like to add to your buddy list.\n"
 msgstr "Prosim, vnesite psevdonim in ostale informacije za pomenek, ki ga želite dodati na seznam prijateljev.\n"
 
-#: ../pidgin/gtkblist.c:5895
+#: ../pidgin/gtkblist.c:5912
 msgid "Please enter the name of the group to be added."
 msgstr "Prosimo vnesite ime skupine, ki jo želite dodati."
 
-#: ../pidgin/gtkblist.c:6535
+#: ../pidgin/gtkblist.c:6552
 msgid "<PurpleMain>/Accounts/"
 msgstr "<PurpleMain>/Računi/"
 
-#: ../pidgin/gtkblist.c:6559
+#: ../pidgin/gtkblist.c:6576
 msgid "_Edit Account"
 msgstr "_Uredi račun"
 
-#: ../pidgin/gtkblist.c:6572
-#: ../pidgin/gtkconv.c:3024
+#: ../pidgin/gtkblist.c:6589
+#: ../pidgin/gtkconv.c:2982
 msgid "No actions available"
 msgstr "Na voljo ni nobenega ukaza"
 
-#: ../pidgin/gtkblist.c:6580
+#: ../pidgin/gtkblist.c:6597
 msgid "_Disable"
 msgstr "_Onemogoči"
 
-#: ../pidgin/gtkblist.c:6592
+#: ../pidgin/gtkblist.c:6609
 msgid "Enable Account"
 msgstr "Omogoči račun"
 
-#: ../pidgin/gtkblist.c:6598
+#: ../pidgin/gtkblist.c:6615
 msgid "<PurpleMain>/Accounts/Enable Account"
 msgstr "<PurpleMain>/Računi/Omogoči račun"
 
-#: ../pidgin/gtkblist.c:6647
+#: ../pidgin/gtkblist.c:6664
 msgid "/Tools"
 msgstr "/Orodja"
 
-#: ../pidgin/gtkblist.c:6717
+#: ../pidgin/gtkblist.c:6734
 msgid "/Buddies/Sort Buddies"
 msgstr "/Prijatelji/Razvrsti prijatelje"
 
@@ -12349,322 +12399,330 @@
 "\n"
 "%s se ne bo poskušal ponovno prijaviti, dokler ne odpravite napake in ponovno omogočite povezovanje računa."
 
-#: ../pidgin/gtkconv.c:793
-#: ../pidgin/gtkconv.c:819
+#: ../pidgin/gtkconv.c:485
+msgid "Unknown command."
+msgstr "Neznan ukaz."
+
+#: ../pidgin/gtkconv.c:757
+#: ../pidgin/gtkconv.c:783
 msgid "That buddy is not on the same protocol as this chat."
 msgstr "Tisti prijatelj ne uporablja enakega protokola kot ta pogovor."
 
-#: ../pidgin/gtkconv.c:813
+#: ../pidgin/gtkconv.c:777
 msgid "You are not currently signed on with an account that can invite that buddy."
 msgstr "Trenutno niste prijavljeni z nobenim računom, ki lahko doda tega prijatelja."
 
-#: ../pidgin/gtkconv.c:866
+#: ../pidgin/gtkconv.c:830
 msgid "Invite Buddy Into Chat Room"
 msgstr "Povabi prijatelja v pogovorno sobo"
 
 #. Put our happy label in it.
-#: ../pidgin/gtkconv.c:896
+#: ../pidgin/gtkconv.c:860
 msgid "Please enter the name of the user you wish to invite, along with an optional invite message."
 msgstr "Prosim vnesite ime uporabnika, ki ga želite povabiti, dodate pa lahko še povabilo."
 
-#: ../pidgin/gtkconv.c:917
+#: ../pidgin/gtkconv.c:881
 msgid "_Buddy:"
 msgstr "_Prijatelj:"
 
-#: ../pidgin/gtkconv.c:937
-#: ../pidgin/gtksavedstatuses.c:1141
-#: ../pidgin/gtksavedstatuses.c:1477
+#: ../pidgin/gtkconv.c:901
+#: ../pidgin/gtksavedstatuses.c:1193
+#: ../pidgin/gtksavedstatuses.c:1525
 msgid "_Message:"
 msgstr "_Sporočilo:"
 
-#: ../pidgin/gtkconv.c:994
-#: ../pidgin/gtkconv.c:2548
+#: ../pidgin/gtkconv.c:958
+#: ../pidgin/gtkconv.c:2506
 #: ../pidgin/gtkdebug.c:218
 #: ../pidgin/gtkft.c:542
 msgid "Unable to open file."
 msgstr "Datoteke ni bilo mogoče odprti."
 
-#: ../pidgin/gtkconv.c:1000
+#: ../pidgin/gtkconv.c:964
 #, c-format
 msgid "<h1>Conversation with %s</h1>\n"
 msgstr "<h1>Pogovor z %s</h1>\n"
 
-#: ../pidgin/gtkconv.c:1036
+#: ../pidgin/gtkconv.c:1000
 msgid "Save Conversation"
 msgstr "Shrani pogovor"
 
-#: ../pidgin/gtkconv.c:1185
+#: ../pidgin/gtkconv.c:1149
 #: ../pidgin/gtkdebug.c:166
 #: ../pidgin/gtkdebug.c:742
 msgid "Find"
 msgstr "Najdi"
 
-#: ../pidgin/gtkconv.c:1211
+#: ../pidgin/gtkconv.c:1175
 #: ../pidgin/gtkdebug.c:194
 msgid "_Search for:"
 msgstr "_Išči:"
 
-#: ../pidgin/gtkconv.c:1394
+#: ../pidgin/gtkconv.c:1358
 msgid "Logging started. Future messages in this conversation will be logged."
 msgstr "Začelo se je beleženje v dnevnik. Vsa nadaljna sporočila pogovora bodo zabeležena."
 
-#: ../pidgin/gtkconv.c:1402
+#: ../pidgin/gtkconv.c:1366
 msgid "Logging stopped. Future messages in this conversation will not be logged."
 msgstr "Beleženje v dnevnik ustavljeno. Nadaljna sporočila pogovora ne bodo zabeležena."
 
-#: ../pidgin/gtkconv.c:1650
+#: ../pidgin/gtkconv.c:1614
 msgid "Un-Ignore"
 msgstr "Ne prezri"
 
-#: ../pidgin/gtkconv.c:1653
+#: ../pidgin/gtkconv.c:1617
 msgid "Ignore"
 msgstr "Prezri"
 
-#: ../pidgin/gtkconv.c:1673
+#: ../pidgin/gtkconv.c:1637
 msgid "Get Away Message"
 msgstr "Sporočilo o odsotnosti"
 
-#: ../pidgin/gtkconv.c:1696
+#: ../pidgin/gtkconv.c:1660
 msgid "Last said"
 msgstr "Nazadnje rečeno"
 
-#: ../pidgin/gtkconv.c:2556
+#: ../pidgin/gtkconv.c:2514
 msgid "Unable to save icon file to disk."
 msgstr "Datoteke z ikonami ni bilo mogoče shraniti."
 
-#: ../pidgin/gtkconv.c:2607
+#: ../pidgin/gtkconv.c:2565
 msgid "Save Icon"
 msgstr "Shrani ikono"
 
-#: ../pidgin/gtkconv.c:2659
+#: ../pidgin/gtkconv.c:2617
 msgid "Animate"
 msgstr "Animiraj"
 
-#: ../pidgin/gtkconv.c:2664
+#: ../pidgin/gtkconv.c:2622
 msgid "Hide Icon"
 msgstr "Skrij ikono"
 
-#: ../pidgin/gtkconv.c:2667
+#: ../pidgin/gtkconv.c:2625
 msgid "Save Icon As..."
 msgstr "Shrani ikono kot ..."
 
-#: ../pidgin/gtkconv.c:2671
+#: ../pidgin/gtkconv.c:2629
 msgid "Set Custom Icon..."
 msgstr "Nastavi ikono po meri ..."
 
-#: ../pidgin/gtkconv.c:2684
+#: ../pidgin/gtkconv.c:2642
 msgid "Remove Custom Icon"
 msgstr "Odstrani ikono po meri"
 
 #. Conversation menu
-#: ../pidgin/gtkconv.c:2826
+#: ../pidgin/gtkconv.c:2784
 msgid "/_Conversation"
 msgstr "/_Pogovor"
 
-#: ../pidgin/gtkconv.c:2828
+#: ../pidgin/gtkconv.c:2786
 msgid "/Conversation/New Instant _Message..."
 msgstr "/Pogovor/N_ovo neposredno sporočilo ..."
 
-#: ../pidgin/gtkconv.c:2833
+#: ../pidgin/gtkconv.c:2791
 msgid "/Conversation/_Find..."
 msgstr "/Pogovor/_Najdi ..."
 
-#: ../pidgin/gtkconv.c:2835
+#: ../pidgin/gtkconv.c:2793
 msgid "/Conversation/View _Log"
 msgstr "/Pogovor/Pokaži _dnevnik ..."
 
-#: ../pidgin/gtkconv.c:2836
+#: ../pidgin/gtkconv.c:2794
 msgid "/Conversation/_Save As..."
 msgstr "/Pogovor/_Shrani kot ..."
 
-#: ../pidgin/gtkconv.c:2838
+#: ../pidgin/gtkconv.c:2796
 msgid "/Conversation/Clea_r Scrollback"
 msgstr "/Pogovor/Po_čisti pogovor"
 
-#: ../pidgin/gtkconv.c:2842
+#: ../pidgin/gtkconv.c:2800
 msgid "/Conversation/Se_nd File..."
 msgstr "/Pogovor/_Pošlji datoteko ..."
 
-#: ../pidgin/gtkconv.c:2843
+#: ../pidgin/gtkconv.c:2801
 msgid "/Conversation/Add Buddy _Pounce..."
 msgstr "/Pogovor/Dodaj _opozorilo prijatelja ..."
 
-#: ../pidgin/gtkconv.c:2845
+#: ../pidgin/gtkconv.c:2803
 msgid "/Conversation/_Get Info"
 msgstr "/Pogovor/_Informacije"
 
-#: ../pidgin/gtkconv.c:2847
+#: ../pidgin/gtkconv.c:2805
 msgid "/Conversation/In_vite..."
 msgstr "/Pogovor/Pova_bi ..."
 
-#: ../pidgin/gtkconv.c:2849
+#: ../pidgin/gtkconv.c:2807
 msgid "/Conversation/M_ore"
 msgstr "/Pogovor/_Več"
 
-#: ../pidgin/gtkconv.c:2853
+#: ../pidgin/gtkconv.c:2811
 msgid "/Conversation/Al_ias..."
 msgstr "/Pogovor/_Vzdevek ..."
 
-#: ../pidgin/gtkconv.c:2855
+#: ../pidgin/gtkconv.c:2813
 msgid "/Conversation/_Block..."
 msgstr "/Pogovor/Zavr_ni ..."
 
-#: ../pidgin/gtkconv.c:2857
+#: ../pidgin/gtkconv.c:2815
 msgid "/Conversation/_Unblock..."
 msgstr "/Pogovor/Pre_kliči zavrnitev ..."
 
-#: ../pidgin/gtkconv.c:2859
+#: ../pidgin/gtkconv.c:2817
 msgid "/Conversation/_Add..."
 msgstr "/Pogovor/Dod_aj ..."
 
-#: ../pidgin/gtkconv.c:2861
+#: ../pidgin/gtkconv.c:2819
 msgid "/Conversation/_Remove..."
 msgstr "/Pogovor/Odst_rani ..."
 
-#: ../pidgin/gtkconv.c:2866
+#: ../pidgin/gtkconv.c:2824
 msgid "/Conversation/Insert Lin_k..."
 msgstr "/Pogovor/Vstavi pove_zavo ..."
 
-#: ../pidgin/gtkconv.c:2868
+#: ../pidgin/gtkconv.c:2826
 msgid "/Conversation/Insert Imag_e..."
 msgstr "/Pogovor/Vstavi _sliko ..."
 
-#: ../pidgin/gtkconv.c:2874
+#: ../pidgin/gtkconv.c:2832
 msgid "/Conversation/_Close"
 msgstr "/Pogovor/_Zapri"
 
 #. Options
-#: ../pidgin/gtkconv.c:2878
+#: ../pidgin/gtkconv.c:2836
 msgid "/_Options"
 msgstr "/M_ožnosti"
 
-#: ../pidgin/gtkconv.c:2879
+#: ../pidgin/gtkconv.c:2837
 msgid "/Options/Enable _Logging"
 msgstr "/Možnosti/Vk_ljuči dnevnik"
 
-#: ../pidgin/gtkconv.c:2880
+#: ../pidgin/gtkconv.c:2838
 msgid "/Options/Enable _Sounds"
 msgstr "/Možnosti/Vključi _zvoke"
 
-#: ../pidgin/gtkconv.c:2881
+#: ../pidgin/gtkconv.c:2839
 msgid "/Options/Show Buddy _Icon"
 msgstr "/Možnosti/Pokaži _ikono prijatelja"
 
-#: ../pidgin/gtkconv.c:2883
+#: ../pidgin/gtkconv.c:2841
 msgid "/Options/Show Formatting _Toolbars"
 msgstr "/Možnosti/Pokaži orodno vrstico za _oblikovanje"
 
-#: ../pidgin/gtkconv.c:2884
+#: ../pidgin/gtkconv.c:2842
 msgid "/Options/Show Ti_mestamps"
 msgstr "/Možnosti/Pokaži _časovne žige"
 
-#: ../pidgin/gtkconv.c:2960
+#: ../pidgin/gtkconv.c:2918
 msgid "/Conversation/More"
 msgstr "/Pogovor/Več"
 
+#: ../pidgin/gtkconv.c:3026
+msgid "/Options"
+msgstr "/Možnosti"
+
 #. The menubar has been deactivated. Make sure the 'More' submenu is regenerated next time
 #. * the 'Conversation' menu pops up.
 #. Make sure the 'Conversation -> More' menuitems are regenerated whenever
 #. * the 'Conversation' menu pops up because the entries can change after the
 #. * conversation is created.
-#: ../pidgin/gtkconv.c:3048
-#: ../pidgin/gtkconv.c:3080
+#: ../pidgin/gtkconv.c:3061
+#: ../pidgin/gtkconv.c:3093
 msgid "/Conversation"
 msgstr "/Pogovor"
 
-#: ../pidgin/gtkconv.c:3088
+#: ../pidgin/gtkconv.c:3101
 msgid "/Conversation/View Log"
 msgstr "/Pogovor/Pokaži dnevnik"
 
-#: ../pidgin/gtkconv.c:3094
+#: ../pidgin/gtkconv.c:3107
 msgid "/Conversation/Send File..."
 msgstr "/Pogovor/Pošlji datoteko ..."
 
-#: ../pidgin/gtkconv.c:3098
+#: ../pidgin/gtkconv.c:3111
 msgid "/Conversation/Add Buddy Pounce..."
 msgstr "/Pogovor/Dodaj opozorilo prijatelja ..."
 
-#: ../pidgin/gtkconv.c:3104
+#: ../pidgin/gtkconv.c:3117
 msgid "/Conversation/Get Info"
 msgstr "/Pogovor/Informacije"
 
-#: ../pidgin/gtkconv.c:3108
+#: ../pidgin/gtkconv.c:3121
 msgid "/Conversation/Invite..."
 msgstr "/Pogovor/Povabi ..."
 
-#: ../pidgin/gtkconv.c:3114
+#: ../pidgin/gtkconv.c:3127
 msgid "/Conversation/Alias..."
 msgstr "/Pogovor/Psevdonim ..."
 
-#: ../pidgin/gtkconv.c:3118
+#: ../pidgin/gtkconv.c:3131
 msgid "/Conversation/Block..."
 msgstr "/Pogovor/Zavrni ..."
 
-#: ../pidgin/gtkconv.c:3122
+#: ../pidgin/gtkconv.c:3135
 msgid "/Conversation/Unblock..."
 msgstr "/Pogovor/Prekliči zavrnitev ..."
 
-#: ../pidgin/gtkconv.c:3126
+#: ../pidgin/gtkconv.c:3139
 msgid "/Conversation/Add..."
 msgstr "/Pogovor/Dodaj ..."
 
-#: ../pidgin/gtkconv.c:3130
+#: ../pidgin/gtkconv.c:3143
 msgid "/Conversation/Remove..."
 msgstr "/Pogovor/Odstrani ..."
 
-#: ../pidgin/gtkconv.c:3136
+#: ../pidgin/gtkconv.c:3149
 msgid "/Conversation/Insert Link..."
 msgstr "/Pogovor/Vstavi povezavo ..."
 
-#: ../pidgin/gtkconv.c:3140
+#: ../pidgin/gtkconv.c:3153
 msgid "/Conversation/Insert Image..."
 msgstr "/Pogovor/Vstavi sliko ..."
 
-#: ../pidgin/gtkconv.c:3146
+#: ../pidgin/gtkconv.c:3159
 msgid "/Options/Enable Logging"
 msgstr "/Možnosti/Vključi dnevnik"
 
-#: ../pidgin/gtkconv.c:3149
+#: ../pidgin/gtkconv.c:3162
 msgid "/Options/Enable Sounds"
 msgstr "/Možnosti/Vključi zvoke"
 
-#: ../pidgin/gtkconv.c:3162
+#: ../pidgin/gtkconv.c:3175
 msgid "/Options/Show Formatting Toolbars"
 msgstr "/Možnosti/Pokaži orodno vrstico za oblikovanje"
 
-#: ../pidgin/gtkconv.c:3165
+#: ../pidgin/gtkconv.c:3178
 msgid "/Options/Show Timestamps"
 msgstr "/Možnosti/Pokaži časovne žige"
 
-#: ../pidgin/gtkconv.c:3168
+#: ../pidgin/gtkconv.c:3181
 msgid "/Options/Show Buddy Icon"
 msgstr "/Možnosti/Pokaži ikono prijatelja"
 
-#: ../pidgin/gtkconv.c:3252
-#: ../pidgin/gtkconv.c:3294
+#: ../pidgin/gtkconv.c:3265
+#: ../pidgin/gtkconv.c:3307
 msgid "User is typing..."
 msgstr "Uporabnik tipka ..."
 
-#: ../pidgin/gtkconv.c:3297
+#: ../pidgin/gtkconv.c:3310
 msgid "User has typed something and stopped"
 msgstr "Uporabnik je napisal nekaj in se ustavil."
 
 #. Build the Send To menu
-#: ../pidgin/gtkconv.c:3479
+#: ../pidgin/gtkconv.c:3492
 msgid "_Send To"
 msgstr "_Pošlji k"
 
-#: ../pidgin/gtkconv.c:4193
+#: ../pidgin/gtkconv.c:4206
 msgid "_Send"
 msgstr "_Pošlji"
 
 #. Setup the label telling how many people are in the room.
-#: ../pidgin/gtkconv.c:4344
+#: ../pidgin/gtkconv.c:4310
 msgid "0 people in room"
 msgstr "0 oseb v sobi"
 
-#: ../pidgin/gtkconv.c:5536
-#: ../pidgin/gtkconv.c:5657
+#: ../pidgin/gtkconv.c:5496
+#: ../pidgin/gtkconv.c:5617
 #, c-format
 msgid "%d person in room"
 msgid_plural "%d people in room"
@@ -12673,74 +12731,78 @@
 msgstr[2] "%d osebi v sobi"
 msgstr[3] "%d osebe v sobi"
 
-#: ../pidgin/gtkconv.c:6231
-#: ../pidgin/gtkstatusbox.c:657
+#: ../pidgin/gtkconv.c:6216
+#: ../pidgin/gtkstatusbox.c:659
 msgid "Typing"
 msgstr "Tipka"
 
-#: ../pidgin/gtkconv.c:6237
+#: ../pidgin/gtkconv.c:6222
 msgid "Stopped Typing"
 msgstr "Prenehal tipkati"
 
-#: ../pidgin/gtkconv.c:6242
+#: ../pidgin/gtkconv.c:6227
 msgid "Nick Said"
 msgstr "Vzdevek pravi"
 
-#: ../pidgin/gtkconv.c:6247
+#: ../pidgin/gtkconv.c:6232
 #: ../pidgin/gtkdocklet.c:492
 msgid "Unread Messages"
 msgstr "Neprebrana sporočila"
 
-#: ../pidgin/gtkconv.c:6252
+#: ../pidgin/gtkconv.c:6237
 msgid "New Event"
 msgstr "Nov dogodek"
 
-#: ../pidgin/gtkconv.c:7384
+#: ../pidgin/gtkconv.c:7210
+msgid "clear: Clears all conversation scrollbacks."
+msgstr "clear: Počisti vse izpisane replike pomenka."
+
+#: ../pidgin/gtkconv.c:7374
 msgid "Confirm close"
 msgstr "Potrdi zaprtje"
 
-#: ../pidgin/gtkconv.c:7416
+#: ../pidgin/gtkconv.c:7406
 msgid "You have unread messages. Are you sure you want to close the window?"
 msgstr "Imate neprebrana sporočila. Ste prepričani, da želite zapreti okno?"
 
-#: ../pidgin/gtkconv.c:7938
+#: ../pidgin/gtkconv.c:7967
 msgid "Close other tabs"
 msgstr "Zapri druge zavihke"
 
-#: ../pidgin/gtkconv.c:7944
+#: ../pidgin/gtkconv.c:7973
 msgid "Close all tabs"
 msgstr "Zapri vse zavihke"
 
-#: ../pidgin/gtkconv.c:7952
+#: ../pidgin/gtkconv.c:7981
 msgid "Detach this tab"
 msgstr "Odpni ta zavihek"
 
-#: ../pidgin/gtkconv.c:7958
+#: ../pidgin/gtkconv.c:7987
 msgid "Close this tab"
 msgstr "Zapri ta zavihek"
 
-#: ../pidgin/gtkconv.c:8344
+#: ../pidgin/gtkconv.c:8433
 msgid "Close conversation"
 msgstr "Zapri pogovor"
 
-#: ../pidgin/gtkconv.c:8867
+#: ../pidgin/gtkconv.c:8957
 msgid "Last created window"
 msgstr "zadnje odprto okno"
 
-#: ../pidgin/gtkconv.c:8869
+#: ../pidgin/gtkconv.c:8959
 msgid "Separate IM and Chat windows"
 msgstr "loči okna za klepet in zasebni pomenek"
 
-#: ../pidgin/gtkconv.c:8871
-#: ../pidgin/gtkprefs.c:1340
+#: ../pidgin/gtkconv.c:8961
+#: ../pidgin/gtkprefs.c:1410
 msgid "New window"
 msgstr "novo okno"
 
-#: ../pidgin/gtkconv.c:8873
+#: ../pidgin/gtkconv.c:8963
 msgid "By group"
 msgstr "po skupinah"
 
-#: ../pidgin/gtkconv.c:8875
+#: ../pidgin/gtkconv.c:8965
 msgid "By account"
 msgstr "po vrsti računa"
 
@@ -12877,7 +12939,7 @@
 
 #: ../pidgin/gtkdialogs.c:125
 #: ../pidgin/gtkdialogs.c:126
-#: ../pidgin/gtkdialogs.c:211
+#: ../pidgin/gtkdialogs.c:213
 msgid "Bulgarian"
 msgstr "bolgarsko"
 
@@ -12893,8 +12955,8 @@
 msgstr "bosansko"
 
 #: ../pidgin/gtkdialogs.c:132
-#: ../pidgin/gtkdialogs.c:212
-#: ../pidgin/gtkdialogs.c:213
+#: ../pidgin/gtkdialogs.c:214
+#: ../pidgin/gtkdialogs.c:215
 msgid "Catalan"
 msgstr "katalonsko"
 
@@ -12904,7 +12966,7 @@
 msgstr "valencijansko-katalonsko"
 
 #: ../pidgin/gtkdialogs.c:135
-#: ../pidgin/gtkdialogs.c:214
+#: ../pidgin/gtkdialogs.c:216
 msgid "Czech"
 msgstr "češko"
 
@@ -12915,7 +12977,7 @@
 
 #: ../pidgin/gtkdialogs.c:138
 #: ../pidgin/gtkdialogs.c:139
-#: ../pidgin/gtkdialogs.c:215
+#: ../pidgin/gtkdialogs.c:217
 msgid "German"
 msgstr "nemško"
 
@@ -12947,10 +13009,10 @@
 msgstr "esperanto"
 
 #: ../pidgin/gtkdialogs.c:149
-#: ../pidgin/gtkdialogs.c:216
-#: ../pidgin/gtkdialogs.c:217
 #: ../pidgin/gtkdialogs.c:218
 #: ../pidgin/gtkdialogs.c:219
+#: ../pidgin/gtkdialogs.c:220
+#: ../pidgin/gtkdialogs.c:221
 msgid "Spanish"
 msgstr "špansko"
 
@@ -12966,303 +13028,309 @@
 msgstr "perzijsko"
 
 #: ../pidgin/gtkdialogs.c:155
-#: ../pidgin/gtkdialogs.c:220
-#: ../pidgin/gtkdialogs.c:221
+#: ../pidgin/gtkdialogs.c:222
+#: ../pidgin/gtkdialogs.c:223
 msgid "Finnish"
 msgstr "finsko"
 
 #: ../pidgin/gtkdialogs.c:156
-#: ../pidgin/gtkdialogs.c:222
-#: ../pidgin/gtkdialogs.c:223
 #: ../pidgin/gtkdialogs.c:224
 #: ../pidgin/gtkdialogs.c:225
+#: ../pidgin/gtkdialogs.c:226
+#: ../pidgin/gtkdialogs.c:227
 msgid "French"
 msgstr "francosko"
 
 #: ../pidgin/gtkdialogs.c:157
+#: ../pidgin/gtkdialogs.c:158
 msgid "Galician"
 msgstr "galicijsko"
 
-#: ../pidgin/gtkdialogs.c:158
-#: ../pidgin/gtkdialogs.c:159
-msgid "Gujarati"
-msgstr "gujaratsko"
-
 #: ../pidgin/gtkdialogs.c:159
-msgid "Gujarati Language Team"
-msgstr "prevajalska skupina za Gujarati"
+#: ../pidgin/gtkdialogs.c:160
+msgid "Gujarati"
+msgstr "gujaratsko"
 
 #: ../pidgin/gtkdialogs.c:160
-#: ../pidgin/gtkdialogs.c:226
+msgid "Gujarati Language Team"
+msgstr "prevajalska skupina za Gujarati"
+
+#: ../pidgin/gtkdialogs.c:161
+#: ../pidgin/gtkdialogs.c:228
 msgid "Hebrew"
 msgstr "hebrejsko"
 
-#: ../pidgin/gtkdialogs.c:161
-msgid "Hindi"
-msgstr "hindujsko"
-
 #: ../pidgin/gtkdialogs.c:162
-msgid "Hungarian"
-msgstr "madžarsko"
+msgid "Hindi"
+msgstr "hindujsko"
 
 #: ../pidgin/gtkdialogs.c:163
+msgid "Hungarian"
+msgstr "madžarsko"
+
+#: ../pidgin/gtkdialogs.c:164
 msgid "Indonesian"
 msgstr "indonezijsko"
 
-#: ../pidgin/gtkdialogs.c:164
-#: ../pidgin/gtkdialogs.c:227
+#: ../pidgin/gtkdialogs.c:165
+#: ../pidgin/gtkdialogs.c:229
 msgid "Italian"
 msgstr "italijansko"
 
-#: ../pidgin/gtkdialogs.c:165
-#: ../pidgin/gtkdialogs.c:228
-#: ../pidgin/gtkdialogs.c:229
-#: ../pidgin/gtkdialogs.c:230
-msgid "Japanese"
-msgstr "japonsko"
-
-#: ../pidgin/gtkdialogs.c:166
-#: ../pidgin/gtkdialogs.c:231
-msgid "Georgian"
-msgstr "gruzijsko"
-
 #: ../pidgin/gtkdialogs.c:166
-msgid "Ubuntu Georgian Translators"
-msgstr "gruzijski prevajalci za Ubuntu"
+#: ../pidgin/gtkdialogs.c:230
+#: ../pidgin/gtkdialogs.c:231
+#: ../pidgin/gtkdialogs.c:232
+msgid "Japanese"
+msgstr "japonsko"
 
 #: ../pidgin/gtkdialogs.c:167
+#: ../pidgin/gtkdialogs.c:233
+msgid "Georgian"
+msgstr "gruzijsko"
+
+#: ../pidgin/gtkdialogs.c:167
+msgid "Ubuntu Georgian Translators"
+msgstr "gruzijski prevajalci za Ubuntu"
+
+#: ../pidgin/gtkdialogs.c:168
 msgid "Kannada"
 msgstr "kannadsko"
 
-#: ../pidgin/gtkdialogs.c:167
+#: ../pidgin/gtkdialogs.c:168
 msgid "Kannada Translation team"
 msgstr "prevajalska skupina za Kannado"
 
-#: ../pidgin/gtkdialogs.c:168
-#: ../pidgin/gtkdialogs.c:232
+#: ../pidgin/gtkdialogs.c:169
+#: ../pidgin/gtkdialogs.c:234
+#: ../pidgin/gtkdialogs.c:235
 msgid "Korean"
 msgstr "korejsko"
 
-#: ../pidgin/gtkdialogs.c:169
 #: ../pidgin/gtkdialogs.c:170
 #: ../pidgin/gtkdialogs.c:171
+#: ../pidgin/gtkdialogs.c:172
 msgid "Kurdish"
 msgstr "kurdsko"
 
-#: ../pidgin/gtkdialogs.c:172
-#: ../pidgin/gtkdialogs.c:233
-#: ../pidgin/gtkdialogs.c:234
+#: ../pidgin/gtkdialogs.c:173
+#: ../pidgin/gtkdialogs.c:236
+#: ../pidgin/gtkdialogs.c:237
 msgid "Lithuanian"
 msgstr "litvansko"
 
-#: ../pidgin/gtkdialogs.c:173
 #: ../pidgin/gtkdialogs.c:174
-#: ../pidgin/gtkdialogs.c:235
+#: ../pidgin/gtkdialogs.c:175
+#: ../pidgin/gtkdialogs.c:238
 msgid "Macedonian"
 msgstr "makedonsko"
 
-#: ../pidgin/gtkdialogs.c:175
+#: ../pidgin/gtkdialogs.c:176
 msgid "Bokmål Norwegian"
 msgstr "norveško (Bokmål)"
 
-#: ../pidgin/gtkdialogs.c:176
+#: ../pidgin/gtkdialogs.c:177
 msgid "Nepali"
 msgstr "nepalsko"
 
-#: ../pidgin/gtkdialogs.c:177
+#: ../pidgin/gtkdialogs.c:178
 msgid "Dutch, Flemish"
 msgstr "nizozemsko, flamsko"
 
-#: ../pidgin/gtkdialogs.c:178
-msgid "Norwegian"
-msgstr "norveško"
-
 #: ../pidgin/gtkdialogs.c:179
+msgid "Norwegian"
+msgstr "norveško"
+
 #: ../pidgin/gtkdialogs.c:180
+msgid "Norwegian Nynorsk"
+msgstr "norveško (Nyorsk)"
+
 #: ../pidgin/gtkdialogs.c:181
-#: ../pidgin/gtkdialogs.c:236
+#: ../pidgin/gtkdialogs.c:182
+#: ../pidgin/gtkdialogs.c:183
+#: ../pidgin/gtkdialogs.c:239
 msgid "Polish"
 msgstr "poljsko"
 
-#: ../pidgin/gtkdialogs.c:182
+#: ../pidgin/gtkdialogs.c:184
 msgid "Portuguese"
 msgstr "portugalsko"
 
-#: ../pidgin/gtkdialogs.c:183
+#: ../pidgin/gtkdialogs.c:185
 msgid "Portuguese-Brazil"
 msgstr "portugalsko (Brazilija)"
 
-#: ../pidgin/gtkdialogs.c:184
-msgid "Pashto"
-msgstr "paštunsko"
-
-#: ../pidgin/gtkdialogs.c:185
-msgid "Romanian"
-msgstr "romunsko"
-
 #: ../pidgin/gtkdialogs.c:186
-#: ../pidgin/gtkdialogs.c:237
-#: ../pidgin/gtkdialogs.c:238
+msgid "Pashto"
+msgstr "paštunsko"
+
+#: ../pidgin/gtkdialogs.c:187
+msgid "Romanian"
+msgstr "romunsko"
+
+#: ../pidgin/gtkdialogs.c:188
+#: ../pidgin/gtkdialogs.c:240
+#: ../pidgin/gtkdialogs.c:241
 msgid "Russian"
 msgstr "rusko"
 
-#: ../pidgin/gtkdialogs.c:187
-#: ../pidgin/gtkdialogs.c:188
-#: ../pidgin/gtkdialogs.c:239
-#: ../pidgin/gtkdialogs.c:240
-#: ../pidgin/gtkdialogs.c:241
+#: ../pidgin/gtkdialogs.c:189
+#: ../pidgin/gtkdialogs.c:190
+#: ../pidgin/gtkdialogs.c:242
+#: ../pidgin/gtkdialogs.c:243
+#: ../pidgin/gtkdialogs.c:244
 msgid "Slovak"
 msgstr "slovaško"
 
-#: ../pidgin/gtkdialogs.c:189
-#: ../pidgin/gtkdialogs.c:242
+#: ../pidgin/gtkdialogs.c:191
+#: ../pidgin/gtkdialogs.c:245
 msgid "Slovenian"
 msgstr "slovensko"
 
-#: ../pidgin/gtkdialogs.c:190
+#: ../pidgin/gtkdialogs.c:192
 msgid "Albanian"
 msgstr "albansko"
 
-#: ../pidgin/gtkdialogs.c:191
-#: ../pidgin/gtkdialogs.c:192
-msgid "Serbian"
-msgstr "srbsko"
-
 #: ../pidgin/gtkdialogs.c:193
-#: ../pidgin/gtkdialogs.c:243
+#: ../pidgin/gtkdialogs.c:194
+msgid "Serbian"
+msgstr "srbsko"
+
+#: ../pidgin/gtkdialogs.c:195
+#: ../pidgin/gtkdialogs.c:246
 msgid "Swedish"
 msgstr "švedsko"
 
-#: ../pidgin/gtkdialogs.c:194
+#: ../pidgin/gtkdialogs.c:196
 msgid "Tamil"
 msgstr "tamilsko"
 
-#: ../pidgin/gtkdialogs.c:195
+#: ../pidgin/gtkdialogs.c:197
 msgid "Telugu"
 msgstr "teluško"
 
-#: ../pidgin/gtkdialogs.c:196
-msgid "Thai"
-msgstr "tajsko"
-
-#: ../pidgin/gtkdialogs.c:197
-#: ../pidgin/gtkdialogs.c:244
-msgid "Turkish"
-msgstr "turško"
-
-#: ../pidgin/gtkdialogs.c:198
-msgid "Vietnamese"
-msgstr "vietnamsko"
-
 #: ../pidgin/gtkdialogs.c:198
-msgid "T.M.Thanh and the Gnome-Vi Team"
-msgstr "T.M.Thanh in ekipa Gnome-Vi"
+msgid "Thai"
+msgstr "tajsko"
 
 #: ../pidgin/gtkdialogs.c:199
-#: ../pidgin/gtkdialogs.c:245
+#: ../pidgin/gtkdialogs.c:247
+msgid "Turkish"
+msgstr "turško"
+
+#: ../pidgin/gtkdialogs.c:200
+msgid "Vietnamese"
+msgstr "vietnamsko"
+
+#: ../pidgin/gtkdialogs.c:200
+msgid "T.M.Thanh and the Gnome-Vi Team"
+msgstr "T.M.Thanh in ekipa Gnome-Vi"
+
+#: ../pidgin/gtkdialogs.c:201
+#: ../pidgin/gtkdialogs.c:248
 msgid "Simplified Chinese"
 msgstr "poenostavljeno kitajsko"
 
-#: ../pidgin/gtkdialogs.c:200
-#: ../pidgin/gtkdialogs.c:201
 #: ../pidgin/gtkdialogs.c:202
+#: ../pidgin/gtkdialogs.c:203
+#: ../pidgin/gtkdialogs.c:204
 msgid "Hong Kong Chinese"
 msgstr "hongkonško kitajsko"
 
-#: ../pidgin/gtkdialogs.c:203
-#: ../pidgin/gtkdialogs.c:204
-#: ../pidgin/gtkdialogs.c:246
+#: ../pidgin/gtkdialogs.c:205
+#: ../pidgin/gtkdialogs.c:206
+#: ../pidgin/gtkdialogs.c:249
 msgid "Traditional Chinese"
 msgstr "tradicionalno kitajsko"
 
-#: ../pidgin/gtkdialogs.c:210
+#: ../pidgin/gtkdialogs.c:212
 msgid "Amharic"
 msgstr "amharsko"
 
-#: ../pidgin/gtkdialogs.c:331
+#: ../pidgin/gtkdialogs.c:334
 #, c-format
 msgid "About %s"
 msgstr "O programu %s"
 
-#: ../pidgin/gtkdialogs.c:369
+#: ../pidgin/gtkdialogs.c:372
 #, c-format
 msgid "%s is a graphical modular messaging client based on libpurple which is capable of connecting to AIM, MSN, Yahoo!, XMPP, ICQ, IRC, SILC, SIP/SIMPLE, Novell GroupWise, Lotus Sametime, Bonjour, Zephyr, Gadu-Gadu, and QQ all at once.  It is written using GTK+.<BR><BR>You may modify and redistribute the program under the terms of the GPL (version 2 or later).  A copy of the GPL is contained in the 'COPYING' file distributed with %s.  %s is copyrighted by its contributors.  See the 'COPYRIGHT' file for the complete list of contributors.  We provide no warranty for this program.<BR><BR>"
 msgstr "%s je modularen odjemalec za neposredna sporočila, ki lahko hkrati uporablja protokole AIM, MSN, Yahoo!, XMPPr, ICQ, IRC, SILC, SIP/SIMPLE, Novell GroupWise, Lotus Sametime, Bonjour, Zephyr, Gadu-Gadu in QQ. Napisan je s pomočjo Gtk+.<BR><BR>Program lahko spreminjate in razširjate pod pogoji licence GPL (različice 2 ali novejše).  Kopija licence GPL je v datoteki 'COPYING', ki je distribuirana s programom %s.  %s je zaščitena znamka svojih avtorjev.  Oglejte si datoteko 'COPYRIGHT' za popoln seznam sodelavcev.  Za program ni na voljo nikakršna garancija.<BR><BR>"
 
-#: ../pidgin/gtkdialogs.c:384
+#: ../pidgin/gtkdialogs.c:387
 msgid "<FONT SIZE=\"4\">IRC:</FONT> #pidgin on irc.freenode.net<BR><BR>"
 msgstr "<FONT SIZE=\"4\">IRC:</FONT> #pidgin na irc.freenode.net<BR><BR>"
 
-#: ../pidgin/gtkdialogs.c:389
+#: ../pidgin/gtkdialogs.c:392
 msgid "Current Developers"
 msgstr "Trenutni razvijalci"
 
-#: ../pidgin/gtkdialogs.c:404
+#: ../pidgin/gtkdialogs.c:407
 msgid "Crazy Patch Writers"
 msgstr "Nori razvijalci obližev"
 
-#: ../pidgin/gtkdialogs.c:419
+#: ../pidgin/gtkdialogs.c:422
 msgid "Retired Developers"
 msgstr "Upokojeni razvijalci"
 
-#: ../pidgin/gtkdialogs.c:434
+#: ../pidgin/gtkdialogs.c:437
 msgid "Artists"
 msgstr "Oblikovalci"
 
-#: ../pidgin/gtkdialogs.c:449
+#: ../pidgin/gtkdialogs.c:452
 msgid "Current Translators"
 msgstr "Trenutni prevajalci"
 
-#: ../pidgin/gtkdialogs.c:469
+#: ../pidgin/gtkdialogs.c:472
 msgid "Past Translators"
 msgstr "Nekdanji prevajalci"
 
-#: ../pidgin/gtkdialogs.c:487
+#: ../pidgin/gtkdialogs.c:490
 msgid "Debugging Information"
 msgstr "Informacije za razhroščevanje"
 
-#: ../pidgin/gtkdialogs.c:865
+#: ../pidgin/gtkdialogs.c:859
 msgid "Get User Info"
 msgstr "Informacije o uporabniku"
 
-#: ../pidgin/gtkdialogs.c:867
+#: ../pidgin/gtkdialogs.c:861
 msgid "Please enter the screen name or alias of the person whose info you would like to view."
 msgstr "Vnesite pojavno ime ali psevdonim osebe, o kateri si želite ogledati podatke."
 
-#: ../pidgin/gtkdialogs.c:957
+#: ../pidgin/gtkdialogs.c:951
 msgid "View User Log"
 msgstr "Prikaži uporabniški dnevnik"
 
-#: ../pidgin/gtkdialogs.c:959
+#: ../pidgin/gtkdialogs.c:953
 msgid "Please enter the screen name or alias of the person whose log you would like to view."
 msgstr "Vnesite pojavno ime ali psevdonim osebe, o kateri želite pridobiti dnevnik."
 
-#: ../pidgin/gtkdialogs.c:979
+#: ../pidgin/gtkdialogs.c:973
 msgid "Alias Contact"
 msgstr "Psevdonim stika"
 
-#: ../pidgin/gtkdialogs.c:980
+#: ../pidgin/gtkdialogs.c:974
 msgid "Enter an alias for this contact."
 msgstr "Vnesite psevdonim za ta pomenek."
 
-#: ../pidgin/gtkdialogs.c:1002
+#: ../pidgin/gtkdialogs.c:996
 #, c-format
 msgid "Enter an alias for %s."
 msgstr "Vnesite psevdonim za %s."
 
-#: ../pidgin/gtkdialogs.c:1004
+#: ../pidgin/gtkdialogs.c:998
 msgid "Alias Buddy"
 msgstr "Psevdonim prijatelja"
 
-#: ../pidgin/gtkdialogs.c:1025
+#: ../pidgin/gtkdialogs.c:1019
 msgid "Alias Chat"
 msgstr "Psevdonim pomenka"
 
-#: ../pidgin/gtkdialogs.c:1026
+#: ../pidgin/gtkdialogs.c:1020
 msgid "Enter an alias for this chat."
 msgstr "Vnesite psevdonim za ta pomenek."
 
-#: ../pidgin/gtkdialogs.c:1065
+#: ../pidgin/gtkdialogs.c:1059
 #, c-format
 msgid "You are about to remove the contact containing %s and %d other buddy from your buddy list.  Do you want to continue?"
 msgid_plural "You are about to remove the contact containing %s and %d other buddies from your buddy list.  Do you want to continue?"
@@ -13271,63 +13339,63 @@
 msgstr[2] "S seznama prijateljev boste odstranili stik, ki vsebuje %s in %d druga prijatelja. Ali želite nadaljevati?"
 msgstr[3] "S seznama prijateljev boste odstranili stik, ki vsebuje %s in %d druge prijatelje. Ali želite nadaljevati?"
 
-#: ../pidgin/gtkdialogs.c:1073
+#: ../pidgin/gtkdialogs.c:1067
 msgid "Remove Contact"
 msgstr "Odstrani stik"
 
-#: ../pidgin/gtkdialogs.c:1076
+#: ../pidgin/gtkdialogs.c:1070
 msgid "_Remove Contact"
 msgstr "_Odstrani stik"
 
-#: ../pidgin/gtkdialogs.c:1107
+#: ../pidgin/gtkdialogs.c:1101
 #, c-format
 msgid "You are about to merge the group called %s into the group called %s. Do you want to continue?"
 msgstr "Skupino %s boste spojili v skupino %s. Ali želite nadaljevati?"
 
-#: ../pidgin/gtkdialogs.c:1114
+#: ../pidgin/gtkdialogs.c:1108
 msgid "Merge Groups"
 msgstr "Spoji skupine"
 
-#: ../pidgin/gtkdialogs.c:1117
+#: ../pidgin/gtkdialogs.c:1111
 msgid "_Merge Groups"
 msgstr "_Spoji skupine"
 
-#: ../pidgin/gtkdialogs.c:1167
+#: ../pidgin/gtkdialogs.c:1161
 #, c-format
 msgid "You are about to remove the group %s and all its members from your buddy list.  Do you want to continue?"
 msgstr "S seznama prijateljev boste odstranili skupino %s. Ali želite nadaljevati?"
 
-#: ../pidgin/gtkdialogs.c:1170
+#: ../pidgin/gtkdialogs.c:1164
 msgid "Remove Group"
 msgstr "Odstrani skupino"
 
-#: ../pidgin/gtkdialogs.c:1173
+#: ../pidgin/gtkdialogs.c:1167
 msgid "_Remove Group"
 msgstr "_Odstrani skupino"
 
-#: ../pidgin/gtkdialogs.c:1206
+#: ../pidgin/gtkdialogs.c:1200
 #, c-format
 msgid "You are about to remove %s from your buddy list.  Do you want to continue?"
 msgstr "Odstranili boste %s s seznama prijateljev. Ali želite nadaljevati?"
 
-#: ../pidgin/gtkdialogs.c:1209
+#: ../pidgin/gtkdialogs.c:1203
 msgid "Remove Buddy"
 msgstr "Odstrani prijatelja"
 
-#: ../pidgin/gtkdialogs.c:1212
+#: ../pidgin/gtkdialogs.c:1206
 msgid "_Remove Buddy"
 msgstr "_Odstrani prijatelja"
 
-#: ../pidgin/gtkdialogs.c:1233
+#: ../pidgin/gtkdialogs.c:1227
 #, c-format
 msgid "You are about to remove the chat %s from your buddy list.  Do you want to continue?"
 msgstr "S seznama prijateljev boste odstranili pomenek %s. Ali želite nadaljevati?"
 
-#: ../pidgin/gtkdialogs.c:1236
+#: ../pidgin/gtkdialogs.c:1230
 msgid "Remove Chat"
 msgstr "Odstrani pomenek"
 
-#: ../pidgin/gtkdialogs.c:1239
+#: ../pidgin/gtkdialogs.c:1233
 msgid "_Remove Chat"
 msgstr "_Odstrani pomenek"
 
@@ -13422,67 +13490,67 @@
 msgid "Time Remaining:"
 msgstr "Preostali čas:"
 
-#: ../pidgin/gtkft.c:786
+#: ../pidgin/gtkft.c:783
 msgid "Close this window when all transfers _finish"
 msgstr "Zapri to okno po zaključku _vseh prenosov"
 
-#: ../pidgin/gtkft.c:796
+#: ../pidgin/gtkft.c:793
 msgid "C_lear finished transfers"
 msgstr "_Počisti dokončane prenose"
 
 #. "Download Details" arrow
-#: ../pidgin/gtkft.c:805
+#: ../pidgin/gtkft.c:802
 msgid "File transfer _details"
 msgstr "Po_drobnosti o prenosu"
 
 #. Pause button
-#: ../pidgin/gtkft.c:835
+#: ../pidgin/gtkft.c:832
 #: ../pidgin/pidginstock.c:89
 msgid "_Pause"
 msgstr "_Premor"
 
 #. Resume button
-#: ../pidgin/gtkft.c:845
+#: ../pidgin/gtkft.c:842
 msgid "_Resume"
 msgstr "_Nadaljuj"
 
-#: ../pidgin/gtkimhtml.c:796
+#: ../pidgin/gtkimhtml.c:795
 msgid "Paste as Plain _Text"
 msgstr "Prilepi kot navadno be_sedilo"
 
-#: ../pidgin/gtkimhtml.c:813
+#: ../pidgin/gtkimhtml.c:812
 msgid "_Reset formatting"
 msgstr "_Počisti oblikovanje"
 
-#: ../pidgin/gtkimhtml.c:1309
+#: ../pidgin/gtkimhtml.c:1349
 msgid "Hyperlink color"
 msgstr "Barva povezave"
 
-#: ../pidgin/gtkimhtml.c:1310
+#: ../pidgin/gtkimhtml.c:1350
 msgid "Color to draw hyperlinks."
 msgstr "Barva za risanje povezav."
 
-#: ../pidgin/gtkimhtml.c:1313
+#: ../pidgin/gtkimhtml.c:1353
 msgid "Hyperlink prelight color"
 msgstr "Barva presvetljene povezave"
 
-#: ../pidgin/gtkimhtml.c:1314
+#: ../pidgin/gtkimhtml.c:1354
 msgid "Color to draw hyperlinks when mouse is over them."
 msgstr "Barva za risanje povezav, ko je nad njimi miška."
 
-#: ../pidgin/gtkimhtml.c:1530
+#: ../pidgin/gtkimhtml.c:1575
 msgid "_Copy E-Mail Address"
 msgstr "_Kopiraj naslov e-pošte"
 
-#: ../pidgin/gtkimhtml.c:1542
+#: ../pidgin/gtkimhtml.c:1587
 msgid "_Open Link in Browser"
 msgstr "_Odpri povezavo v brskalniku"
 
-#: ../pidgin/gtkimhtml.c:1552
+#: ../pidgin/gtkimhtml.c:1597
 msgid "_Copy Link Location"
 msgstr "_Kopiraj lokacijo povezave"
 
-#: ../pidgin/gtkimhtml.c:3227
+#: ../pidgin/gtkimhtml.c:3341
 msgid ""
 "<span size='larger' weight='bold'>Unrecognized file type</span>\n"
 "\n"
@@ -13492,7 +13560,7 @@
 "\n"
 "Uporabljena bo privzeta vrednost PNG."
 
-#: ../pidgin/gtkimhtml.c:3230
+#: ../pidgin/gtkimhtml.c:3344
 msgid ""
 "Unrecognized file type\n"
 "\n"
@@ -13502,7 +13570,7 @@
 "\n"
 "Uporabljena bo privzeta vrednost PNG."
 
-#: ../pidgin/gtkimhtml.c:3259
+#: ../pidgin/gtkimhtml.c:3373
 #, c-format
 msgid ""
 "<span size='larger' weight='bold'>Error saving image</span>\n"
@@ -13513,7 +13581,7 @@
 "\n"
 "%s"
 
-#: ../pidgin/gtkimhtml.c:3262
+#: ../pidgin/gtkimhtml.c:3376
 #, c-format
 msgid ""
 "Error saving image\n"
@@ -13524,196 +13592,202 @@
 "\n"
 "%s"
 
-#: ../pidgin/gtkimhtml.c:3340
-#: ../pidgin/gtkimhtml.c:3352
+#: ../pidgin/gtkimhtml.c:3454
+#: ../pidgin/gtkimhtml.c:3466
 msgid "Save Image"
 msgstr "Shrani sliko"
 
-#: ../pidgin/gtkimhtml.c:3380
+#: ../pidgin/gtkimhtml.c:3494
 msgid "_Save Image..."
 msgstr "_Shrani sliko ..."
 
-#: ../pidgin/gtkimhtmltoolbar.c:151
+#: ../pidgin/gtkimhtmltoolbar.c:153
 msgid "Select Font"
 msgstr "Nastavi pisavo"
 
-#: ../pidgin/gtkimhtmltoolbar.c:230
+#: ../pidgin/gtkimhtmltoolbar.c:232
 msgid "Select Text Color"
 msgstr "Nastavi barvo besedila"
 
-#: ../pidgin/gtkimhtmltoolbar.c:309
+#: ../pidgin/gtkimhtmltoolbar.c:311
 msgid "Select Background Color"
 msgstr "Nastavi barvo ozadja"
 
-#: ../pidgin/gtkimhtmltoolbar.c:398
+#: ../pidgin/gtkimhtmltoolbar.c:400
 msgid "_URL"
 msgstr "_URL"
 
-#: ../pidgin/gtkimhtmltoolbar.c:406
+#: ../pidgin/gtkimhtmltoolbar.c:408
 msgid "_Description"
 msgstr "_Opis"
 
-#: ../pidgin/gtkimhtmltoolbar.c:409
+#: ../pidgin/gtkimhtmltoolbar.c:411
 msgid "Please enter the URL and description of the link that you want to insert. The description is optional."
 msgstr "Vnesite URL in opis povezave, ki jo želite vstaviti. Opis ni obvezen."
 
-#: ../pidgin/gtkimhtmltoolbar.c:413
+#: ../pidgin/gtkimhtmltoolbar.c:415
 msgid "Please enter the URL of the link that you want to insert."
 msgstr "Vnesite URL povezave, ki jo želite vstaviti."
 
-#: ../pidgin/gtkimhtmltoolbar.c:418
+#: ../pidgin/gtkimhtmltoolbar.c:420
 msgid "Insert Link"
 msgstr "Vstavi povezavo"
 
-#: ../pidgin/gtkimhtmltoolbar.c:422
+#: ../pidgin/gtkimhtmltoolbar.c:424
+#: ../pidgin/gtkimhtmltoolbar.c:1155
 msgid "_Insert"
 msgstr "_Vstavi"
 
-#: ../pidgin/gtkimhtmltoolbar.c:491
+#: ../pidgin/gtkimhtmltoolbar.c:493
 #, c-format
 msgid "Failed to store image: %s\n"
 msgstr "Slike: %s ni mogoče shraniti.\n"
 
-#: ../pidgin/gtkimhtmltoolbar.c:517
-#: ../pidgin/gtkimhtmltoolbar.c:527
+#: ../pidgin/gtkimhtmltoolbar.c:519
+#: ../pidgin/gtkimhtmltoolbar.c:529
 msgid "Insert Image"
 msgstr "Vstavi sliko"
 
-#: ../pidgin/gtkimhtmltoolbar.c:725
+#: ../pidgin/gtkimhtmltoolbar.c:740
 msgid "This theme has no available smileys."
 msgstr "Ta tema nima smeškov."
 
 #. show everything
-#: ../pidgin/gtkimhtmltoolbar.c:739
+#: ../pidgin/gtkimhtmltoolbar.c:757
 msgid "Smile!"
 msgstr "Nasmeh!"
 
-#: ../pidgin/gtkimhtmltoolbar.c:926
-#: ../pidgin/plugins/convcolors.c:287
-msgid "Bold"
-msgstr "Krepko"
-
-#: ../pidgin/gtkimhtmltoolbar.c:937
-#: ../pidgin/plugins/convcolors.c:294
-msgid "Italic"
-msgstr "Ležeče"
-
-#: ../pidgin/gtkimhtmltoolbar.c:948
-#: ../pidgin/plugins/convcolors.c:301
-msgid "Underline"
-msgstr "Podčrtano"
-
-#: ../pidgin/gtkimhtmltoolbar.c:964
-msgid "Larger font size"
-msgstr "Povečaj pisavo"
-
-#: ../pidgin/gtkimhtmltoolbar.c:976
-msgid "Smaller font size"
-msgstr "Manjša pisava"
-
-#: ../pidgin/gtkimhtmltoolbar.c:993
-msgid "Font face"
-msgstr "Vrsta pisave"
-
-#: ../pidgin/gtkimhtmltoolbar.c:1005
-msgid "Foreground font color"
-msgstr "Barva pisave"
-
-#: ../pidgin/gtkimhtmltoolbar.c:1017
-msgid "Background color"
-msgstr "Barva ozadja"
-
-#: ../pidgin/gtkimhtmltoolbar.c:1033
-msgid "Reset formatting"
-msgstr "Počisti oblikovanje"
-
-#: ../pidgin/gtkimhtmltoolbar.c:1048
-msgid "Insert link"
-msgstr "Vstavi povezavo"
-
-#: ../pidgin/gtkimhtmltoolbar.c:1058
-msgid "Insert image"
-msgstr "Vstavi sliko"
+#: ../pidgin/gtkimhtmltoolbar.c:1064
+msgid "_Bold"
+msgstr "_Krepko"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1065
+msgid "_Italic"
+msgstr "_Ležeče"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1066
+msgid "_Underline"
+msgstr "Pod_črtano"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1067
+msgid "_Larger"
+msgstr "Več_je"
 
 #: ../pidgin/gtkimhtmltoolbar.c:1069
-msgid "Insert smiley"
-msgstr "Vstavi smeškota"
-
-#: ../pidgin/gtklog.c:267
+msgid "_Normal"
+msgstr "_Navadno"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1071
+msgid "_Smaller"
+msgstr "_Manjše"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1072
+msgid "_Font face"
+msgstr "_Vrsta pisave"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1073
+msgid "_Foreground color"
+msgstr "_Barva ospredja"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1074
+msgid "_Background color"
+msgstr "Barva _ozadja"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1100
+msgid "_Font"
+msgstr "_Pisava"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1135
+msgid "_Reset font"
+msgstr "Ponas_tavi pisavo"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1162
+msgid "_Smiley"
+msgstr "_Smejček"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1168
+msgid "_Image"
+msgstr "Sli_ka"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1174
+msgid "_Link"
+msgstr "Pove_zava"
+
+#: ../pidgin/gtklog.c:292
 #, c-format
 msgid "Are you sure you want to permanently delete the log of the conversation with %s which started at %s?"
 msgstr "Ste prepričani, da želite povsem izbrisati dnevnik klepeta z %s, ki se je pričel ob %s?"
 
-#: ../pidgin/gtklog.c:278
+#: ../pidgin/gtklog.c:303
 #, c-format
 msgid "Are you sure you want to permanently delete the log of the conversation in %s which started at %s?"
 msgstr "Ste prepričani, da želite povsem izbrisati dnevnik klepeta v %s, ki se je pričel ob %s?"
 
-#: ../pidgin/gtklog.c:283
+#: ../pidgin/gtklog.c:308
 #, c-format
 msgid "Are you sure you want to permanently delete the system log which started at %s?"
 msgstr "Ste prepričani, da želite povsem izbrisati sistemski dnevnik, ki se je pričel ob %s?"
 
-#: ../pidgin/gtklog.c:427
+#: ../pidgin/gtklog.c:452
 #, c-format
 msgid "<span size='larger' weight='bold'>Conversation in %s on %s</span>"
 msgstr "<span weight=\"bold\" size=\"larger\">Pogovor s/z %s o %s</span>"
 
-#: ../pidgin/gtklog.c:430
+#: ../pidgin/gtklog.c:455
 #, c-format
 msgid "<span size='larger' weight='bold'>Conversation with %s on %s</span>"
 msgstr "<span weight=\"bold\" size=\"larger\">Pogovor s/z %s glede %s</span>"
 
-#: ../pidgin/gtklog.c:477
+#: ../pidgin/gtklog.c:502
 msgid "%B %Y"
 msgstr "%B %Y"
 
-#: ../pidgin/gtklog.c:524
+#: ../pidgin/gtklog.c:549
 msgid "System events will only be logged if the \"Log all status changes to system log\" preference is enabled."
 msgstr "Sistemski dogodki bodo shranjeni, le če bo nastavljena možnost \"Omogoči sistemski dnevnik\"."
 
-#: ../pidgin/gtklog.c:528
+#: ../pidgin/gtklog.c:553
 msgid "Instant messages will only be logged if the \"Log all instant messages\" preference is enabled."
 msgstr "Neposredna sporočila se bodo shranila, le če bo okljukana možnost \"Shranjuj vsa neposredna sporočila\"."
 
-#: ../pidgin/gtklog.c:531
+#: ../pidgin/gtklog.c:556
 msgid "Chats will only be logged if the \"Log all chats\" preference is enabled."
 msgstr "Pomenki bodo shranjeni v dnevnik, ko je okljukana možnost \"Shranjuj vse pomenke\"."
 
-#: ../pidgin/gtklog.c:535
+#: ../pidgin/gtklog.c:560
 msgid "No logs were found"
 msgstr "Ni najdenih dnevnikov."
 
 #. Steal the "HELP" response and use it to trigger browsing to the logs folder
-#: ../pidgin/gtklog.c:550
+#: ../pidgin/gtklog.c:575
 msgid "_Browse logs folder"
 msgstr "_Prebrskaj mapo dnevnikov"
 
-#: ../pidgin/gtklog.c:614
+#: ../pidgin/gtklog.c:639
 msgid "Total log size:"
 msgstr "Skupna velikost dnevnika:"
 
-#: ../pidgin/gtklog.c:683
+#: ../pidgin/gtklog.c:708
 #, c-format
 msgid "Conversations in %s"
 msgstr "Pomenki v %s"
 
-#: ../pidgin/gtklog.c:691
-#: ../pidgin/gtklog.c:753
+#: ../pidgin/gtklog.c:716
+#: ../pidgin/gtklog.c:778
 #, c-format
 msgid "Conversations with %s"
 msgstr "Pomenki z %s"
 
-#: ../pidgin/gtklog.c:778
+#: ../pidgin/gtklog.c:803
 msgid "System Log"
 msgstr "Sistemski dnevnik"
 
-#: ../pidgin/gtkmain.c:368
+#: ../pidgin/gtkmain.c:385
 #, c-format
 msgid "%s %s. Try `%s -h' for more information.\n"
 msgstr "%s %s. Poskusite `%s -h' za več informacij.\n"
 
-#: ../pidgin/gtkmain.c:370
+#: ../pidgin/gtkmain.c:387
 #, c-format
 msgid ""
 "%s %s\n"
@@ -13722,23 +13796,25 @@
 "  -c, --config=DIR    use DIR for config files\n"
 "  -d, --debug         print debugging messages to stdout\n"
 "  -h, --help          display this help and exit\n"
+"  -m, --multiple      do not ensure single instance\n"
 "  -n, --nologin       don't automatically login\n"
 "  -l, --login[=NAME]  automatically login (optional argument NAME specifies\n"
 "                      account(s) to use, separated by commas)\n"
 "  -v, --version       display the current version and exit\n"
 msgstr ""
 "%s %s\n"
-"Uporaba: %s [MOŽNOST]...\n"
+"Uporaba: %s [MOŽNOST] ...\n"
 "\n"
 "  -c, --config=DIR    uporabi DIR za nastavitvene datoteke\n"
 "  -d, --debug         izpiši sporočila za razhroščevanje na stdout\n"
 "  -h, --help          izpiši to pomoč in končaj program\n"
+"  -m, --multiple      ne dovoljuj le enega zagnanega programa\n"
 "  -n, --nologin       brez samodejne prijave\n"
 "  -l, --login[=NAME]  samodejna prijava (dodaten možen argument NAME\n"
 "                     določa račun(e) za prijavo, ločene z vejico)\n"
 "  -v, --version       izpiši trenutno različico in končaj program\n"
 
-#: ../pidgin/gtkmain.c:490
+#: ../pidgin/gtkmain.c:511
 #, c-format
 msgid ""
 "%s has segfaulted and attempted to dump a core file.\n"
@@ -13747,7 +13823,7 @@
 "\n"
 "If you can reproduce the crash, please notify the developers\n"
 "by reporting a bug at:\n"
-"%snewticket/\n"
+"%ssimpleticket/\n"
 "\n"
 "Please make sure to specify what you were doing at the time\n"
 "and post the backtrace from the core file.  If you do not know\n"
@@ -13764,7 +13840,7 @@
 "\n"
 "Če lahko ponovite korake, ki privedejo do sesutja, prosimo,\n"
 "obvestite razvijalce s poročilom o hrošču na naslovu\n"
-"%snewticket/\n"
+"%ssimpleticket/\n"
 "\n"
 "Ne pozabite navesti, kaj ste takrat počeli,\n"
 "objavite tudi izsledek iz datoteke pomnilniškega izmeta (core).\n"
@@ -13776,6 +13852,13 @@
 "Podatki za stik z Seanom in Lukom prek drugih protokolov so na\n"
 "%swiki/DeveloperPages.\n"
 
+#. Translators may want to transliterate the name.
+#. It is not to be translated.
+#: ../pidgin/gtkmain.c:697
+#: ../pidgin/pidgin.h:50
+msgid "Pidgin"
+msgstr "Pidgin"
+
 #: ../pidgin/gtknotify.c:343
 msgid "Open All Messages"
 msgstr "Odpri vsa sporočila"
@@ -13784,10 +13867,6 @@
 msgid "<span weight=\"bold\" size=\"larger\">You have mail!</span>"
 msgstr "<span weight=\"bold\" size=\"larger\">Dobili ste pošto!</span>"
 
-#: ../pidgin/gtknotify.c:489
-msgid "Sender"
-msgstr "Pošiljatelj"
-
 #: ../pidgin/gtknotify.c:515
 #, c-format
 msgid "%s has %d new message."
@@ -13806,25 +13885,25 @@
 msgstr[2] "<b>Imate %d novi e-sporočili.</b>"
 msgstr[3] "<b>Imate %d nova e-sporočila.</b>"
 
-#: ../pidgin/gtknotify.c:969
+#: ../pidgin/gtknotify.c:965
 #, c-format
 msgid "The browser command \"%s\" is invalid."
 msgstr "Ukaz brskalnika \"%s\" ni veljaven."
 
-#: ../pidgin/gtknotify.c:971
-#: ../pidgin/gtknotify.c:983
-#: ../pidgin/gtknotify.c:996
-#: ../pidgin/gtknotify.c:1124
+#: ../pidgin/gtknotify.c:967
+#: ../pidgin/gtknotify.c:979
+#: ../pidgin/gtknotify.c:992
+#: ../pidgin/gtknotify.c:1120
 msgid "Unable to open URL"
 msgstr "Ni bilo mogoče odprti URL"
 
-#: ../pidgin/gtknotify.c:981
-#: ../pidgin/gtknotify.c:994
+#: ../pidgin/gtknotify.c:977
+#: ../pidgin/gtknotify.c:990
 #, c-format
 msgid "Error launching \"%s\": %s"
 msgstr "Napaka pri zagonu \"%s\": %s"
 
-#: ../pidgin/gtknotify.c:1125
+#: ../pidgin/gtknotify.c:1121
 msgid "The 'Manual' browser command has been chosen, but no command has been set."
 msgstr "Vašega brskalnika ni bilo mogoče zagnati, ker ste v nastavitvah izbrali poljuben brskalnik, a niste nastavili ukaza."
 
@@ -13870,359 +13949,372 @@
 msgid "<b>Plugin Details</b>"
 msgstr "<b>Podrobnosti o vstavku</b>"
 
-#: ../pidgin/gtkpounce.c:155
+#: ../pidgin/gtkpounce.c:156
 msgid "Select a file"
 msgstr "Izberi datoteko"
 
 #. Create the "Pounce on Whom" frame.
-#: ../pidgin/gtkpounce.c:524
+#: ../pidgin/gtkpounce.c:533
 msgid "Pounce on Whom"
 msgstr "Opozori koga"
 
-#: ../pidgin/gtkpounce.c:551
+#: ../pidgin/gtkpounce.c:560
 msgid "_Buddy name:"
 msgstr "_Ime prijatelja:"
 
-#: ../pidgin/gtkpounce.c:585
+#: ../pidgin/gtkpounce.c:594
 msgid "Si_gns on"
 msgstr "_prijavi"
 
-#: ../pidgin/gtkpounce.c:587
+#: ../pidgin/gtkpounce.c:596
 msgid "Signs o_ff"
 msgstr "_odjavi"
 
-#: ../pidgin/gtkpounce.c:589
+#: ../pidgin/gtkpounce.c:598
 msgid "Goes a_way"
 msgstr "postane od_soten"
 
-#: ../pidgin/gtkpounce.c:591
+#: ../pidgin/gtkpounce.c:600
 msgid "Ret_urns from away"
 msgstr "_vrne"
 
-#: ../pidgin/gtkpounce.c:593
+#: ../pidgin/gtkpounce.c:602
 msgid "Becomes _idle"
 msgstr "postane _nedejaven"
 
-#: ../pidgin/gtkpounce.c:595
+#: ../pidgin/gtkpounce.c:604
 msgid "Is no longer i_dle"
 msgstr "ni ve_č nedejaven."
 
-#: ../pidgin/gtkpounce.c:597
+#: ../pidgin/gtkpounce.c:606
 msgid "Starts _typing"
 msgstr "začne _tipkati"
 
-#: ../pidgin/gtkpounce.c:599
+#: ../pidgin/gtkpounce.c:608
 msgid "P_auses while typing"
 msgstr "Premor med _tipkanjem"
 
-#: ../pidgin/gtkpounce.c:601
+#: ../pidgin/gtkpounce.c:610
 msgid "Stops t_yping"
 msgstr "_preneha tipkati"
 
-#: ../pidgin/gtkpounce.c:603
+#: ../pidgin/gtkpounce.c:612
 msgid "Sends a _message"
 msgstr "Pošlje spo_ročilo"
 
-#: ../pidgin/gtkpounce.c:646
+#: ../pidgin/gtkpounce.c:655
 msgid "Ope_n an IM window"
 msgstr "Odpri no_vo sporočilno okno"
 
-#: ../pidgin/gtkpounce.c:648
+#: ../pidgin/gtkpounce.c:657
 msgid "_Pop up a notification"
 msgstr "_Prikaži obvestilo"
 
-#: ../pidgin/gtkpounce.c:650
+#: ../pidgin/gtkpounce.c:659
 msgid "Send a _message"
 msgstr "Pošlji spo_ročilo"
 
-#: ../pidgin/gtkpounce.c:652
+#: ../pidgin/gtkpounce.c:661
 msgid "E_xecute a command"
 msgstr "Izvr_ši ukaz"
 
-#: ../pidgin/gtkpounce.c:654
+#: ../pidgin/gtkpounce.c:663
 msgid "P_lay a sound"
 msgstr "Pre_dvajaj zvok"
 
-#: ../pidgin/gtkpounce.c:659
+#: ../pidgin/gtkpounce.c:669
 msgid "Brows_e..."
 msgstr "Pre_rskaj ..."
 
-#: ../pidgin/gtkpounce.c:661
+#: ../pidgin/gtkpounce.c:671
 msgid "Br_owse..."
 msgstr "Preb_rskaj ..."
 
-#: ../pidgin/gtkpounce.c:662
+#: ../pidgin/gtkpounce.c:672
 msgid "Pre_view"
 msgstr "Pred_ogled"
 
-#: ../pidgin/gtkpounce.c:786
+#: ../pidgin/gtkpounce.c:799
 msgid "P_ounce only when my status is not Available"
 msgstr "_Opozori le tedaj, ko nisem na voljo"
 
-#: ../pidgin/gtkpounce.c:791
+#: ../pidgin/gtkpounce.c:804
 msgid "_Recurring"
 msgstr "Ponavl_jajoč"
 
-#: ../pidgin/gtkpounce.c:1247
+#: ../pidgin/gtkpounce.c:1260
 msgid "Pounce Target"
 msgstr "Tarča opozorila"
 
-#: ../pidgin/gtkprefs.c:509
+#: ../pidgin/gtkprefs.c:385
+#: ../pidgin/pixmaps/emotes/default/22/default.theme.in.h:1
+msgid "Default"
+msgstr "Privzeto"
+
+#: ../pidgin/gtkprefs.c:516
 msgid "Smiley theme failed to unpack."
 msgstr "Teme nasmeškov ni mogoče razpakirati."
 
-#: ../pidgin/gtkprefs.c:638
+#: ../pidgin/gtkprefs.c:643
+msgid "Install Theme"
+msgstr "Namesti temo"
+
+#: ../pidgin/gtkprefs.c:696
 msgid "Select a smiley theme that you would like to use from the list below. New themes can be installed by dragging and dropping them onto the theme list."
 msgstr "S spodnjega seznama izberite vrsto smeškov, ki jih želite uporabljati. Nove teme lahko namestite, če jih povlečete in spustite na seznam."
 
-#: ../pidgin/gtkprefs.c:673
+#: ../pidgin/gtkprefs.c:731
 msgid "Icon"
 msgstr "Ikona"
 
-#: ../pidgin/gtkprefs.c:816
+#: ../pidgin/gtkprefs.c:893
 msgid "System Tray Icon"
 msgstr "Ikona na pladnju"
 
-#: ../pidgin/gtkprefs.c:817
+#: ../pidgin/gtkprefs.c:894
 msgid "_Show system tray icon:"
 msgstr "_Pokaži sistemsko ikono na pladnju:"
 
-#: ../pidgin/gtkprefs.c:819
-#: ../pidgin/gtkprefs.c:831
-#: ../pidgin/gtkprefs.c:1686
+#: ../pidgin/gtkprefs.c:896
+#: ../pidgin/gtkprefs.c:908
+#: ../pidgin/gtkprefs.c:1756
 #: ../pidgin/plugins/timestamp_format.c:42
 #: ../pidgin/plugins/timestamp_format.c:51
 #: ../pidgin/plugins/win32/winprefs/winprefs.c:338
 msgid "Always"
 msgstr "vedno"
 
-#: ../pidgin/gtkprefs.c:821
+#: ../pidgin/gtkprefs.c:898
 msgid "On unread messages"
 msgstr "Ob neprebranih sporočilih"
 
-#: ../pidgin/gtkprefs.c:826
+#: ../pidgin/gtkprefs.c:903
 msgid "Conversation Window Hiding"
 msgstr "Skrivanje okna pogovora"
 
-#: ../pidgin/gtkprefs.c:827
+#: ../pidgin/gtkprefs.c:904
 msgid "_Hide new IM conversations:"
 msgstr "Skrij nove po_govore IM:"
 
-#: ../pidgin/gtkprefs.c:830
-#: ../pidgin/gtkprefs.c:1867
+#: ../pidgin/gtkprefs.c:907
+#: ../pidgin/gtkprefs.c:1937
 msgid "When away"
 msgstr "ob odsotnosti"
 
 #. All the tab options!
-#: ../pidgin/gtkprefs.c:838
+#: ../pidgin/gtkprefs.c:915
 msgid "Tabs"
 msgstr "Zavihki"
 
-#: ../pidgin/gtkprefs.c:840
+#: ../pidgin/gtkprefs.c:917
 msgid "Show IMs and chats in _tabbed windows"
 msgstr "Prikaži pogovore v _oknih z zavihki"
 
-#: ../pidgin/gtkprefs.c:854
+#: ../pidgin/gtkprefs.c:931
 msgid "Show close b_utton on tabs"
 msgstr "Pokaži _gumb 'Zapri' na zavihkih"
 
-#: ../pidgin/gtkprefs.c:857
+#: ../pidgin/gtkprefs.c:934
 msgid "_Placement:"
 msgstr "_Postavitev"
 
-#: ../pidgin/gtkprefs.c:859
+#: ../pidgin/gtkprefs.c:936
 msgid "Top"
 msgstr "zgoraj"
 
-#: ../pidgin/gtkprefs.c:860
+#: ../pidgin/gtkprefs.c:937
 msgid "Bottom"
 msgstr "spodaj"
 
-#: ../pidgin/gtkprefs.c:861
+#: ../pidgin/gtkprefs.c:938
 msgid "Left"
 msgstr "na levi"
 
-#: ../pidgin/gtkprefs.c:862
+#: ../pidgin/gtkprefs.c:939
 msgid "Right"
 msgstr "na desni"
 
-#: ../pidgin/gtkprefs.c:864
+#: ../pidgin/gtkprefs.c:941
 msgid "Left Vertical"
 msgstr "levo navpično"
 
-#: ../pidgin/gtkprefs.c:865
+#: ../pidgin/gtkprefs.c:942
 msgid "Right Vertical"
 msgstr "desno navpično"
 
-#: ../pidgin/gtkprefs.c:872
+#: ../pidgin/gtkprefs.c:949
 msgid "N_ew conversations:"
 msgstr "N_ovi pogovori:"
 
-#: ../pidgin/gtkprefs.c:917
+#: ../pidgin/gtkprefs.c:994
 msgid "Show _formatting on incoming messages"
 msgstr "Prikaži _oblikovanje v dohodnih sporočilih"
 
-#: ../pidgin/gtkprefs.c:920
+#: ../pidgin/gtkprefs.c:997
 msgid "Show buddy _icons"
 msgstr "Prikaži _ikone"
 
-#: ../pidgin/gtkprefs.c:922
+#: ../pidgin/gtkprefs.c:999
 msgid "Enable buddy ic_on animation"
 msgstr "_Omogoči animacijo ikon prijateljev"
 
-#: ../pidgin/gtkprefs.c:929
+#: ../pidgin/gtkprefs.c:1006
 msgid "_Notify buddies that you are typing to them"
 msgstr "O_bvesti prijatelje, da jim pišem"
 
-#: ../pidgin/gtkprefs.c:932
+#: ../pidgin/gtkprefs.c:1009
 msgid "Highlight _misspelled words"
 msgstr "_Obarvaj nepravilno črkovane besede"
 
-#: ../pidgin/gtkprefs.c:936
+#: ../pidgin/gtkprefs.c:1013
 msgid "Use smooth-scrolling"
 msgstr "Uporabi animirano drsenje"
 
-#: ../pidgin/gtkprefs.c:939
+#: ../pidgin/gtkprefs.c:1016
 msgid "F_lash window when IMs are received"
 msgstr "Utripaj z _oknom, ko prispe novo sporočilo"
 
-#: ../pidgin/gtkprefs.c:943
+#: ../pidgin/gtkprefs.c:1018
+msgid "Minimi_ze new conversation windows"
+msgstr "Poman_jšaj pogovorna okna"
+
+#: ../pidgin/gtkprefs.c:1022
 msgid "Font"
 msgstr "Pisava"
 
-#: ../pidgin/gtkprefs.c:945
+#: ../pidgin/gtkprefs.c:1024
 msgid "Use document font from _theme"
 msgstr "Uporabi pisavo dokumenta iz _teme"
 
-#: ../pidgin/gtkprefs.c:947
+#: ../pidgin/gtkprefs.c:1026
 msgid "Use font from _theme"
 msgstr "Uporabi pisavo iz _teme"
 
-#: ../pidgin/gtkprefs.c:949
+#: ../pidgin/gtkprefs.c:1028
 msgid "Conversation _font:"
 msgstr "_Pisava pogovora:"
 
-#: ../pidgin/gtkprefs.c:962
+#: ../pidgin/gtkprefs.c:1041
 msgid "Default Formatting"
 msgstr "Privzeto oblikovanje"
 
-#: ../pidgin/gtkprefs.c:978
-msgid "This is how your outgoing message text will appear when you use protocols that support formatting. :)"
-msgstr "Tako bo izgledalo besedilo vašega odhodnega sporočila, če uporabljate protokole, ki podpirajo oblikovanje. :)"
-
-#: ../pidgin/gtkprefs.c:1054
+#: ../pidgin/gtkprefs.c:1057
+msgid "This is how your outgoing message text will appear when you use protocols that support formatting."
+msgstr "Tako bo izgledalo besedilo vašega odhodnega sporočila, če uporabljate protokole, ki podpirajo oblikovanje."
+
+#: ../pidgin/gtkprefs.c:1123
 msgid "ST_UN server:"
 msgstr "Strežnik ST_UN:"
 
-#: ../pidgin/gtkprefs.c:1066
+#: ../pidgin/gtkprefs.c:1135
 msgid "<span style=\"italic\">Example: stunserver.org</span>"
 msgstr "<span style=\"italic\">Primer: stunserver.org</span>"
 
-#: ../pidgin/gtkprefs.c:1070
+#: ../pidgin/gtkprefs.c:1139
 msgid "_Autodetect IP address"
 msgstr "_Samozaznaj naslov IP"
 
-#: ../pidgin/gtkprefs.c:1079
+#: ../pidgin/gtkprefs.c:1148
 msgid "Public _IP:"
 msgstr "Javen _IP:"
 
-#: ../pidgin/gtkprefs.c:1108
+#: ../pidgin/gtkprefs.c:1177
 msgid "Ports"
 msgstr "Vrata"
 
-#: ../pidgin/gtkprefs.c:1111
+#: ../pidgin/gtkprefs.c:1180
 msgid "_Manually specify range of ports to listen on"
 msgstr "_Ročno določi obseg vrat za poslušanje"
 
-#: ../pidgin/gtkprefs.c:1114
+#: ../pidgin/gtkprefs.c:1183
 msgid "_Start port:"
 msgstr "_Začetna vrata:"
 
-#: ../pidgin/gtkprefs.c:1121
+#: ../pidgin/gtkprefs.c:1190
 msgid "_End port:"
 msgstr "_Končna vrata:"
 
-#: ../pidgin/gtkprefs.c:1129
+#: ../pidgin/gtkprefs.c:1198
 msgid "Proxy Server"
 msgstr "Strežnik proxy"
 
-#: ../pidgin/gtkprefs.c:1133
+#: ../pidgin/gtkprefs.c:1202
 msgid "No proxy"
 msgstr "Brez strežnika proxy"
 
-#: ../pidgin/gtkprefs.c:1189
+#: ../pidgin/gtkprefs.c:1258
 msgid "_User:"
 msgstr "_Uporabnik:"
 
-#: ../pidgin/gtkprefs.c:1253
+#: ../pidgin/gtkprefs.c:1323
 msgid "Seamonkey"
 msgstr "Seamonkey"
 
-#: ../pidgin/gtkprefs.c:1254
+#: ../pidgin/gtkprefs.c:1324
 msgid "Opera"
 msgstr "Opera"
 
-#: ../pidgin/gtkprefs.c:1255
+#: ../pidgin/gtkprefs.c:1325
 msgid "Netscape"
 msgstr "Netscape"
 
-#: ../pidgin/gtkprefs.c:1256
+#: ../pidgin/gtkprefs.c:1326
 msgid "Mozilla"
 msgstr "Mozilla"
 
-#: ../pidgin/gtkprefs.c:1257
+#: ../pidgin/gtkprefs.c:1327
 msgid "Konqueror"
 msgstr "Konqueror"
 
-#: ../pidgin/gtkprefs.c:1258
+#: ../pidgin/gtkprefs.c:1328
 msgid "GNOME Default"
 msgstr "Privzeto za GNOME"
 
-#: ../pidgin/gtkprefs.c:1259
+#: ../pidgin/gtkprefs.c:1329
 msgid "Galeon"
 msgstr "Galeon"
 
-#: ../pidgin/gtkprefs.c:1260
+#: ../pidgin/gtkprefs.c:1330
 msgid "Firefox"
 msgstr "Firefox"
 
-#: ../pidgin/gtkprefs.c:1261
+#: ../pidgin/gtkprefs.c:1331
 msgid "Firebird"
 msgstr "Firebird"
 
-#: ../pidgin/gtkprefs.c:1262
+#: ../pidgin/gtkprefs.c:1332
 msgid "Epiphany"
 msgstr "Epiphany"
 
-#: ../pidgin/gtkprefs.c:1271
+#: ../pidgin/gtkprefs.c:1341
 msgid "Manual"
 msgstr "Ročni"
 
-#: ../pidgin/gtkprefs.c:1324
+#: ../pidgin/gtkprefs.c:1394
 msgid "Browser Selection"
 msgstr "Izbira brskalnika"
 
-#: ../pidgin/gtkprefs.c:1328
+#: ../pidgin/gtkprefs.c:1398
 msgid "_Browser:"
 msgstr "_Brskalnik:"
 
-#: ../pidgin/gtkprefs.c:1336
+#: ../pidgin/gtkprefs.c:1406
 msgid "_Open link in:"
 msgstr "_Odpri povezavo v:"
 
-#: ../pidgin/gtkprefs.c:1338
+#: ../pidgin/gtkprefs.c:1408
 msgid "Browser default"
 msgstr "Privzeto za brskalnik"
 
-#: ../pidgin/gtkprefs.c:1339
+#: ../pidgin/gtkprefs.c:1409
 msgid "Existing window"
 msgstr "Obstoječe okno"
 
-#: ../pidgin/gtkprefs.c:1341
+#: ../pidgin/gtkprefs.c:1411
 msgid "New tab"
 msgstr "Nov zavihek"
 
-#: ../pidgin/gtkprefs.c:1355
+#: ../pidgin/gtkprefs.c:1425
 #, c-format
 msgid ""
 "_Manual:\n"
@@ -14231,81 +14323,81 @@
 "_Ročno:\n"
 "(%s namesto URL)"
 
-#: ../pidgin/gtkprefs.c:1395
+#: ../pidgin/gtkprefs.c:1465
 msgid "Log _format:"
 msgstr "Oblika _dnevnika:"
 
-#: ../pidgin/gtkprefs.c:1400
+#: ../pidgin/gtkprefs.c:1470
 msgid "Log all _instant messages"
 msgstr "Shranjuj vsa _neposredna sporočila"
 
-#: ../pidgin/gtkprefs.c:1402
+#: ../pidgin/gtkprefs.c:1472
 msgid "Log all c_hats"
 msgstr "Shranjuj vse po_menke"
 
-#: ../pidgin/gtkprefs.c:1404
+#: ../pidgin/gtkprefs.c:1474
 msgid "Log all _status changes to system log"
 msgstr "Beleži vse spremembe _stanja v sistemski dnevnik"
 
-#: ../pidgin/gtkprefs.c:1512
-#: ../pidgin/gtkprefs.c:1601
-#: ../pidgin/gtkprefs.c:1795
+#: ../pidgin/gtkprefs.c:1582
+#: ../pidgin/gtkprefs.c:1671
+#: ../pidgin/gtkprefs.c:1865
 msgid "(default)"
 msgstr "(privzeto)"
 
-#: ../pidgin/gtkprefs.c:1550
+#: ../pidgin/gtkprefs.c:1620
 msgid "Sound Selection"
 msgstr "Izbira zvoka"
 
-#: ../pidgin/gtkprefs.c:1560
+#: ../pidgin/gtkprefs.c:1630
 msgid "Quietest"
 msgstr "najtišje"
 
-#: ../pidgin/gtkprefs.c:1562
+#: ../pidgin/gtkprefs.c:1632
 msgid "Quieter"
 msgstr "tišje"
 
-#: ../pidgin/gtkprefs.c:1564
+#: ../pidgin/gtkprefs.c:1634
 msgid "Quiet"
 msgstr "tiho"
 
-#: ../pidgin/gtkprefs.c:1568
+#: ../pidgin/gtkprefs.c:1638
 msgid "Loud"
 msgstr "glasno"
 
-#: ../pidgin/gtkprefs.c:1570
+#: ../pidgin/gtkprefs.c:1640
 msgid "Louder"
 msgstr "glasneje"
 
-#: ../pidgin/gtkprefs.c:1572
+#: ../pidgin/gtkprefs.c:1642
 msgid "Loudest"
 msgstr "najglasneje"
 
-#: ../pidgin/gtkprefs.c:1635
+#: ../pidgin/gtkprefs.c:1705
 msgid "Sound Method"
 msgstr "Način zvoka"
 
-#: ../pidgin/gtkprefs.c:1636
+#: ../pidgin/gtkprefs.c:1706
 msgid "_Method:"
 msgstr "_Način:"
 
-#: ../pidgin/gtkprefs.c:1638
+#: ../pidgin/gtkprefs.c:1708
 msgid "Console beep"
 msgstr "Pisk"
 
-#: ../pidgin/gtkprefs.c:1640
+#: ../pidgin/gtkprefs.c:1710
 msgid "Automatic"
 msgstr "Samodejno"
 
-#: ../pidgin/gtkprefs.c:1644
+#: ../pidgin/gtkprefs.c:1714
 msgid "Command"
 msgstr "Ukaz"
 
-#: ../pidgin/gtkprefs.c:1645
+#: ../pidgin/gtkprefs.c:1715
 msgid "No sounds"
 msgstr "Nemo"
 
-#: ../pidgin/gtkprefs.c:1653
+#: ../pidgin/gtkprefs.c:1723
 #, c-format
 msgid ""
 "Sound c_ommand:\n"
@@ -14314,117 +14406,117 @@
 "Ukaz za _zvok:\n"
 "(%s namesto datoteke)"
 
-#: ../pidgin/gtkprefs.c:1679
+#: ../pidgin/gtkprefs.c:1749
 msgid "Sound Options"
 msgstr "Nastavitve zvoka"
 
-#: ../pidgin/gtkprefs.c:1680
+#: ../pidgin/gtkprefs.c:1750
 msgid "Sounds when conversation has _focus"
 msgstr "Zvok, ko pogovorno okno dobi _fokus"
 
-#: ../pidgin/gtkprefs.c:1682
+#: ../pidgin/gtkprefs.c:1752
 msgid "Enable sounds:"
 msgstr "Omogoči zvoke:"
 
-#: ../pidgin/gtkprefs.c:1684
+#: ../pidgin/gtkprefs.c:1754
 msgid "Only when available"
 msgstr "Samo ko je na voljo"
 
-#: ../pidgin/gtkprefs.c:1685
+#: ../pidgin/gtkprefs.c:1755
 msgid "Only when not available"
 msgstr "Samo ko ni na voljo"
 
-#: ../pidgin/gtkprefs.c:1693
+#: ../pidgin/gtkprefs.c:1763
 msgid "Volume:"
 msgstr "Glasnost:"
 
-#: ../pidgin/gtkprefs.c:1721
+#: ../pidgin/gtkprefs.c:1791
 msgid "Sound Events"
 msgstr "Zvočni Dogodki"
 
-#: ../pidgin/gtkprefs.c:1773
+#: ../pidgin/gtkprefs.c:1843
 msgid "Play"
 msgstr "Predvajaj"
 
-#: ../pidgin/gtkprefs.c:1780
+#: ../pidgin/gtkprefs.c:1850
 msgid "Event"
 msgstr "Dogodek"
 
-#: ../pidgin/gtkprefs.c:1799
+#: ../pidgin/gtkprefs.c:1869
 msgid "Test"
 msgstr "Preskus"
 
-#: ../pidgin/gtkprefs.c:1803
+#: ../pidgin/gtkprefs.c:1873
 msgid "Reset"
 msgstr "Ponastavi"
 
-#: ../pidgin/gtkprefs.c:1807
+#: ../pidgin/gtkprefs.c:1877
 msgid "Choose..."
 msgstr "Izberi ..."
 
-#: ../pidgin/gtkprefs.c:1850
+#: ../pidgin/gtkprefs.c:1920
 msgid "_Report idle time:"
 msgstr "_Poročaj o času odsotnosti:"
 
-#: ../pidgin/gtkprefs.c:1855
+#: ../pidgin/gtkprefs.c:1925
 msgid "Based on keyboard or mouse use"
 msgstr "Temelji na uporabi tipkovnice ali miške"
 
-#: ../pidgin/gtkprefs.c:1864
+#: ../pidgin/gtkprefs.c:1934
 msgid "_Auto-reply:"
 msgstr "_Samodejni odziv"
 
-#: ../pidgin/gtkprefs.c:1868
+#: ../pidgin/gtkprefs.c:1938
 msgid "When both away and idle"
 msgstr "ob odsotnosti in nedejavnosti"
 
 #. Auto-away stuff
-#: ../pidgin/gtkprefs.c:1874
+#: ../pidgin/gtkprefs.c:1944
 msgid "Auto-away"
 msgstr "Samodejna odsotnost"
 
-#: ../pidgin/gtkprefs.c:1876
+#: ../pidgin/gtkprefs.c:1946
 msgid "Change status when _idle"
 msgstr "Spremeni stanje ob _nedejavnosti"
 
-#: ../pidgin/gtkprefs.c:1880
+#: ../pidgin/gtkprefs.c:1950
 msgid "_Minutes before changing status:"
 msgstr "Število _minut pred spremembo stanja:"
 
-#: ../pidgin/gtkprefs.c:1888
+#: ../pidgin/gtkprefs.c:1958
 msgid "Change _status to:"
 msgstr "Spremeni _stanje v:"
 
 #. Signon status stuff
-#: ../pidgin/gtkprefs.c:1909
+#: ../pidgin/gtkprefs.c:1979
 msgid "Status at Startup"
 msgstr "Stanje ob zagonu"
 
-#: ../pidgin/gtkprefs.c:1911
+#: ../pidgin/gtkprefs.c:1981
 msgid "Use status from last _exit at startup"
 msgstr "Ob zagonu uporabi stanje ob zadnjem _izhodu"
 
-#: ../pidgin/gtkprefs.c:1917
+#: ../pidgin/gtkprefs.c:1987
 msgid "Status to a_pply at startup:"
 msgstr "Stanje ob _zagonu:"
 
-#: ../pidgin/gtkprefs.c:1955
+#: ../pidgin/gtkprefs.c:2025
 msgid "Interface"
 msgstr "Vmesnik"
 
-#: ../pidgin/gtkprefs.c:1957
+#: ../pidgin/gtkprefs.c:2027
 msgid "Smiley Themes"
 msgstr "Teme za smeške"
 
-#: ../pidgin/gtkprefs.c:1958
+#: ../pidgin/gtkprefs.c:2028
 msgid "Sounds"
 msgstr "Zvoki"
 
-#: ../pidgin/gtkprefs.c:1964
+#: ../pidgin/gtkprefs.c:2034
 msgid "Browser"
 msgstr "Brskalnik"
 
-#: ../pidgin/gtkprefs.c:1968
+#: ../pidgin/gtkprefs.c:2038
 msgid "Status / Idle"
 msgstr "Stanje / Nedejaven"
 
@@ -14448,66 +14540,66 @@
 msgid "Block only the users below"
 msgstr "Zavrni samo uporabnike spodaj"
 
-#: ../pidgin/gtkprivacy.c:372
+#: ../pidgin/gtkprivacy.c:369
 msgid "Privacy"
 msgstr "Zasebnost"
 
-#: ../pidgin/gtkprivacy.c:385
+#: ../pidgin/gtkprivacy.c:381
 msgid "Changes to privacy settings take effect immediately."
 msgstr "Spremembe nastavitev o zasebnosti stopijo v veljavo takoj."
 
 #. "Set privacy for:" label
-#: ../pidgin/gtkprivacy.c:397
+#: ../pidgin/gtkprivacy.c:393
 msgid "Set privacy for:"
 msgstr "Nastavi zasebnost za:"
 
-#: ../pidgin/gtkprivacy.c:560
-#: ../pidgin/gtkprivacy.c:577
+#: ../pidgin/gtkprivacy.c:556
+#: ../pidgin/gtkprivacy.c:573
 msgid "Permit User"
 msgstr "Dovoli uporabniku"
 
-#: ../pidgin/gtkprivacy.c:561
+#: ../pidgin/gtkprivacy.c:557
 msgid "Type a user you permit to contact you."
 msgstr "Vpišite uporabnika, ki mu želiš dovoliti, da stopi v stik z vami."
 
-#: ../pidgin/gtkprivacy.c:562
+#: ../pidgin/gtkprivacy.c:558
 msgid "Please enter the name of the user you wish to be able to contact you."
 msgstr "Prosim vnesite ime uporabnika, ki mu želite omogočiti, da stopi v stik z vami"
 
-#: ../pidgin/gtkprivacy.c:565
-#: ../pidgin/gtkprivacy.c:581
+#: ../pidgin/gtkprivacy.c:561
+#: ../pidgin/gtkprivacy.c:577
 msgid "_Permit"
 msgstr "_Dovoli"
 
-#: ../pidgin/gtkprivacy.c:571
+#: ../pidgin/gtkprivacy.c:567
 #, c-format
 msgid "Allow %s to contact you?"
 msgstr "Dovoli %s, da stopi v stik z vami?"
 
-#: ../pidgin/gtkprivacy.c:573
+#: ../pidgin/gtkprivacy.c:569
 #, c-format
 msgid "Are you sure you wish to allow %s to contact you?"
 msgstr "Ste prepričani, da želite dovoliti %s, da stopi v stik z vami?"
 
-#: ../pidgin/gtkprivacy.c:602
-#: ../pidgin/gtkprivacy.c:616
+#: ../pidgin/gtkprivacy.c:598
+#: ../pidgin/gtkprivacy.c:612
 msgid "Block User"
 msgstr "Zavrni uporabnika"
 
-#: ../pidgin/gtkprivacy.c:603
+#: ../pidgin/gtkprivacy.c:599
 msgid "Type a user to block."
 msgstr "Vpišite uporabnika, ki ga želite zavrniti."
 
-#: ../pidgin/gtkprivacy.c:604
+#: ../pidgin/gtkprivacy.c:600
 msgid "Please enter the name of the user you wish to block."
 msgstr "Vnesite ime uporabnika, ki ga želite zavrniti."
 
-#: ../pidgin/gtkprivacy.c:612
+#: ../pidgin/gtkprivacy.c:608
 #, c-format
 msgid "Block %s?"
 msgstr "Zavrnem %s?"
 
-#: ../pidgin/gtkprivacy.c:614
+#: ../pidgin/gtkprivacy.c:610
 #, c-format
 msgid "Are you sure you want to block %s?"
 msgstr "Ste prepričani, da želite zavrniti %s?"
@@ -14516,79 +14608,80 @@
 msgid "Apply"
 msgstr "Uporabi"
 
-#: ../pidgin/gtkrequest.c:1482
+#: ../pidgin/gtkrequest.c:1478
 msgid "That file already exists"
 msgstr "Datoteka že obstaja"
 
-#: ../pidgin/gtkrequest.c:1483
+#: ../pidgin/gtkrequest.c:1479
 msgid "Would you like to overwrite it?"
 msgstr "Ali jo želite prepisati?"
 
-#: ../pidgin/gtkrequest.c:1486
+#: ../pidgin/gtkrequest.c:1482
 msgid "Overwrite"
 msgstr "Prepiši"
 
-#: ../pidgin/gtkrequest.c:1487
+#: ../pidgin/gtkrequest.c:1483
 msgid "Choose New Name"
 msgstr "Izberite novo ime"
 
-#: ../pidgin/gtkrequest.c:1625
-#: ../pidgin/gtkrequest.c:1639
+#: ../pidgin/gtkrequest.c:1621
+#: ../pidgin/gtkrequest.c:1635
 msgid "Select Folder..."
 msgstr "Izberite mapo ..."
 
-#: ../pidgin/gtkroomlist.c:376
+#. Create the window.
+#: ../pidgin/gtkroomlist.c:374
 msgid "Room List"
 msgstr "Seznam sob"
 
 #. list button
-#: ../pidgin/gtkroomlist.c:446
+#: ../pidgin/gtkroomlist.c:442
 msgid "_Get List"
 msgstr "_Dobi seznam"
 
 #. add button
-#: ../pidgin/gtkroomlist.c:454
+#: ../pidgin/gtkroomlist.c:450
 msgid "_Add Chat"
 msgstr "_Dodaj pomenek"
 
-#: ../pidgin/gtksavedstatuses.c:331
+#: ../pidgin/gtksavedstatuses.c:336
 msgid "Are you sure you want to delete the selected saved statuses?"
 msgstr "Ste prepričani, da želite izbrisati izbrana shranjena stanja?"
 
 #. Use button
-#: ../pidgin/gtksavedstatuses.c:580
-#: ../pidgin/gtksavedstatuses.c:1213
+#: ../pidgin/gtksavedstatuses.c:619
+#: ../pidgin/gtksavedstatuses.c:1265
 msgid "_Use"
 msgstr "_Uporabi"
 
-#: ../pidgin/gtksavedstatuses.c:726
+#: ../pidgin/gtksavedstatuses.c:779
 msgid "Title already in use.  You must choose a unique title."
 msgstr "Naziv je že v uporabi. Prosimo, izberite drug naziv."
 
-#: ../pidgin/gtksavedstatuses.c:914
+#: ../pidgin/gtksavedstatuses.c:969
 msgid "Different"
 msgstr "Razno"
 
-#: ../pidgin/gtksavedstatuses.c:1106
+#: ../pidgin/gtksavedstatuses.c:1158
 msgid "_Title:"
 msgstr "_Naziv:"
 
-#: ../pidgin/gtksavedstatuses.c:1125
-#: ../pidgin/gtksavedstatuses.c:1446
+#: ../pidgin/gtksavedstatuses.c:1177
+#: ../pidgin/gtksavedstatuses.c:1494
 msgid "_Status:"
 msgstr "_Stanje:"
 
 #. Different status message expander
-#: ../pidgin/gtksavedstatuses.c:1157
+#: ../pidgin/gtksavedstatuses.c:1209
 msgid "Use a _different status for some accounts"
 msgstr "Za nekatere račune uporabi _različno stanje"
 
 #. Save & Use button
-#: ../pidgin/gtksavedstatuses.c:1221
+#: ../pidgin/gtksavedstatuses.c:1273
 msgid "Sa_ve & Use"
 msgstr "Shra_ni in uporabi"
 
-#: ../pidgin/gtksavedstatuses.c:1427
+#: ../pidgin/gtksavedstatuses.c:1477
 #, c-format
 msgid "Status for %s"
 msgstr "Stanje za %s"
@@ -14641,69 +14734,69 @@
 msgid "GStreamer failed to initialize."
 msgstr "GStreamer se ni uspel inicializirati."
 
-#: ../pidgin/gtkstatusbox.c:661
+#: ../pidgin/gtkstatusbox.c:663
 msgid "Waiting for network connection"
 msgstr "Čakanje na omrežno povezavo"
 
-#: ../pidgin/gtkutils.c:593
+#: ../pidgin/gtkutils.c:627
 msgid "Google Talk"
 msgstr "Google Talk"
 
-#: ../pidgin/gtkutils.c:1309
-#: ../pidgin/gtkutils.c:1332
+#: ../pidgin/gtkutils.c:1384
+#: ../pidgin/gtkutils.c:1407
 #, c-format
 msgid "The following error has occurred loading %s: %s"
 msgstr "Pri odpiranju %s je prišlo do neznane napake: %s"
 
-#: ../pidgin/gtkutils.c:1312
-#: ../pidgin/gtkutils.c:1334
+#: ../pidgin/gtkutils.c:1387
+#: ../pidgin/gtkutils.c:1409
 msgid "Failed to load image"
 msgstr "Slike ni mogoče odpreti"
 
-#: ../pidgin/gtkutils.c:1408
+#: ../pidgin/gtkutils.c:1483
 #, c-format
 msgid "Cannot send folder %s."
 msgstr "Ni mogoče poslati mape %s."
 
-#: ../pidgin/gtkutils.c:1409
+#: ../pidgin/gtkutils.c:1484
 #, c-format
 msgid "%s cannot transfer a folder. You will need to send the files within individually."
 msgstr "Mape %s ni mogoče prenesti. Datoteke boste morali poslati posamično."
 
-#: ../pidgin/gtkutils.c:1441
-#: ../pidgin/gtkutils.c:1453
-#: ../pidgin/gtkutils.c:1460
+#: ../pidgin/gtkutils.c:1516
+#: ../pidgin/gtkutils.c:1528
+#: ../pidgin/gtkutils.c:1535
 msgid "You have dragged an image"
 msgstr "Povlekli ste sliko"
 
-#: ../pidgin/gtkutils.c:1442
+#: ../pidgin/gtkutils.c:1517
 msgid "You can send this image as a file transfer, embed it into this message, or use it as the buddy icon for this user."
 msgstr "To sliko lahko pošljete kot datoteko, jo vključite v to sporočilo ali uporabite kot ikono za tega uporabnika."
 
-#: ../pidgin/gtkutils.c:1448
-#: ../pidgin/gtkutils.c:1468
+#: ../pidgin/gtkutils.c:1523
+#: ../pidgin/gtkutils.c:1543
 msgid "Set as buddy icon"
 msgstr "Nastavi kot ikono prijatelja"
 
-#: ../pidgin/gtkutils.c:1449
-#: ../pidgin/gtkutils.c:1469
+#: ../pidgin/gtkutils.c:1524
+#: ../pidgin/gtkutils.c:1544
 msgid "Send image file"
 msgstr "Pošlji slikovno datoteko"
 
-#: ../pidgin/gtkutils.c:1450
-#: ../pidgin/gtkutils.c:1469
+#: ../pidgin/gtkutils.c:1525
+#: ../pidgin/gtkutils.c:1544
 msgid "Insert in message"
 msgstr "Vstavi v sporočilo"
 
-#: ../pidgin/gtkutils.c:1454
+#: ../pidgin/gtkutils.c:1529
 msgid "Would you like to set it as the buddy icon for this user?"
 msgstr "Jo želite nastaviti za ikono prijatelja?"
 
-#: ../pidgin/gtkutils.c:1461
+#: ../pidgin/gtkutils.c:1536
 msgid "You can send this image as a file transfer, or use it as the buddy icon for this user."
 msgstr "To sliko lahko pošljete kot datoteko ali uporabite kot ikono za tega uporabnika."
 
-#: ../pidgin/gtkutils.c:1462
+#: ../pidgin/gtkutils.c:1537
 msgid "You can insert this image into this message, or use it as the buddy icon for this user"
 msgstr "To sliko lahko vstavite v to sporočilo ali pa jo uporabite kot ikono prijatelja za tega prijatelja"
 
@@ -14712,15 +14805,15 @@
 #. * send.  The only logical one is "Application," but do we really want to send a binary and nothing else?
 #. * Probably not.  I'll just give an error and return.
 #. The original patch sent the icon used by the launcher.  That's probably wrong
-#: ../pidgin/gtkutils.c:1520
+#: ../pidgin/gtkutils.c:1595
 msgid "Cannot send launcher"
 msgstr "Ni mogoče poslati zaganjalnika"
 
-#: ../pidgin/gtkutils.c:1520
+#: ../pidgin/gtkutils.c:1595
 msgid "You dragged a desktop launcher. Most likely you wanted to send whatever this launcher points to instead of this launcher itself."
 msgstr "Povlekli ste namizni zaganjalnik. Najverjetneje ste želeli namesto samega zaganjalnika poslati tisto, na kar ta zaganjalnik kaže."
 
-#: ../pidgin/gtkutils.c:2268
+#: ../pidgin/gtkutils.c:2317
 #, c-format
 msgid ""
 "<b>File:</b> %s\n"
@@ -14731,44 +14824,38 @@
 "<b>Velikost:</b> %s\n"
 "<b>Velikost slike:</b> %dx%d"
 
-#: ../pidgin/gtkutils.c:2564
+#: ../pidgin/gtkutils.c:2613
 #, c-format
 msgid "The file '%s' is too large for %s.  Please try a smaller image.\n"
 msgstr "Datoteka '%s' je prevelika za %s.  Prosimo, poskusite z manjšo sliko.\n"
 
-#: ../pidgin/gtkutils.c:2566
+#: ../pidgin/gtkutils.c:2615
 msgid "Icon Error"
 msgstr "Napaka ikone"
 
-#: ../pidgin/gtkutils.c:2567
+#: ../pidgin/gtkutils.c:2616
 msgid "Could not set icon"
 msgstr "Ikone ni mogoče nastaviti"
 
-#: ../pidgin/gtkutils.c:2667
+#: ../pidgin/gtkutils.c:2716
 #, c-format
 msgid "Failed to open file '%s': %s"
 msgstr "Datoteke '%s' ni mogoče odpreti: %s"
 
-#: ../pidgin/gtkutils.c:2716
+#: ../pidgin/gtkutils.c:2765
 #, c-format
 msgid "Failed to load image '%s': reason not known, probably a corrupt image file"
 msgstr "Sliko '%s' ni mogoče naložiti: razlog ni znan, najbrž je datoteka okvarjena"
 
-#: ../pidgin/gtkwhiteboard.c:760
-#: ../pidgin/gtkwhiteboard.c:779
+#: ../pidgin/gtkwhiteboard.c:754
+#: ../pidgin/gtkwhiteboard.c:773
 msgid "Save File"
 msgstr "Shrani datoteko"
 
-#: ../pidgin/gtkwhiteboard.c:867
+#: ../pidgin/gtkwhiteboard.c:861
 msgid "Select color"
 msgstr "Izberite barvo"
 
-#. Translators may want to transliterate the name.
-#. It is not to be translated.
-#: ../pidgin/pidgin.h:50
-msgid "Pidgin"
-msgstr "Pidgin"
-
 #: ../pidgin/pidginstock.c:81
 msgid "_Alias"
 msgstr "Psev_donim"
@@ -14793,10 +14880,6 @@
 msgid "_Open Mail"
 msgstr "_Odpri pošto"
 
-#: ../pidgin/pixmaps/emotes/default/22/default.theme.in.h:1
-msgid "Default"
-msgstr "Privzeto"
-
 #: ../pidgin/pixmaps/emotes/default/22/default.theme.in.h:2
 msgid "Pidgin smileys"
 msgstr "Smejčki Pidgin"
@@ -14854,18 +14937,18 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/cap/cap.c:934
+#: ../pidgin/plugins/cap/cap.c:935
 msgid "Contact Availability Prediction"
 msgstr "Napoved dosegljivosti stika"
 
 #. *< name
 #. *< version
-#: ../pidgin/plugins/cap/cap.c:936
+#: ../pidgin/plugins/cap/cap.c:937
 msgid "Contact Availability Prediction plugin."
 msgstr "Vstavek za napovedovanje dosegljivosti stika."
 
 #. *  summary
-#: ../pidgin/plugins/cap/cap.c:937
+#: ../pidgin/plugins/cap/cap.c:938
 msgid "The contact availability plugin (cap) is used to display statistical information about buddies in a users contact list."
 msgstr "Vstavek dosegljivosti stika (cap) se uporablja za prikaz statističnih podatkov o prijateljih v seznamu stikov."
 
@@ -14958,11 +15041,23 @@
 msgstr "Prejeta sporočila"
 
 #: ../pidgin/plugins/convcolors.c:210
-#: ../pidgin/plugins/pidginrc.c:320
+#: ../pidgin/plugins/pidginrc.c:251
 #, c-format
 msgid "Select Color for %s"
 msgstr "Nastavite barvo za %s"
 
+#: ../pidgin/plugins/convcolors.c:287
+msgid "Bold"
+msgstr "Krepko"
+
+#: ../pidgin/plugins/convcolors.c:294
+msgid "Italic"
+msgstr "Ležeče"
+
+#: ../pidgin/plugins/convcolors.c:301
+msgid "Underline"
+msgstr "Podčrtano"
+
 #: ../pidgin/plugins/convcolors.c:310
 msgid "Ignore incoming format"
 msgstr "Prezri dohodno obliko"
@@ -15075,39 +15170,39 @@
 msgstr "Neposredno sporočanje"
 
 #. Add the label.
-#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:460
+#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:457
 msgid "Select a person from your address book below, or add a new person."
 msgstr "Izberite osebo iz vašega adresarja spodaj ali dodajte novo."
 
-#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:554
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:307
+#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:551
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:303
 msgid "Group:"
 msgstr "Skupina:"
 
 #. "New Person" button
-#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:580
-#: ../pidgin/plugins/gevolution/assoc-buddy.c:469
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:251
+#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:577
+#: ../pidgin/plugins/gevolution/assoc-buddy.c:467
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:249
 msgid "New Person"
 msgstr "Nova oseba"
 
 #. "Select Buddy" button
-#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:597
+#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:594
 msgid "Select Buddy"
 msgstr "Izberi prijatelja"
 
 #. Add the label.
-#: ../pidgin/plugins/gevolution/assoc-buddy.c:345
+#: ../pidgin/plugins/gevolution/assoc-buddy.c:343
 msgid "Select a person from your address book to add this buddy to, or create a new person."
 msgstr "Izberite osebo iz vašega adresarja, ki ji želite dodati tega prijatelja, ali ustvarite novo osebo."
 
 #. Add the expander
-#: ../pidgin/plugins/gevolution/assoc-buddy.c:433
+#: ../pidgin/plugins/gevolution/assoc-buddy.c:431
 msgid "User _details"
 msgstr "Podrobnosti _o uporabniku"
 
 #. "Associate Buddy" button
-#: ../pidgin/plugins/gevolution/assoc-buddy.c:486
+#: ../pidgin/plugins/gevolution/assoc-buddy.c:484
 msgid "_Associate Buddy"
 msgstr "Pridruži prijatelj_a"
 
@@ -15161,32 +15256,32 @@
 msgid "Provides integration with Evolution."
 msgstr "Omogoča integracijo z Evolutionom."
 
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:267
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:263
 msgid "Please enter the person's information below."
 msgstr "Spodaj vnesite podatke o osebi."
 
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:271
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:267
 msgid "Please enter the buddy's screen name and account type below."
 msgstr "Spodaj vnesite prijateljevo pojavno ime in vrsto računa."
 
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:291
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:287
 msgid "Account type:"
 msgstr "Vrsta računa:"
 
 #. Optional Information section
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:315
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:311
 msgid "Optional information:"
 msgstr "Dodatne informacije:"
 
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:350
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:346
 msgid "First name:"
 msgstr "Ime:"
 
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:362
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:358
 msgid "Last name:"
 msgstr "Priimek:"
 
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:382
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:378
 msgid "E-mail:"
 msgstr "E-pošta:"
 
@@ -15486,24 +15581,24 @@
 msgid "Notify Dialog"
 msgstr "Pogovorno okno obvestila"
 
-#: ../pidgin/plugins/pidginrc.c:322
+#: ../pidgin/plugins/pidginrc.c:253
 msgid "Select Color"
 msgstr "Nastavite barvo"
 
-#: ../pidgin/plugins/pidginrc.c:361
+#: ../pidgin/plugins/pidginrc.c:300
+msgid "Select Interface Font"
+msgstr "Nastavite pisavo vmesnika"
+
+#: ../pidgin/plugins/pidginrc.c:303
 #, c-format
 msgid "Select Font for %s"
 msgstr "Nastavite pisavo za %s"
 
-#: ../pidgin/plugins/pidginrc.c:398
-msgid "Select Interface Font"
-msgstr "Nastavite pisavo vmesnika"
-
-#: ../pidgin/plugins/pidginrc.c:453
+#: ../pidgin/plugins/pidginrc.c:371
 msgid "GTK+ Interface Font"
 msgstr "Pisava vmesnika GTK+"
 
-#: ../pidgin/plugins/pidginrc.c:473
+#: ../pidgin/plugins/pidginrc.c:391
 msgid "GTK+ Text Shortcut Theme"
 msgstr "Tema bližnjic besedila GTK+"
 
@@ -15527,37 +15622,37 @@
 #. widget_bool_widgets[i]);
 #. }
 #.
-#: ../pidgin/plugins/pidginrc.c:510
+#: ../pidgin/plugins/pidginrc.c:428
 msgid "Interface colors"
 msgstr "Barve vmesnika"
 
-#: ../pidgin/plugins/pidginrc.c:534
+#: ../pidgin/plugins/pidginrc.c:452
 msgid "Widget Sizes"
 msgstr "Velikosti gradnikov"
 
-#: ../pidgin/plugins/pidginrc.c:555
+#: ../pidgin/plugins/pidginrc.c:473
 msgid "Fonts"
 msgstr "Pisave"
 
-#: ../pidgin/plugins/pidginrc.c:578
-msgid "Tools"
-msgstr "Orodja"
-
-#: ../pidgin/plugins/pidginrc.c:583
+#: ../pidgin/plugins/pidginrc.c:497
+msgid "Gtkrc File Tools"
+msgstr "Datotečna orodja Gtkrc"
+
+#: ../pidgin/plugins/pidginrc.c:502
 #, c-format
 msgid "Write settings to %s%sgtkrc-2.0"
 msgstr "Zapiši nastavitve v %s%sgtkrc-2.0"
 
-#: ../pidgin/plugins/pidginrc.c:591
+#: ../pidgin/plugins/pidginrc.c:511
 msgid "Re-read gtkrc files"
 msgstr "Ponovno preberi datoteke gtkrc"
 
-#: ../pidgin/plugins/pidginrc.c:624
+#: ../pidgin/plugins/pidginrc.c:544
 msgid "Pidgin GTK+ Theme Control"
 msgstr "Nadzor teme Gaim GTK+ v Pidginu"
 
-#: ../pidgin/plugins/pidginrc.c:626
-#: ../pidgin/plugins/pidginrc.c:627
+#: ../pidgin/plugins/pidginrc.c:546
+#: ../pidgin/plugins/pidginrc.c:547
 msgid "Provides access to commonly used gtkrc settings."
 msgstr "Omogoča dostop do pogosto uporabljenih nastavitev gtkrc."
 
@@ -15575,16 +15670,16 @@
 
 #: ../pidgin/plugins/relnot.c:71
 #, c-format
-msgid "You are using %s version %s.  The current version is %s.  You can get it from <a href=\""
-msgstr "Uporabljate %s različice %s.  Najnovejša dosegljiva različica je %s. Prenesete jo lahko z naslova <a href=\""
-
-#: ../pidgin/plugins/relnot.c:78
+msgid "You are using %s version %s.  The current version is %s.  You can get it from <a href=\"%s\">%s</a><hr>"
+msgstr "Uporabljate %s različice %s.  Najnovejša dosegljiva različica je %s. Prenesete jo lahko z naslova <a href=\"%s\">%s</a><hr>"
+
+#: ../pidgin/plugins/relnot.c:79
 #, c-format
 msgid "<b>ChangeLog:</b><br>%s"
 msgstr "<b>Dnevnik sprememb:</b><br>%s"
 
-#: ../pidgin/plugins/relnot.c:83
 #: ../pidgin/plugins/relnot.c:84
+#: ../pidgin/plugins/relnot.c:85
 msgid "New Version Available"
 msgstr "Na voljo je nova različica."
 
@@ -15594,85 +15689,85 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/relnot.c:142
+#: ../pidgin/plugins/relnot.c:143
 msgid "Release Notification"
 msgstr "Obvestilo o izdaji"
 
 #. *< name
 #. *< version
 #. *  summary
-#: ../pidgin/plugins/relnot.c:145
+#: ../pidgin/plugins/relnot.c:146
 msgid "Checks periodically for new releases."
 msgstr "Preverjaj, ali je na voljo nova različica."
 
 #. *  description
-#: ../pidgin/plugins/relnot.c:147
+#: ../pidgin/plugins/relnot.c:148
 msgid "Checks periodically for new releases and notifies the user with the ChangeLog."
 msgstr "Preverja, ali je na voljo nova različica in uporabika seznanja z dnevnikom sprememb."
 
-#: ../pidgin/plugins/spellchk.c:1965
+#: ../pidgin/plugins/spellchk.c:1962
 msgid "Duplicate Correction"
 msgstr "Popravek dvojnikov"
 
-#: ../pidgin/plugins/spellchk.c:1966
+#: ../pidgin/plugins/spellchk.c:1963
 msgid "The specified word already exists in the correction list."
 msgstr "Navedena beseda že obstaja v seznamu popravkov."
 
-#: ../pidgin/plugins/spellchk.c:2180
+#: ../pidgin/plugins/spellchk.c:2177
 msgid "Text Replacements"
 msgstr "Zamenjave besedila"
 
-#: ../pidgin/plugins/spellchk.c:2203
+#: ../pidgin/plugins/spellchk.c:2200
 msgid "You type"
 msgstr "Vi napišete"
 
-#: ../pidgin/plugins/spellchk.c:2217
+#: ../pidgin/plugins/spellchk.c:2214
 msgid "You send"
 msgstr "Jaz pošljem"
 
-#: ../pidgin/plugins/spellchk.c:2231
+#: ../pidgin/plugins/spellchk.c:2228
 msgid "Whole words only"
 msgstr "Samo cele besede"
 
-#: ../pidgin/plugins/spellchk.c:2243
+#: ../pidgin/plugins/spellchk.c:2240
 msgid "Case sensitive"
 msgstr "Razlikuj velike in male črke"
 
-#: ../pidgin/plugins/spellchk.c:2269
+#: ../pidgin/plugins/spellchk.c:2266
 msgid "Add a new text replacement"
 msgstr "Dodaj novo zamenjavo"
 
-#: ../pidgin/plugins/spellchk.c:2285
+#: ../pidgin/plugins/spellchk.c:2282
 msgid "You _type:"
 msgstr "Vi _napišete:"
 
-#: ../pidgin/plugins/spellchk.c:2302
+#: ../pidgin/plugins/spellchk.c:2299
 msgid "You _send:"
 msgstr "Jaz _pošljem:"
 
 #. Created here so it can be passed to whole_words_button_toggled.
-#: ../pidgin/plugins/spellchk.c:2314
+#: ../pidgin/plugins/spellchk.c:2311
 msgid "_Exact case match (uncheck for automatic case handling)"
 msgstr "_Natanko ujemanje velikih in malih črk (ne označi za samodejno ravnanje)"
 
-#: ../pidgin/plugins/spellchk.c:2316
+#: ../pidgin/plugins/spellchk.c:2313
 msgid "Only replace _whole words"
 msgstr "Zamenjaj le _cele besede"
 
-#: ../pidgin/plugins/spellchk.c:2341
+#: ../pidgin/plugins/spellchk.c:2338
 msgid "General Text Replacement Options"
 msgstr "Splošne možnosti zamenjave besedila"
 
-#: ../pidgin/plugins/spellchk.c:2342
+#: ../pidgin/plugins/spellchk.c:2339
 msgid "Enable replacement of last word on send"
 msgstr "Omogoči zamenjavo zadnje besede pri pošiljanju"
 
-#: ../pidgin/plugins/spellchk.c:2373
+#: ../pidgin/plugins/spellchk.c:2370
 msgid "Text replacement"
 msgstr "Zamenjava besedila"
 
-#: ../pidgin/plugins/spellchk.c:2375
-#: ../pidgin/plugins/spellchk.c:2376
+#: ../pidgin/plugins/spellchk.c:2372
+#: ../pidgin/plugins/spellchk.c:2373
 msgid "Replaces text in outgoing messages according to user-defined rules."
 msgstr "Zamenja besedilo v odhodnih sporočilih po uporabniško določenih pravilih."
 
@@ -15682,8 +15777,8 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/ticker/ticker.c:77
-#: ../pidgin/plugins/ticker/ticker.c:355
+#: ../pidgin/plugins/ticker/ticker.c:74
+#: ../pidgin/plugins/ticker/ticker.c:354
 msgid "Buddy Ticker"
 msgstr "Nabodalo prijateljev"
 
@@ -15691,8 +15786,8 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../pidgin/plugins/ticker/ticker.c:358
-#: ../pidgin/plugins/ticker/ticker.c:360
+#: ../pidgin/plugins/ticker/ticker.c:357
+#: ../pidgin/plugins/ticker/ticker.c:359
 msgid "A horizontal scrolling version of the buddy list."
 msgstr "Vodoravna inačica seznama prijateljev."
 
@@ -15774,44 +15869,44 @@
 msgid "This plugin allows the user to customize conversation and logging message timestamp formats."
 msgstr "Ta vtičnik omogoča uporabniku prilagajati zapis časovnega žiga pogovorov in dnevniških sporočil."
 
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:183
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:569
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:616
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:174
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:589
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:636
 msgid "Opacity:"
 msgstr "Neprosojnost:"
 
 #. IM Convo trans options
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:533
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:553
 msgid "IM Conversation Windows"
 msgstr "Pogovorna okna"
 
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:534
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:554
 msgid "_IM window transparency"
 msgstr "Pro_sojnost pogovornega okna"
 
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:548
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:568
 msgid "_Show slider bar in IM window"
 msgstr "_Prikaži drsno vrstico v pogovornem oknu"
 
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:555
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:575
 msgid "Remove IM window transparency on focus"
 msgstr "Odstrani prosojnost pogovornega okna v ospredju"
 
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:558
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:606
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:578
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:626
 msgid "Always on top"
 msgstr "Vedno na vrhu"
 
 #. Buddy List trans options
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:590
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:610
 msgid "Buddy List Window"
 msgstr "Seznam prijateljev"
 
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:591
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:611
 msgid "_Buddy List window transparency"
 msgstr "_Prosojnost seznama prijateljev"
 
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:604
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:624
 msgid "Remove Buddy List window transparency on focus"
 msgstr "Odstrani prosojnost seznama prijateljev v ospredju"
 
@@ -15821,19 +15916,19 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:664
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:684
 msgid "Transparency"
 msgstr "Prosojnost"
 
 #. *< name
 #. *< version
 #. *  summary
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:667
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:687
 msgid "Variable Transparency for the buddy list and conversations."
 msgstr "Poljubna prosojnost seznama prijateljev in pomenkov."
 
 #. *  description
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:669
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:689
 msgid ""
 "This plugin enables variable alpha transparency on conversation windows and the buddy list.\n"
 "\n"
@@ -15887,7 +15982,7 @@
 msgid "Provides options specific to Pidgin for Windows , such as buddy list docking."
 msgstr "Ponuja nastavitve, specifične za %s v okolju Windows, kot je sidranje seznama prijateljev."
 
-#: ../pidgin/plugins/xmppconsole.c:666
+#: ../pidgin/plugins/xmppconsole.c:667
 msgid "<font color='#777777'>Logged out.</font>"
 msgstr "<font color='#777777'>Odjavljeni.</font>"
 
@@ -15898,40 +15993,40 @@
 #. *< priority
 #. *< id
 #: ../pidgin/plugins/xmppconsole.c:746
-#: ../pidgin/plugins/xmppconsole.c:842
-#: ../pidgin/plugins/xmppconsole.c:861
+#: ../pidgin/plugins/xmppconsole.c:841
+#: ../pidgin/plugins/xmppconsole.c:860
 msgid "XMPP Console"
 msgstr "Konzola XMPP"
 
-#: ../pidgin/plugins/xmppconsole.c:754
+#: ../pidgin/plugins/xmppconsole.c:753
 msgid "Account: "
 msgstr "Račun: "
 
-#: ../pidgin/plugins/xmppconsole.c:781
+#: ../pidgin/plugins/xmppconsole.c:780
 msgid "<font color='#777777'>Not connected to XMPP</font>"
 msgstr "<font color='#777777'>V XMPP niste prijavljeni</font>"
 
-#: ../pidgin/plugins/xmppconsole.c:791
+#: ../pidgin/plugins/xmppconsole.c:790
 msgid "Insert an <iq/> stanza."
 msgstr "Vstavi vrstico <iq/>."
 
-#: ../pidgin/plugins/xmppconsole.c:800
+#: ../pidgin/plugins/xmppconsole.c:799
 msgid "Insert a <presence/> stanza."
 msgstr "Vstavi vrstico <presence/>."
 
-#: ../pidgin/plugins/xmppconsole.c:809
+#: ../pidgin/plugins/xmppconsole.c:808
 msgid "Insert a <message/> stanza."
 msgstr "Vstavi vrstico <message/>."
 
 #. *< name
 #. *< version
 #. *  summary
-#: ../pidgin/plugins/xmppconsole.c:864
+#: ../pidgin/plugins/xmppconsole.c:863
 msgid "Send and receive raw XMPP stanzas."
 msgstr "Pošlijaj in sprejemaj surove vrstice XMPP."
 
 #. *  description
-#: ../pidgin/plugins/xmppconsole.c:866
+#: ../pidgin/plugins/xmppconsole.c:865
 msgid "This plugin is useful for debbuging XMPP servers or clients."
 msgstr "Ta vstavek je uporaben za razhroščevanje strežnikov ali odjemalcev XMPP."