# HG changeset patch
# User Gabriel Schulhof <nix@go-nix.ca>
# Date 1187391012 0
# Node ID e19a9e7cf15dbbfc14c55be25bb806dc550eb914
# Parent  e42b22d0f564083c0680fa00176277f358fbe08e# Parent  96d5d37e08f046fba1555180df652fa1947beab8
merge of '157af56b7d2b30861754d904bd1a501357ee10a7'
     and 'fc666ac71d6625f3d3433d18f931f602c755d311'

diff -r e42b22d0f564 -r e19a9e7cf15d NEWS
--- a/NEWS	Fri Aug 17 22:50:00 2007 +0000
+++ b/NEWS	Fri Aug 17 22:50:12 2007 +0000
@@ -7,6 +7,13 @@
 	attention to Yahoo! and Bonjour. Thanks to everyone who 
 	contributed.
 
+	Luke: We have reworked some parts of the conversation windows in
+	response to user comments.  We did not quite reach 100 tickets
+	closed this release, so a fair few will role over again.  Still,
+	we are slowly but surely working our way through the reported bugs.
+	Many thanks to everyone who has helped with tracking down the
+	various issues, testing fixes, and getting patches in.
+
 2.1.0 (7/28/2007):
 	Sean: This release took a bit longer than 3 weeks, but boy is it 
 	worth it! We're beginning to experiment with new UI concepts and
diff -r e42b22d0f564 -r e19a9e7cf15d finch/gntblist.c
--- a/finch/gntblist.c	Fri Aug 17 22:50:00 2007 +0000
+++ b/finch/gntblist.c	Fri Aug 17 22:50:12 2007 +0000
@@ -1292,8 +1292,11 @@
 	account = purple_buddy_get_account(buddy);
 	presence = purple_buddy_get_presence(buddy);
 
-	if (!full || g_utf8_collate(purple_buddy_get_name(buddy), alias))
-		purple_notify_user_info_add_pair(user_info, _("Nickname"), alias);
+	if (!full || g_utf8_collate(purple_buddy_get_name(buddy), alias)) {
+		char *esc = g_markup_escape_text(alias, -1);
+		purple_notify_user_info_add_pair(user_info, _("Nickname"), esc);
+		g_free(esc);
+	}
 
 	tmp = g_strdup_printf("%s (%s)",
 			purple_account_get_username(account),
diff -r e42b22d0f564 -r e19a9e7cf15d pidgin/gtknotify.c
--- a/pidgin/gtknotify.c	Fri Aug 17 22:50:00 2007 +0000
+++ b/pidgin/gtknotify.c	Fri Aug 17 22:50:12 2007 +0000
@@ -151,6 +151,10 @@
 	mail_dialog = NULL;
 }
 
+static void email_row_activated_cb(GtkTreeView *tv, GtkTreePath *path, GtkTreeViewColumn *col, gpointer data) {
+	email_response_cb(GTK_DIALOG(mail_dialog->dialog), GTK_RESPONSE_YES, mail_dialog);
+}
+
 static void
 reset_mail_dialog(GtkDialog *dialog)
 {
@@ -377,6 +381,7 @@
 						 G_CALLBACK(email_response_cb), mail_dialog);
 		g_signal_connect(G_OBJECT(gtk_tree_view_get_selection(GTK_TREE_VIEW(mail_dialog->treeview))),
 						 "changed", G_CALLBACK(selection_changed_cb), mail_dialog);
+		g_signal_connect(G_OBJECT(mail_dialog->treeview), "row-activated", G_CALLBACK(email_row_activated_cb), NULL);
 
 		gtk_tree_view_set_headers_visible(GTK_TREE_VIEW(mail_dialog->treeview), FALSE);
 		gtk_tree_view_set_rules_hint(GTK_TREE_VIEW(mail_dialog->treeview), TRUE);
diff -r e42b22d0f564 -r e19a9e7cf15d po/ChangeLog
--- a/po/ChangeLog	Fri Aug 17 22:50:00 2007 +0000
+++ b/po/ChangeLog	Fri Aug 17 22:50:12 2007 +0000
@@ -1,10 +1,12 @@
 Pidgin and Finch: The Pimpin' Penguin IM Clients That're Good for the Soul
 
 version 2.1.1
+	* Afrikaans translation added (Friedel Wolff)
 	* Estonian translation updated (Ivar Smolin)
 	* Finnish translation updated (Timo Jyrinki)
 	* French translation updated (Éric Boumaour)
 	* Galician translation updated (Frco. Javier Rial Rodríguez)
+	* German translation updated (Bjoern Voigt)
 	* Hebrew translation updated (Shalom Craimer)
 	* Lithuanian translation updated (Laurynas Biveinis)
 	* Macedonian translation updated (Арангел Ангов)
diff -r e42b22d0f564 -r e19a9e7cf15d po/af.po
--- a/po/af.po	Fri Aug 17 22:50:00 2007 +0000
+++ b/po/af.po	Fri Aug 17 22:50:12 2007 +0000
@@ -1,28 +1,35 @@
-# Afrikaans translations for gaim
+# Afrikaans translations for pidgin
 # Copyright (C) 2006
 # This file is distributed under the same license as the pidgin package.
 # Friedel Wolff <friedel BY translate.org.za>, 2006-2007.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: 2.0.0\n"
+# Samuel Murray <leuce.com BY gmail.com>, 2007
+msgid ""
+msgstr ""
+"Project-Id-Version: 2.1.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-04-09 08:32-0400\n"
-"PO-Revision-Date: 2007-05-01 23:30+0200\n"
-"Last-Translator: F Wolff <friedel BY translate.org.za>\n"
+"POT-Creation-Date: 2007-08-14 03:22-0400\n"
+"PO-Revision-Date: 2007-08-17 10:10+0200\n"
+"Last-Translator: Samuel Murray <leuce.com BY gmail.com>\n"
 "Language-Team: <translate-discuss-af@lists.sourceforge.net>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Pootle 1.0beta2\n"
-
-#: ../finch/finch.c:229
+"X-Generator: Translate Toolkit 1.0.1\n"
+
+#. Translators may want to transliterate the name.
+#. It is not to be translated.
+#: ../finch/finch.c:64 ../finch/finch.c:300 ../finch/finch.c:329
+#: ../finch/finch.c:417
+msgid "Finch"
+msgstr "Finch"
+
+#: ../finch/finch.c:206
 #, c-format
 msgid "%s. Try `%s -h' for more information.\n"
 msgstr "%s. Probeer `%s -h' vir meer inligting.\n"
 
-#: ../finch/finch.c:231
+#: ../finch/finch.c:208
 #, c-format
 msgid ""
 "%s\n"
@@ -39,449 +46,515 @@
 "\n"
 "  -c, --config=DIR    gebruik DIR vir konfigurasielêers\n"
 "  -d, --debug         skryf ontfoutboodskappe na stdout\n"
-"  -h, --help          vertoon hierdie hulp en sluit af\n"
+"  -h, --help          wys hierdie hulp en sluit af\n"
 "  -n, --nologin       moenie outomaties anmeld nie\n"
 "  -v, --version       wys die huidige weergawe en sluit af\n"
 
-#: ../finch/gntaccount.c:119 ../finch/gntblist.c:274 ../finch/gntblist.c:393
-#: ../finch/gntblist.c:406 ../finch/gntplugin.c:154 ../finch/gntplugin.c:199
-#: ../finch/gntstatus.c:291 ../finch/gntstatus.c:299
-#: ../libpurple/protocols/jabber/buddy.c:1406
-#: ../libpurple/protocols/jabber/chat.c:679
-#: ../libpurple/protocols/jabber/chat.c:690
-#: ../libpurple/protocols/jabber/jabber.c:1216
-#: ../libpurple/protocols/qq/group_join.c:324
-#: ../libpurple/protocols/silc/ops.c:1451
+#: ../finch/finch.c:327 ../pidgin/gtkmain.c:711
+#, c-format
+msgid ""
+"%s encountered errors migrating your settings from %s to %s. Please "
+"investigate and complete the migration by hand. Please report this error at "
+"http://developer.pidgin.im"
+msgstr ""
+"%s kon nie u instellings van %s na %s migreer nie. Stel asb. ondersoek in, "
+"en handel die migrasie handmatig af. Rapporteer asb. hierdie fout by http://"
+"developer.pidgin.im"
+
+#: ../finch/gntaccount.c:123 ../finch/gntaccount.c:478 ../finch/gntblist.c:299
+#: ../finch/gntblist.c:432 ../finch/gntblist.c:445 ../finch/gntplugin.c:185
+#: ../finch/gntplugin.c:233 ../finch/gntstatus.c:300 ../finch/gntstatus.c:308
+#: ../libpurple/protocols/jabber/buddy.c:1464
+#: ../libpurple/protocols/jabber/chat.c:677
+#: ../libpurple/protocols/jabber/chat.c:688
+#: ../libpurple/protocols/jabber/jabber.c:1227
+#: ../libpurple/protocols/qq/group_join.c:328
+#: ../libpurple/protocols/qq/im.c:576 ../libpurple/protocols/silc/ops.c:57
+#: ../libpurple/protocols/silc/ops.c:1456
+#: ../libpurple/protocols/silc10/ops.c:1451
 msgid "Error"
 msgstr "Fout"
 
-#: ../finch/gntaccount.c:119
+#: ../finch/gntaccount.c:123
 msgid "Account was not added"
 msgstr "Rekening is nie bygevoeg nie"
 
-#: ../finch/gntaccount.c:120
+#: ../finch/gntaccount.c:124
 msgid "Screenname of an account must be non-empty."
 msgstr "Skermnaam van rekening kan nie leeg wees nie."
 
-#: ../finch/gntaccount.c:423 ../pidgin/gtkaccount.c:567
+#: ../finch/gntaccount.c:431
 msgid "New mail notifications"
 msgstr "Kennisgewings vir nuwe pos"
 
-#: ../finch/gntaccount.c:433 ../pidgin/gtkaccount.c:496
+#: ../finch/gntaccount.c:441
 msgid "Remember password"
 msgstr "Onthou wagwoord"
 
-#: ../finch/gntaccount.c:474 ../pidgin/gtkaccount.c:1430
-#: ../pidgin/gtkblist.c:3891
+#: ../finch/gntaccount.c:479
+msgid "There's no protocol plugins installed."
+msgstr "Daar is geen protokolinproppe geïnstalleer nie."
+
+#: ../finch/gntaccount.c:480
+msgid "(You probably forgot to 'make install'.)"
+msgstr "(U't waarskynlik vergeet om te 'make install'.)"
+
+#: ../finch/gntaccount.c:490 ../pidgin/gtkaccount.c:1478
+#: ../pidgin/gtkblist.c:4023
 msgid "Modify Account"
 msgstr "Wysig rekening"
 
-#: ../finch/gntaccount.c:474
+#: ../finch/gntaccount.c:490
 msgid "New Account"
 msgstr "Nuwe rekening"
 
-#: ../finch/gntaccount.c:500 ../pidgin/gtkaccount.c:407 ../pidgin/gtkft.c:695
+#: ../finch/gntaccount.c:515 ../pidgin/gtkft.c:695
 msgid "Protocol:"
 msgstr "Protokol:"
 
-#: ../finch/gntaccount.c:508 ../pidgin/gtkaccount.c:412
-#: ../pidgin/gtkblist.c:5293
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:295
+#: ../finch/gntaccount.c:523
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:291
 msgid "Screen name:"
 msgstr "Skermnaam:"
 
-#: ../finch/gntaccount.c:521 ../pidgin/gtkaccount.c:487
+#: ../finch/gntaccount.c:536
 msgid "Password:"
 msgstr "Wagwoord:"
 
-#: ../finch/gntaccount.c:531 ../pidgin/gtkblist.c:5314
-#: ../pidgin/gtkblist.c:5677
+#: ../finch/gntaccount.c:546
 msgid "Alias:"
 msgstr "Alias:"
 
 #. Cancel button
 #. Cancel
-#: ../finch/gntaccount.c:554 ../finch/gntaccount.c:615
-#: ../finch/gntaccount.c:834 ../finch/gntblist.c:316 ../finch/gntblist.c:383
-#: ../finch/gntblist.c:416 ../finch/gntblist.c:740 ../finch/gntblist.c:926
-#: ../finch/gntblist.c:1017 ../finch/gntblist.c:2049 ../finch/gntpounce.c:456
-#: ../finch/gntpounce.c:652 ../finch/gntprefs.c:284 ../finch/gntstatus.c:139
-#: ../finch/gntstatus.c:472 ../finch/gntstatus.c:597
-#: ../libpurple/account.c:969 ../libpurple/account.c:1218
-#: ../libpurple/account.c:1252 ../libpurple/conversation.c:1164
-#: ../libpurple/plugins/buddynote.c:51 ../libpurple/protocols/gg/gg.c:498
-#: ../libpurple/protocols/gg/gg.c:656 ../libpurple/protocols/gg/gg.c:792
-#: ../libpurple/protocols/gg/gg.c:871
+#: ../finch/gntaccount.c:569 ../finch/gntaccount.c:632
+#: ../finch/gntaccount.c:878 ../finch/gntblist.c:343 ../finch/gntblist.c:420
+#: ../finch/gntblist.c:455 ../finch/gntblist.c:802 ../finch/gntblist.c:1004
+#: ../finch/gntblist.c:1100 ../finch/gntblist.c:2209 ../finch/gntplugin.c:378
+#: ../finch/gntpounce.c:458 ../finch/gntpounce.c:656 ../finch/gntprefs.c:264
+#: ../finch/gntsound.c:1045 ../finch/gntstatus.c:144 ../finch/gntstatus.c:481
+#: ../finch/gntstatus.c:606 ../libpurple/account.c:984
+#: ../libpurple/account.c:1234 ../libpurple/account.c:1269
+#: ../libpurple/conversation.c:1173 ../libpurple/plugins/buddynote.c:51
+#: ../libpurple/protocols/gg/gg.c:502 ../libpurple/protocols/gg/gg.c:661
+#: ../libpurple/protocols/gg/gg.c:798 ../libpurple/protocols/gg/gg.c:879
 #: ../libpurple/protocols/jabber/buddy.c:588
-#: ../libpurple/protocols/jabber/buddy.c:1768
-#: ../libpurple/protocols/jabber/buddy.c:1802
-#: ../libpurple/protocols/jabber/chat.c:788
-#: ../libpurple/protocols/jabber/jabber.c:876
-#: ../libpurple/protocols/jabber/jabber.c:1371
-#: ../libpurple/protocols/jabber/xdata.c:338
-#: ../libpurple/protocols/msn/msn.c:250 ../libpurple/protocols/msn/msn.c:265
-#: ../libpurple/protocols/msn/msn.c:280 ../libpurple/protocols/msn/msn.c:295
-#: ../libpurple/protocols/msn/msn.c:312
-#: ../libpurple/protocols/oscar/oscar.c:6039
-#: ../libpurple/protocols/oscar/peer.c:1021
+#: ../libpurple/protocols/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: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:6042
+#: ../libpurple/protocols/oscar/peer.c:1023
 #: ../libpurple/protocols/qq/buddy_info.c:484
-#: ../libpurple/protocols/qq/buddy_opt.c:212
-#: ../libpurple/protocols/qq/buddy_opt.c:402
+#: ../libpurple/protocols/qq/buddy_opt.c:214
+#: ../libpurple/protocols/qq/buddy_opt.c:411
 #: ../libpurple/protocols/qq/group.c:124
-#: ../libpurple/protocols/qq/group_join.c:138
-#: ../libpurple/protocols/qq/group_join.c:359
-#: ../libpurple/protocols/qq/group_opt.c:142
-#: ../libpurple/protocols/qq/group_opt.c:392
-#: ../libpurple/protocols/qq/sys_msg.c:104
-#: ../libpurple/protocols/qq/sys_msg.c:159
-#: ../libpurple/protocols/qq/sys_msg.c:247
+#: ../libpurple/protocols/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:113
+#: ../libpurple/protocols/qq/sys_msg.c:172
+#: ../libpurple/protocols/qq/sys_msg.c:266
 #: ../libpurple/protocols/sametime/sametime.c:3389
-#: ../libpurple/protocols/sametime/sametime.c:3474
-#: ../libpurple/protocols/sametime/sametime.c:3644
-#: ../libpurple/protocols/sametime/sametime.c:5388
-#: ../libpurple/protocols/sametime/sametime.c:5477
-#: ../libpurple/protocols/sametime/sametime.c:5601
-#: ../libpurple/protocols/silc/buddy.c:467
-#: ../libpurple/protocols/silc/buddy.c:1078
-#: ../libpurple/protocols/silc/buddy.c:1183
-#: ../libpurple/protocols/silc/chat.c:597
-#: ../libpurple/protocols/silc/chat.c:726
-#: ../libpurple/protocols/silc/ops.c:1912
-#: ../libpurple/protocols/silc/silc.c:744
-#: ../libpurple/protocols/silc/silc.c:949
-#: ../libpurple/protocols/yahoo/yahoo.c:988
-#: ../libpurple/protocols/yahoo/yahoo.c:3228
-#: ../libpurple/protocols/yahoo/yahoo.c:3237 ../pidgin/gtkaccount.c:1866
-#: ../pidgin/gtkaccount.c:2446 ../pidgin/gtkblist.c:5733
-#: ../pidgin/gtkdialogs.c:724 ../pidgin/gtkdialogs.c:861
-#: ../pidgin/gtkdialogs.c:952 ../pidgin/gtkdialogs.c:971
-#: ../pidgin/gtkdialogs.c:993 ../pidgin/gtkdialogs.c:1013
-#: ../pidgin/gtkdialogs.c:1057 ../pidgin/gtkdialogs.c:1095
-#: ../pidgin/gtkdialogs.c:1149 ../pidgin/gtkdialogs.c:1186
-#: ../pidgin/gtkdialogs.c:1211 ../pidgin/gtkimhtmltoolbar.c:419
-#: ../pidgin/gtklog.c:294 ../pidgin/gtkplugin.c:286 ../pidgin/gtkpounce.c:1098
-#: ../pidgin/gtkprivacy.c:566 ../pidgin/gtkprivacy.c:579
-#: ../pidgin/gtkprivacy.c:604 ../pidgin/gtkprivacy.c:615
-#: ../pidgin/gtkrequest.c:270 ../pidgin/gtksavedstatuses.c:336
+#: ../libpurple/protocols/sametime/sametime.c:3475
+#: ../libpurple/protocols/sametime/sametime.c:3646
+#: ../libpurple/protocols/sametime/sametime.c:5398
+#: ../libpurple/protocols/sametime/sametime.c:5488
+#: ../libpurple/protocols/sametime/sametime.c:5613
+#: ../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:1006
+#: ../libpurple/protocols/yahoo/yahoo.c:3337
+#: ../libpurple/protocols/yahoo/yahoo.c:3348 ../pidgin/gtkaccount.c:1917
+#: ../pidgin/gtkaccount.c:2511 ../pidgin/gtkblist.c:5925
+#: ../pidgin/gtkdialogs.c:747 ../pidgin/gtkdialogs.c:885
+#: ../pidgin/gtkdialogs.c:977 ../pidgin/gtkdialogs.c:997
+#: ../pidgin/gtkdialogs.c:1021 ../pidgin/gtkdialogs.c:1043
+#: ../pidgin/gtkdialogs.c:1091 ../pidgin/gtkdialogs.c:1132
+#: ../pidgin/gtkdialogs.c:1188 ../pidgin/gtkdialogs.c:1227
+#: ../pidgin/gtkdialogs.c:1254 ../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:1572
 msgid "Cancel"
 msgstr "Kanselleer"
 
 #. Save button
 #. Save
-#: ../finch/gntaccount.c:558 ../finch/gntpounce.c:462 ../finch/gntprefs.c:284
-#: ../finch/gntstatus.c:475 ../finch/gntstatus.c:585
-#: ../libpurple/account.c:1251 ../libpurple/plugins/buddynote.c:50
-#: ../libpurple/protocols/jabber/buddy.c:587 ../pidgin/gtkdebug.c:762
+#: ../finch/gntaccount.c:573 ../finch/gntplugin.c:378 ../finch/gntpounce.c:464
+#: ../finch/gntprefs.c:264 ../finch/gntsound.c:1042 ../finch/gntstatus.c:484
+#: ../finch/gntstatus.c:594 ../libpurple/account.c:1268
+#: ../libpurple/plugins/buddynote.c:50
+#: ../libpurple/protocols/jabber/buddy.c:587 ../pidgin/gtkdebug.c:748
 #: ../pidgin/gtkrequest.c:276
 msgid "Save"
 msgstr "Stoor"
 
-#: ../finch/gntaccount.c:611 ../pidgin/gtkaccount.c:1860
-#: ../pidgin/gtksavedstatuses.c:328
+#: ../finch/gntaccount.c:626 ../pidgin/gtkaccount.c:1909
+#: ../pidgin/gtksavedstatuses.c:332 ../pidgin/gtkstatusbox.c:1566
 #, c-format
 msgid "Are you sure you want to delete %s?"
 msgstr "Wil u definitief %s uitvee?"
 
-#: ../finch/gntaccount.c:614
+#: ../finch/gntaccount.c:629
 msgid "Delete Account"
 msgstr "Vee rekening uit"
 
 #. Delete button
-#: ../finch/gntaccount.c:615 ../finch/gntaccount.c:681
-#: ../finch/gntpounce.c:651 ../finch/gntpounce.c:712 ../finch/gntstatus.c:139
-#: ../finch/gntstatus.c:201 ../pidgin/gtkaccount.c:1865 ../pidgin/gtklog.c:294
-#: ../pidgin/gtkpounce.c:1097 ../pidgin/gtkrequest.c:273
-#: ../pidgin/gtksavedstatuses.c:335
+#: ../finch/gntaccount.c:631 ../finch/gntaccount.c:701
+#: ../finch/gntpounce.c:655 ../finch/gntpounce.c:718 ../finch/gntstatus.c:143
+#: ../finch/gntstatus.c:209 ../pidgin/gtkaccount.c:1916 ../pidgin/gtklog.c:326
+#: ../pidgin/gtkpounce.c:1114 ../pidgin/gtkrequest.c:273
+#: ../pidgin/gtksavedstatuses.c:343 ../pidgin/gtkstatusbox.c:1571
 msgid "Delete"
 msgstr "Vee uit"
 
-#: ../finch/gntaccount.c:644 ../finch/gntblist.c:1955 ../finch/gntui.c:76
-#: ../pidgin/gtkaccount.c:2272 ../pidgin/gtkdocklet.c:530
+#: ../finch/gntaccount.c:663 ../finch/gntblist.c:2115 ../finch/gntui.c:81
+#: ../pidgin/gtkaccount.c:2334 ../pidgin/gtkdocklet.c:522
 msgid "Accounts"
 msgstr "Rekeninge"
 
-#: ../finch/gntaccount.c:650
+#: ../finch/gntaccount.c:669
 msgid "You can enable/disable accounts from the following list."
 msgstr "U kan rekeninge aktiveer/deaktiveer vanuit die volgende lys."
 
 #. Add button
-#: ../finch/gntaccount.c:673 ../finch/gntaccount.c:833 ../finch/gntblist.c:316
-#: ../finch/gntblist.c:383 ../finch/gntblist.c:416 ../finch/gntnotify.c:309
-#: ../finch/gntpounce.c:697 ../finch/gntstatus.c:191
-#: ../libpurple/protocols/gg/gg.c:870 ../libpurple/protocols/qq/sys_msg.c:104
-#: ../libpurple/protocols/qq/sys_msg.c:159
-#: ../libpurple/protocols/qq/sys_msg.c:247
-#: ../libpurple/protocols/sametime/sametime.c:5476
-#: ../libpurple/protocols/silc/chat.c:596 ../pidgin/gtkaccount.c:2445
-#: ../pidgin/gtkblist.c:5732 ../pidgin/gtkconv.c:1651
+#: ../finch/gntaccount.c:692 ../finch/gntaccount.c:877 ../finch/gntblist.c:342
+#: ../finch/gntblist.c:420 ../finch/gntblist.c:455 ../finch/gntnotify.c:379
+#: ../finch/gntpounce.c:702 ../finch/gntstatus.c:198
+#: ../libpurple/protocols/gg/gg.c:878 ../libpurple/protocols/qq/sys_msg.c:114
+#: ../libpurple/protocols/qq/sys_msg.c:173
+#: ../libpurple/protocols/qq/sys_msg.c:267
+#: ../libpurple/protocols/sametime/sametime.c:5487
+#: ../libpurple/protocols/silc/chat.c:615
+#: ../libpurple/protocols/silc10/chat.c:599 ../pidgin/gtkaccount.c:2510
+#: ../pidgin/gtkblist.c:5924 ../pidgin/gtkconv.c:1654
 #: ../pidgin/gtkrequest.c:274
 msgid "Add"
 msgstr "Voeg by"
 
 #. Modify button
-#: ../finch/gntaccount.c:677 ../finch/gntpounce.c:704
+#: ../finch/gntaccount.c:697 ../finch/gntpounce.c:710
 msgid "Modify"
 msgstr "Wysig"
 
-#: ../finch/gntaccount.c:758 ../pidgin/gtkaccount.c:2392
+#: ../finch/gntaccount.c:800 ../pidgin/gtkaccount.c:2457
 #, c-format
 msgid "%s%s%s%s has made %s his or her buddy%s%s"
 msgstr "%s%s%s%s het %s sy/haar vriend/vriendin gemaak%s%s"
 
-#: ../finch/gntaccount.c:831 ../pidgin/gtkaccount.c:2444
+#: ../finch/gntaccount.c:873 ../pidgin/gtkaccount.c:2509
 msgid "Add buddy to your list?"
 msgstr "Voeg vriend by u lys?"
 
-#: ../finch/gntaccount.c:883 ../pidgin/gtkaccount.c:2496
+#: ../finch/gntaccount.c:933 ../pidgin/gtkaccount.c:2567
 #, c-format
 msgid "%s%s%s%s wants to add %s to his or her buddy list%s%s"
 msgstr "%s%s%s%s wil %s by sy/haar vriendelys voeg%s%s"
 
-#: ../finch/gntaccount.c:903 ../finch/gntaccount.c:908
-#: ../pidgin/gtkaccount.c:2519 ../pidgin/gtkaccount.c:2525
+#: ../finch/gntaccount.c:958 ../finch/gntaccount.c:961
+#: ../finch/gntaccount.c:988 ../pidgin/gtkaccount.c:2590
+#: ../pidgin/gtkaccount.c:2596
 msgid "Authorize buddy?"
-msgstr "Laat vriend toe?"
-
-#: ../finch/gntaccount.c:905 ../finch/gntaccount.c:910
-#: ../pidgin/gtkaccount.c:2520 ../pidgin/gtkaccount.c:2526
+msgstr "Magtig vriend?"
+
+#: ../finch/gntaccount.c:965 ../finch/gntaccount.c:992
+#: ../pidgin/gtkaccount.c:2591 ../pidgin/gtkaccount.c:2597
 msgid "Authorize"
-msgstr "Laat toe"
-
-#: ../finch/gntaccount.c:906 ../finch/gntaccount.c:911
-#: ../pidgin/gtkaccount.c:2521 ../pidgin/gtkaccount.c:2527
+msgstr "Magtig"
+
+#: ../finch/gntaccount.c:966 ../finch/gntaccount.c:993
+#: ../pidgin/gtkaccount.c:2592 ../pidgin/gtkaccount.c:2598
 msgid "Deny"
 msgstr "Weier"
 
-#: ../finch/gntblist.c:266
+#: ../finch/gntblist.c:288
 msgid "You must provide a screename for the buddy."
 msgstr "U moet 'n skermnaam verskaf vir die vriend."
 
-#: ../finch/gntblist.c:268
+#: ../finch/gntblist.c:290
 msgid "You must provide a group."
 msgstr "U moet 'n groep voorsien."
 
-#: ../finch/gntblist.c:270
+#: ../finch/gntblist.c:292
 msgid "You must select an account."
 msgstr "U moet 'n rekening kies."
 
-#: ../finch/gntblist.c:274
+#: ../finch/gntblist.c:294
+msgid "The selected account is not online."
+msgstr "Die gekose rekening is nie aanlyn nie."
+
+#: ../finch/gntblist.c:299
 msgid "Error adding buddy"
 msgstr "Fout met byvoeging van vriend"
 
-#: ../finch/gntblist.c:299 ../libpurple/protocols/oscar/oscar.c:2851
-#: ../pidgin/gtkaccount.c:1941 ../pidgin/gtksavedstatuses.c:923
+#: ../finch/gntblist.c:324 ../libpurple/protocols/oscar/oscar.c:2858
+#: ../pidgin/gtkaccount.c:1990 ../pidgin/gtksavedstatuses.c:979
 msgid "Screen Name"
 msgstr "Skermnaam"
 
-#: ../finch/gntblist.c:302 ../finch/gntblist.c:375
-#: ../libpurple/protocols/msn/msn.c:1340
-#: ../libpurple/protocols/silc/chat.c:587
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:680
+#: ../finch/gntblist.c:327 ../finch/gntblist.c:409 ../finch/gntblist.c:1249
+#: ../libpurple/protocols/msn/msn.c:1364
+#: ../libpurple/protocols/silc/chat.c:606
+#: ../libpurple/protocols/silc10/chat.c:590
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:704
 #: ../libpurple/protocols/zephyr/zephyr.c:788
-#: ../libpurple/protocols/zephyr/zephyr.c:1206 ../pidgin/gtkdialogs.c:970
-#: ../pidgin/gtkdialogs.c:992 ../pidgin/gtkdialogs.c:1012
+#: ../libpurple/protocols/zephyr/zephyr.c:1207 ../pidgin/gtkdialogs.c:996
+#: ../pidgin/gtkdialogs.c:1020 ../pidgin/gtkdialogs.c:1042
 #: ../pidgin/gtkrequest.c:277
 msgid "Alias"
 msgstr "Alias"
 
-#: ../finch/gntblist.c:305 ../finch/gntblist.c:378
+#: ../finch/gntblist.c:330 ../finch/gntblist.c:412
 msgid "Group"
 msgstr "Groep"
 
-#: ../finch/gntblist.c:309 ../finch/gntblist.c:366 ../finch/gntblist.c:1186
-#: ../finch/gntnotify.c:155 ../finch/gntstatus.c:563
-#: ../libpurple/plugins/idle.c:153 ../libpurple/plugins/idle.c:189
-#: ../pidgin/gtkblist.c:2890 ../pidgin/gtknotify.c:476
-#: ../pidgin/gtkpounce.c:1265 ../pidgin/plugins/gevolution/gevolution.c:444
+#: ../finch/gntblist.c:334 ../finch/gntblist.c:400 ../finch/gntblist.c:1301
+#: ../finch/gntnotify.c:173 ../finch/gntstatus.c:572
+#: ../libpurple/plugins/idle.c:153 ../libpurple/plugins/idle.c:190
+#: ../pidgin/gtkblist.c:2986 ../pidgin/gtknotify.c:483
+#: ../pidgin/gtkpounce.c:1282 ../pidgin/plugins/gevolution/gevolution.c:445
 msgid "Account"
 msgstr "Rekening"
 
-#: ../finch/gntblist.c:315 ../finch/gntblist.c:787
-#: ../libpurple/protocols/silc/buddy.c:736
-#: ../libpurple/protocols/silc/buddy.c:1030
-#: ../libpurple/protocols/silc/buddy.c:1075
-#: ../libpurple/protocols/silc/buddy.c:1174
-#: ../libpurple/protocols/yahoo/yahoo.c:3142 ../pidgin/gtkblist.c:5247
-#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:447
+#: ../finch/gntblist.c:340 ../finch/gntblist.c:851
+#: ../libpurple/protocols/silc/buddy.c:725
+#: ../libpurple/protocols/silc/buddy.c:1027
+#: ../libpurple/protocols/silc/buddy.c:1072
+#: ../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:3182 ../pidgin/gtkblist.c:5431
+#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:445
 msgid "Add Buddy"
 msgstr "Voeg vriend by"
 
-#: ../finch/gntblist.c:315
+#: ../finch/gntblist.c:340
 msgid "Please enter buddy information."
 msgstr "Gee asb. vriendinligting."
 
-#: ../finch/gntblist.c:338 ../libpurple/blist.c:1197
+#: ../finch/gntblist.c:369 ../libpurple/blist.c:1190
 msgid "Chats"
 msgstr "Geselsies"
 
 #. Extract their Name and put it in
-#: ../finch/gntblist.c:372 ../libpurple/protocols/jabber/jabber.c:807
-#: ../libpurple/protocols/msn/msn.c:1513 ../libpurple/protocols/msn/msn.c:1578
-#: ../libpurple/protocols/msn/msn.c:1605
-#: ../libpurple/protocols/qq/buddy_info.c:44 ../pidgin/gtkplugin.c:579
-#: ../pidgin/gtkroomlist.c:621
+#: ../finch/gntblist.c:406 ../libpurple/protocols/jabber/jabber.c:813
+#: ../libpurple/protocols/msn/msn.c:1553 ../libpurple/protocols/msn/msn.c:1618
+#: ../libpurple/protocols/msn/msn.c:1645
+#: ../libpurple/protocols/qq/buddy_info.c:44 ../pidgin/gtkplugin.c:581
+#: ../pidgin/gtkroomlist.c:617
 #: ../pidgin/plugins/gevolution/add_buddy_dialog.c:132
 #: ../pidgin/plugins/gevolution/assoc-buddy.c:123
 msgid "Name"
 msgstr "Naam"
 
-#: ../finch/gntblist.c:381 ../finch/gntblist.c:789 ../pidgin/gtkblist.c:5623
+#: ../finch/gntblist.c:415 ../finch/gntblist.c:818
+msgid "Auto-join"
+msgstr "Outoaansluit"
+
+#: ../finch/gntblist.c:418 ../finch/gntblist.c:853 ../pidgin/gtkblist.c:5810
 msgid "Add Chat"
 msgstr "Voeg geselsie by"
 
-#: ../finch/gntblist.c:382
+#: ../finch/gntblist.c:419
 msgid "You can edit more information from the context menu later."
 msgstr "U kan later meer inligting wysig vanaf die kieslys."
 
-#: ../finch/gntblist.c:393 ../finch/gntblist.c:406
+#: ../finch/gntblist.c:432 ../finch/gntblist.c:445
 msgid "Error adding group"
 msgstr "Fout met byvoeg van groep"
 
-#: ../finch/gntblist.c:394
+#: ../finch/gntblist.c:433
 msgid "You must give a name for the group to add."
 msgstr "U moet 'n naam gee vir die nuwe groep."
 
-#: ../finch/gntblist.c:407
+#: ../finch/gntblist.c:446
 msgid "A group with the name already exists."
 msgstr "'n Groep met dié naam bestaan reeds."
 
-#: ../finch/gntblist.c:414 ../finch/gntblist.c:791
-#: ../libpurple/protocols/sametime/sametime.c:5387
-#: ../libpurple/protocols/sametime/sametime.c:5474 ../pidgin/gtkblist.c:5729
+#: ../finch/gntblist.c:453 ../finch/gntblist.c:855
+#: ../libpurple/protocols/sametime/sametime.c:5397
+#: ../libpurple/protocols/sametime/sametime.c:5485 ../pidgin/gtkblist.c:5921
 msgid "Add Group"
 msgstr "Voeg groep by"
 
-#: ../finch/gntblist.c:414
+#: ../finch/gntblist.c:453
 msgid "Enter the name of the group"
 msgstr "Gee die naam van die groep"
 
-#: ../finch/gntblist.c:739
+#: ../finch/gntblist.c:801
 msgid "Edit Chat"
 msgstr "Wysig geselsie"
 
-#: ../finch/gntblist.c:739
+#: ../finch/gntblist.c:801
 msgid "Please Update the necessary fields."
 msgstr "Dateer asb. die nodige velde."
 
-#: ../finch/gntblist.c:740 ../finch/gntstatus.c:196
+#: ../finch/gntblist.c:802 ../finch/gntstatus.c:204
 msgid "Edit"
 msgstr "Wysig"
 
-#: ../finch/gntblist.c:754
-msgid "Auto-join"
-msgstr "Outoaansluit"
-
-#: ../finch/gntblist.c:763
+#: ../finch/gntblist.c:827
 msgid "Edit Settings"
 msgstr "Wysig instellings"
 
-#: ../finch/gntblist.c:827 ../libpurple/protocols/silc/chat.c:878
+#: ../finch/gntblist.c:863 ../pidgin/gtkutils.c:930
+msgid "Information"
+msgstr "Inligting"
+
+#: ../finch/gntblist.c:863 ../pidgin/gtkutils.c:930
+msgid "Retrieving..."
+msgstr "Verkry tans..."
+
+#: ../finch/gntblist.c:903 ../finch/gntconv.c:407
+#: ../libpurple/protocols/silc/chat.c:899
+#: ../libpurple/protocols/silc10/chat.c:883
 msgid "Get Info"
 msgstr "Kry inligting"
 
-#: ../finch/gntblist.c:831
+#: ../finch/gntblist.c:907
 msgid "Add Buddy Pounce"
 msgstr "Voeg vriendwag by"
 
-#: ../finch/gntblist.c:838 ../libpurple/protocols/oscar/oscar.c:635
-#: ../pidgin/gtkconv.c:1599
+#. if (q_bud && is_online(q_bud->status)) {
+#: ../finch/gntblist.c:914 ../finch/gntconv.c:419
+#: ../libpurple/protocols/jabber/si.c:868
+#: ../libpurple/protocols/oscar/oscar.c:653 ../libpurple/protocols/qq/qq.c:587
+#: ../pidgin/gtkconv.c:1602
 msgid "Send File"
 msgstr "Stuur lêer"
 
-#: ../finch/gntblist.c:842
+#: ../finch/gntblist.c:918
 msgid "View Log"
 msgstr "Bekyk staaflêer"
 
-#: ../finch/gntblist.c:922
+#: ../finch/gntblist.c:999
 #, c-format
 msgid "Please enter the new name for %s"
 msgstr "Gee asb. die nuwe naam vir %s"
 
-#: ../finch/gntblist.c:924 ../finch/gntblist.c:925 ../finch/gntblist.c:1136
+#: ../finch/gntblist.c:1001 ../finch/gntblist.c:1249
 msgid "Rename"
 msgstr "Hernoem"
 
-#: ../finch/gntblist.c:924
+#: ../finch/gntblist.c:1001
+msgid "Set Alias"
+msgstr "Stel alias"
+
+#: ../finch/gntblist.c:1002
 msgid "Enter empty string to reset the name."
-msgstr ""
-
-#: ../finch/gntblist.c:997
+msgstr "Gee leë string om die naam terug te stel."
+
+#: ../finch/gntblist.c:1078
 msgid "Removing this contact will also remove all the buddies in the contact"
 msgstr ""
 "Verwydering van hierdie kontak sal ook al die vriende in hierdie kontak "
 "verwyder"
 
-#: ../finch/gntblist.c:1005
+#: ../finch/gntblist.c:1086
 msgid "Removing this group will also remove all the buddies in the group"
 msgstr ""
 "Verwydering van hierdie groep sal ook al die vriende in hierdie groep "
 "verwyder"
 
-#: ../finch/gntblist.c:1010
+#: ../finch/gntblist.c:1091
 #, c-format
 msgid "Are you sure you want to remove %s?"
 msgstr "Wil u definitief %s verwyder?"
 
 #. XXX: anything to do with the returned ui-handle?
-#: ../finch/gntblist.c:1013
+#: ../finch/gntblist.c:1094
 msgid "Confirm Remove"
 msgstr "Bevestig verwydering"
 
-#: ../finch/gntblist.c:1016 ../finch/gntblist.c:1138 ../finch/gntft.c:223
-#: ../pidgin/gtkblist.c:1100 ../pidgin/gtkconv.c:1648
-#: ../pidgin/gtkrequest.c:275 ../pidgin/gtkstatusbox.c:249
+#: ../finch/gntblist.c:1099 ../finch/gntblist.c:1251 ../finch/gntft.c:224
+#: ../pidgin/gtkconv.c:1651 ../pidgin/gtkrequest.c:275
+#: ../pidgin/gtkstatusbox.c:263
 msgid "Remove"
 msgstr "Verwyder"
 
 #. Buddy List
-#: ../finch/gntblist.c:1113 ../finch/gntblist.c:2118 ../finch/gntprefs.c:278
-#: ../finch/gntui.c:77 ../pidgin/gtkblist.c:4133
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:330
+#: ../finch/gntblist.c:1225 ../finch/gntblist.c:2294 ../finch/gntprefs.c:257
+#: ../finch/gntui.c:82 ../pidgin/gtkblist.c:4267
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:326
 msgid "Buddy List"
 msgstr "Vriendelys"
 
-#: ../finch/gntblist.c:1143
+#: ../finch/gntblist.c:1256
 msgid "Place tagged"
-msgstr ""
-
-#: ../finch/gntblist.c:1148
+msgstr "Plek gemerk"
+
+#: ../finch/gntblist.c:1261
 msgid "Toggle Tag"
-msgstr ""
+msgstr "Wissel merker"
 
 #. General
-#: ../finch/gntblist.c:1181 ../libpurple/protocols/gg/gg.c:627
-#: ../libpurple/protocols/gg/gg.c:1035 ../libpurple/protocols/gg/gg.c:1110
-#: ../libpurple/protocols/gg/gg.c:2182
+#: ../finch/gntblist.c:1296 ../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:821
-#: ../libpurple/protocols/jabber/buddy.c:1569
-#: ../libpurple/protocols/jabber/buddy.c:1751
-#: ../libpurple/protocols/jabber/jabber.c:817
-#: ../libpurple/protocols/msn/msn.c:1348 ../libpurple/protocols/msn/msn.c:1516
+#: ../libpurple/protocols/jabber/buddy.c: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:1528
-#: ../libpurple/protocols/silc/ops.c:1036
-#: ../libpurple/protocols/silc/ops.c:1179
-#: ../libpurple/protocols/silc/ops.c:1328
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1042 ../pidgin/gtkblist.c:2914
+#: ../libpurple/protocols/silc/buddy.c:1535
+#: ../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:1066 ../pidgin/gtkblist.c:3010
 msgid "Nickname"
 msgstr "Bynaam"
 
 #. Idle stuff
-#: ../finch/gntblist.c:1201 ../finch/gntprefs.c:281
-#: ../libpurple/protocols/bonjour/bonjour.c:322
-#: ../libpurple/protocols/jabber/buddy.c:646
-#: ../libpurple/protocols/jabber/buddy.c:686
-#: ../libpurple/protocols/msn/msn.c:513 ../libpurple/protocols/msn/state.c:32
-#: ../libpurple/protocols/novell/novell.c:2826
-#: ../libpurple/protocols/oscar/oscar.c:2875
-#: ../libpurple/protocols/yahoo/yahoo.c:2896
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:686 ../pidgin/gtkblist.c:2934
-#: ../pidgin/gtkblist.c:3323 ../pidgin/gtkprefs.c:1807
+#: ../finch/gntblist.c:1316 ../finch/gntprefs.c:260
+#: ../libpurple/protocols/bonjour/bonjour.c:333
+#: ../libpurple/protocols/jabber/buddy.c:647
+#: ../libpurple/protocols/jabber/buddy.c:687
+#: ../libpurple/protocols/msn/msn.c:516 ../libpurple/protocols/msn/state.c:32
+#: ../libpurple/protocols/novell/novell.c:2825
+#: ../libpurple/protocols/oscar/oscar.c:2882
+#: ../libpurple/protocols/yahoo/yahoo.c:2936
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:710 ../pidgin/gtkblist.c:3038
+#: ../pidgin/gtkblist.c:3443 ../pidgin/gtkprefs.c:1920
 msgid "Idle"
 msgstr "Ledig"
 
-#: ../finch/gntblist.c:1290
+#: ../finch/gntblist.c:1330
+msgid "On Mobile"
+msgstr "Op selfoon"
+
+#: ../finch/gntblist.c:1411
 #, c-format
 msgid ""
 "Online: %d\n"
@@ -490,12 +563,12 @@
 "Aanlyn: %d\n"
 "Totaal: %d"
 
-#: ../finch/gntblist.c:1299
+#: ../finch/gntblist.c:1420
 #, c-format
 msgid "Account: %s (%s)"
 msgstr "Rekening: %s (%s)"
 
-#: ../finch/gntblist.c:1311
+#: ../finch/gntblist.c:1432
 #, c-format
 msgid ""
 "\n"
@@ -504,161 +577,162 @@
 "\n"
 "Laas gesien: %s gelede"
 
-#: ../finch/gntblist.c:1560 ../pidgin/gtkdocklet.c:478
-#: ../pidgin/gtkstatusbox.c:1102
+#: ../finch/gntblist.c:1698 ../pidgin/gtkdocklet.c:470
+#: ../pidgin/gtkstatusbox.c:1070
 msgid "New..."
 msgstr "Nuwe..."
 
-#: ../finch/gntblist.c:1567 ../pidgin/gtkdocklet.c:479
-#: ../pidgin/gtkstatusbox.c:1103
+#: ../finch/gntblist.c:1705 ../pidgin/gtkdocklet.c:471
+#: ../pidgin/gtkstatusbox.c:1071
 msgid "Saved..."
 msgstr "Gestoor..."
 
-#: ../finch/gntblist.c:1923 ../finch/gntplugin.c:216 ../finch/gntui.c:81
-#: ../pidgin/gtkdocklet.c:531 ../pidgin/gtkplugin.c:528
+#: ../finch/gntblist.c:2083 ../finch/gntplugin.c:254 ../finch/gntui.c:86
+#: ../pidgin/gtkdocklet.c:523 ../pidgin/gtkplugin.c:530
 msgid "Plugins"
 msgstr "Inproppe"
 
-#: ../finch/gntblist.c:2030 ../pidgin/gtkdialogs.c:705
-#: ../pidgin/gtkdialogs.c:842 ../pidgin/gtkdialogs.c:922
+#: ../finch/gntblist.c:2190 ../pidgin/gtkdialogs.c:728
+#: ../pidgin/gtkdialogs.c:866 ../pidgin/gtkdialogs.c:947
 msgid "_Name"
 msgstr "_Naam"
 
-#: ../finch/gntblist.c:2035 ../pidgin/gtkdialogs.c:710
-#: ../pidgin/gtkdialogs.c:847 ../pidgin/gtkdialogs.c:927
+#: ../finch/gntblist.c:2195 ../pidgin/gtkdialogs.c:733
+#: ../pidgin/gtkdialogs.c:871 ../pidgin/gtkdialogs.c:952
 msgid "_Account"
 msgstr "_Rekening"
 
-#: ../finch/gntblist.c:2043 ../pidgin/gtkdialogs.c:718
+#: ../finch/gntblist.c:2203 ../pidgin/gtkdialogs.c:741
 msgid "New Instant Message"
 msgstr "Nuwe kitsboodskap"
 
-#: ../finch/gntblist.c:2045 ../pidgin/gtkdialogs.c:720
+#: ../finch/gntblist.c:2205 ../pidgin/gtkdialogs.c:743
 msgid ""
 "Please enter the screen name or alias of the person you would like to IM."
 msgstr ""
 "Gee asb. die skermnaam of alias van die persoon om 'n kitsboodskap heen te "
 "stuur."
 
-#: ../finch/gntblist.c:2048 ../finch/gntconn.c:47 ../finch/gntnotify.c:79
-#: ../libpurple/account.c:968 ../libpurple/account.c:1217
-#: ../libpurple/protocols/gg/gg.c:497 ../libpurple/protocols/gg/gg.c:655
-#: ../libpurple/protocols/gg/gg.c:791
-#: ../libpurple/protocols/jabber/jabber.c:1370
-#: ../libpurple/protocols/jabber/xdata.c:337
-#: ../libpurple/protocols/msn/msn.c:249 ../libpurple/protocols/msn/msn.c:264
-#: ../libpurple/protocols/msn/msn.c:279 ../libpurple/protocols/msn/msn.c:294
-#: ../libpurple/protocols/oscar/oscar.c:6038
-#: ../libpurple/protocols/silc/buddy.c:466
-#: ../libpurple/protocols/silc/buddy.c:1182
-#: ../libpurple/protocols/silc/chat.c:424
-#: ../libpurple/protocols/silc/chat.c:462
-#: ../libpurple/protocols/silc/chat.c:725
-#: ../libpurple/protocols/silc/ops.c:1297
-#: ../libpurple/protocols/silc/ops.c:1911
-#: ../libpurple/protocols/silc/silc.c:743
-#: ../libpurple/protocols/yahoo/yahoo.c:987
-#: ../libpurple/protocols/yahoo/yahoo.c:3227
-#: ../libpurple/protocols/yahoo/yahoo.c:3236 ../pidgin/gtkblist.c:3890
-#: ../pidgin/gtkdialogs.c:723 ../pidgin/gtkdialogs.c:860
-#: ../pidgin/gtkdialogs.c:951 ../pidgin/gtkrequest.c:269
+#: ../finch/gntblist.c:2208 ../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:6041
+#: ../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:1005
+#: ../libpurple/protocols/yahoo/yahoo.c:3336
+#: ../libpurple/protocols/yahoo/yahoo.c:3347 ../pidgin/gtkblist.c:4022
+#: ../pidgin/gtkdialogs.c:746 ../pidgin/gtkdialogs.c:884
+#: ../pidgin/gtkdialogs.c:976 ../pidgin/gtkrequest.c:269
 msgid "OK"
 msgstr "Regso"
 
 #. Create the "Options" frame.
-#: ../finch/gntblist.c:2067 ../finch/gntpounce.c:444 ../pidgin/gtkpounce.c:776
+#: ../finch/gntblist.c:2228 ../finch/gntpounce.c:446 ../pidgin/gtkpounce.c:791
 msgid "Options"
 msgstr "Keuses"
 
-#: ../finch/gntblist.c:2073
+#: ../finch/gntblist.c:2234
 msgid "Send IM..."
 msgstr "Stuur kitsboodskap..."
 
-#: ../finch/gntblist.c:2077
-msgid "Toggle offline buddies"
-msgstr ""
-
-#: ../finch/gntblist.c:2083
+#: ../finch/gntblist.c:2238
+msgid "Show empty groups"
+msgstr "Wys leë groepe"
+
+#: ../finch/gntblist.c:2244
+msgid "Show offline buddies"
+msgstr "Wys aflynvriende"
+
+#: ../finch/gntblist.c:2250
 msgid "Sort by status"
 msgstr "Sorteer volgens status"
 
-#: ../finch/gntblist.c:2087
+#: ../finch/gntblist.c:2254
 msgid "Sort alphabetically"
 msgstr "Sorteer alfabeties"
 
-#: ../finch/gntblist.c:2091
+#: ../finch/gntblist.c:2258
 msgid "Sort by log size"
 msgstr "Sorteer volgens staaflêergrootte"
 
-#: ../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 "%s afgesny."
 
-#: ../finch/gntconn.c:42
-#, c-format
-msgid ""
-"%s was disconnected due to the following error:\n"
-"%s"
-msgstr ""
-"%s is afgesny weens die volgende fout:\n"
-"%s"
-
-#: ../finch/gntconn.c:45 ../libpurple/account.c:996
-#: ../libpurple/connection.c:107 ../pidgin/gtkblist.c:3888
-msgid "Connection Error"
-msgstr "Verbindingfout"
-
-#: ../finch/gntconn.c:48 ../libpurple/protocols/sametime/sametime.c:3643
-#: ../pidgin/gtkblist.c:3892
-msgid "Connect"
-msgstr "Verbind"
-
-#: ../finch/gntconv.c:103
+#: ../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 sal nie weer probeer verbind totdat u die fout reggemaak het en die "
+"rekening geheraktiveer het nie."
+
+#: ../finch/gntconv.c:117
 msgid "No such command."
 msgstr "Daar is nie so 'n opdrag nie."
 
-#: ../finch/gntconv.c:107 ../pidgin/gtkconv.c:507
+#: ../finch/gntconv.c:121 ../pidgin/gtkconv.c:495
 msgid "Syntax Error:  You typed the wrong number of arguments to that command."
 msgstr ""
 "Sintaksfout:  U het die verkeerde aantal argumente vir daardie opdrag getik."
 
-#: ../finch/gntconv.c:112 ../pidgin/gtkconv.c:512
+#: ../finch/gntconv.c:126 ../pidgin/gtkconv.c:501
 msgid "Your command failed for an unknown reason."
 msgstr "Die opdrag het misluk weens 'n onbekende rede."
 
-#: ../finch/gntconv.c:117 ../pidgin/gtkconv.c:518
+#: ../finch/gntconv.c:131 ../pidgin/gtkconv.c:508
 msgid "That command only works in chats, not IMs."
-msgstr "Daardie opdrag werk net in geselsies, nie gesprekke nie."
-
-#: ../finch/gntconv.c:120 ../pidgin/gtkconv.c:521
+msgstr "Daardie opdrag werk net in geselsies, nie kitsboodskappe nie."
+
+#: ../finch/gntconv.c:134 ../pidgin/gtkconv.c:511
 msgid "That command only works in IMs, not chats."
-msgstr "Daardie opdrag werk net in gesprekke, nie geselsies nie."
-
-#: ../finch/gntconv.c:124 ../pidgin/gtkconv.c:525
+msgstr "Daardie opdrag werk net in kitsboodskappe, nie geselsies nie."
+
+#: ../finch/gntconv.c:138 ../pidgin/gtkconv.c:516
 msgid "That command doesn't work on this protocol."
 msgstr "Daardie opdrag werk nie met hierdie protokol nie."
 
-#: ../finch/gntconv.c:131
-msgid "Commands are not supported yet. Message was NOT sent."
-msgstr "Opdragte word nog nie ondersteun nie. Boodskap is NIE gestuur nie."
-
-#: ../finch/gntconv.c:234
+#: ../finch/gntconv.c:224
 #, c-format
 msgid "%s (%s -- %s)"
 msgstr "%s (%s -- %s)"
 
-#: ../finch/gntconv.c:257
+#: ../finch/gntconv.c:247
 #, c-format
 msgid "%s [%s]"
 msgstr "%s [%s]"
 
-#: ../finch/gntconv.c:262 ../finch/gntconv.c:436
+#: ../finch/gntconv.c:252 ../finch/gntconv.c:647
 #, c-format
 msgid ""
 "\n"
@@ -667,24 +741,48 @@
 "\n"
 "%s tik..."
 
-#: ../finch/gntconv.c:403
+#: ../finch/gntconv.c:271
+msgid "You have left this chat."
+msgstr "U het hierdie geselsie verlaat."
+
+#: ../finch/gntconv.c:342
+msgid "Send To"
+msgstr "Stuur na"
+
+#: ../finch/gntconv.c:386
+msgid "Conversation"
+msgstr "Gesprek"
+
+#: ../finch/gntconv.c:392
+msgid "Clear Scrollback"
+msgstr "Maak gesprekvenster skoon"
+
+#: ../finch/gntconv.c:396 ../finch/gntprefs.c:190
+msgid "Show Timestamps"
+msgstr "Wys tydstempels"
+
+#: ../finch/gntconv.c:412
+msgid "Add Buddy Pounce..."
+msgstr "Voeg vriendwag by..."
+
+#: ../finch/gntconv.c:613
 msgid "<AUTO-REPLY> "
-msgstr ""
+msgstr "<AUTO-REPLY> "
 
 #. Print the list of users in the room
-#: ../finch/gntconv.c:505
+#: ../finch/gntconv.c:735
 msgid "List of users:\n"
 msgstr "Lys van gebruikers:\n"
 
-#: ../finch/gntconv.c:629 ../pidgin/gtkconv.c:388
+#: ../finch/gntconv.c:880 ../pidgin/gtkconv.c:338
 msgid "Supported debug options are:  version"
-msgstr ""
-
-#: ../finch/gntconv.c:664 ../pidgin/gtkconv.c:424
+msgstr "Ondersteunde ontfoutkeuses is:  weergawe"
+
+#: ../finch/gntconv.c:915 ../pidgin/gtkconv.c:387
 msgid "No such command (in this context)."
 msgstr "Daar is nie so 'n opdrag (in hierdie konteks) nie."
 
-#: ../finch/gntconv.c:667 ../pidgin/gtkconv.c:427
+#: ../finch/gntconv.c:918 ../pidgin/gtkconv.c:390
 msgid ""
 "Use \"/help &lt;command&gt;\" for help on a specific command.\n"
 "The following commands are available in this context:\n"
@@ -692,18 +790,18 @@
 "Gebruik \"/help &lt;opdrag&gt;\" vir hulp met 'n spesifieke opdrag.\n"
 "Die volgende opdragte is in hierdie konteks beskikbaar:\n"
 
-#: ../finch/gntconv.c:706 ../pidgin/gtkconv.c:6949
+#: ../finch/gntconv.c:976 ../pidgin/gtkconv.c:7346
 msgid ""
 "say &lt;message&gt;:  Send a message normally as if you weren't using a "
 "command."
 msgstr ""
 "say &lt;boodskap&gt;:  Stuur 'n boodskap gewoonweg net soos sonder 'n opdrag."
 
-#: ../finch/gntconv.c:709 ../pidgin/gtkconv.c:6952
+#: ../finch/gntconv.c:979 ../pidgin/gtkconv.c:7349
 msgid "me &lt;action&gt;:  Send an IRC style action to a buddy or chat."
-msgstr "me &lt;action&gt;:  Stuur 'n IRC-tipe aksie na 'n vriend of geselskap."
-
-#: ../finch/gntconv.c:712 ../pidgin/gtkconv.c:6955
+msgstr "me &lt;action&gt;:  Stuur 'n IRC-tipe aksie na 'n vriend of geselsie."
+
+#: ../finch/gntconv.c:982 ../pidgin/gtkconv.c:7352
 msgid ""
 "debug &lt;option&gt;:  Send various debug information to the current "
 "conversation."
@@ -711,39 +809,43 @@
 "debug &lt;option&gt;:  Stuur 'n verskeidenheid ontfout-inligting na die "
 "huidige gesprek."
 
-#: ../finch/gntconv.c:715 ../pidgin/gtkconv.c:6958
+#: ../finch/gntconv.c:985 ../pidgin/gtkconv.c:7355
 msgid "clear: Clears the conversation scrollback."
 msgstr "clear: Maak die gesprekvenster skoon."
 
-#: ../finch/gntconv.c:718 ../pidgin/gtkconv.c:6961
+#: ../finch/gntconv.c:988 ../pidgin/gtkconv.c:7361
 msgid "help &lt;command&gt;:  Help on a specific command."
 msgstr "help &lt;opdrag&gt;:  Hulp oor 'n spesifieke opdrag."
 
-#: ../finch/gntconv.c:723
+#: ../finch/gntconv.c:991
+msgid "users:  Show the list of users in the chat."
+msgstr "gebruikers:  Wys die lys gebruikers in hierdie geselsie."
+
+#: ../finch/gntconv.c:996
 msgid "plugins: Show the plugins window."
 msgstr "plugins: Wys die inpropvenster."
 
-#: ../finch/gntconv.c:726
+#: ../finch/gntconv.c:999
 msgid "buddylist: Show the buddylist."
 msgstr "buddylist: Wys die vriendelys."
 
-#: ../finch/gntconv.c:729
+#: ../finch/gntconv.c:1002
 msgid "accounts: Show the accounts window."
 msgstr "accounts: Wys die rekeningvenster."
 
-#: ../finch/gntconv.c:732
+#: ../finch/gntconv.c:1005
 msgid "debugwin: Show the debug window."
 msgstr "debugwin: Wys die ontfoutvenster."
 
-#: ../finch/gntconv.c:735
+#: ../finch/gntconv.c:1008
 msgid "prefs: Show the preference window."
 msgstr "prefs: Wys die voorkeurevenster."
 
-#: ../finch/gntconv.c:738
+#: ../finch/gntconv.c:1011
 msgid "statuses: Show the savedstatuses window."
 msgstr "statuses: Wys die venster met gestoorde statusse."
 
-#: ../finch/gntdebug.c:225 ../finch/gntui.c:79 ../pidgin/gtkdebug.c:708
+#: ../finch/gntdebug.c:234 ../finch/gntui.c:84 ../pidgin/gtkdebug.c:694
 msgid "Debug Window"
 msgstr "Ontfoutvenster"
 
@@ -751,180 +853,194 @@
 #. * it's necessary to make the width of the debug window resizable ... like I said,
 #. * it doesn't make sense. The bug is likely in the packing in gntbox.c.
 #.
-#: ../finch/gntdebug.c:246 ../pidgin/gtkdebug.c:767
+#: ../finch/gntdebug.c:255 ../pidgin/gtkdebug.c:753
 msgid "Clear"
 msgstr "Maak skoon"
 
-#: ../finch/gntdebug.c:251 ../pidgin/gtkdebug.c:776
+#: ../finch/gntdebug.c:261
+msgid "Filter: "
+msgstr "Filter: "
+
+#: ../finch/gntdebug.c:265 ../pidgin/gtkdebug.c:762
 msgid "Pause"
 msgstr "Pouseer"
 
-#: ../finch/gntdebug.c:256 ../pidgin/gtkdebug.c:783 ../pidgin/gtkdebug.c:784
-msgid "Timestamps"
-msgstr "Tydstempels"
-
 #: ../finch/gntft.c:117 ../pidgin/gtkft.c:228
 #, c-format
 msgid "File Transfers - %d%% of %d files"
 msgstr "Lêeroordragte - %d%% van %d lêers"
 
-#: ../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:85
+#: ../pidgin/gtkft.c:233 ../pidgin/gtkft.c:761
 msgid "File Transfers"
 msgstr "Lêeroordragte"
 
-#: ../finch/gntft.c:197 ../pidgin/gtkft.c:644
+#: ../finch/gntft.c:198 ../pidgin/gtkft.c:644
 msgid "Progress"
 msgstr "Vordering"
 
-#: ../finch/gntft.c:197 ../pidgin/gtkft.c:651
+#: ../finch/gntft.c:198 ../pidgin/gtkft.c:651
 msgid "Filename"
 msgstr "Lêernaam"
 
-#: ../finch/gntft.c:197 ../pidgin/gtkft.c:658
+#: ../finch/gntft.c:198 ../pidgin/gtkft.c:658
 msgid "Size"
 msgstr "Grootte"
 
-#: ../finch/gntft.c:197
+#: ../finch/gntft.c:198
 msgid "Speed"
 msgstr "Spoed"
 
-#: ../finch/gntft.c:197 ../pidgin/gtkft.c:665
+#: ../finch/gntft.c:198 ../pidgin/gtkft.c:665
 msgid "Remaining"
 msgstr "Oorblywend"
 
 #. XXX: Use of ggp_str_to_uin() is an ugly hack!
-#: ../finch/gntft.c:197 ../finch/gntstatus.c:534 ../finch/gntstatus.c:563
-#: ../libpurple/protocols/bonjour/bonjour.c:326
-#: ../libpurple/protocols/gg/gg.c:1024 ../libpurple/protocols/gg/gg.c:1563
-#: ../libpurple/protocols/gg/gg.c:1571
-#: ../libpurple/protocols/jabber/buddy.c:637
-#: ../libpurple/protocols/jabber/buddy.c:641
-#: ../libpurple/protocols/jabber/buddy.c:676
-#: ../libpurple/protocols/jabber/jabber.c:1201
-#: ../libpurple/protocols/msn/msn.c:512
-#: ../libpurple/protocols/novell/novell.c:2836
-#: ../libpurple/protocols/oscar/oscar.c:802
-#: ../libpurple/protocols/oscar/oscar.c:807
-#: ../libpurple/protocols/oscar/oscar.c:809
-#: ../libpurple/protocols/oscar/oscar.c:2664
-#: ../libpurple/protocols/oscar/oscar.c:3782
+#: ../finch/gntft.c:198 ../finch/gntstatus.c:543 ../finch/gntstatus.c:572
+#: ../libpurple/protocols/bonjour/bonjour.c:337
+#: ../libpurple/protocols/gg/gg.c:1034 ../libpurple/protocols/gg/gg.c:1571
+#: ../libpurple/protocols/gg/gg.c:1579
+#: ../libpurple/protocols/jabber/buddy.c:638
+#: ../libpurple/protocols/jabber/buddy.c:642
+#: ../libpurple/protocols/jabber/buddy.c:677
+#: ../libpurple/protocols/jabber/jabber.c:1212
+#: ../libpurple/protocols/msn/msn.c:515
+#: ../libpurple/protocols/novell/novell.c:2835
+#: ../libpurple/protocols/oscar/oscar.c:820
+#: ../libpurple/protocols/oscar/oscar.c:825
+#: ../libpurple/protocols/oscar/oscar.c:827
+#: ../libpurple/protocols/oscar/oscar.c:2670
+#: ../libpurple/protocols/oscar/oscar.c:3748
 #: ../libpurple/protocols/sametime/sametime.c:3264
-#: ../libpurple/protocols/sametime/sametime.c:4149
-#: ../libpurple/protocols/yahoo/yahoo.c:3047 ../pidgin/gtkblist.c:2978
-#: ../pidgin/gtkblist.c:2991 ../pidgin/gtkblist.c:2993
-#: ../pidgin/gtksavedstatuses.c:942 ../pidgin/gtksavedstatuses.c:1089
+#: ../libpurple/protocols/sametime/sametime.c:4151
+#: ../libpurple/protocols/yahoo/yahoo.c:3087 ../pidgin/gtkblist.c:3082
+#: ../pidgin/gtkblist.c:3095 ../pidgin/gtkblist.c:3097
+#: ../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 "Sluit hierdie venster wanneer alle oordragte klaar is"
 
-#: ../finch/gntft.c:214
+#: ../finch/gntft.c:215
 msgid "Clear finished transfers"
 msgstr "Verwyder afgehandelde oordragte van lys"
 
-#: ../finch/gntft.c:228
+#: ../finch/gntft.c:229
 msgid "Stop"
 msgstr "Stop"
 
 #. Close button
-#: ../finch/gntft.c:233 ../finch/gntnotify.c:163 ../finch/gntplugin.c:178
-#: ../finch/gntplugin.c:259 ../finch/gntpounce.c:720 ../finch/gntstatus.c:206
-#: ../libpurple/protocols/msn/msn.c:356 ../libpurple/protocols/silc/util.c:377
-#: ../pidgin/gtkaccount.c:2419 ../pidgin/gtkrequest.c:272
+#: ../finch/gntft.c:234 ../finch/gntnotify.c:181 ../finch/gntplugin.c:209
+#: ../finch/gntplugin.c:309 ../finch/gntpounce.c:727 ../finch/gntstatus.c:215
+#: ../libpurple/protocols/msn/msn.c:375 ../libpurple/protocols/silc/util.c:382
+#: ../libpurple/protocols/silc10/util.c:377 ../pidgin/gtkaccount.c:2484
+#: ../pidgin/gtkrequest.c:272
 msgid "Close"
 msgstr "Sluit"
 
-#: ../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 "Wag vir oordrag om te begin"
 
-#: ../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 "Gekanselleer"
 
-#: ../finch/gntft.c:368 ../pidgin/gtkft.c:1058
+#: ../finch/gntft.c:371 ../pidgin/gtkft.c:1055
 msgid "Failed"
 msgstr "Misluk"
 
-#: ../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 KG/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 "Afgehandel"
 
-#: ../finch/gntft.c:428 ../libpurple/protocols/msn/session.c:346
+#: ../finch/gntft.c:431 ../libpurple/protocols/msn/session.c:347
 msgid "Transferring"
-msgstr ""
-
-#: ../finch/gntnotify.c:146
+msgstr "Dra tans oor"
+
+#: ../finch/gntnotify.c:164
 msgid "Emails"
 msgstr "E-posse"
 
-#: ../finch/gntnotify.c:152 ../finch/gntnotify.c:206
+#: ../finch/gntnotify.c:170 ../finch/gntnotify.c:224
 msgid "You have mail!"
 msgstr "Daar is pos!"
 
-#: ../finch/gntnotify.c:155 ../libpurple/protocols/jabber/jabber.c:1161
-msgid "From"
-msgstr "Van"
-
-#: ../finch/gntnotify.c:155 ../pidgin/gtknotify.c:490
+#: ../finch/gntnotify.c:173 ../pidgin/gtknotify.c:490
+msgid "Sender"
+msgstr "Sender"
+
+#: ../finch/gntnotify.c:173 ../pidgin/gtknotify.c:497
 msgid "Subject"
 msgstr "Onderwerp"
 
-#: ../finch/gntnotify.c:182
+#: ../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) het %d nuwe boodskap."
 msgstr[1] "%s (%s) het %d nuwe boodskappe."
 
-#: ../finch/gntnotify.c:206 ../pidgin/gtknotify.c:329
+#: ../finch/gntnotify.c:224 ../pidgin/gtknotify.c:336
 msgid "New Mail"
 msgstr "Nuwe pos"
 
-#: ../finch/gntnotify.c:230 ../pidgin/gtknotify.c:866
+#: ../finch/gntnotify.c:289 ../pidgin/gtknotify.c:918
 #, c-format
 msgid "Info for %s"
 msgstr "Inligting vir %s"
 
-#: ../finch/gntnotify.c:232 ../libpurple/protocols/toc/toc.c:476
-#: ../pidgin/gtknotify.c:868
+#: ../finch/gntnotify.c:290 ../libpurple/protocols/toc/toc.c:476
+#: ../pidgin/gtknotify.c:919
 msgid "Buddy Information"
 msgstr "Vriendinligting"
 
-#: ../finch/gntnotify.c:306
+#: ../finch/gntnotify.c:376 ../libpurple/protocols/qq/group_join.c:367
 msgid "Continue"
 msgstr "Gaan voort"
 
-#: ../finch/gntnotify.c:312 ../pidgin/gtkconv.c:1627 ../pidgin/gtkdebug.c:862
+#: ../finch/gntnotify.c:382 ../pidgin/gtkconv.c:1630 ../pidgin/gtkdebug.c:834
 msgid "Info"
 msgstr "Inligting"
 
-#: ../finch/gntnotify.c:315 ../pidgin/gtkconv.c:1588
+#: ../finch/gntnotify.c:385 ../pidgin/gtkconv.c:1591
 msgid "IM"
 msgstr "Kitsklets"
 
-#: ../finch/gntnotify.c:318
+#: ../finch/gntnotify.c:388
 msgid "Join"
 msgstr "Sluit aan"
 
-#: ../finch/gntnotify.c:321 ../libpurple/protocols/sametime/sametime.c:3473
+#: ../finch/gntnotify.c:391 ../libpurple/protocols/sametime/sametime.c:3474
 msgid "Invite"
 msgstr "Nooi uit"
 
-#: ../finch/gntnotify.c:324
+#: ../finch/gntnotify.c:394
 msgid "(none)"
 msgstr "(geen)"
 
-#: ../finch/gntplugin.c:102
+#: ../finch/gntplugin.c:74 ../finch/gntplugin.c:83
+msgid "ERROR"
+msgstr "FOUT"
+
+#: ../finch/gntplugin.c:74
+msgid "loading plugin failed"
+msgstr "laai van inprop het misluk"
+
+#: ../finch/gntplugin.c:83
+msgid "unloading plugin failed"
+msgstr "ontlaai van inprop het misluk"
+
+#: ../finch/gntplugin.c:128
 #, c-format
 msgid ""
 "Name: %s\n"
@@ -941,313 +1057,476 @@
 "Webwerf: %s\n"
 "Lêernaam: %s\n"
 
-#: ../finch/gntplugin.c:155
+#: ../finch/gntplugin.c:186
 msgid "Plugin need to be loaded before you can configure it."
 msgstr "Inprop moet gelaai word voordat dit opgestel kan word."
 
-#: ../finch/gntplugin.c:193
-msgid "..."
-msgstr "..."
-
-#: ../finch/gntplugin.c:194
-msgid "Still need to do something about this."
-msgstr "Moet nog iets hieromtrent doen."
-
-#: ../finch/gntplugin.c:200
+#: ../finch/gntplugin.c:234
 msgid "No configuration options for this plugin."
 msgstr "Geen opstelkeuses vir hierdie inprop nie."
 
-#: ../finch/gntplugin.c:221
+#: ../finch/gntplugin.c:259
 msgid "You can (un)load plugins from the following list."
-msgstr "U kan inproppe laai / ontlaai vanaf die volgende lys."
-
-#: ../finch/gntplugin.c:264
+msgstr "U kan inproppe (ont)laai vanaf die volgende lys."
+
+#: ../finch/gntplugin.c:314
 msgid "Configure Plugin"
 msgstr "Stel inprop op"
 
-#: ../finch/gntpounce.c:180 ../pidgin/gtkpounce.c:251
+#. 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:88 ../pidgin/gtkdocklet.c:524 ../pidgin/gtkprefs.c:2062
+msgid "Preferences"
+msgstr "Voorkeure"
+
+#: ../finch/gntpounce.c:182 ../pidgin/gtkpounce.c:255
 msgid "Please enter a buddy to pounce."
 msgstr "Gee asb. 'n vriend om dop te hou."
 
-#: ../finch/gntpounce.c:325 ../pidgin/gtkpounce.c:505
+#. Create the window.
+#: ../finch/gntpounce.c:327 ../pidgin/gtkpounce.c:516
 msgid "New Buddy Pounce"
 msgstr "Nuwe vriendwag"
 
-#: ../finch/gntpounce.c:325 ../pidgin/gtkpounce.c:505
+#: ../finch/gntpounce.c:327 ../pidgin/gtkpounce.c:516
 msgid "Edit Buddy Pounce"
 msgstr "Wysig vriendwag"
 
-#: ../finch/gntpounce.c:330
+#: ../finch/gntpounce.c:332
 msgid "Pounce Who"
 msgstr "Hou wie dop"
 
 #. Account:
-#. Set up stuff for the account box
-#: ../finch/gntpounce.c:333 ../finch/gntstatus.c:443 ../pidgin/gtkblist.c:5341
-#: ../pidgin/gtkblist.c:5657
+#: ../finch/gntpounce.c:335 ../finch/gntstatus.c:452
 msgid "Account:"
 msgstr "Rekening:"
 
-#: ../finch/gntpounce.c:355
+#: ../finch/gntpounce.c:357
 msgid "Buddy name:"
 msgstr "Vriendnaam:"
 
 #. Create the "Pounce When Buddy..." frame.
-#: ../finch/gntpounce.c:370 ../pidgin/gtkpounce.c:575
+#: ../finch/gntpounce.c:373 ../pidgin/gtkpounce.c:586
 msgid "Pounce When Buddy..."
 msgstr "Reageer wanneer vriend..."
 
-#: ../finch/gntpounce.c:372
-msgid "Signs on"
-msgstr "aanmeld"
-
-#: ../finch/gntpounce.c:373
-msgid "Signs off"
-msgstr "afmeld"
-
-#: ../finch/gntpounce.c:374
-msgid "Goes away"
-msgstr "weggaan"
-
 #: ../finch/gntpounce.c:375
-msgid "Returns from away"
-msgstr "terugkeer"
+msgid "Signs on"
+msgstr "Aanmeld"
 
 #: ../finch/gntpounce.c:376
-msgid "Becomes idle"
-msgstr "ledig raak"
+msgid "Signs off"
+msgstr "Afmeld"
 
 #: ../finch/gntpounce.c:377
-msgid "Is no longer idle"
-msgstr "nie meer ledig is nie"
+msgid "Goes away"
+msgstr "Weggaan"
 
 #: ../finch/gntpounce.c:378
-msgid "Starts typing"
-msgstr "begin tik"
+msgid "Returns from away"
+msgstr "Terugkeer"
 
 #: ../finch/gntpounce.c:379
-msgid "Pauses while typing"
-msgstr "wag tydens tik"
+msgid "Becomes idle"
+msgstr "Ledig raak"
 
 #: ../finch/gntpounce.c:380
-msgid "Stops typing"
-msgstr "ophou tik"
+msgid "Is no longer idle"
+msgstr "Nie meer ledig is nie"
 
 #: ../finch/gntpounce.c:381
+msgid "Starts typing"
+msgstr "Begin tik"
+
+#: ../finch/gntpounce.c:382
+msgid "Pauses while typing"
+msgstr "Wag tydens tik"
+
+#: ../finch/gntpounce.c:383
+msgid "Stops typing"
+msgstr "Ophou tik"
+
+#: ../finch/gntpounce.c:384
 msgid "Sends a message"
-msgstr "'n boodskap stuur"
+msgstr "'n Boodskap stuur"
 
 #. Create the "Action" frame.
-#: ../finch/gntpounce.c:411 ../pidgin/gtkpounce.c:636
+#: ../finch/gntpounce.c:413 ../pidgin/gtkpounce.c:647
 msgid "Action"
 msgstr "Aksie"
 
-#: ../finch/gntpounce.c:413
+#: ../finch/gntpounce.c:415
 msgid "Open an IM window"
 msgstr "Open 'n kletsvenster"
 
-#: ../finch/gntpounce.c:414
+#: ../finch/gntpounce.c:416
 msgid "Pop up a notification"
 msgstr "Wys 'n boodskapvenster"
 
-#: ../finch/gntpounce.c:415
+#: ../finch/gntpounce.c:417
 msgid "Send a message"
 msgstr "Stuur 'n boodskap"
 
-#: ../finch/gntpounce.c:416
+#: ../finch/gntpounce.c:418
 msgid "Execute a command"
 msgstr "Voer 'n opdrag uit"
 
-#: ../finch/gntpounce.c:417
+#: ../finch/gntpounce.c:419
 msgid "Play a sound"
 msgstr "Speel 'n klank"
 
-#: ../finch/gntpounce.c:445
+#: ../finch/gntpounce.c:447
 msgid "Pounce only when my status is not available"
-msgstr "Reageer slegs wanneer my status niebeskikbaar is"
-
-#: ../finch/gntpounce.c:447 ../pidgin/gtkpounce.c:1278
+msgstr "Reageer net wanneer my status niebeskikbaar is"
+
+#: ../finch/gntpounce.c:449 ../pidgin/gtkpounce.c:1295
 msgid "Recurring"
 msgstr "Herhalend"
 
-#: ../finch/gntpounce.c:649 ../pidgin/gtkpounce.c:1095
+#: ../finch/gntpounce.c:651 ../pidgin/gtkpounce.c:1110
 #, c-format
 msgid "Are you sure you want to delete the pounce on %s for %s?"
-msgstr "Wil u definitief die wag op %s vir %s uitvee?"
-
-#: ../finch/gntpounce.c:680 ../finch/gntui.c:78 ../pidgin/gtkpounce.c:1325
+msgstr "Wil u definitief die vriendwag op %s vir %s uitvee?"
+
+#: ../finch/gntpounce.c:685 ../finch/gntui.c:83 ../pidgin/gtkpounce.c:1339
 msgid "Buddy Pounces"
 msgstr "Vriendwagte"
 
-#: ../finch/gntpounce.c:792 ../pidgin/gtkpounce.c:1452
+#: ../finch/gntpounce.c:799 ../pidgin/gtkpounce.c:1466
 #, c-format
 msgid "%s has started typing to you (%s)"
 msgstr "%s het begin om aan u te tik (%s)"
 
-#: ../finch/gntpounce.c:794 ../pidgin/gtkpounce.c:1454
+#: ../finch/gntpounce.c:801 ../pidgin/gtkpounce.c:1468
 #, c-format
 msgid "%s has paused while typing to you (%s)"
 msgstr "%s het gewag terwyl hy/sy besig was om aan u te tik (%s)"
 
-#: ../finch/gntpounce.c:796 ../pidgin/gtkpounce.c:1456
+#: ../finch/gntpounce.c:803 ../pidgin/gtkpounce.c:1470
 #, c-format
 msgid "%s has signed on (%s)"
 msgstr "%s het aangemeld op (%s)"
 
-#: ../finch/gntpounce.c:798 ../pidgin/gtkpounce.c:1458
+#: ../finch/gntpounce.c:805 ../pidgin/gtkpounce.c:1472
 #, c-format
 msgid "%s has returned from being idle (%s)"
 msgstr "%s het teruggekeer na ledigheid (%s)"
 
-#: ../finch/gntpounce.c:800 ../pidgin/gtkpounce.c:1460
+#: ../finch/gntpounce.c:807 ../pidgin/gtkpounce.c:1474
 #, c-format
 msgid "%s has returned from being away (%s)"
 msgstr "%s het teruggekeer (%s)"
 
-#: ../finch/gntpounce.c:802 ../pidgin/gtkpounce.c:1462
+#: ../finch/gntpounce.c:809 ../pidgin/gtkpounce.c:1476
 #, c-format
 msgid "%s has stopped typing to you (%s)"
 msgstr "%s het opgehou om aan u te tik (%s)"
 
-#: ../finch/gntpounce.c:804 ../pidgin/gtkpounce.c:1464
+#: ../finch/gntpounce.c:811 ../pidgin/gtkpounce.c:1478
 #, c-format
 msgid "%s has signed off (%s)"
 msgstr "%s het afgemeld (%s)"
 
-#: ../finch/gntpounce.c:806 ../pidgin/gtkpounce.c:1466
+#: ../finch/gntpounce.c:813 ../pidgin/gtkpounce.c:1480
 #, c-format
 msgid "%s has become idle (%s)"
 msgstr "%s het ledig geword (%s)"
 
-#: ../finch/gntpounce.c:808 ../pidgin/gtkpounce.c:1468
+#: ../finch/gntpounce.c:815 ../pidgin/gtkpounce.c:1482
 #, c-format
 msgid "%s has gone away. (%s)"
 msgstr "%s het weggegaan. (%s)"
 
-#: ../finch/gntpounce.c:810 ../pidgin/gtkpounce.c:1470
+#: ../finch/gntpounce.c:817 ../pidgin/gtkpounce.c:1484
 #, c-format
 msgid "%s has sent you a message. (%s)"
 msgstr "%s het u 'n boodskap gestuur. (%s)"
 
-#: ../finch/gntpounce.c:811 ../pidgin/gtkpounce.c:1471
+#: ../finch/gntpounce.c:818 ../pidgin/gtkpounce.c:1485
 msgid "Unknown pounce event. Please report this!"
-msgstr "Onbekende waggebeurtenis. Rapporteer hierdie, asb!"
-
-#: ../finch/gntprefs.c:69 ../pidgin/gtkprefs.c:1812
+msgstr "Onbekende vriendwag-gebeurtenis. Rapporteer hierdie, asb!"
+
+#: ../finch/gntprefs.c:91
+msgid "Based on keyboard use"
+msgstr "Gebaseer op gebruik van sleutelbord"
+
+#: ../finch/gntprefs.c:93 ../pidgin/gtkprefs.c:1925
 msgid "From last sent message"
 msgstr "Sedert laaste gestuurde boodskap"
 
-#: ../finch/gntprefs.c:71 ../libpurple/plugins/autoreply.c:360
-#: ../pidgin/gtkprefs.c:820 ../pidgin/gtkprefs.c:829 ../pidgin/gtkprefs.c:1811
-#: ../pidgin/gtkprefs.c:1825 ../pidgin/plugins/win32/winprefs/winprefs.c:337
+#: ../finch/gntprefs.c:95 ../pidgin/gtkprefs.c:897 ../pidgin/gtkprefs.c:906
+#: ../pidgin/gtkprefs.c:1924 ../pidgin/gtkprefs.c:1938
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:333
 msgid "Never"
 msgstr "Nooit"
 
-#: ../finch/gntprefs.c:159
+#: ../finch/gntprefs.c:183
 msgid "Show Idle Time"
 msgstr "Wys ledige tyd"
 
-#: ../finch/gntprefs.c:160
+#: ../finch/gntprefs.c:184
 msgid "Show Offline Buddies"
 msgstr "Wys aflynvriende"
 
-#: ../finch/gntprefs.c:166
-msgid "Show Timestamps"
-msgstr "Wys tydstempels"
-
-#: ../finch/gntprefs.c:167
+#: ../finch/gntprefs.c:191
 msgid "Notify buddies when you are typing"
 msgstr "Laat weet vriende wanneer u tik"
 
-#: ../finch/gntprefs.c:173
+#: ../finch/gntprefs.c:197
 msgid "Log format"
 msgstr "Boekstaafformaat"
 
-#: ../finch/gntprefs.c:174
+#: ../finch/gntprefs.c:198
 msgid "Log IMs"
 msgstr "Boekstaaf kitsboodskappe"
 
-#: ../finch/gntprefs.c:175
+#: ../finch/gntprefs.c:199
 msgid "Log chats"
 msgstr "Boekstaaf geselsies"
 
-#: ../finch/gntprefs.c:176
+#: ../finch/gntprefs.c:200
 msgid "Log status change events"
 msgstr "Boekstaaf statusveranderinge"
 
+#: ../finch/gntprefs.c:206
+msgid "Report Idle time"
+msgstr "Raporteer ledige tyd"
+
+#: ../finch/gntprefs.c:207
+msgid "Change status when idle"
+msgstr "Verander status terwyl ledig"
+
+#: ../finch/gntprefs.c:208
+msgid "Minutes before changing status"
+msgstr "Minute voor verandering van status:"
+
+#: ../finch/gntprefs.c:209
+msgid "Change status to"
+msgstr "Verander status na:"
+
 #. Conversations
-#: ../finch/gntprefs.c:279 ../pidgin/gtkprefs.c:898 ../pidgin/gtkprefs.c:1915
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:344
+#: ../finch/gntprefs.c:258 ../pidgin/gtkprefs.c:992 ../pidgin/gtkprefs.c:2028
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:340
 msgid "Conversations"
 msgstr "Gesprekke"
 
-#: ../finch/gntprefs.c:280 ../pidgin/gtkprefs.c:1355 ../pidgin/gtkprefs.c:1926
+#: ../finch/gntprefs.c:259 ../pidgin/gtkprefs.c:1464 ../pidgin/gtkprefs.c:2039
 msgid "Logging"
 msgstr "Boekstawing"
 
-#: ../finch/gntprefs.c:283 ../finch/gntui.c:82 ../pidgin/gtkdocklet.c:532
-#: ../pidgin/gtkprefs.c:1951
-msgid "Preferences"
-msgstr "Voorkeure"
-
-#: ../finch/gntrequest.c:521
+#: ../finch/gntrequest.c:563
 msgid "Not implemented yet."
 msgstr "Nog nie geïmplementeer nie."
 
-#: ../finch/gntrequest.c:583 ../pidgin/gtkrequest.c:1514
-#: ../pidgin/gtkrequest.c:1559
+#: ../finch/gntrequest.c:635 ../pidgin/gtkrequest.c:1552
+#: ../pidgin/gtkrequest.c:1598
 msgid "Save File..."
 msgstr "Stoor lêer..."
 
-#: ../finch/gntrequest.c:583 ../pidgin/gtkrequest.c:1515
-#: ../pidgin/gtkrequest.c:1560
+#: ../finch/gntrequest.c:635 ../pidgin/gtkrequest.c:1553
+#: ../pidgin/gtkrequest.c:1599
 msgid "Open File..."
 msgstr "Open lêer..."
 
-#: ../finch/gntstatus.c:135
+#: ../finch/gntsound.c:94 ../pidgin/gtksound.c:63
+msgid "Buddy logs in"
+msgstr "Vriend meld aan"
+
+#: ../finch/gntsound.c:95 ../pidgin/gtksound.c:64
+msgid "Buddy logs out"
+msgstr "Vriend meld af"
+
+#: ../finch/gntsound.c:96 ../pidgin/gtksound.c:65
+msgid "Message received"
+msgstr "Boodskap ontvang"
+
+#: ../finch/gntsound.c:97 ../pidgin/gtksound.c:66
+msgid "Message received begins conversation"
+msgstr "Boodskapontvangs begin gesprek"
+
+#: ../finch/gntsound.c:98 ../pidgin/gtksound.c:67
+msgid "Message sent"
+msgstr "Boodskap gestuur"
+
+#: ../finch/gntsound.c:99 ../pidgin/gtksound.c:68
+msgid "Person enters chat"
+msgstr "Persoon kom geselsie binne"
+
+#: ../finch/gntsound.c:100 ../pidgin/gtksound.c:69
+msgid "Person leaves chat"
+msgstr "Persoon verlaat geselsie"
+
+#: ../finch/gntsound.c:101 ../pidgin/gtksound.c:70
+msgid "You talk in chat"
+msgstr "U praat in geselsie"
+
+#: ../finch/gntsound.c:102 ../pidgin/gtksound.c:71
+msgid "Others talk in chat"
+msgstr "Ander praat in geselsie"
+
+#: ../finch/gntsound.c:104 ../pidgin/gtksound.c:74
+msgid "Someone says your screen name in chat"
+msgstr "Iemand sê u skermnaam in 'n geselsie"
+
+#: ../finch/gntsound.c:357 ../pidgin/gtksound.c:310
+msgid "GStreamer Failure"
+msgstr "GStreamer-mislukking"
+
+#: ../finch/gntsound.c:358 ../pidgin/gtksound.c:311
+msgid "GStreamer failed to initialize."
+msgstr "Inisialiseer van GStreamer het misluk."
+
+#: ../finch/gntsound.c:706 ../finch/gntsound.c:791 ../pidgin/gtkprefs.c:1584
+#: ../pidgin/gtkprefs.c:1673 ../pidgin/gtkprefs.c:1867
+msgid "(default)"
+msgstr "(verstek)"
+
+#: ../finch/gntsound.c:719
+msgid "Select Sound File ..."
+msgstr "Kies klanklêer..."
+
+#: ../finch/gntsound.c:893
+msgid "Sound Preferences"
+msgstr "Klankvoorkeure"
+
+#: ../finch/gntsound.c:904
+msgid "Profiles"
+msgstr "Profiele"
+
+#: ../finch/gntsound.c:943 ../pidgin/gtkprefs.c:1712
+msgid "Automatic"
+msgstr "Outomaties"
+
+#: ../finch/gntsound.c:946
+msgid "Console Beep"
+msgstr "Konsolebiep"
+
+#: ../finch/gntsound.c:947 ../pidgin/gtkprefs.c:1716
+msgid "Command"
+msgstr "Opdrag"
+
+#: ../finch/gntsound.c:948
+msgid "No Sound"
+msgstr "Geen klank nie"
+
+#: ../finch/gntsound.c:950 ../pidgin/gtkprefs.c:1707
+msgid "Sound Method"
+msgstr "Klankmetode"
+
+#: ../finch/gntsound.c:955
+msgid "Method: "
+msgstr "Metode: "
+
+#: ../finch/gntsound.c:962
+#, c-format
+msgid ""
+"Sound Command\n"
+"(%s for filename)"
+msgstr ""
+"Klankopdrag\n"
+"(%s vir lêernaam)"
+
+#. Sound options
+#: ../finch/gntsound.c:970 ../pidgin/gtkprefs.c:1751
+msgid "Sound Options"
+msgstr "Klankkeuses"
+
+#: ../finch/gntsound.c:971
+msgid "Sounds when conversation has focus"
+msgstr "Klanke terwyl gesprek in fokus is"
+
+#: ../finch/gntsound.c:979 ../pidgin/gtkprefs.c:896 ../pidgin/gtkprefs.c:908
+#: ../pidgin/gtkprefs.c:1758 ../pidgin/plugins/timestamp_format.c:42
+#: ../pidgin/plugins/timestamp_format.c:51
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:334
+msgid "Always"
+msgstr "Altyd"
+
+#: ../finch/gntsound.c:980 ../pidgin/gtkprefs.c:1756
+msgid "Only when available"
+msgstr "Net indien beskikbaar"
+
+#: ../finch/gntsound.c:981 ../pidgin/gtkprefs.c:1757
+msgid "Only when not available"
+msgstr "Net indien nie beskikbaar nie"
+
+#: ../finch/gntsound.c:988
+msgid "Volume(0-100):"
+msgstr "Volume (0-100):"
+
+#. Sound events
+#: ../finch/gntsound.c:1005 ../pidgin/gtkprefs.c:1793
+msgid "Sound Events"
+msgstr "Klankgebeure"
+
+#: ../finch/gntsound.c:1007 ../pidgin/gtkprefs.c:1852
+msgid "Event"
+msgstr "Gebeurtenis"
+
+#: ../finch/gntsound.c:1007
+msgid "File"
+msgstr "Lêer"
+
+#: ../finch/gntsound.c:1026 ../pidgin/gtkprefs.c:1871
+msgid "Test"
+msgstr "Toets"
+
+#: ../finch/gntsound.c:1029 ../pidgin/gtkprefs.c:1875
+msgid "Reset"
+msgstr "Terugstel"
+
+#: ../finch/gntsound.c:1032 ../pidgin/gtkprefs.c:1879
+msgid "Choose..."
+msgstr "Kies..."
+
+#: ../finch/gntstatus.c:137
 #, c-format
 msgid "Are you sure you want to delete \"%s\""
 msgstr "Wil u definitief \"%s\" uitvee?"
 
-#: ../finch/gntstatus.c:138
+#: ../finch/gntstatus.c:140
 msgid "Delete Status"
 msgstr "Vee status uit"
 
-#: ../finch/gntstatus.c:167 ../pidgin/gtksavedstatuses.c:556
+#: ../finch/gntstatus.c:175 ../pidgin/gtksavedstatuses.c:596
 msgid "Saved Statuses"
 msgstr "Gestoorde statusse"
 
-#: ../finch/gntstatus.c:174 ../finch/gntstatus.c:526
+#: ../finch/gntstatus.c:182 ../finch/gntstatus.c:535
 #: ../libpurple/protocols/jabber/buddy.c:286
-#: ../libpurple/protocols/jabber/buddy.c:938
+#: ../libpurple/protocols/jabber/buddy.c:973
 #: ../libpurple/protocols/novell/novell.c:1484
-#: ../pidgin/gtksavedstatuses.c:463
+#: ../pidgin/gtksavedstatuses.c:499
 msgid "Title"
 msgstr "Titel"
 
-#: ../finch/gntstatus.c:174 ../pidgin/gtksavedstatuses.c:478
+#: ../finch/gntstatus.c:182 ../pidgin/gtksavedstatuses.c:514
 msgid "Type"
 msgstr "Tipe"
 
-#: ../finch/gntstatus.c:174 ../finch/gntstatus.c:551 ../finch/gntstatus.c:563
-#: ../libpurple/protocols/bonjour/bonjour.c:258
-#: ../libpurple/protocols/bonjour/bonjour.c:265
-#: ../libpurple/protocols/bonjour/bonjour.c:328
-#: ../libpurple/protocols/gg/gg.c:1062 ../libpurple/protocols/gg/gg.c:1566
-#: ../libpurple/protocols/gg/gg.c:1584 ../libpurple/protocols/gg/gg.c:1594
-#: ../libpurple/protocols/gg/gg.c:1600 ../libpurple/protocols/gg/gg.c:1609
-#: ../libpurple/protocols/gg/gg.c:1614 ../libpurple/protocols/irc/irc.c:234
-#: ../libpurple/protocols/jabber/jabber.c:1233
-#: ../libpurple/protocols/jabber/jabber.c:1243
-#: ../libpurple/protocols/jabber/jabber.c:1253
-#: ../libpurple/protocols/jabber/jabber.c:1263
-#: ../libpurple/protocols/jabber/jabber.c:1273
-#: ../libpurple/protocols/jabber/jabber.c:1285
-#: ../libpurple/protocols/novell/novell.c:2839
-#: ../libpurple/protocols/novell/novell.c:2942
-#: ../libpurple/protocols/novell/novell.c:2948
-#: ../libpurple/protocols/novell/novell.c:2954
-#: ../libpurple/protocols/oscar/oscar.c:5492
+#: ../finch/gntstatus.c:182 ../finch/gntstatus.c:560 ../finch/gntstatus.c:572
+#: ../libpurple/protocols/bonjour/bonjour.c:249
+#: ../libpurple/protocols/bonjour/bonjour.c:256
+#: ../libpurple/protocols/bonjour/bonjour.c:339
+#: ../libpurple/protocols/gg/gg.c:1072 ../libpurple/protocols/gg/gg.c:1574
+#: ../libpurple/protocols/gg/gg.c:1592 ../libpurple/protocols/gg/gg.c:1602
+#: ../libpurple/protocols/gg/gg.c:1608 ../libpurple/protocols/gg/gg.c:1617
+#: ../libpurple/protocols/gg/gg.c:1622 ../libpurple/protocols/irc/irc.c:234
+#: ../libpurple/protocols/jabber/jabber.c:1244
+#: ../libpurple/protocols/jabber/jabber.c:1254
+#: ../libpurple/protocols/jabber/jabber.c:1264
+#: ../libpurple/protocols/jabber/jabber.c:1274
+#: ../libpurple/protocols/jabber/jabber.c:1284
+#: ../libpurple/protocols/jabber/jabber.c:1296
+#: ../libpurple/protocols/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:5502
 #: ../libpurple/protocols/oscar/oscar.c:5720
 #: ../libpurple/protocols/oscar/oscar.c:5734
 #: ../libpurple/protocols/oscar/oscar.c:5750
@@ -1257,68 +1536,73 @@
 #: ../libpurple/protocols/sametime/sametime.c:3293
 #: ../libpurple/protocols/sametime/sametime.c:3299
 #: ../libpurple/protocols/sametime/sametime.c:3378
-#: ../libpurple/protocols/silc/buddy.c:1544
+#: ../libpurple/protocols/silc/buddy.c:1551
+#: ../libpurple/protocols/silc10/buddy.c:1551
 #: ../libpurple/protocols/simple/simple.c:246
-#: ../libpurple/protocols/yahoo/yahoo.c:3470
-#: ../libpurple/protocols/yahoo/yahoo.c:3476
-#: ../libpurple/protocols/zephyr/zephyr.c:2336
-#: ../pidgin/gtksavedstatuses.c:489 ../pidgin/gtksavedstatuses.c:953
+#: ../libpurple/protocols/yahoo/yahoo.c:3590
+#: ../libpurple/protocols/yahoo/yahoo.c:3596
+#: ../libpurple/protocols/zephyr/zephyr.c:2337
+#: ../pidgin/gtksavedstatuses.c:525 ../pidgin/gtksavedstatuses.c:1009
 msgid "Message"
 msgstr "Boodskap"
 
 #. Use
-#: ../finch/gntstatus.c:186 ../finch/gntstatus.c:580
+#: ../finch/gntstatus.c:193 ../finch/gntstatus.c:589
 msgid "Use"
 msgstr "Gebruik"
 
-#: ../finch/gntstatus.c:291
+#: ../finch/gntstatus.c:300
 msgid "Invalid title"
 msgstr "Ongeldige titel"
 
-#: ../finch/gntstatus.c:292
+#: ../finch/gntstatus.c:301
 msgid "Please enter a non-empty title for the status."
 msgstr "Gee asb. 'n nieleë titel vir die status."
 
-#: ../finch/gntstatus.c:299
+#: ../finch/gntstatus.c:308
 msgid "Duplicate title"
 msgstr "Duplikaat titel"
 
-#: ../finch/gntstatus.c:300
+#: ../finch/gntstatus.c:309
 msgid "Please enter a different title for the status."
 msgstr "Gee asb. 'n ander titel vir die status."
 
-#: ../finch/gntstatus.c:440
+#: ../finch/gntstatus.c:449
 msgid "Substatus"
 msgstr "Substatus"
 
-#: ../finch/gntstatus.c:451 ../pidgin/gtkft.c:698
+#: ../finch/gntstatus.c:460 ../pidgin/gtkft.c:698
 msgid "Status:"
 msgstr "Status:"
 
-#: ../finch/gntstatus.c:466
+#: ../finch/gntstatus.c:475
 msgid "Message:"
 msgstr "Boodskap:"
 
-#: ../finch/gntstatus.c:515
+#: ../finch/gntstatus.c:524
 msgid "Edit Status"
 msgstr "Wysig status"
 
-#: ../finch/gntstatus.c:557
+#: ../finch/gntstatus.c:566
 msgid "Use different status for following accounts"
 msgstr "Gebruik 'n ander status vir die volgende rekenings"
 
 #. Save & Use
-#: ../finch/gntstatus.c:591
+#: ../finch/gntstatus.c:600
 msgid "Save & Use"
 msgstr "Stoor en gebruik"
 
-#: ../finch/gntui.c:83
+#: ../finch/gntui.c:87 ../pidgin/gtkprefs.c:2030
+msgid "Sounds"
+msgstr "Klanke"
+
+#: ../finch/gntui.c:89
 msgid "Statuses"
 msgstr "Statusse"
 
 #: ../finch/plugins/gntclipboard.c:149
 msgid "GntClipboard"
-msgstr ""
+msgstr "GntClipboard"
 
 #: ../finch/plugins/gntclipboard.c:151
 msgid "Clipboard plugin"
@@ -1329,67 +1613,69 @@
 "When the gnt clipboard contents change, the contents are made available to "
 "X, if possible."
 msgstr ""
-
-#: ../finch/plugins/gntgf.c:209
+"Wanneer die gnt-knipbord se inhoud verander, sal die inhoud aan X beskikbaar "
+"gemaak word, indien moontlik."
+
+#: ../finch/plugins/gntgf.c:231
 #, c-format
 msgid "%s just signed on"
 msgstr "%s het pas aangemeld"
 
-#: ../finch/plugins/gntgf.c:216
+#: ../finch/plugins/gntgf.c:238
 #, c-format
 msgid "%s just signed off"
 msgstr "%s het pas afgemeld"
 
-#: ../finch/plugins/gntgf.c:224
+#: ../finch/plugins/gntgf.c:246
 #, c-format
 msgid "%s sent you a message"
 msgstr "%s het u 'n boodskap gestuur"
 
-#: ../finch/plugins/gntgf.c:243
+#: ../finch/plugins/gntgf.c:265
 #, c-format
 msgid "%s said your nick in %s"
 msgstr "%s het u bynaam gesê in %s"
 
-#: ../finch/plugins/gntgf.c:245
+#: ../finch/plugins/gntgf.c:267
 #, c-format
 msgid "%s sent a message in %s"
 msgstr "%s het 'n boodskap gestuur in %s"
 
-#: ../finch/plugins/gntgf.c:283
+#: ../finch/plugins/gntgf.c:305
 msgid "Buddy signs on/off"
 msgstr "Vriend meld aan/af"
 
-#: ../finch/plugins/gntgf.c:284
+#: ../finch/plugins/gntgf.c:306
 msgid "You receive an IM"
 msgstr "U ontvang 'n kitsboodskap"
 
-#: ../finch/plugins/gntgf.c:285
+#: ../finch/plugins/gntgf.c:307
 msgid "Someone speaks in a chat"
-msgstr "Iemand praat in 'n geselskap"
-
-#: ../finch/plugins/gntgf.c:286
+msgstr "Iemand praat in 'n geselsie"
+
+#: ../finch/plugins/gntgf.c:308
 msgid "Someone says your name in a chat"
-msgstr "Iemand sê u naam in 'n geselskap"
-
-#: ../finch/plugins/gntgf.c:314
+msgstr "Iemand sê u naam in 'n geselsie"
+
+#: ../finch/plugins/gntgf.c:336
 msgid "Notify with a toaster when"
-msgstr ""
-
-#: ../finch/plugins/gntgf.c:329
+msgstr "Stel met oploer in kennis wanneer"
+
+#: ../finch/plugins/gntgf.c:351
 msgid "Beep too!"
-msgstr ""
-
-#: ../finch/plugins/gntgf.c:335
+msgstr "Biep ook!"
+
+#: ../finch/plugins/gntgf.c:357
 msgid "Set URGENT for the terminal window."
 msgstr "Stel DRINGEND vir die terminaalvenster."
 
-#: ../finch/plugins/gntgf.c:355
+#: ../finch/plugins/gntgf.c:377
 msgid "GntGf"
 msgstr "GntGf"
 
-#: ../finch/plugins/gntgf.c:357 ../finch/plugins/gntgf.c:358
+#: ../finch/plugins/gntgf.c:379 ../finch/plugins/gntgf.c:380
 msgid "Toaster plugin"
-msgstr ""
+msgstr "Oploer-inprop"
 
 #: ../finch/plugins/gnthistory.c:116 ../pidgin/plugins/history.c:120
 #, c-format
@@ -1398,7 +1684,7 @@
 
 #: ../finch/plugins/gnthistory.c:138 ../pidgin/plugins/history.c:147
 msgid "History Plugin Requires Logging"
-msgstr ""
+msgstr "Geskiedenis-inprop vereis boekstawing"
 
 #: ../finch/plugins/gnthistory.c:139 ../pidgin/plugins/history.c:148
 msgid ""
@@ -1414,27 +1700,27 @@
 
 #: ../finch/plugins/gnthistory.c:179
 msgid "GntHistory"
-msgstr "GntHistory"
+msgstr "Gnthistory"
 
 #: ../finch/plugins/gnthistory.c:181 ../pidgin/plugins/history.c:190
 msgid "Shows recently logged conversations in new conversations."
-msgstr "Wys onlangs gestaafde gesprekke in die nuwe gesprek."
+msgstr "Wys onlangs geboekstaafde gesprekke in die nuwe gesprek."
 
 #: ../finch/plugins/gnthistory.c:182 ../pidgin/plugins/history.c:191
 msgid ""
 "When a new conversation is opened this plugin will insert the last "
 "conversation into the current conversation."
 msgstr ""
-"Wanneer 'n nuwe gesprek begin word, sal hierdie inprop die laaste gesprek in "
-"die huidige een invoeg."
+"Wanneer 'n nuwe gesprek geopen word, sal hierdie inprop die laaste gesprek "
+"in die huidige een invoeg."
 
 #: ../finch/plugins/lastlog.c:69
 msgid "Lastlog"
-msgstr ""
+msgstr "Laastestaaf"
 
 #: ../finch/plugins/lastlog.c:99
 msgid "lastlog: Searches for a substring in the backlog."
-msgstr ""
+msgstr "lastlog: Soek vir 'n substring in die agterstaaflêer."
 
 #: ../finch/plugins/lastlog.c:121
 msgid "GntLastlog"
@@ -1442,90 +1728,96 @@
 
 #: ../finch/plugins/lastlog.c:123 ../finch/plugins/lastlog.c:124
 msgid "Lastlog plugin."
-msgstr ""
-
-#: ../libpurple/account.c:777
+msgstr "Laastestaaf-inprop."
+
+#: ../libpurple/account.c:790
 msgid "accounts"
 msgstr "rekeninge"
 
-#: ../libpurple/account.c:923
+#: ../libpurple/account.c:937 ../libpurple/protocols/jabber/auth.c:194
+#: ../libpurple/protocols/jabber/auth.c:233
 msgid "Password is required to sign on."
-msgstr "Wagwoord word benodig om aan te meld."
-
-#: ../libpurple/account.c:948
+msgstr "Wagwoord word vereis om aan te meld."
+
+#: ../libpurple/account.c:963
 #, c-format
 msgid "Enter password for %s (%s)"
 msgstr "Gee wagwoord vir %s (%s)"
 
-#: ../libpurple/account.c:955
+#: ../libpurple/account.c:970
 msgid "Enter Password"
 msgstr "Gee wagwoord"
 
-#: ../libpurple/account.c:960
+#: ../libpurple/account.c:975
 msgid "Save password"
 msgstr "Stoor wagwoord"
 
-#: ../libpurple/account.c:994 ../libpurple/connection.c:104
+#: ../libpurple/account.c:1010 ../libpurple/connection.c:104
 #, c-format
 msgid "Missing protocol plugin for %s"
 msgstr "Ontbrekende protokolinprop vir %s"
 
-#: ../libpurple/account.c:1154 ../libpurple/protocols/gg/gg.c:696
-#: ../libpurple/protocols/jabber/jabber.c:1323
+#: ../libpurple/account.c:1012 ../libpurple/connection.c:107
+#: ../pidgin/gtkblist.c:4019
+msgid "Connection Error"
+msgstr "Verbindingfout"
+
+#: ../libpurple/account.c:1170 ../libpurple/protocols/gg/gg.c:702
+#: ../libpurple/protocols/jabber/jabber.c:1334
 msgid "New passwords do not match."
 msgstr "Nuwe wagwoorde stem nie ooreen nie."
 
-#: ../libpurple/account.c:1163
+#: ../libpurple/account.c:1179
 msgid "Fill out all fields completely."
 msgstr "Vul alle velde volledig in."
 
-#: ../libpurple/account.c:1186
+#: ../libpurple/account.c:1202
 msgid "Original password"
 msgstr "Oorspronklike wagword"
 
-#: ../libpurple/account.c:1193
+#: ../libpurple/account.c:1209
 msgid "New password"
 msgstr "Nuwe wagwoord"
 
-#: ../libpurple/account.c:1200
+#: ../libpurple/account.c:1216
 msgid "New password (again)"
 msgstr "Nuwe wagwoord (weer)"
 
-#: ../libpurple/account.c:1206
+#: ../libpurple/account.c:1222
 #, c-format
 msgid "Change password for %s"
 msgstr "Verander wagwoord vir %s"
 
-#: ../libpurple/account.c:1214
+#: ../libpurple/account.c:1230
 msgid "Please enter your current password and your new password."
 msgstr "Gee asb. u huidige wagwoord en u nuwe wagwoord."
 
-#: ../libpurple/account.c:1244
+#: ../libpurple/account.c:1261
 #, c-format
 msgid "Change user information for %s"
 msgstr "Verander gebruikerinligting vir %s"
 
-#: ../libpurple/account.c:1247 ../libpurple/protocols/toc/toc.c:1670
+#: ../libpurple/account.c:1264 ../libpurple/protocols/toc/toc.c:1670
 msgid "Set User Info"
 msgstr "Stel gebruikerinligting"
 
-#: ../libpurple/account.c:1783 ../libpurple/protocols/gg/gg.c:1002
-#: ../libpurple/protocols/jabber/buddy.c:641
-#: ../libpurple/protocols/jabber/buddy.c:1404
-#: ../libpurple/protocols/jabber/buddy.c:1421
-#: ../libpurple/protocols/novell/novell.c:2832
-#: ../libpurple/protocols/qq/qq.c:230 ../pidgin/gtkft.c:159
+#: ../libpurple/account.c:1744 ../libpurple/protocols/gg/gg.c:1012
+#: ../libpurple/protocols/jabber/buddy.c:642
+#: ../libpurple/protocols/jabber/buddy.c:1462
+#: ../libpurple/protocols/jabber/buddy.c:1479
+#: ../libpurple/protocols/novell/novell.c:2831
+#: ../libpurple/protocols/qq/qq.c:232 ../pidgin/gtkft.c:159
 msgid "Unknown"
 msgstr "Onbekend"
 
-#: ../libpurple/blist.c:523 ../libpurple/blist.c:1296
-#: ../libpurple/blist.c:1525 ../libpurple/protocols/jabber/roster.c:68
-#: ../pidgin/gtkblist.c:5137 ../pidgin/plugins/gevolution/gevolution.c:97
+#: ../libpurple/blist.c:521 ../libpurple/blist.c:1289
+#: ../libpurple/blist.c:1518 ../libpurple/protocols/jabber/roster.c:68
+#: ../pidgin/gtkblist.c:5321 ../pidgin/plugins/gevolution/gevolution.c:96
 #: ../pidgin/plugins/gevolution/gevo-util.c:64
 msgid "Buddies"
 msgstr "Vriende"
 
-#: ../libpurple/blist.c:550
+#: ../libpurple/blist.c:548
 msgid "buddy list"
 msgstr "vriendelys"
 
@@ -1544,81 +1836,86 @@
 msgstr "+++ %s het afgemeld"
 
 #: ../libpurple/connection.c:440 ../libpurple/plugin.c:282
-#: ../libpurple/protocols/jabber/buddy.c:1692
+#: ../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 "Onbekende fout"
 
-#: ../libpurple/conversation.c:165
+#: ../libpurple/conversation.c:170
 msgid "Unable to send message: The message is too large."
 msgstr "Kan nie boodskap stuur nie: Die boodskap is te groot."
 
-#: ../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 "Kan nie boodskap stuur aan %s nie."
 
-#: ../libpurple/conversation.c:169
+#: ../libpurple/conversation.c:174
 msgid "The message is too large."
 msgstr "Die boodskap is te groot."
 
-#: ../libpurple/conversation.c:178
+#: ../libpurple/conversation.c:183 ../libpurple/protocols/bonjour/jabber.c:255
+#: ../libpurple/protocols/bonjour/jabber.c:298
 msgid "Unable to send message."
 msgstr "Kan nie boodskap stuur nie."
 
-#: ../libpurple/conversation.c:1162
+#: ../libpurple/conversation.c:1169
 msgid "Send Message"
 msgstr "Stuur boodskap"
 
-#: ../libpurple/conversation.c:1163
+#: ../libpurple/conversation.c:1172
 msgid "_Send Message"
 msgstr "_Stuur boodskap"
 
-#: ../libpurple/conversation.c:1566
+#: ../libpurple/conversation.c:1578
 #, c-format
 msgid "%s entered the room."
 msgstr "%s het die kamer binnegekom."
 
-#: ../libpurple/conversation.c:1569
+#: ../libpurple/conversation.c:1581
 #, c-format
 msgid "%s [<I>%s</I>] entered the room."
 msgstr "%s [<I>%s</I>] het die kamer binnegekom."
 
-#: ../libpurple/conversation.c:1674
+#: ../libpurple/conversation.c:1691
 #, c-format
 msgid "You are now known as %s"
 msgstr "U staan nou bekend as %s"
 
-#: ../libpurple/conversation.c:1694
+#: ../libpurple/conversation.c:1711
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s staan nou bekend as %s"
 
-#: ../libpurple/conversation.c:1767
+#: ../libpurple/conversation.c:1786
 #, c-format
 msgid "%s left the room."
 msgstr "%s het die kamer verlaat."
 
-#: ../libpurple/conversation.c:1770
+#: ../libpurple/conversation.c:1789
 #, c-format
 msgid "%s left the room (%s)."
 msgstr "%s het die kamer verlaat (%s)."
 
-#: ../libpurple/dbus-server.c:578
+#: ../libpurple/dbus-server.c:584
 #, c-format
 msgid "Failed to get connection: %s"
-msgstr "Kon nie verbinding kry nie: %s"
-
-#: ../libpurple/dbus-server.c:590
+msgstr "Kry van verbinding het misluk: %s"
+
+#: ../libpurple/dbus-server.c:596
 #, c-format
 msgid "Failed to get name: %s"
-msgstr "Kon nie naam kry nie: %s"
-
-#: ../libpurple/dbus-server.c:603
+msgstr "Kry van naam het misluk: %s"
+
+#: ../libpurple/dbus-server.c:610
 #, c-format
 msgid "Failed to get serv name: %s"
-msgstr "Kon nie bedienernaam kry nie: %s"
+msgstr "Kry van bedienernaam het misluk: %s"
+
+#: ../libpurple/dbus-server.h:84
+msgid "Purple's D-BUS server is not running for the reason listed below"
+msgstr "Purple se D-BUS-bediener loop nie, vir die rede hier onder"
 
 #: ../libpurple/desktopitem.c:286 ../libpurple/desktopitem.c:877
 msgid "No name"
@@ -1626,11 +1923,11 @@
 
 #: ../libpurple/dnsquery.c:510
 msgid "Unable to create new resolver process\n"
-msgstr ""
+msgstr "Kon nie nuwe oplosserproses skep nie\n"
 
 #: ../libpurple/dnsquery.c:515
 msgid "Unable to send request to resolver process\n"
-msgstr ""
+msgstr "Kon nie versoek aan oplosserproses stuur nie\n"
 
 #: ../libpurple/dnsquery.c:548 ../libpurple/dnsquery.c:696
 #, c-format
@@ -1638,12 +1935,14 @@
 "Error resolving %s:\n"
 "%s"
 msgstr ""
+"Fout met oplos van %s:\n"
+"%s"
 
 #: ../libpurple/dnsquery.c:551 ../libpurple/dnsquery.c:710
 #: ../libpurple/dnsquery.c:830
 #, c-format
 msgid "Error resolving %s: %d"
-msgstr ""
+msgstr "Fout met oplos van %s: %d"
 
 #: ../libpurple/dnsquery.c:573
 #, c-format
@@ -1651,136 +1950,147 @@
 "Error reading from resolver process:\n"
 "%s"
 msgstr ""
+"Fout met lees van oplosserproses:\n"
+"%s"
 
 #: ../libpurple/dnsquery.c:577
 msgid "EOF while reading from resolver process"
-msgstr ""
+msgstr "EOF terwyl van oplosserproses lees"
 
 #: ../libpurple/dnsquery.c:760
 #, c-format
 msgid "Thread creation failure: %s"
-msgstr ""
+msgstr "Draadskepping het misluk %s"
 
 #: ../libpurple/dnsquery.c:761
 msgid "Unknown reason"
 msgstr "Onbekende rede"
 
-#: ../libpurple/ft.c:204 ../libpurple/protocols/msn/msn.c:409
+#: ../libpurple/ft.c:207
 #, c-format
 msgid ""
 "Error reading %s: \n"
 "%s.\n"
 msgstr ""
-
-#: ../libpurple/ft.c:208
+"Fout met lees van %s: \n"
+"%s.\n"
+
+#: ../libpurple/ft.c:211
 #, c-format
 msgid ""
 "Error writing %s: \n"
 "%s.\n"
 msgstr ""
-
-#: ../libpurple/ft.c:212
+"Fout met skryf van %s: \n"
+"%s.\n"
+
+#: ../libpurple/ft.c:215
 #, c-format
 msgid ""
 "Error accessing %s: \n"
 "%s.\n"
 msgstr ""
-
-#: ../libpurple/ft.c:248
+"Fout met toegang verkry van %s: \n"
+"%s.\n"
+
+#: ../libpurple/ft.c:251
 msgid "Directory is not writable."
-msgstr ""
-
-#: ../libpurple/ft.c:263
+msgstr "Gids is nie skryfbaar nie."
+
+#: ../libpurple/ft.c:266
 msgid "Cannot send a file of 0 bytes."
 msgstr "Kan nie 'n lêer van 0 grepe stuur nie."
 
-#: ../libpurple/ft.c:273
+#: ../libpurple/ft.c:276
 msgid "Cannot send a directory."
 msgstr "Kan nie 'n gids stuur nie."
 
-#: ../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 is nie 'n gewone lêer nie. Gaan dus nie probeer om te oorskryf nie.\n"
 
-#: ../libpurple/ft.c:340
+#: ../libpurple/ft.c:345
 #, c-format
 msgid "%s wants to send you %s (%s)"
 msgstr "%s wil %s aan u stuur (%s)"
 
-#: ../libpurple/ft.c:347
+#: ../libpurple/ft.c:352
 #, c-format
 msgid "%s wants to send you a file"
 msgstr "%s wil aan u 'n lêer stuur"
 
-#: ../libpurple/ft.c:388
+#: ../libpurple/ft.c:395
 #, c-format
 msgid "Accept file transfer request from %s?"
 msgstr "Aanvaar die versoek tot lêeroordrag vanaf %s?"
 
-#: ../libpurple/ft.c:392
+#: ../libpurple/ft.c:399
 #, c-format
 msgid ""
 "A file is available for download from:\n"
 "Remote host: %s\n"
 "Remote port: %d"
 msgstr ""
-
-#: ../libpurple/ft.c:425
+"'n Lêer is beskikbaar vir aflaai van:\n"
+"Afgeleë gasheer: %s\n"
+"Afgeleë poort: %d"
+
+#: ../libpurple/ft.c:434
 #, c-format
 msgid "%s is offering to send file %s"
 msgstr "%s bied aan om lêer %s te stuur"
 
-#: ../libpurple/ft.c:477
+#: ../libpurple/ft.c:486
 #, c-format
 msgid "%s is not a valid filename.\n"
 msgstr "%s is nie 'n geldige lêernaam nie.\n"
 
-#: ../libpurple/ft.c:498
+#: ../libpurple/ft.c:507
 #, c-format
 msgid "Offering to send %s to %s"
 msgstr "Bied aan om %s aan %s te stuur"
 
-#: ../libpurple/ft.c:510
+#: ../libpurple/ft.c:519
 #, c-format
 msgid "Starting transfer of %s from %s"
 msgstr "Begin nou met oordrag van %s vanaf %s"
 
-#: ../libpurple/ft.c:664
+#: ../libpurple/ft.c:680
 #, c-format
 msgid "Transfer of file %s complete"
 msgstr "Oordrag van lêer %s voltooi"
 
-#: ../libpurple/ft.c:667
+#: ../libpurple/ft.c:683
 msgid "File transfer complete"
 msgstr "Lêeroordrag voltooi"
 
-#: ../libpurple/ft.c:1084
+#: ../libpurple/ft.c:1101
 #, c-format
 msgid "You canceled the transfer of %s"
 msgstr "U het die oordrag van %s gekanselleer"
 
-#: ../libpurple/ft.c:1089
+#: ../libpurple/ft.c:1106
 msgid "File transfer cancelled"
 msgstr "Lêeroordrag gekanselleer"
 
-#: ../libpurple/ft.c:1147
+#: ../libpurple/ft.c:1164
 #, c-format
 msgid "%s canceled the transfer of %s"
 msgstr "%s het die oordrag van %s gekanselleer"
 
-#: ../libpurple/ft.c:1152
+#: ../libpurple/ft.c:1169
 #, c-format
 msgid "%s canceled the file transfer"
 msgstr "%s het die lêeroordrag gekanselleer"
 
-#: ../libpurple/ft.c:1209
+#: ../libpurple/ft.c:1226
 #, c-format
 msgid "File transfer to %s failed."
 msgstr "Lêeroordrag na %s het misluk."
 
-#: ../libpurple/ft.c:1211
+#: ../libpurple/ft.c:1228
 #, c-format
 msgid "File transfer from %s failed."
 msgstr "Lêeroordrag vanaf %s het misluk."
@@ -1935,110 +2245,115 @@
 
 #: ../libpurple/gconf/purple.schemas.in.h:27
 msgid "Whether the specified command should handle \"aim\" URLs"
-msgstr ""
+msgstr "Of die gespesifiseerde bevel \"aim\"-URL'e moet hanteer"
 
 #: ../libpurple/gconf/purple.schemas.in.h:28
 msgid "Whether the specified command should handle \"gg\" URLs"
-msgstr ""
+msgstr "Of die gespesifiseerde bevel \"gg\"-URL'e moet hanteer"
 
 #: ../libpurple/gconf/purple.schemas.in.h:29
 msgid "Whether the specified command should handle \"icq\" URLs"
-msgstr ""
+msgstr "Of die gespesifiseerde bevel \"icq\"-URL'e moet hanteer"
 
 #: ../libpurple/gconf/purple.schemas.in.h:30
 msgid "Whether the specified command should handle \"irc\" URLs"
-msgstr ""
+msgstr "Of die gespesifiseerde bevel \"irc\"-URL'e moet hanteer"
 
 #: ../libpurple/gconf/purple.schemas.in.h:31
 msgid "Whether the specified command should handle \"msnim\" URLs"
-msgstr ""
+msgstr "Of die gespesifiseerde bevel \"msnim\"-URL'e moet hanteer"
 
 #: ../libpurple/gconf/purple.schemas.in.h:32
 msgid "Whether the specified command should handle \"sip\" URLs"
-msgstr ""
+msgstr "Of die gespesifiseerde bevel \"sip\"-URL'e moet hanteer"
 
 #: ../libpurple/gconf/purple.schemas.in.h:33
 msgid "Whether the specified command should handle \"xmpp\" URLs"
-msgstr ""
+msgstr "Of die gespesifiseerde bevel \"xmpp\"-URL'e moet hanteer"
 
 #: ../libpurple/gconf/purple.schemas.in.h:34
 msgid "Whether the specified command should handle \"ymsgr\" URLs"
-msgstr ""
-
-#: ../libpurple/log.c:181
+msgstr "Of die gespesifiseerde bevel \"ymsgr\"-URL'e moet hanteer"
+
+#: ../libpurple/log.c:182
 msgid "<b><font color=\"red\">The logger has no read function</font></b>"
 msgstr ""
-
-#: ../libpurple/log.c:593
+"<b><font color=\"red\">Die boekstawer het geen leesfunksie nie</font></b>"
+
+#: ../libpurple/log.c:597
 msgid "HTML"
 msgstr "HTML"
 
-#: ../libpurple/log.c:607
+#: ../libpurple/log.c:611
 msgid "Plain text"
 msgstr "Eenvoudige teks"
 
-#: ../libpurple/log.c:621
+#: ../libpurple/log.c:625
 msgid "Old flat format"
-msgstr ""
-
-#: ../libpurple/log.c:732
+msgstr "Ou plat formaat"
+
+#: ../libpurple/log.c:838
 msgid "Logging of this conversation failed."
 msgstr "Boekstawing van hierdie gesprek het misluk."
 
-#: ../libpurple/log.c:1175
+#: ../libpurple/log.c:1281
 msgid "XML"
 msgstr "XML"
 
-#: ../libpurple/log.c:1251
+#: ../libpurple/log.c:1365
 #, c-format
 msgid ""
 "<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
 "REPLY&gt;:</b></font> %s<br/>\n"
 msgstr ""
-
-#: ../libpurple/log.c:1253
+"<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
+"REPLY&gt;:</b></font> %s<br/>\n"
+
+#: ../libpurple/log.c:1367
 #, c-format
 msgid ""
 "<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
 "REPLY&gt;:</b></font> %s<br/>\n"
 msgstr ""
-
-#: ../libpurple/log.c:1311 ../libpurple/log.c:1444
+"<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
+"REPLY&gt;:</b></font> %s<br/>\n"
+
+#: ../libpurple/log.c:1425 ../libpurple/log.c:1558
 msgid "<font color=\"red\"><b>Unable to find log path!</b></font>"
-msgstr ""
-
-#: ../libpurple/log.c:1323 ../libpurple/log.c:1453
+msgstr "<font color=\"red\"><b>Kon nie boekstaafpad vind nie!</b></font>"
+
+#: ../libpurple/log.c:1437 ../libpurple/log.c:1567
 #, c-format
 msgid "<font color=\"red\"><b>Could not read file: %s</b></font>"
-msgstr ""
-
-#: ../libpurple/log.c:1385
+msgstr "<font color=\"red\"><b>Kon nie lêer lees nie: %s</b></font>"
+
+#: ../libpurple/log.c:1499
 #, c-format
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
-msgstr ""
+msgstr "(%s) %s <AUTO-REPLY>: %s\n"
 
 #: ../libpurple/plugin.c:365
 #, c-format
 msgid "You are using %s, but this plugin requires %s."
-msgstr ""
+msgstr "U gebruik tans %s, maar hierdie inprop vereis %s."
 
 #: ../libpurple/plugin.c:380
 msgid "This plugin has not defined an ID."
-msgstr ""
+msgstr "Hierdie inprop is nie as 'n ID gedefinieer nie."
 
 #: ../libpurple/plugin.c:448
 #, c-format
 msgid "Plugin magic mismatch %d (need %d)"
-msgstr ""
+msgstr "Inpropkuns pas nie: %d (benodig %d)"
 
 #: ../libpurple/plugin.c:465
 #, c-format
 msgid "ABI version mismatch %d.%d.x (need %d.%d.x)"
-msgstr ""
+msgstr "ABI-weergawe pas nie %d.%d.x (benodig %d.%d.x)"
 
 #: ../libpurple/plugin.c:482
 msgid "Plugin does not implement all required functions"
-msgstr ""
+msgstr "Inprop implementeer nie al die vereiste funksies nie"
 
 #: ../libpurple/plugin.c:547
 #, c-format
@@ -2046,6 +2361,8 @@
 "The required plugin %s was not found. Please install this plugin and try "
 "again."
 msgstr ""
+"Die vereiste inprop %s is nie gevind nie. Installeer asb. hierdie inprop en "
+"probeer weer."
 
 #: ../libpurple/plugin.c:552
 msgid "Unable to load the plugin"
@@ -2054,7 +2371,7 @@
 #: ../libpurple/plugin.c:574
 #, c-format
 msgid "The required plugin %s was unable to load."
-msgstr ""
+msgstr "Die vereiste inprop %s kon nie laai nie."
 
 #: ../libpurple/plugin.c:578
 msgid "Unable to load your plugin."
@@ -2063,11 +2380,11 @@
 #: ../libpurple/plugin.c:677
 #, c-format
 msgid "The dependent plugin %s failed to unload."
-msgstr ""
+msgstr "Ontlaai van die afhanklike inprop %s het misluk."
 
 #: ../libpurple/plugin.c:681
 msgid "There were errors unloading the plugin."
-msgstr ""
+msgstr "Daar was foute met ontlaaiing van die inprop."
 
 #: ../libpurple/plugins/autoaccept.c:23
 msgid "Autoaccept"
@@ -2095,194 +2412,93 @@
 msgid "Set Autoaccept Setting"
 msgstr "Verstel outoaanvaarding"
 
-#: ../libpurple/plugins/autoaccept.c:164 ../libpurple/plugins/autoreply.c:225
+#: ../libpurple/plugins/autoaccept.c:164
 msgid "_Save"
 msgstr "_Stoor"
 
-#: ../libpurple/plugins/autoaccept.c:165 ../libpurple/plugins/autoreply.c:226
-#: ../libpurple/plugins/idle.c:170 ../libpurple/plugins/idle.c:203
-#: ../libpurple/plugins/idle.c:228 ../libpurple/protocols/oscar/oscar.c:1434
+#: ../libpurple/plugins/autoaccept.c:165 ../libpurple/plugins/idle.c:170
+#: ../libpurple/plugins/idle.c:204 ../libpurple/plugins/idle.c:230
+#: ../libpurple/protocols/oscar/oscar.c:1451
 #: ../libpurple/protocols/oscar/oscar.c:2243
-#: ../libpurple/protocols/oscar/oscar.c:2289
+#: ../libpurple/protocols/oscar/oscar.c:2292
 #: ../libpurple/protocols/oscar/oscar.c:5834
-#: ../libpurple/protocols/oscar/oscar.c:5886
-#: ../libpurple/protocols/oscar/oscar.c:6110
-#: ../libpurple/protocols/oscar/oscar.c:6179 ../libpurple/request.h:1350
-#: ../libpurple/request.h:1360
+#: ../libpurple/protocols/oscar/oscar.c:5889
+#: ../libpurple/protocols/oscar/oscar.c:6115
+#: ../libpurple/protocols/oscar/oscar.c:6185 ../libpurple/request.h:1387
+#: ../libpurple/request.h:1397
 msgid "_Cancel"
 msgstr "_Kanselleer"
 
-#: ../libpurple/plugins/autoaccept.c:166
+#: ../libpurple/plugins/autoaccept.c:168
 msgid "Ask"
 msgstr "Vra"
 
-#: ../libpurple/plugins/autoaccept.c:167
+#: ../libpurple/plugins/autoaccept.c:169
 msgid "Auto Accept"
 msgstr "Outoaanvaar"
 
-#: ../libpurple/plugins/autoaccept.c:168
+#: ../libpurple/plugins/autoaccept.c:170
 msgid "Auto Reject"
 msgstr "Outoweier"
 
-#: ../libpurple/plugins/autoaccept.c:181
+#: ../libpurple/plugins/autoaccept.c:185
 msgid "Autoaccept File Transfers..."
 msgstr "Outoaanvaar lêeroordrag..."
 
 #. XXX: Is there a better way than this? There really should be.
-#: ../libpurple/plugins/autoaccept.c:211
+#: ../libpurple/plugins/autoaccept.c:215
 msgid ""
 "Path to save the files in\n"
 "(Please provide the full path)"
 msgstr ""
-
-#: ../libpurple/plugins/autoaccept.c:216
-msgid "Automatically reject from users not in buddy list"
-msgstr ""
-"Wys outomaties van die hand vir gebruikers wat nie in die vriendelys is nie"
+"Pad om die lêers in te stoor\n"
+"(Verskaf asb. die volledige pad)"
 
 #: ../libpurple/plugins/autoaccept.c:220
+msgid "Automatically reject from users not in buddy list"
+msgstr "Weier outomaties vir gebruikers wat nie in die vriendelys is nie"
+
+#: ../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)"
 msgstr ""
 "Laat weet met opspringvenster wanneer outoaanvaarde lêeroordrag voltooi het\n"
-"(slegs as daar geen gesprek met sender is nie)"
-
-#: ../libpurple/plugins/autoreply.c:23
-msgid "Autoreply"
-msgstr "Outo-antwoord"
-
-#: ../libpurple/plugins/autoreply.c:25
-msgid "Autoreply for all the protocols"
-msgstr "Outo-antwoord vir al die protokolle"
-
-#: ../libpurple/plugins/autoreply.c:26
-msgid ""
-"This plugin lets you set autoreply message for any protocol. You can set the "
-"global autoreply message from the Plugin-options dialog. To set some "
-"specific autoreply message for a particular buddy, right click on the buddy "
-"in the buddy-list window. To set autoreply messages for some account, go to "
-"the `Advanced' tab of the Account-edit dialog."
-msgstr ""
-"Hierdie inprop laat mens 'n outo-antwoord-boodskap stel vir enige protokol. "
-"Die globale outo-antwoord kan gestel word van die Inpropkeuses-dialoog. Om "
-"'n spesifieke outo-antwoord vir 'n spesifieke vriend te stel, klik regs op "
-"die vriend in die vriendelys. Om 'n outo-antwoord vir 'n rekening te stuur, "
-"gaan na die `Gevorderde'-oortjie van die Rekening-wysigingsdialoog."
-
-#. XXX: There should be a way to reset to the default/account-default autoreply
-#: ../libpurple/plugins/autoreply.c:218
-#, c-format
-msgid "Set autoreply message for %s"
-msgstr "Stel outoantwoord vir %s"
-
-#: ../libpurple/plugins/autoreply.c:220
-msgid "Set Autoreply Message"
-msgstr "Stel outoantwoord"
-
-#: ../libpurple/plugins/autoreply.c:221
-msgid ""
-"The following message will be sent to the buddy when the buddy sends you a "
-"message and autoreply is enabled."
-msgstr ""
-"Die volgende boodskap sal aan die vriend gestuur word as die vriend 'n "
-"boodskap stuur en u outo-antwoord is geaktiveer."
-
-#: ../libpurple/plugins/autoreply.c:238
-msgid "Set _Autoreply Message"
-msgstr "Stel _outo-antwoord"
-
-#: ../libpurple/plugins/autoreply.c:249
-msgid "Autoreply message"
-msgstr "Outoantwoord"
-
-#: ../libpurple/plugins/autoreply.c:336
-msgid "Send autoreply messages when"
-msgstr "Stuur outo-antwoorde wanneer"
-
-#: ../libpurple/plugins/autoreply.c:340
-msgid "When my account is _away"
-msgstr "my rekening op _weg is"
-
-#: ../libpurple/plugins/autoreply.c:344
-msgid "When my account is _idle"
-msgstr "my rekening op _ledig is"
-
-#: ../libpurple/plugins/autoreply.c:348
-msgid "_Default reply"
-msgstr "_Verstekantwoord"
-
-#: ../libpurple/plugins/autoreply.c:354
-msgid "Status message"
-msgstr "Statusboodskap"
-
-#: ../libpurple/plugins/autoreply.c:358
-msgid "Autoreply with status message"
-msgstr "Outo-antwoord met statusboodskap"
-
-#: ../libpurple/plugins/autoreply.c:362
-msgid "Always when there is a status message"
-msgstr "Altyd as daar 'n statusboodskap is"
-
-#: ../libpurple/plugins/autoreply.c:364
-msgid "Only when there's no autoreply message"
-msgstr "Slegs as daar geen outo-antwoord is nie"
-
-#: ../libpurple/plugins/autoreply.c:369
-msgid "Delay between autoreplies"
-msgstr "Wagtyd tussen outo-antwoorde"
-
-#: ../libpurple/plugins/autoreply.c:373
-msgid "_Minimum delay (mins)"
-msgstr "_Minimum wagtyd (minute)"
-
-#: ../libpurple/plugins/autoreply.c:377
-msgid "Times to send autoreplies"
-msgstr "Aantal outo-antwoorde om te stuur"
-
-#: ../libpurple/plugins/autoreply.c:381
-msgid "Ma_ximum count"
-msgstr "Ma_ksimum aantal"
-
-#: ../libpurple/plugins/autoreply.c:428
-msgid ""
-"I am currently not available. Please leave your message, and I will get back "
-"to you as soon as possible."
-msgstr ""
-"Ek is tans nie beskikbaar nie. Los gerus 'n boodskap en ek sal so gou "
-"moontlik antwoord."
-
-#: ../libpurple/plugins/buddynote.c:46 ../libpurple/protocols/msn/msn.c:1589
-#: ../libpurple/protocols/msn/msn.c:1619
+"(net as daar geen gesprek met sender is nie)"
+
+#: ../libpurple/plugins/buddynote.c:46 ../libpurple/protocols/msn/msn.c:1629
+#: ../libpurple/protocols/msn/msn.c:1659
 msgid "Notes"
 msgstr "Notas"
 
 #: ../libpurple/plugins/buddynote.c:47
 msgid "Enter your notes below..."
-msgstr "Tik u notas onder in..."
-
-#: ../libpurple/plugins/buddynote.c:61
+msgstr "Gee u notas onder..."
+
+#: ../libpurple/plugins/buddynote.c:65
 msgid "Edit Notes..."
 msgstr "Wysig notas..."
 
+#. *< major version
+#. *< minor version
 #. *< type
 #. *< ui_requirement
 #. *< flags
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/buddynote.c:87
+#: ../libpurple/plugins/buddynote.c:90 ../pidgin/plugins/gtkbuddynote.c:71
 msgid "Buddy Notes"
 msgstr "Vriendnotas"
 
 #. *< name
 #. *< version
-#: ../libpurple/plugins/buddynote.c:89
+#: ../libpurple/plugins/buddynote.c:92 ../pidgin/plugins/gtkbuddynote.c:73
 msgid "Store notes on particular buddies."
 msgstr "Stoor notas oor spesifieke vriende."
 
-#. *  summary
-#: ../libpurple/plugins/buddynote.c:90
+#. *< 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 ""
 "Voeg die moontlikheid by om notas oor vriende op die vriendelys te stoor."
@@ -2295,7 +2511,7 @@
 #. *< id
 #: ../libpurple/plugins/ciphertest.c:264
 msgid "Cipher Test"
-msgstr ""
+msgstr "Syfertoets"
 
 #. *< name
 #. *< version
@@ -2303,7 +2519,7 @@
 #. *  description
 #: ../libpurple/plugins/ciphertest.c:267 ../libpurple/plugins/ciphertest.c:269
 msgid "Tests the ciphers that ship with libpurple."
-msgstr ""
+msgstr "Toets die syfers wat met by libpurble ingesluit is."
 
 #. *< type
 #. *< ui_requirement
@@ -2340,50 +2556,48 @@
 #. *  description
 #: ../libpurple/plugins/filectl.c:251 ../libpurple/plugins/filectl.c:253
 msgid "Allows control by entering commands in a file."
-msgstr "Maak beheer moontlik deur opdragte in 'n lêer te voeg."
-
-#: ../libpurple/plugins/idle.c:158 ../libpurple/plugins/idle.c:216
+msgstr "Maak beheer moontlik deur opdragte in 'n lêer te gee."
+
+#: ../libpurple/plugins/idle.c:158 ../libpurple/plugins/idle.c:218
 msgid "Minutes"
 msgstr "Minute"
 
 #. This is a cultural reference.  Dy'er Mak'er is a song by Led Zeppelin.
 #. If that doesn't translate well into your language, drop the 's before translating.
-#: ../libpurple/plugins/idle.c:165 ../libpurple/plugins/idle.c:198
-#: ../libpurple/plugins/idle.c:223 ../libpurple/plugins/idle.c:315
+#: ../libpurple/plugins/idle.c:165 ../libpurple/plugins/idle.c:199
+#: ../libpurple/plugins/idle.c:225 ../libpurple/plugins/idle.c:318
 msgid "I'dle Mak'er"
-msgstr ""
-
-#: ../libpurple/plugins/idle.c:166 ../libpurple/plugins/idle.c:255
+msgstr "Ledigmaker"
+
+#: ../libpurple/plugins/idle.c:166 ../libpurple/plugins/idle.c:258
 msgid "Set Account Idle Time"
 msgstr "Stel rekening se ledige tyd"
 
-#: ../libpurple/plugins/idle.c:169 ../libpurple/plugins/idle.c:227
+#: ../libpurple/plugins/idle.c:169 ../libpurple/plugins/idle.c:229
 msgid "_Set"
 msgstr "_Stel"
 
-#: ../libpurple/plugins/idle.c:183
+#: ../libpurple/plugins/idle.c:184
 msgid "None of your accounts are idle."
 msgstr "Geen van u rekenings is ledig nie."
 
-#: ../libpurple/plugins/idle.c:199 ../libpurple/plugins/idle.c:259
-#, fuzzy
+#: ../libpurple/plugins/idle.c:200 ../libpurple/plugins/idle.c:262
 msgid "Unset Account Idle Time"
-msgstr "Stel rekening se ledige tyd"
-
-#: ../libpurple/plugins/idle.c:202
+msgstr "Deaktiveer ledige tyd in rekening"
+
+#: ../libpurple/plugins/idle.c:203
 msgid "_Unset"
-msgstr ""
-
-#: ../libpurple/plugins/idle.c:224 ../libpurple/plugins/idle.c:263
+msgstr "_Deaktiveer"
+
+#: ../libpurple/plugins/idle.c:226 ../libpurple/plugins/idle.c:266
 msgid "Set Idle Time for All Accounts"
 msgstr "Stel ledige tyd vir alle rekeninge"
 
-#: ../libpurple/plugins/idle.c:268
-#, fuzzy
+#: ../libpurple/plugins/idle.c:271
 msgid "Unset Idle Time for All Idled Accounts"
-msgstr "Stel ledige tyd vir alle rekeninge"
-
-#: ../libpurple/plugins/idle.c:317 ../libpurple/plugins/idle.c:318
+msgstr "Deaktiveer ledige tyd in alle rekeninge"
+
+#: ../libpurple/plugins/idle.c:320 ../libpurple/plugins/idle.c:321
 msgid "Allows you to hand-configure how long you've been idle"
 msgstr "Laat mens toe om met die hand te stel hoe lank mens ledig was"
 
@@ -2410,6 +2624,8 @@
 "Test plugin IPC support, as a client. This locates the server plugin and "
 "calls the commands registered."
 msgstr ""
+"Toets inprop-IPC-ondersteuning, as 'n kliënt. Dit vind die bedienerinprop en "
+"roep die bevele wat geregistreer is."
 
 #. *< type
 #. *< ui_requirement
@@ -2444,7 +2660,7 @@
 
 #: ../libpurple/plugins/joinpart.c:239
 msgid "User Inactivity Timeout (in minutes)"
-msgstr ""
+msgstr "Gebruikeronaktiwiteit-uittelling (in minute)"
 
 #. *< type
 #. *< ui_requirement
@@ -2452,127 +2668,137 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/joinpart.c:264
+#: ../libpurple/plugins/joinpart.c:270
 msgid "Join/Part Hiding"
 msgstr "In- en uitgaanversteking"
 
 #. *< name
 #. *< version
 #. *  summary
-#: ../libpurple/plugins/joinpart.c:267
+#: ../libpurple/plugins/joinpart.c:273
 msgid "Hides extraneous join/part messages."
 msgstr "Versteek onnodige in- en uitgaanboodskappe."
 
 #. *  description
-#: ../libpurple/plugins/joinpart.c:269
+#: ../libpurple/plugins/joinpart.c:275
 msgid ""
 "This plugin hides join/part messages in large rooms, except for those users "
 "actively taking part in a conversation."
 msgstr ""
+"Hierdie inprop versteek aansluit/weggaan-boodskappe in groot kamers, behalwe "
+"vir gebruikers wat aktief aan die gesprek deelneem."
 
 #. This is used in the place of a timezone abbreviation if the
 #. * offset is way off.  The user should never really see it, but
 #. * it's here just in case.  The parens are to make it clear it's
 #. * not a real timezone.
-#: ../libpurple/plugins/log_reader.c:497
+#: ../libpurple/plugins/log_reader.c:493
 msgid "(UTC)"
-msgstr ""
-
-#: ../libpurple/plugins/log_reader.c:1552
+msgstr "(UTC)"
+
+#: ../libpurple/plugins/log_reader.c:1577
 msgid "User is offline."
 msgstr "Gebruiker is aflyn."
 
-#: ../libpurple/plugins/log_reader.c:1558
+#: ../libpurple/plugins/log_reader.c:1583
 msgid "Auto-response sent:"
 msgstr "Outo-antwoord gestuur:"
 
-#: ../libpurple/plugins/log_reader.c:1568
-#: ../libpurple/plugins/log_reader.c:1571
+#: ../libpurple/plugins/log_reader.c:1593
+#: ../libpurple/plugins/log_reader.c:1596
 #: ../libpurple/plugins/statenotify.c:80
 #, c-format
 msgid "%s has signed off."
 msgstr "%s het afgemeld."
 
-#: ../libpurple/plugins/log_reader.c:1585
+#: ../libpurple/plugins/log_reader.c:1610
 msgid "One or more messages may have been undeliverable."
 msgstr "Een of meer boodskappe kon dalk nie afgelewer word nie."
 
-#: ../libpurple/plugins/log_reader.c:1595
+#: ../libpurple/plugins/log_reader.c:1620
 msgid "You were disconnected from the server."
 msgstr "U is van die bediener afgesny."
 
-#: ../libpurple/plugins/log_reader.c:1603
+#: ../libpurple/plugins/log_reader.c:1628
 msgid ""
 "You are currently disconnected. Messages will not be received unless you are "
 "logged in."
 msgstr ""
 "U is tans afgesny. Boodskappe sal nie ontvang word tensy u aangemeld is nie."
 
-#: ../libpurple/plugins/log_reader.c:1618
+#: ../libpurple/plugins/log_reader.c:1643
 msgid "Message could not be sent because the maximum length was exceeded."
 msgstr "Boodskap kon nie gestuur word nie want die maksimumlengte is oorskry."
 
-#: ../libpurple/plugins/log_reader.c:1623
+#: ../libpurple/plugins/log_reader.c:1648
 msgid "Message could not be sent."
 msgstr "Boodskap kon nie gestuur word nie."
 
 #. 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:2349
+#: ../libpurple/plugins/log_reader.c:2472
 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:2362
+#: ../libpurple/plugins/log_reader.c:2477
 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:2374
+#: ../libpurple/plugins/log_reader.c:2481
 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:2388
+#: ../libpurple/plugins/log_reader.c:2486
+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:2400
+#: ../libpurple/plugins/log_reader.c:2490
 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:2412
+#: ../libpurple/plugins/log_reader.c:2494
 msgid "Trillian"
 msgstr "Trillian"
 
 #. Add general preferences.
-#: ../libpurple/plugins/log_reader.c:2067
+#: ../libpurple/plugins/log_reader.c:2454
 msgid "General Log Reading Configuration"
-msgstr ""
-
-#: ../libpurple/plugins/log_reader.c:2071
+msgstr "Leeskonfigurasie van algemene staaflêers"
+
+#: ../libpurple/plugins/log_reader.c:2458
 msgid "Fast size calculations"
-msgstr ""
-
-#: ../libpurple/plugins/log_reader.c:2075
+msgstr "Vinnige grootteberekeninge"
+
+#: ../libpurple/plugins/log_reader.c:2462
 msgid "Use name heuristics"
-msgstr ""
+msgstr "Gebruik naamheuristiek"
 
 #. Add Log Directory preferences.
-#: ../libpurple/plugins/log_reader.c:2081
+#: ../libpurple/plugins/log_reader.c:2468
 msgid "Log Directory"
-msgstr ""
+msgstr "Staaflêergids"
 
 #. *< type
 #. *< ui_requirement
@@ -2580,19 +2806,19 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/log_reader.c:2126
+#: ../libpurple/plugins/log_reader.c:2523
 msgid "Log Reader"
 msgstr "Staaflêerleser"
 
 #. *< name
 #. *< version
 #. * summary
-#: ../libpurple/plugins/log_reader.c:2130
+#: ../libpurple/plugins/log_reader.c:2527
 msgid "Includes other IM clients' logs in the log viewer."
 msgstr "Sluit ander kletskliënte se staaflêers in in die staaflêerleser."
 
 #. * description
-#: ../libpurple/plugins/log_reader.c:2134
+#: ../libpurple/plugins/log_reader.c:2531
 msgid ""
 "When viewing logs, this plugin will include logs from other IM clients. "
 "Currently, this includes Adium, MSN Messenger, and Trillian.\n"
@@ -2600,13 +2826,18 @@
 "WARNING: This plugin is still alpha code and may crash frequently.  Use it "
 "at your own risk!"
 msgstr ""
-
-#: ../libpurple/plugins/mono/loader/mono.c:211
+"Wanneer staaflêers gelees word, sal hierdie inprop staaflêers uit ander IM-"
+"kliënte insluit. Dit sluit tans Adium, MSN Messenger en Trillian in.\n"
+"\n"
+"LET WEL: Hierdie inprop is nog in alfakode en kan dalk gereeld omval.  "
+"Gebruik op eie risiko!"
+
+#: ../libpurple/plugins/mono/loader/mono.c:217
 msgid "Mono Plugin Loader"
 msgstr "Laaier vir Mono-inproppe"
 
-#: ../libpurple/plugins/mono/loader/mono.c:213
-#: ../libpurple/plugins/mono/loader/mono.c:214
+#: ../libpurple/plugins/mono/loader/mono.c:219
+#: ../libpurple/plugins/mono/loader/mono.c:220
 msgid "Loads .NET plugins with Mono."
 msgstr "Laai .NET-inproppe met Mono."
 
@@ -2627,14 +2858,16 @@
 #. *< version
 #: ../libpurple/plugins/newline.c:70
 msgid "Prepends a newline to displayed message."
-msgstr "Voeg 'n nuwe lyn vooraan die vertoonde boodskap."
-
-#. *  summary
+msgstr "Voeg 'n nuwe lyn vooraan die gewysde boodskap."
+
+#. *< summary
 #: ../libpurple/plugins/newline.c:71
 msgid ""
 "Prepends a newline to messages so that the rest of the message appears below "
 "the screen name in the conversation window."
 msgstr ""
+"Voeg 'n reëlbreuk vooraan boodskappe sodat die res van die boo0dskap onder "
+"die skermnaam in die gesprekvenster verskyn."
 
 #: ../libpurple/plugins/offlinemsg.c:23
 msgid "Offline Message Emulation"
@@ -2669,31 +2902,35 @@
 msgid "You can edit/delete the pounce from the `Buddy Pounces' dialog"
 msgstr "U kan die vriendwag wysig/verwyder vanuit die `Vriendwag'-dialoog"
 
-#: ../libpurple/plugins/offlinemsg.c:159
-#: ../libpurple/protocols/msn/dialog.c:132
-#: ../libpurple/protocols/msn/msn.c:519 ../libpurple/protocols/msn/msn.c:529
-#: ../libpurple/protocols/novell/novell.c:1918
-#: ../libpurple/protocols/silc/buddy.c:313
-#: ../libpurple/protocols/silc/pk.c:117 ../libpurple/protocols/silc/wb.c:303
-#: ../pidgin/gtkrequest.c:267
+#: ../libpurple/plugins/offlinemsg.c:161
+#: ../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: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 "Ja"
 
-#: ../libpurple/plugins/offlinemsg.c:160
-#: ../libpurple/protocols/msn/dialog.c:133
-#: ../libpurple/protocols/msn/msn.c:519 ../libpurple/protocols/msn/msn.c:529
-#: ../libpurple/protocols/novell/novell.c:1919
-#: ../libpurple/protocols/silc/buddy.c:314
-#: ../libpurple/protocols/silc/pk.c:118 ../libpurple/protocols/silc/wb.c:304
-#: ../pidgin/gtkrequest.c:268
+#: ../libpurple/plugins/offlinemsg.c:162
+#: ../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: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 "Nee"
 
-#: ../libpurple/plugins/offlinemsg.c:187
+#: ../libpurple/plugins/offlinemsg.c:189
 msgid "Save offline messages in pounce"
 msgstr "Stoor aflyn boodskappe in vriendwag"
 
-#: ../libpurple/plugins/offlinemsg.c:191
+#: ../libpurple/plugins/offlinemsg.c:193
 msgid "Do not ask. Always save in pounce."
 msgstr "Moenie vra nie. Stoor altyd in vriendwag."
 
@@ -2703,50 +2940,52 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/perl/perl.c:588
+#: ../libpurple/plugins/perl/perl.c:601
 msgid "Perl Plugin Loader"
 msgstr "Laaier vir perl-inproppe"
 
 #. *< name
 #. *< version
 #. *< summary
-#: ../libpurple/plugins/perl/perl.c:590 ../libpurple/plugins/perl/perl.c:591
+#: ../libpurple/plugins/perl/perl.c:603 ../libpurple/plugins/perl/perl.c:604
 msgid "Provides support for loading perl plugins."
 msgstr "Verskaf ondersteuning vir die laai van perl-inproppe."
 
-#: ../libpurple/plugins/psychic.c:19
+#: ../libpurple/plugins/psychic.c:20
 msgid "Psychic Mode"
 msgstr "Sienermodus"
 
-#: ../libpurple/plugins/psychic.c:20
+#: ../libpurple/plugins/psychic.c:21
 msgid "Psychic mode for incoming conversation"
 msgstr "Sienermodus vir inkomende gesprekke"
 
-#: ../libpurple/plugins/psychic.c:21
+#: ../libpurple/plugins/psychic.c:22
 msgid ""
 "Causes conversation windows to appear as other users begin to message you.  "
-"This works for AIM, ICQ, Jabber, Sametime, and Yahoo!"
-msgstr "Veroorsaak dat gesprekvensters verskein wanneer ander gebruikers 'n boodskap begin tik.  Hierdie werk vir AIM, ICQ, Jabber, Sametime en Yahoo!"
-
-#: ../libpurple/plugins/psychic.c:66
+"This works for AIM, ICQ, XMPP, Sametime, and Yahoo!"
+msgstr ""
+"Veroorsaak dat gesprekvensters verskyn wanneer ander gebruikers 'n boodskap "
+"begin tik.  Hierdie werk vir AIM, ICQ, XMPP, Sametime en Yahoo!"
+
+#: ../libpurple/plugins/psychic.c:72
 msgid "You feel a disturbance in the force..."
 msgstr "U voel 'n magtige dreuning..."
 
-#: ../libpurple/plugins/psychic.c:85
+#: ../libpurple/plugins/psychic.c:91
 msgid "Only enable for users on the buddy list"
-msgstr "Aktiveer slegs vir gebruikers in die vriendelys"
-
-#: ../libpurple/plugins/psychic.c:90
+msgstr "Aktiveer net vir gebruikers in die vriendelys"
+
+#: ../libpurple/plugins/psychic.c:96
 msgid "Disable when away"
 msgstr "Deaktiveer terwyl weg"
 
-#: ../libpurple/plugins/psychic.c:94
+#: ../libpurple/plugins/psychic.c:100
 msgid "Display notification message in conversations"
-msgstr "Vertoon kennisgewingsboodskap in gesprekke"
-
-#: ../libpurple/plugins/psychic.c:99
+msgstr "Wys kennisgewingsboodskap in gesprekke"
+
+#: ../libpurple/plugins/psychic.c:105
 msgid "Raise psychic conversations"
-msgstr ""
+msgstr "Bring sienergesprekke na vore"
 
 #. *< type
 #. *< ui_requirement
@@ -2754,7 +2993,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/signals-test.c:684
+#: ../libpurple/plugins/signals-test.c:711
 msgid "Signals Test"
 msgstr "Seinetoets"
 
@@ -2762,8 +3001,8 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/plugins/signals-test.c:687
-#: ../libpurple/plugins/signals-test.c:689
+#: ../libpurple/plugins/signals-test.c:714
+#: ../libpurple/plugins/signals-test.c:716
 msgid "Test to see that all signals are working properly."
 msgstr "Toets om te sien of alle seine goed werk."
 
@@ -2801,7 +3040,7 @@
 #. *  description
 #: ../libpurple/plugins/ssl/ssl.c:97 ../libpurple/plugins/ssl/ssl.c:99
 msgid "Provides a wrapper around SSL support libraries."
-msgstr ""
+msgstr "Verskaf 'n skil vir SSL-ondersteuning-programmateke."
 
 #. *< type
 #. *< ui_requirement
@@ -2809,7 +3048,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/ssl/ssl-gnutls.c:257
+#: ../libpurple/plugins/ssl/ssl-gnutls.c:275
 msgid "GNUTLS"
 msgstr "GNUTLS"
 
@@ -2817,8 +3056,8 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/plugins/ssl/ssl-gnutls.c:260
-#: ../libpurple/plugins/ssl/ssl-gnutls.c:262
+#: ../libpurple/plugins/ssl/ssl-gnutls.c:278
+#: ../libpurple/plugins/ssl/ssl-gnutls.c:280
 msgid "Provides SSL support through GNUTLS."
 msgstr "Verskaf SSL-steun d.m.v. GNUTLS."
 
@@ -2828,7 +3067,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/ssl/ssl-nss.c:409
+#: ../libpurple/plugins/ssl/ssl-nss.c:423
 msgid "NSS"
 msgstr "NSS"
 
@@ -2836,8 +3075,8 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/plugins/ssl/ssl-nss.c:412
-#: ../libpurple/plugins/ssl/ssl-nss.c:414
+#: ../libpurple/plugins/ssl/ssl-nss.c:426
+#: ../libpurple/plugins/ssl/ssl-nss.c:428
 msgid "Provides SSL support through Mozilla NSS."
 msgstr "Verskaf SSL-steun d.m.v. Mozilla-NSS."
 
@@ -2872,15 +3111,15 @@
 
 #: ../libpurple/plugins/statenotify.c:94
 msgid "Buddy Goes _Away"
-msgstr "vriend _weggaan"
+msgstr "Vriend _weggaan"
 
 #: ../libpurple/plugins/statenotify.c:97
 msgid "Buddy Goes _Idle"
-msgstr "vriend _ledig word"
+msgstr "Vriend _ledig word"
 
 #: ../libpurple/plugins/statenotify.c:100
 msgid "Buddy _Signs On/Off"
-msgstr "vriend aan-/af_meld"
+msgstr "Vriend aan-/af_meld"
 
 #. *< type
 #. *< ui_requirement
@@ -2888,7 +3127,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/statenotify.c:142
+#: ../libpurple/plugins/statenotify.c:148
 msgid "Buddy State Notification"
 msgstr "Vriendstatuskennisgewing"
 
@@ -2896,55 +3135,79 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/plugins/statenotify.c:145
-#: ../libpurple/plugins/statenotify.c:148
+#: ../libpurple/plugins/statenotify.c:151
+#: ../libpurple/plugins/statenotify.c:154
 msgid ""
 "Notifies in a conversation window when a buddy goes or returns from away or "
 "idle."
-msgstr "Dui aan in 'n gespreksvenster wanneer 'n vriend weggaan of terugkom vanaf 'n weg- of ledige status."
-
-#: ../libpurple/plugins/tcl/tcl.c:415
+msgstr ""
+"Dui aan in 'n gespreksvenster wanneer 'n vriend weggaan of terugkom vanaf 'n "
+"weg- of ledige status."
+
+#: ../libpurple/plugins/tcl/tcl.c:421
 msgid "Tcl Plugin Loader"
 msgstr "Laaier vir Tcl-inproppe"
 
-#: ../libpurple/plugins/tcl/tcl.c:417 ../libpurple/plugins/tcl/tcl.c:418
+#: ../libpurple/plugins/tcl/tcl.c:423 ../libpurple/plugins/tcl/tcl.c:424
 msgid "Provides support for loading Tcl plugins"
-msgstr ""
-
-#: ../libpurple/plugins/tcl/tcl.c:483
+msgstr "Verskaf ondersteuning vir die laai van Tcl-inproppe"
+
+#: ../libpurple/plugins/tcl/tcl.c:507
 msgid ""
 "Unable to detect ActiveTCL installation. If you wish to use TCL plugins, "
 "install ActiveTCL from http://www.activestate.com\n"
 msgstr ""
+"Kon nie ActiveTCL-installasie bespeur nie. Indien u TCL-inproppe wil "
+"gebruik, installeerActiveTCL vanaf http://www.activestate.com\n"
 
 #. Send a message about the connection error
-#: ../libpurple/protocols/bonjour/bonjour.c:113
+#: ../libpurple/protocols/bonjour/bonjour.c:112
 msgid "Unable to listen for incoming IM connections\n"
-msgstr ""
-
-#: ../libpurple/protocols/bonjour/bonjour.c:148
+msgstr "Kon nie vir inkomende kitsboodskap-verbindings luister nie\n"
+
+#: ../libpurple/protocols/bonjour/bonjour.c:137
 msgid ""
 "Unable to establish connection with the local mDNS server.  Is it running?"
 msgstr ""
-
-#. get_yahoo_status_from_purple_status() returns YAHOO_STATUS_CUSTOM for
-#. * the generic away state (YAHOO_STATUS_TYPE_AWAY) with no message
-#. Away stuff
-#: ../libpurple/protocols/bonjour/bonjour.c:302
-#: ../libpurple/protocols/gg/gg.c:999 ../libpurple/protocols/irc/irc.c:514
-#: ../libpurple/protocols/irc/msgs.c:299
-#: ../libpurple/protocols/jabber/buddy.c:1414
-#: ../libpurple/protocols/novell/novell.c:2820
-#: ../libpurple/protocols/oscar/oscar.c:714
-#: ../libpurple/protocols/oscar/oscar.c:4520
-#: ../libpurple/protocols/oscar/oscar.c:5570
-#: ../libpurple/protocols/qq/qq.c:180 ../libpurple/protocols/silc/buddy.c:1469
-#: ../libpurple/protocols/yahoo/yahoo.c:3373
-#: ../libpurple/protocols/yahoo/yahoo.c:3446 ../libpurple/status.c:158
-#: ../pidgin/gtkdocklet.c:450 ../pidgin/gtkprefs.c:1821
-#: ../pidgin/gtkstatusbox.c:1090
-msgid "Away"
-msgstr "Weg"
+"Kon nie verbinding bewerkstellig met plaaslike mDNS-bediener nie.  Loop dit?"
+
+#. Creating the options for the protocol
+#: ../libpurple/protocols/bonjour/bonjour.c:344
+#: ../libpurple/protocols/bonjour/bonjour.c:614
+#: ../libpurple/protocols/gg/gg.c:627
+#: ../libpurple/protocols/jabber/jabber.c:828
+msgid "First name"
+msgstr "Naam"
+
+#: ../libpurple/protocols/bonjour/bonjour.c:346
+#: ../libpurple/protocols/bonjour/bonjour.c:617
+#: ../libpurple/protocols/gg/gg.c:622
+#: ../libpurple/protocols/jabber/jabber.c:833
+msgid "Last name"
+msgstr "Van"
+
+#: ../libpurple/protocols/bonjour/bonjour.c:350
+#: ../libpurple/protocols/jabber/buddy.c:283
+#: ../libpurple/protocols/jabber/buddy.c:940
+#: ../libpurple/protocols/jabber/buddy.c:948
+#: ../libpurple/protocols/jabber/buddy.c:1629
+#: ../libpurple/protocols/silc/ops.c:1041
+#: ../libpurple/protocols/silc/util.c:555
+#: ../libpurple/protocols/silc10/ops.c:1075
+#: ../libpurple/protocols/silc10/util.c:551
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1061
+msgid "E-Mail"
+msgstr "E-pos"
+
+#: ../libpurple/protocols/bonjour/bonjour.c:353
+#: ../libpurple/protocols/bonjour/bonjour.c:623
+msgid "AIM Account"
+msgstr "AIM-rekening"
+
+#: ../libpurple/protocols/bonjour/bonjour.c:356
+#: ../libpurple/protocols/bonjour/bonjour.c:626
+msgid "XMPP Account"
+msgstr "XMPP-rekening"
 
 #. *< type
 #. *< ui_requirement
@@ -2956,100 +3219,86 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/bonjour/bonjour.c:425
-#: ../libpurple/protocols/bonjour/bonjour.c:427
+#: ../libpurple/protocols/bonjour/bonjour.c:460
+#: ../libpurple/protocols/bonjour/bonjour.c:462
 msgid "Bonjour Protocol Plugin"
 msgstr "Bonjour-protokolinprop"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:463
-#: ../libpurple/protocols/bonjour/bonjour.c:470
-#: ../libpurple/protocols/bonjour/bonjour.c:528
+#: ../libpurple/protocols/bonjour/bonjour.c:505
+#: ../libpurple/protocols/bonjour/bonjour.c:512
+#: ../libpurple/protocols/bonjour/bonjour.c:561
 msgid "Purple Person"
-msgstr ""
+msgstr "Pers persoon"
 
 #. Creating the user splits
-#: ../libpurple/protocols/bonjour/bonjour.c:567
-#: ../libpurple/protocols/silc/silc.c:925
+#: ../libpurple/protocols/bonjour/bonjour.c:610
+#: ../libpurple/protocols/silc/silc.c:1007
+#: ../libpurple/protocols/silc10/silc.c:918
 msgid "Hostname"
 msgstr "Gasheernaam"
 
-#. Creating the options for the protocol
-#: ../libpurple/protocols/bonjour/bonjour.c:571
-#: ../libpurple/protocols/gg/gg.c:622
-#: ../libpurple/protocols/jabber/jabber.c:822
-msgid "First name"
-msgstr "Naam"
-
-#: ../libpurple/protocols/bonjour/bonjour.c:574
-#: ../libpurple/protocols/gg/gg.c:617
-#: ../libpurple/protocols/jabber/jabber.c:827
-msgid "Last name"
-msgstr "Van"
-
-#: ../libpurple/protocols/bonjour/bonjour.c:577
-#: ../libpurple/protocols/gg/gg.c:468
-#: ../libpurple/protocols/jabber/jabber.c:812
-#: ../libpurple/protocols/silc/silc.c:689
-#: ../libpurple/protocols/silc/silc.c:929
+#: ../libpurple/protocols/bonjour/bonjour.c:620
+#: ../libpurple/protocols/gg/gg.c:472
+#: ../libpurple/protocols/jabber/jabber.c:818
+#: ../libpurple/protocols/silc/silc.c:770
+#: ../libpurple/protocols/silc/silc.c:1011
+#: ../libpurple/protocols/silc10/silc.c:681
+#: ../libpurple/protocols/silc10/silc.c:922
 msgid "E-mail"
 msgstr "E-pos"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:580
-msgid "AIM Account"
-msgstr "AIM-rekening"
-
-#: ../libpurple/protocols/bonjour/bonjour.c:583
-msgid "Jabber Account"
-msgstr "Jabber-rekening"
-
-#: ../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:383
 #, c-format
 msgid "%s has closed the conversation."
 msgstr "%s het die gesprek afgesluit."
 
-#: ../libpurple/protocols/bonjour/jabber.c:461
+#: ../libpurple/protocols/bonjour/jabber.c:435
+#: ../libpurple/protocols/bonjour/jabber.c:658
+#: ../libpurple/protocols/bonjour/jabber.c:676
+msgid "Unable to send the message, the conversation couldn't be started."
+msgstr "Kon nie die boodskap stuur nie, die gesprek kon nie begin word nie."
+
+#: ../libpurple/protocols/bonjour/jabber.c:581
 msgid "Cannot open socket"
 msgstr "Kan nie sok open nie"
 
-#: ../libpurple/protocols/bonjour/jabber.c:469
+#: ../libpurple/protocols/bonjour/jabber.c:589
 msgid "Error setting socket options"
 msgstr "Fout met instel van sokkeuses"
 
-#: ../libpurple/protocols/bonjour/jabber.c:493
+#: ../libpurple/protocols/bonjour/jabber.c:613
 msgid "Could not bind socket to port"
 msgstr "Kon nie sok aan poort verbind nie"
 
-#: ../libpurple/protocols/bonjour/jabber.c:501
+#: ../libpurple/protocols/bonjour/jabber.c:621
 msgid "Could not listen on socket"
 msgstr "Kon nie op sok luister nie"
 
-#: ../libpurple/protocols/bonjour/jabber.c:599
-msgid "Unable to send the message, the conversation couldn't be started."
-msgstr "Kon nie die boodskap stuur nie, die gesprek kon nie begin word nie."
-
-#: ../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 "Ongeldige instaaninstellings"
 
-#: ../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."
 msgstr ""
+"Óf die gasheernaam óf die poortnommer wat vir u gegewe instaanbedienertipe "
+"gespesifiseer is, is ongeldig."
 
 #: ../libpurple/protocols/gg/gg.c:115 ../libpurple/protocols/gg/gg.c:137
 #: ../libpurple/protocols/gg/gg.c:180
 msgid "Token Error"
-msgstr ""
+msgstr "Tekenfout"
 
 #: ../libpurple/protocols/gg/gg.c:116 ../libpurple/protocols/gg/gg.c:138
 #: ../libpurple/protocols/gg/gg.c:181
 msgid "Unable to fetch the token.\n"
-msgstr ""
+msgstr "Kon nie die teken gaan haal nie.\n"
 
 #: ../libpurple/protocols/gg/gg.c:269 ../libpurple/protocols/gg/gg.c:288
 msgid "Save Buddylist..."
@@ -3057,7 +3306,7 @@
 
 #: ../libpurple/protocols/gg/gg.c:270
 msgid "Your buddylist is empty, nothing was written to the file."
-msgstr ""
+msgstr "U vriendelys is leeg, en niks is na die lêer geskryf nie."
 
 #: ../libpurple/protocols/gg/gg.c:276 ../libpurple/protocols/gg/gg.c:278
 msgid "Couldn't open file"
@@ -3083,287 +3332,310 @@
 msgid "Save buddylist..."
 msgstr "Stoor vriendelys..."
 
-#: ../libpurple/protocols/gg/gg.c:380
+#: ../libpurple/protocols/gg/gg.c:384
 msgid "Fill in the registration fields."
 msgstr "Vul die registrasievelde in."
 
-#: ../libpurple/protocols/gg/gg.c:385
+#: ../libpurple/protocols/gg/gg.c:389
 msgid "Passwords do not match."
 msgstr "Wagwoorde stem nie ooreen nie."
 
-#: ../libpurple/protocols/gg/gg.c:394
+#: ../libpurple/protocols/gg/gg.c:398
 msgid "Unable to register new account. Error occurred.\n"
 msgstr "Kan nie nuwe rekening registreer nie. 'n Fout het voorgekom.\n"
 
-#: ../libpurple/protocols/gg/gg.c:407
+#: ../libpurple/protocols/gg/gg.c:411
 msgid "New Gadu-Gadu Account Registered"
-msgstr ""
-
-#: ../libpurple/protocols/gg/gg.c:408
+msgstr "Nuwe Gadu-Gadu-rekening geregistreer"
+
+#: ../libpurple/protocols/gg/gg.c:412
 msgid "Registration completed successfully!"
 msgstr "Registrasie suksesvol voltooi!"
 
-#: ../libpurple/protocols/gg/gg.c:473 ../libpurple/protocols/gg/gg.c:764
-#: ../libpurple/protocols/jabber/jabber.c:801
-#: ../libpurple/protocols/jabber/jabber.c:1358
+#: ../libpurple/protocols/gg/gg.c:477 ../libpurple/protocols/gg/gg.c:770
+#: ../libpurple/protocols/jabber/jabber.c:807
+#: ../libpurple/protocols/jabber/jabber.c:1369
 msgid "Password"
 msgstr "Wagwoord"
 
-#: ../libpurple/protocols/gg/gg.c:478 ../libpurple/protocols/gg/gg.c:769
+#: ../libpurple/protocols/gg/gg.c:482 ../libpurple/protocols/gg/gg.c:775
 msgid "Password (retype)"
 msgstr "Wagwoord (weer)"
 
-#: ../libpurple/protocols/gg/gg.c:483 ../libpurple/protocols/gg/gg.c:774
+#: ../libpurple/protocols/gg/gg.c:487 ../libpurple/protocols/gg/gg.c:780
 msgid "Enter current token"
-msgstr ""
-
-#: ../libpurple/protocols/gg/gg.c:489 ../libpurple/protocols/gg/gg.c:780
+msgstr "Gee huidige teken"
+
+#: ../libpurple/protocols/gg/gg.c:493 ../libpurple/protocols/gg/gg.c:786
 msgid "Current token"
-msgstr ""
-
-#: ../libpurple/protocols/gg/gg.c:493 ../libpurple/protocols/gg/gg.c:494
+msgstr "Huidige teken"
+
+#: ../libpurple/protocols/gg/gg.c:497 ../libpurple/protocols/gg/gg.c:498
 msgid "Register New Gadu-Gadu Account"
-msgstr ""
-
-#: ../libpurple/protocols/gg/gg.c:495
+msgstr "Registreer nuwe Gadu-Gadu-rekening"
+
+#: ../libpurple/protocols/gg/gg.c:499
 msgid "Please, fill in the following fields"
-msgstr ""
-
-#: ../libpurple/protocols/gg/gg.c:632 ../libpurple/protocols/gg/gg.c:1039
-#: ../libpurple/protocols/gg/gg.c:1113
-#: ../libpurple/protocols/jabber/jabber.c:837
-#: ../libpurple/protocols/oscar/oscar.c:3791
-#: ../libpurple/protocols/oscar/oscar.c:3804
+msgstr "Vul asb. die volgende velde in"
+
+#: ../libpurple/protocols/gg/gg.c:637 ../libpurple/protocols/gg/gg.c:1049
+#: ../libpurple/protocols/gg/gg.c:1121
+#: ../libpurple/protocols/jabber/jabber.c:843
+#: ../libpurple/protocols/oscar/oscar.c:3757
+#: ../libpurple/protocols/oscar/oscar.c:3770
 #: ../libpurple/protocols/qq/buddy_info.c:49
 msgid "City"
 msgstr "Stad"
 
-#: ../libpurple/protocols/gg/gg.c:637
+#: ../libpurple/protocols/gg/gg.c:642
 msgid "Year of birth"
 msgstr "Jaar van geboorte"
 
-#: ../libpurple/protocols/gg/gg.c:640 ../libpurple/protocols/msn/msn.c:1518
-#: ../libpurple/protocols/oscar/oscar.c:3734
+#: ../libpurple/protocols/gg/gg.c:645 ../libpurple/protocols/msn/msn.c:1558
+#: ../libpurple/protocols/oscar/oscar.c:3700
 #: ../libpurple/protocols/qq/buddy_info.c:46
-#: ../libpurple/protocols/qq/qq.c:224 ../libpurple/protocols/qq/qq.c:227
-#: ../libpurple/protocols/qq/qq.c:230 ../libpurple/protocols/qq/qq.c:234
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1067
+#: ../libpurple/protocols/qq/qq.c:226 ../libpurple/protocols/qq/qq.c:229
+#: ../libpurple/protocols/qq/qq.c:232 ../libpurple/protocols/qq/qq.c:236
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1091
 msgid "Gender"
 msgstr "Geslag"
 
-#: ../libpurple/protocols/gg/gg.c:641
+#: ../libpurple/protocols/gg/gg.c:646
 msgid "Male or female"
 msgstr "Manlik of vroulik"
 
-#: ../libpurple/protocols/gg/gg.c:642
-#: ../libpurple/protocols/oscar/oscar.c:3734
+#: ../libpurple/protocols/gg/gg.c:647
+#: ../libpurple/protocols/oscar/oscar.c:3700
 #: ../libpurple/protocols/qq/buddy_info.c:83
-#: ../libpurple/protocols/qq/qq.c:224
+#: ../libpurple/protocols/qq/qq.c:226
 msgid "Male"
 msgstr "Manlik"
 
-#: ../libpurple/protocols/gg/gg.c:643
-#: ../libpurple/protocols/oscar/oscar.c:3734
+#: ../libpurple/protocols/gg/gg.c:648
+#: ../libpurple/protocols/oscar/oscar.c:3700
 #: ../libpurple/protocols/qq/buddy_info.c:84
-#: ../libpurple/protocols/qq/qq.c:227
+#: ../libpurple/protocols/qq/qq.c:229
 msgid "Female"
 msgstr "Vroulik"
 
-#: ../libpurple/protocols/gg/gg.c:647
+#: ../libpurple/protocols/gg/gg.c:652
 msgid "Only online"
-msgstr "Slegs aanlyn"
-
-#: ../libpurple/protocols/gg/gg.c:651 ../libpurple/protocols/gg/gg.c:652
+msgstr "Net aanlyn"
+
+#: ../libpurple/protocols/gg/gg.c:656 ../libpurple/protocols/gg/gg.c:657
 msgid "Find buddies"
 msgstr "Soek vriende"
 
-#: ../libpurple/protocols/gg/gg.c:653
+#: ../libpurple/protocols/gg/gg.c:658
 msgid "Please, enter your search criteria below"
-msgstr ""
-
-#: ../libpurple/protocols/gg/gg.c:690
+msgstr "Gee asb. u soekkriteria hier onder"
+
+#: ../libpurple/protocols/gg/gg.c:696
 msgid "Fill in the fields."
 msgstr "Vul die velde in."
 
-#: ../libpurple/protocols/gg/gg.c:702
+#: ../libpurple/protocols/gg/gg.c:708
 msgid "Your current password is different from the one that you specified."
 msgstr "U huidige wagwoord verskil van die gespesifiseerde een."
 
-#: ../libpurple/protocols/gg/gg.c:716
+#: ../libpurple/protocols/gg/gg.c:722
 msgid "Unable to change password. Error occurred.\n"
 msgstr "Kan nie wagwoord verander nie. 'n Fout het voorgekom.\n"
 
-#: ../libpurple/protocols/gg/gg.c:725
+#: ../libpurple/protocols/gg/gg.c:731
 msgid "Change password for the Gadu-Gadu account"
 msgstr "Verander wagwoord vir die Gadu-Gadu-rekening"
 
-#: ../libpurple/protocols/gg/gg.c:726
+#: ../libpurple/protocols/gg/gg.c:732
 msgid "Password was changed successfully!"
 msgstr "Wagwoord is suksesvol verander!"
 
-#: ../libpurple/protocols/gg/gg.c:759
+#: ../libpurple/protocols/gg/gg.c:765
 msgid "Current password"
 msgstr "Huidige wagwoord"
 
-#: ../libpurple/protocols/gg/gg.c:784
+#: ../libpurple/protocols/gg/gg.c:790
 msgid "Please, enter your current password and your new password for UIN: "
 msgstr "Gee asb. u huidige wagwoord en u nuwe wagwoord vir UIN: "
 
-#: ../libpurple/protocols/gg/gg.c:788 ../libpurple/protocols/gg/gg.c:789
+#: ../libpurple/protocols/gg/gg.c:794 ../libpurple/protocols/gg/gg.c:795
 msgid "Change Gadu-Gadu Password"
 msgstr "Verander Gadu-Gadu-wagwoord"
 
-#: ../libpurple/protocols/gg/gg.c:863
+#: ../libpurple/protocols/gg/gg.c:871
 #, c-format
 msgid "Select a chat for buddy: %s"
-msgstr ""
-
-#: ../libpurple/protocols/gg/gg.c:866 ../libpurple/protocols/gg/gg.c:867
+msgstr "Kies 'n geselsie vir vriend: %s"
+
+#: ../libpurple/protocols/gg/gg.c:874 ../libpurple/protocols/gg/gg.c:875
 msgid "Add to chat..."
-msgstr ""
-
-#: ../libpurple/protocols/gg/gg.c:993
-#: ../libpurple/protocols/jabber/buddy.c:1408
-#: ../libpurple/protocols/novell/novell.c:2829
-#: ../libpurple/protocols/oscar/oscar.c:809
-#: ../libpurple/protocols/oscar/oscar.c:5542
+msgstr "Voeg by geselsie..."
+
+#: ../libpurple/protocols/gg/gg.c:1003
+#: ../libpurple/protocols/jabber/buddy.c:1466
+#: ../libpurple/protocols/novell/novell.c:2828
+#: ../libpurple/protocols/oscar/oscar.c:827
+#: ../libpurple/protocols/oscar/oscar.c:5552
 #: ../libpurple/protocols/qq/qq.c:170 ../libpurple/protocols/qq/qq.c:177
-#: ../libpurple/protocols/yahoo/yahoo.c:2898 ../libpurple/status.c:154
-#: ../pidgin/gtkblist.c:2978 ../pidgin/gtkblist.c:3302
-#: ../pidgin/gtkdocklet.c:458 ../pidgin/gtkstatusbox.c:1092
+#: ../libpurple/protocols/qq/qq.c:292
+#: ../libpurple/protocols/yahoo/yahoo.c:2938 ../libpurple/status.c:153
+#: ../pidgin/gtkblist.c:3082 ../pidgin/gtkblist.c:3419
+#: ../pidgin/gtkdocklet.c:450 ../pidgin/gtkstatusbox.c:1059
 msgid "Offline"
 msgstr "Aflyn"
 
-#: ../libpurple/protocols/gg/gg.c:996
-#: ../libpurple/protocols/jabber/buddy.c:1410
+#: ../libpurple/protocols/gg/gg.c:1006
+#: ../libpurple/protocols/jabber/buddy.c:1468
 #: ../libpurple/protocols/msn/state.c:29 ../libpurple/protocols/msn/state.c:30
 #: ../libpurple/protocols/msn/state.c:37 ../libpurple/protocols/msn/state.c:38
-#: ../libpurple/protocols/novell/novell.c:2817
-#: ../libpurple/protocols/yahoo/yahoo.c:2900 ../libpurple/status.c:155
-#: ../pidgin/gtkdocklet.c:446 ../pidgin/gtkstatusbox.c:1089
+#: ../libpurple/protocols/novell/novell.c:2816
+#: ../libpurple/protocols/qq/qq.c:280
+#: ../libpurple/protocols/yahoo/yahoo.c:2940 ../libpurple/status.c:154
+#: ../pidgin/gtkdocklet.c:438 ../pidgin/gtkstatusbox.c:1055
 msgid "Available"
 msgstr "Beskikbaar"
 
-#: ../libpurple/protocols/gg/gg.c:1028 ../libpurple/protocols/gg/gg.c:1104
-#: ../libpurple/protocols/oscar/oscar.c:2663
-#: ../libpurple/protocols/oscar/oscar.c:3701
+#. get_yahoo_status_from_purple_status() returns YAHOO_STATUS_CUSTOM for
+#. * the generic away state (YAHOO_STATUS_TYPE_AWAY) with no message
+#. Away stuff
+#: ../libpurple/protocols/gg/gg.c:1009 ../libpurple/protocols/irc/irc.c:530
+#: ../libpurple/protocols/irc/msgs.c:310
+#: ../libpurple/protocols/jabber/buddy.c:1472
+#: ../libpurple/protocols/novell/novell.c:2819
+#: ../libpurple/protocols/oscar/oscar.c:732
+#: ../libpurple/protocols/oscar/oscar.c:4504
+#: ../libpurple/protocols/oscar/oscar.c:5580
+#: ../libpurple/protocols/qq/qq.c:180 ../libpurple/protocols/qq/qq.c:284
+#: ../libpurple/protocols/silc/buddy.c:1476
+#: ../libpurple/protocols/silc10/buddy.c:1476
+#: ../libpurple/protocols/yahoo/yahoo.c:3492
+#: ../libpurple/protocols/yahoo/yahoo.c:3566 ../libpurple/status.c:157
+#: ../pidgin/gtkdocklet.c:442 ../pidgin/gtkprefs.c:1934
+#: ../pidgin/gtkstatusbox.c:1056
+msgid "Away"
+msgstr "Weg"
+
+#: ../libpurple/protocols/gg/gg.c:1038 ../libpurple/protocols/gg/gg.c:1112
+#: ../libpurple/protocols/oscar/oscar.c:2669
+#: ../libpurple/protocols/oscar/oscar.c:3667
 msgid "UIN"
-msgstr ""
-
-#: ../libpurple/protocols/gg/gg.c:1031 ../libpurple/protocols/gg/gg.c:1107
-#: ../libpurple/protocols/jabber/buddy.c:1565
-#: ../libpurple/protocols/jabber/buddy.c:1741
-#: ../libpurple/protocols/oscar/oscar.c:3712
-#: ../libpurple/protocols/silc/ops.c:1024
+msgstr "UIN"
+
+#: ../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:3678
+#: ../libpurple/protocols/silc/ops.c:990
+#: ../libpurple/protocols/silc10/ops.c:1024
 msgid "First Name"
 msgstr "Naam"
 
-#: ../libpurple/protocols/gg/gg.c:1044 ../libpurple/protocols/gg/gg.c:1116
+#: ../libpurple/protocols/gg/gg.c:1054 ../libpurple/protocols/gg/gg.c:1124
 msgid "Birth Year"
 msgstr "Jaar van geboorte"
 
-#: ../libpurple/protocols/gg/gg.c:1098 ../libpurple/protocols/gg/gg.c:1167
-#: ../libpurple/protocols/oscar/oscar.c:3913
+#: ../libpurple/protocols/gg/gg.c:1106 ../libpurple/protocols/gg/gg.c:1175
+#: ../libpurple/protocols/oscar/oscar.c:3879
 msgid "Unable to display the search results."
-msgstr ""
-
-#: ../libpurple/protocols/gg/gg.c:1158
+msgstr "Kon nie die soekresultate wys nie."
+
+#: ../libpurple/protocols/gg/gg.c:1166
 msgid "Gadu-Gadu Public Directory"
-msgstr ""
-
-#: ../libpurple/protocols/gg/gg.c:1159
+msgstr "Gadu-Gadu- publieke gids"
+
+#: ../libpurple/protocols/gg/gg.c:1167
 msgid "Search results"
 msgstr "Soekresultate"
 
-#: ../libpurple/protocols/gg/gg.c:1202
+#: ../libpurple/protocols/gg/gg.c:1210
 msgid "No matching users found"
-msgstr ""
-
-#: ../libpurple/protocols/gg/gg.c:1203
+msgstr "Geen passende gebruikers gevind nie"
+
+#: ../libpurple/protocols/gg/gg.c:1211
 msgid "There are no users matching your search criteria."
-msgstr ""
-
-#: ../libpurple/protocols/gg/gg.c:1297 ../libpurple/protocols/gg/gg.c:1450
+msgstr "Daar is geen gebruikers wat by u soekkriteria pas nie."
+
+#: ../libpurple/protocols/gg/gg.c:1305 ../libpurple/protocols/gg/gg.c:1458
 msgid "Unable to read socket"
 msgstr "Kan nie sok lees nie"
 
-#: ../libpurple/protocols/gg/gg.c:1382
+#: ../libpurple/protocols/gg/gg.c:1390
 msgid "Buddy list downloaded"
 msgstr "Vriendelys afgelaai"
 
-#: ../libpurple/protocols/gg/gg.c:1383
+#: ../libpurple/protocols/gg/gg.c:1391
 msgid "Your buddy list was downloaded from the server."
 msgstr "U vriendelys is van die bediener afgelaai."
 
-#: ../libpurple/protocols/gg/gg.c:1390
+#: ../libpurple/protocols/gg/gg.c:1398
 msgid "Buddy list uploaded"
 msgstr "Vriendelys opgelaai"
 
-#: ../libpurple/protocols/gg/gg.c:1391
+#: ../libpurple/protocols/gg/gg.c:1399
 msgid "Your buddy list was stored on the server."
 msgstr "U vriendelys is na die bediener opgelaai."
 
-#: ../libpurple/protocols/gg/gg.c:1496 ../libpurple/protocols/gg/gg.c:1702
+#: ../libpurple/protocols/gg/gg.c:1504 ../libpurple/protocols/gg/gg.c:1710
 msgid "Connection failed."
 msgstr "Verbinding misluk."
 
-#: ../libpurple/protocols/gg/gg.c:1608 ../libpurple/protocols/msn/msn.c:528
+#: ../libpurple/protocols/gg/gg.c:1616 ../libpurple/protocols/msn/msn.c:531
 msgid "Blocked"
 msgstr "Geblokkeer"
 
-#: ../libpurple/protocols/gg/gg.c:1631
+#: ../libpurple/protocols/gg/gg.c:1639
 msgid "Add to chat"
-msgstr ""
-
-#: ../libpurple/protocols/gg/gg.c:1640
+msgstr "Voeg by geselsie"
+
+#: ../libpurple/protocols/gg/gg.c:1648
 msgid "Unblock"
-msgstr ""
-
-#: ../libpurple/protocols/gg/gg.c:1644
+msgstr "Ontblokkeer"
+
+#: ../libpurple/protocols/gg/gg.c:1652
 msgid "Block"
 msgstr "Blokkeer"
 
-#: ../libpurple/protocols/gg/gg.c:1661
+#: ../libpurple/protocols/gg/gg.c:1669
 msgid "Chat _name:"
-msgstr ""
-
-#: ../libpurple/protocols/gg/gg.c:1901
+msgstr "Geselsie_naam:"
+
+#: ../libpurple/protocols/gg/gg.c:1909
 msgid "Chat error"
-msgstr ""
-
-#: ../libpurple/protocols/gg/gg.c:1902
+msgstr "Geselsiefout"
+
+#: ../libpurple/protocols/gg/gg.c:1910
 msgid "This chat name is already in use"
-msgstr ""
-
-#: ../libpurple/protocols/gg/gg.c:1985
+msgstr "Hierdie geselsienaam word reeds gebruik"
+
+#: ../libpurple/protocols/gg/gg.c:1993
 msgid "Not connected to the server."
-msgstr ""
-
-#: ../libpurple/protocols/gg/gg.c:2008
+msgstr "Nie aan die bediener verbind nie."
+
+#: ../libpurple/protocols/gg/gg.c:2016
 msgid "Find buddies..."
 msgstr "Soek vriende..."
 
-#: ../libpurple/protocols/gg/gg.c:2014
+#: ../libpurple/protocols/gg/gg.c:2022
 msgid "Change password..."
 msgstr "Verander wagwoord..."
 
-#: ../libpurple/protocols/gg/gg.c:2020
+#: ../libpurple/protocols/gg/gg.c:2028
 msgid "Upload buddylist to Server"
 msgstr "Laai vriendelys op na bediener"
 
-#: ../libpurple/protocols/gg/gg.c:2024
+#: ../libpurple/protocols/gg/gg.c:2032
 msgid "Download buddylist from Server"
 msgstr "Laai vriendelys af van bediener"
 
-#: ../libpurple/protocols/gg/gg.c:2028
+#: ../libpurple/protocols/gg/gg.c:2036
 msgid "Delete buddylist from Server"
 msgstr "Verwyder vriendelys van bediener"
 
-#: ../libpurple/protocols/gg/gg.c:2032
+#: ../libpurple/protocols/gg/gg.c:2040
 msgid "Save buddylist to file..."
 msgstr "Stoor vriendelys in lêer..."
 
-#: ../libpurple/protocols/gg/gg.c:2036
+#: ../libpurple/protocols/gg/gg.c:2044
 msgid "Load buddylist from file..."
 msgstr "Laai vriendelys van lêer..."
 
@@ -3378,147 +3650,153 @@
 #. id
 #. name
 #. version
-#: ../libpurple/protocols/gg/gg.c:2134
+#: ../libpurple/protocols/gg/gg.c:2148
 msgid "Gadu-Gadu Protocol Plugin"
 msgstr "Gadu-Gadu-protokolinprop"
 
 #. summary
-#: ../libpurple/protocols/gg/gg.c:2135
+#: ../libpurple/protocols/gg/gg.c:2149
 msgid "Polish popular IM"
 msgstr "Gewilde Poolse stelsel vir kitsboodskappe"
 
-#: ../libpurple/protocols/gg/gg.c:2183
+#: ../libpurple/protocols/gg/gg.c:2203
 msgid "Gadu-Gadu User"
 msgstr "Gadu-Gadu-gebruiker"
 
 #: ../libpurple/protocols/irc/cmds.c:43
-#: ../libpurple/protocols/silc/silc.c:1575
+#: ../libpurple/protocols/silc/silc.c:1637
+#: ../libpurple/protocols/silc10/silc.c:1566
 #, c-format
 msgid "Unknown command: %s"
 msgstr "Onbekende opdrag: %s"
 
 #: ../libpurple/protocols/irc/cmds.c:503
-#: ../libpurple/protocols/jabber/chat.c:593
-#: ../libpurple/protocols/silc/silc.c:1283
+#: ../libpurple/protocols/jabber/chat.c:591
+#: ../libpurple/protocols/silc/silc.c:1345
+#: ../libpurple/protocols/silc10/silc.c:1274
 #, c-format
 msgid "current topic is: %s"
 msgstr "onderwerp tans: %s"
 
 #: ../libpurple/protocols/irc/cmds.c:507
-#: ../libpurple/protocols/jabber/chat.c:597
-#: ../libpurple/protocols/silc/silc.c:1287
+#: ../libpurple/protocols/jabber/chat.c:595
+#: ../libpurple/protocols/silc/silc.c:1349
+#: ../libpurple/protocols/silc10/silc.c:1278
 msgid "No topic is set"
 msgstr "Geen onderwerp gestel nie"
 
 #: ../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 "Lêeroordrag het misluk"
 
 #: ../libpurple/protocols/irc/dcc_send.c:297
 #: ../libpurple/protocols/irc/dcc_send.c:338
 msgid "Could not open a listening port."
-msgstr "Kon nie op 'n poort luister nie."
+msgstr "Kon nie 'n luisterpoort open nie."
 
 #: ../libpurple/protocols/irc/irc.c:79
 msgid "Error displaying MOTD"
-msgstr ""
+msgstr "Fout met wys van dagboodskap"
 
 #: ../libpurple/protocols/irc/irc.c:79
 msgid "No MOTD available"
-msgstr ""
+msgstr "Geen dagboodskap beskikbaar nie"
 
 #: ../libpurple/protocols/irc/irc.c:80
 msgid "There is no MOTD associated with this connection."
-msgstr ""
+msgstr "Daar is geen dagboodskap met hierdie verbinding geassosieer nie."
 
 #: ../libpurple/protocols/irc/irc.c:83
 #, c-format
 msgid "MOTD for %s"
-msgstr ""
+msgstr "Dagboodskap vir %s"
 
 #: ../libpurple/protocols/irc/irc.c:127 ../libpurple/protocols/irc/irc.c:165
-#: ../libpurple/protocols/irc/irc.c:598 ../libpurple/protocols/irc/irc.c:623
+#: ../libpurple/protocols/irc/irc.c:614 ../libpurple/protocols/irc/irc.c:639
 msgid "Server has disconnected"
-msgstr ""
+msgstr "Bediener is afgesny"
 
 #: ../libpurple/protocols/irc/irc.c:249
 msgid "View MOTD"
-msgstr ""
+msgstr "Bekyk dagboodskap"
 
 #: ../libpurple/protocols/irc/irc.c:261 ../libpurple/protocols/silc/chat.c:33
+#: ../libpurple/protocols/silc10/chat.c:33
 msgid "_Channel:"
 msgstr "_Kanaal:"
 
 #: ../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 "_Wagwoord:"
 
 #: ../libpurple/protocols/irc/irc.c:298
 msgid "IRC nicks may not contain whitespace"
-msgstr ""
+msgstr "IRC-bynaam kan nie spasies bevat nie"
 
 #. connect to the server
 #: ../libpurple/protocols/irc/irc.c:319
-#: ../libpurple/protocols/jabber/jabber.c:1038
-#: ../libpurple/protocols/msn/session.c:344
-#: ../libpurple/protocols/novell/novell.c:2183
-#: ../libpurple/protocols/oscar/oscar.c:1269
+#: ../libpurple/protocols/jabber/jabber.c:1046
+#: ../libpurple/protocols/msn/session.c:345
+#: ../libpurple/protocols/novell/novell.c:2182
+#: ../libpurple/protocols/oscar/oscar.c:1285
 #: ../libpurple/protocols/qq/qq.c:136
-#: ../libpurple/protocols/sametime/sametime.c:3721
-#: ../libpurple/protocols/simple/simple.c:1669
-#: ../libpurple/protocols/yahoo/yahoo.c:2743
-#: ../libpurple/protocols/zephyr/zephyr.c:1620 ../pidgin/gtkstatusbox.c:609
+#: ../libpurple/protocols/sametime/sametime.c:3724
+#: ../libpurple/protocols/simple/simple.c:1676
+#: ../libpurple/protocols/yahoo/yahoo.c:2783
+#: ../libpurple/protocols/zephyr/zephyr.c:1621 ../pidgin/gtkstatusbox.c:661
 msgid "Connecting"
 msgstr "Verbind tans"
 
 #: ../libpurple/protocols/irc/irc.c:327
-#: ../libpurple/protocols/jabber/jabber.c:597
-#: ../libpurple/protocols/jabber/jabber.c:942
+#: ../libpurple/protocols/jabber/jabber.c:603
+#: ../libpurple/protocols/jabber/jabber.c:950
 msgid "SSL support unavailable"
 msgstr "SSL-steun nie beskikbaar nie"
 
 #: ../libpurple/protocols/irc/irc.c:338
 #: ../libpurple/protocols/simple/simple.c:464
-#: ../libpurple/protocols/simple/simple.c:1584
+#: ../libpurple/protocols/simple/simple.c:1591
 msgid "Couldn't create socket"
 msgstr "Kon nie netwerksok skep nie"
 
-#: ../libpurple/protocols/irc/irc.c:402
-#: ../libpurple/protocols/jabber/jabber.c:466
-#: ../libpurple/protocols/oscar/oscar.c:1265
+#: ../libpurple/protocols/irc/irc.c:416
+#: ../libpurple/protocols/oscar/oscar.c:1281
 msgid "Couldn't connect to host"
 msgstr "Kon nie aan gasheer verbind nie"
 
-#: ../libpurple/protocols/irc/irc.c:424
-#: ../libpurple/protocols/jabber/jabber.c:495
+#: ../libpurple/protocols/irc/irc.c:438
+#: ../libpurple/protocols/jabber/jabber.c:499
 msgid "Connection Failed"
 msgstr "Verbinding misluk"
 
-#: ../libpurple/protocols/irc/irc.c:427
-#: ../libpurple/protocols/jabber/jabber.c:498
+#: ../libpurple/protocols/irc/irc.c:441
+#: ../libpurple/protocols/jabber/jabber.c:502
 msgid "SSL Handshake Failed"
-msgstr ""
-
-#: ../libpurple/protocols/irc/irc.c:595 ../libpurple/protocols/irc/irc.c:620
+msgstr "SSL-bladskud het misluk"
+
+#: ../libpurple/protocols/irc/irc.c:611 ../libpurple/protocols/irc/irc.c:636
 msgid "Read error"
 msgstr "Leesfout"
 
-#: ../libpurple/protocols/irc/irc.c:759
-#: ../libpurple/protocols/silc/chat.c:1421
-#: ../libpurple/protocols/yahoo/yahoochat.c:1438
+#: ../libpurple/protocols/irc/irc.c:775
+#: ../libpurple/protocols/silc/chat.c:1412
+#: ../libpurple/protocols/silc10/chat.c:1426
+#: ../libpurple/protocols/yahoo/yahoochat.c:1401
 msgid "Users"
 msgstr "Gebruikers"
 
-#: ../libpurple/protocols/irc/irc.c:762
+#: ../libpurple/protocols/irc/irc.c:778
 #: ../libpurple/protocols/sametime/sametime.c:3375
-#: ../libpurple/protocols/silc/chat.c:1424
-#: ../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 "Onderwerp"
 
@@ -3530,56 +3808,65 @@
 #. *< id
 #. *< name
 #. *< version
-#: ../libpurple/protocols/irc/irc.c:893
+#: ../libpurple/protocols/irc/irc.c:916
 msgid "IRC Protocol Plugin"
 msgstr "IRC-protokolinprop"
 
 #. *  summary
-#: ../libpurple/protocols/irc/irc.c:894
+#: ../libpurple/protocols/irc/irc.c:917
 msgid "The IRC Protocol Plugin that Sucks Less"
 msgstr "Die IRC-protokolinprop wat minder suig"
 
 #. host to connect to
-#: ../libpurple/protocols/irc/irc.c:913 ../libpurple/protocols/irc/msgs.c:312
-#: ../libpurple/protocols/jabber/jabber.c:1994
-#: ../libpurple/protocols/msn/msn.c:2099
-#: ../libpurple/protocols/oscar/oscar.c:6621
-#: ../libpurple/protocols/qq/qq.c:746
-#: ../libpurple/protocols/sametime/sametime.c:5706
-#: ../libpurple/protocols/silc/ops.c:1244
-#: ../libpurple/protocols/silc/ops.c:1347
-#: ../libpurple/protocols/simple/simple.c:1836
+#: ../libpurple/protocols/irc/irc.c:942 ../libpurple/protocols/irc/msgs.c:323
+#: ../libpurple/protocols/msn/msn.c:2154
+#: ../libpurple/protocols/oscar/oscar.c:6619
+#: ../libpurple/protocols/qq/qq.c:755
+#: ../libpurple/protocols/sametime/sametime.c:5728
+#: ../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:1855
 #: ../libpurple/protocols/toc/toc.c:2327
 msgid "Server"
 msgstr "Bediener"
 
 #. port to connect to
-#: ../libpurple/protocols/irc/irc.c:916 ../libpurple/protocols/msn/msn.c:2104
-#: ../libpurple/protocols/oscar/oscar.c:6624
-#: ../libpurple/protocols/qq/qq.c:749
-#: ../libpurple/protocols/sametime/sametime.c:5711
-#: ../libpurple/protocols/silc/silc.c:1850
+#: ../libpurple/protocols/irc/irc.c:945 ../libpurple/protocols/msn/msn.c:2159
+#: ../libpurple/protocols/oscar/oscar.c:6622
+#: ../libpurple/protocols/qq/qq.c:758
+#: ../libpurple/protocols/sametime/sametime.c:5733
+#: ../libpurple/protocols/silc/silc.c:1918
+#: ../libpurple/protocols/silc10/silc.c:1861
 #: ../libpurple/protocols/toc/toc.c:2331
 msgid "Port"
 msgstr "Poort"
 
-#: ../libpurple/protocols/irc/irc.c:919
+#: ../libpurple/protocols/irc/irc.c:948
 msgid "Encodings"
 msgstr "Enkoderings"
 
-#: ../libpurple/protocols/irc/irc.c:922 ../libpurple/protocols/irc/msgs.c:305
-#: ../libpurple/protocols/jabber/jabber.c:797
-#: ../libpurple/protocols/silc/buddy.c:1532
-#: ../libpurple/protocols/silc/ops.c:1191
-#: ../libpurple/protocols/silc/ops.c:1194
-#: ../libpurple/protocols/silc/ops.c:1340
-#: ../libpurple/protocols/silc/ops.c:1343
-#: ../libpurple/protocols/silc/silc.c:923
+#: ../libpurple/protocols/irc/irc.c:951 ../libpurple/protocols/irc/msgs.c:316
+#: ../libpurple/protocols/jabber/jabber.c:803
+#: ../libpurple/protocols/silc/buddy.c:1539
+#: ../libpurple/protocols/silc/ops.c:1197
+#: ../libpurple/protocols/silc/ops.c:1200
+#: ../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 "Gebruikernaam"
 
-#: ../libpurple/protocols/irc/irc.c:925 ../libpurple/protocols/irc/msgs.c:306
-#: ../libpurple/protocols/silc/silc.c:927
+#: ../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 "Regte naam"
 
@@ -3587,216 +3874,220 @@
 #. option = purple_account_option_string_new(_("Quit message"), "quitmsg", IRC_DEFAULT_QUIT);
 #. prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option);
 #.
-#: ../libpurple/protocols/irc/irc.c:933
+#: ../libpurple/protocols/irc/irc.c:962
 msgid "Use SSL"
 msgstr "Gebruik SSL"
 
-#: ../libpurple/protocols/irc/msgs.c:180
+#: ../libpurple/protocols/irc/msgs.c:187
 msgid "Bad mode"
-msgstr ""
-
-#: ../libpurple/protocols/irc/msgs.c:191
+msgstr "Slegte modus"
+
+#: ../libpurple/protocols/irc/msgs.c:198
 #, c-format
 msgid "You are banned from %s."
 msgstr "U is verban uit %s."
 
-#: ../libpurple/protocols/irc/msgs.c:192
+#: ../libpurple/protocols/irc/msgs.c:199
 msgid "Banned"
 msgstr "Verban"
 
-#: ../libpurple/protocols/irc/msgs.c:209
+#: ../libpurple/protocols/irc/msgs.c:216
 #, c-format
 msgid "Cannot ban %s: banlist is full"
-msgstr ""
-
-#: ../libpurple/protocols/irc/msgs.c:290
+msgstr "Kan nie %s verban nie: verbanlys is vol"
+
+#: ../libpurple/protocols/irc/msgs.c:301
 msgid " <i>(ircop)</i>"
-msgstr ""
-
-#: ../libpurple/protocols/irc/msgs.c:291
+msgstr " <i>(ircop)</i>"
+
+#: ../libpurple/protocols/irc/msgs.c:302
 msgid " <i>(identified)</i>"
 msgstr " <i>(geïdentifiseer)</i>"
 
-#: ../libpurple/protocols/irc/msgs.c:292
-#: ../libpurple/protocols/oscar/oscar.c:3702
-#: ../libpurple/protocols/silc/ops.c:1414
+#: ../libpurple/protocols/irc/msgs.c:303
+#: ../libpurple/protocols/oscar/oscar.c:3668
+#: ../libpurple/protocols/silc/ops.c:1418
+#: ../libpurple/protocols/silc10/ops.c:1414
 msgid "Nick"
 msgstr "Bynaam"
 
-#: ../libpurple/protocols/irc/msgs.c:318
-#: ../libpurple/protocols/silc/ops.c:1272
+#: ../libpurple/protocols/irc/msgs.c:329
+#: ../libpurple/protocols/silc/ops.c:1268
+#: ../libpurple/protocols/silc10/ops.c:1272
 msgid "Currently on"
 msgstr "Tans in"
 
-#: ../libpurple/protocols/irc/msgs.c:323
+#: ../libpurple/protocols/irc/msgs.c:334
 msgid "Idle for"
 msgstr "Ledig vir"
 
-#: ../libpurple/protocols/irc/msgs.c:326
+#: ../libpurple/protocols/irc/msgs.c:337
 msgid "Online since"
 msgstr "Aanlyn sedert"
 
-#: ../libpurple/protocols/irc/msgs.c:330
+#: ../libpurple/protocols/irc/msgs.c:341
 msgid "<b>Defining adjective:</b>"
 msgstr "<b>Dié beskrywing:</b>"
 
-#: ../libpurple/protocols/irc/msgs.c:330
+#: ../libpurple/protocols/irc/msgs.c:341
 msgid "Glorious"
 msgstr "Heerlik"
 
-#: ../libpurple/protocols/irc/msgs.c:406
+#: ../libpurple/protocols/irc/msgs.c:420
 #, c-format
 msgid "%s has changed the topic to: %s"
 msgstr "%s het die onderwerp verander na: %s"
 
-#: ../libpurple/protocols/irc/msgs.c:408
+#: ../libpurple/protocols/irc/msgs.c:422
 #, c-format
 msgid "%s has cleared the topic."
 msgstr "%s het die onderwerp geskrap."
 
-#: ../libpurple/protocols/irc/msgs.c:416
+#: ../libpurple/protocols/irc/msgs.c:430
 #, c-format
 msgid "The topic for %s is: %s"
 msgstr "Die onderwerp vir %s is: %s"
 
-#: ../libpurple/protocols/irc/msgs.c:434
+#: ../libpurple/protocols/irc/msgs.c:448
 #, c-format
 msgid "Unknown message '%s'"
 msgstr "Onbekende boodskap '%s'"
 
-#: ../libpurple/protocols/irc/msgs.c:435
+#: ../libpurple/protocols/irc/msgs.c:449
 msgid "Unknown message"
 msgstr "Onbekende boodskap"
 
-#: ../libpurple/protocols/irc/msgs.c:435
+#: ../libpurple/protocols/irc/msgs.c:449
 msgid "The IRC server received a message it did not understand."
 msgstr "Die IRC-bediener het 'n boodskap ontvang wat hy nie verstaan het nie."
 
-#: ../libpurple/protocols/irc/msgs.c:456
+#: ../libpurple/protocols/irc/msgs.c:470
 #, c-format
 msgid "Users on %s: %s"
 msgstr "Gebruikers op %s: %s"
 
-#: ../libpurple/protocols/irc/msgs.c:553
+#: ../libpurple/protocols/irc/msgs.c:575
 msgid "Time Response"
-msgstr ""
-
-#: ../libpurple/protocols/irc/msgs.c:554
+msgstr "Tydreaksie"
+
+#: ../libpurple/protocols/irc/msgs.c:576
 msgid "The IRC server's local time is:"
 msgstr "Die IRC-bediener se plaaslike tyd is:"
 
-#: ../libpurple/protocols/irc/msgs.c:565
+#: ../libpurple/protocols/irc/msgs.c:587
 msgid "No such channel"
-msgstr ""
+msgstr "Nie so 'n kanaal nie"
 
 #. does this happen?
-#: ../libpurple/protocols/irc/msgs.c:576
+#: ../libpurple/protocols/irc/msgs.c:598
 msgid "no such channel"
-msgstr ""
-
-#: ../libpurple/protocols/irc/msgs.c:579
+msgstr "nie so 'n kanaal nie"
+
+#: ../libpurple/protocols/irc/msgs.c:601
 msgid "User is not logged in"
 msgstr "Gebruiker is nie aangemeld nie"
 
-#: ../libpurple/protocols/irc/msgs.c:584
+#: ../libpurple/protocols/irc/msgs.c:606
 msgid "No such nick or channel"
-msgstr ""
-
-#: ../libpurple/protocols/irc/msgs.c:604
+msgstr "Nie so 'n bynaam of kanaal nie"
+
+#: ../libpurple/protocols/irc/msgs.c:626
 msgid "Could not send"
 msgstr "Kon nie stuur nie"
 
-#: ../libpurple/protocols/irc/msgs.c:660
+#: ../libpurple/protocols/irc/msgs.c:682
 #, c-format
 msgid "Joining %s requires an invitation."
-msgstr "Uitnodiging benodig om by %s aan te sluit."
-
-#: ../libpurple/protocols/irc/msgs.c:661
+msgstr "Uitnodiging vereis om by %s aan te sluit."
+
+#: ../libpurple/protocols/irc/msgs.c:683
 msgid "Invitation only"
-msgstr "Slegs op uitnodiging"
-
-#: ../libpurple/protocols/irc/msgs.c:773
+msgstr "Net op uitnodiging"
+
+#: ../libpurple/protocols/irc/msgs.c:795
 #, c-format
 msgid "You have been kicked by %s: (%s)"
-msgstr "U is uitgeskop deur %s: (%s)"
+msgstr "U is geskop deur %s: (%s)"
 
 #. Remove user from channel
-#: ../libpurple/protocols/irc/msgs.c:778 ../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 "Uitgeskop deur %s (%s)"
-
-#: ../libpurple/protocols/irc/msgs.c:801
+msgstr "Geskop deur %s (%s)"
+
+#: ../libpurple/protocols/irc/msgs.c:823
 #, c-format
 msgid "mode (%s %s) by %s"
 msgstr "modus (%s %s) deur %s"
 
-#: ../libpurple/protocols/irc/msgs.c:886 ../libpurple/protocols/irc/msgs.c:887
+#: ../libpurple/protocols/irc/msgs.c:908 ../libpurple/protocols/irc/msgs.c:909
 msgid "Invalid nickname"
 msgstr "Ongeldige bynaam"
 
-#: ../libpurple/protocols/irc/msgs.c:888
+#: ../libpurple/protocols/irc/msgs.c:910
 msgid ""
 "Your selected nickname was rejected by the server.  It probably contains "
 "invalid characters."
 msgstr ""
-"U gekose bynaam is gewyer deur die bediner.  Dit bevat waarskynlik ongeldige "
-"karakters."
-
-#: ../libpurple/protocols/irc/msgs.c:893
+"U gekose bynaam is geweier deur die bediner.  Dit bevat waarskynlik "
+"ongeldige karakters."
+
+#: ../libpurple/protocols/irc/msgs.c:915
 msgid ""
 "Your selected account name was rejected by the server.  It probably contains "
 "invalid characters."
 msgstr ""
-"U gekose rekeningnaam is gewyer deur die bediner.  Dit bevat waarskynlik "
+"U gekose rekeningnaam is geweier deur die bediner.  Dit bevat waarskynlik "
 "ongeldige karakters."
 
-#: ../libpurple/protocols/irc/msgs.c:932
+#: ../libpurple/protocols/irc/msgs.c:954
 msgid "Cannot change nick"
 msgstr "Kan nie bynaam verander nie"
 
-#: ../libpurple/protocols/irc/msgs.c:932
+#: ../libpurple/protocols/irc/msgs.c:954
 msgid "Could not change nick"
 msgstr "Kon nie bynaam verander nie"
 
-#: ../libpurple/protocols/irc/msgs.c:953
+#: ../libpurple/protocols/irc/msgs.c:975
 #, c-format
 msgid "You have parted the channel%s%s"
-msgstr ""
-
-#: ../libpurple/protocols/irc/msgs.c:995
+msgstr "U het die kanaal%s%s verlaat"
+
+#: ../libpurple/protocols/irc/msgs.c:1017
 msgid "Error: invalid PONG from server"
-msgstr ""
-
-#: ../libpurple/protocols/irc/msgs.c:997
+msgstr "Fout: ongeldige PONG vanaf bediener"
+
+#: ../libpurple/protocols/irc/msgs.c:1019
 #, c-format
 msgid "PING reply -- Lag: %lu seconds"
-msgstr ""
-
-#: ../libpurple/protocols/irc/msgs.c:1078
-#, c-format
-msgid "Cannot join %s:"
-msgstr "Kan nie by %s aansluit nie:"
-
-#: ../libpurple/protocols/irc/msgs.c:1079
-#: ../libpurple/protocols/silc/ops.c:1128
+msgstr "PIENG-antwoord -- vertraging: %lu sekondes"
+
+#: ../libpurple/protocols/irc/msgs.c:1110
+#, c-format
+msgid "Cannot join %s: Registration is required."
+msgstr "Kan nie by %s aansluit nie: Registrasie word vereis."
+
+#: ../libpurple/protocols/irc/msgs.c:1111
+#: ../libpurple/protocols/silc/ops.c:1093
+#: ../libpurple/protocols/silc10/ops.c:1128
 msgid "Cannot join channel"
 msgstr "Kan nie by kanaal aansluit nie"
 
-#: ../libpurple/protocols/irc/msgs.c:1113
+#: ../libpurple/protocols/irc/msgs.c:1145
 msgid "Nick or channel is temporarily unavailable."
 msgstr "Bynaam of kanaal is tydelik nie beskikbaar nie."
 
-#: ../libpurple/protocols/irc/msgs.c:1125
+#: ../libpurple/protocols/irc/msgs.c:1157
 #, c-format
 msgid "Wallops from %s"
 msgstr "Loesing van %s"
 
-#: ../libpurple/protocols/irc/parse.c:118
+#: ../libpurple/protocols/irc/parse.c:122
 msgid "action &lt;action to perform&gt;:  Perform an action."
 msgstr "action &lt;aksie om uit te voer&gt;:  Voer 'n aksie uit."
 
-#: ../libpurple/protocols/irc/parse.c:119
+#: ../libpurple/protocols/irc/parse.c:123
 msgid ""
 "away [message]:  Set an away message, or use no message to return from being "
 "away."
@@ -3804,529 +4095,576 @@
 "away [boodskap]:  Stel die wegboodskap, of geen boodskap om terug te keer "
 "vanaf wegstatus."
 
-#: ../libpurple/protocols/irc/parse.c:120
+#: ../libpurple/protocols/irc/parse.c:124
 msgid "chanserv: Send a command to chanserv"
 msgstr "chanserv: Stuur 'n opdrag aan chanserv"
 
-#: ../libpurple/protocols/irc/parse.c:121
+#: ../libpurple/protocols/irc/parse.c:125
 msgid ""
 "deop &lt;nick1&gt; [nick2] ...:  Remove channel operator status from "
 "someone. You must be a channel operator to do this."
 msgstr ""
-
-#: ../libpurple/protocols/irc/parse.c:122
+"deop &lt;bynaam1&gt; [bynaam2] ...:  Verwyder iemand se kanaaloperateur-"
+"status. U moet 'n kanaaloperateur wees om dit te kan doen."
+
+#: ../libpurple/protocols/irc/parse.c:126
 msgid ""
 "devoice &lt;nick1&gt; [nick2] ...:  Remove channel voice status from "
 "someone, preventing them from speaking if the channel is moderated (+m). You "
 "must be a channel operator to do this."
 msgstr ""
-
-#: ../libpurple/protocols/irc/parse.c:123
+"devoice &lt;bynaam1&gt; [bynaam2] ...:  Verwyder iemand se kanaalstemstatus, "
+"wat voorkom dat hulle kan praat as die kanaal gemodereer is (+m). U moet 'n "
+"kanaaloperateur wees om dit te kan doen."
+
+#: ../libpurple/protocols/irc/parse.c:127
 msgid ""
 "invite &lt;nick&gt; [room]:  Invite someone to join you in the specified "
 "channel, or the current channel."
 msgstr ""
-
-#: ../libpurple/protocols/irc/parse.c:124
+"invite &lt;bynaam&gt; [kamer]:  Nooi iemand uit om by u in die "
+"gespesifiseerde kanaal of die huidige kanaal aan te sluit."
+
+#: ../libpurple/protocols/irc/parse.c:128
 msgid ""
 "j &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  Enter one or more "
 "channels, optionally providing a channel key for each if needed."
 msgstr ""
-
-#: ../libpurple/protocols/irc/parse.c:125
+"j &lt;kamer1&gt;[,kamer2][,...] [sleutel1[,sleutel2][,...]]:  Sluit aan by "
+"een of meer kanale, en gee opsioneel 'n kanaalsleutel vir elk indien nodig."
+
+#: ../libpurple/protocols/irc/parse.c:129
 msgid ""
 "join &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  Enter one or more "
 "channels, optionally providing a channel key for each if needed."
 msgstr ""
-
-#: ../libpurple/protocols/irc/parse.c:126
+"join &lt;kamer1&gt;[,kamer2][,...] [sleutel1[,sleutel2][,...]]:  Sluit aan "
+"by een of meer kanale, en gee opsioneel 'n kanaalsleutel vir elk indien "
+"nodig."
+
+#: ../libpurple/protocols/irc/parse.c:130
 msgid ""
 "kick &lt;nick&gt; [message]:  Remove someone from a channel. You must be a "
 "channel operator to do this."
 msgstr ""
-
-#: ../libpurple/protocols/irc/parse.c:127
+"kick &lt;bynaam&gt; [boodskap]:  Verwyder iemand uit 'n kanaal. U moet 'n "
+"kanaaloperateur wees om dit te kan doen."
+
+#: ../libpurple/protocols/irc/parse.c:131
 msgid ""
 "list:  Display a list of chat rooms on the network. <i>Warning, some servers "
 "may disconnect you upon doing this.</i>"
 msgstr ""
-
-#: ../libpurple/protocols/irc/parse.c:128
+"list:  Wys 'n lys geselsiekamers op die netwerk. <i>Let wel: sekere "
+"bedieners kan u afsny as u dit doen.</i>"
+
+#: ../libpurple/protocols/irc/parse.c:132
 msgid "me &lt;action to perform&gt;:  Perform an action."
 msgstr "me &lt;aksie om uit te voer&gt;:  Voer 'n aksie uit."
 
-#: ../libpurple/protocols/irc/parse.c:129
+#: ../libpurple/protocols/irc/parse.c:133
 msgid "memoserv: Send a command to memoserv"
 msgstr "memoserv: Stuur 'n opdrag aan memoserv"
 
-#: ../libpurple/protocols/irc/parse.c:130
+#: ../libpurple/protocols/irc/parse.c:134
 msgid ""
 "mode &lt;+|-&gt;&lt;A-Za-z&gt; &lt;nick|channel&gt;:  Set or unset a channel "
 "or user mode."
 msgstr ""
-
-#: ../libpurple/protocols/irc/parse.c:131
+"mode &lt;+|-&gt;&lt;A-Za-z&gt; &lt;bynaam|kanaal&gt;:  Aktiveer of "
+"deaktiveer 'n kanaal- of gebruikermodus."
+
+#: ../libpurple/protocols/irc/parse.c:135
 msgid ""
 "msg &lt;nick&gt; &lt;message&gt;:  Send a private message to a user (as "
 "opposed to a channel)."
 msgstr ""
-
-#: ../libpurple/protocols/irc/parse.c:132
+"msg &lt;bynaam&gt; &lt;boodskap&gt;:  Stuur 'n private boodskap aan 'n "
+"gebruiker (in plaas van 'n kanaal)."
+
+#: ../libpurple/protocols/irc/parse.c:136
 msgid "names [channel]:  List the users currently in a channel."
-msgstr ""
-
-#: ../libpurple/protocols/irc/parse.c:133
-#: ../libpurple/protocols/jabber/jabber.c:1798
+msgstr "names [kanaal]:  Lys die gebruikers tans in 'n kanaal."
+
+#: ../libpurple/protocols/irc/parse.c:137
+#: ../libpurple/protocols/jabber/jabber.c:1830
 msgid "nick &lt;new nickname&gt;:  Change your nickname."
-msgstr ""
-
-#: ../libpurple/protocols/irc/parse.c:134
+msgstr "nick &lt;nuwe bynaam&gt;:  Verander u bynaam."
+
+#: ../libpurple/protocols/irc/parse.c:138
 msgid "nickserv: Send a command to nickserv"
 msgstr "nickserv: Stuur 'n opdrag aan nickserv"
 
-#: ../libpurple/protocols/irc/parse.c:135
+#: ../libpurple/protocols/irc/parse.c:139
 msgid ""
 "op &lt;nick1&gt; [nick2] ...:  Grant channel operator status to someone. You "
 "must be a channel operator to do this."
 msgstr ""
-
-#: ../libpurple/protocols/irc/parse.c:136
+"op &lt;bynaam1&gt; [bynaam2] ...:  Ken iemand kanaaloperateur-status toe. U "
+"moet 'n kanaaloperateur wees om dit te kan doen."
+
+#: ../libpurple/protocols/irc/parse.c:140
 msgid ""
 "operwall &lt;message&gt;:  If you don't know what this is, you probably "
 "can't use it."
 msgstr ""
-
-#: ../libpurple/protocols/irc/parse.c:137
+"operwall &lt;boodskap&gt;:  Indien u nie weet wat dit is nie, kan u dit "
+"waarskynlik ook nie gebruik nie."
+
+#: ../libpurple/protocols/irc/parse.c:141
 msgid "operserv: Send a command to operserv"
 msgstr "operserv: Stuur 'n opdrag aan operserv"
 
-#: ../libpurple/protocols/irc/parse.c:138
+#: ../libpurple/protocols/irc/parse.c:142
 msgid ""
 "part [room] [message]:  Leave the current channel, or a specified channel, "
 "with an optional message."
 msgstr ""
-
-#: ../libpurple/protocols/irc/parse.c:139
+"part [kamer] [boodskap]:  Verlaat die huidige kanaal, of 'n gespesifiseerde "
+"kanaal, met 'n opsionele boodskap."
+
+#: ../libpurple/protocols/irc/parse.c:143
 msgid ""
 "ping [nick]:  Asks how much lag a user (or the server if no user specified) "
 "has."
 msgstr ""
-
-#: ../libpurple/protocols/irc/parse.c:140
+"ping [bynaam]:  Vra aan hoeveel vertraging 'n gebruiker ly (of die bediener, "
+"as geen gebruiker gespesifiseer is nie)."
+
+#: ../libpurple/protocols/irc/parse.c:144
 msgid ""
 "query &lt;nick&gt; &lt;message&gt;:  Send a private message to a user (as "
 "opposed to a channel)."
 msgstr ""
-
-#: ../libpurple/protocols/irc/parse.c:141
+"query &lt;bynaam&gt; &lt;boodskap&gt;:  Stuur 'n private boodskap aan 'n "
+"gebruiker (in plaas van 'n kanaal)."
+
+#: ../libpurple/protocols/irc/parse.c:145
 msgid "quit [message]:  Disconnect from the server, with an optional message."
 msgstr ""
 "quit [boodskap]:  Sluit verbinding met bediener, met 'n opsionele boodskap."
 
-#: ../libpurple/protocols/irc/parse.c:142
+#: ../libpurple/protocols/irc/parse.c:146
 msgid "quote [...]:  Send a raw command to the server."
-msgstr ""
-
-#: ../libpurple/protocols/irc/parse.c:143
+msgstr "quote [...]:  Stuur 'n rou bevel aan die bediener."
+
+#: ../libpurple/protocols/irc/parse.c:147
 msgid ""
 "remove &lt;nick&gt; [message]:  Remove someone from a room. You must be a "
 "channel operator to do this."
 msgstr ""
-
-#: ../libpurple/protocols/irc/parse.c:144
+"remove &lt;bynaam&gt; [boodskap]:  Verwyder iemand uit 'n kamer. U moet 'n "
+"kanaaloperateur wees om dit te kan doen."
+
+#: ../libpurple/protocols/irc/parse.c:148
 msgid "time: Displays the current local time at the IRC server."
-msgstr "time: Vertoon die plaaslike tyd van die IRC-bediener."
-
-#: ../libpurple/protocols/irc/parse.c:145
+msgstr "time: Wys die plaaslike tyd van die IRC-bediener."
+
+#: ../libpurple/protocols/irc/parse.c:149
 msgid "topic [new topic]:  View or change the channel topic."
 msgstr "topic [nuwe onderwerp]:  Bekyk of verander die kanaalonderwerp."
 
-#: ../libpurple/protocols/irc/parse.c:146
+#: ../libpurple/protocols/irc/parse.c:150
 msgid "umode &lt;+|-&gt;&lt;A-Za-z&gt;:  Set or unset a user mode."
 msgstr ""
-
-#: ../libpurple/protocols/irc/parse.c:147
+"umode &lt;+|-&gt;&lt;A-Za-z&gt;:  Aktiveer of deaktiveer 'n gebruikermodus."
+
+#: ../libpurple/protocols/irc/parse.c:151
 msgid "version [nick]: send CTCP VERSION request to a user"
-msgstr ""
-
-#: ../libpurple/protocols/irc/parse.c:148
+msgstr "version [bynaam]: stuur CTCP VERSION-versoek aan 'n gebruiker"
+
+#: ../libpurple/protocols/irc/parse.c:152
 msgid ""
 "voice &lt;nick1&gt; [nick2] ...:  Grant channel voice status to someone. You "
 "must be a channel operator to do this."
 msgstr ""
-
-#: ../libpurple/protocols/irc/parse.c:149
+"voice &lt;bynaam1&gt; [bynaam2] ...:  Ken iemand kanaalstem-status toe. U "
+"moet 'n kanaaloperateur wees om dit te kan doen."
+
+#: ../libpurple/protocols/irc/parse.c:153
 msgid ""
 "wallops &lt;message&gt;:  If you don't know what this is, you probably can't "
 "use it."
 msgstr ""
-
-#: ../libpurple/protocols/irc/parse.c:150
+"wallops &lt;boodskap&gt;:  Indien u nie weet wat dit is nie, kan u dit "
+"waarskynlik ook nie gebruik nie."
+
+#: ../libpurple/protocols/irc/parse.c:154
 msgid "whois [server] &lt;nick&gt;:  Get information on a user."
-msgstr ""
-
-#: ../libpurple/protocols/irc/parse.c:444
+msgstr "whois [bediener] &lt;bynaam&gt;:  Kry inligting oor 'n gebruiker."
+
+#: ../libpurple/protocols/irc/parse.c:155
+msgid "whowas &lt;nick&gt;: Get information on a user that has logged off."
+msgstr ""
+"whowas &lt;bynaam&gt;: Kry inligting oor 'n gebruiker wat afgemeld het."
+
+#: ../libpurple/protocols/irc/parse.c:465
 #, c-format
 msgid "Reply time from %s: %lu seconds"
 msgstr "Antwoordtyd van %s: %lu sekondes"
 
-#: ../libpurple/protocols/irc/parse.c:445
+#: ../libpurple/protocols/irc/parse.c:466
 msgid "PONG"
-msgstr ""
-
-#: ../libpurple/protocols/irc/parse.c:445
+msgstr "PONG"
+
+#: ../libpurple/protocols/irc/parse.c:466
 msgid "CTCP PING reply"
-msgstr ""
-
-#: ../libpurple/protocols/irc/parse.c:556
-#: ../libpurple/protocols/irc/parse.c:560 ../libpurple/protocols/toc/toc.c:191
+msgstr "CTCP PING-antwoord"
+
+#: ../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."
 msgstr "Afgesny."
 
-#: ../libpurple/protocols/jabber/auth.c:51
+#: ../libpurple/protocols/jabber/auth.c:52
 msgid "Server requires TLS/SSL for login.  No TLS/SSL support found."
 msgstr ""
-"Bediener benodig TLS/SSL vir aanmelding.  Geen TLS/SSL-steun gevind nie."
-
-#: ../libpurple/protocols/jabber/auth.c:114
+"Bediener vereis TLS/SSL vir aanmelding.  Geen TLS/SSL-steun gevind nie."
+
+#: ../libpurple/protocols/jabber/auth.c:115
 msgid "Server requires plaintext authentication over an unencrypted stream"
-msgstr ""
-
-#: ../libpurple/protocols/jabber/auth.c:229
-msgid "Server couldn't authenticate you without a password"
-msgstr ""
-
-#: ../libpurple/protocols/jabber/auth.c:232
-#: ../libpurple/protocols/jabber/auth.c:233
-#: ../libpurple/protocols/jabber/auth.c:407
-#: ../libpurple/protocols/jabber/auth.c:408
-#: ../libpurple/protocols/jabber/auth.c:489
-#: ../libpurple/protocols/jabber/auth.c:490
+msgstr "Bediener vereis skoonteksstawing oor 'n ongeënkripteerde stroom"
+
+#: ../libpurple/protocols/jabber/auth.c:294
+#: ../libpurple/protocols/jabber/auth.c:483
+#, c-format
+msgid ""
+"%s requires plaintext authentication over an unencrypted connection.  Allow "
+"this and continue authentication?"
+msgstr ""
+"%s vereis skoonteksstawing oor 'n ongeënkripteerde verbinding.  Laat dit toe "
+"en gaan voort met stawing?"
+
+#: ../libpurple/protocols/jabber/auth.c:296
+#: ../libpurple/protocols/jabber/auth.c:297
+#: ../libpurple/protocols/jabber/auth.c:485
+#: ../libpurple/protocols/jabber/auth.c:486
+#: ../libpurple/protocols/jabber/auth.c:570
+#: ../libpurple/protocols/jabber/auth.c:571
 msgid "Plaintext Authentication"
-msgstr ""
-
-#: ../libpurple/protocols/jabber/auth.c:234
-#: ../libpurple/protocols/jabber/auth.c:409
-#: ../libpurple/protocols/jabber/auth.c:491
+msgstr "Skoonteksstawing"
+
+#: ../libpurple/protocols/jabber/auth.c:309
+#: ../libpurple/protocols/jabber/auth.c:498
+#: ../libpurple/protocols/jabber/auth.c:582
+msgid "Server does not use any supported authentication method"
+msgstr "Bediener gebruik nie enige ondersteunde stawingmetode nie"
+
+#. This should never happen!
+#: ../libpurple/protocols/jabber/auth.c:437
+#: ../libpurple/protocols/jabber/auth.c:533
+#: ../libpurple/protocols/jabber/auth.c:748
+#: ../libpurple/protocols/jabber/auth.c:889
+#: ../libpurple/protocols/jabber/auth.c:914
+#: ../libpurple/protocols/jabber/auth.c:933
+#: ../libpurple/protocols/jabber/jabber.c:115
+msgid "Invalid response from server."
+msgstr "Ongeldige antwoord van die bediener."
+
+#: ../libpurple/protocols/jabber/auth.c:572
 msgid ""
 "This server requires plaintext authentication over an unencrypted "
 "connection.  Allow this and continue authentication?"
 msgstr ""
-
-#: ../libpurple/protocols/jabber/auth.c:240
-#: ../libpurple/protocols/jabber/auth.c:417
-#: ../libpurple/protocols/jabber/auth.c:499
-msgid "Server does not use any supported authentication method"
-msgstr ""
-
-#. This should never happen!
-#: ../libpurple/protocols/jabber/auth.c:330
-#: ../libpurple/protocols/jabber/auth.c:452
-#: ../libpurple/protocols/jabber/auth.c:620
-#: ../libpurple/protocols/jabber/auth.c:754
-#: ../libpurple/protocols/jabber/auth.c:779
-#: ../libpurple/protocols/jabber/auth.c:798
-#: ../libpurple/protocols/jabber/jabber.c:115
-msgid "Invalid response from server."
-msgstr "Ongeldige antwoord van die bediener."
-
-#: ../libpurple/protocols/jabber/auth.c:641
+"Hierdie bediener vereis skoonteksstawing oor 'n ongeënkripteerde "
+"verbinding.  Laat dit toe en gaan voort met stawing?"
+
+#: ../libpurple/protocols/jabber/auth.c:769
+#: ../libpurple/protocols/jabber/auth.c:792
 msgid "Invalid challenge from server"
-msgstr ""
-
-#: ../libpurple/protocols/jabber/auth.c:729
+msgstr "Ongeldige uitdaging vanaf bediener"
+
+#: ../libpurple/protocols/jabber/auth.c:864
 msgid "SASL error"
 msgstr "SASL-fout"
 
 #: ../libpurple/protocols/jabber/buddy.c:271
-#: ../libpurple/protocols/jabber/buddy.c:790
-#: ../libpurple/protocols/sametime/sametime.c:4127
-#: ../libpurple/protocols/silc/ops.c:1020
+#: ../libpurple/protocols/jabber/buddy.c:825
+#: ../libpurple/protocols/sametime/sametime.c:4129
+#: ../libpurple/protocols/silc/ops.c:986
+#: ../libpurple/protocols/silc10/ops.c:1020
 msgid "Full Name"
 msgstr "Volle name"
 
 #: ../libpurple/protocols/jabber/buddy.c:272
-#: ../libpurple/protocols/jabber/buddy.c:803
-#: ../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 "Van"
 
 #: ../libpurple/protocols/jabber/buddy.c:273
-#: ../libpurple/protocols/jabber/buddy.c:807
+#: ../libpurple/protocols/jabber/buddy.c:842
 msgid "Given Name"
 msgstr "Doopnaam"
 
 #: ../libpurple/protocols/jabber/buddy.c:275
-#: ../libpurple/protocols/jabber/jabber.c:857
+#: ../libpurple/protocols/jabber/jabber.c:863
 msgid "URL"
 msgstr "URL"
 
 #: ../libpurple/protocols/jabber/buddy.c:276
-#: ../libpurple/protocols/jabber/buddy.c:859
+#: ../libpurple/protocols/jabber/buddy.c:894
 msgid "Street Address"
 msgstr "Straatadres"
 
 #: ../libpurple/protocols/jabber/buddy.c:277
-#: ../libpurple/protocols/jabber/buddy.c:855
+#: ../libpurple/protocols/jabber/buddy.c:890
 msgid "Extended Address"
 msgstr "Uitgebreide adres"
 
 #: ../libpurple/protocols/jabber/buddy.c:278
-#: ../libpurple/protocols/jabber/buddy.c:863
+#: ../libpurple/protocols/jabber/buddy.c:898
 msgid "Locality"
 msgstr "Ligging"
 
 #: ../libpurple/protocols/jabber/buddy.c:279
-#: ../libpurple/protocols/jabber/buddy.c:867
+#: ../libpurple/protocols/jabber/buddy.c:902
 msgid "Region"
 msgstr "Streek"
 
 #: ../libpurple/protocols/jabber/buddy.c:280
-#: ../libpurple/protocols/jabber/buddy.c:871
+#: ../libpurple/protocols/jabber/buddy.c:906
 msgid "Postal Code"
 msgstr "Poskode"
 
 #: ../libpurple/protocols/jabber/buddy.c:281
-#: ../libpurple/protocols/jabber/buddy.c:876
-#: ../libpurple/protocols/silc/silc.c:933
+#: ../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:887
-#: ../libpurple/protocols/jabber/buddy.c:894
+#: ../libpurple/protocols/jabber/buddy.c:922
+#: ../libpurple/protocols/jabber/buddy.c:929
 msgid "Telephone"
 msgstr "Telefoon"
 
-#: ../libpurple/protocols/jabber/buddy.c:283
-#: ../libpurple/protocols/jabber/buddy.c:905
-#: ../libpurple/protocols/jabber/buddy.c:913
-#: ../libpurple/protocols/jabber/buddy.c:1571
-#: ../libpurple/protocols/silc/ops.c:1075
-#: ../libpurple/protocols/silc/util.c:551
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1037
-msgid "E-Mail"
-msgstr "E-pos"
-
 #: ../libpurple/protocols/jabber/buddy.c:284
-#: ../libpurple/protocols/jabber/buddy.c:928
+#: ../libpurple/protocols/jabber/buddy.c:963
 msgid "Organization Name"
 msgstr "Naam van organisasie"
 
 #: ../libpurple/protocols/jabber/buddy.c:285
-#: ../libpurple/protocols/jabber/buddy.c:932
+#: ../libpurple/protocols/jabber/buddy.c:967
 msgid "Organization Unit"
 msgstr "Eenheid"
 
 #: ../libpurple/protocols/jabber/buddy.c:287
-#: ../libpurple/protocols/jabber/buddy.c:941
+#: ../libpurple/protocols/jabber/buddy.c:976
 msgid "Role"
 msgstr "Rol"
 
 #: ../libpurple/protocols/jabber/buddy.c:288
-#: ../libpurple/protocols/jabber/buddy.c:824
-#: ../libpurple/protocols/msn/msn.c:1587
-#: ../libpurple/protocols/oscar/oscar.c:3751
+#: ../libpurple/protocols/jabber/buddy.c:859
+#: ../libpurple/protocols/msn/msn.c:1627
+#: ../libpurple/protocols/oscar/oscar.c:3717
 msgid "Birthday"
 msgstr "Verjaardag"
 
 #: ../libpurple/protocols/jabber/buddy.c:289
-#: ../libpurple/protocols/jabber/buddy.c:944
-#: ../libpurple/protocols/jabber/chat.c:777 ../pidgin/gtkblist.c:2989
-#: ../pidgin/gtkprefs.c:680
+#: ../libpurple/protocols/jabber/buddy.c:979
+#: ../libpurple/protocols/jabber/chat.c:775 ../pidgin/gtkblist.c:3093
+#: ../pidgin/gtkprefs.c:738
 msgid "Description"
 msgstr "Beskrywing"
 
 #: ../libpurple/protocols/jabber/buddy.c:582
 #: ../libpurple/protocols/jabber/buddy.c:583
-msgid "Edit Jabber vCard"
-msgstr "Wysig Jabber-vCard"
+msgid "Edit XMPP vCard"
+msgstr "Wysig XMPP-vCard"
 
 #: ../libpurple/protocols/jabber/buddy.c:584
 msgid ""
 "All items below are optional. Enter only the information with which you feel "
 "comfortable."
 msgstr ""
-"Alle onderstaande items is opsioneel. Gee slegs die inligting waarmee u "
+"Alle onderstaande items is opsioneel. Gee net die inligting waarmee u "
 "gemaklik voel."
 
-#: ../libpurple/protocols/jabber/buddy.c:654
-#: ../libpurple/protocols/jabber/buddy.c:695
+#: ../libpurple/protocols/jabber/buddy.c:655
+#: ../libpurple/protocols/jabber/buddy.c:696
 msgid "Client"
 msgstr "Kliënt"
 
-#: ../libpurple/protocols/jabber/buddy.c:658
-#: ../libpurple/protocols/jabber/buddy.c:699
+#: ../libpurple/protocols/jabber/buddy.c:659
+#: ../libpurple/protocols/jabber/buddy.c:700
 msgid "Operating System"
 msgstr "Bedryfstelsel"
 
-#: ../libpurple/protocols/jabber/buddy.c:668
-#: ../libpurple/protocols/jabber/jabber.c:1997
+#: ../libpurple/protocols/jabber/buddy.c:669
+#: ../libpurple/protocols/jabber/libxmpp.c:202
+#: ../libpurple/protocols/jabber/si.c:853
 msgid "Resource"
 msgstr "Hulpbron"
 
-#: ../libpurple/protocols/jabber/buddy.c:670
-#: ../libpurple/protocols/jabber/jabber.c:1232
-#: ../libpurple/protocols/jabber/jabber.c:1242
-#: ../libpurple/protocols/jabber/jabber.c:1252
-#: ../libpurple/protocols/jabber/jabber.c:1262
-#: ../libpurple/protocols/jabber/jabber.c:1272
+#: ../libpurple/protocols/jabber/buddy.c: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 "Prioriteit"
 
-#: ../libpurple/protocols/jabber/buddy.c:811
-#: ../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 "Tweede naam"
 
-#: ../libpurple/protocols/jabber/buddy.c:844
-#: ../libpurple/protocols/jabber/jabber.c:832
-#: ../libpurple/protocols/oscar/oscar.c:3790
-#: ../libpurple/protocols/oscar/oscar.c:3803
+#: ../libpurple/protocols/jabber/buddy.c:879
+#: ../libpurple/protocols/jabber/jabber.c:838
+#: ../libpurple/protocols/oscar/oscar.c:3756
+#: ../libpurple/protocols/oscar/oscar.c:3769
 #: ../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 "Adres"
 
-#: ../libpurple/protocols/jabber/buddy.c:851
+#: ../libpurple/protocols/jabber/buddy.c:886
 msgid "P.O. Box"
 msgstr "Posbus"
 
-#: ../libpurple/protocols/jabber/buddy.c:965
+#: ../libpurple/protocols/jabber/buddy.c:1000
 msgid "Photo"
 msgstr "Foto"
 
-#: ../libpurple/protocols/jabber/buddy.c:965
+#: ../libpurple/protocols/jabber/buddy.c:1000
 msgid "Logo"
 msgstr "Embleem"
 
-#: ../libpurple/protocols/jabber/buddy.c:1351
+#: ../libpurple/protocols/jabber/buddy.c:1409
 msgid "Un-hide From"
-msgstr ""
-
-#: ../libpurple/protocols/jabber/buddy.c:1355
+msgstr "Onversteek vanaf"
+
+#: ../libpurple/protocols/jabber/buddy.c:1413
 msgid "Temporarily Hide From"
 msgstr "Kruip tydelik weg vir"
 
 #. && NOT ME
-#: ../libpurple/protocols/jabber/buddy.c:1363
+#: ../libpurple/protocols/jabber/buddy.c:1421
 msgid "Cancel Presence Notification"
 msgstr "Kanselleer teenwoordigheidkennisgewings"
 
-#: ../libpurple/protocols/jabber/buddy.c:1370
+#: ../libpurple/protocols/jabber/buddy.c:1428
 msgid "(Re-)Request authorization"
 msgstr "(Her-)Versoek magtiging"
 
 #. if(NOT ME)
 #. shouldn't this just happen automatically when the buddy is
 #. removed?
-#: ../libpurple/protocols/jabber/buddy.c:1379
+#: ../libpurple/protocols/jabber/buddy.c:1437
 msgid "Unsubscribe"
 msgstr "Beëindig inskrywing"
 
-#: ../libpurple/protocols/jabber/buddy.c:1412
-#: ../libpurple/protocols/jabber/jabber.c:1241
+#: ../libpurple/protocols/jabber/buddy.c:1470
+#: ../libpurple/protocols/jabber/jabber.c:1252
 msgid "Chatty"
 msgstr "Geselserig"
 
-#: ../libpurple/protocols/jabber/buddy.c:1416 ../libpurple/status.c:159
+#: ../libpurple/protocols/jabber/buddy.c:1474
 msgid "Extended Away"
 msgstr "Vir lank weg"
 
-#: ../libpurple/protocols/jabber/buddy.c:1418
-#: ../libpurple/protocols/jabber/jabber.c:1271
-#: ../libpurple/protocols/oscar/oscar.c:708
+#: ../libpurple/protocols/jabber/buddy.c:1476
+#: ../libpurple/protocols/jabber/jabber.c:1282
+#: ../libpurple/protocols/oscar/oscar.c:726
 #: ../libpurple/protocols/oscar/oscar.c:5756
 #: ../libpurple/protocols/sametime/sametime.c:3298
 msgid "Do Not Disturb"
 msgstr "Moenie pla nie"
 
-#: ../libpurple/protocols/jabber/buddy.c:1563
+#: ../libpurple/protocols/jabber/buddy.c:1621
 msgid "JID"
 msgstr "JID"
 
-#: ../libpurple/protocols/jabber/buddy.c:1567
-#: ../libpurple/protocols/jabber/buddy.c:1746
-#: ../libpurple/protocols/oscar/oscar.c:3713
+#: ../libpurple/protocols/jabber/buddy.c:1625
+#: ../libpurple/protocols/jabber/buddy.c:1804
+#: ../libpurple/protocols/oscar/oscar.c:3679
 msgid "Last Name"
 msgstr "Van"
 
-#: ../libpurple/protocols/jabber/buddy.c:1599
+#: ../libpurple/protocols/jabber/buddy.c:1657
 msgid "The following are the results of your search"
 msgstr "Die volgende is die resultate van u soektog"
 
 #. current comment from Jabber User Directory users.jabber.org
-#: ../libpurple/protocols/jabber/buddy.c:1674
+#: ../libpurple/protocols/jabber/buddy.c:1732
 msgid ""
 "Find a contact by entering the search criteria in the given fields. Note: "
 "Each field supports wild card searches (%)"
 msgstr ""
-
-#: ../libpurple/protocols/jabber/buddy.c:1694
+"Soek 'n kontak deur die soekkriteria in die gegewe velde te gee. Let wel: "
+"Elke veld ondersteun instaankarakter-soektogte (%)"
+
+#: ../libpurple/protocols/jabber/buddy.c:1752
 msgid "Directory Query Failed"
-msgstr ""
-
-#: ../libpurple/protocols/jabber/buddy.c:1695
+msgstr "Gidsnavraag het misluk"
+
+#: ../libpurple/protocols/jabber/buddy.c:1753
 msgid "Could not query the directory server."
-msgstr ""
+msgstr "Kon nie navraag by die gidsbediener doen nie."
 
 #. Try to translate the message (see static message
 #. list in jabber_user_dir_comments[])
-#: ../libpurple/protocols/jabber/buddy.c:1729
+#: ../libpurple/protocols/jabber/buddy.c:1787
 #, c-format
 msgid "Server Instructions: %s"
 msgstr "Bedienerinstruksies: %s"
 
-#: ../libpurple/protocols/jabber/buddy.c:1736
-msgid "Fill in one or more fields to search for any matching Jabber users."
-msgstr "Vul een of meer velde in om te soek vir passende Jabber-gebruikers."
-
-#: ../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 "Vul een of meer velde in om te soek vir passende XMPP-gebruikers."
+
+#: ../libpurple/protocols/jabber/buddy.c:1814
 #: ../libpurple/protocols/novell/novell.c:1488
-#: ../libpurple/protocols/oscar/oscar.c:3716
-#: ../libpurple/protocols/oscar/oscar.c:3725
+#: ../libpurple/protocols/oscar/oscar.c:3682
+#: ../libpurple/protocols/oscar/oscar.c:3691
 msgid "E-Mail Address"
 msgstr "E-posadres"
 
-#: ../libpurple/protocols/jabber/buddy.c:1765
-#: ../libpurple/protocols/jabber/buddy.c:1766
-msgid "Search for Jabber users"
-msgstr "Soek vir Jabber-gebruikers"
+#: ../libpurple/protocols/jabber/buddy.c:1823
+#: ../libpurple/protocols/jabber/buddy.c:1824
+msgid "Search for XMPP users"
+msgstr "Soek vir XMPP-gebruikers"
 
 #. "Search"
-#: ../libpurple/protocols/jabber/buddy.c:1767
+#: ../libpurple/protocols/jabber/buddy.c:1825
 #: ../libpurple/protocols/qq/group.c:123
-#: ../libpurple/protocols/qq/group_im.c:139
-#: ../libpurple/protocols/qq/sys_msg.c:162
-#: ../libpurple/protocols/qq/sys_msg.c:232
+#: ../libpurple/protocols/qq/group_im.c:147
+#: ../libpurple/protocols/qq/sys_msg.c:174
 #: ../libpurple/protocols/qq/sys_msg.c:250
-#: ../libpurple/protocols/sametime/sametime.c:5600
-#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:473
-#: ../pidgin/plugins/gevolution/assoc-buddy.c:358
+#: ../libpurple/protocols/qq/sys_msg.c:268
+#: ../libpurple/protocols/sametime/sametime.c:5612
+#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:470
+#: ../pidgin/plugins/gevolution/assoc-buddy.c:356
 msgid "Search"
 msgstr "Soek"
 
-#: ../libpurple/protocols/jabber/buddy.c:1780
+#: ../libpurple/protocols/jabber/buddy.c:1840
 msgid "Invalid Directory"
 msgstr "Ongeldige gids"
 
-#: ../libpurple/protocols/jabber/buddy.c:1797
+#: ../libpurple/protocols/jabber/buddy.c:1857
 msgid "Enter a User Directory"
 msgstr "Gee 'n gebruikergids"
 
-#: ../libpurple/protocols/jabber/buddy.c:1798
+#: ../libpurple/protocols/jabber/buddy.c:1858
 msgid "Select a user directory to search"
 msgstr "Kies 'n gebruikergids om te deursoek"
 
-#: ../libpurple/protocols/jabber/buddy.c:1801
+#: ../libpurple/protocols/jabber/buddy.c:1861
 msgid "Search Directory"
-msgstr ""
+msgstr "Deursoek gids"
 
 #: ../libpurple/protocols/jabber/chat.c:41
-#: ../libpurple/protocols/oscar/oscar.c:5252
-#: ../libpurple/protocols/yahoo/yahoochat.c:999
+#: ../libpurple/protocols/oscar/oscar.c:5242
+#: ../libpurple/protocols/yahoo/yahoochat.c:962
 msgid "_Room:"
 msgstr "_Kamer:"
 
@@ -4336,90 +4674,89 @@
 
 #: ../libpurple/protocols/jabber/chat.c:53
 msgid "_Handle:"
-msgstr ""
-
-#: ../libpurple/protocols/jabber/chat.c:225
+msgstr "_Vatsel:"
+
+#: ../libpurple/protocols/jabber/chat.c:223
 #, c-format
 msgid "%s is not a valid room name"
 msgstr "%s is nie 'n geldige kamernaam nie"
 
-#: ../libpurple/protocols/jabber/chat.c:226
+#: ../libpurple/protocols/jabber/chat.c:224
 msgid "Invalid Room Name"
 msgstr "Ongeldige kamernaam"
 
-#: ../libpurple/protocols/jabber/chat.c:231
+#: ../libpurple/protocols/jabber/chat.c:229
 #, c-format
 msgid "%s is not a valid server name"
 msgstr "%s is nie 'n geldige bedienernaam nie"
 
-#: ../libpurple/protocols/jabber/chat.c:232
-#: ../libpurple/protocols/jabber/chat.c:233
+#: ../libpurple/protocols/jabber/chat.c:230
+#: ../libpurple/protocols/jabber/chat.c:231
 msgid "Invalid Server Name"
 msgstr "Ongeldige bedienernaam"
 
-#: ../libpurple/protocols/jabber/chat.c:237
-#, c-format
-#, fuzzy
+#: ../libpurple/protocols/jabber/chat.c:235
+#, c-format
 msgid "%s is not a valid room handle"
 msgstr "%s is nie 'n geldige kamernaam nie"
 
-#: ../libpurple/protocols/jabber/chat.c:238
-#: ../libpurple/protocols/jabber/chat.c:239
-#, fuzzy
+#: ../libpurple/protocols/jabber/chat.c:236
+#: ../libpurple/protocols/jabber/chat.c:237
 msgid "Invalid Room Handle"
 msgstr "Ongeldige kamernaam"
 
-#: ../libpurple/protocols/jabber/chat.c:398
+#: ../libpurple/protocols/jabber/chat.c:396
 msgid "Configuration error"
 msgstr "Opstellingfout"
 
-#: ../libpurple/protocols/jabber/chat.c:407
-#: ../libpurple/protocols/jabber/chat.c:550
+#: ../libpurple/protocols/jabber/chat.c:405
+#: ../libpurple/protocols/jabber/chat.c:548
 msgid "Unable to configure"
 msgstr "Kan nie opstel nie"
 
-#: ../libpurple/protocols/jabber/chat.c:422
+#: ../libpurple/protocols/jabber/chat.c:420
 msgid "Room Configuration Error"
 msgstr "Kameropstellingfout"
 
-#: ../libpurple/protocols/jabber/chat.c:423
+#: ../libpurple/protocols/jabber/chat.c:421
 msgid "This room is not capable of being configured"
 msgstr "Hieride kamer kan nie opgestel word nie"
 
-#: ../libpurple/protocols/jabber/chat.c:472
-#: ../libpurple/protocols/jabber/chat.c:541
+#: ../libpurple/protocols/jabber/chat.c:470
+#: ../libpurple/protocols/jabber/chat.c:539
 msgid "Registration error"
 msgstr "Registrasiefout"
 
-#: ../libpurple/protocols/jabber/chat.c:629
+#: ../libpurple/protocols/jabber/chat.c:627
 msgid "Nick changing not supported in non-MUC chatrooms"
-msgstr ""
-
-#: ../libpurple/protocols/jabber/chat.c:680
-#: ../libpurple/protocols/jabber/chat.c:691
-#: ../libpurple/protocols/silc/ops.c:1451
+msgstr "Bynaamverandering nie in nie-MUC-geselsiekamers ondersteun nie"
+
+#: ../libpurple/protocols/jabber/chat.c:678
+#: ../libpurple/protocols/jabber/chat.c:689
+#: ../libpurple/protocols/silc/ops.c:1456
+#: ../libpurple/protocols/silc10/ops.c:1451
 msgid "Error retrieving room list"
 msgstr "Fout met die kry van die kamerlys"
 
-#: ../libpurple/protocols/jabber/chat.c:739
+#: ../libpurple/protocols/jabber/chat.c:737
 msgid "Invalid Server"
 msgstr "Ongeldige bediener"
 
-#: ../libpurple/protocols/jabber/chat.c:783
+#: ../libpurple/protocols/jabber/chat.c:781
 msgid "Enter a Conference Server"
 msgstr "Gee 'n konferensiebediener"
 
-#: ../libpurple/protocols/jabber/chat.c:784
+#: ../libpurple/protocols/jabber/chat.c:782
 msgid "Select a conference server to query"
 msgstr "Kies 'n konferensiebediener om te vra"
 
-#: ../libpurple/protocols/jabber/chat.c:787
+#: ../libpurple/protocols/jabber/chat.c:785
 msgid "Find Rooms"
 msgstr "Vind kamers"
 
 #: ../libpurple/protocols/jabber/jabber.c:84
 msgid "Error initializing session"
-msgstr ""
+msgstr "Fout met inisialiseer van sessie"
 
 #: ../libpurple/protocols/jabber/jabber.c:247
 #: ../libpurple/protocols/jabber/jabber.c:300
@@ -4432,447 +4769,482 @@
 msgid "Read Error"
 msgstr "Leesfout"
 
-#: ../libpurple/protocols/jabber/jabber.c:519
+#: ../libpurple/protocols/jabber/jabber.c:467
+#: ../libpurple/protocols/oscar/flap_connection.c:394
+#: ../libpurple/protocols/yahoo/yahoo.c:2402
+#: ../libpurple/protocols/yahoo/yahoo.c:2434
+#, c-format
+msgid ""
+"Could not establish a connection with the server:\n"
+"%s"
+msgstr ""
+"Kon nie 'n verbinding met die bediener bewerkstellig nie:\n"
+"%s"
+
+#: ../libpurple/protocols/jabber/jabber.c:523
 msgid "Unable to create socket"
 msgstr "Kan nie sok skep nie"
 
-#: ../libpurple/protocols/jabber/jabber.c:567
-#: ../libpurple/protocols/jabber/jabber.c:910
-msgid "Invalid Jabber ID"
-msgstr "Ongeldige Jabber-ID"
-
-#: ../libpurple/protocols/jabber/jabber.c:638
+#: ../libpurple/protocols/jabber/jabber.c:568
+#: ../libpurple/protocols/jabber/jabber.c:918
+msgid "Invalid XMPP ID"
+msgstr "Ongeldige XMPP-ID"
+
+#: ../libpurple/protocols/jabber/jabber.c:573
+msgid "Invalid XMPP ID. Domain must be set."
+msgstr "Ongeldige XMPP-ID. Domein moet ingestel word."
+
+#: ../libpurple/protocols/jabber/jabber.c:644
 #, c-format
 msgid "Registration of %s@%s successful"
 msgstr "Registrasie van %s@%s suksesvol"
 
-#: ../libpurple/protocols/jabber/jabber.c:640
-#: ../libpurple/protocols/jabber/jabber.c:641
+#: ../libpurple/protocols/jabber/jabber.c:646
+#: ../libpurple/protocols/jabber/jabber.c:647
 msgid "Registration Successful"
 msgstr "Registrasie suksesvol"
 
-#: ../libpurple/protocols/jabber/jabber.c:647
-#: ../libpurple/protocols/jabber/jabber.c:1509
+#: ../libpurple/protocols/jabber/jabber.c:653
+#: ../libpurple/protocols/jabber/jabber.c:1524
 msgid "Unknown Error"
 msgstr "Onbekende fout"
 
-#: ../libpurple/protocols/jabber/jabber.c:649
-#: ../libpurple/protocols/jabber/jabber.c:650
+#: ../libpurple/protocols/jabber/jabber.c:655
+#: ../libpurple/protocols/jabber/jabber.c:656
 msgid "Registration Failed"
 msgstr "Registrasie het misluk"
 
-#: ../libpurple/protocols/jabber/jabber.c:765
-#: ../libpurple/protocols/jabber/jabber.c:766
+#: ../libpurple/protocols/jabber/jabber.c:771
+#: ../libpurple/protocols/jabber/jabber.c:772
 msgid "Already Registered"
 msgstr "Reeds geregistreer"
 
-#: ../libpurple/protocols/jabber/jabber.c:842
-#: ../libpurple/protocols/oscar/oscar.c:3792
-#: ../libpurple/protocols/oscar/oscar.c:3805
+#: ../libpurple/protocols/jabber/jabber.c:848
+#: ../libpurple/protocols/oscar/oscar.c:3758
+#: ../libpurple/protocols/oscar/oscar.c:3771
 msgid "State"
 msgstr "Staat"
 
-#: ../libpurple/protocols/jabber/jabber.c:847
+#: ../libpurple/protocols/jabber/jabber.c:853
 msgid "Postal code"
 msgstr "Poskode"
 
-#: ../libpurple/protocols/jabber/jabber.c:852
-#: ../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 "Telefoon"
 
-#: ../libpurple/protocols/jabber/jabber.c:862
+#: ../libpurple/protocols/jabber/jabber.c:868
 msgid "Date"
 msgstr "Datum"
 
-#: ../libpurple/protocols/jabber/jabber.c:870
+#: ../libpurple/protocols/jabber/jabber.c:876
 msgid "Please fill out the information below to register your new account."
 msgstr "Vul die inligting onder in om die nuwe rekening te registreer."
 
-#: ../libpurple/protocols/jabber/jabber.c:873
-#: ../libpurple/protocols/jabber/jabber.c:874
-msgid "Register New Jabber Account"
-msgstr "Registreer 'n nuwe Jabber-rekening"
+#: ../libpurple/protocols/jabber/jabber.c:879
+#: ../libpurple/protocols/jabber/jabber.c:880
+msgid "Register New XMPP Account"
+msgstr "Registreer 'n nuwe XMPP-rekening"
 
 #. Register button
-#: ../libpurple/protocols/jabber/jabber.c:875 ../pidgin/gtkaccount.c:1478
+#: ../libpurple/protocols/jabber/jabber.c:881 ../pidgin/gtkaccount.c:1523
 msgid "Register"
 msgstr "Registreer"
 
-#: ../libpurple/protocols/jabber/jabber.c:1042
+#: ../libpurple/protocols/jabber/jabber.c:1050
 msgid "Initializing Stream"
 msgstr "Inisialiseer stroom"
 
-#: ../libpurple/protocols/jabber/jabber.c:1047
-#: ../libpurple/protocols/msn/session.c:350
+#: ../libpurple/protocols/jabber/jabber.c:1055
+#: ../libpurple/protocols/msn/session.c:351
 msgid "Authenticating"
-msgstr "Staaf"
-
-#: ../libpurple/protocols/jabber/jabber.c:1056
+msgstr "Stawing"
+
+#: ../libpurple/protocols/jabber/jabber.c:1064
 msgid "Re-initializing Stream"
 msgstr "Herinisialiseer stroom"
 
-#: ../libpurple/protocols/jabber/jabber.c:1115
-#: ../libpurple/protocols/jabber/jabber.c:1487
-#: ../libpurple/protocols/jabber/jabber.c:1528
-#: ../libpurple/protocols/jabber/jabber.c:1564
-#: ../libpurple/protocols/oscar/oscar.c:807
-#: ../libpurple/protocols/oscar/oscar.c:5540
+#: ../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:825
+#: ../libpurple/protocols/oscar/oscar.c:5550
 msgid "Not Authorized"
 msgstr "Nie gemagtig nie"
 
-#: ../libpurple/protocols/jabber/jabber.c:1157
+#: ../libpurple/protocols/jabber/jabber.c:1168
 msgid "Both"
 msgstr "Beide"
 
-#: ../libpurple/protocols/jabber/jabber.c:1159
+#: ../libpurple/protocols/jabber/jabber.c:1170
 msgid "From (To pending)"
-msgstr ""
-
-#: ../libpurple/protocols/jabber/jabber.c:1164
+msgstr "Van (aan hangende)"
+
+#: ../libpurple/protocols/jabber/jabber.c:1172
+msgid "From"
+msgstr "Van"
+
+#: ../libpurple/protocols/jabber/jabber.c:1175
 msgid "To"
-msgstr ""
-
-#: ../libpurple/protocols/jabber/jabber.c:1166
+msgstr "Aan"
+
+#: ../libpurple/protocols/jabber/jabber.c:1177
 msgid "None (To pending)"
-msgstr ""
-
-#: ../libpurple/protocols/jabber/jabber.c:1168
+msgstr "Geen (aan hangende)"
+
+#: ../libpurple/protocols/jabber/jabber.c:1179
 #: ../pidgin/plugins/gevolution/eds-utils.c:73
 #: ../pidgin/plugins/gevolution/eds-utils.c:86
 msgid "None"
 msgstr "Geen"
 
-#: ../libpurple/protocols/jabber/jabber.c:1171
+#: ../libpurple/protocols/jabber/jabber.c:1182
 msgid "Subscription"
 msgstr "Inskrywing"
 
-#: ../libpurple/protocols/jabber/jabber.c:1301
+#: ../libpurple/protocols/jabber/jabber.c:1312
 msgid "Password Changed"
 msgstr "Wagwoord verander"
 
-#: ../libpurple/protocols/jabber/jabber.c:1302
+#: ../libpurple/protocols/jabber/jabber.c:1313
 msgid "Your password has been changed."
 msgstr "U wagwoord is verander."
 
-#: ../libpurple/protocols/jabber/jabber.c:1306
-#: ../libpurple/protocols/jabber/jabber.c:1307
+#: ../libpurple/protocols/jabber/jabber.c:1317
+#: ../libpurple/protocols/jabber/jabber.c:1318
 msgid "Error changing password"
 msgstr "Fout met verandering van wagwoord"
 
-#: ../libpurple/protocols/jabber/jabber.c:1363
+#: ../libpurple/protocols/jabber/jabber.c:1375
 msgid "Password (again)"
 msgstr "Wagwoord (weer)"
 
-#: ../libpurple/protocols/jabber/jabber.c:1368
-#: ../libpurple/protocols/jabber/jabber.c:1369
-msgid "Change Jabber Password"
-msgstr "Verander Jabber-wagwoord"
-
-#: ../libpurple/protocols/jabber/jabber.c:1369
+#: ../libpurple/protocols/jabber/jabber.c:1381
+#: ../libpurple/protocols/jabber/jabber.c:1382
+msgid "Change XMPP Password"
+msgstr "Verander XMPP-wagwoord"
+
+#: ../libpurple/protocols/jabber/jabber.c:1382
 msgid "Please enter your new password"
 msgstr "Gee asb. u nuwe wagwoord"
 
-#: ../libpurple/protocols/jabber/jabber.c:1379
-#: ../libpurple/protocols/oscar/oscar.c:6341
-#: ../libpurple/protocols/silc/silc.c:1013
+#: ../libpurple/protocols/jabber/jabber.c:1394
+#: ../libpurple/protocols/oscar/oscar.c:6336
+#: ../libpurple/protocols/silc/silc.c:1093
+#: ../libpurple/protocols/silc10/silc.c:1004
 msgid "Set User Info..."
 msgstr "Stel gebruikerinligting..."
 
 #. if (js->protocol_options & CHANGE_PASSWORD) {
-#: ../libpurple/protocols/jabber/jabber.c:1384
-#: ../libpurple/protocols/oscar/oscar.c:6352
-#: ../libpurple/protocols/silc/silc.c:1009
+#: ../libpurple/protocols/jabber/jabber.c:1399
+#: ../libpurple/protocols/oscar/oscar.c:6347
+#: ../libpurple/protocols/silc/silc.c:1089
+#: ../libpurple/protocols/silc10/silc.c:1000
 msgid "Change Password..."
 msgstr "Verander wagwoord..."
 
 #. }
-#: ../libpurple/protocols/jabber/jabber.c:1389
+#: ../libpurple/protocols/jabber/jabber.c:1404
 msgid "Search for Users..."
 msgstr "Soek vir gebruikers..."
 
-#: ../libpurple/protocols/jabber/jabber.c:1467
+#: ../libpurple/protocols/jabber/jabber.c:1482
 msgid "Bad Request"
 msgstr "Slegte versoek"
 
-#: ../libpurple/protocols/jabber/jabber.c:1469
+#: ../libpurple/protocols/jabber/jabber.c:1484
 msgid "Conflict"
 msgstr "Konflik"
 
-#: ../libpurple/protocols/jabber/jabber.c:1471
+#: ../libpurple/protocols/jabber/jabber.c:1486
 msgid "Feature Not Implemented"
 msgstr "Kenmerk nie geïmplementeer nie"
 
-#: ../libpurple/protocols/jabber/jabber.c:1473
+#: ../libpurple/protocols/jabber/jabber.c:1488
 msgid "Forbidden"
 msgstr "Verbode"
 
-#: ../libpurple/protocols/jabber/jabber.c:1475
+#: ../libpurple/protocols/jabber/jabber.c:1490
 msgid "Gone"
 msgstr "Weg"
 
-#: ../libpurple/protocols/jabber/jabber.c:1477
-#: ../libpurple/protocols/jabber/jabber.c:1554
+#: ../libpurple/protocols/jabber/jabber.c:1492
+#: ../libpurple/protocols/jabber/jabber.c:1569
 msgid "Internal Server Error"
 msgstr "Interne bedienerfout"
 
-#: ../libpurple/protocols/jabber/jabber.c:1479
+#: ../libpurple/protocols/jabber/jabber.c:1494
 msgid "Item Not Found"
 msgstr "Item nie gevind nie"
 
-#: ../libpurple/protocols/jabber/jabber.c:1481
-msgid "Malformed Jabber ID"
-msgstr "Misvormde Jabber-ID"
-
-#: ../libpurple/protocols/jabber/jabber.c:1483
+#: ../libpurple/protocols/jabber/jabber.c:1496
+msgid "Malformed XMPP ID"
+msgstr "Wanvormde XMPP-ID"
+
+#: ../libpurple/protocols/jabber/jabber.c:1498
 msgid "Not Acceptable"
 msgstr "Nie aanvaarbaar nie"
 
-#: ../libpurple/protocols/jabber/jabber.c:1485
+#: ../libpurple/protocols/jabber/jabber.c:1500
 msgid "Not Allowed"
 msgstr "Nie toegelaat nie"
 
-#: ../libpurple/protocols/jabber/jabber.c:1489
+#: ../libpurple/protocols/jabber/jabber.c:1504
 msgid "Payment Required"
-msgstr "Betaling benodig"
-
-#: ../libpurple/protocols/jabber/jabber.c:1491
+msgstr "Betaling vereis"
+
+#: ../libpurple/protocols/jabber/jabber.c:1506
 msgid "Recipient Unavailable"
 msgstr "Ontvanger nie beskikbaar nie"
 
-#: ../libpurple/protocols/jabber/jabber.c:1495
+#: ../libpurple/protocols/jabber/jabber.c:1510
 msgid "Registration Required"
-msgstr "Registrasie benodig"
-
-#: ../libpurple/protocols/jabber/jabber.c:1497
+msgstr "Registrasie vereis"
+
+#: ../libpurple/protocols/jabber/jabber.c:1512
 msgid "Remote Server Not Found"
 msgstr "Afgeleë bediener nie gevind nie"
 
-#: ../libpurple/protocols/jabber/jabber.c:1499
+#: ../libpurple/protocols/jabber/jabber.c:1514
 msgid "Remote Server Timeout"
-msgstr ""
-
-#: ../libpurple/protocols/jabber/jabber.c:1501
+msgstr "Afgeleëbediener-uittelling"
+
+#: ../libpurple/protocols/jabber/jabber.c:1516
 msgid "Server Overloaded"
 msgstr "Bediener oorlaai"
 
-#: ../libpurple/protocols/jabber/jabber.c:1503
+#: ../libpurple/protocols/jabber/jabber.c:1518
 msgid "Service Unavailable"
 msgstr "Diens nie beskikbaar nie"
 
-#: ../libpurple/protocols/jabber/jabber.c:1505
+#: ../libpurple/protocols/jabber/jabber.c:1520
 msgid "Subscription Required"
-msgstr "Inskrywing benodig"
-
-#: ../libpurple/protocols/jabber/jabber.c:1507
+msgstr "Inskrywing vereis"
+
+#: ../libpurple/protocols/jabber/jabber.c:1522
 msgid "Unexpected Request"
 msgstr "Onverwagde versoek"
 
-#: ../libpurple/protocols/jabber/jabber.c:1514
+#: ../libpurple/protocols/jabber/jabber.c:1529
 msgid "Authorization Aborted"
 msgstr "Magtiging gestaak"
 
-#: ../libpurple/protocols/jabber/jabber.c:1516
+#: ../libpurple/protocols/jabber/jabber.c:1531
 msgid "Incorrect encoding in authorization"
 msgstr "Verkeerde enkodering in magtiging"
 
-#: ../libpurple/protocols/jabber/jabber.c:1519
+#: ../libpurple/protocols/jabber/jabber.c:1534
 msgid "Invalid authzid"
 msgstr "Ongeldige authzid"
 
-#: ../libpurple/protocols/jabber/jabber.c:1522
+#: ../libpurple/protocols/jabber/jabber.c:1537
 msgid "Invalid Authorization Mechanism"
 msgstr "Ongeldige magtigingmeganisme"
 
-#: ../libpurple/protocols/jabber/jabber.c:1525
+#: ../libpurple/protocols/jabber/jabber.c:1540
 msgid "Authorization mechanism too weak"
 msgstr "Magtigingmeganisme te swak"
 
-#: ../libpurple/protocols/jabber/jabber.c:1530
+#: ../libpurple/protocols/jabber/jabber.c:1545
 msgid "Temporary Authentication Failure"
-msgstr "Tydlike magtigingmislukking"
-
-#: ../libpurple/protocols/jabber/jabber.c:1533
+msgstr "Tydlike stawingmislukking"
+
+#: ../libpurple/protocols/jabber/jabber.c:1548
 msgid "Authentication Failure"
-msgstr "Magtigingmislukking"
-
-#: ../libpurple/protocols/jabber/jabber.c:1539
+msgstr "Stawingmislukking"
+
+#: ../libpurple/protocols/jabber/jabber.c:1554
 msgid "Bad Format"
 msgstr "Slegte formaat"
 
-#: ../libpurple/protocols/jabber/jabber.c:1541
+#: ../libpurple/protocols/jabber/jabber.c:1556
 msgid "Bad Namespace Prefix"
-msgstr ""
-
-#: ../libpurple/protocols/jabber/jabber.c:1544
+msgstr "Slegte naamruimte-voorvoegsel"
+
+#: ../libpurple/protocols/jabber/jabber.c:1559
 msgid "Resource Conflict"
-msgstr ""
-
-#: ../libpurple/protocols/jabber/jabber.c:1546
-#: ../libpurple/protocols/silc/ops.c:1729
+msgstr "Hulpbron-konflik"
+
+#: ../libpurple/protocols/jabber/jabber.c:1561
+#: ../libpurple/protocols/silc/silc.c:244
+#: ../libpurple/protocols/silc10/ops.c:1720
 msgid "Connection Timeout"
-msgstr ""
-
-#: ../libpurple/protocols/jabber/jabber.c:1548
+msgstr "Verbinding-uittelling"
+
+#: ../libpurple/protocols/jabber/jabber.c:1563
 msgid "Host Gone"
 msgstr "Gasheer weg"
 
-#: ../libpurple/protocols/jabber/jabber.c:1550
+#: ../libpurple/protocols/jabber/jabber.c:1565
 msgid "Host Unknown"
 msgstr "Gasheer onbekend"
 
-#: ../libpurple/protocols/jabber/jabber.c:1552
+#: ../libpurple/protocols/jabber/jabber.c:1567
 msgid "Improper Addressing"
-msgstr ""
-
-#: ../libpurple/protocols/jabber/jabber.c:1556
+msgstr "Onbehoorlike adressering"
+
+#: ../libpurple/protocols/jabber/jabber.c:1571
 msgid "Invalid ID"
 msgstr "Ongeldige ID"
 
-#: ../libpurple/protocols/jabber/jabber.c:1558
+#: ../libpurple/protocols/jabber/jabber.c:1573
 msgid "Invalid Namespace"
-msgstr ""
-
-#: ../libpurple/protocols/jabber/jabber.c:1560
+msgstr "Ongeldige naamruimte"
+
+#: ../libpurple/protocols/jabber/jabber.c:1575
 msgid "Invalid XML"
 msgstr "Ongeldige XML"
 
-#: ../libpurple/protocols/jabber/jabber.c:1562
+#: ../libpurple/protocols/jabber/jabber.c:1577
 msgid "Non-matching Hosts"
 msgstr "Niepassende gashere"
 
-#: ../libpurple/protocols/jabber/jabber.c:1566
+#: ../libpurple/protocols/jabber/jabber.c:1581
 msgid "Policy Violation"
 msgstr "Beleidskending"
 
-#: ../libpurple/protocols/jabber/jabber.c:1568
+#: ../libpurple/protocols/jabber/jabber.c:1583
 msgid "Remote Connection Failed"
-msgstr ""
-
-#: ../libpurple/protocols/jabber/jabber.c:1570
+msgstr "Afgeleë verbinding het misluk"
+
+#: ../libpurple/protocols/jabber/jabber.c:1585
 msgid "Resource Constraint"
-msgstr ""
-
-#: ../libpurple/protocols/jabber/jabber.c:1572
+msgstr "Hulpbron-beperking"
+
+#: ../libpurple/protocols/jabber/jabber.c:1587
 msgid "Restricted XML"
 msgstr "Ingeperkte XML"
 
-#: ../libpurple/protocols/jabber/jabber.c:1574
+#: ../libpurple/protocols/jabber/jabber.c:1589
 msgid "See Other Host"
 msgstr "Sien ander gasheer"
 
-#: ../libpurple/protocols/jabber/jabber.c:1576
+#: ../libpurple/protocols/jabber/jabber.c:1591
 msgid "System Shutdown"
-msgstr ""
-
-#: ../libpurple/protocols/jabber/jabber.c:1578
+msgstr "Stelselafsluiting"
+
+#: ../libpurple/protocols/jabber/jabber.c:1593
 msgid "Undefined Condition"
-msgstr ""
-
-#: ../libpurple/protocols/jabber/jabber.c:1580
+msgstr "Ongedefinieerde verbinding"
+
+#: ../libpurple/protocols/jabber/jabber.c:1595
 msgid "Unsupported Encoding"
 msgstr "Enkodering nie gesteun nie"
 
-#: ../libpurple/protocols/jabber/jabber.c:1582
+#: ../libpurple/protocols/jabber/jabber.c:1597
 msgid "Unsupported Stanza Type"
-msgstr ""
-
-#: ../libpurple/protocols/jabber/jabber.c:1584
+msgstr "Nieondersteunde stanzatipe"
+
+#: ../libpurple/protocols/jabber/jabber.c:1599
 msgid "Unsupported Version"
 msgstr "Weergawe nie gesteun nie"
 
-#: ../libpurple/protocols/jabber/jabber.c:1586
+#: ../libpurple/protocols/jabber/jabber.c:1601
 msgid "XML Not Well Formed"
 msgstr "XML nie goed gevorm nie"
 
-#: ../libpurple/protocols/jabber/jabber.c:1588
+#: ../libpurple/protocols/jabber/jabber.c:1603
 msgid "Stream Error"
 msgstr "Stroomfout"
 
-#: ../libpurple/protocols/jabber/jabber.c:1655
+#: ../libpurple/protocols/jabber/jabber.c:1686
 #, c-format
 msgid "Unable to ban user %s"
 msgstr "Kan nie gebruiker %s verban nie"
 
-#: ../libpurple/protocols/jabber/jabber.c:1675
+#: ../libpurple/protocols/jabber/jabber.c:1706
 #, c-format
 msgid "Unknown affiliation: \"%s\""
-msgstr "Onbekene affiliasie: \"%s\""
-
-#: ../libpurple/protocols/jabber/jabber.c:1680
+msgstr "Onbekende affiliasie: \"%s\""
+
+#: ../libpurple/protocols/jabber/jabber.c:1711
 #, c-format
 msgid "Unable to affiliate user %s as \"%s\""
 msgstr "Kan nie gebruiker %s as \"%s\" affilieer nie"
 
-#: ../libpurple/protocols/jabber/jabber.c:1699
+#: ../libpurple/protocols/jabber/jabber.c:1730
 #, c-format
 msgid "Unknown role: \"%s\""
 msgstr "Onbekende rol: \"%s\""
 
-#: ../libpurple/protocols/jabber/jabber.c:1706
+#: ../libpurple/protocols/jabber/jabber.c:1735
 #, c-format
 msgid "Unable to set role \"%s\" for user: %s"
 msgstr "Kan nie rol \"%s\" vir gebruiker %s stel nie"
 
-#: ../libpurple/protocols/jabber/jabber.c:1759
+#: ../libpurple/protocols/jabber/jabber.c:1788
 #, c-format
 msgid "Unable to kick user %s"
-msgstr "Kan nie gebruiker %s uitskop nie"
-
-#: ../libpurple/protocols/jabber/jabber.c:1790
+msgstr "Kan nie gebruiker %s skop nie"
+
+#: ../libpurple/protocols/jabber/jabber.c:1822
 msgid "config:  Configure a chat room."
-msgstr ""
-
-#: ../libpurple/protocols/jabber/jabber.c:1794
+msgstr "config:  Konfigureer 'n geselsiekamer."
+
+#: ../libpurple/protocols/jabber/jabber.c:1826
 msgid "configure:  Configure a chat room."
-msgstr ""
-
-#: ../libpurple/protocols/jabber/jabber.c:1803
+msgstr "configure:  Konfigureer 'n geselsiekamer."
+
+#: ../libpurple/protocols/jabber/jabber.c:1835
 msgid "part [room]:  Leave the room."
-msgstr ""
-
-#: ../libpurple/protocols/jabber/jabber.c:1808
+msgstr "part [kamer]:  Verlaat die kamer."
+
+#: ../libpurple/protocols/jabber/jabber.c:1840
 msgid "register:  Register with a chat room."
-msgstr ""
-
-#: ../libpurple/protocols/jabber/jabber.c:1814
+msgstr "register:  Registreer met 'n geselsiekamer."
+
+#: ../libpurple/protocols/jabber/jabber.c:1846
 msgid "topic [new topic]:  View or change the topic."
 msgstr "topic [nuwe onderwerp]:  Bekyk of verander die onderwerp."
 
-#: ../libpurple/protocols/jabber/jabber.c:1820
+#: ../libpurple/protocols/jabber/jabber.c:1852
 msgid "ban &lt;user&gt; [room]:  Ban a user from the room."
 msgstr "ban &lt;gebruiker&gt; [kamer]:  Verban 'n gebruiker uit die kamer."
 
-#: ../libpurple/protocols/jabber/jabber.c:1826
+#: ../libpurple/protocols/jabber/jabber.c:1858
 msgid ""
 "affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Set a user's "
 "affiliation with the room."
 msgstr ""
-
-#: ../libpurple/protocols/jabber/jabber.c:1832
+"affiliate &lt;gebruiker&gt; &lt;eienaar|admin|lid|verworpene|geen&gt;: Stel "
+"'n gebruiker se affiliasie met die kamer in."
+
+#: ../libpurple/protocols/jabber/jabber.c:1864
 msgid ""
 "role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: Set a user's "
 "role in the room."
 msgstr ""
-
-#: ../libpurple/protocols/jabber/jabber.c:1838
+"role &lt;gebruiker&gt; &lt;moderator|deelnemer|besoeker|geen&gt;: Stel 'n "
+"gebruiker se rol in die kamer in."
+
+#: ../libpurple/protocols/jabber/jabber.c:1870
 msgid "invite &lt;user&gt; [message]:  Invite a user to the room."
-msgstr "invite &lt;gebruiker&gt; [boodskap]:  Nooi 'n gebruiker uit na die kamer."
-
-#: ../libpurple/protocols/jabber/jabber.c:1844
+msgstr ""
+"invite &lt;gebruiker&gt; [boodskap]:  Nooi 'n gebruiker uit na die kamer."
+
+#: ../libpurple/protocols/jabber/jabber.c:1876
 msgid "join: &lt;room&gt; [server]:  Join a chat on this server."
-msgstr "join: &lt;kamer&gt; [bediener]:  Sluit by 'n geselsie aan op hierdie bediener."
-
-#: ../libpurple/protocols/jabber/jabber.c:1850
+msgstr ""
+"join: &lt;kamer&gt; [bediener]:  Sluit by 'n geselsie aan op hierdie "
+"bediener."
+
+#: ../libpurple/protocols/jabber/jabber.c:1882
 msgid "kick &lt;user&gt; [room]:  Kick a user from the room."
-msgstr ""
-
-#: ../libpurple/protocols/jabber/jabber.c:1855
+msgstr "kick &lt;gebruiker&gt; [kamer]:  Skop 'n gebruiker uit die kamer."
+
+#: ../libpurple/protocols/jabber/jabber.c:1887
 msgid ""
 "msg &lt;user&gt; &lt;message&gt;:  Send a private message to another user."
 msgstr ""
+"msg &lt;gebruiker&gt; &lt;boodskap&gt;:  Stuur 'n private boodskap aan 'n "
+"ander gebruiker."
 
 #. *< type
 #. *< ui_requirement
@@ -4884,111 +5256,148 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/jabber/jabber.c:1972
-#: ../libpurple/protocols/jabber/jabber.c:1974
-msgid "Jabber Protocol Plugin"
-msgstr "Inprop vir die Jabber-protokol"
-
-#: ../libpurple/protocols/jabber/jabber.c:2000
+#: ../libpurple/protocols/jabber/libxmpp.c:169
+#: ../libpurple/protocols/jabber/libxmpp.c:171
+msgid "XMPP Protocol Plugin"
+msgstr "XMPP-protokolinprop"
+
+#. Translators: 'domain' is used here in the context of Internet domains, e.g. pidgin.im
+#: ../libpurple/protocols/jabber/libxmpp.c:198 ../pidgin/gtkaccount.c:508
+msgid "Domain"
+msgstr "Domein"
+
+#: ../libpurple/protocols/jabber/libxmpp.c:206
 msgid "Force old (port 5223) SSL"
-msgstr "forseer ou (poort 5223-) SSL"
-
-#: ../libpurple/protocols/jabber/jabber.c:2005
+msgstr "Dwing ou SSL (poort 5223)"
+
+#: ../libpurple/protocols/jabber/libxmpp.c:211
 msgid "Allow plaintext auth over unencrypted streams"
-msgstr ""
-
-#: ../libpurple/protocols/jabber/jabber.c:2010
-#: ../libpurple/protocols/simple/simple.c:1842
+msgstr "Laat skoonteksstawing oor ongeënkripteerde strome toe"
+
+#: ../libpurple/protocols/jabber/libxmpp.c:216
+#: ../libpurple/protocols/simple/simple.c:1861
 msgid "Connect port"
 msgstr "Verbindingspoort"
 
 #. Account options
-#: ../libpurple/protocols/jabber/jabber.c:2014
-#: ../libpurple/protocols/silc/silc.c:1846
+#: ../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 ""
-
-#: ../libpurple/protocols/jabber/message.c:155
+msgstr "Verbind bediener"
+
+#: ../libpurple/protocols/jabber/message.c:102
+#, c-format
+msgid "%s has left the conversation."
+msgstr "%s het die gesprek verlaat."
+
+#: ../libpurple/protocols/jabber/message.c:153
 #, c-format
 msgid "Message from %s"
 msgstr "Boodskap van %s"
 
-#: ../libpurple/protocols/jabber/message.c:219
+#: ../libpurple/protocols/jabber/message.c:217
 #, c-format
 msgid "%s has set the topic to: %s"
 msgstr "%s het die onderwerp gestel na: %s"
 
-#: ../libpurple/protocols/jabber/message.c:221
+#: ../libpurple/protocols/jabber/message.c:219
 #, c-format
 msgid "The topic is: %s"
 msgstr "Die onderwerp is: %s"
 
-#: ../libpurple/protocols/jabber/message.c:269
+#: ../libpurple/protocols/jabber/message.c:267
 #, c-format
 msgid "Message delivery to %s failed: %s"
 msgstr "Boodskapaflewering na %s het misluk: %s"
 
-#: ../libpurple/protocols/jabber/message.c:272
-msgid "Jabber Message Error"
-msgstr "Jabber-boodskapfout"
-
-#: ../libpurple/protocols/jabber/message.c:352
+#: ../libpurple/protocols/jabber/message.c:270
+msgid "XMPP Message Error"
+msgstr "XMPP-foutboodskap"
+
+#: ../libpurple/protocols/jabber/message.c:359
 #, c-format
 msgid " (Code %s)"
 msgstr " (Kode %s)"
 
 #: ../libpurple/protocols/jabber/parser.c:193
 msgid "XML Parse error"
-msgstr ""
-
-#: ../libpurple/protocols/jabber/presence.c:282
+msgstr "XML-ontleedfout"
+
+#: ../libpurple/protocols/jabber/presence.c:292
 msgid "Unknown Error in presence"
-msgstr ""
-
-#: ../libpurple/protocols/jabber/presence.c:356
-#: ../libpurple/protocols/jabber/presence.c:357
+msgstr "Onbekende fout in teenwoordigheid"
+
+#: ../libpurple/protocols/jabber/presence.c:366
+#: ../libpurple/protocols/jabber/presence.c:367
 msgid "Create New Room"
 msgstr "Skep nuwe kamer"
 
-#: ../libpurple/protocols/jabber/presence.c:358
+#: ../libpurple/protocols/jabber/presence.c:368
 msgid ""
 "You are creating a new room.  Would you like to configure it, or accept the "
 "default settings?"
 msgstr ""
 "U skep 'n nuwe kamer.  Wil u dit opstel of die verstekinstellings aanvaar?"
 
-#: ../libpurple/protocols/jabber/presence.c:361
+#: ../libpurple/protocols/jabber/presence.c:374
 msgid "_Configure Room"
 msgstr "_Stel kamer op"
 
-#: ../libpurple/protocols/jabber/presence.c:363
+#: ../libpurple/protocols/jabber/presence.c:375
 msgid "_Accept Defaults"
 msgstr "_Aanvaar verstek"
 
-#: ../libpurple/protocols/jabber/presence.c:401
+#: ../libpurple/protocols/jabber/presence.c:417
 #, c-format
 msgid "Error in chat %s"
 msgstr "Fout in geselsie %s"
 
-#: ../libpurple/protocols/jabber/presence.c:404
+#: ../libpurple/protocols/jabber/presence.c:421
 #, c-format
 msgid "Error joining chat %s"
 msgstr "Fout met aansluiting by geselsie %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 "Kan nie lêer stuur aan %s nie: die gebruiker steun nie lêeroordrag nie"
 
-#: ../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 "Lêerversending het misluk"
 
+#: ../libpurple/protocols/jabber/si.c:832
+#, c-format
+msgid "Unable to send file to %s, invalid JID"
+msgstr "Kan nie lêer aan %s stuur nie, ongeldige JID"
+
+#: ../libpurple/protocols/jabber/si.c:834
+#, c-format
+msgid "Unable to send file to %s, user is not online"
+msgstr "Kan nie lêer stuur aan %s nie, gebruiker nie aanlyn nie"
+
+#: ../libpurple/protocols/jabber/si.c:836
+#, c-format
+msgid "Unable to send file to %s, not subscribed to user presence"
+msgstr ""
+"Kan nie lêer stuur aan %s nie, nie by gebruikerteenwoordigheid ingeteken nie"
+
+#: ../libpurple/protocols/jabber/si.c:851
+#, c-format
+msgid "Please select which resource of %s you would like to send a file to"
+msgstr "Kies asb. aan watter hulpbron van %s u 'n lêer wil stuur"
+
+#: ../libpurple/protocols/jabber/si.c:867
+msgid "Select a Resource"
+msgstr "Kies 'n hulpbron"
+
 #: ../libpurple/protocols/msn/dialog.c:110
 #, c-format
 msgid "Buddy list synchronization issue in %s (%s)"
-msgstr ""
+msgstr "Vriendelys-sinchronisasieprobleem in %s (%s)"
 
 #: ../libpurple/protocols/msn/dialog.c:116
 #, c-format
@@ -4996,6 +5405,8 @@
 "%s on the local list is inside the group \"%s\" but not on the server list. "
 "Do you want this buddy to be added?"
 msgstr ""
+"%s op die plaaslike lys is binne die groep \"%s\" maar nie op die "
+"bedienerlys nie. Wil u hierdie vriend byvoeg?"
 
 #: ../libpurple/protocols/msn/dialog.c:124
 #, c-format
@@ -5003,14 +5414,16 @@
 "%s is on the local list but not on the server list. Do you want this buddy "
 "to be added?"
 msgstr ""
+"%s op die plaaslike lys maar nie op die bedienerlys nie. Wil u hierdie "
+"vriend byvoeg?"
 
 #: ../libpurple/protocols/msn/error.c:36
 msgid "Unable to parse message"
-msgstr ""
+msgstr "Kon nie boodskap ontleed nie"
 
 #: ../libpurple/protocols/msn/error.c:41
 msgid "Syntax Error (probably a client bug)"
-msgstr ""
+msgstr "Sintaksfout (dalk 'n kliëntfout)"
 
 #: ../libpurple/protocols/msn/error.c:46
 msgid "Invalid e-mail address"
@@ -5022,7 +5435,7 @@
 
 #: ../libpurple/protocols/msn/error.c:53
 msgid "Fully qualified domain name missing"
-msgstr ""
+msgstr "Volledig gekwalifiseerde domeinnaam word vermis"
 
 #: ../libpurple/protocols/msn/error.c:56
 msgid "Already logged in"
@@ -5034,7 +5447,7 @@
 
 #: ../libpurple/protocols/msn/error.c:62
 msgid "Invalid friendly name"
-msgstr ""
+msgstr "Ongeldige vriendelike naam"
 
 #: ../libpurple/protocols/msn/error.c:65
 msgid "List full"
@@ -5055,11 +5468,11 @@
 
 #: ../libpurple/protocols/msn/error.c:78
 msgid "Already in the mode"
-msgstr ""
+msgstr "Reeds in die modus"
 
 #: ../libpurple/protocols/msn/error.c:82
 msgid "Already in opposite list"
-msgstr ""
+msgstr "Reeds in teenoorgestelde-lys"
 
 #: ../libpurple/protocols/msn/error.c:86
 msgid "Too many groups"
@@ -5091,15 +5504,15 @@
 
 #: ../libpurple/protocols/msn/error.c:111
 msgid "Notify transfer failed"
-msgstr ""
+msgstr "Laat weet oordrag het misluk"
 
 #: ../libpurple/protocols/msn/error.c:116
 msgid "Required fields missing"
-msgstr "Benodigde velde kort"
+msgstr "Vereiste velde kort"
 
 #: ../libpurple/protocols/msn/error.c:120
 msgid "Too many hits to a FND"
-msgstr ""
+msgstr "Te veel resultate vir 'n FND"
 
 #: ../libpurple/protocols/msn/error.c:124
 #: ../libpurple/protocols/oscar/oscar.c:119
@@ -5120,15 +5533,15 @@
 
 #: ../libpurple/protocols/msn/error.c:139
 msgid "File operation error"
-msgstr ""
+msgstr "Lêerbewerkingsfout"
 
 #: ../libpurple/protocols/msn/error.c:143
 msgid "Memory allocation error"
-msgstr ""
+msgstr "Geheuetoekenningsfout"
 
 #: ../libpurple/protocols/msn/error.c:147
 msgid "Wrong CHL value sent to server"
-msgstr ""
+msgstr "Verkeerde CHL-waarde aan bediener gestuur"
 
 #: ../libpurple/protocols/msn/error.c:152
 msgid "Server busy"
@@ -5142,7 +5555,7 @@
 
 #: ../libpurple/protocols/msn/error.c:158
 msgid "Peer notification server down"
-msgstr ""
+msgstr "Ewekniekennisstel-bediener af"
 
 #: ../libpurple/protocols/msn/error.c:162
 msgid "Database connect error"
@@ -5150,7 +5563,7 @@
 
 #: ../libpurple/protocols/msn/error.c:167
 msgid "Server is going down (abandon ship)"
-msgstr ""
+msgstr "Bediener dreig om te val (verlaat die skip)"
 
 #: ../libpurple/protocols/msn/error.c:174
 msgid "Error creating connection"
@@ -5158,7 +5571,7 @@
 
 #: ../libpurple/protocols/msn/error.c:179
 msgid "CVR parameters are either unknown or not allowed"
-msgstr ""
+msgstr "CVR-parameters is óf onbekend óf nie toegelaat nie"
 
 #: ../libpurple/protocols/msn/error.c:183
 msgid "Unable to write"
@@ -5178,424 +5591,436 @@
 
 #: ../libpurple/protocols/msn/error.c:196
 msgid "Passport not verified"
-msgstr ""
+msgstr "Paspoort nie geverifieer nie"
 
 #: ../libpurple/protocols/msn/error.c:199
 msgid "Bad friend file"
-msgstr ""
+msgstr "Slegte vriendlêer"
 
 #: ../libpurple/protocols/msn/error.c:203
 msgid "Not expected"
-msgstr ""
+msgstr "Nie verwag nie"
 
 #: ../libpurple/protocols/msn/error.c:209
 msgid "Friendly name changes too rapidly"
-msgstr ""
+msgstr "Vriendelike naam verander te vinnig"
 
 #: ../libpurple/protocols/msn/error.c:218
 msgid "Server too busy"
-msgstr ""
+msgstr "Bediener te besig"
 
 #: ../libpurple/protocols/msn/error.c:222
-#: ../libpurple/protocols/oscar/oscar.c:1357
-#: ../libpurple/protocols/silc/ops.c:1718 ../libpurple/protocols/toc/toc.c:728
-#: ../libpurple/proxy.c:1351
+#: ../libpurple/protocols/oscar/oscar.c:1378
+#: ../libpurple/protocols/silc/silc.c:233
+#: ../libpurple/protocols/silc10/ops.c:1709
+#: ../libpurple/protocols/toc/toc.c:728 ../libpurple/proxy.c:1363
 msgid "Authentication failed"
-msgstr "Magtiging het misluk"
+msgstr "Stawing het misluk"
 
 #: ../libpurple/protocols/msn/error.c:225
 msgid "Not allowed when offline"
-msgstr ""
+msgstr "Nie toegelaat wanneer aflyn nie"
 
 #: ../libpurple/protocols/msn/error.c:233
 msgid "Not accepting new users"
-msgstr ""
+msgstr "Aanvaar nie nuwe gebruikers nie"
 
 #: ../libpurple/protocols/msn/error.c:237
 msgid "Kids Passport without parental consent"
-msgstr ""
+msgstr "Kinderwagwoord sonder ouertoestemming"
 
 #: ../libpurple/protocols/msn/error.c:241
 msgid "Passport account not yet verified"
-msgstr ""
+msgstr "Wagwoordrekening nog nie geverifieer nie"
 
 #: ../libpurple/protocols/msn/error.c:244
 msgid "Bad ticket"
-msgstr ""
+msgstr "Slegte kaartjie"
 
 #: ../libpurple/protocols/msn/error.c:249
 #, c-format
 msgid "Unknown Error Code %d"
-msgstr ""
+msgstr "Onbekende foutkode %d"
 
 #: ../libpurple/protocols/msn/error.c:263
 #, c-format
 msgid "MSN Error: %s\n"
 msgstr "MSN-fout: %s\n"
 
-#: ../libpurple/protocols/msn/msn.c:112
+#: ../libpurple/protocols/msn/msn.c:121
 msgid "You have just sent a Nudge!"
-msgstr ""
-
-#: ../libpurple/protocols/msn/msn.c:137
+msgstr "U het so pas 'n stootjie gestuur!"
+
+#: ../libpurple/protocols/msn/msn.c:146
 msgid "Your new MSN friendly name is too long."
-msgstr ""
-
-#: ../libpurple/protocols/msn/msn.c:245
+msgstr "U nuwe MSN- vriendelike naam is te lank."
+
+#: ../libpurple/protocols/msn/msn.c:254
 msgid "Set your friendly name."
-msgstr ""
-
-#: ../libpurple/protocols/msn/msn.c:246
+msgstr "Stel u vriendelike naam in."
+
+#: ../libpurple/protocols/msn/msn.c:255
 msgid "This is the name that other MSN buddies will see you as."
-msgstr ""
-
-#: ../libpurple/protocols/msn/msn.c:262
+msgstr "Hierdie is die naam hoe ander MSN-vriende u sal sien."
+
+#: ../libpurple/protocols/msn/msn.c:273
 msgid "Set your home phone number."
-msgstr ""
-
-#: ../libpurple/protocols/msn/msn.c:277
+msgstr "Stel u huisfoonnommer op."
+
+#: ../libpurple/protocols/msn/msn.c:290
 msgid "Set your work phone number."
-msgstr ""
-
-#: ../libpurple/protocols/msn/msn.c:292
+msgstr "Stel u werkfoonnommer op."
+
+#: ../libpurple/protocols/msn/msn.c:307
 msgid "Set your mobile phone number."
-msgstr ""
-
-#: ../libpurple/protocols/msn/msn.c:305
+msgstr "Stel u selfoonnommer op."
+
+#: ../libpurple/protocols/msn/msn.c:322
 msgid "Allow MSN Mobile pages?"
-msgstr ""
-
-#: ../libpurple/protocols/msn/msn.c:306
+msgstr "Laat MSN-selfoonbladsye toe?"
+
+#: ../libpurple/protocols/msn/msn.c:323
 msgid ""
 "Do you want to allow or disallow people on your buddy list to send you MSN "
 "Mobile pages to your cell phone or other mobile device?"
 msgstr ""
-
-#: ../libpurple/protocols/msn/msn.c:310
+"Wil u toelaat of weier dat mense op u vriendelys vir u MSN-selfoonbladsye na "
+"u selfoon of ander mobiele toestel stuur?"
+
+#: ../libpurple/protocols/msn/msn.c:329
 msgid "Allow"
-msgstr ""
-
-#: ../libpurple/protocols/msn/msn.c:311
+msgstr "Toelaat"
+
+#: ../libpurple/protocols/msn/msn.c:330
 msgid "Disallow"
-msgstr ""
-
-#: ../libpurple/protocols/msn/msn.c:327
+msgstr "Weier"
+
+#: ../libpurple/protocols/msn/msn.c:346
 msgid "This Hotmail account may not be active."
-msgstr ""
-
-#: ../libpurple/protocols/msn/msn.c:353
+msgstr "Hierdie Hotmail-rekening is dalk nie aktief nie."
+
+#: ../libpurple/protocols/msn/msn.c:372
 msgid "Send a mobile message."
-msgstr ""
-
-#: ../libpurple/protocols/msn/msn.c:355
+msgstr "Stuur 'n selfoonboodskap."
+
+#: ../libpurple/protocols/msn/msn.c:374
 msgid "Page"
-msgstr ""
-
-#: ../libpurple/protocols/msn/msn.c:518
+msgstr "Bladsy"
+
+#: ../libpurple/protocols/msn/msn.c:521
 msgid "Has you"
-msgstr ""
-
-#: ../libpurple/protocols/msn/msn.c:548 ../libpurple/protocols/msn/state.c:33
-#: ../libpurple/protocols/yahoo/yahoo.c:2876
-#: ../libpurple/protocols/yahoo/yahoo.c:3480
+msgstr "Het u"
+
+#: ../libpurple/protocols/msn/msn.c:551 ../libpurple/protocols/msn/state.c:33
+#: ../libpurple/protocols/yahoo/yahoo.c:2916
+#: ../libpurple/protocols/yahoo/yahoo.c:3600
 msgid "Be Right Back"
 msgstr "Binnekort terug"
 
-#: ../libpurple/protocols/msn/msn.c:552 ../libpurple/protocols/msn/state.c:31
-#: ../libpurple/protocols/novell/novell.c:2823
-#: ../libpurple/protocols/novell/novell.c:2953
-#: ../libpurple/protocols/silc/buddy.c:1473
-#: ../libpurple/protocols/silc/silc.c:47
-#: ../libpurple/protocols/yahoo/yahoo.c:2878
-#: ../libpurple/protocols/yahoo/yahoo.c:3483
+#: ../libpurple/protocols/msn/msn.c:555 ../libpurple/protocols/msn/state.c:31
+#: ../libpurple/protocols/novell/novell.c:2822
+#: ../libpurple/protocols/novell/novell.c:2952
+#: ../libpurple/protocols/silc/buddy.c:1480
+#: ../libpurple/protocols/silc/silc.c:56
+#: ../libpurple/protocols/silc10/buddy.c:1480
+#: ../libpurple/protocols/silc10/silc.c:47
+#: ../libpurple/protocols/yahoo/yahoo.c:2918
+#: ../libpurple/protocols/yahoo/yahoo.c:3603
 msgid "Busy"
 msgstr "Besig"
 
-#: ../libpurple/protocols/msn/msn.c:556
-#: ../libpurple/protocols/yahoo/yahoo.c:2886
-#: ../libpurple/protocols/yahoo/yahoo.c:3495
+#: ../libpurple/protocols/msn/msn.c:559
+#: ../libpurple/protocols/yahoo/yahoo.c:2926
+#: ../libpurple/protocols/yahoo/yahoo.c:3615
 msgid "On the Phone"
 msgstr "Op die foon"
 
-#: ../libpurple/protocols/msn/msn.c:560
-#: ../libpurple/protocols/yahoo/yahoo.c:2890
-#: ../libpurple/protocols/yahoo/yahoo.c:3501
+#: ../libpurple/protocols/msn/msn.c:563
+#: ../libpurple/protocols/yahoo/yahoo.c:2930
+#: ../libpurple/protocols/yahoo/yahoo.c:3621
 msgid "Out to Lunch"
 msgstr "Uit vir ete"
 
-#: ../libpurple/protocols/msn/msn.c:588
+#: ../libpurple/protocols/msn/msn.c:591
 msgid "Set Friendly Name..."
-msgstr ""
-
-#: ../libpurple/protocols/msn/msn.c:593
+msgstr "Stel vriendelike naam..."
+
+#: ../libpurple/protocols/msn/msn.c:596
 msgid "Set Home Phone Number..."
-msgstr ""
-
-#: ../libpurple/protocols/msn/msn.c:597
+msgstr "Stel huisfoonnommer..."
+
+#: ../libpurple/protocols/msn/msn.c:600
 msgid "Set Work Phone Number..."
-msgstr ""
-
-#: ../libpurple/protocols/msn/msn.c:601
+msgstr "Stel werkfoonnommer op...."
+
+#: ../libpurple/protocols/msn/msn.c:604
 msgid "Set Mobile Phone Number..."
-msgstr ""
-
-#: ../libpurple/protocols/msn/msn.c:607
+msgstr "Stel selfoonnommer..."
+
+#: ../libpurple/protocols/msn/msn.c:610
 msgid "Enable/Disable Mobile Devices..."
-msgstr ""
-
-#: ../libpurple/protocols/msn/msn.c:612
+msgstr "Aktiveer/deaktiveer mobiele toestelle..."
+
+#: ../libpurple/protocols/msn/msn.c:615
 msgid "Allow/Disallow Mobile Pages..."
-msgstr ""
-
-#: ../libpurple/protocols/msn/msn.c:622
+msgstr "Laat toe/weier selfoonbladsye..."
+
+#: ../libpurple/protocols/msn/msn.c:626
 msgid "Open Hotmail Inbox"
-msgstr ""
-
-#: ../libpurple/protocols/msn/msn.c:646
+msgstr "Open Hotmail-inkassie"
+
+#: ../libpurple/protocols/msn/msn.c:650
 msgid "Send to Mobile"
-msgstr ""
-
-#: ../libpurple/protocols/msn/msn.c:656
-#: ../libpurple/protocols/novell/novell.c:3409
+msgstr "Stuur na selfoon"
+
+#: ../libpurple/protocols/msn/msn.c:660
+#: ../libpurple/protocols/novell/novell.c:3408
 msgid "Initiate _Chat"
-msgstr ""
-
-#: ../libpurple/protocols/msn/msn.c:694
+msgstr "Inisieer _geselsie"
+
+#: ../libpurple/protocols/msn/msn.c:698
 msgid "SSL support is needed for MSN. Please install a supported SSL library."
 msgstr ""
-
-#: ../libpurple/protocols/msn/msn.c:719
+"SSL-ondersteuning is nodig vir MSN. Installeer asb. 'n ondersteunde SSL-"
+"programmateek."
+
+#: ../libpurple/protocols/msn/msn.c:723
 msgid "Failed to connect to server."
-msgstr ""
-
-#: ../libpurple/protocols/msn/msn.c:1439 ../libpurple/protocols/msn/msn.c:1784
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:784
+msgstr "Om te verbind aan bediener, het misluk."
+
+#: ../libpurple/protocols/msn/msn.c:1479 ../libpurple/protocols/msn/msn.c:1827
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:808
 msgid "Error retrieving profile"
-msgstr ""
-
-#: ../libpurple/protocols/msn/msn.c:1510 ../pidgin/plugins/convcolors.c:309
-#: ../pidgin/plugins/pidginrc.c:448
+msgstr "Fout met verkry van profiel"
+
+#: ../libpurple/protocols/msn/msn.c:1550 ../pidgin/plugins/convcolors.c:309
+#: ../pidgin/plugins/pidginrc.c:366
 msgid "General"
 msgstr "Algemeen"
 
-#: ../libpurple/protocols/msn/msn.c:1517
-#: ../libpurple/protocols/oscar/oscar.c:3757
+#: ../libpurple/protocols/msn/msn.c:1557
+#: ../libpurple/protocols/oscar/oscar.c:3723
 #: ../libpurple/protocols/qq/buddy_info.c:45
-#: ../libpurple/protocols/qq/qq.c:219
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1057
+#: ../libpurple/protocols/qq/qq.c:221
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1081
 msgid "Age"
 msgstr "Ouderdom"
 
-#: ../libpurple/protocols/msn/msn.c:1519
+#: ../libpurple/protocols/msn/msn.c:1559
 #: ../libpurple/protocols/qq/buddy_info.c:51
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1072
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1096
 msgid "Occupation"
 msgstr "Beroep"
 
-#: ../libpurple/protocols/msn/msn.c:1520
+#: ../libpurple/protocols/msn/msn.c:1560
 #: ../libpurple/protocols/novell/novell.c:1478
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1052
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1076
 #: ../libpurple/protocols/zephyr/zephyr.c:798
-#: ../libpurple/protocols/zephyr/zephyr.c:1214
+#: ../libpurple/protocols/zephyr/zephyr.c:1215
 msgid "Location"
 msgstr "Ligging"
 
-#: ../libpurple/protocols/msn/msn.c:1525 ../libpurple/protocols/msn/msn.c:1717
-#: ../libpurple/protocols/msn/msn.c:1723 ../libpurple/protocols/msn/msn.c:1730
+#: ../libpurple/protocols/msn/msn.c:1565 ../libpurple/protocols/msn/msn.c:1757
+#: ../libpurple/protocols/msn/msn.c:1763 ../libpurple/protocols/msn/msn.c:1770
 msgid "Hobbies and Interests"
 msgstr "Stokperdjies en belangstellings"
 
-#: ../libpurple/protocols/msn/msn.c:1531 ../libpurple/protocols/msn/msn.c:1651
-#: ../libpurple/protocols/msn/msn.c:1657 ../libpurple/protocols/msn/msn.c:1664
-#: ../libpurple/protocols/msn/msn.c:1672 ../libpurple/protocols/msn/msn.c:1679
+#: ../libpurple/protocols/msn/msn.c:1571 ../libpurple/protocols/msn/msn.c:1691
+#: ../libpurple/protocols/msn/msn.c:1697 ../libpurple/protocols/msn/msn.c:1704
+#: ../libpurple/protocols/msn/msn.c:1712 ../libpurple/protocols/msn/msn.c:1719
 msgid "A Little About Me"
-msgstr ""
-
-#: ../libpurple/protocols/msn/msn.c:1548
+msgstr "Iets meer oor my"
+
+#: ../libpurple/protocols/msn/msn.c:1588
 msgid "Social"
-msgstr ""
-
-#: ../libpurple/protocols/msn/msn.c:1550
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1062
+msgstr "Sosiaal"
+
+#: ../libpurple/protocols/msn/msn.c:1590
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1086
 msgid "Marital Status"
 msgstr "Huwelikstatus"
 
-#: ../libpurple/protocols/msn/msn.c:1551
+#: ../libpurple/protocols/msn/msn.c:1591
 msgid "Interests"
 msgstr "Belangstellings"
 
-#: ../libpurple/protocols/msn/msn.c:1552
+#: ../libpurple/protocols/msn/msn.c:1592
 msgid "Pets"
 msgstr "Troeteldiere"
 
-#: ../libpurple/protocols/msn/msn.c:1553
+#: ../libpurple/protocols/msn/msn.c:1593
 msgid "Hometown"
 msgstr "Tuisdorp"
 
-#: ../libpurple/protocols/msn/msn.c:1554
+#: ../libpurple/protocols/msn/msn.c:1594
 msgid "Places Lived"
 msgstr "Plekke gewoon"
 
-#: ../libpurple/protocols/msn/msn.c:1555
+#: ../libpurple/protocols/msn/msn.c:1595
 msgid "Fashion"
 msgstr "Mode"
 
-#: ../libpurple/protocols/msn/msn.c:1556
+#: ../libpurple/protocols/msn/msn.c:1596
 msgid "Humor"
 msgstr "Humor"
 
-#: ../libpurple/protocols/msn/msn.c:1557
+#: ../libpurple/protocols/msn/msn.c:1597
 msgid "Music"
 msgstr "Musiek"
 
-#: ../libpurple/protocols/msn/msn.c:1558 ../libpurple/protocols/msn/msn.c:1739
-#: ../libpurple/protocols/msn/msn.c:1745
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1114
+#: ../libpurple/protocols/msn/msn.c:1598 ../libpurple/protocols/msn/msn.c:1779
+#: ../libpurple/protocols/msn/msn.c:1785
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1138
 msgid "Favorite Quote"
 msgstr "Gunsteling aanhaling"
 
-#: ../libpurple/protocols/msn/msn.c:1575
+#: ../libpurple/protocols/msn/msn.c:1615
 msgid "Contact Info"
 msgstr "Kontakinligting"
 
-#: ../libpurple/protocols/msn/msn.c:1576
+#: ../libpurple/protocols/msn/msn.c:1616
 msgid "Personal"
 msgstr "Persoonlik"
 
-#: ../libpurple/protocols/msn/msn.c:1579
+#: ../libpurple/protocols/msn/msn.c:1619
 msgid "Significant Other"
-msgstr ""
-
-#: ../libpurple/protocols/msn/msn.c:1580
+msgstr "Ega"
+
+#: ../libpurple/protocols/msn/msn.c:1620
 msgid "Home Phone"
 msgstr "Huistelefoon"
 
-#: ../libpurple/protocols/msn/msn.c:1581
+#: ../libpurple/protocols/msn/msn.c:1621
 msgid "Home Phone 2"
 msgstr "Huistelefoon 2"
 
-#: ../libpurple/protocols/msn/msn.c:1582
-#: ../libpurple/protocols/oscar/oscar.c:3795
+#: ../libpurple/protocols/msn/msn.c:1622
+#: ../libpurple/protocols/oscar/oscar.c:3761
 msgid "Home Address"
 msgstr "Huisadres"
 
-#: ../libpurple/protocols/msn/msn.c:1583
+#: ../libpurple/protocols/msn/msn.c:1623
 msgid "Personal Mobile"
 msgstr "Persoonlike sel"
 
-#: ../libpurple/protocols/msn/msn.c:1584
+#: ../libpurple/protocols/msn/msn.c:1624
 msgid "Home Fax"
 msgstr "Huisfaks"
 
-#: ../libpurple/protocols/msn/msn.c:1585
+#: ../libpurple/protocols/msn/msn.c:1625
 msgid "Personal E-Mail"
 msgstr "Persoonlike e-pos"
 
-#: ../libpurple/protocols/msn/msn.c:1586
+#: ../libpurple/protocols/msn/msn.c:1626
 msgid "Personal IM"
 msgstr "Persoonlike kitsboodskappe"
 
-#: ../libpurple/protocols/msn/msn.c:1588
+#: ../libpurple/protocols/msn/msn.c:1628
 msgid "Anniversary"
 msgstr "Herdenking"
 
 #. Business
-#: ../libpurple/protocols/msn/msn.c:1604
+#: ../libpurple/protocols/msn/msn.c:1644
 msgid "Work"
 msgstr "Werk"
 
-#: ../libpurple/protocols/msn/msn.c:1606
-#: ../libpurple/protocols/silc/ops.c:1044
+#: ../libpurple/protocols/msn/msn.c:1646
+#: ../libpurple/protocols/silc/ops.c:1010
+#: ../libpurple/protocols/silc10/ops.c:1044
 msgid "Job Title"
-msgstr ""
-
-#: ../libpurple/protocols/msn/msn.c:1607
-#: ../libpurple/protocols/oscar/oscar.c:3816
+msgstr "Postitel"
+
+#: ../libpurple/protocols/msn/msn.c:1647
+#: ../libpurple/protocols/oscar/oscar.c:3782
 msgid "Company"
 msgstr "Maatskappy"
 
-#: ../libpurple/protocols/msn/msn.c:1608
+#: ../libpurple/protocols/msn/msn.c:1648
 #: ../libpurple/protocols/novell/novell.c:1480
 msgid "Department"
 msgstr "Departement"
 
-#: ../libpurple/protocols/msn/msn.c:1609
+#: ../libpurple/protocols/msn/msn.c:1649
 msgid "Profession"
 msgstr "Prefessie"
 
-#: ../libpurple/protocols/msn/msn.c:1610
+#: ../libpurple/protocols/msn/msn.c:1650
 msgid "Work Phone"
 msgstr "Werktelefoon"
 
-#: ../libpurple/protocols/msn/msn.c:1611
+#: ../libpurple/protocols/msn/msn.c:1651
 msgid "Work Phone 2"
 msgstr "Werktelefoon 2"
 
-#: ../libpurple/protocols/msn/msn.c:1612
-#: ../libpurple/protocols/oscar/oscar.c:3808
+#: ../libpurple/protocols/msn/msn.c:1652
+#: ../libpurple/protocols/oscar/oscar.c:3774
 msgid "Work Address"
 msgstr "Werkadres"
 
-#: ../libpurple/protocols/msn/msn.c:1613
+#: ../libpurple/protocols/msn/msn.c:1653
 msgid "Work Mobile"
 msgstr "Werksel"
 
-#: ../libpurple/protocols/msn/msn.c:1614
+#: ../libpurple/protocols/msn/msn.c:1654
 msgid "Work Pager"
-msgstr ""
-
-#: ../libpurple/protocols/msn/msn.c:1615
+msgstr "Werkroeper"
+
+#: ../libpurple/protocols/msn/msn.c:1655
 msgid "Work Fax"
 msgstr "Werkfaks"
 
-#: ../libpurple/protocols/msn/msn.c:1616
+#: ../libpurple/protocols/msn/msn.c:1656
 msgid "Work E-Mail"
 msgstr "Werks-e-pos"
 
-#: ../libpurple/protocols/msn/msn.c:1617
+#: ../libpurple/protocols/msn/msn.c:1657
 msgid "Work IM"
 msgstr "Werkkitsboodskappe"
 
-#: ../libpurple/protocols/msn/msn.c:1618
+#: ../libpurple/protocols/msn/msn.c:1658
 msgid "Start Date"
 msgstr "Begindatum"
 
-#: ../libpurple/protocols/msn/msn.c:1688 ../libpurple/protocols/msn/msn.c:1694
-#: ../libpurple/protocols/msn/msn.c:1701 ../libpurple/protocols/msn/msn.c:1708
+#: ../libpurple/protocols/msn/msn.c:1728 ../libpurple/protocols/msn/msn.c:1734
+#: ../libpurple/protocols/msn/msn.c:1741 ../libpurple/protocols/msn/msn.c:1748
 msgid "Favorite Things"
-msgstr ""
-
-#: ../libpurple/protocols/msn/msn.c:1753
+msgstr "Gunsteling-dinge"
+
+#: ../libpurple/protocols/msn/msn.c:1793
 msgid "Last Updated"
 msgstr "Laas opgedateer"
 
-#: ../libpurple/protocols/msn/msn.c:1764
+#: ../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 "Tuisblad"
 
-#: ../libpurple/protocols/msn/msn.c:1785
+#: ../libpurple/protocols/msn/msn.c:1828
 msgid "The user has not created a public profile."
 msgstr "Die gebruiker het nie 'n publieke profiel geskep nie."
 
-#: ../libpurple/protocols/msn/msn.c:1786
+#: ../libpurple/protocols/msn/msn.c:1829
 msgid ""
 "MSN reported not being able to find the user's profile. This either means "
 "that the user does not exist, or that the user exists but has not created a "
 "public profile."
 msgstr ""
-
-#: ../libpurple/protocols/msn/msn.c:1790
+"MSN sê dit kan nie die gebruiker se profiel kry nie. Dit beteken óf dat die "
+"gebruiker nie bestaan nie, of dat die gebruiker wel bestaan maar nie 'n "
+"publieke profiel geskep het nie."
+
+#: ../libpurple/protocols/msn/msn.c:1833
 msgid ""
 "Could not find any information in the user's profile. The user most likely "
 "does not exist."
 msgstr ""
-"Kon geen inligting in die gebruiker se profiel kry nie. Heel "
-"waarskynlik bestaan die gebruiker nie."
-
-#: ../libpurple/protocols/msn/msn.c:1798
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1216
+"Kon geen inligting in die gebruiker se profiel kry nie. Heel waarskynlik "
+"bestaan die gebruiker nie."
+
+#: ../libpurple/protocols/msn/msn.c:1841
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1240
 msgid "Profile URL"
 msgstr "Profiel-URL"
 
@@ -5609,21 +6034,21 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/msn/msn.c:2078 ../libpurple/protocols/msn/msn.c:2080
+#: ../libpurple/protocols/msn/msn.c:2127 ../libpurple/protocols/msn/msn.c:2129
 msgid "MSN Protocol Plugin"
 msgstr "MSN-protokolinprop"
 
-#: ../libpurple/protocols/msn/msn.c:2108
+#: ../libpurple/protocols/msn/msn.c:2163
 msgid "Use HTTP Method"
 msgstr "Gebruik HTTP-metode"
 
-#: ../libpurple/protocols/msn/msn.c:2113
+#: ../libpurple/protocols/msn/msn.c:2168
 msgid "Show custom smileys"
 msgstr "Wys pasgemaakte gesiggies"
 
-#: ../libpurple/protocols/msn/msn.c:2121
+#: ../libpurple/protocols/msn/msn.c:2176
 msgid "nudge: nudge a user to get their attention"
-msgstr ""
+msgstr "nudge: gee 'n gebruiker 'n stootjie om sy aandag te trek"
 
 #: ../libpurple/protocols/msn/nexus.c:146
 #: ../libpurple/protocols/msn/servconn.c:133
@@ -5640,19 +6065,19 @@
 #: ../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 "Kon nie verbind nie"
 
 #: ../libpurple/protocols/msn/notification.c:178
 #, c-format
 msgid "%s is not a valid group."
-msgstr ""
+msgstr "%s is nie 'n geldige groep nie."
 
 #: ../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 "Onbekende fout."
 
@@ -5664,41 +6089,41 @@
 #: ../libpurple/protocols/msn/notification.c:498
 #, c-format
 msgid "Unable to add user on %s (%s)"
-msgstr ""
+msgstr "Kan nie gebruiker by %s byvoeg nie (%s)"
 
 #: ../libpurple/protocols/msn/notification.c:502
 #, c-format
 msgid "Unable to block user on %s (%s)"
-msgstr ""
+msgstr "Kan nie gebruiker op %s blokkeer nie (%s)"
 
 #: ../libpurple/protocols/msn/notification.c:506
 #, c-format
 msgid "Unable to permit user on %s (%s)"
-msgstr ""
+msgstr "Kan nie gebruiker op %s toelaat nie (%s)"
 
 #: ../libpurple/protocols/msn/notification.c:514
 #, c-format
 msgid "%s could not be added because your buddy list is full."
-msgstr ""
+msgstr "%s kon nie bygevoeg word nie omdat u vriendelys vol is."
 
 #: ../libpurple/protocols/msn/notification.c:523
 #, c-format
 msgid "%s is not a valid passport account."
-msgstr ""
+msgstr "%s is nie 'n geldige paspoortrekening nie."
 
 #: ../libpurple/protocols/msn/notification.c:528
 msgid "Service Temporarily Unavailable."
 msgstr "Diens tydelik nie beskikbaar nie."
 
-#: ../libpurple/protocols/msn/notification.c:823
+#: ../libpurple/protocols/msn/notification.c:851
 msgid "Unable to rename group"
 msgstr "Kan nie groep hernoem nie"
 
-#: ../libpurple/protocols/msn/notification.c:878
+#: ../libpurple/protocols/msn/notification.c:906
 msgid "Unable to delete group"
 msgstr "Kan nie groep uitvee nie"
 
-#: ../libpurple/protocols/msn/notification.c:1314
+#: ../libpurple/protocols/msn/notification.c:1325
 #, c-format
 msgid ""
 "The MSN server will shut down for maintenance in %d minute. You will "
@@ -5715,7 +6140,15 @@
 "After the maintenance has been completed, you will be able to successfully "
 "sign in."
 msgstr[0] ""
+"Die MSN-bediener sal in %d minuut afskakel vir onderhoud. U sal dan "
+"outomaties afgemeld word.  Maak asb. enige gesprekke wat besig is, klaar.\n"
+"\n"
+"Nadat die onderhoud afgehandel is, sal u suksesvol kan aanmeld."
 msgstr[1] ""
+"Die MSN-bediener sal in %d minute afskakel vir onderhoud. U sal dan "
+"outomaties afgemeld word.  Maak asb. enige gesprekke wat besig is, klaar.\n"
+"\n"
+"Nadat die onderhoud afgehandel is, sal u suksesvol kan aanmeld."
 
 #: ../libpurple/protocols/msn/servconn.c:135
 msgid "Writing error"
@@ -5731,6 +6164,8 @@
 "Connection error from %s server:\n"
 "%s"
 msgstr ""
+"Verbindingfout van %s bediener:\n"
+"%s"
 
 #: ../libpurple/protocols/msn/session.c:299
 msgid "Our protocol is not supported by the server."
@@ -5738,11 +6173,11 @@
 
 #: ../libpurple/protocols/msn/session.c:303
 msgid "Error parsing HTTP."
-msgstr ""
+msgstr "Fout met ontleed van HTTP."
 
 #: ../libpurple/protocols/msn/session.c:307
-#: ../libpurple/protocols/oscar/oscar.c:3469
-#: ../libpurple/protocols/yahoo/yahoo.c:201
+#: ../libpurple/protocols/oscar/flap_connection.c:384
+#: ../libpurple/protocols/yahoo/yahoo.c:205
 msgid "You have signed on from another location."
 msgstr "U het van 'n ander plek aangemeld."
 
@@ -5753,36 +6188,37 @@
 
 #: ../libpurple/protocols/msn/session.c:315
 msgid "The MSN servers are going down temporarily."
-msgstr ""
-
-#: ../libpurple/protocols/msn/session.c:319
+msgstr "Die MSN-bedieners sal tydelik afskakel."
+
+#: ../libpurple/protocols/msn/session.c:320
 #, c-format
 msgid "Unable to authenticate: %s"
-msgstr ""
-
-#: ../libpurple/protocols/msn/session.c:324
+msgstr "Kon nie magtig nie: %s"
+
+#: ../libpurple/protocols/msn/session.c:325
 msgid ""
 "Your MSN buddy list is temporarily unavailable. Please wait and try again."
-msgstr "U MSN-vriendelys is tydelik nie beskikbaar nie. Wag asb. en probeer weer."
-
-#: ../libpurple/protocols/msn/session.c:345
-#: ../libpurple/protocols/msn/session.c:347
+msgstr ""
+"U MSN-vriendelys is tydelik nie beskikbaar nie. Wag asb. en probeer weer."
+
+#: ../libpurple/protocols/msn/session.c:346
+#: ../libpurple/protocols/msn/session.c:348
 msgid "Handshaking"
-msgstr ""
-
-#: ../libpurple/protocols/msn/session.c:348
-msgid "Starting authentication"
-msgstr ""
+msgstr "Bladskud"
 
 #: ../libpurple/protocols/msn/session.c:349
+msgid "Starting authentication"
+msgstr "Begin stawing"
+
+#: ../libpurple/protocols/msn/session.c:350
 msgid "Getting cookie"
 msgstr "Kry tans koekie"
 
-#: ../libpurple/protocols/msn/session.c:351
+#: ../libpurple/protocols/msn/session.c:352
 msgid "Sending cookie"
 msgstr "Stuur tans koekie"
 
-#: ../libpurple/protocols/msn/session.c:352
+#: ../libpurple/protocols/msn/session.c:353
 msgid "Retrieving buddy list"
 msgstr "Kry tans vriendelys"
 
@@ -5800,196 +6236,211 @@
 
 #: ../libpurple/protocols/msn/switchboard.c:400
 msgid "Message may have not been sent because a timeout occurred:"
-msgstr ""
+msgstr "Boodskap is dalk nie gestuur nie vanweë 'n uittelling:"
 
 #: ../libpurple/protocols/msn/switchboard.c:408
 msgid "Message could not be sent, not allowed while invisible:"
-msgstr ""
+msgstr "Boodskap kon nie gestuur word nie, nie toegelaat terwyl onsigbaar nie:"
 
 #: ../libpurple/protocols/msn/switchboard.c:412
 msgid "Message could not be sent because the user is offline:"
-msgstr ""
+msgstr "Boodskap kon nie gestuur word nie omdat die gebruiker aflyn is:"
 
 #: ../libpurple/protocols/msn/switchboard.c:416
 msgid "Message could not be sent because a connection error occurred:"
 msgstr ""
+"Boodskap kon nie gestuur word nie omdat 'n verbindingfout plaasgevind het:"
 
 #: ../libpurple/protocols/msn/switchboard.c:420
 msgid "Message could not be sent because we are sending too quickly:"
-msgstr ""
+msgstr "Boodskap kon nie gestuur word nie omdat ons te vinnig stuur:"
 
 #: ../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 ""
+"Boodskap kon nie gestuur word nie omdat ons nie 'n sessie met die bediener "
+"kon bewerkstellig nie. Dis waarskynlik 'n bedienerprobleem; probeer weer na "
+"'n paar minute:"
+
+#: ../libpurple/protocols/msn/switchboard.c:431
+msgid ""
 "Message could not be sent because an error with the switchboard occurred:"
 msgstr ""
-
-#: ../libpurple/protocols/msn/switchboard.c:432
+"Boodskap kon nie gestuur word nie omdat 'n fout met die skakelbord "
+"plaasgevind het:"
+
+#: ../libpurple/protocols/msn/switchboard.c:439
 msgid "Message may have not been sent because an unknown error occurred:"
-msgstr ""
-
-#: ../libpurple/protocols/msn/switchboard.c:956
+msgstr "Boodskap is dalk nie gestuur nie vanweë 'n onbekende fout:"
+
+#: ../libpurple/protocols/msn/switchboard.c:963
 #, c-format
 msgid "%s just sent you a Nudge!"
-msgstr ""
-
-#: ../libpurple/protocols/msn/userlist.c:250
+msgstr "%s het u so pas 'n stootjie gestuur!"
+
+#: ../libpurple/protocols/msn/userlist.c:252
 #, c-format
 msgid "%s has added you to his or her buddy list."
 msgstr "%s het u by sy of haar vriendelys gevoeg."
 
-#: ../libpurple/protocols/msn/userlist.c:319
+#: ../libpurple/protocols/msn/userlist.c:321
 #, c-format
 msgid "%s has removed you from his or her buddy list."
 msgstr "%s het u van sy of haar vriendelys verwyder."
 
-#: ../libpurple/protocols/msn/userlist.c:641
+#: ../libpurple/protocols/msn/userlist.c:643
 #, c-format
 msgid "Unable to add \"%s\"."
 msgstr "Kan nie \"%s\" byvoeg nie."
 
-#: ../libpurple/protocols/msn/userlist.c:643
+#: ../libpurple/protocols/msn/userlist.c:645
 msgid "The screen name specified is invalid."
-msgstr ""
-
-#: ../libpurple/protocols/novell/nmuser.c:1878
+msgstr "Die gespesifiseerde skermnaam is ongeldig."
+
+#: ../libpurple/protocols/novell/nmuser.c:1864
 msgid "Required parameters not passed in"
-msgstr ""
-
-#: ../libpurple/protocols/novell/nmuser.c:1881
+msgstr "Vereiste parameters nie aangegee nie"
+
+#: ../libpurple/protocols/novell/nmuser.c:1867
 msgid "Unable to write to network"
-msgstr ""
+msgstr "Kan nie op netwerk skryf nie"
+
+#: ../libpurple/protocols/novell/nmuser.c:1870
+msgid "Unable to read from network"
+msgstr "Kan nie vanaf netwerk lees nie"
+
+#: ../libpurple/protocols/novell/nmuser.c:1873
+msgid "Error communicating with server"
+msgstr "Fout met kommunikasie met bediener"
+
+#: ../libpurple/protocols/novell/nmuser.c:1877
+msgid "Conference not found"
+msgstr "Konferensie nie gevind nie"
+
+#: ../libpurple/protocols/novell/nmuser.c:1880
+msgid "Conference does not exist"
+msgstr "Konferensie bestaan nie"
 
 #: ../libpurple/protocols/novell/nmuser.c:1884
-msgid "Unable to read from network"
-msgstr ""
+msgid "A folder with that name already exists"
+msgstr "'n Gids met daardie naam bestaan reeds"
 
 #: ../libpurple/protocols/novell/nmuser.c:1887
-msgid "Error communicating with server"
-msgstr ""
+msgid "Not supported"
+msgstr "Nie ondersteun nie"
 
 #: ../libpurple/protocols/novell/nmuser.c:1891
-msgid "Conference not found"
-msgstr "Konferensie nie gevind nie"
+msgid "Password has expired"
+msgstr "Wagwoord het verval"
 
 #: ../libpurple/protocols/novell/nmuser.c:1894
-msgid "Conference does not exist"
-msgstr "Konferensie bestaan nie"
-
-#: ../libpurple/protocols/novell/nmuser.c:1898
-msgid "A folder with that name already exists"
-msgstr "'n Gids met daardie naam bestaan reeds"
-
-#: ../libpurple/protocols/novell/nmuser.c:1901
-msgid "Not supported"
-msgstr ""
-
-#: ../libpurple/protocols/novell/nmuser.c:1905
-msgid "Password has expired"
-msgstr "Wagwoord het verval"
-
-#: ../libpurple/protocols/novell/nmuser.c:1908
 msgid "Incorrect password"
 msgstr "Verkeerde wagwoord"
 
-#: ../libpurple/protocols/novell/nmuser.c:1911
+#: ../libpurple/protocols/novell/nmuser.c:1897
 msgid "User not found"
 msgstr "Gebruiker nie gevind nie"
 
-#: ../libpurple/protocols/novell/nmuser.c:1914
+#: ../libpurple/protocols/novell/nmuser.c:1900
 msgid "Account has been disabled"
 msgstr "Rekening gedeaktiveer"
 
-#: ../libpurple/protocols/novell/nmuser.c:1917
+#: ../libpurple/protocols/novell/nmuser.c:1903
 msgid "The server could not access the directory"
-msgstr ""
-
-#: ../libpurple/protocols/novell/nmuser.c:1920
+msgstr "Die bediener kon nie toegang tot die gids kry nie"
+
+#: ../libpurple/protocols/novell/nmuser.c:1906
 msgid "Your system administrator has disabled this operation"
-msgstr ""
-
-#: ../libpurple/protocols/novell/nmuser.c:1923
+msgstr "U stelseladministrateur het hierdie bewerking gedeaktiveer"
+
+#: ../libpurple/protocols/novell/nmuser.c:1909
 msgid "The server is unavailable; try again later"
-msgstr ""
-
-#: ../libpurple/protocols/novell/nmuser.c:1926
+msgstr "Die bediener is nie beskikbaar nie; probeer later weer"
+
+#: ../libpurple/protocols/novell/nmuser.c:1912
 msgid "Cannot add a contact to the same folder twice"
-msgstr ""
-
-#: ../libpurple/protocols/novell/nmuser.c:1929
+msgstr "Kan nie 'n kontak twee keer by dieselfde gids voeg nie"
+
+#: ../libpurple/protocols/novell/nmuser.c:1915
 msgid "Cannot add yourself"
-msgstr ""
-
-#: ../libpurple/protocols/novell/nmuser.c:1932
+msgstr "Kan nie uself byvoeg nie"
+
+#: ../libpurple/protocols/novell/nmuser.c:1918
 msgid "Master archive is misconfigured"
-msgstr ""
-
-#: ../libpurple/protocols/novell/nmuser.c:1936
+msgstr "Meesterargief is gewankonfigureer"
+
+#: ../libpurple/protocols/novell/nmuser.c:1922
 msgid "Incorrect screen name or password"
 msgstr "Verkeerde skermnaam of wagwoord"
 
-#: ../libpurple/protocols/novell/nmuser.c:1939
+#: ../libpurple/protocols/novell/nmuser.c:1925
 msgid "Could not recognize the host of the screen name you entered"
-msgstr ""
-
-#: ../libpurple/protocols/novell/nmuser.c:1942
+msgstr "Kon nie die gasheer van die skermnaam herken wat u gegee het nie"
+
+#: ../libpurple/protocols/novell/nmuser.c:1928
 msgid ""
 "Your account has been disabled because too many incorrect passwords were "
 "entered"
-msgstr ""
-
-#: ../libpurple/protocols/novell/nmuser.c:1945
+msgstr "U rekening is gedeaktiveer omdat te veel verkeerde wagwoorde gegee is"
+
+#: ../libpurple/protocols/novell/nmuser.c:1931
 msgid "You cannot add the same person twice to a conversation"
-msgstr ""
-
-#: ../libpurple/protocols/novell/nmuser.c:1949
+msgstr "U kan nie dieselfde persoon twee keer by 'n geselsie voeg nie"
+
+#: ../libpurple/protocols/novell/nmuser.c:1935
 msgid "You have reached your limit for the number of contacts allowed"
-msgstr ""
-
-#: ../libpurple/protocols/novell/nmuser.c:1952
+msgstr "U het u limiet vir die getal toegelate kontakte bereik"
+
+#: ../libpurple/protocols/novell/nmuser.c:1938
 msgid "You have entered an incorrect screen name"
-msgstr ""
-
-#: ../libpurple/protocols/novell/nmuser.c:1955
+msgstr "U het 'n verkeerde skermnaam gegee"
+
+#: ../libpurple/protocols/novell/nmuser.c:1941
 msgid "An error occurred while updating the directory"
 msgstr "'n Fout het voorgekom met die opdatering van die gids"
 
-#: ../libpurple/protocols/novell/nmuser.c:1958
+#: ../libpurple/protocols/novell/nmuser.c:1944
 msgid "Incompatible protocol version"
-msgstr ""
-
-#: ../libpurple/protocols/novell/nmuser.c:1961
+msgstr "Onversoenbare protokolweergawe"
+
+#: ../libpurple/protocols/novell/nmuser.c:1947
 msgid "The user has blocked you"
-msgstr ""
-
-#: ../libpurple/protocols/novell/nmuser.c:1964
+msgstr "Die gebruiker het u geblokkeer"
+
+#: ../libpurple/protocols/novell/nmuser.c:1950
 msgid ""
 "This evaluation version does not allow more than ten users to log in at one "
 "time"
 msgstr ""
-
-#: ../libpurple/protocols/novell/nmuser.c:1967
+"Hierdie evalueringsweergawe laat nie meer as tien gebruikers toe om gelyk "
+"aan te meld nie"
+
+#: ../libpurple/protocols/novell/nmuser.c:1953
 msgid "The user is either offline or you are blocked"
-msgstr ""
-
-#: ../libpurple/protocols/novell/nmuser.c:1970
+msgstr "Die gebruiker is óf aflyn óf het u geblokkeer"
+
+#: ../libpurple/protocols/novell/nmuser.c:1956
 #, c-format
 msgid "Unknown error: 0x%X"
-msgstr ""
+msgstr "Onbekende fout: 0x%X"
 
 #: ../libpurple/protocols/novell/novell.c:124
 #, c-format
 msgid "Login failed (%s)."
-msgstr ""
+msgstr "Aanmelding het misluk (%s)."
 
 #: ../libpurple/protocols/novell/novell.c:247
 #, c-format
 msgid "Unable to send message. Could not get details for user (%s)."
 msgstr ""
+"Kan nie boodskap stuur nie. Kon nie die detail vir gebruiker kry nie (%s)."
 
 #: ../libpurple/protocols/novell/novell.c:396
 #, c-format
 msgid "Unable to add %s to your buddy list (%s)."
-msgstr ""
+msgstr "Kon nie %s by u vriendelys voeg nie (%s)."
 
 #. TODO: Improve this! message to who or for what conference?
 #: ../libpurple/protocols/novell/novell.c:422
@@ -6001,17 +6452,18 @@
 #: ../libpurple/protocols/novell/novell.c:985
 #, c-format
 msgid "Unable to invite user (%s)."
-msgstr ""
+msgstr "Kon nie gebruiker uitnooi nie (%s)."
 
 #: ../libpurple/protocols/novell/novell.c:532
 #, c-format
 msgid "Unable to send message to %s. Could not create the conference (%s)."
 msgstr ""
+"Kan nie boodskap stuur aan %s nie. Kon nie die konferensie skep nie (%s)."
 
 #: ../libpurple/protocols/novell/novell.c:537
 #, c-format
 msgid "Unable to send message. Could not create the conference (%s)."
-msgstr ""
+msgstr "Kan nie boodskap stuur nie. Kon nie die konferensie skep nie (%s)."
 
 #: ../libpurple/protocols/novell/novell.c:584
 #, c-format
@@ -6019,6 +6471,8 @@
 "Unable to move user %s to folder %s in the server side list. Error while "
 "creating folder (%s)."
 msgstr ""
+"Kon nie gebruiker %s na gids %s in die bedienerkantlys skuif nie. Fout "
+"terwyl gids geskep is (%s)."
 
 #: ../libpurple/protocols/novell/novell.c:632
 #, c-format
@@ -6026,65 +6480,67 @@
 "Unable to add %s to your buddy list. Error creating folder in server side "
 "list (%s)."
 msgstr ""
+"Kan nie %s by u vriendelys voeg nie. Fout met skep van gids in "
+"bedienerkantlys (%s)."
 
 #: ../libpurple/protocols/novell/novell.c:705
 #, c-format
 msgid "Could not get details for user %s (%s)."
-msgstr ""
+msgstr "Kon nie detail vir gebruiker %s kry nie (%s)."
 
 #: ../libpurple/protocols/novell/novell.c:751
 #: ../libpurple/protocols/novell/novell.c:897
 #, c-format
 msgid "Unable to add user to privacy list (%s)."
-msgstr ""
+msgstr "Kan nie gebruiker by privaat lys voeg nie (%s)."
 
 #: ../libpurple/protocols/novell/novell.c:798
 #, c-format
 msgid "Unable to add %s to deny list (%s)."
-msgstr ""
+msgstr "Kan nie %s by weierlys voeg nie (%s)."
 
 #: ../libpurple/protocols/novell/novell.c:851
 #, c-format
 msgid "Unable to add %s to permit list (%s)."
-msgstr ""
+msgstr "Kan nie %s by toelaatlys voeg nie (%s)."
 
 #: ../libpurple/protocols/novell/novell.c:919
 #, c-format
 msgid "Unable to remove %s from privacy list (%s)."
-msgstr ""
+msgstr "Kan nie %s uit privaat lys verwyder nie (%s)."
 
 #: ../libpurple/protocols/novell/novell.c:942
-#: ../libpurple/protocols/novell/novell.c:1650
+#: ../libpurple/protocols/novell/novell.c:1647
 #, c-format
 msgid "Unable to change server side privacy settings (%s)."
-msgstr ""
+msgstr "Kon nie bedienerkant-privaatheidinstellings verander nie (%s)."
 
 #: ../libpurple/protocols/novell/novell.c:1012
 #, c-format
 msgid "Unable to create conference (%s)."
-msgstr ""
+msgstr "Kan nie konferensie skep nie (%s)."
 
 #: ../libpurple/protocols/novell/novell.c:1121
-#: ../libpurple/protocols/novell/novell.c:1695
+#: ../libpurple/protocols/novell/novell.c:1692
 msgid "Error communicating with server. Closing connection."
-msgstr ""
+msgstr "Fout met kommunikasie met bediener. Verbinding word gesluit."
 
 #: ../libpurple/protocols/novell/novell.c:1476
 msgid "Telephone Number"
-msgstr ""
+msgstr "Telefoonnommer"
 
 #: ../libpurple/protocols/novell/novell.c:1482
 msgid "Personal Title"
-msgstr ""
+msgstr "Persoonlike titel"
 
 #: ../libpurple/protocols/novell/novell.c:1486
 msgid "Mailstop"
-msgstr ""
-
-#: ../libpurple/protocols/novell/novell.c:1505
-#: ../libpurple/protocols/sametime/sametime.c:4121
+msgstr "Mailstop"
+
+#: ../libpurple/protocols/novell/novell.c:1502
+#: ../libpurple/protocols/sametime/sametime.c:4123
 msgid "User ID"
-msgstr ""
+msgstr "Gebruiker-ID"
 
 #. tag = _("DN");
 #. value = nm_user_record_get_dn(user_record);
@@ -6092,80 +6548,88 @@
 #. purple_notify_user_info_add_pair(user_info, tag, value);
 #. }
 #.
-#: ../libpurple/protocols/novell/novell.c:1518
+#: ../libpurple/protocols/novell/novell.c:1515
 msgid "Full name"
 msgstr "Volle name"
 
-#: ../libpurple/protocols/novell/novell.c:1640
+#: ../libpurple/protocols/novell/novell.c:1637
 #, c-format
 msgid "GroupWise Conference %d"
-msgstr ""
-
-#: ../libpurple/protocols/novell/novell.c:1671
+msgstr "GroupWise-konferensie %d"
+
+#: ../libpurple/protocols/novell/novell.c:1668
 msgid "Unable to make SSL connection to server."
-msgstr ""
-
-#: ../libpurple/protocols/novell/novell.c:1723
+msgstr "Kan nie SSL-verbinding aan bediener bewerkstellig nie."
+
+#: ../libpurple/protocols/novell/novell.c:1720
 msgid "Authenticating..."
 msgstr "Staaf tans..."
 
+#: ../libpurple/protocols/novell/novell.c:1732
+msgid "Unable to connect to server."
+msgstr "Kan nie aan bediener verbind nie."
+
 #: ../libpurple/protocols/novell/novell.c:1735
-msgid "Unable to connect to server."
-msgstr "Kan nie aan bediener verbind nie."
-
-#: ../libpurple/protocols/novell/novell.c:1738
 msgid "Waiting for response..."
 msgstr "Wag vir antwoord..."
 
-#: ../libpurple/protocols/novell/novell.c:1873
+#: ../libpurple/protocols/novell/novell.c:1870
 #, c-format
 msgid "%s has been invited to this conversation."
-msgstr ""
-
-#: ../libpurple/protocols/novell/novell.c:1901
+msgstr "%s is na hierdie gesprek genooi."
+
+#: ../libpurple/protocols/novell/novell.c:1898
 msgid "Invitation to Conversation"
-msgstr ""
-
-#: ../libpurple/protocols/novell/novell.c:1902
+msgstr "Uitnodiging na gesprek"
+
+#: ../libpurple/protocols/novell/novell.c:1899
 #, c-format
 msgid ""
 "Invitation from: %s\n"
 "\n"
 "Sent: %s"
 msgstr ""
-
-#: ../libpurple/protocols/novell/novell.c:1904
+"Uitnodiging van: %s\n"
+"\n"
+"Gestuur: %s"
+
+#: ../libpurple/protocols/novell/novell.c:1901
 msgid "Would you like to join the conversation?"
-msgstr ""
+msgstr "Wil u by die gesprek aansluit?"
 
 #. we don't want to reconnect in this case
-#: ../libpurple/protocols/novell/novell.c:2013
+#: ../libpurple/protocols/novell/novell.c:2012
 msgid "You have been logged out because you logged in at another workstation."
-msgstr ""
-
-#: ../libpurple/protocols/novell/novell.c:2070
+msgstr "U is afgemeld omdat u by 'n ander werkstasie aangemeld het."
+
+#: ../libpurple/protocols/novell/novell.c:2069
 #, c-format
 msgid ""
 "%s appears to be offline and did not receive the message that you just sent."
 msgstr ""
+"%s blyk aflyn te wees, en nie die boodskap ontvang het wat u nou net gestuur "
+"het nie."
 
 #. TODO: Would be nice to prompt if not set!
 #. *  purple_request_fields(gc, _("Server Address"),...);
 #.
 #. ...but for now just error out with a nice message.
-#: ../libpurple/protocols/novell/novell.c:2168
+#: ../libpurple/protocols/novell/novell.c:2167
 msgid ""
 "Unable to connect to server. Please enter the address of the server you wish "
 "to connect to."
 msgstr ""
-
-#: ../libpurple/protocols/novell/novell.c:2196
+"Kan nie aan bediener verbind nie. Gee asb. die adres van die bediener "
+"waaraan u wil verbind."
+
+#: ../libpurple/protocols/novell/novell.c:2195
 msgid "Error. SSL support is not installed."
-msgstr ""
-
-#: ../libpurple/protocols/novell/novell.c:2505
+msgstr "Fout. SSL-ondersteuning nie geïnstalleer nie."
+
+#: ../libpurple/protocols/novell/novell.c:2504
 msgid "This conference has been closed. No more messages can be sent."
 msgstr ""
+"Hierdie konferensie is gesluit. Geen verdere boodskappe kan gestuur word nie."
 
 #. *< type
 #. *< ui_requirement
@@ -6177,33 +6641,33 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/novell/novell.c:3514
-#: ../libpurple/protocols/novell/novell.c:3516
+#: ../libpurple/protocols/novell/novell.c:3518
+#: ../libpurple/protocols/novell/novell.c:3520
 msgid "Novell GroupWise Messenger Protocol Plugin"
-msgstr ""
-
-#: ../libpurple/protocols/novell/novell.c:3535
+msgstr "Inprop vir Novell GroupWise-boodskapperprotokol"
+
+#: ../libpurple/protocols/novell/novell.c:3545
 msgid "Server address"
 msgstr "Bedieneradres"
 
-#: ../libpurple/protocols/novell/novell.c:3539
+#: ../libpurple/protocols/novell/novell.c:3549
 msgid "Server port"
 msgstr "Bedienerpoort"
 
-#: ../libpurple/protocols/oscar/flap_connection.c:379
-#: ../libpurple/protocols/yahoo/yahoo.c:2287
-#: ../libpurple/protocols/yahoo/yahoo.c:2446
+#: ../libpurple/protocols/oscar/flap_connection.c:387
+#: ../libpurple/protocols/yahoo/yahoo.c:2313
+#: ../libpurple/protocols/yahoo/yahoo.c:2480
 #: ../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 "Bediener het die verbinding toegemaak."
 
-#: ../libpurple/protocols/oscar/flap_connection.c:381
-#: ../libpurple/protocols/yahoo/yahoo.c:2281
-#: ../libpurple/protocols/yahoo/yahoo.c:2440 ../libpurple/proxy.c:592
-#: ../libpurple/proxy.c:1097 ../libpurple/proxy.c:1208
-#: ../libpurple/proxy.c:1308 ../libpurple/proxy.c:1436
+#: ../libpurple/protocols/oscar/flap_connection.c:389
+#: ../libpurple/protocols/yahoo/yahoo.c:2307
+#: ../libpurple/protocols/yahoo/yahoo.c:2474 ../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"
@@ -6212,21 +6676,12 @@
 "Verbinding met bediener verloor:\n"
 "%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/protocols/oscar/flap_connection.c:392
+#: ../libpurple/proxy.c:1128 ../libpurple/proxy.c:1233
+#: ../libpurple/proxy.c:1332 ../libpurple/proxy.c:1404
+#: ../libpurple/proxy.c:1461
 msgid "Received invalid data on connection with server."
-msgstr ""
-
-#: ../libpurple/protocols/oscar/flap_connection.c:386
-#, c-format
-msgid ""
-"Could not establish a connection with the server:\n"
-"%s"
-msgstr ""
-"Kon nie 'n verbinding met die bediener bewerkstellig nie:\n"
-"%s"
+msgstr "Het ongeldige data ontvang toe met bediener verbind is."
 
 #. *< type
 #. *< ui_requirement
@@ -6238,8 +6693,8 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/oscar/libaim.c:112
-#: ../libpurple/protocols/oscar/libaim.c:114
+#: ../libpurple/protocols/oscar/libaim.c:118
+#: ../libpurple/protocols/oscar/libaim.c:120
 msgid "AIM Protocol Plugin"
 msgstr "AIM-protokolinprop"
 
@@ -6253,33 +6708,33 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/oscar/libicq.c:112
-#: ../libpurple/protocols/oscar/libicq.c:114
+#: ../libpurple/protocols/oscar/libicq.c:118
+#: ../libpurple/protocols/oscar/libicq.c:120
 msgid "ICQ Protocol Plugin"
 msgstr "ICQ-protokolinprop"
 
-#: ../libpurple/protocols/oscar/libicq.c:135
-#: ../libpurple/protocols/yahoo/yahoo.c:4069
-#: ../libpurple/protocols/zephyr/zephyr.c:2984
+#: ../libpurple/protocols/oscar/libicq.c:147
+#: ../libpurple/protocols/yahoo/yahoo.c:4213
+#: ../libpurple/protocols/zephyr/zephyr.c:2997
 msgid "Encoding"
 msgstr "Enkodering"
 
 #: ../libpurple/protocols/oscar/odc.c:40
 msgid "The remote user has closed the connection."
-msgstr ""
+msgstr "Die afgeleë gebruiker het die verbinding gesluit."
 
 #: ../libpurple/protocols/oscar/odc.c:42
 msgid "The remote user has declined your request."
-msgstr ""
+msgstr "Die afgeleë gebruiker het u versoek van die hand gewys."
 
 #: ../libpurple/protocols/oscar/odc.c:44
 #, c-format
 msgid "Lost connection with the remote user:<br>%s"
-msgstr ""
+msgstr "Verbinding met die afgeleë gebruiker verloor:<br>%s"
 
 #: ../libpurple/protocols/oscar/odc.c:47
 msgid "Received invalid data on connection with remote user."
-msgstr ""
+msgstr "Het ongeldige data ontvang toe met afgeleë gebruiker verbind is."
 
 #: ../libpurple/protocols/oscar/odc.c:49
 msgid "Could not establish a connection with the remote user."
@@ -6287,12 +6742,12 @@
 
 #: ../libpurple/protocols/oscar/odc.c:560
 msgid "Direct IM established"
-msgstr ""
+msgstr "Direkte kitsboodskap bewerkstellig"
 
 #: ../libpurple/protocols/oscar/oft.c:657
 #, c-format
 msgid "File %s is %s, which is larger than the maximum size of %s."
-msgstr ""
+msgstr "Lêer %s is %s, wat groter as die maksimum grootte %s is."
 
 #: ../libpurple/protocols/oscar/oscar.c:115
 msgid "Invalid error"
@@ -6300,15 +6755,15 @@
 
 #: ../libpurple/protocols/oscar/oscar.c:116
 msgid "Invalid SNAC"
-msgstr ""
+msgstr "Ongeldige SNAC"
 
 #: ../libpurple/protocols/oscar/oscar.c:117
 msgid "Rate to host"
-msgstr ""
+msgstr "Koers na gasheer"
 
 #: ../libpurple/protocols/oscar/oscar.c:118
 msgid "Rate to client"
-msgstr ""
+msgstr "Koers na kliënt"
 
 #: ../libpurple/protocols/oscar/oscar.c:120
 msgid "Service unavailable"
@@ -6320,7 +6775,7 @@
 
 #: ../libpurple/protocols/oscar/oscar.c:122
 msgid "Obsolete SNAC"
-msgstr ""
+msgstr "Verouderde SNAC"
 
 #: ../libpurple/protocols/oscar/oscar.c:123
 msgid "Not supported by host"
@@ -6340,31 +6795,31 @@
 
 #: ../libpurple/protocols/oscar/oscar.c:127
 msgid "Responses lost"
-msgstr ""
+msgstr "Reaksies verloor"
 
 #: ../libpurple/protocols/oscar/oscar.c:128
 msgid "Request denied"
-msgstr ""
+msgstr "Versoek geweier"
 
 #: ../libpurple/protocols/oscar/oscar.c:129
 msgid "Busted SNAC payload"
-msgstr ""
+msgstr "Gebreekte SNAC-afvoer"
 
 #: ../libpurple/protocols/oscar/oscar.c:130
 msgid "Insufficient rights"
-msgstr ""
+msgstr "Onvoldoende regte"
 
 #: ../libpurple/protocols/oscar/oscar.c:131
 msgid "In local permit/deny"
-msgstr ""
+msgstr "In plaaslike toelaat/weier"
 
 #: ../libpurple/protocols/oscar/oscar.c:132
 msgid "Too evil (sender)"
-msgstr ""
+msgstr "Te naar (sender)"
 
 #: ../libpurple/protocols/oscar/oscar.c:133
 msgid "Too evil (receiver)"
-msgstr ""
+msgstr "Te naar (ontvanger)"
 
 #: ../libpurple/protocols/oscar/oscar.c:134
 msgid "User temporarily unavailable"
@@ -6372,11 +6827,11 @@
 
 #: ../libpurple/protocols/oscar/oscar.c:135
 msgid "No match"
-msgstr ""
+msgstr "Geen passing nie"
 
 #: ../libpurple/protocols/oscar/oscar.c:136
 msgid "List overflow"
-msgstr ""
+msgstr "Lysoorvloed"
 
 #: ../libpurple/protocols/oscar/oscar.c:137
 msgid "Request ambiguous"
@@ -6384,297 +6839,317 @@
 
 #: ../libpurple/protocols/oscar/oscar.c:138
 msgid "Queue full"
-msgstr ""
+msgstr "Tou vol"
 
 #: ../libpurple/protocols/oscar/oscar.c:139
 msgid "Not while on AOL"
-msgstr ""
-
-#: ../libpurple/protocols/oscar/oscar.c:329
+msgstr "Nie terwyl op AOL nie"
+
+#: ../libpurple/protocols/oscar/oscar.c:347
 msgid ""
 "(There was an error receiving this message.  The buddy you are speaking with "
 "is probably using a different encoding than expected.  If you know what "
 "encoding he is using, you can specify it in the advanced account options for "
 "your AIM/ICQ account.)"
 msgstr ""
-
-#: ../libpurple/protocols/oscar/oscar.c:438
+"(Daar was 'n fout met ontvangs van hierdie boodskap.  Die vriend met wie u "
+"praat, gebruik waarskynlik 'n ander enkodering as verwag.  Indien u weet "
+"watter enkodering hy gebruik, kan u dit in die gevorderde rekeningkeuses van "
+"u AIM/ICQ-rekening spesifiseer.)"
+
+#: ../libpurple/protocols/oscar/oscar.c:456
 #, c-format
 msgid ""
 "(There was an error receiving this message.  Either you and %s have "
 "different encodings selected, or %s has a buggy client.)"
 msgstr ""
+"(Daar was 'n fout met ontvangs van hierdie boodskap.  Óf u en %s het "
+"verskillende enkoderings gekies, óf %s het 'n vrotterige kliënt.)"
 
 #. Label
-#: ../libpurple/protocols/oscar/oscar.c:620 ../pidgin/gtkutils.c:2335
-#: ../pidgin/gtkutils.c:2357
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:338
+#: ../libpurple/protocols/oscar/oscar.c:638 ../pidgin/gtkutils.c:2376
+#: ../pidgin/gtkutils.c:2406
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:334
 msgid "Buddy Icon"
 msgstr "Vriendikoon"
 
-#: ../libpurple/protocols/oscar/oscar.c:623
+#: ../libpurple/protocols/oscar/oscar.c:641
 msgid "Voice"
 msgstr "Stem"
 
-#: ../libpurple/protocols/oscar/oscar.c:626
+#: ../libpurple/protocols/oscar/oscar.c:644
 msgid "AIM Direct IM"
-msgstr ""
-
-#: ../libpurple/protocols/oscar/oscar.c:629
-#: ../libpurple/protocols/silc/silc.c:687
-#: ../libpurple/protocols/silc/util.c:549
+msgstr "AIM- direkte kitsboodskap"
+
+#: ../libpurple/protocols/oscar/oscar.c:647
+#: ../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 "Gesels"
-
-#: ../libpurple/protocols/oscar/oscar.c:632
-#: ../libpurple/protocols/oscar/oscar.c:5955
+msgstr "Geselsie"
+
+#: ../libpurple/protocols/oscar/oscar.c:650
+#: ../libpurple/protocols/oscar/oscar.c:5958
 msgid "Get File"
 msgstr "Kry lêer"
 
-#: ../libpurple/protocols/oscar/oscar.c:639
+#: ../libpurple/protocols/oscar/oscar.c:657
 msgid "Games"
 msgstr "Speletjies"
 
-#: ../libpurple/protocols/oscar/oscar.c:642
+#: ../libpurple/protocols/oscar/oscar.c:660
 msgid "Add-Ins"
-msgstr ""
-
-#: ../libpurple/protocols/oscar/oscar.c:645
+msgstr "Invoegsels"
+
+#: ../libpurple/protocols/oscar/oscar.c:663
 msgid "Send Buddy List"
 msgstr "Stuur vriendelys"
 
-#: ../libpurple/protocols/oscar/oscar.c:648
+#: ../libpurple/protocols/oscar/oscar.c:666
 msgid "ICQ Direct Connect"
-msgstr ""
-
-#: ../libpurple/protocols/oscar/oscar.c:651
-msgid "AP User"
-msgstr ""
-
-#: ../libpurple/protocols/oscar/oscar.c:654
-msgid "ICQ RTF"
-msgstr ""
-
-#: ../libpurple/protocols/oscar/oscar.c:657
-msgid "Nihilist"
-msgstr ""
-
-#: ../libpurple/protocols/oscar/oscar.c:660
-msgid "ICQ Server Relay"
-msgstr ""
-
-#: ../libpurple/protocols/oscar/oscar.c:663
-msgid "Old ICQ UTF8"
-msgstr ""
-
-#: ../libpurple/protocols/oscar/oscar.c:666
-msgid "Trillian Encryption"
-msgstr ""
+msgstr "ICQ- direkte verbinding"
 
 #: ../libpurple/protocols/oscar/oscar.c:669
-msgid "ICQ UTF8"
-msgstr ""
+msgid "AP User"
+msgstr "AP-gebruiker"
 
 #: ../libpurple/protocols/oscar/oscar.c:672
-msgid "Hiptop"
-msgstr ""
+msgid "ICQ RTF"
+msgstr "ICQ RTF"
 
 #: ../libpurple/protocols/oscar/oscar.c:675
-msgid "Security Enabled"
-msgstr "Sekuriteit geaktiveer"
+msgid "Nihilist"
+msgstr "Nihilis"
 
 #: ../libpurple/protocols/oscar/oscar.c:678
+msgid "ICQ Server Relay"
+msgstr "ICQ-bedienerherleiding"
+
+#: ../libpurple/protocols/oscar/oscar.c:681
+msgid "Old ICQ UTF8"
+msgstr "Ou ICQ-UTF8"
+
+#: ../libpurple/protocols/oscar/oscar.c:684
+msgid "Trillian Encryption"
+msgstr "Trillian-enkripsie"
+
+#: ../libpurple/protocols/oscar/oscar.c:687
+msgid "ICQ UTF8"
+msgstr "ICQ UTF8"
+
+#: ../libpurple/protocols/oscar/oscar.c:690
+msgid "Hiptop"
+msgstr "Hiptop"
+
+#: ../libpurple/protocols/oscar/oscar.c:693
+msgid "Security Enabled"
+msgstr "Sekuriteit geaktiveer"
+
+#: ../libpurple/protocols/oscar/oscar.c:696
 msgid "Video Chat"
-msgstr "Videogesels"
-
-#: ../libpurple/protocols/oscar/oscar.c:682
+msgstr "Videogeselsies"
+
+#: ../libpurple/protocols/oscar/oscar.c:700
 msgid "iChat AV"
-msgstr ""
-
-#: ../libpurple/protocols/oscar/oscar.c:685
+msgstr "iChat AV"
+
+#: ../libpurple/protocols/oscar/oscar.c:703
 msgid "Live Video"
 msgstr "Lewende video"
 
-#: ../libpurple/protocols/oscar/oscar.c:688
+#: ../libpurple/protocols/oscar/oscar.c:706
 msgid "Camera"
 msgstr "Kammera"
 
-#: ../libpurple/protocols/oscar/oscar.c:706
+#: ../libpurple/protocols/oscar/oscar.c:724
 #: ../libpurple/protocols/oscar/oscar.c:5728
 msgid "Free For Chat"
-msgstr "Beskikbaar vir gesels"
-
-#: ../libpurple/protocols/oscar/oscar.c:710
+msgstr "Beskikbaar vir geselsies"
+
+#: ../libpurple/protocols/oscar/oscar.c:728
 #: ../libpurple/protocols/oscar/oscar.c:5763
 msgid "Not Available"
 msgstr "Nie beskikbaar nie"
 
-#: ../libpurple/protocols/oscar/oscar.c:712
+#: ../libpurple/protocols/oscar/oscar.c:730
 #: ../libpurple/protocols/oscar/oscar.c:5749
 msgid "Occupied"
 msgstr "Beset"
 
-#: ../libpurple/protocols/oscar/oscar.c:716
+#: ../libpurple/protocols/oscar/oscar.c:734
 msgid "Web Aware"
-msgstr ""
-
-#: ../libpurple/protocols/oscar/oscar.c:718 ../libpurple/protocols/qq/qq.c:183
-#: ../libpurple/protocols/yahoo/yahoo.c:2894 ../libpurple/status.c:157
-#: ../pidgin/gtkdocklet.c:454 ../pidgin/gtkstatusbox.c:1091
+msgstr "Web Aware"
+
+#: ../libpurple/protocols/oscar/oscar.c:736 ../libpurple/protocols/qq/qq.c:183
+#: ../libpurple/protocols/qq/qq.c:288
+#: ../libpurple/protocols/yahoo/yahoo.c:2934 ../libpurple/status.c:156
+#: ../pidgin/gtkdocklet.c:446 ../pidgin/gtkstatusbox.c:1058
 msgid "Invisible"
 msgstr "Onsigbaar"
 
-#: ../libpurple/protocols/oscar/oscar.c:720
+#: ../libpurple/protocols/oscar/oscar.c:738
 msgid "Online"
 msgstr "Aanlyn"
 
-#: ../libpurple/protocols/oscar/oscar.c:819
-#: ../libpurple/protocols/oscar/oscar.c:3709
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:697 ../pidgin/gtkprefs.c:1015
+#: ../libpurple/protocols/oscar/oscar.c:837
+#: ../libpurple/protocols/oscar/oscar.c:3675
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:721 ../pidgin/gtkprefs.c:1123
 msgid "IP Address"
 msgstr "IP-adres"
 
-#: ../libpurple/protocols/oscar/oscar.c:826
-#: ../libpurple/protocols/oscar/oscar.c:2854
+#: ../libpurple/protocols/oscar/oscar.c:844
+#: ../libpurple/protocols/oscar/oscar.c:2861
 msgid "Warning Level"
 msgstr "Waarskuwingvlak"
 
-#: ../libpurple/protocols/oscar/oscar.c:836
+#: ../libpurple/protocols/oscar/oscar.c:854
 msgid "Buddy Comment"
-msgstr "Vriendkommentaar"
-
-#: ../libpurple/protocols/oscar/oscar.c:976
+msgstr "Vriendopmerking"
+
+#: ../libpurple/protocols/oscar/oscar.c:994
 #, c-format
 msgid ""
 "Could not connect to authentication server:\n"
 "%s"
 msgstr ""
-
-#: ../libpurple/protocols/oscar/oscar.c:984
+"Kon nie aan stawingbediener verbind nie:\n"
+"%s"
+
+#: ../libpurple/protocols/oscar/oscar.c:1002
 #, c-format
 msgid ""
 "Could not connect to BOS server:\n"
 "%s"
 msgstr ""
-
-#: ../libpurple/protocols/oscar/oscar.c:1024
+"Kon nie aan BOS-bediener verbind nie:\n"
+"%s"
+
+#: ../libpurple/protocols/oscar/oscar.c:1042
 msgid "Screen name sent"
 msgstr "Skermnaam gestuur"
 
-#: ../libpurple/protocols/oscar/oscar.c:1029
+#: ../libpurple/protocols/oscar/oscar.c:1047
 msgid "Connection established, cookie sent"
-msgstr ""
+msgstr "Verbinding bewerkstellig, koekie gestuur"
 
 #. TODO: Don't call this with ssi
-#: ../libpurple/protocols/oscar/oscar.c:1058
+#: ../libpurple/protocols/oscar/oscar.c:1076
 msgid "Finalizing connection"
 msgstr "Finaliseer verbinding"
 
-#: ../libpurple/protocols/oscar/oscar.c:1242
+#: ../libpurple/protocols/oscar/oscar.c:1258
 #, c-format
 msgid ""
 "Unable to login: Could not sign on as %s because the screen name is "
-"invalid.  Screen names must either start with a letter and contain only "
-"letters, numbers and spaces, or contain only numbers."
-msgstr ""
-
-#: ../libpurple/protocols/oscar/oscar.c:1327
-#: ../libpurple/protocols/yahoo/yahoo.c:1929
+"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 ""
+"Kan nie aanmeld nie: Kon nie op %s aanmeld nie omdat die skermnaam ongeldig "
+"is.  Skermname moet geldige e-posadresse wees, of met 'n letter begin en net "
+"letters, syfers en spasies bevat, of net syfers bevat."
+
+#: ../libpurple/protocols/oscar/oscar.c:1343
+#: ../libpurple/protocols/yahoo/yahoo.c:1952
 msgid "Invalid screen name."
 msgstr "Ongeldige skermnaam."
 
-#: ../libpurple/protocols/oscar/oscar.c:1334
+#: ../libpurple/protocols/oscar/oscar.c:1350
 #: ../libpurple/protocols/qq/login_logout.c:483
-#: ../libpurple/protocols/simple/simple.c:1035
-#: ../libpurple/protocols/yahoo/yahoo.c:1947
+#: ../libpurple/protocols/simple/simple.c:1039
+#: ../libpurple/protocols/yahoo/yahoo.c:1973
 msgid "Incorrect password."
 msgstr "Verkeerde wagwoord."
 
-#: ../libpurple/protocols/oscar/oscar.c:1339
+#: ../libpurple/protocols/oscar/oscar.c:1355
 msgid "Your account is currently suspended."
-msgstr ""
+msgstr "U rekening is tans opgeskort."
 
 #. service temporarily unavailable
-#: ../libpurple/protocols/oscar/oscar.c:1343
+#: ../libpurple/protocols/oscar/oscar.c:1359
 msgid "The AOL Instant Messenger service is temporarily unavailable."
-msgstr ""
-
-#: ../libpurple/protocols/oscar/oscar.c:1348
+msgstr "Die AOL-kitsboodskapdiens is tydelik nie beskikbaar nie."
+
+#: ../libpurple/protocols/oscar/oscar.c:1364
+#: ../libpurple/protocols/oscar/oscar.c:1375
 msgid ""
 "You have been connecting and disconnecting too frequently. Wait ten minutes "
 "and try again. If you continue to try, you will need to wait even longer."
-msgstr "U het nou te gereeld gekoppel en ontkoppel.  Wag tien minute en probeer "
-"weer.  Indien u voortgaan om te probeer sal u selfs nog langer moet wag."
-
-#: ../libpurple/protocols/oscar/oscar.c:1353
+msgstr ""
+"U het nou te gereeld verbind en afgesny. Wag tien minute en probeer weer. "
+"Indien u voortgaan om te probeer sal u selfs nog langer moet wag."
+
+#: ../libpurple/protocols/oscar/oscar.c:1369
 #, c-format
 msgid "The client version you are using is too old. Please upgrade at %s"
-msgstr ""
-
-#: ../libpurple/protocols/oscar/oscar.c:1388
+msgstr "Die kliëntweergawe wat u gebruik, is te oud. Gradeer asb. op by %s"
+
+#: ../libpurple/protocols/oscar/oscar.c:1408
 msgid "Could Not Connect"
 msgstr "Kon nie verbind nie"
 
-#: ../libpurple/protocols/oscar/oscar.c:1393
+#: ../libpurple/protocols/oscar/oscar.c:1412
 msgid "Received authorization"
-msgstr ""
-
-#: ../libpurple/protocols/oscar/oscar.c:1416
+msgstr "Magtiging ontvang"
+
+#: ../libpurple/protocols/oscar/oscar.c:1434
 msgid "The SecurID key entered is invalid."
-msgstr ""
-
-#: ../libpurple/protocols/oscar/oscar.c:1430
+msgstr "Die SecurID-sleutel wat gegee is, is ongeldig."
+
+#: ../libpurple/protocols/oscar/oscar.c:1447
 msgid "Enter SecurID"
-msgstr ""
-
-#: ../libpurple/protocols/oscar/oscar.c:1431
+msgstr "Gee SecurID"
+
+#: ../libpurple/protocols/oscar/oscar.c:1448
 msgid "Enter the 6 digit number from the digital display."
-msgstr ""
+msgstr "Gee die 6-syfer-nommer vanaf die digitale skerm."
 
 #. *
 #. * A wrapper for purple_request_action() that uses @c OK and @c Cancel buttons.
 #.
-#: ../libpurple/protocols/oscar/oscar.c:1433
+#: ../libpurple/protocols/oscar/oscar.c:1450
 #: ../libpurple/protocols/oscar/oscar.c:2242
-#: ../libpurple/protocols/oscar/oscar.c:2288
+#: ../libpurple/protocols/oscar/oscar.c:2291
 #: ../libpurple/protocols/oscar/oscar.c:5833
-#: ../libpurple/protocols/oscar/oscar.c:6109 ../libpurple/request.h:1350
+#: ../libpurple/protocols/oscar/oscar.c:6114 ../libpurple/request.h:1387
 msgid "_OK"
 msgstr "_Regso"
 
-#: ../libpurple/protocols/oscar/oscar.c:1471
-#: ../libpurple/protocols/oscar/oscar.c:1514
+#: ../libpurple/protocols/oscar/oscar.c:1489
+#: ../libpurple/protocols/oscar/oscar.c:1532
 #, c-format
 msgid ""
 "You may be disconnected shortly.  You may want to use TOC until this is "
 "fixed.  Check %s for updates."
 msgstr ""
-
-#: ../libpurple/protocols/oscar/oscar.c:1474
-#: ../libpurple/protocols/oscar/oscar.c:1517
+"U kan dalk binnekort afgesny word.  U moet dalk TOC gebruik tot dit "
+"reggemaak is.  Kontroleer %s vir bywerkings."
+
+#: ../libpurple/protocols/oscar/oscar.c:1492
+#: ../libpurple/protocols/oscar/oscar.c:1535
 msgid "Unable to get a valid AIM login hash."
 msgstr "Kan nie 'n geldige AIM-aanmeldhutswaarde kry nie."
 
-#: ../libpurple/protocols/oscar/oscar.c:1603
+#: ../libpurple/protocols/oscar/oscar.c:1620
 #, c-format
 msgid "You may be disconnected shortly.  Check %s for updates."
-msgstr ""
-
-#: ../libpurple/protocols/oscar/oscar.c:1606
+msgstr "U kan dalk binnekort afgesny word.  Kontroleer %s vir bywerkings."
+
+#: ../libpurple/protocols/oscar/oscar.c:1623
 msgid "Unable to get a valid login hash."
 msgstr "Kan nie geldige aanmeldhutswaarde kry nie."
 
-#: ../libpurple/protocols/oscar/oscar.c:1632
+#: ../libpurple/protocols/oscar/oscar.c:1652
 msgid "Password sent"
 msgstr "Wagwoord gestuur"
 
-#: ../libpurple/protocols/oscar/oscar.c:1688
+#: ../libpurple/protocols/oscar/oscar.c:1708
 msgid "Unable to initialize connection"
-msgstr ""
+msgstr "Kan nie verbinding inisialiseer nie"
 
 #: ../libpurple/protocols/oscar/oscar.c:2212
 msgid "Please authorize me so I can add you to my buddy list."
-msgstr ""
+msgstr "Magtig my asb. sodat ek u by my vriendelys kan voeg."
 
 #: ../libpurple/protocols/oscar/oscar.c:2240
 msgid "Authorization Request Message:"
@@ -6682,39 +7157,43 @@
 
 #: ../libpurple/protocols/oscar/oscar.c:2241
 msgid "Please authorize me!"
-msgstr "Laat my asb. toe!"
-
-#: ../libpurple/protocols/oscar/oscar.c:2280
-#: ../libpurple/protocols/oscar/oscar.c:2287
-#: ../libpurple/protocols/oscar/oscar.c:2413
-#: ../libpurple/protocols/oscar/oscar.c:5221
-#: ../libpurple/protocols/yahoo/yahoo.c:986
+msgstr "Magtig my asb!"
+
+#: ../libpurple/protocols/oscar/oscar.c:2282
+#: ../libpurple/protocols/oscar/oscar.c:2290
+#: ../libpurple/protocols/oscar/oscar.c:2417
+#: ../libpurple/protocols/oscar/oscar.c:5211
+#: ../libpurple/protocols/yahoo/yahoo.c:1004
 msgid "No reason given."
 msgstr "Geen rede gegee nie."
 
-#: ../libpurple/protocols/oscar/oscar.c:2286
+#: ../libpurple/protocols/oscar/oscar.c:2289
 msgid "Authorization Denied Message:"
 msgstr "Magtiging gewyer-boodskap:"
 
-#: ../libpurple/protocols/oscar/oscar.c:2413
+#: ../libpurple/protocols/oscar/oscar.c:2417
 #, c-format
 msgid ""
 "The user %u has denied your request to add them to your buddy list for the "
 "following reason:\n"
 "%s"
 msgstr ""
-
-#: ../libpurple/protocols/oscar/oscar.c:2414
+"Die gebruiker %u het u versoek om hulle by u vriendelys te voeg, geweier, "
+"vir die volgende rede:\n"
+"%s"
+
+#: ../libpurple/protocols/oscar/oscar.c:2418
 msgid "ICQ authorization denied."
-msgstr ""
+msgstr "ICQ-magtiging geweier."
 
 #. Someone has granted you authorization
-#: ../libpurple/protocols/oscar/oscar.c:2421
+#: ../libpurple/protocols/oscar/oscar.c:2425
 #, c-format
 msgid "The user %u has granted your request to add them to your buddy list."
 msgstr ""
-
-#: ../libpurple/protocols/oscar/oscar.c:2429
+"Die gebruiker %u het u versoek om hulle by u vriendelys te voeg, aanvaar."
+
+#: ../libpurple/protocols/oscar/oscar.c:2433
 #, c-format
 msgid ""
 "You have received a special message\n"
@@ -6722,8 +7201,12 @@
 "From: %s [%s]\n"
 "%s"
 msgstr ""
-
-#: ../libpurple/protocols/oscar/oscar.c:2437
+"U het 'n spesiale boodskap ontvang\n"
+"\n"
+"Van: %s [%s]\n"
+"%s"
+
+#: ../libpurple/protocols/oscar/oscar.c:2441
 #, c-format
 msgid ""
 "You have received an ICQ page\n"
@@ -6731,8 +7214,12 @@
 "From: %s [%s]\n"
 "%s"
 msgstr ""
-
-#: ../libpurple/protocols/oscar/oscar.c:2445
+"U het 'n ICQ-roep ontvang\n"
+"\n"
+"Van: %s [%s]\n"
+"%s"
+
+#: ../libpurple/protocols/oscar/oscar.c:2449
 #, c-format
 msgid ""
 "You have received an ICQ e-mail from %s [%s]\n"
@@ -6740,303 +7227,318 @@
 "Message is:\n"
 "%s"
 msgstr ""
-
-#: ../libpurple/protocols/oscar/oscar.c:2466
+"U het 'n ICQ-e-pos van %s ontvang [%s]\n"
+"\n"
+"Boodskap is:\n"
+"%s"
+
+#: ../libpurple/protocols/oscar/oscar.c:2470
 #, c-format
 msgid "ICQ user %u has sent you a buddy: %s (%s)"
-msgstr ""
-
-#: ../libpurple/protocols/oscar/oscar.c:2472
+msgstr "ICQ-gebruiker %u het u 'n vriend gestuur: %s (%s)"
+
+#: ../libpurple/protocols/oscar/oscar.c:2476
 msgid "Do you want to add this buddy to your buddy list?"
 msgstr "Wil u hierdie vriend by die vriendelys voeg?"
 
-#: ../libpurple/protocols/oscar/oscar.c:2475 ../pidgin/gtkroomlist.c:308
+#: ../libpurple/protocols/oscar/oscar.c:2481 ../pidgin/gtkroomlist.c:308
 msgid "_Add"
 msgstr "_Voeg by"
 
-#: ../libpurple/protocols/oscar/oscar.c:2476
+#: ../libpurple/protocols/oscar/oscar.c:2482
 msgid "_Decline"
-msgstr ""
-
-#: ../libpurple/protocols/oscar/oscar.c:2560
+msgstr "_Weier"
+
+#: ../libpurple/protocols/oscar/oscar.c:2566
 #, c-format
 msgid "You missed %hu message from %s because it was invalid."
 msgid_plural "You missed %hu messages from %s because they were invalid."
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../libpurple/protocols/oscar/oscar.c:2569
+msgstr[0] "U het %hu kitsboodskap vanaf %s gemis omdat dit ongeldig was."
+msgstr[1] "U het %hu kitsboodskappe vanaf %s gemis omdat hulle ongeldig was."
+
+#: ../libpurple/protocols/oscar/oscar.c:2575
 #, c-format
 msgid "You missed %hu message from %s because it was too large."
 msgid_plural "You missed %hu messages from %s because they were too large."
 msgstr[0] "U het %hu kitsboodskap vanaf %s gemis omdat dit te groot was."
 msgstr[1] "U het %hu kitsboodskappe vanaf %s gemis omdat hulle te groot was."
 
-#: ../libpurple/protocols/oscar/oscar.c:2578
+#: ../libpurple/protocols/oscar/oscar.c:2584
 #, c-format
 msgid ""
 "You missed %hu message from %s because the rate limit has been exceeded."
 msgid_plural ""
 "You missed %hu messages from %s because the rate limit has been exceeded."
 msgstr[0] ""
+"U het %hu kitsboodskap vanaf %s gemis omdat die koerslimiet oorskry is."
 msgstr[1] ""
-
-#: ../libpurple/protocols/oscar/oscar.c:2587
+"U het %hu kitsboodskappe vanaf %s gemis omdat die koerslimiet oorskry is."
+
+#: ../libpurple/protocols/oscar/oscar.c:2593
 #, c-format
 msgid "You missed %hu message from %s because he/she was too evil."
 msgid_plural "You missed %hu messages from %s because he/she was too evil."
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../libpurple/protocols/oscar/oscar.c:2596
+msgstr[0] "U het %hu kitsboodskap vanaf %s gemis omdat hy/sy te naar was."
+msgstr[1] "U het %hu kitsboodskappe vanaf %s gemis omdat hy/sy te naar was."
+
+#: ../libpurple/protocols/oscar/oscar.c:2602
 #, c-format
 msgid "You missed %hu message from %s because you are too evil."
 msgid_plural "You missed %hu messages from %s because you are too evil."
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../libpurple/protocols/oscar/oscar.c:2605
+msgstr[0] "U het %hu kitsboodskap vanaf %s gemis omdat u te naar was."
+msgstr[1] "U het %hu kitsboodskappe vanaf %s gemis omdat u te naar was."
+
+#: ../libpurple/protocols/oscar/oscar.c:2611
 #, c-format
 msgid "You missed %hu message from %s for an unknown reason."
 msgid_plural "You missed %hu messages from %s for an unknown reason."
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "U het %hu kitsboodskap vanaf %s gemis vir 'n onbekende rede."
+msgstr[1] "U het %hu kitsboodskappe vanaf %s gemis vir 'n onbekende rede."
 
 #. Data is assumed to be the destination sn
-#: ../libpurple/protocols/oscar/oscar.c:2760
+#: ../libpurple/protocols/oscar/oscar.c:2766
 #, c-format
 msgid "Unable to send message: %s"
 msgstr "Kan nie boodskap stuur nie: %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2760
-#: ../libpurple/protocols/oscar/oscar.c:2765
-#: ../libpurple/protocols/oscar/oscar.c:2827
-#: ../libpurple/protocols/oscar/oscar.c:2831
+#: ../libpurple/protocols/oscar/oscar.c:2766
+#: ../libpurple/protocols/oscar/oscar.c:2771
+#: ../libpurple/protocols/oscar/oscar.c:2835
 msgid "Unknown reason."
 msgstr "Onbekende rede."
 
-#: ../libpurple/protocols/oscar/oscar.c:2763
+#: ../libpurple/protocols/oscar/oscar.c:2769
 #: ../libpurple/protocols/sametime/sametime.c:2409
 #, c-format
 msgid "Unable to send message to %s:"
 msgstr "Kan nie boodskap aan %s stuur nie:"
 
-#: ../libpurple/protocols/oscar/oscar.c:2827
+#: ../libpurple/protocols/oscar/oscar.c:2835
 #, c-format
 msgid "User information not available: %s"
 msgstr "Gebruikerinligting nie beskikbaar nie: %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2830
-#, c-format
-msgid "User information for %s unavailable:"
-msgstr "Gebruikerinligting vir %s nie beskikbaar nie:"
-
-#: ../libpurple/protocols/oscar/oscar.c:2859
+#: ../libpurple/protocols/oscar/oscar.c:2866
 msgid "Online Since"
 msgstr "Aanlyn sedert"
 
-#: ../libpurple/protocols/oscar/oscar.c:2864
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1161
+#: ../libpurple/protocols/oscar/oscar.c:2871
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1185
 msgid "Member Since"
 msgstr "Lid sedert"
 
-#: ../libpurple/protocols/oscar/oscar.c:2869
+#: ../libpurple/protocols/oscar/oscar.c:2876
 msgid "Capabilities"
-msgstr ""
-
-#: ../libpurple/protocols/oscar/oscar.c:2887
+msgstr "Vermoëns"
+
+#: ../libpurple/protocols/oscar/oscar.c:2906
 msgid "Available Message"
-msgstr ""
-
-#: ../libpurple/protocols/oscar/oscar.c:2913
+msgstr "Beskikbare boodskap"
+
+#: ../libpurple/protocols/oscar/oscar.c:2934
 msgid "Profile"
 msgstr "Profiel"
 
-#: ../libpurple/protocols/oscar/oscar.c:2990
+#: ../libpurple/protocols/oscar/oscar.c:3014
 msgid "Your AIM connection may be lost."
-msgstr ""
+msgstr "U AIM-verbinding is dalk afgesny."
 
 #. The conversion failed!
-#: ../libpurple/protocols/oscar/oscar.c:3177
+#: ../libpurple/protocols/oscar/oscar.c:3202
 msgid ""
 "[Unable to display a message from this user because it contained invalid "
 "characters.]"
 msgstr ""
-
-#: ../libpurple/protocols/oscar/oscar.c:3398
-msgid "Rate limiting error."
-msgstr ""
-
-#: ../libpurple/protocols/oscar/oscar.c:3399
+"[Kon nie 'n boodskap van hierdie gebruiker wys nie omdat dit ongeldige "
+"karakters bevat.]"
+
+#: ../libpurple/protocols/oscar/oscar.c:3366
 msgid ""
 "The last action you attempted could not be performed because you are over "
 "the rate limit. Please wait 10 seconds and try again."
 msgstr ""
-
-#: ../libpurple/protocols/oscar/oscar.c:3471
-msgid "You have been signed off for an unknown reason."
-msgstr ""
-
-#: ../libpurple/protocols/oscar/oscar.c:3484
+"Die vorige aksie wat u probeer uitvoer het, kon nie uitgevoer word nie omdat "
+"u oor die koerslimiet is. Wag asb. 10 sekondes en probeer weer."
+
+#: ../libpurple/protocols/oscar/oscar.c:3449
 #: ../libpurple/protocols/toc/toc.c:977
 #, c-format
 msgid "You have been disconnected from chat room %s."
-msgstr ""
-
-#: ../libpurple/protocols/oscar/oscar.c:3731
-#: ../libpurple/protocols/silc/util.c:581
+msgstr "U is uit geselsiekamer %s afgesny."
+
+#: ../libpurple/protocols/oscar/oscar.c:3697
+#: ../libpurple/protocols/silc/util.c:585
+#: ../libpurple/protocols/silc10/util.c:581
 msgid "Mobile Phone"
 msgstr "Selfoon"
 
-#: ../libpurple/protocols/oscar/oscar.c:3761
+#: ../libpurple/protocols/oscar/oscar.c:3727
 msgid "Personal Web Page"
-msgstr ""
-
-#: ../libpurple/protocols/oscar/oscar.c:3785
+msgstr "Persoonlike webblad"
+
+#: ../libpurple/protocols/oscar/oscar.c:3751
 #: ../libpurple/protocols/qq/buddy_info.c:40
 msgid "Additional Information"
 msgstr "Ekstra inligting"
 
-#: ../libpurple/protocols/oscar/oscar.c:3793
-#: ../libpurple/protocols/oscar/oscar.c:3806
+#: ../libpurple/protocols/oscar/oscar.c:3759
+#: ../libpurple/protocols/oscar/oscar.c:3772
 msgid "Zip Code"
 msgstr "Poskode"
 
-#: ../libpurple/protocols/oscar/oscar.c:3817
+#: ../libpurple/protocols/oscar/oscar.c:3783
 msgid "Division"
 msgstr "Afdeling"
 
-#: ../libpurple/protocols/oscar/oscar.c:3818
+#: ../libpurple/protocols/oscar/oscar.c:3784
 msgid "Position"
 msgstr "Posisie"
 
-#: ../libpurple/protocols/oscar/oscar.c:3820
+#: ../libpurple/protocols/oscar/oscar.c:3786
 msgid "Web Page"
 msgstr "Webblad"
 
-#: ../libpurple/protocols/oscar/oscar.c:3823
+#: ../libpurple/protocols/oscar/oscar.c:3789
 msgid "Work Information"
 msgstr "Werkinligting"
 
-#: ../libpurple/protocols/oscar/oscar.c:3879
+#: ../libpurple/protocols/oscar/oscar.c:3845
 msgid "Pop-Up Message"
-msgstr ""
-
-#: ../libpurple/protocols/oscar/oscar.c:3919
+msgstr "Opspring-boodskap"
+
+#: ../libpurple/protocols/oscar/oscar.c:3885
 #, c-format
 msgid "The following screen name is associated with %s"
 msgid_plural "The following screen names are associated with %s"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../libpurple/protocols/oscar/oscar.c:3924
+msgstr[0] "Die volgende skermnaam word met %s geassosieer"
+msgstr[1] "Die volgende skermname word met %s geassosieer"
+
+#: ../libpurple/protocols/oscar/oscar.c:3890
 msgid "Screen name"
 msgstr "Skermnaam"
 
-#: ../libpurple/protocols/oscar/oscar.c:3950
+#: ../libpurple/protocols/oscar/oscar.c:3916
 #, c-format
 msgid "No results found for e-mail address %s"
-msgstr ""
-
-#: ../libpurple/protocols/oscar/oscar.c:3971
+msgstr "Geen resultate gekry vir e-posadres %s nie"
+
+#: ../libpurple/protocols/oscar/oscar.c:3937
 #, c-format
 msgid "You should receive an e-mail asking to confirm %s."
-msgstr ""
+msgstr "U behoort 'n e-pos te ontvang wat vra dat u %s bevestig."
+
+#: ../libpurple/protocols/oscar/oscar.c:3939
+msgid "Account Confirmation Requested"
+msgstr "Rekening-bevestiging vereis"
+
+#: ../libpurple/protocols/oscar/oscar.c:3970
+msgid "Error Changing Account Info"
+msgstr "Fout met verandering van rekeninginligting"
 
 #: ../libpurple/protocols/oscar/oscar.c:3973
-msgid "Account Confirmation Requested"
-msgstr ""
-
-#: ../libpurple/protocols/oscar/oscar.c:4004
-msgid "Error Changing Account Info"
-msgstr ""
-
-#: ../libpurple/protocols/oscar/oscar.c:4007
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
 "differs from the original."
 msgstr ""
-
-#: ../libpurple/protocols/oscar/oscar.c:4010
+"Fout 0x%04x: Kon nie die skermnaam formateer nie omdat die aangevraagde "
+"skermnaam van die oorspronklike verskil."
+
+#: ../libpurple/protocols/oscar/oscar.c:3976
 #, c-format
 msgid "Error 0x%04x: Unable to format screen name because it is invalid."
 msgstr ""
-
-#: ../libpurple/protocols/oscar/oscar.c:4013
+"Fout 0x%04x: Kon nie die skermnaam formateer nie omdat dit ongeldig is."
+
+#: ../libpurple/protocols/oscar/oscar.c:3979
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
 "is too long."
 msgstr ""
-
-#: ../libpurple/protocols/oscar/oscar.c:4016
+"Fout 0x%04x: Kon nie die skermnaam formateer nie omdat die aangevraagde "
+"skermnaam te lank is."
+
+#: ../libpurple/protocols/oscar/oscar.c:3982
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change e-mail address because there is already a "
 "request pending for this screen name."
 msgstr ""
-
-#: ../libpurple/protocols/oscar/oscar.c:4019
+"Fout 0x%04x: Kon nie die e-posadres verander nie omdat daar reeds 'n versoek "
+"hangende vir hierdie skermnaam is."
+
+#: ../libpurple/protocols/oscar/oscar.c:3985
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change e-mail address because the given address has "
 "too many screen names associated with it."
 msgstr ""
-
-#: ../libpurple/protocols/oscar/oscar.c:4022
+"Fout 0x%04x: Kon nie e-posadres verander nie omdat die gegewe adres te veel "
+"skermname daarmee geassosieer het."
+
+#: ../libpurple/protocols/oscar/oscar.c:3988
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change e-mail address because the given address is "
 "invalid."
 msgstr ""
-
-#: ../libpurple/protocols/oscar/oscar.c:4025
+"Fout 0x%04x: Kon nie e-posadres verander nie omdat die gegewe adres ongeldig "
+"is."
+
+#: ../libpurple/protocols/oscar/oscar.c:3991
 #, c-format
 msgid "Error 0x%04x: Unknown error."
-msgstr ""
-
-#: ../libpurple/protocols/oscar/oscar.c:4035
+msgstr "Fout 0x%04x: Onbekende fout."
+
+#: ../libpurple/protocols/oscar/oscar.c:4001
 #, c-format
 msgid "The e-mail address for %s is %s"
 msgstr "Die e-posadres vir %s is %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:4037
+#: ../libpurple/protocols/oscar/oscar.c:4003
 msgid "Account Info"
 msgstr "Rekeninginligting"
 
-#: ../libpurple/protocols/oscar/oscar.c:4210
+#: ../libpurple/protocols/oscar/oscar.c:4175
 msgid ""
 "Your IM Image was not sent. You must be Direct Connected to send IM Images."
 msgstr ""
-
-#: ../libpurple/protocols/oscar/oscar.c:4462
+"U kitsboodskapprentjie is nie gestuur nie. U moet direk verbind wees om "
+"kitsboodskapprentjies te stuur."
+
+#: ../libpurple/protocols/oscar/oscar.c:4446
 msgid "Unable to set AIM profile."
-msgstr ""
-
-#: ../libpurple/protocols/oscar/oscar.c:4463
+msgstr "Kan nie AIM-profiel instel nie."
+
+#: ../libpurple/protocols/oscar/oscar.c:4447
 msgid ""
 "You have probably requested to set your profile before the login procedure "
 "completed.  Your profile remains unset; try setting it again when you are "
 "fully connected."
 msgstr ""
-
-#: ../libpurple/protocols/oscar/oscar.c:4477
+"U het moontlik versoek dat u profiel geaktiveer word voor die "
+"aanmeldprosedure afgehandel is.  U profiel is nog gedeaktiveer; probeer dit "
+"weer aktiveer wanneer u volledig verbind is."
+
+#: ../libpurple/protocols/oscar/oscar.c:4461
 #, c-format
 msgid ""
 "The maximum profile length of %d byte has been exceeded.  It has been "
-"truncated it for you."
+"truncated for you."
 msgid_plural ""
 "The maximum profile length of %d bytes has been exceeded.  It has been "
-"truncated it for you."
+"truncated for you."
 msgstr[0] ""
+"Die maksimum profiellengte van %d greep is oorskry.  Dit is vir u afgesny."
 msgstr[1] ""
-
-#: ../libpurple/protocols/oscar/oscar.c:4482
+"Die maksimum profiellengte van %d grepe is oorskry.  Dit is vir u afgesny."
+
+#: ../libpurple/protocols/oscar/oscar.c:4466
 msgid "Profile too long."
 msgstr "Profiel te lank."
 
-#: ../libpurple/protocols/oscar/oscar.c:4527
+#: ../libpurple/protocols/oscar/oscar.c:4511
 #, c-format
 msgid ""
 "The maximum away message length of %d byte has been exceeded.  It has been "
@@ -7045,297 +7547,319 @@
 "The maximum away message length of %d bytes has been exceeded.  It has been "
 "truncated for you."
 msgstr[0] ""
+"Die maksimum wegboodskap-lengte van %d greep is oorskry.  Dit is vir u "
+"afgesny."
 msgstr[1] ""
-
-#: ../libpurple/protocols/oscar/oscar.c:4532
+"Die maksimum wegboodskap-lengte van %d grepe is oorskry.  Dit is vir u "
+"afgesny."
+
+#: ../libpurple/protocols/oscar/oscar.c:4516
 msgid "Away message too long."
 msgstr "Weg-boodskap te lank."
 
-#: ../libpurple/protocols/oscar/oscar.c:4601
+#: ../libpurple/protocols/oscar/oscar.c:4585
 #, 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 ""
-
-#: ../libpurple/protocols/oscar/oscar.c:4603
-#: ../libpurple/protocols/oscar/oscar.c:5028
-#: ../libpurple/protocols/oscar/oscar.c:5042
+"must be a valid email address, or start with a letter and contain only "
+"letters, numbers and spaces, or contain only numbers."
+msgstr ""
+"Kon nie die vriend %s byvoeg nie omdat die skermnaam ongeldig is.  Skermname "
+"moet geldige e-posadresse wees, of met 'n letter begin en net letters, "
+"syfers en spasies bevat, of net syfers bevat."
+
+#: ../libpurple/protocols/oscar/oscar.c:4587
+#: ../libpurple/protocols/oscar/oscar.c:5020
+#: ../libpurple/protocols/oscar/oscar.c:5035
 msgid "Unable To Add"
 msgstr "Kan nie byvoeg nie"
 
-#: ../libpurple/protocols/oscar/oscar.c:4707
+#: ../libpurple/protocols/oscar/oscar.c:4696
 msgid "Unable To Retrieve Buddy List"
-msgstr "Kan nie vriendelys kry nie"
-
-#: ../libpurple/protocols/oscar/oscar.c:4708
+msgstr "Kan nie vriendelys haal nie"
+
+#: ../libpurple/protocols/oscar/oscar.c:4697
 msgid ""
 "The AIM servers were temporarily unable to send your buddy list.  Your buddy "
 "list is not lost, and will probably become available in a few hours."
 msgstr ""
-
-#: ../libpurple/protocols/oscar/oscar.c:4913
-#: ../libpurple/protocols/oscar/oscar.c:4914
-#: ../libpurple/protocols/oscar/oscar.c:4919
-#: ../libpurple/protocols/oscar/oscar.c:5096
-#: ../libpurple/protocols/oscar/oscar.c:5097
-#: ../libpurple/protocols/oscar/oscar.c:5102
+"Die AIM-bedieners kan tydelik nie u vriendelys stuur nie.  U vriendelys is "
+"nie verlore nie, en sal waarskynlik na 'n paar uur weer beskikbaar word."
+
+#: ../libpurple/protocols/oscar/oscar.c:4879
+#: ../libpurple/protocols/oscar/oscar.c:4881
+#: ../libpurple/protocols/oscar/oscar.c:5089
+#: ../libpurple/protocols/oscar/oscar.c:5090
+#: ../libpurple/protocols/oscar/oscar.c:5095
 msgid "Orphans"
-msgstr ""
-
-#: ../libpurple/protocols/oscar/oscar.c:5026
+msgstr "Wesies"
+
+#: ../libpurple/protocols/oscar/oscar.c:5018
 #, c-format
 msgid ""
 "Could not add the buddy %s because you have too many buddies in your buddy "
 "list.  Please remove one and try again."
 msgstr ""
-
-#: ../libpurple/protocols/oscar/oscar.c:5026
-#: ../libpurple/protocols/oscar/oscar.c:5040
+"Kon nie die vriend %s byvoeg nie omdat u te veel vriende in u vriendelys "
+"het.  Verwyder asb. een en probeer weer."
+
+#: ../libpurple/protocols/oscar/oscar.c:5018
+#: ../libpurple/protocols/oscar/oscar.c:5033
 msgid "(no name)"
-msgstr ""
-
-#: ../libpurple/protocols/oscar/oscar.c:5040
-#, 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 ""
-
-#: ../libpurple/protocols/oscar/oscar.c:5133
+msgstr "(geen naam)"
+
+#: ../libpurple/protocols/oscar/oscar.c:5032
+#, c-format
+msgid "Could not add the buddy %s for an unknown reason."
+msgstr "Kon nie die vriend %s byvoeg nie, om 'n onbekende rede."
+
+#: ../libpurple/protocols/oscar/oscar.c:5126
 #, c-format
 msgid ""
 "The user %s has given you permission to add you to their buddy list.  Do you "
 "want to add them?"
 msgstr ""
-
-#: ../libpurple/protocols/oscar/oscar.c:5139
+"Die gebruiker %s het u toestemming gegee om u by hul vriendelys te voeg.  "
+"Wil u hulle byvoeg?"
+
+#: ../libpurple/protocols/oscar/oscar.c:5134
 msgid "Authorization Given"
 msgstr "Magtiging gegee"
 
 #. Granted
-#: ../libpurple/protocols/oscar/oscar.c:5217
+#: ../libpurple/protocols/oscar/oscar.c:5207
 #, c-format
 msgid "The user %s has granted your request to add them to your buddy list."
 msgstr ""
-
-#: ../libpurple/protocols/oscar/oscar.c:5218
+"Die gebruiker %s het u versoek om hulle by u vriendelys te voeg, aanvaar."
+
+#: ../libpurple/protocols/oscar/oscar.c:5208
 msgid "Authorization Granted"
 msgstr "Magtiging toegestaan"
 
 #. Denied
-#: ../libpurple/protocols/oscar/oscar.c:5221
+#: ../libpurple/protocols/oscar/oscar.c:5211
 #, c-format
 msgid ""
 "The user %s has denied your request to add them to your buddy list for the "
 "following reason:\n"
 "%s"
 msgstr ""
-
-#: ../libpurple/protocols/oscar/oscar.c:5222
+"Die gebruiker %s het u versoek om hulle by u vriendelys te voeg, geweier, "
+"vir die volgende rede:\n"
+"%s"
+
+#: ../libpurple/protocols/oscar/oscar.c:5212
 msgid "Authorization Denied"
 msgstr "Magtiging geweier"
 
-#: ../libpurple/protocols/oscar/oscar.c:5258
+#: ../libpurple/protocols/oscar/oscar.c:5248
 #: ../libpurple/protocols/toc/toc.c:1371
 msgid "_Exchange:"
-msgstr ""
-
-#: ../libpurple/protocols/oscar/oscar.c:5298
+msgstr "_Uitruiling:"
+
+#: ../libpurple/protocols/oscar/oscar.c:5288
 msgid "Invalid chat name specified."
-msgstr ""
-
-#: ../libpurple/protocols/oscar/oscar.c:5368
+msgstr "Ongeldige geselsienaam gespesifiseer."
+
+#: ../libpurple/protocols/oscar/oscar.c:5357
 msgid "Your IM Image was not sent. You cannot send IM Images in AIM chats."
 msgstr ""
-
-#: ../libpurple/protocols/oscar/oscar.c:5507
-#: ../libpurple/protocols/oscar/oscar.c:5512
+"U kitsboodskapprentjie is nie gestuur nie. U kan nie kitsboodskapprentjies "
+"in AIM-geselsies stuur nie."
+
+#: ../libpurple/protocols/oscar/oscar.c:5517
+#: ../libpurple/protocols/oscar/oscar.c:5522
 msgid "Away Message"
 msgstr "Weg-boodskap"
 
-#: ../libpurple/protocols/oscar/oscar.c:5512
+#: ../libpurple/protocols/oscar/oscar.c:5522
 msgid "<i>(retrieving)</i>"
 msgstr "<i>(verkry tans)</i>"
 
 #: ../libpurple/protocols/oscar/oscar.c:5722
 msgid "iTunes Music Store Link"
-msgstr ""
+msgstr "iTunes Music Store-skakel"
 
 #: ../libpurple/protocols/oscar/oscar.c:5830
 #, c-format
 msgid "Buddy Comment for %s"
-msgstr "Vriendkommentaar vir %s"
+msgstr "Vriendopmerking vir %s"
 
 #: ../libpurple/protocols/oscar/oscar.c:5831
 msgid "Buddy Comment:"
-msgstr "Vriendkommentaar:"
-
-#: ../libpurple/protocols/oscar/oscar.c:5877
+msgstr "Vriendopmerking:"
+
+#: ../libpurple/protocols/oscar/oscar.c:5878
 #, c-format
 msgid "You have selected to open a Direct IM connection with %s."
-msgstr ""
-
-#: ../libpurple/protocols/oscar/oscar.c:5881
+msgstr "U het gekies om 'n direkte kitsboodskapverbinding met %s te open."
+
+#: ../libpurple/protocols/oscar/oscar.c:5882
 msgid ""
 "Because this reveals your IP address, it may be considered a security risk.  "
 "Do you wish to continue?"
 msgstr ""
-
-#: ../libpurple/protocols/oscar/oscar.c:5885
+"Omdat dit u IP-adres bekend maak, kan dit 'n sekuriteitsrisiko wees.  Wil u "
+"voortgaan?"
+
+#: ../libpurple/protocols/oscar/oscar.c:5888
+#: ../libpurple/protocols/oscar/peer.c:1022
 msgid "C_onnect"
 msgstr "_Verbind"
 
-#: ../libpurple/protocols/oscar/oscar.c:5920
+#: ../libpurple/protocols/oscar/oscar.c:5923
 msgid "Get AIM Info"
 msgstr "Kry AIM-inligting"
 
-#: ../libpurple/protocols/oscar/oscar.c:5926
+#: ../libpurple/protocols/oscar/oscar.c:5929
 msgid "Edit Buddy Comment"
-msgstr "Wysig vriendkommentaar"
-
-#: ../libpurple/protocols/oscar/oscar.c:5934
+msgstr "Wysig vriendopmerking"
+
+#: ../libpurple/protocols/oscar/oscar.c:5937
 msgid "Get Status Msg"
-msgstr ""
-
-#: ../libpurple/protocols/oscar/oscar.c:5947
+msgstr "Kry statusboodskap"
+
+#: ../libpurple/protocols/oscar/oscar.c:5950
 msgid "Direct IM"
-msgstr ""
-
-#: ../libpurple/protocols/oscar/oscar.c:5969
+msgstr "Direkte kitsboodskap"
+
+#: ../libpurple/protocols/oscar/oscar.c:5972
 msgid "Re-request Authorization"
 msgstr "Herversoek magtiging"
 
-#: ../libpurple/protocols/oscar/oscar.c:6028
+#: ../libpurple/protocols/oscar/oscar.c:6031
 msgid "Require authorization"
-msgstr ""
-
-#: ../libpurple/protocols/oscar/oscar.c:6031
+msgstr "Vereis magtiging"
+
+#: ../libpurple/protocols/oscar/oscar.c:6034
 msgid "Web aware (enabling this will cause you to receive SPAM!)"
-msgstr ""
-
-#: ../libpurple/protocols/oscar/oscar.c:6036
+msgstr "Webbewus (as u dit aktiveer, sal u gemorspos ontvang!)"
+
+#: ../libpurple/protocols/oscar/oscar.c:6039
 msgid "ICQ Privacy Options"
-msgstr ""
-
-#: ../libpurple/protocols/oscar/oscar.c:6053
+msgstr "ICQ-privaatheidkeuses"
+
+#: ../libpurple/protocols/oscar/oscar.c:6058
 msgid "The new formatting is invalid."
-msgstr ""
-
-#: ../libpurple/protocols/oscar/oscar.c:6054
+msgstr "Die nuwe formatering ongeldig."
+
+#: ../libpurple/protocols/oscar/oscar.c:6059
 msgid "Screen name formatting can change only capitalization and whitespace."
-msgstr ""
-
-#: ../libpurple/protocols/oscar/oscar.c:6107
+msgstr "Skermnaam-formatering kan net hoofletters en spasies verander."
+
+#: ../libpurple/protocols/oscar/oscar.c:6112
 msgid "Change Address To:"
 msgstr "Verander adres na:"
 
-#: ../libpurple/protocols/oscar/oscar.c:6152
+#: ../libpurple/protocols/oscar/oscar.c:6158
 msgid "<i>you are not waiting for authorization</i>"
-msgstr ""
-
-#: ../libpurple/protocols/oscar/oscar.c:6155
+msgstr "<i>u wag nie vir magtiging nie</i>"
+
+#: ../libpurple/protocols/oscar/oscar.c:6161
 msgid "You are awaiting authorization from the following buddies"
-msgstr ""
-
-#: ../libpurple/protocols/oscar/oscar.c:6156
+msgstr "U wag op magtiging van die volgende vriende"
+
+#: ../libpurple/protocols/oscar/oscar.c:6162
 msgid ""
 "You can re-request authorization from these buddies by right-clicking on "
 "them and selecting \"Re-request Authorization.\""
 msgstr ""
-
-#: ../libpurple/protocols/oscar/oscar.c:6173
+"U kan magtiging van hierdie vriende weer aanvra, deur op hulle te regskliek "
+"en \"Vra weer magtiging aan\" te kies."
+
+#: ../libpurple/protocols/oscar/oscar.c:6179
 msgid "Find Buddy by E-Mail"
 msgstr "Vind vriend volgens e-pos"
 
-#: ../libpurple/protocols/oscar/oscar.c:6174
+#: ../libpurple/protocols/oscar/oscar.c:6180
 msgid "Search for a buddy by e-mail address"
 msgstr "Soek vir 'n vriend volgens e-posadres"
 
-#: ../libpurple/protocols/oscar/oscar.c:6175
+#: ../libpurple/protocols/oscar/oscar.c:6181
 msgid "Type the e-mail address of the buddy you are searching for."
 msgstr "Gee die e-posadres van die vriend waarvoor u soek."
 
-#: ../libpurple/protocols/oscar/oscar.c:6178
+#: ../libpurple/protocols/oscar/oscar.c:6184
 msgid "_Search"
 msgstr "_Soek"
 
-#: ../libpurple/protocols/oscar/oscar.c:6347
+#: ../libpurple/protocols/oscar/oscar.c:6342
 msgid "Set User Info (URL)..."
 msgstr "Stel gebruikerinligting (URL)..."
 
-#: ../libpurple/protocols/oscar/oscar.c:6358
+#: ../libpurple/protocols/oscar/oscar.c:6353
 msgid "Change Password (URL)"
 msgstr "Verander wagwoord (URL)"
 
-#: ../libpurple/protocols/oscar/oscar.c:6362
+#: ../libpurple/protocols/oscar/oscar.c:6357
 msgid "Configure IM Forwarding (URL)"
-msgstr ""
+msgstr "Konfigureer kitsboodskapaanstuur (URL)"
 
 #. ICQ actions
-#: ../libpurple/protocols/oscar/oscar.c:6372
+#: ../libpurple/protocols/oscar/oscar.c:6367
 msgid "Set Privacy Options..."
 msgstr "Stel privaatheidkeuses..."
 
 #. AIM actions
-#: ../libpurple/protocols/oscar/oscar.c:6379
+#: ../libpurple/protocols/oscar/oscar.c:6374
 msgid "Confirm Account"
 msgstr "Bevestig rekening"
 
-#: ../libpurple/protocols/oscar/oscar.c:6383
+#: ../libpurple/protocols/oscar/oscar.c:6378
 msgid "Display Currently Registered E-Mail Address"
 msgstr "Wys e-posadres wat tans geregistreer is"
 
-#: ../libpurple/protocols/oscar/oscar.c:6387
+#: ../libpurple/protocols/oscar/oscar.c:6382
 msgid "Change Currently Registered E-Mail Address..."
 msgstr "Verander e-posadres wat tans geregistreer is..."
 
-#: ../libpurple/protocols/oscar/oscar.c:6394
+#: ../libpurple/protocols/oscar/oscar.c:6389
 msgid "Show Buddies Awaiting Authorization"
 msgstr "Wys vriende wat op magtiging wag"
 
+#: ../libpurple/protocols/oscar/oscar.c:6395
+msgid "Search for Buddy by E-Mail Address..."
+msgstr "Soek vir vriend met e-posadres..."
+
 #: ../libpurple/protocols/oscar/oscar.c:6400
-msgid "Search for Buddy by E-Mail Address..."
-msgstr "Soek vir vriend met e-posadres..."
-
-#: ../libpurple/protocols/oscar/oscar.c:6405
 msgid "Search for Buddy by Information"
 msgstr "Soek vir vriend met inligting"
 
-#: ../libpurple/protocols/oscar/oscar.c:6473
+#: ../libpurple/protocols/oscar/oscar.c:6468
 msgid "Use recent buddies group"
-msgstr ""
-
-#: ../libpurple/protocols/oscar/oscar.c:6476
+msgstr "Gebruik onlangse vriendegroep"
+
+#: ../libpurple/protocols/oscar/oscar.c:6471
 msgid "Show how long you have been idle"
 msgstr "Wys hoe lank u ledig was"
 
-#: ../libpurple/protocols/oscar/oscar.c:6628
+#: ../libpurple/protocols/oscar/oscar.c:6626
 msgid ""
 "Always use ICQ proxy server for file transfers\n"
 "(slower, but does not reveal your IP address)"
 msgstr ""
+"Gebruik altyd ICQ-instaanbediener vir lêeroordrag\n"
+"(stadiger, maar maak nie u IP-adres bekend nie)"
 
 #: ../libpurple/protocols/oscar/peer.c:674
 #, c-format
 msgid "Asking %s to connect to us at %s:%hu for Direct IM."
-msgstr ""
+msgstr "Vra tans %s om aan ons by %s:%hu te verbind vir direkte kitsboodskap."
 
 #: ../libpurple/protocols/oscar/peer.c:759
 #, c-format
 msgid "Attempting to connect to %s:%hu."
-msgstr ""
+msgstr "Probeer tans om aan %s:%hu te verbind."
 
 #: ../libpurple/protocols/oscar/peer.c:833
 msgid "Attempting to connect via proxy server."
-msgstr ""
+msgstr "Probeer tans om via instaanbediener te verbind."
 
 #: ../libpurple/protocols/oscar/peer.c:1010
 #, c-format
 msgid "%s has just asked to directly connect to %s"
-msgstr ""
+msgstr "%s het pas gevra om direk aan %s te verbind"
 
 #: ../libpurple/protocols/oscar/peer.c:1014
 msgid ""
@@ -7343,14 +7867,13 @@
 "for IM Images.  Because your IP address will be revealed, this may be "
 "considered a privacy risk."
 msgstr ""
-
-#: ../libpurple/protocols/oscar/peer.c:1020
-msgid "_Connect"
-msgstr "_Verbind"
+"Hierdie vereis 'n direkte verbinding tussen twee rekenaars en is nodig vir "
+"kitsboodskapprentjies.  Omdat u IP-adres bekend gemaak sal word, kan dit 'n "
+"privaatheidrisiko wees."
 
 #: ../libpurple/protocols/qq/buddy_info.c:39
 msgid "Primary Information"
-msgstr ""
+msgstr "Primêre inligting"
 
 #: ../libpurple/protocols/qq/buddy_info.c:41
 msgid "Personal Introduction"
@@ -7358,31 +7881,31 @@
 
 #: ../libpurple/protocols/qq/buddy_info.c:42
 msgid "QQ Number"
-msgstr ""
+msgstr "QQ-nommer"
 
 #: ../libpurple/protocols/qq/buddy_info.c:47
 msgid "Country/Region"
-msgstr ""
+msgstr "Land/streek"
 
 #: ../libpurple/protocols/qq/buddy_info.c:48
 msgid "Province/State"
-msgstr ""
+msgstr "Provinsie/deelstaat"
 
 #: ../libpurple/protocols/qq/buddy_info.c:50
 msgid "Horoscope Symbol"
-msgstr ""
+msgstr "Horoskoopsimbool"
 
 #: ../libpurple/protocols/qq/buddy_info.c:52
 msgid "Zodiac Sign"
-msgstr ""
+msgstr "Zodiac-teken"
 
 #: ../libpurple/protocols/qq/buddy_info.c:53
 msgid "Blood Type"
-msgstr ""
+msgstr "Bloedgroep"
 
 #: ../libpurple/protocols/qq/buddy_info.c:54
 msgid "College"
-msgstr ""
+msgstr "Kollege"
 
 #: ../libpurple/protocols/qq/buddy_info.c:55
 msgid "Email"
@@ -7394,419 +7917,422 @@
 
 #: ../libpurple/protocols/qq/buddy_info.c:58
 msgid "Cellphone Number"
-msgstr ""
+msgstr "Selfoonnommer"
 
 #: ../libpurple/protocols/qq/buddy_info.c:59
 msgid "Phone Number"
-msgstr ""
+msgstr "Foonnommer"
 
 #: ../libpurple/protocols/qq/buddy_info.c:64
 msgid "Aquarius"
-msgstr ""
+msgstr "Waterdraer"
 
 #: ../libpurple/protocols/qq/buddy_info.c:64
 msgid "Pisces"
-msgstr ""
+msgstr "Visse"
 
 #: ../libpurple/protocols/qq/buddy_info.c:64
 msgid "Aries"
-msgstr ""
+msgstr "Ram"
 
 #: ../libpurple/protocols/qq/buddy_info.c:64
 msgid "Taurus"
-msgstr ""
+msgstr "Stier"
 
 #: ../libpurple/protocols/qq/buddy_info.c:65
 msgid "Gemini"
-msgstr ""
+msgstr "Tweeling"
 
 #: ../libpurple/protocols/qq/buddy_info.c:65
 msgid "Cancer"
-msgstr ""
+msgstr "Krap"
 
 #: ../libpurple/protocols/qq/buddy_info.c:65
 msgid "Leo"
-msgstr ""
+msgstr "Leeu"
 
 #: ../libpurple/protocols/qq/buddy_info.c:65
 msgid "Virgo"
-msgstr ""
+msgstr "Maagd"
 
 #: ../libpurple/protocols/qq/buddy_info.c:65
 msgid "Libra"
-msgstr ""
+msgstr "Weegskaal"
 
 #: ../libpurple/protocols/qq/buddy_info.c:66
 msgid "Scorpio"
-msgstr ""
+msgstr "Skerpioen"
 
 #: ../libpurple/protocols/qq/buddy_info.c:66
 msgid "Sagittarius"
-msgstr ""
+msgstr "Boogskutter"
 
 #: ../libpurple/protocols/qq/buddy_info.c:66
 msgid "Capricorn"
-msgstr ""
+msgstr "Steenbok"
 
 #: ../libpurple/protocols/qq/buddy_info.c:71
 msgid "Rat"
-msgstr ""
+msgstr "Rot"
 
 #: ../libpurple/protocols/qq/buddy_info.c:71
 msgid "Ox"
-msgstr ""
+msgstr "Os"
 
 #: ../libpurple/protocols/qq/buddy_info.c:71
 msgid "Tiger"
-msgstr ""
+msgstr "Tier"
 
 #: ../libpurple/protocols/qq/buddy_info.c:71
 msgid "Rabbit"
-msgstr ""
+msgstr "Haas"
 
 #: ../libpurple/protocols/qq/buddy_info.c:72
 msgid "Dragon"
-msgstr ""
+msgstr "Draak"
 
 #: ../libpurple/protocols/qq/buddy_info.c:72
 msgid "Snake"
-msgstr ""
+msgstr "Slang"
 
 #: ../libpurple/protocols/qq/buddy_info.c:72
 msgid "Horse"
-msgstr ""
+msgstr "Perd"
 
 #: ../libpurple/protocols/qq/buddy_info.c:72
 msgid "Goat"
-msgstr ""
+msgstr "Bok"
 
 #: ../libpurple/protocols/qq/buddy_info.c:72
 msgid "Monkey"
-msgstr ""
+msgstr "Aap"
 
 #: ../libpurple/protocols/qq/buddy_info.c:73
 msgid "Rooster"
-msgstr ""
+msgstr "Haan"
 
 #: ../libpurple/protocols/qq/buddy_info.c:73
 msgid "Dog"
-msgstr ""
+msgstr "Hond"
 
 #: ../libpurple/protocols/qq/buddy_info.c:73
 msgid "Pig"
-msgstr ""
+msgstr "Vark"
 
 #: ../libpurple/protocols/qq/buddy_info.c:78
 msgid "Other"
-msgstr ""
+msgstr "Ander"
 
 #: ../libpurple/protocols/qq/buddy_info.c:481
 #: ../libpurple/protocols/qq/buddy_info.c:482
 msgid "Modify my information"
-msgstr ""
+msgstr "Wysig my inligting"
 
 #: ../libpurple/protocols/qq/buddy_info.c:483
 msgid "Update my information"
-msgstr ""
-
-#: ../libpurple/protocols/qq/buddy_info.c:506
+msgstr "Werk my inligting by"
+
+#: ../libpurple/protocols/qq/buddy_info.c:507
 msgid "Your information has been updated"
-msgstr ""
-
-#: ../libpurple/protocols/qq/buddy_info.c:565
+msgstr "U inliging is bygewerk"
+
+#: ../libpurple/protocols/qq/buddy_info.c:560
+#, c-format
 msgid ""
 "Setting custom faces is not currently supported. Please choose an image from "
-msgstr ""
-
-#: ../libpurple/protocols/qq/buddy_info.c:582
-#: ../libpurple/protocols/qq/buddy_info.c:595
+"%s."
+msgstr ""
+"Doelgemaakte gesiggies word nie tans ondersteun nie. Kies asb. 'n prentjie "
+"uit %s."
+
+#: ../libpurple/protocols/qq/buddy_info.c:577
+#: ../libpurple/protocols/qq/buddy_info.c:590
 msgid "Invalid QQ Face"
-msgstr ""
-
-#: ../libpurple/protocols/qq/buddy_opt.c:207
-#: ../libpurple/protocols/qq/group_opt.c:135
-#, c-format
-msgid "You rejected %d's request"
-msgstr ""
+msgstr "Ongeldige QQ-gesig"
 
 #: ../libpurple/protocols/qq/buddy_opt.c:208
 #: ../libpurple/protocols/qq/group_opt.c:136
+#, c-format
+msgid "You rejected %d's request"
+msgstr "U het %d se versoek geweier"
+
+#: ../libpurple/protocols/qq/buddy_opt.c:209
 msgid "Input your reason:"
-msgstr ""
-
-#: ../libpurple/protocols/qq/buddy_opt.c:210
-msgid "Reject request"
-msgstr ""
-
-#: ../libpurple/protocols/qq/buddy_opt.c:211
-#: ../libpurple/protocols/qq/group_opt.c:139
-msgid "Sorry, you are not my type..."
-msgstr ""
+msgstr "Gee 'n rede:"
 
 #: ../libpurple/protocols/qq/buddy_opt.c:212
-#: ../libpurple/protocols/qq/group_im.c:136
-#: ../libpurple/protocols/qq/group_opt.c:125
-#: ../libpurple/protocols/qq/sys_msg.c:85
-#: ../libpurple/protocols/qq/sys_msg.c:228
+msgid "Reject request"
+msgstr "Weier versoek"
+
+#. title
+#: ../libpurple/protocols/qq/buddy_opt.c:213
+#: ../libpurple/protocols/qq/group_opt.c:141
+msgid "Sorry, you are not my type..."
+msgstr "Jammer, u's nie my tipe nie..."
+
+#: ../libpurple/protocols/qq/buddy_opt.c:214
+#: ../libpurple/protocols/qq/group_im.c:144
+#: ../libpurple/protocols/qq/group_opt.c:127
+#: ../libpurple/protocols/qq/sys_msg.c:90
+#: ../libpurple/protocols/qq/sys_msg.c:246
 msgid "Reject"
-msgstr ""
-
-#: ../libpurple/protocols/qq/buddy_opt.c:272
-msgid "Add buddy with auth request fails"
-msgstr ""
-
-#: ../libpurple/protocols/qq/buddy_opt.c:303
+msgstr "Weier"
+
+#: ../libpurple/protocols/qq/buddy_opt.c:277
+msgid "Add buddy with auth request failed"
+msgstr "Versoek om vriend met magtiging by te voeg het misluk"
+
+#. TODO: We don't really need to notify the user about this, do we?
+#: ../libpurple/protocols/qq/buddy_opt.c:309
 msgid "You have successfully removed a buddy"
-msgstr ""
-
-#: ../libpurple/protocols/qq/buddy_opt.c:331
-msgid "You have successfully removed yourself from a buddy"
-msgstr ""
-
-#: ../libpurple/protocols/qq/buddy_opt.c:395
+msgstr "U het suksesvol 'n vriend verwyder"
+
+#. TODO: Does the user really need to be notified about this?
+#: ../libpurple/protocols/qq/buddy_opt.c:338
+msgid "You have successfully removed yourself from your friend's buddy list"
+msgstr "U het suksesvol uself van 'n vriend se vriendelys verwyder"
+
+#: ../libpurple/protocols/qq/buddy_opt.c:404
 #, c-format
 msgid "User %d needs authentication"
-msgstr ""
-
-#: ../libpurple/protocols/qq/buddy_opt.c:397
-#: ../libpurple/protocols/qq/group_join.c:134
+msgstr "Gebruiker %d kort stawing"
+
+#: ../libpurple/protocols/qq/buddy_opt.c:406
+#: ../libpurple/protocols/qq/group_join.c:136
 msgid "Input request here"
-msgstr ""
-
-#: ../libpurple/protocols/qq/buddy_opt.c:398
-#: ../libpurple/protocols/qq/group_join.c:135
+msgstr "Gee versoek hier"
+
+#. TODO: Awkward string to fix post string freeze - standardize auth dialogues? -evands
+#: ../libpurple/protocols/qq/buddy_opt.c:407
+#: ../libpurple/protocols/qq/group_join.c:137
 msgid "Would you be my friend?"
-msgstr ""
-
-#: ../libpurple/protocols/qq/buddy_opt.c:399
-#: ../libpurple/protocols/qq/group_join.c:136
-#: ../libpurple/protocols/qq/group_opt.c:140
+msgstr "Sal u my vriend wees?"
+
+#. multiline
+#. masked
+#. hint
+#: ../libpurple/protocols/qq/buddy_opt.c:408
+#: ../libpurple/protocols/qq/group_join.c:138
+#: ../libpurple/protocols/qq/group_opt.c:143
 msgid "Send"
 msgstr "Stuur"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:406
-#, c-format
-msgid "You have added %d in buddy list"
-msgstr ""
-
-#: ../libpurple/protocols/qq/buddy_opt.c:503
+#: ../libpurple/protocols/qq/buddy_opt.c:418
+#, c-format
+msgid "You have added %d to buddy list"
+msgstr "U het %d by vriendelys gevoeg"
+
+#: ../libpurple/protocols/qq/buddy_opt.c:515
 msgid "QQid Error"
-msgstr ""
-
-#: ../libpurple/protocols/qq/buddy_opt.c:504
+msgstr "QQid-fout"
+
+#: ../libpurple/protocols/qq/buddy_opt.c:516
 msgid "Invalid QQid"
-msgstr ""
+msgstr "Ongeldige QQid"
 
 #: ../libpurple/protocols/qq/group.c:65
 msgid "ID: "
-msgstr ""
+msgstr "ID: "
 
 #: ../libpurple/protocols/qq/group.c:98
 msgid "Group ID"
-msgstr ""
+msgstr "Groep-ID"
 
 #: ../libpurple/protocols/qq/group.c:100
 msgid "Creator"
-msgstr ""
+msgstr "Skepper"
 
 #: ../libpurple/protocols/qq/group.c:103
 msgid "Group Description"
-msgstr ""
+msgstr "Groepbeskrywing"
 
 #: ../libpurple/protocols/qq/group.c:109
 msgid "Auth"
-msgstr ""
+msgstr "Magtiging"
 
 #: ../libpurple/protocols/qq/group.c:119
 msgid "QQ Qun"
-msgstr ""
+msgstr "QQ-qun"
 
 #: ../libpurple/protocols/qq/group.c:120
-msgid "Please input external group ID"
-msgstr ""
+msgid "Please enter external group ID"
+msgstr "Gee asb. eksterne groep-ID"
 
 #: ../libpurple/protocols/qq/group.c:121
 msgid "You can only search for permanent QQ groups\n"
-msgstr ""
-
-#: ../libpurple/protocols/qq/group_im.c:122
-#, c-format
-msgid "User %d applied to join group %d"
-msgstr ""
-
-#: ../libpurple/protocols/qq/group_im.c:123
-#: ../libpurple/protocols/qq/group_im.c:172
-#: ../libpurple/protocols/qq/sys_msg.c:180
+msgstr "U kan net vir permanente QQ-groepe soek\n"
+
+#: ../libpurple/protocols/qq/group_im.c:126
+#, c-format
+msgid "User %d requested to join group %d"
+msgstr "Gebruiker %d het versoek om by groep %d aan te sluit"
+
+#: ../libpurple/protocols/qq/group_im.c:127
+#: ../libpurple/protocols/qq/group_im.c:181
+#: ../libpurple/protocols/qq/sys_msg.c:193
 #, c-format
 msgid "Reason: %s"
-msgstr ""
-
-#: ../libpurple/protocols/qq/group_im.c:130
-#: ../libpurple/protocols/qq/group_im.c:174
-#: ../libpurple/protocols/qq/group_im.c:214
-#: ../libpurple/protocols/qq/group_im.c:249
-#: ../libpurple/protocols/qq/group_im.c:283
-#: ../libpurple/protocols/qq/group_join.c:229
-#: ../libpurple/protocols/qq/group_join.c:355
-#: ../libpurple/protocols/qq/group_opt.c:230
-#: ../libpurple/protocols/qq/group_opt.c:300
-#: ../libpurple/protocols/qq/group_opt.c:386
+msgstr "Rede: %s"
+
+#: ../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 ""
-
-#: ../libpurple/protocols/qq/group_im.c:133
-#: ../libpurple/protocols/qq/group_opt.c:127
-#: ../libpurple/protocols/qq/sys_msg.c:87
-#: ../libpurple/protocols/qq/sys_msg.c:230
+msgstr "QQ-qun-bewerking"
+
+#: ../libpurple/protocols/qq/group_im.c:141
+#: ../libpurple/protocols/qq/group_opt.c:128
+#: ../libpurple/protocols/qq/sys_msg.c:91
+#: ../libpurple/protocols/qq/sys_msg.c:248
 msgid "Approve"
-msgstr ""
-
-#: ../libpurple/protocols/qq/group_im.c:171
-#, c-format
-msgid "You request to join group %d has been rejected by admin %d"
-msgstr ""
-
-#: ../libpurple/protocols/qq/group_im.c:212
-#, c-format
-msgid "You request to join group %d has been approved by admin %d"
-msgstr ""
-
-#: ../libpurple/protocols/qq/group_im.c:248
-#, c-format
-msgid "You [%d] has exit group \"%d\""
-msgstr ""
-
-#: ../libpurple/protocols/qq/group_im.c:282
-#, c-format
-msgid "You [%d] has been added by group \"%d\""
-msgstr ""
-
-#: ../libpurple/protocols/qq/group_im.c:283
+msgstr "Goedkeur"
+
+#: ../libpurple/protocols/qq/group_im.c:180
+#, c-format
+msgid "Your request to join group %d has been rejected by admin %d"
+msgstr "U versoek om by groep %d aan te sluit, is deur admin %d geweier"
+
+#: ../libpurple/protocols/qq/group_im.c:221
+#, c-format
+msgid "Your request to join group %d has been approved by admin %d"
+msgstr "U versoek om by groep %d aan te sluit, is deur admin %d goed gekeur"
+
+#: ../libpurple/protocols/qq/group_im.c:257
+#, c-format
+msgid "You [%d] have left group \"%d\""
+msgstr "U [%d] het groep \"%d\" verlaat"
+
+#: ../libpurple/protocols/qq/group_im.c:291
+#, c-format
+msgid "You [%d] have been added to group \"%d\""
+msgstr "U [%d] is by groep \"%d\" gevoeg"
+
+#: ../libpurple/protocols/qq/group_im.c:292
 msgid "This group has been added to your buddy list"
-msgstr ""
+msgstr "Hierdie groep is by u vriendelys gevoeg"
 
 #: ../libpurple/protocols/qq/group_internal.c:41
-msgid "I am not member"
-msgstr ""
+msgid "I am not a member"
+msgstr "Ek is nie 'n lid nie"
 
 #: ../libpurple/protocols/qq/group_internal.c:44
 msgid "I am a member"
-msgstr ""
+msgstr "Ek is 'n lid"
 
 #: ../libpurple/protocols/qq/group_internal.c:47
 msgid "I am applying to join"
-msgstr ""
+msgstr "Ek doen aansoek om aan te sluit"
 
 #: ../libpurple/protocols/qq/group_internal.c:50
 msgid "I am the admin"
-msgstr ""
+msgstr "Ek is die admin"
 
 #: ../libpurple/protocols/qq/group_internal.c:53
 msgid "Unknown status"
-msgstr ""
-
-#: ../libpurple/protocols/qq/group_join.c:80
+msgstr "Onbekende status"
+
+#: ../libpurple/protocols/qq/group_join.c:82
 msgid "This group does not allow others to join"
-msgstr ""
-
-#: ../libpurple/protocols/qq/group_join.c:229
-msgid "You have successfully exited the group"
-msgstr ""
-
-#: ../libpurple/protocols/qq/group_join.c:253
+msgstr "Hierdie groep laat nie ander toe om aan te sluit nie"
+
+#: ../libpurple/protocols/qq/group_join.c:233
+msgid "You have successfully left the group"
+msgstr "U het die groep suksesvol verlaat"
+
+#: ../libpurple/protocols/qq/group_join.c:257
 msgid "QQ Group Auth"
-msgstr ""
-
-#: ../libpurple/protocols/qq/group_join.c:254
-msgid "Your authorization operation has been accepted by the QQ server"
-msgstr ""
-
-#: ../libpurple/protocols/qq/group_join.c:325
-msgid "You inputted a group id outside the acceptable range"
-msgstr ""
-
-#: ../libpurple/protocols/qq/group_join.c:356
-msgid "Are you sure to exit this Qun?"
-msgstr ""
-
-#: ../libpurple/protocols/qq/group_join.c:358
+msgstr "QQ-groep-magtiging"
+
+#: ../libpurple/protocols/qq/group_join.c:258
+msgid "Your authorization request has been accepted by the QQ server"
+msgstr "U magtigingversoek is deur die QQ-bediener aanvaar"
+
+#: ../libpurple/protocols/qq/group_join.c:329
+msgid "You entered a group ID outside the acceptable range"
+msgstr "U het 'n groep-ID gegee buite die aanvaarbare bestek"
+
+#: ../libpurple/protocols/qq/group_join.c:360
+msgid "Are you sure you want to leave this Qun?"
+msgstr "Wil u definitief hierdie qun verlaat?"
+
+#: ../libpurple/protocols/qq/group_join.c:362
 msgid ""
 "Note, if you are the creator, \n"
 "this operation will eventually remove this Qun."
 msgstr ""
-
-#: ../libpurple/protocols/qq/group_join.c:361
-msgid "Go ahead"
-msgstr ""
-
-#: ../libpurple/protocols/qq/group_network.c:90
+"Let wel, as u die skepper is, \n"
+"sal hierdie bewerking eindelik hierdie qun verwyder."
+
+#: ../libpurple/protocols/qq/group_network.c:92
 #, c-format
 msgid "Code [0x%02X]: %s"
-msgstr ""
-
-#: ../libpurple/protocols/qq/group_network.c:91
+msgstr "Kode [0x%02X]: %s"
+
+#: ../libpurple/protocols/qq/group_network.c:93
 msgid "Group Operation Error"
-msgstr ""
-
+msgstr "Groepbewerkingsfout"
+
+#. we want to see window
 #: ../libpurple/protocols/qq/group_opt.c:124
-#: ../libpurple/protocols/qq/sys_msg.c:84
-msgid "Do you wanna approve the request?"
-msgstr ""
-
-#: ../libpurple/protocols/qq/group_opt.c:230
-msgid "You have successfully modify Qun member"
-msgstr ""
-
-#: ../libpurple/protocols/qq/group_opt.c:300
-msgid "You have successfully modify Qun information"
-msgstr ""
-
-#: ../libpurple/protocols/qq/group_opt.c:387
+#: ../libpurple/protocols/qq/sys_msg.c:87
+msgid "Do you want to approve the request?"
+msgstr "Wil u die versoek toestaan?"
+
+#: ../libpurple/protocols/qq/group_opt.c:137
+msgid "Enter your reason:"
+msgstr "Gee u rede:"
+
+#: ../libpurple/protocols/qq/group_opt.c:235
+msgid "You have successfully modified Qun member"
+msgstr "U het qun-lid suksesvol gewysig"
+
+#: ../libpurple/protocols/qq/group_opt.c:305
+msgid "You have successfully modified Qun information"
+msgstr "U het qun-inligting suksesvol gewysig"
+
+#: ../libpurple/protocols/qq/group_opt.c:392
 msgid "You have successfully created a Qun"
-msgstr ""
-
-#: ../libpurple/protocols/qq/group_opt.c:389
+msgstr "U het 'n qun suksesvol geskep"
+
+#: ../libpurple/protocols/qq/group_opt.c:394
 msgid "Would you like to set up the Qun details now?"
-msgstr ""
-
-#: ../libpurple/protocols/qq/group_opt.c:390
+msgstr "Wil u die qun-detail nou opstel?"
+
+#: ../libpurple/protocols/qq/group_opt.c:398
 msgid "Setup"
-msgstr ""
-
-#: ../libpurple/protocols/qq/im.c:423
+msgstr "Opstel"
+
+#: ../libpurple/protocols/qq/im.c:432
 msgid "System Message"
 msgstr "Stelselboodskap"
 
-#: ../libpurple/protocols/qq/im.c:567
-msgid "Server ACK"
-msgstr ""
-
-#: ../libpurple/protocols/qq/im.c:567
-msgid "Send IM fail\n"
-msgstr ""
-
-#: ../libpurple/protocols/qq/keep_alive.c:85
-msgid "Keep alive error, seems connection lost!"
-msgstr ""
+#: ../libpurple/protocols/qq/im.c:576
+msgid "Failed to send IM."
+msgstr "Stuur van kitsboodskap het misluk."
+
+#: ../libpurple/protocols/qq/keep_alive.c:87
+msgid "Keep alive error"
+msgstr "Wakkerhou-fout"
 
 #: ../libpurple/protocols/qq/login_logout.c:408
-msgid "Request login token error!"
-msgstr ""
+msgid "Error requesting login token"
+msgstr "Fout met versoek van aanmeldteken"
 
 #: ../libpurple/protocols/qq/login_logout.c:486
 msgid "Unable to login, check debug log"
-msgstr ""
+msgstr "Kon nie aanmeld nie, kontroleer ontfoutstaaflêer"
 
 #. we didn't successfully connect. tdt->toc_fd is valid here
-#. TODO: Include error_message in the message below
 #: ../libpurple/protocols/qq/qq.c:139 ../libpurple/protocols/toc/toc.c:173
-#: ../libpurple/protocols/yahoo/yahoo.c:2375
-#: ../libpurple/protocols/yahoo/yahoo.c:2403
-#: ../libpurple/protocols/yahoo/yahoo.c:2510
-#: ../libpurple/protocols/yahoo/yahoo.c:2531
-#: ../libpurple/protocols/yahoo/yahoo.c:2615
-#: ../libpurple/protocols/yahoo/yahoo_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 "Kan nie verbind nie."
@@ -7816,94 +8342,85 @@
 msgid "Unknown-%d"
 msgstr "Onbekend-%d"
 
-#: ../libpurple/protocols/qq/qq.c:209
-#, c-format
-msgid "%s Address"
-msgstr "%s-adres"
-
-#: ../libpurple/protocols/qq/qq.c:240
+#: ../libpurple/protocols/qq/qq.c:211
+msgid "TCP Address"
+msgstr "TCP-adres"
+
+#: ../libpurple/protocols/qq/qq.c:213
+msgid "UDP Address"
+msgstr "UDP-adres"
+
+#: ../libpurple/protocols/qq/qq.c:242
 msgid "Level"
 msgstr "Vlak"
 
-#: ../libpurple/protocols/qq/qq.c:278
-msgid "QQ: Available"
-msgstr "QQ: Beskikaar"
-
-#: ../libpurple/protocols/qq/qq.c:282
-msgid "QQ: Away"
-msgstr "QQ: Weg"
-
-#: ../libpurple/protocols/qq/qq.c:286
-msgid "QQ: Invisible"
-msgstr "QQ: Onsigbaar"
-
-#: ../libpurple/protocols/qq/qq.c:290
-msgid "QQ: Offline"
-msgstr "QQ: Aflyn"
-
-#: ../libpurple/protocols/qq/qq.c:371
+#: ../libpurple/protocols/qq/qq.c:373
 msgid "Invalid name"
 msgstr "Ongeldige naam"
 
-#: ../libpurple/protocols/qq/qq.c:438
+#: ../libpurple/protocols/qq/qq.c:439
 #, c-format
 msgid "<b>Current Online</b>: %d<br>\n"
-msgstr ""
-
-#: ../libpurple/protocols/qq/qq.c:439
+msgstr "<b>Tans aanlyn</b>: %d<br>\n"
+
+#: ../libpurple/protocols/qq/qq.c:440
 #, c-format
 msgid "<b>Last Refresh</b>: %s<br>\n"
-msgstr ""
-
-#: ../libpurple/protocols/qq/qq.c:443
+msgstr "<b>Vorige verfrissing</b>: %s<br>\n"
+
+#: ../libpurple/protocols/qq/qq.c:444
 #, c-format
 msgid "<b>Connection Mode</b>: %s<br>\n"
-msgstr ""
-
-#: ../libpurple/protocols/qq/qq.c:444
+msgstr "<b>Verbindingmodus</b>: %s<br>\n"
+
+#: ../libpurple/protocols/qq/qq.c:445
 #, c-format
 msgid "<b>Server IP</b>: %s: %d<br>\n"
-msgstr ""
-
-#: ../libpurple/protocols/qq/qq.c:445
+msgstr "<b>Bediener-IP</b>: %s: %d<br>\n"
+
+#: ../libpurple/protocols/qq/qq.c:446
 #, c-format
 msgid "<b>My Public IP</b>: %s<br>\n"
-msgstr ""
-
-#: ../libpurple/protocols/qq/qq.c:450
+msgstr "<b>My publieke IP</b>: %s<br>\n"
+
+#: ../libpurple/protocols/qq/qq.c:451
 #, c-format
 msgid "<b>Login Time</b>: %s<br>\n"
-msgstr ""
-
-#: ../libpurple/protocols/qq/qq.c:451
-#, c-format
-msgid "<b>Last Login IP</b>: %s<br>\n"
-msgstr ""
+msgstr "<b>Aanmeldtyd</b>: %s<br>\n"
 
 #: ../libpurple/protocols/qq/qq.c:452
 #, c-format
+msgid "<b>Last Login IP</b>: %s<br>\n"
+msgstr "<b>Vorige aanmeld-IP</b>: %s<br>\n"
+
+#: ../libpurple/protocols/qq/qq.c:453
+#, c-format
 msgid "<b>Last Login Time</b>: %s\n"
-msgstr ""
-
-#: ../libpurple/protocols/qq/qq.c:456
+msgstr "<b>Vorige aanmeldtyd</b>: %s\n"
+
+#: ../libpurple/protocols/qq/qq.c:457
 msgid "Login Information"
 msgstr "Aanmeldinligting"
 
-#: ../libpurple/protocols/qq/qq.c:531
-msgid "Modify My Information"
-msgstr ""
-
-#: ../libpurple/protocols/qq/qq.c:534 ../libpurple/protocols/toc/toc.c:1680
+#: ../libpurple/protocols/qq/qq.c:533
+msgid "Set My Information"
+msgstr "Stel my bedienerinligting"
+
+#: ../libpurple/protocols/qq/qq.c:536 ../libpurple/protocols/toc/toc.c:1680
 msgid "Change Password"
 msgstr "Verander wagwoord"
 
-#: ../libpurple/protocols/qq/qq.c:537
+#: ../libpurple/protocols/qq/qq.c:539
 msgid "Show Login Information"
-msgstr ""
-
-#: ../libpurple/protocols/qq/qq.c:558
-msgid "Exit this QQ Qun"
-msgstr ""
+msgstr "Wys aanmeldinligting"
+
+#: ../libpurple/protocols/qq/qq.c:560
+msgid "Leave this QQ Qun"
+msgstr "Verlaat hierdie QQ-qun"
+
+#: ../libpurple/protocols/qq/qq.c:584
+msgid "Block this buddy"
+msgstr "Blokkeer hierdie vriend"
 
 #. *< type
 #. *< ui_requirement
@@ -7915,25 +8432,13 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/qq/qq.c:719 ../libpurple/protocols/qq/qq.c:721
+#: ../libpurple/protocols/qq/qq.c:725 ../libpurple/protocols/qq/qq.c:727
 msgid "QQ Protocol\tPlugin"
 msgstr "QQ-protokol-\tinprop"
 
-#: ../libpurple/protocols/qq/qq.c:740
-msgid "Login in TCP"
-msgstr ""
-
-#: ../libpurple/protocols/qq/qq.c:743
-msgid "Login Hidden"
-msgstr ""
-
-#: ../libpurple/protocols/qq/qq_proxy.c:497
-msgid "Socket send error"
-msgstr ""
-
-#: ../libpurple/protocols/qq/qq_proxy.c:500
-msgid "Connection refused"
-msgstr "Verbinding gewyer"
+#: ../libpurple/protocols/qq/qq.c:752
+msgid "Connect using TCP"
+msgstr "Verbind met TCP"
 
 #: ../libpurple/protocols/qq/recv_core.c:309
 msgid "Socket error"
@@ -7941,145 +8446,145 @@
 
 #: ../libpurple/protocols/qq/recv_core.c:319
 msgid "Unable to read from socket"
-msgstr ""
-
-#: ../libpurple/protocols/qq/send_file.c:706
+msgstr "Kan nie van sok lees nie"
+
+#: ../libpurple/protocols/qq/send_file.c:707
 #, c-format
 msgid "%d has declined the file %s"
-msgstr ""
-
-#: ../libpurple/protocols/qq/send_file.c:709
-#: ../libpurple/protocols/qq/send_file.c:738
+msgstr "%d het die lêer %s geweier"
+
+#: ../libpurple/protocols/qq/send_file.c:710
+#: ../libpurple/protocols/qq/send_file.c:739
 msgid "File Send"
-msgstr ""
-
-#: ../libpurple/protocols/qq/send_file.c:735
+msgstr "Lêer stuur"
+
+#: ../libpurple/protocols/qq/send_file.c:736
 #, c-format
 msgid "%d canceled the transfer of %s"
 msgstr "%d het die oordrag van %s gekanselleer"
 
-#: ../libpurple/protocols/qq/sendqueue.c:122
+#: ../libpurple/protocols/qq/sendqueue.c:123
 msgid "Connection lost"
 msgstr "Verbinding verloor"
 
 #. cancel login progress
-#: ../libpurple/protocols/qq/sendqueue.c:130
+#: ../libpurple/protocols/qq/sendqueue.c:131
 msgid "Login failed, no reply"
-msgstr ""
-
-#: ../libpurple/protocols/qq/sys_msg.c:103
-msgid "Do you wanna add this buddy?"
-msgstr ""
+msgstr "Aanmeld het misluk, geen antwoord nie"
+
+#: ../libpurple/protocols/qq/sys_msg.c:110
+msgid "Do you want to add this buddy?"
+msgstr "Wil u hierdie vriend byvoeg?"
 
 #. only need to get value
-#: ../libpurple/protocols/qq/sys_msg.c:155
+#: ../libpurple/protocols/qq/sys_msg.c:166
 #, c-format
 msgid "You have been added by %s"
-msgstr ""
-
-#: ../libpurple/protocols/qq/sys_msg.c:158
+msgstr "U is deur %s bygevoeg"
+
+#: ../libpurple/protocols/qq/sys_msg.c:169
 msgid "Would like to add him?"
-msgstr ""
-
-#: ../libpurple/protocols/qq/sys_msg.c:164
-#, c-format
-msgid "%s has added you [%s]"
-msgstr ""
-
-#: ../libpurple/protocols/qq/sys_msg.c:179
+msgstr "Wil u hom byvoeg?"
+
+#: ../libpurple/protocols/qq/sys_msg.c:176
+#, c-format
+msgid "%s has added you [%s] to his or her buddy list"
+msgstr "%s het u [%s] by sy of haar vriendelys gevoeg"
+
+#: ../libpurple/protocols/qq/sys_msg.c:192
 #, c-format
 msgid "User %s rejected your request"
-msgstr ""
-
-#: ../libpurple/protocols/qq/sys_msg.c:199
-#, c-format
-msgid "User %s has approved your request"
-msgstr ""
-
-#: ../libpurple/protocols/qq/sys_msg.c:222
-#, c-format
-msgid "%s wanna add you [%s] as friends"
-msgstr ""
-
-#: ../libpurple/protocols/qq/sys_msg.c:223
+msgstr "Gebruiker %s het u versoek geweier"
+
+#: ../libpurple/protocols/qq/sys_msg.c:212
+#, c-format
+msgid "User %s approved your request"
+msgstr "Gebruiker %s het u versoek goed gekeur"
+
+#. TODO: this should go through purple_account_request_authorization()
+#: ../libpurple/protocols/qq/sys_msg.c:238
+#, c-format
+msgid "%s wants to add you [%s] as a friend"
+msgstr "%s wil u [%s] as vriend byvoeg"
+
+#: ../libpurple/protocols/qq/sys_msg.c:239
 #, c-format
 msgid "Message: %s"
-msgstr ""
-
-#: ../libpurple/protocols/qq/sys_msg.c:244
+msgstr "Boodskap: %s"
+
+#: ../libpurple/protocols/qq/sys_msg.c:261
 #, c-format
 msgid "%s is not in your buddy list"
-msgstr ""
-
-#: ../libpurple/protocols/qq/sys_msg.c:246
+msgstr "%s is nie in u vriendelys nie"
+
+#: ../libpurple/protocols/qq/sys_msg.c:263
 msgid "Would you like to add him?"
-msgstr ""
+msgstr "Wil u hom byvoeg?"
 
 #: ../libpurple/protocols/sametime/sametime.c:417
 msgid "Connection closed (writing)"
-msgstr ""
+msgstr "Verbinding gesluit (skrif)"
 
 #: ../libpurple/protocols/sametime/sametime.c:1290
 #, c-format
 msgid "<b>Group Title:</b> %s<br>"
-msgstr ""
+msgstr "<b>Groeptitel:</b> %s<br>"
 
 #: ../libpurple/protocols/sametime/sametime.c:1291
 #, c-format
 msgid "<b>Notes Group ID:</b> %s<br>"
-msgstr ""
+msgstr "<b>Notasgroep-ID:</b> %s<br>"
 
 #: ../libpurple/protocols/sametime/sametime.c:1293
 #, c-format
 msgid "Info for Group %s"
-msgstr ""
+msgstr "Inligting vir groep %s"
 
 #: ../libpurple/protocols/sametime/sametime.c:1295
 msgid "Notes Address Book Information"
-msgstr ""
+msgstr "Notasadresboekinligting"
 
 #: ../libpurple/protocols/sametime/sametime.c:1327
 msgid "Invite Group to Conference..."
-msgstr ""
+msgstr "Nooi groep na konferensie..."
 
 #: ../libpurple/protocols/sametime/sametime.c:1337
 msgid "Get Notes Address Book Info"
-msgstr ""
+msgstr "Kry notasadresboekinligting"
 
 #: ../libpurple/protocols/sametime/sametime.c:1504
 msgid "Sending Handshake"
-msgstr ""
+msgstr "Stuur bladskud"
 
 #: ../libpurple/protocols/sametime/sametime.c:1509
 msgid "Waiting for Handshake Acknowledgement"
-msgstr ""
+msgstr "Wag vir bladskuderkenning"
 
 #: ../libpurple/protocols/sametime/sametime.c:1514
 msgid "Handshake Acknowledged, Sending Login"
-msgstr ""
+msgstr "Bladskud erken, stuur tans aanmelding"
 
 #: ../libpurple/protocols/sametime/sametime.c:1519
 msgid "Waiting for Login Acknowledgement"
-msgstr ""
+msgstr "Wag tans vir aanmelderkenning"
 
 #: ../libpurple/protocols/sametime/sametime.c:1524
 msgid "Login Redirected"
-msgstr ""
+msgstr "Aanmeld herlei"
 
 #: ../libpurple/protocols/sametime/sametime.c:1530
 msgid "Forcing Login"
-msgstr ""
+msgstr "Dwing aanmeld af"
 
 #: ../libpurple/protocols/sametime/sametime.c:1534
 msgid "Login Acknowledged"
-msgstr ""
+msgstr "Aanmeld erken"
 
 #: ../libpurple/protocols/sametime/sametime.c:1539
 msgid "Starting Services"
-msgstr ""
+msgstr "Begin tans dienste"
 
 #: ../libpurple/protocols/sametime/sametime.c:1544
-#, fuzzy
 msgid "Connected"
 msgstr "Verbind"
 
@@ -8088,72 +8593,74 @@
 msgid ""
 "A Sametime administrator has issued the following announcement on server %s"
 msgstr ""
+"'n Selfdetyd-administrateur het die volgende aankondiging op bediener %s "
+"uitgevaardig"
 
 #: ../libpurple/protocols/sametime/sametime.c:1650
 msgid "Sametime Administrator Announcement"
-msgstr ""
+msgstr "Selfdetyd-administrateur se aankondiging"
 
 #: ../libpurple/protocols/sametime/sametime.c:1702
 msgid "Connection reset"
-msgstr ""
+msgstr "Verbinding teruggestel"
 
 #: ../libpurple/protocols/sametime/sametime.c:1709
 #, c-format
 msgid "Error reading from socket: %s"
-msgstr ""
+msgstr "Fout met lees van sok: %s"
 
 #. this is a regular connect, error out
 #: ../libpurple/protocols/sametime/sametime.c:1732
-#: ../libpurple/protocols/sametime/sametime.c:3724
+#: ../libpurple/protocols/sametime/sametime.c:3727
 msgid "Unable to connect to host"
 msgstr "Kon nie aan gasheer verbind nie"
 
 #: ../libpurple/protocols/sametime/sametime.c:1770
 #, c-format
 msgid "Announcement from %s"
-msgstr ""
+msgstr "Aankondiging van %s"
 
 #: ../libpurple/protocols/sametime/sametime.c:1944
 msgid "Conference Closed"
-msgstr ""
+msgstr "Konferensie gesluit"
 
 #: ../libpurple/protocols/sametime/sametime.c:2403
 msgid "Unable to send message: "
 msgstr "Kan nie boodskap stuur nie: "
 
-#: ../libpurple/protocols/sametime/sametime.c:2960
+#: ../libpurple/protocols/sametime/sametime.c:2959
 msgid "Place Closed"
-msgstr ""
+msgstr "Plek gesluit"
 
 #: ../libpurple/protocols/sametime/sametime.c:3230
 msgid "Microphone"
-msgstr ""
+msgstr "Mikrofoon"
 
 #: ../libpurple/protocols/sametime/sametime.c:3231
 msgid "Speakers"
-msgstr ""
+msgstr "Luidsprekers"
 
 #: ../libpurple/protocols/sametime/sametime.c:3232
 msgid "Video Camera"
-msgstr ""
+msgstr "Videokamera"
 
 #: ../libpurple/protocols/sametime/sametime.c:3236
 msgid "File Transfer"
 msgstr "Lêeroordrag"
 
 #: ../libpurple/protocols/sametime/sametime.c:3270
-#: ../libpurple/protocols/sametime/sametime.c:4144
+#: ../libpurple/protocols/sametime/sametime.c:4146
 msgid "Supports"
 msgstr "Ondersteun"
 
 #: ../libpurple/protocols/sametime/sametime.c:3275
-#: ../libpurple/protocols/sametime/sametime.c:4118
+#: ../libpurple/protocols/sametime/sametime.c:4120
 msgid "External User"
-msgstr ""
+msgstr "Eksterne gebruiker"
 
 #: ../libpurple/protocols/sametime/sametime.c:3381
 msgid "Create conference with user"
-msgstr ""
+msgstr "Skep konferensie met gebruiker"
 
 #: ../libpurple/protocols/sametime/sametime.c:3382
 #, c-format
@@ -8161,689 +8668,880 @@
 "Please enter a topic for the new conference, and an invitation message to be "
 "sent to %s"
 msgstr ""
+"Gee asb. 'n onderwerp vir die nuwe konferensie, en 'n uitnodigingboodskap "
+"wat aan %s gestuur moet word"
 
 #: ../libpurple/protocols/sametime/sametime.c:3386
 msgid "New Conference"
-msgstr ""
+msgstr "Nuwe konferensie"
 
 #: ../libpurple/protocols/sametime/sametime.c:3388
 msgid "Create"
-msgstr ""
-
-#: ../libpurple/protocols/sametime/sametime.c:3452
+msgstr "Skep"
+
+#: ../libpurple/protocols/sametime/sametime.c:3453
 msgid "Available Conferences"
-msgstr ""
-
-#: ../libpurple/protocols/sametime/sametime.c:3458
+msgstr "Beskikbare konferensies"
+
+#: ../libpurple/protocols/sametime/sametime.c:3459
 msgid "Create New Conference..."
-msgstr ""
-
-#: ../libpurple/protocols/sametime/sametime.c:3465
-msgid "Invite user to a conference"
-msgstr ""
+msgstr "Skep nuwe konferensie..."
 
 #: ../libpurple/protocols/sametime/sametime.c:3466
+msgid "Invite user to a conference"
+msgstr "Nooi gebruiker na 'n konferensie"
+
+#: ../libpurple/protocols/sametime/sametime.c:3467
 #, c-format
 msgid ""
 "Select a conference from the list below to send an invite to user %s. Select "
 "\"Create New Conference\" if you'd like to create a new conference to invite "
 "this user to."
 msgstr ""
-
-#: ../libpurple/protocols/sametime/sametime.c:3471
+"Kies 'n konferensie uit die lys hier onder om 'n uitnodiging aan gebruiker %"
+"s te stuur. Kies \"Skep nuwe konferensie\" as u 'n nuwe konferensie wil skep "
+"om hierdie gebruiker na uit te nooi."
+
+#: ../libpurple/protocols/sametime/sametime.c:3472
 msgid "Invite to Conference"
-msgstr ""
-
-#: ../libpurple/protocols/sametime/sametime.c:3561
+msgstr "Nooi na konferensie"
+
+#: ../libpurple/protocols/sametime/sametime.c:3563
 msgid "Invite to Conference..."
-msgstr ""
-
-#: ../libpurple/protocols/sametime/sametime.c:3566
+msgstr "Nooi na konferensie..."
+
+#: ../libpurple/protocols/sametime/sametime.c:3568
 msgid "Send TEST Announcement"
-msgstr ""
-
-#: ../libpurple/protocols/sametime/sametime.c:3585 ../pidgin/gtkconv.c:4161
+msgstr "Stuur TEST-aankondiging"
+
+#: ../libpurple/protocols/sametime/sametime.c:3587 ../pidgin/gtkconv.c:4307
 msgid "Topic:"
 msgstr "Onderwerp:"
 
-#: ../libpurple/protocols/sametime/sametime.c:3613
+#: ../libpurple/protocols/sametime/sametime.c:3615
 msgid "No Sametime Community Server specified"
-msgstr ""
-
-#: ../libpurple/protocols/sametime/sametime.c:3635
+msgstr "Geen selfdetyd-gemeenskapsbediener gespesifiseer nie"
+
+#: ../libpurple/protocols/sametime/sametime.c:3637
 #, c-format
 msgid ""
 "No host or IP address has been configured for the Meanwhile account %s. "
 "Please enter one below to continue logging in."
 msgstr ""
-
-#: ../libpurple/protocols/sametime/sametime.c:3640
+"Geen gasheer of IP-adres is vir die Intussen-rekening %s gekonfigureer nie. "
+"Gee asb. een hier onder om steeds aan te meld."
+
+#: ../libpurple/protocols/sametime/sametime.c:3642
 msgid "Meanwhile Connection Setup"
-msgstr ""
-
-#: ../libpurple/protocols/sametime/sametime.c:3641
+msgstr "Opstelling van Intussen-verbinding"
+
+#: ../libpurple/protocols/sametime/sametime.c:3643
 msgid "No Sametime Community Server Specified"
-msgstr ""
-
-#: ../libpurple/protocols/sametime/sametime.c:4134
-#, c-format
-msgid "Unknown (0x%04x)<br>"
-msgstr ""
+msgstr "Geen selfdetyd-gemeenskapsbediener gespesifiseer nie"
+
+#: ../libpurple/protocols/sametime/sametime.c:3645 ../pidgin/gtkblist.c:4024
+msgid "Connect"
+msgstr "Verbind"
 
 #: ../libpurple/protocols/sametime/sametime.c:4136
+#, c-format
+msgid "Unknown (0x%04x)<br>"
+msgstr "Onbekend (0x%04x)<br>"
+
+#: ../libpurple/protocols/sametime/sametime.c:4138
 msgid "Last Known Client"
-msgstr ""
-
-#: ../libpurple/protocols/sametime/sametime.c:4300
-#: ../libpurple/protocols/sametime/sametime.c:5495
+msgstr "Vorige bekende kliënt"
+
+#: ../libpurple/protocols/sametime/sametime.c:4302
+#: ../libpurple/protocols/sametime/sametime.c:5507
 msgid "User Name"
 msgstr "Gebruikernaam"
 
-#: ../libpurple/protocols/sametime/sametime.c:4303
-#: ../libpurple/protocols/sametime/sametime.c:5498
+#: ../libpurple/protocols/sametime/sametime.c:4305
+#: ../libpurple/protocols/sametime/sametime.c:5510
 msgid "Sametime ID"
-msgstr ""
-
-#: ../libpurple/protocols/sametime/sametime.c:4327
+msgstr "Selfdetyd-ID"
+
+#: ../libpurple/protocols/sametime/sametime.c:4329
 msgid "An ambiguous user ID was entered"
-msgstr ""
-
-#: ../libpurple/protocols/sametime/sametime.c:4328
+msgstr "'n Dubbelsinnige gebruiker-ID is gegee"
+
+#: ../libpurple/protocols/sametime/sametime.c:4330
 #, c-format
 msgid ""
 "The identifier '%s' may possibly refer to any of the following users. Please "
 "select the correct user from the list below to add them to your buddy list."
 msgstr ""
-
-#: ../libpurple/protocols/sametime/sametime.c:4333
+"Die identifiseerder '%s' verwys dalk na enige van die volgende kwessies. "
+"Kies asb. die korrekte gebruiker uit die lys hier onder om hulle by u "
+"vriendelys te voeg."
+
+#: ../libpurple/protocols/sametime/sametime.c:4335
 msgid "Select User"
 msgstr "Kies gebruiker"
 
-#: ../libpurple/protocols/sametime/sametime.c:4417
+#: ../libpurple/protocols/sametime/sametime.c:4419
 msgid "Unable to add user: user not found"
-msgstr ""
-
-#: ../libpurple/protocols/sametime/sametime.c:4419
+msgstr "Kan nie gebruiker byvoeg nie: gebruiker nie gevind nie"
+
+#: ../libpurple/protocols/sametime/sametime.c:4421
 #, c-format
 msgid ""
 "The identifier '%s' did not match any users in your Sametime community. This "
 "entry has been removed from your buddy list."
 msgstr ""
-
-#: ../libpurple/protocols/sametime/sametime.c:4424
+"Die identifiseerder '%s' pas nie by enige gebruikers in u selfdetyd-"
+"gemeenskap nie. Hierdie inskrywing is uit u vriendelys geskrap."
+
+#: ../libpurple/protocols/sametime/sametime.c:4426
 msgid "Unable to add user"
 msgstr "Kan nie gebruiker byvoeg nie"
 
-#: ../libpurple/protocols/sametime/sametime.c:5010
+#: ../libpurple/protocols/sametime/sametime.c:5012
 #, c-format
 msgid ""
 "Error reading file %s: \n"
 "%s\n"
 msgstr ""
-
-#: ../libpurple/protocols/sametime/sametime.c:5145
+"Fout met lees van lêer %s: \n"
+"%s\n"
+
+#: ../libpurple/protocols/sametime/sametime.c:5147
 msgid "Remotely Stored Buddy List"
-msgstr ""
-
-#: ../libpurple/protocols/sametime/sametime.c:5150
+msgstr "Afgeleë gestoorde vriendelys"
+
+#: ../libpurple/protocols/sametime/sametime.c:5152
 msgid "Buddy List Storage Mode"
-msgstr ""
-
-#: ../libpurple/protocols/sametime/sametime.c:5153
-msgid "Local Buddy List Only"
-msgstr ""
+msgstr "Vriendelys-stoormodus"
 
 #: ../libpurple/protocols/sametime/sametime.c:5155
-msgid "Merge List from Server"
-msgstr ""
+msgid "Local Buddy List Only"
+msgstr "Net plaaslike vriendelys"
 
 #: ../libpurple/protocols/sametime/sametime.c:5157
-msgid "Merge and Save List to Server"
-msgstr ""
+msgid "Merge List from Server"
+msgstr "Voeg lys saam van bediener"
 
 #: ../libpurple/protocols/sametime/sametime.c:5159
+msgid "Merge and Save List to Server"
+msgstr "Voeg saam en stoor lys na bediener"
+
+#: ../libpurple/protocols/sametime/sametime.c:5161
 msgid "Synchronize List with Server"
-msgstr ""
-
-#: ../libpurple/protocols/sametime/sametime.c:5208
+msgstr "Sinchroniseer lys met bediener"
+
+#: ../libpurple/protocols/sametime/sametime.c:5216
 #, c-format
 msgid "Import Sametime List for Account %s"
-msgstr ""
-
-#: ../libpurple/protocols/sametime/sametime.c:5247
+msgstr "Voer selfdetyd-lys in vir rekening %s"
+
+#: ../libpurple/protocols/sametime/sametime.c:5256
 #, c-format
 msgid "Export Sametime List for Account %s"
-msgstr ""
-
-#: ../libpurple/protocols/sametime/sametime.c:5300
+msgstr "Voer selfdetyd-lys uit vir rekening %s"
+
+#: ../libpurple/protocols/sametime/sametime.c:5310
 msgid "Unable to add group: group exists"
-msgstr ""
-
-#: ../libpurple/protocols/sametime/sametime.c:5301
+msgstr "Kan nie groep byvoeg nie: groep bestaan"
+
+#: ../libpurple/protocols/sametime/sametime.c:5311
 #, c-format
 msgid "A group named '%s' already exists in your buddy list."
-msgstr ""
-
-#: ../libpurple/protocols/sametime/sametime.c:5304
-#: ../libpurple/protocols/sametime/sametime.c:5433
+msgstr "'n Groep genaam '%s' bestaan reeds in u vriendelys."
+
+#: ../libpurple/protocols/sametime/sametime.c:5314
+#: ../libpurple/protocols/sametime/sametime.c:5444
 msgid "Unable to add group"
 msgstr "Kan nie groep byvoeg nie"
 
-#: ../libpurple/protocols/sametime/sametime.c:5363
+#: ../libpurple/protocols/sametime/sametime.c:5373
 msgid "Possible Matches"
-msgstr ""
-
-#: ../libpurple/protocols/sametime/sametime.c:5379
+msgstr "Moontlike passings"
+
+#: ../libpurple/protocols/sametime/sametime.c:5389
 msgid "Notes Address Book group results"
-msgstr ""
-
-#: ../libpurple/protocols/sametime/sametime.c:5380
+msgstr "Notasadresboekgroepresultate"
+
+#: ../libpurple/protocols/sametime/sametime.c:5390
 #, c-format
 msgid ""
 "The identifier '%s' may possibly refer to any of the following Notes Address "
 "Book groups. Please select the correct group from the list below to add it "
 "to your buddy list."
 msgstr ""
-
-#: ../libpurple/protocols/sametime/sametime.c:5385
+"Die identifiseerder '%s' verwys dalk na enige van die volgende "
+"Notasadresbespreek-groepe. Kies asb. die korrekte gebruiker uit die lys hier "
+"onder om hulle by u vriendelys te voeg."
+
+#: ../libpurple/protocols/sametime/sametime.c:5395
 msgid "Select Notes Address Book"
-msgstr ""
-
-#: ../libpurple/protocols/sametime/sametime.c:5427
+msgstr "Kies notasadresboekinligting"
+
+#: ../libpurple/protocols/sametime/sametime.c:5438
 msgid "Unable to add group: group not found"
-msgstr ""
-
-#: ../libpurple/protocols/sametime/sametime.c:5429
+msgstr "Kan nie groep byvoeg nie: groep nie gevind nie"
+
+#: ../libpurple/protocols/sametime/sametime.c:5440
 #, c-format
 msgid ""
 "The identifier '%s' did not match any Notes Address Book groups in your "
 "Sametime community."
 msgstr ""
-
-#: ../libpurple/protocols/sametime/sametime.c:5470
+"Die identifiseerder '%s' pas nie by enige notasadresboekgroepe in u "
+"selfdetyd-gemeenskap nie."
+
+#: ../libpurple/protocols/sametime/sametime.c:5481
 msgid "Notes Address Book Group"
-msgstr ""
-
-#: ../libpurple/protocols/sametime/sametime.c:5471
+msgstr "Notasadresboekgroep"
+
+#: ../libpurple/protocols/sametime/sametime.c:5482
 msgid ""
 "Enter the name of a Notes Address Book group in the field below to add the "
 "group and its members to your buddy list."
 msgstr ""
-
-#: ../libpurple/protocols/sametime/sametime.c:5519
+"Gee die naam van 'n notasadresboekgroep in die veld hier onder om die groep "
+"en sy lede by u vriendelys te voeg."
+
+#: ../libpurple/protocols/sametime/sametime.c:5531
 #, c-format
 msgid "Search results for '%s'"
-msgstr ""
-
-#: ../libpurple/protocols/sametime/sametime.c:5520
+msgstr "Soekresultate vir '%s'"
+
+#: ../libpurple/protocols/sametime/sametime.c:5532
 #, c-format
 msgid ""
 "The identifier '%s' may possibly refer to any of the following users. You "
 "may add these users to your buddy list or send them messages with the action "
 "buttons below."
 msgstr ""
-
-#: ../libpurple/protocols/sametime/sametime.c:5527 ../pidgin/gtknotify.c:709
+"Die identifiseerder '%s' verwys dalk na enige van die volgende kwessies. U "
+"kan hierdie gebruikers by u vriendelys voeg of vir hulle boodskappe stuur "
+"met die aksieknoppies hier onder."
+
+#. Create the window
+#: ../libpurple/protocols/sametime/sametime.c:5539 ../pidgin/gtknotify.c:721
 msgid "Search Results"
 msgstr "Soekresultate"
 
-#: ../libpurple/protocols/sametime/sametime.c:5552
+#: ../libpurple/protocols/sametime/sametime.c:5564
 msgid "No matches"
-msgstr ""
-
-#: ../libpurple/protocols/sametime/sametime.c:5553
+msgstr "Geen passing nie"
+
+#: ../libpurple/protocols/sametime/sametime.c:5565
 #, c-format
 msgid "The identifier '%s' did not match any users in your Sametime community."
 msgstr ""
-
-#: ../libpurple/protocols/sametime/sametime.c:5557
+"Die identifiseerder '%s' pas nie by enige gebruikers in u selfdetyd-"
+"gemeenskap nie."
+
+#: ../libpurple/protocols/sametime/sametime.c:5569
 msgid "No Matches"
-msgstr ""
-
-#: ../libpurple/protocols/sametime/sametime.c:5594
+msgstr "Geen passing nie"
+
+#: ../libpurple/protocols/sametime/sametime.c:5606
 msgid "Search for a user"
-msgstr ""
-
-#: ../libpurple/protocols/sametime/sametime.c:5595
+msgstr "Soek vir 'n gebruiker"
+
+#: ../libpurple/protocols/sametime/sametime.c:5607
 msgid ""
 "Enter a name or partial ID in the field below to search for matching users "
 "in your Sametime community."
 msgstr ""
-
-#: ../libpurple/protocols/sametime/sametime.c:5598
-msgid "User Search"
-msgstr ""
+"Gee 'n naam of gedeeltelike ID in die veld hier onder om vir passende "
+"gebruikers in u selfdetydgemeenskap te soek."
 
 #: ../libpurple/protocols/sametime/sametime.c:5610
+msgid "User Search"
+msgstr "Gebruikersoektog"
+
+#: ../libpurple/protocols/sametime/sametime.c:5623
 msgid "Import Sametime List..."
-msgstr ""
-
-#: ../libpurple/protocols/sametime/sametime.c:5614
+msgstr "Voer selfdetydlys in..."
+
+#: ../libpurple/protocols/sametime/sametime.c:5627
 msgid "Export Sametime List..."
-msgstr ""
-
-#: ../libpurple/protocols/sametime/sametime.c:5618
+msgstr "Voer selfdetydlys uit..."
+
+#: ../libpurple/protocols/sametime/sametime.c:5631
 msgid "Add Notes Address Book Group..."
-msgstr ""
-
-#: ../libpurple/protocols/sametime/sametime.c:5622
+msgstr "Voeg notasadresboekgroep by..."
+
+#: ../libpurple/protocols/sametime/sametime.c:5635
 msgid "User Search..."
-msgstr ""
-
-#: ../libpurple/protocols/sametime/sametime.c:5719
+msgstr "Gebruikersoektog..."
+
+#: ../libpurple/protocols/sametime/sametime.c:5741
 msgid "Force login (ignore server redirects)"
-msgstr ""
+msgstr "Dwing aanmeld (ignoreer bedienerherverwysing)"
 
 #. pretend to be Sametime Connect
-#: ../libpurple/protocols/sametime/sametime.c:5729
+#: ../libpurple/protocols/sametime/sametime.c:5751
 msgid "Hide client identity"
-msgstr ""
+msgstr "Versteek kliëntidentiteit"
 
 #: ../libpurple/protocols/silc/buddy.c:52
-#: ../libpurple/protocols/silc/buddy.c:420
-#: ../libpurple/protocols/silc/buddy.c:545
-#: ../libpurple/protocols/silc/buddy.c:711
-#: ../libpurple/protocols/silc/ft.c:338
+#: ../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 ""
+msgstr "Gebruiker %s is nie op die netwerk teenwoordig nie"
 
 #: ../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 ""
+msgstr "Sleutelooreenkoms"
 
 #: ../libpurple/protocols/silc/buddy.c:54
+#: ../libpurple/protocols/silc10/buddy.c:54
 msgid "Cannot perform the key agreement"
-msgstr ""
-
-#: ../libpurple/protocols/silc/buddy.c:116
+msgstr "Kan nie sleutelooreenkoms uitvoer nie"
+
+#: ../libpurple/protocols/silc/buddy.c:111
+#: ../libpurple/protocols/silc10/buddy.c:116
 msgid "Error occurred during key agreement"
-msgstr ""
+msgstr "Fout het plaasgevind tydens sleutelooreenkoms"
+
+#: ../libpurple/protocols/silc/buddy.c:115
+#: ../libpurple/protocols/silc10/buddy.c:120
+msgid "Key Agreement failed"
+msgstr "Sleutelooreenkoms het misluk"
 
 #: ../libpurple/protocols/silc/buddy.c:120
-msgid "Key Agreement failed"
-msgstr ""
+#: ../libpurple/protocols/silc10/buddy.c:125
+msgid "Timeout during key agreement"
+msgstr "Uittelling het plaasgevind tydens sleutelooreenkoms"
 
 #: ../libpurple/protocols/silc/buddy.c:125
-msgid "Timeout during key agreement"
-msgstr ""
+#: ../libpurple/protocols/silc10/buddy.c:130
+msgid "Key agreement was aborted"
+msgstr "Sleutelooreenkoms is gestaak"
 
 #: ../libpurple/protocols/silc/buddy.c:130
-msgid "Key agreement was aborted"
-msgstr ""
+#: ../libpurple/protocols/silc10/buddy.c:135
+msgid "Key agreement is already started"
+msgstr "Sleutelooreenkoms is reeds begin"
 
 #: ../libpurple/protocols/silc/buddy.c:135
-msgid "Key agreement is already started"
-msgstr ""
-
-#: ../libpurple/protocols/silc/buddy.c:140
+#: ../libpurple/protocols/silc10/buddy.c:140
 msgid "Key agreement cannot be started with yourself"
-msgstr ""
-
-#: ../libpurple/protocols/silc/buddy.c:258
-#: ../libpurple/protocols/silc/buddy.c:388
-#: ../libpurple/protocols/silc/buddy.c:513
+msgstr "Sleutelooreenkoms kan nie deur uself begin word nie"
+
+#: ../libpurple/protocols/silc/buddy.c:255
+#: ../libpurple/protocols/silc/buddy.c:383
+#: ../libpurple/protocols/silc/buddy.c:497
+#: ../libpurple/protocols/silc/buddy.c:508
+#: ../libpurple/protocols/silc10/buddy.c:258
+#: ../libpurple/protocols/silc10/buddy.c:389
+#: ../libpurple/protocols/silc10/buddy.c:514
 msgid "The remote user is not present in the network any more"
-msgstr ""
-
-#: ../libpurple/protocols/silc/buddy.c:294
+msgstr "Die afgeleë gebruiker is nie meer op die netwerk teenwoordig nie"
+
+#: ../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 ""
-
-#: ../libpurple/protocols/silc/buddy.c:298
+"Sleutelooreenkoms-versoek ontvang van %s. Wil u by die sleutelooreenkoms "
+"uitvoer?"
+
+#: ../libpurple/protocols/silc/buddy.c:302
+#: ../libpurple/protocols/silc10/buddy.c:299
 #, c-format
 msgid ""
 "The remote user is waiting key agreement on:\n"
 "Remote host: %s\n"
 "Remote port: %d"
 msgstr ""
-
-#: ../libpurple/protocols/silc/buddy.c:311
+"Die afgeleë gebruiker wag vir sleutelooreenkoms op:\n"
+"Afgeleë gasheer: %s\n"
+"Afgeleë poort: %d"
+
+#: ../libpurple/protocols/silc/buddy.c:315
+#: ../libpurple/protocols/silc10/buddy.c:312
 msgid "Key Agreement Request"
-msgstr ""
-
-#: ../libpurple/protocols/silc/buddy.c:387
-#: ../libpurple/protocols/silc/buddy.c:422
-#: ../libpurple/protocols/silc/buddy.c:464
+msgstr "Sleutelooreenkoms-versoek"
+
+#: ../libpurple/protocols/silc/buddy.c:382
+#: ../libpurple/protocols/silc/buddy.c:412
+#: ../libpurple/protocols/silc/buddy.c:452
+#: ../libpurple/protocols/silc10/buddy.c:388
+#: ../libpurple/protocols/silc10/buddy.c:423
+#: ../libpurple/protocols/silc10/buddy.c:465
 msgid "IM With Password"
-msgstr ""
-
-#: ../libpurple/protocols/silc/buddy.c:423
+msgstr "Kitsboodskap met wagwoord"
+
+#: ../libpurple/protocols/silc/buddy.c:413
+#: ../libpurple/protocols/silc10/buddy.c:424
 msgid "Cannot set IM key"
-msgstr ""
-
-#: ../libpurple/protocols/silc/buddy.c:465
+msgstr "Kan nie kitsboodskap-sleutel stel nie"
+
+#: ../libpurple/protocols/silc/buddy.c:453
+#: ../libpurple/protocols/silc10/buddy.c:466
 msgid "Set IM Password"
-msgstr ""
-
-#: ../libpurple/protocols/silc/buddy.c:512
-#: ../libpurple/protocols/silc/buddy.c:547
-#: ../libpurple/protocols/silc/ops.c:1494
-#: ../libpurple/protocols/silc/ops.c:1505
+msgstr "Stel kitsboodskap-wagwoord"
+
+#: ../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 "Kry publieke sleutel"
 
-#: ../libpurple/protocols/silc/buddy.c:548
-#: ../libpurple/protocols/silc/ops.c:1495
-#: ../libpurple/protocols/silc/ops.c:1506
+#: ../libpurple/protocols/silc/buddy.c:541
+#: ../libpurple/protocols/silc/ops.c:1500
+#: ../libpurple/protocols/silc/ops.c:1511
+#: ../libpurple/protocols/silc10/buddy.c:549
+#: ../libpurple/protocols/silc10/ops.c:1495
+#: ../libpurple/protocols/silc10/ops.c:1506
 msgid "Cannot fetch the public key"
-msgstr ""
-
-#: ../libpurple/protocols/silc/buddy.c:634
-#: ../libpurple/protocols/silc/buddy.c:1647
+msgstr "Kan nie publieke sleutel haal nie"
+
+#: ../libpurple/protocols/silc/buddy.c:622
+#: ../libpurple/protocols/silc/buddy.c:1655
+#: ../libpurple/protocols/silc10/buddy.c:635
+#: ../libpurple/protocols/silc10/buddy.c:1654
 msgid "Show Public Key"
-msgstr ""
-
-#: ../libpurple/protocols/silc/buddy.c:635
-#: ../libpurple/protocols/silc/buddy.c:1030
+msgstr "Wys publieke sleutel"
+
+#: ../libpurple/protocols/silc/buddy.c:623
+#: ../libpurple/protocols/silc/buddy.c:1027
 #: ../libpurple/protocols/silc/chat.c:237
+#: ../libpurple/protocols/silc10/buddy.c:636
+#: ../libpurple/protocols/silc10/buddy.c:1033
+#: ../libpurple/protocols/silc10/chat.c:237
 msgid "Could not load public key"
-msgstr ""
-
-#: ../libpurple/protocols/silc/buddy.c:712
-#: ../libpurple/protocols/silc/ops.c:1087
-#: ../libpurple/protocols/silc/ops.c:1159
-#: ../libpurple/protocols/silc/ops.c:1294
-#: ../libpurple/protocols/silc/ops.c:1295
-#: ../libpurple/protocols/silc/ops.c:1313
+msgstr "Kon nie publieke sleutel laai nie"
+
+#: ../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 "Gebruikerinligting"
 
-#: ../libpurple/protocols/silc/buddy.c:713
-#: ../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 "Kon nie gebruikerinligting kry nie"
 
-#: ../libpurple/protocols/silc/buddy.c:734
+#: ../libpurple/protocols/silc/buddy.c:723
+#: ../libpurple/protocols/silc10/buddy.c:735
 #, c-format
 msgid "The %s buddy is not trusted"
-msgstr ""
-
-#: ../libpurple/protocols/silc/buddy.c:737
+msgstr "Die %s vriend word nie vertrou nie"
+
+#: ../libpurple/protocols/silc/buddy.c:726
+#: ../libpurple/protocols/silc10/buddy.c:738
 msgid ""
 "You cannot receive buddy notifications until you import his/her public key.  "
 "You can use the Get Public Key command to get the public key."
 msgstr ""
+"U kan nie vriendkennisstelings ontvang voor u sy/haar publieke sleutel "
+"ingevoer het nie.  U kan die 'Kry publieke sleutel'-bevel gebruik om die "
+"publieke sleutel te kry."
 
 #. Open file selector to select the public key.
-#: ../libpurple/protocols/silc/buddy.c:1064
+#: ../libpurple/protocols/silc/buddy.c:1059
+#: ../libpurple/protocols/silc10/buddy.c:1067
 msgid "Open..."
 msgstr "Open..."
 
-#: ../libpurple/protocols/silc/buddy.c:1073
+#: ../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 ""
-
-#: ../libpurple/protocols/silc/buddy.c:1076
+msgstr "Die %s vriend is nie op die netwerk teenwoordig nie"
+
+#: ../libpurple/protocols/silc/buddy.c:1073
+#: ../libpurple/protocols/silc10/buddy.c:1081
 msgid ""
 "To add the buddy you must import his/her public key. Press Import to import "
 "a public key."
 msgstr ""
-
-#: ../libpurple/protocols/silc/buddy.c:1079
+"Om die vriend by te voeg, moet u sy/haar publieke sleutel invoer. Druk "
+"Invoer om 'n publieke sleutel in te voer."
+
+#: ../libpurple/protocols/silc/buddy.c:1077
+#: ../libpurple/protocols/silc10/buddy.c:1085
 msgid "_Import..."
 msgstr "Voer _in..."
 
-#: ../libpurple/protocols/silc/buddy.c:1175
+#: ../libpurple/protocols/silc/buddy.c:1183
+#: ../libpurple/protocols/silc10/buddy.c:1181
 msgid "Select correct user"
 msgstr "Kies die regte gebruiker"
 
-#: ../libpurple/protocols/silc/buddy.c:1177
+#: ../libpurple/protocols/silc/buddy.c:1185
+#: ../libpurple/protocols/silc10/buddy.c:1183
 msgid ""
 "More than one user was found with the same public key. Select the correct "
 "user from the list to add to the buddy list."
 msgstr ""
-
-#: ../libpurple/protocols/silc/buddy.c:1179
+"Meer as een gebruiker is met dieselfde publieke sleutel gevind. Kies die "
+"korrekte gebruiker uit die lys om hulle by die vriendelys te voeg."
+
+#: ../libpurple/protocols/silc/buddy.c:1187
+#: ../libpurple/protocols/silc10/buddy.c:1185
 msgid ""
 "More than one user was found with the same name. Select the correct user "
 "from the list to add to the buddy list."
 msgstr ""
-
-#: ../libpurple/protocols/silc/buddy.c:1467
+"Meer as een gebruiker is met dieselfde naam gevind. Kies die korrekte "
+"gebruiker uit die lys om hulle by die vriendelys te voeg."
+
+#: ../libpurple/protocols/silc/buddy.c:1474
+#: ../libpurple/protocols/silc10/buddy.c:1474
 msgid "Detached"
-msgstr ""
-
-#: ../libpurple/protocols/silc/buddy.c:1471
-#: ../libpurple/protocols/silc/silc.c:49
+msgstr "Ontheg"
+
+#: ../libpurple/protocols/silc/buddy.c:1478
+#: ../libpurple/protocols/silc/silc.c:58
+#: ../libpurple/protocols/silc10/buddy.c:1478
+#: ../libpurple/protocols/silc10/silc.c:49
 msgid "Indisposed"
-msgstr ""
-
-#: ../libpurple/protocols/silc/buddy.c:1475
-#: ../libpurple/protocols/silc/silc.c:51
+msgstr "Ongesteld"
+
+#: ../libpurple/protocols/silc/buddy.c:1482
+#: ../libpurple/protocols/silc/silc.c:60
+#: ../libpurple/protocols/silc10/buddy.c:1482
+#: ../libpurple/protocols/silc10/silc.c:51
 msgid "Wake Me Up"
 msgstr "Maak my wakker"
 
-#: ../libpurple/protocols/silc/buddy.c:1477
-#: ../libpurple/protocols/silc/silc.c:43
+#: ../libpurple/protocols/silc/buddy.c:1484
+#: ../libpurple/protocols/silc/silc.c:52
+#: ../libpurple/protocols/silc10/buddy.c:1484
+#: ../libpurple/protocols/silc10/silc.c:43
 msgid "Hyper Active"
 msgstr "Hiperaktief"
 
-#: ../libpurple/protocols/silc/buddy.c:1479
+#: ../libpurple/protocols/silc/buddy.c:1486
+#: ../libpurple/protocols/silc10/buddy.c:1486
 msgid "Robot"
 msgstr "Robot"
 
-#: ../libpurple/protocols/silc/buddy.c:1486
-#: ../libpurple/protocols/silc/silc.c:662
-#: ../libpurple/protocols/silc/util.c:512
+#: ../libpurple/protocols/silc/buddy.c:1493
+#: ../libpurple/protocols/silc/silc.c:743
+#: ../libpurple/protocols/silc/util.c:516
+#: ../libpurple/protocols/silc10/buddy.c:1493
+#: ../libpurple/protocols/silc10/silc.c:654
+#: ../libpurple/protocols/silc10/util.c:512
 msgid "Happy"
 msgstr "Gelukkig"
 
-#: ../libpurple/protocols/silc/buddy.c:1488
-#: ../libpurple/protocols/silc/silc.c:664
-#: ../libpurple/protocols/silc/util.c:514
+#: ../libpurple/protocols/silc/buddy.c:1495
+#: ../libpurple/protocols/silc/silc.c:745
+#: ../libpurple/protocols/silc/util.c:518
+#: ../libpurple/protocols/silc10/buddy.c:1495
+#: ../libpurple/protocols/silc10/silc.c:656
+#: ../libpurple/protocols/silc10/util.c:514
 msgid "Sad"
 msgstr "Ongelukkig"
 
-#: ../libpurple/protocols/silc/buddy.c:1490
-#: ../libpurple/protocols/silc/silc.c:666
-#: ../libpurple/protocols/silc/util.c:516
+#: ../libpurple/protocols/silc/buddy.c:1497
+#: ../libpurple/protocols/silc/silc.c:747
+#: ../libpurple/protocols/silc/util.c:520
+#: ../libpurple/protocols/silc10/buddy.c:1497
+#: ../libpurple/protocols/silc10/silc.c:658
+#: ../libpurple/protocols/silc10/util.c:516
 msgid "Angry"
 msgstr "Kwaad"
 
-#: ../libpurple/protocols/silc/buddy.c:1492
-#: ../libpurple/protocols/silc/silc.c:668
-#: ../libpurple/protocols/silc/util.c:518
+#: ../libpurple/protocols/silc/buddy.c:1499
+#: ../libpurple/protocols/silc/silc.c:749
+#: ../libpurple/protocols/silc/util.c:522
+#: ../libpurple/protocols/silc10/buddy.c:1499
+#: ../libpurple/protocols/silc10/silc.c:660
+#: ../libpurple/protocols/silc10/util.c:518
 msgid "Jealous"
 msgstr "Jaloers"
 
-#: ../libpurple/protocols/silc/buddy.c:1494
-#: ../libpurple/protocols/silc/silc.c:670
-#: ../libpurple/protocols/silc/util.c:520
+#: ../libpurple/protocols/silc/buddy.c:1501
+#: ../libpurple/protocols/silc/silc.c:751
+#: ../libpurple/protocols/silc/util.c:524
+#: ../libpurple/protocols/silc10/buddy.c:1501
+#: ../libpurple/protocols/silc10/silc.c:662
+#: ../libpurple/protocols/silc10/util.c:520
 msgid "Ashamed"
 msgstr "Skaam"
 
-#: ../libpurple/protocols/silc/buddy.c:1496
-#: ../libpurple/protocols/silc/silc.c:672
-#: ../libpurple/protocols/silc/util.c:522
+#: ../libpurple/protocols/silc/buddy.c:1503
+#: ../libpurple/protocols/silc/silc.c:753
+#: ../libpurple/protocols/silc/util.c:526
+#: ../libpurple/protocols/silc10/buddy.c:1503
+#: ../libpurple/protocols/silc10/silc.c:664
+#: ../libpurple/protocols/silc10/util.c:522
 msgid "Invincible"
 msgstr "Onoorwinlik"
 
-#: ../libpurple/protocols/silc/buddy.c:1498
-#: ../libpurple/protocols/silc/util.c:524
+#: ../libpurple/protocols/silc/buddy.c:1505
+#: ../libpurple/protocols/silc/util.c:528
+#: ../libpurple/protocols/silc10/buddy.c:1505
+#: ../libpurple/protocols/silc10/util.c:524
 msgid "In Love"
 msgstr "Verlief"
 
-#: ../libpurple/protocols/silc/buddy.c:1500
-#: ../libpurple/protocols/silc/silc.c:676
-#: ../libpurple/protocols/silc/util.c:526
+#: ../libpurple/protocols/silc/buddy.c:1507
+#: ../libpurple/protocols/silc/silc.c:757
+#: ../libpurple/protocols/silc/util.c:530
+#: ../libpurple/protocols/silc10/buddy.c:1507
+#: ../libpurple/protocols/silc10/silc.c:668
+#: ../libpurple/protocols/silc10/util.c:526
 msgid "Sleepy"
 msgstr "Vaak"
 
-#: ../libpurple/protocols/silc/buddy.c:1502
-#: ../libpurple/protocols/silc/silc.c:678
-#: ../libpurple/protocols/silc/util.c:528
+#: ../libpurple/protocols/silc/buddy.c:1509
+#: ../libpurple/protocols/silc/silc.c:759
+#: ../libpurple/protocols/silc/util.c:532
+#: ../libpurple/protocols/silc10/buddy.c:1509
+#: ../libpurple/protocols/silc10/silc.c:670
+#: ../libpurple/protocols/silc10/util.c:528
 msgid "Bored"
 msgstr "Verveeld"
 
-#: ../libpurple/protocols/silc/buddy.c:1504
-#: ../libpurple/protocols/silc/silc.c:680
-#: ../libpurple/protocols/silc/util.c:530
+#: ../libpurple/protocols/silc/buddy.c:1511
+#: ../libpurple/protocols/silc/silc.c:761
+#: ../libpurple/protocols/silc/util.c:534
+#: ../libpurple/protocols/silc10/buddy.c:1511
+#: ../libpurple/protocols/silc10/silc.c:672
+#: ../libpurple/protocols/silc10/util.c:530
 msgid "Excited"
 msgstr "Opgewonde"
 
-#: ../libpurple/protocols/silc/buddy.c:1506
-#: ../libpurple/protocols/silc/silc.c:682
-#: ../libpurple/protocols/silc/util.c:532
+#: ../libpurple/protocols/silc/buddy.c:1513
+#: ../libpurple/protocols/silc/silc.c:763
+#: ../libpurple/protocols/silc/util.c:536
+#: ../libpurple/protocols/silc10/buddy.c:1513
+#: ../libpurple/protocols/silc10/silc.c:674
+#: ../libpurple/protocols/silc10/util.c:532
 msgid "Anxious"
 msgstr "Besorgd"
 
-#: ../libpurple/protocols/silc/buddy.c:1538
-#: ../libpurple/protocols/silc/ops.c:1202
+#: ../libpurple/protocols/silc/buddy.c:1545
+#: ../libpurple/protocols/silc/ops.c:1207
+#: ../libpurple/protocols/silc10/buddy.c:1545
+#: ../libpurple/protocols/silc10/ops.c:1202
 msgid "User Modes"
-msgstr ""
-
-#: ../libpurple/protocols/silc/buddy.c:1550
-#: ../libpurple/protocols/silc/ops.c:1207
+msgstr "Gebruikermodusse"
+
+#: ../libpurple/protocols/silc/buddy.c:1557
+#: ../libpurple/protocols/silc/ops.c:1212
+#: ../libpurple/protocols/silc10/buddy.c:1557
+#: ../libpurple/protocols/silc10/ops.c:1207
 msgid "Mood"
 msgstr "Bui"
 
-#: ../libpurple/protocols/silc/buddy.c:1555
-#: ../libpurple/protocols/silc/ops.c:1219
+#: ../libpurple/protocols/silc/buddy.c:1562
+#: ../libpurple/protocols/silc/ops.c:1224
+#: ../libpurple/protocols/silc10/buddy.c:1562
+#: ../libpurple/protocols/silc10/ops.c:1219
 msgid "Preferred Contact"
-msgstr ""
-
-#: ../libpurple/protocols/silc/buddy.c:1560
-#: ../libpurple/protocols/silc/ops.c:1224
+msgstr "Voorkeurkontak"
+
+#: ../libpurple/protocols/silc/buddy.c:1567
+#: ../libpurple/protocols/silc/ops.c:1229
+#: ../libpurple/protocols/silc10/buddy.c:1567
+#: ../libpurple/protocols/silc10/ops.c:1224
 msgid "Preferred Language"
 msgstr "Voorkeurtaal"
 
-#: ../libpurple/protocols/silc/buddy.c:1565
-#: ../libpurple/protocols/silc/ops.c:1229
+#: ../libpurple/protocols/silc/buddy.c:1572
+#: ../libpurple/protocols/silc/ops.c:1234
+#: ../libpurple/protocols/silc10/buddy.c:1572
+#: ../libpurple/protocols/silc10/ops.c:1229
 msgid "Device"
 msgstr "Toestel"
 
-#: ../libpurple/protocols/silc/buddy.c:1570
-#: ../libpurple/protocols/silc/ops.c:1234
-#: ../libpurple/protocols/silc/silc.c:730
-#: ../libpurple/protocols/silc/silc.c:732
+#: ../libpurple/protocols/silc/buddy.c:1577
+#: ../libpurple/protocols/silc/ops.c:1239
+#: ../libpurple/protocols/silc10/buddy.c:1577
+#: ../libpurple/protocols/silc10/ops.c:1234
+#: ../libpurple/protocols/silc10/silc.c:722
+#: ../libpurple/protocols/silc10/silc.c:724
 msgid "Timezone"
 msgstr "Tydsone"
 
-#: ../libpurple/protocols/silc/buddy.c:1575
-#: ../libpurple/protocols/silc/ops.c:1239
+#: ../libpurple/protocols/silc/buddy.c:1582
+#: ../libpurple/protocols/silc/ops.c:1244
+#: ../libpurple/protocols/silc10/buddy.c:1582
+#: ../libpurple/protocols/silc10/ops.c:1239
 msgid "Geolocation"
 msgstr "Geografiese ligging"
 
-#: ../libpurple/protocols/silc/buddy.c:1629
+#: ../libpurple/protocols/silc/buddy.c:1638
+#: ../libpurple/protocols/silc10/buddy.c:1636
 msgid "Reset IM Key"
-msgstr ""
-
-#: ../libpurple/protocols/silc/buddy.c:1635
+msgstr "Stel kitsboodskap-sleutel terug"
+
+#: ../libpurple/protocols/silc/buddy.c:1643
+#: ../libpurple/protocols/silc10/buddy.c:1642
 msgid "IM with Key Exchange"
-msgstr ""
-
-#: ../libpurple/protocols/silc/buddy.c:1640
+msgstr "Kitsboodskap met sleutelruiling"
+
+#: ../libpurple/protocols/silc/buddy.c:1648
+#: ../libpurple/protocols/silc10/buddy.c:1647
 msgid "IM with Password"
-msgstr ""
-
-#: ../libpurple/protocols/silc/buddy.c:1653
+msgstr "Kitsboodskap met wagwoord"
+
+#: ../libpurple/protocols/silc/buddy.c:1661
+#: ../libpurple/protocols/silc10/buddy.c:1660
 msgid "Get Public Key..."
 msgstr "Kry publieke sleutel..."
 
-#: ../libpurple/protocols/silc/buddy.c:1660
-#: ../libpurple/protocols/silc/ops.c:1624
+#: ../libpurple/protocols/silc/buddy.c:1668
+#: ../libpurple/protocols/silc/ops.c:1608
+#: ../libpurple/protocols/silc10/buddy.c:1667
+#: ../libpurple/protocols/silc10/ops.c:1624
 msgid "Kill User"
-msgstr ""
-
-#: ../libpurple/protocols/silc/buddy.c:1670
-#: ../libpurple/protocols/silc/chat.c:972
+msgstr "Moor gebruiker"
+
+#: ../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 "Teken op witbord"
 
 #: ../libpurple/protocols/silc/chat.c:39
+#: ../libpurple/protocols/silc10/chat.c:39
 msgid "_Passphrase:"
-msgstr ""
+msgstr "_Wagwoordfrase:"
 
 #: ../libpurple/protocols/silc/chat.c:80
+#: ../libpurple/protocols/silc10/chat.c:80
 #, c-format
 msgid "Channel %s does not exist in the network"
 msgstr "Kanaal %s bestaan nie in die netwerk nie"
 
 #: ../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 "Kanaalinligting"
 
 #: ../libpurple/protocols/silc/chat.c:82
+#: ../libpurple/protocols/silc10/chat.c:82
 msgid "Cannot get channel information"
 msgstr "Kan nie kanaaninligting kry nie"
 
 #: ../libpurple/protocols/silc/chat.c:119
+#: ../libpurple/protocols/silc10/chat.c:119
 #, c-format
 msgid "<b>Channel Name:</b> %s"
-msgstr ""
+msgstr "<b>Kanaalnaam:</b> %s"
 
 #: ../libpurple/protocols/silc/chat.c:122
+#: ../libpurple/protocols/silc10/chat.c:122
 #, c-format
 msgid "<br><b>User Count:</b> %d"
-msgstr ""
+msgstr "<br><b>Gebruikertelling:</b> %d"
 
 #: ../libpurple/protocols/silc/chat.c:129
+#: ../libpurple/protocols/silc10/chat.c:129
 #, c-format
 msgid "<br><b>Channel Founder:</b> %s"
-msgstr ""
+msgstr "<br><b>Kanaalstigter:</b> %s"
 
 #: ../libpurple/protocols/silc/chat.c:138
+#: ../libpurple/protocols/silc10/chat.c:138
 #, c-format
 msgid "<br><b>Channel Cipher:</b> %s"
-msgstr ""
+msgstr "<br><b>Kanaalsyfer:</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 ""
-
-#: ../libpurple/protocols/silc/chat.c:147
+msgstr "<br><b>Kanaal-HMAC:</b> %s"
+
+#: ../libpurple/protocols/silc/chat.c:148
+#: ../libpurple/protocols/silc10/chat.c:147
 #, c-format
 msgid "<br><b>Channel Topic:</b><br>%s"
-msgstr ""
-
-#: ../libpurple/protocols/silc/chat.c:152
+msgstr "<br><b>Kanaalonderwerp:</b><br>%s"
+
+#: ../libpurple/protocols/silc/chat.c:153
+#: ../libpurple/protocols/silc10/chat.c:152
 msgid "<br><b>Channel Modes:</b> "
-msgstr ""
-
-#: ../libpurple/protocols/silc/chat.c:165
+msgstr "<br><b>Kanaalmodusse:</b> "
+
+#: ../libpurple/protocols/silc/chat.c:166
+#: ../libpurple/protocols/silc10/chat.c:165
 #, c-format
 msgid "<br><b>Founder Key Fingerprint:</b><br>%s"
-msgstr ""
-
-#: ../libpurple/protocols/silc/chat.c:166
+msgstr "<br><b>Stigter se sleutelvingerafdruk:</b><br>%s"
+
+#: ../libpurple/protocols/silc/chat.c:167
+#: ../libpurple/protocols/silc10/chat.c:166
 #, c-format
 msgid "<br><b>Founder Key Babbleprint:</b><br>%s"
-msgstr ""
+msgstr "<br><b>Stigter se sleutelbabbelafdruk:</b><br>%s"
 
 #: ../libpurple/protocols/silc/chat.c:236
+#: ../libpurple/protocols/silc10/chat.c:236
 msgid "Add Channel Public Key"
-msgstr ""
+msgstr "Voeg kanaal- publieke sleutel by"
 
 #. 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 "Open publieke sleutel..."
 
-#: ../libpurple/protocols/silc/chat.c:400
+#: ../libpurple/protocols/silc/chat.c:423
+#: ../libpurple/protocols/silc10/chat.c:401
 msgid "Channel Passphrase"
-msgstr ""
-
-#: ../libpurple/protocols/silc/chat.c:407
+msgstr "Kanaalwagwoordfrase"
+
+#: ../libpurple/protocols/silc/chat.c:430
+#: ../libpurple/protocols/silc10/chat.c:408
 msgid "Channel Public Keys List"
-msgstr ""
-
-#: ../libpurple/protocols/silc/chat.c:412
+msgstr "Lys kanaal- publieke sleutels"
+
+#: ../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 "
@@ -8851,334 +9549,452 @@
 "channel public keys are set then only users whose public keys are listed are "
 "able to join."
 msgstr ""
-
-#: ../libpurple/protocols/silc/chat.c:421
-#: ../libpurple/protocols/silc/chat.c:422
-#: ../libpurple/protocols/silc/chat.c:459
-#: ../libpurple/protocols/silc/chat.c:460
-#: ../libpurple/protocols/silc/chat.c:906
+"Kanaalstawing word gebruik om die kanaal van ongemagtigde toegang te "
+"beskerm. Die stawing kan op wagwoordfrase en digitale handtekening gebaseer "
+"wees. Indien wagwoordfrase gestel is, word dit vereis om aan te sluit. "
+"Indien kanaal- publieke sleutels gestel is, kan net gebruikers wie se "
+"publieke sleutels gelys is, aansluit."
+
+#: ../libpurple/protocols/silc/chat.c:444
+#: ../libpurple/protocols/silc/chat.c:445
+#: ../libpurple/protocols/silc/chat.c:479
+#: ../libpurple/protocols/silc/chat.c:480
+#: ../libpurple/protocols/silc/chat.c:927
+#: ../libpurple/protocols/silc10/chat.c:422
+#: ../libpurple/protocols/silc10/chat.c:423
+#: ../libpurple/protocols/silc10/chat.c:461
+#: ../libpurple/protocols/silc10/chat.c:462
+#: ../libpurple/protocols/silc10/chat.c:911
 msgid "Channel Authentication"
-msgstr ""
-
-#: ../libpurple/protocols/silc/chat.c:423
-#: ../libpurple/protocols/silc/chat.c:461
+msgstr "Kanaalstawing"
+
+#: ../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 "Voeg by / verwyder"
 
-#: ../libpurple/protocols/silc/chat.c:578
+#: ../libpurple/protocols/silc/chat.c:597
+#: ../libpurple/protocols/silc10/chat.c:581
 msgid "Group Name"
 msgstr "Groepnaam"
 
-#: ../libpurple/protocols/silc/chat.c:582
-#: ../libpurple/protocols/silc/ops.c:1909
-#: ../libpurple/protocols/silc/silc.c:938
+#: ../libpurple/protocols/silc/chat.c:601
+#: ../libpurple/protocols/silc/ops.c:1813
+#: ../libpurple/protocols/silc/silc.c:1020
+#: ../libpurple/protocols/silc10/chat.c:585
+#: ../libpurple/protocols/silc10/ops.c:1901
+#: ../libpurple/protocols/silc10/silc.c:931
 msgid "Passphrase"
-msgstr ""
-
-#: ../libpurple/protocols/silc/chat.c:593
+msgstr "Wagwoordfrase"
+
+#: ../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 ""
-
-#: ../libpurple/protocols/silc/chat.c:595
+msgstr "Gee asb. die %s kanaal- private groep se naam en wagwoordfrase."
+
+#: ../libpurple/protocols/silc/chat.c:614
+#: ../libpurple/protocols/silc10/chat.c:598
 msgid "Add Channel Private Group"
-msgstr ""
-
-#: ../libpurple/protocols/silc/chat.c:722
+msgstr "Voeg kanaal- private groep by"
+
+#: ../libpurple/protocols/silc/chat.c:742
+#: ../libpurple/protocols/silc10/chat.c:726
 msgid "User Limit"
 msgstr "Gebruikerlimiet"
 
-#: ../libpurple/protocols/silc/chat.c:723
+#: ../libpurple/protocols/silc/chat.c:743
+#: ../libpurple/protocols/silc10/chat.c:727
 msgid "Set user limit on channel. Set to zero to reset user limit."
 msgstr ""
-
-#: ../libpurple/protocols/silc/chat.c:886
+"Stel gebruikerlimiet op kanaal. Stel op nul om gebruikerlimiet terug te stel."
+
+#: ../libpurple/protocols/silc/chat.c:907
+#: ../libpurple/protocols/silc10/chat.c:891
 msgid "Invite List"
 msgstr "Uitnodigings"
 
-#: ../libpurple/protocols/silc/chat.c:891
+#: ../libpurple/protocols/silc/chat.c:912
+#: ../libpurple/protocols/silc10/chat.c:896
 msgid "Ban List"
-msgstr "Bannelinge"
-
-#: ../libpurple/protocols/silc/chat.c:899
+msgstr "Verbanlys"
+
+#: ../libpurple/protocols/silc/chat.c:920
+#: ../libpurple/protocols/silc10/chat.c:904
 msgid "Add Private Group"
-msgstr ""
-
-#: ../libpurple/protocols/silc/chat.c:912
+msgstr "Voeg private groep by"
+
+#: ../libpurple/protocols/silc/chat.c:933
+#: ../libpurple/protocols/silc10/chat.c:917
 msgid "Reset Permanent"
-msgstr ""
-
-#: ../libpurple/protocols/silc/chat.c:917
+msgstr "Stel permanent terug"
+
+#: ../libpurple/protocols/silc/chat.c:938
+#: ../libpurple/protocols/silc10/chat.c:922
 msgid "Set Permanent"
-msgstr ""
-
-#: ../libpurple/protocols/silc/chat.c:925
+msgstr "Stel permanent"
+
+#: ../libpurple/protocols/silc/chat.c:946
+#: ../libpurple/protocols/silc10/chat.c:930
 msgid "Set User Limit"
 msgstr "Stel gebruikerlimiet"
 
-#: ../libpurple/protocols/silc/chat.c:931
+#: ../libpurple/protocols/silc/chat.c:952
+#: ../libpurple/protocols/silc10/chat.c:936
 msgid "Reset Topic Restriction"
-msgstr ""
-
-#: ../libpurple/protocols/silc/chat.c:936
+msgstr "Stel onderwerpbeperking terug"
+
+#: ../libpurple/protocols/silc/chat.c:957
+#: ../libpurple/protocols/silc10/chat.c:941
 msgid "Set Topic Restriction"
-msgstr ""
-
-#: ../libpurple/protocols/silc/chat.c:943
+msgstr "Stel onderwerpbeperking"
+
+#: ../libpurple/protocols/silc/chat.c:964
+#: ../libpurple/protocols/silc10/chat.c:948
 msgid "Reset Private Channel"
-msgstr ""
-
-#: ../libpurple/protocols/silc/chat.c:948
+msgstr "Stel private groep terug"
+
+#: ../libpurple/protocols/silc/chat.c:969
+#: ../libpurple/protocols/silc10/chat.c:953
 msgid "Set Private Channel"
-msgstr ""
-
-#: ../libpurple/protocols/silc/chat.c:955
+msgstr "Stel private kanaal"
+
+#: ../libpurple/protocols/silc/chat.c:976
+#: ../libpurple/protocols/silc10/chat.c:960
 msgid "Reset Secret Channel"
-msgstr ""
-
-#: ../libpurple/protocols/silc/chat.c:960
+msgstr "Stel geheime kanaal terug"
+
+#: ../libpurple/protocols/silc/chat.c:981
+#: ../libpurple/protocols/silc10/chat.c:965
 msgid "Set Secret Channel"
-msgstr ""
-
-#: ../libpurple/protocols/silc/chat.c:1034
-#, c-format
-msgid "You are channel founder on <I>%s</I>"
-msgstr ""
-
-#: ../libpurple/protocols/silc/chat.c:1038
-#, c-format
-msgid "Channel founder on <I>%s</I> is <I>%s</I>"
-msgstr ""
-
-#: ../libpurple/protocols/silc/chat.c:1097
+msgstr "Stel geheime kanaal"
+
+#: ../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 ""
-
-#: ../libpurple/protocols/silc/chat.c:1099
+"U het by die %s kanaal aangesluit voor u by die private groep kon aansluit"
+
+#: ../libpurple/protocols/silc/chat.c:1047
+#: ../libpurple/protocols/silc10/chat.c:1104
 msgid "Join Private Group"
-msgstr ""
-
-#: ../libpurple/protocols/silc/chat.c:1100
+msgstr "Sluit by private groep aan"
+
+#: ../libpurple/protocols/silc/chat.c:1048
+#: ../libpurple/protocols/silc10/chat.c:1105
 msgid "Cannot join private group"
-msgstr ""
-
-#: ../libpurple/protocols/silc/chat.c:1294
-#: ../libpurple/protocols/silc/silc.c:1146
+msgstr "Kan nie by private groep aansluit nie"
+
+#: ../libpurple/protocols/silc/chat.c:1260
+#: ../libpurple/protocols/silc/silc.c:1217
+#: ../libpurple/protocols/silc10/chat.c:1299
+#: ../libpurple/protocols/silc10/silc.c:1137
 msgid "Call Command"
-msgstr ""
-
-#: ../libpurple/protocols/silc/chat.c:1294
-#: ../libpurple/protocols/silc/silc.c:1146
+msgstr "Roep bevel"
+
+#: ../libpurple/protocols/silc/chat.c:1260
+#: ../libpurple/protocols/silc/silc.c:1218
+#: ../libpurple/protocols/silc10/chat.c:1299
+#: ../libpurple/protocols/silc10/silc.c:1137
 msgid "Cannot call command"
-msgstr ""
-
-#: ../libpurple/protocols/silc/chat.c:1295
-#: ../libpurple/protocols/silc/silc.c:1147
+msgstr "Kan nie bevel roep nie"
+
+#: ../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 "Onbekende opdrag"
 
-#: ../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 "Beveiligde lêeroordrag"
 
-#: ../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 "Fout tydens lêeroordrag"
 
-#: ../libpurple/protocols/silc/ft.c:94
+#: ../libpurple/protocols/silc/ft.c:87
+msgid "Remote disconnected"
+msgstr "Afgeleë afgesny"
+
+#: ../libpurple/protocols/silc/ft.c:106 ../libpurple/protocols/silc10/ft.c:94
 msgid "Permission denied"
 msgstr "Toestemming gewyer"
 
-#: ../libpurple/protocols/silc/ft.c:98
+#: ../libpurple/protocols/silc/ft.c:110 ../libpurple/protocols/silc10/ft.c:98
 msgid "Key agreement failed"
-msgstr ""
-
-#: ../libpurple/protocols/silc/ft.c:102
+msgstr "Sleutelooreenkoms het misluk"
+
+#: ../libpurple/protocols/silc/ft.c:114
+msgid "Connection timed out"
+msgstr "Verbinding het uitgetel"
+
+#: ../libpurple/protocols/silc/ft.c:118
+msgid "Creating connection failed"
+msgstr "Skep van verbinding het misluk"
+
+#: ../libpurple/protocols/silc/ft.c:122 ../libpurple/protocols/silc10/ft.c:102
 msgid "File transfer session does not exist"
-msgstr ""
-
-#: ../libpurple/protocols/silc/ft.c:206
+msgstr "Lêeroordragsessie bestaan nie"
+
+#: ../libpurple/protocols/silc/ft.c:273 ../libpurple/protocols/silc10/ft.c:206
 msgid "No file transfer session active"
-msgstr ""
-
-#: ../libpurple/protocols/silc/ft.c:211
+msgstr "Geen lêeroordragsessie aktief nie"
+
+#: ../libpurple/protocols/silc/ft.c:278 ../libpurple/protocols/silc10/ft.c:211
 msgid "File transfer already started"
 msgstr "Lêeroordrag reeds begin"
 
-#: ../libpurple/protocols/silc/ft.c:216
+#: ../libpurple/protocols/silc/ft.c:283 ../libpurple/protocols/silc10/ft.c:216
 msgid "Could not perform key agreement for file transfer"
-msgstr ""
-
-#: ../libpurple/protocols/silc/ft.c:222
+msgstr "Kon nie sleutelooreenkoms uitvoer vir lêeroordrag nie"
+
+#: ../libpurple/protocols/silc/ft.c:289 ../libpurple/protocols/silc10/ft.c:222
 msgid "Could not start the file transfer"
-msgstr ""
-
-#: ../libpurple/protocols/silc/ft.c:341
+msgstr "Kon nie die lêeroordrag begin nie"
+
+#: ../libpurple/protocols/silc/ft.c:426 ../libpurple/protocols/silc10/ft.c:341
 msgid "Cannot send file"
 msgstr "Kan nie lêer stuur nie"
 
-#: ../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 "Fout het voorgekom"
+
+#: ../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 ""
-
-#: ../libpurple/protocols/silc/ops.c:638
+msgstr "%s het die onderwerp van <I>%s</I> verander na: %s"
+
+#: ../libpurple/protocols/silc/ops.c:617
+#: ../libpurple/protocols/silc10/ops.c:638
 #, c-format
 msgid "<I>%s</I> set channel <I>%s</I> modes to: %s"
-msgstr ""
-
-#: ../libpurple/protocols/silc/ops.c:642
+msgstr "<I>%s</I> het kanaal <I>%s</I> se modusse gestel na: %s"
+
+#: ../libpurple/protocols/silc/ops.c:621
+#: ../libpurple/protocols/silc10/ops.c:642
 #, c-format
 msgid "<I>%s</I> removed all channel <I>%s</I> modes"
-msgstr ""
-
-#: ../libpurple/protocols/silc/ops.c:675
+msgstr "<I>%s</I> het al kanaal <I>%s</I> se modusse verwyder"
+
+#: ../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 ""
-
-#: ../libpurple/protocols/silc/ops.c:683
+msgstr "<I>%s</I> het kanaal <I>%s</I> se modusse gestel na: %s"
+
+#: ../libpurple/protocols/silc/ops.c:662
+#: ../libpurple/protocols/silc10/ops.c:683
 #, c-format
 msgid "<I>%s</I> removed all <I>%s's</I> modes"
-msgstr ""
-
-#: ../libpurple/protocols/silc/ops.c:712
+msgstr "<I>%s</I> het al kanaal <I>%s</I> se modusse verwyder"
+
+#: ../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 ""
-
-#: ../libpurple/protocols/silc/ops.c:742 ../libpurple/protocols/silc/ops.c:747
-#: ../libpurple/protocols/silc/ops.c:752
-#, c-format
-#, fuzzy
+msgstr "U is by <I>%s</I> geskop deur <I>%s</I> (%s)"
+
+#: ../libpurple/protocols/silc/ops.c:718 ../libpurple/protocols/silc/ops.c:723
+#: ../libpurple/protocols/silc/ops.c:728
+#: ../libpurple/protocols/silc10/ops.c:742
+#: ../libpurple/protocols/silc10/ops.c:747
+#: ../libpurple/protocols/silc10/ops.c:752
+#, c-format
 msgid "You have been killed by %s (%s)"
-msgstr "U is uitgeskop deur %s: (%s)"
-
-#: ../libpurple/protocols/silc/ops.c:773 ../libpurple/protocols/silc/ops.c:778
-#: ../libpurple/protocols/silc/ops.c:783
-#, c-format
-#, fuzzy
+msgstr "U is gemoor deur %s (%s)"
+
+#: ../libpurple/protocols/silc/ops.c:749 ../libpurple/protocols/silc/ops.c:754
+#: ../libpurple/protocols/silc/ops.c:759
+#: ../libpurple/protocols/silc10/ops.c:773
+#: ../libpurple/protocols/silc10/ops.c:778
+#: ../libpurple/protocols/silc10/ops.c:783
+#, c-format
 msgid "Killed by %s (%s)"
-msgstr "Uitgeskop deur %s (%s)"
-
-#: ../libpurple/protocols/silc/ops.c:829
+msgstr "Gemoor deur %s (%s)"
+
+#: ../libpurple/protocols/silc/ops.c:796
+#: ../libpurple/protocols/silc10/ops.c:829
 msgid "Server signoff"
-msgstr ""
-
-#: ../libpurple/protocols/silc/ops.c:1017
+msgstr "Bediener teken af"
+
+#: ../libpurple/protocols/silc/ops.c:983
+#: ../libpurple/protocols/silc10/ops.c:1017
 msgid "Personal Information"
 msgstr "Persoonlike inligting"
 
-#: ../libpurple/protocols/silc/ops.c:1040
+#: ../libpurple/protocols/silc/ops.c:1006
+#: ../libpurple/protocols/silc10/ops.c:1040
 msgid "Birth Day"
 msgstr "Verjaardag"
 
-#: ../libpurple/protocols/silc/ops.c:1048
+#: ../libpurple/protocols/silc/ops.c:1014
+#: ../libpurple/protocols/silc10/ops.c:1048
 msgid "Job Role"
-msgstr ""
-
-#: ../libpurple/protocols/silc/ops.c:1052
-#: ../libpurple/protocols/silc/silc.c:931
+msgstr "Taakrol"
+
+#: ../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 "Organisasie"
 
-#: ../libpurple/protocols/silc/ops.c:1056
+#: ../libpurple/protocols/silc/ops.c:1022
+#: ../libpurple/protocols/silc10/ops.c:1056
 msgid "Unit"
 msgstr "Eenheid"
 
-#: ../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 "Sluit by geselskap aan"
-
-#: ../libpurple/protocols/silc/ops.c:1183
-#: ../libpurple/protocols/silc/ops.c:1332
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1047
+msgstr "Sluit by geselsie aan"
+
+#: ../libpurple/protocols/silc/ops.c:1127
+#: ../libpurple/protocols/silc10/chat.c:1039
+#, c-format
+msgid "You are channel founder on <I>%s</I>"
+msgstr "U is kanaalstigter op <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 "Kanaalstigter op <I>%s</I> is <I>%s</I>"
+
+#: ../libpurple/protocols/silc/ops.c:1190
+#: ../libpurple/protocols/silc/ops.c:1326
+#: ../libpurple/protocols/silc10/ops.c:1183
+#: ../libpurple/protocols/silc10/ops.c:1332
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1071
 msgid "Real Name"
 msgstr "Regte naam"
 
-#: ../libpurple/protocols/silc/ops.c:1213
+#: ../libpurple/protocols/silc/ops.c:1218
+#: ../libpurple/protocols/silc10/ops.c:1213
 msgid "Status Text"
 msgstr "Statusteks"
 
-#: ../libpurple/protocols/silc/ops.c:1285
-#: ../libpurple/protocols/silc/ops.c:1357
+#: ../libpurple/protocols/silc/ops.c:1279
+#: ../libpurple/protocols/silc/ops.c:1351
+#: ../libpurple/protocols/silc10/ops.c:1285
+#: ../libpurple/protocols/silc10/ops.c:1357
 msgid "Public Key Fingerprint"
-msgstr ""
-
-#: ../libpurple/protocols/silc/ops.c:1286
-#: ../libpurple/protocols/silc/ops.c:1358
+msgstr "Publiekesleutel-vingerafdruk"
+
+#: ../libpurple/protocols/silc/ops.c:1280
+#: ../libpurple/protocols/silc/ops.c:1352
+#: ../libpurple/protocols/silc10/ops.c:1286
+#: ../libpurple/protocols/silc10/ops.c:1358
 msgid "Public Key Babbleprint"
-msgstr ""
-
-#: ../libpurple/protocols/silc/ops.c:1298
+msgstr "Publiekesleutel-babbelafdruk"
+
+#: ../libpurple/protocols/silc/ops.c:1292
+#: ../libpurple/protocols/silc10/ops.c:1298
 msgid "_More..."
 msgstr "_Meer..."
 
-#: ../libpurple/protocols/silc/ops.c:1371
-#: ../libpurple/protocols/silc/silc.c:997
+#: ../libpurple/protocols/silc/ops.c:1369
+#: ../libpurple/protocols/silc/silc.c:1077
+#: ../libpurple/protocols/silc10/ops.c:1371
+#: ../libpurple/protocols/silc10/silc.c:988
 msgid "Detach From Server"
-msgstr ""
-
-#: ../libpurple/protocols/silc/ops.c:1371
+msgstr "Ontheg van bediener"
+
+#: ../libpurple/protocols/silc/ops.c:1369
+#: ../libpurple/protocols/silc10/ops.c:1371
 msgid "Cannot detach"
-msgstr ""
-
-#: ../libpurple/protocols/silc/ops.c:1382
+msgstr "Kan nie ontheg nie"
+
+#: ../libpurple/protocols/silc/ops.c:1389
+#: ../libpurple/protocols/silc10/ops.c:1382
 msgid "Cannot set topic"
 msgstr "Kan nie onderwerp stel nie"
 
-#: ../libpurple/protocols/silc/ops.c:1414
+#: ../libpurple/protocols/silc/ops.c:1418
+#: ../libpurple/protocols/silc10/ops.c:1414
 msgid "Failed to change nickname"
 msgstr "Verandering van bynaam het misluk"
 
-#: ../libpurple/protocols/silc/ops.c:1462
+#: ../libpurple/protocols/silc/ops.c:1467
+#: ../libpurple/protocols/silc10/ops.c:1462
 msgid "Roomlist"
 msgstr "Kamerlys"
 
-#: ../libpurple/protocols/silc/ops.c:1462
+#: ../libpurple/protocols/silc/ops.c:1467
+#: ../libpurple/protocols/silc10/ops.c:1462
 msgid "Cannot get room list"
 msgstr "Kan nie kamerlys kry nie"
 
-#: ../libpurple/protocols/silc/ops.c:1507
+#: ../libpurple/protocols/silc/ops.c:1468
+msgid "Network is empty"
+msgstr "Netwerk is leeg"
+
+#: ../libpurple/protocols/silc/ops.c:1512
+#: ../libpurple/protocols/silc10/ops.c:1507
 msgid "No public key was received"
 msgstr "Geen publieke sleutel is ontvang nie"
 
-#: ../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 "Bedienerinligting"
 
-#: ../libpurple/protocols/silc/ops.c:1520
+#: ../libpurple/protocols/silc/ops.c:1525
+#: ../libpurple/protocols/silc10/ops.c:1520
 msgid "Cannot get server information"
 msgstr "Kan nie bedienerinligting kry nie"
 
-#: ../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 "Bedienerstatistiek"
 
-#: ../libpurple/protocols/silc/ops.c:1550
+#: ../libpurple/protocols/silc/ops.c:1549
+#: ../libpurple/protocols/silc10/ops.c:1550
 msgid "Cannot get server statistics"
 msgstr "Kan nie bedienerstatistiek kry nie"
 
-#: ../libpurple/protocols/silc/ops.c:1559
-msgid "No server statistics available"
-msgstr "Geen bedienerstatistiek beskikbaar nie"
-
-#: ../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"
@@ -9197,116 +10013,97 @@
 "Total server operators: %d\n"
 "Total router operators: %d\n"
 msgstr ""
-
-#: ../libpurple/protocols/silc/ops.c:1604
+"Plaaslike bediener se begintyd: %s\n"
+"Plaaslike bediener se optyd: %s\n"
+"Plaaslike bediener se kliënte: %d\n"
+"Plaaslike bediener se kanale: %d\n"
+"Plaaslike bediener se operateurs: %d\n"
+"Plaaslike roeteerder se operateurs: %d\n"
+"Plaaslike selfoonkliënte: %d\n"
+"Plaaslike selfoonkanale: %d\n"
+"Plaaslike selfoonbedieners: %d\n"
+"Totale kliënte: %d\n"
+"Totale kanale: %d\n"
+"Totale bedieners: %d\n"
+"Totale roeteerders: %d\n"
+"Totale bedieneroperateurs: %d\n"
+"Totale roeteerderoperateurs: %d\n"
+
+#: ../libpurple/protocols/silc/ops.c:1588
+#: ../libpurple/protocols/silc10/ops.c:1604
 msgid "Network Statistics"
 msgstr "Netwerk statistiek"
 
-#: ../libpurple/protocols/silc/ops.c:1612
-#: ../libpurple/protocols/silc/ops.c:1617
+#: ../libpurple/protocols/silc/ops.c:1596
+#: ../libpurple/protocols/silc/ops.c:1601
+#: ../libpurple/protocols/silc10/ops.c:1612
+#: ../libpurple/protocols/silc10/ops.c:1617
 msgid "Ping"
-msgstr ""
-
-#: ../libpurple/protocols/silc/ops.c:1612
+msgstr "Pieng"
+
+#: ../libpurple/protocols/silc/ops.c:1596
+#: ../libpurple/protocols/silc10/ops.c:1612
 msgid "Ping failed"
-msgstr ""
-
-#: ../libpurple/protocols/silc/ops.c:1617
+msgstr "Pieng het misluk"
+
+#: ../libpurple/protocols/silc/ops.c:1601
+#: ../libpurple/protocols/silc10/ops.c:1617
 msgid "Ping reply received from server"
-msgstr ""
-
-#: ../libpurple/protocols/silc/ops.c:1625
+msgstr "Pieng-antwoord ontvang van bediener"
+
+#: ../libpurple/protocols/silc/ops.c:1609
+#: ../libpurple/protocols/silc10/ops.c:1625
 msgid "Could not kill user"
-msgstr ""
-
-#: ../libpurple/protocols/silc/ops.c:1709
-msgid "Error during connecting to SILC Server"
-msgstr ""
-
-#: ../libpurple/protocols/silc/ops.c:1714
-msgid "Key Exchange failed"
-msgstr ""
-
-#: ../libpurple/protocols/silc/ops.c:1723
-msgid ""
-"Resuming detached session failed. Press Reconnect to create new connection."
-msgstr ""
-
-#: ../libpurple/protocols/silc/ops.c:1758
-msgid "Disconnected by server"
-msgstr ""
-
-#: ../libpurple/protocols/silc/ops.c:1820
-#: ../libpurple/protocols/silc/ops.c:1867
-#: ../libpurple/protocols/silc/silc.c:182
+msgstr "Kon nie gebruiker moor nie"
+
+#: ../libpurple/protocols/silc/ops.c:1648
+msgid "WATCH"
+msgstr "DOPHOU"
+
+#: ../libpurple/protocols/silc/ops.c:1648
+msgid "Cannot watch user"
+msgstr "Kan nie gebruiker dophou nie"
+
+#: ../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 "Hervat sessie"
 
-#: ../libpurple/protocols/silc/ops.c:1822
+#: ../libpurple/protocols/silc/ops.c:1726
+#: ../libpurple/protocols/silc10/ops.c:1813
 msgid "Authenticating connection"
-msgstr ""
-
-#: ../libpurple/protocols/silc/ops.c:1869
+msgstr "Staaf tans verbinding"
+
+#: ../libpurple/protocols/silc/ops.c:1777
+#: ../libpurple/protocols/silc10/ops.c:1860
 msgid "Verifying server public key"
-msgstr ""
-
-#: ../libpurple/protocols/silc/ops.c:1910
+msgstr "Verifieer bediener se publieke sleutel"
+
+#: ../libpurple/protocols/silc/ops.c:1814
+#: ../libpurple/protocols/silc10/ops.c:1902
 msgid "Passphrase required"
-msgstr ""
-
-#: ../libpurple/protocols/silc/ops.c:1939
-msgid "Failure: Version mismatch, upgrade your client"
-msgstr ""
-
-#: ../libpurple/protocols/silc/ops.c:1942
-msgid "Failure: Remote does not trust/support your public key"
-msgstr ""
-
-#: ../libpurple/protocols/silc/ops.c:1945
-msgid "Failure: Remote does not support proposed KE group"
-msgstr ""
-
-#: ../libpurple/protocols/silc/ops.c:1948
-msgid "Failure: Remote does not support proposed cipher"
-msgstr ""
-
-#: ../libpurple/protocols/silc/ops.c:1951
-msgid "Failure: Remote does not support proposed PKCS"
-msgstr ""
-
-#: ../libpurple/protocols/silc/ops.c:1954
-msgid "Failure: Remote does not support proposed hash function"
-msgstr ""
-
-#: ../libpurple/protocols/silc/ops.c:1957
-msgid "Failure: Remote does not support proposed HMAC"
-msgstr ""
-
-#: ../libpurple/protocols/silc/ops.c:1959
-msgid "Failure: Incorrect signature"
-msgstr ""
-
-#: ../libpurple/protocols/silc/ops.c:1961
-msgid "Failure: Invalid cookie"
-msgstr ""
-
-#: ../libpurple/protocols/silc/ops.c:1972
-msgid "Failure: Authentication failed"
-msgstr ""
-
-#: ../libpurple/protocols/silc/pk.c:103
+msgstr "Wagwoordfrase vereis"
+
+#: ../libpurple/protocols/silc/pk.c:98 ../libpurple/protocols/silc10/pk.c:104
 #, c-format
 msgid ""
 "Received %s's public key. Your local copy does not match this key. Would you "
 "still like to accept this public key?"
 msgstr ""
-
-#: ../libpurple/protocols/silc/pk.c:108
+"%s se publieke sleutel ontvang. U plaaslik afskrif pas nie by hierdie "
+"sleutel nie. Wil u steeds hierdie publieke sleutel aanvaar?"
+
+#: ../libpurple/protocols/silc/pk.c:103 ../libpurple/protocols/silc10/pk.c:109
 #, c-format
 msgid "Received %s's public key. Would you like to accept this public key?"
 msgstr ""
-
-#: ../libpurple/protocols/silc/pk.c:112
+"%s se publieke sleutel ontvang. Wil u hierdie publieke sleutel aanvaar?"
+
+#: ../libpurple/protocols/silc/pk.c:107 ../libpurple/protocols/silc10/pk.c:113
 #, c-format
 msgid ""
 "Fingerprint and babbleprint for the %s key are:\n"
@@ -9314,346 +10111,470 @@
 "%s\n"
 "%s\n"
 msgstr ""
-
-#: ../libpurple/protocols/silc/pk.c:115 ../libpurple/protocols/silc/pk.c:140
+"Vingerafdruk en babbelafdruk vir die %s sleutel is:\n"
+"\n"
+"%s\n"
+"%s\n"
+
+#: ../libpurple/protocols/silc/pk.c:110 ../libpurple/protocols/silc/pk.c:139
+#: ../libpurple/protocols/silc10/pk.c:116
+#: ../libpurple/protocols/silc10/pk.c:142
 msgid "Verify Public Key"
-msgstr ""
-
-#: ../libpurple/protocols/silc/pk.c:119
+msgstr "Verifieer publieke sleutel"
+
+#: ../libpurple/protocols/silc/pk.c:115 ../libpurple/protocols/silc10/pk.c:121
 msgid "_View..."
 msgstr "_Bekyk..."
 
-#: ../libpurple/protocols/silc/pk.c:141
+#: ../libpurple/protocols/silc/pk.c:140 ../libpurple/protocols/silc10/pk.c:143
 msgid "Unsupported public key type"
-msgstr ""
-
-#: ../libpurple/protocols/silc/silc.c:153
+msgstr "Nieondersteunde publiekesleutel-tipe"
+
+#: ../libpurple/protocols/silc/silc.c:217
+#: ../libpurple/protocols/silc10/ops.c:1749
+msgid "Disconnected by server"
+msgstr "Afgesny van bediener"
+
+#: ../libpurple/protocols/silc/silc.c:224
+#: ../libpurple/protocols/silc10/ops.c:1700
+msgid "Error during connecting to SILC Server"
+msgstr "Fout tydens verbinding aan SILC-bediener"
+
+#: ../libpurple/protocols/silc/silc.c:229
+#: ../libpurple/protocols/silc10/ops.c:1705
+msgid "Key Exchange failed"
+msgstr "Sleutelruiling het misluk"
+
+#: ../libpurple/protocols/silc/silc.c:238
+#: ../libpurple/protocols/silc10/ops.c:1714
+msgid ""
+"Resuming detached session failed. Press Reconnect to create new connection."
+msgstr ""
+"Hervat van onthegte sessie het misluk. Druk 'Verbind weer' om 'n nuwe "
+"verbinding te skep."
+
+#: ../libpurple/protocols/silc/silc.c:265
+#: ../libpurple/protocols/silc/silc.c:311
+#: ../libpurple/protocols/silc10/silc.c:161
 msgid "Connection failed"
 msgstr "Verbinding het misluk"
 
-#: ../libpurple/protocols/silc/silc.c:174
-msgid "Cannot initialize SILC Client connection"
-msgstr ""
-
-#: ../libpurple/protocols/silc/silc.c:185
+#: ../libpurple/protocols/silc/silc.c:280
+#: ../libpurple/protocols/silc10/silc.c:193
 msgid "Performing key exchange"
-msgstr ""
-
-#: ../libpurple/protocols/silc/silc.c:271
+msgstr "Voer tans sleutelruiling uit"
+
+#. Progress
+#: ../libpurple/protocols/silc/silc.c:343
+#: ../libpurple/protocols/silc10/silc.c:325
+msgid "Connecting to SILC Server"
+msgstr "Verbind tans aan SILC-bediener"
+
+#: ../libpurple/protocols/silc/silc.c:352
+msgid "Could not load SILC key pair"
+msgstr "Kon nie SILC-sleutelpaar laai nie"
+
+#: ../libpurple/protocols/silc/silc.c:366
+#: ../libpurple/protocols/silc10/silc.c:355
+msgid "Unable to create connection"
+msgstr "Kon nie verbinding skep nie"
+
+#: ../libpurple/protocols/silc/silc.c:395
+#: ../libpurple/protocols/silc10/silc.c:267
 msgid "Out of memory"
 msgstr "Onvoldoende geheue"
 
-#: ../libpurple/protocols/silc/silc.c:294
-msgid "John Noname"
-msgstr "Naamloos Niemand"
-
-#: ../libpurple/protocols/silc/silc.c:317
+#: ../libpurple/protocols/silc/silc.c:438
+#: ../libpurple/protocols/silc10/silc.c:313
 msgid "Cannot initialize SILC protocol"
-msgstr ""
-
-#: ../libpurple/protocols/silc/silc.c:324
-msgid "Cannot find/access ~/.silc directory"
-msgstr ""
-
-#. Progress
-#: ../libpurple/protocols/silc/silc.c:329
-msgid "Connecting to SILC Server"
-msgstr ""
-
-#: ../libpurple/protocols/silc/silc.c:338
-#, c-format
-msgid "Could not load SILC key pair: %s"
-msgstr ""
-
-#: ../libpurple/protocols/silc/silc.c:359
-msgid "Unable to create connection"
-msgstr ""
-
-#: ../libpurple/protocols/silc/silc.c:658
+msgstr "Kon nie SILC-protokol inisialiseer nie"
+
+#: ../libpurple/protocols/silc/silc.c:445
+msgid "Error loading SILC key pair"
+msgstr "Fout met laai van SILC-sleutelpaar"
+
+#: ../libpurple/protocols/silc/silc.c:739
+#: ../libpurple/protocols/silc10/silc.c:650
 msgid "Your Current Mood"
-msgstr ""
-
-#: ../libpurple/protocols/silc/silc.c:660 ../pidgin/gtkprefs.c:1527
+msgstr "U huidige stemming"
+
+#: ../libpurple/protocols/silc/silc.c:741
+#: ../libpurple/protocols/silc10/silc.c:652 ../pidgin/gtkprefs.c:1638
 msgid "Normal"
 msgstr "Normaal"
 
-#: ../libpurple/protocols/silc/silc.c:674
+#: ../libpurple/protocols/silc/silc.c:755
+#: ../libpurple/protocols/silc10/silc.c:666
 msgid "In love"
 msgstr "Verlief"
 
-#: ../libpurple/protocols/silc/silc.c:685
+#: ../libpurple/protocols/silc/silc.c:766
+#: ../libpurple/protocols/silc10/silc.c:677
 msgid ""
 "\n"
 "Your Preferred Contact Methods"
 msgstr ""
-
-#: ../libpurple/protocols/silc/silc.c:693
-#: ../libpurple/protocols/silc/util.c:557
+"\n"
+"U voorkeur-kontakmetodes"
+
+#: ../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 "Videokonferensie"
 
-#: ../libpurple/protocols/silc/silc.c:702
+#: ../libpurple/protocols/silc/silc.c:783
+#: ../libpurple/protocols/silc10/silc.c:694
 msgid "Your Current Status"
 msgstr "U huidige status"
 
-#: ../libpurple/protocols/silc/silc.c:709
+#: ../libpurple/protocols/silc/silc.c:790
+#: ../libpurple/protocols/silc10/silc.c:701
 msgid "Online Services"
 msgstr "Aanlyndienste"
 
-#: ../libpurple/protocols/silc/silc.c:712
+#: ../libpurple/protocols/silc/silc.c:793
+#: ../libpurple/protocols/silc10/silc.c:704
 msgid "Let others see what services you are using"
-msgstr ""
-
-#: ../libpurple/protocols/silc/silc.c:718
+msgstr "Laat ander sien watter dienste u gebruik"
+
+#: ../libpurple/protocols/silc/silc.c:799
+#: ../libpurple/protocols/silc10/silc.c:710
 msgid "Let others see what computer you are using"
-msgstr ""
-
-#: ../libpurple/protocols/silc/silc.c:725
+msgstr "Laat ander sien watter rekenaar u gebruik"
+
+#: ../libpurple/protocols/silc/silc.c:806
+#: ../libpurple/protocols/silc10/silc.c:717
 msgid "Your VCard File"
 msgstr "U VCard-lêer"
 
-#: ../libpurple/protocols/silc/silc.c:737
-#: ../libpurple/protocols/silc/silc.c:738
+#: ../libpurple/protocols/silc/silc.c:812
+msgid "Timezone (UTC)"
+msgstr "Tydsone (UTC)"
+
+#: ../libpurple/protocols/silc/silc.c:816
+#: ../libpurple/protocols/silc/silc.c:817
+#: ../libpurple/protocols/silc10/silc.c:729
+#: ../libpurple/protocols/silc10/silc.c:730
 msgid "User Online Status Attributes"
-msgstr ""
-
-#: ../libpurple/protocols/silc/silc.c:739
+msgstr "Attribute van gebruikers se aanlynstatus"
+
+#: ../libpurple/protocols/silc/silc.c:818
+#: ../libpurple/protocols/silc10/silc.c:731
 msgid ""
 "You can let other users see your online status information and your personal "
 "information. Please fill the information you would like other users to see "
 "about yourself."
 msgstr ""
-
-#: ../libpurple/protocols/silc/silc.c:779
-#: ../libpurple/protocols/silc/silc.c:785
-#: ../libpurple/protocols/silc/silc.c:1424
+"U kan ander gebruikers u aanlynstatus-inligting en u persoonlike inligting "
+"laat sien. Vul asb. die inligting in wat u wil hê ander gebruiker oor u moet "
+"kan sien."
+
+#: ../libpurple/protocols/silc/silc.c:859
+#: ../libpurple/protocols/silc/silc.c:865
+#: ../libpurple/protocols/silc/silc.c:1486
+#: ../libpurple/protocols/silc10/silc.c:772
+#: ../libpurple/protocols/silc10/silc.c:778
+#: ../libpurple/protocols/silc10/silc.c:1415
 msgid "Message of the Day"
-msgstr ""
-
-#: ../libpurple/protocols/silc/silc.c:779
+msgstr "Dagboodskap"
+
+#: ../libpurple/protocols/silc/silc.c:859
+#: ../libpurple/protocols/silc10/silc.c:772
 msgid "No Message of the Day available"
-msgstr ""
-
-#: ../libpurple/protocols/silc/silc.c:780
-#: ../libpurple/protocols/silc/silc.c:1419
+msgstr "Geen dagboodskap nie"
+
+#: ../libpurple/protocols/silc/silc.c:860
+#: ../libpurple/protocols/silc/silc.c:1481
+#: ../libpurple/protocols/silc10/silc.c:773
+#: ../libpurple/protocols/silc10/silc.c:1410
 msgid "There is no Message of the Day associated with this connection"
-msgstr ""
-
-#: ../libpurple/protocols/silc/silc.c:831
-#: ../libpurple/protocols/silc/silc.c:875
-#: ../libpurple/protocols/silc/silc.c:946
-#: ../libpurple/protocols/silc/silc.c:947
+msgstr "Daar word geen dagboodskap met hierdie verbinding geassosieer nie"
+
+#: ../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 ""
-
-#: ../libpurple/protocols/silc/silc.c:831
-#, fuzzy
+msgstr "Skep nuwe SILC-sleutelpaar"
+
+#: ../libpurple/protocols/silc/silc.c:911
+#: ../libpurple/protocols/silc10/silc.c:824
 msgid "Passphrases do not match"
-msgstr "Wagwoorde stem nie ooreen nie."
-
-#: ../libpurple/protocols/silc/silc.c:875
+msgstr "Wagwoordfrases stem nie ooreen nie"
+
+#: ../libpurple/protocols/silc/silc.c:957
+#: ../libpurple/protocols/silc10/silc.c:868
 msgid "Key Pair Generation failed"
-msgstr ""
-
-#: ../libpurple/protocols/silc/silc.c:914
+msgstr "Sleutelpaar-generering het misluk"
+
+#: ../libpurple/protocols/silc/silc.c:996
+#: ../libpurple/protocols/silc10/silc.c:907
 msgid "Key length"
 msgstr "Sleutellengte"
 
-#: ../libpurple/protocols/silc/silc.c:916
+#: ../libpurple/protocols/silc/silc.c:998
+#: ../libpurple/protocols/silc10/silc.c:909
 msgid "Public key file"
 msgstr "Publiekesleutellêer"
 
-#: ../libpurple/protocols/silc/silc.c:918
+#: ../libpurple/protocols/silc/silc.c:1000
+#: ../libpurple/protocols/silc10/silc.c:911
 msgid "Private key file"
 msgstr "Privateesleutellêer"
 
-#: ../libpurple/protocols/silc/silc.c:941
+#: ../libpurple/protocols/silc/silc.c:1023
+#: ../libpurple/protocols/silc10/silc.c:934
 msgid "Passphrase (retype)"
-msgstr ""
-
-#: ../libpurple/protocols/silc/silc.c:948
+msgstr "Wagwoordfrase (hertik)"
+
+#: ../libpurple/protocols/silc/silc.c:1030
+#: ../libpurple/protocols/silc10/silc.c:941
 msgid "Generate Key Pair"
-msgstr ""
-
-#: ../libpurple/protocols/silc/silc.c:992
+msgstr "Genereer sleutelpaar"
+
+#: ../libpurple/protocols/silc/silc.c:1073
+#: ../libpurple/protocols/silc10/silc.c:984
 msgid "Online Status"
 msgstr "Aanlynstatus"
 
-#: ../libpurple/protocols/silc/silc.c:1001
+#: ../libpurple/protocols/silc/silc.c:1081
+#: ../libpurple/protocols/silc10/silc.c:992
 msgid "View Message of the Day"
-msgstr ""
-
-#: ../libpurple/protocols/silc/silc.c:1005
+msgstr "Bekyk dagboodskap"
+
+#: ../libpurple/protocols/silc/silc.c:1085
+#: ../libpurple/protocols/silc10/silc.c:996
 msgid "Create SILC Key Pair..."
-msgstr ""
-
-#: ../libpurple/protocols/silc/silc.c:1104
+msgstr "Skep SILC-sleutelpaar..."
+
+#: ../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 ""
-
-#: ../libpurple/protocols/silc/silc.c:1295
+msgstr "Gebruiker <I>%s</I> is nie op die netwerk teenwoordig nie"
+
+#: ../libpurple/protocols/silc/silc.c:1357
+#: ../libpurple/protocols/silc10/silc.c:1286
 msgid "Topic too long"
 msgstr "Onderwerp te lank"
 
-#: ../libpurple/protocols/silc/silc.c:1376
+#: ../libpurple/protocols/silc/silc.c:1438
+#: ../libpurple/protocols/silc10/silc.c:1367
 msgid "You must specify a nick"
-msgstr ""
-
-#: ../libpurple/protocols/silc/silc.c:1478
+msgstr "U moet 'n bynaam spesifiseer"
+
+#: ../libpurple/protocols/silc/silc.c:1540
+#: ../libpurple/protocols/silc10/silc.c:1469
 #, c-format
 msgid "channel %s not found"
 msgstr "kanaal %s nie gevind nie"
 
-#: ../libpurple/protocols/silc/silc.c:1483
+#: ../libpurple/protocols/silc/silc.c:1545
+#: ../libpurple/protocols/silc10/silc.c:1474
 #, c-format
 msgid "channel modes for %s: %s"
 msgstr "kanaalmodusse vir %s: %s"
 
-#: ../libpurple/protocols/silc/silc.c:1485
+#: ../libpurple/protocols/silc/silc.c:1547
+#: ../libpurple/protocols/silc10/silc.c:1476
 #, c-format
 msgid "no channel modes are set on %s"
 msgstr "geen kanaalmodusse is gestel op %s nie"
 
-#: ../libpurple/protocols/silc/silc.c:1498
+#: ../libpurple/protocols/silc/silc.c:1560
+#: ../libpurple/protocols/silc10/silc.c:1489
 #, c-format
 msgid "Failed to set cmodes for %s"
-msgstr ""
-
-#: ../libpurple/protocols/silc/silc.c:1528
+msgstr "Het misluk om cmodusse vir %s te stel"
+
+#: ../libpurple/protocols/silc/silc.c:1590
+#: ../libpurple/protocols/silc10/silc.c:1519
 #, c-format
 msgid "Unknown command: %s, (may be a client bug)"
 msgstr "Onbekende opdrag: %s, (moontlik 'n kliëntfout)"
 
-#: ../libpurple/protocols/silc/silc.c:1591
+#: ../libpurple/protocols/silc/silc.c:1653
+#: ../libpurple/protocols/silc10/silc.c:1582
 msgid "part [channel]:  Leave the chat"
-msgstr ""
-
-#: ../libpurple/protocols/silc/silc.c:1595
+msgstr "part [kanaal]:  Verlaat die geselsie"
+
+#: ../libpurple/protocols/silc/silc.c:1657
+#: ../libpurple/protocols/silc10/silc.c:1586
 msgid "leave [channel]:  Leave the chat"
-msgstr ""
-
-#: ../libpurple/protocols/silc/silc.c:1599
+msgstr "leave [kanaal]:  Verlaat die geselsie"
+
+#: ../libpurple/protocols/silc/silc.c:1661
+#: ../libpurple/protocols/silc10/silc.c:1590
 msgid "topic [&lt;new topic&gt;]:  View or change the topic"
-msgstr ""
-
-#: ../libpurple/protocols/silc/silc.c:1604
+msgstr "topic [&lt;nuwe onderwe&rp]:  Bekyk of verander die onderwerp"
+
+#: ../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 ""
-
-#: ../libpurple/protocols/silc/silc.c:1608
+"join &lt;kanaal&gt; [&lt;wagwoord&gt;]:  Sluit by 'n geselsie aan op hierdie "
+"netwerk"
+
+#: ../libpurple/protocols/silc/silc.c:1670
+#: ../libpurple/protocols/silc10/silc.c:1599
 msgid "list:  List channels on this network"
-msgstr ""
-
-#: ../libpurple/protocols/silc/silc.c:1612
+msgstr "list:  Lys kanale op hierdie netwerk"
+
+#: ../libpurple/protocols/silc/silc.c:1674
+#: ../libpurple/protocols/silc10/silc.c:1603
 msgid "whois &lt;nick&gt;:  View nick's information"
-msgstr ""
-
-#: ../libpurple/protocols/silc/silc.c:1616
-#: ../libpurple/protocols/zephyr/zephyr.c:2684
+msgstr "whois &lt;bynaam&gt;:  Bekyk bynaam se inligting"
+
+#: ../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 ""
-
-#: ../libpurple/protocols/silc/silc.c:1620
+"msg &lt;bynaam&gt; &lt;boodskap&gt;:  Stuur 'n private boodskap aan 'n "
+"gebruiker"
+
+#: ../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 ""
-
-#: ../libpurple/protocols/silc/silc.c:1624
+"query &lt;bynaam&gt; [&lt;boodskap&gt;]:  Stuur 'n private boodskap aan 'n "
+"gebruiker"
+
+#: ../libpurple/protocols/silc/silc.c:1686
+#: ../libpurple/protocols/silc10/silc.c:1615
 msgid "motd:  View the server's Message Of The Day"
-msgstr ""
-
-#: ../libpurple/protocols/silc/silc.c:1628
+msgstr "motd:  Bekyk die bediener se dagboodskap"
+
+#: ../libpurple/protocols/silc/silc.c:1690
+#: ../libpurple/protocols/silc10/silc.c:1619
 msgid "detach:  Detach this session"
-msgstr ""
-
-#: ../libpurple/protocols/silc/silc.c:1632
+msgstr "detach:  Ontheg hierdie sessie"
+
+#: ../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 [boodskap]:  Sluit verbinding met bediener, met 'n opsionele boodskap"
-
-#: ../libpurple/protocols/silc/silc.c:1636
+msgstr "quit [boodskap]:  Sny af van bediener, met 'n opsionele boodskap"
+
+#: ../libpurple/protocols/silc/silc.c:1698
+#: ../libpurple/protocols/silc10/silc.c:1627
 msgid "call &lt;command&gt;:  Call any silc client command"
-msgstr ""
-
-#: ../libpurple/protocols/silc/silc.c:1642
+msgstr "call &lt;bevel&gt;:  Roep enige silc-kliëntbevel"
+
+#: ../libpurple/protocols/silc/silc.c:1704
+#: ../libpurple/protocols/silc10/silc.c:1633
 msgid "kill &lt;nick&gt; [-pubkey|&lt;reason&gt;]:  Kill nick"
-msgstr ""
-
-#: ../libpurple/protocols/silc/silc.c:1646
+msgstr "kill &lt;bynaam&gt; [-pubkey|&lt;rede&gt;]:  Moor bynaam"
+
+#: ../libpurple/protocols/silc/silc.c:1708
+#: ../libpurple/protocols/silc10/silc.c:1637
 msgid "nick &lt;newnick&gt;:  Change your nickname"
-msgstr ""
-
-#: ../libpurple/protocols/silc/silc.c:1650
+msgstr "nick &lt;nuwe bynaam&gt;:  Verander u bynaam"
+
+#: ../libpurple/protocols/silc/silc.c:1712
+#: ../libpurple/protocols/silc10/silc.c:1641
 msgid "whowas &lt;nick&gt;:  View nick's information"
-msgstr ""
-
-#: ../libpurple/protocols/silc/silc.c:1654
+msgstr "whowas &lt;bynaam&gt;:  Bekyk bynaam se inligting"
+
+#: ../libpurple/protocols/silc/silc.c:1716
+#: ../libpurple/protocols/silc10/silc.c:1645
 msgid ""
 "cmode &lt;channel&gt; [+|-&lt;modes&gt;] [arguments]:  Change or display "
 "channel modes"
 msgstr ""
-
-#: ../libpurple/protocols/silc/silc.c:1658
+"cmode &lt;kanaal&gt; [+|-&lt;modusse&gt;] [argumente]:  Verander of wys "
+"kanaalmodusse"
+
+#: ../libpurple/protocols/silc/silc.c:1720
+#: ../libpurple/protocols/silc10/silc.c:1649
 msgid ""
 "cumode &lt;channel&gt; +|-&lt;modes&gt; &lt;nick&gt;:  Change nick's modes "
 "on channel"
 msgstr ""
-
-#: ../libpurple/protocols/silc/silc.c:1662
+"cumode &lt;kanaal&gt; +|-&lt;modusse&gt; &lt;bynaam&gt;:  Verander bynaam se "
+"modusse op kanaal"
+
+#: ../libpurple/protocols/silc/silc.c:1724
+#: ../libpurple/protocols/silc10/silc.c:1653
 msgid "umode &lt;usermodes&gt;:  Set your modes in the network"
-msgstr ""
-
-#: ../libpurple/protocols/silc/silc.c:1666
+msgstr "umode &lt;gebruikermodusse&gt;:  Stel u modusse op die netwerk"
+
+#: ../libpurple/protocols/silc/silc.c:1728
+#: ../libpurple/protocols/silc10/silc.c:1657
 msgid "oper &lt;nick&gt; [-pubkey]:  Get server operator privileges"
-msgstr ""
-
-#: ../libpurple/protocols/silc/silc.c:1670
+msgstr "oper &lt;bynaam&gt; [-pubkey]:  Kry bedieneroperateur-voorregte"
+
+#: ../libpurple/protocols/silc/silc.c:1732
+#: ../libpurple/protocols/silc10/silc.c:1661
 msgid ""
 "invite &lt;channel&gt; [-|+]&lt;nick&gt;:  invite nick or add/remove from "
 "channel invite list"
 msgstr ""
-
-#: ../libpurple/protocols/silc/silc.c:1674
+"invite &lt;kanaal&gt; [-|+]&lt;bynaam&gt;:  nooi bynaam uit of voeg by/"
+"verwyder van kanaaluitnooilys"
+
+#: ../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 ""
-
-#: ../libpurple/protocols/silc/silc.c:1678
+"kick &lt;kanaal&gt; &lt;bynaam&gt; [opmerking]:  Skop kliënt van kanaal"
+
+#: ../libpurple/protocols/silc/silc.c:1740
+#: ../libpurple/protocols/silc10/silc.c:1669
 msgid "info [server]:  View server administrative details"
-msgstr ""
-
-#: ../libpurple/protocols/silc/silc.c:1682
+msgstr "info [bediener]:  Bekyk bedieneradministrasiedetail"
+
+#: ../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 ""
-
-#: ../libpurple/protocols/silc/silc.c:1686
+msgstr "ban [&lt;kanaal&gt; +|-&lt;bynaam&gt;]:  Verban kliënt van kanaal"
+
+#: ../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 ""
-
-#: ../libpurple/protocols/silc/silc.c:1690
+"getkey &lt;bynaam|bediener&gt;:  Haal kliënt of bediener se publieke sleutel"
+
+#: ../libpurple/protocols/silc/silc.c:1752
+#: ../libpurple/protocols/silc10/silc.c:1681
 msgid "stats:  View server and network statistics"
-msgstr ""
-
-#: ../libpurple/protocols/silc/silc.c:1694
+msgstr "stats:  Bekyk bediener- en netwerkstatistiek"
+
+#: ../libpurple/protocols/silc/silc.c:1756
+#: ../libpurple/protocols/silc10/silc.c:1685
 msgid "ping:  Send PING to the connected server"
-msgstr ""
-
-#: ../libpurple/protocols/silc/silc.c:1699
+msgstr "ping:  Stuur PIENG aan die verbinde bediener"
+
+#: ../libpurple/protocols/silc/silc.c:1761
+#: ../libpurple/protocols/silc10/silc.c:1690
 msgid "users &lt;channel&gt;:  List users in channel"
-msgstr ""
-
-#: ../libpurple/protocols/silc/silc.c:1703
+msgstr "users &lt;kanaal&gt;:  Lys gebruikers in kanaal"
+
+#: ../libpurple/protocols/silc/silc.c:1765
+#: ../libpurple/protocols/silc10/silc.c:1694
 msgid ""
 "names [-count|-ops|-halfops|-voices|-normal] &lt;channel(s)&gt;:  List "
 "specific users in channel(s)"
 msgstr ""
+"names [-count|-ops|-halfops|-voices|-normal] &lt;kanaal(e)&gt;:  Lys "
+"spesifieke gebruikers in kanaal(e)"
 
 #. *< type
 #. *< ui_requirement
@@ -9664,199 +10585,299 @@
 #. *< name
 #. *< version
 #. *  summary
-#: ../libpurple/protocols/silc/silc.c:1814
+#: ../libpurple/protocols/silc/silc.c:1876
+#: ../libpurple/protocols/silc10/silc.c:1819
 msgid "SILC Protocol Plugin"
 msgstr "SILC-protokolinprop"
 
 #. *  description
-#: ../libpurple/protocols/silc/silc.c:1816
+#: ../libpurple/protocols/silc/silc.c:1878
+#: ../libpurple/protocols/silc10/silc.c:1821
 msgid "Secure Internet Live Conferencing (SILC) Protocol"
-msgstr ""
-
-#: ../libpurple/protocols/silc/silc.c:1842 ../pidgin/gtkprefs.c:1918
+msgstr "Beveiligde regstreekse internetkonferensie- (SILC) protokol"
+
+#: ../libpurple/protocols/silc/silc.c:1910
+#: ../libpurple/protocols/silc10/silc.c:1853 ../pidgin/gtkprefs.c:2031
 msgid "Network"
 msgstr "Netwerk"
 
-#: ../libpurple/protocols/silc/silc.c:1853
+#: ../libpurple/protocols/silc/silc.c:1921
+#: ../libpurple/protocols/silc10/silc.c:1864
 msgid "Public Key file"
 msgstr "Publiekesleutellêer"
 
-#: ../libpurple/protocols/silc/silc.c:1857
+#: ../libpurple/protocols/silc/silc.c:1925
+#: ../libpurple/protocols/silc10/silc.c:1868
 msgid "Private Key file"
-msgstr "Privatesleutellêer"
-
-#: ../libpurple/protocols/silc/silc.c:1867
+msgstr "Privatesleutel-lêer"
+
+#: ../libpurple/protocols/silc/silc.c:1935
+#: ../libpurple/protocols/silc10/silc.c:1878
 msgid "Cipher"
-msgstr ""
-
-#: ../libpurple/protocols/silc/silc.c:1877
+msgstr "Syfer"
+
+#: ../libpurple/protocols/silc/silc.c:1945
+#: ../libpurple/protocols/silc10/silc.c:1888
 msgid "HMAC"
-msgstr ""
-
-#: ../libpurple/protocols/silc/silc.c:1880
+msgstr "HMAC"
+
+#: ../libpurple/protocols/silc/silc.c:1948
+msgid "Use Perfect Forward Secrecy"
+msgstr "Gebruik perfekte vooruitgeheimhouding"
+
+#: ../libpurple/protocols/silc/silc.c:1952
+#: ../libpurple/protocols/silc10/silc.c:1891
 msgid "Public key authentication"
-msgstr ""
-
-#: ../libpurple/protocols/silc/silc.c:1883
-msgid "Reject watching by other users"
-msgstr ""
-
-#: ../libpurple/protocols/silc/silc.c:1886
-msgid "Block invites"
-msgstr ""
-
-#: ../libpurple/protocols/silc/silc.c:1889
+msgstr "Publiekesleutel-stawing"
+
+#: ../libpurple/protocols/silc/silc.c:1955
+#: ../libpurple/protocols/silc10/silc.c:1894
 msgid "Block IMs without Key Exchange"
-msgstr ""
-
-#: ../libpurple/protocols/silc/silc.c:1892
-msgid "Reject online status attribute requests"
-msgstr ""
-
-#: ../libpurple/protocols/silc/silc.c:1895
+msgstr "Blokkeer kitsboodskappe sonder sleutelruiling"
+
+#: ../libpurple/protocols/silc/silc.c:1958
+#: ../libpurple/protocols/silc10/silc.c:1897
 msgid "Block messages to whiteboard"
-msgstr ""
-
-#: ../libpurple/protocols/silc/silc.c:1898
+msgstr "Blokkeer boodskappe aan witbord"
+
+#: ../libpurple/protocols/silc/silc.c:1961
+#: ../libpurple/protocols/silc10/silc.c:1900
 msgid "Automatically open whiteboard"
-msgstr ""
-
-#: ../libpurple/protocols/silc/silc.c:1901
+msgstr "Open witbord outomaties"
+
+#: ../libpurple/protocols/silc/silc.c:1964
+#: ../libpurple/protocols/silc10/silc.c:1903
 msgid "Digitally sign and verify all messages"
-msgstr ""
+msgstr "Onder digitaal en verifieer alle boodskappe"
 
 #: ../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 ""
+msgstr "Skep tans SILC-sleutelpaar..."
+
+#: ../libpurple/protocols/silc/util.c:215
+#: ../libpurple/protocols/silc/util.c:257
+msgid "Cannot create SILC key pair\n"
+msgstr "Kan nie SILC-sleutelpaar skep nie\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 ""
-
-#: ../libpurple/protocols/silc/util.c:357
+msgstr "Regte naam: \t%s\n"
+
+#: ../libpurple/protocols/silc/util.c:360
+#: ../libpurple/protocols/silc10/util.c:357
 #, c-format
 msgid "User Name: \t%s\n"
 msgstr "Gebruikernaam: \t%s\n"
 
-#: ../libpurple/protocols/silc/util.c:359
+#: ../libpurple/protocols/silc/util.c:362
+#: ../libpurple/protocols/silc10/util.c:359
 #, c-format
 msgid "E-Mail: \t\t%s\n"
 msgstr "E-pos: \t\t%s\n"
 
-#: ../libpurple/protocols/silc/util.c:361
+#: ../libpurple/protocols/silc/util.c:364
+#: ../libpurple/protocols/silc10/util.c:361
 #, c-format
 msgid "Host Name: \t%s\n"
 msgstr "Gasheernaam: \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 "Organisasie: \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 "Land: \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 "Algoritme: \t%s\n"
 
-#: ../libpurple/protocols/silc/util.c:367
+#: ../libpurple/protocols/silc/util.c:370
+#: ../libpurple/protocols/silc10/util.c:367
 #, c-format
 msgid "Key Length: \t%d bits\n"
-msgstr ""
-
-#: ../libpurple/protocols/silc/util.c:369
+msgstr "Sleutellengte: \t%d bisse\n"
+
+#: ../libpurple/protocols/silc/util.c:372
+#, c-format
+msgid "Version: \t%s\n"
+msgstr "Weergawe: \t%s\n"
+
+#: ../libpurple/protocols/silc/util.c:374
+#: ../libpurple/protocols/silc10/util.c:369
 #, c-format
 msgid ""
 "Public Key Fingerprint:\n"
 "%s\n"
 "\n"
 msgstr ""
-
-#: ../libpurple/protocols/silc/util.c:370
+"Publiekesleutel-vingerafdruk\n"
+"%s\n"
+"\n"
+
+#: ../libpurple/protocols/silc/util.c:375
+#: ../libpurple/protocols/silc10/util.c:370
 #, c-format
 msgid ""
 "Public Key Babbleprint:\n"
 "%s"
 msgstr ""
-
-#: ../libpurple/protocols/silc/util.c:374
-#: ../libpurple/protocols/silc/util.c:375
+"Publiekesleutel-babbelafdruk\n"
+"%s"
+
+#: ../libpurple/protocols/silc/util.c:379
+#: ../libpurple/protocols/silc/util.c:380
+#: ../libpurple/protocols/silc10/util.c:374
+#: ../libpurple/protocols/silc10/util.c:375
 msgid "Public Key Information"
 msgstr "Publiekesleutelinligting"
 
-#: ../libpurple/protocols/silc/util.c:555
+#: ../libpurple/protocols/silc/util.c:559
+#: ../libpurple/protocols/silc10/util.c:555
 msgid "Paging"
-msgstr ""
-
-#: ../libpurple/protocols/silc/util.c:561
+msgstr "Roeping"
+
+#: ../libpurple/protocols/silc/util.c:565
+#: ../libpurple/protocols/silc10/util.c:561
 msgid "Video Conferencing"
 msgstr "Videokonferensie"
 
-#: ../libpurple/protocols/silc/util.c:579
+#: ../libpurple/protocols/silc/util.c:583
+#: ../libpurple/protocols/silc10/util.c:579
 msgid "Computer"
 msgstr "Rekenaar"
 
-#: ../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 "Terminaal"
 
-#: ../libpurple/protocols/silc/wb.c:284
+#: ../libpurple/protocols/silc/wb.c:284 ../libpurple/protocols/silc10/wb.c:284
 #, c-format
 msgid "%s sent message to whiteboard. Would you like to open the whiteboard?"
-msgstr ""
-
-#: ../libpurple/protocols/silc/wb.c:288
+msgstr "%s het boodskap na witbord gestuur. Wil u die witbord open?"
+
+#: ../libpurple/protocols/silc/wb.c:288 ../libpurple/protocols/silc10/wb.c:288
 #, c-format
 msgid ""
 "%s sent message to whiteboard on %s channel. Would you like to open the "
 "whiteboard?"
 msgstr ""
-
-#: ../libpurple/protocols/silc/wb.c:302
+"%s het boodskap na witbord op %s kanaal gestuur. Wil u die witbord open?"
+
+#: ../libpurple/protocols/silc/wb.c:302 ../libpurple/protocols/silc10/wb.c:302
 msgid "Whiteboard"
 msgstr "Witbord"
 
+#: ../libpurple/protocols/silc10/ops.c:1559
+msgid "No server statistics available"
+msgstr "Geen bedienerstatistiek beskikbaar nie"
+
+#: ../libpurple/protocols/silc10/ops.c:1931
+msgid "Failure: Version mismatch, upgrade your client"
+msgstr "Mislukking: Weergawe pas nie, opgradeer u kliënt"
+
+#: ../libpurple/protocols/silc10/ops.c:1934
+msgid "Failure: Remote does not trust/support your public key"
+msgstr "Mislukking: Afgeleë vertrou/ondersteun nie u publieke sleutel nie"
+
+#: ../libpurple/protocols/silc10/ops.c:1937
+msgid "Failure: Remote does not support proposed KE group"
+msgstr "Mislukking: Afgeleë ondersteun nie voorgestelde KE-groep nie"
+
+#: ../libpurple/protocols/silc10/ops.c:1940
+msgid "Failure: Remote does not support proposed cipher"
+msgstr "Mislukking: Afgeleë ondersteun nie voorgestelde syfer nie"
+
+#: ../libpurple/protocols/silc10/ops.c:1943
+msgid "Failure: Remote does not support proposed PKCS"
+msgstr "Mislukking: Afgeleë ondersteun nie voorgestelde PKCS nie"
+
+#: ../libpurple/protocols/silc10/ops.c:1946
+msgid "Failure: Remote does not support proposed hash function"
+msgstr "Mislukking: Afgeleë ondersteun nie voorgestelde hutsfunksie nie"
+
+#: ../libpurple/protocols/silc10/ops.c:1949
+msgid "Failure: Remote does not support proposed HMAC"
+msgstr "Mislukking: Afgeleë ondersteun nie voorgestelde HMAC nie"
+
+#: ../libpurple/protocols/silc10/ops.c:1951
+msgid "Failure: Incorrect signature"
+msgstr "Mislukking: Verkeerde handtekening"
+
+#: ../libpurple/protocols/silc10/ops.c:1953
+msgid "Failure: Invalid cookie"
+msgstr "Mislukking: Ongeldige koekie"
+
+#: ../libpurple/protocols/silc10/ops.c:1964
+msgid "Failure: Authentication failed"
+msgstr "Mislukking: Stawing het misluk"
+
+#: ../libpurple/protocols/silc10/silc.c:182
+msgid "Cannot initialize SILC Client connection"
+msgstr "Kon nie SILC-kliëntverbinding inisialiseer nie"
+
+#: ../libpurple/protocols/silc10/silc.c:290
+msgid "John Noname"
+msgstr "Naamloos Niemand"
+
+#: ../libpurple/protocols/silc10/silc.c:320
+msgid "Cannot find/access ~/.silc directory"
+msgstr "Kan nie ~/.silc-gids vind of daartoe toegang verkry nie"
+
+#: ../libpurple/protocols/silc10/silc.c:334
+#, c-format
+msgid "Could not load SILC key pair: %s"
+msgstr "Kon nie SILC-sleutelpaar laai nie: %s"
+
 #. TODO: do we really want to disconnect on a failure to write?
 #: ../libpurple/protocols/simple/simple.c:416
 msgid "Could not write"
 msgstr "Kon nie skryf nie"
 
 #: ../libpurple/protocols/simple/simple.c:438
-#: ../libpurple/protocols/simple/simple.c:1482
+#: ../libpurple/protocols/simple/simple.c:1489
 msgid "Could not connect"
 msgstr "Kon nie verbind nie"
 
-#: ../libpurple/protocols/simple/simple.c:1516
-#: ../libpurple/protocols/simple/simple.c:1558
-#: ../libpurple/protocols/simple/simple.c:1571
-#: ../libpurple/protocols/simple/simple.c:1622
+#: ../libpurple/protocols/simple/simple.c:1523
+#: ../libpurple/protocols/simple/simple.c:1565
+#: ../libpurple/protocols/simple/simple.c:1578
+#: ../libpurple/protocols/simple/simple.c:1629
 msgid "Could not create listen socket"
-msgstr ""
-
-#: ../libpurple/protocols/simple/simple.c:1539
+msgstr "Kon nie luistersok skep nie"
+
+#: ../libpurple/protocols/simple/simple.c:1546
 msgid "Couldn't resolve host"
-msgstr ""
-
-#: ../libpurple/protocols/simple/simple.c:1630
+msgstr "Kon nie gasheer oplos nie"
+
+#: ../libpurple/protocols/simple/simple.c:1637
 msgid "Could not resolve hostname"
-msgstr ""
-
-#: ../libpurple/protocols/simple/simple.c:1647
+msgstr "Kon nie gasheernaam oplos nie"
+
+#: ../libpurple/protocols/simple/simple.c:1654
 msgid "SIP screen names may not contain whitespaces or @ symbols"
-msgstr ""
+msgstr "SIP-skermname mag nie spasies of @-simbole bevat nie"
 
 #. *< type
 #. *< ui_requirement
@@ -9866,43 +10887,43 @@
 #. *< id
 #. *< name
 #. *< version
-#: ../libpurple/protocols/simple/simple.c:1816
+#: ../libpurple/protocols/simple/simple.c:1829
 msgid "SIP/SIMPLE Protocol Plugin"
-msgstr ""
+msgstr "SIP/SIMPLE-protokolinprop"
 
 #. *  summary
-#: ../libpurple/protocols/simple/simple.c:1817
+#: ../libpurple/protocols/simple/simple.c:1830
 msgid "The SIP/SIMPLE Protocol Plugin"
-msgstr ""
-
-#: ../libpurple/protocols/simple/simple.c:1839
+msgstr "Die SIP/SIMPLE-protokolinprop"
+
+#: ../libpurple/protocols/simple/simple.c:1858
 msgid "Publish status (note: everyone may watch you)"
-msgstr ""
-
-#: ../libpurple/protocols/simple/simple.c:1845
+msgstr "Publiseer status (let wel: almal kan u dophou)"
+
+#: ../libpurple/protocols/simple/simple.c:1864
 msgid "Use UDP"
 msgstr "Gebruik UDP"
 
-#: ../libpurple/protocols/simple/simple.c:1847
+#: ../libpurple/protocols/simple/simple.c:1866
 msgid "Use proxy"
 msgstr "Gebruik instaanbediener"
 
-#: ../libpurple/protocols/simple/simple.c:1849
+#: ../libpurple/protocols/simple/simple.c:1868
 msgid "Proxy"
 msgstr "Instaanbediener"
 
-#: ../libpurple/protocols/simple/simple.c:1851
+#: ../libpurple/protocols/simple/simple.c:1870
 msgid "Auth User"
-msgstr ""
-
-#: ../libpurple/protocols/simple/simple.c:1853
+msgstr "Magtig gebruiker"
+
+#: ../libpurple/protocols/simple/simple.c:1872
 msgid "Auth Domain"
-msgstr ""
+msgstr "Magtig domein"
 
 #: ../libpurple/protocols/toc/toc.c:139
 #, c-format
 msgid "Looking up %s"
-msgstr ""
+msgstr "Soek tans %s op"
 
 #: ../libpurple/protocols/toc/toc.c:148
 #, c-format
@@ -9937,7 +10958,7 @@
 #: ../libpurple/protocols/toc/toc.c:500
 #, c-format
 msgid "Warning of %s not allowed."
-msgstr ""
+msgstr "Waarskuwing indien %s nie toegelaat nie."
 
 #: ../libpurple/protocols/toc/toc.c:503
 msgid "A message has been dropped, you are exceeding the server speed limit."
@@ -9973,7 +10994,7 @@
 
 #: ../libpurple/protocols/toc/toc.c:524
 msgid "Need more qualifiers."
-msgstr ""
+msgstr "Benodig méér kwalifiseerders."
 
 #: ../libpurple/protocols/toc/toc.c:527
 msgid "Dir service temporarily unavailable."
@@ -9981,7 +11002,7 @@
 
 #: ../libpurple/protocols/toc/toc.c:530
 msgid "E-mail lookup restricted."
-msgstr ""
+msgstr "E-posopsoek beperk."
 
 #: ../libpurple/protocols/toc/toc.c:533
 msgid "Keyword ignored."
@@ -10014,15 +11035,15 @@
 
 #: ../libpurple/protocols/toc/toc.c:555
 msgid "Your warning level is currently too high to log in."
-msgstr ""
+msgstr "U waarskuwingsvlak is tans te hoog om aan te meld."
 
 #: ../libpurple/protocols/toc/toc.c:558
 msgid ""
 "You have been connecting and disconnecting too frequently.  Wait ten minutes "
 "and try again.  If you continue to try, you will need to wait even longer."
 msgstr ""
-"U het nou te gereeld gekoppel en ontkoppel.  Wag tien minute en probeer "
-"weer.  Indien u voortgaan om te probeer sal u selfs nog langer moet wag."
+"U het nou te gereeld verbind en afgesny.  Wag tien minute en probeer weer.  "
+"Indien u voortgaan om te probeer sal u selfs nog langer moet wag."
 
 #: ../libpurple/protocols/toc/toc.c:560
 #, c-format
@@ -10032,7 +11053,7 @@
 #: ../libpurple/protocols/toc/toc.c:563
 #, c-format
 msgid "An unknown error, %d, has occurred.  Info: %s"
-msgstr ""
+msgstr "'n Onbekende fout, %d, het voorgekom.  Inligting: %s"
 
 #: ../libpurple/protocols/toc/toc.c:590
 msgid "Invalid Groupname"
@@ -10048,13 +11069,14 @@
 
 #: ../libpurple/protocols/toc/toc.c:792
 msgid "TOC has come back from its pause. You may now send messages again."
-msgstr ""
+msgstr "TOC is terug ná sy blaaskans. U kan u weer boodskappe stuur."
 
 #: ../libpurple/protocols/toc/toc.c:995
 msgid "Password Change Successful"
 msgstr "Wagwoord suksesvol verander"
 
-#: ../libpurple/protocols/toc/toc.c:1366
+#: ../libpurple/protocols/toc/toc.c:1366 ../pidgin/gtkblist.c:5530
+#: ../pidgin/gtkblist.c:5883
 msgid "_Group:"
 msgstr "_Groep:"
 
@@ -10069,7 +11091,7 @@
 #: ../libpurple/protocols/toc/toc.c:1797
 #, c-format
 msgid "Could not open %s for writing!"
-msgstr ""
+msgstr "Kon nie %s vir skryf open nie!"
 
 #: ../libpurple/protocols/toc/toc.c:1833
 msgid "File transfer failed; other side probably canceled."
@@ -10078,11 +11100,11 @@
 #: ../libpurple/protocols/toc/toc.c:1878 ../libpurple/protocols/toc/toc.c:1918
 #: ../libpurple/protocols/toc/toc.c:2042 ../libpurple/protocols/toc/toc.c:2130
 msgid "Could not connect for transfer."
-msgstr ""
+msgstr "Kon nie vir oordrag verbind nie."
 
 #: ../libpurple/protocols/toc/toc.c:2075
 msgid "Could not write file header.  The file will not be transferred."
-msgstr ""
+msgstr "Kon nie lêerkop skryf nie.  Die lêer sal nie oorgedra word nie."
 
 #: ../libpurple/protocols/toc/toc.c:2175
 msgid "Save As..."
@@ -10092,8 +11114,8 @@
 #, c-format
 msgid "%s requests %s to accept %d file: %s (%.2f %s)%s%s"
 msgid_plural "%s requests %s to accept %d files: %s (%.2f %s)%s%s"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%s versoek dat %s %d lêer aanvaar: %s (%.2f %s)%s%s"
+msgstr[1] "%s versoek dat %s %d lêers aanvaar: %s (%.2f %s)%s%s"
 
 #: ../libpurple/protocols/toc/toc.c:2216
 #, c-format
@@ -10114,204 +11136,236 @@
 msgid "TOC Protocol Plugin"
 msgstr "TOC-protokolinprop"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:805
+#: ../libpurple/protocols/yahoo/yahoo.c:823
 msgid "Your Yahoo! message did not get sent."
 msgstr "U Yahoo!-boodskap is nie gestuur nie."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:875
-#, fuzzy, c-format
+#: ../libpurple/protocols/yahoo/yahoo.c:895
+#, c-format
 msgid "%s just sent you a Buzz!"
-msgstr "%s wil aan u 'n lêer stuur"
-
-#: ../libpurple/protocols/yahoo/yahoo.c:925
+msgstr "%s het u so pas 'n zoempie gestuur!"
+
+#: ../libpurple/protocols/yahoo/yahoo.c:942
 #, c-format
 msgid "Yahoo! system message for %s:"
-msgstr ""
-
-#: ../libpurple/protocols/yahoo/yahoo.c:985
+msgstr "Yahoo!-stelselboodskap vir %s:"
+
+#: ../libpurple/protocols/yahoo/yahoo.c:1003
 msgid "Authorization denied message:"
 msgstr "Magtiging gewyer-boodskap:"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1064
+#: ../libpurple/protocols/yahoo/yahoo.c:1084
 #, c-format
 msgid "%s has (retroactively) denied your request to add them to your list."
-msgstr ""
-
-#: ../libpurple/protocols/yahoo/yahoo.c:1067
+msgstr "%s het (retroaktief) u versoek om hulle by u lys te voeg, geweier."
+
+#: ../libpurple/protocols/yahoo/yahoo.c:1087
 #, c-format
 msgid ""
 "%s has (retroactively) denied your request to add them to your list for the "
 "following reason: %s."
 msgstr ""
-
-#: ../libpurple/protocols/yahoo/yahoo.c:1070
+"%s het (retroaktief) u versoek om hulle by u vriendelys te voeg, geweier, "
+"vir die volgende rede: %s."
+
+#: ../libpurple/protocols/yahoo/yahoo.c:1090
 msgid "Add buddy rejected"
-msgstr ""
-
-#: ../libpurple/protocols/yahoo/yahoo.c:1821
+msgstr "Vriend byvoeg geweier"
+
+#: ../libpurple/protocols/yahoo/yahoo.c:1841
 #, c-format
 msgid ""
 "The Yahoo server has requested the use of an unrecognized authentication "
 "method.  You will probably not be able to successfully sign on to Yahoo.  "
 "Check %s for updates."
 msgstr ""
-
-#: ../libpurple/protocols/yahoo/yahoo.c:1824
+"Die Yahoo-bediener het die gebruik van 'n nie-erkende stawingsmetode "
+"versoek.  U sal waarskynlik nie suksesvol by Yahoo kan inteken nie.  "
+"Kontroleer %s vir bywerkings."
+
+#: ../libpurple/protocols/yahoo/yahoo.c:1844
 msgid "Failed Yahoo! Authentication"
-msgstr ""
-
-#: ../libpurple/protocols/yahoo/yahoo.c:1890
+msgstr "Yahoo!-stawing het misluk"
+
+#: ../libpurple/protocols/yahoo/yahoo.c:1910
 #, c-format
 msgid ""
 "You have tried to ignore %s, but the user is on your buddy list.  Clicking "
 "\"Yes\" will remove and ignore the buddy."
 msgstr ""
-
-#: ../libpurple/protocols/yahoo/yahoo.c:1893
+"U het probeer om %s te ignoreer, maar die gebruiker is op u vriendelys.  "
+"Kliek \"Ja\" om die vriend te verwyder en te ignoreer."
+
+#: ../libpurple/protocols/yahoo/yahoo.c:1913
 msgid "Ignore buddy?"
 msgstr "Ignoreer vriend?"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1950
+#: ../libpurple/protocols/yahoo/yahoo.c:1976
 msgid "Your account is locked, please log in to the Yahoo! website."
-msgstr ""
-
-#: ../libpurple/protocols/yahoo/yahoo.c:1953
+msgstr "U rekening is gesluit; meld asb. by die Yahoo!-webwerf aan."
+
+#: ../libpurple/protocols/yahoo/yahoo.c:1979
 #, c-format
 msgid "Unknown error number %d. Logging into the Yahoo! website may fix this."
 msgstr ""
-
-#: ../libpurple/protocols/yahoo/yahoo.c:2007
+"Onbekende fout nommer %d. As u by die Yahoo!-webwerf aanmeld, kan dit dalk "
+"opgelos word."
+
+#: ../libpurple/protocols/yahoo/yahoo.c:2033
 #, c-format
 msgid "Could not add buddy %s to group %s to the server list on account %s."
 msgstr ""
-
-#: ../libpurple/protocols/yahoo/yahoo.c:2010
+"Kon nie vriend %s by groep %s op die bedienerlys op rekening %s voeg nie."
+
+#: ../libpurple/protocols/yahoo/yahoo.c:2036
 msgid "Could not add buddy to server list"
-msgstr ""
-
-#: ../libpurple/protocols/yahoo/yahoo.c:2129
+msgstr "Kon nie vriend by bedienerlys voeg nie"
+
+#: ../libpurple/protocols/yahoo/yahoo.c:2155
 #, c-format
 msgid "[ Audible %s/%s/%s.swf ] %s"
-msgstr ""
-
-#: ../libpurple/protocols/yahoo/yahoo.c:2461
+msgstr "[ Hoorbaar %s/%s/%s.swf ] %s"
+
+#: ../libpurple/protocols/yahoo/yahoo.c:2495
 msgid "Received unexpected HTTP response from server."
-msgstr ""
-
-#: ../libpurple/protocols/yahoo/yahoo.c:2485
-#: ../libpurple/protocols/yahoo/yahoo.c:2664
-#: ../libpurple/protocols/yahoo/yahoo.c:2768
-#: ../libpurple/protocols/yahoo/yahoo.c:2778
-#: ../libpurple/protocols/yahoo/yahoochat.c:1455
-#: ../libpurple/protocols/yahoo/yahoochat.c:1525
+msgstr "Onverwagte HTTP-antwoord van die bediener ontvang."
+
+#: ../libpurple/protocols/yahoo/yahoo.c:2519
+#: ../libpurple/protocols/yahoo/yahoo.c:2705
+#: ../libpurple/protocols/yahoo/yahoo.c:2808
+#: ../libpurple/protocols/yahoo/yahoo.c:2818
+#: ../libpurple/protocols/yahoo/yahoochat.c:1418
+#: ../libpurple/protocols/yahoo/yahoochat.c:1488
 #: ../libpurple/protocols/yahoo/ycht.c:585
 msgid "Connection problem"
 msgstr "Verbindingprobleem"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2880
-#: ../libpurple/protocols/yahoo/yahoo.c:3486
+#: ../libpurple/protocols/yahoo/yahoo.c:2545
+#, c-format
+msgid ""
+"Lost connection with %s:\n"
+"%s"
+msgstr ""
+"Verbinding met %s verloor:\n"
+"%s"
+
+#: ../libpurple/protocols/yahoo/yahoo.c:2570
+#, c-format
+msgid ""
+"Could not establish a connection with %s:\n"
+"%s"
+msgstr ""
+"Kon nie 'n verbinding met %s bewerkstellig nie:\n"
+"%s"
+
+#: ../libpurple/protocols/yahoo/yahoo.c:2920
+#: ../libpurple/protocols/yahoo/yahoo.c:3606
 msgid "Not at Home"
 msgstr "Nie tuis nie"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2882
-#: ../libpurple/protocols/yahoo/yahoo.c:3489
+#: ../libpurple/protocols/yahoo/yahoo.c:2922
+#: ../libpurple/protocols/yahoo/yahoo.c:3609
 msgid "Not at Desk"
 msgstr "Nie by die lessenaar nie"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2884
-#: ../libpurple/protocols/yahoo/yahoo.c:3492
+#: ../libpurple/protocols/yahoo/yahoo.c:2924
+#: ../libpurple/protocols/yahoo/yahoo.c:3612
 msgid "Not in Office"
 msgstr "Nie op kantoor nie"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2888
-#: ../libpurple/protocols/yahoo/yahoo.c:3498
+#: ../libpurple/protocols/yahoo/yahoo.c:2928
+#: ../libpurple/protocols/yahoo/yahoo.c:3618
 msgid "On Vacation"
 msgstr "Op vakansie"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2892
-#: ../libpurple/protocols/yahoo/yahoo.c:3504
+#: ../libpurple/protocols/yahoo/yahoo.c:2932
+#: ../libpurple/protocols/yahoo/yahoo.c:3624
 msgid "Stepped Out"
 msgstr "Uit"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2985
-#: ../libpurple/protocols/yahoo/yahoo.c:3015
+#: ../libpurple/protocols/yahoo/yahoo.c:3025
+#: ../libpurple/protocols/yahoo/yahoo.c:3055
 msgid "Not on server list"
 msgstr "Nie op bedienerlys nie"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3032
-#: ../libpurple/protocols/yahoo/yahoo.c:3090
+#: ../libpurple/protocols/yahoo/yahoo.c:3072
+#: ../libpurple/protocols/yahoo/yahoo.c:3130
 msgid "Appear Online"
-msgstr ""
-
-#: ../libpurple/protocols/yahoo/yahoo.c:3035
-#: ../libpurple/protocols/yahoo/yahoo.c:3111
+msgstr "Lyk of aanlyn is"
+
+#: ../libpurple/protocols/yahoo/yahoo.c:3075
+#: ../libpurple/protocols/yahoo/yahoo.c:3151
 msgid "Appear Permanently Offline"
-msgstr ""
-
-#: ../libpurple/protocols/yahoo/yahoo.c:3053
+msgstr "Lyk of permanent aflyn is"
+
+#: ../libpurple/protocols/yahoo/yahoo.c:3093
 msgid "Presence"
-msgstr ""
-
-#: ../libpurple/protocols/yahoo/yahoo.c:3096
+msgstr "Teenwoordigheid"
+
+#: ../libpurple/protocols/yahoo/yahoo.c:3136
 msgid "Appear Offline"
-msgstr ""
-
-#: ../libpurple/protocols/yahoo/yahoo.c:3105
+msgstr "Lyk of aflyn is"
+
+#: ../libpurple/protocols/yahoo/yahoo.c:3145
 msgid "Don't Appear Permanently Offline"
-msgstr ""
-
-#: ../libpurple/protocols/yahoo/yahoo.c:3153
-#, fuzzy
-msgid "Join in Chat"
-msgstr "Sluit by gesprek aan"
-
-#: ../libpurple/protocols/yahoo/yahoo.c:3159
-msgid "Initiate Conference"
-msgstr ""
-
-#: ../libpurple/protocols/yahoo/yahoo.c:3187
-msgid "Presence Settings"
-msgstr ""
+msgstr "Moenie lyk of permanent aflyn is nie"
 
 #: ../libpurple/protocols/yahoo/yahoo.c:3193
+msgid "Join in Chat"
+msgstr "Sluit by geselsie aan"
+
+#: ../libpurple/protocols/yahoo/yahoo.c:3199
+msgid "Initiate Conference"
+msgstr "Inisieer konferensie"
+
+#: ../libpurple/protocols/yahoo/yahoo.c:3227
+msgid "Presence Settings"
+msgstr "Teenwoordigheid-stellings"
+
+#: ../libpurple/protocols/yahoo/yahoo.c:3233
 msgid "Start Doodling"
-msgstr ""
-
-#: ../libpurple/protocols/yahoo/yahoo.c:3225
-msgid "Active which ID?"
+msgstr "Begin krabbel"
+
+#: ../libpurple/protocols/yahoo/yahoo.c:3334
+msgid "Activate which ID?"
 msgstr "Aktiveer watter ID?"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3234
+#: ../libpurple/protocols/yahoo/yahoo.c:3345
 msgid "Join who in chat?"
-msgstr ""
-
-#: ../libpurple/protocols/yahoo/yahoo.c:3244
+msgstr "Sluit wie by geselsie aan?"
+
+#: ../libpurple/protocols/yahoo/yahoo.c:3357
 msgid "Activate ID..."
 msgstr "Aktiveer ID..."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3248
+#: ../libpurple/protocols/yahoo/yahoo.c:3361
 msgid "Join User in Chat..."
-msgstr ""
-
-#: ../libpurple/protocols/yahoo/yahoo.c:3755
+msgstr "Sluit gebruiker by geselsie aan..."
+
+#: ../libpurple/protocols/yahoo/yahoo.c:3366
+msgid "Open Inbox"
+msgstr "Open inkassie"
+
+#: ../libpurple/protocols/yahoo/yahoo.c:3881
 msgid "You have just sent a Buzz!"
-msgstr ""
-
-#: ../libpurple/protocols/yahoo/yahoo.c:3814
+msgstr "U het so pas 'n zoempie gestuur!"
+
+#: ../libpurple/protocols/yahoo/yahoo.c:3940
 msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
 msgstr ""
-
-#: ../libpurple/protocols/yahoo/yahoo.c:3819
+"join &lt;kamer&gt;:  Sluit by 'n geselsiekamers op die Yahoo-netwerk aan"
+
+#: ../libpurple/protocols/yahoo/yahoo.c:3945
 msgid "list: List rooms on the Yahoo network"
-msgstr ""
-
-#: ../libpurple/protocols/yahoo/yahoo.c:3823
+msgstr "list: Lys kamers op die Yahoo-netwerk"
+
+#: ../libpurple/protocols/yahoo/yahoo.c:3949
 msgid "buzz: Buzz a user to get their attention"
-msgstr ""
-
-#: ../libpurple/protocols/yahoo/yahoo.c:3827
+msgstr "buzz: Stuur 'n gebruiker 'n zoempie om sy aandag te trek"
+
+#: ../libpurple/protocols/yahoo/yahoo.c:3953
 msgid "doodle: Request user to start a Doodle session"
-msgstr ""
+msgstr "doodle: Versoek gebruiker om 'n krabbelsessie te begin"
 
 #. *< type
 #. *< ui_requirement
@@ -10323,125 +11377,129 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/yahoo/yahoo.c:4023
-#: ../libpurple/protocols/yahoo/yahoo.c:4025
+#: ../libpurple/protocols/yahoo/yahoo.c:4161
+#: ../libpurple/protocols/yahoo/yahoo.c:4163
 msgid "Yahoo Protocol Plugin"
 msgstr "Inprop vir die Yahoo-protokol"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4042
+#: ../libpurple/protocols/yahoo/yahoo.c:4186
 msgid "Yahoo Japan"
 msgstr "Yahoo Japan"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4045
+#: ../libpurple/protocols/yahoo/yahoo.c:4189
 msgid "Pager server"
-msgstr ""
-
-#: ../libpurple/protocols/yahoo/yahoo.c:4048
+msgstr "Roeper-bediener"
+
+#: ../libpurple/protocols/yahoo/yahoo.c:4192
 msgid "Japan Pager server"
-msgstr ""
-
-#: ../libpurple/protocols/yahoo/yahoo.c:4051
+msgstr "Japannese roeper-bediener"
+
+#: ../libpurple/protocols/yahoo/yahoo.c:4195
 msgid "Pager port"
-msgstr ""
-
-#: ../libpurple/protocols/yahoo/yahoo.c:4054
+msgstr "Roeper-poort"
+
+#: ../libpurple/protocols/yahoo/yahoo.c:4198
 msgid "File transfer server"
 msgstr "Lêeroordragbediener"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4057
+#: ../libpurple/protocols/yahoo/yahoo.c:4201
 msgid "Japan file transfer server"
-msgstr ""
-
-#: ../libpurple/protocols/yahoo/yahoo.c:4060
+msgstr "Japannese lêeroordragbediener"
+
+#: ../libpurple/protocols/yahoo/yahoo.c:4204
 msgid "File transfer port"
 msgstr "Lêeroordragpoort"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4063
+#: ../libpurple/protocols/yahoo/yahoo.c:4207
 msgid "Chat room locale"
-msgstr ""
-
-#: ../libpurple/protocols/yahoo/yahoo.c:4066
+msgstr "Geselsiekamer-lokaliteit"
+
+#: ../libpurple/protocols/yahoo/yahoo.c:4210
 msgid "Ignore conference and chatroom invitations"
-msgstr ""
-
-#: ../libpurple/protocols/yahoo/yahoo.c:4074
+msgstr "Ignoreer konferensie- en geselsiekamer-uitnodigings"
+
+#: ../libpurple/protocols/yahoo/yahoo.c:4218
 msgid "Chat room list URL"
-msgstr ""
-
-#: ../libpurple/protocols/yahoo/yahoo.c:4077
+msgstr "Geselsiekamer-lys-URL"
+
+#: ../libpurple/protocols/yahoo/yahoo.c:4221
 msgid "Yahoo Chat server"
-msgstr "Yahoo-geselsbediener"
-
-#: ../libpurple/protocols/yahoo/yahoo.c:4080
+msgstr "Yahoo-geselsiebediener"
+
+#: ../libpurple/protocols/yahoo/yahoo.c:4224
 msgid "Yahoo Chat port"
-msgstr "Yahoo-geselspoort"
-
-#: ../libpurple/protocols/yahoo/yahoochat.c:203
+msgstr "Yahoo-geselsiepoort"
+
+#: ../libpurple/protocols/yahoo/yahoochat.c:204
 #, c-format
 msgid "%s declined your conference invitation to room \"%s\" because \"%s\"."
 msgstr ""
-
-#: ../libpurple/protocols/yahoo/yahoochat.c:205
+"%s het u konferensie-uitnodiging na kamer \"%s\" van die hand gewys omdat \"%"
+"s\"."
+
+#: ../libpurple/protocols/yahoo/yahoochat.c:206
 msgid "Invitation Rejected"
-msgstr "Uitnodiging van die hand gewys"
-
-#: ../libpurple/protocols/yahoo/yahoochat.c:361
+msgstr "Uitnodiging geweier"
+
+#: ../libpurple/protocols/yahoo/yahoochat.c:362
 msgid "Failed to join chat"
 msgstr "Aansluit by geselsie het misluk"
 
 #. -6
-#: ../libpurple/protocols/yahoo/yahoochat.c:364
+#: ../libpurple/protocols/yahoo/yahoochat.c:365
 msgid "Unknown room"
 msgstr "Onbekende kamer"
 
 #. -15
-#: ../libpurple/protocols/yahoo/yahoochat.c:367
+#: ../libpurple/protocols/yahoo/yahoochat.c:368
 msgid "Maybe the room is full"
 msgstr "Miskien is die kamer vol"
 
 #. -35
-#: ../libpurple/protocols/yahoo/yahoochat.c:370
+#: ../libpurple/protocols/yahoo/yahoochat.c:371
 msgid "Not available"
 msgstr "Nie beskikbaar nie"
 
-#: ../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 ""
-
-#: ../libpurple/protocols/yahoo/yahoochat.c:452
+"Onbekende fout. U moet dalk afmeld en vyf minute wag voor u weer die "
+"geselsiekamer kan betree"
+
+#: ../libpurple/protocols/yahoo/yahoochat.c:453
 #, c-format
 msgid "You are now chatting in %s."
-msgstr ""
-
-#: ../libpurple/protocols/yahoo/yahoochat.c:627
-msgid "Failed to join buddy in chat"
-msgstr ""
+msgstr "U gesels nou in %s."
 
 #: ../libpurple/protocols/yahoo/yahoochat.c:628
+msgid "Failed to join buddy in chat"
+msgstr "Het misluk om vriend by geselsie te laat aansluit"
+
+#: ../libpurple/protocols/yahoo/yahoochat.c:629
 msgid "Maybe they're not in a chat?"
-msgstr ""
-
-#: ../libpurple/protocols/yahoo/yahoochat.c:1357
-#: ../libpurple/protocols/yahoo/yahoochat.c:1383
+msgstr "Dalk wil hulle nie gesels nie?"
+
+#: ../libpurple/protocols/yahoo/yahoochat.c:1320
+#: ../libpurple/protocols/yahoo/yahoochat.c:1346
 msgid "Fetching the room list failed."
-msgstr ""
-
-#: ../libpurple/protocols/yahoo/yahoochat.c:1441
+msgstr "Haal van kamerlys het misluk."
+
+#: ../libpurple/protocols/yahoo/yahoochat.c:1404
 msgid "Voices"
 msgstr "Stemme"
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:1444
+#: ../libpurple/protocols/yahoo/yahoochat.c:1407
 msgid "Webcams"
 msgstr "Webkameras"
 
-#: ../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 ""
-
-#: ../libpurple/protocols/yahoo/yahoochat.c:1518
+msgstr "Kon nie die kamerlys haal nie."
+
+#: ../libpurple/protocols/yahoo/yahoochat.c:1481
 msgid "User Rooms"
 msgstr "Gebruikerkamers"
 
@@ -10450,112 +11508,123 @@
 #.
 #: ../libpurple/protocols/yahoo/yahoo_doodle.c:98
 msgid "Sent Doodle request."
-msgstr ""
-
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:269
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:278
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:291
+msgstr "Krabbelversoek gestuur."
+
+#: ../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 ""
+msgstr "Kon nie lêerbeskrywer bewerkstellig nie."
 
 #. TODO: what to do here - do we really have to disconnect?
-#: ../libpurple/protocols/yahoo/yahoo_packet.c:289
+#: ../libpurple/protocols/yahoo/yahoo_packet.c:307
 msgid "Write Error"
 msgstr "Skryffout"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:773
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:797
 msgid "Yahoo! Japan Profile"
-msgstr ""
-
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:774
+msgstr "Yahoo! Japan-profiel"
+
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:798
 msgid "Yahoo! Profile"
 msgstr "Yahoo!-profiel"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:814
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:838
 msgid ""
 "Sorry, profiles marked as containing adult content are not supported at this "
 "time."
-msgstr ""
-
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:816
+msgstr "Jammer, profiele met volwassene-inhoud word nie tans ondersteun nie."
+
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:840
 msgid ""
 "If you wish to view this profile, you will need to visit this link in your "
 "web browser:"
 msgstr ""
-
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1010
+"Indien u hierdie profiel wil bekyk, moet u hierdie skakel in u webblaaier "
+"besoek:"
+
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1034
 msgid "Yahoo! ID"
 msgstr "Yahoo!-ID"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1085
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1089
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1093
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1109
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1113
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1117
 msgid "Hobbies"
 msgstr "Stokperdjies"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1103
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1107
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1127
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1131
 msgid "Latest News"
 msgstr "Jongste nuus"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1128
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1152
 msgid "Home Page"
 msgstr "Tuisblad"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1143
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1167
 msgid "Cool Link 1"
-msgstr ""
-
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1148
+msgstr "Oulike skakel 1"
+
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1172
 msgid "Cool Link 2"
-msgstr ""
-
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1152
+msgstr "Oulike skakel 2"
+
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1176
 msgid "Cool Link 3"
-msgstr ""
-
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1166
+msgstr "Oulike skakel 3"
+
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1190
 msgid "Last Update"
 msgstr "Laaste opdatering"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1175
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1199
 #, c-format
 msgid "User information for %s unavailable"
 msgstr "Gebruikerinligting vir %s nie beskikbaar nie"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1181
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1205
 msgid ""
 "Sorry, this profile seems to be in a language or format that is not "
 "supported at this time."
 msgstr ""
-
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1197
+"Jammer, dit lyk of hierdie profiel in 'n taal of formaat is wat nie tans "
+"ondersteun word nie."
+
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1221
 msgid ""
 "Could not retrieve the user's profile. This most likely is a temporary "
 "server-side problem. Please try again later."
 msgstr ""
-
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1200
+"Kon nie die gebruiker se profiel haal nie. Dit is waarskynlik 'n tydelike "
+"probleem aan bedienerkant. Probeer asb. later weer."
+
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1224
 msgid ""
 "Could not retrieve the user's profile. This most likely means that the user "
 "does not exist; however, Yahoo! sometimes does fail to find a user's "
 "profile. If you know that the user exists, please try again later."
 msgstr ""
-
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1207
+"Kon nie die gebruiker se profiel haal nie. Dit beteken waarskynlik dat die "
+"gebruiker nie bestaan nie; maar Yahoo! kry dit soms nie reg om 'n gebruiker "
+"se profiel op te spoor nie. As u weet dat die gebruiker wel bestaan, probeer "
+"asb. later weer."
+
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1231
 msgid "The user's profile is empty."
 msgstr "Die gebruiker se profiel is leeg."
 
 #: ../libpurple/protocols/yahoo/ycht.c:456
 msgid "Connection problem with the YCHT server."
-msgstr ""
+msgstr "Verbindingprobleem met die YCHT-bediener."
 
 #: ../libpurple/protocols/yahoo/ycht.c:475
 #, c-format
 msgid ""
 "Lost connection with server\n"
 "%s"
-msgstr "Verbinding met bediener verloor\n"
+msgstr ""
+"Verbinding met bediener verloor\n"
 "%s"
 
 #: ../libpurple/protocols/zephyr/zephyr.c:354
@@ -10563,108 +11632,122 @@
 "(There was an error converting this message.\t Check the 'Encoding' option "
 "in the Account Editor)"
 msgstr ""
+"(Daar was 'n fout om hierdie boodskap om te skakel.\t Kontroleer die "
+"'Enkodering'-keuse in die Rekeningredigeerder)"
 
 #: ../libpurple/protocols/zephyr/zephyr.c:752
 #, c-format
 msgid "Unable to send to chat %s,%s,%s"
-msgstr ""
+msgstr "Kan nie aan geselsie %s,%s,%s stuur nie"
 
 #: ../libpurple/protocols/zephyr/zephyr.c:786
-#: ../libpurple/protocols/zephyr/zephyr.c:1203
+#: ../libpurple/protocols/zephyr/zephyr.c:1204
 msgid "User"
 msgstr "Gebruiker"
 
 #: ../libpurple/protocols/zephyr/zephyr.c:791
-#: ../libpurple/protocols/zephyr/zephyr.c:1209
+#: ../libpurple/protocols/zephyr/zephyr.c:1210
 msgid "Hidden or not logged-in"
 msgstr "Versteek of nie aangemeld nie"
 
 #: ../libpurple/protocols/zephyr/zephyr.c:797
-#: ../libpurple/protocols/zephyr/zephyr.c:1211
+#: ../libpurple/protocols/zephyr/zephyr.c:1212
 #, c-format
 msgid "<br>At %s since %s"
-msgstr ""
-
-#: ../libpurple/protocols/zephyr/zephyr.c:1545
+msgstr "<br>Te %s sedert %s"
+
 #: ../libpurple/protocols/zephyr/zephyr.c:1546
+#: ../libpurple/protocols/zephyr/zephyr.c:1547
 msgid "Anyone"
 msgstr "Enigeen"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2353
+#: ../libpurple/protocols/zephyr/zephyr.c:2354
 msgid "_Class:"
-msgstr ""
-
-#: ../libpurple/protocols/zephyr/zephyr.c:2359
+msgstr "_Klas:"
+
+#: ../libpurple/protocols/zephyr/zephyr.c:2360
 msgid "_Instance:"
-msgstr ""
-
-#: ../libpurple/protocols/zephyr/zephyr.c:2365
+msgstr "_Geval:"
+
+#: ../libpurple/protocols/zephyr/zephyr.c:2366
 msgid "_Recipient:"
-msgstr ""
-
-#: ../libpurple/protocols/zephyr/zephyr.c:2376
+msgstr "_Ontvanger:"
+
+#: ../libpurple/protocols/zephyr/zephyr.c:2377
 #, c-format
 msgid "Attempt to subscribe to %s,%s,%s failed"
-msgstr ""
-
-#: ../libpurple/protocols/zephyr/zephyr.c:2689
+msgstr "Poging om by %s,%s,%s in te teken, het misluk"
+
+#: ../libpurple/protocols/zephyr/zephyr.c:2690
 msgid "zlocate &lt;nick&gt;: Locate user"
-msgstr ""
-
-#: ../libpurple/protocols/zephyr/zephyr.c:2694
+msgstr "zlocate &lt;bynaam&gt;: Vind gebruiker"
+
+#: ../libpurple/protocols/zephyr/zephyr.c:2695
 msgid "zl &lt;nick&gt;: Locate user"
-msgstr ""
-
-#: ../libpurple/protocols/zephyr/zephyr.c:2699
+msgstr "zl &lt;bynaam&gt;: Vind gebruiker"
+
+#: ../libpurple/protocols/zephyr/zephyr.c:2700
 msgid "instance &lt;instance&gt;: Set the instance to be used on this class"
 msgstr ""
-
-#: ../libpurple/protocols/zephyr/zephyr.c:2704
+"instance &lt;geval&gt;: Stel die geval wat gebruik moet word op hierdie klas"
+
+#: ../libpurple/protocols/zephyr/zephyr.c:2705
 msgid "inst &lt;instance&gt;: Set the instance to be used on this class"
 msgstr ""
-
-#: ../libpurple/protocols/zephyr/zephyr.c:2709
+"inst &lt;geval&gt;: Stel die geval wat gebruik moet word op hierdie klas"
+
+#: ../libpurple/protocols/zephyr/zephyr.c:2710
 msgid "topic &lt;instance&gt;: Set the instance to be used on this class"
 msgstr ""
-
-#: ../libpurple/protocols/zephyr/zephyr.c:2715
+"topic &lt;geval&gt;: Stel die geval wat gebruik moet word op hierdie klas"
+
+#: ../libpurple/protocols/zephyr/zephyr.c:2716
 msgid "sub &lt;class&gt; &lt;instance&gt; &lt;recipient&gt;: Join a new chat"
 msgstr ""
-
-#: ../libpurple/protocols/zephyr/zephyr.c:2720
+"sub &lt;klas&gt; &lt;geval&gt; &lt;ontvanger&gt;: Sluit by nuwe geselsie aan"
+
+#: ../libpurple/protocols/zephyr/zephyr.c:2721
 msgid ""
 "zi &lt;instance&gt;: Send a message to &lt;message,<i>instance</i>,*&gt;"
 msgstr ""
-
-#: ../libpurple/protocols/zephyr/zephyr.c:2726
+"zi &lt;geval&gt;: Stuur 'n boodskap aan &lt;boodskap,<i>geval</i>,*&gt;"
+
+#: ../libpurple/protocols/zephyr/zephyr.c:2727
 msgid ""
 "zci &lt;class&gt; &lt;instance&gt;: Send a message to &lt;<i>class</i>,"
 "<i>instance</i>,*&gt;"
 msgstr ""
-
-#: ../libpurple/protocols/zephyr/zephyr.c:2732
+"zci &lt;klas&gt; &lt;geval&gt;: Stuur 'n boodskap aan &lt;<i>klas</i>,"
+"<i>geval</i>,*&gt;"
+
+#: ../libpurple/protocols/zephyr/zephyr.c:2733
 msgid ""
 "zcir &lt;class&gt; &lt;instance&gt; &lt;recipient&gt;: Send a message to &lt;"
 "<i>class</i>,<i>instance</i>,<i>recipient</i>&gt;"
 msgstr ""
-
-#: ../libpurple/protocols/zephyr/zephyr.c:2738
+"zcir &lt;klas&gt; &lt;geval&gt; &lt;ontvanger&gt;: Stuur 'n boodskap aan &lt;"
+"<i>klas</i>,<i>geval</i>,<i>ontvanger</i>&gt;"
+
+#: ../libpurple/protocols/zephyr/zephyr.c:2739
 msgid ""
 "zir &lt;instance&gt; &lt;recipient&gt;: Send a message to &lt;MESSAGE,"
 "<i>instance</i>,<i>recipient</i>&gt;"
 msgstr ""
-
-#: ../libpurple/protocols/zephyr/zephyr.c:2743
+"zir &lt;geval&gt; &lt;ontvanger&gt;: Stuur 'n boodskap aan &lt;BOODSKAP,"
+"<i>geval</i>,<i>ontvanger</i>&gt;"
+
+#: ../libpurple/protocols/zephyr/zephyr.c:2744
 msgid "zc &lt;class&gt;: Send a message to &lt;<i>class</i>,PERSONAL,*&gt;"
 msgstr ""
-
-#: ../libpurple/protocols/zephyr/zephyr.c:2849
+"zc &lt;klas&gt;: Stuur 'n boodskap aan &lt;<i>klas</i>,PERSOONLIK,*&gt;"
+
+#: ../libpurple/protocols/zephyr/zephyr.c:2850
 msgid "Resubscribe"
-msgstr ""
-
-#: ../libpurple/protocols/zephyr/zephyr.c:2852
+msgstr "Skryf weer in"
+
+#: ../libpurple/protocols/zephyr/zephyr.c:2853
 msgid "Retrieve subscriptions from server"
-msgstr ""
+msgstr "Haal intekenings van bediener"
 
 #. *< type
 #. *< ui_requirement
@@ -10676,266 +11759,280 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/zephyr/zephyr.c:2939
-#: ../libpurple/protocols/zephyr/zephyr.c:2941
+#: ../libpurple/protocols/zephyr/zephyr.c:2946
+#: ../libpurple/protocols/zephyr/zephyr.c:2948
 msgid "Zephyr Protocol Plugin"
 msgstr "Inprop vir die Zephyr-protokol"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2960
+#: ../libpurple/protocols/zephyr/zephyr.c:2973
 msgid "Use tzc"
-msgstr ""
-
-#: ../libpurple/protocols/zephyr/zephyr.c:2963
+msgstr "Gebruik tzc"
+
+#: ../libpurple/protocols/zephyr/zephyr.c:2976
 msgid "tzc command"
-msgstr ""
-
-#: ../libpurple/protocols/zephyr/zephyr.c:2966
+msgstr "tzc-bevel"
+
+#: ../libpurple/protocols/zephyr/zephyr.c:2979
 msgid "Export to .anyone"
-msgstr ""
-
-#: ../libpurple/protocols/zephyr/zephyr.c:2969
+msgstr "Voer uit aan .enigiemand"
+
+#: ../libpurple/protocols/zephyr/zephyr.c:2982
 msgid "Export to .zephyr.subs"
-msgstr ""
-
-#: ../libpurple/protocols/zephyr/zephyr.c:2972
+msgstr "Voer uit aan .zephyr.subs"
+
+#: ../libpurple/protocols/zephyr/zephyr.c:2985
 msgid "Import from .anyone"
-msgstr ""
-
-#: ../libpurple/protocols/zephyr/zephyr.c:2975
+msgstr "Voer in van .enigiemand"
+
+#: ../libpurple/protocols/zephyr/zephyr.c:2988
 msgid "Import from .zephyr.subs"
-msgstr ""
-
-#: ../libpurple/protocols/zephyr/zephyr.c:2978
+msgstr "Voer in van .zephyr.subs"
+
+#: ../libpurple/protocols/zephyr/zephyr.c:2991
 msgid "Realm"
-msgstr ""
-
-#: ../libpurple/protocols/zephyr/zephyr.c:2981
+msgstr "Ryk"
+
+#: ../libpurple/protocols/zephyr/zephyr.c:2994
 msgid "Exposure"
-msgstr ""
+msgstr "Blootstelling"
 
 #: ../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"
 "%s"
-msgstr "Kan nie sok skep nie:\n"
+msgstr ""
+"Kan nie sok skep nie:\n"
 "%s"
 
 #: ../libpurple/proxy.c:658
 #, c-format
 msgid "Unable to parse response from HTTP proxy: %s\n"
-msgstr ""
+msgstr "Kon nie antwoord van HTTP-instaanbediener ontleed nie: %s\n"
 
 #: ../libpurple/proxy.c:686 ../libpurple/proxy.c:732 ../libpurple/proxy.c:770
 #: ../libpurple/proxy.c:782
 #, c-format
 msgid "HTTP proxy connection error %d"
-msgstr ""
+msgstr "HTTP-instaanbedienerverbinding-fout %d"
 
 #: ../libpurple/proxy.c:778
 #, c-format
 msgid "Access denied: HTTP proxy server forbids port %d tunneling."
-msgstr ""
+msgstr "Toegang geweier: HTTP-instaanbediener verbied poort %d om te tonnel."
 
 #: ../libpurple/proxy.c:995
 #, c-format
 msgid "Error resolving %s"
-msgstr ""
-
-#: ../libpurple/proxy.c:1685
+msgstr "Fout met oplos van %s"
+
+#: ../libpurple/proxy.c:1697
 msgid "Could not resolve host name"
-msgstr ""
+msgstr "Kon nie gasheernaam oplos nie"
 
 #. *
 #. * A wrapper for purple_request_action() that uses @c Yes and @c No buttons.
 #.
-#: ../libpurple/request.h:1341
+#: ../libpurple/request.h:1377
 msgid "_Yes"
 msgstr "_Ja"
 
-#: ../libpurple/request.h:1341
+#: ../libpurple/request.h:1377
 msgid "_No"
 msgstr "_Nee"
 
 #. *
 #. * A wrapper for purple_request_action() that uses Accept and Cancel buttons.
 #.
-#: ../libpurple/request.h:1360
+#: ../libpurple/request.h:1397
 msgid "_Accept"
 msgstr "_Aanvaar"
 
 #. *
 #. * 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 "Ek's nie hier op die oomblik nie"
 
-#: ../libpurple/savedstatuses.c:526
+#: ../libpurple/savedstatuses.c:534
 msgid "saved statuses"
 msgstr "gestoorde statusse"
 
-#: ../libpurple/server.c:228
+#: ../libpurple/server.c:233
 #, c-format
 msgid "%s is now known as %s.\n"
 msgstr "%s staan nou bekend as %s.\n"
 
-#: ../libpurple/server.c:670
+#: ../libpurple/server.c:680
 #, c-format
 msgid ""
 "%s has invited %s to the chat room %s:\n"
 "%s"
 msgstr ""
-"%s het %s uitgenooi na geselskamer %s:\n"
+"%s het %s uitgenooi na geselsiekamer %s:\n"
 "%s"
 
-#: ../libpurple/server.c:675
+#: ../libpurple/server.c:685
 #, c-format
 msgid "%s has invited %s to the chat room %s\n"
-msgstr "%s het %s na die geselskamer %s uitgenooi\n"
-
-#: ../libpurple/server.c:679
+msgstr "%s het %s na die geselsiekamer %s uitgenooi\n"
+
+#: ../libpurple/server.c:689
 msgid "Accept chat invitation?"
-msgstr "Aanvaar geselsuitnodiging?"
-
-#: ../libpurple/status.c:153
+msgstr "Aanvaar geselsie-uitnodiging?"
+
+#: ../libpurple/status.c:152
 msgid "Unset"
-msgstr ""
-
-#: ../libpurple/status.c:156
-msgid "Unavailable"
-msgstr "Nie beskikbaar"
-
-#: ../libpurple/status.c:160
+msgstr "Deaktiveer"
+
+#: ../libpurple/status.c:155 ../pidgin/gtkstatusbox.c:1057
+msgid "Do not disturb"
+msgstr "Moenie steur nie"
+
+#: ../libpurple/status.c:158
+msgid "Extended away"
+msgstr "Vir lank weg"
+
+#: ../libpurple/status.c:159
 msgid "Mobile"
 msgstr "Mobiel"
 
-#: ../libpurple/status.c:611
+#: ../libpurple/status.c:608
 #, c-format
 msgid "%s changed status from %s to %s"
 msgstr "%s het van status %s na %s verander"
 
-#: ../libpurple/status.c:621
+#: ../libpurple/status.c:618
 #, c-format
 msgid "%s is now %s"
 msgstr "%s is nou %s"
 
-#: ../libpurple/status.c:626
+#: ../libpurple/status.c:623
 #, c-format
 msgid "%s is no longer %s"
 msgstr "%s is nie meer %s nie"
 
-#: ../libpurple/status.c:1293
+#: ../libpurple/status.c:1233
 #, c-format
 msgid "%s became idle"
 msgstr "%s het ledig geraak"
 
-#: ../libpurple/status.c:1310
+#: ../libpurple/status.c:1250
 #, c-format
 msgid "%s became unidle"
-msgstr "%s het besig geword"
-
-#: ../libpurple/status.c:1376
+msgstr "%s is nie meer ledig nie"
+
+#: ../libpurple/status.c:1313
 #, c-format
 msgid "+++ %s became idle"
 msgstr "+++ %s het ledig geword"
 
-#: ../libpurple/status.c:1378
+#: ../libpurple/status.c:1315
 #, c-format
 msgid "+++ %s became unidle"
-msgstr "+++ %s het besig geword"
-
-#: ../libpurple/util.c:681
+msgstr "+++ %s is nie meer ledig nie"
+
+#: ../libpurple/util.c:717
 #, c-format
 msgid "%x %X"
 msgstr "%x %X"
 
-#: ../libpurple/util.c:2442
+#: ../libpurple/util.c:2702
 #, c-format
 msgid "Error Reading %s"
 msgstr "Fout met lees van %s"
 
-#: ../libpurple/util.c:2443
+#: ../libpurple/util.c:2703
 #, c-format
 msgid ""
 "An error was encountered reading your %s.  They have not been loaded, and "
 "the old file has been renamed to %s~."
 msgstr ""
-
-#: ../libpurple/util.c:2906
+"'n Fout is teëgekom toe u %s gelees is.  Dit is nie gelaai nie, en die ou "
+"lêer is hernoem na %s~."
+
+#: ../libpurple/util.c:3203
 msgid "Calculating..."
 msgstr "Bereken..."
 
-#: ../libpurple/util.c:2909
+#: ../libpurple/util.c:3206
 msgid "Unknown."
 msgstr "Onbekend."
 
-#: ../libpurple/util.c:2935
+#: ../libpurple/util.c:3232
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] "%d sekonde"
 msgstr[1] "%d sekondes"
 
-#: ../libpurple/util.c:2947
+#: ../libpurple/util.c:3244
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] "%d dag"
 msgstr[1] "%d dae"
 
-#: ../libpurple/util.c:2955
+#: ../libpurple/util.c:3252
 #, c-format
 msgid "%s, %d hour"
 msgid_plural "%s, %d hours"
 msgstr[0] "%s, %d uur"
 msgstr[1] "%s, %d ure"
 
-#: ../libpurple/util.c:2961
+#: ../libpurple/util.c:3258
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d uur"
 msgstr[1] "%d ure"
 
-#: ../libpurple/util.c:2969
+#: ../libpurple/util.c:3266
 #, c-format
 msgid "%s, %d minute"
 msgid_plural "%s, %d minutes"
 msgstr[0] "%s, %d minuut"
 msgstr[1] "%s, %d minute"
 
-#: ../libpurple/util.c:2975
+#: ../libpurple/util.c:3272
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d minuut"
 msgstr[1] "%d minute"
 
-#: ../libpurple/util.c:3242 ../libpurple/util.c:3540
+#: ../libpurple/util.c:3532
+#, c-format
+msgid "Could not open %s: Redirected too many times"
+msgstr "Kon nie %s open nie: Te veel keer herlei"
+
+#: ../libpurple/util.c:3569 ../libpurple/util.c:3864
 #, c-format
 msgid "Unable to connect to %s"
 msgstr "Kan nie verbind aan %s nie"
 
-#: ../libpurple/util.c:3368
+#: ../libpurple/util.c:3692
 #, c-format
 msgid ""
 "Unable to allocate enough memory to hold the contents from %s.  The web "
 "server may be trying something malicious."
 msgstr ""
-
-#: ../libpurple/util.c:3403
+"Kon nie genoeg geheue toeken om inhoud van %s te hou nie.  Die webbediener "
+"probeer dalk iets kwaadwilligs."
+
+#: ../libpurple/util.c:3727
 #, c-format
 msgid "Error reading from %s: %s"
-msgstr ""
-
-#: ../libpurple/util.c:3434
+msgstr "Fout met lees van %s: %s"
+
+#: ../libpurple/util.c:3758
 #, c-format
 msgid "Error writing to %s: %s"
-msgstr ""
-
-#: ../libpurple/util.c:3459
+msgstr "Fout met skryf na %s: %s"
+
+#: ../libpurple/util.c:3783
 #, c-format
 msgid "Unable to connect to %s: %s"
 msgstr "Kan nie verbind aan %s nie: %s"
@@ -10961,55 +12058,71 @@
 msgstr "Die oriëntasie van die laai."
 
 #. Build the login options frame.
-#: ../pidgin/gtkaccount.c:390
+#: ../pidgin/gtkaccount.c:409
 msgid "Login Options"
 msgstr "Aanmeldkeuses"
 
-#: ../pidgin/gtkaccount.c:492
-msgid "Local alias:"
-msgstr "Plaaslike alias:"
+#: ../pidgin/gtkaccount.c:430
+msgid "Pro_tocol:"
+msgstr "Pro_tokol:"
+
+#: ../pidgin/gtkaccount.c:441
+msgid "Screen _name:"
+msgstr "Skerm_naam:"
+
+#: ../pidgin/gtkaccount.c:531
+msgid "_Local alias:"
+msgstr "_Plaaslike alias:"
+
+#: ../pidgin/gtkaccount.c:535
+msgid "Remember pass_word"
+msgstr "Onthou wag_woord"
 
 #. Build the user options frame.
-#: ../pidgin/gtkaccount.c:554
+#: ../pidgin/gtkaccount.c:593
 msgid "User Options"
 msgstr "Gebruikerkeuses"
 
+#: ../pidgin/gtkaccount.c:606
+msgid "New _mail notifications"
+msgstr "Kennis_gewings vir nuwe pos"
+
 #. Buddy icon
-#: ../pidgin/gtkaccount.c:572
-msgid "Use this buddy icon for this account:"
-msgstr "Gebruik hierdie vriendikoon vir hierdie rekening:"
+#: ../pidgin/gtkaccount.c:611
+msgid "Use this buddy _icon for this account:"
+msgstr "Gebruik hierdie vriend_ikoon vir hierdie rekening:"
 
 #. Build the protocol options frame.
-#: ../pidgin/gtkaccount.c:684
+#: ../pidgin/gtkaccount.c:731
 #, c-format
 msgid "%s Options"
 msgstr "%s-keuses"
 
-#: ../pidgin/gtkaccount.c:881
+#: ../pidgin/gtkaccount.c:936
 msgid "Use GNOME Proxy Settings"
 msgstr "Gebruik GNOME se instaaninstellings"
 
-#: ../pidgin/gtkaccount.c:882
+#: ../pidgin/gtkaccount.c:937
 msgid "Use Global Proxy Settings"
 msgstr "Gebruik globale instaaninstellings"
 
-#: ../pidgin/gtkaccount.c:888
+#: ../pidgin/gtkaccount.c:943
 msgid "No Proxy"
 msgstr "Geen instaanbediener"
 
-#: ../pidgin/gtkaccount.c:894
+#: ../pidgin/gtkaccount.c:949
 msgid "HTTP"
 msgstr "HTTP"
 
-#: ../pidgin/gtkaccount.c:900
+#: ../pidgin/gtkaccount.c:955
 msgid "SOCKS 4"
 msgstr "SOCKS 4"
 
-#: ../pidgin/gtkaccount.c:906
+#: ../pidgin/gtkaccount.c:961
 msgid "SOCKS 5"
 msgstr "SOCKS 5"
 
-#: ../pidgin/gtkaccount.c:912 ../pidgin/gtkprefs.c:1100
+#: ../pidgin/gtkaccount.c:967 ../pidgin/gtkprefs.c:1208
 msgid "Use Environmental Settings"
 msgstr "Gebruik omgewinginstellings"
 
@@ -11018,60 +12131,60 @@
 #. A) your network is really slow and you have nothing better to do than
 #. look at butterflies.
 #. B)You are looking really closely at something that shouldn't matter.
-#: ../pidgin/gtkaccount.c:951
+#: ../pidgin/gtkaccount.c:1006
 msgid "If you look real closely"
 msgstr "As mens stip kyk,"
 
 #. This is an easter egg. See the comment on the previous line in the source.
-#: ../pidgin/gtkaccount.c:954
+#: ../pidgin/gtkaccount.c:1009
 msgid "you can see the butterflies mating"
 msgstr "kan mens skoenlappers sien paar"
 
-#: ../pidgin/gtkaccount.c:975
+#: ../pidgin/gtkaccount.c:1030
 msgid "Proxy Options"
 msgstr "Instaankeuses"
 
-#: ../pidgin/gtkaccount.c:989 ../pidgin/gtkprefs.c:1094
+#: ../pidgin/gtkaccount.c:1044 ../pidgin/gtkprefs.c:1202
 msgid "Proxy _type:"
 msgstr "Instaan_tipes:"
 
-#: ../pidgin/gtkaccount.c:998 ../pidgin/gtkprefs.c:1115
+#: ../pidgin/gtkaccount.c:1053 ../pidgin/gtkprefs.c:1223
 msgid "_Host:"
 msgstr "_Gasheer:"
 
-#: ../pidgin/gtkaccount.c:1002 ../pidgin/gtkprefs.c:1133
+#: ../pidgin/gtkaccount.c:1057 ../pidgin/gtkprefs.c:1241
 msgid "_Port:"
 msgstr "_Poort:"
 
-#: ../pidgin/gtkaccount.c:1010
+#: ../pidgin/gtkaccount.c:1065
 msgid "_Username:"
 msgstr "_Gebruikernaam:"
 
-#: ../pidgin/gtkaccount.c:1017 ../pidgin/gtkprefs.c:1170
+#: ../pidgin/gtkaccount.c:1072 ../pidgin/gtkprefs.c:1278
 msgid "Pa_ssword:"
 msgstr "_Wagwoord:"
 
-#: ../pidgin/gtkaccount.c:1428
+#: ../pidgin/gtkaccount.c:1478
 msgid "Add Account"
 msgstr "Voeg rekening by"
 
-#: ../pidgin/gtkaccount.c:1452
+#: ../pidgin/gtkaccount.c:1497
 msgid "_Basic"
 msgstr "_Eenvoudig"
 
-#: ../pidgin/gtkaccount.c:1463
+#: ../pidgin/gtkaccount.c:1508
 msgid "_Advanced"
 msgstr "_Gevorderd"
 
-#: ../pidgin/gtkaccount.c:1933 ../pidgin/gtkplugin.c:566
+#: ../pidgin/gtkaccount.c:1982 ../pidgin/gtkplugin.c:568
 msgid "Enabled"
 msgstr "Geaktiveer"
 
-#: ../pidgin/gtkaccount.c:1961
+#: ../pidgin/gtkaccount.c:2010
 msgid "Protocol"
 msgstr "Protokol"
 
-#: ../pidgin/gtkaccount.c:2144
+#: ../pidgin/gtkaccount.c:2210
 #, c-format
 msgid ""
 "<span size='larger' weight='bold'>Welcome to %s!</span>\n"
@@ -11086,242 +12199,238 @@
 msgstr ""
 "<span size='larger' weight='bold'>Welkom by %s!</span>\n"
 "\n"
-""
-"Daar is nog geen kletsrekeninge opgestel nie. Om met %s te kan verbind, "
-"druk op die <b>Voeg by</b>-knoppie hier onder en stel die eerste rekening "
-""
-"op. Indien u %s vir verskeie rekeninge wil gebruik, druk weer <b>Voeg by</"
-"b> om elkeen op te stel.\n"
+"Daar is nog geen kletsrekeninge opgestel nie. Om met %s te kan verbind, druk "
+"op die <b>Voeg by</b>-knoppie hier onder en stel die eerste rekening op. "
+"Indien u wil hê %s moet aan verskeie rekeninge verbind, druk weer <b>Voeg "
+"by</b> om elkeen op te stel.\n"
 "\n"
 "U kan na hierdie venster terugkeer in die Vriendelys-venster by <b>Rekeninge-"
-">Voeg by / wysig</b> om rekeninge by te voeg, te wysig of te verwyder."
-
-#: ../pidgin/gtkblist.c:704
+">Voeg by / wysig</b> om rekeninge by te voeg, te wysig of te verwyder"
+
+#: ../pidgin/gtkblist.c:760
 msgid "Join a Chat"
-msgstr "Sluit by gesprek aan"
-
-#: ../pidgin/gtkblist.c:725
+msgstr "Sluit by geselsie aan"
+
+#: ../pidgin/gtkblist.c:781
 msgid ""
 "Please enter the appropriate information about the chat you would like to "
 "join.\n"
 msgstr ""
 "Gee asb. die gepaste inligting vir die geselsie waarby u wil aansluit.\n"
 
-#: ../pidgin/gtkblist.c:736 ../pidgin/gtkpounce.c:529
-#: ../pidgin/gtkroomlist.c:399
+#. Set up stuff for the account box
+#: ../pidgin/gtkblist.c:792 ../pidgin/gtkblist.c:5478
+#: ../pidgin/gtkblist.c:5844 ../pidgin/gtkpounce.c:540
+#: ../pidgin/gtkroomlist.c:395
 msgid "_Account:"
 msgstr "_Rekening:"
 
-#: ../pidgin/gtkblist.c:1010 ../pidgin/gtkprivacy.c:603
-#: ../pidgin/gtkprivacy.c:614
+#: ../pidgin/gtkblist.c:1081 ../pidgin/gtkprivacy.c:602
+#: ../pidgin/gtkprivacy.c:616
 msgid "_Block"
 msgstr "_Blokkeer"
 
-#: ../pidgin/gtkblist.c:1010
+#: ../pidgin/gtkblist.c:1081
 msgid "Un_block"
-msgstr ""
-
-#: ../pidgin/gtkblist.c:1061
+msgstr "Ont_blokkeer"
+
+#: ../pidgin/gtkblist.c:1132
 msgid "Get _Info"
 msgstr "_Inligting"
 
-#: ../pidgin/gtkblist.c:1064 ../pidgin/pidginstock.c:91
+#: ../pidgin/gtkblist.c:1135 ../pidgin/pidginstock.c:84
 msgid "I_M"
 msgstr "_Kitsklets"
 
-#: ../pidgin/gtkblist.c:1070
+#: ../pidgin/gtkblist.c:1141
 msgid "_Send File"
 msgstr "_Stuur lêer"
 
-#: ../pidgin/gtkblist.c:1077
+#: ../pidgin/gtkblist.c:1148
 msgid "Add Buddy _Pounce"
 msgstr "Voeg vriend_wag by"
 
-#: ../pidgin/gtkblist.c:1081 ../pidgin/gtkblist.c:1085
-#: ../pidgin/gtkblist.c:1184 ../pidgin/gtkblist.c:1207
+#: ../pidgin/gtkblist.c:1153 ../pidgin/gtkblist.c:1157
+#: ../pidgin/gtkblist.c:1262 ../pidgin/gtkblist.c:1285
 msgid "View _Log"
 msgstr "Bekyk _staaflêer"
 
-#: ../pidgin/gtkblist.c:1097
-msgid "Alias..."
-msgstr "Alias..."
-
-#: ../pidgin/gtkblist.c:1106 ../pidgin/gtkblist.c:1192
-#: ../pidgin/gtkblist.c:1213
+#: ../pidgin/gtkblist.c:1170 ../pidgin/gtkblist.c:1179
+#: ../pidgin/gtkblist.c:1270 ../pidgin/gtkblist.c:1291
 msgid "_Alias..."
 msgstr "_Alias..."
 
-#: ../pidgin/gtkblist.c:1108 ../pidgin/gtkblist.c:1194
-#: ../pidgin/gtkblist.c:1215
+#: ../pidgin/gtkblist.c:1173 ../pidgin/gtkblist.c:1181
+#: ../pidgin/gtkblist.c:1272 ../pidgin/gtkblist.c:1293
 msgid "_Remove"
 msgstr "_Verwyder"
 
-#: ../pidgin/gtkblist.c:1155
+#: ../pidgin/gtkblist.c:1231
 msgid "Add a _Buddy"
 msgstr "Voeg 'n _vriend by"
 
-#: ../pidgin/gtkblist.c:1157
+#: ../pidgin/gtkblist.c:1234
 msgid "Add a C_hat"
 msgstr "Voeg 'n _gesprek by"
 
-#: ../pidgin/gtkblist.c:1160
+#: ../pidgin/gtkblist.c:1237
 msgid "_Delete Group"
 msgstr "_Vee groep uit"
 
-#: ../pidgin/gtkblist.c:1162
+#: ../pidgin/gtkblist.c:1239
 msgid "_Rename"
 msgstr "_Hernoem"
 
 #. join button
-#: ../pidgin/gtkblist.c:1180 ../pidgin/gtkroomlist.c:306
-#: ../pidgin/gtkroomlist.c:463 ../pidgin/pidginstock.c:89
+#: ../pidgin/gtkblist.c:1258 ../pidgin/gtkroomlist.c:306
+#: ../pidgin/gtkroomlist.c:459 ../pidgin/pidginstock.c:82
 msgid "_Join"
 msgstr "_Sluit aan"
 
-#: ../pidgin/gtkblist.c:1182
+#: ../pidgin/gtkblist.c:1260
 msgid "Auto-Join"
 msgstr "Outoaansluit"
 
-#: ../pidgin/gtkblist.c:1220 ../pidgin/gtkblist.c:1243
+#: ../pidgin/gtkblist.c:1298 ../pidgin/gtkblist.c:1322
 msgid "_Collapse"
 msgstr "_Vou toe"
 
-#: ../pidgin/gtkblist.c:1248
+#: ../pidgin/gtkblist.c:1327
 msgid "_Expand"
 msgstr "_Vou oop"
 
-#: ../pidgin/gtkblist.c:1493 ../pidgin/gtkblist.c:1505
-#: ../pidgin/gtkblist.c:4431 ../pidgin/gtkblist.c:4441
+#: ../pidgin/gtkblist.c:1572 ../pidgin/gtkblist.c:1584
+#: ../pidgin/gtkblist.c:4572 ../pidgin/gtkblist.c:4582
 msgid "/Tools/Mute Sounds"
 msgstr "Demp klanke"
 
-#: ../pidgin/gtkblist.c:1965 ../pidgin/gtkconv.c:4514
-#: ../pidgin/gtkpounce.c:421
+#: ../pidgin/gtkblist.c:2044 ../pidgin/gtkconv.c:4709
+#: ../pidgin/gtkpounce.c:429
 msgid ""
 "You are not currently signed on with an account that can add that buddy."
 msgstr "U is tans aangemeld met 'n rekening wat daardie vriend kan byvoeg."
 
 #. Buddies menu
-#: ../pidgin/gtkblist.c:2757
+#: ../pidgin/gtkblist.c:2850
 msgid "/_Buddies"
-msgstr "/_Vriende"
-
-#: ../pidgin/gtkblist.c:2758
+msgstr "_Vriende"
+
+#: ../pidgin/gtkblist.c:2851
 msgid "/Buddies/New Instant _Message..."
 msgstr "Nuwe _kitsboodskap..."
 
-#: ../pidgin/gtkblist.c:2759
+#: ../pidgin/gtkblist.c:2852
 msgid "/Buddies/Join a _Chat..."
 msgstr "Sluit by _geselsie aan..."
 
-#: ../pidgin/gtkblist.c:2760
+#: ../pidgin/gtkblist.c:2853
 msgid "/Buddies/Get User _Info..."
 msgstr "Kry gebruiker_inligting..."
 
-#: ../pidgin/gtkblist.c:2761
+#: ../pidgin/gtkblist.c:2854
 msgid "/Buddies/View User _Log..."
 msgstr "Bekyk gebruiker se staaf_lêer..."
 
-#: ../pidgin/gtkblist.c:2763
+#: ../pidgin/gtkblist.c:2856
 msgid "/Buddies/Show _Offline Buddies"
 msgstr "Wys a_flynvriende"
 
-#: ../pidgin/gtkblist.c:2764
+#: ../pidgin/gtkblist.c:2857
 msgid "/Buddies/Show _Empty Groups"
 msgstr "Wys _leë groepe"
 
-#: ../pidgin/gtkblist.c:2765
+#: ../pidgin/gtkblist.c:2858
 msgid "/Buddies/Show Buddy _Details"
 msgstr "Wys vriend_detail"
 
-#: ../pidgin/gtkblist.c:2766
+#: ../pidgin/gtkblist.c:2859
 msgid "/Buddies/Show Idle _Times"
 msgstr "Wys ledige _tye"
 
-#: ../pidgin/gtkblist.c:2767
+#: ../pidgin/gtkblist.c:2860
 msgid "/Buddies/_Sort Buddies"
 msgstr "_Sorteer vriende"
 
-#: ../pidgin/gtkblist.c:2769
+#: ../pidgin/gtkblist.c:2862
 msgid "/Buddies/_Add Buddy..."
 msgstr "Voeg _vriend by..."
 
-#: ../pidgin/gtkblist.c:2770
+#: ../pidgin/gtkblist.c:2863
 msgid "/Buddies/Add C_hat..."
 msgstr "Voeg gese_lsie by..."
 
-#: ../pidgin/gtkblist.c:2771
+#: ../pidgin/gtkblist.c:2864
 msgid "/Buddies/Add _Group..."
 msgstr "Voeg _groep by..."
 
-#: ../pidgin/gtkblist.c:2773
+#: ../pidgin/gtkblist.c:2866
 msgid "/Buddies/_Quit"
 msgstr "_Sluit af"
 
 #. Accounts menu
-#: ../pidgin/gtkblist.c:2776
+#: ../pidgin/gtkblist.c:2869
 msgid "/_Accounts"
-msgstr "/_Rekeninge"
-
-#: ../pidgin/gtkblist.c:2777 ../pidgin/gtkblist.c:6344
+msgstr "_Rekeninge"
+
+#: ../pidgin/gtkblist.c:2870 ../pidgin/gtkblist.c:6542
 msgid "/Accounts/Add\\/Edit"
 msgstr "Voeg by \\/ wysig"
 
 #. Tools
-#: ../pidgin/gtkblist.c:2780
+#: ../pidgin/gtkblist.c:2873
 msgid "/_Tools"
-msgstr "/_Gereedskap"
-
-#: ../pidgin/gtkblist.c:2781
+msgstr "_Gereedskap"
+
+#: ../pidgin/gtkblist.c:2874
 msgid "/Tools/Buddy _Pounces"
-msgstr "/Gereedskap/Vriend_wagte"
-
-#: ../pidgin/gtkblist.c:2782
+msgstr "Vriend_wagte"
+
+#: ../pidgin/gtkblist.c:2875
 msgid "/Tools/Plu_gins"
-msgstr "/Gereedskap/_Inproppe"
-
-#: ../pidgin/gtkblist.c:2783
+msgstr "_Inproppe"
+
+#: ../pidgin/gtkblist.c:2876
 msgid "/Tools/Pr_eferences"
-msgstr "/Gereedskap/_Voorkeure"
-
-#: ../pidgin/gtkblist.c:2784
+msgstr "_Voorkeure"
+
+#: ../pidgin/gtkblist.c:2877
 msgid "/Tools/Pr_ivacy"
-msgstr "/Gereedskap/_Privaatheid"
-
-#: ../pidgin/gtkblist.c:2786
+msgstr "_Privaatheid"
+
+#: ../pidgin/gtkblist.c:2879
 msgid "/Tools/_File Transfers"
-msgstr "/Gereedskap/_Lêeroordragte"
-
-#: ../pidgin/gtkblist.c:2787
+msgstr "_Lêeroordragte"
+
+#: ../pidgin/gtkblist.c:2880
 msgid "/Tools/R_oom List"
-msgstr "/Gereedskap/_Kamerlys"
-
-#: ../pidgin/gtkblist.c:2788
+msgstr "_Kamerlys"
+
+#: ../pidgin/gtkblist.c:2881
 msgid "/Tools/System _Log"
 msgstr "Stelselstaaf_lêer"
 
-#: ../pidgin/gtkblist.c:2790
+#: ../pidgin/gtkblist.c:2883
 msgid "/Tools/Mute _Sounds"
 msgstr "Demp _klanke"
 
 #. Help
-#: ../pidgin/gtkblist.c:2793
+#: ../pidgin/gtkblist.c:2885
 msgid "/_Help"
-msgstr "/_Hulp"
-
-#: ../pidgin/gtkblist.c:2794
+msgstr "_Hulp"
+
+#: ../pidgin/gtkblist.c:2886
 msgid "/Help/Online _Help"
-msgstr "/Hulp/_Hulp aanlyn"
-
-#: ../pidgin/gtkblist.c:2795
+msgstr "_Hulp aanlyn"
+
+#: ../pidgin/gtkblist.c:2887
 msgid "/Help/_Debug Window"
 msgstr "_Ontfoutvenster"
 
-#: ../pidgin/gtkblist.c:2796
+#: ../pidgin/gtkblist.c:2889 ../pidgin/gtkblist.c:2891
 msgid "/Help/_About"
-msgstr "/Hulp/_Aangaande"
-
-#: ../pidgin/gtkblist.c:2824
+msgstr "_Aangaande"
+
+#: ../pidgin/gtkblist.c:2920
 #, c-format
 msgid ""
 "\n"
@@ -11330,131 +12439,132 @@
 "\n"
 "<b>Rekening:</b> %s"
 
-#: ../pidgin/gtkblist.c:2902
+#: ../pidgin/gtkblist.c:2998
 msgid "Buddy Alias"
 msgstr "Vriendalias"
 
-#: ../pidgin/gtkblist.c:2923
+#: ../pidgin/gtkblist.c:3027
 msgid "Logged In"
 msgstr "Aangemeld"
 
-#: ../pidgin/gtkblist.c:2969
+#: ../pidgin/gtkblist.c:3073
 msgid "Last Seen"
 msgstr "Laas gesien"
 
-#: ../pidgin/gtkblist.c:2989
+#: ../pidgin/gtkblist.c:3093
 msgid "Spooky"
-msgstr ""
-
-#: ../pidgin/gtkblist.c:2991
+msgstr "Vreemd"
+
+#: ../pidgin/gtkblist.c:3095
 msgid "Awesome"
-msgstr ""
-
-#: ../pidgin/gtkblist.c:2993
+msgstr "Asemrowend"
+
+#: ../pidgin/gtkblist.c:3097
 msgid "Rockin'"
-msgstr ""
-
-#: ../pidgin/gtkblist.c:3318
+msgstr "Aitsa"
+
+#: ../pidgin/gtkblist.c:3436
+#, c-format
+msgid "Idle %dd %dh %02dm"
+msgstr "Ledig %dd %dh %02dm"
+
+#: ../pidgin/gtkblist.c:3438
 #, c-format
 msgid "Idle %dh %02dm"
 msgstr "Ledig %dh %02dm"
 
-#: ../pidgin/gtkblist.c:3320
+#: ../pidgin/gtkblist.c:3440
 #, c-format
 msgid "Idle %dm"
 msgstr "Ledig %dm"
 
-#: ../pidgin/gtkblist.c:3457
+#: ../pidgin/gtkblist.c:3585
 msgid "/Buddies/New Instant Message..."
 msgstr "Nuwe kitsboodskap..."
 
-#: ../pidgin/gtkblist.c:3458 ../pidgin/gtkblist.c:3491
+#: ../pidgin/gtkblist.c:3586 ../pidgin/gtkblist.c:3619
 msgid "/Buddies/Join a Chat..."
-msgstr "Sluit by geselskap aan..."
-
-#: ../pidgin/gtkblist.c:3459
+msgstr "Sluit by geselsie aan..."
+
+#: ../pidgin/gtkblist.c:3587
 msgid "/Buddies/Get User Info..."
 msgstr "Kry gebruikerinligting..."
 
-#: ../pidgin/gtkblist.c:3460
+#: ../pidgin/gtkblist.c:3588
 msgid "/Buddies/Add Buddy..."
 msgstr "Voeg vriend by..."
 
-#: ../pidgin/gtkblist.c:3461 ../pidgin/gtkblist.c:3494
+#: ../pidgin/gtkblist.c:3589 ../pidgin/gtkblist.c:3622
 msgid "/Buddies/Add Chat..."
 msgstr "Voeg geselsie by..."
 
-#: ../pidgin/gtkblist.c:3462
+#: ../pidgin/gtkblist.c:3590
 msgid "/Buddies/Add Group..."
 msgstr "Voeg groep by..."
 
-#: ../pidgin/gtkblist.c:3497
-msgid "/Tools/Buddy Pounces"
-msgstr "Vriendwagte"
-
-#: ../pidgin/gtkblist.c:3500
+#: ../pidgin/gtkblist.c:3625
 msgid "/Tools/Privacy"
 msgstr "Privaatheid"
 
-#: ../pidgin/gtkblist.c:3503
+#: ../pidgin/gtkblist.c:3628
 msgid "/Tools/Room List"
 msgstr "Kamerlys"
 
-#: ../pidgin/gtkblist.c:3600 ../pidgin/gtkdocklet.c:153
+#: ../pidgin/gtkblist.c:3725 ../pidgin/gtkdocklet.c:153
 #, c-format
 msgid "%d unread message from %s\n"
 msgid_plural "%d unread messages from %s\n"
 msgstr[0] "%d ongelese boodskap van %s\n"
 msgstr[1] "%d ongelese boodskappe van %s\n"
 
-#: ../pidgin/gtkblist.c:3677
+#: ../pidgin/gtkblist.c:3805
 msgid "Manually"
 msgstr "Handmatig"
 
-#: ../pidgin/gtkblist.c:3679
+#: ../pidgin/gtkblist.c:3807
 msgid "Alphabetically"
 msgstr "Alfabeties"
 
-#: ../pidgin/gtkblist.c:3680
+#: ../pidgin/gtkblist.c:3808
 msgid "By status"
 msgstr "Volgens status"
 
-#: ../pidgin/gtkblist.c:3681
+#: ../pidgin/gtkblist.c:3809
 msgid "By log size"
 msgstr "Volgens staaflêergrootte"
 
-#: ../pidgin/gtkblist.c:3883 ../pidgin/gtkconn.c:178
+#: ../pidgin/gtkblist.c:4014 ../pidgin/gtkconn.c:178
 #, c-format
 msgid "%s disconnected"
 msgstr "%s afgesny"
 
-#: ../pidgin/gtkblist.c:3892
+#: ../pidgin/gtkblist.c:4024
 msgid "Re-enable Account"
 msgstr "Heraktiveer rekening"
 
-#: ../pidgin/gtkblist.c:3913
+#: ../pidgin/gtkblist.c:4050
 #, c-format
 msgid "<span color=\"red\">%s disconnected: %s</span>"
 msgstr "<span color=\"red\">%s afgesny: %s</span>"
 
-#: ../pidgin/gtkblist.c:4066
+#: ../pidgin/gtkblist.c:4202
 msgid "<b>Username:</b>"
 msgstr "<b>Gebruikernaam:</b>"
 
-#: ../pidgin/gtkblist.c:4073
+#: ../pidgin/gtkblist.c:4209
 msgid "<b>Password:</b>"
 msgstr "<b>Wagwoord:</b>"
 
-#: ../pidgin/gtkblist.c:4084
+#: ../pidgin/gtkblist.c:4220
 msgid "_Login"
 msgstr "_Meld aan"
 
-#: ../pidgin/gtkblist.c:4169
+#: ../pidgin/gtkblist.c:4303
 msgid "/Accounts"
-msgstr "/Rekeninge"
+msgstr "Rekeninge"
 
 #. Translators: Please maintain the use of -> and <- to refer to menu heirarchy
-#: ../pidgin/gtkblist.c:4183
+#: ../pidgin/gtkblist.c:4317
 #, c-format
 msgid ""
 "<span weight='bold' size='larger'>Welcome to %s!</span>\n"
@@ -11473,23 +12583,23 @@
 #. set the Show Offline Buddies option. must be done
 #. * after the treeview or faceprint gets mad. -Robot101
 #.
-#: ../pidgin/gtkblist.c:4425
+#: ../pidgin/gtkblist.c:4566
 msgid "/Buddies/Show Offline Buddies"
 msgstr "Wys aflynvriende"
 
-#: ../pidgin/gtkblist.c:4428
+#: ../pidgin/gtkblist.c:4569
 msgid "/Buddies/Show Empty Groups"
 msgstr "Wys leë groepe"
 
-#: ../pidgin/gtkblist.c:4434
+#: ../pidgin/gtkblist.c:4575
 msgid "/Buddies/Show Buddy Details"
 msgstr "Wys vrienddetail"
 
-#: ../pidgin/gtkblist.c:4437
+#: ../pidgin/gtkblist.c:4578
 msgid "/Buddies/Show Idle Times"
 msgstr "Wys ledige tye"
 
-#: ../pidgin/gtkblist.c:5271
+#: ../pidgin/gtkblist.c:5455
 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. "
@@ -11499,24 +12609,26 @@
 "kan 'n alias of bynaam vir die vriend gebruik as u wil.  Die alias sal in "
 "die plek van die skermnaam gebruik word wanneer moontlik.\n"
 
-#: ../pidgin/gtkblist.c:5331 ../pidgin/gtkblist.c:5692
-#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:554
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:307
-msgid "Group:"
-msgstr "Groep:"
-
-#: ../pidgin/gtkblist.c:5590
+#. End of account box
+#: ../pidgin/gtkblist.c:5490
+msgid "_Screen name:"
+msgstr "_Skermnaam:"
+
+#: ../pidgin/gtkblist.c:5512 ../pidgin/gtkblist.c:5865
+msgid "A_lias:"
+msgstr "A_lias:"
+
+#: ../pidgin/gtkblist.c:5777
 msgid "This protocol does not support chat rooms."
-msgstr "Hierdie protokol ondersteun nie gesprekkamers nie."
-
-#: ../pidgin/gtkblist.c:5606
+msgstr "Hierdie protokol ondersteun nie geselsiekamers nie."
+
+#: ../pidgin/gtkblist.c:5793
 msgid ""
 "You are not currently signed on with any protocols that have the ability to "
 "chat."
-msgstr ""
-"U is nie tans aangemeld met enige protokol met geselskapfasiliteit nie."
-
-#: ../pidgin/gtkblist.c:5647
+msgstr "U is nie tans aangemeld met enige protokol met geselsiefasiliteit nie."
+
+#: ../pidgin/gtkblist.c:5834
 msgid ""
 "Please enter an alias, and the appropriate information about the chat you "
 "would like to add to your buddy list.\n"
@@ -11524,39 +12636,39 @@
 "Gee asb. 'n alias en die geskikte inligting oor die geselsie wat u by die "
 "vriendelys wil voeg.\n"
 
-#: ../pidgin/gtkblist.c:5730
+#: ../pidgin/gtkblist.c:5922
 msgid "Please enter the name of the group to be added."
 msgstr "Gee asb. die naam van die groep om by te voeg."
 
-#: ../pidgin/gtkblist.c:6364
+#: ../pidgin/gtkblist.c:6562
 msgid "<PurpleMain>/Accounts/"
 msgstr "<PurpleMain>/Rekeninge/"
 
-#: ../pidgin/gtkblist.c:6388
+#: ../pidgin/gtkblist.c:6586
 msgid "_Edit Account"
 msgstr "_Wysig rekening"
 
-#: ../pidgin/gtkblist.c:6401 ../pidgin/gtkconv.c:2920
+#: ../pidgin/gtkblist.c:6599 ../pidgin/gtkconv.c:3015
 msgid "No actions available"
 msgstr "Geen aksies beskikbaar nie"
 
-#: ../pidgin/gtkblist.c:6409
+#: ../pidgin/gtkblist.c:6607
 msgid "_Disable"
 msgstr "_Deaktiveer"
 
-#: ../pidgin/gtkblist.c:6421
+#: ../pidgin/gtkblist.c:6619
 msgid "Enable Account"
 msgstr "Aktiveer rekening"
 
-#: ../pidgin/gtkblist.c:6427
+#: ../pidgin/gtkblist.c:6625
 msgid "<PurpleMain>/Accounts/Enable Account"
 msgstr "<PurpleMain>/Rekeninge/Aktiveer rekening"
 
-#: ../pidgin/gtkblist.c:6476
+#: ../pidgin/gtkblist.c:6674
 msgid "/Tools"
 msgstr "Gereedskap"
 
-#: ../pidgin/gtkblist.c:6546
+#: ../pidgin/gtkblist.c:6744
 msgid "/Buddies/Sort Buddies"
 msgstr "Sorteer vriende"
 
@@ -11573,22 +12685,26 @@
 "%s sal eers weer probeer verbind nadat u die fout reggemaak het en die "
 "rekening geheraktiveer het."
 
-#: ../pidgin/gtkconv.c:782 ../pidgin/gtkconv.c:808
+#: ../pidgin/gtkconv.c:488
+msgid "Unknown command."
+msgstr "Onbekende opdrag."
+
+#: ../pidgin/gtkconv.c:760 ../pidgin/gtkconv.c:786
 msgid "That buddy is not on the same protocol as this chat."
-msgstr "Daardie vriend is nie op die selfde protokol as hierdie geselskap nie."
-
-#: ../pidgin/gtkconv.c:802
+msgstr "Daardie vriend is nie op die selfde protokol as hierdie geselsie nie."
+
+#: ../pidgin/gtkconv.c:780
 msgid ""
 "You are not currently signed on with an account that can invite that buddy."
 msgstr ""
 "U is nie tans aangemeld met 'n rekening wat daardie vriend kan nooi nie."
 
-#: ../pidgin/gtkconv.c:855
+#: ../pidgin/gtkconv.c:833
 msgid "Invite Buddy Into Chat Room"
-msgstr "Nooi vriend na geselskamer"
+msgstr "Nooi vriend na geselsiekamer"
 
 #. Put our happy label in it.
-#: ../pidgin/gtkconv.c:885
+#: ../pidgin/gtkconv.c:863
 msgid ""
 "Please enter the name of the user you wish to invite, along with an optional "
 "invite message."
@@ -11596,355 +12712,379 @@
 "Gee asb. die naam van die gebruiker om uit te nooi, saam met 'n opsionele "
 "uitnodigingsboodskap."
 
-#: ../pidgin/gtkconv.c:906
+#: ../pidgin/gtkconv.c:884
 msgid "_Buddy:"
 msgstr "_Vriend:"
 
-#: ../pidgin/gtkconv.c:926 ../pidgin/gtksavedstatuses.c:1141
-#: ../pidgin/gtksavedstatuses.c:1477
+#: ../pidgin/gtkconv.c:904 ../pidgin/gtksavedstatuses.c:1193
+#: ../pidgin/gtksavedstatuses.c:1525
 msgid "_Message:"
 msgstr "_Boodskap:"
 
-#: ../pidgin/gtkconv.c:983 ../pidgin/gtkconv.c:2487 ../pidgin/gtkdebug.c:218
+#: ../pidgin/gtkconv.c:961 ../pidgin/gtkconv.c:2522 ../pidgin/gtkdebug.c:218
 #: ../pidgin/gtkft.c:542
 msgid "Unable to open file."
-msgstr "Kan nie lêer oopmaak nie."
-
-#: ../pidgin/gtkconv.c:989
+msgstr "Kan nie lêer open nie."
+
+#: ../pidgin/gtkconv.c:967
 #, c-format
 msgid "<h1>Conversation with %s</h1>\n"
 msgstr "<h1>Gesprek met %s</h1>\n"
 
-#: ../pidgin/gtkconv.c:1013
+#: ../pidgin/gtkconv.c:1003
 msgid "Save Conversation"
 msgstr "Stoor gesprek"
 
-#: ../pidgin/gtkconv.c:1160 ../pidgin/gtkdebug.c:166 ../pidgin/gtkdebug.c:756
+#: ../pidgin/gtkconv.c:1152 ../pidgin/gtkdebug.c:166 ../pidgin/gtkdebug.c:742
 msgid "Find"
 msgstr "Soek"
 
-#: ../pidgin/gtkconv.c:1186 ../pidgin/gtkdebug.c:194
+#: ../pidgin/gtkconv.c:1178 ../pidgin/gtkdebug.c:194
 msgid "_Search for:"
 msgstr "_Soek vir:"
 
-#: ../pidgin/gtkconv.c:1338
+#: ../pidgin/gtkconv.c:1361
 msgid "Logging started. Future messages in this conversation will be logged."
 msgstr ""
 "Boekstawing het begin. Boodskappe in hierdie gesprek sal van nou af "
 "geboekstaaf word."
 
-#: ../pidgin/gtkconv.c:1346
+#: ../pidgin/gtkconv.c:1369
 msgid ""
 "Logging stopped. Future messages in this conversation will not be logged."
 msgstr ""
 "Boekstawing gestop. Boodskappe in hierdie gesprek sal van nou af nie "
 "geboekstaaf word nie."
 
-#: ../pidgin/gtkconv.c:1614
+#: ../pidgin/gtkconv.c:1617
 msgid "Un-Ignore"
 msgstr "On-ignoreer"
 
-#: ../pidgin/gtkconv.c:1617
+#: ../pidgin/gtkconv.c:1620
 msgid "Ignore"
 msgstr "Ignoreer"
 
-#: ../pidgin/gtkconv.c:1637
+#: ../pidgin/gtkconv.c:1640
 msgid "Get Away Message"
 msgstr "Kry Weg-boodskap"
 
-#: ../pidgin/gtkconv.c:1660
+#: ../pidgin/gtkconv.c:1663
 msgid "Last said"
 msgstr "Laaste gesê"
 
-#: ../pidgin/gtkconv.c:2495
+#: ../pidgin/gtkconv.c:2530
 msgid "Unable to save icon file to disk."
 msgstr "Kan nie ikoonlêer op skyf stoor nie."
 
-#: ../pidgin/gtkconv.c:2565
+#: ../pidgin/gtkconv.c:2581
 msgid "Save Icon"
 msgstr "Stoor ikoon"
 
-#: ../pidgin/gtkconv.c:2614
+#: ../pidgin/gtkconv.c:2633
 msgid "Animate"
 msgstr "Animeer"
 
-#: ../pidgin/gtkconv.c:2619
+#: ../pidgin/gtkconv.c:2638
 msgid "Hide Icon"
 msgstr "Versteek ikoon"
 
-#: ../pidgin/gtkconv.c:2622
+#: ../pidgin/gtkconv.c:2641
 msgid "Save Icon As..."
 msgstr "Stoor ikoon as..."
 
-#: ../pidgin/gtkconv.c:2626
+#: ../pidgin/gtkconv.c:2645
 msgid "Set Custom Icon..."
 msgstr "Stel eie ikoon..."
 
-#: ../pidgin/gtkconv.c:2633
+#: ../pidgin/gtkconv.c:2658
 msgid "Remove Custom Icon"
 msgstr "Verwyder eie ikoon"
 
 #. Conversation menu
-#: ../pidgin/gtkconv.c:2774
+#: ../pidgin/gtkconv.c:2800
 msgid "/_Conversation"
-msgstr "/_Gesprek"
-
-#: ../pidgin/gtkconv.c:2776
+msgstr "_Gesprek"
+
+#: ../pidgin/gtkconv.c:2802
 msgid "/Conversation/New Instant _Message..."
-msgstr "/Gesprek/Nuwe _kitsboodskap..."
-
-#: ../pidgin/gtkconv.c:2781
+msgstr "Nuwe _kitsboodskap..."
+
+#: ../pidgin/gtkconv.c:2807
 msgid "/Conversation/_Find..."
-msgstr "/Gesprek/_Vind..."
-
-#: ../pidgin/gtkconv.c:2783
+msgstr "_Vind..."
+
+#: ../pidgin/gtkconv.c:2809
 msgid "/Conversation/View _Log"
 msgstr "Bekyk staaf_lêer"
 
-#: ../pidgin/gtkconv.c:2784
+#: ../pidgin/gtkconv.c:2810
 msgid "/Conversation/_Save As..."
-msgstr "/Gesprek/_Stoor as..."
-
-#: ../pidgin/gtkconv.c:2786
+msgstr "_Stoor as..."
+
+#: ../pidgin/gtkconv.c:2812
 msgid "/Conversation/Clea_r Scrollback"
 msgstr "Maak gesprekvenster skoo_n"
 
-#: ../pidgin/gtkconv.c:2790
+#: ../pidgin/gtkconv.c:2816
 msgid "/Conversation/Se_nd File..."
-msgstr "/Gesprek/S_tuur lêer..."
-
-#: ../pidgin/gtkconv.c:2791
+msgstr "S_tuur lêer..."
+
+#: ../pidgin/gtkconv.c:2817
 msgid "/Conversation/Add Buddy _Pounce..."
-msgstr "/Gesprek/Voeg vriend_wag by..."
-
-#: ../pidgin/gtkconv.c:2793
+msgstr "Voeg vriend_wag by..."
+
+#: ../pidgin/gtkconv.c:2819
 msgid "/Conversation/_Get Info"
-msgstr "/Gesprek/_Kry inligting"
-
-#: ../pidgin/gtkconv.c:2795
+msgstr "_Kry inligting"
+
+#: ../pidgin/gtkconv.c:2821
 msgid "/Conversation/In_vite..."
-msgstr "/Gesprek/_Nooi uit..."
-
-#: ../pidgin/gtkconv.c:2797
+msgstr "_Nooi uit..."
+
+#: ../pidgin/gtkconv.c:2823
 msgid "/Conversation/M_ore"
-msgstr "/Gesprek/_Meer"
-
-#: ../pidgin/gtkconv.c:2801
+msgstr "_Meer"
+
+#: ../pidgin/gtkconv.c:2827
 msgid "/Conversation/Al_ias..."
-msgstr "/Gesprek/_Alias..."
-
-#: ../pidgin/gtkconv.c:2803
+msgstr "_Alias..."
+
+#: ../pidgin/gtkconv.c:2829
 msgid "/Conversation/_Block..."
 msgstr "_Blokkeer..."
 
-#: ../pidgin/gtkconv.c:2805
+#: ../pidgin/gtkconv.c:2831
 msgid "/Conversation/_Unblock..."
-msgstr ""
-
-#: ../pidgin/gtkconv.c:2807
+msgstr "_Ontblokkeer..."
+
+#: ../pidgin/gtkconv.c:2833
 msgid "/Conversation/_Add..."
-msgstr "/Gesprek/_Voeg by..."
-
-#: ../pidgin/gtkconv.c:2809
+msgstr "_Voeg by..."
+
+#: ../pidgin/gtkconv.c:2835
 msgid "/Conversation/_Remove..."
-msgstr "/Gesprek/Ve_rwyder..."
-
-#: ../pidgin/gtkconv.c:2814
+msgstr "Ve_rwyder..."
+
+#: ../pidgin/gtkconv.c:2840
+msgid "/Conversation/Insert Lin_k..."
+msgstr "Voeg s_kakel in..."
+
+#: ../pidgin/gtkconv.c:2842
+msgid "/Conversation/Insert Imag_e..."
+msgstr "Voeg pr_entjie in..."
+
+#: ../pidgin/gtkconv.c:2848
 msgid "/Conversation/_Close"
-msgstr "/Gesprek/Slui_t"
+msgstr "Slui_t"
 
 #. Options
-#: ../pidgin/gtkconv.c:2818
+#: ../pidgin/gtkconv.c:2852
 msgid "/_Options"
-msgstr "/_Keuses"
-
-#: ../pidgin/gtkconv.c:2819
+msgstr "_Keuses"
+
+#: ../pidgin/gtkconv.c:2853
 msgid "/Options/Enable _Logging"
-msgstr "/Keuses/Aktiveer _boekstawing"
-
-#: ../pidgin/gtkconv.c:2820
+msgstr "Aktiveer _boekstawing"
+
+#: ../pidgin/gtkconv.c:2854
 msgid "/Options/Enable _Sounds"
-msgstr "/Keuses/Aktiveer _klanke"
-
-#: ../pidgin/gtkconv.c:2821
+msgstr "Aktiveer _klanke"
+
+#: ../pidgin/gtkconv.c:2855
 msgid "/Options/Show Buddy _Icon"
 msgstr "Wys vriend_ikoon"
 
-#: ../pidgin/gtkconv.c:2823
+#: ../pidgin/gtkconv.c:2857
 msgid "/Options/Show Formatting _Toolbars"
-msgstr "/Keuses/Wys _formatteringgereedskap"
-
-#: ../pidgin/gtkconv.c:2824
+msgstr "Wys _formateringgereedskap"
+
+#: ../pidgin/gtkconv.c:2858
 msgid "/Options/Show Ti_mestamps"
-msgstr "/Keuses/Wys _tydstempels"
-
-#: ../pidgin/gtkconv.c:2899
+msgstr "Wys _tydstempels"
+
+#: ../pidgin/gtkconv.c:3003
 msgid "/Conversation/More"
-msgstr "/Gesprek/Meer"
+msgstr "Meer"
+
+#: ../pidgin/gtkconv.c:3059
+msgid "/Options"
+msgstr "Keuses"
 
 #. The menubar has been deactivated. Make sure the 'More' submenu is regenerated next time
 #. * the 'Conversation' menu pops up.
 #. Make sure the 'Conversation -> More' menuitems are regenerated whenever
 #. * the 'Conversation' menu pops up because the entries can change after the
 #. * conversation is created.
-#: ../pidgin/gtkconv.c:2944 ../pidgin/gtkconv.c:2976
+#: ../pidgin/gtkconv.c:3094 ../pidgin/gtkconv.c:3126
 msgid "/Conversation"
-msgstr "/Gesprek"
-
-#: ../pidgin/gtkconv.c:2984
+msgstr "Gesprek"
+
+#: ../pidgin/gtkconv.c:3134
 msgid "/Conversation/View Log"
-msgstr "/Gesprek/Bekyk staaflêer"
-
-#: ../pidgin/gtkconv.c:2990
+msgstr "Bekyk staaflêer"
+
+#: ../pidgin/gtkconv.c:3140
 msgid "/Conversation/Send File..."
-msgstr "/Gesprek/Stuur lêer..."
-
-#: ../pidgin/gtkconv.c:2994
+msgstr "Stuur lêer..."
+
+#: ../pidgin/gtkconv.c:3144
 msgid "/Conversation/Add Buddy Pounce..."
-msgstr "/Gesprek/Voeg vriendwag by..."
-
-#: ../pidgin/gtkconv.c:3000
+msgstr "Voeg vriendwag by..."
+
+#: ../pidgin/gtkconv.c:3150
 msgid "/Conversation/Get Info"
-msgstr "/Gesprek/Kry inligting"
-
-#: ../pidgin/gtkconv.c:3004
+msgstr "Kry inligting"
+
+#: ../pidgin/gtkconv.c:3154
 msgid "/Conversation/Invite..."
-msgstr "/Gesprek/Nooi uit..."
-
-#: ../pidgin/gtkconv.c:3010
+msgstr "Nooi uit..."
+
+#: ../pidgin/gtkconv.c:3160
 msgid "/Conversation/Alias..."
-msgstr "/Gesprek/Alias..."
-
-#: ../pidgin/gtkconv.c:3014
+msgstr "Alias..."
+
+#: ../pidgin/gtkconv.c:3164
 msgid "/Conversation/Block..."
-msgstr "/Gesprek/Blokkeer..."
-
-#: ../pidgin/gtkconv.c:3018
+msgstr "Blokkeer..."
+
+#: ../pidgin/gtkconv.c:3168
 msgid "/Conversation/Unblock..."
-msgstr ""
-
-#: ../pidgin/gtkconv.c:3022
+msgstr "Ontblokkeer..."
+
+#: ../pidgin/gtkconv.c:3172
 msgid "/Conversation/Add..."
-msgstr "/Gesprek/Voeg by..."
-
-#: ../pidgin/gtkconv.c:3026
+msgstr "Voeg by..."
+
+#: ../pidgin/gtkconv.c:3176
 msgid "/Conversation/Remove..."
-msgstr "/Gesprek/Verwyder..."
-
-#: ../pidgin/gtkconv.c:3030
+msgstr "Verwyder..."
+
+#: ../pidgin/gtkconv.c:3182
+msgid "/Conversation/Insert Link..."
+msgstr "Voeg skakel in..."
+
+#: ../pidgin/gtkconv.c:3186
+msgid "/Conversation/Insert Image..."
+msgstr "Voeg prentjie in..."
+
+#: ../pidgin/gtkconv.c:3192
 msgid "/Options/Enable Logging"
-msgstr "/Keuses/Aktiveer boekstawing"
-
-#: ../pidgin/gtkconv.c:3033
+msgstr "Aktiveer boekstawing"
+
+#: ../pidgin/gtkconv.c:3195
 msgid "/Options/Enable Sounds"
-msgstr "/Keuses/Aktiveer klanke"
-
-#: ../pidgin/gtkconv.c:3046
+msgstr "Aktiveer klanke"
+
+#: ../pidgin/gtkconv.c:3208
 msgid "/Options/Show Formatting Toolbars"
-msgstr "/Keuses/Wys formatteringgereedskap"
-
-#: ../pidgin/gtkconv.c:3049
+msgstr "Wys formateringgereedskap"
+
+#: ../pidgin/gtkconv.c:3211
 msgid "/Options/Show Timestamps"
-msgstr "/Keuses/Wys tydstempels"
-
-#: ../pidgin/gtkconv.c:3052
+msgstr "Wys tydstempels"
+
+#: ../pidgin/gtkconv.c:3214
 msgid "/Options/Show Buddy Icon"
 msgstr "Wys vriendikoon"
 
-#: ../pidgin/gtkconv.c:3136 ../pidgin/gtkconv.c:3173
+#: ../pidgin/gtkconv.c:3298 ../pidgin/gtkconv.c:3340
 msgid "User is typing..."
 msgstr "Gebruiker tik..."
 
-#: ../pidgin/gtkconv.c:3176
+#: ../pidgin/gtkconv.c:3343
 msgid "User has typed something and stopped"
 msgstr "Gebruiker het iets getik en gestop"
 
 #. Build the Send To menu
-#: ../pidgin/gtkconv.c:3358
+#: ../pidgin/gtkconv.c:3526 ../pidgin/gtkconv.c:7817
 msgid "_Send To"
 msgstr "_Stuur na"
 
-#: ../pidgin/gtkconv.c:4065
+#: ../pidgin/gtkconv.c:4239
 msgid "_Send"
 msgstr "_Stuur"
 
 #. Setup the label telling how many people are in the room.
-#: ../pidgin/gtkconv.c:4213
+#: ../pidgin/gtkconv.c:4343
 msgid "0 people in room"
 msgstr "0 mense in die kamer"
 
-#: ../pidgin/gtkconv.c:5303 ../pidgin/gtkconv.c:5424
+#: ../pidgin/gtkconv.c:5611 ../pidgin/gtkconv.c:5732
 #, c-format
 msgid "%d person in room"
 msgid_plural "%d people in room"
 msgstr[0] "%d persoon in kamer"
 msgstr[1] "%d mense in kamer"
 
-#: ../pidgin/gtkconv.c:5980 ../pidgin/gtkstatusbox.c:607
+#: ../pidgin/gtkconv.c:6341 ../pidgin/gtkstatusbox.c:659
 msgid "Typing"
 msgstr "Tik"
 
-#: ../pidgin/gtkconv.c:5986
+#: ../pidgin/gtkconv.c:6345
 msgid "Stopped Typing"
 msgstr "Het opgehou tik"
 
-#: ../pidgin/gtkconv.c:5991
+#: ../pidgin/gtkconv.c:6348
 msgid "Nick Said"
 msgstr "Bynaam genoem"
 
-#: ../pidgin/gtkconv.c:5996 ../pidgin/gtkdocklet.c:500
+#: ../pidgin/gtkconv.c:6351 ../pidgin/gtkdocklet.c:492
 msgid "Unread Messages"
 msgstr "Ongelese boodskappe"
 
-#: ../pidgin/gtkconv.c:6001
+#: ../pidgin/gtkconv.c:6354
 msgid "New Event"
-msgstr ""
-
-#: ../pidgin/gtkconv.c:7122
+msgstr "Nuwe gebeurtenis"
+
+#: ../pidgin/gtkconv.c:7358
+msgid "clear: Clears all conversation scrollbacks."
+msgstr "clear: Maak die gesprekvenster skoon."
+
+#: ../pidgin/gtkconv.c:7522
 msgid "Confirm close"
 msgstr "Bevestig sluiting"
 
-#: ../pidgin/gtkconv.c:7154
+#: ../pidgin/gtkconv.c:7554
 msgid "You have unread messages. Are you sure you want to close the window?"
 msgstr "U het ongelese boodskappe. Wil u definitief die venster toemaak?"
 
-#: ../pidgin/gtkconv.c:7689
+#: ../pidgin/gtkconv.c:8144
 msgid "Close other tabs"
 msgstr "Sluit ander oortjies"
 
-#: ../pidgin/gtkconv.c:7695
+#: ../pidgin/gtkconv.c:8150
 msgid "Close all tabs"
 msgstr "Sluit alle oortjies"
 
-#: ../pidgin/gtkconv.c:7703
+#: ../pidgin/gtkconv.c:8158
 msgid "Detach this tab"
-msgstr "Maak hierdie oortjie los"
-
-#: ../pidgin/gtkconv.c:7709
+msgstr "Ontheg hierdie oortjie"
+
+#: ../pidgin/gtkconv.c:8164
 msgid "Close this tab"
 msgstr "Sluit hierdie oortjie"
 
-#: ../pidgin/gtkconv.c:8012
+#: ../pidgin/gtkconv.c:8650
 msgid "Close conversation"
 msgstr "Sluit gesprek"
 
-#: ../pidgin/gtkconv.c:8476
+#: ../pidgin/gtkconv.c:9250
 msgid "Last created window"
 msgstr "Laas geskepte venster"
 
-#: ../pidgin/gtkconv.c:8478
+#: ../pidgin/gtkconv.c:9252
 msgid "Separate IM and Chat windows"
-msgstr "Aparte gesprek- en geselsvensters"
-
-#: ../pidgin/gtkconv.c:8480 ../pidgin/gtkprefs.c:1303
+msgstr "Aparte kitsboodskap- en geselsievensters"
+
+#: ../pidgin/gtkconv.c:9254 ../pidgin/gtkprefs.c:1412
 msgid "New window"
 msgstr "Nuwe venster"
 
-#: ../pidgin/gtkconv.c:8482
+#: ../pidgin/gtkconv.c:9256
 msgid "By group"
 msgstr "Volgens groep"
 
-#: ../pidgin/gtkconv.c:8484
+#: ../pidgin/gtkconv.c:9258
 msgid "By account"
 msgstr "Volgens rekening"
 
@@ -11952,439 +13092,461 @@
 msgid "Save Debug Log"
 msgstr "Stoor ontfoutstaaflêer"
 
-#: ../pidgin/gtkdebug.c:594
+#: ../pidgin/gtkdebug.c:581
 msgid "Invert"
-msgstr ""
-
-#: ../pidgin/gtkdebug.c:597
+msgstr "Omkeer"
+
+#: ../pidgin/gtkdebug.c:584
 msgid "Highlight matches"
-msgstr ""
-
-#: ../pidgin/gtkdebug.c:664
+msgstr "Merk passings"
+
+#: ../pidgin/gtkdebug.c:651
 msgid "_Icon Only"
-msgstr "Slegs _ikoon"
-
-#: ../pidgin/gtkdebug.c:665
+msgstr "Net _ikoon"
+
+#: ../pidgin/gtkdebug.c:652
 msgid "_Text Only"
-msgstr "Slegs _teks"
-
-#: ../pidgin/gtkdebug.c:666
+msgstr "Net _teks"
+
+#: ../pidgin/gtkdebug.c:653
 msgid "_Both Icon & Text"
 msgstr "_Beide ikoon en teks"
 
-#: ../pidgin/gtkdebug.c:802
+#: ../pidgin/gtkdebug.c:774
 msgid "Filter"
-msgstr ""
-
-#: ../pidgin/gtkdebug.c:821
+msgstr "Filter"
+
+#: ../pidgin/gtkdebug.c:793
 msgid "Right click for more options."
 msgstr "Klik regs vir meer keuses."
 
-#: ../pidgin/gtkdebug.c:851
+#: ../pidgin/gtkdebug.c:823
 msgid "Level "
 msgstr "Vlak "
 
-#: ../pidgin/gtkdebug.c:852 ../pidgin/gtkdebug.c:858
+#: ../pidgin/gtkdebug.c:824 ../pidgin/gtkdebug.c:830
 msgid "Select the debug filter level."
-msgstr ""
-
-#: ../pidgin/gtkdebug.c:860
+msgstr "Kies die ontfoutfiltervlak."
+
+#: ../pidgin/gtkdebug.c:832
 msgid "All"
 msgstr "Almal"
 
-#: ../pidgin/gtkdebug.c:861
+#: ../pidgin/gtkdebug.c:833
 msgid "Misc"
 msgstr "Allerlei"
 
-#: ../pidgin/gtkdebug.c:863
+#: ../pidgin/gtkdebug.c:835
 msgid "Warning"
 msgstr "Waarskuwing"
 
-#: ../pidgin/gtkdebug.c:864
+#: ../pidgin/gtkdebug.c:836
 msgid "Error "
 msgstr "Fout "
 
-#: ../pidgin/gtkdebug.c:865
+#: ../pidgin/gtkdebug.c:837
 msgid "Fatal Error"
 msgstr "Fatale fout"
 
-#: ../pidgin/gtkdialogs.c:71 ../pidgin/gtkdialogs.c:115
+#: ../pidgin/gtkdialogs.c:71 ../pidgin/gtkdialogs.c:113
 msgid "lead developer"
 msgstr "hoofprogrammeerder"
 
 #: ../pidgin/gtkdialogs.c:72 ../pidgin/gtkdialogs.c:73
 #: ../pidgin/gtkdialogs.c:74 ../pidgin/gtkdialogs.c:75
-#: ../pidgin/gtkdialogs.c:76 ../pidgin/gtkdialogs.c:78
-#: ../pidgin/gtkdialogs.c:79 ../pidgin/gtkdialogs.c:80
-#: ../pidgin/gtkdialogs.c:81 ../pidgin/gtkdialogs.c:82
-#: ../pidgin/gtkdialogs.c:83 ../pidgin/gtkdialogs.c:86
-#: ../pidgin/gtkdialogs.c:87 ../pidgin/gtkdialogs.c:88
+#: ../pidgin/gtkdialogs.c:76 ../pidgin/gtkdialogs.c:77
+#: ../pidgin/gtkdialogs.c:78 ../pidgin/gtkdialogs.c:79
+#: ../pidgin/gtkdialogs.c:80 ../pidgin/gtkdialogs.c:81
+#: ../pidgin/gtkdialogs.c:82 ../pidgin/gtkdialogs.c:83
+#: ../pidgin/gtkdialogs.c:84 ../pidgin/gtkdialogs.c:85
+#: ../pidgin/gtkdialogs.c:88 ../pidgin/gtkdialogs.c:89
+#: ../pidgin/gtkdialogs.c:90
 msgid "developer"
 msgstr "programmeerder"
 
-#: ../pidgin/gtkdialogs.c:77
-msgid "developer & webmaster"
-msgstr "programmeerder en webmeester"
-
-#: ../pidgin/gtkdialogs.c:84
+#: ../pidgin/gtkdialogs.c:86
 msgid "support"
 msgstr "ondersteuning"
 
-#: ../pidgin/gtkdialogs.c:85
+#: ../pidgin/gtkdialogs.c:87
 msgid "support/QA"
-msgstr ""
-
-#: ../pidgin/gtkdialogs.c:107
+msgstr "ondersteuning/V-en-A"
+
+#: ../pidgin/gtkdialogs.c:104
 msgid "win32 port"
 msgstr "win32-weergawe"
 
-#: ../pidgin/gtkdialogs.c:108 ../pidgin/gtkdialogs.c:109
+#: ../pidgin/gtkdialogs.c:105 ../pidgin/gtkdialogs.c:106
 msgid "maintainer"
 msgstr "onderhouer"
 
-#: ../pidgin/gtkdialogs.c:110
+#: ../pidgin/gtkdialogs.c:107
 msgid "libfaim maintainer"
 msgstr "libfaim-onderhouer"
 
+#: ../pidgin/gtkdialogs.c:108
+msgid "developer & webmaster"
+msgstr "programmeerder en webmeester"
+
 #. If "lazy bum" translates literally into a serious insult, use something else or omit it.
-#: ../pidgin/gtkdialogs.c:112
+#: ../pidgin/gtkdialogs.c:110
 msgid "hacker and designated driver [lazy bum]"
-msgstr ""
-
-#: ../pidgin/gtkdialogs.c:113
-msgid "Jabber developer"
-msgstr "Jabber-programmeerder"
-
-#: ../pidgin/gtkdialogs.c:114
+msgstr "kapper en geheelonthouer [luie lak]"
+
+#: ../pidgin/gtkdialogs.c:111
+msgid "XMPP developer"
+msgstr "XMPP-ontwikkelaar"
+
+#: ../pidgin/gtkdialogs.c:112
 msgid "original author"
 msgstr "oorspronklike outeur"
 
-#: ../pidgin/gtkdialogs.c:121
+#: ../pidgin/gtkdialogs.c:128
 msgid "Afrikaans"
 msgstr "Afrikaans"
 
-#: ../pidgin/gtkdialogs.c:122
+#: ../pidgin/gtkdialogs.c:129
 msgid "Arabic"
 msgstr "Arabies"
 
-#: ../pidgin/gtkdialogs.c:123 ../pidgin/gtkdialogs.c:124
-#: ../pidgin/gtkdialogs.c:205
+#: ../pidgin/gtkdialogs.c:130 ../pidgin/gtkdialogs.c:131
+#: ../pidgin/gtkdialogs.c:218
 msgid "Bulgarian"
 msgstr "Bulgaars"
 
-#: ../pidgin/gtkdialogs.c:125 ../pidgin/gtkdialogs.c:126
-#: ../pidgin/gtkdialogs.c:127 ../pidgin/gtkdialogs.c:128
+#: ../pidgin/gtkdialogs.c:132 ../pidgin/gtkdialogs.c:133
+#: ../pidgin/gtkdialogs.c:134 ../pidgin/gtkdialogs.c:135
 msgid "Bengali"
 msgstr "Bengaals"
 
-#: ../pidgin/gtkdialogs.c:129
+#: ../pidgin/gtkdialogs.c:136
 msgid "Bosnian"
 msgstr "Bosnies"
 
-#: ../pidgin/gtkdialogs.c:130 ../pidgin/gtkdialogs.c:206
-#: ../pidgin/gtkdialogs.c:207
+#: ../pidgin/gtkdialogs.c:137 ../pidgin/gtkdialogs.c:219
+#: ../pidgin/gtkdialogs.c:220
 msgid "Catalan"
 msgstr "Katalaans"
 
-#: ../pidgin/gtkdialogs.c:131 ../pidgin/gtkdialogs.c:132
+#: ../pidgin/gtkdialogs.c:138 ../pidgin/gtkdialogs.c:139
 msgid "Valencian-Catalan"
 msgstr "Valensiese Katalaans"
 
-#: ../pidgin/gtkdialogs.c:133 ../pidgin/gtkdialogs.c:208
+#: ../pidgin/gtkdialogs.c:140 ../pidgin/gtkdialogs.c:221
 msgid "Czech"
 msgstr "Tsjeggies"
 
-#: ../pidgin/gtkdialogs.c:134 ../pidgin/gtkdialogs.c:135
+#: ../pidgin/gtkdialogs.c:141 ../pidgin/gtkdialogs.c:142
 msgid "Danish"
 msgstr "Deens"
 
-#: ../pidgin/gtkdialogs.c:136 ../pidgin/gtkdialogs.c:137
-#: ../pidgin/gtkdialogs.c:209
+#: ../pidgin/gtkdialogs.c:143 ../pidgin/gtkdialogs.c:144
+#: ../pidgin/gtkdialogs.c:222
 msgid "German"
 msgstr "Duits"
 
-#: ../pidgin/gtkdialogs.c:138 ../pidgin/gtkdialogs.c:139
-#: ../pidgin/gtkdialogs.c:140
+#: ../pidgin/gtkdialogs.c:145 ../pidgin/gtkdialogs.c:146
+#: ../pidgin/gtkdialogs.c:147
 msgid "Dzongkha"
 msgstr "Dzongkha"
 
-#: ../pidgin/gtkdialogs.c:141 ../pidgin/gtkdialogs.c:142
+#: ../pidgin/gtkdialogs.c:148 ../pidgin/gtkdialogs.c:149
 msgid "Greek"
 msgstr "Grieks"
 
-#: ../pidgin/gtkdialogs.c:143
+#: ../pidgin/gtkdialogs.c:150
 msgid "Australian English"
 msgstr "Australiaanse Engels"
 
-#: ../pidgin/gtkdialogs.c:144
+#: ../pidgin/gtkdialogs.c:151
 msgid "Canadian English"
 msgstr "Kanadese Engels"
 
-#: ../pidgin/gtkdialogs.c:145
+#: ../pidgin/gtkdialogs.c:152
 msgid "British English"
 msgstr "Britse Engels"
 
-#: ../pidgin/gtkdialogs.c:146
+#: ../pidgin/gtkdialogs.c:153
 msgid "Esperanto"
 msgstr "Esperanto"
 
-#: ../pidgin/gtkdialogs.c:147 ../pidgin/gtkdialogs.c:210
-#: ../pidgin/gtkdialogs.c:211 ../pidgin/gtkdialogs.c:212
-#: ../pidgin/gtkdialogs.c:213
+#: ../pidgin/gtkdialogs.c:154 ../pidgin/gtkdialogs.c:223
+#: ../pidgin/gtkdialogs.c:224 ../pidgin/gtkdialogs.c:225
+#: ../pidgin/gtkdialogs.c:226
 msgid "Spanish"
 msgstr "Spaans"
 
-#: ../pidgin/gtkdialogs.c:148 ../pidgin/gtkdialogs.c:149
+#: ../pidgin/gtkdialogs.c:155 ../pidgin/gtkdialogs.c:156
 msgid "Euskera(Basque)"
-msgstr "Baskies"
-
-#: ../pidgin/gtkdialogs.c:150 ../pidgin/gtkdialogs.c:151
-#: ../pidgin/gtkdialogs.c:152
+msgstr "Euskera(Baskies)"
+
+#: ../pidgin/gtkdialogs.c:157 ../pidgin/gtkdialogs.c:158
+#: ../pidgin/gtkdialogs.c:159
 msgid "Persian"
 msgstr "Persies"
 
-#: ../pidgin/gtkdialogs.c:153 ../pidgin/gtkdialogs.c:214
-#: ../pidgin/gtkdialogs.c:215
+#: ../pidgin/gtkdialogs.c:160 ../pidgin/gtkdialogs.c:227
+#: ../pidgin/gtkdialogs.c:228
 msgid "Finnish"
 msgstr "Fins"
 
-#: ../pidgin/gtkdialogs.c:154 ../pidgin/gtkdialogs.c:216
-#: ../pidgin/gtkdialogs.c:217 ../pidgin/gtkdialogs.c:218
-#: ../pidgin/gtkdialogs.c:219
+#: ../pidgin/gtkdialogs.c:161 ../pidgin/gtkdialogs.c:229
+#: ../pidgin/gtkdialogs.c:230 ../pidgin/gtkdialogs.c:231
+#: ../pidgin/gtkdialogs.c:232
 msgid "French"
 msgstr "Frans"
 
-#: ../pidgin/gtkdialogs.c:155
+#: ../pidgin/gtkdialogs.c:162 ../pidgin/gtkdialogs.c:163
 msgid "Galician"
 msgstr "Galisies"
 
-#: ../pidgin/gtkdialogs.c:156 ../pidgin/gtkdialogs.c:157
+#: ../pidgin/gtkdialogs.c:164 ../pidgin/gtkdialogs.c:165
 msgid "Gujarati"
 msgstr "Gujaraties"
 
-#: ../pidgin/gtkdialogs.c:158 ../pidgin/gtkdialogs.c:220
+#: ../pidgin/gtkdialogs.c:165
+msgid "Gujarati Language Team"
+msgstr "Goedjarati-taalspan"
+
+#: ../pidgin/gtkdialogs.c:166 ../pidgin/gtkdialogs.c:233
 msgid "Hebrew"
 msgstr "Hebreeus"
 
-#: ../pidgin/gtkdialogs.c:159
+#: ../pidgin/gtkdialogs.c:167
 msgid "Hindi"
 msgstr "Hindi"
 
-#: ../pidgin/gtkdialogs.c:160
+#: ../pidgin/gtkdialogs.c:168
 msgid "Hungarian"
 msgstr "Hongaars"
 
-#: ../pidgin/gtkdialogs.c:161
+#: ../pidgin/gtkdialogs.c:169
 msgid "Indonesian"
 msgstr "Indonesies"
 
-#: ../pidgin/gtkdialogs.c:162 ../pidgin/gtkdialogs.c:221
+#: ../pidgin/gtkdialogs.c:170 ../pidgin/gtkdialogs.c:234
 msgid "Italian"
 msgstr "Italiaans"
 
-#: ../pidgin/gtkdialogs.c:163 ../pidgin/gtkdialogs.c:222
-#: ../pidgin/gtkdialogs.c:223 ../pidgin/gtkdialogs.c:224
+#: ../pidgin/gtkdialogs.c:171 ../pidgin/gtkdialogs.c:235
+#: ../pidgin/gtkdialogs.c:236 ../pidgin/gtkdialogs.c:237
 msgid "Japanese"
 msgstr "Japannees"
 
-#: ../pidgin/gtkdialogs.c:164 ../pidgin/gtkdialogs.c:225
+#: ../pidgin/gtkdialogs.c:172 ../pidgin/gtkdialogs.c:238
 msgid "Georgian"
 msgstr "Georgies"
 
-#: ../pidgin/gtkdialogs.c:165
+#: ../pidgin/gtkdialogs.c:172
+msgid "Ubuntu Georgian Translators"
+msgstr "Ubuntu- Georgiese vertalers"
+
+#: ../pidgin/gtkdialogs.c:173
 msgid "Kannada"
 msgstr "Kannada"
 
-#: ../pidgin/gtkdialogs.c:166 ../pidgin/gtkdialogs.c:226
+#: ../pidgin/gtkdialogs.c:173
+msgid "Kannada Translation team"
+msgstr "Kannada-vertaalspan"
+
+#: ../pidgin/gtkdialogs.c:174 ../pidgin/gtkdialogs.c:239
+#: ../pidgin/gtkdialogs.c:240
 msgid "Korean"
 msgstr "Koreaans"
 
-#: ../pidgin/gtkdialogs.c:167 ../pidgin/gtkdialogs.c:168
-#: ../pidgin/gtkdialogs.c:169
+#: ../pidgin/gtkdialogs.c:175 ../pidgin/gtkdialogs.c:176
+#: ../pidgin/gtkdialogs.c:177
 msgid "Kurdish"
 msgstr "Koerdies"
 
-#: ../pidgin/gtkdialogs.c:170 ../pidgin/gtkdialogs.c:227
-#: ../pidgin/gtkdialogs.c:228
+#: ../pidgin/gtkdialogs.c:178 ../pidgin/gtkdialogs.c:241
+#: ../pidgin/gtkdialogs.c:242
 msgid "Lithuanian"
 msgstr "Litous"
 
-#: ../pidgin/gtkdialogs.c:171
+#: ../pidgin/gtkdialogs.c:179 ../pidgin/gtkdialogs.c:180
+#: ../pidgin/gtkdialogs.c:243
 msgid "Macedonian"
 msgstr "Masedonies"
 
-#: ../pidgin/gtkdialogs.c:172
+#: ../pidgin/gtkdialogs.c:181
 msgid "Bokmål Norwegian"
 msgstr "Bokmål-Noorweegs"
 
-#: ../pidgin/gtkdialogs.c:173
+#: ../pidgin/gtkdialogs.c:182
 msgid "Nepali"
 msgstr "Nepalees"
 
-#: ../pidgin/gtkdialogs.c:174
+#: ../pidgin/gtkdialogs.c:183
 msgid "Dutch, Flemish"
 msgstr "Nederlands, Flaams"
 
-#: ../pidgin/gtkdialogs.c:175
+#: ../pidgin/gtkdialogs.c:184
 msgid "Norwegian"
 msgstr "Noorweegs"
 
-#: ../pidgin/gtkdialogs.c:176 ../pidgin/gtkdialogs.c:177
-#: ../pidgin/gtkdialogs.c:178 ../pidgin/gtkdialogs.c:229
+#: ../pidgin/gtkdialogs.c:185
+msgid "Norwegian Nynorsk"
+msgstr "Noorweegse Nynorsk"
+
+#: ../pidgin/gtkdialogs.c:186 ../pidgin/gtkdialogs.c:187
+#: ../pidgin/gtkdialogs.c:188 ../pidgin/gtkdialogs.c:244
 msgid "Polish"
 msgstr "Pools"
 
-#: ../pidgin/gtkdialogs.c:179
+#: ../pidgin/gtkdialogs.c:189
 msgid "Portuguese"
 msgstr "Portugees"
 
-#: ../pidgin/gtkdialogs.c:180
+#: ../pidgin/gtkdialogs.c:190
 msgid "Portuguese-Brazil"
 msgstr "Portugees-Brasilië"
 
-#: ../pidgin/gtkdialogs.c:181
+#: ../pidgin/gtkdialogs.c:191
 msgid "Pashto"
 msgstr "Pasjtoe"
 
-#: ../pidgin/gtkdialogs.c:182
+#: ../pidgin/gtkdialogs.c:192
 msgid "Romanian"
 msgstr "Romeens"
 
-#: ../pidgin/gtkdialogs.c:183 ../pidgin/gtkdialogs.c:230
-#: ../pidgin/gtkdialogs.c:231
+#: ../pidgin/gtkdialogs.c:193 ../pidgin/gtkdialogs.c:245
+#: ../pidgin/gtkdialogs.c:246
 msgid "Russian"
 msgstr "Russies"
 
-#: ../pidgin/gtkdialogs.c:184 ../pidgin/gtkdialogs.c:232
-#: ../pidgin/gtkdialogs.c:233 ../pidgin/gtkdialogs.c:234
+#: ../pidgin/gtkdialogs.c:194 ../pidgin/gtkdialogs.c:195
+#: ../pidgin/gtkdialogs.c:247 ../pidgin/gtkdialogs.c:248
+#: ../pidgin/gtkdialogs.c:249
 msgid "Slovak"
 msgstr "Slowaaks"
 
-#: ../pidgin/gtkdialogs.c:185
-msgid "Slovack"
-msgstr "Slowaaks"
-
-#: ../pidgin/gtkdialogs.c:186 ../pidgin/gtkdialogs.c:235
+#: ../pidgin/gtkdialogs.c:196 ../pidgin/gtkdialogs.c:250
 msgid "Slovenian"
 msgstr "Sloweens"
 
-#: ../pidgin/gtkdialogs.c:187
+#: ../pidgin/gtkdialogs.c:197
 msgid "Albanian"
 msgstr "Albanees"
 
-#: ../pidgin/gtkdialogs.c:188 ../pidgin/gtkdialogs.c:189
+#: ../pidgin/gtkdialogs.c:198 ../pidgin/gtkdialogs.c:199
 msgid "Serbian"
 msgstr "Serwies"
 
-#: ../pidgin/gtkdialogs.c:190 ../pidgin/gtkdialogs.c:236
+#: ../pidgin/gtkdialogs.c:200 ../pidgin/gtkdialogs.c:251
 msgid "Swedish"
 msgstr "Sweeds"
 
-#: ../pidgin/gtkdialogs.c:191
+#: ../pidgin/gtkdialogs.c:201
 msgid "Tamil"
 msgstr "Tamil"
 
-#: ../pidgin/gtkdialogs.c:192
+#: ../pidgin/gtkdialogs.c:202
 msgid "Telugu"
-msgstr ""
-
-#: ../pidgin/gtkdialogs.c:193
+msgstr "Teloegoe"
+
+#: ../pidgin/gtkdialogs.c:203
 msgid "Thai"
 msgstr "Thai"
 
-#: ../pidgin/gtkdialogs.c:194
+#: ../pidgin/gtkdialogs.c:204 ../pidgin/gtkdialogs.c:252
 msgid "Turkish"
 msgstr "Turks"
 
-#: ../pidgin/gtkdialogs.c:195
+#: ../pidgin/gtkdialogs.c:205
 msgid "Vietnamese"
 msgstr "Viëtnamees"
 
-#: ../pidgin/gtkdialogs.c:195
+#: ../pidgin/gtkdialogs.c:205
 msgid "T.M.Thanh and the Gnome-Vi Team"
 msgstr "T.M.Thanh en die Gnome-Vi-span"
 
-#: ../pidgin/gtkdialogs.c:196 ../pidgin/gtkdialogs.c:237
+#: ../pidgin/gtkdialogs.c:206 ../pidgin/gtkdialogs.c:253
 msgid "Simplified Chinese"
 msgstr "Vereenvoudigde Sjinees"
 
-#: ../pidgin/gtkdialogs.c:197 ../pidgin/gtkdialogs.c:198
-#: ../pidgin/gtkdialogs.c:238
+#: ../pidgin/gtkdialogs.c:207 ../pidgin/gtkdialogs.c:208
+#: ../pidgin/gtkdialogs.c:209
+msgid "Hong Kong Chinese"
+msgstr "Hongkongse Sjinees"
+
+#: ../pidgin/gtkdialogs.c:210 ../pidgin/gtkdialogs.c:211
+#: ../pidgin/gtkdialogs.c:254
 msgid "Traditional Chinese"
 msgstr "Tradisionele Sjinees"
 
-#: ../pidgin/gtkdialogs.c:204
+#: ../pidgin/gtkdialogs.c:217
 msgid "Amharic"
 msgstr "Amharies"
 
-#: ../pidgin/gtkdialogs.c:323
+#: ../pidgin/gtkdialogs.c:339
 #, c-format
 msgid "About %s"
 msgstr "Omtrent %s"
 
-#: ../pidgin/gtkdialogs.c:359
-#, c-format
-msgid ""
-"%s is a modular messaging client capable of using AIM, MSN, Yahoo!, Jabber, "
-"ICQ, IRC, SILC, SIP/SIMPLE, Novell GroupWise, Lotus Sametime, Bonjour, "
-"Zephyr, Gadu-Gadu, and QQ all at once.  It is written using GTK+.<BR><BR>You "
-"may modify and redistribute the program under the terms of the GPL (version "
-"2 or later).  A copy of the GPL is contained in the 'COPYING' file "
-"distributed with %s.  %s is copyrighted by its contributors.  See the "
-"'COPYRIGHT' file for the complete list of contributors.  We provide no "
-"warranty for this program.<BR><BR>"
-msgstr ""
-"%s is 'n modulêre geselskliënt wat AIM, MSN, Yahoo!, Jabber, ICQ, IRC, "
-"SILC, SIP/SIMPLENovell GroupWise, Lotus Sametime, Bonjour, Zephyr, Gadu-"
-"Gadu, en QQ als gelyktydig kan gebruik.  Dit is geskryf met GTK+.<BR><BR>U "
-"mag die program aanpas en herversprei onderhewig aan die voorwaardes van die "
-"GPL (weergawe 2 of later).  'n Kopie van die GPL is bevat in die lêer "
-"'COPYING' wat saam met %s versprei word.  Die kopiereg van %s berus by "
-"sy bydraers.  Sien die lêer 'COPYRIGHT' vir die lys van bydraers.  Ons "
-"verskaf geen waarborg vir hierdie program nie.<BR><BR>"
-
-#: ../pidgin/gtkdialogs.c:374
-#, fuzzy
-msgid "<FONT SIZE=\"4\">IRC:</FONT> #pidgin-win32 on irc.freenode.net<BR><BR>"
-msgstr "<FONT SIZE=\"4\">IRC:</FONT> #wingaim op irc.freenode.net<BR><BR>"
-
 #: ../pidgin/gtkdialogs.c:377
+#, 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 is 'n grafiese modulêre geselskliënt wat op libpurple gebaseer is, wat "
+"aan AIM, MSN, Yahoo!, XMPP, ICQ, IRC, SILC, SIP/SIMPLE, Novell GroupWise, "
+"Lotus Sametime, Bonjour, Zephyr, Gadu-Gadu, en QQ als gelyktydig kan "
+"verbind. Dit is geskryf met GTK+.<BR><BR>U mag die program wysig en "
+"herversprei onderhewig aan die bepalings van die GPL (weergawe 2 of later).  "
+"'n Afskrif van die GPL word vervat in die lêer 'COPYING' wat saam met %s "
+"versprei word. Die kopiereg van %s berus by sy bydraers. Sien die lêer "
+"'COPYRIGHT' vir die lys bydraers. Ons verskaf geen waarborg vir hierdie "
+"program nie.<BR><BR>"
+
+#: ../pidgin/gtkdialogs.c:392
 msgid "<FONT SIZE=\"4\">IRC:</FONT> #pidgin on irc.freenode.net<BR><BR>"
 msgstr "<FONT SIZE=\"4\">IRC:</FONT> #pidgin op irc.freenode.net<BR><BR>"
 
-#: ../pidgin/gtkdialogs.c:383
+#: ../pidgin/gtkdialogs.c:397
 msgid "Current Developers"
 msgstr "Huidige programmeerders"
 
-#: ../pidgin/gtkdialogs.c:398
+#: ../pidgin/gtkdialogs.c:412
 msgid "Crazy Patch Writers"
-msgstr ""
-
-#: ../pidgin/gtkdialogs.c:413
+msgstr "Malle lapverwers"
+
+#: ../pidgin/gtkdialogs.c:427
 msgid "Retired Developers"
 msgstr "Afgetrede programmeerders"
 
-#: ../pidgin/gtkdialogs.c:428
+#: ../pidgin/gtkdialogs.c:442
+msgid "Retired Crazy Patch Writers"
+msgstr "Afgetrede malle lapverwers"
+
+#: ../pidgin/gtkdialogs.c:457
 msgid "Artists"
-msgstr ""
-
-#: ../pidgin/gtkdialogs.c:443
+msgstr "Kunstenaars"
+
+#: ../pidgin/gtkdialogs.c:472
 msgid "Current Translators"
 msgstr "Huidige vertalers"
 
-#: ../pidgin/gtkdialogs.c:463
+#: ../pidgin/gtkdialogs.c:492
 msgid "Past Translators"
 msgstr "Vorige vertalers"
 
-#: ../pidgin/gtkdialogs.c:481
+#: ../pidgin/gtkdialogs.c:510
 msgid "Debugging Information"
 msgstr "Ontfoutinligting"
 
-#: ../pidgin/gtkdialogs.c:855
+#: ../pidgin/gtkdialogs.c:879
 msgid "Get User Info"
 msgstr "Kry gebruikerinligting"
 
-#: ../pidgin/gtkdialogs.c:857
+#: ../pidgin/gtkdialogs.c:881
 msgid ""
 "Please enter the screen name or alias of the person whose info you would "
 "like to view."
@@ -12392,11 +13554,11 @@
 "Gee asb. die skermnaam of die alias van die persoon wie se inligting u wil "
 "sien."
 
-#: ../pidgin/gtkdialogs.c:946
+#: ../pidgin/gtkdialogs.c:971
 msgid "View User Log"
 msgstr "Bekyk gebruikerstaaflêer"
 
-#: ../pidgin/gtkdialogs.c:948
+#: ../pidgin/gtkdialogs.c:973
 msgid ""
 "Please enter the screen name or alias of the person whose log you would like "
 "to view."
@@ -12404,32 +13566,32 @@
 "Gee asb. die skermnaam of die alias van die persoon wie se staaflêer u wil "
 "sien."
 
-#: ../pidgin/gtkdialogs.c:967
+#: ../pidgin/gtkdialogs.c:993
 msgid "Alias Contact"
 msgstr "Aliaskontak"
 
-#: ../pidgin/gtkdialogs.c:968
+#: ../pidgin/gtkdialogs.c:994
 msgid "Enter an alias for this contact."
 msgstr "Gee 'n alias vir hierdie kontak."
 
-#: ../pidgin/gtkdialogs.c:988
+#: ../pidgin/gtkdialogs.c:1016
 #, c-format
 msgid "Enter an alias for %s."
 msgstr "Gee 'n alias vir %s."
 
-#: ../pidgin/gtkdialogs.c:990
+#: ../pidgin/gtkdialogs.c:1018
 msgid "Alias Buddy"
 msgstr "Aliasvriend"
 
-#: ../pidgin/gtkdialogs.c:1009
+#: ../pidgin/gtkdialogs.c:1039
 msgid "Alias Chat"
 msgstr "Aliasgeselsie"
 
-#: ../pidgin/gtkdialogs.c:1010
+#: ../pidgin/gtkdialogs.c:1040
 msgid "Enter an alias for this chat."
 msgstr "Gee 'n alias vir hierdie geselsie."
 
-#: ../pidgin/gtkdialogs.c:1047
+#: ../pidgin/gtkdialogs.c:1079
 #, c-format
 msgid ""
 "You are about to remove the contact containing %s and %d other buddy from "
@@ -12444,15 +13606,15 @@
 "U staan op die punt om die kontak wat %s en %d ander vriende bevat, uit die "
 "vriendelys te verwyder.  Wil u voortgaan?"
 
-#: ../pidgin/gtkdialogs.c:1055
+#: ../pidgin/gtkdialogs.c:1087
 msgid "Remove Contact"
 msgstr "Verwyder kontak"
 
-#: ../pidgin/gtkdialogs.c:1056
+#: ../pidgin/gtkdialogs.c:1090
 msgid "_Remove Contact"
 msgstr "_Verwyder kontak"
 
-#: ../pidgin/gtkdialogs.c:1086
+#: ../pidgin/gtkdialogs.c:1121
 #, c-format
 msgid ""
 "You are about to merge the group called %s into the group called %s. Do you "
@@ -12461,15 +13623,15 @@
 "U staan op die punt om die groep genaamd %s in die groep genaamd %s te "
 "smeld. Wil u voortgaan?"
 
-#: ../pidgin/gtkdialogs.c:1093
+#: ../pidgin/gtkdialogs.c:1128
 msgid "Merge Groups"
 msgstr "Versmeld groepe"
 
-#: ../pidgin/gtkdialogs.c:1094
+#: ../pidgin/gtkdialogs.c:1131
 msgid "_Merge Groups"
 msgstr "_Versmeld groepe"
 
-#: ../pidgin/gtkdialogs.c:1144
+#: ../pidgin/gtkdialogs.c:1181
 #, c-format
 msgid ""
 "You are about to remove the group %s and all its members from your buddy "
@@ -12478,30 +13640,30 @@
 "U staan op die punt om die groep %s en al sy lede uit die vriendelys te "
 "verwyder.  Wil u voortgaan?"
 
-#: ../pidgin/gtkdialogs.c:1147
+#: ../pidgin/gtkdialogs.c:1184
 msgid "Remove Group"
 msgstr "Verwyder groep"
 
-#: ../pidgin/gtkdialogs.c:1148
+#: ../pidgin/gtkdialogs.c:1187
 msgid "_Remove Group"
 msgstr "_Verwyder groep"
 
-#: ../pidgin/gtkdialogs.c:1181
+#: ../pidgin/gtkdialogs.c:1220
 #, c-format
 msgid ""
 "You are about to remove %s from your buddy list.  Do you want to continue?"
 msgstr ""
 "U staan op die punt om %s uit die vriendelys te verwyder.  Wil u voortgaan?"
 
-#: ../pidgin/gtkdialogs.c:1184
+#: ../pidgin/gtkdialogs.c:1223
 msgid "Remove Buddy"
 msgstr "Verwyder vriend"
 
-#: ../pidgin/gtkdialogs.c:1185
+#: ../pidgin/gtkdialogs.c:1226
 msgid "_Remove Buddy"
 msgstr "_Verwyder vriend"
 
-#: ../pidgin/gtkdialogs.c:1206
+#: ../pidgin/gtkdialogs.c:1247
 #, c-format
 msgid ""
 "You are about to remove the chat %s from your buddy list.  Do you want to "
@@ -12509,11 +13671,11 @@
 msgstr ""
 "U gaan nou die geselsie %s uit die vriendelys verwyder.  Wil u voortgaan?"
 
-#: ../pidgin/gtkdialogs.c:1209
+#: ../pidgin/gtkdialogs.c:1250
 msgid "Remove Chat"
 msgstr "Verwyder geselsie"
 
-#: ../pidgin/gtkdialogs.c:1210
+#: ../pidgin/gtkdialogs.c:1253
 msgid "_Remove Chat"
 msgstr "_Verwyder geselsie"
 
@@ -12521,30 +13683,27 @@
 msgid "Right-click for more unread messages...\n"
 msgstr "Klik regs vir nog ongelese boodskappe...\n"
 
-#: ../pidgin/gtkdocklet.c:443
+#: ../pidgin/gtkdocklet.c:435
 msgid "Change Status"
 msgstr "Verander status"
 
-#: ../pidgin/gtkdocklet.c:495
+#: ../pidgin/gtkdocklet.c:487
 msgid "Show Buddy List"
 msgstr "Wys vriendelys"
 
-#: ../pidgin/gtkdocklet.c:521
+#: ../pidgin/gtkdocklet.c:513
 msgid "New Message..."
 msgstr "Nuwe boodskap..."
 
-#: ../pidgin/gtkdocklet.c:536
+#: ../pidgin/gtkdocklet.c:528
 msgid "Mute Sounds"
 msgstr "Demp klanke"
 
-#: ../pidgin/gtkdocklet.c:543
+#: ../pidgin/gtkdocklet.c:535
 msgid "Blink on new message"
 msgstr "Flikker met nuwe boodskap"
 
-#. TODO: need a submenu to change status, this needs to "link"
-#. * to the status in the buddy list gtkstatusbox
-#.
-#: ../pidgin/gtkdocklet.c:554
+#: ../pidgin/gtkdocklet.c:542
 msgid "Quit"
 msgstr "Sluit af"
 
@@ -12570,16 +13729,16 @@
 
 #: ../pidgin/gtkft.c:497
 msgid "There is no application configured to open this type of file."
-msgstr "Daar is geen toepassing opgestel om hierdie lêertipe oop te maak nie."
+msgstr "Daar is geen toepassing opgestel om hierdie lêertipe te open nie."
 
 #: ../pidgin/gtkft.c:502
 msgid "An error occurred while opening the file."
-msgstr "'n Fout het voorgekom met die oopmaak van die lêer."
+msgstr "'n Fout het voorgekom met die open van die lêer."
 
 #: ../pidgin/gtkft.c:539
 #, c-format
 msgid "Error launching %s: %s"
-msgstr ""
+msgstr "Fout met laai van %s: %s"
 
 #: ../pidgin/gtkft.c:548
 #, c-format
@@ -12611,66 +13770,66 @@
 msgid "Time Remaining:"
 msgstr "Oorblywende tyd:"
 
-#: ../pidgin/gtkft.c:786
+#: ../pidgin/gtkft.c:783
 msgid "Close this window when all transfers _finish"
 msgstr "Sluit hierdie venster wanneer alle oordragte _klaar is"
 
-#: ../pidgin/gtkft.c:796
+#: ../pidgin/gtkft.c:793
 msgid "C_lear finished transfers"
 msgstr "_Verwyder afgehandelde oordragte van lys"
 
 #. "Download Details" arrow
-#: ../pidgin/gtkft.c:805
+#: ../pidgin/gtkft.c:802
 msgid "File transfer _details"
 msgstr "_Detail oor lêeroordrag"
 
 #. Pause button
-#: ../pidgin/gtkft.c:835 ../pidgin/pidginstock.c:96
+#: ../pidgin/gtkft.c:832 ../pidgin/pidginstock.c:89
 msgid "_Pause"
 msgstr "_Pouseer"
 
 #. Resume button
-#: ../pidgin/gtkft.c:845
+#: ../pidgin/gtkft.c:842
 msgid "_Resume"
 msgstr "_Hervat"
 
-#: ../pidgin/gtkimhtml.c:793
+#: ../pidgin/gtkimhtml.c:815
 msgid "Paste as Plain _Text"
 msgstr "Plak as gewone _teks"
 
-#: ../pidgin/gtkimhtml.c:810
+#: ../pidgin/gtkimhtml.c:832 ../pidgin/gtkimhtmltoolbar.c:1138
 msgid "_Reset formatting"
-msgstr ""
-
-#: ../pidgin/gtkimhtml.c:1295
+msgstr "_Terugstel van formatering"
+
+#: ../pidgin/gtkimhtml.c:1372
 msgid "Hyperlink color"
 msgstr "Hiperskakelkleur"
 
-#: ../pidgin/gtkimhtml.c:1296
+#: ../pidgin/gtkimhtml.c:1373
 msgid "Color to draw hyperlinks."
 msgstr "Kleur om hiperskakels mee te teken."
 
-#: ../pidgin/gtkimhtml.c:1299
+#: ../pidgin/gtkimhtml.c:1376
 msgid "Hyperlink prelight color"
-msgstr ""
-
-#: ../pidgin/gtkimhtml.c:1300
+msgstr "Hiperskakel-voorafmerkkleur"
+
+#: ../pidgin/gtkimhtml.c:1377
 msgid "Color to draw hyperlinks when mouse is over them."
 msgstr "Kleur om hiperskakels mee te teken as die muis oor hulle is."
 
-#: ../pidgin/gtkimhtml.c:1516
+#: ../pidgin/gtkimhtml.c:1597
 msgid "_Copy E-Mail Address"
 msgstr "_Kopieer e-posadres"
 
-#: ../pidgin/gtkimhtml.c:1528
+#: ../pidgin/gtkimhtml.c:1609
 msgid "_Open Link in Browser"
 msgstr "_Open skakel in blaaier"
 
-#: ../pidgin/gtkimhtml.c:1538
+#: ../pidgin/gtkimhtml.c:1619
 msgid "_Copy Link Location"
 msgstr "_Kopieer skakelligging"
 
-#: ../pidgin/gtkimhtml.c:3271
+#: ../pidgin/gtkimhtml.c:3365
 msgid ""
 "<span size='larger' weight='bold'>Unrecognized file type</span>\n"
 "\n"
@@ -12680,7 +13839,7 @@
 "\n"
 "Val terug na verstek van PNG."
 
-#: ../pidgin/gtkimhtml.c:3274
+#: ../pidgin/gtkimhtml.c:3368
 msgid ""
 "Unrecognized file type\n"
 "\n"
@@ -12690,7 +13849,7 @@
 "\n"
 "Val terug na verstek van PNG."
 
-#: ../pidgin/gtkimhtml.c:3287
+#: ../pidgin/gtkimhtml.c:3397
 #, c-format
 msgid ""
 "<span size='larger' weight='bold'>Error saving image</span>\n"
@@ -12701,7 +13860,7 @@
 "\n"
 "%s"
 
-#: ../pidgin/gtkimhtml.c:3290
+#: ../pidgin/gtkimhtml.c:3400
 #, c-format
 msgid ""
 "Error saving image\n"
@@ -12712,35 +13871,35 @@
 "\n"
 "%s"
 
-#: ../pidgin/gtkimhtml.c:3370 ../pidgin/gtkimhtml.c:3382
+#: ../pidgin/gtkimhtml.c:3478 ../pidgin/gtkimhtml.c:3490
 msgid "Save Image"
 msgstr "Stoor prentjie"
 
-#: ../pidgin/gtkimhtml.c:3410
+#: ../pidgin/gtkimhtml.c:3518
 msgid "_Save Image..."
 msgstr "_Stoor prentjie..."
 
-#: ../pidgin/gtkimhtmltoolbar.c:147
+#: ../pidgin/gtkimhtmltoolbar.c:153
 msgid "Select Font"
 msgstr "Kies skriftipe"
 
-#: ../pidgin/gtkimhtmltoolbar.c:226
+#: ../pidgin/gtkimhtmltoolbar.c:232
 msgid "Select Text Color"
 msgstr "Kies tekskleur"
 
-#: ../pidgin/gtkimhtmltoolbar.c:305
+#: ../pidgin/gtkimhtmltoolbar.c:311
 msgid "Select Background Color"
 msgstr "Kies agtergrondkleur"
 
-#: ../pidgin/gtkimhtmltoolbar.c:394
+#: ../pidgin/gtkimhtmltoolbar.c:400
 msgid "_URL"
 msgstr "_URL"
 
-#: ../pidgin/gtkimhtmltoolbar.c:402
+#: ../pidgin/gtkimhtmltoolbar.c:408
 msgid "_Description"
 msgstr "_Beskrywing"
 
-#: ../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."
@@ -12748,99 +13907,110 @@
 "Gee asb. die URL en die beskrywing van die skakel wat u wil invoeg. Die "
 "beskrywing is opsioneel."
 
-#: ../pidgin/gtkimhtmltoolbar.c:409
+#: ../pidgin/gtkimhtmltoolbar.c:415
 msgid "Please enter the URL of the link that you want to insert."
 msgstr "Gee asb. die URL van die skakel om in te sit."
 
-#: ../pidgin/gtkimhtmltoolbar.c:414
+#: ../pidgin/gtkimhtmltoolbar.c:420
 msgid "Insert Link"
 msgstr "Voeg skakel in"
 
-#: ../pidgin/gtkimhtmltoolbar.c:418
+#: ../pidgin/gtkimhtmltoolbar.c:424 ../pidgin/gtkimhtmltoolbar.c:1207
 msgid "_Insert"
 msgstr "_Voeg in"
 
-#: ../pidgin/gtkimhtmltoolbar.c:487
+#: ../pidgin/gtkimhtmltoolbar.c:493
 #, c-format
 msgid "Failed to store image: %s\n"
 msgstr "Stoor van prentjie het misluk: %s\n"
 
-#: ../pidgin/gtkimhtmltoolbar.c:513 ../pidgin/gtkimhtmltoolbar.c:523
+#: ../pidgin/gtkimhtmltoolbar.c:519 ../pidgin/gtkimhtmltoolbar.c:529
 msgid "Insert Image"
 msgstr "Voeg prentjie in"
 
-#: ../pidgin/gtkimhtmltoolbar.c:721
+#: ../pidgin/gtkimhtmltoolbar.c:740
 msgid "This theme has no available smileys."
 msgstr "Hierdie tema het geen gesiggies beskikbaar nie."
 
 #. show everything
-#: ../pidgin/gtkimhtmltoolbar.c:735
+#: ../pidgin/gtkimhtmltoolbar.c:757
 msgid "Smile!"
 msgstr "Glimlag!"
 
-#: ../pidgin/gtkimhtmltoolbar.c:922 ../pidgin/plugins/convcolors.c:287
-msgid "Bold"
-msgstr "Vetdruk"
-
-#: ../pidgin/gtkimhtmltoolbar.c:933 ../pidgin/plugins/convcolors.c:294
-msgid "Italic"
-msgstr "Skuinsdruk"
-
-#: ../pidgin/gtkimhtmltoolbar.c:944 ../pidgin/plugins/convcolors.c:301
-msgid "Underline"
-msgstr "Onderstreep"
-
-#: ../pidgin/gtkimhtmltoolbar.c:960
-msgid "Larger font size"
-msgstr "Groter skrif"
-
-#: ../pidgin/gtkimhtmltoolbar.c:972
-msgid "Smaller font size"
-msgstr "Kleiner skrif"
-
-#: ../pidgin/gtkimhtmltoolbar.c:989
-msgid "Font face"
-msgstr ""
-
-#: ../pidgin/gtkimhtmltoolbar.c:1001
-msgid "Foreground font color"
-msgstr "Skrif se voorgrondkleur"
-
-#: ../pidgin/gtkimhtmltoolbar.c:1013
-msgid "Background color"
-msgstr "Agtergrondkleur"
-
-#: ../pidgin/gtkimhtmltoolbar.c:1029
-msgid "Reset formatting"
-msgstr ""
-
-#: ../pidgin/gtkimhtmltoolbar.c:1044
-msgid "Insert link"
-msgstr "Voeg skakel in"
-
-#: ../pidgin/gtkimhtmltoolbar.c:1054
-msgid "Insert image"
-msgstr "Voeg prentjie in"
-
-#: ../pidgin/gtkimhtmltoolbar.c:1065
-msgid "Insert smiley"
-msgstr "Voeg gesiggie in"
-
-#: ../pidgin/gtklog.c:262
-#, fuzzy, c-format
+#: ../pidgin/gtkimhtmltoolbar.c:820 ../pidgin/gtkimhtmltoolbar.c:1164
+msgid "_Font"
+msgstr "_Skriftipe"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1124
+msgid "<b>_Bold</b>"
+msgstr "<b>_Vetdruk</b>"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1125
+msgid "<i>_Italic</i>"
+msgstr "<i>_Skuinsdruk</i>"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1126
+msgid "<u>_Underline</u>"
+msgstr "<u>_Onderstreep</u>"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1127
+msgid "<span size='larger'>_Larger</span>"
+msgstr "<span size='larger'>_Groter</span>"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1129
+msgid "_Normal"
+msgstr "_Normaal"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1131
+msgid "<span size='smaller'>_Smaller</span>"
+msgstr "<span size='smaller'>_Kleiner</span>"
+
+#. If we want to show the formatting for the following items, we would
+#. * need to update them when formatting changes. The above items don't need
+#. * no updating nor nothin'
+#: ../pidgin/gtkimhtmltoolbar.c:1135
+msgid "_Font face"
+msgstr "_Skriftipe"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1136
+msgid "Foreground _color"
+msgstr "Voorgrond_kleur"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1137
+msgid "Bac_kground color"
+msgstr "Agter_grondkleur"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1215
+msgid "_Smiley"
+msgstr "_Gesiggie"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1221
+msgid "_Image"
+msgstr "_Prentjie"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1227
+msgid "_Link"
+msgstr "_Skakel"
+
+#: ../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 "Wil u definitief die wag op %s vir %s uitvee?"
-
-#: ../pidgin/gtklog.c:273
-#, fuzzy, c-format
+msgstr ""
+"Is u seker u wil die staaflêer van die gesprek met %s wat op %s begin is, "
+"permanent uitvee?"
+
+#: ../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 "Wil u definitief die wag op %s vir %s uitvee?"
-
-#: ../pidgin/gtklog.c:278
+msgstr ""
+"Wil u seker u wil die staaflêer van die gesprek in %s wat op %s begin is, "
+"permanent uitvee?"
+
+#: ../pidgin/gtklog.c:308
 #, c-format
 msgid ""
 "Are you sure you want to permanently delete the system log which started at %"
@@ -12848,70 +14018,76 @@
 msgstr ""
 "Wil u definitief die stelselstaaflêer wat %s begin het, permanent uitvee?"
 
-#: ../pidgin/gtklog.c:419
+#: ../pidgin/gtklog.c:452
 #, c-format
 msgid "<span size='larger' weight='bold'>Conversation in %s on %s</span>"
 msgstr "<span size='larger' weight='bold'>Gesprek in %s op %s</span>"
 
-#: ../pidgin/gtklog.c:422
+#: ../pidgin/gtklog.c:455
 #, c-format
 msgid "<span size='larger' weight='bold'>Conversation with %s on %s</span>"
 msgstr "<span size='larger' weight='bold'>Gesprek met %s op %s</span>"
 
-#: ../pidgin/gtklog.c:469
+#: ../pidgin/gtklog.c:502
 msgid "%B %Y"
 msgstr "%B %Y"
 
-#: ../pidgin/gtklog.c:516
+#: ../pidgin/gtklog.c:549
 msgid ""
 "System events will only be logged if the \"Log all status changes to system "
 "log\" preference is enabled."
 msgstr ""
-
-#: ../pidgin/gtklog.c:520
+"Stelselgebeure sal net geboekstaaf word as die \"Boekstaaf alle "
+"statusverandering in stelselboekstaaf\"-voorkeur geaktiveer is."
+
+#: ../pidgin/gtklog.c:553
 msgid ""
 "Instant messages will only be logged if the \"Log all instant messages\" "
 "preference is enabled."
 msgstr ""
-
-#: ../pidgin/gtklog.c:523
+"Kitsboodskappe sal net geboekstaaf word as die \"Boekstaaf alle "
+"kitsboodskappe\"-voorkeur geaktiveer is."
+
+#: ../pidgin/gtklog.c:556
 msgid ""
 "Chats will only be logged if the \"Log all chats\" preference is enabled."
 msgstr ""
-
-#: ../pidgin/gtklog.c:527
+"Geselsies sal net geboekstaaf word as die \"Boekstaaf alle geselsies\"-"
+"voorkeur geaktiveer is."
+
+#: ../pidgin/gtklog.c:560
 msgid "No logs were found"
-msgstr "Geen joernale gevind nie"
+msgstr "Geen staaflêers gevind nie"
 
 #. Steal the "HELP" response and use it to trigger browsing to the logs folder
-#: ../pidgin/gtklog.c:542
+#: ../pidgin/gtklog.c:575
 msgid "_Browse logs folder"
-msgstr ""
-
-#: ../pidgin/gtklog.c:606
+msgstr "_Blaai deur staafgids"
+
+#: ../pidgin/gtklog.c:639
 msgid "Total log size:"
 msgstr "Totale staaflêergrootte:"
 
-#: ../pidgin/gtklog.c:675
+#: ../pidgin/gtklog.c:708
 #, c-format
 msgid "Conversations in %s"
 msgstr "Gesprekke in %s"
 
-#: ../pidgin/gtklog.c:683 ../pidgin/gtklog.c:735
+#: ../pidgin/gtklog.c:716 ../pidgin/gtklog.c:778
 #, c-format
 msgid "Conversations with %s"
 msgstr "Gesprekke met %s"
 
-#: ../pidgin/gtklog.c:760
+#: ../pidgin/gtklog.c:803
 msgid "System Log"
 msgstr "Stelselstaaflêer"
 
-#: ../pidgin/gtkmain.c:364
+#: ../pidgin/gtkmain.c:386
 #, c-format
 msgid "%s %s. Try `%s -h' for more information.\n"
 msgstr "%s %s. Probeer `%s -h' vir meer inligting.\n"
 
-#: ../pidgin/gtkmain.c:366
+#: ../pidgin/gtkmain.c:388
 #, c-format
 msgid ""
 "%s %s\n"
@@ -12920,88 +14096,107 @@
 "  -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"
-"Gebruik: %s [KEUSE]..."
-"\n"
+"Gebruik: %s [KEUSE]...\n"
 "\n"
 "  -c, --config=GIDS   gebruik GIDS vir konfigurasielêers\n"
 "  -d, --debug         skryf ontfoutboodskappe na stdout\n"
-"  -h, --help          vertoon hierdie hulp en sluit af\n"
-"  -n, --nologin       moenie outomaties anmeld nie\n"
-"  -l, --login[=NAAM]  meld outomaties aan (opsionele NAAM-argument "
-"spesifiseer\n"
-"                      rekening(e) om te gebruik, geskei met kommas)\n"
-"  -v, --version       wys die huidige weergawe en sluit af\n"
-
-#: ../pidgin/gtkmain.c:550
+"  -h, --help          wys hierdie hulp, en sluit af\n"
+"  -m, --multiple      moenie enkele uittrekking verseker nie\n"
+"  -n, --nologin       moenie outomaties aanmeld nie\n"
+"  -l, --login[=NAAM]  meld outomaties aan (opsionele NAAM-argument\n"
+"           spesifiseer rekening(e) om te gebruik, geskei met kommas)\n"
+"  -v, --version       wys die huidige weergawe, en sluit af\n"
+
+#: ../pidgin/gtkmain.c:512
 #, c-format
 msgid ""
 "%s has segfaulted and attempted to dump a core file.\n"
 "This is a bug in the software and has happened through\n"
 "no fault of your own.\n"
 "\n"
-"If you can reproduce the crash, please notify the Pidgin\n"
-"developers by reporting a bug at\n"
-"%sbug.php\n"
+"If you can reproduce the crash, please notify the developers\n"
+"by reporting a bug at:\n"
+"%ssimpleticket/\n"
 "\n"
 "Please make sure to specify what you were doing at the time\n"
 "and post the backtrace from the core file.  If you do not know\n"
 "how to get the backtrace, please read the instructions at\n"
-"%sgdb.php\n"
+"%swiki/GetABacktrace\n"
 "\n"
 "If you need further assistance, please IM either SeanEgn or \n"
 "LSchiere (via AIM).  Contact information for Sean and Luke \n"
 "on other protocols is at\n"
-"%scontactinfo.php\n"
-msgstr ""
-
-#: ../pidgin/gtknotify.c:337
+"%swiki/DeveloperPages\n"
+msgstr ""
+"%s het ge-segfault en probeer om 'n pitlêer te stort.\n"
+"Dit is 'n fout in die sagteware en is nie u skuld nie.\n"
+"\n"
+"\n"
+"Indien u die omval kan herproduseer, stel asb. die ontwikkelaars\n"
+"in kennis deur 'n fout te rapporteer by:\n"
+"%ssimpleticket/\n"
+"\n"
+"Spesifiseer asb. wat u op daardie stadium mee besig was\n"
+"en pos die sleepspoor van die pitlêer.  Indien u nie weet\n"
+"hoe om die sleepspoor te kry nie, lees asb. die instruksies by\n"
+"%swiki/GetABacktrace\n"
+"\n"
+"Indien u verdere bystand verlang, stuur 'n kitsboodskap aan óf SeanEgn óf \n"
+"LSchiere (met AIM).  Kontakinligting vir Sean en Luke \n"
+"op ander protokols is by\n"
+"%swiki/DeveloperPages\n"
+
+#. Translators may want to transliterate the name.
+#. It is not to be translated.
+#: ../pidgin/gtkmain.c:699 ../pidgin/pidgin.h:50
+msgid "Pidgin"
+msgstr "Pidgin"
+
+#: ../pidgin/gtknotify.c:344
 msgid "Open All Messages"
 msgstr "Open alle boodskappe"
 
-#: ../pidgin/gtknotify.c:389
+#: ../pidgin/gtknotify.c:396
 msgid "<span weight=\"bold\" size=\"larger\">You have mail!</span>"
 msgstr "<span weight=\"bold\" size=\"larger\">U het pos!</span>"
 
-#: ../pidgin/gtknotify.c:483
-msgid "Sender"
-msgstr "Sender"
-
-#: ../pidgin/gtknotify.c:509
+#: ../pidgin/gtknotify.c:516
 #, c-format
 msgid "%s has %d new message."
 msgid_plural "%s has %d new messages."
 msgstr[0] "%s het %d nuwe boodskap."
 msgstr[1] "%s het %d nuwe boodskappe."
 
-#: ../pidgin/gtknotify.c:520
+#: ../pidgin/gtknotify.c:527
 #, c-format
 msgid "<b>You have %d new e-mail.</b>"
 msgid_plural "<b>You have %d new e-mails.</b>"
 msgstr[0] "<b>U het %d nuwe e-pos.</b>"
 msgstr[1] "<b>U het %d nuwe e-posse.</b>"
 
-#: ../pidgin/gtknotify.c:909
+#: ../pidgin/gtknotify.c:967
 #, c-format
 msgid "The browser command \"%s\" is invalid."
 msgstr "Die blaaieropdrag \"%s\" is ongeldig."
 
-#: ../pidgin/gtknotify.c:911 ../pidgin/gtknotify.c:923
-#: ../pidgin/gtknotify.c:936 ../pidgin/gtknotify.c:1064
+#: ../pidgin/gtknotify.c:969 ../pidgin/gtknotify.c:981
+#: ../pidgin/gtknotify.c:994 ../pidgin/gtknotify.c:1122
 msgid "Unable to open URL"
-msgstr "Kan nie die URL oopmaak nie"
-
-#: ../pidgin/gtknotify.c:921 ../pidgin/gtknotify.c:934
+msgstr "Kan nie die URL open nie"
+
+#: ../pidgin/gtknotify.c:979 ../pidgin/gtknotify.c:992
 #, c-format
 msgid "Error launching \"%s\": %s"
-msgstr ""
-
-#: ../pidgin/gtknotify.c:1065
+msgstr "Fout met laai van \"%s\": %s"
+
+#: ../pidgin/gtknotify.c:1123
 msgid ""
 "The 'Manual' browser command has been chosen, but no command has been set."
 msgstr ""
@@ -13015,11 +14210,11 @@
 msgid "Multiple plugins will be unloaded."
 msgstr "Veelvuldige inproppe gaan ontlaai word."
 
-#: ../pidgin/gtkplugin.c:285
+#: ../pidgin/gtkplugin.c:287
 msgid "Unload Plugins"
 msgstr "Ontlaai inproppe"
 
-#: ../pidgin/gtkplugin.c:397
+#: ../pidgin/gtkplugin.c:399
 #, c-format
 msgid ""
 "%s%s<span weight=\"bold\">Written by:</span>\t%s\n"
@@ -13030,7 +14225,7 @@
 "<span weight=\"bold\">Webwerf:</span>\t\t%s\n"
 "<span weight=\"bold\">Lêernaam:</span>\t\t%s"
 
-#: ../pidgin/gtkplugin.c:407
+#: ../pidgin/gtkplugin.c:409
 #, c-format
 msgid ""
 "%s\n"
@@ -13041,116 +14236,125 @@
 "<span foreground=\"#ff0000\" weight=\"bold\">Fout: %s\n"
 "Kyk by die inprop se webwerf vir 'n opdatering.</span>"
 
-#: ../pidgin/gtkplugin.c:533
+#: ../pidgin/gtkplugin.c:535
 msgid "Configure Pl_ugin"
 msgstr "Stel _inprop op"
 
-#: ../pidgin/gtkplugin.c:596
+#: ../pidgin/gtkplugin.c:598
 msgid "<b>Plugin Details</b>"
 msgstr "<b>Inpropdetail</b>"
 
-#: ../pidgin/gtkpounce.c:155
+#: ../pidgin/gtkpounce.c:156
 msgid "Select a file"
 msgstr "Kies 'n lêer"
 
 #. Create the "Pounce on Whom" frame.
-#: ../pidgin/gtkpounce.c:522
+#: ../pidgin/gtkpounce.c:533
 msgid "Pounce on Whom"
 msgstr "Hou wie dop"
 
-#: ../pidgin/gtkpounce.c:549
+#: ../pidgin/gtkpounce.c:560
 msgid "_Buddy name:"
 msgstr "_Vriendnaam:"
 
-#: ../pidgin/gtkpounce.c:583
+#: ../pidgin/gtkpounce.c:594
 msgid "Si_gns on"
-msgstr "aa_nmeld"
-
-#: ../pidgin/gtkpounce.c:585
+msgstr "Aa_nmeld"
+
+#: ../pidgin/gtkpounce.c:596
 msgid "Signs o_ff"
-msgstr "a_fmeld"
-
-#: ../pidgin/gtkpounce.c:587
+msgstr "A_fmeld"
+
+#: ../pidgin/gtkpounce.c:598
 msgid "Goes a_way"
-msgstr "_weggaan"
-
-#: ../pidgin/gtkpounce.c:589
+msgstr "_Weggaan"
+
+#: ../pidgin/gtkpounce.c:600
 msgid "Ret_urns from away"
-msgstr "ter_ugkeer"
-
-#: ../pidgin/gtkpounce.c:591
+msgstr "Ter_ugkeer"
+
+#: ../pidgin/gtkpounce.c:602
 msgid "Becomes _idle"
-msgstr "_ledig raak"
-
-#: ../pidgin/gtkpounce.c:593
+msgstr "_Ledig raak"
+
+#: ../pidgin/gtkpounce.c:604
 msgid "Is no longer i_dle"
-msgstr "nie meer l_edig is nie"
-
-#: ../pidgin/gtkpounce.c:595
+msgstr "Nie meer l_edig is nie"
+
+#: ../pidgin/gtkpounce.c:606
 msgid "Starts _typing"
-msgstr "begin _tik"
-
-#: ../pidgin/gtkpounce.c:597
+msgstr "Begin _tik"
+
+#: ../pidgin/gtkpounce.c:608
 msgid "P_auses while typing"
-msgstr "w_ag tydens tik"
-
-#: ../pidgin/gtkpounce.c:599
+msgstr "W_ag tydens tik"
+
+#: ../pidgin/gtkpounce.c:610
 msgid "Stops t_yping"
-msgstr "ophou ti_k"
-
-#: ../pidgin/gtkpounce.c:601
+msgstr "Ophou ti_k"
+
+#: ../pidgin/gtkpounce.c:612
 msgid "Sends a _message"
-msgstr "'n _boodskap stuur"
-
-#: ../pidgin/gtkpounce.c:644
+msgstr "'n _Boodskap stuur"
+
+#: ../pidgin/gtkpounce.c:655
 msgid "Ope_n an IM window"
 msgstr "Ope_n 'n kletsvenster"
 
-#: ../pidgin/gtkpounce.c:646
+#: ../pidgin/gtkpounce.c:657
 msgid "_Pop up a notification"
 msgstr "Wys 'n boodskap_venster"
 
-#: ../pidgin/gtkpounce.c:648
+#: ../pidgin/gtkpounce.c:659
 msgid "Send a _message"
 msgstr "Stuur 'n _boodskap"
 
-#: ../pidgin/gtkpounce.c:650
+#: ../pidgin/gtkpounce.c:661
 msgid "E_xecute a command"
-msgstr "_Voer 'n opdrag uit"
-
-#: ../pidgin/gtkpounce.c:652
+msgstr "_Voer 'n bevel uit"
+
+#: ../pidgin/gtkpounce.c:663
 msgid "P_lay a sound"
 msgstr "Spee_l 'n klank"
 
-#: ../pidgin/gtkpounce.c:657
+#: ../pidgin/gtkpounce.c:669
 msgid "Brows_e..."
 msgstr "_Blaai..."
 
-#: ../pidgin/gtkpounce.c:659
+#: ../pidgin/gtkpounce.c:671
 msgid "Br_owse..."
 msgstr "_Blaai..."
 
-#: ../pidgin/gtkpounce.c:660
+#: ../pidgin/gtkpounce.c:672
 msgid "Pre_view"
 msgstr "_Voorskou"
 
-#: ../pidgin/gtkpounce.c:784
-msgid "P_ounce only when my status is not available"
-msgstr "_Reageer slegs wanneer my status nie beskikbaar is nie"
-
-#: ../pidgin/gtkpounce.c:789
+#: ../pidgin/gtkpounce.c:799
+msgid "P_ounce only when my status is not Available"
+msgstr "_Hou dop net wanneer my status 'Nie beskikbaar' is"
+
+#: ../pidgin/gtkpounce.c:804
 msgid "_Recurring"
 msgstr "_Herhalend"
 
-#: ../pidgin/gtkpounce.c:1243
+#: ../pidgin/gtkpounce.c:1260
 msgid "Pounce Target"
 msgstr "Dophou-teiken"
 
-#: ../pidgin/gtkprefs.c:509
+#: ../pidgin/gtkprefs.c:385
+#: ../pidgin/pixmaps/emotes/default/22/default.theme.in.h:1
+msgid "Default"
+msgstr "Verstek"
+
+#: ../pidgin/gtkprefs.c:516
 msgid "Smiley theme failed to unpack."
 msgstr "Uitpak van gesiggie-tema het misluk."
 
-#: ../pidgin/gtkprefs.c:638
+#: ../pidgin/gtkprefs.c:643
+msgid "Install Theme"
+msgstr "Installeer 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."
@@ -13158,239 +14362,252 @@
 "Kies 'n gesiggie-tema wat u wil gebruik vanuit die lys hier onder. Nuwe "
 "temas kan geïnstalleer word deur hulle te sleep en te los op die temalys."
 
-#: ../pidgin/gtkprefs.c:673
+#: ../pidgin/gtkprefs.c:731
 msgid "Icon"
 msgstr "Ikoon"
 
-#: ../pidgin/gtkprefs.c:816
+#: ../pidgin/gtkprefs.c:893
 msgid "System Tray Icon"
 msgstr "Stelsellaai-ikoon"
 
-#: ../pidgin/gtkprefs.c:817
+#: ../pidgin/gtkprefs.c:894
 msgid "_Show system tray icon:"
 msgstr "_Wys ikoon in stelsellaai"
 
-#: ../pidgin/gtkprefs.c:819 ../pidgin/gtkprefs.c:831 ../pidgin/gtkprefs.c:1646
-#: ../pidgin/plugins/timestamp_format.c:42
-#: ../pidgin/plugins/timestamp_format.c:51
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:338
-msgid "Always"
-msgstr "Altyd"
-
-#: ../pidgin/gtkprefs.c:821
+#: ../pidgin/gtkprefs.c:898
 msgid "On unread messages"
 msgstr "Met ongelese boodskappe"
 
-#: ../pidgin/gtkprefs.c:826
+#: ../pidgin/gtkprefs.c:903
 msgid "Conversation Window Hiding"
 msgstr "Versteking van gesprekvenster"
 
-#: ../pidgin/gtkprefs.c:827
+#: ../pidgin/gtkprefs.c:904
 msgid "_Hide new IM conversations:"
-msgstr "_Versteek nuwe gesprekke:"
-
-#: ../pidgin/gtkprefs.c:830 ../pidgin/gtkprefs.c:1826
+msgstr "_Versteek nuwe kitsboodskappe:"
+
+#: ../pidgin/gtkprefs.c:907 ../pidgin/gtkprefs.c:1939
 msgid "When away"
 msgstr "Terwyl weg"
 
 #. All the tab options!
-#: ../pidgin/gtkprefs.c:838
+#: ../pidgin/gtkprefs.c:915
 msgid "Tabs"
 msgstr "Oortjies"
 
-#: ../pidgin/gtkprefs.c:840
+#: ../pidgin/gtkprefs.c:917
 msgid "Show IMs and chats in _tabbed windows"
 msgstr "Wys boodskappe en geselsies in _oortjies"
 
-#: ../pidgin/gtkprefs.c:854
+#: ../pidgin/gtkprefs.c:931
 msgid "Show close b_utton on tabs"
 msgstr "Wys 'n _sluitknoppie op oortjies"
 
-#: ../pidgin/gtkprefs.c:857
+#: ../pidgin/gtkprefs.c:934
 msgid "_Placement:"
 msgstr "_Plasing:"
 
-#: ../pidgin/gtkprefs.c:859
+#: ../pidgin/gtkprefs.c:936
 msgid "Top"
 msgstr "Bo"
 
-#: ../pidgin/gtkprefs.c:860
+#: ../pidgin/gtkprefs.c:937
 msgid "Bottom"
 msgstr "Onder"
 
-#: ../pidgin/gtkprefs.c:861
+#: ../pidgin/gtkprefs.c:938
 msgid "Left"
 msgstr "Links"
 
-#: ../pidgin/gtkprefs.c:862
+#: ../pidgin/gtkprefs.c:939
 msgid "Right"
 msgstr "Regs"
 
-#: ../pidgin/gtkprefs.c:864
+#: ../pidgin/gtkprefs.c:941
 msgid "Left Vertical"
 msgstr "Vertikaal links"
 
-#: ../pidgin/gtkprefs.c:865
+#: ../pidgin/gtkprefs.c:942
 msgid "Right Vertical"
 msgstr "Vertikaal regs"
 
-#: ../pidgin/gtkprefs.c:872
+#: ../pidgin/gtkprefs.c:949
 msgid "N_ew conversations:"
 msgstr "N_uwe gesprekke:"
 
-#: ../pidgin/gtkprefs.c:900
+#: ../pidgin/gtkprefs.c:994
 msgid "Show _formatting on incoming messages"
-msgstr "Wys _formattering op inkomende boodskappe"
-
-#: ../pidgin/gtkprefs.c:903
-msgid "Show buddy _icons"
-msgstr "Wys vriend_ikone"
-
-#: ../pidgin/gtkprefs.c:905
+msgstr "Wys _formatering op inkomende boodskappe"
+
+#: ../pidgin/gtkprefs.c:997
+msgid "Show _detailed information"
+msgstr "Wys _gedetailleerde inligting"
+
+#: ../pidgin/gtkprefs.c:999
 msgid "Enable buddy ic_on animation"
 msgstr "Aktiveer _animasie van vriendikoon"
 
-#: ../pidgin/gtkprefs.c:912
+#: ../pidgin/gtkprefs.c:1006
 msgid "_Notify buddies that you are typing to them"
 msgstr "_Laat weet vriende dat u vir hulle tik"
 
-#: ../pidgin/gtkprefs.c:915
+#: ../pidgin/gtkprefs.c:1009
 msgid "Highlight _misspelled words"
 msgstr "Dui _spelfoute aan"
 
-#: ../pidgin/gtkprefs.c:919
+#: ../pidgin/gtkprefs.c:1013
 msgid "Use smooth-scrolling"
 msgstr "Gebruik gladde rol"
 
-#: ../pidgin/gtkprefs.c:922
+#: ../pidgin/gtkprefs.c:1016
 msgid "F_lash window when IMs are received"
 msgstr "_Flits boodskap wanneer 'n kitsboodskap ontvang word"
 
-#: ../pidgin/gtkprefs.c:925
+#: ../pidgin/gtkprefs.c:1018
+msgid "Minimi_ze new conversation windows"
+msgstr "Minim_eer nuwe gesprekvensters"
+
+#: ../pidgin/gtkprefs.c:1022
+msgid "Font"
+msgstr "Skriftipe"
+
+#: ../pidgin/gtkprefs.c:1024
+msgid "Use document font from _theme"
+msgstr "Gebruik dokumentskriftipe uit _tema"
+
+#: ../pidgin/gtkprefs.c:1026
+msgid "Use font from _theme"
+msgstr "Gebruik skriftipe uit _tema"
+
+#: ../pidgin/gtkprefs.c:1028
+msgid "Conversation _font:"
+msgstr "Gesprek_skriftipe:"
+
+#: ../pidgin/gtkprefs.c:1041
 msgid "Default Formatting"
-msgstr "Verstekformattering"
-
-#: ../pidgin/gtkprefs.c:941
+msgstr "Verstekformatering"
+
+#: ../pidgin/gtkprefs.c:1059
 msgid ""
 "This is how your outgoing message text will appear when you use protocols "
-"that support formatting. :)"
-msgstr ""
-"Dit is hoe die uitgaande boodskapteks sal vertoon wanneer u protokolle "
-"gebruik wat formattering ondersteun. :)"
-
-#: ../pidgin/gtkprefs.c:1017
+"that support formatting."
+msgstr ""
+"Dit is hoe die uitgaande boodskapteks sal wys wanneer u protokolle gebruik "
+"wat formatering ondersteun."
+
+#: ../pidgin/gtkprefs.c:1125
 msgid "ST_UN server:"
 msgstr "ST_UN-bediener:"
 
-#: ../pidgin/gtkprefs.c:1029
+#: ../pidgin/gtkprefs.c:1137
 msgid "<span style=\"italic\">Example: stunserver.org</span>"
 msgstr "<span style=\"italic\">Voorbeeld: stunserver.org</span>"
 
-#: ../pidgin/gtkprefs.c:1033
+#: ../pidgin/gtkprefs.c:1141
 msgid "_Autodetect IP address"
 msgstr "_Outospeur IP-adres"
 
-#: ../pidgin/gtkprefs.c:1042
+#: ../pidgin/gtkprefs.c:1150
 msgid "Public _IP:"
 msgstr "Publieke _IP:"
 
-#: ../pidgin/gtkprefs.c:1071
+#: ../pidgin/gtkprefs.c:1179
 msgid "Ports"
 msgstr "Poorte"
 
-#: ../pidgin/gtkprefs.c:1074
+#: ../pidgin/gtkprefs.c:1182
 msgid "_Manually specify range of ports to listen on"
 msgstr "_Spesifiseer self die omvang van poorte om op te luister"
 
-#: ../pidgin/gtkprefs.c:1077
+#: ../pidgin/gtkprefs.c:1185
 msgid "_Start port:"
 msgstr "_Beginpoort:"
 
-#: ../pidgin/gtkprefs.c:1084
+#: ../pidgin/gtkprefs.c:1192
 msgid "_End port:"
 msgstr "_Endpoort:"
 
-#: ../pidgin/gtkprefs.c:1092
+#: ../pidgin/gtkprefs.c:1200
 msgid "Proxy Server"
 msgstr "Instaanbediener"
 
-#: ../pidgin/gtkprefs.c:1096
+#: ../pidgin/gtkprefs.c:1204
 msgid "No proxy"
 msgstr "Geen instaanbediener"
 
-#: ../pidgin/gtkprefs.c:1152
+#: ../pidgin/gtkprefs.c:1260
 msgid "_User:"
 msgstr "_Gebruiker:"
 
-#: ../pidgin/gtkprefs.c:1216
+#: ../pidgin/gtkprefs.c:1325
 msgid "Seamonkey"
 msgstr "Seamonkey"
 
-#: ../pidgin/gtkprefs.c:1217
+#: ../pidgin/gtkprefs.c:1326
 msgid "Opera"
 msgstr "Opera"
 
-#: ../pidgin/gtkprefs.c:1218
+#: ../pidgin/gtkprefs.c:1327
 msgid "Netscape"
 msgstr "Netscape"
 
-#: ../pidgin/gtkprefs.c:1219
+#: ../pidgin/gtkprefs.c:1328
 msgid "Mozilla"
 msgstr "Mozilla"
 
-#: ../pidgin/gtkprefs.c:1220
+#: ../pidgin/gtkprefs.c:1329
 msgid "Konqueror"
 msgstr "Konqueror"
 
-#: ../pidgin/gtkprefs.c:1221
+#: ../pidgin/gtkprefs.c:1330
 msgid "GNOME Default"
 msgstr "GNOME se verstek"
 
-#: ../pidgin/gtkprefs.c:1222
+#: ../pidgin/gtkprefs.c:1331
 msgid "Galeon"
 msgstr "Galeon"
 
-#: ../pidgin/gtkprefs.c:1223
+#: ../pidgin/gtkprefs.c:1332
 msgid "Firefox"
 msgstr "Firefox"
 
-#: ../pidgin/gtkprefs.c:1224
+#: ../pidgin/gtkprefs.c:1333
 msgid "Firebird"
 msgstr "Firebird"
 
-#: ../pidgin/gtkprefs.c:1225
+#: ../pidgin/gtkprefs.c:1334
 msgid "Epiphany"
 msgstr "Epiphany"
 
-#: ../pidgin/gtkprefs.c:1234
+#: ../pidgin/gtkprefs.c:1343
 msgid "Manual"
 msgstr "Handmatig"
 
-#: ../pidgin/gtkprefs.c:1287
+#: ../pidgin/gtkprefs.c:1396
 msgid "Browser Selection"
 msgstr "Blaaierkeuse"
 
-#: ../pidgin/gtkprefs.c:1291
+#: ../pidgin/gtkprefs.c:1400
 msgid "_Browser:"
 msgstr "_Blaaier:"
 
-#: ../pidgin/gtkprefs.c:1299
+#: ../pidgin/gtkprefs.c:1408
 msgid "_Open link in:"
 msgstr "_Open skakel in:"
 
-#: ../pidgin/gtkprefs.c:1301
+#: ../pidgin/gtkprefs.c:1410
 msgid "Browser default"
 msgstr "Verstekblaaier"
 
-#: ../pidgin/gtkprefs.c:1302
+#: ../pidgin/gtkprefs.c:1411
 msgid "Existing window"
 msgstr "Bestaande venster"
 
-#: ../pidgin/gtkprefs.c:1304
+#: ../pidgin/gtkprefs.c:1413
 msgid "New tab"
 msgstr "Nuwe oortjie"
 
-#: ../pidgin/gtkprefs.c:1318
+#: ../pidgin/gtkprefs.c:1427
 #, c-format
 msgid ""
 "_Manual:\n"
@@ -13399,75 +14616,63 @@
 "_Handmatig:\n"
 "(%s vir URL)"
 
-#: ../pidgin/gtkprefs.c:1358
+#: ../pidgin/gtkprefs.c:1467
 msgid "Log _format:"
 msgstr "Boekstaaf_formaat:"
 
-#: ../pidgin/gtkprefs.c:1363
+#: ../pidgin/gtkprefs.c:1472
 msgid "Log all _instant messages"
 msgstr "Boekstaaf alle k_itsboodskappe"
 
-#: ../pidgin/gtkprefs.c:1365
+#: ../pidgin/gtkprefs.c:1474
 msgid "Log all c_hats"
 msgstr "Boekstaaf alle g_eselsies"
 
-#: ../pidgin/gtkprefs.c:1367
+#: ../pidgin/gtkprefs.c:1476
 msgid "Log all _status changes to system log"
 msgstr "Boekstaaf alle _statusveranderinge na die stelselstaaflêer"
 
-#: ../pidgin/gtkprefs.c:1513
+#: ../pidgin/gtkprefs.c:1622
 msgid "Sound Selection"
 msgstr "Klankkeuse"
 
-#: ../pidgin/gtkprefs.c:1521
+#: ../pidgin/gtkprefs.c:1632
 msgid "Quietest"
 msgstr "Sagste"
 
-#: ../pidgin/gtkprefs.c:1523
+#: ../pidgin/gtkprefs.c:1634
 msgid "Quieter"
 msgstr "Sagter"
 
-#: ../pidgin/gtkprefs.c:1525
+#: ../pidgin/gtkprefs.c:1636
 msgid "Quiet"
 msgstr "Sag"
 
-#: ../pidgin/gtkprefs.c:1529
+#: ../pidgin/gtkprefs.c:1640
 msgid "Loud"
 msgstr "Hard"
 
-#: ../pidgin/gtkprefs.c:1531
+#: ../pidgin/gtkprefs.c:1642
 msgid "Louder"
 msgstr "Harder"
 
-#: ../pidgin/gtkprefs.c:1533
+#: ../pidgin/gtkprefs.c:1644
 msgid "Loudest"
 msgstr "Hardste"
 
-#: ../pidgin/gtkprefs.c:1596
-msgid "Sound Method"
-msgstr "Klankmetode"
-
-#: ../pidgin/gtkprefs.c:1597
+#: ../pidgin/gtkprefs.c:1708
 msgid "_Method:"
 msgstr "_Metode:"
 
-#: ../pidgin/gtkprefs.c:1599
+#: ../pidgin/gtkprefs.c:1710
 msgid "Console beep"
-msgstr ""
-
-#: ../pidgin/gtkprefs.c:1601
-msgid "Automatic"
-msgstr "Outomaties"
-
-#: ../pidgin/gtkprefs.c:1604
-msgid "Command"
-msgstr "Opdrag"
-
-#: ../pidgin/gtkprefs.c:1605
+msgstr "Konsolebiep"
+
+#: ../pidgin/gtkprefs.c:1717
 msgid "No sounds"
 msgstr "Geen klanke"
 
-#: ../pidgin/gtkprefs.c:1613
+#: ../pidgin/gtkprefs.c:1725
 #, c-format
 msgid ""
 "Sound c_ommand:\n"
@@ -13476,117 +14681,81 @@
 "Klank_opdrag:\n"
 "(%s vir lêernaam)"
 
-#: ../pidgin/gtkprefs.c:1639
-msgid "Sound Options"
-msgstr "Klankkeuses"
-
-#: ../pidgin/gtkprefs.c:1640
+#: ../pidgin/gtkprefs.c:1752
 msgid "Sounds when conversation has _focus"
 msgstr "Klanke terwyl gesprek in _fokus is"
 
-#: ../pidgin/gtkprefs.c:1642
+#: ../pidgin/gtkprefs.c:1754
 msgid "Enable sounds:"
 msgstr "Aktiveer klanke:"
 
-#: ../pidgin/gtkprefs.c:1644
-msgid "Only when available"
-msgstr "Slegs indien beskikbaar"
-
-#: ../pidgin/gtkprefs.c:1645
-msgid "Only when not available"
-msgstr "Slegs indien nie beskikbaar nie"
-
-#: ../pidgin/gtkprefs.c:1653
+#: ../pidgin/gtkprefs.c:1765
 msgid "Volume:"
 msgstr "Volume:"
 
-#: ../pidgin/gtkprefs.c:1681
-msgid "Sound Events"
-msgstr "Gebeurtenisklanke"
-
-#: ../pidgin/gtkprefs.c:1732
+#: ../pidgin/gtkprefs.c:1845
 msgid "Play"
 msgstr "Speel"
 
-#: ../pidgin/gtkprefs.c:1739
-msgid "Event"
-msgstr "Gebeurtenis"
-
-#: ../pidgin/gtkprefs.c:1758
-msgid "Test"
-msgstr "Toets"
-
-#: ../pidgin/gtkprefs.c:1762
-msgid "Reset"
-msgstr ""
-
-#: ../pidgin/gtkprefs.c:1766
-msgid "Choose..."
-msgstr "Kies..."
-
-#: ../pidgin/gtkprefs.c:1809
+#: ../pidgin/gtkprefs.c:1922
 msgid "_Report idle time:"
 msgstr "_Raporteer ledige tyd:"
 
-#: ../pidgin/gtkprefs.c:1814
+#: ../pidgin/gtkprefs.c:1927
 msgid "Based on keyboard or mouse use"
 msgstr "Gebaseer op gebruik van sleutelbord en muis"
 
-#: ../pidgin/gtkprefs.c:1823
+#: ../pidgin/gtkprefs.c:1936
 msgid "_Auto-reply:"
 msgstr "_Outo-antwoord:"
 
-#: ../pidgin/gtkprefs.c:1827
+#: ../pidgin/gtkprefs.c:1940
 msgid "When both away and idle"
 msgstr "Terwyl weg en ledig"
 
 #. Auto-away stuff
-#: ../pidgin/gtkprefs.c:1833
+#: ../pidgin/gtkprefs.c:1946
 msgid "Auto-away"
 msgstr "Outoweg"
 
-#: ../pidgin/gtkprefs.c:1835
+#: ../pidgin/gtkprefs.c:1948
 msgid "Change status when _idle"
 msgstr "Verander status terwyl _ledig"
 
-#: ../pidgin/gtkprefs.c:1839
-msgid "_Minutes before changing status:"
-msgstr "_Minute voor verandering van status:"
-
-#: ../pidgin/gtkprefs.c:1847
+#: ../pidgin/gtkprefs.c:1952
+msgid "_Minutes before becoming idle:"
+msgstr "_Minute voor ledig word:"
+
+#: ../pidgin/gtkprefs.c:1960
 msgid "Change _status to:"
 msgstr "Verander _status na:"
 
 #. Signon status stuff
-#: ../pidgin/gtkprefs.c:1868
+#: ../pidgin/gtkprefs.c:1981
 msgid "Status at Startup"
 msgstr "Status by begin"
 
-#: ../pidgin/gtkprefs.c:1870
+#: ../pidgin/gtkprefs.c:1983
 msgid "Use status from last _exit at startup"
 msgstr "By begin, gebruik status van laaste _afsluiting"
 
-#: ../pidgin/gtkprefs.c:1876
+#: ../pidgin/gtkprefs.c:1989
 msgid "Status to a_pply at startup:"
 msgstr "Status om te ge_bruik by begin:"
 
-#: ../pidgin/gtkprefs.c:1914
+#: ../pidgin/gtkprefs.c:2027
 msgid "Interface"
 msgstr "Koppelvlak"
 
-#: ../pidgin/gtkprefs.c:1916
+#: ../pidgin/gtkprefs.c:2029
 msgid "Smiley Themes"
 msgstr "Gesiggie-temas"
 
-#: ../pidgin/gtkprefs.c:1917
-msgid "Sounds"
-msgstr "Klanke"
-
-#: ../pidgin/gtkprefs.c:1923
+#: ../pidgin/gtkprefs.c:2036
 msgid "Browser"
 msgstr "Blaaier"
 
-#: ../pidgin/gtkprefs.c:1927
+#: ../pidgin/gtkprefs.c:2040
 msgid "Status / Idle"
 msgstr "Status / ledig"
 
@@ -13596,11 +14765,11 @@
 
 #: ../pidgin/gtkprivacy.c:80
 msgid "Allow only the users on my buddy list"
-msgstr "Laat slegs die gebruikers op my vriendelys toe"
+msgstr "Laat net die gebruikers op my vriendelys toe"
 
 #: ../pidgin/gtkprivacy.c:81
 msgid "Allow only the users below"
-msgstr "Laat slegs die gebruikers hier onder toe"
+msgstr "Laat net die gebruikers hier onder toe"
 
 #: ../pidgin/gtkprivacy.c:82
 msgid "Block all users"
@@ -13608,56 +14777,56 @@
 
 #: ../pidgin/gtkprivacy.c:83
 msgid "Block only the users below"
-msgstr "Blokkeer slegs die gebruikers hier onder"
-
-#: ../pidgin/gtkprivacy.c:372
+msgstr "Blokkeer net die gebruikers hier onder"
+
+#: ../pidgin/gtkprivacy.c:369
 msgid "Privacy"
 msgstr "Privaatheid"
 
-#: ../pidgin/gtkprivacy.c:385
+#: ../pidgin/gtkprivacy.c:381
 msgid "Changes to privacy settings take effect immediately."
 msgstr "Veranderinge aan privaatheidinstellings is onmiddelik van toepassing."
 
 #. "Set privacy for:" label
-#: ../pidgin/gtkprivacy.c:397
+#: ../pidgin/gtkprivacy.c:393
 msgid "Set privacy for:"
 msgstr "Stel privaatheid vir:"
 
-#: ../pidgin/gtkprivacy.c:560 ../pidgin/gtkprivacy.c:576
+#: ../pidgin/gtkprivacy.c:556 ../pidgin/gtkprivacy.c:573
 msgid "Permit User"
 msgstr "Laat gebruiker toe"
 
-#: ../pidgin/gtkprivacy.c:561
+#: ../pidgin/gtkprivacy.c:557
 msgid "Type a user you permit to contact you."
 msgstr "Tik 'n gebruiker wat u toelaat om u te kontak."
 
-#: ../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 "Tik asb. die naam van die gebruiker wat u wil hê moet u kan kontak."
 
-#: ../pidgin/gtkprivacy.c:565 ../pidgin/gtkprivacy.c:578
+#: ../pidgin/gtkprivacy.c:561 ../pidgin/gtkprivacy.c:577
 msgid "_Permit"
 msgstr "_Laat toe"
 
-#: ../pidgin/gtkprivacy.c:570
+#: ../pidgin/gtkprivacy.c:567
 #, c-format
 msgid "Allow %s to contact you?"
 msgstr "Laat %s toe om u te kontak?"
 
-#: ../pidgin/gtkprivacy.c:572
+#: ../pidgin/gtkprivacy.c:569
 #, c-format
 msgid "Are you sure you wish to allow %s to contact you?"
 msgstr "Wil u definitief %s toelaat om u te kontak?"
 
-#: ../pidgin/gtkprivacy.c:599 ../pidgin/gtkprivacy.c:612
+#: ../pidgin/gtkprivacy.c:598 ../pidgin/gtkprivacy.c:612
 msgid "Block User"
 msgstr "Blokkeer gebruiker"
 
+#: ../pidgin/gtkprivacy.c:599
+msgid "Type a user to block."
+msgstr "Tik 'n gebruiker om te blokkeer."
+
 #: ../pidgin/gtkprivacy.c:600
-msgid "Type a user to block."
-msgstr "Tik 'n gebruiker om te blokkeer."
-
-#: ../pidgin/gtkprivacy.c:601
 msgid "Please enter the name of the user you wish to block."
 msgstr "Gee asb. die naam van die gebruiker wat u wil blokkeer."
 
@@ -13675,161 +14844,118 @@
 msgid "Apply"
 msgstr "Pas toe"
 
-#: ../pidgin/gtkrequest.c:1469
+#: ../pidgin/gtkrequest.c:1504
 msgid "That file already exists"
 msgstr "Daardie lêer bestaan reeds"
 
-#: ../pidgin/gtkrequest.c:1470
+#: ../pidgin/gtkrequest.c:1505
 msgid "Would you like to overwrite it?"
 msgstr "Wil u dit oorskryf?"
 
-#: ../pidgin/gtkrequest.c:1471
+#: ../pidgin/gtkrequest.c:1508
 msgid "Overwrite"
 msgstr "Oorskryf"
 
-#: ../pidgin/gtkrequest.c:1472
+#: ../pidgin/gtkrequest.c:1509
 msgid "Choose New Name"
 msgstr "Kies nuwe naam"
 
-#: ../pidgin/gtkrequest.c:1607 ../pidgin/gtkrequest.c:1621
+#: ../pidgin/gtkrequest.c:1647 ../pidgin/gtkrequest.c:1661
 msgid "Select Folder..."
 msgstr "Kies gids..."
 
-#: ../pidgin/gtkroomlist.c:376
+#. Create the window.
+#: ../pidgin/gtkroomlist.c:374
 msgid "Room List"
 msgstr "Kamernommer"
 
 #. list button
-#: ../pidgin/gtkroomlist.c:446
+#: ../pidgin/gtkroomlist.c:442
 msgid "_Get List"
 msgstr "_Kry lys"
 
 #. add button
-#: ../pidgin/gtkroomlist.c:454
+#: ../pidgin/gtkroomlist.c:450
 msgid "_Add Chat"
 msgstr "_Voeg geselsie by"
 
-#: ../pidgin/gtksavedstatuses.c:331
+#: ../pidgin/gtksavedstatuses.c:336
 msgid "Are you sure you want to delete the selected saved statuses?"
 msgstr "Wil u definitief die gekose gestoorde statusse uitvee?"
 
 #. Use button
-#: ../pidgin/gtksavedstatuses.c:579 ../pidgin/gtksavedstatuses.c:1213
+#: ../pidgin/gtksavedstatuses.c:619 ../pidgin/gtksavedstatuses.c:1265
 msgid "_Use"
 msgstr "_Gebruik"
 
-#: ../pidgin/gtksavedstatuses.c:725
+#: ../pidgin/gtksavedstatuses.c:779
 msgid "Title already in use.  You must choose a unique title."
 msgstr "Titel reeds in gebruik.  U moet 'n unieke titel kies."
 
-#: ../pidgin/gtksavedstatuses.c:913
+#: ../pidgin/gtksavedstatuses.c:969
 msgid "Different"
 msgstr "Anders"
 
-#: ../pidgin/gtksavedstatuses.c:1106
+#: ../pidgin/gtksavedstatuses.c:1158
 msgid "_Title:"
 msgstr "_Titel:"
 
-#: ../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 "Gebruik 'n _ander status vir sekere rekenings"
 
 #. Save & Use button
-#: ../pidgin/gtksavedstatuses.c:1221
+#: ../pidgin/gtksavedstatuses.c:1273
 msgid "Sa_ve & Use"
 msgstr "S_toor en gebruik"
 
-#: ../pidgin/gtksavedstatuses.c:1427
+#: ../pidgin/gtksavedstatuses.c:1477
 #, c-format
 msgid "Status for %s"
 msgstr "Status vir %s"
 
-#: ../pidgin/gtksound.c:63
-msgid "Buddy logs in"
-msgstr "Vriend meld aan"
-
-#: ../pidgin/gtksound.c:64
-msgid "Buddy logs out"
-msgstr "Vriend meld af"
-
-#: ../pidgin/gtksound.c:65
-msgid "Message received"
-msgstr "Boodskap ontvang"
-
-#: ../pidgin/gtksound.c:66
-msgid "Message received begins conversation"
-msgstr "Boodskapontvangs begin gesprek"
-
-#: ../pidgin/gtksound.c:67
-msgid "Message sent"
-msgstr "Boodskap gestuur"
-
-#: ../pidgin/gtksound.c:68
-msgid "Person enters chat"
-msgstr "Persoon kom geselskap binne"
-
-#: ../pidgin/gtksound.c:69
-msgid "Person leaves chat"
-msgstr "Persoon verlaat geselskap"
-
-#: ../pidgin/gtksound.c:70
-msgid "You talk in chat"
-msgstr "U praat in geselsie"
-
-#: ../pidgin/gtksound.c:71
-msgid "Others talk in chat"
-msgstr "Ander praat in geselsie"
-
-#: ../pidgin/gtksound.c:74
-msgid "Someone says your screen name in chat"
-msgstr "Iemand sê u skermnaam in 'n geselsie"
-
-#: ../pidgin/gtksound.c:310
-msgid "GStreamer Failure"
-msgstr "GStreamer-mislukking"
-
-#: ../pidgin/gtksound.c:311
-msgid "GStreamer failed to initialize."
-msgstr "GStreamer kon nie begin nie."
-
-#: ../pidgin/gtkstatusbox.c:611
+#: ../pidgin/gtkstatusbox.c:663
 msgid "Waiting for network connection"
 msgstr "Wag vir netwerkverbinding"
 
-#: ../pidgin/gtkutils.c:1320 ../pidgin/gtkutils.c:1343
+#: ../pidgin/gtkutils.c:631
+msgid "Google Talk"
+msgstr "Google Talk"
+
+#: ../pidgin/gtkutils.c:1388 ../pidgin/gtkutils.c:1411
 #, c-format
 msgid "The following error has occurred loading %s: %s"
 msgstr "Die volgende fout het voorgekom met die laai van %s: %s"
 
-#: ../pidgin/gtkutils.c:1323 ../pidgin/gtkutils.c:1345
+#: ../pidgin/gtkutils.c:1391 ../pidgin/gtkutils.c:1413
 msgid "Failed to load image"
 msgstr "Laai van prentjie het misluk"
 
-#: ../pidgin/gtkutils.c:1420
+#: ../pidgin/gtkutils.c:1487
 #, c-format
 msgid "Cannot send folder %s."
 msgstr "Kan nie gids %s stuur nie."
 
-#: ../pidgin/gtkutils.c:1421
+#: ../pidgin/gtkutils.c:1488
 #, c-format
 msgid ""
 "%s cannot transfer a folder. You will need to send the files within "
-"individually"
-msgstr ""
-"%s kan nie 'n gids oordra nie. U sal elke lêer binne-in afsonderlik moet "
+"individually."
+msgstr ""
+"%s kan nie 'n gids oordra nie. U sal die lêers binne-in afsonderlik moet "
 "stuur."
 
-#: ../pidgin/gtkutils.c:1453 ../pidgin/gtkutils.c:1462
-#: ../pidgin/gtkutils.c:1467
+#: ../pidgin/gtkutils.c:1520 ../pidgin/gtkutils.c:1532
+#: ../pidgin/gtkutils.c:1539
 msgid "You have dragged an image"
 msgstr "U het 'n prentjie gesleep"
 
-#: ../pidgin/gtkutils.c:1454
+#: ../pidgin/gtkutils.c:1521
 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."
@@ -13837,54 +14963,56 @@
 "U kan hierdie prentjie as 'n lêer oordra, in hierdie boodskap invoeg, of as "
 "die vriendikoon gebruik vir hierdie gebruiker."
 
-#: ../pidgin/gtkutils.c:1458 ../pidgin/gtkutils.c:1473
+#: ../pidgin/gtkutils.c:1527 ../pidgin/gtkutils.c:1547
 msgid "Set as buddy icon"
 msgstr "Stel as vriendikoon"
 
-#: ../pidgin/gtkutils.c:1459 ../pidgin/gtkutils.c:1474
+#: ../pidgin/gtkutils.c:1528 ../pidgin/gtkutils.c:1548
 msgid "Send image file"
 msgstr "Stuur die prentlêer"
 
-#: ../pidgin/gtkutils.c:1460 ../pidgin/gtkutils.c:1474
+#: ../pidgin/gtkutils.c:1529 ../pidgin/gtkutils.c:1548
 msgid "Insert in message"
 msgstr "Voeg in boodskap"
 
-#: ../pidgin/gtkutils.c:1463
+#: ../pidgin/gtkutils.c:1533
 msgid "Would you like to set it as the buddy icon for this user?"
 msgstr "Wil u dit as die vriendikoon vir hierdie gebruiker stel?"
 
-#: ../pidgin/gtkutils.c:1468
-msgid ""
-"You can send this image as a file transfer or embed it into this message, or "
-"use it as the buddy icon for this user."
-msgstr ""
-"U kan hierdie prentjie as 'n lêer oordra, in hierdie boodskap invoeg, of as "
-"die vriendikoon gebruik vir hierdie gebruiker."
-
-#: ../pidgin/gtkutils.c:1470
+#: ../pidgin/gtkutils.c:1540
+msgid ""
+"You can send this image as a file transfer, or use it as the buddy icon for "
+"this user."
+msgstr ""
+"U kan hierdie prentjie as 'n lêeroordrag stuur, of dit as die vriendikoon "
+"gebruik vir hierdie gebruiker."
+
+#: ../pidgin/gtkutils.c:1541
 msgid ""
 "You can insert this image into this message, or use it as the buddy icon for "
 "this user"
 msgstr ""
 "U kan hierdie prentjie in hierdie boodskap invoeg, of as die vriendikoon "
-"gebruik vir hierdie gebruiker."
+"gebruik vir hierdie gebruiker"
 
 #. I don't know if we really want to do anything here.  Most of the desktop item types are crap like
 #. * "MIME Type" (I have no clue how that would be a desktop item) and "Comment"... nothing we can really
 #. * send.  The only logical one is "Application," but do we really want to send a binary and nothing else?
 #. * Probably not.  I'll just give an error and return.
 #. The original patch sent the icon used by the launcher.  That's probably wrong
-#: ../pidgin/gtkutils.c:1524
+#: ../pidgin/gtkutils.c:1599
 msgid "Cannot send launcher"
-msgstr ""
-
-#: ../pidgin/gtkutils.c:1524
+msgstr "Kan nie laaier stuur nie"
+
+#: ../pidgin/gtkutils.c:1599
 msgid ""
 "You dragged a desktop launcher. Most likely you wanted to send whatever this "
 "launcher points to instead of this launcher itself."
 msgstr ""
-
-#: ../pidgin/gtkutils.c:2291
+"U het 'n werkskermlaaier gesleep. U wou waarskynlik dit stuur waarna die "
+"laaier wys, in plaas van die laaier sélf."
+
+#: ../pidgin/gtkutils.c:2334
 #, c-format
 msgid ""
 "<b>File:</b> %s\n"
@@ -13893,95 +15021,111 @@
 msgstr ""
 "<b>Lêer:</b> %s\n"
 "<b>Lêergroote:</b> %s\n"
-"<b>Prentgrootte:</b> %dx%d"
-
-#: ../pidgin/gtkutils.c:2611
+"<b>Prentjiegrootte:</b> %dx%d"
+
+#: ../pidgin/gtkutils.c:2630
 #, c-format
 msgid "The file '%s' is too large for %s.  Please try a smaller image.\n"
-msgstr "Die lêer '%s' is te groot vir %s.  Probeer asb. 'n kleiner prent.\n"
-
-#: ../pidgin/gtkutils.c:2613
+msgstr "Die lêer '%s' is te groot vir %s.  Probeer asb. 'n kleiner prentjie.\n"
+
+#: ../pidgin/gtkutils.c:2632
 msgid "Icon Error"
 msgstr "Ikoonfout"
 
-#: ../pidgin/gtkutils.c:2614
+#: ../pidgin/gtkutils.c:2633
 msgid "Could not set icon"
 msgstr "Kon nie ikoon stel nie"
 
-#: ../pidgin/gtkutils.c:2715
+#: ../pidgin/gtkutils.c:2733
 #, c-format
 msgid "Failed to open file '%s': %s"
-msgstr "Kon nie lêer '%s' oopmaak nie: %s"
-
-#: ../pidgin/gtkutils.c:2764
+msgstr "Open van lêer '%s' het misluk: %s"
+
+#: ../pidgin/gtkutils.c:2782
 #, c-format
 msgid ""
 "Failed to load image '%s': reason not known, probably a corrupt image file"
 msgstr ""
 "Laai van beeld '%s' het misluk: rede onbekent, waarskynlik 'n korropte "
-"prentlêer"
-
-#: ../pidgin/gtkwhiteboard.c:756 ../pidgin/gtkwhiteboard.c:775
+"prentjielêer"
+
+#: ../pidgin/gtkwhiteboard.c:754 ../pidgin/gtkwhiteboard.c:773
 msgid "Save File"
 msgstr "Stoor lêer"
 
-#: ../pidgin/gtkwhiteboard.c:863
+#: ../pidgin/gtkwhiteboard.c:861
 msgid "Select color"
 msgstr "Kies kleur"
 
-#: ../pidgin/pidginstock.c:88
+#: ../pidgin/pidginstock.c:81
 msgid "_Alias"
 msgstr "_Alias"
 
-#: ../pidgin/pidginstock.c:90
+#: ../pidgin/pidginstock.c:83
 msgid "Close _tabs"
 msgstr "Sluit _oortjies"
 
-#: ../pidgin/pidginstock.c:92
+#: ../pidgin/pidginstock.c:85
 msgid "_Get Info"
 msgstr "_Kry info"
 
-#: ../pidgin/pidginstock.c:93
+#: ../pidgin/pidginstock.c:86
 msgid "_Invite"
 msgstr "_Nooi uit"
 
-#: ../pidgin/pidginstock.c:94
+#: ../pidgin/pidginstock.c:87
 msgid "_Modify"
 msgstr "_Wysig"
 
-#: ../pidgin/pidginstock.c:95
+#: ../pidgin/pidginstock.c:88
 msgid "_Open Mail"
 msgstr "_Open pos"
 
-#: ../pidgin/plugins/cap/cap.c:449
+#: ../pidgin/pixmaps/emotes/default/22/default.theme.in.h:2
+msgid "Pidgin smileys"
+msgstr "Pidgin-gesiggies"
+
+#: ../pidgin/pixmaps/emotes/none/none.theme.in.h:1
+msgid "Penguin Pimps"
+msgstr "Pikkepikkewyne"
+
+#: ../pidgin/pixmaps/emotes/none/none.theme.in.h:2
+msgid "Selecting this disables graphical emoticons."
+msgstr "Deur hier te kies, deaktiveer u grafiese emotikons."
+
+#: ../pidgin/pixmaps/emotes/none/none.theme.in.h:3
+msgid "none"
+msgstr "geen"
+
+#: ../pidgin/plugins/cap/cap.c:450
 msgid "Display Statistics"
-msgstr "Vertoon statistiek"
-
-#: ../pidgin/plugins/cap/cap.c:461 ../pidgin/plugins/cap/cap.c:464
+msgstr "Wys statistiek"
+
+#: ../pidgin/plugins/cap/cap.c:462 ../pidgin/plugins/cap/cap.c:465
 msgid "Response Probability:"
 msgstr "Antwoordwaarskynlikheid:"
 
-#: ../pidgin/plugins/cap/cap.c:810
+#: ../pidgin/plugins/cap/cap.c:811
 msgid "Statistics Configuration"
 msgstr "Statistiekopstelling"
 
 #. msg_difference spinner
-#: ../pidgin/plugins/cap/cap.c:813
+#: ../pidgin/plugins/cap/cap.c:814
 msgid "Maximum response timeout:"
-msgstr ""
-
-#: ../pidgin/plugins/cap/cap.c:816 ../pidgin/plugins/cap/cap.c:823
-#: ../pidgin/plugins/cap/cap.c:830 ../pidgin/plugins/timestamp.c:149
+msgstr "Maksimum antwoorduittelling:"
+
+#: ../pidgin/plugins/cap/cap.c:817 ../pidgin/plugins/cap/cap.c:824
+#: ../pidgin/plugins/cap/cap.c:831 ../pidgin/plugins/timestamp.c:150
 msgid "minutes"
 msgstr "minute"
 
 #. last_seen spinner
-#: ../pidgin/plugins/cap/cap.c:820
+#: ../pidgin/plugins/cap/cap.c:821
 msgid "Maximum last-seen difference:"
-msgstr ""
+msgstr "Maksimum laasgesien-verskil:"
 
 #. threshold spinner
-#: ../pidgin/plugins/cap/cap.c:827
+#: ../pidgin/plugins/cap/cap.c:828
 msgid "Threshold:"
 msgstr "Drempel:"
 
@@ -13991,22 +15135,24 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/cap/cap.c:934
+#: ../pidgin/plugins/cap/cap.c:936
 msgid "Contact Availability Prediction"
-msgstr ""
+msgstr "Kontakbeskikbaarheid-voorspelling"
 
 #. *< name
 #. *< version
-#: ../pidgin/plugins/cap/cap.c:936
+#: ../pidgin/plugins/cap/cap.c:938
 msgid "Contact Availability Prediction plugin."
-msgstr ""
+msgstr "Kontakbeskikbaarheid-voorspelling-inprop."
 
 #. *  summary
-#: ../pidgin/plugins/cap/cap.c:937
+#: ../pidgin/plugins/cap/cap.c:939
 msgid ""
 "The contact availability plugin (cap) is used to display statistical "
 "information about buddies in a users contact list."
 msgstr ""
+"Die kontakbeskikbaarheid-inprop (kbi) word gebruik om statistiese inligting "
+"oor vriende in 'n gebruiker se kontaklys te wys."
 
 #: ../pidgin/plugins/contact_priority.c:61
 msgid "Buddy is idle"
@@ -14018,7 +15164,7 @@
 
 #: ../pidgin/plugins/contact_priority.c:63
 msgid "Buddy is \"extended\" away"
-msgstr "Vriend is weg vir lank"
+msgstr "Vriend is \"lank\" weg"
 
 #. Not used yet.
 #: ../pidgin/plugins/contact_priority.c:66
@@ -14055,14 +15201,14 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/contact_priority.c:182
+#: ../pidgin/plugins/contact_priority.c:187
 msgid "Contact Priority"
 msgstr "Kontakprioriteit"
 
 #. *< name
 #. *< version
 #. *< summary
-#: ../pidgin/plugins/contact_priority.c:185
+#: ../pidgin/plugins/contact_priority.c:190
 msgid ""
 "Allows for controlling the values associated with different buddy states."
 msgstr ""
@@ -14070,7 +15216,7 @@
 "vriendstatusse."
 
 #. *< description
-#: ../pidgin/plugins/contact_priority.c:187
+#: ../pidgin/plugins/contact_priority.c:192
 msgid ""
 "Allows for changing the point values of idle/away/offline states for buddies "
 "in contact priority computations."
@@ -14092,7 +15238,7 @@
 
 #: ../pidgin/plugins/convcolors.c:83
 msgid "Highlighted Messages"
-msgstr ""
+msgstr "Gemerkte boodskappe"
 
 #: ../pidgin/plugins/convcolors.c:84
 msgid "System Messages"
@@ -14106,11 +15252,23 @@
 msgid "Received Messages"
 msgstr "Ontvangde boodskappe"
 
-#: ../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 "Kies kleur vir %s"
 
+#: ../pidgin/plugins/convcolors.c:287
+msgid "Bold"
+msgstr "Vetdruk"
+
+#: ../pidgin/plugins/convcolors.c:294
+msgid "Italic"
+msgstr "Skuinsdruk"
+
+#: ../pidgin/plugins/convcolors.c:301
+msgid "Underline"
+msgstr "Onderstreep"
+
 #: ../pidgin/plugins/convcolors.c:310
 msgid "Ignore incoming format"
 msgstr "Ignoreer inkomende formaat"
@@ -14131,13 +15289,23 @@
 msgid "Conversation Placement"
 msgstr "Gesprekplasing"
 
-#: ../pidgin/plugins/extplacement.c:106
+#. Translators: "New conversations" should match the text in the preferences dialog and "By conversation count" should be the same text used above
+#: ../pidgin/plugins/extplacement.c:105
+msgid ""
+"Note: The preference for \"New conversations\" must be set to \"By "
+"conversation count\"."
+msgstr ""
+"Let wel: Die voorkeur vir \"Nuwe gesprekke\" moet na \"Volgens "
+"gesprekstelling\" gestel wees."
+
+#: ../pidgin/plugins/extplacement.c:111
 msgid "Number of conversations per window"
 msgstr "Aantal gesprekke per venster"
 
-#: ../pidgin/plugins/extplacement.c:112
+#: ../pidgin/plugins/extplacement.c:117
 msgid "Separate IM and Chat windows when placing by number"
-msgstr "Aparte gesprek- en geselsvensters wanneer geplaas word volgens aantal"
+msgstr ""
+"Aparte kitsboodskap- en geselsievensters wanneer geplaas word volgens aantal"
 
 #. *< type
 #. *< ui_requirement
@@ -14145,56 +15313,26 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/extplacement.c:135
+#: ../pidgin/plugins/extplacement.c:146
 msgid "ExtPlacement"
 msgstr "Gesprekplasing"
 
 #. *< name
 #. *< version
-#: ../pidgin/plugins/extplacement.c:137
+#: ../pidgin/plugins/extplacement.c:148
 msgid "Extra conversation placement options."
 msgstr "Ekstra keuses vir gesprekplasing."
 
 #. *< summary
 #. *  description
-#: ../pidgin/plugins/extplacement.c:139
+#: ../pidgin/plugins/extplacement.c:150
 msgid ""
 "Restrict the number of conversations per windows, optionally separating IMs "
 "and Chats"
 msgstr ""
-"Beperk die aantal gesprekke per venster en skei moontlik gesprekke en "
+"Beperk die aantal gesprekke per venster en skei moontlik kitsboodskappe en "
 "geselsies"
 
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../pidgin/plugins/gaiminc.c:91
-msgid "Pidgin Demonstration Plugin"
-msgstr "Pidgin-demostrasie-inprop"
-
-#. *< name
-#. *< version
-#. *  summary
-#: ../pidgin/plugins/gaiminc.c:94
-msgid "An example plugin that does stuff - see the description."
-msgstr "'n Voorbeeldinprop wat dinge doen - sien die beskrywing."
-
-#. *  description
-#: ../pidgin/plugins/gaiminc.c:96
-msgid ""
-"This is a really cool plugin that does a lot of stuff:\n"
-"- It tells you who wrote the program when you log in\n"
-"- It reverses all incoming text\n"
-"- It sends a message to people on your list immediately when they sign on"
-msgstr ""
-"Hierdie is 'n baie oulike inprop wat klomp dinge doen:\n"
-"- Dit sê wie die program geskryf het wanneer mens aanmeld\n"
-"- Dit keer alle teks agterstevoorom\n"
-"- Dit stuur 'n boodksap aan mense op u lys die oomblik wat hulle aanmeld"
-
 #. Configuration frame
 #: ../pidgin/plugins/gestures/gestures.c:235
 msgid "Mouse Gestures Configuration"
@@ -14219,19 +15357,19 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/gestures/gestures.c:289
+#: ../pidgin/plugins/gestures/gestures.c:295
 msgid "Mouse Gestures"
 msgstr "Muisgebare"
 
 #. *< name
 #. *< version
 #. *  summary
-#: ../pidgin/plugins/gestures/gestures.c:292
+#: ../pidgin/plugins/gestures/gestures.c:298
 msgid "Provides support for mouse gestures"
 msgstr "Verskaf ondersteuning vir muisgebare"
 
 #. *  description
-#: ../pidgin/plugins/gestures/gestures.c:294
+#: ../pidgin/plugins/gestures/gestures.c:300
 msgid ""
 "Allows support for mouse gestures in conversation windows.\n"
 "Drag the middle mouse button to perform certain actions:\n"
@@ -14240,31 +15378,42 @@
 "Drag up and then to the left to switch to the previous conversation.\n"
 "Drag up and then to the right to switch to the next conversation."
 msgstr ""
+"Verskaf ondersteuning vir muisgebare in gespreksvensters.\n"
+"Sleep die middelmuisknoppie om sekere aksies uit te voer:\n"
+"\n"
+"Sleep af en dan regs om 'n gesprek af te sluit.\n"
+"Sleep op en dan links om na die vorige gesprek te gaan.\n"
+"Sleep op en dan regs om na die volgende gesprek te gaan."
 
 #: ../pidgin/plugins/gevolution/add_buddy_dialog.c:143
 msgid "Instant Messaging"
 msgstr "Kitsboodskappe"
 
 #. 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 ""
 "Kies 'n persoon van u adresboek hier onder, of voeg 'n nuwe persoon by."
 
+#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:551
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:303
+msgid "Group:"
+msgstr "Groep:"
+
 #. "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 "Nuwe persoon"
 
 #. "Select Buddy" button
-#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:597
+#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:594
 msgid "Select Buddy"
 msgstr "Kies vriend"
 
 #. 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."
@@ -14273,43 +15422,43 @@
 "nuwe persoon."
 
 #. Add the expander
-#: ../pidgin/plugins/gevolution/assoc-buddy.c:433
+#: ../pidgin/plugins/gevolution/assoc-buddy.c:431
 msgid "User _details"
 msgstr "Gebruiker_detail"
 
 #. "Associate Buddy" button
-#: ../pidgin/plugins/gevolution/assoc-buddy.c:486
+#: ../pidgin/plugins/gevolution/assoc-buddy.c:484
 msgid "_Associate Buddy"
 msgstr "_Assosieer vriend"
 
-#: ../pidgin/plugins/gevolution/gevolution.c:239
-#: ../pidgin/plugins/gevolution/gevolution.c:245
-msgid "Unable to send e-mail"
-msgstr "Kan nie e-pos stuur nie"
-
 #: ../pidgin/plugins/gevolution/gevolution.c:240
+#: ../pidgin/plugins/gevolution/gevolution.c:246
+msgid "Unable to send e-mail"
+msgstr "Kan nie e-pos stuur nie"
+
+#: ../pidgin/plugins/gevolution/gevolution.c:241
 msgid "The evolution executable was not found in the PATH."
 msgstr "Die evolution-programlêer is nie in die PATH gevind nie."
 
-#: ../pidgin/plugins/gevolution/gevolution.c:246
+#: ../pidgin/plugins/gevolution/gevolution.c:247
 msgid "An e-mail address was not found for this buddy."
 msgstr "Daar is nie 'n e-posadres vir hierdie vriend gevind nie."
 
-#: ../pidgin/plugins/gevolution/gevolution.c:272
+#: ../pidgin/plugins/gevolution/gevolution.c:273
 msgid "Add to Address Book"
 msgstr "Voeg by adresboek"
 
-#: ../pidgin/plugins/gevolution/gevolution.c:284
+#: ../pidgin/plugins/gevolution/gevolution.c:285
 msgid "Send E-Mail"
 msgstr "Stuur e-pos"
 
 #. Configuration frame
-#: ../pidgin/plugins/gevolution/gevolution.c:411
+#: ../pidgin/plugins/gevolution/gevolution.c:412
 msgid "Evolution Integration Configuration"
 msgstr "Opstelling van Evolution-integrasie"
 
 #. Label
-#: ../pidgin/plugins/gevolution/gevolution.c:414
+#: ../pidgin/plugins/gevolution/gevolution.c:415
 msgid "Select all accounts that buddies should be auto-added to."
 msgstr "Kies al die rekeninge waarvoor vriende outomaties bygevoeg moet word."
 
@@ -14319,7 +15468,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/gevolution/gevolution.c:521
+#: ../pidgin/plugins/gevolution/gevolution.c:527
 msgid "Evolution Integration"
 msgstr "Evolution-integrasie"
 
@@ -14327,40 +15476,49 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../pidgin/plugins/gevolution/gevolution.c:524
-#: ../pidgin/plugins/gevolution/gevolution.c:526
+#: ../pidgin/plugins/gevolution/gevolution.c:530
+#: ../pidgin/plugins/gevolution/gevolution.c:532
 msgid "Provides integration with Evolution."
 msgstr "Verskaf integrasie met Evolution."
 
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:263
+msgid "Please enter the person's information below."
+msgstr "Gee asb. die persoon se inligting hier onder."
+
 #: ../pidgin/plugins/gevolution/new_person_dialog.c:267
-msgid "Please enter the person's information below."
-msgstr "Gee asb. die persoon se inligting hier onder."
-
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:271
 msgid "Please enter the buddy's screen name and account type below."
 msgstr "Gee asb. die vriend se skermnaam en rekeningtipe hier onder."
 
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:291
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:287
 msgid "Account type:"
 msgstr "Rekeningtipe:"
 
 #. Optional Information section
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:315
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:311
 msgid "Optional information:"
 msgstr "Opsionele inligting:"
 
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:350
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:346
 msgid "First name:"
 msgstr "Naam:"
 
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:362
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:358
 msgid "Last name:"
 msgstr "Van:"
 
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:382
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:378
 msgid "E-mail:"
 msgstr "E-pos:"
 
+#: ../pidgin/plugins/gtkbuddynote.c:34
+#, c-format
+msgid ""
+"\n"
+"<b>Buddy Note</b>: %s"
+msgstr ""
+"\n"
+"<b>Vriendnota</b>: %s"
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -14424,7 +15582,7 @@
 
 #: ../pidgin/plugins/markerline.c:246
 msgid "Draw Markerline in "
-msgstr ""
+msgstr "Teken merkerlyn in "
 
 #: ../pidgin/plugins/markerline.c:250 ../pidgin/plugins/notify.c:676
 msgid "_IM windows"
@@ -14438,15 +15596,15 @@
 msgid ""
 "A music messaging session has been requested. Please click the MM icon to "
 "accept."
-msgstr ""
+msgstr "'n Musiekboodskapsessie is aangevra. Klik die MM-ikoon om te aanvaar."
 
 #: ../pidgin/plugins/musicmessaging/musicmessaging.c:45
 msgid "Music messaging session confirmed."
-msgstr ""
+msgstr "Musiekboodskapsessie bevestig."
 
 #: ../pidgin/plugins/musicmessaging/musicmessaging.c:419
 msgid "Music Messaging"
-msgstr ""
+msgstr "Musiekboodskappe"
 
 #: ../pidgin/plugins/musicmessaging/musicmessaging.c:420
 msgid "There was a conflict in running the command:"
@@ -14454,7 +15612,7 @@
 
 #: ../pidgin/plugins/musicmessaging/musicmessaging.c:528
 msgid "Error Running Editor"
-msgstr ""
+msgstr "Fout met loop van redigeerder"
 
 #: ../pidgin/plugins/musicmessaging/musicmessaging.c:529
 msgid "The following error has occurred:"
@@ -14463,11 +15621,11 @@
 #. Configuration frame
 #: ../pidgin/plugins/musicmessaging/musicmessaging.c:628
 msgid "Music Messaging Configuration"
-msgstr ""
+msgstr "Musiekboodskappe-konfigurasie"
 
 #: ../pidgin/plugins/musicmessaging/musicmessaging.c:632
 msgid "Score Editor Path"
-msgstr ""
+msgstr "Tellingredigering-pad"
 
 #: ../pidgin/plugins/musicmessaging/musicmessaging.c:633
 msgid "_Apply"
@@ -14481,25 +15639,27 @@
 #. *< id
 #. *< name
 #. *< version
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:668
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:674
 msgid "Music Messaging Plugin for collaborative composition."
-msgstr ""
+msgstr "Musiekboodskap-inprop vir saamwerk-komponering."
 
 #. *  summary
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:670
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:676
 msgid ""
 "The Music Messaging Plugin allows a number of users to simultaneously work "
 "on a piece of music by editting a common score in real-time."
 msgstr ""
+"Die musiekboodskap-inprop stel 'n aantal gebruikers in staat om gelyktydig "
+"aan 'n musiekstuk te werk deur gedeelde bladmusiek intyds te redigeer."
 
 #. ---------- "Notify For" ----------
 #: ../pidgin/plugins/notify.c:672
 msgid "Notify For"
-msgstr ""
+msgstr "Kennisstel vir"
 
 #: ../pidgin/plugins/notify.c:691
 msgid "\t_Only when someone says your screen name"
-msgstr "\t_Slegs wanneer iemand u skermnaam noem"
+msgstr "\t_Net wanneer iemand u skermnaam noem"
 
 #: ../pidgin/plugins/notify.c:701
 msgid "_Focused windows"
@@ -14527,7 +15687,7 @@
 #. Urgent method button
 #: ../pidgin/plugins/notify.c:752
 msgid "Set window manager \"_URGENT\" hint"
-msgstr "Stel vensterbvestuurder se \"_DRINGEND\"-wenk"
+msgstr "Stel vensterbestuurder se \"_DRINGEND\"-wenk"
 
 #. Raise window method button
 #: ../pidgin/plugins/notify.c:761
@@ -14570,7 +15730,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/notify.c:895
+#: ../pidgin/plugins/notify.c:901
 msgid "Message Notification"
 msgstr "Boodskapkennisgewing"
 
@@ -14578,147 +15738,182 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../pidgin/plugins/notify.c:898 ../pidgin/plugins/notify.c:900
+#: ../pidgin/plugins/notify.c:904 ../pidgin/plugins/notify.c:906
 msgid "Provides a variety of ways of notifying you of unread messages."
 msgstr ""
 "Verskaf 'n verskeidenheid maniere om te laat weet van ongelese boodskappe."
 
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../pidgin/plugins/pidgininc.c:91
+msgid "Pidgin Demonstration Plugin"
+msgstr "Pidgin-demostrasie-inprop"
+
+#. *< name
+#. *< version
+#. *  summary
+#: ../pidgin/plugins/pidgininc.c:94
+msgid "An example plugin that does stuff - see the description."
+msgstr "'n Voorbeeldinprop wat dinge doen - sien die beskrywing."
+
+#. *  description
+#: ../pidgin/plugins/pidgininc.c:96
+msgid ""
+"This is a really cool plugin that does a lot of stuff:\n"
+"- It tells you who wrote the program when you log in\n"
+"- It reverses all incoming text\n"
+"- It sends a message to people on your list immediately when they sign on"
+msgstr ""
+"Hierdie is 'n baie oulike inprop wat klomp dinge doen:\n"
+"- Dit sê wie die program geskryf het wanneer mens aanmeld\n"
+"- Dit keer alle teks agterstevoorom\n"
+"- Dit stuur 'n boodksap aan mense op u lys die oomblik wat hulle aanmeld"
+
 #: ../pidgin/plugins/pidginrc.c:41
 msgid "Cursor Color"
-msgstr ""
+msgstr "Porkleur"
 
 #: ../pidgin/plugins/pidginrc.c:42
 msgid "Secondary Cursor Color"
-msgstr ""
+msgstr "Sekondêre porkleur"
 
 #: ../pidgin/plugins/pidginrc.c:43
 msgid "Hyperlink Color"
 msgstr "Hiperskakelkleur"
 
-#: ../pidgin/plugins/pidginrc.c:56
-msgid "GtkTreeView Expander Size"
-msgstr ""
-
-#: ../pidgin/plugins/pidginrc.c:57
+#: ../pidgin/plugins/pidginrc.c:54
 msgid "GtkTreeView Horizontal Separation"
-msgstr ""
-
-#: ../pidgin/plugins/pidginrc.c:76
+msgstr "GtkTreeView- horisontale skeiding"
+
+#: ../pidgin/plugins/pidginrc.c:73
 msgid "Conversation Entry"
 msgstr "Gesprekinskrywing"
 
-#: ../pidgin/plugins/pidginrc.c:77
+#: ../pidgin/plugins/pidginrc.c:74
 msgid "Conversation History"
 msgstr "Gesprekgeskiedenis"
 
-#: ../pidgin/plugins/pidginrc.c:78
+#: ../pidgin/plugins/pidginrc.c:75
 msgid "Log Viewer"
-msgstr ""
-
-#: ../pidgin/plugins/pidginrc.c:79
+msgstr "Staaflêerbekyker"
+
+#: ../pidgin/plugins/pidginrc.c:76
 msgid "Request Dialog"
-msgstr ""
-
-#: ../pidgin/plugins/pidginrc.c:80
+msgstr "Versoek-dialoog"
+
+#: ../pidgin/plugins/pidginrc.c:77
 msgid "Notify Dialog"
-msgstr ""
-
-#: ../pidgin/plugins/pidginrc.c:91
-msgid "GtkTreeView Indent Expanders"
-msgstr ""
-
-#: ../pidgin/plugins/pidginrc.c:322
+msgstr "Kennisstel-dialoog"
+
+#: ../pidgin/plugins/pidginrc.c:253
 msgid "Select Color"
 msgstr "Kies kleur"
 
-#: ../pidgin/plugins/pidginrc.c:361
+#: ../pidgin/plugins/pidginrc.c:300
+msgid "Select Interface Font"
+msgstr "Kies koppelvlakskriftipe"
+
+#: ../pidgin/plugins/pidginrc.c:303
 #, c-format
 msgid "Select Font for %s"
 msgstr "Kies skriftipe vir %s"
 
-#: ../pidgin/plugins/pidginrc.c:398
-msgid "Select Interface Font"
-msgstr "Kies koppelvlakskrif"
-
-#: ../pidgin/plugins/pidginrc.c:453
+#: ../pidgin/plugins/pidginrc.c:371
 msgid "GTK+ Interface Font"
-msgstr "GTK+-koppelvlakskrif"
-
-#: ../pidgin/plugins/pidginrc.c:473
+msgstr "GTK+-koppelvlakskriftipe"
+
+#: ../pidgin/plugins/pidginrc.c:391
 msgid "GTK+ Text Shortcut Theme"
 msgstr "GTK+-tekskortpadtema"
 
-#: ../pidgin/plugins/pidginrc.c:508
+#.
+#. for (i = 0; i < G_N_ELEMENTS(widget_bool_prefs); i++) {
+#. hbox = gtk_hbox_new(FALSE, PIDGIN_HIG_CAT_SPACE);
+#. gtk_box_pack_start(GTK_BOX(frame), hbox, FALSE, FALSE, 0);
+#.
+#. check = pidgin_prefs_checkbox(_(widget_bool_names[i]),
+#. widget_bool_prefs_set[i], hbox);
+#. gtk_size_group_add_widget(labelsg, check);
+#.
+#. widget_bool_widgets[i] = pidgin_prefs_checkbox("", widget_bool_prefs[i], hbox);
+#. *
+#. gtk_size_group_add_widget(widgetsb, widget_bool_widgets[i]);
+#. *
+#. gtk_widget_set_sensitive(widget_bool_widgets[i],
+#. purple_prefs_get_bool(widget_bool_prefs_set[i]));
+#. g_signal_connect(G_OBJECT(check), "toggled",
+#. G_CALLBACK(pidgin_toggle_sensitive),
+#. widget_bool_widgets[i]);
+#. }
+#.
+#: ../pidgin/plugins/pidginrc.c:428
 msgid "Interface colors"
 msgstr "Koppelvlakkleure"
 
-#: ../pidgin/plugins/pidginrc.c:532
+#: ../pidgin/plugins/pidginrc.c:452
 msgid "Widget Sizes"
-msgstr ""
-
-#: ../pidgin/plugins/pidginrc.c:553
+msgstr "Dingessie-groottes"
+
+#: ../pidgin/plugins/pidginrc.c:473
 msgid "Fonts"
 msgstr "Skriftipes"
 
-#: ../pidgin/plugins/pidginrc.c:576
-msgid "Tools"
-msgstr "Gereedskap"
-
-#: ../pidgin/plugins/pidginrc.c:581
+#: ../pidgin/plugins/pidginrc.c:497
+msgid "Gtkrc File Tools"
+msgstr "Gtkrc-lêergereedskap"
+
+#: ../pidgin/plugins/pidginrc.c:502
 #, c-format
 msgid "Write settings to %s%sgtkrc-2.0"
 msgstr "Skryf instellings na %s%sgtkrc-2.0"
 
-#: ../pidgin/plugins/pidginrc.c:589
+#: ../pidgin/plugins/pidginrc.c:511
 msgid "Re-read gtkrc files"
 msgstr "Lees gtkrc-lêers weer"
 
-#: ../pidgin/plugins/pidginrc.c:616
+#: ../pidgin/plugins/pidginrc.c:544
 msgid "Pidgin GTK+ Theme Control"
 msgstr "Pidgin GTK+-temabeheer"
 
-#: ../pidgin/plugins/pidginrc.c:618 ../pidgin/plugins/pidginrc.c:619
+#: ../pidgin/plugins/pidginrc.c:546 ../pidgin/plugins/pidginrc.c:547
 msgid "Provides access to commonly used gtkrc settings."
 msgstr "Verskaf toegang tot algemeen gebruikte gtkrc-instellings."
 
 #: ../pidgin/plugins/raw.c:175
 msgid "Raw"
-msgstr ""
+msgstr "Rou"
 
 #: ../pidgin/plugins/raw.c:177
 msgid "Lets you send raw input to text-based protocols."
-msgstr ""
+msgstr "Laat u rou toevoer na teksgebaseerde protokols stuur."
 
 #: ../pidgin/plugins/raw.c:178
 msgid ""
-"Lets you send raw input to text-based protocols (Jabber, MSN, IRC, TOC). Hit "
+"Lets you send raw input to text-based protocols (XMPP, MSN, IRC, TOC). Hit "
 "'Enter' in the entry box to send. Watch the debug window."
 msgstr ""
+"Laat u rou toevoer na teksgebaseerde protokols (XMPP, MSN, IRC, TOC) stuur. "
+"Druk 'Enter' in die inskryfkassie om te stuur. Hou die ontfoutvenster dop."
 
 #: ../pidgin/plugins/relnot.c:71
 #, c-format
-msgid "You are using %s version %s.  The current version is %s.<hr>"
-msgstr "U gebruik %s weergawe %s.  Die huidige weergawe is %s.<hr>"
-
-#: ../pidgin/plugins/relnot.c:77
-#, c-format
-msgid ""
-"<b>ChangeLog:</b>\n"
-"%s<br><br>"
-msgstr ""
-"<b>Veranderinge:</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 ""
-"U kan weergawe %s verkry vanaf:<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 ""
+"U gebruik %s weergawe %s.  Die huidige weergawe is %s.  U kan dit kry van <a "
+"href=\"%s\">%s</a><hr>"
+
+#: ../pidgin/plugins/relnot.c:79
+#, c-format
+msgid "<b>ChangeLog:</b><br>%s"
+msgstr "<b>Veranderinge:</b><br>%s"
+
+#: ../pidgin/plugins/relnot.c:84 ../pidgin/plugins/relnot.c:85
 msgid "New Version Available"
 msgstr "Nuwe weergawe beskikbaar"
 
@@ -14728,19 +15923,19 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/relnot.c:145
+#: ../pidgin/plugins/relnot.c:143
 msgid "Release Notification"
 msgstr "Vrystellingskennisgewings"
 
 #. *< name
 #. *< version
 #. *  summary
-#: ../pidgin/plugins/relnot.c:148
+#: ../pidgin/plugins/relnot.c:146
 msgid "Checks periodically for new releases."
 msgstr "Kyk af en toe vir nuwe weergawes."
 
 #. *  description
-#: ../pidgin/plugins/relnot.c:150
+#: ../pidgin/plugins/relnot.c:148
 msgid ""
 "Checks periodically for new releases and notifies the user with the "
 "ChangeLog."
@@ -14748,70 +15943,70 @@
 "Kyk van tyd tot tyd vir nuwe weergawes en laat weet die gebruiker met die "
 "veranderings."
 
-#: ../pidgin/plugins/spellchk.c:1965
+#: ../pidgin/plugins/spellchk.c:1962
 msgid "Duplicate Correction"
 msgstr "Duplikaatverbetering"
 
-#: ../pidgin/plugins/spellchk.c:1966
+#: ../pidgin/plugins/spellchk.c:1963
 msgid "The specified word already exists in the correction list."
 msgstr "Die gespesifiseerde woord bestaan reeds in die verbeteringlys."
 
-#: ../pidgin/plugins/spellchk.c:2180
+#: ../pidgin/plugins/spellchk.c:2177
 msgid "Text Replacements"
 msgstr "Teksvervangings"
 
-#: ../pidgin/plugins/spellchk.c:2203
+#: ../pidgin/plugins/spellchk.c:2200
 msgid "You type"
 msgstr "U tik"
 
-#: ../pidgin/plugins/spellchk.c:2217
+#: ../pidgin/plugins/spellchk.c:2214
 msgid "You send"
 msgstr "U stuur"
 
-#: ../pidgin/plugins/spellchk.c:2231
+#: ../pidgin/plugins/spellchk.c:2228
 msgid "Whole words only"
-msgstr "Slegs heelwoorde"
-
-#: ../pidgin/plugins/spellchk.c:2243
+msgstr "Net heelwoorde"
+
+#: ../pidgin/plugins/spellchk.c:2240
 msgid "Case sensitive"
 msgstr "Kassensitief"
 
-#: ../pidgin/plugins/spellchk.c:2269
+#: ../pidgin/plugins/spellchk.c:2266
 msgid "Add a new text replacement"
 msgstr "Voeg 'n nuwe teksvervanging by"
 
-#: ../pidgin/plugins/spellchk.c:2285
+#: ../pidgin/plugins/spellchk.c:2282
 msgid "You _type:"
 msgstr "U _tik:"
 
-#: ../pidgin/plugins/spellchk.c:2302
+#: ../pidgin/plugins/spellchk.c:2299
 msgid "You _send:"
 msgstr "U _stuur:"
 
 #. 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 ""
 "Identies wat _kas betref (deaktiveer vir outomatiese hantering van "
 "hoofletters)"
 
-#: ../pidgin/plugins/spellchk.c:2316
+#: ../pidgin/plugins/spellchk.c:2313
 msgid "Only replace _whole words"
-msgstr "Vervang slegs _heelwoorde"
-
-#: ../pidgin/plugins/spellchk.c:2341
+msgstr "Vervang net _heelwoorde"
+
+#: ../pidgin/plugins/spellchk.c:2338
 msgid "General Text Replacement Options"
 msgstr "Algemene keuses vir teksvervanging"
 
-#: ../pidgin/plugins/spellchk.c:2342
+#: ../pidgin/plugins/spellchk.c:2339
 msgid "Enable replacement of last word on send"
 msgstr "Aktiveer vervanging van laaste woord tydens stuur"
 
-#: ../pidgin/plugins/spellchk.c:2367
+#: ../pidgin/plugins/spellchk.c:2370
 msgid "Text replacement"
 msgstr "Teksvervanging"
 
-#: ../pidgin/plugins/spellchk.c:2369 ../pidgin/plugins/spellchk.c:2370
+#: ../pidgin/plugins/spellchk.c:2372 ../pidgin/plugins/spellchk.c:2373
 msgid "Replaces text in outgoing messages according to user-defined rules."
 msgstr ""
 "Vervang teks in uitgaande boodskappe volgens gebruikergespesifiseerde reëls."
@@ -14822,7 +16017,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 "Vriendelint"
 
@@ -14830,13 +16025,13 @@
 #. *< 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 "'n Weergawe van die vriendelys wat horisontaal rol."
 
-#: ../pidgin/plugins/timestamp.c:136
+#: ../pidgin/plugins/timestamp.c:137
 msgid "Display Timestamps Every"
-msgstr "Vertoon tydstempels elke"
+msgstr "Wys tydstempels elke"
 
 #. *< type
 #. *< ui_requirement
@@ -14844,31 +16039,29 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/timestamp.c:195
+#: ../pidgin/plugins/timestamp.c:202
 msgid "Timestamp"
 msgstr "Tydstempel"
 
 #. *< name
 #. *< version
 #. *  summary
-#: ../pidgin/plugins/timestamp.c:198
+#: ../pidgin/plugins/timestamp.c:205
 msgid "Display iChat-style timestamps"
-msgstr "Vertoon iChat-tydstempels"
+msgstr "Wys iChat-tydstempels"
 
 #. *  description
-#: ../pidgin/plugins/timestamp.c:200
+#: ../pidgin/plugins/timestamp.c:207
 msgid "Display iChat-style timestamps every N minutes."
-msgstr "Vertoon iChat-tydstempels elke N minute."
+msgstr "Wys iChat-tydstempels elke N minute."
 
 #: ../pidgin/plugins/timestamp_format.c:23
 msgid "Timestamp Format Options"
-msgstr "Tydstempelformattering"
+msgstr "Tydstempelformatering"
 
 #: ../pidgin/plugins/timestamp_format.c:26
-#, c-format
-#, c-format
-msgid "_Force (traditional %s) 24-hour time format"
-msgstr "_Forseer (tradisionele %s-) 24-uur-tydformaat"
+msgid "_Force 24-hour time format"
+msgstr "_Dwing 24-uur-tydformaat"
 
 #: ../pidgin/plugins/timestamp_format.c:33
 msgid "Show dates in..."
@@ -14886,11 +16079,11 @@
 #: ../pidgin/plugins/timestamp_format.c:41
 #: ../pidgin/plugins/timestamp_format.c:50
 msgid "For delayed messages and in chats"
-msgstr "Vir vertraagde boodskappe en in geselskappe"
+msgstr "Vir vertraagde boodskappe en in geselsies"
 
 #: ../pidgin/plugins/timestamp_format.c:47
 msgid "_Message Logs:"
-msgstr "_Boodskapjoernale:"
+msgstr "_Boodskapstaaflêers:"
 
 #. *< type
 #. *< ui_requirement
@@ -14898,64 +16091,64 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/timestamp_format.c:144
+#: ../pidgin/plugins/timestamp_format.c:151
 msgid "Message Timestamp Formats"
 msgstr "Boodskaptydstempelformate"
 
 #. *< name
 #. *< version
 #. *  summary
-#: ../pidgin/plugins/timestamp_format.c:147
+#: ../pidgin/plugins/timestamp_format.c:154
 msgid "Customizes the message timestamp formats."
 msgstr "Pasgemaakte formate vir boodskaptydstempels."
 
 #. *  description
-#: ../pidgin/plugins/timestamp_format.c:149
+#: ../pidgin/plugins/timestamp_format.c:156
 msgid ""
 "This plugin allows the user to customize conversation and logging message "
 "timestamp formats."
 msgstr ""
 "Hierdie inprop laat die gebruiker toe om die formaat van tydstempels in "
-"gesprekke in joernale aan te pas."
-
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:183
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:569
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:616
+"gesprekke in staaflêers aan te pas."
+
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:174
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:593
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:640
 msgid "Opacity:"
 msgstr "Ondeursigtigheid:"
 
 #. IM Convo trans options
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:533
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:557
 msgid "IM Conversation Windows"
-msgstr "Gesprekvensters"
-
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:534
-msgid "_IM window transparency"
-msgstr "_Gesrekvenster-deursigtigheid"
-
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:548
-msgid "_Show slider bar in IM window"
-msgstr ""
-
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:555
-msgid "Remove IM window transparency on focus"
-msgstr "Verwyder gesprekvenster se deursigtigheid terwyl gefokus"
+msgstr "Kitsboodskap-gesprekvensters"
 
 #: ../pidgin/plugins/win32/transparency/win2ktrans.c:558
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:606
+msgid "_IM window transparency"
+msgstr "_Kitsboodskap-gesprekvenster-deursigtigheid"
+
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:572
+msgid "_Show slider bar in IM window"
+msgstr "_Wys skuifstaaf in kitsboodskapvenster"
+
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:579
+msgid "Remove IM window transparency on focus"
+msgstr "Verwyder kitsboodskapvenster se deursigtigheid terwyl gefokus"
+
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:582
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:630
 msgid "Always on top"
 msgstr "Altyd bo-op"
 
 #. Buddy List trans options
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:590
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:614
 msgid "Buddy List Window"
 msgstr "Vriendelysvenster"
 
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:591
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:615
 msgid "_Buddy List window transparency"
 msgstr "_Vriendelysvenster se deursigtigheid"
 
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:604
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:628
 msgid "Remove Buddy List window transparency on focus"
 msgstr "Verwyder vriendelysvenster se deursigtigheid tydens fokus"
 
@@ -14965,75 +16158,79 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:658
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:688
 msgid "Transparency"
 msgstr "Deursigtigheid"
 
 #. *< name
 #. *< version
 #. *  summary
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:661
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:691
 msgid "Variable Transparency for the buddy list and conversations."
-msgstr "Veranderbare deursigtigheid vir die vriendelys en geselsies."
+msgstr "Veranderbare deursigtigheid vir die vriendelys en gesprekke."
 
 #. *  description
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:663
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:693
 msgid ""
 "This plugin enables variable alpha transparency on conversation windows and "
 "the buddy list.\n"
 "\n"
 "* Note: This plugin requires Win2000 or greater."
 msgstr ""
-
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:307
+"Hierdie inprop stel wisselende alfadeursigtigheid op gespreksvensters en die "
+"vriendelys in staat.\n"
+"\n"
+"* Let wel: Hierdie inprop vereis Win2k of jonger."
+
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:303
 msgid "GTK+ Runtime Version"
 msgstr "GTK+-weergawe"
 
 #. Autostart
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:315
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:311
 msgid "Startup"
 msgstr "Begin"
 
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:316
-#, c-format
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:312
 #, c-format
 msgid "_Start %s on Windows startup"
 msgstr "_Begin %s met Windows-begin"
 
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:331
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:327
 msgid "_Dockable Buddy List"
-msgstr ""
+msgstr "_Dokbare vriendelys"
 
 #. Blist On Top
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:335
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:331
 msgid "_Keep Buddy List window on top:"
 msgstr "_Hou vriendelysvenster bo:"
 
 #. XXX: Did this ever work?
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:340
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:336
 msgid "Only when docked"
-msgstr ""
-
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:345
+msgstr "Net indien gedok"
+
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:341
 msgid "_Flash window when chat messages are received"
-msgstr "_Flits venster wanneer geselsboodskappe ontvang word"
-
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:369
-msgid "Pidgwin Options"
-msgstr "Pidgin-keuses"
+msgstr "_Flits venster wanneer geselsieboodskappe ontvang word"
 
 #: ../pidgin/plugins/win32/winprefs/winprefs.c:371
+msgid "Windows Pidgin Options"
+msgstr "Windows Pidgin-keuses"
+
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:373
 msgid "Options specific to Pidgin for Windows."
 msgstr "Keuses spesifiek aan Pidgin vir Windows."
 
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:372
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:374
 msgid ""
 "Provides options specific to Pidgin for Windows , such as buddy list docking."
 msgstr ""
-
-#: ../pidgin/plugins/xmppconsole.c:665
+"Verskaf keuses spesifiek vir Pidgin op Windows, soos vriendelysdokking."
+
+#: ../pidgin/plugins/xmppconsole.c:667
 msgid "<font color='#777777'>Logged out.</font>"
-msgstr ""
+msgstr "<font color='#777777'>Afgemeld.</font>"
 
 #. *< type
 #. *< ui_requirement
@@ -15041,10 +16238,10 @@
 #. *< 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 ""
+msgstr "XMPP-konsole"
 
 #: ../pidgin/plugins/xmppconsole.c:753
 msgid "Account: "
@@ -15052,47 +16249,262 @@
 
 #: ../pidgin/plugins/xmppconsole.c:780
 msgid "<font color='#777777'>Not connected to XMPP</font>"
-msgstr ""
+msgstr "<font color='#777777'>Nie aan XMPP verbind nie</font>"
 
 #: ../pidgin/plugins/xmppconsole.c:790
 msgid "Insert an <iq/> stanza."
-msgstr ""
+msgstr "Voeg 'n <iq/>-stanza in."
 
 #: ../pidgin/plugins/xmppconsole.c:799
 msgid "Insert a <presence/> stanza."
-msgstr ""
+msgstr "Voeg 'n <presence/>-stanza in."
 
 #: ../pidgin/plugins/xmppconsole.c:808
 msgid "Insert a <message/> stanza."
-msgstr ""
+msgstr "Voeg 'n <message/>-stanza in."
 
 #. *< name
 #. *< version
 #. *  summary
 #: ../pidgin/plugins/xmppconsole.c:863
 msgid "Send and receive raw XMPP stanzas."
-msgstr ""
+msgstr "Stuur en ontvang rou XMPP-stanzas."
 
 #. *  description
 #: ../pidgin/plugins/xmppconsole.c:865
 msgid "This plugin is useful for debbuging XMPP servers or clients."
-msgstr ""
+msgstr "Hierdie inprop is nuttig om XMPP-bedieners of -kliënte te ontfout."
+
+#~ msgid "_Bold"
+#~ msgstr "_Vetdruk"
+
+#~ msgid "_Italic"
+#~ msgstr "_Skuinsdruk"
+
+#~ msgid "_Underline"
+#~ msgstr "_Onderstreep"
+
+#~ msgid "_Larger"
+#~ msgstr "_Groter"
+
+#~ msgid "_Smaller"
+#~ msgstr "_Kleiner"
+
+#~ msgid ""
+#~ "%s was disconnected due to the following error:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "%s is afgesny weens die volgende fout:\n"
+#~ "%s"
+
+#~ msgid "Commands are not supported yet. Message was NOT sent."
+#~ msgstr "Opdragte word nog nie ondersteun nie. Boodskap is NIE gestuur nie."
+
+#~ msgid "Timestamps"
+#~ msgstr "Tydstempels"
+
+#~ msgid "..."
+#~ msgstr "..."
+
+#~ msgid "Still need to do something about this."
+#~ msgstr "Moet nog iets hieromtrent doen."
+
+#~ msgid "Autoreply"
+#~ msgstr "Outo-antwoord"
+
+#~ msgid "Autoreply for all the protocols"
+#~ msgstr "Outo-antwoord vir al die protokolle"
+
+#~ msgid ""
+#~ "This plugin lets you set autoreply message for any protocol. You can set "
+#~ "the global autoreply message from the Plugin-options dialog. To set some "
+#~ "specific autoreply message for a particular buddy, right click on the "
+#~ "buddy in the buddy-list window. To set autoreply messages for some "
+#~ "account, go to the `Advanced' tab of the Account-edit dialog."
+#~ msgstr ""
+#~ "Hierdie inprop laat mens 'n outo-antwoord-boodskap stel vir enige "
+#~ "protokol. Die globale outo-antwoord kan gestel word van die Inpropkeuses-"
+#~ "dialoog. Om 'n spesifieke outo-antwoord vir 'n spesifieke vriend te stel, "
+#~ "klik regs op die vriend in die vriendelys. Om 'n outo-antwoord vir 'n "
+#~ "rekening te stuur, gaan na die `Gevorderde'-oortjie van die Rekening-"
+#~ "wysigingsdialoog."
+
+#~ msgid "Set autoreply message for %s"
+#~ msgstr "Stel outoantwoord vir %s"
+
+#~ msgid "Set Autoreply Message"
+#~ msgstr "Stel outoantwoord"
+
+#~ msgid ""
+#~ "The following message will be sent to the buddy when the buddy sends you "
+#~ "a message and autoreply is enabled."
+#~ msgstr ""
+#~ "Die volgende boodskap sal aan die vriend gestuur word as die vriend 'n "
+#~ "boodskap stuur en u outo-antwoord is geaktiveer."
+
+#~ msgid "Set _Autoreply Message"
+#~ msgstr "Stel _outo-antwoord"
+
+#~ msgid "Autoreply message"
+#~ msgstr "Outoantwoord"
+
+#~ msgid "Send autoreply messages when"
+#~ msgstr "Stuur outo-antwoorde wanneer"
+
+#~ msgid "When my account is _away"
+#~ msgstr "my rekening op _weg is"
+
+#~ msgid "When my account is _idle"
+#~ msgstr "my rekening op _ledig is"
+
+#~ msgid "_Default reply"
+#~ msgstr "_Verstekantwoord"
+
+#~ msgid "Status message"
+#~ msgstr "Statusboodskap"
+
+#~ msgid "Autoreply with status message"
+#~ msgstr "Outo-antwoord met statusboodskap"
+
+#~ msgid "Always when there is a status message"
+#~ msgstr "Altyd as daar 'n statusboodskap is"
+
+#~ msgid "Only when there's no autoreply message"
+#~ msgstr "Slegs as daar geen outo-antwoord is nie"
+
+#~ msgid "Delay between autoreplies"
+#~ msgstr "Wagtyd tussen outo-antwoorde"
+
+#~ msgid "_Minimum delay (mins)"
+#~ msgstr "_Minimum wagtyd (minute)"
+
+#~ msgid "Times to send autoreplies"
+#~ msgstr "Aantal outo-antwoorde om te stuur"
+
+#~ msgid "Ma_ximum count"
+#~ msgstr "Ma_ksimum aantal"
+
+#~ msgid ""
+#~ "I am currently not available. Please leave your message, and I will get "
+#~ "back to you as soon as possible."
+#~ msgstr ""
+#~ "Ek is tans nie beskikbaar nie. Los gerus 'n boodskap en ek sal so gou "
+#~ "moontlik antwoord."
+
+#~ msgid "Jabber Account"
+#~ msgstr "Jabber-rekening"
+
+#~ msgid "Cannot join %s:"
+#~ msgstr "Kan nie by %s aansluit nie:"
+
+#~ msgid "Edit Jabber vCard"
+#~ msgstr "Wysig Jabber-vCard"
+
+#~ msgid "Search for Jabber users"
+#~ msgstr "Soek vir Jabber-gebruikers"
+
+#~ msgid "Invalid Jabber ID"
+#~ msgstr "Ongeldige Jabber-ID"
+
+#~ msgid "Change Jabber Password"
+#~ msgstr "Verander Jabber-wagwoord"
+
+#~ msgid "Malformed Jabber ID"
+#~ msgstr "Misvormde Jabber-ID"
+
+#~ msgid "Jabber Protocol Plugin"
+#~ msgstr "Inprop vir die Jabber-protokol"
+
+#~ msgid "Jabber Message Error"
+#~ msgstr "Jabber-boodskapfout"
+
+#~ msgid "User information for %s unavailable:"
+#~ msgstr "Gebruikerinligting vir %s nie beskikbaar nie:"
+
+#~ msgid "_Connect"
+#~ msgstr "_Verbind"
+
+#~ msgid "%s Address"
+#~ msgstr "%s-adres"
+
+#~ msgid "QQ: Available"
+#~ msgstr "QQ: Beskikaar"
+
+#~ msgid "QQ: Away"
+#~ msgstr "QQ: Weg"
+
+#~ msgid "QQ: Invisible"
+#~ msgstr "QQ: Onsigbaar"
+
+#~ msgid "QQ: Offline"
+#~ msgstr "QQ: Aflyn"
+
+#~ msgid "Unavailable"
+#~ msgstr "Nie beskikbaar"
+
+#~ msgid "Alias..."
+#~ msgstr "Alias..."
+
+#~ msgid "/Tools/Buddy Pounces"
+#~ msgstr "Vriendwagte"
+
+#~ msgid "Jabber developer"
+#~ msgstr "Jabber-programmeerder"
+
+#~ msgid "Slovack"
+#~ msgstr "Slowaaks"
+
+#, fuzzy
+#~ msgid "<FONT SIZE=\"4\">IRC:</FONT> #pidgwin on irc.freenode.net<BR><BR>"
+#~ msgstr "<FONT SIZE=\"4\">IRC:</FONT> #wingaim op irc.freenode.net<BR><BR>"
+
+#~ msgid "Larger font size"
+#~ msgstr "Groter skrif"
+
+#~ msgid "Smaller font size"
+#~ msgstr "Kleiner skrif"
+
+#~ msgid "Insert link"
+#~ msgstr "Voeg skakel in"
+
+#~ msgid "Insert image"
+#~ msgstr "Voeg prentjie in"
+
+#~ msgid "Insert smiley"
+#~ msgstr "Voeg gesiggie in"
+
+#~ msgid "Show buddy _icons"
+#~ msgstr "Wys vriend_ikone"
+
+#~ 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 ""
+#~ "U kan hierdie prentjie as 'n lêer oordra, in hierdie boodskap invoeg, of "
+#~ "as die vriendikoon gebruik vir hierdie gebruiker."
+
+#~ msgid "Tools"
+#~ msgstr "Gereedskap"
+
+#~ msgid "You are using %s version %s.  The current version is %s.<hr>"
+#~ msgstr "U gebruik %s weergawe %s.  Die huidige weergawe is %s.<hr>"
+
+#~ msgid ""
+#~ "You can get version %s from:<br><a href=\"http://pidgin.im/\">http://"
+#~ "pidgin.im</a>."
+#~ msgstr ""
+#~ "U kan weergawe %s verkry vanaf:<br><a href=\"http://pidgin.im/\">http://"
+#~ "pidgin.im</a>."
+
+#~ msgid "_Force (traditional %s) 24-hour time format"
+#~ msgstr "_Forseer (tradisionele %s-) 24-uur-tydformaat"
+
+#~ msgid "Pidgwin Options"
+#~ msgstr "Pidgin-keuses"
 
 #~ msgid "Gaim Internet Messenger"
 #~ msgstr "Gaim Internetboodskapper"
 
-#~ msgid "/Conversation/Insert Lin_k..."
-#~ msgstr "/Gesprek/Voeg s_kakel in..."
-
-#~ msgid "/Conversation/Insert Imag_e..."
-#~ msgstr "/Gesprek/Voeg pr_entjie in..."
-
-#~ msgid "/Conversation/Insert Link..."
-#~ msgstr "/Gesprek/Voeg skakel in..."
-
-#~ msgid "/Conversation/Insert Image..."
-#~ msgstr "/Gesprek/Voeg prentjie in..."
-
 #~ msgid "<FONT SIZE=\"4\">IRC:</FONT> #wingaim on irc.freenode.net<BR><BR>"
 #~ msgstr "<FONT SIZE=\"4\">IRC:</FONT> #wingaim op irc.freenode.net<BR><BR>"
 
diff -r e42b22d0f564 -r e19a9e7cf15d po/de.po
--- a/po/de.po	Fri Aug 17 22:50:00 2007 +0000
+++ b/po/de.po	Fri Aug 17 22:50:12 2007 +0000
@@ -12,8 +12,8 @@
 msgstr ""
 "Project-Id-Version: de\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-07-28 21:25+0200\n"
-"PO-Revision-Date: 2007-07-28 21:25+0200\n"
+"POT-Creation-Date: 2007-08-16 20:05+0200\n"
+"PO-Revision-Date: 2007-08-16 20:04+0200\n"
 "Last-Translator: Bjoern Voigt <bjoern@cs.tu-berlin.de>\n"
 "Language-Team: Deutsch <de@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -24,16 +24,17 @@
 
 #. 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
+#: ../finch/finch.c:64 ../finch/finch.c:300 ../finch/finch.c:329
+#: ../finch/finch.c:417
 msgid "Finch"
 msgstr "Finch"
 
-#: finch/finch.c:204
+#: ../finch/finch.c:206
 #, 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:206
+#: ../finch/finch.c:208
 #, c-format
 msgid ""
 "%s\n"
@@ -54,7 +55,7 @@
 "  -n, --nologin       nicht automatisch anmelden\n"
 "  -v, --version       zeigt aktuelle Version und beendet das Programm\n"
 
-#: finch/finch.c:325 pidgin/gtkmain.c:708
+#: ../finch/finch.c:327 ../pidgin/gtkmain.c:711
 #, c-format
 msgid ""
 "%s encountered errors migrating your settings from %s to %s. Please "
@@ -66,458 +67,498 @@
 "Migration per Hand. Bitte melden Sie diesen Fehler auf http://developer."
 "pidgin.im"
 
-#: finch/gntaccount.c:123 finch/gntaccount.c:478 finch/gntblist.c:299
-#: finch/gntblist.c:432 finch/gntblist.c:445 finch/gntplugin.c:185
-#: finch/gntplugin.c:233 finch/gntstatus.c:300 finch/gntstatus.c:308
-#: libpurple/protocols/jabber/buddy.c:1464
-#: libpurple/protocols/jabber/chat.c:677 libpurple/protocols/jabber/chat.c:688
-#: 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
+#: ../finch/gntaccount.c:123 ../finch/gntaccount.c:478 ../finch/gntblist.c:299
+#: ../finch/gntblist.c:432 ../finch/gntblist.c:445 ../finch/gntplugin.c:185
+#: ../finch/gntplugin.c:233 ../finch/gntstatus.c:300 ../finch/gntstatus.c:308
+#: ../libpurple/protocols/jabber/buddy.c:1464
+#: ../libpurple/protocols/jabber/chat.c:677
+#: ../libpurple/protocols/jabber/chat.c:688
+#: ../libpurple/protocols/jabber/jabber.c:1227
+#: ../libpurple/protocols/qq/group_join.c:328
+#: ../libpurple/protocols/qq/im.c:576 ../libpurple/protocols/silc/ops.c:57
+#: ../libpurple/protocols/silc/ops.c:1456
+#: ../libpurple/protocols/silc10/ops.c:1451
 msgid "Error"
 msgstr "Fehler"
 
-#: finch/gntaccount.c:123
+#: ../finch/gntaccount.c:123
 msgid "Account was not added"
 msgstr "Konto wurde nicht hinzugefügt"
 
-#: finch/gntaccount.c:124
+#: ../finch/gntaccount.c:124
 msgid "Screenname of an account must be non-empty."
 msgstr "Benutzername eines Kontos darf nicht leer sein."
 
-#: finch/gntaccount.c:431
+#: ../finch/gntaccount.c:431
 msgid "New mail notifications"
 msgstr "Benachrichtigung über neue Mails"
 
-#: finch/gntaccount.c:441
+#: ../finch/gntaccount.c:441
 msgid "Remember password"
 msgstr "Passwort speichern"
 
-#: finch/gntaccount.c:479
+#: ../finch/gntaccount.c:479
 msgid "There's no protocol plugins installed."
 msgstr "Es sind keine Protokoll-Plugins installiert."
 
-#: finch/gntaccount.c:480
+#: ../finch/gntaccount.c:480
 msgid "(You probably forgot to 'make install'.)"
 msgstr "(Sie haben wahrscheinlich vergessen 'make install' aufzurufen.)"
 
-#: finch/gntaccount.c:490 pidgin/gtkaccount.c:1473 pidgin/gtkblist.c:4024
+#: ../finch/gntaccount.c:490 ../pidgin/gtkaccount.c:1478
+#: ../pidgin/gtkblist.c:4023
 msgid "Modify Account"
 msgstr "Konto bearbeiten"
 
-#: finch/gntaccount.c:490
+#: ../finch/gntaccount.c:490
 msgid "New Account"
 msgstr "Neues Konto"
 
-#: finch/gntaccount.c:515 pidgin/gtkft.c:695
+#: ../finch/gntaccount.c:515 ../pidgin/gtkft.c:695
 msgid "Protocol:"
 msgstr "Protokoll:"
 
-#: finch/gntaccount.c:523 pidgin/plugins/gevolution/new_person_dialog.c:291
+#: ../finch/gntaccount.c:523
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:291
 msgid "Screen name:"
 msgstr "Benutzername:"
 
-#: finch/gntaccount.c:536
+#: ../finch/gntaccount.c:536
 msgid "Password:"
 msgstr "Passwort:"
 
-#: finch/gntaccount.c:546
+#: ../finch/gntaccount.c:546
 msgid "Alias:"
 msgstr "Alias:"
 
 #. Cancel button
 #. Cancel
-#: finch/gntaccount.c:569 finch/gntaccount.c:632 finch/gntaccount.c:878
-#: finch/gntblist.c:343 finch/gntblist.c:420 finch/gntblist.c:455
-#: finch/gntblist.c:802 finch/gntblist.c:1004 finch/gntblist.c:1100
-#: finch/gntblist.c:2209 finch/gntplugin.c:378 finch/gntpounce.c:458
-#: finch/gntpounce.c:656 finch/gntprefs.c:264 finch/gntstatus.c:144
-#: finch/gntstatus.c:481 finch/gntstatus.c:606 libpurple/account.c:984
-#: libpurple/account.c:1234 libpurple/account.c:1269
-#: libpurple/conversation.c:1173 libpurple/plugins/buddynote.c:51
-#: libpurple/protocols/gg/gg.c:502 libpurple/protocols/gg/gg.c:661
-#: libpurple/protocols/gg/gg.c:798 libpurple/protocols/gg/gg.c:879
-#: libpurple/protocols/jabber/buddy.c:588
-#: libpurple/protocols/jabber/buddy.c:1826
-#: libpurple/protocols/jabber/buddy.c:1862
-#: libpurple/protocols/jabber/chat.c:786
-#: libpurple/protocols/jabber/jabber.c: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: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: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
-#: libpurple/protocols/sametime/sametime.c:3389
-#: libpurple/protocols/sametime/sametime.c:3475
-#: libpurple/protocols/sametime/sametime.c:3646
-#: libpurple/protocols/sametime/sametime.c:5398
-#: libpurple/protocols/sametime/sametime.c:5488
-#: libpurple/protocols/sametime/sametime.c:5613
-#: 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:3252
-#: libpurple/protocols/yahoo/yahoo.c:3263 pidgin/gtkaccount.c:1912
-#: pidgin/gtkaccount.c:2506 pidgin/gtkblist.c:5926 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:1572
+#: ../finch/gntaccount.c:569 ../finch/gntaccount.c:632
+#: ../finch/gntaccount.c:878 ../finch/gntblist.c:343 ../finch/gntblist.c:420
+#: ../finch/gntblist.c:455 ../finch/gntblist.c:802 ../finch/gntblist.c:1004
+#: ../finch/gntblist.c:1100 ../finch/gntblist.c:2209 ../finch/gntplugin.c:378
+#: ../finch/gntpounce.c:458 ../finch/gntpounce.c:656 ../finch/gntprefs.c:264
+#: ../finch/gntsound.c:1045 ../finch/gntstatus.c:144 ../finch/gntstatus.c:481
+#: ../finch/gntstatus.c:606 ../libpurple/account.c:984
+#: ../libpurple/account.c:1234 ../libpurple/account.c:1269
+#: ../libpurple/conversation.c:1173 ../libpurple/plugins/buddynote.c:51
+#: ../libpurple/protocols/gg/gg.c:502 ../libpurple/protocols/gg/gg.c:661
+#: ../libpurple/protocols/gg/gg.c:798 ../libpurple/protocols/gg/gg.c:879
+#: ../libpurple/protocols/jabber/buddy.c:588
+#: ../libpurple/protocols/jabber/buddy.c:1826
+#: ../libpurple/protocols/jabber/buddy.c:1862
+#: ../libpurple/protocols/jabber/chat.c:786
+#: ../libpurple/protocols/jabber/jabber.c: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:6042
+#: ../libpurple/protocols/oscar/peer.c:1023
+#: ../libpurple/protocols/qq/buddy_info.c:484
+#: ../libpurple/protocols/qq/buddy_opt.c:214
+#: ../libpurple/protocols/qq/buddy_opt.c:411
+#: ../libpurple/protocols/qq/group.c:124
+#: ../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:113
+#: ../libpurple/protocols/qq/sys_msg.c:172
+#: ../libpurple/protocols/qq/sys_msg.c:266
+#: ../libpurple/protocols/sametime/sametime.c:3389
+#: ../libpurple/protocols/sametime/sametime.c:3475
+#: ../libpurple/protocols/sametime/sametime.c:3646
+#: ../libpurple/protocols/sametime/sametime.c:5398
+#: ../libpurple/protocols/sametime/sametime.c:5488
+#: ../libpurple/protocols/sametime/sametime.c:5613
+#: ../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:1006
+#: ../libpurple/protocols/yahoo/yahoo.c:3337
+#: ../libpurple/protocols/yahoo/yahoo.c:3348 ../pidgin/gtkaccount.c:1917
+#: ../pidgin/gtkaccount.c:2511 ../pidgin/gtkblist.c:5925
+#: ../pidgin/gtkdialogs.c:747 ../pidgin/gtkdialogs.c:885
+#: ../pidgin/gtkdialogs.c:977 ../pidgin/gtkdialogs.c:997
+#: ../pidgin/gtkdialogs.c:1021 ../pidgin/gtkdialogs.c:1043
+#: ../pidgin/gtkdialogs.c:1091 ../pidgin/gtkdialogs.c:1132
+#: ../pidgin/gtkdialogs.c:1188 ../pidgin/gtkdialogs.c:1227
+#: ../pidgin/gtkdialogs.c:1254 ../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:1572
 msgid "Cancel"
 msgstr "Abbrechen"
 
 #. Save button
 #. Save
-#: finch/gntaccount.c:573 finch/gntplugin.c:378 finch/gntpounce.c:464
-#: finch/gntprefs.c:264 finch/gntstatus.c:484 finch/gntstatus.c:594
-#: libpurple/account.c:1268 libpurple/plugins/buddynote.c:50
-#: libpurple/protocols/jabber/buddy.c:587 pidgin/gtkdebug.c:748
-#: pidgin/gtkrequest.c:276
+#: ../finch/gntaccount.c:573 ../finch/gntplugin.c:378 ../finch/gntpounce.c:464
+#: ../finch/gntprefs.c:264 ../finch/gntsound.c:1042 ../finch/gntstatus.c:484
+#: ../finch/gntstatus.c:594 ../libpurple/account.c:1268
+#: ../libpurple/plugins/buddynote.c:50
+#: ../libpurple/protocols/jabber/buddy.c:587 ../pidgin/gtkdebug.c:748
+#: ../pidgin/gtkrequest.c:276
 msgid "Save"
 msgstr "Speichern"
 
-#: finch/gntaccount.c:626 pidgin/gtkaccount.c:1904
-#: pidgin/gtksavedstatuses.c:332 pidgin/gtkstatusbox.c:1566
+#: ../finch/gntaccount.c:626 ../pidgin/gtkaccount.c:1909
+#: ../pidgin/gtksavedstatuses.c:332 ../pidgin/gtkstatusbox.c:1566
 #, c-format
 msgid "Are you sure you want to delete %s?"
 msgstr "Wollen Sie %s wirklich löschen?"
 
-#: finch/gntaccount.c:629
+#: ../finch/gntaccount.c:629
 msgid "Delete Account"
 msgstr "Konto löschen"
 
 #. Delete button
-#: finch/gntaccount.c:631 finch/gntaccount.c:701 finch/gntpounce.c:655
-#: finch/gntpounce.c:718 finch/gntstatus.c:143 finch/gntstatus.c:209
-#: pidgin/gtkaccount.c:1911 pidgin/gtklog.c:326 pidgin/gtkpounce.c:1114
-#: pidgin/gtkrequest.c:273 pidgin/gtksavedstatuses.c:343
-#: pidgin/gtkstatusbox.c:1571
+#: ../finch/gntaccount.c:631 ../finch/gntaccount.c:701
+#: ../finch/gntpounce.c:655 ../finch/gntpounce.c:718 ../finch/gntstatus.c:143
+#: ../finch/gntstatus.c:209 ../pidgin/gtkaccount.c:1916 ../pidgin/gtklog.c:326
+#: ../pidgin/gtkpounce.c:1114 ../pidgin/gtkrequest.c:273
+#: ../pidgin/gtksavedstatuses.c:343 ../pidgin/gtkstatusbox.c:1571
 msgid "Delete"
 msgstr "Löschen"
 
-#: finch/gntaccount.c:663 finch/gntblist.c:2115 finch/gntui.c:77
-#: pidgin/gtkaccount.c:2329 pidgin/gtkdocklet.c:522
+#: ../finch/gntaccount.c:663 ../finch/gntblist.c:2115 ../finch/gntui.c:81
+#: ../pidgin/gtkaccount.c:2334 ../pidgin/gtkdocklet.c:522
 msgid "Accounts"
 msgstr "Konten"
 
-#: finch/gntaccount.c:669
+#: ../finch/gntaccount.c:669
 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:692 finch/gntaccount.c:877 finch/gntblist.c:342
-#: finch/gntblist.c:420 finch/gntblist.c:455 finch/gntnotify.c:379
-#: finch/gntpounce.c:702 finch/gntstatus.c:198 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:5487
-#: libpurple/protocols/silc/chat.c:615 libpurple/protocols/silc10/chat.c:599
-#: pidgin/gtkaccount.c:2505 pidgin/gtkblist.c:5925 pidgin/gtkconv.c:1650
-#: pidgin/gtkrequest.c:274
+#: ../finch/gntaccount.c:692 ../finch/gntaccount.c:877 ../finch/gntblist.c:342
+#: ../finch/gntblist.c:420 ../finch/gntblist.c:455 ../finch/gntnotify.c:379
+#: ../finch/gntpounce.c:702 ../finch/gntstatus.c:198
+#: ../libpurple/protocols/gg/gg.c:878 ../libpurple/protocols/qq/sys_msg.c:114
+#: ../libpurple/protocols/qq/sys_msg.c:173
+#: ../libpurple/protocols/qq/sys_msg.c:267
+#: ../libpurple/protocols/sametime/sametime.c:5487
+#: ../libpurple/protocols/silc/chat.c:615
+#: ../libpurple/protocols/silc10/chat.c:599 ../pidgin/gtkaccount.c:2510
+#: ../pidgin/gtkblist.c:5924 ../pidgin/gtkconv.c:1654
+#: ../pidgin/gtkrequest.c:274
 msgid "Add"
 msgstr "Hinzufügen"
 
 #. Modify button
-#: finch/gntaccount.c:697 finch/gntpounce.c:710
+#: ../finch/gntaccount.c:697 ../finch/gntpounce.c:710
 msgid "Modify"
 msgstr "Bearbeiten"
 
-#: finch/gntaccount.c:800 pidgin/gtkaccount.c:2452
+#: ../finch/gntaccount.c:800 ../pidgin/gtkaccount.c:2457
 #, 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:873 pidgin/gtkaccount.c:2504
+#: ../finch/gntaccount.c:873 ../pidgin/gtkaccount.c:2509
 msgid "Add buddy to your list?"
 msgstr "Benutzer zu Ihrer Buddy-Liste hinzufügen?"
 
-#: finch/gntaccount.c:927 pidgin/gtkaccount.c:2556
+#: ../finch/gntaccount.c:933 ../pidgin/gtkaccount.c:2567
 #, 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:952 finch/gntaccount.c:955 finch/gntaccount.c:982
-#: pidgin/gtkaccount.c:2579 pidgin/gtkaccount.c:2585
+#: ../finch/gntaccount.c:958 ../finch/gntaccount.c:961
+#: ../finch/gntaccount.c:988 ../pidgin/gtkaccount.c:2590
+#: ../pidgin/gtkaccount.c:2596
 msgid "Authorize buddy?"
 msgstr "Buddy autorisieren?"
 
-#: finch/gntaccount.c:959 finch/gntaccount.c:986 pidgin/gtkaccount.c:2580
-#: pidgin/gtkaccount.c:2586
+#: ../finch/gntaccount.c:965 ../finch/gntaccount.c:992
+#: ../pidgin/gtkaccount.c:2591 ../pidgin/gtkaccount.c:2597
 msgid "Authorize"
 msgstr "Autorisieren"
 
-#: finch/gntaccount.c:960 finch/gntaccount.c:987 pidgin/gtkaccount.c:2581
-#: pidgin/gtkaccount.c:2587
+#: ../finch/gntaccount.c:966 ../finch/gntaccount.c:993
+#: ../pidgin/gtkaccount.c:2592 ../pidgin/gtkaccount.c:2598
 msgid "Deny"
 msgstr "Sperren"
 
-#: finch/gntblist.c:288
+#: ../finch/gntblist.c:288
 msgid "You must provide a screename for the buddy."
 msgstr "Sie müssen einen Benutzernamen für den Buddy angeben."
 
-#: finch/gntblist.c:290
+#: ../finch/gntblist.c:290
 msgid "You must provide a group."
 msgstr "Sie müssen eine Gruppe angeben."
 
-#: finch/gntblist.c:292
+#: ../finch/gntblist.c:292
 msgid "You must select an account."
 msgstr "Sie müssen ein Konto auswählen."
 
-#: finch/gntblist.c:294
+#: ../finch/gntblist.c:294
 msgid "The selected account is not online."
 msgstr "Das gewählte Konto ist nicht online."
 
-#: finch/gntblist.c:299
+#: ../finch/gntblist.c:299
 msgid "Error adding buddy"
 msgstr "Fehler beim Hinzufügen des Buddys"
 
-#: finch/gntblist.c:324 libpurple/protocols/oscar/oscar.c:2860
-#: pidgin/gtkaccount.c:1985 pidgin/gtksavedstatuses.c:979
+#: ../finch/gntblist.c:324 ../libpurple/protocols/oscar/oscar.c:2858
+#: ../pidgin/gtkaccount.c:1990 ../pidgin/gtksavedstatuses.c:979
 msgid "Screen Name"
 msgstr "Benutzername"
 
-#: finch/gntblist.c:327 finch/gntblist.c:409 finch/gntblist.c:1249
-#: libpurple/protocols/msn/msn.c:1364 libpurple/protocols/silc/chat.c:606
-#: libpurple/protocols/silc10/chat.c:590
-#: libpurple/protocols/yahoo/yahoo_profile.c:704
-#: libpurple/protocols/zephyr/zephyr.c:788
-#: libpurple/protocols/zephyr/zephyr.c:1207 pidgin/gtkdialogs.c:976
-#: pidgin/gtkdialogs.c:1000 pidgin/gtkdialogs.c:1022 pidgin/gtkrequest.c:277
+#: ../finch/gntblist.c:327 ../finch/gntblist.c:409 ../finch/gntblist.c:1249
+#: ../libpurple/protocols/msn/msn.c:1364
+#: ../libpurple/protocols/silc/chat.c:606
+#: ../libpurple/protocols/silc10/chat.c:590
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:704
+#: ../libpurple/protocols/zephyr/zephyr.c:788
+#: ../libpurple/protocols/zephyr/zephyr.c:1207 ../pidgin/gtkdialogs.c:996
+#: ../pidgin/gtkdialogs.c:1020 ../pidgin/gtkdialogs.c:1042
+#: ../pidgin/gtkrequest.c:277
 msgid "Alias"
 msgstr "Alias"
 
-#: finch/gntblist.c:330 finch/gntblist.c:412
+#: ../finch/gntblist.c:330 ../finch/gntblist.c:412
 msgid "Group"
 msgstr "Gruppe"
 
-#: finch/gntblist.c:334 finch/gntblist.c:400 finch/gntblist.c:1301
-#: finch/gntnotify.c:173 finch/gntstatus.c:572 libpurple/plugins/idle.c:153
-#: libpurple/plugins/idle.c:190 pidgin/gtkblist.c:2983 pidgin/gtknotify.c:482
-#: pidgin/gtkpounce.c:1282 pidgin/plugins/gevolution/gevolution.c:445
+#: ../finch/gntblist.c:334 ../finch/gntblist.c:400 ../finch/gntblist.c:1301
+#: ../finch/gntnotify.c:173 ../finch/gntstatus.c:572
+#: ../libpurple/plugins/idle.c:153 ../libpurple/plugins/idle.c:190
+#: ../pidgin/gtkblist.c:2986 ../pidgin/gtknotify.c:483
+#: ../pidgin/gtkpounce.c:1282 ../pidgin/plugins/gevolution/gevolution.c:445
 msgid "Account"
 msgstr "Konto"
 
-#: finch/gntblist.c:340 finch/gntblist.c:851
-#: libpurple/protocols/silc/buddy.c:725 libpurple/protocols/silc/buddy.c:1027
-#: libpurple/protocols/silc/buddy.c:1072 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:3165 pidgin/gtkblist.c:5432
-#: pidgin/plugins/gevolution/add_buddy_dialog.c:445
+#: ../finch/gntblist.c:340 ../finch/gntblist.c:851
+#: ../libpurple/protocols/silc/buddy.c:725
+#: ../libpurple/protocols/silc/buddy.c:1027
+#: ../libpurple/protocols/silc/buddy.c:1072
+#: ../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:3182 ../pidgin/gtkblist.c:5431
+#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:445
 msgid "Add Buddy"
 msgstr "Buddy hinzufügen"
 
-#: finch/gntblist.c:340
+#: ../finch/gntblist.c:340
 msgid "Please enter buddy information."
 msgstr "Bitte Buddy-Informationen angeben."
 
-#: finch/gntblist.c:369 libpurple/blist.c:1190
+#: ../finch/gntblist.c:369 ../libpurple/blist.c:1190
 msgid "Chats"
 msgstr "Chats"
 
 #. Extract their Name and put it in
-#: finch/gntblist.c:406 libpurple/protocols/jabber/jabber.c:813
-#: libpurple/protocols/msn/msn.c:1553 libpurple/protocols/msn/msn.c:1618
-#: libpurple/protocols/msn/msn.c:1645 libpurple/protocols/qq/buddy_info.c:44
-#: pidgin/gtkplugin.c:581 pidgin/gtkroomlist.c:617
-#: pidgin/plugins/gevolution/add_buddy_dialog.c:132
-#: pidgin/plugins/gevolution/assoc-buddy.c:123
+#: ../finch/gntblist.c:406 ../libpurple/protocols/jabber/jabber.c:813
+#: ../libpurple/protocols/msn/msn.c:1553 ../libpurple/protocols/msn/msn.c:1618
+#: ../libpurple/protocols/msn/msn.c:1645
+#: ../libpurple/protocols/qq/buddy_info.c:44 ../pidgin/gtkplugin.c:581
+#: ../pidgin/gtkroomlist.c:617
+#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:132
+#: ../pidgin/plugins/gevolution/assoc-buddy.c:123
 msgid "Name"
 msgstr "Name"
 
-#: finch/gntblist.c:415 finch/gntblist.c:818
+#: ../finch/gntblist.c:415 ../finch/gntblist.c:818
 msgid "Auto-join"
 msgstr "Automatisch beitreten"
 
-#: finch/gntblist.c:418 finch/gntblist.c:853 pidgin/gtkblist.c:5811
+#: ../finch/gntblist.c:418 ../finch/gntblist.c:853 ../pidgin/gtkblist.c:5810
 msgid "Add Chat"
 msgstr "Chat hinzufügen"
 
-#: finch/gntblist.c:419
+#: ../finch/gntblist.c:419
 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:432 finch/gntblist.c:445
+#: ../finch/gntblist.c:432 ../finch/gntblist.c:445
 msgid "Error adding group"
 msgstr "Fehler beim Hinzufügen der Gruppe"
 
-#: finch/gntblist.c:433
+#: ../finch/gntblist.c:433
 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:446
+#: ../finch/gntblist.c:446
 msgid "A group with the name already exists."
 msgstr "Es gibt schon eine Gruppe mit diesem Namen."
 
-#: finch/gntblist.c:453 finch/gntblist.c:855
-#: libpurple/protocols/sametime/sametime.c:5397
-#: libpurple/protocols/sametime/sametime.c:5485 pidgin/gtkblist.c:5922
+#: ../finch/gntblist.c:453 ../finch/gntblist.c:855
+#: ../libpurple/protocols/sametime/sametime.c:5397
+#: ../libpurple/protocols/sametime/sametime.c:5485 ../pidgin/gtkblist.c:5921
 msgid "Add Group"
 msgstr "Gruppe hinzufügen"
 
-#: finch/gntblist.c:453
+#: ../finch/gntblist.c:453
 msgid "Enter the name of the group"
 msgstr "Bitte geben Sie den Namen der Gruppe ein"
 
-#: finch/gntblist.c:801
+#: ../finch/gntblist.c:801
 msgid "Edit Chat"
 msgstr "Chat bearbeiten"
 
-#: finch/gntblist.c:801
+#: ../finch/gntblist.c:801
 msgid "Please Update the necessary fields."
 msgstr "Bitte aktualisieren Sie die erforderlichen Felder."
 
-#: finch/gntblist.c:802 finch/gntstatus.c:204
+#: ../finch/gntblist.c:802 ../finch/gntstatus.c:204
 msgid "Edit"
 msgstr "Bearbeiten"
 
-#: finch/gntblist.c:827
+#: ../finch/gntblist.c:827
 msgid "Edit Settings"
 msgstr "Einstellungen bearbeiten"
 
-#: finch/gntblist.c:863 pidgin/gtkutils.c:930
+#: ../finch/gntblist.c:863 ../pidgin/gtkutils.c:930
 msgid "Information"
 msgstr "Information"
 
-#: finch/gntblist.c:863 pidgin/gtkutils.c:930
+#: ../finch/gntblist.c:863 ../pidgin/gtkutils.c:930
 msgid "Retrieving..."
 msgstr "Empfange..."
 
-#: finch/gntblist.c:903 finch/gntconv.c:407
-#: libpurple/protocols/silc/chat.c:899 libpurple/protocols/silc10/chat.c:883
+#: ../finch/gntblist.c:903 ../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:907
+#: ../finch/gntblist.c:907
 msgid "Add Buddy Pounce"
 msgstr "Buddy-Alarm hinzufügen"
 
 #. if (q_bud && is_online(q_bud->status)) {
-#: finch/gntblist.c:914 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:1598
+#: ../finch/gntblist.c:914 ../finch/gntconv.c:419
+#: ../libpurple/protocols/jabber/si.c:868
+#: ../libpurple/protocols/oscar/oscar.c:653 ../libpurple/protocols/qq/qq.c:587
+#: ../pidgin/gtkconv.c:1602
 msgid "Send File"
 msgstr "Datei versenden"
 
-#: finch/gntblist.c:918
+#: ../finch/gntblist.c:918
 msgid "View Log"
 msgstr "Mitschnitt anzeigen"
 
-#: finch/gntblist.c:999
+#: ../finch/gntblist.c:999
 #, c-format
 msgid "Please enter the new name for %s"
 msgstr "Bitte geben Sie den neuen Namen für %s ein"
 
-#: finch/gntblist.c:1001 finch/gntblist.c:1249
+#: ../finch/gntblist.c:1001 ../finch/gntblist.c:1249
 msgid "Rename"
 msgstr "Umbenennen"
 
-#: finch/gntblist.c:1001
+#: ../finch/gntblist.c:1001
 msgid "Set Alias"
 msgstr "Alias setzen"
 
-#: finch/gntblist.c:1002
+#: ../finch/gntblist.c:1002
 msgid "Enter empty string to reset the name."
 msgstr "Geben Sie eine leere Zeichenkette ein, um den Namen zurückzusetzen."
 
-#: finch/gntblist.c:1078
+#: ../finch/gntblist.c:1078
 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:1086
+#: ../finch/gntblist.c:1086
 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:1091
+#: ../finch/gntblist.c:1091
 #, 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:1094
+#: ../finch/gntblist.c:1094
 msgid "Confirm Remove"
 msgstr "Entfernen bestätigen"
 
-#: finch/gntblist.c:1099 finch/gntblist.c:1251 finch/gntft.c:224
-#: pidgin/gtkconv.c:1647 pidgin/gtkrequest.c:275 pidgin/gtkstatusbox.c:263
+#: ../finch/gntblist.c:1099 ../finch/gntblist.c:1251 ../finch/gntft.c:224
+#: ../pidgin/gtkconv.c:1651 ../pidgin/gtkrequest.c:275
+#: ../pidgin/gtkstatusbox.c:263
 msgid "Remove"
 msgstr "Entfernen"
 
 #. Buddy List
-#: finch/gntblist.c:1225 finch/gntblist.c:2294 finch/gntprefs.c:257
-#: finch/gntui.c:78 pidgin/gtkblist.c:4268
-#: pidgin/plugins/win32/winprefs/winprefs.c:330
+#: ../finch/gntblist.c:1225 ../finch/gntblist.c:2294 ../finch/gntprefs.c:257
+#: ../finch/gntui.c:82 ../pidgin/gtkblist.c:4267
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:326
 msgid "Buddy List"
 msgstr "Buddy-Liste"
 
-#: finch/gntblist.c:1256
+#: ../finch/gntblist.c:1256
 msgid "Place tagged"
 msgstr "Stelle markiert"
 
-#: finch/gntblist.c:1261
+#: ../finch/gntblist.c:1261
 msgid "Toggle Tag"
 msgstr "Markierung umkehren"
 
 #. General
-#: finch/gntblist.c:1296 libpurple/protocols/gg/gg.c:632
-#: libpurple/protocols/gg/gg.c:1045 libpurple/protocols/gg/gg.c:1118
-#: libpurple/protocols/gg/gg.c:2202 libpurple/protocols/jabber/buddy.c:274
-#: libpurple/protocols/jabber/buddy.c:856
-#: libpurple/protocols/jabber/buddy.c:1627
-#: libpurple/protocols/jabber/buddy.c:1809
-#: libpurple/protocols/jabber/jabber.c:823 libpurple/protocols/msn/msn.c:1372
-#: libpurple/protocols/msn/msn.c:1556 libpurple/protocols/qq/buddy_info.c:43
-#: libpurple/protocols/silc/buddy.c:1535 libpurple/protocols/silc/ops.c:1002
-#: 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:1066 pidgin/gtkblist.c:3007
+#: ../finch/gntblist.c:1296 ../libpurple/protocols/gg/gg.c:632
+#: ../libpurple/protocols/gg/gg.c:1045 ../libpurple/protocols/gg/gg.c:1118
+#: ../libpurple/protocols/gg/gg.c:2202
+#: ../libpurple/protocols/jabber/buddy.c:274
+#: ../libpurple/protocols/jabber/buddy.c:856
+#: ../libpurple/protocols/jabber/buddy.c:1627
+#: ../libpurple/protocols/jabber/buddy.c:1809
+#: ../libpurple/protocols/jabber/jabber.c:823
+#: ../libpurple/protocols/msn/msn.c:1372 ../libpurple/protocols/msn/msn.c:1556
+#: ../libpurple/protocols/qq/buddy_info.c:43
+#: ../libpurple/protocols/silc/buddy.c:1535
+#: ../libpurple/protocols/silc/ops.c:1002
+#: ../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:1066 ../pidgin/gtkblist.c:3010
 msgid "Nickname"
 msgstr "Spitzname"
 
 #. Idle stuff
-#: finch/gntblist.c:1316 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:2884
-#: libpurple/protocols/yahoo/yahoo.c:2919
-#: libpurple/protocols/yahoo/yahoo_profile.c:710 pidgin/gtkblist.c:3035
-#: pidgin/gtkblist.c:3444 pidgin/gtkprefs.c:1918
+#: ../finch/gntblist.c:1316 ../finch/gntprefs.c:260
+#: ../libpurple/protocols/bonjour/bonjour.c:333
+#: ../libpurple/protocols/jabber/buddy.c:647
+#: ../libpurple/protocols/jabber/buddy.c:687
+#: ../libpurple/protocols/msn/msn.c:516 ../libpurple/protocols/msn/state.c:32
+#: ../libpurple/protocols/novell/novell.c:2825
+#: ../libpurple/protocols/oscar/oscar.c:2882
+#: ../libpurple/protocols/yahoo/yahoo.c:2936
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:710 ../pidgin/gtkblist.c:3038
+#: ../pidgin/gtkblist.c:3443 ../pidgin/gtkprefs.c:1920
 msgid "Idle"
 msgstr "Untätig"
 
-#: finch/gntblist.c:1330
+#: ../finch/gntblist.c:1330
 msgid "On Mobile"
 msgstr "Am Handy"
 
-#: finch/gntblist.c:1411
+#: ../finch/gntblist.c:1411
 #, c-format
 msgid ""
 "Online: %d\n"
@@ -526,12 +567,12 @@
 "Online: %d\n"
 "Gesamt: %d"
 
-#: finch/gntblist.c:1420
+#: ../finch/gntblist.c:1420
 #, c-format
 msgid "Account: %s (%s)"
 msgstr "Konto: %s (%s)"
 
-#: finch/gntblist.c:1432
+#: ../finch/gntblist.c:1432
 #, c-format
 msgid ""
 "\n"
@@ -540,103 +581,113 @@
 "\n"
 "Zuletzt gesehen: vor %s"
 
-#: finch/gntblist.c:1698 pidgin/gtkdocklet.c:470 pidgin/gtkstatusbox.c:1070
+#: ../finch/gntblist.c:1698 ../pidgin/gtkdocklet.c:470
+#: ../pidgin/gtkstatusbox.c:1070
 msgid "New..."
 msgstr "Neu..."
 
-#: finch/gntblist.c:1705 pidgin/gtkdocklet.c:471 pidgin/gtkstatusbox.c:1071
+#: ../finch/gntblist.c:1705 ../pidgin/gtkdocklet.c:471
+#: ../pidgin/gtkstatusbox.c:1071
 msgid "Saved..."
 msgstr "Gespeichert..."
 
-#: finch/gntblist.c:2083 finch/gntplugin.c:254 finch/gntui.c:82
-#: pidgin/gtkdocklet.c:523 pidgin/gtkplugin.c:530
+#: ../finch/gntblist.c:2083 ../finch/gntplugin.c:254 ../finch/gntui.c:86
+#: ../pidgin/gtkdocklet.c:523 ../pidgin/gtkplugin.c:530
 msgid "Plugins"
 msgstr "Plugins"
 
-#: finch/gntblist.c:2190 pidgin/gtkdialogs.c:708 pidgin/gtkdialogs.c:846
-#: pidgin/gtkdialogs.c:927
+#: ../finch/gntblist.c:2190 ../pidgin/gtkdialogs.c:728
+#: ../pidgin/gtkdialogs.c:866 ../pidgin/gtkdialogs.c:947
 msgid "_Name"
 msgstr "_Name"
 
-#: finch/gntblist.c:2195 pidgin/gtkdialogs.c:713 pidgin/gtkdialogs.c:851
-#: pidgin/gtkdialogs.c:932
+#: ../finch/gntblist.c:2195 ../pidgin/gtkdialogs.c:733
+#: ../pidgin/gtkdialogs.c:871 ../pidgin/gtkdialogs.c:952
 msgid "_Account"
 msgstr "_Konto"
 
-#: finch/gntblist.c:2203 pidgin/gtkdialogs.c:721
+#: ../finch/gntblist.c:2203 ../pidgin/gtkdialogs.c:741
 msgid "New Instant Message"
 msgstr "Neue Sofortnachricht"
 
-#: finch/gntblist.c:2205 pidgin/gtkdialogs.c:723
+#: ../finch/gntblist.c:2205 ../pidgin/gtkdialogs.c:743
 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:2208 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: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:3251
-#: libpurple/protocols/yahoo/yahoo.c:3262 pidgin/gtkblist.c:4023
-#: pidgin/gtkdialogs.c:726 pidgin/gtkdialogs.c:864 pidgin/gtkdialogs.c:956
-#: pidgin/gtkrequest.c:269
+#: ../finch/gntblist.c:2208 ../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:6041
+#: ../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:1005
+#: ../libpurple/protocols/yahoo/yahoo.c:3336
+#: ../libpurple/protocols/yahoo/yahoo.c:3347 ../pidgin/gtkblist.c:4022
+#: ../pidgin/gtkdialogs.c:746 ../pidgin/gtkdialogs.c:884
+#: ../pidgin/gtkdialogs.c:976 ../pidgin/gtkrequest.c:269
 msgid "OK"
 msgstr "OK"
 
 #. Create the "Options" frame.
-#: finch/gntblist.c:2228 finch/gntpounce.c:446 pidgin/gtkpounce.c:791
+#: ../finch/gntblist.c:2228 ../finch/gntpounce.c:446 ../pidgin/gtkpounce.c:791
 msgid "Options"
 msgstr "Optionen"
 
-#: finch/gntblist.c:2234
+#: ../finch/gntblist.c:2234
 msgid "Send IM..."
 msgstr "Nachricht senden..."
 
-#: finch/gntblist.c:2238
+#: ../finch/gntblist.c:2238
 msgid "Show empty groups"
 msgstr "Zeige leere Gruppen"
 
-#: finch/gntblist.c:2244
+#: ../finch/gntblist.c:2244
 msgid "Show offline buddies"
 msgstr "Zeige Offline-Buddys"
 
-#: finch/gntblist.c:2250
+#: ../finch/gntblist.c:2250
 msgid "Sort by status"
 msgstr "Nach Status sortieren"
 
-#: finch/gntblist.c:2254
+#: ../finch/gntblist.c:2254
 msgid "Sort alphabetically"
 msgstr "Alphabetisch sortieren"
 
-#: finch/gntblist.c:2258
+#: ../finch/gntblist.c:2258
 msgid "Sort by log size"
 msgstr "Nach Größe der Logs sortieren"
 
-#: finch/gntconn.c:110
+#: ../finch/gntconn.c:110
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: finch/gntconn.c:113
+#: ../finch/gntconn.c:113
 #, c-format
 msgid "%s disconnected."
 msgstr "%s abgemeldet."
 
-#: finch/gntconn.c:114
+#: ../finch/gntconn.c:114
 #, c-format
 msgid ""
 "%s\n"
@@ -649,42 +700,42 @@
 "Finch wird nicht versuchen, das Konto wieder zu verbinden bis Sie den Fehler "
 "behoben und das Konto wieder aktiviert haben."
 
-#: finch/gntconv.c:117
+#: ../finch/gntconv.c:117
 msgid "No such command."
 msgstr "Es gibt kein solches Kommando."
 
-#: finch/gntconv.c:121 pidgin/gtkconv.c:491
+#: ../finch/gntconv.c:121 ../pidgin/gtkconv.c:495
 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:126 pidgin/gtkconv.c:497
+#: ../finch/gntconv.c:126 ../pidgin/gtkconv.c:501
 msgid "Your command failed for an unknown reason."
 msgstr "Ihre Kommando scheiterte aus einem unbekannten Grund."
 
-#: finch/gntconv.c:131 pidgin/gtkconv.c:504
+#: ../finch/gntconv.c:131 ../pidgin/gtkconv.c:508
 msgid "That command only works in chats, not IMs."
 msgstr "Dieses Kommando funktioniert nur in Chats, nicht bei IMs."
 
-#: finch/gntconv.c:134 pidgin/gtkconv.c:507
+#: ../finch/gntconv.c:134 ../pidgin/gtkconv.c:511
 msgid "That command only works in IMs, not chats."
 msgstr "Dieses Kommando funktioniert nur bei IMs, nicht bei Chats."
 
-#: finch/gntconv.c:138 pidgin/gtkconv.c:512
+#: ../finch/gntconv.c:138 ../pidgin/gtkconv.c:516
 msgid "That command doesn't work on this protocol."
 msgstr "Dieses Kommando funktioniert nicht in diesem Protokoll."
 
-#: finch/gntconv.c:224
+#: ../finch/gntconv.c:224
 #, c-format
 msgid "%s (%s -- %s)"
 msgstr "%s (%s -- %s)"
 
-#: finch/gntconv.c:247
+#: ../finch/gntconv.c:247
 #, c-format
 msgid "%s [%s]"
 msgstr "%s [%s]"
 
-#: finch/gntconv.c:252 finch/gntconv.c:647
+#: ../finch/gntconv.c:252 ../finch/gntconv.c:647
 #, c-format
 msgid ""
 "\n"
@@ -693,48 +744,48 @@
 "\n"
 "%s tippt gerade..."
 
-#: finch/gntconv.c:271
+#: ../finch/gntconv.c:271
 msgid "You have left this chat."
 msgstr "Sie haben diesen Chat verlassen."
 
-#: finch/gntconv.c:342
+#: ../finch/gntconv.c:342
 msgid "Send To"
 msgstr "Senden an"
 
-#: finch/gntconv.c:386
+#: ../finch/gntconv.c:386
 msgid "Conversation"
 msgstr "Unterhaltung"
 
-#: finch/gntconv.c:392
+#: ../finch/gntconv.c:392
 msgid "Clear Scrollback"
 msgstr "Gesprächsfenster leeren"
 
-#: finch/gntconv.c:396 finch/gntprefs.c:190
+#: ../finch/gntconv.c:396 ../finch/gntprefs.c:190
 msgid "Show Timestamps"
 msgstr "Zeige Zeitstempel"
 
-#: finch/gntconv.c:412
+#: ../finch/gntconv.c:412
 msgid "Add Buddy Pounce..."
 msgstr "Buddy-Alarm hinzufügen..."
 
-#: finch/gntconv.c:613
+#: ../finch/gntconv.c:613
 msgid "<AUTO-REPLY> "
 msgstr "<AUTO-REPLY> "
 
 #. Print the list of users in the room
-#: finch/gntconv.c:735
+#: ../finch/gntconv.c:735
 msgid "List of users:\n"
 msgstr "Liste der Benutzer:\n"
 
-#: finch/gntconv.c:880 pidgin/gtkconv.c:334
+#: ../finch/gntconv.c:880 ../pidgin/gtkconv.c:338
 msgid "Supported debug options are:  version"
 msgstr "Unterstützte Debug-Optionen sind:  version"
 
-#: finch/gntconv.c:915 pidgin/gtkconv.c:383
+#: ../finch/gntconv.c:915 ../pidgin/gtkconv.c:387
 msgid "No such command (in this context)."
 msgstr "Kein solches Kommando (in diesem Kontext)."
 
-#: finch/gntconv.c:918 pidgin/gtkconv.c:386
+#: ../finch/gntconv.c:918 ../pidgin/gtkconv.c:390
 msgid ""
 "Use \"/help &lt;command&gt;\" for help on a specific command.\n"
 "The following commands are available in this context:\n"
@@ -743,7 +794,7 @@
 "zu erhalten.\n"
 "Die folgenden Kommandos sind in diesem Kontext verfügbar:\n"
 
-#: finch/gntconv.c:976 pidgin/gtkconv.c:7291
+#: ../finch/gntconv.c:976 ../pidgin/gtkconv.c:7346
 msgid ""
 "say &lt;message&gt;:  Send a message normally as if you weren't using a "
 "command."
@@ -751,13 +802,13 @@
 "say &lt;Nachricht&gt;:  Sendet eine Nachricht genau so, als wenn Sie die "
 "Nachricht ohne ein Kommando absenden."
 
-#: finch/gntconv.c:979 pidgin/gtkconv.c:7294
+#: ../finch/gntconv.c:979 ../pidgin/gtkconv.c:7349
 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:982 pidgin/gtkconv.c:7297
+#: ../finch/gntconv.c:982 ../pidgin/gtkconv.c:7352
 msgid ""
 "debug &lt;option&gt;:  Send various debug information to the current "
 "conversation."
@@ -765,43 +816,43 @@
 "debug &lt;Option&gt;:  Verschiedene Debugging-Informationen zur aktuellen "
 "Unterhaltung senden."
 
-#: finch/gntconv.c:985 pidgin/gtkconv.c:7300
+#: ../finch/gntconv.c:985 ../pidgin/gtkconv.c:7355
 msgid "clear: Clears the conversation scrollback."
 msgstr "clear: Leert das Gesprächsfenster."
 
-#: finch/gntconv.c:988 pidgin/gtkconv.c:7306
+#: ../finch/gntconv.c:988 ../pidgin/gtkconv.c:7361
 msgid "help &lt;command&gt;:  Help on a specific command."
 msgstr "help &lt;Kommando&gt;:  Hilfe zu einem bestimmten Kommando."
 
-#: finch/gntconv.c:991
+#: ../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:996
+#: ../finch/gntconv.c:996
 msgid "plugins: Show the plugins window."
 msgstr "plugins: Plugin-Fenster anzeigen."
 
-#: finch/gntconv.c:999
+#: ../finch/gntconv.c:999
 msgid "buddylist: Show the buddylist."
 msgstr "buddylist: Die Kontaktliste anzeigen."
 
-#: finch/gntconv.c:1002
+#: ../finch/gntconv.c:1002
 msgid "accounts: Show the accounts window."
 msgstr "accounts: Das Konten-Fenster anzeigen."
 
-#: finch/gntconv.c:1005
+#: ../finch/gntconv.c:1005
 msgid "debugwin: Show the debug window."
 msgstr "debugwin: Das Debugging-Fenster anzeigen."
 
-#: finch/gntconv.c:1008
+#: ../finch/gntconv.c:1008
 msgid "prefs: Show the preference window."
 msgstr "prefs: Das Einstellungs-Fenster anzeigen."
 
-#: finch/gntconv.c:1011
+#: ../finch/gntconv.c:1011
 msgid "statuses: Show the savedstatuses window."
 msgstr "statuses: Das Fenster mit gespeicherten Status-Infos anzeigen."
 
-#: finch/gntdebug.c:234 finch/gntui.c:80 pidgin/gtkdebug.c:694
+#: ../finch/gntdebug.c:234 ../finch/gntui.c:84 ../pidgin/gtkdebug.c:694
 msgid "Debug Window"
 msgstr "Debug-Fenster"
 
@@ -809,190 +860,194 @@
 #. * 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:255 pidgin/gtkdebug.c:753
+#: ../finch/gntdebug.c:255 ../pidgin/gtkdebug.c:753
 msgid "Clear"
 msgstr "Leeren"
 
-#: finch/gntdebug.c:261
+#: ../finch/gntdebug.c:261
 msgid "Filter: "
 msgstr "Filter: "
 
-#: finch/gntdebug.c:265 pidgin/gtkdebug.c:762
+#: ../finch/gntdebug.c:265 ../pidgin/gtkdebug.c:762
 msgid "Pause"
 msgstr "Pause"
 
-#: finch/gntft.c:117 pidgin/gtkft.c:228
+#: ../finch/gntft.c:117 ../pidgin/gtkft.c:228
 #, c-format
 msgid "File Transfers - %d%% of %d files"
 msgstr "Dateiübertragungen - %d%% von %d Dateien"
 
 #. Create the window.
-#: finch/gntft.c:122 finch/gntft.c:195 finch/gntui.c:81 pidgin/gtkft.c:233
-#: pidgin/gtkft.c:761
+#: ../finch/gntft.c:122 ../finch/gntft.c:195 ../finch/gntui.c:85
+#: ../pidgin/gtkft.c:233 ../pidgin/gtkft.c:761
 msgid "File Transfers"
 msgstr "Dateiübertragungen"
 
-#: finch/gntft.c:198 pidgin/gtkft.c:644
+#: ../finch/gntft.c:198 ../pidgin/gtkft.c:644
 msgid "Progress"
 msgstr "Fortschritt"
 
-#: finch/gntft.c:198 pidgin/gtkft.c:651
+#: ../finch/gntft.c:198 ../pidgin/gtkft.c:651
 msgid "Filename"
 msgstr "Dateiname"
 
-#: finch/gntft.c:198 pidgin/gtkft.c:658
+#: ../finch/gntft.c:198 ../pidgin/gtkft.c:658
 msgid "Size"
 msgstr "Größe"
 
-#: finch/gntft.c:198
+#: ../finch/gntft.c:198
 msgid "Speed"
 msgstr "Geschwindigkeit"
 
-#: finch/gntft.c:198 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:198 finch/gntstatus.c:543 finch/gntstatus.c:572
-#: 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: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:2672
-#: libpurple/protocols/oscar/oscar.c:3789
-#: libpurple/protocols/sametime/sametime.c:3264
-#: libpurple/protocols/sametime/sametime.c:4151
-#: libpurple/protocols/yahoo/yahoo.c:3070 pidgin/gtkblist.c:3079
-#: pidgin/gtkblist.c:3092 pidgin/gtkblist.c:3094 pidgin/gtksavedstatuses.c:998
-#: pidgin/gtksavedstatuses.c:1143
+#: ../finch/gntft.c:198 ../finch/gntstatus.c:543 ../finch/gntstatus.c:572
+#: ../libpurple/protocols/bonjour/bonjour.c:337
+#: ../libpurple/protocols/gg/gg.c:1034 ../libpurple/protocols/gg/gg.c:1571
+#: ../libpurple/protocols/gg/gg.c:1579
+#: ../libpurple/protocols/jabber/buddy.c:638
+#: ../libpurple/protocols/jabber/buddy.c:642
+#: ../libpurple/protocols/jabber/buddy.c:677
+#: ../libpurple/protocols/jabber/jabber.c:1212
+#: ../libpurple/protocols/msn/msn.c:515
+#: ../libpurple/protocols/novell/novell.c:2835
+#: ../libpurple/protocols/oscar/oscar.c:820
+#: ../libpurple/protocols/oscar/oscar.c:825
+#: ../libpurple/protocols/oscar/oscar.c:827
+#: ../libpurple/protocols/oscar/oscar.c:2670
+#: ../libpurple/protocols/oscar/oscar.c:3748
+#: ../libpurple/protocols/sametime/sametime.c:3264
+#: ../libpurple/protocols/sametime/sametime.c:4151
+#: ../libpurple/protocols/yahoo/yahoo.c:3087 ../pidgin/gtkblist.c:3082
+#: ../pidgin/gtkblist.c:3095 ../pidgin/gtkblist.c:3097
+#: ../pidgin/gtksavedstatuses.c:998 ../pidgin/gtksavedstatuses.c:1143
 msgid "Status"
 msgstr "Status"
 
-#: finch/gntft.c:208
+#: ../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:215
+#: ../finch/gntft.c:215
 msgid "Clear finished transfers"
 msgstr "Entferne komplette Übertragungen"
 
-#: finch/gntft.c:229
+#: ../finch/gntft.c:229
 msgid "Stop"
 msgstr "Stopp"
 
 #. Close button
-#: finch/gntft.c:234 finch/gntnotify.c:181 finch/gntplugin.c:209
-#: finch/gntplugin.c:309 finch/gntpounce.c:727 finch/gntstatus.c:215
-#: libpurple/protocols/msn/msn.c:375 libpurple/protocols/silc/util.c:382
-#: libpurple/protocols/silc10/util.c:377 pidgin/gtkaccount.c:2479
-#: pidgin/gtkrequest.c:272
+#: ../finch/gntft.c:234 ../finch/gntnotify.c:181 ../finch/gntplugin.c:209
+#: ../finch/gntplugin.c:309 ../finch/gntpounce.c:727 ../finch/gntstatus.c:215
+#: ../libpurple/protocols/msn/msn.c:375 ../libpurple/protocols/silc/util.c:382
+#: ../libpurple/protocols/silc10/util.c:377 ../pidgin/gtkaccount.c:2484
+#: ../pidgin/gtkrequest.c:272
 msgid "Close"
 msgstr "Schließen"
 
-#: finch/gntft.c:302 pidgin/gtkft.c:168 pidgin/gtkft.c:972
+#: ../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:369 pidgin/gtkft.c:165 pidgin/gtkft.c:1053
+#: ../finch/gntft.c:369 ../pidgin/gtkft.c:165 ../pidgin/gtkft.c:1053
 msgid "Canceled"
 msgstr "Abgebrochen"
 
-#: finch/gntft.c:371 pidgin/gtkft.c:1055
+#: ../finch/gntft.c:371 ../pidgin/gtkft.c:1055
 msgid "Failed"
 msgstr "Gescheitert"
 
-#: finch/gntft.c:417 pidgin/gtkft.c:133
+#: ../finch/gntft.c:417 ../pidgin/gtkft.c:133
 #, c-format
 msgid "%.2f KiB/s"
 msgstr "%.2f KB/s"
 
-#: finch/gntft.c:428 finch/gntft.c:429 pidgin/gtkft.c:162 pidgin/gtkft.c:1115
+#: ../finch/gntft.c:428 ../finch/gntft.c:429 ../pidgin/gtkft.c:162
+#: ../pidgin/gtkft.c:1115
 msgid "Finished"
 msgstr "Fertig"
 
-#: finch/gntft.c:431 libpurple/protocols/msn/session.c:347
+#: ../finch/gntft.c:431 ../libpurple/protocols/msn/session.c:347
 msgid "Transferring"
 msgstr "Übertragung"
 
-#: finch/gntnotify.c:164
+#: ../finch/gntnotify.c:164
 msgid "Emails"
 msgstr "E-Mails"
 
-#: finch/gntnotify.c:170 finch/gntnotify.c:224
+#: ../finch/gntnotify.c:170 ../finch/gntnotify.c:224
 msgid "You have mail!"
 msgstr "Sie haben Post!"
 
-#: finch/gntnotify.c:173 pidgin/gtknotify.c:489
+#: ../finch/gntnotify.c:173 ../pidgin/gtknotify.c:490
 msgid "Sender"
 msgstr "Sender"
 
-#: finch/gntnotify.c:173 pidgin/gtknotify.c:496
+#: ../finch/gntnotify.c:173 ../pidgin/gtknotify.c:497
 msgid "Subject"
 msgstr "Betreff"
 
-#: finch/gntnotify.c:200
+#: ../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:224 pidgin/gtknotify.c:335
+#: ../finch/gntnotify.c:224 ../pidgin/gtknotify.c:336
 msgid "New Mail"
 msgstr "Neue Mail"
 
-#: finch/gntnotify.c:289 pidgin/gtknotify.c:915
+#: ../finch/gntnotify.c:289 ../pidgin/gtknotify.c:918
 #, c-format
 msgid "Info for %s"
 msgstr "Info über %s"
 
-#: finch/gntnotify.c:290 libpurple/protocols/toc/toc.c:476
-#: pidgin/gtknotify.c:916
+#: ../finch/gntnotify.c:290 ../libpurple/protocols/toc/toc.c:476
+#: ../pidgin/gtknotify.c:919
 msgid "Buddy Information"
 msgstr "Buddy-Information"
 
-#: finch/gntnotify.c:376
+#: ../finch/gntnotify.c:376 ../libpurple/protocols/qq/group_join.c:367
 msgid "Continue"
 msgstr "Fortfahren"
 
-#: finch/gntnotify.c:382 pidgin/gtkconv.c:1626 pidgin/gtkdebug.c:834
+#: ../finch/gntnotify.c:382 ../pidgin/gtkconv.c:1630 ../pidgin/gtkdebug.c:834
 msgid "Info"
 msgstr "Info"
 
-#: finch/gntnotify.c:385 pidgin/gtkconv.c:1587
+#: ../finch/gntnotify.c:385 ../pidgin/gtkconv.c:1591
 msgid "IM"
 msgstr "Nachricht"
 
-#: finch/gntnotify.c:388
+#: ../finch/gntnotify.c:388
 msgid "Join"
 msgstr "Betreten"
 
-#: finch/gntnotify.c:391 libpurple/protocols/sametime/sametime.c:3474
+#: ../finch/gntnotify.c:391 ../libpurple/protocols/sametime/sametime.c:3474
 msgid "Invite"
 msgstr "Einladen"
 
-#: finch/gntnotify.c:394
+#: ../finch/gntnotify.c:394
 msgid "(none)"
 msgstr "(kein)"
 
-#: finch/gntplugin.c:74 finch/gntplugin.c:83
+#: ../finch/gntplugin.c:74 ../finch/gntplugin.c:83
 msgid "ERROR"
 msgstr "FEHLER"
 
-#: finch/gntplugin.c:74
+#: ../finch/gntplugin.c:74
 msgid "loading plugin failed"
 msgstr "Laden des Plugins fehlgeschlagen"
 
-#: finch/gntplugin.c:83
+#: ../finch/gntplugin.c:83
 msgid "unloading plugin failed"
 msgstr "Entladen des Plugins fehlgeschlagen"
 
-#: finch/gntplugin.c:128
+#: ../finch/gntplugin.c:128
 #, c-format
 msgid ""
 "Name: %s\n"
@@ -1009,19 +1064,19 @@
 "Website: %s\n"
 "Dateiname: %s\n"
 
-#: finch/gntplugin.c:186
+#: ../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:234
+#: ../finch/gntplugin.c:234
 msgid "No configuration options for this plugin."
 msgstr "Keine Einstellungsoptionen für dieses Plugin."
 
-#: finch/gntplugin.c:259
+#: ../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:314
+#: ../finch/gntplugin.c:314
 msgid "Configure Plugin"
 msgstr "Plugin konfigurieren"
 
@@ -1030,379 +1085,537 @@
 #. (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
+#: ../finch/gntplugin.c:370 ../finch/gntplugin.c:377 ../finch/gntprefs.c:263
+#: ../finch/gntui.c:88 ../pidgin/gtkdocklet.c:524 ../pidgin/gtkprefs.c:2062
 msgid "Preferences"
 msgstr "Einstellungen"
 
-#: finch/gntpounce.c:182 pidgin/gtkpounce.c:255
+#: ../finch/gntpounce.c:182 ../pidgin/gtkpounce.c:255
 msgid "Please enter a buddy to pounce."
 msgstr "Bitte Buddy zum Alarmieren angeben."
 
 #. Create the window.
-#: finch/gntpounce.c:327 pidgin/gtkpounce.c:516
+#: ../finch/gntpounce.c:327 ../pidgin/gtkpounce.c:516
 msgid "New Buddy Pounce"
 msgstr "Neuer Buddy-Alarm"
 
-#: finch/gntpounce.c:327 pidgin/gtkpounce.c:516
+#: ../finch/gntpounce.c:327 ../pidgin/gtkpounce.c:516
 msgid "Edit Buddy Pounce"
 msgstr "Buddy-Alarm bearbeiten"
 
-#: finch/gntpounce.c:332
+#: ../finch/gntpounce.c:332
 msgid "Pounce Who"
 msgstr "Bei wem alarmieren"
 
 #. Account:
-#: finch/gntpounce.c:335 finch/gntstatus.c:452
+#: ../finch/gntpounce.c:335 ../finch/gntstatus.c:452
 msgid "Account:"
 msgstr "Konto:"
 
-#: finch/gntpounce.c:357
+#: ../finch/gntpounce.c:357
 msgid "Buddy name:"
 msgstr "Buddy-Name:"
 
 #. Create the "Pounce When Buddy..." frame.
-#: finch/gntpounce.c:373 pidgin/gtkpounce.c:586
+#: ../finch/gntpounce.c:373 ../pidgin/gtkpounce.c:586
 msgid "Pounce When Buddy..."
 msgstr "Alarm, wenn Buddy..."
 
-#: finch/gntpounce.c:375
+#: ../finch/gntpounce.c:375
 msgid "Signs on"
 msgstr "sich anmeldet"
 
-#: finch/gntpounce.c:376
+#: ../finch/gntpounce.c:376
 msgid "Signs off"
 msgstr "sich abmeldet"
 
-#: finch/gntpounce.c:377
+#: ../finch/gntpounce.c:377
 msgid "Goes away"
 msgstr "hinausgeht"
 
-#: finch/gntpounce.c:378
+#: ../finch/gntpounce.c:378
 msgid "Returns from away"
 msgstr "wieder anwesend ist"
 
-#: finch/gntpounce.c:379
+#: ../finch/gntpounce.c:379
 msgid "Becomes idle"
 msgstr "untätig wird"
 
-#: finch/gntpounce.c:380
+#: ../finch/gntpounce.c:380
 msgid "Is no longer idle"
 msgstr "nicht mehr untätig ist"
 
-#: finch/gntpounce.c:381
+#: ../finch/gntpounce.c:381
 msgid "Starts typing"
 msgstr "zu tippen beginnt"
 
-#: finch/gntpounce.c:382
+#: ../finch/gntpounce.c:382
 msgid "Pauses while typing"
 msgstr "beim Tippen anhält"
 
-#: finch/gntpounce.c:383
+#: ../finch/gntpounce.c:383
 msgid "Stops typing"
 msgstr "aufhört zu tippen"
 
-#: finch/gntpounce.c:384
+#: ../finch/gntpounce.c:384
 msgid "Sends a message"
 msgstr "eine Nachricht sendet"
 
 #. Create the "Action" frame.
-#: finch/gntpounce.c:413 pidgin/gtkpounce.c:647
+#: ../finch/gntpounce.c:413 ../pidgin/gtkpounce.c:647
 msgid "Action"
 msgstr "Aktion"
 
-#: finch/gntpounce.c:415
+#: ../finch/gntpounce.c:415
 msgid "Open an IM window"
 msgstr "Ein Gesprächsfenster öffnen"
 
-#: finch/gntpounce.c:416
+#: ../finch/gntpounce.c:416
 msgid "Pop up a notification"
 msgstr "Popup-Benachrichtigung"
 
-#: finch/gntpounce.c:417
+#: ../finch/gntpounce.c:417
 msgid "Send a message"
 msgstr "Eine Nachricht senden"
 
-#: finch/gntpounce.c:418
+#: ../finch/gntpounce.c:418
 msgid "Execute a command"
 msgstr "Einen Befehl ausführen"
 
-#: finch/gntpounce.c:419
+#: ../finch/gntpounce.c:419
 msgid "Play a sound"
 msgstr "Einen Klang abspielen"
 
-#: finch/gntpounce.c:447
+#: ../finch/gntpounce.c:447
 msgid "Pounce only when my status is not available"
 msgstr "Nur alarmieren, wenn ich nicht verfügbar bin"
 
-#: finch/gntpounce.c:449 pidgin/gtkpounce.c:1295
+#: ../finch/gntpounce.c:449 ../pidgin/gtkpounce.c:1295
 msgid "Recurring"
 msgstr "Wiederkehrend"
 
-#: finch/gntpounce.c:651 pidgin/gtkpounce.c:1110
+#: ../finch/gntpounce.c:651 ../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:685 finch/gntui.c:79 pidgin/gtkpounce.c:1339
+#: ../finch/gntpounce.c:685 ../finch/gntui.c:83 ../pidgin/gtkpounce.c:1339
 msgid "Buddy Pounces"
 msgstr "Buddy-Alarm"
 
-#: finch/gntpounce.c:799 pidgin/gtkpounce.c:1466
+#: ../finch/gntpounce.c:799 ../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:801 pidgin/gtkpounce.c:1468
+#: ../finch/gntpounce.c:801 ../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:803 pidgin/gtkpounce.c:1470
+#: ../finch/gntpounce.c:803 ../pidgin/gtkpounce.c:1470
 #, c-format
 msgid "%s has signed on (%s)"
 msgstr "%s hat sich angemeldet (%s)"
 
-#: finch/gntpounce.c:805 pidgin/gtkpounce.c:1472
+#: ../finch/gntpounce.c:805 ../pidgin/gtkpounce.c:1472
 #, c-format
 msgid "%s has returned from being idle (%s)"
 msgstr "%s ist nicht mehr inaktiv (%s)"
 
-#: finch/gntpounce.c:807 pidgin/gtkpounce.c:1474
+#: ../finch/gntpounce.c:807 ../pidgin/gtkpounce.c:1474
 #, c-format
 msgid "%s has returned from being away (%s)"
 msgstr "%s ist wieder anwesend (%s)"
 
-#: finch/gntpounce.c:809 pidgin/gtkpounce.c:1476
+#: ../finch/gntpounce.c:809 ../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:811 pidgin/gtkpounce.c:1478
+#: ../finch/gntpounce.c:811 ../pidgin/gtkpounce.c:1478
 #, c-format
 msgid "%s has signed off (%s)"
 msgstr "%s hat sich abgemeldet (%s)"
 
-#: finch/gntpounce.c:813 pidgin/gtkpounce.c:1480
+#: ../finch/gntpounce.c:813 ../pidgin/gtkpounce.c:1480
 #, c-format
 msgid "%s has become idle (%s)"
 msgstr "%s wurde untätig (%s)"
 
-#: finch/gntpounce.c:815 pidgin/gtkpounce.c:1482
+#: ../finch/gntpounce.c:815 ../pidgin/gtkpounce.c:1482
 #, c-format
 msgid "%s has gone away. (%s)"
 msgstr "%s ist abwesend. (%s)"
 
-#: finch/gntpounce.c:817 pidgin/gtkpounce.c:1484
+#: ../finch/gntpounce.c:817 ../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:818 pidgin/gtkpounce.c:1485
-#, c-format
+#: ../finch/gntpounce.c:818 ../pidgin/gtkpounce.c:1485
 msgid "Unknown pounce event. Please report this!"
 msgstr "Unbekanntes Alarm-Ereignis. Bitte berichten Sie dieses Problem!"
 
-#: finch/gntprefs.c:91
+#: ../finch/gntprefs.c:91
 msgid "Based on keyboard use"
 msgstr "Abhängig von Tastaturbenutzung"
 
-#: finch/gntprefs.c:93 pidgin/gtkprefs.c:1923
+#: ../finch/gntprefs.c:93 ../pidgin/gtkprefs.c:1925
 msgid "From last sent message"
 msgstr "Von letzter gesendeter Nachricht"
 
-#: 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
+#: ../finch/gntprefs.c:95 ../pidgin/gtkprefs.c:897 ../pidgin/gtkprefs.c:906
+#: ../pidgin/gtkprefs.c:1924 ../pidgin/gtkprefs.c:1938
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:333
 msgid "Never"
 msgstr "Niemals"
 
-#: finch/gntprefs.c:183
+#: ../finch/gntprefs.c:183
 msgid "Show Idle Time"
 msgstr "Zeige Untätigkeitszeiten"
 
-#: finch/gntprefs.c:184
+#: ../finch/gntprefs.c:184
 msgid "Show Offline Buddies"
 msgstr "Zeige Offline-Buddys"
 
-#: finch/gntprefs.c:191
+#: ../finch/gntprefs.c:191
 msgid "Notify buddies when you are typing"
 msgstr "Buddys benachrichtigen, wenn Sie ihnen schreiben"
 
-#: finch/gntprefs.c:197
+#: ../finch/gntprefs.c:197
 msgid "Log format"
 msgstr "Mitschnitt-Format"
 
-#: finch/gntprefs.c:198
+#: ../finch/gntprefs.c:198
 msgid "Log IMs"
 msgstr "IMs mitschneiden"
 
-#: finch/gntprefs.c:199
+#: ../finch/gntprefs.c:199
 msgid "Log chats"
 msgstr "Chats mitschneiden"
 
-#: finch/gntprefs.c:200
+#: ../finch/gntprefs.c:200
 msgid "Log status change events"
 msgstr "Statusveränderungen mitschneiden"
 
-#: finch/gntprefs.c:206
+#: ../finch/gntprefs.c:206
 msgid "Report Idle time"
 msgstr "Inaktivitätszeiten anzeigen"
 
-#: finch/gntprefs.c:207
+#: ../finch/gntprefs.c:207
 msgid "Change status when idle"
 msgstr "Ändere Status, wenn inaktiv"
 
-#: finch/gntprefs.c:208
+#: ../finch/gntprefs.c:208
 msgid "Minutes before changing status"
 msgstr "Minuten, bevor Status geändert wird"
 
-#: finch/gntprefs.c:209
+#: ../finch/gntprefs.c:209
 msgid "Change status to"
 msgstr "Ändere Status zu"
 
 #. Conversations
-#: finch/gntprefs.c:258 pidgin/gtkprefs.c:992 pidgin/gtkprefs.c:2026
-#: pidgin/plugins/win32/winprefs/winprefs.c:344
+#: ../finch/gntprefs.c:258 ../pidgin/gtkprefs.c:992 ../pidgin/gtkprefs.c:2028
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:340
 msgid "Conversations"
 msgstr "Unterhaltungen"
 
-#: finch/gntprefs.c:259 pidgin/gtkprefs.c:1462 pidgin/gtkprefs.c:2037
+#: ../finch/gntprefs.c:259 ../pidgin/gtkprefs.c:1464 ../pidgin/gtkprefs.c:2039
 msgid "Logging"
 msgstr "Mitschnitt"
 
-#: finch/gntrequest.c:563
+#: ../finch/gntrequest.c:563
 msgid "Not implemented yet."
 msgstr "Noch nicht implementiert."
 
-#: finch/gntrequest.c:635 pidgin/gtkrequest.c:1531 pidgin/gtkrequest.c:1577
+#: ../finch/gntrequest.c:635 ../pidgin/gtkrequest.c:1552
+#: ../pidgin/gtkrequest.c:1598
 msgid "Save File..."
 msgstr "Datei speichern..."
 
-#: finch/gntrequest.c:635 pidgin/gtkrequest.c:1532 pidgin/gtkrequest.c:1578
+#: ../finch/gntrequest.c:635 ../pidgin/gtkrequest.c:1553
+#: ../pidgin/gtkrequest.c:1599
 msgid "Open File..."
 msgstr "Datei öffnen..."
 
-#: finch/gntstatus.c:137
+#: ../finch/gntsound.c:94 ../pidgin/gtksound.c:63
+msgid "Buddy logs in"
+msgstr "Buddy meldet sich an"
+
+#: ../finch/gntsound.c:95 ../pidgin/gtksound.c:64
+msgid "Buddy logs out"
+msgstr "Buddy meldet sich ab"
+
+#: ../finch/gntsound.c:96 ../pidgin/gtksound.c:65
+msgid "Message received"
+msgstr "Nachricht empfangen"
+
+#: ../finch/gntsound.c:97 ../pidgin/gtksound.c:66
+msgid "Message received begins conversation"
+msgstr "Nachricht beginnt neue Unterhaltung"
+
+#: ../finch/gntsound.c:98 ../pidgin/gtksound.c:67
+msgid "Message sent"
+msgstr "Nachricht gesendet"
+
+#: ../finch/gntsound.c:99 ../pidgin/gtksound.c:68
+msgid "Person enters chat"
+msgstr "Person betritt den Chat"
+
+#: ../finch/gntsound.c:100 ../pidgin/gtksound.c:69
+msgid "Person leaves chat"
+msgstr "Person verlässt den Chat"
+
+#: ../finch/gntsound.c:101 ../pidgin/gtksound.c:70
+msgid "You talk in chat"
+msgstr "Sie sprechen im Chat"
+
+#: ../finch/gntsound.c:102 ../pidgin/gtksound.c:71
+msgid "Others talk in chat"
+msgstr "Andere sprechen im Chat"
+
+#: ../finch/gntsound.c:104 ../pidgin/gtksound.c:74
+msgid "Someone says your screen name in chat"
+msgstr "Jemand nennt Ihren Benutzernamen im Chat"
+
+#: ../finch/gntsound.c:357 ../pidgin/gtksound.c:310
+msgid "GStreamer Failure"
+msgstr "GStreamer-Fehler"
+
+#: ../finch/gntsound.c:358 ../pidgin/gtksound.c:311
+msgid "GStreamer failed to initialize."
+msgstr "GStreamer konnte nicht initialisiert werden."
+
+#: ../finch/gntsound.c:706 ../finch/gntsound.c:791 ../pidgin/gtkprefs.c:1584
+#: ../pidgin/gtkprefs.c:1673 ../pidgin/gtkprefs.c:1867
+msgid "(default)"
+msgstr "(Standard)"
+
+#: ../finch/gntsound.c:719
+msgid "Select Sound File ..."
+msgstr "Klang-Datei auswählen..."
+
+#: ../finch/gntsound.c:893
+msgid "Sound Preferences"
+msgstr "Klang-Einstellungen"
+
+#: ../finch/gntsound.c:904
+msgid "Profiles"
+msgstr "Profile"
+
+#: ../finch/gntsound.c:943 ../pidgin/gtkprefs.c:1712
+msgid "Automatic"
+msgstr "Automatisch"
+
+#: ../finch/gntsound.c:946
+msgid "Console Beep"
+msgstr "Konsolen-Lautsprecher"
+
+#: ../finch/gntsound.c:947 ../pidgin/gtkprefs.c:1716
+msgid "Command"
+msgstr "Kommando"
+
+#: ../finch/gntsound.c:948
+msgid "No Sound"
+msgstr "Kein Klang"
+
+#: ../finch/gntsound.c:950 ../pidgin/gtkprefs.c:1707
+msgid "Sound Method"
+msgstr "Klang-Ausgabesystem"
+
+#: ../finch/gntsound.c:955
+msgid "Method: "
+msgstr "Methode: "
+
+#: ../finch/gntsound.c:962
+#, c-format
+msgid ""
+"Sound Command\n"
+"(%s for filename)"
+msgstr ""
+"Klang-Abspielbefehl\n"
+"(%s für den Dateinamen)"
+
+#. Sound options
+#: ../finch/gntsound.c:970 ../pidgin/gtkprefs.c:1751
+msgid "Sound Options"
+msgstr "Klang-Optionen"
+
+#: ../finch/gntsound.c:971
+msgid "Sounds when conversation has focus"
+msgstr "Klang, wenn das Gespräch den Fokus hat"
+
+#: ../finch/gntsound.c:979 ../pidgin/gtkprefs.c:896 ../pidgin/gtkprefs.c:908
+#: ../pidgin/gtkprefs.c:1758 ../pidgin/plugins/timestamp_format.c:42
+#: ../pidgin/plugins/timestamp_format.c:51
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:334
+msgid "Always"
+msgstr "Immer"
+
+#: ../finch/gntsound.c:980 ../pidgin/gtkprefs.c:1756
+msgid "Only when available"
+msgstr "Nur wenn anwesend"
+
+#: ../finch/gntsound.c:981 ../pidgin/gtkprefs.c:1757
+msgid "Only when not available"
+msgstr "Nur wenn nicht verfügbar"
+
+#: ../finch/gntsound.c:988
+msgid "Volume(0-100):"
+msgstr "Lautstärke (0-100):"
+
+#. Sound events
+#: ../finch/gntsound.c:1005 ../pidgin/gtkprefs.c:1793
+msgid "Sound Events"
+msgstr "Klang-Ereignisse"
+
+#: ../finch/gntsound.c:1007 ../pidgin/gtkprefs.c:1852
+msgid "Event"
+msgstr "Ereignis"
+
+#: ../finch/gntsound.c:1007
+msgid "File"
+msgstr "Datei"
+
+#: ../finch/gntsound.c:1026 ../pidgin/gtkprefs.c:1871
+msgid "Test"
+msgstr "Testen"
+
+#: ../finch/gntsound.c:1029 ../pidgin/gtkprefs.c:1875
+msgid "Reset"
+msgstr "Zurücksetzen"
+
+#: ../finch/gntsound.c:1032 ../pidgin/gtkprefs.c:1879
+msgid "Choose..."
+msgstr "Auswählen..."
+
+#: ../finch/gntstatus.c:137
 #, c-format
 msgid "Are you sure you want to delete \"%s\""
 msgstr "Wollen Sie \"%s\" wirklich löschen"
 
-#: finch/gntstatus.c:140
+#: ../finch/gntstatus.c:140
 msgid "Delete Status"
 msgstr "Status löschen"
 
-#: finch/gntstatus.c:175 pidgin/gtksavedstatuses.c:596
+#: ../finch/gntstatus.c:175 ../pidgin/gtksavedstatuses.c:596
 msgid "Saved Statuses"
 msgstr "Gespeicherter Status"
 
-#: finch/gntstatus.c:182 finch/gntstatus.c:535
-#: libpurple/protocols/jabber/buddy.c:286
-#: libpurple/protocols/jabber/buddy.c:973
-#: libpurple/protocols/novell/novell.c:1484 pidgin/gtksavedstatuses.c:499
+#: ../finch/gntstatus.c:182 ../finch/gntstatus.c:535
+#: ../libpurple/protocols/jabber/buddy.c:286
+#: ../libpurple/protocols/jabber/buddy.c:973
+#: ../libpurple/protocols/novell/novell.c:1484
+#: ../pidgin/gtksavedstatuses.c:499
 msgid "Title"
 msgstr "Titel"
 
-#: finch/gntstatus.c:182 pidgin/gtksavedstatuses.c:514
+#: ../finch/gntstatus.c:182 ../pidgin/gtksavedstatuses.c:514
 msgid "Type"
 msgstr "Typ"
 
-#: finch/gntstatus.c:182 finch/gntstatus.c:560 finch/gntstatus.c:572
-#: 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: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:3287
-#: libpurple/protocols/sametime/sametime.c:3293
-#: libpurple/protocols/sametime/sametime.c:3299
-#: libpurple/protocols/sametime/sametime.c:3378
-#: libpurple/protocols/silc/buddy.c:1551
-#: libpurple/protocols/silc10/buddy.c:1551
-#: libpurple/protocols/simple/simple.c:246
-#: libpurple/protocols/yahoo/yahoo.c:3498
-#: libpurple/protocols/yahoo/yahoo.c:3504
-#: libpurple/protocols/zephyr/zephyr.c:2337 pidgin/gtksavedstatuses.c:525
-#: pidgin/gtksavedstatuses.c:1009
+#: ../finch/gntstatus.c:182 ../finch/gntstatus.c:560 ../finch/gntstatus.c:572
+#: ../libpurple/protocols/bonjour/bonjour.c:249
+#: ../libpurple/protocols/bonjour/bonjour.c:256
+#: ../libpurple/protocols/bonjour/bonjour.c:339
+#: ../libpurple/protocols/gg/gg.c:1072 ../libpurple/protocols/gg/gg.c:1574
+#: ../libpurple/protocols/gg/gg.c:1592 ../libpurple/protocols/gg/gg.c:1602
+#: ../libpurple/protocols/gg/gg.c:1608 ../libpurple/protocols/gg/gg.c:1617
+#: ../libpurple/protocols/gg/gg.c:1622 ../libpurple/protocols/irc/irc.c:234
+#: ../libpurple/protocols/jabber/jabber.c:1244
+#: ../libpurple/protocols/jabber/jabber.c:1254
+#: ../libpurple/protocols/jabber/jabber.c:1264
+#: ../libpurple/protocols/jabber/jabber.c:1274
+#: ../libpurple/protocols/jabber/jabber.c:1284
+#: ../libpurple/protocols/jabber/jabber.c:1296
+#: ../libpurple/protocols/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:5502
+#: ../libpurple/protocols/oscar/oscar.c:5720
+#: ../libpurple/protocols/oscar/oscar.c:5734
+#: ../libpurple/protocols/oscar/oscar.c:5750
+#: ../libpurple/protocols/oscar/oscar.c:5757
+#: ../libpurple/protocols/oscar/oscar.c:5764
+#: ../libpurple/protocols/sametime/sametime.c:3287
+#: ../libpurple/protocols/sametime/sametime.c:3293
+#: ../libpurple/protocols/sametime/sametime.c:3299
+#: ../libpurple/protocols/sametime/sametime.c:3378
+#: ../libpurple/protocols/silc/buddy.c:1551
+#: ../libpurple/protocols/silc10/buddy.c:1551
+#: ../libpurple/protocols/simple/simple.c:246
+#: ../libpurple/protocols/yahoo/yahoo.c:3590
+#: ../libpurple/protocols/yahoo/yahoo.c:3596
+#: ../libpurple/protocols/zephyr/zephyr.c:2337
+#: ../pidgin/gtksavedstatuses.c:525 ../pidgin/gtksavedstatuses.c:1009
 msgid "Message"
 msgstr "Nachricht"
 
 #. Use
-#: finch/gntstatus.c:193 finch/gntstatus.c:589
+#: ../finch/gntstatus.c:193 ../finch/gntstatus.c:589
 msgid "Use"
 msgstr "Benutzen"
 
-#: finch/gntstatus.c:300
+#: ../finch/gntstatus.c:300
 msgid "Invalid title"
 msgstr "Ungültige Bezeichnung"
 
-#: finch/gntstatus.c:301
+#: ../finch/gntstatus.c:301
 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:308
+#: ../finch/gntstatus.c:308
 msgid "Duplicate title"
 msgstr "Doppelte Bezeichnung"
 
-#: finch/gntstatus.c:309
+#: ../finch/gntstatus.c:309
 msgid "Please enter a different title for the status."
 msgstr "Bitte geben sie eine andere Bezeichnung für den Status ein."
 
-#: finch/gntstatus.c:449
+#: ../finch/gntstatus.c:449
 msgid "Substatus"
 msgstr "Unter-Status"
 
-#: finch/gntstatus.c:460 pidgin/gtkft.c:698
+#: ../finch/gntstatus.c:460 ../pidgin/gtkft.c:698
 msgid "Status:"
 msgstr "Status:"
 
-#: finch/gntstatus.c:475
+#: ../finch/gntstatus.c:475
 msgid "Message:"
 msgstr "Nachricht:"
 
-#: finch/gntstatus.c:524
+#: ../finch/gntstatus.c:524
 msgid "Edit Status"
 msgstr "Status bearbeiten"
 
-#: finch/gntstatus.c:566
+#: ../finch/gntstatus.c:566
 msgid "Use different status for following accounts"
 msgstr "Benutze einen anderen Status für die folgenden Konten"
 
 #. Save & Use
-#: finch/gntstatus.c:600
+#: ../finch/gntstatus.c:600
 msgid "Save & Use"
 msgstr "Speichern & Übernehmen"
 
-#: finch/gntui.c:84
+#: ../finch/gntui.c:87 ../pidgin/gtkprefs.c:2030
+msgid "Sounds"
+msgstr "Klänge"
+
+#: ../finch/gntui.c:89
 msgid "Statuses"
 msgstr "Status-Meldungen"
 
-#: finch/plugins/gntclipboard.c:149
+#: ../finch/plugins/gntclipboard.c:149
 msgid "GntClipboard"
 msgstr "GntClipboard"
 
-#: finch/plugins/gntclipboard.c:151
+#: ../finch/plugins/gntclipboard.c:151
 msgid "Clipboard plugin"
 msgstr "Zwischenablage-Plugin"
 
-#: finch/plugins/gntclipboard.c:152
+#: ../finch/plugins/gntclipboard.c:152
 msgid ""
 "When the gnt clipboard contents change, the contents are made available to "
 "X, if possible."
@@ -1410,77 +1623,77 @@
 "Wenn sich der Inhalt der Gnt-Zwischenablage verändert, werden ihre Inhalte "
 "in X verfügbar gemacht, wenn möglich."
 
-#: finch/plugins/gntgf.c:231
+#: ../finch/plugins/gntgf.c:231
 #, c-format
 msgid "%s just signed on"
 msgstr "%s hat sich angemeldet"
 
-#: finch/plugins/gntgf.c:238
+#: ../finch/plugins/gntgf.c:238
 #, c-format
 msgid "%s just signed off"
 msgstr "%s hat sich abgemeldet"
 
-#: finch/plugins/gntgf.c:246
+#: ../finch/plugins/gntgf.c:246
 #, c-format
 msgid "%s sent you a message"
 msgstr "%s hat Ihnen eine Nachricht gesendet"
 
-#: finch/plugins/gntgf.c:265
+#: ../finch/plugins/gntgf.c:265
 #, c-format
 msgid "%s said your nick in %s"
 msgstr "%s sagte ihren Spitznamen in %s"
 
-#: finch/plugins/gntgf.c:267
+#: ../finch/plugins/gntgf.c:267
 #, c-format
 msgid "%s sent a message in %s"
 msgstr "%s hat eine Nachricht in %s gesendet"
 
-#: finch/plugins/gntgf.c:305
+#: ../finch/plugins/gntgf.c:305
 msgid "Buddy signs on/off"
 msgstr "Buddy sich an/abmeldet"
 
-#: finch/plugins/gntgf.c:306
+#: ../finch/plugins/gntgf.c:306
 msgid "You receive an IM"
 msgstr "Sie empfangen einen Nachricht"
 
-#: finch/plugins/gntgf.c:307
+#: ../finch/plugins/gntgf.c:307
 msgid "Someone speaks in a chat"
 msgstr "Jemand redet im Chat"
 
-#: finch/plugins/gntgf.c:308
+#: ../finch/plugins/gntgf.c:308
 msgid "Someone says your name in a chat"
 msgstr "Jemand sagt Ihren Namen im Chat"
 
-#: finch/plugins/gntgf.c:336
+#: ../finch/plugins/gntgf.c:336
 msgid "Notify with a toaster when"
 msgstr "Mit einem Toaster benachrichtigen, wenn"
 
-#: finch/plugins/gntgf.c:351
+#: ../finch/plugins/gntgf.c:351
 msgid "Beep too!"
 msgstr "Auch piepen!"
 
-#: finch/plugins/gntgf.c:357
+#: ../finch/plugins/gntgf.c:357
 msgid "Set URGENT for the terminal window."
 msgstr "URGENT-Eigenschaft für das Terminalfenster setzen."
 
-#: finch/plugins/gntgf.c:377
+#: ../finch/plugins/gntgf.c:377
 msgid "GntGf"
 msgstr "GntGf"
 
-#: finch/plugins/gntgf.c:379 finch/plugins/gntgf.c:380
+#: ../finch/plugins/gntgf.c:379 ../finch/plugins/gntgf.c:380
 msgid "Toaster plugin"
 msgstr "Toaster-Plugin"
 
-#: finch/plugins/gnthistory.c:116 pidgin/plugins/history.c:120
+#: ../finch/plugins/gnthistory.c:116 ../pidgin/plugins/history.c:120
 #, c-format
 msgid "<b>Conversation with %s on %s:</b><br>"
 msgstr "<b>Unterhaltung mit %s am %s:</b><br>"
 
-#: finch/plugins/gnthistory.c:138 pidgin/plugins/history.c:147
+#: ../finch/plugins/gnthistory.c:138 ../pidgin/plugins/history.c:147
 msgid "History Plugin Requires Logging"
 msgstr "Das Verlaufs-Plugin erfordert das Mitschneiden"
 
-#: finch/plugins/gnthistory.c:139 pidgin/plugins/history.c:148
+#: ../finch/plugins/gnthistory.c:139 ../pidgin/plugins/history.c:148
 msgid ""
 "Logging can be enabled from Tools -> Preferences -> Logging.\n"
 "\n"
@@ -1493,15 +1706,15 @@
 "Das Aktivieren des Mitschnitts für Sofortnachrichten und/oder Chats "
 "aktiviert den Verlauf für die entsprechenden Unterhaltungsarten."
 
-#: finch/plugins/gnthistory.c:179
+#: ../finch/plugins/gnthistory.c:179
 msgid "GntHistory"
 msgstr "Gnt-Verlauf"
 
-#: finch/plugins/gnthistory.c:181 pidgin/plugins/history.c:190
+#: ../finch/plugins/gnthistory.c:181 ../pidgin/plugins/history.c:190
 msgid "Shows recently logged conversations in new conversations."
 msgstr "Zeigt vor kurzem mitgeschnittene Gespräche in neuen Gesprächen an."
 
-#: finch/plugins/gnthistory.c:182 pidgin/plugins/history.c:191
+#: ../finch/plugins/gnthistory.c:182 ../pidgin/plugins/history.c:191
 msgid ""
 "When a new conversation is opened this plugin will insert the last "
 "conversation into the current conversation."
@@ -1509,221 +1722,222 @@
 "Wenn eine neue Unterhaltung eröffnet wird, fügt dieses Plugin die letzte "
 "Unterhaltung in die aktuelle Unterhaltung ein."
 
-#: finch/plugins/lastlog.c:69
+#: ../finch/plugins/lastlog.c:69
 msgid "Lastlog"
 msgstr "Verlauf"
 
-#: finch/plugins/lastlog.c:99
+#: ../finch/plugins/lastlog.c:99
 msgid "lastlog: Searches for a substring in the backlog."
 msgstr "lastlog: Sucht rückwärts nach einem Teilwort im Mitschnitt."
 
-#: finch/plugins/lastlog.c:121
+#: ../finch/plugins/lastlog.c:121
 msgid "GntLastlog"
 msgstr "Gnt-Verlauf"
 
-#: finch/plugins/lastlog.c:123 finch/plugins/lastlog.c:124
+#: ../finch/plugins/lastlog.c:123 ../finch/plugins/lastlog.c:124
 msgid "Lastlog plugin."
 msgstr "Verlauf-Plugin."
 
-#: libpurple/account.c:790
+#: ../libpurple/account.c:790
 msgid "accounts"
 msgstr "Konten"
 
-#: libpurple/account.c:937 libpurple/protocols/jabber/auth.c:194
-#: libpurple/protocols/jabber/auth.c:233
+#: ../libpurple/account.c:937 ../libpurple/protocols/jabber/auth.c:194
+#: ../libpurple/protocols/jabber/auth.c:233
 msgid "Password is required to sign on."
 msgstr "Passwort wird für die Anmeldung benötigt."
 
-#: libpurple/account.c:963
+#: ../libpurple/account.c:963
 #, c-format
 msgid "Enter password for %s (%s)"
 msgstr "Geben Sie das Passwort für %s (%s) ein"
 
-#: libpurple/account.c:970
+#: ../libpurple/account.c:970
 msgid "Enter Password"
 msgstr "Geben Sie ein Passwort ein"
 
-#: libpurple/account.c:975
+#: ../libpurple/account.c:975
 msgid "Save password"
 msgstr "Passwort speichern"
 
-#: libpurple/account.c:1010 libpurple/connection.c:104
+#: ../libpurple/account.c:1010 ../libpurple/connection.c:104
 #, c-format
 msgid "Missing protocol plugin for %s"
 msgstr "Fehlendes Protokoll-Plugin für %s"
 
-#: libpurple/account.c:1012 libpurple/connection.c:107 pidgin/gtkblist.c:4020
+#: ../libpurple/account.c:1012 ../libpurple/connection.c:107
+#: ../pidgin/gtkblist.c:4019
 msgid "Connection Error"
 msgstr "Verbindungsfehler"
 
-#: libpurple/account.c:1170 libpurple/protocols/gg/gg.c:702
-#: libpurple/protocols/jabber/jabber.c:1334
+#: ../libpurple/account.c:1170 ../libpurple/protocols/gg/gg.c:702
+#: ../libpurple/protocols/jabber/jabber.c:1334
 msgid "New passwords do not match."
 msgstr "Die neuen Passwörter stimmen nicht überein."
 
-#: libpurple/account.c:1179
+#: ../libpurple/account.c:1179
 msgid "Fill out all fields completely."
 msgstr "Bitte füllen Sie alle Felder aus."
 
-#: libpurple/account.c:1202
+#: ../libpurple/account.c:1202
 msgid "Original password"
 msgstr "Aktuelles Passwort"
 
-#: libpurple/account.c:1209
+#: ../libpurple/account.c:1209
 msgid "New password"
 msgstr "Neues Passwort"
 
-#: libpurple/account.c:1216
+#: ../libpurple/account.c:1216
 msgid "New password (again)"
 msgstr "Neues Passwort (nochmal)"
 
-#: libpurple/account.c:1222
+#: ../libpurple/account.c:1222
 #, c-format
 msgid "Change password for %s"
 msgstr "Ändern des Passworts für %s"
 
-#: libpurple/account.c:1230
+#: ../libpurple/account.c:1230
 msgid "Please enter your current password and your new password."
 msgstr "Bitte geben Sie Ihr aktuelles und Ihr neues Passwort ein."
 
-#: libpurple/account.c:1261
+#: ../libpurple/account.c:1261
 #, c-format
 msgid "Change user information for %s"
 msgstr "Ändere die Benutzerinformation für %s"
 
-#: libpurple/account.c:1264 libpurple/protocols/toc/toc.c:1670
+#: ../libpurple/account.c:1264 ../libpurple/protocols/toc/toc.c:1670
 msgid "Set User Info"
 msgstr "Benutzer-Info setzen"
 
-#: libpurple/account.c:1744 libpurple/protocols/gg/gg.c:1012
-#: libpurple/protocols/jabber/buddy.c:642
-#: libpurple/protocols/jabber/buddy.c:1462
-#: libpurple/protocols/jabber/buddy.c:1479
-#: libpurple/protocols/novell/novell.c:2831 libpurple/protocols/qq/qq.c:230
-#: pidgin/gtkft.c:159
+#: ../libpurple/account.c:1744 ../libpurple/protocols/gg/gg.c:1012
+#: ../libpurple/protocols/jabber/buddy.c:642
+#: ../libpurple/protocols/jabber/buddy.c:1462
+#: ../libpurple/protocols/jabber/buddy.c:1479
+#: ../libpurple/protocols/novell/novell.c:2831
+#: ../libpurple/protocols/qq/qq.c:232 ../pidgin/gtkft.c:159
 msgid "Unknown"
 msgstr "Unbekannt"
 
-#: libpurple/blist.c:521 libpurple/blist.c:1289 libpurple/blist.c:1518
-#: libpurple/protocols/jabber/roster.c:68 pidgin/gtkblist.c:5322
-#: pidgin/plugins/gevolution/gevo-util.c:64
-#: 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:5321 ../pidgin/plugins/gevolution/gevo-util.c:64
+#: ../pidgin/plugins/gevolution/gevolution.c:96
 msgid "Buddies"
 msgstr "Buddys"
 
-#: libpurple/blist.c:548
+#: ../libpurple/blist.c:548
 msgid "buddy list"
 msgstr "Buddy-Liste"
 
-#: libpurple/connection.c:106
+#: ../libpurple/connection.c:106
 msgid "Registration Error"
 msgstr "Registrierungsfehler"
 
-#: libpurple/connection.c:293
+#: ../libpurple/connection.c:293
 #, c-format
 msgid "+++ %s signed on"
 msgstr "+++ %s hat sich angemeldet"
 
-#: libpurple/connection.c:323
+#: ../libpurple/connection.c:323
 #, c-format
 msgid "+++ %s signed off"
 msgstr "+++ %s hat sich abgemeldet"
 
-#: libpurple/connection.c:440 libpurple/plugin.c:282
-#: libpurple/protocols/jabber/buddy.c:1750
-#: libpurple/protocols/msn/servconn.c:139
-#: libpurple/protocols/msn/session.c:322
+#: ../libpurple/connection.c:440 ../libpurple/plugin.c:282
+#: ../libpurple/protocols/jabber/buddy.c:1750
+#: ../libpurple/protocols/msn/servconn.c:139
+#: ../libpurple/protocols/msn/session.c:322
 msgid "Unknown error"
 msgstr "Unbekannter Fehler"
 
-#: libpurple/conversation.c:170
+#: ../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:173 libpurple/conversation.c:186
+#: ../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:174
+#: ../libpurple/conversation.c:174
 msgid "The message is too large."
 msgstr "Die Nachricht ist zu lang."
 
-#: libpurple/conversation.c:183 libpurple/protocols/bonjour/jabber.c:284
-#: libpurple/protocols/bonjour/jabber.c:326
+#: ../libpurple/conversation.c:183 ../libpurple/protocols/bonjour/jabber.c:255
+#: ../libpurple/protocols/bonjour/jabber.c:298
 msgid "Unable to send message."
 msgstr "Nachricht kann nicht gesendet werden."
 
-#: libpurple/conversation.c:1169
+#: ../libpurple/conversation.c:1169
 msgid "Send Message"
 msgstr "Nachricht senden"
 
-#: libpurple/conversation.c:1172
+#: ../libpurple/conversation.c:1172
 msgid "_Send Message"
 msgstr "Nachricht _senden"
 
-#: libpurple/conversation.c:1578
+#: ../libpurple/conversation.c:1578
 #, c-format
 msgid "%s entered the room."
 msgstr "%s hat den Raum betreten."
 
-#: libpurple/conversation.c:1581
+#: ../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:1691
+#: ../libpurple/conversation.c:1691
 #, c-format
 msgid "You are now known as %s"
 msgstr "Sie heißen jetzt %s"
 
-#: libpurple/conversation.c:1711
+#: ../libpurple/conversation.c:1711
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s heißt jetzt %s"
 
-#: libpurple/conversation.c:1786
+#: ../libpurple/conversation.c:1786
 #, c-format
 msgid "%s left the room."
 msgstr "%s hat den Raum verlassen."
 
-#: libpurple/conversation.c:1789
+#: ../libpurple/conversation.c:1789
 #, c-format
 msgid "%s left the room (%s)."
 msgstr "%s hat den Raum verlassen (%s)."
 
-#: libpurple/dbus-server.c:584
+#: ../libpurple/dbus-server.c:584
 #, c-format
 msgid "Failed to get connection: %s"
 msgstr "Kann keine Verbindung herstellen: %s"
 
-#: libpurple/dbus-server.c:596
+#: ../libpurple/dbus-server.c:596
 #, c-format
 msgid "Failed to get name: %s"
 msgstr "Kann den Namen nicht bekommen: %s"
 
-#: libpurple/dbus-server.c:610
+#: ../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:84
+#: ../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"
 
-#: libpurple/desktopitem.c:286 libpurple/desktopitem.c:877
+#: ../libpurple/desktopitem.c:286 ../libpurple/desktopitem.c:877
 msgid "No name"
 msgstr "Kein Name"
 
-#: libpurple/dnsquery.c:510
+#: ../libpurple/dnsquery.c:510
 msgid "Unable to create new resolver process\n"
 msgstr "Kann keinen neuen Auflösungsprozess erstellen\n"
 
-#: libpurple/dnsquery.c:515
+#: ../libpurple/dnsquery.c:515
 msgid "Unable to send request to resolver process\n"
 msgstr "Kann keine Nachricht an den Auflösungsprozess senden\n"
 
-#: libpurple/dnsquery.c:548 libpurple/dnsquery.c:696
+#: ../libpurple/dnsquery.c:548 ../libpurple/dnsquery.c:696
 #, c-format
 msgid ""
 "Error resolving %s:\n"
@@ -1732,12 +1946,13 @@
 "Fehler beim Auflösen von %s:\n"
 "%s"
 
-#: libpurple/dnsquery.c:551 libpurple/dnsquery.c:710 libpurple/dnsquery.c:830
+#: ../libpurple/dnsquery.c:551 ../libpurple/dnsquery.c:710
+#: ../libpurple/dnsquery.c:830
 #, c-format
 msgid "Error resolving %s: %d"
 msgstr "Fehler beim Auflösen von %s: %d"
 
-#: libpurple/dnsquery.c:573
+#: ../libpurple/dnsquery.c:573
 #, c-format
 msgid ""
 "Error reading from resolver process:\n"
@@ -1746,21 +1961,20 @@
 "Fehler beim Lesen vom Auflösungsprozess:\n"
 "%s"
 
-#: libpurple/dnsquery.c:577
-#, c-format
+#: ../libpurple/dnsquery.c:577
 msgid "EOF while reading from resolver process"
 msgstr "EOF während vom Resolver-Prozess gelesen wurde"
 
-#: libpurple/dnsquery.c:760
+#: ../libpurple/dnsquery.c:760
 #, c-format
 msgid "Thread creation failure: %s"
 msgstr "Fehler beim Erzeugen eines Threads: %s"
 
-#: libpurple/dnsquery.c:761
+#: ../libpurple/dnsquery.c:761
 msgid "Unknown reason"
 msgstr "Unbekannter Grund"
 
-#: libpurple/ft.c:207
+#: ../libpurple/ft.c:207
 #, c-format
 msgid ""
 "Error reading %s: \n"
@@ -1769,7 +1983,7 @@
 "Fehler beim Empfangen von %s: \n"
 "%s.\n"
 
-#: libpurple/ft.c:211
+#: ../libpurple/ft.c:211
 #, c-format
 msgid ""
 "Error writing %s: \n"
@@ -1778,7 +1992,7 @@
 "Fehler beim Senden von %s: \n"
 "%s.\n"
 
-#: libpurple/ft.c:215
+#: ../libpurple/ft.c:215
 #, c-format
 msgid ""
 "Error accessing %s: \n"
@@ -1787,40 +2001,40 @@
 "Fehler beim Zugriff auf %s: \n"
 "%s.\n"
 
-#: libpurple/ft.c:251
+#: ../libpurple/ft.c:251
 msgid "Directory is not writable."
 msgstr "Verzeichnis ist nicht schreibbar."
 
-#: libpurple/ft.c:266
+#: ../libpurple/ft.c:266
 msgid "Cannot send a file of 0 bytes."
 msgstr "Kann keine Datei mit 0 Bytes senden."
 
-#: libpurple/ft.c:276
+#: ../libpurple/ft.c:276
 msgid "Cannot send a directory."
 msgstr "Kann kein Verzeichnis senden."
 
-#: libpurple/ft.c:285
+#: ../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:345
+#: ../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:352
+#: ../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:395
+#: ../libpurple/ft.c:395
 #, c-format
 msgid "Accept file transfer request from %s?"
 msgstr "Akzeptieren Sie die Dateiübertragung von %s?"
 
-#: libpurple/ft.c:399
+#: ../libpurple/ft.c:399
 #, c-format
 msgid ""
 "A file is available for download from:\n"
@@ -1831,135 +2045,133 @@
 "Remote-Computer: %s\n"
 "Remote-Port: %d"
 
-#: libpurple/ft.c:434
+#: ../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:486
+#: ../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:507
+#: ../libpurple/ft.c:507
 #, c-format
 msgid "Offering to send %s to %s"
 msgstr "Angebot zum Senden von %s an %s"
 
-#: libpurple/ft.c:519
+#: ../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:680
+#: ../libpurple/ft.c:680
 #, c-format
 msgid "Transfer of file %s complete"
 msgstr "Übertragung der Datei %s ist komplett"
 
-#: libpurple/ft.c:683
-#, c-format
+#: ../libpurple/ft.c:683
 msgid "File transfer complete"
 msgstr "Dateiübertragung ist komplett"
 
-#: libpurple/ft.c:1101
+#: ../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:1106
-#, c-format
+#: ../libpurple/ft.c:1106
 msgid "File transfer cancelled"
 msgstr "Dateiübertragung wurde abgebrochen"
 
-#: libpurple/ft.c:1164
+#: ../libpurple/ft.c:1164
 #, c-format
 msgid "%s canceled the transfer of %s"
 msgstr "%s hat die Übertragung von %s abgebrochen"
 
-#: libpurple/ft.c:1169
+#: ../libpurple/ft.c:1169
 #, c-format
 msgid "%s canceled the file transfer"
 msgstr "%s hat die Datenübertragung abgebrochen"
 
-#: libpurple/ft.c:1226
+#: ../libpurple/ft.c:1226
 #, c-format
 msgid "File transfer to %s failed."
 msgstr "Dateiübertragung an %s wurde abgebrochen."
 
-#: libpurple/ft.c:1228
+#: ../libpurple/ft.c:1228
 #, c-format
 msgid "File transfer from %s failed."
 msgstr "Dateiübertragung von %s wurde abgebrochen."
 
-#: libpurple/gconf/purple.schemas.in.h:1
+#: ../libpurple/gconf/purple.schemas.in.h:1
 msgid "Run the command in a terminal"
 msgstr "Befehl in einem Terminal ausführen"
 
-#: libpurple/gconf/purple.schemas.in.h:2
+#: ../libpurple/gconf/purple.schemas.in.h:2
 msgid "The command used to handle \"aim\" URLs, if enabled."
 msgstr "Der Befehl, der \"aim\"-URLs verarbeitet, wenn aktiviert."
 
-#: libpurple/gconf/purple.schemas.in.h:3
+#: ../libpurple/gconf/purple.schemas.in.h:3
 msgid "The command used to handle \"gg\" URLs, if enabled."
 msgstr "Der Befehl, der \"gg\"-URLs verarbeitet, wenn aktiviert."
 
-#: libpurple/gconf/purple.schemas.in.h:4
+#: ../libpurple/gconf/purple.schemas.in.h:4
 msgid "The command used to handle \"icq\" URLs, if enabled."
 msgstr "Der Befehl, der \"icq\"-URLs verarbeitet, wenn aktiviert."
 
-#: libpurple/gconf/purple.schemas.in.h:5
+#: ../libpurple/gconf/purple.schemas.in.h:5
 msgid "The command used to handle \"irc\" URLs, if enabled."
 msgstr "Der Befehl, der \"irc\"-URLs verarbeitet, wenn aktiviert."
 
-#: libpurple/gconf/purple.schemas.in.h:6
+#: ../libpurple/gconf/purple.schemas.in.h:6
 msgid "The command used to handle \"msnim\" URLs, if enabled."
 msgstr "Der Befehl, der \"msnim\"-URLs verarbeitet, wenn aktiviert."
 
-#: libpurple/gconf/purple.schemas.in.h:7
+#: ../libpurple/gconf/purple.schemas.in.h:7
 msgid "The command used to handle \"sip\" URLs, if enabled."
 msgstr "Der Befehl, der \"sip\"-URLs verarbeitet, wenn aktiviert."
 
-#: libpurple/gconf/purple.schemas.in.h:8
+#: ../libpurple/gconf/purple.schemas.in.h:8
 msgid "The command used to handle \"xmpp\" URLs, if enabled."
 msgstr "Der Befehl, der \"xmpp\"-URLs verarbeitet, wenn aktiviert."
 
-#: libpurple/gconf/purple.schemas.in.h:9
+#: ../libpurple/gconf/purple.schemas.in.h:9
 msgid "The command used to handle \"ymsgr\" URLs, if enabled."
 msgstr "Der Befehl, der \"ymsgr\"-URLs verarbeitet, wenn aktiviert."
 
-#: libpurple/gconf/purple.schemas.in.h:10
+#: ../libpurple/gconf/purple.schemas.in.h:10
 msgid "The handler for \"aim\" URLs"
 msgstr "Behandlungsroutine für \"aim\"-URLs"
 
-#: libpurple/gconf/purple.schemas.in.h:11
+#: ../libpurple/gconf/purple.schemas.in.h:11
 msgid "The handler for \"gg\" URLs"
 msgstr "Behandlungsroutine für \"gg\"-URLs"
 
-#: libpurple/gconf/purple.schemas.in.h:12
+#: ../libpurple/gconf/purple.schemas.in.h:12
 msgid "The handler for \"icq\" URLs"
 msgstr "Behandlungsroutine für \"icq\"-URLs"
 
-#: libpurple/gconf/purple.schemas.in.h:13
+#: ../libpurple/gconf/purple.schemas.in.h:13
 msgid "The handler for \"irc\" URLs"
 msgstr "Behandlungsroutine für \"irc\"-URLs"
 
-#: libpurple/gconf/purple.schemas.in.h:14
+#: ../libpurple/gconf/purple.schemas.in.h:14
 msgid "The handler for \"msnim\" URLs"
 msgstr "Behandlungsroutine für \"msnim\"-URLs"
 
-#: libpurple/gconf/purple.schemas.in.h:15
+#: ../libpurple/gconf/purple.schemas.in.h:15
 msgid "The handler for \"sip\" URLs"
 msgstr "Behandlungsroutine  für \"sip\"-URLs"
 
-#: libpurple/gconf/purple.schemas.in.h:16
+#: ../libpurple/gconf/purple.schemas.in.h:16
 msgid "The handler for \"xmpp\" URLs"
 msgstr "Behandlungsroutine für \"xmpp\"-URLs"
 
-#: libpurple/gconf/purple.schemas.in.h:17
+#: ../libpurple/gconf/purple.schemas.in.h:17
 msgid "The handler for \"ymsgr\" URLs"
 msgstr "Behandlungsroutine für \"ymsrg\"-URLs"
 
-#: libpurple/gconf/purple.schemas.in.h:18
+#: ../libpurple/gconf/purple.schemas.in.h:18
 msgid ""
 "True if the command specified in the \"command\" key should handle \"aim\" "
 "URLs."
@@ -1967,7 +2179,7 @@
 "Aktivieren, wenn der Befehl, der im \"command\"-Schlüssel angegeben ist, "
 "\"aim\"-URLs verarbeiten soll."
 
-#: libpurple/gconf/purple.schemas.in.h:19
+#: ../libpurple/gconf/purple.schemas.in.h:19
 msgid ""
 "True if the command specified in the \"command\" key should handle \"gg\" "
 "URLs."
@@ -1975,7 +2187,7 @@
 "Aktivieren, wenn der Befehl, der im \"command\"-Schlüssel angegeben ist, \"gg"
 "\"-URLs verarbeiten soll."
 
-#: libpurple/gconf/purple.schemas.in.h:20
+#: ../libpurple/gconf/purple.schemas.in.h:20
 msgid ""
 "True if the command specified in the \"command\" key should handle \"icq\" "
 "URLs."
@@ -1983,7 +2195,7 @@
 "Aktivieren, wenn der Befehl, der im \"command\"-Schlüssel angegeben ist, "
 "\"icq\"-URLs verarbeiten soll."
 
-#: libpurple/gconf/purple.schemas.in.h:21
+#: ../libpurple/gconf/purple.schemas.in.h:21
 msgid ""
 "True if the command specified in the \"command\" key should handle \"irc\" "
 "URLs."
@@ -1991,7 +2203,7 @@
 "Aktivieren, wenn der Befehl, der im \"command\"-Schlüssel angegeben ist, "
 "\"irc\"-URLs verarbeiten soll."
 
-#: libpurple/gconf/purple.schemas.in.h:22
+#: ../libpurple/gconf/purple.schemas.in.h:22
 msgid ""
 "True if the command specified in the \"command\" key should handle \"msnim\" "
 "URLs."
@@ -1999,7 +2211,7 @@
 "Aktivieren, wenn der Befehl, der im \"command\"-Schlüssel angegeben ist, "
 "\"msnim\"-URLs verarbeiten soll."
 
-#: libpurple/gconf/purple.schemas.in.h:23
+#: ../libpurple/gconf/purple.schemas.in.h:23
 msgid ""
 "True if the command specified in the \"command\" key should handle \"sip\" "
 "URLs."
@@ -2007,7 +2219,7 @@
 "Aktivieren, wenn der Befehl, der im \"command\"-Schlüssel angegeben ist, "
 "\"sip\"-URLs verarbeiten soll."
 
-#: libpurple/gconf/purple.schemas.in.h:24
+#: ../libpurple/gconf/purple.schemas.in.h:24
 msgid ""
 "True if the command specified in the \"command\" key should handle \"xmpp\" "
 "URLs."
@@ -2015,7 +2227,7 @@
 "Aktivieren, wenn der Befehl, der im \"command\"-Schlüssel angegeben ist, "
 "\"xmpp\"-URLs verarbeiten soll."
 
-#: libpurple/gconf/purple.schemas.in.h:25
+#: ../libpurple/gconf/purple.schemas.in.h:25
 msgid ""
 "True if the command specified in the \"command\" key should handle \"ymsgr\" "
 "URLs."
@@ -2023,7 +2235,7 @@
 "Aktivieren, wenn der Befehl, der im \"command\"-Schlüssel angegeben ist, "
 "\"ymsgr\"-URLs verarbeiten soll."
 
-#: libpurple/gconf/purple.schemas.in.h:26
+#: ../libpurple/gconf/purple.schemas.in.h:26
 msgid ""
 "True if the command used to handle this type of URL should be run in a "
 "terminal."
@@ -2031,63 +2243,63 @@
 "Aktivieren, wenn der Befehl, der benutzt wird um diese Art von URL zu "
 "verarbeiten, in einem Terminal ausgeführt werden soll."
 
-#: libpurple/gconf/purple.schemas.in.h:27
+#: ../libpurple/gconf/purple.schemas.in.h:27
 msgid "Whether the specified command should handle \"aim\" URLs"
 msgstr "Legt fest, ob das angegebene Kommado \"aim\"-URLs verarbeiten soll"
 
-#: libpurple/gconf/purple.schemas.in.h:28
+#: ../libpurple/gconf/purple.schemas.in.h:28
 msgid "Whether the specified command should handle \"gg\" URLs"
 msgstr "Legt fest, ob das angegebene Kommado \"gg\"-URLs verarbeiten soll"
 
-#: libpurple/gconf/purple.schemas.in.h:29
+#: ../libpurple/gconf/purple.schemas.in.h:29
 msgid "Whether the specified command should handle \"icq\" URLs"
 msgstr "Legt fest, ob das angegebene Kommado \"icq\"-URLs verarbeiten soll"
 
-#: libpurple/gconf/purple.schemas.in.h:30
+#: ../libpurple/gconf/purple.schemas.in.h:30
 msgid "Whether the specified command should handle \"irc\" URLs"
 msgstr "Legt fest, ob das angegebene Kommado \"irc\"-URLs verarbeiten soll"
 
-#: libpurple/gconf/purple.schemas.in.h:31
+#: ../libpurple/gconf/purple.schemas.in.h:31
 msgid "Whether the specified command should handle \"msnim\" URLs"
 msgstr "Legt fest, ob das angegebene Kommado \"msnim\"-URLs verarbeiten soll"
 
-#: libpurple/gconf/purple.schemas.in.h:32
+#: ../libpurple/gconf/purple.schemas.in.h:32
 msgid "Whether the specified command should handle \"sip\" URLs"
 msgstr "Legt fest, ob das angegebene Kommado \"sip\"-URLs verarbeiten soll"
 
-#: libpurple/gconf/purple.schemas.in.h:33
+#: ../libpurple/gconf/purple.schemas.in.h:33
 msgid "Whether the specified command should handle \"xmpp\" URLs"
 msgstr "Legt fest, ob das angegebene Kommado \"xmpp\"-URLs verarbeiten soll"
 
-#: libpurple/gconf/purple.schemas.in.h:34
+#: ../libpurple/gconf/purple.schemas.in.h:34
 msgid "Whether the specified command should handle \"ymsgr\" URLs"
 msgstr "Legt fest, ob das angegebene Kommado \"ymsrg\"-URLs verarbeiten soll"
 
-#: libpurple/log.c:182
+#: ../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:597
+#: ../libpurple/log.c:597
 msgid "HTML"
 msgstr "HTML"
 
-#: libpurple/log.c:611
+#: ../libpurple/log.c:611
 msgid "Plain text"
 msgstr "Einfacher Text"
 
-#: libpurple/log.c:625
+#: ../libpurple/log.c:625
 msgid "Old flat format"
 msgstr "Altes \"flaches\" Format"
 
-#: libpurple/log.c:837
+#: ../libpurple/log.c:838
 msgid "Logging of this conversation failed."
 msgstr "Mitschnitt der Unterhaltung fehlgeschlagen."
 
-#: libpurple/log.c:1280
+#: ../libpurple/log.c:1281
 msgid "XML"
 msgstr "XML"
 
-#: libpurple/log.c:1364
+#: ../libpurple/log.c:1365
 #, c-format
 msgid ""
 "<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
@@ -2096,7 +2308,7 @@
 "<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
 "REPLY&gt;:</b></font> %s<br/>\n"
 
-#: libpurple/log.c:1366
+#: ../libpurple/log.c:1367
 #, c-format
 msgid ""
 "<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
@@ -2105,46 +2317,45 @@
 "<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
 "REPLY&gt;:</b></font> %s<br/>\n"
 
-#: libpurple/log.c:1424 libpurple/log.c:1557
+#: ../libpurple/log.c:1425 ../libpurple/log.c:1558
 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:1436 libpurple/log.c:1566
+#: ../libpurple/log.c:1437 ../libpurple/log.c:1567
 #, 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:1498
+#: ../libpurple/log.c:1499
 #, c-format
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr "(%s) %s <AUTO-REPLY>: %s\n"
 
-#: libpurple/plugin.c:365
+#: ../libpurple/plugin.c:365
 #, c-format
 msgid "You are using %s, but this plugin requires %s."
 msgstr "Sie benutzen %s, aber dieses Plugin benötigt %s."
 
-#: libpurple/plugin.c:380
-#, c-format
+#: ../libpurple/plugin.c:380
 msgid "This plugin has not defined an ID."
 msgstr "Dieses Plugin hat keine ID definiert."
 
-#: libpurple/plugin.c:448
+#: ../libpurple/plugin.c:448
 #, c-format
 msgid "Plugin magic mismatch %d (need %d)"
 msgstr "Keine Übereinstimmung der Plugin-Magic-Nummer %d (brauche %d)"
 
-#: libpurple/plugin.c:465
+#: ../libpurple/plugin.c:465
 #, c-format
 msgid "ABI version mismatch %d.%d.x (need %d.%d.x)"
 msgstr "ABI Versionskonflikt %d.%d.x (brauche %d.%d.x)"
 
-#: libpurple/plugin.c:482
+#: ../libpurple/plugin.c:482
 msgid "Plugin does not implement all required functions"
 msgstr "Plugin enthält nicht alle benötigten Funktionen"
 
-#: libpurple/plugin.c:547
+#: ../libpurple/plugin.c:547
 #, c-format
 msgid ""
 "The required plugin %s was not found. Please install this plugin and try "
@@ -2153,91 +2364,91 @@
 "Das erforderliche Plugin %s wurde nicht gefunden. Bitte installieren Sie das "
 "Plugin und versuchen Sie es erneut."
 
-#: libpurple/plugin.c:552
+#: ../libpurple/plugin.c:552
 msgid "Unable to load the plugin"
 msgstr "Konnte das Plugin nicht laden"
 
-#: libpurple/plugin.c:574
+#: ../libpurple/plugin.c:574
 #, c-format
 msgid "The required plugin %s was unable to load."
 msgstr "Das erforderliche Plugin %s konnte nicht geladen werden."
 
-#: libpurple/plugin.c:578
+#: ../libpurple/plugin.c:578
 msgid "Unable to load your plugin."
 msgstr "Konnte Ihr Plugin nicht laden."
 
-#: libpurple/plugin.c:677
+#: ../libpurple/plugin.c:677
 #, c-format
 msgid "The dependent plugin %s failed to unload."
 msgstr "Das erforderliche Plugin %s konnte nicht entladen werden."
 
-#: libpurple/plugin.c:681
+#: ../libpurple/plugin.c:681
 msgid "There were errors unloading the plugin."
 msgstr "Beim Entladen des Plugins traten Fehler auf."
 
-#: libpurple/plugins/autoaccept.c:23
+#: ../libpurple/plugins/autoaccept.c:23
 msgid "Autoaccept"
 msgstr "Auto-Akzeptieren"
 
-#: libpurple/plugins/autoaccept.c:25 libpurple/plugins/autoaccept.c:26
+#: ../libpurple/plugins/autoaccept.c:25 ../libpurple/plugins/autoaccept.c:26
 msgid "Auto-accept file transfer requests from selected users."
 msgstr "Dateiübertragung von ausgewählten Benutzern automatisch akzeptieren."
 
-#: libpurple/plugins/autoaccept.c:80
+#: ../libpurple/plugins/autoaccept.c:80
 #, c-format
 msgid "Autoaccepted file transfer of \"%s\" from \"%s\" completed."
 msgstr ""
 "Automatisch akzeptierte Übertragung der Datei \"%s\" von \"%s\" "
 "abgeschlossen."
 
-#: libpurple/plugins/autoaccept.c:82
+#: ../libpurple/plugins/autoaccept.c:82
 msgid "Autoaccept complete"
 msgstr "Autoaccept fertig"
 
-#: libpurple/plugins/autoaccept.c:160
+#: ../libpurple/plugins/autoaccept.c:160
 #, c-format
 msgid "When a file-transfer request arrives from %s"
 msgstr "Wenn eine Dateitransferanfrage von %s ankommt"
 
-#: libpurple/plugins/autoaccept.c:162
+#: ../libpurple/plugins/autoaccept.c:162
 msgid "Set Autoaccept Setting"
 msgstr "Auto-Akzeptieren-Einstellungen setzen"
 
-#: libpurple/plugins/autoaccept.c:164
+#: ../libpurple/plugins/autoaccept.c:164
 msgid "_Save"
 msgstr "_Speichern"
 
-#: 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:1454
-#: libpurple/protocols/oscar/oscar.c:2247
-#: libpurple/protocols/oscar/oscar.c:2294
-#: 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
+#: ../libpurple/plugins/autoaccept.c:165 ../libpurple/plugins/idle.c:170
+#: ../libpurple/plugins/idle.c:204 ../libpurple/plugins/idle.c:230
+#: ../libpurple/protocols/oscar/oscar.c:1451
+#: ../libpurple/protocols/oscar/oscar.c:2243
+#: ../libpurple/protocols/oscar/oscar.c:2292
+#: ../libpurple/protocols/oscar/oscar.c:5834
+#: ../libpurple/protocols/oscar/oscar.c:5889
+#: ../libpurple/protocols/oscar/oscar.c:6115
+#: ../libpurple/protocols/oscar/oscar.c:6185 ../libpurple/request.h:1387
+#: ../libpurple/request.h:1397
 msgid "_Cancel"
 msgstr "A_bbrechen"
 
-#: libpurple/plugins/autoaccept.c:168
+#: ../libpurple/plugins/autoaccept.c:168
 msgid "Ask"
 msgstr "Fragen"
 
-#: libpurple/plugins/autoaccept.c:169
+#: ../libpurple/plugins/autoaccept.c:169
 msgid "Auto Accept"
 msgstr "Auto-Akzeptieren"
 
-#: libpurple/plugins/autoaccept.c:170
+#: ../libpurple/plugins/autoaccept.c:170
 msgid "Auto Reject"
 msgstr "Auto-Ablehnen"
 
-#: libpurple/plugins/autoaccept.c:185
+#: ../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:215
+#: ../libpurple/plugins/autoaccept.c:215
 msgid ""
 "Path to save the files in\n"
 "(Please provide the full path)"
@@ -2245,11 +2456,11 @@
 "Pfad in denen die Dateien gespeichert werden sollen\n"
 "(Bitte geben Sie den vollständigen Pfad an)"
 
-#: libpurple/plugins/autoaccept.c:220
+#: ../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:224
+#: ../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)"
@@ -2258,16 +2469,16 @@
 "Dateiübertragung abgeschlossen ist\n"
 "(nur, wenn es keine Unterhaltung mit dem Sender gibt)"
 
-#: libpurple/plugins/buddynote.c:46 libpurple/protocols/msn/msn.c:1629
-#: libpurple/protocols/msn/msn.c:1659
+#: ../libpurple/plugins/buddynote.c:46 ../libpurple/protocols/msn/msn.c:1629
+#: ../libpurple/protocols/msn/msn.c:1659
 msgid "Notes"
 msgstr "Notizen"
 
-#: libpurple/plugins/buddynote.c:47
+#: ../libpurple/plugins/buddynote.c:47
 msgid "Enter your notes below..."
 msgstr "Geben Sie Ihre Notizen unten ein..."
 
-#: libpurple/plugins/buddynote.c:65
+#: ../libpurple/plugins/buddynote.c:65
 msgid "Edit Notes..."
 msgstr "Notizen bearbeiten..."
 
@@ -2279,18 +2490,18 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: libpurple/plugins/buddynote.c:90 pidgin/plugins/gtkbuddynote.c:71
+#: ../libpurple/plugins/buddynote.c:90 ../pidgin/plugins/gtkbuddynote.c:71
 msgid "Buddy Notes"
 msgstr "Buddy-Notizen"
 
 #. *< name
 #. *< version
-#: libpurple/plugins/buddynote.c:92 pidgin/plugins/gtkbuddynote.c:73
+#: ../libpurple/plugins/buddynote.c:92 ../pidgin/plugins/gtkbuddynote.c:73
 msgid "Store notes on particular buddies."
 msgstr "Notizen über bestimmte Buddys speichern."
 
 #. *< summary
-#: libpurple/plugins/buddynote.c:93 pidgin/plugins/gtkbuddynote.c:74
+#: ../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."
@@ -2301,7 +2512,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: libpurple/plugins/ciphertest.c:264
+#: ../libpurple/plugins/ciphertest.c:264
 msgid "Cipher Test"
 msgstr "Verschlüsselungstest"
 
@@ -2309,7 +2520,7 @@
 #. *< version
 #. *  summary
 #. *  description
-#: libpurple/plugins/ciphertest.c:267 libpurple/plugins/ciphertest.c:269
+#: ../libpurple/plugins/ciphertest.c:267 ../libpurple/plugins/ciphertest.c:269
 msgid "Tests the ciphers that ship with libpurple."
 msgstr "Testet die Chiffren, die mit libpurple geliefert werden."
 
@@ -2319,7 +2530,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: libpurple/plugins/dbus-example.c:155
+#: ../libpurple/plugins/dbus-example.c:155
 msgid "DBus Example"
 msgstr "DBus-Beispiel"
 
@@ -2327,7 +2538,8 @@
 #. *< version
 #. *  summary
 #. *  description
-#: libpurple/plugins/dbus-example.c:158 libpurple/plugins/dbus-example.c:160
+#: ../libpurple/plugins/dbus-example.c:158
+#: ../libpurple/plugins/dbus-example.c:160
 msgid "DBus Plugin Example"
 msgstr "DBus-Plugin-Beispiel"
 
@@ -2337,7 +2549,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: libpurple/plugins/filectl.c:248
+#: ../libpurple/plugins/filectl.c:248
 msgid "File Control"
 msgstr "Dateikontrolle"
 
@@ -2345,50 +2557,50 @@
 #. *< version
 #. *  summary
 #. *  description
-#: libpurple/plugins/filectl.c:251 libpurple/plugins/filectl.c:253
+#: ../libpurple/plugins/filectl.c:251 ../libpurple/plugins/filectl.c:253
 msgid "Allows control by entering commands in a file."
 msgstr "Erlaubt die Steuerung, indem Sie Kommandos in eine Datei schreiben."
 
-#: libpurple/plugins/idle.c:158 libpurple/plugins/idle.c:218
+#: ../libpurple/plugins/idle.c:158 ../libpurple/plugins/idle.c:218
 msgid "Minutes"
 msgstr "Minuten"
 
 #. This is a cultural reference.  Dy'er Mak'er is a song by Led Zeppelin.
 #. If that doesn't translate well into your language, drop the 's before translating.
-#: libpurple/plugins/idle.c:165 libpurple/plugins/idle.c:199
-#: libpurple/plugins/idle.c:225 libpurple/plugins/idle.c:318
+#: ../libpurple/plugins/idle.c:165 ../libpurple/plugins/idle.c:199
+#: ../libpurple/plugins/idle.c:225 ../libpurple/plugins/idle.c:318
 msgid "I'dle Mak'er"
 msgstr "Untätigkeitsmarker"
 
-#: libpurple/plugins/idle.c:166 libpurple/plugins/idle.c:258
+#: ../libpurple/plugins/idle.c:166 ../libpurple/plugins/idle.c:258
 msgid "Set Account Idle Time"
 msgstr "Setze Konto-Untätigkeitszeit"
 
-#: libpurple/plugins/idle.c:169 libpurple/plugins/idle.c:229
+#: ../libpurple/plugins/idle.c:169 ../libpurple/plugins/idle.c:229
 msgid "_Set"
 msgstr "_Setzen"
 
-#: libpurple/plugins/idle.c:184
+#: ../libpurple/plugins/idle.c:184
 msgid "None of your accounts are idle."
 msgstr "Keine ihrer Konten sind untätig."
 
-#: libpurple/plugins/idle.c:200 libpurple/plugins/idle.c:262
+#: ../libpurple/plugins/idle.c:200 ../libpurple/plugins/idle.c:262
 msgid "Unset Account Idle Time"
 msgstr "Untätigkeitszeit zurücksetzen"
 
-#: libpurple/plugins/idle.c:203
+#: ../libpurple/plugins/idle.c:203
 msgid "_Unset"
 msgstr "Zurücksetze_n"
 
-#: libpurple/plugins/idle.c:226 libpurple/plugins/idle.c:266
+#: ../libpurple/plugins/idle.c:226 ../libpurple/plugins/idle.c:266
 msgid "Set Idle Time for All Accounts"
 msgstr "Untätigkeitszeit für alle Konten setzen"
 
-#: libpurple/plugins/idle.c:271
+#: ../libpurple/plugins/idle.c:271
 msgid "Unset Idle Time for All Idled Accounts"
 msgstr "Untätigkeitszeit für alle untätige Konten zurücksetzen"
 
-#: libpurple/plugins/idle.c:320 libpurple/plugins/idle.c:321
+#: ../libpurple/plugins/idle.c:320 ../libpurple/plugins/idle.c:321
 msgid "Allows you to hand-configure how long you've been idle"
 msgstr ""
 "Erlaubt Ihnen manuell zu konfigurieren, wie lange Sie untätig sein wollen"
@@ -2399,19 +2611,19 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: libpurple/plugins/ipc-test-client.c:87
+#: ../libpurple/plugins/ipc-test-client.c:87
 msgid "IPC Test Client"
 msgstr "IPC Testclient"
 
 #. *< name
 #. *< version
 #. *  summary
-#: libpurple/plugins/ipc-test-client.c:90
+#: ../libpurple/plugins/ipc-test-client.c:90
 msgid "Test plugin IPC support, as a client."
 msgstr "Plugin zum Testen der IPC-Unterstützung als Client."
 
 #. *  description
-#: libpurple/plugins/ipc-test-client.c:92
+#: ../libpurple/plugins/ipc-test-client.c:92
 msgid ""
 "Test plugin IPC support, as a client. This locates the server plugin and "
 "calls the commands registered."
@@ -2425,33 +2637,33 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: libpurple/plugins/ipc-test-server.c:74
+#: ../libpurple/plugins/ipc-test-server.c:74
 msgid "IPC Test Server"
 msgstr "IPC Testserver"
 
 #. *< name
 #. *< version
 #. *  summary
-#: libpurple/plugins/ipc-test-server.c:77
+#: ../libpurple/plugins/ipc-test-server.c:77
 msgid "Test plugin IPC support, as a server."
 msgstr "Plugin zum Testen der IPC-Unterstützung als Server."
 
 #. *  description
-#: libpurple/plugins/ipc-test-server.c:79
+#: ../libpurple/plugins/ipc-test-server.c:79
 msgid "Test plugin IPC support, as a server. This registers the IPC commands."
 msgstr ""
 "Plugin zum Testen der IPC-Unterstützung als Server. Die IPC-Kommandos werden "
 "registriert."
 
-#: libpurple/plugins/joinpart.c:229
+#: ../libpurple/plugins/joinpart.c:229
 msgid "Join/Part Hiding Configuration"
 msgstr "Verstecken der Betreten-/Verlassen-Meldungen"
 
-#: libpurple/plugins/joinpart.c:233
+#: ../libpurple/plugins/joinpart.c:233
 msgid "Minimum Room Size"
 msgstr "Minimale Raumgröße"
 
-#: libpurple/plugins/joinpart.c:239
+#: ../libpurple/plugins/joinpart.c:239
 msgid "User Inactivity Timeout (in minutes)"
 msgstr "Benutzer-Inaktivitäts-Zeitüberschreitung"
 
@@ -2461,19 +2673,19 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: libpurple/plugins/joinpart.c:270
+#: ../libpurple/plugins/joinpart.c:270
 msgid "Join/Part Hiding"
 msgstr "Betreten/Verlassen verstecken"
 
 #. *< name
 #. *< version
 #. *  summary
-#: libpurple/plugins/joinpart.c:273
+#: ../libpurple/plugins/joinpart.c:273
 msgid "Hides extraneous join/part messages."
 msgstr "Versteckt belanglose Betreten-/Verlassen-Meldungen."
 
 #. *  description
-#: libpurple/plugins/joinpart.c:275
+#: ../libpurple/plugins/joinpart.c:275
 msgid ""
 "This plugin hides join/part messages in large rooms, except for those users "
 "actively taking part in a conversation."
@@ -2485,33 +2697,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:492
+#: ../libpurple/plugins/log_reader.c:493
 msgid "(UTC)"
 msgstr "(UTC)"
 
-#: libpurple/plugins/log_reader.c:1573
+#: ../libpurple/plugins/log_reader.c:1577
 msgid "User is offline."
 msgstr "Benutzer ist offline."
 
-#: libpurple/plugins/log_reader.c:1579
+#: ../libpurple/plugins/log_reader.c:1583
 msgid "Auto-response sent:"
 msgstr "Automatische Antwort gesendet:"
 
-#: libpurple/plugins/log_reader.c:1589 libpurple/plugins/log_reader.c:1592
-#: libpurple/plugins/statenotify.c:80
+#: ../libpurple/plugins/log_reader.c:1593
+#: ../libpurple/plugins/log_reader.c:1596
+#: ../libpurple/plugins/statenotify.c:80
 #, c-format
 msgid "%s has signed off."
 msgstr "%s hat sich abgemeldet."
 
-#: libpurple/plugins/log_reader.c:1606
+#: ../libpurple/plugins/log_reader.c:1610
 msgid "One or more messages may have been undeliverable."
 msgstr "Eine oder mehrere Nachrichten konnten nicht zugestellt werden."
 
-#: libpurple/plugins/log_reader.c:1616
+#: ../libpurple/plugins/log_reader.c:1620
 msgid "You were disconnected from the server."
 msgstr "Sie wurden vom Server getrennt."
 
-#: libpurple/plugins/log_reader.c:1624
+#: ../libpurple/plugins/log_reader.c:1628
 msgid ""
 "You are currently disconnected. Messages will not be received unless you are "
 "logged in."
@@ -2519,73 +2732,79 @@
 "Sie sind nicht verbunden. Nachrichten können nicht empfangen werden bis Sie "
 "sich wieder anmelden."
 
-#: libpurple/plugins/log_reader.c:1639
+#: ../libpurple/plugins/log_reader.c:1643
 msgid "Message could not be sent because the maximum length was exceeded."
 msgstr ""
 "Nachricht konnte nicht gesendet werden, da maximale Länge überschritten "
 "wurde."
 
-#: libpurple/plugins/log_reader.c:1644
+#: ../libpurple/plugins/log_reader.c:1648
 msgid "Message could not be sent."
 msgstr "Ihre Nachricht wurde nicht verschickt."
 
 #. 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:2343 libpurple/plugins/log_reader.c:2466
+#: ../libpurple/plugins/log_reader.c:2349
+#: ../libpurple/plugins/log_reader.c:2472
 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:2356 libpurple/plugins/log_reader.c:2471
+#: ../libpurple/plugins/log_reader.c:2362
+#: ../libpurple/plugins/log_reader.c:2477
 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:2368 libpurple/plugins/log_reader.c:2475
+#: ../libpurple/plugins/log_reader.c:2374
+#: ../libpurple/plugins/log_reader.c:2481
 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:2382 libpurple/plugins/log_reader.c:2480
+#: ../libpurple/plugins/log_reader.c:2388
+#: ../libpurple/plugins/log_reader.c:2486
 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:2394 libpurple/plugins/log_reader.c:2484
+#: ../libpurple/plugins/log_reader.c:2400
+#: ../libpurple/plugins/log_reader.c:2490
 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:2406 libpurple/plugins/log_reader.c:2488
+#: ../libpurple/plugins/log_reader.c:2412
+#: ../libpurple/plugins/log_reader.c:2494
 msgid "Trillian"
 msgstr "Trillian"
 
 #. Add general preferences.
-#: libpurple/plugins/log_reader.c:2448
+#: ../libpurple/plugins/log_reader.c:2454
 msgid "General Log Reading Configuration"
 msgstr "Allgemeine Mitschnittseinstellungen"
 
-#: libpurple/plugins/log_reader.c:2452
+#: ../libpurple/plugins/log_reader.c:2458
 msgid "Fast size calculations"
 msgstr "Schnelle Größenberechnung"
 
-#: libpurple/plugins/log_reader.c:2456
+#: ../libpurple/plugins/log_reader.c:2462
 msgid "Use name heuristics"
 msgstr "Benutze Namensheuristiken"
 
 #. Add Log Directory preferences.
-#: libpurple/plugins/log_reader.c:2462
+#: ../libpurple/plugins/log_reader.c:2468
 msgid "Log Directory"
 msgstr "Mitschnittverzeichnis"
 
@@ -2595,21 +2814,21 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: libpurple/plugins/log_reader.c:2517
+#: ../libpurple/plugins/log_reader.c:2523
 msgid "Log Reader"
 msgstr "Mitschnittsbetrachter"
 
 #. *< name
 #. *< version
 #. * summary
-#: libpurple/plugins/log_reader.c:2521
+#: ../libpurple/plugins/log_reader.c:2527
 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:2525
+#: ../libpurple/plugins/log_reader.c:2531
 msgid ""
 "When viewing logs, this plugin will include logs from other IM clients. "
 "Currently, this includes Adium, MSN Messenger, and Trillian.\n"
@@ -2623,12 +2842,12 @@
 "WARNUNG: Dieses Plugin befindet sich noch im Entwicklungsstadium und kann "
 "oft Abstürzen. Benutzung auf eigene Gefahr!"
 
-#: libpurple/plugins/mono/loader/mono.c:217
+#: ../libpurple/plugins/mono/loader/mono.c:217
 msgid "Mono Plugin Loader"
 msgstr "Mono-Plugin-Lader"
 
-#: libpurple/plugins/mono/loader/mono.c:219
-#: libpurple/plugins/mono/loader/mono.c:220
+#: ../libpurple/plugins/mono/loader/mono.c:219
+#: ../libpurple/plugins/mono/loader/mono.c:220
 msgid "Loads .NET plugins with Mono."
 msgstr "Lädt .NET-Plugins mit Mono."
 
@@ -2641,18 +2860,18 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: libpurple/plugins/newline.c:68
+#: ../libpurple/plugins/newline.c:68
 msgid "New Line"
 msgstr "Neue Zeile"
 
 #. *< name
 #. *< version
-#: libpurple/plugins/newline.c:70
+#: ../libpurple/plugins/newline.c:70
 msgid "Prepends a newline to displayed message."
 msgstr "Fügt einen Zeilenumbruch vor angezeigter Nachricht ein."
 
 #. *< summary
-#: libpurple/plugins/newline.c:71
+#: ../libpurple/plugins/newline.c:71
 msgid ""
 "Prepends a newline to messages so that the rest of the message appears below "
 "the screen name in the conversation window."
@@ -2660,15 +2879,15 @@
 "Fügt einen Zeilenumbruch vor Nachrichten ein, sodass im Gesprächsfenster der "
 "Nachrichtentext unter dem Benutzernamen erscheint."
 
-#: libpurple/plugins/offlinemsg.c:23
+#: ../libpurple/plugins/offlinemsg.c:23
 msgid "Offline Message Emulation"
 msgstr "Offline-Nachrichten-Emulation"
 
-#: libpurple/plugins/offlinemsg.c:25 libpurple/plugins/offlinemsg.c:26
+#: ../libpurple/plugins/offlinemsg.c:25 ../libpurple/plugins/offlinemsg.c:26
 msgid "Save messages sent to an offline user as pounce."
 msgstr "Sichert Nachrichten an einen Offline-Benutzer als Alarm."
 
-#: libpurple/plugins/offlinemsg.c:95
+#: ../libpurple/plugins/offlinemsg.c:95
 msgid ""
 "The rest of the messages will be saved as pounce. You can edit/delete the "
 "pounce from the `Buddy Pounce' dialog."
@@ -2676,7 +2895,7 @@
 "Die folgenden Nachrichten werden als Alarm gesichert. Sie können den Alarm "
 "im `Buddy-Alarm'-Dialog ändern oder löschen."
 
-#: libpurple/plugins/offlinemsg.c:152
+#: ../libpurple/plugins/offlinemsg.c:152
 #, c-format
 msgid ""
 "\"%s\" is currently offline. Do you want to save the rest of the messages in "
@@ -2686,39 +2905,43 @@
 "einem Alarm sichern? Diese Nachrichten würden dann automatisch gesendet, "
 "wenn sich \"%s\" wieder anmeldet."
 
-#: libpurple/plugins/offlinemsg.c:156
+#: ../libpurple/plugins/offlinemsg.c:156
 msgid "Offline Message"
 msgstr "Offline-Nachrichten"
 
-#: libpurple/plugins/offlinemsg.c:157
+#: ../libpurple/plugins/offlinemsg.c:157
 msgid "You can edit/delete the pounce from the `Buddy Pounces' dialog"
 msgstr "Sie können den Alarm im `Buddy-Alarm'-Dialog ändern/löschen"
 
-#: libpurple/plugins/offlinemsg.c:161 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: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
+#: ../libpurple/plugins/offlinemsg.c:161
+#: ../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: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 "Ja"
 
-#: libpurple/plugins/offlinemsg.c:162 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: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
+#: ../libpurple/plugins/offlinemsg.c:162
+#: ../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: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 "Nein"
 
-#: libpurple/plugins/offlinemsg.c:189
+#: ../libpurple/plugins/offlinemsg.c:189
 msgid "Save offline messages in pounce"
 msgstr "Sichere Offline-Nachricht als Alarm"
 
-#: libpurple/plugins/offlinemsg.c:193
+#: ../libpurple/plugins/offlinemsg.c:193
 msgid "Do not ask. Always save in pounce."
 msgstr "Nicht nachfragen. Immer als Alarm sichern."
 
@@ -2728,26 +2951,26 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: libpurple/plugins/perl/perl.c:601
+#: ../libpurple/plugins/perl/perl.c:601
 msgid "Perl Plugin Loader"
 msgstr "Perl-Plugin-Loader"
 
 #. *< name
 #. *< version
 #. *< summary
-#: libpurple/plugins/perl/perl.c:603 libpurple/plugins/perl/perl.c:604
+#: ../libpurple/plugins/perl/perl.c:603 ../libpurple/plugins/perl/perl.c:604
 msgid "Provides support for loading perl plugins."
 msgstr "Ermöglicht das Laden von Perl-Plugins."
 
-#: libpurple/plugins/psychic.c:20
+#: ../libpurple/plugins/psychic.c:20
 msgid "Psychic Mode"
 msgstr "Psycho-Modus"
 
-#: libpurple/plugins/psychic.c:21
+#: ../libpurple/plugins/psychic.c:21
 msgid "Psychic mode for incoming conversation"
 msgstr "Psycho-Modus für eingehende Gespräche"
 
-#: libpurple/plugins/psychic.c:22
+#: ../libpurple/plugins/psychic.c:22
 msgid ""
 "Causes conversation windows to appear as other users begin to message you.  "
 "This works for AIM, ICQ, XMPP, Sametime, and Yahoo!"
@@ -2755,23 +2978,23 @@
 "Öffnet Gesprächsfenster, wenn andere Benutzer beginnen, Ihnen eine Nachricht "
 "zu senden.  Das funktioniert mit AIM, ICQ, XMPP, Sametime und Yahoo!"
 
-#: libpurple/plugins/psychic.c:72
+#: ../libpurple/plugins/psychic.c:72
 msgid "You feel a disturbance in the force..."
 msgstr "Ihr Buddy beginnt zu tippen..."
 
-#: libpurple/plugins/psychic.c:91
+#: ../libpurple/plugins/psychic.c:91
 msgid "Only enable for users on the buddy list"
 msgstr "Nur für Benutzer aus der Buddy-Liste aktivieren"
 
-#: libpurple/plugins/psychic.c:96
+#: ../libpurple/plugins/psychic.c:96
 msgid "Disable when away"
 msgstr "Deaktivieren, wenn abwesend"
 
-#: libpurple/plugins/psychic.c:100
+#: ../libpurple/plugins/psychic.c:100
 msgid "Display notification message in conversations"
 msgstr "Benachrichtigung in Gesprächen anzeigen"
 
-#: libpurple/plugins/psychic.c:105
+#: ../libpurple/plugins/psychic.c:105
 msgid "Raise psychic conversations"
 msgstr "Psycho-Unterhaltungen anheben"
 
@@ -2781,7 +3004,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: libpurple/plugins/signals-test.c:711
+#: ../libpurple/plugins/signals-test.c:711
 msgid "Signals Test"
 msgstr "Signaltest"
 
@@ -2789,7 +3012,8 @@
 #. *< version
 #. *  summary
 #. *  description
-#: libpurple/plugins/signals-test.c:714 libpurple/plugins/signals-test.c:716
+#: ../libpurple/plugins/signals-test.c:714
+#: ../libpurple/plugins/signals-test.c:716
 msgid "Test to see that all signals are working properly."
 msgstr "Test, um zu sehen, ob alle Signale richtig funktionieren."
 
@@ -2799,7 +3023,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: libpurple/plugins/simple.c:37
+#: ../libpurple/plugins/simple.c:37
 msgid "Simple Plugin"
 msgstr "Einfaches Plugin"
 
@@ -2807,7 +3031,7 @@
 #. *< version
 #. *  summary
 #. *  description
-#: libpurple/plugins/simple.c:40 libpurple/plugins/simple.c:42
+#: ../libpurple/plugins/simple.c:40 ../libpurple/plugins/simple.c:42
 msgid "Tests to see that most things are working."
 msgstr "Tests, um zu sehen, ob das meiste funktioniert."
 
@@ -2817,7 +3041,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: libpurple/plugins/ssl/ssl-gnutls.c:275
+#: ../libpurple/plugins/ssl/ssl-gnutls.c:275
 msgid "GNUTLS"
 msgstr "GNUTLS"
 
@@ -2825,8 +3049,8 @@
 #. *< version
 #. *  summary
 #. *  description
-#: libpurple/plugins/ssl/ssl-gnutls.c:278
-#: libpurple/plugins/ssl/ssl-gnutls.c:280
+#: ../libpurple/plugins/ssl/ssl-gnutls.c:278
+#: ../libpurple/plugins/ssl/ssl-gnutls.c:280
 msgid "Provides SSL support through GNUTLS."
 msgstr "Erlaubt SSL-Unterstützung mit GNUTLS."
 
@@ -2836,7 +3060,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: libpurple/plugins/ssl/ssl-nss.c:423
+#: ../libpurple/plugins/ssl/ssl-nss.c:423
 msgid "NSS"
 msgstr "NSS"
 
@@ -2844,7 +3068,8 @@
 #. *< version
 #. *  summary
 #. *  description
-#: libpurple/plugins/ssl/ssl-nss.c:426 libpurple/plugins/ssl/ssl-nss.c:428
+#: ../libpurple/plugins/ssl/ssl-nss.c:426
+#: ../libpurple/plugins/ssl/ssl-nss.c:428
 msgid "Provides SSL support through Mozilla NSS."
 msgstr "Erlaubt SSL-Unterstützung mit Mozilla NSS."
 
@@ -2854,7 +3079,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: libpurple/plugins/ssl/ssl.c:94
+#: ../libpurple/plugins/ssl/ssl.c:94
 msgid "SSL"
 msgstr "SSL"
 
@@ -2862,48 +3087,48 @@
 #. *< version
 #. *  summary
 #. *  description
-#: libpurple/plugins/ssl/ssl.c:97 libpurple/plugins/ssl/ssl.c:99
+#: ../libpurple/plugins/ssl/ssl.c:97 ../libpurple/plugins/ssl/ssl.c:99
 msgid "Provides a wrapper around SSL support libraries."
 msgstr "Liefert einen Wrapper um die SSL-Bibliotheken."
 
-#: libpurple/plugins/statenotify.c:50
+#: ../libpurple/plugins/statenotify.c:50
 #, c-format
 msgid "%s is no longer away."
 msgstr "%s ist wieder anwesend."
 
-#: libpurple/plugins/statenotify.c:52
+#: ../libpurple/plugins/statenotify.c:52
 #, c-format
 msgid "%s has gone away."
 msgstr "%s ist abwesend."
 
-#: libpurple/plugins/statenotify.c:62
+#: ../libpurple/plugins/statenotify.c:62
 #, c-format
 msgid "%s has become idle."
 msgstr "%s ist inaktiv."
 
-#: libpurple/plugins/statenotify.c:64
+#: ../libpurple/plugins/statenotify.c:64
 #, c-format
 msgid "%s is no longer idle."
 msgstr "%s ist nicht mehr inaktiv."
 
-#: libpurple/plugins/statenotify.c:73
+#: ../libpurple/plugins/statenotify.c:73
 #, c-format
 msgid "%s has signed on."
 msgstr "%s hat sich angemeldet."
 
-#: libpurple/plugins/statenotify.c:91
+#: ../libpurple/plugins/statenotify.c:91
 msgid "Notify When"
 msgstr "Benachrichtigung, wenn"
 
-#: libpurple/plugins/statenotify.c:94
+#: ../libpurple/plugins/statenotify.c:94
 msgid "Buddy Goes _Away"
 msgstr "Buddy _hinaus geht"
 
-#: libpurple/plugins/statenotify.c:97
+#: ../libpurple/plugins/statenotify.c:97
 msgid "Buddy Goes _Idle"
 msgstr "Buddy _untätig wird"
 
-#: libpurple/plugins/statenotify.c:100
+#: ../libpurple/plugins/statenotify.c:100
 msgid "Buddy _Signs On/Off"
 msgstr "Buddy _sich an/abmeldet"
 
@@ -2913,7 +3138,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: libpurple/plugins/statenotify.c:148
+#: ../libpurple/plugins/statenotify.c:148
 msgid "Buddy State Notification"
 msgstr "Buddy-Status-Benachrichtigung"
 
@@ -2921,7 +3146,8 @@
 #. *< version
 #. *  summary
 #. *  description
-#: libpurple/plugins/statenotify.c:151 libpurple/plugins/statenotify.c:154
+#: ../libpurple/plugins/statenotify.c:151
+#: ../libpurple/plugins/statenotify.c:154
 msgid ""
 "Notifies in a conversation window when a buddy goes or returns from away or "
 "idle."
@@ -2929,15 +3155,15 @@
 "Benachrichtigt in einem Gesprächsfenster darüber, ob ein Buddy gegangen ist "
 "oder vom Abwesenheits- oder Untätigkeitsstatus zurückgekehrt ist."
 
-#: libpurple/plugins/tcl/tcl.c:421
+#: ../libpurple/plugins/tcl/tcl.c:421
 msgid "Tcl Plugin Loader"
 msgstr "Tcl-Plugin-Lader"
 
-#: libpurple/plugins/tcl/tcl.c:423 libpurple/plugins/tcl/tcl.c:424
+#: ../libpurple/plugins/tcl/tcl.c:423 ../libpurple/plugins/tcl/tcl.c:424
 msgid "Provides support for loading Tcl plugins"
 msgstr "Ermöglicht das Laden von Tcl-Plugins"
 
-#: libpurple/plugins/tcl/tcl.c:507
+#: ../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"
@@ -2946,33 +3172,53 @@
 "dann installieren Sie ActiveTCL von http://www.activestate.com\n"
 
 #. Send a message about the connection error
-#: libpurple/protocols/bonjour/bonjour.c:112
+#: ../libpurple/protocols/bonjour/bonjour.c:112
 msgid "Unable to listen for incoming IM connections\n"
 msgstr "Kann nicht auf eingehende IM-Verbindungen hören\n"
 
-#: libpurple/protocols/bonjour/bonjour.c:137
+#: ../libpurple/protocols/bonjour/bonjour.c:137
 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
-#. * the generic away state (YAHOO_STATUS_TYPE_AWAY) with no message
-#. Away stuff
-#: 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:1472
-#: libpurple/protocols/novell/novell.c:2819
-#: 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:3401
-#: libpurple/protocols/yahoo/yahoo.c:3474 libpurple/status.c:157
-#: pidgin/gtkdocklet.c:442 pidgin/gtkprefs.c:1932 pidgin/gtkstatusbox.c:1056
-#, c-format
-msgid "Away"
-msgstr "Abwesend"
+# old strings
+#. Creating the options for the protocol
+#: ../libpurple/protocols/bonjour/bonjour.c:344
+#: ../libpurple/protocols/bonjour/bonjour.c:614
+#: ../libpurple/protocols/gg/gg.c:627
+#: ../libpurple/protocols/jabber/jabber.c:828
+msgid "First name"
+msgstr "Vorname"
+
+#: ../libpurple/protocols/bonjour/bonjour.c:346
+#: ../libpurple/protocols/bonjour/bonjour.c:617
+#: ../libpurple/protocols/gg/gg.c:622
+#: ../libpurple/protocols/jabber/jabber.c:833
+msgid "Last name"
+msgstr "Nachname"
+
+#: ../libpurple/protocols/bonjour/bonjour.c:350
+#: ../libpurple/protocols/jabber/buddy.c:283
+#: ../libpurple/protocols/jabber/buddy.c:940
+#: ../libpurple/protocols/jabber/buddy.c:948
+#: ../libpurple/protocols/jabber/buddy.c:1629
+#: ../libpurple/protocols/silc/ops.c:1041
+#: ../libpurple/protocols/silc/util.c:555
+#: ../libpurple/protocols/silc10/ops.c:1075
+#: ../libpurple/protocols/silc10/util.c:551
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1061
+msgid "E-Mail"
+msgstr "E-Mail"
+
+#: ../libpurple/protocols/bonjour/bonjour.c:353
+#: ../libpurple/protocols/bonjour/bonjour.c:623
+msgid "AIM Account"
+msgstr "AIM-Konto"
+
+#: ../libpurple/protocols/bonjour/bonjour.c:356
+#: ../libpurple/protocols/bonjour/bonjour.c:626
+msgid "XMPP Account"
+msgstr "XMPP-Konto"
 
 #. *< type
 #. *< ui_requirement
@@ -2984,409 +3230,424 @@
 #. *< version
 #. *  summary
 #. *  description
-#: libpurple/protocols/bonjour/bonjour.c:425
-#: libpurple/protocols/bonjour/bonjour.c:427
+#: ../libpurple/protocols/bonjour/bonjour.c:460
+#: ../libpurple/protocols/bonjour/bonjour.c:462
 msgid "Bonjour Protocol Plugin"
 msgstr "Bonjour-Protokoll-Plugin"
 
-#: libpurple/protocols/bonjour/bonjour.c:470
-#: libpurple/protocols/bonjour/bonjour.c:477
-#: libpurple/protocols/bonjour/bonjour.c:526
+#: ../libpurple/protocols/bonjour/bonjour.c:505
+#: ../libpurple/protocols/bonjour/bonjour.c:512
+#: ../libpurple/protocols/bonjour/bonjour.c:561
 msgid "Purple Person"
 msgstr "Purple-Person"
 
 #. Creating the user splits
-#: libpurple/protocols/bonjour/bonjour.c:575
-#: libpurple/protocols/silc/silc.c:1007 libpurple/protocols/silc10/silc.c:918
+#: ../libpurple/protocols/bonjour/bonjour.c:610
+#: ../libpurple/protocols/silc/silc.c:1007
+#: ../libpurple/protocols/silc10/silc.c:918
 msgid "Hostname"
 msgstr "Rechnername"
 
-# old strings
-#. Creating the options for the protocol
-#: libpurple/protocols/bonjour/bonjour.c:579 libpurple/protocols/gg/gg.c:627
-#: libpurple/protocols/jabber/jabber.c:828
-msgid "First name"
-msgstr "Vorname"
-
-#: libpurple/protocols/bonjour/bonjour.c:582 libpurple/protocols/gg/gg.c:622
-#: libpurple/protocols/jabber/jabber.c:833
-msgid "Last name"
-msgstr "Nachname"
-
-#: libpurple/protocols/bonjour/bonjour.c:585 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
+#: ../libpurple/protocols/bonjour/bonjour.c:620
+#: ../libpurple/protocols/gg/gg.c:472
+#: ../libpurple/protocols/jabber/jabber.c:818
+#: ../libpurple/protocols/silc/silc.c:770
+#: ../libpurple/protocols/silc/silc.c:1011
+#: ../libpurple/protocols/silc10/silc.c:681
+#: ../libpurple/protocols/silc10/silc.c:922
 msgid "E-mail"
 msgstr "E-Mail"
 
-#: libpurple/protocols/bonjour/bonjour.c:588
-msgid "AIM Account"
-msgstr "AIM-Konto"
-
-#: libpurple/protocols/bonjour/bonjour.c:591
-msgid "XMPP Account"
-msgstr "XMPP-Konto"
-
-#: libpurple/protocols/bonjour/bonjour.h:33
+#: ../libpurple/protocols/bonjour/bonjour.h:33
 msgid "Bonjour"
 msgstr "Bonjour"
 
-#: libpurple/protocols/bonjour/jabber.c:391
+#: ../libpurple/protocols/bonjour/jabber.c:383
 #, c-format
 msgid "%s has closed the conversation."
 msgstr "%s hat das Gespräch beendet."
 
-#: libpurple/protocols/bonjour/jabber.c:443
-#: libpurple/protocols/bonjour/jabber.c:656
-#: libpurple/protocols/bonjour/jabber.c:682
+#: ../libpurple/protocols/bonjour/jabber.c:435
+#: ../libpurple/protocols/bonjour/jabber.c:658
+#: ../libpurple/protocols/bonjour/jabber.c:676
 msgid "Unable to send the message, the conversation couldn't be started."
 msgstr ""
 "Die Nachricht kann nicht gesendet werden, das Gespräch kann nicht gestartet "
 "werden."
 
-#: libpurple/protocols/bonjour/jabber.c:577
+#: ../libpurple/protocols/bonjour/jabber.c:581
 msgid "Cannot open socket"
 msgstr "Kann die Socket nicht öffnen"
 
-#: libpurple/protocols/bonjour/jabber.c:585
+#: ../libpurple/protocols/bonjour/jabber.c:589
 msgid "Error setting socket options"
 msgstr "Fehler beim Setzen der Socket-Optionen"
 
-#: libpurple/protocols/bonjour/jabber.c:609
+#: ../libpurple/protocols/bonjour/jabber.c:613
 msgid "Could not bind socket to port"
 msgstr "Kann die Socket nicht an den Port binden"
 
-#: libpurple/protocols/bonjour/jabber.c:617
+#: ../libpurple/protocols/bonjour/jabber.c:621
 msgid "Could not listen on socket"
 msgstr "Kann nicht an der Socket hören"
 
-#: libpurple/protocols/gg/gg.c:76 libpurple/proxy.c:1812
+#: ../libpurple/protocols/gg/gg.c:76 ../libpurple/proxy.c:1812
 msgid "Invalid proxy settings"
 msgstr "Falsche Proxy-Einstellungen"
 
-#: libpurple/protocols/gg/gg.c:77 libpurple/proxy.c:1812
+#: ../libpurple/protocols/gg/gg.c:77 ../libpurple/proxy.c:1812
 msgid ""
 "Either the host name or port number specified for your given proxy type is "
 "invalid."
 msgstr "Hostname oder Portnummer ihres Proxys sind falsch angegeben."
 
-#: libpurple/protocols/gg/gg.c:115 libpurple/protocols/gg/gg.c:137
-#: libpurple/protocols/gg/gg.c:180
+#: ../libpurple/protocols/gg/gg.c:115 ../libpurple/protocols/gg/gg.c:137
+#: ../libpurple/protocols/gg/gg.c:180
 msgid "Token Error"
 msgstr "Kürzel-Fehler"
 
-#: libpurple/protocols/gg/gg.c:116 libpurple/protocols/gg/gg.c:138
-#: libpurple/protocols/gg/gg.c:181
+#: ../libpurple/protocols/gg/gg.c:116 ../libpurple/protocols/gg/gg.c:138
+#: ../libpurple/protocols/gg/gg.c:181
 msgid "Unable to fetch the token.\n"
 msgstr "Kann das Kürzel nicht abholen.\n"
 
-#: libpurple/protocols/gg/gg.c:269 libpurple/protocols/gg/gg.c:288
+#: ../libpurple/protocols/gg/gg.c:269 ../libpurple/protocols/gg/gg.c:288
 msgid "Save Buddylist..."
 msgstr "Buddy-Liste speichern..."
 
-#: libpurple/protocols/gg/gg.c:270
+#: ../libpurple/protocols/gg/gg.c:270
 msgid "Your buddylist is empty, nothing was written to the file."
 msgstr "Ihre Buddy-Liste ist leer, es wurde nichts in die Datei geschrieben."
 
-#: libpurple/protocols/gg/gg.c:276 libpurple/protocols/gg/gg.c:278
+#: ../libpurple/protocols/gg/gg.c:276 ../libpurple/protocols/gg/gg.c:278
 msgid "Couldn't open file"
 msgstr "Kann Datei nicht öffnen"
 
-#: libpurple/protocols/gg/gg.c:289
+#: ../libpurple/protocols/gg/gg.c:289
 msgid "Buddylist saved successfully!"
 msgstr "Buddy-Liste wurde erfolgreich gespeichert!"
 
-#: libpurple/protocols/gg/gg.c:307 libpurple/protocols/gg/gg.c:308
+#: ../libpurple/protocols/gg/gg.c:307 ../libpurple/protocols/gg/gg.c:308
 msgid "Couldn't load buddylist"
 msgstr "Konnte Buddy-Liste nicht laden"
 
-#: libpurple/protocols/gg/gg.c:324
+#: ../libpurple/protocols/gg/gg.c:324
 msgid "Load Buddylist..."
 msgstr "Öffne Buddy-Liste..."
 
-#: libpurple/protocols/gg/gg.c:325
+#: ../libpurple/protocols/gg/gg.c:325
 msgid "Buddylist loaded successfully!"
 msgstr "Buddy-Liste erfolgreich geladen!"
 
-#: libpurple/protocols/gg/gg.c:336
+#: ../libpurple/protocols/gg/gg.c:336
 msgid "Save buddylist..."
 msgstr "Buddy-Liste speichern..."
 
-#: libpurple/protocols/gg/gg.c:384
+#: ../libpurple/protocols/gg/gg.c:384
 msgid "Fill in the registration fields."
 msgstr "Füllen Sie die Registrierungsfelder aus."
 
-#: libpurple/protocols/gg/gg.c:389
+#: ../libpurple/protocols/gg/gg.c:389
 msgid "Passwords do not match."
 msgstr "Passwörter stimmen nicht überein."
 
-#: libpurple/protocols/gg/gg.c:398
+#: ../libpurple/protocols/gg/gg.c:398
 msgid "Unable to register new account. Error occurred.\n"
 msgstr "Kann neues Konto nicht anlegen. Es ist ein Fehler aufgetreten.\n"
 
-#: libpurple/protocols/gg/gg.c:411
+#: ../libpurple/protocols/gg/gg.c:411
 msgid "New Gadu-Gadu Account Registered"
 msgstr "Neues Gadu-Gadu-Konto angelegt"
 
-#: libpurple/protocols/gg/gg.c:412
+#: ../libpurple/protocols/gg/gg.c:412
 msgid "Registration completed successfully!"
 msgstr "Registrierung erfolgreich abgeschlossen!"
 
-#: libpurple/protocols/gg/gg.c:477 libpurple/protocols/gg/gg.c:770
-#: libpurple/protocols/jabber/jabber.c:807
-#: libpurple/protocols/jabber/jabber.c:1369
+#: ../libpurple/protocols/gg/gg.c:477 ../libpurple/protocols/gg/gg.c:770
+#: ../libpurple/protocols/jabber/jabber.c:807
+#: ../libpurple/protocols/jabber/jabber.c:1369
 msgid "Password"
 msgstr "Passwort"
 
-#: libpurple/protocols/gg/gg.c:482 libpurple/protocols/gg/gg.c:775
+#: ../libpurple/protocols/gg/gg.c:482 ../libpurple/protocols/gg/gg.c:775
 msgid "Password (retype)"
 msgstr "Passwort (nochmal)"
 
-#: libpurple/protocols/gg/gg.c:487 libpurple/protocols/gg/gg.c:780
+#: ../libpurple/protocols/gg/gg.c:487 ../libpurple/protocols/gg/gg.c:780
 msgid "Enter current token"
 msgstr "Geben Sie das aktuelle Kürzel ein"
 
-#: libpurple/protocols/gg/gg.c:493 libpurple/protocols/gg/gg.c:786
+#: ../libpurple/protocols/gg/gg.c:493 ../libpurple/protocols/gg/gg.c:786
 msgid "Current token"
 msgstr "Aktuelles Kürzel"
 
-#: libpurple/protocols/gg/gg.c:497 libpurple/protocols/gg/gg.c:498
+#: ../libpurple/protocols/gg/gg.c:497 ../libpurple/protocols/gg/gg.c:498
 msgid "Register New Gadu-Gadu Account"
 msgstr "Registrierung eines neuen Gadu-Gadu-Kontos"
 
-#: libpurple/protocols/gg/gg.c:499
+#: ../libpurple/protocols/gg/gg.c:499
 msgid "Please, fill in the following fields"
 msgstr "Bitte füllen sie die folgenden Felder aus"
 
-#: libpurple/protocols/gg/gg.c:637 libpurple/protocols/gg/gg.c:1049
-#: libpurple/protocols/gg/gg.c:1121 libpurple/protocols/jabber/jabber.c:843
-#: libpurple/protocols/oscar/oscar.c:3798
-#: libpurple/protocols/oscar/oscar.c:3811
-#: libpurple/protocols/qq/buddy_info.c:49
+#: ../libpurple/protocols/gg/gg.c:637 ../libpurple/protocols/gg/gg.c:1049
+#: ../libpurple/protocols/gg/gg.c:1121
+#: ../libpurple/protocols/jabber/jabber.c:843
+#: ../libpurple/protocols/oscar/oscar.c:3757
+#: ../libpurple/protocols/oscar/oscar.c:3770
+#: ../libpurple/protocols/qq/buddy_info.c:49
 msgid "City"
 msgstr "Stadt"
 
-#: libpurple/protocols/gg/gg.c:642
+#: ../libpurple/protocols/gg/gg.c:642
 msgid "Year of birth"
 msgstr "Geburtsjahr"
 
-#: libpurple/protocols/gg/gg.c:645 libpurple/protocols/msn/msn.c:1558
-#: libpurple/protocols/oscar/oscar.c:3741
-#: libpurple/protocols/qq/buddy_info.c:46 libpurple/protocols/qq/qq.c:224
-#: libpurple/protocols/qq/qq.c:227 libpurple/protocols/qq/qq.c:230
-#: libpurple/protocols/qq/qq.c:234
-#: libpurple/protocols/yahoo/yahoo_profile.c:1091
+#: ../libpurple/protocols/gg/gg.c:645 ../libpurple/protocols/msn/msn.c:1558
+#: ../libpurple/protocols/oscar/oscar.c:3700
+#: ../libpurple/protocols/qq/buddy_info.c:46
+#: ../libpurple/protocols/qq/qq.c:226 ../libpurple/protocols/qq/qq.c:229
+#: ../libpurple/protocols/qq/qq.c:232 ../libpurple/protocols/qq/qq.c:236
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1091
 msgid "Gender"
 msgstr "Geschlecht"
 
-#: libpurple/protocols/gg/gg.c:646
+#: ../libpurple/protocols/gg/gg.c:646
 msgid "Male or female"
 msgstr "Männlich oder weiblich"
 
-#: libpurple/protocols/gg/gg.c:647 libpurple/protocols/oscar/oscar.c:3741
-#: libpurple/protocols/qq/buddy_info.c:83 libpurple/protocols/qq/qq.c:224
+#: ../libpurple/protocols/gg/gg.c:647
+#: ../libpurple/protocols/oscar/oscar.c:3700
+#: ../libpurple/protocols/qq/buddy_info.c:83
+#: ../libpurple/protocols/qq/qq.c:226
 msgid "Male"
 msgstr "Männlich"
 
-#: libpurple/protocols/gg/gg.c:648 libpurple/protocols/oscar/oscar.c:3741
-#: libpurple/protocols/qq/buddy_info.c:84 libpurple/protocols/qq/qq.c:227
+#: ../libpurple/protocols/gg/gg.c:648
+#: ../libpurple/protocols/oscar/oscar.c:3700
+#: ../libpurple/protocols/qq/buddy_info.c:84
+#: ../libpurple/protocols/qq/qq.c:229
 msgid "Female"
 msgstr "Weiblich"
 
-#: libpurple/protocols/gg/gg.c:652
+#: ../libpurple/protocols/gg/gg.c:652
 msgid "Only online"
 msgstr "Nur online"
 
-#: libpurple/protocols/gg/gg.c:656 libpurple/protocols/gg/gg.c:657
+#: ../libpurple/protocols/gg/gg.c:656 ../libpurple/protocols/gg/gg.c:657
 msgid "Find buddies"
 msgstr "Suche Buddys"
 
-#: libpurple/protocols/gg/gg.c:658
+#: ../libpurple/protocols/gg/gg.c:658
 msgid "Please, enter your search criteria below"
 msgstr "Bitte geben Sie Ihre Suchkriterien unten ein"
 
-#: libpurple/protocols/gg/gg.c:696
+#: ../libpurple/protocols/gg/gg.c:696
 msgid "Fill in the fields."
 msgstr "Füllen Sie die Felder aus."
 
-#: libpurple/protocols/gg/gg.c:708
+#: ../libpurple/protocols/gg/gg.c:708
 msgid "Your current password is different from the one that you specified."
 msgstr "Ihr aktuelles Passwort ist anders als das angegebene."
 
-#: libpurple/protocols/gg/gg.c:722
+#: ../libpurple/protocols/gg/gg.c:722
 msgid "Unable to change password. Error occurred.\n"
 msgstr "Konnte das Passwort nicht ändern. Es trat ein Fehler auf.\n"
 
-#: libpurple/protocols/gg/gg.c:731
+#: ../libpurple/protocols/gg/gg.c:731
 msgid "Change password for the Gadu-Gadu account"
 msgstr "Ändern des Passworts für dieses Gadu-Gadu-Konto"
 
-#: libpurple/protocols/gg/gg.c:732
+#: ../libpurple/protocols/gg/gg.c:732
 msgid "Password was changed successfully!"
 msgstr "Das Passwort wurde erfolgreich geändert!"
 
-#: libpurple/protocols/gg/gg.c:765
+#: ../libpurple/protocols/gg/gg.c:765
 msgid "Current password"
 msgstr "Aktuelles Passwort"
 
-#: libpurple/protocols/gg/gg.c:790
+#: ../libpurple/protocols/gg/gg.c:790
 msgid "Please, enter your current password and your new password for UIN: "
 msgstr ""
 "Bitte geben Sie Ihr aktuelles und Ihr neues Passwort für folgende UIN ein: "
 
-#: libpurple/protocols/gg/gg.c:794 libpurple/protocols/gg/gg.c:795
+#: ../libpurple/protocols/gg/gg.c:794 ../libpurple/protocols/gg/gg.c:795
 msgid "Change Gadu-Gadu Password"
 msgstr "Gadu-Gadu Passwort ändern"
 
-#: libpurple/protocols/gg/gg.c:871
+#: ../libpurple/protocols/gg/gg.c:871
 #, c-format
 msgid "Select a chat for buddy: %s"
 msgstr "Wählen sie einen Chat für den Benutzer: %s"
 
-#: libpurple/protocols/gg/gg.c:874 libpurple/protocols/gg/gg.c:875
+#: ../libpurple/protocols/gg/gg.c:874 ../libpurple/protocols/gg/gg.c:875
 msgid "Add to chat..."
 msgstr "Zum Chat hinzufügen..."
 
-#: libpurple/protocols/gg/gg.c:1003 libpurple/protocols/jabber/buddy.c:1466
-#: libpurple/protocols/novell/novell.c:2828
-#: 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:2921
-#: libpurple/status.c:153 pidgin/gtkblist.c:3079 pidgin/gtkblist.c:3420
-#: pidgin/gtkdocklet.c:450 pidgin/gtkstatusbox.c:1059
+#: ../libpurple/protocols/gg/gg.c:1003
+#: ../libpurple/protocols/jabber/buddy.c:1466
+#: ../libpurple/protocols/novell/novell.c:2828
+#: ../libpurple/protocols/oscar/oscar.c:827
+#: ../libpurple/protocols/oscar/oscar.c:5552
+#: ../libpurple/protocols/qq/qq.c:170 ../libpurple/protocols/qq/qq.c:177
+#: ../libpurple/protocols/qq/qq.c:292
+#: ../libpurple/protocols/yahoo/yahoo.c:2938 ../libpurple/status.c:153
+#: ../pidgin/gtkblist.c:3082 ../pidgin/gtkblist.c:3419
+#: ../pidgin/gtkdocklet.c:450 ../pidgin/gtkstatusbox.c:1059
 msgid "Offline"
 msgstr "Offline"
 
-#: libpurple/protocols/gg/gg.c:1006 libpurple/protocols/jabber/buddy.c:1468
-#: libpurple/protocols/msn/state.c:29 libpurple/protocols/msn/state.c:30
-#: libpurple/protocols/msn/state.c:37 libpurple/protocols/msn/state.c:38
-#: libpurple/protocols/novell/novell.c:2816
-#: libpurple/protocols/yahoo/yahoo.c:2923 libpurple/status.c:154
-#: pidgin/gtkdocklet.c:438 pidgin/gtkstatusbox.c:1055
+#: ../libpurple/protocols/gg/gg.c:1006
+#: ../libpurple/protocols/jabber/buddy.c:1468
+#: ../libpurple/protocols/msn/state.c:29 ../libpurple/protocols/msn/state.c:30
+#: ../libpurple/protocols/msn/state.c:37 ../libpurple/protocols/msn/state.c:38
+#: ../libpurple/protocols/novell/novell.c:2816
+#: ../libpurple/protocols/qq/qq.c:280
+#: ../libpurple/protocols/yahoo/yahoo.c:2940 ../libpurple/status.c:154
+#: ../pidgin/gtkdocklet.c:438 ../pidgin/gtkstatusbox.c:1055
 msgid "Available"
 msgstr "Verfügbar"
 
-#: libpurple/protocols/gg/gg.c:1038 libpurple/protocols/gg/gg.c:1112
-#: libpurple/protocols/oscar/oscar.c:2671
-#: libpurple/protocols/oscar/oscar.c:3708
+#. get_yahoo_status_from_purple_status() returns YAHOO_STATUS_CUSTOM for
+#. * the generic away state (YAHOO_STATUS_TYPE_AWAY) with no message
+#. Away stuff
+#: ../libpurple/protocols/gg/gg.c:1009 ../libpurple/protocols/irc/irc.c:530
+#: ../libpurple/protocols/irc/msgs.c:310
+#: ../libpurple/protocols/jabber/buddy.c:1472
+#: ../libpurple/protocols/novell/novell.c:2819
+#: ../libpurple/protocols/oscar/oscar.c:732
+#: ../libpurple/protocols/oscar/oscar.c:4504
+#: ../libpurple/protocols/oscar/oscar.c:5580
+#: ../libpurple/protocols/qq/qq.c:180 ../libpurple/protocols/qq/qq.c:284
+#: ../libpurple/protocols/silc/buddy.c:1476
+#: ../libpurple/protocols/silc10/buddy.c:1476
+#: ../libpurple/protocols/yahoo/yahoo.c:3492
+#: ../libpurple/protocols/yahoo/yahoo.c:3566 ../libpurple/status.c:157
+#: ../pidgin/gtkdocklet.c:442 ../pidgin/gtkprefs.c:1934
+#: ../pidgin/gtkstatusbox.c:1056
+msgid "Away"
+msgstr "Abwesend"
+
+#: ../libpurple/protocols/gg/gg.c:1038 ../libpurple/protocols/gg/gg.c:1112
+#: ../libpurple/protocols/oscar/oscar.c:2669
+#: ../libpurple/protocols/oscar/oscar.c:3667
 msgid "UIN"
 msgstr "UIN"
 
-#: 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:3719 libpurple/protocols/silc/ops.c:990
-#: libpurple/protocols/silc10/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:3678
+#: ../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:1124
+#: ../libpurple/protocols/gg/gg.c:1054 ../libpurple/protocols/gg/gg.c:1124
 msgid "Birth Year"
 msgstr "Geburtsjahr"
 
-#: libpurple/protocols/gg/gg.c:1106 libpurple/protocols/gg/gg.c:1175
-#: libpurple/protocols/oscar/oscar.c:3920
+#: ../libpurple/protocols/gg/gg.c:1106 ../libpurple/protocols/gg/gg.c:1175
+#: ../libpurple/protocols/oscar/oscar.c:3879
 msgid "Unable to display the search results."
 msgstr "Kann Suchergebnisse nicht anzeigen."
 
-#: libpurple/protocols/gg/gg.c:1166
+#: ../libpurple/protocols/gg/gg.c:1166
 msgid "Gadu-Gadu Public Directory"
 msgstr "Öffentliches Gadu-Gadu-Verzeichnis"
 
-#: libpurple/protocols/gg/gg.c:1167
+#: ../libpurple/protocols/gg/gg.c:1167
 msgid "Search results"
 msgstr "Suchergebnisse"
 
-#: libpurple/protocols/gg/gg.c:1210
+#: ../libpurple/protocols/gg/gg.c:1210
 msgid "No matching users found"
 msgstr "Keine entsprechenden Benutzer gefunden"
 
-#: libpurple/protocols/gg/gg.c:1211
+#: ../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:1305 libpurple/protocols/gg/gg.c:1458
+#: ../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:1390
+#: ../libpurple/protocols/gg/gg.c:1390
 msgid "Buddy list downloaded"
 msgstr "Buddy-Liste heruntergeladen"
 
-#: libpurple/protocols/gg/gg.c:1391
+#: ../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:1398
+#: ../libpurple/protocols/gg/gg.c:1398
 msgid "Buddy list uploaded"
 msgstr "Buddy-Liste hochgeladen"
 
-#: libpurple/protocols/gg/gg.c:1399
+#: ../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:1504 libpurple/protocols/gg/gg.c:1710
+#: ../libpurple/protocols/gg/gg.c:1504 ../libpurple/protocols/gg/gg.c:1710
 msgid "Connection failed."
 msgstr "Verbindung fehlgeschlagen."
 
-#: libpurple/protocols/gg/gg.c:1616 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:1639
+#: ../libpurple/protocols/gg/gg.c:1639
 msgid "Add to chat"
 msgstr "Zum Chat hinzufügen"
 
-#: libpurple/protocols/gg/gg.c:1648
+#: ../libpurple/protocols/gg/gg.c:1648
 msgid "Unblock"
 msgstr "Sperrung aufheben"
 
-#: libpurple/protocols/gg/gg.c:1652
+#: ../libpurple/protocols/gg/gg.c:1652
 msgid "Block"
 msgstr "Sperren"
 
-#: libpurple/protocols/gg/gg.c:1669
+#: ../libpurple/protocols/gg/gg.c:1669
 msgid "Chat _name:"
 msgstr "Chat_name:"
 
-#: libpurple/protocols/gg/gg.c:1909
+#: ../libpurple/protocols/gg/gg.c:1909
 msgid "Chat error"
 msgstr "Chatfehler"
 
-#: libpurple/protocols/gg/gg.c:1910
+#: ../libpurple/protocols/gg/gg.c:1910
 msgid "This chat name is already in use"
 msgstr "Dieser Chatname existiert bereits"
 
-#: libpurple/protocols/gg/gg.c:1993
+#: ../libpurple/protocols/gg/gg.c:1993
 msgid "Not connected to the server."
 msgstr "Nicht mit dem Server verbunden."
 
-#: libpurple/protocols/gg/gg.c:2016
+#: ../libpurple/protocols/gg/gg.c:2016
 msgid "Find buddies..."
 msgstr "Finde Buddys..."
 
-#: libpurple/protocols/gg/gg.c:2022
+#: ../libpurple/protocols/gg/gg.c:2022
 msgid "Change password..."
 msgstr "Passwort ändern..."
 
-#: libpurple/protocols/gg/gg.c:2028
+#: ../libpurple/protocols/gg/gg.c:2028
 msgid "Upload buddylist to Server"
 msgstr "Buddy-Liste zum Server hochladen"
 
-#: libpurple/protocols/gg/gg.c:2032
+#: ../libpurple/protocols/gg/gg.c:2032
 msgid "Download buddylist from Server"
 msgstr "Buddy-Liste vom Server herunterladen"
 
-#: libpurple/protocols/gg/gg.c:2036
+#: ../libpurple/protocols/gg/gg.c:2036
 msgid "Delete buddylist from Server"
 msgstr "Löschen der Buddy-Liste vom Server"
 
-#: libpurple/protocols/gg/gg.c:2040
+#: ../libpurple/protocols/gg/gg.c:2040
 msgid "Save buddylist to file..."
 msgstr "Buddy-Liste in Datei speichern..."
 
-#: libpurple/protocols/gg/gg.c:2044
+#: ../libpurple/protocols/gg/gg.c:2044
 msgid "Load buddylist from file..."
 msgstr "Buddy-Liste aus Datei laden..."
 
@@ -3401,139 +3662,153 @@
 #. id
 #. name
 #. version
-#: libpurple/protocols/gg/gg.c:2148
+#: ../libpurple/protocols/gg/gg.c:2148
 msgid "Gadu-Gadu Protocol Plugin"
 msgstr "Gadu-Gadu-Protokoll-Plugin"
 
 #. summary
-#: libpurple/protocols/gg/gg.c:2149
+#: ../libpurple/protocols/gg/gg.c:2149
 msgid "Polish popular IM"
 msgstr "Beliebter polnischer IM-Dienst"
 
-#: libpurple/protocols/gg/gg.c:2203
+#: ../libpurple/protocols/gg/gg.c:2203
 msgid "Gadu-Gadu User"
 msgstr "Gadu-Gadu-Benutzer"
 
-#: libpurple/protocols/irc/cmds.c:43 libpurple/protocols/silc/silc.c:1637
-#: libpurple/protocols/silc10/silc.c:1566
+#: ../libpurple/protocols/irc/cmds.c:43
+#: ../libpurple/protocols/silc/silc.c:1637
+#: ../libpurple/protocols/silc10/silc.c:1566
 #, c-format
 msgid "Unknown command: %s"
 msgstr "Unbekanntes Kommando: %s"
 
-#: libpurple/protocols/irc/cmds.c:503 libpurple/protocols/jabber/chat.c:591
-#: libpurple/protocols/silc/silc.c:1345 libpurple/protocols/silc10/silc.c:1274
+#: ../libpurple/protocols/irc/cmds.c:503
+#: ../libpurple/protocols/jabber/chat.c:591
+#: ../libpurple/protocols/silc/silc.c:1345
+#: ../libpurple/protocols/silc10/silc.c:1274
 #, c-format
 msgid "current topic is: %s"
 msgstr "Das aktuelle Thema ist: %s"
 
-#: libpurple/protocols/irc/cmds.c:507 libpurple/protocols/jabber/chat.c:595
-#: libpurple/protocols/silc/silc.c:1349 libpurple/protocols/silc10/silc.c:1278
+#: ../libpurple/protocols/irc/cmds.c:507
+#: ../libpurple/protocols/jabber/chat.c:595
+#: ../libpurple/protocols/silc/silc.c:1349
+#: ../libpurple/protocols/silc10/silc.c:1278
 msgid "No topic is set"
 msgstr "Kein Thema gesetzt"
 
-#: libpurple/protocols/irc/dcc_send.c:296
-#: libpurple/protocols/irc/dcc_send.c:337
-#: libpurple/protocols/yahoo/yahoo_filexfer.c:269
-#: libpurple/protocols/yahoo/yahoo_filexfer.c:278
-#: libpurple/protocols/yahoo/yahoo_filexfer.c:291
+#: ../libpurple/protocols/irc/dcc_send.c:296
+#: ../libpurple/protocols/irc/dcc_send.c:337
+#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:269
+#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:278
+#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:291
 msgid "File Transfer Failed"
 msgstr "Dateiübertragung gescheitert"
 
-#: libpurple/protocols/irc/dcc_send.c:297
-#: libpurple/protocols/irc/dcc_send.c:338
+#: ../libpurple/protocols/irc/dcc_send.c:297
+#: ../libpurple/protocols/irc/dcc_send.c:338
 msgid "Could not open a listening port."
 msgstr "Konnte keinen Listener-Port öffnen."
 
-#: libpurple/protocols/irc/irc.c:79
+#: ../libpurple/protocols/irc/irc.c:79
 msgid "Error displaying MOTD"
 msgstr "Fehler beim Anzeigen des MOTD"
 
-#: libpurple/protocols/irc/irc.c:79
+#: ../libpurple/protocols/irc/irc.c:79
 msgid "No MOTD available"
 msgstr "Kein MOTD verfügbar"
 
-#: libpurple/protocols/irc/irc.c:80
+#: ../libpurple/protocols/irc/irc.c:80
 msgid "There is no MOTD associated with this connection."
 msgstr "Es gibt kein MOTD zu dieser Verbindung."
 
-#: libpurple/protocols/irc/irc.c:83
+#: ../libpurple/protocols/irc/irc.c:83
 #, c-format
 msgid "MOTD for %s"
 msgstr "MOTD für %s"
 
-#: libpurple/protocols/irc/irc.c:127 libpurple/protocols/irc/irc.c:165
-#: libpurple/protocols/irc/irc.c:614 libpurple/protocols/irc/irc.c:639
+#: ../libpurple/protocols/irc/irc.c:127 ../libpurple/protocols/irc/irc.c:165
+#: ../libpurple/protocols/irc/irc.c:614 ../libpurple/protocols/irc/irc.c:639
 msgid "Server has disconnected"
 msgstr "Serververbindung wurde unterbrochen"
 
-#: libpurple/protocols/irc/irc.c:249
+#: ../libpurple/protocols/irc/irc.c:249
 msgid "View MOTD"
 msgstr "MOTD anzeigen"
 
-#: libpurple/protocols/irc/irc.c:261 libpurple/protocols/silc/chat.c:33
-#: libpurple/protocols/silc10/chat.c:33
+#: ../libpurple/protocols/irc/irc.c:261 ../libpurple/protocols/silc/chat.c:33
+#: ../libpurple/protocols/silc10/chat.c:33
 msgid "_Channel:"
 msgstr "_Kanal:"
 
-#: libpurple/protocols/irc/irc.c:267 libpurple/protocols/jabber/chat.c:59
-#: pidgin/gtkaccount.c:526
+#: ../libpurple/protocols/irc/irc.c:267
+#: ../libpurple/protocols/jabber/chat.c:59 ../pidgin/gtkaccount.c:526
 msgid "_Password:"
 msgstr "_Passwort:"
 
-#: libpurple/protocols/irc/irc.c:298
+#: ../libpurple/protocols/irc/irc.c:298
 msgid "IRC nicks may not contain whitespace"
 msgstr "IRC-Nicknamen dürfen keine Leerzeichen enthalten"
 
 #. connect to the server
-#: libpurple/protocols/irc/irc.c:319 libpurple/protocols/jabber/jabber.c:1046
-#: libpurple/protocols/msn/session.c:345
-#: libpurple/protocols/novell/novell.c:2182
-#: libpurple/protocols/oscar/oscar.c:1288 libpurple/protocols/qq/qq.c:136
-#: libpurple/protocols/sametime/sametime.c:3724
-#: libpurple/protocols/simple/simple.c:1676
-#: libpurple/protocols/yahoo/yahoo.c:2766
-#: libpurple/protocols/zephyr/zephyr.c:1621 pidgin/gtkstatusbox.c:661
+#: ../libpurple/protocols/irc/irc.c:319
+#: ../libpurple/protocols/jabber/jabber.c:1046
+#: ../libpurple/protocols/msn/session.c:345
+#: ../libpurple/protocols/novell/novell.c:2182
+#: ../libpurple/protocols/oscar/oscar.c:1285
+#: ../libpurple/protocols/qq/qq.c:136
+#: ../libpurple/protocols/sametime/sametime.c:3724
+#: ../libpurple/protocols/simple/simple.c:1676
+#: ../libpurple/protocols/yahoo/yahoo.c:2783
+#: ../libpurple/protocols/zephyr/zephyr.c:1621 ../pidgin/gtkstatusbox.c:661
 msgid "Connecting"
 msgstr "Verbindungsaufbau"
 
-#: libpurple/protocols/irc/irc.c:327 libpurple/protocols/jabber/jabber.c:603
-#: libpurple/protocols/jabber/jabber.c:950
+#: ../libpurple/protocols/irc/irc.c:327
+#: ../libpurple/protocols/jabber/jabber.c:603
+#: ../libpurple/protocols/jabber/jabber.c:950
 msgid "SSL support unavailable"
 msgstr "SSL-Unterstützung nicht verfügbar"
 
-#: libpurple/protocols/irc/irc.c:338 libpurple/protocols/simple/simple.c:464
-#: libpurple/protocols/simple/simple.c:1591
+#: ../libpurple/protocols/irc/irc.c:338
+#: ../libpurple/protocols/simple/simple.c:464
+#: ../libpurple/protocols/simple/simple.c:1591
 msgid "Couldn't create socket"
 msgstr "Kann Socket nicht erstellen"
 
-#: libpurple/protocols/irc/irc.c:416 libpurple/protocols/oscar/oscar.c:1284
+#: ../libpurple/protocols/irc/irc.c:416
+#: ../libpurple/protocols/oscar/oscar.c:1281
 msgid "Couldn't connect to host"
 msgstr "Keine Verbindung zum Host"
 
-#: libpurple/protocols/irc/irc.c:438 libpurple/protocols/jabber/jabber.c:499
+#: ../libpurple/protocols/irc/irc.c:438
+#: ../libpurple/protocols/jabber/jabber.c:499
 msgid "Connection Failed"
 msgstr "Verbindung fehlgeschlagen"
 
-#: libpurple/protocols/irc/irc.c:441 libpurple/protocols/jabber/jabber.c:502
+#: ../libpurple/protocols/irc/irc.c:441
+#: ../libpurple/protocols/jabber/jabber.c:502
 msgid "SSL Handshake Failed"
 msgstr "SSL Handshake gescheitert"
 
-#: libpurple/protocols/irc/irc.c:611 libpurple/protocols/irc/irc.c:636
+#: ../libpurple/protocols/irc/irc.c:611 ../libpurple/protocols/irc/irc.c:636
 msgid "Read error"
 msgstr "Fehler beim Lesen"
 
-#: libpurple/protocols/irc/irc.c:775 libpurple/protocols/silc/chat.c:1412
-#: libpurple/protocols/silc10/chat.c:1426
-#: libpurple/protocols/yahoo/yahoochat.c:1401
+#: ../libpurple/protocols/irc/irc.c:775
+#: ../libpurple/protocols/silc/chat.c:1412
+#: ../libpurple/protocols/silc10/chat.c:1426
+#: ../libpurple/protocols/yahoo/yahoochat.c:1401
 msgid "Users"
 msgstr "Benutzer"
 
-#: libpurple/protocols/irc/irc.c:778
-#: libpurple/protocols/sametime/sametime.c:3375
-#: 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
+#: ../libpurple/protocols/irc/irc.c:778
+#: ../libpurple/protocols/sametime/sametime.c:3375
+#: ../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 "Thema"
 
@@ -3545,53 +3820,65 @@
 #. *< id
 #. *< name
 #. *< version
-#: libpurple/protocols/irc/irc.c:916
+#: ../libpurple/protocols/irc/irc.c:916
 msgid "IRC Protocol Plugin"
 msgstr "IRC-Protokoll-Plugin"
 
 #. *  summary
-#: libpurple/protocols/irc/irc.c:917
+#: ../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: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:5728
-#: 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:1855 libpurple/protocols/toc/toc.c:2327
+#: ../libpurple/protocols/irc/irc.c:942 ../libpurple/protocols/irc/msgs.c:323
+#: ../libpurple/protocols/msn/msn.c:2154
+#: ../libpurple/protocols/oscar/oscar.c:6619
+#: ../libpurple/protocols/qq/qq.c:755
+#: ../libpurple/protocols/sametime/sametime.c:5728
+#: ../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:1855
+#: ../libpurple/protocols/toc/toc.c:2327
 msgid "Server"
 msgstr "Server"
 
 #. port to connect to
-#: 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:5733
-#: libpurple/protocols/silc/silc.c:1918 libpurple/protocols/silc10/silc.c:1861
-#: libpurple/protocols/toc/toc.c:2331
+#: ../libpurple/protocols/irc/irc.c:945 ../libpurple/protocols/msn/msn.c:2159
+#: ../libpurple/protocols/oscar/oscar.c:6622
+#: ../libpurple/protocols/qq/qq.c:758
+#: ../libpurple/protocols/sametime/sametime.c:5733
+#: ../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:948
+#: ../libpurple/protocols/irc/irc.c:948
 msgid "Encodings"
 msgstr "Kodierungen"
 
-#: libpurple/protocols/irc/irc.c:951 libpurple/protocols/irc/msgs.c:316
-#: libpurple/protocols/jabber/jabber.c:803
-#: libpurple/protocols/silc/buddy.c:1539 libpurple/protocols/silc/ops.c:1197
-#: libpurple/protocols/silc/ops.c:1200 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
+#: ../libpurple/protocols/irc/irc.c:951 ../libpurple/protocols/irc/msgs.c:316
+#: ../libpurple/protocols/jabber/jabber.c:803
+#: ../libpurple/protocols/silc/buddy.c:1539
+#: ../libpurple/protocols/silc/ops.c:1197
+#: ../libpurple/protocols/silc/ops.c:1200
+#: ../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 "Benutzer"
 
-#: libpurple/protocols/irc/irc.c:954 libpurple/protocols/irc/msgs.c:317
-#: libpurple/protocols/silc/silc.c:1009 libpurple/protocols/silc10/silc.c:920
+#: ../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 "Echter Name"
 
@@ -3599,155 +3886,158 @@
 #. option = purple_account_option_string_new(_("Quit message"), "quitmsg", IRC_DEFAULT_QUIT);
 #. prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option);
 #.
-#: libpurple/protocols/irc/irc.c:962
+#: ../libpurple/protocols/irc/irc.c:962
 msgid "Use SSL"
 msgstr "Benutze SSL"
 
-#: libpurple/protocols/irc/msgs.c:187
+#: ../libpurple/protocols/irc/msgs.c:187
 msgid "Bad mode"
 msgstr "Falscher Modus"
 
-#: libpurple/protocols/irc/msgs.c:198
+#: ../libpurple/protocols/irc/msgs.c:198
 #, c-format
 msgid "You are banned from %s."
 msgstr "Sie sind aus %s verbannt worden."
 
-#: libpurple/protocols/irc/msgs.c:199
+#: ../libpurple/protocols/irc/msgs.c:199
 msgid "Banned"
 msgstr "Verbannt"
 
-#: libpurple/protocols/irc/msgs.c:216
+#: ../libpurple/protocols/irc/msgs.c:216
 #, c-format
 msgid "Cannot ban %s: banlist is full"
 msgstr "Kann %s nicht verbannen: Bannliste ist voll"
 
-#: libpurple/protocols/irc/msgs.c:301
+#: ../libpurple/protocols/irc/msgs.c:301
 msgid " <i>(ircop)</i>"
 msgstr " <i>(ircop)</i>"
 
-#: libpurple/protocols/irc/msgs.c:302
+#: ../libpurple/protocols/irc/msgs.c:302
 msgid " <i>(identified)</i>"
 msgstr " <i>(identifiziert)</i>"
 
-#: libpurple/protocols/irc/msgs.c:303 libpurple/protocols/oscar/oscar.c:3709
-#: libpurple/protocols/silc/ops.c:1418 libpurple/protocols/silc10/ops.c:1414
+#: ../libpurple/protocols/irc/msgs.c:303
+#: ../libpurple/protocols/oscar/oscar.c:3668
+#: ../libpurple/protocols/silc/ops.c:1418
+#: ../libpurple/protocols/silc10/ops.c:1414
 msgid "Nick"
 msgstr "Spitzname"
 
-#: libpurple/protocols/irc/msgs.c:329 libpurple/protocols/silc/ops.c:1268
-#: libpurple/protocols/silc10/ops.c:1272
+#: ../libpurple/protocols/irc/msgs.c:329
+#: ../libpurple/protocols/silc/ops.c:1268
+#: ../libpurple/protocols/silc10/ops.c:1272
 msgid "Currently on"
 msgstr "Im Moment in"
 
-#: libpurple/protocols/irc/msgs.c:334
+#: ../libpurple/protocols/irc/msgs.c:334
 msgid "Idle for"
 msgstr "Untätig seit"
 
-#: libpurple/protocols/irc/msgs.c:337
+#: ../libpurple/protocols/irc/msgs.c:337
 msgid "Online since"
 msgstr "Online seit"
 
-#: libpurple/protocols/irc/msgs.c:341
+#: ../libpurple/protocols/irc/msgs.c:341
 msgid "<b>Defining adjective:</b>"
 msgstr "<b>Definiere ein Adjektiv:</b>"
 
-#: libpurple/protocols/irc/msgs.c:341
+#: ../libpurple/protocols/irc/msgs.c:341
 msgid "Glorious"
 msgstr "Glorreich"
 
-#: libpurple/protocols/irc/msgs.c:420
+#: ../libpurple/protocols/irc/msgs.c:420
 #, c-format
 msgid "%s has changed the topic to: %s"
 msgstr "%s hat das Thema zu %s abgeändert"
 
-#: libpurple/protocols/irc/msgs.c:422
+#: ../libpurple/protocols/irc/msgs.c:422
 #, c-format
 msgid "%s has cleared the topic."
 msgstr "%s hat das Thema entfernt."
 
-#: libpurple/protocols/irc/msgs.c:430
+#: ../libpurple/protocols/irc/msgs.c:430
 #, c-format
 msgid "The topic for %s is: %s"
 msgstr "Das Thema für %s ist: %s"
 
-#: libpurple/protocols/irc/msgs.c:448
+#: ../libpurple/protocols/irc/msgs.c:448
 #, c-format
 msgid "Unknown message '%s'"
 msgstr "Unbekannte Nachricht '%s'"
 
-#: libpurple/protocols/irc/msgs.c:449
+#: ../libpurple/protocols/irc/msgs.c:449
 msgid "Unknown message"
 msgstr "Unbekannte Nachricht"
 
-#: libpurple/protocols/irc/msgs.c:449
+#: ../libpurple/protocols/irc/msgs.c:449
 msgid "The IRC server received a message it did not understand."
 msgstr "Der IRC-Server hat eine Nachricht erhalten, die er nicht versteht."
 
-#: libpurple/protocols/irc/msgs.c:470
+#: ../libpurple/protocols/irc/msgs.c:470
 #, c-format
 msgid "Users on %s: %s"
 msgstr "Benutzer auf %s: %s"
 
-#: libpurple/protocols/irc/msgs.c:575
+#: ../libpurple/protocols/irc/msgs.c:575
 msgid "Time Response"
 msgstr "Zeit-Antwort"
 
-#: libpurple/protocols/irc/msgs.c:576
+#: ../libpurple/protocols/irc/msgs.c:576
 msgid "The IRC server's local time is:"
 msgstr "Die Lokalzeit des IRC-Servers ist:"
 
-#: libpurple/protocols/irc/msgs.c:587
+#: ../libpurple/protocols/irc/msgs.c:587
 msgid "No such channel"
 msgstr "Dieser Kanal existiert nicht"
 
 #. does this happen?
-#: libpurple/protocols/irc/msgs.c:598
+#: ../libpurple/protocols/irc/msgs.c:598
 msgid "no such channel"
 msgstr "Dieser Kanal existiert nicht"
 
-#: libpurple/protocols/irc/msgs.c:601
+#: ../libpurple/protocols/irc/msgs.c:601
 msgid "User is not logged in"
 msgstr "Benutzer ist nicht angemeldet"
 
-#: libpurple/protocols/irc/msgs.c:606
+#: ../libpurple/protocols/irc/msgs.c:606
 msgid "No such nick or channel"
 msgstr "Es gibt keinen solchen Spitznamen oder Kanal"
 
-#: libpurple/protocols/irc/msgs.c:626
+#: ../libpurple/protocols/irc/msgs.c:626
 msgid "Could not send"
 msgstr "Konnte nicht senden"
 
-#: libpurple/protocols/irc/msgs.c:682
+#: ../libpurple/protocols/irc/msgs.c:682
 #, c-format
 msgid "Joining %s requires an invitation."
 msgstr "Das Betreten von %s erfordert eine Einladung."
 
-#: libpurple/protocols/irc/msgs.c:683
+#: ../libpurple/protocols/irc/msgs.c:683
 msgid "Invitation only"
 msgstr "Nur Einladungen"
 
-#: libpurple/protocols/irc/msgs.c:795
+#: ../libpurple/protocols/irc/msgs.c:795
 #, c-format
 msgid "You have been kicked by %s: (%s)"
 msgstr "Sie wurden hinausgeworfen von %s: (%s)"
 
 #. Remove user from channel
-#: libpurple/protocols/irc/msgs.c:800 libpurple/protocols/silc/ops.c:699
-#: libpurple/protocols/silc10/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 "Hinausgeworfen durch %s (%s)"
 
-#: libpurple/protocols/irc/msgs.c:823
+#: ../libpurple/protocols/irc/msgs.c:823
 #, c-format
 msgid "mode (%s %s) by %s"
 msgstr "Modus (%s %s) von %s"
 
-#: libpurple/protocols/irc/msgs.c:908 libpurple/protocols/irc/msgs.c:909
+#: ../libpurple/protocols/irc/msgs.c:908 ../libpurple/protocols/irc/msgs.c:909
 msgid "Invalid nickname"
 msgstr "Ungültiger Benutzername"
 
-#: libpurple/protocols/irc/msgs.c:910
+#: ../libpurple/protocols/irc/msgs.c:910
 msgid ""
 "Your selected nickname was rejected by the server.  It probably contains "
 "invalid characters."
@@ -3755,7 +4045,7 @@
 "Ihr gewählter Kontoname wurde vom Server abgelehnt.  Er enthält vermutlich "
 "ungültige Zeichen."
 
-#: libpurple/protocols/irc/msgs.c:915
+#: ../libpurple/protocols/irc/msgs.c:915
 msgid ""
 "Your selected account name was rejected by the server.  It probably contains "
 "invalid characters."
@@ -3763,52 +4053,53 @@
 "Ihr gewählter Kontoname wurde vom Server abgelehnt.  Er enthält vermutlich "
 "ungültige Zeichen."
 
-#: libpurple/protocols/irc/msgs.c:954
+#: ../libpurple/protocols/irc/msgs.c:954
 msgid "Cannot change nick"
 msgstr "Kann den Spitznamen nicht ändern"
 
-#: libpurple/protocols/irc/msgs.c:954
+#: ../libpurple/protocols/irc/msgs.c:954
 msgid "Could not change nick"
 msgstr "Konnte den Spitznamen nicht ändern"
 
-#: libpurple/protocols/irc/msgs.c:975
+#: ../libpurple/protocols/irc/msgs.c:975
 #, c-format
 msgid "You have parted the channel%s%s"
 msgstr "Sie waren im Kanal%s%s"
 
-#: libpurple/protocols/irc/msgs.c:1017
+#: ../libpurple/protocols/irc/msgs.c:1017
 msgid "Error: invalid PONG from server"
 msgstr "Fehler: falsches PONG vom Server"
 
-#: libpurple/protocols/irc/msgs.c:1019
+#: ../libpurple/protocols/irc/msgs.c:1019
 #, c-format
 msgid "PING reply -- Lag: %lu seconds"
 msgstr "PING-Antwort -- Verzögerung: %lu Sekunden"
 
-#: libpurple/protocols/irc/msgs.c:1110
+#: ../libpurple/protocols/irc/msgs.c:1110
 #, c-format
 msgid "Cannot join %s: Registration is required."
 msgstr "Kann %s nicht beitreten: Registrierung ist erforderlich."
 
-#: libpurple/protocols/irc/msgs.c:1111 libpurple/protocols/silc/ops.c:1093
-#: libpurple/protocols/silc10/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 "Kann den Kanal nicht betreten"
 
-#: libpurple/protocols/irc/msgs.c:1145
+#: ../libpurple/protocols/irc/msgs.c:1145
 msgid "Nick or channel is temporarily unavailable."
 msgstr "Der Spitzname oder Kanal ist zur Zeit nicht verfügbar."
 
-#: libpurple/protocols/irc/msgs.c:1157
+#: ../libpurple/protocols/irc/msgs.c:1157
 #, c-format
 msgid "Wallops from %s"
 msgstr "Wallops von %s"
 
-#: libpurple/protocols/irc/parse.c:122
+#: ../libpurple/protocols/irc/parse.c:122
 msgid "action &lt;action to perform&gt;:  Perform an action."
 msgstr "action &lt;Aktion&gt;:  Führe eine Aktion durch."
 
-#: libpurple/protocols/irc/parse.c:123
+#: ../libpurple/protocols/irc/parse.c:123
 msgid ""
 "away [message]:  Set an away message, or use no message to return from being "
 "away."
@@ -3816,11 +4107,11 @@
 "away [Nachricht]:  Setzen Sie eine Abwesenheitsnachricht. Verwenden Sie "
 "keine Nachricht, um wieder zurückzukehren."
 
-#: libpurple/protocols/irc/parse.c:124
+#: ../libpurple/protocols/irc/parse.c:124
 msgid "chanserv: Send a command to chanserv"
 msgstr "chanserv: Sendet ein Kommando zum Chanserv"
 
-#: libpurple/protocols/irc/parse.c:125
+#: ../libpurple/protocols/irc/parse.c:125
 msgid ""
 "deop &lt;nick1&gt; [nick2] ...:  Remove channel operator status from "
 "someone. You must be a channel operator to do this."
@@ -3828,7 +4119,7 @@
 "deop &lt;Nick1&gt; [Nick2] ...:  Entferne den Kanal-Operator-Status von "
 "jemanden. Sie müssen hierfür selbst Operator des Kanals sein."
 
-#: libpurple/protocols/irc/parse.c:126
+#: ../libpurple/protocols/irc/parse.c:126
 msgid ""
 "devoice &lt;nick1&gt; [nick2] ...:  Remove channel voice status from "
 "someone, preventing them from speaking if the channel is moderated (+m). You "
@@ -3838,7 +4129,7 @@
 "Dies verbietet ihm zu sprechen, wenn der Kanal moderiert wird (+). Sie "
 "müssen hierfür selbst Operator des Kanals sein."
 
-#: libpurple/protocols/irc/parse.c:127
+#: ../libpurple/protocols/irc/parse.c:127
 msgid ""
 "invite &lt;nick&gt; [room]:  Invite someone to join you in the specified "
 "channel, or the current channel."
@@ -3846,7 +4137,7 @@
 "invite &lt;Nick&gt; [Raum]:  Jemanden in den angegeben Kanal oder in den "
 "aktuellen Kanal einladen."
 
-#: libpurple/protocols/irc/parse.c:128
+#: ../libpurple/protocols/irc/parse.c:128
 msgid ""
 "j &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  Enter one or more "
 "channels, optionally providing a channel key for each if needed."
@@ -3855,7 +4146,7 @@
 "mehrere Räume angeben, optional jeden mit einem Kanal-Schlüssel, falls "
 "dieser benötigt wird."
 
-#: libpurple/protocols/irc/parse.c:129
+#: ../libpurple/protocols/irc/parse.c:129
 msgid ""
 "join &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  Enter one or more "
 "channels, optionally providing a channel key for each if needed."
@@ -3864,7 +4155,7 @@
 "oder mehrere Räume angeben, optional jeden mit einem Kanal-Schlüssel, falls "
 "dieser benötigt wird."
 
-#: libpurple/protocols/irc/parse.c:130
+#: ../libpurple/protocols/irc/parse.c:130
 msgid ""
 "kick &lt;nick&gt; [message]:  Remove someone from a channel. You must be a "
 "channel operator to do this."
@@ -3872,7 +4163,7 @@
 "kick &lt;Nick&gt; [Nachricht]:  Kickt jemanden aus dem Kanal. Sie müssen "
 "hierfür selbst Operator des Kanals sein."
 
-#: libpurple/protocols/irc/parse.c:131
+#: ../libpurple/protocols/irc/parse.c:131
 msgid ""
 "list:  Display a list of chat rooms on the network. <i>Warning, some servers "
 "may disconnect you upon doing this.</i>"
@@ -3880,15 +4171,15 @@
 "list:  Zeige eine Liste der Chaträume in diesem Netzwerk. <i>Warnung: Einige "
 "Server trennen die Verbindung, wenn Sie dieses Kommando eingeben.</i>"
 
-#: libpurple/protocols/irc/parse.c:132
+#: ../libpurple/protocols/irc/parse.c:132
 msgid "me &lt;action to perform&gt;:  Perform an action."
 msgstr "me &lt;Aktion&gt;:  Eine Aktion durchführen."
 
-#: libpurple/protocols/irc/parse.c:133
+#: ../libpurple/protocols/irc/parse.c:133
 msgid "memoserv: Send a command to memoserv"
 msgstr "memoserv: Sendet ein Kommando zum Memoserv"
 
-#: libpurple/protocols/irc/parse.c:134
+#: ../libpurple/protocols/irc/parse.c:134
 msgid ""
 "mode &lt;+|-&gt;&lt;A-Za-z&gt; &lt;nick|channel&gt;:  Set or unset a channel "
 "or user mode."
@@ -3896,7 +4187,7 @@
 "mode &lt;+|-&gt;&lt;A-Za-z&gt; &lt;Nick|Kanal&gt;:  Kanal- oder Benutzermodi "
 "setzen oder zurücknehmen."
 
-#: libpurple/protocols/irc/parse.c:135
+#: ../libpurple/protocols/irc/parse.c:135
 msgid ""
 "msg &lt;nick&gt; &lt;message&gt;:  Send a private message to a user (as "
 "opposed to a channel)."
@@ -3904,20 +4195,20 @@
 "msg &lt;nick&gt; &lt;nachricht&gt;:  Sendet eine private Nachricht an einen "
 "Benutzer (im Gegensatz zum Kanal)."
 
-#: libpurple/protocols/irc/parse.c:136
+#: ../libpurple/protocols/irc/parse.c:136
 msgid "names [channel]:  List the users currently in a channel."
 msgstr "names [Kanal]:  Listet die Benutzer im aktuellen Kanal auf."
 
-#: libpurple/protocols/irc/parse.c:137
-#: libpurple/protocols/jabber/jabber.c:1813
+#: ../libpurple/protocols/irc/parse.c:137
+#: ../libpurple/protocols/jabber/jabber.c:1830
 msgid "nick &lt;new nickname&gt;:  Change your nickname."
 msgstr "nick &lt;new nickname&gt;:  Ihren Spitznamen ändern."
 
-#: libpurple/protocols/irc/parse.c:138
+#: ../libpurple/protocols/irc/parse.c:138
 msgid "nickserv: Send a command to nickserv"
 msgstr "nickserv: Sendet ein Kommando zum Nickserv"
 
-#: libpurple/protocols/irc/parse.c:139
+#: ../libpurple/protocols/irc/parse.c:139
 msgid ""
 "op &lt;nick1&gt; [nick2] ...:  Grant channel operator status to someone. You "
 "must be a channel operator to do this."
@@ -3925,7 +4216,7 @@
 "op &lt;Nick1&gt; [Nick2] ...:  Erteile den Operator-Status an jemanden. Sie "
 "müssen hierfür selbst Operator des Kanals sein."
 
-#: libpurple/protocols/irc/parse.c:140
+#: ../libpurple/protocols/irc/parse.c:140
 msgid ""
 "operwall &lt;message&gt;:  If you don't know what this is, you probably "
 "can't use it."
@@ -3933,11 +4224,11 @@
 "operwall &lt;Nachricht&gt;:  Wenn Sie nicht wissen, was dies ist, brauchen "
 "Sie es wahrscheinlich nicht."
 
-#: libpurple/protocols/irc/parse.c:141
+#: ../libpurple/protocols/irc/parse.c:141
 msgid "operserv: Send a command to operserv"
 msgstr "operserv: Sendet ein Kommandos zum Operserv"
 
-#: libpurple/protocols/irc/parse.c:142
+#: ../libpurple/protocols/irc/parse.c:142
 msgid ""
 "part [room] [message]:  Leave the current channel, or a specified channel, "
 "with an optional message."
@@ -3945,7 +4236,7 @@
 "part [Raum] [Nachricht]:  Verlässt den aktuellen Kanal oder den angegebenen "
 "Kanal mit einer optionalen Nachricht."
 
-#: libpurple/protocols/irc/parse.c:143
+#: ../libpurple/protocols/irc/parse.c:143
 msgid ""
 "ping [nick]:  Asks how much lag a user (or the server if no user specified) "
 "has."
@@ -3953,7 +4244,7 @@
 "ping [Nick]:  Ermittelt die Verzögerung eines Benutzers (oder eines Server, "
 "wenn kein Benutzer angegeben wird) über ein Ping."
 
-#: libpurple/protocols/irc/parse.c:144
+#: ../libpurple/protocols/irc/parse.c:144
 msgid ""
 "query &lt;nick&gt; &lt;message&gt;:  Send a private message to a user (as "
 "opposed to a channel)."
@@ -3961,15 +4252,15 @@
 "query &lt;Nick&gt; &lt;Nachricht&gt;:  Sendet eine private Nachricht an "
 "einen Benutzer (im Gegensatz zu einem Kanal)."
 
-#: libpurple/protocols/irc/parse.c:145
+#: ../libpurple/protocols/irc/parse.c:145
 msgid "quit [message]:  Disconnect from the server, with an optional message."
 msgstr "quit [Nachricht]:  Trennung vom Server mit einer optionalen Nachricht."
 
-#: libpurple/protocols/irc/parse.c:146
+#: ../libpurple/protocols/irc/parse.c:146
 msgid "quote [...]:  Send a raw command to the server."
 msgstr "quote [...]:  Sendet den Text im Rohformat an den Server."
 
-#: libpurple/protocols/irc/parse.c:147
+#: ../libpurple/protocols/irc/parse.c:147
 msgid ""
 "remove &lt;nick&gt; [message]:  Remove someone from a room. You must be a "
 "channel operator to do this."
@@ -3977,24 +4268,24 @@
 "remove &lt;Nick&gt; [Nachricht]:  Jemanden aus dem Raum entfernen. Sie "
 "müssen hierfür selbst Operator des Kanals sein."
 
-#: libpurple/protocols/irc/parse.c:148
+#: ../libpurple/protocols/irc/parse.c:148
 msgid "time: Displays the current local time at the IRC server."
 msgstr "time: Zeigt die aktuelle Lokalzeit auf dem IRC-Server an."
 
-#: libpurple/protocols/irc/parse.c:149
+#: ../libpurple/protocols/irc/parse.c:149
 msgid "topic [new topic]:  View or change the channel topic."
 msgstr "topic [neues Thema]:  Ansehen oder Ändern des Themas des Kanals."
 
-#: libpurple/protocols/irc/parse.c:150
+#: ../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."
 
-#: libpurple/protocols/irc/parse.c:151
+#: ../libpurple/protocols/irc/parse.c:151
 msgid "version [nick]: send CTCP VERSION request to a user"
 msgstr "version [Benutzer]: sende CTCP VERSION-Anfrage an einen Benutzer"
 
-#: libpurple/protocols/irc/parse.c:152
+#: ../libpurple/protocols/irc/parse.c:152
 msgid ""
 "voice &lt;nick1&gt; [nick2] ...:  Grant channel voice status to someone. You "
 "must be a channel operator to do this."
@@ -4003,7 +4294,7 @@
 "erlaubt ihm auch dann noch zu sprechen, wenn der Kanal moderiert wird (+m). "
 "Sie müssen hierfür selbst Operator des Kanals sein."
 
-#: libpurple/protocols/irc/parse.c:153
+#: ../libpurple/protocols/irc/parse.c:153
 msgid ""
 "wallops &lt;message&gt;:  If you don't know what this is, you probably can't "
 "use it."
@@ -4011,47 +4302,49 @@
 "wallops &lt;Nachricht&gt;:  Wenn Sie diese Funktion nicht kennen, brauchen "
 "sie sie wahrscheinlich nicht."
 
-#: libpurple/protocols/irc/parse.c:154
+#: ../libpurple/protocols/irc/parse.c:154
 msgid "whois [server] &lt;nick&gt;:  Get information on a user."
 msgstr "whois [Server] &lt;Nick&gt;:  Informationen zu einem Benutzer abrufen."
 
-#: libpurple/protocols/irc/parse.c:155
+#: ../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."
 
-#: libpurple/protocols/irc/parse.c:465
+#: ../libpurple/protocols/irc/parse.c:465
 #, c-format
 msgid "Reply time from %s: %lu seconds"
 msgstr "Antwortzeit von %s: %lu Sekunden"
 
-#: libpurple/protocols/irc/parse.c:466
+#: ../libpurple/protocols/irc/parse.c:466
 msgid "PONG"
 msgstr "PONG"
 
-#: libpurple/protocols/irc/parse.c:466
+#: ../libpurple/protocols/irc/parse.c:466
 msgid "CTCP PING reply"
 msgstr "CTCP PING Antwort"
 
-#: 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
+#: ../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."
 msgstr "Verbindung unterbrochen."
 
-#: libpurple/protocols/jabber/auth.c:52
+#: ../libpurple/protocols/jabber/auth.c:52
 msgid "Server requires TLS/SSL for login.  No TLS/SSL support found."
 msgstr ""
 "Der Server benötigt TLS/SSL zur Anmeldung.  Es wurde kein TLS/SSL-Support "
 "gefunden."
 
-#: libpurple/protocols/jabber/auth.c:115
+#: ../libpurple/protocols/jabber/auth.c:115
 msgid "Server requires plaintext authentication over an unencrypted stream"
 msgstr ""
 "Der Server erfordert eine Klartext-Authentifizierung über einen "
 "unverschlüsselten Kanal"
 
-#: libpurple/protocols/jabber/auth.c:294 libpurple/protocols/jabber/auth.c:483
+#: ../libpurple/protocols/jabber/auth.c:294
+#: ../libpurple/protocols/jabber/auth.c:483
 #, c-format
 msgid ""
 "%s requires plaintext authentication over an unencrypted connection.  Allow "
@@ -4061,26 +4354,33 @@
 "Verbindung.  Wollen Sie dies erlauben und mit der Authentifikation "
 "fortfahren?"
 
-#: libpurple/protocols/jabber/auth.c:296 libpurple/protocols/jabber/auth.c:297
-#: libpurple/protocols/jabber/auth.c:485 libpurple/protocols/jabber/auth.c:486
-#: libpurple/protocols/jabber/auth.c:570 libpurple/protocols/jabber/auth.c:571
+#: ../libpurple/protocols/jabber/auth.c:296
+#: ../libpurple/protocols/jabber/auth.c:297
+#: ../libpurple/protocols/jabber/auth.c:485
+#: ../libpurple/protocols/jabber/auth.c:486
+#: ../libpurple/protocols/jabber/auth.c:570
+#: ../libpurple/protocols/jabber/auth.c:571
 msgid "Plaintext Authentication"
 msgstr "Klartext-Authentifizierung"
 
-#: libpurple/protocols/jabber/auth.c:309 libpurple/protocols/jabber/auth.c:498
-#: libpurple/protocols/jabber/auth.c:582
+#: ../libpurple/protocols/jabber/auth.c:309
+#: ../libpurple/protocols/jabber/auth.c:498
+#: ../libpurple/protocols/jabber/auth.c:582
 msgid "Server does not use any supported authentication method"
 msgstr "Der Server benutzt keine der unterstützten Authentifizierungsmethoden"
 
 #. This should never happen!
-#: libpurple/protocols/jabber/auth.c:437 libpurple/protocols/jabber/auth.c:533
-#: libpurple/protocols/jabber/auth.c:748 libpurple/protocols/jabber/auth.c:889
-#: libpurple/protocols/jabber/auth.c:914 libpurple/protocols/jabber/auth.c:933
-#: libpurple/protocols/jabber/jabber.c:115
+#: ../libpurple/protocols/jabber/auth.c:437
+#: ../libpurple/protocols/jabber/auth.c:533
+#: ../libpurple/protocols/jabber/auth.c:748
+#: ../libpurple/protocols/jabber/auth.c:889
+#: ../libpurple/protocols/jabber/auth.c:914
+#: ../libpurple/protocols/jabber/auth.c:933
+#: ../libpurple/protocols/jabber/jabber.c:115
 msgid "Invalid response from server."
 msgstr "Ungültige Serverantwort."
 
-#: libpurple/protocols/jabber/auth.c:572
+#: ../libpurple/protocols/jabber/auth.c:572
 msgid ""
 "This server requires plaintext authentication over an unencrypted "
 "connection.  Allow this and continue authentication?"
@@ -4088,118 +4388,113 @@
 "Der Server erfordert eine Klartext-Authentifizierung über einen "
 "unverschlüsselten Kanal.  Wollen Sie dies erlauben und fortfahren?"
 
-#: libpurple/protocols/jabber/auth.c:769 libpurple/protocols/jabber/auth.c:792
+#: ../libpurple/protocols/jabber/auth.c:769
+#: ../libpurple/protocols/jabber/auth.c:792
 msgid "Invalid challenge from server"
 msgstr "Ungültige Challenge vom Server"
 
-#: libpurple/protocols/jabber/auth.c:864
+#: ../libpurple/protocols/jabber/auth.c:864
 msgid "SASL error"
 msgstr "SASL-Fehler"
 
-#: libpurple/protocols/jabber/buddy.c:271
-#: libpurple/protocols/jabber/buddy.c:825
-#: libpurple/protocols/sametime/sametime.c:4129
-#: libpurple/protocols/silc/ops.c:986 libpurple/protocols/silc10/ops.c:1020
+#: ../libpurple/protocols/jabber/buddy.c:271
+#: ../libpurple/protocols/jabber/buddy.c:825
+#: ../libpurple/protocols/sametime/sametime.c:4129
+#: ../libpurple/protocols/silc/ops.c:986
+#: ../libpurple/protocols/silc10/ops.c:1020
 msgid "Full Name"
 msgstr "Vollständiger Name"
 
-#: libpurple/protocols/jabber/buddy.c:272
-#: libpurple/protocols/jabber/buddy.c:838 libpurple/protocols/silc/ops.c:998
-#: libpurple/protocols/silc10/ops.c:1032
+#: ../libpurple/protocols/jabber/buddy.c:272
+#: ../libpurple/protocols/jabber/buddy.c:838
+#: ../libpurple/protocols/silc/ops.c:998
+#: ../libpurple/protocols/silc10/ops.c:1032
 msgid "Family Name"
 msgstr "Nachname"
 
-#: libpurple/protocols/jabber/buddy.c:273
-#: libpurple/protocols/jabber/buddy.c:842
+#: ../libpurple/protocols/jabber/buddy.c:273
+#: ../libpurple/protocols/jabber/buddy.c:842
 msgid "Given Name"
 msgstr "Vorname"
 
-#: libpurple/protocols/jabber/buddy.c:275
-#: libpurple/protocols/jabber/jabber.c:863
+#: ../libpurple/protocols/jabber/buddy.c:275
+#: ../libpurple/protocols/jabber/jabber.c:863
 msgid "URL"
 msgstr "URL"
 
-#: libpurple/protocols/jabber/buddy.c:276
-#: libpurple/protocols/jabber/buddy.c:894
+#: ../libpurple/protocols/jabber/buddy.c:276
+#: ../libpurple/protocols/jabber/buddy.c:894
 msgid "Street Address"
 msgstr "Straße"
 
-#: libpurple/protocols/jabber/buddy.c:277
-#: libpurple/protocols/jabber/buddy.c:890
+#: ../libpurple/protocols/jabber/buddy.c:277
+#: ../libpurple/protocols/jabber/buddy.c:890
 msgid "Extended Address"
 msgstr "Erweiterte Adresse"
 
-#: libpurple/protocols/jabber/buddy.c:278
-#: libpurple/protocols/jabber/buddy.c:898
+#: ../libpurple/protocols/jabber/buddy.c:278
+#: ../libpurple/protocols/jabber/buddy.c:898
 msgid "Locality"
 msgstr "Ort"
 
-#: libpurple/protocols/jabber/buddy.c:279
-#: libpurple/protocols/jabber/buddy.c:902
+#: ../libpurple/protocols/jabber/buddy.c:279
+#: ../libpurple/protocols/jabber/buddy.c:902
 msgid "Region"
 msgstr "Region"
 
-#: libpurple/protocols/jabber/buddy.c:280
-#: libpurple/protocols/jabber/buddy.c:906
+#: ../libpurple/protocols/jabber/buddy.c:280
+#: ../libpurple/protocols/jabber/buddy.c:906
 msgid "Postal Code"
 msgstr "Postleitzahl"
 
-#: libpurple/protocols/jabber/buddy.c:281
-#: libpurple/protocols/jabber/buddy.c:911 libpurple/protocols/silc/silc.c:1015
-#: libpurple/protocols/silc10/silc.c:926
+#: ../libpurple/protocols/jabber/buddy.c:281
+#: ../libpurple/protocols/jabber/buddy.c:911
+#: ../libpurple/protocols/silc/silc.c:1015
+#: ../libpurple/protocols/silc10/silc.c:926
 msgid "Country"
 msgstr "Land"
 
-#: libpurple/protocols/jabber/buddy.c:282
-#: libpurple/protocols/jabber/buddy.c:922
-#: libpurple/protocols/jabber/buddy.c:929
+#: ../libpurple/protocols/jabber/buddy.c:282
+#: ../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: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:1061
-msgid "E-Mail"
-msgstr "E-Mail"
-
-#: libpurple/protocols/jabber/buddy.c:284
-#: libpurple/protocols/jabber/buddy.c:963
+#: ../libpurple/protocols/jabber/buddy.c:284
+#: ../libpurple/protocols/jabber/buddy.c:963
 msgid "Organization Name"
 msgstr "Name der Organisation"
 
-#: libpurple/protocols/jabber/buddy.c:285
-#: libpurple/protocols/jabber/buddy.c:967
+#: ../libpurple/protocols/jabber/buddy.c:285
+#: ../libpurple/protocols/jabber/buddy.c:967
 msgid "Organization Unit"
 msgstr "Organisationseinheit"
 
-#: libpurple/protocols/jabber/buddy.c:287
-#: libpurple/protocols/jabber/buddy.c:976
+#: ../libpurple/protocols/jabber/buddy.c:287
+#: ../libpurple/protocols/jabber/buddy.c:976
 msgid "Role"
 msgstr "Funktion"
 
-#: libpurple/protocols/jabber/buddy.c:288
-#: libpurple/protocols/jabber/buddy.c:859 libpurple/protocols/msn/msn.c:1627
-#: libpurple/protocols/oscar/oscar.c:3758
+#: ../libpurple/protocols/jabber/buddy.c:288
+#: ../libpurple/protocols/jabber/buddy.c:859
+#: ../libpurple/protocols/msn/msn.c:1627
+#: ../libpurple/protocols/oscar/oscar.c:3717
 msgid "Birthday"
 msgstr "Geburtstag"
 
-#: libpurple/protocols/jabber/buddy.c:289
-#: libpurple/protocols/jabber/buddy.c:979
-#: libpurple/protocols/jabber/chat.c:775 pidgin/gtkblist.c:3090
-#: pidgin/gtkprefs.c:738
+#: ../libpurple/protocols/jabber/buddy.c:289
+#: ../libpurple/protocols/jabber/buddy.c:979
+#: ../libpurple/protocols/jabber/chat.c:775 ../pidgin/gtkblist.c:3093
+#: ../pidgin/gtkprefs.c:738
 msgid "Description"
 msgstr "Beschreibung"
 
-#: libpurple/protocols/jabber/buddy.c:582
-#: libpurple/protocols/jabber/buddy.c:583
+#: ../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:584
+#: ../libpurple/protocols/jabber/buddy.c:584
 msgid ""
 "All items below are optional. Enter only the information with which you feel "
 "comfortable."
@@ -4207,115 +4502,116 @@
 "Die folgenden Punkte sind optional. Geben Sie nur die Informationen an, die "
 "Sie angeben möchten."
 
-#: libpurple/protocols/jabber/buddy.c:655
-#: libpurple/protocols/jabber/buddy.c:696
+#: ../libpurple/protocols/jabber/buddy.c:655
+#: ../libpurple/protocols/jabber/buddy.c:696
 msgid "Client"
 msgstr "Client"
 
-#: libpurple/protocols/jabber/buddy.c:659
-#: libpurple/protocols/jabber/buddy.c:700
+#: ../libpurple/protocols/jabber/buddy.c:659
+#: ../libpurple/protocols/jabber/buddy.c:700
 msgid "Operating System"
 msgstr "Betriebssystem"
 
-#: libpurple/protocols/jabber/buddy.c:669
-#: libpurple/protocols/jabber/libxmpp.c:202
-#: libpurple/protocols/jabber/si.c:853
+#: ../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: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
+#: ../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:846 libpurple/protocols/silc/ops.c:994
-#: libpurple/protocols/silc10/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 "Zweiter Name"
 
-#: libpurple/protocols/jabber/buddy.c:879
-#: libpurple/protocols/jabber/jabber.c:838
-#: libpurple/protocols/oscar/oscar.c:3797
-#: libpurple/protocols/oscar/oscar.c:3810
-#: libpurple/protocols/qq/buddy_info.c:56 libpurple/protocols/silc/ops.c:1030
-#: libpurple/protocols/silc10/ops.c:1064
+#: ../libpurple/protocols/jabber/buddy.c:879
+#: ../libpurple/protocols/jabber/jabber.c:838
+#: ../libpurple/protocols/oscar/oscar.c:3756
+#: ../libpurple/protocols/oscar/oscar.c:3769
+#: ../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:886
+#: ../libpurple/protocols/jabber/buddy.c:886
 msgid "P.O. Box"
 msgstr "Postfach"
 
-#: libpurple/protocols/jabber/buddy.c:1000
+#: ../libpurple/protocols/jabber/buddy.c:1000
 msgid "Photo"
 msgstr "Foto"
 
-#: libpurple/protocols/jabber/buddy.c:1000
+#: ../libpurple/protocols/jabber/buddy.c:1000
 msgid "Logo"
 msgstr "Logo"
 
-#: libpurple/protocols/jabber/buddy.c:1409
+#: ../libpurple/protocols/jabber/buddy.c:1409
 msgid "Un-hide From"
 msgstr "Sichtbar von"
 
-#: libpurple/protocols/jabber/buddy.c:1413
+#: ../libpurple/protocols/jabber/buddy.c:1413
 msgid "Temporarily Hide From"
 msgstr "Temporär versteckt von"
 
 #. && NOT ME
-#: libpurple/protocols/jabber/buddy.c:1421
+#: ../libpurple/protocols/jabber/buddy.c:1421
 msgid "Cancel Presence Notification"
 msgstr "Abbrechen der Anwesenheitsbenachrichtigung"
 
-#: libpurple/protocols/jabber/buddy.c:1428
+#: ../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:1437
+#: ../libpurple/protocols/jabber/buddy.c:1437
 msgid "Unsubscribe"
 msgstr "Abbestellen"
 
-#: libpurple/protocols/jabber/buddy.c:1470
-#: libpurple/protocols/jabber/jabber.c:1252
+#: ../libpurple/protocols/jabber/buddy.c:1470
+#: ../libpurple/protocols/jabber/jabber.c:1252
 msgid "Chatty"
 msgstr "Gesprächig"
 
-#: libpurple/protocols/jabber/buddy.c:1474
+#: ../libpurple/protocols/jabber/buddy.c:1474
 msgid "Extended Away"
 msgstr "Abwesend (erweitert)"
 
-#: 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:3298
-#, c-format
+#: ../libpurple/protocols/jabber/buddy.c:1476
+#: ../libpurple/protocols/jabber/jabber.c:1282
+#: ../libpurple/protocols/oscar/oscar.c:726
+#: ../libpurple/protocols/oscar/oscar.c:5756
+#: ../libpurple/protocols/sametime/sametime.c:3298
 msgid "Do Not Disturb"
 msgstr "Nicht stören"
 
-#: libpurple/protocols/jabber/buddy.c:1621
+#: ../libpurple/protocols/jabber/buddy.c:1621
 msgid "JID"
 msgstr "JID"
 
-#: libpurple/protocols/jabber/buddy.c:1625
-#: libpurple/protocols/jabber/buddy.c:1804
-#: libpurple/protocols/oscar/oscar.c:3720
+#: ../libpurple/protocols/jabber/buddy.c:1625
+#: ../libpurple/protocols/jabber/buddy.c:1804
+#: ../libpurple/protocols/oscar/oscar.c:3679
 msgid "Last Name"
 msgstr "Nachname"
 
-#: libpurple/protocols/jabber/buddy.c:1657
+#: ../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:1732
+#: ../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 (%)"
@@ -4323,170 +4619,180 @@
 "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:1752
+#: ../libpurple/protocols/jabber/buddy.c:1752
 msgid "Directory Query Failed"
 msgstr "Verzeichnisanfrage gescheitert"
 
-#: libpurple/protocols/jabber/buddy.c:1753
+#: ../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:1787
+#: ../libpurple/protocols/jabber/buddy.c:1787
 #, c-format
 msgid "Server Instructions: %s"
 msgstr "Anleitung vom Server: %s"
 
-#: libpurple/protocols/jabber/buddy.c:1794
+#: ../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:1814
-#: libpurple/protocols/novell/novell.c:1488
-#: libpurple/protocols/oscar/oscar.c:3723
-#: libpurple/protocols/oscar/oscar.c:3732
+#: ../libpurple/protocols/jabber/buddy.c:1814
+#: ../libpurple/protocols/novell/novell.c:1488
+#: ../libpurple/protocols/oscar/oscar.c:3682
+#: ../libpurple/protocols/oscar/oscar.c:3691
 msgid "E-Mail Address"
 msgstr "E-Mail-Adresse"
 
-#: libpurple/protocols/jabber/buddy.c:1823
-#: libpurple/protocols/jabber/buddy.c:1824
+#: ../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:1825 libpurple/protocols/qq/group.c:123
-#: 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:5612
-#: pidgin/plugins/gevolution/add_buddy_dialog.c:470
-#: pidgin/plugins/gevolution/assoc-buddy.c:356
+#: ../libpurple/protocols/jabber/buddy.c:1825
+#: ../libpurple/protocols/qq/group.c:123
+#: ../libpurple/protocols/qq/group_im.c:147
+#: ../libpurple/protocols/qq/sys_msg.c:174
+#: ../libpurple/protocols/qq/sys_msg.c:250
+#: ../libpurple/protocols/qq/sys_msg.c:268
+#: ../libpurple/protocols/sametime/sametime.c:5612
+#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:470
+#: ../pidgin/plugins/gevolution/assoc-buddy.c:356
 msgid "Search"
 msgstr "Suchen"
 
-#: libpurple/protocols/jabber/buddy.c:1840
+#: ../libpurple/protocols/jabber/buddy.c:1840
 msgid "Invalid Directory"
 msgstr "Ungültiges Verzeichnis"
 
-#: libpurple/protocols/jabber/buddy.c:1857
+#: ../libpurple/protocols/jabber/buddy.c:1857
 msgid "Enter a User Directory"
 msgstr "Geben Sie ein Benutzerverzeichnis ein"
 
-#: libpurple/protocols/jabber/buddy.c:1858
+#: ../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:1861
+#: ../libpurple/protocols/jabber/buddy.c:1861
 msgid "Search Directory"
 msgstr "Suche im Verzeichnis"
 
-#: libpurple/protocols/jabber/chat.c:41 libpurple/protocols/oscar/oscar.c:5273
-#: libpurple/protocols/yahoo/yahoochat.c:962
+#: ../libpurple/protocols/jabber/chat.c:41
+#: ../libpurple/protocols/oscar/oscar.c:5242
+#: ../libpurple/protocols/yahoo/yahoochat.c:962
 msgid "_Room:"
 msgstr "_Raum:"
 
-#: libpurple/protocols/jabber/chat.c:47
+#: ../libpurple/protocols/jabber/chat.c:47
 msgid "_Server:"
 msgstr "_Server:"
 
-#: libpurple/protocols/jabber/chat.c:53
+#: ../libpurple/protocols/jabber/chat.c:53
 msgid "_Handle:"
 msgstr "_Kürzel:"
 
-#: libpurple/protocols/jabber/chat.c:223
+#: ../libpurple/protocols/jabber/chat.c:223
 #, c-format
 msgid "%s is not a valid room name"
 msgstr "%s ist kein gültiger Raumname"
 
-#: libpurple/protocols/jabber/chat.c:224
+#: ../libpurple/protocols/jabber/chat.c:224
 msgid "Invalid Room Name"
 msgstr "Ungültiger Raumname"
 
-#: libpurple/protocols/jabber/chat.c:229
+#: ../libpurple/protocols/jabber/chat.c:229
 #, c-format
 msgid "%s is not a valid server name"
 msgstr "%s ist kein gültiger Servername"
 
-#: libpurple/protocols/jabber/chat.c:230 libpurple/protocols/jabber/chat.c:231
+#: ../libpurple/protocols/jabber/chat.c:230
+#: ../libpurple/protocols/jabber/chat.c:231
 msgid "Invalid Server Name"
 msgstr "Ungültiger Servername"
 
-#: libpurple/protocols/jabber/chat.c:235
+#: ../libpurple/protocols/jabber/chat.c:235
 #, c-format
 msgid "%s is not a valid room handle"
 msgstr "%s ist kein gültiger Raumbezeichner"
 
-#: libpurple/protocols/jabber/chat.c:236 libpurple/protocols/jabber/chat.c:237
+#: ../libpurple/protocols/jabber/chat.c:236
+#: ../libpurple/protocols/jabber/chat.c:237
 msgid "Invalid Room Handle"
 msgstr "Ungültiger Raumbezeichner"
 
-#: libpurple/protocols/jabber/chat.c:396
+#: ../libpurple/protocols/jabber/chat.c:396
 msgid "Configuration error"
 msgstr "Konfigurationsfehler"
 
-#: libpurple/protocols/jabber/chat.c:405 libpurple/protocols/jabber/chat.c:548
+#: ../libpurple/protocols/jabber/chat.c:405
+#: ../libpurple/protocols/jabber/chat.c:548
 msgid "Unable to configure"
 msgstr "Kann nicht konfigurieren"
 
-#: libpurple/protocols/jabber/chat.c:420
+#: ../libpurple/protocols/jabber/chat.c:420
 msgid "Room Configuration Error"
 msgstr "Raum-Konfigurationsfehler"
 
-#: libpurple/protocols/jabber/chat.c:421
+#: ../libpurple/protocols/jabber/chat.c:421
 msgid "This room is not capable of being configured"
 msgstr "Dieser Raum kann nicht konfiguriert werden"
 
-#: libpurple/protocols/jabber/chat.c:470 libpurple/protocols/jabber/chat.c:539
+#: ../libpurple/protocols/jabber/chat.c:470
+#: ../libpurple/protocols/jabber/chat.c:539
 msgid "Registration error"
 msgstr "Registrierungsfehler"
 
-#: libpurple/protocols/jabber/chat.c:627
+#: ../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"
 
-#: libpurple/protocols/jabber/chat.c:678 libpurple/protocols/jabber/chat.c:689
-#: libpurple/protocols/silc/ops.c:1456 libpurple/protocols/silc10/ops.c:1451
+#: ../libpurple/protocols/jabber/chat.c:678
+#: ../libpurple/protocols/jabber/chat.c:689
+#: ../libpurple/protocols/silc/ops.c:1456
+#: ../libpurple/protocols/silc10/ops.c:1451
 msgid "Error retrieving room list"
 msgstr "Fehler beim Empfangen der Raumliste"
 
-#: libpurple/protocols/jabber/chat.c:737
+#: ../libpurple/protocols/jabber/chat.c:737
 msgid "Invalid Server"
 msgstr "Ungültiger Server"
 
-#: libpurple/protocols/jabber/chat.c:781
+#: ../libpurple/protocols/jabber/chat.c:781
 msgid "Enter a Conference Server"
 msgstr "Geben Sie einen Konferenzserver ein"
 
-#: libpurple/protocols/jabber/chat.c:782
+#: ../libpurple/protocols/jabber/chat.c:782
 msgid "Select a conference server to query"
 msgstr "Wählen Sie einen Konferenz-Server zur Abfrage"
 
-#: libpurple/protocols/jabber/chat.c:785
+#: ../libpurple/protocols/jabber/chat.c:785
 msgid "Find Rooms"
 msgstr "Finde Räume"
 
-#: libpurple/protocols/jabber/jabber.c:84
+#: ../libpurple/protocols/jabber/jabber.c:84
 msgid "Error initializing session"
 msgstr "Fehler bei Initialisieren der Sitzung"
 
-#: libpurple/protocols/jabber/jabber.c:247
-#: libpurple/protocols/jabber/jabber.c:300
-#: libpurple/protocols/jabber/jabber.c:328
+#: ../libpurple/protocols/jabber/jabber.c:247
+#: ../libpurple/protocols/jabber/jabber.c:300
+#: ../libpurple/protocols/jabber/jabber.c:328
 msgid "Write error"
 msgstr "Schreibfehler"
 
-#: libpurple/protocols/jabber/jabber.c:396
-#: libpurple/protocols/jabber/jabber.c:433
+#: ../libpurple/protocols/jabber/jabber.c:396
+#: ../libpurple/protocols/jabber/jabber.c:433
 msgid "Read Error"
 msgstr "Fehler beim Lesen"
 
-#: libpurple/protocols/jabber/jabber.c:467
-#: libpurple/protocols/oscar/flap_connection.c:394
-#: libpurple/protocols/yahoo/yahoo.c:2385
-#: libpurple/protocols/yahoo/yahoo.c:2417
+#: ../libpurple/protocols/jabber/jabber.c:467
+#: ../libpurple/protocols/oscar/flap_connection.c:394
+#: ../libpurple/protocols/yahoo/yahoo.c:2402
+#: ../libpurple/protocols/yahoo/yahoo.c:2434
 #, c-format
 msgid ""
 "Could not establish a connection with the server:\n"
@@ -4495,430 +4801,436 @@
 "Die Verbindung mit dem Server konnte nicht hergestellt werden:\n"
 "%s"
 
-#: libpurple/protocols/jabber/jabber.c:523
+#: ../libpurple/protocols/jabber/jabber.c:523
 msgid "Unable to create socket"
 msgstr "Kann Socket nicht erstellen"
 
-#: libpurple/protocols/jabber/jabber.c:568
-#: libpurple/protocols/jabber/jabber.c:918
+#: ../libpurple/protocols/jabber/jabber.c:568
+#: ../libpurple/protocols/jabber/jabber.c:918
 msgid "Invalid XMPP ID"
 msgstr "Ungültige XMPP-ID"
 
-#: libpurple/protocols/jabber/jabber.c:573
+#: ../libpurple/protocols/jabber/jabber.c:573
 msgid "Invalid XMPP ID. Domain must be set."
 msgstr "Falsche XMPP-ID. Die Domain muss gesetzt werden."
 
-#: libpurple/protocols/jabber/jabber.c:644
+#: ../libpurple/protocols/jabber/jabber.c:644
 #, c-format
 msgid "Registration of %s@%s successful"
 msgstr "Registrierung von %s@%s erfolgreich"
 
-#: libpurple/protocols/jabber/jabber.c:646
-#: libpurple/protocols/jabber/jabber.c:647
+#: ../libpurple/protocols/jabber/jabber.c:646
+#: ../libpurple/protocols/jabber/jabber.c:647
 msgid "Registration Successful"
 msgstr "Registrierung erfolgreich"
 
-#: libpurple/protocols/jabber/jabber.c:653
-#: libpurple/protocols/jabber/jabber.c:1524
+#: ../libpurple/protocols/jabber/jabber.c:653
+#: ../libpurple/protocols/jabber/jabber.c:1524
 msgid "Unknown Error"
 msgstr "Unbekannter Fehler"
 
-#: libpurple/protocols/jabber/jabber.c:655
-#: libpurple/protocols/jabber/jabber.c:656
+#: ../libpurple/protocols/jabber/jabber.c:655
+#: ../libpurple/protocols/jabber/jabber.c:656
 msgid "Registration Failed"
 msgstr "Registrierung fehlgeschlagen"
 
-#: libpurple/protocols/jabber/jabber.c:771
-#: libpurple/protocols/jabber/jabber.c:772
+#: ../libpurple/protocols/jabber/jabber.c:771
+#: ../libpurple/protocols/jabber/jabber.c:772
 msgid "Already Registered"
 msgstr "Schon registriert"
 
-#: libpurple/protocols/jabber/jabber.c:848
-#: libpurple/protocols/oscar/oscar.c:3799
-#: libpurple/protocols/oscar/oscar.c:3812
+#: ../libpurple/protocols/jabber/jabber.c:848
+#: ../libpurple/protocols/oscar/oscar.c:3758
+#: ../libpurple/protocols/oscar/oscar.c:3771
 msgid "State"
 msgstr "Provinz/Bundesland"
 
-#: libpurple/protocols/jabber/jabber.c:853
+#: ../libpurple/protocols/jabber/jabber.c:853
 msgid "Postal code"
 msgstr "Postleitzahl"
 
-#: 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
+#: ../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 "Telefon"
 
-#: libpurple/protocols/jabber/jabber.c:868
+#: ../libpurple/protocols/jabber/jabber.c:868
 msgid "Date"
 msgstr "Datum"
 
-#: libpurple/protocols/jabber/jabber.c:876
+#: ../libpurple/protocols/jabber/jabber.c:876
 msgid "Please fill out the information below to register your new account."
 msgstr ""
 "Bitte füllen Sie die unten stehenden Informationen aus, um ein neues Konto "
 "zu registrieren."
 
-#: libpurple/protocols/jabber/jabber.c:879
-#: libpurple/protocols/jabber/jabber.c:880
+#: ../libpurple/protocols/jabber/jabber.c:879
+#: ../libpurple/protocols/jabber/jabber.c:880
 msgid "Register New XMPP Account"
 msgstr "Registrierung eines neuen XMPP-Kontos"
 
 #. Register button
-#: libpurple/protocols/jabber/jabber.c:881 pidgin/gtkaccount.c:1518
+#: ../libpurple/protocols/jabber/jabber.c:881 ../pidgin/gtkaccount.c:1523
 msgid "Register"
 msgstr "Registrieren"
 
-#: libpurple/protocols/jabber/jabber.c:1050
+#: ../libpurple/protocols/jabber/jabber.c:1050
 msgid "Initializing Stream"
 msgstr "Initialisiere den Stream"
 
-#: libpurple/protocols/jabber/jabber.c:1055
-#: libpurple/protocols/msn/session.c:351
+#: ../libpurple/protocols/jabber/jabber.c:1055
+#: ../libpurple/protocols/msn/session.c:351
 msgid "Authenticating"
 msgstr "Authentifizierung"
 
-#: libpurple/protocols/jabber/jabber.c:1064
+#: ../libpurple/protocols/jabber/jabber.c:1064
 msgid "Re-initializing Stream"
 msgstr "Initialisiere Stream nochmal"
 
-#: 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
+#: ../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:825
+#: ../libpurple/protocols/oscar/oscar.c:5550
 msgid "Not Authorized"
 msgstr "Nicht autorisiert"
 
-#: libpurple/protocols/jabber/jabber.c:1168
+#: ../libpurple/protocols/jabber/jabber.c:1168
 msgid "Both"
 msgstr "Beide"
 
-#: libpurple/protocols/jabber/jabber.c:1170
+#: ../libpurple/protocols/jabber/jabber.c:1170
 msgid "From (To pending)"
 msgstr "Von (zu den offenen)"
 
-#: libpurple/protocols/jabber/jabber.c:1172
+#: ../libpurple/protocols/jabber/jabber.c:1172
 msgid "From"
 msgstr "Von"
 
-#: libpurple/protocols/jabber/jabber.c:1175
+#: ../libpurple/protocols/jabber/jabber.c:1175
 msgid "To"
 msgstr "Zu"
 
-#: libpurple/protocols/jabber/jabber.c:1177
+#: ../libpurple/protocols/jabber/jabber.c:1177
 msgid "None (To pending)"
 msgstr "Kein (zu den offenen)"
 
-#: libpurple/protocols/jabber/jabber.c:1179
-#: pidgin/plugins/gevolution/eds-utils.c:73
-#: pidgin/plugins/gevolution/eds-utils.c:86
+#: ../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:1182
+#: ../libpurple/protocols/jabber/jabber.c:1182
 msgid "Subscription"
 msgstr "Abonnement"
 
-#: libpurple/protocols/jabber/jabber.c:1312
+#: ../libpurple/protocols/jabber/jabber.c:1312
 msgid "Password Changed"
 msgstr "Passwort geändert"
 
-#: libpurple/protocols/jabber/jabber.c:1313
+#: ../libpurple/protocols/jabber/jabber.c:1313
 msgid "Your password has been changed."
 msgstr "Ihr Passwort wurde geändert."
 
-#: libpurple/protocols/jabber/jabber.c:1317
-#: libpurple/protocols/jabber/jabber.c:1318
+#: ../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:1375
+#: ../libpurple/protocols/jabber/jabber.c:1375
 msgid "Password (again)"
 msgstr "Passwort (nochmal)"
 
-#: libpurple/protocols/jabber/jabber.c:1381
-#: libpurple/protocols/jabber/jabber.c:1382
+#: ../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:1382
+#: ../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:1394
-#: libpurple/protocols/oscar/oscar.c:6367 libpurple/protocols/silc/silc.c:1093
-#: libpurple/protocols/silc10/silc.c:1004
+#: ../libpurple/protocols/jabber/jabber.c:1394
+#: ../libpurple/protocols/oscar/oscar.c:6336
+#: ../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:1399
-#: libpurple/protocols/oscar/oscar.c:6378 libpurple/protocols/silc/silc.c:1089
-#: libpurple/protocols/silc10/silc.c:1000
+#: ../libpurple/protocols/jabber/jabber.c:1399
+#: ../libpurple/protocols/oscar/oscar.c:6347
+#: ../libpurple/protocols/silc/silc.c:1089
+#: ../libpurple/protocols/silc10/silc.c:1000
 msgid "Change Password..."
 msgstr "Passwort ändern..."
 
 #. }
-#: libpurple/protocols/jabber/jabber.c:1404
+#: ../libpurple/protocols/jabber/jabber.c:1404
 msgid "Search for Users..."
 msgstr "Suche nach Benutzern..."
 
-#: libpurple/protocols/jabber/jabber.c:1482
+#: ../libpurple/protocols/jabber/jabber.c:1482
 msgid "Bad Request"
 msgstr "Falsche Anfrage"
 
-#: libpurple/protocols/jabber/jabber.c:1484
+#: ../libpurple/protocols/jabber/jabber.c:1484
 msgid "Conflict"
 msgstr "Konflikt"
 
-#: libpurple/protocols/jabber/jabber.c:1486
+#: ../libpurple/protocols/jabber/jabber.c:1486
 msgid "Feature Not Implemented"
 msgstr "Feature nicht implementiert"
 
-#: libpurple/protocols/jabber/jabber.c:1488
+#: ../libpurple/protocols/jabber/jabber.c:1488
 msgid "Forbidden"
 msgstr "Verboten"
 
-#: libpurple/protocols/jabber/jabber.c:1490
+#: ../libpurple/protocols/jabber/jabber.c:1490
 msgid "Gone"
 msgstr "Gegangen"
 
-#: libpurple/protocols/jabber/jabber.c:1492
-#: libpurple/protocols/jabber/jabber.c:1569
+#: ../libpurple/protocols/jabber/jabber.c:1492
+#: ../libpurple/protocols/jabber/jabber.c:1569
 msgid "Internal Server Error"
 msgstr "Interner Server-Fehler"
 
-#: libpurple/protocols/jabber/jabber.c:1494
+#: ../libpurple/protocols/jabber/jabber.c:1494
 msgid "Item Not Found"
 msgstr "Eintrag nicht gefunden"
 
-#: libpurple/protocols/jabber/jabber.c:1496
+#: ../libpurple/protocols/jabber/jabber.c:1496
 msgid "Malformed XMPP ID"
 msgstr "Falsche XMPP-ID"
 
-#: libpurple/protocols/jabber/jabber.c:1498
+#: ../libpurple/protocols/jabber/jabber.c:1498
 msgid "Not Acceptable"
 msgstr "Nicht akzeptabel"
 
-#: libpurple/protocols/jabber/jabber.c:1500
+#: ../libpurple/protocols/jabber/jabber.c:1500
 msgid "Not Allowed"
 msgstr "Nicht erlaubt"
 
-#: libpurple/protocols/jabber/jabber.c:1504
+#: ../libpurple/protocols/jabber/jabber.c:1504
 msgid "Payment Required"
 msgstr "Bezahlung erforderlich"
 
-#: libpurple/protocols/jabber/jabber.c:1506
+#: ../libpurple/protocols/jabber/jabber.c:1506
 msgid "Recipient Unavailable"
 msgstr "Empfänger nicht verfügbar"
 
-#: libpurple/protocols/jabber/jabber.c:1510
+#: ../libpurple/protocols/jabber/jabber.c:1510
 msgid "Registration Required"
 msgstr "Registrierung erforderlich"
 
-#: libpurple/protocols/jabber/jabber.c:1512
+#: ../libpurple/protocols/jabber/jabber.c:1512
 msgid "Remote Server Not Found"
 msgstr "Remote-Server nicht gefunden"
 
-#: libpurple/protocols/jabber/jabber.c:1514
+#: ../libpurple/protocols/jabber/jabber.c:1514
 msgid "Remote Server Timeout"
 msgstr "Zeitüberschreitung beim Remote-Server"
 
-#: libpurple/protocols/jabber/jabber.c:1516
+#: ../libpurple/protocols/jabber/jabber.c:1516
 msgid "Server Overloaded"
 msgstr "Server überlastet"
 
-#: libpurple/protocols/jabber/jabber.c:1518
+#: ../libpurple/protocols/jabber/jabber.c:1518
 msgid "Service Unavailable"
 msgstr "Dienst nicht erreichbar"
 
-#: libpurple/protocols/jabber/jabber.c:1520
+#: ../libpurple/protocols/jabber/jabber.c:1520
 msgid "Subscription Required"
 msgstr "Abonnement erforderlich"
 
-#: libpurple/protocols/jabber/jabber.c:1522
+#: ../libpurple/protocols/jabber/jabber.c:1522
 msgid "Unexpected Request"
 msgstr "Unerwartete Anfrage"
 
-#: libpurple/protocols/jabber/jabber.c:1529
+#: ../libpurple/protocols/jabber/jabber.c:1529
 msgid "Authorization Aborted"
 msgstr "Autorisierung abgebrochen"
 
-#: libpurple/protocols/jabber/jabber.c:1531
+#: ../libpurple/protocols/jabber/jabber.c:1531
 msgid "Incorrect encoding in authorization"
 msgstr "Falsche Kodierung in der Autorisierung"
 
-#: libpurple/protocols/jabber/jabber.c:1534
+#: ../libpurple/protocols/jabber/jabber.c:1534
 msgid "Invalid authzid"
 msgstr "Ungültige authzid"
 
-#: libpurple/protocols/jabber/jabber.c:1537
+#: ../libpurple/protocols/jabber/jabber.c:1537
 msgid "Invalid Authorization Mechanism"
 msgstr "Falscher Autorisierungsmechanismus"
 
-#: libpurple/protocols/jabber/jabber.c:1540
+#: ../libpurple/protocols/jabber/jabber.c:1540
 msgid "Authorization mechanism too weak"
 msgstr "Autorisierungsmechanismus zu schwach"
 
-#: libpurple/protocols/jabber/jabber.c:1545
+#: ../libpurple/protocols/jabber/jabber.c:1545
 msgid "Temporary Authentication Failure"
 msgstr "Temporärer Authentifizierungsfehler"
 
-#: libpurple/protocols/jabber/jabber.c:1548
+#: ../libpurple/protocols/jabber/jabber.c:1548
 msgid "Authentication Failure"
 msgstr "Authentifizierungsfehler"
 
-#: libpurple/protocols/jabber/jabber.c:1554
+#: ../libpurple/protocols/jabber/jabber.c:1554
 msgid "Bad Format"
 msgstr "Schlechtes Format"
 
-#: libpurple/protocols/jabber/jabber.c:1556
+#: ../libpurple/protocols/jabber/jabber.c:1556
 msgid "Bad Namespace Prefix"
 msgstr "Falsches Namensraum-Präfix"
 
-#: libpurple/protocols/jabber/jabber.c:1559
+#: ../libpurple/protocols/jabber/jabber.c:1559
 msgid "Resource Conflict"
 msgstr "Ressourcenkonflikt"
 
-#: libpurple/protocols/jabber/jabber.c:1561
-#: libpurple/protocols/silc/silc.c:244 libpurple/protocols/silc10/ops.c:1720
+#: ../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:1563
+#: ../libpurple/protocols/jabber/jabber.c:1563
 msgid "Host Gone"
 msgstr "Server hat sich verabschiedet"
 
-#: libpurple/protocols/jabber/jabber.c:1565
+#: ../libpurple/protocols/jabber/jabber.c:1565
 msgid "Host Unknown"
 msgstr "Rechner unbekannt"
 
-#: libpurple/protocols/jabber/jabber.c:1567
+#: ../libpurple/protocols/jabber/jabber.c:1567
 msgid "Improper Addressing"
 msgstr "Falsche Adressierung"
 
-#: libpurple/protocols/jabber/jabber.c:1571
+#: ../libpurple/protocols/jabber/jabber.c:1571
 msgid "Invalid ID"
 msgstr "Ungültige ID"
 
-#: libpurple/protocols/jabber/jabber.c:1573
+#: ../libpurple/protocols/jabber/jabber.c:1573
 msgid "Invalid Namespace"
 msgstr "Ungültiger Namenraum"
 
-#: libpurple/protocols/jabber/jabber.c:1575
+#: ../libpurple/protocols/jabber/jabber.c:1575
 msgid "Invalid XML"
 msgstr "Ungültiges XML"
 
-#: libpurple/protocols/jabber/jabber.c:1577
+#: ../libpurple/protocols/jabber/jabber.c:1577
 msgid "Non-matching Hosts"
 msgstr "Nicht-passender Rechner"
 
-#: libpurple/protocols/jabber/jabber.c:1581
+#: ../libpurple/protocols/jabber/jabber.c:1581
 msgid "Policy Violation"
 msgstr "Richtlinien-Verletzung"
 
-#: libpurple/protocols/jabber/jabber.c:1583
+#: ../libpurple/protocols/jabber/jabber.c:1583
 msgid "Remote Connection Failed"
 msgstr "Entfernte Verbindung fehlgeschlagen"
 
-#: libpurple/protocols/jabber/jabber.c:1585
+#: ../libpurple/protocols/jabber/jabber.c:1585
 msgid "Resource Constraint"
 msgstr "Eingeschränkte Ressourcen"
 
-#: libpurple/protocols/jabber/jabber.c:1587
+#: ../libpurple/protocols/jabber/jabber.c:1587
 msgid "Restricted XML"
 msgstr "Eingeschränktes XML"
 
-#: libpurple/protocols/jabber/jabber.c:1589
+#: ../libpurple/protocols/jabber/jabber.c:1589
 msgid "See Other Host"
 msgstr "Siehe anderer Rechner"
 
-#: libpurple/protocols/jabber/jabber.c:1591
+#: ../libpurple/protocols/jabber/jabber.c:1591
 msgid "System Shutdown"
 msgstr "Herunterfahren des Systems"
 
-#: libpurple/protocols/jabber/jabber.c:1593
+#: ../libpurple/protocols/jabber/jabber.c:1593
 msgid "Undefined Condition"
 msgstr "Undefinierte Bedingung"
 
-#: libpurple/protocols/jabber/jabber.c:1595
+#: ../libpurple/protocols/jabber/jabber.c:1595
 msgid "Unsupported Encoding"
 msgstr "Kodierung wird nicht unterstützt"
 
-#: libpurple/protocols/jabber/jabber.c:1597
+#: ../libpurple/protocols/jabber/jabber.c:1597
 msgid "Unsupported Stanza Type"
 msgstr "Nicht-unterstützter Blocktyp"
 
-#: libpurple/protocols/jabber/jabber.c:1599
+#: ../libpurple/protocols/jabber/jabber.c:1599
 msgid "Unsupported Version"
 msgstr "Nicht-unterstützte Version"
 
-#: libpurple/protocols/jabber/jabber.c:1601
+#: ../libpurple/protocols/jabber/jabber.c:1601
 msgid "XML Not Well Formed"
 msgstr "XML ist nicht „wohlgeformt“"
 
-#: libpurple/protocols/jabber/jabber.c:1603
+#: ../libpurple/protocols/jabber/jabber.c:1603
 msgid "Stream Error"
 msgstr "Stream-Fehler"
 
-#: libpurple/protocols/jabber/jabber.c:1670
+#: ../libpurple/protocols/jabber/jabber.c:1686
 #, c-format
 msgid "Unable to ban user %s"
 msgstr "Kann den Benutzer %s nicht verbannen"
 
-#: libpurple/protocols/jabber/jabber.c:1690
+#: ../libpurple/protocols/jabber/jabber.c:1706
 #, c-format
 msgid "Unknown affiliation: \"%s\""
 msgstr "Unbekannte Zugehörigkeit: „%s“"
 
-#: libpurple/protocols/jabber/jabber.c:1695
+#: ../libpurple/protocols/jabber/jabber.c:1711
 #, c-format
 msgid "Unable to affiliate user %s as \"%s\""
 msgstr "Kann den Benutzer %s nicht zu „%s“ zuordnen"
 
-#: libpurple/protocols/jabber/jabber.c:1714
+#: ../libpurple/protocols/jabber/jabber.c:1730
 #, c-format
 msgid "Unknown role: \"%s\""
 msgstr "Unbekannte Rolle: „%s“"
 
-#: libpurple/protocols/jabber/jabber.c:1721
+#: ../libpurple/protocols/jabber/jabber.c:1735
 #, 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:1774
+#: ../libpurple/protocols/jabber/jabber.c:1788
 #, c-format
 msgid "Unable to kick user %s"
 msgstr "Kann den Benutzer %s nicht herauswerfen"
 
-#: libpurple/protocols/jabber/jabber.c:1805
+#: ../libpurple/protocols/jabber/jabber.c:1822
 msgid "config:  Configure a chat room."
 msgstr "config:  Konfiguriere einen Chatraum."
 
-#: libpurple/protocols/jabber/jabber.c:1809
+#: ../libpurple/protocols/jabber/jabber.c:1826
 msgid "configure:  Configure a chat room."
 msgstr "configure:  Konfiguriere einen Chatraum."
 
-#: libpurple/protocols/jabber/jabber.c:1818
+#: ../libpurple/protocols/jabber/jabber.c:1835
 msgid "part [room]:  Leave the room."
 msgstr "part [Raum]:  Verlasse den Raum."
 
-#: libpurple/protocols/jabber/jabber.c:1823
+#: ../libpurple/protocols/jabber/jabber.c:1840
 msgid "register:  Register with a chat room."
 msgstr "register:  Für einen Chatraum anmelden."
 
-#: libpurple/protocols/jabber/jabber.c:1829
+#: ../libpurple/protocols/jabber/jabber.c:1846
 msgid "topic [new topic]:  View or change the topic."
 msgstr "topic [neues Thema]:  Thema ändern oder anzeigen."
 
-#: libpurple/protocols/jabber/jabber.c:1835
+#: ../libpurple/protocols/jabber/jabber.c:1852
 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:1841
+#: ../libpurple/protocols/jabber/jabber.c:1858
 msgid ""
 "affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Set a user's "
 "affiliation with the room."
@@ -4926,7 +5238,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:1847
+#: ../libpurple/protocols/jabber/jabber.c:1864
 msgid ""
 "role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: Set a user's "
 "role in the room."
@@ -4934,20 +5246,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:1853
+#: ../libpurple/protocols/jabber/jabber.c:1870
 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:1859
+#: ../libpurple/protocols/jabber/jabber.c:1876
 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:1865
+#: ../libpurple/protocols/jabber/jabber.c:1882
 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:1870
+#: ../libpurple/protocols/jabber/jabber.c:1887
 msgid ""
 "msg &lt;user&gt; &lt;message&gt;:  Send a private message to another user."
 msgstr ""
@@ -4964,84 +5276,84 @@
 #. *< version
 #. *  summary
 #. *  description
-#: libpurple/protocols/jabber/libxmpp.c:169
-#: libpurple/protocols/jabber/libxmpp.c:171
+#: ../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:198 pidgin/gtkaccount.c:508
+#: ../libpurple/protocols/jabber/libxmpp.c:198 ../pidgin/gtkaccount.c:508
 msgid "Domain"
 msgstr "Domain"
 
-#: libpurple/protocols/jabber/libxmpp.c:206
+#: ../libpurple/protocols/jabber/libxmpp.c:206
 msgid "Force old (port 5223) SSL"
 msgstr "Erzwinge altes SSL (Port 5223)"
 
-#: libpurple/protocols/jabber/libxmpp.c:211
+#: ../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:216
-#: libpurple/protocols/simple/simple.c:1861
+#: ../libpurple/protocols/jabber/libxmpp.c:216
+#: ../libpurple/protocols/simple/simple.c:1861
 msgid "Connect port"
 msgstr "Verbindungsport"
 
 #. Account options
-#: libpurple/protocols/jabber/libxmpp.c:220
-#: libpurple/protocols/silc/silc.c:1914 libpurple/protocols/silc10/silc.c:1857
-#: pidgin/gtkaccount.c:837
+#: ../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"
 
-#: libpurple/protocols/jabber/message.c:102
+#: ../libpurple/protocols/jabber/message.c:102
 #, c-format
 msgid "%s has left the conversation."
 msgstr "%s hat das Gespräch verlassen."
 
-#: libpurple/protocols/jabber/message.c:153
+#: ../libpurple/protocols/jabber/message.c:153
 #, c-format
 msgid "Message from %s"
 msgstr "Nachricht von %s"
 
-#: libpurple/protocols/jabber/message.c:217
+#: ../libpurple/protocols/jabber/message.c:217
 #, c-format
 msgid "%s has set the topic to: %s"
 msgstr "%s hat das Thema zu %s abgeändert"
 
-#: libpurple/protocols/jabber/message.c:219
+#: ../libpurple/protocols/jabber/message.c:219
 #, c-format
 msgid "The topic is: %s"
 msgstr "Das Thema ist: %s"
 
-#: libpurple/protocols/jabber/message.c:267
+#: ../libpurple/protocols/jabber/message.c:267
 #, c-format
 msgid "Message delivery to %s failed: %s"
 msgstr "Nachrichtenzustellung an %s fehlgeschlagen: %s"
 
-#: libpurple/protocols/jabber/message.c:270
+#: ../libpurple/protocols/jabber/message.c:270
 msgid "XMPP Message Error"
 msgstr "XMPP-Nachrichtenfehler"
 
-#: libpurple/protocols/jabber/message.c:359
+#: ../libpurple/protocols/jabber/message.c:359
 #, c-format
 msgid " (Code %s)"
 msgstr " (Code %s)"
 
-#: libpurple/protocols/jabber/parser.c:193
+#: ../libpurple/protocols/jabber/parser.c:193
 msgid "XML Parse error"
 msgstr "Fehler bei Einlesen von XML-Daten"
 
-#: libpurple/protocols/jabber/presence.c:290
+#: ../libpurple/protocols/jabber/presence.c:292
 msgid "Unknown Error in presence"
 msgstr "Unbekannter Fehlercode"
 
-#: libpurple/protocols/jabber/presence.c:364
-#: libpurple/protocols/jabber/presence.c:365
+#: ../libpurple/protocols/jabber/presence.c:366
+#: ../libpurple/protocols/jabber/presence.c:367
 msgid "Create New Room"
 msgstr "Einen neuen Chat-Raum erstellen"
 
-#: libpurple/protocols/jabber/presence.c:366
+#: ../libpurple/protocols/jabber/presence.c:368
 msgid ""
 "You are creating a new room.  Would you like to configure it, or accept the "
 "default settings?"
@@ -5049,68 +5361,69 @@
 "Sie erstellen einen neuen Chat-Raum.  Möchten Sie den Raum konfigurieren "
 "oder akzeptieren Sie die Standardeinstellungen?"
 
-#: libpurple/protocols/jabber/presence.c:372
+#: ../libpurple/protocols/jabber/presence.c:374
 msgid "_Configure Room"
 msgstr "Raum _konfigurieren"
 
-#: libpurple/protocols/jabber/presence.c:373
+#: ../libpurple/protocols/jabber/presence.c:375
 msgid "_Accept Defaults"
 msgstr "Standards _akzeptieren"
 
-#: libpurple/protocols/jabber/presence.c:415
+#: ../libpurple/protocols/jabber/presence.c:417
 #, c-format
 msgid "Error in chat %s"
 msgstr "Fehler im Chat %s"
 
-#: libpurple/protocols/jabber/presence.c:418
+#: ../libpurple/protocols/jabber/presence.c:421
 #, c-format
 msgid "Error joining chat %s"
 msgstr "Fehler beim Betreten des Chats %s"
 
-#: libpurple/protocols/jabber/si.c:769
+#: ../libpurple/protocols/jabber/si.c:769
 #, c-format
 msgid "Unable to send file to %s, user does not support file transfers"
 msgstr ""
 "Kann die Datei nicht an %s senden, da der Client des Benutzers keine "
 "Dateiübertragung unterstützt"
 
-#: libpurple/protocols/jabber/si.c:770 libpurple/protocols/jabber/si.c:771
-#: libpurple/protocols/jabber/si.c:839
+#: ../libpurple/protocols/jabber/si.c:770
+#: ../libpurple/protocols/jabber/si.c:771
+#: ../libpurple/protocols/jabber/si.c:839
 msgid "File Send Failed"
 msgstr "Senden der Datei gescheitert"
 
-#: libpurple/protocols/jabber/si.c:832
+#: ../libpurple/protocols/jabber/si.c:832
 #, c-format
 msgid "Unable to send file to %s, invalid JID"
 msgstr "Kann die Nachricht an %s nicht senden, ungültige JID"
 
-#: libpurple/protocols/jabber/si.c:834
+#: ../libpurple/protocols/jabber/si.c:834
 #, c-format
 msgid "Unable to send file to %s, user is not online"
 msgstr "Kann die Datei nicht an %s senden, Benutzer ist nicht online"
 
-#: libpurple/protocols/jabber/si.c:836
+#: ../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"
 
-#: libpurple/protocols/jabber/si.c:851
+#: ../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"
 
-#: libpurple/protocols/jabber/si.c:867
+#: ../libpurple/protocols/jabber/si.c:867
 msgid "Select a Resource"
 msgstr "Wählen Sie eine Ressource"
 
-#: libpurple/protocols/msn/dialog.c:110
+#: ../libpurple/protocols/msn/dialog.c:110
 #, c-format
 msgid "Buddy list synchronization issue in %s (%s)"
 msgstr "Fehler bei der Buddy-Listen-Synchronisation bei %s (%s)"
 
-#: libpurple/protocols/msn/dialog.c:116
+#: ../libpurple/protocols/msn/dialog.c:116
 #, c-format
 msgid ""
 "%s on the local list is inside the group \"%s\" but not on the server list. "
@@ -5119,7 +5432,7 @@
 "%s auf der lokalen Liste ist in der Gruppe „%s“, aber nicht auf der "
 "Serverliste. Möchten Sie, dass der Buddy hinzugefügt wird?"
 
-#: libpurple/protocols/msn/dialog.c:124
+#: ../libpurple/protocols/msn/dialog.c:124
 #, c-format
 msgid ""
 "%s is on the local list but not on the server list. Do you want this buddy "
@@ -5128,318 +5441,270 @@
 "%s ist auf der lokalen Liste, aber nicht auf der Serverliste. Möchten Sie, "
 "dass der Buddy hinzugefügt wird?"
 
-#: libpurple/protocols/msn/error.c:36
-#, c-format
+#: ../libpurple/protocols/msn/error.c:36
 msgid "Unable to parse message"
 msgstr "Kann die Nachricht nicht parsen"
 
-#: libpurple/protocols/msn/error.c:41
-#, c-format
+#: ../libpurple/protocols/msn/error.c:41
 msgid "Syntax Error (probably a client bug)"
 msgstr "Syntaxfehler (wahrscheinlich ein Client-Bug)"
 
-#: libpurple/protocols/msn/error.c:46
-#, c-format
+#: ../libpurple/protocols/msn/error.c:46
 msgid "Invalid e-mail address"
 msgstr "Ungültige E-Mail-Adresse"
 
-#: libpurple/protocols/msn/error.c:49
-#, c-format
+#: ../libpurple/protocols/msn/error.c:49
 msgid "User does not exist"
 msgstr "Benutzer existiert nicht"
 
-#: libpurple/protocols/msn/error.c:53
-#, c-format
+#: ../libpurple/protocols/msn/error.c:53
 msgid "Fully qualified domain name missing"
 msgstr "Der Fully Qualified Domain Name fehlt"
 
-#: libpurple/protocols/msn/error.c:56
-#, c-format
+#: ../libpurple/protocols/msn/error.c:56
 msgid "Already logged in"
 msgstr "Schon angemeldet"
 
-#: libpurple/protocols/msn/error.c:59
-#, c-format
+#: ../libpurple/protocols/msn/error.c:59
 msgid "Invalid screen name"
 msgstr "Ungültiger Benutzername"
 
-#: libpurple/protocols/msn/error.c:62
-#, c-format
+#: ../libpurple/protocols/msn/error.c:62
 msgid "Invalid friendly name"
 msgstr "Ungültiger Freundesname"
 
-#: libpurple/protocols/msn/error.c:65
-#, c-format
+#: ../libpurple/protocols/msn/error.c:65
 msgid "List full"
 msgstr "Liste voll"
 
-#: libpurple/protocols/msn/error.c:68
-#, c-format
+#: ../libpurple/protocols/msn/error.c:68
 msgid "Already there"
 msgstr "Schon da"
 
-#: libpurple/protocols/msn/error.c:72
-#, c-format
+#: ../libpurple/protocols/msn/error.c:72
 msgid "Not on list"
 msgstr "Nicht auf der Liste"
 
-#: libpurple/protocols/msn/error.c:75 libpurple/protocols/zephyr/zephyr.c:756
-#, c-format
+#: ../libpurple/protocols/msn/error.c:75
+#: ../libpurple/protocols/zephyr/zephyr.c:756
 msgid "User is offline"
 msgstr "Benutzer ist offline"
 
-#: libpurple/protocols/msn/error.c:78
-#, c-format
+#: ../libpurple/protocols/msn/error.c:78
 msgid "Already in the mode"
 msgstr "Bereits in diesem Modus"
 
-#: libpurple/protocols/msn/error.c:82
-#, c-format
+#: ../libpurple/protocols/msn/error.c:82
 msgid "Already in opposite list"
 msgstr "Bereits in der „Gegenteil-Liste“"
 
-#: libpurple/protocols/msn/error.c:86
-#, c-format
+#: ../libpurple/protocols/msn/error.c:86
 msgid "Too many groups"
 msgstr "Zu viele Gruppen"
 
-#: libpurple/protocols/msn/error.c:89
-#, c-format
+#: ../libpurple/protocols/msn/error.c:89
 msgid "Invalid group"
 msgstr "Ungültige Gruppe"
 
-#: libpurple/protocols/msn/error.c:92
-#, c-format
+#: ../libpurple/protocols/msn/error.c:92
 msgid "User not in group"
 msgstr "Benutzer ist nicht in der Gruppe"
 
-#: libpurple/protocols/msn/error.c:95
-#, c-format
+#: ../libpurple/protocols/msn/error.c:95
 msgid "Group name too long"
 msgstr "Name der Gruppe ist zu lang"
 
-#: libpurple/protocols/msn/error.c:98
-#, c-format
+#: ../libpurple/protocols/msn/error.c:98
 msgid "Cannot remove group zero"
 msgstr "Kann die Gruppe „Null“ nicht entfernen"
 
-#: libpurple/protocols/msn/error.c:103
-#, c-format
+#: ../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"
 
-#: libpurple/protocols/msn/error.c:107
-#, c-format
+#: ../libpurple/protocols/msn/error.c:107
 msgid "Switchboard failed"
 msgstr "Vermittlung gescheitert"
 
-#: libpurple/protocols/msn/error.c:111
-#, c-format
+#: ../libpurple/protocols/msn/error.c:111
 msgid "Notify transfer failed"
 msgstr "Übertragung der Benachrichtigung gescheitert"
 
-#: libpurple/protocols/msn/error.c:116
-#, c-format
+#: ../libpurple/protocols/msn/error.c:116
 msgid "Required fields missing"
 msgstr "Notwendige Felder fehlen"
 
-#: libpurple/protocols/msn/error.c:120
-#, c-format
+#: ../libpurple/protocols/msn/error.c:120
 msgid "Too many hits to a FND"
 msgstr "Zu viele Treffer zu einem FND"
 
-#: libpurple/protocols/msn/error.c:124 libpurple/protocols/oscar/oscar.c:119
-#, c-format
+#: ../libpurple/protocols/msn/error.c:124
+#: ../libpurple/protocols/oscar/oscar.c:119
 msgid "Not logged in"
 msgstr "Nicht angemeldet"
 
-#: libpurple/protocols/msn/error.c:128
-#, c-format
+#: ../libpurple/protocols/msn/error.c:128
 msgid "Service temporarily unavailable"
 msgstr "Dienst momentan nicht verfügbar"
 
-#: libpurple/protocols/msn/error.c:131
-#, c-format
+#: ../libpurple/protocols/msn/error.c:131
 msgid "Database server error"
 msgstr "Fehler des Datenbank-Servers"
 
-#: libpurple/protocols/msn/error.c:135
-#, c-format
+#: ../libpurple/protocols/msn/error.c:135
 msgid "Command disabled"
 msgstr "Kommando abgeschaltet"
 
-#: libpurple/protocols/msn/error.c:139
-#, c-format
+#: ../libpurple/protocols/msn/error.c:139
 msgid "File operation error"
 msgstr "Dateiverarbeitungsfehler"
 
-#: libpurple/protocols/msn/error.c:143
-#, c-format
+#: ../libpurple/protocols/msn/error.c:143
 msgid "Memory allocation error"
 msgstr "Fehler bei der Speicheranforderung"
 
-#: libpurple/protocols/msn/error.c:147
-#, c-format
+#: ../libpurple/protocols/msn/error.c:147
 msgid "Wrong CHL value sent to server"
 msgstr "Falscher CHL-Wert zum Server gesendet"
 
-#: libpurple/protocols/msn/error.c:152
-#, c-format
+#: ../libpurple/protocols/msn/error.c:152
 msgid "Server busy"
 msgstr "Server beschäftigt"
 
-#: libpurple/protocols/msn/error.c:155 libpurple/protocols/msn/error.c:170
-#: libpurple/protocols/msn/error.c:230
-#, c-format
+#: ../libpurple/protocols/msn/error.c:155
+#: ../libpurple/protocols/msn/error.c:170
+#: ../libpurple/protocols/msn/error.c:230
 msgid "Server unavailable"
 msgstr "Server unerreichbar"
 
-#: libpurple/protocols/msn/error.c:158
-#, c-format
+#: ../libpurple/protocols/msn/error.c:158
 msgid "Peer notification server down"
 msgstr "Peer-Benachrichtigungsserver nicht erreichbar"
 
-#: libpurple/protocols/msn/error.c:162
-#, c-format
+#: ../libpurple/protocols/msn/error.c:162
 msgid "Database connect error"
 msgstr "Datenbank-Verbindungsfehler"
 
-#: libpurple/protocols/msn/error.c:167
-#, c-format
+#: ../libpurple/protocols/msn/error.c:167
 msgid "Server is going down (abandon ship)"
 msgstr "Server fährt runter (melden Sie sich ab)"
 
-#: libpurple/protocols/msn/error.c:174
-#, c-format
+#: ../libpurple/protocols/msn/error.c:174
 msgid "Error creating connection"
 msgstr "Fehler beim Herstellen der Verbindung"
 
-#: libpurple/protocols/msn/error.c:179
-#, c-format
+#: ../libpurple/protocols/msn/error.c:179
 msgid "CVR parameters are either unknown or not allowed"
 msgstr "CVR-Parameter sind entweder unbekannt oder nicht erlaubt"
 
-#: libpurple/protocols/msn/error.c:183
-#, c-format
+#: ../libpurple/protocols/msn/error.c:183
 msgid "Unable to write"
 msgstr "Schreiben nicht möglich"
 
-#: libpurple/protocols/msn/error.c:186
-#, c-format
+#: ../libpurple/protocols/msn/error.c:186
 msgid "Session overload"
 msgstr "Sitzung überlastet"
 
-#: libpurple/protocols/msn/error.c:190
-#, c-format
+#: ../libpurple/protocols/msn/error.c:190
 msgid "User is too active"
 msgstr "Benutzer ist zu aktiv"
 
-#: libpurple/protocols/msn/error.c:193
-#, c-format
+#: ../libpurple/protocols/msn/error.c:193
 msgid "Too many sessions"
 msgstr "Zu viele Sitzungen"
 
-#: libpurple/protocols/msn/error.c:196
-#, c-format
+#: ../libpurple/protocols/msn/error.c:196
 msgid "Passport not verified"
 msgstr "Passport (MSN Benutzerausweis) wurde nicht überprüft"
 
-#: libpurple/protocols/msn/error.c:199
-#, c-format
+#: ../libpurple/protocols/msn/error.c:199
 msgid "Bad friend file"
 msgstr "Falsche Friends-Datei"
 
-#: libpurple/protocols/msn/error.c:203
-#, c-format
+#: ../libpurple/protocols/msn/error.c:203
 msgid "Not expected"
 msgstr "Nicht erwartet"
 
-#: libpurple/protocols/msn/error.c:209
-#, c-format
+#: ../libpurple/protocols/msn/error.c:209
 msgid "Friendly name changes too rapidly"
 msgstr "Benutzernamen werden zu oft geändert"
 
-#: libpurple/protocols/msn/error.c:218
-#, c-format
+#: ../libpurple/protocols/msn/error.c:218
 msgid "Server too busy"
 msgstr "Server ist zu beschäftigt"
 
-#: libpurple/protocols/msn/error.c:222 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
-#, c-format
+#: ../libpurple/protocols/msn/error.c:222
+#: ../libpurple/protocols/oscar/oscar.c:1378
+#: ../libpurple/protocols/silc/silc.c:233
+#: ../libpurple/protocols/silc10/ops.c:1709
+#: ../libpurple/protocols/toc/toc.c:728 ../libpurple/proxy.c:1363
 msgid "Authentication failed"
 msgstr "Authentifizierung fehlgeschlagen"
 
-#: libpurple/protocols/msn/error.c:225
-#, c-format
+#: ../libpurple/protocols/msn/error.c:225
 msgid "Not allowed when offline"
 msgstr "Nicht erlaubt im Offline-Modus"
 
-#: libpurple/protocols/msn/error.c:233
-#, c-format
+#: ../libpurple/protocols/msn/error.c:233
 msgid "Not accepting new users"
 msgstr "Akzeptiert keine neuen Benutzer"
 
-#: libpurple/protocols/msn/error.c:237
-#, c-format
+#: ../libpurple/protocols/msn/error.c:237
 msgid "Kids Passport without parental consent"
 msgstr "Kinder-Passwort ohne die Zustimmung der Eltern"
 
-#: libpurple/protocols/msn/error.c:241
-#, c-format
+#: ../libpurple/protocols/msn/error.c:241
 msgid "Passport account not yet verified"
 msgstr "Passport-Konto wurde noch nicht überprüft"
 
-#: libpurple/protocols/msn/error.c:244
-#, c-format
+#: ../libpurple/protocols/msn/error.c:244
 msgid "Bad ticket"
 msgstr "Falsches Ticket"
 
-#: libpurple/protocols/msn/error.c:249
+#: ../libpurple/protocols/msn/error.c:249
 #, c-format
 msgid "Unknown Error Code %d"
 msgstr "Unbekannter Fehlercode %d"
 
-#: libpurple/protocols/msn/error.c:263
+#: ../libpurple/protocols/msn/error.c:263
 #, c-format
 msgid "MSN Error: %s\n"
 msgstr "MSN-Fehler: %s\n"
 
-#: libpurple/protocols/msn/msn.c:121
+#: ../libpurple/protocols/msn/msn.c:121
 msgid "You have just sent a Nudge!"
 msgstr "Sie haben gerade angeklopft!"
 
-#: libpurple/protocols/msn/msn.c:146
+#: ../libpurple/protocols/msn/msn.c:146
 msgid "Your new MSN friendly name is too long."
 msgstr "Ihr neuer MSN-Benutzername zu lang."
 
-#: libpurple/protocols/msn/msn.c:254
+#: ../libpurple/protocols/msn/msn.c:254
 msgid "Set your friendly name."
 msgstr "Setze Ihren Spitznamen."
 
-#: libpurple/protocols/msn/msn.c:255
+#: ../libpurple/protocols/msn/msn.c:255
 msgid "This is the name that other MSN buddies will see you as."
 msgstr "Das ist der Name, den andere MSN-Buddys von Ihren sehen."
 
-#: libpurple/protocols/msn/msn.c:273
+#: ../libpurple/protocols/msn/msn.c:273
 msgid "Set your home phone number."
 msgstr "Setze Ihre private Telefonnummer."
 
-#: libpurple/protocols/msn/msn.c:290
+#: ../libpurple/protocols/msn/msn.c:290
 msgid "Set your work phone number."
 msgstr "Setze Ihre geschäftliche Telefonnummer."
 
-#: libpurple/protocols/msn/msn.c:307
+#: ../libpurple/protocols/msn/msn.c:307
 msgid "Set your mobile phone number."
 msgstr "Setze Ihre Handynummer."
 
-#: libpurple/protocols/msn/msn.c:322
+#: ../libpurple/protocols/msn/msn.c:322
 msgid "Allow MSN Mobile pages?"
 msgstr "Erlaube die SMS-Seiten von MSN?"
 
-#: libpurple/protocols/msn/msn.c:323
+#: ../libpurple/protocols/msn/msn.c:323
 msgid ""
 "Do you want to allow or disallow people on your buddy list to send you MSN "
 "Mobile pages to your cell phone or other mobile device?"
@@ -5447,305 +5712,321 @@
 "Möchten Sie anderen Leuten in Ihrer Buddy-Liste erlauben oder verbieten, "
 "Ihnen Nachrichten an Ihre Handy oder an andere mobile Geräte zu senden?"
 
-#: libpurple/protocols/msn/msn.c:329
+#: ../libpurple/protocols/msn/msn.c:329
 msgid "Allow"
 msgstr "Erlauben"
 
-#: libpurple/protocols/msn/msn.c:330
+#: ../libpurple/protocols/msn/msn.c:330
 msgid "Disallow"
 msgstr "Verbieten"
 
-#: libpurple/protocols/msn/msn.c:346
+#: ../libpurple/protocols/msn/msn.c:346
 msgid "This Hotmail account may not be active."
 msgstr "Dieses Hotmail-Konto ist vielleicht nicht aktiv."
 
-#: libpurple/protocols/msn/msn.c:372
+#: ../libpurple/protocols/msn/msn.c:372
 msgid "Send a mobile message."
 msgstr "Eine SMS senden."
 
-#: libpurple/protocols/msn/msn.c:374
+#: ../libpurple/protocols/msn/msn.c:374
 msgid "Page"
 msgstr "Nachricht"
 
-#: libpurple/protocols/msn/msn.c:521
+#: ../libpurple/protocols/msn/msn.c:521
 msgid "Has you"
 msgstr "Hat Sie"
 
-#: libpurple/protocols/msn/msn.c:551 libpurple/protocols/msn/state.c:33
-#: libpurple/protocols/yahoo/yahoo.c:2899
-#: libpurple/protocols/yahoo/yahoo.c:3508
+#: ../libpurple/protocols/msn/msn.c:551 ../libpurple/protocols/msn/state.c:33
+#: ../libpurple/protocols/yahoo/yahoo.c:2916
+#: ../libpurple/protocols/yahoo/yahoo.c:3600
 msgid "Be Right Back"
 msgstr "Bin gleich zurück"
 
-#: libpurple/protocols/msn/msn.c:555 libpurple/protocols/msn/state.c:31
-#: libpurple/protocols/novell/novell.c:2822
-#: libpurple/protocols/novell/novell.c:2952
-#: libpurple/protocols/silc/buddy.c:1480 libpurple/protocols/silc/silc.c:56
-#: libpurple/protocols/silc10/buddy.c:1480
-#: libpurple/protocols/silc10/silc.c:47 libpurple/protocols/yahoo/yahoo.c:2901
-#: libpurple/protocols/yahoo/yahoo.c:3511
+#: ../libpurple/protocols/msn/msn.c:555 ../libpurple/protocols/msn/state.c:31
+#: ../libpurple/protocols/novell/novell.c:2822
+#: ../libpurple/protocols/novell/novell.c:2952
+#: ../libpurple/protocols/silc/buddy.c:1480
+#: ../libpurple/protocols/silc/silc.c:56
+#: ../libpurple/protocols/silc10/buddy.c:1480
+#: ../libpurple/protocols/silc10/silc.c:47
+#: ../libpurple/protocols/yahoo/yahoo.c:2918
+#: ../libpurple/protocols/yahoo/yahoo.c:3603
 msgid "Busy"
 msgstr "Beschäftigt"
 
-#: libpurple/protocols/msn/msn.c:559 libpurple/protocols/yahoo/yahoo.c:2909
-#: libpurple/protocols/yahoo/yahoo.c:3523
+#: ../libpurple/protocols/msn/msn.c:559
+#: ../libpurple/protocols/yahoo/yahoo.c:2926
+#: ../libpurple/protocols/yahoo/yahoo.c:3615
 msgid "On the Phone"
 msgstr "Am Telefon"
 
-#: libpurple/protocols/msn/msn.c:563 libpurple/protocols/yahoo/yahoo.c:2913
-#: libpurple/protocols/yahoo/yahoo.c:3529
+#: ../libpurple/protocols/msn/msn.c:563
+#: ../libpurple/protocols/yahoo/yahoo.c:2930
+#: ../libpurple/protocols/yahoo/yahoo.c:3621
 msgid "Out to Lunch"
 msgstr "Zur Mittagspause"
 
-#: libpurple/protocols/msn/msn.c:591
+#: ../libpurple/protocols/msn/msn.c:591
 msgid "Set Friendly Name..."
 msgstr "Setze Spitzname..."
 
-#: libpurple/protocols/msn/msn.c:596
+#: ../libpurple/protocols/msn/msn.c:596
 msgid "Set Home Phone Number..."
 msgstr "Setze private Telefonnummer..."
 
-#: libpurple/protocols/msn/msn.c:600
+#: ../libpurple/protocols/msn/msn.c:600
 msgid "Set Work Phone Number..."
 msgstr "Setze geschäftliche Telefonnummer..."
 
-#: libpurple/protocols/msn/msn.c:604
+#: ../libpurple/protocols/msn/msn.c:604
 msgid "Set Mobile Phone Number..."
 msgstr "Setze Handynummer..."
 
-#: libpurple/protocols/msn/msn.c:610
+#: ../libpurple/protocols/msn/msn.c:610
 msgid "Enable/Disable Mobile Devices..."
 msgstr "Erlaube/verbiete mobile Geräte..."
 
-#: libpurple/protocols/msn/msn.c:615
+#: ../libpurple/protocols/msn/msn.c:615
 msgid "Allow/Disallow Mobile Pages..."
 msgstr "Erlaube/verbiete mobile Webseiten..."
 
-#: libpurple/protocols/msn/msn.c:626
+#: ../libpurple/protocols/msn/msn.c:626
 msgid "Open Hotmail Inbox"
 msgstr "Öffne Hotmail-Posteingang"
 
-#: libpurple/protocols/msn/msn.c:650
+#: ../libpurple/protocols/msn/msn.c:650
 msgid "Send to Mobile"
 msgstr "Sende an mobiles Gerät"
 
-#: libpurple/protocols/msn/msn.c:660 libpurple/protocols/novell/novell.c:3408
+#: ../libpurple/protocols/msn/msn.c:660
+#: ../libpurple/protocols/novell/novell.c:3408
 msgid "Initiate _Chat"
 msgstr "Initiiere _Chat"
 
-#: libpurple/protocols/msn/msn.c:698
+#: ../libpurple/protocols/msn/msn.c:698
 msgid "SSL support is needed for MSN. Please install a supported SSL library."
 msgstr ""
 "Für MSN wird SSL-Unterstützung benötigt. Bitte installieren Sie eine "
 "unterstützte SSL-Bibliothek."
 
-#: libpurple/protocols/msn/msn.c:723
+#: ../libpurple/protocols/msn/msn.c:723
 msgid "Failed to connect to server."
 msgstr "Verbindung zum Server nicht möglich."
 
-#: libpurple/protocols/msn/msn.c:1479 libpurple/protocols/msn/msn.c:1827
-#: libpurple/protocols/yahoo/yahoo_profile.c:808
+#: ../libpurple/protocols/msn/msn.c:1479 ../libpurple/protocols/msn/msn.c:1827
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:808
 msgid "Error retrieving profile"
 msgstr "Fehler beim Empfangen des Profils"
 
-#: libpurple/protocols/msn/msn.c:1550 pidgin/plugins/convcolors.c:309
-#: pidgin/plugins/pidginrc.c:366
+#: ../libpurple/protocols/msn/msn.c:1550 ../pidgin/plugins/convcolors.c:309
+#: ../pidgin/plugins/pidginrc.c:366
 msgid "General"
 msgstr "Allgemein"
 
-#: libpurple/protocols/msn/msn.c:1557 libpurple/protocols/oscar/oscar.c:3764
-#: libpurple/protocols/qq/buddy_info.c:45 libpurple/protocols/qq/qq.c:219
-#: libpurple/protocols/yahoo/yahoo_profile.c:1081
+#: ../libpurple/protocols/msn/msn.c:1557
+#: ../libpurple/protocols/oscar/oscar.c:3723
+#: ../libpurple/protocols/qq/buddy_info.c:45
+#: ../libpurple/protocols/qq/qq.c:221
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1081
 msgid "Age"
 msgstr "Alter"
 
-#: libpurple/protocols/msn/msn.c:1559 libpurple/protocols/qq/buddy_info.c:51
-#: libpurple/protocols/yahoo/yahoo_profile.c:1096
+#: ../libpurple/protocols/msn/msn.c:1559
+#: ../libpurple/protocols/qq/buddy_info.c:51
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1096
 msgid "Occupation"
 msgstr "Beruf"
 
-#: libpurple/protocols/msn/msn.c:1560 libpurple/protocols/novell/novell.c:1478
-#: libpurple/protocols/yahoo/yahoo_profile.c:1076
-#: libpurple/protocols/zephyr/zephyr.c:798
-#: libpurple/protocols/zephyr/zephyr.c:1215
+#: ../libpurple/protocols/msn/msn.c:1560
+#: ../libpurple/protocols/novell/novell.c:1478
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1076
+#: ../libpurple/protocols/zephyr/zephyr.c:798
+#: ../libpurple/protocols/zephyr/zephyr.c:1215
 msgid "Location"
 msgstr "Ort"
 
-#: libpurple/protocols/msn/msn.c:1565 libpurple/protocols/msn/msn.c:1757
-#: libpurple/protocols/msn/msn.c:1763 libpurple/protocols/msn/msn.c:1770
+#: ../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 "Hobbys und Interessen"
 
-#: 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
+#: ../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 "Einige Informationen über mich"
 
-#: libpurple/protocols/msn/msn.c:1588
+#: ../libpurple/protocols/msn/msn.c:1588
 msgid "Social"
 msgstr "Sozial"
 
-#: libpurple/protocols/msn/msn.c:1590
-#: libpurple/protocols/yahoo/yahoo_profile.c:1086
+#: ../libpurple/protocols/msn/msn.c:1590
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1086
 msgid "Marital Status"
 msgstr "Familienstatus"
 
-#: libpurple/protocols/msn/msn.c:1591
+#: ../libpurple/protocols/msn/msn.c:1591
 msgid "Interests"
 msgstr "Interessen"
 
-#: libpurple/protocols/msn/msn.c:1592
+#: ../libpurple/protocols/msn/msn.c:1592
 msgid "Pets"
 msgstr "Haustiere"
 
-#: libpurple/protocols/msn/msn.c:1593
+#: ../libpurple/protocols/msn/msn.c:1593
 msgid "Hometown"
 msgstr "Heimatstadt"
 
-#: libpurple/protocols/msn/msn.c:1594
+#: ../libpurple/protocols/msn/msn.c:1594
 msgid "Places Lived"
 msgstr "Bisherige Wohnorte"
 
-#: libpurple/protocols/msn/msn.c:1595
+#: ../libpurple/protocols/msn/msn.c:1595
 msgid "Fashion"
 msgstr "Mode"
 
-#: libpurple/protocols/msn/msn.c:1596
+#: ../libpurple/protocols/msn/msn.c:1596
 msgid "Humor"
 msgstr "Humor"
 
-#: libpurple/protocols/msn/msn.c:1597
+#: ../libpurple/protocols/msn/msn.c:1597
 msgid "Music"
 msgstr "Musik"
 
-#: libpurple/protocols/msn/msn.c:1598 libpurple/protocols/msn/msn.c:1779
-#: libpurple/protocols/msn/msn.c:1785
-#: libpurple/protocols/yahoo/yahoo_profile.c:1138
+#: ../libpurple/protocols/msn/msn.c:1598 ../libpurple/protocols/msn/msn.c:1779
+#: ../libpurple/protocols/msn/msn.c:1785
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1138
 msgid "Favorite Quote"
 msgstr "Lieblingsspruch"
 
-#: libpurple/protocols/msn/msn.c:1615
+#: ../libpurple/protocols/msn/msn.c:1615
 msgid "Contact Info"
 msgstr "Kontakt-Info"
 
-#: libpurple/protocols/msn/msn.c:1616
+#: ../libpurple/protocols/msn/msn.c:1616
 msgid "Personal"
 msgstr "Privat"
 
-#: libpurple/protocols/msn/msn.c:1619
+#: ../libpurple/protocols/msn/msn.c:1619
 msgid "Significant Other"
 msgstr "Andere wichtige Dinge"
 
-#: libpurple/protocols/msn/msn.c:1620
+#: ../libpurple/protocols/msn/msn.c:1620
 msgid "Home Phone"
 msgstr "Telefon (privat)"
 
-#: libpurple/protocols/msn/msn.c:1621
+#: ../libpurple/protocols/msn/msn.c:1621
 msgid "Home Phone 2"
 msgstr "Telefon 2 (privat)"
 
-#: libpurple/protocols/msn/msn.c:1622 libpurple/protocols/oscar/oscar.c:3802
+#: ../libpurple/protocols/msn/msn.c:1622
+#: ../libpurple/protocols/oscar/oscar.c:3761
 msgid "Home Address"
 msgstr "Privatadresse"
 
-#: libpurple/protocols/msn/msn.c:1623
+#: ../libpurple/protocols/msn/msn.c:1623
 msgid "Personal Mobile"
 msgstr "Handy (privat)"
 
-#: libpurple/protocols/msn/msn.c:1624
+#: ../libpurple/protocols/msn/msn.c:1624
 msgid "Home Fax"
 msgstr "Fax (privat)"
 
-#: libpurple/protocols/msn/msn.c:1625
+#: ../libpurple/protocols/msn/msn.c:1625
 msgid "Personal E-Mail"
 msgstr "E-Mail (privat)"
 
-#: libpurple/protocols/msn/msn.c:1626
+#: ../libpurple/protocols/msn/msn.c:1626
 msgid "Personal IM"
 msgstr "IM (privat)"
 
-#: libpurple/protocols/msn/msn.c:1628
+#: ../libpurple/protocols/msn/msn.c:1628
 msgid "Anniversary"
 msgstr "Jahrestag"
 
 #. Business
-#: libpurple/protocols/msn/msn.c:1644
+#: ../libpurple/protocols/msn/msn.c:1644
 msgid "Work"
 msgstr "Geschäftlich"
 
-#: libpurple/protocols/msn/msn.c:1646 libpurple/protocols/silc/ops.c:1010
-#: libpurple/protocols/silc10/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 "Beruf"
 
-#: libpurple/protocols/msn/msn.c:1647 libpurple/protocols/oscar/oscar.c:3823
+#: ../libpurple/protocols/msn/msn.c:1647
+#: ../libpurple/protocols/oscar/oscar.c:3782
 msgid "Company"
 msgstr "Firma"
 
-#: libpurple/protocols/msn/msn.c:1648 libpurple/protocols/novell/novell.c:1480
+#: ../libpurple/protocols/msn/msn.c:1648
+#: ../libpurple/protocols/novell/novell.c:1480
 msgid "Department"
 msgstr "Abteilung"
 
-#: libpurple/protocols/msn/msn.c:1649
+#: ../libpurple/protocols/msn/msn.c:1649
 msgid "Profession"
 msgstr "Beruf"
 
-#: libpurple/protocols/msn/msn.c:1650
+#: ../libpurple/protocols/msn/msn.c:1650
 msgid "Work Phone"
 msgstr "Telefon (geschäftlich)"
 
-#: libpurple/protocols/msn/msn.c:1651
+#: ../libpurple/protocols/msn/msn.c:1651
 msgid "Work Phone 2"
 msgstr "Telefon 2 (geschäftlich)"
 
-#: libpurple/protocols/msn/msn.c:1652 libpurple/protocols/oscar/oscar.c:3815
+#: ../libpurple/protocols/msn/msn.c:1652
+#: ../libpurple/protocols/oscar/oscar.c:3774
 msgid "Work Address"
 msgstr "Adresse (geschäftlich)"
 
-#: libpurple/protocols/msn/msn.c:1653
+#: ../libpurple/protocols/msn/msn.c:1653
 msgid "Work Mobile"
 msgstr "Handy (geschäftlich)"
 
-#: libpurple/protocols/msn/msn.c:1654
+#: ../libpurple/protocols/msn/msn.c:1654
 msgid "Work Pager"
 msgstr "Pager (geschäftlich)"
 
-#: libpurple/protocols/msn/msn.c:1655
+#: ../libpurple/protocols/msn/msn.c:1655
 msgid "Work Fax"
 msgstr "Fax (geschäftlich)"
 
-#: libpurple/protocols/msn/msn.c:1656
+#: ../libpurple/protocols/msn/msn.c:1656
 msgid "Work E-Mail"
 msgstr "E-Mail (geschäftlich)"
 
-#: libpurple/protocols/msn/msn.c:1657
+#: ../libpurple/protocols/msn/msn.c:1657
 msgid "Work IM"
 msgstr "IM (geschäftlich)"
 
-#: libpurple/protocols/msn/msn.c:1658
+#: ../libpurple/protocols/msn/msn.c:1658
 msgid "Start Date"
 msgstr "Anfangsdatum"
 
-#: libpurple/protocols/msn/msn.c:1728 libpurple/protocols/msn/msn.c:1734
-#: libpurple/protocols/msn/msn.c:1741 libpurple/protocols/msn/msn.c:1748
+#: ../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 "Lieblingsdinge"
 
-#: libpurple/protocols/msn/msn.c:1793
+#: ../libpurple/protocols/msn/msn.c:1793
 msgid "Last Updated"
 msgstr "Zuletzt aktualisiert"
 
-#: libpurple/protocols/msn/msn.c:1804 libpurple/protocols/qq/buddy_info.c:60
-#: libpurple/protocols/silc/ops.c:1026 libpurple/protocols/silc10/ops.c:1060
+#: ../libpurple/protocols/msn/msn.c:1804
+#: ../libpurple/protocols/qq/buddy_info.c:60
+#: ../libpurple/protocols/silc/ops.c:1026
+#: ../libpurple/protocols/silc10/ops.c:1060
 msgid "Homepage"
 msgstr "Homepage"
 
-#: libpurple/protocols/msn/msn.c:1828
+#: ../libpurple/protocols/msn/msn.c:1828
 msgid "The user has not created a public profile."
 msgstr "Der Benutzer hat kein öffentliches Profil erstellt."
 
-#: libpurple/protocols/msn/msn.c:1829
+#: ../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 "
@@ -5755,7 +6036,7 @@
 "der Benutzer nicht existiert oder dass der Benutzer zwar existiert, aber "
 "kein öffentliches Profil angelegt hat."
 
-#: libpurple/protocols/msn/msn.c:1833
+#: ../libpurple/protocols/msn/msn.c:1833
 msgid ""
 "Could not find any information in the user's profile. The user most likely "
 "does not exist."
@@ -5763,8 +6044,8 @@
 "Konnte keinerlei Information im Profil des Benutzers finden. Der Benutzer "
 "existiert wahrscheinlich nicht."
 
-#: libpurple/protocols/msn/msn.c:1841
-#: libpurple/protocols/yahoo/yahoo_profile.c:1240
+#: ../libpurple/protocols/msn/msn.c:1841
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1240
 msgid "Profile URL"
 msgstr "URL des Profils"
 
@@ -5778,93 +6059,96 @@
 #. *< version
 #. *  summary
 #. *  description
-#: libpurple/protocols/msn/msn.c:2127 libpurple/protocols/msn/msn.c:2129
+#: ../libpurple/protocols/msn/msn.c:2127 ../libpurple/protocols/msn/msn.c:2129
 msgid "MSN Protocol Plugin"
 msgstr "MSN-Protokoll-Plugin"
 
-#: libpurple/protocols/msn/msn.c:2163
+#: ../libpurple/protocols/msn/msn.c:2163
 msgid "Use HTTP Method"
 msgstr "Benutze HTTP"
 
-#: libpurple/protocols/msn/msn.c:2168
+#: ../libpurple/protocols/msn/msn.c:2168
 msgid "Show custom smileys"
 msgstr "Zeige benutzerdefinierte Smileys"
 
-#: libpurple/protocols/msn/msn.c:2176
+#: ../libpurple/protocols/msn/msn.c:2176
 msgid "nudge: nudge a user to get their attention"
 msgstr "nudge: Einen Kontakt anstoßen, um seine Aufmerksamkeit zu erhalten"
 
-#: libpurple/protocols/msn/nexus.c:146 libpurple/protocols/msn/servconn.c:133
-#: libpurple/protocols/qq/qq_proxy.c:242 libpurple/protocols/qq/qq_proxy.c:321
-#: libpurple/protocols/qq/qq_proxy.c:366 libpurple/protocols/qq/qq_proxy.c:399
-#: libpurple/protocols/qq/udp_proxy_s5.c:63
-#: libpurple/protocols/qq/udp_proxy_s5.c:163
-#: libpurple/protocols/qq/udp_proxy_s5.c:187
-#: libpurple/protocols/qq/udp_proxy_s5.c:200
-#: libpurple/protocols/qq/udp_proxy_s5.c:229
-#: libpurple/protocols/qq/udp_proxy_s5.c:243
-#: libpurple/protocols/qq/udp_proxy_s5.c:268
-#: libpurple/protocols/qq/udp_proxy_s5.c:302
-#: libpurple/protocols/qq/udp_proxy_s5.c:332
-#: libpurple/protocols/yahoo/yahoochat.c:1320
-#: libpurple/protocols/yahoo/yahoochat.c:1346
+#: ../libpurple/protocols/msn/nexus.c:146
+#: ../libpurple/protocols/msn/servconn.c:133
+#: ../libpurple/protocols/qq/qq_proxy.c:242
+#: ../libpurple/protocols/qq/qq_proxy.c:321
+#: ../libpurple/protocols/qq/qq_proxy.c:366
+#: ../libpurple/protocols/qq/qq_proxy.c:399
+#: ../libpurple/protocols/qq/udp_proxy_s5.c:63
+#: ../libpurple/protocols/qq/udp_proxy_s5.c:163
+#: ../libpurple/protocols/qq/udp_proxy_s5.c:187
+#: ../libpurple/protocols/qq/udp_proxy_s5.c:200
+#: ../libpurple/protocols/qq/udp_proxy_s5.c:229
+#: ../libpurple/protocols/qq/udp_proxy_s5.c:243
+#: ../libpurple/protocols/qq/udp_proxy_s5.c:268
+#: ../libpurple/protocols/qq/udp_proxy_s5.c:302
+#: ../libpurple/protocols/qq/udp_proxy_s5.c:332
+#: ../libpurple/protocols/yahoo/yahoochat.c:1320
+#: ../libpurple/protocols/yahoo/yahoochat.c:1346
 msgid "Unable to connect"
 msgstr "Verbindung nicht möglich"
 
-#: libpurple/protocols/msn/notification.c:178
+#: ../libpurple/protocols/msn/notification.c:178
 #, c-format
 msgid "%s is not a valid group."
 msgstr "%s ist keine gültige Gruppe."
 
-#: libpurple/protocols/msn/notification.c:184
-#: libpurple/protocols/msn/notification.c:532
-#: libpurple/protocols/msn/session.c:330
+#: ../libpurple/protocols/msn/notification.c:184
+#: ../libpurple/protocols/msn/notification.c:532
+#: ../libpurple/protocols/msn/session.c:330
 msgid "Unknown error."
 msgstr "Unbekannter Fehler."
 
-#: libpurple/protocols/msn/notification.c:187
+#: ../libpurple/protocols/msn/notification.c:187
 #, c-format
 msgid "%s on %s (%s)"
 msgstr "%s auf %s (%s)"
 
-#: libpurple/protocols/msn/notification.c:498
+#: ../libpurple/protocols/msn/notification.c:498
 #, c-format
 msgid "Unable to add user on %s (%s)"
 msgstr "Kann den Benutzer nicht zu %s (%s) hinzufügen"
 
-#: libpurple/protocols/msn/notification.c:502
+#: ../libpurple/protocols/msn/notification.c:502
 #, c-format
 msgid "Unable to block user on %s (%s)"
 msgstr "Kann den Benutzer nicht für %s (%s) blockieren"
 
-#: libpurple/protocols/msn/notification.c:506
+#: ../libpurple/protocols/msn/notification.c:506
 #, c-format
 msgid "Unable to permit user on %s (%s)"
 msgstr "Kann den Benutzer nicht für %s (%s) erlauben"
 
-#: libpurple/protocols/msn/notification.c:514
+#: ../libpurple/protocols/msn/notification.c:514
 #, c-format
 msgid "%s could not be added because your buddy list is full."
 msgstr "%s konnte nicht hinzugefügt werden, da Ihre Buddy-Liste voll ist."
 
-#: libpurple/protocols/msn/notification.c:523
+#: ../libpurple/protocols/msn/notification.c:523
 #, c-format
 msgid "%s is not a valid passport account."
 msgstr "%s ist kein gültiges Passport-Konto."
 
-#: libpurple/protocols/msn/notification.c:528
+#: ../libpurple/protocols/msn/notification.c:528
 msgid "Service Temporarily Unavailable."
 msgstr "Dienst momentan nicht verfügbar."
 
-#: libpurple/protocols/msn/notification.c:851
+#: ../libpurple/protocols/msn/notification.c:851
 msgid "Unable to rename group"
 msgstr "Kann die Gruppe nicht umbenennen"
 
-#: libpurple/protocols/msn/notification.c:906
+#: ../libpurple/protocols/msn/notification.c:906
 msgid "Unable to delete group"
 msgstr "Kann die Gruppe nicht löschen"
 
-#: libpurple/protocols/msn/notification.c:1325
+#: ../libpurple/protocols/msn/notification.c:1325
 #, c-format
 msgid ""
 "The MSN server will shut down for maintenance in %d minute. You will "
@@ -5895,15 +6179,15 @@
 "Nach Beendigung der Wartungsarbeiten können Sie sich wieder problemlos "
 "anmelden."
 
-#: libpurple/protocols/msn/servconn.c:135
+#: ../libpurple/protocols/msn/servconn.c:135
 msgid "Writing error"
 msgstr "Schreibfehler"
 
-#: libpurple/protocols/msn/servconn.c:137
+#: ../libpurple/protocols/msn/servconn.c:137
 msgid "Reading error"
 msgstr "Fehler beim Lesen"
 
-#: libpurple/protocols/msn/servconn.c:144
+#: ../libpurple/protocols/msn/servconn.c:144
 #, c-format
 msgid ""
 "Connection error from %s server:\n"
@@ -5912,101 +6196,102 @@
 "Verbindungsfehler vom %s-Server:\n"
 "%s"
 
-#: libpurple/protocols/msn/session.c:299
+#: ../libpurple/protocols/msn/session.c:299
 msgid "Our protocol is not supported by the server."
 msgstr "Unser Protokoll wird vom Server nicht unterstützt."
 
-#: libpurple/protocols/msn/session.c:303
+#: ../libpurple/protocols/msn/session.c:303
 msgid "Error parsing HTTP."
 msgstr "Fehler beim Verarbeiten von HTTP."
 
-#: libpurple/protocols/msn/session.c:307
-#: libpurple/protocols/oscar/flap_connection.c:384
-#: libpurple/protocols/yahoo/yahoo.c:202
+#: ../libpurple/protocols/msn/session.c:307
+#: ../libpurple/protocols/oscar/flap_connection.c:384
+#: ../libpurple/protocols/yahoo/yahoo.c:205
 msgid "You have signed on from another location."
 msgstr "Sie haben sich von einem anderen Ort angemeldet."
 
-#: libpurple/protocols/msn/session.c:310
+#: ../libpurple/protocols/msn/session.c:310
 msgid "The MSN servers are temporarily unavailable. Please wait and try again."
 msgstr ""
 "Die MSN-Server sind temporär nicht verfügbar. Bitte warten Sie und versuchen "
 "Sie es später nochmal."
 
-#: libpurple/protocols/msn/session.c:315
+#: ../libpurple/protocols/msn/session.c:315
 msgid "The MSN servers are going down temporarily."
 msgstr "Die MSN-Server werden kurzzeitig heruntergefahren."
 
-#: libpurple/protocols/msn/session.c:320
+#: ../libpurple/protocols/msn/session.c:320
 #, c-format
 msgid "Unable to authenticate: %s"
 msgstr "Kann nicht authentifizieren: %s"
 
-#: libpurple/protocols/msn/session.c:325
+#: ../libpurple/protocols/msn/session.c:325
 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."
 
-#: libpurple/protocols/msn/session.c:346 libpurple/protocols/msn/session.c:348
+#: ../libpurple/protocols/msn/session.c:346
+#: ../libpurple/protocols/msn/session.c:348
 msgid "Handshaking"
 msgstr "Händedruck"
 
-#: libpurple/protocols/msn/session.c:349
+#: ../libpurple/protocols/msn/session.c:349
 msgid "Starting authentication"
 msgstr "Starte Authentifizierung"
 
-#: libpurple/protocols/msn/session.c:350
+#: ../libpurple/protocols/msn/session.c:350
 msgid "Getting cookie"
 msgstr "Cookie erhalten"
 
-#: libpurple/protocols/msn/session.c:352
+#: ../libpurple/protocols/msn/session.c:352
 msgid "Sending cookie"
 msgstr "Cookie senden"
 
-#: libpurple/protocols/msn/session.c:353
+#: ../libpurple/protocols/msn/session.c:353
 msgid "Retrieving buddy list"
 msgstr "Abfragen der Buddy-Liste"
 
-#: libpurple/protocols/msn/state.c:34
+#: ../libpurple/protocols/msn/state.c:34
 msgid "Away From Computer"
 msgstr "Abwesend"
 
-#: libpurple/protocols/msn/state.c:35
+#: ../libpurple/protocols/msn/state.c:35
 msgid "On The Phone"
 msgstr "Am Telefon"
 
-#: libpurple/protocols/msn/state.c:36
+#: ../libpurple/protocols/msn/state.c:36
 msgid "Out To Lunch"
 msgstr "Mittagspause"
 
-#: libpurple/protocols/msn/switchboard.c:400
+#: ../libpurple/protocols/msn/switchboard.c:400
 msgid "Message may have not been sent because a timeout occurred:"
 msgstr ""
 "Nachricht konnte evtl. nicht gesendet werden, da eine Zeitüberschreitung "
 "aufgetreten ist:"
 
-#: libpurple/protocols/msn/switchboard.c:408
+#: ../libpurple/protocols/msn/switchboard.c:408
 msgid "Message could not be sent, not allowed while invisible:"
 msgstr ""
 "Nachricht konnte nicht gesendet werden, da dies nicht erlaubt ist, wenn Sie "
 "unsichtbar angemeldet sind:"
 
-#: libpurple/protocols/msn/switchboard.c:412
+#: ../libpurple/protocols/msn/switchboard.c:412
 msgid "Message could not be sent because the user is offline:"
 msgstr "Nachricht konnte nicht gesendet werden, da der Benutzer offline ist:"
 
-#: libpurple/protocols/msn/switchboard.c:416
+#: ../libpurple/protocols/msn/switchboard.c:416
 msgid "Message could not be sent because a connection error occurred:"
 msgstr ""
 "Nachricht konnte nicht gesendet werden, da ein Verbindungsfehler aufgetreten "
 "ist:"
 
-#: libpurple/protocols/msn/switchboard.c:420
+#: ../libpurple/protocols/msn/switchboard.c:420
 msgid "Message could not be sent because we are sending too quickly:"
 msgstr "Nachricht konnte nicht gesendet werden, da wir zu schnell senden:"
 
-#: libpurple/protocols/msn/switchboard.c:424
+#: ../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:"
@@ -6015,215 +6300,215 @@
 "hergestellt werden konnte. Dies ist wahrscheinlich ein Server-Problem, "
 "versuchen Sie es in ein paar Minuten erneut:"
 
-#: libpurple/protocols/msn/switchboard.c:431
+#: ../libpurple/protocols/msn/switchboard.c:431
 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:"
 
-#: libpurple/protocols/msn/switchboard.c:439
+#: ../libpurple/protocols/msn/switchboard.c:439
 msgid "Message may have not been sent because an unknown error occurred:"
 msgstr ""
 "Nachricht konnte nicht gesendet werden, da ein unbekannter Fehler "
 "aufgetreten ist:"
 
-#: libpurple/protocols/msn/switchboard.c:963
+#: ../libpurple/protocols/msn/switchboard.c:963
 #, c-format
 msgid "%s just sent you a Nudge!"
 msgstr "%s hat Sie gerade angestoßen!"
 
-#: libpurple/protocols/msn/userlist.c:250
+#: ../libpurple/protocols/msn/userlist.c:252
 #, c-format
 msgid "%s has added you to his or her buddy list."
 msgstr "Der Benutzer %s hat Sie zu seiner Buddy-Liste hinzugefügt."
 
-#: libpurple/protocols/msn/userlist.c:319
+#: ../libpurple/protocols/msn/userlist.c:321
 #, c-format
 msgid "%s has removed you from his or her buddy list."
 msgstr "Der Benutzer %s hat Sie von seiner Buddy-Liste gelöscht."
 
-#: libpurple/protocols/msn/userlist.c:641
+#: ../libpurple/protocols/msn/userlist.c:643
 #, c-format
 msgid "Unable to add \"%s\"."
 msgstr "Kann „%s“ nicht hinzufügen."
 
-#: libpurple/protocols/msn/userlist.c:643
+#: ../libpurple/protocols/msn/userlist.c:645
 msgid "The screen name specified is invalid."
 msgstr "Der angegebene Benutzername ist ungültig."
 
-#: libpurple/protocols/novell/nmuser.c:1864
+#: ../libpurple/protocols/novell/nmuser.c:1864
 msgid "Required parameters not passed in"
 msgstr "Erforderliche Parameter nicht übergeben"
 
-#: libpurple/protocols/novell/nmuser.c:1867
+#: ../libpurple/protocols/novell/nmuser.c:1867
 msgid "Unable to write to network"
 msgstr "Kann nicht zum Netzwerk senden"
 
-#: libpurple/protocols/novell/nmuser.c:1870
+#: ../libpurple/protocols/novell/nmuser.c:1870
 msgid "Unable to read from network"
 msgstr "Kann vom Netzwerk empfangen"
 
-#: libpurple/protocols/novell/nmuser.c:1873
+#: ../libpurple/protocols/novell/nmuser.c:1873
 msgid "Error communicating with server"
 msgstr "Kommunikationsfehler mit dem Server"
 
-#: libpurple/protocols/novell/nmuser.c:1877
+#: ../libpurple/protocols/novell/nmuser.c:1877
 msgid "Conference not found"
 msgstr "Konferenz nicht gefunden"
 
-#: libpurple/protocols/novell/nmuser.c:1880
+#: ../libpurple/protocols/novell/nmuser.c:1880
 msgid "Conference does not exist"
 msgstr "Konferenz existiert nicht"
 
-#: libpurple/protocols/novell/nmuser.c:1884
+#: ../libpurple/protocols/novell/nmuser.c:1884
 msgid "A folder with that name already exists"
 msgstr "Ein Ordner mit dem Namen existiert schon"
 
-#: libpurple/protocols/novell/nmuser.c:1887
+#: ../libpurple/protocols/novell/nmuser.c:1887
 msgid "Not supported"
 msgstr "Nicht unterstützt"
 
-#: libpurple/protocols/novell/nmuser.c:1891
+#: ../libpurple/protocols/novell/nmuser.c:1891
 msgid "Password has expired"
 msgstr "Passwort ist abgelaufen"
 
-#: libpurple/protocols/novell/nmuser.c:1894
+#: ../libpurple/protocols/novell/nmuser.c:1894
 msgid "Incorrect password"
 msgstr "Falsches Passwort"
 
-#: libpurple/protocols/novell/nmuser.c:1897
+#: ../libpurple/protocols/novell/nmuser.c:1897
 msgid "User not found"
 msgstr "Benutzer nicht gefunden"
 
-#: libpurple/protocols/novell/nmuser.c:1900
+#: ../libpurple/protocols/novell/nmuser.c:1900
 msgid "Account has been disabled"
 msgstr "Konto wurde deaktiviert"
 
-#: libpurple/protocols/novell/nmuser.c:1903
+#: ../libpurple/protocols/novell/nmuser.c:1903
 msgid "The server could not access the directory"
 msgstr "Server konnte nicht auf das Verzeichnis zugreifen"
 
-#: libpurple/protocols/novell/nmuser.c:1906
+#: ../libpurple/protocols/novell/nmuser.c:1906
 msgid "Your system administrator has disabled this operation"
 msgstr "Ihr Systemadministrator hat diese Operation deaktiviert"
 
-#: libpurple/protocols/novell/nmuser.c:1909
+#: ../libpurple/protocols/novell/nmuser.c:1909
 msgid "The server is unavailable; try again later"
 msgstr "Der Server ist nicht erreichbar; Versuchen Sie es später nochmal"
 
-#: libpurple/protocols/novell/nmuser.c:1912
+#: ../libpurple/protocols/novell/nmuser.c:1912
 msgid "Cannot add a contact to the same folder twice"
 msgstr "Kann einen Kontakt nicht zweimal zum gleichen Ordner hinzufügen"
 
-#: libpurple/protocols/novell/nmuser.c:1915
+#: ../libpurple/protocols/novell/nmuser.c:1915
 msgid "Cannot add yourself"
 msgstr "Kann Sie nicht selbst hinzufügen"
 
-#: libpurple/protocols/novell/nmuser.c:1918
+#: ../libpurple/protocols/novell/nmuser.c:1918
 msgid "Master archive is misconfigured"
 msgstr "Master-Archiv ist falsch konfiguriert"
 
-#: libpurple/protocols/novell/nmuser.c:1922
+#: ../libpurple/protocols/novell/nmuser.c:1922
 msgid "Incorrect screen name or password"
 msgstr "Falscher Benutzername oder falsches Passwort"
 
-#: libpurple/protocols/novell/nmuser.c:1925
+#: ../libpurple/protocols/novell/nmuser.c:1925
 msgid "Could not recognize the host of the screen name you entered"
 msgstr ""
 "Konnte den Rechnernamen des Benutzers, den Sie eingegeben haben, nicht "
 "erkennen"
 
-#: libpurple/protocols/novell/nmuser.c:1928
+#: ../libpurple/protocols/novell/nmuser.c:1928
 msgid ""
 "Your account has been disabled because too many incorrect passwords were "
 "entered"
 msgstr ""
 "Ihr Konto wurde wegen zu vielen falsch eingegebenen Passworten gesperrt"
 
-#: libpurple/protocols/novell/nmuser.c:1931
+#: ../libpurple/protocols/novell/nmuser.c:1931
 msgid "You cannot add the same person twice to a conversation"
 msgstr "Sie können die selbe Person nicht zweimal zu einem Gespräch hinzufügen"
 
-#: libpurple/protocols/novell/nmuser.c:1935
+#: ../libpurple/protocols/novell/nmuser.c:1935
 msgid "You have reached your limit for the number of contacts allowed"
 msgstr "Sie haben die Grenze der maximal erlaubten Kontakte erreicht"
 
-#: libpurple/protocols/novell/nmuser.c:1938
+#: ../libpurple/protocols/novell/nmuser.c:1938
 msgid "You have entered an incorrect screen name"
 msgstr "Sie haben einen falschen Benutzernamen eingegeben"
 
-#: libpurple/protocols/novell/nmuser.c:1941
+#: ../libpurple/protocols/novell/nmuser.c:1941
 msgid "An error occurred while updating the directory"
 msgstr "Beim Aktualisieren des Verzeichnisses trat ein Fehler auf"
 
-#: libpurple/protocols/novell/nmuser.c:1944
+#: ../libpurple/protocols/novell/nmuser.c:1944
 msgid "Incompatible protocol version"
 msgstr "Inkompatible Protokollversion"
 
-#: libpurple/protocols/novell/nmuser.c:1947
+#: ../libpurple/protocols/novell/nmuser.c:1947
 msgid "The user has blocked you"
 msgstr "Der Benutzer hat Sie blockiert"
 
-#: libpurple/protocols/novell/nmuser.c:1950
+#: ../libpurple/protocols/novell/nmuser.c:1950
 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"
 
-#: libpurple/protocols/novell/nmuser.c:1953
+#: ../libpurple/protocols/novell/nmuser.c:1953
 msgid "The user is either offline or you are blocked"
 msgstr "Der Benutzer ist entweder offline oder Sie werden blockiert"
 
-#: libpurple/protocols/novell/nmuser.c:1956
+#: ../libpurple/protocols/novell/nmuser.c:1956
 #, c-format
 msgid "Unknown error: 0x%X"
 msgstr "Unbekannter Fehler: 0x%X"
 
-#: libpurple/protocols/novell/novell.c:124
+#: ../libpurple/protocols/novell/novell.c:124
 #, c-format
 msgid "Login failed (%s)."
 msgstr "Anmeldung fehlgeschlagen (%s)."
 
-#: libpurple/protocols/novell/novell.c:247
+#: ../libpurple/protocols/novell/novell.c:247
 #, c-format
 msgid "Unable to send message. Could not get details for user (%s)."
 msgstr ""
 "Kann die Nachricht nicht senden. Kann die Details vom Benutzer nicht holen (%"
 "s)."
 
-#: libpurple/protocols/novell/novell.c:396
+#: ../libpurple/protocols/novell/novell.c:396
 #, c-format
 msgid "Unable to add %s to your buddy list (%s)."
 msgstr "Kann %s nicht zu Ihrer Buddy-Liste hinzufügen (%s)."
 
 #. TODO: Improve this! message to who or for what conference?
-#: libpurple/protocols/novell/novell.c:422
+#: ../libpurple/protocols/novell/novell.c:422
 #, c-format
 msgid "Unable to send message (%s)."
 msgstr "Kann die Nachricht nicht senden (%s)."
 
-#: libpurple/protocols/novell/novell.c:493
-#: libpurple/protocols/novell/novell.c:985
+#: ../libpurple/protocols/novell/novell.c:493
+#: ../libpurple/protocols/novell/novell.c:985
 #, c-format
 msgid "Unable to invite user (%s)."
 msgstr "Kann den Benutzer nicht einladen (%s)."
 
-#: libpurple/protocols/novell/novell.c:532
+#: ../libpurple/protocols/novell/novell.c:532
 #, c-format
 msgid "Unable to send message to %s. Could not create the conference (%s)."
 msgstr ""
 "Kann die Nachricht nicht an %s senden. Kann die Konferenz nicht erstellen (%"
 "s)."
 
-#: libpurple/protocols/novell/novell.c:537
+#: ../libpurple/protocols/novell/novell.c:537
 #, c-format
 msgid "Unable to send message. Could not create the conference (%s)."
 msgstr ""
 "Kann die Nachricht nicht senden. Kann die Konferenz nicht erstellen (%s)."
 
-#: libpurple/protocols/novell/novell.c:584
+#: ../libpurple/protocols/novell/novell.c:584
 #, c-format
 msgid ""
 "Unable to move user %s to folder %s in the server side list. Error while "
@@ -6232,7 +6517,7 @@
 "Fehler beim Verschieben des Benutzers %s zum Verzeichnis %s auf der "
 "serverseitigen Liste. Fehler beim Erstellen des Verzeichnisses (%s)."
 
-#: libpurple/protocols/novell/novell.c:632
+#: ../libpurple/protocols/novell/novell.c:632
 #, c-format
 msgid ""
 "Unable to add %s to your buddy list. Error creating folder in server side "
@@ -6241,63 +6526,63 @@
 "Kann den Benutzer %s nicht zur Buddy-Liste hinzufügen. Fehler beim Erstellen "
 "des Verzeichnisses auf der serverseitigen Liste (%s)."
 
-#: libpurple/protocols/novell/novell.c:705
+#: ../libpurple/protocols/novell/novell.c:705
 #, c-format
 msgid "Could not get details for user %s (%s)."
 msgstr "Kann die Details für den Benutzer %s nicht holen (%s)."
 
-#: libpurple/protocols/novell/novell.c:751
-#: libpurple/protocols/novell/novell.c:897
+#: ../libpurple/protocols/novell/novell.c:751
+#: ../libpurple/protocols/novell/novell.c:897
 #, c-format
 msgid "Unable to add user to privacy list (%s)."
 msgstr "Kann den Benutzer nicht zu Ihrer Privatsphäre-Liste hinzufügen (%s)."
 
-#: libpurple/protocols/novell/novell.c:798
+#: ../libpurple/protocols/novell/novell.c:798
 #, c-format
 msgid "Unable to add %s to deny list (%s)."
 msgstr "Kann %s nicht zu Ihrer Verboten-Liste hinzufügen (%s)."
 
-#: libpurple/protocols/novell/novell.c:851
+#: ../libpurple/protocols/novell/novell.c:851
 #, c-format
 msgid "Unable to add %s to permit list (%s)."
 msgstr "Kann %s nicht zu Ihrer Erlaubt-Liste hinzufügen (%s)."
 
-#: libpurple/protocols/novell/novell.c:919
+#: ../libpurple/protocols/novell/novell.c:919
 #, c-format
 msgid "Unable to remove %s from privacy list (%s)."
 msgstr "Kann %s nicht zu Ihrer Privatsphäre-Liste entfernen (%s)."
 
-#: libpurple/protocols/novell/novell.c:942
-#: libpurple/protocols/novell/novell.c:1647
+#: ../libpurple/protocols/novell/novell.c:942
+#: ../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)."
 
-#: libpurple/protocols/novell/novell.c:1012
+#: ../libpurple/protocols/novell/novell.c:1012
 #, c-format
 msgid "Unable to create conference (%s)."
 msgstr "Konferenz kann nicht erstellt werden (%s)."
 
-#: libpurple/protocols/novell/novell.c:1121
-#: libpurple/protocols/novell/novell.c:1692
+#: ../libpurple/protocols/novell/novell.c:1121
+#: ../libpurple/protocols/novell/novell.c:1692
 msgid "Error communicating with server. Closing connection."
 msgstr "Kommunikationsfehler mit dem Server. Schließe die Verbindung."
 
-#: libpurple/protocols/novell/novell.c:1476
+#: ../libpurple/protocols/novell/novell.c:1476
 msgid "Telephone Number"
 msgstr "Telefonnummer"
 
-#: libpurple/protocols/novell/novell.c:1482
+#: ../libpurple/protocols/novell/novell.c:1482
 msgid "Personal Title"
 msgstr "Persönlicher Titel"
 
-#: libpurple/protocols/novell/novell.c:1486
+#: ../libpurple/protocols/novell/novell.c:1486
 msgid "Mailstop"
 msgstr "Hauspostcode"
 
-#: libpurple/protocols/novell/novell.c:1502
-#: libpurple/protocols/sametime/sametime.c:4123
+#: ../libpurple/protocols/novell/novell.c:1502
+#: ../libpurple/protocols/sametime/sametime.c:4123
 msgid "User ID"
 msgstr "Benutzer-ID"
 
@@ -6307,41 +6592,41 @@
 #. purple_notify_user_info_add_pair(user_info, tag, value);
 #. }
 #.
-#: libpurple/protocols/novell/novell.c:1515
+#: ../libpurple/protocols/novell/novell.c:1515
 msgid "Full name"
 msgstr "Vollständiger Name"
 
-#: libpurple/protocols/novell/novell.c:1637
+#: ../libpurple/protocols/novell/novell.c:1637
 #, c-format
 msgid "GroupWise Conference %d"
 msgstr "GroupWise-Konferenz %d"
 
-#: libpurple/protocols/novell/novell.c:1668
+#: ../libpurple/protocols/novell/novell.c:1668
 msgid "Unable to make SSL connection to server."
 msgstr "Kann keine SSL-Verbindung zum Server herstellen."
 
-#: libpurple/protocols/novell/novell.c:1720
+#: ../libpurple/protocols/novell/novell.c:1720
 msgid "Authenticating..."
 msgstr "Authentifizierung..."
 
-#: libpurple/protocols/novell/novell.c:1732
+#: ../libpurple/protocols/novell/novell.c:1732
 msgid "Unable to connect to server."
 msgstr "Verbindung zum Server nicht möglich."
 
-#: libpurple/protocols/novell/novell.c:1735
+#: ../libpurple/protocols/novell/novell.c:1735
 msgid "Waiting for response..."
 msgstr "Warte auf Antwort..."
 
-#: libpurple/protocols/novell/novell.c:1870
+#: ../libpurple/protocols/novell/novell.c:1870
 #, c-format
 msgid "%s has been invited to this conversation."
 msgstr "%s wurde zu diesem Gespräch eingeladen."
 
-#: libpurple/protocols/novell/novell.c:1898
+#: ../libpurple/protocols/novell/novell.c:1898
 msgid "Invitation to Conversation"
 msgstr "Einladung zur Unterhaltung"
 
-#: libpurple/protocols/novell/novell.c:1899
+#: ../libpurple/protocols/novell/novell.c:1899
 #, c-format
 msgid ""
 "Invitation from: %s\n"
@@ -6352,18 +6637,18 @@
 "\n"
 "Gesendet: %s"
 
-#: libpurple/protocols/novell/novell.c:1901
+#: ../libpurple/protocols/novell/novell.c:1901
 msgid "Would you like to join the conversation?"
 msgstr "Möchten der Konferenz beitreten?"
 
 #. we don't want to reconnect in this case
-#: libpurple/protocols/novell/novell.c:2012
+#: ../libpurple/protocols/novell/novell.c:2012
 msgid "You have been logged out because you logged in at another workstation."
 msgstr ""
 "Sie wurden abgemeldet, weil Sie sich an einer anderen Workstation angemeldet "
 "haben."
 
-#: libpurple/protocols/novell/novell.c:2069
+#: ../libpurple/protocols/novell/novell.c:2069
 #, c-format
 msgid ""
 "%s appears to be offline and did not receive the message that you just sent."
@@ -6375,7 +6660,7 @@
 #. *  purple_request_fields(gc, _("Server Address"),...);
 #.
 #. ...but for now just error out with a nice message.
-#: libpurple/protocols/novell/novell.c:2167
+#: ../libpurple/protocols/novell/novell.c:2167
 msgid ""
 "Unable to connect to server. Please enter the address of the server you wish "
 "to connect to."
@@ -6383,12 +6668,11 @@
 "Kann keine Verbindung zum Server herstellen. Bitte geben Sie die Adresse des "
 "Servers ein, mit dem Sie sich verbinden wollen."
 
-#: libpurple/protocols/novell/novell.c:2195
+#: ../libpurple/protocols/novell/novell.c:2195
 msgid "Error. SSL support is not installed."
 msgstr "Fehler. SSL ist nicht installiert."
 
-#: libpurple/protocols/novell/novell.c:2504
-#, c-format
+#: ../libpurple/protocols/novell/novell.c:2504
 msgid "This conference has been closed. No more messages can be sent."
 msgstr ""
 "Diese Konferenz wurde geschlossen. Es können keine Nachrichten mehr gesendet "
@@ -6404,32 +6688,33 @@
 #. *< version
 #. *  summary
 #. *  description
-#: libpurple/protocols/novell/novell.c:3518
-#: libpurple/protocols/novell/novell.c:3520
+#: ../libpurple/protocols/novell/novell.c:3518
+#: ../libpurple/protocols/novell/novell.c:3520
 msgid "Novell GroupWise Messenger Protocol Plugin"
 msgstr "Novell GroupWise Messenger Protokoll-Plugin"
 
-#: libpurple/protocols/novell/novell.c:3545
+#: ../libpurple/protocols/novell/novell.c:3545
 msgid "Server address"
 msgstr "Server-Adresse"
 
-#: libpurple/protocols/novell/novell.c:3549
+#: ../libpurple/protocols/novell/novell.c:3549
 msgid "Server port"
 msgstr "Server-Port"
 
-#: libpurple/protocols/oscar/flap_connection.c:387
-#: libpurple/protocols/yahoo/yahoo.c:2296
-#: libpurple/protocols/yahoo/yahoo.c:2463 libpurple/protocols/yahoo/ycht.c:481
-#: libpurple/proxy.c:580 libpurple/proxy.c:1099 libpurple/proxy.c:1208
-#: libpurple/proxy.c:1308 libpurple/proxy.c:1436
+#: ../libpurple/protocols/oscar/flap_connection.c:387
+#: ../libpurple/protocols/yahoo/yahoo.c:2313
+#: ../libpurple/protocols/yahoo/yahoo.c:2480
+#: ../libpurple/protocols/yahoo/ycht.c:481 ../libpurple/proxy.c:580
+#: ../libpurple/proxy.c:1099 ../libpurple/proxy.c:1208
+#: ../libpurple/proxy.c:1308 ../libpurple/proxy.c:1436
 msgid "Server closed the connection."
 msgstr "Der Server hat die Verbindung beendet."
 
-#: libpurple/protocols/oscar/flap_connection.c:389
-#: libpurple/protocols/yahoo/yahoo.c:2290
-#: libpurple/protocols/yahoo/yahoo.c:2457 libpurple/proxy.c:592
-#: libpurple/proxy.c:1111 libpurple/proxy.c:1220 libpurple/proxy.c:1320
-#: libpurple/proxy.c:1448
+#: ../libpurple/protocols/oscar/flap_connection.c:389
+#: ../libpurple/protocols/yahoo/yahoo.c:2307
+#: ../libpurple/protocols/yahoo/yahoo.c:2474 ../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"
@@ -6438,9 +6723,10 @@
 "Verbindung zum Server verloren:\n"
 "%s"
 
-#: libpurple/protocols/oscar/flap_connection.c:392 libpurple/proxy.c:1128
-#: libpurple/proxy.c:1233 libpurple/proxy.c:1332 libpurple/proxy.c:1404
-#: libpurple/proxy.c:1461
+#: ../libpurple/protocols/oscar/flap_connection.c:392
+#: ../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 "Ungültige Daten in der Verbindung mit dem Server empfangen."
 
@@ -6454,8 +6740,8 @@
 #. *< version
 #. *  summary
 #. *  description
-#: libpurple/protocols/oscar/libaim.c:118
-#: libpurple/protocols/oscar/libaim.c:120
+#: ../libpurple/protocols/oscar/libaim.c:118
+#: ../libpurple/protocols/oscar/libaim.c:120
 msgid "AIM Protocol Plugin"
 msgstr "AIM-Protokoll-Plugin"
 
@@ -6469,146 +6755,146 @@
 #. *< version
 #. *  summary
 #. *  description
-#: libpurple/protocols/oscar/libicq.c:118
-#: libpurple/protocols/oscar/libicq.c:120
+#: ../libpurple/protocols/oscar/libicq.c:118
+#: ../libpurple/protocols/oscar/libicq.c:120
 msgid "ICQ Protocol Plugin"
 msgstr "IRC-Protokoll-Plugin"
 
-#: libpurple/protocols/oscar/libicq.c:147
-#: libpurple/protocols/yahoo/yahoo.c:4115
-#: libpurple/protocols/zephyr/zephyr.c:2997
+#: ../libpurple/protocols/oscar/libicq.c:147
+#: ../libpurple/protocols/yahoo/yahoo.c:4213
+#: ../libpurple/protocols/zephyr/zephyr.c:2997
 msgid "Encoding"
 msgstr "Kodierung"
 
-#: libpurple/protocols/oscar/odc.c:40
+#: ../libpurple/protocols/oscar/odc.c:40
 msgid "The remote user has closed the connection."
 msgstr "Der entfernte Benutzer hat das Gespräch beendet."
 
-#: libpurple/protocols/oscar/odc.c:42
+#: ../libpurple/protocols/oscar/odc.c:42
 msgid "The remote user has declined your request."
 msgstr "Der entfernte Benutzer hat Ihre Anfrage abgelehnt."
 
-#: libpurple/protocols/oscar/odc.c:44
+#: ../libpurple/protocols/oscar/odc.c:44
 #, c-format
 msgid "Lost connection with the remote user:<br>%s"
 msgstr "Verbindung zum entfernten Benutzer verloren: <br>%s"
 
-#: libpurple/protocols/oscar/odc.c:47
+#: ../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."
 
-#: libpurple/protocols/oscar/odc.c:49
+#: ../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."
 
-#: libpurple/protocols/oscar/odc.c:560
+#: ../libpurple/protocols/oscar/odc.c:560
 msgid "Direct IM established"
 msgstr "Direkt-IM hergestellt"
 
-#: libpurple/protocols/oscar/oft.c:657
+#: ../libpurple/protocols/oscar/oft.c:657
 #, c-format
 msgid "File %s is %s, which is larger than the maximum size of %s."
 msgstr "Datei %s (%s) ist größer als die maximale Größe von %s."
 
-#: libpurple/protocols/oscar/oscar.c:115
+#: ../libpurple/protocols/oscar/oscar.c:115
 msgid "Invalid error"
 msgstr "Ungültiger Name"
 
-#: libpurple/protocols/oscar/oscar.c:116
+#: ../libpurple/protocols/oscar/oscar.c:116
 msgid "Invalid SNAC"
 msgstr "Ungültiger SNAC"
 
-#: libpurple/protocols/oscar/oscar.c:117
+#: ../libpurple/protocols/oscar/oscar.c:117
 msgid "Rate to host"
 msgstr "Bewertung zum Host"
 
-#: libpurple/protocols/oscar/oscar.c:118
+#: ../libpurple/protocols/oscar/oscar.c:118
 msgid "Rate to client"
 msgstr "Bewertung zum Client"
 
-#: libpurple/protocols/oscar/oscar.c:120
+#: ../libpurple/protocols/oscar/oscar.c:120
 msgid "Service unavailable"
 msgstr "Server unerreichbar"
 
-#: libpurple/protocols/oscar/oscar.c:121
+#: ../libpurple/protocols/oscar/oscar.c:121
 msgid "Service not defined"
 msgstr "Dienst nicht definiert"
 
-#: libpurple/protocols/oscar/oscar.c:122
+#: ../libpurple/protocols/oscar/oscar.c:122
 msgid "Obsolete SNAC"
 msgstr "Obsoleteter SNAC"
 
-#: libpurple/protocols/oscar/oscar.c:123
+#: ../libpurple/protocols/oscar/oscar.c:123
 msgid "Not supported by host"
 msgstr "Nicht unterstützt vom Host"
 
-#: libpurple/protocols/oscar/oscar.c:124
+#: ../libpurple/protocols/oscar/oscar.c:124
 msgid "Not supported by client"
 msgstr "Nicht unterstützt vom Client"
 
-#: libpurple/protocols/oscar/oscar.c:125
+#: ../libpurple/protocols/oscar/oscar.c:125
 msgid "Refused by client"
 msgstr "Abgelehnt vom Client"
 
-#: libpurple/protocols/oscar/oscar.c:126
+#: ../libpurple/protocols/oscar/oscar.c:126
 msgid "Reply too big"
 msgstr "Antwort zu groß"
 
-#: libpurple/protocols/oscar/oscar.c:127
+#: ../libpurple/protocols/oscar/oscar.c:127
 msgid "Responses lost"
 msgstr "Antworten verloren"
 
-#: libpurple/protocols/oscar/oscar.c:128
+#: ../libpurple/protocols/oscar/oscar.c:128
 msgid "Request denied"
 msgstr "Anfrage verweigert"
 
-#: libpurple/protocols/oscar/oscar.c:129
+#: ../libpurple/protocols/oscar/oscar.c:129
 msgid "Busted SNAC payload"
 msgstr "Ruinierte SNAC-Daten"
 
-#: libpurple/protocols/oscar/oscar.c:130
+#: ../libpurple/protocols/oscar/oscar.c:130
 msgid "Insufficient rights"
 msgstr "Ungenügende Rechte"
 
-#: libpurple/protocols/oscar/oscar.c:131
+#: ../libpurple/protocols/oscar/oscar.c:131
 msgid "In local permit/deny"
 msgstr "In lokaler erlaubt/verboten-Liste"
 
-#: libpurple/protocols/oscar/oscar.c:132
+#: ../libpurple/protocols/oscar/oscar.c:132
 msgid "Too evil (sender)"
 msgstr "Zu boshaft (Sender)"
 
-#: libpurple/protocols/oscar/oscar.c:133
+#: ../libpurple/protocols/oscar/oscar.c:133
 msgid "Too evil (receiver)"
 msgstr "Zu boshaft (Empfänger)"
 
-#: libpurple/protocols/oscar/oscar.c:134
+#: ../libpurple/protocols/oscar/oscar.c:134
 msgid "User temporarily unavailable"
 msgstr "Benutzer ist temporär nicht verfügbar"
 
-#: libpurple/protocols/oscar/oscar.c:135
+#: ../libpurple/protocols/oscar/oscar.c:135
 msgid "No match"
 msgstr "Keine Übereinstimmung"
 
-#: libpurple/protocols/oscar/oscar.c:136
+#: ../libpurple/protocols/oscar/oscar.c:136
 msgid "List overflow"
 msgstr "Listenüberlauf"
 
-#: libpurple/protocols/oscar/oscar.c:137
+#: ../libpurple/protocols/oscar/oscar.c:137
 msgid "Request ambiguous"
 msgstr "Anfrage ist nicht eindeutig"
 
-#: libpurple/protocols/oscar/oscar.c:138
+#: ../libpurple/protocols/oscar/oscar.c:138
 msgid "Queue full"
 msgstr "Warteschlange voll"
 
-#: libpurple/protocols/oscar/oscar.c:139
+#: ../libpurple/protocols/oscar/oscar.c:139
 msgid "Not while on AOL"
 msgstr "Nicht solange bei AOL angemeldet"
 
-#: libpurple/protocols/oscar/oscar.c:348
+#: ../libpurple/protocols/oscar/oscar.c:347
 msgid ""
 "(There was an error receiving this message.  The buddy you are speaking with "
 "is probably using a different encoding than expected.  If you know what "
@@ -6620,7 +6906,7 @@
 "erwartet.  Wenn Sie wissen, welche Kodierung er benutzt, können Sie diese in "
 "den erweiterten Konto-Optionen Ihres AIM/ICQ-Kontos angeben.)"
 
-#: libpurple/protocols/oscar/oscar.c:457
+#: ../libpurple/protocols/oscar/oscar.c:456
 #, c-format
 msgid ""
 "(There was an error receiving this message.  Either you and %s have "
@@ -6631,149 +6917,147 @@
 "Client.)"
 
 #. Label
-#: libpurple/protocols/oscar/oscar.c:639 pidgin/gtkutils.c:2376
-#: pidgin/gtkutils.c:2406 pidgin/plugins/gevolution/new_person_dialog.c:334
+#: ../libpurple/protocols/oscar/oscar.c:638 ../pidgin/gtkutils.c:2376
+#: ../pidgin/gtkutils.c:2406
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:334
 msgid "Buddy Icon"
 msgstr "Buddy-Icon"
 
-#: libpurple/protocols/oscar/oscar.c:642
+#: ../libpurple/protocols/oscar/oscar.c:641
 msgid "Voice"
 msgstr "Stimme"
 
-#: libpurple/protocols/oscar/oscar.c:645
+#: ../libpurple/protocols/oscar/oscar.c:644
 msgid "AIM Direct IM"
 msgstr "AIM direkte Nachricht"
 
-#: 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
+#: ../libpurple/protocols/oscar/oscar.c:647
+#: ../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 "Chat"
 
-#: libpurple/protocols/oscar/oscar.c:651
-#: libpurple/protocols/oscar/oscar.c:5989
+#: ../libpurple/protocols/oscar/oscar.c:650
+#: ../libpurple/protocols/oscar/oscar.c:5958
 msgid "Get File"
 msgstr "Datei abrufen"
 
-#: libpurple/protocols/oscar/oscar.c:658
+#: ../libpurple/protocols/oscar/oscar.c:657
 msgid "Games"
 msgstr "Spiele"
 
-#: libpurple/protocols/oscar/oscar.c:661
+#: ../libpurple/protocols/oscar/oscar.c:660
 msgid "Add-Ins"
 msgstr "Zusätze"
 
-#: libpurple/protocols/oscar/oscar.c:664
+#: ../libpurple/protocols/oscar/oscar.c:663
 msgid "Send Buddy List"
 msgstr "Buddy-Liste senden"
 
-#: libpurple/protocols/oscar/oscar.c:667
+#: ../libpurple/protocols/oscar/oscar.c:666
 msgid "ICQ Direct Connect"
 msgstr "ICQ direkte Verbindung"
 
-#: libpurple/protocols/oscar/oscar.c:670
+#: ../libpurple/protocols/oscar/oscar.c:669
 msgid "AP User"
 msgstr "AP Benutzer"
 
-#: libpurple/protocols/oscar/oscar.c:673
+#: ../libpurple/protocols/oscar/oscar.c:672
 msgid "ICQ RTF"
 msgstr "ICQ RTF"
 
-#: libpurple/protocols/oscar/oscar.c:676
+#: ../libpurple/protocols/oscar/oscar.c:675
 msgid "Nihilist"
 msgstr "Nihilist"
 
-#: libpurple/protocols/oscar/oscar.c:679
+#: ../libpurple/protocols/oscar/oscar.c:678
 msgid "ICQ Server Relay"
 msgstr "ICQ Server Relay"
 
-#: libpurple/protocols/oscar/oscar.c:682
+#: ../libpurple/protocols/oscar/oscar.c:681
 msgid "Old ICQ UTF8"
 msgstr "Altes ICQ UTF-8"
 
-#: libpurple/protocols/oscar/oscar.c:685
+#: ../libpurple/protocols/oscar/oscar.c:684
 msgid "Trillian Encryption"
 msgstr "Trillian-Verschlüsselung"
 
-#: libpurple/protocols/oscar/oscar.c:688
+#: ../libpurple/protocols/oscar/oscar.c:687
 msgid "ICQ UTF8"
 msgstr "ICQ UTF-8"
 
-#: libpurple/protocols/oscar/oscar.c:691
+#: ../libpurple/protocols/oscar/oscar.c:690
 msgid "Hiptop"
 msgstr "Hiptop"
 
-#: libpurple/protocols/oscar/oscar.c:694
+#: ../libpurple/protocols/oscar/oscar.c:693
 msgid "Security Enabled"
 msgstr "Sicherheit aktiviert"
 
-#: libpurple/protocols/oscar/oscar.c:697
+#: ../libpurple/protocols/oscar/oscar.c:696
 msgid "Video Chat"
 msgstr "Video-Chat"
 
-#: libpurple/protocols/oscar/oscar.c:701
+#: ../libpurple/protocols/oscar/oscar.c:700
 msgid "iChat AV"
 msgstr "iChat AV"
 
-#: libpurple/protocols/oscar/oscar.c:704
+#: ../libpurple/protocols/oscar/oscar.c:703
 msgid "Live Video"
 msgstr "Live-Video"
 
-#: libpurple/protocols/oscar/oscar.c:707
+#: ../libpurple/protocols/oscar/oscar.c:706
 msgid "Camera"
 msgstr "Kamera"
 
-#: libpurple/protocols/oscar/oscar.c:725
-#: libpurple/protocols/oscar/oscar.c:5759
-#, c-format
+#: ../libpurple/protocols/oscar/oscar.c:724
+#: ../libpurple/protocols/oscar/oscar.c:5728
 msgid "Free For Chat"
 msgstr "Bereit zum Chatten"
 
-#: libpurple/protocols/oscar/oscar.c:729
-#: libpurple/protocols/oscar/oscar.c:5794
-#, c-format
+#: ../libpurple/protocols/oscar/oscar.c:728
+#: ../libpurple/protocols/oscar/oscar.c:5763
 msgid "Not Available"
 msgstr "Nicht verfügbar"
 
-#: libpurple/protocols/oscar/oscar.c:731
-#: libpurple/protocols/oscar/oscar.c:5780
-#, c-format
+#: ../libpurple/protocols/oscar/oscar.c:730
+#: ../libpurple/protocols/oscar/oscar.c:5749
 msgid "Occupied"
 msgstr "Beschäftigt"
 
-#: libpurple/protocols/oscar/oscar.c:735
-#, c-format
+#: ../libpurple/protocols/oscar/oscar.c:734
 msgid "Web Aware"
 msgstr "In Web"
 
-#: libpurple/protocols/oscar/oscar.c:737 libpurple/protocols/qq/qq.c:183
-#: libpurple/protocols/yahoo/yahoo.c:2917 libpurple/status.c:156
-#: pidgin/gtkdocklet.c:446 pidgin/gtkstatusbox.c:1058
-#, c-format
+#: ../libpurple/protocols/oscar/oscar.c:736 ../libpurple/protocols/qq/qq.c:183
+#: ../libpurple/protocols/qq/qq.c:288
+#: ../libpurple/protocols/yahoo/yahoo.c:2934 ../libpurple/status.c:156
+#: ../pidgin/gtkdocklet.c:446 ../pidgin/gtkstatusbox.c:1058
 msgid "Invisible"
 msgstr "Unsichtbar"
 
-#: libpurple/protocols/oscar/oscar.c:739
-#, c-format
+#: ../libpurple/protocols/oscar/oscar.c:738
 msgid "Online"
 msgstr "Online"
 
-#: libpurple/protocols/oscar/oscar.c:838
-#: libpurple/protocols/oscar/oscar.c:3716
-#: libpurple/protocols/yahoo/yahoo_profile.c:721 pidgin/gtkprefs.c:1121
+#: ../libpurple/protocols/oscar/oscar.c:837
+#: ../libpurple/protocols/oscar/oscar.c:3675
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:721 ../pidgin/gtkprefs.c:1123
 msgid "IP Address"
 msgstr "IP-Adresse"
 
-#: libpurple/protocols/oscar/oscar.c:845
-#: libpurple/protocols/oscar/oscar.c:2863
+#: ../libpurple/protocols/oscar/oscar.c:844
+#: ../libpurple/protocols/oscar/oscar.c:2861
 msgid "Warning Level"
 msgstr "Warnstufe"
 
-#: libpurple/protocols/oscar/oscar.c:855
+#: ../libpurple/protocols/oscar/oscar.c:854
 msgid "Buddy Comment"
 msgstr "Buddy-Kommentar"
 
-#: libpurple/protocols/oscar/oscar.c:995
+#: ../libpurple/protocols/oscar/oscar.c:994
 #, c-format
 msgid ""
 "Could not connect to authentication server:\n"
@@ -6782,7 +7066,7 @@
 "Verbindung zum Authentifizierungsserver nicht möglich:\n"
 "%s"
 
-#: libpurple/protocols/oscar/oscar.c:1003
+#: ../libpurple/protocols/oscar/oscar.c:1002
 #, c-format
 msgid ""
 "Could not connect to BOS server:\n"
@@ -6791,20 +7075,20 @@
 "Verbindung zum BOS-Server nicht möglich\n"
 "%s"
 
-#: libpurple/protocols/oscar/oscar.c:1043
+#: ../libpurple/protocols/oscar/oscar.c:1042
 msgid "Screen name sent"
 msgstr "Benutzername gesendet"
 
-#: libpurple/protocols/oscar/oscar.c:1048
+#: ../libpurple/protocols/oscar/oscar.c:1047
 msgid "Connection established, cookie sent"
 msgstr "Verbindung hergestellt. Cookie gesendet"
 
 #. TODO: Don't call this with ssi
-#: libpurple/protocols/oscar/oscar.c:1077
+#: ../libpurple/protocols/oscar/oscar.c:1076
 msgid "Finalizing connection"
 msgstr "Verbindung herstellen"
 
-#: libpurple/protocols/oscar/oscar.c:1261
+#: ../libpurple/protocols/oscar/oscar.c:1258
 #, c-format
 msgid ""
 "Unable to login: Could not sign on as %s because the screen name is "
@@ -6816,29 +7100,29 @@
 "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:1935
+#: ../libpurple/protocols/oscar/oscar.c:1343
+#: ../libpurple/protocols/yahoo/yahoo.c:1952
 msgid "Invalid screen name."
 msgstr "Ungültiger Benutzername."
 
-#: libpurple/protocols/oscar/oscar.c:1353
-#: libpurple/protocols/qq/login_logout.c:483
-#: libpurple/protocols/simple/simple.c:1039
-#: libpurple/protocols/yahoo/yahoo.c:1956
+#: ../libpurple/protocols/oscar/oscar.c:1350
+#: ../libpurple/protocols/qq/login_logout.c:483
+#: ../libpurple/protocols/simple/simple.c:1039
+#: ../libpurple/protocols/yahoo/yahoo.c:1973
 msgid "Incorrect password."
 msgstr "Falsches Passwort."
 
-#: libpurple/protocols/oscar/oscar.c:1358
+#: ../libpurple/protocols/oscar/oscar.c:1355
 msgid "Your account is currently suspended."
 msgstr "Ihr Benutzerkonto ist momentan gesperrt."
 
 #. service temporarily unavailable
-#: libpurple/protocols/oscar/oscar.c:1362
+#: ../libpurple/protocols/oscar/oscar.c:1359
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr "Der AOL-Sofortnachrichtendienst ist zur Zeit nicht erreichbar."
 
-#: libpurple/protocols/oscar/oscar.c:1367
-#: libpurple/protocols/oscar/oscar.c:1378
+#: ../libpurple/protocols/oscar/oscar.c:1364
+#: ../libpurple/protocols/oscar/oscar.c:1375
 msgid ""
 "You have been connecting and disconnecting too frequently. Wait ten minutes "
 "and try again. If you continue to try, you will need to wait even longer."
@@ -6847,45 +7131,45 @@
 "versuchen Sie es noch einmal. Wenn Sie es weiterversuchen, müssen Sie sogar "
 "noch länger warten."
 
-#: libpurple/protocols/oscar/oscar.c:1372
+#: ../libpurple/protocols/oscar/oscar.c:1369
 #, c-format
 msgid "The client version you are using is too old. Please upgrade at %s"
 msgstr ""
 "Die Client-Version, die Sie nutzen ist zu alt. Bitte updaten Sie unter %s"
 
-#: libpurple/protocols/oscar/oscar.c:1411
+#: ../libpurple/protocols/oscar/oscar.c:1408
 msgid "Could Not Connect"
 msgstr "Verbinden nicht möglich"
 
-#: libpurple/protocols/oscar/oscar.c:1415
+#: ../libpurple/protocols/oscar/oscar.c:1412
 msgid "Received authorization"
 msgstr "Autorisierung empfangen"
 
-#: libpurple/protocols/oscar/oscar.c:1437
+#: ../libpurple/protocols/oscar/oscar.c:1434
 msgid "The SecurID key entered is invalid."
 msgstr "Der eingegebene SecurID-Schlüssel ist falsch."
 
-#: libpurple/protocols/oscar/oscar.c:1450
+#: ../libpurple/protocols/oscar/oscar.c:1447
 msgid "Enter SecurID"
 msgstr "SecurID-Eingabe"
 
-#: libpurple/protocols/oscar/oscar.c:1451
+#: ../libpurple/protocols/oscar/oscar.c:1448
 msgid "Enter the 6 digit number from the digital display."
 msgstr "Geben Sie die 6-stellige Nummer vom Digital-Display ein."
 
 #. *
 #. * A wrapper for purple_request_action() that uses @c OK and @c Cancel buttons.
 #.
-#: libpurple/protocols/oscar/oscar.c:1453
-#: libpurple/protocols/oscar/oscar.c:2246
-#: libpurple/protocols/oscar/oscar.c:2293
-#: libpurple/protocols/oscar/oscar.c:5864
-#: libpurple/protocols/oscar/oscar.c:6145 libpurple/request.h:1387
+#: ../libpurple/protocols/oscar/oscar.c:1450
+#: ../libpurple/protocols/oscar/oscar.c:2242
+#: ../libpurple/protocols/oscar/oscar.c:2291
+#: ../libpurple/protocols/oscar/oscar.c:5833
+#: ../libpurple/protocols/oscar/oscar.c:6114 ../libpurple/request.h:1387
 msgid "_OK"
 msgstr "_OK"
 
-#: libpurple/protocols/oscar/oscar.c:1492
-#: libpurple/protocols/oscar/oscar.c:1535
+#: ../libpurple/protocols/oscar/oscar.c:1489
+#: ../libpurple/protocols/oscar/oscar.c:1532
 #, c-format
 msgid ""
 "You may be disconnected shortly.  You may want to use TOC until this is "
@@ -6894,56 +7178,56 @@
 "Die Verbindung kann schnell unterbrochen werden. Vielleicht wollen Sie TOC "
 "benutzen bis dieser Fehler behoben wurde. Suchen Sie auf %s nach Updates."
 
-#: libpurple/protocols/oscar/oscar.c:1495
-#: libpurple/protocols/oscar/oscar.c:1538
+#: ../libpurple/protocols/oscar/oscar.c:1492
+#: ../libpurple/protocols/oscar/oscar.c:1535
 msgid "Unable to get a valid AIM login hash."
 msgstr "Konnte keinen gültigen AIM Login-Hash bekommen."
 
-#: libpurple/protocols/oscar/oscar.c:1623
+#: ../libpurple/protocols/oscar/oscar.c:1620
 #, c-format
 msgid "You may be disconnected shortly.  Check %s for updates."
 msgstr ""
 "Sie wurden in kurzer Zeit abgemeldet.  Überprüfen Sie %s wegen Updates."
 
-#: libpurple/protocols/oscar/oscar.c:1626
+#: ../libpurple/protocols/oscar/oscar.c:1623
 msgid "Unable to get a valid login hash."
 msgstr "Konnte keinen gültigen Login-Hash bekommen."
 
-#: libpurple/protocols/oscar/oscar.c:1655
+#: ../libpurple/protocols/oscar/oscar.c:1652
 msgid "Password sent"
 msgstr "Passwort gesendet"
 
-#: libpurple/protocols/oscar/oscar.c:1711
+#: ../libpurple/protocols/oscar/oscar.c:1708
 msgid "Unable to initialize connection"
 msgstr "Kann Verbindung nicht erstellen"
 
-#: libpurple/protocols/oscar/oscar.c:2216
+#: ../libpurple/protocols/oscar/oscar.c:2212
 msgid "Please authorize me so I can add you to my buddy list."
 msgstr ""
 "Bitte autorisieren Sie mich, sodass ich Sie in meine Buddy-Liste aufnehmen "
 "kann."
 
-#: libpurple/protocols/oscar/oscar.c:2244
+#: ../libpurple/protocols/oscar/oscar.c:2240
 msgid "Authorization Request Message:"
 msgstr "Autorisierungsanfrage:"
 
-#: libpurple/protocols/oscar/oscar.c:2245
+#: ../libpurple/protocols/oscar/oscar.c:2241
 msgid "Please authorize me!"
 msgstr "Bitte autorisiere mich!"
 
-#: libpurple/protocols/oscar/oscar.c:2285
-#: libpurple/protocols/oscar/oscar.c:2292
-#: libpurple/protocols/oscar/oscar.c:2419
-#: libpurple/protocols/oscar/oscar.c:5242
-#: libpurple/protocols/yahoo/yahoo.c:987
+#: ../libpurple/protocols/oscar/oscar.c:2282
+#: ../libpurple/protocols/oscar/oscar.c:2290
+#: ../libpurple/protocols/oscar/oscar.c:2417
+#: ../libpurple/protocols/oscar/oscar.c:5211
+#: ../libpurple/protocols/yahoo/yahoo.c:1004
 msgid "No reason given."
 msgstr "Kein Grund angegeben."
 
-#: libpurple/protocols/oscar/oscar.c:2291
+#: ../libpurple/protocols/oscar/oscar.c:2289
 msgid "Authorization Denied Message:"
 msgstr "Nachricht für die Ablehnung der Autorisierung:"
 
-#: libpurple/protocols/oscar/oscar.c:2419
+#: ../libpurple/protocols/oscar/oscar.c:2417
 #, c-format
 msgid ""
 "The user %u has denied your request to add them to your buddy list for the "
@@ -6954,19 +7238,19 @@
 "Liste hinzufügen zu dürfen, und zwar aus folgendem Grund:\n"
 "%s"
 
-#: libpurple/protocols/oscar/oscar.c:2420
+#: ../libpurple/protocols/oscar/oscar.c:2418
 msgid "ICQ authorization denied."
 msgstr "ICQ-Autorisierung verweigert."
 
 #. Someone has granted you authorization
-#: libpurple/protocols/oscar/oscar.c:2427
+#: ../libpurple/protocols/oscar/oscar.c:2425
 #, c-format
 msgid "The user %u has granted your request to add them to your buddy list."
 msgstr ""
 "Der Benutzer %u hat Ihre Anfrage akzeptiert, ihn bzw. sie zu Ihrer Buddy-"
 "Liste hinzufügen zu dürfen."
 
-#: libpurple/protocols/oscar/oscar.c:2435
+#: ../libpurple/protocols/oscar/oscar.c:2433
 #, c-format
 msgid ""
 "You have received a special message\n"
@@ -6979,7 +7263,7 @@
 "Von: %s [%s]\n"
 "%s"
 
-#: libpurple/protocols/oscar/oscar.c:2443
+#: ../libpurple/protocols/oscar/oscar.c:2441
 #, c-format
 msgid ""
 "You have received an ICQ page\n"
@@ -6992,7 +7276,7 @@
 "Von: %s [%s]\n"
 "%s"
 
-#: libpurple/protocols/oscar/oscar.c:2451
+#: ../libpurple/protocols/oscar/oscar.c:2449
 #, c-format
 msgid ""
 "You have received an ICQ e-mail from %s [%s]\n"
@@ -7005,24 +7289,24 @@
 "Nachricht:\n"
 "%s"
 
-#: libpurple/protocols/oscar/oscar.c:2472
+#: ../libpurple/protocols/oscar/oscar.c:2470
 #, c-format
 msgid "ICQ user %u has sent you a buddy: %s (%s)"
 msgstr "Der ICQ Benutzer %u hat Ihnen einen Buddy gesendet: %s (%s)"
 
-#: libpurple/protocols/oscar/oscar.c:2478
+#: ../libpurple/protocols/oscar/oscar.c:2476
 msgid "Do you want to add this buddy to your buddy list?"
 msgstr "Möchten Sie diesen Buddy zu Ihrer Buddy-Liste hinzufügen?"
 
-#: libpurple/protocols/oscar/oscar.c:2483 pidgin/gtkroomlist.c:308
+#: ../libpurple/protocols/oscar/oscar.c:2481 ../pidgin/gtkroomlist.c:308
 msgid "_Add"
 msgstr "_Hinzufügen"
 
-#: libpurple/protocols/oscar/oscar.c:2484
+#: ../libpurple/protocols/oscar/oscar.c:2482
 msgid "_Decline"
 msgstr "_Ablehnen"
 
-#: libpurple/protocols/oscar/oscar.c:2568
+#: ../libpurple/protocols/oscar/oscar.c:2566
 #, c-format
 msgid "You missed %hu message from %s because it was invalid."
 msgid_plural "You missed %hu messages from %s because they were invalid."
@@ -7030,7 +7314,7 @@
 msgstr[1] ""
 "Sie haben %hu Nachrichten von %s nicht erhalten, da sie ungültig waren."
 
-#: libpurple/protocols/oscar/oscar.c:2577
+#: ../libpurple/protocols/oscar/oscar.c:2575
 #, c-format
 msgid "You missed %hu message from %s because it was too large."
 msgid_plural "You missed %hu messages from %s because they were too large."
@@ -7038,7 +7322,7 @@
 msgstr[1] ""
 "Sie haben %hu Nachrichten von %s nicht erhalten, da sie zu groß waren."
 
-#: libpurple/protocols/oscar/oscar.c:2586
+#: ../libpurple/protocols/oscar/oscar.c:2584
 #, c-format
 msgid ""
 "You missed %hu message from %s because the rate limit has been exceeded."
@@ -7051,7 +7335,7 @@
 "Sie haben %hu Nachrichten von %s nicht erhalten, da die Senderate "
 "überschritten wurde."
 
-#: libpurple/protocols/oscar/oscar.c:2595
+#: ../libpurple/protocols/oscar/oscar.c:2593
 #, c-format
 msgid "You missed %hu message from %s because he/she was too evil."
 msgid_plural "You missed %hu messages from %s because he/she was too evil."
@@ -7060,7 +7344,7 @@
 msgstr[1] ""
 "Sie haben %hu Nachrichten von %s nicht erhalten,/sie zu boshaft war."
 
-#: libpurple/protocols/oscar/oscar.c:2604
+#: ../libpurple/protocols/oscar/oscar.c:2602
 #, c-format
 msgid "You missed %hu message from %s because you are too evil."
 msgid_plural "You missed %hu messages from %s because you are too evil."
@@ -7069,7 +7353,7 @@
 msgstr[1] ""
 "Sie haben %hu Nachrichten von %s nicht erhalten, da Sie zu boshaft sind."
 
-#: libpurple/protocols/oscar/oscar.c:2613
+#: ../libpurple/protocols/oscar/oscar.c:2611
 #, c-format
 msgid "You missed %hu message from %s for an unknown reason."
 msgid_plural "You missed %hu messages from %s for an unknown reason."
@@ -7079,55 +7363,55 @@
 "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:2768
+#: ../libpurple/protocols/oscar/oscar.c:2766
 #, c-format
 msgid "Unable to send message: %s"
 msgstr "Kann die Nachricht nicht senden: %s"
 
-#: libpurple/protocols/oscar/oscar.c:2768
-#: libpurple/protocols/oscar/oscar.c:2773
-#: libpurple/protocols/oscar/oscar.c:2837
+#: ../libpurple/protocols/oscar/oscar.c:2766
+#: ../libpurple/protocols/oscar/oscar.c:2771
+#: ../libpurple/protocols/oscar/oscar.c:2835
 msgid "Unknown reason."
 msgstr "Unbekannter Grund."
 
-#: libpurple/protocols/oscar/oscar.c:2771
-#: libpurple/protocols/sametime/sametime.c:2409
+#: ../libpurple/protocols/oscar/oscar.c:2769
+#: ../libpurple/protocols/sametime/sametime.c:2409
 #, c-format
 msgid "Unable to send message to %s:"
 msgstr "Kann die Nachricht an %s nicht senden:"
 
-#: libpurple/protocols/oscar/oscar.c:2837
+#: ../libpurple/protocols/oscar/oscar.c:2835
 #, c-format
 msgid "User information not available: %s"
 msgstr "Benutzerinformation nicht verfügbar: %s"
 
-#: libpurple/protocols/oscar/oscar.c:2868
+#: ../libpurple/protocols/oscar/oscar.c:2866
 msgid "Online Since"
 msgstr "Online seit"
 
-#: libpurple/protocols/oscar/oscar.c:2873
-#: libpurple/protocols/yahoo/yahoo_profile.c:1185
+#: ../libpurple/protocols/oscar/oscar.c:2871
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1185
 msgid "Member Since"
 msgstr "Mitglied seit"
 
-#: libpurple/protocols/oscar/oscar.c:2878
+#: ../libpurple/protocols/oscar/oscar.c:2876
 msgid "Capabilities"
 msgstr "Fähigkeiten"
 
-#: libpurple/protocols/oscar/oscar.c:2908
+#: ../libpurple/protocols/oscar/oscar.c:2906
 msgid "Available Message"
 msgstr "Verfügbarkeitsnachricht"
 
-#: libpurple/protocols/oscar/oscar.c:2936
+#: ../libpurple/protocols/oscar/oscar.c:2934
 msgid "Profile"
 msgstr "Profil"
 
-#: libpurple/protocols/oscar/oscar.c:3016
+#: ../libpurple/protocols/oscar/oscar.c:3014
 msgid "Your AIM connection may be lost."
 msgstr "Ihre AIM-Verbindung könnte unterbrochen sein."
 
 #. The conversion failed!
-#: libpurple/protocols/oscar/oscar.c:3204
+#: ../libpurple/protocols/oscar/oscar.c:3202
 msgid ""
 "[Unable to display a message from this user because it contained invalid "
 "characters.]"
@@ -7135,7 +7419,7 @@
 "[Kann die Nachricht von diesem Benutzer nicht anzeigen, da sie ungültige "
 "Zeichen enthält.]"
 
-#: libpurple/protocols/oscar/oscar.c:3407
+#: ../libpurple/protocols/oscar/oscar.c:3366
 msgid ""
 "The last action you attempted could not be performed because you are over "
 "the rate limit. Please wait 10 seconds and try again."
@@ -7144,83 +7428,84 @@
 "Senderate überschritten wurde. Bitte warten Sie 10 Sekunden und versuchen "
 "Sie es erneut."
 
-#: libpurple/protocols/oscar/oscar.c:3490 libpurple/protocols/toc/toc.c:977
+#: ../libpurple/protocols/oscar/oscar.c:3449
+#: ../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:3738 libpurple/protocols/silc/util.c:585
-#: libpurple/protocols/silc10/util.c:581
+#: ../libpurple/protocols/oscar/oscar.c:3697
+#: ../libpurple/protocols/silc/util.c:585
+#: ../libpurple/protocols/silc10/util.c:581
 msgid "Mobile Phone"
 msgstr "Handynummer"
 
-#: libpurple/protocols/oscar/oscar.c:3768
+#: ../libpurple/protocols/oscar/oscar.c:3727
 msgid "Personal Web Page"
 msgstr "Persönliche Webseite"
 
-#: libpurple/protocols/oscar/oscar.c:3792
-#: libpurple/protocols/qq/buddy_info.c:40
+#: ../libpurple/protocols/oscar/oscar.c:3751
+#: ../libpurple/protocols/qq/buddy_info.c:40
 msgid "Additional Information"
 msgstr "Zusätzliche Informationen"
 
-#: libpurple/protocols/oscar/oscar.c:3800
-#: libpurple/protocols/oscar/oscar.c:3813
+#: ../libpurple/protocols/oscar/oscar.c:3759
+#: ../libpurple/protocols/oscar/oscar.c:3772
 msgid "Zip Code"
 msgstr "PLZ"
 
-#: libpurple/protocols/oscar/oscar.c:3824
+#: ../libpurple/protocols/oscar/oscar.c:3783
 msgid "Division"
 msgstr "Abteilung"
 
-#: libpurple/protocols/oscar/oscar.c:3825
+#: ../libpurple/protocols/oscar/oscar.c:3784
 msgid "Position"
 msgstr "Position"
 
-#: libpurple/protocols/oscar/oscar.c:3827
+#: ../libpurple/protocols/oscar/oscar.c:3786
 msgid "Web Page"
 msgstr "Webseite"
 
-#: libpurple/protocols/oscar/oscar.c:3830
+#: ../libpurple/protocols/oscar/oscar.c:3789
 msgid "Work Information"
 msgstr "Information (Arbeit)"
 
-#: libpurple/protocols/oscar/oscar.c:3886
+#: ../libpurple/protocols/oscar/oscar.c:3845
 msgid "Pop-Up Message"
 msgstr "Pop-Up Nachricht"
 
-#: libpurple/protocols/oscar/oscar.c:3926
+#: ../libpurple/protocols/oscar/oscar.c:3885
 #, 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:3931
+#: ../libpurple/protocols/oscar/oscar.c:3890
 msgid "Screen name"
 msgstr "Benutzername"
 
-#: libpurple/protocols/oscar/oscar.c:3957
+#: ../libpurple/protocols/oscar/oscar.c:3916
 #, 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:3978
+#: ../libpurple/protocols/oscar/oscar.c:3937
 #, 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:3980
+#: ../libpurple/protocols/oscar/oscar.c:3939
 msgid "Account Confirmation Requested"
 msgstr "Kontobestätigung wurde angefragt"
 
-#: libpurple/protocols/oscar/oscar.c:4011
-#, c-format
+#: ../libpurple/protocols/oscar/oscar.c:3970
 msgid "Error Changing Account Info"
 msgstr "Fehler beim Ändern der Konten-Information"
 
-#: libpurple/protocols/oscar/oscar.c:4014
+#: ../libpurple/protocols/oscar/oscar.c:3973
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
@@ -7229,14 +7514,14 @@
 "Fehler 0x%04x: Kann den Benutzernamen nicht formatieren, weil der Name vom "
 "Original abweicht."
 
-#: libpurple/protocols/oscar/oscar.c:4017
+#: ../libpurple/protocols/oscar/oscar.c:3976
 #, 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:4020
+#: ../libpurple/protocols/oscar/oscar.c:3979
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
@@ -7245,7 +7530,7 @@
 "Fehler 0x%04x: Kann den Benutzernamen nicht formatieren, weil der Name zu "
 "lang ist."
 
-#: libpurple/protocols/oscar/oscar.c:4023
+#: ../libpurple/protocols/oscar/oscar.c:3982
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change e-mail address because there is already a "
@@ -7254,7 +7539,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:4026
+#: ../libpurple/protocols/oscar/oscar.c:3985
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change e-mail address because the given address has "
@@ -7263,7 +7548,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:4029
+#: ../libpurple/protocols/oscar/oscar.c:3988
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change e-mail address because the given address is "
@@ -7272,32 +7557,32 @@
 "Fehler 0x%04x: Kann die E-Mail-Adresse nicht ändern, weil die angegebene "
 "Adresse falsch ist."
 
-#: libpurple/protocols/oscar/oscar.c:4032
+#: ../libpurple/protocols/oscar/oscar.c:3991
 #, c-format
 msgid "Error 0x%04x: Unknown error."
 msgstr "Fehler 0x%04x: Unbekannter Fehler."
 
-#: libpurple/protocols/oscar/oscar.c:4042
+#: ../libpurple/protocols/oscar/oscar.c:4001
 #, 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:4044
+#: ../libpurple/protocols/oscar/oscar.c:4003
 msgid "Account Info"
 msgstr "Konto-Info"
 
-#: libpurple/protocols/oscar/oscar.c:4216
+#: ../libpurple/protocols/oscar/oscar.c:4175
 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:4487
+#: ../libpurple/protocols/oscar/oscar.c:4446
 msgid "Unable to set AIM profile."
 msgstr "Kann das AIM-Profil nicht setzen."
 
-#: libpurple/protocols/oscar/oscar.c:4488
+#: ../libpurple/protocols/oscar/oscar.c:4447
 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 "
@@ -7307,7 +7592,7 @@
 "Anmeldeprozedur abgeschlossen war. Das Profil bleibt ungesetzt. Versuchen "
 "Sie es wieder, wenn Sie vollständig verbunden sind."
 
-#: libpurple/protocols/oscar/oscar.c:4502
+#: ../libpurple/protocols/oscar/oscar.c:4461
 #, c-format
 msgid ""
 "The maximum profile length of %d byte has been exceeded.  It has been "
@@ -7322,11 +7607,11 @@
 "Die maximale Profilgröße von %d Bytes wurde überschritten.  Es wurde für Sie "
 "abgeschnitten."
 
-#: libpurple/protocols/oscar/oscar.c:4507
+#: ../libpurple/protocols/oscar/oscar.c:4466
 msgid "Profile too long."
 msgstr "Profil zu lang."
 
-#: libpurple/protocols/oscar/oscar.c:4552
+#: ../libpurple/protocols/oscar/oscar.c:4511
 #, c-format
 msgid ""
 "The maximum away message length of %d byte has been exceeded.  It has been "
@@ -7341,11 +7626,11 @@
 "Die Abwesenheitsnachricht hat die maximale Größe von %d Bytes "
 "überschritten.  Sie wurde für Sie abgeschnitten."
 
-#: libpurple/protocols/oscar/oscar.c:4557
+#: ../libpurple/protocols/oscar/oscar.c:4516
 msgid "Away message too long."
 msgstr "Abwesenheitsmitteilungen zu lang."
 
-#: libpurple/protocols/oscar/oscar.c:4626
+#: ../libpurple/protocols/oscar/oscar.c:4585
 #, c-format
 msgid ""
 "Could not add the buddy %s because the screen name is invalid.  Screen names "
@@ -7357,17 +7642,17 @@
 "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
+#: ../libpurple/protocols/oscar/oscar.c:4587
+#: ../libpurple/protocols/oscar/oscar.c:5020
+#: ../libpurple/protocols/oscar/oscar.c:5035
 msgid "Unable To Add"
 msgstr "Kann nicht hinzufügen"
 
-#: libpurple/protocols/oscar/oscar.c:4732
+#: ../libpurple/protocols/oscar/oscar.c:4696
 msgid "Unable To Retrieve Buddy List"
 msgstr "Konnte Buddy-Liste nicht laden"
 
-#: libpurple/protocols/oscar/oscar.c:4733
+#: ../libpurple/protocols/oscar/oscar.c:4697
 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."
@@ -7376,16 +7661,15 @@
 "versenden. Ihre Buddy-Liste ist nicht verloren und wird wahrscheinlich in "
 "ein paar Stunden wieder verfügbar sein."
 
-#: 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
+#: ../libpurple/protocols/oscar/oscar.c:4879
+#: ../libpurple/protocols/oscar/oscar.c:4881
+#: ../libpurple/protocols/oscar/oscar.c:5089
+#: ../libpurple/protocols/oscar/oscar.c:5090
+#: ../libpurple/protocols/oscar/oscar.c:5095
 msgid "Orphans"
 msgstr "Waisen"
 
-#: libpurple/protocols/oscar/oscar.c:5049
+#: ../libpurple/protocols/oscar/oscar.c:5018
 #, c-format
 msgid ""
 "Could not add the buddy %s because you have too many buddies in your buddy "
@@ -7394,17 +7678,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:5049
-#: libpurple/protocols/oscar/oscar.c:5064
+#: ../libpurple/protocols/oscar/oscar.c:5018
+#: ../libpurple/protocols/oscar/oscar.c:5033
 msgid "(no name)"
 msgstr "(kein Name)"
 
-#: libpurple/protocols/oscar/oscar.c:5063
+#: ../libpurple/protocols/oscar/oscar.c:5032
 #, 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
+#: ../libpurple/protocols/oscar/oscar.c:5126
 #, c-format
 msgid ""
 "The user %s has given you permission to add you to their buddy list.  Do you "
@@ -7413,24 +7697,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:5165
+#: ../libpurple/protocols/oscar/oscar.c:5134
 msgid "Authorization Given"
 msgstr "Autorisierung wurde gegeben"
 
 #. Granted
-#: libpurple/protocols/oscar/oscar.c:5238
+#: ../libpurple/protocols/oscar/oscar.c:5207
 #, 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:5239
+#: ../libpurple/protocols/oscar/oscar.c:5208
 msgid "Authorization Granted"
 msgstr "Autorisierung erteilt"
 
 #. Denied
-#: libpurple/protocols/oscar/oscar.c:5242
+#: ../libpurple/protocols/oscar/oscar.c:5211
 #, c-format
 msgid ""
 "The user %s has denied your request to add them to your buddy list for the "
@@ -7441,52 +7725,53 @@
 "Liste hinzufügen zu dürfen, und zwar aus folgendem Grund:\n"
 "%s"
 
-#: libpurple/protocols/oscar/oscar.c:5243
+#: ../libpurple/protocols/oscar/oscar.c:5212
 msgid "Authorization Denied"
 msgstr "Autorisierung abgelehnt"
 
-#: libpurple/protocols/oscar/oscar.c:5279 libpurple/protocols/toc/toc.c:1371
+#: ../libpurple/protocols/oscar/oscar.c:5248
+#: ../libpurple/protocols/toc/toc.c:1371
 msgid "_Exchange:"
 msgstr "A_ustausch:"
 
-#: libpurple/protocols/oscar/oscar.c:5319
+#: ../libpurple/protocols/oscar/oscar.c:5288
 msgid "Invalid chat name specified."
 msgstr "Ungültiger Chat-Name angegeben."
 
-#: libpurple/protocols/oscar/oscar.c:5388
+#: ../libpurple/protocols/oscar/oscar.c:5357
 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:5548
-#: libpurple/protocols/oscar/oscar.c:5553
+#: ../libpurple/protocols/oscar/oscar.c:5517
+#: ../libpurple/protocols/oscar/oscar.c:5522
 msgid "Away Message"
 msgstr "Abwesenheitsnachricht"
 
-#: libpurple/protocols/oscar/oscar.c:5553
+#: ../libpurple/protocols/oscar/oscar.c:5522
 msgid "<i>(retrieving)</i>"
 msgstr "<i>(empfange)</i>"
 
-#: libpurple/protocols/oscar/oscar.c:5753
+#: ../libpurple/protocols/oscar/oscar.c:5722
 msgid "iTunes Music Store Link"
 msgstr "iTunes Music Store Link"
 
-#: libpurple/protocols/oscar/oscar.c:5861
+#: ../libpurple/protocols/oscar/oscar.c:5830
 #, c-format
 msgid "Buddy Comment for %s"
 msgstr "Buddy-Kommentar für %s"
 
-#: libpurple/protocols/oscar/oscar.c:5862
+#: ../libpurple/protocols/oscar/oscar.c:5831
 msgid "Buddy Comment:"
 msgstr "Buddy-Kommentar:"
 
-#: libpurple/protocols/oscar/oscar.c:5909
+#: ../libpurple/protocols/oscar/oscar.c:5878
 #, 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:5913
+#: ../libpurple/protocols/oscar/oscar.c:5882
 msgid ""
 "Because this reveals your IP address, it may be considered a security risk.  "
 "Do you wish to continue?"
@@ -7494,66 +7779,66 @@
 "Da dies Ihre IP-Adresse sichtbar macht, kann es als Sicherheitsrisiko "
 "betrachtet werden. Möchten Sie fortfahren?"
 
-#: libpurple/protocols/oscar/oscar.c:5919
-#: libpurple/protocols/oscar/peer.c:1022
+#: ../libpurple/protocols/oscar/oscar.c:5888
+#: ../libpurple/protocols/oscar/peer.c:1022
 msgid "C_onnect"
 msgstr "V_erbinden"
 
-#: libpurple/protocols/oscar/oscar.c:5954
+#: ../libpurple/protocols/oscar/oscar.c:5923
 msgid "Get AIM Info"
 msgstr "AIM-Info"
 
-#: libpurple/protocols/oscar/oscar.c:5960
+#: ../libpurple/protocols/oscar/oscar.c:5929
 msgid "Edit Buddy Comment"
 msgstr "Buddy-Kommentar bearbeiten"
 
-#: libpurple/protocols/oscar/oscar.c:5968
+#: ../libpurple/protocols/oscar/oscar.c:5937
 msgid "Get Status Msg"
 msgstr "Abwesenheitsmitteilung abrufen"
 
-#: libpurple/protocols/oscar/oscar.c:5981
+#: ../libpurple/protocols/oscar/oscar.c:5950
 msgid "Direct IM"
 msgstr "Direkte Nachricht"
 
-#: libpurple/protocols/oscar/oscar.c:6003
+#: ../libpurple/protocols/oscar/oscar.c:5972
 msgid "Re-request Authorization"
 msgstr "Nochmal nach Autorisierung fragen"
 
-#: libpurple/protocols/oscar/oscar.c:6062
+#: ../libpurple/protocols/oscar/oscar.c:6031
 msgid "Require authorization"
 msgstr "Autorisierung erforderlich"
 
-#: libpurple/protocols/oscar/oscar.c:6065
+#: ../libpurple/protocols/oscar/oscar.c:6034
 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:6070
+#: ../libpurple/protocols/oscar/oscar.c:6039
 msgid "ICQ Privacy Options"
 msgstr "ICQ Privatsphärenoptionen"
 
-#: libpurple/protocols/oscar/oscar.c:6089
+#: ../libpurple/protocols/oscar/oscar.c:6058
 msgid "The new formatting is invalid."
 msgstr "Die neue Formatierung ist ungültig."
 
-#: libpurple/protocols/oscar/oscar.c:6090
+#: ../libpurple/protocols/oscar/oscar.c:6059
 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:6143
+#: ../libpurple/protocols/oscar/oscar.c:6112
 msgid "Change Address To:"
 msgstr "Ändere die Adresse zu:"
 
-#: libpurple/protocols/oscar/oscar.c:6189
+#: ../libpurple/protocols/oscar/oscar.c:6158
 msgid "<i>you are not waiting for authorization</i>"
 msgstr "<i>Sie warten derzeit auf keine Autorisierungen</i>"
 
-#: libpurple/protocols/oscar/oscar.c:6192
+#: ../libpurple/protocols/oscar/oscar.c:6161
 msgid "You are awaiting authorization from the following buddies"
 msgstr "Sie warten auf Autorisierung von den folgenden Buddys"
 
-#: libpurple/protocols/oscar/oscar.c:6193
+#: ../libpurple/protocols/oscar/oscar.c:6162
 msgid ""
 "You can re-request authorization from these buddies by right-clicking on "
 "them and selecting \"Re-request Authorization.\""
@@ -7562,73 +7847,73 @@
 "den Buddy mit einem Rechtsklick anklicken und „Nochmal nach Autorisierung "
 "fragen“ auswählen."
 
-#: libpurple/protocols/oscar/oscar.c:6210
+#: ../libpurple/protocols/oscar/oscar.c:6179
 msgid "Find Buddy by E-Mail"
 msgstr "Suche Buddys nach E-Mail-Adresse"
 
-#: libpurple/protocols/oscar/oscar.c:6211
+#: ../libpurple/protocols/oscar/oscar.c:6180
 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:6212
+#: ../libpurple/protocols/oscar/oscar.c:6181
 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:6215
+#: ../libpurple/protocols/oscar/oscar.c:6184
 msgid "_Search"
 msgstr "_Suchen"
 
-#: libpurple/protocols/oscar/oscar.c:6373
+#: ../libpurple/protocols/oscar/oscar.c:6342
 msgid "Set User Info (URL)..."
 msgstr "Benutzer-Info (URL) setzen..."
 
-#: libpurple/protocols/oscar/oscar.c:6384
+#: ../libpurple/protocols/oscar/oscar.c:6353
 msgid "Change Password (URL)"
 msgstr "Ändere Passwort (URL)"
 
-#: libpurple/protocols/oscar/oscar.c:6388
+#: ../libpurple/protocols/oscar/oscar.c:6357
 msgid "Configure IM Forwarding (URL)"
 msgstr "Konfiguriere IM-Weiterleitung (URL)"
 
 #. ICQ actions
-#: libpurple/protocols/oscar/oscar.c:6398
+#: ../libpurple/protocols/oscar/oscar.c:6367
 msgid "Set Privacy Options..."
 msgstr "Privatsphärenoptionen setzen..."
 
 #. AIM actions
-#: libpurple/protocols/oscar/oscar.c:6405
+#: ../libpurple/protocols/oscar/oscar.c:6374
 msgid "Confirm Account"
 msgstr "Konto bestätigen"
 
-#: libpurple/protocols/oscar/oscar.c:6409
+#: ../libpurple/protocols/oscar/oscar.c:6378
 msgid "Display Currently Registered E-Mail Address"
 msgstr "Zeige die aktuell registrierte E-Mail-Adresse"
 
-#: libpurple/protocols/oscar/oscar.c:6413
+#: ../libpurple/protocols/oscar/oscar.c:6382
 msgid "Change Currently Registered E-Mail Address..."
 msgstr "Ändere die aktuell registrierte E-Mail-Adresse..."
 
-#: libpurple/protocols/oscar/oscar.c:6420
+#: ../libpurple/protocols/oscar/oscar.c:6389
 msgid "Show Buddies Awaiting Authorization"
 msgstr "Zeige Buddys, von denen Sie Autorisierung erwarten"
 
-#: libpurple/protocols/oscar/oscar.c:6426
+#: ../libpurple/protocols/oscar/oscar.c:6395
 msgid "Search for Buddy by E-Mail Address..."
 msgstr "Suche Buddys nach E-Mail-Adresse..."
 
-#: libpurple/protocols/oscar/oscar.c:6431
+#: ../libpurple/protocols/oscar/oscar.c:6400
 msgid "Search for Buddy by Information"
 msgstr "Suche Buddy nach Information"
 
-#: libpurple/protocols/oscar/oscar.c:6499
+#: ../libpurple/protocols/oscar/oscar.c:6468
 msgid "Use recent buddies group"
 msgstr "Benutze neueste Gruppe"
 
-#: libpurple/protocols/oscar/oscar.c:6502
+#: ../libpurple/protocols/oscar/oscar.c:6471
 msgid "Show how long you have been idle"
 msgstr "Anzeigen, wie lange ich untätig war"
 
-#: libpurple/protocols/oscar/oscar.c:6657
+#: ../libpurple/protocols/oscar/oscar.c:6626
 msgid ""
 "Always use ICQ proxy server for file transfers\n"
 "(slower, but does not reveal your IP address)"
@@ -7636,27 +7921,26 @@
 "Benutze immer den AIM/ICQ-Proxyserver\n"
 "(langsamer, aber zeigt Ihre IP-Adresse nicht)"
 
-#: libpurple/protocols/oscar/peer.c:674
+#: ../libpurple/protocols/oscar/peer.c:674
 #, c-format
 msgid "Asking %s to connect to us at %s:%hu for Direct IM."
 msgstr "Frage %s, ob er sich zu uns auf %s:%hu für Direkt-IM verbinden möchte."
 
-#: libpurple/protocols/oscar/peer.c:759
+#: ../libpurple/protocols/oscar/peer.c:759
 #, c-format
 msgid "Attempting to connect to %s:%hu."
 msgstr "Verbindungsversuch mit %s:%hu."
 
-#: libpurple/protocols/oscar/peer.c:833
-#, c-format
+#: ../libpurple/protocols/oscar/peer.c:833
 msgid "Attempting to connect via proxy server."
 msgstr "Verbindungsversuch über einen Proxyserver."
 
-#: libpurple/protocols/oscar/peer.c:1010
+#: ../libpurple/protocols/oscar/peer.c:1010
 #, c-format
 msgid "%s has just asked to directly connect to %s"
 msgstr "%s hat nach einer direkten Verbindung zu %s gefragt"
 
-#: libpurple/protocols/oscar/peer.c:1014
+#: ../libpurple/protocols/oscar/peer.c:1014
 msgid ""
 "This requires a direct connection between the two computers and is necessary "
 "for IM Images.  Because your IP address will be revealed, this may be "
@@ -7666,172 +7950,172 @@
 "ist notwendig für IM-Bilder. Da Ihre IP-Adresse verwendet wird, kann dies "
 "eine Verletzung der Privatsphäre bedeuten."
 
-#: libpurple/protocols/qq/buddy_info.c:39
+#: ../libpurple/protocols/qq/buddy_info.c:39
 msgid "Primary Information"
 msgstr "Primäre Informationen"
 
-#: libpurple/protocols/qq/buddy_info.c:41
+#: ../libpurple/protocols/qq/buddy_info.c:41
 msgid "Personal Introduction"
 msgstr "Persönliche Vorstellung"
 
-#: libpurple/protocols/qq/buddy_info.c:42
+#: ../libpurple/protocols/qq/buddy_info.c:42
 msgid "QQ Number"
 msgstr "QQ-Nummer"
 
-#: libpurple/protocols/qq/buddy_info.c:47
+#: ../libpurple/protocols/qq/buddy_info.c:47
 msgid "Country/Region"
 msgstr "Land/Region"
 
-#: libpurple/protocols/qq/buddy_info.c:48
+#: ../libpurple/protocols/qq/buddy_info.c:48
 msgid "Province/State"
 msgstr "Provinz/Staat"
 
-#: libpurple/protocols/qq/buddy_info.c:50
+#: ../libpurple/protocols/qq/buddy_info.c:50
 msgid "Horoscope Symbol"
 msgstr "Horoskopsymbol"
 
-#: libpurple/protocols/qq/buddy_info.c:52
+#: ../libpurple/protocols/qq/buddy_info.c:52
 msgid "Zodiac Sign"
 msgstr "Sternzeichen"
 
-#: libpurple/protocols/qq/buddy_info.c:53
+#: ../libpurple/protocols/qq/buddy_info.c:53
 msgid "Blood Type"
 msgstr "Blutgruppe"
 
-#: libpurple/protocols/qq/buddy_info.c:54
+#: ../libpurple/protocols/qq/buddy_info.c:54
 msgid "College"
 msgstr "College"
 
-#: libpurple/protocols/qq/buddy_info.c:55
+#: ../libpurple/protocols/qq/buddy_info.c:55
 msgid "Email"
 msgstr "E-Mail"
 
-#: libpurple/protocols/qq/buddy_info.c:57
+#: ../libpurple/protocols/qq/buddy_info.c:57
 msgid "Zipcode"
 msgstr "PLZ"
 
-#: libpurple/protocols/qq/buddy_info.c:58
+#: ../libpurple/protocols/qq/buddy_info.c:58
 msgid "Cellphone Number"
 msgstr "Handy-Telefonnummer"
 
-#: libpurple/protocols/qq/buddy_info.c:59
+#: ../libpurple/protocols/qq/buddy_info.c:59
 msgid "Phone Number"
 msgstr "Telefonnummer"
 
-#: libpurple/protocols/qq/buddy_info.c:64
+#: ../libpurple/protocols/qq/buddy_info.c:64
 msgid "Aquarius"
 msgstr "Wassermann"
 
-#: libpurple/protocols/qq/buddy_info.c:64
+#: ../libpurple/protocols/qq/buddy_info.c:64
 msgid "Pisces"
 msgstr "Fische"
 
-#: libpurple/protocols/qq/buddy_info.c:64
+#: ../libpurple/protocols/qq/buddy_info.c:64
 msgid "Aries"
 msgstr "Widder"
 
-#: libpurple/protocols/qq/buddy_info.c:64
+#: ../libpurple/protocols/qq/buddy_info.c:64
 msgid "Taurus"
 msgstr "Stier"
 
-#: libpurple/protocols/qq/buddy_info.c:65
+#: ../libpurple/protocols/qq/buddy_info.c:65
 msgid "Gemini"
 msgstr "Zwillinge"
 
-#: libpurple/protocols/qq/buddy_info.c:65
+#: ../libpurple/protocols/qq/buddy_info.c:65
 msgid "Cancer"
 msgstr "Krebs"
 
-#: libpurple/protocols/qq/buddy_info.c:65
+#: ../libpurple/protocols/qq/buddy_info.c:65
 msgid "Leo"
 msgstr "Löwe"
 
-#: libpurple/protocols/qq/buddy_info.c:65
+#: ../libpurple/protocols/qq/buddy_info.c:65
 msgid "Virgo"
 msgstr "Jungfrau"
 
-#: libpurple/protocols/qq/buddy_info.c:65
+#: ../libpurple/protocols/qq/buddy_info.c:65
 msgid "Libra"
 msgstr "Waage"
 
-#: libpurple/protocols/qq/buddy_info.c:66
+#: ../libpurple/protocols/qq/buddy_info.c:66
 msgid "Scorpio"
 msgstr "Skorpion"
 
-#: libpurple/protocols/qq/buddy_info.c:66
+#: ../libpurple/protocols/qq/buddy_info.c:66
 msgid "Sagittarius"
 msgstr "Schütze"
 
-#: libpurple/protocols/qq/buddy_info.c:66
+#: ../libpurple/protocols/qq/buddy_info.c:66
 msgid "Capricorn"
 msgstr "Steinbock"
 
-#: libpurple/protocols/qq/buddy_info.c:71
+#: ../libpurple/protocols/qq/buddy_info.c:71
 msgid "Rat"
 msgstr "Ratte"
 
-#: libpurple/protocols/qq/buddy_info.c:71
+#: ../libpurple/protocols/qq/buddy_info.c:71
 msgid "Ox"
 msgstr "Ochse"
 
-#: libpurple/protocols/qq/buddy_info.c:71
+#: ../libpurple/protocols/qq/buddy_info.c:71
 msgid "Tiger"
 msgstr "Tiger"
 
-#: libpurple/protocols/qq/buddy_info.c:71
+#: ../libpurple/protocols/qq/buddy_info.c:71
 msgid "Rabbit"
 msgstr "Kaninchen"
 
-#: libpurple/protocols/qq/buddy_info.c:72
+#: ../libpurple/protocols/qq/buddy_info.c:72
 msgid "Dragon"
 msgstr "Drache"
 
-#: libpurple/protocols/qq/buddy_info.c:72
+#: ../libpurple/protocols/qq/buddy_info.c:72
 msgid "Snake"
 msgstr "Schlange"
 
-#: libpurple/protocols/qq/buddy_info.c:72
+#: ../libpurple/protocols/qq/buddy_info.c:72
 msgid "Horse"
 msgstr "Pferd"
 
-#: libpurple/protocols/qq/buddy_info.c:72
+#: ../libpurple/protocols/qq/buddy_info.c:72
 msgid "Goat"
 msgstr "Gans"
 
-#: libpurple/protocols/qq/buddy_info.c:72
+#: ../libpurple/protocols/qq/buddy_info.c:72
 msgid "Monkey"
 msgstr "Affe"
 
-#: libpurple/protocols/qq/buddy_info.c:73
+#: ../libpurple/protocols/qq/buddy_info.c:73
 msgid "Rooster"
 msgstr "Hahn"
 
-#: libpurple/protocols/qq/buddy_info.c:73
+#: ../libpurple/protocols/qq/buddy_info.c:73
 msgid "Dog"
 msgstr "Hund"
 
-#: libpurple/protocols/qq/buddy_info.c:73
+#: ../libpurple/protocols/qq/buddy_info.c:73
 msgid "Pig"
 msgstr "Schwein"
 
-#: libpurple/protocols/qq/buddy_info.c:78
+#: ../libpurple/protocols/qq/buddy_info.c:78
 msgid "Other"
 msgstr "Andere"
 
-#: libpurple/protocols/qq/buddy_info.c:481
-#: libpurple/protocols/qq/buddy_info.c:482
+#: ../libpurple/protocols/qq/buddy_info.c:481
+#: ../libpurple/protocols/qq/buddy_info.c:482
 msgid "Modify my information"
 msgstr "Meine Informationen bearbeiten"
 
-#: libpurple/protocols/qq/buddy_info.c:483
+#: ../libpurple/protocols/qq/buddy_info.c:483
 msgid "Update my information"
 msgstr "Meine Informationen aktualisieren"
 
-#: libpurple/protocols/qq/buddy_info.c:507
+#: ../libpurple/protocols/qq/buddy_info.c:507
 msgid "Your information has been updated"
 msgstr "Ihre Informationen wurden aktualisiert"
 
-#: libpurple/protocols/qq/buddy_info.c:560
+#: ../libpurple/protocols/qq/buddy_info.c:560
 #, c-format
 msgid ""
 "Setting custom faces is not currently supported. Please choose an image from "
@@ -7840,219 +8124,225 @@
 "Das Setzen von benutzerdefinierten Gesichtern wird momentan nicht "
 "unterstützt. Bitte wählen Sie ein Bild von %s."
 
-#: libpurple/protocols/qq/buddy_info.c:577
-#: libpurple/protocols/qq/buddy_info.c:590
+#: ../libpurple/protocols/qq/buddy_info.c:577
+#: ../libpurple/protocols/qq/buddy_info.c:590
 msgid "Invalid QQ Face"
 msgstr "Ungültiges QQ-Gesicht"
 
 # c-format
-#: libpurple/protocols/qq/buddy_opt.c:208
-#: libpurple/protocols/qq/group_opt.c:136
+#: ../libpurple/protocols/qq/buddy_opt.c:208
+#: ../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:137
+#: ../libpurple/protocols/qq/buddy_opt.c:209
 msgid "Input your reason:"
 msgstr "Geben Sie Ihren Grund an:"
 
-#: libpurple/protocols/qq/buddy_opt.c:212
+#: ../libpurple/protocols/qq/buddy_opt.c:212
 msgid "Reject request"
 msgstr "Anfrage ablehnen"
 
 #. title
-#: libpurple/protocols/qq/buddy_opt.c:213
-#: libpurple/protocols/qq/group_opt.c:141
+#: ../libpurple/protocols/qq/buddy_opt.c:213
+#: ../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:144
-#: libpurple/protocols/qq/group_opt.c:127 libpurple/protocols/qq/sys_msg.c:91
-#: libpurple/protocols/qq/sys_msg.c:249
+#: ../libpurple/protocols/qq/buddy_opt.c:214
+#: ../libpurple/protocols/qq/group_im.c:144
+#: ../libpurple/protocols/qq/group_opt.c:127
+#: ../libpurple/protocols/qq/sys_msg.c:90
+#: ../libpurple/protocols/qq/sys_msg.c:246
 msgid "Reject"
 msgstr "Ablehnen"
 
-#: libpurple/protocols/qq/buddy_opt.c:277
-msgid "Add buddy with auth request fails"
-msgstr "Benutzer hinzufügen, wenn Autorisierungsanfrage fehlschlägt"
-
-#: libpurple/protocols/qq/buddy_opt.c:308
+#: ../libpurple/protocols/qq/buddy_opt.c:277
+msgid "Add buddy with auth request failed"
+msgstr "Benutzer hinzufügen, wenn Autorisierungsanfrage fehlschlug"
+
+#. TODO: We don't really need to notify the user about this, do we?
+#: ../libpurple/protocols/qq/buddy_opt.c:309
 msgid "You have successfully removed a buddy"
 msgstr "Sie haben einen Buddy entfernt"
 
-#: libpurple/protocols/qq/buddy_opt.c:336
-msgid "You have successfully removed yourself from a buddy"
-msgstr "Sie haben sich erfolgreich von einem Buddy entfernt"
-
-#: libpurple/protocols/qq/buddy_opt.c:402
+#. TODO: Does the user really need to be notified about this?
+#: ../libpurple/protocols/qq/buddy_opt.c:338
+msgid "You have successfully removed yourself from your friend's buddy list"
+msgstr "Sie haben sich erfolgreich von der Kontaktliste Ihres Freunds entfernt"
+
+#: ../libpurple/protocols/qq/buddy_opt.c:404
 #, c-format
 msgid "User %d needs authentication"
 msgstr "Benutzer %d benötigt Authentifizierung"
 
-#: libpurple/protocols/qq/buddy_opt.c:404
-#: libpurple/protocols/qq/group_join.c:136
+#: ../libpurple/protocols/qq/buddy_opt.c:406
+#: ../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:137
+#: ../libpurple/protocols/qq/buddy_opt.c:407
+#: ../libpurple/protocols/qq/group_join.c:137
 msgid "Would you be my friend?"
 msgstr "Möchten Sie mein Freund sein?"
 
 #. multiline
 #. masked
 #. hint
-#: libpurple/protocols/qq/buddy_opt.c:406
-#: libpurple/protocols/qq/group_join.c:138
-#: libpurple/protocols/qq/group_opt.c:143
+#: ../libpurple/protocols/qq/buddy_opt.c:408
+#: ../libpurple/protocols/qq/group_join.c:138
+#: ../libpurple/protocols/qq/group_opt.c:143
 msgid "Send"
 msgstr "Senden"
 
-#: libpurple/protocols/qq/buddy_opt.c:416
-#, c-format
-msgid "You have added %d in buddy list"
+#: ../libpurple/protocols/qq/buddy_opt.c:418
+#, c-format
+msgid "You have added %d to buddy list"
 msgstr "Sie haben %d zu Ihrer Buddy-Liste hinzugefügt"
 
-#: libpurple/protocols/qq/buddy_opt.c:513
+#: ../libpurple/protocols/qq/buddy_opt.c:515
 msgid "QQid Error"
 msgstr "QQid-Fehler"
 
-#: libpurple/protocols/qq/buddy_opt.c:514
+#: ../libpurple/protocols/qq/buddy_opt.c:516
 msgid "Invalid QQid"
 msgstr "Ungültige QQid"
 
-#: libpurple/protocols/qq/group.c:65
+#: ../libpurple/protocols/qq/group.c:65
 msgid "ID: "
 msgstr "ID: "
 
-#: libpurple/protocols/qq/group.c:98
+#: ../libpurple/protocols/qq/group.c:98
 msgid "Group ID"
 msgstr "Gruppen-ID"
 
-#: libpurple/protocols/qq/group.c:100
+#: ../libpurple/protocols/qq/group.c:100
 msgid "Creator"
 msgstr "Ersteller"
 
-#: libpurple/protocols/qq/group.c:103
+#: ../libpurple/protocols/qq/group.c:103
 msgid "Group Description"
 msgstr "Gruppenbeschreibung"
 
-#: libpurple/protocols/qq/group.c:109
+#: ../libpurple/protocols/qq/group.c:109
 msgid "Auth"
 msgstr "Autorisieren"
 
-#: libpurple/protocols/qq/group.c:119
+#: ../libpurple/protocols/qq/group.c:119
 msgid "QQ Qun"
 msgstr "QQ-Qun"
 
-#: libpurple/protocols/qq/group.c:120
-msgid "Please input external group ID"
-msgstr "Bitte geben sie die externe Gruppen-ID an"
-
-#: libpurple/protocols/qq/group.c:121
+#: ../libpurple/protocols/qq/group.c:120
+msgid "Please enter external group ID"
+msgstr "Bitte geben Sie die externe Gruppen-ID an"
+
+#: ../libpurple/protocols/qq/group.c:121
 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:126
-#, c-format
-msgid "User %d applied to join group %d"
+#: ../libpurple/protocols/qq/group_im.c:126
+#, c-format
+msgid "User %d requested to join group %d"
 msgstr "Benutzer %d möchte der Gruppe %d beitreten"
 
-#: libpurple/protocols/qq/group_im.c:127 libpurple/protocols/qq/group_im.c:181
-#: libpurple/protocols/qq/sys_msg.c:195
+#: ../libpurple/protocols/qq/group_im.c:127
+#: ../libpurple/protocols/qq/group_im.c:181
+#: ../libpurple/protocols/qq/sys_msg.c:193
 #, c-format
 msgid "Reason: %s"
 msgstr "Grund: %s"
 
-#: 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
+#: ../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:141
-#: libpurple/protocols/qq/group_opt.c:128 libpurple/protocols/qq/sys_msg.c:92
-#: libpurple/protocols/qq/sys_msg.c:251
+#: ../libpurple/protocols/qq/group_im.c:141
+#: ../libpurple/protocols/qq/group_opt.c:128
+#: ../libpurple/protocols/qq/sys_msg.c:91
+#: ../libpurple/protocols/qq/sys_msg.c:248
 msgid "Approve"
 msgstr "Akzeptieren"
 
-#: libpurple/protocols/qq/group_im.c:180
-#, c-format
-msgid "You request to join group %d has been rejected by admin %d"
+#: ../libpurple/protocols/qq/group_im.c:180
+#, c-format
+msgid "Your 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:221
-#, c-format
-msgid "You request to join group %d has been approved by admin %d"
+#: ../libpurple/protocols/qq/group_im.c:221
+#, c-format
+msgid "Your 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:257
-#, c-format
-msgid "You [%d] has exit group \"%d\""
+#: ../libpurple/protocols/qq/group_im.c:257
+#, c-format
+msgid "You [%d] have left group \"%d\""
 msgstr "Sie [%d] haben die Gruppe \"%d\" verlassen"
 
-#: libpurple/protocols/qq/group_im.c:291
-#, c-format
-msgid "You [%d] has been added by group \"%d\""
+#: ../libpurple/protocols/qq/group_im.c:291
+#, c-format
+msgid "You [%d] have been added to group \"%d\""
 msgstr "Sie [%d] wurden der Gruppe \"%d\" hinzugefügt"
 
-#: libpurple/protocols/qq/group_im.c:292
+#: ../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"
 
-#: libpurple/protocols/qq/group_internal.c:41
-msgid "I am not member"
+#: ../libpurple/protocols/qq/group_internal.c:41
+msgid "I am not a member"
 msgstr "Ich bin kein Mitglied"
 
-#: libpurple/protocols/qq/group_internal.c:44
+#: ../libpurple/protocols/qq/group_internal.c:44
 msgid "I am a member"
 msgstr "Ich bin Mitglied"
 
-#: libpurple/protocols/qq/group_internal.c:47
+#: ../libpurple/protocols/qq/group_internal.c:47
 msgid "I am applying to join"
 msgstr "Ich möchte beitreten"
 
-#: libpurple/protocols/qq/group_internal.c:50
+#: ../libpurple/protocols/qq/group_internal.c:50
 msgid "I am the admin"
 msgstr "Ich bin der Admin"
 
-#: libpurple/protocols/qq/group_internal.c:53
+#: ../libpurple/protocols/qq/group_internal.c:53
 msgid "Unknown status"
 msgstr "Unbekannter Status"
 
-#: libpurple/protocols/qq/group_join.c:82
+#: ../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:233
-msgid "You have successfully exited the group"
-msgstr "Sie haben die Gruppe verlassen"
-
-#: libpurple/protocols/qq/group_join.c:257
+#: ../libpurple/protocols/qq/group_join.c:233
+msgid "You have successfully left the group"
+msgstr "Sie haben die Gruppe erfolgreich verlassen"
+
+#: ../libpurple/protocols/qq/group_join.c:257
 msgid "QQ Group Auth"
 msgstr "QQ-Gruppenauthentifikation"
 
-#: 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:329
-msgid "You inputted a group id outside the acceptable range"
+#: ../libpurple/protocols/qq/group_join.c:258
+msgid "Your authorization request has been accepted by the QQ server"
+msgstr "Ihre Autorisierungsanfrage wurde vom QQ-Server akzeptiert"
+
+#: ../libpurple/protocols/qq/group_join.c:329
+msgid "You entered 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:360
-msgid "Are you sure to exit this Qun?"
+#: ../libpurple/protocols/qq/group_join.c:360
+msgid "Are you sure you want to leave this Qun?"
 msgstr "Wollen Sie dieses Qun wirklich verlassen?"
 
-#: libpurple/protocols/qq/group_join.c:362
+#: ../libpurple/protocols/qq/group_join.c:362
 msgid ""
 "Note, if you are the creator, \n"
 "this operation will eventually remove this Qun."
@@ -8060,172 +8350,155 @@
 "Beachten Sie, dass diese Operation den Qun entfernen könnte, \n"
 "wenn Sie der Ersteller sind."
 
-#: libpurple/protocols/qq/group_join.c:367
-msgid "Go ahead"
-msgstr "Fortfahren"
-
-#: libpurple/protocols/qq/group_network.c:92
+#: ../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:93
+#: ../libpurple/protocols/qq/group_network.c:93
 msgid "Group Operation Error"
 msgstr "Gruppenoperationsfehler"
 
-#. we wanna see window
-#: libpurple/protocols/qq/group_opt.c:124 libpurple/protocols/qq/sys_msg.c:88
-msgid "Do you wanna approve the request?"
+#. we want to see window
+#: ../libpurple/protocols/qq/group_opt.c:124
+#: ../libpurple/protocols/qq/sys_msg.c:87
+msgid "Do you want to approve the request?"
 msgstr "Wollen sie die Anfrage akzeptieren?"
 
-#: libpurple/protocols/qq/group_opt.c:235
-msgid "You have successfully modify Qun member"
+#: ../libpurple/protocols/qq/group_opt.c:137
+msgid "Enter your reason:"
+msgstr "Geben Sie Ihren Grund an:"
+
+#: ../libpurple/protocols/qq/group_opt.c:235
+msgid "You have successfully modified Qun member"
 msgstr "Sie haben die Qun-Mitgliedschaft erfolgreich modifiziert"
 
-#: libpurple/protocols/qq/group_opt.c:305
-msgid "You have successfully modify Qun information"
+#: ../libpurple/protocols/qq/group_opt.c:305
+msgid "You have successfully modified Qun information"
 msgstr "Sie haben die Qun-Information erfolgreich modifiziert"
 
-#: libpurple/protocols/qq/group_opt.c:392
+#: ../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:394
+#: ../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:398
+#: ../libpurple/protocols/qq/group_opt.c:398
 msgid "Setup"
 msgstr "Setup"
 
-#: libpurple/protocols/qq/im.c:432
+#: ../libpurple/protocols/qq/im.c:432
 msgid "System Message"
 msgstr "Systemnachricht"
 
-#: libpurple/protocols/qq/im.c:576
-msgid "Server ACK"
-msgstr "Server-ACK"
-
-#: libpurple/protocols/qq/im.c:576
+#: ../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!"
-
-#: libpurple/protocols/qq/login_logout.c:408
-msgid "Request login token error!"
-msgstr "Fehler beim Anmelden!"
-
-#: libpurple/protocols/qq/login_logout.c:486
+#: ../libpurple/protocols/qq/keep_alive.c:87
+msgid "Keep alive error"
+msgstr "Fehler beim Aufrechterhalten der Verbindung (Keep alive)"
+
+#: ../libpurple/protocols/qq/login_logout.c:408
+msgid "Error requesting login token"
+msgstr "Fehler beim Abfragen des Anmelde-Tokens"
+
+#: ../libpurple/protocols/qq/login_logout.c:486
 msgid "Unable to login, check debug log"
 msgstr "Anmeldung fehlgeschlagen, Debugmitschnitt beachten"
 
 #. 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:109
-#: libpurple/protocols/yahoo/yahoo_filexfer.c:189
-#: libpurple/protocols/yahoo/ycht.c:549
+#: ../libpurple/protocols/qq/qq.c:139 ../libpurple/protocols/toc/toc.c:173
+#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:109
+#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:189
+#: ../libpurple/protocols/yahoo/ycht.c:549
 msgid "Unable to connect."
 msgstr "Verbindung nicht möglich."
 
-#: libpurple/protocols/qq/qq.c:186
+#: ../libpurple/protocols/qq/qq.c:186
 #, c-format
 msgid "Unknown-%d"
 msgstr "Unbekannt-%d"
 
-#: libpurple/protocols/qq/qq.c:209
-#, c-format
-msgid "%s Address"
-msgstr "%s Adresse"
-
-#: libpurple/protocols/qq/qq.c:240
+#: ../libpurple/protocols/qq/qq.c:211
+msgid "TCP Address"
+msgstr "TCP-Adresse"
+
+#: ../libpurple/protocols/qq/qq.c:213
+msgid "UDP Address"
+msgstr "UDP-Adresse"
+
+#: ../libpurple/protocols/qq/qq.c:242
 msgid "Level"
 msgstr "Stufe"
 
-#: libpurple/protocols/qq/qq.c:278
-msgid "QQ: Available"
-msgstr "QQ: Verfügbar"
-
-#: libpurple/protocols/qq/qq.c:282
-msgid "QQ: Away"
-msgstr "QQ: Abwesend"
-
-#: libpurple/protocols/qq/qq.c:286
-msgid "QQ: Invisible"
-msgstr "QQ: Unsichtbar"
-
-#: libpurple/protocols/qq/qq.c:290
-msgid "QQ: Offline"
-msgstr "QQ: Offline"
-
-#: libpurple/protocols/qq/qq.c:371
+#: ../libpurple/protocols/qq/qq.c:373
 msgid "Invalid name"
 msgstr "QQ: Ungültiger Name"
 
-#: libpurple/protocols/qq/qq.c:437
+#: ../libpurple/protocols/qq/qq.c:439
 #, c-format
 msgid "<b>Current Online</b>: %d<br>\n"
 msgstr "<b>Aktuell online:</b> %d<br>\n"
 
-#: libpurple/protocols/qq/qq.c:438
+#: ../libpurple/protocols/qq/qq.c:440
 #, c-format
 msgid "<b>Last Refresh</b>: %s<br>\n"
 msgstr "<b>Letzte Aktualisierung</b>: %s<br>\n"
 
-#: libpurple/protocols/qq/qq.c:442
+#: ../libpurple/protocols/qq/qq.c:444
 #, c-format
 msgid "<b>Connection Mode</b>: %s<br>\n"
 msgstr "<b>Verbindungsmodus</b>: %s<br>\n"
 
-#: libpurple/protocols/qq/qq.c:443
+#: ../libpurple/protocols/qq/qq.c:445
 #, c-format
 msgid "<b>Server IP</b>: %s: %d<br>\n"
 msgstr "<b>Server-IP</b>: %s: %d<br>\n"
 
-#: libpurple/protocols/qq/qq.c:444
+#: ../libpurple/protocols/qq/qq.c:446
 #, c-format
 msgid "<b>My Public IP</b>: %s<br>\n"
 msgstr "<b>Meine öffentlich IP</b>: %s<br>\n"
 
-#: libpurple/protocols/qq/qq.c:449
+#: ../libpurple/protocols/qq/qq.c:451
 #, c-format
 msgid "<b>Login Time</b>: %s<br>\n"
 msgstr "<b>Anmeldezeit</b>: %s<br>\n"
 
-#: libpurple/protocols/qq/qq.c:450
+#: ../libpurple/protocols/qq/qq.c:452
 #, c-format
 msgid "<b>Last Login IP</b>: %s<br>\n"
 msgstr "<b>Letzte Anmelde-IP</b>: %s<br>\n"
 
-#: libpurple/protocols/qq/qq.c:451
+#: ../libpurple/protocols/qq/qq.c:453
 #, c-format
 msgid "<b>Last Login Time</b>: %s\n"
 msgstr "<b>Letzte Anmeldezeit</b>: %s\n"
 
-#: libpurple/protocols/qq/qq.c:455
+#: ../libpurple/protocols/qq/qq.c:457
 msgid "Login Information"
 msgstr "Login-Informationen"
 
-#: libpurple/protocols/qq/qq.c:531
-msgid "Modify My Information"
-msgstr "Meine Informationen bearbeiten"
-
-#: libpurple/protocols/qq/qq.c:534 libpurple/protocols/toc/toc.c:1680
+#: ../libpurple/protocols/qq/qq.c:533
+msgid "Set My Information"
+msgstr "Meine Informationen festlegen"
+
+#: ../libpurple/protocols/qq/qq.c:536 ../libpurple/protocols/toc/toc.c:1680
 msgid "Change Password"
 msgstr "Passwort ändern"
 
-#: libpurple/protocols/qq/qq.c:537
+#: ../libpurple/protocols/qq/qq.c:539
 msgid "Show Login Information"
 msgstr "Login-Informationen anzeigen"
 
-#: libpurple/protocols/qq/qq.c:558
-msgid "Exit this QQ Qun"
+#: ../libpurple/protocols/qq/qq.c:560
+msgid "Leave this QQ Qun"
 msgstr "Dieses QQ-Qun verlassen"
 
-#: libpurple/protocols/qq/qq.c:582
+#: ../libpurple/protocols/qq/qq.c:584
 msgid "Block this buddy"
 msgstr "Diesen Buddy blockieren"
 
@@ -8239,249 +8512,236 @@
 #. *< version
 #. *  summary
 #. *  description
-#: libpurple/protocols/qq/qq.c:723 libpurple/protocols/qq/qq.c:725
+#: ../libpurple/protocols/qq/qq.c:725 ../libpurple/protocols/qq/qq.c:727
 msgid "QQ Protocol\tPlugin"
 msgstr "QQ-Protokoll-Plugin"
 
-#: libpurple/protocols/qq/qq.c:750
-msgid "Login in TCP"
-msgstr "Anmeldung mit TCP"
-
-#: libpurple/protocols/qq/qq.c:753
-msgid "Login Hidden"
-msgstr "Unsichtbar anmelden"
-
-#: libpurple/protocols/qq/qq_proxy.c:497
-msgid "Socket send error"
-msgstr "Socket-Sendefehler"
-
-#: libpurple/protocols/qq/qq_proxy.c:500
-msgid "Connection refused"
-msgstr "Verbindung abgelehnt"
-
-#: libpurple/protocols/qq/recv_core.c:309
+#: ../libpurple/protocols/qq/qq.c:752
+msgid "Connect using TCP"
+msgstr "Über TCP verbinden"
+
+#: ../libpurple/protocols/qq/recv_core.c:309
 msgid "Socket error"
 msgstr "Socket-Fehler"
 
-#: libpurple/protocols/qq/recv_core.c:319
+#: ../libpurple/protocols/qq/recv_core.c:319
 msgid "Unable to read from socket"
 msgstr "Socket kann nicht gelesen werden"
 
-#: libpurple/protocols/qq/send_file.c:707
+#: ../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:710
-#: libpurple/protocols/qq/send_file.c:739
+#: ../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:736
+#: ../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:123
+#: ../libpurple/protocols/qq/sendqueue.c:123
 msgid "Connection lost"
 msgstr "Verbindung verloren"
 
 #. cancel login progress
-#: libpurple/protocols/qq/sendqueue.c:131
+#: ../libpurple/protocols/qq/sendqueue.c:131
 msgid "Login failed, no reply"
 msgstr "Anmeldung fehlgeschlagen, keine Antwort"
 
-#: libpurple/protocols/qq/sys_msg.c:112
-msgid "Do you wanna add this buddy?"
-msgstr "Möchten Sie diesen Buddy zu Ihrer Buddy-Liste hinzufügen?"
+#: ../libpurple/protocols/qq/sys_msg.c:110
+msgid "Do you want to add this buddy?"
+msgstr "Möchten Sie diesen Buddy hinzufügen?"
 
 #. only need to get value
-#: libpurple/protocols/qq/sys_msg.c:168
+#: ../libpurple/protocols/qq/sys_msg.c:166
 #, c-format
 msgid "You have been added by %s"
 msgstr "Sie wurden von %s hinzugefügt"
 
-#: libpurple/protocols/qq/sys_msg.c:171
+#: ../libpurple/protocols/qq/sys_msg.c:169
 msgid "Would like to add him?"
 msgstr "Möchten Sie ihn hinzufügen?"
 
-#: libpurple/protocols/qq/sys_msg.c:178
-#, c-format
-msgid "%s has added you [%s]"
-msgstr "%s hat Sie [%s] hinzugefügt"
-
-#: libpurple/protocols/qq/sys_msg.c:194
+#: ../libpurple/protocols/qq/sys_msg.c:176
+#, c-format
+msgid "%s has added you [%s] to his or her buddy list"
+msgstr "%s hat Sie [%s] zu seiner Buddy-Liste hinzugefügt"
+
+#: ../libpurple/protocols/qq/sys_msg.c:192
 #, c-format
 msgid "User %s rejected your request"
 msgstr "Benutzer %s hat Ihre Anfrage abgelehnt"
 
-#: libpurple/protocols/qq/sys_msg.c:214
-#, c-format
-msgid "User %s has approved your request"
+#: ../libpurple/protocols/qq/sys_msg.c:212
+#, c-format
+msgid "User %s approved your request"
 msgstr "Benutzer %s hat Ihre Anfrage akzeptiert"
 
-#. TODO: 'wanna' is not an appropriate word for this string. Fix after string freeze
 #. TODO: this should go through purple_account_request_authorization()
-#: libpurple/protocols/qq/sys_msg.c:241
-#, c-format
-msgid "%s wanna add you [%s] as friends"
+#: ../libpurple/protocols/qq/sys_msg.c:238
+#, c-format
+msgid "%s wants to add you [%s] as a friend"
 msgstr "%s möchte Sie [%s] als Freund hinzufügen"
 
-#: libpurple/protocols/qq/sys_msg.c:242
+#: ../libpurple/protocols/qq/sys_msg.c:239
 #, c-format
 msgid "Message: %s"
 msgstr "Nachricht: %s"
 
-#: libpurple/protocols/qq/sys_msg.c:264
+#: ../libpurple/protocols/qq/sys_msg.c:261
 #, c-format
 msgid "%s is not in your buddy list"
 msgstr "%s ist nicht in Ihrer Buddy-Liste"
 
-#: libpurple/protocols/qq/sys_msg.c:266
+#: ../libpurple/protocols/qq/sys_msg.c:263
 msgid "Would you like to add him?"
 msgstr "Möchten Sie ihn hinzufügen?"
 
-#: libpurple/protocols/sametime/sametime.c:417
+#: ../libpurple/protocols/sametime/sametime.c:417
 msgid "Connection closed (writing)"
 msgstr "Verbindung geschlossen (schreibend)"
 
-#: libpurple/protocols/sametime/sametime.c:1290
+#: ../libpurple/protocols/sametime/sametime.c:1290
 #, c-format
 msgid "<b>Group Title:</b> %s<br>"
 msgstr "<b>Gruppentitel:</b> %s<br>"
 
-#: libpurple/protocols/sametime/sametime.c:1291
+#: ../libpurple/protocols/sametime/sametime.c:1291
 #, c-format
 msgid "<b>Notes Group ID:</b> %s<br>"
 msgstr "<b>Notes-Gruppen-ID:</b> %s<br>"
 
-#: libpurple/protocols/sametime/sametime.c:1293
+#: ../libpurple/protocols/sametime/sametime.c:1293
 #, c-format
 msgid "Info for Group %s"
 msgstr "Info zur Gruppe %s"
 
-#: libpurple/protocols/sametime/sametime.c:1295
+#: ../libpurple/protocols/sametime/sametime.c:1295
 msgid "Notes Address Book Information"
 msgstr "Notes Adressbuch-Information"
 
-#: libpurple/protocols/sametime/sametime.c:1327
+#: ../libpurple/protocols/sametime/sametime.c:1327
 msgid "Invite Group to Conference..."
 msgstr "Gruppe zu Konferenz einladen..."
 
-#: libpurple/protocols/sametime/sametime.c:1337
+#: ../libpurple/protocols/sametime/sametime.c:1337
 msgid "Get Notes Address Book Info"
 msgstr "Notes Adressbuch-Info anzeigen"
 
-#: libpurple/protocols/sametime/sametime.c:1504
+#: ../libpurple/protocols/sametime/sametime.c:1504
 msgid "Sending Handshake"
 msgstr "Sende Handshake"
 
-#: libpurple/protocols/sametime/sametime.c:1509
+#: ../libpurple/protocols/sametime/sametime.c:1509
 msgid "Waiting for Handshake Acknowledgement"
 msgstr "Warte auf Bestätigung des Handshakes"
 
-#: libpurple/protocols/sametime/sametime.c:1514
+#: ../libpurple/protocols/sametime/sametime.c:1514
 msgid "Handshake Acknowledged, Sending Login"
 msgstr "Handshake bestätigt, sende Login"
 
-#: libpurple/protocols/sametime/sametime.c:1519
+#: ../libpurple/protocols/sametime/sametime.c:1519
 msgid "Waiting for Login Acknowledgement"
 msgstr "Warte auf Login-Bestätigung"
 
-#: libpurple/protocols/sametime/sametime.c:1524
+#: ../libpurple/protocols/sametime/sametime.c:1524
 msgid "Login Redirected"
 msgstr "Login umgeleitet"
 
-#: libpurple/protocols/sametime/sametime.c:1530
+#: ../libpurple/protocols/sametime/sametime.c:1530
 msgid "Forcing Login"
 msgstr "Erzwinge Login"
 
-#: libpurple/protocols/sametime/sametime.c:1534
+#: ../libpurple/protocols/sametime/sametime.c:1534
 msgid "Login Acknowledged"
 msgstr "Login bestätigt"
 
-#: libpurple/protocols/sametime/sametime.c:1539
+#: ../libpurple/protocols/sametime/sametime.c:1539
 msgid "Starting Services"
 msgstr "Starte Dienste"
 
-#: libpurple/protocols/sametime/sametime.c:1544
+#: ../libpurple/protocols/sametime/sametime.c:1544
 msgid "Connected"
 msgstr "Verbunden"
 
-#: libpurple/protocols/sametime/sametime.c:1645
+#: ../libpurple/protocols/sametime/sametime.c:1645
 #, c-format
 msgid ""
 "A Sametime administrator has issued the following announcement on server %s"
 msgstr ""
 "Ein Sametime-Administrator hat die folgende Ankündigung auf Server %s gemacht"
 
-#: libpurple/protocols/sametime/sametime.c:1650
+#: ../libpurple/protocols/sametime/sametime.c:1650
 msgid "Sametime Administrator Announcement"
 msgstr "Sametime-Administrator-Ankündigung"
 
-#: libpurple/protocols/sametime/sametime.c:1702
+#: ../libpurple/protocols/sametime/sametime.c:1702
 msgid "Connection reset"
 msgstr "Verbindung zurückgesetzt"
 
-#: libpurple/protocols/sametime/sametime.c:1709
+#: ../libpurple/protocols/sametime/sametime.c:1709
 #, c-format
 msgid "Error reading from socket: %s"
 msgstr "Fehler beim Lesen des Socket: %s"
 
 #. this is a regular connect, error out
-#: libpurple/protocols/sametime/sametime.c:1732
-#: libpurple/protocols/sametime/sametime.c:3727
+#: ../libpurple/protocols/sametime/sametime.c:1732
+#: ../libpurple/protocols/sametime/sametime.c:3727
 msgid "Unable to connect to host"
 msgstr "Verbindung zum Server nicht möglich"
 
-#: libpurple/protocols/sametime/sametime.c:1770
+#: ../libpurple/protocols/sametime/sametime.c:1770
 #, c-format
 msgid "Announcement from %s"
 msgstr "Ankündigung von %s"
 
-#: libpurple/protocols/sametime/sametime.c:1944
+#: ../libpurple/protocols/sametime/sametime.c:1944
 msgid "Conference Closed"
 msgstr "Konferenz geschlossen"
 
-#: libpurple/protocols/sametime/sametime.c:2403
+#: ../libpurple/protocols/sametime/sametime.c:2403
 msgid "Unable to send message: "
 msgstr "Kann die Nachricht nicht senden: "
 
-#: libpurple/protocols/sametime/sametime.c:2959
+#: ../libpurple/protocols/sametime/sametime.c:2959
 msgid "Place Closed"
 msgstr "Platz geschlossen"
 
-#: libpurple/protocols/sametime/sametime.c:3230
+#: ../libpurple/protocols/sametime/sametime.c:3230
 msgid "Microphone"
 msgstr "Mikrofon"
 
-#: libpurple/protocols/sametime/sametime.c:3231
+#: ../libpurple/protocols/sametime/sametime.c:3231
 msgid "Speakers"
 msgstr "Lautsprecher"
 
-#: libpurple/protocols/sametime/sametime.c:3232
+#: ../libpurple/protocols/sametime/sametime.c:3232
 msgid "Video Camera"
 msgstr "Videokamera"
 
-#: libpurple/protocols/sametime/sametime.c:3236
+#: ../libpurple/protocols/sametime/sametime.c:3236
 msgid "File Transfer"
 msgstr "Dateiübertragung"
 
-#: libpurple/protocols/sametime/sametime.c:3270
-#: libpurple/protocols/sametime/sametime.c:4146
+#: ../libpurple/protocols/sametime/sametime.c:3270
+#: ../libpurple/protocols/sametime/sametime.c:4146
 msgid "Supports"
 msgstr "Unterstützt"
 
-#: libpurple/protocols/sametime/sametime.c:3275
-#: libpurple/protocols/sametime/sametime.c:4120
+#: ../libpurple/protocols/sametime/sametime.c:3275
+#: ../libpurple/protocols/sametime/sametime.c:4120
 msgid "External User"
 msgstr "Externer Benutzer"
 
-#: libpurple/protocols/sametime/sametime.c:3381
+#: ../libpurple/protocols/sametime/sametime.c:3381
 msgid "Create conference with user"
 msgstr "Konferenz mit dem Benutzer beginnen"
 
-#: libpurple/protocols/sametime/sametime.c:3382
+#: ../libpurple/protocols/sametime/sametime.c:3382
 #, c-format
 msgid ""
 "Please enter a topic for the new conference, and an invitation message to be "
@@ -8490,27 +8750,27 @@
 "Bitte geben sie ein Thema für die neue Konferenz und eine "
 "Einladungsnachricht für %s ein"
 
-#: libpurple/protocols/sametime/sametime.c:3386
+#: ../libpurple/protocols/sametime/sametime.c:3386
 msgid "New Conference"
 msgstr "Neue Konferenz"
 
-#: libpurple/protocols/sametime/sametime.c:3388
+#: ../libpurple/protocols/sametime/sametime.c:3388
 msgid "Create"
 msgstr "Erzeugen"
 
-#: libpurple/protocols/sametime/sametime.c:3453
+#: ../libpurple/protocols/sametime/sametime.c:3453
 msgid "Available Conferences"
 msgstr "Verfügbare Konferenzen"
 
-#: libpurple/protocols/sametime/sametime.c:3459
+#: ../libpurple/protocols/sametime/sametime.c:3459
 msgid "Create New Conference..."
 msgstr "Neue Konferenz erzeugen..."
 
-#: libpurple/protocols/sametime/sametime.c:3466
+#: ../libpurple/protocols/sametime/sametime.c:3466
 msgid "Invite user to a conference"
 msgstr "Benutzer zu einer Konferenz einladen"
 
-#: libpurple/protocols/sametime/sametime.c:3467
+#: ../libpurple/protocols/sametime/sametime.c:3467
 #, c-format
 msgid ""
 "Select a conference from the list below to send an invite to user %s. Select "
@@ -8521,27 +8781,27 @@
 "möchten. Wählen sie „Neue Konferenz erzeugen“, wenn Sie den Benutzer zu "
 "einer neuen Konferenz einladen möchten."
 
-#: libpurple/protocols/sametime/sametime.c:3472
+#: ../libpurple/protocols/sametime/sametime.c:3472
 msgid "Invite to Conference"
 msgstr "Zur Konferenz einladen"
 
-#: libpurple/protocols/sametime/sametime.c:3563
+#: ../libpurple/protocols/sametime/sametime.c:3563
 msgid "Invite to Conference..."
 msgstr "Zur Konferenz einladen..."
 
-#: libpurple/protocols/sametime/sametime.c:3568
+#: ../libpurple/protocols/sametime/sametime.c:3568
 msgid "Send TEST Announcement"
 msgstr "Sende TEST-Nachricht"
 
-#: libpurple/protocols/sametime/sametime.c:3587 pidgin/gtkconv.c:4302
+#: ../libpurple/protocols/sametime/sametime.c:3587 ../pidgin/gtkconv.c:4307
 msgid "Topic:"
 msgstr "Thema:"
 
-#: libpurple/protocols/sametime/sametime.c:3615
+#: ../libpurple/protocols/sametime/sametime.c:3615
 msgid "No Sametime Community Server specified"
 msgstr "Kein Sametime-Community Server angegeben"
 
-#: libpurple/protocols/sametime/sametime.c:3637
+#: ../libpurple/protocols/sametime/sametime.c:3637
 #, c-format
 msgid ""
 "No host or IP address has been configured for the Meanwhile account %s. "
@@ -8550,42 +8810,42 @@
 "Es wurde kein Rechner für das Meanwhile-Konto %s angegeben. Bitte geben Sie "
 "einen Rechner an, um die Anmeldung fortzusetzen."
 
-#: libpurple/protocols/sametime/sametime.c:3642
+#: ../libpurple/protocols/sametime/sametime.c:3642
 msgid "Meanwhile Connection Setup"
 msgstr "Meanwhile-Verbindungseinstellungen"
 
-#: libpurple/protocols/sametime/sametime.c:3643
+#: ../libpurple/protocols/sametime/sametime.c:3643
 msgid "No Sametime Community Server Specified"
 msgstr "Kein Sametime-Community Server angegeben"
 
-#: libpurple/protocols/sametime/sametime.c:3645 pidgin/gtkblist.c:4025
+#: ../libpurple/protocols/sametime/sametime.c:3645 ../pidgin/gtkblist.c:4024
 msgid "Connect"
 msgstr "Verbinden"
 
-#: libpurple/protocols/sametime/sametime.c:4136
+#: ../libpurple/protocols/sametime/sametime.c:4136
 #, c-format
 msgid "Unknown (0x%04x)<br>"
 msgstr "Unbekannt (0x%04x)<br>"
 
-#: libpurple/protocols/sametime/sametime.c:4138
+#: ../libpurple/protocols/sametime/sametime.c:4138
 msgid "Last Known Client"
 msgstr "Letzter bekannter Client"
 
-#: libpurple/protocols/sametime/sametime.c:4302
-#: libpurple/protocols/sametime/sametime.c:5507
+#: ../libpurple/protocols/sametime/sametime.c:4302
+#: ../libpurple/protocols/sametime/sametime.c:5507
 msgid "User Name"
 msgstr "Benutzername"
 
-#: libpurple/protocols/sametime/sametime.c:4305
-#: libpurple/protocols/sametime/sametime.c:5510
+#: ../libpurple/protocols/sametime/sametime.c:4305
+#: ../libpurple/protocols/sametime/sametime.c:5510
 msgid "Sametime ID"
 msgstr "Sametime ID"
 
-#: libpurple/protocols/sametime/sametime.c:4329
+#: ../libpurple/protocols/sametime/sametime.c:4329
 msgid "An ambiguous user ID was entered"
 msgstr "Eine mehrdeutige ID wurde angegeben"
 
-#: libpurple/protocols/sametime/sametime.c:4330
+#: ../libpurple/protocols/sametime/sametime.c:4330
 #, c-format
 msgid ""
 "The identifier '%s' may possibly refer to any of the following users. Please "
@@ -8595,15 +8855,15 @@
 "beziehen. Bitte wählen Sie den korrekten Benutzer vor der untenstehenden "
 "Liste, um ihn zu Ihrer Buddy-Liste hinzuzufügen."
 
-#: libpurple/protocols/sametime/sametime.c:4335
+#: ../libpurple/protocols/sametime/sametime.c:4335
 msgid "Select User"
 msgstr "Benutzer wählen"
 
-#: libpurple/protocols/sametime/sametime.c:4419
+#: ../libpurple/protocols/sametime/sametime.c:4419
 msgid "Unable to add user: user not found"
 msgstr "Kann den Benutzer nicht hinzufügen: Benutzer nicht gefunden"
 
-#: libpurple/protocols/sametime/sametime.c:4421
+#: ../libpurple/protocols/sametime/sametime.c:4421
 #, c-format
 msgid ""
 "The identifier '%s' did not match any users in your Sametime community. This "
@@ -8612,11 +8872,11 @@
 "Der Bezeichner '%s' passt zu keinem der Benutzer in Ihrer Sametime-"
 "Community. Der Eintrag wurde von Ihrer Buddy-Liste entfernt."
 
-#: libpurple/protocols/sametime/sametime.c:4426
+#: ../libpurple/protocols/sametime/sametime.c:4426
 msgid "Unable to add user"
 msgstr "Kann den Benutzer nicht hinzufügen"
 
-#: libpurple/protocols/sametime/sametime.c:5012
+#: ../libpurple/protocols/sametime/sametime.c:5012
 #, c-format
 msgid ""
 "Error reading file %s: \n"
@@ -8625,63 +8885,63 @@
 "Fehler beim Lesen von %s: \n"
 "%s\n"
 
-#: libpurple/protocols/sametime/sametime.c:5147
+#: ../libpurple/protocols/sametime/sametime.c:5147
 msgid "Remotely Stored Buddy List"
 msgstr "Entfernt gespeicherte Buddy-Liste"
 
-#: libpurple/protocols/sametime/sametime.c:5152
+#: ../libpurple/protocols/sametime/sametime.c:5152
 msgid "Buddy List Storage Mode"
 msgstr "Buddy-Listen-Speicherungsmethode"
 
-#: libpurple/protocols/sametime/sametime.c:5155
+#: ../libpurple/protocols/sametime/sametime.c:5155
 msgid "Local Buddy List Only"
 msgstr "Nur lokale Buddy-Liste"
 
-#: libpurple/protocols/sametime/sametime.c:5157
+#: ../libpurple/protocols/sametime/sametime.c:5157
 msgid "Merge List from Server"
 msgstr "Mit Buddy-Liste vom Server zusammenführen"
 
-#: libpurple/protocols/sametime/sametime.c:5159
+#: ../libpurple/protocols/sametime/sametime.c:5159
 msgid "Merge and Save List to Server"
 msgstr "Buddy-Liste zusammenführen und zum Server exportieren"
 
-#: libpurple/protocols/sametime/sametime.c:5161
+#: ../libpurple/protocols/sametime/sametime.c:5161
 msgid "Synchronize List with Server"
 msgstr "Buddy-Liste mit Server abgleichen"
 
-#: libpurple/protocols/sametime/sametime.c:5216
+#: ../libpurple/protocols/sametime/sametime.c:5216
 #, c-format
 msgid "Import Sametime List for Account %s"
 msgstr "Sametime-Buddy-Liste für Konto %s importieren"
 
-#: libpurple/protocols/sametime/sametime.c:5256
+#: ../libpurple/protocols/sametime/sametime.c:5256
 #, c-format
 msgid "Export Sametime List for Account %s"
 msgstr "Sametime-Buddy-Liste für Konto %s exportieren"
 
-#: libpurple/protocols/sametime/sametime.c:5310
+#: ../libpurple/protocols/sametime/sametime.c:5310
 msgid "Unable to add group: group exists"
 msgstr "Kann Gruppe nicht hinzufügen: Gruppe existiert"
 
-#: libpurple/protocols/sametime/sametime.c:5311
+#: ../libpurple/protocols/sametime/sametime.c:5311
 #, c-format
 msgid "A group named '%s' already exists in your buddy list."
 msgstr "Eine Gruppe mit dem Namen '%s' existiert bereits in Ihrer Buddy-Liste."
 
-#: libpurple/protocols/sametime/sametime.c:5314
-#: libpurple/protocols/sametime/sametime.c:5444
+#: ../libpurple/protocols/sametime/sametime.c:5314
+#: ../libpurple/protocols/sametime/sametime.c:5444
 msgid "Unable to add group"
 msgstr "Kann die Gruppe nicht hinzufügen"
 
-#: libpurple/protocols/sametime/sametime.c:5373
+#: ../libpurple/protocols/sametime/sametime.c:5373
 msgid "Possible Matches"
 msgstr "Mögliche Übereinstimmungen"
 
-#: libpurple/protocols/sametime/sametime.c:5389
+#: ../libpurple/protocols/sametime/sametime.c:5389
 msgid "Notes Address Book group results"
 msgstr "Notes-Adressbuchgruppenergebnisse"
 
-#: libpurple/protocols/sametime/sametime.c:5390
+#: ../libpurple/protocols/sametime/sametime.c:5390
 #, c-format
 msgid ""
 "The identifier '%s' may possibly refer to any of the following Notes Address "
@@ -8692,15 +8952,15 @@
 "Adressbuchgruppen. Bitte wählen Sie die richtige Gruppe aus der Liste, um "
 "sie Ihrer Buddy-Liste hinzuzufügen."
 
-#: libpurple/protocols/sametime/sametime.c:5395
+#: ../libpurple/protocols/sametime/sametime.c:5395
 msgid "Select Notes Address Book"
 msgstr "Wählen Sie das Notes-Adressbuch"
 
-#: libpurple/protocols/sametime/sametime.c:5438
+#: ../libpurple/protocols/sametime/sametime.c:5438
 msgid "Unable to add group: group not found"
 msgstr "Kann Gruppe nicht hinzufügen: Gruppe nicht gefunden"
 
-#: libpurple/protocols/sametime/sametime.c:5440
+#: ../libpurple/protocols/sametime/sametime.c:5440
 #, c-format
 msgid ""
 "The identifier '%s' did not match any Notes Address Book groups in your "
@@ -8709,11 +8969,11 @@
 "Der Bezeichner '%s' stimmt mit keiner Notes-Adressbuchgruppe in Ihrer "
 "Sametime-Community überein."
 
-#: libpurple/protocols/sametime/sametime.c:5481
+#: ../libpurple/protocols/sametime/sametime.c:5481
 msgid "Notes Address Book Group"
 msgstr "Notes-Adressbuchgruppe"
 
-#: libpurple/protocols/sametime/sametime.c:5482
+#: ../libpurple/protocols/sametime/sametime.c:5482
 msgid ""
 "Enter the name of a Notes Address Book group in the field below to add the "
 "group and its members to your buddy list."
@@ -8721,12 +8981,12 @@
 "Geben Sie den Namen einer Notes-Adressbuchgruppe in das Feld ein um die "
 "Gruppe und ihre Mitglieder zu ihrer Buddy-Liste hinzuzufügen."
 
-#: libpurple/protocols/sametime/sametime.c:5531
+#: ../libpurple/protocols/sametime/sametime.c:5531
 #, c-format
 msgid "Search results for '%s'"
 msgstr "Suchergebnisse für '%s'"
 
-#: libpurple/protocols/sametime/sametime.c:5532
+#: ../libpurple/protocols/sametime/sametime.c:5532
 #, c-format
 msgid ""
 "The identifier '%s' may possibly refer to any of the following users. You "
@@ -8739,30 +8999,30 @@
 "senden, indem sie die folgenden Aktions-Buttons benutzen."
 
 #. Create the window
-#: libpurple/protocols/sametime/sametime.c:5539 pidgin/gtknotify.c:718
+#: ../libpurple/protocols/sametime/sametime.c:5539 ../pidgin/gtknotify.c:721
 msgid "Search Results"
 msgstr "Suchergebnisse"
 
-#: libpurple/protocols/sametime/sametime.c:5564
+#: ../libpurple/protocols/sametime/sametime.c:5564
 msgid "No matches"
 msgstr "Keine Übereinstimmung"
 
-#: libpurple/protocols/sametime/sametime.c:5565
+#: ../libpurple/protocols/sametime/sametime.c:5565
 #, c-format
 msgid "The identifier '%s' did not match any users in your Sametime community."
 msgstr ""
 "Der Bezeichner '%s' stimmt mit keinem Benutzer in Ihrer Sametime-Community "
 "überein."
 
-#: libpurple/protocols/sametime/sametime.c:5569
+#: ../libpurple/protocols/sametime/sametime.c:5569
 msgid "No Matches"
 msgstr "Keine Übereinstimmung"
 
-#: libpurple/protocols/sametime/sametime.c:5606
+#: ../libpurple/protocols/sametime/sametime.c:5606
 msgid "Search for a user"
 msgstr "Suche nach einem Benutzer"
 
-#: libpurple/protocols/sametime/sametime.c:5607
+#: ../libpurple/protocols/sametime/sametime.c:5607
 msgid ""
 "Enter a name or partial ID in the field below to search for matching users "
 "in your Sametime community."
@@ -8770,97 +9030,115 @@
 "Geben die einen Namen oder den Teil einer ID in das folgende Feld ein, um "
 "nach entsprechenden Benutzern in Ihrer Sametime-Community zu suchen."
 
-#: libpurple/protocols/sametime/sametime.c:5610
+#: ../libpurple/protocols/sametime/sametime.c:5610
 msgid "User Search"
 msgstr "Benutzersuche"
 
-#: libpurple/protocols/sametime/sametime.c:5623
+#: ../libpurple/protocols/sametime/sametime.c:5623
 msgid "Import Sametime List..."
 msgstr "Import der Sametime-Liste..."
 
-#: libpurple/protocols/sametime/sametime.c:5627
+#: ../libpurple/protocols/sametime/sametime.c:5627
 msgid "Export Sametime List..."
 msgstr "Export der Sametime-Liste..."
 
-#: libpurple/protocols/sametime/sametime.c:5631
+#: ../libpurple/protocols/sametime/sametime.c:5631
 msgid "Add Notes Address Book Group..."
 msgstr "Zum Notes-Adressbuch hinzufügen..."
 
-#: libpurple/protocols/sametime/sametime.c:5635
+#: ../libpurple/protocols/sametime/sametime.c:5635
 msgid "User Search..."
 msgstr "Benutzersuche..."
 
-#: libpurple/protocols/sametime/sametime.c:5741
+#: ../libpurple/protocols/sametime/sametime.c:5741
 msgid "Force login (ignore server redirects)"
 msgstr "Erzwinge Login (ignoriere Serverumleitungen)"
 
 #. pretend to be Sametime Connect
-#: libpurple/protocols/sametime/sametime.c:5751
+#: ../libpurple/protocols/sametime/sametime.c:5751
 msgid "Hide client identity"
 msgstr "Client-Identität verbergen"
 
-#: libpurple/protocols/silc/buddy.c:52 libpurple/protocols/silc/buddy.c:410
-#: libpurple/protocols/silc/buddy.c:538 libpurple/protocols/silc/buddy.c:700
-#: libpurple/protocols/silc/ft.c:423 libpurple/protocols/silc10/buddy.c:52
-#: libpurple/protocols/silc10/buddy.c:421
-#: libpurple/protocols/silc10/buddy.c:546
-#: libpurple/protocols/silc10/buddy.c:712 libpurple/protocols/silc10/ft.c:338
+#: ../libpurple/protocols/silc/buddy.c:52
+#: ../libpurple/protocols/silc/buddy.c:410
+#: ../libpurple/protocols/silc/buddy.c:538
+#: ../libpurple/protocols/silc/buddy.c:700
+#: ../libpurple/protocols/silc/ft.c:423
+#: ../libpurple/protocols/silc10/buddy.c:52
+#: ../libpurple/protocols/silc10/buddy.c:421
+#: ../libpurple/protocols/silc10/buddy.c:546
+#: ../libpurple/protocols/silc10/buddy.c:712
+#: ../libpurple/protocols/silc10/ft.c:338
 #, c-format
 msgid "User %s is not present in the network"
 msgstr "Der Benutzer %s ist nicht im Netzwerk"
 
-#: libpurple/protocols/silc/buddy.c:53 libpurple/protocols/silc/buddy.c:110
-#: libpurple/protocols/silc/buddy.c:115 libpurple/protocols/silc/buddy.c:119
-#: libpurple/protocols/silc/buddy.c:124 libpurple/protocols/silc/buddy.c:129
-#: libpurple/protocols/silc/buddy.c:134 libpurple/protocols/silc/buddy.c:254
-#: libpurple/protocols/silc10/buddy.c:53
-#: libpurple/protocols/silc10/buddy.c:115
-#: libpurple/protocols/silc10/buddy.c:120
-#: libpurple/protocols/silc10/buddy.c:124
-#: libpurple/protocols/silc10/buddy.c:129
-#: libpurple/protocols/silc10/buddy.c:134
-#: libpurple/protocols/silc10/buddy.c:139
-#: libpurple/protocols/silc10/buddy.c:257
+#: ../libpurple/protocols/silc/buddy.c:53
+#: ../libpurple/protocols/silc/buddy.c:110
+#: ../libpurple/protocols/silc/buddy.c:115
+#: ../libpurple/protocols/silc/buddy.c:119
+#: ../libpurple/protocols/silc/buddy.c:124
+#: ../libpurple/protocols/silc/buddy.c:129
+#: ../libpurple/protocols/silc/buddy.c:134
+#: ../libpurple/protocols/silc/buddy.c:254
+#: ../libpurple/protocols/silc10/buddy.c:53
+#: ../libpurple/protocols/silc10/buddy.c:115
+#: ../libpurple/protocols/silc10/buddy.c:120
+#: ../libpurple/protocols/silc10/buddy.c:124
+#: ../libpurple/protocols/silc10/buddy.c:129
+#: ../libpurple/protocols/silc10/buddy.c:134
+#: ../libpurple/protocols/silc10/buddy.c:139
+#: ../libpurple/protocols/silc10/buddy.c:257
 msgid "Key Agreement"
 msgstr "Schlüsselaustausch"
 
-#: libpurple/protocols/silc/buddy.c:54 libpurple/protocols/silc10/buddy.c:54
+#: ../libpurple/protocols/silc/buddy.c:54
+#: ../libpurple/protocols/silc10/buddy.c:54
 msgid "Cannot perform the key agreement"
 msgstr "Kann den Schlüsselaustausch nicht durchführen"
 
-#: libpurple/protocols/silc/buddy.c:111 libpurple/protocols/silc10/buddy.c:116
+#: ../libpurple/protocols/silc/buddy.c:111
+#: ../libpurple/protocols/silc10/buddy.c:116
 msgid "Error occurred during key agreement"
 msgstr "Beim Schlüsselaustausch ist ein Fehler aufgetreten"
 
-#: libpurple/protocols/silc/buddy.c:115 libpurple/protocols/silc10/buddy.c:120
+#: ../libpurple/protocols/silc/buddy.c:115
+#: ../libpurple/protocols/silc10/buddy.c:120
 msgid "Key Agreement failed"
 msgstr "Schlüsselaustausch fehlgeschlagen"
 
-#: libpurple/protocols/silc/buddy.c:120 libpurple/protocols/silc10/buddy.c:125
+#: ../libpurple/protocols/silc/buddy.c:120
+#: ../libpurple/protocols/silc10/buddy.c:125
 msgid "Timeout during key agreement"
 msgstr "Zeitüberschreitung beim Schlüsselaustausch"
 
-#: libpurple/protocols/silc/buddy.c:125 libpurple/protocols/silc10/buddy.c:130
+#: ../libpurple/protocols/silc/buddy.c:125
+#: ../libpurple/protocols/silc10/buddy.c:130
 msgid "Key agreement was aborted"
 msgstr "Schlüsselaustausch wurde abgebrochen"
 
-#: libpurple/protocols/silc/buddy.c:130 libpurple/protocols/silc10/buddy.c:135
+#: ../libpurple/protocols/silc/buddy.c:130
+#: ../libpurple/protocols/silc10/buddy.c:135
 msgid "Key agreement is already started"
 msgstr "Schlüsselaustausch wurde schon gestartet"
 
-#: libpurple/protocols/silc/buddy.c:135 libpurple/protocols/silc10/buddy.c:140
+#: ../libpurple/protocols/silc/buddy.c:135
+#: ../libpurple/protocols/silc10/buddy.c:140
 msgid "Key agreement cannot be started with yourself"
 msgstr "Schlüsselaustausch kann nicht mit Ihnen selbst gestartet werden"
 
-#: 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
+#: ../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 "Der entfernte Benutzer ist nicht mehr im Netzwerk präsent"
 
-#: libpurple/protocols/silc/buddy.c:298 libpurple/protocols/silc10/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 "
@@ -8869,7 +9147,8 @@
 "Anfrage nach Schlüsselaustausch wurde von %s empfangen. Möchten Sie den "
 "Schlüsselaustausch durchführen?"
 
-#: libpurple/protocols/silc/buddy.c:302 libpurple/protocols/silc10/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"
@@ -8880,74 +9159,99 @@
 "Remote-Computer: %s\n"
 "Remote-Port: %d"
 
-#: libpurple/protocols/silc/buddy.c:315 libpurple/protocols/silc10/buddy.c:312
+#: ../libpurple/protocols/silc/buddy.c:315
+#: ../libpurple/protocols/silc10/buddy.c:312
 msgid "Key Agreement Request"
 msgstr "Anfrage nach Schlüsselaustausch"
 
-#: 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
+#: ../libpurple/protocols/silc/buddy.c:382
+#: ../libpurple/protocols/silc/buddy.c:412
+#: ../libpurple/protocols/silc/buddy.c:452
+#: ../libpurple/protocols/silc10/buddy.c:388
+#: ../libpurple/protocols/silc10/buddy.c:423
+#: ../libpurple/protocols/silc10/buddy.c:465
 msgid "IM With Password"
 msgstr "IM mit Passwort"
 
-#: libpurple/protocols/silc/buddy.c:413 libpurple/protocols/silc10/buddy.c:424
+#: ../libpurple/protocols/silc/buddy.c:413
+#: ../libpurple/protocols/silc10/buddy.c:424
 msgid "Cannot set IM key"
 msgstr "Kann IM-Schlüssel nicht setzen"
 
-#: libpurple/protocols/silc/buddy.c:453 libpurple/protocols/silc10/buddy.c:466
+#: ../libpurple/protocols/silc/buddy.c:453
+#: ../libpurple/protocols/silc10/buddy.c:466
 msgid "Set IM Password"
 msgstr "Setze IM-Passwort"
 
-#: 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
+#: ../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 "Öffentlichen Schlüssel abrufen"
 
-#: 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
+#: ../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 "Konnte den öffentlichen Schlüssel nicht abrufen"
 
-#: libpurple/protocols/silc/buddy.c:622 libpurple/protocols/silc/buddy.c:1655
-#: libpurple/protocols/silc10/buddy.c:635
-#: libpurple/protocols/silc10/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 "Zeige öffentlichen Schlüssel"
 
-#: 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
+#: ../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 "Konnte den öffentlichen Schlüssel nicht laden"
 
-#: 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
+#: ../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 "Benutzer-Information"
 
-#: libpurple/protocols/silc/buddy.c:702 libpurple/protocols/silc/ops.c:1169
-#: libpurple/protocols/silc/ops.c:1308 libpurple/protocols/silc10/buddy.c:714
-#: libpurple/protocols/silc10/ops.c:1160 libpurple/protocols/silc10/ops.c:1314
+#: ../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 "Kann die Benutzerinformation nicht abrufen"
 
-#: libpurple/protocols/silc/buddy.c:723 libpurple/protocols/silc10/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 "Dem Buddy %s wird nicht (kryptografisch) vertraut"
 
-#: libpurple/protocols/silc/buddy.c:726 libpurple/protocols/silc10/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."
@@ -8958,19 +9262,19 @@
 "erhalten."
 
 #. Open file selector to select the public key.
-#: libpurple/protocols/silc/buddy.c:1059
-#: libpurple/protocols/silc10/buddy.c:1067
+#: ../libpurple/protocols/silc/buddy.c:1059
+#: ../libpurple/protocols/silc10/buddy.c:1067
 msgid "Open..."
 msgstr "Öffnen..."
 
-#: libpurple/protocols/silc/buddy.c:1070
-#: libpurple/protocols/silc10/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 "Der Benutzer %s ist nicht im Netzwerk präsent"
 
-#: libpurple/protocols/silc/buddy.c:1073
-#: libpurple/protocols/silc10/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."
@@ -8979,18 +9283,18 @@
 "Schlüssel importieren. Drücken Sie auf Import, um den öffentlichen Schlüssel "
 "zu importieren."
 
-#: libpurple/protocols/silc/buddy.c:1077
-#: libpurple/protocols/silc10/buddy.c:1085
+#: ../libpurple/protocols/silc/buddy.c:1077
+#: ../libpurple/protocols/silc10/buddy.c:1085
 msgid "_Import..."
 msgstr "_Import..."
 
-#: libpurple/protocols/silc/buddy.c:1183
-#: libpurple/protocols/silc10/buddy.c:1181
+#: ../libpurple/protocols/silc/buddy.c:1183
+#: ../libpurple/protocols/silc10/buddy.c:1181
 msgid "Select correct user"
 msgstr "Wählen Sie den richtigen Benutzer"
 
-#: libpurple/protocols/silc/buddy.c:1185
-#: libpurple/protocols/silc10/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."
@@ -8999,8 +9303,8 @@
 "gefunden. Wählen Sie den richtigen Benutzer, um ihn zur Buddy-Liste "
 "hinzuzufügen."
 
-#: libpurple/protocols/silc/buddy.c:1187
-#: libpurple/protocols/silc10/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."
@@ -9008,258 +9312,319 @@
 "Mehr als ein Benutzer wurde mit dem gleichen Namen gefunden. Wählen Sie den "
 "richtigen Benutzer, um ihn zur Buddy-Liste hinzuzufügen."
 
-#: libpurple/protocols/silc/buddy.c:1474
-#: libpurple/protocols/silc10/buddy.c:1474
+#: ../libpurple/protocols/silc/buddy.c:1474
+#: ../libpurple/protocols/silc10/buddy.c:1474
 msgid "Detached"
 msgstr "Unbeteiligt"
 
-#: libpurple/protocols/silc/buddy.c:1478 libpurple/protocols/silc/silc.c:58
-#: libpurple/protocols/silc10/buddy.c:1478
-#: libpurple/protocols/silc10/silc.c:49
+#: ../libpurple/protocols/silc/buddy.c:1478
+#: ../libpurple/protocols/silc/silc.c:58
+#: ../libpurple/protocols/silc10/buddy.c:1478
+#: ../libpurple/protocols/silc10/silc.c:49
 msgid "Indisposed"
 msgstr "Indisponiert"
 
-#: libpurple/protocols/silc/buddy.c:1482 libpurple/protocols/silc/silc.c:60
-#: libpurple/protocols/silc10/buddy.c:1482
-#: libpurple/protocols/silc10/silc.c:51
+#: ../libpurple/protocols/silc/buddy.c:1482
+#: ../libpurple/protocols/silc/silc.c:60
+#: ../libpurple/protocols/silc10/buddy.c:1482
+#: ../libpurple/protocols/silc10/silc.c:51
 msgid "Wake Me Up"
 msgstr "Wecke mich auf"
 
-#: libpurple/protocols/silc/buddy.c:1484 libpurple/protocols/silc/silc.c:52
-#: libpurple/protocols/silc10/buddy.c:1484
-#: libpurple/protocols/silc10/silc.c:43
+#: ../libpurple/protocols/silc/buddy.c:1484
+#: ../libpurple/protocols/silc/silc.c:52
+#: ../libpurple/protocols/silc10/buddy.c:1484
+#: ../libpurple/protocols/silc10/silc.c:43
 msgid "Hyper Active"
 msgstr "Hyperaktiv"
 
-#: libpurple/protocols/silc/buddy.c:1486
-#: libpurple/protocols/silc10/buddy.c:1486
+#: ../libpurple/protocols/silc/buddy.c:1486
+#: ../libpurple/protocols/silc10/buddy.c:1486
 msgid "Robot"
 msgstr "Robot"
 
-#: libpurple/protocols/silc/buddy.c:1493 libpurple/protocols/silc/silc.c:743
-#: libpurple/protocols/silc/util.c:516 libpurple/protocols/silc10/buddy.c:1493
-#: libpurple/protocols/silc10/silc.c:654 libpurple/protocols/silc10/util.c:512
+#: ../libpurple/protocols/silc/buddy.c:1493
+#: ../libpurple/protocols/silc/silc.c:743
+#: ../libpurple/protocols/silc/util.c:516
+#: ../libpurple/protocols/silc10/buddy.c:1493
+#: ../libpurple/protocols/silc10/silc.c:654
+#: ../libpurple/protocols/silc10/util.c:512
 msgid "Happy"
 msgstr "Glücklich"
 
-#: libpurple/protocols/silc/buddy.c:1495 libpurple/protocols/silc/silc.c:745
-#: libpurple/protocols/silc/util.c:518 libpurple/protocols/silc10/buddy.c:1495
-#: libpurple/protocols/silc10/silc.c:656 libpurple/protocols/silc10/util.c:514
+#: ../libpurple/protocols/silc/buddy.c:1495
+#: ../libpurple/protocols/silc/silc.c:745
+#: ../libpurple/protocols/silc/util.c:518
+#: ../libpurple/protocols/silc10/buddy.c:1495
+#: ../libpurple/protocols/silc10/silc.c:656
+#: ../libpurple/protocols/silc10/util.c:514
 msgid "Sad"
 msgstr "Traurig"
 
-#: libpurple/protocols/silc/buddy.c:1497 libpurple/protocols/silc/silc.c:747
-#: libpurple/protocols/silc/util.c:520 libpurple/protocols/silc10/buddy.c:1497
-#: libpurple/protocols/silc10/silc.c:658 libpurple/protocols/silc10/util.c:516
+#: ../libpurple/protocols/silc/buddy.c:1497
+#: ../libpurple/protocols/silc/silc.c:747
+#: ../libpurple/protocols/silc/util.c:520
+#: ../libpurple/protocols/silc10/buddy.c:1497
+#: ../libpurple/protocols/silc10/silc.c:658
+#: ../libpurple/protocols/silc10/util.c:516
 msgid "Angry"
 msgstr "Verärgert"
 
-#: libpurple/protocols/silc/buddy.c:1499 libpurple/protocols/silc/silc.c:749
-#: libpurple/protocols/silc/util.c:522 libpurple/protocols/silc10/buddy.c:1499
-#: libpurple/protocols/silc10/silc.c:660 libpurple/protocols/silc10/util.c:518
+#: ../libpurple/protocols/silc/buddy.c:1499
+#: ../libpurple/protocols/silc/silc.c:749
+#: ../libpurple/protocols/silc/util.c:522
+#: ../libpurple/protocols/silc10/buddy.c:1499
+#: ../libpurple/protocols/silc10/silc.c:660
+#: ../libpurple/protocols/silc10/util.c:518
 msgid "Jealous"
 msgstr "Eifersüchtig"
 
-#: libpurple/protocols/silc/buddy.c:1501 libpurple/protocols/silc/silc.c:751
-#: libpurple/protocols/silc/util.c:524 libpurple/protocols/silc10/buddy.c:1501
-#: libpurple/protocols/silc10/silc.c:662 libpurple/protocols/silc10/util.c:520
+#: ../libpurple/protocols/silc/buddy.c:1501
+#: ../libpurple/protocols/silc/silc.c:751
+#: ../libpurple/protocols/silc/util.c:524
+#: ../libpurple/protocols/silc10/buddy.c:1501
+#: ../libpurple/protocols/silc10/silc.c:662
+#: ../libpurple/protocols/silc10/util.c:520
 msgid "Ashamed"
 msgstr "Beschämt"
 
-#: libpurple/protocols/silc/buddy.c:1503 libpurple/protocols/silc/silc.c:753
-#: libpurple/protocols/silc/util.c:526 libpurple/protocols/silc10/buddy.c:1503
-#: libpurple/protocols/silc10/silc.c:664 libpurple/protocols/silc10/util.c:522
+#: ../libpurple/protocols/silc/buddy.c:1503
+#: ../libpurple/protocols/silc/silc.c:753
+#: ../libpurple/protocols/silc/util.c:526
+#: ../libpurple/protocols/silc10/buddy.c:1503
+#: ../libpurple/protocols/silc10/silc.c:664
+#: ../libpurple/protocols/silc10/util.c:522
 msgid "Invincible"
 msgstr "Unerschütterlich"
 
-#: libpurple/protocols/silc/buddy.c:1505 libpurple/protocols/silc/util.c:528
-#: libpurple/protocols/silc10/buddy.c:1505
-#: libpurple/protocols/silc10/util.c:524
+#: ../libpurple/protocols/silc/buddy.c:1505
+#: ../libpurple/protocols/silc/util.c:528
+#: ../libpurple/protocols/silc10/buddy.c:1505
+#: ../libpurple/protocols/silc10/util.c:524
 msgid "In Love"
 msgstr "Verliebt"
 
-#: libpurple/protocols/silc/buddy.c:1507 libpurple/protocols/silc/silc.c:757
-#: libpurple/protocols/silc/util.c:530 libpurple/protocols/silc10/buddy.c:1507
-#: libpurple/protocols/silc10/silc.c:668 libpurple/protocols/silc10/util.c:526
+#: ../libpurple/protocols/silc/buddy.c:1507
+#: ../libpurple/protocols/silc/silc.c:757
+#: ../libpurple/protocols/silc/util.c:530
+#: ../libpurple/protocols/silc10/buddy.c:1507
+#: ../libpurple/protocols/silc10/silc.c:668
+#: ../libpurple/protocols/silc10/util.c:526
 msgid "Sleepy"
 msgstr "Müde"
 
-#: libpurple/protocols/silc/buddy.c:1509 libpurple/protocols/silc/silc.c:759
-#: libpurple/protocols/silc/util.c:532 libpurple/protocols/silc10/buddy.c:1509
-#: libpurple/protocols/silc10/silc.c:670 libpurple/protocols/silc10/util.c:528
+#: ../libpurple/protocols/silc/buddy.c:1509
+#: ../libpurple/protocols/silc/silc.c:759
+#: ../libpurple/protocols/silc/util.c:532
+#: ../libpurple/protocols/silc10/buddy.c:1509
+#: ../libpurple/protocols/silc10/silc.c:670
+#: ../libpurple/protocols/silc10/util.c:528
 msgid "Bored"
 msgstr "Gelangweilt"
 
-#: libpurple/protocols/silc/buddy.c:1511 libpurple/protocols/silc/silc.c:761
-#: libpurple/protocols/silc/util.c:534 libpurple/protocols/silc10/buddy.c:1511
-#: libpurple/protocols/silc10/silc.c:672 libpurple/protocols/silc10/util.c:530
+#: ../libpurple/protocols/silc/buddy.c:1511
+#: ../libpurple/protocols/silc/silc.c:761
+#: ../libpurple/protocols/silc/util.c:534
+#: ../libpurple/protocols/silc10/buddy.c:1511
+#: ../libpurple/protocols/silc10/silc.c:672
+#: ../libpurple/protocols/silc10/util.c:530
 msgid "Excited"
 msgstr "Aufgeregt"
 
-#: libpurple/protocols/silc/buddy.c:1513 libpurple/protocols/silc/silc.c:763
-#: libpurple/protocols/silc/util.c:536 libpurple/protocols/silc10/buddy.c:1513
-#: libpurple/protocols/silc10/silc.c:674 libpurple/protocols/silc10/util.c:532
+#: ../libpurple/protocols/silc/buddy.c:1513
+#: ../libpurple/protocols/silc/silc.c:763
+#: ../libpurple/protocols/silc/util.c:536
+#: ../libpurple/protocols/silc10/buddy.c:1513
+#: ../libpurple/protocols/silc10/silc.c:674
+#: ../libpurple/protocols/silc10/util.c:532
 msgid "Anxious"
 msgstr "Besorgt"
 
-#: libpurple/protocols/silc/buddy.c:1545 libpurple/protocols/silc/ops.c:1207
-#: libpurple/protocols/silc10/buddy.c:1545
-#: libpurple/protocols/silc10/ops.c:1202
+#: ../libpurple/protocols/silc/buddy.c:1545
+#: ../libpurple/protocols/silc/ops.c:1207
+#: ../libpurple/protocols/silc10/buddy.c:1545
+#: ../libpurple/protocols/silc10/ops.c:1202
 msgid "User Modes"
 msgstr "Benutzermodi"
 
-#: libpurple/protocols/silc/buddy.c:1557 libpurple/protocols/silc/ops.c:1212
-#: libpurple/protocols/silc10/buddy.c:1557
-#: libpurple/protocols/silc10/ops.c:1207
+#: ../libpurple/protocols/silc/buddy.c:1557
+#: ../libpurple/protocols/silc/ops.c:1212
+#: ../libpurple/protocols/silc10/buddy.c:1557
+#: ../libpurple/protocols/silc10/ops.c:1207
 msgid "Mood"
 msgstr "Stimmung"
 
-#: libpurple/protocols/silc/buddy.c:1562 libpurple/protocols/silc/ops.c:1224
-#: libpurple/protocols/silc10/buddy.c:1562
-#: libpurple/protocols/silc10/ops.c:1219
+#: ../libpurple/protocols/silc/buddy.c:1562
+#: ../libpurple/protocols/silc/ops.c:1224
+#: ../libpurple/protocols/silc10/buddy.c:1562
+#: ../libpurple/protocols/silc10/ops.c:1219
 msgid "Preferred Contact"
 msgstr "Bevorzugter Kontakt"
 
-#: libpurple/protocols/silc/buddy.c:1567 libpurple/protocols/silc/ops.c:1229
-#: libpurple/protocols/silc10/buddy.c:1567
-#: libpurple/protocols/silc10/ops.c:1224
+#: ../libpurple/protocols/silc/buddy.c:1567
+#: ../libpurple/protocols/silc/ops.c:1229
+#: ../libpurple/protocols/silc10/buddy.c:1567
+#: ../libpurple/protocols/silc10/ops.c:1224
 msgid "Preferred Language"
 msgstr "Bevorzugte Sprache"
 
-#: libpurple/protocols/silc/buddy.c:1572 libpurple/protocols/silc/ops.c:1234
-#: libpurple/protocols/silc10/buddy.c:1572
-#: libpurple/protocols/silc10/ops.c:1229
+#: ../libpurple/protocols/silc/buddy.c:1572
+#: ../libpurple/protocols/silc/ops.c:1234
+#: ../libpurple/protocols/silc10/buddy.c:1572
+#: ../libpurple/protocols/silc10/ops.c:1229
 msgid "Device"
 msgstr "Gerät"
 
-#: libpurple/protocols/silc/buddy.c:1577 libpurple/protocols/silc/ops.c:1239
-#: libpurple/protocols/silc10/buddy.c:1577
-#: libpurple/protocols/silc10/ops.c:1234 libpurple/protocols/silc10/silc.c:722
-#: libpurple/protocols/silc10/silc.c:724
+#: ../libpurple/protocols/silc/buddy.c:1577
+#: ../libpurple/protocols/silc/ops.c:1239
+#: ../libpurple/protocols/silc10/buddy.c:1577
+#: ../libpurple/protocols/silc10/ops.c:1234
+#: ../libpurple/protocols/silc10/silc.c:722
+#: ../libpurple/protocols/silc10/silc.c:724
 msgid "Timezone"
 msgstr "Zeitzone"
 
-#: libpurple/protocols/silc/buddy.c:1582 libpurple/protocols/silc/ops.c:1244
-#: libpurple/protocols/silc10/buddy.c:1582
-#: libpurple/protocols/silc10/ops.c:1239
+#: ../libpurple/protocols/silc/buddy.c:1582
+#: ../libpurple/protocols/silc/ops.c:1244
+#: ../libpurple/protocols/silc10/buddy.c:1582
+#: ../libpurple/protocols/silc10/ops.c:1239
 msgid "Geolocation"
 msgstr "Geographische Koordinaten"
 
-#: libpurple/protocols/silc/buddy.c:1638
-#: libpurple/protocols/silc10/buddy.c:1636
+#: ../libpurple/protocols/silc/buddy.c:1638
+#: ../libpurple/protocols/silc10/buddy.c:1636
 msgid "Reset IM Key"
 msgstr "IM-Schlüssel zurücksetzen"
 
-#: libpurple/protocols/silc/buddy.c:1643
-#: libpurple/protocols/silc10/buddy.c:1642
+#: ../libpurple/protocols/silc/buddy.c:1643
+#: ../libpurple/protocols/silc10/buddy.c:1642
 msgid "IM with Key Exchange"
 msgstr "IM mit Schlüsselaustausch"
 
-#: libpurple/protocols/silc/buddy.c:1648
-#: libpurple/protocols/silc10/buddy.c:1647
+#: ../libpurple/protocols/silc/buddy.c:1648
+#: ../libpurple/protocols/silc10/buddy.c:1647
 msgid "IM with Password"
 msgstr "IM mit Passwort"
 
-#: libpurple/protocols/silc/buddy.c:1661
-#: libpurple/protocols/silc10/buddy.c:1660
+#: ../libpurple/protocols/silc/buddy.c:1661
+#: ../libpurple/protocols/silc10/buddy.c:1660
 msgid "Get Public Key..."
 msgstr "Öffentlichen Schlüssel abrufen..."
 
-#: libpurple/protocols/silc/buddy.c:1668 libpurple/protocols/silc/ops.c:1608
-#: libpurple/protocols/silc10/buddy.c:1667
-#: libpurple/protocols/silc10/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 "Benutzer hinauswerfen"
 
-#: libpurple/protocols/silc/buddy.c:1678 libpurple/protocols/silc/chat.c:993
-#: libpurple/protocols/silc10/buddy.c:1677
-#: libpurple/protocols/silc10/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 "Auf Whiteboard malen"
 
-#: libpurple/protocols/silc/chat.c:39 libpurple/protocols/silc10/chat.c:39
+#: ../libpurple/protocols/silc/chat.c:39
+#: ../libpurple/protocols/silc10/chat.c:39
 msgid "_Passphrase:"
 msgstr "_Passphrase:"
 
-#: libpurple/protocols/silc/chat.c:80 libpurple/protocols/silc10/chat.c:80
+#: ../libpurple/protocols/silc/chat.c:80
+#: ../libpurple/protocols/silc10/chat.c:80
 #, c-format
 msgid "Channel %s does not exist in the network"
 msgstr "Kanal %s existiert nicht im Netzwerk"
 
-#: libpurple/protocols/silc/chat.c:81 libpurple/protocols/silc/chat.c:175
-#: libpurple/protocols/silc10/chat.c:81 libpurple/protocols/silc10/chat.c:174
+#: ../libpurple/protocols/silc/chat.c:81
+#: ../libpurple/protocols/silc/chat.c:175
+#: ../libpurple/protocols/silc10/chat.c:81
+#: ../libpurple/protocols/silc10/chat.c:174
 msgid "Channel Information"
 msgstr "Kanal-Information"
 
-#: libpurple/protocols/silc/chat.c:82 libpurple/protocols/silc10/chat.c:82
+#: ../libpurple/protocols/silc/chat.c:82
+#: ../libpurple/protocols/silc10/chat.c:82
 msgid "Cannot get channel information"
 msgstr "Kann die Kanal-Informationen nicht abrufen"
 
-#: libpurple/protocols/silc/chat.c:119 libpurple/protocols/silc10/chat.c:119
+#: ../libpurple/protocols/silc/chat.c:119
+#: ../libpurple/protocols/silc10/chat.c:119
 #, c-format
 msgid "<b>Channel Name:</b> %s"
 msgstr "<b>Kanalname:</b> %s"
 
-#: libpurple/protocols/silc/chat.c:122 libpurple/protocols/silc10/chat.c:122
+#: ../libpurple/protocols/silc/chat.c:122
+#: ../libpurple/protocols/silc10/chat.c:122
 #, c-format
 msgid "<br><b>User Count:</b> %d"
 msgstr "<br><b>Benutzeranzahl:</b> %d"
 
-#: libpurple/protocols/silc/chat.c:129 libpurple/protocols/silc10/chat.c:129
+#: ../libpurple/protocols/silc/chat.c:129
+#: ../libpurple/protocols/silc10/chat.c:129
 #, c-format
 msgid "<br><b>Channel Founder:</b> %s"
 msgstr "<br><b>Gründer des Kanals:</b> %s"
 
-#: libpurple/protocols/silc/chat.c:138 libpurple/protocols/silc10/chat.c:138
+#: ../libpurple/protocols/silc/chat.c:138
+#: ../libpurple/protocols/silc10/chat.c:138
 #, c-format
 msgid "<br><b>Channel Cipher:</b> %s"
 msgstr "<br><b>Kanal-Chiffrierung:</b> %s"
 
 #. Definition of HMAC: http://en.wikipedia.org/wiki/HMAC
-#: libpurple/protocols/silc/chat.c:143 libpurple/protocols/silc10/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>Kanal-HMAC:</b> %s"
 
-#: libpurple/protocols/silc/chat.c:148 libpurple/protocols/silc10/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>Thema des Kanals:</b><br>%s"
 
-#: libpurple/protocols/silc/chat.c:153 libpurple/protocols/silc10/chat.c:152
-#, c-format
+#: ../libpurple/protocols/silc/chat.c:153
+#: ../libpurple/protocols/silc10/chat.c:152
 msgid "<br><b>Channel Modes:</b> "
 msgstr "<br><b>Kanal-Modi:</b> "
 
-#: libpurple/protocols/silc/chat.c:166 libpurple/protocols/silc10/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>Schlüssel-Fingerprint des Gründers:</b><br>%s"
 
-#: libpurple/protocols/silc/chat.c:167 libpurple/protocols/silc10/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>Schlüssel-Babbleprint des Gründers:</b><br>%s"
 
-#: libpurple/protocols/silc/chat.c:236 libpurple/protocols/silc10/chat.c:236
+#: ../libpurple/protocols/silc/chat.c:236
+#: ../libpurple/protocols/silc10/chat.c:236
 msgid "Add Channel Public Key"
 msgstr "Öffentlichen Schlüssel des Kanals hinzufügen"
 
 #. Add new public key
-#: libpurple/protocols/silc/chat.c:304 libpurple/protocols/silc10/chat.c:291
+#: ../libpurple/protocols/silc/chat.c:304
+#: ../libpurple/protocols/silc10/chat.c:291
 msgid "Open Public Key..."
 msgstr "Öffentlichen Schlüssel öffnen..."
 
-#: libpurple/protocols/silc/chat.c:423 libpurple/protocols/silc10/chat.c:401
+#: ../libpurple/protocols/silc/chat.c:423
+#: ../libpurple/protocols/silc10/chat.c:401
 msgid "Channel Passphrase"
 msgstr "Kanal-Passphrase"
 
-#: libpurple/protocols/silc/chat.c:430 libpurple/protocols/silc10/chat.c:408
+#: ../libpurple/protocols/silc/chat.c:430
+#: ../libpurple/protocols/silc10/chat.c:408
 msgid "Channel Public Keys List"
 msgstr "Liste der öffentlichen Schlüssel des Kanals"
 
-#: libpurple/protocols/silc/chat.c:435 libpurple/protocols/silc10/chat.c:413
-#, c-format
+#: ../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 "
@@ -9274,98 +9639,126 @@
 "Schlüssel gewählt werden, können nur solche Benutzer den Kanal betreten, "
 "deren Schlüssel aufgelistet sind."
 
-#: 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
+#: ../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 "Kanal-Authentifikation"
 
-#: libpurple/protocols/silc/chat.c:446 libpurple/protocols/silc/chat.c:481
-#: libpurple/protocols/silc10/chat.c:424 libpurple/protocols/silc10/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 "Hinzufügen / Entfernen"
 
-#: libpurple/protocols/silc/chat.c:597 libpurple/protocols/silc10/chat.c:581
+#: ../libpurple/protocols/silc/chat.c:597
+#: ../libpurple/protocols/silc10/chat.c:581
 msgid "Group Name"
 msgstr "Gruppenname"
 
-#: 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
+#: ../libpurple/protocols/silc/chat.c:601
+#: ../libpurple/protocols/silc/ops.c:1813
+#: ../libpurple/protocols/silc/silc.c:1020
+#: ../libpurple/protocols/silc10/chat.c:585
+#: ../libpurple/protocols/silc10/ops.c:1901
+#: ../libpurple/protocols/silc10/silc.c:931
 msgid "Passphrase"
 msgstr "Passphrase"
 
-#: libpurple/protocols/silc/chat.c:612 libpurple/protocols/silc10/chat.c:596
+#: ../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 ""
 "Bitte geben Sie für den Kanal %s den Namen der privaten Gruppe und die "
 "Passphrase an."
 
-#: libpurple/protocols/silc/chat.c:614 libpurple/protocols/silc10/chat.c:598
+#: ../libpurple/protocols/silc/chat.c:614
+#: ../libpurple/protocols/silc10/chat.c:598
 msgid "Add Channel Private Group"
 msgstr "Private Gruppe im Kanal hinzufügen"
 
-#: libpurple/protocols/silc/chat.c:742 libpurple/protocols/silc10/chat.c:726
+#: ../libpurple/protocols/silc/chat.c:742
+#: ../libpurple/protocols/silc10/chat.c:726
 msgid "User Limit"
 msgstr "Benutzer-Limit"
 
-#: libpurple/protocols/silc/chat.c:743 libpurple/protocols/silc10/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 ""
 "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
+#: ../libpurple/protocols/silc/chat.c:907
+#: ../libpurple/protocols/silc10/chat.c:891
 msgid "Invite List"
 msgstr "Einladungsliste"
 
-#: libpurple/protocols/silc/chat.c:912 libpurple/protocols/silc10/chat.c:896
+#: ../libpurple/protocols/silc/chat.c:912
+#: ../libpurple/protocols/silc10/chat.c:896
 msgid "Ban List"
 msgstr "Verbannungsliste"
 
-#: libpurple/protocols/silc/chat.c:920 libpurple/protocols/silc10/chat.c:904
+#: ../libpurple/protocols/silc/chat.c:920
+#: ../libpurple/protocols/silc10/chat.c:904
 msgid "Add Private Group"
 msgstr "Private Gruppe hinzufügen"
 
-#: libpurple/protocols/silc/chat.c:933 libpurple/protocols/silc10/chat.c:917
+#: ../libpurple/protocols/silc/chat.c:933
+#: ../libpurple/protocols/silc10/chat.c:917
 msgid "Reset Permanent"
 msgstr "Permanent zurücksetzen"
 
-#: libpurple/protocols/silc/chat.c:938 libpurple/protocols/silc10/chat.c:922
+#: ../libpurple/protocols/silc/chat.c:938
+#: ../libpurple/protocols/silc10/chat.c:922
 msgid "Set Permanent"
 msgstr "Permanent setzen"
 
-#: libpurple/protocols/silc/chat.c:946 libpurple/protocols/silc10/chat.c:930
+#: ../libpurple/protocols/silc/chat.c:946
+#: ../libpurple/protocols/silc10/chat.c:930
 msgid "Set User Limit"
 msgstr "Setze Benutzer-Limit"
 
-#: libpurple/protocols/silc/chat.c:952 libpurple/protocols/silc10/chat.c:936
+#: ../libpurple/protocols/silc/chat.c:952
+#: ../libpurple/protocols/silc10/chat.c:936
 msgid "Reset Topic Restriction"
 msgstr "Themenbeschränkung zurücknehmen"
 
-#: libpurple/protocols/silc/chat.c:957 libpurple/protocols/silc10/chat.c:941
+#: ../libpurple/protocols/silc/chat.c:957
+#: ../libpurple/protocols/silc10/chat.c:941
 msgid "Set Topic Restriction"
 msgstr "Setze Themenbeschränkung"
 
-#: libpurple/protocols/silc/chat.c:964 libpurple/protocols/silc10/chat.c:948
+#: ../libpurple/protocols/silc/chat.c:964
+#: ../libpurple/protocols/silc10/chat.c:948
 msgid "Reset Private Channel"
 msgstr "Privaten Kanal zurücksetzen"
 
-#: libpurple/protocols/silc/chat.c:969 libpurple/protocols/silc10/chat.c:953
+#: ../libpurple/protocols/silc/chat.c:969
+#: ../libpurple/protocols/silc10/chat.c:953
 msgid "Set Private Channel"
 msgstr "Setze privaten Kanal"
 
-#: libpurple/protocols/silc/chat.c:976 libpurple/protocols/silc10/chat.c:960
+#: ../libpurple/protocols/silc/chat.c:976
+#: ../libpurple/protocols/silc10/chat.c:960
 msgid "Reset Secret Channel"
 msgstr "Geheimen Kanal zurücksetzen"
 
-#: libpurple/protocols/silc/chat.c:981 libpurple/protocols/silc10/chat.c:965
+#: ../libpurple/protocols/silc/chat.c:981
+#: ../libpurple/protocols/silc10/chat.c:965
 msgid "Set Secret Channel"
 msgstr "Setze geheimen Kanal"
 
-#: libpurple/protocols/silc/chat.c:1045 libpurple/protocols/silc10/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"
@@ -9373,268 +9766,322 @@
 "Sie müssen den Kanal %s betreten, bevor Sie die private Gruppe betreten "
 "können"
 
-#: libpurple/protocols/silc/chat.c:1047 libpurple/protocols/silc10/chat.c:1104
+#: ../libpurple/protocols/silc/chat.c:1047
+#: ../libpurple/protocols/silc10/chat.c:1104
 msgid "Join Private Group"
 msgstr "Private Gruppe betreten"
 
-#: libpurple/protocols/silc/chat.c:1048 libpurple/protocols/silc10/chat.c:1105
+#: ../libpurple/protocols/silc/chat.c:1048
+#: ../libpurple/protocols/silc10/chat.c:1105
 msgid "Cannot join private group"
 msgstr "Kann die private Gruppe nicht betreten"
 
-#: libpurple/protocols/silc/chat.c:1260 libpurple/protocols/silc/silc.c:1217
-#: libpurple/protocols/silc10/chat.c:1299
-#: libpurple/protocols/silc10/silc.c:1137
+#: ../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 "Kommando ausführen"
 
-#: libpurple/protocols/silc/chat.c:1260 libpurple/protocols/silc/silc.c:1218
-#: libpurple/protocols/silc10/chat.c:1299
-#: libpurple/protocols/silc10/silc.c:1137
+#: ../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 "Kommando nicht aufrufbar"
 
-#: libpurple/protocols/silc/chat.c:1261 libpurple/protocols/silc/silc.c:1219
-#: libpurple/protocols/silc10/chat.c:1300
-#: libpurple/protocols/silc10/silc.c:1138
+#: ../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 "Unbekanntes Kommando"
 
-#: 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
+#: ../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 "Sichere Dateiübertragungen"
 
-#: 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
+#: ../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 "Fehler bei der Dateiübertragung"
 
-#: libpurple/protocols/silc/ft.c:87
+#: ../libpurple/protocols/silc/ft.c:87
 msgid "Remote disconnected"
 msgstr "Die entfernte Seite hat sich abgemeldet"
 
-#: libpurple/protocols/silc/ft.c:106 libpurple/protocols/silc10/ft.c:94
+#: ../libpurple/protocols/silc/ft.c:106 ../libpurple/protocols/silc10/ft.c:94
 msgid "Permission denied"
 msgstr "Zugriff verweigert"
 
-#: libpurple/protocols/silc/ft.c:110 libpurple/protocols/silc10/ft.c:98
+#: ../libpurple/protocols/silc/ft.c:110 ../libpurple/protocols/silc10/ft.c:98
 msgid "Key agreement failed"
 msgstr "Schlüsselaustausch ist fehlgeschlagen"
 
-#: libpurple/protocols/silc/ft.c:114
+#: ../libpurple/protocols/silc/ft.c:114
 msgid "Connection timed out"
 msgstr "Verbindungsabbruch wegen Zeitüberschreitung"
 
-#: libpurple/protocols/silc/ft.c:118
+#: ../libpurple/protocols/silc/ft.c:118
 msgid "Creating connection failed"
 msgstr "Verbindungsherstellung fehlgeschlagen"
 
-#: libpurple/protocols/silc/ft.c:122 libpurple/protocols/silc10/ft.c:102
+#: ../libpurple/protocols/silc/ft.c:122 ../libpurple/protocols/silc10/ft.c:102
 msgid "File transfer session does not exist"
 msgstr "Dateiübertragungssitzung existiert nicht"
 
-#: libpurple/protocols/silc/ft.c:273 libpurple/protocols/silc10/ft.c:206
+#: ../libpurple/protocols/silc/ft.c:273 ../libpurple/protocols/silc10/ft.c:206
 msgid "No file transfer session active"
 msgstr "Keine Dateiübertragungssitzung aktiv"
 
-#: libpurple/protocols/silc/ft.c:278 libpurple/protocols/silc10/ft.c:211
+#: ../libpurple/protocols/silc/ft.c:278 ../libpurple/protocols/silc10/ft.c:211
 msgid "File transfer already started"
 msgstr "Dateiübertragung wurde schon gestartet"
 
-#: libpurple/protocols/silc/ft.c:283 libpurple/protocols/silc10/ft.c:216
+#: ../libpurple/protocols/silc/ft.c:283 ../libpurple/protocols/silc10/ft.c:216
 msgid "Could not perform key agreement for file transfer"
 msgstr "Kann den Schlüsselaustausch für die Dateiübertragung nicht vollziehen"
 
-#: libpurple/protocols/silc/ft.c:289 libpurple/protocols/silc10/ft.c:222
+#: ../libpurple/protocols/silc/ft.c:289 ../libpurple/protocols/silc10/ft.c:222
 msgid "Could not start the file transfer"
 msgstr "Konnte die Dateiübertragung nicht starten"
 
-#: libpurple/protocols/silc/ft.c:426 libpurple/protocols/silc10/ft.c:341
+#: ../libpurple/protocols/silc/ft.c:426 ../libpurple/protocols/silc10/ft.c:341
 msgid "Cannot send file"
 msgstr "Kann Datei nicht senden"
 
-#: libpurple/protocols/silc/ops.c:57
+#: ../libpurple/protocols/silc/ops.c:57
 msgid "Error occurred"
 msgstr "Fehler aufgetreten"
 
-#: 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
+#: ../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 hat das Thema von <I>%s</I> zu %s abgeändert"
 
-#: libpurple/protocols/silc/ops.c:617 libpurple/protocols/silc10/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> setzt die Kanalmodi von <I>%s</I> auf: %s"
 
-#: libpurple/protocols/silc/ops.c:621 libpurple/protocols/silc10/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> entfernte alle Kanalmodi auf <I>%s</I>"
 
-#: libpurple/protocols/silc/ops.c:654 libpurple/protocols/silc10/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> setzte die Modi von <I>%s</I> auf: %s"
 
-#: libpurple/protocols/silc/ops.c:662 libpurple/protocols/silc10/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> entfernte alle Kanalmodi von <I>%s's</I>"
 
-#: libpurple/protocols/silc/ops.c:691 libpurple/protocols/silc10/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 "Sie wurden aus <I>%s</I> hinausgeworfen von <I>%s</I> (%s)"
 
-#: libpurple/protocols/silc/ops.c:718 libpurple/protocols/silc/ops.c:723
-#: libpurple/protocols/silc/ops.c:728 libpurple/protocols/silc10/ops.c:742
-#: libpurple/protocols/silc10/ops.c:747 libpurple/protocols/silc10/ops.c:752
+#: ../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 "Sie wurden hinausgeworfen von %s (%s)"
 
-#: libpurple/protocols/silc/ops.c:749 libpurple/protocols/silc/ops.c:754
-#: libpurple/protocols/silc/ops.c:759 libpurple/protocols/silc10/ops.c:773
-#: libpurple/protocols/silc10/ops.c:778 libpurple/protocols/silc10/ops.c:783
+#: ../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 "Hinausgeworfen durch %s (%s)"
 
-#: libpurple/protocols/silc/ops.c:796 libpurple/protocols/silc10/ops.c:829
+#: ../libpurple/protocols/silc/ops.c:796
+#: ../libpurple/protocols/silc10/ops.c:829
 msgid "Server signoff"
 msgstr "Server abgemeldet"
 
-#: libpurple/protocols/silc/ops.c:983 libpurple/protocols/silc10/ops.c:1017
+#: ../libpurple/protocols/silc/ops.c:983
+#: ../libpurple/protocols/silc10/ops.c:1017
 msgid "Personal Information"
 msgstr "Persönliche Informationen"
 
-#: libpurple/protocols/silc/ops.c:1006 libpurple/protocols/silc10/ops.c:1040
+#: ../libpurple/protocols/silc/ops.c:1006
+#: ../libpurple/protocols/silc10/ops.c:1040
 msgid "Birth Day"
 msgstr "Geburtstag"
 
-#: libpurple/protocols/silc/ops.c:1014 libpurple/protocols/silc10/ops.c:1048
+#: ../libpurple/protocols/silc/ops.c:1014
+#: ../libpurple/protocols/silc10/ops.c:1048
 msgid "Job Role"
 msgstr "Position"
 
-#: libpurple/protocols/silc/ops.c:1018 libpurple/protocols/silc/silc.c:1013
-#: libpurple/protocols/silc10/ops.c:1052 libpurple/protocols/silc10/silc.c:924
+#: ../libpurple/protocols/silc/ops.c:1018
+#: ../libpurple/protocols/silc/silc.c:1013
+#: ../libpurple/protocols/silc10/ops.c:1052
+#: ../libpurple/protocols/silc10/silc.c:924
 msgid "Organization"
 msgstr "Organisation"
 
-#: libpurple/protocols/silc/ops.c:1022 libpurple/protocols/silc10/ops.c:1056
+#: ../libpurple/protocols/silc/ops.c:1022
+#: ../libpurple/protocols/silc10/ops.c:1056
 msgid "Unit"
 msgstr "Abteilung"
 
-#: libpurple/protocols/silc/ops.c:1046 libpurple/protocols/silc10/ops.c:1080
+#: ../libpurple/protocols/silc/ops.c:1046
+#: ../libpurple/protocols/silc10/ops.c:1080
 msgid "Note"
 msgstr "Bemerkung"
 
-#: libpurple/protocols/silc/ops.c:1093 libpurple/protocols/silc10/ops.c:1128
+#: ../libpurple/protocols/silc/ops.c:1093
+#: ../libpurple/protocols/silc10/ops.c:1128
 msgid "Join Chat"
 msgstr "Chat betreten"
 
-#: libpurple/protocols/silc/ops.c:1127 libpurple/protocols/silc10/chat.c:1039
+#: ../libpurple/protocols/silc/ops.c:1127
+#: ../libpurple/protocols/silc10/chat.c:1039
 #, c-format
 msgid "You are channel founder on <I>%s</I>"
 msgstr "Sie sind der Gründer des Kanals <I>%s</I>"
 
-#: libpurple/protocols/silc/ops.c:1131 libpurple/protocols/silc10/chat.c:1043
+#: ../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 "Gründer des Kanals <I>%s</I> ist <I>%s</I>"
 
-#: libpurple/protocols/silc/ops.c:1190 libpurple/protocols/silc/ops.c:1326
-#: libpurple/protocols/silc10/ops.c:1183 libpurple/protocols/silc10/ops.c:1332
-#: libpurple/protocols/yahoo/yahoo_profile.c:1071
+#: ../libpurple/protocols/silc/ops.c:1190
+#: ../libpurple/protocols/silc/ops.c:1326
+#: ../libpurple/protocols/silc10/ops.c:1183
+#: ../libpurple/protocols/silc10/ops.c:1332
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1071
 msgid "Real Name"
 msgstr "Echter Name"
 
-#: libpurple/protocols/silc/ops.c:1218 libpurple/protocols/silc10/ops.c:1213
+#: ../libpurple/protocols/silc/ops.c:1218
+#: ../libpurple/protocols/silc10/ops.c:1213
 msgid "Status Text"
 msgstr "Statustext"
 
-#: libpurple/protocols/silc/ops.c:1279 libpurple/protocols/silc/ops.c:1351
-#: libpurple/protocols/silc10/ops.c:1285 libpurple/protocols/silc10/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 "Öffentlicher Schlüssel-Fingerprint"
 
-#: libpurple/protocols/silc/ops.c:1280 libpurple/protocols/silc/ops.c:1352
-#: libpurple/protocols/silc10/ops.c:1286 libpurple/protocols/silc10/ops.c:1358
+#: ../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 "Öffentlicher Schlüssel-Babbleprint"
 
-#: libpurple/protocols/silc/ops.c:1292 libpurple/protocols/silc10/ops.c:1298
+#: ../libpurple/protocols/silc/ops.c:1292
+#: ../libpurple/protocols/silc10/ops.c:1298
 msgid "_More..."
 msgstr "_Mehr..."
 
-#: libpurple/protocols/silc/ops.c:1369 libpurple/protocols/silc/silc.c:1077
-#: libpurple/protocols/silc10/ops.c:1371 libpurple/protocols/silc10/silc.c:988
+#: ../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 "Vom Server trennen"
 
-#: libpurple/protocols/silc/ops.c:1369 libpurple/protocols/silc10/ops.c:1371
+#: ../libpurple/protocols/silc/ops.c:1369
+#: ../libpurple/protocols/silc10/ops.c:1371
 msgid "Cannot detach"
 msgstr "Trennung nicht möglich"
 
-#: libpurple/protocols/silc/ops.c:1389 libpurple/protocols/silc10/ops.c:1382
+#: ../libpurple/protocols/silc/ops.c:1389
+#: ../libpurple/protocols/silc10/ops.c:1382
 msgid "Cannot set topic"
 msgstr "Kann das Thema nicht setzen"
 
-#: libpurple/protocols/silc/ops.c:1418 libpurple/protocols/silc10/ops.c:1414
+#: ../libpurple/protocols/silc/ops.c:1418
+#: ../libpurple/protocols/silc10/ops.c:1414
 msgid "Failed to change nickname"
 msgstr "Kann den Nickname nicht ändern"
 
-#: libpurple/protocols/silc/ops.c:1467 libpurple/protocols/silc10/ops.c:1462
+#: ../libpurple/protocols/silc/ops.c:1467
+#: ../libpurple/protocols/silc10/ops.c:1462
 msgid "Roomlist"
 msgstr "Raumliste"
 
-#: libpurple/protocols/silc/ops.c:1467 libpurple/protocols/silc10/ops.c:1462
+#: ../libpurple/protocols/silc/ops.c:1467
+#: ../libpurple/protocols/silc10/ops.c:1462
 msgid "Cannot get room list"
 msgstr "Kamm die Raumliste nicht abrufen"
 
-#: libpurple/protocols/silc/ops.c:1468
+#: ../libpurple/protocols/silc/ops.c:1468
 msgid "Network is empty"
 msgstr "Netzwerk ist leer"
 
-#: libpurple/protocols/silc/ops.c:1512 libpurple/protocols/silc10/ops.c:1507
+#: ../libpurple/protocols/silc/ops.c:1512
+#: ../libpurple/protocols/silc10/ops.c:1507
 msgid "No public key was received"
 msgstr "Kein öffentlicher Schlüssel empfangen"
 
-#: libpurple/protocols/silc/ops.c:1524 libpurple/protocols/silc/ops.c:1537
-#: libpurple/protocols/silc10/ops.c:1519 libpurple/protocols/silc10/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 "Serverinformation"
 
-#: libpurple/protocols/silc/ops.c:1525 libpurple/protocols/silc10/ops.c:1520
+#: ../libpurple/protocols/silc/ops.c:1525
+#: ../libpurple/protocols/silc10/ops.c:1520
 msgid "Cannot get server information"
 msgstr "Kann die Serverinformation nicht abrufen"
 
-#: libpurple/protocols/silc/ops.c:1548 libpurple/protocols/silc10/ops.c:1549
-#: libpurple/protocols/silc10/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 "Serverstatistik"
 
-#: libpurple/protocols/silc/ops.c:1549 libpurple/protocols/silc10/ops.c:1550
+#: ../libpurple/protocols/silc/ops.c:1549
+#: ../libpurple/protocols/silc10/ops.c:1550
 msgid "Cannot get server statistics"
 msgstr "Kann die Serverstatistik nicht abrufen"
 
-#: libpurple/protocols/silc/ops.c:1556 libpurple/protocols/silc10/ops.c:1581
+#: ../libpurple/protocols/silc/ops.c:1556
+#: ../libpurple/protocols/silc10/ops.c:1581
 #, c-format
 msgid ""
 "Local server start time: %s\n"
@@ -9669,54 +10116,66 @@
 "Server-Operatoren insgesamt: %d\n"
 "Router-Operatoren insgesamt: %d\n"
 
-#: libpurple/protocols/silc/ops.c:1588 libpurple/protocols/silc10/ops.c:1604
+#: ../libpurple/protocols/silc/ops.c:1588
+#: ../libpurple/protocols/silc10/ops.c:1604
 msgid "Network Statistics"
 msgstr "Netzwerkstatistik"
 
-#: libpurple/protocols/silc/ops.c:1596 libpurple/protocols/silc/ops.c:1601
-#: libpurple/protocols/silc10/ops.c:1612 libpurple/protocols/silc10/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:1596 libpurple/protocols/silc10/ops.c:1612
+#: ../libpurple/protocols/silc/ops.c:1596
+#: ../libpurple/protocols/silc10/ops.c:1612
 msgid "Ping failed"
 msgstr "Ping fehlgeschlagen"
 
-#: libpurple/protocols/silc/ops.c:1601 libpurple/protocols/silc10/ops.c:1617
+#: ../libpurple/protocols/silc/ops.c:1601
+#: ../libpurple/protocols/silc10/ops.c:1617
 msgid "Ping reply received from server"
 msgstr "Antwort auf ein Ping vom Server empfangen"
 
-#: libpurple/protocols/silc/ops.c:1609 libpurple/protocols/silc10/ops.c:1625
+#: ../libpurple/protocols/silc/ops.c:1609
+#: ../libpurple/protocols/silc10/ops.c:1625
 msgid "Could not kill user"
 msgstr "Kann den Benutzer nicht hinauswerfen"
 
-#: libpurple/protocols/silc/ops.c:1648
+#: ../libpurple/protocols/silc/ops.c:1648
 msgid "WATCH"
 msgstr "Beobachten"
 
-#: libpurple/protocols/silc/ops.c:1648
+#: ../libpurple/protocols/silc/ops.c:1648
 msgid "Cannot watch user"
 msgstr "Kann den Benutzer nicht beobachten"
 
-#: 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
+#: ../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 "Sitzung wird fortgesetzt"
 
-#: libpurple/protocols/silc/ops.c:1726 libpurple/protocols/silc10/ops.c:1813
+#: ../libpurple/protocols/silc/ops.c:1726
+#: ../libpurple/protocols/silc10/ops.c:1813
 msgid "Authenticating connection"
 msgstr "Verbindung wird authentifiziert"
 
-#: libpurple/protocols/silc/ops.c:1777 libpurple/protocols/silc10/ops.c:1860
+#: ../libpurple/protocols/silc/ops.c:1777
+#: ../libpurple/protocols/silc10/ops.c:1860
 msgid "Verifying server public key"
 msgstr "Überprüfung des öffentlichen Schlüssels des Servers"
 
-#: libpurple/protocols/silc/ops.c:1814 libpurple/protocols/silc10/ops.c:1902
+#: ../libpurple/protocols/silc/ops.c:1814
+#: ../libpurple/protocols/silc10/ops.c:1902
 msgid "Passphrase required"
 msgstr "Passphrase erforderlich"
 
-#: libpurple/protocols/silc/pk.c:98 libpurple/protocols/silc10/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 "
@@ -9726,14 +10185,14 @@
 "nicht mit diesem Schlüssel überein. Möchten Sie trotzdem diesen (neuen) "
 "Schlüssel akzeptieren?"
 
-#: libpurple/protocols/silc/pk.c:103 libpurple/protocols/silc10/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 ""
 "Öffentlicher Schlüssel von %s wurde empfangen. Möchten Sie diesen "
 "öffentlichen Schlüssel akzeptieren?"
 
-#: libpurple/protocols/silc/pk.c:107 libpurple/protocols/silc10/pk.c:113
+#: ../libpurple/protocols/silc/pk.c:107 ../libpurple/protocols/silc10/pk.c:113
 #, c-format
 msgid ""
 "Fingerprint and babbleprint for the %s key are:\n"
@@ -9746,88 +10205,100 @@
 "%s\n"
 "%s\n"
 
-#: libpurple/protocols/silc/pk.c:110 libpurple/protocols/silc/pk.c:139
-#: libpurple/protocols/silc10/pk.c:116 libpurple/protocols/silc10/pk.c:142
+#: ../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 "Öffentlichen Schlüssel ansehen"
 
-#: libpurple/protocols/silc/pk.c:115 libpurple/protocols/silc10/pk.c:121
+#: ../libpurple/protocols/silc/pk.c:115 ../libpurple/protocols/silc10/pk.c:121
 msgid "_View..."
 msgstr "_Ansehen..."
 
-#: libpurple/protocols/silc/pk.c:140 libpurple/protocols/silc10/pk.c:143
+#: ../libpurple/protocols/silc/pk.c:140 ../libpurple/protocols/silc10/pk.c:143
 msgid "Unsupported public key type"
 msgstr "Nicht-unterstützter Typ für den öffentlichen Schlüssel"
 
-#: libpurple/protocols/silc/silc.c:217 libpurple/protocols/silc10/ops.c:1749
+#: ../libpurple/protocols/silc/silc.c:217
+#: ../libpurple/protocols/silc10/ops.c:1749
 msgid "Disconnected by server"
 msgstr "Abgemeldet vom Server"
 
-#: libpurple/protocols/silc/silc.c:224 libpurple/protocols/silc10/ops.c:1700
+#: ../libpurple/protocols/silc/silc.c:224
+#: ../libpurple/protocols/silc10/ops.c:1700
 msgid "Error during connecting to SILC Server"
 msgstr "Fehler beim Verbinden mit dem SILC-Server"
 
-#: libpurple/protocols/silc/silc.c:229 libpurple/protocols/silc10/ops.c:1705
+#: ../libpurple/protocols/silc/silc.c:229
+#: ../libpurple/protocols/silc10/ops.c:1705
 msgid "Key Exchange failed"
 msgstr "Schlüsselaustausch gescheitert"
 
-#: libpurple/protocols/silc/silc.c:238 libpurple/protocols/silc10/ops.c:1714
+#: ../libpurple/protocols/silc/silc.c:238
+#: ../libpurple/protocols/silc10/ops.c:1714
 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."
 
-#: libpurple/protocols/silc/silc.c:265 libpurple/protocols/silc/silc.c:311
-#: libpurple/protocols/silc10/silc.c:161
+#: ../libpurple/protocols/silc/silc.c:265
+#: ../libpurple/protocols/silc/silc.c:311
+#: ../libpurple/protocols/silc10/silc.c:161
 msgid "Connection failed"
 msgstr "Verbindung fehlgeschlagen"
 
-#: libpurple/protocols/silc/silc.c:280 libpurple/protocols/silc10/silc.c:193
+#: ../libpurple/protocols/silc/silc.c:280
+#: ../libpurple/protocols/silc10/silc.c:193
 msgid "Performing key exchange"
 msgstr "Schlüsselaustausch"
 
 #. Progress
-#: libpurple/protocols/silc/silc.c:343 libpurple/protocols/silc10/silc.c:325
+#: ../libpurple/protocols/silc/silc.c:343
+#: ../libpurple/protocols/silc10/silc.c:325
 msgid "Connecting to SILC Server"
 msgstr "Verbinde mit SILC-Server"
 
-#: libpurple/protocols/silc/silc.c:352
-#, c-format
+#: ../libpurple/protocols/silc/silc.c:352
 msgid "Could not load SILC key pair"
 msgstr "Konnte SILC-Schlüsselpaar nicht laden"
 
-#: libpurple/protocols/silc/silc.c:366 libpurple/protocols/silc10/silc.c:355
+#: ../libpurple/protocols/silc/silc.c:366
+#: ../libpurple/protocols/silc10/silc.c:355
 msgid "Unable to create connection"
 msgstr "Kann Verbindung nicht erstellen"
 
-#: libpurple/protocols/silc/silc.c:395 libpurple/protocols/silc10/silc.c:267
+#: ../libpurple/protocols/silc/silc.c:395
+#: ../libpurple/protocols/silc10/silc.c:267
 msgid "Out of memory"
 msgstr "Kein Speicher verfügbar"
 
-#: libpurple/protocols/silc/silc.c:438 libpurple/protocols/silc10/silc.c:313
+#: ../libpurple/protocols/silc/silc.c:438
+#: ../libpurple/protocols/silc10/silc.c:313
 msgid "Cannot initialize SILC protocol"
 msgstr "Kann das SILC-Protokoll nicht initialisieren"
 
-#: libpurple/protocols/silc/silc.c:445
+#: ../libpurple/protocols/silc/silc.c:445
 msgid "Error loading SILC key pair"
 msgstr "Fehler beim Laden des SILC-Schlüsselpaares"
 
-#: libpurple/protocols/silc/silc.c:739 libpurple/protocols/silc10/silc.c:650
+#: ../libpurple/protocols/silc/silc.c:739
+#: ../libpurple/protocols/silc10/silc.c:650
 msgid "Your Current Mood"
 msgstr "Ihre momentane Stimmung"
 
-#: libpurple/protocols/silc/silc.c:741 libpurple/protocols/silc10/silc.c:652
-#: pidgin/gtkprefs.c:1636
-#, c-format
+#: ../libpurple/protocols/silc/silc.c:741
+#: ../libpurple/protocols/silc10/silc.c:652 ../pidgin/gtkprefs.c:1638
 msgid "Normal"
 msgstr "Normal"
 
-#: libpurple/protocols/silc/silc.c:755 libpurple/protocols/silc10/silc.c:666
+#: ../libpurple/protocols/silc/silc.c:755
+#: ../libpurple/protocols/silc10/silc.c:666
 msgid "In love"
 msgstr "Verliebt"
 
-#: libpurple/protocols/silc/silc.c:766 libpurple/protocols/silc10/silc.c:677
+#: ../libpurple/protocols/silc/silc.c:766
+#: ../libpurple/protocols/silc10/silc.c:677
 msgid ""
 "\n"
 "Your Preferred Contact Methods"
@@ -9835,50 +10306,63 @@
 "\n"
 "Ihre gewünschten Kontaktmethoden"
 
-#: libpurple/protocols/silc/silc.c:774 libpurple/protocols/silc/util.c:561
-#: libpurple/protocols/silc10/silc.c:685 libpurple/protocols/silc10/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:776 libpurple/protocols/silc/util.c:563
-#: libpurple/protocols/silc10/silc.c:687 libpurple/protocols/silc10/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:778 libpurple/protocols/silc10/silc.c:689
+#: ../libpurple/protocols/silc/silc.c:778
+#: ../libpurple/protocols/silc10/silc.c:689
 msgid "Video conferencing"
 msgstr "Videokonferenz"
 
-#: libpurple/protocols/silc/silc.c:783 libpurple/protocols/silc10/silc.c:694
+#: ../libpurple/protocols/silc/silc.c:783
+#: ../libpurple/protocols/silc10/silc.c:694
 msgid "Your Current Status"
 msgstr "Ihr aktueller Status"
 
-#: libpurple/protocols/silc/silc.c:790 libpurple/protocols/silc10/silc.c:701
+#: ../libpurple/protocols/silc/silc.c:790
+#: ../libpurple/protocols/silc10/silc.c:701
 msgid "Online Services"
 msgstr "Online-Dienste"
 
-#: libpurple/protocols/silc/silc.c:793 libpurple/protocols/silc10/silc.c:704
+#: ../libpurple/protocols/silc/silc.c:793
+#: ../libpurple/protocols/silc10/silc.c:704
 msgid "Let others see what services you are using"
 msgstr "Andere Benutzer können sehen, welche Dienste Sie nutzen"
 
-#: libpurple/protocols/silc/silc.c:799 libpurple/protocols/silc10/silc.c:710
+#: ../libpurple/protocols/silc/silc.c:799
+#: ../libpurple/protocols/silc10/silc.c:710
 msgid "Let others see what computer you are using"
 msgstr "Andere Benutzer können sehen, welchen Computer Sie nutzen"
 
-#: libpurple/protocols/silc/silc.c:806 libpurple/protocols/silc10/silc.c:717
+#: ../libpurple/protocols/silc/silc.c:806
+#: ../libpurple/protocols/silc10/silc.c:717
 msgid "Your VCard File"
 msgstr "Ihre VCard-Datei"
 
-#: libpurple/protocols/silc/silc.c:812
+#: ../libpurple/protocols/silc/silc.c:812
 msgid "Timezone (UTC)"
 msgstr "Zeitzone (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
+#: ../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 "Online-Statusattribute des Benutzers"
 
-#: libpurple/protocols/silc/silc.c:818 libpurple/protocols/silc10/silc.c:731
+#: ../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 "
@@ -9888,175 +10372,217 @@
 "Informationen zugänglich machen. Bitte füllen Sie die Informationen aus, die "
 "andere Benutzer von Ihnen sehen können."
 
-#: 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
+#: ../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 "Nachricht des Tages"
 
-#: libpurple/protocols/silc/silc.c:859 libpurple/protocols/silc10/silc.c:772
+#: ../libpurple/protocols/silc/silc.c:859
+#: ../libpurple/protocols/silc10/silc.c:772
 msgid "No Message of the Day available"
 msgstr "Keine Nachricht-des-Tages verfügbar"
 
-#: libpurple/protocols/silc/silc.c:860 libpurple/protocols/silc/silc.c:1481
-#: libpurple/protocols/silc10/silc.c:773
-#: libpurple/protocols/silc10/silc.c:1410
+#: ../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 "Es gibt keine Nachricht-des-Tages zu dieser Verbindung"
 
-#: 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
+#: ../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 "Erstelle ein neues SILC-Schlüsselpaar"
 
-#: libpurple/protocols/silc/silc.c:911 libpurple/protocols/silc10/silc.c:824
+#: ../libpurple/protocols/silc/silc.c:911
+#: ../libpurple/protocols/silc10/silc.c:824
 msgid "Passphrases do not match"
 msgstr "Passphrasen stimmen nicht überein"
 
-#: libpurple/protocols/silc/silc.c:957 libpurple/protocols/silc10/silc.c:868
+#: ../libpurple/protocols/silc/silc.c:957
+#: ../libpurple/protocols/silc10/silc.c:868
 msgid "Key Pair Generation failed"
 msgstr "Schlüsselerzeugung ist fehlgeschlagen"
 
-#: libpurple/protocols/silc/silc.c:996 libpurple/protocols/silc10/silc.c:907
+#: ../libpurple/protocols/silc/silc.c:996
+#: ../libpurple/protocols/silc10/silc.c:907
 msgid "Key length"
 msgstr "Schlüssellänge"
 
-#: libpurple/protocols/silc/silc.c:998 libpurple/protocols/silc10/silc.c:909
+#: ../libpurple/protocols/silc/silc.c:998
+#: ../libpurple/protocols/silc10/silc.c:909
 msgid "Public key file"
 msgstr "Öffentlicher Schlüssel (Datei)"
 
-#: libpurple/protocols/silc/silc.c:1000 libpurple/protocols/silc10/silc.c:911
+#: ../libpurple/protocols/silc/silc.c:1000
+#: ../libpurple/protocols/silc10/silc.c:911
 msgid "Private key file"
 msgstr "Privater Schlüssel (Datei)"
 
-#: libpurple/protocols/silc/silc.c:1023 libpurple/protocols/silc10/silc.c:934
+#: ../libpurple/protocols/silc/silc.c:1023
+#: ../libpurple/protocols/silc10/silc.c:934
 msgid "Passphrase (retype)"
 msgstr "Passphrase (nochmal)"
 
-#: libpurple/protocols/silc/silc.c:1030 libpurple/protocols/silc10/silc.c:941
+#: ../libpurple/protocols/silc/silc.c:1030
+#: ../libpurple/protocols/silc10/silc.c:941
 msgid "Generate Key Pair"
 msgstr "Schlüsselpaar erzeugen"
 
-#: libpurple/protocols/silc/silc.c:1073 libpurple/protocols/silc10/silc.c:984
+#: ../libpurple/protocols/silc/silc.c:1073
+#: ../libpurple/protocols/silc10/silc.c:984
 msgid "Online Status"
 msgstr "Online-Status"
 
-#: libpurple/protocols/silc/silc.c:1081 libpurple/protocols/silc10/silc.c:992
+#: ../libpurple/protocols/silc/silc.c:1081
+#: ../libpurple/protocols/silc10/silc.c:992
 msgid "View Message of the Day"
 msgstr "Nachricht des Tages anschauen"
 
-#: libpurple/protocols/silc/silc.c:1085 libpurple/protocols/silc10/silc.c:996
+#: ../libpurple/protocols/silc/silc.c:1085
+#: ../libpurple/protocols/silc10/silc.c:996
 msgid "Create SILC Key Pair..."
 msgstr "SILC-Schlüsselpaar erstellen..."
 
-#: libpurple/protocols/silc/silc.c:1177 libpurple/protocols/silc10/silc.c:1095
+#: ../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 "Benutzer <I>%s</I> ist nicht im Netzwerk präsent"
 
-#: libpurple/protocols/silc/silc.c:1357 libpurple/protocols/silc10/silc.c:1286
+#: ../libpurple/protocols/silc/silc.c:1357
+#: ../libpurple/protocols/silc10/silc.c:1286
 msgid "Topic too long"
 msgstr "Thema zu lang"
 
-#: libpurple/protocols/silc/silc.c:1438 libpurple/protocols/silc10/silc.c:1367
+#: ../libpurple/protocols/silc/silc.c:1438
+#: ../libpurple/protocols/silc10/silc.c:1367
 msgid "You must specify a nick"
 msgstr "Sie müssen einen Nick angeben"
 
-#: libpurple/protocols/silc/silc.c:1540 libpurple/protocols/silc10/silc.c:1469
+#: ../libpurple/protocols/silc/silc.c:1540
+#: ../libpurple/protocols/silc10/silc.c:1469
 #, c-format
 msgid "channel %s not found"
 msgstr "Kanal %s nicht gefunden"
 
-#: libpurple/protocols/silc/silc.c:1545 libpurple/protocols/silc10/silc.c:1474
+#: ../libpurple/protocols/silc/silc.c:1545
+#: ../libpurple/protocols/silc10/silc.c:1474
 #, c-format
 msgid "channel modes for %s: %s"
 msgstr "Kanal-Modi für %s: %s"
 
-#: libpurple/protocols/silc/silc.c:1547 libpurple/protocols/silc10/silc.c:1476
+#: ../libpurple/protocols/silc/silc.c:1547
+#: ../libpurple/protocols/silc10/silc.c:1476
 #, c-format
 msgid "no channel modes are set on %s"
 msgstr "Für den Kanal %s sind keine Kanal-Modi gesetzt"
 
-#: libpurple/protocols/silc/silc.c:1560 libpurple/protocols/silc10/silc.c:1489
+#: ../libpurple/protocols/silc/silc.c:1560
+#: ../libpurple/protocols/silc10/silc.c:1489
 #, c-format
 msgid "Failed to set cmodes for %s"
 msgstr "Setzen der cmodes für %s gescheitert"
 
-#: libpurple/protocols/silc/silc.c:1590 libpurple/protocols/silc10/silc.c:1519
+#: ../libpurple/protocols/silc/silc.c:1590
+#: ../libpurple/protocols/silc10/silc.c:1519
 #, c-format
 msgid "Unknown command: %s, (may be a client bug)"
 msgstr "Unbekanntes Kommando: %s, (möglicherweise ein Bug)"
 
-#: libpurple/protocols/silc/silc.c:1653 libpurple/protocols/silc10/silc.c:1582
+#: ../libpurple/protocols/silc/silc.c:1653
+#: ../libpurple/protocols/silc10/silc.c:1582
 msgid "part [channel]:  Leave the chat"
 msgstr "part [Kanal]:  Verlasse den Chat"
 
-#: libpurple/protocols/silc/silc.c:1657 libpurple/protocols/silc10/silc.c:1586
+#: ../libpurple/protocols/silc/silc.c:1657
+#: ../libpurple/protocols/silc10/silc.c:1586
 msgid "leave [channel]:  Leave the chat"
 msgstr "leave [Kanal]:  Verlassen des Chats"
 
-#: libpurple/protocols/silc/silc.c:1661 libpurple/protocols/silc10/silc.c:1590
+#: ../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;neues Thema&gt;]:  Thema ändern oder anzeigen"
 
-#: libpurple/protocols/silc/silc.c:1666 libpurple/protocols/silc10/silc.c:1595
+#: ../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"
 
-#: libpurple/protocols/silc/silc.c:1670 libpurple/protocols/silc10/silc.c:1599
+#: ../libpurple/protocols/silc/silc.c:1670
+#: ../libpurple/protocols/silc10/silc.c:1599
 msgid "list:  List channels on this network"
 msgstr "list:  Liste Kanäle in diesem Netzwerk auf"
 
-#: libpurple/protocols/silc/silc.c:1674 libpurple/protocols/silc10/silc.c:1603
+#: ../libpurple/protocols/silc/silc.c:1674
+#: ../libpurple/protocols/silc10/silc.c:1603
 msgid "whois &lt;nick&gt;:  View nick's information"
 msgstr "whois &lt;Nick&gt;:  Informationen zum Nick anzeigen"
 
-#: libpurple/protocols/silc/silc.c:1678 libpurple/protocols/silc10/silc.c:1607
-#: libpurple/protocols/zephyr/zephyr.c:2685
+#: ../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;Benutzer&gt; &lt;Nachricht&gt;:  Sendet eine private Nachricht an "
 "einen anderen Benutzer"
 
-#: libpurple/protocols/silc/silc.c:1682 libpurple/protocols/silc10/silc.c:1611
+#: ../libpurple/protocols/silc/silc.c:1682
+#: ../libpurple/protocols/silc10/silc.c:1611
 msgid "query &lt;nick&gt; [&lt;message&gt;]:  Send a private message to a user"
 msgstr ""
 "query &lt;Nick&gt; [&lt;Nachricht&gt;]:  Sende eine private Nachricht an "
 "einen Benutzer"
 
-#: libpurple/protocols/silc/silc.c:1686 libpurple/protocols/silc10/silc.c:1615
+#: ../libpurple/protocols/silc/silc.c:1686
+#: ../libpurple/protocols/silc10/silc.c:1615
 msgid "motd:  View the server's Message Of The Day"
 msgstr "motd:  Nachricht des Tages vom Server anzeigen"
 
-#: libpurple/protocols/silc/silc.c:1690 libpurple/protocols/silc10/silc.c:1619
+#: ../libpurple/protocols/silc/silc.c:1690
+#: ../libpurple/protocols/silc10/silc.c:1619
 msgid "detach:  Detach this session"
 msgstr "detach:  Sitzung beenden"
 
-#: libpurple/protocols/silc/silc.c:1694 libpurple/protocols/silc10/silc.c:1623
+#: ../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 [Nachricht]:  Trennung vom Server mit einer optionalen Nachricht"
 
-#: libpurple/protocols/silc/silc.c:1698 libpurple/protocols/silc10/silc.c:1627
+#: ../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;Kommando&gt;:  Rufe ein Silc-Client-Kommando auf"
 
-#: libpurple/protocols/silc/silc.c:1704 libpurple/protocols/silc10/silc.c:1633
+#: ../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;Grund&gt;]:  Killt einen Nick"
 
-#: libpurple/protocols/silc/silc.c:1708 libpurple/protocols/silc10/silc.c:1637
+#: ../libpurple/protocols/silc/silc.c:1708
+#: ../libpurple/protocols/silc10/silc.c:1637
 msgid "nick &lt;newnick&gt;:  Change your nickname"
 msgstr "nick &lt;neue Nickname&gt;:  Ihren Nickname ändern"
 
-#: libpurple/protocols/silc/silc.c:1712 libpurple/protocols/silc10/silc.c:1641
+#: ../libpurple/protocols/silc/silc.c:1712
+#: ../libpurple/protocols/silc10/silc.c:1641
 msgid "whowas &lt;nick&gt;:  View nick's information"
 msgstr "whowas &lt;Nick&gt;:  Informationen zu einem Benutzer abrufen"
 
-#: libpurple/protocols/silc/silc.c:1716 libpurple/protocols/silc10/silc.c:1645
+#: ../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"
@@ -10064,7 +10590,8 @@
 "cmode &lt;Kanal&gt; [+|-&lt;Modi&gt;] [Argumente]:  Kanal-Modi ändern oder "
 "anzeigen"
 
-#: libpurple/protocols/silc/silc.c:1720 libpurple/protocols/silc10/silc.c:1649
+#: ../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"
@@ -10072,17 +10599,20 @@
 "cumode &lt;Kanal&gt; +|-&lt;Modi&gt; &lt;Nick&gt;:  Modi des Benutzers auf "
 "dem Kanal ändern"
 
-#: libpurple/protocols/silc/silc.c:1724 libpurple/protocols/silc10/silc.c:1653
+#: ../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"
 
-#: libpurple/protocols/silc/silc.c:1728 libpurple/protocols/silc10/silc.c:1657
+#: ../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"
 
-#: libpurple/protocols/silc/silc.c:1732 libpurple/protocols/silc10/silc.c:1661
+#: ../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"
@@ -10090,39 +10620,47 @@
 "invite &lt;Kanal&gt; [-|+]&lt;Nick&gt;:  Benutzer einladen oder Benutzer zur "
 "Einladungsliste des Kanals hinzufügen oder von der Einladungsliste entfernen"
 
-#: libpurple/protocols/silc/silc.c:1736 libpurple/protocols/silc10/silc.c:1665
+#: ../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;Kanal&gt; &lt;Nick&gt; [Kommentar]:  Kickt einen Benutzer aus dem "
 "Kanal"
 
-#: libpurple/protocols/silc/silc.c:1740 libpurple/protocols/silc10/silc.c:1669
+#: ../libpurple/protocols/silc/silc.c:1740
+#: ../libpurple/protocols/silc10/silc.c:1669
 msgid "info [server]:  View server administrative details"
 msgstr "info [Server]:  Administrative Details des Servers ansehen"
 
-#: libpurple/protocols/silc/silc.c:1744 libpurple/protocols/silc10/silc.c:1673
+#: ../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;Kanal&gt; +|-&lt;Nick&gt;]:  Verbanne Benutzer vom Kanal"
 
-#: libpurple/protocols/silc/silc.c:1748 libpurple/protocols/silc10/silc.c:1677
+#: ../libpurple/protocols/silc/silc.c:1748
+#: ../libpurple/protocols/silc10/silc.c:1677
 msgid "getkey &lt;nick|server&gt;:  Retrieve client's or server's public key"
 msgstr ""
 "getkey &lt;Nick|Server&gt;:  Öffentlichen Schlüssel der Servers oder des "
 "Benutzers abrufen"
 
-#: libpurple/protocols/silc/silc.c:1752 libpurple/protocols/silc10/silc.c:1681
+#: ../libpurple/protocols/silc/silc.c:1752
+#: ../libpurple/protocols/silc10/silc.c:1681
 msgid "stats:  View server and network statistics"
 msgstr "stats:  Server- und Netzwerkstatistik ansehen"
 
-#: libpurple/protocols/silc/silc.c:1756 libpurple/protocols/silc10/silc.c:1685
+#: ../libpurple/protocols/silc/silc.c:1756
+#: ../libpurple/protocols/silc10/silc.c:1685
 msgid "ping:  Send PING to the connected server"
 msgstr "ping:  Sendet PING an den verbundenen Server"
 
-#: libpurple/protocols/silc/silc.c:1761 libpurple/protocols/silc10/silc.c:1690
+#: ../libpurple/protocols/silc/silc.c:1761
+#: ../libpurple/protocols/silc10/silc.c:1690
 msgid "users &lt;channel&gt;:  List users in channel"
 msgstr "users &lt;Kanal&gt;:  Benutzer im Kanal auflisten"
 
-#: libpurple/protocols/silc/silc.c:1765 libpurple/protocols/silc10/silc.c:1694
+#: ../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)"
@@ -10139,118 +10677,141 @@
 #. *< name
 #. *< version
 #. *  summary
-#: libpurple/protocols/silc/silc.c:1876 libpurple/protocols/silc10/silc.c:1819
+#: ../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:1878 libpurple/protocols/silc10/silc.c:1821
+#: ../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:1910 libpurple/protocols/silc10/silc.c:1853
-#: pidgin/gtkprefs.c:2029
+#: ../libpurple/protocols/silc/silc.c:1910
+#: ../libpurple/protocols/silc10/silc.c:1853 ../pidgin/gtkprefs.c:2031
 msgid "Network"
 msgstr "Netzwerk"
 
-#: libpurple/protocols/silc/silc.c:1921 libpurple/protocols/silc10/silc.c:1864
+#: ../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:1925 libpurple/protocols/silc10/silc.c:1868
+#: ../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:1935 libpurple/protocols/silc10/silc.c:1878
+#: ../libpurple/protocols/silc/silc.c:1935
+#: ../libpurple/protocols/silc10/silc.c:1878
 msgid "Cipher"
 msgstr "Verschlüsselung"
 
-#: libpurple/protocols/silc/silc.c:1945 libpurple/protocols/silc10/silc.c:1888
+#: ../libpurple/protocols/silc/silc.c:1945
+#: ../libpurple/protocols/silc10/silc.c:1888
 msgid "HMAC"
 msgstr "HMAC"
 
-#: libpurple/protocols/silc/silc.c:1948
+#: ../libpurple/protocols/silc/silc.c:1948
 msgid "Use Perfect Forward Secrecy"
 msgstr "Benutze perfekt fortgesetzte Geheimhaltung (PFS)"
 
-#: libpurple/protocols/silc/silc.c:1952 libpurple/protocols/silc10/silc.c:1891
+#: ../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:1955 libpurple/protocols/silc10/silc.c:1894
+#: ../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:1958 libpurple/protocols/silc10/silc.c:1897
+#: ../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:1961 libpurple/protocols/silc10/silc.c:1900
+#: ../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:1964 libpurple/protocols/silc10/silc.c:1903
+#: ../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"
 
-#: libpurple/protocols/silc/util.c:207 libpurple/protocols/silc/util.c:249
-#: libpurple/protocols/silc10/util.c:207 libpurple/protocols/silc10/util.c:247
+#: ../libpurple/protocols/silc/util.c:207
+#: ../libpurple/protocols/silc/util.c:249
+#: ../libpurple/protocols/silc10/util.c:207
+#: ../libpurple/protocols/silc10/util.c:247
 msgid "Creating SILC key pair..."
 msgstr "Erstelle SILC-Schlüsselpaar..."
 
-#: libpurple/protocols/silc/util.c:215 libpurple/protocols/silc/util.c:257
+#: ../libpurple/protocols/silc/util.c:215
+#: ../libpurple/protocols/silc/util.c:257
 msgid "Cannot create SILC key pair\n"
 msgstr "Kann SILC-Schlüsselpaar nicht erstellen\n"
 
 #. Hint for translators: Please check the tabulator width here and in
 #. the next strings (short strings: 2 tabs, longer strings 1 tab,
 #. sum: 3 tabs or 24 characters)
-#: libpurple/protocols/silc/util.c:358 libpurple/protocols/silc10/util.c:355
+#: ../libpurple/protocols/silc/util.c:358
+#: ../libpurple/protocols/silc10/util.c:355
 #, c-format
 msgid "Real Name: \t%s\n"
 msgstr "Echter Name: \t%s\n"
 
-#: libpurple/protocols/silc/util.c:360 libpurple/protocols/silc10/util.c:357
+#: ../libpurple/protocols/silc/util.c:360
+#: ../libpurple/protocols/silc10/util.c:357
 #, c-format
 msgid "User Name: \t%s\n"
 msgstr "Benutzername: \t%s\n"
 
-#: libpurple/protocols/silc/util.c:362 libpurple/protocols/silc10/util.c:359
+#: ../libpurple/protocols/silc/util.c:362
+#: ../libpurple/protocols/silc10/util.c:359
 #, c-format
 msgid "E-Mail: \t\t%s\n"
 msgstr "E-Mail: \t\t%s\n"
 
-#: libpurple/protocols/silc/util.c:364 libpurple/protocols/silc10/util.c:361
+#: ../libpurple/protocols/silc/util.c:364
+#: ../libpurple/protocols/silc10/util.c:361
 #, c-format
 msgid "Host Name: \t%s\n"
 msgstr "Rechnername: \t%s\n"
 
-#: libpurple/protocols/silc/util.c:366 libpurple/protocols/silc10/util.c:363
+#: ../libpurple/protocols/silc/util.c:366
+#: ../libpurple/protocols/silc10/util.c:363
 #, c-format
 msgid "Organization: \t%s\n"
 msgstr "Organisation: \t%s\n"
 
-#: libpurple/protocols/silc/util.c:368 libpurple/protocols/silc10/util.c:365
+#: ../libpurple/protocols/silc/util.c:368
+#: ../libpurple/protocols/silc10/util.c:365
 #, c-format
 msgid "Country: \t%s\n"
 msgstr "Land: \t%s\n"
 
-#: libpurple/protocols/silc/util.c:369 libpurple/protocols/silc10/util.c:366
+#: ../libpurple/protocols/silc/util.c:369
+#: ../libpurple/protocols/silc10/util.c:366
 #, c-format
 msgid "Algorithm: \t%s\n"
 msgstr "Algorithmus: \t%s\n"
 
-#: libpurple/protocols/silc/util.c:370 libpurple/protocols/silc10/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 "Schlüssellänge: \t%d Bits\n"
 
-#: libpurple/protocols/silc/util.c:372
+#: ../libpurple/protocols/silc/util.c:372
 #, c-format
 msgid "Version: \t%s\n"
 msgstr "Version: \t%s\n"
 
-#: libpurple/protocols/silc/util.c:374 libpurple/protocols/silc10/util.c:369
+#: ../libpurple/protocols/silc/util.c:374
+#: ../libpurple/protocols/silc10/util.c:369
 #, c-format
 msgid ""
 "Public Key Fingerprint:\n"
@@ -10261,7 +10822,8 @@
 "%s\n"
 "\n"
 
-#: libpurple/protocols/silc/util.c:375 libpurple/protocols/silc10/util.c:370
+#: ../libpurple/protocols/silc/util.c:375
+#: ../libpurple/protocols/silc10/util.c:370
 #, c-format
 msgid ""
 "Public Key Babbleprint:\n"
@@ -10270,39 +10832,46 @@
 "Öffentlicher Schlüssel Babbleprint:\n"
 "%s"
 
-#: libpurple/protocols/silc/util.c:379 libpurple/protocols/silc/util.c:380
-#: libpurple/protocols/silc10/util.c:374 libpurple/protocols/silc10/util.c:375
+#: ../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 "Informationen zum öffentlichen Schlüssel"
 
-#: libpurple/protocols/silc/util.c:559 libpurple/protocols/silc10/util.c:555
+#: ../libpurple/protocols/silc/util.c:559
+#: ../libpurple/protocols/silc10/util.c:555
 msgid "Paging"
 msgstr "Funkruf"
 
-#: libpurple/protocols/silc/util.c:565 libpurple/protocols/silc10/util.c:561
+#: ../libpurple/protocols/silc/util.c:565
+#: ../libpurple/protocols/silc10/util.c:561
 msgid "Video Conferencing"
 msgstr "Videokonferenz"
 
-#: libpurple/protocols/silc/util.c:583 libpurple/protocols/silc10/util.c:579
+#: ../libpurple/protocols/silc/util.c:583
+#: ../libpurple/protocols/silc10/util.c:579
 msgid "Computer"
 msgstr "Computer"
 
-#: libpurple/protocols/silc/util.c:587 libpurple/protocols/silc10/util.c:583
+#: ../libpurple/protocols/silc/util.c:587
+#: ../libpurple/protocols/silc10/util.c:583
 msgid "PDA"
 msgstr "PDA"
 
-#: libpurple/protocols/silc/util.c:589 libpurple/protocols/silc10/util.c:585
+#: ../libpurple/protocols/silc/util.c:589
+#: ../libpurple/protocols/silc10/util.c:585
 msgid "Terminal"
 msgstr "Terminal"
 
-#: libpurple/protocols/silc/wb.c:284 libpurple/protocols/silc10/wb.c:284
+#: ../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 hat eine Nachricht zum Whiteboard geschickt. Möchten Sie das Whiteboard "
 "öffnen?"
 
-#: libpurple/protocols/silc/wb.c:288 libpurple/protocols/silc10/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 "
@@ -10311,111 +10880,101 @@
 "%s hat eine Nachricht zum Whiteboard im Kanal %s geschickt. Möchten Sie das "
 "Whiteboard öffnen?"
 
-#: libpurple/protocols/silc/wb.c:302 libpurple/protocols/silc10/wb.c:302
+#: ../libpurple/protocols/silc/wb.c:302 ../libpurple/protocols/silc10/wb.c:302
 msgid "Whiteboard"
 msgstr "Whiteboard"
 
-#: libpurple/protocols/silc10/ops.c:1559
+#: ../libpurple/protocols/silc10/ops.c:1559
 msgid "No server statistics available"
 msgstr "Keine Serverstatistik verfügbar"
 
-#: libpurple/protocols/silc10/ops.c:1931
-#, c-format
+#: ../libpurple/protocols/silc10/ops.c:1931
 msgid "Failure: Version mismatch, upgrade your client"
 msgstr "Fehler: Unterschiedliche Version, aktualisieren Sie Ihren Client"
 
-#: libpurple/protocols/silc10/ops.c:1934
-#, c-format
+#: ../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"
 
-#: libpurple/protocols/silc10/ops.c:1937
-#, c-format
+#: ../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"
 
-#: libpurple/protocols/silc10/ops.c:1940
-#, c-format
+#: ../libpurple/protocols/silc10/ops.c:1940
 msgid "Failure: Remote does not support proposed cipher"
 msgstr ""
 "Fehler: Entferntes Programm unterstützt die vorgeschlagene Cipher nicht"
 
-#: libpurple/protocols/silc10/ops.c:1943
-#, c-format
+#: ../libpurple/protocols/silc10/ops.c:1943
 msgid "Failure: Remote does not support proposed PKCS"
 msgstr "Fehler: Entferntes Programm unterstützt die vorgeschlagene PKCS nicht"
 
-#: libpurple/protocols/silc10/ops.c:1946
-#, c-format
+#: ../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"
 
-#: libpurple/protocols/silc10/ops.c:1949
-#, c-format
+#: ../libpurple/protocols/silc10/ops.c:1949
 msgid "Failure: Remote does not support proposed HMAC"
 msgstr "Fehler: Entferntes Programm unterstützt das vorgeschlagene HMAC nicht"
 
-#: libpurple/protocols/silc10/ops.c:1951
-#, c-format
+#: ../libpurple/protocols/silc10/ops.c:1951
 msgid "Failure: Incorrect signature"
 msgstr "Fehler: Falsche Signatur"
 
-#: libpurple/protocols/silc10/ops.c:1953
-#, c-format
+#: ../libpurple/protocols/silc10/ops.c:1953
 msgid "Failure: Invalid cookie"
 msgstr "Fehler: Ungültiger Cookie"
 
-#: libpurple/protocols/silc10/ops.c:1964
-#, c-format
+#: ../libpurple/protocols/silc10/ops.c:1964
 msgid "Failure: Authentication failed"
 msgstr "Fehler: Authentifizierung fehlgeschlagen"
 
-#: libpurple/protocols/silc10/silc.c:182
+#: ../libpurple/protocols/silc10/silc.c:182
 msgid "Cannot initialize SILC Client connection"
 msgstr "Konnte die SILC-Client-Verbindung nicht herstellen"
 
-#: libpurple/protocols/silc10/silc.c:290
+#: ../libpurple/protocols/silc10/silc.c:290
 msgid "John Noname"
 msgstr "Max Mustermann"
 
-#: libpurple/protocols/silc10/silc.c:320
+#: ../libpurple/protocols/silc10/silc.c:320
 msgid "Cannot find/access ~/.silc directory"
 msgstr "Kann nicht auf das Verzeichnis ~/.silc zugreifen"
 
-#: libpurple/protocols/silc10/silc.c:334
+#: ../libpurple/protocols/silc10/silc.c:334
 #, c-format
 msgid "Could not load SILC key pair: %s"
 msgstr "Konnte SILC-Schlüsselpaar nicht laden: %s"
 
 #. TODO: do we really want to disconnect on a failure to write?
-#: libpurple/protocols/simple/simple.c:416
+#: ../libpurple/protocols/simple/simple.c:416
 msgid "Could not write"
 msgstr "Konnte nicht schreiben"
 
-#: libpurple/protocols/simple/simple.c:438
-#: libpurple/protocols/simple/simple.c:1489
+#: ../libpurple/protocols/simple/simple.c:438
+#: ../libpurple/protocols/simple/simple.c:1489
 msgid "Could not connect"
 msgstr "Verbinden nicht möglich"
 
-#: libpurple/protocols/simple/simple.c:1523
-#: libpurple/protocols/simple/simple.c:1565
-#: libpurple/protocols/simple/simple.c:1578
-#: libpurple/protocols/simple/simple.c:1629
+#: ../libpurple/protocols/simple/simple.c:1523
+#: ../libpurple/protocols/simple/simple.c:1565
+#: ../libpurple/protocols/simple/simple.c:1578
+#: ../libpurple/protocols/simple/simple.c:1629
 msgid "Could not create listen socket"
 msgstr "Kann Listen-Socket nicht erstellen"
 
-#: libpurple/protocols/simple/simple.c:1546
+#: ../libpurple/protocols/simple/simple.c:1546
 msgid "Couldn't resolve host"
 msgstr "Kann den Hostnamen nicht auflösen"
 
-#: libpurple/protocols/simple/simple.c:1637
+#: ../libpurple/protocols/simple/simple.c:1637
 msgid "Could not resolve hostname"
 msgstr "Konnte den Hostnamen nicht auflösen"
 
-#: libpurple/protocols/simple/simple.c:1654
+#: ../libpurple/protocols/simple/simple.c:1654
 msgid "SIP screen names may not contain whitespaces or @ symbols"
 msgstr "SIP-Benutzernamen dürfen keine Leerzeichen oder @-Symbole enthalten"
 
@@ -10427,175 +10986,161 @@
 #. *< id
 #. *< name
 #. *< version
-#: libpurple/protocols/simple/simple.c:1829
+#: ../libpurple/protocols/simple/simple.c:1829
 msgid "SIP/SIMPLE Protocol Plugin"
 msgstr "SIP/SIMPLE Protokoll-Plugin"
 
 #. *  summary
-#: libpurple/protocols/simple/simple.c:1830
+#: ../libpurple/protocols/simple/simple.c:1830
 msgid "The SIP/SIMPLE Protocol Plugin"
 msgstr "Das SIP/SIMPLE-Protokoll-Plugin"
 
-#: libpurple/protocols/simple/simple.c:1858
+#: ../libpurple/protocols/simple/simple.c:1858
 msgid "Publish status (note: everyone may watch you)"
 msgstr "Status veröffentlichen (Bemerkung: Jeder kann Sie sehen)"
 
-#: libpurple/protocols/simple/simple.c:1864
+#: ../libpurple/protocols/simple/simple.c:1864
 msgid "Use UDP"
 msgstr "Benutze UDP"
 
-#: libpurple/protocols/simple/simple.c:1866
+#: ../libpurple/protocols/simple/simple.c:1866
 msgid "Use proxy"
 msgstr "Proxy benutzen"
 
-#: libpurple/protocols/simple/simple.c:1868
+#: ../libpurple/protocols/simple/simple.c:1868
 msgid "Proxy"
 msgstr "Proxy"
 
-#: libpurple/protocols/simple/simple.c:1870
+#: ../libpurple/protocols/simple/simple.c:1870
 msgid "Auth User"
 msgstr "Auth-Benutzer"
 
-#: libpurple/protocols/simple/simple.c:1872
+#: ../libpurple/protocols/simple/simple.c:1872
 msgid "Auth Domain"
 msgstr "Auth-Domain"
 
-#: libpurple/protocols/toc/toc.c:139
+#: ../libpurple/protocols/toc/toc.c:139
 #, c-format
 msgid "Looking up %s"
 msgstr "Suche nach %s"
 
-#: libpurple/protocols/toc/toc.c:148
+#: ../libpurple/protocols/toc/toc.c:148
 #, c-format
 msgid "Connect to %s failed"
 msgstr "Verbindung mit %s fehlgeschlagen"
 
-#: libpurple/protocols/toc/toc.c:201
+#: ../libpurple/protocols/toc/toc.c:201
 #, c-format
 msgid "Signon: %s"
 msgstr "Anmeldung: %s"
 
-#: libpurple/protocols/toc/toc.c:488
+#: ../libpurple/protocols/toc/toc.c:488
 #, c-format
 msgid "Unable to write file %s."
 msgstr "Datei %s konnte nicht geschrieben werden."
 
-#: libpurple/protocols/toc/toc.c:491
+#: ../libpurple/protocols/toc/toc.c:491
 #, c-format
 msgid "Unable to read file %s."
 msgstr "Datei %s konnte nicht gelesen werden."
 
-#: libpurple/protocols/toc/toc.c:494
+#: ../libpurple/protocols/toc/toc.c:494
 #, c-format
 msgid "Message too long, last %s bytes truncated."
 msgstr "Nachricht zu lange, letzten %s Bytes abgeschnitten."
 
-#: libpurple/protocols/toc/toc.c:497
+#: ../libpurple/protocols/toc/toc.c:497
 #, c-format
 msgid "%s not currently logged in."
 msgstr "%s ist zur Zeit nicht online."
 
-#: libpurple/protocols/toc/toc.c:500
+#: ../libpurple/protocols/toc/toc.c:500
 #, c-format
 msgid "Warning of %s not allowed."
 msgstr "Verwarnung von %s nicht erlaubt."
 
-#: libpurple/protocols/toc/toc.c:503
-#, c-format
+#: ../libpurple/protocols/toc/toc.c:503
 msgid "A message has been dropped, you are exceeding the server speed limit."
 msgstr ""
 "Eine Nachricht ging verloren. Sie überschreiten die Geschwindigkeitsgrenze "
 "des Servers."
 
-#: libpurple/protocols/toc/toc.c:506
+#: ../libpurple/protocols/toc/toc.c:506
 #, c-format
 msgid "Chat in %s is not available."
 msgstr "Chat in %s ist nicht verfügbar."
 
-#: libpurple/protocols/toc/toc.c:509
+#: ../libpurple/protocols/toc/toc.c:509
 #, c-format
 msgid "You are sending messages too fast to %s."
 msgstr "Sie verschicken die Nachrichten an %s zu schnell."
 
-#: libpurple/protocols/toc/toc.c:512
+#: ../libpurple/protocols/toc/toc.c:512
 #, c-format
 msgid "You missed an IM from %s because it was too big."
 msgstr "Eine Nachricht von %s hat Sie nicht erreicht, da sie zu groß war."
 
-#: libpurple/protocols/toc/toc.c:515
+#: ../libpurple/protocols/toc/toc.c:515
 #, c-format
 msgid "You missed an IM from %s because it was sent too fast."
 msgstr ""
 "Eine Nachricht von %s hat Sie nicht erreicht, da sie zu schnell gesendet "
 "wurde."
 
-#: libpurple/protocols/toc/toc.c:518
-#, c-format
+#: ../libpurple/protocols/toc/toc.c:518
 msgid "Failure."
 msgstr "Fehler."
 
-#: libpurple/protocols/toc/toc.c:521
-#, c-format
+#: ../libpurple/protocols/toc/toc.c:521
 msgid "Too many matches."
 msgstr "Zu viele Übereinstimmungen."
 
-#: libpurple/protocols/toc/toc.c:524
-#, c-format
+#: ../libpurple/protocols/toc/toc.c:524
 msgid "Need more qualifiers."
 msgstr "Benötige mehr Angaben."
 
-#: libpurple/protocols/toc/toc.c:527
-#, c-format
+#: ../libpurple/protocols/toc/toc.c:527
 msgid "Dir service temporarily unavailable."
 msgstr "Verzeichnis-Dienst ist zur Zeit nicht verfügbar."
 
-#: libpurple/protocols/toc/toc.c:530
-#, c-format
+#: ../libpurple/protocols/toc/toc.c:530
 msgid "E-mail lookup restricted."
 msgstr "E-Mail-Suche eingeschränkt."
 
-#: libpurple/protocols/toc/toc.c:533
-#, c-format
+#: ../libpurple/protocols/toc/toc.c:533
 msgid "Keyword ignored."
 msgstr "Stichwort ignoriert."
 
-#: libpurple/protocols/toc/toc.c:536
-#, c-format
+#: ../libpurple/protocols/toc/toc.c:536
 msgid "No keywords."
 msgstr "Keine Stichwörter."
 
-#: libpurple/protocols/toc/toc.c:539
-#, c-format
+#: ../libpurple/protocols/toc/toc.c:539
 msgid "User has no directory information."
 msgstr "Der Benutzer hat kein Profil."
 
-#: libpurple/protocols/toc/toc.c:543
-#, c-format
+#: ../libpurple/protocols/toc/toc.c:543
 msgid "Country not supported."
 msgstr "Land nicht unterstützt."
 
-#: libpurple/protocols/toc/toc.c:546
+#: ../libpurple/protocols/toc/toc.c:546
 #, c-format
 msgid "Failure unknown: %s."
 msgstr "Unbekannter Fehler: %s."
 
-#: libpurple/protocols/toc/toc.c:549
-#, c-format
+#: ../libpurple/protocols/toc/toc.c:549
 msgid "Incorrect screen name or password."
 msgstr "Ungültiger Benutzername oder Passwort."
 
-#: libpurple/protocols/toc/toc.c:552
-#, c-format
+#: ../libpurple/protocols/toc/toc.c:552
 msgid "The service is temporarily unavailable."
 msgstr "Der Dienst ist zur Zeit nicht verfügbar."
 
-#: libpurple/protocols/toc/toc.c:555
-#, c-format
+#: ../libpurple/protocols/toc/toc.c:555
 msgid "Your warning level is currently too high to log in."
 msgstr "Ihre Warnstufe ist zur Zeit zu hoch, um sich anzumelden."
 
-#: libpurple/protocols/toc/toc.c:558
-#, c-format
+#: ../libpurple/protocols/toc/toc.c:558
 msgid ""
 "You have been connecting and disconnecting too frequently.  Wait ten minutes "
 "and try again.  If you continue to try, you will need to wait even longer."
@@ -10604,83 +11149,83 @@
 "versuchen Sie es erneut. Wenn Sie es weiter versuchen, werden sie noch "
 "länger warten müssen."
 
-#: libpurple/protocols/toc/toc.c:560
+#: ../libpurple/protocols/toc/toc.c:560
 #, c-format
 msgid "An unknown signon error has occurred: %s."
 msgstr "Unbekannter Anmeldungsfehler: %s."
 
-#: libpurple/protocols/toc/toc.c:563
+#: ../libpurple/protocols/toc/toc.c:563
 #, c-format
 msgid "An unknown error, %d, has occurred.  Info: %s"
 msgstr "Unbekannter Fehler '%d' aufgetreten. Info: %s"
 
-#: libpurple/protocols/toc/toc.c:590
+#: ../libpurple/protocols/toc/toc.c:590
 msgid "Invalid Groupname"
 msgstr "Ungültiger Gruppenname"
 
-#: libpurple/protocols/toc/toc.c:674
+#: ../libpurple/protocols/toc/toc.c:674
 msgid "Connection Closed"
 msgstr "Verbindung geschlossen"
 
-#: libpurple/protocols/toc/toc.c:714
+#: ../libpurple/protocols/toc/toc.c:714
 msgid "Waiting for reply..."
 msgstr "Warte auf Antwort..."
 
-#: libpurple/protocols/toc/toc.c:792
+#: ../libpurple/protocols/toc/toc.c:792
 msgid "TOC has come back from its pause. You may now send messages again."
 msgstr ""
 "TOC ist von seiner Pause zurückgekehrt. Sie können wieder Nachrichten senden."
 
-#: libpurple/protocols/toc/toc.c:995
+#: ../libpurple/protocols/toc/toc.c:995
 msgid "Password Change Successful"
 msgstr "Passwortänderung erfolgreich"
 
-#: libpurple/protocols/toc/toc.c:1366 pidgin/gtkblist.c:5531
-#: pidgin/gtkblist.c:5884
+#: ../libpurple/protocols/toc/toc.c:1366 ../pidgin/gtkblist.c:5530
+#: ../pidgin/gtkblist.c:5883
 msgid "_Group:"
 msgstr "_Gruppe:"
 
-#: libpurple/protocols/toc/toc.c:1535
+#: ../libpurple/protocols/toc/toc.c:1535
 msgid "Get Dir Info"
 msgstr "Verzeichnisinformation abrufen"
 
-#: libpurple/protocols/toc/toc.c:1675
+#: ../libpurple/protocols/toc/toc.c:1675
 msgid "Set Dir Info"
 msgstr "Verzeichnisinformation abrufen"
 
-#: libpurple/protocols/toc/toc.c:1797
+#: ../libpurple/protocols/toc/toc.c:1797
 #, c-format
 msgid "Could not open %s for writing!"
 msgstr "Kann %s nicht zum Schreiben öffnen!"
 
-#: libpurple/protocols/toc/toc.c:1833
+#: ../libpurple/protocols/toc/toc.c:1833
 msgid "File transfer failed; other side probably canceled."
 msgstr ""
 "Dateiübertragung gescheitert; die andere Seite hat die Dateiübertragung "
 "wahrscheinlich abgebrochen."
 
-#: libpurple/protocols/toc/toc.c:1878 libpurple/protocols/toc/toc.c:1918
-#: libpurple/protocols/toc/toc.c:2042 libpurple/protocols/toc/toc.c:2130
+#: ../libpurple/protocols/toc/toc.c:1878 ../libpurple/protocols/toc/toc.c:1918
+#: ../libpurple/protocols/toc/toc.c:2042 ../libpurple/protocols/toc/toc.c:2130
 msgid "Could not connect for transfer."
 msgstr "Übertragungsverbindung konnte nicht hergestellt werden."
 
-#: libpurple/protocols/toc/toc.c:2075
+#: ../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."
 
-#: libpurple/protocols/toc/toc.c:2175
+#: ../libpurple/protocols/toc/toc.c:2175
 msgid "Save As..."
 msgstr "Speichern unter..."
 
-#: libpurple/protocols/toc/toc.c:2209
+#: ../libpurple/protocols/toc/toc.c:2209
 #, c-format
 msgid "%s requests %s to accept %d file: %s (%.2f %s)%s%s"
 msgid_plural "%s requests %s to accept %d files: %s (%.2f %s)%s%s"
 msgstr[0] "%s bittet %s %d Datei zu akzeptieren: %s (%.2f %s)%s%s"
 msgstr[1] "%s bittet %s %d Dateien zu akzeptieren: %s (%.2f %s)%s%s"
 
-#: libpurple/protocols/toc/toc.c:2216
+#: ../libpurple/protocols/toc/toc.c:2216
 #, c-format
 msgid "%s requests you to send them a file"
 msgstr "%s bittet Sie eine Datei zu senden"
@@ -10695,36 +11240,36 @@
 #. *< version
 #. *  summary
 #. *  description
-#: libpurple/protocols/toc/toc.c:2306 libpurple/protocols/toc/toc.c:2308
+#: ../libpurple/protocols/toc/toc.c:2306 ../libpurple/protocols/toc/toc.c:2308
 msgid "TOC Protocol Plugin"
 msgstr "TOC-Protokoll-Plugin"
 
-#: libpurple/protocols/yahoo/yahoo.c:810
+#: ../libpurple/protocols/yahoo/yahoo.c:823
 msgid "Your Yahoo! message did not get sent."
 msgstr "Ihre Yahoo!-Nachricht wurde nicht verschickt."
 
-#: libpurple/protocols/yahoo/yahoo.c:880
+#: ../libpurple/protocols/yahoo/yahoo.c:895
 #, c-format
 msgid "%s just sent you a Buzz!"
 msgstr "%s hat Ihnen gerade einen Kick gegeben!"
 
-#: libpurple/protocols/yahoo/yahoo.c:927
+#: ../libpurple/protocols/yahoo/yahoo.c:942
 #, c-format
 msgid "Yahoo! system message for %s:"
 msgstr "Yahoo!-Systemnachricht für %s:"
 
-#: libpurple/protocols/yahoo/yahoo.c:986
+#: ../libpurple/protocols/yahoo/yahoo.c:1003
 msgid "Authorization denied message:"
 msgstr "Nachricht für die Ablehnung der Autorisierung:"
 
-#: libpurple/protocols/yahoo/yahoo.c:1067
+#: ../libpurple/protocols/yahoo/yahoo.c:1084
 #, c-format
 msgid "%s has (retroactively) denied your request to add them to your list."
 msgstr ""
 "%s hat (rückwirkend) Ihre Anfrage abgelehnt, dass Sie ihn bzw. sie zu Ihrer "
 "Buddy-Liste hinzufügen."
 
-#: libpurple/protocols/yahoo/yahoo.c:1070
+#: ../libpurple/protocols/yahoo/yahoo.c:1087
 #, c-format
 msgid ""
 "%s has (retroactively) denied your request to add them to your list for the "
@@ -10733,11 +11278,11 @@
 "%s hat (rückwirkend) Ihre Anfrage abgelehnt, dass Sie ihn bzw. sie zu Ihrer "
 "Buddy-Liste hinzufügen und zwar aus folgendem Grund: %s."
 
-#: libpurple/protocols/yahoo/yahoo.c:1073
+#: ../libpurple/protocols/yahoo/yahoo.c:1090
 msgid "Add buddy rejected"
 msgstr "Hinzufügen des Buddys zurückgewiesen"
 
-#: libpurple/protocols/yahoo/yahoo.c:1824
+#: ../libpurple/protocols/yahoo/yahoo.c:1841
 #, c-format
 msgid ""
 "The Yahoo server has requested the use of an unrecognized authentication "
@@ -10748,11 +11293,11 @@
 "Sie werden wahrscheinlich nicht in der Lage sein, Sich erfolgreich bei Yahoo "
 "anzumelden.  Prüfen Sie %s auf Updates."
 
-#: libpurple/protocols/yahoo/yahoo.c:1827
+#: ../libpurple/protocols/yahoo/yahoo.c:1844
 msgid "Failed Yahoo! Authentication"
 msgstr "Yahoo-Authentifizierung fehlgeschlagen"
 
-#: libpurple/protocols/yahoo/yahoo.c:1893
+#: ../libpurple/protocols/yahoo/yahoo.c:1910
 #, c-format
 msgid ""
 "You have tried to ignore %s, but the user is on your buddy list.  Clicking "
@@ -10761,53 +11306,53 @@
 "Sie haben versucht %s zu ignorieren, aber der Benutzer ist in Ihrer Buddy-"
 "Liste.  Wenn Sie auf „Ja“ klicken, wird der Buddy entfernt und ignoriert."
 
-#: libpurple/protocols/yahoo/yahoo.c:1896
+#: ../libpurple/protocols/yahoo/yahoo.c:1913
 msgid "Ignore buddy?"
 msgstr "Buddy ignorieren?"
 
-#: libpurple/protocols/yahoo/yahoo.c:1959
+#: ../libpurple/protocols/yahoo/yahoo.c:1976
 msgid "Your account is locked, please log in to the Yahoo! website."
 msgstr ""
 "Ihr Konto ist gesperrt. Bitte melden Sie sich auf der Yahoo! Webseite an."
 
-#: libpurple/protocols/yahoo/yahoo.c:1962
+#: ../libpurple/protocols/yahoo/yahoo.c:1979
 #, c-format
 msgid "Unknown error number %d. Logging into the Yahoo! website may fix this."
 msgstr ""
 "Unbekannte Fehlernummer %d. Vielleicht kann dies repariert werden, wenn Sie "
 "sich auf der Yahoo! Webseite anmelden."
 
-#: libpurple/protocols/yahoo/yahoo.c:2016
+#: ../libpurple/protocols/yahoo/yahoo.c:2033
 #, c-format
 msgid "Could not add buddy %s to group %s to the server list on account %s."
 msgstr ""
 "Konnte den Buddy %s der Gruppe %s nicht zur Serverliste des Kontos %s "
 "hinzufügen."
 
-#: libpurple/protocols/yahoo/yahoo.c:2019
+#: ../libpurple/protocols/yahoo/yahoo.c:2036
 msgid "Could not add buddy to server list"
 msgstr "Konnte den Buddy nicht zur Serverliste hinzufügen"
 
-#: libpurple/protocols/yahoo/yahoo.c:2138
+#: ../libpurple/protocols/yahoo/yahoo.c:2155
 #, c-format
 msgid "[ Audible %s/%s/%s.swf ] %s"
 msgstr "[ Hörbar %s/%s/%s.swf ] %s"
 
-#: libpurple/protocols/yahoo/yahoo.c:2478
+#: ../libpurple/protocols/yahoo/yahoo.c:2495
 msgid "Received unexpected HTTP response from server."
 msgstr "Ungültige HTTP-Antwort vom Server empfangen."
 
-#: libpurple/protocols/yahoo/yahoo.c:2502
-#: libpurple/protocols/yahoo/yahoo.c:2688
-#: libpurple/protocols/yahoo/yahoo.c:2791
-#: libpurple/protocols/yahoo/yahoo.c:2801
-#: libpurple/protocols/yahoo/yahoochat.c:1418
-#: libpurple/protocols/yahoo/yahoochat.c:1488
-#: libpurple/protocols/yahoo/ycht.c:585
+#: ../libpurple/protocols/yahoo/yahoo.c:2519
+#: ../libpurple/protocols/yahoo/yahoo.c:2705
+#: ../libpurple/protocols/yahoo/yahoo.c:2808
+#: ../libpurple/protocols/yahoo/yahoo.c:2818
+#: ../libpurple/protocols/yahoo/yahoochat.c:1418
+#: ../libpurple/protocols/yahoo/yahoochat.c:1488
+#: ../libpurple/protocols/yahoo/ycht.c:585
 msgid "Connection problem"
 msgstr "Verbindungsfehler"
 
-#: libpurple/protocols/yahoo/yahoo.c:2528
+#: ../libpurple/protocols/yahoo/yahoo.c:2545
 #, c-format
 msgid ""
 "Lost connection with %s:\n"
@@ -10816,7 +11361,7 @@
 "Verbindung zu %s verloren:\n"
 "%s"
 
-#: libpurple/protocols/yahoo/yahoo.c:2553
+#: ../libpurple/protocols/yahoo/yahoo.c:2570
 #, c-format
 msgid ""
 "Could not establish a connection with %s:\n"
@@ -10825,108 +11370,111 @@
 "Die Verbindung mit %s konnte nicht hergestellt werden:\n"
 "%s"
 
-#: libpurple/protocols/yahoo/yahoo.c:2903
-#: libpurple/protocols/yahoo/yahoo.c:3514
+#: ../libpurple/protocols/yahoo/yahoo.c:2920
+#: ../libpurple/protocols/yahoo/yahoo.c:3606
 msgid "Not at Home"
 msgstr "Nicht zu Hause"
 
-#: libpurple/protocols/yahoo/yahoo.c:2905
-#: libpurple/protocols/yahoo/yahoo.c:3517
+#: ../libpurple/protocols/yahoo/yahoo.c:2922
+#: ../libpurple/protocols/yahoo/yahoo.c:3609
 msgid "Not at Desk"
 msgstr "Nicht am Schreibtisch"
 
-#: libpurple/protocols/yahoo/yahoo.c:2907
-#: libpurple/protocols/yahoo/yahoo.c:3520
+#: ../libpurple/protocols/yahoo/yahoo.c:2924
+#: ../libpurple/protocols/yahoo/yahoo.c:3612
 msgid "Not in Office"
 msgstr "Nicht im Büro"
 
-#: libpurple/protocols/yahoo/yahoo.c:2911
-#: libpurple/protocols/yahoo/yahoo.c:3526
+#: ../libpurple/protocols/yahoo/yahoo.c:2928
+#: ../libpurple/protocols/yahoo/yahoo.c:3618
 msgid "On Vacation"
 msgstr "Im Urlaub"
 
-#: libpurple/protocols/yahoo/yahoo.c:2915
-#: libpurple/protocols/yahoo/yahoo.c:3532
+#: ../libpurple/protocols/yahoo/yahoo.c:2932
+#: ../libpurple/protocols/yahoo/yahoo.c:3624
 msgid "Stepped Out"
 msgstr "Hinausgegangen"
 
-#: libpurple/protocols/yahoo/yahoo.c:3008
-#: libpurple/protocols/yahoo/yahoo.c:3038
+#: ../libpurple/protocols/yahoo/yahoo.c:3025
+#: ../libpurple/protocols/yahoo/yahoo.c:3055
 msgid "Not on server list"
 msgstr "Nicht auf der Serverliste"
 
-#: libpurple/protocols/yahoo/yahoo.c:3055
-#: libpurple/protocols/yahoo/yahoo.c:3113
+#: ../libpurple/protocols/yahoo/yahoo.c:3072
+#: ../libpurple/protocols/yahoo/yahoo.c:3130
 msgid "Appear Online"
 msgstr "Online erscheinen"
 
-#: libpurple/protocols/yahoo/yahoo.c:3058
-#: libpurple/protocols/yahoo/yahoo.c:3134
+#: ../libpurple/protocols/yahoo/yahoo.c:3075
+#: ../libpurple/protocols/yahoo/yahoo.c:3151
 msgid "Appear Permanently Offline"
 msgstr "Permanent offline erscheinen"
 
-#: libpurple/protocols/yahoo/yahoo.c:3076
+#: ../libpurple/protocols/yahoo/yahoo.c:3093
 msgid "Presence"
 msgstr "Präsenz"
 
-#: libpurple/protocols/yahoo/yahoo.c:3119
+#: ../libpurple/protocols/yahoo/yahoo.c:3136
 msgid "Appear Offline"
 msgstr "Offline erscheinen"
 
-#: libpurple/protocols/yahoo/yahoo.c:3128
+#: ../libpurple/protocols/yahoo/yahoo.c:3145
 msgid "Don't Appear Permanently Offline"
 msgstr "Nicht permanent offline erscheinen"
 
-#: libpurple/protocols/yahoo/yahoo.c:3176
+#: ../libpurple/protocols/yahoo/yahoo.c:3193
 msgid "Join in Chat"
 msgstr "Chat betreten"
 
-#: libpurple/protocols/yahoo/yahoo.c:3182
+#: ../libpurple/protocols/yahoo/yahoo.c:3199
 msgid "Initiate Conference"
 msgstr "Konferenz einleiten"
 
-#: libpurple/protocols/yahoo/yahoo.c:3210
+#: ../libpurple/protocols/yahoo/yahoo.c:3227
 msgid "Presence Settings"
 msgstr "Anwesenheitseinstellungen"
 
-#: libpurple/protocols/yahoo/yahoo.c:3216
+#: ../libpurple/protocols/yahoo/yahoo.c:3233
 msgid "Start Doodling"
 msgstr "Anfangen zu malen"
 
-#. XXX Typo: This should be _("Activate which ID?") - fix after string freeze is over
-#: libpurple/protocols/yahoo/yahoo.c:3249
-msgid "Active which ID?"
+#: ../libpurple/protocols/yahoo/yahoo.c:3334
+msgid "Activate which ID?"
 msgstr "Welche ID aktivieren?"
 
-#: libpurple/protocols/yahoo/yahoo.c:3260
+#: ../libpurple/protocols/yahoo/yahoo.c:3345
 msgid "Join who in chat?"
 msgstr "Wen wollen Sie zum Chat einladen?"
 
-#: libpurple/protocols/yahoo/yahoo.c:3272
+#: ../libpurple/protocols/yahoo/yahoo.c:3357
 msgid "Activate ID..."
 msgstr "Aktiviere ID..."
 
-#: libpurple/protocols/yahoo/yahoo.c:3276
+#: ../libpurple/protocols/yahoo/yahoo.c:3361
 msgid "Join User in Chat..."
 msgstr "Einen Benutzer zum Chat einladen..."
 
-#: libpurple/protocols/yahoo/yahoo.c:3783
+#: ../libpurple/protocols/yahoo/yahoo.c:3366
+msgid "Open Inbox"
+msgstr "Öffne Posteingang"
+
+#: ../libpurple/protocols/yahoo/yahoo.c:3881
 msgid "You have just sent a Buzz!"
 msgstr "Sie haben gerade einen Kick versandt!"
 
-#: libpurple/protocols/yahoo/yahoo.c:3842
+#: ../libpurple/protocols/yahoo/yahoo.c:3940
 msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
 msgstr "join: &lt;Raum&gt;:  Einen Chatraum im Yahoo-Netzwerk betreten"
 
-#: libpurple/protocols/yahoo/yahoo.c:3847
+#: ../libpurple/protocols/yahoo/yahoo.c:3945
 msgid "list: List rooms on the Yahoo network"
 msgstr "list:  Liste Räume im Yahoo-Netzwerk auf"
 
-#: libpurple/protocols/yahoo/yahoo.c:3851
+#: ../libpurple/protocols/yahoo/yahoo.c:3949
 msgid "buzz: Buzz a user to get their attention"
 msgstr "buzz: Einen Kontakt anrufen, um seine Aufmerksamkeit zu erhalten"
 
-#: libpurple/protocols/yahoo/yahoo.c:3855
+#: ../libpurple/protocols/yahoo/yahoo.c:3953
 msgid "doodle: Request user to start a Doodle session"
 msgstr "doodle: Einen Benutzer auffordern, eine Mal-Sitzung zu starten"
 
@@ -10940,86 +11488,86 @@
 #. *< version
 #. *  summary
 #. *  description
-#: libpurple/protocols/yahoo/yahoo.c:4063
-#: libpurple/protocols/yahoo/yahoo.c:4065
+#: ../libpurple/protocols/yahoo/yahoo.c:4161
+#: ../libpurple/protocols/yahoo/yahoo.c:4163
 msgid "Yahoo Protocol Plugin"
 msgstr "Yahoo-Protokoll-Plugin"
 
-#: libpurple/protocols/yahoo/yahoo.c:4088
+#: ../libpurple/protocols/yahoo/yahoo.c:4186
 msgid "Yahoo Japan"
 msgstr "Yahoo Japan"
 
-#: libpurple/protocols/yahoo/yahoo.c:4091
+#: ../libpurple/protocols/yahoo/yahoo.c:4189
 msgid "Pager server"
 msgstr "Pager-Server"
 
-#: libpurple/protocols/yahoo/yahoo.c:4094
+#: ../libpurple/protocols/yahoo/yahoo.c:4192
 msgid "Japan Pager server"
 msgstr "Pager-Server (Japan)"
 
-#: libpurple/protocols/yahoo/yahoo.c:4097
+#: ../libpurple/protocols/yahoo/yahoo.c:4195
 msgid "Pager port"
 msgstr "Pager-Port"
 
-#: libpurple/protocols/yahoo/yahoo.c:4100
+#: ../libpurple/protocols/yahoo/yahoo.c:4198
 msgid "File transfer server"
 msgstr "Server für Dateiübertragungen"
 
-#: libpurple/protocols/yahoo/yahoo.c:4103
+#: ../libpurple/protocols/yahoo/yahoo.c:4201
 msgid "Japan file transfer server"
 msgstr "Server für Dateiübertragungen (Japan)"
 
-#: libpurple/protocols/yahoo/yahoo.c:4106
+#: ../libpurple/protocols/yahoo/yahoo.c:4204
 msgid "File transfer port"
 msgstr "Port für Dateiübertragungen"
 
-#: libpurple/protocols/yahoo/yahoo.c:4109
+#: ../libpurple/protocols/yahoo/yahoo.c:4207
 msgid "Chat room locale"
 msgstr "Chatraum-Gebiet"
 
-#: libpurple/protocols/yahoo/yahoo.c:4112
+#: ../libpurple/protocols/yahoo/yahoo.c:4210
 msgid "Ignore conference and chatroom invitations"
 msgstr "Konferenz- und Chateinladungen ignorieren"
 
-#: libpurple/protocols/yahoo/yahoo.c:4120
+#: ../libpurple/protocols/yahoo/yahoo.c:4218
 msgid "Chat room list URL"
 msgstr "Chatraumliste (URL)"
 
-#: libpurple/protocols/yahoo/yahoo.c:4123
+#: ../libpurple/protocols/yahoo/yahoo.c:4221
 msgid "Yahoo Chat server"
 msgstr "Yahoo-Chat-Server"
 
-#: libpurple/protocols/yahoo/yahoo.c:4126
+#: ../libpurple/protocols/yahoo/yahoo.c:4224
 msgid "Yahoo Chat port"
 msgstr "Yahoo-Chat-Port"
 
 #. Write a local message to this conversation showing that a request for a
 #. * Doodle session has been made
 #.
-#: libpurple/protocols/yahoo/yahoo_doodle.c:98
+#: ../libpurple/protocols/yahoo/yahoo_doodle.c:98
 msgid "Sent Doodle request."
 msgstr "Doodle-Anfrage senden."
 
-#: libpurple/protocols/yahoo/yahoo_filexfer.c:270
-#: libpurple/protocols/yahoo/yahoo_filexfer.c:279
-#: libpurple/protocols/yahoo/yahoo_filexfer.c:292
+#: ../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."
 
 #. TODO: what to do here - do we really have to disconnect?
-#: libpurple/protocols/yahoo/yahoo_packet.c:302
+#: ../libpurple/protocols/yahoo/yahoo_packet.c:307
 msgid "Write Error"
 msgstr "Schreibfehler"
 
-#: libpurple/protocols/yahoo/yahoo_profile.c:797
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:797
 msgid "Yahoo! Japan Profile"
 msgstr "Yahoo!-Japan-Profil"
 
-#: libpurple/protocols/yahoo/yahoo_profile.c:798
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:798
 msgid "Yahoo! Profile"
 msgstr "Yahoo!-Profil"
 
-#: libpurple/protocols/yahoo/yahoo_profile.c:838
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:838
 msgid ""
 "Sorry, profiles marked as containing adult content are not supported at this "
 "time."
@@ -11027,7 +11575,7 @@
 "Entschuldigung, Profile mit der Kennzeichnung „Nur für Erwachsene“ werden "
 "zur Zeit nicht unterstützt."
 
-#: libpurple/protocols/yahoo/yahoo_profile.c:840
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:840
 msgid ""
 "If you wish to view this profile, you will need to visit this link in your "
 "web browser:"
@@ -11035,47 +11583,47 @@
 "Wenn Sie diese Profil ansehen möchten, müssen Sie diesen Link in Ihrem Web-"
 "Browser betrachten:"
 
-#: libpurple/protocols/yahoo/yahoo_profile.c:1034
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1034
 msgid "Yahoo! ID"
 msgstr "Yahoo!-ID"
 
-#: libpurple/protocols/yahoo/yahoo_profile.c:1109
-#: libpurple/protocols/yahoo/yahoo_profile.c:1113
-#: libpurple/protocols/yahoo/yahoo_profile.c:1117
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1109
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1113
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1117
 msgid "Hobbies"
 msgstr "Hobbys"
 
-#: libpurple/protocols/yahoo/yahoo_profile.c:1127
-#: libpurple/protocols/yahoo/yahoo_profile.c:1131
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1127
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1131
 msgid "Latest News"
 msgstr "Letzte Neuigkeiten"
 
-#: libpurple/protocols/yahoo/yahoo_profile.c:1152
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1152
 msgid "Home Page"
 msgstr "Homepage"
 
-#: libpurple/protocols/yahoo/yahoo_profile.c:1167
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1167
 msgid "Cool Link 1"
 msgstr "Cooler Link 1"
 
-#: libpurple/protocols/yahoo/yahoo_profile.c:1172
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1172
 msgid "Cool Link 2"
 msgstr "Cooler Link 2"
 
-#: libpurple/protocols/yahoo/yahoo_profile.c:1176
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1176
 msgid "Cool Link 3"
 msgstr "Cooler Link 3"
 
-#: libpurple/protocols/yahoo/yahoo_profile.c:1190
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1190
 msgid "Last Update"
 msgstr "Letzte Aktualisierung"
 
-#: libpurple/protocols/yahoo/yahoo_profile.c:1199
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1199
 #, c-format
 msgid "User information for %s unavailable"
 msgstr "Benutzerinformation für %s nicht verfügbar"
 
-#: libpurple/protocols/yahoo/yahoo_profile.c:1205
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1205
 msgid ""
 "Sorry, this profile seems to be in a language or format that is not "
 "supported at this time."
@@ -11083,7 +11631,7 @@
 "Entschuldigung, das Profil enthält eine Sprache, die zur Zeit nicht "
 "unterstützt wird."
 
-#: libpurple/protocols/yahoo/yahoo_profile.c:1221
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1221
 msgid ""
 "Could not retrieve the user's profile. This most likely is a temporary "
 "server-side problem. Please try again later."
@@ -11091,7 +11639,7 @@
 "Konnte das Profil des Benutzers nicht abrufen. Das ist wahrscheinlich ein "
 "temporäres serverseitiges Problem. Bitte versuchen Sie es später nochmal."
 
-#: libpurple/protocols/yahoo/yahoo_profile.c:1224
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1224
 msgid ""
 "Could not retrieve the user's profile. This most likely means that the user "
 "does not exist; however, Yahoo! sometimes does fail to find a user's "
@@ -11102,39 +11650,39 @@
 "Profile eines Benutzers nicht finden. Wenn Sie wissen, dass der Benutzer "
 "existiert, versuchen Sie es später nochmal."
 
-#: libpurple/protocols/yahoo/yahoo_profile.c:1231
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1231
 msgid "The user's profile is empty."
 msgstr "Das Profil des Benutzers ist leer."
 
-#: libpurple/protocols/yahoo/yahoochat.c:204
+#: ../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:206
+#: ../libpurple/protocols/yahoo/yahoochat.c:206
 msgid "Invitation Rejected"
 msgstr "Einladung zurückgewiesen"
 
-#: libpurple/protocols/yahoo/yahoochat.c:362
+#: ../libpurple/protocols/yahoo/yahoochat.c:362
 msgid "Failed to join chat"
 msgstr "Der Chat kann nicht betreten werden"
 
 #. -6
-#: libpurple/protocols/yahoo/yahoochat.c:365
+#: ../libpurple/protocols/yahoo/yahoochat.c:365
 msgid "Unknown room"
 msgstr "Unbekannter Raum"
 
 #. -15
-#: libpurple/protocols/yahoo/yahoochat.c:368
+#: ../libpurple/protocols/yahoo/yahoochat.c:368
 msgid "Maybe the room is full"
 msgstr "Vielleicht ist der Raum voll"
 
 #. -35
-#: libpurple/protocols/yahoo/yahoochat.c:371
+#: ../libpurple/protocols/yahoo/yahoochat.c:371
 msgid "Not available"
 msgstr "Nicht verfügbar"
 
-#: libpurple/protocols/yahoo/yahoochat.c:375
+#: ../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"
@@ -11142,46 +11690,46 @@
 "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:453
+#: ../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:628
+#: ../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:629
+#: ../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:1320
-#: libpurple/protocols/yahoo/yahoochat.c:1346
+#: ../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:1404
+#: ../libpurple/protocols/yahoo/yahoochat.c:1404
 msgid "Voices"
 msgstr "Stimmen"
 
-#: libpurple/protocols/yahoo/yahoochat.c:1407
+#: ../libpurple/protocols/yahoo/yahoochat.c:1407
 msgid "Webcams"
 msgstr "Webcams"
 
-#: libpurple/protocols/yahoo/yahoochat.c:1418
-#: libpurple/protocols/yahoo/yahoochat.c:1488
+#: ../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:1481
+#: ../libpurple/protocols/yahoo/yahoochat.c:1481
 msgid "User Rooms"
 msgstr "Benutzerräume"
 
-#: libpurple/protocols/yahoo/ycht.c:456
+#: ../libpurple/protocols/yahoo/ycht.c:456
 msgid "Connection problem with the YCHT server."
 msgstr "Verbindungsproblem mit dem YCHT-Server."
 
-#: libpurple/protocols/yahoo/ycht.c:475
+#: ../libpurple/protocols/yahoo/ycht.c:475
 #, c-format
 msgid ""
 "Lost connection with server\n"
@@ -11190,7 +11738,7 @@
 "Verbindung zum Server verloren\n"
 "%s"
 
-#: libpurple/protocols/zephyr/zephyr.c:354
+#: ../libpurple/protocols/zephyr/zephyr.c:354
 msgid ""
 "(There was an error converting this message.\t Check the 'Encoding' option "
 "in the Account Editor)"
@@ -11198,87 +11746,87 @@
 "(Es gab einen Fehler beim Konvertieren dieser Nachricht.\tPrüfen Sie die "
 "Kodierungsoption 'Kodierung' im Konten-Editor)"
 
-#: libpurple/protocols/zephyr/zephyr.c:752
+#: ../libpurple/protocols/zephyr/zephyr.c:752
 #, c-format
 msgid "Unable to send to chat %s,%s,%s"
 msgstr "Kann nicht an den Chat %s,%s,%s senden"
 
-#: libpurple/protocols/zephyr/zephyr.c:786
-#: libpurple/protocols/zephyr/zephyr.c:1204
+#: ../libpurple/protocols/zephyr/zephyr.c:786
+#: ../libpurple/protocols/zephyr/zephyr.c:1204
 msgid "User"
 msgstr "Benutzer"
 
-#: libpurple/protocols/zephyr/zephyr.c:791
-#: libpurple/protocols/zephyr/zephyr.c:1210
+#: ../libpurple/protocols/zephyr/zephyr.c:791
+#: ../libpurple/protocols/zephyr/zephyr.c:1210
 msgid "Hidden or not logged-in"
 msgstr "Versteckt oder nicht angemeldet"
 
-#: libpurple/protocols/zephyr/zephyr.c:797
-#: libpurple/protocols/zephyr/zephyr.c:1212
+#: ../libpurple/protocols/zephyr/zephyr.c:797
+#: ../libpurple/protocols/zephyr/zephyr.c:1212
 #, c-format
 msgid "<br>At %s since %s"
 msgstr "<br>Bei %s seit %s"
 
-#: libpurple/protocols/zephyr/zephyr.c:1546
-#: libpurple/protocols/zephyr/zephyr.c:1547
+#: ../libpurple/protocols/zephyr/zephyr.c:1546
+#: ../libpurple/protocols/zephyr/zephyr.c:1547
 msgid "Anyone"
 msgstr "Jeder"
 
-#: libpurple/protocols/zephyr/zephyr.c:2354
+#: ../libpurple/protocols/zephyr/zephyr.c:2354
 msgid "_Class:"
 msgstr "_Klasse:"
 
-#: libpurple/protocols/zephyr/zephyr.c:2360
+#: ../libpurple/protocols/zephyr/zephyr.c:2360
 msgid "_Instance:"
 msgstr "_Instanz:"
 
-#: libpurple/protocols/zephyr/zephyr.c:2366
+#: ../libpurple/protocols/zephyr/zephyr.c:2366
 msgid "_Recipient:"
 msgstr "_Empfänger:"
 
-#: libpurple/protocols/zephyr/zephyr.c:2377
+#: ../libpurple/protocols/zephyr/zephyr.c:2377
 #, c-format
 msgid "Attempt to subscribe to %s,%s,%s failed"
 msgstr "Der Versuch, %s,%s,%s zu abonnieren ist gescheitert"
 
-#: libpurple/protocols/zephyr/zephyr.c:2690
+#: ../libpurple/protocols/zephyr/zephyr.c:2690
 msgid "zlocate &lt;nick&gt;: Locate user"
 msgstr "zlocate &lt;Nick&gt;: Benutzer suchen"
 
-#: libpurple/protocols/zephyr/zephyr.c:2695
+#: ../libpurple/protocols/zephyr/zephyr.c:2695
 msgid "zl &lt;nick&gt;: Locate user"
 msgstr "zl &lt;Nick&gt;: Benutzer suchen"
 
-#: libpurple/protocols/zephyr/zephyr.c:2700
+#: ../libpurple/protocols/zephyr/zephyr.c:2700
 msgid "instance &lt;instance&gt;: Set the instance to be used on this class"
 msgstr ""
 "instance &lt;Instanz&gt;: Setze die Instanz, die für diese Klasse benutzt "
 "wird"
 
-#: libpurple/protocols/zephyr/zephyr.c:2705
+#: ../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"
 
-#: libpurple/protocols/zephyr/zephyr.c:2710
+#: ../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"
 
-#: libpurple/protocols/zephyr/zephyr.c:2716
+#: ../libpurple/protocols/zephyr/zephyr.c:2716
 msgid "sub &lt;class&gt; &lt;instance&gt; &lt;recipient&gt;: Join a new chat"
 msgstr ""
 "sub &lt;Klasse&gt; &lt;Instanz&gt; &lt;Empfänger&gt;: Einen neuen Chat "
 "betreten"
 
-#: libpurple/protocols/zephyr/zephyr.c:2721
+#: ../libpurple/protocols/zephyr/zephyr.c:2721
 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;"
 
-#: libpurple/protocols/zephyr/zephyr.c:2727
+#: ../libpurple/protocols/zephyr/zephyr.c:2727
 msgid ""
 "zci &lt;class&gt; &lt;instance&gt;: Send a message to &lt;<i>class</i>,"
 "<i>instance</i>,*&gt;"
@@ -11286,7 +11834,7 @@
 "zci &lt;Klasse&gt; &lt;Instanz&gt;: Sendet eine Nachricht an &lt;<i>Klasse</"
 "i>,<i>Instanz</i>,*&gt;"
 
-#: libpurple/protocols/zephyr/zephyr.c:2733
+#: ../libpurple/protocols/zephyr/zephyr.c:2733
 msgid ""
 "zcir &lt;class&gt; &lt;instance&gt; &lt;recipient&gt;: Send a message to &lt;"
 "<i>class</i>,<i>instance</i>,<i>recipient</i>&gt;"
@@ -11294,7 +11842,7 @@
 "zcir &lt;Klasse&gt; &lt;Instanz&gt; &lt;Empfänger&gt;: Sendet eine Nachricht "
 "an &lt;<i>Klasse</i>,<i>Instanz</i>,<i>Empfänger</i>&gt;"
 
-#: libpurple/protocols/zephyr/zephyr.c:2739
+#: ../libpurple/protocols/zephyr/zephyr.c:2739
 msgid ""
 "zir &lt;instance&gt; &lt;recipient&gt;: Send a message to &lt;MESSAGE,"
 "<i>instance</i>,<i>recipient</i>&gt;"
@@ -11302,16 +11850,16 @@
 "zir &lt;Instanz&gt; &lt;Empfänger&gt;: Sendet eine Nachricht an &lt;"
 "NACHRICHT,<i>Instanz</i>,<i>Empfänger</i>&gt;"
 
-#: libpurple/protocols/zephyr/zephyr.c:2744
+#: ../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;"
 
-#: libpurple/protocols/zephyr/zephyr.c:2850
+#: ../libpurple/protocols/zephyr/zephyr.c:2850
 msgid "Resubscribe"
 msgstr "Neu Abonnieren"
 
-#: libpurple/protocols/zephyr/zephyr.c:2853
+#: ../libpurple/protocols/zephyr/zephyr.c:2853
 msgid "Retrieve subscriptions from server"
 msgstr "Abonnements vom Server abrufen"
 
@@ -11325,45 +11873,45 @@
 #. *< version
 #. *  summary
 #. *  description
-#: libpurple/protocols/zephyr/zephyr.c:2946
-#: libpurple/protocols/zephyr/zephyr.c:2948
+#: ../libpurple/protocols/zephyr/zephyr.c:2946
+#: ../libpurple/protocols/zephyr/zephyr.c:2948
 msgid "Zephyr Protocol Plugin"
 msgstr "Zephyr-Protokoll-Plugin"
 
-#: libpurple/protocols/zephyr/zephyr.c:2973
+#: ../libpurple/protocols/zephyr/zephyr.c:2973
 msgid "Use tzc"
 msgstr "Benutze tzc"
 
-#: libpurple/protocols/zephyr/zephyr.c:2976
+#: ../libpurple/protocols/zephyr/zephyr.c:2976
 msgid "tzc command"
 msgstr "tzc-Kommando"
 
-#: libpurple/protocols/zephyr/zephyr.c:2979
+#: ../libpurple/protocols/zephyr/zephyr.c:2979
 msgid "Export to .anyone"
 msgstr "Export an .anyone"
 
-#: libpurple/protocols/zephyr/zephyr.c:2982
+#: ../libpurple/protocols/zephyr/zephyr.c:2982
 msgid "Export to .zephyr.subs"
 msgstr "Export an .zephyr.subs"
 
-#: libpurple/protocols/zephyr/zephyr.c:2985
+#: ../libpurple/protocols/zephyr/zephyr.c:2985
 msgid "Import from .anyone"
 msgstr "Import von .anyone"
 
-#: libpurple/protocols/zephyr/zephyr.c:2988
+#: ../libpurple/protocols/zephyr/zephyr.c:2988
 msgid "Import from .zephyr.subs"
 msgstr "Import von .zephyr.subs"
 
-#: libpurple/protocols/zephyr/zephyr.c:2991
+#: ../libpurple/protocols/zephyr/zephyr.c:2991
 msgid "Realm"
 msgstr "Realm"
 
-#: libpurple/protocols/zephyr/zephyr.c:2994
+#: ../libpurple/protocols/zephyr/zephyr.c:2994
 msgid "Exposure"
 msgstr "Aussetzen"
 
-#: libpurple/proxy.c:458 libpurple/proxy.c:877 libpurple/proxy.c:1032
-#: libpurple/proxy.c:1600
+#: ../libpurple/proxy.c:458 ../libpurple/proxy.c:877 ../libpurple/proxy.c:1032
+#: ../libpurple/proxy.c:1600
 #, c-format
 msgid ""
 "Unable to create socket:\n"
@@ -11372,67 +11920,67 @@
 "Kann Socket nicht erstellen:\n"
 "%s"
 
-#: libpurple/proxy.c:658
+#: ../libpurple/proxy.c:658
 #, c-format
 msgid "Unable to parse response from HTTP proxy: %s\n"
 msgstr "Kann Antwort vom HTTP-Proxy nicht verarbeiten: %s\n"
 
-#: libpurple/proxy.c:686 libpurple/proxy.c:732 libpurple/proxy.c:770
-#: libpurple/proxy.c:782
+#: ../libpurple/proxy.c:686 ../libpurple/proxy.c:732 ../libpurple/proxy.c:770
+#: ../libpurple/proxy.c:782
 #, c-format
 msgid "HTTP proxy connection error %d"
 msgstr "HTTP-Proxy-Verbindungsfehler %d"
 
-#: libpurple/proxy.c:778
+#: ../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."
 
-#: libpurple/proxy.c:995
+#: ../libpurple/proxy.c:995
 #, c-format
 msgid "Error resolving %s"
 msgstr "Fehler beim Auflösen von %s"
 
-#: libpurple/proxy.c:1697
+#: ../libpurple/proxy.c:1697
 msgid "Could not resolve host name"
 msgstr "Kann den Hostnamen nicht auflösen"
 
 #. *
 #. * A wrapper for purple_request_action() that uses @c Yes and @c No buttons.
 #.
-#: libpurple/request.h:1377
+#: ../libpurple/request.h:1377
 msgid "_Yes"
 msgstr "_Ja"
 
-#: libpurple/request.h:1377
+#: ../libpurple/request.h:1377
 msgid "_No"
 msgstr "_Nein"
 
 #. *
 #. * A wrapper for purple_request_action() that uses Accept and Cancel buttons.
 #.
-#: libpurple/request.h:1397
+#: ../libpurple/request.h:1397
 msgid "_Accept"
 msgstr "_Akzeptieren"
 
 #. *
 #. * The default message to use when the user becomes auto-away.
 #.
-#: libpurple/savedstatuses.c:47
+#: ../libpurple/savedstatuses.c:47
 msgid "I'm not here right now"
 msgstr "Ich bin gerade nicht hier"
 
-#: libpurple/savedstatuses.c:534
+#: ../libpurple/savedstatuses.c:534
 msgid "saved statuses"
 msgstr "gespeicherter Status"
 
-#: libpurple/server.c:233
+#: ../libpurple/server.c:233
 #, c-format
 msgid "%s is now known as %s.\n"
 msgstr "%s heißt jetzt %s.\n"
 
-#: libpurple/server.c:680
+#: ../libpurple/server.c:680
 #, c-format
 msgid ""
 "%s has invited %s to the chat room %s:\n"
@@ -11441,77 +11989,77 @@
 "%s hat %s in den Chatraum %s eingeladen:\n"
 "%s"
 
-#: libpurple/server.c:685
+#: ../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:689
+#: ../libpurple/server.c:689
 msgid "Accept chat invitation?"
 msgstr "Akzeptieren Sie die Chat-Einladung?"
 
-#: libpurple/status.c:152
+#: ../libpurple/status.c:152
 msgid "Unset"
 msgstr "Nicht gesetzt"
 
-#: libpurple/status.c:155 pidgin/gtkstatusbox.c:1057
+#: ../libpurple/status.c:155 ../pidgin/gtkstatusbox.c:1057
 msgid "Do not disturb"
 msgstr "Nicht stören"
 
-#: libpurple/status.c:158
+#: ../libpurple/status.c:158
 msgid "Extended away"
 msgstr "Abwesend (erweitert)"
 
-#: libpurple/status.c:159
+#: ../libpurple/status.c:159
 msgid "Mobile"
 msgstr "Mobil"
 
-#: libpurple/status.c:608
+#: ../libpurple/status.c:608
 #, c-format
 msgid "%s changed status from %s to %s"
 msgstr "%s hat den Status von %s zu %s geändert"
 
-#: libpurple/status.c:618
+#: ../libpurple/status.c:618
 #, c-format
 msgid "%s is now %s"
 msgstr "%s ist jetzt %s"
 
-#: libpurple/status.c:623
+#: ../libpurple/status.c:623
 #, c-format
 msgid "%s is no longer %s"
 msgstr "%s ist nicht mehr %s"
 
-#: libpurple/status.c:1233
+#: ../libpurple/status.c:1233
 #, c-format
 msgid "%s became idle"
 msgstr "%s wurde untätig"
 
-#: libpurple/status.c:1250
+#: ../libpurple/status.c:1250
 #, c-format
 msgid "%s became unidle"
 msgstr "%s wurde tätig"
 
-#: libpurple/status.c:1313
+#: ../libpurple/status.c:1313
 #, c-format
 msgid "+++ %s became idle"
 msgstr "+++ %s wurde untätig"
 
-#: libpurple/status.c:1315
+#: ../libpurple/status.c:1315
 #, c-format
 msgid "+++ %s became unidle"
 msgstr "+++ %s wurde tätig"
 
-#: libpurple/util.c:717
+#: ../libpurple/util.c:717
 #, c-format
 msgid "%x %X"
 msgstr "%x %X"
 
-#: libpurple/util.c:2692
+#: ../libpurple/util.c:2702
 #, c-format
 msgid "Error Reading %s"
 msgstr "Fehler beim Lesen von %s"
 
-#: libpurple/util.c:2693
+#: ../libpurple/util.c:2703
 #, c-format
 msgid ""
 "An error was encountered reading your %s.  They have not been loaded, and "
@@ -11520,67 +12068,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:3193
+#: ../libpurple/util.c:3203
 msgid "Calculating..."
 msgstr "Berechne..."
 
-#: libpurple/util.c:3196
+#: ../libpurple/util.c:3206
 msgid "Unknown."
 msgstr "Unbekannt."
 
-#: libpurple/util.c:3222
+#: ../libpurple/util.c:3232
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] "%d Sekunde"
 msgstr[1] "%d Sekunden"
 
-#: libpurple/util.c:3234
+#: ../libpurple/util.c:3244
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] "%d Tag"
 msgstr[1] "%d Tage"
 
-#: libpurple/util.c:3242
+#: ../libpurple/util.c:3252
 #, c-format
 msgid "%s, %d hour"
 msgid_plural "%s, %d hours"
 msgstr[0] "%s, %d Stunde"
 msgstr[1] "%s, %d Stunden"
 
-#: libpurple/util.c:3248
+#: ../libpurple/util.c:3258
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d Stunde"
 msgstr[1] "%d Stunden"
 
-#: libpurple/util.c:3256
+#: ../libpurple/util.c:3266
 #, c-format
 msgid "%s, %d minute"
 msgid_plural "%s, %d minutes"
 msgstr[0] "%s, %d Minute"
 msgstr[1] "%s, %d Minuten"
 
-#: libpurple/util.c:3262
+#: ../libpurple/util.c:3272
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d Minute"
 msgstr[1] "%d Minuten"
 
-#: libpurple/util.c:3522
+#: ../libpurple/util.c:3532
 #, c-format
 msgid "Could not open %s: Redirected too many times"
 msgstr "Konnte %s nicht öffnen: Zu oft weitergeleitet"
 
-#: libpurple/util.c:3559 libpurple/util.c:3854
+#: ../libpurple/util.c:3569 ../libpurple/util.c:3864
 #, c-format
 msgid "Unable to connect to %s"
 msgstr "Verbindung zu %s nicht möglich"
 
-#: libpurple/util.c:3682
+#: ../libpurple/util.c:3692
 #, c-format
 msgid ""
 "Unable to allocate enough memory to hold the contents from %s.  The web "
@@ -11589,107 +12137,107 @@
 "Nicht genug Speicher für die Inhalte von %s verfügbar.  Eventuell versucht "
 "der Web-Server etwas böses zu tun."
 
-#: libpurple/util.c:3717
+#: ../libpurple/util.c:3727
 #, c-format
 msgid "Error reading from %s: %s"
 msgstr "Fehler beim Lesen von %s: %s"
 
-#: libpurple/util.c:3748
+#: ../libpurple/util.c:3758
 #, c-format
 msgid "Error writing to %s: %s"
 msgstr "Fehler beim Schreiben von %s: %s"
 
-#: libpurple/util.c:3773
+#: ../libpurple/util.c:3783
 #, c-format
 msgid "Unable to connect to %s: %s"
 msgstr "Verbindung zu %s nicht möglich: %s"
 
-#: pidgin.desktop.in.h:1
+#: ../pidgin.desktop.in.h:1
 msgid "Internet Messenger"
 msgstr "Internet-Sofortnachrichtendienst"
 
-#: pidgin.desktop.in.h:2
+#: ../pidgin.desktop.in.h:2
 msgid "Pidgin Internet Messenger"
 msgstr "Pidgin Internet-Sofortnachrichtendienst"
 
-#: pidgin.desktop.in.h:3
+#: ../pidgin.desktop.in.h:3
 msgid "Send instant messages over multiple protocols"
 msgstr "Sendet Sofortnachrichten über mehrere Protokolle"
 
-#: pidgin/eggtrayicon.c:129
+#: ../pidgin/eggtrayicon.c:129
 msgid "Orientation"
 msgstr "Ausrichtung"
 
-#: pidgin/eggtrayicon.c:130
+#: ../pidgin/eggtrayicon.c:130
 msgid "The orientation of the tray."
 msgstr "Die Ausrichtung der Kontrollleiste."
 
 #. Build the login options frame.
-#: pidgin/gtkaccount.c:409
+#: ../pidgin/gtkaccount.c:409
 msgid "Login Options"
 msgstr "Anmeldeoptionen"
 
-#: pidgin/gtkaccount.c:430
+#: ../pidgin/gtkaccount.c:430
 msgid "Pro_tocol:"
 msgstr "Pro_tokoll:"
 
-#: pidgin/gtkaccount.c:441
+#: ../pidgin/gtkaccount.c:441
 msgid "Screen _name:"
 msgstr "Benutzer_name:"
 
-#: pidgin/gtkaccount.c:531
+#: ../pidgin/gtkaccount.c:531
 msgid "_Local alias:"
 msgstr "Lokaler _Alias:"
 
-#: pidgin/gtkaccount.c:535
+#: ../pidgin/gtkaccount.c:535
 msgid "Remember pass_word"
 msgstr "Pass_wort speichern"
 
 #. Build the user options frame.
-#: pidgin/gtkaccount.c:593
+#: ../pidgin/gtkaccount.c:593
 msgid "User Options"
 msgstr "Benutzereinstellungen"
 
-#: pidgin/gtkaccount.c:606
+#: ../pidgin/gtkaccount.c:606
 msgid "New _mail notifications"
 msgstr "Benachrichtigung über neue _Mails"
 
 #. Buddy icon
-#: pidgin/gtkaccount.c:611
+#: ../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:731
+#: ../pidgin/gtkaccount.c:731
 #, c-format
 msgid "%s Options"
 msgstr "%s Einstellungen"
 
-#: pidgin/gtkaccount.c:936
+#: ../pidgin/gtkaccount.c:936
 msgid "Use GNOME Proxy Settings"
 msgstr "Benutze GNOME-Proxy-Einstellungen"
 
-#: pidgin/gtkaccount.c:937
+#: ../pidgin/gtkaccount.c:937
 msgid "Use Global Proxy Settings"
 msgstr "Benutze globale Proxy-Einstellungen"
 
-#: pidgin/gtkaccount.c:943
+#: ../pidgin/gtkaccount.c:943
 msgid "No Proxy"
 msgstr "Kein Proxy"
 
-#: pidgin/gtkaccount.c:949
+#: ../pidgin/gtkaccount.c:949
 msgid "HTTP"
 msgstr "HTTP"
 
-#: pidgin/gtkaccount.c:955
+#: ../pidgin/gtkaccount.c:955
 msgid "SOCKS 4"
 msgstr "SOCKS 4"
 
-#: pidgin/gtkaccount.c:961
+#: ../pidgin/gtkaccount.c:961
 msgid "SOCKS 5"
 msgstr "SOCKS 5"
 
-#: pidgin/gtkaccount.c:967 pidgin/gtkprefs.c:1206
+#: ../pidgin/gtkaccount.c:967 ../pidgin/gtkprefs.c:1208
 msgid "Use Environmental Settings"
 msgstr "Benutze Umgebungsvariablen"
 
@@ -11698,61 +12246,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:1006
+#: ../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:1009
+#: ../pidgin/gtkaccount.c:1009
 msgid "you can see the butterflies mating"
 msgstr "Sie können den Schmetterlingen beim Paaren zusehen"
 
-#: pidgin/gtkaccount.c:1030
+#: ../pidgin/gtkaccount.c:1030
 msgid "Proxy Options"
 msgstr "Proxy-Optionen"
 
-#: pidgin/gtkaccount.c:1044 pidgin/gtkprefs.c:1200
+#: ../pidgin/gtkaccount.c:1044 ../pidgin/gtkprefs.c:1202
 msgid "Proxy _type:"
 msgstr "Proxy-_Typ:"
 
-#: pidgin/gtkaccount.c:1053 pidgin/gtkprefs.c:1221
+#: ../pidgin/gtkaccount.c:1053 ../pidgin/gtkprefs.c:1223
 msgid "_Host:"
 msgstr "_Host:"
 
-#: pidgin/gtkaccount.c:1057 pidgin/gtkprefs.c:1239
+#: ../pidgin/gtkaccount.c:1057 ../pidgin/gtkprefs.c:1241
 msgid "_Port:"
 msgstr "_Port:"
 
-#: pidgin/gtkaccount.c:1065
+#: ../pidgin/gtkaccount.c:1065
 msgid "_Username:"
 msgstr "_Benutzer:"
 
-#: pidgin/gtkaccount.c:1072 pidgin/gtkprefs.c:1276
+#: ../pidgin/gtkaccount.c:1072 ../pidgin/gtkprefs.c:1278
 msgid "Pa_ssword:"
 msgstr "P_asswort:"
 
-#: pidgin/gtkaccount.c:1473
+#: ../pidgin/gtkaccount.c:1478
 msgid "Add Account"
 msgstr "Konto hinzufügen"
 
-#: pidgin/gtkaccount.c:1492
+#: ../pidgin/gtkaccount.c:1497
 msgid "_Basic"
 msgstr "_Einfach"
 
-#: pidgin/gtkaccount.c:1503
+#: ../pidgin/gtkaccount.c:1508
 msgid "_Advanced"
 msgstr "_Erweitert"
 
 # Aktiv
-#: pidgin/gtkaccount.c:1977 pidgin/gtkplugin.c:568
+#: ../pidgin/gtkaccount.c:1982 ../pidgin/gtkplugin.c:568
 msgid "Enabled"
 msgstr "Aktiv"
 
-#: pidgin/gtkaccount.c:2005
+#: ../pidgin/gtkaccount.c:2010
 msgid "Protocol"
 msgstr "Protokoll"
 
-#: pidgin/gtkaccount.c:2205
+#: ../pidgin/gtkaccount.c:2210
 #, c-format
 msgid ""
 "<span size='larger' weight='bold'>Welcome to %s!</span>\n"
@@ -11776,11 +12324,11 @@
 "Kontaktlistenfenster zu diesem Dialog zurückkehren und Konten hinzufügen, "
 "bearbeiten oder löschen"
 
-#: pidgin/gtkblist.c:760
+#: ../pidgin/gtkblist.c:760
 msgid "Join a Chat"
 msgstr "Chat betreten"
 
-#: pidgin/gtkblist.c:781
+#: ../pidgin/gtkblist.c:781
 msgid ""
 "Please enter the appropriate information about the chat you would like to "
 "join.\n"
@@ -11789,90 +12337,93 @@
 "wollen.\n"
 
 #. Set up stuff for the account box
-#: pidgin/gtkblist.c:792 pidgin/gtkblist.c:5479 pidgin/gtkblist.c:5845
-#: pidgin/gtkpounce.c:540 pidgin/gtkroomlist.c:395
+#: ../pidgin/gtkblist.c:792 ../pidgin/gtkblist.c:5478
+#: ../pidgin/gtkblist.c:5844 ../pidgin/gtkpounce.c:540
+#: ../pidgin/gtkroomlist.c:395
 msgid "_Account:"
 msgstr "_Konto:"
 
-#: pidgin/gtkblist.c:1081 pidgin/gtkprivacy.c:602 pidgin/gtkprivacy.c:616
+#: ../pidgin/gtkblist.c:1081 ../pidgin/gtkprivacy.c:602
+#: ../pidgin/gtkprivacy.c:616
 msgid "_Block"
 msgstr "_Sperren"
 
-#: pidgin/gtkblist.c:1081
+#: ../pidgin/gtkblist.c:1081
 msgid "Un_block"
 msgstr "_Sperrung aufheben"
 
-#: pidgin/gtkblist.c:1132
+#: ../pidgin/gtkblist.c:1132
 msgid "Get _Info"
 msgstr "_Info abrufen"
 
-#: pidgin/gtkblist.c:1135 pidgin/pidginstock.c:84
+#: ../pidgin/gtkblist.c:1135 ../pidgin/pidginstock.c:84
 msgid "I_M"
 msgstr "I_M"
 
-#: pidgin/gtkblist.c:1141
+#: ../pidgin/gtkblist.c:1141
 msgid "_Send File"
 msgstr "Datei ver_senden"
 
-#: pidgin/gtkblist.c:1148
+#: ../pidgin/gtkblist.c:1148
 msgid "Add Buddy _Pounce"
 msgstr "B_uddy-Alarm hinzufügen"
 
-#: pidgin/gtkblist.c:1153 pidgin/gtkblist.c:1157 pidgin/gtkblist.c:1262
-#: pidgin/gtkblist.c:1285
+#: ../pidgin/gtkblist.c:1153 ../pidgin/gtkblist.c:1157
+#: ../pidgin/gtkblist.c:1262 ../pidgin/gtkblist.c:1285
 msgid "View _Log"
 msgstr "Mi_tschnitt anzeigen"
 
-#: pidgin/gtkblist.c:1170 pidgin/gtkblist.c:1179 pidgin/gtkblist.c:1270
-#: pidgin/gtkblist.c:1291
+#: ../pidgin/gtkblist.c:1170 ../pidgin/gtkblist.c:1179
+#: ../pidgin/gtkblist.c:1270 ../pidgin/gtkblist.c:1291
 msgid "_Alias..."
 msgstr "_Alias..."
 
-#: pidgin/gtkblist.c:1173 pidgin/gtkblist.c:1181 pidgin/gtkblist.c:1272
-#: pidgin/gtkblist.c:1293
+#: ../pidgin/gtkblist.c:1173 ../pidgin/gtkblist.c:1181
+#: ../pidgin/gtkblist.c:1272 ../pidgin/gtkblist.c:1293
 msgid "_Remove"
 msgstr "_Entfernen"
 
-#: pidgin/gtkblist.c:1231
+#: ../pidgin/gtkblist.c:1231
 msgid "Add a _Buddy"
 msgstr "Buddy _hinzufügen"
 
-#: pidgin/gtkblist.c:1234
+#: ../pidgin/gtkblist.c:1234
 msgid "Add a C_hat"
 msgstr "C_hat hinzufügen"
 
-#: pidgin/gtkblist.c:1237
+#: ../pidgin/gtkblist.c:1237
 msgid "_Delete Group"
 msgstr "Gruppe _löschen"
 
-#: pidgin/gtkblist.c:1239
+#: ../pidgin/gtkblist.c:1239
 msgid "_Rename"
 msgstr "_Umbenennen"
 
 #. join button
-#: pidgin/gtkblist.c:1258 pidgin/gtkroomlist.c:306 pidgin/gtkroomlist.c:459
-#: 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:1260
+#: ../pidgin/gtkblist.c:1260
 msgid "Auto-Join"
 msgstr "Automatisch beitreten"
 
-#: pidgin/gtkblist.c:1298 pidgin/gtkblist.c:1322
+#: ../pidgin/gtkblist.c:1298 ../pidgin/gtkblist.c:1322
 msgid "_Collapse"
 msgstr "_Zusammenklappen"
 
-#: pidgin/gtkblist.c:1327
+#: ../pidgin/gtkblist.c:1327
 msgid "_Expand"
 msgstr "A_usklappen"
 
-#: pidgin/gtkblist.c:1572 pidgin/gtkblist.c:1584 pidgin/gtkblist.c:4573
-#: pidgin/gtkblist.c:4583
+#: ../pidgin/gtkblist.c:1572 ../pidgin/gtkblist.c:1584
+#: ../pidgin/gtkblist.c:4572 ../pidgin/gtkblist.c:4582
 msgid "/Tools/Mute Sounds"
 msgstr "/Werkzeuge/Stummschalten"
 
-#: pidgin/gtkblist.c:2044 pidgin/gtkconv.c:4686 pidgin/gtkpounce.c:429
+#: ../pidgin/gtkblist.c:2044 ../pidgin/gtkconv.c:4709
+#: ../pidgin/gtkpounce.c:429
 msgid ""
 "You are not currently signed on with an account that can add that buddy."
 msgstr ""
@@ -11880,126 +12431,126 @@
 "kann, um diesen Buddy hinzuzufügen."
 
 #. Buddies menu
-#: pidgin/gtkblist.c:2847
+#: ../pidgin/gtkblist.c:2850
 msgid "/_Buddies"
 msgstr "/_Buddys"
 
-#: pidgin/gtkblist.c:2848
+#: ../pidgin/gtkblist.c:2851
 msgid "/Buddies/New Instant _Message..."
 msgstr "/Buddys/_Neue Sofortnachricht..."
 
-#: pidgin/gtkblist.c:2849
+#: ../pidgin/gtkblist.c:2852
 msgid "/Buddies/Join a _Chat..."
 msgstr "/Buddys/Einen _Chat betreten..."
 
-#: pidgin/gtkblist.c:2850
+#: ../pidgin/gtkblist.c:2853
 msgid "/Buddies/Get User _Info..."
 msgstr "/Buddys/B_enutzer-Info abrufen..."
 
-#: pidgin/gtkblist.c:2851
+#: ../pidgin/gtkblist.c:2854
 msgid "/Buddies/View User _Log..."
 msgstr "/Buddys/Benutzer-_Mitschnitt ansehen..."
 
-#: pidgin/gtkblist.c:2853
+#: ../pidgin/gtkblist.c:2856
 msgid "/Buddies/Show _Offline Buddies"
 msgstr "/Buddys/Zeige _Offline-Buddys"
 
-#: pidgin/gtkblist.c:2854
+#: ../pidgin/gtkblist.c:2857
 msgid "/Buddies/Show _Empty Groups"
 msgstr "/Buddys/Zeige _leere Gruppen"
 
-#: pidgin/gtkblist.c:2855 pidgin/gtkprefs.c:997
+#: ../pidgin/gtkblist.c:2858
 msgid "/Buddies/Show Buddy _Details"
 msgstr "/Buddys/Zeige Buddy-_Details"
 
-#: pidgin/gtkblist.c:2856
+#: ../pidgin/gtkblist.c:2859
 msgid "/Buddies/Show Idle _Times"
 msgstr "/Buddys/Zeige Untätigkeitszei_ten"
 
-#: pidgin/gtkblist.c:2857
+#: ../pidgin/gtkblist.c:2860
 msgid "/Buddies/_Sort Buddies"
 msgstr "/Buddys/Buddys _sortieren"
 
-#: pidgin/gtkblist.c:2859
+#: ../pidgin/gtkblist.c:2862
 msgid "/Buddies/_Add Buddy..."
 msgstr "/Buddys/B_uddy hinzufügen..."
 
-#: pidgin/gtkblist.c:2860
+#: ../pidgin/gtkblist.c:2863
 msgid "/Buddies/Add C_hat..."
 msgstr "/Buddys/C_hat hinzufügen..."
 
-#: pidgin/gtkblist.c:2861
+#: ../pidgin/gtkblist.c:2864
 msgid "/Buddies/Add _Group..."
 msgstr "/Buddys/_Gruppe hinzufügen..."
 
-#: pidgin/gtkblist.c:2863
+#: ../pidgin/gtkblist.c:2866
 msgid "/Buddies/_Quit"
 msgstr "/Buddys/_Beenden"
 
 #. Accounts menu
-#: pidgin/gtkblist.c:2866
+#: ../pidgin/gtkblist.c:2869
 msgid "/_Accounts"
 msgstr "/_Konten"
 
-#: pidgin/gtkblist.c:2867 pidgin/gtkblist.c:6543
+#: ../pidgin/gtkblist.c:2870 ../pidgin/gtkblist.c:6542
 msgid "/Accounts/Add\\/Edit"
 msgstr "/Konten/Hinzufügen\\/Ändern"
 
 #. Tools
-#: pidgin/gtkblist.c:2870
+#: ../pidgin/gtkblist.c:2873
 msgid "/_Tools"
 msgstr "/_Werkzeuge"
 
-#: pidgin/gtkblist.c:2871
+#: ../pidgin/gtkblist.c:2874
 msgid "/Tools/Buddy _Pounces"
 msgstr "/Werkzeuge/Buddy-_Alarm"
 
-#: pidgin/gtkblist.c:2872
+#: ../pidgin/gtkblist.c:2875
 msgid "/Tools/Plu_gins"
 msgstr "/Werkzeuge/Plu_gins"
 
-#: pidgin/gtkblist.c:2873
+#: ../pidgin/gtkblist.c:2876
 msgid "/Tools/Pr_eferences"
 msgstr "/Werkzeuge/_Einstellungen"
 
-#: pidgin/gtkblist.c:2874
+#: ../pidgin/gtkblist.c:2877
 msgid "/Tools/Pr_ivacy"
 msgstr "/Werkzeuge/Pri_vatsphäre"
 
-#: pidgin/gtkblist.c:2876
+#: ../pidgin/gtkblist.c:2879
 msgid "/Tools/_File Transfers"
 msgstr "/Werkzeuge/_Dateiübertragungen"
 
-#: pidgin/gtkblist.c:2877
+#: ../pidgin/gtkblist.c:2880
 msgid "/Tools/R_oom List"
 msgstr "/Werkzeuge/Chat_räume"
 
-#: pidgin/gtkblist.c:2878
+#: ../pidgin/gtkblist.c:2881
 msgid "/Tools/System _Log"
 msgstr "/Werkzeuge/_System-Mitschnitt"
 
-#: pidgin/gtkblist.c:2880
+#: ../pidgin/gtkblist.c:2883
 msgid "/Tools/Mute _Sounds"
 msgstr "/Werkzeuge/_Stummschalten"
 
 #. Help
-#: pidgin/gtkblist.c:2882
+#: ../pidgin/gtkblist.c:2885
 msgid "/_Help"
 msgstr "/_Hilfe"
 
-#: pidgin/gtkblist.c:2883
+#: ../pidgin/gtkblist.c:2886
 msgid "/Help/Online _Help"
 msgstr "/Hilfe/Online-_Hilfe"
 
-#: pidgin/gtkblist.c:2884
+#: ../pidgin/gtkblist.c:2887
 msgid "/Help/_Debug Window"
 msgstr "/Hilfe/_Debug-Fenster"
 
-#: pidgin/gtkblist.c:2886 pidgin/gtkblist.c:2888
+#: ../pidgin/gtkblist.c:2889 ../pidgin/gtkblist.c:2891
 msgid "/Help/_About"
 msgstr "/Hilfe/Ü_ber"
 
-#: pidgin/gtkblist.c:2917
+#: ../pidgin/gtkblist.c:2920
 #, c-format
 msgid ""
 "\n"
@@ -12008,132 +12559,132 @@
 "\n"
 "<b>Konto:</b> %s"
 
-#: pidgin/gtkblist.c:2995
+#: ../pidgin/gtkblist.c:2998
 msgid "Buddy Alias"
 msgstr "Buddy-Alias"
 
-#: pidgin/gtkblist.c:3024
+#: ../pidgin/gtkblist.c:3027
 msgid "Logged In"
 msgstr "Angemeldet"
 
-#: pidgin/gtkblist.c:3070
+#: ../pidgin/gtkblist.c:3073
 msgid "Last Seen"
 msgstr "Zuletzt gesehen"
 
-#: pidgin/gtkblist.c:3090
+#: ../pidgin/gtkblist.c:3093
 msgid "Spooky"
 msgstr "Gruselig"
 
-#: pidgin/gtkblist.c:3092
+#: ../pidgin/gtkblist.c:3095
 msgid "Awesome"
 msgstr "Großartig"
 
-#: pidgin/gtkblist.c:3094
+#: ../pidgin/gtkblist.c:3097
 msgid "Rockin'"
 msgstr "Abgefahren"
 
-#: pidgin/gtkblist.c:3437
+#: ../pidgin/gtkblist.c:3436
 #, c-format
 msgid "Idle %dd %dh %02dm"
 msgstr "Untätig %dd %dh %02dm"
 
-#: pidgin/gtkblist.c:3439
+#: ../pidgin/gtkblist.c:3438
 #, c-format
 msgid "Idle %dh %02dm"
 msgstr "Untätig %dh %02dm"
 
-#: pidgin/gtkblist.c:3441
+#: ../pidgin/gtkblist.c:3440
 #, c-format
 msgid "Idle %dm"
 msgstr "Untätig %dm"
 
-#: pidgin/gtkblist.c:3586
+#: ../pidgin/gtkblist.c:3585
 msgid "/Buddies/New Instant Message..."
 msgstr "/Buddys/Neue Sofortnachricht..."
 
-#: pidgin/gtkblist.c:3587 pidgin/gtkblist.c:3620
+#: ../pidgin/gtkblist.c:3586 ../pidgin/gtkblist.c:3619
 msgid "/Buddies/Join a Chat..."
 msgstr "/Buddys/Chat betreten..."
 
-#: pidgin/gtkblist.c:3588
+#: ../pidgin/gtkblist.c:3587
 msgid "/Buddies/Get User Info..."
 msgstr "/Buddys/Benutzer-Info abrufen..."
 
-#: pidgin/gtkblist.c:3589
+#: ../pidgin/gtkblist.c:3588
 msgid "/Buddies/Add Buddy..."
 msgstr "/Buddys/Buddy hinzufügen..."
 
-#: pidgin/gtkblist.c:3590 pidgin/gtkblist.c:3623
+#: ../pidgin/gtkblist.c:3589 ../pidgin/gtkblist.c:3622
 msgid "/Buddies/Add Chat..."
 msgstr "/Buddys/Chat hinzufügen..."
 
-#: pidgin/gtkblist.c:3591
+#: ../pidgin/gtkblist.c:3590
 msgid "/Buddies/Add Group..."
 msgstr "/Buddys/Gruppe hinzufügen..."
 
-#: pidgin/gtkblist.c:3626
+#: ../pidgin/gtkblist.c:3625
 msgid "/Tools/Privacy"
 msgstr "/Werkzeuge/Privatsphäre"
 
-#: pidgin/gtkblist.c:3629
+#: ../pidgin/gtkblist.c:3628
 msgid "/Tools/Room List"
 msgstr "/Werkzeuge/Chaträume"
 
-#: pidgin/gtkblist.c:3726 pidgin/gtkdocklet.c:153
+#: ../pidgin/gtkblist.c:3725 ../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:3806
+#: ../pidgin/gtkblist.c:3805
 msgid "Manually"
 msgstr "Manuell"
 
-#: pidgin/gtkblist.c:3808
+#: ../pidgin/gtkblist.c:3807
 msgid "Alphabetically"
 msgstr "Alphabetisch"
 
-#: pidgin/gtkblist.c:3809
+#: ../pidgin/gtkblist.c:3808
 msgid "By status"
 msgstr "Nach Status"
 
-#: pidgin/gtkblist.c:3810
+#: ../pidgin/gtkblist.c:3809
 msgid "By log size"
 msgstr "Nach Größe der Logs"
 
-#: pidgin/gtkblist.c:4015 pidgin/gtkconn.c:178
+#: ../pidgin/gtkblist.c:4014 ../pidgin/gtkconn.c:178
 #, c-format
 msgid "%s disconnected"
 msgstr "%s abgemeldet"
 
-#: pidgin/gtkblist.c:4025
+#: ../pidgin/gtkblist.c:4024
 msgid "Re-enable Account"
 msgstr "Konten reaktivieren"
 
-#: pidgin/gtkblist.c:4051
+#: ../pidgin/gtkblist.c:4050
 #, c-format
 msgid "<span color=\"red\">%s disconnected: %s</span>"
 msgstr "<span color=\"red\">%s abgemeldet: %s</span>"
 
-#: pidgin/gtkblist.c:4203
+#: ../pidgin/gtkblist.c:4202
 msgid "<b>Username:</b>"
 msgstr "<b>Benutzername:</b>"
 
-#: pidgin/gtkblist.c:4210
+#: ../pidgin/gtkblist.c:4209
 msgid "<b>Password:</b>"
 msgstr "<b>Passwort:</b>"
 
-#: pidgin/gtkblist.c:4221
+#: ../pidgin/gtkblist.c:4220
 msgid "_Login"
 msgstr "_Anmelden"
 
-#: pidgin/gtkblist.c:4304
+#: ../pidgin/gtkblist.c:4303
 msgid "/Accounts"
 msgstr "/Konten"
 
 #. Translators: Please maintain the use of -> and <- to refer to menu heirarchy
-#: pidgin/gtkblist.c:4318
+#: ../pidgin/gtkblist.c:4317
 #, c-format
 msgid ""
 "<span weight='bold' size='larger'>Welcome to %s!</span>\n"
@@ -12152,23 +12703,23 @@
 #. set the Show Offline Buddies option. must be done
 #. * after the treeview or faceprint gets mad. -Robot101
 #.
-#: pidgin/gtkblist.c:4567
+#: ../pidgin/gtkblist.c:4566
 msgid "/Buddies/Show Offline Buddies"
 msgstr "/Buddys/Zeige Offline-Buddys"
 
-#: pidgin/gtkblist.c:4570
+#: ../pidgin/gtkblist.c:4569
 msgid "/Buddies/Show Empty Groups"
 msgstr "/Buddys/Zeige leere Gruppen"
 
-#: pidgin/gtkblist.c:4576
+#: ../pidgin/gtkblist.c:4575
 msgid "/Buddies/Show Buddy Details"
 msgstr "/Buddys/Zeige Buddy-Details"
 
-#: pidgin/gtkblist.c:4579
+#: ../pidgin/gtkblist.c:4578
 msgid "/Buddies/Show Idle Times"
 msgstr "/Buddys/Zeige Untätigkeitszeiten"
 
-#: pidgin/gtkblist.c:5456
+#: ../pidgin/gtkblist.c:5455
 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. "
@@ -12180,25 +12731,25 @@
 "immer es möglich ist.\n"
 
 #. End of account box
-#: pidgin/gtkblist.c:5491
+#: ../pidgin/gtkblist.c:5490
 msgid "_Screen name:"
 msgstr "_Benutzername:"
 
-#: pidgin/gtkblist.c:5513 pidgin/gtkblist.c:5866
+#: ../pidgin/gtkblist.c:5512 ../pidgin/gtkblist.c:5865
 msgid "A_lias:"
 msgstr "A_lias:"
 
-#: pidgin/gtkblist.c:5778
+#: ../pidgin/gtkblist.c:5777
 msgid "This protocol does not support chat rooms."
 msgstr "Dieses Protokoll unterstützt keine Chaträume."
 
-#: pidgin/gtkblist.c:5794
+#: ../pidgin/gtkblist.c:5793
 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:5835
+#: ../pidgin/gtkblist.c:5834
 msgid ""
 "Please enter an alias, and the appropriate information about the chat you "
 "would like to add to your buddy list.\n"
@@ -12206,43 +12757,43 @@
 "Bitte geben Sie einen Alias und geeignete Informationen über den Chat ein, "
 "den Sie in Ihre Buddy-Liste aufnehmen wollen.\n"
 
-#: pidgin/gtkblist.c:5923
+#: ../pidgin/gtkblist.c:5922
 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:6563
+#: ../pidgin/gtkblist.c:6562
 msgid "<PurpleMain>/Accounts/"
 msgstr "<PurpleMain>/Konten"
 
-#: pidgin/gtkblist.c:6587
+#: ../pidgin/gtkblist.c:6586
 msgid "_Edit Account"
 msgstr "Konto _bearbeiten"
 
-#: pidgin/gtkblist.c:6600 pidgin/gtkconv.c:3011
+#: ../pidgin/gtkblist.c:6599 ../pidgin/gtkconv.c:3015
 msgid "No actions available"
 msgstr "Keine Aktionen verfügbar"
 
-#: pidgin/gtkblist.c:6608
+#: ../pidgin/gtkblist.c:6607
 msgid "_Disable"
 msgstr "_Deaktivieren"
 
-#: pidgin/gtkblist.c:6620
+#: ../pidgin/gtkblist.c:6619
 msgid "Enable Account"
 msgstr "Konten aktivieren"
 
-#: pidgin/gtkblist.c:6626
+#: ../pidgin/gtkblist.c:6625
 msgid "<PurpleMain>/Accounts/Enable Account"
 msgstr "<PurpleMain>/Konten/Konto aktivieren"
 
-#: pidgin/gtkblist.c:6675
+#: ../pidgin/gtkblist.c:6674
 msgid "/Tools"
 msgstr "/Werkzeuge"
 
-#: pidgin/gtkblist.c:6745
+#: ../pidgin/gtkblist.c:6744
 msgid "/Buddies/Sort Buddies"
 msgstr "/Buddys/Buddys sortieren"
 
-#: pidgin/gtkconn.c:179
+#: ../pidgin/gtkconn.c:179
 #, c-format
 msgid ""
 "%s\n"
@@ -12255,27 +12806,27 @@
 "%s wird nicht versuchen, das Konto wieder zu verbinden bis Sie den Fehler "
 "behoben und das Konto wieder aktiviert haben."
 
-#: pidgin/gtkconv.c:484
+#: ../pidgin/gtkconv.c:488
 msgid "Unknown command."
 msgstr "Unbekanntes Kommando."
 
-#: pidgin/gtkconv.c:756 pidgin/gtkconv.c:782
+#: ../pidgin/gtkconv.c:760 ../pidgin/gtkconv.c:786
 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:776
+#: ../pidgin/gtkconv.c:780
 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:829
+#: ../pidgin/gtkconv.c:833
 msgid "Invite Buddy Into Chat Room"
 msgstr "Buddy in einen Chatraum einladen"
 
 #. Put our happy label in it.
-#: pidgin/gtkconv.c:859
+#: ../pidgin/gtkconv.c:863
 msgid ""
 "Please enter the name of the user you wish to invite, along with an optional "
 "invite message."
@@ -12283,201 +12834,201 @@
 "Bitte geben Sie den Benutzernamen der Person ein, die Sie einladen möchten "
 "zusammen mit einer optionalen Einladungsnachricht."
 
-#: pidgin/gtkconv.c:880
+#: ../pidgin/gtkconv.c:884
 msgid "_Buddy:"
 msgstr "_Buddy:"
 
-#: pidgin/gtkconv.c:900 pidgin/gtksavedstatuses.c:1193
-#: pidgin/gtksavedstatuses.c:1525
+#: ../pidgin/gtkconv.c:904 ../pidgin/gtksavedstatuses.c:1193
+#: ../pidgin/gtksavedstatuses.c:1525
 msgid "_Message:"
 msgstr "_Nachricht:"
 
-#: pidgin/gtkconv.c:957 pidgin/gtkconv.c:2518 pidgin/gtkdebug.c:218
-#: pidgin/gtkft.c:542
+#: ../pidgin/gtkconv.c:961 ../pidgin/gtkconv.c:2522 ../pidgin/gtkdebug.c:218
+#: ../pidgin/gtkft.c:542
 msgid "Unable to open file."
 msgstr "Konnte die Datei nicht öffnen."
 
-#: pidgin/gtkconv.c:963
+#: ../pidgin/gtkconv.c:967
 #, c-format
 msgid "<h1>Conversation with %s</h1>\n"
 msgstr "<h1>Unterhaltung mit %s</h1>\n"
 
-#: pidgin/gtkconv.c:999
+#: ../pidgin/gtkconv.c:1003
 msgid "Save Conversation"
 msgstr "Unterhaltung speichern"
 
-#: pidgin/gtkconv.c:1148 pidgin/gtkdebug.c:166 pidgin/gtkdebug.c:742
+#: ../pidgin/gtkconv.c:1152 ../pidgin/gtkdebug.c:166 ../pidgin/gtkdebug.c:742
 msgid "Find"
 msgstr "Suchen"
 
-#: pidgin/gtkconv.c:1174 pidgin/gtkdebug.c:194
+#: ../pidgin/gtkconv.c:1178 ../pidgin/gtkdebug.c:194
 msgid "_Search for:"
 msgstr "_Suche nach:"
 
-#: pidgin/gtkconv.c:1357
+#: ../pidgin/gtkconv.c:1361
 msgid "Logging started. Future messages in this conversation will be logged."
 msgstr ""
 "Mitschnitt gestartet. Zukünftige Nachrichten dieser Unterhaltung werden "
 "mitgeschnitten."
 
-#: pidgin/gtkconv.c:1365
+#: ../pidgin/gtkconv.c:1369
 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:1613
+#: ../pidgin/gtkconv.c:1617
 msgid "Un-Ignore"
 msgstr "Nicht Ignorieren"
 
-#: pidgin/gtkconv.c:1616
+#: ../pidgin/gtkconv.c:1620
 msgid "Ignore"
 msgstr "Ignorieren"
 
-#: pidgin/gtkconv.c:1636
+#: ../pidgin/gtkconv.c:1640
 msgid "Get Away Message"
 msgstr "Neue Abwesenheitsnachricht abholen"
 
-#: pidgin/gtkconv.c:1659
+#: ../pidgin/gtkconv.c:1663
 msgid "Last said"
 msgstr "Zuletzt gesagt"
 
-#: pidgin/gtkconv.c:2526
+#: ../pidgin/gtkconv.c:2530
 msgid "Unable to save icon file to disk."
 msgstr "Kann Icon-Datei nicht auf die Festplatte speichern."
 
-#: pidgin/gtkconv.c:2577
+#: ../pidgin/gtkconv.c:2581
 msgid "Save Icon"
 msgstr "Icon speichern"
 
-#: pidgin/gtkconv.c:2629
+#: ../pidgin/gtkconv.c:2633
 msgid "Animate"
 msgstr "Animieren"
 
-#: pidgin/gtkconv.c:2634
+#: ../pidgin/gtkconv.c:2638
 msgid "Hide Icon"
 msgstr "Icon verbergen"
 
-#: pidgin/gtkconv.c:2637
+#: ../pidgin/gtkconv.c:2641
 msgid "Save Icon As..."
 msgstr "Icon speichern unter..."
 
-#: pidgin/gtkconv.c:2641
+#: ../pidgin/gtkconv.c:2645
 msgid "Set Custom Icon..."
 msgstr "Setze benutzerdefiniertes Icon..."
 
-#: pidgin/gtkconv.c:2654
+#: ../pidgin/gtkconv.c:2658
 msgid "Remove Custom Icon"
 msgstr "Benutzerdefiniertes Icon entfernen"
 
 #. Conversation menu
-#: pidgin/gtkconv.c:2796
+#: ../pidgin/gtkconv.c:2800
 msgid "/_Conversation"
 msgstr "/_Unterhaltung"
 
-#: pidgin/gtkconv.c:2798
+#: ../pidgin/gtkconv.c:2802
 msgid "/Conversation/New Instant _Message..."
 msgstr "/Unterhaltung/_Neue Sofortnachricht..."
 
-#: pidgin/gtkconv.c:2803
+#: ../pidgin/gtkconv.c:2807
 msgid "/Conversation/_Find..."
 msgstr "/Unterhaltung/_Finden..."
 
-#: pidgin/gtkconv.c:2805
+#: ../pidgin/gtkconv.c:2809
 msgid "/Conversation/View _Log"
 msgstr "/Unterhaltung/Betrachte _Mitschnitt"
 
-#: pidgin/gtkconv.c:2806
+#: ../pidgin/gtkconv.c:2810
 msgid "/Conversation/_Save As..."
 msgstr "/Unterhaltung/_Speichern als..."
 
-#: pidgin/gtkconv.c:2808
+#: ../pidgin/gtkconv.c:2812
 msgid "/Conversation/Clea_r Scrollback"
 msgstr "/Unterhaltung/_Leeren"
 
-#: pidgin/gtkconv.c:2812
+#: ../pidgin/gtkconv.c:2816
 msgid "/Conversation/Se_nd File..."
 msgstr "/Unterhaltung/Datei _senden..."
 
-#: pidgin/gtkconv.c:2813
+#: ../pidgin/gtkconv.c:2817
 msgid "/Conversation/Add Buddy _Pounce..."
 msgstr "/Unterhaltung/Buddy-Alar_m hinzufügen..."
 
-#: pidgin/gtkconv.c:2815
+#: ../pidgin/gtkconv.c:2819
 msgid "/Conversation/_Get Info"
 msgstr "/Unterhaltung/B_enutzer-Info abrufen"
 
-#: pidgin/gtkconv.c:2817
+#: ../pidgin/gtkconv.c:2821
 msgid "/Conversation/In_vite..."
 msgstr "/Unterhaltung/_Einladen..."
 
-#: pidgin/gtkconv.c:2819
+#: ../pidgin/gtkconv.c:2823
 msgid "/Conversation/M_ore"
 msgstr "/Unterhaltung/M_ehr"
 
-#: pidgin/gtkconv.c:2823
+#: ../pidgin/gtkconv.c:2827
 msgid "/Conversation/Al_ias..."
 msgstr "/Unterhaltung/Al_ias..."
 
-#: pidgin/gtkconv.c:2825
+#: ../pidgin/gtkconv.c:2829
 msgid "/Conversation/_Block..."
 msgstr "/Unterhaltung/_Blockieren..."
 
-#: pidgin/gtkconv.c:2827
+#: ../pidgin/gtkconv.c:2831
 msgid "/Conversation/_Unblock..."
 msgstr "/Unterhaltung/_Entsperren..."
 
-#: pidgin/gtkconv.c:2829
+#: ../pidgin/gtkconv.c:2833
 msgid "/Conversation/_Add..."
 msgstr "/Unterhaltung/_Hinzufügen..."
 
-#: pidgin/gtkconv.c:2831
+#: ../pidgin/gtkconv.c:2835
 msgid "/Conversation/_Remove..."
 msgstr "/Unterhaltung/_Entfernen..."
 
-#: pidgin/gtkconv.c:2836
+#: ../pidgin/gtkconv.c:2840
 msgid "/Conversation/Insert Lin_k..."
 msgstr "/Unterhaltung/Lin_k einfügen..."
 
-#: pidgin/gtkconv.c:2838
+#: ../pidgin/gtkconv.c:2842
 msgid "/Conversation/Insert Imag_e..."
 msgstr "/Unterhaltung/Bil_d einfügen..."
 
-#: pidgin/gtkconv.c:2844
+#: ../pidgin/gtkconv.c:2848
 msgid "/Conversation/_Close"
 msgstr "/Unterhaltung/S_chließen"
 
 #. Options
-#: pidgin/gtkconv.c:2848
+#: ../pidgin/gtkconv.c:2852
 msgid "/_Options"
 msgstr "/_Optionen"
 
-#: pidgin/gtkconv.c:2849
+#: ../pidgin/gtkconv.c:2853
 msgid "/Options/Enable _Logging"
 msgstr "/Optionen/Schalte _Mitschnitt ein"
 
-#: pidgin/gtkconv.c:2850
+#: ../pidgin/gtkconv.c:2854
 msgid "/Options/Enable _Sounds"
 msgstr "/Optionen/Schalte _Klänge ein"
 
-#: pidgin/gtkconv.c:2851
+#: ../pidgin/gtkconv.c:2855
 msgid "/Options/Show Buddy _Icon"
 msgstr "/Optionen/Buddy-_Icon anzeigen"
 
-#: pidgin/gtkconv.c:2853
+#: ../pidgin/gtkconv.c:2857
 msgid "/Options/Show Formatting _Toolbars"
 msgstr "/Optionen/Zeige _Werkzeugleisten für Formatierung"
 
-#: pidgin/gtkconv.c:2854
+#: ../pidgin/gtkconv.c:2858
 msgid "/Options/Show Ti_mestamps"
 msgstr "/Optionen/Zeige Zeitste_mpel"
 
-#: pidgin/gtkconv.c:2999
+#: ../pidgin/gtkconv.c:3003
 msgid "/Conversation/More"
 msgstr "/Unterhaltung/Mehr"
 
-#: pidgin/gtkconv.c:3055
+#: ../pidgin/gtkconv.c:3059
 msgid "/Options"
 msgstr "/Optionen"
 
@@ -12486,558 +13037,577 @@
 #. 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:3090 pidgin/gtkconv.c:3122
+#: ../pidgin/gtkconv.c:3094 ../pidgin/gtkconv.c:3126
 msgid "/Conversation"
 msgstr "/Unterhaltung"
 
-#: pidgin/gtkconv.c:3130
+#: ../pidgin/gtkconv.c:3134
 msgid "/Conversation/View Log"
 msgstr "/Unterhaltung/Betrachte Mitschnitt"
 
-#: pidgin/gtkconv.c:3136
+#: ../pidgin/gtkconv.c:3140
 msgid "/Conversation/Send File..."
 msgstr "/Unterhaltung/Datei senden ..."
 
-#: pidgin/gtkconv.c:3140
+#: ../pidgin/gtkconv.c:3144
 msgid "/Conversation/Add Buddy Pounce..."
 msgstr "/Unterhaltung/Buddy-Alarm hinzufügen..."
 
-#: pidgin/gtkconv.c:3146
+#: ../pidgin/gtkconv.c:3150
 msgid "/Conversation/Get Info"
 msgstr "/Unterhaltung/Info abrufen"
 
-#: pidgin/gtkconv.c:3150
+#: ../pidgin/gtkconv.c:3154
 msgid "/Conversation/Invite..."
 msgstr "/Unterhaltung/Einladen ..."
 
-#: pidgin/gtkconv.c:3156
+#: ../pidgin/gtkconv.c:3160
 msgid "/Conversation/Alias..."
 msgstr "/Unterhaltung/Alias..."
 
-#: pidgin/gtkconv.c:3160
+#: ../pidgin/gtkconv.c:3164
 msgid "/Conversation/Block..."
 msgstr "/Unterhaltung/Blockieren..."
 
-#: pidgin/gtkconv.c:3164
+#: ../pidgin/gtkconv.c:3168
 msgid "/Conversation/Unblock..."
 msgstr "/Unterhaltung/Entsperren..."
 
-#: pidgin/gtkconv.c:3168
+#: ../pidgin/gtkconv.c:3172
 msgid "/Conversation/Add..."
 msgstr "/Unterhaltung/Hinzufügen..."
 
-#: pidgin/gtkconv.c:3172
+#: ../pidgin/gtkconv.c:3176
 msgid "/Conversation/Remove..."
 msgstr "/Unterhaltung/Entfernen..."
 
-#: pidgin/gtkconv.c:3178
+#: ../pidgin/gtkconv.c:3182
 msgid "/Conversation/Insert Link..."
 msgstr "/Unterhaltung/Link einfügen..."
 
-#: pidgin/gtkconv.c:3182
+#: ../pidgin/gtkconv.c:3186
 msgid "/Conversation/Insert Image..."
 msgstr "/Unterhaltung/Bild einfügen..."
 
-#: pidgin/gtkconv.c:3188
+#: ../pidgin/gtkconv.c:3192
 msgid "/Options/Enable Logging"
 msgstr "/Optionen/Schalte Mitschnitt ein"
 
-#: pidgin/gtkconv.c:3191
+#: ../pidgin/gtkconv.c:3195
 msgid "/Options/Enable Sounds"
 msgstr "/Optionen/Schalte Klänge ein"
 
-#: pidgin/gtkconv.c:3204
+#: ../pidgin/gtkconv.c:3208
 msgid "/Options/Show Formatting Toolbars"
 msgstr "/Optionen/Zeige Werkzeugleisten für Formatierung"
 
-#: pidgin/gtkconv.c:3207
+#: ../pidgin/gtkconv.c:3211
 msgid "/Options/Show Timestamps"
 msgstr "/Optionen/Zeige Zeitstempel"
 
-#: pidgin/gtkconv.c:3210
+#: ../pidgin/gtkconv.c:3214
 msgid "/Options/Show Buddy Icon"
 msgstr "/Optionen/Zeige Buddy-Icon"
 
-#: pidgin/gtkconv.c:3294 pidgin/gtkconv.c:3336
+#: ../pidgin/gtkconv.c:3298 ../pidgin/gtkconv.c:3340
 msgid "User is typing..."
 msgstr "Benutzer tippt gerade..."
 
-#: pidgin/gtkconv.c:3339
+#: ../pidgin/gtkconv.c:3343
 msgid "User has typed something and stopped"
 msgstr "Benutzer hat etwas getippt und wartet nun"
 
 #. Build the Send To menu
-#: pidgin/gtkconv.c:3520 pidgin/gtkconv.c:7732
+#: ../pidgin/gtkconv.c:3526 ../pidgin/gtkconv.c:7817
 msgid "_Send To"
 msgstr "_Senden an"
 
-#: pidgin/gtkconv.c:4234
+#: ../pidgin/gtkconv.c:4239
 msgid "_Send"
 msgstr "Ab_schicken"
 
 #. Setup the label telling how many people are in the room.
-#: pidgin/gtkconv.c:4338
+#: ../pidgin/gtkconv.c:4343
 msgid "0 people in room"
 msgstr "0 Personen im Raum"
 
-#: pidgin/gtkconv.c:5585 pidgin/gtkconv.c:5706
+#: ../pidgin/gtkconv.c:5611 ../pidgin/gtkconv.c:5732
 #, 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:6305 pidgin/gtkstatusbox.c:659
+#: ../pidgin/gtkconv.c:6341 ../pidgin/gtkstatusbox.c:659
 msgid "Typing"
 msgstr "Tippt gerade"
 
-#: pidgin/gtkconv.c:6311
+#: ../pidgin/gtkconv.c:6345
 msgid "Stopped Typing"
 msgstr "Tippen gestoppt"
 
-#: pidgin/gtkconv.c:6316
+#: ../pidgin/gtkconv.c:6348
 msgid "Nick Said"
 msgstr "Spitzname gesagt"
 
-#: pidgin/gtkconv.c:6321 pidgin/gtkdocklet.c:492
+#: ../pidgin/gtkconv.c:6351 ../pidgin/gtkdocklet.c:492
 msgid "Unread Messages"
 msgstr "Ungelesene Nachrichten"
 
-#: pidgin/gtkconv.c:6326
+#: ../pidgin/gtkconv.c:6354
 msgid "New Event"
 msgstr "Neue Ereignisse"
 
-#: pidgin/gtkconv.c:7303
+#: ../pidgin/gtkconv.c:7358
 msgid "clear: Clears all conversation scrollbacks."
 msgstr "clear: Leert alle Gesprächsfenster."
 
-#: pidgin/gtkconv.c:7467
+#: ../pidgin/gtkconv.c:7522
 msgid "Confirm close"
 msgstr "Schließen bestätigen"
 
-#: pidgin/gtkconv.c:7499
+#: ../pidgin/gtkconv.c:7554
 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:8059
+#: ../pidgin/gtkconv.c:8144
 msgid "Close other tabs"
 msgstr "Andere Reiter schließen"
 
-#: pidgin/gtkconv.c:8065
+#: ../pidgin/gtkconv.c:8150
 msgid "Close all tabs"
 msgstr "Alle Reiter schließen"
 
-#: pidgin/gtkconv.c:8073
+#: ../pidgin/gtkconv.c:8158
 msgid "Detach this tab"
 msgstr "Diesen Reiter ablösen"
 
-#: pidgin/gtkconv.c:8079
+#: ../pidgin/gtkconv.c:8164
 msgid "Close this tab"
 msgstr "Diesen Reiter schließen"
 
-#: pidgin/gtkconv.c:8560
+#: ../pidgin/gtkconv.c:8650
 msgid "Close conversation"
 msgstr "Unterhaltung schließen"
 
-#: pidgin/gtkconv.c:9092
+#: ../pidgin/gtkconv.c:9250
 msgid "Last created window"
 msgstr "Letztes erstelltes Fenster"
 
-#: pidgin/gtkconv.c:9094
+#: ../pidgin/gtkconv.c:9252
 msgid "Separate IM and Chat windows"
 msgstr "Getrennte IM- und Chat-Fenster"
 
-#: pidgin/gtkconv.c:9096 pidgin/gtkprefs.c:1410
+#: ../pidgin/gtkconv.c:9254 ../pidgin/gtkprefs.c:1412
 msgid "New window"
 msgstr "Neues Fenster"
 
-#: pidgin/gtkconv.c:9098
+#: ../pidgin/gtkconv.c:9256
 msgid "By group"
 msgstr "Nach Gruppe"
 
-#: pidgin/gtkconv.c:9100
+#: ../pidgin/gtkconv.c:9258
 msgid "By account"
 msgstr "Nach Konto"
 
-#: pidgin/gtkdebug.c:233
+#: ../pidgin/gtkdebug.c:233
 msgid "Save Debug Log"
 msgstr "Debug-Mitschnitt speichern"
 
-#: pidgin/gtkdebug.c:581
+#: ../pidgin/gtkdebug.c:581
 msgid "Invert"
 msgstr "Invertieren"
 
-#: pidgin/gtkdebug.c:584
+#: ../pidgin/gtkdebug.c:584
 msgid "Highlight matches"
 msgstr "Treffer hervorheben"
 
-#: pidgin/gtkdebug.c:651
+#: ../pidgin/gtkdebug.c:651
 msgid "_Icon Only"
 msgstr "Nur _Icon"
 
-#: pidgin/gtkdebug.c:652
+#: ../pidgin/gtkdebug.c:652
 msgid "_Text Only"
 msgstr "Nur _Text"
 
-#: pidgin/gtkdebug.c:653
+#: ../pidgin/gtkdebug.c:653
 msgid "_Both Icon & Text"
 msgstr "Icon _und Text"
 
-#: pidgin/gtkdebug.c:774
+#: ../pidgin/gtkdebug.c:774
 msgid "Filter"
 msgstr "Filter"
 
-#: pidgin/gtkdebug.c:793
+#: ../pidgin/gtkdebug.c:793
 msgid "Right click for more options."
 msgstr "Rechtsklicken für weitere Optionen."
 
-#: pidgin/gtkdebug.c:823
+#: ../pidgin/gtkdebug.c:823
 msgid "Level "
 msgstr "Stufe "
 
-#: pidgin/gtkdebug.c:824 pidgin/gtkdebug.c:830
+#: ../pidgin/gtkdebug.c:824 ../pidgin/gtkdebug.c:830
 msgid "Select the debug filter level."
 msgstr "Debug-Filterstufe auswählen."
 
-#: pidgin/gtkdebug.c:832
+#: ../pidgin/gtkdebug.c:832
 msgid "All"
 msgstr "Alle"
 
-#: pidgin/gtkdebug.c:833
+#: ../pidgin/gtkdebug.c:833
 msgid "Misc"
 msgstr "Sonstiges"
 
-#: pidgin/gtkdebug.c:835
+#: ../pidgin/gtkdebug.c:835
 msgid "Warning"
 msgstr "Warnung"
 
-#: pidgin/gtkdebug.c:836
+#: ../pidgin/gtkdebug.c:836
 msgid "Error "
 msgstr "Fehler "
 
-#: pidgin/gtkdebug.c:837
+#: ../pidgin/gtkdebug.c:837
 msgid "Fatal Error"
 msgstr "Schwerer Fehler"
 
-#: pidgin/gtkdialogs.c:71 pidgin/gtkdialogs.c:117
+#: ../pidgin/gtkdialogs.c:71 ../pidgin/gtkdialogs.c:113
 msgid "lead developer"
 msgstr "Hauptentwickler"
 
-#: pidgin/gtkdialogs.c:72 pidgin/gtkdialogs.c:73 pidgin/gtkdialogs.c:74
-#: pidgin/gtkdialogs.c:75 pidgin/gtkdialogs.c:76 pidgin/gtkdialogs.c:77
-#: pidgin/gtkdialogs.c:79 pidgin/gtkdialogs.c:80 pidgin/gtkdialogs.c:81
-#: pidgin/gtkdialogs.c:82 pidgin/gtkdialogs.c:83 pidgin/gtkdialogs.c:84
-#: pidgin/gtkdialogs.c:85 pidgin/gtkdialogs.c:86 pidgin/gtkdialogs.c:89
-#: pidgin/gtkdialogs.c:90 pidgin/gtkdialogs.c:91
+#: ../pidgin/gtkdialogs.c:72 ../pidgin/gtkdialogs.c:73
+#: ../pidgin/gtkdialogs.c:74 ../pidgin/gtkdialogs.c:75
+#: ../pidgin/gtkdialogs.c:76 ../pidgin/gtkdialogs.c:77
+#: ../pidgin/gtkdialogs.c:78 ../pidgin/gtkdialogs.c:79
+#: ../pidgin/gtkdialogs.c:80 ../pidgin/gtkdialogs.c:81
+#: ../pidgin/gtkdialogs.c:82 ../pidgin/gtkdialogs.c:83
+#: ../pidgin/gtkdialogs.c:84 ../pidgin/gtkdialogs.c:85
+#: ../pidgin/gtkdialogs.c:88 ../pidgin/gtkdialogs.c:89
+#: ../pidgin/gtkdialogs.c:90
 msgid "developer"
 msgstr "Entwickler"
 
-#: pidgin/gtkdialogs.c:78
-msgid "developer & webmaster"
-msgstr "Entwickler & Webmaster"
-
-#: pidgin/gtkdialogs.c:87
+#: ../pidgin/gtkdialogs.c:86
 msgid "support"
 msgstr "Support"
 
-#: pidgin/gtkdialogs.c:88
+#: ../pidgin/gtkdialogs.c:87
 msgid "support/QA"
 msgstr "Support/Qualitätssicherung"
 
-#: pidgin/gtkdialogs.c:109
+#: ../pidgin/gtkdialogs.c:104
 msgid "win32 port"
 msgstr "Win32 Portierung"
 
-#: pidgin/gtkdialogs.c:110 pidgin/gtkdialogs.c:111
+#: ../pidgin/gtkdialogs.c:105 ../pidgin/gtkdialogs.c:106
 msgid "maintainer"
 msgstr "Maintainer"
 
-#: pidgin/gtkdialogs.c:112
+#: ../pidgin/gtkdialogs.c:107
 msgid "libfaim maintainer"
 msgstr "libfaim-Maintainer"
 
+#: ../pidgin/gtkdialogs.c:108
+msgid "developer & webmaster"
+msgstr "Entwickler & Webmaster"
+
 #. If "lazy bum" translates literally into a serious insult, use something else or omit it.
-#: pidgin/gtkdialogs.c:114
+#: ../pidgin/gtkdialogs.c:110
 msgid "hacker and designated driver [lazy bum]"
 msgstr "Grafische Benutzeroberfläche"
 
-#: pidgin/gtkdialogs.c:115
+#: ../pidgin/gtkdialogs.c:111
 msgid "XMPP developer"
 msgstr "XMPP-Entwickler"
 
-#: pidgin/gtkdialogs.c:116
+#: ../pidgin/gtkdialogs.c:112
 msgid "original author"
 msgstr "Originalautor"
 
-#: pidgin/gtkdialogs.c:123
+#: ../pidgin/gtkdialogs.c:128
 msgid "Afrikaans"
 msgstr "Afrikaans"
 
-#: pidgin/gtkdialogs.c:124
+#: ../pidgin/gtkdialogs.c:129
 msgid "Arabic"
 msgstr "Arabisch"
 
-#: pidgin/gtkdialogs.c:125 pidgin/gtkdialogs.c:126 pidgin/gtkdialogs.c:213
+#: ../pidgin/gtkdialogs.c:130 ../pidgin/gtkdialogs.c:131
+#: ../pidgin/gtkdialogs.c:218
 msgid "Bulgarian"
 msgstr "Bulgarisch"
 
-#: pidgin/gtkdialogs.c:127 pidgin/gtkdialogs.c:128 pidgin/gtkdialogs.c:129
-#: pidgin/gtkdialogs.c:130
+#: ../pidgin/gtkdialogs.c:132 ../pidgin/gtkdialogs.c:133
+#: ../pidgin/gtkdialogs.c:134 ../pidgin/gtkdialogs.c:135
 msgid "Bengali"
 msgstr "Bengalisch"
 
-#: pidgin/gtkdialogs.c:131
+#: ../pidgin/gtkdialogs.c:136
 msgid "Bosnian"
 msgstr "Bosnisch"
 
-#: pidgin/gtkdialogs.c:132 pidgin/gtkdialogs.c:214 pidgin/gtkdialogs.c:215
+#: ../pidgin/gtkdialogs.c:137 ../pidgin/gtkdialogs.c:219
+#: ../pidgin/gtkdialogs.c:220
 msgid "Catalan"
 msgstr "Katalanisch"
 
-#: pidgin/gtkdialogs.c:133 pidgin/gtkdialogs.c:134
+#: ../pidgin/gtkdialogs.c:138 ../pidgin/gtkdialogs.c:139
 msgid "Valencian-Catalan"
 msgstr "Valencianisch-Katalanisch"
 
-#: pidgin/gtkdialogs.c:135 pidgin/gtkdialogs.c:216
+#: ../pidgin/gtkdialogs.c:140 ../pidgin/gtkdialogs.c:221
 msgid "Czech"
 msgstr "Tschechisch"
 
-#: pidgin/gtkdialogs.c:136 pidgin/gtkdialogs.c:137
+#: ../pidgin/gtkdialogs.c:141 ../pidgin/gtkdialogs.c:142
 msgid "Danish"
 msgstr "Dänisch"
 
-#: pidgin/gtkdialogs.c:138 pidgin/gtkdialogs.c:139 pidgin/gtkdialogs.c:217
+#: ../pidgin/gtkdialogs.c:143 ../pidgin/gtkdialogs.c:144
+#: ../pidgin/gtkdialogs.c:222
 msgid "German"
 msgstr "Deutsch"
 
-#: pidgin/gtkdialogs.c:140 pidgin/gtkdialogs.c:141 pidgin/gtkdialogs.c:142
+#: ../pidgin/gtkdialogs.c:145 ../pidgin/gtkdialogs.c:146
+#: ../pidgin/gtkdialogs.c:147
 msgid "Dzongkha"
 msgstr "Dzongkha"
 
-#: pidgin/gtkdialogs.c:143 pidgin/gtkdialogs.c:144
+#: ../pidgin/gtkdialogs.c:148 ../pidgin/gtkdialogs.c:149
 msgid "Greek"
 msgstr "Griechisch"
 
-#: pidgin/gtkdialogs.c:145
+#: ../pidgin/gtkdialogs.c:150
 msgid "Australian English"
 msgstr "Australisches Englisch"
 
-#: pidgin/gtkdialogs.c:146
+#: ../pidgin/gtkdialogs.c:151
 msgid "Canadian English"
 msgstr "Kanadisches Englisch"
 
-#: pidgin/gtkdialogs.c:147
+#: ../pidgin/gtkdialogs.c:152
 msgid "British English"
 msgstr "Britisches Englisch"
 
-#: pidgin/gtkdialogs.c:148
+#: ../pidgin/gtkdialogs.c:153
 msgid "Esperanto"
 msgstr "Esperanto"
 
-#: pidgin/gtkdialogs.c:149 pidgin/gtkdialogs.c:218 pidgin/gtkdialogs.c:219
-#: pidgin/gtkdialogs.c:220 pidgin/gtkdialogs.c:221
+#: ../pidgin/gtkdialogs.c:154 ../pidgin/gtkdialogs.c:223
+#: ../pidgin/gtkdialogs.c:224 ../pidgin/gtkdialogs.c:225
+#: ../pidgin/gtkdialogs.c:226
 msgid "Spanish"
 msgstr "Spanisch"
 
-#: pidgin/gtkdialogs.c:150 pidgin/gtkdialogs.c:151
+#: ../pidgin/gtkdialogs.c:155 ../pidgin/gtkdialogs.c:156
 msgid "Euskera(Basque)"
 msgstr "Euskera (Baskisch)"
 
-#: pidgin/gtkdialogs.c:152 pidgin/gtkdialogs.c:153 pidgin/gtkdialogs.c:154
+#: ../pidgin/gtkdialogs.c:157 ../pidgin/gtkdialogs.c:158
+#: ../pidgin/gtkdialogs.c:159
 msgid "Persian"
 msgstr "Persisch"
 
-#: pidgin/gtkdialogs.c:155 pidgin/gtkdialogs.c:222 pidgin/gtkdialogs.c:223
+#: ../pidgin/gtkdialogs.c:160 ../pidgin/gtkdialogs.c:227
+#: ../pidgin/gtkdialogs.c:228
 msgid "Finnish"
 msgstr "Finnisch"
 
-#: pidgin/gtkdialogs.c:156 pidgin/gtkdialogs.c:224 pidgin/gtkdialogs.c:225
-#: pidgin/gtkdialogs.c:226 pidgin/gtkdialogs.c:227
+#: ../pidgin/gtkdialogs.c:161 ../pidgin/gtkdialogs.c:229
+#: ../pidgin/gtkdialogs.c:230 ../pidgin/gtkdialogs.c:231
+#: ../pidgin/gtkdialogs.c:232
 msgid "French"
 msgstr "Französisch"
 
-#: pidgin/gtkdialogs.c:157 pidgin/gtkdialogs.c:158
+#: ../pidgin/gtkdialogs.c:162 ../pidgin/gtkdialogs.c:163
 msgid "Galician"
 msgstr "Galizisch"
 
-#: pidgin/gtkdialogs.c:159 pidgin/gtkdialogs.c:160
+#: ../pidgin/gtkdialogs.c:164 ../pidgin/gtkdialogs.c:165
 msgid "Gujarati"
 msgstr "Gujaratisch"
 
-#: pidgin/gtkdialogs.c:160
+#: ../pidgin/gtkdialogs.c:165
 msgid "Gujarati Language Team"
 msgstr "Gujaratisch-Team"
 
-#: pidgin/gtkdialogs.c:161 pidgin/gtkdialogs.c:228
+#: ../pidgin/gtkdialogs.c:166 ../pidgin/gtkdialogs.c:233
 msgid "Hebrew"
 msgstr "Hebräisch"
 
-#: pidgin/gtkdialogs.c:162
+#: ../pidgin/gtkdialogs.c:167
 msgid "Hindi"
 msgstr "Hindi"
 
-#: pidgin/gtkdialogs.c:163
+#: ../pidgin/gtkdialogs.c:168
 msgid "Hungarian"
 msgstr "Ungarisch"
 
-#: pidgin/gtkdialogs.c:164
+#: ../pidgin/gtkdialogs.c:169
 msgid "Indonesian"
 msgstr "Indonesisch"
 
-#: pidgin/gtkdialogs.c:165 pidgin/gtkdialogs.c:229
+#: ../pidgin/gtkdialogs.c:170 ../pidgin/gtkdialogs.c:234
 msgid "Italian"
 msgstr "Italienisch"
 
-#: pidgin/gtkdialogs.c:166 pidgin/gtkdialogs.c:230 pidgin/gtkdialogs.c:231
-#: pidgin/gtkdialogs.c:232
+#: ../pidgin/gtkdialogs.c:171 ../pidgin/gtkdialogs.c:235
+#: ../pidgin/gtkdialogs.c:236 ../pidgin/gtkdialogs.c:237
 msgid "Japanese"
 msgstr "Japanisch"
 
-#: pidgin/gtkdialogs.c:167 pidgin/gtkdialogs.c:233
+#: ../pidgin/gtkdialogs.c:172 ../pidgin/gtkdialogs.c:238
 msgid "Georgian"
 msgstr "Georgisch"
 
-#: pidgin/gtkdialogs.c:167
+#: ../pidgin/gtkdialogs.c:172
 msgid "Ubuntu Georgian Translators"
 msgstr "Ubuntu-Georgisch-Übersetzer"
 
-#: pidgin/gtkdialogs.c:168
+#: ../pidgin/gtkdialogs.c:173
 msgid "Kannada"
 msgstr "Kannada"
 
-#: pidgin/gtkdialogs.c:168
+#: ../pidgin/gtkdialogs.c:173
 msgid "Kannada Translation team"
 msgstr "Kannada-Übersetzungsteam"
 
-#: pidgin/gtkdialogs.c:169 pidgin/gtkdialogs.c:234 pidgin/gtkdialogs.c:235
+#: ../pidgin/gtkdialogs.c:174 ../pidgin/gtkdialogs.c:239
+#: ../pidgin/gtkdialogs.c:240
 msgid "Korean"
 msgstr "Koreanisch"
 
-#: pidgin/gtkdialogs.c:170 pidgin/gtkdialogs.c:171 pidgin/gtkdialogs.c:172
+#: ../pidgin/gtkdialogs.c:175 ../pidgin/gtkdialogs.c:176
+#: ../pidgin/gtkdialogs.c:177
 msgid "Kurdish"
 msgstr "Kurdisch"
 
-#: pidgin/gtkdialogs.c:173 pidgin/gtkdialogs.c:236 pidgin/gtkdialogs.c:237
+#: ../pidgin/gtkdialogs.c:178 ../pidgin/gtkdialogs.c:241
+#: ../pidgin/gtkdialogs.c:242
 msgid "Lithuanian"
 msgstr "Litauisch"
 
-#: pidgin/gtkdialogs.c:174 pidgin/gtkdialogs.c:175 pidgin/gtkdialogs.c:238
+#: ../pidgin/gtkdialogs.c:179 ../pidgin/gtkdialogs.c:180
+#: ../pidgin/gtkdialogs.c:243
 msgid "Macedonian"
 msgstr "Makedonisch"
 
-#: pidgin/gtkdialogs.c:176
+#: ../pidgin/gtkdialogs.c:181
 msgid "Bokmål Norwegian"
 msgstr "Bokmål Norwegisch"
 
-#: pidgin/gtkdialogs.c:177
+#: ../pidgin/gtkdialogs.c:182
 msgid "Nepali"
 msgstr "Nepali"
 
-#: pidgin/gtkdialogs.c:178
+#: ../pidgin/gtkdialogs.c:183
 msgid "Dutch, Flemish"
 msgstr "Niederländisch, Flämisch"
 
-#: pidgin/gtkdialogs.c:179
+#: ../pidgin/gtkdialogs.c:184
 msgid "Norwegian"
 msgstr "Norwegisch"
 
-#: pidgin/gtkdialogs.c:180
+#: ../pidgin/gtkdialogs.c:185
 msgid "Norwegian Nynorsk"
 msgstr "Norwegisch (Nynorsk)"
 
-#: pidgin/gtkdialogs.c:181 pidgin/gtkdialogs.c:182 pidgin/gtkdialogs.c:183
-#: pidgin/gtkdialogs.c:239
+#: ../pidgin/gtkdialogs.c:186 ../pidgin/gtkdialogs.c:187
+#: ../pidgin/gtkdialogs.c:188 ../pidgin/gtkdialogs.c:244
 msgid "Polish"
 msgstr "Polnisch"
 
-#: pidgin/gtkdialogs.c:184
+#: ../pidgin/gtkdialogs.c:189
 msgid "Portuguese"
 msgstr "Portugiesisch"
 
-#: pidgin/gtkdialogs.c:185
+#: ../pidgin/gtkdialogs.c:190
 msgid "Portuguese-Brazil"
 msgstr "Portugiesisch (Brasilien)"
 
-#: pidgin/gtkdialogs.c:186
+#: ../pidgin/gtkdialogs.c:191
 msgid "Pashto"
 msgstr "Paschtunisch"
 
-#: pidgin/gtkdialogs.c:187
+#: ../pidgin/gtkdialogs.c:192
 msgid "Romanian"
 msgstr "Rumänisch"
 
-#: pidgin/gtkdialogs.c:188 pidgin/gtkdialogs.c:240 pidgin/gtkdialogs.c:241
+#: ../pidgin/gtkdialogs.c:193 ../pidgin/gtkdialogs.c:245
+#: ../pidgin/gtkdialogs.c:246
 msgid "Russian"
 msgstr "Russisch"
 
-#: pidgin/gtkdialogs.c:189 pidgin/gtkdialogs.c:190 pidgin/gtkdialogs.c:242
-#: pidgin/gtkdialogs.c:243 pidgin/gtkdialogs.c:244
+#: ../pidgin/gtkdialogs.c:194 ../pidgin/gtkdialogs.c:195
+#: ../pidgin/gtkdialogs.c:247 ../pidgin/gtkdialogs.c:248
+#: ../pidgin/gtkdialogs.c:249
 msgid "Slovak"
 msgstr "Slowakisch"
 
-#: pidgin/gtkdialogs.c:191 pidgin/gtkdialogs.c:245
+#: ../pidgin/gtkdialogs.c:196 ../pidgin/gtkdialogs.c:250
 msgid "Slovenian"
 msgstr "Slowenisch"
 
-#: pidgin/gtkdialogs.c:192
+#: ../pidgin/gtkdialogs.c:197
 msgid "Albanian"
 msgstr "Albanisch"
 
-#: pidgin/gtkdialogs.c:193 pidgin/gtkdialogs.c:194
+#: ../pidgin/gtkdialogs.c:198 ../pidgin/gtkdialogs.c:199
 msgid "Serbian"
 msgstr "Serbisch"
 
-#: pidgin/gtkdialogs.c:195 pidgin/gtkdialogs.c:246
+#: ../pidgin/gtkdialogs.c:200 ../pidgin/gtkdialogs.c:251
 msgid "Swedish"
 msgstr "Schwedisch"
 
-#: pidgin/gtkdialogs.c:196
+#: ../pidgin/gtkdialogs.c:201
 msgid "Tamil"
 msgstr "Tamil"
 
-#: pidgin/gtkdialogs.c:197
+#: ../pidgin/gtkdialogs.c:202
 msgid "Telugu"
 msgstr "Telugu"
 
-#: pidgin/gtkdialogs.c:198
+#: ../pidgin/gtkdialogs.c:203
 msgid "Thai"
 msgstr "Thailändisch"
 
-#: pidgin/gtkdialogs.c:199 pidgin/gtkdialogs.c:247
+#: ../pidgin/gtkdialogs.c:204 ../pidgin/gtkdialogs.c:252
 msgid "Turkish"
 msgstr "Türkisch"
 
-#: pidgin/gtkdialogs.c:200
+#: ../pidgin/gtkdialogs.c:205
 msgid "Vietnamese"
 msgstr "Vietnamesisch"
 
-#: pidgin/gtkdialogs.c:200
+#: ../pidgin/gtkdialogs.c:205
 msgid "T.M.Thanh and the Gnome-Vi Team"
 msgstr "T.M.Thanh und das Gnome-Vi Team"
 
-#: pidgin/gtkdialogs.c:201 pidgin/gtkdialogs.c:248
+#: ../pidgin/gtkdialogs.c:206 ../pidgin/gtkdialogs.c:253
 msgid "Simplified Chinese"
 msgstr "Vereinfachtes Chinesisch"
 
-#: pidgin/gtkdialogs.c:202 pidgin/gtkdialogs.c:203 pidgin/gtkdialogs.c:204
+#: ../pidgin/gtkdialogs.c:207 ../pidgin/gtkdialogs.c:208
+#: ../pidgin/gtkdialogs.c:209
 msgid "Hong Kong Chinese"
 msgstr "Hong Kong Chinesisch"
 
-#: pidgin/gtkdialogs.c:205 pidgin/gtkdialogs.c:206 pidgin/gtkdialogs.c:249
+#: ../pidgin/gtkdialogs.c:210 ../pidgin/gtkdialogs.c:211
+#: ../pidgin/gtkdialogs.c:254
 msgid "Traditional Chinese"
 msgstr "Traditionelles Chinesisch"
 
-#: pidgin/gtkdialogs.c:212
+#: ../pidgin/gtkdialogs.c:217
 msgid "Amharic"
 msgstr "Amharisch"
 
-#: pidgin/gtkdialogs.c:334
+#: ../pidgin/gtkdialogs.c:339
 #, c-format
 msgid "About %s"
 msgstr "Über %s"
 
-#: pidgin/gtkdialogs.c:372
+#: ../pidgin/gtkdialogs.c:377
 #, c-format
 msgid ""
 "%s is a graphical modular messaging client based on libpurple which is "
@@ -13059,44 +13629,47 @@
 "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:387
-#, c-format
+#: ../pidgin/gtkdialogs.c:392
 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:392
+#: ../pidgin/gtkdialogs.c:397
 msgid "Current Developers"
 msgstr "Aktuelle Entwickler"
 
-#: pidgin/gtkdialogs.c:407
+#: ../pidgin/gtkdialogs.c:412
 msgid "Crazy Patch Writers"
 msgstr "Verrückte Patchschreiber"
 
-#: pidgin/gtkdialogs.c:422
+#: ../pidgin/gtkdialogs.c:427
 msgid "Retired Developers"
 msgstr "Zurückgetretene Entwickler"
 
-#: pidgin/gtkdialogs.c:437
+#: ../pidgin/gtkdialogs.c:442
+msgid "Retired Crazy Patch Writers"
+msgstr "Zurückgetretene verrückte Patchschreiber"
+
+#: ../pidgin/gtkdialogs.c:457
 msgid "Artists"
 msgstr "Künstler"
 
-#: pidgin/gtkdialogs.c:452
+#: ../pidgin/gtkdialogs.c:472
 msgid "Current Translators"
 msgstr "Aktuelle Übersetzer"
 
-#: pidgin/gtkdialogs.c:472
+#: ../pidgin/gtkdialogs.c:492
 msgid "Past Translators"
 msgstr "Frühere Übersetzer"
 
-#: pidgin/gtkdialogs.c:490
+#: ../pidgin/gtkdialogs.c:510
 msgid "Debugging Information"
 msgstr "Debugging-Information"
 
-#: pidgin/gtkdialogs.c:859
+#: ../pidgin/gtkdialogs.c:879
 msgid "Get User Info"
 msgstr "Benutzer-Info abrufen"
 
-#: pidgin/gtkdialogs.c:861
+#: ../pidgin/gtkdialogs.c:881
 msgid ""
 "Please enter the screen name or alias of the person whose info you would "
 "like to view."
@@ -13104,11 +13677,11 @@
 "Bitte geben Sie den Benutzernamen oder den Alias der Person ein, deren Info "
 "Sie sehen möchten."
 
-#: pidgin/gtkdialogs.c:951
+#: ../pidgin/gtkdialogs.c:971
 msgid "View User Log"
 msgstr "Benutzer-Mitschnitt anzeigen"
 
-#: pidgin/gtkdialogs.c:953
+#: ../pidgin/gtkdialogs.c:973
 msgid ""
 "Please enter the screen name or alias of the person whose log you would like "
 "to view."
@@ -13116,32 +13689,32 @@
 "Bitte geben Sie den Benutzernamen der Person ein, deren Mitschnitt Sie sehen "
 "möchten."
 
-#: pidgin/gtkdialogs.c:973
+#: ../pidgin/gtkdialogs.c:993
 msgid "Alias Contact"
 msgstr "Kontakt-Alias"
 
-#: pidgin/gtkdialogs.c:974
+#: ../pidgin/gtkdialogs.c:994
 msgid "Enter an alias for this contact."
 msgstr "Geben Sie einen Alias für diesen Kontakt ein."
 
-#: pidgin/gtkdialogs.c:996
+#: ../pidgin/gtkdialogs.c:1016
 #, c-format
 msgid "Enter an alias for %s."
 msgstr "Geben Sie einen Alias %s ein."
 
-#: pidgin/gtkdialogs.c:998
+#: ../pidgin/gtkdialogs.c:1018
 msgid "Alias Buddy"
 msgstr "Alias für Buddy"
 
-#: pidgin/gtkdialogs.c:1019
+#: ../pidgin/gtkdialogs.c:1039
 msgid "Alias Chat"
 msgstr "Chat-Alias"
 
-#: pidgin/gtkdialogs.c:1020
+#: ../pidgin/gtkdialogs.c:1040
 msgid "Enter an alias for this chat."
 msgstr "Geben Sie einen Alias für diesen Chat ein."
 
-#: pidgin/gtkdialogs.c:1059
+#: ../pidgin/gtkdialogs.c:1079
 #, c-format
 msgid ""
 "You are about to remove the contact containing %s and %d other buddy from "
@@ -13156,15 +13729,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:1067
+#: ../pidgin/gtkdialogs.c:1087
 msgid "Remove Contact"
 msgstr "Kontakt entfernen"
 
-#: pidgin/gtkdialogs.c:1070
+#: ../pidgin/gtkdialogs.c:1090
 msgid "_Remove Contact"
 msgstr "_Kontakt entfernen"
 
-#: pidgin/gtkdialogs.c:1101
+#: ../pidgin/gtkdialogs.c:1121
 #, c-format
 msgid ""
 "You are about to merge the group called %s into the group called %s. Do you "
@@ -13173,15 +13746,15 @@
 "Sie sind dabei, die Gruppe %s in die Gruppe %s einzufügen. Möchten Sie "
 "fortfahren?"
 
-#: pidgin/gtkdialogs.c:1108
+#: ../pidgin/gtkdialogs.c:1128
 msgid "Merge Groups"
 msgstr "Gruppe zusammenführen"
 
-#: pidgin/gtkdialogs.c:1111
+#: ../pidgin/gtkdialogs.c:1131
 msgid "_Merge Groups"
 msgstr "_Gruppen zusammenführen"
 
-#: pidgin/gtkdialogs.c:1161
+#: ../pidgin/gtkdialogs.c:1181
 #, c-format
 msgid ""
 "You are about to remove the group %s and all its members from your buddy "
@@ -13190,15 +13763,15 @@
 "Sie sind dabei, die Gruppe %s und alle darin enthaltenen Mitglieder aus "
 "Ihrer Buddy-Liste zu entfernen. Möchten Sie fortfahren?"
 
-#: pidgin/gtkdialogs.c:1164
+#: ../pidgin/gtkdialogs.c:1184
 msgid "Remove Group"
 msgstr "Gruppe entfernen"
 
-#: pidgin/gtkdialogs.c:1167
+#: ../pidgin/gtkdialogs.c:1187
 msgid "_Remove Group"
 msgstr "_Gruppe entfernen"
 
-#: pidgin/gtkdialogs.c:1200
+#: ../pidgin/gtkdialogs.c:1220
 #, c-format
 msgid ""
 "You are about to remove %s from your buddy list.  Do you want to continue?"
@@ -13206,15 +13779,15 @@
 "Sie sind dabei, %s aus Ihrer Buddy-Liste zu entfernen. Möchten Sie "
 "fortfahren?"
 
-#: pidgin/gtkdialogs.c:1203
+#: ../pidgin/gtkdialogs.c:1223
 msgid "Remove Buddy"
 msgstr "Buddy entfernen"
 
-#: pidgin/gtkdialogs.c:1206
+#: ../pidgin/gtkdialogs.c:1226
 msgid "_Remove Buddy"
 msgstr "Buddy _entfernen"
 
-#: pidgin/gtkdialogs.c:1227
+#: ../pidgin/gtkdialogs.c:1247
 #, c-format
 msgid ""
 "You are about to remove the chat %s from your buddy list.  Do you want to "
@@ -13223,166 +13796,166 @@
 "Sie sind dabei, den Chat %s aus Ihrer Buddy-Liste zu entfernen. Möchten Sie "
 "fortfahren?"
 
-#: pidgin/gtkdialogs.c:1230
+#: ../pidgin/gtkdialogs.c:1250
 msgid "Remove Chat"
 msgstr "Chat Entfernen"
 
-#: pidgin/gtkdialogs.c:1233
+#: ../pidgin/gtkdialogs.c:1253
 msgid "_Remove Chat"
 msgstr "Chat _entfernen"
 
-#: pidgin/gtkdocklet.c:150
+#: ../pidgin/gtkdocklet.c:150
 msgid "Right-click for more unread messages...\n"
 msgstr "Rechtsklicken für weitere ungelesene Nachrichten...\n"
 
-#: pidgin/gtkdocklet.c:435
+#: ../pidgin/gtkdocklet.c:435
 msgid "Change Status"
 msgstr "Ändere Status"
 
-#: pidgin/gtkdocklet.c:487
+#: ../pidgin/gtkdocklet.c:487
 msgid "Show Buddy List"
 msgstr "Buddy-Liste anzeigen"
 
-#: pidgin/gtkdocklet.c:513
+#: ../pidgin/gtkdocklet.c:513
 msgid "New Message..."
 msgstr "Neue Nachricht..."
 
-#: pidgin/gtkdocklet.c:528
+#: ../pidgin/gtkdocklet.c:528
 msgid "Mute Sounds"
 msgstr "Stummschalten"
 
-#: pidgin/gtkdocklet.c:535
+#: ../pidgin/gtkdocklet.c:535
 msgid "Blink on new message"
 msgstr "Bei neuen Nachrichten blinken"
 
-#: pidgin/gtkdocklet.c:542
+#: ../pidgin/gtkdocklet.c:542
 msgid "Quit"
 msgstr "Beenden"
 
-#: pidgin/gtkft.c:153
+#: ../pidgin/gtkft.c:153
 msgid "Not started"
 msgstr "Nicht gestartet"
 
-#: pidgin/gtkft.c:273
+#: ../pidgin/gtkft.c:273
 msgid "<b>Receiving As:</b>"
 msgstr "<b>Empfange als:</b>"
 
-#: pidgin/gtkft.c:275
+#: ../pidgin/gtkft.c:275
 msgid "<b>Receiving From:</b>"
 msgstr "<b>Empfange von:</b>"
 
-#: pidgin/gtkft.c:279
+#: ../pidgin/gtkft.c:279
 msgid "<b>Sending To:</b>"
 msgstr "<b>Sende an:</b>"
 
-#: pidgin/gtkft.c:281
+#: ../pidgin/gtkft.c:281
 msgid "<b>Sending As:</b>"
 msgstr "<b>Sende als:</b>"
 
-#: pidgin/gtkft.c:497
+#: ../pidgin/gtkft.c:497
 msgid "There is no application configured to open this type of file."
 msgstr "Es wurde kein Programm zum Öffnen dieses Dateityps konfiguriert."
 
-#: pidgin/gtkft.c:502
+#: ../pidgin/gtkft.c:502
 msgid "An error occurred while opening the file."
 msgstr "Beim Öffnen der Datei trat ein Fehler auf."
 
-#: pidgin/gtkft.c:539
+#: ../pidgin/gtkft.c:539
 #, c-format
 msgid "Error launching %s: %s"
 msgstr "Fehler beim Aufruf von %s: %s"
 
-#: pidgin/gtkft.c:548
+#: ../pidgin/gtkft.c:548
 #, c-format
 msgid "Error running %s"
 msgstr "Fehler beim Ausführen von %s"
 
-#: pidgin/gtkft.c:549
+#: ../pidgin/gtkft.c:549
 #, c-format
 msgid "Process returned error code %d"
 msgstr "Der Prozess gab den Fehlercode %d zurück"
 
-#: pidgin/gtkft.c:696
+#: ../pidgin/gtkft.c:696
 msgid "Filename:"
 msgstr "Dateiname:"
 
-#: pidgin/gtkft.c:697
+#: ../pidgin/gtkft.c:697
 msgid "Local File:"
 msgstr "Lokale Datei:"
 
-#: pidgin/gtkft.c:699
+#: ../pidgin/gtkft.c:699
 msgid "Speed:"
 msgstr "Geschwindigkeit:"
 
-#: pidgin/gtkft.c:700
+#: ../pidgin/gtkft.c:700
 msgid "Time Elapsed:"
 msgstr "Verstrichene Zeit:"
 
-#: pidgin/gtkft.c:701
+#: ../pidgin/gtkft.c:701
 msgid "Time Remaining:"
 msgstr "Verbleibende Zeit:"
 
-#: pidgin/gtkft.c:783
+#: ../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:793
+#: ../pidgin/gtkft.c:793
 msgid "C_lear finished transfers"
 msgstr "_Entferne komplette Übertragungen"
 
 #. "Download Details" arrow
-#: pidgin/gtkft.c:802
+#: ../pidgin/gtkft.c:802
 msgid "File transfer _details"
 msgstr "Dateiübertragungs-_Details"
 
 #. Pause button
-#: pidgin/gtkft.c:832 pidgin/pidginstock.c:89
+#: ../pidgin/gtkft.c:832 ../pidgin/pidginstock.c:89
 msgid "_Pause"
 msgstr "_Pause"
 
 #. Resume button
-#: pidgin/gtkft.c:842
+#: ../pidgin/gtkft.c:842
 msgid "_Resume"
 msgstr "Fo_rtsetzen"
 
-#: pidgin/gtkimhtml.c:811
+#: ../pidgin/gtkimhtml.c:815
 msgid "Paste as Plain _Text"
 msgstr "Einfügen als normaler _Text"
 
-#: pidgin/gtkimhtml.c:828
+#: ../pidgin/gtkimhtml.c:832 ../pidgin/gtkimhtmltoolbar.c:1138
 msgid "_Reset formatting"
 msgstr "Formatierung _zurücksetzen"
 
-#: pidgin/gtkimhtml.c:1368
+#: ../pidgin/gtkimhtml.c:1372
 msgid "Hyperlink color"
 msgstr "Hyperlink-Farbe"
 
-#: pidgin/gtkimhtml.c:1369
+#: ../pidgin/gtkimhtml.c:1373
 msgid "Color to draw hyperlinks."
 msgstr "Farbe zum Darstellen von Hyperlinks."
 
-#: pidgin/gtkimhtml.c:1372
+#: ../pidgin/gtkimhtml.c:1376
 msgid "Hyperlink prelight color"
 msgstr "Hyperlink-Farbe"
 
-#: pidgin/gtkimhtml.c:1373
+#: ../pidgin/gtkimhtml.c:1377
 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:1593
+#: ../pidgin/gtkimhtml.c:1597
 msgid "_Copy E-Mail Address"
 msgstr "Kopiere _E-Mail-Adresse"
 
-#: pidgin/gtkimhtml.c:1605
+#: ../pidgin/gtkimhtml.c:1609
 msgid "_Open Link in Browser"
 msgstr "Ö_ffne Link im Browser"
 
-#: pidgin/gtkimhtml.c:1615
+#: ../pidgin/gtkimhtml.c:1619
 msgid "_Copy Link Location"
 msgstr "_Kopiere den Link"
 
-#: pidgin/gtkimhtml.c:3359
+#: ../pidgin/gtkimhtml.c:3365
 msgid ""
 "<span size='larger' weight='bold'>Unrecognized file type</span>\n"
 "\n"
@@ -13392,7 +13965,7 @@
 "\n"
 "Verwende Standard (PNG)."
 
-#: pidgin/gtkimhtml.c:3362
+#: ../pidgin/gtkimhtml.c:3368
 msgid ""
 "Unrecognized file type\n"
 "\n"
@@ -13402,7 +13975,7 @@
 "\n"
 "Verwende Standard (PNG)."
 
-#: pidgin/gtkimhtml.c:3391
+#: ../pidgin/gtkimhtml.c:3397
 #, c-format
 msgid ""
 "<span size='larger' weight='bold'>Error saving image</span>\n"
@@ -13413,7 +13986,7 @@
 "\n"
 "%s"
 
-#: pidgin/gtkimhtml.c:3394
+#: ../pidgin/gtkimhtml.c:3400
 #, c-format
 msgid ""
 "Error saving image\n"
@@ -13424,36 +13997,35 @@
 "\n"
 "%s"
 
-#: pidgin/gtkimhtml.c:3472 pidgin/gtkimhtml.c:3484
+#: ../pidgin/gtkimhtml.c:3478 ../pidgin/gtkimhtml.c:3490
 msgid "Save Image"
 msgstr "Bild speichern"
 
-#: pidgin/gtkimhtml.c:3512
-#, c-format
+#: ../pidgin/gtkimhtml.c:3518
 msgid "_Save Image..."
 msgstr "Bild _speichern..."
 
-#: pidgin/gtkimhtmltoolbar.c:153
+#: ../pidgin/gtkimhtmltoolbar.c:153
 msgid "Select Font"
 msgstr "Schriftart wählen"
 
-#: pidgin/gtkimhtmltoolbar.c:232
+#: ../pidgin/gtkimhtmltoolbar.c:232
 msgid "Select Text Color"
 msgstr "Textfarbe auswählen"
 
-#: pidgin/gtkimhtmltoolbar.c:311
+#: ../pidgin/gtkimhtmltoolbar.c:311
 msgid "Select Background Color"
 msgstr "Hintergrundfarbe auswählen"
 
-#: pidgin/gtkimhtmltoolbar.c:400
+#: ../pidgin/gtkimhtmltoolbar.c:400
 msgid "_URL"
 msgstr "_URL"
 
-#: pidgin/gtkimhtmltoolbar.c:408
+#: ../pidgin/gtkimhtmltoolbar.c:408
 msgid "_Description"
 msgstr "_Beschreibung"
 
-#: pidgin/gtkimhtmltoolbar.c:411
+#: ../pidgin/gtkimhtmltoolbar.c:411
 msgid ""
 "Please enter the URL and description of the link that you want to insert. "
 "The description is optional."
@@ -13461,93 +14033,92 @@
 "Bitte geben Sie die URL und die Beschreibung des Links an, den Sie einfügen "
 "möchten. Die Beschreibung ist optional."
 
-#: pidgin/gtkimhtmltoolbar.c:415
+#: ../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:420
+#: ../pidgin/gtkimhtmltoolbar.c:420
 msgid "Insert Link"
 msgstr "Link einfügen"
 
-#: pidgin/gtkimhtmltoolbar.c:424 pidgin/gtkimhtmltoolbar.c:1155
+#: ../pidgin/gtkimhtmltoolbar.c:424 ../pidgin/gtkimhtmltoolbar.c:1207
 msgid "_Insert"
 msgstr "_Einfügen"
 
-#: pidgin/gtkimhtmltoolbar.c:493
+#: ../pidgin/gtkimhtmltoolbar.c:493
 #, c-format
 msgid "Failed to store image: %s\n"
 msgstr "Speichern des Bildes fehlgeschlagen: %s\n"
 
-#: pidgin/gtkimhtmltoolbar.c:519 pidgin/gtkimhtmltoolbar.c:529
+#: ../pidgin/gtkimhtmltoolbar.c:519 ../pidgin/gtkimhtmltoolbar.c:529
 msgid "Insert Image"
 msgstr "Bild einfügen"
 
-#: pidgin/gtkimhtmltoolbar.c:740
+#: ../pidgin/gtkimhtmltoolbar.c:740
 msgid "This theme has no available smileys."
 msgstr "Dieses Thema verfügt über keine Smileys."
 
 #. show everything
-#: pidgin/gtkimhtmltoolbar.c:757
+#: ../pidgin/gtkimhtmltoolbar.c:757
 msgid "Smile!"
 msgstr "Lächeln!"
 
-#: 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
+#: ../pidgin/gtkimhtmltoolbar.c:820 ../pidgin/gtkimhtmltoolbar.c:1164
+msgid "_Font"
+msgstr "_Schrift"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1124
+msgid "<b>_Bold</b>"
+msgstr "<b>_Fett</b>"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1125
+msgid "<i>_Italic</i>"
+msgstr "<i>_Kursiv</i>"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1126
+msgid "<u>_Underline</u>"
+msgstr "<u>_Unterstrichen</u>"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1127
+msgid "<span size='larger'>_Larger</span>"
+msgstr "<span size='larger'>_Größer</span>"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1129
 msgid "_Normal"
 msgstr "_Normal"
 
-#: pidgin/gtkimhtmltoolbar.c:1071
-msgid "_Smaller"
-msgstr "K_leiner"
-
-#: pidgin/gtkimhtmltoolbar.c:1072
+#: ../pidgin/gtkimhtmltoolbar.c:1131
+msgid "<span size='smaller'>_Smaller</span>"
+msgstr "<span size='smaller'>_Kleiner</span>"
+
+#. If we want to show the formatting for the following items, we would
+#. * need to update them when formatting changes. The above items don't need
+#. * no updating nor nothin'
+#: ../pidgin/gtkimhtmltoolbar.c:1135
 msgid "_Font face"
 msgstr "_Schriftart"
 
-#: pidgin/gtkimhtmltoolbar.c:1073
-msgid "_Foreground color"
+#: ../pidgin/gtkimhtmltoolbar.c:1136
+msgid "Foreground _color"
 msgstr "_Vordergrundfarbe"
 
-#: pidgin/gtkimhtmltoolbar.c:1074
-msgid "_Background color"
+#: ../pidgin/gtkimhtmltoolbar.c:1137
+msgid "Bac_kground 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
+#: ../pidgin/gtkimhtmltoolbar.c:1215
 msgid "_Smiley"
 msgstr "_Smiley"
 
-#: pidgin/gtkimhtmltoolbar.c:1168
+#: ../pidgin/gtkimhtmltoolbar.c:1221
 msgid "_Image"
 msgstr "_Bild"
 
-#: pidgin/gtkimhtmltoolbar.c:1174
+#: ../pidgin/gtkimhtmltoolbar.c:1227
 msgid "_Link"
 msgstr "_Link"
 
-#: pidgin/gtklog.c:292
+#: ../pidgin/gtklog.c:292
 #, c-format
 msgid ""
 "Are you sure you want to permanently delete the log of the conversation with "
@@ -13556,7 +14127,7 @@
 "Wollen Sie wirklich den Mitschnitt der Unterhaltung mit %s, gestartet am %s, "
 "permanent löschen?"
 
-#: pidgin/gtklog.c:303
+#: ../pidgin/gtklog.c:303
 #, c-format
 msgid ""
 "Are you sure you want to permanently delete the log of the conversation in %"
@@ -13565,7 +14136,7 @@
 "Wollen Sie wirklich den Mitschnitt der Unterhaltung in %s, gestartet am %s, "
 "permanent löschen?"
 
-#: pidgin/gtklog.c:308
+#: ../pidgin/gtklog.c:308
 #, c-format
 msgid ""
 "Are you sure you want to permanently delete the system log which started at %"
@@ -13574,21 +14145,21 @@
 "Wollen Sie wirklich den System-Mitschnitt, gestartet am %s, permanent "
 "löschen?"
 
-#: pidgin/gtklog.c:452
+#: ../pidgin/gtklog.c:452
 #, c-format
 msgid "<span size='larger' weight='bold'>Conversation in %s on %s</span>"
 msgstr "<span size='larger' weight='bold'>Unterhaltung mit %s am %s</span>"
 
-#: pidgin/gtklog.c:455
+#: ../pidgin/gtklog.c:455
 #, c-format
 msgid "<span size='larger' weight='bold'>Conversation with %s on %s</span>"
 msgstr "<span size='larger' weight='bold'>Unterhaltung mit %s am %s</span>"
 
-#: pidgin/gtklog.c:502
+#: ../pidgin/gtklog.c:502
 msgid "%B %Y"
 msgstr "%B %Y"
 
-#: pidgin/gtklog.c:549
+#: ../pidgin/gtklog.c:549
 msgid ""
 "System events will only be logged if the \"Log all status changes to system "
 "log\" preference is enabled."
@@ -13596,7 +14167,7 @@
 "Systemereignisse werden nur mitgeschnitten, wenn die Option „Schneide alle "
 "Statusveränderungen im System-Mitschnitt mit“ aktiviert ist."
 
-#: pidgin/gtklog.c:553
+#: ../pidgin/gtklog.c:553
 msgid ""
 "Instant messages will only be logged if the \"Log all instant messages\" "
 "preference is enabled."
@@ -13604,46 +14175,46 @@
 "Sofortnachrichten werden nur mitgeschnitten, wenn die Option „Alle "
 "Sofortnachrichten mitschneiden“ aktiviert ist."
 
-#: pidgin/gtklog.c:556
+#: ../pidgin/gtklog.c:556
 msgid ""
 "Chats will only be logged if the \"Log all chats\" preference is enabled."
 msgstr ""
 "Chats werden nur mitgeschnitten, wenn die Option „Alle Chats mitschneiden“ "
 "aktiviert ist."
 
-#: pidgin/gtklog.c:560
+#: ../pidgin/gtklog.c:560
 msgid "No logs were found"
 msgstr "Keine Mitschnitte gefunden"
 
 #. Steal the "HELP" response and use it to trigger browsing to the logs folder
-#: pidgin/gtklog.c:575
+#: ../pidgin/gtklog.c:575
 msgid "_Browse logs folder"
 msgstr "_Mitschnitt-Ordner anschauen"
 
-#: pidgin/gtklog.c:639
+#: ../pidgin/gtklog.c:639
 msgid "Total log size:"
 msgstr "Gesamte Mitschnittgröße:"
 
-#: pidgin/gtklog.c:708
+#: ../pidgin/gtklog.c:708
 #, c-format
 msgid "Conversations in %s"
 msgstr "Unterhaltung in %s"
 
-#: pidgin/gtklog.c:716 pidgin/gtklog.c:778
+#: ../pidgin/gtklog.c:716 ../pidgin/gtklog.c:778
 #, c-format
 msgid "Conversations with %s"
 msgstr "Unterhaltung mit %s"
 
-#: pidgin/gtklog.c:803
+#: ../pidgin/gtklog.c:803
 msgid "System Log"
 msgstr "System-Mitschnitt"
 
-#: pidgin/gtkmain.c:385
+#: ../pidgin/gtkmain.c:386
 #, 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:387
+#: ../pidgin/gtkmain.c:388
 #, c-format
 msgid ""
 "%s %s\n"
@@ -13671,7 +14242,7 @@
 "                      sollen, getrennt durch Kommata)\n"
 "  -v, --version       zeigt aktuelle Version und beendet das Programm\n"
 
-#: pidgin/gtkmain.c:511
+#: ../pidgin/gtkmain.c:512
 #, c-format
 msgid ""
 "%s has segfaulted and attempted to dump a core file.\n"
@@ -13713,66 +14284,66 @@
 
 #. Translators may want to transliterate the name.
 #. It is not to be translated.
-#: pidgin/gtkmain.c:697 pidgin/pidgin.h:50
+#: ../pidgin/gtkmain.c:699 ../pidgin/pidgin.h:50
 msgid "Pidgin"
 msgstr "Pidgin"
 
-#: pidgin/gtknotify.c:343
+#: ../pidgin/gtknotify.c:344
 msgid "Open All Messages"
 msgstr "Alle Nachrichten öffnen"
 
-#: pidgin/gtknotify.c:395
+#: ../pidgin/gtknotify.c:396
 msgid "<span weight=\"bold\" size=\"larger\">You have mail!</span>"
 msgstr "<span weight=\"bold\" size=\"larger\">Sie haben Post!</span>"
 
-#: pidgin/gtknotify.c:515
+#: ../pidgin/gtknotify.c:516
 #, c-format
 msgid "%s has %d new message."
 msgid_plural "%s has %d new messages."
 msgstr[0] "%s hat %d neue Nachricht."
 msgstr[1] "%s hat %d neue Nachrichten."
 
-#: pidgin/gtknotify.c:526
+#: ../pidgin/gtknotify.c:527
 #, c-format
 msgid "<b>You have %d new e-mail.</b>"
 msgid_plural "<b>You have %d new e-mails.</b>"
 msgstr[0] "<b>Sie haben %d neue E-Mail.</b>"
 msgstr[1] "<b>Sie haben %d neue E-Mails.</b>"
 
-#: pidgin/gtknotify.c:964
+#: ../pidgin/gtknotify.c:967
 #, c-format
 msgid "The browser command \"%s\" is invalid."
 msgstr "Das Browser-Kommando „%s“ ist falsch."
 
-#: pidgin/gtknotify.c:966 pidgin/gtknotify.c:978 pidgin/gtknotify.c:991
-#: pidgin/gtknotify.c:1119
+#: ../pidgin/gtknotify.c:969 ../pidgin/gtknotify.c:981
+#: ../pidgin/gtknotify.c:994 ../pidgin/gtknotify.c:1122
 msgid "Unable to open URL"
 msgstr "Kann die URL nicht öffnen"
 
-#: pidgin/gtknotify.c:976 pidgin/gtknotify.c:989
+#: ../pidgin/gtknotify.c:979 ../pidgin/gtknotify.c:992
 #, c-format
 msgid "Error launching \"%s\": %s"
 msgstr "Fehler beim Aufruf von „%s“: %s"
 
-#: pidgin/gtknotify.c:1120
+#: ../pidgin/gtknotify.c:1123
 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
+#: ../pidgin/gtkplugin.c:264
 msgid "The following plugins will be unloaded."
 msgstr "Die folgenden Plugins werden entladen."
 
-#: pidgin/gtkplugin.c:283
+#: ../pidgin/gtkplugin.c:283
 msgid "Multiple plugins will be unloaded."
 msgstr "Mehrere Plugins werden entladen."
 
-#: pidgin/gtkplugin.c:287
+#: ../pidgin/gtkplugin.c:287
 msgid "Unload Plugins"
 msgstr "Plugins entladen"
 
-#: pidgin/gtkplugin.c:399
+#: ../pidgin/gtkplugin.c:399
 #, c-format
 msgid ""
 "%s%s<span weight=\"bold\">Written by:</span>\t%s\n"
@@ -13783,7 +14354,7 @@
 "<span weight=\"bold\">Webseite: </span>\t\t%s\n"
 "<span weight=\"bold\">Dateiname:</span>\t\t%s"
 
-#: pidgin/gtkplugin.c:409
+#: ../pidgin/gtkplugin.c:409
 #, c-format
 msgid ""
 "%s\n"
@@ -13794,124 +14365,125 @@
 "<span foreground=\"#ff0000\" weight=\"bold\">Fehler: %s\n"
 "Überprüfen Sie die Website des Plugins auf eine neue Version.</span>"
 
-#: pidgin/gtkplugin.c:535
+#: ../pidgin/gtkplugin.c:535
 msgid "Configure Pl_ugin"
 msgstr "Pl_ugin konfigurieren"
 
-#: pidgin/gtkplugin.c:598
+#: ../pidgin/gtkplugin.c:598
 msgid "<b>Plugin Details</b>"
 msgstr "<b>Plugin-Details</b>"
 
-#: pidgin/gtkpounce.c:156
+#: ../pidgin/gtkpounce.c:156
 msgid "Select a file"
 msgstr "Wählen Sie eine Datei"
 
 #. Create the "Pounce on Whom" frame.
-#: pidgin/gtkpounce.c:533
+#: ../pidgin/gtkpounce.c:533
 msgid "Pounce on Whom"
 msgstr "Bei wem alarmieren"
 
-#: pidgin/gtkpounce.c:560
+#: ../pidgin/gtkpounce.c:560
 msgid "_Buddy name:"
 msgstr "_Buddy-Name:"
 
-#: pidgin/gtkpounce.c:594
+#: ../pidgin/gtkpounce.c:594
 msgid "Si_gns on"
 msgstr "_sich anmeldet"
 
-#: pidgin/gtkpounce.c:596
+#: ../pidgin/gtkpounce.c:596
 msgid "Signs o_ff"
 msgstr "sich abmel_det"
 
-#: pidgin/gtkpounce.c:598
+#: ../pidgin/gtkpounce.c:598
 msgid "Goes a_way"
 msgstr "_hinausgeht"
 
-#: pidgin/gtkpounce.c:600
+#: ../pidgin/gtkpounce.c:600
 msgid "Ret_urns from away"
 msgstr "wi_eder anwesend ist"
 
-#: pidgin/gtkpounce.c:602
+#: ../pidgin/gtkpounce.c:602
 msgid "Becomes _idle"
 msgstr "_untätig wird"
 
-#: pidgin/gtkpounce.c:604
+#: ../pidgin/gtkpounce.c:604
 msgid "Is no longer i_dle"
 msgstr "nicht meh_r untätig ist"
 
-#: pidgin/gtkpounce.c:606
+#: ../pidgin/gtkpounce.c:606
 msgid "Starts _typing"
 msgstr "zu _tippen beginnt"
 
-#: pidgin/gtkpounce.c:608
+#: ../pidgin/gtkpounce.c:608
 msgid "P_auses while typing"
 msgstr "beim Tippen an_hält"
 
-#: pidgin/gtkpounce.c:610
+#: ../pidgin/gtkpounce.c:610
 msgid "Stops t_yping"
 msgstr "aufhört _zu tippen"
 
-#: pidgin/gtkpounce.c:612
+#: ../pidgin/gtkpounce.c:612
 msgid "Sends a _message"
 msgstr "eine _Nachricht sendet"
 
-#: pidgin/gtkpounce.c:655
+#: ../pidgin/gtkpounce.c:655
 msgid "Ope_n an IM window"
 msgstr "Gesprächsfenster ö_ffnen"
 
-#: pidgin/gtkpounce.c:657
+#: ../pidgin/gtkpounce.c:657
 msgid "_Pop up a notification"
 msgstr "_Popup-Benachrichtigung"
 
-#: pidgin/gtkpounce.c:659
+#: ../pidgin/gtkpounce.c:659
 msgid "Send a _message"
 msgstr "_Nachricht senden"
 
-#: pidgin/gtkpounce.c:661
+#: ../pidgin/gtkpounce.c:661
 msgid "E_xecute a command"
 msgstr "Befeh_l ausführen"
 
-#: pidgin/gtkpounce.c:663
+#: ../pidgin/gtkpounce.c:663
 msgid "P_lay a sound"
 msgstr "einen _Klang abspielen"
 
-#: pidgin/gtkpounce.c:669
+#: ../pidgin/gtkpounce.c:669
 msgid "Brows_e..."
 msgstr "Aus_wählen..."
 
-#: pidgin/gtkpounce.c:671
+#: ../pidgin/gtkpounce.c:671
 msgid "Br_owse..."
 msgstr "Aus_wählen..."
 
-#: pidgin/gtkpounce.c:672
+#: ../pidgin/gtkpounce.c:672
 msgid "Pre_view"
 msgstr "_Vorschau"
 
-#: pidgin/gtkpounce.c:799
+#: ../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:804
+#: ../pidgin/gtkpounce.c:804
 msgid "_Recurring"
 msgstr "_Wiederkehrend"
 
-#: pidgin/gtkpounce.c:1260
+#: ../pidgin/gtkpounce.c:1260
 msgid "Pounce Target"
 msgstr "Alarm-Ziel"
 
-#: pidgin/gtkprefs.c:385 pidgin/pixmaps/emotes/default/22/default.theme.in.h:1
+#: ../pidgin/gtkprefs.c:385
+#: ../pidgin/pixmaps/emotes/default/22/default.theme.in.h:1
 msgid "Default"
 msgstr "Standard"
 
-#: pidgin/gtkprefs.c:516
+#: ../pidgin/gtkprefs.c:516
 msgid "Smiley theme failed to unpack."
 msgstr "Smiley-Thema konnte nicht entpackt werden."
 
-#: pidgin/gtkprefs.c:643
+#: ../pidgin/gtkprefs.c:643
 msgid "Install Theme"
 msgstr "Thema installieren"
 
-#: pidgin/gtkprefs.c:696
+#: ../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."
@@ -13919,134 +14491,132 @@
 "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:731
+#: ../pidgin/gtkprefs.c:731
 msgid "Icon"
 msgstr "Icon"
 
-#: pidgin/gtkprefs.c:893
+#: ../pidgin/gtkprefs.c:893
 msgid "System Tray Icon"
 msgstr "Kontrollleisten-Icon"
 
-#: pidgin/gtkprefs.c:894
+#: ../pidgin/gtkprefs.c:894
 msgid "_Show system tray icon:"
 msgstr "Kontrollleisten-Icon _anzeigen:"
 
-#: 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:898
+#: ../pidgin/gtkprefs.c:898
 msgid "On unread messages"
 msgstr "Bei ungelesenen Nachrichten"
 
-#: pidgin/gtkprefs.c:903
+#: ../pidgin/gtkprefs.c:903
 msgid "Conversation Window Hiding"
 msgstr "Gesprächsfenster verstecken"
 
-#: pidgin/gtkprefs.c:904
+#: ../pidgin/gtkprefs.c:904
 msgid "_Hide new IM conversations:"
 msgstr "_Neue IM-Gespräche verstecken:"
 
-#: pidgin/gtkprefs.c:907 pidgin/gtkprefs.c:1937
+#: ../pidgin/gtkprefs.c:907 ../pidgin/gtkprefs.c:1939
 msgid "When away"
 msgstr "Bei Abwesenheit"
 
 #. All the tab options!
-#: pidgin/gtkprefs.c:915
+#: ../pidgin/gtkprefs.c:915
 msgid "Tabs"
 msgstr "Reiter"
 
-#: pidgin/gtkprefs.c:917
+#: ../pidgin/gtkprefs.c:917
 msgid "Show IMs and chats in _tabbed windows"
 msgstr "IMs und Chats in _Reiter-Fenstern anzeigen"
 
-#: pidgin/gtkprefs.c:931
+#: ../pidgin/gtkprefs.c:931
 msgid "Show close b_utton on tabs"
 msgstr "_Beenden-Button in Reitern zeigen"
 
-#: pidgin/gtkprefs.c:934
+#: ../pidgin/gtkprefs.c:934
 msgid "_Placement:"
 msgstr "_Platzierung:"
 
-#: pidgin/gtkprefs.c:936
+#: ../pidgin/gtkprefs.c:936
 msgid "Top"
 msgstr "Oben"
 
-#: pidgin/gtkprefs.c:937
+#: ../pidgin/gtkprefs.c:937
 msgid "Bottom"
 msgstr "Unten"
 
-#: pidgin/gtkprefs.c:938
+#: ../pidgin/gtkprefs.c:938
 msgid "Left"
 msgstr "Links"
 
-#: pidgin/gtkprefs.c:939
+#: ../pidgin/gtkprefs.c:939
 msgid "Right"
 msgstr "Rechts"
 
-#: pidgin/gtkprefs.c:941
+#: ../pidgin/gtkprefs.c:941
 msgid "Left Vertical"
 msgstr "Links vertikal"
 
-#: pidgin/gtkprefs.c:942
+#: ../pidgin/gtkprefs.c:942
 msgid "Right Vertical"
 msgstr "Rechts vertikal"
 
-#: pidgin/gtkprefs.c:949
+#: ../pidgin/gtkprefs.c:949
 msgid "N_ew conversations:"
 msgstr "N_eue Unterhaltungen:"
 
-#: pidgin/gtkprefs.c:994
+#: ../pidgin/gtkprefs.c:994
 msgid "Show _formatting on incoming messages"
 msgstr "Zeige _Formatierung bei ankommenden Nachrichten"
 
-#: pidgin/gtkprefs.c:999
+#: ../pidgin/gtkprefs.c:997
+msgid "Show _detailed information"
+msgstr "_Detaillierte Informationen anzeigen"
+
+#: ../pidgin/gtkprefs.c:999
 msgid "Enable buddy ic_on animation"
-msgstr "Buddy-Icon-_Animation aktivieren"
-
-#: pidgin/gtkprefs.c:1006
+msgstr "Buddy-Ic_on-Animation aktivieren"
+
+#: ../pidgin/gtkprefs.c:1006
 msgid "_Notify buddies that you are typing to them"
 msgstr "Buddys be_nachrichtigen, dass Sie ihnen schreiben"
 
-#: pidgin/gtkprefs.c:1009
+#: ../pidgin/gtkprefs.c:1009
 msgid "Highlight _misspelled words"
 msgstr "_Falsch geschriebene Wörter hervorheben"
 
-#: pidgin/gtkprefs.c:1013
+#: ../pidgin/gtkprefs.c:1013
 msgid "Use smooth-scrolling"
 msgstr "Weiches Scrollen aktivieren"
 
-#: pidgin/gtkprefs.c:1016
+#: ../pidgin/gtkprefs.c:1016
 msgid "F_lash window when IMs are received"
-msgstr "_Fenster blinkt, wenn Nachrichten empfangen werden"
-
-#: pidgin/gtkprefs.c:1018
+msgstr "Fenster b_linkt, wenn Nachrichten empfangen werden"
+
+#: ../pidgin/gtkprefs.c:1018
 msgid "Minimi_ze new conversation windows"
 msgstr "Neue Gesprächsfenster mi_nimieren"
 
-#: pidgin/gtkprefs.c:1022
+#: ../pidgin/gtkprefs.c:1022
 msgid "Font"
 msgstr "Schriftart"
 
-#: pidgin/gtkprefs.c:1024
+#: ../pidgin/gtkprefs.c:1024
 msgid "Use document font from _theme"
 msgstr "Benutze Dokumentenschriftart des _Themas"
 
-#: pidgin/gtkprefs.c:1026
+#: ../pidgin/gtkprefs.c:1026
 msgid "Use font from _theme"
 msgstr "Benutze Schriftart des _Themas"
 
-#: pidgin/gtkprefs.c:1028
+#: ../pidgin/gtkprefs.c:1028
 msgid "Conversation _font:"
 msgstr "Gesprächsschri_ftart:"
 
-#: pidgin/gtkprefs.c:1041
+#: ../pidgin/gtkprefs.c:1041
 msgid "Default Formatting"
 msgstr "Standard-Formatierung"
 
-#: pidgin/gtkprefs.c:1057
+#: ../pidgin/gtkprefs.c:1059
 msgid ""
 "This is how your outgoing message text will appear when you use protocols "
 "that support formatting."
@@ -14054,119 +14624,119 @@
 "So wird der ausgehende Nachrichtentext aussehen, wenn Sie "
 "Protokollebenutzen, die Formatierung unterstützen."
 
-#: pidgin/gtkprefs.c:1123
+#: ../pidgin/gtkprefs.c:1125
 msgid "ST_UN server:"
 msgstr "ST_UN Server:"
 
-#: pidgin/gtkprefs.c:1135
+#: ../pidgin/gtkprefs.c:1137
 msgid "<span style=\"italic\">Example: stunserver.org</span>"
 msgstr "<span style=\"italic\">Beispiel: stunserver.org</span>"
 
-#: pidgin/gtkprefs.c:1139
+#: ../pidgin/gtkprefs.c:1141
 msgid "_Autodetect IP address"
 msgstr "IP-Adresse _automatisch erkennen"
 
-#: pidgin/gtkprefs.c:1148
+#: ../pidgin/gtkprefs.c:1150
 msgid "Public _IP:"
 msgstr "Öffentliche _IP:"
 
-#: pidgin/gtkprefs.c:1177
+#: ../pidgin/gtkprefs.c:1179
 msgid "Ports"
 msgstr "Ports"
 
-#: pidgin/gtkprefs.c:1180
+#: ../pidgin/gtkprefs.c:1182
 msgid "_Manually specify range of ports to listen on"
 msgstr "Port-Bereich, auf dem gehört werden soll, _manuell bestimmen"
 
-#: pidgin/gtkprefs.c:1183
+#: ../pidgin/gtkprefs.c:1185
 msgid "_Start port:"
 msgstr "_Start-Port:"
 
-#: pidgin/gtkprefs.c:1190
+#: ../pidgin/gtkprefs.c:1192
 msgid "_End port:"
 msgstr "_End-Port:"
 
-#: pidgin/gtkprefs.c:1198
+#: ../pidgin/gtkprefs.c:1200
 msgid "Proxy Server"
 msgstr "Proxy-Server"
 
-#: pidgin/gtkprefs.c:1202
+#: ../pidgin/gtkprefs.c:1204
 msgid "No proxy"
 msgstr "Kein Proxy"
 
-#: pidgin/gtkprefs.c:1258
+#: ../pidgin/gtkprefs.c:1260
 msgid "_User:"
 msgstr "_Benutzer:"
 
-#: pidgin/gtkprefs.c:1323
+#: ../pidgin/gtkprefs.c:1325
 msgid "Seamonkey"
 msgstr "Seamonkey"
 
-#: pidgin/gtkprefs.c:1324
+#: ../pidgin/gtkprefs.c:1326
 msgid "Opera"
 msgstr "Opera"
 
-#: pidgin/gtkprefs.c:1325
+#: ../pidgin/gtkprefs.c:1327
 msgid "Netscape"
 msgstr "Netscape"
 
-#: pidgin/gtkprefs.c:1326
+#: ../pidgin/gtkprefs.c:1328
 msgid "Mozilla"
 msgstr "Mozilla"
 
-#: pidgin/gtkprefs.c:1327
+#: ../pidgin/gtkprefs.c:1329
 msgid "Konqueror"
 msgstr "Konqueror"
 
-#: pidgin/gtkprefs.c:1328
+#: ../pidgin/gtkprefs.c:1330
 msgid "GNOME Default"
 msgstr "GNOME-Standard"
 
-#: pidgin/gtkprefs.c:1329
+#: ../pidgin/gtkprefs.c:1331
 msgid "Galeon"
 msgstr "Galeon"
 
-#: pidgin/gtkprefs.c:1330
+#: ../pidgin/gtkprefs.c:1332
 msgid "Firefox"
 msgstr "Firefox"
 
-#: pidgin/gtkprefs.c:1331
+#: ../pidgin/gtkprefs.c:1333
 msgid "Firebird"
 msgstr "Firebird"
 
-#: pidgin/gtkprefs.c:1332
+#: ../pidgin/gtkprefs.c:1334
 msgid "Epiphany"
 msgstr "Epiphany"
 
-#: pidgin/gtkprefs.c:1341
+#: ../pidgin/gtkprefs.c:1343
 msgid "Manual"
 msgstr "Manuell"
 
-#: pidgin/gtkprefs.c:1394
+#: ../pidgin/gtkprefs.c:1396
 msgid "Browser Selection"
 msgstr "Browserauswahl"
 
-#: pidgin/gtkprefs.c:1398
+#: ../pidgin/gtkprefs.c:1400
 msgid "_Browser:"
 msgstr "_Browser:"
 
-#: pidgin/gtkprefs.c:1406
+#: ../pidgin/gtkprefs.c:1408
 msgid "_Open link in:"
 msgstr "Ö_ffne Link in:"
 
-#: pidgin/gtkprefs.c:1408
+#: ../pidgin/gtkprefs.c:1410
 msgid "Browser default"
 msgstr "Standard-Browser"
 
-#: pidgin/gtkprefs.c:1409
+#: ../pidgin/gtkprefs.c:1411
 msgid "Existing window"
 msgstr "Existierendes Fenster"
 
-#: pidgin/gtkprefs.c:1411
+#: ../pidgin/gtkprefs.c:1413
 msgid "New tab"
 msgstr "Neuer Reiter"
 
-#: pidgin/gtkprefs.c:1425
+#: ../pidgin/gtkprefs.c:1427
 #, c-format
 msgid ""
 "_Manual:\n"
@@ -14175,447 +14745,341 @@
 "_Manuell:\n"
 "(%s für die URL)"
 
-#: pidgin/gtkprefs.c:1465
+#: ../pidgin/gtkprefs.c:1467
 msgid "Log _format:"
 msgstr "Mitschnitt-_Format:"
 
-#: pidgin/gtkprefs.c:1470
+#: ../pidgin/gtkprefs.c:1472
 msgid "Log all _instant messages"
 msgstr "_Schneide alle Sofortnachrichten mit"
 
-#: pidgin/gtkprefs.c:1472
+#: ../pidgin/gtkprefs.c:1474
 msgid "Log all c_hats"
 msgstr "Alle C_hats mitschneiden"
 
-#: pidgin/gtkprefs.c:1474
+#: ../pidgin/gtkprefs.c:1476
 msgid "Log all _status changes to system log"
 msgstr "Schneide alle _Statusveränderungen im System-Mitschnitt mit"
 
-#: pidgin/gtkprefs.c:1582 pidgin/gtkprefs.c:1671 pidgin/gtkprefs.c:1865
-msgid "(default)"
-msgstr "(Standard)"
-
-#: pidgin/gtkprefs.c:1620
+#: ../pidgin/gtkprefs.c:1622
 msgid "Sound Selection"
-msgstr "Sound-Auswahl"
-
-#: pidgin/gtkprefs.c:1630
-#, c-format
+msgstr "Klang-Auswahl"
+
+#: ../pidgin/gtkprefs.c:1632
 msgid "Quietest"
 msgstr "Am leisesten"
 
-#: pidgin/gtkprefs.c:1632
-#, c-format
+#: ../pidgin/gtkprefs.c:1634
 msgid "Quieter"
 msgstr "Leiser"
 
-#: pidgin/gtkprefs.c:1634
-#, c-format
+#: ../pidgin/gtkprefs.c:1636
 msgid "Quiet"
 msgstr "Leise"
 
-#: pidgin/gtkprefs.c:1638
-#, c-format
+#: ../pidgin/gtkprefs.c:1640
 msgid "Loud"
 msgstr "Laut"
 
-#: pidgin/gtkprefs.c:1640
-#, c-format
+#: ../pidgin/gtkprefs.c:1642
 msgid "Louder"
 msgstr "Lauter"
 
-#: pidgin/gtkprefs.c:1642
-#, c-format
+#: ../pidgin/gtkprefs.c:1644
 msgid "Loudest"
 msgstr "Am lautesten"
 
-#: pidgin/gtkprefs.c:1705
-msgid "Sound Method"
-msgstr "Sound-Ausgabesystem"
-
-#: pidgin/gtkprefs.c:1706
+#: ../pidgin/gtkprefs.c:1708
 msgid "_Method:"
 msgstr "_Methode:"
 
-#: pidgin/gtkprefs.c:1708
+#: ../pidgin/gtkprefs.c:1710
 msgid "Console beep"
 msgstr "Konsolen-Lautsprecher"
 
-#: pidgin/gtkprefs.c:1710
-msgid "Automatic"
-msgstr "Automatisch"
-
-#: pidgin/gtkprefs.c:1714
-msgid "Command"
-msgstr "Kommando"
-
-#: pidgin/gtkprefs.c:1715
+#: ../pidgin/gtkprefs.c:1717
 msgid "No sounds"
 msgstr "Keine Klänge"
 
-#: pidgin/gtkprefs.c:1723
+#: ../pidgin/gtkprefs.c:1725
 #, c-format
 msgid ""
 "Sound c_ommand:\n"
 "(%s for filename)"
 msgstr ""
-"Sound-_Abspielbefehl:\n"
+"Klang-_Abspielbefehl:\n"
 "(%s für den Dateinamen)"
 
-#: pidgin/gtkprefs.c:1749
-msgid "Sound Options"
-msgstr "Sound-Einstellungen"
-
-#: pidgin/gtkprefs.c:1750
+#: ../pidgin/gtkprefs.c:1752
 msgid "Sounds when conversation has _focus"
 msgstr "Klang, wenn das Gespräch den _Fokus hat"
 
-#: pidgin/gtkprefs.c:1752
+#: ../pidgin/gtkprefs.c:1754
 msgid "Enable sounds:"
 msgstr "Klänge aktivieren:"
 
-#: pidgin/gtkprefs.c:1754
-msgid "Only when available"
-msgstr "Nur wenn anwesend"
-
-#: pidgin/gtkprefs.c:1755
-msgid "Only when not available"
-msgstr "Nur wenn nicht verfügbar"
-
-#: pidgin/gtkprefs.c:1763
+#: ../pidgin/gtkprefs.c:1765
 msgid "Volume:"
 msgstr "Lautstärke:"
 
-#: pidgin/gtkprefs.c:1791
-msgid "Sound Events"
-msgstr "Sound-Ereignisse"
-
-#: pidgin/gtkprefs.c:1843
+#: ../pidgin/gtkprefs.c:1845
 msgid "Play"
 msgstr "Abspielen"
 
-#: pidgin/gtkprefs.c:1850
-msgid "Event"
-msgstr "Ereignis"
-
-#: pidgin/gtkprefs.c:1869
-msgid "Test"
-msgstr "Testen"
-
-#: pidgin/gtkprefs.c:1873
-msgid "Reset"
-msgstr "Zurücksetzen"
-
-#: pidgin/gtkprefs.c:1877
-msgid "Choose..."
-msgstr "Auswählen..."
-
-#: pidgin/gtkprefs.c:1920
+#: ../pidgin/gtkprefs.c:1922
 msgid "_Report idle time:"
 msgstr "Inaktivitätszei_ten anzeigen:"
 
-#: pidgin/gtkprefs.c:1925
+#: ../pidgin/gtkprefs.c:1927
 msgid "Based on keyboard or mouse use"
 msgstr "Abhängig von Tastatur- oder Mausbenutzung"
 
-#: pidgin/gtkprefs.c:1934
+#: ../pidgin/gtkprefs.c:1936
 msgid "_Auto-reply:"
 msgstr "A_utomatische Antwort:"
 
-#: pidgin/gtkprefs.c:1938
+#: ../pidgin/gtkprefs.c:1940
 msgid "When both away and idle"
 msgstr "Wenn abwesend und untätig"
 
 #. Auto-away stuff
-#: pidgin/gtkprefs.c:1944
+#: ../pidgin/gtkprefs.c:1946
 msgid "Auto-away"
 msgstr "Automatisch abwesend"
 
-#: pidgin/gtkprefs.c:1946
+#: ../pidgin/gtkprefs.c:1948
 msgid "Change status when _idle"
 msgstr "Ändere Status, wenn _inaktiv"
 
-#: pidgin/gtkprefs.c:1950
-msgid "_Minutes before changing status:"
+#: ../pidgin/gtkprefs.c:1952
+msgid "_Minutes before becoming idle:"
 msgstr "_Minuten, bevor auf abwesend gesetzt wird:"
 
-#: pidgin/gtkprefs.c:1958
+#: ../pidgin/gtkprefs.c:1960
 msgid "Change _status to:"
 msgstr "Ändere _Status zu:"
 
 #
 #. Signon status stuff
-#: pidgin/gtkprefs.c:1979
+#: ../pidgin/gtkprefs.c:1981
 msgid "Status at Startup"
 msgstr "Status beim Start"
 
-#: pidgin/gtkprefs.c:1981
+#: ../pidgin/gtkprefs.c:1983
 msgid "Use status from last _exit at startup"
 msgstr "Status beim Neu_start wiederherstellen"
 
-#: pidgin/gtkprefs.c:1987
+#: ../pidgin/gtkprefs.c:1989
 msgid "Status to a_pply at startup:"
 msgstr "Beim Starten folgenden Status _benutzen:"
 
-#: pidgin/gtkprefs.c:2025
+#: ../pidgin/gtkprefs.c:2027
 msgid "Interface"
 msgstr "Schnittstelle"
 
-#: pidgin/gtkprefs.c:2027
+#: ../pidgin/gtkprefs.c:2029
 msgid "Smiley Themes"
 msgstr "Smiley-Themen"
 
-#: pidgin/gtkprefs.c:2028
-msgid "Sounds"
-msgstr "Klänge"
-
-#: pidgin/gtkprefs.c:2034
+#: ../pidgin/gtkprefs.c:2036
 msgid "Browser"
 msgstr "Browser"
 
-#: pidgin/gtkprefs.c:2038
+#: ../pidgin/gtkprefs.c:2040
 msgid "Status / Idle"
 msgstr "Status / Untätig"
 
-#: pidgin/gtkprivacy.c:79
+#: ../pidgin/gtkprivacy.c:79
 msgid "Allow all users to contact me"
 msgstr "Allen Benutzern erlauben, mich zu kontaktieren"
 
-#: pidgin/gtkprivacy.c:80
+#: ../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"
 
-#: pidgin/gtkprivacy.c:81
+#: ../pidgin/gtkprivacy.c:81
 msgid "Allow only the users below"
 msgstr "Erlaube nur den untenstehenden Benutzern mir Nachrichten zu senden"
 
-#: pidgin/gtkprivacy.c:82
+#: ../pidgin/gtkprivacy.c:82
 msgid "Block all users"
 msgstr "Blockiere alle Benutzer"
 
-#: pidgin/gtkprivacy.c:83
+#: ../pidgin/gtkprivacy.c:83
 msgid "Block only the users below"
 msgstr "Blockiere nur die untenstehenden Benutzer"
 
-#: pidgin/gtkprivacy.c:369
+#: ../pidgin/gtkprivacy.c:369
 msgid "Privacy"
 msgstr "Privatsphäre"
 
-#: pidgin/gtkprivacy.c:381
+#: ../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:393
+#: ../pidgin/gtkprivacy.c:393
 msgid "Set privacy for:"
 msgstr "Setze Privatsphäre für:"
 
-#: pidgin/gtkprivacy.c:556 pidgin/gtkprivacy.c:573
+#: ../pidgin/gtkprivacy.c:556 ../pidgin/gtkprivacy.c:573
 msgid "Permit User"
 msgstr "Benutzer erlauben"
 
-#: pidgin/gtkprivacy.c:557
+#: ../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:558
+#: ../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:561 pidgin/gtkprivacy.c:577
+#: ../pidgin/gtkprivacy.c:561 ../pidgin/gtkprivacy.c:577
 msgid "_Permit"
 msgstr "_Zulassen"
 
-#: pidgin/gtkprivacy.c:567
+#: ../pidgin/gtkprivacy.c:567
 #, c-format
 msgid "Allow %s to contact you?"
 msgstr "Erlaube %s, Ihnen Nachrichten zu schreiben?"
 
-#: pidgin/gtkprivacy.c:569
+#: ../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:598 pidgin/gtkprivacy.c:612
+#: ../pidgin/gtkprivacy.c:598 ../pidgin/gtkprivacy.c:612
 msgid "Block User"
 msgstr "Benutzer blockieren"
 
-#: pidgin/gtkprivacy.c:599
+#: ../pidgin/gtkprivacy.c:599
 msgid "Type a user to block."
 msgstr "Geben Sie einen Benutzer ein, den Sie blockieren wollen."
 
-#: pidgin/gtkprivacy.c:600
+#: ../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:608
+#: ../pidgin/gtkprivacy.c:608
 #, c-format
 msgid "Block %s?"
 msgstr "%s sperren?"
 
-#: pidgin/gtkprivacy.c:610
+#: ../pidgin/gtkprivacy.c:610
 #, c-format
 msgid "Are you sure you want to block %s?"
 msgstr "Sie Sie sicher, dass Sie %s blockieren wollen?"
 
-#: pidgin/gtkrequest.c:271
+#: ../pidgin/gtkrequest.c:271
 msgid "Apply"
 msgstr "Anwenden"
 
-#: pidgin/gtkrequest.c:1483
+#: ../pidgin/gtkrequest.c:1504
 msgid "That file already exists"
 msgstr "Diese Datei existiert bereits"
 
-#: pidgin/gtkrequest.c:1484
+#: ../pidgin/gtkrequest.c:1505
 msgid "Would you like to overwrite it?"
 msgstr "Möchten Sie sie überschreiben?"
 
-#: pidgin/gtkrequest.c:1487
+#: ../pidgin/gtkrequest.c:1508
 msgid "Overwrite"
 msgstr "Überschreiben"
 
-#: pidgin/gtkrequest.c:1488
+#: ../pidgin/gtkrequest.c:1509
 msgid "Choose New Name"
 msgstr "Einen neuen Namen wählen"
 
-#: pidgin/gtkrequest.c:1626 pidgin/gtkrequest.c:1640
+#: ../pidgin/gtkrequest.c:1647 ../pidgin/gtkrequest.c:1661
 msgid "Select Folder..."
 msgstr "Ordner auswählen..."
 
 #. Create the window.
-#: pidgin/gtkroomlist.c:374
+#: ../pidgin/gtkroomlist.c:374
 msgid "Room List"
 msgstr "Raumliste"
 
 #. list button
-#: pidgin/gtkroomlist.c:442
+#: ../pidgin/gtkroomlist.c:442
 msgid "_Get List"
 msgstr "_Liste abrufen"
 
 #. add button
-#: pidgin/gtkroomlist.c:450
+#: ../pidgin/gtkroomlist.c:450
 msgid "_Add Chat"
 msgstr "Chat _hinzufügen"
 
-#: pidgin/gtksavedstatuses.c:336
+#: ../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?"
 
 #. Use button
-#: pidgin/gtksavedstatuses.c:619 pidgin/gtksavedstatuses.c:1265
+#: ../pidgin/gtksavedstatuses.c:619 ../pidgin/gtksavedstatuses.c:1265
 msgid "_Use"
 msgstr "Über_nehmen"
 
-#: pidgin/gtksavedstatuses.c:779
+#: ../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:969
+#: ../pidgin/gtksavedstatuses.c:969
 msgid "Different"
 msgstr "Anders"
 
-#: pidgin/gtksavedstatuses.c:1158
+#: ../pidgin/gtksavedstatuses.c:1158
 msgid "_Title:"
 msgstr "_Bezeichnung:"
 
-#: pidgin/gtksavedstatuses.c:1177 pidgin/gtksavedstatuses.c:1494
+#: ../pidgin/gtksavedstatuses.c:1177 ../pidgin/gtksavedstatuses.c:1494
 msgid "_Status:"
 msgstr "_Status:"
 
 #. Different status message expander
-#: pidgin/gtksavedstatuses.c:1209
+#: ../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:1273
+#: ../pidgin/gtksavedstatuses.c:1273
 msgid "Sa_ve & Use"
 msgstr "S_peichern & Übernehmen"
 
 #
-#: pidgin/gtksavedstatuses.c:1477
+#: ../pidgin/gtksavedstatuses.c:1477
 #, c-format
 msgid "Status for %s"
 msgstr "Status für %s"
 
-#: pidgin/gtksound.c:63
-msgid "Buddy logs in"
-msgstr "Buddy meldet sich an"
-
-#: pidgin/gtksound.c:64
-msgid "Buddy logs out"
-msgstr "Buddy meldet sich ab"
-
-#: pidgin/gtksound.c:65
-msgid "Message received"
-msgstr "Nachricht empfangen"
-
-#: pidgin/gtksound.c:66
-msgid "Message received begins conversation"
-msgstr "Nachricht beginnt neue Unterhaltung"
-
-#: pidgin/gtksound.c:67
-msgid "Message sent"
-msgstr "Nachricht gesendet"
-
-#: pidgin/gtksound.c:68
-msgid "Person enters chat"
-msgstr "Person betritt den Chat"
-
-#: pidgin/gtksound.c:69
-msgid "Person leaves chat"
-msgstr "Person verlässt den Chat"
-
-#: pidgin/gtksound.c:70
-msgid "You talk in chat"
-msgstr "Sie sprechen im Chat"
-
-#: pidgin/gtksound.c:71
-msgid "Others talk in chat"
-msgstr "Andere sprechen im Chat"
-
-#: pidgin/gtksound.c:74
-msgid "Someone says your screen name in chat"
-msgstr "Jemand nennt Ihren Benutzernamen im Chat"
-
-#: pidgin/gtksound.c:310
-msgid "GStreamer Failure"
-msgstr "GStreamer-Fehler"
-
-#: pidgin/gtksound.c:311
-msgid "GStreamer failed to initialize."
-msgstr "GStreamer konnte nicht initialisiert werden."
-
-#: pidgin/gtkstatusbox.c:663
+#: ../pidgin/gtkstatusbox.c:663
 msgid "Waiting for network connection"
 msgstr "Warte auf Netzwerkverbindung"
 
-#: pidgin/gtkutils.c:631
+#: ../pidgin/gtkutils.c:631
 msgid "Google Talk"
 msgstr "Google Talk"
 
-#: pidgin/gtkutils.c:1388 pidgin/gtkutils.c:1411
+#: ../pidgin/gtkutils.c:1388 ../pidgin/gtkutils.c:1411
 #, c-format
 msgid "The following error has occurred loading %s: %s"
 msgstr "Beim Laden von %s ist folgender Fehler aufgetreten: %s"
 
-#: pidgin/gtkutils.c:1391 pidgin/gtkutils.c:1413
+#: ../pidgin/gtkutils.c:1391 ../pidgin/gtkutils.c:1413
 msgid "Failed to load image"
 msgstr "Laden des Bildes fehlgeschlagen"
 
-#: pidgin/gtkutils.c:1487
+#: ../pidgin/gtkutils.c:1487
 #, c-format
 msgid "Cannot send folder %s."
 msgstr "Kann Verzeichnis %s nicht senden."
 
-#: pidgin/gtkutils.c:1488
+#: ../pidgin/gtkutils.c:1488
 #, c-format
 msgid ""
 "%s cannot transfer a folder. You will need to send the files within "
@@ -14623,11 +15087,12 @@
 msgstr ""
 "%s kann keine Verzeichnisse übertragen. Bitte senden sie die Dateien einzeln."
 
-#: pidgin/gtkutils.c:1520 pidgin/gtkutils.c:1532 pidgin/gtkutils.c:1539
+#: ../pidgin/gtkutils.c:1520 ../pidgin/gtkutils.c:1532
+#: ../pidgin/gtkutils.c:1539
 msgid "You have dragged an image"
 msgstr "Sie haben ein Bild gewählt"
 
-#: pidgin/gtkutils.c:1521
+#: ../pidgin/gtkutils.c:1521
 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."
@@ -14635,23 +15100,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:1527 pidgin/gtkutils.c:1547
+#: ../pidgin/gtkutils.c:1527 ../pidgin/gtkutils.c:1547
 msgid "Set as buddy icon"
 msgstr "Als Buddy-Icons verwenden"
 
-#: pidgin/gtkutils.c:1528 pidgin/gtkutils.c:1548
+#: ../pidgin/gtkutils.c:1528 ../pidgin/gtkutils.c:1548
 msgid "Send image file"
 msgstr "Bilddatei senden"
 
-#: pidgin/gtkutils.c:1529 pidgin/gtkutils.c:1548
+#: ../pidgin/gtkutils.c:1529 ../pidgin/gtkutils.c:1548
 msgid "Insert in message"
 msgstr "In Nachricht einfügen"
 
-#: pidgin/gtkutils.c:1533
+#: ../pidgin/gtkutils.c:1533
 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:1540
+#: ../pidgin/gtkutils.c:1540
 msgid ""
 "You can send this image as a file transfer, or use it as the buddy icon for "
 "this user."
@@ -14659,7 +15124,7 @@
 "Sie können dieses Bild als Dateiübertragung senden oder es als Buddy-Icon "
 "für diesen Benutzer verwenden."
 
-#: pidgin/gtkutils.c:1541
+#: ../pidgin/gtkutils.c:1541
 msgid ""
 "You can insert this image into this message, or use it as the buddy icon for "
 "this user"
@@ -14672,11 +15137,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:1599
+#: ../pidgin/gtkutils.c:1599
 msgid "Cannot send launcher"
 msgstr "Kann Verknüpfung nicht senden"
 
-#: pidgin/gtkutils.c:1599
+#: ../pidgin/gtkutils.c:1599
 msgid ""
 "You dragged a desktop launcher. Most likely you wanted to send whatever this "
 "launcher points to instead of this launcher itself."
@@ -14684,7 +15149,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:2334
+#: ../pidgin/gtkutils.c:2334
 #, c-format
 msgid ""
 "<b>File:</b> %s\n"
@@ -14695,26 +15160,26 @@
 "<b>Dateigröße:</b> %s\n"
 "<b>Bildgröße:</b> %dx%d"
 
-#: pidgin/gtkutils.c:2630
+#: ../pidgin/gtkutils.c:2630
 #, 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:2632
+#: ../pidgin/gtkutils.c:2632
 msgid "Icon Error"
 msgstr "Icon-Fehler"
 
-#: pidgin/gtkutils.c:2633
+#: ../pidgin/gtkutils.c:2633
 msgid "Could not set icon"
 msgstr "Konnte das Icon nicht setzen"
 
-#: pidgin/gtkutils.c:2733
+#: ../pidgin/gtkutils.c:2733
 #, c-format
 msgid "Failed to open file '%s': %s"
 msgstr "Öffnen der Datei '%s' fehlgeschlagen: %s"
 
-#: pidgin/gtkutils.c:2782
+#: ../pidgin/gtkutils.c:2782
 #, c-format
 msgid ""
 "Failed to load image '%s': reason not known, probably a corrupt image file"
@@ -14722,83 +15187,83 @@
 "Bild '%s' konnte nicht geladen werden: Grund unbekannt, vermutlich eine "
 "korrupte Bilddatei"
 
-#: pidgin/gtkwhiteboard.c:754 pidgin/gtkwhiteboard.c:773
+#: ../pidgin/gtkwhiteboard.c:754 ../pidgin/gtkwhiteboard.c:773
 msgid "Save File"
 msgstr "Datei speichern"
 
-#: pidgin/gtkwhiteboard.c:861
+#: ../pidgin/gtkwhiteboard.c:861
 msgid "Select color"
 msgstr "Farbe auswählen"
 
-#: pidgin/pidginstock.c:81
+#: ../pidgin/pidginstock.c:81
 msgid "_Alias"
 msgstr "Alia_s"
 
-#: pidgin/pidginstock.c:83
+#: ../pidgin/pidginstock.c:83
 msgid "Close _tabs"
 msgstr "_Reiter schließen"
 
-#: pidgin/pidginstock.c:85
+#: ../pidgin/pidginstock.c:85
 msgid "_Get Info"
 msgstr "_Benutzer-Info"
 
-#: pidgin/pidginstock.c:86
+#: ../pidgin/pidginstock.c:86
 msgid "_Invite"
 msgstr "_Einladen"
 
-#: pidgin/pidginstock.c:87
+#: ../pidgin/pidginstock.c:87
 msgid "_Modify"
 msgstr "_Bearbeiten"
 
-#: pidgin/pidginstock.c:88
+#: ../pidgin/pidginstock.c:88
 msgid "_Open Mail"
 msgstr "Mail ö_ffnen"
 
-#: pidgin/pixmaps/emotes/default/22/default.theme.in.h:2
+#: ../pidgin/pixmaps/emotes/default/22/default.theme.in.h:2
 msgid "Pidgin smileys"
 msgstr "Pidgin-Smileys"
 
-#: pidgin/pixmaps/emotes/none/none.theme.in.h:1
+#: ../pidgin/pixmaps/emotes/none/none.theme.in.h:1
 msgid "Penguin Pimps"
 msgstr "Pinguin Pimps"
 
-#: pidgin/pixmaps/emotes/none/none.theme.in.h:2
+#: ../pidgin/pixmaps/emotes/none/none.theme.in.h:2
 msgid "Selecting this disables graphical emoticons."
 msgstr "Wenn Sie dies auswählen, werden grafische Emoticons deaktiviert."
 
-#: pidgin/pixmaps/emotes/none/none.theme.in.h:3
+#: ../pidgin/pixmaps/emotes/none/none.theme.in.h:3
 msgid "none"
 msgstr "keine"
 
-#: pidgin/plugins/cap/cap.c:450
+#: ../pidgin/plugins/cap/cap.c:450
 msgid "Display Statistics"
 msgstr "Statistik anzeigen"
 
-#: pidgin/plugins/cap/cap.c:462 pidgin/plugins/cap/cap.c:465
+#: ../pidgin/plugins/cap/cap.c:462 ../pidgin/plugins/cap/cap.c:465
 msgid "Response Probability:"
 msgstr "Antwortwahrscheinlichkeit:"
 
-#: pidgin/plugins/cap/cap.c:811
+#: ../pidgin/plugins/cap/cap.c:811
 msgid "Statistics Configuration"
 msgstr "Statistik-Konfiguration"
 
 #. msg_difference spinner
-#: pidgin/plugins/cap/cap.c:814
+#: ../pidgin/plugins/cap/cap.c:814
 msgid "Maximum response timeout:"
 msgstr "Maximale Antwort-Zeitüberschreitung:"
 
-#: pidgin/plugins/cap/cap.c:817 pidgin/plugins/cap/cap.c:824
-#: pidgin/plugins/cap/cap.c:831 pidgin/plugins/timestamp.c:150
+#: ../pidgin/plugins/cap/cap.c:817 ../pidgin/plugins/cap/cap.c:824
+#: ../pidgin/plugins/cap/cap.c:831 ../pidgin/plugins/timestamp.c:150
 msgid "minutes"
 msgstr "Minuten"
 
 #. last_seen spinner
-#: pidgin/plugins/cap/cap.c:821
+#: ../pidgin/plugins/cap/cap.c:821
 msgid "Maximum last-seen difference:"
 msgstr "Maximale \"zuletzt-gesehen\"-Differenz:"
 
 #. threshold spinner
-#: pidgin/plugins/cap/cap.c:828
+#: ../pidgin/plugins/cap/cap.c:828
 msgid "Threshold:"
 msgstr "Schwellwert:"
 
@@ -14808,18 +15273,18 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: pidgin/plugins/cap/cap.c:936
+#: ../pidgin/plugins/cap/cap.c:936
 msgid "Contact Availability Prediction"
 msgstr "Kontakt-Verfügbarkeits-Vorhersage"
 
 #. *< name
 #. *< version
-#: pidgin/plugins/cap/cap.c:938
+#: ../pidgin/plugins/cap/cap.c:938
 msgid "Contact Availability Prediction plugin."
 msgstr "Kontakt-Verfügbarkeits-Vorhersage-Plugin."
 
 #. *  summary
-#: pidgin/plugins/cap/cap.c:939
+#: ../pidgin/plugins/cap/cap.c:939
 msgid ""
 "The contact availability plugin (cap) is used to display statistical "
 "information about buddies in a users contact list."
@@ -14827,32 +15292,32 @@
 "Das Kontakt-Verfügbarkeits-Plugin (cap) wird benutzt um statistische "
 "Informationen über Buddys anzuzeigen."
 
-#: pidgin/plugins/contact_priority.c:61
+#: ../pidgin/plugins/contact_priority.c:61
 msgid "Buddy is idle"
 msgstr "Buddy ist untätig"
 
-#: pidgin/plugins/contact_priority.c:62
+#: ../pidgin/plugins/contact_priority.c:62
 msgid "Buddy is away"
 msgstr "Buddy ist abwesend"
 
-#: pidgin/plugins/contact_priority.c:63
+#: ../pidgin/plugins/contact_priority.c:63
 msgid "Buddy is \"extended\" away"
 msgstr "Buddy ist „erweitert“ abwesend"
 
 #. Not used yet.
-#: pidgin/plugins/contact_priority.c:66
+#: ../pidgin/plugins/contact_priority.c:66
 msgid "Buddy is mobile"
 msgstr "Buddy ist mobil"
 
-#: pidgin/plugins/contact_priority.c:68
+#: ../pidgin/plugins/contact_priority.c:68
 msgid "Buddy is offline"
 msgstr "Buddy ist offline"
 
-#: pidgin/plugins/contact_priority.c:90
+#: ../pidgin/plugins/contact_priority.c:90
 msgid "Point values to use when..."
 msgstr "Punktzahlen, die benutzt werden, wenn..."
 
-#: pidgin/plugins/contact_priority.c:118
+#: ../pidgin/plugins/contact_priority.c:118
 msgid ""
 "The buddy with the <i>largest score</i> is the buddy who will have priority "
 "in the contact.\n"
@@ -14860,11 +15325,11 @@
 "Der Buddy mit der <i>höchsten Punktzahl</i> bekommt die höchste Priorität im "
 "Kontakt.\n"
 
-#: pidgin/plugins/contact_priority.c:125
+#: ../pidgin/plugins/contact_priority.c:125
 msgid "Use last buddy when scores are equal"
 msgstr "Benutze den letzten Buddy, wenn die Punktzahlen gleich sind"
 
-#: pidgin/plugins/contact_priority.c:130
+#: ../pidgin/plugins/contact_priority.c:130
 msgid "Point values to use for account..."
 msgstr "Punktzahlen für dieses Konto..."
 
@@ -14874,14 +15339,14 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: pidgin/plugins/contact_priority.c:187
+#: ../pidgin/plugins/contact_priority.c:187
 msgid "Contact Priority"
 msgstr "Kontaktpriorität"
 
 #. *< name
 #. *< version
 #. *< summary
-#: pidgin/plugins/contact_priority.c:190
+#: ../pidgin/plugins/contact_priority.c:190
 msgid ""
 "Allows for controlling the values associated with different buddy states."
 msgstr ""
@@ -14889,7 +15354,7 @@
 "verbunden sind."
 
 #. *< description
-#: pidgin/plugins/contact_priority.c:192
+#: ../pidgin/plugins/contact_priority.c:192
 msgid ""
 "Allows for changing the point values of idle/away/offline states for buddies "
 "in contact priority computations."
@@ -14898,73 +15363,73 @@
 "abwesend, offline), die für die Berechnung der Kontakt-Priorität verwendet "
 "werden."
 
-#: pidgin/plugins/convcolors.c:23
+#: ../pidgin/plugins/convcolors.c:23
 msgid "Conversation Colors"
 msgstr "Gesprächsfarben"
 
-#: pidgin/plugins/convcolors.c:25 pidgin/plugins/convcolors.c:26
+#: ../pidgin/plugins/convcolors.c:25 ../pidgin/plugins/convcolors.c:26
 msgid "Customize colors in the conversation window"
 msgstr "Farben im Gesprächsfenster anpassen"
 
-#: pidgin/plugins/convcolors.c:82
+#: ../pidgin/plugins/convcolors.c:82
 msgid "Error Messages"
 msgstr "Fehlernachrichten"
 
-#: pidgin/plugins/convcolors.c:83
+#: ../pidgin/plugins/convcolors.c:83
 msgid "Highlighted Messages"
 msgstr "Hervorgehobene Nachrichten"
 
-#: pidgin/plugins/convcolors.c:84
+#: ../pidgin/plugins/convcolors.c:84
 msgid "System Messages"
 msgstr "Systemnachrichten"
 
-#: pidgin/plugins/convcolors.c:85
+#: ../pidgin/plugins/convcolors.c:85
 msgid "Sent Messages"
 msgstr "Gesendete Nachrichten"
 
-#: pidgin/plugins/convcolors.c:86
+#: ../pidgin/plugins/convcolors.c:86
 msgid "Received Messages"
 msgstr "Empfangene Nachrichten"
 
-#: pidgin/plugins/convcolors.c:210 pidgin/plugins/pidginrc.c:251
+#: ../pidgin/plugins/convcolors.c:210 ../pidgin/plugins/pidginrc.c:251
 #, c-format
 msgid "Select Color for %s"
 msgstr "Textfarbe für %s auswählen"
 
-#: pidgin/plugins/convcolors.c:287
+#: ../pidgin/plugins/convcolors.c:287
 msgid "Bold"
 msgstr "Fett"
 
-#: pidgin/plugins/convcolors.c:294
+#: ../pidgin/plugins/convcolors.c:294
 msgid "Italic"
 msgstr "Kursiv"
 
-#: pidgin/plugins/convcolors.c:301
+#: ../pidgin/plugins/convcolors.c:301
 msgid "Underline"
 msgstr "Unterstrichen"
 
-#: pidgin/plugins/convcolors.c:310
+#: ../pidgin/plugins/convcolors.c:310
 msgid "Ignore incoming format"
 msgstr "Eingehendes Format ignorieren"
 
-#: pidgin/plugins/convcolors.c:311
+#: ../pidgin/plugins/convcolors.c:311
 msgid "Apply in Chats"
 msgstr "In Chats anwenden"
 
-#: pidgin/plugins/convcolors.c:312
+#: ../pidgin/plugins/convcolors.c:312
 msgid "Apply in IMs"
 msgstr "In IMs anwenden"
 
-#: pidgin/plugins/extplacement.c:80
+#: ../pidgin/plugins/extplacement.c:80
 msgid "By conversation count"
 msgstr "Nach der Zahl der Gespräche"
 
-#: pidgin/plugins/extplacement.c:101
+#: ../pidgin/plugins/extplacement.c:101
 msgid "Conversation Placement"
 msgstr "Platzierung der Gespräche"
 
 #. Translators: "New conversations" should match the text in the preferences dialog and "By conversation count" should be the same text used above
-#: pidgin/plugins/extplacement.c:105
+#: ../pidgin/plugins/extplacement.c:105
 msgid ""
 "Note: The preference for \"New conversations\" must be set to \"By "
 "conversation count\"."
@@ -14972,11 +15437,11 @@
 "Bemerkung: Die Einstellung für \"Neue Unterhaltungen\" muss auf \"Nach der "
 "Zahl der Gespräche\" gesetzt werden."
 
-#: pidgin/plugins/extplacement.c:111
+#: ../pidgin/plugins/extplacement.c:111
 msgid "Number of conversations per window"
 msgstr "Zahl der Gespräche pro Fenster"
 
-#: pidgin/plugins/extplacement.c:117
+#: ../pidgin/plugins/extplacement.c:117
 msgid "Separate IM and Chat windows when placing by number"
 msgstr "Getrennte IM- und Chat-Fenster bei der Platzierung nach Nummern"
 
@@ -14986,19 +15451,19 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: pidgin/plugins/extplacement.c:146
+#: ../pidgin/plugins/extplacement.c:146
 msgid "ExtPlacement"
 msgstr "Erweiterte Platzierung"
 
 #. *< name
 #. *< version
-#: pidgin/plugins/extplacement.c:148
+#: ../pidgin/plugins/extplacement.c:148
 msgid "Extra conversation placement options."
 msgstr "Zusätzliche Optionen zur Platzierung von Gesprächen."
 
 #. *< summary
 #. *  description
-#: pidgin/plugins/extplacement.c:150
+#: ../pidgin/plugins/extplacement.c:150
 msgid ""
 "Restrict the number of conversations per windows, optionally separating IMs "
 "and Chats"
@@ -15007,20 +15472,20 @@
 "Chats"
 
 #. Configuration frame
-#: pidgin/plugins/gestures/gestures.c:235
+#: ../pidgin/plugins/gestures/gestures.c:235
 msgid "Mouse Gestures Configuration"
 msgstr "Maus-Gestik-Konfiguration"
 
-#: pidgin/plugins/gestures/gestures.c:242
+#: ../pidgin/plugins/gestures/gestures.c:242
 msgid "Middle mouse button"
 msgstr "Mittlere Maustaste"
 
-#: pidgin/plugins/gestures/gestures.c:247
+#: ../pidgin/plugins/gestures/gestures.c:247
 msgid "Right mouse button"
 msgstr "Rechte Maustaste"
 
 #. "Visual gesture display" checkbox
-#: pidgin/plugins/gestures/gestures.c:259
+#: ../pidgin/plugins/gestures/gestures.c:259
 msgid "_Visual gesture display"
 msgstr "_Gestiken anzeigen"
 
@@ -15030,19 +15495,19 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: pidgin/plugins/gestures/gestures.c:295
+#: ../pidgin/plugins/gestures/gestures.c:295
 msgid "Mouse Gestures"
 msgstr "Maus-Gestiken"
 
 #. *< name
 #. *< version
 #. *  summary
-#: pidgin/plugins/gestures/gestures.c:298
+#: ../pidgin/plugins/gestures/gestures.c:298
 msgid "Provides support for mouse gestures"
 msgstr "Ermöglicht die Bedienung mit Maus-Gestiken"
 
 #. *  description
-#: pidgin/plugins/gestures/gestures.c:300
+#: ../pidgin/plugins/gestures/gestures.c:300
 msgid ""
 "Allows support for mouse gestures in conversation windows.\n"
 "Drag the middle mouse button to perform certain actions:\n"
@@ -15058,36 +15523,36 @@
 "und dann nach links, um auf ein voriges Gespräch zu wechseln. Hochziehen und "
 "dann nach rechts, um zum nächsten Gespräche zu wechseln."
 
-#: pidgin/plugins/gevolution/add_buddy_dialog.c:143
+#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:143
 msgid "Instant Messaging"
 msgstr "Sofortnachrichten"
 
 #. Add the label.
-#: pidgin/plugins/gevolution/add_buddy_dialog.c:457
+#: ../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:551
-#: pidgin/plugins/gevolution/new_person_dialog.c:303
+#: ../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:577
-#: pidgin/plugins/gevolution/assoc-buddy.c:467
-#: pidgin/plugins/gevolution/new_person_dialog.c:249
+#: ../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:594
+#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:594
 msgid "Select Buddy"
 msgstr "Buddy auswählen"
 
 #. Add the label.
-#: pidgin/plugins/gevolution/assoc-buddy.c:343
+#: ../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."
@@ -15096,43 +15561,43 @@
 "werden soll oder erstellen Sie einen neuen Kontakt."
 
 #. Add the expander
-#: pidgin/plugins/gevolution/assoc-buddy.c:431
+#: ../pidgin/plugins/gevolution/assoc-buddy.c:431
 msgid "User _details"
 msgstr "Benutzer_details"
 
 #. "Associate Buddy" button
-#: pidgin/plugins/gevolution/assoc-buddy.c:484
+#: ../pidgin/plugins/gevolution/assoc-buddy.c:484
 msgid "_Associate Buddy"
 msgstr "_Assoziiere den Buddy"
 
-#: pidgin/plugins/gevolution/gevolution.c:240
-#: pidgin/plugins/gevolution/gevolution.c:246
+#: ../pidgin/plugins/gevolution/gevolution.c:240
+#: ../pidgin/plugins/gevolution/gevolution.c:246
 msgid "Unable to send e-mail"
 msgstr "E-Mail konnte nicht gesendet werden"
 
-#: pidgin/plugins/gevolution/gevolution.c:241
+#: ../pidgin/plugins/gevolution/gevolution.c:241
 msgid "The evolution executable was not found in the PATH."
 msgstr "Die ausführbare Evolution-Datei wurde nicht im Pfad (PATH) gefunden."
 
-#: pidgin/plugins/gevolution/gevolution.c:247
+#: ../pidgin/plugins/gevolution/gevolution.c:247
 msgid "An e-mail address was not found for this buddy."
 msgstr "Für diesen Buddy wurde keine E-Mail-Adresse gefunden."
 
-#: pidgin/plugins/gevolution/gevolution.c:273
+#: ../pidgin/plugins/gevolution/gevolution.c:273
 msgid "Add to Address Book"
 msgstr "Zum Adressbuch hinzufügen"
 
-#: pidgin/plugins/gevolution/gevolution.c:285
+#: ../pidgin/plugins/gevolution/gevolution.c:285
 msgid "Send E-Mail"
 msgstr "E-Mail senden"
 
 #. Configuration frame
-#: pidgin/plugins/gevolution/gevolution.c:412
+#: ../pidgin/plugins/gevolution/gevolution.c:412
 msgid "Evolution Integration Configuration"
 msgstr "Konfiguration der Evolution-Integration"
 
 #. Label
-#: pidgin/plugins/gevolution/gevolution.c:415
+#: ../pidgin/plugins/gevolution/gevolution.c:415
 msgid "Select all accounts that buddies should be auto-added to."
 msgstr ""
 "Wählen Sie alle Konten, zu denen Buddys automatisch hinzugefügt werden "
@@ -15144,7 +15609,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: pidgin/plugins/gevolution/gevolution.c:527
+#: ../pidgin/plugins/gevolution/gevolution.c:527
 msgid "Evolution Integration"
 msgstr "Evolution-Integration"
 
@@ -15152,39 +15617,39 @@
 #. *< version
 #. *  summary
 #. *  description
-#: pidgin/plugins/gevolution/gevolution.c:530
-#: pidgin/plugins/gevolution/gevolution.c:532
+#: ../pidgin/plugins/gevolution/gevolution.c:530
+#: ../pidgin/plugins/gevolution/gevolution.c:532
 msgid "Provides integration with Evolution."
 msgstr "Erlaubt die Integration mit Evolution."
 
-#: pidgin/plugins/gevolution/new_person_dialog.c:263
+#: ../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:267
+#: ../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:287
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:287
 msgid "Account type:"
 msgstr "Kontotyp:"
 
 #. Optional Information section
-#: pidgin/plugins/gevolution/new_person_dialog.c:311
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:311
 msgid "Optional information:"
 msgstr "Optionale Informationen:"
 
 # old strings
-#: pidgin/plugins/gevolution/new_person_dialog.c:346
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:346
 msgid "First name:"
 msgstr "Vorname:"
 
-#: pidgin/plugins/gevolution/new_person_dialog.c:358
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:358
 msgid "Last name:"
 msgstr "Nachname:"
 
-#: pidgin/plugins/gevolution/new_person_dialog.c:378
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:378
 msgid "E-mail:"
 msgstr "E-Mail:"
 
@@ -15194,7 +15659,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: pidgin/plugins/gtk-signals-test.c:160
+#: ../pidgin/plugins/gtk-signals-test.c:160
 msgid "GTK Signals Test"
 msgstr "GTK-Signaltest"
 
@@ -15202,11 +15667,12 @@
 #. *< version
 #. *  summary
 #. *  description
-#: pidgin/plugins/gtk-signals-test.c:163 pidgin/plugins/gtk-signals-test.c:165
+#: ../pidgin/plugins/gtk-signals-test.c:163
+#: ../pidgin/plugins/gtk-signals-test.c:165
 msgid "Test to see that all ui signals are working properly."
 msgstr "Test, um zu sehen, ob alle Signale richtig funktionieren."
 
-#: pidgin/plugins/gtkbuddynote.c:34
+#: ../pidgin/plugins/gtkbuddynote.c:34
 #, c-format
 msgid ""
 "\n"
@@ -15215,7 +15681,7 @@
 "\n"
 "<b>Buddy-Notizen</b>: %s"
 
-#: pidgin/plugins/history.c:188
+#: ../pidgin/plugins/history.c:188
 msgid "History"
 msgstr "Verlauf"
 
@@ -15225,7 +15691,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: pidgin/plugins/iconaway.c:82
+#: ../pidgin/plugins/iconaway.c:82
 msgid "Iconify on Away"
 msgstr "Minimieren, wenn Abwesend"
 
@@ -15233,46 +15699,46 @@
 #. *< version
 #. *  summary
 #. *  description
-#: pidgin/plugins/iconaway.c:85 pidgin/plugins/iconaway.c:87
+#: ../pidgin/plugins/iconaway.c:85 ../pidgin/plugins/iconaway.c:87
 msgid "Iconifies the buddy list and your conversations when you go away."
 msgstr "Minimiert die Buddy-Liste und die Gesprächsfenster, wenn Sie weggehen."
 
-#: pidgin/plugins/mailchk.c:160
+#: ../pidgin/plugins/mailchk.c:160
 msgid "Mail Checker"
 msgstr "Mail-Benachrichtigung"
 
-#: pidgin/plugins/mailchk.c:162
+#: ../pidgin/plugins/mailchk.c:162
 msgid "Checks for new local mail."
 msgstr "Überprüft, ob es neue lokale Mails gibt."
 
-#: pidgin/plugins/mailchk.c:163
+#: ../pidgin/plugins/mailchk.c:163
 msgid "Adds a small box to the buddy list that shows if you have new mail."
 msgstr ""
 "Fügt eine kleine Box zur Buddy-Liste hinzu, die zeigt, ob Sie neue E-Mails "
 "haben."
 
-#: pidgin/plugins/markerline.c:23
+#: ../pidgin/plugins/markerline.c:23
 msgid "Markerline"
 msgstr "Markierunglinie"
 
-#: pidgin/plugins/markerline.c:25 pidgin/plugins/markerline.c:26
+#: ../pidgin/plugins/markerline.c:25 ../pidgin/plugins/markerline.c:26
 msgid "Draw a line to indicate new messages in a conversation."
 msgstr ""
 "Eine Linie zeichnen um neue Nachrichten in einer Unterhaltung anzuzeigen."
 
-#: pidgin/plugins/markerline.c:246
+#: ../pidgin/plugins/markerline.c:246
 msgid "Draw Markerline in "
 msgstr "Zeichne eine Markierunglinie in "
 
-#: pidgin/plugins/markerline.c:250 pidgin/plugins/notify.c:676
+#: ../pidgin/plugins/markerline.c:250 ../pidgin/plugins/notify.c:676
 msgid "_IM windows"
 msgstr "_IM-Fenstern"
 
-#: pidgin/plugins/markerline.c:254 pidgin/plugins/notify.c:683
+#: ../pidgin/plugins/markerline.c:254 ../pidgin/plugins/notify.c:683
 msgid "C_hat windows"
 msgstr "C_hat-Fenstern"
 
-#: pidgin/plugins/musicmessaging/musicmessaging.c:44
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:44
 msgid ""
 "A music messaging session has been requested. Please click the MM icon to "
 "accept."
@@ -15280,36 +15746,36 @@
 "Eine Musik-Nachrichten-Sitzung wurde angefragt. Bitte klicken Sie das MM-"
 "Icon zum Akzeptieren."
 
-#: pidgin/plugins/musicmessaging/musicmessaging.c:45
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:45
 msgid "Music messaging session confirmed."
 msgstr "Musik-Nachrichten-Sitzung bestätigt."
 
-#: pidgin/plugins/musicmessaging/musicmessaging.c:419
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:419
 msgid "Music Messaging"
 msgstr "Musik-Nachrichten"
 
-#: pidgin/plugins/musicmessaging/musicmessaging.c:420
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:420
 msgid "There was a conflict in running the command:"
 msgstr "Es gab einen Konflikt beim Ausführen des Kommandos:"
 
-#: pidgin/plugins/musicmessaging/musicmessaging.c:528
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:528
 msgid "Error Running Editor"
 msgstr "Fehler beim Ausführen des Editors"
 
-#: pidgin/plugins/musicmessaging/musicmessaging.c:529
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:529
 msgid "The following error has occurred:"
 msgstr "Der folgende Fehler ist aufgetreten:"
 
 #. Configuration frame
-#: pidgin/plugins/musicmessaging/musicmessaging.c:628
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:628
 msgid "Music Messaging Configuration"
 msgstr "Musik-Nachrichten-Konfiguration"
 
-#: pidgin/plugins/musicmessaging/musicmessaging.c:632
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:632
 msgid "Score Editor Path"
 msgstr "Pfad zum Partitur-Editor"
 
-#: pidgin/plugins/musicmessaging/musicmessaging.c:633
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:633
 msgid "_Apply"
 msgstr "_Anwenden"
 
@@ -15321,12 +15787,12 @@
 #. *< id
 #. *< name
 #. *< version
-#: pidgin/plugins/musicmessaging/musicmessaging.c:674
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:674
 msgid "Music Messaging Plugin for collaborative composition."
 msgstr "Musik-Nachrichten-Plugin zum gemeinschaftlichen Komponieren."
 
 #. *  summary
-#: pidgin/plugins/musicmessaging/musicmessaging.c:676
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:676
 msgid ""
 "The Music Messaging Plugin allows a number of users to simultaneously work "
 "on a piece of music by editting a common score in real-time."
@@ -15335,74 +15801,74 @@
 "Benutzern, simultan an einem Musikstück in Echtzeit zu arbeiten."
 
 #. ---------- "Notify For" ----------
-#: pidgin/plugins/notify.c:672
+#: ../pidgin/plugins/notify.c:672
 msgid "Notify For"
 msgstr "Benachrichtigung für"
 
-#: pidgin/plugins/notify.c:691
+#: ../pidgin/plugins/notify.c:691
 msgid "\t_Only when someone says your screen name"
 msgstr "\t_Nur wenn jemand Ihren Benutzernamen nennt"
 
-#: pidgin/plugins/notify.c:701
+#: ../pidgin/plugins/notify.c:701
 msgid "_Focused windows"
 msgstr "_Fokussierte Fenster"
 
 #. ---------- "Notification Methods" ----------
-#: pidgin/plugins/notify.c:709
+#: ../pidgin/plugins/notify.c:709
 msgid "Notification Methods"
 msgstr "Benachrichtigungsmethoden"
 
-#: pidgin/plugins/notify.c:716
+#: ../pidgin/plugins/notify.c:716
 msgid "Prepend _string into window title:"
 msgstr "Stelle die _Zeichenkette vor den Fenstertitel:"
 
 #. Count method button
-#: pidgin/plugins/notify.c:735
+#: ../pidgin/plugins/notify.c:735
 msgid "Insert c_ount of new messages into window title"
 msgstr "Füge _Anzahl der neuen Nachrichten in den Fenstertitel ein"
 
 #. Count xprop method button
-#: pidgin/plugins/notify.c:744
+#: ../pidgin/plugins/notify.c:744
 msgid "Insert count of new message into _X property"
 msgstr "Füge _Anzahl der neuen Nachrichten in den Fenstertitel ein"
 
 #. Urgent method button
-#: pidgin/plugins/notify.c:752
+#: ../pidgin/plugins/notify.c:752
 msgid "Set window manager \"_URGENT\" hint"
 msgstr "Setze den „_URGENT“-Hinweis für den Window-Manager"
 
 #. Raise window method button
-#: pidgin/plugins/notify.c:761
+#: ../pidgin/plugins/notify.c:761
 msgid "R_aise conversation window"
 msgstr "G_esprächsfenster in den Vordergrund bringen"
 
 #. ---------- "Notification Removals" ----------
-#: pidgin/plugins/notify.c:769
+#: ../pidgin/plugins/notify.c:769
 msgid "Notification Removal"
 msgstr "Entfernung von Benachrichtigungen"
 
 #. Remove on focus button
-#: pidgin/plugins/notify.c:774
+#: ../pidgin/plugins/notify.c:774
 msgid "Remove when conversation window _gains focus"
 msgstr "Entferne, wenn das _Gesprächsfenster den Fokus bekommt"
 
 #. Remove on click button
-#: pidgin/plugins/notify.c:781
+#: ../pidgin/plugins/notify.c:781
 msgid "Remove when conversation window _receives click"
 msgstr "Entferne, wenn das Gesprächsfenster ge_klickt wird"
 
 #. Remove on type button
-#: pidgin/plugins/notify.c:789
+#: ../pidgin/plugins/notify.c:789
 msgid "Remove when _typing in conversation window"
 msgstr "Entferne, wenn im Gesprächsfenster ge_tippt wird"
 
 #. Remove on message send button
-#: pidgin/plugins/notify.c:797
+#: ../pidgin/plugins/notify.c:797
 msgid "Remove when a _message gets sent"
 msgstr "Entferne, wenn eine _Nachricht gesendet wird"
 
 #. Remove on conversation switch button
-#: pidgin/plugins/notify.c:806
+#: ../pidgin/plugins/notify.c:806
 msgid "Remove on switch to conversation ta_b"
 msgstr "Entfernen bei der Umschaltung zum Gesprächs_reiter"
 
@@ -15412,7 +15878,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: pidgin/plugins/notify.c:901
+#: ../pidgin/plugins/notify.c:901
 msgid "Message Notification"
 msgstr "Benachrichtigung"
 
@@ -15420,7 +15886,7 @@
 #. *< version
 #. *  summary
 #. *  description
-#: pidgin/plugins/notify.c:904 pidgin/plugins/notify.c:906
+#: ../pidgin/plugins/notify.c:904 ../pidgin/plugins/notify.c:906
 msgid "Provides a variety of ways of notifying you of unread messages."
 msgstr ""
 "Gibt Ihnen eine Reihe von Möglichkeiten, über ungelesene Nachrichten "
@@ -15432,21 +15898,21 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: pidgin/plugins/pidgininc.c:91
+#: ../pidgin/plugins/pidgininc.c:91
 msgid "Pidgin Demonstration Plugin"
 msgstr "Pidgin Demonstrations-Plugin"
 
 #. *< name
 #. *< version
 #. *  summary
-#: pidgin/plugins/pidgininc.c:94
+#: ../pidgin/plugins/pidgininc.c:94
 msgid "An example plugin that does stuff - see the description."
 msgstr ""
 "Ein Beispiel-Plugin, welches einige Sachen macht - sehen Sie sich die "
 "Beschreibung an."
 
 #. *  description
-#: pidgin/plugins/pidgininc.c:96
+#: ../pidgin/plugins/pidgininc.c:96
 msgid ""
 "This is a really cool plugin that does a lot of stuff:\n"
 "- It tells you who wrote the program when you log in\n"
@@ -15459,61 +15925,60 @@
 "- Es sendet eine Nachricht zu Leuten in Ihrer Buddy Liste, direkt wenn Sie "
 "sich angemeldet haben"
 
-#: pidgin/plugins/pidginrc.c:41
+#: ../pidgin/plugins/pidginrc.c:41
 msgid "Cursor Color"
 msgstr "Cursor-Farbe"
 
-#: pidgin/plugins/pidginrc.c:42
+#: ../pidgin/plugins/pidginrc.c:42
 msgid "Secondary Cursor Color"
 msgstr "Sekundäre Cursor-Farbe"
 
-#: pidgin/plugins/pidginrc.c:43
+#: ../pidgin/plugins/pidginrc.c:43
 msgid "Hyperlink Color"
 msgstr "Hyperlink-Farbe"
 
-#: pidgin/plugins/pidginrc.c:54
+#: ../pidgin/plugins/pidginrc.c:54
 msgid "GtkTreeView Horizontal Separation"
 msgstr "GtkTreeview horizontaler Abstand"
 
-#: pidgin/plugins/pidginrc.c:73
+#: ../pidgin/plugins/pidginrc.c:73
 msgid "Conversation Entry"
 msgstr "Unterhaltungseintrag"
 
-#: pidgin/plugins/pidginrc.c:74
+#: ../pidgin/plugins/pidginrc.c:74
 msgid "Conversation History"
 msgstr "Unterhaltungsverlauf"
 
-#: pidgin/plugins/pidginrc.c:75
+#: ../pidgin/plugins/pidginrc.c:75
 msgid "Log Viewer"
 msgstr "Mitschnittsbetrachter"
 
-#: pidgin/plugins/pidginrc.c:76
+#: ../pidgin/plugins/pidginrc.c:76
 msgid "Request Dialog"
 msgstr "Dialog anfordern"
 
-#: pidgin/plugins/pidginrc.c:77
+#: ../pidgin/plugins/pidginrc.c:77
 msgid "Notify Dialog"
 msgstr "Benachrichtigungsdialog"
 
-#: pidgin/plugins/pidginrc.c:253
+#: ../pidgin/plugins/pidginrc.c:253
 msgid "Select Color"
 msgstr "Farbe auswählen"
 
-#: pidgin/plugins/pidginrc.c:300
-#, c-format
+#: ../pidgin/plugins/pidginrc.c:300
 msgid "Select Interface Font"
 msgstr "Schriftart wählen"
 
-#: pidgin/plugins/pidginrc.c:303
+#: ../pidgin/plugins/pidginrc.c:303
 #, c-format
 msgid "Select Font for %s"
 msgstr "Schriftart für %s wählen"
 
-#: pidgin/plugins/pidginrc.c:371
+#: ../pidgin/plugins/pidginrc.c:371
 msgid "GTK+ Interface Font"
 msgstr "GTK+ Schrift"
 
-#: pidgin/plugins/pidginrc.c:391
+#: ../pidgin/plugins/pidginrc.c:391
 msgid "GTK+ Text Shortcut Theme"
 msgstr "GTK+ Text Shortcut-Thema"
 
@@ -15537,48 +16002,48 @@
 #. widget_bool_widgets[i]);
 #. }
 #.
-#: pidgin/plugins/pidginrc.c:428
+#: ../pidgin/plugins/pidginrc.c:428
 msgid "Interface colors"
 msgstr "UI-Farben"
 
-#: pidgin/plugins/pidginrc.c:452
+#: ../pidgin/plugins/pidginrc.c:452
 msgid "Widget Sizes"
 msgstr "Widget-Größen"
 
-#: pidgin/plugins/pidginrc.c:473
+#: ../pidgin/plugins/pidginrc.c:473
 msgid "Fonts"
 msgstr "Schrift"
 
-#: pidgin/plugins/pidginrc.c:497
+#: ../pidgin/plugins/pidginrc.c:497
 msgid "Gtkrc File Tools"
 msgstr "Gtkrc-Datei-Werkzeuge"
 
-#: pidgin/plugins/pidginrc.c:502
+#: ../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:511
+#: ../pidgin/plugins/pidginrc.c:511
 msgid "Re-read gtkrc files"
 msgstr "Neueinlesen der gtkrc-Dateien"
 
-#: pidgin/plugins/pidginrc.c:544
+#: ../pidgin/plugins/pidginrc.c:544
 msgid "Pidgin GTK+ Theme Control"
 msgstr "Pidgin GTK+ Themenkontrolle"
 
-#: pidgin/plugins/pidginrc.c:546 pidgin/plugins/pidginrc.c:547
+#: ../pidgin/plugins/pidginrc.c:546 ../pidgin/plugins/pidginrc.c:547
 msgid "Provides access to commonly used gtkrc settings."
 msgstr "Erlaubt den Zugriff auf häufig benutzte gtkrc-Einstellungen."
 
-#: pidgin/plugins/raw.c:175
+#: ../pidgin/plugins/raw.c:175
 msgid "Raw"
 msgstr "Raw"
 
-#: pidgin/plugins/raw.c:177
+#: ../pidgin/plugins/raw.c:177
 msgid "Lets you send raw input to text-based protocols."
 msgstr "Erlaubt Ihnen Rohdaten an textbasierte Protokolle zu senden."
 
-#: pidgin/plugins/raw.c:178
+#: ../pidgin/plugins/raw.c:178
 msgid ""
 "Lets you send raw input to text-based protocols (XMPP, MSN, IRC, TOC). Hit "
 "'Enter' in the entry box to send. Watch the debug window."
@@ -15587,7 +16052,7 @@
 "senden. Drücken Sie die 'Enter'-Taste im Eingabefeld zum Senden. Beachten "
 "Sie das Debug-Fenster."
 
-#: pidgin/plugins/relnot.c:71
+#: ../pidgin/plugins/relnot.c:71
 #, c-format
 msgid ""
 "You are using %s version %s.  The current version is %s.  You can get it "
@@ -15596,12 +16061,12 @@
 "Sie verwenden %s Version %s.  Die aktuelle Version ist %s.Download unter <a "
 "href=\"%s\">%s</a><hr>"
 
-#: pidgin/plugins/relnot.c:79
+#: ../pidgin/plugins/relnot.c:79
 #, c-format
 msgid "<b>ChangeLog:</b><br>%s"
 msgstr "<b>Änderungen:</b><br>%s"
 
-#: pidgin/plugins/relnot.c:84 pidgin/plugins/relnot.c:85
+#: ../pidgin/plugins/relnot.c:84 ../pidgin/plugins/relnot.c:85
 msgid "New Version Available"
 msgstr "Neue Version verfügbar"
 
@@ -15611,19 +16076,19 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: pidgin/plugins/relnot.c:143
+#: ../pidgin/plugins/relnot.c:143
 msgid "Release Notification"
 msgstr "Release-Benachrichtigung"
 
 #. *< name
 #. *< version
 #. *  summary
-#: pidgin/plugins/relnot.c:146
+#: ../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:148
+#: ../pidgin/plugins/relnot.c:148
 msgid ""
 "Checks periodically for new releases and notifies the user with the "
 "ChangeLog."
@@ -15631,69 +16096,69 @@
 "Prüft regelmäßig, ob neue Versionen verfügbar sind und zeigt die Änderungen "
 "an."
 
-#: pidgin/plugins/spellchk.c:1962
+#: ../pidgin/plugins/spellchk.c:1962
 msgid "Duplicate Correction"
 msgstr "Duplikat-Korrektur"
 
-#: pidgin/plugins/spellchk.c:1963
+#: ../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:2177
+#: ../pidgin/plugins/spellchk.c:2177
 msgid "Text Replacements"
 msgstr "Text-Ersetzung"
 
-#: pidgin/plugins/spellchk.c:2200
+#: ../pidgin/plugins/spellchk.c:2200
 msgid "You type"
 msgstr "Sie tippen"
 
-#: pidgin/plugins/spellchk.c:2214
+#: ../pidgin/plugins/spellchk.c:2214
 msgid "You send"
 msgstr "Sie senden"
 
-#: pidgin/plugins/spellchk.c:2228
+#: ../pidgin/plugins/spellchk.c:2228
 msgid "Whole words only"
 msgstr "Nur ganze Wörter"
 
-#: pidgin/plugins/spellchk.c:2240
+#: ../pidgin/plugins/spellchk.c:2240
 msgid "Case sensitive"
 msgstr "Groß-/Kleinschreibung beachten"
 
-#: pidgin/plugins/spellchk.c:2266
+#: ../pidgin/plugins/spellchk.c:2266
 msgid "Add a new text replacement"
 msgstr "Fügen Sie eine neue Textersetzung hinzu"
 
-#: pidgin/plugins/spellchk.c:2282
+#: ../pidgin/plugins/spellchk.c:2282
 msgid "You _type:"
 msgstr "Sie _tippen:"
 
-#: pidgin/plugins/spellchk.c:2299
+#: ../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:2311
+#: ../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:2313
+#: ../pidgin/plugins/spellchk.c:2313
 msgid "Only replace _whole words"
 msgstr "Ersetze nur ganze _Wörter"
 
-#: pidgin/plugins/spellchk.c:2338
+#: ../pidgin/plugins/spellchk.c:2338
 msgid "General Text Replacement Options"
 msgstr "Allgemeine Textersetzungsoptionen"
 
-#: pidgin/plugins/spellchk.c:2339
+#: ../pidgin/plugins/spellchk.c:2339
 msgid "Enable replacement of last word on send"
 msgstr "Ersetzung des letztes Worts beim Senden"
 
-#: pidgin/plugins/spellchk.c:2370
+#: ../pidgin/plugins/spellchk.c:2370
 msgid "Text replacement"
 msgstr "Textersetzung"
 
-#: pidgin/plugins/spellchk.c:2372 pidgin/plugins/spellchk.c:2373
+#: ../pidgin/plugins/spellchk.c:2372 ../pidgin/plugins/spellchk.c:2373
 msgid "Replaces text in outgoing messages according to user-defined rules."
 msgstr ""
 "Ersetzt Text in ausgehenden Nachrichten durch benutzerdefinierte Regeln."
@@ -15704,7 +16169,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: pidgin/plugins/ticker/ticker.c:74 pidgin/plugins/ticker/ticker.c:354
+#: ../pidgin/plugins/ticker/ticker.c:74 ../pidgin/plugins/ticker/ticker.c:354
 msgid "Buddy Ticker"
 msgstr "Buddy-Ticker"
 
@@ -15712,11 +16177,11 @@
 #. *< version
 #. *  summary
 #. *  description
-#: pidgin/plugins/ticker/ticker.c:357 pidgin/plugins/ticker/ticker.c:359
+#: ../pidgin/plugins/ticker/ticker.c:357 ../pidgin/plugins/ticker/ticker.c:359
 msgid "A horizontal scrolling version of the buddy list."
 msgstr "Zeigt die Buddy-Liste als tickerähnliche Laufschrift."
 
-#: pidgin/plugins/timestamp.c:137
+#: ../pidgin/plugins/timestamp.c:137
 msgid "Display Timestamps Every"
 msgstr "Zeige Zeitstemple alle"
 
@@ -15726,48 +16191,49 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: pidgin/plugins/timestamp.c:202
+#: ../pidgin/plugins/timestamp.c:202
 msgid "Timestamp"
 msgstr "Zeitstempel"
 
 #. *< name
 #. *< version
 #. *  summary
-#: pidgin/plugins/timestamp.c:205
+#: ../pidgin/plugins/timestamp.c:205
 msgid "Display iChat-style timestamps"
 msgstr "Zeige iChat-ähnliche Zeitstempel"
 
 #. *  description
-#: pidgin/plugins/timestamp.c:207
+#: ../pidgin/plugins/timestamp.c:207
 msgid "Display iChat-style timestamps every N minutes."
 msgstr "Zeige alle N Minuten iChat-ähnliche Zeitstempel an."
 
-#: pidgin/plugins/timestamp_format.c:23
+#: ../pidgin/plugins/timestamp_format.c:23
 msgid "Timestamp Format Options"
 msgstr "Zeitstempelformat-Optionen"
 
-#: pidgin/plugins/timestamp_format.c:26
-#, c-format
+#: ../pidgin/plugins/timestamp_format.c:26
 msgid "_Force 24-hour time format"
 msgstr "_Erzwinge 24-Stunden Zeitformat"
 
-#: pidgin/plugins/timestamp_format.c:33
+#: ../pidgin/plugins/timestamp_format.c:33
 msgid "Show dates in..."
 msgstr "Zeige Datumsangaben in..."
 
-#: pidgin/plugins/timestamp_format.c:38
+#: ../pidgin/plugins/timestamp_format.c:38
 msgid "Co_nversations:"
 msgstr "U_nterhaltungen:"
 
-#: pidgin/plugins/timestamp_format.c:40 pidgin/plugins/timestamp_format.c:49
+#: ../pidgin/plugins/timestamp_format.c:40
+#: ../pidgin/plugins/timestamp_format.c:49
 msgid "For delayed messages"
 msgstr "Für verzögerte Nachrichten"
 
-#: pidgin/plugins/timestamp_format.c:41 pidgin/plugins/timestamp_format.c:50
+#: ../pidgin/plugins/timestamp_format.c:41
+#: ../pidgin/plugins/timestamp_format.c:50
 msgid "For delayed messages and in chats"
 msgstr "Für verzögerte Nachrichten in Chats"
 
-#: pidgin/plugins/timestamp_format.c:47
+#: ../pidgin/plugins/timestamp_format.c:47
 msgid "_Message Logs:"
 msgstr "Nachrichten-_Mitschnitt:"
 
@@ -15777,19 +16243,19 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: pidgin/plugins/timestamp_format.c:151
+#: ../pidgin/plugins/timestamp_format.c:151
 msgid "Message Timestamp Formats"
 msgstr "Nachrichten-Zeitstempel-Formate"
 
 #. *< name
 #. *< version
 #. *  summary
-#: pidgin/plugins/timestamp_format.c:154
+#: ../pidgin/plugins/timestamp_format.c:154
 msgid "Customizes the message timestamp formats."
 msgstr "Nachrichten-Zeitstempel-Formate anpassen."
 
 #. *  description
-#: pidgin/plugins/timestamp_format.c:156
+#: ../pidgin/plugins/timestamp_format.c:156
 msgid ""
 "This plugin allows the user to customize conversation and logging message "
 "timestamp formats."
@@ -15797,44 +16263,44 @@
 "Dieses Plugin erlaubt es dem Benutzer die Zeitstempel in Unterhaltungen und "
 "im Mitschnitt anzupassen."
 
-#: pidgin/plugins/win32/transparency/win2ktrans.c:174
-#: pidgin/plugins/win32/transparency/win2ktrans.c:589
-#: pidgin/plugins/win32/transparency/win2ktrans.c:636
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:174
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:593
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:640
 msgid "Opacity:"
 msgstr "Durchlässigkeit:"
 
 #. IM Convo trans options
-#: pidgin/plugins/win32/transparency/win2ktrans.c:553
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:557
 msgid "IM Conversation Windows"
 msgstr "IM Gesprächsfenster"
 
-#: pidgin/plugins/win32/transparency/win2ktrans.c:554
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:558
 msgid "_IM window transparency"
 msgstr "_IM Fenstertransparenz"
 
-#: pidgin/plugins/win32/transparency/win2ktrans.c:568
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:572
 msgid "_Show slider bar in IM window"
 msgstr "Zeige _Schiebebalken im IM-Fenster"
 
-#: pidgin/plugins/win32/transparency/win2ktrans.c:575
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:579
 msgid "Remove IM window transparency on focus"
 msgstr "Transparenz des Unterhaltungsfensters beim Aktivieren aufheben"
 
-#: pidgin/plugins/win32/transparency/win2ktrans.c:578
-#: pidgin/plugins/win32/transparency/win2ktrans.c:626
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:582
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:630
 msgid "Always on top"
 msgstr "Immer im Vordergrund"
 
 #. Buddy List trans options
-#: pidgin/plugins/win32/transparency/win2ktrans.c:610
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:614
 msgid "Buddy List Window"
 msgstr "Buddy-Listen-Fenster"
 
-#: pidgin/plugins/win32/transparency/win2ktrans.c:611
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:615
 msgid "_Buddy List window transparency"
 msgstr "Transparenz des _Buddy-Listen-Fensters"
 
-#: pidgin/plugins/win32/transparency/win2ktrans.c:624
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:628
 msgid "Remove Buddy List window transparency on focus"
 msgstr "Transparenz des Buddy-Listen-Fensters beim Aktivieren aufheben"
 
@@ -15844,19 +16310,19 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: pidgin/plugins/win32/transparency/win2ktrans.c:684
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:688
 msgid "Transparency"
 msgstr "Transparenz"
 
 #. *< name
 #. *< version
 #. *  summary
-#: pidgin/plugins/win32/transparency/win2ktrans.c:687
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:691
 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:689
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:693
 msgid ""
 "This plugin enables variable alpha transparency on conversation windows and "
 "the buddy list.\n"
@@ -15868,53 +16334,53 @@
 "\n"
 "* Hinweis: Dieses Plugin verlangt Win2000 oder höher."
 
-#: pidgin/plugins/win32/winprefs/winprefs.c:307
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:303
 msgid "GTK+ Runtime Version"
 msgstr "GTK+ Runtime Version"
 
 #. Autostart
-#: pidgin/plugins/win32/winprefs/winprefs.c:315
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:311
 msgid "Startup"
 msgstr "Start"
 
-#: pidgin/plugins/win32/winprefs/winprefs.c:316
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:312
 #, c-format
 msgid "_Start %s on Windows startup"
 msgstr "_Starte %s beim Windows-Start"
 
-#: pidgin/plugins/win32/winprefs/winprefs.c:331
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:327
 msgid "_Dockable Buddy List"
 msgstr "An_dockbare Buddy-Liste"
 
 #. Blist On Top
-#: pidgin/plugins/win32/winprefs/winprefs.c:335
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:331
 msgid "_Keep Buddy List window on top:"
 msgstr "_Buddy-Listen-Fenster bleibt im Vordergrund:"
 
 #. XXX: Did this ever work?
-#: pidgin/plugins/win32/winprefs/winprefs.c:340
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:336
 msgid "Only when docked"
 msgstr "Nur wenn angedockt"
 
-#: pidgin/plugins/win32/winprefs/winprefs.c:345
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:341
 msgid "_Flash window when chat messages are received"
 msgstr "_Fenster blinkt, wenn Nachrichten empfangen werden"
 
-#: pidgin/plugins/win32/winprefs/winprefs.c:375
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:371
 msgid "Windows Pidgin Options"
 msgstr "Windows-Pidgin-Optionen"
 
-#: pidgin/plugins/win32/winprefs/winprefs.c:377
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:373
 msgid "Options specific to Pidgin for Windows."
 msgstr "Optionen für Pidgin unter Windows."
 
-#: pidgin/plugins/win32/winprefs/winprefs.c:378
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:374
 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
+#: ../pidgin/plugins/xmppconsole.c:667
 msgid "<font color='#777777'>Logged out.</font>"
 msgstr "<font color='#777777'>Abgemeldet.</font>"
 
@@ -15924,46 +16390,40 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: pidgin/plugins/xmppconsole.c:746 pidgin/plugins/xmppconsole.c:841
-#: pidgin/plugins/xmppconsole.c:860
+#: ../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:753
+#: ../pidgin/plugins/xmppconsole.c:753
 msgid "Account: "
 msgstr "Konto: "
 
-#: pidgin/plugins/xmppconsole.c:780
+#: ../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:790
+#: ../pidgin/plugins/xmppconsole.c:790
 msgid "Insert an <iq/> stanza."
 msgstr "Einen <iq/> Block einfügen."
 
-#: pidgin/plugins/xmppconsole.c:799
+#: ../pidgin/plugins/xmppconsole.c:799
 msgid "Insert a <presence/> stanza."
 msgstr "Einen <presence/> Block einfügen."
 
-#: pidgin/plugins/xmppconsole.c:808
+#: ../pidgin/plugins/xmppconsole.c:808
 msgid "Insert a <message/> stanza."
 msgstr "Einen <message/> Block einfügen."
 
 #. *< name
 #. *< version
 #. *  summary
-#: pidgin/plugins/xmppconsole.c:863
+#: ../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:865
+#: ../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."
-
-#~ msgid "You have been signed off for an unknown reason."
-#~ msgstr "Sie haben sich aus einem unbekannten Grund abgemeldet."
-
-#~ msgid "Show buddy _icons"
-#~ msgstr "Buddy-_Icons anzeigen"