Binary files /tmp/tmpDLDwi4/hbSI30kwC6/language-pack-xh-base-14.04+20150804/data/extra.tar and /tmp/tmpDLDwi4/D6Nm6njGgv/language-pack-xh-base-14.04+20160720/data/extra.tar differ
diff -Nru language-pack-xh-base-14.04+20150804/data/xh/LC_MESSAGES/apparmorapplet.po language-pack-xh-base-14.04+20160720/data/xh/LC_MESSAGES/apparmorapplet.po
--- language-pack-xh-base-14.04+20150804/data/xh/LC_MESSAGES/apparmorapplet.po	2015-08-14 07:58:58.000000000 +0000
+++ language-pack-xh-base-14.04+20160720/data/xh/LC_MESSAGES/apparmorapplet.po	2016-07-20 16:45:10.000000000 +0000
@@ -12,8 +12,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-08-04 07:36+0000\n"
-"X-Generator: Launchpad (build 17656)\n"
+"X-Launchpad-Export-Date: 2016-07-20 13:17+0000\n"
+"X-Generator: Launchpad (build 18147)\n"
 
 #: src/apparmor-applet.c:244
 msgid ""
diff -Nru language-pack-xh-base-14.04+20150804/data/xh/LC_MESSAGES/apparmor-parser.po language-pack-xh-base-14.04+20160720/data/xh/LC_MESSAGES/apparmor-parser.po
--- language-pack-xh-base-14.04+20150804/data/xh/LC_MESSAGES/apparmor-parser.po	2015-08-14 07:58:58.000000000 +0000
+++ language-pack-xh-base-14.04+20160720/data/xh/LC_MESSAGES/apparmor-parser.po	2016-07-20 16:45:12.000000000 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-08-04 07:36+0000\n"
-"X-Generator: Launchpad (build 17656)\n"
+"X-Launchpad-Export-Date: 2016-07-20 13:17+0000\n"
+"X-Generator: Launchpad (build 18147)\n"
 
 #: ../parser_include.c:113
 msgid "Error: Out of memory.\n"
diff -Nru language-pack-xh-base-14.04+20150804/data/xh/LC_MESSAGES/newt.po language-pack-xh-base-14.04+20160720/data/xh/LC_MESSAGES/newt.po
--- language-pack-xh-base-14.04+20150804/data/xh/LC_MESSAGES/newt.po	2015-08-14 07:58:57.000000000 +0000
+++ language-pack-xh-base-14.04+20160720/data/xh/LC_MESSAGES/newt.po	2016-07-20 16:45:10.000000000 +0000
@@ -15,8 +15,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-08-04 06:29+0000\n"
-"X-Generator: Launchpad (build 17656)\n"
+"X-Launchpad-Export-Date: 2016-07-20 11:59+0000\n"
+"X-Generator: Launchpad (build 18147)\n"
 
 #: ../dialogboxes.c:49
 msgid "Ok"
diff -Nru language-pack-xh-base-14.04+20150804/data/xh/LC_MESSAGES/pidgin.po language-pack-xh-base-14.04+20160720/data/xh/LC_MESSAGES/pidgin.po
--- language-pack-xh-base-14.04+20150804/data/xh/LC_MESSAGES/pidgin.po	2015-08-14 07:58:59.000000000 +0000
+++ language-pack-xh-base-14.04+20160720/data/xh/LC_MESSAGES/pidgin.po	2016-07-20 16:45:11.000000000 +0000
@@ -8,22 +8,22 @@
 msgstr ""
 "Project-Id-Version: Pidgin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-10-27 16:57+0000\n"
-"PO-Revision-Date: 2014-04-11 08:12+0000\n"
+"POT-Creation-Date: 2016-07-12 13:50+0000\n"
+"PO-Revision-Date: 2016-07-13 07:30+0000\n"
 "Last-Translator: Canonical Ltd <Unknown>\n"
 "Language-Team: Xhosa <xh-translate@ubuntu.com>\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-Launchpad-Export-Date: 2015-08-04 07:46+0000\n"
-"X-Generator: Launchpad (build 17656)\n"
+"X-Launchpad-Export-Date: 2016-07-20 13:29+0000\n"
+"X-Generator: Launchpad (build 18147)\n"
 "Language: xh\n"
 
 #. Translators may want to transliterate the name.
 #. It is not to be translated.
-#: ../finch/finch.c:66 ../finch/finch.c:335 ../finch/finch.c:364
-#: ../finch/finch.c:459
+#: ../finch/finch.c:66 ../finch/finch.c:336 ../finch/finch.c:365
+#: ../finch/finch.c:454
 msgid "Finch"
 msgstr ""
 
@@ -45,7 +45,7 @@
 "  -v, --version       display the current version and exit\n"
 msgstr ""
 
-#: ../finch/finch.c:362 ../pidgin/gtkmain.c:723
+#: ../finch/finch.c:363 ../pidgin/gtkmain.c:719
 #, c-format
 msgid ""
 "%s encountered errors migrating your settings from %s to %s. Please "
@@ -62,11 +62,11 @@
 #: ../finch/plugins/gntclipboard.c:128
 #: ../libpurple/protocols/jabber/chat.c:812
 #: ../libpurple/protocols/jabber/chat.c:823
-#: ../libpurple/protocols/jabber/jabber.c:2360
+#: ../libpurple/protocols/jabber/jabber.c:2352
 #: ../libpurple/protocols/jabber/jutil.c:710
 #: ../libpurple/protocols/mxit/login.c:526
-#: ../libpurple/protocols/mxit/protocol.c:2543
-#: ../libpurple/protocols/silc/ops.c:77 ../libpurple/protocols/silc/ops.c:1471
+#: ../libpurple/protocols/mxit/protocol.c:2582
+#: ../libpurple/protocols/silc/ops.c:77 ../libpurple/protocols/silc/ops.c:1472
 #: ../libpurple/protocols/silc10/ops.c:1451
 #: ../pidgin/plugins/disco/xmppdisco.c:514
 #: ../pidgin/plugins/disco/xmppdisco.c:519
@@ -113,7 +113,7 @@
 msgstr ""
 
 #: ../finch/gntaccount.c:570 ../finch/gntconn.c:138
-#: ../pidgin/gtkaccount.c:1583 ../pidgin/gtkblist.c:5127
+#: ../pidgin/gtkaccount.c:1576 ../pidgin/gtkblist.c:5127
 msgid "Modify Account"
 msgstr "Lungisa i-Akhawunti"
 
@@ -151,10 +151,10 @@
 #: ../finch/gntblist.c:1583 ../finch/gntblist.c:2762 ../finch/gntblist.c:2813
 #: ../finch/gntblist.c:2887 ../finch/gntblist.c:2949 ../finch/gntcertmgr.c:91
 #: ../finch/gntplugin.c:534 ../finch/gntpounce.c:473 ../finch/gntpounce.c:681
-#: ../finch/gntprefs.c:268 ../finch/gntsound.c:1081 ../finch/gntstatus.c:147
+#: ../finch/gntprefs.c:266 ../finch/gntsound.c:1081 ../finch/gntstatus.c:147
 #: ../finch/gntstatus.c:487 ../finch/gntstatus.c:612
-#: ../finch/plugins/gnthistory.c:182 ../libpurple/account.c:1281
-#: ../libpurple/account.c:1644 ../libpurple/account.c:1679
+#: ../finch/plugins/gnthistory.c:182 ../libpurple/account.c:1222
+#: ../libpurple/account.c:1585 ../libpurple/account.c:1620
 #: ../libpurple/conversation.c:1311 ../libpurple/conversation.c:2147
 #: ../libpurple/plugins/buddynote.c:51 ../libpurple/protocols/gg/gg.c:336
 #: ../libpurple/protocols/gg/gg.c:391 ../libpurple/protocols/gg/gg.c:456
@@ -162,11 +162,11 @@
 #: ../libpurple/protocols/jabber/buddy.c:2214
 #: ../libpurple/protocols/jabber/buddy.c:2263
 #: ../libpurple/protocols/jabber/chat.c:922
-#: ../libpurple/protocols/jabber/jabber.c:1475
-#: ../libpurple/protocols/jabber/jabber.c:1486
-#: ../libpurple/protocols/jabber/jabber.c:2566
-#: ../libpurple/protocols/jabber/jabber.c:3430
-#: ../libpurple/protocols/jabber/si.c:1580
+#: ../libpurple/protocols/jabber/jabber.c:1467
+#: ../libpurple/protocols/jabber/jabber.c:1478
+#: ../libpurple/protocols/jabber/jabber.c:2558
+#: ../libpurple/protocols/jabber/jabber.c:3422
+#: ../libpurple/protocols/jabber/si.c:1584
 #: ../libpurple/protocols/jabber/usernick.c:83
 #: ../libpurple/protocols/jabber/xdata.c:404
 #: ../libpurple/protocols/msn/msn.c:452 ../libpurple/protocols/msn/msn.c:577
@@ -177,21 +177,21 @@
 #: ../libpurple/protocols/mxit/actions.c:412
 #: ../libpurple/protocols/mxit/login.c:365
 #: ../libpurple/protocols/mxit/login.c:711
-#: ../libpurple/protocols/myspace/user.c:826
-#: ../libpurple/protocols/myspace/user.c:887
-#: ../libpurple/protocols/oscar/oscar.c:5215
-#: ../libpurple/protocols/oscar/peer.c:1066
-#: ../libpurple/protocols/sametime/sametime.c:3435
-#: ../libpurple/protocols/sametime/sametime.c:3521
-#: ../libpurple/protocols/sametime/sametime.c:5420
-#: ../libpurple/protocols/sametime/sametime.c:5510
-#: ../libpurple/protocols/sametime/sametime.c:5635
+#: ../libpurple/protocols/myspace/user.c:824
+#: ../libpurple/protocols/myspace/user.c:885
+#: ../libpurple/protocols/oscar/oscar.c:5220
+#: ../libpurple/protocols/oscar/peer.c:1071
+#: ../libpurple/protocols/sametime/sametime.c:3471
+#: ../libpurple/protocols/sametime/sametime.c:3557
+#: ../libpurple/protocols/sametime/sametime.c:5456
+#: ../libpurple/protocols/sametime/sametime.c:5546
+#: ../libpurple/protocols/sametime/sametime.c:5671
 #: ../libpurple/protocols/silc/buddy.c:459
-#: ../libpurple/protocols/silc/buddy.c:1078
-#: ../libpurple/protocols/silc/buddy.c:1193
+#: ../libpurple/protocols/silc/buddy.c:1084
+#: ../libpurple/protocols/silc/buddy.c:1199
 #: ../libpurple/protocols/silc/chat.c:622
 #: ../libpurple/protocols/silc/chat.c:756
-#: ../libpurple/protocols/silc/ops.c:1831
+#: ../libpurple/protocols/silc/ops.c:1832
 #: ../libpurple/protocols/silc/silc.c:1063
 #: ../libpurple/protocols/silc/silc.c:1271
 #: ../libpurple/protocols/silc10/buddy.c:468
@@ -203,41 +203,41 @@
 #: ../libpurple/protocols/silc10/silc.c:761
 #: ../libpurple/protocols/silc10/silc.c:967
 #: ../libpurple/protocols/yahoo/libymsg.c:1369
-#: ../libpurple/protocols/yahoo/libymsg.c:4562
-#: ../libpurple/protocols/yahoo/libymsg.c:4573
+#: ../libpurple/protocols/yahoo/libymsg.c:4575
+#: ../libpurple/protocols/yahoo/libymsg.c:4586
 #: ../libpurple/protocols/yahoo/yahoo_aliases.c:589
 #: ../libpurple/protocols/yahoo/yahoo_aliases.c:600
-#: ../pidgin/gtkaccount.c:1952 ../pidgin/gtkaccount.c:2487
+#: ../pidgin/gtkaccount.c:1945 ../pidgin/gtkaccount.c:2480
 #: ../pidgin/gtkblist.c:705 ../pidgin/gtkblist.c:3582
-#: ../pidgin/gtkblist.c:7334 ../pidgin/gtkcertmgr.c:195
-#: ../pidgin/gtkdialogs.c:913 ../pidgin/gtkdialogs.c:1052
-#: ../pidgin/gtkdialogs.c:1144 ../pidgin/gtkdialogs.c:1164
-#: ../pidgin/gtkdialogs.c:1188 ../pidgin/gtkdialogs.c:1210
-#: ../pidgin/gtkdialogs.c:1258 ../pidgin/gtkdialogs.c:1299
-#: ../pidgin/gtkdialogs.c:1355 ../pidgin/gtkdialogs.c:1394
-#: ../pidgin/gtkdialogs.c:1421 ../pidgin/gtkimhtmltoolbar.c:451
+#: ../pidgin/gtkblist.c:7331 ../pidgin/gtkcertmgr.c:195
+#: ../pidgin/gtkdialogs.c:900 ../pidgin/gtkdialogs.c:1039
+#: ../pidgin/gtkdialogs.c:1131 ../pidgin/gtkdialogs.c:1151
+#: ../pidgin/gtkdialogs.c:1175 ../pidgin/gtkdialogs.c:1197
+#: ../pidgin/gtkdialogs.c:1245 ../pidgin/gtkdialogs.c:1286
+#: ../pidgin/gtkdialogs.c:1342 ../pidgin/gtkdialogs.c:1381
+#: ../pidgin/gtkdialogs.c:1408 ../pidgin/gtkimhtmltoolbar.c:451
 #: ../pidgin/gtklog.c:324 ../pidgin/gtkplugin.c:308 ../pidgin/gtkpounce.c:1141
-#: ../pidgin/gtkprivacy.c:498 ../pidgin/gtkprivacy.c:514
-#: ../pidgin/gtkprivacy.c:539 ../pidgin/gtkprivacy.c:553
+#: ../pidgin/gtkprivacy.c:497 ../pidgin/gtkprivacy.c:513
+#: ../pidgin/gtkprivacy.c:538 ../pidgin/gtkprivacy.c:552
 #: ../pidgin/gtkrequest.c:301 ../pidgin/gtksavedstatuses.c:317
-#: ../pidgin/gtkstatusbox.c:1611 ../pidgin/gtkutils.c:1628
-#: ../pidgin/gtkutils.c:1648 ../pidgin/plugins/disco/gtkdisco.c:246
+#: ../pidgin/gtkstatusbox.c:1611 ../pidgin/gtkutils.c:1620
+#: ../pidgin/gtkutils.c:1640 ../pidgin/plugins/disco/gtkdisco.c:246
 msgid "Cancel"
 msgstr "Rhoxisa"
 
 #. Save button
 #. Save
-#: ../finch/gntaccount.c:658 ../finch/gntcertmgr.c:311 ../finch/gntdebug.c:342
-#: ../finch/gntplugin.c:534 ../finch/gntpounce.c:479 ../finch/gntprefs.c:268
+#: ../finch/gntaccount.c:658 ../finch/gntcertmgr.c:311 ../finch/gntdebug.c:341
+#: ../finch/gntplugin.c:534 ../finch/gntpounce.c:479 ../finch/gntprefs.c:266
 #: ../finch/gntsound.c:1078 ../finch/gntstatus.c:490 ../finch/gntstatus.c:600
-#: ../libpurple/account.c:1678 ../libpurple/plugins/buddynote.c:50
+#: ../libpurple/account.c:1619 ../libpurple/plugins/buddynote.c:50
 #: ../libpurple/protocols/jabber/buddy.c:680 ../pidgin/gtkblist.c:705
 #: ../pidgin/gtkdebug.c:824 ../pidgin/gtkdebug.c:826
 #: ../pidgin/gtkrequest.c:307
 msgid "Save"
 msgstr "Gcina"
 
-#: ../finch/gntaccount.c:711 ../pidgin/gtkaccount.c:1943
+#: ../finch/gntaccount.c:711 ../pidgin/gtkaccount.c:1936
 #: ../pidgin/gtksavedstatuses.c:305 ../pidgin/gtkstatusbox.c:1605
 #, c-format
 msgid "Are you sure you want to delete %s?"
@@ -251,14 +251,14 @@
 #: ../finch/gntaccount.c:717 ../finch/gntaccount.c:832
 #: ../finch/gntcertmgr.c:319 ../finch/gntpounce.c:680 ../finch/gntpounce.c:743
 #: ../finch/gntstatus.c:146 ../finch/gntstatus.c:212
-#: ../pidgin/gtkaccount.c:1951 ../pidgin/gtklog.c:323
+#: ../pidgin/gtkaccount.c:1944 ../pidgin/gtklog.c:323
 #: ../pidgin/gtkpounce.c:1140 ../pidgin/gtkrequest.c:304
 #: ../pidgin/gtksavedstatuses.c:316 ../pidgin/gtkstatusbox.c:1610
 msgid "Delete"
 msgstr "Cima"
 
 #: ../finch/gntaccount.c:793 ../finch/gntblist.c:2628 ../finch/gntui.c:99
-#: ../pidgin/gtkaccount.c:2348
+#: ../pidgin/gtkaccount.c:2341
 msgid "Accounts"
 msgstr "Ii-Akhawunti"
 
@@ -269,13 +269,13 @@
 #. Add button
 #: ../finch/gntaccount.c:823 ../finch/gntaccount.c:1013
 #: ../finch/gntblist.c:699 ../finch/gntblist.c:806 ../finch/gntblist.c:854
-#: ../finch/gntblist.c:3069 ../finch/gntcertmgr.c:306 ../finch/gntnotify.c:456
+#: ../finch/gntblist.c:3069 ../finch/gntcertmgr.c:306 ../finch/gntnotify.c:452
 #: ../finch/gntpounce.c:727 ../finch/gntroomlist.c:276
 #: ../finch/gntstatus.c:201 ../libpurple/protocols/gg/gg.c:455
-#: ../libpurple/protocols/sametime/sametime.c:5509
+#: ../libpurple/protocols/sametime/sametime.c:5545
 #: ../libpurple/protocols/silc/chat.c:621
-#: ../libpurple/protocols/silc10/chat.c:599 ../pidgin/gtkaccount.c:2486
-#: ../pidgin/gtkblist.c:7333 ../pidgin/gtkconv.c:1692
+#: ../libpurple/protocols/silc10/chat.c:599 ../pidgin/gtkaccount.c:2479
+#: ../pidgin/gtkblist.c:7330 ../pidgin/gtkconv.c:1692
 #: ../pidgin/gtkrequest.c:305
 msgid "Add"
 msgstr "Yongeza"
@@ -285,12 +285,12 @@
 msgid "Modify"
 msgstr ""
 
-#: ../finch/gntaccount.c:936 ../pidgin/gtkaccount.c:2433
+#: ../finch/gntaccount.c:936 ../pidgin/gtkaccount.c:2426
 #, c-format
 msgid "%s%s%s%s has made %s his or her buddy%s%s"
 msgstr ""
 
-#: ../finch/gntaccount.c:1009 ../pidgin/gtkaccount.c:2485
+#: ../finch/gntaccount.c:1009 ../pidgin/gtkaccount.c:2478
 msgid "Add buddy to your list?"
 msgstr "Yongeza umhlobo kuluhlu lwakho?"
 
@@ -300,17 +300,17 @@
 msgstr ""
 
 #: ../finch/gntaccount.c:1094 ../finch/gntaccount.c:1097
-#: ../finch/gntaccount.c:1124 ../pidgin/gtkaccount.c:2618
+#: ../finch/gntaccount.c:1124 ../pidgin/gtkaccount.c:2611
 msgid "Authorize buddy?"
 msgstr ""
 
 #: ../finch/gntaccount.c:1101 ../finch/gntaccount.c:1128
-#: ../pidgin/gtkaccount.c:2619
+#: ../pidgin/gtkaccount.c:2612
 msgid "Authorize"
 msgstr "Gunyazisa"
 
 #: ../finch/gntaccount.c:1102 ../finch/gntaccount.c:1129
-#: ../pidgin/gtkaccount.c:2620
+#: ../pidgin/gtkaccount.c:2613
 msgid "Deny"
 msgstr "Phika"
 
@@ -336,7 +336,7 @@
 #: ../finch/gntblist.c:319 ../pidgin/gtkprefs.c:422 ../pidgin/gtkprefs.c:543
 #: ../pidgin/gtkprefs.c:551
 #: ../pidgin/pixmaps/emotes/default/24/default.theme.in.h:1
-#: ../pidgin/plugins/vvconfig.c:93
+#: ../pidgin/plugins/vvconfig.c:87
 msgid "Default"
 msgstr ""
 
@@ -360,21 +360,21 @@
 msgid "Error adding buddy"
 msgstr ""
 
-#: ../finch/gntblist.c:678 ../libpurple/protocols/jabber/jabber.c:1409
-#: ../libpurple/protocols/jabber/jabber.c:1411
-#: ../libpurple/protocols/oscar/oscar.c:3020
-#: ../libpurple/protocols/silc/buddy.c:1546
-#: ../libpurple/protocols/silc/ops.c:1208
-#: ../libpurple/protocols/silc/ops.c:1211
-#: ../libpurple/protocols/silc/ops.c:1347
-#: ../libpurple/protocols/silc/ops.c:1350
+#: ../finch/gntblist.c:678 ../libpurple/protocols/jabber/jabber.c:1401
+#: ../libpurple/protocols/jabber/jabber.c:1403
+#: ../libpurple/protocols/oscar/oscar.c:3023
+#: ../libpurple/protocols/silc/buddy.c:1552
+#: ../libpurple/protocols/silc/ops.c:1209
+#: ../libpurple/protocols/silc/ops.c:1212
+#: ../libpurple/protocols/silc/ops.c:1348
+#: ../libpurple/protocols/silc/ops.c:1351
 #: ../libpurple/protocols/silc/silc.c:1245
 #: ../libpurple/protocols/silc10/buddy.c:1559
 #: ../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:941 ../pidgin/gtkaccount.c:2025
+#: ../libpurple/protocols/silc10/silc.c:941 ../pidgin/gtkaccount.c:2018
 #: ../pidgin/gtksavedstatuses.c:951
 msgid "Username"
 msgstr "Igama lomsebenzisi"
@@ -393,7 +393,7 @@
 
 #: ../finch/gntblist.c:691 ../finch/gntblist.c:785 ../finch/gntblist.c:1794
 #: ../finch/gntblist.c:2743 ../finch/gntblist.c:2799 ../finch/gntblist.c:2874
-#: ../finch/gntblist.c:2934 ../finch/gntnotify.c:195 ../finch/gntstatus.c:578
+#: ../finch/gntblist.c:2934 ../finch/gntnotify.c:192 ../finch/gntstatus.c:578
 #: ../libpurple/plugins/idle.c:149 ../libpurple/plugins/idle.c:186
 #: ../pidgin/gtkblist.c:3779 ../pidgin/gtknotify.c:712
 #: ../pidgin/gtkpounce.c:1292 ../pidgin/plugins/gevolution/gevolution.c:456
@@ -402,14 +402,14 @@
 
 #: ../finch/gntblist.c:697 ../finch/gntblist.c:1259
 #: ../libpurple/protocols/silc/buddy.c:730
-#: ../libpurple/protocols/silc/buddy.c:1029
-#: ../libpurple/protocols/silc/buddy.c:1074
-#: ../libpurple/protocols/silc/buddy.c:1184
+#: ../libpurple/protocols/silc/buddy.c:1035
+#: ../libpurple/protocols/silc/buddy.c:1080
+#: ../libpurple/protocols/silc/buddy.c:1190
 #: ../libpurple/protocols/silc10/buddy.c:737
 #: ../libpurple/protocols/silc10/buddy.c:1036
 #: ../libpurple/protocols/silc10/buddy.c:1083
 #: ../libpurple/protocols/silc10/buddy.c:1183
-#: ../libpurple/protocols/yahoo/libymsg.c:4370 ../pidgin/gtkblist.c:7096
+#: ../libpurple/protocols/yahoo/libymsg.c:4383 ../pidgin/gtkblist.c:7093
 #: ../pidgin/plugins/gevolution/add_buddy_dialog.c:451
 msgid "Add Buddy"
 msgstr "Yongeza umHlobo"
@@ -418,18 +418,18 @@
 msgid "Please enter buddy information."
 msgstr ""
 
-#: ../finch/gntblist.c:753 ../libpurple/blist.c:1496
+#: ../finch/gntblist.c:753 ../libpurple/blist.c:1495
 msgid "Chats"
 msgstr "Iincoko"
 
 #. Extract their Name and put it in
 #: ../finch/gntblist.c:791 ../finch/gntblist.c:2738 ../finch/gntblist.c:2794
 #: ../finch/gntblist.c:2929 ../finch/gntroomlist.c:300
-#: ../libpurple/protocols/jabber/jabber.c:1432
-#: ../libpurple/protocols/jabber/jabber.c:1436
-#: ../libpurple/protocols/msn/msn.c:529 ../libpurple/protocols/msn/msn.c:2410
-#: ../libpurple/protocols/msn/msn.c:2475 ../libpurple/protocols/msn/msn.c:2502
-#: ../pidgin/gtkplugin.c:767 ../pidgin/gtkroomlist.c:740
+#: ../libpurple/protocols/jabber/jabber.c:1424
+#: ../libpurple/protocols/jabber/jabber.c:1428
+#: ../libpurple/protocols/msn/msn.c:529 ../libpurple/protocols/msn/msn.c:2411
+#: ../libpurple/protocols/msn/msn.c:2476 ../libpurple/protocols/msn/msn.c:2503
+#: ../pidgin/gtkplugin.c:765 ../pidgin/gtkroomlist.c:740
 #: ../pidgin/plugins/disco/gtkdisco.c:554
 #: ../pidgin/plugins/gevolution/add_buddy_dialog.c:131
 #: ../pidgin/plugins/gevolution/assoc-buddy.c:122
@@ -437,14 +437,14 @@
 msgstr "iGama"
 
 #: ../finch/gntblist.c:794 ../finch/gntblist.c:1735
-#: ../libpurple/protocols/gg/gg.c:1569 ../libpurple/protocols/msn/msn.c:2236
+#: ../libpurple/protocols/gg/gg.c:1569 ../libpurple/protocols/msn/msn.c:2237
 #: ../libpurple/protocols/mxit/profile.c:206
 #: ../libpurple/protocols/silc/chat.c:612
 #: ../libpurple/protocols/silc10/chat.c:590
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:704
-#: ../libpurple/protocols/zephyr/zephyr.c:804
-#: ../libpurple/protocols/zephyr/zephyr.c:1188 ../pidgin/gtkdialogs.c:1163
-#: ../pidgin/gtkdialogs.c:1187 ../pidgin/gtkdialogs.c:1209
+#: ../libpurple/protocols/zephyr/zephyr.c:797
+#: ../libpurple/protocols/zephyr/zephyr.c:1178 ../pidgin/gtkdialogs.c:1150
+#: ../pidgin/gtkdialogs.c:1174 ../pidgin/gtkdialogs.c:1196
 #: ../pidgin/gtkrequest.c:308
 msgid "Alias"
 msgstr "Onelinye igama"
@@ -458,7 +458,7 @@
 msgid "Auto-join"
 msgstr ""
 
-#: ../finch/gntblist.c:804 ../finch/gntblist.c:1261 ../pidgin/gtkblist.c:7274
+#: ../finch/gntblist.c:804 ../finch/gntblist.c:1261 ../pidgin/gtkblist.c:7271
 msgid "Add Chat"
 msgstr "Ngenela inCoko"
 
@@ -475,8 +475,8 @@
 msgstr ""
 
 #: ../finch/gntblist.c:852 ../finch/gntblist.c:1263
-#: ../libpurple/protocols/sametime/sametime.c:5419
-#: ../libpurple/protocols/sametime/sametime.c:5507 ../pidgin/gtkblist.c:7330
+#: ../libpurple/protocols/sametime/sametime.c:5455
+#: ../libpurple/protocols/sametime/sametime.c:5543 ../pidgin/gtkblist.c:7327
 msgid "Add Group"
 msgstr "Yongeza iQela"
 
@@ -500,11 +500,11 @@
 msgid "Edit Settings"
 msgstr ""
 
-#: ../finch/gntblist.c:1271 ../pidgin/gtkutils.c:1011
+#: ../finch/gntblist.c:1271 ../pidgin/gtkutils.c:1003
 msgid "Information"
 msgstr "Ulwazi"
 
-#: ../finch/gntblist.c:1271 ../pidgin/gtkutils.c:1011
+#: ../finch/gntblist.c:1271 ../pidgin/gtkutils.c:1003
 msgid "Retrieving..."
 msgstr ""
 
@@ -519,7 +519,7 @@
 msgstr ""
 
 #: ../finch/gntblist.c:1347 ../finch/gntconv.c:641
-#: ../libpurple/protocols/jabber/si.c:1580
+#: ../libpurple/protocols/jabber/si.c:1584
 #: ../libpurple/protocols/oscar/userinfo.c:58 ../pidgin/gtkconv.c:1631
 msgid "Send File"
 msgstr "Thumela iFayili"
@@ -575,7 +575,7 @@
 msgstr "Susa"
 
 #. Buddy List
-#: ../finch/gntblist.c:1711 ../finch/gntblist.c:3126 ../finch/gntprefs.c:261
+#: ../finch/gntblist.c:1711 ../finch/gntblist.c:3126 ../finch/gntprefs.c:259
 #: ../finch/gntui.c:100 ../pidgin/gtkblist.c:5768
 #: ../pidgin/plugins/win32/winprefs/winprefs.c:303
 msgid "Buddy List"
@@ -596,22 +596,22 @@
 #. General
 #: ../finch/gntblist.c:1787 ../libpurple/protocols/gg/gg.c:307
 #: ../libpurple/protocols/gg/gg.c:801 ../libpurple/protocols/gg/gg.c:873
-#: ../libpurple/protocols/gg/gg.c:2404
+#: ../libpurple/protocols/gg/gg.c:2346
 #: ../libpurple/protocols/jabber/buddy.c:353
 #: ../libpurple/protocols/jabber/buddy.c:1050
 #: ../libpurple/protocols/jabber/buddy.c:2004
 #: ../libpurple/protocols/jabber/buddy.c:2197
-#: ../libpurple/protocols/jabber/jabber.c:1329
-#: ../libpurple/protocols/jabber/jabber.c:2383
-#: ../libpurple/protocols/jabber/jabber.c:2407
-#: ../libpurple/protocols/jabber/jabber.c:2423
-#: ../libpurple/protocols/jabber/jabber.c:2439
-#: ../libpurple/protocols/jabber/jabber.c:2453
-#: ../libpurple/protocols/msn/msn.c:2243 ../libpurple/protocols/msn/msn.c:2413
-#: ../libpurple/protocols/silc/buddy.c:1543
-#: ../libpurple/protocols/silc/ops.c:1014
-#: ../libpurple/protocols/silc/ops.c:1197
-#: ../libpurple/protocols/silc/ops.c:1335
+#: ../libpurple/protocols/jabber/jabber.c:1321
+#: ../libpurple/protocols/jabber/jabber.c:2375
+#: ../libpurple/protocols/jabber/jabber.c:2399
+#: ../libpurple/protocols/jabber/jabber.c:2415
+#: ../libpurple/protocols/jabber/jabber.c:2431
+#: ../libpurple/protocols/jabber/jabber.c:2445
+#: ../libpurple/protocols/msn/msn.c:2244 ../libpurple/protocols/msn/msn.c:2414
+#: ../libpurple/protocols/silc/buddy.c:1549
+#: ../libpurple/protocols/silc/ops.c:1015
+#: ../libpurple/protocols/silc/ops.c:1198
+#: ../libpurple/protocols/silc/ops.c:1336
 #: ../libpurple/protocols/silc10/buddy.c:1555
 #: ../libpurple/protocols/silc10/ops.c:1036
 #: ../libpurple/protocols/silc10/ops.c:1179
@@ -623,17 +623,17 @@
 
 #. Never know what those translations might end up like...
 #. Idle stuff
-#: ../finch/gntblist.c:1809 ../finch/gntprefs.c:264
+#: ../finch/gntblist.c:1809 ../finch/gntprefs.c:262
 #: ../libpurple/protocols/bonjour/bonjour.c:370
 #: ../libpurple/protocols/jabber/buddy.c:748
-#: ../libpurple/protocols/jabber/jabber.c:2248
+#: ../libpurple/protocols/jabber/jabber.c:2240
 #: ../libpurple/protocols/msn/msn.c:1071 ../libpurple/protocols/msn/msn.c:1088
 #: ../libpurple/protocols/msn/msn.c:1095 ../libpurple/protocols/msn/state.c:38
 #: ../libpurple/protocols/novell/novell.c:2848
-#: ../libpurple/protocols/oscar/userinfo.c:500
-#: ../libpurple/protocols/yahoo/libymsg.c:4089
+#: ../libpurple/protocols/oscar/userinfo.c:499
+#: ../libpurple/protocols/yahoo/libymsg.c:4102
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:709 ../pidgin/gtkblist.c:3831
-#: ../pidgin/gtkblist.c:4286 ../pidgin/gtkprefs.c:2714
+#: ../pidgin/gtkblist.c:4286 ../pidgin/gtkprefs.c:2709
 msgid "Idle"
 msgstr "Ilalele"
 
@@ -650,7 +650,7 @@
 msgstr ""
 
 #: ../finch/gntblist.c:2596 ../finch/gntplugin.c:354 ../finch/gntui.c:105
-#: ../pidgin/gtkplugin.c:722
+#: ../pidgin/gtkplugin.c:720
 msgid "Plugins"
 msgstr "Amathuba okuNgena"
 
@@ -676,26 +676,26 @@
 #. Not masked?
 #. No hints?
 #: ../finch/gntblist.c:2761 ../finch/gntblist.c:2812 ../finch/gntblist.c:2948
-#: ../finch/gntcertmgr.c:90 ../finch/gntconn.c:137 ../finch/gntnotify.c:85
-#: ../finch/plugins/gnthistory.c:181 ../libpurple/account.c:1280
-#: ../libpurple/account.c:1643 ../libpurple/protocols/gg/gg.c:335
+#: ../finch/gntcertmgr.c:90 ../finch/gntconn.c:137 ../finch/gntnotify.c:83
+#: ../finch/plugins/gnthistory.c:181 ../libpurple/account.c:1221
+#: ../libpurple/account.c:1584 ../libpurple/protocols/gg/gg.c:335
 #: ../libpurple/protocols/gg/gg.c:390
-#: ../libpurple/protocols/jabber/jabber.c:2565
+#: ../libpurple/protocols/jabber/jabber.c:2557
 #: ../libpurple/protocols/jabber/xdata.c:403
 #: ../libpurple/protocols/msn/msn.c:451 ../libpurple/protocols/msn/msn.c:576
 #: ../libpurple/protocols/msn/msn.c:654 ../libpurple/protocols/msn/msn.c:671
 #: ../libpurple/protocols/msn/msn.c:688
 #: ../libpurple/protocols/mxit/login.c:365
-#: ../libpurple/protocols/myspace/user.c:825
-#: ../libpurple/protocols/myspace/user.c:886
-#: ../libpurple/protocols/oscar/oscar.c:5214
+#: ../libpurple/protocols/myspace/user.c:823
+#: ../libpurple/protocols/myspace/user.c:884
+#: ../libpurple/protocols/oscar/oscar.c:5219
 #: ../libpurple/protocols/silc/buddy.c:458
-#: ../libpurple/protocols/silc/buddy.c:1192
+#: ../libpurple/protocols/silc/buddy.c:1198
 #: ../libpurple/protocols/silc/chat.c:451
 #: ../libpurple/protocols/silc/chat.c:488
 #: ../libpurple/protocols/silc/chat.c:755
-#: ../libpurple/protocols/silc/ops.c:1304
-#: ../libpurple/protocols/silc/ops.c:1830
+#: ../libpurple/protocols/silc/ops.c:1305
+#: ../libpurple/protocols/silc/ops.c:1831
 #: ../libpurple/protocols/silc/silc.c:1062
 #: ../libpurple/protocols/silc10/buddy.c:467
 #: ../libpurple/protocols/silc10/buddy.c:1191
@@ -706,22 +706,22 @@
 #: ../libpurple/protocols/silc10/ops.c:1909
 #: ../libpurple/protocols/silc10/silc.c:760
 #: ../libpurple/protocols/yahoo/libymsg.c:1368
-#: ../libpurple/protocols/yahoo/libymsg.c:4561
-#: ../libpurple/protocols/yahoo/libymsg.c:4572
+#: ../libpurple/protocols/yahoo/libymsg.c:4574
+#: ../libpurple/protocols/yahoo/libymsg.c:4585
 #: ../libpurple/protocols/yahoo/yahoo_aliases.c:588
 #: ../libpurple/protocols/yahoo/yahoo_aliases.c:599 ../pidgin/gtkblist.c:3581
-#: ../pidgin/gtkcertmgr.c:193 ../pidgin/gtkdialogs.c:912
-#: ../pidgin/gtkdialogs.c:1051 ../pidgin/gtkdialogs.c:1143
-#: ../pidgin/gtkrequest.c:300 ../pidgin/gtkutils.c:1627
-#: ../pidgin/gtkutils.c:1647
+#: ../pidgin/gtkcertmgr.c:193 ../pidgin/gtkdialogs.c:899
+#: ../pidgin/gtkdialogs.c:1038 ../pidgin/gtkdialogs.c:1130
+#: ../pidgin/gtkrequest.c:300 ../pidgin/gtkutils.c:1619
+#: ../pidgin/gtkutils.c:1639
 msgid "OK"
 msgstr "Kulungile"
 
-#: ../finch/gntblist.c:2807 ../pidgin/gtkdialogs.c:907
+#: ../finch/gntblist.c:2807 ../pidgin/gtkdialogs.c:894
 msgid "New Instant Message"
 msgstr "Umyalezo omTsha waNgoko nangoko"
 
-#: ../finch/gntblist.c:2809 ../pidgin/gtkdialogs.c:909
+#: ../finch/gntblist.c:2809 ../pidgin/gtkdialogs.c:896
 msgid ""
 "Please enter the username or alias of the person you would like to IM."
 msgstr ""
@@ -738,11 +738,11 @@
 msgid "Please enter the name of the chat you want to join."
 msgstr ""
 
-#: ../finch/gntblist.c:2886 ../finch/gntnotify.c:465
+#: ../finch/gntblist.c:2886 ../finch/gntnotify.c:461
 msgid "Join"
 msgstr ""
 
-#: ../finch/gntblist.c:2945 ../pidgin/gtkdialogs.c:1140
+#: ../finch/gntblist.c:2945 ../pidgin/gtkdialogs.c:1127
 msgid ""
 "Please enter the username or alias of the person whose log you would like to "
 "view."
@@ -808,7 +808,7 @@
 
 #: ../finch/gntblist.c:3080 ../libpurple/protocols/oscar/userinfo.c:52
 #: ../libpurple/protocols/silc/silc.c:1008
-#: ../libpurple/protocols/silc/util.c:509
+#: ../libpurple/protocols/silc/util.c:560
 #: ../libpurple/protocols/silc10/silc.c:704
 #: ../libpurple/protocols/silc10/util.c:553
 #: ../pidgin/plugins/disco/gtkdisco.c:482
@@ -905,20 +905,20 @@
 msgid "Hostname"
 msgstr ""
 
-#: ../finch/gntcertmgr.c:315 ../finch/gntnotify.c:459 ../pidgin/gtkconv.c:1668
+#: ../finch/gntcertmgr.c:315 ../finch/gntnotify.c:455 ../pidgin/gtkconv.c:1668
 #: ../pidgin/gtkdebug.c:940
 msgid "Info"
 msgstr "ULwazi"
 
 #. Close button
-#: ../finch/gntcertmgr.c:324 ../finch/gntft.c:256 ../finch/gntnotify.c:203
+#: ../finch/gntcertmgr.c:324 ../finch/gntft.c:256 ../finch/gntnotify.c:200
 #: ../finch/gntplugin.c:222 ../finch/gntplugin.c:415 ../finch/gntpounce.c:752
 #: ../finch/gntroomlist.c:277 ../finch/gntstatus.c:218
-#: ../libpurple/certificate.c:2212 ../libpurple/protocols/msn/msn.c:794
+#: ../libpurple/protocols/msn/msn.c:794
 #: ../libpurple/protocols/mxit/splashscreen.c:207
 #: ../libpurple/protocols/mxit/splashscreen.c:211
-#: ../libpurple/protocols/silc/util.c:335
-#: ../libpurple/protocols/silc10/util.c:377 ../pidgin/gtkaccount.c:2460
+#: ../libpurple/protocols/silc/util.c:386
+#: ../libpurple/protocols/silc10/util.c:377 ../pidgin/gtkaccount.c:2453
 #: ../pidgin/gtkblist.c:5874 ../pidgin/gtkrequest.c:303
 msgid "Close"
 msgstr "Vala"
@@ -1025,7 +1025,7 @@
 msgid "Clear Scrollback"
 msgstr ""
 
-#: ../finch/gntconv.c:616 ../finch/gntprefs.c:194
+#: ../finch/gntconv.c:616 ../finch/gntprefs.c:192
 msgid "Show Timestamps"
 msgstr ""
 
@@ -1089,7 +1089,7 @@
 msgid "%s is not a valid color. See '/help msgcolor' for valid colors."
 msgstr ""
 
-#: ../finch/gntconv.c:1415 ../pidgin/gtkconv.c:8084
+#: ../finch/gntconv.c:1415 ../pidgin/gtkconv.c:8081
 msgid ""
 "say &lt;message&gt;:  Send a message normally as if you weren't using a "
 "command."
@@ -1097,13 +1097,13 @@
 "say &lt;umyalezo&gt;:  Thumela umyalezo ngokwesiqhelo ngokungathi "
 "ubungasebenzisi umyalelo."
 
-#: ../finch/gntconv.c:1418 ../pidgin/gtkconv.c:8087
+#: ../finch/gntconv.c:1418 ../pidgin/gtkconv.c:8084
 msgid "me &lt;action&gt;:  Send an IRC style action to a buddy or chat."
 msgstr ""
 "me &lt;intshukumo&gt;:  Thumela intshukumo yemo yeIRC kumhlobo okanye "
 "kwincoko."
 
-#: ../finch/gntconv.c:1421 ../pidgin/gtkconv.c:8090
+#: ../finch/gntconv.c:1421 ../pidgin/gtkconv.c:8087
 msgid ""
 "debug &lt;option&gt;:  Send various debug information to the current "
 "conversation."
@@ -1111,11 +1111,11 @@
 "debug $lt;ukhetho&gt;:  Thumela iintlobo ngeentlobo zolwazi lokulungisa "
 "iziphene zenkqubo kwincoko eqhubekayo njengangoku."
 
-#: ../finch/gntconv.c:1424 ../pidgin/gtkconv.c:8093
+#: ../finch/gntconv.c:1424 ../pidgin/gtkconv.c:8090
 msgid "clear: Clears the conversation scrollback."
 msgstr ""
 
-#: ../finch/gntconv.c:1427 ../pidgin/gtkconv.c:8099
+#: ../finch/gntconv.c:1427 ../pidgin/gtkconv.c:8096
 msgid "help &lt;command&gt;:  Help on a specific command."
 msgstr ""
 "help &lt;umyalelo&gt;:  Nceda ngokuphathelele kumyalelo okhethekileyo."
@@ -1158,12 +1158,12 @@
 "default"
 msgstr ""
 
-#: ../finch/gntdebug.c:276 ../pidgin/gtkconv.c:994 ../pidgin/gtkdebug.c:230
-#: ../pidgin/gtkft.c:519 ../pidgin/gtkutils.c:3347
+#: ../finch/gntdebug.c:275 ../pidgin/gtkconv.c:994 ../pidgin/gtkdebug.c:230
+#: ../pidgin/gtkft.c:519 ../pidgin/gtkutils.c:3339
 msgid "Unable to open file."
 msgstr "Akukwazeki ukuvula ifayili."
 
-#: ../finch/gntdebug.c:316 ../finch/gntui.c:103 ../pidgin/gtkdebug.c:755
+#: ../finch/gntdebug.c:315 ../finch/gntui.c:103 ../pidgin/gtkdebug.c:755
 msgid "Debug Window"
 msgstr "Lungisa isiphene efestileni"
 
@@ -1171,15 +1171,15 @@
 #. * it's necessary to make the width of the debug window resizable ... like I said,
 #. * it doesn't make sense. The bug is likely in the packing in gntbox.c.
 #. 
-#: ../finch/gntdebug.c:337 ../pidgin/gtkdebug.c:835 ../pidgin/gtkdebug.c:837
+#: ../finch/gntdebug.c:336 ../pidgin/gtkdebug.c:835 ../pidgin/gtkdebug.c:837
 msgid "Clear"
 msgstr ""
 
-#: ../finch/gntdebug.c:348
+#: ../finch/gntdebug.c:347
 msgid "Filter:"
 msgstr ""
 
-#: ../finch/gntdebug.c:354 ../pidgin/gtkdebug.c:849 ../pidgin/gtkdebug.c:851
+#: ../finch/gntdebug.c:353 ../pidgin/gtkdebug.c:849 ../pidgin/gtkdebug.c:851
 msgid "Pause"
 msgstr "Nqumama"
 
@@ -1225,18 +1225,18 @@
 #: ../libpurple/protocols/jabber/buddy.c:770
 #: ../libpurple/protocols/jabber/buddy.c:778
 #: ../libpurple/protocols/jabber/buddy.c:849
-#: ../libpurple/protocols/jabber/jabber.c:2233
+#: ../libpurple/protocols/jabber/jabber.c:2225
 #: ../libpurple/protocols/msn/msn.c:1081 ../libpurple/protocols/msn/msn.c:1090
 #: ../libpurple/protocols/msn/msn.c:1094 ../libpurple/protocols/msn/msn.c:1097
 #: ../libpurple/protocols/mxit/mxit.c:342
 #: ../libpurple/protocols/mxit/profile.c:235
 #: ../libpurple/protocols/novell/novell.c:2858
-#: ../libpurple/protocols/oscar/oscar.c:2294
-#: ../libpurple/protocols/oscar/oscar.c:2317
+#: ../libpurple/protocols/oscar/oscar.c:2296
+#: ../libpurple/protocols/oscar/oscar.c:2319
 #: ../libpurple/protocols/oscar/userinfo.c:303
-#: ../libpurple/protocols/sametime/sametime.c:3310
-#: ../libpurple/protocols/sametime/sametime.c:4161
-#: ../libpurple/protocols/yahoo/libymsg.c:4245 ../pidgin/gtkblist.c:3876
+#: ../libpurple/protocols/sametime/sametime.c:3346
+#: ../libpurple/protocols/sametime/sametime.c:4197
+#: ../libpurple/protocols/yahoo/libymsg.c:4258 ../pidgin/gtkblist.c:3876
 #: ../pidgin/gtkblist.c:3890 ../pidgin/gtkblist.c:3892
 #: ../pidgin/gtksavedstatuses.c:970 ../pidgin/gtksavedstatuses.c:1120
 msgid "Status"
@@ -1359,7 +1359,7 @@
 msgid "System Log"
 msgstr "Inkqubo yeNgxelo yokwenziweyo"
 
-#: ../finch/gntmedia.c:159 ../pidgin/gtkmedia.c:341
+#: ../finch/gntmedia.c:159 ../pidgin/gtkmedia.c:339
 msgid "Calling..."
 msgstr ""
 
@@ -1376,15 +1376,15 @@
 msgid "Reject"
 msgstr ""
 
-#: ../finch/gntmedia.c:190 ../pidgin/gtkmedia.c:1144 ../pidgin/gtkmedia.c:1146
+#: ../finch/gntmedia.c:190 ../pidgin/gtkmedia.c:970 ../pidgin/gtkmedia.c:972
 msgid "Call in progress."
 msgstr ""
 
-#: ../finch/gntmedia.c:242 ../pidgin/gtkmedia.c:1123
+#: ../finch/gntmedia.c:242 ../pidgin/gtkmedia.c:949
 msgid "The call has been terminated."
 msgstr ""
 
-#: ../finch/gntmedia.c:270 ../pidgin/gtkmedia.c:640
+#: ../finch/gntmedia.c:270 ../pidgin/gtkmedia.c:635
 #, c-format
 msgid "%s wishes to start an audio session with you."
 msgstr ""
@@ -1394,7 +1394,7 @@
 msgid "%s is trying to start an unsupported media session type with you."
 msgstr ""
 
-#: ../finch/gntmedia.c:288 ../pidgin/gtkmedia.c:1139
+#: ../finch/gntmedia.c:288 ../pidgin/gtkmedia.c:965
 msgid "You have rejected the call."
 msgstr ""
 
@@ -1402,65 +1402,65 @@
 msgid "call: Make an audio call."
 msgstr ""
 
-#: ../finch/gntnotify.c:186
+#: ../finch/gntnotify.c:183
 msgid "Emails"
 msgstr ""
 
-#: ../finch/gntnotify.c:192 ../finch/gntnotify.c:256
+#: ../finch/gntnotify.c:189 ../finch/gntnotify.c:252
 msgid "You have mail!"
 msgstr ""
 
-#: ../finch/gntnotify.c:195 ../pidgin/gtknotify.c:719
+#: ../finch/gntnotify.c:192 ../pidgin/gtknotify.c:719
 msgid "Sender"
 msgstr ""
 
-#: ../finch/gntnotify.c:195 ../pidgin/gtknotify.c:726
+#: ../finch/gntnotify.c:192 ../pidgin/gtknotify.c:726
 msgid "Subject"
 msgstr ""
 
-#: ../finch/gntnotify.c:226
+#: ../finch/gntnotify.c:223
 #, c-format
 msgid "%s (%s) has %d new message."
 msgid_plural "%s (%s) has %d new messages."
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../finch/gntnotify.c:256 ../pidgin/gtknotify.c:1596
+#: ../finch/gntnotify.c:252 ../pidgin/gtknotify.c:1596
 msgid "New Mail"
 msgstr ""
 
-#: ../finch/gntnotify.c:362 ../pidgin/gtknotify.c:1155
+#: ../finch/gntnotify.c:358 ../pidgin/gtknotify.c:1155
 #, c-format
 msgid "Info for %s"
 msgstr "Ulwazi ngama %s"
 
-#: ../finch/gntnotify.c:363 ../pidgin/gtknotify.c:1156
+#: ../finch/gntnotify.c:359 ../pidgin/gtknotify.c:1156
 msgid "Buddy Information"
 msgstr "Ulwazi ngomHlobo"
 
-#: ../finch/gntnotify.c:453 ../libpurple/protocols/mxit/login.c:711
+#: ../finch/gntnotify.c:449 ../libpurple/protocols/mxit/login.c:711
 #: ../libpurple/protocols/mxit/splashscreen.c:211
 msgid "Continue"
 msgstr ""
 
-#: ../finch/gntnotify.c:462 ../pidgin/gtkconv.c:1618
+#: ../finch/gntnotify.c:458 ../pidgin/gtkconv.c:1618
 #: ../pidgin/gtknotify.c:1638
 msgid "IM"
 msgstr "I-IM"
 
-#: ../finch/gntnotify.c:468 ../libpurple/conversation.c:2146
-#: ../libpurple/protocols/sametime/sametime.c:3520
+#: ../finch/gntnotify.c:464 ../libpurple/conversation.c:2146
+#: ../libpurple/protocols/sametime/sametime.c:3556
 msgid "Invite"
 msgstr "Mema"
 
-#: ../finch/gntnotify.c:471
+#: ../finch/gntnotify.c:467
 msgid "(none)"
 msgstr ""
 
 #. XXX: The following expects that finch_notify_message gets called. This
 #. * may not always happen, e.g. when another plugin sets its own
 #. * notify_message. So tread carefully.
-#: ../finch/gntnotify.c:498 ../finch/plugins/gnttinyurl.c:370
+#: ../finch/gntnotify.c:493 ../finch/plugins/gnttinyurl.c:370
 msgid "URI"
 msgstr ""
 
@@ -1529,8 +1529,8 @@
 #. (that should have been "effect," right?)
 #. Back to instant-apply! I win!  BU-HAHAHA!
 #. Create the window
-#: ../finch/gntplugin.c:526 ../finch/gntplugin.c:533 ../finch/gntprefs.c:267
-#: ../finch/gntui.c:108 ../pidgin/gtkprefs.c:2835
+#: ../finch/gntplugin.c:526 ../finch/gntplugin.c:533 ../finch/gntprefs.c:265
+#: ../finch/gntui.c:108 ../pidgin/gtkprefs.c:2830
 msgid "Preferences"
 msgstr "Ezikhethwayo"
 
@@ -1716,66 +1716,66 @@
 msgid "Based on keyboard use"
 msgstr ""
 
-#: ../finch/gntprefs.c:95 ../pidgin/gtkprefs.c:2719
+#: ../finch/gntprefs.c:95 ../pidgin/gtkprefs.c:2714
 msgid "From last sent message"
 msgstr ""
 
-#: ../finch/gntprefs.c:97 ../pidgin/gtkprefs.c:1355 ../pidgin/gtkprefs.c:1363
-#: ../pidgin/gtkprefs.c:2718 ../pidgin/gtkprefs.c:2754
+#: ../finch/gntprefs.c:97 ../pidgin/gtkprefs.c:1349 ../pidgin/gtkprefs.c:1357
+#: ../pidgin/gtkprefs.c:2713 ../pidgin/gtkprefs.c:2749
 #: ../pidgin/plugins/win32/winprefs/winprefs.c:310
 msgid "Never"
 msgstr "Nakanye"
 
-#: ../finch/gntprefs.c:187
+#: ../finch/gntprefs.c:185
 msgid "Show Idle Time"
 msgstr ""
 
-#: ../finch/gntprefs.c:188
+#: ../finch/gntprefs.c:186
 msgid "Show Offline Buddies"
 msgstr ""
 
-#: ../finch/gntprefs.c:195
+#: ../finch/gntprefs.c:193
 msgid "Notify buddies when you are typing"
 msgstr ""
 
-#: ../finch/gntprefs.c:201 ../finch/plugins/gnthistory.c:157
+#: ../finch/gntprefs.c:199 ../finch/plugins/gnthistory.c:157
 msgid "Log format"
 msgstr ""
 
-#: ../finch/gntprefs.c:202 ../finch/plugins/gnthistory.c:147
+#: ../finch/gntprefs.c:200 ../finch/plugins/gnthistory.c:147
 msgid "Log IMs"
 msgstr ""
 
-#: ../finch/gntprefs.c:203 ../finch/plugins/gnthistory.c:148
+#: ../finch/gntprefs.c:201 ../finch/plugins/gnthistory.c:148
 msgid "Log chats"
 msgstr ""
 
-#: ../finch/gntprefs.c:204
+#: ../finch/gntprefs.c:202
 msgid "Log status change events"
 msgstr ""
 
-#: ../finch/gntprefs.c:210
+#: ../finch/gntprefs.c:208
 msgid "Report Idle time"
 msgstr ""
 
-#: ../finch/gntprefs.c:211
+#: ../finch/gntprefs.c:209
 msgid "Change status when idle"
 msgstr ""
 
-#: ../finch/gntprefs.c:212
+#: ../finch/gntprefs.c:210
 msgid "Minutes before changing status"
 msgstr ""
 
-#: ../finch/gntprefs.c:213
+#: ../finch/gntprefs.c:211
 msgid "Change status to"
 msgstr ""
 
-#: ../finch/gntprefs.c:262 ../pidgin/gtkprefs.c:1475 ../pidgin/gtkprefs.c:2806
+#: ../finch/gntprefs.c:260 ../pidgin/gtkprefs.c:1469 ../pidgin/gtkprefs.c:2801
 msgid "Conversations"
 msgstr "Iincoko"
 
-#: ../finch/gntprefs.c:263 ../finch/plugins/gnthistory.c:155
-#: ../pidgin/gtkprefs.c:2231 ../pidgin/gtkprefs.c:2807
+#: ../finch/gntprefs.c:261 ../finch/plugins/gnthistory.c:155
+#: ../pidgin/gtkprefs.c:2225 ../pidgin/gtkprefs.c:2802
 msgid "Logging"
 msgstr "Ukungena"
 
@@ -1791,11 +1791,11 @@
 msgid "Not implemented yet."
 msgstr ""
 
-#: ../finch/gntrequest.c:766 ../pidgin/gtkrequest.c:1610
+#: ../finch/gntrequest.c:766 ../pidgin/gtkrequest.c:1584
 msgid "Save File..."
 msgstr "Gcina iFayili..."
 
-#: ../finch/gntrequest.c:766 ../pidgin/gtkrequest.c:1611
+#: ../finch/gntrequest.c:766 ../pidgin/gtkrequest.c:1585
 msgid "Open File..."
 msgstr "Vula iFayili..."
 
@@ -1812,7 +1812,7 @@
 msgstr ""
 
 #. Create the window.
-#: ../finch/gntroomlist.c:287 ../finch/gntui.c:106 ../pidgin/gtkblist.c:7280
+#: ../finch/gntroomlist.c:287 ../finch/gntui.c:106 ../pidgin/gtkblist.c:7277
 #: ../pidgin/gtkroomlist.c:531
 msgid "Room List"
 msgstr "Uluhlu lweGumbi"
@@ -1872,8 +1872,8 @@
 #: ../finch/gntsound.c:739 ../finch/gntsound.c:825 ../pidgin/gtkpounce.c:178
 #: ../pidgin/gtkpounce.c:189 ../pidgin/gtkpounce.c:318
 #: ../pidgin/gtkpounce.c:696 ../pidgin/gtkpounce.c:958
-#: ../pidgin/gtkprefs.c:947 ../pidgin/gtkprefs.c:2357
-#: ../pidgin/gtkprefs.c:2455 ../pidgin/gtkprefs.c:2652
+#: ../pidgin/gtkprefs.c:941 ../pidgin/gtkprefs.c:2351
+#: ../pidgin/gtkprefs.c:2449 ../pidgin/gtkprefs.c:2646
 msgid "(default)"
 msgstr ""
 
@@ -1889,7 +1889,7 @@
 msgid "Profiles"
 msgstr ""
 
-#: ../finch/gntsound.c:977 ../pidgin/gtkprefs.c:2519
+#: ../finch/gntsound.c:977 ../pidgin/gtkprefs.c:2513
 msgid "Automatic"
 msgstr "Ngokuzenzekela"
 
@@ -1897,7 +1897,7 @@
 msgid "Console Beep"
 msgstr ""
 
-#: ../finch/gntsound.c:981 ../pidgin/gtkprefs.c:2523
+#: ../finch/gntsound.c:981 ../pidgin/gtkprefs.c:2517
 msgid "Command"
 msgstr "Umyalelo"
 
@@ -1921,7 +1921,7 @@
 msgstr ""
 
 #. Sound options
-#: ../finch/gntsound.c:1004 ../pidgin/gtkprefs.c:2509
+#: ../finch/gntsound.c:1004 ../pidgin/gtkprefs.c:2503
 msgid "Sound Options"
 msgstr "Ezinokukhethwe kwiSandi"
 
@@ -1929,19 +1929,19 @@
 msgid "Sounds when conversation has focus"
 msgstr ""
 
-#: ../finch/gntsound.c:1013 ../pidgin/gtkprefs.c:1353
-#: ../pidgin/gtkprefs.c:1365 ../pidgin/gtkprefs.c:2554
+#: ../finch/gntsound.c:1013 ../pidgin/gtkprefs.c:1347
+#: ../pidgin/gtkprefs.c:1359 ../pidgin/gtkprefs.c:2548
 #: ../pidgin/plugins/timestamp_format.c:58
 #: ../pidgin/plugins/timestamp_format.c:67
 #: ../pidgin/plugins/win32/winprefs/winprefs.c:311
 msgid "Always"
 msgstr ""
 
-#: ../finch/gntsound.c:1014 ../pidgin/gtkprefs.c:2552
+#: ../finch/gntsound.c:1014 ../pidgin/gtkprefs.c:2546
 msgid "Only when available"
 msgstr ""
 
-#: ../finch/gntsound.c:1015 ../pidgin/gtkprefs.c:2553
+#: ../finch/gntsound.c:1015 ../pidgin/gtkprefs.c:2547
 msgid "Only when not available"
 msgstr ""
 
@@ -1950,12 +1950,12 @@
 msgstr ""
 
 #. Sound events
-#: ../finch/gntsound.c:1041 ../pidgin/gtkprefs.c:2581
+#: ../finch/gntsound.c:1041 ../pidgin/gtkprefs.c:2575
 msgid "Sound Events"
 msgstr "Iziganeko zeSandi"
 
 #: ../finch/gntsound.c:1043 ../pidgin/gtknotify.c:1675
-#: ../pidgin/gtkprefs.c:2635
+#: ../pidgin/gtkprefs.c:2629
 msgid "Event"
 msgstr "Isiganeko"
 
@@ -2015,13 +2015,13 @@
 #: ../libpurple/protocols/gg/gg.c:1594 ../libpurple/protocols/gg/gg.c:1604
 #: ../libpurple/protocols/gg/gg.c:1610 ../libpurple/protocols/gg/gg.c:1620
 #: ../libpurple/protocols/gg/gg.c:1629 ../libpurple/protocols/gg/gg.c:1634
-#: ../libpurple/protocols/irc/irc.c:276
-#: ../libpurple/protocols/jabber/jabber.c:2380
-#: ../libpurple/protocols/jabber/jabber.c:2404
-#: ../libpurple/protocols/jabber/jabber.c:2420
-#: ../libpurple/protocols/jabber/jabber.c:2436
-#: ../libpurple/protocols/jabber/jabber.c:2450
-#: ../libpurple/protocols/jabber/jabber.c:2465
+#: ../libpurple/protocols/irc/irc.c:274
+#: ../libpurple/protocols/jabber/jabber.c:2372
+#: ../libpurple/protocols/jabber/jabber.c:2396
+#: ../libpurple/protocols/jabber/jabber.c:2412
+#: ../libpurple/protocols/jabber/jabber.c:2428
+#: ../libpurple/protocols/jabber/jabber.c:2442
+#: ../libpurple/protocols/jabber/jabber.c:2457
 #: ../libpurple/protocols/msn/msn.c:1150 ../libpurple/protocols/msn/msn.c:1156
 #: ../libpurple/protocols/msn/msn.c:1162 ../libpurple/protocols/msn/msn.c:1168
 #: ../libpurple/protocols/msn/msn.c:1173 ../libpurple/protocols/msn/msn.c:1178
@@ -2031,29 +2031,29 @@
 #: ../libpurple/protocols/novell/novell.c:2964
 #: ../libpurple/protocols/novell/novell.c:2970
 #: ../libpurple/protocols/novell/novell.c:2976
-#: ../libpurple/protocols/oscar/oscar.c:4758
-#: ../libpurple/protocols/oscar/oscar.c:4767
-#: ../libpurple/protocols/oscar/oscar.c:4775
-#: ../libpurple/protocols/oscar/oscar.c:4783
-#: ../libpurple/protocols/oscar/oscar.c:4791
-#: ../libpurple/protocols/oscar/oscar.c:4799
-#: ../libpurple/protocols/oscar/oscar.c:4808
-#: ../libpurple/protocols/oscar/oscar.c:4816
-#: ../libpurple/protocols/oscar/oscar.c:4823
-#: ../libpurple/protocols/oscar/oscar.c:4835
-#: ../libpurple/protocols/oscar/oscar.c:4842
-#: ../libpurple/protocols/oscar/oscar.c:4849
-#: ../libpurple/protocols/sametime/sametime.c:3333
-#: ../libpurple/protocols/sametime/sametime.c:3339
-#: ../libpurple/protocols/sametime/sametime.c:3345
-#: ../libpurple/protocols/sametime/sametime.c:3424
-#: ../libpurple/protocols/silc/buddy.c:1557
+#: ../libpurple/protocols/oscar/oscar.c:4763
+#: ../libpurple/protocols/oscar/oscar.c:4772
+#: ../libpurple/protocols/oscar/oscar.c:4780
+#: ../libpurple/protocols/oscar/oscar.c:4788
+#: ../libpurple/protocols/oscar/oscar.c:4796
+#: ../libpurple/protocols/oscar/oscar.c:4804
+#: ../libpurple/protocols/oscar/oscar.c:4813
+#: ../libpurple/protocols/oscar/oscar.c:4821
+#: ../libpurple/protocols/oscar/oscar.c:4828
+#: ../libpurple/protocols/oscar/oscar.c:4840
+#: ../libpurple/protocols/oscar/oscar.c:4847
+#: ../libpurple/protocols/oscar/oscar.c:4854
+#: ../libpurple/protocols/sametime/sametime.c:3369
+#: ../libpurple/protocols/sametime/sametime.c:3375
+#: ../libpurple/protocols/sametime/sametime.c:3381
+#: ../libpurple/protocols/sametime/sametime.c:3460
+#: ../libpurple/protocols/silc/buddy.c:1563
 #: ../libpurple/protocols/silc10/buddy.c:1571
-#: ../libpurple/protocols/simple/simple.c:252
-#: ../libpurple/protocols/yahoo/libymsg.c:5085
-#: ../libpurple/protocols/yahoo/libymsg.c:5091
-#: ../libpurple/protocols/yahoo/libymsg.c:5100
-#: ../libpurple/protocols/zephyr/zephyr.c:2355 ../pidgin/gtknotify.c:1683
+#: ../libpurple/protocols/simple/simple.c:247
+#: ../libpurple/protocols/yahoo/libymsg.c:5098
+#: ../libpurple/protocols/yahoo/libymsg.c:5104
+#: ../libpurple/protocols/yahoo/libymsg.c:5113
+#: ../libpurple/protocols/zephyr/zephyr.c:2340 ../pidgin/gtknotify.c:1683
 #: ../pidgin/gtksavedstatuses.c:496 ../pidgin/gtksavedstatuses.c:985
 msgid "Message"
 msgstr "Umyalezo"
@@ -2108,7 +2108,7 @@
 msgid "Certificates"
 msgstr ""
 
-#: ../finch/gntui.c:107 ../pidgin/gtkprefs.c:2811
+#: ../finch/gntui.c:107 ../pidgin/gtkprefs.c:2806
 msgid "Sounds"
 msgstr "Izandi"
 
@@ -2289,9 +2289,9 @@
 #: ../libpurple/protocols/jabber/jutil.c:704
 #: ../libpurple/protocols/mxit/roster.c:53
 #: ../libpurple/protocols/novell/novell.c:2851
-#: ../libpurple/protocols/oscar/oscar.c:4681
+#: ../libpurple/protocols/oscar/oscar.c:4686
 #: ../libpurple/protocols/oscar/userinfo.c:279
-#: ../libpurple/protocols/yahoo/libymsg.c:4091 ../libpurple/status.c:162
+#: ../libpurple/protocols/yahoo/libymsg.c:4104 ../libpurple/status.c:162
 #: ../pidgin/gtkblist.c:3876 ../pidgin/gtkblist.c:4263
 #: ../pidgin/gtkdocklet.c:564 ../pidgin/gtkstatusbox.c:1100
 #: ../pidgin/plugins/themeedit-icon.c:67
@@ -2347,111 +2347,110 @@
 msgid "Lastlog plugin."
 msgstr ""
 
-#: ../libpurple/account.c:1026
+#: ../libpurple/account.c:972
 msgid "accounts"
 msgstr ""
 
-#: ../libpurple/account.c:1226 ../libpurple/protocols/jabber/auth.c:106
+#: ../libpurple/account.c:1167 ../libpurple/protocols/jabber/auth.c:106
 #: ../libpurple/protocols/jabber/auth_cyrus.c:150
 #: ../libpurple/protocols/silc/silc.c:475
 msgid "Password is required to sign on."
 msgstr ""
 
-#: ../libpurple/account.c:1260
+#: ../libpurple/account.c:1201
 #, c-format
 msgid "Enter password for %s (%s)"
 msgstr "Faka i-password ye %s (%s)"
 
-#: ../libpurple/account.c:1267
+#: ../libpurple/account.c:1208
 msgid "Enter Password"
 msgstr ""
 
-#: ../libpurple/account.c:1272
+#: ../libpurple/account.c:1213
 msgid "Save password"
 msgstr ""
 
-#: ../libpurple/account.c:1309 ../libpurple/connection.c:119
+#: ../libpurple/account.c:1250 ../libpurple/connection.c:119
 #: ../libpurple/connection.c:197
 #, c-format
 msgid "Missing protocol plugin for %s"
 msgstr "Imithetho yokusebenza engekhoyo yokungenisa kwi-%s"
 
-#: ../libpurple/account.c:1310 ../libpurple/connection.c:122
+#: ../libpurple/account.c:1251 ../libpurple/connection.c:122
 msgid "Connection Error"
 msgstr "Impazamo yokuNxulumana"
 
-#: ../libpurple/account.c:1564 ../libpurple/protocols/jabber/jabber.c:2518
+#: ../libpurple/account.c:1505 ../libpurple/protocols/jabber/jabber.c:2510
 msgid "New passwords do not match."
 msgstr "Ii-password ezintsha azingqamani."
 
-#: ../libpurple/account.c:1577
+#: ../libpurple/account.c:1518
 msgid "Fill out all fields completely."
 msgstr "Zalisa zonke iindawo ngokupheleleyo."
 
-#: ../libpurple/account.c:1609
+#: ../libpurple/account.c:1550
 msgid "Original password"
 msgstr "I-password yentsusa"
 
-#: ../libpurple/account.c:1617
+#: ../libpurple/account.c:1558
 msgid "New password"
 msgstr "I-password entsha"
 
-#: ../libpurple/account.c:1625
+#: ../libpurple/account.c:1566
 msgid "New password (again)"
 msgstr "I-password entsha (kwakhona)"
 
-#: ../libpurple/account.c:1632
+#: ../libpurple/account.c:1573
 #, c-format
 msgid "Change password for %s"
 msgstr "Tshintsha i-password ye %s"
 
-#: ../libpurple/account.c:1640
+#: ../libpurple/account.c:1581
 msgid "Please enter your current password and your new password."
 msgstr "Nceda ufake i-password yakho yangoku kunye ne-password yakho entsha."
 
-#: ../libpurple/account.c:1671
+#: ../libpurple/account.c:1612
 #, c-format
 msgid "Change user information for %s"
 msgstr "Tshintsha ulwazi lomsebenzisi lwe-%s"
 
-#: ../libpurple/account.c:1674
+#: ../libpurple/account.c:1615
 #: ../libpurple/protocols/yahoo/yahoo_aliases.c:587
 #: ../libpurple/protocols/yahoo/yahoo_aliases.c:598
 msgid "Set User Info"
 msgstr "Misela uLwazi ngomSebenzisi"
 
-#: ../libpurple/account.c:1928
+#: ../libpurple/account.c:1869
 msgid "This protocol does not support setting a public alias."
 msgstr ""
 
-#: ../libpurple/account.c:1968
+#: ../libpurple/account.c:1909
 msgid "This protocol does not support fetching the public alias."
 msgstr ""
 
-#: ../libpurple/account.c:2266 ../libpurple/protocols/gg/gg.c:772
+#: ../libpurple/account.c:2207 ../libpurple/protocols/gg/gg.c:772
 #: ../libpurple/protocols/jabber/buddy.c:778
 #: ../libpurple/protocols/jabber/jutil.c:721
 #: ../libpurple/protocols/msn/oim.c:732
 #: ../libpurple/protocols/mxit/profile.c:46
 #: ../libpurple/protocols/mxit/profile.c:239
 #: ../libpurple/protocols/novell/novell.c:2854 ../pidgin/gtkft.c:162
-#: ../pidgin/plugins/disco/gtkdisco.c:470 ../pidgin/plugins/vvconfig.c:160
+#: ../pidgin/plugins/disco/gtkdisco.c:470 ../pidgin/plugins/vvconfig.c:147
 msgid "Unknown"
 msgstr "Engaziwayo"
 
-#: ../libpurple/blist.c:282 ../libpurple/blist.c:586 ../libpurple/blist.c:1600
-#: ../libpurple/blist.c:1848 ../libpurple/blist.c:1850
-#: ../libpurple/protocols/jabber/facebook_roster.c:124
-#: ../libpurple/protocols/jabber/roster.c:143
-#: ../libpurple/protocols/jabber/roster.c:271
-#: ../libpurple/protocols/jabber/roster.c:541
-#: ../libpurple/protocols/myspace/myspace.c:3484 ../pidgin/gtkblist.c:6958
+#. Changing this string?  Look in add_purple_buddy_to_groups
+#: ../libpurple/blist.c:585 ../libpurple/blist.c:1599
+#: ../libpurple/blist.c:1847 ../libpurple/blist.c:1849
+#: ../libpurple/protocols/jabber/roster.c:117
+#: ../libpurple/protocols/jabber/roster.c:256
+#: ../libpurple/protocols/myspace/myspace.c:3484 ../pidgin/gtkblist.c:6955
 #: ../pidgin/plugins/gevolution/gevo-util.c:73
 #: ../pidgin/plugins/gevolution/gevolution.c:106
 msgid "Buddies"
 msgstr "Abahlobo"
 
-#: ../libpurple/blist.c:613
+#: ../libpurple/blist.c:612
 msgid "buddy list"
 msgstr ""
 
@@ -2583,8 +2582,7 @@
 msgstr ""
 
 #. TODO: Find what the handle ought to be
-#: ../libpurple/certificate.c:2144 ../libpurple/certificate.c:2203
-#: ../libpurple/certificate.c:2208
+#: ../libpurple/certificate.c:2178
 msgid "Certificate Information"
 msgstr ""
 
@@ -2613,14 +2611,13 @@
 #: ../libpurple/protocols/jabber/buddy.c:2138
 #: ../libpurple/protocols/msn/servconn.c:149
 #: ../libpurple/protocols/msn/session.c:404
-#: ../libpurple/protocols/msn/session.c:413
 #: ../libpurple/protocols/msn/session.c:417
 #: ../libpurple/protocols/oscar/family_chatnav.c:66
 #: ../libpurple/protocols/oscar/family_icbm.c:64
 #: ../libpurple/protocols/oscar/family_icbm.c:65
-#: ../libpurple/protocols/yahoo/libymsg.c:2021
-#: ../libpurple/protocols/yahoo/libymsg.c:2032
-#: ../libpurple/protocols/yahoo/libymsg.c:2391
+#: ../libpurple/protocols/yahoo/libymsg.c:2022
+#: ../libpurple/protocols/yahoo/libymsg.c:2031
+#: ../libpurple/protocols/yahoo/libymsg.c:2406
 msgid "Unknown error"
 msgstr "Impazamo engaziwayo"
 
@@ -2637,8 +2634,8 @@
 msgid "The message is too large."
 msgstr "Lo myalezo mkhulu kakhulu."
 
-#: ../libpurple/conversation.c:227 ../libpurple/protocols/bonjour/jabber.c:306
-#: ../libpurple/protocols/bonjour/jabber.c:352
+#: ../libpurple/conversation.c:227 ../libpurple/protocols/bonjour/jabber.c:305
+#: ../libpurple/protocols/bonjour/jabber.c:351
 msgid "Unable to send message."
 msgstr "Akukwazeki ukuthumela umyalezo."
 
@@ -2716,55 +2713,55 @@
 msgid "No name"
 msgstr ""
 
-#: ../libpurple/dnsquery.c:618
+#: ../libpurple/dnsquery.c:616
 msgid "Unable to create new resolver process\n"
 msgstr ""
 
-#: ../libpurple/dnsquery.c:623
+#: ../libpurple/dnsquery.c:621
 msgid "Unable to send request to resolver process\n"
 msgstr ""
 
-#: ../libpurple/dnsquery.c:656 ../libpurple/dnsquery.c:787
+#: ../libpurple/dnsquery.c:654 ../libpurple/dnsquery.c:785
 #, c-format
 msgid ""
 "Error resolving %s:\n"
 "%s"
 msgstr ""
 
-#: ../libpurple/dnsquery.c:659 ../libpurple/dnsquery.c:801
-#: ../libpurple/dnsquery.c:853 ../libpurple/dnsquery.c:864
+#: ../libpurple/dnsquery.c:657 ../libpurple/dnsquery.c:799
+#: ../libpurple/dnsquery.c:851 ../libpurple/dnsquery.c:862
 #, c-format
 msgid "Error resolving %s: %d"
 msgstr ""
 
-#: ../libpurple/dnsquery.c:683
+#: ../libpurple/dnsquery.c:681
 #, c-format
 msgid ""
 "Error reading from resolver process:\n"
 "%s"
 msgstr ""
 
-#: ../libpurple/dnsquery.c:687
+#: ../libpurple/dnsquery.c:685
 #, c-format
 msgid "Resolver process exited without answering our request"
 msgstr ""
 
-#: ../libpurple/dnsquery.c:751
+#: ../libpurple/dnsquery.c:749
 #, c-format
 msgid "Error converting %s to punycode: %d"
 msgstr ""
 
-#: ../libpurple/dnsquery.c:826
+#: ../libpurple/dnsquery.c:824
 #, c-format
 msgid "Thread creation failure: %s"
 msgstr ""
 
-#: ../libpurple/dnsquery.c:827 ../libpurple/protocols/oscar/oscar.c:1122
+#: ../libpurple/dnsquery.c:825 ../libpurple/protocols/oscar/oscar.c:1124
 #: ../libpurple/protocols/oscar/util.c:69
 msgid "Unknown reason"
 msgstr ""
 
-#: ../libpurple/dnsquery.c:901
+#: ../libpurple/dnsquery.c:899
 msgid "Aborting DNS lookup in Tor Proxy mode."
 msgstr ""
 
@@ -2848,215 +2845,215 @@
 msgid "%s is offering to send file %s"
 msgstr ""
 
-#: ../libpurple/ft.c:663
+#: ../libpurple/ft.c:661
 #, c-format
 msgid "%s is not a valid filename.\n"
 msgstr "I-%s asilogama elisebenzayo lefayili.\n"
 
-#: ../libpurple/ft.c:690
+#: ../libpurple/ft.c:688
 #, c-format
 msgid "Offering to send %s to %s"
 msgstr "Nikela ukuthumela %s ku %s"
 
-#: ../libpurple/ft.c:701
+#: ../libpurple/ft.c:699
 #, c-format
 msgid "Starting transfer of %s from %s"
 msgstr ""
 
-#: ../libpurple/ft.c:889
+#: ../libpurple/ft.c:887
 #, c-format
 msgid "Transfer of file <A HREF=\"file://%s\">%s</A> complete"
 msgstr ""
 
-#: ../libpurple/ft.c:894
+#: ../libpurple/ft.c:892
 #, c-format
 msgid "Transfer of file %s complete"
 msgstr ""
 
-#: ../libpurple/ft.c:899
+#: ../libpurple/ft.c:897
 msgid "File transfer complete"
 msgstr ""
 
-#: ../libpurple/ft.c:1518
+#: ../libpurple/ft.c:1511
 #, c-format
 msgid "You cancelled the transfer of %s"
 msgstr ""
 
-#: ../libpurple/ft.c:1523
+#: ../libpurple/ft.c:1516
 msgid "File transfer cancelled"
 msgstr ""
 
-#: ../libpurple/ft.c:1581
+#: ../libpurple/ft.c:1574
 #, c-format
 msgid "%s cancelled the transfer of %s"
 msgstr ""
 
-#: ../libpurple/ft.c:1586
+#: ../libpurple/ft.c:1579
 #, c-format
 msgid "%s cancelled the file transfer"
 msgstr ""
 
-#: ../libpurple/ft.c:1643
+#: ../libpurple/ft.c:1636
 #, c-format
 msgid "File transfer to %s failed."
 msgstr ""
 
-#: ../libpurple/ft.c:1645
+#: ../libpurple/ft.c:1638
 #, c-format
 msgid "File transfer from %s failed."
 msgstr ""
 
-#: ../libpurple/data/gconf/purple.schemas.in.h:1
+#: ../libpurple/gconf/purple.schemas.in.h:1
 msgid "Whether the specified command should handle \"aim\" URLs"
 msgstr ""
 
-#: ../libpurple/data/gconf/purple.schemas.in.h:2
+#: ../libpurple/gconf/purple.schemas.in.h:2
 msgid ""
 "True if the command specified in the \"command\" key should handle \"aim\" "
 "URLs."
 msgstr ""
 
-#: ../libpurple/data/gconf/purple.schemas.in.h:3
+#: ../libpurple/gconf/purple.schemas.in.h:3
 msgid "The handler for \"aim\" URLs"
 msgstr ""
 
-#: ../libpurple/data/gconf/purple.schemas.in.h:4
+#: ../libpurple/gconf/purple.schemas.in.h:4
 msgid "The command used to handle \"aim\" URLs, if enabled."
 msgstr ""
 
-#: ../libpurple/data/gconf/purple.schemas.in.h:5
+#: ../libpurple/gconf/purple.schemas.in.h:5
 msgid "Run the command in a terminal"
 msgstr ""
 
-#: ../libpurple/data/gconf/purple.schemas.in.h:6
+#: ../libpurple/gconf/purple.schemas.in.h:6
 msgid ""
 "True if the command used to handle this type of URL should be run in a "
 "terminal."
 msgstr ""
 
-#: ../libpurple/data/gconf/purple.schemas.in.h:7
+#: ../libpurple/gconf/purple.schemas.in.h:7
 msgid "Whether the specified command should handle \"gg\" URLs"
 msgstr ""
 
-#: ../libpurple/data/gconf/purple.schemas.in.h:8
+#: ../libpurple/gconf/purple.schemas.in.h:8
 msgid ""
 "True if the command specified in the \"command\" key should handle \"gg\" "
 "URLs."
 msgstr ""
 
-#: ../libpurple/data/gconf/purple.schemas.in.h:9
+#: ../libpurple/gconf/purple.schemas.in.h:9
 msgid "The handler for \"gg\" URLs"
 msgstr ""
 
-#: ../libpurple/data/gconf/purple.schemas.in.h:10
+#: ../libpurple/gconf/purple.schemas.in.h:10
 msgid "The command used to handle \"gg\" URLs, if enabled."
 msgstr ""
 
-#: ../libpurple/data/gconf/purple.schemas.in.h:11
+#: ../libpurple/gconf/purple.schemas.in.h:11
 msgid "Whether the specified command should handle \"icq\" URLs"
 msgstr ""
 
-#: ../libpurple/data/gconf/purple.schemas.in.h:12
+#: ../libpurple/gconf/purple.schemas.in.h:12
 msgid ""
 "True if the command specified in the \"command\" key should handle \"icq\" "
 "URLs."
 msgstr ""
 
-#: ../libpurple/data/gconf/purple.schemas.in.h:13
+#: ../libpurple/gconf/purple.schemas.in.h:13
 msgid "The handler for \"icq\" URLs"
 msgstr ""
 
-#: ../libpurple/data/gconf/purple.schemas.in.h:14
+#: ../libpurple/gconf/purple.schemas.in.h:14
 msgid "The command used to handle \"icq\" URLs, if enabled."
 msgstr ""
 
-#: ../libpurple/data/gconf/purple.schemas.in.h:15
+#: ../libpurple/gconf/purple.schemas.in.h:15
 msgid "Whether the specified command should handle \"irc\" URLs"
 msgstr ""
 
-#: ../libpurple/data/gconf/purple.schemas.in.h:16
+#: ../libpurple/gconf/purple.schemas.in.h:16
 msgid ""
 "True if the command specified in the \"command\" key should handle \"irc\" "
 "URLs."
 msgstr ""
 
-#: ../libpurple/data/gconf/purple.schemas.in.h:17
+#: ../libpurple/gconf/purple.schemas.in.h:17
 msgid "The handler for \"irc\" URLs"
 msgstr ""
 
-#: ../libpurple/data/gconf/purple.schemas.in.h:18
+#: ../libpurple/gconf/purple.schemas.in.h:18
 msgid "The command used to handle \"irc\" URLs, if enabled."
 msgstr ""
 
-#: ../libpurple/data/gconf/purple.schemas.in.h:19
+#: ../libpurple/gconf/purple.schemas.in.h:19
 msgid "Whether the specified command should handle \"msnim\" URLs"
 msgstr ""
 
-#: ../libpurple/data/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 \"msnim\" "
 "URLs."
 msgstr ""
 
-#: ../libpurple/data/gconf/purple.schemas.in.h:21
+#: ../libpurple/gconf/purple.schemas.in.h:21
 msgid "The handler for \"msnim\" URLs"
 msgstr ""
 
-#: ../libpurple/data/gconf/purple.schemas.in.h:22
+#: ../libpurple/gconf/purple.schemas.in.h:22
 msgid "The command used to handle \"msnim\" URLs, if enabled."
 msgstr ""
 
-#: ../libpurple/data/gconf/purple.schemas.in.h:23
+#: ../libpurple/gconf/purple.schemas.in.h:23
 msgid "Whether the specified command should handle \"sip\" URLs"
 msgstr ""
 
-#: ../libpurple/data/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 \"sip\" "
 "URLs."
 msgstr ""
 
-#: ../libpurple/data/gconf/purple.schemas.in.h:25
+#: ../libpurple/gconf/purple.schemas.in.h:25
 msgid "The handler for \"sip\" URLs"
 msgstr ""
 
-#: ../libpurple/data/gconf/purple.schemas.in.h:26
+#: ../libpurple/gconf/purple.schemas.in.h:26
 msgid "The command used to handle \"sip\" URLs, if enabled."
 msgstr ""
 
-#: ../libpurple/data/gconf/purple.schemas.in.h:27
+#: ../libpurple/gconf/purple.schemas.in.h:27
 msgid "Whether the specified command should handle \"xmpp\" URLs"
 msgstr ""
 
-#: ../libpurple/data/gconf/purple.schemas.in.h:28
+#: ../libpurple/gconf/purple.schemas.in.h:28
 msgid ""
 "True if the command specified in the \"command\" key should handle \"xmpp\" "
 "URLs."
 msgstr ""
 
-#: ../libpurple/data/gconf/purple.schemas.in.h:29
+#: ../libpurple/gconf/purple.schemas.in.h:29
 msgid "The handler for \"xmpp\" URLs"
 msgstr ""
 
-#: ../libpurple/data/gconf/purple.schemas.in.h:30
+#: ../libpurple/gconf/purple.schemas.in.h:30
 msgid "The command used to handle \"xmpp\" URLs, if enabled."
 msgstr ""
 
-#: ../libpurple/data/gconf/purple.schemas.in.h:31
+#: ../libpurple/gconf/purple.schemas.in.h:31
 msgid "Whether the specified command should handle \"ymsgr\" URLs"
 msgstr ""
 
-#: ../libpurple/data/gconf/purple.schemas.in.h:32
+#: ../libpurple/gconf/purple.schemas.in.h:32
 msgid ""
 "True if the command specified in the \"command\" key should handle \"ymsgr\" "
 "URLs."
 msgstr ""
 
-#: ../libpurple/data/gconf/purple.schemas.in.h:33
+#: ../libpurple/gconf/purple.schemas.in.h:33
 msgid "The handler for \"ymsgr\" URLs"
 msgstr ""
 
-#: ../libpurple/data/gconf/purple.schemas.in.h:34
+#: ../libpurple/gconf/purple.schemas.in.h:34
 msgid "The command used to handle \"ymsgr\" URLs, if enabled."
 msgstr ""
 
@@ -3117,38 +3114,38 @@
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr "(%s) %s <AUTO-REPLY>: %s\n"
 
-#: ../libpurple/media/backend-fs2.c:1019
+#: ../libpurple/media/backend-fs2.c:880
 msgid ""
 "No codecs found. Install some GStreamer codecs found in GStreamer plugins "
 "packages."
 msgstr ""
 
-#: ../libpurple/media/backend-fs2.c:1028
+#: ../libpurple/media/backend-fs2.c:889
 msgid ""
 "No codecs left. Your codec preferences in fs-codecs.conf are too strict."
 msgstr ""
 
-#: ../libpurple/media/backend-fs2.c:1062
+#: ../libpurple/media/backend-fs2.c:919
 msgid "A non-recoverable Farsight2 error has occurred."
 msgstr ""
 
-#: ../libpurple/media/backend-fs2.c:1065
+#: ../libpurple/media/backend-fs2.c:922
 msgid "A non-recoverable Farstream error has occurred."
 msgstr ""
 
-#: ../libpurple/media/backend-fs2.c:1331
+#: ../libpurple/media/backend-fs2.c:1191
 msgid "Error with your microphone"
 msgstr ""
 
-#: ../libpurple/media/backend-fs2.c:1334
+#: ../libpurple/media/backend-fs2.c:1194
 msgid "Error with your webcam"
 msgstr ""
 
-#: ../libpurple/media/backend-fs2.c:1341
+#: ../libpurple/media/backend-fs2.c:1201
 msgid "Conference error"
 msgstr ""
 
-#: ../libpurple/media/backend-fs2.c:1757
+#: ../libpurple/media/backend-fs2.c:1610
 #, c-format
 msgid "Error creating session: %s"
 msgstr ""
@@ -3238,11 +3235,11 @@
 #: ../libpurple/plugins/idle.c:200 ../libpurple/plugins/idle.c:226
 #: ../libpurple/protocols/mxit/actions.c:502
 #: ../libpurple/protocols/oscar/authorization.c:99
-#: ../libpurple/protocols/oscar/oscar.c:1222
-#: ../libpurple/protocols/oscar/oscar.c:4932
-#: ../libpurple/protocols/oscar/oscar.c:4989
-#: ../libpurple/protocols/oscar/oscar.c:5272
-#: ../libpurple/protocols/oscar/oscar.c:5329 ../libpurple/request.h:1498
+#: ../libpurple/protocols/oscar/oscar.c:1224
+#: ../libpurple/protocols/oscar/oscar.c:4937
+#: ../libpurple/protocols/oscar/oscar.c:4994
+#: ../libpurple/protocols/oscar/oscar.c:5277
+#: ../libpurple/protocols/oscar/oscar.c:5334 ../libpurple/request.h:1498
 #: ../libpurple/request.h:1508 ../libpurple/request.h:1521
 msgid "_Cancel"
 msgstr "_Rhoxisa"
@@ -3290,8 +3287,8 @@
 msgid "Escape the filenames"
 msgstr ""
 
-#: ../libpurple/plugins/buddynote.c:46 ../libpurple/protocols/msn/msn.c:2486
-#: ../libpurple/protocols/msn/msn.c:2516
+#: ../libpurple/plugins/buddynote.c:46 ../libpurple/protocols/msn/msn.c:2487
+#: ../libpurple/protocols/msn/msn.c:2517
 msgid "Notes"
 msgstr ""
 
@@ -3523,114 +3520,114 @@
 msgid "(UTC)"
 msgstr ""
 
-#: ../libpurple/plugins/log_reader.c:1567
+#: ../libpurple/plugins/log_reader.c:1561
 msgid "User is offline."
 msgstr ""
 
-#: ../libpurple/plugins/log_reader.c:1573
+#: ../libpurple/plugins/log_reader.c:1567
 msgid "Auto-response sent:"
 msgstr ""
 
-#: ../libpurple/plugins/log_reader.c:1588
-#: ../libpurple/plugins/log_reader.c:1591
+#: ../libpurple/plugins/log_reader.c:1582
+#: ../libpurple/plugins/log_reader.c:1585
 #: ../libpurple/plugins/statenotify.c:93
 #, c-format
 msgid "%s has signed off."
 msgstr ""
 
-#: ../libpurple/plugins/log_reader.c:1612
+#: ../libpurple/plugins/log_reader.c:1606
 msgid "One or more messages may have been undeliverable."
 msgstr ""
 
-#: ../libpurple/plugins/log_reader.c:1622
+#: ../libpurple/plugins/log_reader.c:1616
 msgid "You were disconnected from the server."
 msgstr "Ubuqhawukile kwiseva."
 
-#: ../libpurple/plugins/log_reader.c:1630
+#: ../libpurple/plugins/log_reader.c:1624
 msgid ""
 "You are currently disconnected. Messages will not be received unless you are "
 "logged in."
 msgstr ""
 
-#: ../libpurple/plugins/log_reader.c:1645
+#: ../libpurple/plugins/log_reader.c:1639
 msgid "Message could not be sent because the maximum length was exceeded."
 msgstr ""
 
-#: ../libpurple/plugins/log_reader.c:1650
+#: ../libpurple/plugins/log_reader.c:1644
 msgid "Message could not be sent."
 msgstr ""
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
-#: ../libpurple/plugins/log_reader.c:2751
-#: ../libpurple/plugins/log_reader.c:2907
+#: ../libpurple/plugins/log_reader.c:2726
+#: ../libpurple/plugins/log_reader.c:2882
 msgid "Adium"
 msgstr ""
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
-#: ../libpurple/plugins/log_reader.c:2764
-#: ../libpurple/plugins/log_reader.c:2912
+#: ../libpurple/plugins/log_reader.c:2739
+#: ../libpurple/plugins/log_reader.c:2887
 msgid "Fire"
 msgstr ""
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
-#: ../libpurple/plugins/log_reader.c:2776
-#: ../libpurple/plugins/log_reader.c:2916
+#: ../libpurple/plugins/log_reader.c:2751
+#: ../libpurple/plugins/log_reader.c:2891
 msgid "Messenger Plus!"
 msgstr ""
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
-#: ../libpurple/plugins/log_reader.c:2790
-#: ../libpurple/plugins/log_reader.c:2921
+#: ../libpurple/plugins/log_reader.c:2765
+#: ../libpurple/plugins/log_reader.c:2896
 msgid "QIP"
 msgstr ""
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
-#: ../libpurple/plugins/log_reader.c:2802
-#: ../libpurple/plugins/log_reader.c:2925
+#: ../libpurple/plugins/log_reader.c:2777
+#: ../libpurple/plugins/log_reader.c:2900
 msgid "MSN Messenger"
 msgstr ""
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
-#: ../libpurple/plugins/log_reader.c:2814
-#: ../libpurple/plugins/log_reader.c:2929
+#: ../libpurple/plugins/log_reader.c:2789
+#: ../libpurple/plugins/log_reader.c:2904
 msgid "Trillian"
 msgstr ""
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
-#: ../libpurple/plugins/log_reader.c:2826
-#: ../libpurple/plugins/log_reader.c:2933
+#: ../libpurple/plugins/log_reader.c:2801
+#: ../libpurple/plugins/log_reader.c:2908
 msgid "aMSN"
 msgstr ""
 
 #. Add general preferences.
-#: ../libpurple/plugins/log_reader.c:2889
+#: ../libpurple/plugins/log_reader.c:2864
 msgid "General Log Reading Configuration"
 msgstr ""
 
-#: ../libpurple/plugins/log_reader.c:2893
+#: ../libpurple/plugins/log_reader.c:2868
 msgid "Fast size calculations"
 msgstr ""
 
-#: ../libpurple/plugins/log_reader.c:2897
+#: ../libpurple/plugins/log_reader.c:2872
 msgid "Use name heuristics"
 msgstr ""
 
 #. Add Log Directory preferences.
-#: ../libpurple/plugins/log_reader.c:2903
+#: ../libpurple/plugins/log_reader.c:2878
 msgid "Log Directory"
 msgstr ""
 
@@ -3640,19 +3637,19 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/log_reader.c:2962
+#: ../libpurple/plugins/log_reader.c:2937
 msgid "Log Reader"
 msgstr ""
 
 #. *< name
 #. *< version
 #. * summary
-#: ../libpurple/plugins/log_reader.c:2966
+#: ../libpurple/plugins/log_reader.c:2941
 msgid "Includes other IM clients' logs in the log viewer."
 msgstr ""
 
 #. * description
-#: ../libpurple/plugins/log_reader.c:2970
+#: ../libpurple/plugins/log_reader.c:2945
 msgid ""
 "When viewing logs, this plugin will include logs from other IM clients. "
 "Currently, this includes Adium, MSN Messenger, aMSN, and Trillian.\n"
@@ -3738,7 +3735,7 @@
 #: ../libpurple/protocols/msn/msn.c:1123 ../libpurple/protocols/msn/msn.c:1126
 #: ../libpurple/protocols/novell/novell.c:1929
 #: ../libpurple/protocols/silc/buddy.c:318
-#: ../libpurple/protocols/silc/pk.c:114 ../libpurple/protocols/silc/wb.c:307
+#: ../libpurple/protocols/silc/pk.c:114 ../libpurple/protocols/silc/wb.c:309
 #: ../libpurple/protocols/silc10/buddy.c:314
 #: ../libpurple/protocols/silc10/pk.c:119
 #: ../libpurple/protocols/silc10/wb.c:307 ../pidgin/gtkrequest.c:298
@@ -3750,7 +3747,7 @@
 #: ../libpurple/protocols/msn/msn.c:1123 ../libpurple/protocols/msn/msn.c:1126
 #: ../libpurple/protocols/novell/novell.c:1930
 #: ../libpurple/protocols/silc/buddy.c:319
-#: ../libpurple/protocols/silc/pk.c:115 ../libpurple/protocols/silc/wb.c:308
+#: ../libpurple/protocols/silc/pk.c:115 ../libpurple/protocols/silc/wb.c:310
 #: ../libpurple/protocols/silc10/buddy.c:315
 #: ../libpurple/protocols/silc10/pk.c:120
 #: ../libpurple/protocols/silc10/wb.c:308 ../pidgin/gtkrequest.c:299
@@ -3800,14 +3797,14 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/perl/perl.c:674
+#: ../libpurple/plugins/perl/perl.c:671
 msgid "Perl Plugin Loader"
 msgstr "I-Perl yesiFakelo seNgeniso"
 
 #. *< name
 #. *< version
 #. *< summary
-#: ../libpurple/plugins/perl/perl.c:676 ../libpurple/plugins/perl/perl.c:677
+#: ../libpurple/plugins/perl/perl.c:673 ../libpurple/plugins/perl/perl.c:674
 msgid "Provides support for loading perl plugins."
 msgstr "Ibonelela ngenkxaso yokufakela iindlela zokungena ze-perl."
 
@@ -3883,8 +3880,8 @@
 msgstr "Iimvavanyo zokubona ukuba uninzi lwezinto luyasebenza."
 
 #. Scheme name
-#: ../libpurple/plugins/ssl/ssl-gnutls.c:1232
-#: ../libpurple/plugins/ssl/ssl-nss.c:1199
+#: ../libpurple/plugins/ssl/ssl-gnutls.c:1183
+#: ../libpurple/plugins/ssl/ssl-nss.c:1032
 msgid "X.509 Certificates"
 msgstr ""
 
@@ -3894,7 +3891,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/ssl/ssl-gnutls.c:1308
+#: ../libpurple/plugins/ssl/ssl-gnutls.c:1259
 msgid "GNUTLS"
 msgstr "I-GNUTLS"
 
@@ -3902,8 +3899,8 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/plugins/ssl/ssl-gnutls.c:1311
-#: ../libpurple/plugins/ssl/ssl-gnutls.c:1313
+#: ../libpurple/plugins/ssl/ssl-gnutls.c:1262
+#: ../libpurple/plugins/ssl/ssl-gnutls.c:1264
 msgid "Provides SSL support through GNUTLS."
 msgstr "Ibonelela ngenkxaso yeSSL ngeGNUTLS."
 
@@ -3913,7 +3910,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/ssl/ssl-nss.c:1275
+#: ../libpurple/plugins/ssl/ssl-nss.c:1108
 msgid "NSS"
 msgstr "I-NSS"
 
@@ -3921,8 +3918,8 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/plugins/ssl/ssl-nss.c:1278
-#: ../libpurple/plugins/ssl/ssl-nss.c:1280
+#: ../libpurple/plugins/ssl/ssl-nss.c:1111
+#: ../libpurple/plugins/ssl/ssl-nss.c:1113
 msgid "Provides SSL support through Mozilla NSS."
 msgstr "Ibonelela ngenkxaso yeSSL ngeMozilla NSS."
 
@@ -4040,14 +4037,14 @@
 #: ../libpurple/protocols/bonjour/bonjour.c:386
 #: ../libpurple/protocols/bonjour/bonjour.c:736
 #: ../libpurple/protocols/gg/gg.c:302
-#: ../libpurple/protocols/jabber/jabber.c:1330
+#: ../libpurple/protocols/jabber/jabber.c:1322
 msgid "First name"
 msgstr ""
 
 #: ../libpurple/protocols/bonjour/bonjour.c:388
 #: ../libpurple/protocols/bonjour/bonjour.c:739
 #: ../libpurple/protocols/gg/gg.c:297
-#: ../libpurple/protocols/jabber/jabber.c:1331
+#: ../libpurple/protocols/jabber/jabber.c:1323
 msgid "Last name"
 msgstr ""
 
@@ -4058,12 +4055,12 @@
 #: ../libpurple/protocols/jabber/buddy.c:1127
 #: ../libpurple/protocols/jabber/buddy.c:1140
 #: ../libpurple/protocols/jabber/buddy.c:2006
-#: ../libpurple/protocols/jabber/jabber.c:1328
+#: ../libpurple/protocols/jabber/jabber.c:1320
 #: ../libpurple/protocols/mxit/actions.c:294
-#: ../libpurple/protocols/silc/ops.c:1053
+#: ../libpurple/protocols/silc/ops.c:1054
 #: ../libpurple/protocols/silc/silc.c:1010
 #: ../libpurple/protocols/silc/silc.c:1251
-#: ../libpurple/protocols/silc/util.c:511
+#: ../libpurple/protocols/silc/util.c:562
 #: ../libpurple/protocols/silc10/ops.c:1075
 #: ../libpurple/protocols/silc10/silc.c:706
 #: ../libpurple/protocols/silc10/silc.c:947
@@ -4110,16 +4107,16 @@
 msgid "Bonjour"
 msgstr ""
 
-#: ../libpurple/protocols/bonjour/jabber.c:401
+#: ../libpurple/protocols/bonjour/jabber.c:398
 #, c-format
 msgid "%s has closed the conversation."
 msgstr ""
 
-#: ../libpurple/protocols/bonjour/jabber.c:491
-#: ../libpurple/protocols/bonjour/jabber.c:556
-#: ../libpurple/protocols/bonjour/jabber.c:601
-#: ../libpurple/protocols/bonjour/jabber.c:874
-#: ../libpurple/protocols/bonjour/jabber.c:895
+#: ../libpurple/protocols/bonjour/jabber.c:488
+#: ../libpurple/protocols/bonjour/jabber.c:553
+#: ../libpurple/protocols/bonjour/jabber.c:598
+#: ../libpurple/protocols/bonjour/jabber.c:875
+#: ../libpurple/protocols/bonjour/jabber.c:896
 msgid "Unable to send the message, the conversation couldn't be started."
 msgstr ""
 
@@ -4127,13 +4124,13 @@
 msgid "Error communicating with local mDNSResponder."
 msgstr ""
 
-#: ../libpurple/protocols/gg/gg.c:96 ../libpurple/proxy.c:2330
-#: ../libpurple/proxy.c:2398
+#: ../libpurple/protocols/gg/gg.c:96 ../libpurple/proxy.c:2359
+#: ../libpurple/proxy.c:2427
 msgid "Invalid proxy settings"
 msgstr "ImiMiselo engasebenziyo yomQobo"
 
-#: ../libpurple/protocols/gg/gg.c:97 ../libpurple/proxy.c:2330
-#: ../libpurple/proxy.c:2398
+#: ../libpurple/protocols/gg/gg.c:97 ../libpurple/proxy.c:2359
+#: ../libpurple/proxy.c:2427
 msgid ""
 "Either the host name or port number specified for your given proxy type is "
 "invalid."
@@ -4175,15 +4172,15 @@
 msgid "Save buddylist..."
 msgstr ""
 
-#: ../libpurple/protocols/gg/gg.c:197 ../libpurple/protocols/gg/gg.c:2233
+#: ../libpurple/protocols/gg/gg.c:197 ../libpurple/protocols/gg/gg.c:2193
 msgid "Load buddylist from file..."
 msgstr ""
 
 #: ../libpurple/protocols/gg/gg.c:312 ../libpurple/protocols/gg/gg.c:805
 #: ../libpurple/protocols/gg/gg.c:876
-#: ../libpurple/protocols/jabber/jabber.c:1333
-#: ../libpurple/protocols/oscar/userinfo.c:463
-#: ../libpurple/protocols/oscar/userinfo.c:471
+#: ../libpurple/protocols/jabber/jabber.c:1325
+#: ../libpurple/protocols/oscar/userinfo.c:462
+#: ../libpurple/protocols/oscar/userinfo.c:470
 msgid "City"
 msgstr "Isixeko"
 
@@ -4192,13 +4189,13 @@
 msgstr ""
 
 #. gender
-#: ../libpurple/protocols/gg/gg.c:320 ../libpurple/protocols/msn/msn.c:2415
+#: ../libpurple/protocols/gg/gg.c:320 ../libpurple/protocols/msn/msn.c:2416
 #: ../libpurple/protocols/mxit/actions.c:245
 #: ../libpurple/protocols/mxit/login.c:349
 #: ../libpurple/protocols/mxit/profile.c:217
 #: ../libpurple/protocols/mxit/profile.c:327
 #: ../libpurple/protocols/myspace/user.c:131
-#: ../libpurple/protocols/oscar/userinfo.c:424
+#: ../libpurple/protocols/oscar/userinfo.c:423
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1090
 msgid "Gender"
 msgstr "Isini"
@@ -4212,7 +4209,7 @@
 #: ../libpurple/protocols/mxit/actions.c:247
 #: ../libpurple/protocols/mxit/login.c:351
 #: ../libpurple/protocols/mxit/profile.c:217
-#: ../libpurple/protocols/oscar/userinfo.c:424
+#: ../libpurple/protocols/oscar/userinfo.c:423
 msgid "Male"
 msgstr "Indoda"
 
@@ -4220,7 +4217,7 @@
 #: ../libpurple/protocols/mxit/actions.c:246
 #: ../libpurple/protocols/mxit/login.c:350
 #: ../libpurple/protocols/mxit/profile.c:217
-#: ../libpurple/protocols/oscar/userinfo.c:424
+#: ../libpurple/protocols/oscar/userinfo.c:423
 msgid "Female"
 msgstr "Ibhinqa"
 
@@ -4249,7 +4246,7 @@
 msgstr ""
 
 #: ../libpurple/protocols/gg/gg.c:386 ../libpurple/protocols/gg/gg.c:387
-#: ../libpurple/protocols/gg/gg.c:2223
+#: ../libpurple/protocols/gg/gg.c:2183
 msgid "Change status broadcasting"
 msgstr ""
 
@@ -4274,7 +4271,7 @@
 #: ../libpurple/protocols/msn/state.c:43 ../libpurple/protocols/msn/state.c:44
 #: ../libpurple/protocols/mxit/roster.c:54
 #: ../libpurple/protocols/novell/novell.c:2839
-#: ../libpurple/protocols/yahoo/libymsg.c:4093 ../libpurple/status.c:163
+#: ../libpurple/protocols/yahoo/libymsg.c:4106 ../libpurple/status.c:163
 #: ../pidgin/gtkdocklet.c:548 ../pidgin/gtkstatusbox.c:1096
 #: ../pidgin/plugins/themeedit-icon.c:63
 msgid "Available"
@@ -4282,7 +4279,7 @@
 
 #. 2
 #: ../libpurple/protocols/gg/gg.c:763
-#: ../libpurple/protocols/jabber/jabber.c:2402
+#: ../libpurple/protocols/jabber/jabber.c:2394
 #: ../libpurple/protocols/jabber/jutil.c:706
 #: ../libpurple/protocols/mxit/roster.c:56
 msgid "Chatty"
@@ -4290,12 +4287,12 @@
 
 #. 3
 #: ../libpurple/protocols/gg/gg.c:766
-#: ../libpurple/protocols/jabber/jabber.c:2448
+#: ../libpurple/protocols/jabber/jabber.c:2440
 #: ../libpurple/protocols/jabber/jutil.c:709
 #: ../libpurple/protocols/mxit/roster.c:57
 #: ../libpurple/protocols/oscar/oscar.c:159
-#: ../libpurple/protocols/oscar/oscar.c:4841
-#: ../libpurple/protocols/sametime/sametime.c:3344
+#: ../libpurple/protocols/oscar/oscar.c:4846
+#: ../libpurple/protocols/sametime/sametime.c:3380
 msgid "Do Not Disturb"
 msgstr "Musa ukuPhazamisa"
 
@@ -4303,25 +4300,25 @@
 #. 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:769 ../libpurple/protocols/irc/irc.c:597
+#: ../libpurple/protocols/gg/gg.c:769 ../libpurple/protocols/irc/irc.c:595
 #: ../libpurple/protocols/irc/msgs.c:427
 #: ../libpurple/protocols/jabber/jutil.c:707
 #: ../libpurple/protocols/mxit/roster.c:55
 #: ../libpurple/protocols/novell/novell.c:2842
 #: ../libpurple/protocols/oscar/oscar.c:165
-#: ../libpurple/protocols/silc/buddy.c:1483
+#: ../libpurple/protocols/silc/buddy.c:1489
 #: ../libpurple/protocols/silc10/buddy.c:1496
-#: ../libpurple/protocols/yahoo/libymsg.c:4971
-#: ../libpurple/protocols/yahoo/libymsg.c:5058 ../libpurple/status.c:166
-#: ../pidgin/gtkdocklet.c:552 ../pidgin/gtkprefs.c:2750
+#: ../libpurple/protocols/yahoo/libymsg.c:4984
+#: ../libpurple/protocols/yahoo/libymsg.c:5071 ../libpurple/status.c:166
+#: ../pidgin/gtkdocklet.c:552 ../pidgin/gtkprefs.c:2745
 #: ../pidgin/gtkstatusbox.c:1097 ../pidgin/plugins/themeedit-icon.c:64
 msgid "Away"
 msgstr "Engekhoyo"
 
 #: ../libpurple/protocols/gg/gg.c:794 ../libpurple/protocols/gg/gg.c:867
-#: ../libpurple/protocols/oscar/oscar.c:2293
-#: ../libpurple/protocols/oscar/oscar.c:2316
-#: ../libpurple/protocols/oscar/userinfo.c:401
+#: ../libpurple/protocols/oscar/oscar.c:2295
+#: ../libpurple/protocols/oscar/oscar.c:2318
+#: ../libpurple/protocols/oscar/userinfo.c:400
 msgid "UIN"
 msgstr "I-UIN"
 
@@ -4333,8 +4330,8 @@
 #: ../libpurple/protocols/mxit/actions.c:251
 #: ../libpurple/protocols/mxit/profile.c:220
 #: ../libpurple/protocols/mxit/profile.c:323
-#: ../libpurple/protocols/oscar/userinfo.c:412
-#: ../libpurple/protocols/silc/ops.c:1002
+#: ../libpurple/protocols/oscar/userinfo.c:411
+#: ../libpurple/protocols/silc/ops.c:1003
 #: ../libpurple/protocols/silc10/ops.c:1024
 #: ../libpurple/protocols/yahoo/yahoo_aliases.c:544
 msgid "First Name"
@@ -4345,7 +4342,7 @@
 msgstr "Unyaka wokuzalwa"
 
 #: ../libpurple/protocols/gg/gg.c:860 ../libpurple/protocols/gg/gg.c:925
-#: ../libpurple/protocols/oscar/oscar.c:3009
+#: ../libpurple/protocols/oscar/oscar.c:3012
 msgid "Unable to display the search results."
 msgstr ""
 
@@ -4374,11 +4371,11 @@
 #. * we're ready for it (session key, userid, username all setup).
 #: ../libpurple/protocols/gg/gg.c:1496
 #: ../libpurple/protocols/myspace/myspace.c:1159
-#: ../libpurple/protocols/sametime/sametime.c:1577
+#: ../libpurple/protocols/sametime/sametime.c:1578
 msgid "Connected"
 msgstr ""
 
-#: ../libpurple/protocols/gg/gg.c:1505 ../libpurple/protocols/gg/gg.c:1735
+#: ../libpurple/protocols/gg/gg.c:1505 ../libpurple/protocols/gg/gg.c:1759
 #: ../libpurple/protocols/silc/silc.c:375
 #: ../libpurple/protocols/silc/silc.c:422
 #: ../libpurple/protocols/silc10/silc.c:164
@@ -4400,36 +4397,36 @@
 
 #. 1. connect to server
 #. connect to the server
-#: ../libpurple/protocols/gg/gg.c:1731 ../libpurple/protocols/irc/irc.c:363
-#: ../libpurple/protocols/jabber/jabber.c:1749
+#: ../libpurple/protocols/gg/gg.c:1755 ../libpurple/protocols/irc/irc.c:361
+#: ../libpurple/protocols/jabber/jabber.c:1741
 #: ../libpurple/protocols/msn/session.c:432
 #: ../libpurple/protocols/myspace/myspace.c:2206
 #: ../libpurple/protocols/novell/novell.c:2198
 #: ../libpurple/protocols/oscar/oscar.c:834
-#: ../libpurple/protocols/sametime/sametime.c:3733
-#: ../libpurple/protocols/simple/simple.c:1962
-#: ../libpurple/protocols/yahoo/libymsg.c:3897
-#: ../libpurple/protocols/zephyr/zephyr.c:1593 ../pidgin/gtkstatusbox.c:716
+#: ../libpurple/protocols/sametime/sametime.c:3769
+#: ../libpurple/protocols/simple/simple.c:1960
+#: ../libpurple/protocols/yahoo/libymsg.c:3910
+#: ../libpurple/protocols/zephyr/zephyr.c:1581 ../pidgin/gtkstatusbox.c:716
 msgid "Connecting"
 msgstr "Ukunxulumana"
 
-#: ../libpurple/protocols/gg/gg.c:2126
+#: ../libpurple/protocols/gg/gg.c:2086
 msgid "Chat error"
 msgstr ""
 
-#: ../libpurple/protocols/gg/gg.c:2127
+#: ../libpurple/protocols/gg/gg.c:2087
 msgid "This chat name is already in use"
 msgstr ""
 
-#: ../libpurple/protocols/gg/gg.c:2210
+#: ../libpurple/protocols/gg/gg.c:2170
 msgid "Not connected to the server"
 msgstr ""
 
-#: ../libpurple/protocols/gg/gg.c:2219
+#: ../libpurple/protocols/gg/gg.c:2179
 msgid "Find buddies..."
 msgstr ""
 
-#: ../libpurple/protocols/gg/gg.c:2229
+#: ../libpurple/protocols/gg/gg.c:2189
 msgid "Save buddylist to file..."
 msgstr ""
 
@@ -4444,44 +4441,44 @@
 #. id
 #. name
 #. version
-#: ../libpurple/protocols/gg/gg.c:2347
+#: ../libpurple/protocols/gg/gg.c:2297
 msgid "Gadu-Gadu Protocol Plugin"
 msgstr "Imithetho yokusebenza yokuNgenisa yeGadu-gadu"
 
 #. summary
-#: ../libpurple/protocols/gg/gg.c:2348
+#: ../libpurple/protocols/gg/gg.c:2298
 msgid "Polish popular IM"
 msgstr ""
 
-#: ../libpurple/protocols/gg/gg.c:2405
+#: ../libpurple/protocols/gg/gg.c:2347
 msgid "Gadu-Gadu User"
 msgstr ""
 
-#: ../libpurple/protocols/gg/gg.c:2409
+#: ../libpurple/protocols/gg/gg.c:2351
 msgid "GG server"
 msgstr ""
 
-#: ../libpurple/protocols/gg/gg.c:2421
-#: ../libpurple/protocols/oscar/oscar.c:5737
+#: ../libpurple/protocols/gg/gg.c:2363
+#: ../libpurple/protocols/oscar/oscar.c:5742
 msgid "Don't use encryption"
 msgstr ""
 
-#: ../libpurple/protocols/gg/gg.c:2422
+#: ../libpurple/protocols/gg/gg.c:2364
 #: ../libpurple/protocols/jabber/libxmpp.c:277
-#: ../libpurple/protocols/oscar/oscar.c:5735
+#: ../libpurple/protocols/oscar/oscar.c:5740
 msgid "Use encryption if available"
 msgstr ""
 
 #. TODO
-#: ../libpurple/protocols/gg/gg.c:2426
+#: ../libpurple/protocols/gg/gg.c:2368
 #: ../libpurple/protocols/jabber/libxmpp.c:276
-#: ../libpurple/protocols/oscar/oscar.c:5736
+#: ../libpurple/protocols/oscar/oscar.c:5741
 msgid "Require encryption"
 msgstr ""
 
-#: ../libpurple/protocols/gg/gg.c:2429
+#: ../libpurple/protocols/gg/gg.c:2371
 #: ../libpurple/protocols/jabber/libxmpp.c:286
-#: ../libpurple/protocols/oscar/oscar.c:5761
+#: ../libpurple/protocols/oscar/oscar.c:5766
 msgid "Connection security"
 msgstr ""
 
@@ -4492,34 +4489,34 @@
 msgid "Unknown command: %s"
 msgstr "Umyalelo ongaziwa: %s"
 
-#: ../libpurple/protocols/irc/cmds.c:581
-#: ../libpurple/protocols/jabber/jabber.c:2871
+#: ../libpurple/protocols/irc/cmds.c:536
+#: ../libpurple/protocols/jabber/jabber.c:2863
 #: ../libpurple/protocols/silc/silc.c:1590
 #: ../libpurple/protocols/silc10/silc.c:1299
 #, c-format
 msgid "current topic is: %s"
 msgstr "Isihloko sangoku si: %s"
 
-#: ../libpurple/protocols/irc/cmds.c:585
-#: ../libpurple/protocols/jabber/jabber.c:2875
+#: ../libpurple/protocols/irc/cmds.c:540
+#: ../libpurple/protocols/jabber/jabber.c:2867
 #: ../libpurple/protocols/silc/silc.c:1594
 #: ../libpurple/protocols/silc10/silc.c:1303
 msgid "No topic is set"
 msgstr "Asikho isihloko esimiselweyo"
 
-#: ../libpurple/protocols/irc/dcc_send.c:300
-#: ../libpurple/protocols/irc/dcc_send.c:341
+#: ../libpurple/protocols/irc/dcc_send.c:304
+#: ../libpurple/protocols/irc/dcc_send.c:345
 #: ../libpurple/protocols/yahoo/yahoo_filexfer.c:327
 #: ../libpurple/protocols/yahoo/yahoo_filexfer.c:336
 #: ../libpurple/protocols/yahoo/yahoo_filexfer.c:345
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:1200
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:1948
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:2045
+#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:1216
+#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:1977
+#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:2074
 msgid "File Transfer Failed"
 msgstr ""
 
-#: ../libpurple/protocols/irc/dcc_send.c:301
-#: ../libpurple/protocols/irc/dcc_send.c:342
+#: ../libpurple/protocols/irc/dcc_send.c:305
+#: ../libpurple/protocols/irc/dcc_send.c:346
 msgid "Unable to open a listening port."
 msgstr ""
 
@@ -4546,124 +4543,124 @@
 #. * PurpleHTTPConnection reports it is fully sent.
 #. 
 #. TODO: do we really want to disconnect on a failure to write?
-#: ../libpurple/protocols/irc/irc.c:131 ../libpurple/protocols/irc/irc.c:176
-#: ../libpurple/protocols/irc/irc.c:695 ../libpurple/protocols/irc/irc.c:726
+#: ../libpurple/protocols/irc/irc.c:129 ../libpurple/protocols/irc/irc.c:174
+#: ../libpurple/protocols/irc/irc.c:693 ../libpurple/protocols/irc/irc.c:724
 #: ../libpurple/protocols/jabber/bosh.c:1044
 #: ../libpurple/protocols/jabber/bosh.c:1100
 #: ../libpurple/protocols/jabber/jabber.c:408
 #: ../libpurple/protocols/jabber/jabber.c:444
-#: ../libpurple/protocols/jabber/jabber.c:673
-#: ../libpurple/protocols/jabber/jabber.c:731
+#: ../libpurple/protocols/jabber/jabber.c:671
+#: ../libpurple/protocols/jabber/jabber.c:729
 #: ../libpurple/protocols/myspace/myspace.c:2070
 #: ../libpurple/protocols/oscar/flap_connection.c:474
 #: ../libpurple/protocols/sametime/sametime.c:412
-#: ../libpurple/protocols/sametime/sametime.c:1778
-#: ../libpurple/protocols/simple/simple.c:438
-#: ../libpurple/protocols/yahoo/libymsg.c:3363
-#: ../libpurple/protocols/yahoo/libymsg.c:3517
-#: ../libpurple/protocols/yahoo/ycht.c:476 ../libpurple/proxy.c:934
-#: ../libpurple/proxy.c:1517 ../libpurple/proxy.c:1631
-#: ../libpurple/proxy.c:1871 ../libpurple/proxy.c:1947
+#: ../libpurple/protocols/sametime/sametime.c:1779
+#: ../libpurple/protocols/simple/simple.c:433
+#: ../libpurple/protocols/yahoo/libymsg.c:3376
+#: ../libpurple/protocols/yahoo/libymsg.c:3530
+#: ../libpurple/protocols/yahoo/ycht.c:476 ../libpurple/proxy.c:948
+#: ../libpurple/proxy.c:1544 ../libpurple/proxy.c:1658
+#: ../libpurple/proxy.c:1893 ../libpurple/proxy.c:1969
 #, c-format
 msgid "Lost connection with server: %s"
 msgstr ""
 
-#: ../libpurple/protocols/irc/irc.c:291
+#: ../libpurple/protocols/irc/irc.c:289
 msgid "View MOTD"
 msgstr "Jonga iMOTD"
 
-#: ../libpurple/protocols/irc/irc.c:303 ../libpurple/protocols/silc/chat.c:34
+#: ../libpurple/protocols/irc/irc.c:301 ../libpurple/protocols/silc/chat.c:34
 #: ../libpurple/protocols/silc10/chat.c:33
 msgid "_Channel:"
 msgstr "I_siqhagamshelanisi:"
 
-#: ../libpurple/protocols/irc/irc.c:309
-#: ../libpurple/protocols/jabber/chat.c:62 ../pidgin/gtkaccount.c:601
+#: ../libpurple/protocols/irc/irc.c:307
+#: ../libpurple/protocols/jabber/chat.c:62 ../pidgin/gtkaccount.c:594
 msgid "_Password:"
 msgstr "I-_Password:"
 
-#: ../libpurple/protocols/irc/irc.c:342
+#: ../libpurple/protocols/irc/irc.c:340
 msgid "IRC nick and server may not contain whitespace"
 msgstr ""
 
-#: ../libpurple/protocols/irc/irc.c:373
+#: ../libpurple/protocols/irc/irc.c:371
 #: ../libpurple/protocols/jabber/bosh.c:995
-#: ../libpurple/protocols/jabber/jabber.c:1072
+#: ../libpurple/protocols/jabber/jabber.c:1064
 #: ../libpurple/protocols/novell/novell.c:2213
-#: ../libpurple/protocols/yahoo/libymsg.c:2189
+#: ../libpurple/protocols/yahoo/libymsg.c:2188
 msgid "SSL support unavailable"
 msgstr "Inkxaso engafumanekiyo yeSSL"
 
-#: ../libpurple/protocols/irc/irc.c:386
+#: ../libpurple/protocols/irc/irc.c:384
 #: ../libpurple/protocols/jabber/bosh.c:1001
-#: ../libpurple/protocols/jabber/jabber.c:796
-#: ../libpurple/protocols/jabber/jabber.c:881
+#: ../libpurple/protocols/jabber/jabber.c:794
+#: ../libpurple/protocols/jabber/jabber.c:879
 #: ../libpurple/protocols/msn/msn.c:1379
 #: ../libpurple/protocols/msn/servconn.c:143
-#: ../libpurple/protocols/mxit/http.c:338
+#: ../libpurple/protocols/mxit/http.c:335
 #: ../libpurple/protocols/myspace/myspace.c:2224
 #: ../libpurple/protocols/novell/novell.c:1743
 #: ../libpurple/protocols/oscar/oscar.c:829
-#: ../libpurple/protocols/oscar/oscar.c:1049
-#: ../libpurple/protocols/oscar/oscar.c:1170
-#: ../libpurple/protocols/sametime/sametime.c:3737
+#: ../libpurple/protocols/oscar/oscar.c:1051
+#: ../libpurple/protocols/oscar/oscar.c:1172
+#: ../libpurple/protocols/sametime/sametime.c:3773
 #: ../libpurple/protocols/silc/silc.c:451
-#: ../libpurple/protocols/simple/simple.c:487
-#: ../libpurple/protocols/simple/simple.c:1862
-#: ../libpurple/protocols/yahoo/libymsg.c:3570
-#: ../libpurple/protocols/yahoo/libymsg.c:3758
-#: ../libpurple/protocols/yahoo/libymsg.c:3843
-#: ../libpurple/protocols/yahoo/libymsg.c:3865
+#: ../libpurple/protocols/simple/simple.c:482
+#: ../libpurple/protocols/simple/simple.c:1860
+#: ../libpurple/protocols/yahoo/libymsg.c:3583
+#: ../libpurple/protocols/yahoo/libymsg.c:3771
+#: ../libpurple/protocols/yahoo/libymsg.c:3856
 #: ../libpurple/protocols/yahoo/libymsg.c:3878
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:2045
-#: ../libpurple/protocols/yahoo/yahoochat.c:1505
-#: ../libpurple/protocols/yahoo/yahoochat.c:1531
+#: ../libpurple/protocols/yahoo/libymsg.c:3891
+#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:2074
+#: ../libpurple/protocols/yahoo/yahoochat.c:1530
+#: ../libpurple/protocols/yahoo/yahoochat.c:1556
 #: ../libpurple/protocols/yahoo/ycht.c:549
 #: ../libpurple/protocols/yahoo/ycht.c:585
 msgid "Unable to connect"
 msgstr "Akukwazeki ukunxulumana"
 
 #. this is a regular connect, error out
-#: ../libpurple/protocols/irc/irc.c:477
+#: ../libpurple/protocols/irc/irc.c:475
 #: ../libpurple/protocols/myspace/myspace.c:2163
 #: ../libpurple/protocols/oscar/flap_connection.c:479
-#: ../libpurple/protocols/sametime/sametime.c:1803
-#: ../libpurple/protocols/simple/simple.c:457
-#: ../libpurple/protocols/simple/simple.c:1742
-#: ../libpurple/protocols/yahoo/libymsg.c:3452
-#: ../libpurple/protocols/yahoo/libymsg.c:3478
+#: ../libpurple/protocols/sametime/sametime.c:1804
+#: ../libpurple/protocols/simple/simple.c:452
+#: ../libpurple/protocols/simple/simple.c:1740
+#: ../libpurple/protocols/yahoo/libymsg.c:3465
+#: ../libpurple/protocols/yahoo/libymsg.c:3491
 #, c-format
 msgid "Unable to connect: %s"
 msgstr ""
 
-#: ../libpurple/protocols/irc/irc.c:704 ../libpurple/protocols/irc/irc.c:735
-#: ../libpurple/protocols/jabber/jabber.c:671
-#: ../libpurple/protocols/jabber/jabber.c:729
+#: ../libpurple/protocols/irc/irc.c:702 ../libpurple/protocols/irc/irc.c:733
+#: ../libpurple/protocols/jabber/jabber.c:669
+#: ../libpurple/protocols/jabber/jabber.c:727
 #: ../libpurple/protocols/myspace/myspace.c:2079
 #: ../libpurple/protocols/oscar/flap_connection.c:472
-#: ../libpurple/protocols/sametime/sametime.c:1770
-#: ../libpurple/protocols/yahoo/libymsg.c:3370
-#: ../libpurple/protocols/yahoo/libymsg.c:3524
-#: ../libpurple/protocols/yahoo/ycht.c:482 ../libpurple/proxy.c:923
-#: ../libpurple/proxy.c:1505 ../libpurple/proxy.c:1619
-#: ../libpurple/proxy.c:1860 ../libpurple/proxy.c:1935
+#: ../libpurple/protocols/sametime/sametime.c:1771
+#: ../libpurple/protocols/yahoo/libymsg.c:3383
+#: ../libpurple/protocols/yahoo/libymsg.c:3537
+#: ../libpurple/protocols/yahoo/ycht.c:482 ../libpurple/proxy.c:937
+#: ../libpurple/proxy.c:1532 ../libpurple/proxy.c:1646
+#: ../libpurple/proxy.c:1882 ../libpurple/proxy.c:1957
 msgid "Server closed the connection"
 msgstr ""
 
-#: ../libpurple/protocols/irc/irc.c:871
+#: ../libpurple/protocols/irc/irc.c:869
 #: ../libpurple/protocols/silc/chat.c:1405
 #: ../libpurple/protocols/silc10/chat.c:1426
-#: ../libpurple/protocols/yahoo/yahoochat.c:1588
+#: ../libpurple/protocols/yahoo/yahoochat.c:1613
 msgid "Users"
 msgstr "Abasebenzisi"
 
-#: ../libpurple/protocols/irc/irc.c:874
-#: ../libpurple/protocols/sametime/sametime.c:3421
+#: ../libpurple/protocols/irc/irc.c:872
+#: ../libpurple/protocols/sametime/sametime.c:3457
 #: ../libpurple/protocols/silc/chat.c:1408
-#: ../libpurple/protocols/silc/ops.c:1404
+#: ../libpurple/protocols/silc/ops.c:1405
 #: ../libpurple/protocols/silc10/chat.c:1429
 #: ../libpurple/protocols/silc10/ops.c:1382
-#: ../libpurple/protocols/yahoo/yahoochat.c:1597
+#: ../libpurple/protocols/yahoo/yahoochat.c:1622
 msgid "Topic"
 msgstr "Isihloko"
 
@@ -4675,50 +4672,50 @@
 #. *< id
 #. *< name
 #. *< version
-#: ../libpurple/protocols/irc/irc.c:1018
+#: ../libpurple/protocols/irc/irc.c:1016
 msgid "IRC Protocol Plugin"
 msgstr "Imithetho yokuSebenza yokuNgenisa yeIRC"
 
 #. *  summary
-#: ../libpurple/protocols/irc/irc.c:1019
+#: ../libpurple/protocols/irc/irc.c:1017
 msgid "The IRC Protocol Plugin that Sucks Less"
 msgstr "Umthetho wokuSebenza wokuNgenisa iIRC eFunxa Kancinci"
 
 #. set up account ID as user:server
-#: ../libpurple/protocols/irc/irc.c:1044 ../libpurple/protocols/irc/msgs.c:448
-#: ../libpurple/protocols/msn/msn.c:3024
-#: ../libpurple/protocols/oscar/oscar.c:5749
-#: ../libpurple/protocols/sametime/sametime.c:5747
-#: ../libpurple/protocols/silc/ops.c:1260
-#: ../libpurple/protocols/silc/ops.c:1354
+#: ../libpurple/protocols/irc/irc.c:1042 ../libpurple/protocols/irc/msgs.c:448
+#: ../libpurple/protocols/msn/msn.c:3025
+#: ../libpurple/protocols/oscar/oscar.c:5754
+#: ../libpurple/protocols/sametime/sametime.c:5783
+#: ../libpurple/protocols/silc/ops.c:1261
+#: ../libpurple/protocols/silc/ops.c:1355
 #: ../libpurple/protocols/silc10/ops.c:1244
 #: ../libpurple/protocols/silc10/ops.c:1347
-#: ../libpurple/protocols/simple/simple.c:2166
+#: ../libpurple/protocols/simple/simple.c:2164
 msgid "Server"
 msgstr "Iseva"
 
 #. port to connect to
-#: ../libpurple/protocols/irc/irc.c:1047 ../libpurple/protocols/msn/msn.c:3029
-#: ../libpurple/protocols/oscar/oscar.c:5752
-#: ../libpurple/protocols/sametime/sametime.c:5756
+#: ../libpurple/protocols/irc/irc.c:1045 ../libpurple/protocols/msn/msn.c:3030
+#: ../libpurple/protocols/oscar/oscar.c:5757
+#: ../libpurple/protocols/sametime/sametime.c:5792
 #: ../libpurple/protocols/silc/silc.c:2196
 #: ../libpurple/protocols/silc10/silc.c:1910
 msgid "Port"
 msgstr "Isiqhagamsheli"
 
-#: ../libpurple/protocols/irc/irc.c:1050
+#: ../libpurple/protocols/irc/irc.c:1048
 msgid "Encodings"
 msgstr "Iindlela zonxulumano"
 
-#: ../libpurple/protocols/irc/irc.c:1053
+#: ../libpurple/protocols/irc/irc.c:1051
 msgid "Auto-detect incoming UTF-8"
 msgstr ""
 
-#: ../libpurple/protocols/irc/irc.c:1056 ../libpurple/protocols/irc/msgs.c:439
+#: ../libpurple/protocols/irc/irc.c:1054 ../libpurple/protocols/irc/msgs.c:439
 msgid "Ident name"
 msgstr ""
 
-#: ../libpurple/protocols/irc/irc.c:1059 ../libpurple/protocols/irc/msgs.c:431
+#: ../libpurple/protocols/irc/irc.c:1057 ../libpurple/protocols/irc/msgs.c:431
 #: ../libpurple/protocols/silc/silc.c:1249
 #: ../libpurple/protocols/silc10/silc.c:945
 msgid "Real name"
@@ -4728,15 +4725,15 @@
 #. 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:1067
+#: ../libpurple/protocols/irc/irc.c:1065
 msgid "Use SSL"
 msgstr ""
 
-#: ../libpurple/protocols/irc/irc.c:1071
+#: ../libpurple/protocols/irc/irc.c:1069
 msgid "Authenticate with SASL"
 msgstr ""
 
-#: ../libpurple/protocols/irc/irc.c:1075
+#: ../libpurple/protocols/irc/irc.c:1073
 msgid "Allow plaintext SASL auth over unencrypted connection"
 msgstr ""
 
@@ -4781,8 +4778,8 @@
 msgstr " <i>(echongiweyo)</i>"
 
 #: ../libpurple/protocols/irc/msgs.c:420
-#: ../libpurple/protocols/oscar/userinfo.c:402
-#: ../libpurple/protocols/silc/ops.c:1433
+#: ../libpurple/protocols/oscar/userinfo.c:401
+#: ../libpurple/protocols/silc/ops.c:1434
 #: ../libpurple/protocols/silc10/ops.c:1414
 msgid "Nick"
 msgstr "Isikhewu"
@@ -4796,7 +4793,7 @@
 msgstr ""
 
 #: ../libpurple/protocols/irc/msgs.c:454
-#: ../libpurple/protocols/silc/ops.c:1279
+#: ../libpurple/protocols/silc/ops.c:1280
 #: ../libpurple/protocols/silc10/ops.c:1272
 msgid "Currently on"
 msgstr "Iyasebenza ngeli thuba"
@@ -4902,7 +4899,7 @@
 #. Remove user from channel
 #: ../libpurple/protocols/irc/msgs.c:1035
 #: ../libpurple/protocols/jabber/presence.c:747
-#: ../libpurple/protocols/silc/ops.c:724
+#: ../libpurple/protocols/silc/ops.c:726
 #: ../libpurple/protocols/silc10/ops.c:720
 #, c-format
 msgid "Kicked by %s (%s)"
@@ -4915,7 +4912,7 @@
 
 #: ../libpurple/protocols/irc/msgs.c:1148
 #: ../libpurple/protocols/irc/msgs.c:1149
-#: ../libpurple/protocols/jabber/jabber.c:2893
+#: ../libpurple/protocols/jabber/jabber.c:2885
 msgid "Invalid nickname"
 msgstr ""
 
@@ -4972,7 +4969,7 @@
 msgstr ""
 
 #: ../libpurple/protocols/irc/msgs.c:1364
-#: ../libpurple/protocols/silc/ops.c:1104
+#: ../libpurple/protocols/silc/ops.c:1105
 #: ../libpurple/protocols/silc10/ops.c:1128
 msgid "Cannot join channel"
 msgstr "Akwenzeki ukudibanisa isiqhagamshelanisi"
@@ -5137,7 +5134,7 @@
 "ngeli thuba."
 
 #: ../libpurple/protocols/irc/parse.c:158
-#: ../libpurple/protocols/jabber/jabber.c:3624
+#: ../libpurple/protocols/jabber/jabber.c:3616
 msgid "nick &lt;new nickname&gt;:  Change your nickname."
 msgstr "nick &lt;isiqhulo esitsha&gt;:  Guqula isiqhulo sakho."
 
@@ -5277,9 +5274,9 @@
 #: ../libpurple/protocols/jabber/adhoccommands.c:161
 #: ../libpurple/protocols/jabber/auth.c:199
 #: ../libpurple/protocols/jabber/auth_scram.c:73
-#: ../libpurple/protocols/jabber/jabber.c:1169
-#: ../libpurple/protocols/jabber/jabber.c:1204
-#: ../libpurple/protocols/jabber/jabber.c:2731
+#: ../libpurple/protocols/jabber/jabber.c:1161
+#: ../libpurple/protocols/jabber/jabber.c:1196
+#: ../libpurple/protocols/jabber/jabber.c:2723
 msgid "Unknown Error"
 msgstr "Impazamo engaziwayo"
 
@@ -5372,8 +5369,8 @@
 msgstr ""
 
 #: ../libpurple/protocols/jabber/auth_cyrus.c:472
-#: ../libpurple/protocols/jabber/jabber.c:544
-#: ../libpurple/protocols/jabber/jabber.c:702
+#: ../libpurple/protocols/jabber/jabber.c:542
+#: ../libpurple/protocols/jabber/jabber.c:700
 #, c-format
 msgid "SASL error: %s"
 msgstr ""
@@ -5416,7 +5413,7 @@
 msgstr ""
 
 #: ../libpurple/protocols/jabber/auth_scram.c:71
-#: ../libpurple/protocols/jabber/jabber.c:2796
+#: ../libpurple/protocols/jabber/jabber.c:2788
 msgid "Resource Constraint"
 msgstr "UkuNqongophala kwamaNcedo"
 
@@ -5459,21 +5456,21 @@
 msgstr ""
 
 #: ../libpurple/protocols/jabber/bosh.c:990
-#: ../libpurple/protocols/jabber/jabber.c:1067
+#: ../libpurple/protocols/jabber/jabber.c:1059
 msgid "Unable to establish SSL connection"
 msgstr ""
 
 #: ../libpurple/protocols/jabber/buddy.c:350
 #: ../libpurple/protocols/jabber/buddy.c:1024
-#: ../libpurple/protocols/sametime/sametime.c:4139
-#: ../libpurple/protocols/silc/ops.c:998
+#: ../libpurple/protocols/sametime/sametime.c:4175
+#: ../libpurple/protocols/silc/ops.c:999
 #: ../libpurple/protocols/silc10/ops.c:1020
 msgid "Full Name"
 msgstr "iGama ngokuPheleleyo"
 
 #: ../libpurple/protocols/jabber/buddy.c:351
 #: ../libpurple/protocols/jabber/buddy.c:1035
-#: ../libpurple/protocols/silc/ops.c:1010
+#: ../libpurple/protocols/silc/ops.c:1011
 #: ../libpurple/protocols/silc10/ops.c:1032
 msgid "Family Name"
 msgstr "iFani"
@@ -5484,7 +5481,7 @@
 msgstr "iGama eliNikiweyo"
 
 #: ../libpurple/protocols/jabber/buddy.c:354
-#: ../libpurple/protocols/jabber/jabber.c:1337
+#: ../libpurple/protocols/jabber/jabber.c:1329
 msgid "URL"
 msgstr "i-URL"
 
@@ -5546,9 +5543,9 @@
 
 #: ../libpurple/protocols/jabber/buddy.c:365
 #: ../libpurple/protocols/jabber/buddy.c:1163
-#: ../libpurple/protocols/msn/msn.c:2503
+#: ../libpurple/protocols/msn/msn.c:2504
 #: ../libpurple/protocols/novell/novell.c:1492
-#: ../libpurple/protocols/silc/ops.c:1022
+#: ../libpurple/protocols/silc/ops.c:1023
 #: ../libpurple/protocols/silc10/ops.c:1044
 msgid "Job Title"
 msgstr "Isihloko somsebenzi"
@@ -5562,18 +5559,18 @@
 #. birthday (required)
 #: ../libpurple/protocols/jabber/buddy.c:367
 #: ../libpurple/protocols/jabber/buddy.c:1053
-#: ../libpurple/protocols/msn/msn.c:2484
+#: ../libpurple/protocols/msn/msn.c:2485
 #: ../libpurple/protocols/mxit/actions.c:239
 #: ../libpurple/protocols/mxit/login.c:343
 #: ../libpurple/protocols/mxit/profile.c:214
-#: ../libpurple/protocols/oscar/userinfo.c:445
+#: ../libpurple/protocols/oscar/userinfo.c:444
 msgid "Birthday"
 msgstr "Umhla wokuZalwa"
 
 #: ../libpurple/protocols/jabber/buddy.c:368
 #: ../libpurple/protocols/jabber/buddy.c:1167
 #: ../libpurple/protocols/jabber/chat.c:911 ../pidgin/gtkblist.c:3888
-#: ../pidgin/gtkplugin.c:592 ../pidgin/plugins/disco/gtkdisco.c:571
+#: ../pidgin/gtkplugin.c:590 ../pidgin/plugins/disco/gtkdisco.c:571
 msgid "Description"
 msgstr "Inkcazelo"
 
@@ -5603,18 +5600,18 @@
 msgstr ""
 
 #: ../libpurple/protocols/jabber/buddy.c:773
-#: ../libpurple/protocols/jabber/jabber.c:2379
-#: ../libpurple/protocols/jabber/jabber.c:2403
-#: ../libpurple/protocols/jabber/jabber.c:2419
-#: ../libpurple/protocols/jabber/jabber.c:2435
-#: ../libpurple/protocols/jabber/jabber.c:2449
+#: ../libpurple/protocols/jabber/jabber.c:2371
+#: ../libpurple/protocols/jabber/jabber.c:2395
+#: ../libpurple/protocols/jabber/jabber.c:2411
+#: ../libpurple/protocols/jabber/jabber.c:2427
+#: ../libpurple/protocols/jabber/jabber.c:2441
 msgid "Priority"
 msgstr ""
 
 #: ../libpurple/protocols/jabber/buddy.c:819
-#: ../libpurple/protocols/jabber/jabber.c:3368
+#: ../libpurple/protocols/jabber/jabber.c:3360
 #: ../libpurple/protocols/jabber/libxmpp.c:265
-#: ../libpurple/protocols/jabber/si.c:1567
+#: ../libpurple/protocols/jabber/si.c:1571
 msgid "Resource"
 msgstr "Uvimba"
 
@@ -5632,17 +5629,17 @@
 msgstr ""
 
 #: ../libpurple/protocols/jabber/buddy.c:1039
-#: ../libpurple/protocols/silc/ops.c:1006
+#: ../libpurple/protocols/silc/ops.c:1007
 #: ../libpurple/protocols/silc10/ops.c:1028
 #: ../libpurple/protocols/yahoo/yahoo_aliases.c:547
 msgid "Middle Name"
 msgstr "iGama eliPhakathi"
 
 #: ../libpurple/protocols/jabber/buddy.c:1072
-#: ../libpurple/protocols/jabber/jabber.c:1332
-#: ../libpurple/protocols/oscar/userinfo.c:462
-#: ../libpurple/protocols/oscar/userinfo.c:470
-#: ../libpurple/protocols/silc/ops.c:1042
+#: ../libpurple/protocols/jabber/jabber.c:1324
+#: ../libpurple/protocols/oscar/userinfo.c:461
+#: ../libpurple/protocols/oscar/userinfo.c:469
+#: ../libpurple/protocols/silc/ops.c:1043
 #: ../libpurple/protocols/silc10/ops.c:1064
 msgid "Address"
 msgstr "iDilesi"
@@ -5714,7 +5711,7 @@
 #: ../libpurple/protocols/mxit/actions.c:255
 #: ../libpurple/protocols/mxit/profile.c:221
 #: ../libpurple/protocols/mxit/profile.c:325
-#: ../libpurple/protocols/oscar/userinfo.c:413
+#: ../libpurple/protocols/oscar/userinfo.c:412
 #: ../libpurple/protocols/yahoo/yahoo_aliases.c:545
 msgid "Last Name"
 msgstr "iFani"
@@ -5751,8 +5748,8 @@
 
 #: ../libpurple/protocols/jabber/buddy.c:2202
 #: ../libpurple/protocols/novell/novell.c:1496
-#: ../libpurple/protocols/oscar/userinfo.c:414
-#: ../libpurple/protocols/oscar/userinfo.c:418
+#: ../libpurple/protocols/oscar/userinfo.c:413
+#: ../libpurple/protocols/oscar/userinfo.c:417
 msgid "Email Address"
 msgstr "Idilesi ye-iMeyili"
 
@@ -5763,7 +5760,7 @@
 
 #. "Search"
 #: ../libpurple/protocols/jabber/buddy.c:2213
-#: ../libpurple/protocols/sametime/sametime.c:5634
+#: ../libpurple/protocols/sametime/sametime.c:5670
 #: ../pidgin/plugins/gevolution/add_buddy_dialog.c:476
 #: ../pidgin/plugins/gevolution/assoc-buddy.c:356
 msgid "Search"
@@ -5786,8 +5783,8 @@
 msgstr ""
 
 #: ../libpurple/protocols/jabber/chat.c:44
-#: ../libpurple/protocols/oscar/oscar.c:4401
-#: ../libpurple/protocols/yahoo/yahoochat.c:1137
+#: ../libpurple/protocols/oscar/oscar.c:4406
+#: ../libpurple/protocols/yahoo/yahoochat.c:1162
 msgid "_Room:"
 msgstr "_iGumbi:"
 
@@ -5856,7 +5853,7 @@
 
 #: ../libpurple/protocols/jabber/chat.c:813
 #: ../libpurple/protocols/jabber/chat.c:824
-#: ../libpurple/protocols/silc/ops.c:1471
+#: ../libpurple/protocols/silc/ops.c:1472
 #: ../libpurple/protocols/silc10/ops.c:1451
 msgid "Error retrieving room list"
 msgstr ""
@@ -5891,7 +5888,7 @@
 msgid "Roles:"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:252 ../libpurple/util.c:4236
+#: ../libpurple/protocols/jabber/jabber.c:252 ../libpurple/util.c:4212
 msgid "Server requires TLS/SSL, but no TLS/SSL support was found."
 msgstr ""
 
@@ -5899,223 +5896,223 @@
 msgid "You require encryption, but no TLS/SSL support was found."
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:623
+#: ../libpurple/protocols/jabber/jabber.c:621
 msgid "Ping timed out"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:953
-#: ../libpurple/protocols/jabber/jabber.c:991
-#: ../libpurple/protocols/jabber/jabber.c:3039
+#: ../libpurple/protocols/jabber/jabber.c:945
+#: ../libpurple/protocols/jabber/jabber.c:983
+#: ../libpurple/protocols/jabber/jabber.c:3031
 msgid "Invalid XMPP ID"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:962
+#: ../libpurple/protocols/jabber/jabber.c:954
 msgid "Invalid XMPP ID. Username portion must be set."
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:971
+#: ../libpurple/protocols/jabber/jabber.c:963
 msgid "Invalid XMPP ID. Domain must be set."
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1050
+#: ../libpurple/protocols/jabber/jabber.c:1042
 msgid "Malformed BOSH URL"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1153
+#: ../libpurple/protocols/jabber/jabber.c:1145
 #, c-format
 msgid "Registration of %s@%s successful"
 msgstr "Ubhaliso lwe %s@%s ngempumelelo"
 
-#: ../libpurple/protocols/jabber/jabber.c:1159
+#: ../libpurple/protocols/jabber/jabber.c:1151
 #, c-format
 msgid "Registration to %s successful"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1162
-#: ../libpurple/protocols/jabber/jabber.c:1163
+#: ../libpurple/protocols/jabber/jabber.c:1154
+#: ../libpurple/protocols/jabber/jabber.c:1155
 msgid "Registration Successful"
 msgstr "Impumelelo yoBhaliso"
 
-#: ../libpurple/protocols/jabber/jabber.c:1171
-#: ../libpurple/protocols/jabber/jabber.c:1172
+#: ../libpurple/protocols/jabber/jabber.c:1163
+#: ../libpurple/protocols/jabber/jabber.c:1164
 msgid "Registration Failed"
 msgstr "Ubhaliso aluphumelelanga"
 
-#: ../libpurple/protocols/jabber/jabber.c:1195
+#: ../libpurple/protocols/jabber/jabber.c:1187
 #, c-format
 msgid "Registration from %s successfully removed"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1197
-#: ../libpurple/protocols/jabber/jabber.c:1198
+#: ../libpurple/protocols/jabber/jabber.c:1189
+#: ../libpurple/protocols/jabber/jabber.c:1190
 msgid "Unregistration Successful"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1206
-#: ../libpurple/protocols/jabber/jabber.c:1207
+#: ../libpurple/protocols/jabber/jabber.c:1198
+#: ../libpurple/protocols/jabber/jabber.c:1199
 msgid "Unregistration Failed"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1334
-#: ../libpurple/protocols/oscar/userinfo.c:464
-#: ../libpurple/protocols/oscar/userinfo.c:472
+#: ../libpurple/protocols/jabber/jabber.c:1326
+#: ../libpurple/protocols/oscar/userinfo.c:463
+#: ../libpurple/protocols/oscar/userinfo.c:471
 msgid "State"
 msgstr "Isimo"
 
-#: ../libpurple/protocols/jabber/jabber.c:1335
+#: ../libpurple/protocols/jabber/jabber.c:1327
 msgid "Postal code"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1336
-#: ../libpurple/protocols/silc/ops.c:1047
+#: ../libpurple/protocols/jabber/jabber.c:1328
+#: ../libpurple/protocols/silc/ops.c:1048
 #: ../libpurple/protocols/silc/silc.c:1012
-#: ../libpurple/protocols/silc/util.c:513
+#: ../libpurple/protocols/silc/util.c:564
 #: ../libpurple/protocols/silc10/ops.c:1069
 #: ../libpurple/protocols/silc10/silc.c:708
 #: ../libpurple/protocols/silc10/util.c:557
 msgid "Phone"
 msgstr "Ifowuni"
 
-#: ../libpurple/protocols/jabber/jabber.c:1338 ../pidgin/gtknotify.c:1691
+#: ../libpurple/protocols/jabber/jabber.c:1330 ../pidgin/gtknotify.c:1691
 msgid "Date"
 msgstr "Umhla"
 
-#: ../libpurple/protocols/jabber/jabber.c:1367
-#: ../libpurple/protocols/jabber/jabber.c:1368
+#: ../libpurple/protocols/jabber/jabber.c:1359
+#: ../libpurple/protocols/jabber/jabber.c:1360
 msgid "Already Registered"
 msgstr "Sewubhalisile"
 
-#: ../libpurple/protocols/jabber/jabber.c:1418
-#: ../libpurple/protocols/jabber/jabber.c:1422
-#: ../libpurple/protocols/jabber/jabber.c:2551
+#: ../libpurple/protocols/jabber/jabber.c:1410
+#: ../libpurple/protocols/jabber/jabber.c:1414
+#: ../libpurple/protocols/jabber/jabber.c:2543
 msgid "Password"
 msgstr "I-Password"
 
-#: ../libpurple/protocols/jabber/jabber.c:1454
+#: ../libpurple/protocols/jabber/jabber.c:1446
 msgid "Unregister"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1461
+#: ../libpurple/protocols/jabber/jabber.c:1453
 msgid ""
 "Please fill out the information below to change your account registration."
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1464
+#: ../libpurple/protocols/jabber/jabber.c:1456
 msgid "Please fill out the information below to register your new account."
 msgstr "Nceda uzalise ulwazi ngezantsi ukubhalisa i-akhawunti yakho entsha."
 
-#: ../libpurple/protocols/jabber/jabber.c:1472
-#: ../libpurple/protocols/jabber/jabber.c:1473
+#: ../libpurple/protocols/jabber/jabber.c:1464
+#: ../libpurple/protocols/jabber/jabber.c:1465
 msgid "Register New XMPP Account"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1474
-#: ../libpurple/protocols/jabber/jabber.c:1485
+#: ../libpurple/protocols/jabber/jabber.c:1466
+#: ../libpurple/protocols/jabber/jabber.c:1477
 #: ../pidgin/plugins/disco/gtkdisco.c:307
 #: ../pidgin/plugins/disco/gtkdisco.c:688
 msgid "Register"
 msgstr "Bhalisa"
 
-#: ../libpurple/protocols/jabber/jabber.c:1481
+#: ../libpurple/protocols/jabber/jabber.c:1473
 #, c-format
 msgid "Change Account Registration at %s"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1482
+#: ../libpurple/protocols/jabber/jabber.c:1474
 #, c-format
 msgid "Register New Account at %s"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1485
+#: ../libpurple/protocols/jabber/jabber.c:1477
 msgid "Change Registration"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1533
-#: ../libpurple/protocols/jabber/jabber.c:1534
+#: ../libpurple/protocols/jabber/jabber.c:1525
+#: ../libpurple/protocols/jabber/jabber.c:1526
 msgid "Error unregistering account"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1539
-#: ../libpurple/protocols/jabber/jabber.c:1540
+#: ../libpurple/protocols/jabber/jabber.c:1531
+#: ../libpurple/protocols/jabber/jabber.c:1532
 msgid "Account successfully unregistered"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1753
+#: ../libpurple/protocols/jabber/jabber.c:1745
 msgid "Initializing Stream"
 msgstr "Ukuqalisa Umjelo"
 
-#: ../libpurple/protocols/jabber/jabber.c:1758
+#: ../libpurple/protocols/jabber/jabber.c:1750
 msgid "Initializing SSL/TLS"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1762
+#: ../libpurple/protocols/jabber/jabber.c:1754
 #: ../libpurple/protocols/msn/session.c:438
 msgid "Authenticating"
 msgstr "Ukuqinisekisa"
 
-#: ../libpurple/protocols/jabber/jabber.c:1766
+#: ../libpurple/protocols/jabber/jabber.c:1758
 msgid "Re-initializing Stream"
 msgstr "Ukuphinda uqalise umjelo"
 
-#: ../libpurple/protocols/jabber/jabber.c:1935
-#: ../libpurple/protocols/jabber/jabber.c:1936
+#: ../libpurple/protocols/jabber/jabber.c:1927
+#: ../libpurple/protocols/jabber/jabber.c:1928
 msgid "Server doesn't support blocking"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:2189
-#: ../libpurple/protocols/jabber/jabber.c:2709
-#: ../libpurple/protocols/jabber/jabber.c:2752
-#: ../libpurple/protocols/jabber/jabber.c:2790
-#: ../libpurple/protocols/oscar/oscar.c:4679
+#: ../libpurple/protocols/jabber/jabber.c:2181
+#: ../libpurple/protocols/jabber/jabber.c:2701
+#: ../libpurple/protocols/jabber/jabber.c:2744
+#: ../libpurple/protocols/jabber/jabber.c:2782
+#: ../libpurple/protocols/oscar/oscar.c:4684
 #: ../libpurple/protocols/oscar/userinfo.c:272
 msgid "Not Authorized"
 msgstr "Engagunyaziswanga"
 
-#: ../libpurple/protocols/jabber/jabber.c:2321
-#: ../libpurple/protocols/jabber/jabber.c:2324
-#: ../libpurple/protocols/jabber/jabber.c:2381
-#: ../libpurple/protocols/jabber/jabber.c:2405
-#: ../libpurple/protocols/jabber/jabber.c:2421
-#: ../libpurple/protocols/jabber/jabber.c:2437
-#: ../libpurple/protocols/jabber/jabber.c:2451
+#: ../libpurple/protocols/jabber/jabber.c:2313
+#: ../libpurple/protocols/jabber/jabber.c:2316
+#: ../libpurple/protocols/jabber/jabber.c:2373
+#: ../libpurple/protocols/jabber/jabber.c:2397
+#: ../libpurple/protocols/jabber/jabber.c:2413
+#: ../libpurple/protocols/jabber/jabber.c:2429
+#: ../libpurple/protocols/jabber/jabber.c:2443
 #: ../libpurple/protocols/mxit/mxit.c:350
 #: ../libpurple/protocols/mxit/profile.c:243
 #: ../libpurple/protocols/mxit/profile.c:245
 #: ../libpurple/protocols/oscar/userinfo.c:298
-#: ../libpurple/protocols/silc/buddy.c:1563
-#: ../libpurple/protocols/silc/ops.c:1223
+#: ../libpurple/protocols/silc/buddy.c:1569
+#: ../libpurple/protocols/silc/ops.c:1224
 #: ../libpurple/protocols/silc10/buddy.c:1577
 #: ../libpurple/protocols/silc10/ops.c:1207
 msgid "Mood"
 msgstr "Isimo"
 
-#: ../libpurple/protocols/jabber/jabber.c:2334
+#: ../libpurple/protocols/jabber/jabber.c:2326
 #: ../libpurple/protocols/msn/msn.c:1046
 msgid "Now Listening"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:2341
+#: ../libpurple/protocols/jabber/jabber.c:2333
 #: ../libpurple/protocols/mxit/roster.c:252
 msgid "Both"
 msgstr "Zombini"
 
-#: ../libpurple/protocols/jabber/jabber.c:2343
+#: ../libpurple/protocols/jabber/jabber.c:2335
 msgid "From (To pending)"
 msgstr "Ukusuka (Ukuya kuXhomekeko)"
 
-#: ../libpurple/protocols/jabber/jabber.c:2345
+#: ../libpurple/protocols/jabber/jabber.c:2337
 msgid "From"
 msgstr "Ukusuka"
 
-#: ../libpurple/protocols/jabber/jabber.c:2348
+#: ../libpurple/protocols/jabber/jabber.c:2340
 msgid "To"
 msgstr "Ku-"
 
-#: ../libpurple/protocols/jabber/jabber.c:2350
+#: ../libpurple/protocols/jabber/jabber.c:2342
 msgid "None (To pending)"
 msgstr "Akukho nto (Ukuya kuxhomekeko)"
 
-#: ../libpurple/protocols/jabber/jabber.c:2352
+#: ../libpurple/protocols/jabber/jabber.c:2344
 #: ../libpurple/protocols/mxit/profile.c:245
 #: ../libpurple/protocols/mxit/roster.c:262 ../pidgin/gtkblist.c:3542
 #: ../pidgin/gtkblist.c:3544 ../pidgin/plugins/gevolution/eds-utils.c:73
@@ -6124,35 +6121,35 @@
 msgstr "Akukho nto"
 
 #. subscription type
-#: ../libpurple/protocols/jabber/jabber.c:2355
+#: ../libpurple/protocols/jabber/jabber.c:2347
 #: ../libpurple/protocols/mxit/mxit.c:354
 #: ../libpurple/protocols/mxit/profile.c:252
 msgid "Subscription"
 msgstr "Umrhumo"
 
-#: ../libpurple/protocols/jabber/jabber.c:2382
-#: ../libpurple/protocols/jabber/jabber.c:2406
-#: ../libpurple/protocols/jabber/jabber.c:2422
-#: ../libpurple/protocols/jabber/jabber.c:2438
-#: ../libpurple/protocols/jabber/jabber.c:2452
+#: ../libpurple/protocols/jabber/jabber.c:2374
+#: ../libpurple/protocols/jabber/jabber.c:2398
+#: ../libpurple/protocols/jabber/jabber.c:2414
+#: ../libpurple/protocols/jabber/jabber.c:2430
+#: ../libpurple/protocols/jabber/jabber.c:2444
 msgid "Mood Text"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:2384
-#: ../libpurple/protocols/jabber/jabber.c:2408
-#: ../libpurple/protocols/jabber/jabber.c:2424
-#: ../libpurple/protocols/jabber/jabber.c:2440
+#: ../libpurple/protocols/jabber/jabber.c:2376
+#: ../libpurple/protocols/jabber/jabber.c:2400
+#: ../libpurple/protocols/jabber/jabber.c:2416
+#: ../libpurple/protocols/jabber/jabber.c:2432
 msgid "Allow Buzz"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:2391
+#: ../libpurple/protocols/jabber/jabber.c:2383
 #: ../libpurple/protocols/mxit/roster.c:86
-#: ../libpurple/protocols/oscar/oscar.c:4860
+#: ../libpurple/protocols/oscar/oscar.c:4865
 msgid "Mood Name"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:2392
-#: ../libpurple/protocols/oscar/oscar.c:4861
+#: ../libpurple/protocols/jabber/jabber.c:2384
+#: ../libpurple/protocols/oscar/oscar.c:4866
 msgid "Mood Comment"
 msgstr ""
 
@@ -6162,335 +6159,335 @@
 #. saveable
 #. should be user_settable some day
 #. independent
-#: ../libpurple/protocols/jabber/jabber.c:2471
+#: ../libpurple/protocols/jabber/jabber.c:2463
 #: ../libpurple/protocols/msn/msn.c:1196
 #: ../libpurple/protocols/myspace/myspace.c:501
 msgid "Tune Artist"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:2472
+#: ../libpurple/protocols/jabber/jabber.c:2464
 #: ../libpurple/protocols/msn/msn.c:1198
 #: ../libpurple/protocols/myspace/myspace.c:502
 msgid "Tune Title"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:2473
+#: ../libpurple/protocols/jabber/jabber.c:2465
 #: ../libpurple/protocols/msn/msn.c:1197
 msgid "Tune Album"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:2474
+#: ../libpurple/protocols/jabber/jabber.c:2466
 msgid "Tune Genre"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:2475
+#: ../libpurple/protocols/jabber/jabber.c:2467
 msgid "Tune Comment"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:2476
+#: ../libpurple/protocols/jabber/jabber.c:2468
 msgid "Tune Track"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:2477
+#: ../libpurple/protocols/jabber/jabber.c:2469
 msgid "Tune Time"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:2478
+#: ../libpurple/protocols/jabber/jabber.c:2470
 msgid "Tune Year"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:2479
+#: ../libpurple/protocols/jabber/jabber.c:2471
 msgid "Tune URL"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:2492
+#: ../libpurple/protocols/jabber/jabber.c:2484
 msgid "Password Changed"
 msgstr "I-Password iTshintshile"
 
-#: ../libpurple/protocols/jabber/jabber.c:2493
+#: ../libpurple/protocols/jabber/jabber.c:2485
 msgid "Your password has been changed."
 msgstr "I-password yakho itshintshile."
 
-#: ../libpurple/protocols/jabber/jabber.c:2499
-#: ../libpurple/protocols/jabber/jabber.c:2500
+#: ../libpurple/protocols/jabber/jabber.c:2491
+#: ../libpurple/protocols/jabber/jabber.c:2492
 msgid "Error changing password"
 msgstr "ImPazamo yokutshintsha i-password"
 
-#: ../libpurple/protocols/jabber/jabber.c:2557
+#: ../libpurple/protocols/jabber/jabber.c:2549
 msgid "Password (again)"
 msgstr "I-Password (kwakhona)"
 
-#: ../libpurple/protocols/jabber/jabber.c:2563
-#: ../libpurple/protocols/jabber/jabber.c:2564
+#: ../libpurple/protocols/jabber/jabber.c:2555
+#: ../libpurple/protocols/jabber/jabber.c:2556
 msgid "Change XMPP Password"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:2564
+#: ../libpurple/protocols/jabber/jabber.c:2556
 msgid "Please enter your new password"
 msgstr "Nceda ufake i-password yakho entsha"
 
-#: ../libpurple/protocols/jabber/jabber.c:2578
-#: ../libpurple/protocols/oscar/oscar.c:5480
+#: ../libpurple/protocols/jabber/jabber.c:2570
+#: ../libpurple/protocols/oscar/oscar.c:5485
 #: ../libpurple/protocols/silc/silc.c:1333
 #: ../libpurple/protocols/silc10/silc.c:1029
-#: ../libpurple/protocols/yahoo/libymsg.c:4426
-#: ../libpurple/protocols/yahoo/libymsg.c:4582
+#: ../libpurple/protocols/yahoo/libymsg.c:4439
+#: ../libpurple/protocols/yahoo/libymsg.c:4595
 msgid "Set User Info..."
 msgstr "Ulwazi oluMiselweyo lomSebenzisi..."
 
 #. if (js->protocol_options & CHANGE_PASSWORD) {
-#: ../libpurple/protocols/jabber/jabber.c:2583
-#: ../libpurple/protocols/oscar/oscar.c:5491
+#: ../libpurple/protocols/jabber/jabber.c:2575
+#: ../libpurple/protocols/oscar/oscar.c:5496
 #: ../libpurple/protocols/silc/silc.c:1329
 #: ../libpurple/protocols/silc10/silc.c:1025
 msgid "Change Password..."
 msgstr "Tshintsha i-Password..."
 
 #. }
-#: ../libpurple/protocols/jabber/jabber.c:2588
+#: ../libpurple/protocols/jabber/jabber.c:2580
 msgid "Search for Users..."
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:2688
+#: ../libpurple/protocols/jabber/jabber.c:2680
 msgid "Bad Request"
 msgstr "Isicelo esiNgalunganga"
 
-#: ../libpurple/protocols/jabber/jabber.c:2691
+#: ../libpurple/protocols/jabber/jabber.c:2683
 msgid "Conflict"
 msgstr "Impixano"
 
-#: ../libpurple/protocols/jabber/jabber.c:2693
+#: ../libpurple/protocols/jabber/jabber.c:2685
 msgid "Feature Not Implemented"
 msgstr "UPhawu aluPhunyezwanga"
 
-#: ../libpurple/protocols/jabber/jabber.c:2695
+#: ../libpurple/protocols/jabber/jabber.c:2687
 msgid "Forbidden"
 msgstr "Ithintelwe"
 
-#: ../libpurple/protocols/jabber/jabber.c:2697
+#: ../libpurple/protocols/jabber/jabber.c:2689
 msgid "Gone"
 msgstr "Ihambile"
 
-#: ../libpurple/protocols/jabber/jabber.c:2699
-#: ../libpurple/protocols/jabber/jabber.c:2780
+#: ../libpurple/protocols/jabber/jabber.c:2691
+#: ../libpurple/protocols/jabber/jabber.c:2772
 msgid "Internal Server Error"
 msgstr "imPazamo yeSeva yangaPhakathi"
 
-#: ../libpurple/protocols/jabber/jabber.c:2701
+#: ../libpurple/protocols/jabber/jabber.c:2693
 msgid "Item Not Found"
 msgstr "Into ayiFunyanwanga"
 
-#: ../libpurple/protocols/jabber/jabber.c:2703
+#: ../libpurple/protocols/jabber/jabber.c:2695
 msgid "Malformed XMPP ID"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:2705
+#: ../libpurple/protocols/jabber/jabber.c:2697
 msgid "Not Acceptable"
 msgstr "Ayamkeleki"
 
-#: ../libpurple/protocols/jabber/jabber.c:2707
+#: ../libpurple/protocols/jabber/jabber.c:2699
 msgid "Not Allowed"
 msgstr "Ayivunyelwanga"
 
-#: ../libpurple/protocols/jabber/jabber.c:2711
+#: ../libpurple/protocols/jabber/jabber.c:2703
 msgid "Payment Required"
 msgstr "Kufunwa intlawulo"
 
-#: ../libpurple/protocols/jabber/jabber.c:2713
+#: ../libpurple/protocols/jabber/jabber.c:2705
 msgid "Recipient Unavailable"
 msgstr "Irisithi ayiFumaneki"
 
-#: ../libpurple/protocols/jabber/jabber.c:2717
+#: ../libpurple/protocols/jabber/jabber.c:2709
 msgid "Registration Required"
 msgstr "Kufuneka uBhaliso"
 
-#: ../libpurple/protocols/jabber/jabber.c:2719
+#: ../libpurple/protocols/jabber/jabber.c:2711
 msgid "Remote Server Not Found"
 msgstr "ISeva eKwenye iNdawo ayiFumaneki"
 
-#: ../libpurple/protocols/jabber/jabber.c:2721
+#: ../libpurple/protocols/jabber/jabber.c:2713
 msgid "Remote Server Timeout"
 msgstr "ISeva eKwenye iNdawo iPhelelwe liXesha"
 
-#: ../libpurple/protocols/jabber/jabber.c:2723
+#: ../libpurple/protocols/jabber/jabber.c:2715
 msgid "Server Overloaded"
 msgstr "ISeva iThwaliswe kakhulu"
 
-#: ../libpurple/protocols/jabber/jabber.c:2725
+#: ../libpurple/protocols/jabber/jabber.c:2717
 msgid "Service Unavailable"
 msgstr "Inkonzo ayiFumaneki"
 
-#: ../libpurple/protocols/jabber/jabber.c:2727
+#: ../libpurple/protocols/jabber/jabber.c:2719
 msgid "Subscription Required"
 msgstr "Kufunwa umRhumo"
 
-#: ../libpurple/protocols/jabber/jabber.c:2729
+#: ../libpurple/protocols/jabber/jabber.c:2721
 msgid "Unexpected Request"
 msgstr "Isicelo esingaLindelekanga"
 
-#: ../libpurple/protocols/jabber/jabber.c:2737
+#: ../libpurple/protocols/jabber/jabber.c:2729
 msgid "Authorization Aborted"
 msgstr "UGunyaziso luYekiwe"
 
-#: ../libpurple/protocols/jabber/jabber.c:2739
+#: ../libpurple/protocols/jabber/jabber.c:2731
 msgid "Incorrect encoding in authorization"
 msgstr "Unxulumano oluphosakeleyo kugunyaziso"
 
-#: ../libpurple/protocols/jabber/jabber.c:2741
+#: ../libpurple/protocols/jabber/jabber.c:2733
 msgid "Invalid authzid"
 msgstr "UGunyaziso olungaSebenziyo"
 
-#: ../libpurple/protocols/jabber/jabber.c:2743
+#: ../libpurple/protocols/jabber/jabber.c:2735
 msgid "Invalid Authorization Mechanism"
 msgstr "Inkqubo yoGunyaziso engaSebenziyo"
 
-#: ../libpurple/protocols/jabber/jabber.c:2746
+#: ../libpurple/protocols/jabber/jabber.c:2738
 msgid "Authorization mechanism too weak"
 msgstr "Intsebenzo yogunyaziso ibuthathaka"
 
-#: ../libpurple/protocols/jabber/jabber.c:2754
+#: ../libpurple/protocols/jabber/jabber.c:2746
 msgid "Temporary Authentication Failure"
 msgstr "Ukungaphumeleli kwethutyana ukuqinisekisa"
 
-#: ../libpurple/protocols/jabber/jabber.c:2757
+#: ../libpurple/protocols/jabber/jabber.c:2749
 msgid "Authentication Failure"
 msgstr "Ukuqinisekisa akuPhumelelanga"
 
-#: ../libpurple/protocols/jabber/jabber.c:2765
+#: ../libpurple/protocols/jabber/jabber.c:2757
 msgid "Bad Format"
 msgstr "ISakhelo esingaLunganga"
 
-#: ../libpurple/protocols/jabber/jabber.c:2767
+#: ../libpurple/protocols/jabber/jabber.c:2759
 msgid "Bad Namespace Prefix"
 msgstr "Isimaphambili esiNgalunganga sesithuba seGama"
 
-#: ../libpurple/protocols/jabber/jabber.c:2770
+#: ../libpurple/protocols/jabber/jabber.c:2762
 msgid "Resource Conflict"
 msgstr "Impixano yamaNcedo"
 
-#: ../libpurple/protocols/jabber/jabber.c:2772
+#: ../libpurple/protocols/jabber/jabber.c:2764
 #: ../libpurple/protocols/msn/msn.c:232
 msgid "Connection Timeout"
 msgstr "Ukuphela kweXesha lokuNxulumana"
 
-#: ../libpurple/protocols/jabber/jabber.c:2774
+#: ../libpurple/protocols/jabber/jabber.c:2766
 msgid "Host Gone"
 msgstr "Umququzeleli uHambile"
 
-#: ../libpurple/protocols/jabber/jabber.c:2776
+#: ../libpurple/protocols/jabber/jabber.c:2768
 msgid "Host Unknown"
 msgstr "UmQuquzeleli akaZiwa"
 
-#: ../libpurple/protocols/jabber/jabber.c:2778
+#: ../libpurple/protocols/jabber/jabber.c:2770
 msgid "Improper Addressing"
 msgstr "Idilesi engaFanelekanga"
 
-#: ../libpurple/protocols/jabber/jabber.c:2782
+#: ../libpurple/protocols/jabber/jabber.c:2774
 msgid "Invalid ID"
 msgstr "ISazizi esingasebenziyo"
 
-#: ../libpurple/protocols/jabber/jabber.c:2784
+#: ../libpurple/protocols/jabber/jabber.c:2776
 msgid "Invalid Namespace"
 msgstr "IGama leNdawo elingaSebenziyo"
 
-#: ../libpurple/protocols/jabber/jabber.c:2786
+#: ../libpurple/protocols/jabber/jabber.c:2778
 msgid "Invalid XML"
 msgstr "I-XML engaSebenziyo"
 
-#: ../libpurple/protocols/jabber/jabber.c:2788
+#: ../libpurple/protocols/jabber/jabber.c:2780
 msgid "Non-matching Hosts"
 msgstr "Akukho baQuquzeleli banoNgqamaniso"
 
-#: ../libpurple/protocols/jabber/jabber.c:2792
+#: ../libpurple/protocols/jabber/jabber.c:2784
 msgid "Policy Violation"
 msgstr "Utyeshelo lomGaqo-nkqubo"
 
-#: ../libpurple/protocols/jabber/jabber.c:2794
+#: ../libpurple/protocols/jabber/jabber.c:2786
 msgid "Remote Connection Failed"
 msgstr "UThungelwano oluKwenye iNdawo aluphumelelanga"
 
-#: ../libpurple/protocols/jabber/jabber.c:2798
+#: ../libpurple/protocols/jabber/jabber.c:2790
 msgid "Restricted XML"
 msgstr "I-XML ethintelweyo"
 
-#: ../libpurple/protocols/jabber/jabber.c:2800
+#: ../libpurple/protocols/jabber/jabber.c:2792
 msgid "See Other Host"
 msgstr "Bona oMnye umQuquzeleli"
 
-#: ../libpurple/protocols/jabber/jabber.c:2802
+#: ../libpurple/protocols/jabber/jabber.c:2794
 msgid "System Shutdown"
 msgstr "UkuCima kweNkqubo"
 
-#: ../libpurple/protocols/jabber/jabber.c:2804
+#: ../libpurple/protocols/jabber/jabber.c:2796
 msgid "Undefined Condition"
 msgstr "Imeko engaChazwanga"
 
-#: ../libpurple/protocols/jabber/jabber.c:2806
+#: ../libpurple/protocols/jabber/jabber.c:2798
 msgid "Unsupported Encoding"
 msgstr "Unxulumano olungaxhaswanga"
 
-#: ../libpurple/protocols/jabber/jabber.c:2808
+#: ../libpurple/protocols/jabber/jabber.c:2800
 msgid "Unsupported Stanza Type"
 msgstr "UHlobo lweSiqendu lwesibgongo olungaXhaswanga"
 
-#: ../libpurple/protocols/jabber/jabber.c:2810
+#: ../libpurple/protocols/jabber/jabber.c:2802
 msgid "Unsupported Version"
 msgstr "INguqulelo engaXhaswanga"
 
-#: ../libpurple/protocols/jabber/jabber.c:2812
+#: ../libpurple/protocols/jabber/jabber.c:2804
 msgid "XML Not Well Formed"
 msgstr "I-XML engaDalekanga Kakuhle"
 
-#: ../libpurple/protocols/jabber/jabber.c:2814
+#: ../libpurple/protocols/jabber/jabber.c:2806
 msgid "Stream Error"
 msgstr "Impazamo yoMjelo"
 
-#: ../libpurple/protocols/jabber/jabber.c:2924
+#: ../libpurple/protocols/jabber/jabber.c:2916
 #, c-format
 msgid "Unable to ban user %s"
 msgstr "Akukwazeki ukugxotha i-%s yomsebenzisi"
 
-#: ../libpurple/protocols/jabber/jabber.c:2944
+#: ../libpurple/protocols/jabber/jabber.c:2936
 #, c-format
 msgid "Unknown affiliation: \"%s\""
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:2954
+#: ../libpurple/protocols/jabber/jabber.c:2946
 #, c-format
 msgid "Unable to affiliate user %s as \"%s\""
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:2979
+#: ../libpurple/protocols/jabber/jabber.c:2971
 #, c-format
 msgid "Unknown role: \"%s\""
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:2989
+#: ../libpurple/protocols/jabber/jabber.c:2981
 #, c-format
 msgid "Unable to set role \"%s\" for user: %s"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:3071
+#: ../libpurple/protocols/jabber/jabber.c:3063
 #, c-format
 msgid "Unable to kick user %s"
 msgstr "Akukwazeki ukususa i-%s yomsebenzisi"
 
-#: ../libpurple/protocols/jabber/jabber.c:3108
+#: ../libpurple/protocols/jabber/jabber.c:3100
 #, c-format
 msgid "Unable to ping user %s"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:3130
+#: ../libpurple/protocols/jabber/jabber.c:3122
 #, c-format
 msgid "Unable to buzz, because there is nothing known about %s."
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:3137
+#: ../libpurple/protocols/jabber/jabber.c:3129
 #, c-format
 msgid "Unable to buzz, because %s might be offline."
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:3161
+#: ../libpurple/protocols/jabber/jabber.c:3153
 #, c-format
 msgid ""
 "Unable to buzz, because %s does not support it or does not wish to receive "
@@ -6499,134 +6496,134 @@
 
 #. Yahoo only supports one attention command: the 'buzz'.
 #. This is index number YAHOO_BUZZ.
-#: ../libpurple/protocols/jabber/jabber.c:3208
-#: ../libpurple/protocols/yahoo/libymsg.c:5507
+#: ../libpurple/protocols/jabber/jabber.c:3200
+#: ../libpurple/protocols/yahoo/libymsg.c:5520
 msgid "Buzz"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:3209
-#: ../libpurple/protocols/yahoo/libymsg.c:5508
+#: ../libpurple/protocols/jabber/jabber.c:3201
+#: ../libpurple/protocols/yahoo/libymsg.c:5521
 #, c-format
 msgid "%s has buzzed you!"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:3209
-#: ../libpurple/protocols/yahoo/libymsg.c:5508
+#: ../libpurple/protocols/jabber/jabber.c:3201
+#: ../libpurple/protocols/yahoo/libymsg.c:5521
 #, c-format
 msgid "Buzzing %s..."
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:3324
+#: ../libpurple/protocols/jabber/jabber.c:3316
 #, c-format
 msgid "Unable to initiate media with %s: invalid JID"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:3326
+#: ../libpurple/protocols/jabber/jabber.c:3318
 #, c-format
 msgid "Unable to initiate media with %s: user is not online"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:3328
+#: ../libpurple/protocols/jabber/jabber.c:3320
 #, c-format
 msgid "Unable to initiate media with %s: resource is not online"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:3330
+#: ../libpurple/protocols/jabber/jabber.c:3322
 #, c-format
 msgid "Unable to initiate media with %s: not subscribed to user presence"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:3333
-#: ../libpurple/protocols/jabber/jabber.c:3334
+#: ../libpurple/protocols/jabber/jabber.c:3325
+#: ../libpurple/protocols/jabber/jabber.c:3326
 msgid "Media Initiation Failed"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:3418
+#: ../libpurple/protocols/jabber/jabber.c:3410
 #, c-format
 msgid ""
 "Please select the resource of %s with which you would like to start a media "
 "session."
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:3428
-#: ../libpurple/protocols/jabber/si.c:1579
+#: ../libpurple/protocols/jabber/jabber.c:3420
+#: ../libpurple/protocols/jabber/si.c:1583
 msgid "Select a Resource"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:3429
+#: ../libpurple/protocols/jabber/jabber.c:3421
 msgid "Initiate Media"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:3599
+#: ../libpurple/protocols/jabber/jabber.c:3591
 msgid "Account does not support PEP, can't set mood"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:3612
+#: ../libpurple/protocols/jabber/jabber.c:3604
 msgid "config:  Configure a chat room."
 msgstr "config:  Misela inkqubo yegumbi lencoko."
 
-#: ../libpurple/protocols/jabber/jabber.c:3618
+#: ../libpurple/protocols/jabber/jabber.c:3610
 msgid "configure:  Configure a chat room."
 msgstr "configure:  Misela inkqubo yegumbi lencoko."
 
-#: ../libpurple/protocols/jabber/jabber.c:3631
+#: ../libpurple/protocols/jabber/jabber.c:3623
 msgid "part [message]:  Leave the room."
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:3638
+#: ../libpurple/protocols/jabber/jabber.c:3630
 msgid "register:  Register with a chat room."
 msgstr "register:  Bhalisa kwigumbi lencoko."
 
-#: ../libpurple/protocols/jabber/jabber.c:3646
+#: ../libpurple/protocols/jabber/jabber.c:3638
 msgid "topic [new topic]:  View or change the topic."
 msgstr "topic [isihloko esitsha]:  Jonga okanye guqula isihloko."
 
-#: ../libpurple/protocols/jabber/jabber.c:3654
+#: ../libpurple/protocols/jabber/jabber.c:3646
 msgid "ban &lt;user&gt; [reason]:  Ban a user from the room."
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:3662
+#: ../libpurple/protocols/jabber/jabber.c:3654
 msgid ""
 "affiliate &lt;owner|admin|member|outcast|none&gt; [nick1] [nick2] ...: Get "
 "the users with an affiliation or set users' affiliation with the room."
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:3670
+#: ../libpurple/protocols/jabber/jabber.c:3662
 msgid ""
 "role &lt;moderator|participant|visitor|none&gt; [nick1] [nick2] ...: Get the "
 "users with a role or set users' role with the room."
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:3678
+#: ../libpurple/protocols/jabber/jabber.c:3670
 msgid "invite &lt;user&gt; [message]:  Invite a user to the room."
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:3686
+#: ../libpurple/protocols/jabber/jabber.c:3678
 msgid "join: &lt;room[@server]&gt; [password]:  Join a chat."
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:3694
+#: ../libpurple/protocols/jabber/jabber.c:3686
 msgid "kick &lt;user&gt; [reason]:  Kick a user from the room."
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:3701
+#: ../libpurple/protocols/jabber/jabber.c:3693
 msgid ""
 "msg &lt;user&gt; &lt;message&gt;:  Send a private message to another user."
 msgstr ""
 "msg &lt;umsebenzisi&gt; &lt;umyalezo&gt;:  Thumela umyalezo wabucala komnye "
 "umsebenzisi."
 
-#: ../libpurple/protocols/jabber/jabber.c:3709
+#: ../libpurple/protocols/jabber/jabber.c:3701
 msgid "ping &lt;jid&gt;:\tPing a user/component/server."
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:3717
+#: ../libpurple/protocols/jabber/jabber.c:3709
 #: ../libpurple/protocols/yahoo/libyahoo.c:53
 #: ../libpurple/protocols/yahoo/libyahoojp.c:50
 msgid "buzz: Buzz a user to get their attention"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:3724
+#: ../libpurple/protocols/jabber/jabber.c:3716
 msgid "mood: Set current user mood"
 msgstr ""
 
@@ -6651,8 +6648,8 @@
 msgstr ""
 
 #. Translators: 'domain' is used here in the context of Internet domains, e.g. pidgin.im
-#: ../libpurple/protocols/jabber/libxmpp.c:261 ../pidgin/gtkaccount.c:577
-#: ../pidgin/gtkaccount.c:581
+#: ../libpurple/protocols/jabber/libxmpp.c:261 ../pidgin/gtkaccount.c:570
+#: ../pidgin/gtkaccount.c:574
 msgid "Domain"
 msgstr ""
 
@@ -6666,7 +6663,7 @@
 
 #: ../libpurple/protocols/jabber/libxmpp.c:296
 #: ../libpurple/protocols/myspace/myspace.c:3633
-#: ../libpurple/protocols/simple/simple.c:2172
+#: ../libpurple/protocols/simple/simple.c:2170
 msgid "Connect port"
 msgstr ""
 
@@ -6797,8 +6794,8 @@
 msgid "Unknown Error in presence"
 msgstr "Ubukho bempazamo engaziwayo"
 
-#: ../libpurple/protocols/jabber/si.c:1442
-#: ../libpurple/protocols/jabber/si.c:1483
+#: ../libpurple/protocols/jabber/si.c:1446
+#: ../libpurple/protocols/jabber/si.c:1487
 #, c-format
 msgid "Unable to send file to %s, user does not support file transfers"
 msgstr ""
@@ -6806,31 +6803,31 @@
 "kwefayili"
 
 #. not success
-#: ../libpurple/protocols/jabber/si.c:1443
-#: ../libpurple/protocols/jabber/si.c:1444
-#: ../libpurple/protocols/jabber/si.c:1484
-#: ../libpurple/protocols/jabber/si.c:1485
-#: ../libpurple/protocols/jabber/si.c:1555
-#: ../libpurple/protocols/mxit/protocol.c:2251
+#: ../libpurple/protocols/jabber/si.c:1447
+#: ../libpurple/protocols/jabber/si.c:1448
+#: ../libpurple/protocols/jabber/si.c:1488
+#: ../libpurple/protocols/jabber/si.c:1489
+#: ../libpurple/protocols/jabber/si.c:1559
+#: ../libpurple/protocols/mxit/protocol.c:2289
 msgid "File Send Failed"
 msgstr "AkuPhumelelenga ukuThumela iFayili"
 
-#: ../libpurple/protocols/jabber/si.c:1548
+#: ../libpurple/protocols/jabber/si.c:1552
 #, c-format
 msgid "Unable to send file to %s, invalid JID"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/si.c:1550
+#: ../libpurple/protocols/jabber/si.c:1554
 #, c-format
 msgid "Unable to send file to %s, user is not online"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/si.c:1552
+#: ../libpurple/protocols/jabber/si.c:1556
 #, c-format
 msgid "Unable to send file to %s, not subscribed to user presence"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/si.c:1565
+#: ../libpurple/protocols/jabber/si.c:1569
 #, c-format
 msgid ""
 "Please select the resource of %s to which you would like to send a file"
@@ -6852,9 +6849,9 @@
 #: ../libpurple/protocols/mxit/roster.c:138
 #: ../libpurple/protocols/mxit/roster.c:202
 #: ../libpurple/protocols/oscar/family_locate.c:415
-#: ../libpurple/protocols/silc/buddy.c:1504
+#: ../libpurple/protocols/silc/buddy.c:1510
 #: ../libpurple/protocols/silc/silc.c:987
-#: ../libpurple/protocols/silc/util.c:476
+#: ../libpurple/protocols/silc/util.c:527
 #: ../libpurple/protocols/silc10/buddy.c:1517
 #: ../libpurple/protocols/silc10/silc.c:683
 #: ../libpurple/protocols/silc10/util.c:519
@@ -6866,9 +6863,9 @@
 msgstr ""
 
 #: ../libpurple/protocols/jabber/usermood.c:39
-#: ../libpurple/protocols/silc/buddy.c:1520
+#: ../libpurple/protocols/silc/buddy.c:1526
 #: ../libpurple/protocols/silc/silc.c:1003
-#: ../libpurple/protocols/silc/util.c:492
+#: ../libpurple/protocols/silc/util.c:543
 #: ../libpurple/protocols/silc10/buddy.c:1533
 #: ../libpurple/protocols/silc10/silc.c:699
 #: ../libpurple/protocols/silc10/util.c:535
@@ -6880,9 +6877,9 @@
 msgstr ""
 
 #: ../libpurple/protocols/jabber/usermood.c:41
-#: ../libpurple/protocols/silc/buddy.c:1508
+#: ../libpurple/protocols/silc/buddy.c:1514
 #: ../libpurple/protocols/silc/silc.c:991
-#: ../libpurple/protocols/silc/util.c:480
+#: ../libpurple/protocols/silc/util.c:531
 #: ../libpurple/protocols/silc10/buddy.c:1521
 #: ../libpurple/protocols/silc10/silc.c:687
 #: ../libpurple/protocols/silc10/util.c:523
@@ -6892,9 +6889,9 @@
 #: ../libpurple/protocols/jabber/usermood.c:42
 #: ../libpurple/protocols/mxit/roster.c:148
 #: ../libpurple/protocols/mxit/roster.c:222
-#: ../libpurple/protocols/silc/buddy.c:1516
+#: ../libpurple/protocols/silc/buddy.c:1522
 #: ../libpurple/protocols/silc/silc.c:999
-#: ../libpurple/protocols/silc/util.c:488
+#: ../libpurple/protocols/silc/util.c:539
 #: ../libpurple/protocols/silc10/buddy.c:1529
 #: ../libpurple/protocols/silc10/silc.c:695
 #: ../libpurple/protocols/silc10/util.c:531
@@ -6988,9 +6985,9 @@
 #: ../libpurple/protocols/jabber/usermood.c:63
 #: ../libpurple/protocols/mxit/roster.c:139
 #: ../libpurple/protocols/mxit/roster.c:204
-#: ../libpurple/protocols/silc/buddy.c:1518
+#: ../libpurple/protocols/silc/buddy.c:1524
 #: ../libpurple/protocols/silc/silc.c:1001
-#: ../libpurple/protocols/silc/util.c:490
+#: ../libpurple/protocols/silc/util.c:541
 #: ../libpurple/protocols/silc10/buddy.c:1531
 #: ../libpurple/protocols/silc10/silc.c:697
 #: ../libpurple/protocols/silc10/util.c:533
@@ -7026,9 +7023,9 @@
 #: ../libpurple/protocols/jabber/usermood.c:70
 #: ../libpurple/protocols/mxit/roster.c:141
 #: ../libpurple/protocols/mxit/roster.c:208
-#: ../libpurple/protocols/silc/buddy.c:1500
+#: ../libpurple/protocols/silc/buddy.c:1506
 #: ../libpurple/protocols/silc/silc.c:983
-#: ../libpurple/protocols/silc/util.c:472
+#: ../libpurple/protocols/silc/util.c:523
 #: ../libpurple/protocols/silc10/buddy.c:1513
 #: ../libpurple/protocols/silc10/silc.c:679
 #: ../libpurple/protocols/silc10/util.c:515
@@ -7094,9 +7091,9 @@
 #: ../libpurple/protocols/jabber/usermood.c:83
 #: ../libpurple/protocols/mxit/roster.c:143
 #: ../libpurple/protocols/mxit/roster.c:212
-#: ../libpurple/protocols/silc/buddy.c:1510
+#: ../libpurple/protocols/silc/buddy.c:1516
 #: ../libpurple/protocols/silc/silc.c:993
-#: ../libpurple/protocols/silc/util.c:482
+#: ../libpurple/protocols/silc/util.c:533
 #: ../libpurple/protocols/silc10/buddy.c:1523
 #: ../libpurple/protocols/silc10/silc.c:689
 #: ../libpurple/protocols/silc10/util.c:525
@@ -7104,9 +7101,9 @@
 msgstr "Ongoyiswayo"
 
 #: ../libpurple/protocols/jabber/usermood.c:84
-#: ../libpurple/protocols/silc/buddy.c:1506
+#: ../libpurple/protocols/silc/buddy.c:1512
 #: ../libpurple/protocols/silc/silc.c:989
-#: ../libpurple/protocols/silc/util.c:478
+#: ../libpurple/protocols/silc/util.c:529
 #: ../libpurple/protocols/silc10/buddy.c:1519
 #: ../libpurple/protocols/silc10/silc.c:685
 #: ../libpurple/protocols/silc10/util.c:521
@@ -7176,9 +7173,9 @@
 #: ../libpurple/protocols/jabber/usermood.c:100
 #: ../libpurple/protocols/mxit/roster.c:144
 #: ../libpurple/protocols/mxit/roster.c:214
-#: ../libpurple/protocols/silc/buddy.c:1502
+#: ../libpurple/protocols/silc/buddy.c:1508
 #: ../libpurple/protocols/silc/silc.c:985
-#: ../libpurple/protocols/silc/util.c:474
+#: ../libpurple/protocols/silc/util.c:525
 #: ../libpurple/protocols/silc10/buddy.c:1515
 #: ../libpurple/protocols/silc10/silc.c:681
 #: ../libpurple/protocols/silc10/util.c:517
@@ -7217,9 +7214,9 @@
 #: ../libpurple/protocols/mxit/roster.c:147
 #: ../libpurple/protocols/mxit/roster.c:220
 #: ../libpurple/protocols/oscar/family_locate.c:428
-#: ../libpurple/protocols/silc/buddy.c:1514
+#: ../libpurple/protocols/silc/buddy.c:1520
 #: ../libpurple/protocols/silc/silc.c:997
-#: ../libpurple/protocols/silc/util.c:486
+#: ../libpurple/protocols/silc/util.c:537
 #: ../libpurple/protocols/silc10/buddy.c:1527
 #: ../libpurple/protocols/silc10/silc.c:693
 #: ../libpurple/protocols/silc10/util.c:529
@@ -7303,20 +7300,20 @@
 #. only notify the user about problems adding to the friends list
 #. * maybe we should do something else for other lists, but it probably
 #. * won't cause too many problems if we just ignore it
-#: ../libpurple/protocols/msn/contact.c:1073
-#: ../libpurple/protocols/msn/contact.c:1169
+#: ../libpurple/protocols/msn/contact.c:1070
+#: ../libpurple/protocols/msn/contact.c:1166
 #: ../libpurple/protocols/msn/userlist.c:523
 #, c-format
 msgid "Unable to add \"%s\"."
 msgstr ""
 
-#: ../libpurple/protocols/msn/contact.c:1074
-#: ../libpurple/protocols/msn/contact.c:1170
+#: ../libpurple/protocols/msn/contact.c:1071
+#: ../libpurple/protocols/msn/contact.c:1167
 msgid "Buddy Add error"
 msgstr ""
 
-#: ../libpurple/protocols/msn/contact.c:1075
-#: ../libpurple/protocols/msn/contact.c:1171
+#: ../libpurple/protocols/msn/contact.c:1072
+#: ../libpurple/protocols/msn/contact.c:1168
 msgid "The username specified does not exist."
 msgstr ""
 
@@ -7366,7 +7363,7 @@
 msgstr "Akekho kuLuhlu"
 
 #: ../libpurple/protocols/msn/error.c:86
-#: ../libpurple/protocols/zephyr/zephyr.c:763
+#: ../libpurple/protocols/zephyr/zephyr.c:759
 msgid "User is offline"
 msgstr "Umsebenzisi akekho kunxibelelwano"
 
@@ -7516,7 +7513,7 @@
 
 #: ../libpurple/protocols/msn/error.c:228
 #: ../libpurple/protocols/silc/silc.c:340
-#: ../libpurple/protocols/silc10/ops.c:1713 ../libpurple/proxy.c:1774
+#: ../libpurple/protocols/silc10/ops.c:1713 ../libpurple/proxy.c:1796
 msgid "Authentication failed"
 msgstr "Ukuqinisekisa akuphumelelanga"
 
@@ -7756,26 +7753,26 @@
 msgstr "Unawe"
 
 #: ../libpurple/protocols/msn/msn.c:1130
-#: ../libpurple/protocols/yahoo/libymsg.c:4260
+#: ../libpurple/protocols/yahoo/libymsg.c:4273
 #: ../libpurple/protocols/yahoo/yahoo_aliases.c:548
 msgid "Home Phone Number"
 msgstr ""
 
 #: ../libpurple/protocols/msn/msn.c:1134
-#: ../libpurple/protocols/yahoo/libymsg.c:4261
+#: ../libpurple/protocols/yahoo/libymsg.c:4274
 #: ../libpurple/protocols/yahoo/yahoo_aliases.c:549
 msgid "Work Phone Number"
 msgstr ""
 
 #: ../libpurple/protocols/msn/msn.c:1138
-#: ../libpurple/protocols/yahoo/libymsg.c:4262
+#: ../libpurple/protocols/yahoo/libymsg.c:4275
 #: ../libpurple/protocols/yahoo/yahoo_aliases.c:550
 msgid "Mobile Phone Number"
 msgstr ""
 
 #: ../libpurple/protocols/msn/msn.c:1161 ../libpurple/protocols/msn/state.c:39
-#: ../libpurple/protocols/yahoo/libymsg.c:4069
-#: ../libpurple/protocols/yahoo/libymsg.c:5095
+#: ../libpurple/protocols/yahoo/libymsg.c:4082
+#: ../libpurple/protocols/yahoo/libymsg.c:5108
 msgid "Be Right Back"
 msgstr "Ndiza kubuya ngoku"
 
@@ -7783,25 +7780,25 @@
 #: ../libpurple/protocols/novell/novell.c:2845
 #: ../libpurple/protocols/novell/novell.c:2975
 #: ../libpurple/protocols/oscar/family_locate.c:409
-#: ../libpurple/protocols/silc/buddy.c:1487
+#: ../libpurple/protocols/silc/buddy.c:1493
 #: ../libpurple/protocols/silc/silc.c:58
 #: ../libpurple/protocols/silc10/buddy.c:1500
 #: ../libpurple/protocols/silc10/silc.c:48
-#: ../libpurple/protocols/yahoo/libymsg.c:4071
-#: ../libpurple/protocols/yahoo/libymsg.c:5099
+#: ../libpurple/protocols/yahoo/libymsg.c:4084
+#: ../libpurple/protocols/yahoo/libymsg.c:5112
 #: ../pidgin/plugins/themeedit-icon.c:66
 msgid "Busy"
 msgstr "Xakekileyo"
 
 #: ../libpurple/protocols/msn/msn.c:1172
-#: ../libpurple/protocols/yahoo/libymsg.c:4079
-#: ../libpurple/protocols/yahoo/libymsg.c:5113
+#: ../libpurple/protocols/yahoo/libymsg.c:4092
+#: ../libpurple/protocols/yahoo/libymsg.c:5126
 msgid "On the Phone"
 msgstr ""
 
 #: ../libpurple/protocols/msn/msn.c:1177
-#: ../libpurple/protocols/yahoo/libymsg.c:4083
-#: ../libpurple/protocols/yahoo/libymsg.c:5119
+#: ../libpurple/protocols/yahoo/libymsg.c:4096
+#: ../libpurple/protocols/yahoo/libymsg.c:5132
 msgid "Out to Lunch"
 msgstr ""
 
@@ -7862,227 +7859,227 @@
 "SSL support is needed for MSN. Please install a supported SSL library."
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:1781
+#: ../libpurple/protocols/msn/msn.c:1782
 #, c-format
 msgid ""
 "Unable to add the buddy %s because the username is invalid.  Usernames must "
 "be valid email addresses."
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:1783
-#: ../libpurple/protocols/oscar/oscar.c:3695
-#: ../libpurple/protocols/oscar/oscar.c:4164
-#: ../libpurple/protocols/oscar/oscar.c:4179
+#: ../libpurple/protocols/msn/msn.c:1784
+#: ../libpurple/protocols/oscar/oscar.c:3698
+#: ../libpurple/protocols/oscar/oscar.c:4169
+#: ../libpurple/protocols/oscar/oscar.c:4184
 msgid "Unable to Add"
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:2343 ../libpurple/protocols/msn/msn.c:2685
+#: ../libpurple/protocols/msn/msn.c:2344 ../libpurple/protocols/msn/msn.c:2686
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:808
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1199
 msgid "Error retrieving profile"
 msgstr "Impazamo yokufumana inkangeleko"
 
-#: ../libpurple/protocols/msn/msn.c:2407 ../pidgin/plugins/convcolors.c:387
+#: ../libpurple/protocols/msn/msn.c:2408 ../pidgin/plugins/convcolors.c:387
 msgid "General"
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:2414
+#: ../libpurple/protocols/msn/msn.c:2415
 #: ../libpurple/protocols/mxit/profile.c:329
 #: ../libpurple/protocols/myspace/user.c:127
-#: ../libpurple/protocols/oscar/userinfo.c:450
+#: ../libpurple/protocols/oscar/userinfo.c:449
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1080
 msgid "Age"
 msgstr "Ubudala"
 
-#: ../libpurple/protocols/msn/msn.c:2416
+#: ../libpurple/protocols/msn/msn.c:2417
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1095
 msgid "Occupation"
 msgstr "Umsebenzi"
 
-#: ../libpurple/protocols/msn/msn.c:2417
+#: ../libpurple/protocols/msn/msn.c:2418
 #: ../libpurple/protocols/myspace/user.c:135
 #: ../libpurple/protocols/novell/novell.c:1486
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1075
-#: ../libpurple/protocols/zephyr/zephyr.c:814
-#: ../libpurple/protocols/zephyr/zephyr.c:1196
+#: ../libpurple/protocols/zephyr/zephyr.c:807
+#: ../libpurple/protocols/zephyr/zephyr.c:1186
 msgid "Location"
 msgstr "Indawo"
 
-#: ../libpurple/protocols/msn/msn.c:2422 ../libpurple/protocols/msn/msn.c:2614
-#: ../libpurple/protocols/msn/msn.c:2620 ../libpurple/protocols/msn/msn.c:2627
+#: ../libpurple/protocols/msn/msn.c:2423 ../libpurple/protocols/msn/msn.c:2615
+#: ../libpurple/protocols/msn/msn.c:2621 ../libpurple/protocols/msn/msn.c:2628
 msgid "Hobbies and Interests"
 msgstr "Imisebenzi nezinto endinoMdla kuzo"
 
-#: ../libpurple/protocols/msn/msn.c:2428 ../libpurple/protocols/msn/msn.c:2548
-#: ../libpurple/protocols/msn/msn.c:2554 ../libpurple/protocols/msn/msn.c:2561
-#: ../libpurple/protocols/msn/msn.c:2569 ../libpurple/protocols/msn/msn.c:2576
+#: ../libpurple/protocols/msn/msn.c:2429 ../libpurple/protocols/msn/msn.c:2549
+#: ../libpurple/protocols/msn/msn.c:2555 ../libpurple/protocols/msn/msn.c:2562
+#: ../libpurple/protocols/msn/msn.c:2570 ../libpurple/protocols/msn/msn.c:2577
 msgid "A Little About Me"
 msgstr "Amabalengwe Ngam"
 
-#: ../libpurple/protocols/msn/msn.c:2445
+#: ../libpurple/protocols/msn/msn.c:2446
 msgid "Social"
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:2447
+#: ../libpurple/protocols/msn/msn.c:2448
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1085
 msgid "Marital Status"
 msgstr "Imo yomTshato"
 
-#: ../libpurple/protocols/msn/msn.c:2448
+#: ../libpurple/protocols/msn/msn.c:2449
 msgid "Interests"
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:2449
+#: ../libpurple/protocols/msn/msn.c:2450
 msgid "Pets"
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:2450
+#: ../libpurple/protocols/msn/msn.c:2451
 msgid "Hometown"
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:2451
+#: ../libpurple/protocols/msn/msn.c:2452
 msgid "Places Lived"
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:2452
+#: ../libpurple/protocols/msn/msn.c:2453
 msgid "Fashion"
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:2453
+#: ../libpurple/protocols/msn/msn.c:2454
 msgid "Humor"
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:2454
+#: ../libpurple/protocols/msn/msn.c:2455
 msgid "Music"
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:2455 ../libpurple/protocols/msn/msn.c:2636
-#: ../libpurple/protocols/msn/msn.c:2642
+#: ../libpurple/protocols/msn/msn.c:2456 ../libpurple/protocols/msn/msn.c:2637
+#: ../libpurple/protocols/msn/msn.c:2643
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1137
 msgid "Favorite Quote"
 msgstr "Isicatshulwa endisiThandayo"
 
-#: ../libpurple/protocols/msn/msn.c:2472
+#: ../libpurple/protocols/msn/msn.c:2473
 msgid "Contact Info"
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:2473
+#: ../libpurple/protocols/msn/msn.c:2474
 msgid "Personal"
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:2476
+#: ../libpurple/protocols/msn/msn.c:2477
 msgid "Significant Other"
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:2477
+#: ../libpurple/protocols/msn/msn.c:2478
 msgid "Home Phone"
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:2478
+#: ../libpurple/protocols/msn/msn.c:2479
 msgid "Home Phone 2"
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:2479
-#: ../libpurple/protocols/oscar/userinfo.c:460
+#: ../libpurple/protocols/msn/msn.c:2480
+#: ../libpurple/protocols/oscar/userinfo.c:459
 msgid "Home Address"
 msgstr "Idilesi yaseKhaya"
 
-#: ../libpurple/protocols/msn/msn.c:2480
+#: ../libpurple/protocols/msn/msn.c:2481
 msgid "Personal Mobile"
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:2481
+#: ../libpurple/protocols/msn/msn.c:2482
 msgid "Home Fax"
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:2482
+#: ../libpurple/protocols/msn/msn.c:2483
 msgid "Personal Email"
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:2483
+#: ../libpurple/protocols/msn/msn.c:2484
 msgid "Personal IM"
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:2485
+#: ../libpurple/protocols/msn/msn.c:2486
 msgid "Anniversary"
 msgstr ""
 
 #. Business
-#: ../libpurple/protocols/msn/msn.c:2501
+#: ../libpurple/protocols/msn/msn.c:2502
 msgid "Work"
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:2504
-#: ../libpurple/protocols/oscar/userinfo.c:478
+#: ../libpurple/protocols/msn/msn.c:2505
+#: ../libpurple/protocols/oscar/userinfo.c:477
 msgid "Company"
 msgstr "Inkampani"
 
-#: ../libpurple/protocols/msn/msn.c:2505
+#: ../libpurple/protocols/msn/msn.c:2506
 #: ../libpurple/protocols/novell/novell.c:1488
 msgid "Department"
 msgstr "Isebe"
 
-#: ../libpurple/protocols/msn/msn.c:2506
+#: ../libpurple/protocols/msn/msn.c:2507
 msgid "Profession"
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:2507
+#: ../libpurple/protocols/msn/msn.c:2508
 msgid "Work Phone"
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:2508
+#: ../libpurple/protocols/msn/msn.c:2509
 msgid "Work Phone 2"
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:2509
-#: ../libpurple/protocols/oscar/userinfo.c:468
+#: ../libpurple/protocols/msn/msn.c:2510
+#: ../libpurple/protocols/oscar/userinfo.c:467
 msgid "Work Address"
 msgstr "Idilesi yaseMsebenzini"
 
-#: ../libpurple/protocols/msn/msn.c:2510
+#: ../libpurple/protocols/msn/msn.c:2511
 msgid "Work Mobile"
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:2511
+#: ../libpurple/protocols/msn/msn.c:2512
 msgid "Work Pager"
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:2512
+#: ../libpurple/protocols/msn/msn.c:2513
 msgid "Work Fax"
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:2513
+#: ../libpurple/protocols/msn/msn.c:2514
 msgid "Work Email"
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:2514
+#: ../libpurple/protocols/msn/msn.c:2515
 msgid "Work IM"
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:2515
+#: ../libpurple/protocols/msn/msn.c:2516
 msgid "Start Date"
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:2585 ../libpurple/protocols/msn/msn.c:2591
-#: ../libpurple/protocols/msn/msn.c:2598 ../libpurple/protocols/msn/msn.c:2605
+#: ../libpurple/protocols/msn/msn.c:2586 ../libpurple/protocols/msn/msn.c:2592
+#: ../libpurple/protocols/msn/msn.c:2599 ../libpurple/protocols/msn/msn.c:2606
 msgid "Favorite Things"
 msgstr "Izinto endiziThandayo"
 
-#: ../libpurple/protocols/msn/msn.c:2650
+#: ../libpurple/protocols/msn/msn.c:2651
 msgid "Last Updated"
 msgstr "Igqibele ukuHlaziywa"
 
-#: ../libpurple/protocols/msn/msn.c:2661
-#: ../libpurple/protocols/silc/ops.c:1038
+#: ../libpurple/protocols/msn/msn.c:2662
+#: ../libpurple/protocols/silc/ops.c:1039
 #: ../libpurple/protocols/silc10/ops.c:1060
 msgid "Homepage"
 msgstr "IPhepha lokuQala"
 
-#: ../libpurple/protocols/msn/msn.c:2687
+#: ../libpurple/protocols/msn/msn.c:2688
 msgid "The user has not created a public profile."
 msgstr "Kufuneka umsebenzisi akhe ifayili kawonkewonke."
 
-#: ../libpurple/protocols/msn/msn.c:2688
+#: ../libpurple/protocols/msn/msn.c:2689
 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 "
@@ -8092,16 +8089,16 @@
 "Mhlawumbi oko kuthetha ukuthi umsebenzisi akeakho, okanye umsebenzisi ukhona "
 "kodwa akayilanga ifayili kawonke-wonke."
 
-#: ../libpurple/protocols/msn/msn.c:2692
+#: ../libpurple/protocols/msn/msn.c:2693
 msgid ""
 "Could not find any information in the user's profile. The user most likely "
 "does not exist."
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:2700
+#: ../libpurple/protocols/msn/msn.c:2701
 #: ../libpurple/protocols/myspace/user.c:194
 #: ../libpurple/protocols/myspace/user.c:197
-#: ../libpurple/protocols/oscar/userinfo.c:536
+#: ../libpurple/protocols/oscar/userinfo.c:535
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1237
 msgid "View web profile"
 msgstr ""
@@ -8115,31 +8112,31 @@
 #. *< name
 #. *< version
 #. *< summary
-#: ../libpurple/protocols/msn/msn.c:2998 ../libpurple/protocols/msn/msn.c:2999
+#: ../libpurple/protocols/msn/msn.c:2999 ../libpurple/protocols/msn/msn.c:3000
 msgid "Windows Live Messenger Protocol Plugin"
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:3033
+#: ../libpurple/protocols/msn/msn.c:3034
 msgid "Use HTTP Method"
 msgstr "Ukusebenzisa Indlela yeHTTP"
 
-#: ../libpurple/protocols/msn/msn.c:3038
+#: ../libpurple/protocols/msn/msn.c:3039
 msgid "HTTP Method Server"
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:3043
+#: ../libpurple/protocols/msn/msn.c:3044
 msgid "Show custom smileys"
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:3048
+#: ../libpurple/protocols/msn/msn.c:3049
 msgid "Allow direct connections"
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:3053
+#: ../libpurple/protocols/msn/msn.c:3054
 msgid "Allow connecting from multiple locations"
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:3061
+#: ../libpurple/protocols/msn/msn.c:3062
 msgid "nudge: nudge a user to get their attention"
 msgstr ""
 
@@ -8151,44 +8148,44 @@
 msgid "Windows Live ID authentication:Invalid response"
 msgstr ""
 
-#: ../libpurple/protocols/msn/notification.c:833
+#: ../libpurple/protocols/msn/notification.c:824
 msgid "The following users are missing from your addressbook"
 msgstr ""
 
-#: ../libpurple/protocols/msn/notification.c:841
-#: ../libpurple/protocols/msn/notification.c:888
+#: ../libpurple/protocols/msn/notification.c:832
+#: ../libpurple/protocols/msn/notification.c:879
 #, c-format
 msgid "Unknown error (%d): %s"
 msgstr ""
 
-#: ../libpurple/protocols/msn/notification.c:845
-#: ../libpurple/protocols/msn/notification.c:869
-#: ../libpurple/protocols/sametime/sametime.c:4436
+#: ../libpurple/protocols/msn/notification.c:836
+#: ../libpurple/protocols/msn/notification.c:860
+#: ../libpurple/protocols/sametime/sametime.c:4472
 msgid "Unable to add user"
 msgstr ""
 
 #. Unknown error!
-#: ../libpurple/protocols/msn/notification.c:868
-#: ../libpurple/protocols/msn/notification.c:914
-#: ../libpurple/protocols/yahoo/libymsg.c:2143
+#: ../libpurple/protocols/msn/notification.c:859
+#: ../libpurple/protocols/msn/notification.c:905
+#: ../libpurple/protocols/yahoo/libymsg.c:2142
 #, c-format
 msgid "Unknown error (%d)"
 msgstr ""
 
-#: ../libpurple/protocols/msn/notification.c:892
-#: ../libpurple/protocols/msn/notification.c:915
+#: ../libpurple/protocols/msn/notification.c:883
+#: ../libpurple/protocols/msn/notification.c:906
 msgid "Unable to remove user"
 msgstr ""
 
-#: ../libpurple/protocols/msn/notification.c:1219
+#: ../libpurple/protocols/msn/notification.c:1210
 msgid "Mobile message was not sent because it was too long."
 msgstr ""
 
-#: ../libpurple/protocols/msn/notification.c:1221
+#: ../libpurple/protocols/msn/notification.c:1212
 msgid "Mobile message was not sent because an unknown error occurred."
 msgstr ""
 
-#: ../libpurple/protocols/msn/notification.c:2243
+#: ../libpurple/protocols/msn/notification.c:2234
 #, c-format
 msgid ""
 "The MSN server will shut down for maintenance in %d minute. You will "
@@ -8423,7 +8420,7 @@
 #. (reference: "libpurple/request.h")
 #: ../libpurple/protocols/mxit/actions.c:224
 #: ../libpurple/protocols/mxit/actions.c:313
-#: ../libpurple/protocols/oscar/userinfo.c:528
+#: ../libpurple/protocols/oscar/userinfo.c:527
 msgid "Profile"
 msgstr "Inkangeleko"
 
@@ -8549,7 +8546,7 @@
 msgstr ""
 
 #: ../libpurple/protocols/mxit/actions.c:501
-#: ../libpurple/protocols/oscar/oscar.c:5328
+#: ../libpurple/protocols/oscar/oscar.c:5333
 msgid "_Search"
 msgstr ""
 
@@ -8589,16 +8586,16 @@
 msgstr ""
 
 #. file read error
-#: ../libpurple/protocols/mxit/filexfer.c:177
+#: ../libpurple/protocols/mxit/filexfer.c:178
 msgid "Unable to access the local file"
 msgstr ""
 
 #. file write error
-#: ../libpurple/protocols/mxit/filexfer.c:455
+#: ../libpurple/protocols/mxit/filexfer.c:456
 msgid "Unable to save the file"
 msgstr ""
 
-#: ../libpurple/protocols/mxit/http.c:287
+#: ../libpurple/protocols/mxit/http.c:281
 msgid ""
 "Unable to connect to the MXit HTTP server. Please check your server settings."
 msgstr ""
@@ -8849,146 +8846,146 @@
 msgstr[1] ""
 
 #. we must have lost the connection, so terminate it so that we can reconnect
-#: ../libpurple/protocols/mxit/protocol.c:417
+#: ../libpurple/protocols/mxit/protocol.c:444
 msgid "We have lost the connection to MXit. Please reconnect."
 msgstr ""
 
 #. packet could not be queued for transmission
-#: ../libpurple/protocols/mxit/protocol.c:513
+#: ../libpurple/protocols/mxit/protocol.c:540
 msgid "Message Send Error"
 msgstr ""
 
-#: ../libpurple/protocols/mxit/protocol.c:513
+#: ../libpurple/protocols/mxit/protocol.c:540
 msgid "Unable to process your request at this time"
 msgstr ""
 
-#: ../libpurple/protocols/mxit/protocol.c:539
+#: ../libpurple/protocols/mxit/protocol.c:566
 msgid "Timeout while waiting for a response from the MXit server."
 msgstr ""
 
-#: ../libpurple/protocols/mxit/protocol.c:1475
+#: ../libpurple/protocols/mxit/protocol.c:1478
 msgid "Successfully Logged In..."
 msgstr ""
 
-#: ../libpurple/protocols/mxit/protocol.c:1572
+#: ../libpurple/protocols/mxit/protocol.c:1575
 #, c-format
 msgid ""
 "%s sent you an encrypted message, but it is not supported on this client."
 msgstr ""
 
-#: ../libpurple/protocols/mxit/protocol.c:1573
-#: ../libpurple/protocols/mxit/protocol.c:2490
+#: ../libpurple/protocols/mxit/protocol.c:1576
+#: ../libpurple/protocols/mxit/protocol.c:2529
 msgid "Message Error"
 msgstr ""
 
 #. could not be decrypted
-#: ../libpurple/protocols/mxit/protocol.c:1581
+#: ../libpurple/protocols/mxit/protocol.c:1584
 msgid "An encrypted message was received which could not be decrypted."
 msgstr ""
 
-#: ../libpurple/protocols/mxit/protocol.c:2291
+#: ../libpurple/protocols/mxit/protocol.c:2330
 msgid "Cannot perform redirect using the specified protocol"
 msgstr ""
 
-#: ../libpurple/protocols/mxit/protocol.c:2459
+#: ../libpurple/protocols/mxit/protocol.c:2498
 msgid "An internal MXit server error occurred."
 msgstr ""
 
-#: ../libpurple/protocols/mxit/protocol.c:2478
+#: ../libpurple/protocols/mxit/protocol.c:2517
 #, c-format
 msgid "Login error: %s (%i)"
 msgstr ""
 
-#: ../libpurple/protocols/mxit/protocol.c:2483
+#: ../libpurple/protocols/mxit/protocol.c:2522
 #, c-format
 msgid "Logout error: %s (%i)"
 msgstr ""
 
-#: ../libpurple/protocols/mxit/protocol.c:2487
+#: ../libpurple/protocols/mxit/protocol.c:2526
 msgid "Contact Error"
 msgstr ""
 
-#: ../libpurple/protocols/mxit/protocol.c:2493
+#: ../libpurple/protocols/mxit/protocol.c:2532
 msgid "Message Sending Error"
 msgstr ""
 
-#: ../libpurple/protocols/mxit/protocol.c:2496
+#: ../libpurple/protocols/mxit/protocol.c:2535
 msgid "Status Error"
 msgstr ""
 
-#: ../libpurple/protocols/mxit/protocol.c:2499
+#: ../libpurple/protocols/mxit/protocol.c:2538
 msgid "Mood Error"
 msgstr ""
 
-#: ../libpurple/protocols/mxit/protocol.c:2510
+#: ../libpurple/protocols/mxit/protocol.c:2549
 msgid "Invitation Error"
 msgstr ""
 
-#: ../libpurple/protocols/mxit/protocol.c:2513
+#: ../libpurple/protocols/mxit/protocol.c:2552
 msgid "Contact Removal Error"
 msgstr ""
 
-#: ../libpurple/protocols/mxit/protocol.c:2517
+#: ../libpurple/protocols/mxit/protocol.c:2556
 msgid "Subscription Error"
 msgstr ""
 
-#: ../libpurple/protocols/mxit/protocol.c:2520
+#: ../libpurple/protocols/mxit/protocol.c:2559
 msgid "Contact Update Error"
 msgstr ""
 
-#: ../libpurple/protocols/mxit/protocol.c:2523
+#: ../libpurple/protocols/mxit/protocol.c:2562
 msgid "File Transfer Error"
 msgstr ""
 
-#: ../libpurple/protocols/mxit/protocol.c:2526
+#: ../libpurple/protocols/mxit/protocol.c:2565
 msgid "Cannot create MultiMx room"
 msgstr ""
 
-#: ../libpurple/protocols/mxit/protocol.c:2529
+#: ../libpurple/protocols/mxit/protocol.c:2568
 msgid "MultiMx Invitation Error"
 msgstr ""
 
-#: ../libpurple/protocols/mxit/protocol.c:2533
+#: ../libpurple/protocols/mxit/protocol.c:2572
 msgid "Profile Error"
 msgstr ""
 
 #. bad packet
-#: ../libpurple/protocols/mxit/protocol.c:2747
+#: ../libpurple/protocols/mxit/protocol.c:2787
 msgid "Invalid packet received from MXit."
 msgstr ""
 
 #. connection error
-#: ../libpurple/protocols/mxit/protocol.c:2812
+#: ../libpurple/protocols/mxit/protocol.c:2852
 msgid "A connection error occurred to MXit. (read stage 0x01)"
 msgstr ""
 
 #. connection closed
-#: ../libpurple/protocols/mxit/protocol.c:2817
+#: ../libpurple/protocols/mxit/protocol.c:2857
 msgid "A connection error occurred to MXit. (read stage 0x02)"
 msgstr ""
 
-#: ../libpurple/protocols/mxit/protocol.c:2827
+#: ../libpurple/protocols/mxit/protocol.c:2867
 msgid "A connection error occurred to MXit. (read stage 0x03)"
 msgstr ""
 
 #. malformed packet length record (too long)
-#: ../libpurple/protocols/mxit/protocol.c:2838
+#: ../libpurple/protocols/mxit/protocol.c:2879
 msgid "A connection error occurred to MXit. (read stage 0x04)"
 msgstr ""
 
 #. connection error
-#: ../libpurple/protocols/mxit/protocol.c:2849
+#: ../libpurple/protocols/mxit/protocol.c:2890
 msgid "A connection error occurred to MXit. (read stage 0x05)"
 msgstr ""
 
 #. connection closed
-#: ../libpurple/protocols/mxit/protocol.c:2854
+#: ../libpurple/protocols/mxit/protocol.c:2895
 msgid "A connection error occurred to MXit. (read stage 0x06)"
 msgstr ""
 
 #: ../libpurple/protocols/mxit/roster.c:210
-#: ../libpurple/protocols/silc/buddy.c:1512
-#: ../libpurple/protocols/silc/util.c:484
+#: ../libpurple/protocols/silc/buddy.c:1518
+#: ../libpurple/protocols/silc/util.c:535
 #: ../libpurple/protocols/silc10/buddy.c:1525
 #: ../libpurple/protocols/silc10/util.c:527
 msgid "In Love"
@@ -9222,8 +9219,8 @@
 msgstr ""
 
 #: ../libpurple/protocols/myspace/user.c:120
-#: ../libpurple/protocols/zephyr/zephyr.c:801
-#: ../libpurple/protocols/zephyr/zephyr.c:1184
+#: ../libpurple/protocols/zephyr/zephyr.c:794
+#: ../libpurple/protocols/zephyr/zephyr.c:1174
 msgid "User"
 msgstr ""
 
@@ -9243,45 +9240,45 @@
 msgid "Client Version"
 msgstr ""
 
-#: ../libpurple/protocols/myspace/user.c:634
-#: ../libpurple/protocols/myspace/user.c:788
+#: ../libpurple/protocols/myspace/user.c:632
+#: ../libpurple/protocols/myspace/user.c:786
 msgid ""
 "An error occurred while trying to set the username.  Please try again, or "
 "visit http://editprofile.myspace.com/index.cfm?fuseaction=profile.username "
 "to set your username."
 msgstr ""
 
-#: ../libpurple/protocols/myspace/user.c:808
+#: ../libpurple/protocols/myspace/user.c:806
 msgid "MySpaceIM - Username Available"
 msgstr ""
 
-#: ../libpurple/protocols/myspace/user.c:809
+#: ../libpurple/protocols/myspace/user.c:807
 msgid "This username is available. Would you like to set it?"
 msgstr ""
 
-#: ../libpurple/protocols/myspace/user.c:810
+#: ../libpurple/protocols/myspace/user.c:808
 msgid "ONCE SET, THIS CANNOT BE CHANGED!"
 msgstr ""
 
-#: ../libpurple/protocols/myspace/user.c:821
-#: ../libpurple/protocols/myspace/user.c:882
+#: ../libpurple/protocols/myspace/user.c:819
+#: ../libpurple/protocols/myspace/user.c:880
 msgid "MySpaceIM - Please Set a Username"
 msgstr ""
 
-#: ../libpurple/protocols/myspace/user.c:822
+#: ../libpurple/protocols/myspace/user.c:820
 msgid "This username is unavailable."
 msgstr ""
 
-#: ../libpurple/protocols/myspace/user.c:823
+#: ../libpurple/protocols/myspace/user.c:821
 msgid "Please try another username:"
 msgstr ""
 
 #. Protocol won't log in now without a username set.. Disconnect
-#: ../libpurple/protocols/myspace/user.c:872
+#: ../libpurple/protocols/myspace/user.c:870
 msgid "No username set"
 msgstr ""
 
-#: ../libpurple/protocols/myspace/user.c:883
+#: ../libpurple/protocols/myspace/user.c:881
 msgid "Please enter a username to check its availability:"
 msgstr ""
 
@@ -9292,7 +9289,7 @@
 #. * connotation, for example, "he was zapped by electricity when
 #. * he put a fork in the toaster."
 #: ../libpurple/protocols/myspace/zap.c:44
-#: ../libpurple/protocols/myspace/zap.c:216
+#: ../libpurple/protocols/myspace/zap.c:217
 msgid "Zap"
 msgstr ""
 
@@ -9491,9 +9488,9 @@
 
 #: ../libpurple/protocols/novell/nmuser.c:1893
 #: ../libpurple/protocols/oscar/clientlogin.c:487
-#: ../libpurple/protocols/oscar/oscar.c:1094
-#: ../libpurple/protocols/simple/simple.c:1132
-#: ../libpurple/protocols/yahoo/libymsg.c:2109
+#: ../libpurple/protocols/oscar/oscar.c:1096
+#: ../libpurple/protocols/simple/simple.c:1127
+#: ../libpurple/protocols/yahoo/libymsg.c:2108
 msgid "Incorrect password"
 msgstr ""
 
@@ -9690,7 +9687,7 @@
 msgstr "Indawo yeposi"
 
 #: ../libpurple/protocols/novell/novell.c:1510
-#: ../libpurple/protocols/sametime/sametime.c:4133
+#: ../libpurple/protocols/sametime/sametime.c:4169
 msgid "User ID"
 msgstr "Isazizi somSebenzisi"
 
@@ -9788,8 +9785,8 @@
 
 #: ../libpurple/protocols/oscar/authorization.c:87
 #: ../libpurple/protocols/oscar/authorization.c:97
-#: ../libpurple/protocols/oscar/oscar.c:1962
-#: ../libpurple/protocols/oscar/oscar.c:4368
+#: ../libpurple/protocols/oscar/oscar.c:1964
+#: ../libpurple/protocols/oscar/oscar.c:4373
 #: ../libpurple/protocols/yahoo/libymsg.c:1367
 msgid "No reason given."
 msgstr "Akukho sizathu sinikiweyo."
@@ -9802,9 +9799,9 @@
 #. * A wrapper for purple_request_action() that uses @c OK and @c Cancel buttons.
 #. 
 #: ../libpurple/protocols/oscar/authorization.c:98
-#: ../libpurple/protocols/oscar/oscar.c:1221
-#: ../libpurple/protocols/oscar/oscar.c:4931
-#: ../libpurple/protocols/oscar/oscar.c:5271 ../libpurple/request.h:1498
+#: ../libpurple/protocols/oscar/oscar.c:1223
+#: ../libpurple/protocols/oscar/oscar.c:4936
+#: ../libpurple/protocols/oscar/oscar.c:5276 ../libpurple/request.h:1498
 msgid "_OK"
 msgstr ""
 
@@ -9828,7 +9825,7 @@
 "ixesha elidana nangakumbi."
 
 #: ../libpurple/protocols/oscar/clientlogin.c:283
-#: ../libpurple/protocols/oscar/oscar.c:1296
+#: ../libpurple/protocols/oscar/oscar.c:1298
 msgid ""
 "You required encryption in your account settings, but one of the servers "
 "doesn't support it."
@@ -9975,7 +9972,7 @@
 msgid "Watching a movie"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/family_locate.c:419 ../pidgin/gtkconv.c:6823
+#: ../libpurple/protocols/oscar/family_locate.c:419 ../pidgin/gtkconv.c:6820
 #: ../pidgin/gtkstatusbox.c:714
 msgid "Typing"
 msgstr ""
@@ -10068,10 +10065,9 @@
 msgstr ""
 
 #: ../libpurple/protocols/oscar/flap_connection.c:477
-#: ../libpurple/proxy.c:1534 ../libpurple/proxy.c:1564
-#: ../libpurple/proxy.c:1644 ../libpurple/proxy.c:1715
-#: ../libpurple/proxy.c:1725 ../libpurple/proxy.c:1821
-#: ../libpurple/proxy.c:1960
+#: ../libpurple/proxy.c:1561 ../libpurple/proxy.c:1591
+#: ../libpurple/proxy.c:1671 ../libpurple/proxy.c:1742
+#: ../libpurple/proxy.c:1843 ../libpurple/proxy.c:1982
 msgid "Received invalid data on connection with server"
 msgstr ""
 
@@ -10112,7 +10108,7 @@
 #: ../libpurple/protocols/oscar/libicq.c:162
 #: ../libpurple/protocols/yahoo/libyahoo.c:326
 #: ../libpurple/protocols/yahoo/libyahoojp.c:222
-#: ../libpurple/protocols/zephyr/zephyr.c:2997
+#: ../libpurple/protocols/zephyr/zephyr.c:2982
 msgid "Encoding"
 msgstr "Ukunxulumana"
 
@@ -10154,17 +10150,17 @@
 msgstr ""
 
 #: ../libpurple/protocols/oscar/oscar.c:157
-#: ../libpurple/protocols/oscar/oscar.c:4766
+#: ../libpurple/protocols/oscar/oscar.c:4771
 msgid "Free For Chat"
 msgstr "Ukukhululeka Ukuba ungaNcokola"
 
 #: ../libpurple/protocols/oscar/oscar.c:161
-#: ../libpurple/protocols/oscar/oscar.c:4848
+#: ../libpurple/protocols/oscar/oscar.c:4853
 msgid "Not Available"
 msgstr "Akufumaneki"
 
 #: ../libpurple/protocols/oscar/oscar.c:163
-#: ../libpurple/protocols/oscar/oscar.c:4834
+#: ../libpurple/protocols/oscar/oscar.c:4839
 msgid "Occupied"
 msgstr "Uxakekile"
 
@@ -10173,28 +10169,28 @@
 msgstr "Ukuqaphela iwebhu ye-Intanethi"
 
 #: ../libpurple/protocols/oscar/oscar.c:169
-#: ../libpurple/protocols/yahoo/libymsg.c:4087 ../libpurple/status.c:165
+#: ../libpurple/protocols/yahoo/libymsg.c:4100 ../libpurple/status.c:165
 #: ../pidgin/gtkdocklet.c:560 ../pidgin/gtkstatusbox.c:1099
 msgid "Invisible"
 msgstr "Engabonakaliyo"
 
 #: ../libpurple/protocols/oscar/oscar.c:171
-#: ../libpurple/protocols/oscar/oscar.c:4774
+#: ../libpurple/protocols/oscar/oscar.c:4779
 msgid "Evil"
 msgstr ""
 
 #: ../libpurple/protocols/oscar/oscar.c:173
-#: ../libpurple/protocols/oscar/oscar.c:4782
+#: ../libpurple/protocols/oscar/oscar.c:4787
 msgid "Depression"
 msgstr ""
 
 #: ../libpurple/protocols/oscar/oscar.c:175
-#: ../libpurple/protocols/oscar/oscar.c:4790
+#: ../libpurple/protocols/oscar/oscar.c:4795
 msgid "At home"
 msgstr ""
 
 #: ../libpurple/protocols/oscar/oscar.c:177
-#: ../libpurple/protocols/oscar/oscar.c:4798
+#: ../libpurple/protocols/oscar/oscar.c:4803
 msgid "At work"
 msgstr ""
 
@@ -10241,7 +10237,7 @@
 
 #: ../libpurple/protocols/oscar/oscar.c:896
 #: ../libpurple/protocols/oscar/oscar.c:937
-#: ../libpurple/protocols/oscar/oscar.c:1008
+#: ../libpurple/protocols/oscar/oscar.c:1010
 #, c-format
 msgid "You may be disconnected shortly.  If so, check %s for updates."
 msgstr ""
@@ -10251,35 +10247,35 @@
 msgid "Unable to get a valid AIM login hash."
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:1012
+#: ../libpurple/protocols/oscar/oscar.c:1014
 msgid "Unable to get a valid login hash."
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:1055
-#: ../libpurple/protocols/oscar/oscar.c:1174
+#: ../libpurple/protocols/oscar/oscar.c:1057
+#: ../libpurple/protocols/oscar/oscar.c:1176
 msgid "Received authorization"
 msgstr "Wamkele uGunyaziso"
 
 #. Unregistered username
 #. the username does not exist
-#: ../libpurple/protocols/oscar/oscar.c:1088
-#: ../libpurple/protocols/yahoo/libymsg.c:2120
-#: ../libpurple/protocols/yahoo/libymsg.c:2395
+#: ../libpurple/protocols/oscar/oscar.c:1090
+#: ../libpurple/protocols/yahoo/libymsg.c:2119
+#: ../libpurple/protocols/yahoo/libymsg.c:2410
 msgid "Username does not exist"
 msgstr ""
 
 #. Suspended account
-#: ../libpurple/protocols/oscar/oscar.c:1098
+#: ../libpurple/protocols/oscar/oscar.c:1100
 msgid "Your account is currently suspended"
 msgstr ""
 
 #. service temporarily unavailable
-#: ../libpurple/protocols/oscar/oscar.c:1103
+#: ../libpurple/protocols/oscar/oscar.c:1105
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr "Inkonzo yeAOL Instant Messenger ayifumaneki okwethutyana."
 
 #. username connecting too frequently
-#: ../libpurple/protocols/oscar/oscar.c:1107
+#: ../libpurple/protocols/oscar/oscar.c:1109
 msgid ""
 "Your username has been connecting and disconnecting too frequently. Wait ten "
 "minutes and try again. If you continue to try, you will need to wait even "
@@ -10287,41 +10283,41 @@
 msgstr ""
 
 #. client too old
-#: ../libpurple/protocols/oscar/oscar.c:1112
+#: ../libpurple/protocols/oscar/oscar.c:1114
 #, c-format
 msgid "The client version you are using is too old. Please upgrade at %s"
 msgstr ""
 "Inguqulelo umxumi ayisebenzisayo indala kakhulu. Nceda uyihlaziye e%s"
 
 #. IP address connecting too frequently
-#: ../libpurple/protocols/oscar/oscar.c:1119
+#: ../libpurple/protocols/oscar/oscar.c:1121
 msgid ""
 "Your IP address has been connecting and disconnecting too frequently. Wait a "
 "minute and try again. If you continue to try, you will need to wait even "
 "longer."
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:1202
+#: ../libpurple/protocols/oscar/oscar.c:1204
 msgid "The SecurID key entered is invalid"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:1218
+#: ../libpurple/protocols/oscar/oscar.c:1220
 msgid "Enter SecurID"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:1219
+#: ../libpurple/protocols/oscar/oscar.c:1221
 msgid "Enter the 6 digit number from the digital display."
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:1257
+#: ../libpurple/protocols/oscar/oscar.c:1259
 msgid "Password sent"
 msgstr "Ukuthunyelwa kwepassword"
 
-#: ../libpurple/protocols/oscar/oscar.c:1348
+#: ../libpurple/protocols/oscar/oscar.c:1350
 msgid "Unable to initialize connection"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:1962
+#: ../libpurple/protocols/oscar/oscar.c:1964
 #, c-format
 msgid ""
 "The user %u has denied your request to add them to your buddy list for the "
@@ -10332,18 +10328,18 @@
 "yezizathu ezilandelayo:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:1963
+#: ../libpurple/protocols/oscar/oscar.c:1965
 msgid "ICQ authorization denied."
 msgstr "UkuLandula uGunyaziso lweICQ."
 
 #. Someone has granted you authorization
-#: ../libpurple/protocols/oscar/oscar.c:1970
+#: ../libpurple/protocols/oscar/oscar.c:1972
 #, c-format
 msgid "The user %u has granted your request to add them to your buddy list."
 msgstr ""
 "Umsebenzisi %u usamkele isicelo sakho ukubongeza kuluhlu lwakho lobuhlobo."
 
-#: ../libpurple/protocols/oscar/oscar.c:1978
+#: ../libpurple/protocols/oscar/oscar.c:1980
 #, c-format
 msgid ""
 "You have received a special message\n"
@@ -10356,7 +10352,7 @@
 "Ovela: %s [%s]\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:1986
+#: ../libpurple/protocols/oscar/oscar.c:1988
 #, c-format
 msgid ""
 "You have received an ICQ page\n"
@@ -10369,7 +10365,7 @@
 "Ukuvela: %s [%s]\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:1994
+#: ../libpurple/protocols/oscar/oscar.c:1996
 #, c-format
 msgid ""
 "You have received an ICQ email from %s [%s]\n"
@@ -10382,32 +10378,32 @@
 "Umyalezo:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2028
+#: ../libpurple/protocols/oscar/oscar.c:2030
 #, c-format
 msgid "ICQ user %u has sent you a buddy: %s (%s)"
 msgstr "Umsebenzisi weICQ u-%u ukuthumelele umhlobo: %s (%s)"
 
-#: ../libpurple/protocols/oscar/oscar.c:2036
+#: ../libpurple/protocols/oscar/oscar.c:2038
 msgid "Do you want to add this buddy to your buddy list?"
 msgstr "Ingaba ufuna ukongeza lo mhlobo kuluhlu lwakho lomhlobo?"
 
-#: ../libpurple/protocols/oscar/oscar.c:2041 ../pidgin/gtkroomlist.c:325
+#: ../libpurple/protocols/oscar/oscar.c:2043 ../pidgin/gtkroomlist.c:325
 #: ../pidgin/plugins/disco/gtkdisco.c:694
 msgid "_Add"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:2042
+#: ../libpurple/protocols/oscar/oscar.c:2044
 msgid "_Decline"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:2190
+#: ../libpurple/protocols/oscar/oscar.c:2192
 #, 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] "Uphose %hu umyalezo ovela %s ngenxa yokuba ubungasebenzi."
 msgstr[1] "Uphose imiyalezo %hu evela ku %s ngenxa yokuba ibingasebenzi."
 
-#: ../libpurple/protocols/oscar/oscar.c:2199
+#: ../libpurple/protocols/oscar/oscar.c:2201
 #, 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."
@@ -10415,7 +10411,7 @@
 msgstr[1] ""
 "Uphose imiyalezo %hu evela ku %s ngenxa yokuba ibimikhulu kakhulu."
 
-#: ../libpurple/protocols/oscar/oscar.c:2208
+#: ../libpurple/protocols/oscar/oscar.c:2210
 #, c-format
 msgid ""
 "You missed %hu message from %s because the rate limit has been exceeded."
@@ -10426,7 +10422,7 @@
 msgstr[1] ""
 "Uphose imiyalezo %hu evela ku %s ngenxa yokuba ibigqitha imigangatho yemida."
 
-#: ../libpurple/protocols/oscar/oscar.c:2217
+#: ../libpurple/protocols/oscar/oscar.c:2219
 #, c-format
 msgid ""
 "You missed %hu message from %s because his/her warning level is too high."
@@ -10435,7 +10431,7 @@
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../libpurple/protocols/oscar/oscar.c:2226
+#: ../libpurple/protocols/oscar/oscar.c:2228
 #, c-format
 msgid ""
 "You missed %hu message from %s because your warning level is too high."
@@ -10444,89 +10440,89 @@
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../libpurple/protocols/oscar/oscar.c:2235
+#: ../libpurple/protocols/oscar/oscar.c:2237
 #, 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] "Uphose umyalezo %hu ovela ku %s ngenxa yesizathu esingaziwayo."
 msgstr[1] "Uphose imiyalezo %hu evela ku %s ngenxa yesizathu esingaziwayo."
 
-#: ../libpurple/protocols/oscar/oscar.c:2435
+#: ../libpurple/protocols/oscar/oscar.c:2437
 msgid "Your AIM connection may be lost."
 msgstr "Kunokwenzeka unxibelelwano lwakho no-AIM lulahlekile."
 
-#: ../libpurple/protocols/oscar/oscar.c:2771
+#: ../libpurple/protocols/oscar/oscar.c:2773
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "Uqhawuliwe kunxibelelwano negumbi lencoko %s."
 
-#: ../libpurple/protocols/oscar/oscar.c:2841
+#: ../libpurple/protocols/oscar/oscar.c:2843
 msgid "The new formatting is invalid."
 msgstr "Ulungiselelo olutsha alusebenzi."
 
-#: ../libpurple/protocols/oscar/oscar.c:2842
+#: ../libpurple/protocols/oscar/oscar.c:2844
 msgid "Username formatting can change only capitalization and whitespace."
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:2975
+#: ../libpurple/protocols/oscar/oscar.c:2978
 msgid "Pop-Up Message"
 msgstr "Umyalezo omFutshane oqhashumbayo"
 
-#: ../libpurple/protocols/oscar/oscar.c:3015
+#: ../libpurple/protocols/oscar/oscar.c:3018
 #, c-format
 msgid "The following username is associated with %s"
 msgid_plural "The following usernames are associated with %s"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../libpurple/protocols/oscar/oscar.c:3046
+#: ../libpurple/protocols/oscar/oscar.c:3049
 #, c-format
 msgid "No results found for email address %s"
 msgstr "Akukho ziphumo zifunyenweyo zedilesi ye-imeyile %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:3067
+#: ../libpurple/protocols/oscar/oscar.c:3070
 #, c-format
 msgid "You should receive an email asking to confirm %s."
 msgstr "Uza kufumana i-imeyile ecela ukuba ungqine %s."
 
-#: ../libpurple/protocols/oscar/oscar.c:3069
+#: ../libpurple/protocols/oscar/oscar.c:3072
 msgid "Account Confirmation Requested"
 msgstr "Isicelo sokuQinisekisa i-akhawunti"
 
-#: ../libpurple/protocols/oscar/oscar.c:3102
+#: ../libpurple/protocols/oscar/oscar.c:3105
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format username because the requested name differs "
 "from the original."
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:3104
+#: ../libpurple/protocols/oscar/oscar.c:3107
 #, c-format
 msgid "Error 0x%04x: Unable to format username because it is invalid."
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:3106
+#: ../libpurple/protocols/oscar/oscar.c:3109
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format username because the requested name is too "
 "long."
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:3108
+#: ../libpurple/protocols/oscar/oscar.c:3111
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change email address because there is already a "
 "request pending for this username."
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:3110
+#: ../libpurple/protocols/oscar/oscar.c:3113
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change email address because the given address has "
 "too many usernames associated with it."
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:3112
+#: ../libpurple/protocols/oscar/oscar.c:3115
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change email address because the given address is "
@@ -10535,36 +10531,36 @@
 "Impazamo 0x%04x: Akukwazeki ukutshintsha idilesi ye-imeyile ngenxa yokuba "
 "idilesi enikiweyo ayisebenzi."
 
-#: ../libpurple/protocols/oscar/oscar.c:3114
+#: ../libpurple/protocols/oscar/oscar.c:3117
 #, c-format
 msgid "Error 0x%04x: Unknown error."
 msgstr "Impazamo 0x%04x: Impazamo engaziwayo."
 
-#: ../libpurple/protocols/oscar/oscar.c:3116
+#: ../libpurple/protocols/oscar/oscar.c:3119
 msgid "Error Changing Account Info"
 msgstr "Impazamo Ukutshintsha Iinkcukacha ze-akhawunti"
 
-#: ../libpurple/protocols/oscar/oscar.c:3122
+#: ../libpurple/protocols/oscar/oscar.c:3125
 #, c-format
 msgid "The email address for %s is %s"
 msgstr "Idilesi ye-imeyili ye %s yile %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:3124
+#: ../libpurple/protocols/oscar/oscar.c:3127
 msgid "Account Info"
 msgstr "Ulwazi nge-akhawunti"
 
-#: ../libpurple/protocols/oscar/oscar.c:3312
+#: ../libpurple/protocols/oscar/oscar.c:3315
 msgid ""
 "Your IM Image was not sent. You must be Direct Connected to send IM Images."
 msgstr ""
 "UmFanekiso wakho we-IM awuthunyelwanga. Kufuneka ube uNxulumene Ngqo "
 "ukuthumela imiFanekiso yeIM."
 
-#: ../libpurple/protocols/oscar/oscar.c:3539
+#: ../libpurple/protocols/oscar/oscar.c:3542
 msgid "Unable to set AIM profile."
 msgstr "Akukwazeki ukuseka inkangeleko ye-AIM."
 
-#: ../libpurple/protocols/oscar/oscar.c:3540
+#: ../libpurple/protocols/oscar/oscar.c:3543
 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 "
@@ -10574,7 +10570,7 @@
 "yokungena.  Inkangeleko yakho ihlala ingasekwanga; zama ukuyiseka kwakhona "
 "xa unxibelelene ngokupheleleyo."
 
-#: ../libpurple/protocols/oscar/oscar.c:3554
+#: ../libpurple/protocols/oscar/oscar.c:3557
 #, c-format
 msgid ""
 "The maximum profile length of %d byte has been exceeded.  It has been "
@@ -10585,11 +10581,11 @@
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../libpurple/protocols/oscar/oscar.c:3559
+#: ../libpurple/protocols/oscar/oscar.c:3562
 msgid "Profile too long."
 msgstr "Inkangeleko inde kakhulu."
 
-#: ../libpurple/protocols/oscar/oscar.c:3588
+#: ../libpurple/protocols/oscar/oscar.c:3591
 #, c-format
 msgid ""
 "The maximum away message length of %d byte has been exceeded.  It has been "
@@ -10600,11 +10596,11 @@
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../libpurple/protocols/oscar/oscar.c:3593
+#: ../libpurple/protocols/oscar/oscar.c:3596
 msgid "Away message too long."
 msgstr "Umyalezo wokungabikho mde kakhulu."
 
-#: ../libpurple/protocols/oscar/oscar.c:3693
+#: ../libpurple/protocols/oscar/oscar.c:3696
 #, c-format
 msgid ""
 "Unable to add the buddy %s because the username is invalid.  Usernames must "
@@ -10612,65 +10608,65 @@
 "numbers and spaces, or contain only numbers."
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:3829
+#: ../libpurple/protocols/oscar/oscar.c:3832
 msgid "Unable to Retrieve Buddy List"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:3830
+#: ../libpurple/protocols/oscar/oscar.c:3833
 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 minutes."
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:4011
-#: ../libpurple/protocols/oscar/oscar.c:4013
-#: ../libpurple/protocols/oscar/oscar.c:4237
-#: ../libpurple/protocols/oscar/oscar.c:4238
+#: ../libpurple/protocols/oscar/oscar.c:4016
+#: ../libpurple/protocols/oscar/oscar.c:4018
+#: ../libpurple/protocols/oscar/oscar.c:4242
 #: ../libpurple/protocols/oscar/oscar.c:4243
+#: ../libpurple/protocols/oscar/oscar.c:4248
 msgid "Orphans"
 msgstr "Iinkedama"
 
-#: ../libpurple/protocols/oscar/oscar.c:4162
+#: ../libpurple/protocols/oscar/oscar.c:4167
 #, c-format
 msgid ""
 "Unable to 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:4162
-#: ../libpurple/protocols/oscar/oscar.c:4177
+#: ../libpurple/protocols/oscar/oscar.c:4167
+#: ../libpurple/protocols/oscar/oscar.c:4182
 msgid "(no name)"
 msgstr "(akukho gama)"
 
-#: ../libpurple/protocols/oscar/oscar.c:4176
+#: ../libpurple/protocols/oscar/oscar.c:4181
 #, c-format
 msgid "Unable to add the buddy %s for an unknown reason."
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:4293
+#: ../libpurple/protocols/oscar/oscar.c:4298
 #, c-format
 msgid ""
 "The user %s has given you permission to add him or her to your buddy list.  "
 "Do you want to add this user?"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:4301
+#: ../libpurple/protocols/oscar/oscar.c:4306
 msgid "Authorization Given"
 msgstr "Ugunyaziso lunikiwe"
 
 #. Granted
-#: ../libpurple/protocols/oscar/oscar.c:4364
+#: ../libpurple/protocols/oscar/oscar.c:4369
 #, c-format
 msgid "The user %s has granted your request to add them to your buddy list."
 msgstr ""
 "Umsebenzisi %s wamkele isicelo sakho sokubongeza kuluhlu lwakho lomhlobo."
 
-#: ../libpurple/protocols/oscar/oscar.c:4365
+#: ../libpurple/protocols/oscar/oscar.c:4370
 msgid "Authorization Granted"
 msgstr "Ugunyazilo luVunyelwe"
 
 #. Denied
-#: ../libpurple/protocols/oscar/oscar.c:4368
+#: ../libpurple/protocols/oscar/oscar.c:4373
 #, c-format
 msgid ""
 "The user %s has denied your request to add them to your buddy list for the "
@@ -10681,107 +10677,107 @@
 "ngenxa yesizathu esilandelayo:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:4369
+#: ../libpurple/protocols/oscar/oscar.c:4374
 msgid "Authorization Denied"
 msgstr "UGunyaziso luLandulwe"
 
-#: ../libpurple/protocols/oscar/oscar.c:4407
+#: ../libpurple/protocols/oscar/oscar.c:4412
 msgid "_Exchange:"
 msgstr "_Unaniselwano:"
 
-#: ../libpurple/protocols/oscar/oscar.c:4523
+#: ../libpurple/protocols/oscar/oscar.c:4528
 msgid "Your IM Image was not sent. You cannot send IM Images in AIM chats."
 msgstr ""
 "UmFanekiso wakho we-IM awuthunyelwanga. Awunakho ukuthumela imiFanekiso yeIM "
 "kwiincoko ze-AIM."
 
-#: ../libpurple/protocols/oscar/oscar.c:4760
+#: ../libpurple/protocols/oscar/oscar.c:4765
 msgid "iTunes Music Store Link"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:4807
+#: ../libpurple/protocols/oscar/oscar.c:4812
 msgid "Lunch"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:4928
+#: ../libpurple/protocols/oscar/oscar.c:4933
 #, c-format
 msgid "Buddy Comment for %s"
 msgstr "Izimvo zomHlobo nge %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:4929
+#: ../libpurple/protocols/oscar/oscar.c:4934
 msgid "Buddy Comment:"
 msgstr "Uluvo lomHlobo:"
 
-#: ../libpurple/protocols/oscar/oscar.c:4978
+#: ../libpurple/protocols/oscar/oscar.c:4983
 #, c-format
 msgid "You have selected to open a Direct IM connection with %s."
 msgstr "Ukhethe ukuvula unxulumano Ngqo noIM nge-%s."
 
-#: ../libpurple/protocols/oscar/oscar.c:4982
+#: ../libpurple/protocols/oscar/oscar.c:4987
 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:4988
-#: ../libpurple/protocols/oscar/peer.c:1065
+#: ../libpurple/protocols/oscar/oscar.c:4993
+#: ../libpurple/protocols/oscar/peer.c:1070
 msgid "C_onnect"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:5026
+#: ../libpurple/protocols/oscar/oscar.c:5031
 msgid "You closed the connection."
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:5086
+#: ../libpurple/protocols/oscar/oscar.c:5091
 msgid "Get AIM Info"
 msgstr ""
 
 #. We only do this if the user is in our buddy list
-#: ../libpurple/protocols/oscar/oscar.c:5095
+#: ../libpurple/protocols/oscar/oscar.c:5100
 msgid "Edit Buddy Comment"
 msgstr "Hlela uLuvo lomHlobo"
 
-#: ../libpurple/protocols/oscar/oscar.c:5103
+#: ../libpurple/protocols/oscar/oscar.c:5108
 msgid "Get X-Status Msg"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:5121
+#: ../libpurple/protocols/oscar/oscar.c:5126
 msgid "End Direct IM Session"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:5127
+#: ../libpurple/protocols/oscar/oscar.c:5132
 msgid "Direct IM"
 msgstr "I-IM ethe Ngqo"
 
-#: ../libpurple/protocols/oscar/oscar.c:5145
+#: ../libpurple/protocols/oscar/oscar.c:5150
 msgid "Re-request Authorization"
 msgstr "Ukwenza isicelo kwakhona soGunyaziso"
 
-#: ../libpurple/protocols/oscar/oscar.c:5204
+#: ../libpurple/protocols/oscar/oscar.c:5209
 msgid "Require authorization"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:5207
+#: ../libpurple/protocols/oscar/oscar.c:5212
 msgid "Web aware (enabling this will cause you to receive SPAM!)"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:5212
+#: ../libpurple/protocols/oscar/oscar.c:5217
 msgid "ICQ Privacy Options"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:5269
+#: ../libpurple/protocols/oscar/oscar.c:5274
 msgid "Change Address To:"
 msgstr "Tshintsha iDilesi ukuya ku:"
 
-#: ../libpurple/protocols/oscar/oscar.c:5302
+#: ../libpurple/protocols/oscar/oscar.c:5307
 msgid "you are not waiting for authorization"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:5305
+#: ../libpurple/protocols/oscar/oscar.c:5310
 msgid "You are awaiting authorization from the following buddies"
 msgstr "Ulindele ugunyaziso kubahlobo abalandelayo"
 
-#: ../libpurple/protocols/oscar/oscar.c:5306
+#: ../libpurple/protocols/oscar/oscar.c:5311
 msgid ""
 "You can re-request authorization from these buddies by right-clicking on "
 "them and selecting \"Re-request Authorization.\""
@@ -10789,100 +10785,100 @@
 "Ungacela ugunyaziso kwakhona kwaba bahlobo ngokucofa ngasekunene kubo "
 "nokukhetha \"Isicelo soGunyaziso Kwakhona.\""
 
-#: ../libpurple/protocols/oscar/oscar.c:5323
+#: ../libpurple/protocols/oscar/oscar.c:5328
 msgid "Find Buddy by Email"
 msgstr "Fumana umHlobo ngeI-meyile"
 
-#: ../libpurple/protocols/oscar/oscar.c:5324
+#: ../libpurple/protocols/oscar/oscar.c:5329
 msgid "Search for a buddy by email address"
 msgstr "Zingela umhlobo ngedilesi ye-imeyile"
 
-#: ../libpurple/protocols/oscar/oscar.c:5325
+#: ../libpurple/protocols/oscar/oscar.c:5330
 msgid "Type the email address of the buddy you are searching for."
 msgstr "Chwetheza idilesi ye-imeyile yomhlobo omzingelayo."
 
-#: ../libpurple/protocols/oscar/oscar.c:5486
+#: ../libpurple/protocols/oscar/oscar.c:5491
 msgid "Set User Info (web)..."
 msgstr ""
 
 #. This only happens when connecting with the old-style BUCP login
-#: ../libpurple/protocols/oscar/oscar.c:5498
+#: ../libpurple/protocols/oscar/oscar.c:5503
 msgid "Change Password (web)"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:5505
+#: ../libpurple/protocols/oscar/oscar.c:5510
 msgid "Configure IM Forwarding (web)"
 msgstr ""
 
 #. ICQ actions
-#: ../libpurple/protocols/oscar/oscar.c:5515
+#: ../libpurple/protocols/oscar/oscar.c:5520
 msgid "Set Privacy Options..."
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:5519
+#: ../libpurple/protocols/oscar/oscar.c:5524
 msgid "Show Visible List"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:5522
+#: ../libpurple/protocols/oscar/oscar.c:5527
 msgid "Show Invisible List"
 msgstr ""
 
 #. AIM actions
-#: ../libpurple/protocols/oscar/oscar.c:5528
+#: ../libpurple/protocols/oscar/oscar.c:5533
 msgid "Confirm Account"
 msgstr "Qinisekisa i-Akhawunti"
 
-#: ../libpurple/protocols/oscar/oscar.c:5532
+#: ../libpurple/protocols/oscar/oscar.c:5537
 msgid "Display Currently Registered Email Address"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:5536
+#: ../libpurple/protocols/oscar/oscar.c:5541
 msgid "Change Currently Registered Email Address..."
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:5543
+#: ../libpurple/protocols/oscar/oscar.c:5548
 msgid "Show Buddies Awaiting Authorization"
 msgstr "Bonisa Abahlobo abaLindele uGunyaziso"
 
-#: ../libpurple/protocols/oscar/oscar.c:5549
+#: ../libpurple/protocols/oscar/oscar.c:5554
 msgid "Search for Buddy by Email Address..."
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:5764
+#: ../libpurple/protocols/oscar/oscar.c:5769
 msgid "Use clientLogin"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:5769
+#: ../libpurple/protocols/oscar/oscar.c:5774
 msgid ""
 "Always use AIM/ICQ proxy server for\n"
 "file transfers and direct IM (slower,\n"
 "but does not reveal your IP address)"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:5774
+#: ../libpurple/protocols/oscar/oscar.c:5779
 msgid "Allow multiple simultaneous logins"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/peer.c:715
+#: ../libpurple/protocols/oscar/peer.c:720
 #, c-format
 msgid "Asking %s to connect to us at %s:%hu for Direct IM."
 msgstr "Ukucela %s to connect to us at %s:%hu IM ethe Ngqo."
 
-#: ../libpurple/protocols/oscar/peer.c:800
+#: ../libpurple/protocols/oscar/peer.c:805
 #, c-format
 msgid "Attempting to connect to %s:%hu."
 msgstr ""
 
-#: ../libpurple/protocols/oscar/peer.c:874
+#: ../libpurple/protocols/oscar/peer.c:879
 msgid "Attempting to connect via proxy server."
 msgstr ""
 
-#: ../libpurple/protocols/oscar/peer.c:1053
+#: ../libpurple/protocols/oscar/peer.c:1058
 #, c-format
 msgid "%s has just asked to directly connect to %s"
 msgstr "%s usandula ukucela ukunxulumana ngqo no %s"
 
-#: ../libpurple/protocols/oscar/peer.c:1057
+#: ../libpurple/protocols/oscar/peer.c:1062
 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 "
@@ -10893,7 +10889,7 @@
 "oku kunokuba ngumngcipheko wemfihlio."
 
 #. Label
-#: ../libpurple/protocols/oscar/userinfo.c:43 ../pidgin/gtkutils.c:2310
+#: ../libpurple/protocols/oscar/userinfo.c:43 ../pidgin/gtkutils.c:2302
 #: ../pidgin/plugins/gevolution/new_person_dialog.c:331
 msgid "Buddy Icon"
 msgstr "UmFanekiso ongumQondiso womHlobo"
@@ -10988,8 +10984,8 @@
 msgstr ""
 
 #: ../libpurple/protocols/oscar/userinfo.c:344
-#: ../libpurple/protocols/oscar/userinfo.c:409
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:720 ../pidgin/gtkprefs.c:1748
+#: ../libpurple/protocols/oscar/userinfo.c:408
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:720 ../pidgin/gtkprefs.c:1742
 msgid "IP Address"
 msgstr "Idilesi ye-IP"
 
@@ -11006,53 +11002,53 @@
 msgid "User information not available: %s"
 msgstr "Ulwazi lomsebenzisi alufumaneki kwi: %s"
 
-#: ../libpurple/protocols/oscar/userinfo.c:421
-#: ../libpurple/protocols/silc/util.c:541
+#: ../libpurple/protocols/oscar/userinfo.c:420
+#: ../libpurple/protocols/silc/util.c:592
 #: ../libpurple/protocols/silc10/util.c:586
 msgid "Mobile Phone"
 msgstr "Ifowuni ohamba nayo"
 
-#: ../libpurple/protocols/oscar/userinfo.c:452
+#: ../libpurple/protocols/oscar/userinfo.c:451
 msgid "Personal Web Page"
 msgstr "Iphepha leWebhu ye-intanethi lakho buqu"
 
 #. aim_userinfo_t
 #. use_html_status
-#: ../libpurple/protocols/oscar/userinfo.c:456
+#: ../libpurple/protocols/oscar/userinfo.c:455
 msgid "Additional Information"
 msgstr "Ulwazi olongezelelweyo"
 
-#: ../libpurple/protocols/oscar/userinfo.c:465
-#: ../libpurple/protocols/oscar/userinfo.c:473
+#: ../libpurple/protocols/oscar/userinfo.c:464
+#: ../libpurple/protocols/oscar/userinfo.c:472
 msgid "Zip Code"
 msgstr "Ikhowudi yeNdawo"
 
-#: ../libpurple/protocols/oscar/userinfo.c:476
+#: ../libpurple/protocols/oscar/userinfo.c:475
 msgid "Work Information"
 msgstr "Iinkcukacha ngoMsebenzi"
 
-#: ../libpurple/protocols/oscar/userinfo.c:479
+#: ../libpurple/protocols/oscar/userinfo.c:478
 msgid "Division"
 msgstr "Icandelo"
 
-#: ../libpurple/protocols/oscar/userinfo.c:480
+#: ../libpurple/protocols/oscar/userinfo.c:479
 msgid "Position"
 msgstr "Isikhundla"
 
-#: ../libpurple/protocols/oscar/userinfo.c:481
+#: ../libpurple/protocols/oscar/userinfo.c:480
 msgid "Web Page"
 msgstr "IPhepha leWebhu ye-intanethi"
 
-#: ../libpurple/protocols/oscar/userinfo.c:509
+#: ../libpurple/protocols/oscar/userinfo.c:508
 msgid "Online Since"
 msgstr "Kunxibelelwano ukusuka"
 
-#: ../libpurple/protocols/oscar/userinfo.c:514
+#: ../libpurple/protocols/oscar/userinfo.c:513
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1184
 msgid "Member Since"
 msgstr "Lilungu ukusukela"
 
-#: ../libpurple/protocols/oscar/userinfo.c:519
+#: ../libpurple/protocols/oscar/userinfo.c:518
 msgid "Capabilities"
 msgstr "Izakhono"
 
@@ -11152,8 +11148,8 @@
 #. you to appear online to the chosen user even when your status is set to
 #. Invisible.
 #: ../libpurple/protocols/oscar/visibility.c:26
-#: ../libpurple/protocols/yahoo/libymsg.c:4231
-#: ../libpurple/protocols/yahoo/libymsg.c:4307
+#: ../libpurple/protocols/yahoo/libymsg.c:4244
+#: ../libpurple/protocols/yahoo/libymsg.c:4320
 msgid "Appear Online"
 msgstr ""
 
@@ -11168,7 +11164,7 @@
 #. you to always appear offline to the chosen user (even when your status
 #. isn't Invisible).
 #: ../libpurple/protocols/oscar/visibility.c:36
-#: ../libpurple/protocols/yahoo/libymsg.c:4313
+#: ../libpurple/protocols/yahoo/libymsg.c:4326
 msgid "Appear Offline"
 msgstr "Ukubonakala kungekho nxibelelwano"
 
@@ -11226,136 +11222,136 @@
 msgid "Notes Address Book Information"
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:1355
+#: ../libpurple/protocols/sametime/sametime.c:1357
 msgid "Invite Group to Conference..."
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:1365
+#: ../libpurple/protocols/sametime/sametime.c:1367
 msgid "Get Notes Address Book Info"
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:1536
+#: ../libpurple/protocols/sametime/sametime.c:1538
 msgid "Sending Handshake"
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:1541
+#: ../libpurple/protocols/sametime/sametime.c:1543
 msgid "Waiting for Handshake Acknowledgement"
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:1546
+#: ../libpurple/protocols/sametime/sametime.c:1548
 msgid "Handshake Acknowledged, Sending Login"
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:1551
+#: ../libpurple/protocols/sametime/sametime.c:1553
 msgid "Waiting for Login Acknowledgement"
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:1556
+#: ../libpurple/protocols/sametime/sametime.c:1558
 msgid "Login Redirected"
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:1562
+#: ../libpurple/protocols/sametime/sametime.c:1564
 msgid "Forcing Login"
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:1567
+#: ../libpurple/protocols/sametime/sametime.c:1568
 msgid "Login Acknowledged"
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:1572
+#: ../libpurple/protocols/sametime/sametime.c:1573
 msgid "Starting Services"
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:1709
+#: ../libpurple/protocols/sametime/sametime.c:1710
 #, c-format
 msgid ""
 "A Sametime administrator has issued the following announcement on server %s"
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:1714
+#: ../libpurple/protocols/sametime/sametime.c:1715
 msgid "Sametime Administrator Announcement"
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:1846
+#: ../libpurple/protocols/sametime/sametime.c:1847
 #, c-format
 msgid "Announcement from %s"
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:2020
+#: ../libpurple/protocols/sametime/sametime.c:2021
 msgid "Conference Closed"
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:2468
+#: ../libpurple/protocols/sametime/sametime.c:2486
 msgid "Unable to send message: "
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:2474
+#: ../libpurple/protocols/sametime/sametime.c:2492
 #, c-format
 msgid "Unable to send message to %s:"
 msgstr "Akukwazeki ukuthumela umyalezo kwi-%s:"
 
-#: ../libpurple/protocols/sametime/sametime.c:3024
+#: ../libpurple/protocols/sametime/sametime.c:3042
 msgid "Place Closed"
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:3276
+#: ../libpurple/protocols/sametime/sametime.c:3312
 msgid "Microphone"
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:3277
+#: ../libpurple/protocols/sametime/sametime.c:3313
 msgid "Speakers"
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:3278
+#: ../libpurple/protocols/sametime/sametime.c:3314
 msgid "Video Camera"
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:3282
+#: ../libpurple/protocols/sametime/sametime.c:3318
 msgid "File Transfer"
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:3316
-#: ../libpurple/protocols/sametime/sametime.c:4156
+#: ../libpurple/protocols/sametime/sametime.c:3352
+#: ../libpurple/protocols/sametime/sametime.c:4192
 msgid "Supports"
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:3321
-#: ../libpurple/protocols/sametime/sametime.c:4130
+#: ../libpurple/protocols/sametime/sametime.c:3357
+#: ../libpurple/protocols/sametime/sametime.c:4166
 msgid "External User"
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:3427
+#: ../libpurple/protocols/sametime/sametime.c:3463
 msgid "Create conference with user"
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:3428
+#: ../libpurple/protocols/sametime/sametime.c:3464
 #, c-format
 msgid ""
 "Please enter a topic for the new conference, and an invitation message to be "
 "sent to %s"
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:3432
+#: ../libpurple/protocols/sametime/sametime.c:3468
 msgid "New Conference"
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:3434
+#: ../libpurple/protocols/sametime/sametime.c:3470
 msgid "Create"
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:3499
+#: ../libpurple/protocols/sametime/sametime.c:3535
 msgid "Available Conferences"
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:3505
+#: ../libpurple/protocols/sametime/sametime.c:3541
 msgid "Create New Conference..."
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:3512
+#: ../libpurple/protocols/sametime/sametime.c:3548
 msgid "Invite user to a conference"
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:3513
+#: ../libpurple/protocols/sametime/sametime.c:3549
 #, c-format
 msgid ""
 "Select a conference from the list below to send an invite to user %s. Select "
@@ -11363,135 +11359,135 @@
 "this user to."
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:3518
+#: ../libpurple/protocols/sametime/sametime.c:3554
 msgid "Invite to Conference"
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:3609
+#: ../libpurple/protocols/sametime/sametime.c:3645
 msgid "Invite to Conference..."
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:3614
+#: ../libpurple/protocols/sametime/sametime.c:3650
 msgid "Send TEST Announcement"
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:3633 ../pidgin/gtkconv.c:4681
+#: ../libpurple/protocols/sametime/sametime.c:3669 ../pidgin/gtkconv.c:4681
 msgid "Topic:"
 msgstr "isiHloko:"
 
-#: ../libpurple/protocols/sametime/sametime.c:3693
+#: ../libpurple/protocols/sametime/sametime.c:3729
 msgid "A server is required to connect this account"
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:4146
+#: ../libpurple/protocols/sametime/sametime.c:4182
 #, c-format
 msgid "Unknown (0x%04x)<br>"
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:4148
+#: ../libpurple/protocols/sametime/sametime.c:4184
 msgid "Last Known Client"
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:4312
-#: ../libpurple/protocols/sametime/sametime.c:5529
+#: ../libpurple/protocols/sametime/sametime.c:4348
+#: ../libpurple/protocols/sametime/sametime.c:5565
 msgid "User Name"
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:4315
-#: ../libpurple/protocols/sametime/sametime.c:5532
+#: ../libpurple/protocols/sametime/sametime.c:4351
+#: ../libpurple/protocols/sametime/sametime.c:5568
 msgid "Sametime ID"
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:4339
+#: ../libpurple/protocols/sametime/sametime.c:4375
 msgid "An ambiguous user ID was entered"
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:4340
+#: ../libpurple/protocols/sametime/sametime.c:4376
 #, 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:4345
+#: ../libpurple/protocols/sametime/sametime.c:4381
 msgid "Select User"
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:4429
+#: ../libpurple/protocols/sametime/sametime.c:4465
 msgid "Unable to add user: user not found"
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:4431
+#: ../libpurple/protocols/sametime/sametime.c:4467
 #, 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:5020
+#: ../libpurple/protocols/sametime/sametime.c:5056
 #, c-format
 msgid ""
 "Error reading file %s: \n"
 "%s\n"
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:5169
+#: ../libpurple/protocols/sametime/sametime.c:5205
 msgid "Remotely Stored Buddy List"
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:5174
+#: ../libpurple/protocols/sametime/sametime.c:5210
 msgid "Buddy List Storage Mode"
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:5177
+#: ../libpurple/protocols/sametime/sametime.c:5213
 msgid "Local Buddy List Only"
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:5179
+#: ../libpurple/protocols/sametime/sametime.c:5215
 msgid "Merge List from Server"
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:5181
+#: ../libpurple/protocols/sametime/sametime.c:5217
 msgid "Merge and Save List to Server"
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:5183
+#: ../libpurple/protocols/sametime/sametime.c:5219
 msgid "Synchronize List with Server"
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:5238
+#: ../libpurple/protocols/sametime/sametime.c:5274
 #, c-format
 msgid "Import Sametime List for Account %s"
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:5278
+#: ../libpurple/protocols/sametime/sametime.c:5314
 #, c-format
 msgid "Export Sametime List for Account %s"
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:5332
+#: ../libpurple/protocols/sametime/sametime.c:5368
 msgid "Unable to add group: group exists"
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:5333
+#: ../libpurple/protocols/sametime/sametime.c:5369
 #, c-format
 msgid "A group named '%s' already exists in your buddy list."
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:5336
-#: ../libpurple/protocols/sametime/sametime.c:5466
+#: ../libpurple/protocols/sametime/sametime.c:5372
+#: ../libpurple/protocols/sametime/sametime.c:5502
 msgid "Unable to add group"
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:5395
+#: ../libpurple/protocols/sametime/sametime.c:5431
 msgid "Possible Matches"
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:5411
+#: ../libpurple/protocols/sametime/sametime.c:5447
 msgid "Notes Address Book group results"
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:5412
+#: ../libpurple/protocols/sametime/sametime.c:5448
 #, c-format
 msgid ""
 "The identifier '%s' may possibly refer to any of the following Notes Address "
@@ -11499,37 +11495,37 @@
 "to your buddy list."
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:5417
+#: ../libpurple/protocols/sametime/sametime.c:5453
 msgid "Select Notes Address Book"
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:5460
+#: ../libpurple/protocols/sametime/sametime.c:5496
 msgid "Unable to add group: group not found"
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:5462
+#: ../libpurple/protocols/sametime/sametime.c:5498
 #, c-format
 msgid ""
 "The identifier '%s' did not match any Notes Address Book groups in your "
 "Sametime community."
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:5503
+#: ../libpurple/protocols/sametime/sametime.c:5539
 msgid "Notes Address Book Group"
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:5504
+#: ../libpurple/protocols/sametime/sametime.c:5540
 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:5553
+#: ../libpurple/protocols/sametime/sametime.c:5589
 #, c-format
 msgid "Search results for '%s'"
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:5554
+#: ../libpurple/protocols/sametime/sametime.c:5590
 #, c-format
 msgid ""
 "The identifier '%s' may possibly refer to any of the following users. You "
@@ -11537,60 +11533,60 @@
 "buttons below."
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:5561 ../pidgin/gtknotify.c:972
+#: ../libpurple/protocols/sametime/sametime.c:5597 ../pidgin/gtknotify.c:972
 msgid "Search Results"
 msgstr "Khangela iziPhumo"
 
-#: ../libpurple/protocols/sametime/sametime.c:5586
+#: ../libpurple/protocols/sametime/sametime.c:5622
 msgid "No matches"
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:5587
+#: ../libpurple/protocols/sametime/sametime.c:5623
 #, c-format
 msgid ""
 "The identifier '%s' did not match any users in your Sametime community."
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:5591
+#: ../libpurple/protocols/sametime/sametime.c:5627
 msgid "No Matches"
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:5628
+#: ../libpurple/protocols/sametime/sametime.c:5664
 msgid "Search for a user"
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:5629
+#: ../libpurple/protocols/sametime/sametime.c:5665
 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:5632
+#: ../libpurple/protocols/sametime/sametime.c:5668
 msgid "User Search"
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:5645
+#: ../libpurple/protocols/sametime/sametime.c:5681
 msgid "Import Sametime List..."
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:5649
+#: ../libpurple/protocols/sametime/sametime.c:5685
 msgid "Export Sametime List..."
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:5653
+#: ../libpurple/protocols/sametime/sametime.c:5689
 msgid "Add Notes Address Book Group..."
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:5657
+#: ../libpurple/protocols/sametime/sametime.c:5693
 msgid "User Search..."
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:5764
+#: ../libpurple/protocols/sametime/sametime.c:5800
 msgid "Force login (ignore server redirects)"
 msgstr ""
 
 #. pretend to be Sametime Connect
-#: ../libpurple/protocols/sametime/sametime.c:5774
+#: ../libpurple/protocols/sametime/sametime.c:5810
 msgid "Hide client identity"
 msgstr ""
 
@@ -11721,8 +11717,8 @@
 #: ../libpurple/protocols/silc/buddy.c:500
 #: ../libpurple/protocols/silc/buddy.c:511
 #: ../libpurple/protocols/silc/buddy.c:544
-#: ../libpurple/protocols/silc/ops.c:1514
-#: ../libpurple/protocols/silc/ops.c:1525
+#: ../libpurple/protocols/silc/ops.c:1515
+#: ../libpurple/protocols/silc/ops.c:1526
 #: ../libpurple/protocols/silc10/buddy.c:513
 #: ../libpurple/protocols/silc10/buddy.c:548
 #: ../libpurple/protocols/silc10/ops.c:1494
@@ -11731,8 +11727,8 @@
 msgstr "Fumana isiTshixo soLuntu"
 
 #: ../libpurple/protocols/silc/buddy.c:545
-#: ../libpurple/protocols/silc/ops.c:1515
-#: ../libpurple/protocols/silc/ops.c:1526
+#: ../libpurple/protocols/silc/ops.c:1516
+#: ../libpurple/protocols/silc/ops.c:1527
 #: ../libpurple/protocols/silc10/buddy.c:549
 #: ../libpurple/protocols/silc10/ops.c:1495
 #: ../libpurple/protocols/silc10/ops.c:1506
@@ -11740,14 +11736,14 @@
 msgstr "Akukwazeki ukulanda iqhosa likawonke-wonke"
 
 #: ../libpurple/protocols/silc/buddy.c:626
-#: ../libpurple/protocols/silc/buddy.c:1662
+#: ../libpurple/protocols/silc/buddy.c:1668
 #: ../libpurple/protocols/silc10/buddy.c:635
 #: ../libpurple/protocols/silc10/buddy.c:1674
 msgid "Show Public Key"
 msgstr "Bonisa isiTshixo soLuntu"
 
 #: ../libpurple/protocols/silc/buddy.c:627
-#: ../libpurple/protocols/silc/buddy.c:1029
+#: ../libpurple/protocols/silc/buddy.c:1035
 #: ../libpurple/protocols/silc/chat.c:241
 #: ../libpurple/protocols/silc10/buddy.c:636
 #: ../libpurple/protocols/silc10/buddy.c:1036
@@ -11756,11 +11752,11 @@
 msgstr "Akukwazekanga ukufaka iqhosha likawonke-wonke"
 
 #: ../libpurple/protocols/silc/buddy.c:706
-#: ../libpurple/protocols/silc/ops.c:1064
-#: ../libpurple/protocols/silc/ops.c:1179
-#: ../libpurple/protocols/silc/ops.c:1301
+#: ../libpurple/protocols/silc/ops.c:1065
+#: ../libpurple/protocols/silc/ops.c:1180
 #: ../libpurple/protocols/silc/ops.c:1302
-#: ../libpurple/protocols/silc/ops.c:1320
+#: ../libpurple/protocols/silc/ops.c:1303
+#: ../libpurple/protocols/silc/ops.c:1321
 #: ../libpurple/protocols/silc10/buddy.c:713
 #: ../libpurple/protocols/silc10/ops.c:1087
 #: ../libpurple/protocols/silc10/ops.c:1159
@@ -11771,8 +11767,8 @@
 msgstr "Ulwazi lomSebenzisi"
 
 #: ../libpurple/protocols/silc/buddy.c:707
-#: ../libpurple/protocols/silc/ops.c:1180
-#: ../libpurple/protocols/silc/ops.c:1321
+#: ../libpurple/protocols/silc/ops.c:1181
+#: ../libpurple/protocols/silc/ops.c:1322
 #: ../libpurple/protocols/silc10/buddy.c:714
 #: ../libpurple/protocols/silc10/ops.c:1160
 #: ../libpurple/protocols/silc10/ops.c:1314
@@ -11796,18 +11792,18 @@
 "ufumane iqhosha likawonke-wonke."
 
 #. Open file selector to select the public key.
-#: ../libpurple/protocols/silc/buddy.c:1061
+#: ../libpurple/protocols/silc/buddy.c:1067
 #: ../libpurple/protocols/silc10/buddy.c:1070
 msgid "Open..."
 msgstr "Evulekileyo..."
 
-#: ../libpurple/protocols/silc/buddy.c:1072
+#: ../libpurple/protocols/silc/buddy.c:1078
 #: ../libpurple/protocols/silc10/buddy.c:1081
 #, c-format
 msgid "The %s buddy is not present in the network"
 msgstr "Umhlobo %s akekho kuthungelwano"
 
-#: ../libpurple/protocols/silc/buddy.c:1075
+#: ../libpurple/protocols/silc/buddy.c:1081
 #: ../libpurple/protocols/silc10/buddy.c:1084
 msgid ""
 "To add the buddy you must import his/her public key. Press Import to import "
@@ -11816,17 +11812,17 @@
 "Ukuze wongeze umhlobo kufuneka ungenise iqhosha lakhe likawonke-wonke. Cofa "
 "uNgenisa ukungenisa iqhosha likawonke-wonke."
 
-#: ../libpurple/protocols/silc/buddy.c:1079
+#: ../libpurple/protocols/silc/buddy.c:1085
 #: ../libpurple/protocols/silc10/buddy.c:1088
 msgid "_Import..."
 msgstr ""
 
-#: ../libpurple/protocols/silc/buddy.c:1185
+#: ../libpurple/protocols/silc/buddy.c:1191
 #: ../libpurple/protocols/silc10/buddy.c:1184
 msgid "Select correct user"
 msgstr "Khetha umsebenzisi ochanekileyo"
 
-#: ../libpurple/protocols/silc/buddy.c:1187
+#: ../libpurple/protocols/silc/buddy.c:1193
 #: ../libpurple/protocols/silc10/buddy.c:1186
 msgid ""
 "More than one user was found with the same public key. Select the correct "
@@ -11836,7 +11832,7 @@
 "likawonke-wonke. Khetha umsebenzisi ochanekileyo kuluhlu ukongeza kuluhlu "
 "lwakho lomhlobo."
 
-#: ../libpurple/protocols/silc/buddy.c:1189
+#: ../libpurple/protocols/silc/buddy.c:1195
 #: ../libpurple/protocols/silc10/buddy.c:1188
 msgid ""
 "More than one user was found with the same name. Select the correct user "
@@ -11845,67 +11841,67 @@
 "Kufunyenwe umsebenzisi ongaphaya komnye enegama elifanayo. Khetha "
 "umsebenzisi ochanekileyo kuluhlu ukongeza kuluhlu lwakho lobuhlobo."
 
-#: ../libpurple/protocols/silc/buddy.c:1481
+#: ../libpurple/protocols/silc/buddy.c:1487
 #: ../libpurple/protocols/silc10/buddy.c:1494
 msgid "Detached"
 msgstr "Ohlukanisiweyo"
 
-#: ../libpurple/protocols/silc/buddy.c:1485
+#: ../libpurple/protocols/silc/buddy.c:1491
 #: ../libpurple/protocols/silc/silc.c:60
 #: ../libpurple/protocols/silc10/buddy.c:1498
 #: ../libpurple/protocols/silc10/silc.c:50
 msgid "Indisposed"
 msgstr "Ongaphilanga"
 
-#: ../libpurple/protocols/silc/buddy.c:1489
+#: ../libpurple/protocols/silc/buddy.c:1495
 #: ../libpurple/protocols/silc/silc.c:62
 #: ../libpurple/protocols/silc10/buddy.c:1502
 #: ../libpurple/protocols/silc10/silc.c:52
 msgid "Wake Me Up"
 msgstr "Ndivuse"
 
-#: ../libpurple/protocols/silc/buddy.c:1491
+#: ../libpurple/protocols/silc/buddy.c:1497
 #: ../libpurple/protocols/silc/silc.c:54
 #: ../libpurple/protocols/silc10/buddy.c:1504
 #: ../libpurple/protocols/silc10/silc.c:44
 msgid "Hyper Active"
 msgstr "Okhuthele Gqitha"
 
-#: ../libpurple/protocols/silc/buddy.c:1493
+#: ../libpurple/protocols/silc/buddy.c:1499
 #: ../libpurple/protocols/silc10/buddy.c:1506
 msgid "Robot"
 msgstr "Irobothi"
 
-#: ../libpurple/protocols/silc/buddy.c:1551
-#: ../libpurple/protocols/silc/ops.c:1218
+#: ../libpurple/protocols/silc/buddy.c:1557
+#: ../libpurple/protocols/silc/ops.c:1219
 #: ../libpurple/protocols/silc10/buddy.c:1565
 #: ../libpurple/protocols/silc10/ops.c:1202
 msgid "User Modes"
 msgstr "Izimo zomSebenzisi"
 
-#: ../libpurple/protocols/silc/buddy.c:1568
-#: ../libpurple/protocols/silc/ops.c:1235
+#: ../libpurple/protocols/silc/buddy.c:1574
+#: ../libpurple/protocols/silc/ops.c:1236
 #: ../libpurple/protocols/silc10/buddy.c:1582
 #: ../libpurple/protocols/silc10/ops.c:1219
 msgid "Preferred Contact"
 msgstr "Indibano eKhethekayo"
 
-#: ../libpurple/protocols/silc/buddy.c:1573
-#: ../libpurple/protocols/silc/ops.c:1240
+#: ../libpurple/protocols/silc/buddy.c:1579
+#: ../libpurple/protocols/silc/ops.c:1241
 #: ../libpurple/protocols/silc10/buddy.c:1587
 #: ../libpurple/protocols/silc10/ops.c:1224
 msgid "Preferred Language"
 msgstr "Ulwimi oluKhethwayo"
 
-#: ../libpurple/protocols/silc/buddy.c:1578
-#: ../libpurple/protocols/silc/ops.c:1245
+#: ../libpurple/protocols/silc/buddy.c:1584
+#: ../libpurple/protocols/silc/ops.c:1246
 #: ../libpurple/protocols/silc10/buddy.c:1592
 #: ../libpurple/protocols/silc10/ops.c:1229
 msgid "Device"
 msgstr "isiXhobo"
 
-#: ../libpurple/protocols/silc/buddy.c:1583
-#: ../libpurple/protocols/silc/ops.c:1250
+#: ../libpurple/protocols/silc/buddy.c:1589
+#: ../libpurple/protocols/silc/ops.c:1251
 #: ../libpurple/protocols/silc10/buddy.c:1597
 #: ../libpurple/protocols/silc10/ops.c:1234
 #: ../libpurple/protocols/silc10/silc.c:747
@@ -11913,41 +11909,41 @@
 msgid "Timezone"
 msgstr "Ixesha lamazwe ngamazwe"
 
-#: ../libpurple/protocols/silc/buddy.c:1588
-#: ../libpurple/protocols/silc/ops.c:1255
+#: ../libpurple/protocols/silc/buddy.c:1594
+#: ../libpurple/protocols/silc/ops.c:1256
 #: ../libpurple/protocols/silc10/buddy.c:1602
 #: ../libpurple/protocols/silc10/ops.c:1239
 msgid "Geolocation"
 msgstr "Indawo ngokwejografi"
 
-#: ../libpurple/protocols/silc/buddy.c:1645
+#: ../libpurple/protocols/silc/buddy.c:1651
 #: ../libpurple/protocols/silc10/buddy.c:1656
 msgid "Reset IM Key"
 msgstr "Ukumisela kwakhona isiTshixo se-IM"
 
-#: ../libpurple/protocols/silc/buddy.c:1650
+#: ../libpurple/protocols/silc/buddy.c:1656
 #: ../libpurple/protocols/silc10/buddy.c:1662
 msgid "IM with Key Exchange"
 msgstr "Unaniselwano oluPhambili neIM"
 
-#: ../libpurple/protocols/silc/buddy.c:1655
+#: ../libpurple/protocols/silc/buddy.c:1661
 #: ../libpurple/protocols/silc10/buddy.c:1667
 msgid "IM with Password"
 msgstr "I-IM nePassword"
 
-#: ../libpurple/protocols/silc/buddy.c:1668
+#: ../libpurple/protocols/silc/buddy.c:1674
 #: ../libpurple/protocols/silc10/buddy.c:1680
 msgid "Get Public Key..."
 msgstr "Fumana isiTshixo soLuntu..."
 
-#: ../libpurple/protocols/silc/buddy.c:1675
-#: ../libpurple/protocols/silc/ops.c:1623
+#: ../libpurple/protocols/silc/buddy.c:1681
+#: ../libpurple/protocols/silc/ops.c:1624
 #: ../libpurple/protocols/silc10/buddy.c:1687
 #: ../libpurple/protocols/silc10/ops.c:1624
 msgid "Kill User"
 msgstr "Tshabalalisa Umsebenzisi"
 
-#: ../libpurple/protocols/silc/buddy.c:1685
+#: ../libpurple/protocols/silc/buddy.c:1691
 #: ../libpurple/protocols/silc/chat.c:1004
 #: ../libpurple/protocols/silc10/buddy.c:1697
 #: ../libpurple/protocols/silc10/chat.c:977
@@ -12096,7 +12092,7 @@
 msgstr "iGama leQela"
 
 #: ../libpurple/protocols/silc/chat.c:607
-#: ../libpurple/protocols/silc/ops.c:1828
+#: ../libpurple/protocols/silc/ops.c:1829
 #: ../libpurple/protocols/silc/silc.c:1260
 #: ../libpurple/protocols/silc10/chat.c:585
 #: ../libpurple/protocols/silc10/ops.c:1907
@@ -12306,8 +12302,8 @@
 msgid "Error occurred"
 msgstr ""
 
-#: ../libpurple/protocols/silc/ops.c:558 ../libpurple/protocols/silc/ops.c:567
-#: ../libpurple/protocols/silc/ops.c:576
+#: ../libpurple/protocols/silc/ops.c:560 ../libpurple/protocols/silc/ops.c:569
+#: ../libpurple/protocols/silc/ops.c:578
 #: ../libpurple/protocols/silc10/ops.c:554
 #: ../libpurple/protocols/silc10/ops.c:563
 #: ../libpurple/protocols/silc10/ops.c:572
@@ -12315,38 +12311,38 @@
 msgid "%s has changed the topic of <I>%s</I> to: %s"
 msgstr "%s utshintshe isihloko se <I>%s</I> ukuba: %s"
 
-#: ../libpurple/protocols/silc/ops.c:642
+#: ../libpurple/protocols/silc/ops.c:644
 #: ../libpurple/protocols/silc10/ops.c:638
 #, c-format
 msgid "<I>%s</I> set channel <I>%s</I> modes to: %s"
 msgstr "<I>%s</I> misela iziqhagamshelanisi <I>%s</I> kwiimo zo: %s"
 
-#: ../libpurple/protocols/silc/ops.c:646
+#: ../libpurple/protocols/silc/ops.c:648
 #: ../libpurple/protocols/silc10/ops.c:642
 #, c-format
 msgid "<I>%s</I> removed all channel <I>%s</I> modes"
 msgstr "<I>%s</I> ususe zonke iziqhagamshelanisi <I>%s</I> kwiimo"
 
-#: ../libpurple/protocols/silc/ops.c:679
+#: ../libpurple/protocols/silc/ops.c:681
 #: ../libpurple/protocols/silc10/ops.c:675
 #, c-format
 msgid "<I>%s</I> set <I>%s's</I> modes to: %s"
 msgstr "<I>%s</I> seka <I>%s's</I> iinkqubo zoku: %s"
 
-#: ../libpurple/protocols/silc/ops.c:687
+#: ../libpurple/protocols/silc/ops.c:689
 #: ../libpurple/protocols/silc10/ops.c:683
 #, c-format
 msgid "<I>%s</I> removed all <I>%s's</I> modes"
 msgstr "<I>%s</I> susa zonke <I>%s's</I> iinkqubo"
 
-#: ../libpurple/protocols/silc/ops.c:716
+#: ../libpurple/protocols/silc/ops.c:718
 #: ../libpurple/protocols/silc10/ops.c:712
 #, c-format
 msgid "You have been kicked off <I>%s</I> by <I>%s</I> (%s)"
 msgstr "Ugxothiwe <I>%s</I> ngu <I>%s</I> (%s)"
 
-#: ../libpurple/protocols/silc/ops.c:743 ../libpurple/protocols/silc/ops.c:748
-#: ../libpurple/protocols/silc/ops.c:753
+#: ../libpurple/protocols/silc/ops.c:745 ../libpurple/protocols/silc/ops.c:750
+#: ../libpurple/protocols/silc/ops.c:755
 #: ../libpurple/protocols/silc10/ops.c:742
 #: ../libpurple/protocols/silc10/ops.c:747
 #: ../libpurple/protocols/silc10/ops.c:752
@@ -12354,8 +12350,8 @@
 msgid "You have been killed by %s (%s)"
 msgstr "Ubulewe yi %s (%s)"
 
-#: ../libpurple/protocols/silc/ops.c:774 ../libpurple/protocols/silc/ops.c:779
-#: ../libpurple/protocols/silc/ops.c:784
+#: ../libpurple/protocols/silc/ops.c:776 ../libpurple/protocols/silc/ops.c:781
+#: ../libpurple/protocols/silc/ops.c:786
 #: ../libpurple/protocols/silc10/ops.c:773
 #: ../libpurple/protocols/silc10/ops.c:778
 #: ../libpurple/protocols/silc10/ops.c:783
@@ -12363,157 +12359,157 @@
 msgid "Killed by %s (%s)"
 msgstr "Ubulewe ngama %s (%s)"
 
-#: ../libpurple/protocols/silc/ops.c:821
+#: ../libpurple/protocols/silc/ops.c:823
 #: ../libpurple/protocols/silc10/ops.c:829
 msgid "Server signoff"
 msgstr "Ukuphuma kwiseva"
 
-#: ../libpurple/protocols/silc/ops.c:995
+#: ../libpurple/protocols/silc/ops.c:996
 #: ../libpurple/protocols/silc10/ops.c:1017
 msgid "Personal Information"
 msgstr "Ulwazi ngawe Buqu"
 
-#: ../libpurple/protocols/silc/ops.c:1018
+#: ../libpurple/protocols/silc/ops.c:1019
 #: ../libpurple/protocols/silc10/ops.c:1040
 msgid "Birth Day"
 msgstr "UmHla wokuZalwa"
 
-#: ../libpurple/protocols/silc/ops.c:1026
+#: ../libpurple/protocols/silc/ops.c:1027
 #: ../libpurple/protocols/silc10/ops.c:1048
 msgid "Job Role"
 msgstr "Indima yomSebenzi"
 
-#: ../libpurple/protocols/silc/ops.c:1030
+#: ../libpurple/protocols/silc/ops.c:1031
 #: ../libpurple/protocols/silc/silc.c:1253
 #: ../libpurple/protocols/silc10/ops.c:1052
 #: ../libpurple/protocols/silc10/silc.c:949
 msgid "Organization"
 msgstr "iGama lomButho"
 
-#: ../libpurple/protocols/silc/ops.c:1034
+#: ../libpurple/protocols/silc/ops.c:1035
 #: ../libpurple/protocols/silc10/ops.c:1056
 msgid "Unit"
 msgstr "Icandelo loMbutho"
 
-#: ../libpurple/protocols/silc/ops.c:1058
+#: ../libpurple/protocols/silc/ops.c:1059
 #: ../libpurple/protocols/silc10/ops.c:1080
 msgid "Note"
 msgstr "Inqaku"
 
-#: ../libpurple/protocols/silc/ops.c:1104
+#: ../libpurple/protocols/silc/ops.c:1105
 #: ../libpurple/protocols/silc10/ops.c:1128
 msgid "Join Chat"
 msgstr "Ngenela iNcoko"
 
-#: ../libpurple/protocols/silc/ops.c:1138
+#: ../libpurple/protocols/silc/ops.c:1139
 #: ../libpurple/protocols/silc10/chat.c:1039
 #, c-format
 msgid "You are channel founder on <I>%s</I>"
 msgstr "Ungumseki wesiqhagamshelanisi kwi <I>%s</I>"
 
-#: ../libpurple/protocols/silc/ops.c:1142
+#: ../libpurple/protocols/silc/ops.c:1143
 #: ../libpurple/protocols/silc10/chat.c:1043
 #, c-format
 msgid "Channel founder on <I>%s</I> is <I>%s</I>"
 msgstr "Umseki wesiqhagamshelanisi kwi <I>%s</I> is <I>%s</I>"
 
-#: ../libpurple/protocols/silc/ops.c:1201
-#: ../libpurple/protocols/silc/ops.c:1339
+#: ../libpurple/protocols/silc/ops.c:1202
+#: ../libpurple/protocols/silc/ops.c:1340
 #: ../libpurple/protocols/silc10/ops.c:1183
 #: ../libpurple/protocols/silc10/ops.c:1332
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1070
 msgid "Real Name"
 msgstr ""
 
-#: ../libpurple/protocols/silc/ops.c:1229
+#: ../libpurple/protocols/silc/ops.c:1230
 #: ../libpurple/protocols/silc10/ops.c:1213 ../pidgin/gtkblist-theme.c:467
 msgid "Status Text"
 msgstr "Imo yomBhalo"
 
-#: ../libpurple/protocols/silc/ops.c:1291
-#: ../libpurple/protocols/silc/ops.c:1365
+#: ../libpurple/protocols/silc/ops.c:1292
+#: ../libpurple/protocols/silc/ops.c:1366
 #: ../libpurple/protocols/silc10/ops.c:1285
 #: ../libpurple/protocols/silc10/ops.c:1357
 msgid "Public Key Fingerprint"
 msgstr "IQhosha likaWonke-wonke lomZila womNwe"
 
-#: ../libpurple/protocols/silc/ops.c:1292
-#: ../libpurple/protocols/silc/ops.c:1366
+#: ../libpurple/protocols/silc/ops.c:1293
+#: ../libpurple/protocols/silc/ops.c:1367
 #: ../libpurple/protocols/silc10/ops.c:1286
 #: ../libpurple/protocols/silc10/ops.c:1358
 msgid "Public Key Babbleprint"
 msgstr "IQhosha likaWonke-wonke lomZila ongaCacanga"
 
-#: ../libpurple/protocols/silc/ops.c:1305
+#: ../libpurple/protocols/silc/ops.c:1306
 #: ../libpurple/protocols/silc10/ops.c:1298
 msgid "_More..."
 msgstr ""
 
-#: ../libpurple/protocols/silc/ops.c:1384
+#: ../libpurple/protocols/silc/ops.c:1385
 #: ../libpurple/protocols/silc/silc.c:1317
 #: ../libpurple/protocols/silc10/ops.c:1371
 #: ../libpurple/protocols/silc10/silc.c:1013
 msgid "Detach From Server"
 msgstr "Ukwahlukanisa kwiSeva"
 
-#: ../libpurple/protocols/silc/ops.c:1384
+#: ../libpurple/protocols/silc/ops.c:1385
 #: ../libpurple/protocols/silc10/ops.c:1371
 msgid "Cannot detach"
 msgstr "Akukwazeki uKwahlukanisa"
 
-#: ../libpurple/protocols/silc/ops.c:1404
+#: ../libpurple/protocols/silc/ops.c:1405
 #: ../libpurple/protocols/silc10/ops.c:1382
 msgid "Cannot set topic"
 msgstr "Akukwazeki ukumisela isihloko"
 
-#: ../libpurple/protocols/silc/ops.c:1433
+#: ../libpurple/protocols/silc/ops.c:1434
 #: ../libpurple/protocols/silc10/ops.c:1414
 msgid "Failed to change nickname"
 msgstr "Akukwazekanga ukutshintsha isiqhulo"
 
-#: ../libpurple/protocols/silc/ops.c:1482
+#: ../libpurple/protocols/silc/ops.c:1483
 #: ../libpurple/protocols/silc10/ops.c:1462
 msgid "Roomlist"
 msgstr "Uluhlu lweGumbi"
 
-#: ../libpurple/protocols/silc/ops.c:1482
+#: ../libpurple/protocols/silc/ops.c:1483
 #: ../libpurple/protocols/silc10/ops.c:1462
 msgid "Cannot get room list"
 msgstr "Alufumaneki uLuhlu lweGumbi"
 
-#: ../libpurple/protocols/silc/ops.c:1483
+#: ../libpurple/protocols/silc/ops.c:1484
 msgid "Network is empty"
 msgstr ""
 
-#: ../libpurple/protocols/silc/ops.c:1527
+#: ../libpurple/protocols/silc/ops.c:1528
 #: ../libpurple/protocols/silc10/ops.c:1507
 msgid "No public key was received"
 msgstr "Akukho qhosha likawonke-wonke lamkelweyo"
 
-#: ../libpurple/protocols/silc/ops.c:1539
-#: ../libpurple/protocols/silc/ops.c:1552
+#: ../libpurple/protocols/silc/ops.c:1540
+#: ../libpurple/protocols/silc/ops.c:1553
 #: ../libpurple/protocols/silc10/ops.c:1519
 #: ../libpurple/protocols/silc10/ops.c:1532
 msgid "Server Information"
 msgstr "Ulwazi ngeSeva"
 
-#: ../libpurple/protocols/silc/ops.c:1540
+#: ../libpurple/protocols/silc/ops.c:1541
 #: ../libpurple/protocols/silc10/ops.c:1520
 msgid "Cannot get server information"
 msgstr "Akukwazeki ukufumana ulwazi ngeseva"
 
-#: ../libpurple/protocols/silc/ops.c:1563
+#: ../libpurple/protocols/silc/ops.c:1564
 #: ../libpurple/protocols/silc10/ops.c:1549
 #: ../libpurple/protocols/silc10/ops.c:1558
 msgid "Server Statistics"
 msgstr "Izibalo ngeSeva"
 
-#: ../libpurple/protocols/silc/ops.c:1564
+#: ../libpurple/protocols/silc/ops.c:1565
 #: ../libpurple/protocols/silc10/ops.c:1550
 msgid "Cannot get server statistics"
 msgstr "Akukwazeki ukufumana ingqokelela yamanani eseva"
 
-#: ../libpurple/protocols/silc/ops.c:1571
+#: ../libpurple/protocols/silc/ops.c:1572
 #: ../libpurple/protocols/silc10/ops.c:1581
 #, c-format
 msgid ""
@@ -12549,43 +12545,43 @@
 "Ababhexesi beseva bebonke: %d\n"
 "Ababhexeshi bezikhombandlela bebonke: %d\n"
 
-#: ../libpurple/protocols/silc/ops.c:1603
+#: ../libpurple/protocols/silc/ops.c:1604
 #: ../libpurple/protocols/silc10/ops.c:1604
 msgid "Network Statistics"
 msgstr "Ingqokelela yamaNani oThungelwano"
 
-#: ../libpurple/protocols/silc/ops.c:1611
-#: ../libpurple/protocols/silc/ops.c:1616
+#: ../libpurple/protocols/silc/ops.c:1612
+#: ../libpurple/protocols/silc/ops.c:1617
 #: ../libpurple/protocols/silc10/ops.c:1612
 #: ../libpurple/protocols/silc10/ops.c:1617
 msgid "Ping"
 msgstr "I-Ping"
 
-#: ../libpurple/protocols/silc/ops.c:1611
+#: ../libpurple/protocols/silc/ops.c:1612
 #: ../libpurple/protocols/silc10/ops.c:1612
 msgid "Ping failed"
 msgstr "Isilumkiso asiphumelelanga"
 
-#: ../libpurple/protocols/silc/ops.c:1616
+#: ../libpurple/protocols/silc/ops.c:1617
 #: ../libpurple/protocols/silc10/ops.c:1617
 msgid "Ping reply received from server"
 msgstr "Impendulo yePing efunyenwe kwiseva"
 
-#: ../libpurple/protocols/silc/ops.c:1624
+#: ../libpurple/protocols/silc/ops.c:1625
 #: ../libpurple/protocols/silc10/ops.c:1625
 msgid "Could not kill user"
 msgstr "Akukwazekanga ukubulala umsebenzisi"
 
-#: ../libpurple/protocols/silc/ops.c:1663
+#: ../libpurple/protocols/silc/ops.c:1664
 msgid "WATCH"
 msgstr ""
 
-#: ../libpurple/protocols/silc/ops.c:1663
+#: ../libpurple/protocols/silc/ops.c:1664
 msgid "Cannot watch user"
 msgstr ""
 
-#: ../libpurple/protocols/silc/ops.c:1739
-#: ../libpurple/protocols/silc/ops.c:1790
+#: ../libpurple/protocols/silc/ops.c:1740
+#: ../libpurple/protocols/silc/ops.c:1791
 #: ../libpurple/protocols/silc/silc.c:396
 #: ../libpurple/protocols/silc10/ops.c:1817
 #: ../libpurple/protocols/silc10/ops.c:1864
@@ -12593,17 +12589,17 @@
 msgid "Resuming session"
 msgstr "Indibano yokuqalisa kwakhona"
 
-#: ../libpurple/protocols/silc/ops.c:1741
+#: ../libpurple/protocols/silc/ops.c:1742
 #: ../libpurple/protocols/silc10/ops.c:1819
 msgid "Authenticating connection"
 msgstr "Uqhagamshelano lokunyanisekisa"
 
-#: ../libpurple/protocols/silc/ops.c:1792
+#: ../libpurple/protocols/silc/ops.c:1793
 #: ../libpurple/protocols/silc10/ops.c:1866
 msgid "Verifying server public key"
 msgstr "Iqhosha likawonke-wonke lokuqinisekisa iseva"
 
-#: ../libpurple/protocols/silc/ops.c:1829
+#: ../libpurple/protocols/silc/ops.c:1830
 #: ../libpurple/protocols/silc10/ops.c:1908
 msgid "Passphrase required"
 msgstr "Kufuneka ibinzana lokudlula"
@@ -12719,7 +12715,7 @@
 msgstr "Imo yaKho yaNgoku"
 
 #: ../libpurple/protocols/silc/silc.c:981
-#: ../libpurple/protocols/silc10/silc.c:677 ../pidgin/gtkprefs.c:2417
+#: ../libpurple/protocols/silc10/silc.c:677 ../pidgin/gtkprefs.c:2411
 #, c-format
 msgid "Normal"
 msgstr "Okuqhelekileyo"
@@ -12734,14 +12730,14 @@
 "IiNdlela Zakho eziKhethwayo zokuDibana"
 
 #: ../libpurple/protocols/silc/silc.c:1014
-#: ../libpurple/protocols/silc/util.c:517
+#: ../libpurple/protocols/silc/util.c:568
 #: ../libpurple/protocols/silc10/silc.c:710
 #: ../libpurple/protocols/silc10/util.c:561
 msgid "SMS"
 msgstr "I-SMS"
 
 #: ../libpurple/protocols/silc/silc.c:1016
-#: ../libpurple/protocols/silc/util.c:519
+#: ../libpurple/protocols/silc/util.c:570
 #: ../libpurple/protocols/silc10/silc.c:712
 #: ../libpurple/protocols/silc10/util.c:563
 msgid "MMS"
@@ -12961,7 +12957,7 @@
 
 #: ../libpurple/protocols/silc/silc.c:1941
 #: ../libpurple/protocols/silc10/silc.c:1650
-#: ../libpurple/protocols/zephyr/zephyr.c:2708
+#: ../libpurple/protocols/zephyr/zephyr.c:2693
 msgid "msg &lt;nick&gt; &lt;message&gt;:  Send a private message to a user"
 msgstr ""
 "msg &lt;isiqhulo&gt; &lt;umyalezo&gt;:  Thumela umyalezo wabucala "
@@ -13125,7 +13121,7 @@
 "Londoloza imiThetho yokuSebenza yeNgqungquthela ePhilayo eyeNzekayo (SILC)"
 
 #: ../libpurple/protocols/silc/silc.c:2188
-#: ../libpurple/protocols/silc10/silc.c:1902 ../pidgin/gtkprefs.c:2808
+#: ../libpurple/protocols/silc10/silc.c:1902 ../pidgin/gtkprefs.c:2803
 msgid "Network"
 msgstr "uThungelwano"
 
@@ -13178,75 +13174,75 @@
 msgid "Digitally sign and verify all messages"
 msgstr ""
 
-#: ../libpurple/protocols/silc/util.c:159
-#: ../libpurple/protocols/silc/util.c:202
+#: ../libpurple/protocols/silc/util.c:208
+#: ../libpurple/protocols/silc/util.c:251
 #: ../libpurple/protocols/silc10/util.c:207
 #: ../libpurple/protocols/silc10/util.c:247
 msgid "Creating SILC key pair..."
 msgstr "Ukudala iqhosa eliyiperi leSILC..."
 
-#: ../libpurple/protocols/silc/util.c:168
-#: ../libpurple/protocols/silc/util.c:211
+#: ../libpurple/protocols/silc/util.c:217
+#: ../libpurple/protocols/silc/util.c:260
 msgid "Unable to create SILC key pair"
 msgstr ""
 
 #. 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:313
+#: ../libpurple/protocols/silc/util.c:364
 #: ../libpurple/protocols/silc10/util.c:355
 #, c-format
 msgid "Real Name: \t%s\n"
 msgstr "iGama lokwenyani: \t%s\n"
 
-#: ../libpurple/protocols/silc/util.c:315
+#: ../libpurple/protocols/silc/util.c:366
 #: ../libpurple/protocols/silc10/util.c:357
 #, c-format
 msgid "User Name: \t%s\n"
 msgstr "iGama lomSebenzisi: \t%s\n"
 
-#: ../libpurple/protocols/silc/util.c:317
+#: ../libpurple/protocols/silc/util.c:368
 #: ../libpurple/protocols/silc10/util.c:359
 #, c-format
 msgid "Email: \t\t%s\n"
 msgstr ""
 
-#: ../libpurple/protocols/silc/util.c:319
+#: ../libpurple/protocols/silc/util.c:370
 #: ../libpurple/protocols/silc10/util.c:361
 #, c-format
 msgid "Host Name: \t%s\n"
 msgstr "IGama lomququzeleli: \t%s\n"
 
-#: ../libpurple/protocols/silc/util.c:321
+#: ../libpurple/protocols/silc/util.c:372
 #: ../libpurple/protocols/silc10/util.c:363
 #, c-format
 msgid "Organization: \t%s\n"
 msgstr "UmButho: \t%s\n"
 
-#: ../libpurple/protocols/silc/util.c:323
+#: ../libpurple/protocols/silc/util.c:374
 #: ../libpurple/protocols/silc10/util.c:365
 #, c-format
 msgid "Country: \t%s\n"
 msgstr "Ilizwe: \t%s\n"
 
-#: ../libpurple/protocols/silc/util.c:324
+#: ../libpurple/protocols/silc/util.c:375
 #: ../libpurple/protocols/silc10/util.c:366
 #, c-format
 msgid "Algorithm: \t%s\n"
 msgstr "I-Algorithmu: \t%s\n"
 
-#: ../libpurple/protocols/silc/util.c:325
+#: ../libpurple/protocols/silc/util.c:376
 #: ../libpurple/protocols/silc10/util.c:367
 #, c-format
 msgid "Key Length: \t%d bits\n"
 msgstr "Ubude obuPhambili: \t%d bits\n"
 
-#: ../libpurple/protocols/silc/util.c:327
+#: ../libpurple/protocols/silc/util.c:378
 #, c-format
 msgid "Version: \t%s\n"
 msgstr ""
 
-#: ../libpurple/protocols/silc/util.c:329
+#: ../libpurple/protocols/silc/util.c:380
 #: ../libpurple/protocols/silc10/util.c:369
 #, c-format
 msgid ""
@@ -13258,7 +13254,7 @@
 "%s\n"
 "\n"
 
-#: ../libpurple/protocols/silc/util.c:330
+#: ../libpurple/protocols/silc/util.c:381
 #: ../libpurple/protocols/silc10/util.c:370
 #, c-format
 msgid ""
@@ -13268,51 +13264,51 @@
 "IQhosha likaWonke-wonke lomZila ongaCacanga:\n"
 "%s"
 
-#: ../libpurple/protocols/silc/util.c:332
-#: ../libpurple/protocols/silc/util.c:333
+#: ../libpurple/protocols/silc/util.c:383
+#: ../libpurple/protocols/silc/util.c:384
 #: ../libpurple/protocols/silc10/util.c:374
 #: ../libpurple/protocols/silc10/util.c:375
 msgid "Public Key Information"
 msgstr "Ulwazi oluPhambili loLuntu"
 
-#: ../libpurple/protocols/silc/util.c:515
+#: ../libpurple/protocols/silc/util.c:566
 #: ../libpurple/protocols/silc10/util.c:559
 msgid "Paging"
 msgstr "Ukubiza ngomnxeba"
 
-#: ../libpurple/protocols/silc/util.c:521
+#: ../libpurple/protocols/silc/util.c:572
 #: ../libpurple/protocols/silc10/util.c:565
 msgid "Video Conferencing"
 msgstr "Ingqungquthela ngevidiyo"
 
-#: ../libpurple/protocols/silc/util.c:539
+#: ../libpurple/protocols/silc/util.c:590
 #: ../libpurple/protocols/silc10/util.c:584
 msgid "Computer"
 msgstr "Ikhompyutha"
 
-#: ../libpurple/protocols/silc/util.c:543
+#: ../libpurple/protocols/silc/util.c:594
 #: ../libpurple/protocols/silc10/util.c:588
 msgid "PDA"
 msgstr "I-PDA"
 
-#: ../libpurple/protocols/silc/util.c:545
+#: ../libpurple/protocols/silc/util.c:596
 #: ../libpurple/protocols/silc10/util.c:590
 msgid "Terminal"
 msgstr "I-Terminal"
 
-#: ../libpurple/protocols/silc/wb.c:287 ../libpurple/protocols/silc10/wb.c:287
+#: ../libpurple/protocols/silc/wb.c:289 ../libpurple/protocols/silc10/wb.c:287
 #, c-format
 msgid "%s sent message to whiteboard. Would you like to open the whiteboard?"
 msgstr ""
 
-#: ../libpurple/protocols/silc/wb.c:291 ../libpurple/protocols/silc10/wb.c:291
+#: ../libpurple/protocols/silc/wb.c:293 ../libpurple/protocols/silc10/wb.c:291
 #, c-format
 msgid ""
 "%s sent message to whiteboard on %s channel. Would you like to open the "
 "whiteboard?"
 msgstr ""
 
-#: ../libpurple/protocols/silc/wb.c:305 ../libpurple/protocols/silc10/wb.c:305
+#: ../libpurple/protocols/silc/wb.c:307 ../libpurple/protocols/silc10/wb.c:305
 msgid "Whiteboard"
 msgstr ""
 
@@ -13393,27 +13389,27 @@
 msgid "Unable to create connection"
 msgstr ""
 
-#: ../libpurple/protocols/simple/simple.c:1147
+#: ../libpurple/protocols/simple/simple.c:1142
 msgid "Unknown server response"
 msgstr ""
 
-#: ../libpurple/protocols/simple/simple.c:1782
-#: ../libpurple/protocols/simple/simple.c:1832
-#: ../libpurple/protocols/simple/simple.c:1847
-#: ../libpurple/protocols/simple/simple.c:1902
+#: ../libpurple/protocols/simple/simple.c:1780
+#: ../libpurple/protocols/simple/simple.c:1830
+#: ../libpurple/protocols/simple/simple.c:1845
+#: ../libpurple/protocols/simple/simple.c:1900
 msgid "Unable to create listen socket"
 msgstr ""
 
-#: ../libpurple/protocols/simple/simple.c:1811
-#: ../libpurple/protocols/simple/simple.c:1913 ../libpurple/proxy.c:2211
+#: ../libpurple/protocols/simple/simple.c:1809
+#: ../libpurple/protocols/simple/simple.c:1911 ../libpurple/proxy.c:2240
 msgid "Unable to resolve hostname"
 msgstr ""
 
-#: ../libpurple/protocols/simple/simple.c:1931
+#: ../libpurple/protocols/simple/simple.c:1929
 msgid "SIP usernames may not contain whitespaces or @ symbols"
 msgstr ""
 
-#: ../libpurple/protocols/simple/simple.c:1950
+#: ../libpurple/protocols/simple/simple.c:1948
 msgid "SIP connect server not specified"
 msgstr ""
 
@@ -13425,36 +13421,36 @@
 #. *< id
 #. *< name
 #. *< version
-#: ../libpurple/protocols/simple/simple.c:2140
+#: ../libpurple/protocols/simple/simple.c:2138
 msgid "SIP/SIMPLE Protocol Plugin"
 msgstr ""
 
 #. *  summary
-#: ../libpurple/protocols/simple/simple.c:2141
+#: ../libpurple/protocols/simple/simple.c:2139
 msgid "The SIP/SIMPLE Protocol Plugin"
 msgstr ""
 
-#: ../libpurple/protocols/simple/simple.c:2169
+#: ../libpurple/protocols/simple/simple.c:2167
 msgid "Publish status (note: everyone may watch you)"
 msgstr ""
 
-#: ../libpurple/protocols/simple/simple.c:2175
+#: ../libpurple/protocols/simple/simple.c:2173
 msgid "Use UDP"
 msgstr ""
 
-#: ../libpurple/protocols/simple/simple.c:2177
+#: ../libpurple/protocols/simple/simple.c:2175
 msgid "Use proxy"
 msgstr ""
 
-#: ../libpurple/protocols/simple/simple.c:2179 ../pidgin/gtkprefs.c:2809
+#: ../libpurple/protocols/simple/simple.c:2177 ../pidgin/gtkprefs.c:2804
 msgid "Proxy"
 msgstr ""
 
-#: ../libpurple/protocols/simple/simple.c:2181
+#: ../libpurple/protocols/simple/simple.c:2179
 msgid "Auth User"
 msgstr ""
 
-#: ../libpurple/protocols/simple/simple.c:2183
+#: ../libpurple/protocols/simple/simple.c:2181
 msgid "Auth Domain"
 msgstr ""
 
@@ -13546,7 +13542,7 @@
 msgid "Yahoo! JAPAN Protocol Plugin"
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/libymsg.c:926
+#: ../libpurple/protocols/yahoo/libymsg.c:928
 #, c-format
 msgid "%s has sent you a webcam invite, which is not yet supported."
 msgstr ""
@@ -13589,38 +13585,38 @@
 msgstr "Ukongeza umhlobo kukhatyiwe"
 
 #. Some error in the received stream
-#: ../libpurple/protocols/yahoo/libymsg.c:2016
-#: ../libpurple/protocols/yahoo/libymsg.c:2101
+#: ../libpurple/protocols/yahoo/libymsg.c:2017
+#: ../libpurple/protocols/yahoo/libymsg.c:2100
 msgid "Received invalid data"
 msgstr ""
 
 #. security lock from too many failed login attempts
-#: ../libpurple/protocols/yahoo/libymsg.c:2114
+#: ../libpurple/protocols/yahoo/libymsg.c:2113
 msgid ""
 "Account locked: Too many failed login attempts.  Logging into the Yahoo! "
 "website may fix this."
 msgstr ""
 
 #. indicates a lock of some description
-#: ../libpurple/protocols/yahoo/libymsg.c:2125
+#: ../libpurple/protocols/yahoo/libymsg.c:2124
 msgid ""
 "Account locked: Unknown reason.  Logging into the Yahoo! website may fix "
 "this."
 msgstr ""
 
 #. indicates a lock due to logging in too frequently
-#: ../libpurple/protocols/yahoo/libymsg.c:2131
+#: ../libpurple/protocols/yahoo/libymsg.c:2130
 msgid ""
 "Account locked: You have been logging in too frequently.  Wait a few minutes "
 "before trying to connect again.  Logging into the Yahoo! website may help."
 msgstr ""
 
 #. username or password missing
-#: ../libpurple/protocols/yahoo/libymsg.c:2138
+#: ../libpurple/protocols/yahoo/libymsg.c:2137
 msgid "Username or password missing"
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/libymsg.c:2249
+#: ../libpurple/protocols/yahoo/libymsg.c:2256
 #, c-format
 msgid ""
 "The Yahoo server has requested the use of an unrecognized authentication "
@@ -13628,11 +13624,11 @@
 "Check %s for updates."
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/libymsg.c:2253
+#: ../libpurple/protocols/yahoo/libymsg.c:2260
 msgid "Failed Yahoo! Authentication"
 msgstr "U-Yahoo akaphumelelanga! Ukunyanisekisa"
 
-#: ../libpurple/protocols/yahoo/libymsg.c:2336
+#: ../libpurple/protocols/yahoo/libymsg.c:2351
 #, c-format
 msgid ""
 "You have tried to ignore %s, but the user is on your buddy list.  Clicking "
@@ -13641,31 +13637,31 @@
 "Uzamile ukungahoyi i %s, kodwa umsebenzisi ukuluhlu lwakho lobuhlobo.  "
 "Ngokucofa u \"Ewe\" uya kumsusa kwaye ungamhoyi umhlobo."
 
-#: ../libpurple/protocols/yahoo/libymsg.c:2339
+#: ../libpurple/protocols/yahoo/libymsg.c:2354
 msgid "Ignore buddy?"
 msgstr "Angahoywa umhlobo?"
 
-#: ../libpurple/protocols/yahoo/libymsg.c:2417
+#: ../libpurple/protocols/yahoo/libymsg.c:2432
 msgid "Invalid username or password"
 msgstr "Igama lomsebenzisi okanye ipassword zezingasebenziyo"
 
-#: ../libpurple/protocols/yahoo/libymsg.c:2421
+#: ../libpurple/protocols/yahoo/libymsg.c:2436
 msgid ""
 "Your account has been locked due to too many failed login attempts.  Please "
 "try logging into the Yahoo! website."
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/libymsg.c:2428
+#: ../libpurple/protocols/yahoo/libymsg.c:2443
 msgid "Unknown error 52.  Reconnecting should fix this."
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/libymsg.c:2432
+#: ../libpurple/protocols/yahoo/libymsg.c:2447
 msgid ""
 "Error 1013: The username you have entered is invalid.  The most common cause "
 "of this error is entering your email address instead of your Yahoo! ID."
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/libymsg.c:2438
+#: ../libpurple/protocols/yahoo/libymsg.c:2453
 #, c-format
 msgid ""
 "Unknown error number %d. Logging into the Yahoo! website may fix this."
@@ -13673,134 +13669,134 @@
 "Impazamo engaziwayo yenani %d. Ukungena kunxibelelwano kwi-website kaYahoo! "
 "kungakulungisa oku."
 
-#: ../libpurple/protocols/yahoo/libymsg.c:2532
+#: ../libpurple/protocols/yahoo/libymsg.c:2547
 #, c-format
 msgid "Unable to add buddy %s to group %s to the server list on account %s."
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/libymsg.c:2535
+#: ../libpurple/protocols/yahoo/libymsg.c:2550
 msgid "Unable to add buddy to server list"
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/libymsg.c:3194
+#: ../libpurple/protocols/yahoo/libymsg.c:3207
 #, c-format
 msgid "[ Audible %s/%s/%s.swf ] %s"
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/libymsg.c:3540
+#: ../libpurple/protocols/yahoo/libymsg.c:3553
 msgid "Received unexpected HTTP response from server"
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/libymsg.c:3596
+#: ../libpurple/protocols/yahoo/libymsg.c:3609
 #, c-format
 msgid "Lost connection with %s: %s"
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/libymsg.c:3621
+#: ../libpurple/protocols/yahoo/libymsg.c:3634
 #, c-format
 msgid "Unable to establish a connection with %s: %s"
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/libymsg.c:3838
+#: ../libpurple/protocols/yahoo/libymsg.c:3851
 msgid "Unable to connect: The server returned an empty response."
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/libymsg.c:3872
+#: ../libpurple/protocols/yahoo/libymsg.c:3885
 msgid ""
 "Unable to connect: The server's response did not contain the necessary "
 "information"
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/libymsg.c:4073
-#: ../libpurple/protocols/yahoo/libymsg.c:5104
+#: ../libpurple/protocols/yahoo/libymsg.c:4086
+#: ../libpurple/protocols/yahoo/libymsg.c:5117
 msgid "Not at Home"
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/libymsg.c:4075
-#: ../libpurple/protocols/yahoo/libymsg.c:5107
+#: ../libpurple/protocols/yahoo/libymsg.c:4088
+#: ../libpurple/protocols/yahoo/libymsg.c:5120
 msgid "Not at Desk"
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/libymsg.c:4077
-#: ../libpurple/protocols/yahoo/libymsg.c:5110
+#: ../libpurple/protocols/yahoo/libymsg.c:4090
+#: ../libpurple/protocols/yahoo/libymsg.c:5123
 msgid "Not in Office"
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/libymsg.c:4081
-#: ../libpurple/protocols/yahoo/libymsg.c:5116
+#: ../libpurple/protocols/yahoo/libymsg.c:4094
+#: ../libpurple/protocols/yahoo/libymsg.c:5129
 msgid "On Vacation"
 msgstr "UkwiKhefu"
 
-#: ../libpurple/protocols/yahoo/libymsg.c:4085
-#: ../libpurple/protocols/yahoo/libymsg.c:5122
+#: ../libpurple/protocols/yahoo/libymsg.c:4098
+#: ../libpurple/protocols/yahoo/libymsg.c:5135
 msgid "Stepped Out"
 msgstr "UPhumele Phandle"
 
-#: ../libpurple/protocols/yahoo/libymsg.c:4183
-#: ../libpurple/protocols/yahoo/libymsg.c:4214
+#: ../libpurple/protocols/yahoo/libymsg.c:4196
+#: ../libpurple/protocols/yahoo/libymsg.c:4227
 msgid "Not on server list"
 msgstr "Ayikho kuluhlu lweseva"
 
-#: ../libpurple/protocols/yahoo/libymsg.c:4234
-#: ../libpurple/protocols/yahoo/libymsg.c:4328
+#: ../libpurple/protocols/yahoo/libymsg.c:4247
+#: ../libpurple/protocols/yahoo/libymsg.c:4341
 msgid "Appear Permanently Offline"
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/libymsg.c:4250
+#: ../libpurple/protocols/yahoo/libymsg.c:4263
 msgid "Presence"
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/libymsg.c:4322
+#: ../libpurple/protocols/yahoo/libymsg.c:4335
 msgid "Don't Appear Permanently Offline"
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/libymsg.c:4381
+#: ../libpurple/protocols/yahoo/libymsg.c:4394
 msgid "Join in Chat"
 msgstr "Ngenela iNcoko"
 
-#: ../libpurple/protocols/yahoo/libymsg.c:4387
+#: ../libpurple/protocols/yahoo/libymsg.c:4400
 msgid "Initiate Conference"
 msgstr "Ukusungula iNgqungquthela"
 
-#: ../libpurple/protocols/yahoo/libymsg.c:4415
+#: ../libpurple/protocols/yahoo/libymsg.c:4428
 msgid "Presence Settings"
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/libymsg.c:4420
+#: ../libpurple/protocols/yahoo/libymsg.c:4433
 msgid "Start Doodling"
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/libymsg.c:4559
+#: ../libpurple/protocols/yahoo/libymsg.c:4572
 msgid "Select the ID you want to activate"
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/libymsg.c:4570
+#: ../libpurple/protocols/yahoo/libymsg.c:4583
 msgid "Join whom in chat?"
 msgstr "Ngenela incoko?"
 
-#: ../libpurple/protocols/yahoo/libymsg.c:4586
+#: ../libpurple/protocols/yahoo/libymsg.c:4599
 msgid "Activate ID..."
 msgstr "Dlamkisa iSazisi..."
 
-#: ../libpurple/protocols/yahoo/libymsg.c:4590
+#: ../libpurple/protocols/yahoo/libymsg.c:4603
 msgid "Join User in Chat..."
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/libymsg.c:4595
+#: ../libpurple/protocols/yahoo/libymsg.c:4608
 msgid "Open Inbox"
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/libymsg.c:4622
-#: ../libpurple/protocols/yahoo/libymsg.c:4719
+#: ../libpurple/protocols/yahoo/libymsg.c:4635
+#: ../libpurple/protocols/yahoo/libymsg.c:4732
 msgid "Can't send SMS. Unable to obtain mobile carrier."
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/libymsg.c:4652
-#: ../libpurple/protocols/yahoo/libymsg.c:4783
+#: ../libpurple/protocols/yahoo/libymsg.c:4665
+#: ../libpurple/protocols/yahoo/libymsg.c:4796
 msgid "Can't send SMS. Unknown mobile carrier."
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/libymsg.c:4774
+#: ../libpurple/protocols/yahoo/libymsg.c:4787
 msgid "Getting mobile carrier to send the SMS."
 msgstr ""
 
@@ -13813,19 +13809,19 @@
 
 #: ../libpurple/protocols/yahoo/yahoo_filexfer.c:167
 #: ../libpurple/protocols/yahoo/yahoo_filexfer.c:247
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:1297
+#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:1313
 msgid "Unable to connect."
 msgstr "Akukwazeki ukunxulumana."
 
 #: ../libpurple/protocols/yahoo/yahoo_filexfer.c:328
 #: ../libpurple/protocols/yahoo/yahoo_filexfer.c:337
 #: ../libpurple/protocols/yahoo/yahoo_filexfer.c:346
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:1201
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:1949
+#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:1217
+#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:1978
 msgid "Unable to establish file descriptor."
 msgstr "Akukwazeki ukuseka isichazi sefayili."
 
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:1840
+#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:1863
 #, c-format
 msgid "%s is trying to send you a group of %d files.\n"
 msgstr ""
@@ -13924,68 +13920,68 @@
 msgid "%s has declined to join."
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:506
+#: ../libpurple/protocols/yahoo/yahoochat.c:507
 msgid "Failed to join chat"
 msgstr "Akuphumelelanga ukungenela incoko"
 
 #. -6
-#: ../libpurple/protocols/yahoo/yahoochat.c:509
+#: ../libpurple/protocols/yahoo/yahoochat.c:510
 msgid "Unknown room"
 msgstr ""
 
 #. -15
-#: ../libpurple/protocols/yahoo/yahoochat.c:512
+#: ../libpurple/protocols/yahoo/yahoochat.c:513
 msgid "Maybe the room is full"
 msgstr ""
 
 #. -35
-#: ../libpurple/protocols/yahoo/yahoochat.c:515
+#: ../libpurple/protocols/yahoo/yahoochat.c:516
 msgid "Not available"
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:519
+#: ../libpurple/protocols/yahoo/yahoochat.c:520
 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:603
+#: ../libpurple/protocols/yahoo/yahoochat.c:628
 #, c-format
 msgid "You are now chatting in %s."
 msgstr "Ngoku uncokola kwi %s."
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:809
+#: ../libpurple/protocols/yahoo/yahoochat.c:834
 msgid "Failed to join buddy in chat"
 msgstr "Akuphumelelanga ukudibana nomhlobo kwincoko"
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:810
+#: ../libpurple/protocols/yahoo/yahoochat.c:835
 msgid "Maybe they're not in a chat?"
 msgstr "Mhlawumbi abekho kwincoko?"
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:1505
-#: ../libpurple/protocols/yahoo/yahoochat.c:1531
+#: ../libpurple/protocols/yahoo/yahoochat.c:1530
+#: ../libpurple/protocols/yahoo/yahoochat.c:1556
 msgid "Fetching the room list failed."
 msgstr "Ukulanda uluhlu lwegumbi akuphumelelanga."
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:1591
+#: ../libpurple/protocols/yahoo/yahoochat.c:1616
 msgid "Voices"
 msgstr "Amazwi"
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:1594
+#: ../libpurple/protocols/yahoo/yahoochat.c:1619
 msgid "Webcams"
 msgstr "Ii-webcam"
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:1605
-#: ../libpurple/protocols/yahoo/yahoochat.c:1676
+#: ../libpurple/protocols/yahoo/yahoochat.c:1630
+#: ../libpurple/protocols/yahoo/yahoochat.c:1701
 msgid "Connection problem"
 msgstr "INgxaki yokuNxulumana"
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:1605
-#: ../libpurple/protocols/yahoo/yahoochat.c:1676
+#: ../libpurple/protocols/yahoo/yahoochat.c:1630
+#: ../libpurple/protocols/yahoo/yahoochat.c:1701
 msgid "Unable to fetch room list."
 msgstr "Akukwazeki ukulanda uluhlu lwegumbi."
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:1668
+#: ../libpurple/protocols/yahoo/yahoochat.c:1693
 msgid "User Rooms"
 msgstr "AmaGumbi omSebenzisi"
 
@@ -14001,76 +13997,76 @@
 "(Kubekho impazamo ekuguquleni lomyalezo.\t Jonga ukhetho 'Lokunxulumanisa' "
 "kwi-Akhawunti yomHleli)"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:756
+#: ../libpurple/protocols/zephyr/zephyr.c:755
 #, c-format
 msgid "Unable to send to chat %s,%s,%s"
 msgstr ""
 
-#: ../libpurple/protocols/zephyr/zephyr.c:807
-#: ../libpurple/protocols/zephyr/zephyr.c:1191
+#: ../libpurple/protocols/zephyr/zephyr.c:800
+#: ../libpurple/protocols/zephyr/zephyr.c:1181
 msgid "Hidden or not logged-in"
 msgstr ""
 
-#: ../libpurple/protocols/zephyr/zephyr.c:813
-#: ../libpurple/protocols/zephyr/zephyr.c:1193
+#: ../libpurple/protocols/zephyr/zephyr.c:806
+#: ../libpurple/protocols/zephyr/zephyr.c:1183
 #, c-format
 msgid "<br>At %s since %s"
 msgstr "<br>Nge %s ukususela ngo %s"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:1518
-#: ../libpurple/protocols/zephyr/zephyr.c:1519
+#: ../libpurple/protocols/zephyr/zephyr.c:1506
+#: ../libpurple/protocols/zephyr/zephyr.c:1507
 msgid "Anyone"
 msgstr "Nabani na"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2372
+#: ../libpurple/protocols/zephyr/zephyr.c:2357
 msgid "_Class:"
 msgstr "_Udidi:"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2378
+#: ../libpurple/protocols/zephyr/zephyr.c:2363
 msgid "_Instance:"
 msgstr "_Isehlo:"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2384
+#: ../libpurple/protocols/zephyr/zephyr.c:2369
 msgid "_Recipient:"
 msgstr "_Umamkeli:"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2395
+#: ../libpurple/protocols/zephyr/zephyr.c:2380
 #, c-format
 msgid "Attempt to subscribe to %s,%s,%s failed"
 msgstr "Umzamo wokubhalisa kwi %s,%s,%s awuphumelelanga"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2713
+#: ../libpurple/protocols/zephyr/zephyr.c:2698
 msgid "zlocate &lt;nick&gt;: Locate user"
 msgstr "zlocate &lt;isiqhulo&gt;: Fumana umsebenzisi"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2718
+#: ../libpurple/protocols/zephyr/zephyr.c:2703
 msgid "zl &lt;nick&gt;: Locate user"
 msgstr "zl &lt;isiqhulo&gt;: Fumana umsebenzisi"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2723
+#: ../libpurple/protocols/zephyr/zephyr.c:2708
 msgid "instance &lt;instance&gt;: Set the instance to be used on this class"
 msgstr "instance &lt;isehlo&gt;: Ukuseka isehlo sokusetyenziswa kule klasi"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2728
+#: ../libpurple/protocols/zephyr/zephyr.c:2713
 msgid "inst &lt;instance&gt;: Set the instance to be used on this class"
 msgstr "inst &lt;isehlo&gt;: Seka isehlo esiya kusetyenziswa kule klasi"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2733
+#: ../libpurple/protocols/zephyr/zephyr.c:2718
 msgid "topic &lt;instance&gt;: Set the instance to be used on this class"
 msgstr ""
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2739
+#: ../libpurple/protocols/zephyr/zephyr.c:2724
 msgid "sub &lt;class&gt; &lt;instance&gt; &lt;recipient&gt;: Join a new chat"
 msgstr ""
 "sub &lt;iklasi&gt; &lt;isehlo&gt; &lt;umamkeli&gt;: Ukungenela incoko entsha"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2744
+#: ../libpurple/protocols/zephyr/zephyr.c:2729
 msgid ""
 "zi &lt;instance&gt;: Send a message to &lt;message,<i>instance</i>,*&gt;"
 msgstr ""
 "zi &lt;isehlo&gt;: Thumela umyalezo ku &lt;umyalezo,<i>isehlo</i>,*&gt;"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2750
+#: ../libpurple/protocols/zephyr/zephyr.c:2735
 msgid ""
 "zci &lt;class&gt; &lt;instance&gt;: Send a message to "
 "&lt;<i>class</i>,<i>instance</i>,*&gt;"
@@ -14078,7 +14074,7 @@
 "zci &lt;iklasi&gt; &lt;isehlo&gt;: Thumela umyalezo ku "
 "&lt;<i>iklasi</i>,<i>isehlo</i>,*&gt;"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2756
+#: ../libpurple/protocols/zephyr/zephyr.c:2741
 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;"
@@ -14086,7 +14082,7 @@
 "zcir &lt;iklasi&gt; &lt;isehlo&gt; &lt;umamkeli&gt;: thumela umyalezo ku "
 "&lt;<i>iklasi</i>,<i>isehlo</i>,<i>umamkeli</i>&gt;"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2762
+#: ../libpurple/protocols/zephyr/zephyr.c:2747
 msgid ""
 "zir &lt;instance&gt; &lt;recipient&gt;: Send a message to "
 "&lt;MESSAGE,<i>instance</i>,<i>recipient</i>&gt;"
@@ -14094,16 +14090,16 @@
 "zir &lt;isehlo&gt; &lt;umamkeli&gt;: Thumela umyalezo ku "
 "&lt;MESSAGE,<i>isehlo</i>,<i>umamkeli</i>&gt;"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2767
+#: ../libpurple/protocols/zephyr/zephyr.c:2752
 msgid "zc &lt;class&gt;: Send a message to &lt;<i>class</i>,PERSONAL,*&gt;"
 msgstr ""
 "zc &lt;iklasi&gt;: Thumela umyalezo ku &lt;<i>iklasi</i>,PERSONAL,*&gt;"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2843
+#: ../libpurple/protocols/zephyr/zephyr.c:2828
 msgid "Resubscribe"
 msgstr "Rhuma kwakhona"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2846
+#: ../libpurple/protocols/zephyr/zephyr.c:2831
 msgid "Retrieve subscriptions from server"
 msgstr "Fumana imirhumo evela kwiseva"
 
@@ -14117,66 +14113,66 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/zephyr/zephyr.c:2946
-#: ../libpurple/protocols/zephyr/zephyr.c:2948
+#: ../libpurple/protocols/zephyr/zephyr.c:2931
+#: ../libpurple/protocols/zephyr/zephyr.c:2933
 msgid "Zephyr Protocol Plugin"
 msgstr "Imithetho yokuSebenza yokuNgenisa iZephyr"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2973
+#: ../libpurple/protocols/zephyr/zephyr.c:2958
 msgid "Use tzc"
 msgstr ""
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2976
+#: ../libpurple/protocols/zephyr/zephyr.c:2961
 msgid "tzc command"
 msgstr ""
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2979
+#: ../libpurple/protocols/zephyr/zephyr.c:2964
 msgid "Export to .anyone"
 msgstr "Thumela ku- .anyone"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2982
+#: ../libpurple/protocols/zephyr/zephyr.c:2967
 msgid "Export to .zephyr.subs"
 msgstr "Hambisa ukuya .zephyr.subs"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2985
+#: ../libpurple/protocols/zephyr/zephyr.c:2970
 msgid "Import from .anyone"
 msgstr ""
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2988
+#: ../libpurple/protocols/zephyr/zephyr.c:2973
 msgid "Import from .zephyr.subs"
 msgstr ""
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2991
+#: ../libpurple/protocols/zephyr/zephyr.c:2976
 msgid "Realm"
 msgstr ""
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2994
+#: ../libpurple/protocols/zephyr/zephyr.c:2979
 msgid "Exposure"
 msgstr "Ukutyhileka"
 
-#: ../libpurple/proxy.c:752 ../libpurple/proxy.c:807 ../libpurple/proxy.c:1254
-#: ../libpurple/proxy.c:1441 ../libpurple/proxy.c:2099
+#: ../libpurple/proxy.c:754 ../libpurple/proxy.c:816 ../libpurple/proxy.c:1269
+#: ../libpurple/proxy.c:1463 ../libpurple/proxy.c:2123
 #, c-format
 msgid "Unable to create socket: %s"
 msgstr ""
 
-#: ../libpurple/proxy.c:989 ../libpurple/proxy.c:1010
+#: ../libpurple/proxy.c:1002 ../libpurple/proxy.c:1023
 #, c-format
 msgid "Unable to parse response from HTTP proxy: %s"
 msgstr ""
 
-#: ../libpurple/proxy.c:1043 ../libpurple/proxy.c:1105
-#: ../libpurple/proxy.c:1134
+#: ../libpurple/proxy.c:1056 ../libpurple/proxy.c:1118
+#: ../libpurple/proxy.c:1147
 #, c-format
 msgid "HTTP proxy connection error %d"
 msgstr ""
 
-#: ../libpurple/proxy.c:1130
+#: ../libpurple/proxy.c:1143
 #, c-format
 msgid "Access denied: HTTP proxy server forbids port %d tunneling"
 msgstr ""
 
-#: ../libpurple/proxy.c:1323
+#: ../libpurple/proxy.c:1343
 #, c-format
 msgid "Error resolving %s"
 msgstr ""
@@ -14342,99 +14338,99 @@
 msgid "%x %X"
 msgstr ""
 
-#: ../libpurple/util.c:3309
+#: ../libpurple/util.c:3294
 msgid "Calculating..."
 msgstr "Ukubala..."
 
-#: ../libpurple/util.c:3312
+#: ../libpurple/util.c:3297
 msgid "Unknown."
 msgstr "Engaziwayo."
 
-#: ../libpurple/util.c:3338
+#: ../libpurple/util.c:3323
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../libpurple/util.c:3350
+#: ../libpurple/util.c:3335
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../libpurple/util.c:3358
+#: ../libpurple/util.c:3343
 #, c-format
 msgid "%s, %d hour"
 msgid_plural "%s, %d hours"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../libpurple/util.c:3364
+#: ../libpurple/util.c:3349
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../libpurple/util.c:3372
+#: ../libpurple/util.c:3357
 #, c-format
 msgid "%s, %d minute"
 msgid_plural "%s, %d minutes"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../libpurple/util.c:3378
+#: ../libpurple/util.c:3363
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../libpurple/util.c:3659
+#: ../libpurple/util.c:3644
 #, c-format
 msgid "Could not open %s: Redirected too many times"
 msgstr ""
 
-#: ../libpurple/util.c:3709 ../libpurple/util.c:4252
+#: ../libpurple/util.c:3694 ../libpurple/util.c:4228
 #, c-format
 msgid "Unable to connect to %s"
 msgstr ""
 
-#: ../libpurple/util.c:3858
+#: ../libpurple/util.c:3834
 #, c-format
 msgid "Error reading from %s: response too long (%d bytes limit)"
 msgstr ""
 
-#: ../libpurple/util.c:3925 ../libpurple/util.c:3945
+#: ../libpurple/util.c:3901 ../libpurple/util.c:3921
 #, 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:3979
+#: ../libpurple/util.c:3955
 #, c-format
 msgid "Error reading from %s: %s"
 msgstr ""
 
-#: ../libpurple/util.c:4103
+#: ../libpurple/util.c:4079
 #, c-format
 msgid "Error writing to %s: %s"
 msgstr ""
 
-#: ../libpurple/util.c:4134 ../libpurple/util.c:4164 ../libpurple/util.c:4234
+#: ../libpurple/util.c:4110 ../libpurple/util.c:4140 ../libpurple/util.c:4210
 #, c-format
 msgid "Unable to connect to %s: %s"
 msgstr ""
 
-#: ../libpurple/util.c:5129
+#: ../libpurple/util.c:5085
 #, c-format
 msgid " - %s"
 msgstr ""
 
-#: ../libpurple/util.c:5135
+#: ../libpurple/util.c:5091
 #, c-format
 msgid " (%s)"
 msgstr ""
@@ -14476,87 +14472,87 @@
 "the old file has been renamed to %s~."
 msgstr ""
 
-#: ../pidgin/data/pidgin.desktop.in.h:1
+#: ../pidgin.desktop.in.h:1
 msgid "Pidgin Internet Messenger"
 msgstr ""
 
-#: ../pidgin/data/pidgin.desktop.in.h:2
+#: ../pidgin.desktop.in.h:2
 msgid "Internet Messenger"
 msgstr ""
 
-#: ../pidgin/data/pidgin.desktop.in.h:3
+#: ../pidgin.desktop.in.h:3
 msgid ""
 "Chat over IM.  Supports AIM, Google Talk, Jabber/XMPP, MSN, Yahoo and more"
 msgstr ""
 
 #. Build the login options frame.
-#: ../pidgin/gtkaccount.c:455
+#: ../pidgin/gtkaccount.c:448
 msgid "Login Options"
 msgstr "IinDlela zokuKhetha zokuNgena"
 
-#: ../pidgin/gtkaccount.c:480
+#: ../pidgin/gtkaccount.c:473
 msgid "Pro_tocol:"
 msgstr ""
 
-#: ../pidgin/gtkaccount.c:493 ../pidgin/gtkaccount.c:1136
+#: ../pidgin/gtkaccount.c:486 ../pidgin/gtkaccount.c:1129
 msgid "_Username:"
 msgstr "_Igama lomsebenzisi:"
 
-#: ../pidgin/gtkaccount.c:606
+#: ../pidgin/gtkaccount.c:599
 msgid "Remember pass_word"
 msgstr ""
 
 #. Build the user options frame.
-#: ../pidgin/gtkaccount.c:661
+#: ../pidgin/gtkaccount.c:654
 msgid "User Options"
 msgstr "Iindlela zokuKhetha zomSebenzisi"
 
-#: ../pidgin/gtkaccount.c:674
+#: ../pidgin/gtkaccount.c:667
 msgid "_Local alias:"
 msgstr ""
 
-#: ../pidgin/gtkaccount.c:678
+#: ../pidgin/gtkaccount.c:671
 msgid "New _mail notifications"
 msgstr ""
 
 #. Buddy icon
-#: ../pidgin/gtkaccount.c:683
+#: ../pidgin/gtkaccount.c:676
 msgid "Use this buddy _icon for this account:"
 msgstr ""
 
-#: ../pidgin/gtkaccount.c:815
+#: ../pidgin/gtkaccount.c:808
 msgid "Ad_vanced"
 msgstr ""
 
-#: ../pidgin/gtkaccount.c:1000
+#: ../pidgin/gtkaccount.c:993
 msgid "Use GNOME Proxy Settings"
 msgstr ""
 
-#: ../pidgin/gtkaccount.c:1001
+#: ../pidgin/gtkaccount.c:994
 msgid "Use Global Proxy Settings"
 msgstr "Sebenzisa imiMiselo we-Global Proxy"
 
-#: ../pidgin/gtkaccount.c:1007
+#: ../pidgin/gtkaccount.c:1000
 msgid "No Proxy"
 msgstr "Akukho Mqobo"
 
-#: ../pidgin/gtkaccount.c:1013 ../pidgin/gtkprefs.c:2119
+#: ../pidgin/gtkaccount.c:1006 ../pidgin/gtkprefs.c:2113
 msgid "SOCKS 4"
 msgstr "I-SOCKS 4"
 
-#: ../pidgin/gtkaccount.c:1019 ../pidgin/gtkprefs.c:2120
+#: ../pidgin/gtkaccount.c:1012 ../pidgin/gtkprefs.c:2114
 msgid "SOCKS 5"
 msgstr "I-SOCKS 5"
 
-#: ../pidgin/gtkaccount.c:1025 ../pidgin/gtkprefs.c:2121
+#: ../pidgin/gtkaccount.c:1018 ../pidgin/gtkprefs.c:2115
 msgid "Tor/Privacy (SOCKS5)"
 msgstr ""
 
-#: ../pidgin/gtkaccount.c:1031 ../pidgin/gtkprefs.c:2122
+#: ../pidgin/gtkaccount.c:1024 ../pidgin/gtkprefs.c:2116
 msgid "HTTP"
 msgstr "i-HTTP"
 
-#: ../pidgin/gtkaccount.c:1037 ../pidgin/gtkprefs.c:2123
+#: ../pidgin/gtkaccount.c:1030 ../pidgin/gtkprefs.c:2117
 msgid "Use Environmental Settings"
 msgstr "Sebenzisa imiMiselo yokusiNgqongileyo"
 
@@ -14565,73 +14561,73 @@
 #. 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:1082
+#: ../pidgin/gtkaccount.c:1075
 msgid "If you look real closely"
 msgstr "Xa uqwalasela ngocoselelo"
 
 #. This is an easter egg. See the comment on the previous line in the source.
-#: ../pidgin/gtkaccount.c:1085
+#: ../pidgin/gtkaccount.c:1078
 msgid "you can see the butterflies mating"
 msgstr "ungawabona amabhabhathane esenza ubuqabane"
 
-#: ../pidgin/gtkaccount.c:1115
+#: ../pidgin/gtkaccount.c:1108
 msgid "Proxy _type:"
 msgstr "Uhlobo _lomqobo:"
 
-#: ../pidgin/gtkaccount.c:1124 ../pidgin/gtkprefs.c:2139
+#: ../pidgin/gtkaccount.c:1117 ../pidgin/gtkprefs.c:2133
 msgid "_Host:"
 msgstr "_Umququzeleli:"
 
-#: ../pidgin/gtkaccount.c:1128
+#: ../pidgin/gtkaccount.c:1121
 msgid "_Port:"
 msgstr "I_siqhagamsheli:"
 
-#: ../pidgin/gtkaccount.c:1145 ../pidgin/gtkprefs.c:2191
+#: ../pidgin/gtkaccount.c:1138 ../pidgin/gtkprefs.c:2185
 msgid "Pa_ssword:"
 msgstr "I-Pa_ssword:"
 
-#: ../pidgin/gtkaccount.c:1214
+#: ../pidgin/gtkaccount.c:1207
 msgid "Use _silence suppression"
 msgstr ""
 
-#: ../pidgin/gtkaccount.c:1219
+#: ../pidgin/gtkaccount.c:1212
 msgid "_Voice and Video"
 msgstr ""
 
-#: ../pidgin/gtkaccount.c:1308
+#: ../pidgin/gtkaccount.c:1301
 msgid "Unable to save new account"
 msgstr ""
 
-#: ../pidgin/gtkaccount.c:1309
+#: ../pidgin/gtkaccount.c:1302
 msgid "An account already exists with the specified criteria."
 msgstr ""
 
-#: ../pidgin/gtkaccount.c:1583
+#: ../pidgin/gtkaccount.c:1576
 msgid "Add Account"
 msgstr "Yongeza i-Akhawunti"
 
-#: ../pidgin/gtkaccount.c:1600
+#: ../pidgin/gtkaccount.c:1593
 msgid "_Basic"
 msgstr ""
 
-#: ../pidgin/gtkaccount.c:1608
+#: ../pidgin/gtkaccount.c:1601
 msgid "Create _this new account on the server"
 msgstr ""
 
-#: ../pidgin/gtkaccount.c:1625
+#: ../pidgin/gtkaccount.c:1618
 msgid "P_roxy"
 msgstr ""
 
-#: ../pidgin/gtkaccount.c:2017 ../pidgin/gtkplugin.c:754
+#: ../pidgin/gtkaccount.c:2010 ../pidgin/gtkplugin.c:752
 #: ../pidgin/plugins/convcolors.c:343
 msgid "Enabled"
 msgstr ""
 
-#: ../pidgin/gtkaccount.c:2045
+#: ../pidgin/gtkaccount.c:2038
 msgid "Protocol"
 msgstr "Imithetho yokusebenza"
 
-#: ../pidgin/gtkaccount.c:2232
+#: ../pidgin/gtkaccount.c:2225
 #, c-format
 msgid ""
 "<span size='larger' weight='bold'>Welcome to %s!</span>\n"
@@ -14645,19 +14641,19 @@
 "<b>Accounts->Manage Accounts</b> in the Buddy List window"
 msgstr ""
 
-#: ../pidgin/gtkaccount.c:2582
+#: ../pidgin/gtkaccount.c:2575
 #, c-format
 msgid ""
 "<a href=\"viewinfo\">%s</a>%s%s%s wants to add you (%s) to his or her buddy "
 "list%s%s"
 msgstr ""
 
-#: ../pidgin/gtkaccount.c:2595
+#: ../pidgin/gtkaccount.c:2588
 #, c-format
 msgid "%s%s%s%s wants to add you (%s) to his or her buddy list%s%s"
 msgstr ""
 
-#: ../pidgin/gtkaccount.c:2629
+#: ../pidgin/gtkaccount.c:2622
 msgid "Send Instant Message"
 msgstr ""
 
@@ -14840,8 +14836,8 @@
 msgid "Room _List"
 msgstr ""
 
-#: ../pidgin/gtkblist.c:1404 ../pidgin/gtkprivacy.c:538
-#: ../pidgin/gtkprivacy.c:552
+#: ../pidgin/gtkblist.c:1404 ../pidgin/gtkprivacy.c:537
+#: ../pidgin/gtkprivacy.c:551
 msgid "_Block"
 msgstr ""
 
@@ -15056,7 +15052,7 @@
 msgid "/_Accounts"
 msgstr ""
 
-#: ../pidgin/gtkblist.c:3626 ../pidgin/gtkblist.c:8021
+#: ../pidgin/gtkblist.c:3626 ../pidgin/gtkblist.c:8018
 msgid "/Accounts/Manage Accounts"
 msgstr ""
 
@@ -15345,31 +15341,31 @@
 msgid "/Buddies/Show/Protocol Icons"
 msgstr ""
 
-#: ../pidgin/gtkblist.c:7097
+#: ../pidgin/gtkblist.c:7094
 msgid "Add a buddy.\n"
 msgstr ""
 
-#: ../pidgin/gtkblist.c:7112
+#: ../pidgin/gtkblist.c:7109
 msgid "Buddy's _username:"
 msgstr ""
 
-#: ../pidgin/gtkblist.c:7129
+#: ../pidgin/gtkblist.c:7126
 msgid "(Optional) A_lias:"
 msgstr ""
 
-#: ../pidgin/gtkblist.c:7140
+#: ../pidgin/gtkblist.c:7137
 msgid "(Optional) _Invite message:"
 msgstr ""
 
-#: ../pidgin/gtkblist.c:7145
+#: ../pidgin/gtkblist.c:7142
 msgid "Add buddy to _group:"
 msgstr ""
 
-#: ../pidgin/gtkblist.c:7250
+#: ../pidgin/gtkblist.c:7247
 msgid "This protocol does not support chat rooms."
 msgstr "Lo mthetho wokusebenza awuwaxhasi amagumbi encoko."
 
-#: ../pidgin/gtkblist.c:7266
+#: ../pidgin/gtkblist.c:7263
 msgid ""
 "You are not currently signed on with any protocols that have the ability to "
 "chat."
@@ -15377,7 +15373,7 @@
 "Ngeli thuba awubhaliswanga nakweyiphi na imithetho yokusebenza enawo amandla "
 "okuncokola."
 
-#: ../pidgin/gtkblist.c:7275
+#: ../pidgin/gtkblist.c:7272
 msgid ""
 "Please enter an alias, and the appropriate information about the chat you "
 "would like to add to your buddy list.\n"
@@ -15385,60 +15381,60 @@
 "Nceda ufake elinye igama, kwakunye naluphi na ulwazi olufanelekileyo malunga "
 "nencoko onqwenela ukuyongeza kuluhlu lwakho lomhlobo.\n"
 
-#: ../pidgin/gtkblist.c:7296
+#: ../pidgin/gtkblist.c:7293
 msgid "A_lias:"
 msgstr ""
 
-#: ../pidgin/gtkblist.c:7303
+#: ../pidgin/gtkblist.c:7300
 msgid "_Group:"
 msgstr "_Iqela:"
 
-#: ../pidgin/gtkblist.c:7307
+#: ../pidgin/gtkblist.c:7304
 msgid "Auto_join when account connects."
 msgstr ""
 
-#: ../pidgin/gtkblist.c:7308
+#: ../pidgin/gtkblist.c:7305
 msgid "_Remain in chat after window is closed."
 msgstr ""
 
-#: ../pidgin/gtkblist.c:7331
+#: ../pidgin/gtkblist.c:7328
 msgid "Please enter the name of the group to be added."
 msgstr "Nceda ufake igama leqela elimele ukongezwa."
 
-#: ../pidgin/gtkblist.c:8035
+#: ../pidgin/gtkblist.c:8032
 msgid "Enable Account"
 msgstr ""
 
-#: ../pidgin/gtkblist.c:8040
+#: ../pidgin/gtkblist.c:8037
 msgid "<PurpleMain>/Accounts/Enable Account"
 msgstr ""
 
-#: ../pidgin/gtkblist.c:8094
+#: ../pidgin/gtkblist.c:8091
 msgid "<PurpleMain>/Accounts/"
 msgstr ""
 
-#: ../pidgin/gtkblist.c:8115
+#: ../pidgin/gtkblist.c:8112
 msgid "_Edit Account"
 msgstr ""
 
-#: ../pidgin/gtkblist.c:8133
+#: ../pidgin/gtkblist.c:8130
 msgid "Set _Mood..."
 msgstr ""
 
-#: ../pidgin/gtkblist.c:8143 ../pidgin/gtkconv.c:3345
+#: ../pidgin/gtkblist.c:8140 ../pidgin/gtkconv.c:3345
 #: ../pidgin/gtkimhtml.c:1862
 msgid "No actions available"
 msgstr "Akukho zintshukumo ezifumanekayo"
 
-#: ../pidgin/gtkblist.c:8150
+#: ../pidgin/gtkblist.c:8147
 msgid "_Disable"
 msgstr ""
 
-#: ../pidgin/gtkblist.c:8168
+#: ../pidgin/gtkblist.c:8165
 msgid "/Tools"
 msgstr ""
 
-#: ../pidgin/gtkblist.c:8239
+#: ../pidgin/gtkblist.c:8236
 msgid "/Buddies/Sort Buddies"
 msgstr ""
 
@@ -15765,7 +15761,7 @@
 msgstr ""
 
 #. Build the Send To menu
-#: ../pidgin/gtkconv.c:3885 ../pidgin/gtkconv.c:8618
+#: ../pidgin/gtkconv.c:3885 ../pidgin/gtkconv.c:8615
 msgid "S_end To"
 msgstr ""
 
@@ -15786,84 +15782,84 @@
 msgid "Find:"
 msgstr ""
 
-#: ../pidgin/gtkconv.c:6176 ../pidgin/gtkconv.c:6294
+#: ../pidgin/gtkconv.c:6173 ../pidgin/gtkconv.c:6291
 #, c-format
 msgid "%d person in room"
 msgid_plural "%d people in room"
 msgstr[0] "umntu osendlini oyi-%d"
 msgstr[1] "abantu abasendlini aba-%d"
 
-#: ../pidgin/gtkconv.c:6827
+#: ../pidgin/gtkconv.c:6824
 msgid "Stopped Typing"
 msgstr ""
 
-#: ../pidgin/gtkconv.c:6830
+#: ../pidgin/gtkconv.c:6827
 msgid "Nick Said"
 msgstr ""
 
-#: ../pidgin/gtkconv.c:6833
+#: ../pidgin/gtkconv.c:6830
 msgid "Unread Messages"
 msgstr ""
 
-#: ../pidgin/gtkconv.c:6839
+#: ../pidgin/gtkconv.c:6836
 msgid "New Event"
 msgstr ""
 
-#: ../pidgin/gtkconv.c:7605
+#: ../pidgin/gtkconv.c:7602
 msgid ""
 "The account has disconnected and you are no longer in this chat. You will "
 "automatically rejoin the chat when the account reconnects."
 msgstr ""
 
-#: ../pidgin/gtkconv.c:8096
+#: ../pidgin/gtkconv.c:8093
 msgid "clear: Clears all conversation scrollbacks."
 msgstr ""
 
-#: ../pidgin/gtkconv.c:8301
+#: ../pidgin/gtkconv.c:8298
 msgid "Confirm close"
 msgstr ""
 
-#: ../pidgin/gtkconv.c:8333
+#: ../pidgin/gtkconv.c:8330
 msgid "You have unread messages. Are you sure you want to close the window?"
 msgstr ""
 
-#: ../pidgin/gtkconv.c:8956
+#: ../pidgin/gtkconv.c:8953
 msgid "Close other tabs"
 msgstr ""
 
-#: ../pidgin/gtkconv.c:8962
+#: ../pidgin/gtkconv.c:8959
 msgid "Close all tabs"
 msgstr ""
 
-#: ../pidgin/gtkconv.c:8970
+#: ../pidgin/gtkconv.c:8967
 msgid "Detach this tab"
 msgstr ""
 
-#: ../pidgin/gtkconv.c:8976
+#: ../pidgin/gtkconv.c:8973
 msgid "Close this tab"
 msgstr ""
 
-#: ../pidgin/gtkconv.c:9481
+#: ../pidgin/gtkconv.c:9478
 msgid "Close conversation"
 msgstr "Vala iNcoko"
 
-#: ../pidgin/gtkconv.c:10071
+#: ../pidgin/gtkconv.c:10068
 msgid "Last created window"
 msgstr "Ifestile yokugqibela eyiliweyo"
 
-#: ../pidgin/gtkconv.c:10073
+#: ../pidgin/gtkconv.c:10070
 msgid "Separate IM and Chat windows"
 msgstr "Hlukanisa iifestile ze-IM nezeNcoko"
 
-#: ../pidgin/gtkconv.c:10075 ../pidgin/gtkprefs.c:2015
+#: ../pidgin/gtkconv.c:10072 ../pidgin/gtkprefs.c:2009
 msgid "New window"
 msgstr "Ifestile entsha"
 
-#: ../pidgin/gtkconv.c:10077
+#: ../pidgin/gtkconv.c:10074
 msgid "By group"
 msgstr "Ngeqela"
 
-#: ../pidgin/gtkconv.c:10079
+#: ../pidgin/gtkconv.c:10076
 msgid "By account"
 msgstr "Nge-akhawunti"
 
@@ -15998,7 +15994,7 @@
 msgid "Afrikaans"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:152 ../pidgin/gtkdialogs.c:273
+#: ../pidgin/gtkdialogs.c:152 ../pidgin/gtkdialogs.c:265
 msgid "Arabic"
 msgstr ""
 
@@ -16015,13 +16011,13 @@
 msgstr ""
 
 #: ../pidgin/gtkdialogs.c:156 ../pidgin/gtkdialogs.c:157
-#: ../pidgin/gtkdialogs.c:274
+#: ../pidgin/gtkdialogs.c:266
 msgid "Bulgarian"
 msgstr "IsiBulgaria"
 
 #: ../pidgin/gtkdialogs.c:158 ../pidgin/gtkdialogs.c:159
-#: ../pidgin/gtkdialogs.c:160 ../pidgin/gtkdialogs.c:275
-#: ../pidgin/gtkdialogs.c:276
+#: ../pidgin/gtkdialogs.c:160 ../pidgin/gtkdialogs.c:267
+#: ../pidgin/gtkdialogs.c:268
 msgid "Bengali"
 msgstr ""
 
@@ -16029,31 +16025,30 @@
 msgid "Bengali-India"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:163
+#: ../pidgin/gtkdialogs.c:162
 msgid "Bosnian"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:164 ../pidgin/gtkdialogs.c:277
-#: ../pidgin/gtkdialogs.c:278
+#: ../pidgin/gtkdialogs.c:163 ../pidgin/gtkdialogs.c:269
+#: ../pidgin/gtkdialogs.c:270
 msgid "Catalan"
 msgstr "IsiCatala"
 
-#: ../pidgin/gtkdialogs.c:165 ../pidgin/gtkdialogs.c:166
+#: ../pidgin/gtkdialogs.c:164 ../pidgin/gtkdialogs.c:165
 msgid "Valencian-Catalan"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:167 ../pidgin/gtkdialogs.c:279
-#: ../pidgin/gtkdialogs.c:280
+#: ../pidgin/gtkdialogs.c:166 ../pidgin/gtkdialogs.c:271
+#: ../pidgin/gtkdialogs.c:272
 msgid "Czech"
 msgstr "IsiCzech"
 
-#: ../pidgin/gtkdialogs.c:168 ../pidgin/gtkdialogs.c:281
-#: ../pidgin/gtkdialogs.c:282
+#: ../pidgin/gtkdialogs.c:167 ../pidgin/gtkdialogs.c:168
 msgid "Danish"
 msgstr "IsiDanish"
 
-#: ../pidgin/gtkdialogs.c:169 ../pidgin/gtkdialogs.c:283
-#: ../pidgin/gtkdialogs.c:284
+#: ../pidgin/gtkdialogs.c:169 ../pidgin/gtkdialogs.c:273
+#: ../pidgin/gtkdialogs.c:274
 msgid "German"
 msgstr "IsiJamani"
 
@@ -16066,11 +16061,11 @@
 msgid "Greek"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:175 ../pidgin/gtkdialogs.c:285
+#: ../pidgin/gtkdialogs.c:175
 msgid "Australian English"
 msgstr "IsiNgesi saseAustralia"
 
-#: ../pidgin/gtkdialogs.c:176 ../pidgin/gtkdialogs.c:286
+#: ../pidgin/gtkdialogs.c:176 ../pidgin/gtkdialogs.c:275
 msgid "British English"
 msgstr "IsiNgesi saseBritani"
 
@@ -16082,72 +16077,72 @@
 msgid "Esperanto"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:179 ../pidgin/gtkdialogs.c:287
-#: ../pidgin/gtkdialogs.c:288 ../pidgin/gtkdialogs.c:289
-#: ../pidgin/gtkdialogs.c:290
+#: ../pidgin/gtkdialogs.c:179 ../pidgin/gtkdialogs.c:276
+#: ../pidgin/gtkdialogs.c:277 ../pidgin/gtkdialogs.c:278
+#: ../pidgin/gtkdialogs.c:279
 msgid "Spanish"
 msgstr "IsiSpanish"
 
-#: ../pidgin/gtkdialogs.c:181
+#: ../pidgin/gtkdialogs.c:180
 msgid "Estonian"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:182 ../pidgin/gtkdialogs.c:291
-#: ../pidgin/gtkdialogs.c:292
+#: ../pidgin/gtkdialogs.c:181 ../pidgin/gtkdialogs.c:280
+#: ../pidgin/gtkdialogs.c:281
 msgid "Basque"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:183 ../pidgin/gtkdialogs.c:184
-#: ../pidgin/gtkdialogs.c:185
+#: ../pidgin/gtkdialogs.c:182 ../pidgin/gtkdialogs.c:183
+#: ../pidgin/gtkdialogs.c:184
 msgid "Persian"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:186 ../pidgin/gtkdialogs.c:293
-#: ../pidgin/gtkdialogs.c:294
+#: ../pidgin/gtkdialogs.c:185 ../pidgin/gtkdialogs.c:282
+#: ../pidgin/gtkdialogs.c:283
 msgid "Finnish"
 msgstr "IsiFinnish"
 
-#: ../pidgin/gtkdialogs.c:187 ../pidgin/gtkdialogs.c:295
-#: ../pidgin/gtkdialogs.c:296 ../pidgin/gtkdialogs.c:297
-#: ../pidgin/gtkdialogs.c:298
+#: ../pidgin/gtkdialogs.c:186 ../pidgin/gtkdialogs.c:284
+#: ../pidgin/gtkdialogs.c:285 ../pidgin/gtkdialogs.c:286
+#: ../pidgin/gtkdialogs.c:287
 msgid "French"
 msgstr "IsiFrentshi"
 
-#: ../pidgin/gtkdialogs.c:188 ../pidgin/gtkdialogs.c:189
+#: ../pidgin/gtkdialogs.c:187 ../pidgin/gtkdialogs.c:188
 msgid "Irish"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:190 ../pidgin/gtkdialogs.c:191
-#: ../pidgin/gtkdialogs.c:299
+#: ../pidgin/gtkdialogs.c:189 ../pidgin/gtkdialogs.c:190
+#: ../pidgin/gtkdialogs.c:288
 msgid "Galician"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:192 ../pidgin/gtkdialogs.c:193
+#: ../pidgin/gtkdialogs.c:191 ../pidgin/gtkdialogs.c:192
 msgid "Gujarati"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:193
+#: ../pidgin/gtkdialogs.c:192
 msgid "Gujarati Language Team"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:194 ../pidgin/gtkdialogs.c:300
+#: ../pidgin/gtkdialogs.c:193 ../pidgin/gtkdialogs.c:289
 msgid "Hebrew"
 msgstr "IsiHebheru"
 
-#: ../pidgin/gtkdialogs.c:195 ../pidgin/gtkdialogs.c:196
-#: ../pidgin/gtkdialogs.c:301
+#: ../pidgin/gtkdialogs.c:194 ../pidgin/gtkdialogs.c:195
+#: ../pidgin/gtkdialogs.c:290
 msgid "Hindi"
 msgstr "IsiHindi"
 
-#: ../pidgin/gtkdialogs.c:197
+#: ../pidgin/gtkdialogs.c:196
 msgid "Croatian"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:198 ../pidgin/gtkdialogs.c:302
+#: ../pidgin/gtkdialogs.c:197 ../pidgin/gtkdialogs.c:291
 msgid "Hungarian"
 msgstr "IsiHungaria"
 
-#: ../pidgin/gtkdialogs.c:303
+#: ../pidgin/gtkdialogs.c:198
 msgid "Armenian"
 msgstr ""
 
@@ -16155,17 +16150,17 @@
 msgid "Indonesian"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:200 ../pidgin/gtkdialogs.c:304
+#: ../pidgin/gtkdialogs.c:200 ../pidgin/gtkdialogs.c:292
 msgid "Italian"
 msgstr "IsiTaliyana"
 
-#: ../pidgin/gtkdialogs.c:201 ../pidgin/gtkdialogs.c:305
-#: ../pidgin/gtkdialogs.c:306 ../pidgin/gtkdialogs.c:307
-#: ../pidgin/gtkdialogs.c:308
+#: ../pidgin/gtkdialogs.c:201 ../pidgin/gtkdialogs.c:293
+#: ../pidgin/gtkdialogs.c:294 ../pidgin/gtkdialogs.c:295
+#: ../pidgin/gtkdialogs.c:296
 msgid "Japanese"
 msgstr "IsiJapane"
 
-#: ../pidgin/gtkdialogs.c:202 ../pidgin/gtkdialogs.c:309
+#: ../pidgin/gtkdialogs.c:202 ../pidgin/gtkdialogs.c:297
 msgid "Georgian"
 msgstr ""
 
@@ -16173,216 +16168,215 @@
 msgid "Ubuntu Georgian Translators"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:204
+#: ../pidgin/gtkdialogs.c:203
 msgid "Khmer"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:205
+#: ../pidgin/gtkdialogs.c:204
 msgid "Kannada"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:205
+#: ../pidgin/gtkdialogs.c:204
 msgid "Kannada Translation team"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:206 ../pidgin/gtkdialogs.c:310
-#: ../pidgin/gtkdialogs.c:311
+#: ../pidgin/gtkdialogs.c:205 ../pidgin/gtkdialogs.c:298
+#: ../pidgin/gtkdialogs.c:299
 msgid "Korean"
 msgstr "IsiKorea"
 
-#: ../pidgin/gtkdialogs.c:208 ../pidgin/gtkdialogs.c:209
-#: ../pidgin/gtkdialogs.c:210
+#: ../pidgin/gtkdialogs.c:206 ../pidgin/gtkdialogs.c:207
+#: ../pidgin/gtkdialogs.c:208
 msgid "Kurdish"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:312
+#: ../pidgin/gtkdialogs.c:209
 msgid "Lao"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:212 ../pidgin/gtkdialogs.c:313
-#: ../pidgin/gtkdialogs.c:314 ../pidgin/gtkdialogs.c:315
+#: ../pidgin/gtkdialogs.c:210 ../pidgin/gtkdialogs.c:300
+#: ../pidgin/gtkdialogs.c:301 ../pidgin/gtkdialogs.c:302
 msgid "Lithuanian"
 msgstr "IsiLithuania"
 
-#: ../pidgin/gtkdialogs.c:214 ../pidgin/gtkdialogs.c:215
+#: ../pidgin/gtkdialogs.c:211 ../pidgin/gtkdialogs.c:212
 msgid "Maithili"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:216
+#: ../pidgin/gtkdialogs.c:213
 msgid "Meadow Mari"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:217 ../pidgin/gtkdialogs.c:218
-#: ../pidgin/gtkdialogs.c:219 ../pidgin/gtkdialogs.c:316
+#: ../pidgin/gtkdialogs.c:214 ../pidgin/gtkdialogs.c:215
+#: ../pidgin/gtkdialogs.c:216 ../pidgin/gtkdialogs.c:303
 msgid "Macedonian"
 msgstr "IsiMacedonia"
 
-#: ../pidgin/gtkdialogs.c:220
+#: ../pidgin/gtkdialogs.c:217
 msgid "Malayalam"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:221
+#: ../pidgin/gtkdialogs.c:218
 msgid "Mongolian"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:222
+#: ../pidgin/gtkdialogs.c:219
 msgid "Marathi"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:317
+#: ../pidgin/gtkdialogs.c:220
 msgid "Malay"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:223
+#: ../pidgin/gtkdialogs.c:221
 msgid "Burmese"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:224 ../pidgin/gtkdialogs.c:318
-#: ../pidgin/gtkdialogs.c:319 ../pidgin/gtkdialogs.c:320
-#: ../pidgin/gtkdialogs.c:321
+#: ../pidgin/gtkdialogs.c:222 ../pidgin/gtkdialogs.c:304
+#: ../pidgin/gtkdialogs.c:305 ../pidgin/gtkdialogs.c:306
 msgid "Bokmål Norwegian"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:225
+#: ../pidgin/gtkdialogs.c:223
 msgid "Nepali"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:226 ../pidgin/gtkdialogs.c:322
+#: ../pidgin/gtkdialogs.c:224 ../pidgin/gtkdialogs.c:307
 msgid "Dutch, Flemish"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:227
+#: ../pidgin/gtkdialogs.c:225
 msgid "Norwegian Nynorsk"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:228 ../pidgin/gtkdialogs.c:323
+#: ../pidgin/gtkdialogs.c:226
 msgid "Occitan"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:229
+#: ../pidgin/gtkdialogs.c:227
 msgid "Oriya"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:230
+#: ../pidgin/gtkdialogs.c:228
 msgid "Punjabi"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:231 ../pidgin/gtkdialogs.c:324
-#: ../pidgin/gtkdialogs.c:325 ../pidgin/gtkdialogs.c:326
-#: ../pidgin/gtkdialogs.c:327 ../pidgin/gtkdialogs.c:328
+#: ../pidgin/gtkdialogs.c:229 ../pidgin/gtkdialogs.c:308
+#: ../pidgin/gtkdialogs.c:309 ../pidgin/gtkdialogs.c:310
+#: ../pidgin/gtkdialogs.c:311 ../pidgin/gtkdialogs.c:312
 msgid "Polish"
 msgstr "IsiPolishi"
 
-#: ../pidgin/gtkdialogs.c:232 ../pidgin/gtkdialogs.c:329
+#: ../pidgin/gtkdialogs.c:230 ../pidgin/gtkdialogs.c:313
 msgid "Portuguese"
 msgstr "IsiPhutukezi"
 
-#: ../pidgin/gtkdialogs.c:233 ../pidgin/gtkdialogs.c:330
-#: ../pidgin/gtkdialogs.c:331
+#: ../pidgin/gtkdialogs.c:231 ../pidgin/gtkdialogs.c:314
+#: ../pidgin/gtkdialogs.c:315
 msgid "Portuguese-Brazil"
 msgstr "IsiPhutukezi saseBrazili"
 
-#: ../pidgin/gtkdialogs.c:234
+#: ../pidgin/gtkdialogs.c:232
 msgid "Pashto"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:235 ../pidgin/gtkdialogs.c:236
+#: ../pidgin/gtkdialogs.c:233 ../pidgin/gtkdialogs.c:234
 msgid "Romanian"
 msgstr "IsiRomania"
 
-#: ../pidgin/gtkdialogs.c:237 ../pidgin/gtkdialogs.c:332
-#: ../pidgin/gtkdialogs.c:333 ../pidgin/gtkdialogs.c:334
+#: ../pidgin/gtkdialogs.c:235 ../pidgin/gtkdialogs.c:316
+#: ../pidgin/gtkdialogs.c:317 ../pidgin/gtkdialogs.c:318
 msgid "Russian"
 msgstr "IsiRashiya"
 
-#: ../pidgin/gtkdialogs.c:239 ../pidgin/gtkdialogs.c:240
-#: ../pidgin/gtkdialogs.c:335 ../pidgin/gtkdialogs.c:336
-#: ../pidgin/gtkdialogs.c:337
+#: ../pidgin/gtkdialogs.c:236 ../pidgin/gtkdialogs.c:237
+#: ../pidgin/gtkdialogs.c:319 ../pidgin/gtkdialogs.c:320
+#: ../pidgin/gtkdialogs.c:321
 msgid "Slovak"
 msgstr "IsiSlovak"
 
-#: ../pidgin/gtkdialogs.c:241 ../pidgin/gtkdialogs.c:338
+#: ../pidgin/gtkdialogs.c:238 ../pidgin/gtkdialogs.c:322
 msgid "Slovenian"
 msgstr "IsiSlovenia"
 
-#: ../pidgin/gtkdialogs.c:242
+#: ../pidgin/gtkdialogs.c:239
 msgid "Albanian"
 msgstr "IsiAlbania"
 
-#: ../pidgin/gtkdialogs.c:243 ../pidgin/gtkdialogs.c:339
-#: ../pidgin/gtkdialogs.c:340
+#: ../pidgin/gtkdialogs.c:240 ../pidgin/gtkdialogs.c:323
+#: ../pidgin/gtkdialogs.c:324
 msgid "Serbian"
 msgstr "IsiSerbia"
 
-#: ../pidgin/gtkdialogs.c:244
+#: ../pidgin/gtkdialogs.c:241
 msgid "Serbian Latin"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:245 ../pidgin/gtkdialogs.c:246
+#: ../pidgin/gtkdialogs.c:242 ../pidgin/gtkdialogs.c:243
 msgid "Sinhala"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:247 ../pidgin/gtkdialogs.c:341
-#: ../pidgin/gtkdialogs.c:342 ../pidgin/gtkdialogs.c:343
+#: ../pidgin/gtkdialogs.c:244 ../pidgin/gtkdialogs.c:325
+#: ../pidgin/gtkdialogs.c:326
 msgid "Swedish"
 msgstr "IsiSwede"
 
-#: ../pidgin/gtkdialogs.c:248
+#: ../pidgin/gtkdialogs.c:245
 msgid "Swahili"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:249 ../pidgin/gtkdialogs.c:250
+#: ../pidgin/gtkdialogs.c:246 ../pidgin/gtkdialogs.c:247
 msgid "Tamil"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:251 ../pidgin/gtkdialogs.c:344
+#: ../pidgin/gtkdialogs.c:248 ../pidgin/gtkdialogs.c:327
 msgid "Telugu"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:252
+#: ../pidgin/gtkdialogs.c:249
 msgid "Thai"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:254
+#: ../pidgin/gtkdialogs.c:250
 msgid "Ukranian"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:255
+#: ../pidgin/gtkdialogs.c:251
 msgid "Urdu"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:260 ../pidgin/gtkdialogs.c:347
+#: ../pidgin/gtkdialogs.c:252 ../pidgin/gtkdialogs.c:330
 msgid "Vietnamese"
 msgstr "IsiVietnam"
 
-#: ../pidgin/gtkdialogs.c:261 ../pidgin/gtkdialogs.c:348
-#: ../pidgin/gtkdialogs.c:349
+#: ../pidgin/gtkdialogs.c:253 ../pidgin/gtkdialogs.c:331
+#: ../pidgin/gtkdialogs.c:332
 msgid "Simplified Chinese"
 msgstr "IsiTshayina esiLula"
 
-#: ../pidgin/gtkdialogs.c:262 ../pidgin/gtkdialogs.c:263
-#: ../pidgin/gtkdialogs.c:264
+#: ../pidgin/gtkdialogs.c:254 ../pidgin/gtkdialogs.c:255
+#: ../pidgin/gtkdialogs.c:256
 msgid "Hong Kong Chinese"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:265 ../pidgin/gtkdialogs.c:266
-#: ../pidgin/gtkdialogs.c:350
+#: ../pidgin/gtkdialogs.c:257 ../pidgin/gtkdialogs.c:258
+#: ../pidgin/gtkdialogs.c:333
 msgid "Traditional Chinese"
 msgstr "IsiTshayin seMveli"
 
-#: ../pidgin/gtkdialogs.c:272
+#: ../pidgin/gtkdialogs.c:264
 msgid "Amharic"
 msgstr "IsiAmharic"
 
-#: ../pidgin/gtkdialogs.c:345 ../pidgin/gtkdialogs.c:346
+#: ../pidgin/gtkdialogs.c:328 ../pidgin/gtkdialogs.c:329
 msgid "Turkish"
 msgstr "IsiTurkishi"
 
-#: ../pidgin/gtkdialogs.c:347
+#: ../pidgin/gtkdialogs.c:330
 msgid "T.M.Thanh and the Gnome-Vi Team"
 msgstr "I-T.M.Thanh neGnome-Vi Team"
 
-#: ../pidgin/gtkdialogs.c:525
+#: ../pidgin/gtkdialogs.c:508
 #, c-format
 msgid ""
 "%s is a messaging client based on libpurple which is capable of connecting "
@@ -16393,7 +16387,7 @@
 " There is no warranty for %s.<BR><BR>"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:535
+#: ../pidgin/gtkdialogs.c:518
 #, c-format
 msgid ""
 "<FONT SIZE=\"4\"><B>Helpful Resources</B></FONT><BR>\t<A "
@@ -16402,7 +16396,7 @@
 "devel@conference.pidgin.im<BR><BR>"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:549
+#: ../pidgin/gtkdialogs.c:532
 msgid ""
 "<font size=\"4\"><b>Help from other Pidgin users</b></font> is available by "
 "e-mailing <a "
@@ -16414,114 +16408,114 @@
 "responses may be less helpful.<br/>"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:559
+#: ../pidgin/gtkdialogs.c:542
 #, c-format
 msgid "About %s"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:581
+#: ../pidgin/gtkdialogs.c:564
 msgid "Build Information"
 msgstr ""
 
 #. End of not to be translated section
-#: ../pidgin/gtkdialogs.c:746
+#: ../pidgin/gtkdialogs.c:733
 #, c-format
 msgid "%s Build Information"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:767
+#: ../pidgin/gtkdialogs.c:754
 msgid "Current Developers"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:773
+#: ../pidgin/gtkdialogs.c:760
 msgid "Crazy Patch Writers"
 msgstr "AbaBhali beziZiba abangamaTshantliziyo"
 
-#: ../pidgin/gtkdialogs.c:779
+#: ../pidgin/gtkdialogs.c:766
 msgid "Retired Developers"
 msgstr "AbaPhuhlisi abakuMhlalaphantsi"
 
-#: ../pidgin/gtkdialogs.c:785
+#: ../pidgin/gtkdialogs.c:772
 msgid "Retired Crazy Patch Writers"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:788
+#: ../pidgin/gtkdialogs.c:775
 #, c-format
 msgid "%s Developer Information"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:809
+#: ../pidgin/gtkdialogs.c:796
 msgid "Current Translators"
 msgstr "Abaguquleli baNgoku"
 
-#: ../pidgin/gtkdialogs.c:815
+#: ../pidgin/gtkdialogs.c:802
 msgid "Past Translators"
 msgstr "AbaGuquleli bexa eliDlulileyo"
 
-#: ../pidgin/gtkdialogs.c:818
+#: ../pidgin/gtkdialogs.c:805
 #, c-format
 msgid "%s Translator Information"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:829
+#: ../pidgin/gtkdialogs.c:816
 #, c-format
 msgid "%s Plugin Information"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:838
+#: ../pidgin/gtkdialogs.c:825
 msgid "Plugin Information"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:894 ../pidgin/gtkdialogs.c:1033
-#: ../pidgin/gtkdialogs.c:1114
+#: ../pidgin/gtkdialogs.c:881 ../pidgin/gtkdialogs.c:1020
+#: ../pidgin/gtkdialogs.c:1101
 msgid "_Name"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:899 ../pidgin/gtkdialogs.c:1038
-#: ../pidgin/gtkdialogs.c:1119
+#: ../pidgin/gtkdialogs.c:886 ../pidgin/gtkdialogs.c:1025
+#: ../pidgin/gtkdialogs.c:1106
 msgid "_Account"
 msgstr "i-_Akhawunti"
 
-#: ../pidgin/gtkdialogs.c:1046
+#: ../pidgin/gtkdialogs.c:1033
 msgid "Get User Info"
 msgstr "Fumana ulwazi ngomsebenzisi"
 
-#: ../pidgin/gtkdialogs.c:1048
+#: ../pidgin/gtkdialogs.c:1035
 msgid ""
 "Please enter the username or alias of the person whose info you would like "
 "to view."
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:1138
+#: ../pidgin/gtkdialogs.c:1125
 msgid "View User Log"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:1160
+#: ../pidgin/gtkdialogs.c:1147
 msgid "Alias Contact"
 msgstr "Dibana noMnye"
 
-#: ../pidgin/gtkdialogs.c:1161
+#: ../pidgin/gtkdialogs.c:1148
 msgid "Enter an alias for this contact."
 msgstr "Bhala elinye igama malunga nalo mntu uqhagamshelana naye."
 
-#: ../pidgin/gtkdialogs.c:1183
+#: ../pidgin/gtkdialogs.c:1170
 #, c-format
 msgid "Enter an alias for %s."
 msgstr "Faka elinye igama le %s."
 
-#: ../pidgin/gtkdialogs.c:1185
+#: ../pidgin/gtkdialogs.c:1172
 msgid "Alias Buddy"
 msgstr "Elinye iGama lomHlobo"
 
-#: ../pidgin/gtkdialogs.c:1206
+#: ../pidgin/gtkdialogs.c:1193
 msgid "Alias Chat"
 msgstr "Ncokola noneLinye igama"
 
-#: ../pidgin/gtkdialogs.c:1207
+#: ../pidgin/gtkdialogs.c:1194
 msgid "Enter an alias for this chat."
 msgstr "Bhala elinye igama malunga nale ncoko."
 
-#: ../pidgin/gtkdialogs.c:1246
+#: ../pidgin/gtkdialogs.c:1233
 #, c-format
 msgid ""
 "You are about to remove the contact containing %s and %d other buddy from "
@@ -16532,30 +16526,30 @@
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../pidgin/gtkdialogs.c:1254
+#: ../pidgin/gtkdialogs.c:1241
 msgid "Remove Contact"
 msgstr "Susa umQhagamshelanisi"
 
-#: ../pidgin/gtkdialogs.c:1257
+#: ../pidgin/gtkdialogs.c:1244
 msgid "_Remove Contact"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:1288
+#: ../pidgin/gtkdialogs.c:1275
 #, c-format
 msgid ""
 "You are about to merge the group called %s into the group called %s. Do you "
 "want to continue?"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:1295
+#: ../pidgin/gtkdialogs.c:1282
 msgid "Merge Groups"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:1298
+#: ../pidgin/gtkdialogs.c:1285
 msgid "_Merge Groups"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:1348
+#: ../pidgin/gtkdialogs.c:1335
 #, c-format
 msgid ""
 "You are about to remove the group %s and all its members from your buddy "
@@ -16564,30 +16558,30 @@
 "Sewukufuphi nokususa iqela i%s kwakunye nawo onke amalungu alo kuluhlu "
 "lwakho lobuhlobo. Ingaba ufuna ukuqhubeka?"
 
-#: ../pidgin/gtkdialogs.c:1351
+#: ../pidgin/gtkdialogs.c:1338
 msgid "Remove Group"
 msgstr "Susa iQela"
 
-#: ../pidgin/gtkdialogs.c:1354
+#: ../pidgin/gtkdialogs.c:1341
 msgid "_Remove Group"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:1387
+#: ../pidgin/gtkdialogs.c:1374
 #, c-format
 msgid ""
 "You are about to remove %s from your buddy list.  Do you want to continue?"
 msgstr ""
 "Sewukufuphi ukususa i%s kuluhlu lwakho lobuhlobo. Ingaba ukufuna ukuqhubeka?"
 
-#: ../pidgin/gtkdialogs.c:1390
+#: ../pidgin/gtkdialogs.c:1377
 msgid "Remove Buddy"
 msgstr "Susa umHlobo"
 
-#: ../pidgin/gtkdialogs.c:1393
+#: ../pidgin/gtkdialogs.c:1380
 msgid "_Remove Buddy"
 msgstr "_Susa umHlobo"
 
-#: ../pidgin/gtkdialogs.c:1414
+#: ../pidgin/gtkdialogs.c:1401
 #, c-format
 msgid ""
 "You are about to remove the chat %s from your buddy list.  Do you want to "
@@ -16596,11 +16590,11 @@
 "Sewukufuphi ukususa i%s yencoko kuluhlu lwakho lobuhlobo.  Ingaba ufuna "
 "ukuqhubeka?"
 
-#: ../pidgin/gtkdialogs.c:1417
+#: ../pidgin/gtkdialogs.c:1404
 msgid "Remove Chat"
 msgstr "Susa iNcoko"
 
-#: ../pidgin/gtkdialogs.c:1420
+#: ../pidgin/gtkdialogs.c:1407
 msgid "_Remove Chat"
 msgstr ""
 
@@ -16668,25 +16662,25 @@
 msgid "<b>Sending As:</b>"
 msgstr "<b>Thumela Njenge:</b>"
 
-#: ../pidgin/gtkft.c:474 ../pidgin/gtkutils.c:3304
+#: ../pidgin/gtkft.c:474 ../pidgin/gtkutils.c:3296
 msgid "There is no application configured to open this type of file."
 msgstr "Akukho nkqubo yokusebenza ukuvula olu hlobo lwefayili."
 
-#: ../pidgin/gtkft.c:479 ../pidgin/gtkutils.c:3309
+#: ../pidgin/gtkft.c:479 ../pidgin/gtkutils.c:3301
 msgid "An error occurred while opening the file."
 msgstr "Kwenzeke impazamo xeshikweni uvula ifayili."
 
-#: ../pidgin/gtkft.c:516 ../pidgin/gtkutils.c:3345
+#: ../pidgin/gtkft.c:516 ../pidgin/gtkutils.c:3337
 #, c-format
 msgid "Error launching %s: %s"
 msgstr ""
 
-#: ../pidgin/gtkft.c:525 ../pidgin/gtkutils.c:3353
+#: ../pidgin/gtkft.c:525 ../pidgin/gtkutils.c:3345
 #, c-format
 msgid "Error running %s"
 msgstr ""
 
-#: ../pidgin/gtkft.c:526 ../pidgin/gtkutils.c:3354
+#: ../pidgin/gtkft.c:526 ../pidgin/gtkutils.c:3346
 #, c-format
 msgid "Process returned error code %d"
 msgstr ""
@@ -17158,7 +17152,7 @@
 msgid "display the current version and exit"
 msgstr ""
 
-#: ../pidgin/gtkmain.c:497
+#: ../pidgin/gtkmain.c:493
 #, c-format
 msgid ""
 "%s %s has segfaulted and attempted to dump a core file.\n"
@@ -17175,42 +17169,42 @@
 "%swiki/GetABacktrace\n"
 msgstr ""
 
-#: ../pidgin/gtkmain.c:785
+#: ../pidgin/gtkmain.c:781
 #, c-format
 msgid "Exiting because another libpurple client is already running.\n"
 msgstr ""
 
-#: ../pidgin/gtkmedia.c:273
+#: ../pidgin/gtkmedia.c:271
 msgid "_Media"
 msgstr ""
 
-#: ../pidgin/gtkmedia.c:274
+#: ../pidgin/gtkmedia.c:272
 msgid "_Hangup"
 msgstr ""
 
-#: ../pidgin/gtkmedia.c:637
+#: ../pidgin/gtkmedia.c:632
 #, c-format
 msgid "%s wishes to start an audio/video session with you."
 msgstr ""
 
-#: ../pidgin/gtkmedia.c:643
+#: ../pidgin/gtkmedia.c:638
 #, c-format
 msgid "%s wishes to start a video session with you."
 msgstr ""
 
-#: ../pidgin/gtkmedia.c:649
+#: ../pidgin/gtkmedia.c:644
 msgid "Incoming Call"
 msgstr ""
 
-#: ../pidgin/gtkmedia.c:962
+#: ../pidgin/gtkmedia.c:792
 msgid "_Hold"
 msgstr ""
 
-#: ../pidgin/gtkmedia.c:1033 ../pidgin/pidginstock.c:92
+#: ../pidgin/gtkmedia.c:863 ../pidgin/pidginstock.c:92
 msgid "_Pause"
 msgstr "_Nqumama"
 
-#: ../pidgin/gtkmedia.c:1051
+#: ../pidgin/gtkmedia.c:881
 msgid "_Mute"
 msgstr ""
 
@@ -17314,27 +17308,27 @@
 "Check the plugin website for an update.</span>"
 msgstr ""
 
-#: ../pidgin/gtkplugin.c:593
+#: ../pidgin/gtkplugin.c:591
 msgid "Author"
 msgstr ""
 
-#: ../pidgin/gtkplugin.c:671
+#: ../pidgin/gtkplugin.c:669
 msgid "<b>Written by:</b>"
 msgstr ""
 
-#: ../pidgin/gtkplugin.c:691
+#: ../pidgin/gtkplugin.c:689
 msgid "<b>Web site:</b>"
 msgstr ""
 
-#: ../pidgin/gtkplugin.c:700
+#: ../pidgin/gtkplugin.c:698
 msgid "<b>Filename:</b>"
 msgstr ""
 
-#: ../pidgin/gtkplugin.c:727
+#: ../pidgin/gtkplugin.c:725
 msgid "Configure Pl_ugin"
 msgstr ""
 
-#: ../pidgin/gtkplugin.c:789
+#: ../pidgin/gtkplugin.c:787
 msgid "<b>Plugin Details</b>"
 msgstr ""
 
@@ -17428,7 +17422,7 @@
 msgid "Br_owse..."
 msgstr ""
 
-#: ../pidgin/gtkpounce.c:699 ../pidgin/gtkprefs.c:2660
+#: ../pidgin/gtkpounce.c:699 ../pidgin/gtkprefs.c:2654
 msgid "Pre_view"
 msgstr "Jonga _kwangaphambili"
 
@@ -17513,365 +17507,365 @@
 msgid "Theme failed to unpack."
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:743 ../pidgin/gtkprefs.c:787
+#: ../pidgin/gtkprefs.c:740 ../pidgin/gtkprefs.c:781
 msgid "Theme failed to load."
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:790
+#: ../pidgin/gtkprefs.c:784
 msgid "Theme failed to copy."
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:1091
+#: ../pidgin/gtkprefs.c:1085
 msgid "Theme Selections"
 msgstr ""
 
 #. Instructions
-#: ../pidgin/gtkprefs.c:1094
+#: ../pidgin/gtkprefs.c:1088
 msgid ""
 "Select a theme that you would like to use from the lists below.\n"
 "New themes can be installed by dragging and dropping them onto the theme "
 "list."
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:1108
+#: ../pidgin/gtkprefs.c:1102
 msgid "Buddy List Theme:"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:1114
+#: ../pidgin/gtkprefs.c:1108
 msgid "Status Icon Theme:"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:1120
+#: ../pidgin/gtkprefs.c:1114
 msgid "Sound Theme:"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:1126
+#: ../pidgin/gtkprefs.c:1120
 msgid "Smiley Theme:"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:1299
+#: ../pidgin/gtkprefs.c:1293
 msgid "Keyboard Shortcuts"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:1319
+#: ../pidgin/gtkprefs.c:1313
 msgid "Cl_ose conversations with the Escape key"
 msgstr ""
 
 #. System Tray
-#: ../pidgin/gtkprefs.c:1350
+#: ../pidgin/gtkprefs.c:1344
 msgid "System Tray Icon"
 msgstr "Inkqubo yeTreyi yomFanekiso womQondiso"
 
-#: ../pidgin/gtkprefs.c:1351
+#: ../pidgin/gtkprefs.c:1345
 msgid "_Show system tray icon:"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:1354
+#: ../pidgin/gtkprefs.c:1348
 msgid "On unread messages"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:1360
+#: ../pidgin/gtkprefs.c:1354
 msgid "Conversation Window"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:1361
+#: ../pidgin/gtkprefs.c:1355
 msgid "_Hide new IM conversations:"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:1364 ../pidgin/gtkprefs.c:2755
+#: ../pidgin/gtkprefs.c:1358 ../pidgin/gtkprefs.c:2750
 msgid "When away"
 msgstr "Xa ungekho"
 
-#: ../pidgin/gtkprefs.c:1371
+#: ../pidgin/gtkprefs.c:1365
 msgid "Minimi_ze new conversation windows"
 msgstr ""
 
 #. All the tab options!
-#: ../pidgin/gtkprefs.c:1375
+#: ../pidgin/gtkprefs.c:1369
 msgid "Tabs"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:1377
+#: ../pidgin/gtkprefs.c:1371
 msgid "Show IMs and chats in _tabbed windows"
 msgstr "Bonisa ii-IM neencoko kwifestile ezinee_tab"
 
-#: ../pidgin/gtkprefs.c:1391
+#: ../pidgin/gtkprefs.c:1385
 msgid "Show close b_utton on tabs"
 msgstr "Bonisa iqho_sha lokuvala kwii-tab"
 
-#: ../pidgin/gtkprefs.c:1394
+#: ../pidgin/gtkprefs.c:1388
 msgid "_Placement:"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:1396
+#: ../pidgin/gtkprefs.c:1390
 msgid "Top"
 msgstr "Umphezulu"
 
-#: ../pidgin/gtkprefs.c:1397
+#: ../pidgin/gtkprefs.c:1391
 msgid "Bottom"
 msgstr "Umphantsi"
 
-#: ../pidgin/gtkprefs.c:1398
+#: ../pidgin/gtkprefs.c:1392
 msgid "Left"
 msgstr "Ekhohlo"
 
-#: ../pidgin/gtkprefs.c:1399
+#: ../pidgin/gtkprefs.c:1393
 msgid "Right"
 msgstr "Ekunene"
 
-#: ../pidgin/gtkprefs.c:1400
+#: ../pidgin/gtkprefs.c:1394
 msgid "Left Vertical"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:1401
+#: ../pidgin/gtkprefs.c:1395
 msgid "Right Vertical"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:1407
+#: ../pidgin/gtkprefs.c:1401
 msgid "N_ew conversations:"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:1477
+#: ../pidgin/gtkprefs.c:1471
 msgid "Show _formatting on incoming messages"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:1479
+#: ../pidgin/gtkprefs.c:1473
 msgid "Close IMs immediately when the tab is closed"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:1482
+#: ../pidgin/gtkprefs.c:1476
 msgid "Show _detailed information"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:1484
+#: ../pidgin/gtkprefs.c:1478
 msgid "Enable buddy ic_on animation"
 msgstr "Yenza kwenzeke ukuba _umfanekiso womqondiso womhlobo ubengupopayi"
 
-#: ../pidgin/gtkprefs.c:1491
+#: ../pidgin/gtkprefs.c:1485
 msgid "_Notify buddies that you are typing to them"
 msgstr "_Yazisa abahlobo ukuba uyababhalela ngokuchwetheza"
 
-#: ../pidgin/gtkprefs.c:1494
+#: ../pidgin/gtkprefs.c:1488
 msgid "Highlight _misspelled words"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:1498
+#: ../pidgin/gtkprefs.c:1492
 msgid "Use smooth-scrolling"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:1501
+#: ../pidgin/gtkprefs.c:1495
 msgid "F_lash window when IMs are received"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:1505
+#: ../pidgin/gtkprefs.c:1499
 msgid "Resize incoming custom smileys"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:1509
+#: ../pidgin/gtkprefs.c:1503
 msgid "Maximum size:"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:1523
+#: ../pidgin/gtkprefs.c:1517
 msgid "Minimum input area height in lines:"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:1531
+#: ../pidgin/gtkprefs.c:1525
 msgid "Font"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:1533
+#: ../pidgin/gtkprefs.c:1527
 msgid "Use font from _theme"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:1544
+#: ../pidgin/gtkprefs.c:1538
 msgid "Conversation _font:"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:1554
+#: ../pidgin/gtkprefs.c:1548
 msgid "Default Formatting"
 msgstr "Ukulungiselela okumiselweyo"
 
-#: ../pidgin/gtkprefs.c:1572
+#: ../pidgin/gtkprefs.c:1566
 msgid ""
 "This is how your outgoing message text will appear when you use protocols "
 "that support formatting."
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:1682
+#: ../pidgin/gtkprefs.c:1676
 msgid "Cannot start proxy configuration program."
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:1695
+#: ../pidgin/gtkprefs.c:1689
 msgid "Cannot start browser configuration program."
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:1730
+#: ../pidgin/gtkprefs.c:1724
 msgid "Disabled"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:1732
+#: ../pidgin/gtkprefs.c:1726
 #, c-format
 msgid "Use _automatically detected IP address: %s"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:1758
+#: ../pidgin/gtkprefs.c:1752
 msgid "ST_UN server:"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:1770
+#: ../pidgin/gtkprefs.c:1764
 msgid "<span style=\"italic\">Example: stunserver.org</span>"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:1785
+#: ../pidgin/gtkprefs.c:1779
 msgid "Public _IP:"
 msgstr "I-_IP yoLuntu:"
 
-#: ../pidgin/gtkprefs.c:1797
+#: ../pidgin/gtkprefs.c:1791
 msgid "Ports"
 msgstr "Iziqhagamshelanisi"
 
-#: ../pidgin/gtkprefs.c:1800
+#: ../pidgin/gtkprefs.c:1794
 msgid "_Enable automatic router port forwarding"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:1805
+#: ../pidgin/gtkprefs.c:1799
 msgid "_Manually specify range of ports to listen on:"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:1808
+#: ../pidgin/gtkprefs.c:1802
 msgid "_Start:"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:1815
+#: ../pidgin/gtkprefs.c:1809
 msgid "_End:"
 msgstr ""
 
 #. TURN server
-#: ../pidgin/gtkprefs.c:1827
+#: ../pidgin/gtkprefs.c:1821
 msgid "Relay Server (TURN)"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:1837
+#: ../pidgin/gtkprefs.c:1831
 msgid "_TURN server:"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:1840
+#: ../pidgin/gtkprefs.c:1834
 msgid "_UDP Port:"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:1843
+#: ../pidgin/gtkprefs.c:1837
 msgid "T_CP Port:"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:1846
+#: ../pidgin/gtkprefs.c:1840
 msgid "Use_rname:"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:1848
+#: ../pidgin/gtkprefs.c:1842
 msgid "Pass_word:"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:1879
+#: ../pidgin/gtkprefs.c:1873
 msgid "Seamonkey"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:1880
+#: ../pidgin/gtkprefs.c:1874
 msgid "Opera"
 msgstr "I-Opera"
 
-#: ../pidgin/gtkprefs.c:1881
+#: ../pidgin/gtkprefs.c:1875
 msgid "Netscape"
 msgstr "i-Netscape"
 
-#: ../pidgin/gtkprefs.c:1882
+#: ../pidgin/gtkprefs.c:1876
 msgid "Mozilla"
 msgstr "I-Mozilla"
 
-#: ../pidgin/gtkprefs.c:1883
+#: ../pidgin/gtkprefs.c:1877
 msgid "Konqueror"
 msgstr "I-Konqueror"
 
-#: ../pidgin/gtkprefs.c:1884
+#: ../pidgin/gtkprefs.c:1878
 msgid "Google Chrome"
 msgstr ""
 
 #. Do not move the line below.  Code below expects gnome-open to be in
 #. * this list immediately after xdg-open!
-#: ../pidgin/gtkprefs.c:1887
+#: ../pidgin/gtkprefs.c:1881
 msgid "Desktop Default"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:1888
+#: ../pidgin/gtkprefs.c:1882
 msgid "GNOME Default"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:1889
+#: ../pidgin/gtkprefs.c:1883
 msgid "Galeon"
 msgstr "I-Galeon"
 
-#: ../pidgin/gtkprefs.c:1890
+#: ../pidgin/gtkprefs.c:1884
 msgid "Firefox"
 msgstr "I-Firefox"
 
-#: ../pidgin/gtkprefs.c:1891
+#: ../pidgin/gtkprefs.c:1885
 msgid "Firebird"
 msgstr "I-Firebird"
 
-#: ../pidgin/gtkprefs.c:1892
+#: ../pidgin/gtkprefs.c:1886
 msgid "Epiphany"
 msgstr "I-Epiphany"
 
 #. Translators: please do not translate "chromium-browser" here!
-#: ../pidgin/gtkprefs.c:1894
+#: ../pidgin/gtkprefs.c:1888
 msgid "Chromium (chromium-browser)"
 msgstr ""
 
 #. Translators: please do not translate "chrome" here!
-#: ../pidgin/gtkprefs.c:1896
+#: ../pidgin/gtkprefs.c:1890
 msgid "Chromium (chrome)"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:1905
+#: ../pidgin/gtkprefs.c:1899
 msgid "Manual"
 msgstr "Uxwebhu lokusebenzisa"
 
-#: ../pidgin/gtkprefs.c:1962
+#: ../pidgin/gtkprefs.c:1956
 msgid "Browser Selection"
 msgstr "Ukhetho lwesiKhangeli"
 
-#: ../pidgin/gtkprefs.c:1968
+#: ../pidgin/gtkprefs.c:1962
 msgid "Browser preferences are configured in GNOME preferences"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:1987
+#: ../pidgin/gtkprefs.c:1981
 msgid "<b>Browser configuration program was not found.</b>"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:1990
+#: ../pidgin/gtkprefs.c:1984
 msgid "Configure _Browser"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:2003
+#: ../pidgin/gtkprefs.c:1997
 msgid "_Browser:"
 msgstr "_IsiKhangeli:"
 
-#: ../pidgin/gtkprefs.c:2011
+#: ../pidgin/gtkprefs.c:2005
 msgid "_Open link in:"
 msgstr "_Ikhonco elivulekileyo:"
 
-#: ../pidgin/gtkprefs.c:2013
+#: ../pidgin/gtkprefs.c:2007
 msgid "Browser default"
 msgstr "Isikhangeli esimiselweyo"
 
-#: ../pidgin/gtkprefs.c:2014
+#: ../pidgin/gtkprefs.c:2008
 msgid "Existing window"
 msgstr "Ifestile ekhoyo"
 
-#: ../pidgin/gtkprefs.c:2016
+#: ../pidgin/gtkprefs.c:2010
 msgid "New tab"
 msgstr "I-taba eNtsha"
 
-#: ../pidgin/gtkprefs.c:2033
+#: ../pidgin/gtkprefs.c:2027
 #, c-format
 msgid ""
 "_Manual:\n"
@@ -17880,107 +17874,107 @@
 "_Uxwebhu lokusebenzisa:\n"
 "(%s yeURL)"
 
-#: ../pidgin/gtkprefs.c:2065
+#: ../pidgin/gtkprefs.c:2059
 msgid "Proxy Server"
 msgstr "Iseva yoMqobo"
 
-#: ../pidgin/gtkprefs.c:2072
+#: ../pidgin/gtkprefs.c:2066
 msgid "Proxy preferences are configured in GNOME preferences"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:2094
+#: ../pidgin/gtkprefs.c:2088
 msgid "<b>Proxy configuration program was not found.</b>"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:2097
+#: ../pidgin/gtkprefs.c:2091
 msgid "Configure _Proxy"
 msgstr ""
 
 #. This is a global option that affects SOCKS4 usage even with
 #. * account-specific proxy settings
-#: ../pidgin/gtkprefs.c:2112
+#: ../pidgin/gtkprefs.c:2106
 msgid "Use remote _DNS with SOCKS4 proxies"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:2116
+#: ../pidgin/gtkprefs.c:2110
 msgid "Proxy t_ype:"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:2118
+#: ../pidgin/gtkprefs.c:2112
 msgid "No proxy"
 msgstr "Akukho mqobo"
 
-#: ../pidgin/gtkprefs.c:2157
+#: ../pidgin/gtkprefs.c:2151
 msgid "P_ort:"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:2173
+#: ../pidgin/gtkprefs.c:2167
 msgid "User_name:"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:2234
+#: ../pidgin/gtkprefs.c:2228
 msgid "Log _format:"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:2239
+#: ../pidgin/gtkprefs.c:2233
 msgid "Log all _instant messages"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:2241
+#: ../pidgin/gtkprefs.c:2235
 msgid "Log all c_hats"
 msgstr "Ingxelo yazo zonke ii_ncoko"
 
-#: ../pidgin/gtkprefs.c:2243
+#: ../pidgin/gtkprefs.c:2237
 msgid "Log all _status changes to system log"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:2400
+#: ../pidgin/gtkprefs.c:2394
 msgid "Sound Selection"
 msgstr "Ukhetho lweSandi"
 
-#: ../pidgin/gtkprefs.c:2411
+#: ../pidgin/gtkprefs.c:2405
 #, c-format
 msgid "Quietest"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:2413
+#: ../pidgin/gtkprefs.c:2407
 #, c-format
 msgid "Quieter"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:2415
+#: ../pidgin/gtkprefs.c:2409
 #, c-format
 msgid "Quiet"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:2419
+#: ../pidgin/gtkprefs.c:2413
 #, c-format
 msgid "Loud"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:2421
+#: ../pidgin/gtkprefs.c:2415
 #, c-format
 msgid "Louder"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:2423
+#: ../pidgin/gtkprefs.c:2417
 #, c-format
 msgid "Loudest"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:2515
+#: ../pidgin/gtkprefs.c:2509
 msgid "_Method:"
 msgstr "_Indlela yokusebenza:"
 
-#: ../pidgin/gtkprefs.c:2517
+#: ../pidgin/gtkprefs.c:2511
 msgid "Console beep"
 msgstr "Isandi sesakhelo sekhompyutha"
 
-#: ../pidgin/gtkprefs.c:2524
+#: ../pidgin/gtkprefs.c:2518
 msgid "No sounds"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:2537
+#: ../pidgin/gtkprefs.c:2531
 #, c-format
 msgid ""
 "Sound c_ommand:\n"
@@ -17989,84 +17983,84 @@
 "Umyalelo we_sandi:\n"
 "(%s owegama lefayili)"
 
-#: ../pidgin/gtkprefs.c:2545
+#: ../pidgin/gtkprefs.c:2539
 msgid "M_ute sounds"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:2548
+#: ../pidgin/gtkprefs.c:2542
 msgid "Sounds when conversation has _focus"
 msgstr "Izandi xa ingxoxo _inogqaliselo"
 
-#: ../pidgin/gtkprefs.c:2550
+#: ../pidgin/gtkprefs.c:2544
 msgid "_Enable sounds:"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:2567
+#: ../pidgin/gtkprefs.c:2561
 msgid "V_olume:"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:2628
+#: ../pidgin/gtkprefs.c:2622
 msgid "Play"
 msgstr "Dlala"
 
-#: ../pidgin/gtkprefs.c:2656
+#: ../pidgin/gtkprefs.c:2650
 msgid "_Browse..."
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:2664
+#: ../pidgin/gtkprefs.c:2658
 msgid "_Reset"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:2716
+#: ../pidgin/gtkprefs.c:2711
 msgid "_Report idle time:"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:2721
+#: ../pidgin/gtkprefs.c:2716
 msgid "Based on keyboard or mouse use"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:2728
+#: ../pidgin/gtkprefs.c:2723
 msgid "_Minutes before becoming idle:"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:2734
+#: ../pidgin/gtkprefs.c:2729
 msgid "Change to this status when _idle:"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:2752
+#: ../pidgin/gtkprefs.c:2747
 msgid "_Auto-reply:"
 msgstr "_Ukuphinda udlale ngokuzenzekela:"
 
-#: ../pidgin/gtkprefs.c:2756
+#: ../pidgin/gtkprefs.c:2751
 msgid "When both away and idle"
 msgstr ""
 
 #. Signon status stuff
-#: ../pidgin/gtkprefs.c:2762
+#: ../pidgin/gtkprefs.c:2757
 msgid "Status at Startup"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:2764
+#: ../pidgin/gtkprefs.c:2759
 msgid "Use status from last _exit at startup"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:2773
+#: ../pidgin/gtkprefs.c:2768
 msgid "Status to a_pply at startup:"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:2797
+#: ../pidgin/gtkprefs.c:2792
 msgid "Interface"
 msgstr "Umdibaniso wemida"
 
-#: ../pidgin/gtkprefs.c:2803
+#: ../pidgin/gtkprefs.c:2798
 msgid "Browser"
 msgstr "IsiKhangeli"
 
-#: ../pidgin/gtkprefs.c:2812
+#: ../pidgin/gtkprefs.c:2807
 msgid "Status / Idle"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:2813
+#: ../pidgin/gtkprefs.c:2808
 msgid "Themes"
 msgstr ""
 
@@ -18090,69 +18084,69 @@
 msgid "Block only the users below"
 msgstr "Thintela abasebenzisi abangezantsi kuphela"
 
-#: ../pidgin/gtkprivacy.c:344
+#: ../pidgin/gtkprivacy.c:343
 msgid "Privacy"
 msgstr "Yangasese"
 
-#: ../pidgin/gtkprivacy.c:354
+#: ../pidgin/gtkprivacy.c:353
 msgid "Changes to privacy settings take effect immediately."
 msgstr ""
 "Iinguquko kwimimiselo yangasese ingena entsebenzweni ngokukhawulezileyo."
 
-#: ../pidgin/gtkprivacy.c:363
+#: ../pidgin/gtkprivacy.c:362
 msgid "Set privacy for:"
 msgstr "Imimiselo yengaSese:"
 
 #. Remove All button
-#: ../pidgin/gtkprivacy.c:406
+#: ../pidgin/gtkprivacy.c:405
 msgid "Remove Al_l"
 msgstr ""
 
-#: ../pidgin/gtkprivacy.c:492 ../pidgin/gtkprivacy.c:509
+#: ../pidgin/gtkprivacy.c:491 ../pidgin/gtkprivacy.c:508
 msgid "Permit User"
 msgstr "Imvume yomSebenzisi"
 
-#: ../pidgin/gtkprivacy.c:493
+#: ../pidgin/gtkprivacy.c:492
 msgid "Type a user you permit to contact you."
 msgstr "Chwetheza umsebenzisi omvumele ukunxibelelana nawe."
 
-#: ../pidgin/gtkprivacy.c:494
+#: ../pidgin/gtkprivacy.c:493
 msgid "Please enter the name of the user you wish to be able to contact you."
 msgstr ""
 "Nceda ufake igama lomsebenzisi onqwenela ukuba akwazi ukunxibelelana nawe."
 
-#: ../pidgin/gtkprivacy.c:497 ../pidgin/gtkprivacy.c:513
+#: ../pidgin/gtkprivacy.c:496 ../pidgin/gtkprivacy.c:512
 msgid "_Permit"
 msgstr ""
 
-#: ../pidgin/gtkprivacy.c:503
+#: ../pidgin/gtkprivacy.c:502
 #, c-format
 msgid "Allow %s to contact you?"
 msgstr "Uvumela i-%s anxibelelane nawe?"
 
-#: ../pidgin/gtkprivacy.c:505
+#: ../pidgin/gtkprivacy.c:504
 #, c-format
 msgid "Are you sure you wish to allow %s to contact you?"
 msgstr "Uqinisekile ukuba unqwenela ukuvumela i-%s anxibelelane nawe?"
 
-#: ../pidgin/gtkprivacy.c:534 ../pidgin/gtkprivacy.c:548
+#: ../pidgin/gtkprivacy.c:533 ../pidgin/gtkprivacy.c:547
 msgid "Block User"
 msgstr "Ukuthintela umSebenzisi"
 
-#: ../pidgin/gtkprivacy.c:535
+#: ../pidgin/gtkprivacy.c:534
 msgid "Type a user to block."
 msgstr "Chwetheza umsebenzisi oza kumthintela."
 
-#: ../pidgin/gtkprivacy.c:536
+#: ../pidgin/gtkprivacy.c:535
 msgid "Please enter the name of the user you wish to block."
 msgstr "Nceda ufake igama lomsebenzisi onqwenela ukumthintela."
 
-#: ../pidgin/gtkprivacy.c:544
+#: ../pidgin/gtkprivacy.c:543
 #, c-format
 msgid "Block %s?"
 msgstr "Kuthintelwe u-%s?"
 
-#: ../pidgin/gtkprivacy.c:546
+#: ../pidgin/gtkprivacy.c:545
 #, c-format
 msgid "Are you sure you want to block %s?"
 msgstr "Uqinisekile ufuna ukuthintela u-%s?"
@@ -18161,23 +18155,23 @@
 msgid "Apply"
 msgstr "Sebenzisa"
 
-#: ../pidgin/gtkrequest.c:1578
+#: ../pidgin/gtkrequest.c:1552
 msgid "That file already exists"
 msgstr "Loo fayili sele ikhona"
 
-#: ../pidgin/gtkrequest.c:1579
+#: ../pidgin/gtkrequest.c:1553
 msgid "Would you like to overwrite it?"
 msgstr "Ingaba unqwenela ukuyibhala kwakhona?"
 
-#: ../pidgin/gtkrequest.c:1582
+#: ../pidgin/gtkrequest.c:1556
 msgid "Overwrite"
 msgstr ""
 
-#: ../pidgin/gtkrequest.c:1583
+#: ../pidgin/gtkrequest.c:1557
 msgid "Choose New Name"
 msgstr ""
 
-#: ../pidgin/gtkrequest.c:1684
+#: ../pidgin/gtkrequest.c:1656
 msgid "Select Folder..."
 msgstr ""
 
@@ -18274,7 +18268,7 @@
 msgid "Custom Smiley Manager"
 msgstr ""
 
-#: ../pidgin/gtkstatusbox.c:323
+#: ../pidgin/gtkstatusbox.c:322
 msgid "Select Buddy Icon"
 msgstr ""
 
@@ -18310,61 +18304,61 @@
 msgid "Facebook (XMPP)"
 msgstr ""
 
-#: ../pidgin/gtkutils.c:1483 ../pidgin/gtkutils.c:1512
+#: ../pidgin/gtkutils.c:1475 ../pidgin/gtkutils.c:1504
 #, c-format
 msgid "The following error has occurred loading %s: %s"
 msgstr ""
 
-#: ../pidgin/gtkutils.c:1486 ../pidgin/gtkutils.c:1514
+#: ../pidgin/gtkutils.c:1478 ../pidgin/gtkutils.c:1506
 msgid "Failed to load image"
 msgstr ""
 
-#: ../pidgin/gtkutils.c:1590
+#: ../pidgin/gtkutils.c:1582
 #, c-format
 msgid "Cannot send folder %s."
 msgstr ""
 
-#: ../pidgin/gtkutils.c:1591
+#: ../pidgin/gtkutils.c:1583
 #, c-format
 msgid ""
 "%s cannot transfer a folder. You will need to send the files within "
 "individually."
 msgstr ""
 
-#: ../pidgin/gtkutils.c:1624 ../pidgin/gtkutils.c:1636
-#: ../pidgin/gtkutils.c:1643
+#: ../pidgin/gtkutils.c:1616 ../pidgin/gtkutils.c:1628
+#: ../pidgin/gtkutils.c:1635
 msgid "You have dragged an image"
 msgstr ""
 
-#: ../pidgin/gtkutils.c:1625
+#: ../pidgin/gtkutils.c:1617
 msgid ""
 "You can send this image as a file transfer, embed it into this message, or "
 "use it as the buddy icon for this user."
 msgstr ""
 
-#: ../pidgin/gtkutils.c:1631 ../pidgin/gtkutils.c:1651
+#: ../pidgin/gtkutils.c:1623 ../pidgin/gtkutils.c:1643
 msgid "Set as buddy icon"
 msgstr ""
 
-#: ../pidgin/gtkutils.c:1632 ../pidgin/gtkutils.c:1652
+#: ../pidgin/gtkutils.c:1624 ../pidgin/gtkutils.c:1644
 msgid "Send image file"
 msgstr ""
 
-#: ../pidgin/gtkutils.c:1633 ../pidgin/gtkutils.c:1652
+#: ../pidgin/gtkutils.c:1625 ../pidgin/gtkutils.c:1644
 msgid "Insert in message"
 msgstr ""
 
-#: ../pidgin/gtkutils.c:1637
+#: ../pidgin/gtkutils.c:1629
 msgid "Would you like to set it as the buddy icon for this user?"
 msgstr ""
 
-#: ../pidgin/gtkutils.c:1644
+#: ../pidgin/gtkutils.c:1636
 msgid ""
 "You can send this image as a file transfer, or use it as the buddy icon for "
 "this user."
 msgstr ""
 
-#: ../pidgin/gtkutils.c:1645
+#: ../pidgin/gtkutils.c:1637
 msgid ""
 "You can insert this image into this message, or use it as the buddy icon for "
 "this user"
@@ -18378,17 +18372,17 @@
 #. * 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:1702
+#: ../pidgin/gtkutils.c:1694
 msgid "Cannot send launcher"
 msgstr ""
 
-#: ../pidgin/gtkutils.c:1703
+#: ../pidgin/gtkutils.c:1695
 msgid ""
 "You dragged a desktop launcher. Most likely you wanted to send the target of "
 "this launcher instead of this launcher itself."
 msgstr ""
 
-#: ../pidgin/gtkutils.c:2283
+#: ../pidgin/gtkutils.c:2275
 #, c-format
 msgid ""
 "<b>File:</b> %s\n"
@@ -18399,48 +18393,48 @@
 "<b>Ubukhulu befayili:<b> %s\n"
 "<b>Umfanekiso wefayili:</b> %dx%d"
 
-#: ../pidgin/gtkutils.c:2528
+#: ../pidgin/gtkutils.c:2520
 #, c-format
 msgid "The file '%s' is too large for %s.  Please try a smaller image.\n"
 msgstr ""
 
-#: ../pidgin/gtkutils.c:2530
+#: ../pidgin/gtkutils.c:2522
 msgid "Icon Error"
 msgstr ""
 
-#: ../pidgin/gtkutils.c:2530
+#: ../pidgin/gtkutils.c:2522
 msgid "Could not set icon"
 msgstr ""
 
-#: ../pidgin/gtkutils.c:3241
+#: ../pidgin/gtkutils.c:3233
 msgid "_Open Link"
 msgstr ""
 
-#: ../pidgin/gtkutils.c:3248
+#: ../pidgin/gtkutils.c:3240
 msgid "_Copy Link Location"
 msgstr "_Indawo yokuNxulumanisa iKopi"
 
-#: ../pidgin/gtkutils.c:3270
+#: ../pidgin/gtkutils.c:3262
 msgid "_Copy Email Address"
 msgstr "_Kopa iDilesi ye-iMeyile"
 
-#: ../pidgin/gtkutils.c:3392
+#: ../pidgin/gtkutils.c:3384
 msgid "_Open File"
 msgstr ""
 
-#: ../pidgin/gtkutils.c:3399
+#: ../pidgin/gtkutils.c:3391
 msgid "Open _Containing Directory"
 msgstr ""
 
-#: ../pidgin/gtkutils.c:3448 ../pidgin/gtkwhiteboard.c:754
+#: ../pidgin/gtkutils.c:3440 ../pidgin/gtkwhiteboard.c:754
 msgid "Save File"
 msgstr ""
 
-#: ../pidgin/gtkutils.c:3468
+#: ../pidgin/gtkutils.c:3460
 msgid "_Play Sound"
 msgstr ""
 
-#: ../pidgin/gtkutils.c:3476
+#: ../pidgin/gtkutils.c:3468
 msgid "_Save File"
 msgstr ""
 
@@ -19787,55 +19781,55 @@
 msgid "Provides integration with Unity's messaging menu and launcher."
 msgstr ""
 
-#: ../pidgin/plugins/vvconfig.c:322
+#: ../pidgin/plugins/vvconfig.c:303
 msgid "Audio"
 msgstr ""
 
-#: ../pidgin/plugins/vvconfig.c:324
+#: ../pidgin/plugins/vvconfig.c:305
 msgid "Video"
 msgstr ""
 
-#: ../pidgin/plugins/vvconfig.c:335 ../pidgin/plugins/vvconfig.c:342
+#: ../pidgin/plugins/vvconfig.c:316 ../pidgin/plugins/vvconfig.c:323
 msgid "Output"
 msgstr ""
 
-#: ../pidgin/plugins/vvconfig.c:335 ../pidgin/plugins/vvconfig.c:342
+#: ../pidgin/plugins/vvconfig.c:316 ../pidgin/plugins/vvconfig.c:323
 msgid "_Plugin"
 msgstr ""
 
-#: ../pidgin/plugins/vvconfig.c:336 ../pidgin/plugins/vvconfig.c:343
+#: ../pidgin/plugins/vvconfig.c:317 ../pidgin/plugins/vvconfig.c:324
 msgid "_Device"
 msgstr ""
 
-#: ../pidgin/plugins/vvconfig.c:338 ../pidgin/plugins/vvconfig.c:345
+#: ../pidgin/plugins/vvconfig.c:319 ../pidgin/plugins/vvconfig.c:326
 msgid "Input"
 msgstr ""
 
-#: ../pidgin/plugins/vvconfig.c:338 ../pidgin/plugins/vvconfig.c:345
+#: ../pidgin/plugins/vvconfig.c:319 ../pidgin/plugins/vvconfig.c:326
 msgid "P_lugin"
 msgstr ""
 
-#: ../pidgin/plugins/vvconfig.c:339 ../pidgin/plugins/vvconfig.c:346
+#: ../pidgin/plugins/vvconfig.c:320 ../pidgin/plugins/vvconfig.c:327
 msgid "D_evice"
 msgstr ""
 
-#: ../pidgin/plugins/vvconfig.c:647
+#: ../pidgin/plugins/vvconfig.c:622
 msgid "DROP"
 msgstr ""
 
-#: ../pidgin/plugins/vvconfig.c:704
+#: ../pidgin/plugins/vvconfig.c:679
 msgid "Volume:"
 msgstr ""
 
-#: ../pidgin/plugins/vvconfig.c:708
+#: ../pidgin/plugins/vvconfig.c:683
 msgid "Silence threshold:"
 msgstr ""
 
-#: ../pidgin/plugins/vvconfig.c:755
+#: ../pidgin/plugins/vvconfig.c:730
 msgid "Input and Output Settings"
 msgstr ""
 
-#: ../pidgin/plugins/vvconfig.c:760
+#: ../pidgin/plugins/vvconfig.c:735
 msgid "Microphone Test"
 msgstr ""
 
@@ -19848,18 +19842,18 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/vvconfig.c:801
+#: ../pidgin/plugins/vvconfig.c:776
 msgid "Voice/Video Settings"
 msgstr ""
 
 #. *< name
 #. *< version
-#: ../pidgin/plugins/vvconfig.c:803
+#: ../pidgin/plugins/vvconfig.c:778
 msgid "Configure your microphone and webcam."
 msgstr ""
 
 #. *< summary
-#: ../pidgin/plugins/vvconfig.c:804
+#: ../pidgin/plugins/vvconfig.c:779
 msgid "Configure microphone and webcam settings for voice/video calls."
 msgstr ""
 
diff -Nru language-pack-xh-base-14.04+20150804/data/xh/LC_MESSAGES/software-properties.po language-pack-xh-base-14.04+20160720/data/xh/LC_MESSAGES/software-properties.po
--- language-pack-xh-base-14.04+20150804/data/xh/LC_MESSAGES/software-properties.po	2015-08-14 07:58:58.000000000 +0000
+++ language-pack-xh-base-14.04+20160720/data/xh/LC_MESSAGES/software-properties.po	2016-07-20 16:45:10.000000000 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: update-notifier\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-07-07 19:35+0000\n"
+"POT-Creation-Date: 2016-01-05 21:06+0000\n"
 "PO-Revision-Date: 2014-03-07 11:42+0000\n"
 "Last-Translator: Canonical Ltd <Unknown>\n"
 "Language-Team: Xhosa <xh-translate@ubuntu.com>\n"
@@ -16,8 +16,8 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2015-08-04 07:36+0000\n"
-"X-Generator: Launchpad (build 17656)\n"
+"X-Launchpad-Export-Date: 2016-07-20 13:17+0000\n"
+"X-Generator: Launchpad (build 18147)\n"
 
 #: ../data/com.ubuntu.softwareproperties.policy.in.h:1
 msgid "Write Configuration"
@@ -42,8 +42,8 @@
 msgstr ""
 
 #: ../data/software-properties-kde.desktop.in.h:1
-#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:653
-#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:672
+#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:671
+#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:690
 msgid "Software Sources"
 msgstr ""
 
@@ -173,17 +173,17 @@
 msgstr ""
 
 #: ../softwareproperties/kde/DialogMirror.py:219
-#: ../softwareproperties/gtk/DialogMirror.py:332
+#: ../softwareproperties/gtk/DialogMirror.py:335
 msgid "No suitable download server was found"
 msgstr ""
 
 #: ../softwareproperties/kde/DialogMirror.py:220
-#: ../softwareproperties/gtk/DialogMirror.py:333
+#: ../softwareproperties/gtk/DialogMirror.py:336
 msgid "Please check your Internet connection."
 msgstr ""
 
 #: ../softwareproperties/kde/DialogMirror.py:235
-#: ../softwareproperties/gtk/DialogMirror.py:348
+#: ../softwareproperties/gtk/DialogMirror.py:351
 msgid "Canceling..."
 msgstr ""
 
@@ -208,7 +208,7 @@
 msgstr ""
 
 #: ../softwareproperties/kde/SoftwarePropertiesKDE.py:172
-#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:241
+#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:244
 #, python-format
 msgid "Every %s days"
 msgstr ""
@@ -221,7 +221,7 @@
 
 #. TRANS: %s stands for the distribution name e.g. Debian or Ubuntu
 #: ../softwareproperties/kde/SoftwarePropertiesKDE.py:218
-#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:301
+#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:304
 #, python-format
 msgid "%s Software"
 msgstr ""
@@ -230,7 +230,7 @@
 #. first %s is the description of the component
 #. second %s is the code name of the comp, eg main, universe
 #: ../softwareproperties/kde/SoftwarePropertiesKDE.py:237
-#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:314
+#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:317
 #, python-format
 msgid "%s (%s)"
 msgstr ""
@@ -238,33 +238,33 @@
 #. add a separator and the option to choose another mirror from the list
 #. #FIXME server_store.append(["sep", None, True])
 #: ../softwareproperties/kde/SoftwarePropertiesKDE.py:300
-#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:429
-#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:522
+#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:447
+#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:540
 msgid "Other..."
 msgstr ""
 
 #: ../softwareproperties/kde/SoftwarePropertiesKDE.py:668
-#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:945
+#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:963
 msgid "Import key"
 msgstr ""
 
 #: ../softwareproperties/kde/SoftwarePropertiesKDE.py:671
-#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:959
+#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:977
 msgid "Error importing selected file"
 msgstr ""
 
 #: ../softwareproperties/kde/SoftwarePropertiesKDE.py:672
-#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:960
+#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:978
 msgid "The selected file may not be a GPG key file or it might be corrupt."
 msgstr ""
 
 #: ../softwareproperties/kde/SoftwarePropertiesKDE.py:685
-#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:976
+#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:994
 msgid "Error removing the key"
 msgstr ""
 
 #: ../softwareproperties/kde/SoftwarePropertiesKDE.py:686
-#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:977
+#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:995
 msgid ""
 "The key you selected could not be removed. Please report this as a bug."
 msgstr ""
@@ -349,143 +349,143 @@
 msgid "New mirror"
 msgstr ""
 
-#: ../softwareproperties/gtk/DialogMirror.py:321
+#: ../softwareproperties/gtk/DialogMirror.py:324
 #, python-format
 msgid "Completed %s of %s tests"
 msgstr ""
 
-#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:663
-#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:682
+#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:681
+#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:700
 msgid "Active"
 msgstr ""
 
-#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:721
+#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:739
 msgid "Key"
 msgstr ""
 
-#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:738
+#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:756
 msgid "_Add key from paste data"
 msgstr ""
 
-#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:751
-#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:762
+#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:769
+#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:780
 msgid "Error importing key"
 msgstr ""
 
-#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:752
-#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:763
+#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:770
+#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:781
 msgid "The selected data may not be a GPG key file or it might be corrupt."
 msgstr ""
 
 #: ../softwareproperties/kde/SoftwarePropertiesKDE.py:731
-#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:811
+#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:829
 msgid "Error scanning the CD"
 msgstr ""
 
-#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:812
+#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:830
 msgid "Could not find a suitable CD."
 msgstr ""
 
-#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:1022
+#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:1040
 msgid "Applying changes..."
 msgstr ""
 
-#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:1103
-#: ../data/gtkbuilder/main.ui.h:40
+#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:1121
+#: ../data/gtkbuilder/main.ui.h:42
 msgid "Re_vert"
 msgstr ""
 
-#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:1105
+#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:1123
 msgid "_Apply Changes"
 msgstr ""
 
-#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:1107
+#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:1125
 msgid "_Cancel"
 msgstr ""
 
-#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:1109
+#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:1127
 msgid "_Restart..."
 msgstr ""
 
-#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:1124
+#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:1142
 msgid "Searching for available drivers..."
 msgstr ""
 
-#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:1154
+#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:1172
 msgid "An error occurred while searching for drivers."
 msgstr ""
 
-#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:1226
+#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:1246
 msgid "This device is using the recommended driver."
 msgstr ""
 
-#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:1227
+#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:1247
 msgid "This device is using an alternative driver."
 msgstr ""
 
-#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:1228
+#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:1248
 msgid "This device is using a manually-installed driver."
 msgstr ""
 
-#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:1229
+#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:1249
 msgid "This device is not working."
 msgstr ""
 
-#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:1238
+#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:1258
 msgid "Continue using a manually installed driver"
 msgstr ""
 
-#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:1265
+#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:1285
 msgid "Using {} from {}"
 msgstr ""
 
-#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:1267
+#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:1287
 msgid "Using {}"
 msgstr ""
 
-#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:1274
+#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:1294
 msgid "open source"
 msgstr ""
 
-#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:1276
+#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:1296
 msgid "proprietary"
 msgstr ""
 
-#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:1279
+#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:1299
 #, python-brace-format
 msgid "{base_description} ({licence}, tested)"
 msgstr ""
 
-#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:1281
+#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:1301
 #, python-brace-format
 msgid "{base_description} ({licence})"
 msgstr ""
 
-#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:1301
+#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:1321
 msgid "Do not use the device"
 msgstr ""
 
 #. No drivers found.
-#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:1321
+#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:1341
 msgid "No additional drivers available."
 msgstr ""
 
-#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:1339
+#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:1359
 msgid "Unknown"
 msgstr ""
 
-#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:1388
+#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:1408
 msgid "You need to restart the computer to complete the driver changes."
 msgstr ""
 
-#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:1402
+#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:1422
 #, python-format
 msgid "%(count)d proprietary driver in use."
 msgid_plural "%(count)d proprietary drivers in use."
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:1407
+#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:1427
 #: ../data/gtkbuilder/main.ui.h:37
 msgid "No proprietary drivers are in use."
 msgstr ""
diff -Nru language-pack-xh-base-14.04+20150804/data/xh/LC_MESSAGES/subdomain_parser.po language-pack-xh-base-14.04+20160720/data/xh/LC_MESSAGES/subdomain_parser.po
--- language-pack-xh-base-14.04+20150804/data/xh/LC_MESSAGES/subdomain_parser.po	2015-08-14 07:58:58.000000000 +0000
+++ language-pack-xh-base-14.04+20160720/data/xh/LC_MESSAGES/subdomain_parser.po	2016-07-20 16:45:11.000000000 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-08-04 07:37+0000\n"
-"X-Generator: Launchpad (build 17656)\n"
+"X-Launchpad-Export-Date: 2016-07-20 13:17+0000\n"
+"X-Generator: Launchpad (build 18147)\n"
 "Language: xh\n"
 
 #: ../parser_include.c:80
diff -Nru language-pack-xh-base-14.04+20150804/debian/changelog language-pack-xh-base-14.04+20160720/debian/changelog
--- language-pack-xh-base-14.04+20150804/debian/changelog	2015-08-14 07:58:55.000000000 +0000
+++ language-pack-xh-base-14.04+20160720/debian/changelog	2016-07-20 16:45:10.000000000 +0000
@@ -1,6 +1,6 @@
-language-pack-xh-base (1:14.04+20150804) trusty-proposed; urgency=low
+language-pack-xh-base (1:14.04+20160720) trusty-proposed; urgency=low
 
   * Initial Release.
 
- -- Ubuntu automatic language-pack builder <language-packs@ubuntu.com>  Fri, 14 Aug 2015 07:58:55 +0000
+ -- Ubuntu automatic language-pack builder <language-packs@ubuntu.com>  Wed, 20 Jul 2016 16:45:10 +0000