# HG changeset patch
# User Friedel Wolff <friedel@translate.org.za>
# Date 1194991474 0
# Node ID b5231fbc29aeeadd01fb53aeb72e6586db516da8
# Parent  25347f1f2ee2df51a69ac09de9f60285e627c146
fixes #3783

committer: Luke Schierer <lschiere@pidgin.im>

diff -r 25347f1f2ee2 -r b5231fbc29ae po/ChangeLog
--- a/po/ChangeLog	Tue Nov 13 22:01:42 2007 +0000
+++ b/po/ChangeLog	Tue Nov 13 22:04:34 2007 +0000
@@ -1,6 +1,7 @@
 Pidgin and Finch: The Pimpin' Penguin IM Clients That're Good for the Soul
 
 version 2.3.0
+	* Afrikaans translation added (Friedel Wolff)
 	* Belarusian Latin translation updated (Ihar Hrachyshka)
 	* Catalan translation updated (Josep Puigdemont)
 	* Chinese (Simplified) translation updated (Funda Wang)
diff -r 25347f1f2ee2 -r b5231fbc29ae po/af.po
--- a/po/af.po	Tue Nov 13 22:01:42 2007 +0000
+++ b/po/af.po	Tue Nov 13 22:04:34 2007 +0000
@@ -1,21 +1,21 @@
 # Afrikaans translations for pidgin
-# Copyright (C) 2006
+# Copyright (C) 2006-2007
 # This file is distributed under the same license as the pidgin package.
 # Friedel Wolff <friedel BY translate.org.za>, 2006-2007.
 # Samuel Murray <leuce.com BY gmail.com>, 2007
 msgid ""
 msgstr ""
-"Project-Id-Version: 2.1.1\n"
+"Project-Id-Version: 2.3.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-09-28 15:32-0500\n"
-"PO-Revision-Date: 2007-08-17 10:10+0200\n"
-"Last-Translator: Samuel Murray <leuce.com BY gmail.com>\n"
+"POT-Creation-Date: 2007-11-11 03:21-0500\n"
+"PO-Revision-Date: 2007-11-12 11:10+0200\n"
+"Last-Translator: Samuel Murray <afrikaans BY gmail.com>\n"
 "Language-Team: <translate-discuss-af@lists.sourceforge.net>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Translate Toolkit 1.0.1\n"
+"X-Generator: Pootle 1.0.2\n"
 
 #: ../finch/finch.c:64 ../finch/finch.c:301 ../finch/finch.c:330
 #: ../finch/finch.c:418
@@ -45,32 +45,32 @@
 "  -c, --config=DIR    gebruik DIR vir konfigurasielêers\n"
 "  -d, --debug         skryf ontfoutboodskappe na stdout\n"
 "  -h, --help          wys hierdie hulp en sluit af\n"
-"  -n, --nologin       moenie outomaties anmeld nie\n"
+"  -n, --nologin       moenie outomaties aanmeld nie\n"
 "  -v, --version       wys die huidige weergawe en sluit af\n"
 
-#: ../finch/finch.c:328 ../pidgin/gtkmain.c:711
+#: ../finch/finch.c:328 ../pidgin/gtkmain.c:718
 #, c-format
 msgid ""
 "%s encountered errors migrating your settings from %s to %s. Please "
 "investigate and complete the migration by hand. Please report this error at "
 "http://developer.pidgin.im"
 msgstr ""
-"%s kon nie u instellings van %s na %s migreer nie. Stel asb. ondersoek in, "
-"en handel die migrasie handmatig af. Rapporteer asb. hierdie fout by http://"
+"%s kon nie u instellings van %s na %s migreer nie. Stel gerus ondersoek in, "
+"en handel die migrasie handmatig af. Rapporteer gerus hierdie fout by http://"
 "developer.pidgin.im"
 
 #: ../finch/gntaccount.c:124 ../finch/gntaccount.c:484 ../finch/gntblist.c:300
-#: ../finch/gntblist.c:433 ../finch/gntblist.c:446 ../finch/gntplugin.c:186
-#: ../finch/gntplugin.c:234 ../finch/gntstatus.c:301 ../finch/gntstatus.c:310
+#: ../finch/gntblist.c:433 ../finch/gntblist.c:446 ../finch/gntplugin.c:189
+#: ../finch/gntplugin.c:237 ../finch/gntstatus.c:301 ../finch/gntstatus.c:310
 #: ../finch/plugins/gntclipboard.c:115 ../finch/plugins/gntclipboard.c:121
 #: ../finch/plugins/gntclipboard.c:128
-#: ../libpurple/protocols/jabber/buddy.c:2029
+#: ../libpurple/protocols/jabber/buddy.c:2032
 #: ../libpurple/protocols/jabber/chat.c:677
 #: ../libpurple/protocols/jabber/chat.c:688
-#: ../libpurple/protocols/jabber/jabber.c:1515
+#: ../libpurple/protocols/jabber/jabber.c:1522
 #: ../libpurple/protocols/qq/group_join.c:328
 #: ../libpurple/protocols/qq/im.c:576 ../libpurple/protocols/silc/ops.c:57
-#: ../libpurple/protocols/silc/ops.c:1456
+#: ../libpurple/protocols/silc/ops.c:1460
 #: ../libpurple/protocols/silc10/ops.c:1451
 msgid "Error"
 msgstr "Fout"
@@ -99,8 +99,8 @@
 msgid "(You probably forgot to 'make install'.)"
 msgstr "(U't waarskynlik vergeet om te 'make install'.)"
 
-#: ../finch/gntaccount.c:496 ../finch/gntconn.c:136
-#: ../pidgin/gtkaccount.c:1473 ../pidgin/gtkblist.c:4040
+#: ../finch/gntaccount.c:496 ../finch/gntconn.c:137
+#: ../pidgin/gtkaccount.c:1478 ../pidgin/gtkblist.c:4388
 msgid "Modify Account"
 msgstr "Wysig rekening"
 
@@ -130,32 +130,32 @@
 #: ../finch/gntaccount.c:575 ../finch/gntaccount.c:638
 #: ../finch/gntaccount.c:889 ../finch/gntblist.c:344 ../finch/gntblist.c:421
 #: ../finch/gntblist.c:456 ../finch/gntblist.c:803 ../finch/gntblist.c:1005
-#: ../finch/gntblist.c:1101 ../finch/gntblist.c:2222 ../finch/gntcertmgr.c:91
-#: ../finch/gntplugin.c:379 ../finch/gntpounce.c:459 ../finch/gntpounce.c:667
-#: ../finch/gntprefs.c:265 ../finch/gntsound.c:1058 ../finch/gntstatus.c:145
-#: ../finch/gntstatus.c:485 ../finch/gntstatus.c:610
-#: ../libpurple/account.c:1013 ../libpurple/account.c:1263
-#: ../libpurple/account.c:1298 ../libpurple/conversation.c:1215
+#: ../finch/gntblist.c:1101 ../finch/gntblist.c:2224 ../finch/gntblist.c:2287
+#: ../finch/gntcertmgr.c:91 ../finch/gntplugin.c:475 ../finch/gntpounce.c:472
+#: ../finch/gntpounce.c:680 ../finch/gntprefs.c:265 ../finch/gntsound.c:1058
+#: ../finch/gntstatus.c:145 ../finch/gntstatus.c:485 ../finch/gntstatus.c:610
+#: ../libpurple/account.c:1016 ../libpurple/account.c:1305
+#: ../libpurple/account.c:1340 ../libpurple/conversation.c:1215
 #: ../libpurple/plugins/buddynote.c:51 ../libpurple/protocols/gg/gg.c:507
 #: ../libpurple/protocols/gg/gg.c:666 ../libpurple/protocols/gg/gg.c:803
-#: ../libpurple/protocols/gg/gg.c:884
+#: ../libpurple/protocols/gg/gg.c:885
 #: ../libpurple/protocols/jabber/buddy.c:728
-#: ../libpurple/protocols/jabber/buddy.c:2413
-#: ../libpurple/protocols/jabber/buddy.c:2449
+#: ../libpurple/protocols/jabber/buddy.c:2426
+#: ../libpurple/protocols/jabber/buddy.c:2462
 #: ../libpurple/protocols/jabber/chat.c:786
 #: ../libpurple/protocols/jabber/jabber.c:1008
 #: ../libpurple/protocols/jabber/jabber.c:1017
-#: ../libpurple/protocols/jabber/jabber.c:1737
+#: ../libpurple/protocols/jabber/jabber.c:1715
 #: ../libpurple/protocols/jabber/si.c:874
-#: ../libpurple/protocols/jabber/usermood.c:184
+#: ../libpurple/protocols/jabber/usermood.c:202
 #: ../libpurple/protocols/jabber/usernick.c:78
 #: ../libpurple/protocols/jabber/xdata.c:400
-#: ../libpurple/protocols/msn/msn.c:287 ../libpurple/protocols/msn/msn.c:304
-#: ../libpurple/protocols/msn/msn.c:321 ../libpurple/protocols/msn/msn.c:338
-#: ../libpurple/protocols/msn/msn.c:359
-#: ../libpurple/protocols/oscar/oscar.c:6094
-#: ../libpurple/protocols/oscar/peer.c:1046
-#: ../libpurple/protocols/qq/buddy_info.c:484
+#: ../libpurple/protocols/msn/msn.c:291 ../libpurple/protocols/msn/msn.c:308
+#: ../libpurple/protocols/msn/msn.c:325 ../libpurple/protocols/msn/msn.c:342
+#: ../libpurple/protocols/msn/msn.c:363
+#: ../libpurple/protocols/oscar/oscar.c:6149
+#: ../libpurple/protocols/oscar/peer.c:1048
+#: ../libpurple/protocols/qq/buddy_info.c:525
 #: ../libpurple/protocols/qq/buddy_opt.c:214
 #: ../libpurple/protocols/qq/buddy_opt.c:411
 #: ../libpurple/protocols/qq/group.c:124
@@ -173,53 +173,53 @@
 #: ../libpurple/protocols/sametime/sametime.c:5487
 #: ../libpurple/protocols/sametime/sametime.c:5612
 #: ../libpurple/protocols/silc/buddy.c:455
-#: ../libpurple/protocols/silc/buddy.c:1076
-#: ../libpurple/protocols/silc/buddy.c:1191
-#: ../libpurple/protocols/silc/chat.c:616
-#: ../libpurple/protocols/silc/chat.c:746
-#: ../libpurple/protocols/silc/ops.c:1816
-#: ../libpurple/protocols/silc/silc.c:823
-#: ../libpurple/protocols/silc/silc.c:1031
+#: ../libpurple/protocols/silc/buddy.c:1079
+#: ../libpurple/protocols/silc/buddy.c:1194
+#: ../libpurple/protocols/silc/chat.c:620
+#: ../libpurple/protocols/silc/chat.c:750
+#: ../libpurple/protocols/silc/ops.c:1820
+#: ../libpurple/protocols/silc/silc.c:954
+#: ../libpurple/protocols/silc/silc.c:1162
 #: ../libpurple/protocols/silc10/buddy.c:468
-#: ../libpurple/protocols/silc10/buddy.c:1084
-#: ../libpurple/protocols/silc10/buddy.c:1189
+#: ../libpurple/protocols/silc10/buddy.c:1087
+#: ../libpurple/protocols/silc10/buddy.c:1192
 #: ../libpurple/protocols/silc10/chat.c:600
 #: ../libpurple/protocols/silc10/chat.c:730
 #: ../libpurple/protocols/silc10/ops.c:1904
 #: ../libpurple/protocols/silc10/silc.c:736
-#: ../libpurple/protocols/silc10/silc.c:942
-#: ../libpurple/protocols/yahoo/yahoo.c:1032
-#: ../libpurple/protocols/yahoo/yahoo.c:3498
-#: ../libpurple/protocols/yahoo/yahoo.c:3509 ../pidgin/gtkaccount.c:1908
-#: ../pidgin/gtkaccount.c:2495 ../pidgin/gtkblist.c:5967
-#: ../pidgin/gtkcertmgr.c:197 ../pidgin/gtkdialogs.c:773
-#: ../pidgin/gtkdialogs.c:912 ../pidgin/gtkdialogs.c:1004
-#: ../pidgin/gtkdialogs.c:1024 ../pidgin/gtkdialogs.c:1048
-#: ../pidgin/gtkdialogs.c:1070 ../pidgin/gtkdialogs.c:1118
-#: ../pidgin/gtkdialogs.c:1159 ../pidgin/gtkdialogs.c:1215
-#: ../pidgin/gtkdialogs.c:1254 ../pidgin/gtkdialogs.c:1281
-#: ../pidgin/gtkimhtmltoolbar.c:435 ../pidgin/gtklog.c:328
-#: ../pidgin/gtkplugin.c:289 ../pidgin/gtkpounce.c:1101
-#: ../pidgin/gtkprivacy.c:563 ../pidgin/gtkprivacy.c:579
-#: ../pidgin/gtkprivacy.c:604 ../pidgin/gtkprivacy.c:618
-#: ../pidgin/gtkrequest.c:271 ../pidgin/gtksavedstatuses.c:345
-#: ../pidgin/gtkstatusbox.c:1574
+#: ../libpurple/protocols/silc10/silc.c:943
+#: ../libpurple/protocols/yahoo/yahoo.c:1034
+#: ../libpurple/protocols/yahoo/yahoo.c:3500
+#: ../libpurple/protocols/yahoo/yahoo.c:3511 ../pidgin/gtkaccount.c:1913
+#: ../pidgin/gtkaccount.c:2501 ../pidgin/gtkblist.c:6346
+#: ../pidgin/gtkcertmgr.c:197 ../pidgin/gtkdialogs.c:787
+#: ../pidgin/gtkdialogs.c:926 ../pidgin/gtkdialogs.c:1018
+#: ../pidgin/gtkdialogs.c:1038 ../pidgin/gtkdialogs.c:1062
+#: ../pidgin/gtkdialogs.c:1084 ../pidgin/gtkdialogs.c:1132
+#: ../pidgin/gtkdialogs.c:1173 ../pidgin/gtkdialogs.c:1229
+#: ../pidgin/gtkdialogs.c:1268 ../pidgin/gtkdialogs.c:1295
+#: ../pidgin/gtkimhtmltoolbar.c:437 ../pidgin/gtklog.c:328
+#: ../pidgin/gtkplugin.c:289 ../pidgin/gtkpounce.c:1121
+#: ../pidgin/gtkprivacy.c:565 ../pidgin/gtkprivacy.c:581
+#: ../pidgin/gtkprivacy.c:606 ../pidgin/gtkprivacy.c:620
+#: ../pidgin/gtkrequest.c:321 ../pidgin/gtksavedstatuses.c:345
+#: ../pidgin/gtkstatusbox.c:1593
 msgid "Cancel"
 msgstr "Kanselleer"
 
 #. Save button
 #. Save
-#: ../finch/gntaccount.c:579 ../finch/gntcertmgr.c:311
-#: ../finch/gntplugin.c:379 ../finch/gntpounce.c:465 ../finch/gntprefs.c:265
+#: ../finch/gntaccount.c:579 ../finch/gntcertmgr.c:311 ../finch/gntdebug.c:297
+#: ../finch/gntplugin.c:475 ../finch/gntpounce.c:478 ../finch/gntprefs.c:265
 #: ../finch/gntsound.c:1055 ../finch/gntstatus.c:488 ../finch/gntstatus.c:598
-#: ../libpurple/account.c:1297 ../libpurple/plugins/buddynote.c:50
-#: ../libpurple/protocols/jabber/buddy.c:727 ../pidgin/gtkdebug.c:749
-#: ../pidgin/gtkrequest.c:277
+#: ../libpurple/account.c:1339 ../libpurple/plugins/buddynote.c:50
+#: ../libpurple/protocols/jabber/buddy.c:727 ../pidgin/gtkdebug.c:754
+#: ../pidgin/gtkrequest.c:327
 msgid "Save"
 msgstr "Stoor"
 
-#: ../finch/gntaccount.c:632 ../pidgin/gtkaccount.c:1900
-#: ../pidgin/gtksavedstatuses.c:333 ../pidgin/gtkstatusbox.c:1568
+#: ../finch/gntaccount.c:632 ../pidgin/gtkaccount.c:1905
+#: ../pidgin/gtksavedstatuses.c:333 ../pidgin/gtkstatusbox.c:1587
 #, c-format
 msgid "Are you sure you want to delete %s?"
 msgstr "Wil u definitief %s uitvee?"
@@ -230,16 +230,16 @@
 
 #. Delete button
 #: ../finch/gntaccount.c:637 ../finch/gntaccount.c:707
-#: ../finch/gntcertmgr.c:319 ../finch/gntpounce.c:666 ../finch/gntpounce.c:729
+#: ../finch/gntcertmgr.c:319 ../finch/gntpounce.c:679 ../finch/gntpounce.c:742
 #: ../finch/gntstatus.c:144 ../finch/gntstatus.c:210
-#: ../pidgin/gtkaccount.c:1907 ../pidgin/gtklog.c:327
-#: ../pidgin/gtkpounce.c:1100 ../pidgin/gtkrequest.c:274
-#: ../pidgin/gtksavedstatuses.c:344 ../pidgin/gtkstatusbox.c:1573
+#: ../pidgin/gtkaccount.c:1912 ../pidgin/gtklog.c:327
+#: ../pidgin/gtkpounce.c:1120 ../pidgin/gtkrequest.c:324
+#: ../pidgin/gtksavedstatuses.c:344 ../pidgin/gtkstatusbox.c:1592
 msgid "Delete"
 msgstr "Vee uit"
 
-#: ../finch/gntaccount.c:669 ../finch/gntblist.c:2119 ../finch/gntui.c:82
-#: ../pidgin/gtkaccount.c:2325 ../pidgin/gtkdocklet.c:522
+#: ../finch/gntaccount.c:669 ../finch/gntblist.c:2121 ../finch/gntui.c:82
+#: ../pidgin/gtkaccount.c:2331 ../pidgin/gtkdocklet.c:715
 msgid "Accounts"
 msgstr "Rekeninge"
 
@@ -249,51 +249,52 @@
 
 #. Add button
 #: ../finch/gntaccount.c:698 ../finch/gntaccount.c:888 ../finch/gntblist.c:343
-#: ../finch/gntblist.c:421 ../finch/gntblist.c:456 ../finch/gntcertmgr.c:306
-#: ../finch/gntnotify.c:380 ../finch/gntpounce.c:713 ../finch/gntstatus.c:199
-#: ../libpurple/protocols/gg/gg.c:883 ../libpurple/protocols/qq/sys_msg.c:114
+#: ../finch/gntblist.c:421 ../finch/gntblist.c:456 ../finch/gntblist.c:2379
+#: ../finch/gntcertmgr.c:306 ../finch/gntnotify.c:385 ../finch/gntpounce.c:726
+#: ../finch/gntstatus.c:199 ../libpurple/protocols/gg/gg.c:884
+#: ../libpurple/protocols/qq/sys_msg.c:114
 #: ../libpurple/protocols/qq/sys_msg.c:173
 #: ../libpurple/protocols/qq/sys_msg.c:267
 #: ../libpurple/protocols/sametime/sametime.c:5486
-#: ../libpurple/protocols/silc/chat.c:615
-#: ../libpurple/protocols/silc10/chat.c:599 ../pidgin/gtkaccount.c:2494
-#: ../pidgin/gtkblist.c:5966 ../pidgin/gtkconv.c:1659
-#: ../pidgin/gtkrequest.c:275
+#: ../libpurple/protocols/silc/chat.c:619
+#: ../libpurple/protocols/silc10/chat.c:599 ../pidgin/gtkaccount.c:2500
+#: ../pidgin/gtkblist.c:6345 ../pidgin/gtkconv.c:1713
+#: ../pidgin/gtkrequest.c:325
 msgid "Add"
 msgstr "Voeg by"
 
 #. Modify button
-#: ../finch/gntaccount.c:703 ../finch/gntpounce.c:721
+#: ../finch/gntaccount.c:703 ../finch/gntpounce.c:734
 msgid "Modify"
 msgstr "Wysig"
 
-#: ../finch/gntaccount.c:811 ../pidgin/gtkaccount.c:2441
+#: ../finch/gntaccount.c:811 ../pidgin/gtkaccount.c:2447
 #, c-format
 msgid "%s%s%s%s has made %s his or her buddy%s%s"
 msgstr "%s%s%s%s het %s sy/haar vriend/vriendin gemaak%s%s"
 
-#: ../finch/gntaccount.c:884 ../pidgin/gtkaccount.c:2493
+#: ../finch/gntaccount.c:884 ../pidgin/gtkaccount.c:2499
 msgid "Add buddy to your list?"
 msgstr "Voeg vriend by u lys?"
 
-#: ../finch/gntaccount.c:944 ../pidgin/gtkaccount.c:2551
+#: ../finch/gntaccount.c:944 ../pidgin/gtkaccount.c:2557
 #, c-format
 msgid "%s%s%s%s wants to add %s to his or her buddy list%s%s"
 msgstr "%s%s%s%s wil %s by sy/haar vriendelys voeg%s%s"
 
 #: ../finch/gntaccount.c:969 ../finch/gntaccount.c:972
-#: ../finch/gntaccount.c:999 ../pidgin/gtkaccount.c:2574
-#: ../pidgin/gtkaccount.c:2580
+#: ../finch/gntaccount.c:999 ../pidgin/gtkaccount.c:2580
+#: ../pidgin/gtkaccount.c:2586
 msgid "Authorize buddy?"
 msgstr "Magtig vriend?"
 
 #: ../finch/gntaccount.c:976 ../finch/gntaccount.c:1003
-#: ../pidgin/gtkaccount.c:2575 ../pidgin/gtkaccount.c:2581
+#: ../pidgin/gtkaccount.c:2581 ../pidgin/gtkaccount.c:2587
 msgid "Authorize"
 msgstr "Magtig"
 
 #: ../finch/gntaccount.c:977 ../finch/gntaccount.c:1004
-#: ../pidgin/gtkaccount.c:2576 ../pidgin/gtkaccount.c:2582
+#: ../pidgin/gtkaccount.c:2582 ../pidgin/gtkaccount.c:2588
 msgid "Deny"
 msgstr "Weier"
 
@@ -315,22 +316,22 @@
 
 #: ../finch/gntblist.c:300
 msgid "Error adding buddy"
-msgstr "Fout met byvoeging van vriend"
-
-#: ../finch/gntblist.c:325 ../libpurple/protocols/oscar/oscar.c:2888
-#: ../pidgin/gtkaccount.c:1981 ../pidgin/gtksavedstatuses.c:980
+msgstr "Kon nie vriend byvoeg"
+
+#: ../finch/gntblist.c:325 ../libpurple/protocols/oscar/oscar.c:2903
+#: ../pidgin/gtkaccount.c:1986 ../pidgin/gtksavedstatuses.c:986
 msgid "Screen Name"
 msgstr "Skermnaam"
 
 #: ../finch/gntblist.c:328 ../finch/gntblist.c:410 ../finch/gntblist.c:1250
-#: ../libpurple/protocols/msn/msn.c:1395
-#: ../libpurple/protocols/silc/chat.c:606
+#: ../libpurple/protocols/msn/msn.c:1549
+#: ../libpurple/protocols/silc/chat.c:610
 #: ../libpurple/protocols/silc10/chat.c:590
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:704
 #: ../libpurple/protocols/zephyr/zephyr.c:788
-#: ../libpurple/protocols/zephyr/zephyr.c:1207 ../pidgin/gtkdialogs.c:1023
-#: ../pidgin/gtkdialogs.c:1047 ../pidgin/gtkdialogs.c:1069
-#: ../pidgin/gtkrequest.c:278
+#: ../libpurple/protocols/zephyr/zephyr.c:1207 ../pidgin/gtkdialogs.c:1037
+#: ../pidgin/gtkdialogs.c:1061 ../pidgin/gtkdialogs.c:1083
+#: ../pidgin/gtkrequest.c:328
 msgid "Alias"
 msgstr "Alias"
 
@@ -339,41 +340,43 @@
 msgstr "Groep"
 
 #: ../finch/gntblist.c:335 ../finch/gntblist.c:401 ../finch/gntblist.c:1305
-#: ../finch/gntnotify.c:174 ../finch/gntstatus.c:576
-#: ../libpurple/plugins/idle.c:153 ../libpurple/plugins/idle.c:190
-#: ../pidgin/gtkblist.c:3008 ../pidgin/gtknotify.c:506
-#: ../pidgin/gtkpounce.c:1268 ../pidgin/plugins/gevolution/gevolution.c:445
+#: ../finch/gntblist.c:2210 ../finch/gntblist.c:2274 ../finch/gntnotify.c:174
+#: ../finch/gntstatus.c:576 ../libpurple/plugins/idle.c:153
+#: ../libpurple/plugins/idle.c:190 ../pidgin/gtkblist.c:3226
+#: ../pidgin/gtknotify.c:512 ../pidgin/gtkpounce.c:1288
+#: ../pidgin/plugins/gevolution/gevolution.c:445
 msgid "Account"
 msgstr "Rekening"
 
 #: ../finch/gntblist.c:341 ../finch/gntblist.c:852
 #: ../libpurple/protocols/silc/buddy.c:725
-#: ../libpurple/protocols/silc/buddy.c:1027
-#: ../libpurple/protocols/silc/buddy.c:1072
-#: ../libpurple/protocols/silc/buddy.c:1182
+#: ../libpurple/protocols/silc/buddy.c:1030
+#: ../libpurple/protocols/silc/buddy.c:1075
+#: ../libpurple/protocols/silc/buddy.c:1185
 #: ../libpurple/protocols/silc10/buddy.c:737
-#: ../libpurple/protocols/silc10/buddy.c:1033
-#: ../libpurple/protocols/silc10/buddy.c:1080
-#: ../libpurple/protocols/silc10/buddy.c:1180
-#: ../libpurple/protocols/yahoo/yahoo.c:3343 ../pidgin/gtkblist.c:5483
+#: ../libpurple/protocols/silc10/buddy.c:1036
+#: ../libpurple/protocols/silc10/buddy.c:1083
+#: ../libpurple/protocols/silc10/buddy.c:1183
+#: ../libpurple/protocols/yahoo/yahoo.c:3345 ../pidgin/gtkblist.c:5847
 #: ../pidgin/plugins/gevolution/add_buddy_dialog.c:445
 msgid "Add Buddy"
 msgstr "Voeg vriend by"
 
 #: ../finch/gntblist.c:341
 msgid "Please enter buddy information."
-msgstr "Gee asb. vriendinligting."
-
-#: ../finch/gntblist.c:370 ../libpurple/blist.c:1209
+msgstr "Tik gerus vriendinligting."
+
+#: ../finch/gntblist.c:370 ../libpurple/blist.c:1210
 msgid "Chats"
 msgstr "Geselsies"
 
 #. Extract their Name and put it in
-#: ../finch/gntblist.c:407 ../libpurple/protocols/jabber/jabber.c:924
+#: ../finch/gntblist.c:407 ../finch/gntblist.c:2205
+#: ../libpurple/protocols/jabber/jabber.c:924
 #: ../libpurple/protocols/jabber/jabber.c:927
-#: ../libpurple/protocols/msn/msn.c:1584 ../libpurple/protocols/msn/msn.c:1649
-#: ../libpurple/protocols/msn/msn.c:1676
-#: ../libpurple/protocols/qq/buddy_info.c:44 ../pidgin/gtkplugin.c:582
+#: ../libpurple/protocols/msn/msn.c:1730 ../libpurple/protocols/msn/msn.c:1795
+#: ../libpurple/protocols/msn/msn.c:1822
+#: ../libpurple/protocols/qq/buddy_info.c:44 ../pidgin/gtkplugin.c:608
 #: ../pidgin/gtkroomlist.c:618
 #: ../pidgin/plugins/gevolution/add_buddy_dialog.c:132
 #: ../pidgin/plugins/gevolution/assoc-buddy.c:123
@@ -384,7 +387,7 @@
 msgid "Auto-join"
 msgstr "Outoaansluit"
 
-#: ../finch/gntblist.c:419 ../finch/gntblist.c:854 ../pidgin/gtkblist.c:5859
+#: ../finch/gntblist.c:419 ../finch/gntblist.c:854 ../pidgin/gtkblist.c:6231
 msgid "Add Chat"
 msgstr "Voeg geselsie by"
 
@@ -394,7 +397,7 @@
 
 #: ../finch/gntblist.c:433 ../finch/gntblist.c:446
 msgid "Error adding group"
-msgstr "Fout met byvoeg van groep"
+msgstr "Kon nie groep byvoeg nie"
 
 #: ../finch/gntblist.c:434
 msgid "You must give a name for the group to add."
@@ -406,13 +409,13 @@
 
 #: ../finch/gntblist.c:454 ../finch/gntblist.c:856
 #: ../libpurple/protocols/sametime/sametime.c:5396
-#: ../libpurple/protocols/sametime/sametime.c:5484 ../pidgin/gtkblist.c:5963
+#: ../libpurple/protocols/sametime/sametime.c:5484 ../pidgin/gtkblist.c:6342
 msgid "Add Group"
 msgstr "Voeg groep by"
 
 #: ../finch/gntblist.c:454
 msgid "Enter the name of the group"
-msgstr "Gee die naam van die groep"
+msgstr "Tik die naam van die groep"
 
 #: ../finch/gntblist.c:802
 msgid "Edit Chat"
@@ -420,7 +423,7 @@
 
 #: ../finch/gntblist.c:802
 msgid "Please Update the necessary fields."
-msgstr "Dateer asb. die nodige velde."
+msgstr "Dateer gerus die nodige velde."
 
 #: ../finch/gntblist.c:803 ../finch/gntstatus.c:205
 msgid "Edit"
@@ -430,16 +433,16 @@
 msgid "Edit Settings"
 msgstr "Wysig instellings"
 
-#: ../finch/gntblist.c:864 ../pidgin/gtkutils.c:931
+#: ../finch/gntblist.c:864 ../pidgin/gtkutils.c:930
 msgid "Information"
 msgstr "Inligting"
 
-#: ../finch/gntblist.c:864 ../pidgin/gtkutils.c:931
+#: ../finch/gntblist.c:864 ../pidgin/gtkutils.c:930
 msgid "Retrieving..."
 msgstr "Verkry tans..."
 
-#: ../finch/gntblist.c:904 ../finch/gntconv.c:507
-#: ../libpurple/protocols/silc/chat.c:899
+#: ../finch/gntblist.c:904 ../finch/gntconv.c:528
+#: ../libpurple/protocols/silc/chat.c:903
 #: ../libpurple/protocols/silc10/chat.c:883
 msgid "Get Info"
 msgstr "Kry inligting"
@@ -449,10 +452,10 @@
 msgstr "Voeg vriendwag by"
 
 #. if (q_bud && is_online(q_bud->status)) {
-#: ../finch/gntblist.c:915 ../finch/gntconv.c:519
+#: ../finch/gntblist.c:915 ../finch/gntconv.c:540
 #: ../libpurple/protocols/jabber/si.c:874
 #: ../libpurple/protocols/oscar/oscar.c:654 ../libpurple/protocols/qq/qq.c:587
-#: ../pidgin/gtkconv.c:1607
+#: ../pidgin/gtkconv.c:1661
 msgid "Send File"
 msgstr "Stuur lêer"
 
@@ -463,7 +466,7 @@
 #: ../finch/gntblist.c:1000
 #, c-format
 msgid "Please enter the new name for %s"
-msgstr "Gee asb. die nuwe naam vir %s"
+msgstr "Tik gerus die nuwe naam vir %s"
 
 #: ../finch/gntblist.c:1002 ../finch/gntblist.c:1250
 msgid "Rename"
@@ -475,7 +478,7 @@
 
 #: ../finch/gntblist.c:1003
 msgid "Enter empty string to reset the name."
-msgstr "Gee leë string om die naam terug te stel."
+msgstr "Tik leë string om die naam terug te stel."
 
 #: ../finch/gntblist.c:1079
 msgid "Removing this contact will also remove all the buddies in the contact"
@@ -500,14 +503,14 @@
 msgstr "Bevestig verwydering"
 
 #: ../finch/gntblist.c:1100 ../finch/gntblist.c:1252 ../finch/gntft.c:227
-#: ../pidgin/gtkconv.c:1656 ../pidgin/gtkrequest.c:276
+#: ../pidgin/gtkconv.c:1710 ../pidgin/gtkrequest.c:326
 #: ../pidgin/gtkstatusbox.c:264
 msgid "Remove"
 msgstr "Verwyder"
 
 #. Buddy List
-#: ../finch/gntblist.c:1226 ../finch/gntblist.c:2307 ../finch/gntprefs.c:258
-#: ../finch/gntui.c:83 ../pidgin/gtkblist.c:2688 ../pidgin/gtkblist.c:4284
+#: ../finch/gntblist.c:1226 ../finch/gntblist.c:2432 ../finch/gntprefs.c:258
+#: ../finch/gntui.c:83 ../pidgin/gtkblist.c:2892 ../pidgin/gtkblist.c:4631
 #: ../pidgin/plugins/win32/winprefs/winprefs.c:326
 msgid "Buddy List"
 msgstr "Vriendelys"
@@ -522,43 +525,44 @@
 
 #. General
 #: ../finch/gntblist.c:1298 ../libpurple/protocols/gg/gg.c:637
-#: ../libpurple/protocols/gg/gg.c:1050 ../libpurple/protocols/gg/gg.c:1123
-#: ../libpurple/protocols/gg/gg.c:2207
+#: ../libpurple/protocols/gg/gg.c:1051 ../libpurple/protocols/gg/gg.c:1124
+#: ../libpurple/protocols/gg/gg.c:2217
 #: ../libpurple/protocols/jabber/buddy.c:286
 #: ../libpurple/protocols/jabber/buddy.c:1247
-#: ../libpurple/protocols/jabber/buddy.c:2214
-#: ../libpurple/protocols/jabber/buddy.c:2396
+#: ../libpurple/protocols/jabber/buddy.c:2217
+#: ../libpurple/protocols/jabber/buddy.c:2409
 #: ../libpurple/protocols/jabber/jabber.c:937
-#: ../libpurple/protocols/jabber/jabber.c:1544
-#: ../libpurple/protocols/jabber/jabber.c:1567
-#: ../libpurple/protocols/jabber/jabber.c:1590
-#: ../libpurple/protocols/jabber/jabber.c:1613
-#: ../libpurple/protocols/jabber/jabber.c:1636
-#: ../libpurple/protocols/msn/msn.c:1403 ../libpurple/protocols/msn/msn.c:1587
+#: ../libpurple/protocols/jabber/jabber.c:1542
+#: ../libpurple/protocols/jabber/jabber.c:1556
+#: ../libpurple/protocols/jabber/jabber.c:1570
+#: ../libpurple/protocols/jabber/jabber.c:1584
+#: ../libpurple/protocols/jabber/jabber.c:1598
+#: ../libpurple/protocols/msn/msn.c:1557 ../libpurple/protocols/msn/msn.c:1733
 #: ../libpurple/protocols/qq/buddy_info.c:43
-#: ../libpurple/protocols/silc/buddy.c:1535
+#: ../libpurple/protocols/silc/buddy.c:1538
 #: ../libpurple/protocols/silc/ops.c:1002
 #: ../libpurple/protocols/silc/ops.c:1186
-#: ../libpurple/protocols/silc/ops.c:1322
-#: ../libpurple/protocols/silc10/buddy.c:1535
+#: ../libpurple/protocols/silc/ops.c:1324
+#: ../libpurple/protocols/silc10/buddy.c:1538
 #: ../libpurple/protocols/silc10/ops.c:1036
 #: ../libpurple/protocols/silc10/ops.c:1179
 #: ../libpurple/protocols/silc10/ops.c:1328
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1066 ../pidgin/gtkblist.c:3032
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1066 ../pidgin/gtkblist.c:3250
 msgid "Nickname"
 msgstr "Bynaam"
 
 #. Idle stuff
 #: ../finch/gntblist.c:1320 ../finch/gntprefs.c:261
-#: ../libpurple/protocols/bonjour/bonjour.c:340
+#: ../libpurple/protocols/bonjour/bonjour.c:354
 #: ../libpurple/protocols/jabber/buddy.c:787
 #: ../libpurple/protocols/jabber/buddy.c:951
-#: ../libpurple/protocols/msn/msn.c:544 ../libpurple/protocols/msn/state.c:32
-#: ../libpurple/protocols/novell/novell.c:2825
-#: ../libpurple/protocols/oscar/oscar.c:2912
-#: ../libpurple/protocols/yahoo/yahoo.c:3097
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:710 ../pidgin/gtkblist.c:3060
-#: ../pidgin/gtkblist.c:3460 ../pidgin/gtkprefs.c:1925
+#: ../libpurple/protocols/msn/msn.c:611 ../libpurple/protocols/msn/msn.c:629
+#: ../libpurple/protocols/msn/msn.c:637 ../libpurple/protocols/msn/state.c:32
+#: ../libpurple/protocols/novell/novell.c:2830
+#: ../libpurple/protocols/oscar/oscar.c:2927
+#: ../libpurple/protocols/yahoo/yahoo.c:3099
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:710 ../pidgin/gtkblist.c:3278
+#: ../pidgin/gtkblist.c:3684 ../pidgin/gtkprefs.c:2026
 msgid "Idle"
 msgstr "Ledig"
 
@@ -589,122 +593,135 @@
 "\n"
 "Laas gesien: %s gelede"
 
-#: ../finch/gntblist.c:1702 ../pidgin/gtkdocklet.c:470
-#: ../pidgin/gtkstatusbox.c:1072
+#: ../finch/gntblist.c:1704 ../pidgin/gtkdocklet.c:582
 msgid "New..."
 msgstr "Nuwe..."
 
-#: ../finch/gntblist.c:1709 ../pidgin/gtkdocklet.c:471
-#: ../pidgin/gtkstatusbox.c:1073
+#: ../finch/gntblist.c:1711 ../pidgin/gtkdocklet.c:583
 msgid "Saved..."
 msgstr "Gestoor..."
 
-#: ../finch/gntblist.c:2087 ../finch/gntplugin.c:255 ../finch/gntui.c:88
-#: ../pidgin/gtkdocklet.c:523 ../pidgin/gtkplugin.c:531
+#: ../finch/gntblist.c:2089 ../finch/gntplugin.c:345 ../finch/gntui.c:88
+#: ../pidgin/gtkdocklet.c:716 ../pidgin/gtkplugin.c:555
 msgid "Plugins"
 msgstr "Inproppe"
 
-#: ../finch/gntblist.c:2203 ../pidgin/gtkdialogs.c:754
-#: ../pidgin/gtkdialogs.c:893 ../pidgin/gtkdialogs.c:974
-msgid "_Name"
-msgstr "_Naam"
-
-#: ../finch/gntblist.c:2208 ../pidgin/gtkdialogs.c:759
-#: ../pidgin/gtkdialogs.c:898 ../pidgin/gtkdialogs.c:979
-msgid "_Account"
-msgstr "_Rekening"
-
-#: ../finch/gntblist.c:2216 ../pidgin/gtkdialogs.c:767
+#: ../finch/gntblist.c:2218 ../pidgin/gtkdialogs.c:781
 msgid "New Instant Message"
 msgstr "Nuwe kitsboodskap"
 
-#: ../finch/gntblist.c:2218 ../pidgin/gtkdialogs.c:769
+#: ../finch/gntblist.c:2220 ../pidgin/gtkdialogs.c:783
 msgid ""
 "Please enter the screen name or alias of the person you would like to IM."
 msgstr ""
-"Gee asb. die skermnaam of alias van die persoon om 'n kitsboodskap heen te "
+"Tik gerus die skermnaam of alias van die persoon om 'n kitsboodskap heen te "
 "stuur."
 
 #. Not multiline
 #. Not masked?
 #. No hints?
-#: ../finch/gntblist.c:2221 ../finch/gntcertmgr.c:90 ../finch/gntconn.c:135
-#: ../finch/gntnotify.c:80 ../libpurple/account.c:1012
-#: ../libpurple/account.c:1262 ../libpurple/protocols/gg/gg.c:506
+#: ../finch/gntblist.c:2223 ../finch/gntcertmgr.c:90 ../finch/gntconn.c:136
+#: ../finch/gntnotify.c:80 ../libpurple/account.c:1015
+#: ../libpurple/account.c:1304 ../libpurple/protocols/gg/gg.c:506
 #: ../libpurple/protocols/gg/gg.c:665 ../libpurple/protocols/gg/gg.c:802
-#: ../libpurple/protocols/jabber/jabber.c:1736
+#: ../libpurple/protocols/jabber/jabber.c:1714
 #: ../libpurple/protocols/jabber/xdata.c:399
-#: ../libpurple/protocols/msn/msn.c:286 ../libpurple/protocols/msn/msn.c:303
-#: ../libpurple/protocols/msn/msn.c:320 ../libpurple/protocols/msn/msn.c:337
-#: ../libpurple/protocols/oscar/oscar.c:6093
+#: ../libpurple/protocols/msn/msn.c:290 ../libpurple/protocols/msn/msn.c:307
+#: ../libpurple/protocols/msn/msn.c:324 ../libpurple/protocols/msn/msn.c:341
+#: ../libpurple/protocols/oscar/oscar.c:6148
 #: ../libpurple/protocols/silc/buddy.c:454
-#: ../libpurple/protocols/silc/buddy.c:1190
-#: ../libpurple/protocols/silc/chat.c:447
-#: ../libpurple/protocols/silc/chat.c:482
-#: ../libpurple/protocols/silc/chat.c:745
-#: ../libpurple/protocols/silc/ops.c:1291
-#: ../libpurple/protocols/silc/ops.c:1815
-#: ../libpurple/protocols/silc/silc.c:822
+#: ../libpurple/protocols/silc/buddy.c:1193
+#: ../libpurple/protocols/silc/chat.c:449
+#: ../libpurple/protocols/silc/chat.c:486
+#: ../libpurple/protocols/silc/chat.c:749
+#: ../libpurple/protocols/silc/ops.c:1293
+#: ../libpurple/protocols/silc/ops.c:1819
+#: ../libpurple/protocols/silc/silc.c:953
 #: ../libpurple/protocols/silc10/buddy.c:467
-#: ../libpurple/protocols/silc10/buddy.c:1188
+#: ../libpurple/protocols/silc10/buddy.c:1191
 #: ../libpurple/protocols/silc10/chat.c:425
 #: ../libpurple/protocols/silc10/chat.c:464
 #: ../libpurple/protocols/silc10/chat.c:729
 #: ../libpurple/protocols/silc10/ops.c:1297
 #: ../libpurple/protocols/silc10/ops.c:1903
 #: ../libpurple/protocols/silc10/silc.c:735
-#: ../libpurple/protocols/yahoo/yahoo.c:1031
-#: ../libpurple/protocols/yahoo/yahoo.c:3497
-#: ../libpurple/protocols/yahoo/yahoo.c:3508 ../pidgin/gtkblist.c:4039
-#: ../pidgin/gtkcertmgr.c:195 ../pidgin/gtkdialogs.c:772
-#: ../pidgin/gtkdialogs.c:911 ../pidgin/gtkdialogs.c:1003
-#: ../pidgin/gtkrequest.c:270
+#: ../libpurple/protocols/yahoo/yahoo.c:1033
+#: ../libpurple/protocols/yahoo/yahoo.c:3499
+#: ../libpurple/protocols/yahoo/yahoo.c:3510 ../pidgin/gtkblist.c:4387
+#: ../pidgin/gtkcertmgr.c:195 ../pidgin/gtkdialogs.c:786
+#: ../pidgin/gtkdialogs.c:925 ../pidgin/gtkdialogs.c:1017
+#: ../pidgin/gtkrequest.c:320
 msgid "OK"
 msgstr "Regso"
 
+#: ../finch/gntblist.c:2270
+msgid "Channel"
+msgstr "Kanaal"
+
+#: ../finch/gntblist.c:2282 ../pidgin/gtkblist.c:924
+msgid "Join a Chat"
+msgstr "Sluit by geselsie aan"
+
+#: ../finch/gntblist.c:2284
+msgid "Please enter the name of the chat you want to join."
+msgstr "Tik gerus die naam van die geselsie om by aan te sluit."
+
+#: ../finch/gntblist.c:2286 ../finch/gntnotify.c:394
+msgid "Join"
+msgstr "Sluit aan"
+
 #. Create the "Options" frame.
-#: ../finch/gntblist.c:2241 ../finch/gntpounce.c:447 ../pidgin/gtkpounce.c:790
+#: ../finch/gntblist.c:2324 ../finch/gntpounce.c:460 ../pidgin/gtkpounce.c:810
 msgid "Options"
-msgstr "Keuses"
-
-#: ../finch/gntblist.c:2247
+msgstr "Opsies"
+
+#: ../finch/gntblist.c:2330
 msgid "Send IM..."
 msgstr "Stuur kitsboodskap..."
 
-#: ../finch/gntblist.c:2251
-#, fuzzy
-msgid "Show empty groups"
-msgstr "Wys leë groepe"
-
-#: ../finch/gntblist.c:2257
-#, fuzzy
-msgid "Show offline buddies"
-msgstr "Wys aflynvriende"
-
-#: ../finch/gntblist.c:2263
-msgid "Sort by status"
-msgstr "Sorteer volgens status"
-
-#: ../finch/gntblist.c:2267
-msgid "Sort alphabetically"
-msgstr "Sorteer alfabeties"
-
-#: ../finch/gntblist.c:2271
-msgid "Sort by log size"
-msgstr "Sorteer volgens staaflêergrootte"
+#: ../finch/gntblist.c:2335
+msgid "Join Chat..."
+msgstr "Sluit by geselsie aan..."
+
+#: ../finch/gntblist.c:2340
+msgid "Show"
+msgstr "Wys"
+
+#: ../finch/gntblist.c:2345
+msgid "Empty groups"
+msgstr "Leë groepe"
+
+#: ../finch/gntblist.c:2352
+msgid "Offline buddies"
+msgstr "Vanlynvriende"
+
+#: ../finch/gntblist.c:2359
+msgid "Sort"
+msgstr "Sorteer"
+
+#: ../finch/gntblist.c:2364
+msgid "By Status"
+msgstr "Volgens status"
+
+#: ../finch/gntblist.c:2369 ../pidgin/gtkblist.c:4172
+msgid "Alphabetically"
+msgstr "Alfabeties"
+
+#: ../finch/gntblist.c:2374
+msgid "By Log Size"
+msgstr "Volgens staaflêergrootte"
 
 #: ../finch/gntcertmgr.c:86 ../pidgin/gtkcertmgr.c:188
-#, fuzzy
 msgid "Certificate Import"
-msgstr "Verbindingspoort"
+msgstr "Sertifikaatinvoer"
 
 #: ../finch/gntcertmgr.c:87 ../pidgin/gtkcertmgr.c:189
 msgid "Specify a hostname"
-msgstr ""
+msgstr "Spesifiseer 'n gasheernaam"
 
 #: ../finch/gntcertmgr.c:88 ../pidgin/gtkcertmgr.c:190
 msgid "Type the host name this certificate is for."
-msgstr ""
+msgstr "Tik die gasheernaam vir hierdie sertifikaat in."
 
 #: ../finch/gntcertmgr.c:97 ../pidgin/gtkcertmgr.c:210
 #, c-format
@@ -712,19 +729,20 @@
 "File %s could not be imported.\n"
 "Make sure that the file is readable and in PEM format.\n"
 msgstr ""
+"Lêer %s kon nie ingevoer word nie.\n"
+"Maak seker die lêer is leesbaar en in PEM-formaat.\n"
 
 #: ../finch/gntcertmgr.c:99 ../pidgin/gtkcertmgr.c:212
 msgid "Certificate Import Error"
-msgstr ""
+msgstr "Kon nie sertifikaat invoer nie"
 
 #: ../finch/gntcertmgr.c:100 ../pidgin/gtkcertmgr.c:213
 msgid "X.509 certificate import failed"
-msgstr ""
+msgstr "Invoer van X.509-sertifikaat het misluk"
 
 #: ../finch/gntcertmgr.c:110 ../pidgin/gtkcertmgr.c:224
-#, fuzzy
 msgid "Select a PEM certificate"
-msgstr "Kies 'n lêer"
+msgstr "Kies 'n PEM-sertifikaat"
 
 #: ../finch/gntcertmgr.c:127 ../pidgin/gtkcertmgr.c:245
 #, c-format
@@ -732,23 +750,25 @@
 "Export to file %s failed.\n"
 "Check that you have write permission to the target path\n"
 msgstr ""
+"Uitvoer na lêer %s het misluk.\n"
+"Kontroleer dat u skryftoestemming na die teikenpad het\n"
 
 #: ../finch/gntcertmgr.c:129 ../pidgin/gtkcertmgr.c:247
 msgid "Certificate Export Error"
-msgstr ""
+msgstr "Kon nie sertifikaat uitvoer nie"
 
 #: ../finch/gntcertmgr.c:130 ../pidgin/gtkcertmgr.c:248
 msgid "X.509 certificate export failed"
-msgstr ""
+msgstr "Uitvoer van X.509-sertifikaat het misluk"
 
 #: ../finch/gntcertmgr.c:159 ../pidgin/gtkcertmgr.c:299
 msgid "PEM X.509 Certificate Export"
-msgstr ""
+msgstr "PEM X.509-sertifikaatuitvoer"
 
 #: ../finch/gntcertmgr.c:188
-#, fuzzy, c-format
+#, c-format
 msgid "Certificate for %s"
-msgstr "Status vir %s"
+msgstr "Sertifikaat vir %s"
 
 #: ../finch/gntcertmgr.c:195
 #, c-format
@@ -758,57 +778,61 @@
 "SHA1 fingerprint:\n"
 "%s"
 msgstr ""
+"Algemene naam: %s\n"
+"\n"
+"SHA1-vingerafdruk:\n"
+"%s"
 
 #: ../finch/gntcertmgr.c:198
 msgid "SSL Host Certificate"
-msgstr ""
+msgstr "SSL-gasheersertifikaat"
 
 #: ../finch/gntcertmgr.c:233 ../pidgin/gtkcertmgr.c:372
 #, c-format
 msgid "Really delete certificate for %s?"
-msgstr ""
+msgstr "Skrap sertifikaat vir %s regtig?"
 
 #: ../finch/gntcertmgr.c:236 ../pidgin/gtkcertmgr.c:374
 msgid "Confirm certificate delete"
-msgstr ""
-
-#: ../finch/gntcertmgr.c:293 ../pidgin/gtkcertmgr.c:602
+msgstr "Bevestig sertifikaatskrapping"
+
+#: ../finch/gntcertmgr.c:293 ../pidgin/gtkcertmgr.c:603
 msgid "Certificate Manager"
-msgstr ""
+msgstr "Sertifikaatbestuurder"
 
 #. Creating the user splits
-#: ../finch/gntcertmgr.c:298 ../libpurple/protocols/bonjour/bonjour.c:652
-#: ../libpurple/protocols/silc/silc.c:1007
+#: ../finch/gntcertmgr.c:298 ../libpurple/protocols/bonjour/bonjour.c:666
+#: ../libpurple/protocols/silc/silc.c:1138
 #: ../libpurple/protocols/silc10/silc.c:918
 msgid "Hostname"
 msgstr "Gasheernaam"
 
-#: ../finch/gntcertmgr.c:315 ../finch/gntnotify.c:383 ../pidgin/gtkconv.c:1635
-#: ../pidgin/gtkdebug.c:835
+#: ../finch/gntcertmgr.c:315 ../finch/gntnotify.c:388 ../pidgin/gtkconv.c:1689
+#: ../pidgin/gtkdebug.c:840
 msgid "Info"
 msgstr "Inligting"
 
 #. Close button
 #: ../finch/gntcertmgr.c:324 ../finch/gntft.c:237 ../finch/gntnotify.c:182
-#: ../finch/gntplugin.c:210 ../finch/gntplugin.c:310 ../finch/gntpounce.c:738
-#: ../finch/gntstatus.c:216 ../libpurple/protocols/msn/msn.c:403
-#: ../libpurple/protocols/silc/util.c:382
-#: ../libpurple/protocols/silc10/util.c:377 ../pidgin/gtkaccount.c:2468
-#: ../pidgin/gtkrequest.c:273
+#: ../finch/gntplugin.c:213 ../finch/gntplugin.c:406 ../finch/gntpounce.c:751
+#: ../finch/gntstatus.c:216 ../libpurple/protocols/msn/msn.c:407
+#: ../libpurple/protocols/silc/util.c:386
+#: ../libpurple/protocols/silc10/util.c:377 ../pidgin/gtkaccount.c:2474
+#: ../pidgin/gtkrequest.c:323
 msgid "Close"
 msgstr "Sluit"
 
-#: ../finch/gntconn.c:124
+#: ../finch/gntconn.c:125
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../finch/gntconn.c:127
+#: ../finch/gntconn.c:128
 #, c-format
 msgid "%s disconnected."
-msgstr "%s afgesny."
-
-#: ../finch/gntconn.c:128
+msgstr "%s ontkoppel."
+
+#: ../finch/gntconn.c:129
 #, c-format
 msgid ""
 "%s\n"
@@ -818,54 +842,53 @@
 msgstr ""
 "%s\n"
 "\n"
-"Finch sal nie weer probeer verbind totdat u die fout reggemaak het en die "
+"Finch sal nie weer probeer koppel totdat u die fout reggemaak het en die "
 "rekening geheraktiveer het nie."
 
-#: ../finch/gntconn.c:137 ../pidgin/gtkblist.c:4041
+#: ../finch/gntconn.c:138 ../pidgin/gtkblist.c:4389
 msgid "Re-enable Account"
 msgstr "Heraktiveer rekening"
 
-#: ../finch/gntconv.c:139
+#: ../finch/gntconv.c:137
 msgid "No such command."
-msgstr "Daar is nie so 'n opdrag nie."
-
-#: ../finch/gntconv.c:143 ../pidgin/gtkconv.c:489
+msgstr "Daar is nie so 'n bevel nie."
+
+#: ../finch/gntconv.c:141 ../pidgin/gtkconv.c:531
 msgid "Syntax Error:  You typed the wrong number of arguments to that command."
 msgstr ""
-"Sintaksfout:  U het die verkeerde aantal argumente vir daardie opdrag getik."
-
-#: ../finch/gntconv.c:148 ../pidgin/gtkconv.c:495
+"Sintaksfout:  U het die verkeerde getal argumente vir daardie bevel getik."
+
+#: ../finch/gntconv.c:146 ../pidgin/gtkconv.c:537
 msgid "Your command failed for an unknown reason."
-msgstr "Die opdrag het misluk weens 'n onbekende rede."
-
-#: ../finch/gntconv.c:153 ../pidgin/gtkconv.c:502
+msgstr "Die bevel het misluk weens 'n onbekende rede."
+
+#: ../finch/gntconv.c:151 ../pidgin/gtkconv.c:544
 msgid "That command only works in chats, not IMs."
-msgstr "Daardie opdrag werk net in geselsies, nie kitsboodskappe nie."
-
-#: ../finch/gntconv.c:156 ../pidgin/gtkconv.c:505
+msgstr "Daardie bevel werk net in geselsies, nie kitsboodskappe nie."
+
+#: ../finch/gntconv.c:154 ../pidgin/gtkconv.c:547
 msgid "That command only works in IMs, not chats."
-msgstr "Daardie opdrag werk net in kitsboodskappe, nie geselsies nie."
-
-#: ../finch/gntconv.c:160 ../pidgin/gtkconv.c:510
+msgstr "Daardie bevel werk net in kitsboodskappe, nie geselsies nie."
+
+#: ../finch/gntconv.c:158 ../pidgin/gtkconv.c:552
 msgid "That command doesn't work on this protocol."
-msgstr "Daardie opdrag werk nie met hierdie protokol nie."
-
-#: ../finch/gntconv.c:168
-#, fuzzy
+msgstr "Daardie bevel werk nie met hierdie protokol nie."
+
+#: ../finch/gntconv.c:166
 msgid "Message was not sent, because you are not signed on."
-msgstr "Boodskap kon nie gestuur word nie omdat ons te vinnig stuur:"
-
-#: ../finch/gntconv.c:251
+msgstr "Boodskap is nie gestuur nie omdat u nie aangeteken is nie."
+
+#: ../finch/gntconv.c:245
 #, c-format
 msgid "%s (%s -- %s)"
 msgstr "%s (%s -- %s)"
 
-#: ../finch/gntconv.c:274
+#: ../finch/gntconv.c:268
 #, c-format
 msgid "%s [%s]"
 msgstr "%s [%s]"
 
-#: ../finch/gntconv.c:279 ../finch/gntconv.c:773
+#: ../finch/gntconv.c:273 ../finch/gntconv.c:795
 #, c-format
 msgid ""
 "\n"
@@ -874,90 +897,88 @@
 "\n"
 "%s tik..."
 
-#: ../finch/gntconv.c:298
+#: ../finch/gntconv.c:292
 msgid "You have left this chat."
 msgstr "U het hierdie geselsie verlaat."
 
-#: ../finch/gntconv.c:387 ../pidgin/gtkconv.c:1362
+#: ../finch/gntconv.c:408 ../pidgin/gtkconv.c:1416
 msgid "Logging started. Future messages in this conversation will be logged."
 msgstr ""
 "Boekstawing het begin. Boodskappe in hierdie gesprek sal van nou af "
 "geboekstaaf word."
 
-#: ../finch/gntconv.c:393 ../pidgin/gtkconv.c:1370
+#: ../finch/gntconv.c:414 ../pidgin/gtkconv.c:1424
 msgid ""
 "Logging stopped. Future messages in this conversation will not be logged."
 msgstr ""
 "Boekstawing gestop. Boodskappe in hierdie gesprek sal van nou af nie "
 "geboekstaaf word nie."
 
-#: ../finch/gntconv.c:442
+#: ../finch/gntconv.c:463
 msgid "Send To"
 msgstr "Stuur na"
 
-#: ../finch/gntconv.c:486
+#: ../finch/gntconv.c:507
 msgid "Conversation"
 msgstr "Gesprek"
 
-#: ../finch/gntconv.c:492
+#: ../finch/gntconv.c:513
 msgid "Clear Scrollback"
 msgstr "Maak gesprekvenster skoon"
 
-#: ../finch/gntconv.c:496 ../finch/gntprefs.c:191
+#: ../finch/gntconv.c:517 ../finch/gntprefs.c:191
 msgid "Show Timestamps"
 msgstr "Wys tydstempels"
 
-#: ../finch/gntconv.c:512
+#: ../finch/gntconv.c:533
 msgid "Add Buddy Pounce..."
 msgstr "Voeg vriendwag by..."
 
-#: ../finch/gntconv.c:527
-#, fuzzy
+#: ../finch/gntconv.c:548
 msgid "Enable Logging"
 msgstr "Aktiveer boekstawing"
 
-#: ../finch/gntconv.c:533
-#, fuzzy
+#: ../finch/gntconv.c:554
 msgid "Enable Sounds"
-msgstr "Aktiveer klanke:"
-
-#: ../finch/gntconv.c:739
+msgstr "Aktiveer klanke"
+
+#: ../finch/gntconv.c:760
 msgid "<AUTO-REPLY> "
 msgstr "<AUTO-REPLY> "
 
 #. Print the list of users in the room
-#: ../finch/gntconv.c:861
+#: ../finch/gntconv.c:883
 msgid "List of users:\n"
 msgstr "Lys van gebruikers:\n"
 
-#: ../finch/gntconv.c:1023 ../pidgin/gtkconv.c:331
+#: ../finch/gntconv.c:1045 ../pidgin/gtkconv.c:371
 msgid "Supported debug options are:  version"
-msgstr "Ondersteunde ontfoutkeuses is:  weergawe"
-
-#: ../finch/gntconv.c:1059 ../pidgin/gtkconv.c:381
+msgstr "Gesteunde ontfoutopsies is:  weergawe"
+
+#: ../finch/gntconv.c:1081 ../pidgin/gtkconv.c:423
 msgid "No such command (in this context)."
-msgstr "Daar is nie so 'n opdrag (in hierdie konteks) nie."
-
-#: ../finch/gntconv.c:1062 ../pidgin/gtkconv.c:384
+msgstr "Daar is nie so 'n bevel (in hierdie konteks) nie."
+
+#: ../finch/gntconv.c:1084 ../pidgin/gtkconv.c:426
 msgid ""
 "Use \"/help &lt;command&gt;\" for help on a specific command.\n"
 "The following commands are available in this context:\n"
 msgstr ""
-"Gebruik \"/help &lt;opdrag&gt;\" vir hulp met 'n spesifieke opdrag.\n"
-"Die volgende opdragte is in hierdie konteks beskikbaar:\n"
-
-#: ../finch/gntconv.c:1120 ../pidgin/gtkconv.c:7560
+"Gebruik \"/help &lt;bevel&gt;\" vir hulp met 'n spesifieke bevel.\n"
+"Die volgende bevele is in hierdie konteks beskikbaar:\n"
+
+#: ../finch/gntconv.c:1142 ../pidgin/gtkconv.c:7755
 msgid ""
 "say &lt;message&gt;:  Send a message normally as if you weren't using a "
 "command."
 msgstr ""
-"say &lt;boodskap&gt;:  Stuur 'n boodskap gewoonweg net soos sonder 'n opdrag."
-
-#: ../finch/gntconv.c:1123 ../pidgin/gtkconv.c:7563
+"say &lt;boodskap&gt;:  Stuur 'n boodskap gewoonweg net soos sonder 'n bevel."
+
+#: ../finch/gntconv.c:1145 ../pidgin/gtkconv.c:7758
 msgid "me &lt;action&gt;:  Send an IRC style action to a buddy or chat."
 msgstr "me &lt;action&gt;:  Stuur 'n IRC-tipe aksie na 'n vriend of geselsie."
 
-#: ../finch/gntconv.c:1126 ../pidgin/gtkconv.c:7566
+#: ../finch/gntconv.c:1148 ../pidgin/gtkconv.c:7761
 msgid ""
 "debug &lt;option&gt;:  Send various debug information to the current "
 "conversation."
@@ -965,43 +986,48 @@
 "debug &lt;option&gt;:  Stuur 'n verskeidenheid ontfout-inligting na die "
 "huidige gesprek."
 
-#: ../finch/gntconv.c:1129 ../pidgin/gtkconv.c:7569
+#: ../finch/gntconv.c:1151 ../pidgin/gtkconv.c:7764
 msgid "clear: Clears the conversation scrollback."
 msgstr "clear: Maak die gesprekvenster skoon."
 
-#: ../finch/gntconv.c:1132 ../pidgin/gtkconv.c:7575
+#: ../finch/gntconv.c:1154 ../pidgin/gtkconv.c:7770
 msgid "help &lt;command&gt;:  Help on a specific command."
-msgstr "help &lt;opdrag&gt;:  Hulp oor 'n spesifieke opdrag."
-
-#: ../finch/gntconv.c:1135
+msgstr "help &lt;bevel&gt;:  Hulp oor 'n spesifieke bevel."
+
+#: ../finch/gntconv.c:1157
 msgid "users:  Show the list of users in the chat."
 msgstr "gebruikers:  Wys die lys gebruikers in hierdie geselsie."
 
-#: ../finch/gntconv.c:1140
+#: ../finch/gntconv.c:1162
 msgid "plugins: Show the plugins window."
 msgstr "plugins: Wys die inpropvenster."
 
-#: ../finch/gntconv.c:1143
+#: ../finch/gntconv.c:1165
 msgid "buddylist: Show the buddylist."
 msgstr "buddylist: Wys die vriendelys."
 
-#: ../finch/gntconv.c:1146
+#: ../finch/gntconv.c:1168
 msgid "accounts: Show the accounts window."
 msgstr "accounts: Wys die rekeningvenster."
 
-#: ../finch/gntconv.c:1149
+#: ../finch/gntconv.c:1171
 msgid "debugwin: Show the debug window."
 msgstr "debugwin: Wys die ontfoutvenster."
 
-#: ../finch/gntconv.c:1152
+#: ../finch/gntconv.c:1174
 msgid "prefs: Show the preference window."
 msgstr "prefs: Wys die voorkeurevenster."
 
-#: ../finch/gntconv.c:1155
+#: ../finch/gntconv.c:1177
 msgid "statuses: Show the savedstatuses window."
 msgstr "statuses: Wys die venster met gestoorde statusse."
 
-#: ../finch/gntdebug.c:235 ../finch/gntui.c:86 ../pidgin/gtkdebug.c:695
+#: ../finch/gntdebug.c:231 ../pidgin/gtkconv.c:989 ../pidgin/gtkconv.c:2663
+#: ../pidgin/gtkdebug.c:220 ../pidgin/gtkft.c:543
+msgid "Unable to open file."
+msgstr "Kan nie lêer open nie."
+
+#: ../finch/gntdebug.c:271 ../finch/gntui.c:86 ../pidgin/gtkdebug.c:700
 msgid "Debug Window"
 msgstr "Ontfoutvenster"
 
@@ -1009,15 +1035,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:256 ../pidgin/gtkdebug.c:754
+#: ../finch/gntdebug.c:292 ../pidgin/gtkdebug.c:759
 msgid "Clear"
 msgstr "Maak skoon"
 
-#: ../finch/gntdebug.c:262
-msgid "Filter: "
-msgstr "Filter: "
-
-#: ../finch/gntdebug.c:266 ../pidgin/gtkdebug.c:763
+#: ../finch/gntdebug.c:303
+msgid "Filter:"
+msgstr "Filter:"
+
+#: ../finch/gntdebug.c:309 ../pidgin/gtkdebug.c:768
 msgid "Pause"
 msgstr "Pouseer"
 
@@ -1054,25 +1080,26 @@
 
 #. XXX: Use of ggp_str_to_uin() is an ugly hack!
 #: ../finch/gntft.c:201 ../finch/gntstatus.c:547 ../finch/gntstatus.c:576
-#: ../libpurple/protocols/bonjour/bonjour.c:344
-#: ../libpurple/protocols/gg/gg.c:1039 ../libpurple/protocols/gg/gg.c:1576
-#: ../libpurple/protocols/gg/gg.c:1584
+#: ../libpurple/protocols/bonjour/bonjour.c:358
+#: ../libpurple/protocols/gg/gg.c:1040 ../libpurple/protocols/gg/gg.c:1577
+#: ../libpurple/protocols/gg/gg.c:1585
 #: ../libpurple/protocols/jabber/buddy.c:778
 #: ../libpurple/protocols/jabber/buddy.c:782
 #: ../libpurple/protocols/jabber/buddy.c:941
-#: ../libpurple/protocols/jabber/jabber.c:1500
-#: ../libpurple/protocols/msn/msn.c:543
-#: ../libpurple/protocols/novell/novell.c:2835
+#: ../libpurple/protocols/jabber/jabber.c:1507
+#: ../libpurple/protocols/msn/msn.c:621 ../libpurple/protocols/msn/msn.c:631
+#: ../libpurple/protocols/msn/msn.c:636 ../libpurple/protocols/msn/msn.c:639
+#: ../libpurple/protocols/novell/novell.c:2840
 #: ../libpurple/protocols/oscar/oscar.c:821
 #: ../libpurple/protocols/oscar/oscar.c:826
 #: ../libpurple/protocols/oscar/oscar.c:828
-#: ../libpurple/protocols/oscar/oscar.c:2700
-#: ../libpurple/protocols/oscar/oscar.c:3780
+#: ../libpurple/protocols/oscar/oscar.c:2715
+#: ../libpurple/protocols/oscar/oscar.c:3795
 #: ../libpurple/protocols/sametime/sametime.c:3263
 #: ../libpurple/protocols/sametime/sametime.c:4150
-#: ../libpurple/protocols/yahoo/yahoo.c:3248 ../pidgin/gtkblist.c:3104
-#: ../pidgin/gtkblist.c:3118 ../pidgin/gtkblist.c:3120
-#: ../pidgin/gtksavedstatuses.c:999 ../pidgin/gtksavedstatuses.c:1144
+#: ../libpurple/protocols/yahoo/yahoo.c:3250 ../pidgin/gtkblist.c:3322
+#: ../pidgin/gtkblist.c:3336 ../pidgin/gtkblist.c:3338
+#: ../pidgin/gtksavedstatuses.c:1005 ../pidgin/gtksavedstatuses.c:1150
 msgid "Status"
 msgstr "Status"
 
@@ -1108,14 +1135,14 @@
 #: ../finch/gntft.c:431
 #, c-format
 msgid "The file was saved as %s."
-msgstr ""
+msgstr "Die lêer is gestoor as %s."
 
 #: ../finch/gntft.c:432 ../finch/gntft.c:433 ../pidgin/gtkft.c:163
 #: ../pidgin/gtkft.c:1116
 msgid "Finished"
 msgstr "Afgehandel"
 
-#: ../finch/gntft.c:437 ../libpurple/protocols/msn/session.c:347
+#: ../finch/gntft.c:437 ../libpurple/protocols/msn/session.c:396
 msgid "Transferring"
 msgstr "Dra tans oor"
 
@@ -1123,72 +1150,68 @@
 msgid "Emails"
 msgstr "E-posse"
 
-#: ../finch/gntnotify.c:171 ../finch/gntnotify.c:225
+#: ../finch/gntnotify.c:171 ../finch/gntnotify.c:226
 msgid "You have mail!"
 msgstr "Daar is pos!"
 
-#: ../finch/gntnotify.c:174 ../pidgin/gtknotify.c:513
+#: ../finch/gntnotify.c:174 ../pidgin/gtknotify.c:519
 msgid "Sender"
 msgstr "Sender"
 
-#: ../finch/gntnotify.c:174 ../pidgin/gtknotify.c:520
+#: ../finch/gntnotify.c:174 ../pidgin/gtknotify.c:526
 msgid "Subject"
 msgstr "Onderwerp"
 
-#: ../finch/gntnotify.c:201
+#: ../finch/gntnotify.c:202
 #, c-format
 msgid "%s (%s) has %d new message."
 msgid_plural "%s (%s) has %d new messages."
 msgstr[0] "%s (%s) het %d nuwe boodskap."
 msgstr[1] "%s (%s) het %d nuwe boodskappe."
 
-#: ../finch/gntnotify.c:225 ../pidgin/gtknotify.c:341
+#: ../finch/gntnotify.c:226 ../pidgin/gtknotify.c:342
 msgid "New Mail"
 msgstr "Nuwe pos"
 
-#: ../finch/gntnotify.c:290 ../pidgin/gtknotify.c:940
+#: ../finch/gntnotify.c:291 ../pidgin/gtknotify.c:949
 #, c-format
 msgid "Info for %s"
 msgstr "Inligting vir %s"
 
-#: ../finch/gntnotify.c:291 ../libpurple/protocols/toc/toc.c:476
-#: ../pidgin/gtknotify.c:941
+#: ../finch/gntnotify.c:292 ../libpurple/protocols/toc/toc.c:476
+#: ../pidgin/gtknotify.c:950
 msgid "Buddy Information"
 msgstr "Vriendinligting"
 
-#: ../finch/gntnotify.c:377 ../libpurple/protocols/qq/group_join.c:367
+#: ../finch/gntnotify.c:382 ../libpurple/protocols/qq/group_join.c:367
 msgid "Continue"
 msgstr "Gaan voort"
 
-#: ../finch/gntnotify.c:386 ../pidgin/gtkconv.c:1596
+#: ../finch/gntnotify.c:391 ../pidgin/gtkconv.c:1650
 msgid "IM"
-msgstr "Kitsklets"
-
-#: ../finch/gntnotify.c:389
-msgid "Join"
-msgstr "Sluit aan"
-
-#: ../finch/gntnotify.c:392 ../libpurple/protocols/sametime/sametime.c:3473
+msgstr "Kitsboodskap"
+
+#: ../finch/gntnotify.c:397 ../libpurple/protocols/sametime/sametime.c:3473
 msgid "Invite"
 msgstr "Nooi uit"
 
-#: ../finch/gntnotify.c:395
+#: ../finch/gntnotify.c:400
 msgid "(none)"
 msgstr "(geen)"
 
-#: ../finch/gntplugin.c:75 ../finch/gntplugin.c:84
+#: ../finch/gntplugin.c:77 ../finch/gntplugin.c:86
 msgid "ERROR"
 msgstr "FOUT"
 
-#: ../finch/gntplugin.c:75
+#: ../finch/gntplugin.c:77
 msgid "loading plugin failed"
 msgstr "laai van inprop het misluk"
 
-#: ../finch/gntplugin.c:84
+#: ../finch/gntplugin.c:86
 msgid "unloading plugin failed"
 msgstr "ontlaai van inprop het misluk"
 
-#: ../finch/gntplugin.c:129
+#: ../finch/gntplugin.c:132
 #, c-format
 msgid ""
 "Name: %s\n"
@@ -1205,19 +1228,42 @@
 "Webwerf: %s\n"
 "Lêernaam: %s\n"
 
-#: ../finch/gntplugin.c:187
+#: ../finch/gntplugin.c:190
 msgid "Plugin need to be loaded before you can configure it."
 msgstr "Inprop moet gelaai word voordat dit opgestel kan word."
 
-#: ../finch/gntplugin.c:235
+#: ../finch/gntplugin.c:238
 msgid "No configuration options for this plugin."
-msgstr "Geen opstelkeuses vir hierdie inprop nie."
+msgstr "Geen opstelopsies vir hierdie inprop nie."
+
+#: ../finch/gntplugin.c:259
+msgid "Error loading plugin"
+msgstr "Kon nie die inprop laai nie"
 
 #: ../finch/gntplugin.c:260
+msgid "The selected file is not a valid plugin."
+msgstr "Die gekose lêer is nie 'n geldige inprop nie."
+
+#: ../finch/gntplugin.c:261
+msgid ""
+"Please open the debug window and try again to see the exact error message."
+msgstr ""
+"Maak gerus die ontfoutvenster oop en probeer weer om die presiese "
+"foutboodskap te sien."
+
+#: ../finch/gntplugin.c:324
+msgid "Select plugin to install"
+msgstr "Kies inprop om te installeer"
+
+#: ../finch/gntplugin.c:350
 msgid "You can (un)load plugins from the following list."
 msgstr "U kan inproppe (ont)laai vanaf die volgende lys."
 
-#: ../finch/gntplugin.c:315
+#: ../finch/gntplugin.c:401
+msgid "Install Plugin..."
+msgstr "Installeer inprop..."
+
+#: ../finch/gntplugin.c:411
 msgid "Configure Plugin"
 msgstr "Stel inprop op"
 
@@ -1226,202 +1272,199 @@
 #. (that should have been "effect," right?)
 #. Back to instant-apply! I win!  BU-HAHAHA!
 #. Create the window
-#: ../finch/gntplugin.c:371 ../finch/gntplugin.c:378 ../finch/gntprefs.c:264
-#: ../finch/gntui.c:90 ../pidgin/gtkdocklet.c:524 ../pidgin/gtkprefs.c:2067
+#: ../finch/gntplugin.c:467 ../finch/gntplugin.c:474 ../finch/gntprefs.c:264
+#: ../finch/gntui.c:90 ../pidgin/gtkdocklet.c:717 ../pidgin/gtkprefs.c:2169
 msgid "Preferences"
 msgstr "Voorkeure"
 
-#: ../finch/gntpounce.c:183 ../pidgin/gtkpounce.c:256
+#: ../finch/gntpounce.c:194 ../pidgin/gtkpounce.c:256
 msgid "Please enter a buddy to pounce."
-msgstr "Gee asb. 'n vriend om dop te hou."
-
-#: ../finch/gntpounce.c:328 ../pidgin/gtkpounce.c:517
+msgstr "Tik gerus 'n vriend om dop te hou."
+
+#: ../finch/gntpounce.c:339 ../pidgin/gtkpounce.c:531
 msgid "New Buddy Pounce"
 msgstr "Nuwe vriendwag"
 
-#: ../finch/gntpounce.c:328 ../pidgin/gtkpounce.c:517
+#: ../finch/gntpounce.c:339 ../pidgin/gtkpounce.c:531
 msgid "Edit Buddy Pounce"
 msgstr "Wysig vriendwag"
 
-#: ../finch/gntpounce.c:333
+#: ../finch/gntpounce.c:344
 msgid "Pounce Who"
 msgstr "Hou wie dop"
 
 #. Account:
-#: ../finch/gntpounce.c:336 ../finch/gntstatus.c:456
+#: ../finch/gntpounce.c:347 ../finch/gntstatus.c:456
 msgid "Account:"
 msgstr "Rekening:"
 
-#: ../finch/gntpounce.c:358
+#: ../finch/gntpounce.c:369
 msgid "Buddy name:"
 msgstr "Vriendnaam:"
 
 #. Create the "Pounce When Buddy..." frame.
-#: ../finch/gntpounce.c:374 ../pidgin/gtkpounce.c:585
+#: ../finch/gntpounce.c:387 ../pidgin/gtkpounce.c:600
 msgid "Pounce When Buddy..."
 msgstr "Reageer wanneer vriend..."
 
-#: ../finch/gntpounce.c:376
+#: ../finch/gntpounce.c:389
 msgid "Signs on"
 msgstr "Aanmeld"
 
-#: ../finch/gntpounce.c:377
+#: ../finch/gntpounce.c:390
 msgid "Signs off"
 msgstr "Afmeld"
 
-#: ../finch/gntpounce.c:378
+#: ../finch/gntpounce.c:391
 msgid "Goes away"
 msgstr "Weggaan"
 
-#: ../finch/gntpounce.c:379
+#: ../finch/gntpounce.c:392
 msgid "Returns from away"
 msgstr "Terugkeer"
 
-#: ../finch/gntpounce.c:380
+#: ../finch/gntpounce.c:393
 msgid "Becomes idle"
 msgstr "Ledig raak"
 
-#: ../finch/gntpounce.c:381
+#: ../finch/gntpounce.c:394
 msgid "Is no longer idle"
 msgstr "Nie meer ledig is nie"
 
-#: ../finch/gntpounce.c:382
+#: ../finch/gntpounce.c:395
 msgid "Starts typing"
 msgstr "Begin tik"
 
-#: ../finch/gntpounce.c:383
+#: ../finch/gntpounce.c:396
 msgid "Pauses while typing"
 msgstr "Wag tydens tik"
 
-#: ../finch/gntpounce.c:384
+#: ../finch/gntpounce.c:397
 msgid "Stops typing"
 msgstr "Ophou tik"
 
-#: ../finch/gntpounce.c:385
+#: ../finch/gntpounce.c:398
 msgid "Sends a message"
 msgstr "'n Boodskap stuur"
 
 #. Create the "Action" frame.
-#: ../finch/gntpounce.c:414 ../pidgin/gtkpounce.c:646
+#: ../finch/gntpounce.c:427 ../pidgin/gtkpounce.c:661
 msgid "Action"
 msgstr "Aksie"
 
-#: ../finch/gntpounce.c:416
+#: ../finch/gntpounce.c:429
 msgid "Open an IM window"
-msgstr "Open 'n kletsvenster"
-
-#: ../finch/gntpounce.c:417
+msgstr "Open 'n kletsboodskapvenster"
+
+#: ../finch/gntpounce.c:430
 msgid "Pop up a notification"
-msgstr "Wys 'n boodskapvenster"
-
-#: ../finch/gntpounce.c:418
+msgstr "Wys 'n kennisgewing"
+
+#: ../finch/gntpounce.c:431
 msgid "Send a message"
 msgstr "Stuur 'n boodskap"
 
-#: ../finch/gntpounce.c:419
+#: ../finch/gntpounce.c:432
 msgid "Execute a command"
-msgstr "Voer 'n opdrag uit"
-
-#: ../finch/gntpounce.c:420
+msgstr "Voer 'n bevel uit"
+
+#: ../finch/gntpounce.c:433
 msgid "Play a sound"
 msgstr "Speel 'n klank"
 
-#: ../finch/gntpounce.c:448
+#: ../finch/gntpounce.c:461
 msgid "Pounce only when my status is not available"
 msgstr "Reageer net wanneer my status niebeskikbaar is"
 
-#: ../finch/gntpounce.c:450 ../pidgin/gtkpounce.c:1281
+#: ../finch/gntpounce.c:463 ../pidgin/gtkpounce.c:1301
 msgid "Recurring"
 msgstr "Herhalend"
 
-#: ../finch/gntpounce.c:618
-#, fuzzy
+#: ../finch/gntpounce.c:631
 msgid "Cannot create pounce"
-msgstr "Kan nie bynaam verander nie"
-
-#: ../finch/gntpounce.c:619
-#, fuzzy
+msgstr "Kan nie vriendwag skep nie"
+
+#: ../finch/gntpounce.c:632
 msgid "You do not have any accounts."
-msgstr "U moet 'n rekening kies."
-
-#: ../finch/gntpounce.c:620
+msgstr "U het nie enige rekeninge nie."
+
+#: ../finch/gntpounce.c:633
 msgid "You must create an account first before you can create a pounce."
-msgstr ""
-
-#: ../finch/gntpounce.c:662 ../pidgin/gtkpounce.c:1096
+msgstr "U moet 'n rekening skep voor u 'n vriendwag kan skep."
+
+#: ../finch/gntpounce.c:675 ../pidgin/gtkpounce.c:1116
 #, c-format
 msgid "Are you sure you want to delete the pounce on %s for %s?"
 msgstr "Wil u definitief die vriendwag op %s vir %s uitvee?"
 
-#: ../finch/gntpounce.c:696 ../finch/gntui.c:84 ../pidgin/gtkpounce.c:1325
+#: ../finch/gntpounce.c:709 ../finch/gntui.c:84 ../pidgin/gtkpounce.c:1352
 msgid "Buddy Pounces"
 msgstr "Vriendwagte"
 
-#: ../finch/gntpounce.c:810 ../pidgin/gtkpounce.c:1452
+#: ../finch/gntpounce.c:823 ../pidgin/gtkpounce.c:1480
 #, c-format
 msgid "%s has started typing to you (%s)"
 msgstr "%s het begin om aan u te tik (%s)"
 
-#: ../finch/gntpounce.c:812 ../pidgin/gtkpounce.c:1454
+#: ../finch/gntpounce.c:825 ../pidgin/gtkpounce.c:1482
 #, c-format
 msgid "%s has paused while typing to you (%s)"
 msgstr "%s het gewag terwyl hy/sy besig was om aan u te tik (%s)"
 
-#: ../finch/gntpounce.c:814 ../pidgin/gtkpounce.c:1456
+#: ../finch/gntpounce.c:827 ../pidgin/gtkpounce.c:1484
 #, c-format
 msgid "%s has signed on (%s)"
 msgstr "%s het aangemeld op (%s)"
 
-#: ../finch/gntpounce.c:816 ../pidgin/gtkpounce.c:1458
+#: ../finch/gntpounce.c:829 ../pidgin/gtkpounce.c:1486
 #, c-format
 msgid "%s has returned from being idle (%s)"
 msgstr "%s het teruggekeer na ledigheid (%s)"
 
-#: ../finch/gntpounce.c:818 ../pidgin/gtkpounce.c:1460
+#: ../finch/gntpounce.c:831 ../pidgin/gtkpounce.c:1488
 #, c-format
 msgid "%s has returned from being away (%s)"
 msgstr "%s het teruggekeer (%s)"
 
-#: ../finch/gntpounce.c:820 ../pidgin/gtkpounce.c:1462
+#: ../finch/gntpounce.c:833 ../pidgin/gtkpounce.c:1490
 #, c-format
 msgid "%s has stopped typing to you (%s)"
 msgstr "%s het opgehou om aan u te tik (%s)"
 
-#: ../finch/gntpounce.c:822 ../pidgin/gtkpounce.c:1464
+#: ../finch/gntpounce.c:835 ../pidgin/gtkpounce.c:1492
 #, c-format
 msgid "%s has signed off (%s)"
 msgstr "%s het afgemeld (%s)"
 
-#: ../finch/gntpounce.c:824 ../pidgin/gtkpounce.c:1466
+#: ../finch/gntpounce.c:837 ../pidgin/gtkpounce.c:1494
 #, c-format
 msgid "%s has become idle (%s)"
 msgstr "%s het ledig geword (%s)"
 
-#: ../finch/gntpounce.c:826 ../pidgin/gtkpounce.c:1468
+#: ../finch/gntpounce.c:839 ../pidgin/gtkpounce.c:1496
 #, c-format
 msgid "%s has gone away. (%s)"
 msgstr "%s het weggegaan. (%s)"
 
-#: ../finch/gntpounce.c:828 ../pidgin/gtkpounce.c:1470
+#: ../finch/gntpounce.c:841 ../pidgin/gtkpounce.c:1498
 #, c-format
 msgid "%s has sent you a message. (%s)"
 msgstr "%s het u 'n boodskap gestuur. (%s)"
 
-#: ../finch/gntpounce.c:829 ../pidgin/gtkpounce.c:1471
-#, c-format
+#: ../finch/gntpounce.c:842 ../pidgin/gtkpounce.c:1499
 msgid "Unknown pounce event. Please report this!"
-msgstr "Onbekende vriendwag-gebeurtenis. Rapporteer hierdie, asb!"
+msgstr "Onbekende vriendwag-gebeurtenis. Rapporteer dit, asseblief!"
 
 #: ../finch/gntprefs.c:92
 msgid "Based on keyboard use"
 msgstr "Gebaseer op gebruik van sleutelbord"
 
-#: ../finch/gntprefs.c:94 ../pidgin/gtkprefs.c:1930
+#: ../finch/gntprefs.c:94 ../pidgin/gtkprefs.c:2031
 msgid "From last sent message"
 msgstr "Sedert laaste gestuurde boodskap"
 
-#: ../finch/gntprefs.c:96 ../pidgin/gtkprefs.c:898 ../pidgin/gtkprefs.c:907
-#: ../pidgin/gtkprefs.c:1929 ../pidgin/gtkprefs.c:1943
+#: ../finch/gntprefs.c:96 ../pidgin/gtkprefs.c:900 ../pidgin/gtkprefs.c:908
+#: ../pidgin/gtkprefs.c:2030 ../pidgin/gtkprefs.c:2044
 #: ../pidgin/plugins/win32/winprefs/winprefs.c:333
 msgid "Never"
 msgstr "Nooit"
@@ -1432,7 +1475,7 @@
 
 #: ../finch/gntprefs.c:185
 msgid "Show Offline Buddies"
-msgstr "Wys aflynvriende"
+msgstr "Wys vanlynvriende"
 
 #: ../finch/gntprefs.c:192
 msgid "Notify buddies when you are typing"
@@ -1471,79 +1514,79 @@
 msgstr "Verander status na:"
 
 #. Conversations
-#: ../finch/gntprefs.c:259 ../pidgin/gtkprefs.c:993 ../pidgin/gtkprefs.c:2033
+#: ../finch/gntprefs.c:259 ../pidgin/gtkprefs.c:995 ../pidgin/gtkprefs.c:2135
 #: ../pidgin/plugins/win32/winprefs/winprefs.c:340
 msgid "Conversations"
 msgstr "Gesprekke"
 
-#: ../finch/gntprefs.c:260 ../pidgin/gtkprefs.c:1467 ../pidgin/gtkprefs.c:2044
+#: ../finch/gntprefs.c:260 ../pidgin/gtkprefs.c:1563 ../pidgin/gtkprefs.c:2146
 msgid "Logging"
 msgstr "Boekstawing"
 
-#: ../finch/gntrequest.c:583
+#: ../finch/gntrequest.c:585
 msgid "Not implemented yet."
 msgstr "Nog nie geïmplementeer nie."
 
-#: ../finch/gntrequest.c:659 ../pidgin/gtkrequest.c:1555
-#: ../pidgin/gtkrequest.c:1601
+#: ../finch/gntrequest.c:661 ../pidgin/gtkrequest.c:1699
+#: ../pidgin/gtkrequest.c:1745
 msgid "Save File..."
 msgstr "Stoor lêer..."
 
-#: ../finch/gntrequest.c:659 ../pidgin/gtkrequest.c:1556
-#: ../pidgin/gtkrequest.c:1602
+#: ../finch/gntrequest.c:661 ../pidgin/gtkrequest.c:1700
+#: ../pidgin/gtkrequest.c:1746
 msgid "Open File..."
 msgstr "Open lêer..."
 
-#: ../finch/gntsound.c:97 ../pidgin/gtksound.c:64
+#: ../finch/gntsound.c:97 ../pidgin/gtksound.c:62
 msgid "Buddy logs in"
 msgstr "Vriend meld aan"
 
-#: ../finch/gntsound.c:98 ../pidgin/gtksound.c:65
+#: ../finch/gntsound.c:98 ../pidgin/gtksound.c:63
 msgid "Buddy logs out"
 msgstr "Vriend meld af"
 
-#: ../finch/gntsound.c:99 ../pidgin/gtksound.c:66
+#: ../finch/gntsound.c:99 ../pidgin/gtksound.c:64
 msgid "Message received"
 msgstr "Boodskap ontvang"
 
-#: ../finch/gntsound.c:100 ../pidgin/gtksound.c:67
+#: ../finch/gntsound.c:100 ../pidgin/gtksound.c:65
 msgid "Message received begins conversation"
 msgstr "Boodskapontvangs begin gesprek"
 
-#: ../finch/gntsound.c:101 ../pidgin/gtksound.c:68
+#: ../finch/gntsound.c:101 ../pidgin/gtksound.c:66
 msgid "Message sent"
 msgstr "Boodskap gestuur"
 
-#: ../finch/gntsound.c:102 ../pidgin/gtksound.c:69
+#: ../finch/gntsound.c:102 ../pidgin/gtksound.c:67
 msgid "Person enters chat"
 msgstr "Persoon kom geselsie binne"
 
-#: ../finch/gntsound.c:103 ../pidgin/gtksound.c:70
+#: ../finch/gntsound.c:103 ../pidgin/gtksound.c:68
 msgid "Person leaves chat"
 msgstr "Persoon verlaat geselsie"
 
-#: ../finch/gntsound.c:104 ../pidgin/gtksound.c:71
+#: ../finch/gntsound.c:104 ../pidgin/gtksound.c:69
 msgid "You talk in chat"
 msgstr "U praat in geselsie"
 
-#: ../finch/gntsound.c:105 ../pidgin/gtksound.c:72
+#: ../finch/gntsound.c:105 ../pidgin/gtksound.c:70
 msgid "Others talk in chat"
 msgstr "Ander praat in geselsie"
 
-#: ../finch/gntsound.c:107 ../pidgin/gtksound.c:75
+#: ../finch/gntsound.c:107 ../pidgin/gtksound.c:73
 msgid "Someone says your screen name in chat"
 msgstr "Iemand sê u skermnaam in 'n geselsie"
 
-#: ../finch/gntsound.c:361 ../pidgin/gtksound.c:311
+#: ../finch/gntsound.c:361 ../pidgin/gtksound.c:306
 msgid "GStreamer Failure"
 msgstr "GStreamer-mislukking"
 
-#: ../finch/gntsound.c:362 ../pidgin/gtksound.c:312
+#: ../finch/gntsound.c:362 ../pidgin/gtksound.c:307
 msgid "GStreamer failed to initialize."
 msgstr "Inisialiseer van GStreamer het misluk."
 
-#: ../finch/gntsound.c:716 ../finch/gntsound.c:802 ../pidgin/gtkprefs.c:1587
-#: ../pidgin/gtkprefs.c:1676 ../pidgin/gtkprefs.c:1872
+#: ../finch/gntsound.c:716 ../finch/gntsound.c:802 ../pidgin/gtkprefs.c:1687
+#: ../pidgin/gtkprefs.c:1776 ../pidgin/gtkprefs.c:1972
 msgid "(default)"
 msgstr "(verstek)"
 
@@ -1559,7 +1602,7 @@
 msgid "Profiles"
 msgstr "Profiele"
 
-#: ../finch/gntsound.c:954 ../pidgin/gtkprefs.c:1717
+#: ../finch/gntsound.c:954 ../pidgin/gtkprefs.c:1817
 msgid "Automatic"
 msgstr "Outomaties"
 
@@ -1567,15 +1610,15 @@
 msgid "Console Beep"
 msgstr "Konsolebiep"
 
-#: ../finch/gntsound.c:958 ../pidgin/gtkprefs.c:1721
+#: ../finch/gntsound.c:958 ../pidgin/gtkprefs.c:1821
 msgid "Command"
-msgstr "Opdrag"
+msgstr "Bevel"
 
 #: ../finch/gntsound.c:959
 msgid "No Sound"
 msgstr "Geen klank nie"
 
-#: ../finch/gntsound.c:961 ../pidgin/gtkprefs.c:1712
+#: ../finch/gntsound.c:961 ../pidgin/gtkprefs.c:1812
 msgid "Sound Method"
 msgstr "Klankmetode"
 
@@ -1589,30 +1632,30 @@
 "Sound Command\n"
 "(%s for filename)"
 msgstr ""
-"Klankopdrag\n"
+"Klankbevel\n"
 "(%s vir lêernaam)"
 
 #. Sound options
-#: ../finch/gntsound.c:981 ../pidgin/gtkprefs.c:1756
+#: ../finch/gntsound.c:981 ../pidgin/gtkprefs.c:1856
 msgid "Sound Options"
-msgstr "Klankkeuses"
+msgstr "Klankopsies"
 
 #: ../finch/gntsound.c:982
 msgid "Sounds when conversation has focus"
 msgstr "Klanke terwyl gesprek in fokus is"
 
-#: ../finch/gntsound.c:990 ../pidgin/gtkprefs.c:897 ../pidgin/gtkprefs.c:909
-#: ../pidgin/gtkprefs.c:1763 ../pidgin/plugins/timestamp_format.c:42
+#: ../finch/gntsound.c:990 ../pidgin/gtkprefs.c:898 ../pidgin/gtkprefs.c:910
+#: ../pidgin/gtkprefs.c:1863 ../pidgin/plugins/timestamp_format.c:42
 #: ../pidgin/plugins/timestamp_format.c:51
 #: ../pidgin/plugins/win32/winprefs/winprefs.c:334
 msgid "Always"
 msgstr "Altyd"
 
-#: ../finch/gntsound.c:991 ../pidgin/gtkprefs.c:1761
+#: ../finch/gntsound.c:991 ../pidgin/gtkprefs.c:1861
 msgid "Only when available"
 msgstr "Net indien beskikbaar"
 
-#: ../finch/gntsound.c:992 ../pidgin/gtkprefs.c:1762
+#: ../finch/gntsound.c:992 ../pidgin/gtkprefs.c:1862
 msgid "Only when not available"
 msgstr "Net indien nie beskikbaar nie"
 
@@ -1621,11 +1664,11 @@
 msgstr "Volume (0-100):"
 
 #. Sound events
-#: ../finch/gntsound.c:1018 ../pidgin/gtkprefs.c:1798
+#: ../finch/gntsound.c:1018 ../pidgin/gtkprefs.c:1898
 msgid "Sound Events"
 msgstr "Klankgebeure"
 
-#: ../finch/gntsound.c:1020 ../pidgin/gtkprefs.c:1857
+#: ../finch/gntsound.c:1020 ../pidgin/gtkprefs.c:1957
 msgid "Event"
 msgstr "Gebeurtenis"
 
@@ -1633,15 +1676,15 @@
 msgid "File"
 msgstr "Lêer"
 
-#: ../finch/gntsound.c:1039 ../pidgin/gtkprefs.c:1876
+#: ../finch/gntsound.c:1039 ../pidgin/gtkprefs.c:1976
 msgid "Test"
 msgstr "Toets"
 
-#: ../finch/gntsound.c:1042 ../pidgin/gtkprefs.c:1880
+#: ../finch/gntsound.c:1042 ../pidgin/gtkprefs.c:1980
 msgid "Reset"
 msgstr "Terugstel"
 
-#: ../finch/gntsound.c:1045 ../pidgin/gtkprefs.c:1884
+#: ../finch/gntsound.c:1045 ../pidgin/gtkprefs.c:1984
 msgid "Choose..."
 msgstr "Kies..."
 
@@ -1661,7 +1704,8 @@
 #: ../finch/gntstatus.c:183 ../finch/gntstatus.c:539
 #: ../libpurple/protocols/jabber/buddy.c:298
 #: ../libpurple/protocols/jabber/buddy.c:1359
-#: ../libpurple/protocols/novell/novell.c:1484
+#: ../libpurple/protocols/msn/msn.c:725
+#: ../libpurple/protocols/novell/novell.c:1486
 #: ../pidgin/gtksavedstatuses.c:500
 msgid "Title"
 msgstr "Titel"
@@ -1679,41 +1723,44 @@
 #. not independent
 #. Attributes - each status can have a message.
 #: ../finch/gntstatus.c:183 ../finch/gntstatus.c:564 ../finch/gntstatus.c:576
-#: ../libpurple/protocols/bonjour/bonjour.c:256
-#: ../libpurple/protocols/bonjour/bonjour.c:263
-#: ../libpurple/protocols/bonjour/bonjour.c:346
-#: ../libpurple/protocols/gg/gg.c:1077 ../libpurple/protocols/gg/gg.c:1579
-#: ../libpurple/protocols/gg/gg.c:1597 ../libpurple/protocols/gg/gg.c:1607
-#: ../libpurple/protocols/gg/gg.c:1613 ../libpurple/protocols/gg/gg.c:1622
-#: ../libpurple/protocols/gg/gg.c:1627 ../libpurple/protocols/irc/irc.c:234
-#: ../libpurple/protocols/jabber/jabber.c:1532
-#: ../libpurple/protocols/jabber/jabber.c:1555
-#: ../libpurple/protocols/jabber/jabber.c:1578
-#: ../libpurple/protocols/jabber/jabber.c:1601
-#: ../libpurple/protocols/jabber/jabber.c:1624
-#: ../libpurple/protocols/jabber/jabber.c:1649
+#: ../libpurple/protocols/bonjour/bonjour.c:270
+#: ../libpurple/protocols/bonjour/bonjour.c:277
+#: ../libpurple/protocols/bonjour/bonjour.c:360
+#: ../libpurple/protocols/gg/gg.c:1078 ../libpurple/protocols/gg/gg.c:1580
+#: ../libpurple/protocols/gg/gg.c:1598 ../libpurple/protocols/gg/gg.c:1608
+#: ../libpurple/protocols/gg/gg.c:1614 ../libpurple/protocols/gg/gg.c:1623
+#: ../libpurple/protocols/gg/gg.c:1628 ../libpurple/protocols/irc/irc.c:234
+#: ../libpurple/protocols/jabber/jabber.c:1539
+#: ../libpurple/protocols/jabber/jabber.c:1553
+#: ../libpurple/protocols/jabber/jabber.c:1567
+#: ../libpurple/protocols/jabber/jabber.c:1581
+#: ../libpurple/protocols/jabber/jabber.c:1595
+#: ../libpurple/protocols/jabber/jabber.c:1611
+#: ../libpurple/protocols/msn/msn.c:677 ../libpurple/protocols/msn/msn.c:683
+#: ../libpurple/protocols/msn/msn.c:689 ../libpurple/protocols/msn/msn.c:695
+#: ../libpurple/protocols/msn/msn.c:700 ../libpurple/protocols/msn/msn.c:705
 #: ../libpurple/protocols/myspace/myspace.c:148
-#: ../libpurple/protocols/novell/novell.c:2838
-#: ../libpurple/protocols/novell/novell.c:2941
-#: ../libpurple/protocols/novell/novell.c:2947
-#: ../libpurple/protocols/novell/novell.c:2953
-#: ../libpurple/protocols/oscar/oscar.c:5554
-#: ../libpurple/protocols/oscar/oscar.c:5772
-#: ../libpurple/protocols/oscar/oscar.c:5786
-#: ../libpurple/protocols/oscar/oscar.c:5802
-#: ../libpurple/protocols/oscar/oscar.c:5809
-#: ../libpurple/protocols/oscar/oscar.c:5816
+#: ../libpurple/protocols/novell/novell.c:2843
+#: ../libpurple/protocols/novell/novell.c:2946
+#: ../libpurple/protocols/novell/novell.c:2952
+#: ../libpurple/protocols/novell/novell.c:2958
+#: ../libpurple/protocols/oscar/oscar.c:5609
+#: ../libpurple/protocols/oscar/oscar.c:5827
+#: ../libpurple/protocols/oscar/oscar.c:5841
+#: ../libpurple/protocols/oscar/oscar.c:5857
+#: ../libpurple/protocols/oscar/oscar.c:5864
+#: ../libpurple/protocols/oscar/oscar.c:5871
 #: ../libpurple/protocols/sametime/sametime.c:3286
 #: ../libpurple/protocols/sametime/sametime.c:3292
 #: ../libpurple/protocols/sametime/sametime.c:3298
 #: ../libpurple/protocols/sametime/sametime.c:3377
-#: ../libpurple/protocols/silc/buddy.c:1551
-#: ../libpurple/protocols/silc10/buddy.c:1551
-#: ../libpurple/protocols/simple/simple.c:246
-#: ../libpurple/protocols/yahoo/yahoo.c:3751
-#: ../libpurple/protocols/yahoo/yahoo.c:3757
+#: ../libpurple/protocols/silc/buddy.c:1554
+#: ../libpurple/protocols/silc10/buddy.c:1554
+#: ../libpurple/protocols/simple/simple.c:247
+#: ../libpurple/protocols/yahoo/yahoo.c:3753
+#: ../libpurple/protocols/yahoo/yahoo.c:3759
 #: ../libpurple/protocols/zephyr/zephyr.c:2337
-#: ../pidgin/gtksavedstatuses.c:526 ../pidgin/gtksavedstatuses.c:1010
+#: ../pidgin/gtksavedstatuses.c:526 ../pidgin/gtksavedstatuses.c:1016
 msgid "Message"
 msgstr "Boodskap"
 
@@ -1728,7 +1775,7 @@
 
 #: ../finch/gntstatus.c:302
 msgid "Please enter a non-empty title for the status."
-msgstr "Gee asb. 'n nieleë titel vir die status."
+msgstr "Tik gerus 'n nieleë titel vir die status."
 
 #: ../finch/gntstatus.c:310
 msgid "Duplicate title"
@@ -1736,7 +1783,7 @@
 
 #: ../finch/gntstatus.c:311
 msgid "Please enter a different title for the status."
-msgstr "Gee asb. 'n ander titel vir die status."
+msgstr "Tik gerus 'n ander titel vir die status."
 
 #: ../finch/gntstatus.c:452
 msgid "Substatus"
@@ -1765,9 +1812,9 @@
 
 #: ../finch/gntui.c:85
 msgid "Certificates"
-msgstr ""
-
-#: ../finch/gntui.c:89 ../pidgin/gtkprefs.c:2035
+msgstr "Sertifikate"
+
+#: ../finch/gntui.c:89 ../pidgin/gtkprefs.c:2137
 msgid "Sounds"
 msgstr "Klanke"
 
@@ -1777,23 +1824,22 @@
 
 #: ../finch/plugins/gntclipboard.c:115 ../finch/plugins/gntclipboard.c:121
 #: ../finch/plugins/gntclipboard.c:128
-#, fuzzy
 msgid "Error loading the plugin."
-msgstr "Daar was foute met ontlaaiing van die inprop."
+msgstr "Kon nie die inprop laai nie."
 
 #: ../finch/plugins/gntclipboard.c:116
-#, fuzzy
 msgid "Couldn't find X display"
-msgstr "Kon nie lêer open nie"
+msgstr "Kon nie X-vertoon vind nie"
 
 #: ../finch/plugins/gntclipboard.c:122
-#, fuzzy
 msgid "Couldn't find window"
-msgstr "Kon nie lêer open nie"
+msgstr "Kon nie venster vind nie"
 
 #: ../finch/plugins/gntclipboard.c:129
 msgid "This plugin cannot be loaded because it was not built with X11 support."
 msgstr ""
+"Hierdie inprop kan nie gelaai word nie omdat dit nie met X11-steun gebou is "
+"nie."
 
 #: ../finch/plugins/gntclipboard.c:158
 msgid "GntClipboard"
@@ -1872,36 +1918,36 @@
 msgid "Toaster plugin"
 msgstr "Oploer-inprop"
 
-#: ../finch/plugins/gnthistory.c:116 ../pidgin/plugins/history.c:120
+#: ../finch/plugins/gnthistory.c:116 ../pidgin/plugins/history.c:125
 #, c-format
 msgid "<b>Conversation with %s on %s:</b><br>"
 msgstr "<b>Gesprek met %s op %s:</b><br>"
 
-#: ../finch/plugins/gnthistory.c:138 ../pidgin/plugins/history.c:147
+#: ../finch/plugins/gnthistory.c:138 ../pidgin/plugins/history.c:153
 msgid "History Plugin Requires Logging"
 msgstr "Geskiedenis-inprop vereis boekstawing"
 
-#: ../finch/plugins/gnthistory.c:139 ../pidgin/plugins/history.c:148
+#: ../finch/plugins/gnthistory.c:139 ../pidgin/plugins/history.c:154
 msgid ""
 "Logging can be enabled from Tools -> Preferences -> Logging.\n"
 "\n"
 "Enabling logs for instant messages and/or chats will activate history for "
 "the same conversation type(s)."
 msgstr ""
-"Boekstawing kan geaktiveer word by Gereedskap -> Voorkeure -> Boekstawing.\n"
+"Boekstawing kan geaktiveer word by Nutsgoed -> Voorkeure -> Boekstawing.\n"
 "\n"
 "Aktivering van staaflêers vir kitsboodsappe en/of geselsies sal geskiedenis "
 "aktiveer vir die selfde gesprektipe(s)."
 
 #: ../finch/plugins/gnthistory.c:179
 msgid "GntHistory"
-msgstr "Gnthistory"
-
-#: ../finch/plugins/gnthistory.c:181 ../pidgin/plugins/history.c:190
+msgstr "GntHistory"
+
+#: ../finch/plugins/gnthistory.c:181 ../pidgin/plugins/history.c:197
 msgid "Shows recently logged conversations in new conversations."
 msgstr "Wys onlangs geboekstaafde gesprekke in die nuwe gesprek."
 
-#: ../finch/plugins/gnthistory.c:182 ../pidgin/plugins/history.c:191
+#: ../finch/plugins/gnthistory.c:182 ../pidgin/plugins/history.c:198
 msgid ""
 "When a new conversation is opened this plugin will insert the last "
 "conversation into the current conversation."
@@ -1911,7 +1957,7 @@
 
 #: ../finch/plugins/lastlog.c:69
 msgid "Lastlog"
-msgstr "Laastestaaf"
+msgstr "Lastlog"
 
 #. Translator Note: The "backlog" is the conversation buffer/history.
 #: ../finch/plugins/lastlog.c:100
@@ -1926,89 +1972,89 @@
 msgid "Lastlog plugin."
 msgstr "Laastestaaf-inprop."
 
-#: ../libpurple/account.c:791
+#: ../libpurple/account.c:794
 msgid "accounts"
 msgstr "rekeninge"
 
-#: ../libpurple/account.c:958 ../libpurple/protocols/jabber/auth.c:195
+#: ../libpurple/account.c:961 ../libpurple/protocols/jabber/auth.c:195
 msgid "Password is required to sign on."
 msgstr "Wagwoord word vereis om aan te meld."
 
-#: ../libpurple/account.c:992
+#: ../libpurple/account.c:995
 #, c-format
 msgid "Enter password for %s (%s)"
-msgstr "Gee wagwoord vir %s (%s)"
-
-#: ../libpurple/account.c:999
+msgstr "Tik wagwoord vir %s (%s)"
+
+#: ../libpurple/account.c:1002
 msgid "Enter Password"
-msgstr "Gee wagwoord"
-
-#: ../libpurple/account.c:1004
+msgstr "Tik wagwoord"
+
+#: ../libpurple/account.c:1007
 msgid "Save password"
 msgstr "Stoor wagwoord"
 
-#: ../libpurple/account.c:1039 ../libpurple/connection.c:105
+#: ../libpurple/account.c:1042 ../libpurple/connection.c:105
 #: ../libpurple/connection.c:178
 #, c-format
 msgid "Missing protocol plugin for %s"
 msgstr "Ontbrekende protokolinprop vir %s"
 
-#: ../libpurple/account.c:1041 ../libpurple/connection.c:108
-#: ../pidgin/gtkblist.c:4036
+#: ../libpurple/account.c:1044 ../libpurple/connection.c:108
+#: ../pidgin/gtkblist.c:4384
 msgid "Connection Error"
 msgstr "Verbindingfout"
 
-#: ../libpurple/account.c:1199 ../libpurple/protocols/gg/gg.c:707
-#: ../libpurple/protocols/jabber/jabber.c:1687
+#: ../libpurple/account.c:1241 ../libpurple/protocols/gg/gg.c:707
+#: ../libpurple/protocols/jabber/jabber.c:1667
 msgid "New passwords do not match."
 msgstr "Nuwe wagwoorde stem nie ooreen nie."
 
-#: ../libpurple/account.c:1208
+#: ../libpurple/account.c:1250
 msgid "Fill out all fields completely."
 msgstr "Vul alle velde volledig in."
 
-#: ../libpurple/account.c:1231
+#: ../libpurple/account.c:1273
 msgid "Original password"
 msgstr "Oorspronklike wagword"
 
-#: ../libpurple/account.c:1238
+#: ../libpurple/account.c:1280
 msgid "New password"
 msgstr "Nuwe wagwoord"
 
-#: ../libpurple/account.c:1245
+#: ../libpurple/account.c:1287
 msgid "New password (again)"
 msgstr "Nuwe wagwoord (weer)"
 
-#: ../libpurple/account.c:1251
+#: ../libpurple/account.c:1293
 #, c-format
 msgid "Change password for %s"
 msgstr "Verander wagwoord vir %s"
 
-#: ../libpurple/account.c:1259
+#: ../libpurple/account.c:1301
 msgid "Please enter your current password and your new password."
-msgstr "Gee asb. u huidige wagwoord en u nuwe wagwoord."
-
-#: ../libpurple/account.c:1290
+msgstr "Tik gerus u huidige wagwoord en u nuwe wagwoord."
+
+#: ../libpurple/account.c:1332
 #, c-format
 msgid "Change user information for %s"
 msgstr "Verander gebruikerinligting vir %s"
 
-#: ../libpurple/account.c:1293 ../libpurple/protocols/toc/toc.c:1670
+#: ../libpurple/account.c:1335 ../libpurple/protocols/toc/toc.c:1670
 msgid "Set User Info"
 msgstr "Stel gebruikerinligting"
 
-#: ../libpurple/account.c:1764 ../libpurple/protocols/gg/gg.c:1017
+#: ../libpurple/account.c:1806 ../libpurple/protocols/gg/gg.c:1018
 #: ../libpurple/protocols/jabber/buddy.c:782
-#: ../libpurple/protocols/jabber/buddy.c:2027
-#: ../libpurple/protocols/jabber/buddy.c:2044
-#: ../libpurple/protocols/novell/novell.c:2831
+#: ../libpurple/protocols/jabber/buddy.c:2030
+#: ../libpurple/protocols/jabber/buddy.c:2047
+#: ../libpurple/protocols/novell/novell.c:2836
 #: ../libpurple/protocols/qq/qq.c:232 ../pidgin/gtkft.c:160
 msgid "Unknown"
 msgstr "Onbekend"
 
-#: ../libpurple/blist.c:521 ../libpurple/blist.c:1320
-#: ../libpurple/blist.c:1552 ../libpurple/protocols/jabber/roster.c:69
-#: ../libpurple/protocols/myspace/myspace.c:3244 ../pidgin/gtkblist.c:5373
+#: ../libpurple/blist.c:521 ../libpurple/blist.c:1321
+#: ../libpurple/blist.c:1531 ../libpurple/protocols/jabber/roster.c:69
+#: ../libpurple/protocols/myspace/myspace.c:3250 ../pidgin/gtkblist.c:5737
 #: ../pidgin/plugins/gevolution/gevo-util.c:67
 #: ../pidgin/plugins/gevolution/gevolution.c:96
 msgid "Buddies"
@@ -2018,58 +2064,59 @@
 msgid "buddy list"
 msgstr "vriendelys"
 
-#: ../libpurple/certificate.c:545
+#: ../libpurple/certificate.c:558
 msgid "(DOES NOT MATCH)"
-msgstr ""
+msgstr "(PAS NIE)"
 
 #. Make messages
-#: ../libpurple/certificate.c:549
+#: ../libpurple/certificate.c:562
 #, c-format
 msgid "%s has presented the following certificate for just-this-once use:"
-msgstr ""
-
-#: ../libpurple/certificate.c:550
+msgstr "%s het die volgende sertifikaat vir eenkeer-gebruik voorgelê:"
+
+#: ../libpurple/certificate.c:563
 #, c-format
 msgid ""
 "Common name: %s %s\n"
 "Fingerprint (SHA1): %s"
 msgstr ""
+"Algemene naam: %s %s\n"
+"Vingerafdruk (SHA1): %s"
 
 #. TODO: Find what the handle ought to be
-#: ../libpurple/certificate.c:555
+#: ../libpurple/certificate.c:568
 msgid "Single-use Certificate Verification"
-msgstr ""
+msgstr "Verifiëring van eenkeergebruik-sertifikate"
 
 #. Scheme name
 #. Pool name
-#: ../libpurple/certificate.c:872
+#: ../libpurple/certificate.c:886
 msgid "Certificate Authorities"
-msgstr ""
+msgstr "Sertifikaatowerhede"
 
 #. Scheme name
 #. Pool name
-#: ../libpurple/certificate.c:1040
+#: ../libpurple/certificate.c:1054
 msgid "SSL Peers Cache"
-msgstr ""
+msgstr "SSL-ewekniekas"
 
 #. Make messages
-#: ../libpurple/certificate.c:1171
-#, fuzzy, c-format
+#: ../libpurple/certificate.c:1185
+#, c-format
 msgid "Accept certificate for %s?"
-msgstr "Aanvaar geselsie-uitnodiging?"
+msgstr "Aanvaar sertifikaat vir %s?"
 
 #. TODO: Find what the handle ought to be
-#: ../libpurple/certificate.c:1177
+#: ../libpurple/certificate.c:1191
 msgid "SSL Certificate Verification"
-msgstr ""
+msgstr "SSL-sertifikaatverifikasie"
 
 #. Number of actions
-#: ../libpurple/certificate.c:1186
-#, fuzzy
+#: ../libpurple/certificate.c:1201
 msgid "Accept"
-msgstr "_Aanvaar"
-
-#: ../libpurple/certificate.c:1187 ../libpurple/protocols/qq/buddy_opt.c:214
+msgstr "Aanvaar"
+
+#: ../libpurple/certificate.c:1202 ../libpurple/protocols/qq/buddy_opt.c:214
 #: ../libpurple/protocols/qq/group_im.c:144
 #: ../libpurple/protocols/qq/group_opt.c:127
 #: ../libpurple/protocols/qq/sys_msg.c:90
@@ -2077,77 +2124,87 @@
 msgid "Reject"
 msgstr "Weier"
 
-#: ../libpurple/certificate.c:1188
+#: ../libpurple/certificate.c:1203
 msgid "_View Certificate..."
-msgstr ""
+msgstr "_Bekyk sertifikaat..."
 
 #. Prompt the user to authenticate the certificate
 #. TODO: Provide the user with more guidance about why he is
 #. being prompted
 #. vrq will be completed by user_auth
-#: ../libpurple/certificate.c:1288
+#: ../libpurple/certificate.c:1303
 #, c-format
 msgid ""
 "The certificate presented by \"%s\" claims to be from \"%s\" instead.  This "
 "could mean that you are not connecting to the service you believe you are."
 msgstr ""
+"Die sertifikaat wat deur \"%s\" voorgelê is, beweer om van \"%s\" afkomstig "
+"te wees.  Dit kan beteken dat u nie tans aan die diens gekoppel is wat u "
+"dink nie."
 
 #. Prompt the user to authenticate the certificate
 #. vrq will be completed by user_auth
-#: ../libpurple/certificate.c:1313
+#: ../libpurple/certificate.c:1328
 #, c-format
 msgid ""
 "The certificate presented by \"%s\" is self-signed. It cannot be "
 "automatically checked."
 msgstr ""
-
-#: ../libpurple/certificate.c:1331
+"Die sertifikaat wat voorgelê word deur \"%s\", is selfonderteken. Dit kan "
+"nie outomaties gekontroleer word nie."
+
+#: ../libpurple/certificate.c:1346
 #, c-format
 msgid "The certificate chain presented for %s is not valid."
-msgstr ""
+msgstr "Die sertifikaatketting wat vir %s voorgelê word, is nie geldig nie."
 
 #. TODO: Make this error either block the ensuing SSL
 #. connection error until the user dismisses this one, or
 #. stifle it.
 #. TODO: Probably wrong.
 #. TODO: Probably wrong
-#: ../libpurple/certificate.c:1339 ../libpurple/certificate.c:1416
-#, fuzzy
+#: ../libpurple/certificate.c:1354 ../libpurple/certificate.c:1423
 msgid "SSL Certificate Error"
-msgstr "Skryffout"
-
-#: ../libpurple/certificate.c:1340
-#, fuzzy
+msgstr "SSL-sertifikaatfout"
+
+#: ../libpurple/certificate.c:1355
 msgid "Invalid certificate chain"
-msgstr "Ongeldige titel"
+msgstr "Ongeldige sertifikaatketting"
 
 #. vrq will be completed by user_auth
-#: ../libpurple/certificate.c:1360
+#: ../libpurple/certificate.c:1375
 msgid ""
 "You have no database of root certificates, so this certificate cannot be "
 "validated."
 msgstr ""
+"U het geen databasis of wortelsertifikate nie, dus kan hierdie sertifikaat "
+"nie geldig wees nie."
 
 #. vrq will be completed by user_auth
-#: ../libpurple/certificate.c:1382
+#: ../libpurple/certificate.c:1398
 msgid ""
 "The root certificate this one claims to be issued by is unknown to Pidgin."
 msgstr ""
-
-#: ../libpurple/certificate.c:1408
+"Die wortelsertifikaat wat hierdie een beweer uitgereik is, is nie aan Pidgin "
+"bekend nie."
+
+#: ../libpurple/certificate.c:1415
 #, c-format
 msgid ""
 "The certificate chain presented by %s does not have a valid digital "
 "signature from the Certificate Authority from which it claims to have a "
 "signature."
 msgstr ""
-
-#: ../libpurple/certificate.c:1417
+"Die sertifikaatketting wat deur %s voorgelê word, het nie 'n geldige "
+"digitale handtekening van die sertifikaatgesag waarvan dit beweer dit 'n "
+"handtekening het nie."
+
+#: ../libpurple/certificate.c:1424
 msgid "Invalid certificate authority signature"
-msgstr ""
+msgstr "Ongeldige sertifikaatgesag-sertifikaat"
 
 #. Make messages
-#: ../libpurple/certificate.c:1881
+#: ../libpurple/certificate.c:1888
 #, c-format
 msgid ""
 "Common name: %s\n"
@@ -2157,21 +2214,25 @@
 "Activation date: %s\n"
 "Expiration date: %s\n"
 msgstr ""
+"Algemene naam: %s\n"
+"\n"
+"Vingerafdruk (SHA1): %s\n"
+"\n"
+"Aktiveringsdatum: %s\n"
+"Vervaldatum: %s\n"
 
 #. TODO: Find what the handle ought to be
-#: ../libpurple/certificate.c:1890
-#, fuzzy
+#: ../libpurple/certificate.c:1897
 msgid "Certificate Information"
-msgstr "Bedienerinligting"
+msgstr "Sertifikaatinligting"
 
 #: ../libpurple/connection.c:107
 msgid "Registration Error"
 msgstr "Registrasiefout"
 
 #: ../libpurple/connection.c:180
-#, fuzzy
 msgid "Unregistration Error"
-msgstr "Registrasiefout"
+msgstr "Deregistrasiefout"
 
 #: ../libpurple/connection.c:350
 #, c-format
@@ -2183,10 +2244,10 @@
 msgid "+++ %s signed off"
 msgstr "+++ %s het afgemeld"
 
-#: ../libpurple/connection.c:497 ../libpurple/plugin.c:282
-#: ../libpurple/protocols/jabber/buddy.c:2337
+#: ../libpurple/connection.c:497 ../libpurple/plugin.c:277
+#: ../libpurple/protocols/jabber/buddy.c:2350
 #: ../libpurple/protocols/msn/servconn.c:141
-#: ../libpurple/protocols/msn/session.c:322
+#: ../libpurple/protocols/msn/session.c:371
 msgid "Unknown error"
 msgstr "Onbekende fout"
 
@@ -2261,7 +2322,7 @@
 msgid "Failed to get serv name: %s"
 msgstr "Kry van bedienernaam het misluk: %s"
 
-#: ../libpurple/dbus-server.h:85
+#: ../libpurple/dbus-server.h:84
 msgid "Purple's D-BUS server is not running for the reason listed below"
 msgstr "Purple se D-BUS-bediener loop nie, vir die rede hier onder"
 
@@ -2277,20 +2338,20 @@
 msgid "Unable to send request to resolver process\n"
 msgstr "Kon nie versoek aan oplosserproses stuur nie\n"
 
-#: ../libpurple/dnsquery.c:549 ../libpurple/dnsquery.c:697
+#: ../libpurple/dnsquery.c:549 ../libpurple/dnsquery.c:698
 #, c-format
 msgid ""
 "Error resolving %s:\n"
 "%s"
 msgstr ""
-"Fout met oplos van %s:\n"
+"Kon nie %s oplos nie:\n"
 "%s"
 
-#: ../libpurple/dnsquery.c:552 ../libpurple/dnsquery.c:711
-#: ../libpurple/dnsquery.c:831
+#: ../libpurple/dnsquery.c:552 ../libpurple/dnsquery.c:712
+#: ../libpurple/dnsquery.c:830
 #, c-format
 msgid "Error resolving %s: %d"
-msgstr "Fout met oplos van %s: %d"
+msgstr "Kon nie %s oplos nie: %d"
 
 #: ../libpurple/dnsquery.c:574
 #, c-format
@@ -2298,20 +2359,19 @@
 "Error reading from resolver process:\n"
 "%s"
 msgstr ""
-"Fout met lees van oplosserproses:\n"
+"Kon nie van oplosserproses lees nie:\n"
 "%s"
 
 #: ../libpurple/dnsquery.c:578
-#, c-format
 msgid "EOF while reading from resolver process"
 msgstr "EOF terwyl van oplosserproses lees"
 
-#: ../libpurple/dnsquery.c:761
+#: ../libpurple/dnsquery.c:762
 #, c-format
 msgid "Thread creation failure: %s"
 msgstr "Draadskepping het misluk %s"
 
-#: ../libpurple/dnsquery.c:762
+#: ../libpurple/dnsquery.c:763
 msgid "Unknown reason"
 msgstr "Onbekende rede"
 
@@ -2321,7 +2381,7 @@
 "Error reading %s: \n"
 "%s.\n"
 msgstr ""
-"Fout met lees van %s: \n"
+"Kon nie %s lees nie: \n"
 "%s.\n"
 
 #: ../libpurple/ft.c:213
@@ -2330,7 +2390,7 @@
 "Error writing %s: \n"
 "%s.\n"
 msgstr ""
-"Fout met skryf van %s: \n"
+"Kon nie %s skryf nie: \n"
 "%s.\n"
 
 #: ../libpurple/ft.c:217
@@ -2339,7 +2399,7 @@
 "Error accessing %s: \n"
 "%s.\n"
 msgstr ""
-"Fout met toegang verkry van %s: \n"
+"Kon nie toegang tot %s kry nie: \n"
 "%s.\n"
 
 #: ../libpurple/ft.c:253
@@ -2412,7 +2472,6 @@
 msgstr "Oordrag van lêer %s voltooi"
 
 #: ../libpurple/ft.c:685
-#, c-format
 msgid "File transfer complete"
 msgstr "Lêeroordrag voltooi"
 
@@ -2422,7 +2481,6 @@
 msgstr "U het die oordrag van %s gekanselleer"
 
 #: ../libpurple/ft.c:1108
-#, c-format
 msgid "File transfer cancelled"
 msgstr "Lêeroordrag gekanselleer"
 
@@ -2448,94 +2506,94 @@
 
 #: ../libpurple/gconf/purple.schemas.in.h:1
 msgid "Run the command in a terminal"
-msgstr "Loop die opdrag in 'n terminaal"
+msgstr "Loop die bevel in 'n terminaal"
 
 #: ../libpurple/gconf/purple.schemas.in.h:2
 msgid "The command used to handle \"aim\" URLs, if enabled."
 msgstr ""
-"Die opdrag wat gebruik word om \"aim\"-URL'e te hanteer, indien geaktiveer."
+"Die bevel wat gebruik word om \"aim\"-URL'e te hanteer, indien geaktiveer."
 
 #: ../libpurple/gconf/purple.schemas.in.h:3
 msgid "The command used to handle \"gg\" URLs, if enabled."
 msgstr ""
-"Die opdrag wat gebruik word om \"gg\"-URL'e te hanteer, indien geaktiveer."
+"Die bevel wat gebruik word om \"gg\"-URL'e te hanteer, indien geaktiveer."
 
 #: ../libpurple/gconf/purple.schemas.in.h:4
 msgid "The command used to handle \"icq\" URLs, if enabled."
 msgstr ""
-"Die opdrag wat gebruik word om \"icq\"-URL'e te hanteer, indien geaktiveer."
+"Die bevel wat gebruik word om \"icq\"-URL'e te hanteer, indien geaktiveer."
 
 #: ../libpurple/gconf/purple.schemas.in.h:5
 msgid "The command used to handle \"irc\" URLs, if enabled."
 msgstr ""
-"Die opdrag wat gebruik word om \"irc\"-URL'e te hanteer, indien geaktiveer."
+"Die bevel wat gebruik word om \"irc\"-URL'e te hanteer, indien geaktiveer."
 
 #: ../libpurple/gconf/purple.schemas.in.h:6
 msgid "The command used to handle \"msnim\" URLs, if enabled."
 msgstr ""
-"Die opdrag wat gebruik word om \"msnim\"-URL'e te hanteer, indien geaktiveer."
+"Die bevel wat gebruik word om \"msnim\"-URL'e te hanteer, indien geaktiveer."
 
 #: ../libpurple/gconf/purple.schemas.in.h:7
 msgid "The command used to handle \"sip\" URLs, if enabled."
 msgstr ""
-"Die opdrag wat gebruik word om \"sip\"-URL'e te hanteer, indien geaktiveer."
+"Die bevel wat gebruik word om \"sip\"-URL'e te hanteer, indien geaktiveer."
 
 #: ../libpurple/gconf/purple.schemas.in.h:8
 msgid "The command used to handle \"xmpp\" URLs, if enabled."
 msgstr ""
-"Die opdrag wat gebruik word om \"xmpp\"-URL'e te hanteer, indien geaktiveer."
+"Die bevel wat gebruik word om \"xmpp\"-URL'e te hanteer, indien geaktiveer."
 
 #: ../libpurple/gconf/purple.schemas.in.h:9
 msgid "The command used to handle \"ymsgr\" URLs, if enabled."
 msgstr ""
-"Die opdrag wat gebruik word om \"ymsgr\"-URL'e te hanteer, indien geaktiveer."
+"Die bevel wat gebruik word om \"ymsgr\"-URL'e te hanteer, indien geaktiveer."
 
 #: ../libpurple/gconf/purple.schemas.in.h:10
 msgid "The handler for \"aim\" URLs"
-msgstr "Hantering van \"aim\"-URL'e"
+msgstr "Die vatsel vir \"aim\"-URL'e"
 
 #: ../libpurple/gconf/purple.schemas.in.h:11
 msgid "The handler for \"gg\" URLs"
-msgstr "Hantering van \"gg\"-URL'e"
+msgstr "Die vatsel vir \"gg\"-URL'e"
 
 #: ../libpurple/gconf/purple.schemas.in.h:12
 msgid "The handler for \"icq\" URLs"
-msgstr "Hantering van \"icq\"-URL'e"
+msgstr "Die vatsel vir \"icq\"-URL'e"
 
 #: ../libpurple/gconf/purple.schemas.in.h:13
 msgid "The handler for \"irc\" URLs"
-msgstr "Hantering van \"irc\"-URL'e"
+msgstr "Die vatsel vir \"irc\"-URL'e"
 
 #: ../libpurple/gconf/purple.schemas.in.h:14
 msgid "The handler for \"msnim\" URLs"
-msgstr "Hantering van \"msnim\"-URL'e"
+msgstr "Die vatsel vir \"msnim\"-URL'e"
 
 #: ../libpurple/gconf/purple.schemas.in.h:15
 msgid "The handler for \"sip\" URLs"
-msgstr "Hantering van \"sip\"-URL'e"
+msgstr "Die vatsel vir \"sip\"-URL'e"
 
 #: ../libpurple/gconf/purple.schemas.in.h:16
 msgid "The handler for \"xmpp\" URLs"
-msgstr "Hantering van \"xmpp\"-URL'e"
+msgstr "Die vatsel vir \"xmpp\"-URL'e"
 
 #: ../libpurple/gconf/purple.schemas.in.h:17
 msgid "The handler for \"ymsgr\" URLs"
-msgstr "Hantering van \"ymsgr\"-URL'e"
+msgstr "Die vatsel vir \"ymsgr\"-URL'e"
 
 #: ../libpurple/gconf/purple.schemas.in.h:18
 msgid ""
 "True if the command specified in the \"command\" key should handle \"aim\" "
 "URLs."
 msgstr ""
-"Waar indien die opdrag gespesifiseer in die \"command\"-sleutel \"aim\"-"
-"URL'e moet hanteer."
+"Waar indien die bevel gespesifiseer in die \"command\"-sleutel \"aim\"-URL'e "
+"moet hanteer."
 
 #: ../libpurple/gconf/purple.schemas.in.h:19
 msgid ""
 "True if the command specified in the \"command\" key should handle \"gg\" "
 "URLs."
 msgstr ""
-"Waar indien die opdrag gespesifiseer in die \"command\"-sleutel \"gg\"-URL'e "
+"Waar indien die bevel gespesifiseer in die \"command\"-sleutel \"gg\"-URL'e "
 "moet hanteer."
 
 #: ../libpurple/gconf/purple.schemas.in.h:20
@@ -2543,23 +2601,23 @@
 "True if the command specified in the \"command\" key should handle \"icq\" "
 "URLs."
 msgstr ""
-"Waar indien die opdrag gespesifiseer in die \"command\"-sleutel \"icq\"-"
-"URL'e moet hanteer."
+"Waar indien die bevel gespesifiseer in die \"command\"-sleutel \"icq\"-URL'e "
+"moet hanteer."
 
 #: ../libpurple/gconf/purple.schemas.in.h:21
 msgid ""
 "True if the command specified in the \"command\" key should handle \"irc\" "
 "URLs."
 msgstr ""
-"Waar indien die opdrag gespesifiseer in die \"command\"-sleutel \"irc\"-"
-"URL'e moet hanteer."
+"Waar indien die bevel gespesifiseer in die \"command\"-sleutel \"irc\"-URL'e "
+"moet hanteer."
 
 #: ../libpurple/gconf/purple.schemas.in.h:22
 msgid ""
 "True if the command specified in the \"command\" key should handle \"msnim\" "
 "URLs."
 msgstr ""
-"Waar indien die opdrag gespesifiseer in die \"command\"-sleutel \"msnim\"-"
+"Waar indien die bevel gespesifiseer in die \"command\"-sleutel \"msnim\"-"
 "URL'e moet hanteer."
 
 #: ../libpurple/gconf/purple.schemas.in.h:23
@@ -2567,15 +2625,15 @@
 "True if the command specified in the \"command\" key should handle \"sip\" "
 "URLs."
 msgstr ""
-"Waar indien die opdrag gespesifiseer in die \"command\"-sleutel \"sip\"-"
-"URL'e moet hanteer."
+"Waar indien die bevel gespesifiseer in die \"command\"-sleutel \"sip\"-URL'e "
+"moet hanteer."
 
 #: ../libpurple/gconf/purple.schemas.in.h:24
 msgid ""
 "True if the command specified in the \"command\" key should handle \"xmpp\" "
 "URLs."
 msgstr ""
-"Waar indien die opdrag gespesifiseer in die \"command\"-sleutel \"xmpp\"-"
+"Waar indien die bevel gespesifiseer in die \"command\"-sleutel \"xmpp\"-"
 "URL'e moet hanteer."
 
 #: ../libpurple/gconf/purple.schemas.in.h:25
@@ -2583,7 +2641,7 @@
 "True if the command specified in the \"command\" key should handle \"ymsgr\" "
 "URLs."
 msgstr ""
-"Waar indien die opdrag gespesifiseer in die \"command\"-sleutel \"ymsgr\"-"
+"Waar indien die bevel gespesifiseer in die \"command\"-sleutel \"ymsgr\"-"
 "URL'e moet hanteer."
 
 #: ../libpurple/gconf/purple.schemas.in.h:26
@@ -2591,8 +2649,7 @@
 "True if the command used to handle this type of URL should be run in a "
 "terminal."
 msgstr ""
-"Waar indien die opdrag wat hierdie tipe URL hanteer in 'n terminaal moet "
-"loop."
+"Waar indien die bevel wat hierdie tipe URL hanteer in 'n terminaal moet loop."
 
 #: ../libpurple/gconf/purple.schemas.in.h:27
 msgid "Whether the specified command should handle \"aim\" URLs"
@@ -2645,7 +2702,7 @@
 
 #: ../libpurple/log.c:839
 msgid "Logging of this conversation failed."
-msgstr "Boekstawing van hierdie gesprek het misluk."
+msgstr "Boekstaaf van hierdie gesprek het misluk."
 
 #: ../libpurple/log.c:1282
 msgid "XML"
@@ -2683,60 +2740,55 @@
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr "(%s) %s <AUTO-REPLY>: %s\n"
 
-#: ../libpurple/plugin.c:365
+#: ../libpurple/plugin.c:360
 #, c-format
 msgid "You are using %s, but this plugin requires %s."
 msgstr "U gebruik tans %s, maar hierdie inprop vereis %s."
 
-#: ../libpurple/plugin.c:380
-#, c-format
+#: ../libpurple/plugin.c:375
 msgid "This plugin has not defined an ID."
 msgstr "Hierdie inprop is nie as 'n ID gedefinieer nie."
 
-#: ../libpurple/plugin.c:448
+#: ../libpurple/plugin.c:443
 #, c-format
 msgid "Plugin magic mismatch %d (need %d)"
 msgstr "Inpropkuns pas nie: %d (benodig %d)"
 
-#: ../libpurple/plugin.c:465
+#: ../libpurple/plugin.c:460
 #, c-format
 msgid "ABI version mismatch %d.%d.x (need %d.%d.x)"
 msgstr "ABI-weergawe pas nie %d.%d.x (benodig %d.%d.x)"
 
-#: ../libpurple/plugin.c:482
+#: ../libpurple/plugin.c:477
 msgid "Plugin does not implement all required functions"
 msgstr "Inprop implementeer nie al die vereiste funksies nie"
 
-#: ../libpurple/plugin.c:547
+#: ../libpurple/plugin.c:542
 #, c-format
 msgid ""
 "The required plugin %s was not found. Please install this plugin and try "
 "again."
 msgstr ""
-"Die vereiste inprop %s is nie gevind nie. Installeer asb. hierdie inprop en "
+"Die vereiste inprop %s is nie gevind nie. Installeer gerus hierdie inprop en "
 "probeer weer."
 
-#: ../libpurple/plugin.c:552
+#: ../libpurple/plugin.c:547
 msgid "Unable to load the plugin"
 msgstr "Kan nie inprop laai nie"
 
-#: ../libpurple/plugin.c:574
+#: ../libpurple/plugin.c:569
 #, c-format
 msgid "The required plugin %s was unable to load."
 msgstr "Die vereiste inprop %s kon nie laai nie."
 
-#: ../libpurple/plugin.c:578
+#: ../libpurple/plugin.c:573
 msgid "Unable to load your plugin."
 msgstr "Kan nie u inprop laai nie."
 
-#: ../libpurple/plugin.c:677
-#, c-format
-msgid "The dependent plugin %s failed to unload."
-msgstr "Ontlaai van die afhanklike inprop %s het misluk."
-
-#: ../libpurple/plugin.c:681
-msgid "There were errors unloading the plugin."
-msgstr "Daar was foute met ontlaaiing van die inprop."
+#: ../libpurple/plugin.c:663
+#, c-format
+msgid "%s requires %s, but it failed to unload."
+msgstr "%s vereis %s, maar kon dit nie ontlaai nie."
 
 #: ../libpurple/plugins/autoaccept.c:23
 msgid "Autoaccept"
@@ -2770,14 +2822,15 @@
 
 #: ../libpurple/plugins/autoaccept.c:165 ../libpurple/plugins/idle.c:170
 #: ../libpurple/plugins/idle.c:204 ../libpurple/plugins/idle.c:230
-#: ../libpurple/protocols/oscar/oscar.c:1453
-#: ../libpurple/protocols/oscar/oscar.c:2233
-#: ../libpurple/protocols/oscar/oscar.c:2282
-#: ../libpurple/protocols/oscar/oscar.c:5886
+#: ../libpurple/protocols/oscar/oscar.c:1456
+#: ../libpurple/protocols/oscar/oscar.c:2248
+#: ../libpurple/protocols/oscar/oscar.c:2297
 #: ../libpurple/protocols/oscar/oscar.c:5941
-#: ../libpurple/protocols/oscar/oscar.c:6167
-#: ../libpurple/protocols/oscar/oscar.c:6237 ../libpurple/request.h:1388
-#: ../libpurple/request.h:1398
+#: ../libpurple/protocols/oscar/oscar.c:5996
+#: ../libpurple/protocols/oscar/oscar.c:6222
+#: ../libpurple/protocols/oscar/oscar.c:6292 ../libpurple/request.h:1828
+#: ../libpurple/request.h:1841 ../libpurple/request.h:1854
+#: ../libpurple/request.h:1867 ../pidgin/gtkblist.c:530
 msgid "_Cancel"
 msgstr "_Kanselleer"
 
@@ -2804,7 +2857,7 @@
 "(Please provide the full path)"
 msgstr ""
 "Pad om die lêers in te stoor\n"
-"(Verskaf asb. die volledige pad)"
+"(Verskaf gerus die volledige pad)"
 
 #: ../libpurple/plugins/autoaccept.c:220
 msgid "Automatically reject from users not in buddy list"
@@ -2818,14 +2871,14 @@
 "Laat weet met opspringvenster wanneer outoaanvaarde lêeroordrag voltooi het\n"
 "(net as daar geen gesprek met sender is nie)"
 
-#: ../libpurple/plugins/buddynote.c:46 ../libpurple/protocols/msn/msn.c:1660
-#: ../libpurple/protocols/msn/msn.c:1690
+#: ../libpurple/plugins/buddynote.c:46 ../libpurple/protocols/msn/msn.c:1806
+#: ../libpurple/protocols/msn/msn.c:1836
 msgid "Notes"
 msgstr "Notas"
 
 #: ../libpurple/plugins/buddynote.c:47
 msgid "Enter your notes below..."
-msgstr "Gee u notas onder..."
+msgstr "Tik u notas onder..."
 
 #: ../libpurple/plugins/buddynote.c:65
 msgid "Edit Notes..."
@@ -2908,7 +2961,7 @@
 #. *  description
 #: ../libpurple/plugins/filectl.c:251 ../libpurple/plugins/filectl.c:253
 msgid "Allows control by entering commands in a file."
-msgstr "Maak beheer moontlik deur opdragte in 'n lêer te gee."
+msgstr "Maak beheer moontlik deur bevele in 'n lêer te tik."
 
 #: ../libpurple/plugins/idle.c:158 ../libpurple/plugins/idle.c:218
 msgid "Minutes"
@@ -2951,7 +3004,7 @@
 
 #: ../libpurple/plugins/idle.c:320 ../libpurple/plugins/idle.c:321
 msgid "Allows you to hand-configure how long you've been idle"
-msgstr "Laat mens toe om met die hand te stel hoe lank mens ledig was"
+msgstr "Stel 'n mens in staat om handmatig te stel hoe lank 'n mens ledig was"
 
 #. *< type
 #. *< ui_requirement
@@ -2968,7 +3021,7 @@
 #. *  summary
 #: ../libpurple/plugins/ipc-test-client.c:90
 msgid "Test plugin IPC support, as a client."
-msgstr "Toets inprop-IPC-ondersteuning, as 'n kliënt."
+msgstr "Toets inprop-IPC-steun, as 'n kliënt."
 
 #. *  description
 #: ../libpurple/plugins/ipc-test-client.c:92
@@ -2976,8 +3029,8 @@
 "Test plugin IPC support, as a client. This locates the server plugin and "
 "calls the commands registered."
 msgstr ""
-"Toets inprop-IPC-ondersteuning, as 'n kliënt. Dit vind die bedienerinprop en "
-"roep die bevele wat geregistreer is."
+"Toets inprop-IPC-steun, as 'n kliënt. Dit vind die bedienerinprop en roep "
+"die bevele wat geregistreer is."
 
 #. *< type
 #. *< ui_requirement
@@ -2994,13 +3047,13 @@
 #. *  summary
 #: ../libpurple/plugins/ipc-test-server.c:77
 msgid "Test plugin IPC support, as a server."
-msgstr "Toets inprop-IPC-ondersteuning, as 'n bediener."
+msgstr "Toets inprop-IPC-steun, as 'n bediener."
 
 #. *  description
 #: ../libpurple/plugins/ipc-test-server.c:79
 msgid "Test plugin IPC support, as a server. This registers the IPC commands."
 msgstr ""
-"Toets inprop-IPC-steun, as 'n bediener. Hierdie registreer die IPC-opdragte."
+"Toets inprop-IPC-steun, as 'n bediener. Hierdie registreer die IPC-bevelte."
 
 #: ../libpurple/plugins/joinpart.c:229
 msgid "Join/Part Hiding Configuration"
@@ -3044,111 +3097,120 @@
 #. * offset is way off.  The user should never really see it, but
 #. * it's here just in case.  The parens are to make it clear it's
 #. * not a real timezone.
-#: ../libpurple/plugins/log_reader.c:493
+#: ../libpurple/plugins/log_reader.c:499
 msgid "(UTC)"
 msgstr "(UTC)"
 
-#: ../libpurple/plugins/log_reader.c:1577
+#: ../libpurple/plugins/log_reader.c:1554
 msgid "User is offline."
-msgstr "Gebruiker is aflyn."
-
-#: ../libpurple/plugins/log_reader.c:1583
+msgstr "Gebruiker is vanlyn."
+
+#: ../libpurple/plugins/log_reader.c:1560
 msgid "Auto-response sent:"
-msgstr "Outo-antwoord gestuur:"
-
-#: ../libpurple/plugins/log_reader.c:1593
-#: ../libpurple/plugins/log_reader.c:1596
+msgstr "Outo-respons gestuur:"
+
+#: ../libpurple/plugins/log_reader.c:1570
+#: ../libpurple/plugins/log_reader.c:1573
 #: ../libpurple/plugins/statenotify.c:80
 #, c-format
 msgid "%s has signed off."
 msgstr "%s het afgemeld."
 
-#: ../libpurple/plugins/log_reader.c:1610
+#: ../libpurple/plugins/log_reader.c:1587
 msgid "One or more messages may have been undeliverable."
 msgstr "Een of meer boodskappe kon dalk nie afgelewer word nie."
 
-#: ../libpurple/plugins/log_reader.c:1620
+#: ../libpurple/plugins/log_reader.c:1597
 msgid "You were disconnected from the server."
-msgstr "U is van die bediener afgesny."
-
-#: ../libpurple/plugins/log_reader.c:1628
+msgstr "U is van die bediener ontkoppel."
+
+#: ../libpurple/plugins/log_reader.c:1605
 msgid ""
 "You are currently disconnected. Messages will not be received unless you are "
 "logged in."
 msgstr ""
-"U is tans afgesny. Boodskappe sal nie ontvang word tensy u aangemeld is nie."
-
-#: ../libpurple/plugins/log_reader.c:1643
+"U is tans ontkoppel. Boodskappe sal nie ontvang word tensy u aangemeld is "
+"nie."
+
+#: ../libpurple/plugins/log_reader.c:1620
 msgid "Message could not be sent because the maximum length was exceeded."
 msgstr "Boodskap kon nie gestuur word nie want die maksimumlengte is oorskry."
 
-#: ../libpurple/plugins/log_reader.c:1648
+#: ../libpurple/plugins/log_reader.c:1625
 msgid "Message could not be sent."
 msgstr "Boodskap kon nie gestuur word nie."
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
-#: ../libpurple/plugins/log_reader.c:2349
-#: ../libpurple/plugins/log_reader.c:2472
+#: ../libpurple/plugins/log_reader.c:2699
+#: ../libpurple/plugins/log_reader.c:2835
 msgid "Adium"
 msgstr "Adium"
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
-#: ../libpurple/plugins/log_reader.c:2362
-#: ../libpurple/plugins/log_reader.c:2477
+#: ../libpurple/plugins/log_reader.c:2712
+#: ../libpurple/plugins/log_reader.c:2840
 msgid "Fire"
 msgstr "Fire"
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
-#: ../libpurple/plugins/log_reader.c:2374
-#: ../libpurple/plugins/log_reader.c:2481
+#: ../libpurple/plugins/log_reader.c:2724
+#: ../libpurple/plugins/log_reader.c:2844
 msgid "Messenger Plus!"
 msgstr "Messenger Plus!"
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
-#: ../libpurple/plugins/log_reader.c:2388
-#: ../libpurple/plugins/log_reader.c:2486
+#: ../libpurple/plugins/log_reader.c:2738
+#: ../libpurple/plugins/log_reader.c:2849
 msgid "QIP"
 msgstr "QIP"
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
-#: ../libpurple/plugins/log_reader.c:2400
-#: ../libpurple/plugins/log_reader.c:2490
+#: ../libpurple/plugins/log_reader.c:2750
+#: ../libpurple/plugins/log_reader.c:2853
 msgid "MSN Messenger"
 msgstr "MSN Messenger"
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
-#: ../libpurple/plugins/log_reader.c:2412
-#: ../libpurple/plugins/log_reader.c:2494
+#: ../libpurple/plugins/log_reader.c:2762
+#: ../libpurple/plugins/log_reader.c:2857
 msgid "Trillian"
 msgstr "Trillian"
 
+#. 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:2774
+#: ../libpurple/plugins/log_reader.c:2861
+msgid "aMSN"
+msgstr "aMSN"
+
 #. Add general preferences.
-#: ../libpurple/plugins/log_reader.c:2454
+#: ../libpurple/plugins/log_reader.c:2817
 msgid "General Log Reading Configuration"
 msgstr "Leeskonfigurasie van algemene staaflêers"
 
-#: ../libpurple/plugins/log_reader.c:2458
+#: ../libpurple/plugins/log_reader.c:2821
 msgid "Fast size calculations"
 msgstr "Vinnige grootteberekeninge"
 
-#: ../libpurple/plugins/log_reader.c:2462
+#: ../libpurple/plugins/log_reader.c:2825
 msgid "Use name heuristics"
 msgstr "Gebruik naamheuristiek"
 
 #. Add Log Directory preferences.
-#: ../libpurple/plugins/log_reader.c:2468
+#: ../libpurple/plugins/log_reader.c:2831
 msgid "Log Directory"
 msgstr "Staaflêergids"
 
@@ -3158,19 +3220,19 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/log_reader.c:2523
+#: ../libpurple/plugins/log_reader.c:2890
 msgid "Log Reader"
 msgstr "Staaflêerleser"
 
 #. *< name
 #. *< version
 #. * summary
-#: ../libpurple/plugins/log_reader.c:2527
+#: ../libpurple/plugins/log_reader.c:2894
 msgid "Includes other IM clients' logs in the log viewer."
-msgstr "Sluit ander kletskliënte se staaflêers in in die staaflêerleser."
+msgstr "Sluit ander kitsboodskappers se staaflêers in in die staaflêerleser."
 
 #. * description
-#: ../libpurple/plugins/log_reader.c:2531
+#: ../libpurple/plugins/log_reader.c:2898
 msgid ""
 "When viewing logs, this plugin will include logs from other IM clients. "
 "Currently, this includes Adium, MSN Messenger, and Trillian.\n"
@@ -3178,8 +3240,9 @@
 "WARNING: This plugin is still alpha code and may crash frequently.  Use it "
 "at your own risk!"
 msgstr ""
-"Wanneer staaflêers gelees word, sal hierdie inprop staaflêers uit ander IM-"
-"kliënte insluit. Dit sluit tans Adium, MSN Messenger en Trillian in.\n"
+"Wanneer staaflêers bekyk word, sal hierdie inprop staaflêers uit ander "
+"kitsboodskappers insluit. Dit sluit tans Adium, MSN Messenger en Trillian "
+"in.\n"
 "\n"
 "LET WEL: Hierdie inprop is nog in alfakode en kan dalk gereeld omval.  "
 "Gebruik op eie risiko!"
@@ -3223,11 +3286,11 @@
 
 #: ../libpurple/plugins/offlinemsg.c:23
 msgid "Offline Message Emulation"
-msgstr "Emulasie vir aflynboodskappe"
+msgstr "Emulasie vir vanlynboodskappe"
 
 #: ../libpurple/plugins/offlinemsg.c:25 ../libpurple/plugins/offlinemsg.c:26
 msgid "Save messages sent to an offline user as pounce."
-msgstr "Stoor boodskappe gestuur aan 'n aflynvriend as 'n vriendwag."
+msgstr "Stoor boodskappe gestuur aan 'n vanlynvriend as 'n vriendwag."
 
 #: ../libpurple/plugins/offlinemsg.c:95
 msgid ""
@@ -3243,44 +3306,44 @@
 "\"%s\" is currently offline. Do you want to save the rest of the messages in "
 "a pounce and automatically send them when \"%s\" logs back in?"
 msgstr ""
-"\"%s\" is tans aflyn. Wil u die res van die boodskappe in 'n vriendwag stoor "
-"en outomaties stuur as \"%s\" weer aanmeld?"
+"\"%s\" is tans vanlyn. Wil u die res van die boodskappe in 'n vriendwag "
+"stoor en outomaties stuur as \"%s\" weer aanmeld?"
 
 #: ../libpurple/plugins/offlinemsg.c:160
 msgid "Offline Message"
-msgstr "Aflyn boodskap"
+msgstr "Vanlyn boodskap"
 
 #: ../libpurple/plugins/offlinemsg.c:161
 msgid "You can edit/delete the pounce from the `Buddy Pounces' dialog"
 msgstr "U kan die vriendwag wysig/verwyder vanuit die `Vriendwag'-dialoog"
 
 #: ../libpurple/plugins/offlinemsg.c:165
-#: ../libpurple/protocols/msn/dialog.c:133
-#: ../libpurple/protocols/msn/msn.c:550 ../libpurple/protocols/msn/msn.c:560
-#: ../libpurple/protocols/novell/novell.c:1917
+#: ../libpurple/protocols/msn/dialog.c:141
+#: ../libpurple/protocols/msn/msn.c:665
+#: ../libpurple/protocols/novell/novell.c:1919
 #: ../libpurple/protocols/silc/buddy.c:317
-#: ../libpurple/protocols/silc/pk.c:113 ../libpurple/protocols/silc/wb.c:304
+#: ../libpurple/protocols/silc/pk.c:113 ../libpurple/protocols/silc/wb.c:308
 #: ../libpurple/protocols/silc10/buddy.c:314
 #: ../libpurple/protocols/silc10/pk.c:119
-#: ../libpurple/protocols/silc10/wb.c:304 ../pidgin/gtkrequest.c:268
+#: ../libpurple/protocols/silc10/wb.c:307 ../pidgin/gtkrequest.c:318
 msgid "Yes"
 msgstr "Ja"
 
 #: ../libpurple/plugins/offlinemsg.c:166
-#: ../libpurple/protocols/msn/dialog.c:134
-#: ../libpurple/protocols/msn/msn.c:550 ../libpurple/protocols/msn/msn.c:560
-#: ../libpurple/protocols/novell/novell.c:1918
+#: ../libpurple/protocols/msn/dialog.c:142
+#: ../libpurple/protocols/msn/msn.c:665
+#: ../libpurple/protocols/novell/novell.c:1920
 #: ../libpurple/protocols/silc/buddy.c:318
-#: ../libpurple/protocols/silc/pk.c:114 ../libpurple/protocols/silc/wb.c:305
+#: ../libpurple/protocols/silc/pk.c:114 ../libpurple/protocols/silc/wb.c:309
 #: ../libpurple/protocols/silc10/buddy.c:315
 #: ../libpurple/protocols/silc10/pk.c:120
-#: ../libpurple/protocols/silc10/wb.c:305 ../pidgin/gtkrequest.c:269
+#: ../libpurple/protocols/silc10/wb.c:308 ../pidgin/gtkrequest.c:319
 msgid "No"
 msgstr "Nee"
 
 #: ../libpurple/plugins/offlinemsg.c:193
 msgid "Save offline messages in pounce"
-msgstr "Stoor aflyn boodskappe in vriendwag"
+msgstr "Stoor vanlyn boodskappe in vriendwag"
 
 #: ../libpurple/plugins/offlinemsg.c:197
 msgid "Do not ask. Always save in pounce."
@@ -3301,7 +3364,7 @@
 #. *< summary
 #: ../libpurple/plugins/perl/perl.c:603 ../libpurple/plugins/perl/perl.c:604
 msgid "Provides support for loading perl plugins."
-msgstr "Verskaf ondersteuning vir die laai van perl-inproppe."
+msgstr "Verskaf steun vir die laai van perl-inproppe."
 
 #: ../libpurple/plugins/psychic.c:20
 msgid "Psychic Mode"
@@ -3345,7 +3408,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/signals-test.c:711
+#: ../libpurple/plugins/signals-test.c:739
 msgid "Signals Test"
 msgstr "Seinetoets"
 
@@ -3353,8 +3416,8 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/plugins/signals-test.c:714
-#: ../libpurple/plugins/signals-test.c:716
+#: ../libpurple/plugins/signals-test.c:742
+#: ../libpurple/plugins/signals-test.c:744
 msgid "Test to see that all signals are working properly."
 msgstr "Toets om te sien of alle seine goed werk."
 
@@ -3377,10 +3440,10 @@
 msgstr "Toets om te sien of meeste dinge werk."
 
 #. Scheme name
-#: ../libpurple/plugins/ssl/ssl-gnutls.c:902
-#: ../libpurple/plugins/ssl/ssl-nss.c:725
+#: ../libpurple/plugins/ssl/ssl-gnutls.c:911
+#: ../libpurple/plugins/ssl/ssl-nss.c:731
 msgid "X.509 Certificates"
-msgstr ""
+msgstr "X.509-sertifikate"
 
 #. *< type
 #. *< ui_requirement
@@ -3388,7 +3451,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/ssl/ssl-gnutls.c:986
+#: ../libpurple/plugins/ssl/ssl-gnutls.c:995
 msgid "GNUTLS"
 msgstr "GNUTLS"
 
@@ -3396,8 +3459,8 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/plugins/ssl/ssl-gnutls.c:989
-#: ../libpurple/plugins/ssl/ssl-gnutls.c:991
+#: ../libpurple/plugins/ssl/ssl-gnutls.c:998
+#: ../libpurple/plugins/ssl/ssl-gnutls.c:1000
 msgid "Provides SSL support through GNUTLS."
 msgstr "Verskaf SSL-steun d.m.v. GNUTLS."
 
@@ -3407,7 +3470,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/ssl/ssl-nss.c:810
+#: ../libpurple/plugins/ssl/ssl-nss.c:816
 msgid "NSS"
 msgstr "NSS"
 
@@ -3415,8 +3478,8 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/plugins/ssl/ssl-nss.c:813
-#: ../libpurple/plugins/ssl/ssl-nss.c:815
+#: ../libpurple/plugins/ssl/ssl-nss.c:819
+#: ../libpurple/plugins/ssl/ssl-nss.c:821
 msgid "Provides SSL support through Mozilla NSS."
 msgstr "Verskaf SSL-steun d.m.v. Mozilla-NSS."
 
@@ -3436,7 +3499,7 @@
 #. *  description
 #: ../libpurple/plugins/ssl/ssl.c:97 ../libpurple/plugins/ssl/ssl.c:99
 msgid "Provides a wrapper around SSL support libraries."
-msgstr "Verskaf 'n skil vir SSL-ondersteuning-programmateke."
+msgstr "Verskaf 'n skil vir SSL-steun-programmateke."
 
 #: ../libpurple/plugins/statenotify.c:50
 #, c-format
@@ -3502,15 +3565,15 @@
 "Dui aan in 'n gespreksvenster wanneer 'n vriend weggaan of terugkom vanaf 'n "
 "weg- of ledige status."
 
-#: ../libpurple/plugins/tcl/tcl.c:421
+#: ../libpurple/plugins/tcl/tcl.c:423
 msgid "Tcl Plugin Loader"
 msgstr "Laaier vir Tcl-inproppe"
 
-#: ../libpurple/plugins/tcl/tcl.c:423 ../libpurple/plugins/tcl/tcl.c:424
+#: ../libpurple/plugins/tcl/tcl.c:425 ../libpurple/plugins/tcl/tcl.c:426
 msgid "Provides support for loading Tcl plugins"
-msgstr "Verskaf ondersteuning vir die laai van Tcl-inproppe"
-
-#: ../libpurple/plugins/tcl/tcl.c:507
+msgstr "Verskaf steun vir die laai van Tcl-inproppe"
+
+#: ../libpurple/plugins/tcl/tcl.c:509
 msgid ""
 "Unable to detect ActiveTCL installation. If you wish to use TCL plugins, "
 "install ActiveTCL from http://www.activestate.com\n"
@@ -3518,52 +3581,63 @@
 "Kon nie ActiveTCL-installasie bespeur nie. Indien u TCL-inproppe wil "
 "gebruik, installeerActiveTCL vanaf http://www.activestate.com\n"
 
+#: ../libpurple/protocols/bonjour/bonjour.c:107
+msgid ""
+"The Apple Bonjour For Windows toolkit wasn't found, see the FAQ at: http://"
+"developer.pidgin.im/wiki/Using%20Pidgin#CanIusePidginforBonjourLink-"
+"LocalMessaging for more information."
+msgstr ""
+"Die Apple Bonjour For Windows-nutspak kon nie gevind word nie; kyk kwelvrae "
+"by: http://developer.pidgin.im/wiki/Using%"
+"20Pidgin#CanIusePidginforBonjourLink-LocalMessaging vir meer inligting."
+
 #. Send a message about the connection error
-#: ../libpurple/protocols/bonjour/bonjour.c:112
+#: ../libpurple/protocols/bonjour/bonjour.c:124
 msgid "Unable to listen for incoming IM connections\n"
 msgstr "Kon nie vir inkomende kitsboodskap-verbindings luister nie\n"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:137
+#: ../libpurple/protocols/bonjour/bonjour.c:149
 msgid ""
 "Unable to establish connection with the local mDNS server.  Is it running?"
 msgstr ""
-"Kon nie verbinding bewerkstellig met plaaslike mDNS-bediener nie.  Loop dit?"
+"Kon nie verbinding met plaaslike mDNS-bediener bewerkstellig nie.  Loop dit "
+"tans?"
 
 #. Creating the options for the protocol
-#: ../libpurple/protocols/bonjour/bonjour.c:351
-#: ../libpurple/protocols/bonjour/bonjour.c:656
+#: ../libpurple/protocols/bonjour/bonjour.c:365
+#: ../libpurple/protocols/bonjour/bonjour.c:670
 #: ../libpurple/protocols/gg/gg.c:632
 #: ../libpurple/protocols/jabber/jabber.c:942
 msgid "First name"
 msgstr "Naam"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:353
-#: ../libpurple/protocols/bonjour/bonjour.c:659
+#: ../libpurple/protocols/bonjour/bonjour.c:367
+#: ../libpurple/protocols/bonjour/bonjour.c:673
 #: ../libpurple/protocols/gg/gg.c:627
 #: ../libpurple/protocols/jabber/jabber.c:947
 msgid "Last name"
 msgstr "Van"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:357
+#: ../libpurple/protocols/bonjour/bonjour.c:371
 #: ../libpurple/protocols/jabber/buddy.c:295
 #: ../libpurple/protocols/jabber/buddy.c:1325
 #: ../libpurple/protocols/jabber/buddy.c:1335
-#: ../libpurple/protocols/jabber/buddy.c:2216
+#: ../libpurple/protocols/jabber/buddy.c:2219
 #: ../libpurple/protocols/silc/ops.c:1041
-#: ../libpurple/protocols/silc/util.c:555
+#: ../libpurple/protocols/silc/util.c:559
 #: ../libpurple/protocols/silc10/ops.c:1075
 #: ../libpurple/protocols/silc10/util.c:551
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1061
 msgid "E-Mail"
 msgstr "E-pos"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:360
-#: ../libpurple/protocols/bonjour/bonjour.c:665
+#: ../libpurple/protocols/bonjour/bonjour.c:374
+#: ../libpurple/protocols/bonjour/bonjour.c:679
 msgid "AIM Account"
 msgstr "AIM-rekening"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:363
-#: ../libpurple/protocols/bonjour/bonjour.c:668
+#: ../libpurple/protocols/bonjour/bonjour.c:377
+#: ../libpurple/protocols/bonjour/bonjour.c:682
 msgid "XMPP Account"
 msgstr "XMPP-rekening"
 
@@ -3577,20 +3651,20 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/bonjour/bonjour.c:467
-#: ../libpurple/protocols/bonjour/bonjour.c:469
+#: ../libpurple/protocols/bonjour/bonjour.c:481
+#: ../libpurple/protocols/bonjour/bonjour.c:483
 msgid "Bonjour Protocol Plugin"
 msgstr "Bonjour-protokolinprop"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:610
+#: ../libpurple/protocols/bonjour/bonjour.c:624
 msgid "Purple Person"
 msgstr "Pers persoon"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:662
+#: ../libpurple/protocols/bonjour/bonjour.c:676
 #: ../libpurple/protocols/gg/gg.c:477
 #: ../libpurple/protocols/jabber/jabber.c:932
-#: ../libpurple/protocols/silc/silc.c:770
-#: ../libpurple/protocols/silc/silc.c:1011
+#: ../libpurple/protocols/silc/silc.c:901
+#: ../libpurple/protocols/silc/silc.c:1142
 #: ../libpurple/protocols/silc10/silc.c:681
 #: ../libpurple/protocols/silc10/silc.c:922
 msgid "E-mail"
@@ -3600,38 +3674,38 @@
 msgid "Bonjour"
 msgstr "Bonjour"
 
-#: ../libpurple/protocols/bonjour/jabber.c:380
+#: ../libpurple/protocols/bonjour/jabber.c:381
 #, c-format
 msgid "%s has closed the conversation."
 msgstr "%s het die gesprek afgesluit."
 
-#: ../libpurple/protocols/bonjour/jabber.c:437
-#: ../libpurple/protocols/bonjour/jabber.c:660
-#: ../libpurple/protocols/bonjour/jabber.c:678
+#: ../libpurple/protocols/bonjour/jabber.c:439
+#: ../libpurple/protocols/bonjour/jabber.c:664
+#: ../libpurple/protocols/bonjour/jabber.c:682
 msgid "Unable to send the message, the conversation couldn't be started."
 msgstr "Kon nie die boodskap stuur nie, die gesprek kon nie begin word nie."
 
-#: ../libpurple/protocols/bonjour/jabber.c:583
+#: ../libpurple/protocols/bonjour/jabber.c:587
 msgid "Cannot open socket"
 msgstr "Kan nie sok open nie"
 
-#: ../libpurple/protocols/bonjour/jabber.c:591
+#: ../libpurple/protocols/bonjour/jabber.c:595
 msgid "Error setting socket options"
-msgstr "Fout met instel van sokkeuses"
-
-#: ../libpurple/protocols/bonjour/jabber.c:615
+msgstr "Kon nie sokopsies instel nie"
+
+#: ../libpurple/protocols/bonjour/jabber.c:619
 msgid "Could not bind socket to port"
 msgstr "Kon nie sok aan poort verbind nie"
 
-#: ../libpurple/protocols/bonjour/jabber.c:623
+#: ../libpurple/protocols/bonjour/jabber.c:627
 msgid "Could not listen on socket"
 msgstr "Kon nie op sok luister nie"
 
-#: ../libpurple/protocols/gg/gg.c:76 ../libpurple/proxy.c:1829
+#: ../libpurple/protocols/gg/gg.c:76 ../libpurple/proxy.c:1845
 msgid "Invalid proxy settings"
 msgstr "Ongeldige instaaninstellings"
 
-#: ../libpurple/protocols/gg/gg.c:77 ../libpurple/proxy.c:1829
+#: ../libpurple/protocols/gg/gg.c:77 ../libpurple/proxy.c:1845
 msgid ""
 "Either the host name or port number specified for your given proxy type is "
 "invalid."
@@ -3647,7 +3721,7 @@
 #: ../libpurple/protocols/gg/gg.c:116 ../libpurple/protocols/gg/gg.c:138
 #: ../libpurple/protocols/gg/gg.c:181
 msgid "Unable to fetch the token.\n"
-msgstr "Kon nie die teken gaan haal nie.\n"
+msgstr "Kon nie die teken haal nie.\n"
 
 #: ../libpurple/protocols/gg/gg.c:269 ../libpurple/protocols/gg/gg.c:288
 msgid "Save Buddylist..."
@@ -3704,7 +3778,7 @@
 #: ../libpurple/protocols/gg/gg.c:482 ../libpurple/protocols/gg/gg.c:775
 #: ../libpurple/protocols/jabber/jabber.c:913
 #: ../libpurple/protocols/jabber/jabber.c:916
-#: ../libpurple/protocols/jabber/jabber.c:1722
+#: ../libpurple/protocols/jabber/jabber.c:1700
 msgid "Password"
 msgstr "Wagwoord"
 
@@ -3714,7 +3788,7 @@
 
 #: ../libpurple/protocols/gg/gg.c:492 ../libpurple/protocols/gg/gg.c:785
 msgid "Enter current token"
-msgstr "Gee huidige teken"
+msgstr "Tik huidige teken"
 
 #: ../libpurple/protocols/gg/gg.c:498 ../libpurple/protocols/gg/gg.c:791
 msgid "Current token"
@@ -3726,13 +3800,13 @@
 
 #: ../libpurple/protocols/gg/gg.c:504
 msgid "Please, fill in the following fields"
-msgstr "Vul asb. die volgende velde in"
-
-#: ../libpurple/protocols/gg/gg.c:642 ../libpurple/protocols/gg/gg.c:1054
-#: ../libpurple/protocols/gg/gg.c:1126
+msgstr "Vul gerus die volgende velde in"
+
+#: ../libpurple/protocols/gg/gg.c:642 ../libpurple/protocols/gg/gg.c:1055
+#: ../libpurple/protocols/gg/gg.c:1127
 #: ../libpurple/protocols/jabber/jabber.c:957
-#: ../libpurple/protocols/oscar/oscar.c:3789
-#: ../libpurple/protocols/oscar/oscar.c:3802
+#: ../libpurple/protocols/oscar/oscar.c:3804
+#: ../libpurple/protocols/oscar/oscar.c:3817
 #: ../libpurple/protocols/qq/buddy_info.c:49
 msgid "City"
 msgstr "Stad"
@@ -3741,9 +3815,9 @@
 msgid "Year of birth"
 msgstr "Jaar van geboorte"
 
-#: ../libpurple/protocols/gg/gg.c:650 ../libpurple/protocols/msn/msn.c:1589
-#: ../libpurple/protocols/myspace/user.c:115
-#: ../libpurple/protocols/oscar/oscar.c:3732
+#: ../libpurple/protocols/gg/gg.c:650 ../libpurple/protocols/msn/msn.c:1735
+#: ../libpurple/protocols/myspace/user.c:119
+#: ../libpurple/protocols/oscar/oscar.c:3747
 #: ../libpurple/protocols/qq/buddy_info.c:46
 #: ../libpurple/protocols/qq/qq.c:226 ../libpurple/protocols/qq/qq.c:229
 #: ../libpurple/protocols/qq/qq.c:232 ../libpurple/protocols/qq/qq.c:236
@@ -3756,14 +3830,14 @@
 msgstr "Manlik of vroulik"
 
 #: ../libpurple/protocols/gg/gg.c:652
-#: ../libpurple/protocols/oscar/oscar.c:3732
+#: ../libpurple/protocols/oscar/oscar.c:3747
 #: ../libpurple/protocols/qq/buddy_info.c:83
 #: ../libpurple/protocols/qq/qq.c:226
 msgid "Male"
 msgstr "Manlik"
 
 #: ../libpurple/protocols/gg/gg.c:653
-#: ../libpurple/protocols/oscar/oscar.c:3732
+#: ../libpurple/protocols/oscar/oscar.c:3747
 #: ../libpurple/protocols/qq/buddy_info.c:84
 #: ../libpurple/protocols/qq/qq.c:229
 msgid "Female"
@@ -3775,11 +3849,11 @@
 
 #: ../libpurple/protocols/gg/gg.c:661 ../libpurple/protocols/gg/gg.c:662
 msgid "Find buddies"
-msgstr "Soek vriende"
+msgstr "Vind vriende"
 
 #: ../libpurple/protocols/gg/gg.c:663
 msgid "Please, enter your search criteria below"
-msgstr "Gee asb. u soekkriteria hier onder"
+msgstr "Tik gerus u soekkriteria hier onder"
 
 #: ../libpurple/protocols/gg/gg.c:701
 msgid "Fill in the fields."
@@ -3807,187 +3881,186 @@
 
 #: ../libpurple/protocols/gg/gg.c:795
 msgid "Please, enter your current password and your new password for UIN: "
-msgstr "Gee asb. u huidige wagwoord en u nuwe wagwoord vir UIN: "
+msgstr "Tik gerus u huidige wagwoord en u nuwe wagwoord vir UIN: "
 
 #: ../libpurple/protocols/gg/gg.c:799 ../libpurple/protocols/gg/gg.c:800
 msgid "Change Gadu-Gadu Password"
 msgstr "Verander Gadu-Gadu-wagwoord"
 
-#: ../libpurple/protocols/gg/gg.c:876
+#: ../libpurple/protocols/gg/gg.c:877
 #, c-format
 msgid "Select a chat for buddy: %s"
 msgstr "Kies 'n geselsie vir vriend: %s"
 
-#: ../libpurple/protocols/gg/gg.c:879 ../libpurple/protocols/gg/gg.c:880
+#: ../libpurple/protocols/gg/gg.c:880 ../libpurple/protocols/gg/gg.c:881
 msgid "Add to chat..."
 msgstr "Voeg by geselsie..."
 
-#: ../libpurple/protocols/gg/gg.c:1008
-#: ../libpurple/protocols/jabber/buddy.c:2031
-#: ../libpurple/protocols/novell/novell.c:2828
+#: ../libpurple/protocols/gg/gg.c:1009
+#: ../libpurple/protocols/jabber/buddy.c:2034
+#: ../libpurple/protocols/novell/novell.c:2833
 #: ../libpurple/protocols/oscar/oscar.c:828
-#: ../libpurple/protocols/oscar/oscar.c:5604
+#: ../libpurple/protocols/oscar/oscar.c:5659
 #: ../libpurple/protocols/qq/qq.c:170 ../libpurple/protocols/qq/qq.c:177
 #: ../libpurple/protocols/qq/qq.c:292
-#: ../libpurple/protocols/yahoo/yahoo.c:3099 ../libpurple/status.c:154
-#: ../pidgin/gtkblist.c:3104 ../pidgin/gtkblist.c:3436
-#: ../pidgin/gtkdocklet.c:450 ../pidgin/gtkstatusbox.c:1061
+#: ../libpurple/protocols/yahoo/yahoo.c:3101 ../libpurple/status.c:154
+#: ../pidgin/gtkblist.c:3322 ../pidgin/gtkblist.c:3660
+#: ../pidgin/gtkdocklet.c:561 ../pidgin/gtkstatusbox.c:1061
 msgid "Offline"
-msgstr "Aflyn"
-
-#: ../libpurple/protocols/gg/gg.c:1011
-#: ../libpurple/protocols/jabber/buddy.c:2033
+msgstr "Vanlyn"
+
+#: ../libpurple/protocols/gg/gg.c:1012
+#: ../libpurple/protocols/jabber/buddy.c:2036
 #: ../libpurple/protocols/msn/state.c:29 ../libpurple/protocols/msn/state.c:30
 #: ../libpurple/protocols/msn/state.c:37 ../libpurple/protocols/msn/state.c:38
-#: ../libpurple/protocols/novell/novell.c:2816
+#: ../libpurple/protocols/novell/novell.c:2821
 #: ../libpurple/protocols/qq/qq.c:280
-#: ../libpurple/protocols/yahoo/yahoo.c:3101 ../libpurple/status.c:155
-#: ../pidgin/gtkdocklet.c:438 ../pidgin/gtkstatusbox.c:1057
+#: ../libpurple/protocols/yahoo/yahoo.c:3103 ../libpurple/status.c:155
+#: ../pidgin/gtkdocklet.c:545 ../pidgin/gtkstatusbox.c:1057
 msgid "Available"
 msgstr "Beskikbaar"
 
 #. get_yahoo_status_from_purple_status() returns YAHOO_STATUS_CUSTOM for
 #. * the generic away state (YAHOO_STATUS_TYPE_AWAY) with no message
 #. Away stuff
-#: ../libpurple/protocols/gg/gg.c:1014 ../libpurple/protocols/irc/irc.c:528
+#: ../libpurple/protocols/gg/gg.c:1015 ../libpurple/protocols/irc/irc.c:528
 #: ../libpurple/protocols/irc/msgs.c:310
-#: ../libpurple/protocols/jabber/buddy.c:2037
-#: ../libpurple/protocols/novell/novell.c:2819
+#: ../libpurple/protocols/jabber/buddy.c:2040
+#: ../libpurple/protocols/novell/novell.c:2824
 #: ../libpurple/protocols/oscar/oscar.c:733
-#: ../libpurple/protocols/oscar/oscar.c:4547
-#: ../libpurple/protocols/oscar/oscar.c:5632
+#: ../libpurple/protocols/oscar/oscar.c:4562
+#: ../libpurple/protocols/oscar/oscar.c:5687
 #: ../libpurple/protocols/qq/qq.c:180 ../libpurple/protocols/qq/qq.c:284
-#: ../libpurple/protocols/silc/buddy.c:1476
-#: ../libpurple/protocols/silc10/buddy.c:1476
-#: ../libpurple/protocols/yahoo/yahoo.c:3653
-#: ../libpurple/protocols/yahoo/yahoo.c:3727 ../libpurple/status.c:158
-#: ../pidgin/gtkdocklet.c:442 ../pidgin/gtkprefs.c:1939
+#: ../libpurple/protocols/silc/buddy.c:1479
+#: ../libpurple/protocols/silc10/buddy.c:1479
+#: ../libpurple/protocols/yahoo/yahoo.c:3655
+#: ../libpurple/protocols/yahoo/yahoo.c:3729 ../libpurple/status.c:158
+#: ../pidgin/gtkdocklet.c:549 ../pidgin/gtkprefs.c:2040
 #: ../pidgin/gtkstatusbox.c:1058
-#, c-format
 msgid "Away"
 msgstr "Weg"
 
-#: ../libpurple/protocols/gg/gg.c:1043 ../libpurple/protocols/gg/gg.c:1117
-#: ../libpurple/protocols/oscar/oscar.c:2699
-#: ../libpurple/protocols/oscar/oscar.c:3699
+#: ../libpurple/protocols/gg/gg.c:1044 ../libpurple/protocols/gg/gg.c:1118
+#: ../libpurple/protocols/oscar/oscar.c:2714
+#: ../libpurple/protocols/oscar/oscar.c:3714
 msgid "UIN"
 msgstr "UIN"
 
-#: ../libpurple/protocols/gg/gg.c:1046 ../libpurple/protocols/gg/gg.c:1120
-#: ../libpurple/protocols/jabber/buddy.c:2210
-#: ../libpurple/protocols/jabber/buddy.c:2386
-#: ../libpurple/protocols/oscar/oscar.c:3710
+#: ../libpurple/protocols/gg/gg.c:1047 ../libpurple/protocols/gg/gg.c:1121
+#: ../libpurple/protocols/jabber/buddy.c:2213
+#: ../libpurple/protocols/jabber/buddy.c:2399
+#: ../libpurple/protocols/oscar/oscar.c:3725
 #: ../libpurple/protocols/silc/ops.c:990
 #: ../libpurple/protocols/silc10/ops.c:1024
 msgid "First Name"
 msgstr "Naam"
 
-#: ../libpurple/protocols/gg/gg.c:1059 ../libpurple/protocols/gg/gg.c:1129
+#: ../libpurple/protocols/gg/gg.c:1060 ../libpurple/protocols/gg/gg.c:1130
 msgid "Birth Year"
 msgstr "Jaar van geboorte"
 
-#: ../libpurple/protocols/gg/gg.c:1111 ../libpurple/protocols/gg/gg.c:1180
-#: ../libpurple/protocols/oscar/oscar.c:3911
+#: ../libpurple/protocols/gg/gg.c:1112 ../libpurple/protocols/gg/gg.c:1181
+#: ../libpurple/protocols/oscar/oscar.c:3926
 msgid "Unable to display the search results."
 msgstr "Kon nie die soekresultate wys nie."
 
-#: ../libpurple/protocols/gg/gg.c:1171
+#: ../libpurple/protocols/gg/gg.c:1172
 msgid "Gadu-Gadu Public Directory"
 msgstr "Gadu-Gadu- publieke gids"
 
-#: ../libpurple/protocols/gg/gg.c:1172
+#: ../libpurple/protocols/gg/gg.c:1173
 msgid "Search results"
 msgstr "Soekresultate"
 
-#: ../libpurple/protocols/gg/gg.c:1215
+#: ../libpurple/protocols/gg/gg.c:1216
 msgid "No matching users found"
 msgstr "Geen passende gebruikers gevind nie"
 
-#: ../libpurple/protocols/gg/gg.c:1216
+#: ../libpurple/protocols/gg/gg.c:1217
 msgid "There are no users matching your search criteria."
 msgstr "Daar is geen gebruikers wat by u soekkriteria pas nie."
 
-#: ../libpurple/protocols/gg/gg.c:1310 ../libpurple/protocols/gg/gg.c:1463
+#: ../libpurple/protocols/gg/gg.c:1311 ../libpurple/protocols/gg/gg.c:1464
 msgid "Unable to read socket"
 msgstr "Kan nie sok lees nie"
 
-#: ../libpurple/protocols/gg/gg.c:1395
+#: ../libpurple/protocols/gg/gg.c:1396
 msgid "Buddy list downloaded"
 msgstr "Vriendelys afgelaai"
 
-#: ../libpurple/protocols/gg/gg.c:1396
+#: ../libpurple/protocols/gg/gg.c:1397
 msgid "Your buddy list was downloaded from the server."
 msgstr "U vriendelys is van die bediener afgelaai."
 
-#: ../libpurple/protocols/gg/gg.c:1403
+#: ../libpurple/protocols/gg/gg.c:1404
 msgid "Buddy list uploaded"
 msgstr "Vriendelys opgelaai"
 
-#: ../libpurple/protocols/gg/gg.c:1404
+#: ../libpurple/protocols/gg/gg.c:1405
 msgid "Your buddy list was stored on the server."
 msgstr "U vriendelys is na die bediener opgelaai."
 
-#: ../libpurple/protocols/gg/gg.c:1509 ../libpurple/protocols/gg/gg.c:1715
+#: ../libpurple/protocols/gg/gg.c:1510 ../libpurple/protocols/gg/gg.c:1716
 msgid "Connection failed."
-msgstr "Verbinding misluk."
-
-#: ../libpurple/protocols/gg/gg.c:1621 ../libpurple/protocols/msn/msn.c:559
+msgstr "Verbinding het misluk."
+
+#: ../libpurple/protocols/gg/gg.c:1622 ../libpurple/protocols/msn/msn.c:664
 msgid "Blocked"
 msgstr "Geblokkeer"
 
-#: ../libpurple/protocols/gg/gg.c:1644
+#: ../libpurple/protocols/gg/gg.c:1645
 msgid "Add to chat"
 msgstr "Voeg by geselsie"
 
-#: ../libpurple/protocols/gg/gg.c:1653
+#: ../libpurple/protocols/gg/gg.c:1654
 msgid "Unblock"
 msgstr "Ontblokkeer"
 
-#: ../libpurple/protocols/gg/gg.c:1657
+#: ../libpurple/protocols/gg/gg.c:1658
 msgid "Block"
 msgstr "Blokkeer"
 
-#: ../libpurple/protocols/gg/gg.c:1674
+#: ../libpurple/protocols/gg/gg.c:1675
 msgid "Chat _name:"
 msgstr "Geselsie_naam:"
 
-#: ../libpurple/protocols/gg/gg.c:1914
+#: ../libpurple/protocols/gg/gg.c:1924
 msgid "Chat error"
 msgstr "Geselsiefout"
 
-#: ../libpurple/protocols/gg/gg.c:1915
+#: ../libpurple/protocols/gg/gg.c:1925
 msgid "This chat name is already in use"
 msgstr "Hierdie geselsienaam word reeds gebruik"
 
-#: ../libpurple/protocols/gg/gg.c:1998
+#: ../libpurple/protocols/gg/gg.c:2008
 msgid "Not connected to the server."
-msgstr "Nie aan die bediener verbind nie."
-
-#: ../libpurple/protocols/gg/gg.c:2021
+msgstr "Nie aan die bediener koppel nie."
+
+#: ../libpurple/protocols/gg/gg.c:2031
 msgid "Find buddies..."
-msgstr "Soek vriende..."
-
-#: ../libpurple/protocols/gg/gg.c:2027
+msgstr "Vind vriende..."
+
+#: ../libpurple/protocols/gg/gg.c:2037
 msgid "Change password..."
 msgstr "Verander wagwoord..."
 
-#: ../libpurple/protocols/gg/gg.c:2033
+#: ../libpurple/protocols/gg/gg.c:2043
 msgid "Upload buddylist to Server"
 msgstr "Laai vriendelys op na bediener"
 
-#: ../libpurple/protocols/gg/gg.c:2037
+#: ../libpurple/protocols/gg/gg.c:2047
 msgid "Download buddylist from Server"
 msgstr "Laai vriendelys af van bediener"
 
-#: ../libpurple/protocols/gg/gg.c:2041
+#: ../libpurple/protocols/gg/gg.c:2051
 msgid "Delete buddylist from Server"
 msgstr "Verwyder vriendelys van bediener"
 
-#: ../libpurple/protocols/gg/gg.c:2045
+#: ../libpurple/protocols/gg/gg.c:2055
 msgid "Save buddylist to file..."
 msgstr "Stoor vriendelys in lêer..."
 
-#: ../libpurple/protocols/gg/gg.c:2049
+#: ../libpurple/protocols/gg/gg.c:2059
 msgid "Load buddylist from file..."
 msgstr "Laai vriendelys van lêer..."
 
@@ -4002,38 +4075,38 @@
 #. id
 #. name
 #. version
-#: ../libpurple/protocols/gg/gg.c:2153
+#: ../libpurple/protocols/gg/gg.c:2163
 msgid "Gadu-Gadu Protocol Plugin"
 msgstr "Gadu-Gadu-protokolinprop"
 
 #. summary
-#: ../libpurple/protocols/gg/gg.c:2154
+#: ../libpurple/protocols/gg/gg.c:2164
 msgid "Polish popular IM"
 msgstr "Gewilde Poolse stelsel vir kitsboodskappe"
 
-#: ../libpurple/protocols/gg/gg.c:2208
+#: ../libpurple/protocols/gg/gg.c:2218
 msgid "Gadu-Gadu User"
 msgstr "Gadu-Gadu-gebruiker"
 
 #: ../libpurple/protocols/irc/cmds.c:43
-#: ../libpurple/protocols/silc/silc.c:1637
-#: ../libpurple/protocols/silc10/silc.c:1566
+#: ../libpurple/protocols/silc/silc.c:1768
+#: ../libpurple/protocols/silc10/silc.c:1569
 #, c-format
 msgid "Unknown command: %s"
-msgstr "Onbekende opdrag: %s"
+msgstr "Onbekende bevel: %s"
 
 #: ../libpurple/protocols/irc/cmds.c:503
 #: ../libpurple/protocols/jabber/chat.c:591
-#: ../libpurple/protocols/silc/silc.c:1345
-#: ../libpurple/protocols/silc10/silc.c:1274
+#: ../libpurple/protocols/silc/silc.c:1476
+#: ../libpurple/protocols/silc10/silc.c:1277
 #, c-format
 msgid "current topic is: %s"
 msgstr "onderwerp tans: %s"
 
 #: ../libpurple/protocols/irc/cmds.c:507
 #: ../libpurple/protocols/jabber/chat.c:595
-#: ../libpurple/protocols/silc/silc.c:1349
-#: ../libpurple/protocols/silc10/silc.c:1278
+#: ../libpurple/protocols/silc/silc.c:1480
+#: ../libpurple/protocols/silc10/silc.c:1281
 msgid "No topic is set"
 msgstr "Geen onderwerp gestel nie"
 
@@ -4052,7 +4125,7 @@
 
 #: ../libpurple/protocols/irc/irc.c:79
 msgid "Error displaying MOTD"
-msgstr "Fout met wys van dagboodskap"
+msgstr "Kon nie dagboodskap wys nie"
 
 #: ../libpurple/protocols/irc/irc.c:79
 msgid "No MOTD available"
@@ -4069,9 +4142,9 @@
 
 #: ../libpurple/protocols/irc/irc.c:127 ../libpurple/protocols/irc/irc.c:165
 #: ../libpurple/protocols/irc/irc.c:612 ../libpurple/protocols/irc/irc.c:637
-#: ../libpurple/protocols/myspace/myspace.c:2356
+#: ../libpurple/protocols/myspace/myspace.c:2361
 msgid "Server has disconnected"
-msgstr "Bediener is afgesny"
+msgstr "Bediener is ontkoppel"
 
 #: ../libpurple/protocols/irc/irc.c:249
 msgid "View MOTD"
@@ -4083,29 +4156,29 @@
 msgstr "_Kanaal:"
 
 #: ../libpurple/protocols/irc/irc.c:267
-#: ../libpurple/protocols/jabber/chat.c:59 ../pidgin/gtkaccount.c:524
+#: ../libpurple/protocols/jabber/chat.c:59 ../pidgin/gtkaccount.c:527
 msgid "_Password:"
 msgstr "_Wagwoord:"
 
 #: ../libpurple/protocols/irc/irc.c:298
 msgid "IRC nicks may not contain whitespace"
-msgstr "IRC-bynaam kan nie spasies bevat nie"
+msgstr "IRC-byname kan nie spasies bevat nie"
 
 #. 1. connect to server
 #. connect to the server
 #: ../libpurple/protocols/irc/irc.c:319
 #: ../libpurple/protocols/jabber/jabber.c:1280
-#: ../libpurple/protocols/msn/session.c:345
-#: ../libpurple/protocols/myspace/myspace.c:301
-#: ../libpurple/protocols/novell/novell.c:2182
-#: ../libpurple/protocols/oscar/oscar.c:1287
+#: ../libpurple/protocols/msn/session.c:394
+#: ../libpurple/protocols/myspace/myspace.c:302
+#: ../libpurple/protocols/novell/novell.c:2187
+#: ../libpurple/protocols/oscar/oscar.c:1290
 #: ../libpurple/protocols/qq/qq.c:136
 #: ../libpurple/protocols/sametime/sametime.c:3723
-#: ../libpurple/protocols/simple/simple.c:1716
-#: ../libpurple/protocols/yahoo/yahoo.c:2939
+#: ../libpurple/protocols/simple/simple.c:1871
+#: ../libpurple/protocols/yahoo/yahoo.c:2941
 #: ../libpurple/protocols/zephyr/zephyr.c:1621 ../pidgin/gtkstatusbox.c:662
 msgid "Connecting"
-msgstr "Verbind tans"
+msgstr "Koppel tans"
 
 #: ../libpurple/protocols/irc/irc.c:327
 #: ../libpurple/protocols/jabber/jabber.c:610
@@ -4116,25 +4189,25 @@
 #. TODO: try other ports if in auto mode, then save
 #. * working port and try that first next time.
 #: ../libpurple/protocols/irc/irc.c:338
-#: ../libpurple/protocols/myspace/myspace.c:317
-#: ../libpurple/protocols/simple/simple.c:464
-#: ../libpurple/protocols/simple/simple.c:1631
+#: ../libpurple/protocols/myspace/myspace.c:318
+#: ../libpurple/protocols/simple/simple.c:465
+#: ../libpurple/protocols/simple/simple.c:1786
 msgid "Couldn't create socket"
 msgstr "Kon nie netwerksok skep nie"
 
 #: ../libpurple/protocols/irc/irc.c:421
-#: ../libpurple/protocols/myspace/myspace.c:2469
-#: ../libpurple/protocols/oscar/oscar.c:1283
+#: ../libpurple/protocols/myspace/myspace.c:2474
+#: ../libpurple/protocols/oscar/oscar.c:1286
 msgid "Couldn't connect to host"
-msgstr "Kon nie aan gasheer verbind nie"
+msgstr "Kon nie aan gasheer koppel nie"
 
 #: ../libpurple/protocols/irc/irc.c:609 ../libpurple/protocols/irc/irc.c:634
-#: ../libpurple/protocols/myspace/myspace.c:2352
+#: ../libpurple/protocols/myspace/myspace.c:2357
 msgid "Read error"
 msgstr "Leesfout"
 
 #: ../libpurple/protocols/irc/irc.c:773
-#: ../libpurple/protocols/silc/chat.c:1412
+#: ../libpurple/protocols/silc/chat.c:1398
 #: ../libpurple/protocols/silc10/chat.c:1426
 #: ../libpurple/protocols/yahoo/yahoochat.c:1497
 msgid "Users"
@@ -4142,8 +4215,8 @@
 
 #: ../libpurple/protocols/irc/irc.c:776
 #: ../libpurple/protocols/sametime/sametime.c:3374
-#: ../libpurple/protocols/silc/chat.c:1415
-#: ../libpurple/protocols/silc/ops.c:1389
+#: ../libpurple/protocols/silc/chat.c:1401
+#: ../libpurple/protocols/silc/ops.c:1393
 #: ../libpurple/protocols/silc10/chat.c:1429
 #: ../libpurple/protocols/silc10/ops.c:1382
 #: ../libpurple/protocols/yahoo/yahoochat.c:1506
@@ -4169,26 +4242,26 @@
 
 #. host to connect to
 #: ../libpurple/protocols/irc/irc.c:940 ../libpurple/protocols/irc/msgs.c:323
-#: ../libpurple/protocols/msn/msn.c:2185
-#: ../libpurple/protocols/oscar/oscar.c:6671
+#: ../libpurple/protocols/msn/msn.c:2333
+#: ../libpurple/protocols/oscar/oscar.c:6726
 #: ../libpurple/protocols/qq/qq.c:755
 #: ../libpurple/protocols/sametime/sametime.c:5727
 #: ../libpurple/protocols/silc/ops.c:1249
-#: ../libpurple/protocols/silc/ops.c:1341
+#: ../libpurple/protocols/silc/ops.c:1343
 #: ../libpurple/protocols/silc10/ops.c:1244
 #: ../libpurple/protocols/silc10/ops.c:1347
-#: ../libpurple/protocols/simple/simple.c:1896
+#: ../libpurple/protocols/simple/simple.c:2061
 #: ../libpurple/protocols/toc/toc.c:2327
 msgid "Server"
 msgstr "Bediener"
 
 #. port to connect to
-#: ../libpurple/protocols/irc/irc.c:943 ../libpurple/protocols/msn/msn.c:2190
-#: ../libpurple/protocols/oscar/oscar.c:6674
+#: ../libpurple/protocols/irc/irc.c:943 ../libpurple/protocols/msn/msn.c:2338
+#: ../libpurple/protocols/oscar/oscar.c:6729
 #: ../libpurple/protocols/qq/qq.c:758
 #: ../libpurple/protocols/sametime/sametime.c:5732
-#: ../libpurple/protocols/silc/silc.c:1918
-#: ../libpurple/protocols/silc10/silc.c:1861
+#: ../libpurple/protocols/silc/silc.c:2049
+#: ../libpurple/protocols/silc10/silc.c:1864
 #: ../libpurple/protocols/toc/toc.c:2331
 msgid "Port"
 msgstr "Poort"
@@ -4200,13 +4273,13 @@
 #: ../libpurple/protocols/irc/irc.c:949 ../libpurple/protocols/irc/msgs.c:316
 #: ../libpurple/protocols/jabber/jabber.c:904
 #: ../libpurple/protocols/jabber/jabber.c:907
-#: ../libpurple/protocols/silc/buddy.c:1539
+#: ../libpurple/protocols/silc/buddy.c:1542
 #: ../libpurple/protocols/silc/ops.c:1197
 #: ../libpurple/protocols/silc/ops.c:1200
-#: ../libpurple/protocols/silc/ops.c:1334
-#: ../libpurple/protocols/silc/ops.c:1337
-#: ../libpurple/protocols/silc/silc.c:1005
-#: ../libpurple/protocols/silc10/buddy.c:1539
+#: ../libpurple/protocols/silc/ops.c:1336
+#: ../libpurple/protocols/silc/ops.c:1339
+#: ../libpurple/protocols/silc/silc.c:1136
+#: ../libpurple/protocols/silc10/buddy.c:1542
 #: ../libpurple/protocols/silc10/ops.c:1191
 #: ../libpurple/protocols/silc10/ops.c:1194
 #: ../libpurple/protocols/silc10/ops.c:1340
@@ -4216,7 +4289,7 @@
 msgstr "Gebruikernaam"
 
 #: ../libpurple/protocols/irc/irc.c:952 ../libpurple/protocols/irc/msgs.c:317
-#: ../libpurple/protocols/silc/silc.c:1009
+#: ../libpurple/protocols/silc/silc.c:1140
 #: ../libpurple/protocols/silc10/silc.c:920
 msgid "Real name"
 msgstr "Regte naam"
@@ -4256,8 +4329,8 @@
 msgstr " <i>(geïdentifiseer)</i>"
 
 #: ../libpurple/protocols/irc/msgs.c:303
-#: ../libpurple/protocols/oscar/oscar.c:3700
-#: ../libpurple/protocols/silc/ops.c:1418
+#: ../libpurple/protocols/oscar/oscar.c:3715
+#: ../libpurple/protocols/silc/ops.c:1422
 #: ../libpurple/protocols/silc10/ops.c:1414
 msgid "Nick"
 msgstr "Bynaam"
@@ -4319,7 +4392,7 @@
 
 #: ../libpurple/protocols/irc/msgs.c:575
 msgid "Time Response"
-msgstr "Tydreaksie"
+msgstr "Tydrespons"
 
 #: ../libpurple/protocols/irc/msgs.c:576
 msgid "The IRC server's local time is:"
@@ -4355,28 +4428,28 @@
 msgid "Invitation only"
 msgstr "Net op uitnodiging"
 
-#: ../libpurple/protocols/irc/msgs.c:795
+#: ../libpurple/protocols/irc/msgs.c:798
 #, c-format
 msgid "You have been kicked by %s: (%s)"
 msgstr "U is geskop deur %s: (%s)"
 
 #. Remove user from channel
-#: ../libpurple/protocols/irc/msgs.c:800 ../libpurple/protocols/silc/ops.c:699
+#: ../libpurple/protocols/irc/msgs.c:803 ../libpurple/protocols/silc/ops.c:699
 #: ../libpurple/protocols/silc10/ops.c:720
 #, c-format
 msgid "Kicked by %s (%s)"
 msgstr "Geskop deur %s (%s)"
 
-#: ../libpurple/protocols/irc/msgs.c:823
+#: ../libpurple/protocols/irc/msgs.c:826
 #, c-format
 msgid "mode (%s %s) by %s"
 msgstr "modus (%s %s) deur %s"
 
-#: ../libpurple/protocols/irc/msgs.c:908 ../libpurple/protocols/irc/msgs.c:909
+#: ../libpurple/protocols/irc/msgs.c:911 ../libpurple/protocols/irc/msgs.c:912
 msgid "Invalid nickname"
 msgstr "Ongeldige bynaam"
 
-#: ../libpurple/protocols/irc/msgs.c:910
+#: ../libpurple/protocols/irc/msgs.c:913
 msgid ""
 "Your selected nickname was rejected by the server.  It probably contains "
 "invalid characters."
@@ -4384,7 +4457,7 @@
 "U gekose bynaam is geweier deur die bediner.  Dit bevat waarskynlik "
 "ongeldige karakters."
 
-#: ../libpurple/protocols/irc/msgs.c:915
+#: ../libpurple/protocols/irc/msgs.c:918
 msgid ""
 "Your selected account name was rejected by the server.  It probably contains "
 "invalid characters."
@@ -4392,51 +4465,51 @@
 "U gekose rekeningnaam is geweier deur die bediner.  Dit bevat waarskynlik "
 "ongeldige karakters."
 
-#: ../libpurple/protocols/irc/msgs.c:954
+#: ../libpurple/protocols/irc/msgs.c:957
 msgid "Cannot change nick"
 msgstr "Kan nie bynaam verander nie"
 
-#: ../libpurple/protocols/irc/msgs.c:954
+#: ../libpurple/protocols/irc/msgs.c:957
 msgid "Could not change nick"
 msgstr "Kon nie bynaam verander nie"
 
-#: ../libpurple/protocols/irc/msgs.c:975
+#: ../libpurple/protocols/irc/msgs.c:978
 #, c-format
 msgid "You have parted the channel%s%s"
 msgstr "U het die kanaal%s%s verlaat"
 
-#: ../libpurple/protocols/irc/msgs.c:1017
+#: ../libpurple/protocols/irc/msgs.c:1020
 msgid "Error: invalid PONG from server"
 msgstr "Fout: ongeldige PONG vanaf bediener"
 
-#: ../libpurple/protocols/irc/msgs.c:1019
+#: ../libpurple/protocols/irc/msgs.c:1022
 #, c-format
 msgid "PING reply -- Lag: %lu seconds"
 msgstr "PIENG-antwoord -- vertraging: %lu sekondes"
 
-#: ../libpurple/protocols/irc/msgs.c:1110
+#: ../libpurple/protocols/irc/msgs.c:1113
 #, c-format
 msgid "Cannot join %s: Registration is required."
 msgstr "Kan nie by %s aansluit nie: Registrasie word vereis."
 
-#: ../libpurple/protocols/irc/msgs.c:1111
+#: ../libpurple/protocols/irc/msgs.c:1114
 #: ../libpurple/protocols/silc/ops.c:1093
 #: ../libpurple/protocols/silc10/ops.c:1128
 msgid "Cannot join channel"
 msgstr "Kan nie by kanaal aansluit nie"
 
-#: ../libpurple/protocols/irc/msgs.c:1145
+#: ../libpurple/protocols/irc/msgs.c:1148
 msgid "Nick or channel is temporarily unavailable."
 msgstr "Bynaam of kanaal is tydelik nie beskikbaar nie."
 
-#: ../libpurple/protocols/irc/msgs.c:1157
+#: ../libpurple/protocols/irc/msgs.c:1160
 #, c-format
 msgid "Wallops from %s"
 msgstr "Loesing van %s"
 
 #: ../libpurple/protocols/irc/parse.c:122
 msgid "action &lt;action to perform&gt;:  Perform an action."
-msgstr "action &lt;aksie om uit te voer&gt;:  Voer 'n aksie uit."
+msgstr "action &lt;aksie om uit te voer&gt;:  Verrig 'n aksie."
 
 #: ../libpurple/protocols/irc/parse.c:123
 msgid ""
@@ -4448,7 +4521,7 @@
 
 #: ../libpurple/protocols/irc/parse.c:124
 msgid "chanserv: Send a command to chanserv"
-msgstr "chanserv: Stuur 'n opdrag aan chanserv"
+msgstr "chanserv: Stuur 'n bevel aan chanserv"
 
 #: ../libpurple/protocols/irc/parse.c:125
 msgid ""
@@ -4482,7 +4555,7 @@
 "channels, optionally providing a channel key for each if needed."
 msgstr ""
 "j &lt;kamer1&gt;[,kamer2][,...] [sleutel1[,sleutel2][,...]]:  Sluit aan by "
-"een of meer kanale, en gee opsioneel 'n kanaalsleutel vir elk indien nodig."
+"een of meer kanale, en tik opsioneel 'n kanaalsleutel vir elk indien nodig."
 
 #: ../libpurple/protocols/irc/parse.c:129
 msgid ""
@@ -4490,7 +4563,7 @@
 "channels, optionally providing a channel key for each if needed."
 msgstr ""
 "join &lt;kamer1&gt;[,kamer2][,...] [sleutel1[,sleutel2][,...]]:  Sluit aan "
-"by een of meer kanale, en gee opsioneel 'n kanaalsleutel vir elk indien "
+"by een of meer kanale, en tik opsioneel 'n kanaalsleutel vir elk indien "
 "nodig."
 
 #: ../libpurple/protocols/irc/parse.c:130
@@ -4507,15 +4580,15 @@
 "may disconnect you upon doing this.</i>"
 msgstr ""
 "list:  Wys 'n lys geselsiekamers op die netwerk. <i>Let wel: sekere "
-"bedieners kan u afsny as u dit doen.</i>"
+"bedieners kan u ontkoppel as u dit doen.</i>"
 
 #: ../libpurple/protocols/irc/parse.c:132
 msgid "me &lt;action to perform&gt;:  Perform an action."
-msgstr "me &lt;aksie om uit te voer&gt;:  Voer 'n aksie uit."
+msgstr "me &lt;aksie om uit te voer&gt;:  Verrig 'n aksie."
 
 #: ../libpurple/protocols/irc/parse.c:133
 msgid "memoserv: Send a command to memoserv"
-msgstr "memoserv: Stuur 'n opdrag aan memoserv"
+msgstr "memoserv: Stuur 'n bevel aan memoserv"
 
 #: ../libpurple/protocols/irc/parse.c:134
 msgid ""
@@ -4538,13 +4611,13 @@
 msgstr "names [kanaal]:  Lys die gebruikers tans in 'n kanaal."
 
 #: ../libpurple/protocols/irc/parse.c:137
-#: ../libpurple/protocols/jabber/jabber.c:2261
+#: ../libpurple/protocols/jabber/jabber.c:2282
 msgid "nick &lt;new nickname&gt;:  Change your nickname."
 msgstr "nick &lt;nuwe bynaam&gt;:  Verander u bynaam."
 
 #: ../libpurple/protocols/irc/parse.c:138
 msgid "nickserv: Send a command to nickserv"
-msgstr "nickserv: Stuur 'n opdrag aan nickserv"
+msgstr "nickserv: Stuur 'n bevel aan nickserv"
 
 #: ../libpurple/protocols/irc/parse.c:139
 msgid ""
@@ -4564,7 +4637,7 @@
 
 #: ../libpurple/protocols/irc/parse.c:141
 msgid "operserv: Send a command to operserv"
-msgstr "operserv: Stuur 'n opdrag aan operserv"
+msgstr "operserv: Stuur 'n bevel aan operserv"
 
 #: ../libpurple/protocols/irc/parse.c:142
 msgid ""
@@ -4592,8 +4665,7 @@
 
 #: ../libpurple/protocols/irc/parse.c:145
 msgid "quit [message]:  Disconnect from the server, with an optional message."
-msgstr ""
-"quit [boodskap]:  Sluit verbinding met bediener, met 'n opsionele boodskap."
+msgstr "quit [boodskap]:  Ontkoppel van bediener, met 'n opsionele boodskap."
 
 #: ../libpurple/protocols/irc/parse.c:146
 msgid "quote [...]:  Send a raw command to the server."
@@ -4649,43 +4721,41 @@
 msgstr ""
 "whowas &lt;bynaam&gt;: Kry inligting oor 'n gebruiker wat afgemeld het."
 
-#: ../libpurple/protocols/irc/parse.c:465
+#: ../libpurple/protocols/irc/parse.c:520
 #, c-format
 msgid "Reply time from %s: %lu seconds"
 msgstr "Antwoordtyd van %s: %lu sekondes"
 
-#: ../libpurple/protocols/irc/parse.c:466
+#: ../libpurple/protocols/irc/parse.c:521
 msgid "PONG"
 msgstr "PONG"
 
-#: ../libpurple/protocols/irc/parse.c:466
+#: ../libpurple/protocols/irc/parse.c:521
 msgid "CTCP PING reply"
 msgstr "CTCP PING-antwoord"
 
-#: ../libpurple/protocols/irc/parse.c:577
-#: ../libpurple/protocols/irc/parse.c:581 ../libpurple/protocols/toc/toc.c:191
+#: ../libpurple/protocols/irc/parse.c:632
+#: ../libpurple/protocols/irc/parse.c:636 ../libpurple/protocols/toc/toc.c:191
 #: ../libpurple/protocols/toc/toc.c:694 ../libpurple/protocols/toc/toc.c:710
 #: ../libpurple/protocols/toc/toc.c:786
 msgid "Disconnected."
-msgstr "Afgesny."
-
-#: ../libpurple/protocols/jabber/adhoccommands.c:137
+msgstr "Ontkoppel."
+
+#: ../libpurple/protocols/jabber/adhoccommands.c:143
 #: ../libpurple/protocols/jabber/jabber.c:671
 #: ../libpurple/protocols/jabber/jabber.c:701
-#: ../libpurple/protocols/jabber/jabber.c:1887
+#: ../libpurple/protocols/jabber/jabber.c:1865
 msgid "Unknown Error"
 msgstr "Onbekende fout"
 
-#: ../libpurple/protocols/jabber/adhoccommands.c:139
-#: ../libpurple/protocols/jabber/adhoccommands.c:140
-#, fuzzy
+#: ../libpurple/protocols/jabber/adhoccommands.c:145
+#: ../libpurple/protocols/jabber/adhoccommands.c:146
 msgid "Ad-Hoc Command Failed"
-msgstr "Opdrag gedeaktiveer"
-
-#: ../libpurple/protocols/jabber/adhoccommands.c:173
-#, fuzzy
+msgstr "Ad hoc-bevel het misluk"
+
+#: ../libpurple/protocols/jabber/adhoccommands.c:182
 msgid "execute"
-msgstr "Nie verwag nie"
+msgstr "uitvoer"
 
 #: ../libpurple/protocols/jabber/auth.c:53
 msgid "Server requires TLS/SSL for login.  No TLS/SSL support found."
@@ -4719,7 +4789,7 @@
 #: ../libpurple/protocols/jabber/auth.c:523
 #: ../libpurple/protocols/jabber/auth.c:610
 msgid "Server does not use any supported authentication method"
-msgstr "Bediener gebruik nie enige ondersteunde stawingmetode nie"
+msgstr "Bediener gebruik nie enige gesteunde stawingmetode nie"
 
 #. This should never happen!
 #: ../libpurple/protocols/jabber/auth.c:462
@@ -4730,7 +4800,7 @@
 #: ../libpurple/protocols/jabber/auth.c:961
 #: ../libpurple/protocols/jabber/jabber.c:123
 msgid "Invalid response from server."
-msgstr "Ongeldige antwoord van die bediener."
+msgstr "Ongeldige respons van die bediener."
 
 #: ../libpurple/protocols/jabber/auth.c:600
 msgid ""
@@ -4801,7 +4871,7 @@
 
 #: ../libpurple/protocols/jabber/buddy.c:293
 #: ../libpurple/protocols/jabber/buddy.c:1295
-#: ../libpurple/protocols/silc/silc.c:1015
+#: ../libpurple/protocols/silc/silc.c:1146
 #: ../libpurple/protocols/silc10/silc.c:926
 msgid "Country"
 msgstr "Land"
@@ -4810,7 +4880,7 @@
 #: ../libpurple/protocols/jabber/buddy.c:1306
 #: ../libpurple/protocols/jabber/buddy.c:1313
 msgid "Telephone"
-msgstr "Telefoon"
+msgstr "Foon"
 
 #: ../libpurple/protocols/jabber/buddy.c:296
 #: ../libpurple/protocols/jabber/buddy.c:1350
@@ -4829,16 +4899,16 @@
 
 #: ../libpurple/protocols/jabber/buddy.c:300
 #: ../libpurple/protocols/jabber/buddy.c:1250
-#: ../libpurple/protocols/msn/msn.c:1658
-#: ../libpurple/protocols/oscar/oscar.c:3749
+#: ../libpurple/protocols/msn/msn.c:1804
+#: ../libpurple/protocols/oscar/oscar.c:3764
 msgid "Birthday"
 msgstr "Verjaardag"
 
 #: ../libpurple/protocols/jabber/buddy.c:301
 #: ../libpurple/protocols/jabber/buddy.c:1365
 #: ../libpurple/protocols/jabber/chat.c:775
-#: ../libpurple/protocols/jabber/usermood.c:175 ../pidgin/gtkblist.c:3116
-#: ../pidgin/gtkprefs.c:739
+#: ../libpurple/protocols/jabber/usermood.c:193 ../pidgin/gtkblist.c:3334
+#: ../pidgin/gtkprefs.c:740
 msgid "Description"
 msgstr "Beskrywing"
 
@@ -4852,7 +4922,7 @@
 "All items below are optional. Enter only the information with which you feel "
 "comfortable."
 msgstr ""
-"Alle onderstaande items is opsioneel. Gee net die inligting waarmee u "
+"Alle onderstaande items is opsioneel. Tik net die inligting waarmee u "
 "gemaklik voel."
 
 #: ../libpurple/protocols/jabber/buddy.c:795
@@ -4868,104 +4938,92 @@
 #: ../libpurple/protocols/jabber/buddy.c:815
 #: ../libpurple/protocols/jabber/buddy.c:975
 msgid "Last Activity"
-msgstr ""
+msgstr "Vorige aktiwiteit"
 
 #: ../libpurple/protocols/jabber/buddy.c:817
 #: ../libpurple/protocols/jabber/buddy.c:977
-#, fuzzy
 msgid "Service Discovery Info"
-msgstr "Stel gidsinligting"
+msgstr "Diensbespeuring-inligting"
 
 #: ../libpurple/protocols/jabber/buddy.c:819
 #: ../libpurple/protocols/jabber/buddy.c:979
 msgid "Service Discovery Items"
-msgstr ""
+msgstr "Diensbespeuring-items"
 
 #: ../libpurple/protocols/jabber/buddy.c:821
 #: ../libpurple/protocols/jabber/buddy.c:981
-#, fuzzy
 msgid "Extended Stanza Addressing"
-msgstr "Uitgebreide adres"
+msgstr "Uitgebreide stanza-adressering"
 
 #: ../libpurple/protocols/jabber/buddy.c:823
 #: ../libpurple/protocols/jabber/buddy.c:983
-#, fuzzy
 msgid "Multi-User Chat"
-msgstr "Aliasgeselsie"
+msgstr "Veelgebruiker-geselsies"
 
 #: ../libpurple/protocols/jabber/buddy.c:825
 #: ../libpurple/protocols/jabber/buddy.c:985
-#, fuzzy
 msgid "Multi-User Chat Extended Presence Information"
-msgstr "Gebruiker het geen gidsinliging nie."
+msgstr "Inligting oor verlengde teenwoordigheid van veelgebruiker-geselsies"
 
 #: ../libpurple/protocols/jabber/buddy.c:827
 #: ../libpurple/protocols/jabber/buddy.c:987
 msgid "In-Band Bytestreams"
-msgstr ""
+msgstr "Inband-greepstrome"
 
 #: ../libpurple/protocols/jabber/buddy.c:829
 #: ../libpurple/protocols/jabber/buddy.c:989
-#, fuzzy
 msgid "Ad-Hoc Commands"
-msgstr "Opdrag"
+msgstr "Ad hoc-bevele"
 
 #: ../libpurple/protocols/jabber/buddy.c:831
 #: ../libpurple/protocols/jabber/buddy.c:991
 msgid "PubSub Service"
-msgstr ""
+msgstr "PubSub-diens"
 
 #: ../libpurple/protocols/jabber/buddy.c:833
 #: ../libpurple/protocols/jabber/buddy.c:993
 msgid "SOCKS5 Bytestreams"
-msgstr ""
+msgstr "SOCKS5-greepstrome"
 
 #: ../libpurple/protocols/jabber/buddy.c:835
 #: ../libpurple/protocols/jabber/buddy.c:995
 msgid "Out of Band Data"
-msgstr ""
+msgstr "Te min banddata"
 
 #: ../libpurple/protocols/jabber/buddy.c:837
 #: ../libpurple/protocols/jabber/buddy.c:997
-#, fuzzy
 msgid "XHTML-IM"
-msgstr "HTML"
+msgstr "XHTML-IM"
 
 #: ../libpurple/protocols/jabber/buddy.c:839
 #: ../libpurple/protocols/jabber/buddy.c:999
-#, fuzzy
 msgid "In-Band Registration"
-msgstr "Registrasiefout"
+msgstr "Inband-registrasie"
 
 #: ../libpurple/protocols/jabber/buddy.c:841
 #: ../libpurple/protocols/jabber/buddy.c:1001
-#, fuzzy
 msgid "User Location"
-msgstr "Ligging"
+msgstr "Gebruikerligging"
 
 #: ../libpurple/protocols/jabber/buddy.c:843
 #: ../libpurple/protocols/jabber/buddy.c:1003
-#, fuzzy
 msgid "User Avatar"
-msgstr "Gebruikersoektog"
+msgstr "Gebruikeravatar"
 
 #: ../libpurple/protocols/jabber/buddy.c:845
 #: ../libpurple/protocols/jabber/buddy.c:1005
-#, fuzzy
 msgid "Chat State Notifications"
-msgstr "Vriendstatuskennisgewing"
+msgstr "Geselsiestatuskennisgewing"
 
 #: ../libpurple/protocols/jabber/buddy.c:847
 #: ../libpurple/protocols/jabber/buddy.c:1007
-#, fuzzy
 msgid "Software Version"
-msgstr "Weergawe nie gesteun nie"
+msgstr "Sagtewareweergawe"
 
 #: ../libpurple/protocols/jabber/buddy.c:849
 #: ../libpurple/protocols/jabber/buddy.c:1009
-#, fuzzy
 msgid "Stream Initiation"
-msgstr "Oriëntasie"
+msgstr "Stroominisiasie"
 
 #: ../libpurple/protocols/jabber/buddy.c:851
 #: ../libpurple/protocols/jabber/buddy.c:1011
@@ -4975,134 +5033,118 @@
 
 #: ../libpurple/protocols/jabber/buddy.c:853
 #: ../libpurple/protocols/jabber/buddy.c:1013
-#, fuzzy
 msgid "User Mood"
-msgstr "Gebruikermodusse"
+msgstr "Gebruikerstemming"
 
 #: ../libpurple/protocols/jabber/buddy.c:855
 #: ../libpurple/protocols/jabber/buddy.c:1015
-#, fuzzy
 msgid "User Activity"
-msgstr "Gebruikerlimiet"
+msgstr "Gebruikeraktiwiteit"
 
 #: ../libpurple/protocols/jabber/buddy.c:857
 #: ../libpurple/protocols/jabber/buddy.c:1017
-#, fuzzy
 msgid "Entity Capabilities"
-msgstr "Vermoëns"
+msgstr "Entiteitvermoëns"
 
 #: ../libpurple/protocols/jabber/buddy.c:859
 #: ../libpurple/protocols/jabber/buddy.c:1019
 msgid "Encrypted Session Negotiations"
-msgstr ""
+msgstr "Geënkripteerde sessieonderhandelings"
 
 #: ../libpurple/protocols/jabber/buddy.c:861
 #: ../libpurple/protocols/jabber/buddy.c:1021
-#, fuzzy
 msgid "User Tune"
-msgstr "Gebruikernaam"
+msgstr "Gebruikerdeuntjie"
 
 #: ../libpurple/protocols/jabber/buddy.c:863
 #: ../libpurple/protocols/jabber/buddy.c:1023
-#, fuzzy
 msgid "Roster Item Exchange"
-msgstr "Kitsboodskap met sleutelruiling"
+msgstr "Roosteritem-ruiling"
 
 #: ../libpurple/protocols/jabber/buddy.c:865
 #: ../libpurple/protocols/jabber/buddy.c:1025
-#, fuzzy
 msgid "Reachability Address"
-msgstr "E-posadres"
+msgstr "Bereikbaarheid-adres"
 
 #: ../libpurple/protocols/jabber/buddy.c:867
 #: ../libpurple/protocols/jabber/buddy.c:1027
-#, fuzzy
 msgid "User Profile"
-msgstr "Profiel"
+msgstr "Gebruikerprofiel"
 
 #: ../libpurple/protocols/jabber/buddy.c:869
 #: ../libpurple/protocols/jabber/buddy.c:1029
-#, fuzzy
 msgid "Jingle"
-msgstr "Sluit aan"
+msgstr "Kenwysie"
 
 #: ../libpurple/protocols/jabber/buddy.c:871
 #: ../libpurple/protocols/jabber/buddy.c:1031
 msgid "Jingle Audio"
-msgstr ""
+msgstr "Kenwysie-klank"
 
 #: ../libpurple/protocols/jabber/buddy.c:873
 #: ../libpurple/protocols/jabber/buddy.c:1033
-#, fuzzy
 msgid "User Nickname"
-msgstr "Gebruikernaam"
+msgstr "Gebruiker se bynaam"
 
 #: ../libpurple/protocols/jabber/buddy.c:875
 #: ../libpurple/protocols/jabber/buddy.c:1035
 msgid "Jingle ICE UDP"
-msgstr ""
+msgstr "Kenwysie ICE UDP"
 
 #: ../libpurple/protocols/jabber/buddy.c:877
 #: ../libpurple/protocols/jabber/buddy.c:1037
 msgid "Jingle ICE TCP"
-msgstr ""
+msgstr "Kenwysie ICE TPC"
 
 #: ../libpurple/protocols/jabber/buddy.c:879
 #: ../libpurple/protocols/jabber/buddy.c:1039
 msgid "Jingle Raw UDP"
-msgstr ""
+msgstr "Kenwysie rou UDP"
 
 #: ../libpurple/protocols/jabber/buddy.c:881
 #: ../libpurple/protocols/jabber/buddy.c:1041
-#, fuzzy
 msgid "Jingle Video"
-msgstr "Lewende video"
+msgstr "Kenwysievideo"
 
 #: ../libpurple/protocols/jabber/buddy.c:883
 #: ../libpurple/protocols/jabber/buddy.c:1043
 msgid "Jingle DTMF"
-msgstr ""
+msgstr "Kenwysie DTMF"
 
 #: ../libpurple/protocols/jabber/buddy.c:885
 #: ../libpurple/protocols/jabber/buddy.c:1045
-#, fuzzy
 msgid "Message Receipts"
-msgstr "Boodskap ontvang"
+msgstr "Boodskap-ontvangste"
 
 #: ../libpurple/protocols/jabber/buddy.c:887
 #: ../libpurple/protocols/jabber/buddy.c:1047
-#, fuzzy
 msgid "Public Key Publishing"
-msgstr "Publiekesleutel-babbelafdruk"
+msgstr "Publiekesleutel-publisering"
 
 #: ../libpurple/protocols/jabber/buddy.c:889
 #: ../libpurple/protocols/jabber/buddy.c:1049
-#, fuzzy
 msgid "User Chatting"
-msgstr "Gebruikerkeuses"
+msgstr "Gebruikergeselsery"
 
 #: ../libpurple/protocols/jabber/buddy.c:891
 #: ../libpurple/protocols/jabber/buddy.c:1051
-#, fuzzy
 msgid "User Browsing"
-msgstr "Gebruikermodusse"
+msgstr "Gebruikerblaaiery"
 
 #: ../libpurple/protocols/jabber/buddy.c:893
 #: ../libpurple/protocols/jabber/buddy.c:1053
-#, fuzzy
 msgid "User Gaming"
-msgstr "Gebruikernaam"
+msgstr "Gebruikerspelery"
 
 #: ../libpurple/protocols/jabber/buddy.c:895
 #: ../libpurple/protocols/jabber/buddy.c:1055
-#, fuzzy
 msgid "User Viewing"
-msgstr "Gebruikerlimiet"
+msgstr "Gebruikerbekyking"
 
 #: ../libpurple/protocols/jabber/buddy.c:897
 #: ../libpurple/protocols/jabber/buddy.c:1057
-#: ../libpurple/protocols/silc/ops.c:1596
-#: ../libpurple/protocols/silc/ops.c:1601
+#: ../libpurple/protocols/silc/ops.c:1600
+#: ../libpurple/protocols/silc/ops.c:1605
 #: ../libpurple/protocols/silc10/ops.c:1612
 #: ../libpurple/protocols/silc10/ops.c:1617
 msgid "Ping"
@@ -5110,63 +5152,62 @@
 
 #: ../libpurple/protocols/jabber/buddy.c:899
 #: ../libpurple/protocols/jabber/buddy.c:1059
-#, fuzzy
 msgid "Stanza Encryption"
-msgstr "Trillian-enkripsie"
+msgstr "Stanzaenkriptering"
 
 #: ../libpurple/protocols/jabber/buddy.c:901
 #: ../libpurple/protocols/jabber/buddy.c:1061
 msgid "Entity Time"
-msgstr ""
+msgstr "Entiteittyd"
 
 #: ../libpurple/protocols/jabber/buddy.c:903
 #: ../libpurple/protocols/jabber/buddy.c:1063
 msgid "Delayed Delivery"
-msgstr ""
+msgstr "Vertraagde lewering"
 
 #: ../libpurple/protocols/jabber/buddy.c:905
 #: ../libpurple/protocols/jabber/buddy.c:1065
 msgid "Collaborative Data Objects"
-msgstr ""
+msgstr "Samewerkende dataobjekte"
 
 #: ../libpurple/protocols/jabber/buddy.c:907
 #: ../libpurple/protocols/jabber/buddy.c:1067
 msgid "File Repository and Sharing"
-msgstr ""
+msgstr "Lêerbewaarplek en deling"
 
 #: ../libpurple/protocols/jabber/buddy.c:909
 #: ../libpurple/protocols/jabber/buddy.c:1069
 msgid "STUN Service Discovery for Jingle"
-msgstr ""
+msgstr "STUN-diensbespeuring vir kenwysie"
 
 #: ../libpurple/protocols/jabber/buddy.c:911
 #: ../libpurple/protocols/jabber/buddy.c:1071
 msgid "Simplified Encrypted Session Negotiation"
-msgstr ""
+msgstr "Vereenvoudigde onderhandeling vir geënkripteerde sessies"
 
 #: ../libpurple/protocols/jabber/buddy.c:913
 #: ../libpurple/protocols/jabber/buddy.c:1073
 msgid "Hop Check"
-msgstr ""
+msgstr "Hop-kontrole"
 
 #: ../libpurple/protocols/jabber/buddy.c:921
 #: ../libpurple/protocols/jabber/buddy.c:1081
-#: ../libpurple/protocols/oscar/oscar.c:2906
+#: ../libpurple/protocols/oscar/oscar.c:2921
 msgid "Capabilities"
 msgstr "Vermoëns"
 
 #: ../libpurple/protocols/jabber/buddy.c:933
-#: ../libpurple/protocols/jabber/libxmpp.c:206
+#: ../libpurple/protocols/jabber/libxmpp.c:209
 #: ../libpurple/protocols/jabber/si.c:859
 msgid "Resource"
 msgstr "Hulpbron"
 
 #: ../libpurple/protocols/jabber/buddy.c:935
-#: ../libpurple/protocols/jabber/jabber.c:1531
-#: ../libpurple/protocols/jabber/jabber.c:1554
-#: ../libpurple/protocols/jabber/jabber.c:1577
-#: ../libpurple/protocols/jabber/jabber.c:1600
-#: ../libpurple/protocols/jabber/jabber.c:1623
+#: ../libpurple/protocols/jabber/jabber.c:1538
+#: ../libpurple/protocols/jabber/jabber.c:1552
+#: ../libpurple/protocols/jabber/jabber.c:1566
+#: ../libpurple/protocols/jabber/jabber.c:1580
+#: ../libpurple/protocols/jabber/jabber.c:1594
 msgid "Priority"
 msgstr "Prioriteit"
 
@@ -5178,8 +5219,8 @@
 
 #: ../libpurple/protocols/jabber/buddy.c:1270
 #: ../libpurple/protocols/jabber/jabber.c:952
-#: ../libpurple/protocols/oscar/oscar.c:3788
-#: ../libpurple/protocols/oscar/oscar.c:3801
+#: ../libpurple/protocols/oscar/oscar.c:3803
+#: ../libpurple/protocols/oscar/oscar.c:3816
 #: ../libpurple/protocols/qq/buddy_info.c:56
 #: ../libpurple/protocols/silc/ops.c:1030
 #: ../libpurple/protocols/silc10/ops.c:1064
@@ -5198,114 +5239,111 @@
 msgid "Logo"
 msgstr "Embleem"
 
-#: ../libpurple/protocols/jabber/buddy.c:1942
+#: ../libpurple/protocols/jabber/buddy.c:1945
 msgid "Un-hide From"
 msgstr "Onversteek vanaf"
 
-#: ../libpurple/protocols/jabber/buddy.c:1946
+#: ../libpurple/protocols/jabber/buddy.c:1949
 msgid "Temporarily Hide From"
 msgstr "Kruip tydelik weg vir"
 
 #. && NOT ME
-#: ../libpurple/protocols/jabber/buddy.c:1954
+#: ../libpurple/protocols/jabber/buddy.c:1957
 msgid "Cancel Presence Notification"
 msgstr "Kanselleer teenwoordigheidkennisgewings"
 
-#: ../libpurple/protocols/jabber/buddy.c:1961
+#: ../libpurple/protocols/jabber/buddy.c:1964
 msgid "(Re-)Request authorization"
 msgstr "(Her-)Versoek magtiging"
 
 #. if(NOT ME)
 #. shouldn't this just happen automatically when the buddy is
 #. removed?
-#: ../libpurple/protocols/jabber/buddy.c:1970
+#: ../libpurple/protocols/jabber/buddy.c:1973
 msgid "Unsubscribe"
-msgstr "Beëindig inskrywing"
-
-#: ../libpurple/protocols/jabber/buddy.c:1985
-#, fuzzy
+msgstr "Teken af"
+
+#: ../libpurple/protocols/jabber/buddy.c:1988
 msgid "Log In"
-msgstr "Aangemeld"
-
-#: ../libpurple/protocols/jabber/buddy.c:1989
-#, fuzzy
+msgstr "Meld aan"
+
+#: ../libpurple/protocols/jabber/buddy.c:1992
 msgid "Log Out"
-msgstr "Boekstaaf geselsies"
-
-#: ../libpurple/protocols/jabber/buddy.c:2035
-#: ../libpurple/protocols/jabber/jabber.c:1553
+msgstr "Meld af"
+
+#: ../libpurple/protocols/jabber/buddy.c:2038
+#: ../libpurple/protocols/jabber/jabber.c:1551
 msgid "Chatty"
 msgstr "Geselserig"
 
-#: ../libpurple/protocols/jabber/buddy.c:2039
+#: ../libpurple/protocols/jabber/buddy.c:2042
 msgid "Extended Away"
 msgstr "Vir lank weg"
 
-#: ../libpurple/protocols/jabber/buddy.c:2041
-#: ../libpurple/protocols/jabber/jabber.c:1622
+#: ../libpurple/protocols/jabber/buddy.c:2044
+#: ../libpurple/protocols/jabber/jabber.c:1593
 #: ../libpurple/protocols/oscar/oscar.c:727
-#: ../libpurple/protocols/oscar/oscar.c:5808
+#: ../libpurple/protocols/oscar/oscar.c:5863
 #: ../libpurple/protocols/sametime/sametime.c:3297
-#, c-format
 msgid "Do Not Disturb"
 msgstr "Moenie pla nie"
 
-#: ../libpurple/protocols/jabber/buddy.c:2208
+#: ../libpurple/protocols/jabber/buddy.c:2211
 msgid "JID"
 msgstr "JID"
 
-#: ../libpurple/protocols/jabber/buddy.c:2212
-#: ../libpurple/protocols/jabber/buddy.c:2391
-#: ../libpurple/protocols/oscar/oscar.c:3711
+#: ../libpurple/protocols/jabber/buddy.c:2215
+#: ../libpurple/protocols/jabber/buddy.c:2404
+#: ../libpurple/protocols/oscar/oscar.c:3726
 msgid "Last Name"
 msgstr "Van"
 
-#: ../libpurple/protocols/jabber/buddy.c:2244
+#: ../libpurple/protocols/jabber/buddy.c:2247
 msgid "The following are the results of your search"
 msgstr "Die volgende is die resultate van u soektog"
 
 #. current comment from Jabber User Directory users.jabber.org
-#: ../libpurple/protocols/jabber/buddy.c:2319
+#: ../libpurple/protocols/jabber/buddy.c:2332
 msgid ""
 "Find a contact by entering the search criteria in the given fields. Note: "
 "Each field supports wild card searches (%)"
 msgstr ""
-"Soek 'n kontak deur die soekkriteria in die gegewe velde te gee. Let wel: "
+"Vind 'n kontak deur die soekkriteria in die gegewe velde te tik. Let wel: "
 "Elke veld ondersteun instaankarakter-soektogte (%)"
 
-#: ../libpurple/protocols/jabber/buddy.c:2339
+#: ../libpurple/protocols/jabber/buddy.c:2352
 msgid "Directory Query Failed"
 msgstr "Gidsnavraag het misluk"
 
-#: ../libpurple/protocols/jabber/buddy.c:2340
+#: ../libpurple/protocols/jabber/buddy.c:2353
 msgid "Could not query the directory server."
 msgstr "Kon nie navraag by die gidsbediener doen nie."
 
 #. Try to translate the message (see static message
 #. list in jabber_user_dir_comments[])
-#: ../libpurple/protocols/jabber/buddy.c:2374
+#: ../libpurple/protocols/jabber/buddy.c:2387
 #, c-format
 msgid "Server Instructions: %s"
 msgstr "Bedienerinstruksies: %s"
 
-#: ../libpurple/protocols/jabber/buddy.c:2381
+#: ../libpurple/protocols/jabber/buddy.c:2394
 msgid "Fill in one or more fields to search for any matching XMPP users."
 msgstr "Vul een of meer velde in om te soek vir passende XMPP-gebruikers."
 
-#: ../libpurple/protocols/jabber/buddy.c:2401
-#: ../libpurple/protocols/novell/novell.c:1488
-#: ../libpurple/protocols/oscar/oscar.c:3714
-#: ../libpurple/protocols/oscar/oscar.c:3723
+#: ../libpurple/protocols/jabber/buddy.c:2414
+#: ../libpurple/protocols/novell/novell.c:1490
+#: ../libpurple/protocols/oscar/oscar.c:3729
+#: ../libpurple/protocols/oscar/oscar.c:3738
 msgid "E-Mail Address"
 msgstr "E-posadres"
 
-#: ../libpurple/protocols/jabber/buddy.c:2410
-#: ../libpurple/protocols/jabber/buddy.c:2411
+#: ../libpurple/protocols/jabber/buddy.c:2423
+#: ../libpurple/protocols/jabber/buddy.c:2424
 msgid "Search for XMPP users"
 msgstr "Soek vir XMPP-gebruikers"
 
 #. "Search"
-#: ../libpurple/protocols/jabber/buddy.c:2412
+#: ../libpurple/protocols/jabber/buddy.c:2425
 #: ../libpurple/protocols/qq/group.c:123
 #: ../libpurple/protocols/qq/group_im.c:147
 #: ../libpurple/protocols/qq/sys_msg.c:174
@@ -5317,24 +5355,24 @@
 msgid "Search"
 msgstr "Soek"
 
-#: ../libpurple/protocols/jabber/buddy.c:2427
+#: ../libpurple/protocols/jabber/buddy.c:2440
 msgid "Invalid Directory"
 msgstr "Ongeldige gids"
 
-#: ../libpurple/protocols/jabber/buddy.c:2444
+#: ../libpurple/protocols/jabber/buddy.c:2457
 msgid "Enter a User Directory"
-msgstr "Gee 'n gebruikergids"
-
-#: ../libpurple/protocols/jabber/buddy.c:2445
+msgstr "Tik 'n gebruikergids"
+
+#: ../libpurple/protocols/jabber/buddy.c:2458
 msgid "Select a user directory to search"
 msgstr "Kies 'n gebruikergids om te deursoek"
 
-#: ../libpurple/protocols/jabber/buddy.c:2448
+#: ../libpurple/protocols/jabber/buddy.c:2461
 msgid "Search Directory"
 msgstr "Deursoek gids"
 
 #: ../libpurple/protocols/jabber/chat.c:41
-#: ../libpurple/protocols/oscar/oscar.c:5294
+#: ../libpurple/protocols/oscar/oscar.c:5347
 #: ../libpurple/protocols/yahoo/yahoochat.c:1048
 msgid "_Room:"
 msgstr "_Kamer:"
@@ -5404,10 +5442,10 @@
 
 #: ../libpurple/protocols/jabber/chat.c:678
 #: ../libpurple/protocols/jabber/chat.c:689
-#: ../libpurple/protocols/silc/ops.c:1456
+#: ../libpurple/protocols/silc/ops.c:1460
 #: ../libpurple/protocols/silc10/ops.c:1451
 msgid "Error retrieving room list"
-msgstr "Fout met die kry van die kamerlys"
+msgstr "Kon nie kamerlys kry nie"
 
 #: ../libpurple/protocols/jabber/chat.c:737
 msgid "Invalid Server"
@@ -5415,7 +5453,7 @@
 
 #: ../libpurple/protocols/jabber/chat.c:781
 msgid "Enter a Conference Server"
-msgstr "Gee 'n konferensiebediener"
+msgstr "Tik 'n konferensiebediener"
 
 #: ../libpurple/protocols/jabber/chat.c:782
 msgid "Select a conference server to query"
@@ -5427,11 +5465,11 @@
 
 #: ../libpurple/protocols/jabber/jabber.c:92
 msgid "Error initializing session"
-msgstr "Fout met inisialiseer van sessie"
+msgstr "Kon nie sessie inisialiseer nie"
 
 #: ../libpurple/protocols/jabber/jabber.c:145
 msgid "You require encryption, but it is not available on this server."
-msgstr ""
+msgstr "U vereis enkripsie, maar dis nie op hierdie bediener beskikbaar nie."
 
 #: ../libpurple/protocols/jabber/jabber.c:259
 #: ../libpurple/protocols/jabber/jabber.c:312
@@ -5445,9 +5483,9 @@
 msgstr "Leesfout"
 
 #: ../libpurple/protocols/jabber/jabber.c:482
-#: ../libpurple/protocols/oscar/flap_connection.c:394
-#: ../libpurple/protocols/yahoo/yahoo.c:2558
-#: ../libpurple/protocols/yahoo/yahoo.c:2590
+#: ../libpurple/protocols/oscar/flap_connection.c:396
+#: ../libpurple/protocols/yahoo/yahoo.c:2560
+#: ../libpurple/protocols/yahoo/yahoo.c:2592
 #, c-format
 msgid ""
 "Could not establish a connection with the server:\n"
@@ -5475,9 +5513,9 @@
 msgstr "Registrasie van %s@%s suksesvol"
 
 #: ../libpurple/protocols/jabber/jabber.c:662
-#, fuzzy, c-format
+#, c-format
 msgid "Registration to %s successful"
-msgstr "Registrasie van %s@%s suksesvol"
+msgstr "Registrasie van %s suksesvol"
 
 #: ../libpurple/protocols/jabber/jabber.c:664
 #: ../libpurple/protocols/jabber/jabber.c:665
@@ -5490,21 +5528,19 @@
 msgstr "Registrasie het misluk"
 
 #: ../libpurple/protocols/jabber/jabber.c:692
-#, fuzzy, c-format
+#, c-format
 msgid "Registration from %s successfully removed"
-msgstr "Registrasie van %s@%s suksesvol"
+msgstr "Registrasie van %s suksesvol verwyder"
 
 #: ../libpurple/protocols/jabber/jabber.c:694
 #: ../libpurple/protocols/jabber/jabber.c:695
-#, fuzzy
 msgid "Unregistration Successful"
-msgstr "Registrasie suksesvol"
+msgstr "Deregistrasie suksesvol"
 
 #: ../libpurple/protocols/jabber/jabber.c:703
 #: ../libpurple/protocols/jabber/jabber.c:704
-#, fuzzy
 msgid "Unregistration Failed"
-msgstr "Registrasie het misluk"
+msgstr "Deregistrasie het misluk"
 
 #: ../libpurple/protocols/jabber/jabber.c:864
 #: ../libpurple/protocols/jabber/jabber.c:865
@@ -5512,8 +5548,8 @@
 msgstr "Reeds geregistreer"
 
 #: ../libpurple/protocols/jabber/jabber.c:962
-#: ../libpurple/protocols/oscar/oscar.c:3790
-#: ../libpurple/protocols/oscar/oscar.c:3803
+#: ../libpurple/protocols/oscar/oscar.c:3805
+#: ../libpurple/protocols/oscar/oscar.c:3818
 msgid "State"
 msgstr "Staat"
 
@@ -5523,28 +5559,28 @@
 
 #: ../libpurple/protocols/jabber/jabber.c:972
 #: ../libpurple/protocols/silc/ops.c:1035
-#: ../libpurple/protocols/silc/silc.c:772
-#: ../libpurple/protocols/silc/util.c:557
+#: ../libpurple/protocols/silc/silc.c:903
+#: ../libpurple/protocols/silc/util.c:561
 #: ../libpurple/protocols/silc10/ops.c:1069
 #: ../libpurple/protocols/silc10/silc.c:683
 #: ../libpurple/protocols/silc10/util.c:553
 msgid "Phone"
-msgstr "Telefoon"
+msgstr "Foon"
 
 #: ../libpurple/protocols/jabber/jabber.c:982
 msgid "Date"
 msgstr "Datum"
 
 #: ../libpurple/protocols/jabber/jabber.c:987
-#, fuzzy
 msgid "Unregister"
-msgstr "Registreer"
+msgstr "Deregistreer"
 
 #: ../libpurple/protocols/jabber/jabber.c:994
-#, fuzzy
 msgid ""
 "Please fill out the information below to change your account registration."
-msgstr "Vul die inligting onder in om die nuwe rekening te registreer."
+msgstr ""
+"Vul asseblief die inligting hier onder in om u rekeningregistrasie te "
+"verander."
 
 #: ../libpurple/protocols/jabber/jabber.c:997
 msgid "Please fill out the information below to register your new account."
@@ -5561,43 +5597,39 @@
 msgstr "Registreer"
 
 #: ../libpurple/protocols/jabber/jabber.c:1012
-#, fuzzy, c-format
+#, c-format
 msgid "Change Account Registration at %s"
-msgstr "Verander gebruikerinligting vir %s"
+msgstr "Verander rekeningregistrasie by %s"
 
 #: ../libpurple/protocols/jabber/jabber.c:1013
-#, fuzzy, c-format
+#, c-format
 msgid "Register New Account at %s"
-msgstr "Registreer 'n nuwe XMPP-rekening"
+msgstr "Registreer nuwe rekening by %s"
 
 #: ../libpurple/protocols/jabber/jabber.c:1016
-#, fuzzy
 msgid "Change Registration"
-msgstr "Verander status na:"
+msgstr "Verander registrasie"
 
 #: ../libpurple/protocols/jabber/jabber.c:1120
 #: ../libpurple/protocols/jabber/jabber.c:1121
-#, fuzzy
 msgid "Error unregistering account"
-msgstr "Fout met verandering van rekeninginligting"
+msgstr "Kon nie rekening deregistreer nie"
 
 #: ../libpurple/protocols/jabber/jabber.c:1126
 #: ../libpurple/protocols/jabber/jabber.c:1127
-#, fuzzy
 msgid "Account successfully unregistered"
-msgstr "U het 'n qun suksesvol geskep"
+msgstr "Rekening suksesvol gederegistreer"
 
 #: ../libpurple/protocols/jabber/jabber.c:1284
 msgid "Initializing Stream"
 msgstr "Inisialiseer stroom"
 
 #: ../libpurple/protocols/jabber/jabber.c:1289
-#, fuzzy
 msgid "Initializing SSL/TLS"
-msgstr "Inisialiseer stroom"
+msgstr "Inisialiseer tans SSL/TLS"
 
 #: ../libpurple/protocols/jabber/jabber.c:1293
-#: ../libpurple/protocols/msn/session.c:351
+#: ../libpurple/protocols/msn/session.c:400
 msgid "Authenticating"
 msgstr "Stawing"
 
@@ -5606,473 +5638,457 @@
 msgstr "Herinisialiseer stroom"
 
 #: ../libpurple/protocols/jabber/jabber.c:1396
-#: ../libpurple/protocols/jabber/jabber.c:1865
-#: ../libpurple/protocols/jabber/jabber.c:1909
-#: ../libpurple/protocols/jabber/jabber.c:1945
+#: ../libpurple/protocols/jabber/jabber.c:1843
+#: ../libpurple/protocols/jabber/jabber.c:1887
+#: ../libpurple/protocols/jabber/jabber.c:1923
 #: ../libpurple/protocols/oscar/oscar.c:826
-#: ../libpurple/protocols/oscar/oscar.c:5602
+#: ../libpurple/protocols/oscar/oscar.c:5657
 msgid "Not Authorized"
 msgstr "Nie gemagtig nie"
 
-#: ../libpurple/protocols/jabber/jabber.c:1442
+#: ../libpurple/protocols/jabber/jabber.c:1444
 msgid "Both"
 msgstr "Beide"
 
-#: ../libpurple/protocols/jabber/jabber.c:1444
+#: ../libpurple/protocols/jabber/jabber.c:1446
 msgid "From (To pending)"
 msgstr "Van (aan hangende)"
 
-#: ../libpurple/protocols/jabber/jabber.c:1446
+#: ../libpurple/protocols/jabber/jabber.c:1448
 msgid "From"
 msgstr "Van"
 
-#: ../libpurple/protocols/jabber/jabber.c:1449
+#: ../libpurple/protocols/jabber/jabber.c:1451
 msgid "To"
 msgstr "Aan"
 
-#: ../libpurple/protocols/jabber/jabber.c:1451
+#: ../libpurple/protocols/jabber/jabber.c:1453
 msgid "None (To pending)"
 msgstr "Geen (aan hangende)"
 
-#: ../libpurple/protocols/jabber/jabber.c:1453
+#: ../libpurple/protocols/jabber/jabber.c:1455
 #: ../pidgin/plugins/gevolution/eds-utils.c:73
 #: ../pidgin/plugins/gevolution/eds-utils.c:86
 msgid "None"
 msgstr "Geen"
 
-#: ../libpurple/protocols/jabber/jabber.c:1456
+#: ../libpurple/protocols/jabber/jabber.c:1458
 msgid "Subscription"
 msgstr "Inskrywing"
 
-#: ../libpurple/protocols/jabber/jabber.c:1466
-#: ../libpurple/protocols/jabber/jabber.c:1469
-#: ../libpurple/protocols/jabber/jabber.c:1533
-#: ../libpurple/protocols/jabber/jabber.c:1556
-#: ../libpurple/protocols/jabber/jabber.c:1579
-#: ../libpurple/protocols/jabber/jabber.c:1602
-#: ../libpurple/protocols/jabber/jabber.c:1625
-#: ../libpurple/protocols/jabber/usermood.c:166
-#: ../libpurple/protocols/silc/buddy.c:1557
+#: ../libpurple/protocols/jabber/jabber.c:1468
+#: ../libpurple/protocols/jabber/jabber.c:1471
+#: ../libpurple/protocols/jabber/jabber.c:1540
+#: ../libpurple/protocols/jabber/jabber.c:1554
+#: ../libpurple/protocols/jabber/jabber.c:1568
+#: ../libpurple/protocols/jabber/jabber.c:1582
+#: ../libpurple/protocols/jabber/jabber.c:1596
+#: ../libpurple/protocols/jabber/usermood.c:184
+#: ../libpurple/protocols/silc/buddy.c:1560
 #: ../libpurple/protocols/silc/ops.c:1212
-#: ../libpurple/protocols/silc10/buddy.c:1557
+#: ../libpurple/protocols/silc10/buddy.c:1560
 #: ../libpurple/protocols/silc10/ops.c:1207
 msgid "Mood"
-msgstr "Bui"
-
-#: ../libpurple/protocols/jabber/jabber.c:1534
-#: ../libpurple/protocols/jabber/jabber.c:1557
-#: ../libpurple/protocols/jabber/jabber.c:1580
-#: ../libpurple/protocols/jabber/jabber.c:1603
-#: ../libpurple/protocols/jabber/jabber.c:1626
-#, fuzzy
-msgid "Mood Text"
-msgstr "Bloedgroep"
-
-#: ../libpurple/protocols/jabber/jabber.c:1535
-#: ../libpurple/protocols/jabber/jabber.c:1558
-#: ../libpurple/protocols/jabber/jabber.c:1581
-#: ../libpurple/protocols/jabber/jabber.c:1604
-#: ../libpurple/protocols/jabber/jabber.c:1627
-#, fuzzy
-msgid "Tune Artist"
-msgstr "Kunstenaars"
-
-#: ../libpurple/protocols/jabber/jabber.c:1536
-#: ../libpurple/protocols/jabber/jabber.c:1559
-#: ../libpurple/protocols/jabber/jabber.c:1582
-#: ../libpurple/protocols/jabber/jabber.c:1605
-#: ../libpurple/protocols/jabber/jabber.c:1628
-#, fuzzy
-msgid "Tune Title"
-msgstr "Titel"
-
-#: ../libpurple/protocols/jabber/jabber.c:1537
-#: ../libpurple/protocols/jabber/jabber.c:1560
-#: ../libpurple/protocols/jabber/jabber.c:1583
-#: ../libpurple/protocols/jabber/jabber.c:1606
-#: ../libpurple/protocols/jabber/jabber.c:1629
-msgid "Tune Album"
-msgstr ""
-
-#: ../libpurple/protocols/jabber/jabber.c:1538
-#: ../libpurple/protocols/jabber/jabber.c:1561
-#: ../libpurple/protocols/jabber/jabber.c:1584
-#: ../libpurple/protocols/jabber/jabber.c:1607
-#: ../libpurple/protocols/jabber/jabber.c:1630
-msgid "Tune Genre"
-msgstr ""
-
-#: ../libpurple/protocols/jabber/jabber.c:1539
-#: ../libpurple/protocols/jabber/jabber.c:1562
-#: ../libpurple/protocols/jabber/jabber.c:1585
-#: ../libpurple/protocols/jabber/jabber.c:1608
-#: ../libpurple/protocols/jabber/jabber.c:1631
-#, fuzzy
-msgid "Tune Comment"
-msgstr "Vriendopmerking"
-
-#: ../libpurple/protocols/jabber/jabber.c:1540
-#: ../libpurple/protocols/jabber/jabber.c:1563
-#: ../libpurple/protocols/jabber/jabber.c:1586
-#: ../libpurple/protocols/jabber/jabber.c:1609
-#: ../libpurple/protocols/jabber/jabber.c:1632
-msgid "Tune Track"
-msgstr ""
+msgstr "Stemming"
+
+#: ../libpurple/protocols/jabber/jabber.c:1476
+#: ../libpurple/protocols/msn/msn.c:647
+msgid "Current media"
+msgstr "Huidige media"
 
 #: ../libpurple/protocols/jabber/jabber.c:1541
-#: ../libpurple/protocols/jabber/jabber.c:1564
-#: ../libpurple/protocols/jabber/jabber.c:1587
-#: ../libpurple/protocols/jabber/jabber.c:1610
-#: ../libpurple/protocols/jabber/jabber.c:1633
-msgid "Tune Time"
-msgstr ""
-
-#: ../libpurple/protocols/jabber/jabber.c:1542
-#: ../libpurple/protocols/jabber/jabber.c:1565
-#: ../libpurple/protocols/jabber/jabber.c:1588
-#: ../libpurple/protocols/jabber/jabber.c:1611
-#: ../libpurple/protocols/jabber/jabber.c:1634
-msgid "Tune Year"
-msgstr ""
+#: ../libpurple/protocols/jabber/jabber.c:1555
+#: ../libpurple/protocols/jabber/jabber.c:1569
+#: ../libpurple/protocols/jabber/jabber.c:1583
+#: ../libpurple/protocols/jabber/jabber.c:1597
+msgid "Mood Text"
+msgstr "Stemmingteks"
 
 #: ../libpurple/protocols/jabber/jabber.c:1543
-#: ../libpurple/protocols/jabber/jabber.c:1566
-#: ../libpurple/protocols/jabber/jabber.c:1589
-#: ../libpurple/protocols/jabber/jabber.c:1612
-#: ../libpurple/protocols/jabber/jabber.c:1635
+#: ../libpurple/protocols/jabber/jabber.c:1557
+#: ../libpurple/protocols/jabber/jabber.c:1571
+#: ../libpurple/protocols/jabber/jabber.c:1585
+#: ../libpurple/protocols/jabber/jabber.c:1599
+msgid "Allow Buzz"
+msgstr "Laat zoempie toe"
+
+#: ../libpurple/protocols/jabber/jabber.c:1617
+msgid "Tune Artist"
+msgstr "Deuntjiekunstenaar"
+
+#: ../libpurple/protocols/jabber/jabber.c:1618
+msgid "Tune Title"
+msgstr "Deuntjietitel"
+
+#: ../libpurple/protocols/jabber/jabber.c:1619
+msgid "Tune Album"
+msgstr "Deuntjiealbum"
+
+#: ../libpurple/protocols/jabber/jabber.c:1620
+msgid "Tune Genre"
+msgstr "Deuntjiegenre"
+
+#: ../libpurple/protocols/jabber/jabber.c:1621
+msgid "Tune Comment"
+msgstr "Deuntjiekommentaar"
+
+#: ../libpurple/protocols/jabber/jabber.c:1622
+msgid "Tune Track"
+msgstr "Deuntjiesnit"
+
+#: ../libpurple/protocols/jabber/jabber.c:1623
+msgid "Tune Time"
+msgstr "Deuntjietyd"
+
+#: ../libpurple/protocols/jabber/jabber.c:1624
+msgid "Tune Year"
+msgstr "Deuntjiejaar"
+
+#: ../libpurple/protocols/jabber/jabber.c:1625
 msgid "Tune URL"
-msgstr ""
-
-#: ../libpurple/protocols/jabber/jabber.c:1545
-#: ../libpurple/protocols/jabber/jabber.c:1568
-#: ../libpurple/protocols/jabber/jabber.c:1591
-#: ../libpurple/protocols/jabber/jabber.c:1614
-#: ../libpurple/protocols/jabber/jabber.c:1637
-#, fuzzy
-msgid "Allow Buzz"
-msgstr "Toelaat"
-
-#: ../libpurple/protocols/jabber/jabber.c:1665
+msgstr "Deuntjie-URL"
+
+#: ../libpurple/protocols/jabber/jabber.c:1641
 msgid "Password Changed"
 msgstr "Wagwoord verander"
 
-#: ../libpurple/protocols/jabber/jabber.c:1666
+#: ../libpurple/protocols/jabber/jabber.c:1642
 msgid "Your password has been changed."
 msgstr "U wagwoord is verander."
 
-#: ../libpurple/protocols/jabber/jabber.c:1670
-#: ../libpurple/protocols/jabber/jabber.c:1671
+#: ../libpurple/protocols/jabber/jabber.c:1648
+#: ../libpurple/protocols/jabber/jabber.c:1649
 msgid "Error changing password"
-msgstr "Fout met verandering van wagwoord"
-
-#: ../libpurple/protocols/jabber/jabber.c:1728
+msgstr "Kon nie wagwoord verander nie"
+
+#: ../libpurple/protocols/jabber/jabber.c:1706
 msgid "Password (again)"
 msgstr "Wagwoord (weer)"
 
-#: ../libpurple/protocols/jabber/jabber.c:1734
-#: ../libpurple/protocols/jabber/jabber.c:1735
+#: ../libpurple/protocols/jabber/jabber.c:1712
+#: ../libpurple/protocols/jabber/jabber.c:1713
 msgid "Change XMPP Password"
 msgstr "Verander XMPP-wagwoord"
 
-#: ../libpurple/protocols/jabber/jabber.c:1735
+#: ../libpurple/protocols/jabber/jabber.c:1713
 msgid "Please enter your new password"
-msgstr "Gee asb. u nuwe wagwoord"
-
-#: ../libpurple/protocols/jabber/jabber.c:1749
-#: ../libpurple/protocols/oscar/oscar.c:6388
-#: ../libpurple/protocols/silc/silc.c:1093
-#: ../libpurple/protocols/silc10/silc.c:1004
+msgstr "Tik gerus u nuwe wagwoord"
+
+#: ../libpurple/protocols/jabber/jabber.c:1727
+#: ../libpurple/protocols/oscar/oscar.c:6443
+#: ../libpurple/protocols/silc/silc.c:1224
+#: ../libpurple/protocols/silc10/silc.c:1007
 msgid "Set User Info..."
 msgstr "Stel gebruikerinligting..."
 
 #. if (js->protocol_options & CHANGE_PASSWORD) {
-#: ../libpurple/protocols/jabber/jabber.c:1754
-#: ../libpurple/protocols/oscar/oscar.c:6399
-#: ../libpurple/protocols/silc/silc.c:1089
-#: ../libpurple/protocols/silc10/silc.c:1000
+#: ../libpurple/protocols/jabber/jabber.c:1732
+#: ../libpurple/protocols/oscar/oscar.c:6454
+#: ../libpurple/protocols/silc/silc.c:1220
+#: ../libpurple/protocols/silc10/silc.c:1003
 msgid "Change Password..."
 msgstr "Verander wagwoord..."
 
 #. }
-#: ../libpurple/protocols/jabber/jabber.c:1759
+#: ../libpurple/protocols/jabber/jabber.c:1737
 msgid "Search for Users..."
 msgstr "Soek vir gebruikers..."
 
-#: ../libpurple/protocols/jabber/jabber.c:1845
+#: ../libpurple/protocols/jabber/jabber.c:1823
 msgid "Bad Request"
 msgstr "Slegte versoek"
 
-#: ../libpurple/protocols/jabber/jabber.c:1847
+#: ../libpurple/protocols/jabber/jabber.c:1825
 msgid "Conflict"
 msgstr "Konflik"
 
-#: ../libpurple/protocols/jabber/jabber.c:1849
+#: ../libpurple/protocols/jabber/jabber.c:1827
 msgid "Feature Not Implemented"
 msgstr "Kenmerk nie geïmplementeer nie"
 
-#: ../libpurple/protocols/jabber/jabber.c:1851
+#: ../libpurple/protocols/jabber/jabber.c:1829
 msgid "Forbidden"
 msgstr "Verbode"
 
-#: ../libpurple/protocols/jabber/jabber.c:1853
+#: ../libpurple/protocols/jabber/jabber.c:1831
 msgid "Gone"
 msgstr "Weg"
 
-#: ../libpurple/protocols/jabber/jabber.c:1855
-#: ../libpurple/protocols/jabber/jabber.c:1935
+#: ../libpurple/protocols/jabber/jabber.c:1833
+#: ../libpurple/protocols/jabber/jabber.c:1913
 msgid "Internal Server Error"
 msgstr "Interne bedienerfout"
 
-#: ../libpurple/protocols/jabber/jabber.c:1857
+#: ../libpurple/protocols/jabber/jabber.c:1835
 msgid "Item Not Found"
 msgstr "Item nie gevind nie"
 
-#: ../libpurple/protocols/jabber/jabber.c:1859
+#: ../libpurple/protocols/jabber/jabber.c:1837
 msgid "Malformed XMPP ID"
 msgstr "Wanvormde XMPP-ID"
 
-#: ../libpurple/protocols/jabber/jabber.c:1861
+#: ../libpurple/protocols/jabber/jabber.c:1839
 msgid "Not Acceptable"
 msgstr "Nie aanvaarbaar nie"
 
-#: ../libpurple/protocols/jabber/jabber.c:1863
+#: ../libpurple/protocols/jabber/jabber.c:1841
 msgid "Not Allowed"
 msgstr "Nie toegelaat nie"
 
-#: ../libpurple/protocols/jabber/jabber.c:1867
+#: ../libpurple/protocols/jabber/jabber.c:1845
 msgid "Payment Required"
 msgstr "Betaling vereis"
 
-#: ../libpurple/protocols/jabber/jabber.c:1869
+#: ../libpurple/protocols/jabber/jabber.c:1847
 msgid "Recipient Unavailable"
 msgstr "Ontvanger nie beskikbaar nie"
 
-#: ../libpurple/protocols/jabber/jabber.c:1873
+#: ../libpurple/protocols/jabber/jabber.c:1851
 msgid "Registration Required"
 msgstr "Registrasie vereis"
 
-#: ../libpurple/protocols/jabber/jabber.c:1875
+#: ../libpurple/protocols/jabber/jabber.c:1853
 msgid "Remote Server Not Found"
 msgstr "Afgeleë bediener nie gevind nie"
 
-#: ../libpurple/protocols/jabber/jabber.c:1877
+#: ../libpurple/protocols/jabber/jabber.c:1855
 msgid "Remote Server Timeout"
 msgstr "Afgeleëbediener-uittelling"
 
-#: ../libpurple/protocols/jabber/jabber.c:1879
+#: ../libpurple/protocols/jabber/jabber.c:1857
 msgid "Server Overloaded"
 msgstr "Bediener oorlaai"
 
-#: ../libpurple/protocols/jabber/jabber.c:1881
+#: ../libpurple/protocols/jabber/jabber.c:1859
 msgid "Service Unavailable"
 msgstr "Diens nie beskikbaar nie"
 
-#: ../libpurple/protocols/jabber/jabber.c:1883
+#: ../libpurple/protocols/jabber/jabber.c:1861
 msgid "Subscription Required"
 msgstr "Inskrywing vereis"
 
-#: ../libpurple/protocols/jabber/jabber.c:1885
+#: ../libpurple/protocols/jabber/jabber.c:1863
 msgid "Unexpected Request"
 msgstr "Onverwagde versoek"
 
-#: ../libpurple/protocols/jabber/jabber.c:1892
+#: ../libpurple/protocols/jabber/jabber.c:1870
 msgid "Authorization Aborted"
 msgstr "Magtiging gestaak"
 
-#: ../libpurple/protocols/jabber/jabber.c:1894
+#: ../libpurple/protocols/jabber/jabber.c:1872
 msgid "Incorrect encoding in authorization"
 msgstr "Verkeerde enkodering in magtiging"
 
-#: ../libpurple/protocols/jabber/jabber.c:1897
+#: ../libpurple/protocols/jabber/jabber.c:1875
 msgid "Invalid authzid"
 msgstr "Ongeldige authzid"
 
-#: ../libpurple/protocols/jabber/jabber.c:1900
+#: ../libpurple/protocols/jabber/jabber.c:1878
 msgid "Invalid Authorization Mechanism"
 msgstr "Ongeldige magtigingmeganisme"
 
-#: ../libpurple/protocols/jabber/jabber.c:1903
+#: ../libpurple/protocols/jabber/jabber.c:1881
 msgid "Authorization mechanism too weak"
 msgstr "Magtigingmeganisme te swak"
 
-#: ../libpurple/protocols/jabber/jabber.c:1911
+#: ../libpurple/protocols/jabber/jabber.c:1889
 msgid "Temporary Authentication Failure"
 msgstr "Tydlike stawingmislukking"
 
-#: ../libpurple/protocols/jabber/jabber.c:1914
+#: ../libpurple/protocols/jabber/jabber.c:1892
 msgid "Authentication Failure"
 msgstr "Stawingmislukking"
 
-#: ../libpurple/protocols/jabber/jabber.c:1920
+#: ../libpurple/protocols/jabber/jabber.c:1898
 msgid "Bad Format"
 msgstr "Slegte formaat"
 
-#: ../libpurple/protocols/jabber/jabber.c:1922
+#: ../libpurple/protocols/jabber/jabber.c:1900
 msgid "Bad Namespace Prefix"
 msgstr "Slegte naamruimte-voorvoegsel"
 
-#: ../libpurple/protocols/jabber/jabber.c:1925
+#: ../libpurple/protocols/jabber/jabber.c:1903
 msgid "Resource Conflict"
 msgstr "Hulpbron-konflik"
 
-#: ../libpurple/protocols/jabber/jabber.c:1927
-#: ../libpurple/protocols/silc/silc.c:244
+#: ../libpurple/protocols/jabber/jabber.c:1905
+#: ../libpurple/protocols/silc/silc.c:344
 #: ../libpurple/protocols/silc10/ops.c:1720
 msgid "Connection Timeout"
 msgstr "Verbinding-uittelling"
 
-#: ../libpurple/protocols/jabber/jabber.c:1929
+#: ../libpurple/protocols/jabber/jabber.c:1907
 msgid "Host Gone"
 msgstr "Gasheer weg"
 
-#: ../libpurple/protocols/jabber/jabber.c:1931
+#: ../libpurple/protocols/jabber/jabber.c:1909
 msgid "Host Unknown"
 msgstr "Gasheer onbekend"
 
-#: ../libpurple/protocols/jabber/jabber.c:1933
+#: ../libpurple/protocols/jabber/jabber.c:1911
 msgid "Improper Addressing"
 msgstr "Onbehoorlike adressering"
 
-#: ../libpurple/protocols/jabber/jabber.c:1937
+#: ../libpurple/protocols/jabber/jabber.c:1915
 msgid "Invalid ID"
 msgstr "Ongeldige ID"
 
-#: ../libpurple/protocols/jabber/jabber.c:1939
+#: ../libpurple/protocols/jabber/jabber.c:1917
 msgid "Invalid Namespace"
 msgstr "Ongeldige naamruimte"
 
-#: ../libpurple/protocols/jabber/jabber.c:1941
+#: ../libpurple/protocols/jabber/jabber.c:1919
 msgid "Invalid XML"
 msgstr "Ongeldige XML"
 
-#: ../libpurple/protocols/jabber/jabber.c:1943
+#: ../libpurple/protocols/jabber/jabber.c:1921
 msgid "Non-matching Hosts"
 msgstr "Niepassende gashere"
 
-#: ../libpurple/protocols/jabber/jabber.c:1947
+#: ../libpurple/protocols/jabber/jabber.c:1925
 msgid "Policy Violation"
 msgstr "Beleidskending"
 
-#: ../libpurple/protocols/jabber/jabber.c:1949
+#: ../libpurple/protocols/jabber/jabber.c:1927
 msgid "Remote Connection Failed"
 msgstr "Afgeleë verbinding het misluk"
 
-#: ../libpurple/protocols/jabber/jabber.c:1951
+#: ../libpurple/protocols/jabber/jabber.c:1929
 msgid "Resource Constraint"
 msgstr "Hulpbron-beperking"
 
-#: ../libpurple/protocols/jabber/jabber.c:1953
+#: ../libpurple/protocols/jabber/jabber.c:1931
 msgid "Restricted XML"
 msgstr "Ingeperkte XML"
 
-#: ../libpurple/protocols/jabber/jabber.c:1955
+#: ../libpurple/protocols/jabber/jabber.c:1933
 msgid "See Other Host"
 msgstr "Sien ander gasheer"
 
-#: ../libpurple/protocols/jabber/jabber.c:1957
+#: ../libpurple/protocols/jabber/jabber.c:1935
 msgid "System Shutdown"
 msgstr "Stelselafsluiting"
 
-#: ../libpurple/protocols/jabber/jabber.c:1959
+#: ../libpurple/protocols/jabber/jabber.c:1937
 msgid "Undefined Condition"
 msgstr "Ongedefinieerde verbinding"
 
-#: ../libpurple/protocols/jabber/jabber.c:1961
+#: ../libpurple/protocols/jabber/jabber.c:1939
 msgid "Unsupported Encoding"
-msgstr "Enkodering nie gesteun nie"
-
-#: ../libpurple/protocols/jabber/jabber.c:1963
+msgstr "Niegesteunde enkodering"
+
+#: ../libpurple/protocols/jabber/jabber.c:1941
 msgid "Unsupported Stanza Type"
-msgstr "Nieondersteunde stanzatipe"
-
-#: ../libpurple/protocols/jabber/jabber.c:1965
+msgstr "Niegesteunde stanzatipe"
+
+#: ../libpurple/protocols/jabber/jabber.c:1943
 msgid "Unsupported Version"
-msgstr "Weergawe nie gesteun nie"
-
-#: ../libpurple/protocols/jabber/jabber.c:1967
+msgstr "Niegesteunde weergawe"
+
+#: ../libpurple/protocols/jabber/jabber.c:1945
 msgid "XML Not Well Formed"
 msgstr "XML nie goed gevorm nie"
 
-#: ../libpurple/protocols/jabber/jabber.c:1969
+#: ../libpurple/protocols/jabber/jabber.c:1947
 msgid "Stream Error"
 msgstr "Stroomfout"
 
-#: ../libpurple/protocols/jabber/jabber.c:2052
+#: ../libpurple/protocols/jabber/jabber.c:2030
 #, c-format
 msgid "Unable to ban user %s"
 msgstr "Kan nie gebruiker %s verban nie"
 
-#: ../libpurple/protocols/jabber/jabber.c:2072
+#: ../libpurple/protocols/jabber/jabber.c:2050
 #, c-format
 msgid "Unknown affiliation: \"%s\""
 msgstr "Onbekende affiliasie: \"%s\""
 
-#: ../libpurple/protocols/jabber/jabber.c:2077
+#: ../libpurple/protocols/jabber/jabber.c:2055
 #, c-format
 msgid "Unable to affiliate user %s as \"%s\""
 msgstr "Kan nie gebruiker %s as \"%s\" affilieer nie"
 
-#: ../libpurple/protocols/jabber/jabber.c:2096
+#: ../libpurple/protocols/jabber/jabber.c:2074
 #, c-format
 msgid "Unknown role: \"%s\""
 msgstr "Onbekende rol: \"%s\""
 
-#: ../libpurple/protocols/jabber/jabber.c:2101
+#: ../libpurple/protocols/jabber/jabber.c:2079
 #, c-format
 msgid "Unable to set role \"%s\" for user: %s"
 msgstr "Kan nie rol \"%s\" vir gebruiker %s stel nie"
 
-#: ../libpurple/protocols/jabber/jabber.c:2154
+#: ../libpurple/protocols/jabber/jabber.c:2132
 #, c-format
 msgid "Unable to kick user %s"
 msgstr "Kan nie gebruiker %s skop nie"
 
-#: ../libpurple/protocols/jabber/jabber.c:2185
-#, fuzzy, c-format
+#: ../libpurple/protocols/jabber/jabber.c:2163
+#, c-format
 msgid "Unable to ping user %s"
-msgstr "Kan nie gebruiker %s verban nie"
-
-#: ../libpurple/protocols/jabber/jabber.c:2207
-#: ../libpurple/protocols/jabber/jabber.c:2217
+msgstr "Kan nie gebruiker %s pieng nie"
+
+#: ../libpurple/protocols/jabber/jabber.c:2181
+#: ../libpurple/protocols/jabber/jabber.c:2192
 #, c-format
 msgid "Unable to buzz, because there is nothing known about user %s."
 msgstr ""
-
-#: ../libpurple/protocols/jabber/jabber.c:2213
+"Kon nie zoempie stuur nie omdat daar niks oor gebruiker %s bekend is nie."
+
+#: ../libpurple/protocols/jabber/jabber.c:2187
 #, c-format
 msgid "Unable to buzz, because user %s might be offline."
-msgstr ""
-
-#: ../libpurple/protocols/jabber/jabber.c:2239
-#, fuzzy, c-format
+msgstr "Kon nie zoempie stuur nie omdat gebruiker %s dalk vanlyn is."
+
+#: ../libpurple/protocols/jabber/jabber.c:2218
+#, c-format
 msgid "Unable to buzz, because the user %s does not support it."
-msgstr "Kan nie lêer stuur aan %s nie: die gebruiker steun nie lêeroordrag nie"
-
-#: ../libpurple/protocols/jabber/jabber.c:2253
+msgstr ""
+"Kon nie zoempie stuur nie omdat die gebruiker %s dit nie ondersteun nie."
+
+#: ../libpurple/protocols/jabber/jabber.c:2240
+#: ../libpurple/protocols/yahoo/yahoo.c:4121
+msgid "Buzz"
+msgstr "Zoempie"
+
+#: ../libpurple/protocols/jabber/jabber.c:2241
+#: ../libpurple/protocols/jabber/message.c:308
+#: ../libpurple/protocols/yahoo/yahoo.c:4122
+#, c-format
+msgid "%s has buzzed you!"
+msgstr "%s het u 'n zoempie gestuur!"
+
+#: ../libpurple/protocols/jabber/jabber.c:2242
+#: ../libpurple/protocols/yahoo/yahoo.c:4123
+#, c-format
+msgid "Buzzing %s..."
+msgstr "Stuur zoempie aan %s..."
+
+#: ../libpurple/protocols/jabber/jabber.c:2274
 msgid "config:  Configure a chat room."
 msgstr "config:  Konfigureer 'n geselsiekamer."
 
-#: ../libpurple/protocols/jabber/jabber.c:2257
+#: ../libpurple/protocols/jabber/jabber.c:2278
 msgid "configure:  Configure a chat room."
 msgstr "configure:  Konfigureer 'n geselsiekamer."
 
-#: ../libpurple/protocols/jabber/jabber.c:2266
+#: ../libpurple/protocols/jabber/jabber.c:2287
 msgid "part [room]:  Leave the room."
 msgstr "part [kamer]:  Verlaat die kamer."
 
-#: ../libpurple/protocols/jabber/jabber.c:2271
+#: ../libpurple/protocols/jabber/jabber.c:2292
 msgid "register:  Register with a chat room."
 msgstr "register:  Registreer met 'n geselsiekamer."
 
-#: ../libpurple/protocols/jabber/jabber.c:2277
+#: ../libpurple/protocols/jabber/jabber.c:2298
 msgid "topic [new topic]:  View or change the topic."
 msgstr "topic [nuwe onderwerp]:  Bekyk of verander die onderwerp."
 
-#: ../libpurple/protocols/jabber/jabber.c:2283
+#: ../libpurple/protocols/jabber/jabber.c:2304
 msgid "ban &lt;user&gt; [room]:  Ban a user from the room."
 msgstr "ban &lt;gebruiker&gt; [kamer]:  Verban 'n gebruiker uit die kamer."
 
-#: ../libpurple/protocols/jabber/jabber.c:2289
+#: ../libpurple/protocols/jabber/jabber.c:2310
 msgid ""
 "affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Set a user's "
 "affiliation with the room."
@@ -6080,7 +6096,7 @@
 "affiliate &lt;gebruiker&gt; &lt;eienaar|admin|lid|verworpene|geen&gt;: Stel "
 "'n gebruiker se affiliasie met die kamer in."
 
-#: ../libpurple/protocols/jabber/jabber.c:2295
+#: ../libpurple/protocols/jabber/jabber.c:2316
 msgid ""
 "role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: Set a user's "
 "role in the room."
@@ -6088,34 +6104,34 @@
 "role &lt;gebruiker&gt; &lt;moderator|deelnemer|besoeker|geen&gt;: Stel 'n "
 "gebruiker se rol in die kamer in."
 
-#: ../libpurple/protocols/jabber/jabber.c:2301
+#: ../libpurple/protocols/jabber/jabber.c:2322
 msgid "invite &lt;user&gt; [message]:  Invite a user to the room."
 msgstr ""
 "invite &lt;gebruiker&gt; [boodskap]:  Nooi 'n gebruiker uit na die kamer."
 
-#: ../libpurple/protocols/jabber/jabber.c:2307
+#: ../libpurple/protocols/jabber/jabber.c:2328
 msgid "join: &lt;room&gt; [server]:  Join a chat on this server."
 msgstr ""
 "join: &lt;kamer&gt; [bediener]:  Sluit by 'n geselsie aan op hierdie "
 "bediener."
 
-#: ../libpurple/protocols/jabber/jabber.c:2313
+#: ../libpurple/protocols/jabber/jabber.c:2334
 msgid "kick &lt;user&gt; [room]:  Kick a user from the room."
 msgstr "kick &lt;gebruiker&gt; [kamer]:  Skop 'n gebruiker uit die kamer."
 
-#: ../libpurple/protocols/jabber/jabber.c:2318
+#: ../libpurple/protocols/jabber/jabber.c:2339
 msgid ""
 "msg &lt;user&gt; &lt;message&gt;:  Send a private message to another user."
 msgstr ""
 "msg &lt;gebruiker&gt; &lt;boodskap&gt;:  Stuur 'n private boodskap aan 'n "
 "ander gebruiker."
 
-#: ../libpurple/protocols/jabber/jabber.c:2324
+#: ../libpurple/protocols/jabber/jabber.c:2345
 msgid "ping &lt;jid&gt;:\tPing a user/component/server."
-msgstr ""
-
-#: ../libpurple/protocols/jabber/jabber.c:2329
-#: ../libpurple/protocols/yahoo/yahoo.c:4145
+msgstr "ping &lt;jid&gt;:\tPieng 'n gebruiker/komponent/bediener."
+
+#: ../libpurple/protocols/jabber/jabber.c:2350
+#: ../libpurple/protocols/yahoo/yahoo.c:4147
 msgid "buzz: Buzz a user to get their attention"
 msgstr "buzz: Stuur 'n gebruiker 'n zoempie om sy aandag te trek"
 
@@ -6135,74 +6151,68 @@
 msgstr "XMPP-protokolinprop"
 
 #. Translators: 'domain' is used here in the context of Internet domains, e.g. pidgin.im
-#: ../libpurple/protocols/jabber/libxmpp.c:202 ../pidgin/gtkaccount.c:506
+#: ../libpurple/protocols/jabber/libxmpp.c:205 ../pidgin/gtkaccount.c:509
 msgid "Domain"
 msgstr "Domein"
 
-#: ../libpurple/protocols/jabber/libxmpp.c:210
+#: ../libpurple/protocols/jabber/libxmpp.c:213
 msgid "Require SSL/TLS"
-msgstr ""
-
-#: ../libpurple/protocols/jabber/libxmpp.c:214
+msgstr "Vereis SSL/TLS"
+
+#: ../libpurple/protocols/jabber/libxmpp.c:217
 msgid "Force old (port 5223) SSL"
 msgstr "Dwing ou SSL (poort 5223)"
 
-#: ../libpurple/protocols/jabber/libxmpp.c:219
+#: ../libpurple/protocols/jabber/libxmpp.c:222
 msgid "Allow plaintext auth over unencrypted streams"
 msgstr "Laat skoonteksstawing oor ongeënkripteerde strome toe"
 
-#: ../libpurple/protocols/jabber/libxmpp.c:224
-#: ../libpurple/protocols/myspace/myspace.c:3277
-#: ../libpurple/protocols/simple/simple.c:1902
+#: ../libpurple/protocols/jabber/libxmpp.c:227
+#: ../libpurple/protocols/myspace/myspace.c:3283
+#: ../libpurple/protocols/simple/simple.c:2067
 msgid "Connect port"
 msgstr "Verbindingspoort"
 
 #. TODO: default to automatically try different ports. Make the user be
 #. * able to set the first port to try (like LastConnectedPort in Windows client).
 #. Account options
-#: ../libpurple/protocols/jabber/libxmpp.c:228
-#: ../libpurple/protocols/myspace/myspace.c:3274
-#: ../libpurple/protocols/silc/silc.c:1914
-#: ../libpurple/protocols/silc10/silc.c:1857 ../pidgin/gtkaccount.c:837
+#: ../libpurple/protocols/jabber/libxmpp.c:231
+#: ../libpurple/protocols/myspace/myspace.c:3280
+#: ../libpurple/protocols/silc/silc.c:2045
+#: ../libpurple/protocols/silc10/silc.c:1860 ../pidgin/gtkaccount.c:840
 msgid "Connect server"
-msgstr "Verbind bediener"
+msgstr "Koppel bediener"
 
 #: ../libpurple/protocols/jabber/message.c:106
 #, c-format
 msgid "%s has left the conversation."
 msgstr "%s het die gesprek verlaat."
 
-#: ../libpurple/protocols/jabber/message.c:161
+#: ../libpurple/protocols/jabber/message.c:162
 #, c-format
 msgid "Message from %s"
 msgstr "Boodskap van %s"
 
-#: ../libpurple/protocols/jabber/message.c:225
+#: ../libpurple/protocols/jabber/message.c:226
 #, c-format
 msgid "%s has set the topic to: %s"
 msgstr "%s het die onderwerp gestel na: %s"
 
-#: ../libpurple/protocols/jabber/message.c:227
+#: ../libpurple/protocols/jabber/message.c:228
 #, c-format
 msgid "The topic is: %s"
 msgstr "Die onderwerp is: %s"
 
-#: ../libpurple/protocols/jabber/message.c:275
+#: ../libpurple/protocols/jabber/message.c:276
 #, c-format
 msgid "Message delivery to %s failed: %s"
 msgstr "Boodskapaflewering na %s het misluk: %s"
 
-#: ../libpurple/protocols/jabber/message.c:278
+#: ../libpurple/protocols/jabber/message.c:279
 msgid "XMPP Message Error"
-msgstr "XMPP-foutboodskap"
-
-#: ../libpurple/protocols/jabber/message.c:307
-#: ../libpurple/protocols/yahoo/yahoo.c:4120
-#, fuzzy, c-format
-msgid "%s has buzzed you!"
-msgstr "%s het aangemeld."
-
-#: ../libpurple/protocols/jabber/message.c:407
+msgstr "XMPP-boodskapfout"
+
+#: ../libpurple/protocols/jabber/message.c:408
 #, c-format
 msgid " (Code %s)"
 msgstr " (Kode %s)"
@@ -6211,39 +6221,39 @@
 msgid "XML Parse error"
 msgstr "XML-ontleedfout"
 
-#: ../libpurple/protocols/jabber/presence.c:427
+#: ../libpurple/protocols/jabber/presence.c:435
 msgid "Unknown Error in presence"
 msgstr "Onbekende fout in teenwoordigheid"
 
-#: ../libpurple/protocols/jabber/presence.c:508
-#: ../libpurple/protocols/jabber/presence.c:509
+#: ../libpurple/protocols/jabber/presence.c:516
+#: ../libpurple/protocols/jabber/presence.c:517
 msgid "Create New Room"
 msgstr "Skep nuwe kamer"
 
-#: ../libpurple/protocols/jabber/presence.c:510
+#: ../libpurple/protocols/jabber/presence.c:518
 msgid ""
 "You are creating a new room.  Would you like to configure it, or accept the "
 "default settings?"
 msgstr ""
 "U skep 'n nuwe kamer.  Wil u dit opstel of die verstekinstellings aanvaar?"
 
-#: ../libpurple/protocols/jabber/presence.c:516
+#: ../libpurple/protocols/jabber/presence.c:524
 msgid "_Configure Room"
 msgstr "_Stel kamer op"
 
-#: ../libpurple/protocols/jabber/presence.c:517
+#: ../libpurple/protocols/jabber/presence.c:525
 msgid "_Accept Defaults"
 msgstr "_Aanvaar verstek"
 
-#: ../libpurple/protocols/jabber/presence.c:559
+#: ../libpurple/protocols/jabber/presence.c:567
 #, c-format
 msgid "Error in chat %s"
 msgstr "Fout in geselsie %s"
 
-#: ../libpurple/protocols/jabber/presence.c:563
+#: ../libpurple/protocols/jabber/presence.c:571
 #, c-format
 msgid "Error joining chat %s"
-msgstr "Fout met aansluiting by geselsie %s"
+msgstr "Kon nie by geselsie %s aansluit nie"
 
 #: ../libpurple/protocols/jabber/si.c:775
 #, c-format
@@ -6275,70 +6285,68 @@
 #: ../libpurple/protocols/jabber/si.c:857
 #, c-format
 msgid "Please select which resource of %s you would like to send a file to"
-msgstr "Kies asb. aan watter hulpbron van %s u 'n lêer wil stuur"
+msgstr "Kies gerus aan watter hulpbron van %s u 'n lêer wil stuur"
 
 #: ../libpurple/protocols/jabber/si.c:873
 msgid "Select a Resource"
 msgstr "Kies 'n hulpbron"
 
-#: ../libpurple/protocols/jabber/usermood.c:179
-#: ../libpurple/protocols/jabber/usermood.c:180
-#, fuzzy
+#: ../libpurple/protocols/jabber/usermood.c:197
+#: ../libpurple/protocols/jabber/usermood.c:198
 msgid "Edit User Mood"
-msgstr "Gebruikermodusse"
-
-#: ../libpurple/protocols/jabber/usermood.c:181
+msgstr "Redigeer gebruikerstemming"
+
+#: ../libpurple/protocols/jabber/usermood.c:199
 msgid "Please select your mood from the list."
-msgstr ""
-
-#: ../libpurple/protocols/jabber/usermood.c:183
+msgstr "Kies asseblief u stemming uit die lys."
+
+#: ../libpurple/protocols/jabber/usermood.c:201
 #: ../libpurple/protocols/jabber/usernick.c:78
-#, fuzzy
 msgid "Set"
-msgstr "_Stel"
-
-#: ../libpurple/protocols/jabber/usermood.c:191
-#, fuzzy
+msgstr "Stel"
+
+#: ../libpurple/protocols/jabber/usermood.c:209
 msgid "Set Mood..."
-msgstr "Stuur kitsboodskap..."
+msgstr "Stel stemming op..."
 
 #: ../libpurple/protocols/jabber/usernick.c:76
-#, fuzzy
 msgid "Set User Nickname"
-msgstr "Stel gebruikerlimiet"
+msgstr "Stel gebruikerbynaam op"
 
 #: ../libpurple/protocols/jabber/usernick.c:76
-#, fuzzy
 msgid "Please specify a new nickname for you."
-msgstr "Gee asb. die nuwe naam vir %s"
+msgstr "Spesifiseer asseblief 'n nuwe bynaam vir uself."
 
 #: ../libpurple/protocols/jabber/usernick.c:77
 msgid ""
 "This information is visible to all contacts on your contact list, so choose "
 "something appropriate."
 msgstr ""
-
-#: ../libpurple/protocols/jabber/usernick.c:99
-#, fuzzy
+"Hierdie inligting is aan alle kontakte op u kontaklys sigbaar, kies dus "
+"sorgvuldig."
+
+#: ../libpurple/protocols/jabber/usernick.c:100
 msgid "Set Nickname..."
-msgstr "Bynaam"
+msgstr "Stel bynaam op..."
 
 #: ../libpurple/protocols/jabber/xdata.c:378
-#, fuzzy
 msgid "Actions"
-msgstr "Aksie"
+msgstr "Aksies"
 
 #: ../libpurple/protocols/jabber/xdata.c:380
-#, fuzzy
 msgid "Select an action"
-msgstr "Kies 'n lêer"
-
-#: ../libpurple/protocols/msn/dialog.c:110
+msgstr "Stel 'n aksie op"
+
+#: ../libpurple/protocols/msn/contact.c:712
+msgid "Unable to retrieve MSN Address Book"
+msgstr "Kan nie MSN-adresboek haal nie"
+
+#: ../libpurple/protocols/msn/dialog.c:118
 #, c-format
 msgid "Buddy list synchronization issue in %s (%s)"
 msgstr "Vriendelys-sinchronisasieprobleem in %s (%s)"
 
-#: ../libpurple/protocols/msn/dialog.c:116
+#: ../libpurple/protocols/msn/dialog.c:124
 #, c-format
 msgid ""
 "%s on the local list is inside the group \"%s\" but not on the server list. "
@@ -6347,7 +6355,7 @@
 "%s op die plaaslike lys is binne die groep \"%s\" maar nie op die "
 "bedienerlys nie. Wil u hierdie vriend byvoeg?"
 
-#: ../libpurple/protocols/msn/dialog.c:124
+#: ../libpurple/protocols/msn/dialog.c:132
 #, c-format
 msgid ""
 "%s is on the local list but not on the server list. Do you want this buddy "
@@ -6357,282 +6365,229 @@
 "vriend byvoeg?"
 
 #: ../libpurple/protocols/msn/error.c:36
-#, c-format
 msgid "Unable to parse message"
 msgstr "Kon nie boodskap ontleed nie"
 
 #: ../libpurple/protocols/msn/error.c:41
-#, c-format
 msgid "Syntax Error (probably a client bug)"
 msgstr "Sintaksfout (dalk 'n kliëntfout)"
 
 #: ../libpurple/protocols/msn/error.c:46
-#, c-format
 msgid "Invalid e-mail address"
 msgstr "Ongeldige e-posadres"
 
 #: ../libpurple/protocols/msn/error.c:49
-#, c-format
 msgid "User does not exist"
 msgstr "Gebruiker bestaan nie"
 
 #: ../libpurple/protocols/msn/error.c:53
-#, c-format
 msgid "Fully qualified domain name missing"
 msgstr "Volledig gekwalifiseerde domeinnaam word vermis"
 
 #: ../libpurple/protocols/msn/error.c:56
-#, c-format
 msgid "Already logged in"
 msgstr "Reeds aangemeld"
 
 #: ../libpurple/protocols/msn/error.c:59
-#, c-format
 msgid "Invalid screen name"
 msgstr "Ongeldige skermnaam"
 
 #: ../libpurple/protocols/msn/error.c:62
-#, c-format
 msgid "Invalid friendly name"
 msgstr "Ongeldige vriendelike naam"
 
 #: ../libpurple/protocols/msn/error.c:65
-#, c-format
 msgid "List full"
 msgstr "Lys vol"
 
 #: ../libpurple/protocols/msn/error.c:68
-#, c-format
 msgid "Already there"
 msgstr "Reeds daar"
 
 #: ../libpurple/protocols/msn/error.c:72
-#, c-format
 msgid "Not on list"
 msgstr "Nie op lys nie"
 
 #: ../libpurple/protocols/msn/error.c:75
 #: ../libpurple/protocols/zephyr/zephyr.c:756
-#, c-format
 msgid "User is offline"
-msgstr "Gebruiker is aflyn"
+msgstr "Gebruiker is vanlyn"
 
 #: ../libpurple/protocols/msn/error.c:78
-#, c-format
 msgid "Already in the mode"
 msgstr "Reeds in die modus"
 
 #: ../libpurple/protocols/msn/error.c:82
-#, c-format
 msgid "Already in opposite list"
 msgstr "Reeds in teenoorgestelde-lys"
 
 #: ../libpurple/protocols/msn/error.c:86
-#, c-format
 msgid "Too many groups"
 msgstr "Te veel groepe"
 
 #: ../libpurple/protocols/msn/error.c:89
-#, c-format
 msgid "Invalid group"
 msgstr "Ongeldige groep"
 
 #: ../libpurple/protocols/msn/error.c:92
-#, c-format
 msgid "User not in group"
 msgstr "Gebruiker nie in groep nie"
 
 #: ../libpurple/protocols/msn/error.c:95
-#, c-format
 msgid "Group name too long"
 msgstr "Groepnaam te lank"
 
 #: ../libpurple/protocols/msn/error.c:98
-#, c-format
 msgid "Cannot remove group zero"
 msgstr "Kan nie groep nul verwyder nie"
 
 #: ../libpurple/protocols/msn/error.c:103
-#, c-format
 msgid "Tried to add a user to a group that doesn't exist"
 msgstr "Het probeer om 'n gebruiker by niebestaande groep te voeg"
 
 #: ../libpurple/protocols/msn/error.c:107
-#, c-format
 msgid "Switchboard failed"
 msgstr "Skakelbord het misluk"
 
 #: ../libpurple/protocols/msn/error.c:111
-#, c-format
 msgid "Notify transfer failed"
 msgstr "Laat weet oordrag het misluk"
 
 #: ../libpurple/protocols/msn/error.c:116
-#, c-format
 msgid "Required fields missing"
 msgstr "Vereiste velde kort"
 
 #: ../libpurple/protocols/msn/error.c:120
-#, c-format
 msgid "Too many hits to a FND"
 msgstr "Te veel resultate vir 'n FND"
 
 #: ../libpurple/protocols/msn/error.c:124
 #: ../libpurple/protocols/oscar/oscar.c:120
-#, c-format
 msgid "Not logged in"
 msgstr "Nie aangemeld nie"
 
 #: ../libpurple/protocols/msn/error.c:128
-#, c-format
 msgid "Service temporarily unavailable"
 msgstr "Diens tydelik nie beskikbaar nie"
 
 #: ../libpurple/protocols/msn/error.c:131
-#, c-format
 msgid "Database server error"
 msgstr "Databasisbedienerfout"
 
 #: ../libpurple/protocols/msn/error.c:135
-#, c-format
 msgid "Command disabled"
-msgstr "Opdrag gedeaktiveer"
+msgstr "Bevel gedeaktiveer"
 
 #: ../libpurple/protocols/msn/error.c:139
-#, c-format
 msgid "File operation error"
 msgstr "Lêerbewerkingsfout"
 
 #: ../libpurple/protocols/msn/error.c:143
-#, c-format
 msgid "Memory allocation error"
 msgstr "Geheuetoekenningsfout"
 
 #: ../libpurple/protocols/msn/error.c:147
-#, c-format
 msgid "Wrong CHL value sent to server"
 msgstr "Verkeerde CHL-waarde aan bediener gestuur"
 
 #: ../libpurple/protocols/msn/error.c:152
-#, c-format
 msgid "Server busy"
 msgstr "Bediener besig"
 
 #: ../libpurple/protocols/msn/error.c:155
 #: ../libpurple/protocols/msn/error.c:170
 #: ../libpurple/protocols/msn/error.c:230
-#, c-format
 msgid "Server unavailable"
 msgstr "Bediener nie beskikbaar nie"
 
 #: ../libpurple/protocols/msn/error.c:158
-#, c-format
 msgid "Peer notification server down"
-msgstr "Ewekniekennisstel-bediener af"
+msgstr "Ewekniekennisgewing-bediener af"
 
 #: ../libpurple/protocols/msn/error.c:162
-#, c-format
 msgid "Database connect error"
 msgstr "Databasisverbindingsfout"
 
 #: ../libpurple/protocols/msn/error.c:167
-#, c-format
 msgid "Server is going down (abandon ship)"
 msgstr "Bediener dreig om te val (verlaat die skip)"
 
 #: ../libpurple/protocols/msn/error.c:174
-#, c-format
 msgid "Error creating connection"
-msgstr "Fout met skep van verbinding"
+msgstr "Kon nie verbinding daarstel nie"
 
 #: ../libpurple/protocols/msn/error.c:179
-#, c-format
 msgid "CVR parameters are either unknown or not allowed"
 msgstr "CVR-parameters is óf onbekend óf nie toegelaat nie"
 
 #: ../libpurple/protocols/msn/error.c:183
-#, c-format
 msgid "Unable to write"
 msgstr "Kan nie skryf nie"
 
 #: ../libpurple/protocols/msn/error.c:186
-#, c-format
 msgid "Session overload"
 msgstr "Sessie oorlaai"
 
 #: ../libpurple/protocols/msn/error.c:190
-#, c-format
 msgid "User is too active"
 msgstr "Gebruiker is te aktief"
 
 #: ../libpurple/protocols/msn/error.c:193
-#, c-format
 msgid "Too many sessions"
 msgstr "Te veel sessies"
 
 #: ../libpurple/protocols/msn/error.c:196
-#, c-format
 msgid "Passport not verified"
 msgstr "Paspoort nie geverifieer nie"
 
 #: ../libpurple/protocols/msn/error.c:199
-#, c-format
 msgid "Bad friend file"
 msgstr "Slegte vriendlêer"
 
 #: ../libpurple/protocols/msn/error.c:203
-#, c-format
 msgid "Not expected"
 msgstr "Nie verwag nie"
 
 #: ../libpurple/protocols/msn/error.c:209
-#, c-format
 msgid "Friendly name changes too rapidly"
 msgstr "Vriendelike naam verander te vinnig"
 
 #: ../libpurple/protocols/msn/error.c:218
-#, c-format
 msgid "Server too busy"
 msgstr "Bediener te besig"
 
 #: ../libpurple/protocols/msn/error.c:222
-#: ../libpurple/protocols/oscar/oscar.c:1380
-#: ../libpurple/protocols/silc/silc.c:233
+#: ../libpurple/protocols/oscar/oscar.c:1383
+#: ../libpurple/protocols/silc/silc.c:333
 #: ../libpurple/protocols/silc10/ops.c:1709
-#: ../libpurple/protocols/toc/toc.c:728 ../libpurple/proxy.c:1380
-#, c-format
+#: ../libpurple/protocols/toc/toc.c:728 ../libpurple/proxy.c:1393
 msgid "Authentication failed"
 msgstr "Stawing het misluk"
 
 #: ../libpurple/protocols/msn/error.c:225
-#, c-format
 msgid "Not allowed when offline"
-msgstr "Nie toegelaat wanneer aflyn nie"
+msgstr "Nie toegelaat wanneer vanlyn nie"
 
 #: ../libpurple/protocols/msn/error.c:233
-#, c-format
 msgid "Not accepting new users"
 msgstr "Aanvaar nie nuwe gebruikers nie"
 
 #: ../libpurple/protocols/msn/error.c:237
-#, c-format
 msgid "Kids Passport without parental consent"
 msgstr "Kinderwagwoord sonder ouertoestemming"
 
 #: ../libpurple/protocols/msn/error.c:241
-#, c-format
 msgid "Passport account not yet verified"
 msgstr "Wagwoordrekening nog nie geverifieer nie"
 
 #: ../libpurple/protocols/msn/error.c:244
-#, c-format
 msgid "Bad ticket"
 msgstr "Slegte kaartjie"
 
 #: ../libpurple/protocols/msn/error.c:249
 #, c-format
 msgid "Unknown Error Code %d"
-msgstr "Onbekende foutkode %d"
+msgstr "Onbekende fout, kode %d"
 
 #: ../libpurple/protocols/msn/error.c:263
 #, c-format
@@ -6641,47 +6596,47 @@
 
 #: ../libpurple/protocols/msn/msn.c:130
 msgid "Nudge"
-msgstr ""
+msgstr "Stootjie"
 
 #: ../libpurple/protocols/msn/msn.c:131
-#, fuzzy, c-format
+#, c-format
 msgid "%s has nudged you!"
-msgstr "%s het aangemeld."
+msgstr "%s het u 'n stootjie gegee!"
 
 #: ../libpurple/protocols/msn/msn.c:132
 #, c-format
 msgid "Nudging %s..."
-msgstr ""
+msgstr "Gee tans %s 'n stootjie..."
 
 #: ../libpurple/protocols/msn/msn.c:174
 msgid "Your new MSN friendly name is too long."
 msgstr "U nuwe MSN- vriendelike naam is te lank."
 
-#: ../libpurple/protocols/msn/msn.c:282
+#: ../libpurple/protocols/msn/msn.c:286
 msgid "Set your friendly name."
 msgstr "Stel u vriendelike naam in."
 
-#: ../libpurple/protocols/msn/msn.c:283
+#: ../libpurple/protocols/msn/msn.c:287
 msgid "This is the name that other MSN buddies will see you as."
 msgstr "Hierdie is die naam hoe ander MSN-vriende u sal sien."
 
-#: ../libpurple/protocols/msn/msn.c:301
+#: ../libpurple/protocols/msn/msn.c:305
 msgid "Set your home phone number."
 msgstr "Stel u huisfoonnommer op."
 
-#: ../libpurple/protocols/msn/msn.c:318
+#: ../libpurple/protocols/msn/msn.c:322
 msgid "Set your work phone number."
 msgstr "Stel u werkfoonnommer op."
 
-#: ../libpurple/protocols/msn/msn.c:335
+#: ../libpurple/protocols/msn/msn.c:339
 msgid "Set your mobile phone number."
 msgstr "Stel u selfoonnommer op."
 
-#: ../libpurple/protocols/msn/msn.c:350
+#: ../libpurple/protocols/msn/msn.c:354
 msgid "Allow MSN Mobile pages?"
 msgstr "Laat MSN-selfoonbladsye toe?"
 
-#: ../libpurple/protocols/msn/msn.c:351
+#: ../libpurple/protocols/msn/msn.c:355
 msgid ""
 "Do you want to allow or disallow people on your buddy list to send you MSN "
 "Mobile pages to your cell phone or other mobile device?"
@@ -6689,341 +6644,344 @@
 "Wil u toelaat of weier dat mense op u vriendelys vir u MSN-selfoonbladsye na "
 "u selfoon of ander mobiele toestel stuur?"
 
-#: ../libpurple/protocols/msn/msn.c:357
+#: ../libpurple/protocols/msn/msn.c:361
 msgid "Allow"
 msgstr "Toelaat"
 
-#: ../libpurple/protocols/msn/msn.c:358
+#: ../libpurple/protocols/msn/msn.c:362
 msgid "Disallow"
 msgstr "Weier"
 
-#: ../libpurple/protocols/msn/msn.c:374
+#: ../libpurple/protocols/msn/msn.c:378
 msgid "This Hotmail account may not be active."
 msgstr "Hierdie Hotmail-rekening is dalk nie aktief nie."
 
-#: ../libpurple/protocols/msn/msn.c:400
+#: ../libpurple/protocols/msn/msn.c:404
 msgid "Send a mobile message."
 msgstr "Stuur 'n selfoonboodskap."
 
-#: ../libpurple/protocols/msn/msn.c:402
+#: ../libpurple/protocols/msn/msn.c:406
 msgid "Page"
 msgstr "Bladsy"
 
-#: ../libpurple/protocols/msn/msn.c:549
-msgid "Has you"
-msgstr "Het u"
-
-#: ../libpurple/protocols/msn/msn.c:579 ../libpurple/protocols/msn/state.c:33
-#: ../libpurple/protocols/yahoo/yahoo.c:3077
-#: ../libpurple/protocols/yahoo/yahoo.c:3761
+#: ../libpurple/protocols/msn/msn.c:688 ../libpurple/protocols/msn/state.c:33
+#: ../libpurple/protocols/yahoo/yahoo.c:3079
+#: ../libpurple/protocols/yahoo/yahoo.c:3763
 msgid "Be Right Back"
 msgstr "Binnekort terug"
 
-#: ../libpurple/protocols/msn/msn.c:583 ../libpurple/protocols/msn/state.c:31
-#: ../libpurple/protocols/novell/novell.c:2822
-#: ../libpurple/protocols/novell/novell.c:2952
-#: ../libpurple/protocols/silc/buddy.c:1480
+#: ../libpurple/protocols/msn/msn.c:694 ../libpurple/protocols/msn/state.c:31
+#: ../libpurple/protocols/novell/novell.c:2827
+#: ../libpurple/protocols/novell/novell.c:2957
+#: ../libpurple/protocols/silc/buddy.c:1483
 #: ../libpurple/protocols/silc/silc.c:56
-#: ../libpurple/protocols/silc10/buddy.c:1480
+#: ../libpurple/protocols/silc10/buddy.c:1483
 #: ../libpurple/protocols/silc10/silc.c:47
-#: ../libpurple/protocols/yahoo/yahoo.c:3079
-#: ../libpurple/protocols/yahoo/yahoo.c:3764
+#: ../libpurple/protocols/yahoo/yahoo.c:3081
+#: ../libpurple/protocols/yahoo/yahoo.c:3766
 msgid "Busy"
 msgstr "Besig"
 
-#: ../libpurple/protocols/msn/msn.c:587
-#: ../libpurple/protocols/yahoo/yahoo.c:3087
-#: ../libpurple/protocols/yahoo/yahoo.c:3776
+#: ../libpurple/protocols/msn/msn.c:699
+#: ../libpurple/protocols/yahoo/yahoo.c:3089
+#: ../libpurple/protocols/yahoo/yahoo.c:3778
 msgid "On the Phone"
 msgstr "Op die foon"
 
-#: ../libpurple/protocols/msn/msn.c:591
-#: ../libpurple/protocols/yahoo/yahoo.c:3091
-#: ../libpurple/protocols/yahoo/yahoo.c:3782
+#: ../libpurple/protocols/msn/msn.c:704
+#: ../libpurple/protocols/yahoo/yahoo.c:3093
+#: ../libpurple/protocols/yahoo/yahoo.c:3784
 msgid "Out to Lunch"
 msgstr "Uit vir ete"
 
-#: ../libpurple/protocols/msn/msn.c:619
+#: ../libpurple/protocols/msn/msn.c:723
+msgid "Artist"
+msgstr "Kunstenaar"
+
+#: ../libpurple/protocols/msn/msn.c:724
+msgid "Album"
+msgstr "Album"
+
+#: ../libpurple/protocols/msn/msn.c:742
 msgid "Set Friendly Name..."
 msgstr "Stel vriendelike naam..."
 
-#: ../libpurple/protocols/msn/msn.c:624
+#: ../libpurple/protocols/msn/msn.c:747
 msgid "Set Home Phone Number..."
 msgstr "Stel huisfoonnommer..."
 
-#: ../libpurple/protocols/msn/msn.c:628
+#: ../libpurple/protocols/msn/msn.c:751
 msgid "Set Work Phone Number..."
-msgstr "Stel werkfoonnommer op...."
-
-#: ../libpurple/protocols/msn/msn.c:632
+msgstr "Stel werkfoonnommer op..."
+
+#: ../libpurple/protocols/msn/msn.c:755
 msgid "Set Mobile Phone Number..."
 msgstr "Stel selfoonnommer..."
 
-#: ../libpurple/protocols/msn/msn.c:638
+#: ../libpurple/protocols/msn/msn.c:761
 msgid "Enable/Disable Mobile Devices..."
 msgstr "Aktiveer/deaktiveer mobiele toestelle..."
 
-#: ../libpurple/protocols/msn/msn.c:643
+#: ../libpurple/protocols/msn/msn.c:766
 msgid "Allow/Disallow Mobile Pages..."
 msgstr "Laat toe/weier selfoonbladsye..."
 
-#: ../libpurple/protocols/msn/msn.c:654
+#: ../libpurple/protocols/msn/msn.c:777
 msgid "Open Hotmail Inbox"
 msgstr "Open Hotmail-inkassie"
 
-#: ../libpurple/protocols/msn/msn.c:678
+#: ../libpurple/protocols/msn/msn.c:801
 msgid "Send to Mobile"
 msgstr "Stuur na selfoon"
 
-#: ../libpurple/protocols/msn/msn.c:688
-#: ../libpurple/protocols/novell/novell.c:3408
+#: ../libpurple/protocols/msn/msn.c:811
+#: ../libpurple/protocols/novell/novell.c:3413
 msgid "Initiate _Chat"
 msgstr "Inisieer _geselsie"
 
-#: ../libpurple/protocols/msn/msn.c:726
+#: ../libpurple/protocols/msn/msn.c:849
 msgid "SSL support is needed for MSN. Please install a supported SSL library."
 msgstr ""
-"SSL-ondersteuning is nodig vir MSN. Installeer asb. 'n ondersteunde SSL-"
-"programmateek."
-
-#: ../libpurple/protocols/msn/msn.c:754
+"SSL-steun is nodig vir MSN. Installeer gerus 'n gesteunde SSL-programmateek."
+
+#: ../libpurple/protocols/msn/msn.c:877
 msgid "Failed to connect to server."
-msgstr "Om te verbind aan bediener, het misluk."
-
-#: ../libpurple/protocols/msn/msn.c:1510 ../libpurple/protocols/msn/msn.c:1858
+msgstr "Verbind aan bediener het misluk."
+
+#: ../libpurple/protocols/msn/msn.c:1661 ../libpurple/protocols/msn/msn.c:2004
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:808
 msgid "Error retrieving profile"
-msgstr "Fout met verkry van profiel"
-
-#: ../libpurple/protocols/msn/msn.c:1581 ../pidgin/plugins/convcolors.c:309
-#: ../pidgin/plugins/pidginrc.c:366
+msgstr "Kon nie profiel haal nie"
+
+#: ../libpurple/protocols/msn/msn.c:1727 ../pidgin/plugins/convcolors.c:309
+#: ../pidgin/plugins/pidginrc.c:360
 msgid "General"
 msgstr "Algemeen"
 
-#: ../libpurple/protocols/msn/msn.c:1588
-#: ../libpurple/protocols/myspace/user.c:110
-#: ../libpurple/protocols/oscar/oscar.c:3755
+#: ../libpurple/protocols/msn/msn.c:1734
+#: ../libpurple/protocols/myspace/user.c:115
+#: ../libpurple/protocols/oscar/oscar.c:3770
 #: ../libpurple/protocols/qq/buddy_info.c:45
 #: ../libpurple/protocols/qq/qq.c:221
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1081
 msgid "Age"
 msgstr "Ouderdom"
 
-#: ../libpurple/protocols/msn/msn.c:1590
+#: ../libpurple/protocols/msn/msn.c:1736
 #: ../libpurple/protocols/qq/buddy_info.c:51
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1096
 msgid "Occupation"
 msgstr "Beroep"
 
-#: ../libpurple/protocols/msn/msn.c:1591
-#: ../libpurple/protocols/myspace/user.c:119
-#: ../libpurple/protocols/novell/novell.c:1478
+#: ../libpurple/protocols/msn/msn.c:1737
+#: ../libpurple/protocols/myspace/user.c:123
+#: ../libpurple/protocols/novell/novell.c:1480
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1076
 #: ../libpurple/protocols/zephyr/zephyr.c:798
 #: ../libpurple/protocols/zephyr/zephyr.c:1215
 msgid "Location"
 msgstr "Ligging"
 
-#: ../libpurple/protocols/msn/msn.c:1596 ../libpurple/protocols/msn/msn.c:1788
-#: ../libpurple/protocols/msn/msn.c:1794 ../libpurple/protocols/msn/msn.c:1801
+#: ../libpurple/protocols/msn/msn.c:1742 ../libpurple/protocols/msn/msn.c:1934
+#: ../libpurple/protocols/msn/msn.c:1940 ../libpurple/protocols/msn/msn.c:1947
 msgid "Hobbies and Interests"
 msgstr "Stokperdjies en belangstellings"
 
-#: ../libpurple/protocols/msn/msn.c:1602 ../libpurple/protocols/msn/msn.c:1722
-#: ../libpurple/protocols/msn/msn.c:1728 ../libpurple/protocols/msn/msn.c:1735
-#: ../libpurple/protocols/msn/msn.c:1743 ../libpurple/protocols/msn/msn.c:1750
+#: ../libpurple/protocols/msn/msn.c:1748 ../libpurple/protocols/msn/msn.c:1868
+#: ../libpurple/protocols/msn/msn.c:1874 ../libpurple/protocols/msn/msn.c:1881
+#: ../libpurple/protocols/msn/msn.c:1889 ../libpurple/protocols/msn/msn.c:1896
 msgid "A Little About Me"
 msgstr "Iets meer oor my"
 
-#: ../libpurple/protocols/msn/msn.c:1619
+#: ../libpurple/protocols/msn/msn.c:1765
 msgid "Social"
 msgstr "Sosiaal"
 
-#: ../libpurple/protocols/msn/msn.c:1621
+#: ../libpurple/protocols/msn/msn.c:1767
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1086
 msgid "Marital Status"
 msgstr "Huwelikstatus"
 
-#: ../libpurple/protocols/msn/msn.c:1622
+#: ../libpurple/protocols/msn/msn.c:1768
 msgid "Interests"
 msgstr "Belangstellings"
 
-#: ../libpurple/protocols/msn/msn.c:1623
+#: ../libpurple/protocols/msn/msn.c:1769
 msgid "Pets"
 msgstr "Troeteldiere"
 
-#: ../libpurple/protocols/msn/msn.c:1624
+#: ../libpurple/protocols/msn/msn.c:1770
 msgid "Hometown"
 msgstr "Tuisdorp"
 
-#: ../libpurple/protocols/msn/msn.c:1625
+#: ../libpurple/protocols/msn/msn.c:1771
 msgid "Places Lived"
 msgstr "Plekke gewoon"
 
-#: ../libpurple/protocols/msn/msn.c:1626
+#: ../libpurple/protocols/msn/msn.c:1772
 msgid "Fashion"
 msgstr "Mode"
 
-#: ../libpurple/protocols/msn/msn.c:1627
+#: ../libpurple/protocols/msn/msn.c:1773
 msgid "Humor"
 msgstr "Humor"
 
-#: ../libpurple/protocols/msn/msn.c:1628
+#: ../libpurple/protocols/msn/msn.c:1774
 msgid "Music"
 msgstr "Musiek"
 
-#: ../libpurple/protocols/msn/msn.c:1629 ../libpurple/protocols/msn/msn.c:1810
-#: ../libpurple/protocols/msn/msn.c:1816
+#: ../libpurple/protocols/msn/msn.c:1775 ../libpurple/protocols/msn/msn.c:1956
+#: ../libpurple/protocols/msn/msn.c:1962
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1138
 msgid "Favorite Quote"
 msgstr "Gunsteling aanhaling"
 
-#: ../libpurple/protocols/msn/msn.c:1646
+#: ../libpurple/protocols/msn/msn.c:1792
 msgid "Contact Info"
 msgstr "Kontakinligting"
 
-#: ../libpurple/protocols/msn/msn.c:1647
+#: ../libpurple/protocols/msn/msn.c:1793
 msgid "Personal"
 msgstr "Persoonlik"
 
-#: ../libpurple/protocols/msn/msn.c:1650
+#: ../libpurple/protocols/msn/msn.c:1796
 msgid "Significant Other"
 msgstr "Ega"
 
-#: ../libpurple/protocols/msn/msn.c:1651
+#: ../libpurple/protocols/msn/msn.c:1797
 msgid "Home Phone"
-msgstr "Huistelefoon"
-
-#: ../libpurple/protocols/msn/msn.c:1652
+msgstr "Huisfoon"
+
+#: ../libpurple/protocols/msn/msn.c:1798
 msgid "Home Phone 2"
-msgstr "Huistelefoon 2"
-
-#: ../libpurple/protocols/msn/msn.c:1653
-#: ../libpurple/protocols/oscar/oscar.c:3793
+msgstr "Huisfoon 2"
+
+#: ../libpurple/protocols/msn/msn.c:1799
+#: ../libpurple/protocols/oscar/oscar.c:3808
 msgid "Home Address"
 msgstr "Huisadres"
 
-#: ../libpurple/protocols/msn/msn.c:1654
+#: ../libpurple/protocols/msn/msn.c:1800
 msgid "Personal Mobile"
 msgstr "Persoonlike sel"
 
-#: ../libpurple/protocols/msn/msn.c:1655
+#: ../libpurple/protocols/msn/msn.c:1801
 msgid "Home Fax"
 msgstr "Huisfaks"
 
-#: ../libpurple/protocols/msn/msn.c:1656
+#: ../libpurple/protocols/msn/msn.c:1802
 msgid "Personal E-Mail"
 msgstr "Persoonlike e-pos"
 
-#: ../libpurple/protocols/msn/msn.c:1657
+#: ../libpurple/protocols/msn/msn.c:1803
 msgid "Personal IM"
 msgstr "Persoonlike kitsboodskappe"
 
-#: ../libpurple/protocols/msn/msn.c:1659
+#: ../libpurple/protocols/msn/msn.c:1805
 msgid "Anniversary"
 msgstr "Herdenking"
 
 #. Business
-#: ../libpurple/protocols/msn/msn.c:1675
+#: ../libpurple/protocols/msn/msn.c:1821
 msgid "Work"
 msgstr "Werk"
 
-#: ../libpurple/protocols/msn/msn.c:1677
+#: ../libpurple/protocols/msn/msn.c:1823
 #: ../libpurple/protocols/silc/ops.c:1010
 #: ../libpurple/protocols/silc10/ops.c:1044
 msgid "Job Title"
 msgstr "Postitel"
 
-#: ../libpurple/protocols/msn/msn.c:1678
-#: ../libpurple/protocols/oscar/oscar.c:3814
+#: ../libpurple/protocols/msn/msn.c:1824
+#: ../libpurple/protocols/oscar/oscar.c:3829
 msgid "Company"
 msgstr "Maatskappy"
 
-#: ../libpurple/protocols/msn/msn.c:1679
-#: ../libpurple/protocols/novell/novell.c:1480
+#: ../libpurple/protocols/msn/msn.c:1825
+#: ../libpurple/protocols/novell/novell.c:1482
 msgid "Department"
 msgstr "Departement"
 
-#: ../libpurple/protocols/msn/msn.c:1680
+#: ../libpurple/protocols/msn/msn.c:1826
 msgid "Profession"
 msgstr "Prefessie"
 
-#: ../libpurple/protocols/msn/msn.c:1681
+#: ../libpurple/protocols/msn/msn.c:1827
 msgid "Work Phone"
-msgstr "Werktelefoon"
-
-#: ../libpurple/protocols/msn/msn.c:1682
+msgstr "Werkfoon"
+
+#: ../libpurple/protocols/msn/msn.c:1828
 msgid "Work Phone 2"
-msgstr "Werktelefoon 2"
-
-#: ../libpurple/protocols/msn/msn.c:1683
-#: ../libpurple/protocols/oscar/oscar.c:3806
+msgstr "Werkfoon 2"
+
+#: ../libpurple/protocols/msn/msn.c:1829
+#: ../libpurple/protocols/oscar/oscar.c:3821
 msgid "Work Address"
 msgstr "Werkadres"
 
-#: ../libpurple/protocols/msn/msn.c:1684
+#: ../libpurple/protocols/msn/msn.c:1830
 msgid "Work Mobile"
 msgstr "Werksel"
 
-#: ../libpurple/protocols/msn/msn.c:1685
+#: ../libpurple/protocols/msn/msn.c:1831
 msgid "Work Pager"
 msgstr "Werkroeper"
 
-#: ../libpurple/protocols/msn/msn.c:1686
+#: ../libpurple/protocols/msn/msn.c:1832
 msgid "Work Fax"
 msgstr "Werkfaks"
 
-#: ../libpurple/protocols/msn/msn.c:1687
+#: ../libpurple/protocols/msn/msn.c:1833
 msgid "Work E-Mail"
 msgstr "Werks-e-pos"
 
-#: ../libpurple/protocols/msn/msn.c:1688
+#: ../libpurple/protocols/msn/msn.c:1834
 msgid "Work IM"
 msgstr "Werkkitsboodskappe"
 
-#: ../libpurple/protocols/msn/msn.c:1689
+#: ../libpurple/protocols/msn/msn.c:1835
 msgid "Start Date"
 msgstr "Begindatum"
 
-#: ../libpurple/protocols/msn/msn.c:1759 ../libpurple/protocols/msn/msn.c:1765
-#: ../libpurple/protocols/msn/msn.c:1772 ../libpurple/protocols/msn/msn.c:1779
+#: ../libpurple/protocols/msn/msn.c:1905 ../libpurple/protocols/msn/msn.c:1911
+#: ../libpurple/protocols/msn/msn.c:1918 ../libpurple/protocols/msn/msn.c:1925
 msgid "Favorite Things"
 msgstr "Gunsteling-dinge"
 
-#: ../libpurple/protocols/msn/msn.c:1824
+#: ../libpurple/protocols/msn/msn.c:1970
 msgid "Last Updated"
 msgstr "Laas opgedateer"
 
-#: ../libpurple/protocols/msn/msn.c:1835
+#: ../libpurple/protocols/msn/msn.c:1981
 #: ../libpurple/protocols/qq/buddy_info.c:60
 #: ../libpurple/protocols/silc/ops.c:1026
 #: ../libpurple/protocols/silc10/ops.c:1060
 msgid "Homepage"
 msgstr "Tuisblad"
 
-#: ../libpurple/protocols/msn/msn.c:1859
+#: ../libpurple/protocols/msn/msn.c:2005
 msgid "The user has not created a public profile."
 msgstr "Die gebruiker het nie 'n publieke profiel geskep nie."
 
-#: ../libpurple/protocols/msn/msn.c:1860
+#: ../libpurple/protocols/msn/msn.c:2006
 msgid ""
 "MSN reported not being able to find the user's profile. This either means "
 "that the user does not exist, or that the user exists but has not created a "
 "public profile."
 msgstr ""
-"MSN sê dit kan nie die gebruiker se profiel kry nie. Dit beteken óf dat die "
+"MSN sê dit kan nie die gebruiker se profiel vind nie. Dit beteken óf dat die "
 "gebruiker nie bestaan nie, of dat die gebruiker wel bestaan maar nie 'n "
 "publieke profiel geskep het nie."
 
-#: ../libpurple/protocols/msn/msn.c:1864
+#: ../libpurple/protocols/msn/msn.c:2010
 msgid ""
 "Could not find any information in the user's profile. The user most likely "
 "does not exist."
 msgstr ""
-"Kon geen inligting in die gebruiker se profiel kry nie. Heel waarskynlik "
+"Kon geen inligting in die gebruiker se profiel vind nie. Heel waarskynlik "
 "bestaan die gebruiker nie."
 
-#: ../libpurple/protocols/msn/msn.c:1872
+#: ../libpurple/protocols/msn/msn.c:2018
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1240
 msgid "Profile URL"
 msgstr "Profiel-URL"
@@ -7038,101 +6996,111 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/msn/msn.c:2158 ../libpurple/protocols/msn/msn.c:2160
-msgid "MSN Protocol Plugin"
-msgstr "MSN-protokolinprop"
-
-#: ../libpurple/protocols/msn/msn.c:2194
+#: ../libpurple/protocols/msn/msn.c:2305 ../libpurple/protocols/msn/msn.c:2307
+msgid "Windows Live Messenger Protocol Plugin"
+msgstr "Inprop vir Windows Live-boodskapperprotokol"
+
+#: ../libpurple/protocols/msn/msn.c:2342
 msgid "Use HTTP Method"
 msgstr "Gebruik HTTP-metode"
 
-#: ../libpurple/protocols/msn/msn.c:2199
-#, fuzzy
+#: ../libpurple/protocols/msn/msn.c:2347
 msgid "HTTP Method Server"
-msgstr "IPC-toetsbediener"
-
-#: ../libpurple/protocols/msn/msn.c:2204
+msgstr "HTTP-metodebediener"
+
+#: ../libpurple/protocols/msn/msn.c:2352
 msgid "Show custom smileys"
 msgstr "Wys pasgemaakte gesiggies"
 
-#: ../libpurple/protocols/msn/msn.c:2212
+#: ../libpurple/protocols/msn/msn.c:2360
 msgid "nudge: nudge a user to get their attention"
 msgstr "nudge: gee 'n gebruiker 'n stootjie om sy aandag te trek"
 
-#: ../libpurple/protocols/msn/nexus.c:146
-#: ../libpurple/protocols/msn/servconn.c:135
-#: ../libpurple/protocols/qq/qq_proxy.c:242
-#: ../libpurple/protocols/qq/qq_proxy.c:321
-#: ../libpurple/protocols/qq/qq_proxy.c:366
-#: ../libpurple/protocols/qq/qq_proxy.c:399
-#: ../libpurple/protocols/qq/udp_proxy_s5.c:63
-#: ../libpurple/protocols/qq/udp_proxy_s5.c:163
-#: ../libpurple/protocols/qq/udp_proxy_s5.c:187
-#: ../libpurple/protocols/qq/udp_proxy_s5.c:200
-#: ../libpurple/protocols/qq/udp_proxy_s5.c:229
-#: ../libpurple/protocols/qq/udp_proxy_s5.c:243
-#: ../libpurple/protocols/qq/udp_proxy_s5.c:268
-#: ../libpurple/protocols/qq/udp_proxy_s5.c:302
-#: ../libpurple/protocols/qq/udp_proxy_s5.c:332
-#: ../libpurple/protocols/yahoo/yahoochat.c:1416
-#: ../libpurple/protocols/yahoo/yahoochat.c:1442
-msgid "Unable to connect"
-msgstr "Kon nie verbind nie"
-
-#: ../libpurple/protocols/msn/notification.c:178
+#: ../libpurple/protocols/msn/nexus.c:70
+msgid "Windows Live ID authentication:Unable to connect"
+msgstr "Windows Live-ID-stawing: Kan nie koppel nie"
+
+#. we must have failed!
+#: ../libpurple/protocols/msn/nexus.c:126
+msgid ""
+"Windows Live ID authentication: cannot find authenticate token in server "
+"response"
+msgstr ""
+"Windows Live ID-stawing: kan nie stawingsteken in bedienerrespons kry nie"
+
+#: ../libpurple/protocols/msn/nexus.c:172
+msgid "Windows Live ID authentication Failed"
+msgstr "Windows Live-ID-stawing het misluk"
+
+#: ../libpurple/protocols/msn/notification.c:185
 #, c-format
 msgid "%s is not a valid group."
 msgstr "%s is nie 'n geldige groep nie."
 
-#: ../libpurple/protocols/msn/notification.c:184
-#: ../libpurple/protocols/msn/notification.c:532
-#: ../libpurple/protocols/msn/session.c:330
+#: ../libpurple/protocols/msn/notification.c:191
+#: ../libpurple/protocols/msn/notification.c:931
+#: ../libpurple/protocols/msn/session.c:379
 msgid "Unknown error."
 msgstr "Onbekende fout."
 
-#: ../libpurple/protocols/msn/notification.c:187
+#: ../libpurple/protocols/msn/notification.c:194
 #, c-format
 msgid "%s on %s (%s)"
 msgstr "%s op %s (%s)"
 
-#: ../libpurple/protocols/msn/notification.c:498
+#: ../libpurple/protocols/msn/notification.c:509
+#, c-format
+msgid "%s just sent you a Nudge!"
+msgstr "%s het u so pas 'n stootjie gestuur!"
+
+#: ../libpurple/protocols/msn/notification.c:836
+#, c-format
+msgid "Unknown error (%d)"
+msgstr "Onbekende fout (%d)"
+
+#: ../libpurple/protocols/msn/notification.c:837
+#: ../libpurple/protocols/sametime/sametime.c:4425
+msgid "Unable to add user"
+msgstr "Kan nie gebruiker byvoeg nie"
+
+#: ../libpurple/protocols/msn/notification.c:897
 #, c-format
 msgid "Unable to add user on %s (%s)"
 msgstr "Kan nie gebruiker by %s byvoeg nie (%s)"
 
-#: ../libpurple/protocols/msn/notification.c:502
+#: ../libpurple/protocols/msn/notification.c:901
 #, c-format
 msgid "Unable to block user on %s (%s)"
 msgstr "Kan nie gebruiker op %s blokkeer nie (%s)"
 
-#: ../libpurple/protocols/msn/notification.c:506
+#: ../libpurple/protocols/msn/notification.c:905
 #, c-format
 msgid "Unable to permit user on %s (%s)"
 msgstr "Kan nie gebruiker op %s toelaat nie (%s)"
 
-#: ../libpurple/protocols/msn/notification.c:514
+#: ../libpurple/protocols/msn/notification.c:913
 #, c-format
 msgid "%s could not be added because your buddy list is full."
 msgstr "%s kon nie bygevoeg word nie omdat u vriendelys vol is."
 
-#: ../libpurple/protocols/msn/notification.c:523
+#: ../libpurple/protocols/msn/notification.c:922
 #, c-format
 msgid "%s is not a valid passport account."
 msgstr "%s is nie 'n geldige paspoortrekening nie."
 
-#: ../libpurple/protocols/msn/notification.c:528
+#: ../libpurple/protocols/msn/notification.c:927
 msgid "Service Temporarily Unavailable."
 msgstr "Diens tydelik nie beskikbaar nie."
 
-#: ../libpurple/protocols/msn/notification.c:851
+#: ../libpurple/protocols/msn/notification.c:1263
 msgid "Unable to rename group"
 msgstr "Kan nie groep hernoem nie"
 
-#: ../libpurple/protocols/msn/notification.c:906
+#: ../libpurple/protocols/msn/notification.c:1318
 msgid "Unable to delete group"
 msgstr "Kan nie groep uitvee nie"
 
-#: ../libpurple/protocols/msn/notification.c:1325
+#: ../libpurple/protocols/msn/notification.c:1931
 #, c-format
 msgid ""
 "The MSN server will shut down for maintenance in %d minute. You will "
@@ -7150,15 +7118,34 @@
 "sign in."
 msgstr[0] ""
 "Die MSN-bediener sal in %d minuut afskakel vir onderhoud. U sal dan "
-"outomaties afgemeld word.  Maak asb. enige gesprekke wat besig is, klaar.\n"
+"outomaties afgemeld word.  Maak gerus enige gesprekke wat besig is, klaar.\n"
 "\n"
 "Nadat die onderhoud afgehandel is, sal u suksesvol kan aanmeld."
 msgstr[1] ""
 "Die MSN-bediener sal in %d minute afskakel vir onderhoud. U sal dan "
-"outomaties afgemeld word.  Maak asb. enige gesprekke wat besig is, klaar.\n"
+"outomaties afgemeld word.  Maak gerus enige gesprekke wat besig is, klaar.\n"
 "\n"
 "Nadat die onderhoud afgehandel is, sal u suksesvol kan aanmeld."
 
+#: ../libpurple/protocols/msn/servconn.c:135
+#: ../libpurple/protocols/qq/qq_proxy.c:242
+#: ../libpurple/protocols/qq/qq_proxy.c:324
+#: ../libpurple/protocols/qq/qq_proxy.c:369
+#: ../libpurple/protocols/qq/qq_proxy.c:402
+#: ../libpurple/protocols/qq/udp_proxy_s5.c:64
+#: ../libpurple/protocols/qq/udp_proxy_s5.c:167
+#: ../libpurple/protocols/qq/udp_proxy_s5.c:191
+#: ../libpurple/protocols/qq/udp_proxy_s5.c:204
+#: ../libpurple/protocols/qq/udp_proxy_s5.c:233
+#: ../libpurple/protocols/qq/udp_proxy_s5.c:247
+#: ../libpurple/protocols/qq/udp_proxy_s5.c:272
+#: ../libpurple/protocols/qq/udp_proxy_s5.c:307
+#: ../libpurple/protocols/qq/udp_proxy_s5.c:338
+#: ../libpurple/protocols/yahoo/yahoochat.c:1416
+#: ../libpurple/protocols/yahoo/yahoochat.c:1442
+msgid "Unable to connect"
+msgstr "Kon nie koppel nie"
+
 #: ../libpurple/protocols/msn/servconn.c:137
 msgid "Writing error"
 msgstr "Skryffout"
@@ -7173,61 +7160,61 @@
 "Connection error from %s server:\n"
 "%s"
 msgstr ""
-"Verbindingfout van %s bediener:\n"
+"Verbindingfout vanaf %s bediener:\n"
 "%s"
 
-#: ../libpurple/protocols/msn/session.c:299
+#: ../libpurple/protocols/msn/session.c:346
 msgid "Our protocol is not supported by the server."
 msgstr "Ons protokol word nie deur die bediener ondersteun nie."
 
-#: ../libpurple/protocols/msn/session.c:303
+#: ../libpurple/protocols/msn/session.c:350
 msgid "Error parsing HTTP."
-msgstr "Fout met ontleed van HTTP."
-
-#: ../libpurple/protocols/msn/session.c:307
+msgstr "Kon nie HTTP ontleed nie."
+
+#: ../libpurple/protocols/msn/session.c:354
 #: ../libpurple/protocols/oscar/flap_connection.c:384
-#: ../libpurple/protocols/yahoo/yahoo.c:205
+#: ../libpurple/protocols/yahoo/yahoo.c:207
 msgid "You have signed on from another location."
 msgstr "U het van 'n ander plek aangemeld."
 
-#: ../libpurple/protocols/msn/session.c:310
+#: ../libpurple/protocols/msn/session.c:359
 msgid "The MSN servers are temporarily unavailable. Please wait and try again."
 msgstr ""
-"Die MSN-bedieners is tydelik nie beskikbaar nie. Wag asb. en probeer weer."
-
-#: ../libpurple/protocols/msn/session.c:315
+"Die MSN-bedieners is tydelik nie beskikbaar nie. Wag gerus en probeer weer."
+
+#: ../libpurple/protocols/msn/session.c:364
 msgid "The MSN servers are going down temporarily."
 msgstr "Die MSN-bedieners sal tydelik afskakel."
 
-#: ../libpurple/protocols/msn/session.c:320
+#: ../libpurple/protocols/msn/session.c:369
 #, c-format
 msgid "Unable to authenticate: %s"
 msgstr "Kon nie magtig nie: %s"
 
-#: ../libpurple/protocols/msn/session.c:325
+#: ../libpurple/protocols/msn/session.c:374
 msgid ""
 "Your MSN buddy list is temporarily unavailable. Please wait and try again."
 msgstr ""
-"U MSN-vriendelys is tydelik nie beskikbaar nie. Wag asb. en probeer weer."
-
-#: ../libpurple/protocols/msn/session.c:346
-#: ../libpurple/protocols/msn/session.c:348
+"U MSN-vriendelys is tydelik nie beskikbaar nie. Wag gerus en probeer weer."
+
+#: ../libpurple/protocols/msn/session.c:395
+#: ../libpurple/protocols/msn/session.c:397
 msgid "Handshaking"
 msgstr "Bladskud"
 
-#: ../libpurple/protocols/msn/session.c:349
+#: ../libpurple/protocols/msn/session.c:398
 msgid "Starting authentication"
 msgstr "Begin stawing"
 
-#: ../libpurple/protocols/msn/session.c:350
+#: ../libpurple/protocols/msn/session.c:399
 msgid "Getting cookie"
 msgstr "Kry tans koekie"
 
-#: ../libpurple/protocols/msn/session.c:352
+#: ../libpurple/protocols/msn/session.c:401
 msgid "Sending cookie"
 msgstr "Stuur tans koekie"
 
-#: ../libpurple/protocols/msn/session.c:353
+#: ../libpurple/protocols/msn/session.c:402
 msgid "Retrieving buddy list"
 msgstr "Kry tans vriendelys"
 
@@ -7243,28 +7230,28 @@
 msgid "Out To Lunch"
 msgstr "Weg vir middagete"
 
-#: ../libpurple/protocols/msn/switchboard.c:400
+#: ../libpurple/protocols/msn/switchboard.c:398
 msgid "Message may have not been sent because a timeout occurred:"
 msgstr "Boodskap is dalk nie gestuur nie vanweë 'n uittelling:"
 
-#: ../libpurple/protocols/msn/switchboard.c:408
+#: ../libpurple/protocols/msn/switchboard.c:406
 msgid "Message could not be sent, not allowed while invisible:"
 msgstr "Boodskap kon nie gestuur word nie, nie toegelaat terwyl onsigbaar nie:"
 
-#: ../libpurple/protocols/msn/switchboard.c:412
+#: ../libpurple/protocols/msn/switchboard.c:410
 msgid "Message could not be sent because the user is offline:"
-msgstr "Boodskap kon nie gestuur word nie omdat die gebruiker aflyn is:"
-
-#: ../libpurple/protocols/msn/switchboard.c:416
+msgstr "Boodskap kon nie gestuur word nie omdat die gebruiker vanlyn is:"
+
+#: ../libpurple/protocols/msn/switchboard.c:414
 msgid "Message could not be sent because a connection error occurred:"
 msgstr ""
-"Boodskap kon nie gestuur word nie omdat 'n verbindingfout plaasgevind het:"
-
-#: ../libpurple/protocols/msn/switchboard.c:420
+"Boodskap kon nie gestuur word nie omdat 'n verbindingfout voorgekom het:"
+
+#: ../libpurple/protocols/msn/switchboard.c:418
 msgid "Message could not be sent because we are sending too quickly:"
 msgstr "Boodskap kon nie gestuur word nie omdat ons te vinnig stuur:"
 
-#: ../libpurple/protocols/msn/switchboard.c:424
+#: ../libpurple/protocols/msn/switchboard.c:422
 msgid ""
 "Message could not be sent because we were unable to establish a session with "
 "the server. This is likely a server problem, try again in a few minutes:"
@@ -7273,50 +7260,55 @@
 "kon bewerkstellig nie. Dis waarskynlik 'n bedienerprobleem; probeer weer na "
 "'n paar minute:"
 
-#: ../libpurple/protocols/msn/switchboard.c:431
+#: ../libpurple/protocols/msn/switchboard.c:429
 msgid ""
 "Message could not be sent because an error with the switchboard occurred:"
 msgstr ""
-"Boodskap kon nie gestuur word nie omdat 'n fout met die skakelbord "
-"plaasgevind het:"
-
-#: ../libpurple/protocols/msn/switchboard.c:439
+"Boodskap kon nie gestuur word nie omdat 'n fout met die skakelbord voorgekom "
+"het:"
+
+#: ../libpurple/protocols/msn/switchboard.c:437
 msgid "Message may have not been sent because an unknown error occurred:"
-msgstr "Boodskap is dalk nie gestuur nie vanweë 'n onbekende fout:"
-
-#: ../libpurple/protocols/msn/userlist.c:252
+msgstr ""
+"Boodskap is dalk nie gestuur nie omdat 'n onbekende fout voorgekom het:"
+
+#: ../libpurple/protocols/msn/userlist.c:243
 #, c-format
 msgid "%s has added you to his or her buddy list."
 msgstr "%s het u by sy of haar vriendelys gevoeg."
 
-#: ../libpurple/protocols/msn/userlist.c:321
+#: ../libpurple/protocols/msn/userlist.c:312
 #, c-format
 msgid "%s has removed you from his or her buddy list."
 msgstr "%s het u van sy of haar vriendelys verwyder."
 
-#: ../libpurple/protocols/msn/userlist.c:643
+#. only notify the user about problems adding to the friends list
+#. * maybe we should do something else for other lists, but it probably
+#. * won't cause too many problems if we just ignore it
+#: ../libpurple/protocols/msn/userlist.c:693
 #, c-format
 msgid "Unable to add \"%s\"."
 msgstr "Kan nie \"%s\" byvoeg nie."
 
-#: ../libpurple/protocols/msn/userlist.c:645
+#: ../libpurple/protocols/msn/userlist.c:696
 msgid "The screen name specified is invalid."
 msgstr "Die gespesifiseerde skermnaam is ongeldig."
 
 #: ../libpurple/protocols/myspace/myspace.c:111
-#, fuzzy
 msgid "Missing Cipher"
-msgstr "Syfer"
+msgstr "Vermiste syfer"
 
 #: ../libpurple/protocols/myspace/myspace.c:112
 msgid "The RC4 cipher could not be found"
-msgstr ""
+msgstr "Die RC4-syfer kon nie gevind word nie"
 
 #: ../libpurple/protocols/myspace/myspace.c:113
 msgid ""
 "Upgrade to a libpurple with RC4 support (>= 2.0.1). MySpaceIM plugin will "
 "not be loaded."
 msgstr ""
+"Opgradeer na 'n libpurble met RC4-steun (>=2.0.1). MySpaceIM-inprop sal nie "
+"gelaai word nie."
 
 #: ../libpurple/protocols/myspace/myspace.c:286
 #, c-format
@@ -7324,220 +7316,208 @@
 "Sorry, passwords over %d characters in length (yours is %d) are not "
 "supported by MySpace."
 msgstr ""
+"Jammer, wagwoorde van meer as %d karakters lank (u s'n is %d) word nie deur "
+"MySpace ondersteun nie."
 
 #. Notify an error message also, because this is important!
 #: ../libpurple/protocols/myspace/myspace.c:292
-#: ../libpurple/protocols/myspace/myspace.c:1801
+#: ../libpurple/protocols/myspace/myspace.c:1810
 msgid "MySpaceIM Error"
-msgstr ""
-
-#: ../libpurple/protocols/myspace/myspace.c:349
-#, fuzzy
+msgstr "MySpaceIM-fout"
+
+#: ../libpurple/protocols/myspace/myspace.c:350
 msgid "Reading challenge"
-msgstr "Leesfout"
-
-#: ../libpurple/protocols/myspace/myspace.c:355
-#, fuzzy
+msgstr "Leesuitdaging"
+
+#: ../libpurple/protocols/myspace/myspace.c:356
 msgid "Unexpected challenge length from server"
-msgstr "Ongeldige uitdaging vanaf bediener"
-
-#: ../libpurple/protocols/myspace/myspace.c:359
-#, fuzzy
+msgstr "Onverwagte uitdaginglengte van bediener"
+
+#: ../libpurple/protocols/myspace/myspace.c:360
 msgid "Logging in"
-msgstr "Boekstawing"
-
-#: ../libpurple/protocols/myspace/myspace.c:1286
+msgstr "Aanmelding"
+
+#: ../libpurple/protocols/myspace/myspace.c:1293
 #, c-format
 msgid "Connection to server lost (no data received within %d seconds)"
 msgstr ""
+"Verbinding aan bediener gebreek (geen data vir %d sekondes ontvang nie)"
 
 #. Can't write _()'d strings in array initializers. Workaround.
-#: ../libpurple/protocols/myspace/myspace.c:1328
-#, fuzzy
+#: ../libpurple/protocols/myspace/myspace.c:1335
 msgid "New mail messages"
-msgstr "Stuur 'n boodskap"
-
-#: ../libpurple/protocols/myspace/myspace.c:1329
+msgstr "Nuwe posboodskappe"
+
+#: ../libpurple/protocols/myspace/myspace.c:1336
 msgid "New blog comments"
-msgstr ""
-
-#: ../libpurple/protocols/myspace/myspace.c:1330
+msgstr "Nuwe blogkommentaar"
+
+#: ../libpurple/protocols/myspace/myspace.c:1337
 msgid "New profile comments"
-msgstr ""
-
-#: ../libpurple/protocols/myspace/myspace.c:1331
+msgstr "Nuwe profielkommentaar"
+
+#: ../libpurple/protocols/myspace/myspace.c:1338
 msgid "New friend requests!"
-msgstr ""
-
-#: ../libpurple/protocols/myspace/myspace.c:1332
+msgstr "Nuwe vriendversoeke!"
+
+#: ../libpurple/protocols/myspace/myspace.c:1339
 msgid "New picture comments"
-msgstr ""
-
-#: ../libpurple/protocols/myspace/myspace.c:1360
+msgstr "Nuwe prentkommentare"
+
+#: ../libpurple/protocols/myspace/myspace.c:1367
 msgid "MySpace"
-msgstr ""
+msgstr "MySpace"
 
 #. The session is now set up, ready to be connected. This emits the
 #. * signedOn signal, so clients can now do anything with msimprpl, and
 #. * we're ready for it (session key, userid, username all setup).
-#: ../libpurple/protocols/myspace/myspace.c:1543
+#: ../libpurple/protocols/myspace/myspace.c:1550
 #: ../libpurple/protocols/sametime/sametime.c:1544
 msgid "Connected"
-msgstr "Verbind"
-
-#: ../libpurple/protocols/myspace/myspace.c:1554
-#: ../libpurple/protocols/myspace/myspace.c:1556
-#, fuzzy
+msgstr "Koppel"
+
+#: ../libpurple/protocols/myspace/myspace.c:1561
+#: ../libpurple/protocols/myspace/myspace.c:1563
 msgid "No username set"
-msgstr "Naamloos"
-
-#: ../libpurple/protocols/myspace/myspace.c:1555
+msgstr "Geen gebruikernaam opgestel nie"
+
+#: ../libpurple/protocols/myspace/myspace.c:1562
 msgid ""
 "Please go to http://editprofile.myspace.com/index.cfm?fuseaction=profile."
 "username and choose a username and try to login again."
 msgstr ""
-
-#: ../libpurple/protocols/myspace/myspace.c:1782
-#, fuzzy, c-format
+"Gaan asseblief na http://editprofile.myspace.com/index.cfm?"
+"fuseaction=profile.username en kies 'n gebruikernaam, en probeer weer."
+
+#: ../libpurple/protocols/myspace/myspace.c:1789
+#, c-format
 msgid "Protocol error, code %d: %s"
-msgstr "Proses het foutkode %d teruggegee"
-
-#: ../libpurple/protocols/myspace/myspace.c:1972
-#: ../libpurple/protocols/myspace/myspace.c:2006
-#, fuzzy
+msgstr "Protokolfout, kode %d: %s"
+
+#: ../libpurple/protocols/myspace/myspace.c:1981
+#: ../libpurple/protocols/myspace/myspace.c:2015
 msgid "Failed to add buddy"
-msgstr "Het misluk om vriend by geselsie te laat aansluit"
-
-#: ../libpurple/protocols/myspace/myspace.c:1972
-#, fuzzy
+msgstr "Byvoeg van vriend het misluk"
+
+#: ../libpurple/protocols/myspace/myspace.c:1981
 msgid "'addbuddy' command failed."
-msgstr "Laai vriendelys van lêer..."
-
-#: ../libpurple/protocols/myspace/myspace.c:2006
-#: ../libpurple/protocols/myspace/myspace.c:2247
-#, fuzzy
+msgstr "'addbuddy'-bevel het misluk."
+
+#: ../libpurple/protocols/myspace/myspace.c:2015
+#: ../libpurple/protocols/myspace/myspace.c:2252
 msgid "persist command failed"
-msgstr "Skakelbord het misluk"
-
-#: ../libpurple/protocols/myspace/myspace.c:2115
+msgstr "persist-bevel het misluk"
+
+#: ../libpurple/protocols/myspace/myspace.c:2120
 #, c-format
 msgid "No such user: %s"
-msgstr ""
-
-#: ../libpurple/protocols/myspace/myspace.c:2116
-#, fuzzy
+msgstr "Geen so 'n gebruiker nie: %s"
+
+#: ../libpurple/protocols/myspace/myspace.c:2121
 msgid "User lookup"
-msgstr "Gebruikerkamers"
-
-#: ../libpurple/protocols/myspace/myspace.c:2228
-#: ../libpurple/protocols/myspace/myspace.c:2247
-#: ../libpurple/protocols/myspace/myspace.c:2269
-#, fuzzy
+msgstr "Gebruikeropsoek"
+
+#: ../libpurple/protocols/myspace/myspace.c:2233
+#: ../libpurple/protocols/myspace/myspace.c:2252
+#: ../libpurple/protocols/myspace/myspace.c:2274
 msgid "Failed to remove buddy"
-msgstr "Het misluk om vriend by geselsie te laat aansluit"
-
-#: ../libpurple/protocols/myspace/myspace.c:2228
+msgstr "Verwyder van vriend het misluk"
+
+#: ../libpurple/protocols/myspace/myspace.c:2233
 msgid "'delbuddy' command failed"
-msgstr ""
-
-#: ../libpurple/protocols/myspace/myspace.c:2269
-#, fuzzy
+msgstr "'delbuddy'-bevel het misluk"
+
+#: ../libpurple/protocols/myspace/myspace.c:2274
 msgid "blocklist command failed"
-msgstr "Skakelbord het misluk"
-
-#: ../libpurple/protocols/myspace/myspace.c:2315
-#, fuzzy
+msgstr "blocklist-bevel het misluk"
+
+#: ../libpurple/protocols/myspace/myspace.c:2320
 msgid "Invalid input condition"
-msgstr "Finaliseer verbinding"
+msgstr "Ongeldige toevoertoestand"
 
 #. TODO: g_realloc like msn, yahoo, irc, jabber?
-#: ../libpurple/protocols/myspace/myspace.c:2333
-#: ../libpurple/protocols/myspace/myspace.c:2364
-#, fuzzy
+#: ../libpurple/protocols/myspace/myspace.c:2338
+#: ../libpurple/protocols/myspace/myspace.c:2369
 msgid "Read buffer full"
-msgstr "Tou vol"
-
-#: ../libpurple/protocols/myspace/myspace.c:2402
-#, fuzzy
+msgstr "Leesbuffer vol"
+
+#: ../libpurple/protocols/myspace/myspace.c:2407
 msgid "Unparseable message"
-msgstr "Kon nie boodskap ontleed nie"
-
-#: ../libpurple/protocols/myspace/myspace.c:2471
-#, fuzzy, c-format
+msgstr "Onontleedbare boodskap"
+
+#: ../libpurple/protocols/myspace/myspace.c:2476
+#, c-format
 msgid "Couldn't connect to host: %s (%d)"
-msgstr "Kon nie aan gasheer verbind nie"
-
-#: ../libpurple/protocols/myspace/myspace.c:2642
-#, fuzzy
+msgstr "Kon nie aan gasheer koppel nie: %s (%d)"
+
+#: ../libpurple/protocols/myspace/myspace.c:2647
 msgid "IM Friends"
-msgstr "Gespre_kvensters"
-
-#: ../libpurple/protocols/myspace/myspace.c:2741
+msgstr "Kitsboodskap-vriende"
+
+#: ../libpurple/protocols/myspace/myspace.c:2747
 #, c-format
 msgid ""
 "%d buddies were added or updated from the server (including buddies already "
 "on the server-side list)"
 msgstr ""
-
-#: ../libpurple/protocols/myspace/myspace.c:2742
-#, fuzzy
+"%d vriende is bygevoeg of bygewerk van die bediener (waaronder vriende wat "
+"reeds op die bedienerlys is)"
+
+#: ../libpurple/protocols/myspace/myspace.c:2748
 msgid "Add contacts from server"
-msgstr "Ongeldige antwoord van die bediener."
-
-#: ../libpurple/protocols/myspace/myspace.c:2794
-#: ../libpurple/protocols/myspace/myspace.c:2859
+msgstr "Voeg kontakte van bediener by"
+
+#: ../libpurple/protocols/myspace/myspace.c:2800
+#: ../libpurple/protocols/myspace/myspace.c:2865
 msgid "Add friends from MySpace.com"
-msgstr ""
-
-#: ../libpurple/protocols/myspace/myspace.c:2795
-#, fuzzy
+msgstr "Voeg vriende van MySpace.com by"
+
+#: ../libpurple/protocols/myspace/myspace.c:2801
 msgid "Importing friends failed"
-msgstr "laai van inprop het misluk"
+msgstr "Invoer van vriende het misluk"
 
 #. TODO: find out how
-#: ../libpurple/protocols/myspace/myspace.c:2851
-#, fuzzy
+#: ../libpurple/protocols/myspace/myspace.c:2857
 msgid "Find people..."
-msgstr "Soek vriende..."
-
-#: ../libpurple/protocols/myspace/myspace.c:2854
-#, fuzzy
+msgstr "Vind mense..."
+
+#: ../libpurple/protocols/myspace/myspace.c:2860
 msgid "Change IM name..."
-msgstr "Verander wagwoord..."
-
-#: ../libpurple/protocols/myspace/myspace.c:3156
+msgstr "Verander kitsboodskap-naam..."
+
+#: ../libpurple/protocols/myspace/myspace.c:3162
 msgid "myim URL handler"
-msgstr ""
-
-#: ../libpurple/protocols/myspace/myspace.c:3157
+msgstr "myim-URL-vatsel"
+
+#: ../libpurple/protocols/myspace/myspace.c:3163
 msgid "No suitable MySpaceIM account could be found to open this myim URL."
 msgstr ""
-
-#: ../libpurple/protocols/myspace/myspace.c:3158
+"Geen geskikte MySpaceIM-rekening kon gevind word om hierdie myim-URL te open "
+"nie."
+
+#: ../libpurple/protocols/myspace/myspace.c:3164
 msgid "Enable the proper MySpaceIM account and try again."
-msgstr ""
-
-#: ../libpurple/protocols/myspace/myspace.c:3281
+msgstr "Aktiveer die korrekte MySpaceIM-rekening, en probeer weer."
+
+#: ../libpurple/protocols/myspace/myspace.c:3287
 msgid "Show display name in status text"
-msgstr ""
-
-#: ../libpurple/protocols/myspace/myspace.c:3284
+msgstr "Wys vertoonnaam in statusteks"
+
+#: ../libpurple/protocols/myspace/myspace.c:3290
 msgid "Show headline in status text"
-msgstr ""
-
-#: ../libpurple/protocols/myspace/myspace.c:3289
-#, fuzzy
+msgstr "Wys opskrif in statusteks"
+
+#: ../libpurple/protocols/myspace/myspace.c:3295
 msgid "Send emoticons"
-msgstr "Klankkeuses"
-
-#: ../libpurple/protocols/myspace/myspace.c:3294
+msgstr "Stuur emotikons"
+
+#: ../libpurple/protocols/myspace/myspace.c:3300
 msgid "Screen resolution (dots per inch)"
-msgstr ""
-
-#: ../libpurple/protocols/myspace/myspace.c:3297
-#, fuzzy
+msgstr "Skermresolusie (stippels per duim)"
+
+#: ../libpurple/protocols/myspace/myspace.c:3303
 msgid "Base font size (points)"
-msgstr "Groter skrif"
+msgstr "Basisfontgrootte (punte)"
 
 #: ../libpurple/protocols/myspace/user.c:95
 #: ../libpurple/protocols/zephyr/zephyr.c:786
@@ -7545,177 +7525,194 @@
 msgid "User"
 msgstr "Gebruiker"
 
-#. TODO: link to username, if available
-#: ../libpurple/protocols/myspace/user.c:102
-#: ../libpurple/protocols/oscar/oscar.c:2964
+#: ../libpurple/protocols/myspace/user.c:105
+#: ../libpurple/protocols/oscar/oscar.c:2979
 msgid "Profile"
 msgstr "Profiel"
 
-#: ../libpurple/protocols/myspace/user.c:124
-#, fuzzy
+#: ../libpurple/protocols/myspace/user.c:128
 msgid "Headline"
-msgstr "_Vatsel:"
-
-#: ../libpurple/protocols/myspace/user.c:129
-#, fuzzy
+msgstr "Opskrif"
+
+#: ../libpurple/protocols/myspace/user.c:133
 msgid "Song"
-msgstr "Klanke"
-
-#: ../libpurple/protocols/myspace/user.c:134
+msgstr "Liedjie"
+
+#: ../libpurple/protocols/myspace/user.c:141
 msgid "Total Friends"
-msgstr ""
-
-#: ../libpurple/protocols/myspace/user.c:145
-#: ../libpurple/protocols/myspace/user.c:148
-#: ../libpurple/protocols/myspace/user.c:151
-#, fuzzy
+msgstr "Totale vriende"
+
+#: ../libpurple/protocols/myspace/user.c:159
 msgid "Client Version"
-msgstr "Sluit gesprek"
+msgstr "Kliëntweergawe"
 
 #. TODO: icons for each zap
-#: ../libpurple/protocols/myspace/zap.c:44
-#: ../libpurple/protocols/myspace/zap.c:177
+#. Lots of comments for translators:
+#. Zap means "to strike suddenly and forcefully as if with a
+#. * projectile or weapon."  This term often has an electrical
+#. * connotation, for example, "he was zapped by electricity when
+#. * he put a fork in the toaster."
+#: ../libpurple/protocols/myspace/zap.c:51
+#: ../libpurple/protocols/myspace/zap.c:214
 msgid "Zap"
-msgstr ""
-
-#: ../libpurple/protocols/myspace/zap.c:44
-#, fuzzy, c-format
+msgstr "Klits"
+
+#: ../libpurple/protocols/myspace/zap.c:51
+#, c-format
 msgid "%s has zapped you!"
-msgstr "%s het aangemeld."
-
-#: ../libpurple/protocols/myspace/zap.c:44
+msgstr "%s het u geklits!"
+
+#: ../libpurple/protocols/myspace/zap.c:51
 #, c-format
 msgid "Zapping %s..."
-msgstr ""
-
-#: ../libpurple/protocols/myspace/zap.c:45
+msgstr "Klits tans vir %s..."
+
+#. Whack means "to hit or strike someone with a sharp blow"
+#: ../libpurple/protocols/myspace/zap.c:54
 msgid "Whack"
-msgstr ""
-
-#: ../libpurple/protocols/myspace/zap.c:45
-#, fuzzy, c-format
+msgstr "Kletter"
+
+#: ../libpurple/protocols/myspace/zap.c:54
+#, c-format
 msgid "%s has whacked you!"
-msgstr "Die gebruiker het u geblokkeer"
-
-#: ../libpurple/protocols/myspace/zap.c:45
+msgstr "%s het u gekletter!"
+
+#: ../libpurple/protocols/myspace/zap.c:54
 #, c-format
 msgid "Whacking %s..."
-msgstr ""
-
-#: ../libpurple/protocols/myspace/zap.c:46
-#, fuzzy
+msgstr "Kletter tans vir %s..."
+
+#. Torch means "to set on fire."  Don't worry, this doesn't
+#. * make a whole lot of sense in English, either.  Feel free
+#. * to translate it literally.
+#: ../libpurple/protocols/myspace/zap.c:59
 msgid "Torch"
-msgstr "Onderwerp"
-
-#: ../libpurple/protocols/myspace/zap.c:46
-#, fuzzy, c-format
+msgstr "Brander"
+
+#: ../libpurple/protocols/myspace/zap.c:59
+#, c-format
 msgid "%s has torched you!"
-msgstr "Die gebruiker het u geblokkeer"
-
-#: ../libpurple/protocols/myspace/zap.c:46
+msgstr "%s het u gebrander!"
+
+#: ../libpurple/protocols/myspace/zap.c:59
 #, c-format
 msgid "Torching %s..."
-msgstr ""
-
-#: ../libpurple/protocols/myspace/zap.c:47
+msgstr "Brander tans vir %s..."
+
+#. Smooch means "to kiss someone, often enthusiastically"
+#: ../libpurple/protocols/myspace/zap.c:62
 msgid "Smooch"
-msgstr ""
-
-#: ../libpurple/protocols/myspace/zap.c:47
-#, fuzzy, c-format
+msgstr "Soenie"
+
+#: ../libpurple/protocols/myspace/zap.c:62
+#, c-format
 msgid "%s has smooched you!"
-msgstr "%s het aangemeld."
-
-#: ../libpurple/protocols/myspace/zap.c:47
+msgstr "%s het u gesoenie!"
+
+#: ../libpurple/protocols/myspace/zap.c:62
 #, c-format
 msgid "Smooching %s..."
-msgstr ""
-
-#: ../libpurple/protocols/myspace/zap.c:48
+msgstr "Soenie tans vir %s..."
+
+#. A hug is a display of affection; wrapping your arms around someone
+#: ../libpurple/protocols/myspace/zap.c:65
 msgid "Hug"
-msgstr ""
-
-#: ../libpurple/protocols/myspace/zap.c:48
-#, fuzzy, c-format
+msgstr "Liefie"
+
+#: ../libpurple/protocols/myspace/zap.c:65
+#, c-format
 msgid "%s has hugged you!"
-msgstr "%s het aangemeld."
-
-#: ../libpurple/protocols/myspace/zap.c:48
+msgstr "%s het u geliefie!"
+
+#: ../libpurple/protocols/myspace/zap.c:65
 #, c-format
 msgid "Hugging %s..."
-msgstr ""
-
-#: ../libpurple/protocols/myspace/zap.c:49
-#, fuzzy
+msgstr "Liefie tans vir %s..."
+
+#. Slap means "to hit someone with an open/flat hand"
+#: ../libpurple/protocols/myspace/zap.c:68
 msgid "Slap"
-msgstr "Vaak"
-
-#: ../libpurple/protocols/myspace/zap.c:49
-#, fuzzy, c-format
+msgstr "Klapper"
+
+#: ../libpurple/protocols/myspace/zap.c:68
+#, c-format
 msgid "%s has slapped you!"
-msgstr "%s het aangemeld."
-
-#: ../libpurple/protocols/myspace/zap.c:49
+msgstr "%s het u geklapper!"
+
+#: ../libpurple/protocols/myspace/zap.c:68
 #, c-format
 msgid "Slapping %s..."
-msgstr ""
-
-#: ../libpurple/protocols/myspace/zap.c:50
-#, fuzzy
+msgstr "Klapper tans vir %s..."
+
+#. Goose means "to pinch someone on their butt"
+#: ../libpurple/protocols/myspace/zap.c:71
 msgid "Goose"
-msgstr "Weg"
-
-#: ../libpurple/protocols/myspace/zap.c:50
-#, fuzzy, c-format
+msgstr "Slurp"
+
+#: ../libpurple/protocols/myspace/zap.c:71
+#, c-format
 msgid "%s has goosed you!"
-msgstr "%s het weggegaan."
-
-#: ../libpurple/protocols/myspace/zap.c:50
-#, fuzzy, c-format
+msgstr "%s het u geslurp!"
+
+#: ../libpurple/protocols/myspace/zap.c:71
+#, c-format
 msgid "Goosing %s..."
-msgstr "Soek tans %s op"
-
-#: ../libpurple/protocols/myspace/zap.c:51
+msgstr "Slurp tans vir %s..."
+
+#. A high-five is when two people's hands slap each other
+#. * in the air above their heads.  It is done to celebrate
+#. * something, often a victory, or to congratulate someone.
+#: ../libpurple/protocols/myspace/zap.c:76
 msgid "High-five"
-msgstr ""
-
-#: ../libpurple/protocols/myspace/zap.c:51
-#, fuzzy, c-format
+msgstr "Vatvyf"
+
+#: ../libpurple/protocols/myspace/zap.c:76
+#, c-format
 msgid "%s has high-fived you!"
-msgstr "%s het aangemeld."
-
-#: ../libpurple/protocols/myspace/zap.c:51
+msgstr "%s het u gevatvyf!"
+
+#: ../libpurple/protocols/myspace/zap.c:76
 #, c-format
 msgid "High-fiving %s..."
-msgstr ""
-
-#: ../libpurple/protocols/myspace/zap.c:52
+msgstr "Vatvyf tans vir %s..."
+
+#. We're not entirely sure what the MySpace people mean by
+#. * this... but we think it's the equivalent of "prank."  Or, for
+#. * someone to perform a mischievous trick or practical joke.
+#: ../libpurple/protocols/myspace/zap.c:81
 msgid "Punk"
-msgstr ""
-
-#: ../libpurple/protocols/myspace/zap.c:52
-#, fuzzy, c-format
+msgstr "Zoer"
+
+#: ../libpurple/protocols/myspace/zap.c:81
+#, c-format
 msgid "%s has punk'd you!"
-msgstr "%s het aangemeld."
-
-#: ../libpurple/protocols/myspace/zap.c:52
+msgstr "%s het u gezoer!"
+
+#: ../libpurple/protocols/myspace/zap.c:81
 #, c-format
 msgid "Punking %s..."
-msgstr ""
-
-#: ../libpurple/protocols/myspace/zap.c:53
+msgstr "Zoer tans vir %s..."
+
+#. Raspberry is a slang term for the vibrating sound made
+#. * when you stick your tongue out of your mouth with your
+#. * lips closed and blow.  It is typically done when
+#. * gloating or bragging.  Nowadays it's a pretty silly
+#. * gesture, so it does not carry a harsh negative
+#. * connotation.  It is generally used in a playful tone
+#. * with friends.
+#: ../libpurple/protocols/myspace/zap.c:90
 msgid "Raspberry"
-msgstr ""
-
-#: ../libpurple/protocols/myspace/zap.c:53
-#, fuzzy, c-format
+msgstr "Kerrie"
+
+#: ../libpurple/protocols/myspace/zap.c:90
+#, c-format
 msgid "%s has raspberried you!"
-msgstr "%s het aangemeld."
-
-#: ../libpurple/protocols/myspace/zap.c:53
+msgstr "%s het u gekerrie!"
+
+#: ../libpurple/protocols/myspace/zap.c:90
 #, c-format
 msgid "Raspberrying %s..."
-msgstr ""
+msgstr "Kerrie tans vir %s..."
 
 #: ../libpurple/protocols/novell/nmuser.c:1864
 msgid "Required parameters not passed in"
@@ -7731,7 +7728,7 @@
 
 #: ../libpurple/protocols/novell/nmuser.c:1873
 msgid "Error communicating with server"
-msgstr "Fout met kommunikasie met bediener"
+msgstr "Kon nie met bediener kommunikeer nie"
 
 #: ../libpurple/protocols/novell/nmuser.c:1877
 msgid "Conference not found"
@@ -7743,7 +7740,7 @@
 
 #: ../libpurple/protocols/novell/nmuser.c:1884
 msgid "A folder with that name already exists"
-msgstr "'n Gids met daardie naam bestaan reeds"
+msgstr "'n Vouer met daardie naam bestaan reeds"
 
 #: ../libpurple/protocols/novell/nmuser.c:1887
 msgid "Not supported"
@@ -7779,7 +7776,7 @@
 
 #: ../libpurple/protocols/novell/nmuser.c:1912
 msgid "Cannot add a contact to the same folder twice"
-msgstr "Kan nie 'n kontak twee keer by dieselfde gids voeg nie"
+msgstr "Kan nie 'n kontak twee keer by dieselfde vouer voeg nie"
 
 #: ../libpurple/protocols/novell/nmuser.c:1915
 msgid "Cannot add yourself"
@@ -7795,13 +7792,13 @@
 
 #: ../libpurple/protocols/novell/nmuser.c:1925
 msgid "Could not recognize the host of the screen name you entered"
-msgstr "Kon nie die gasheer van die skermnaam herken wat u gegee het nie"
+msgstr "Kon nie die gasheer van die skermnaam herken wat u getik het nie"
 
 #: ../libpurple/protocols/novell/nmuser.c:1928
 msgid ""
 "Your account has been disabled because too many incorrect passwords were "
 "entered"
-msgstr "U rekening is gedeaktiveer omdat te veel verkeerde wagwoorde gegee is"
+msgstr "U rekening is gedeaktiveer omdat te veel verkeerde wagwoorde getik is"
 
 #: ../libpurple/protocols/novell/nmuser.c:1931
 msgid "You cannot add the same person twice to a conversation"
@@ -7813,11 +7810,11 @@
 
 #: ../libpurple/protocols/novell/nmuser.c:1938
 msgid "You have entered an incorrect screen name"
-msgstr "U het 'n verkeerde skermnaam gegee"
+msgstr "U het 'n verkeerde skermnaam getik"
 
 #: ../libpurple/protocols/novell/nmuser.c:1941
 msgid "An error occurred while updating the directory"
-msgstr "'n Fout het voorgekom met die opdatering van die gids"
+msgstr "Kon nie die gids volledig bywerk nie"
 
 #: ../libpurple/protocols/novell/nmuser.c:1944
 msgid "Incompatible protocol version"
@@ -7837,7 +7834,7 @@
 
 #: ../libpurple/protocols/novell/nmuser.c:1953
 msgid "The user is either offline or you are blocked"
-msgstr "Die gebruiker is óf aflyn óf het u geblokkeer"
+msgstr "Die gebruiker is óf vanlyn óf het u geblokkeer"
 
 #: ../libpurple/protocols/novell/nmuser.c:1956
 #, c-format
@@ -7849,113 +7846,113 @@
 msgid "Login failed (%s)."
 msgstr "Aanmelding het misluk (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:247
+#: ../libpurple/protocols/novell/novell.c:249
 #, c-format
 msgid "Unable to send message. Could not get details for user (%s)."
 msgstr ""
-"Kan nie boodskap stuur nie. Kon nie die detail vir gebruiker kry nie (%s)."
-
-#: ../libpurple/protocols/novell/novell.c:396
+"Kan nie boodskap stuur nie. Kon nie die details vir gebruiker kry nie (%s)."
+
+#: ../libpurple/protocols/novell/novell.c:398
 #, c-format
 msgid "Unable to add %s to your buddy list (%s)."
 msgstr "Kon nie %s by u vriendelys voeg nie (%s)."
 
 #. TODO: Improve this! message to who or for what conference?
-#: ../libpurple/protocols/novell/novell.c:422
+#: ../libpurple/protocols/novell/novell.c:424
 #, c-format
 msgid "Unable to send message (%s)."
 msgstr "Kan nie boodskap stuur nie (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:493
-#: ../libpurple/protocols/novell/novell.c:985
+#: ../libpurple/protocols/novell/novell.c:495
+#: ../libpurple/protocols/novell/novell.c:987
 #, c-format
 msgid "Unable to invite user (%s)."
 msgstr "Kon nie gebruiker uitnooi nie (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:532
+#: ../libpurple/protocols/novell/novell.c:534
 #, c-format
 msgid "Unable to send message to %s. Could not create the conference (%s)."
 msgstr ""
 "Kan nie boodskap stuur aan %s nie. Kon nie die konferensie skep nie (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:537
+#: ../libpurple/protocols/novell/novell.c:539
 #, c-format
 msgid "Unable to send message. Could not create the conference (%s)."
 msgstr "Kan nie boodskap stuur nie. Kon nie die konferensie skep nie (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:584
+#: ../libpurple/protocols/novell/novell.c:586
 #, c-format
 msgid ""
 "Unable to move user %s to folder %s in the server side list. Error while "
 "creating folder (%s)."
 msgstr ""
-"Kon nie gebruiker %s na gids %s in die bedienerkantlys skuif nie. Fout "
-"terwyl gids geskep is (%s)."
-
-#: ../libpurple/protocols/novell/novell.c:632
+"Kan nie gebruiker %s na vouer %s in die bedienerkant-lys skuif nie. Kon nie "
+"vouer skep nie (%s)."
+
+#: ../libpurple/protocols/novell/novell.c:634
 #, c-format
 msgid ""
 "Unable to add %s to your buddy list. Error creating folder in server side "
 "list (%s)."
 msgstr ""
-"Kan nie %s by u vriendelys voeg nie. Fout met skep van gids in "
-"bedienerkantlys (%s)."
-
-#: ../libpurple/protocols/novell/novell.c:705
+"Kan nie %s by u vriendelys voeg nie. Kon nie vouer in bedienerkantlys skep "
+"nie (%s)."
+
+#: ../libpurple/protocols/novell/novell.c:707
 #, c-format
 msgid "Could not get details for user %s (%s)."
-msgstr "Kon nie detail vir gebruiker %s kry nie (%s)."
-
-#: ../libpurple/protocols/novell/novell.c:751
-#: ../libpurple/protocols/novell/novell.c:897
+msgstr "Kon nie details vir gebruiker %s kry nie (%s)."
+
+#: ../libpurple/protocols/novell/novell.c:753
+#: ../libpurple/protocols/novell/novell.c:899
 #, c-format
 msgid "Unable to add user to privacy list (%s)."
 msgstr "Kan nie gebruiker by privaat lys voeg nie (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:798
+#: ../libpurple/protocols/novell/novell.c:800
 #, c-format
 msgid "Unable to add %s to deny list (%s)."
 msgstr "Kan nie %s by weierlys voeg nie (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:851
+#: ../libpurple/protocols/novell/novell.c:853
 #, c-format
 msgid "Unable to add %s to permit list (%s)."
 msgstr "Kan nie %s by toelaatlys voeg nie (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:919
+#: ../libpurple/protocols/novell/novell.c:921
 #, c-format
 msgid "Unable to remove %s from privacy list (%s)."
 msgstr "Kan nie %s uit privaat lys verwyder nie (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:942
-#: ../libpurple/protocols/novell/novell.c:1647
+#: ../libpurple/protocols/novell/novell.c:944
+#: ../libpurple/protocols/novell/novell.c:1649
 #, c-format
 msgid "Unable to change server side privacy settings (%s)."
 msgstr "Kon nie bedienerkant-privaatheidinstellings verander nie (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:1012
+#: ../libpurple/protocols/novell/novell.c:1014
 #, c-format
 msgid "Unable to create conference (%s)."
 msgstr "Kan nie konferensie skep nie (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:1121
-#: ../libpurple/protocols/novell/novell.c:1692
+#: ../libpurple/protocols/novell/novell.c:1123
+#: ../libpurple/protocols/novell/novell.c:1694
 msgid "Error communicating with server. Closing connection."
-msgstr "Fout met kommunikasie met bediener. Verbinding word gesluit."
-
-#: ../libpurple/protocols/novell/novell.c:1476
+msgstr "Kon nie met bediener kommunikeer nie. Verbinding word gesluit."
+
+#: ../libpurple/protocols/novell/novell.c:1478
 msgid "Telephone Number"
-msgstr "Telefoonnommer"
-
-#: ../libpurple/protocols/novell/novell.c:1482
+msgstr "Foonnommer"
+
+#: ../libpurple/protocols/novell/novell.c:1484
 msgid "Personal Title"
 msgstr "Persoonlike titel"
 
-#: ../libpurple/protocols/novell/novell.c:1486
+#: ../libpurple/protocols/novell/novell.c:1488
 msgid "Mailstop"
 msgstr "Mailstop"
 
-#: ../libpurple/protocols/novell/novell.c:1502
+#: ../libpurple/protocols/novell/novell.c:1504
 #: ../libpurple/protocols/sametime/sametime.c:4122
 msgid "User ID"
 msgstr "Gebruiker-ID"
@@ -7966,41 +7963,41 @@
 #. purple_notify_user_info_add_pair(user_info, tag, value);
 #. }
 #.
-#: ../libpurple/protocols/novell/novell.c:1515
+#: ../libpurple/protocols/novell/novell.c:1517
 msgid "Full name"
 msgstr "Volle name"
 
-#: ../libpurple/protocols/novell/novell.c:1637
+#: ../libpurple/protocols/novell/novell.c:1639
 #, c-format
 msgid "GroupWise Conference %d"
 msgstr "GroupWise-konferensie %d"
 
-#: ../libpurple/protocols/novell/novell.c:1668
+#: ../libpurple/protocols/novell/novell.c:1670
 msgid "Unable to make SSL connection to server."
 msgstr "Kan nie SSL-verbinding aan bediener bewerkstellig nie."
 
-#: ../libpurple/protocols/novell/novell.c:1720
+#: ../libpurple/protocols/novell/novell.c:1722
 msgid "Authenticating..."
 msgstr "Staaf tans..."
 
-#: ../libpurple/protocols/novell/novell.c:1732
+#: ../libpurple/protocols/novell/novell.c:1734
 msgid "Unable to connect to server."
-msgstr "Kan nie aan bediener verbind nie."
-
-#: ../libpurple/protocols/novell/novell.c:1735
+msgstr "Kan nie aan bediener koppel nie."
+
+#: ../libpurple/protocols/novell/novell.c:1737
 msgid "Waiting for response..."
-msgstr "Wag vir antwoord..."
-
-#: ../libpurple/protocols/novell/novell.c:1870
+msgstr "Wag vir respons..."
+
+#: ../libpurple/protocols/novell/novell.c:1872
 #, c-format
 msgid "%s has been invited to this conversation."
 msgstr "%s is na hierdie gesprek genooi."
 
-#: ../libpurple/protocols/novell/novell.c:1898
+#: ../libpurple/protocols/novell/novell.c:1900
 msgid "Invitation to Conversation"
 msgstr "Uitnodiging na gesprek"
 
-#: ../libpurple/protocols/novell/novell.c:1899
+#: ../libpurple/protocols/novell/novell.c:1901
 #, c-format
 msgid ""
 "Invitation from: %s\n"
@@ -8011,41 +8008,39 @@
 "\n"
 "Gestuur: %s"
 
-#: ../libpurple/protocols/novell/novell.c:1901
+#: ../libpurple/protocols/novell/novell.c:1903
 msgid "Would you like to join the conversation?"
 msgstr "Wil u by die gesprek aansluit?"
 
-#. we don't want to reconnect in this case
-#: ../libpurple/protocols/novell/novell.c:2012
+#: ../libpurple/protocols/novell/novell.c:2017
 msgid "You have been logged out because you logged in at another workstation."
 msgstr "U is afgemeld omdat u by 'n ander werkstasie aangemeld het."
 
-#: ../libpurple/protocols/novell/novell.c:2069
+#: ../libpurple/protocols/novell/novell.c:2074
 #, c-format
 msgid ""
 "%s appears to be offline and did not receive the message that you just sent."
 msgstr ""
-"%s blyk aflyn te wees, en nie die boodskap ontvang het wat u nou net gestuur "
-"het nie."
+"%s blyk vanlyn te wees, en nie die boodskap ontvang het wat u nou net "
+"gestuur het nie."
 
 #. TODO: Would be nice to prompt if not set!
-#. *  purple_request_fields(gc, _("Server Address"),...);
+#. *  purple_request_fields_with_hint(gc, _("Server Address"),...);
 #.
 #. ...but for now just error out with a nice message.
-#: ../libpurple/protocols/novell/novell.c:2167
+#: ../libpurple/protocols/novell/novell.c:2172
 msgid ""
 "Unable to connect to server. Please enter the address of the server you wish "
 "to connect to."
 msgstr ""
-"Kan nie aan bediener verbind nie. Gee asb. die adres van die bediener "
-"waaraan u wil verbind."
-
-#: ../libpurple/protocols/novell/novell.c:2195
+"Kan nie aan bediener koppel nie. Tik gerus die adres van die bediener "
+"waaraan u wil koppel."
+
+#: ../libpurple/protocols/novell/novell.c:2200
 msgid "Error. SSL support is not installed."
-msgstr "Fout. SSL-ondersteuning nie geïnstalleer nie."
-
-#: ../libpurple/protocols/novell/novell.c:2504
-#, c-format
+msgstr "Fout. SSL-steun nie geïnstalleer nie."
+
+#: ../libpurple/protocols/novell/novell.c:2509
 msgid "This conference has been closed. No more messages can be sent."
 msgstr ""
 "Hierdie konferensie is gesluit. Geen verdere boodskappe kan gestuur word nie."
@@ -8060,33 +8055,33 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/novell/novell.c:3518
-#: ../libpurple/protocols/novell/novell.c:3520
+#: ../libpurple/protocols/novell/novell.c:3523
+#: ../libpurple/protocols/novell/novell.c:3525
 msgid "Novell GroupWise Messenger Protocol Plugin"
 msgstr "Inprop vir Novell GroupWise-boodskapperprotokol"
 
-#: ../libpurple/protocols/novell/novell.c:3545
+#: ../libpurple/protocols/novell/novell.c:3550
 msgid "Server address"
 msgstr "Bedieneradres"
 
-#: ../libpurple/protocols/novell/novell.c:3549
+#: ../libpurple/protocols/novell/novell.c:3554
 msgid "Server port"
 msgstr "Bedienerpoort"
 
-#: ../libpurple/protocols/oscar/flap_connection.c:387
-#: ../libpurple/protocols/yahoo/yahoo.c:2469
-#: ../libpurple/protocols/yahoo/yahoo.c:2636
-#: ../libpurple/protocols/yahoo/ycht.c:481 ../libpurple/proxy.c:581
-#: ../libpurple/proxy.c:1116 ../libpurple/proxy.c:1225
-#: ../libpurple/proxy.c:1325 ../libpurple/proxy.c:1453
+#: ../libpurple/protocols/oscar/flap_connection.c:389
+#: ../libpurple/protocols/yahoo/yahoo.c:2471
+#: ../libpurple/protocols/yahoo/yahoo.c:2638
+#: ../libpurple/protocols/yahoo/ycht.c:481 ../libpurple/proxy.c:584
+#: ../libpurple/proxy.c:1129 ../libpurple/proxy.c:1238
+#: ../libpurple/proxy.c:1338 ../libpurple/proxy.c:1466
 msgid "Server closed the connection."
 msgstr "Bediener het die verbinding toegemaak."
 
-#: ../libpurple/protocols/oscar/flap_connection.c:389
-#: ../libpurple/protocols/yahoo/yahoo.c:2463
-#: ../libpurple/protocols/yahoo/yahoo.c:2630 ../libpurple/proxy.c:593
-#: ../libpurple/proxy.c:1128 ../libpurple/proxy.c:1237
-#: ../libpurple/proxy.c:1337 ../libpurple/proxy.c:1465
+#: ../libpurple/protocols/oscar/flap_connection.c:391
+#: ../libpurple/protocols/yahoo/yahoo.c:2465
+#: ../libpurple/protocols/yahoo/yahoo.c:2632 ../libpurple/proxy.c:596
+#: ../libpurple/proxy.c:1141 ../libpurple/proxy.c:1250
+#: ../libpurple/proxy.c:1350 ../libpurple/proxy.c:1478
 #, c-format
 msgid ""
 "Lost connection with server:\n"
@@ -8095,12 +8090,12 @@
 "Verbinding met bediener verloor:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/flap_connection.c:392
-#: ../libpurple/proxy.c:1145 ../libpurple/proxy.c:1250
-#: ../libpurple/proxy.c:1349 ../libpurple/proxy.c:1421
-#: ../libpurple/proxy.c:1478
+#: ../libpurple/protocols/oscar/flap_connection.c:394
+#: ../libpurple/proxy.c:1158 ../libpurple/proxy.c:1263
+#: ../libpurple/proxy.c:1362 ../libpurple/proxy.c:1434
+#: ../libpurple/proxy.c:1491
 msgid "Received invalid data on connection with server."
-msgstr "Het ongeldige data ontvang toe met bediener verbind is."
+msgstr "Het ongeldige data ontvang tydens verbinding met bediener."
 
 #. *< type
 #. *< ui_requirement
@@ -8133,36 +8128,45 @@
 msgstr "ICQ-protokolinprop"
 
 #: ../libpurple/protocols/oscar/libicq.c:147
-#: ../libpurple/protocols/yahoo/yahoo.c:4410
+#: ../libpurple/protocols/yahoo/yahoo.c:4412
 #: ../libpurple/protocols/zephyr/zephyr.c:2997
 msgid "Encoding"
 msgstr "Enkodering"
 
-#: ../libpurple/protocols/oscar/odc.c:40
+#: ../libpurple/protocols/oscar/odc.c:42
 msgid "The remote user has closed the connection."
 msgstr "Die afgeleë gebruiker het die verbinding gesluit."
 
-#: ../libpurple/protocols/oscar/odc.c:42
+#: ../libpurple/protocols/oscar/odc.c:44
 msgid "The remote user has declined your request."
 msgstr "Die afgeleë gebruiker het u versoek van die hand gewys."
 
-#: ../libpurple/protocols/oscar/odc.c:44
+#: ../libpurple/protocols/oscar/odc.c:46
 #, c-format
 msgid "Lost connection with the remote user:<br>%s"
 msgstr "Verbinding met die afgeleë gebruiker verloor:<br>%s"
 
-#: ../libpurple/protocols/oscar/odc.c:47
+#: ../libpurple/protocols/oscar/odc.c:49
 msgid "Received invalid data on connection with remote user."
-msgstr "Het ongeldige data ontvang toe met afgeleë gebruiker verbind is."
-
-#: ../libpurple/protocols/oscar/odc.c:49
+msgstr "Het ongeldige data ontvang tydens verbinding met afgeleë gebruiker."
+
+#: ../libpurple/protocols/oscar/odc.c:51
 msgid "Could not establish a connection with the remote user."
 msgstr "Kon nie 'n verbinding met die afgeleë gebruiker bewerkstellig nie."
 
-#: ../libpurple/protocols/oscar/odc.c:560
+#: ../libpurple/protocols/oscar/odc.c:562
 msgid "Direct IM established"
 msgstr "Direkte kitsboodskap bewerkstellig"
 
+#: ../libpurple/protocols/oscar/odc.c:600
+#, c-format
+msgid ""
+"%s tried to send you a %s file, but we only allow files up to %s over Direct "
+"IM.  Try using file transfer instead.\n"
+msgstr ""
+"%s het probeer om jou 'n %s-lêer te stuur, maar ons laat net lêer tot %s oor "
+"Direct IM toe.  Probeer eerder lêeroordrag.\n"
+
 #: ../libpurple/protocols/oscar/oft.c:656
 #, c-format
 msgid "File %s is %s, which is larger than the maximum size of %s."
@@ -8214,7 +8218,7 @@
 
 #: ../libpurple/protocols/oscar/oscar.c:128
 msgid "Responses lost"
-msgstr "Reaksies verloor"
+msgstr "Response verloor"
 
 #: ../libpurple/protocols/oscar/oscar.c:129
 msgid "Request denied"
@@ -8271,10 +8275,10 @@
 "encoding he is using, you can specify it in the advanced account options for "
 "your AIM/ICQ account.)"
 msgstr ""
-"(Daar was 'n fout met ontvangs van hierdie boodskap.  Die vriend met wie u "
-"praat, gebruik waarskynlik 'n ander enkodering as verwag.  Indien u weet "
-"watter enkodering hy gebruik, kan u dit in die gevorderde rekeningkeuses van "
-"u AIM/ICQ-rekening spesifiseer.)"
+"(Kon nie hierdie boodskap ontvang nie.  Die vriend met wie u praat, gebruik "
+"waarskynlik 'n ander enkodering as verwag.  Indien u weet watter enkodering "
+"hy gebruik, kan u dit in die gevorderde rekeningopsies van u AIM/ICQ-"
+"rekening spesifiseer.)"
 
 #: ../libpurple/protocols/oscar/oscar.c:457
 #, c-format
@@ -8282,12 +8286,12 @@
 "(There was an error receiving this message.  Either you and %s have "
 "different encodings selected, or %s has a buggy client.)"
 msgstr ""
-"(Daar was 'n fout met ontvangs van hierdie boodskap.  Óf u en %s het "
-"verskillende enkoderings gekies, óf %s het 'n vrotterige kliënt.)"
+"(Kon nie hierdie boodskap ontvang nie.  Óf u en %s het verskillende "
+"enkoderings gekies, óf %s het 'n vrotterige kliënt.)"
 
 #. Label
-#: ../libpurple/protocols/oscar/oscar.c:639 ../pidgin/gtkutils.c:2387
-#: ../pidgin/gtkutils.c:2417
+#: ../libpurple/protocols/oscar/oscar.c:639 ../pidgin/gtkutils.c:2391
+#: ../pidgin/gtkutils.c:2421
 #: ../pidgin/plugins/gevolution/new_person_dialog.c:332
 msgid "Buddy Icon"
 msgstr "Vriendikoon"
@@ -8301,15 +8305,15 @@
 msgstr "AIM- direkte kitsboodskap"
 
 #: ../libpurple/protocols/oscar/oscar.c:648
-#: ../libpurple/protocols/silc/silc.c:768
-#: ../libpurple/protocols/silc/util.c:553
+#: ../libpurple/protocols/silc/silc.c:899
+#: ../libpurple/protocols/silc/util.c:557
 #: ../libpurple/protocols/silc10/silc.c:679
 #: ../libpurple/protocols/silc10/util.c:549
 msgid "Chat"
 msgstr "Geselsie"
 
 #: ../libpurple/protocols/oscar/oscar.c:651
-#: ../libpurple/protocols/oscar/oscar.c:6010
+#: ../libpurple/protocols/oscar/oscar.c:6065
 msgid "Get File"
 msgstr "Kry lêer"
 
@@ -8382,55 +8386,49 @@
 msgstr "Kammera"
 
 #: ../libpurple/protocols/oscar/oscar.c:725
-#: ../libpurple/protocols/oscar/oscar.c:5780
-#, c-format
+#: ../libpurple/protocols/oscar/oscar.c:5835
 msgid "Free For Chat"
 msgstr "Beskikbaar vir geselsies"
 
 #: ../libpurple/protocols/oscar/oscar.c:729
-#: ../libpurple/protocols/oscar/oscar.c:5815
-#, c-format
+#: ../libpurple/protocols/oscar/oscar.c:5870
 msgid "Not Available"
 msgstr "Nie beskikbaar nie"
 
 #: ../libpurple/protocols/oscar/oscar.c:731
-#: ../libpurple/protocols/oscar/oscar.c:5801
-#, c-format
+#: ../libpurple/protocols/oscar/oscar.c:5856
 msgid "Occupied"
 msgstr "Beset"
 
 #: ../libpurple/protocols/oscar/oscar.c:735
-#, c-format
 msgid "Web Aware"
 msgstr "Web Aware"
 
 #: ../libpurple/protocols/oscar/oscar.c:737 ../libpurple/protocols/qq/qq.c:183
 #: ../libpurple/protocols/qq/qq.c:288
-#: ../libpurple/protocols/yahoo/yahoo.c:3095 ../libpurple/status.c:157
-#: ../pidgin/gtkdocklet.c:446 ../pidgin/gtkstatusbox.c:1060
-#, c-format
+#: ../libpurple/protocols/yahoo/yahoo.c:3097 ../libpurple/status.c:157
+#: ../pidgin/gtkdocklet.c:557 ../pidgin/gtkstatusbox.c:1060
 msgid "Invisible"
 msgstr "Onsigbaar"
 
 #: ../libpurple/protocols/oscar/oscar.c:739
-#, c-format
 msgid "Online"
 msgstr "Aanlyn"
 
 #: ../libpurple/protocols/oscar/oscar.c:838
-#: ../libpurple/protocols/oscar/oscar.c:3707
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:721 ../pidgin/gtkprefs.c:1126
+#: ../libpurple/protocols/oscar/oscar.c:3722
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:721 ../pidgin/gtkprefs.c:1156
 msgid "IP Address"
 msgstr "IP-adres"
 
 #: ../libpurple/protocols/oscar/oscar.c:845
-#: ../libpurple/protocols/oscar/oscar.c:2891
+#: ../libpurple/protocols/oscar/oscar.c:2906
 msgid "Warning Level"
 msgstr "Waarskuwingvlak"
 
 #: ../libpurple/protocols/oscar/oscar.c:855
 msgid "Buddy Comment"
-msgstr "Vriendopmerking"
+msgstr "Vriendkommentaar"
 
 #: ../libpurple/protocols/oscar/oscar.c:995
 #, c-format
@@ -8438,7 +8436,7 @@
 "Could not connect to authentication server:\n"
 "%s"
 msgstr ""
-"Kon nie aan stawingbediener verbind nie:\n"
+"Kon nie aan stawingbediener koppel nie:\n"
 "%s"
 
 #: ../libpurple/protocols/oscar/oscar.c:1003
@@ -8447,7 +8445,7 @@
 "Could not connect to BOS server:\n"
 "%s"
 msgstr ""
-"Kon nie aan BOS-bediener verbind nie:\n"
+"Kon nie aan BOS-bediener koppel nie:\n"
 "%s"
 
 #: ../libpurple/protocols/oscar/oscar.c:1043
@@ -8463,7 +8461,7 @@
 msgid "Finalizing connection"
 msgstr "Finaliseer verbinding"
 
-#: ../libpurple/protocols/oscar/oscar.c:1260
+#: ../libpurple/protocols/oscar/oscar.c:1262
 #, c-format
 msgid ""
 "Unable to login: Could not sign on as %s because the screen name is "
@@ -8474,129 +8472,137 @@
 "is.  Skermname moet geldige e-posadresse wees, of met 'n letter begin en net "
 "letters, syfers en spasies bevat, of net syfers bevat."
 
-#: ../libpurple/protocols/oscar/oscar.c:1345
-#: ../libpurple/protocols/yahoo/yahoo.c:2105
+#: ../libpurple/protocols/oscar/oscar.c:1348
+#: ../libpurple/protocols/yahoo/yahoo.c:2107
 msgid "Invalid screen name."
 msgstr "Ongeldige skermnaam."
 
-#: ../libpurple/protocols/oscar/oscar.c:1352
-#: ../libpurple/protocols/qq/login_logout.c:483
-#: ../libpurple/protocols/simple/simple.c:1045
-#: ../libpurple/protocols/yahoo/yahoo.c:2126
+#: ../libpurple/protocols/oscar/oscar.c:1355
+#: ../libpurple/protocols/qq/login_logout.c:485
+#: ../libpurple/protocols/simple/simple.c:1108
+#: ../libpurple/protocols/yahoo/yahoo.c:2128
 msgid "Incorrect password."
 msgstr "Verkeerde wagwoord."
 
-#: ../libpurple/protocols/oscar/oscar.c:1357
+#: ../libpurple/protocols/oscar/oscar.c:1360
 msgid "Your account is currently suspended."
 msgstr "U rekening is tans opgeskort."
 
 #. service temporarily unavailable
-#: ../libpurple/protocols/oscar/oscar.c:1361
+#: ../libpurple/protocols/oscar/oscar.c:1364
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr "Die AOL-kitsboodskapdiens is tydelik nie beskikbaar nie."
 
-#: ../libpurple/protocols/oscar/oscar.c:1366
-#: ../libpurple/protocols/oscar/oscar.c:1377
+#: ../libpurple/protocols/oscar/oscar.c:1369
+#: ../libpurple/protocols/oscar/oscar.c:1380
 msgid ""
 "You have been connecting and disconnecting too frequently. Wait ten minutes "
 "and try again. If you continue to try, you will need to wait even longer."
 msgstr ""
-"U het nou te gereeld verbind en afgesny. Wag tien minute en probeer weer. "
+"U het nou te gereeld gekoppel en ontkoppel. Wag tien minute en probeer weer. "
 "Indien u voortgaan om te probeer sal u selfs nog langer moet wag."
 
-#: ../libpurple/protocols/oscar/oscar.c:1371
+#: ../libpurple/protocols/oscar/oscar.c:1374
 #, c-format
 msgid "The client version you are using is too old. Please upgrade at %s"
-msgstr "Die kliëntweergawe wat u gebruik, is te oud. Gradeer asb. op by %s"
-
-#: ../libpurple/protocols/oscar/oscar.c:1410
+msgstr "Die kliëntweergawe wat u gebruik, is te oud. Gradeer gerus op by %s"
+
+#: ../libpurple/protocols/oscar/oscar.c:1413
 msgid "Could Not Connect"
-msgstr "Kon nie verbind nie"
-
-#: ../libpurple/protocols/oscar/oscar.c:1414
+msgstr "Kon nie koppel nie"
+
+#: ../libpurple/protocols/oscar/oscar.c:1417
 msgid "Received authorization"
 msgstr "Magtiging ontvang"
 
-#: ../libpurple/protocols/oscar/oscar.c:1436
+#: ../libpurple/protocols/oscar/oscar.c:1439
 msgid "The SecurID key entered is invalid."
-msgstr "Die SecurID-sleutel wat gegee is, is ongeldig."
-
-#: ../libpurple/protocols/oscar/oscar.c:1449
+msgstr "Die SecurID-sleutel wat getik is, is ongeldig."
+
+#: ../libpurple/protocols/oscar/oscar.c:1452
 msgid "Enter SecurID"
-msgstr "Gee SecurID"
-
-#: ../libpurple/protocols/oscar/oscar.c:1450
+msgstr "Tik SecurID"
+
+#: ../libpurple/protocols/oscar/oscar.c:1453
 msgid "Enter the 6 digit number from the digital display."
-msgstr "Gee die 6-syfer-nommer vanaf die digitale skerm."
+msgstr "Tik die 6-syfer-nommer vanaf die digitale skerm."
 
 #. *
 #. * A wrapper for purple_request_action() that uses @c OK and @c Cancel buttons.
+#. *
+#. * @since 2.3.0
 #.
-#: ../libpurple/protocols/oscar/oscar.c:1452
-#: ../libpurple/protocols/oscar/oscar.c:2232
-#: ../libpurple/protocols/oscar/oscar.c:2281
-#: ../libpurple/protocols/oscar/oscar.c:5885
-#: ../libpurple/protocols/oscar/oscar.c:6166 ../libpurple/request.h:1388
+#. *
+#. * A wrapper for purple_request_action() that uses @c OK and @c Cancel buttons.
+#. *
+#. * @deprecated Please use purple_request_ok_cancel_with_hint instead.
+#.
+#: ../libpurple/protocols/oscar/oscar.c:1455
+#: ../libpurple/protocols/oscar/oscar.c:2247
+#: ../libpurple/protocols/oscar/oscar.c:2296
+#: ../libpurple/protocols/oscar/oscar.c:5940
+#: ../libpurple/protocols/oscar/oscar.c:6221 ../libpurple/request.h:1828
+#: ../libpurple/request.h:1841
 msgid "_OK"
 msgstr "_Regso"
 
-#: ../libpurple/protocols/oscar/oscar.c:1491
-#: ../libpurple/protocols/oscar/oscar.c:1534
+#: ../libpurple/protocols/oscar/oscar.c:1494
+#: ../libpurple/protocols/oscar/oscar.c:1537
 #, c-format
 msgid ""
 "You may be disconnected shortly.  You may want to use TOC until this is "
 "fixed.  Check %s for updates."
 msgstr ""
-"U kan dalk binnekort afgesny word.  U moet dalk TOC gebruik tot dit "
+"U kan dalk binnekort ontkoppel word.  U moet dalk TOC gebruik tot dit "
 "reggemaak is.  Kontroleer %s vir bywerkings."
 
-#: ../libpurple/protocols/oscar/oscar.c:1494
-#: ../libpurple/protocols/oscar/oscar.c:1537
+#: ../libpurple/protocols/oscar/oscar.c:1497
+#: ../libpurple/protocols/oscar/oscar.c:1540
 msgid "Unable to get a valid AIM login hash."
 msgstr "Kan nie 'n geldige AIM-aanmeldhutswaarde kry nie."
 
-#: ../libpurple/protocols/oscar/oscar.c:1622
+#: ../libpurple/protocols/oscar/oscar.c:1625
 #, c-format
 msgid "You may be disconnected shortly.  Check %s for updates."
-msgstr "U kan dalk binnekort afgesny word.  Kontroleer %s vir bywerkings."
-
-#: ../libpurple/protocols/oscar/oscar.c:1625
+msgstr "U kan dalk binnekort ontkoppel word.  Kontroleer %s vir bywerkings."
+
+#: ../libpurple/protocols/oscar/oscar.c:1628
 msgid "Unable to get a valid login hash."
 msgstr "Kan nie geldige aanmeldhutswaarde kry nie."
 
-#: ../libpurple/protocols/oscar/oscar.c:1655
+#: ../libpurple/protocols/oscar/oscar.c:1658
 msgid "Password sent"
 msgstr "Wagwoord gestuur"
 
-#: ../libpurple/protocols/oscar/oscar.c:1711
+#: ../libpurple/protocols/oscar/oscar.c:1714
 msgid "Unable to initialize connection"
 msgstr "Kan nie verbinding inisialiseer nie"
 
-#: ../libpurple/protocols/oscar/oscar.c:2202
+#: ../libpurple/protocols/oscar/oscar.c:2205
 msgid "Please authorize me so I can add you to my buddy list."
-msgstr "Magtig my asb. sodat ek u by my vriendelys kan voeg."
-
-#: ../libpurple/protocols/oscar/oscar.c:2230
+msgstr "Magtig my gerus sodat ek u by my vriendelys kan voeg."
+
+#: ../libpurple/protocols/oscar/oscar.c:2245
 msgid "Authorization Request Message:"
 msgstr "Magtigingversoek:"
 
-#: ../libpurple/protocols/oscar/oscar.c:2231
+#: ../libpurple/protocols/oscar/oscar.c:2246
 msgid "Please authorize me!"
-msgstr "Magtig my asb!"
-
-#: ../libpurple/protocols/oscar/oscar.c:2272
-#: ../libpurple/protocols/oscar/oscar.c:2280
-#: ../libpurple/protocols/oscar/oscar.c:2407
-#: ../libpurple/protocols/oscar/oscar.c:5263
-#: ../libpurple/protocols/yahoo/yahoo.c:1030
+msgstr "Magtig my asseblief!"
+
+#: ../libpurple/protocols/oscar/oscar.c:2287
+#: ../libpurple/protocols/oscar/oscar.c:2295
+#: ../libpurple/protocols/oscar/oscar.c:2422
+#: ../libpurple/protocols/oscar/oscar.c:5316
+#: ../libpurple/protocols/yahoo/yahoo.c:1032
 msgid "No reason given."
 msgstr "Geen rede gegee nie."
 
-#: ../libpurple/protocols/oscar/oscar.c:2279
+#: ../libpurple/protocols/oscar/oscar.c:2294
 msgid "Authorization Denied Message:"
 msgstr "Magtiging gewyer-boodskap:"
 
-#: ../libpurple/protocols/oscar/oscar.c:2407
+#: ../libpurple/protocols/oscar/oscar.c:2422
 #, c-format
 msgid ""
 "The user %u has denied your request to add them to your buddy list for the "
@@ -8607,18 +8613,18 @@
 "vir die volgende rede:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2408
+#: ../libpurple/protocols/oscar/oscar.c:2423
 msgid "ICQ authorization denied."
 msgstr "ICQ-magtiging geweier."
 
 #. Someone has granted you authorization
-#: ../libpurple/protocols/oscar/oscar.c:2415
+#: ../libpurple/protocols/oscar/oscar.c:2430
 #, c-format
 msgid "The user %u has granted your request to add them to your buddy list."
 msgstr ""
 "Die gebruiker %u het u versoek om hulle by u vriendelys te voeg, aanvaar."
 
-#: ../libpurple/protocols/oscar/oscar.c:2423
+#: ../libpurple/protocols/oscar/oscar.c:2438
 #, c-format
 msgid ""
 "You have received a special message\n"
@@ -8631,7 +8637,7 @@
 "Van: %s [%s]\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2431
+#: ../libpurple/protocols/oscar/oscar.c:2446
 #, c-format
 msgid ""
 "You have received an ICQ page\n"
@@ -8644,7 +8650,7 @@
 "Van: %s [%s]\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2439
+#: ../libpurple/protocols/oscar/oscar.c:2454
 #, c-format
 msgid ""
 "You have received an ICQ e-mail from %s [%s]\n"
@@ -8657,38 +8663,38 @@
 "Boodskap is:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2460
+#: ../libpurple/protocols/oscar/oscar.c:2475
 #, c-format
 msgid "ICQ user %u has sent you a buddy: %s (%s)"
 msgstr "ICQ-gebruiker %u het u 'n vriend gestuur: %s (%s)"
 
-#: ../libpurple/protocols/oscar/oscar.c:2466
+#: ../libpurple/protocols/oscar/oscar.c:2481
 msgid "Do you want to add this buddy to your buddy list?"
 msgstr "Wil u hierdie vriend by die vriendelys voeg?"
 
-#: ../libpurple/protocols/oscar/oscar.c:2471 ../pidgin/gtkroomlist.c:309
+#: ../libpurple/protocols/oscar/oscar.c:2486 ../pidgin/gtkroomlist.c:309
 msgid "_Add"
 msgstr "_Voeg by"
 
-#: ../libpurple/protocols/oscar/oscar.c:2472
+#: ../libpurple/protocols/oscar/oscar.c:2487
 msgid "_Decline"
 msgstr "_Weier"
 
-#: ../libpurple/protocols/oscar/oscar.c:2596
+#: ../libpurple/protocols/oscar/oscar.c:2611
 #, 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] "U het %hu kitsboodskap vanaf %s gemis omdat dit ongeldig was."
 msgstr[1] "U het %hu kitsboodskappe vanaf %s gemis omdat hulle ongeldig was."
 
-#: ../libpurple/protocols/oscar/oscar.c:2605
+#: ../libpurple/protocols/oscar/oscar.c:2620
 #, c-format
 msgid "You missed %hu message from %s because it was too large."
 msgid_plural "You missed %hu messages from %s because they were too large."
 msgstr[0] "U het %hu kitsboodskap vanaf %s gemis omdat dit te groot was."
 msgstr[1] "U het %hu kitsboodskappe vanaf %s gemis omdat hulle te groot was."
 
-#: ../libpurple/protocols/oscar/oscar.c:2614
+#: ../libpurple/protocols/oscar/oscar.c:2629
 #, c-format
 msgid ""
 "You missed %hu message from %s because the rate limit has been exceeded."
@@ -8699,21 +8705,21 @@
 msgstr[1] ""
 "U het %hu kitsboodskappe vanaf %s gemis omdat die koerslimiet oorskry is."
 
-#: ../libpurple/protocols/oscar/oscar.c:2623
+#: ../libpurple/protocols/oscar/oscar.c:2638
 #, c-format
 msgid "You missed %hu message from %s because he/she was too evil."
 msgid_plural "You missed %hu messages from %s because he/she was too evil."
 msgstr[0] "U het %hu kitsboodskap vanaf %s gemis omdat hy/sy te naar was."
 msgstr[1] "U het %hu kitsboodskappe vanaf %s gemis omdat hy/sy te naar was."
 
-#: ../libpurple/protocols/oscar/oscar.c:2632
+#: ../libpurple/protocols/oscar/oscar.c:2647
 #, c-format
 msgid "You missed %hu message from %s because you are too evil."
 msgid_plural "You missed %hu messages from %s because you are too evil."
 msgstr[0] "U het %hu kitsboodskap vanaf %s gemis omdat u te naar was."
 msgstr[1] "U het %hu kitsboodskappe vanaf %s gemis omdat u te naar was."
 
-#: ../libpurple/protocols/oscar/oscar.c:2641
+#: ../libpurple/protocols/oscar/oscar.c:2656
 #, 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."
@@ -8721,47 +8727,47 @@
 msgstr[1] "U het %hu kitsboodskappe vanaf %s gemis vir 'n onbekende rede."
 
 #. Data is assumed to be the destination sn
-#: ../libpurple/protocols/oscar/oscar.c:2796
+#: ../libpurple/protocols/oscar/oscar.c:2811
 #, c-format
 msgid "Unable to send message: %s"
 msgstr "Kan nie boodskap stuur nie: %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2796
-#: ../libpurple/protocols/oscar/oscar.c:2801
-#: ../libpurple/protocols/oscar/oscar.c:2865
+#: ../libpurple/protocols/oscar/oscar.c:2811
+#: ../libpurple/protocols/oscar/oscar.c:2816
+#: ../libpurple/protocols/oscar/oscar.c:2880
 msgid "Unknown reason."
 msgstr "Onbekende rede."
 
-#: ../libpurple/protocols/oscar/oscar.c:2799
+#: ../libpurple/protocols/oscar/oscar.c:2814
 #: ../libpurple/protocols/sametime/sametime.c:2409
 #, c-format
 msgid "Unable to send message to %s:"
 msgstr "Kan nie boodskap aan %s stuur nie:"
 
-#: ../libpurple/protocols/oscar/oscar.c:2865
+#: ../libpurple/protocols/oscar/oscar.c:2880
 #, c-format
 msgid "User information not available: %s"
 msgstr "Gebruikerinligting nie beskikbaar nie: %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2896
+#: ../libpurple/protocols/oscar/oscar.c:2911
 msgid "Online Since"
 msgstr "Aanlyn sedert"
 
-#: ../libpurple/protocols/oscar/oscar.c:2901
+#: ../libpurple/protocols/oscar/oscar.c:2916
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1185
 msgid "Member Since"
 msgstr "Lid sedert"
 
-#: ../libpurple/protocols/oscar/oscar.c:2936
+#: ../libpurple/protocols/oscar/oscar.c:2951
 msgid "Available Message"
 msgstr "Beskikbare boodskap"
 
-#: ../libpurple/protocols/oscar/oscar.c:3044
+#: ../libpurple/protocols/oscar/oscar.c:3059
 msgid "Your AIM connection may be lost."
-msgstr "U AIM-verbinding is dalk afgesny."
+msgstr "U AIM-verbinding is dalk ontkoppel."
 
 #. The conversion failed!
-#: ../libpurple/protocols/oscar/oscar.c:3232
+#: ../libpurple/protocols/oscar/oscar.c:3247
 msgid ""
 "[Unable to display a message from this user because it contained invalid "
 "characters.]"
@@ -8769,124 +8775,123 @@
 "[Kon nie 'n boodskap van hierdie gebruiker wys nie omdat dit ongeldige "
 "karakters bevat.]"
 
-#: ../libpurple/protocols/oscar/oscar.c:3396
+#: ../libpurple/protocols/oscar/oscar.c:3411
 msgid ""
 "The last action you attempted could not be performed because you are over "
 "the rate limit. Please wait 10 seconds and try again."
 msgstr ""
-"Die vorige aksie wat u probeer uitvoer het, kon nie uitgevoer word nie omdat "
-"u oor die koerslimiet is. Wag asb. 10 sekondes en probeer weer."
-
-#: ../libpurple/protocols/oscar/oscar.c:3479
+"Die vorige aksie wat u probeer verrig het, kon nie uitgevoer word nie omdat "
+"u oor die koerslimiet is. Wag gerus 10 sekondes en probeer weer."
+
+#: ../libpurple/protocols/oscar/oscar.c:3494
 #: ../libpurple/protocols/toc/toc.c:977
 #, c-format
 msgid "You have been disconnected from chat room %s."
-msgstr "U is uit geselsiekamer %s afgesny."
-
-#: ../libpurple/protocols/oscar/oscar.c:3729
-#: ../libpurple/protocols/silc/util.c:585
+msgstr "U is uit geselsiekamer %s ontkoppel."
+
+#: ../libpurple/protocols/oscar/oscar.c:3744
+#: ../libpurple/protocols/silc/util.c:589
 #: ../libpurple/protocols/silc10/util.c:581
 msgid "Mobile Phone"
 msgstr "Selfoon"
 
-#: ../libpurple/protocols/oscar/oscar.c:3759
+#: ../libpurple/protocols/oscar/oscar.c:3774
 msgid "Personal Web Page"
 msgstr "Persoonlike webblad"
 
-#: ../libpurple/protocols/oscar/oscar.c:3783
+#: ../libpurple/protocols/oscar/oscar.c:3798
 #: ../libpurple/protocols/qq/buddy_info.c:40
 msgid "Additional Information"
 msgstr "Ekstra inligting"
 
-#: ../libpurple/protocols/oscar/oscar.c:3791
-#: ../libpurple/protocols/oscar/oscar.c:3804
+#: ../libpurple/protocols/oscar/oscar.c:3806
+#: ../libpurple/protocols/oscar/oscar.c:3819
 msgid "Zip Code"
 msgstr "Poskode"
 
-#: ../libpurple/protocols/oscar/oscar.c:3815
+#: ../libpurple/protocols/oscar/oscar.c:3830
 msgid "Division"
 msgstr "Afdeling"
 
-#: ../libpurple/protocols/oscar/oscar.c:3816
+#: ../libpurple/protocols/oscar/oscar.c:3831
 msgid "Position"
 msgstr "Posisie"
 
-#: ../libpurple/protocols/oscar/oscar.c:3818
+#: ../libpurple/protocols/oscar/oscar.c:3833
 msgid "Web Page"
 msgstr "Webblad"
 
-#: ../libpurple/protocols/oscar/oscar.c:3821
+#: ../libpurple/protocols/oscar/oscar.c:3836
 msgid "Work Information"
 msgstr "Werkinligting"
 
-#: ../libpurple/protocols/oscar/oscar.c:3877
+#: ../libpurple/protocols/oscar/oscar.c:3892
 msgid "Pop-Up Message"
 msgstr "Opspring-boodskap"
 
-#: ../libpurple/protocols/oscar/oscar.c:3917
+#: ../libpurple/protocols/oscar/oscar.c:3932
 #, c-format
 msgid "The following screen name is associated with %s"
 msgid_plural "The following screen names are associated with %s"
 msgstr[0] "Die volgende skermnaam word met %s geassosieer"
 msgstr[1] "Die volgende skermname word met %s geassosieer"
 
-#: ../libpurple/protocols/oscar/oscar.c:3922
+#: ../libpurple/protocols/oscar/oscar.c:3937
 msgid "Screen name"
 msgstr "Skermnaam"
 
-#: ../libpurple/protocols/oscar/oscar.c:3948
+#: ../libpurple/protocols/oscar/oscar.c:3963
 #, c-format
 msgid "No results found for e-mail address %s"
 msgstr "Geen resultate gekry vir e-posadres %s nie"
 
-#: ../libpurple/protocols/oscar/oscar.c:3969
+#: ../libpurple/protocols/oscar/oscar.c:3984
 #, c-format
 msgid "You should receive an e-mail asking to confirm %s."
 msgstr "U behoort 'n e-pos te ontvang wat vra dat u %s bevestig."
 
-#: ../libpurple/protocols/oscar/oscar.c:3971
+#: ../libpurple/protocols/oscar/oscar.c:3986
 msgid "Account Confirmation Requested"
 msgstr "Rekening-bevestiging vereis"
 
-#: ../libpurple/protocols/oscar/oscar.c:4002
-#, c-format
+#: ../libpurple/protocols/oscar/oscar.c:4017
 msgid "Error Changing Account Info"
-msgstr "Fout met verandering van rekeninginligting"
-
-#: ../libpurple/protocols/oscar/oscar.c:4005
+msgstr "Kon nie rekeninginligting verander nie"
+
+#: ../libpurple/protocols/oscar/oscar.c:4020
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
 "differs from the original."
 msgstr ""
-"Fout 0x%04x: Kon nie die skermnaam formateer nie omdat die aangevraagde "
+"Fout 0x%04x: Kan nie die skermnaam formateer nie omdat die aangevraagde "
 "skermnaam van die oorspronklike verskil."
 
-#: ../libpurple/protocols/oscar/oscar.c:4008
+#: ../libpurple/protocols/oscar/oscar.c:4023
 #, c-format
 msgid "Error 0x%04x: Unable to format screen name because it is invalid."
 msgstr ""
-"Fout 0x%04x: Kon nie die skermnaam formateer nie omdat dit ongeldig is."
-
-#: ../libpurple/protocols/oscar/oscar.c:4011
+"Fout 0x%04x: Kan nie die skermnaam formateer nie omdat dit ongeldig is."
+
+#: ../libpurple/protocols/oscar/oscar.c:4026
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
 "is too long."
 msgstr ""
-"Fout 0x%04x: Kon nie die skermnaam formateer nie omdat die aangevraagde "
+"Fout 0x%04x: Kan nie die skermnaam formateer nie omdat die aangevraagde "
 "skermnaam te lank is."
 
-#: ../libpurple/protocols/oscar/oscar.c:4014
+#: ../libpurple/protocols/oscar/oscar.c:4029
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change e-mail address because there is already a "
 "request pending for this screen name."
 msgstr ""
-"Fout 0x%04x: Kon nie die e-posadres verander nie omdat daar reeds 'n versoek "
+"Fout 0x%04x: Kan nie die e-posadres verander nie omdat daar reeds 'n versoek "
 "hangende vir hierdie skermnaam is."
 
-#: ../libpurple/protocols/oscar/oscar.c:4017
+#: ../libpurple/protocols/oscar/oscar.c:4032
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change e-mail address because the given address has "
@@ -8895,7 +8900,7 @@
 "Fout 0x%04x: Kon nie e-posadres verander nie omdat die gegewe adres te veel "
 "skermname daarmee geassosieer het."
 
-#: ../libpurple/protocols/oscar/oscar.c:4020
+#: ../libpurple/protocols/oscar/oscar.c:4035
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change e-mail address because the given address is "
@@ -8904,32 +8909,32 @@
 "Fout 0x%04x: Kon nie e-posadres verander nie omdat die gegewe adres ongeldig "
 "is."
 
-#: ../libpurple/protocols/oscar/oscar.c:4023
+#: ../libpurple/protocols/oscar/oscar.c:4038
 #, c-format
 msgid "Error 0x%04x: Unknown error."
 msgstr "Fout 0x%04x: Onbekende fout."
 
-#: ../libpurple/protocols/oscar/oscar.c:4033
+#: ../libpurple/protocols/oscar/oscar.c:4048
 #, c-format
 msgid "The e-mail address for %s is %s"
 msgstr "Die e-posadres vir %s is %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:4035
+#: ../libpurple/protocols/oscar/oscar.c:4050
 msgid "Account Info"
 msgstr "Rekeninginligting"
 
-#: ../libpurple/protocols/oscar/oscar.c:4218
+#: ../libpurple/protocols/oscar/oscar.c:4233
 msgid ""
 "Your IM Image was not sent. You must be Direct Connected to send IM Images."
 msgstr ""
-"U kitsboodskapprentjie is nie gestuur nie. U moet direk verbind wees om "
-"kitsboodskapprentjies te stuur."
-
-#: ../libpurple/protocols/oscar/oscar.c:4489
+"U kitsboodskapprent is nie gestuur nie. U moet direk gekoppel wees om "
+"kitsboodskapprente te stuur."
+
+#: ../libpurple/protocols/oscar/oscar.c:4504
 msgid "Unable to set AIM profile."
 msgstr "Kan nie AIM-profiel instel nie."
 
-#: ../libpurple/protocols/oscar/oscar.c:4490
+#: ../libpurple/protocols/oscar/oscar.c:4505
 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 "
@@ -8937,9 +8942,9 @@
 msgstr ""
 "U het moontlik versoek dat u profiel geaktiveer word voor die "
 "aanmeldprosedure afgehandel is.  U profiel is nog gedeaktiveer; probeer dit "
-"weer aktiveer wanneer u volledig verbind is."
-
-#: ../libpurple/protocols/oscar/oscar.c:4504
+"weer aktiveer wanneer u volledig gekoppel is."
+
+#: ../libpurple/protocols/oscar/oscar.c:4519
 #, c-format
 msgid ""
 "The maximum profile length of %d byte has been exceeded.  It has been "
@@ -8952,11 +8957,11 @@
 msgstr[1] ""
 "Die maksimum profiellengte van %d grepe is oorskry.  Dit is vir u afgesny."
 
-#: ../libpurple/protocols/oscar/oscar.c:4509
+#: ../libpurple/protocols/oscar/oscar.c:4524
 msgid "Profile too long."
 msgstr "Profiel te lank."
 
-#: ../libpurple/protocols/oscar/oscar.c:4554
+#: ../libpurple/protocols/oscar/oscar.c:4569
 #, c-format
 msgid ""
 "The maximum away message length of %d byte has been exceeded.  It has been "
@@ -8971,11 +8976,11 @@
 "Die maksimum wegboodskap-lengte van %d grepe is oorskry.  Dit is vir u "
 "afgesny."
 
-#: ../libpurple/protocols/oscar/oscar.c:4559
+#: ../libpurple/protocols/oscar/oscar.c:4574
 msgid "Away message too long."
 msgstr "Weg-boodskap te lank."
 
-#: ../libpurple/protocols/oscar/oscar.c:4628
+#: ../libpurple/protocols/oscar/oscar.c:4647
 #, c-format
 msgid ""
 "Could not add the buddy %s because the screen name is invalid.  Screen names "
@@ -8986,52 +8991,52 @@
 "moet geldige e-posadresse wees, of met 'n letter begin en net letters, "
 "syfers en spasies bevat, of net syfers bevat."
 
-#: ../libpurple/protocols/oscar/oscar.c:4630
-#: ../libpurple/protocols/oscar/oscar.c:5060
-#: ../libpurple/protocols/oscar/oscar.c:5075
+#: ../libpurple/protocols/oscar/oscar.c:4649
+#: ../libpurple/protocols/oscar/oscar.c:5102
+#: ../libpurple/protocols/oscar/oscar.c:5117
 msgid "Unable To Add"
 msgstr "Kan nie byvoeg nie"
 
-#: ../libpurple/protocols/oscar/oscar.c:4739
+#: ../libpurple/protocols/oscar/oscar.c:4768
 msgid "Unable To Retrieve Buddy List"
 msgstr "Kan nie vriendelys haal nie"
 
-#: ../libpurple/protocols/oscar/oscar.c:4740
+#: ../libpurple/protocols/oscar/oscar.c:4769
 msgid ""
 "The AIM servers were temporarily unable to send your buddy list.  Your buddy "
-"list is not lost, and will probably become available in a few hours."
+"list is not lost, and will probably become available in a few minutes."
 msgstr ""
 "Die AIM-bedieners kan tydelik nie u vriendelys stuur nie.  U vriendelys is "
-"nie verlore nie, en sal waarskynlik na 'n paar uur weer beskikbaar word."
-
-#: ../libpurple/protocols/oscar/oscar.c:4922
-#: ../libpurple/protocols/oscar/oscar.c:4924
-#: ../libpurple/protocols/oscar/oscar.c:5140
-#: ../libpurple/protocols/oscar/oscar.c:5141
-#: ../libpurple/protocols/oscar/oscar.c:5146
+"nie verlore nie, en sal waarskynlik na 'n paar minute weer beskikbaar word."
+
+#: ../libpurple/protocols/oscar/oscar.c:4952
+#: ../libpurple/protocols/oscar/oscar.c:4954
+#: ../libpurple/protocols/oscar/oscar.c:5182
+#: ../libpurple/protocols/oscar/oscar.c:5183
+#: ../libpurple/protocols/oscar/oscar.c:5188
 msgid "Orphans"
 msgstr "Wesies"
 
-#: ../libpurple/protocols/oscar/oscar.c:5058
+#: ../libpurple/protocols/oscar/oscar.c:5100
 #, c-format
 msgid ""
 "Could not add the buddy %s because you have too many buddies in your buddy "
 "list.  Please remove one and try again."
 msgstr ""
 "Kon nie die vriend %s byvoeg nie omdat u te veel vriende in u vriendelys "
-"het.  Verwyder asb. een en probeer weer."
-
-#: ../libpurple/protocols/oscar/oscar.c:5058
-#: ../libpurple/protocols/oscar/oscar.c:5073
+"het.  Verwyder gerus een en probeer weer."
+
+#: ../libpurple/protocols/oscar/oscar.c:5100
+#: ../libpurple/protocols/oscar/oscar.c:5115
 msgid "(no name)"
 msgstr "(geen naam)"
 
-#: ../libpurple/protocols/oscar/oscar.c:5072
+#: ../libpurple/protocols/oscar/oscar.c:5114
 #, c-format
 msgid "Could not add the buddy %s for an unknown reason."
 msgstr "Kon nie die vriend %s byvoeg nie, om 'n onbekende rede."
 
-#: ../libpurple/protocols/oscar/oscar.c:5178
+#: ../libpurple/protocols/oscar/oscar.c:5231
 #, c-format
 msgid ""
 "The user %s has given you permission to add you to their buddy list.  Do you "
@@ -9040,23 +9045,23 @@
 "Die gebruiker %s het u toestemming gegee om u by hul vriendelys te voeg.  "
 "Wil u hulle byvoeg?"
 
-#: ../libpurple/protocols/oscar/oscar.c:5186
+#: ../libpurple/protocols/oscar/oscar.c:5239
 msgid "Authorization Given"
 msgstr "Magtiging gegee"
 
 #. Granted
-#: ../libpurple/protocols/oscar/oscar.c:5259
+#: ../libpurple/protocols/oscar/oscar.c:5312
 #, c-format
 msgid "The user %s has granted your request to add them to your buddy list."
 msgstr ""
 "Die gebruiker %s het u versoek om hulle by u vriendelys te voeg, aanvaar."
 
-#: ../libpurple/protocols/oscar/oscar.c:5260
+#: ../libpurple/protocols/oscar/oscar.c:5313
 msgid "Authorization Granted"
 msgstr "Magtiging toegestaan"
 
 #. Denied
-#: ../libpurple/protocols/oscar/oscar.c:5263
+#: ../libpurple/protocols/oscar/oscar.c:5316
 #, c-format
 msgid ""
 "The user %s has denied your request to add them to your buddy list for the "
@@ -9067,53 +9072,53 @@
 "vir die volgende rede:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:5264
+#: ../libpurple/protocols/oscar/oscar.c:5317
 msgid "Authorization Denied"
 msgstr "Magtiging geweier"
 
-#: ../libpurple/protocols/oscar/oscar.c:5300
+#: ../libpurple/protocols/oscar/oscar.c:5353
 #: ../libpurple/protocols/toc/toc.c:1371
 msgid "_Exchange:"
 msgstr "_Uitruiling:"
 
-#: ../libpurple/protocols/oscar/oscar.c:5340
+#: ../libpurple/protocols/oscar/oscar.c:5393
 msgid "Invalid chat name specified."
 msgstr "Ongeldige geselsienaam gespesifiseer."
 
-#: ../libpurple/protocols/oscar/oscar.c:5409
+#: ../libpurple/protocols/oscar/oscar.c:5462
 msgid "Your IM Image was not sent. You cannot send IM Images in AIM chats."
 msgstr ""
-"U kitsboodskapprentjie is nie gestuur nie. U kan nie kitsboodskapprentjies "
-"in AIM-geselsies stuur nie."
-
-#: ../libpurple/protocols/oscar/oscar.c:5569
-#: ../libpurple/protocols/oscar/oscar.c:5574
+"U kitsboodskapprent is nie gestuur nie. U kan nie kitsboodskapprente in AIM-"
+"geselsies stuur nie."
+
+#: ../libpurple/protocols/oscar/oscar.c:5624
+#: ../libpurple/protocols/oscar/oscar.c:5629
 msgid "Away Message"
 msgstr "Weg-boodskap"
 
-#: ../libpurple/protocols/oscar/oscar.c:5574
+#: ../libpurple/protocols/oscar/oscar.c:5629
 msgid "<i>(retrieving)</i>"
 msgstr "<i>(verkry tans)</i>"
 
-#: ../libpurple/protocols/oscar/oscar.c:5774
+#: ../libpurple/protocols/oscar/oscar.c:5829
 msgid "iTunes Music Store Link"
 msgstr "iTunes Music Store-skakel"
 
-#: ../libpurple/protocols/oscar/oscar.c:5882
+#: ../libpurple/protocols/oscar/oscar.c:5937
 #, c-format
 msgid "Buddy Comment for %s"
-msgstr "Vriendopmerking vir %s"
-
-#: ../libpurple/protocols/oscar/oscar.c:5883
+msgstr "Vriendkommentaar vir %s"
+
+#: ../libpurple/protocols/oscar/oscar.c:5938
 msgid "Buddy Comment:"
-msgstr "Vriendopmerking:"
-
-#: ../libpurple/protocols/oscar/oscar.c:5930
+msgstr "Vriendkommentaar:"
+
+#: ../libpurple/protocols/oscar/oscar.c:5985
 #, c-format
 msgid "You have selected to open a Direct IM connection with %s."
 msgstr "U het gekies om 'n direkte kitsboodskapverbinding met %s te open."
 
-#: ../libpurple/protocols/oscar/oscar.c:5934
+#: ../libpurple/protocols/oscar/oscar.c:5989
 msgid ""
 "Because this reveals your IP address, it may be considered a security risk.  "
 "Do you wish to continue?"
@@ -9121,64 +9126,64 @@
 "Omdat dit u IP-adres bekend maak, kan dit 'n sekuriteitsrisiko wees.  Wil u "
 "voortgaan?"
 
-#: ../libpurple/protocols/oscar/oscar.c:5940
-#: ../libpurple/protocols/oscar/peer.c:1045
+#: ../libpurple/protocols/oscar/oscar.c:5995
+#: ../libpurple/protocols/oscar/peer.c:1047
 msgid "C_onnect"
 msgstr "_Verbind"
 
-#: ../libpurple/protocols/oscar/oscar.c:5975
+#: ../libpurple/protocols/oscar/oscar.c:6030
 msgid "Get AIM Info"
 msgstr "Kry AIM-inligting"
 
-#: ../libpurple/protocols/oscar/oscar.c:5981
+#: ../libpurple/protocols/oscar/oscar.c:6036
 msgid "Edit Buddy Comment"
-msgstr "Wysig vriendopmerking"
-
-#: ../libpurple/protocols/oscar/oscar.c:5989
+msgstr "Wysig vriendkommentaar"
+
+#: ../libpurple/protocols/oscar/oscar.c:6044
 msgid "Get Status Msg"
 msgstr "Kry statusboodskap"
 
-#: ../libpurple/protocols/oscar/oscar.c:6002
+#: ../libpurple/protocols/oscar/oscar.c:6057
 msgid "Direct IM"
 msgstr "Direkte kitsboodskap"
 
-#: ../libpurple/protocols/oscar/oscar.c:6024
+#: ../libpurple/protocols/oscar/oscar.c:6079
 msgid "Re-request Authorization"
 msgstr "Herversoek magtiging"
 
-#: ../libpurple/protocols/oscar/oscar.c:6083
+#: ../libpurple/protocols/oscar/oscar.c:6138
 msgid "Require authorization"
 msgstr "Vereis magtiging"
 
-#: ../libpurple/protocols/oscar/oscar.c:6086
+#: ../libpurple/protocols/oscar/oscar.c:6141
 msgid "Web aware (enabling this will cause you to receive SPAM!)"
 msgstr "Webbewus (as u dit aktiveer, sal u gemorspos ontvang!)"
 
-#: ../libpurple/protocols/oscar/oscar.c:6091
+#: ../libpurple/protocols/oscar/oscar.c:6146
 msgid "ICQ Privacy Options"
-msgstr "ICQ-privaatheidkeuses"
-
-#: ../libpurple/protocols/oscar/oscar.c:6110
+msgstr "ICQ-privaatheidopsies"
+
+#: ../libpurple/protocols/oscar/oscar.c:6165
 msgid "The new formatting is invalid."
 msgstr "Die nuwe formatering ongeldig."
 
-#: ../libpurple/protocols/oscar/oscar.c:6111
+#: ../libpurple/protocols/oscar/oscar.c:6166
 msgid "Screen name formatting can change only capitalization and whitespace."
 msgstr "Skermnaam-formatering kan net hoofletters en spasies verander."
 
-#: ../libpurple/protocols/oscar/oscar.c:6164
+#: ../libpurple/protocols/oscar/oscar.c:6219
 msgid "Change Address To:"
 msgstr "Verander adres na:"
 
-#: ../libpurple/protocols/oscar/oscar.c:6210
+#: ../libpurple/protocols/oscar/oscar.c:6265
 msgid "<i>you are not waiting for authorization</i>"
 msgstr "<i>u wag nie vir magtiging nie</i>"
 
-#: ../libpurple/protocols/oscar/oscar.c:6213
+#: ../libpurple/protocols/oscar/oscar.c:6268
 msgid "You are awaiting authorization from the following buddies"
 msgstr "U wag op magtiging van die volgende vriende"
 
-#: ../libpurple/protocols/oscar/oscar.c:6214
+#: ../libpurple/protocols/oscar/oscar.c:6269
 msgid ""
 "You can re-request authorization from these buddies by right-clicking on "
 "them and selecting \"Re-request Authorization.\""
@@ -9186,73 +9191,73 @@
 "U kan magtiging van hierdie vriende weer aanvra, deur op hulle te regskliek "
 "en \"Vra weer magtiging aan\" te kies."
 
-#: ../libpurple/protocols/oscar/oscar.c:6231
+#: ../libpurple/protocols/oscar/oscar.c:6286
 msgid "Find Buddy by E-Mail"
 msgstr "Vind vriend volgens e-pos"
 
-#: ../libpurple/protocols/oscar/oscar.c:6232
+#: ../libpurple/protocols/oscar/oscar.c:6287
 msgid "Search for a buddy by e-mail address"
 msgstr "Soek vir 'n vriend volgens e-posadres"
 
-#: ../libpurple/protocols/oscar/oscar.c:6233
+#: ../libpurple/protocols/oscar/oscar.c:6288
 msgid "Type the e-mail address of the buddy you are searching for."
 msgstr "Gee die e-posadres van die vriend waarvoor u soek."
 
-#: ../libpurple/protocols/oscar/oscar.c:6236
+#: ../libpurple/protocols/oscar/oscar.c:6291
 msgid "_Search"
 msgstr "_Soek"
 
-#: ../libpurple/protocols/oscar/oscar.c:6394
+#: ../libpurple/protocols/oscar/oscar.c:6449
 msgid "Set User Info (URL)..."
 msgstr "Stel gebruikerinligting (URL)..."
 
-#: ../libpurple/protocols/oscar/oscar.c:6405
+#: ../libpurple/protocols/oscar/oscar.c:6460
 msgid "Change Password (URL)"
 msgstr "Verander wagwoord (URL)"
 
-#: ../libpurple/protocols/oscar/oscar.c:6409
+#: ../libpurple/protocols/oscar/oscar.c:6464
 msgid "Configure IM Forwarding (URL)"
 msgstr "Konfigureer kitsboodskapaanstuur (URL)"
 
 #. ICQ actions
-#: ../libpurple/protocols/oscar/oscar.c:6419
+#: ../libpurple/protocols/oscar/oscar.c:6474
 msgid "Set Privacy Options..."
-msgstr "Stel privaatheidkeuses..."
+msgstr "Stel privaatheidopsies..."
 
 #. AIM actions
-#: ../libpurple/protocols/oscar/oscar.c:6426
+#: ../libpurple/protocols/oscar/oscar.c:6481
 msgid "Confirm Account"
 msgstr "Bevestig rekening"
 
-#: ../libpurple/protocols/oscar/oscar.c:6430
+#: ../libpurple/protocols/oscar/oscar.c:6485
 msgid "Display Currently Registered E-Mail Address"
 msgstr "Wys e-posadres wat tans geregistreer is"
 
-#: ../libpurple/protocols/oscar/oscar.c:6434
+#: ../libpurple/protocols/oscar/oscar.c:6489
 msgid "Change Currently Registered E-Mail Address..."
 msgstr "Verander e-posadres wat tans geregistreer is..."
 
-#: ../libpurple/protocols/oscar/oscar.c:6441
+#: ../libpurple/protocols/oscar/oscar.c:6496
 msgid "Show Buddies Awaiting Authorization"
 msgstr "Wys vriende wat op magtiging wag"
 
-#: ../libpurple/protocols/oscar/oscar.c:6447
+#: ../libpurple/protocols/oscar/oscar.c:6502
 msgid "Search for Buddy by E-Mail Address..."
 msgstr "Soek vir vriend met e-posadres..."
 
-#: ../libpurple/protocols/oscar/oscar.c:6452
+#: ../libpurple/protocols/oscar/oscar.c:6507
 msgid "Search for Buddy by Information"
 msgstr "Soek vir vriend met inligting"
 
-#: ../libpurple/protocols/oscar/oscar.c:6520
+#: ../libpurple/protocols/oscar/oscar.c:6575
 msgid "Use recent buddies group"
 msgstr "Gebruik onlangse vriendegroep"
 
-#: ../libpurple/protocols/oscar/oscar.c:6523
+#: ../libpurple/protocols/oscar/oscar.c:6578
 msgid "Show how long you have been idle"
 msgstr "Wys hoe lank u ledig was"
 
-#: ../libpurple/protocols/oscar/oscar.c:6678
+#: ../libpurple/protocols/oscar/oscar.c:6733
 msgid ""
 "Always use ICQ proxy server for file transfers\n"
 "(slower, but does not reveal your IP address)"
@@ -9260,34 +9265,33 @@
 "Gebruik altyd ICQ-instaanbediener vir lêeroordrag\n"
 "(stadiger, maar maak nie u IP-adres bekend nie)"
 
-#: ../libpurple/protocols/oscar/peer.c:697
+#: ../libpurple/protocols/oscar/peer.c:699
 #, c-format
 msgid "Asking %s to connect to us at %s:%hu for Direct IM."
-msgstr "Vra tans %s om aan ons by %s:%hu te verbind vir direkte kitsboodskap."
-
-#: ../libpurple/protocols/oscar/peer.c:782
+msgstr "Vra tans %s om aan ons by %s:%hu te koppel vir direkte kitsboodskap."
+
+#: ../libpurple/protocols/oscar/peer.c:784
 #, c-format
 msgid "Attempting to connect to %s:%hu."
-msgstr "Probeer tans om aan %s:%hu te verbind."
-
-#: ../libpurple/protocols/oscar/peer.c:856
-#, c-format
+msgstr "Probeer tans om aan %s:%hu te koppel."
+
+#: ../libpurple/protocols/oscar/peer.c:858
 msgid "Attempting to connect via proxy server."
-msgstr "Probeer tans om via instaanbediener te verbind."
-
-#: ../libpurple/protocols/oscar/peer.c:1033
+msgstr "Probeer tans om via instaanbediener te koppel."
+
+#: ../libpurple/protocols/oscar/peer.c:1035
 #, c-format
 msgid "%s has just asked to directly connect to %s"
-msgstr "%s het pas gevra om direk aan %s te verbind"
-
-#: ../libpurple/protocols/oscar/peer.c:1037
+msgstr "%s het pas gevra om direk aan %s te koppel"
+
+#: ../libpurple/protocols/oscar/peer.c:1039
 msgid ""
 "This requires a direct connection between the two computers and is necessary "
 "for IM Images.  Because your IP address will be revealed, this may be "
 "considered a privacy risk."
 msgstr ""
 "Hierdie vereis 'n direkte verbinding tussen twee rekenaars en is nodig vir "
-"kitsboodskapprentjies.  Omdat u IP-adres bekend gemaak sal word, kan dit 'n "
+"kitsboodskapprente.  Omdat u IP-adres bekend gemaak sal word, kan dit 'n "
 "privaatheidrisiko wees."
 
 #: ../libpurple/protocols/qq/buddy_info.c:39
@@ -9442,30 +9446,30 @@
 msgid "Other"
 msgstr "Ander"
 
-#: ../libpurple/protocols/qq/buddy_info.c:481
-#: ../libpurple/protocols/qq/buddy_info.c:482
+#: ../libpurple/protocols/qq/buddy_info.c:522
+#: ../libpurple/protocols/qq/buddy_info.c:523
 msgid "Modify my information"
 msgstr "Wysig my inligting"
 
-#: ../libpurple/protocols/qq/buddy_info.c:483
+#: ../libpurple/protocols/qq/buddy_info.c:524
 msgid "Update my information"
 msgstr "Werk my inligting by"
 
-#: ../libpurple/protocols/qq/buddy_info.c:507
+#: ../libpurple/protocols/qq/buddy_info.c:548
 msgid "Your information has been updated"
 msgstr "U inliging is bygewerk"
 
-#: ../libpurple/protocols/qq/buddy_info.c:560
+#: ../libpurple/protocols/qq/buddy_info.c:601
 #, c-format
 msgid ""
 "Setting custom faces is not currently supported. Please choose an image from "
 "%s."
 msgstr ""
-"Doelgemaakte gesiggies word nie tans ondersteun nie. Kies asb. 'n prentjie "
-"uit %s."
-
-#: ../libpurple/protocols/qq/buddy_info.c:577
-#: ../libpurple/protocols/qq/buddy_info.c:590
+"Doelgemaakte gesiggies word nie tans ondersteun nie. Kies gerus 'n prent uit "
+"%s."
+
+#: ../libpurple/protocols/qq/buddy_info.c:618
+#: ../libpurple/protocols/qq/buddy_info.c:631
 msgid "Invalid QQ Face"
 msgstr "Ongeldige QQ-gesig"
 
@@ -9567,7 +9571,7 @@
 
 #: ../libpurple/protocols/qq/group.c:120
 msgid "Please enter external group ID"
-msgstr "Gee asb. eksterne groep-ID"
+msgstr "Tik gerus eksterne groep-ID"
 
 #: ../libpurple/protocols/qq/group.c:121
 msgid "You can only search for permanent QQ groups\n"
@@ -9667,7 +9671,7 @@
 
 #: ../libpurple/protocols/qq/group_join.c:329
 msgid "You entered a group ID outside the acceptable range"
-msgstr "U het 'n groep-ID gegee buite die aanvaarbare bestek"
+msgstr "U het 'n groep-ID getik buite die aanvaarbare bestek"
 
 #: ../libpurple/protocols/qq/group_join.c:360
 msgid "Are you sure you want to leave this Qun?"
@@ -9698,7 +9702,7 @@
 
 #: ../libpurple/protocols/qq/group_opt.c:137
 msgid "Enter your reason:"
-msgstr "Gee u rede:"
+msgstr "Tik u rede:"
 
 #: ../libpurple/protocols/qq/group_opt.c:235
 msgid "You have successfully modified Qun member"
@@ -9714,7 +9718,7 @@
 
 #: ../libpurple/protocols/qq/group_opt.c:394
 msgid "Would you like to set up the Qun details now?"
-msgstr "Wil u die qun-detail nou opstel?"
+msgstr "Wil u die qun-details nou opstel?"
 
 #: ../libpurple/protocols/qq/group_opt.c:398
 msgid "Setup"
@@ -9734,9 +9738,9 @@
 
 #: ../libpurple/protocols/qq/login_logout.c:408
 msgid "Error requesting login token"
-msgstr "Fout met versoek van aanmeldteken"
-
-#: ../libpurple/protocols/qq/login_logout.c:486
+msgstr "Kon nie aanmeldteken aanvra nie"
+
+#: ../libpurple/protocols/qq/login_logout.c:488
 msgid "Unable to login, check debug log"
 msgstr "Kon nie aanmeld nie, kontroleer ontfoutstaaflêer"
 
@@ -9746,7 +9750,7 @@
 #: ../libpurple/protocols/yahoo/yahoo_filexfer.c:189
 #: ../libpurple/protocols/yahoo/ycht.c:549
 msgid "Unable to connect."
-msgstr "Kan nie verbind nie."
+msgstr "Kan nie koppel nie."
 
 #: ../libpurple/protocols/qq/qq.c:186
 #, c-format
@@ -9849,7 +9853,7 @@
 
 #: ../libpurple/protocols/qq/qq.c:752
 msgid "Connect using TCP"
-msgstr "Verbind met TCP"
+msgstr "Koppel met TCP"
 
 #: ../libpurple/protocols/qq/recv_core.c:309
 msgid "Socket error"
@@ -9881,7 +9885,7 @@
 #. cancel login progress
 #: ../libpurple/protocols/qq/sendqueue.c:131
 msgid "Login failed, no reply"
-msgstr "Aanmeld het misluk, geen antwoord nie"
+msgstr "Aanmelding het misluk, geen antwoord nie"
 
 #: ../libpurple/protocols/qq/sys_msg.c:110
 msgid "Do you want to add this buddy?"
@@ -9950,7 +9954,7 @@
 
 #: ../libpurple/protocols/sametime/sametime.c:1295
 msgid "Notes Address Book Information"
-msgstr "Notasadresboekinligting"
+msgstr "Notes-adresboekinligting"
 
 #: ../libpurple/protocols/sametime/sametime.c:1327
 msgid "Invite Group to Conference..."
@@ -9958,7 +9962,7 @@
 
 #: ../libpurple/protocols/sametime/sametime.c:1337
 msgid "Get Notes Address Book Info"
-msgstr "Kry notasadresboekinligting"
+msgstr "Kry Notes-adresboekinligting"
 
 #: ../libpurple/protocols/sametime/sametime.c:1504
 msgid "Sending Handshake"
@@ -9997,12 +10001,12 @@
 msgid ""
 "A Sametime administrator has issued the following announcement on server %s"
 msgstr ""
-"'n Selfdetyd-administrateur het die volgende aankondiging op bediener %s "
+"'n Sametime-administrateur het die volgende aankondiging op bediener %s "
 "uitgevaardig"
 
 #: ../libpurple/protocols/sametime/sametime.c:1650
 msgid "Sametime Administrator Announcement"
-msgstr "Selfdetyd-administrateur se aankondiging"
+msgstr "Sametime-administrateur se aankondiging"
 
 #: ../libpurple/protocols/sametime/sametime.c:1702
 msgid "Connection reset"
@@ -10011,13 +10015,13 @@
 #: ../libpurple/protocols/sametime/sametime.c:1709
 #, c-format
 msgid "Error reading from socket: %s"
-msgstr "Fout met lees van sok: %s"
+msgstr "Kon nie vanaf sok lees nie: %s"
 
 #. this is a regular connect, error out
 #: ../libpurple/protocols/sametime/sametime.c:1732
 #: ../libpurple/protocols/sametime/sametime.c:3726
 msgid "Unable to connect to host"
-msgstr "Kon nie aan gasheer verbind nie"
+msgstr "Kon nie aan gasheer koppel nie"
 
 #: ../libpurple/protocols/sametime/sametime.c:1770
 #, c-format
@@ -10068,7 +10072,7 @@
 "Please enter a topic for the new conference, and an invitation message to be "
 "sent to %s"
 msgstr ""
-"Gee asb. 'n onderwerp vir die nuwe konferensie, en 'n uitnodigingboodskap "
+"Tik gerus 'n onderwerp vir die nuwe konferensie, en 'n uitnodigingboodskap "
 "wat aan %s gestuur moet word"
 
 #: ../libpurple/protocols/sametime/sametime.c:3385
@@ -10114,13 +10118,13 @@
 msgid "Send TEST Announcement"
 msgstr "Stuur TEST-aankondiging"
 
-#: ../libpurple/protocols/sametime/sametime.c:3586 ../pidgin/gtkconv.c:4354
+#: ../libpurple/protocols/sametime/sametime.c:3586 ../pidgin/gtkconv.c:4437
 msgid "Topic:"
 msgstr "Onderwerp:"
 
 #: ../libpurple/protocols/sametime/sametime.c:3614
 msgid "No Sametime Community Server specified"
-msgstr "Geen selfdetyd-gemeenskapsbediener gespesifiseer nie"
+msgstr "Geen Sametime-gemeenskapsbediener gespesifiseer nie"
 
 #: ../libpurple/protocols/sametime/sametime.c:3636
 #, c-format
@@ -10129,7 +10133,7 @@
 "Please enter one below to continue logging in."
 msgstr ""
 "Geen gasheer of IP-adres is vir die Intussen-rekening %s gekonfigureer nie. "
-"Gee asb. een hier onder om steeds aan te meld."
+"Tik gerus een hier onder om steeds aan te meld."
 
 #: ../libpurple/protocols/sametime/sametime.c:3641
 msgid "Meanwhile Connection Setup"
@@ -10137,11 +10141,11 @@
 
 #: ../libpurple/protocols/sametime/sametime.c:3642
 msgid "No Sametime Community Server Specified"
-msgstr "Geen selfdetyd-gemeenskapsbediener gespesifiseer nie"
-
-#: ../libpurple/protocols/sametime/sametime.c:3644 ../pidgin/gtkblist.c:4041
+msgstr "Geen Sametime-gemeenskapsbediener gespesifiseer nie"
+
+#: ../libpurple/protocols/sametime/sametime.c:3644 ../pidgin/gtkblist.c:4389
 msgid "Connect"
-msgstr "Verbind"
+msgstr "Koppel"
 
 #: ../libpurple/protocols/sametime/sametime.c:4135
 #, c-format
@@ -10160,11 +10164,11 @@
 #: ../libpurple/protocols/sametime/sametime.c:4304
 #: ../libpurple/protocols/sametime/sametime.c:5509
 msgid "Sametime ID"
-msgstr "Selfdetyd-ID"
+msgstr "Sametime-ID"
 
 #: ../libpurple/protocols/sametime/sametime.c:4328
 msgid "An ambiguous user ID was entered"
-msgstr "'n Dubbelsinnige gebruiker-ID is gegee"
+msgstr "'n Dubbelsinnige gebruiker-ID is getik"
 
 #: ../libpurple/protocols/sametime/sametime.c:4329
 #, c-format
@@ -10173,7 +10177,7 @@
 "select the correct user from the list below to add them to your buddy list."
 msgstr ""
 "Die identifiseerder '%s' verwys dalk na enige van die volgende kwessies. "
-"Kies asb. die korrekte gebruiker uit die lys hier onder om hulle by u "
+"Kies gerus die korrekte gebruiker uit die lys hier onder om hulle by u "
 "vriendelys te voeg."
 
 #: ../libpurple/protocols/sametime/sametime.c:4334
@@ -10190,20 +10194,16 @@
 "The identifier '%s' did not match any users in your Sametime community. This "
 "entry has been removed from your buddy list."
 msgstr ""
-"Die identifiseerder '%s' pas nie by enige gebruikers in u selfdetyd-"
+"Die identifiseerder '%s' pas nie by enige gebruikers in u Sametime-"
 "gemeenskap nie. Hierdie inskrywing is uit u vriendelys geskrap."
 
-#: ../libpurple/protocols/sametime/sametime.c:4425
-msgid "Unable to add user"
-msgstr "Kan nie gebruiker byvoeg nie"
-
 #: ../libpurple/protocols/sametime/sametime.c:5011
 #, c-format
 msgid ""
 "Error reading file %s: \n"
 "%s\n"
 msgstr ""
-"Fout met lees van lêer %s: \n"
+"Kon nie lêer %s lees nie: \n"
 "%s\n"
 
 #: ../libpurple/protocols/sametime/sametime.c:5146
@@ -10233,12 +10233,12 @@
 #: ../libpurple/protocols/sametime/sametime.c:5215
 #, c-format
 msgid "Import Sametime List for Account %s"
-msgstr "Voer selfdetyd-lys in vir rekening %s"
+msgstr "Voer Sametime-lys in vir rekening %s"
 
 #: ../libpurple/protocols/sametime/sametime.c:5255
 #, c-format
 msgid "Export Sametime List for Account %s"
-msgstr "Voer selfdetyd-lys uit vir rekening %s"
+msgstr "Voer Sametime-lys uit vir rekening %s"
 
 #: ../libpurple/protocols/sametime/sametime.c:5309
 msgid "Unable to add group: group exists"
@@ -10260,7 +10260,7 @@
 
 #: ../libpurple/protocols/sametime/sametime.c:5388
 msgid "Notes Address Book group results"
-msgstr "Notasadresboekgroepresultate"
+msgstr "Notes-adresboekgroepresultate"
 
 #: ../libpurple/protocols/sametime/sametime.c:5389
 #, c-format
@@ -10269,13 +10269,13 @@
 "Book groups. Please select the correct group from the list below to add it "
 "to your buddy list."
 msgstr ""
-"Die identifiseerder '%s' verwys dalk na enige van die volgende "
-"Notasadresbespreek-groepe. Kies asb. die korrekte gebruiker uit die lys hier "
-"onder om hulle by u vriendelys te voeg."
+"Die identifiseerder '%s' verwys dalk na enige van die volgende Notes-"
+"adresboek-groepe. Kies gerus die korrekte gebruiker uit die lys hier onder "
+"om hulle by u vriendelys te voeg."
 
 #: ../libpurple/protocols/sametime/sametime.c:5394
 msgid "Select Notes Address Book"
-msgstr "Kies notasadresboekinligting"
+msgstr "Kies Notes-adresboekinligting"
 
 #: ../libpurple/protocols/sametime/sametime.c:5437
 msgid "Unable to add group: group not found"
@@ -10287,19 +10287,19 @@
 "The identifier '%s' did not match any Notes Address Book groups in your "
 "Sametime community."
 msgstr ""
-"Die identifiseerder '%s' pas nie by enige notasadresboekgroepe in u "
-"selfdetyd-gemeenskap nie."
+"Die identifiseerder '%s' pas nie by enige Notes-adresboekgroepe in u "
+"Sametime-gemeenskap nie."
 
 #: ../libpurple/protocols/sametime/sametime.c:5480
 msgid "Notes Address Book Group"
-msgstr "Notasadresboekgroep"
+msgstr "Notes-adresboekgroep"
 
 #: ../libpurple/protocols/sametime/sametime.c:5481
 msgid ""
 "Enter the name of a Notes Address Book group in the field below to add the "
 "group and its members to your buddy list."
 msgstr ""
-"Gee die naam van 'n notasadresboekgroep in die veld hier onder om die groep "
+"Tik die naam van 'n Notes-adresboekgroep in die veld hier onder om die groep "
 "en sy lede by u vriendelys te voeg."
 
 #: ../libpurple/protocols/sametime/sametime.c:5530
@@ -10318,7 +10318,7 @@
 "kan hierdie gebruikers by u vriendelys voeg of vir hulle boodskappe stuur "
 "met die aksieknoppies hier onder."
 
-#: ../libpurple/protocols/sametime/sametime.c:5538 ../pidgin/gtknotify.c:756
+#: ../libpurple/protocols/sametime/sametime.c:5538 ../pidgin/gtknotify.c:763
 msgid "Search Results"
 msgstr "Soekresultate"
 
@@ -10330,7 +10330,7 @@
 #, c-format
 msgid "The identifier '%s' did not match any users in your Sametime community."
 msgstr ""
-"Die identifiseerder '%s' pas nie by enige gebruikers in u selfdetyd-"
+"Die identifiseerder '%s' pas nie by enige gebruikers in u Sametime-"
 "gemeenskap nie."
 
 #: ../libpurple/protocols/sametime/sametime.c:5568
@@ -10346,8 +10346,8 @@
 "Enter a name or partial ID in the field below to search for matching users "
 "in your Sametime community."
 msgstr ""
-"Gee 'n naam of gedeeltelike ID in die veld hier onder om vir passende "
-"gebruikers in u selfdetydgemeenskap te soek."
+"Tik 'n naam of gedeeltelike ID in die veld hier onder om vir passende "
+"gebruikers in u Sametime-gemeenskap te soek."
 
 #: ../libpurple/protocols/sametime/sametime.c:5609
 msgid "User Search"
@@ -10355,15 +10355,15 @@
 
 #: ../libpurple/protocols/sametime/sametime.c:5622
 msgid "Import Sametime List..."
-msgstr "Voer selfdetydlys in..."
+msgstr "Voer Sametimelys in..."
 
 #: ../libpurple/protocols/sametime/sametime.c:5626
 msgid "Export Sametime List..."
-msgstr "Voer selfdetydlys uit..."
+msgstr "Voer Sametimelys uit..."
 
 #: ../libpurple/protocols/sametime/sametime.c:5630
 msgid "Add Notes Address Book Group..."
-msgstr "Voeg notasadresboekgroep by..."
+msgstr "Voeg Notes-adresboekgroep by..."
 
 #: ../libpurple/protocols/sametime/sametime.c:5634
 msgid "User Search..."
@@ -10371,7 +10371,7 @@
 
 #: ../libpurple/protocols/sametime/sametime.c:5740
 msgid "Force login (ignore server redirects)"
-msgstr "Dwing aanmeld (ignoreer bedienerherverwysing)"
+msgstr "Dwing aanmeld (ignoreer bedienerherleiding)"
 
 #. pretend to be Sametime Connect
 #: ../libpurple/protocols/sametime/sametime.c:5750
@@ -10414,12 +10414,12 @@
 #: ../libpurple/protocols/silc/buddy.c:54
 #: ../libpurple/protocols/silc10/buddy.c:54
 msgid "Cannot perform the key agreement"
-msgstr "Kan nie sleutelooreenkoms uitvoer nie"
+msgstr "Kan nie sleutelooreenkoms verrig nie"
 
 #: ../libpurple/protocols/silc/buddy.c:111
 #: ../libpurple/protocols/silc10/buddy.c:116
 msgid "Error occurred during key agreement"
-msgstr "Fout het plaasgevind tydens sleutelooreenkoms"
+msgstr "'n Fout het plaasgevind tydens sleutelooreenkoms"
 
 #: ../libpurple/protocols/silc/buddy.c:115
 #: ../libpurple/protocols/silc10/buddy.c:120
@@ -10464,7 +10464,7 @@
 "agreement?"
 msgstr ""
 "Sleutelooreenkoms-versoek ontvang van %s. Wil u by die sleutelooreenkoms "
-"uitvoer?"
+"verrig?"
 
 #: ../libpurple/protocols/silc/buddy.c:302
 #: ../libpurple/protocols/silc10/buddy.c:299
@@ -10505,8 +10505,8 @@
 #: ../libpurple/protocols/silc/buddy.c:496
 #: ../libpurple/protocols/silc/buddy.c:507
 #: ../libpurple/protocols/silc/buddy.c:540
-#: ../libpurple/protocols/silc/ops.c:1499
-#: ../libpurple/protocols/silc/ops.c:1510
+#: ../libpurple/protocols/silc/ops.c:1503
+#: ../libpurple/protocols/silc/ops.c:1514
 #: ../libpurple/protocols/silc10/buddy.c:513
 #: ../libpurple/protocols/silc10/buddy.c:548
 #: ../libpurple/protocols/silc10/ops.c:1494
@@ -10515,8 +10515,8 @@
 msgstr "Kry publieke sleutel"
 
 #: ../libpurple/protocols/silc/buddy.c:541
-#: ../libpurple/protocols/silc/ops.c:1500
-#: ../libpurple/protocols/silc/ops.c:1511
+#: ../libpurple/protocols/silc/ops.c:1504
+#: ../libpurple/protocols/silc/ops.c:1515
 #: ../libpurple/protocols/silc10/buddy.c:549
 #: ../libpurple/protocols/silc10/ops.c:1495
 #: ../libpurple/protocols/silc10/ops.c:1506
@@ -10524,17 +10524,17 @@
 msgstr "Kan nie publieke sleutel haal nie"
 
 #: ../libpurple/protocols/silc/buddy.c:622
-#: ../libpurple/protocols/silc/buddy.c:1655
+#: ../libpurple/protocols/silc/buddy.c:1658
 #: ../libpurple/protocols/silc10/buddy.c:635
-#: ../libpurple/protocols/silc10/buddy.c:1654
+#: ../libpurple/protocols/silc10/buddy.c:1657
 msgid "Show Public Key"
 msgstr "Wys publieke sleutel"
 
 #: ../libpurple/protocols/silc/buddy.c:623
-#: ../libpurple/protocols/silc/buddy.c:1027
-#: ../libpurple/protocols/silc/chat.c:237
+#: ../libpurple/protocols/silc/buddy.c:1030
+#: ../libpurple/protocols/silc/chat.c:239
 #: ../libpurple/protocols/silc10/buddy.c:636
-#: ../libpurple/protocols/silc10/buddy.c:1033
+#: ../libpurple/protocols/silc10/buddy.c:1036
 #: ../libpurple/protocols/silc10/chat.c:237
 msgid "Could not load public key"
 msgstr "Kon nie publieke sleutel laai nie"
@@ -10542,9 +10542,9 @@
 #: ../libpurple/protocols/silc/buddy.c:701
 #: ../libpurple/protocols/silc/ops.c:1053
 #: ../libpurple/protocols/silc/ops.c:1168
-#: ../libpurple/protocols/silc/ops.c:1288
-#: ../libpurple/protocols/silc/ops.c:1289
-#: ../libpurple/protocols/silc/ops.c:1307
+#: ../libpurple/protocols/silc/ops.c:1290
+#: ../libpurple/protocols/silc/ops.c:1291
+#: ../libpurple/protocols/silc/ops.c:1309
 #: ../libpurple/protocols/silc10/buddy.c:713
 #: ../libpurple/protocols/silc10/ops.c:1087
 #: ../libpurple/protocols/silc10/ops.c:1159
@@ -10556,7 +10556,7 @@
 
 #: ../libpurple/protocols/silc/buddy.c:702
 #: ../libpurple/protocols/silc/ops.c:1169
-#: ../libpurple/protocols/silc/ops.c:1308
+#: ../libpurple/protocols/silc/ops.c:1310
 #: ../libpurple/protocols/silc10/buddy.c:714
 #: ../libpurple/protocols/silc10/ops.c:1160
 #: ../libpurple/protocols/silc10/ops.c:1314
@@ -10575,24 +10575,24 @@
 "You cannot receive buddy notifications until you import his/her public key.  "
 "You can use the Get Public Key command to get the public key."
 msgstr ""
-"U kan nie vriendkennisstelings ontvang voor u sy/haar publieke sleutel "
+"U kan nie vriendkennisgewings ontvang voor u sy/haar publieke sleutel "
 "ingevoer het nie.  U kan die 'Kry publieke sleutel'-bevel gebruik om die "
 "publieke sleutel te kry."
 
 #. Open file selector to select the public key.
-#: ../libpurple/protocols/silc/buddy.c:1059
-#: ../libpurple/protocols/silc10/buddy.c:1067
+#: ../libpurple/protocols/silc/buddy.c:1062
+#: ../libpurple/protocols/silc10/buddy.c:1070
 msgid "Open..."
 msgstr "Open..."
 
-#: ../libpurple/protocols/silc/buddy.c:1070
-#: ../libpurple/protocols/silc10/buddy.c:1078
+#: ../libpurple/protocols/silc/buddy.c:1073
+#: ../libpurple/protocols/silc10/buddy.c:1081
 #, c-format
 msgid "The %s buddy is not present in the network"
 msgstr "Die %s vriend is nie op die netwerk teenwoordig nie"
 
-#: ../libpurple/protocols/silc/buddy.c:1073
-#: ../libpurple/protocols/silc10/buddy.c:1081
+#: ../libpurple/protocols/silc/buddy.c:1076
+#: ../libpurple/protocols/silc10/buddy.c:1084
 msgid ""
 "To add the buddy you must import his/her public key. Press Import to import "
 "a public key."
@@ -10600,18 +10600,18 @@
 "Om die vriend by te voeg, moet u sy/haar publieke sleutel invoer. Druk "
 "Invoer om 'n publieke sleutel in te voer."
 
-#: ../libpurple/protocols/silc/buddy.c:1077
-#: ../libpurple/protocols/silc10/buddy.c:1085
+#: ../libpurple/protocols/silc/buddy.c:1080
+#: ../libpurple/protocols/silc10/buddy.c:1088
 msgid "_Import..."
 msgstr "Voer _in..."
 
-#: ../libpurple/protocols/silc/buddy.c:1183
-#: ../libpurple/protocols/silc10/buddy.c:1181
+#: ../libpurple/protocols/silc/buddy.c:1186
+#: ../libpurple/protocols/silc10/buddy.c:1184
 msgid "Select correct user"
 msgstr "Kies die regte gebruiker"
 
-#: ../libpurple/protocols/silc/buddy.c:1185
-#: ../libpurple/protocols/silc10/buddy.c:1183
+#: ../libpurple/protocols/silc/buddy.c:1188
+#: ../libpurple/protocols/silc10/buddy.c:1186
 msgid ""
 "More than one user was found with the same public key. Select the correct "
 "user from the list to add to the buddy list."
@@ -10619,8 +10619,8 @@
 "Meer as een gebruiker is met dieselfde publieke sleutel gevind. Kies die "
 "korrekte gebruiker uit die lys om hulle by die vriendelys te voeg."
 
-#: ../libpurple/protocols/silc/buddy.c:1187
-#: ../libpurple/protocols/silc10/buddy.c:1185
+#: ../libpurple/protocols/silc/buddy.c:1190
+#: ../libpurple/protocols/silc10/buddy.c:1188
 msgid ""
 "More than one user was found with the same name. Select the correct user "
 "from the list to add to the buddy list."
@@ -10628,208 +10628,208 @@
 "Meer as een gebruiker is met dieselfde naam gevind. Kies die korrekte "
 "gebruiker uit die lys om hulle by die vriendelys te voeg."
 
-#: ../libpurple/protocols/silc/buddy.c:1474
-#: ../libpurple/protocols/silc10/buddy.c:1474
+#: ../libpurple/protocols/silc/buddy.c:1477
+#: ../libpurple/protocols/silc10/buddy.c:1477
 msgid "Detached"
 msgstr "Ontheg"
 
-#: ../libpurple/protocols/silc/buddy.c:1478
+#: ../libpurple/protocols/silc/buddy.c:1481
 #: ../libpurple/protocols/silc/silc.c:58
-#: ../libpurple/protocols/silc10/buddy.c:1478
+#: ../libpurple/protocols/silc10/buddy.c:1481
 #: ../libpurple/protocols/silc10/silc.c:49
 msgid "Indisposed"
 msgstr "Ongesteld"
 
-#: ../libpurple/protocols/silc/buddy.c:1482
+#: ../libpurple/protocols/silc/buddy.c:1485
 #: ../libpurple/protocols/silc/silc.c:60
-#: ../libpurple/protocols/silc10/buddy.c:1482
+#: ../libpurple/protocols/silc10/buddy.c:1485
 #: ../libpurple/protocols/silc10/silc.c:51
 msgid "Wake Me Up"
 msgstr "Maak my wakker"
 
-#: ../libpurple/protocols/silc/buddy.c:1484
+#: ../libpurple/protocols/silc/buddy.c:1487
 #: ../libpurple/protocols/silc/silc.c:52
-#: ../libpurple/protocols/silc10/buddy.c:1484
+#: ../libpurple/protocols/silc10/buddy.c:1487
 #: ../libpurple/protocols/silc10/silc.c:43
 msgid "Hyper Active"
 msgstr "Hiperaktief"
 
-#: ../libpurple/protocols/silc/buddy.c:1486
-#: ../libpurple/protocols/silc10/buddy.c:1486
+#: ../libpurple/protocols/silc/buddy.c:1489
+#: ../libpurple/protocols/silc10/buddy.c:1489
 msgid "Robot"
 msgstr "Robot"
 
-#: ../libpurple/protocols/silc/buddy.c:1493
-#: ../libpurple/protocols/silc/silc.c:743
-#: ../libpurple/protocols/silc/util.c:516
-#: ../libpurple/protocols/silc10/buddy.c:1493
+#: ../libpurple/protocols/silc/buddy.c:1496
+#: ../libpurple/protocols/silc/silc.c:874
+#: ../libpurple/protocols/silc/util.c:520
+#: ../libpurple/protocols/silc10/buddy.c:1496
 #: ../libpurple/protocols/silc10/silc.c:654
 #: ../libpurple/protocols/silc10/util.c:512
 msgid "Happy"
 msgstr "Gelukkig"
 
-#: ../libpurple/protocols/silc/buddy.c:1495
-#: ../libpurple/protocols/silc/silc.c:745
-#: ../libpurple/protocols/silc/util.c:518
-#: ../libpurple/protocols/silc10/buddy.c:1495
+#: ../libpurple/protocols/silc/buddy.c:1498
+#: ../libpurple/protocols/silc/silc.c:876
+#: ../libpurple/protocols/silc/util.c:522
+#: ../libpurple/protocols/silc10/buddy.c:1498
 #: ../libpurple/protocols/silc10/silc.c:656
 #: ../libpurple/protocols/silc10/util.c:514
 msgid "Sad"
 msgstr "Ongelukkig"
 
-#: ../libpurple/protocols/silc/buddy.c:1497
-#: ../libpurple/protocols/silc/silc.c:747
-#: ../libpurple/protocols/silc/util.c:520
-#: ../libpurple/protocols/silc10/buddy.c:1497
+#: ../libpurple/protocols/silc/buddy.c:1500
+#: ../libpurple/protocols/silc/silc.c:878
+#: ../libpurple/protocols/silc/util.c:524
+#: ../libpurple/protocols/silc10/buddy.c:1500
 #: ../libpurple/protocols/silc10/silc.c:658
 #: ../libpurple/protocols/silc10/util.c:516
 msgid "Angry"
 msgstr "Kwaad"
 
-#: ../libpurple/protocols/silc/buddy.c:1499
-#: ../libpurple/protocols/silc/silc.c:749
-#: ../libpurple/protocols/silc/util.c:522
-#: ../libpurple/protocols/silc10/buddy.c:1499
+#: ../libpurple/protocols/silc/buddy.c:1502
+#: ../libpurple/protocols/silc/silc.c:880
+#: ../libpurple/protocols/silc/util.c:526
+#: ../libpurple/protocols/silc10/buddy.c:1502
 #: ../libpurple/protocols/silc10/silc.c:660
 #: ../libpurple/protocols/silc10/util.c:518
 msgid "Jealous"
 msgstr "Jaloers"
 
-#: ../libpurple/protocols/silc/buddy.c:1501
-#: ../libpurple/protocols/silc/silc.c:751
-#: ../libpurple/protocols/silc/util.c:524
-#: ../libpurple/protocols/silc10/buddy.c:1501
+#: ../libpurple/protocols/silc/buddy.c:1504
+#: ../libpurple/protocols/silc/silc.c:882
+#: ../libpurple/protocols/silc/util.c:528
+#: ../libpurple/protocols/silc10/buddy.c:1504
 #: ../libpurple/protocols/silc10/silc.c:662
 #: ../libpurple/protocols/silc10/util.c:520
 msgid "Ashamed"
 msgstr "Skaam"
 
-#: ../libpurple/protocols/silc/buddy.c:1503
-#: ../libpurple/protocols/silc/silc.c:753
-#: ../libpurple/protocols/silc/util.c:526
-#: ../libpurple/protocols/silc10/buddy.c:1503
+#: ../libpurple/protocols/silc/buddy.c:1506
+#: ../libpurple/protocols/silc/silc.c:884
+#: ../libpurple/protocols/silc/util.c:530
+#: ../libpurple/protocols/silc10/buddy.c:1506
 #: ../libpurple/protocols/silc10/silc.c:664
 #: ../libpurple/protocols/silc10/util.c:522
 msgid "Invincible"
 msgstr "Onoorwinlik"
 
-#: ../libpurple/protocols/silc/buddy.c:1505
-#: ../libpurple/protocols/silc/util.c:528
-#: ../libpurple/protocols/silc10/buddy.c:1505
+#: ../libpurple/protocols/silc/buddy.c:1508
+#: ../libpurple/protocols/silc/util.c:532
+#: ../libpurple/protocols/silc10/buddy.c:1508
 #: ../libpurple/protocols/silc10/util.c:524
 msgid "In Love"
 msgstr "Verlief"
 
-#: ../libpurple/protocols/silc/buddy.c:1507
-#: ../libpurple/protocols/silc/silc.c:757
-#: ../libpurple/protocols/silc/util.c:530
-#: ../libpurple/protocols/silc10/buddy.c:1507
+#: ../libpurple/protocols/silc/buddy.c:1510
+#: ../libpurple/protocols/silc/silc.c:888
+#: ../libpurple/protocols/silc/util.c:534
+#: ../libpurple/protocols/silc10/buddy.c:1510
 #: ../libpurple/protocols/silc10/silc.c:668
 #: ../libpurple/protocols/silc10/util.c:526
 msgid "Sleepy"
 msgstr "Vaak"
 
-#: ../libpurple/protocols/silc/buddy.c:1509
-#: ../libpurple/protocols/silc/silc.c:759
-#: ../libpurple/protocols/silc/util.c:532
-#: ../libpurple/protocols/silc10/buddy.c:1509
+#: ../libpurple/protocols/silc/buddy.c:1512
+#: ../libpurple/protocols/silc/silc.c:890
+#: ../libpurple/protocols/silc/util.c:536
+#: ../libpurple/protocols/silc10/buddy.c:1512
 #: ../libpurple/protocols/silc10/silc.c:670
 #: ../libpurple/protocols/silc10/util.c:528
 msgid "Bored"
 msgstr "Verveeld"
 
-#: ../libpurple/protocols/silc/buddy.c:1511
-#: ../libpurple/protocols/silc/silc.c:761
-#: ../libpurple/protocols/silc/util.c:534
-#: ../libpurple/protocols/silc10/buddy.c:1511
+#: ../libpurple/protocols/silc/buddy.c:1514
+#: ../libpurple/protocols/silc/silc.c:892
+#: ../libpurple/protocols/silc/util.c:538
+#: ../libpurple/protocols/silc10/buddy.c:1514
 #: ../libpurple/protocols/silc10/silc.c:672
 #: ../libpurple/protocols/silc10/util.c:530
 msgid "Excited"
 msgstr "Opgewonde"
 
-#: ../libpurple/protocols/silc/buddy.c:1513
-#: ../libpurple/protocols/silc/silc.c:763
-#: ../libpurple/protocols/silc/util.c:536
-#: ../libpurple/protocols/silc10/buddy.c:1513
+#: ../libpurple/protocols/silc/buddy.c:1516
+#: ../libpurple/protocols/silc/silc.c:894
+#: ../libpurple/protocols/silc/util.c:540
+#: ../libpurple/protocols/silc10/buddy.c:1516
 #: ../libpurple/protocols/silc10/silc.c:674
 #: ../libpurple/protocols/silc10/util.c:532
 msgid "Anxious"
 msgstr "Besorgd"
 
-#: ../libpurple/protocols/silc/buddy.c:1545
+#: ../libpurple/protocols/silc/buddy.c:1548
 #: ../libpurple/protocols/silc/ops.c:1207
-#: ../libpurple/protocols/silc10/buddy.c:1545
+#: ../libpurple/protocols/silc10/buddy.c:1548
 #: ../libpurple/protocols/silc10/ops.c:1202
 msgid "User Modes"
 msgstr "Gebruikermodusse"
 
-#: ../libpurple/protocols/silc/buddy.c:1562
+#: ../libpurple/protocols/silc/buddy.c:1565
 #: ../libpurple/protocols/silc/ops.c:1224
-#: ../libpurple/protocols/silc10/buddy.c:1562
+#: ../libpurple/protocols/silc10/buddy.c:1565
 #: ../libpurple/protocols/silc10/ops.c:1219
 msgid "Preferred Contact"
 msgstr "Voorkeurkontak"
 
-#: ../libpurple/protocols/silc/buddy.c:1567
+#: ../libpurple/protocols/silc/buddy.c:1570
 #: ../libpurple/protocols/silc/ops.c:1229
-#: ../libpurple/protocols/silc10/buddy.c:1567
+#: ../libpurple/protocols/silc10/buddy.c:1570
 #: ../libpurple/protocols/silc10/ops.c:1224
 msgid "Preferred Language"
 msgstr "Voorkeurtaal"
 
-#: ../libpurple/protocols/silc/buddy.c:1572
+#: ../libpurple/protocols/silc/buddy.c:1575
 #: ../libpurple/protocols/silc/ops.c:1234
-#: ../libpurple/protocols/silc10/buddy.c:1572
+#: ../libpurple/protocols/silc10/buddy.c:1575
 #: ../libpurple/protocols/silc10/ops.c:1229
 msgid "Device"
 msgstr "Toestel"
 
-#: ../libpurple/protocols/silc/buddy.c:1577
+#: ../libpurple/protocols/silc/buddy.c:1580
 #: ../libpurple/protocols/silc/ops.c:1239
-#: ../libpurple/protocols/silc10/buddy.c:1577
+#: ../libpurple/protocols/silc10/buddy.c:1580
 #: ../libpurple/protocols/silc10/ops.c:1234
 #: ../libpurple/protocols/silc10/silc.c:722
 #: ../libpurple/protocols/silc10/silc.c:724
 msgid "Timezone"
 msgstr "Tydsone"
 
-#: ../libpurple/protocols/silc/buddy.c:1582
+#: ../libpurple/protocols/silc/buddy.c:1585
 #: ../libpurple/protocols/silc/ops.c:1244
-#: ../libpurple/protocols/silc10/buddy.c:1582
+#: ../libpurple/protocols/silc10/buddy.c:1585
 #: ../libpurple/protocols/silc10/ops.c:1239
 msgid "Geolocation"
 msgstr "Geografiese ligging"
 
-#: ../libpurple/protocols/silc/buddy.c:1638
-#: ../libpurple/protocols/silc10/buddy.c:1636
+#: ../libpurple/protocols/silc/buddy.c:1641
+#: ../libpurple/protocols/silc10/buddy.c:1639
 msgid "Reset IM Key"
 msgstr "Stel kitsboodskap-sleutel terug"
 
-#: ../libpurple/protocols/silc/buddy.c:1643
-#: ../libpurple/protocols/silc10/buddy.c:1642
+#: ../libpurple/protocols/silc/buddy.c:1646
+#: ../libpurple/protocols/silc10/buddy.c:1645
 msgid "IM with Key Exchange"
 msgstr "Kitsboodskap met sleutelruiling"
 
-#: ../libpurple/protocols/silc/buddy.c:1648
-#: ../libpurple/protocols/silc10/buddy.c:1647
+#: ../libpurple/protocols/silc/buddy.c:1651
+#: ../libpurple/protocols/silc10/buddy.c:1650
 msgid "IM with Password"
 msgstr "Kitsboodskap met wagwoord"
 
-#: ../libpurple/protocols/silc/buddy.c:1661
-#: ../libpurple/protocols/silc10/buddy.c:1660
+#: ../libpurple/protocols/silc/buddy.c:1664
+#: ../libpurple/protocols/silc10/buddy.c:1663
 msgid "Get Public Key..."
 msgstr "Kry publieke sleutel..."
 
-#: ../libpurple/protocols/silc/buddy.c:1668
-#: ../libpurple/protocols/silc/ops.c:1608
-#: ../libpurple/protocols/silc10/buddy.c:1667
+#: ../libpurple/protocols/silc/buddy.c:1671
+#: ../libpurple/protocols/silc/ops.c:1612
+#: ../libpurple/protocols/silc10/buddy.c:1670
 #: ../libpurple/protocols/silc10/ops.c:1624
 msgid "Kill User"
 msgstr "Moor gebruiker"
 
-#: ../libpurple/protocols/silc/buddy.c:1678
-#: ../libpurple/protocols/silc/chat.c:993
-#: ../libpurple/protocols/silc10/buddy.c:1677
+#: ../libpurple/protocols/silc/buddy.c:1681
+#: ../libpurple/protocols/silc/chat.c:997
+#: ../libpurple/protocols/silc10/buddy.c:1680
 #: ../libpurple/protocols/silc10/chat.c:977
 msgid "Draw On Whiteboard"
 msgstr "Teken op witbord"
@@ -10843,10 +10843,10 @@
 #: ../libpurple/protocols/silc10/chat.c:80
 #, c-format
 msgid "Channel %s does not exist in the network"
-msgstr "Kanaal %s bestaan nie in die netwerk nie"
+msgstr "Kanaal %s bestaan nie op die netwerk nie"
 
 #: ../libpurple/protocols/silc/chat.c:81
-#: ../libpurple/protocols/silc/chat.c:175
+#: ../libpurple/protocols/silc/chat.c:177
 #: ../libpurple/protocols/silc10/chat.c:81
 #: ../libpurple/protocols/silc10/chat.c:174
 msgid "Channel Information"
@@ -10896,46 +10896,44 @@
 
 #: ../libpurple/protocols/silc/chat.c:153
 #: ../libpurple/protocols/silc10/chat.c:152
-#, c-format
 msgid "<br><b>Channel Modes:</b> "
 msgstr "<br><b>Kanaalmodusse:</b> "
 
-#: ../libpurple/protocols/silc/chat.c:166
+#: ../libpurple/protocols/silc/chat.c:167
 #: ../libpurple/protocols/silc10/chat.c:165
 #, c-format
 msgid "<br><b>Founder Key Fingerprint:</b><br>%s"
 msgstr "<br><b>Stigter se sleutelvingerafdruk:</b><br>%s"
 
-#: ../libpurple/protocols/silc/chat.c:167
+#: ../libpurple/protocols/silc/chat.c:168
 #: ../libpurple/protocols/silc10/chat.c:166
 #, c-format
 msgid "<br><b>Founder Key Babbleprint:</b><br>%s"
 msgstr "<br><b>Stigter se sleutelbabbelafdruk:</b><br>%s"
 
-#: ../libpurple/protocols/silc/chat.c:236
+#: ../libpurple/protocols/silc/chat.c:238
 #: ../libpurple/protocols/silc10/chat.c:236
 msgid "Add Channel Public Key"
 msgstr "Voeg kanaal- publieke sleutel by"
 
 #. Add new public key
-#: ../libpurple/protocols/silc/chat.c:304
+#: ../libpurple/protocols/silc/chat.c:306
 #: ../libpurple/protocols/silc10/chat.c:291
 msgid "Open Public Key..."
 msgstr "Open publieke sleutel..."
 
-#: ../libpurple/protocols/silc/chat.c:423
+#: ../libpurple/protocols/silc/chat.c:425
 #: ../libpurple/protocols/silc10/chat.c:401
 msgid "Channel Passphrase"
 msgstr "Kanaalwagwoordfrase"
 
-#: ../libpurple/protocols/silc/chat.c:430
+#: ../libpurple/protocols/silc/chat.c:432
 #: ../libpurple/protocols/silc10/chat.c:408
 msgid "Channel Public Keys List"
 msgstr "Lys kanaal- publieke sleutels"
 
-#: ../libpurple/protocols/silc/chat.c:435
+#: ../libpurple/protocols/silc/chat.c:437
 #: ../libpurple/protocols/silc10/chat.c:413
-#, c-format
 msgid ""
 "Channel authentication is used to secure the channel from unauthorized "
 "access. The authentication may be based on passphrase and digital "
@@ -10949,11 +10947,11 @@
 "Indien kanaal- publieke sleutels gestel is, kan net gebruikers wie se "
 "publieke sleutels gelys is, aansluit."
 
-#: ../libpurple/protocols/silc/chat.c:444
-#: ../libpurple/protocols/silc/chat.c:445
-#: ../libpurple/protocols/silc/chat.c:479
-#: ../libpurple/protocols/silc/chat.c:480
-#: ../libpurple/protocols/silc/chat.c:927
+#: ../libpurple/protocols/silc/chat.c:446
+#: ../libpurple/protocols/silc/chat.c:447
+#: ../libpurple/protocols/silc/chat.c:483
+#: ../libpurple/protocols/silc/chat.c:484
+#: ../libpurple/protocols/silc/chat.c:931
 #: ../libpurple/protocols/silc10/chat.c:422
 #: ../libpurple/protocols/silc10/chat.c:423
 #: ../libpurple/protocols/silc10/chat.c:461
@@ -10962,110 +10960,110 @@
 msgid "Channel Authentication"
 msgstr "Kanaalstawing"
 
-#: ../libpurple/protocols/silc/chat.c:446
-#: ../libpurple/protocols/silc/chat.c:481
+#: ../libpurple/protocols/silc/chat.c:448
+#: ../libpurple/protocols/silc/chat.c:485
 #: ../libpurple/protocols/silc10/chat.c:424
 #: ../libpurple/protocols/silc10/chat.c:463
 msgid "Add / Remove"
 msgstr "Voeg by / verwyder"
 
-#: ../libpurple/protocols/silc/chat.c:597
+#: ../libpurple/protocols/silc/chat.c:601
 #: ../libpurple/protocols/silc10/chat.c:581
 msgid "Group Name"
 msgstr "Groepnaam"
 
-#: ../libpurple/protocols/silc/chat.c:601
-#: ../libpurple/protocols/silc/ops.c:1813
-#: ../libpurple/protocols/silc/silc.c:1020
+#: ../libpurple/protocols/silc/chat.c:605
+#: ../libpurple/protocols/silc/ops.c:1817
+#: ../libpurple/protocols/silc/silc.c:1151
 #: ../libpurple/protocols/silc10/chat.c:585
 #: ../libpurple/protocols/silc10/ops.c:1901
 #: ../libpurple/protocols/silc10/silc.c:931
 msgid "Passphrase"
 msgstr "Wagwoordfrase"
 
-#: ../libpurple/protocols/silc/chat.c:612
+#: ../libpurple/protocols/silc/chat.c:616
 #: ../libpurple/protocols/silc10/chat.c:596
 #, c-format
 msgid "Please enter the %s channel private group name and passphrase."
-msgstr "Gee asb. die %s kanaal- private groep se naam en wagwoordfrase."
-
-#: ../libpurple/protocols/silc/chat.c:614
+msgstr "Tik gerus die %s kanaal- private groep se naam en wagwoordfrase."
+
+#: ../libpurple/protocols/silc/chat.c:618
 #: ../libpurple/protocols/silc10/chat.c:598
 msgid "Add Channel Private Group"
 msgstr "Voeg kanaal- private groep by"
 
-#: ../libpurple/protocols/silc/chat.c:742
+#: ../libpurple/protocols/silc/chat.c:746
 #: ../libpurple/protocols/silc10/chat.c:726
 msgid "User Limit"
 msgstr "Gebruikerlimiet"
 
-#: ../libpurple/protocols/silc/chat.c:743
+#: ../libpurple/protocols/silc/chat.c:747
 #: ../libpurple/protocols/silc10/chat.c:727
 msgid "Set user limit on channel. Set to zero to reset user limit."
 msgstr ""
 "Stel gebruikerlimiet op kanaal. Stel op nul om gebruikerlimiet terug te stel."
 
-#: ../libpurple/protocols/silc/chat.c:907
+#: ../libpurple/protocols/silc/chat.c:911
 #: ../libpurple/protocols/silc10/chat.c:891
 msgid "Invite List"
 msgstr "Uitnodigings"
 
-#: ../libpurple/protocols/silc/chat.c:912
+#: ../libpurple/protocols/silc/chat.c:916
 #: ../libpurple/protocols/silc10/chat.c:896
 msgid "Ban List"
 msgstr "Verbanlys"
 
-#: ../libpurple/protocols/silc/chat.c:920
+#: ../libpurple/protocols/silc/chat.c:924
 #: ../libpurple/protocols/silc10/chat.c:904
 msgid "Add Private Group"
 msgstr "Voeg private groep by"
 
-#: ../libpurple/protocols/silc/chat.c:933
+#: ../libpurple/protocols/silc/chat.c:937
 #: ../libpurple/protocols/silc10/chat.c:917
 msgid "Reset Permanent"
 msgstr "Stel permanent terug"
 
-#: ../libpurple/protocols/silc/chat.c:938
+#: ../libpurple/protocols/silc/chat.c:942
 #: ../libpurple/protocols/silc10/chat.c:922
 msgid "Set Permanent"
 msgstr "Stel permanent"
 
-#: ../libpurple/protocols/silc/chat.c:946
+#: ../libpurple/protocols/silc/chat.c:950
 #: ../libpurple/protocols/silc10/chat.c:930
 msgid "Set User Limit"
 msgstr "Stel gebruikerlimiet"
 
-#: ../libpurple/protocols/silc/chat.c:952
+#: ../libpurple/protocols/silc/chat.c:956
 #: ../libpurple/protocols/silc10/chat.c:936
 msgid "Reset Topic Restriction"
-msgstr "Stel onderwerpbeperking terug"
-
-#: ../libpurple/protocols/silc/chat.c:957
+msgstr "Stel onderwerpinperking terug"
+
+#: ../libpurple/protocols/silc/chat.c:961
 #: ../libpurple/protocols/silc10/chat.c:941
 msgid "Set Topic Restriction"
-msgstr "Stel onderwerpbeperking"
-
-#: ../libpurple/protocols/silc/chat.c:964
+msgstr "Stel onderwerpinperking"
+
+#: ../libpurple/protocols/silc/chat.c:968
 #: ../libpurple/protocols/silc10/chat.c:948
 msgid "Reset Private Channel"
 msgstr "Stel private groep terug"
 
-#: ../libpurple/protocols/silc/chat.c:969
+#: ../libpurple/protocols/silc/chat.c:973
 #: ../libpurple/protocols/silc10/chat.c:953
 msgid "Set Private Channel"
 msgstr "Stel private kanaal"
 
-#: ../libpurple/protocols/silc/chat.c:976
+#: ../libpurple/protocols/silc/chat.c:980
 #: ../libpurple/protocols/silc10/chat.c:960
 msgid "Reset Secret Channel"
 msgstr "Stel geheime kanaal terug"
 
-#: ../libpurple/protocols/silc/chat.c:981
+#: ../libpurple/protocols/silc/chat.c:985
 #: ../libpurple/protocols/silc10/chat.c:965
 msgid "Set Secret Channel"
 msgstr "Stel geheime kanaal"
 
-#: ../libpurple/protocols/silc/chat.c:1045
+#: ../libpurple/protocols/silc/chat.c:1046
 #: ../libpurple/protocols/silc10/chat.c:1102
 #, c-format
 msgid ""
@@ -11073,36 +11071,36 @@
 msgstr ""
 "U het by die %s kanaal aangesluit voor u by die private groep kon aansluit"
 
-#: ../libpurple/protocols/silc/chat.c:1047
+#: ../libpurple/protocols/silc/chat.c:1048
 #: ../libpurple/protocols/silc10/chat.c:1104
 msgid "Join Private Group"
 msgstr "Sluit by private groep aan"
 
-#: ../libpurple/protocols/silc/chat.c:1048
+#: ../libpurple/protocols/silc/chat.c:1049
 #: ../libpurple/protocols/silc10/chat.c:1105
 msgid "Cannot join private group"
 msgstr "Kan nie by private groep aansluit nie"
 
-#: ../libpurple/protocols/silc/chat.c:1260
-#: ../libpurple/protocols/silc/silc.c:1217
+#: ../libpurple/protocols/silc/chat.c:1245
+#: ../libpurple/protocols/silc/silc.c:1348
 #: ../libpurple/protocols/silc10/chat.c:1299
-#: ../libpurple/protocols/silc10/silc.c:1137
+#: ../libpurple/protocols/silc10/silc.c:1140
 msgid "Call Command"
 msgstr "Roep bevel"
 
-#: ../libpurple/protocols/silc/chat.c:1260
-#: ../libpurple/protocols/silc/silc.c:1218
+#: ../libpurple/protocols/silc/chat.c:1245
+#: ../libpurple/protocols/silc/silc.c:1349
 #: ../libpurple/protocols/silc10/chat.c:1299
-#: ../libpurple/protocols/silc10/silc.c:1137
+#: ../libpurple/protocols/silc10/silc.c:1140
 msgid "Cannot call command"
 msgstr "Kan nie bevel roep nie"
 
-#: ../libpurple/protocols/silc/chat.c:1261
-#: ../libpurple/protocols/silc/silc.c:1219
+#: ../libpurple/protocols/silc/chat.c:1246
+#: ../libpurple/protocols/silc/silc.c:1350
 #: ../libpurple/protocols/silc10/chat.c:1300
-#: ../libpurple/protocols/silc10/silc.c:1138
+#: ../libpurple/protocols/silc10/silc.c:1141
 msgid "Unknown command"
-msgstr "Onbekende opdrag"
+msgstr "Onbekende bevel"
 
 #: ../libpurple/protocols/silc/ft.c:85 ../libpurple/protocols/silc/ft.c:101
 #: ../libpurple/protocols/silc/ft.c:104 ../libpurple/protocols/silc/ft.c:108
@@ -11130,11 +11128,11 @@
 #: ../libpurple/protocols/silc10/ft.c:101
 #: ../libpurple/protocols/silc10/ft.c:105
 msgid "Error during file transfer"
-msgstr "Fout tydens lêeroordrag"
+msgstr "Kon nie lêer volledig oordra nie"
 
 #: ../libpurple/protocols/silc/ft.c:87
 msgid "Remote disconnected"
-msgstr "Afgeleë afgesny"
+msgstr "Afgeleë ontkoppel"
 
 #: ../libpurple/protocols/silc/ft.c:106 ../libpurple/protocols/silc10/ft.c:94
 msgid "Permission denied"
@@ -11166,7 +11164,7 @@
 
 #: ../libpurple/protocols/silc/ft.c:283 ../libpurple/protocols/silc10/ft.c:216
 msgid "Could not perform key agreement for file transfer"
-msgstr "Kon nie sleutelooreenkoms uitvoer vir lêeroordrag nie"
+msgstr "Kon nie sleutelooreenkoms verrig vir lêeroordrag nie"
 
 #: ../libpurple/protocols/silc/ft.c:289 ../libpurple/protocols/silc10/ft.c:222
 msgid "Could not start the file transfer"
@@ -11178,7 +11176,7 @@
 
 #: ../libpurple/protocols/silc/ops.c:57
 msgid "Error occurred"
-msgstr "Fout het voorgekom"
+msgstr "'n Fout het voorgekom"
 
 #: ../libpurple/protocols/silc/ops.c:533 ../libpurple/protocols/silc/ops.c:542
 #: ../libpurple/protocols/silc/ops.c:551
@@ -11258,7 +11256,7 @@
 msgstr "Taakrol"
 
 #: ../libpurple/protocols/silc/ops.c:1018
-#: ../libpurple/protocols/silc/silc.c:1013
+#: ../libpurple/protocols/silc/silc.c:1144
 #: ../libpurple/protocols/silc10/ops.c:1052
 #: ../libpurple/protocols/silc10/silc.c:924
 msgid "Organization"
@@ -11292,7 +11290,7 @@
 msgstr "Kanaalstigter op <I>%s</I> is <I>%s</I>"
 
 #: ../libpurple/protocols/silc/ops.c:1190
-#: ../libpurple/protocols/silc/ops.c:1326
+#: ../libpurple/protocols/silc/ops.c:1328
 #: ../libpurple/protocols/silc10/ops.c:1183
 #: ../libpurple/protocols/silc10/ops.c:1332
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1071
@@ -11304,90 +11302,90 @@
 msgid "Status Text"
 msgstr "Statusteks"
 
-#: ../libpurple/protocols/silc/ops.c:1279
-#: ../libpurple/protocols/silc/ops.c:1351
+#: ../libpurple/protocols/silc/ops.c:1280
+#: ../libpurple/protocols/silc/ops.c:1354
 #: ../libpurple/protocols/silc10/ops.c:1285
 #: ../libpurple/protocols/silc10/ops.c:1357
 msgid "Public Key Fingerprint"
 msgstr "Publiekesleutel-vingerafdruk"
 
-#: ../libpurple/protocols/silc/ops.c:1280
-#: ../libpurple/protocols/silc/ops.c:1352
+#: ../libpurple/protocols/silc/ops.c:1281
+#: ../libpurple/protocols/silc/ops.c:1355
 #: ../libpurple/protocols/silc10/ops.c:1286
 #: ../libpurple/protocols/silc10/ops.c:1358
 msgid "Public Key Babbleprint"
 msgstr "Publiekesleutel-babbelafdruk"
 
-#: ../libpurple/protocols/silc/ops.c:1292
+#: ../libpurple/protocols/silc/ops.c:1294
 #: ../libpurple/protocols/silc10/ops.c:1298
 msgid "_More..."
 msgstr "_Meer..."
 
-#: ../libpurple/protocols/silc/ops.c:1369
-#: ../libpurple/protocols/silc/silc.c:1077
+#: ../libpurple/protocols/silc/ops.c:1373
+#: ../libpurple/protocols/silc/silc.c:1208
 #: ../libpurple/protocols/silc10/ops.c:1371
-#: ../libpurple/protocols/silc10/silc.c:988
+#: ../libpurple/protocols/silc10/silc.c:991
 msgid "Detach From Server"
 msgstr "Ontheg van bediener"
 
-#: ../libpurple/protocols/silc/ops.c:1369
+#: ../libpurple/protocols/silc/ops.c:1373
 #: ../libpurple/protocols/silc10/ops.c:1371
 msgid "Cannot detach"
 msgstr "Kan nie ontheg nie"
 
-#: ../libpurple/protocols/silc/ops.c:1389
+#: ../libpurple/protocols/silc/ops.c:1393
 #: ../libpurple/protocols/silc10/ops.c:1382
 msgid "Cannot set topic"
 msgstr "Kan nie onderwerp stel nie"
 
-#: ../libpurple/protocols/silc/ops.c:1418
+#: ../libpurple/protocols/silc/ops.c:1422
 #: ../libpurple/protocols/silc10/ops.c:1414
 msgid "Failed to change nickname"
-msgstr "Verandering van bynaam het misluk"
-
-#: ../libpurple/protocols/silc/ops.c:1467
+msgstr "Verander van bynaam het misluk"
+
+#: ../libpurple/protocols/silc/ops.c:1471
 #: ../libpurple/protocols/silc10/ops.c:1462
 msgid "Roomlist"
 msgstr "Kamerlys"
 
-#: ../libpurple/protocols/silc/ops.c:1467
+#: ../libpurple/protocols/silc/ops.c:1471
 #: ../libpurple/protocols/silc10/ops.c:1462
 msgid "Cannot get room list"
 msgstr "Kan nie kamerlys kry nie"
 
-#: ../libpurple/protocols/silc/ops.c:1468
+#: ../libpurple/protocols/silc/ops.c:1472
 msgid "Network is empty"
 msgstr "Netwerk is leeg"
 
-#: ../libpurple/protocols/silc/ops.c:1512
+#: ../libpurple/protocols/silc/ops.c:1516
 #: ../libpurple/protocols/silc10/ops.c:1507
 msgid "No public key was received"
 msgstr "Geen publieke sleutel is ontvang nie"
 
-#: ../libpurple/protocols/silc/ops.c:1524
-#: ../libpurple/protocols/silc/ops.c:1537
+#: ../libpurple/protocols/silc/ops.c:1528
+#: ../libpurple/protocols/silc/ops.c:1541
 #: ../libpurple/protocols/silc10/ops.c:1519
 #: ../libpurple/protocols/silc10/ops.c:1532
 msgid "Server Information"
 msgstr "Bedienerinligting"
 
-#: ../libpurple/protocols/silc/ops.c:1525
+#: ../libpurple/protocols/silc/ops.c:1529
 #: ../libpurple/protocols/silc10/ops.c:1520
 msgid "Cannot get server information"
 msgstr "Kan nie bedienerinligting kry nie"
 
-#: ../libpurple/protocols/silc/ops.c:1548
+#: ../libpurple/protocols/silc/ops.c:1552
 #: ../libpurple/protocols/silc10/ops.c:1549
 #: ../libpurple/protocols/silc10/ops.c:1558
 msgid "Server Statistics"
 msgstr "Bedienerstatistiek"
 
-#: ../libpurple/protocols/silc/ops.c:1549
+#: ../libpurple/protocols/silc/ops.c:1553
 #: ../libpurple/protocols/silc10/ops.c:1550
 msgid "Cannot get server statistics"
 msgstr "Kan nie bedienerstatistiek kry nie"
 
-#: ../libpurple/protocols/silc/ops.c:1556
+#: ../libpurple/protocols/silc/ops.c:1560
 #: ../libpurple/protocols/silc10/ops.c:1581
 #, c-format
 msgid ""
@@ -11423,54 +11421,54 @@
 "Totale bedieneroperateurs: %d\n"
 "Totale roeteerderoperateurs: %d\n"
 
-#: ../libpurple/protocols/silc/ops.c:1588
+#: ../libpurple/protocols/silc/ops.c:1592
 #: ../libpurple/protocols/silc10/ops.c:1604
 msgid "Network Statistics"
 msgstr "Netwerk statistiek"
 
-#: ../libpurple/protocols/silc/ops.c:1596
+#: ../libpurple/protocols/silc/ops.c:1600
 #: ../libpurple/protocols/silc10/ops.c:1612
 msgid "Ping failed"
 msgstr "Pieng het misluk"
 
-#: ../libpurple/protocols/silc/ops.c:1601
+#: ../libpurple/protocols/silc/ops.c:1605
 #: ../libpurple/protocols/silc10/ops.c:1617
 msgid "Ping reply received from server"
 msgstr "Pieng-antwoord ontvang van bediener"
 
-#: ../libpurple/protocols/silc/ops.c:1609
+#: ../libpurple/protocols/silc/ops.c:1613
 #: ../libpurple/protocols/silc10/ops.c:1625
 msgid "Could not kill user"
 msgstr "Kon nie gebruiker moor nie"
 
-#: ../libpurple/protocols/silc/ops.c:1648
+#: ../libpurple/protocols/silc/ops.c:1652
 msgid "WATCH"
 msgstr "DOPHOU"
 
-#: ../libpurple/protocols/silc/ops.c:1648
+#: ../libpurple/protocols/silc/ops.c:1652
 msgid "Cannot watch user"
 msgstr "Kan nie gebruiker dophou nie"
 
-#: ../libpurple/protocols/silc/ops.c:1724
-#: ../libpurple/protocols/silc/ops.c:1775
-#: ../libpurple/protocols/silc/silc.c:277
+#: ../libpurple/protocols/silc/ops.c:1728
+#: ../libpurple/protocols/silc/ops.c:1779
+#: ../libpurple/protocols/silc/silc.c:377
 #: ../libpurple/protocols/silc10/ops.c:1811
 #: ../libpurple/protocols/silc10/ops.c:1858
 #: ../libpurple/protocols/silc10/silc.c:190
 msgid "Resuming session"
 msgstr "Hervat sessie"
 
-#: ../libpurple/protocols/silc/ops.c:1726
+#: ../libpurple/protocols/silc/ops.c:1730
 #: ../libpurple/protocols/silc10/ops.c:1813
 msgid "Authenticating connection"
 msgstr "Staaf tans verbinding"
 
-#: ../libpurple/protocols/silc/ops.c:1777
+#: ../libpurple/protocols/silc/ops.c:1781
 #: ../libpurple/protocols/silc10/ops.c:1860
 msgid "Verifying server public key"
 msgstr "Verifieer bediener se publieke sleutel"
 
-#: ../libpurple/protocols/silc/ops.c:1814
+#: ../libpurple/protocols/silc/ops.c:1818
 #: ../libpurple/protocols/silc10/ops.c:1902
 msgid "Passphrase required"
 msgstr "Wagwoordfrase vereis"
@@ -11481,7 +11479,7 @@
 "Received %s's public key. Your local copy does not match this key. Would you "
 "still like to accept this public key?"
 msgstr ""
-"%s se publieke sleutel ontvang. U plaaslik afskrif pas nie by hierdie "
+"%s se publieke sleutel ontvang. U plaaslike afskrif pas nie by hierdie "
 "sleutel nie. Wil u steeds hierdie publieke sleutel aanvaar?"
 
 #: ../libpurple/protocols/silc/pk.c:103 ../libpurple/protocols/silc10/pk.c:109
@@ -11515,89 +11513,87 @@
 
 #: ../libpurple/protocols/silc/pk.c:140 ../libpurple/protocols/silc10/pk.c:143
 msgid "Unsupported public key type"
-msgstr "Nieondersteunde publiekesleutel-tipe"
-
-#: ../libpurple/protocols/silc/silc.c:217
+msgstr "Niegesteunde publiekesleutel-tipe"
+
+#: ../libpurple/protocols/silc/silc.c:317
 #: ../libpurple/protocols/silc10/ops.c:1749
 msgid "Disconnected by server"
-msgstr "Afgesny van bediener"
-
-#: ../libpurple/protocols/silc/silc.c:224
+msgstr "Ontkoppel van bediener"
+
+#: ../libpurple/protocols/silc/silc.c:324
 #: ../libpurple/protocols/silc10/ops.c:1700
 msgid "Error during connecting to SILC Server"
-msgstr "Fout tydens verbinding aan SILC-bediener"
-
-#: ../libpurple/protocols/silc/silc.c:229
+msgstr "Kon nie volledig aan SILC-bediener koppel nie"
+
+#: ../libpurple/protocols/silc/silc.c:329
 #: ../libpurple/protocols/silc10/ops.c:1705
 msgid "Key Exchange failed"
 msgstr "Sleutelruiling het misluk"
 
-#: ../libpurple/protocols/silc/silc.c:238
+#: ../libpurple/protocols/silc/silc.c:338
 #: ../libpurple/protocols/silc10/ops.c:1714
 msgid ""
 "Resuming detached session failed. Press Reconnect to create new connection."
 msgstr ""
-"Hervat van onthegte sessie het misluk. Druk 'Verbind weer' om 'n nuwe "
+"Hervat van onthegte sessie het misluk. Druk 'Koppel weer' om 'n nuwe "
 "verbinding te skep."
 
-#: ../libpurple/protocols/silc/silc.c:265
-#: ../libpurple/protocols/silc/silc.c:311
+#: ../libpurple/protocols/silc/silc.c:365
+#: ../libpurple/protocols/silc/silc.c:411
 #: ../libpurple/protocols/silc10/silc.c:161
 msgid "Connection failed"
 msgstr "Verbinding het misluk"
 
-#: ../libpurple/protocols/silc/silc.c:280
+#: ../libpurple/protocols/silc/silc.c:380
 #: ../libpurple/protocols/silc10/silc.c:193
 msgid "Performing key exchange"
-msgstr "Voer tans sleutelruiling uit"
+msgstr "Verrig tans sleutelruiling"
 
 #. Progress
-#: ../libpurple/protocols/silc/silc.c:343
+#: ../libpurple/protocols/silc/silc.c:435
 #: ../libpurple/protocols/silc10/silc.c:325
 msgid "Connecting to SILC Server"
-msgstr "Verbind tans aan SILC-bediener"
-
-#: ../libpurple/protocols/silc/silc.c:352
-#, c-format
+msgstr "Koppel tans aan SILC-bediener"
+
+#: ../libpurple/protocols/silc/silc.c:444
 msgid "Could not load SILC key pair"
 msgstr "Kon nie SILC-sleutelpaar laai nie"
 
-#: ../libpurple/protocols/silc/silc.c:366
+#: ../libpurple/protocols/silc/silc.c:458
 #: ../libpurple/protocols/silc10/silc.c:355
 msgid "Unable to create connection"
 msgstr "Kon nie verbinding skep nie"
 
-#: ../libpurple/protocols/silc/silc.c:395
+#: ../libpurple/protocols/silc/silc.c:487
 #: ../libpurple/protocols/silc10/silc.c:267
 msgid "Out of memory"
 msgstr "Onvoldoende geheue"
 
-#: ../libpurple/protocols/silc/silc.c:438
+#: ../libpurple/protocols/silc/silc.c:538
 #: ../libpurple/protocols/silc10/silc.c:313
 msgid "Cannot initialize SILC protocol"
 msgstr "Kon nie SILC-protokol inisialiseer nie"
 
-#: ../libpurple/protocols/silc/silc.c:445
+#: ../libpurple/protocols/silc/silc.c:547
 msgid "Error loading SILC key pair"
-msgstr "Fout met laai van SILC-sleutelpaar"
-
-#: ../libpurple/protocols/silc/silc.c:739
+msgstr "Kon nie SILC-sleutelpaar volledig laai nie"
+
+#: ../libpurple/protocols/silc/silc.c:870
 #: ../libpurple/protocols/silc10/silc.c:650
 msgid "Your Current Mood"
 msgstr "U huidige stemming"
 
-#: ../libpurple/protocols/silc/silc.c:741
-#: ../libpurple/protocols/silc10/silc.c:652 ../pidgin/gtkprefs.c:1641
-#, c-format
+#: ../libpurple/protocols/silc/silc.c:872
+#: ../libpurple/protocols/silc10/silc.c:652 ../pidgin/gtkprefs.c:1741
 msgid "Normal"
 msgstr "Normaal"
 
-#: ../libpurple/protocols/silc/silc.c:755
+#: ../libpurple/protocols/silc/silc.c:886
 #: ../libpurple/protocols/silc10/silc.c:666
 msgid "In love"
 msgstr "Verlief"
 
-#: ../libpurple/protocols/silc/silc.c:766
+#: ../libpurple/protocols/silc/silc.c:897
 #: ../libpurple/protocols/silc10/silc.c:677
 msgid ""
 "\n"
@@ -11606,62 +11602,62 @@
 "\n"
 "U voorkeur-kontakmetodes"
 
-#: ../libpurple/protocols/silc/silc.c:774
-#: ../libpurple/protocols/silc/util.c:561
+#: ../libpurple/protocols/silc/silc.c:905
+#: ../libpurple/protocols/silc/util.c:565
 #: ../libpurple/protocols/silc10/silc.c:685
 #: ../libpurple/protocols/silc10/util.c:557
 msgid "SMS"
 msgstr "SMS"
 
-#: ../libpurple/protocols/silc/silc.c:776
-#: ../libpurple/protocols/silc/util.c:563
+#: ../libpurple/protocols/silc/silc.c:907
+#: ../libpurple/protocols/silc/util.c:567
 #: ../libpurple/protocols/silc10/silc.c:687
 #: ../libpurple/protocols/silc10/util.c:559
 msgid "MMS"
 msgstr "MMS"
 
-#: ../libpurple/protocols/silc/silc.c:778
+#: ../libpurple/protocols/silc/silc.c:909
 #: ../libpurple/protocols/silc10/silc.c:689
 msgid "Video conferencing"
 msgstr "Videokonferensie"
 
-#: ../libpurple/protocols/silc/silc.c:783
+#: ../libpurple/protocols/silc/silc.c:914
 #: ../libpurple/protocols/silc10/silc.c:694
 msgid "Your Current Status"
 msgstr "U huidige status"
 
-#: ../libpurple/protocols/silc/silc.c:790
+#: ../libpurple/protocols/silc/silc.c:921
 #: ../libpurple/protocols/silc10/silc.c:701
 msgid "Online Services"
 msgstr "Aanlyndienste"
 
-#: ../libpurple/protocols/silc/silc.c:793
+#: ../libpurple/protocols/silc/silc.c:924
 #: ../libpurple/protocols/silc10/silc.c:704
 msgid "Let others see what services you are using"
 msgstr "Laat ander sien watter dienste u gebruik"
 
-#: ../libpurple/protocols/silc/silc.c:799
+#: ../libpurple/protocols/silc/silc.c:930
 #: ../libpurple/protocols/silc10/silc.c:710
 msgid "Let others see what computer you are using"
 msgstr "Laat ander sien watter rekenaar u gebruik"
 
-#: ../libpurple/protocols/silc/silc.c:806
+#: ../libpurple/protocols/silc/silc.c:937
 #: ../libpurple/protocols/silc10/silc.c:717
 msgid "Your VCard File"
 msgstr "U VCard-lêer"
 
-#: ../libpurple/protocols/silc/silc.c:812
+#: ../libpurple/protocols/silc/silc.c:943
 msgid "Timezone (UTC)"
 msgstr "Tydsone (UTC)"
 
-#: ../libpurple/protocols/silc/silc.c:816
-#: ../libpurple/protocols/silc/silc.c:817
+#: ../libpurple/protocols/silc/silc.c:947
+#: ../libpurple/protocols/silc/silc.c:948
 #: ../libpurple/protocols/silc10/silc.c:729
 #: ../libpurple/protocols/silc10/silc.c:730
 msgid "User Online Status Attributes"
 msgstr "Attribute van gebruikers se aanlynstatus"
 
-#: ../libpurple/protocols/silc/silc.c:818
+#: ../libpurple/protocols/silc/silc.c:949
 #: ../libpurple/protocols/silc10/silc.c:731
 msgid ""
 "You can let other users see your online status information and your personal "
@@ -11669,34 +11665,34 @@
 "about yourself."
 msgstr ""
 "U kan ander gebruikers u aanlynstatus-inligting en u persoonlike inligting "
-"laat sien. Vul asb. die inligting in wat u wil hê ander gebruiker oor u moet "
-"kan sien."
-
-#: ../libpurple/protocols/silc/silc.c:859
-#: ../libpurple/protocols/silc/silc.c:865
-#: ../libpurple/protocols/silc/silc.c:1486
+"laat sien. Vul gerus die inligting in wat u wil hê ander gebruiker oor u "
+"moet kan sien."
+
+#: ../libpurple/protocols/silc/silc.c:990
+#: ../libpurple/protocols/silc/silc.c:996
+#: ../libpurple/protocols/silc/silc.c:1617
 #: ../libpurple/protocols/silc10/silc.c:772
 #: ../libpurple/protocols/silc10/silc.c:778
-#: ../libpurple/protocols/silc10/silc.c:1415
+#: ../libpurple/protocols/silc10/silc.c:1418
 msgid "Message of the Day"
 msgstr "Dagboodskap"
 
-#: ../libpurple/protocols/silc/silc.c:859
+#: ../libpurple/protocols/silc/silc.c:990
 #: ../libpurple/protocols/silc10/silc.c:772
 msgid "No Message of the Day available"
 msgstr "Geen dagboodskap nie"
 
-#: ../libpurple/protocols/silc/silc.c:860
-#: ../libpurple/protocols/silc/silc.c:1481
+#: ../libpurple/protocols/silc/silc.c:991
+#: ../libpurple/protocols/silc/silc.c:1612
 #: ../libpurple/protocols/silc10/silc.c:773
-#: ../libpurple/protocols/silc10/silc.c:1410
+#: ../libpurple/protocols/silc10/silc.c:1413
 msgid "There is no Message of the Day associated with this connection"
 msgstr "Daar word geen dagboodskap met hierdie verbinding geassosieer nie"
 
-#: ../libpurple/protocols/silc/silc.c:911
-#: ../libpurple/protocols/silc/silc.c:957
-#: ../libpurple/protocols/silc/silc.c:1028
-#: ../libpurple/protocols/silc/silc.c:1029
+#: ../libpurple/protocols/silc/silc.c:1042
+#: ../libpurple/protocols/silc/silc.c:1088
+#: ../libpurple/protocols/silc/silc.c:1159
+#: ../libpurple/protocols/silc/silc.c:1160
 #: ../libpurple/protocols/silc10/silc.c:824
 #: ../libpurple/protocols/silc10/silc.c:868
 #: ../libpurple/protocols/silc10/silc.c:939
@@ -11704,186 +11700,186 @@
 msgid "Create New SILC Key Pair"
 msgstr "Skep nuwe SILC-sleutelpaar"
 
-#: ../libpurple/protocols/silc/silc.c:911
+#: ../libpurple/protocols/silc/silc.c:1042
 #: ../libpurple/protocols/silc10/silc.c:824
 msgid "Passphrases do not match"
 msgstr "Wagwoordfrases stem nie ooreen nie"
 
-#: ../libpurple/protocols/silc/silc.c:957
+#: ../libpurple/protocols/silc/silc.c:1088
 #: ../libpurple/protocols/silc10/silc.c:868
 msgid "Key Pair Generation failed"
 msgstr "Sleutelpaar-generering het misluk"
 
-#: ../libpurple/protocols/silc/silc.c:996
+#: ../libpurple/protocols/silc/silc.c:1127
 #: ../libpurple/protocols/silc10/silc.c:907
 msgid "Key length"
 msgstr "Sleutellengte"
 
-#: ../libpurple/protocols/silc/silc.c:998
+#: ../libpurple/protocols/silc/silc.c:1129
 #: ../libpurple/protocols/silc10/silc.c:909
 msgid "Public key file"
 msgstr "Publiekesleutellêer"
 
-#: ../libpurple/protocols/silc/silc.c:1000
+#: ../libpurple/protocols/silc/silc.c:1131
 #: ../libpurple/protocols/silc10/silc.c:911
 msgid "Private key file"
 msgstr "Privateesleutellêer"
 
-#: ../libpurple/protocols/silc/silc.c:1023
+#: ../libpurple/protocols/silc/silc.c:1154
 #: ../libpurple/protocols/silc10/silc.c:934
 msgid "Passphrase (retype)"
 msgstr "Wagwoordfrase (hertik)"
 
-#: ../libpurple/protocols/silc/silc.c:1030
+#: ../libpurple/protocols/silc/silc.c:1161
 #: ../libpurple/protocols/silc10/silc.c:941
 msgid "Generate Key Pair"
 msgstr "Genereer sleutelpaar"
 
-#: ../libpurple/protocols/silc/silc.c:1073
-#: ../libpurple/protocols/silc10/silc.c:984
+#: ../libpurple/protocols/silc/silc.c:1204
+#: ../libpurple/protocols/silc10/silc.c:987
 msgid "Online Status"
 msgstr "Aanlynstatus"
 
-#: ../libpurple/protocols/silc/silc.c:1081
-#: ../libpurple/protocols/silc10/silc.c:992
+#: ../libpurple/protocols/silc/silc.c:1212
+#: ../libpurple/protocols/silc10/silc.c:995
 msgid "View Message of the Day"
 msgstr "Bekyk dagboodskap"
 
-#: ../libpurple/protocols/silc/silc.c:1085
-#: ../libpurple/protocols/silc10/silc.c:996
+#: ../libpurple/protocols/silc/silc.c:1216
+#: ../libpurple/protocols/silc10/silc.c:999
 msgid "Create SILC Key Pair..."
 msgstr "Skep SILC-sleutelpaar..."
 
-#: ../libpurple/protocols/silc/silc.c:1177
-#: ../libpurple/protocols/silc10/silc.c:1095
+#: ../libpurple/protocols/silc/silc.c:1308
+#: ../libpurple/protocols/silc10/silc.c:1098
 #, c-format
 msgid "User <I>%s</I> is not present in the network"
 msgstr "Gebruiker <I>%s</I> is nie op die netwerk teenwoordig nie"
 
-#: ../libpurple/protocols/silc/silc.c:1357
-#: ../libpurple/protocols/silc10/silc.c:1286
+#: ../libpurple/protocols/silc/silc.c:1488
+#: ../libpurple/protocols/silc10/silc.c:1289
 msgid "Topic too long"
 msgstr "Onderwerp te lank"
 
-#: ../libpurple/protocols/silc/silc.c:1438
-#: ../libpurple/protocols/silc10/silc.c:1367
+#: ../libpurple/protocols/silc/silc.c:1569
+#: ../libpurple/protocols/silc10/silc.c:1370
 msgid "You must specify a nick"
 msgstr "U moet 'n bynaam spesifiseer"
 
-#: ../libpurple/protocols/silc/silc.c:1540
-#: ../libpurple/protocols/silc10/silc.c:1469
+#: ../libpurple/protocols/silc/silc.c:1671
+#: ../libpurple/protocols/silc10/silc.c:1472
 #, c-format
 msgid "channel %s not found"
 msgstr "kanaal %s nie gevind nie"
 
-#: ../libpurple/protocols/silc/silc.c:1545
-#: ../libpurple/protocols/silc10/silc.c:1474
+#: ../libpurple/protocols/silc/silc.c:1676
+#: ../libpurple/protocols/silc10/silc.c:1477
 #, c-format
 msgid "channel modes for %s: %s"
 msgstr "kanaalmodusse vir %s: %s"
 
-#: ../libpurple/protocols/silc/silc.c:1547
-#: ../libpurple/protocols/silc10/silc.c:1476
+#: ../libpurple/protocols/silc/silc.c:1678
+#: ../libpurple/protocols/silc10/silc.c:1479
 #, c-format
 msgid "no channel modes are set on %s"
 msgstr "geen kanaalmodusse is gestel op %s nie"
 
-#: ../libpurple/protocols/silc/silc.c:1560
-#: ../libpurple/protocols/silc10/silc.c:1489
+#: ../libpurple/protocols/silc/silc.c:1691
+#: ../libpurple/protocols/silc10/silc.c:1492
 #, c-format
 msgid "Failed to set cmodes for %s"
-msgstr "Het misluk om cmodusse vir %s te stel"
-
-#: ../libpurple/protocols/silc/silc.c:1590
-#: ../libpurple/protocols/silc10/silc.c:1519
+msgstr "Stel van cmodusse vir %s het misluk"
+
+#: ../libpurple/protocols/silc/silc.c:1721
+#: ../libpurple/protocols/silc10/silc.c:1522
 #, c-format
 msgid "Unknown command: %s, (may be a client bug)"
-msgstr "Onbekende opdrag: %s, (moontlik 'n kliëntfout)"
-
-#: ../libpurple/protocols/silc/silc.c:1653
-#: ../libpurple/protocols/silc10/silc.c:1582
+msgstr "Onbekende bevel: %s, (moontlik 'n kliëntfout)"
+
+#: ../libpurple/protocols/silc/silc.c:1784
+#: ../libpurple/protocols/silc10/silc.c:1585
 msgid "part [channel]:  Leave the chat"
 msgstr "part [kanaal]:  Verlaat die geselsie"
 
-#: ../libpurple/protocols/silc/silc.c:1657
-#: ../libpurple/protocols/silc10/silc.c:1586
+#: ../libpurple/protocols/silc/silc.c:1788
+#: ../libpurple/protocols/silc10/silc.c:1589
 msgid "leave [channel]:  Leave the chat"
 msgstr "leave [kanaal]:  Verlaat die geselsie"
 
-#: ../libpurple/protocols/silc/silc.c:1661
-#: ../libpurple/protocols/silc10/silc.c:1590
+#: ../libpurple/protocols/silc/silc.c:1792
+#: ../libpurple/protocols/silc10/silc.c:1593
 msgid "topic [&lt;new topic&gt;]:  View or change the topic"
 msgstr "topic [&lt;nuwe onderwe&rp]:  Bekyk of verander die onderwerp"
 
-#: ../libpurple/protocols/silc/silc.c:1666
-#: ../libpurple/protocols/silc10/silc.c:1595
+#: ../libpurple/protocols/silc/silc.c:1797
+#: ../libpurple/protocols/silc10/silc.c:1598
 msgid "join &lt;channel&gt; [&lt;password&gt;]:  Join a chat on this network"
 msgstr ""
 "join &lt;kanaal&gt; [&lt;wagwoord&gt;]:  Sluit by 'n geselsie aan op hierdie "
 "netwerk"
 
-#: ../libpurple/protocols/silc/silc.c:1670
-#: ../libpurple/protocols/silc10/silc.c:1599
+#: ../libpurple/protocols/silc/silc.c:1801
+#: ../libpurple/protocols/silc10/silc.c:1602
 msgid "list:  List channels on this network"
 msgstr "list:  Lys kanale op hierdie netwerk"
 
-#: ../libpurple/protocols/silc/silc.c:1674
-#: ../libpurple/protocols/silc10/silc.c:1603
+#: ../libpurple/protocols/silc/silc.c:1805
+#: ../libpurple/protocols/silc10/silc.c:1606
 msgid "whois &lt;nick&gt;:  View nick's information"
 msgstr "whois &lt;bynaam&gt;:  Bekyk bynaam se inligting"
 
-#: ../libpurple/protocols/silc/silc.c:1678
-#: ../libpurple/protocols/silc10/silc.c:1607
+#: ../libpurple/protocols/silc/silc.c:1809
+#: ../libpurple/protocols/silc10/silc.c:1610
 #: ../libpurple/protocols/zephyr/zephyr.c:2685
 msgid "msg &lt;nick&gt; &lt;message&gt;:  Send a private message to a user"
 msgstr ""
 "msg &lt;bynaam&gt; &lt;boodskap&gt;:  Stuur 'n private boodskap aan 'n "
 "gebruiker"
 
-#: ../libpurple/protocols/silc/silc.c:1682
-#: ../libpurple/protocols/silc10/silc.c:1611
+#: ../libpurple/protocols/silc/silc.c:1813
+#: ../libpurple/protocols/silc10/silc.c:1614
 msgid "query &lt;nick&gt; [&lt;message&gt;]:  Send a private message to a user"
 msgstr ""
 "query &lt;bynaam&gt; [&lt;boodskap&gt;]:  Stuur 'n private boodskap aan 'n "
 "gebruiker"
 
-#: ../libpurple/protocols/silc/silc.c:1686
-#: ../libpurple/protocols/silc10/silc.c:1615
+#: ../libpurple/protocols/silc/silc.c:1817
+#: ../libpurple/protocols/silc10/silc.c:1618
 msgid "motd:  View the server's Message Of The Day"
 msgstr "motd:  Bekyk die bediener se dagboodskap"
 
-#: ../libpurple/protocols/silc/silc.c:1690
-#: ../libpurple/protocols/silc10/silc.c:1619
+#: ../libpurple/protocols/silc/silc.c:1821
+#: ../libpurple/protocols/silc10/silc.c:1622
 msgid "detach:  Detach this session"
 msgstr "detach:  Ontheg hierdie sessie"
 
-#: ../libpurple/protocols/silc/silc.c:1694
-#: ../libpurple/protocols/silc10/silc.c:1623
+#: ../libpurple/protocols/silc/silc.c:1825
+#: ../libpurple/protocols/silc10/silc.c:1626
 msgid "quit [message]:  Disconnect from the server, with an optional message"
-msgstr "quit [boodskap]:  Sny af van bediener, met 'n opsionele boodskap"
-
-#: ../libpurple/protocols/silc/silc.c:1698
-#: ../libpurple/protocols/silc10/silc.c:1627
+msgstr "quit [boodskap]:  Ontkoppel van bediener, met 'n opsionele boodskap"
+
+#: ../libpurple/protocols/silc/silc.c:1829
+#: ../libpurple/protocols/silc10/silc.c:1630
 msgid "call &lt;command&gt;:  Call any silc client command"
 msgstr "call &lt;bevel&gt;:  Roep enige silc-kliëntbevel"
 
-#: ../libpurple/protocols/silc/silc.c:1704
-#: ../libpurple/protocols/silc10/silc.c:1633
+#: ../libpurple/protocols/silc/silc.c:1835
+#: ../libpurple/protocols/silc10/silc.c:1636
 msgid "kill &lt;nick&gt; [-pubkey|&lt;reason&gt;]:  Kill nick"
 msgstr "kill &lt;bynaam&gt; [-pubkey|&lt;rede&gt;]:  Moor bynaam"
 
-#: ../libpurple/protocols/silc/silc.c:1708
-#: ../libpurple/protocols/silc10/silc.c:1637
+#: ../libpurple/protocols/silc/silc.c:1839
+#: ../libpurple/protocols/silc10/silc.c:1640
 msgid "nick &lt;newnick&gt;:  Change your nickname"
 msgstr "nick &lt;nuwe bynaam&gt;:  Verander u bynaam"
 
-#: ../libpurple/protocols/silc/silc.c:1712
-#: ../libpurple/protocols/silc10/silc.c:1641
+#: ../libpurple/protocols/silc/silc.c:1843
+#: ../libpurple/protocols/silc10/silc.c:1644
 msgid "whowas &lt;nick&gt;:  View nick's information"
 msgstr "whowas &lt;bynaam&gt;:  Bekyk bynaam se inligting"
 
-#: ../libpurple/protocols/silc/silc.c:1716
-#: ../libpurple/protocols/silc10/silc.c:1645
+#: ../libpurple/protocols/silc/silc.c:1847
+#: ../libpurple/protocols/silc10/silc.c:1648
 msgid ""
 "cmode &lt;channel&gt; [+|-&lt;modes&gt;] [arguments]:  Change or display "
 "channel modes"
@@ -11891,8 +11887,8 @@
 "cmode &lt;kanaal&gt; [+|-&lt;modusse&gt;] [argumente]:  Verander of wys "
 "kanaalmodusse"
 
-#: ../libpurple/protocols/silc/silc.c:1720
-#: ../libpurple/protocols/silc10/silc.c:1649
+#: ../libpurple/protocols/silc/silc.c:1851
+#: ../libpurple/protocols/silc10/silc.c:1652
 msgid ""
 "cumode &lt;channel&gt; +|-&lt;modes&gt; &lt;nick&gt;:  Change nick's modes "
 "on channel"
@@ -11900,18 +11896,18 @@
 "cumode &lt;kanaal&gt; +|-&lt;modusse&gt; &lt;bynaam&gt;:  Verander bynaam se "
 "modusse op kanaal"
 
-#: ../libpurple/protocols/silc/silc.c:1724
-#: ../libpurple/protocols/silc10/silc.c:1653
+#: ../libpurple/protocols/silc/silc.c:1855
+#: ../libpurple/protocols/silc10/silc.c:1656
 msgid "umode &lt;usermodes&gt;:  Set your modes in the network"
 msgstr "umode &lt;gebruikermodusse&gt;:  Stel u modusse op die netwerk"
 
-#: ../libpurple/protocols/silc/silc.c:1728
-#: ../libpurple/protocols/silc10/silc.c:1657
+#: ../libpurple/protocols/silc/silc.c:1859
+#: ../libpurple/protocols/silc10/silc.c:1660
 msgid "oper &lt;nick&gt; [-pubkey]:  Get server operator privileges"
 msgstr "oper &lt;bynaam&gt; [-pubkey]:  Kry bedieneroperateur-voorregte"
 
-#: ../libpurple/protocols/silc/silc.c:1732
-#: ../libpurple/protocols/silc10/silc.c:1661
+#: ../libpurple/protocols/silc/silc.c:1863
+#: ../libpurple/protocols/silc10/silc.c:1664
 msgid ""
 "invite &lt;channel&gt; [-|+]&lt;nick&gt;:  invite nick or add/remove from "
 "channel invite list"
@@ -11919,45 +11915,45 @@
 "invite &lt;kanaal&gt; [-|+]&lt;bynaam&gt;:  nooi bynaam uit of voeg by/"
 "verwyder van kanaaluitnooilys"
 
-#: ../libpurple/protocols/silc/silc.c:1736
-#: ../libpurple/protocols/silc10/silc.c:1665
+#: ../libpurple/protocols/silc/silc.c:1867
+#: ../libpurple/protocols/silc10/silc.c:1668
 msgid "kick &lt;channel&gt; &lt;nick&gt; [comment]:  Kick client from channel"
 msgstr ""
-"kick &lt;kanaal&gt; &lt;bynaam&gt; [opmerking]:  Skop kliënt van kanaal"
-
-#: ../libpurple/protocols/silc/silc.c:1740
-#: ../libpurple/protocols/silc10/silc.c:1669
+"kick &lt;kanaal&gt; &lt;bynaam&gt; [kommentaar]:  Skop kliënt van kanaal"
+
+#: ../libpurple/protocols/silc/silc.c:1871
+#: ../libpurple/protocols/silc10/silc.c:1672
 msgid "info [server]:  View server administrative details"
-msgstr "info [bediener]:  Bekyk bedieneradministrasiedetail"
-
-#: ../libpurple/protocols/silc/silc.c:1744
-#: ../libpurple/protocols/silc10/silc.c:1673
+msgstr "info [bediener]:  Bekyk bedieneradministrasiedetails"
+
+#: ../libpurple/protocols/silc/silc.c:1875
+#: ../libpurple/protocols/silc10/silc.c:1676
 msgid "ban [&lt;channel&gt; +|-&lt;nick&gt;]:  Ban client from channel"
 msgstr "ban [&lt;kanaal&gt; +|-&lt;bynaam&gt;]:  Verban kliënt van kanaal"
 
-#: ../libpurple/protocols/silc/silc.c:1748
-#: ../libpurple/protocols/silc10/silc.c:1677
+#: ../libpurple/protocols/silc/silc.c:1879
+#: ../libpurple/protocols/silc10/silc.c:1680
 msgid "getkey &lt;nick|server&gt;:  Retrieve client's or server's public key"
 msgstr ""
 "getkey &lt;bynaam|bediener&gt;:  Haal kliënt of bediener se publieke sleutel"
 
-#: ../libpurple/protocols/silc/silc.c:1752
-#: ../libpurple/protocols/silc10/silc.c:1681
+#: ../libpurple/protocols/silc/silc.c:1883
+#: ../libpurple/protocols/silc10/silc.c:1684
 msgid "stats:  View server and network statistics"
 msgstr "stats:  Bekyk bediener- en netwerkstatistiek"
 
-#: ../libpurple/protocols/silc/silc.c:1756
-#: ../libpurple/protocols/silc10/silc.c:1685
+#: ../libpurple/protocols/silc/silc.c:1887
+#: ../libpurple/protocols/silc10/silc.c:1688
 msgid "ping:  Send PING to the connected server"
-msgstr "ping:  Stuur PIENG aan die verbinde bediener"
-
-#: ../libpurple/protocols/silc/silc.c:1761
-#: ../libpurple/protocols/silc10/silc.c:1690
+msgstr "ping:  Stuur PIENG aan die gekoppelde bediener"
+
+#: ../libpurple/protocols/silc/silc.c:1892
+#: ../libpurple/protocols/silc10/silc.c:1693
 msgid "users &lt;channel&gt;:  List users in channel"
 msgstr "users &lt;kanaal&gt;:  Lys gebruikers in kanaal"
 
-#: ../libpurple/protocols/silc/silc.c:1765
-#: ../libpurple/protocols/silc10/silc.c:1694
+#: ../libpurple/protocols/silc/silc.c:1896
+#: ../libpurple/protocols/silc10/silc.c:1697
 msgid ""
 "names [-count|-ops|-halfops|-voices|-normal] &lt;channel(s)&gt;:  List "
 "specific users in channel(s)"
@@ -11974,68 +11970,68 @@
 #. *< name
 #. *< version
 #. *  summary
-#: ../libpurple/protocols/silc/silc.c:1876
-#: ../libpurple/protocols/silc10/silc.c:1819
+#: ../libpurple/protocols/silc/silc.c:2007
+#: ../libpurple/protocols/silc10/silc.c:1822
 msgid "SILC Protocol Plugin"
 msgstr "SILC-protokolinprop"
 
 #. *  description
-#: ../libpurple/protocols/silc/silc.c:1878
-#: ../libpurple/protocols/silc10/silc.c:1821
+#: ../libpurple/protocols/silc/silc.c:2009
+#: ../libpurple/protocols/silc10/silc.c:1824
 msgid "Secure Internet Live Conferencing (SILC) Protocol"
 msgstr "Beveiligde regstreekse internetkonferensie- (SILC) protokol"
 
-#: ../libpurple/protocols/silc/silc.c:1910
-#: ../libpurple/protocols/silc10/silc.c:1853 ../pidgin/gtkprefs.c:2036
+#: ../libpurple/protocols/silc/silc.c:2041
+#: ../libpurple/protocols/silc10/silc.c:1856 ../pidgin/gtkprefs.c:2138
 msgid "Network"
 msgstr "Netwerk"
 
-#: ../libpurple/protocols/silc/silc.c:1921
-#: ../libpurple/protocols/silc10/silc.c:1864
+#: ../libpurple/protocols/silc/silc.c:2052
+#: ../libpurple/protocols/silc10/silc.c:1867
 msgid "Public Key file"
 msgstr "Publiekesleutellêer"
 
-#: ../libpurple/protocols/silc/silc.c:1925
-#: ../libpurple/protocols/silc10/silc.c:1868
+#: ../libpurple/protocols/silc/silc.c:2056
+#: ../libpurple/protocols/silc10/silc.c:1871
 msgid "Private Key file"
 msgstr "Privatesleutel-lêer"
 
-#: ../libpurple/protocols/silc/silc.c:1935
-#: ../libpurple/protocols/silc10/silc.c:1878
+#: ../libpurple/protocols/silc/silc.c:2066
+#: ../libpurple/protocols/silc10/silc.c:1881
 msgid "Cipher"
 msgstr "Syfer"
 
-#: ../libpurple/protocols/silc/silc.c:1945
-#: ../libpurple/protocols/silc10/silc.c:1888
+#: ../libpurple/protocols/silc/silc.c:2076
+#: ../libpurple/protocols/silc10/silc.c:1891
 msgid "HMAC"
 msgstr "HMAC"
 
-#: ../libpurple/protocols/silc/silc.c:1948
+#: ../libpurple/protocols/silc/silc.c:2079
 msgid "Use Perfect Forward Secrecy"
 msgstr "Gebruik perfekte vooruitgeheimhouding"
 
-#: ../libpurple/protocols/silc/silc.c:1952
-#: ../libpurple/protocols/silc10/silc.c:1891
+#: ../libpurple/protocols/silc/silc.c:2083
+#: ../libpurple/protocols/silc10/silc.c:1894
 msgid "Public key authentication"
 msgstr "Publiekesleutel-stawing"
 
-#: ../libpurple/protocols/silc/silc.c:1955
-#: ../libpurple/protocols/silc10/silc.c:1894
+#: ../libpurple/protocols/silc/silc.c:2086
+#: ../libpurple/protocols/silc10/silc.c:1897
 msgid "Block IMs without Key Exchange"
 msgstr "Blokkeer kitsboodskappe sonder sleutelruiling"
 
-#: ../libpurple/protocols/silc/silc.c:1958
-#: ../libpurple/protocols/silc10/silc.c:1897
+#: ../libpurple/protocols/silc/silc.c:2089
+#: ../libpurple/protocols/silc10/silc.c:1900
 msgid "Block messages to whiteboard"
 msgstr "Blokkeer boodskappe aan witbord"
 
-#: ../libpurple/protocols/silc/silc.c:1961
-#: ../libpurple/protocols/silc10/silc.c:1900
+#: ../libpurple/protocols/silc/silc.c:2092
+#: ../libpurple/protocols/silc10/silc.c:1903
 msgid "Automatically open whiteboard"
 msgstr "Open witbord outomaties"
 
-#: ../libpurple/protocols/silc/silc.c:1964
-#: ../libpurple/protocols/silc10/silc.c:1903
+#: ../libpurple/protocols/silc/silc.c:2095
+#: ../libpurple/protocols/silc10/silc.c:1906
 msgid "Digitally sign and verify all messages"
 msgstr "Onder digitaal en verifieer alle boodskappe"
 
@@ -12054,60 +12050,60 @@
 #. Hint for translators: Please check the tabulator width here and in
 #. the next strings (short strings: 2 tabs, longer strings 1 tab,
 #. sum: 3 tabs or 24 characters)
-#: ../libpurple/protocols/silc/util.c:358
+#: ../libpurple/protocols/silc/util.c:362
 #: ../libpurple/protocols/silc10/util.c:355
 #, c-format
 msgid "Real Name: \t%s\n"
 msgstr "Regte naam: \t%s\n"
 
-#: ../libpurple/protocols/silc/util.c:360
+#: ../libpurple/protocols/silc/util.c:364
 #: ../libpurple/protocols/silc10/util.c:357
 #, c-format
 msgid "User Name: \t%s\n"
 msgstr "Gebruikernaam: \t%s\n"
 
-#: ../libpurple/protocols/silc/util.c:362
+#: ../libpurple/protocols/silc/util.c:366
 #: ../libpurple/protocols/silc10/util.c:359
 #, c-format
 msgid "E-Mail: \t\t%s\n"
 msgstr "E-pos: \t\t%s\n"
 
-#: ../libpurple/protocols/silc/util.c:364
+#: ../libpurple/protocols/silc/util.c:368
 #: ../libpurple/protocols/silc10/util.c:361
 #, c-format
 msgid "Host Name: \t%s\n"
 msgstr "Gasheernaam: \t%s\n"
 
-#: ../libpurple/protocols/silc/util.c:366
+#: ../libpurple/protocols/silc/util.c:370
 #: ../libpurple/protocols/silc10/util.c:363
 #, c-format
 msgid "Organization: \t%s\n"
 msgstr "Organisasie: \t%s\n"
 
-#: ../libpurple/protocols/silc/util.c:368
+#: ../libpurple/protocols/silc/util.c:372
 #: ../libpurple/protocols/silc10/util.c:365
 #, c-format
 msgid "Country: \t%s\n"
 msgstr "Land: \t%s\n"
 
-#: ../libpurple/protocols/silc/util.c:369
+#: ../libpurple/protocols/silc/util.c:373
 #: ../libpurple/protocols/silc10/util.c:366
 #, c-format
 msgid "Algorithm: \t%s\n"
 msgstr "Algoritme: \t%s\n"
 
-#: ../libpurple/protocols/silc/util.c:370
+#: ../libpurple/protocols/silc/util.c:374
 #: ../libpurple/protocols/silc10/util.c:367
 #, c-format
 msgid "Key Length: \t%d bits\n"
 msgstr "Sleutellengte: \t%d bisse\n"
 
-#: ../libpurple/protocols/silc/util.c:372
+#: ../libpurple/protocols/silc/util.c:376
 #, c-format
 msgid "Version: \t%s\n"
 msgstr "Weergawe: \t%s\n"
 
-#: ../libpurple/protocols/silc/util.c:374
+#: ../libpurple/protocols/silc/util.c:378
 #: ../libpurple/protocols/silc10/util.c:369
 #, c-format
 msgid ""
@@ -12119,7 +12115,7 @@
 "%s\n"
 "\n"
 
-#: ../libpurple/protocols/silc/util.c:375
+#: ../libpurple/protocols/silc/util.c:379
 #: ../libpurple/protocols/silc10/util.c:370
 #, c-format
 msgid ""
@@ -12129,44 +12125,44 @@
 "Publiekesleutel-babbelafdruk\n"
 "%s"
 
-#: ../libpurple/protocols/silc/util.c:379
-#: ../libpurple/protocols/silc/util.c:380
+#: ../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 "Publiekesleutelinligting"
 
-#: ../libpurple/protocols/silc/util.c:559
+#: ../libpurple/protocols/silc/util.c:563
 #: ../libpurple/protocols/silc10/util.c:555
 msgid "Paging"
 msgstr "Roeping"
 
-#: ../libpurple/protocols/silc/util.c:565
+#: ../libpurple/protocols/silc/util.c:569
 #: ../libpurple/protocols/silc10/util.c:561
 msgid "Video Conferencing"
 msgstr "Videokonferensie"
 
-#: ../libpurple/protocols/silc/util.c:583
+#: ../libpurple/protocols/silc/util.c:587
 #: ../libpurple/protocols/silc10/util.c:579
 msgid "Computer"
 msgstr "Rekenaar"
 
-#: ../libpurple/protocols/silc/util.c:587
+#: ../libpurple/protocols/silc/util.c:591
 #: ../libpurple/protocols/silc10/util.c:583
 msgid "PDA"
 msgstr "PDA"
 
-#: ../libpurple/protocols/silc/util.c:589
+#: ../libpurple/protocols/silc/util.c:593
 #: ../libpurple/protocols/silc10/util.c:585
 msgid "Terminal"
 msgstr "Terminaal"
 
-#: ../libpurple/protocols/silc/wb.c:284 ../libpurple/protocols/silc10/wb.c:284
+#: ../libpurple/protocols/silc/wb.c:288 ../libpurple/protocols/silc10/wb.c:287
 #, c-format
 msgid "%s sent message to whiteboard. Would you like to open the whiteboard?"
 msgstr "%s het boodskap na witbord gestuur. Wil u die witbord open?"
 
-#: ../libpurple/protocols/silc/wb.c:288 ../libpurple/protocols/silc10/wb.c:288
+#: ../libpurple/protocols/silc/wb.c:292 ../libpurple/protocols/silc10/wb.c:291
 #, c-format
 msgid ""
 "%s sent message to whiteboard on %s channel. Would you like to open the "
@@ -12174,7 +12170,7 @@
 msgstr ""
 "%s het boodskap na witbord op %s kanaal gestuur. Wil u die witbord open?"
 
-#: ../libpurple/protocols/silc/wb.c:302 ../libpurple/protocols/silc10/wb.c:302
+#: ../libpurple/protocols/silc/wb.c:306 ../libpurple/protocols/silc10/wb.c:305
 msgid "Whiteboard"
 msgstr "Witbord"
 
@@ -12183,52 +12179,43 @@
 msgstr "Geen bedienerstatistiek beskikbaar nie"
 
 #: ../libpurple/protocols/silc10/ops.c:1931
-#, c-format
 msgid "Failure: Version mismatch, upgrade your client"
-msgstr "Mislukking: Weergawe pas nie, opgradeer u kliënt"
+msgstr "Mislukking: Weergawe pas nie, gradeer u kliënt op"
 
 #: ../libpurple/protocols/silc10/ops.c:1934
-#, c-format
 msgid "Failure: Remote does not trust/support your public key"
-msgstr "Mislukking: Afgeleë vertrou/ondersteun nie u publieke sleutel nie"
+msgstr ""
+"Mislukking: Afgeleë entiteit vertrou/ondersteun nie u publieke sleutel nie"
 
 #: ../libpurple/protocols/silc10/ops.c:1937
-#, c-format
 msgid "Failure: Remote does not support proposed KE group"
 msgstr "Mislukking: Afgeleë ondersteun nie voorgestelde KE-groep nie"
 
 #: ../libpurple/protocols/silc10/ops.c:1940
-#, c-format
 msgid "Failure: Remote does not support proposed cipher"
 msgstr "Mislukking: Afgeleë ondersteun nie voorgestelde syfer nie"
 
 #: ../libpurple/protocols/silc10/ops.c:1943
-#, c-format
 msgid "Failure: Remote does not support proposed PKCS"
 msgstr "Mislukking: Afgeleë ondersteun nie voorgestelde PKCS nie"
 
 #: ../libpurple/protocols/silc10/ops.c:1946
-#, c-format
 msgid "Failure: Remote does not support proposed hash function"
 msgstr "Mislukking: Afgeleë ondersteun nie voorgestelde hutsfunksie nie"
 
 #: ../libpurple/protocols/silc10/ops.c:1949
-#, c-format
 msgid "Failure: Remote does not support proposed HMAC"
 msgstr "Mislukking: Afgeleë ondersteun nie voorgestelde HMAC nie"
 
 #: ../libpurple/protocols/silc10/ops.c:1951
-#, c-format
 msgid "Failure: Incorrect signature"
 msgstr "Mislukking: Verkeerde handtekening"
 
 #: ../libpurple/protocols/silc10/ops.c:1953
-#, c-format
 msgid "Failure: Invalid cookie"
 msgstr "Mislukking: Ongeldige koekie"
 
 #: ../libpurple/protocols/silc10/ops.c:1964
-#, c-format
 msgid "Failure: Authentication failed"
 msgstr "Mislukking: Stawing het misluk"
 
@@ -12250,36 +12237,35 @@
 msgstr "Kon nie SILC-sleutelpaar laai nie: %s"
 
 #. TODO: do we really want to disconnect on a failure to write?
-#: ../libpurple/protocols/simple/simple.c:416
+#: ../libpurple/protocols/simple/simple.c:417
 msgid "Could not write"
 msgstr "Kon nie skryf nie"
 
-#: ../libpurple/protocols/simple/simple.c:438
-#: ../libpurple/protocols/simple/simple.c:1529
+#: ../libpurple/protocols/simple/simple.c:439
+#: ../libpurple/protocols/simple/simple.c:1684
 msgid "Could not connect"
-msgstr "Kon nie verbind nie"
-
-#: ../libpurple/protocols/simple/simple.c:1059
-#, fuzzy
+msgstr "Kon nie koppel nie"
+
+#: ../libpurple/protocols/simple/simple.c:1122
 msgid "Unknown server response."
-msgstr "Onbekende rede."
-
-#: ../libpurple/protocols/simple/simple.c:1563
-#: ../libpurple/protocols/simple/simple.c:1605
-#: ../libpurple/protocols/simple/simple.c:1618
-#: ../libpurple/protocols/simple/simple.c:1669
+msgstr "Onbekende bedienerrespons."
+
+#: ../libpurple/protocols/simple/simple.c:1718
+#: ../libpurple/protocols/simple/simple.c:1760
+#: ../libpurple/protocols/simple/simple.c:1773
+#: ../libpurple/protocols/simple/simple.c:1824
 msgid "Could not create listen socket"
 msgstr "Kon nie luistersok skep nie"
 
-#: ../libpurple/protocols/simple/simple.c:1586
+#: ../libpurple/protocols/simple/simple.c:1741
 msgid "Couldn't resolve host"
 msgstr "Kon nie gasheer oplos nie"
 
-#: ../libpurple/protocols/simple/simple.c:1677
+#: ../libpurple/protocols/simple/simple.c:1832
 msgid "Could not resolve hostname"
 msgstr "Kon nie gasheernaam oplos nie"
 
-#: ../libpurple/protocols/simple/simple.c:1694
+#: ../libpurple/protocols/simple/simple.c:1849
 msgid "SIP screen names may not contain whitespaces or @ symbols"
 msgstr "SIP-skermname mag nie spasies of @-simbole bevat nie"
 
@@ -12291,36 +12277,36 @@
 #. *< id
 #. *< name
 #. *< version
-#: ../libpurple/protocols/simple/simple.c:1870
+#: ../libpurple/protocols/simple/simple.c:2035
 msgid "SIP/SIMPLE Protocol Plugin"
 msgstr "SIP/SIMPLE-protokolinprop"
 
 #. *  summary
-#: ../libpurple/protocols/simple/simple.c:1871
+#: ../libpurple/protocols/simple/simple.c:2036
 msgid "The SIP/SIMPLE Protocol Plugin"
 msgstr "Die SIP/SIMPLE-protokolinprop"
 
-#: ../libpurple/protocols/simple/simple.c:1899
+#: ../libpurple/protocols/simple/simple.c:2064
 msgid "Publish status (note: everyone may watch you)"
 msgstr "Publiseer status (let wel: almal kan u dophou)"
 
-#: ../libpurple/protocols/simple/simple.c:1905
+#: ../libpurple/protocols/simple/simple.c:2070
 msgid "Use UDP"
 msgstr "Gebruik UDP"
 
-#: ../libpurple/protocols/simple/simple.c:1907
+#: ../libpurple/protocols/simple/simple.c:2072
 msgid "Use proxy"
 msgstr "Gebruik instaanbediener"
 
-#: ../libpurple/protocols/simple/simple.c:1909
+#: ../libpurple/protocols/simple/simple.c:2074
 msgid "Proxy"
 msgstr "Instaanbediener"
 
-#: ../libpurple/protocols/simple/simple.c:1911
+#: ../libpurple/protocols/simple/simple.c:2076
 msgid "Auth User"
 msgstr "Magtig gebruiker"
 
-#: ../libpurple/protocols/simple/simple.c:1913
+#: ../libpurple/protocols/simple/simple.c:2078
 msgid "Auth Domain"
 msgstr "Magtig domein"
 
@@ -12365,9 +12351,8 @@
 msgstr "Waarskuwing indien %s nie toegelaat nie."
 
 #: ../libpurple/protocols/toc/toc.c:503
-#, c-format
 msgid "A message has been dropped, you are exceeding the server speed limit."
-msgstr "'n Boodskap is laat val, u oorskry die bediener se spoedgrens."
+msgstr "'n Boodskap is laat val, u oorskry die bediener se spoedlimiet."
 
 #: ../libpurple/protocols/toc/toc.c:506
 #, c-format
@@ -12390,47 +12375,38 @@
 msgstr "U het 'n kitsboodskap vanaf %s gemis omdat dit te vinnig gestuur is."
 
 #: ../libpurple/protocols/toc/toc.c:518
-#, c-format
 msgid "Failure."
 msgstr "Mislukking."
 
 #: ../libpurple/protocols/toc/toc.c:521
-#, c-format
 msgid "Too many matches."
 msgstr "Te veel wat pas."
 
 #: ../libpurple/protocols/toc/toc.c:524
-#, c-format
 msgid "Need more qualifiers."
 msgstr "Benodig méér kwalifiseerders."
 
 #: ../libpurple/protocols/toc/toc.c:527
-#, c-format
 msgid "Dir service temporarily unavailable."
 msgstr "Gidsdiens is tydelik nie beskikbaar nie."
 
 #: ../libpurple/protocols/toc/toc.c:530
-#, c-format
 msgid "E-mail lookup restricted."
-msgstr "E-posopsoek beperk."
+msgstr "E-posopsoek ingeperk."
 
 #: ../libpurple/protocols/toc/toc.c:533
-#, c-format
 msgid "Keyword ignored."
 msgstr "Sleutelwoord geïgnoreer."
 
 #: ../libpurple/protocols/toc/toc.c:536
-#, c-format
 msgid "No keywords."
 msgstr "Geen sleutelwoorde."
 
 #: ../libpurple/protocols/toc/toc.c:539
-#, c-format
 msgid "User has no directory information."
 msgstr "Gebruiker het geen gidsinliging nie."
 
 #: ../libpurple/protocols/toc/toc.c:543
-#, c-format
 msgid "Country not supported."
 msgstr "Land nie ondersteun nie."
 
@@ -12440,28 +12416,24 @@
 msgstr "Onbekende mislukking: %s."
 
 #: ../libpurple/protocols/toc/toc.c:549
-#, c-format
 msgid "Incorrect screen name or password."
 msgstr "Verkeerde skermnaam of wagwoord."
 
 #: ../libpurple/protocols/toc/toc.c:552
-#, c-format
 msgid "The service is temporarily unavailable."
 msgstr "Die diens is tydelik nie beskikbaar nie."
 
 #: ../libpurple/protocols/toc/toc.c:555
-#, c-format
 msgid "Your warning level is currently too high to log in."
 msgstr "U waarskuwingsvlak is tans te hoog om aan te meld."
 
 #: ../libpurple/protocols/toc/toc.c:558
-#, c-format
 msgid ""
 "You have been connecting and disconnecting too frequently.  Wait ten minutes "
 "and try again.  If you continue to try, you will need to wait even longer."
 msgstr ""
-"U het nou te gereeld verbind en afgesny.  Wag tien minute en probeer weer.  "
-"Indien u voortgaan om te probeer sal u selfs nog langer moet wag."
+"U het nou te gereeld gekoppel en ontkoppel.  Wag tien minute en probeer "
+"weer.  Indien u voortgaan om te probeer sal u selfs nog langer moet wag."
 
 #: ../libpurple/protocols/toc/toc.c:560
 #, c-format
@@ -12493,8 +12465,8 @@
 msgid "Password Change Successful"
 msgstr "Wagwoord suksesvol verander"
 
-#: ../libpurple/protocols/toc/toc.c:1366 ../pidgin/gtkblist.c:5582
-#: ../pidgin/gtkblist.c:5932
+#: ../libpurple/protocols/toc/toc.c:1366 ../pidgin/gtkblist.c:5948
+#: ../pidgin/gtkblist.c:6306
 msgid "_Group:"
 msgstr "_Groep:"
 
@@ -12518,7 +12490,7 @@
 #: ../libpurple/protocols/toc/toc.c:1878 ../libpurple/protocols/toc/toc.c:1918
 #: ../libpurple/protocols/toc/toc.c:2042 ../libpurple/protocols/toc/toc.c:2130
 msgid "Could not connect for transfer."
-msgstr "Kon nie vir oordrag verbind nie."
+msgstr "Kon nie vir oordrag koppel nie."
 
 #: ../libpurple/protocols/toc/toc.c:2075
 msgid "Could not write file header.  The file will not be transferred."
@@ -12554,25 +12526,26 @@
 msgid "TOC Protocol Plugin"
 msgstr "TOC-protokolinprop"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:782
+#: ../libpurple/protocols/yahoo/yahoo.c:784
 #, c-format
 msgid "%s has sent you a webcam invite, which is not yet supported."
 msgstr ""
-
-#: ../libpurple/protocols/yahoo/yahoo.c:838
+"%s het u 'n webkamera-uitnodiging gestuur, wat nog nie ondersteun word nie."
+
+#: ../libpurple/protocols/yahoo/yahoo.c:840
 msgid "Your Yahoo! message did not get sent."
 msgstr "U Yahoo!-boodskap is nie gestuur nie."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:960
+#: ../libpurple/protocols/yahoo/yahoo.c:962
 #, c-format
 msgid "Yahoo! system message for %s:"
 msgstr "Yahoo!-stelselboodskap vir %s:"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1029
+#: ../libpurple/protocols/yahoo/yahoo.c:1031
 msgid "Authorization denied message:"
 msgstr "Magtiging gewyer-boodskap:"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1047
+#: ../libpurple/protocols/yahoo/yahoo.c:1049
 #, c-format
 msgid ""
 "%s has (retroactively) denied your request to add them to your list for the "
@@ -12581,16 +12554,16 @@
 "%s het (retroaktief) u versoek om hulle by u vriendelys te voeg, geweier, "
 "vir die volgende rede: %s."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1050
+#: ../libpurple/protocols/yahoo/yahoo.c:1052
 #, c-format
 msgid "%s has (retroactively) denied your request to add them to your list."
 msgstr "%s het (retroaktief) u versoek om hulle by u lys te voeg, geweier."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1052
+#: ../libpurple/protocols/yahoo/yahoo.c:1054
 msgid "Add buddy rejected"
 msgstr "Vriend byvoeg geweier"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1994
+#: ../libpurple/protocols/yahoo/yahoo.c:1996
 #, c-format
 msgid ""
 "The Yahoo server has requested the use of an unrecognized authentication "
@@ -12601,11 +12574,11 @@
 "versoek.  U sal waarskynlik nie suksesvol by Yahoo kan inteken nie.  "
 "Kontroleer %s vir bywerkings."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1997
+#: ../libpurple/protocols/yahoo/yahoo.c:1999
 msgid "Failed Yahoo! Authentication"
 msgstr "Yahoo!-stawing het misluk"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2063
+#: ../libpurple/protocols/yahoo/yahoo.c:2065
 #, c-format
 msgid ""
 "You have tried to ignore %s, but the user is on your buddy list.  Clicking "
@@ -12614,51 +12587,51 @@
 "U het probeer om %s te ignoreer, maar die gebruiker is op u vriendelys.  "
 "Kliek \"Ja\" om die vriend te verwyder en te ignoreer."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2066
+#: ../libpurple/protocols/yahoo/yahoo.c:2068
 msgid "Ignore buddy?"
 msgstr "Ignoreer vriend?"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2129
+#: ../libpurple/protocols/yahoo/yahoo.c:2131
 msgid "Your account is locked, please log in to the Yahoo! website."
-msgstr "U rekening is gesluit; meld asb. by die Yahoo!-webwerf aan."
-
-#: ../libpurple/protocols/yahoo/yahoo.c:2132
+msgstr "U rekening is gesluit; meld gerus by die Yahoo!-webwerf aan."
+
+#: ../libpurple/protocols/yahoo/yahoo.c:2134
 #, c-format
 msgid "Unknown error number %d. Logging into the Yahoo! website may fix this."
 msgstr ""
-"Onbekende fout nommer %d. As u by die Yahoo!-webwerf aanmeld, kan dit dalk "
-"opgelos word."
-
-#: ../libpurple/protocols/yahoo/yahoo.c:2186
+"Onbekende fout, nommer %d. As u by die Yahoo!-webwerf aanmeld, kan dit dalk "
+"die probleem oplos."
+
+#: ../libpurple/protocols/yahoo/yahoo.c:2188
 #, c-format
 msgid "Could not add buddy %s to group %s to the server list on account %s."
 msgstr ""
 "Kon nie vriend %s by groep %s op die bedienerlys op rekening %s voeg nie."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2189
+#: ../libpurple/protocols/yahoo/yahoo.c:2191
 msgid "Could not add buddy to server list"
 msgstr "Kon nie vriend by bedienerlys voeg nie"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2308
+#: ../libpurple/protocols/yahoo/yahoo.c:2310
 #, c-format
 msgid "[ Audible %s/%s/%s.swf ] %s"
 msgstr "[ Hoorbaar %s/%s/%s.swf ] %s"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2651
+#: ../libpurple/protocols/yahoo/yahoo.c:2653
 msgid "Received unexpected HTTP response from server."
-msgstr "Onverwagte HTTP-antwoord van die bediener ontvang."
-
-#: ../libpurple/protocols/yahoo/yahoo.c:2675
-#: ../libpurple/protocols/yahoo/yahoo.c:2861
-#: ../libpurple/protocols/yahoo/yahoo.c:2964
-#: ../libpurple/protocols/yahoo/yahoo.c:2974
+msgstr "Onverwagte HTTP-respons van die bediener ontvang."
+
+#: ../libpurple/protocols/yahoo/yahoo.c:2677
+#: ../libpurple/protocols/yahoo/yahoo.c:2863
+#: ../libpurple/protocols/yahoo/yahoo.c:2966
+#: ../libpurple/protocols/yahoo/yahoo.c:2976
 #: ../libpurple/protocols/yahoo/yahoochat.c:1514
 #: ../libpurple/protocols/yahoo/yahoochat.c:1584
 #: ../libpurple/protocols/yahoo/ycht.c:585
 msgid "Connection problem"
 msgstr "Verbindingprobleem"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2701
+#: ../libpurple/protocols/yahoo/yahoo.c:2703
 #, c-format
 msgid ""
 "Lost connection with %s:\n"
@@ -12667,7 +12640,7 @@
 "Verbinding met %s verloor:\n"
 "%s"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2726
+#: ../libpurple/protocols/yahoo/yahoo.c:2728
 #, c-format
 msgid ""
 "Could not establish a connection with %s:\n"
@@ -12676,113 +12649,104 @@
 "Kon nie 'n verbinding met %s bewerkstellig nie:\n"
 "%s"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3081
-#: ../libpurple/protocols/yahoo/yahoo.c:3767
+#: ../libpurple/protocols/yahoo/yahoo.c:3083
+#: ../libpurple/protocols/yahoo/yahoo.c:3769
 msgid "Not at Home"
 msgstr "Nie tuis nie"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3083
-#: ../libpurple/protocols/yahoo/yahoo.c:3770
+#: ../libpurple/protocols/yahoo/yahoo.c:3085
+#: ../libpurple/protocols/yahoo/yahoo.c:3772
 msgid "Not at Desk"
 msgstr "Nie by die lessenaar nie"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3085
-#: ../libpurple/protocols/yahoo/yahoo.c:3773
+#: ../libpurple/protocols/yahoo/yahoo.c:3087
+#: ../libpurple/protocols/yahoo/yahoo.c:3775
 msgid "Not in Office"
 msgstr "Nie op kantoor nie"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3089
-#: ../libpurple/protocols/yahoo/yahoo.c:3779
+#: ../libpurple/protocols/yahoo/yahoo.c:3091
+#: ../libpurple/protocols/yahoo/yahoo.c:3781
 msgid "On Vacation"
 msgstr "Op vakansie"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3093
-#: ../libpurple/protocols/yahoo/yahoo.c:3785
+#: ../libpurple/protocols/yahoo/yahoo.c:3095
+#: ../libpurple/protocols/yahoo/yahoo.c:3787
 msgid "Stepped Out"
 msgstr "Uit"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3186
-#: ../libpurple/protocols/yahoo/yahoo.c:3216
+#: ../libpurple/protocols/yahoo/yahoo.c:3188
+#: ../libpurple/protocols/yahoo/yahoo.c:3218
 msgid "Not on server list"
 msgstr "Nie op bedienerlys nie"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3233
-#: ../libpurple/protocols/yahoo/yahoo.c:3291
+#: ../libpurple/protocols/yahoo/yahoo.c:3235
+#: ../libpurple/protocols/yahoo/yahoo.c:3293
 msgid "Appear Online"
 msgstr "Lyk of aanlyn is"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3236
-#: ../libpurple/protocols/yahoo/yahoo.c:3312
+#: ../libpurple/protocols/yahoo/yahoo.c:3238
+#: ../libpurple/protocols/yahoo/yahoo.c:3314
 msgid "Appear Permanently Offline"
-msgstr "Lyk of permanent aflyn is"
-
-#: ../libpurple/protocols/yahoo/yahoo.c:3254
+msgstr "Lyk of permanent vanlyn is"
+
+#: ../libpurple/protocols/yahoo/yahoo.c:3256
 msgid "Presence"
 msgstr "Teenwoordigheid"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3297
+#: ../libpurple/protocols/yahoo/yahoo.c:3299
 msgid "Appear Offline"
-msgstr "Lyk of aflyn is"
-
-#: ../libpurple/protocols/yahoo/yahoo.c:3306
+msgstr "Lyk of vanlyn is"
+
+#: ../libpurple/protocols/yahoo/yahoo.c:3308
 msgid "Don't Appear Permanently Offline"
-msgstr "Moenie lyk of permanent aflyn is nie"
-
-#: ../libpurple/protocols/yahoo/yahoo.c:3354
+msgstr "Moenie lyk of permanent vanlyn is nie"
+
+#: ../libpurple/protocols/yahoo/yahoo.c:3356
 msgid "Join in Chat"
 msgstr "Sluit by geselsie aan"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3360
+#: ../libpurple/protocols/yahoo/yahoo.c:3362
 msgid "Initiate Conference"
 msgstr "Inisieer konferensie"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3388
+#: ../libpurple/protocols/yahoo/yahoo.c:3390
 msgid "Presence Settings"
 msgstr "Teenwoordigheid-stellings"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3394
+#: ../libpurple/protocols/yahoo/yahoo.c:3396
 msgid "Start Doodling"
 msgstr "Begin krabbel"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3495
+#: ../libpurple/protocols/yahoo/yahoo.c:3497
 msgid "Activate which ID?"
 msgstr "Aktiveer watter ID?"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3506
-msgid "Join whom in chat?"
+#: ../libpurple/protocols/yahoo/yahoo.c:3508
+msgid "Join who in chat?"
 msgstr "Sluit wie by geselsie aan?"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3518
+#: ../libpurple/protocols/yahoo/yahoo.c:3520
 msgid "Activate ID..."
 msgstr "Aktiveer ID..."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3522
+#: ../libpurple/protocols/yahoo/yahoo.c:3524
 msgid "Join User in Chat..."
 msgstr "Sluit gebruiker by geselsie aan..."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3527
+#: ../libpurple/protocols/yahoo/yahoo.c:3529
 msgid "Open Inbox"
 msgstr "Open inkassie"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4119
-msgid "Buzz"
-msgstr ""
-
-#: ../libpurple/protocols/yahoo/yahoo.c:4121
-#, c-format
-msgid "Buzzing %s..."
-msgstr ""
-
-#: ../libpurple/protocols/yahoo/yahoo.c:4136
+#: ../libpurple/protocols/yahoo/yahoo.c:4138
 msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
 msgstr ""
 "join &lt;kamer&gt;:  Sluit by 'n geselsiekamers op die Yahoo-netwerk aan"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4141
+#: ../libpurple/protocols/yahoo/yahoo.c:4143
 msgid "list: List rooms on the Yahoo network"
 msgstr "list: Lys kamers op die Yahoo-netwerk"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4149
+#: ../libpurple/protocols/yahoo/yahoo.c:4151
 msgid "doodle: Request user to start a Doodle session"
 msgstr "doodle: Versoek gebruiker om 'n krabbelsessie te begin"
 
@@ -12796,56 +12760,56 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/yahoo/yahoo.c:4358
 #: ../libpurple/protocols/yahoo/yahoo.c:4360
+#: ../libpurple/protocols/yahoo/yahoo.c:4362
 msgid "Yahoo Protocol Plugin"
 msgstr "Inprop vir die Yahoo-protokol"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4383
+#: ../libpurple/protocols/yahoo/yahoo.c:4385
 msgid "Yahoo Japan"
 msgstr "Yahoo Japan"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4386
+#: ../libpurple/protocols/yahoo/yahoo.c:4388
 msgid "Pager server"
 msgstr "Roeper-bediener"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4389
+#: ../libpurple/protocols/yahoo/yahoo.c:4391
 msgid "Japan Pager server"
 msgstr "Japannese roeper-bediener"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4392
+#: ../libpurple/protocols/yahoo/yahoo.c:4394
 msgid "Pager port"
 msgstr "Roeper-poort"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4395
+#: ../libpurple/protocols/yahoo/yahoo.c:4397
 msgid "File transfer server"
 msgstr "Lêeroordragbediener"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4398
+#: ../libpurple/protocols/yahoo/yahoo.c:4400
 msgid "Japan file transfer server"
 msgstr "Japannese lêeroordragbediener"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4401
+#: ../libpurple/protocols/yahoo/yahoo.c:4403
 msgid "File transfer port"
 msgstr "Lêeroordragpoort"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4404
+#: ../libpurple/protocols/yahoo/yahoo.c:4406
 msgid "Chat room locale"
 msgstr "Geselsiekamer-lokaliteit"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4407
+#: ../libpurple/protocols/yahoo/yahoo.c:4409
 msgid "Ignore conference and chatroom invitations"
 msgstr "Ignoreer konferensie- en geselsiekamer-uitnodigings"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4415
+#: ../libpurple/protocols/yahoo/yahoo.c:4417
 msgid "Chat room list URL"
 msgstr "Geselsiekamer-lys-URL"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4418
+#: ../libpurple/protocols/yahoo/yahoo.c:4420
 msgid "Yahoo Chat server"
 msgstr "Yahoo-geselsiebediener"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4421
+#: ../libpurple/protocols/yahoo/yahoo.c:4423
 msgid "Yahoo Chat port"
 msgstr "Yahoo-geselsiepoort"
 
@@ -12863,7 +12827,7 @@
 msgstr "Kon nie lêerbeskrywer bewerkstellig nie."
 
 #. TODO: what to do here - do we really have to disconnect?
-#: ../libpurple/protocols/yahoo/yahoo_packet.c:307
+#: ../libpurple/protocols/yahoo/yahoo_packet.c:306
 msgid "Write Error"
 msgstr "Skryffout"
 
@@ -12922,7 +12886,7 @@
 
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1190
 msgid "Last Update"
-msgstr "Laaste opdatering"
+msgstr "Laaste bywerking"
 
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1199
 #, c-format
@@ -12943,7 +12907,7 @@
 "server-side problem. Please try again later."
 msgstr ""
 "Kon nie die gebruiker se profiel haal nie. Dit is waarskynlik 'n tydelike "
-"probleem aan bedienerkant. Probeer asb. later weer."
+"probleem aan bedienerkant. Probeer gerus later weer."
 
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1224
 msgid ""
@@ -12953,8 +12917,8 @@
 msgstr ""
 "Kon nie die gebruiker se profiel haal nie. Dit beteken waarskynlik dat die "
 "gebruiker nie bestaan nie; maar Yahoo! kry dit soms nie reg om 'n gebruiker "
-"se profiel op te spoor nie. As u weet dat die gebruiker wel bestaan, probeer "
-"asb. later weer."
+"se profiel te vind nie. As u weet dat die gebruiker wel bestaan, probeer "
+"gerus later weer."
 
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1231
 msgid "The user's profile is empty."
@@ -13005,7 +12969,7 @@
 
 #: ../libpurple/protocols/yahoo/yahoochat.c:719
 msgid "Failed to join buddy in chat"
-msgstr "Het misluk om vriend by geselsie te laat aansluit"
+msgstr "Kon nie vriend by geselsie laat aansluit nie"
 
 #: ../libpurple/protocols/yahoo/yahoochat.c:720
 msgid "Maybe they're not in a chat?"
@@ -13051,8 +13015,8 @@
 "(There was an error converting this message.\t Check the 'Encoding' option "
 "in the Account Editor)"
 msgstr ""
-"(Daar was 'n fout om hierdie boodskap om te skakel.\t Kontroleer die "
-"'Enkodering'-keuse in die Rekeningredigeerder)"
+"(Kon nie hierdie boodskap omskakel nie.\t Kontroleer die 'Enkodering'-opsie "
+"in die Rekeningredigeerder)"
 
 #: ../libpurple/protocols/zephyr/zephyr.c:752
 #, c-format
@@ -13157,7 +13121,7 @@
 
 #: ../libpurple/protocols/zephyr/zephyr.c:2850
 msgid "Resubscribe"
-msgstr "Skryf weer in"
+msgstr "Teken weer in"
 
 #: ../libpurple/protocols/zephyr/zephyr.c:2853
 msgid "Retrieve subscriptions from server"
@@ -13210,8 +13174,8 @@
 msgid "Exposure"
 msgstr "Blootstelling"
 
-#: ../libpurple/proxy.c:459 ../libpurple/proxy.c:894 ../libpurple/proxy.c:1049
-#: ../libpurple/proxy.c:1617
+#: ../libpurple/proxy.c:461 ../libpurple/proxy.c:902 ../libpurple/proxy.c:1061
+#: ../libpurple/proxy.c:1632
 #, c-format
 msgid ""
 "Unable to create socket:\n"
@@ -13220,46 +13184,60 @@
 "Kan nie sok skep nie:\n"
 "%s"
 
-#: ../libpurple/proxy.c:659
+#: ../libpurple/proxy.c:662
 #, c-format
 msgid "Unable to parse response from HTTP proxy: %s\n"
-msgstr "Kon nie antwoord van HTTP-instaanbediener ontleed nie: %s\n"
-
-#: ../libpurple/proxy.c:698 ../libpurple/proxy.c:744 ../libpurple/proxy.c:780
-#: ../libpurple/proxy.c:792
+msgstr "Kon nie respons van HTTP-instaanbediener ontleed nie: %s\n"
+
+#: ../libpurple/proxy.c:702 ../libpurple/proxy.c:750 ../libpurple/proxy.c:786
+#: ../libpurple/proxy.c:798
 #, c-format
 msgid "HTTP proxy connection error %d"
-msgstr "HTTP-instaanbedienerverbinding-fout %d"
-
-#: ../libpurple/proxy.c:788
+msgstr "HTTP-instaanverbinding-fout %d"
+
+#: ../libpurple/proxy.c:794
 #, c-format
 msgid "Access denied: HTTP proxy server forbids port %d tunneling."
 msgstr "Toegang geweier: HTTP-instaanbediener verbied poort %d om te tonnel."
 
-#: ../libpurple/proxy.c:1012
+#: ../libpurple/proxy.c:1022
 #, c-format
 msgid "Error resolving %s"
-msgstr "Fout met oplos van %s"
-
-#: ../libpurple/proxy.c:1714
+msgstr "Kon nie %s oplos nie"
+
+#: ../libpurple/proxy.c:1730
 msgid "Could not resolve host name"
 msgstr "Kon nie gasheernaam oplos nie"
 
 #. *
 #. * A wrapper for purple_request_action() that uses @c Yes and @c No buttons.
+#. *
+#. * @since 2.3.0
 #.
-#: ../libpurple/request.h:1378
+#. *
+#. * A wrapper for purple_request_action() that uses @c Yes and @c No buttons.
+#. *
+#. * @deprecated Please use purple_request_yes_no_with_hint instead.
+#.
+#: ../libpurple/request.h:1802 ../libpurple/request.h:1815
 msgid "_Yes"
 msgstr "_Ja"
 
-#: ../libpurple/request.h:1378
+#: ../libpurple/request.h:1802 ../libpurple/request.h:1815
 msgid "_No"
 msgstr "_Nee"
 
 #. *
 #. * A wrapper for purple_request_action() that uses Accept and Cancel buttons.
+#. *
+#. * @since 2.3.0
 #.
-#: ../libpurple/request.h:1398
+#. *
+#. * A wrapper for purple_request_action() that uses Accept and Cancel buttons.
+#. *
+#. * @deprecated Please use purple_request_accept_cancel_with_hint instead.
+#.
+#: ../libpurple/request.h:1854 ../libpurple/request.h:1867
 msgid "_Accept"
 msgstr "_Aanvaar"
 
@@ -13282,14 +13260,14 @@
 #: ../libpurple/server.c:302
 #, c-format
 msgid "Requesting %s's attention..."
-msgstr ""
+msgstr "Vra %s se aandag aan..."
 
 #: ../libpurple/server.c:347
 #, c-format
 msgid "%s has requested your attention!"
-msgstr ""
-
-#: ../libpurple/server.c:796
+msgstr "%s het u aandag aangevra!"
+
+#: ../libpurple/server.c:793
 #, c-format
 msgid ""
 "%s has invited %s to the chat room %s:\n"
@@ -13298,19 +13276,18 @@
 "%s het %s uitgenooi na geselsiekamer %s:\n"
 "%s"
 
-#: ../libpurple/server.c:801
+#: ../libpurple/server.c:798
 #, c-format
 msgid "%s has invited %s to the chat room %s\n"
 msgstr "%s het %s na die geselsiekamer %s uitgenooi\n"
 
-#: ../libpurple/server.c:805
+#: ../libpurple/server.c:802
 msgid "Accept chat invitation?"
 msgstr "Aanvaar geselsie-uitnodiging?"
 
 #: ../libpurple/sslconn.c:164
-#, fuzzy
 msgid "SSL Connection Failed"
-msgstr "Verbinding misluk"
+msgstr "SSL-verbinding misluk"
 
 #: ../libpurple/sslconn.c:166
 msgid "SSL Handshake Failed"
@@ -13318,18 +13295,18 @@
 
 #: ../libpurple/sslconn.c:168
 msgid "SSL peer presented an invalid certificate"
-msgstr ""
+msgstr "SSL-eweknie het 'n ongeldige sertifikaat voorgelê"
 
 #: ../libpurple/sslconn.c:171
-#, fuzzy
 msgid "Unknown SSL error"
-msgstr "Onbekende fout"
+msgstr "Onbekende SSL-fout"
 
 #: ../libpurple/status.c:153
 msgid "Unset"
 msgstr "Deaktiveer"
 
-#: ../libpurple/status.c:156 ../pidgin/gtkstatusbox.c:1059
+#: ../libpurple/status.c:156 ../pidgin/gtkdocklet.c:553
+#: ../pidgin/gtkstatusbox.c:1059
 msgid "Do not disturb"
 msgstr "Moenie steur nie"
 
@@ -13341,121 +13318,140 @@
 msgid "Mobile"
 msgstr "Mobiel"
 
-#: ../libpurple/status.c:609
+#: ../libpurple/status.c:161
+msgid "Listening to music"
+msgstr "Luister na musiek"
+
+#: ../libpurple/status.c:610
 #, c-format
 msgid "%s changed status from %s to %s"
 msgstr "%s het van status %s na %s verander"
 
-#: ../libpurple/status.c:619
+#: ../libpurple/status.c:613
+#, c-format
+msgid "%s (%s) changed status from %s to %s"
+msgstr "%s (%s) het van status %s na %s verander"
+
+#: ../libpurple/status.c:624
 #, c-format
 msgid "%s is now %s"
 msgstr "%s is nou %s"
 
-#: ../libpurple/status.c:624
+#: ../libpurple/status.c:626
+#, c-format
+msgid "%s (%s) is now %s"
+msgstr "%s (%s) is nou %s"
+
+#: ../libpurple/status.c:632
 #, c-format
 msgid "%s is no longer %s"
 msgstr "%s is nie meer %s nie"
 
-#: ../libpurple/status.c:1234
+#: ../libpurple/status.c:634
+#, c-format
+msgid "%s (%s) is no longer %s"
+msgstr "%s (%s) is nie meer %s nie"
+
+#: ../libpurple/status.c:1247
 #, c-format
 msgid "%s became idle"
 msgstr "%s het ledig geraak"
 
-#: ../libpurple/status.c:1251
+#: ../libpurple/status.c:1264
 #, c-format
 msgid "%s became unidle"
 msgstr "%s is nie meer ledig nie"
 
-#: ../libpurple/status.c:1314
+#: ../libpurple/status.c:1327
 #, c-format
 msgid "+++ %s became idle"
 msgstr "+++ %s het ledig geword"
 
-#: ../libpurple/status.c:1316
+#: ../libpurple/status.c:1329
 #, c-format
 msgid "+++ %s became unidle"
 msgstr "+++ %s is nie meer ledig nie"
 
-#: ../libpurple/util.c:718
+#: ../libpurple/util.c:721
 #, c-format
 msgid "%x %X"
 msgstr "%x %X"
 
-#: ../libpurple/util.c:2722
+#: ../libpurple/util.c:2783
 #, c-format
 msgid "Error Reading %s"
-msgstr "Fout met lees van %s"
-
-#: ../libpurple/util.c:2723
+msgstr "Kon nie %s lees nie"
+
+#: ../libpurple/util.c:2784
 #, c-format
 msgid ""
 "An error was encountered reading your %s.  They have not been loaded, and "
 "the old file has been renamed to %s~."
 msgstr ""
-"'n Fout is teëgekom toe u %s gelees is.  Dit is nie gelaai nie, en die ou "
-"lêer is hernoem na %s~."
-
-#: ../libpurple/util.c:3223
+"Kon nie volledig u %s lees nie.  Dit is nie gelaai nie, en die ou lêer is "
+"hernoem na %s~."
+
+#: ../libpurple/util.c:3281
 msgid "Calculating..."
 msgstr "Bereken..."
 
-#: ../libpurple/util.c:3226
+#: ../libpurple/util.c:3284
 msgid "Unknown."
 msgstr "Onbekend."
 
-#: ../libpurple/util.c:3252
+#: ../libpurple/util.c:3310
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] "%d sekonde"
 msgstr[1] "%d sekondes"
 
-#: ../libpurple/util.c:3264
+#: ../libpurple/util.c:3322
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] "%d dag"
 msgstr[1] "%d dae"
 
-#: ../libpurple/util.c:3272
+#: ../libpurple/util.c:3330
 #, c-format
 msgid "%s, %d hour"
 msgid_plural "%s, %d hours"
 msgstr[0] "%s, %d uur"
 msgstr[1] "%s, %d ure"
 
-#: ../libpurple/util.c:3278
+#: ../libpurple/util.c:3336
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d uur"
 msgstr[1] "%d ure"
 
-#: ../libpurple/util.c:3286
+#: ../libpurple/util.c:3344
 #, c-format
 msgid "%s, %d minute"
 msgid_plural "%s, %d minutes"
 msgstr[0] "%s, %d minuut"
 msgstr[1] "%s, %d minute"
 
-#: ../libpurple/util.c:3292
+#: ../libpurple/util.c:3350
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d minuut"
 msgstr[1] "%d minute"
 
-#: ../libpurple/util.c:3552
+#: ../libpurple/util.c:3610
 #, c-format
 msgid "Could not open %s: Redirected too many times"
 msgstr "Kon nie %s open nie: Te veel keer herlei"
 
-#: ../libpurple/util.c:3589 ../libpurple/util.c:3885
+#: ../libpurple/util.c:3647 ../libpurple/util.c:3943
 #, c-format
 msgid "Unable to connect to %s"
-msgstr "Kan nie verbind aan %s nie"
-
-#: ../libpurple/util.c:3712
+msgstr "Kan nie koppel aan %s nie"
+
+#: ../libpurple/util.c:3770
 #, c-format
 msgid ""
 "Unable to allocate enough memory to hold the contents from %s.  The web "
@@ -13464,20 +13460,20 @@
 "Kon nie genoeg geheue toeken om inhoud van %s te hou nie.  Die webbediener "
 "probeer dalk iets kwaadwilligs."
 
-#: ../libpurple/util.c:3747
+#: ../libpurple/util.c:3805
 #, c-format
 msgid "Error reading from %s: %s"
-msgstr "Fout met lees van %s: %s"
-
-#: ../libpurple/util.c:3778
+msgstr "Kon nie %s lees nie: %s"
+
+#: ../libpurple/util.c:3836
 #, c-format
 msgid "Error writing to %s: %s"
-msgstr "Fout met skryf na %s: %s"
-
-#: ../libpurple/util.c:3803
+msgstr "Kon nie %s skryf nie: %s"
+
+#: ../libpurple/util.c:3861
 #, c-format
 msgid "Unable to connect to %s: %s"
-msgstr "Kan nie verbind aan %s nie: %s"
+msgstr "Kan nie koppel aan %s nie: %s"
 
 #: ../pidgin.desktop.in.h:1
 msgid "Internet Messenger"
@@ -13491,80 +13487,80 @@
 msgid "Send instant messages over multiple protocols"
 msgstr "Stuur kitsboodskappe oor veelvoudige protokolle"
 
-#: ../pidgin/eggtrayicon.c:129
+#: ../pidgin/eggtrayicon.c:128
 msgid "Orientation"
 msgstr "Oriëntasie"
 
-#: ../pidgin/eggtrayicon.c:130
+#: ../pidgin/eggtrayicon.c:129
 msgid "The orientation of the tray."
 msgstr "Die oriëntasie van die laai."
 
 #. Build the login options frame.
-#: ../pidgin/gtkaccount.c:407
+#: ../pidgin/gtkaccount.c:410
 msgid "Login Options"
-msgstr "Aanmeldkeuses"
-
-#: ../pidgin/gtkaccount.c:428
+msgstr "Aanmeldopsies"
+
+#: ../pidgin/gtkaccount.c:431
 msgid "Pro_tocol:"
 msgstr "Pro_tokol:"
 
-#: ../pidgin/gtkaccount.c:439
+#: ../pidgin/gtkaccount.c:442
 msgid "Screen _name:"
 msgstr "Skerm_naam:"
 
-#: ../pidgin/gtkaccount.c:529
+#: ../pidgin/gtkaccount.c:532
 msgid "_Local alias:"
 msgstr "_Plaaslike alias:"
 
-#: ../pidgin/gtkaccount.c:533
+#: ../pidgin/gtkaccount.c:536
 msgid "Remember pass_word"
 msgstr "Onthou wag_woord"
 
 #. Build the user options frame.
-#: ../pidgin/gtkaccount.c:591
+#: ../pidgin/gtkaccount.c:594
 msgid "User Options"
-msgstr "Gebruikerkeuses"
-
-#: ../pidgin/gtkaccount.c:604
+msgstr "Gebruikeropsies"
+
+#: ../pidgin/gtkaccount.c:607
 msgid "New _mail notifications"
 msgstr "Kennis_gewings vir nuwe pos"
 
 #. Buddy icon
-#: ../pidgin/gtkaccount.c:609
+#: ../pidgin/gtkaccount.c:612
 msgid "Use this buddy _icon for this account:"
 msgstr "Gebruik hierdie vriend_ikoon vir hierdie rekening:"
 
 #. Build the protocol options frame.
-#: ../pidgin/gtkaccount.c:731
+#: ../pidgin/gtkaccount.c:734
 #, c-format
 msgid "%s Options"
-msgstr "%s-keuses"
-
-#: ../pidgin/gtkaccount.c:936
+msgstr "%s-opsies"
+
+#: ../pidgin/gtkaccount.c:939
 msgid "Use GNOME Proxy Settings"
 msgstr "Gebruik GNOME se instaaninstellings"
 
-#: ../pidgin/gtkaccount.c:937
+#: ../pidgin/gtkaccount.c:940
 msgid "Use Global Proxy Settings"
 msgstr "Gebruik globale instaaninstellings"
 
-#: ../pidgin/gtkaccount.c:943
+#: ../pidgin/gtkaccount.c:946
 msgid "No Proxy"
 msgstr "Geen instaanbediener"
 
-#: ../pidgin/gtkaccount.c:949
+#: ../pidgin/gtkaccount.c:952
 msgid "HTTP"
 msgstr "HTTP"
 
-#: ../pidgin/gtkaccount.c:955
+#: ../pidgin/gtkaccount.c:958
 msgid "SOCKS 4"
 msgstr "SOCKS 4"
 
-#: ../pidgin/gtkaccount.c:961
+#: ../pidgin/gtkaccount.c:964
 msgid "SOCKS 5"
 msgstr "SOCKS 5"
 
-#: ../pidgin/gtkaccount.c:967 ../pidgin/gtkprefs.c:1211
+#: ../pidgin/gtkaccount.c:970 ../pidgin/gtkprefs.c:1283
 msgid "Use Environmental Settings"
 msgstr "Gebruik omgewinginstellings"
 
@@ -13573,73 +13569,72 @@
 #. A) your network is really slow and you have nothing better to do than
 #. look at butterflies.
 #. B)You are looking really closely at something that shouldn't matter.
-#: ../pidgin/gtkaccount.c:1006
+#: ../pidgin/gtkaccount.c:1009
 msgid "If you look real closely"
 msgstr "As mens stip kyk,"
 
 #. This is an easter egg. See the comment on the previous line in the source.
-#: ../pidgin/gtkaccount.c:1009
+#: ../pidgin/gtkaccount.c:1012
 msgid "you can see the butterflies mating"
 msgstr "kan mens skoenlappers sien paar"
 
-#: ../pidgin/gtkaccount.c:1030
+#: ../pidgin/gtkaccount.c:1033
 msgid "Proxy Options"
-msgstr "Instaankeuses"
-
-#: ../pidgin/gtkaccount.c:1044 ../pidgin/gtkprefs.c:1205
+msgstr "Instaanopsies"
+
+#: ../pidgin/gtkaccount.c:1047 ../pidgin/gtkprefs.c:1277
 msgid "Proxy _type:"
 msgstr "Instaan_tipes:"
 
-#: ../pidgin/gtkaccount.c:1053 ../pidgin/gtkprefs.c:1226
+#: ../pidgin/gtkaccount.c:1056 ../pidgin/gtkprefs.c:1298
 msgid "_Host:"
 msgstr "_Gasheer:"
 
-#: ../pidgin/gtkaccount.c:1057 ../pidgin/gtkprefs.c:1244
+#: ../pidgin/gtkaccount.c:1060 ../pidgin/gtkprefs.c:1316
 msgid "_Port:"
 msgstr "_Poort:"
 
-#: ../pidgin/gtkaccount.c:1065
+#: ../pidgin/gtkaccount.c:1068
 msgid "_Username:"
 msgstr "_Gebruikernaam:"
 
-#: ../pidgin/gtkaccount.c:1072 ../pidgin/gtkprefs.c:1281
+#: ../pidgin/gtkaccount.c:1075 ../pidgin/gtkprefs.c:1353
 msgid "Pa_ssword:"
 msgstr "_Wagwoord:"
 
-#: ../pidgin/gtkaccount.c:1195
-#, fuzzy
+#: ../pidgin/gtkaccount.c:1199
 msgid "Unable to save new account"
-msgstr "Kon nie verbinding skep nie"
-
-#: ../pidgin/gtkaccount.c:1196
+msgstr "Kan nie nuwe rekening stoor nie"
+
+#: ../pidgin/gtkaccount.c:1200
 msgid "An account already exists with the specified criteria."
-msgstr ""
-
-#: ../pidgin/gtkaccount.c:1473
+msgstr "'n Rekening bestaan reeds met die gespesifiseerde kriteria."
+
+#: ../pidgin/gtkaccount.c:1478
 msgid "Add Account"
 msgstr "Voeg rekening by"
 
-#: ../pidgin/gtkaccount.c:1492
+#: ../pidgin/gtkaccount.c:1497
 msgid "_Basic"
 msgstr "_Eenvoudig"
 
-#: ../pidgin/gtkaccount.c:1499
+#: ../pidgin/gtkaccount.c:1504
 msgid "Create this new account on the server"
-msgstr ""
-
-#: ../pidgin/gtkaccount.c:1515
+msgstr "Skep hierdie nuwe rekening op die bediener"
+
+#: ../pidgin/gtkaccount.c:1520
 msgid "_Advanced"
 msgstr "_Gevorderd"
 
-#: ../pidgin/gtkaccount.c:1973 ../pidgin/gtkplugin.c:569
+#: ../pidgin/gtkaccount.c:1978 ../pidgin/gtkplugin.c:595
 msgid "Enabled"
 msgstr "Geaktiveer"
 
-#: ../pidgin/gtkaccount.c:2001
+#: ../pidgin/gtkaccount.c:2006
 msgid "Protocol"
 msgstr "Protokol"
 
-#: ../pidgin/gtkaccount.c:2201
+#: ../pidgin/gtkaccount.c:2207
 #, c-format
 msgid ""
 "<span size='larger' weight='bold'>Welcome to %s!</span>\n"
@@ -13654,258 +13649,282 @@
 msgstr ""
 "<span size='larger' weight='bold'>Welkom by %s!</span>\n"
 "\n"
-"Daar is nog geen kletsrekeninge opgestel nie. Om met %s te kan verbind, druk "
-"op die <b>Voeg by</b>-knoppie hier onder en stel die eerste rekening op. "
-"Indien u wil hê %s moet aan verskeie rekeninge verbind, druk weer <b>Voeg "
-"by</b> om elkeen op te stel.\n"
+"Daar is nog geen kitsboodskap-rekeninge opgestel nie. Om met %s te kan "
+"koppel, druk op die <b>Voeg by</b>-knoppie hier onder en stel die eerste "
+"rekening op. Indien u wil hê %s moet aan verskeie rekeninge koppel, druk "
+"weer <b>Voeg by</b> om elkeen op te stel.\n"
 "\n"
 "U kan na hierdie venster terugkeer in die Vriendelys-venster by <b>Rekeninge-"
 ">Voeg by / wysig</b> om rekeninge by te voeg, te wysig of te verwyder"
 
-#: ../pidgin/gtkblist.c:767
-msgid "Join a Chat"
-msgstr "Sluit by geselsie aan"
-
-#: ../pidgin/gtkblist.c:788
+#: ../pidgin/gtkblist.c:527
+#, c-format
+msgid "You have %d contact named %s. Would you like to merge them?"
+msgid_plural ""
+"You currently have %d contacts named %s. Would you like to merge them?"
+msgstr[0] "Jy het %d kontak genaamd %s. Wil jy hom saamvoeg?"
+msgstr[1] "Jy het %d kontakte genaamd %s. Wil jy hulle saamvoeg?"
+
+#: ../pidgin/gtkblist.c:528
+msgid ""
+"Merging these contacts will cause them to share a single entry on the buddy "
+"list and use a single conversation window. You can separate them again by "
+"choosing 'Expand' from the contact's context menu"
+msgstr ""
+"As u hierdie kontakte saamvoeg, sal hulle 'n enkele inskrywing in die "
+"vriendelys hê en 'n enkele gespreksvenster gebruik. U kan hulle weer skei "
+"met 'Uitbrei' op die kontak-kontekskielys"
+
+#: ../pidgin/gtkblist.c:530
+msgid "_Merge"
+msgstr "_Versmeld"
+
+#: ../pidgin/gtkblist.c:945
 msgid ""
 "Please enter the appropriate information about the chat you would like to "
 "join.\n"
 msgstr ""
-"Gee asb. die gepaste inligting vir die geselsie waarby u wil aansluit.\n"
-
-#. Set up stuff for the account box
-#: ../pidgin/gtkblist.c:799 ../pidgin/gtkblist.c:5530
-#: ../pidgin/gtkblist.c:5893 ../pidgin/gtkpounce.c:539
-#: ../pidgin/gtkroomlist.c:396
+"Tik gerus die gepaste inligting vir die geselsie waarby u wil aansluit.\n"
+
+#: ../pidgin/gtkblist.c:956 ../pidgin/gtkblist.c:6267
+#: ../pidgin/gtkpounce.c:554 ../pidgin/gtkroomlist.c:396
 msgid "_Account:"
 msgstr "_Rekening:"
 
-#: ../pidgin/gtkblist.c:1088 ../pidgin/gtkprivacy.c:603
-#: ../pidgin/gtkprivacy.c:617
+#: ../pidgin/gtkblist.c:1245 ../pidgin/gtkprivacy.c:605
+#: ../pidgin/gtkprivacy.c:619
 msgid "_Block"
 msgstr "_Blokkeer"
 
-#: ../pidgin/gtkblist.c:1088
+#: ../pidgin/gtkblist.c:1245
 msgid "Un_block"
 msgstr "Ont_blokkeer"
 
-#: ../pidgin/gtkblist.c:1139
+#: ../pidgin/gtkblist.c:1288
+msgid "Move to"
+msgstr "Skuif na"
+
+#: ../pidgin/gtkblist.c:1328
 msgid "Get _Info"
 msgstr "_Inligting"
 
-#: ../pidgin/gtkblist.c:1142 ../pidgin/pidginstock.c:90
+#: ../pidgin/gtkblist.c:1331 ../pidgin/pidginstock.c:90
 msgid "I_M"
 msgstr "_Kitsklets"
 
-#: ../pidgin/gtkblist.c:1148
-#, fuzzy
-msgid "_Send File"
-msgstr "Stuur lêer"
-
-#: ../pidgin/gtkblist.c:1155
-msgid "Add Buddy _Pounce"
-msgstr "Voeg vriend_wag by"
-
-#: ../pidgin/gtkblist.c:1160 ../pidgin/gtkblist.c:1164
-#: ../pidgin/gtkblist.c:1269 ../pidgin/gtkblist.c:1292
+#: ../pidgin/gtkblist.c:1337
+msgid "_Send File..."
+msgstr "_Stuur lêer..."
+
+#: ../pidgin/gtkblist.c:1344
+msgid "Add Buddy _Pounce..."
+msgstr "Voeg vriend_wag by..."
+
+#: ../pidgin/gtkblist.c:1349 ../pidgin/gtkblist.c:1353
+#: ../pidgin/gtkblist.c:1468 ../pidgin/gtkblist.c:1491
 msgid "View _Log"
 msgstr "Bekyk _staaflêer"
 
-#: ../pidgin/gtkblist.c:1177 ../pidgin/gtkblist.c:1186
-#: ../pidgin/gtkblist.c:1277 ../pidgin/gtkblist.c:1298
+#: ../pidgin/gtkblist.c:1359
+msgid "Hide when offline"
+msgstr "Versteek terwyl vanlyn"
+
+#: ../pidgin/gtkblist.c:1359
+msgid "Show when offline"
+msgstr "Wys terwyl aanlyn"
+
+#: ../pidgin/gtkblist.c:1373 ../pidgin/gtkblist.c:1382
+#: ../pidgin/gtkblist.c:1476 ../pidgin/gtkblist.c:1497
 msgid "_Alias..."
 msgstr "_Alias..."
 
-#: ../pidgin/gtkblist.c:1180 ../pidgin/gtkblist.c:1188
-#: ../pidgin/gtkblist.c:1279 ../pidgin/gtkblist.c:1300
+#: ../pidgin/gtkblist.c:1376 ../pidgin/gtkblist.c:1384
+#: ../pidgin/gtkblist.c:1478 ../pidgin/gtkblist.c:1499
 msgid "_Remove"
 msgstr "_Verwyder"
 
-#: ../pidgin/gtkblist.c:1238
-msgid "Add a _Buddy"
-msgstr "Voeg 'n _vriend by"
-
-#: ../pidgin/gtkblist.c:1241
-msgid "Add a C_hat"
-msgstr "Voeg 'n _gesprek by"
-
-#: ../pidgin/gtkblist.c:1244
+#: ../pidgin/gtkblist.c:1434
+msgid "Add _Buddy..."
+msgstr "Voeg _vried by..."
+
+#: ../pidgin/gtkblist.c:1437
+msgid "Add C_hat..."
+msgstr "Voeg _geselsie by..."
+
+#: ../pidgin/gtkblist.c:1440
 msgid "_Delete Group"
 msgstr "_Vee groep uit"
 
-#: ../pidgin/gtkblist.c:1246
+#: ../pidgin/gtkblist.c:1442
 msgid "_Rename"
 msgstr "_Hernoem"
 
 #. join button
-#: ../pidgin/gtkblist.c:1265 ../pidgin/gtkroomlist.c:307
+#: ../pidgin/gtkblist.c:1462 ../pidgin/gtkroomlist.c:307
 #: ../pidgin/gtkroomlist.c:460 ../pidgin/pidginstock.c:88
 msgid "_Join"
 msgstr "_Sluit aan"
 
-#: ../pidgin/gtkblist.c:1267
+#: ../pidgin/gtkblist.c:1464
 msgid "Auto-Join"
 msgstr "Outoaansluit"
 
-#: ../pidgin/gtkblist.c:1305 ../pidgin/gtkblist.c:1329
+#: ../pidgin/gtkblist.c:1466
+msgid "Persistent"
+msgstr "Aanhoudend"
+
+#: ../pidgin/gtkblist.c:1504 ../pidgin/gtkblist.c:1527
 msgid "_Collapse"
 msgstr "_Vou toe"
 
-#: ../pidgin/gtkblist.c:1334
+#: ../pidgin/gtkblist.c:1532
 msgid "_Expand"
 msgstr "_Vou oop"
 
-#: ../pidgin/gtkblist.c:1585 ../pidgin/gtkblist.c:1597
-#: ../pidgin/gtkblist.c:4603 ../pidgin/gtkblist.c:4616
+#: ../pidgin/gtkblist.c:1783 ../pidgin/gtkblist.c:1795
+#: ../pidgin/gtkblist.c:4950 ../pidgin/gtkblist.c:4963
 msgid "/Tools/Mute Sounds"
-msgstr "Demp klanke"
-
-#: ../pidgin/gtkblist.c:2057 ../pidgin/gtkconv.c:4840
-#: ../pidgin/gtkpounce.c:430
+msgstr "Doof klanke"
+
+#: ../pidgin/gtkblist.c:2255 ../pidgin/gtkconv.c:4922
+#: ../pidgin/gtkpounce.c:437
 msgid ""
 "You are not currently signed on with an account that can add that buddy."
 msgstr "U is tans aangemeld met 'n rekening wat daardie vriend kan byvoeg."
 
 #. Buddies menu
-#: ../pidgin/gtkblist.c:2869
+#: ../pidgin/gtkblist.c:3087
 msgid "/_Buddies"
 msgstr "_Vriende"
 
-#: ../pidgin/gtkblist.c:2870
+#: ../pidgin/gtkblist.c:3088
 msgid "/Buddies/New Instant _Message..."
 msgstr "Nuwe _kitsboodskap..."
 
-#: ../pidgin/gtkblist.c:2871
+#: ../pidgin/gtkblist.c:3089
 msgid "/Buddies/Join a _Chat..."
 msgstr "Sluit by _geselsie aan..."
 
-#: ../pidgin/gtkblist.c:2872
+#: ../pidgin/gtkblist.c:3090
 msgid "/Buddies/Get User _Info..."
 msgstr "Kry gebruiker_inligting..."
 
-#: ../pidgin/gtkblist.c:2873
+#: ../pidgin/gtkblist.c:3091
 msgid "/Buddies/View User _Log..."
 msgstr "Bekyk gebruiker se staaf_lêer..."
 
-#: ../pidgin/gtkblist.c:2875
-#, fuzzy
-msgid "/Buddies/Show"
-msgstr "_Vriende"
-
-#: ../pidgin/gtkblist.c:2876
-#, fuzzy
+#: ../pidgin/gtkblist.c:3093
+msgid "/Buddies/Sh_ow"
+msgstr "_Wys"
+
+#: ../pidgin/gtkblist.c:3094
 msgid "/Buddies/Show/_Offline Buddies"
-msgstr "Wys a_flynvriende"
-
-#: ../pidgin/gtkblist.c:2877
-#, fuzzy
+msgstr "A_flynvriende"
+
+#: ../pidgin/gtkblist.c:3095
 msgid "/Buddies/Show/_Empty Groups"
-msgstr "Wys _leë groepe"
-
-#: ../pidgin/gtkblist.c:2878
-#, fuzzy
+msgstr "_Leë groepe"
+
+#: ../pidgin/gtkblist.c:3096
 msgid "/Buddies/Show/Buddy _Details"
-msgstr "Wys vriend_detail"
-
-#: ../pidgin/gtkblist.c:2879
-#, fuzzy
+msgstr "Vriend_details"
+
+#: ../pidgin/gtkblist.c:3097
 msgid "/Buddies/Show/Idle _Times"
-msgstr "Wys ledige _tye"
-
-#: ../pidgin/gtkblist.c:2880
-#, fuzzy
+msgstr "Ledige _tye"
+
+#: ../pidgin/gtkblist.c:3098
 msgid "/Buddies/Show/_Protocol Icons"
-msgstr "Wys _leë groepe"
-
-#: ../pidgin/gtkblist.c:2881
+msgstr "_Protokolikone"
+
+#: ../pidgin/gtkblist.c:3099
 msgid "/Buddies/_Sort Buddies"
-msgstr "_Sorteer vriende"
-
-#: ../pidgin/gtkblist.c:2883
+msgstr "_Rangskik vriende"
+
+#: ../pidgin/gtkblist.c:3101
 msgid "/Buddies/_Add Buddy..."
 msgstr "Voeg _vriend by..."
 
-#: ../pidgin/gtkblist.c:2884
+#: ../pidgin/gtkblist.c:3102
 msgid "/Buddies/Add C_hat..."
 msgstr "Voeg gese_lsie by..."
 
-#: ../pidgin/gtkblist.c:2885
+#: ../pidgin/gtkblist.c:3103
 msgid "/Buddies/Add _Group..."
 msgstr "Voeg _groep by..."
 
-#: ../pidgin/gtkblist.c:2887
+#: ../pidgin/gtkblist.c:3105
 msgid "/Buddies/_Quit"
 msgstr "_Sluit af"
 
 #. Accounts menu
-#: ../pidgin/gtkblist.c:2890
+#: ../pidgin/gtkblist.c:3108
 msgid "/_Accounts"
 msgstr "_Rekeninge"
 
-#: ../pidgin/gtkblist.c:2891 ../pidgin/gtkblist.c:6589
-msgid "/Accounts/Add\\/Edit"
-msgstr "Voeg by \\/ wysig"
+#: ../pidgin/gtkblist.c:3109 ../pidgin/gtkblist.c:6969
+msgid "/Accounts/Manage"
+msgstr "Bestuur"
 
 #. Tools
-#: ../pidgin/gtkblist.c:2894
+#: ../pidgin/gtkblist.c:3112
 msgid "/_Tools"
-msgstr "_Gereedskap"
-
-#: ../pidgin/gtkblist.c:2895
+msgstr "_Nutsgoed"
+
+#: ../pidgin/gtkblist.c:3113
 msgid "/Tools/Buddy _Pounces"
 msgstr "Vriend_wagte"
 
-#: ../pidgin/gtkblist.c:2896
-#, fuzzy
+#: ../pidgin/gtkblist.c:3114
 msgid "/Tools/_Certificates"
-msgstr "_Voorkeure"
-
-#: ../pidgin/gtkblist.c:2897
+msgstr "_Sertifikate"
+
+#: ../pidgin/gtkblist.c:3115
 msgid "/Tools/Plu_gins"
 msgstr "_Inproppe"
 
-#: ../pidgin/gtkblist.c:2898
+#: ../pidgin/gtkblist.c:3116
 msgid "/Tools/Pr_eferences"
 msgstr "_Voorkeure"
 
-#: ../pidgin/gtkblist.c:2899
+#: ../pidgin/gtkblist.c:3117
 msgid "/Tools/Pr_ivacy"
 msgstr "_Privaatheid"
 
-#: ../pidgin/gtkblist.c:2901
+#: ../pidgin/gtkblist.c:3119
 msgid "/Tools/_File Transfers"
 msgstr "_Lêeroordragte"
 
-#: ../pidgin/gtkblist.c:2902
+#: ../pidgin/gtkblist.c:3120
 msgid "/Tools/R_oom List"
 msgstr "_Kamerlys"
 
-#: ../pidgin/gtkblist.c:2903
+#: ../pidgin/gtkblist.c:3121
 msgid "/Tools/System _Log"
 msgstr "Stelselstaaf_lêer"
 
-#: ../pidgin/gtkblist.c:2905
+#: ../pidgin/gtkblist.c:3123
 msgid "/Tools/Mute _Sounds"
-msgstr "Demp _klanke"
+msgstr "Doof _klanke"
 
 #. Help
-#: ../pidgin/gtkblist.c:2907
+#: ../pidgin/gtkblist.c:3125
 msgid "/_Help"
 msgstr "_Hulp"
 
-#: ../pidgin/gtkblist.c:2908
+#: ../pidgin/gtkblist.c:3126
 msgid "/Help/Online _Help"
 msgstr "_Hulp aanlyn"
 
-#: ../pidgin/gtkblist.c:2909
+#: ../pidgin/gtkblist.c:3127
 msgid "/Help/_Debug Window"
 msgstr "_Ontfoutvenster"
 
-#: ../pidgin/gtkblist.c:2911 ../pidgin/gtkblist.c:2913
+#: ../pidgin/gtkblist.c:3129 ../pidgin/gtkblist.c:3131
 msgid "/Help/_About"
 msgstr "_Aangaande"
 
-#: ../pidgin/gtkblist.c:2942
+#: ../pidgin/gtkblist.c:3160
 #, c-format
 msgid ""
 "\n"
@@ -13914,251 +13933,254 @@
 "\n"
 "<b>Rekening:</b> %s"
 
-#: ../pidgin/gtkblist.c:3020
+#: ../pidgin/gtkblist.c:3238
 msgid "Buddy Alias"
 msgstr "Vriendalias"
 
-#: ../pidgin/gtkblist.c:3049
+#: ../pidgin/gtkblist.c:3267
 msgid "Logged In"
 msgstr "Aangemeld"
 
-#: ../pidgin/gtkblist.c:3095
+#: ../pidgin/gtkblist.c:3313
 msgid "Last Seen"
 msgstr "Laas gesien"
 
-#: ../pidgin/gtkblist.c:3116
+#: ../pidgin/gtkblist.c:3334
 msgid "Spooky"
 msgstr "Vreemd"
 
-#: ../pidgin/gtkblist.c:3118
+#: ../pidgin/gtkblist.c:3336
 msgid "Awesome"
 msgstr "Asemrowend"
 
-#: ../pidgin/gtkblist.c:3120
+#: ../pidgin/gtkblist.c:3338
 msgid "Rockin'"
 msgstr "Aitsa"
 
-#: ../pidgin/gtkblist.c:3453
+#: ../pidgin/gtkblist.c:3677
 #, c-format
 msgid "Idle %dd %dh %02dm"
 msgstr "Ledig %dd %dh %02dm"
 
-#: ../pidgin/gtkblist.c:3455
+#: ../pidgin/gtkblist.c:3679
 #, c-format
 msgid "Idle %dh %02dm"
 msgstr "Ledig %dh %02dm"
 
-#: ../pidgin/gtkblist.c:3457
+#: ../pidgin/gtkblist.c:3681
 #, c-format
 msgid "Idle %dm"
 msgstr "Ledig %dm"
 
-#: ../pidgin/gtkblist.c:3602
+#: ../pidgin/gtkblist.c:3835
 msgid "/Buddies/New Instant Message..."
 msgstr "Nuwe kitsboodskap..."
 
-#: ../pidgin/gtkblist.c:3603 ../pidgin/gtkblist.c:3636
+#: ../pidgin/gtkblist.c:3836 ../pidgin/gtkblist.c:3869
 msgid "/Buddies/Join a Chat..."
 msgstr "Sluit by geselsie aan..."
 
-#: ../pidgin/gtkblist.c:3604
+#: ../pidgin/gtkblist.c:3837
 msgid "/Buddies/Get User Info..."
 msgstr "Kry gebruikerinligting..."
 
-#: ../pidgin/gtkblist.c:3605
+#: ../pidgin/gtkblist.c:3838
 msgid "/Buddies/Add Buddy..."
 msgstr "Voeg vriend by..."
 
-#: ../pidgin/gtkblist.c:3606 ../pidgin/gtkblist.c:3639
+#: ../pidgin/gtkblist.c:3839 ../pidgin/gtkblist.c:3872
 msgid "/Buddies/Add Chat..."
 msgstr "Voeg geselsie by..."
 
-#: ../pidgin/gtkblist.c:3607
+#: ../pidgin/gtkblist.c:3840
 msgid "/Buddies/Add Group..."
 msgstr "Voeg groep by..."
 
-#: ../pidgin/gtkblist.c:3642
+#: ../pidgin/gtkblist.c:3875
 msgid "/Tools/Privacy"
 msgstr "Privaatheid"
 
-#: ../pidgin/gtkblist.c:3645
+#: ../pidgin/gtkblist.c:3878
 msgid "/Tools/Room List"
 msgstr "Kamerlys"
 
-#: ../pidgin/gtkblist.c:3742 ../pidgin/gtkdocklet.c:153
+#: ../pidgin/gtkblist.c:4010 ../pidgin/gtkdocklet.c:155
+#: ../pidgin/gtkdocklet.c:160
 #, c-format
 msgid "%d unread message from %s\n"
 msgid_plural "%d unread messages from %s\n"
 msgstr[0] "%d ongelese boodskap van %s\n"
 msgstr[1] "%d ongelese boodskappe van %s\n"
 
-#: ../pidgin/gtkblist.c:3822
+#: ../pidgin/gtkblist.c:4170
 msgid "Manually"
 msgstr "Handmatig"
 
-#: ../pidgin/gtkblist.c:3824
-msgid "Alphabetically"
-msgstr "Alfabeties"
-
-#: ../pidgin/gtkblist.c:3825
+#: ../pidgin/gtkblist.c:4173
 msgid "By status"
 msgstr "Volgens status"
 
-#: ../pidgin/gtkblist.c:3826
+#: ../pidgin/gtkblist.c:4174
 msgid "By log size"
 msgstr "Volgens staaflêergrootte"
 
-#: ../pidgin/gtkblist.c:4031 ../pidgin/gtkconn.c:179
+#: ../pidgin/gtkblist.c:4379 ../pidgin/gtkconn.c:180
 #, c-format
 msgid "%s disconnected"
-msgstr "%s afgesny"
-
-#: ../pidgin/gtkblist.c:4067
+msgstr "%s ontkoppel"
+
+#: ../pidgin/gtkblist.c:4414
 #, c-format
 msgid "<span color=\"red\">%s disconnected: %s</span>"
-msgstr "<span color=\"red\">%s afgesny: %s</span>"
-
-#: ../pidgin/gtkblist.c:4219
+msgstr "<span color=\"red\">%s ontkoppel: %s</span>"
+
+#: ../pidgin/gtkblist.c:4566
 msgid "<b>Username:</b>"
 msgstr "<b>Gebruikernaam:</b>"
 
-#: ../pidgin/gtkblist.c:4226
+#: ../pidgin/gtkblist.c:4573
 msgid "<b>Password:</b>"
 msgstr "<b>Wagwoord:</b>"
 
-#: ../pidgin/gtkblist.c:4237
+#: ../pidgin/gtkblist.c:4584
 msgid "_Login"
 msgstr "_Meld aan"
 
-#: ../pidgin/gtkblist.c:4320
+#: ../pidgin/gtkblist.c:4667
 msgid "/Accounts"
 msgstr "Rekeninge"
 
 #. Translators: Please maintain the use of -> and <- to refer to menu heirarchy
-#: ../pidgin/gtkblist.c:4334
-#, fuzzy, c-format
+#: ../pidgin/gtkblist.c:4681
+#, c-format
 msgid ""
 "<span weight='bold' size='larger'>Welcome to %s!</span>\n"
 "\n"
 "You have no accounts enabled. Enable your IM accounts from the <b>Accounts</"
-"b> window at <b>Accounts->Add/Edit</b>. Once you enable accounts, you'll be "
+"b> window at <b>Accounts->Manage</b>. Once you enable accounts, you'll be "
 "able to sign on, set your status, and talk to your friends."
 msgstr ""
 "<span weight='bold' size='larger'>Welkom by %s!</span>\n"
 "\n"
-"Daar is geen rekeninge geaktiveer nie. Aktiveer die kletsrekeninge by die "
-"<b>Rekeninge</b>-venster by <b>Rekeninge->Voeg by / wysig</b>. Sodra "
-"rekeninge geaktiveer is, kan mens aanmeld, mens se status stel en met "
-"vriende gesels."
+"Daar is geen rekeninge geaktiveer nie. Aktiveer die kitsboodskaprekeninge op "
+"die <b>Rekeninge</b>-venster by <b>Rekeninge->Bestuur</b>. Sodra rekeninge "
+"geaktiveer is, kan mens aanmeld, mens se status stel en met vriende gesels."
 
 #. set the Show Offline Buddies option. must be done
 #. * after the treeview or faceprint gets mad. -Robot101
 #.
-#: ../pidgin/gtkblist.c:4597
-#, fuzzy
+#: ../pidgin/gtkblist.c:4944
 msgid "/Buddies/Show/Offline Buddies"
-msgstr "Wys aflynvriende"
-
-#: ../pidgin/gtkblist.c:4600
-#, fuzzy
+msgstr "Vanlynvriende"
+
+#: ../pidgin/gtkblist.c:4947
 msgid "/Buddies/Show/Empty Groups"
-msgstr "Wys leë groepe"
-
-#: ../pidgin/gtkblist.c:4606
-#, fuzzy
+msgstr "Leë groepe"
+
+#: ../pidgin/gtkblist.c:4953
 msgid "/Buddies/Show/Buddy Details"
-msgstr "Wys vrienddetail"
-
-#: ../pidgin/gtkblist.c:4609
-#, fuzzy
+msgstr "Vrienddetails"
+
+#: ../pidgin/gtkblist.c:4956
 msgid "/Buddies/Show/Idle Times"
-msgstr "Wys ledige tye"
-
-#: ../pidgin/gtkblist.c:4612
-#, fuzzy
+msgstr "Ledige tye"
+
+#: ../pidgin/gtkblist.c:4959
 msgid "/Buddies/Show/Protocol Icons"
-msgstr "Wys leë groepe"
-
-#: ../pidgin/gtkblist.c:5507
+msgstr "Protokolikone"
+
+#: ../pidgin/gtkblist.c:5873
 msgid ""
 "Please enter the screen name of the person you would like to add to your "
 "buddy list. You may optionally enter an alias, or nickname,  for the buddy. "
 "The alias will be displayed in place of the screen name whenever possible.\n"
 msgstr ""
-"Gee asb. die skermnaam van die persoon wat by die vriendelys gevoeg word. U "
+"Tik gerus die skermnaam van die persoon wat by die vriendelys gevoeg word. U "
 "kan 'n alias of bynaam vir die vriend gebruik as u wil.  Die alias sal in "
-"die plek van die skermnaam gebruik word wanneer moontlik.\n"
+"die plek van die skermnaam gewys word wanneer moontlik.\n"
+
+#. Set up stuff for the account box
+#: ../pidgin/gtkblist.c:5896
+msgid "A_ccount:"
+msgstr "_Rekening:"
 
 #. End of account box
-#: ../pidgin/gtkblist.c:5542
+#: ../pidgin/gtkblist.c:5908
 msgid "_Screen name:"
 msgstr "_Skermnaam:"
 
-#: ../pidgin/gtkblist.c:5564 ../pidgin/gtkblist.c:5914
+#: ../pidgin/gtkblist.c:5930 ../pidgin/gtkblist.c:6288
 msgid "A_lias:"
 msgstr "A_lias:"
 
-#: ../pidgin/gtkblist.c:5826
+#: ../pidgin/gtkblist.c:6198
 msgid "This protocol does not support chat rooms."
 msgstr "Hierdie protokol ondersteun nie geselsiekamers nie."
 
-#: ../pidgin/gtkblist.c:5842
+#: ../pidgin/gtkblist.c:6214
 msgid ""
 "You are not currently signed on with any protocols that have the ability to "
 "chat."
 msgstr "U is nie tans aangemeld met enige protokol met geselsiefasiliteit nie."
 
-#: ../pidgin/gtkblist.c:5883
+#: ../pidgin/gtkblist.c:6257
 msgid ""
 "Please enter an alias, and the appropriate information about the chat you "
 "would like to add to your buddy list.\n"
 msgstr ""
-"Gee asb. 'n alias en die geskikte inligting oor die geselsie wat u by die "
+"Tik gerus 'n alias en die geskikte inligting oor die geselsie wat u by die "
 "vriendelys wil voeg.\n"
 
-#: ../pidgin/gtkblist.c:5964
+#: ../pidgin/gtkblist.c:6316
+msgid "Autojoin when account becomes online."
+msgstr "Sluit outomaties aan waneer rekening aanlyn kom."
+
+#: ../pidgin/gtkblist.c:6317
+msgid "Hide chat when the window is closed."
+msgstr "Versteek geselsie wanneer venster gesluit word."
+
+#: ../pidgin/gtkblist.c:6343
 msgid "Please enter the name of the group to be added."
-msgstr "Gee asb. die naam van die groep om by te voeg."
-
-#: ../pidgin/gtkblist.c:6609
+msgstr "Tik gerus die naam van die groep om by te voeg."
+
+#: ../pidgin/gtkblist.c:6989
 msgid "<PurpleMain>/Accounts/"
 msgstr "<PurpleMain>/Rekeninge/"
 
-#: ../pidgin/gtkblist.c:6633
+#: ../pidgin/gtkblist.c:7013
 msgid "_Edit Account"
 msgstr "_Wysig rekening"
 
-#: ../pidgin/gtkblist.c:6646 ../pidgin/gtkconv.c:3073
+#: ../pidgin/gtkblist.c:7026 ../pidgin/gtkconv.c:3146
 msgid "No actions available"
 msgstr "Geen aksies beskikbaar nie"
 
-#: ../pidgin/gtkblist.c:6654
+#: ../pidgin/gtkblist.c:7034
 msgid "_Disable"
 msgstr "_Deaktiveer"
 
-#: ../pidgin/gtkblist.c:6666
+#: ../pidgin/gtkblist.c:7046
 msgid "Enable Account"
 msgstr "Aktiveer rekening"
 
-#: ../pidgin/gtkblist.c:6672
+#: ../pidgin/gtkblist.c:7052
 msgid "<PurpleMain>/Accounts/Enable Account"
 msgstr "<PurpleMain>/Rekeninge/Aktiveer rekening"
 
-#: ../pidgin/gtkblist.c:6721
+#: ../pidgin/gtkblist.c:7101
 msgid "/Tools"
-msgstr "Gereedskap"
-
-#: ../pidgin/gtkblist.c:6791
+msgstr "Nutsgoed"
+
+#: ../pidgin/gtkblist.c:7171
 msgid "/Buddies/Sort Buddies"
-msgstr "Sorteer vriende"
+msgstr "Rangskik vriende"
 
 #. Widget creation function
-#: ../pidgin/gtkcertmgr.c:530
-#, fuzzy
+#: ../pidgin/gtkcertmgr.c:531
 msgid "SSL Servers"
-msgstr "Bediener"
-
-#: ../pidgin/gtkconn.c:180
+msgstr "SSL-bedieners"
+
+#: ../pidgin/gtkconn.c:181
 #, c-format
 msgid ""
 "%s\n"
@@ -14168,452 +14190,447 @@
 msgstr ""
 "%s\n"
 "\n"
-"%s sal eers weer probeer verbind nadat u die fout reggemaak het en die "
-"rekening geheraktiveer het."
-
-#: ../pidgin/gtkconv.c:482
+"%s sal nie probeer herkoppel voor u die fout reggemaak het en die rekening "
+"heraktiveer het nie."
+
+#: ../pidgin/gtkconv.c:524
 msgid "Unknown command."
-msgstr "Onbekende opdrag."
-
-#: ../pidgin/gtkconv.c:754 ../pidgin/gtkconv.c:780
+msgstr "Onbekende bevel."
+
+#: ../pidgin/gtkconv.c:796 ../pidgin/gtkconv.c:822
 msgid "That buddy is not on the same protocol as this chat."
 msgstr "Daardie vriend is nie op die selfde protokol as hierdie geselsie nie."
 
-#: ../pidgin/gtkconv.c:774
+#: ../pidgin/gtkconv.c:816
 msgid ""
 "You are not currently signed on with an account that can invite that buddy."
 msgstr ""
 "U is nie tans aangemeld met 'n rekening wat daardie vriend kan nooi nie."
 
-#: ../pidgin/gtkconv.c:827
+#: ../pidgin/gtkconv.c:869
 msgid "Invite Buddy Into Chat Room"
 msgstr "Nooi vriend na geselsiekamer"
 
 #. Put our happy label in it.
-#: ../pidgin/gtkconv.c:857
+#: ../pidgin/gtkconv.c:899
 msgid ""
 "Please enter the name of the user you wish to invite, along with an optional "
 "invite message."
 msgstr ""
-"Gee asb. die naam van die gebruiker om uit te nooi, saam met 'n opsionele "
+"Tik gerus die naam van die gebruiker om uit te nooi, saam met 'n opsionele "
 "uitnodigingsboodskap."
 
-#: ../pidgin/gtkconv.c:878
+#: ../pidgin/gtkconv.c:920
 msgid "_Buddy:"
 msgstr "_Vriend:"
 
-#: ../pidgin/gtkconv.c:889 ../pidgin/gtksavedstatuses.c:1194
-#: ../pidgin/gtksavedstatuses.c:1528
+#: ../pidgin/gtkconv.c:931 ../pidgin/gtksavedstatuses.c:1200
+#: ../pidgin/gtksavedstatuses.c:1536
 msgid "_Message:"
 msgstr "_Boodskap:"
 
-#: ../pidgin/gtkconv.c:947 ../pidgin/gtkconv.c:2598 ../pidgin/gtkdebug.c:219
-#: ../pidgin/gtkft.c:543
-msgid "Unable to open file."
-msgstr "Kan nie lêer open nie."
-
-#: ../pidgin/gtkconv.c:953
+#: ../pidgin/gtkconv.c:995
 #, c-format
 msgid "<h1>Conversation with %s</h1>\n"
 msgstr "<h1>Gesprek met %s</h1>\n"
 
-#: ../pidgin/gtkconv.c:991
+#: ../pidgin/gtkconv.c:1033
 msgid "Save Conversation"
 msgstr "Stoor gesprek"
 
-#: ../pidgin/gtkconv.c:1140 ../pidgin/gtkdebug.c:167 ../pidgin/gtkdebug.c:743
+#: ../pidgin/gtkconv.c:1179 ../pidgin/gtkdebug.c:168 ../pidgin/gtkdebug.c:748
 msgid "Find"
-msgstr "Soek"
-
-#: ../pidgin/gtkconv.c:1166 ../pidgin/gtkdebug.c:195
+msgstr "Vind"
+
+#: ../pidgin/gtkconv.c:1205 ../pidgin/gtkdebug.c:196
 msgid "_Search for:"
 msgstr "_Soek vir:"
 
-#: ../pidgin/gtkconv.c:1622
+#: ../pidgin/gtkconv.c:1676
 msgid "Un-Ignore"
 msgstr "On-ignoreer"
 
-#: ../pidgin/gtkconv.c:1625
+#: ../pidgin/gtkconv.c:1679
 msgid "Ignore"
 msgstr "Ignoreer"
 
-#: ../pidgin/gtkconv.c:1645
+#: ../pidgin/gtkconv.c:1699
 msgid "Get Away Message"
 msgstr "Kry Weg-boodskap"
 
-#: ../pidgin/gtkconv.c:1668
+#: ../pidgin/gtkconv.c:1722
 msgid "Last said"
 msgstr "Laaste gesê"
 
-#: ../pidgin/gtkconv.c:2606
+#: ../pidgin/gtkconv.c:2671
 msgid "Unable to save icon file to disk."
 msgstr "Kan nie ikoonlêer op skyf stoor nie."
 
-#: ../pidgin/gtkconv.c:2657
+#: ../pidgin/gtkconv.c:2722
 msgid "Save Icon"
 msgstr "Stoor ikoon"
 
-#: ../pidgin/gtkconv.c:2709
+#: ../pidgin/gtkconv.c:2774
 msgid "Animate"
 msgstr "Animeer"
 
-#: ../pidgin/gtkconv.c:2714
+#: ../pidgin/gtkconv.c:2779
 msgid "Hide Icon"
 msgstr "Versteek ikoon"
 
-#: ../pidgin/gtkconv.c:2717
+#: ../pidgin/gtkconv.c:2782
 msgid "Save Icon As..."
 msgstr "Stoor ikoon as..."
 
-#: ../pidgin/gtkconv.c:2721
+#: ../pidgin/gtkconv.c:2786
 msgid "Set Custom Icon..."
 msgstr "Stel eie ikoon..."
 
-#: ../pidgin/gtkconv.c:2734
+#: ../pidgin/gtkconv.c:2799
 msgid "Remove Custom Icon"
 msgstr "Verwyder eie ikoon"
 
-#: ../pidgin/gtkconv.c:2861
+#: ../pidgin/gtkconv.c:2931
 msgid "Show All"
-msgstr ""
+msgstr "Wys alles"
 
 #. Conversation menu
-#: ../pidgin/gtkconv.c:2880
+#: ../pidgin/gtkconv.c:2950
 msgid "/_Conversation"
 msgstr "_Gesprek"
 
-#: ../pidgin/gtkconv.c:2882
+#: ../pidgin/gtkconv.c:2952
 msgid "/Conversation/New Instant _Message..."
 msgstr "Nuwe _kitsboodskap..."
 
-#: ../pidgin/gtkconv.c:2887
+#: ../pidgin/gtkconv.c:2957
 msgid "/Conversation/_Find..."
 msgstr "_Vind..."
 
-#: ../pidgin/gtkconv.c:2889
+#: ../pidgin/gtkconv.c:2959
 msgid "/Conversation/View _Log"
 msgstr "Bekyk staaf_lêer"
 
-#: ../pidgin/gtkconv.c:2890
+#: ../pidgin/gtkconv.c:2960
 msgid "/Conversation/_Save As..."
 msgstr "_Stoor as..."
 
-#: ../pidgin/gtkconv.c:2892
+#: ../pidgin/gtkconv.c:2962
 msgid "/Conversation/Clea_r Scrollback"
 msgstr "Maak gesprekvenster skoo_n"
 
-#: ../pidgin/gtkconv.c:2896
+#: ../pidgin/gtkconv.c:2966
 msgid "/Conversation/Se_nd File..."
 msgstr "S_tuur lêer..."
 
-#: ../pidgin/gtkconv.c:2897
+#: ../pidgin/gtkconv.c:2967
 msgid "/Conversation/Add Buddy _Pounce..."
 msgstr "Voeg vriend_wag by..."
 
-#: ../pidgin/gtkconv.c:2899
+#: ../pidgin/gtkconv.c:2969
 msgid "/Conversation/_Get Info"
 msgstr "_Kry inligting"
 
-#: ../pidgin/gtkconv.c:2901
+#: ../pidgin/gtkconv.c:2971
 msgid "/Conversation/In_vite..."
 msgstr "_Nooi uit..."
 
-#: ../pidgin/gtkconv.c:2903
+#: ../pidgin/gtkconv.c:2973
 msgid "/Conversation/M_ore"
 msgstr "_Meer"
 
-#: ../pidgin/gtkconv.c:2907
+#: ../pidgin/gtkconv.c:2977
 msgid "/Conversation/Al_ias..."
 msgstr "_Alias..."
 
-#: ../pidgin/gtkconv.c:2909
+#: ../pidgin/gtkconv.c:2979
 msgid "/Conversation/_Block..."
 msgstr "_Blokkeer..."
 
-#: ../pidgin/gtkconv.c:2911
+#: ../pidgin/gtkconv.c:2981
 msgid "/Conversation/_Unblock..."
 msgstr "_Ontblokkeer..."
 
-#: ../pidgin/gtkconv.c:2913
+#: ../pidgin/gtkconv.c:2983
 msgid "/Conversation/_Add..."
 msgstr "_Voeg by..."
 
-#: ../pidgin/gtkconv.c:2915
+#: ../pidgin/gtkconv.c:2985
 msgid "/Conversation/_Remove..."
 msgstr "Ve_rwyder..."
 
-#: ../pidgin/gtkconv.c:2920
+#: ../pidgin/gtkconv.c:2990
 msgid "/Conversation/Insert Lin_k..."
 msgstr "Voeg s_kakel in..."
 
-#: ../pidgin/gtkconv.c:2922
+#: ../pidgin/gtkconv.c:2992
 msgid "/Conversation/Insert Imag_e..."
 msgstr "Voeg pr_entjie in..."
 
-#: ../pidgin/gtkconv.c:2928
+#: ../pidgin/gtkconv.c:2998
 msgid "/Conversation/_Close"
 msgstr "Slui_t"
 
 #. Options
-#: ../pidgin/gtkconv.c:2932
+#: ../pidgin/gtkconv.c:3002
 msgid "/_Options"
-msgstr "_Keuses"
-
-#: ../pidgin/gtkconv.c:2933
+msgstr "_Opsies"
+
+#: ../pidgin/gtkconv.c:3003
 msgid "/Options/Enable _Logging"
 msgstr "Aktiveer _boekstawing"
 
-#: ../pidgin/gtkconv.c:2934
+#: ../pidgin/gtkconv.c:3004
 msgid "/Options/Enable _Sounds"
 msgstr "Aktiveer _klanke"
 
-#: ../pidgin/gtkconv.c:2936
+#: ../pidgin/gtkconv.c:3006
 msgid "/Options/Show Formatting _Toolbars"
-msgstr "Wys _formateringgereedskap"
-
-#: ../pidgin/gtkconv.c:2937
+msgstr "Wys _formateringnutsgoed"
+
+#: ../pidgin/gtkconv.c:3007
 msgid "/Options/Show Ti_mestamps"
 msgstr "Wys _tydstempels"
 
-#: ../pidgin/gtkconv.c:3061
+#: ../pidgin/gtkconv.c:3134
 msgid "/Conversation/More"
 msgstr "Meer"
 
-#: ../pidgin/gtkconv.c:3117
+#: ../pidgin/gtkconv.c:3190
 msgid "/Options"
-msgstr "Keuses"
+msgstr "Opsies"
 
 #. The menubar has been deactivated. Make sure the 'More' submenu is regenerated next time
 #. * the 'Conversation' menu pops up.
 #. Make sure the 'Conversation -> More' menuitems are regenerated whenever
 #. * the 'Conversation' menu pops up because the entries can change after the
 #. * conversation is created.
-#: ../pidgin/gtkconv.c:3152 ../pidgin/gtkconv.c:3184
+#: ../pidgin/gtkconv.c:3225 ../pidgin/gtkconv.c:3257
 msgid "/Conversation"
 msgstr "Gesprek"
 
-#: ../pidgin/gtkconv.c:3192
+#: ../pidgin/gtkconv.c:3265
 msgid "/Conversation/View Log"
 msgstr "Bekyk staaflêer"
 
-#: ../pidgin/gtkconv.c:3198
+#: ../pidgin/gtkconv.c:3271
 msgid "/Conversation/Send File..."
 msgstr "Stuur lêer..."
 
-#: ../pidgin/gtkconv.c:3202
+#: ../pidgin/gtkconv.c:3275
 msgid "/Conversation/Add Buddy Pounce..."
 msgstr "Voeg vriendwag by..."
 
-#: ../pidgin/gtkconv.c:3208
+#: ../pidgin/gtkconv.c:3281
 msgid "/Conversation/Get Info"
 msgstr "Kry inligting"
 
-#: ../pidgin/gtkconv.c:3212
+#: ../pidgin/gtkconv.c:3285
 msgid "/Conversation/Invite..."
 msgstr "Nooi uit..."
 
-#: ../pidgin/gtkconv.c:3218
+#: ../pidgin/gtkconv.c:3291
 msgid "/Conversation/Alias..."
 msgstr "Alias..."
 
-#: ../pidgin/gtkconv.c:3222
+#: ../pidgin/gtkconv.c:3295
 msgid "/Conversation/Block..."
 msgstr "Blokkeer..."
 
-#: ../pidgin/gtkconv.c:3226
+#: ../pidgin/gtkconv.c:3299
 msgid "/Conversation/Unblock..."
 msgstr "Ontblokkeer..."
 
-#: ../pidgin/gtkconv.c:3230
+#: ../pidgin/gtkconv.c:3303
 msgid "/Conversation/Add..."
 msgstr "Voeg by..."
 
-#: ../pidgin/gtkconv.c:3234
+#: ../pidgin/gtkconv.c:3307
 msgid "/Conversation/Remove..."
 msgstr "Verwyder..."
 
-#: ../pidgin/gtkconv.c:3240
+#: ../pidgin/gtkconv.c:3313
 msgid "/Conversation/Insert Link..."
 msgstr "Voeg skakel in..."
 
-#: ../pidgin/gtkconv.c:3244
+#: ../pidgin/gtkconv.c:3317
 msgid "/Conversation/Insert Image..."
-msgstr "Voeg prentjie in..."
-
-#: ../pidgin/gtkconv.c:3250
+msgstr "Voeg prent in..."
+
+#: ../pidgin/gtkconv.c:3323
 msgid "/Options/Enable Logging"
 msgstr "Aktiveer boekstawing"
 
-#: ../pidgin/gtkconv.c:3253
+#: ../pidgin/gtkconv.c:3326
 msgid "/Options/Enable Sounds"
 msgstr "Aktiveer klanke"
 
-#: ../pidgin/gtkconv.c:3266
+#: ../pidgin/gtkconv.c:3339
 msgid "/Options/Show Formatting Toolbars"
-msgstr "Wys formateringgereedskap"
-
-#: ../pidgin/gtkconv.c:3269
+msgstr "Wys formateringnutsgoed"
+
+#: ../pidgin/gtkconv.c:3342
 msgid "/Options/Show Timestamps"
 msgstr "Wys tydstempels"
 
-#: ../pidgin/gtkconv.c:3346 ../pidgin/gtkconv.c:3388
+#: ../pidgin/gtkconv.c:3419 ../pidgin/gtkconv.c:3461
 msgid "User is typing..."
 msgstr "Gebruiker tik..."
 
-#: ../pidgin/gtkconv.c:3391
+#: ../pidgin/gtkconv.c:3464
 msgid "User has typed something and stopped"
 msgstr "Gebruiker het iets getik en gestop"
 
 #. Build the Send To menu
-#: ../pidgin/gtkconv.c:3574 ../pidgin/gtkconv.c:8022
-msgid "_Send To"
-msgstr "_Stuur na"
-
-#: ../pidgin/gtkconv.c:4286
+#: ../pidgin/gtkconv.c:3648 ../pidgin/gtkconv.c:8248
+msgid "S_end To"
+msgstr "S_tuur na"
+
+#: ../pidgin/gtkconv.c:4360
 msgid "_Send"
 msgstr "_Stuur"
 
 #. Setup the label telling how many people are in the room.
-#: ../pidgin/gtkconv.c:4390
+#: ../pidgin/gtkconv.c:4473
 msgid "0 people in room"
 msgstr "0 mense in die kamer"
 
-#: ../pidgin/gtkconv.c:5759 ../pidgin/gtkconv.c:5880
+#: ../pidgin/gtkconv.c:5846 ../pidgin/gtkconv.c:5967
 #, c-format
 msgid "%d person in room"
 msgid_plural "%d people in room"
 msgstr[0] "%d persoon in kamer"
 msgstr[1] "%d mense in kamer"
 
-#: ../pidgin/gtkconv.c:6486 ../pidgin/gtkstatusbox.c:660
+#: ../pidgin/gtkconv.c:6574 ../pidgin/gtkstatusbox.c:660
 msgid "Typing"
 msgstr "Tik"
 
-#: ../pidgin/gtkconv.c:6490
+#: ../pidgin/gtkconv.c:6578
 msgid "Stopped Typing"
 msgstr "Het opgehou tik"
 
-#: ../pidgin/gtkconv.c:6493
+#: ../pidgin/gtkconv.c:6581
 msgid "Nick Said"
 msgstr "Bynaam genoem"
 
-#: ../pidgin/gtkconv.c:6496 ../pidgin/gtkdocklet.c:492
+#: ../pidgin/gtkconv.c:6584 ../pidgin/gtkdocklet.c:685
 msgid "Unread Messages"
 msgstr "Ongelese boodskappe"
 
-#: ../pidgin/gtkconv.c:6499
+#: ../pidgin/gtkconv.c:6590
 msgid "New Event"
 msgstr "Nuwe gebeurtenis"
 
-#: ../pidgin/gtkconv.c:7572
+#: ../pidgin/gtkconv.c:7767
 msgid "clear: Clears all conversation scrollbacks."
 msgstr "clear: Maak die gesprekvenster skoon."
 
-#: ../pidgin/gtkconv.c:7736
+#: ../pidgin/gtkconv.c:7930
 msgid "Confirm close"
 msgstr "Bevestig sluiting"
 
-#: ../pidgin/gtkconv.c:7768
+#: ../pidgin/gtkconv.c:7962
 msgid "You have unread messages. Are you sure you want to close the window?"
 msgstr "U het ongelese boodskappe. Wil u definitief die venster toemaak?"
 
-#: ../pidgin/gtkconv.c:8355
+#: ../pidgin/gtkconv.c:8581
 msgid "Close other tabs"
 msgstr "Sluit ander oortjies"
 
-#: ../pidgin/gtkconv.c:8361
+#: ../pidgin/gtkconv.c:8587
 msgid "Close all tabs"
 msgstr "Sluit alle oortjies"
 
-#: ../pidgin/gtkconv.c:8369
+#: ../pidgin/gtkconv.c:8595
 msgid "Detach this tab"
 msgstr "Ontheg hierdie oortjie"
 
-#: ../pidgin/gtkconv.c:8375
+#: ../pidgin/gtkconv.c:8601
 msgid "Close this tab"
 msgstr "Sluit hierdie oortjie"
 
-#: ../pidgin/gtkconv.c:8875
+#: ../pidgin/gtkconv.c:9106
 msgid "Close conversation"
 msgstr "Sluit gesprek"
 
-#: ../pidgin/gtkconv.c:9477
+#: ../pidgin/gtkconv.c:9708
 msgid "Last created window"
 msgstr "Laas geskepte venster"
 
-#: ../pidgin/gtkconv.c:9479
+#: ../pidgin/gtkconv.c:9710
 msgid "Separate IM and Chat windows"
 msgstr "Aparte kitsboodskap- en geselsievensters"
 
-#: ../pidgin/gtkconv.c:9481 ../pidgin/gtkprefs.c:1415
+#: ../pidgin/gtkconv.c:9712 ../pidgin/gtkprefs.c:1510
 msgid "New window"
 msgstr "Nuwe venster"
 
-#: ../pidgin/gtkconv.c:9483
+#: ../pidgin/gtkconv.c:9714
 msgid "By group"
 msgstr "Volgens groep"
 
-#: ../pidgin/gtkconv.c:9485
+#: ../pidgin/gtkconv.c:9716
 msgid "By account"
 msgstr "Volgens rekening"
 
-#: ../pidgin/gtkdebug.c:234
+#: ../pidgin/gtkdebug.c:235
 msgid "Save Debug Log"
 msgstr "Stoor ontfoutstaaflêer"
 
-#: ../pidgin/gtkdebug.c:582
+#: ../pidgin/gtkdebug.c:583
 msgid "Invert"
 msgstr "Omkeer"
 
-#: ../pidgin/gtkdebug.c:585
+#: ../pidgin/gtkdebug.c:586
 msgid "Highlight matches"
 msgstr "Merk passings"
 
-#: ../pidgin/gtkdebug.c:652
+#: ../pidgin/gtkdebug.c:653
 msgid "_Icon Only"
 msgstr "Net _ikoon"
 
-#: ../pidgin/gtkdebug.c:653
+#: ../pidgin/gtkdebug.c:654
 msgid "_Text Only"
 msgstr "Net _teks"
 
-#: ../pidgin/gtkdebug.c:654
+#: ../pidgin/gtkdebug.c:655
 msgid "_Both Icon & Text"
 msgstr "_Beide ikoon en teks"
 
-#: ../pidgin/gtkdebug.c:775
+#: ../pidgin/gtkdebug.c:780
 msgid "Filter"
 msgstr "Filter"
 
-#: ../pidgin/gtkdebug.c:794
+#: ../pidgin/gtkdebug.c:799
 msgid "Right click for more options."
-msgstr "Klik regs vir meer keuses."
-
-#: ../pidgin/gtkdebug.c:824
+msgstr "Klik regs vir meer opsies."
+
+#: ../pidgin/gtkdebug.c:829
 msgid "Level "
 msgstr "Vlak "
 
-#: ../pidgin/gtkdebug.c:825 ../pidgin/gtkdebug.c:831
+#: ../pidgin/gtkdebug.c:830 ../pidgin/gtkdebug.c:836
 msgid "Select the debug filter level."
 msgstr "Kies die ontfoutfiltervlak."
 
-#: ../pidgin/gtkdebug.c:833
+#: ../pidgin/gtkdebug.c:838
 msgid "All"
 msgstr "Almal"
 
-#: ../pidgin/gtkdebug.c:834
+#: ../pidgin/gtkdebug.c:839
 msgid "Misc"
 msgstr "Allerlei"
 
-#: ../pidgin/gtkdebug.c:836
+#: ../pidgin/gtkdebug.c:841
 msgid "Warning"
 msgstr "Waarskuwing"
 
-#: ../pidgin/gtkdebug.c:837
+#: ../pidgin/gtkdebug.c:842
 msgid "Error "
 msgstr "Fout "
 
-#: ../pidgin/gtkdebug.c:838
+#: ../pidgin/gtkdebug.c:843
 msgid "Fatal Error"
 msgstr "Fatale fout"
 
@@ -14628,26 +14645,26 @@
 #: ../pidgin/gtkdialogs.c:81 ../pidgin/gtkdialogs.c:82
 #: ../pidgin/gtkdialogs.c:83 ../pidgin/gtkdialogs.c:84
 #: ../pidgin/gtkdialogs.c:85 ../pidgin/gtkdialogs.c:86
-#: ../pidgin/gtkdialogs.c:89 ../pidgin/gtkdialogs.c:91
-#: ../pidgin/gtkdialogs.c:92
+#: ../pidgin/gtkdialogs.c:87 ../pidgin/gtkdialogs.c:90
+#: ../pidgin/gtkdialogs.c:92 ../pidgin/gtkdialogs.c:93
 msgid "developer"
 msgstr "programmeerder"
 
-#: ../pidgin/gtkdialogs.c:87
+#: ../pidgin/gtkdialogs.c:88
 msgid "support"
-msgstr "ondersteuning"
-
-#: ../pidgin/gtkdialogs.c:88
+msgstr "steun"
+
+#: ../pidgin/gtkdialogs.c:89
 msgid "support/QA"
-msgstr "ondersteuning/V-en-A"
-
-#: ../pidgin/gtkdialogs.c:90 ../pidgin/gtkdialogs.c:112
+msgstr "steun/gehaltebeheer"
+
+#: ../pidgin/gtkdialogs.c:91 ../pidgin/gtkdialogs.c:112
 msgid "developer & webmaster"
 msgstr "programmeerder en webmeester"
 
 #: ../pidgin/gtkdialogs.c:99
 msgid "Senior Contributor/QA"
-msgstr ""
+msgstr "Seniorbydraer/gehaltebeheerder"
 
 #: ../pidgin/gtkdialogs.c:108
 msgid "win32 port"
@@ -14684,7 +14701,7 @@
 
 #: ../pidgin/gtkdialogs.c:135
 msgid "Belarusian Latin"
-msgstr ""
+msgstr "Witrussies in Latynse skrif"
 
 #: ../pidgin/gtkdialogs.c:136 ../pidgin/gtkdialogs.c:137
 #: ../pidgin/gtkdialogs.c:227
@@ -14754,9 +14771,8 @@
 msgstr "Spaans"
 
 #: ../pidgin/gtkdialogs.c:161
-#, fuzzy
 msgid "Estonian"
-msgstr "Bosnies"
+msgstr "Estnies"
 
 #: ../pidgin/gtkdialogs.c:162 ../pidgin/gtkdialogs.c:163
 msgid "Euskera(Basque)"
@@ -14843,9 +14859,8 @@
 msgstr "Koerdies"
 
 #: ../pidgin/gtkdialogs.c:185
-#, fuzzy
 msgid "Lao"
-msgstr "Leeu"
+msgstr "Lao"
 
 #: ../pidgin/gtkdialogs.c:186 ../pidgin/gtkdialogs.c:252
 #: ../pidgin/gtkdialogs.c:253
@@ -14966,13 +14981,13 @@
 msgid "Amharic"
 msgstr "Amharies"
 
-#: ../pidgin/gtkdialogs.c:357
+#: ../pidgin/gtkdialogs.c:368
 #, c-format
 msgid "About %s"
 msgstr "Omtrent %s"
 
-#: ../pidgin/gtkdialogs.c:400
-#, fuzzy, c-format
+#: ../pidgin/gtkdialogs.c:411
+#, c-format
 msgid ""
 "%s is a graphical modular messaging client based on libpurple which is "
 "capable of connecting to AIM, MSN, Yahoo!, XMPP, ICQ, IRC, SILC, SIP/SIMPLE, "
@@ -14986,101 +15001,114 @@
 msgstr ""
 "%s is 'n grafiese modulêre geselskliënt wat op libpurple gebaseer is, wat "
 "aan AIM, MSN, Yahoo!, XMPP, ICQ, IRC, SILC, SIP/SIMPLE, Novell GroupWise, "
-"Lotus Sametime, Bonjour, Zephyr, Gadu-Gadu, en QQ als gelyktydig kan "
-"verbind. Dit is geskryf met GTK+.<BR><BR>U mag die program wysig en "
+"Lotus Sametime, Bonjour, Zephyr, MySpaceIM, Gadu-Gadu, en QQ als gelyktydig "
+"kan koppel.  Dit is geskryf met GTK+.<BR><BR>U mag die program wysig en "
 "herversprei onderhewig aan die bepalings van die GPL (weergawe 2 of later).  "
 "'n Afskrif van die GPL word vervat in die lêer 'COPYING' wat saam met %s "
-"versprei word. Die kopiereg van %s berus by sy bydraers. Sien die lêer "
-"'COPYRIGHT' vir die lys bydraers. Ons verskaf geen waarborg vir hierdie "
+"versprei word.  Die kopiereg van %s berus by sy bydraers.  Sien die lêer "
+"'COPYRIGHT' vir die lys bydraers.  Ons verskaf geen waarborg vir hierdie "
 "program nie.<BR><BR>"
 
-#: ../pidgin/gtkdialogs.c:418
-#, c-format
+#: ../pidgin/gtkdialogs.c:429
 msgid "<FONT SIZE=\"4\">IRC:</FONT> #pidgin on irc.freenode.net<BR><BR>"
 msgstr "<FONT SIZE=\"4\">IRC:</FONT> #pidgin op irc.freenode.net<BR><BR>"
 
-#: ../pidgin/gtkdialogs.c:423
+#: ../pidgin/gtkdialogs.c:434
 msgid "Current Developers"
 msgstr "Huidige programmeerders"
 
-#: ../pidgin/gtkdialogs.c:438
+#: ../pidgin/gtkdialogs.c:449
 msgid "Crazy Patch Writers"
 msgstr "Malle lapverwers"
 
-#: ../pidgin/gtkdialogs.c:453
+#: ../pidgin/gtkdialogs.c:464
 msgid "Retired Developers"
 msgstr "Afgetrede programmeerders"
 
-#: ../pidgin/gtkdialogs.c:468
+#: ../pidgin/gtkdialogs.c:479
 msgid "Retired Crazy Patch Writers"
 msgstr "Afgetrede malle lapverwers"
 
-#: ../pidgin/gtkdialogs.c:483
+#: ../pidgin/gtkdialogs.c:494
 msgid "Artists"
 msgstr "Kunstenaars"
 
-#: ../pidgin/gtkdialogs.c:498
+#: ../pidgin/gtkdialogs.c:509
 msgid "Current Translators"
 msgstr "Huidige vertalers"
 
-#: ../pidgin/gtkdialogs.c:518
+#: ../pidgin/gtkdialogs.c:529
 msgid "Past Translators"
 msgstr "Vorige vertalers"
 
-#: ../pidgin/gtkdialogs.c:536
+#: ../pidgin/gtkdialogs.c:547
 msgid "Debugging Information"
 msgstr "Ontfoutinligting"
 
-#: ../pidgin/gtkdialogs.c:906
+#: ../pidgin/gtkdialogs.c:764 ../pidgin/gtkdialogs.c:907
+#: ../pidgin/gtkdialogs.c:988
+msgid "_Name"
+msgstr "_Naam"
+
+#: ../pidgin/gtkdialogs.c:769
+msgid "Buddy"
+msgstr "Vriend"
+
+#: ../pidgin/gtkdialogs.c:773 ../pidgin/gtkdialogs.c:912
+#: ../pidgin/gtkdialogs.c:993
+msgid "_Account"
+msgstr "_Rekening"
+
+#: ../pidgin/gtkdialogs.c:920
 msgid "Get User Info"
 msgstr "Kry gebruikerinligting"
 
-#: ../pidgin/gtkdialogs.c:908
+#: ../pidgin/gtkdialogs.c:922
 msgid ""
 "Please enter the screen name or alias of the person whose info you would "
 "like to view."
 msgstr ""
-"Gee asb. die skermnaam of die alias van die persoon wie se inligting u wil "
-"sien."
-
-#: ../pidgin/gtkdialogs.c:998
+"Tik gerus die skermnaam of die alias van die persoon wie se inligting u wil "
+"bekyk."
+
+#: ../pidgin/gtkdialogs.c:1012
 msgid "View User Log"
 msgstr "Bekyk gebruikerstaaflêer"
 
-#: ../pidgin/gtkdialogs.c:1000
+#: ../pidgin/gtkdialogs.c:1014
 msgid ""
 "Please enter the screen name or alias of the person whose log you would like "
 "to view."
 msgstr ""
-"Gee asb. die skermnaam of die alias van die persoon wie se staaflêer u wil "
-"sien."
-
-#: ../pidgin/gtkdialogs.c:1020
+"Tik gerus die skermnaam of die alias van die persoon wie se staaflêer u wil "
+"bekyk."
+
+#: ../pidgin/gtkdialogs.c:1034
 msgid "Alias Contact"
 msgstr "Aliaskontak"
 
-#: ../pidgin/gtkdialogs.c:1021
+#: ../pidgin/gtkdialogs.c:1035
 msgid "Enter an alias for this contact."
-msgstr "Gee 'n alias vir hierdie kontak."
-
-#: ../pidgin/gtkdialogs.c:1043
+msgstr "Tik 'n alias vir hierdie kontak."
+
+#: ../pidgin/gtkdialogs.c:1057
 #, c-format
 msgid "Enter an alias for %s."
-msgstr "Gee 'n alias vir %s."
-
-#: ../pidgin/gtkdialogs.c:1045
+msgstr "Tik 'n alias vir %s."
+
+#: ../pidgin/gtkdialogs.c:1059
 msgid "Alias Buddy"
 msgstr "Aliasvriend"
 
-#: ../pidgin/gtkdialogs.c:1066
+#: ../pidgin/gtkdialogs.c:1080
 msgid "Alias Chat"
 msgstr "Aliasgeselsie"
 
-#: ../pidgin/gtkdialogs.c:1067
+#: ../pidgin/gtkdialogs.c:1081
 msgid "Enter an alias for this chat."
-msgstr "Gee 'n alias vir hierdie geselsie."
-
-#: ../pidgin/gtkdialogs.c:1106
+msgstr "Tik 'n alias vir hierdie geselsie."
+
+#: ../pidgin/gtkdialogs.c:1120
 #, c-format
 msgid ""
 "You are about to remove the contact containing %s and %d other buddy from "
@@ -15095,15 +15123,15 @@
 "U staan op die punt om die kontak wat %s en %d ander vriende bevat, uit die "
 "vriendelys te verwyder.  Wil u voortgaan?"
 
-#: ../pidgin/gtkdialogs.c:1114
+#: ../pidgin/gtkdialogs.c:1128
 msgid "Remove Contact"
 msgstr "Verwyder kontak"
 
-#: ../pidgin/gtkdialogs.c:1117
+#: ../pidgin/gtkdialogs.c:1131
 msgid "_Remove Contact"
 msgstr "_Verwyder kontak"
 
-#: ../pidgin/gtkdialogs.c:1148
+#: ../pidgin/gtkdialogs.c:1162
 #, c-format
 msgid ""
 "You are about to merge the group called %s into the group called %s. Do you "
@@ -15112,15 +15140,15 @@
 "U staan op die punt om die groep genaamd %s in die groep genaamd %s te "
 "smeld. Wil u voortgaan?"
 
-#: ../pidgin/gtkdialogs.c:1155
+#: ../pidgin/gtkdialogs.c:1169
 msgid "Merge Groups"
 msgstr "Versmeld groepe"
 
-#: ../pidgin/gtkdialogs.c:1158
+#: ../pidgin/gtkdialogs.c:1172
 msgid "_Merge Groups"
 msgstr "_Versmeld groepe"
 
-#: ../pidgin/gtkdialogs.c:1208
+#: ../pidgin/gtkdialogs.c:1222
 #, c-format
 msgid ""
 "You are about to remove the group %s and all its members from your buddy "
@@ -15129,30 +15157,30 @@
 "U staan op die punt om die groep %s en al sy lede uit die vriendelys te "
 "verwyder.  Wil u voortgaan?"
 
-#: ../pidgin/gtkdialogs.c:1211
+#: ../pidgin/gtkdialogs.c:1225
 msgid "Remove Group"
 msgstr "Verwyder groep"
 
-#: ../pidgin/gtkdialogs.c:1214
+#: ../pidgin/gtkdialogs.c:1228
 msgid "_Remove Group"
 msgstr "_Verwyder groep"
 
-#: ../pidgin/gtkdialogs.c:1247
+#: ../pidgin/gtkdialogs.c:1261
 #, c-format
 msgid ""
 "You are about to remove %s from your buddy list.  Do you want to continue?"
 msgstr ""
 "U staan op die punt om %s uit die vriendelys te verwyder.  Wil u voortgaan?"
 
-#: ../pidgin/gtkdialogs.c:1250
+#: ../pidgin/gtkdialogs.c:1264
 msgid "Remove Buddy"
 msgstr "Verwyder vriend"
 
-#: ../pidgin/gtkdialogs.c:1253
+#: ../pidgin/gtkdialogs.c:1267
 msgid "_Remove Buddy"
 msgstr "_Verwyder vriend"
 
-#: ../pidgin/gtkdialogs.c:1274
+#: ../pidgin/gtkdialogs.c:1288
 #, c-format
 msgid ""
 "You are about to remove the chat %s from your buddy list.  Do you want to "
@@ -15160,40 +15188,39 @@
 msgstr ""
 "U gaan nou die geselsie %s uit die vriendelys verwyder.  Wil u voortgaan?"
 
-#: ../pidgin/gtkdialogs.c:1277
+#: ../pidgin/gtkdialogs.c:1291
 msgid "Remove Chat"
 msgstr "Verwyder geselsie"
 
-#: ../pidgin/gtkdialogs.c:1280
+#: ../pidgin/gtkdialogs.c:1294
 msgid "_Remove Chat"
 msgstr "_Verwyder geselsie"
 
-#: ../pidgin/gtkdocklet.c:150
+#: ../pidgin/gtkdocklet.c:152
 msgid "Right-click for more unread messages...\n"
 msgstr "Klik regs vir nog ongelese boodskappe...\n"
 
-#: ../pidgin/gtkdocklet.c:435
+#: ../pidgin/gtkdocklet.c:533
 msgid "Change Status"
 msgstr "Verander status"
 
-#: ../pidgin/gtkdocklet.c:487
+#: ../pidgin/gtkdocklet.c:680
 msgid "Show Buddy List"
 msgstr "Wys vriendelys"
 
-#: ../pidgin/gtkdocklet.c:513
+#: ../pidgin/gtkdocklet.c:706
 msgid "New Message..."
 msgstr "Nuwe boodskap..."
 
-#: ../pidgin/gtkdocklet.c:528
+#: ../pidgin/gtkdocklet.c:721
 msgid "Mute Sounds"
-msgstr "Demp klanke"
-
-#: ../pidgin/gtkdocklet.c:535
-#, fuzzy
-msgid "Blink on new message"
+msgstr "Doof klanke"
+
+#: ../pidgin/gtkdocklet.c:728
+msgid "Blink on New Message"
 msgstr "Flikker met nuwe boodskap"
 
-#: ../pidgin/gtkdocklet.c:542
+#: ../pidgin/gtkdocklet.c:738
 msgid "Quit"
 msgstr "Sluit af"
 
@@ -15223,22 +15250,22 @@
 
 #: ../pidgin/gtkft.c:503
 msgid "An error occurred while opening the file."
-msgstr "'n Fout het voorgekom met die open van die lêer."
+msgstr "Kon nie die lêer open nie."
 
 #: ../pidgin/gtkft.c:540
 #, c-format
 msgid "Error launching %s: %s"
-msgstr "Fout met laai van %s: %s"
+msgstr "Kon nie %s laai nie: %s"
 
 #: ../pidgin/gtkft.c:549
 #, c-format
 msgid "Error running %s"
-msgstr "Fout met uitvoer van %s"
+msgstr "Kon nie %s laat loop nie"
 
 #: ../pidgin/gtkft.c:550
 #, c-format
 msgid "Process returned error code %d"
-msgstr "Proses het foutkode %d teruggegee"
+msgstr "Proses het foutkode %d aangegee"
 
 #: ../pidgin/gtkft.c:697
 msgid "Filename:"
@@ -15271,7 +15298,7 @@
 #. "Download Details" arrow
 #: ../pidgin/gtkft.c:803
 msgid "File transfer _details"
-msgstr "_Detail oor lêeroordrag"
+msgstr "_Details oor lêeroordrag"
 
 #. Pause button
 #: ../pidgin/gtkft.c:833 ../pidgin/pidginstock.c:95
@@ -15283,43 +15310,43 @@
 msgid "_Resume"
 msgstr "_Hervat"
 
-#: ../pidgin/gtkimhtml.c:816
+#: ../pidgin/gtkimhtml.c:815
 msgid "Paste as Plain _Text"
 msgstr "Plak as gewone _teks"
 
-#: ../pidgin/gtkimhtml.c:833 ../pidgin/gtkimhtmltoolbar.c:1194
+#: ../pidgin/gtkimhtml.c:832 ../pidgin/gtkimhtmltoolbar.c:1199
 msgid "_Reset formatting"
 msgstr "_Terugstel van formatering"
 
-#: ../pidgin/gtkimhtml.c:1373
+#: ../pidgin/gtkimhtml.c:1359
 msgid "Hyperlink color"
 msgstr "Hiperskakelkleur"
 
-#: ../pidgin/gtkimhtml.c:1374
+#: ../pidgin/gtkimhtml.c:1360
 msgid "Color to draw hyperlinks."
 msgstr "Kleur om hiperskakels mee te teken."
 
-#: ../pidgin/gtkimhtml.c:1377
+#: ../pidgin/gtkimhtml.c:1363
 msgid "Hyperlink prelight color"
 msgstr "Hiperskakel-voorafmerkkleur"
 
-#: ../pidgin/gtkimhtml.c:1378
+#: ../pidgin/gtkimhtml.c:1364
 msgid "Color to draw hyperlinks when mouse is over them."
 msgstr "Kleur om hiperskakels mee te teken as die muis oor hulle is."
 
-#: ../pidgin/gtkimhtml.c:1598
+#: ../pidgin/gtkimhtml.c:1581
 msgid "_Copy E-Mail Address"
 msgstr "_Kopieer e-posadres"
 
-#: ../pidgin/gtkimhtml.c:1610
+#: ../pidgin/gtkimhtml.c:1593
 msgid "_Open Link in Browser"
 msgstr "_Open skakel in blaaier"
 
-#: ../pidgin/gtkimhtml.c:1620
+#: ../pidgin/gtkimhtml.c:1603
 msgid "_Copy Link Location"
 msgstr "_Kopieer skakelligging"
 
-#: ../pidgin/gtkimhtml.c:3369
+#: ../pidgin/gtkimhtml.c:3353
 msgid ""
 "<span size='larger' weight='bold'>Unrecognized file type</span>\n"
 "\n"
@@ -15329,7 +15356,7 @@
 "\n"
 "Val terug na verstek van PNG."
 
-#: ../pidgin/gtkimhtml.c:3372
+#: ../pidgin/gtkimhtml.c:3356
 msgid ""
 "Unrecognized file type\n"
 "\n"
@@ -15339,221 +15366,212 @@
 "\n"
 "Val terug na verstek van PNG."
 
-#: ../pidgin/gtkimhtml.c:3401
+#: ../pidgin/gtkimhtml.c:3385
 #, c-format
 msgid ""
 "<span size='larger' weight='bold'>Error saving image</span>\n"
 "\n"
 "%s"
 msgstr ""
-"<span size='larger' weight='bold'>Fout met stoor van prentjie</span>\n"
+"<span size='larger' weight='bold'>Kon nie prent stoor nie</span>\n"
 "\n"
 "%s"
 
-#: ../pidgin/gtkimhtml.c:3404
+#: ../pidgin/gtkimhtml.c:3388
 #, c-format
 msgid ""
 "Error saving image\n"
 "\n"
 "%s"
 msgstr ""
-"Fout met stoor van prentjie\n"
+"Kon nie prent stoor nie\n"
 "\n"
 "%s"
 
-#: ../pidgin/gtkimhtml.c:3482 ../pidgin/gtkimhtml.c:3494
+#: ../pidgin/gtkimhtml.c:3466 ../pidgin/gtkimhtml.c:3478
 msgid "Save Image"
-msgstr "Stoor prentjie"
-
-#: ../pidgin/gtkimhtml.c:3522
-#, c-format
+msgstr "Stoor prent"
+
+#: ../pidgin/gtkimhtml.c:3506
 msgid "_Save Image..."
-msgstr "_Stoor prentjie..."
+msgstr "_Stoor prent..."
 
 #: ../pidgin/gtkimhtmltoolbar.c:163
 msgid "Select Font"
-msgstr "Kies skriftipe"
-
-#: ../pidgin/gtkimhtmltoolbar.c:242
+msgstr "Kies font"
+
+#: ../pidgin/gtkimhtmltoolbar.c:244
 msgid "Select Text Color"
 msgstr "Kies tekskleur"
 
-#: ../pidgin/gtkimhtmltoolbar.c:321
+#: ../pidgin/gtkimhtmltoolbar.c:323
 msgid "Select Background Color"
 msgstr "Kies agtergrondkleur"
 
-#: ../pidgin/gtkimhtmltoolbar.c:410
+#: ../pidgin/gtkimhtmltoolbar.c:412
 msgid "_URL"
 msgstr "_URL"
 
-#: ../pidgin/gtkimhtmltoolbar.c:418
+#: ../pidgin/gtkimhtmltoolbar.c:420
 msgid "_Description"
 msgstr "_Beskrywing"
 
-#: ../pidgin/gtkimhtmltoolbar.c:421
+#: ../pidgin/gtkimhtmltoolbar.c:423
 msgid ""
 "Please enter the URL and description of the link that you want to insert. "
 "The description is optional."
 msgstr ""
-"Gee asb. die URL en die beskrywing van die skakel wat u wil invoeg. Die "
+"Tik gerus die URL en die beskrywing van die skakel wat u wil invoeg. Die "
 "beskrywing is opsioneel."
 
-#: ../pidgin/gtkimhtmltoolbar.c:425
+#: ../pidgin/gtkimhtmltoolbar.c:427
 msgid "Please enter the URL of the link that you want to insert."
-msgstr "Gee asb. die URL van die skakel om in te sit."
-
-#: ../pidgin/gtkimhtmltoolbar.c:430 ../pidgin/gtkimhtmltoolbar.c:1102
+msgstr "Tik gerus die URL van die skakel om in te sit."
+
+#: ../pidgin/gtkimhtmltoolbar.c:432 ../pidgin/gtkimhtmltoolbar.c:1106
 msgid "Insert Link"
 msgstr "Voeg skakel in"
 
-#: ../pidgin/gtkimhtmltoolbar.c:434 ../pidgin/gtkimhtmltoolbar.c:1262
+#: ../pidgin/gtkimhtmltoolbar.c:436 ../pidgin/gtkimhtmltoolbar.c:1267
 msgid "_Insert"
 msgstr "_Voeg in"
 
-#: ../pidgin/gtkimhtmltoolbar.c:514
+#: ../pidgin/gtkimhtmltoolbar.c:516
 #, c-format
 msgid "Failed to store image: %s\n"
-msgstr "Stoor van prentjie het misluk: %s\n"
-
-#: ../pidgin/gtkimhtmltoolbar.c:540 ../pidgin/gtkimhtmltoolbar.c:550
+msgstr "Stoor van prent het misluk: %s\n"
+
+#: ../pidgin/gtkimhtmltoolbar.c:542 ../pidgin/gtkimhtmltoolbar.c:552
 msgid "Insert Image"
-msgstr "Voeg prentjie in"
-
-#: ../pidgin/gtkimhtmltoolbar.c:761
+msgstr "Voeg prent in"
+
+#: ../pidgin/gtkimhtmltoolbar.c:765
 msgid "This theme has no available smileys."
 msgstr "Hierdie tema het geen gesiggies beskikbaar nie."
 
 #. show everything
-#: ../pidgin/gtkimhtmltoolbar.c:778
+#: ../pidgin/gtkimhtmltoolbar.c:782
 msgid "Smile!"
 msgstr "Glimlag!"
 
-#: ../pidgin/gtkimhtmltoolbar.c:846 ../pidgin/gtkimhtmltoolbar.c:1219
+#: ../pidgin/gtkimhtmltoolbar.c:850 ../pidgin/gtkimhtmltoolbar.c:1224
 msgid "_Font"
-msgstr "_Skriftipe"
-
-#: ../pidgin/gtkimhtmltoolbar.c:1054
-#, fuzzy
+msgstr "_Font"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1058
 msgid "Group Items"
-msgstr "Groep-ID"
-
-#: ../pidgin/gtkimhtmltoolbar.c:1054
+msgstr "Groepeer items"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1058
 msgid "Ungroup Items"
-msgstr ""
-
-#: ../pidgin/gtkimhtmltoolbar.c:1088 ../pidgin/plugins/convcolors.c:287
+msgstr "Ontgroepeer items"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1092 ../pidgin/plugins/convcolors.c:287
 msgid "Bold"
 msgstr "Vetdruk"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1089 ../pidgin/plugins/convcolors.c:294
+#: ../pidgin/gtkimhtmltoolbar.c:1093 ../pidgin/plugins/convcolors.c:294
 msgid "Italic"
 msgstr "Skuinsdruk"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1090 ../pidgin/plugins/convcolors.c:301
+#: ../pidgin/gtkimhtmltoolbar.c:1094 ../pidgin/plugins/convcolors.c:301
 msgid "Underline"
 msgstr "Onderstreep"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1091
+#: ../pidgin/gtkimhtmltoolbar.c:1095
 msgid "Strikethrough"
-msgstr ""
-
-#: ../pidgin/gtkimhtmltoolbar.c:1093
-msgid "Increase Font Size"
-msgstr ""
-
-#: ../pidgin/gtkimhtmltoolbar.c:1094
-msgid "Decrease Font Size"
-msgstr ""
-
-#: ../pidgin/gtkimhtmltoolbar.c:1096
-#, fuzzy
-msgid "Font Face"
-msgstr "_Skriftipe"
+msgstr "Deurhaal"
 
 #: ../pidgin/gtkimhtmltoolbar.c:1097
-#, fuzzy
-msgid "Background Color"
-msgstr "Agter_grondkleur"
+msgid "Increase Font Size"
+msgstr "Vergroot font"
 
 #: ../pidgin/gtkimhtmltoolbar.c:1098
-#, fuzzy
-msgid "Foreground Color"
-msgstr "Voorgrond_kleur"
+msgid "Decrease Font Size"
+msgstr "Verklein font"
 
 #: ../pidgin/gtkimhtmltoolbar.c:1100
-#, fuzzy
-msgid "Reset Formatting"
-msgstr "_Terugstel van formatering"
-
-#: ../pidgin/gtkimhtmltoolbar.c:1103
-#, fuzzy
-msgid "Insert IM Image"
-msgstr "Voeg prentjie in"
+msgid "Font Face"
+msgstr "Fonttipe"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1101
+msgid "Background Color"
+msgstr "Agtergrondkleur"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1102
+msgid "Foreground Color"
+msgstr "Voorgrondkleur"
 
 #: ../pidgin/gtkimhtmltoolbar.c:1104
-#, fuzzy
+msgid "Reset Formatting"
+msgstr "Stel formatering terug"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1107
+msgid "Insert IM Image"
+msgstr "Voeg kitsboodskap-prent in"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1108
 msgid "Insert Smiley"
 msgstr "Voeg gesiggie in"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1179
+#: ../pidgin/gtkimhtmltoolbar.c:1184
 msgid "<b>_Bold</b>"
 msgstr "<b>_Vetdruk</b>"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1180
+#: ../pidgin/gtkimhtmltoolbar.c:1185
 msgid "<i>_Italic</i>"
 msgstr "<i>_Skuinsdruk</i>"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1181
+#: ../pidgin/gtkimhtmltoolbar.c:1186
 msgid "<u>_Underline</u>"
 msgstr "<u>_Onderstreep</u>"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1182
-#, fuzzy
+#: ../pidgin/gtkimhtmltoolbar.c:1187
 msgid "<span strikethrough='true'>Strikethrough</span>"
-msgstr "<span size='larger'>_Groter</span>"
-
-#: ../pidgin/gtkimhtmltoolbar.c:1183
+msgstr "<span strikethrough='true'>Deurhaal</span>"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1188
 msgid "<span size='larger'>_Larger</span>"
 msgstr "<span size='larger'>_Groter</span>"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1185
+#: ../pidgin/gtkimhtmltoolbar.c:1190
 msgid "_Normal"
 msgstr "_Normaal"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1187
+#: ../pidgin/gtkimhtmltoolbar.c:1192
 msgid "<span size='smaller'>_Smaller</span>"
 msgstr "<span size='smaller'>_Kleiner</span>"
 
 #. If we want to show the formatting for the following items, we would
 #. * need to update them when formatting changes. The above items don't need
 #. * no updating nor nothin'
-#: ../pidgin/gtkimhtmltoolbar.c:1191
+#: ../pidgin/gtkimhtmltoolbar.c:1196
 msgid "_Font face"
-msgstr "_Skriftipe"
-
-#: ../pidgin/gtkimhtmltoolbar.c:1192
+msgstr "_Font"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1197
 msgid "Foreground _color"
 msgstr "Voorgrond_kleur"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1193
+#: ../pidgin/gtkimhtmltoolbar.c:1198
 msgid "Bac_kground color"
 msgstr "Agter_grondkleur"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1270
-msgid "_Smiley"
-msgstr "_Gesiggie"
-
-#: ../pidgin/gtkimhtmltoolbar.c:1276
+#: ../pidgin/gtkimhtmltoolbar.c:1275
 msgid "_Image"
-msgstr "_Prentjie"
-
-#: ../pidgin/gtkimhtmltoolbar.c:1282
+msgstr "_Prent"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1281
 msgid "_Link"
 msgstr "_Skakel"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1288
+#: ../pidgin/gtkimhtmltoolbar.c:1287
 msgid "_Horizontal rule"
-msgstr ""
+msgstr "_Horisontale streep"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1309
+msgid "_Smile!"
+msgstr "_Glimlag!"
 
 #: ../pidgin/gtklog.c:293
 #, c-format
@@ -15601,7 +15619,7 @@
 "log\" preference is enabled."
 msgstr ""
 "Stelselgebeure sal net geboekstaaf word as die \"Boekstaaf alle "
-"statusverandering in stelselboekstaaf\"-voorkeur geaktiveer is."
+"statusverandering in stelselstaaflêer\"-voorkeur geaktiveer is."
 
 #: ../pidgin/gtklog.c:554
 msgid ""
@@ -15625,23 +15643,23 @@
 #. Steal the "HELP" response and use it to trigger browsing to the logs folder
 #: ../pidgin/gtklog.c:576
 msgid "_Browse logs folder"
-msgstr "_Blaai deur staafgids"
+msgstr "_Blaai deur staaflêervouer"
 
 #: ../pidgin/gtklog.c:640
 msgid "Total log size:"
 msgstr "Totale staaflêergrootte:"
 
-#: ../pidgin/gtklog.c:709
+#: ../pidgin/gtklog.c:714
 #, c-format
 msgid "Conversations in %s"
 msgstr "Gesprekke in %s"
 
-#: ../pidgin/gtklog.c:717 ../pidgin/gtklog.c:779
+#: ../pidgin/gtklog.c:722 ../pidgin/gtklog.c:793
 #, c-format
 msgid "Conversations with %s"
 msgstr "Gesprekke met %s"
 
-#: ../pidgin/gtklog.c:804
+#: ../pidgin/gtklog.c:823
 msgid "System Log"
 msgstr "Stelselstaaflêer"
 
@@ -15651,7 +15669,7 @@
 msgstr "%s %s. Probeer `%s -h' vir meer inligting.\n"
 
 #: ../pidgin/gtkmain.c:388
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "%s %s\n"
 "Usage: %s [OPTION]...\n"
@@ -15663,6 +15681,7 @@
 "  -n, --nologin       don't automatically login\n"
 "  -l, --login[=NAME]  automatically login (optional argument NAME specifies\n"
 "                      account(s) to use, separated by commas)\n"
+"  --display=DISPLAY   X display to use\n"
 "  -v, --version       display the current version and exit\n"
 msgstr ""
 "%s %s\n"
@@ -15675,12 +15694,13 @@
 "  -n, --nologin       moenie outomaties aanmeld nie\n"
 "  -l, --login[=NAAM]  meld outomaties aan (opsionele NAAM-argument\n"
 "           spesifiseer rekening(e) om te gebruik, geskei met kommas)\n"
+"  --display=VERTOON   X vertoon om te gebruik\n"
 "  -v, --version       wys die huidige weergawe, en sluit af\n"
 
-#: ../pidgin/gtkmain.c:512
-#, fuzzy, c-format
-msgid ""
-"%s has segfaulted and attempted to dump a core file.\n"
+#: ../pidgin/gtkmain.c:516
+#, c-format
+msgid ""
+"%s %s has segfaulted and attempted to dump a core file.\n"
 "This is a bug in the software and has happened through\n"
 "no fault of your own.\n"
 "\n"
@@ -15698,17 +15718,17 @@
 "on other protocols is at\n"
 "%swiki/DeveloperPages\n"
 msgstr ""
-"%s het ge-segfault en probeer om 'n pitlêer te stort.\n"
+"%s %s het ge-segfault en probeer om 'n pitlêer te stort.\n"
 "Dit is 'n fout in die sagteware en is nie u skuld nie.\n"
 "\n"
 "\n"
-"Indien u die omval kan herproduseer, stel asb. die ontwikkelaars\n"
+"Indien u die omval kan herproduseer, stel gerus die ontwikkelaars\n"
 "in kennis deur 'n fout te rapporteer by:\n"
 "%ssimpleticket/\n"
 "\n"
-"Spesifiseer asb. wat u op daardie stadium mee besig was\n"
+"Spesifiseer gerus wat u op daardie stadium mee besig was\n"
 "en pos die sleepspoor van die pitlêer.  Indien u nie weet\n"
-"hoe om die sleepspoor te kry nie, lees asb. die instruksies by\n"
+"hoe om die sleepspoor te kry nie, lees gerus die instruksies by\n"
 "%swiki/GetABacktrace\n"
 "\n"
 "Indien u verdere bystand verlang, stuur 'n kitsboodskap aan óf SeanEgn óf \n"
@@ -15718,52 +15738,52 @@
 
 #. Translators may want to transliterate the name.
 #. It is not to be translated.
-#: ../pidgin/gtkmain.c:699 ../pidgin/pidgin.h:51
+#: ../pidgin/gtkmain.c:706 ../pidgin/pidgin.h:51
 msgid "Pidgin"
 msgstr "Pidgin"
 
-#: ../pidgin/gtknotify.c:349
+#: ../pidgin/gtknotify.c:350
 msgid "Open All Messages"
 msgstr "Open alle boodskappe"
 
-#: ../pidgin/gtknotify.c:402
+#: ../pidgin/gtknotify.c:403
 msgid "<span weight=\"bold\" size=\"larger\">You have mail!</span>"
 msgstr "<span weight=\"bold\" size=\"larger\">U het pos!</span>"
 
-#: ../pidgin/gtknotify.c:540
+#: ../pidgin/gtknotify.c:546
 #, c-format
 msgid "%s has %d new message."
 msgid_plural "%s has %d new messages."
 msgstr[0] "%s het %d nuwe boodskap."
 msgstr[1] "%s het %d nuwe boodskappe."
 
-#: ../pidgin/gtknotify.c:564
-#, fuzzy, c-format
-msgid "<b>You have %d new e-mail.</b>"
-msgid_plural "<b>You have %d new e-mails.</b>"
-msgstr[0] "<b>U het %d nuwe e-pos.</b>"
-msgstr[1] "<b>U het %d nuwe e-posse.</b>"
-
-#: ../pidgin/gtknotify.c:989
+#: ../pidgin/gtknotify.c:570
+#, c-format
+msgid "<b>%d new e-mail.</b>"
+msgid_plural "<b>%d new e-mails.</b>"
+msgstr[0] "<b>%d nuwe e-pos.</b>"
+msgstr[1] "<b>%d nuwe e-posse.</b>"
+
+#: ../pidgin/gtknotify.c:998
 #, c-format
 msgid "The browser command \"%s\" is invalid."
-msgstr "Die blaaieropdrag \"%s\" is ongeldig."
-
-#: ../pidgin/gtknotify.c:991 ../pidgin/gtknotify.c:1003
-#: ../pidgin/gtknotify.c:1016 ../pidgin/gtknotify.c:1144
+msgstr "Die blaaierbevel \"%s\" is ongeldig."
+
+#: ../pidgin/gtknotify.c:1000 ../pidgin/gtknotify.c:1012
+#: ../pidgin/gtknotify.c:1025 ../pidgin/gtknotify.c:1153
 msgid "Unable to open URL"
 msgstr "Kan nie die URL open nie"
 
-#: ../pidgin/gtknotify.c:1001 ../pidgin/gtknotify.c:1014
+#: ../pidgin/gtknotify.c:1010 ../pidgin/gtknotify.c:1023
 #, c-format
 msgid "Error launching \"%s\": %s"
-msgstr "Fout met laai van \"%s\": %s"
-
-#: ../pidgin/gtknotify.c:1145
+msgstr "Kon nie \"%s\" laai nie: %s"
+
+#: ../pidgin/gtknotify.c:1154
 msgid ""
 "The 'Manual' browser command has been chosen, but no command has been set."
 msgstr ""
-"Die 'Handmatige' blaaier-opdrag is gekies, maar geen opdrag is gestel nie."
+"Die 'Handmatige' blaaier-bevel is gekies, maar geen bevel is gestel nie."
 
 #: ../pidgin/gtkplugin.c:265
 msgid "The following plugins will be unloaded."
@@ -15777,7 +15797,19 @@
 msgid "Unload Plugins"
 msgstr "Ontlaai inproppe"
 
-#: ../pidgin/gtkplugin.c:400
+#: ../pidgin/gtkplugin.c:308
+msgid "Could not unload plugin"
+msgstr "Kon nie inprop ontlaai nie"
+
+#: ../pidgin/gtkplugin.c:309
+msgid ""
+"The plugin could not be unloaded now, but will be disabled at the next "
+"startup."
+msgstr ""
+"Die inprop kan nie nou ontlaai word nie, maar sal volgende keer gedeaktiveer "
+"word."
+
+#: ../pidgin/gtkplugin.c:417
 #, c-format
 msgid ""
 "%s%s<span weight=\"bold\">Written by:</span>\t%s\n"
@@ -15788,7 +15820,7 @@
 "<span weight=\"bold\">Webwerf:</span>\t\t%s\n"
 "<span weight=\"bold\">Lêernaam:</span>\t\t%s"
 
-#: ../pidgin/gtkplugin.c:410
+#: ../pidgin/gtkplugin.c:427
 #, c-format
 msgid ""
 "%s\n"
@@ -15797,110 +15829,110 @@
 msgstr ""
 "%s\n"
 "<span foreground=\"#ff0000\" weight=\"bold\">Fout: %s\n"
-"Kyk by die inprop se webwerf vir 'n opdatering.</span>"
-
-#: ../pidgin/gtkplugin.c:536
+"Kontroleer die inprop se webwerf vir 'n bywerking.</span>"
+
+#: ../pidgin/gtkplugin.c:562
 msgid "Configure Pl_ugin"
 msgstr "Stel _inprop op"
 
-#: ../pidgin/gtkplugin.c:599
+#: ../pidgin/gtkplugin.c:625
 msgid "<b>Plugin Details</b>"
-msgstr "<b>Inpropdetail</b>"
+msgstr "<b>Inpropdetails</b>"
 
 #: ../pidgin/gtkpounce.c:157
 msgid "Select a file"
 msgstr "Kies 'n lêer"
 
 #. Create the "Pounce on Whom" frame.
-#: ../pidgin/gtkpounce.c:532
+#: ../pidgin/gtkpounce.c:547
 msgid "Pounce on Whom"
 msgstr "Hou wie dop"
 
-#: ../pidgin/gtkpounce.c:559
+#: ../pidgin/gtkpounce.c:574
 msgid "_Buddy name:"
 msgstr "_Vriendnaam:"
 
-#: ../pidgin/gtkpounce.c:593
+#: ../pidgin/gtkpounce.c:608
 msgid "Si_gns on"
 msgstr "Aa_nmeld"
 
-#: ../pidgin/gtkpounce.c:595
+#: ../pidgin/gtkpounce.c:610
 msgid "Signs o_ff"
 msgstr "A_fmeld"
 
-#: ../pidgin/gtkpounce.c:597
+#: ../pidgin/gtkpounce.c:612
 msgid "Goes a_way"
 msgstr "_Weggaan"
 
-#: ../pidgin/gtkpounce.c:599
+#: ../pidgin/gtkpounce.c:614
 msgid "Ret_urns from away"
 msgstr "Ter_ugkeer"
 
-#: ../pidgin/gtkpounce.c:601
+#: ../pidgin/gtkpounce.c:616
 msgid "Becomes _idle"
 msgstr "_Ledig raak"
 
-#: ../pidgin/gtkpounce.c:603
+#: ../pidgin/gtkpounce.c:618
 msgid "Is no longer i_dle"
 msgstr "Nie meer l_edig is nie"
 
-#: ../pidgin/gtkpounce.c:605
+#: ../pidgin/gtkpounce.c:620
 msgid "Starts _typing"
 msgstr "Begin _tik"
 
-#: ../pidgin/gtkpounce.c:607
+#: ../pidgin/gtkpounce.c:622
 msgid "P_auses while typing"
 msgstr "W_ag tydens tik"
 
-#: ../pidgin/gtkpounce.c:609
+#: ../pidgin/gtkpounce.c:624
 msgid "Stops t_yping"
 msgstr "Ophou ti_k"
 
-#: ../pidgin/gtkpounce.c:611
+#: ../pidgin/gtkpounce.c:626
 msgid "Sends a _message"
 msgstr "'n _Boodskap stuur"
 
-#: ../pidgin/gtkpounce.c:654
+#: ../pidgin/gtkpounce.c:669
 msgid "Ope_n an IM window"
-msgstr "Ope_n 'n kletsvenster"
-
-#: ../pidgin/gtkpounce.c:656
+msgstr "Ope_n 'n kitsboodskapvenster"
+
+#: ../pidgin/gtkpounce.c:671
 msgid "_Pop up a notification"
-msgstr "Wys 'n boodskap_venster"
-
-#: ../pidgin/gtkpounce.c:658
+msgstr "Wys 'n kennis_gewing"
+
+#: ../pidgin/gtkpounce.c:673
 msgid "Send a _message"
 msgstr "Stuur 'n _boodskap"
 
-#: ../pidgin/gtkpounce.c:660
+#: ../pidgin/gtkpounce.c:675
 msgid "E_xecute a command"
 msgstr "_Voer 'n bevel uit"
 
-#: ../pidgin/gtkpounce.c:662
+#: ../pidgin/gtkpounce.c:677
 msgid "P_lay a sound"
 msgstr "Spee_l 'n klank"
 
-#: ../pidgin/gtkpounce.c:668
+#: ../pidgin/gtkpounce.c:683
 msgid "Brows_e..."
 msgstr "_Blaai..."
 
-#: ../pidgin/gtkpounce.c:670
+#: ../pidgin/gtkpounce.c:685
 msgid "Br_owse..."
 msgstr "_Blaai..."
 
-#: ../pidgin/gtkpounce.c:671
+#: ../pidgin/gtkpounce.c:686
 msgid "Pre_view"
 msgstr "_Voorskou"
 
-#: ../pidgin/gtkpounce.c:798
+#: ../pidgin/gtkpounce.c:818
 msgid "P_ounce only when my status is not Available"
 msgstr "_Hou dop net wanneer my status 'Nie beskikbaar' is"
 
-#: ../pidgin/gtkpounce.c:803
+#: ../pidgin/gtkpounce.c:823
 msgid "_Recurring"
 msgstr "_Herhalend"
 
-#: ../pidgin/gtkpounce.c:1246
+#: ../pidgin/gtkpounce.c:1266
 msgid "Pounce Target"
 msgstr "Dophou-teiken"
 
@@ -15917,7 +15949,7 @@
 msgid "Install Theme"
 msgstr "Installeer tema"
 
-#: ../pidgin/gtkprefs.c:697
+#: ../pidgin/gtkprefs.c:698
 msgid ""
 "Select a smiley theme that you would like to use from the list below. New "
 "themes can be installed by dragging and dropping them onto the theme list."
@@ -15925,15 +15957,15 @@
 "Kies 'n gesiggie-tema wat u wil gebruik vanuit die lys hier onder. Nuwe "
 "temas kan geïnstalleer word deur hulle te sleep en te los op die temalys."
 
-#: ../pidgin/gtkprefs.c:732
+#: ../pidgin/gtkprefs.c:733
 msgid "Icon"
 msgstr "Ikoon"
 
-#: ../pidgin/gtkprefs.c:894
+#: ../pidgin/gtkprefs.c:895
 msgid "System Tray Icon"
 msgstr "Stelsellaai-ikoon"
 
-#: ../pidgin/gtkprefs.c:895
+#: ../pidgin/gtkprefs.c:896
 msgid "_Show system tray icon:"
 msgstr "_Wys ikoon in stelsellaai"
 
@@ -15941,116 +15973,120 @@
 msgid "On unread messages"
 msgstr "Met ongelese boodskappe"
 
-#: ../pidgin/gtkprefs.c:904
+#: ../pidgin/gtkprefs.c:905
 msgid "Conversation Window Hiding"
 msgstr "Versteking van gesprekvenster"
 
-#: ../pidgin/gtkprefs.c:905
+#: ../pidgin/gtkprefs.c:906
 msgid "_Hide new IM conversations:"
 msgstr "_Versteek nuwe kitsboodskappe:"
 
-#: ../pidgin/gtkprefs.c:908 ../pidgin/gtkprefs.c:1944
+#: ../pidgin/gtkprefs.c:909 ../pidgin/gtkprefs.c:2045
 msgid "When away"
 msgstr "Terwyl weg"
 
 #. All the tab options!
-#: ../pidgin/gtkprefs.c:916
+#: ../pidgin/gtkprefs.c:917
 msgid "Tabs"
 msgstr "Oortjies"
 
-#: ../pidgin/gtkprefs.c:918
+#: ../pidgin/gtkprefs.c:919
 msgid "Show IMs and chats in _tabbed windows"
-msgstr "Wys boodskappe en geselsies in _oortjies"
-
-#: ../pidgin/gtkprefs.c:932
+msgstr "Wys kitsboodskappe en geselsies in _oortjies"
+
+#: ../pidgin/gtkprefs.c:933
 msgid "Show close b_utton on tabs"
 msgstr "Wys 'n _sluitknoppie op oortjies"
 
-#: ../pidgin/gtkprefs.c:935
+#: ../pidgin/gtkprefs.c:936
 msgid "_Placement:"
 msgstr "_Plasing:"
 
-#: ../pidgin/gtkprefs.c:937
+#: ../pidgin/gtkprefs.c:938
 msgid "Top"
 msgstr "Bo"
 
-#: ../pidgin/gtkprefs.c:938
+#: ../pidgin/gtkprefs.c:939
 msgid "Bottom"
 msgstr "Onder"
 
-#: ../pidgin/gtkprefs.c:939
+#: ../pidgin/gtkprefs.c:940
 msgid "Left"
 msgstr "Links"
 
-#: ../pidgin/gtkprefs.c:940
+#: ../pidgin/gtkprefs.c:941
 msgid "Right"
 msgstr "Regs"
 
-#: ../pidgin/gtkprefs.c:942
+#: ../pidgin/gtkprefs.c:943
 msgid "Left Vertical"
 msgstr "Vertikaal links"
 
-#: ../pidgin/gtkprefs.c:943
+#: ../pidgin/gtkprefs.c:944
 msgid "Right Vertical"
 msgstr "Vertikaal regs"
 
-#: ../pidgin/gtkprefs.c:950
+#: ../pidgin/gtkprefs.c:951
 msgid "N_ew conversations:"
 msgstr "N_uwe gesprekke:"
 
-#: ../pidgin/gtkprefs.c:995
+#: ../pidgin/gtkprefs.c:997
 msgid "Show _formatting on incoming messages"
 msgstr "Wys _formatering op inkomende boodskappe"
 
-#: ../pidgin/gtkprefs.c:998
+#: ../pidgin/gtkprefs.c:999
+msgid "Close IMs immediately when the tab is closed"
+msgstr "Sluit kitsboodskappe dadelik wanneer oortjie gesluit word"
+
+#: ../pidgin/gtkprefs.c:1002
 msgid "Show _detailed information"
 msgstr "Wys _gedetailleerde inligting"
 
-#: ../pidgin/gtkprefs.c:1000
+#: ../pidgin/gtkprefs.c:1004
 msgid "Enable buddy ic_on animation"
 msgstr "Aktiveer _animasie van vriendikoon"
 
-#: ../pidgin/gtkprefs.c:1007
+#: ../pidgin/gtkprefs.c:1011
 msgid "_Notify buddies that you are typing to them"
 msgstr "_Laat weet vriende dat u vir hulle tik"
 
-#: ../pidgin/gtkprefs.c:1010
+#: ../pidgin/gtkprefs.c:1014
 msgid "Highlight _misspelled words"
 msgstr "Dui _spelfoute aan"
 
-#: ../pidgin/gtkprefs.c:1014
+#: ../pidgin/gtkprefs.c:1018
 msgid "Use smooth-scrolling"
 msgstr "Gebruik gladde rol"
 
-#: ../pidgin/gtkprefs.c:1017
+#: ../pidgin/gtkprefs.c:1021
 msgid "F_lash window when IMs are received"
 msgstr "_Flits boodskap wanneer 'n kitsboodskap ontvang word"
 
-#: ../pidgin/gtkprefs.c:1019
+#: ../pidgin/gtkprefs.c:1023
 msgid "Minimi_ze new conversation windows"
 msgstr "Minim_eer nuwe gesprekvensters"
 
-#: ../pidgin/gtkprefs.c:1023
-msgid "Font"
-msgstr "Skriftipe"
-
-#: ../pidgin/gtkprefs.c:1025
-msgid "Use document font from _theme"
-msgstr "Gebruik dokumentskriftipe uit _tema"
-
 #: ../pidgin/gtkprefs.c:1027
-msgid "Use font from _theme"
-msgstr "Gebruik skriftipe uit _tema"
+msgid "Font"
+msgstr "Font"
 
 #: ../pidgin/gtkprefs.c:1029
+msgid "Use document font from _theme"
+msgstr "Gebruik dokumentskriftipe uit _tema"
+
+#: ../pidgin/gtkprefs.c:1031
+msgid "Use font from _theme"
+msgstr "Gebruik font uit _tema"
+
+#: ../pidgin/gtkprefs.c:1033
 msgid "Conversation _font:"
-msgstr "Gesprek_skriftipe:"
-
-#: ../pidgin/gtkprefs.c:1043
+msgstr "Gesprek_font:"
+
+#: ../pidgin/gtkprefs.c:1047
 msgid "Default Formatting"
 msgstr "Verstekformatering"
 
-#: ../pidgin/gtkprefs.c:1062
+#: ../pidgin/gtkprefs.c:1066
 msgid ""
 "This is how your outgoing message text will appear when you use protocols "
 "that support formatting."
@@ -16058,119 +16094,155 @@
 "Dit is hoe die uitgaande boodskapteks sal wys wanneer u protokolle gebruik "
 "wat formatering ondersteun."
 
-#: ../pidgin/gtkprefs.c:1128
+#: ../pidgin/gtkprefs.c:1126
+msgid "Cannot start proxy configuration program."
+msgstr "Kan nie instaanopstellingsprogram begin nie."
+
+#: ../pidgin/gtkprefs.c:1138
+msgid "Cannot start browser configuration program."
+msgstr "Kan nie blaaieropstellingsprogram begin nie."
+
+#: ../pidgin/gtkprefs.c:1158
 msgid "ST_UN server:"
 msgstr "ST_UN-bediener:"
 
-#: ../pidgin/gtkprefs.c:1140
+#: ../pidgin/gtkprefs.c:1170
 msgid "<span style=\"italic\">Example: stunserver.org</span>"
 msgstr "<span style=\"italic\">Voorbeeld: stunserver.org</span>"
 
-#: ../pidgin/gtkprefs.c:1144
+#: ../pidgin/gtkprefs.c:1174
 msgid "_Autodetect IP address"
 msgstr "_Outospeur IP-adres"
 
-#: ../pidgin/gtkprefs.c:1153
+#: ../pidgin/gtkprefs.c:1183
 msgid "Public _IP:"
 msgstr "Publieke _IP:"
 
-#: ../pidgin/gtkprefs.c:1182
+#: ../pidgin/gtkprefs.c:1214
 msgid "Ports"
 msgstr "Poorte"
 
-#: ../pidgin/gtkprefs.c:1185
+#: ../pidgin/gtkprefs.c:1217
 msgid "_Manually specify range of ports to listen on"
 msgstr "_Spesifiseer self die omvang van poorte om op te luister"
 
-#: ../pidgin/gtkprefs.c:1188
+#: ../pidgin/gtkprefs.c:1220
 msgid "_Start port:"
 msgstr "_Beginpoort:"
 
-#: ../pidgin/gtkprefs.c:1195
+#: ../pidgin/gtkprefs.c:1227
 msgid "_End port:"
 msgstr "_Endpoort:"
 
-#: ../pidgin/gtkprefs.c:1203
-msgid "Proxy Server"
-msgstr "Instaanbediener"
-
-#: ../pidgin/gtkprefs.c:1207
-msgid "No proxy"
-msgstr "Geen instaanbediener"
+#: ../pidgin/gtkprefs.c:1235
+msgid "Proxy Server &amp; Browser"
+msgstr "Instaanbediener en blaaier"
+
+#: ../pidgin/gtkprefs.c:1243
+msgid "<b>Proxy configuration program was not found.</b>"
+msgstr "<b>Instaanopstellingsprogram is nie gevind nie.</b>"
+
+#: ../pidgin/gtkprefs.c:1251
+msgid "<b>Browser configuration program was not found.</b>"
+msgstr "<b>Blaaieropstellingsprogram is nie gevind nie.</b>"
+
+#: ../pidgin/gtkprefs.c:1256
+msgid ""
+"Proxy & Browser preferences are configured\n"
+"in GNOME Preferences"
+msgstr ""
+"Instaanbediener- en blaaiervoorkeure word in\n"
+"GNOME-voorkeure opgestel"
 
 #: ../pidgin/gtkprefs.c:1263
+msgid "Configure _Proxy"
+msgstr "Stel _instaanbediener op"
+
+#: ../pidgin/gtkprefs.c:1268
+msgid "Configure _Browser"
+msgstr "Stel _blaaier op"
+
+#: ../pidgin/gtkprefs.c:1274
+msgid "Proxy Server"
+msgstr "Instaanbediener"
+
+#: ../pidgin/gtkprefs.c:1279
+msgid "No proxy"
+msgstr "Geen instaanbediener"
+
+#: ../pidgin/gtkprefs.c:1335
 msgid "_User:"
 msgstr "_Gebruiker:"
 
-#: ../pidgin/gtkprefs.c:1328
+#: ../pidgin/gtkprefs.c:1423
 msgid "Seamonkey"
 msgstr "Seamonkey"
 
-#: ../pidgin/gtkprefs.c:1329
+#: ../pidgin/gtkprefs.c:1424
 msgid "Opera"
 msgstr "Opera"
 
-#: ../pidgin/gtkprefs.c:1330
+#: ../pidgin/gtkprefs.c:1425
 msgid "Netscape"
 msgstr "Netscape"
 
-#: ../pidgin/gtkprefs.c:1331
+#: ../pidgin/gtkprefs.c:1426
 msgid "Mozilla"
 msgstr "Mozilla"
 
-#: ../pidgin/gtkprefs.c:1332
+#: ../pidgin/gtkprefs.c:1427
 msgid "Konqueror"
 msgstr "Konqueror"
 
-#: ../pidgin/gtkprefs.c:1333
+#: ../pidgin/gtkprefs.c:1428
 msgid "GNOME Default"
 msgstr "GNOME se verstek"
 
-#: ../pidgin/gtkprefs.c:1334
+#: ../pidgin/gtkprefs.c:1429
 msgid "Galeon"
 msgstr "Galeon"
 
-#: ../pidgin/gtkprefs.c:1335
+#: ../pidgin/gtkprefs.c:1430
 msgid "Firefox"
 msgstr "Firefox"
 
-#: ../pidgin/gtkprefs.c:1336
+#: ../pidgin/gtkprefs.c:1431
 msgid "Firebird"
 msgstr "Firebird"
 
-#: ../pidgin/gtkprefs.c:1337
+#: ../pidgin/gtkprefs.c:1432
 msgid "Epiphany"
 msgstr "Epiphany"
 
-#: ../pidgin/gtkprefs.c:1346
+#: ../pidgin/gtkprefs.c:1441
 msgid "Manual"
 msgstr "Handmatig"
 
-#: ../pidgin/gtkprefs.c:1399
+#: ../pidgin/gtkprefs.c:1494
 msgid "Browser Selection"
 msgstr "Blaaierkeuse"
 
-#: ../pidgin/gtkprefs.c:1403
+#: ../pidgin/gtkprefs.c:1498
 msgid "_Browser:"
 msgstr "_Blaaier:"
 
-#: ../pidgin/gtkprefs.c:1411
+#: ../pidgin/gtkprefs.c:1506
 msgid "_Open link in:"
 msgstr "_Open skakel in:"
 
-#: ../pidgin/gtkprefs.c:1413
+#: ../pidgin/gtkprefs.c:1508
 msgid "Browser default"
 msgstr "Verstekblaaier"
 
-#: ../pidgin/gtkprefs.c:1414
+#: ../pidgin/gtkprefs.c:1509
 msgid "Existing window"
 msgstr "Bestaande venster"
 
-#: ../pidgin/gtkprefs.c:1416
+#: ../pidgin/gtkprefs.c:1511
 msgid "New tab"
 msgstr "Nuwe oortjie"
 
-#: ../pidgin/gtkprefs.c:1430
+#: ../pidgin/gtkprefs.c:1525
 #, c-format
 msgid ""
 "_Manual:\n"
@@ -16179,152 +16251,146 @@
 "_Handmatig:\n"
 "(%s vir URL)"
 
-#: ../pidgin/gtkprefs.c:1470
+#: ../pidgin/gtkprefs.c:1566
 msgid "Log _format:"
 msgstr "Boekstaaf_formaat:"
 
-#: ../pidgin/gtkprefs.c:1475
+#: ../pidgin/gtkprefs.c:1571
 msgid "Log all _instant messages"
 msgstr "Boekstaaf alle k_itsboodskappe"
 
-#: ../pidgin/gtkprefs.c:1477
+#: ../pidgin/gtkprefs.c:1573
 msgid "Log all c_hats"
 msgstr "Boekstaaf alle g_eselsies"
 
-#: ../pidgin/gtkprefs.c:1479
+#: ../pidgin/gtkprefs.c:1575
 msgid "Log all _status changes to system log"
 msgstr "Boekstaaf alle _statusveranderinge na die stelselstaaflêer"
 
-#: ../pidgin/gtkprefs.c:1625
+#: ../pidgin/gtkprefs.c:1725
 msgid "Sound Selection"
 msgstr "Klankkeuse"
 
-#: ../pidgin/gtkprefs.c:1635
-#, c-format
+#: ../pidgin/gtkprefs.c:1735
 msgid "Quietest"
 msgstr "Sagste"
 
-#: ../pidgin/gtkprefs.c:1637
-#, c-format
+#: ../pidgin/gtkprefs.c:1737
 msgid "Quieter"
 msgstr "Sagter"
 
-#: ../pidgin/gtkprefs.c:1639
-#, c-format
+#: ../pidgin/gtkprefs.c:1739
 msgid "Quiet"
 msgstr "Sag"
 
-#: ../pidgin/gtkprefs.c:1643
-#, c-format
+#: ../pidgin/gtkprefs.c:1743
 msgid "Loud"
 msgstr "Hard"
 
-#: ../pidgin/gtkprefs.c:1645
-#, c-format
+#: ../pidgin/gtkprefs.c:1745
 msgid "Louder"
 msgstr "Harder"
 
-#: ../pidgin/gtkprefs.c:1647
-#, c-format
+#: ../pidgin/gtkprefs.c:1747
 msgid "Loudest"
 msgstr "Hardste"
 
-#: ../pidgin/gtkprefs.c:1713
+#: ../pidgin/gtkprefs.c:1813
 msgid "_Method:"
 msgstr "_Metode:"
 
-#: ../pidgin/gtkprefs.c:1715
+#: ../pidgin/gtkprefs.c:1815
 msgid "Console beep"
 msgstr "Konsolebiep"
 
-#: ../pidgin/gtkprefs.c:1722
+#: ../pidgin/gtkprefs.c:1822
 msgid "No sounds"
 msgstr "Geen klanke"
 
-#: ../pidgin/gtkprefs.c:1730
+#: ../pidgin/gtkprefs.c:1830
 #, c-format
 msgid ""
 "Sound c_ommand:\n"
 "(%s for filename)"
 msgstr ""
-"Klank_opdrag:\n"
+"Klank_bevel:\n"
 "(%s vir lêernaam)"
 
-#: ../pidgin/gtkprefs.c:1757
+#: ../pidgin/gtkprefs.c:1857
 msgid "Sounds when conversation has _focus"
 msgstr "Klanke terwyl gesprek in _fokus is"
 
-#: ../pidgin/gtkprefs.c:1759
+#: ../pidgin/gtkprefs.c:1859
 msgid "Enable sounds:"
 msgstr "Aktiveer klanke:"
 
-#: ../pidgin/gtkprefs.c:1770
+#: ../pidgin/gtkprefs.c:1870
 msgid "Volume:"
 msgstr "Volume:"
 
-#: ../pidgin/gtkprefs.c:1850
+#: ../pidgin/gtkprefs.c:1950
 msgid "Play"
 msgstr "Speel"
 
-#: ../pidgin/gtkprefs.c:1927
+#: ../pidgin/gtkprefs.c:2028
 msgid "_Report idle time:"
 msgstr "_Raporteer ledige tyd:"
 
-#: ../pidgin/gtkprefs.c:1932
+#: ../pidgin/gtkprefs.c:2033
 msgid "Based on keyboard or mouse use"
 msgstr "Gebaseer op gebruik van sleutelbord en muis"
 
-#: ../pidgin/gtkprefs.c:1941
+#: ../pidgin/gtkprefs.c:2042
 msgid "_Auto-reply:"
 msgstr "_Outo-antwoord:"
 
-#: ../pidgin/gtkprefs.c:1945
+#: ../pidgin/gtkprefs.c:2046
 msgid "When both away and idle"
 msgstr "Terwyl weg en ledig"
 
 #. Auto-away stuff
-#: ../pidgin/gtkprefs.c:1951
+#: ../pidgin/gtkprefs.c:2052
 msgid "Auto-away"
 msgstr "Outoweg"
 
-#: ../pidgin/gtkprefs.c:1953
+#: ../pidgin/gtkprefs.c:2054
 msgid "Change status when _idle"
 msgstr "Verander status terwyl _ledig"
 
-#: ../pidgin/gtkprefs.c:1957
+#: ../pidgin/gtkprefs.c:2058
 msgid "_Minutes before becoming idle:"
 msgstr "_Minute voor ledig word:"
 
-#: ../pidgin/gtkprefs.c:1965
+#: ../pidgin/gtkprefs.c:2066
 msgid "Change _status to:"
 msgstr "Verander _status na:"
 
 #. Signon status stuff
-#: ../pidgin/gtkprefs.c:1986
+#: ../pidgin/gtkprefs.c:2087
 msgid "Status at Startup"
 msgstr "Status by begin"
 
-#: ../pidgin/gtkprefs.c:1988
+#: ../pidgin/gtkprefs.c:2089
 msgid "Use status from last _exit at startup"
 msgstr "By begin, gebruik status van laaste _afsluiting"
 
-#: ../pidgin/gtkprefs.c:1994
+#: ../pidgin/gtkprefs.c:2095
 msgid "Status to a_pply at startup:"
 msgstr "Status om te ge_bruik by begin:"
 
-#: ../pidgin/gtkprefs.c:2032
+#: ../pidgin/gtkprefs.c:2134
 msgid "Interface"
 msgstr "Koppelvlak"
 
-#: ../pidgin/gtkprefs.c:2034
+#: ../pidgin/gtkprefs.c:2136
 msgid "Smiley Themes"
 msgstr "Gesiggie-temas"
 
-#: ../pidgin/gtkprefs.c:2041
+#: ../pidgin/gtkprefs.c:2143
 msgid "Browser"
 msgstr "Blaaier"
 
-#: ../pidgin/gtkprefs.c:2045
+#: ../pidgin/gtkprefs.c:2147
 msgid "Status / Idle"
 msgstr "Status / ledig"
 
@@ -16348,90 +16414,90 @@
 msgid "Block only the users below"
 msgstr "Blokkeer net die gebruikers hier onder"
 
-#: ../pidgin/gtkprivacy.c:370
+#: ../pidgin/gtkprivacy.c:372
 msgid "Privacy"
 msgstr "Privaatheid"
 
-#: ../pidgin/gtkprivacy.c:382
+#: ../pidgin/gtkprivacy.c:384
 msgid "Changes to privacy settings take effect immediately."
 msgstr "Veranderinge aan privaatheidinstellings is onmiddelik van toepassing."
 
 #. "Set privacy for:" label
-#: ../pidgin/gtkprivacy.c:394
+#: ../pidgin/gtkprivacy.c:396
 msgid "Set privacy for:"
 msgstr "Stel privaatheid vir:"
 
-#: ../pidgin/gtkprivacy.c:557 ../pidgin/gtkprivacy.c:574
+#: ../pidgin/gtkprivacy.c:559 ../pidgin/gtkprivacy.c:576
 msgid "Permit User"
 msgstr "Laat gebruiker toe"
 
-#: ../pidgin/gtkprivacy.c:558
+#: ../pidgin/gtkprivacy.c:560
 msgid "Type a user you permit to contact you."
 msgstr "Tik 'n gebruiker wat u toelaat om u te kontak."
 
-#: ../pidgin/gtkprivacy.c:559
+#: ../pidgin/gtkprivacy.c:561
 msgid "Please enter the name of the user you wish to be able to contact you."
-msgstr "Tik asb. die naam van die gebruiker wat u wil hê moet u kan kontak."
-
-#: ../pidgin/gtkprivacy.c:562 ../pidgin/gtkprivacy.c:578
+msgstr "Tik gerus die naam van die gebruiker wat u wil hê moet u kan kontak."
+
+#: ../pidgin/gtkprivacy.c:564 ../pidgin/gtkprivacy.c:580
 msgid "_Permit"
 msgstr "_Laat toe"
 
-#: ../pidgin/gtkprivacy.c:568
+#: ../pidgin/gtkprivacy.c:570
 #, c-format
 msgid "Allow %s to contact you?"
 msgstr "Laat %s toe om u te kontak?"
 
-#: ../pidgin/gtkprivacy.c:570
+#: ../pidgin/gtkprivacy.c:572
 #, c-format
 msgid "Are you sure you wish to allow %s to contact you?"
 msgstr "Wil u definitief %s toelaat om u te kontak?"
 
-#: ../pidgin/gtkprivacy.c:599 ../pidgin/gtkprivacy.c:613
+#: ../pidgin/gtkprivacy.c:601 ../pidgin/gtkprivacy.c:615
 msgid "Block User"
 msgstr "Blokkeer gebruiker"
 
-#: ../pidgin/gtkprivacy.c:600
+#: ../pidgin/gtkprivacy.c:602
 msgid "Type a user to block."
 msgstr "Tik 'n gebruiker om te blokkeer."
 
-#: ../pidgin/gtkprivacy.c:601
+#: ../pidgin/gtkprivacy.c:603
 msgid "Please enter the name of the user you wish to block."
-msgstr "Gee asb. die naam van die gebruiker wat u wil blokkeer."
-
-#: ../pidgin/gtkprivacy.c:609
+msgstr "Tik gerus die naam van die gebruiker wat u wil blokkeer."
+
+#: ../pidgin/gtkprivacy.c:611
 #, c-format
 msgid "Block %s?"
 msgstr "Blokkeer %s?"
 
-#: ../pidgin/gtkprivacy.c:611
+#: ../pidgin/gtkprivacy.c:613
 #, c-format
 msgid "Are you sure you want to block %s?"
 msgstr "Wil u definitief %s blokkeer?"
 
-#: ../pidgin/gtkrequest.c:272
+#: ../pidgin/gtkrequest.c:322
 msgid "Apply"
 msgstr "Pas toe"
 
-#: ../pidgin/gtkrequest.c:1507
+#: ../pidgin/gtkrequest.c:1651
 msgid "That file already exists"
 msgstr "Daardie lêer bestaan reeds"
 
-#: ../pidgin/gtkrequest.c:1508
+#: ../pidgin/gtkrequest.c:1652
 msgid "Would you like to overwrite it?"
 msgstr "Wil u dit oorskryf?"
 
-#: ../pidgin/gtkrequest.c:1511
+#: ../pidgin/gtkrequest.c:1655
 msgid "Overwrite"
 msgstr "Oorskryf"
 
-#: ../pidgin/gtkrequest.c:1512
+#: ../pidgin/gtkrequest.c:1656
 msgid "Choose New Name"
 msgstr "Kies nuwe naam"
 
-#: ../pidgin/gtkrequest.c:1650 ../pidgin/gtkrequest.c:1664
+#: ../pidgin/gtkrequest.c:1797 ../pidgin/gtkrequest.c:1811
 msgid "Select Folder..."
-msgstr "Kies gids..."
+msgstr "Kies vouer..."
 
 #. Create the window.
 #: ../pidgin/gtkroomlist.c:375
@@ -16453,7 +16519,7 @@
 msgstr "Wil u definitief die gekose gestoorde statusse uitvee?"
 
 #. Use button
-#: ../pidgin/gtksavedstatuses.c:620 ../pidgin/gtksavedstatuses.c:1266
+#: ../pidgin/gtksavedstatuses.c:620 ../pidgin/gtksavedstatuses.c:1273
 msgid "_Use"
 msgstr "_Gebruik"
 
@@ -16461,29 +16527,29 @@
 msgid "Title already in use.  You must choose a unique title."
 msgstr "Titel reeds in gebruik.  U moet 'n unieke titel kies."
 
-#: ../pidgin/gtksavedstatuses.c:970
+#: ../pidgin/gtksavedstatuses.c:976
 msgid "Different"
 msgstr "Anders"
 
-#: ../pidgin/gtksavedstatuses.c:1159
+#: ../pidgin/gtksavedstatuses.c:1165
 msgid "_Title:"
 msgstr "_Titel:"
 
-#: ../pidgin/gtksavedstatuses.c:1178 ../pidgin/gtksavedstatuses.c:1497
+#: ../pidgin/gtksavedstatuses.c:1184 ../pidgin/gtksavedstatuses.c:1505
 msgid "_Status:"
 msgstr "_Status:"
 
 #. Different status message expander
-#: ../pidgin/gtksavedstatuses.c:1210
+#: ../pidgin/gtksavedstatuses.c:1217
 msgid "Use a _different status for some accounts"
 msgstr "Gebruik 'n _ander status vir sekere rekenings"
 
 #. Save & Use button
-#: ../pidgin/gtksavedstatuses.c:1274
+#: ../pidgin/gtksavedstatuses.c:1281
 msgid "Sa_ve & Use"
 msgstr "S_toor en gebruik"
 
-#: ../pidgin/gtksavedstatuses.c:1480
+#: ../pidgin/gtksavedstatuses.c:1488
 #, c-format
 msgid "Status for %s"
 msgstr "Status vir %s"
@@ -16492,76 +16558,84 @@
 msgid "Waiting for network connection"
 msgstr "Wag vir netwerkverbinding"
 
-#: ../pidgin/gtkutils.c:632
+#: ../pidgin/gtkstatusbox.c:1072
+msgid "New status..."
+msgstr "Nuwe status..."
+
+#: ../pidgin/gtkstatusbox.c:1073
+msgid "Saved statuses..."
+msgstr "Gestoorde statusse..."
+
+#: ../pidgin/gtkutils.c:633
 msgid "Google Talk"
 msgstr "Google Talk"
 
-#: ../pidgin/gtkutils.c:1399 ../pidgin/gtkutils.c:1422
+#: ../pidgin/gtkutils.c:1400 ../pidgin/gtkutils.c:1423
 #, c-format
 msgid "The following error has occurred loading %s: %s"
-msgstr "Die volgende fout het voorgekom met die laai van %s: %s"
-
-#: ../pidgin/gtkutils.c:1402 ../pidgin/gtkutils.c:1424
+msgstr "Die volgende fout het voorgekom toe %s gelaai is: %s"
+
+#: ../pidgin/gtkutils.c:1403 ../pidgin/gtkutils.c:1425
 msgid "Failed to load image"
-msgstr "Laai van prentjie het misluk"
-
-#: ../pidgin/gtkutils.c:1498
+msgstr "Laai van prent het misluk"
+
+#: ../pidgin/gtkutils.c:1499
 #, c-format
 msgid "Cannot send folder %s."
-msgstr "Kan nie gids %s stuur nie."
-
-#: ../pidgin/gtkutils.c:1499
+msgstr "Kan nie vouer %s stuur nie."
+
+#: ../pidgin/gtkutils.c:1500
 #, c-format
 msgid ""
 "%s cannot transfer a folder. You will need to send the files within "
 "individually."
 msgstr ""
-"%s kan nie 'n gids oordra nie. U sal die lêers binne-in afsonderlik moet "
+"%s kan nie 'n vouer oordra nie. U sal die lêers binne-in afsonderlik moet "
 "stuur."
 
-#: ../pidgin/gtkutils.c:1531 ../pidgin/gtkutils.c:1543
-#: ../pidgin/gtkutils.c:1550
+#: ../pidgin/gtkutils.c:1534 ../pidgin/gtkutils.c:1546
+#: ../pidgin/gtkutils.c:1553
 msgid "You have dragged an image"
-msgstr "U het 'n prentjie gesleep"
-
-#: ../pidgin/gtkutils.c:1532
+msgstr "U het 'n prent gesleep"
+
+#: ../pidgin/gtkutils.c:1535
 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 ""
-"U kan hierdie prentjie as 'n lêer oordra, in hierdie boodskap invoeg, of as "
-"die vriendikoon gebruik vir hierdie gebruiker."
-
-#: ../pidgin/gtkutils.c:1538 ../pidgin/gtkutils.c:1558
+"U kan hierdie prent as 'n lêer oordra, in hierdie boodskap invoeg, of as die "
+"vriendikoon gebruik vir hierdie gebruiker."
+
+#: ../pidgin/gtkutils.c:1541 ../pidgin/gtkutils.c:1561
 msgid "Set as buddy icon"
 msgstr "Stel as vriendikoon"
 
-#: ../pidgin/gtkutils.c:1539 ../pidgin/gtkutils.c:1559
+#: ../pidgin/gtkutils.c:1542 ../pidgin/gtkutils.c:1562
 msgid "Send image file"
 msgstr "Stuur die prentlêer"
 
-#: ../pidgin/gtkutils.c:1540 ../pidgin/gtkutils.c:1559
+#: ../pidgin/gtkutils.c:1543 ../pidgin/gtkutils.c:1562
 msgid "Insert in message"
 msgstr "Voeg in boodskap"
 
-#: ../pidgin/gtkutils.c:1544
+#: ../pidgin/gtkutils.c:1547
 msgid "Would you like to set it as the buddy icon for this user?"
 msgstr "Wil u dit as die vriendikoon vir hierdie gebruiker stel?"
 
-#: ../pidgin/gtkutils.c:1551
+#: ../pidgin/gtkutils.c:1554
 msgid ""
 "You can send this image as a file transfer, or use it as the buddy icon for "
 "this user."
 msgstr ""
-"U kan hierdie prentjie as 'n lêeroordrag stuur, of dit as die vriendikoon "
+"U kan hierdie prent as 'n lêeroordrag stuur, of dit as die vriendikoon "
 "gebruik vir hierdie gebruiker."
 
-#: ../pidgin/gtkutils.c:1552
+#: ../pidgin/gtkutils.c:1555
 msgid ""
 "You can insert this image into this message, or use it as the buddy icon for "
 "this user"
 msgstr ""
-"U kan hierdie prentjie in hierdie boodskap invoeg, of as die vriendikoon "
+"U kan hierdie prent in hierdie boodskap invoeg, of as die vriendikoon "
 "gebruik vir hierdie gebruiker"
 
 #. I don't know if we really want to do anything here.  Most of the desktop item types are crap like
@@ -16569,11 +16643,11 @@
 #. * send.  The only logical one is "Application," but do we really want to send a binary and nothing else?
 #. * Probably not.  I'll just give an error and return.
 #. The original patch sent the icon used by the launcher.  That's probably wrong
-#: ../pidgin/gtkutils.c:1610
+#: ../pidgin/gtkutils.c:1614
 msgid "Cannot send launcher"
 msgstr "Kan nie laaier stuur nie"
 
-#: ../pidgin/gtkutils.c:1610
+#: ../pidgin/gtkutils.c:1614
 msgid ""
 "You dragged a desktop launcher. Most likely you wanted to send whatever this "
 "launcher points to instead of this launcher itself."
@@ -16581,7 +16655,7 @@
 "U het 'n werkskermlaaier gesleep. U wou waarskynlik dit stuur waarna die "
 "laaier wys, in plaas van die laaier sélf."
 
-#: ../pidgin/gtkutils.c:2345
+#: ../pidgin/gtkutils.c:2349
 #, c-format
 msgid ""
 "<b>File:</b> %s\n"
@@ -16590,33 +16664,32 @@
 msgstr ""
 "<b>Lêer:</b> %s\n"
 "<b>Lêergroote:</b> %s\n"
-"<b>Prentjiegrootte:</b> %dx%d"
-
-#: ../pidgin/gtkutils.c:2641
+"<b>Prentgrootte:</b> %dx%d"
+
+#: ../pidgin/gtkutils.c:2645
 #, c-format
 msgid "The file '%s' is too large for %s.  Please try a smaller image.\n"
-msgstr "Die lêer '%s' is te groot vir %s.  Probeer asb. 'n kleiner prentjie.\n"
-
-#: ../pidgin/gtkutils.c:2643
+msgstr "Die lêer '%s' is te groot vir %s.  Probeer gerus 'n kleiner prent.\n"
+
+#: ../pidgin/gtkutils.c:2647
 msgid "Icon Error"
 msgstr "Ikoonfout"
 
-#: ../pidgin/gtkutils.c:2644
+#: ../pidgin/gtkutils.c:2648
 msgid "Could not set icon"
 msgstr "Kon nie ikoon stel nie"
 
-#: ../pidgin/gtkutils.c:2744
+#: ../pidgin/gtkutils.c:2748
 #, c-format
 msgid "Failed to open file '%s': %s"
 msgstr "Open van lêer '%s' het misluk: %s"
 
-#: ../pidgin/gtkutils.c:2793
+#: ../pidgin/gtkutils.c:2797
 #, c-format
 msgid ""
 "Failed to load image '%s': reason not known, probably a corrupt image file"
 msgstr ""
-"Laai van beeld '%s' het misluk: rede onbekent, waarskynlik 'n korropte "
-"prentjielêer"
+"Kon nie prent '%s' laai nie: rede onbekend, waarskynlik 'n korrupte prentlêer"
 
 #: ../pidgin/gtkwhiteboard.c:754 ../pidgin/gtkwhiteboard.c:773
 msgid "Save File"
@@ -16672,7 +16745,7 @@
 
 #: ../pidgin/plugins/cap/cap.c:462 ../pidgin/plugins/cap/cap.c:465
 msgid "Response Probability:"
-msgstr "Antwoordwaarskynlikheid:"
+msgstr "Responswaarskynlikheid:"
 
 #: ../pidgin/plugins/cap/cap.c:811
 msgid "Statistics Configuration"
@@ -16681,7 +16754,7 @@
 #. msg_difference spinner
 #: ../pidgin/plugins/cap/cap.c:814
 msgid "Maximum response timeout:"
-msgstr "Maksimum antwoorduittelling:"
+msgstr "Maksimum responsuittelling:"
 
 #: ../pidgin/plugins/cap/cap.c:817 ../pidgin/plugins/cap/cap.c:824
 #: ../pidgin/plugins/cap/cap.c:831 ../pidgin/plugins/timestamp.c:150
@@ -16742,7 +16815,7 @@
 
 #: ../pidgin/plugins/contact_priority.c:68
 msgid "Buddy is offline"
-msgstr "Vriend is aflyn"
+msgstr "Vriend is vanlyn"
 
 #: ../pidgin/plugins/contact_priority.c:90
 msgid "Point values to use when..."
@@ -16770,27 +16843,27 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/contact_priority.c:187
+#: ../pidgin/plugins/contact_priority.c:188
 msgid "Contact Priority"
 msgstr "Kontakprioriteit"
 
 #. *< name
 #. *< version
 #. *< summary
-#: ../pidgin/plugins/contact_priority.c:190
+#: ../pidgin/plugins/contact_priority.c:191
 msgid ""
 "Allows for controlling the values associated with different buddy states."
 msgstr ""
-"Laat beheer van waardes toe wat geassosieer word met verskillende "
+"Maak beheer van waardes moontlik wat geassosieer word met verskillende "
 "vriendstatusse."
 
 #. *< description
-#: ../pidgin/plugins/contact_priority.c:192
+#: ../pidgin/plugins/contact_priority.c:193
 msgid ""
 "Allows for changing the point values of idle/away/offline states for buddies "
 "in contact priority computations."
 msgstr ""
-"Laat verandering van puntwaardes van ledig/weg/aflyn-statusse toe by "
+"Maak verandering van puntwaardes van ledig/weg/vanlyn-statusse moontlik by "
 "kontakprioriteitberekenings."
 
 #: ../pidgin/plugins/convcolors.c:23
@@ -16821,7 +16894,7 @@
 msgid "Received Messages"
 msgstr "Ontvangde boodskappe"
 
-#: ../pidgin/plugins/convcolors.c:210 ../pidgin/plugins/pidginrc.c:251
+#: ../pidgin/plugins/convcolors.c:210 ../pidgin/plugins/pidginrc.c:245
 #, c-format
 msgid "Select Color for %s"
 msgstr "Kies kleur vir %s"
@@ -16857,12 +16930,12 @@
 
 #: ../pidgin/plugins/extplacement.c:111
 msgid "Number of conversations per window"
-msgstr "Aantal gesprekke per venster"
+msgstr "Getal gesprekke per venster"
 
 #: ../pidgin/plugins/extplacement.c:117
 msgid "Separate IM and Chat windows when placing by number"
 msgstr ""
-"Aparte kitsboodskap- en geselsievensters wanneer geplaas word volgens aantal"
+"Aparte kitsboodskap- en geselsievensters wanneer geplaas word volgens getal"
 
 #. *< type
 #. *< ui_requirement
@@ -16878,7 +16951,7 @@
 #. *< version
 #: ../pidgin/plugins/extplacement.c:148
 msgid "Extra conversation placement options."
-msgstr "Ekstra keuses vir gesprekplasing."
+msgstr "Ekstra opsies vir gesprekplasing."
 
 #. *< summary
 #. *  description
@@ -16887,7 +16960,7 @@
 "Restrict the number of conversations per windows, optionally separating IMs "
 "and Chats"
 msgstr ""
-"Beperk die aantal gesprekke per venster en skei moontlik kitsboodskappe en "
+"Perk die getal gesprekke per venster in en skei moontlik kitsboodskappe en "
 "geselsies"
 
 #. Configuration frame
@@ -16923,7 +16996,7 @@
 #. *  summary
 #: ../pidgin/plugins/gestures/gestures.c:298
 msgid "Provides support for mouse gestures"
-msgstr "Verskaf ondersteuning vir muisgebare"
+msgstr "Verskaf steun vir muisgebare"
 
 #. *  description
 #: ../pidgin/plugins/gestures/gestures.c:300
@@ -16935,8 +17008,8 @@
 "Drag up and then to the left to switch to the previous conversation.\n"
 "Drag up and then to the right to switch to the next conversation."
 msgstr ""
-"Verskaf ondersteuning vir muisgebare in gespreksvensters.\n"
-"Sleep die middelmuisknoppie om sekere aksies uit te voer:\n"
+"Maak steun vir muisgebare in gespreksvensters moontlik.\n"
+"Sleep die middelmuisknoppie om sekere aksies te verrig:\n"
 "\n"
 "Sleep af en dan regs om 'n gesprek af te sluit.\n"
 "Sleep op en dan links om na die vorige gesprek te gaan.\n"
@@ -16981,7 +17054,7 @@
 #. Add the expander
 #: ../pidgin/plugins/gevolution/assoc-buddy.c:431
 msgid "User _details"
-msgstr "Gebruiker_detail"
+msgstr "Gebruiker_details"
 
 #. "Associate Buddy" button
 #: ../pidgin/plugins/gevolution/assoc-buddy.c:484
@@ -17040,11 +17113,11 @@
 
 #: ../pidgin/plugins/gevolution/new_person_dialog.c:262
 msgid "Please enter the person's information below."
-msgstr "Gee asb. die persoon se inligting hier onder."
+msgstr "Tik gerus die persoon se inligting hier onder."
 
 #: ../pidgin/plugins/gevolution/new_person_dialog.c:266
 msgid "Please enter the buddy's screen name and account type below."
-msgstr "Gee asb. die vriend se skermnaam en rekeningtipe hier onder."
+msgstr "Tik gerus die vriend se skermnaam en rekeningtipe hier onder."
 
 #: ../pidgin/plugins/gevolution/new_person_dialog.c:286
 msgid "Account type:"
@@ -17095,7 +17168,7 @@
 "\n"
 "<b>Vriendnota</b>: %s"
 
-#: ../pidgin/plugins/history.c:188
+#: ../pidgin/plugins/history.c:195
 msgid "History"
 msgstr "Geskiedenis"
 
@@ -17107,7 +17180,7 @@
 #. *< id
 #: ../pidgin/plugins/iconaway.c:82
 msgid "Iconify on Away"
-msgstr "Minimeer wanneer weg"
+msgstr "Ikonifieer wanneer weg"
 
 #. *< name
 #. *< version
@@ -17115,7 +17188,7 @@
 #. *  description
 #: ../pidgin/plugins/iconaway.c:85 ../pidgin/plugins/iconaway.c:87
 msgid "Iconifies the buddy list and your conversations when you go away."
-msgstr "Minimeer die vriendelys en gesprekke wanneer u weggaan."
+msgstr "Ikonifieer die vriendelys en gesprekke wanneer u weggaan."
 
 #: ../pidgin/plugins/mailchk.c:160
 msgid "Mail Checker"
@@ -17123,7 +17196,7 @@
 
 #: ../pidgin/plugins/mailchk.c:162
 msgid "Checks for new local mail."
-msgstr "Kyk vir nuwe pos plaaslik."
+msgstr "Kontroleer vir nuwe pos plaaslik."
 
 #: ../pidgin/plugins/mailchk.c:163
 msgid "Adds a small box to the buddy list that shows if you have new mail."
@@ -17143,7 +17216,7 @@
 
 #: ../pidgin/plugins/markerline.c:250 ../pidgin/plugins/notify.c:682
 msgid "_IM windows"
-msgstr "Gespre_kvensters"
+msgstr "Kitsboodskap_vensters"
 
 #: ../pidgin/plugins/markerline.c:254 ../pidgin/plugins/notify.c:689
 msgid "C_hat windows"
@@ -17165,11 +17238,11 @@
 
 #: ../pidgin/plugins/musicmessaging/musicmessaging.c:431
 msgid "There was a conflict in running the command:"
-msgstr "Daar was 'n konflik met die loop van die opdrag:"
+msgstr "Daar was 'n konflik met die loop van die bevel:"
 
 #: ../pidgin/plugins/musicmessaging/musicmessaging.c:539
 msgid "Error Running Editor"
-msgstr "Fout met loop van redigeerder"
+msgstr "Kon nie redigeerder laat loop nie"
 
 #: ../pidgin/plugins/musicmessaging/musicmessaging.c:540
 msgid "The following error has occurred:"
@@ -17206,7 +17279,7 @@
 "The Music Messaging Plugin allows a number of users to simultaneously work "
 "on a piece of music by editting a common score in real-time."
 msgstr ""
-"Die musiekboodskap-inprop stel 'n aantal gebruikers in staat om gelyktydig "
+"Die musiekboodskap-inprop stel 'n getal gebruikers in staat om gelyktydig "
 "aan 'n musiekstuk te werk deur gedeelde bladmusiek intyds te redigeer."
 
 #. ---------- "Notify For" ----------
@@ -17234,12 +17307,12 @@
 #. Count method button
 #: ../pidgin/plugins/notify.c:741
 msgid "Insert c_ount of new messages into window title"
-msgstr "Voeg _aantal nuwe boodskappe in venstertitel in"
+msgstr "Voeg _getal nuwe boodskappe in venstertitel in"
 
 #. Count xprop method button
 #: ../pidgin/plugins/notify.c:750
 msgid "Insert count of new message into _X property"
-msgstr "Voeg aantal nuwe boodskappe in _X-eienskap in"
+msgstr "Voeg getal nuwe boodskappe in _X-eienskap in"
 
 #. Urgent method button
 #: ../pidgin/plugins/notify.c:758
@@ -17346,45 +17419,36 @@
 msgid "GtkTreeView Horizontal Separation"
 msgstr "GtkTreeView- horisontale skeiding"
 
-#: ../pidgin/plugins/pidginrc.c:73
+#: ../pidgin/plugins/pidginrc.c:69
 msgid "Conversation Entry"
 msgstr "Gesprekinskrywing"
 
-#: ../pidgin/plugins/pidginrc.c:74
-msgid "Conversation History"
-msgstr "Gesprekgeskiedenis"
-
-#: ../pidgin/plugins/pidginrc.c:75
-msgid "Log Viewer"
-msgstr "Staaflêerbekyker"
-
-#: ../pidgin/plugins/pidginrc.c:76
+#: ../pidgin/plugins/pidginrc.c:70
 msgid "Request Dialog"
 msgstr "Versoek-dialoog"
 
-#: ../pidgin/plugins/pidginrc.c:77
+#: ../pidgin/plugins/pidginrc.c:71
 msgid "Notify Dialog"
 msgstr "Kennisstel-dialoog"
 
-#: ../pidgin/plugins/pidginrc.c:253
+#: ../pidgin/plugins/pidginrc.c:247
 msgid "Select Color"
 msgstr "Kies kleur"
 
-#: ../pidgin/plugins/pidginrc.c:300
-#, c-format
+#: ../pidgin/plugins/pidginrc.c:294
 msgid "Select Interface Font"
-msgstr "Kies koppelvlakskriftipe"
-
-#: ../pidgin/plugins/pidginrc.c:303
+msgstr "Kies koppelvlakfont"
+
+#: ../pidgin/plugins/pidginrc.c:297
 #, c-format
 msgid "Select Font for %s"
-msgstr "Kies skriftipe vir %s"
-
-#: ../pidgin/plugins/pidginrc.c:371
+msgstr "Kies font vir %s"
+
+#: ../pidgin/plugins/pidginrc.c:365
 msgid "GTK+ Interface Font"
-msgstr "GTK+-koppelvlakskriftipe"
-
-#: ../pidgin/plugins/pidginrc.c:391
+msgstr "GTK+-koppelvlakfont"
+
+#: ../pidgin/plugins/pidginrc.c:385
 msgid "GTK+ Text Shortcut Theme"
 msgstr "GTK+-tekskortpadtema"
 
@@ -17408,36 +17472,36 @@
 #. widget_bool_widgets[i]);
 #. }
 #.
-#: ../pidgin/plugins/pidginrc.c:428
+#: ../pidgin/plugins/pidginrc.c:422
 msgid "Interface colors"
 msgstr "Koppelvlakkleure"
 
-#: ../pidgin/plugins/pidginrc.c:452
+#: ../pidgin/plugins/pidginrc.c:446
 msgid "Widget Sizes"
 msgstr "Dingessie-groottes"
 
-#: ../pidgin/plugins/pidginrc.c:473
+#: ../pidgin/plugins/pidginrc.c:467
 msgid "Fonts"
-msgstr "Skriftipes"
-
-#: ../pidgin/plugins/pidginrc.c:497
+msgstr "Fonte"
+
+#: ../pidgin/plugins/pidginrc.c:491
 msgid "Gtkrc File Tools"
-msgstr "Gtkrc-lêergereedskap"
-
-#: ../pidgin/plugins/pidginrc.c:502
+msgstr "Gtkrc-lêernutsgoed"
+
+#: ../pidgin/plugins/pidginrc.c:496
 #, c-format
 msgid "Write settings to %s%sgtkrc-2.0"
 msgstr "Skryf instellings na %s%sgtkrc-2.0"
 
-#: ../pidgin/plugins/pidginrc.c:511
+#: ../pidgin/plugins/pidginrc.c:505
 msgid "Re-read gtkrc files"
 msgstr "Lees gtkrc-lêers weer"
 
-#: ../pidgin/plugins/pidginrc.c:544
+#: ../pidgin/plugins/pidginrc.c:543
 msgid "Pidgin GTK+ Theme Control"
 msgstr "Pidgin GTK+-temabeheer"
 
-#: ../pidgin/plugins/pidginrc.c:546 ../pidgin/plugins/pidginrc.c:547
+#: ../pidgin/plugins/pidginrc.c:545 ../pidgin/plugins/pidginrc.c:546
 msgid "Provides access to commonly used gtkrc settings."
 msgstr "Verskaf toegang tot algemeen gebruikte gtkrc-instellings."
 
@@ -17490,7 +17554,7 @@
 #. *  summary
 #: ../pidgin/plugins/relnot.c:146
 msgid "Checks periodically for new releases."
-msgstr "Kyk af en toe vir nuwe weergawes."
+msgstr "Kontroleer af en toe vir nuwe weergawes."
 
 #. *  description
 #: ../pidgin/plugins/relnot.c:148
@@ -17498,8 +17562,8 @@
 "Checks periodically for new releases and notifies the user with the "
 "ChangeLog."
 msgstr ""
-"Kyk van tyd tot tyd vir nuwe weergawes en laat weet die gebruiker met die "
-"veranderings."
+"Kontroleer van tyd tot tyd vir nuwe weergawes en laat weet die gebruiker met "
+"die veranderinge."
 
 #: ../pidgin/plugins/spellchk.c:1962
 msgid "Duplicate Correction"
@@ -17554,17 +17618,17 @@
 
 #: ../pidgin/plugins/spellchk.c:2338
 msgid "General Text Replacement Options"
-msgstr "Algemene keuses vir teksvervanging"
+msgstr "Algemene opsies vir teksvervanging"
 
 #: ../pidgin/plugins/spellchk.c:2339
 msgid "Enable replacement of last word on send"
 msgstr "Aktiveer vervanging van laaste woord tydens stuur"
 
-#: ../pidgin/plugins/spellchk.c:2370
+#: ../pidgin/plugins/spellchk.c:2372
 msgid "Text replacement"
 msgstr "Teksvervanging"
 
-#: ../pidgin/plugins/spellchk.c:2372 ../pidgin/plugins/spellchk.c:2373
+#: ../pidgin/plugins/spellchk.c:2374 ../pidgin/plugins/spellchk.c:2375
 msgid "Replaces text in outgoing messages according to user-defined rules."
 msgstr ""
 "Vervang teks in uitgaande boodskappe volgens gebruikergespesifiseerde reëls."
@@ -17575,7 +17639,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/ticker/ticker.c:74 ../pidgin/plugins/ticker/ticker.c:354
+#: ../pidgin/plugins/ticker/ticker.c:74 ../pidgin/plugins/ticker/ticker.c:356
 msgid "Buddy Ticker"
 msgstr "Vriendelint"
 
@@ -17583,7 +17647,7 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../pidgin/plugins/ticker/ticker.c:357 ../pidgin/plugins/ticker/ticker.c:359
+#: ../pidgin/plugins/ticker/ticker.c:359 ../pidgin/plugins/ticker/ticker.c:361
 msgid "A horizontal scrolling version of the buddy list."
 msgstr "'n Weergawe van die vriendelys wat horisontaal rol."
 
@@ -17615,10 +17679,9 @@
 
 #: ../pidgin/plugins/timestamp_format.c:23
 msgid "Timestamp Format Options"
-msgstr "Tydstempelformatering"
+msgstr "Tydstempelformateeropsies"
 
 #: ../pidgin/plugins/timestamp_format.c:26
-#, c-format
 msgid "_Force 24-hour time format"
 msgstr "_Dwing 24-uur-tydformaat"
 
@@ -17667,7 +17730,7 @@
 "This plugin allows the user to customize conversation and logging message "
 "timestamp formats."
 msgstr ""
-"Hierdie inprop laat die gebruiker toe om die formaat van tydstempels in "
+"Hierdie inprop stel die gebruiker in staat om die formaat van tydstempels in "
 "gesprekke in staaflêers aan te pas."
 
 #: ../pidgin/plugins/win32/transparency/win2ktrans.c:175
@@ -17739,7 +17802,7 @@
 "Hierdie inprop stel wisselende alfadeursigtigheid op gespreksvensters en die "
 "vriendelys in staat.\n"
 "\n"
-"* Let wel: Hierdie inprop vereis Win2k of jonger."
+"* Let wel: Hierdie inprop vereis Win2000 of jonger."
 
 #: ../pidgin/plugins/win32/winprefs/winprefs.c:303
 msgid "GTK+ Runtime Version"
@@ -17775,19 +17838,19 @@
 
 #: ../pidgin/plugins/win32/winprefs/winprefs.c:371
 msgid "Windows Pidgin Options"
-msgstr "Windows Pidgin-keuses"
+msgstr "Windows Pidgin-opsies"
 
 #: ../pidgin/plugins/win32/winprefs/winprefs.c:373
 msgid "Options specific to Pidgin for Windows."
-msgstr "Keuses spesifiek aan Pidgin vir Windows."
+msgstr "Opsies spesifiek aan Pidgin vir Windows."
 
 #: ../pidgin/plugins/win32/winprefs/winprefs.c:374
 msgid ""
 "Provides options specific to Pidgin for Windows , such as buddy list docking."
 msgstr ""
-"Verskaf keuses spesifiek vir Pidgin op Windows, soos vriendelysdokking."
-
-#: ../pidgin/plugins/xmppconsole.c:667
+"Verskaf opsies spesifiek vir Pidgin op Windows, soos vriendelysdokking."
+
+#: ../pidgin/plugins/xmppconsole.c:670
 msgid "<font color='#777777'>Logged out.</font>"
 msgstr "<font color='#777777'>Afgemeld.</font>"
 
@@ -17797,149 +17860,104 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/xmppconsole.c:746 ../pidgin/plugins/xmppconsole.c:841
-#: ../pidgin/plugins/xmppconsole.c:860
+#: ../pidgin/plugins/xmppconsole.c:749 ../pidgin/plugins/xmppconsole.c:844
+#: ../pidgin/plugins/xmppconsole.c:863
 msgid "XMPP Console"
 msgstr "XMPP-konsole"
 
-#: ../pidgin/plugins/xmppconsole.c:753
+#: ../pidgin/plugins/xmppconsole.c:756
 msgid "Account: "
 msgstr "Rekening: "
 
-#: ../pidgin/plugins/xmppconsole.c:780
+#: ../pidgin/plugins/xmppconsole.c:783
 msgid "<font color='#777777'>Not connected to XMPP</font>"
-msgstr "<font color='#777777'>Nie aan XMPP verbind nie</font>"
-
-#: ../pidgin/plugins/xmppconsole.c:790
+msgstr "<font color='#777777'>Nie aan XMPP gekoppel nie</font>"
+
+#: ../pidgin/plugins/xmppconsole.c:793
 msgid "Insert an <iq/> stanza."
 msgstr "Voeg 'n <iq/>-stanza in."
 
-#: ../pidgin/plugins/xmppconsole.c:799
+#: ../pidgin/plugins/xmppconsole.c:802
 msgid "Insert a <presence/> stanza."
 msgstr "Voeg 'n <presence/>-stanza in."
 
-#: ../pidgin/plugins/xmppconsole.c:808
+#: ../pidgin/plugins/xmppconsole.c:811
 msgid "Insert a <message/> stanza."
 msgstr "Voeg 'n <message/>-stanza in."
 
 #. *< name
 #. *< version
 #. *  summary
-#: ../pidgin/plugins/xmppconsole.c:863
+#: ../pidgin/plugins/xmppconsole.c:866
 msgid "Send and receive raw XMPP stanzas."
 msgstr "Stuur en ontvang rou XMPP-stanzas."
 
 #. *  description
-#: ../pidgin/plugins/xmppconsole.c:865
+#: ../pidgin/plugins/xmppconsole.c:868
 msgid "This plugin is useful for debbuging XMPP servers or clients."
 msgstr "Hierdie inprop is nuttig om XMPP-bedieners of -kliënte te ontfout."
 
-#, fuzzy
-#~ msgid "Offline buddies"
-#~ msgstr "Wys aflynvriende"
-
-#, fuzzy
-#~ msgid "Sort"
-#~ msgstr "Poort"
-
-#, fuzzy
-#~ msgid "By Status"
-#~ msgstr "Volgens status"
-
-#, fuzzy
-#~ msgid "By Log Size"
-#~ msgstr "Volgens staaflêergrootte"
-
-#, fuzzy
+#~ msgid "The dependent plugin %s failed to unload."
+#~ msgstr "Ontlaai van die afhanklike inprop %s het misluk."
+
+#~ msgid "There were errors unloading the plugin."
+#~ msgstr "Kon nie inprop volledig ontlaai nie."
+
 #~ msgid "Unable to connect to contact server"
-#~ msgstr "Kan nie aan bediener verbind nie."
-
-#, fuzzy
-#~ msgid "Unable to retrieve MSN Address Book"
-#~ msgstr "Kies notasadresboekinligting"
-
-#, fuzzy
-#~ msgid "Current media"
-#~ msgstr "Huidige teken"
-
-#, fuzzy
-#~ msgid "Windows Live Messenger Protocol Plugin"
-#~ msgstr "Inprop vir Novell GroupWise-boodskapperprotokol"
-
-#, fuzzy
-#~ msgid "Windows Live ID authentication Failed"
-#~ msgstr "Mislukking: Stawing het misluk"
-
-#~ msgid "%s just sent you a Nudge!"
-#~ msgstr "%s het u so pas 'n stootjie gestuur!"
-
-#, fuzzy
-#~ msgid "Unknown error (%d)"
-#~ msgstr "Onbekende fout"
-
-#, fuzzy
+#~ msgstr "Kon nie koppel met kontakbediener nie"
+
 #~ msgid "Unable to connect to OIM server"
-#~ msgstr "Kan nie aan bediener verbind nie."
-
-#, fuzzy
-#~ msgid "%s (%s) changed status from %s to %s"
-#~ msgstr "%s het van status %s na %s verander"
-
-#, fuzzy
-#~ msgid "%s (%s) is now %s"
-#~ msgstr "%s is nou %s"
-
-#, fuzzy
-#~ msgid "%s (%s) is no longer %s"
-#~ msgstr "%s is nie meer %s nie"
-
-#, fuzzy
-#~ msgid "_Merge"
-#~ msgstr "_Boodskap:"
-
-#, fuzzy
-#~ msgid "_Send File..."
-#~ msgstr "_Stuur lêer"
-
-#, fuzzy
-#~ msgid "Add Buddy _Pounce..."
-#~ msgstr "Voeg vriendwag by..."
-
-#, fuzzy
-#~ msgid "Hide when offline"
-#~ msgstr "Nie toegelaat wanneer aflyn nie"
-
-#, fuzzy
-#~ msgid "Show when offline"
-#~ msgstr "Nie toegelaat wanneer aflyn nie"
-
-#, fuzzy
-#~ msgid "Add _Buddy..."
-#~ msgstr "Voeg vriend by"
-
-#, fuzzy
-#~ msgid "Add C_hat..."
-#~ msgstr "Voeg geselsie by"
-
-#, fuzzy
-#~ msgid "Persistent"
-#~ msgstr "Persies"
-
-#, fuzzy
-#~ msgid "/Accounts/Manage"
-#~ msgstr "Rekeninge"
-
-#, fuzzy
-#~ msgid "A_ccount:"
-#~ msgstr "Rekening:"
-
-#, fuzzy
-#~ msgid "S_end To"
-#~ msgstr "Stuur na"
-
-#, fuzzy
-#~ msgid "_Smile!"
-#~ msgstr "Glimlag!"
+#~ msgstr "Kan nie aan OIM-bediener koppel nie"
+
+#~ msgid "Show empty groups"
+#~ msgstr "Wys leë groepe"
+
+#~ msgid "Show offline buddies"
+#~ msgstr "Wys vanlynvriende"
+
+#~ msgid "Sort by status"
+#~ msgstr "Rangskik volgens status"
+
+#~ msgid "Sort alphabetically"
+#~ msgstr "Rangskik alfabeties"
+
+#~ msgid "Sort by log size"
+#~ msgstr "Rangskik volgens staaflêergrootte"
+
+#~ msgid "Has you"
+#~ msgstr "Het u"
+
+#~ msgid "MSN Protocol Plugin"
+#~ msgstr "MSN-protokolinprop"
+
+#~ msgid "Add Buddy _Pounce"
+#~ msgstr "Voeg vriend_wag by"
+
+#~ msgid "Add a _Buddy"
+#~ msgstr "Voeg 'n _vriend by"
+
+#~ msgid "Add a C_hat"
+#~ msgstr "Voeg 'n _gesprek by"
+
+#~ msgid "/Accounts/Add\\/Edit"
+#~ msgstr "Voeg by \\/ wysig"
+
+#~ msgid "_Send To"
+#~ msgstr "_Stuur na"
+
+#~ msgid "_Smiley"
+#~ msgstr "_Gesiggie"
+
+#~ msgid "<b>You have %d new e-mail.</b>"
+#~ msgid_plural "<b>You have %d new e-mails.</b>"
+#~ msgstr[0] "<b>U het %d nuwe e-pos.</b>"
+#~ msgstr[1] "<b>U het %d nuwe e-posse.</b>"
+
+#~ msgid "Conversation History"
+#~ msgstr "Gesprekgeskiedenis"
+
+#~ msgid "Log Viewer"
+#~ msgstr "Staaflêerleser"
 
 #~ msgid "You have just sent a Nudge!"
 #~ msgstr "U het so pas 'n stootjie gestuur!"
@@ -18141,9 +18159,8 @@
 #~ msgid "Slovack"
 #~ msgstr "Slowaaks"
 
-#, fuzzy
-#~ msgid "<FONT SIZE=\"4\">IRC:</FONT> #pidgwin on irc.freenode.net<BR><BR>"
-#~ msgstr "<FONT SIZE=\"4\">IRC:</FONT> #wingaim op irc.freenode.net<BR><BR>"
+#~ msgid "Larger font size"
+#~ msgstr "Groter skrif"
 
 #~ msgid "Smaller font size"
 #~ msgstr "Kleiner skrif"