pidgin: 4b739cc4: Update po files to include Installer str...

datallah at pidgin.im datallah at pidgin.im
Tue May 18 23:31:53 EDT 2010


-----------------------------------------------------------------
Revision: 4b739cc4934010a19cba71025ce00013d7605177
Ancestor: 2fed4f35155d013ce6004ded9ef6f4f50bcf7d85
Author: datallah at pidgin.im
Date: 2010-05-18T00:58:43
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/4b739cc4934010a19cba71025ce00013d7605177

Modified files:
        po/af.po po/am.po po/ar.po po/as.po po/az.po po/be at latin.po
        po/bg.po po/bn.po po/bn_IN.po po/bs.po po/ca.po
        po/ca at valencia.po po/cs.po po/da.po po/de.po po/dz.po
        po/el.po po/en_AU.po po/en_CA.po po/en_GB.po po/eo.po
        po/es.po po/et.po po/eu.po po/fa.po po/fi.po po/fr.po
        po/ga.po po/gl.po po/gu.po po/he.po po/hi.po po/hu.po
        po/hy.po po/id.po po/it.po po/ja.po po/ka.po po/km.po
        po/kn.po po/ko.po po/ku.po po/lo.po po/lt.po po/mk.po
        po/ml.po po/mn.po po/mr.po po/ms_MY.po po/my_MM.po po/nb.po
        po/ne.po po/nl.po po/nn.po po/oc.po po/or.po po/pa.po
        po/pl.po po/ps.po po/pt.po po/pt_BR.po po/ro.po po/ru.po
        po/si.po po/sk.po po/sl.po po/sq.po po/sr.po po/sr at latin.po
        po/sv.po po/sw.po po/ta.po po/te.po po/th.po po/tr.po
        po/uk.po po/ur.po po/vi.po po/xh.po po/zh_CN.po po/zh_HK.po
        po/zh_TW.po

ChangeLog: 

Update po files to include Installer strings

-------------- next part --------------
============================================================
--- po/af.po	1e06f6e4dcd2ae3b79419e880c1f772808bda28d
+++ po/af.po	1040b8ff19d0b129b0873dcd737e0d18b8fd5d6e
@@ -7,30 +7,26 @@ msgstr ""
 msgstr ""
 "Project-Id-Version: 2.7.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-10 09:59-0400\n"
+"POT-Creation-Date: 2010-05-17 20:52-0400\n"
 "PO-Revision-Date: 2010-05-11 00:19+0200\n"
 "Last-Translator: F Wolff <friedel at translate.org.za>\n"
 "Language-Team: translate-discuss-af at lists.sourceforge.net\n"
-"Language: af\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: af\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Virtaal 0.6.0\n"
 
 #. Translators may want to transliterate the name.
 #. It is not to be translated.
-#: ../finch/finch.c:66 ../finch/finch.c:318 ../finch/finch.c:347
-#: ../finch/finch.c:434
 msgid "Finch"
 msgstr "Finch"
 
-#: ../finch/finch.c:230
 #, c-format
 msgid "%s. Try `%s -h' for more information.\n"
 msgstr "%s. Probeer `%s -h' vir meer inligting.\n"
 
-#: ../finch/finch.c:232
 #, c-format
 msgid ""
 "%s\n"
@@ -51,7 +47,6 @@ msgstr ""
 "  -n, --nologin       moenie outomaties aanmeld nie\n"
 "  -v, --version       wys die huidige weergawe en sluit af\n"
 
-#: ../finch/finch.c:345 ../pidgin/gtkmain.c:822
 #, c-format
 msgid ""
 "%s encountered errors migrating your settings from %s to %s. Please "
@@ -59,273 +54,108 @@ msgstr ""
 "http://developer.pidgin.im"
 msgstr ""
 "%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"
+"en handel die migrasie handmatig af. Rapporteer gerus hierdie fout by http://"
+"developer.pidgin.im"
 
 #. the user did not fill in the captcha
-#: ../finch/gntaccount.c:128 ../finch/gntaccount.c:507 ../finch/gntblist.c:646
-#: ../finch/gntblist.c:813 ../finch/gntplugin.c:198 ../finch/gntplugin.c:246
-#: ../finch/gntrequest.c:390 ../finch/gntstatus.c:303 ../finch/gntstatus.c:312
-#: ../finch/plugins/gntclipboard.c:115 ../finch/plugins/gntclipboard.c:121
-#: ../finch/plugins/gntclipboard.c:128
-#: ../libpurple/protocols/jabber/chat.c:761
-#: ../libpurple/protocols/jabber/chat.c:772
-#: ../libpurple/protocols/jabber/jabber.c:2260
-#: ../libpurple/protocols/jabber/jutil.c:666
-#: ../libpurple/protocols/mxit/login.c:518
-#: ../libpurple/protocols/mxit/protocol.c:2029
-#: ../libpurple/protocols/qq/qq_process.c:91
-#: ../libpurple/protocols/silc/ops.c:77 ../libpurple/protocols/silc/ops.c:1462
-#: ../libpurple/protocols/silc10/ops.c:1451
-#: ../pidgin/plugins/disco/xmppdisco.c:514
-#: ../pidgin/plugins/disco/xmppdisco.c:519
 msgid "Error"
 msgstr "Fout"
 
-#: ../finch/gntaccount.c:128
 msgid "Account was not added"
 msgstr "Rekening is nie bygevoeg nie"
 
-#: ../finch/gntaccount.c:129
 msgid "Username of an account must be non-empty."
 msgstr "Gebruikeraam van rekening kan nie leeg wees nie."
 
-#: ../finch/gntaccount.c:459
 msgid "New mail notifications"
 msgstr "Kennisgewings vir nuwe pos"
 
-#: ../finch/gntaccount.c:469
 msgid "Remember password"
 msgstr "Onthou wagwoord"
 
-#: ../finch/gntaccount.c:508
 msgid "There are no protocol plugins installed."
 msgstr "Daar is geen protokolinproppe ge?nstalleer nie."
 
-#: ../finch/gntaccount.c:509
 msgid "(You probably forgot to 'make install'.)"
 msgstr "(U't waarskynlik vergeet om te 'make install'.)"
 
-#: ../finch/gntaccount.c:519 ../finch/gntconn.c:138
-#: ../pidgin/gtkaccount.c:1504 ../pidgin/gtkblist.c:5186
 msgid "Modify Account"
 msgstr "Wysig rekening"
 
-#: ../finch/gntaccount.c:519
 msgid "New Account"
 msgstr "Nuwe rekening"
 
-#: ../finch/gntaccount.c:545 ../pidgin/gtkft.c:665
 msgid "Protocol:"
 msgstr "Protokol:"
 
-#: ../finch/gntaccount.c:553
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:287
 msgid "Username:"
 msgstr "Gebruikernaam:"
 
-#: ../finch/gntaccount.c:566
 msgid "Password:"
 msgstr "Wagwoord:"
 
-#: ../finch/gntaccount.c:576
 msgid "Alias:"
 msgstr "Alias:"
 
 #. Register checkbox
-#: ../finch/gntaccount.c:587
 msgid "Create this account on the server"
 msgstr "Skep hierdie rekening op die bediener"
 
 #. Cancel button
 #. Cancel
-#: ../finch/gntaccount.c:603 ../finch/gntaccount.c:667
-#: ../finch/gntaccount.c:963 ../finch/gntblist.c:696 ../finch/gntblist.c:802
-#: ../finch/gntblist.c:850 ../finch/gntblist.c:1206 ../finch/gntblist.c:1445
-#: ../finch/gntblist.c:1579 ../finch/gntblist.c:2758 ../finch/gntblist.c:2809
-#: ../finch/gntblist.c:2883 ../finch/gntblist.c:2945 ../finch/gntcertmgr.c:91
-#: ../finch/gntplugin.c:534 ../finch/gntpounce.c:473 ../finch/gntpounce.c:681
-#: ../finch/gntprefs.c:266 ../finch/gntsound.c:1059 ../finch/gntstatus.c:147
-#: ../finch/gntstatus.c:487 ../finch/gntstatus.c:612
-#: ../finch/plugins/gnthistory.c:182 ../libpurple/account.c:1172
-#: ../libpurple/account.c:1514 ../libpurple/account.c:1549
-#: ../libpurple/conversation.c:1293 ../libpurple/conversation.c:2120
-#: ../libpurple/plugins/buddynote.c:51 ../libpurple/protocols/gg/gg.c:473
-#: ../libpurple/protocols/gg/gg.c:615 ../libpurple/protocols/gg/gg.c:744
-#: ../libpurple/protocols/gg/gg.c:821
-#: ../libpurple/protocols/jabber/buddy.c:681
-#: ../libpurple/protocols/jabber/buddy.c:2214
-#: ../libpurple/protocols/jabber/buddy.c:2250
-#: ../libpurple/protocols/jabber/chat.c:871
-#: ../libpurple/protocols/jabber/jabber.c:1426
-#: ../libpurple/protocols/jabber/jabber.c:1437
-#: ../libpurple/protocols/jabber/jabber.c:2466
-#: ../libpurple/protocols/jabber/jabber.c:3298
-#: ../libpurple/protocols/jabber/si.c:1581
-#: ../libpurple/protocols/jabber/usernick.c:83
-#: ../libpurple/protocols/jabber/xdata.c:404
-#: ../libpurple/protocols/msn/msn.c:361 ../libpurple/protocols/msn/msn.c:379
-#: ../libpurple/protocols/msn/msn.c:396 ../libpurple/protocols/msn/msn.c:413
-#: ../libpurple/protocols/msn/msn.c:434
-#: ../libpurple/protocols/mxit/actions.c:117
-#: ../libpurple/protocols/mxit/actions.c:359
-#: ../libpurple/protocols/mxit/login.c:360
-#: ../libpurple/protocols/mxit/login.c:684
-#: ../libpurple/protocols/myspace/user.c:826
-#: ../libpurple/protocols/myspace/user.c:887
-#: ../libpurple/protocols/oscar/oscar.c:6771
-#: ../libpurple/protocols/oscar/peer.c:1064
-#: ../libpurple/protocols/qq/buddy_info.c:443
-#: ../libpurple/protocols/qq/buddy_opt.c:333
-#: ../libpurple/protocols/qq/buddy_opt.c:628
-#: ../libpurple/protocols/qq/buddy_opt.c:677
-#: ../libpurple/protocols/qq/buddy_opt.c:1145
-#: ../libpurple/protocols/qq/group.c:112
-#: ../libpurple/protocols/qq/group_join.c:151
-#: ../libpurple/protocols/qq/group_join.c:336
-#: ../libpurple/protocols/qq/group_opt.c:127
-#: ../libpurple/protocols/qq/group_opt.c:355
-#: ../libpurple/protocols/qq/qq_base.c:882
-#: ../libpurple/protocols/sametime/sametime.c:3462
-#: ../libpurple/protocols/sametime/sametime.c:3548
-#: ../libpurple/protocols/sametime/sametime.c:3722
-#: ../libpurple/protocols/sametime/sametime.c:5475
-#: ../libpurple/protocols/sametime/sametime.c:5565
-#: ../libpurple/protocols/sametime/sametime.c:5690
-#: ../libpurple/protocols/silc/buddy.c:459
-#: ../libpurple/protocols/silc/buddy.c:1084
-#: ../libpurple/protocols/silc/buddy.c:1199
-#: ../libpurple/protocols/silc/chat.c:622
-#: ../libpurple/protocols/silc/chat.c:756
-#: ../libpurple/protocols/silc/ops.c:1822
-#: ../libpurple/protocols/silc/silc.c:1059
-#: ../libpurple/protocols/silc/silc.c:1267
-#: ../libpurple/protocols/silc10/buddy.c:468
-#: ../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:1910
-#: ../libpurple/protocols/silc10/silc.c:761
-#: ../libpurple/protocols/silc10/silc.c:967
-#: ../libpurple/protocols/yahoo/libymsg.c:1287
-#: ../libpurple/protocols/yahoo/libymsg.c:4319
-#: ../libpurple/protocols/yahoo/libymsg.c:4330
-#: ../libpurple/protocols/yahoo/yahoo_aliases.c:589
-#: ../libpurple/protocols/yahoo/yahoo_aliases.c:600
-#: ../pidgin/gtkaccount.c:1871 ../pidgin/gtkaccount.c:2415
-#: ../pidgin/gtkblist.c:710 ../pidgin/gtkblist.c:3632
-#: ../pidgin/gtkblist.c:7356 ../pidgin/gtkcertmgr.c:195
-#: ../pidgin/gtkdialogs.c:826 ../pidgin/gtkdialogs.c:965
-#: ../pidgin/gtkdialogs.c:1057 ../pidgin/gtkdialogs.c:1077
-#: ../pidgin/gtkdialogs.c:1101 ../pidgin/gtkdialogs.c:1123
-#: ../pidgin/gtkdialogs.c:1171 ../pidgin/gtkdialogs.c:1212
-#: ../pidgin/gtkdialogs.c:1268 ../pidgin/gtkdialogs.c:1307
-#: ../pidgin/gtkdialogs.c:1334 ../pidgin/gtkimhtmltoolbar.c:448
-#: ../pidgin/gtklog.c:324 ../pidgin/gtkplugin.c:308 ../pidgin/gtkpounce.c:1130
-#: ../pidgin/gtkprivacy.c:505 ../pidgin/gtkprivacy.c:521
-#: ../pidgin/gtkprivacy.c:546 ../pidgin/gtkprivacy.c:560
-#: ../pidgin/gtkrequest.c:301 ../pidgin/gtksavedstatuses.c:317
-#: ../pidgin/gtkstatusbox.c:1614 ../pidgin/gtkutils.c:1609
-#: ../pidgin/gtkutils.c:1629 ../pidgin/plugins/disco/gtkdisco.c:246
 msgid "Cancel"
 msgstr "Kanselleer"
 
 #. Save button
 #. Save
-#: ../finch/gntaccount.c:607 ../finch/gntcertmgr.c:311 ../finch/gntdebug.c:338
-#: ../finch/gntplugin.c:534 ../finch/gntpounce.c:479 ../finch/gntprefs.c:266
-#: ../finch/gntsound.c:1056 ../finch/gntstatus.c:490 ../finch/gntstatus.c:600
-#: ../libpurple/account.c:1548 ../libpurple/plugins/buddynote.c:50
-#: ../libpurple/protocols/jabber/buddy.c:680 ../pidgin/gtkblist.c:710
-#: ../pidgin/gtkdebug.c:761 ../pidgin/gtkdebug.c:763
-#: ../pidgin/gtkrequest.c:307
 msgid "Save"
 msgstr "Stoor"
 
-#: ../finch/gntaccount.c:660 ../pidgin/gtkaccount.c:1862
-#: ../pidgin/gtksavedstatuses.c:305 ../pidgin/gtkstatusbox.c:1608
 #, c-format
 msgid "Are you sure you want to delete %s?"
 msgstr "Wil u definitief %s skrap?"
 
-#: ../finch/gntaccount.c:663
 msgid "Delete Account"
 msgstr "Skrap rekening"
 
 #. Delete button
-#: ../finch/gntaccount.c:666 ../finch/gntaccount.c:781
-#: ../finch/gntcertmgr.c:319 ../finch/gntpounce.c:680 ../finch/gntpounce.c:743
-#: ../finch/gntstatus.c:146 ../finch/gntstatus.c:212
-#: ../pidgin/gtkaccount.c:1870 ../pidgin/gtklog.c:323
-#: ../pidgin/gtkpounce.c:1129 ../pidgin/gtkrequest.c:304
-#: ../pidgin/gtksavedstatuses.c:316 ../pidgin/gtkstatusbox.c:1613
 msgid "Delete"
 msgstr "Skrap"
 
-#: ../finch/gntaccount.c:742 ../finch/gntblist.c:2624 ../finch/gntui.c:99
-#: ../pidgin/gtkaccount.c:2276
 msgid "Accounts"
 msgstr "Rekeninge"
 
-#: ../finch/gntaccount.c:748
 msgid "You can enable/disable accounts from the following list."
 msgstr "U kan rekeninge aktiveer/deaktiveer vanuit die volgende lys."
 
 #. Add button
-#: ../finch/gntaccount.c:772 ../finch/gntaccount.c:962 ../finch/gntblist.c:695
-#: ../finch/gntblist.c:802 ../finch/gntblist.c:850 ../finch/gntblist.c:3065
-#: ../finch/gntcertmgr.c:306 ../finch/gntnotify.c:448 ../finch/gntpounce.c:727
-#: ../finch/gntroomlist.c:276 ../finch/gntstatus.c:201
-#: ../libpurple/protocols/gg/gg.c:820
-#: ../libpurple/protocols/qq/buddy_opt.c:1144
-#: ../libpurple/protocols/sametime/sametime.c:5564
-#: ../libpurple/protocols/silc/chat.c:621
-#: ../libpurple/protocols/silc10/chat.c:599 ../pidgin/gtkaccount.c:2414
-#: ../pidgin/gtkblist.c:7355 ../pidgin/gtkconv.c:1695
-#: ../pidgin/gtkrequest.c:305
 msgid "Add"
 msgstr "Voeg by"
 
 #. Modify button
-#: ../finch/gntaccount.c:777 ../finch/gntpounce.c:735
 msgid "Modify"
 msgstr "Wysig"
 
-#: ../finch/gntaccount.c:885 ../pidgin/gtkaccount.c:2361
 #, 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:958 ../pidgin/gtkaccount.c:2413
 msgid "Add buddy to your list?"
 msgstr "Voeg vriend by u lys?"
 
-#: ../finch/gntaccount.c:1018 ../pidgin/gtkaccount.c:2471
 #, 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:1043 ../finch/gntaccount.c:1046
-#: ../finch/gntaccount.c:1073 ../pidgin/gtkaccount.c:2494
-#: ../pidgin/gtkaccount.c:2501
 msgid "Authorize buddy?"
 msgstr "Magtig vriend?"
 
-#: ../finch/gntaccount.c:1050 ../finch/gntaccount.c:1077
-#: ../libpurple/protocols/qq/group_info.c:161
-#: ../libpurple/protocols/qq/group_opt.c:451 ../pidgin/gtkaccount.c:2495
-#: ../pidgin/gtkaccount.c:2502
 msgid "Authorize"
 msgstr "Magtig"
 
-#: ../finch/gntaccount.c:1051 ../finch/gntaccount.c:1078
-#: ../libpurple/protocols/qq/group_opt.c:450 ../pidgin/gtkaccount.c:2496
-#: ../pidgin/gtkaccount.c:2503
 msgid "Deny"
 msgstr "Weier"
 
-#: ../finch/gntblist.c:278
 #, c-format
 msgid ""
 "Online: %d\n"
@@ -334,12 +164,10 @@ msgstr ""
 "Aanlyn: %d\n"
 "Totaal: %d"
 
-#: ../finch/gntblist.c:287
 #, c-format
 msgid "Account: %s (%s)"
 msgstr "Rekening: %s (%s)"
 
-#: ../finch/gntblist.c:299
 #, c-format
 msgid ""
 "\n"
@@ -348,427 +176,219 @@ msgstr ""
 "\n"
 "Laas gesien: %s gelede"
 
-#: ../finch/gntblist.c:319 ../pidgin/gtkprefs.c:422 ../pidgin/gtkprefs.c:543
-#: ../pidgin/gtkprefs.c:551
-#: ../pidgin/pixmaps/emotes/default/24/default.theme.in.h:1
-#: ../pidgin/plugins/vvconfig.c:84 ../pidgin/plugins/vvconfig.c:89
 msgid "Default"
 msgstr "Verstek"
 
-#: ../finch/gntblist.c:635
 msgid "You must provide a username for the buddy."
 msgstr "U moet 'n gebruikernaam verskaf vir die vriend."
 
-#: ../finch/gntblist.c:637
 msgid "You must provide a group."
 msgstr "U moet 'n groep voorsien."
 
-#: ../finch/gntblist.c:639
 msgid "You must select an account."
 msgstr "U moet 'n rekening kies."
 
-#: ../finch/gntblist.c:641
 msgid "The selected account is not online."
 msgstr "Die gekose rekening is nie aanlyn nie."
 
-#: ../finch/gntblist.c:646
 msgid "Error adding buddy"
 msgstr "Kon nie vriend byvoeg"
 
-#: ../finch/gntblist.c:677 ../libpurple/protocols/irc/irc.c:1019
-#: ../libpurple/protocols/irc/msgs.c:366
-#: ../libpurple/protocols/jabber/jabber.c:1360
-#: ../libpurple/protocols/jabber/jabber.c:1362
-#: ../libpurple/protocols/oscar/oscar.c:4423
-#: ../libpurple/protocols/silc/buddy.c:1554
-#: ../libpurple/protocols/silc/ops.c:1199
-#: ../libpurple/protocols/silc/ops.c:1202
-#: ../libpurple/protocols/silc/ops.c:1338
-#: ../libpurple/protocols/silc/ops.c:1341
-#: ../libpurple/protocols/silc/silc.c:1241
-#: ../libpurple/protocols/silc10/buddy.c:1559
-#: ../libpurple/protocols/silc10/ops.c:1191
-#: ../libpurple/protocols/silc10/ops.c:1194
-#: ../libpurple/protocols/silc10/ops.c:1340
-#: ../libpurple/protocols/silc10/ops.c:1343
-#: ../libpurple/protocols/silc10/silc.c:941 ../pidgin/gtkaccount.c:1944
-#: ../pidgin/gtksavedstatuses.c:962
 msgid "Username"
 msgstr "Gebruikernaam"
 
-#: ../finch/gntblist.c:680
 msgid "Alias (optional)"
 msgstr "Alias (opsioneel)"
 
-#: ../finch/gntblist.c:683
 msgid "Add in group"
 msgstr "Voeg by in groep"
 
-#: ../finch/gntblist.c:687 ../finch/gntblist.c:781 ../finch/gntblist.c:1790
-#: ../finch/gntblist.c:2739 ../finch/gntblist.c:2795 ../finch/gntblist.c:2870
-#: ../finch/gntblist.c:2930 ../finch/gntnotify.c:188 ../finch/gntstatus.c:578
-#: ../libpurple/plugins/idle.c:153 ../libpurple/plugins/idle.c:190
-#: ../pidgin/gtkblist.c:3825 ../pidgin/gtknotify.c:712
-#: ../pidgin/gtkpounce.c:1292 ../pidgin/plugins/gevolution/gevolution.c:452
 msgid "Account"
 msgstr "Rekening"
 
-#: ../finch/gntblist.c:693 ../finch/gntblist.c:1255
-#: ../libpurple/protocols/qq/buddy_opt.c:453
-#: ../libpurple/protocols/qq/qq.c:861 ../libpurple/protocols/silc/buddy.c:730
-#: ../libpurple/protocols/silc/buddy.c:1035
-#: ../libpurple/protocols/silc/buddy.c:1080
-#: ../libpurple/protocols/silc/buddy.c:1190
-#: ../libpurple/protocols/silc10/buddy.c:737
-#: ../libpurple/protocols/silc10/buddy.c:1036
-#: ../libpurple/protocols/silc10/buddy.c:1083
-#: ../libpurple/protocols/silc10/buddy.c:1183
-#: ../libpurple/protocols/yahoo/libymsg.c:4127 ../pidgin/gtkblist.c:7126
-#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:447
 msgid "Add Buddy"
 msgstr "Voeg vriend by"
 
-#: ../finch/gntblist.c:693
 msgid "Please enter buddy information."
 msgstr "Tik gerus vriendinligting."
 
-#: ../finch/gntblist.c:749 ../libpurple/blist.c:1494
 msgid "Chats"
 msgstr "Geselsies"
 
 #. Extract their Name and put it in
-#: ../finch/gntblist.c:787 ../finch/gntblist.c:2734 ../finch/gntblist.c:2790
-#: ../finch/gntblist.c:2925 ../finch/gntroomlist.c:300
-#: ../libpurple/protocols/jabber/jabber.c:1383
-#: ../libpurple/protocols/jabber/jabber.c:1387
-#: ../libpurple/protocols/msn/msn.c:2182 ../libpurple/protocols/msn/msn.c:2247
-#: ../libpurple/protocols/msn/msn.c:2274
-#: ../libpurple/protocols/qq/buddy_info.c:120 ../pidgin/gtkplugin.c:772
-#: ../pidgin/gtkroomlist.c:749 ../pidgin/plugins/disco/gtkdisco.c:552
-#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:132
-#: ../pidgin/plugins/gevolution/assoc-buddy.c:122
 msgid "Name"
 msgstr "Naam"
 
-#: ../finch/gntblist.c:790 ../finch/gntblist.c:1731
-#: ../libpurple/protocols/gg/gg.c:1801 ../libpurple/protocols/msn/msn.c:2001
-#: ../libpurple/protocols/mxit/profile.c:118
-#: ../libpurple/protocols/qq/buddy_memo.c:75
-#: ../libpurple/protocols/silc/chat.c:612
-#: ../libpurple/protocols/silc10/chat.c:590
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:705
-#: ../libpurple/protocols/zephyr/zephyr.c:797
-#: ../libpurple/protocols/zephyr/zephyr.c:1180 ../pidgin/gtkdialogs.c:1076
-#: ../pidgin/gtkdialogs.c:1100 ../pidgin/gtkdialogs.c:1122
-#: ../pidgin/gtkrequest.c:308
 msgid "Alias"
 msgstr "Alias"
 
-#: ../finch/gntblist.c:793 ../finch/gntblist.c:3081
-#: ../pidgin/plugins/themeedit.c:255
 msgid "Group"
 msgstr "Groep"
 
-#: ../finch/gntblist.c:797 ../finch/gntblist.c:1222
 msgid "Auto-join"
 msgstr "Outoaansluit"
 
-#: ../finch/gntblist.c:800 ../finch/gntblist.c:1257 ../pidgin/gtkblist.c:7296
 msgid "Add Chat"
 msgstr "Voeg geselsie by"
 
-#: ../finch/gntblist.c:801
 msgid "You can edit more information from the context menu later."
 msgstr "U kan later meer inligting wysig vanaf die kieslys."
 
-#: ../finch/gntblist.c:813
 msgid "Error adding group"
 msgstr "Kon nie groep byvoeg nie"
 
-#: ../finch/gntblist.c:814
 msgid "You must give a name for the group to add."
 msgstr "U moet 'n naam gee vir die nuwe groep."
 
-#: ../finch/gntblist.c:848 ../finch/gntblist.c:1259
-#: ../libpurple/protocols/sametime/sametime.c:5474
-#: ../libpurple/protocols/sametime/sametime.c:5562 ../pidgin/gtkblist.c:7352
 msgid "Add Group"
 msgstr "Voeg groep by"
 
-#: ../finch/gntblist.c:848
 msgid "Enter the name of the group"
 msgstr "Tik die naam van die groep"
 
-#: ../finch/gntblist.c:1205 ../pidgin/gtkblist.c:709
 msgid "Edit Chat"
 msgstr "Wysig geselsie"
 
-#: ../finch/gntblist.c:1205
 msgid "Please Update the necessary fields."
 msgstr "Werk gerus die nodige velde by."
 
-#: ../finch/gntblist.c:1206 ../finch/gntstatus.c:207
 msgid "Edit"
 msgstr "Wysig"
 
-#: ../finch/gntblist.c:1231
 msgid "Edit Settings"
 msgstr "Wysig instellings"
 
-#: ../finch/gntblist.c:1267 ../pidgin/gtkutils.c:995
 msgid "Information"
 msgstr "Inligting"
 
-#: ../finch/gntblist.c:1267 ../pidgin/gtkutils.c:995
 msgid "Retrieving..."
 msgstr "Verkry tans..."
 
-#: ../finch/gntblist.c:1332 ../finch/gntconv.c:621
-#: ../libpurple/protocols/qq/qq.c:892 ../libpurple/protocols/silc/chat.c:909
-#: ../libpurple/protocols/silc10/chat.c:883
 msgid "Get Info"
 msgstr "Kry inligting"
 
-#: ../finch/gntblist.c:1336 ../pidgin/gtkpounce.c:538
 msgid "Add Buddy Pounce"
 msgstr "Voeg vriendwag by"
 
-#: ../finch/gntblist.c:1343 ../finch/gntconv.c:633
-#: ../libpurple/protocols/jabber/si.c:1581
-#: ../libpurple/protocols/oscar/oscar.c:712 ../libpurple/protocols/qq/qq.c:878
-#: ../pidgin/gtkconv.c:1634
 msgid "Send File"
 msgstr "Stuur l?er"
 
-#: ../finch/gntblist.c:1350 ../libpurple/protocols/gg/gg.c:1860
-#: ../libpurple/protocols/msn/msn.c:856
 msgid "Blocked"
 msgstr "Geblokkeer"
 
-#: ../finch/gntblist.c:1355
 msgid "Show when offline"
 msgstr "Wys terwyl aanlyn"
 
-#: ../finch/gntblist.c:1440
 #, c-format
 msgid "Please enter the new name for %s"
 msgstr "Tik gerus die nuwe naam vir %s"
 
-#: ../finch/gntblist.c:1442 ../finch/gntblist.c:1731
 msgid "Rename"
 msgstr "Hernoem"
 
-#: ../finch/gntblist.c:1442
 msgid "Set Alias"
 msgstr "Stel alias"
 
-#: ../finch/gntblist.c:1443
 msgid "Enter empty string to reset the name."
 msgstr "Tik le? string om die naam terug te stel."
 
-#: ../finch/gntblist.c:1557
 msgid "Removing this contact will also remove all the buddies in the contact"
 msgstr ""
 "Verwydering van hierdie kontak sal ook al die vriende in hierdie kontak "
 "verwyder"
 
-#: ../finch/gntblist.c:1565
 msgid "Removing this group will also remove all the buddies in the group"
 msgstr ""
 "Verwydering van hierdie groep sal ook al die vriende in hierdie groep "
 "verwyder"
 
-#: ../finch/gntblist.c:1570
 #, c-format
 msgid "Are you sure you want to remove %s?"
 msgstr "Wil u definitief %s verwyder?"
 
 #. XXX: anything to do with the returned ui-handle?
-#: ../finch/gntblist.c:1573
 msgid "Confirm Remove"
 msgstr "Bevestig verwydering"
 
-#: ../finch/gntblist.c:1578 ../finch/gntblist.c:1733 ../finch/gntft.c:246
-#: ../pidgin/gtkconv.c:1692 ../pidgin/gtkrequest.c:306
-#: ../pidgin/gtkstatusbox.c:326
 msgid "Remove"
 msgstr "Verwyder"
 
 #. Buddy List
-#: ../finch/gntblist.c:1707 ../finch/gntblist.c:3122 ../finch/gntprefs.c:259
-#: ../finch/gntui.c:100 ../pidgin/gtkblist.c:5828
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:303
 msgid "Buddy List"
 msgstr "Vriendelys"
 
-#: ../finch/gntblist.c:1738
 msgid "Place tagged"
 msgstr "Plek gemerk"
 
-#: ../finch/gntblist.c:1743
 msgid "Toggle Tag"
 msgstr "Wissel merker"
 
-#: ../finch/gntblist.c:1747 ../finch/gntblist.c:2939
 msgid "View Log"
 msgstr "Bekyk staafl?er"
 
 #. General
-#: ../finch/gntblist.c:1783 ../libpurple/protocols/gg/gg.c:586
-#: ../libpurple/protocols/gg/gg.c:1132 ../libpurple/protocols/gg/gg.c:1201
-#: ../libpurple/protocols/gg/gg.c:2576
-#: ../libpurple/protocols/jabber/buddy.c:353
-#: ../libpurple/protocols/jabber/buddy.c:1050
-#: ../libpurple/protocols/jabber/buddy.c:2004
-#: ../libpurple/protocols/jabber/buddy.c:2197
-#: ../libpurple/protocols/jabber/jabber.c:1280
-#: ../libpurple/protocols/jabber/jabber.c:2283
-#: ../libpurple/protocols/jabber/jabber.c:2307
-#: ../libpurple/protocols/jabber/jabber.c:2323
-#: ../libpurple/protocols/jabber/jabber.c:2339
-#: ../libpurple/protocols/jabber/jabber.c:2353
-#: ../libpurple/protocols/msn/msn.c:2009 ../libpurple/protocols/msn/msn.c:2185
-#: ../libpurple/protocols/qq/buddy_info.c:112
-#: ../libpurple/protocols/silc/buddy.c:1550
-#: ../libpurple/protocols/silc/ops.c:1005
-#: ../libpurple/protocols/silc/ops.c:1188
-#: ../libpurple/protocols/silc/ops.c:1326
-#: ../libpurple/protocols/silc10/buddy.c:1555
-#: ../libpurple/protocols/silc10/ops.c:1036
-#: ../libpurple/protocols/silc10/ops.c:1179
-#: ../libpurple/protocols/silc10/ops.c:1328
-#: ../libpurple/protocols/yahoo/yahoo_aliases.c:546
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1067 ../pidgin/gtkblist.c:3849
 msgid "Nickname"
 msgstr "Bynaam"
 
 #. Never know what those translations might end up like...
 #. Idle stuff
-#: ../finch/gntblist.c:1805 ../finch/gntprefs.c:262
-#: ../libpurple/protocols/bonjour/bonjour.c:366
-#: ../libpurple/protocols/jabber/buddy.c:748
-#: ../libpurple/protocols/jabber/jabber.c:2148
-#: ../libpurple/protocols/msn/msn.c:798 ../libpurple/protocols/msn/msn.c:818
-#: ../libpurple/protocols/msn/msn.c:826 ../libpurple/protocols/msn/state.c:37
-#: ../libpurple/protocols/novell/novell.c:2852
-#: ../libpurple/protocols/oscar/oscar.c:3551
-#: ../libpurple/protocols/yahoo/libymsg.c:3841
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:711 ../pidgin/gtkblist.c:3877
-#: ../pidgin/gtkblist.c:4345 ../pidgin/gtkprefs.c:2643
 msgid "Idle"
 msgstr "Ledig"
 
-#: ../finch/gntblist.c:1819
 msgid "On Mobile"
 msgstr "Op selfoon"
 
-#: ../finch/gntblist.c:2126 ../pidgin/gtkdocklet.c:587
 msgid "New..."
 msgstr "Nuwe..."
 
-#: ../finch/gntblist.c:2133 ../pidgin/gtkdocklet.c:588
 msgid "Saved..."
 msgstr "Gestoor..."
 
-#: ../finch/gntblist.c:2592 ../finch/gntplugin.c:354 ../finch/gntui.c:105
-#: ../pidgin/gtkplugin.c:721
 msgid "Plugins"
 msgstr "Inproppe"
 
-#: ../finch/gntblist.c:2747 ../finch/gntblist.c:2752
 msgid "Block/Unblock"
 msgstr "Blokkeer/ontblokkeer"
 
-#: ../finch/gntblist.c:2748 ../libpurple/protocols/gg/gg.c:1900
 msgid "Block"
 msgstr "Blokkeer"
 
-#: ../finch/gntblist.c:2749 ../libpurple/protocols/gg/gg.c:1896
 msgid "Unblock"
 msgstr "Ontblokkeer"
 
-#: ../finch/gntblist.c:2754
 msgid ""
 "Please enter the username or alias of the person you would like to Block/"
 "Unblock."
 msgstr ""
-"Tik gerus die gebruikernaam of alias van die persoon wat u wil "
-"blokkeer/ontblokkeer."
+"Tik gerus die gebruikernaam of alias van die persoon wat u wil blokkeer/"
+"ontblokkeer."
 
 #. Not multiline
 #. Not masked?
 #. No hints?
-#: ../finch/gntblist.c:2757 ../finch/gntblist.c:2808 ../finch/gntblist.c:2944
-#: ../finch/gntcertmgr.c:90 ../finch/gntconn.c:137 ../finch/gntnotify.c:83
-#: ../finch/plugins/gnthistory.c:181 ../libpurple/account.c:1171
-#: ../libpurple/account.c:1513 ../libpurple/protocols/gg/gg.c:472
-#: ../libpurple/protocols/gg/gg.c:614 ../libpurple/protocols/gg/gg.c:743
-#: ../libpurple/protocols/jabber/jabber.c:2465
-#: ../libpurple/protocols/jabber/xdata.c:403
-#: ../libpurple/protocols/msn/msn.c:360 ../libpurple/protocols/msn/msn.c:378
-#: ../libpurple/protocols/msn/msn.c:395 ../libpurple/protocols/msn/msn.c:412
-#: ../libpurple/protocols/mxit/login.c:360
-#: ../libpurple/protocols/myspace/user.c:825
-#: ../libpurple/protocols/myspace/user.c:886
-#: ../libpurple/protocols/oscar/oscar.c:6770
-#: ../libpurple/protocols/qq/buddy_opt.c:627
-#: ../libpurple/protocols/qq/group_opt.c:126
-#: ../libpurple/protocols/qq/qq_base.c:881
-#: ../libpurple/protocols/silc/buddy.c:458
-#: ../libpurple/protocols/silc/buddy.c:1198
-#: ../libpurple/protocols/silc/chat.c:451
-#: ../libpurple/protocols/silc/chat.c:488
-#: ../libpurple/protocols/silc/chat.c:755
-#: ../libpurple/protocols/silc/ops.c:1295
-#: ../libpurple/protocols/silc/ops.c:1821
-#: ../libpurple/protocols/silc/silc.c:1058
-#: ../libpurple/protocols/silc10/buddy.c:467
-#: ../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:1909
-#: ../libpurple/protocols/silc10/silc.c:760
-#: ../libpurple/protocols/yahoo/libymsg.c:1286
-#: ../libpurple/protocols/yahoo/libymsg.c:4318
-#: ../libpurple/protocols/yahoo/libymsg.c:4329
-#: ../libpurple/protocols/yahoo/yahoo_aliases.c:588
-#: ../libpurple/protocols/yahoo/yahoo_aliases.c:599 ../pidgin/gtkblist.c:3631
-#: ../pidgin/gtkcertmgr.c:193 ../pidgin/gtkdialogs.c:825
-#: ../pidgin/gtkdialogs.c:964 ../pidgin/gtkdialogs.c:1056
-#: ../pidgin/gtkrequest.c:300 ../pidgin/gtkutils.c:1608
-#: ../pidgin/gtkutils.c:1628
 msgid "OK"
 msgstr "Regso"
 
-#: ../finch/gntblist.c:2803 ../pidgin/gtkdialogs.c:820
 msgid "New Instant Message"
 msgstr "Nuwe kitsboodskap"
 
-#: ../finch/gntblist.c:2805 ../pidgin/gtkdialogs.c:822
 msgid "Please enter the username or alias of the person you would like to IM."
 msgstr ""
 "Tik gerus die gebruikernaam of alias van die persoon om 'n kitsboodskap heen "
 "te stuur."
 
-#: ../finch/gntblist.c:2866
 msgid "Channel"
 msgstr "Kanaal"
 
-#: ../finch/gntblist.c:2878 ../pidgin/gtkblist.c:1138
 msgid "Join a Chat"
 msgstr "Sluit by geselsie aan"
 
-#: ../finch/gntblist.c:2880
 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:2882 ../finch/gntnotify.c:457
 msgid "Join"
 msgstr "Sluit aan"
 
-#: ../finch/gntblist.c:2941 ../pidgin/gtkdialogs.c:1053
 msgid ""
 "Please enter the username or alias of the person whose log you would like to "
 "view."
@@ -777,89 +397,63 @@ msgstr ""
 "wil bekyk."
 
 #. Create the "Options" frame.
-#: ../finch/gntblist.c:2995 ../finch/gntpounce.c:461 ../pidgin/gtkpounce.c:826
 msgid "Options"
 msgstr "Opsies"
 
-#: ../finch/gntblist.c:3001
 msgid "Send IM..."
 msgstr "Stuur kitsboodskap..."
 
-#: ../finch/gntblist.c:3006
 msgid "Block/Unblock..."
 msgstr "Blokkeer/ontblokkeer..."
 
-#: ../finch/gntblist.c:3011 ../pidgin/gtkdocklet.c:714
 msgid "Join Chat..."
 msgstr "Sluit by geselsie aan..."
 
-#: ../finch/gntblist.c:3016 ../finch/gntconv.c:645
 msgid "View Log..."
 msgstr "Bekyk staafl?er..."
 
-#: ../finch/gntblist.c:3021
 msgid "View All Logs"
 msgstr "Bekyk alle staafl?ers"
 
-#: ../finch/gntblist.c:3026
 msgid "Show"
 msgstr "Wys"
 
-#: ../finch/gntblist.c:3031
 msgid "Empty groups"
 msgstr "Le? groepe"
 
-#: ../finch/gntblist.c:3038
 msgid "Offline buddies"
 msgstr "Vanlynvriende"
 
-#: ../finch/gntblist.c:3045
 msgid "Sort"
 msgstr "Sorteer"
 
-#: ../finch/gntblist.c:3050
 msgid "By Status"
 msgstr "Volgens status"
 
-#: ../finch/gntblist.c:3055 ../pidgin/gtkblist.c:4877
 msgid "Alphabetically"
 msgstr "Alfabeties"
 
-#: ../finch/gntblist.c:3060
 msgid "By Log Size"
 msgstr "Volgens staafl?ergrootte"
 
-#: ../finch/gntblist.c:3071 ../libpurple/conversation.c:2107
-#: ../pidgin/gtknotify.c:1583
 msgid "Buddy"
 msgstr "Vriend"
 
-#: ../finch/gntblist.c:3076 ../libpurple/protocols/oscar/oscar.c:706
-#: ../libpurple/protocols/silc/silc.c:1004
-#: ../libpurple/protocols/silc/util.c:560
-#: ../libpurple/protocols/silc10/silc.c:704
-#: ../libpurple/protocols/silc10/util.c:553
-#: ../pidgin/plugins/disco/gtkdisco.c:480
 msgid "Chat"
 msgstr "Geselsie"
 
-#: ../finch/gntblist.c:3086 ../finch/plugins/grouping.c:365
 msgid "Grouping"
 msgstr "Groepering"
 
-#: ../finch/gntcertmgr.c:86 ../pidgin/gtkcertmgr.c:186
 msgid "Certificate Import"
 msgstr "Sertifikaatinvoer"
 
-#: ../finch/gntcertmgr.c:87 ../pidgin/gtkcertmgr.c:187
 msgid "Specify a hostname"
 msgstr "Spesifiseer 'n gasheernaam"
 
-#: ../finch/gntcertmgr.c:88
 msgid "Type the host name this certificate is for."
 msgstr "Tik die gasheernaam vir hierdie sertifikaat in."
 
-#: ../finch/gntcertmgr.c:97 ../pidgin/gtkcertmgr.c:208
 #, c-format
 msgid ""
 "File %s could not be imported.\n"
@@ -868,19 +462,15 @@ 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:210
 msgid "Certificate Import Error"
 msgstr "Kon nie sertifikaat invoer nie"
 
-#: ../finch/gntcertmgr.c:100 ../pidgin/gtkcertmgr.c:211
 msgid "X.509 certificate import failed"
 msgstr "Invoer van X.509-sertifikaat het misluk"
 
-#: ../finch/gntcertmgr.c:110 ../pidgin/gtkcertmgr.c:222
 msgid "Select a PEM certificate"
 msgstr "Kies 'n PEM-sertifikaat"
 
-#: ../finch/gntcertmgr.c:127 ../pidgin/gtkcertmgr.c:243
 #, c-format
 msgid ""
 "Export to file %s failed.\n"
@@ -889,24 +479,19 @@ 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:245
 msgid "Certificate Export Error"
 msgstr "Kon nie sertifikaat uitvoer nie"
 
-#: ../finch/gntcertmgr.c:130 ../pidgin/gtkcertmgr.c:246
 msgid "X.509 certificate export failed"
 msgstr "Uitvoer van X.509-sertifikaat het misluk"
 
-#: ../finch/gntcertmgr.c:159 ../pidgin/gtkcertmgr.c:296
 msgid "PEM X.509 Certificate Export"
 msgstr "PEM X.509-sertifikaatuitvoer"
 
-#: ../finch/gntcertmgr.c:188
 #, c-format
 msgid "Certificate for %s"
 msgstr "Sertifikaat vir %s"
 
-#: ../finch/gntcertmgr.c:195
 #, c-format
 msgid ""
 "Common name: %s\n"
@@ -919,59 +504,38 @@ msgstr ""
 "SHA1-vingerafdruk:\n"
 "%s"
 
-#: ../finch/gntcertmgr.c:198
 msgid "SSL Host Certificate"
 msgstr "SSL-gasheersertifikaat"
 
-#: ../finch/gntcertmgr.c:233 ../pidgin/gtkcertmgr.c:369
 #, c-format
 msgid "Really delete certificate for %s?"
 msgstr "Skrap sertifikaat vir %s regtig?"
 
-#: ../finch/gntcertmgr.c:236 ../pidgin/gtkcertmgr.c:371
 msgid "Confirm certificate delete"
 msgstr "Bevestig sertifikaatskrapping"
 
-#: ../finch/gntcertmgr.c:293 ../pidgin/gtkcertmgr.c:611
 msgid "Certificate Manager"
 msgstr "Sertifikaatbestuurder"
 
 #. Creating the user splits
-#: ../finch/gntcertmgr.c:298 ../libpurple/protocols/bonjour/bonjour.c:730
-#: ../libpurple/protocols/silc/silc.c:1243
-#: ../libpurple/protocols/silc10/silc.c:943 ../pidgin/gtkcertmgr.c:444
 msgid "Hostname"
 msgstr "Gasheernaam"
 
-#: ../finch/gntcertmgr.c:315 ../finch/gntnotify.c:451 ../pidgin/gtkconv.c:1671
-#: ../pidgin/gtkdebug.c:877
 msgid "Info"
 msgstr "Inligting"
 
 #. Close button
-#: ../finch/gntcertmgr.c:324 ../finch/gntft.c:256 ../finch/gntnotify.c:196
-#: ../finch/gntplugin.c:222 ../finch/gntplugin.c:415 ../finch/gntpounce.c:752
-#: ../finch/gntroomlist.c:277 ../finch/gntstatus.c:218
-#: ../libpurple/protocols/msn/msn.c:521
-#: ../libpurple/protocols/mxit/splashscreen.c:207
-#: ../libpurple/protocols/mxit/splashscreen.c:211
-#: ../libpurple/protocols/silc/util.c:386
-#: ../libpurple/protocols/silc10/util.c:377 ../pidgin/gtkaccount.c:2388
-#: ../pidgin/gtkblist.c:5934 ../pidgin/gtkrequest.c:303
 msgid "Close"
 msgstr "Sluit"
 
-#: ../finch/gntconn.c:126
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../finch/gntconn.c:129
 #, c-format
 msgid "%s disconnected."
 msgstr "%s ontkoppel."
 
-#: ../finch/gntconn.c:130
 #, c-format
 msgid ""
 "%s\n"
@@ -984,50 +548,39 @@ msgstr ""
 "Finch sal nie weer probeer koppel totdat u die fout reggemaak het en die "
 "rekening geheraktiveer het nie."
 
-#: ../finch/gntconn.c:139
 msgid "Re-enable Account"
 msgstr "Heraktiveer rekening"
 
-#: ../finch/gntconv.c:161
 msgid "No such command."
 msgstr "Daar is nie so 'n bevel nie."
 
-#: ../finch/gntconv.c:165 ../pidgin/gtkconv.c:516
 msgid "Syntax Error:  You typed the wrong number of arguments to that command."
 msgstr ""
 "Sintaksfout:  U het die verkeerde getal argumente vir daardie bevel getik."
 
-#: ../finch/gntconv.c:170 ../pidgin/gtkconv.c:522
 msgid "Your command failed for an unknown reason."
 msgstr "Die bevel het misluk weens 'n onbekende rede."
 
-#: ../finch/gntconv.c:175 ../pidgin/gtkconv.c:529
 msgid "That command only works in chats, not IMs."
 msgstr "Daardie bevel werk net in geselsies, nie kitsboodskappe nie."
 
-#: ../finch/gntconv.c:178 ../pidgin/gtkconv.c:532
 msgid "That command only works in IMs, not chats."
 msgstr "Daardie bevel werk net in kitsboodskappe, nie geselsies nie."
 
-#: ../finch/gntconv.c:182 ../pidgin/gtkconv.c:537
 msgid "That command doesn't work on this protocol."
 msgstr "Daardie bevel werk nie met hierdie protokol nie."
 
-#: ../finch/gntconv.c:190
 msgid "Message was not sent, because you are not signed on."
 msgstr "Boodskap is nie gestuur nie omdat u nie aangeteken is nie."
 
-#: ../finch/gntconv.c:267
 #, c-format
 msgid "%s (%s -- %s)"
 msgstr "%s (%s -- %s)"
 
-#: ../finch/gntconv.c:290
 #, c-format
 msgid "%s [%s]"
 msgstr "%s [%s]"
 
-#: ../finch/gntconv.c:295 ../finch/gntconv.c:982 ../pidgin/gtkconv.c:3701
 #, c-format
 msgid ""
 "\n"
@@ -1036,11 +589,9 @@ msgstr ""
 "\n"
 "%s tik..."
 
-#: ../finch/gntconv.c:314
 msgid "You have left this chat."
 msgstr "U het hierdie geselsie verlaat."
 
-#: ../finch/gntconv.c:382 ../pidgin/gtkconv.c:7579
 msgid ""
 "The account has disconnected and you are no longer in this chat. You will be "
 "automatically rejoined in the chat when the account reconnects."
@@ -1048,76 +599,60 @@ msgstr ""
 "Die rekening is ontkoppel en u is nie meer in hierdie geselsie nie. U sal "
 "outomaties by die geselsie aansluit word wanneer die rekening weer koppel."
 
-#: ../finch/gntconv.c:454 ../pidgin/gtkconv.c:1357
 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:458 ../pidgin/gtkconv.c:1365
 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:545
 msgid "Send To"
 msgstr "Stuur na"
 
-#: ../finch/gntconv.c:598
 msgid "Conversation"
 msgstr "Gesprek"
 
-#: ../finch/gntconv.c:604
 msgid "Clear Scrollback"
 msgstr "Maak gesprekvenster skoon"
 
-#: ../finch/gntconv.c:608 ../finch/gntprefs.c:192
 msgid "Show Timestamps"
 msgstr "Wys tydstempels"
 
-#: ../finch/gntconv.c:626
 msgid "Add Buddy Pounce..."
 msgstr "Voeg vriendwag by..."
 
-#: ../finch/gntconv.c:640
 msgid "Invite..."
 msgstr "Nooi uit..."
 
-#: ../finch/gntconv.c:649
 msgid "Enable Logging"
 msgstr "Aktiveer boekstawing"
 
-#: ../finch/gntconv.c:655
 msgid "Enable Sounds"
 msgstr "Aktiveer klanke"
 
-#: ../finch/gntconv.c:671
 msgid "You are not connected."
 msgstr "U is nie gekoppel nie."
 
-#: ../finch/gntconv.c:935
 msgid "<AUTO-REPLY> "
 msgstr "<AUTO-REPLY> "
 
-#: ../finch/gntconv.c:1075
 #, c-format
 msgid "List of %d user:\n"
 msgid_plural "List of %d users:\n"
 msgstr[0] "Lys van %d gebruikers:\n"
 msgstr[1] "Lys van %d gebruikers:\n"
 
-#: ../finch/gntconv.c:1246 ../pidgin/gtkconv.c:353
 #, fuzzy
 msgid "Supported debug options are: plugins version"
 msgstr "Gesteunde ontfoutopsies is:  weergawe"
 
-#: ../finch/gntconv.c:1292 ../pidgin/gtkconv.c:415
 msgid "No such command (in this context)."
 msgstr "Daar is nie so 'n bevel (in hierdie konteks) nie."
 
-#: ../finch/gntconv.c:1295 ../pidgin/gtkconv.c:418
 msgid ""
 "Use \"/help &lt;command&gt;\" for help on a specific command.\n"
 "The following commands are available in this context:\n"
@@ -1125,7 +660,6 @@ msgstr ""
 "Gebruik \"/help &lt;bevel&gt;\" vir hulp met 'n spesifieke bevel.\n"
 "Die volgende bevele is in hierdie konteks beskikbaar:\n"
 
-#: ../finch/gntconv.c:1339
 #, c-format
 msgid ""
 "%s is not a valid message class. See '/help msgcolor' for valid message "
@@ -1134,24 +668,20 @@ msgstr ""
 "%s is nie 'n geldige boodskapklas nie. Sien '/help msgcolor' vir geldige "
 "boodskapklasse."
 
-#: ../finch/gntconv.c:1346 ../finch/gntconv.c:1353
 #, c-format
 msgid "%s is not a valid color. See '/help msgcolor' for valid colors."
 msgstr ""
 "%s is nie 'n geldige kleur nie. Sien '/help msgcolor' vir geldige kleure."
 
-#: ../finch/gntconv.c:1409 ../pidgin/gtkconv.c:8070
 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 bevel."
 
-#: ../finch/gntconv.c:1412 ../pidgin/gtkconv.c:8073
 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:1415 ../pidgin/gtkconv.c:8076
 msgid ""
 "debug &lt;option&gt;:  Send various debug information to the current "
 "conversation."
@@ -1159,43 +689,33 @@ msgstr ""
 "debug &lt;option&gt;:  Stuur 'n verskeidenheid ontfout-inligting na die "
 "huidige gesprek."
 
-#: ../finch/gntconv.c:1418 ../pidgin/gtkconv.c:8079
 msgid "clear: Clears the conversation scrollback."
 msgstr "clear: Maak die gesprekvenster skoon."
 
-#: ../finch/gntconv.c:1421 ../pidgin/gtkconv.c:8085
 msgid "help &lt;command&gt;:  Help on a specific command."
 msgstr "help &lt;bevel&gt;:  Hulp oor 'n spesifieke bevel."
 
-#: ../finch/gntconv.c:1424
 msgid "users:  Show the list of users in the chat."
 msgstr "gebruikers:  Wys die lys gebruikers in hierdie geselsie."
 
-#: ../finch/gntconv.c:1429
 msgid "plugins: Show the plugins window."
 msgstr "plugins: Wys die inpropvenster."
 
-#: ../finch/gntconv.c:1432
 msgid "buddylist: Show the buddylist."
 msgstr "buddylist: Wys die vriendelys."
 
-#: ../finch/gntconv.c:1435
 msgid "accounts: Show the accounts window."
 msgstr "accounts: Wys die rekeningvenster."
 
-#: ../finch/gntconv.c:1438
 msgid "debugwin: Show the debug window."
 msgstr "debugwin: Wys die ontfoutvenster."
 
-#: ../finch/gntconv.c:1441
 msgid "prefs: Show the preference window."
 msgstr "prefs: Wys die voorkeurevenster."
 
-#: ../finch/gntconv.c:1444
 msgid "statuses: Show the savedstatuses window."
 msgstr "statuses: Wys die venster met gestoorde statusse."
 
-#: ../finch/gntconv.c:1449
 msgid ""
 "msgcolor &lt;class&gt; &lt;foreground&gt; &lt;background&gt;: Set the color "
 "for different classes of messages in the conversation window.<br>    &lt;"
@@ -1204,18 +724,14 @@ msgstr ""
 "cyan, default<br><br>EXAMPLE:<br>    msgcolor send cyan default"
 msgstr ""
 "msgcolor &lt;klas&gt; &lt;voorgrond&gt; &lt;agtergrond&gt;: Stel die kleur "
-"vir verskillende klasse van boodskappe in die geselsvenster.<br>    "
-"&lt;klas&gt;: receive, send, highlight, action, timestamp<br>    "
-"&lt;voorgrond/agtergrond&gt;: black, red, green, blue, white, gray, "
-"darkgray, magenta, cyan, default<br><br>VOORBEELD:<br>    msgcolor send cyan "
-"default"
+"vir verskillende klasse van boodskappe in die geselsvenster.<br>    &lt;"
+"klas&gt;: receive, send, highlight, action, timestamp<br>    &lt;voorgrond/"
+"agtergrond&gt;: black, red, green, blue, white, gray, darkgray, magenta, "
+"cyan, default<br><br>VOORBEELD:<br>    msgcolor send cyan default"
 
-#: ../finch/gntdebug.c:272 ../pidgin/gtkconv.c:995 ../pidgin/gtkdebug.c:219
-#: ../pidgin/gtkft.c:522 ../pidgin/gtkutils.c:3190
 msgid "Unable to open file."
 msgstr "Kan nie l?er open nie."
 
-#: ../finch/gntdebug.c:312 ../finch/gntui.c:103 ../pidgin/gtkdebug.c:692
 msgid "Debug Window"
 msgstr "Ontfoutvenster"
 
@@ -1223,19 +739,15 @@ msgstr "Ontfoutvenster"
 #. * 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:333 ../pidgin/gtkdebug.c:772 ../pidgin/gtkdebug.c:774
 msgid "Clear"
 msgstr "Maak skoon"
 
-#: ../finch/gntdebug.c:344
 msgid "Filter:"
 msgstr "Filter:"
 
-#: ../finch/gntdebug.c:350 ../pidgin/gtkdebug.c:786 ../pidgin/gtkdebug.c:788
 msgid "Pause"
 msgstr "Pouseer"
 
-#: ../finch/gntft.c:121 ../pidgin/gtkft.c:228
 #, c-format
 msgid "File Transfers - %d%% of %d file"
 msgid_plural "File Transfers - %d%% of %d files"
@@ -1243,126 +755,81 @@ msgstr[1] "L?eroordragte - %d%% van %d 
 msgstr[1] "L?eroordragte - %d%% van %d l?ers"
 
 #. Create the window.
-#: ../finch/gntft.c:128 ../finch/gntft.c:215 ../finch/gntui.c:104
-#: ../pidgin/gtkft.c:235 ../pidgin/gtkft.c:733
 msgid "File Transfers"
 msgstr "L?eroordragte"
 
-#: ../finch/gntft.c:220 ../pidgin/gtkft.c:614
 msgid "Progress"
 msgstr "Vordering"
 
-#: ../finch/gntft.c:220 ../pidgin/gtkft.c:621
 msgid "Filename"
 msgstr "L?ernaam"
 
-#: ../finch/gntft.c:220 ../pidgin/gtkft.c:628
 msgid "Size"
 msgstr "Grootte"
 
-#: ../finch/gntft.c:220
 msgid "Speed"
 msgstr "Spoed"
 
-#: ../finch/gntft.c:220 ../pidgin/gtkft.c:635
 msgid "Remaining"
 msgstr "Oorblywend"
 
 #. XXX: Use of ggp_str_to_uin() is an ugly hack!
 #. presence
-#: ../finch/gntft.c:220 ../finch/gntstatus.c:549 ../finch/gntstatus.c:578
-#: ../libpurple/protocols/bonjour/bonjour.c:370
-#: ../libpurple/protocols/gg/gg.c:1121 ../libpurple/protocols/gg/gg.c:1807
-#: ../libpurple/protocols/gg/gg.c:1815
-#: ../libpurple/protocols/jabber/buddy.c:770
-#: ../libpurple/protocols/jabber/buddy.c:778
-#: ../libpurple/protocols/jabber/buddy.c:849
-#: ../libpurple/protocols/jabber/jabber.c:2133
-#: ../libpurple/protocols/msn/msn.c:810 ../libpurple/protocols/msn/msn.c:820
-#: ../libpurple/protocols/msn/msn.c:825 ../libpurple/protocols/msn/msn.c:828
-#: ../libpurple/protocols/mxit/mxit.c:338
-#: ../libpurple/protocols/mxit/profile.c:140
-#: ../libpurple/protocols/novell/novell.c:2862
-#: ../libpurple/protocols/oscar/oscar.c:1000
-#: ../libpurple/protocols/oscar/oscar.c:3319
-#: ../libpurple/protocols/oscar/oscar.c:3342
-#: ../libpurple/protocols/sametime/sametime.c:3337
-#: ../libpurple/protocols/sametime/sametime.c:4229
-#: ../libpurple/protocols/yahoo/libymsg.c:4001 ../pidgin/gtkblist.c:3922
-#: ../pidgin/gtkblist.c:3936 ../pidgin/gtkblist.c:3938
-#: ../pidgin/gtksavedstatuses.c:981 ../pidgin/gtksavedstatuses.c:1132
 msgid "Status"
 msgstr "Status"
 
-#: ../finch/gntft.c:230
 msgid "Close this window when all transfers finish"
 msgstr "Sluit hierdie venster wanneer alle oordragte klaar is"
 
-#: ../finch/gntft.c:237
 msgid "Clear finished transfers"
 msgstr "Verwyder afgehandelde oordragte van lys"
 
-#: ../finch/gntft.c:251 ../finch/gntroomlist.c:274
 msgid "Stop"
 msgstr "Stop"
 
-#: ../finch/gntft.c:324 ../pidgin/gtkft.c:168 ../pidgin/gtkft.c:917
 msgid "Waiting for transfer to begin"
 msgstr "Wag vir oordrag om te begin"
 
-#: ../finch/gntft.c:391 ../pidgin/gtkft.c:162 ../pidgin/gtkft.c:998
 msgid "Canceled"
 msgstr "Gekanselleer"
 
-#: ../finch/gntft.c:393 ../pidgin/gtkft.c:1000
 msgid "Failed"
 msgstr "Misluk"
 
-#: ../finch/gntft.c:439 ../pidgin/gtkft.c:133
 #, c-format
 msgid "%.2f KiB/s"
 msgstr "%.2f KG/s"
 
-#: ../finch/gntft.c:450
 msgid "Sent"
 msgstr "Gestuur"
 
-#: ../finch/gntft.c:450
 msgid "Received"
 msgstr "Ontvang"
 
-#: ../finch/gntft.c:451 ../pidgin/gtkft.c:159 ../pidgin/gtkft.c:1063
 msgid "Finished"
 msgstr "Afgehandel"
 
-#: ../finch/gntft.c:453
 #, c-format
 msgid "The file was saved as %s."
 msgstr "Die l?er is gestoor as %s."
 
-#: ../finch/gntft.c:460
 msgid "Sending"
 msgstr "Stuur tans"
 
-#: ../finch/gntft.c:460
 msgid "Receiving"
 msgstr "Ontvang tans"
 
-#: ../finch/gntlog.c:193
 #, c-format
 msgid "Conversation in %s on %s"
 msgstr "Gesprekke in %s op %s"
 
-#: ../finch/gntlog.c:196
 #, c-format
 msgid "Conversation with %s on %s"
 msgstr "Gesprekke met %s op %s"
 
-#: ../finch/gntlog.c:239 ../pidgin/gtklog.c:504
 msgid "%B %Y"
 msgstr "%B %Y"
 
-#: ../finch/gntlog.c:279 ../pidgin/gtklog.c:551
 msgid ""
 "System events will only be logged if the \"Log all status changes to system "
 "log\" preference is enabled."
@@ -1370,7 +837,6 @@ msgstr ""
 "Stelselgebeure sal net geboekstaaf word as die \"Boekstaaf alle "
 "statusverandering in stelselstaafl?er\"-voorkeur geaktiveer is."
 
-#: ../finch/gntlog.c:283 ../pidgin/gtklog.c:555
 msgid ""
 "Instant messages will only be logged if the \"Log all instant messages\" "
 "preference is enabled."
@@ -1378,164 +844,124 @@ msgstr ""
 "Kitsboodskappe sal net geboekstaaf word as die \"Boekstaaf alle "
 "kitsboodskappe\"-voorkeur geaktiveer is."
 
-#: ../finch/gntlog.c:286 ../pidgin/gtklog.c:558
 msgid ""
 "Chats will only be logged if the \"Log all chats\" preference is enabled."
 msgstr ""
-"Geselsies sal net geboekstaaf word as die \"Boekstaaf alle "
-"geselsies\"-voorkeur geaktiveer is."
+"Geselsies sal net geboekstaaf word as die \"Boekstaaf alle geselsies\"-"
+"voorkeur geaktiveer is."
 
-#: ../finch/gntlog.c:292 ../pidgin/gtklog.c:567
 msgid "No logs were found"
 msgstr "Geen staafl?ers gevind nie"
 
-#: ../finch/gntlog.c:339 ../pidgin/gtklog.c:647
 msgid "Total log size:"
 msgstr "Totale staafl?ergrootte:"
 
 #. Search box *********
-#: ../finch/gntlog.c:347
 msgid "Scroll/Search: "
 msgstr "Rol/soek: "
 
-#: ../finch/gntlog.c:405 ../pidgin/gtklog.c:717
 #, c-format
 msgid "Conversations in %s"
 msgstr "Gesprekke in %s"
 
-#: ../finch/gntlog.c:413 ../finch/gntlog.c:490 ../pidgin/gtklog.c:725
-#: ../pidgin/gtklog.c:806
 #, c-format
 msgid "Conversations with %s"
 msgstr "Gesprekke met %s"
 
-#: ../finch/gntlog.c:415
 msgid "All Conversations"
 msgstr "Alle gesprekke"
 
-#: ../finch/gntlog.c:515 ../pidgin/gtklog.c:831
 msgid "System Log"
 msgstr "Stelselstaafl?er"
 
-#: ../finch/gntmedia.c:159 ../pidgin/gtkmedia.c:329
 msgid "Calling..."
 msgstr "Bel tans..."
 
-#: ../finch/gntmedia.c:160
 msgid "Hangup"
 msgstr "Sit neer"
 
 #. Number of actions
-#: ../finch/gntmedia.c:161 ../libpurple/certificate.c:1362
 msgid "Accept"
 msgstr "Aanvaar"
 
-#: ../finch/gntmedia.c:162 ../libpurple/certificate.c:1363
 msgid "Reject"
 msgstr "Weier"
 
-#: ../finch/gntmedia.c:190 ../pidgin/gtkmedia.c:816 ../pidgin/gtkmedia.c:818
 msgid "Call in progress."
 msgstr "Oproep onderweg."
 
-#: ../finch/gntmedia.c:242 ../pidgin/gtkmedia.c:795
 msgid "The call has been terminated."
 msgstr "Die oproep is be?indig."
 
-#: ../finch/gntmedia.c:270 ../pidgin/gtkmedia.c:504
 #, c-format
 msgid "%s wishes to start an audio session with you."
 msgstr "%s wil 'n oudiosessie met u begin."
 
-#: ../finch/gntmedia.c:274
 #, c-format
 msgid "%s is trying to start an unsupported media session type with you."
 msgstr "%s probeer om 'n niegesteunde mediasessietipe met u te begin."
 
-#: ../finch/gntmedia.c:288 ../pidgin/gtkmedia.c:811
 msgid "You have rejected the call."
 msgstr "U het die oproep geweier."
 
-#: ../finch/gntmedia.c:481
 msgid "call: Make an audio call."
 msgstr ""
 
-#: ../finch/gntnotify.c:179
 msgid "Emails"
 msgstr "E-posse"
 
-#: ../finch/gntnotify.c:185 ../finch/gntnotify.c:248
 msgid "You have mail!"
 msgstr "Daar is pos!"
 
-#: ../finch/gntnotify.c:188 ../pidgin/gtknotify.c:719
 msgid "Sender"
 msgstr "Sender"
 
-#: ../finch/gntnotify.c:188 ../pidgin/gtknotify.c:726
 msgid "Subject"
 msgstr "Onderwerp"
 
-#: ../finch/gntnotify.c:219
 #, 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:248 ../pidgin/gtknotify.c:1523
 msgid "New Mail"
 msgstr "Nuwe pos"
 
-#: ../finch/gntnotify.c:354 ../pidgin/gtknotify.c:1163
 #, c-format
 msgid "Info for %s"
 msgstr "Inligting vir %s"
 
-#: ../finch/gntnotify.c:355 ../pidgin/gtknotify.c:1164
 msgid "Buddy Information"
 msgstr "Vriendinligting"
 
-#: ../finch/gntnotify.c:445 ../libpurple/protocols/mxit/login.c:684
-#: ../libpurple/protocols/mxit/splashscreen.c:211
-#: ../libpurple/protocols/qq/group_join.c:338
 msgid "Continue"
 msgstr "Gaan voort"
 
-#: ../finch/gntnotify.c:454 ../pidgin/gtkconv.c:1621
-#: ../pidgin/gtknotify.c:1565
 msgid "IM"
 msgstr "Kitsboodskap"
 
-#: ../finch/gntnotify.c:460 ../libpurple/conversation.c:2119
-#: ../libpurple/protocols/sametime/sametime.c:3547
 msgid "Invite"
 msgstr "Nooi uit"
 
-#: ../finch/gntnotify.c:463
 msgid "(none)"
 msgstr "(geen)"
 
 #. XXX: The following expects that finch_notify_message gets called. This
 #. * may not always happen, e.g. when another plugin sets its own
 #. * notify_message. So tread carefully.
-#: ../finch/gntnotify.c:489 ../finch/plugins/gnttinyurl.c:370
 msgid "URI"
 msgstr "URI"
 
-#: ../finch/gntplugin.c:86 ../finch/gntplugin.c:95
 msgid "ERROR"
 msgstr "FOUT"
 
-#: ../finch/gntplugin.c:86
 msgid "loading plugin failed"
 msgstr "laai van inprop het misluk"
 
-#: ../finch/gntplugin.c:95
 msgid "unloading plugin failed"
 msgstr "ontlaai van inprop het misluk"
 
-#: ../finch/gntplugin.c:141
 #, c-format
 msgid ""
 "Name: %s\n"
@@ -1552,42 +978,33 @@ msgstr ""
 "Webwerf: %s\n"
 "L?ernaam: %s\n"
 
-#: ../finch/gntplugin.c:199
 msgid "Plugin need to be loaded before you can configure it."
 msgstr "Inprop moet gelaai word voordat dit opgestel kan word."
 
-#: ../finch/gntplugin.c:247
 msgid "No configuration options for this plugin."
 msgstr "Geen opstelopsies vir hierdie inprop nie."
 
-#: ../finch/gntplugin.c:268
 msgid "Error loading plugin"
 msgstr "Kon nie die inprop laai nie"
 
-#: ../finch/gntplugin.c:269
 msgid "The selected file is not a valid plugin."
 msgstr "Die gekose l?er is nie 'n geldige inprop nie."
 
-#: ../finch/gntplugin.c:270
 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:333
 msgid "Select plugin to install"
 msgstr "Kies inprop om te installeer"
 
-#: ../finch/gntplugin.c:359
 msgid "You can (un)load plugins from the following list."
 msgstr "U kan inproppe (ont)laai vanaf die volgende lys."
 
-#: ../finch/gntplugin.c:410
 msgid "Install Plugin..."
 msgstr "Installeer inprop..."
 
-#: ../finch/gntplugin.c:420
 msgid "Configure Plugin"
 msgstr "Stel inprop op"
 
@@ -1596,387 +1013,288 @@ msgstr "Stel inprop op"
 #. (that should have been "effect," right?)
 #. Back to instant-apply! I win!  BU-HAHAHA!
 #. Create the window
-#: ../finch/gntplugin.c:526 ../finch/gntplugin.c:533 ../finch/gntprefs.c:265
-#: ../finch/gntui.c:108 ../pidgin/gtkprefs.c:2764
 msgid "Preferences"
 msgstr "Voorkeure"
 
-#: ../finch/gntpounce.c:195 ../pidgin/gtkpounce.c:270
 msgid "Please enter a buddy to pounce."
 msgstr "Tik gerus 'n vriend om dop te hou."
 
-#: ../finch/gntpounce.c:340
 msgid "New Buddy Pounce"
 msgstr "Nuwe vriendwag"
 
-#: ../finch/gntpounce.c:340
 msgid "Edit Buddy Pounce"
 msgstr "Wysig vriendwag"
 
-#: ../finch/gntpounce.c:345
 msgid "Pounce Who"
 msgstr "Hou wie dop"
 
 #. Account:
-#: ../finch/gntpounce.c:348 ../finch/gntstatus.c:458
 msgid "Account:"
 msgstr "Rekening:"
 
-#: ../finch/gntpounce.c:370
 msgid "Buddy name:"
 msgstr "Vriendnaam:"
 
 #. Create the "Pounce When Buddy..." frame.
-#: ../finch/gntpounce.c:388 ../pidgin/gtkpounce.c:606
 msgid "Pounce When Buddy..."
 msgstr "Reageer wanneer vriend..."
 
-#: ../finch/gntpounce.c:390
 msgid "Signs on"
 msgstr "Aanmeld"
 
-#: ../finch/gntpounce.c:391
 msgid "Signs off"
 msgstr "Afmeld"
 
-#: ../finch/gntpounce.c:392
 msgid "Goes away"
 msgstr "Weggaan"
 
-#: ../finch/gntpounce.c:393
 msgid "Returns from away"
 msgstr "Terugkeer"
 
-#: ../finch/gntpounce.c:394
 msgid "Becomes idle"
 msgstr "Ledig raak"
 
-#: ../finch/gntpounce.c:395
 msgid "Is no longer idle"
 msgstr "Nie meer ledig is nie"
 
-#: ../finch/gntpounce.c:396
 msgid "Starts typing"
 msgstr "Begin tik"
 
-#: ../finch/gntpounce.c:397
 msgid "Pauses while typing"
 msgstr "Wag tydens tik"
 
-#: ../finch/gntpounce.c:398
 msgid "Stops typing"
 msgstr "Ophou tik"
 
-#: ../finch/gntpounce.c:399
 msgid "Sends a message"
 msgstr "'n Boodskap stuur"
 
 #. Create the "Action" frame.
-#: ../finch/gntpounce.c:428 ../pidgin/gtkpounce.c:667
 msgid "Action"
 msgstr "Aksie"
 
-#: ../finch/gntpounce.c:430
 msgid "Open an IM window"
 msgstr "Open 'n kletsboodskapvenster"
 
-#: ../finch/gntpounce.c:431
 msgid "Pop up a notification"
 msgstr "Wys 'n kennisgewing"
 
-#: ../finch/gntpounce.c:432
 msgid "Send a message"
 msgstr "Stuur 'n boodskap"
 
-#: ../finch/gntpounce.c:433
 msgid "Execute a command"
 msgstr "Voer 'n bevel uit"
 
-#: ../finch/gntpounce.c:434
 msgid "Play a sound"
 msgstr "Speel 'n klank"
 
-#: ../finch/gntpounce.c:462
 msgid "Pounce only when my status is not Available"
 msgstr "Hou dop net wanneer my status 'Nie beskikbaar' is"
 
-#: ../finch/gntpounce.c:464 ../pidgin/gtkpounce.c:1305
 msgid "Recurring"
 msgstr "Herhalend"
 
-#: ../finch/gntpounce.c:632
 msgid "Cannot create pounce"
 msgstr "Kan nie vriendwag skep nie"
 
-#: ../finch/gntpounce.c:633
 msgid "You do not have any accounts."
 msgstr "U het nie enige rekeninge nie."
 
-#: ../finch/gntpounce.c:634
 msgid "You must create an account first before you can create a pounce."
 msgstr "U moet 'n rekening skep voor u 'n vriendwag kan skep."
 
-#: ../finch/gntpounce.c:676 ../pidgin/gtkpounce.c:1125
 #, 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:710 ../finch/gntui.c:101 ../pidgin/gtkpounce.c:1348
 msgid "Buddy Pounces"
 msgstr "Vriendwagte"
 
-#: ../finch/gntpounce.c:819
 #, c-format
 msgid "%s has started typing to you (%s)"
 msgstr "%s het begin om aan u te tik (%s)"
 
-#: ../finch/gntpounce.c:820
 #, 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:821
 #, c-format
 msgid "%s has signed on (%s)"
 msgstr "%s het aangemeld op (%s)"
 
-#: ../finch/gntpounce.c:822
 #, c-format
 msgid "%s has returned from being idle (%s)"
 msgstr "%s het teruggekeer na ledigheid (%s)"
 
-#: ../finch/gntpounce.c:823
 #, c-format
 msgid "%s has returned from being away (%s)"
 msgstr "%s het teruggekeer (%s)"
 
-#: ../finch/gntpounce.c:824
 #, c-format
 msgid "%s has stopped typing to you (%s)"
 msgstr "%s het opgehou om aan u te tik (%s)"
 
-#: ../finch/gntpounce.c:825
 #, c-format
 msgid "%s has signed off (%s)"
 msgstr "%s het afgemeld (%s)"
 
-#: ../finch/gntpounce.c:826
 #, c-format
 msgid "%s has become idle (%s)"
 msgstr "%s het ledig geword (%s)"
 
-#: ../finch/gntpounce.c:827
 #, c-format
 msgid "%s has gone away. (%s)"
 msgstr "%s het weggegaan. (%s)"
 
-#: ../finch/gntpounce.c:828
 #, c-format
 msgid "%s has sent you a message. (%s)"
 msgstr "%s het u 'n boodskap gestuur. (%s)"
 
-#: ../finch/gntpounce.c:847
 msgid "Unknown pounce event. Please report this!"
 msgstr "Onbekende vriendwag-gebeurtenis. Rapporteer dit, asseblief!"
 
-#: ../finch/gntprefs.c:93
 msgid "Based on keyboard use"
 msgstr "Gebaseer op gebruik van sleutelbord"
 
-#: ../finch/gntprefs.c:95 ../pidgin/gtkprefs.c:2648
 msgid "From last sent message"
 msgstr "Sedert laaste gestuurde boodskap"
 
-#: ../finch/gntprefs.c:97 ../pidgin/gtkprefs.c:1367 ../pidgin/gtkprefs.c:1375
-#: ../pidgin/gtkprefs.c:2647 ../pidgin/gtkprefs.c:2683
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:310
 msgid "Never"
 msgstr "Nooit"
 
-#: ../finch/gntprefs.c:185
 msgid "Show Idle Time"
 msgstr "Wys ledige tyd"
 
-#: ../finch/gntprefs.c:186
 msgid "Show Offline Buddies"
 msgstr "Wys vanlynvriende"
 
-#: ../finch/gntprefs.c:193
 msgid "Notify buddies when you are typing"
 msgstr "Laat weet vriende wanneer u tik"
 
-#: ../finch/gntprefs.c:199 ../finch/plugins/gnthistory.c:157
 msgid "Log format"
 msgstr "Boekstaafformaat"
 
-#: ../finch/gntprefs.c:200 ../finch/plugins/gnthistory.c:147
 msgid "Log IMs"
 msgstr "Boekstaaf kitsboodskappe"
 
-#: ../finch/gntprefs.c:201 ../finch/plugins/gnthistory.c:148
 msgid "Log chats"
 msgstr "Boekstaaf geselsies"
 
-#: ../finch/gntprefs.c:202
 msgid "Log status change events"
 msgstr "Boekstaaf statusveranderinge"
 
-#: ../finch/gntprefs.c:208
 msgid "Report Idle time"
 msgstr "Raporteer ledige tyd"
 
-#: ../finch/gntprefs.c:209
 msgid "Change status when idle"
 msgstr "Verander status terwyl ledig"
 
-#: ../finch/gntprefs.c:210
 msgid "Minutes before changing status"
 msgstr "Minute voor verandering van status:"
 
-#: ../finch/gntprefs.c:211
 msgid "Change status to"
 msgstr "Verander status na:"
 
-#: ../finch/gntprefs.c:260 ../pidgin/gtkprefs.c:1474 ../pidgin/gtkprefs.c:2735
 msgid "Conversations"
 msgstr "Gesprekke"
 
-#: ../finch/gntprefs.c:261 ../finch/plugins/gnthistory.c:155
-#: ../pidgin/gtkprefs.c:2166 ../pidgin/gtkprefs.c:2736
 msgid "Logging"
 msgstr "Boekstawing"
 
-#: ../finch/gntrequest.c:391
 msgid "You must fill all the required fields."
 msgstr "U moet al die vereiste velde invul."
 
-#: ../finch/gntrequest.c:392
 msgid "The required fields are underlined."
 msgstr "Die vereiste velde is onderstreep."
 
-#: ../finch/gntrequest.c:653
 msgid "Not implemented yet."
 msgstr "Nog nie ge?mplementeer nie."
 
-#: ../finch/gntrequest.c:758 ../pidgin/gtkrequest.c:1630
 msgid "Save File..."
 msgstr "Stoor l?er..."
 
-#: ../finch/gntrequest.c:758 ../pidgin/gtkrequest.c:1631
 msgid "Open File..."
 msgstr "Open l?er..."
 
-#: ../finch/gntrequest.c:775
 msgid "Choose Location..."
 msgstr "Kies ligging..."
 
-#: ../finch/gntroomlist.c:209
 msgid "Hit 'Enter' to find more rooms of this category."
 msgstr "Druk 'Enter' vir m eer kamers in hierdie kategorie."
 
-#: ../finch/gntroomlist.c:275
 msgid "Get"
 msgstr "Kry"
 
 #. Create the window.
-#: ../finch/gntroomlist.c:287 ../finch/gntui.c:106 ../pidgin/gtkblist.c:7302
-#: ../pidgin/gtkroomlist.c:533
 msgid "Room List"
 msgstr "Kamernommer"
 
-#: ../finch/gntsound.c:97 ../pidgin/gtksound.c:64
 msgid "Buddy logs in"
 msgstr "Vriend meld aan"
 
-#: ../finch/gntsound.c:98 ../pidgin/gtksound.c:65
 msgid "Buddy logs out"
 msgstr "Vriend meld af"
 
-#: ../finch/gntsound.c:99 ../pidgin/gtksound.c:66
 msgid "Message received"
 msgstr "Boodskap ontvang"
 
-#: ../finch/gntsound.c:100 ../pidgin/gtksound.c:67
 msgid "Message received begins conversation"
 msgstr "Boodskapontvangs begin gesprek"
 
-#: ../finch/gntsound.c:101 ../pidgin/gtksound.c:68
 msgid "Message sent"
 msgstr "Boodskap gestuur"
 
-#: ../finch/gntsound.c:102 ../pidgin/gtksound.c:69
 msgid "Person enters chat"
 msgstr "Persoon kom geselsie binne"
 
-#: ../finch/gntsound.c:103 ../pidgin/gtksound.c:70
 msgid "Person leaves chat"
 msgstr "Persoon verlaat geselsie"
 
-#: ../finch/gntsound.c:104 ../pidgin/gtksound.c:71
 msgid "You talk in chat"
 msgstr "U praat in geselsie"
 
-#: ../finch/gntsound.c:105 ../pidgin/gtksound.c:72
 msgid "Others talk in chat"
 msgstr "Ander praat in geselsie"
 
-#: ../finch/gntsound.c:107 ../pidgin/gtksound.c:75
 msgid "Someone says your username in chat"
 msgstr "Iemand s? u gebruikernaam in 'n geselsie"
 
-#: ../finch/gntsound.c:368 ../pidgin/gtksound.c:326
 msgid "GStreamer Failure"
 msgstr "GStreamer-mislukking"
 
-#: ../finch/gntsound.c:369 ../pidgin/gtksound.c:327
 msgid "GStreamer failed to initialize."
 msgstr "Inisialiseer van GStreamer het misluk."
 
-#: ../finch/gntsound.c:717 ../finch/gntsound.c:803 ../pidgin/gtkpounce.c:178
-#: ../pidgin/gtkpounce.c:189 ../pidgin/gtkpounce.c:321
-#: ../pidgin/gtkpounce.c:691 ../pidgin/gtkpounce.c:953
-#: ../pidgin/gtkprefs.c:941 ../pidgin/gtkprefs.c:2291
-#: ../pidgin/gtkprefs.c:2389 ../pidgin/gtkprefs.c:2589
 msgid "(default)"
 msgstr "(verstek)"
 
-#: ../finch/gntsound.c:730
 msgid "Select Sound File ..."
 msgstr "Kies klankl?er..."
 
-#: ../finch/gntsound.c:905
 msgid "Sound Preferences"
 msgstr "Klankvoorkeure"
 
-#: ../finch/gntsound.c:916
 msgid "Profiles"
 msgstr "Profiele"
 
-#: ../finch/gntsound.c:955 ../pidgin/gtkprefs.c:2452
 msgid "Automatic"
 msgstr "Outomaties"
 
-#: ../finch/gntsound.c:958
 msgid "Console Beep"
 msgstr "Konsolebiep"
 
-#: ../finch/gntsound.c:959 ../pidgin/gtkprefs.c:2456
 msgid "Command"
 msgstr "Bevel"
 
-#: ../finch/gntsound.c:960
 msgid "No Sound"
 msgstr "Geen klank nie"
 
-#: ../finch/gntsound.c:962
 msgid "Sound Method"
 msgstr "Klankmetode"
 
-#: ../finch/gntsound.c:967
 msgid "Method: "
 msgstr "Metode: "
 
-#: ../finch/gntsound.c:974
 #, c-format
 msgid ""
 "Sound Command\n"
@@ -1986,78 +1304,56 @@ msgstr ""
 "(%s vir l?ernaam)"
 
 #. Sound options
-#: ../finch/gntsound.c:982 ../pidgin/gtkprefs.c:2442
 msgid "Sound Options"
 msgstr "Klankopsies"
 
-#: ../finch/gntsound.c:983
 msgid "Sounds when conversation has focus"
 msgstr "Klanke terwyl gesprek in fokus is"
 
-#: ../finch/gntsound.c:991 ../pidgin/gtkprefs.c:1365 ../pidgin/gtkprefs.c:1377
-#: ../pidgin/gtkprefs.c:2487 ../pidgin/plugins/timestamp_format.c:58
-#: ../pidgin/plugins/timestamp_format.c:67
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:311
 msgid "Always"
 msgstr "Altyd"
 
-#: ../finch/gntsound.c:992 ../pidgin/gtkprefs.c:2485
 msgid "Only when available"
 msgstr "Net indien beskikbaar"
 
-#: ../finch/gntsound.c:993 ../pidgin/gtkprefs.c:2486
 msgid "Only when not available"
 msgstr "Net indien nie beskikbaar nie"
 
-#: ../finch/gntsound.c:1000
 msgid "Volume(0-100):"
 msgstr "Volume (0-100):"
 
 #. Sound events
-#: ../finch/gntsound.c:1019 ../pidgin/gtkprefs.c:2514
 msgid "Sound Events"
 msgstr "Klankgebeure"
 
-#: ../finch/gntsound.c:1021 ../pidgin/gtknotify.c:1595
-#: ../pidgin/gtkprefs.c:2574
 msgid "Event"
 msgstr "Gebeurtenis"
 
-#: ../finch/gntsound.c:1021
 msgid "File"
 msgstr "L?er"
 
-#: ../finch/gntsound.c:1040
 msgid "Test"
 msgstr "Toets"
 
-#: ../finch/gntsound.c:1043 ../pidgin/gtkpounce.c:695
 msgid "Reset"
 msgstr "Terugstel"
 
-#: ../finch/gntsound.c:1046
 msgid "Choose..."
 msgstr "Kies..."
 
-#: ../finch/gntstatus.c:140
 #, c-format
 msgid "Are you sure you want to delete \"%s\""
 msgstr "Wil u definitief \"%s\" uitvee"
 
-#: ../finch/gntstatus.c:143
 msgid "Delete Status"
 msgstr "Vee status uit"
 
-#: ../finch/gntstatus.c:178 ../pidgin/gtksavedstatuses.c:576
 msgid "Saved Statuses"
 msgstr "Gestoorde statusse"
 
-#: ../finch/gntstatus.c:185 ../finch/gntstatus.c:541
-#: ../pidgin/gtksavedstatuses.c:479
 msgid "Title"
 msgstr "Titel"
 
-#: ../finch/gntstatus.c:185 ../pidgin/gtksavedstatuses.c:492
 msgid "Type"
 msgstr "Tipe"
 
@@ -2069,143 +1365,73 @@ msgstr "Tipe"
 #. user_settable
 #. not independent
 #. Attributes - each status can have a message.
-#: ../finch/gntstatus.c:185 ../finch/gntstatus.c:566 ../finch/gntstatus.c:578
-#: ../libpurple/conversation.c:2112
-#: ../libpurple/protocols/bonjour/bonjour.c:283
-#: ../libpurple/protocols/bonjour/bonjour.c:290
-#: ../libpurple/protocols/bonjour/bonjour.c:372
-#: ../libpurple/protocols/gg/gg.c:1159 ../libpurple/protocols/gg/gg.c:1810
-#: ../libpurple/protocols/gg/gg.c:1826 ../libpurple/protocols/gg/gg.c:1836
-#: ../libpurple/protocols/gg/gg.c:1842 ../libpurple/protocols/gg/gg.c:1852
-#: ../libpurple/protocols/gg/gg.c:1861 ../libpurple/protocols/gg/gg.c:1866
-#: ../libpurple/protocols/irc/irc.c:247
-#: ../libpurple/protocols/jabber/jabber.c:2280
-#: ../libpurple/protocols/jabber/jabber.c:2304
-#: ../libpurple/protocols/jabber/jabber.c:2320
-#: ../libpurple/protocols/jabber/jabber.c:2336
-#: ../libpurple/protocols/jabber/jabber.c:2350
-#: ../libpurple/protocols/jabber/jabber.c:2365
-#: ../libpurple/protocols/msn/msn.c:881 ../libpurple/protocols/msn/msn.c:887
-#: ../libpurple/protocols/msn/msn.c:893 ../libpurple/protocols/msn/msn.c:899
-#: ../libpurple/protocols/msn/msn.c:904 ../libpurple/protocols/msn/msn.c:909
-#: ../libpurple/protocols/mxit/roster.c:78
-#: ../libpurple/protocols/myspace/myspace.c:484
-#: ../libpurple/protocols/novell/novell.c:2865
-#: ../libpurple/protocols/novell/novell.c:2970
-#: ../libpurple/protocols/novell/novell.c:2976
-#: ../libpurple/protocols/novell/novell.c:2982
-#: ../libpurple/protocols/oscar/oscar.c:6305
-#: ../libpurple/protocols/oscar/oscar.c:6314
-#: ../libpurple/protocols/oscar/oscar.c:6322
-#: ../libpurple/protocols/oscar/oscar.c:6330
-#: ../libpurple/protocols/oscar/oscar.c:6338
-#: ../libpurple/protocols/oscar/oscar.c:6346
-#: ../libpurple/protocols/oscar/oscar.c:6355
-#: ../libpurple/protocols/oscar/oscar.c:6363
-#: ../libpurple/protocols/oscar/oscar.c:6370
-#: ../libpurple/protocols/oscar/oscar.c:6382
-#: ../libpurple/protocols/oscar/oscar.c:6389
-#: ../libpurple/protocols/oscar/oscar.c:6396
-#: ../libpurple/protocols/sametime/sametime.c:3360
-#: ../libpurple/protocols/sametime/sametime.c:3366
-#: ../libpurple/protocols/sametime/sametime.c:3372
-#: ../libpurple/protocols/sametime/sametime.c:3451
-#: ../libpurple/protocols/silc/buddy.c:1566
-#: ../libpurple/protocols/silc10/buddy.c:1571
-#: ../libpurple/protocols/simple/simple.c:247
-#: ../libpurple/protocols/yahoo/libymsg.c:4833
-#: ../libpurple/protocols/yahoo/libymsg.c:4839
-#: ../libpurple/protocols/zephyr/zephyr.c:2342 ../pidgin/gtknotify.c:1603
-#: ../pidgin/gtksavedstatuses.c:507 ../pidgin/gtksavedstatuses.c:996
 msgid "Message"
 msgstr "Boodskap"
 
 #. Use
-#: ../finch/gntstatus.c:196 ../finch/gntstatus.c:595
 msgid "Use"
 msgstr "Gebruik"
 
-#: ../finch/gntstatus.c:303
 msgid "Invalid title"
 msgstr "Ongeldige titel"
 
-#: ../finch/gntstatus.c:304
 msgid "Please enter a non-empty title for the status."
 msgstr "Tik gerus 'n niele? titel vir die status."
 
-#: ../finch/gntstatus.c:312
 msgid "Duplicate title"
 msgstr "Duplikaat titel"
 
-#: ../finch/gntstatus.c:313
 msgid "Please enter a different title for the status."
 msgstr "Tik gerus 'n ander titel vir die status."
 
-#: ../finch/gntstatus.c:454
 msgid "Substatus"
 msgstr "Substatus"
 
-#: ../finch/gntstatus.c:466 ../pidgin/gtkft.c:668
 msgid "Status:"
 msgstr "Status:"
 
-#: ../finch/gntstatus.c:481
 msgid "Message:"
 msgstr "Boodskap:"
 
-#: ../finch/gntstatus.c:530
 msgid "Edit Status"
 msgstr "Wysig status"
 
-#: ../finch/gntstatus.c:572
 msgid "Use different status for following accounts"
 msgstr "Gebruik 'n ander status vir die volgende rekenings"
 
 #. Save & Use
-#: ../finch/gntstatus.c:606
 msgid "Save & Use"
 msgstr "Stoor en gebruik"
 
-#: ../finch/gntui.c:102
 msgid "Certificates"
 msgstr "Sertifikate"
 
-#: ../finch/gntui.c:107 ../pidgin/gtkprefs.c:2740
 msgid "Sounds"
 msgstr "Klanke"
 
-#: ../finch/gntui.c:109
 msgid "Statuses"
 msgstr "Statusse"
 
-#: ../finch/plugins/gntclipboard.c:115 ../finch/plugins/gntclipboard.c:121
-#: ../finch/plugins/gntclipboard.c:128
 msgid "Error loading the plugin."
 msgstr "Kon nie die inprop laai nie."
 
-#: ../finch/plugins/gntclipboard.c:116
 msgid "Couldn't find X display"
 msgstr "Kon nie X-vertoon vind nie"
 
-#: ../finch/plugins/gntclipboard.c:122
 msgid "Couldn't find window"
 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"
 msgstr "GntClipboard"
 
-#: ../finch/plugins/gntclipboard.c:160
 msgid "Clipboard plugin"
 msgstr "Knipbordinprop"
 
-#: ../finch/plugins/gntclipboard.c:161
 msgid ""
 "When the gnt clipboard contents change, the contents are made available to "
 "X, if possible."
@@ -2213,77 +1439,60 @@ msgstr ""
 "Wanneer die gnt-knipbord se inhoud verander, sal die inhoud aan X beskikbaar "
 "gemaak word, indien moontlik."
 
-#: ../finch/plugins/gntgf.c:232
 #, c-format
 msgid "%s just signed on"
 msgstr "%s het pas aangemeld"
 
-#: ../finch/plugins/gntgf.c:239
 #, c-format
 msgid "%s just signed off"
 msgstr "%s het pas afgemeld"
 
-#: ../finch/plugins/gntgf.c:247
 #, c-format
 msgid "%s sent you a message"
 msgstr "%s het u 'n boodskap gestuur"
 
-#: ../finch/plugins/gntgf.c:266
 #, c-format
 msgid "%s said your nick in %s"
 msgstr "%s het u bynaam ges? in %s"
 
-#: ../finch/plugins/gntgf.c:268
 #, c-format
 msgid "%s sent a message in %s"
 msgstr "%s het 'n boodskap gestuur in %s"
 
-#: ../finch/plugins/gntgf.c:306
 msgid "Buddy signs on/off"
 msgstr "Vriend meld aan/af"
 
-#: ../finch/plugins/gntgf.c:307
 msgid "You receive an IM"
 msgstr "U ontvang 'n kitsboodskap"
 
-#: ../finch/plugins/gntgf.c:308
 msgid "Someone speaks in a chat"
 msgstr "Iemand praat in 'n geselsie"
 
-#: ../finch/plugins/gntgf.c:309
 msgid "Someone says your name in a chat"
 msgstr "Iemand s? u naam in 'n geselsie"
 
-#: ../finch/plugins/gntgf.c:337
 msgid "Notify with a toaster when"
 msgstr "Stel met oploer in kennis wanneer"
 
-#: ../finch/plugins/gntgf.c:352
 msgid "Beep too!"
 msgstr "Biep ook!"
 
-#: ../finch/plugins/gntgf.c:358
 msgid "Set URGENT for the terminal window."
 msgstr "Stel DRINGEND vir die terminaalvenster."
 
-#: ../finch/plugins/gntgf.c:378
 msgid "GntGf"
 msgstr "GntGf"
 
-#: ../finch/plugins/gntgf.c:380 ../finch/plugins/gntgf.c:381
 msgid "Toaster plugin"
 msgstr "Oploer-inprop"
 
-#: ../finch/plugins/gnthistory.c:118 ../pidgin/plugins/history.c:136
 #, c-format
 msgid "<b>Conversation with %s on %s:</b><br>"
 msgstr "<b>Gesprek met %s op %s:</b><br>"
 
-#: ../finch/plugins/gnthistory.c:176 ../pidgin/plugins/history.c:163
 msgid "History Plugin Requires Logging"
 msgstr "Geskiedenis-inprop vereis boekstawing"
 
-#: ../finch/plugins/gnthistory.c:177 ../pidgin/plugins/history.c:164
 msgid ""
 "Logging can be enabled from Tools -> Preferences -> Logging.\n"
 "\n"
@@ -2295,15 +1504,12 @@ msgstr ""
 "Aktivering van staafl?ers vir kitsboodsappe en/of geselsies sal geskiedenis "
 "aktiveer vir die selfde gesprektipe(s)."
 
-#: ../finch/plugins/gnthistory.c:221
 msgid "GntHistory"
 msgstr "GntHistory"
 
-#: ../finch/plugins/gnthistory.c:223 ../pidgin/plugins/history.c:207
 msgid "Shows recently logged conversations in new conversations."
 msgstr "Wys onlangs geboekstaafde gesprekke in die nuwe gesprek."
 
-#: ../finch/plugins/gnthistory.c:224 ../pidgin/plugins/history.c:208
 msgid ""
 "When a new conversation is opened this plugin will insert the last "
 "conversation into the current conversation."
@@ -2311,7 +1517,6 @@ msgstr ""
 "Wanneer 'n nuwe gesprek geopen word, sal hierdie inprop die laaste gesprek "
 "in die huidige een invoeg."
 
-#: ../finch/plugins/gnttinyurl.c:324
 #, c-format
 msgid ""
 "\n"
@@ -2320,223 +1525,147 @@ msgstr ""
 "\n"
 "Kry tans TinyURL..."
 
-#: ../finch/plugins/gnttinyurl.c:351
 #, c-format
 msgid "TinyURL for above: %s"
 msgstr "TinyURL vir bostaande: %s"
 
-#: ../finch/plugins/gnttinyurl.c:371
 msgid "Please wait while TinyURL fetches a shorter URL ..."
 msgstr "Wag asb. terwyl TinyURL 'n korter URL kry ..."
 
-#: ../finch/plugins/gnttinyurl.c:438
 msgid "Only create TinyURL for URLs of this length or greater"
 msgstr "Skep 'n TinyURL slegs vir URL'e van di? lengte of langer"
 
-#: ../finch/plugins/gnttinyurl.c:442
 msgid "TinyURL (or other) address prefix"
 msgstr "TinyURL (of ander) adresvoorvoegsel"
 
-#: ../finch/plugins/gnttinyurl.c:471
 msgid "TinyURL"
 msgstr "TinyURL"
 
-#: ../finch/plugins/gnttinyurl.c:473
 msgid "TinyURL plugin"
 msgstr "TinyURL-inprop"
 
-#: ../finch/plugins/gnttinyurl.c:474
 msgid "When receiving a message with URL(s), use TinyURL for easier copying"
 msgstr ""
 "By ontvangs van 'n boodskap met URL(e), gebruik TinyURL vir makliker "
 "kopi?ring"
 
-#: ../finch/plugins/grouping.c:44 ../libpurple/protocols/oscar/oscar.c:814
-#: ../libpurple/protocols/qq/qq.c:265
 msgid "Online"
 msgstr "Aanlyn"
 
 #. primative,						no,							id,			name
-#: ../finch/plugins/grouping.c:46 ../finch/plugins/grouping.c:143
-#: ../libpurple/protocols/gg/gg.c:1086
-#: ../libpurple/protocols/jabber/buddy.c:846
-#: ../libpurple/protocols/jabber/jutil.c:660
-#: ../libpurple/protocols/mxit/roster.c:53
-#: ../libpurple/protocols/novell/novell.c:2855
-#: ../libpurple/protocols/oscar/oscar.c:986
-#: ../libpurple/protocols/oscar/oscar.c:6197
-#: ../libpurple/protocols/qq/qq.c:262 ../libpurple/protocols/qq/qq.c:269
-#: ../libpurple/protocols/qq/qq.c:431
-#: ../libpurple/protocols/yahoo/libymsg.c:3843 ../libpurple/status.c:162
-#: ../pidgin/gtkblist.c:3922 ../pidgin/gtkblist.c:4322
-#: ../pidgin/gtkdocklet.c:566 ../pidgin/gtkstatusbox.c:1109
-#: ../pidgin/plugins/themeedit-icon.c:67
 msgid "Offline"
 msgstr "Vanlyn"
 
-#: ../finch/plugins/grouping.c:115 ../pidgin/gtkblist.c:3958
 msgid "Online Buddies"
 msgstr "Aanlynvriende"
 
-#: ../finch/plugins/grouping.c:115
 msgid "Offline Buddies"
 msgstr "Vanlynvriende"
 
-#: ../finch/plugins/grouping.c:125
 msgid "Online/Offline"
 msgstr "Aanlyn/vanlyn"
 
-#: ../finch/plugins/grouping.c:162
 msgid "Meebo"
 msgstr "Meebo"
 
-#: ../finch/plugins/grouping.c:211
 msgid "No Grouping"
 msgstr "Geen groepering nie"
 
-#: ../finch/plugins/grouping.c:292
 msgid "Nested Subgroup"
 msgstr "Geneste subgroep"
 
-#: ../finch/plugins/grouping.c:324
 msgid "Nested Grouping (experimental)"
 msgstr "Geneste groepering (eksperimenteel)"
 
-#: ../finch/plugins/grouping.c:367 ../finch/plugins/grouping.c:368
 msgid "Provides alternate buddylist grouping options."
 msgstr "Bied alternatiewe vriendlysgroepering."
 
-#: ../finch/plugins/lastlog.c:69
 msgid "Lastlog"
 msgstr "Lastlog"
 
 #. Translator Note: The "backlog" is the conversation buffer/history.
-#: ../finch/plugins/lastlog.c:100
 msgid "lastlog: Searches for a substring in the backlog."
 msgstr "lastlog: Soek vir 'n substring in die agterstaafl?er."
 
-#: ../finch/plugins/lastlog.c:122
 msgid "GntLastlog"
 msgstr "GntLastlog"
 
-#: ../finch/plugins/lastlog.c:124 ../finch/plugins/lastlog.c:125
 msgid "Lastlog plugin."
 msgstr "Laastestaaf-inprop."
 
-#: ../libpurple/account.c:925
 msgid "accounts"
 msgstr "rekeninge"
 
-#: ../libpurple/account.c:1117 ../libpurple/protocols/jabber/auth.c:106
-#: ../libpurple/protocols/jabber/auth_cyrus.c:150
-#: ../libpurple/protocols/silc/silc.c:475
 msgid "Password is required to sign on."
 msgstr "Wagwoord word vereis om aan te meld."
 
-#: ../libpurple/account.c:1151
 #, c-format
 msgid "Enter password for %s (%s)"
 msgstr "Tik wagwoord vir %s (%s)"
 
-#: ../libpurple/account.c:1158
 msgid "Enter Password"
 msgstr "Tik wagwoord"
 
-#: ../libpurple/account.c:1163
 msgid "Save password"
 msgstr "Stoor wagwoord"
 
-#: ../libpurple/account.c:1200 ../libpurple/connection.c:119
-#: ../libpurple/connection.c:197
 #, c-format
 msgid "Missing protocol plugin for %s"
 msgstr "Ontbrekende protokolinprop vir %s"
 
-#: ../libpurple/account.c:1201 ../libpurple/connection.c:122
 msgid "Connection Error"
 msgstr "Verbindingfout"
 
-#: ../libpurple/account.c:1434 ../libpurple/protocols/gg/gg.c:652
-#: ../libpurple/protocols/jabber/jabber.c:2418
 msgid "New passwords do not match."
 msgstr "Nuwe wagwoorde stem nie ooreen nie."
 
-#: ../libpurple/account.c:1447
 msgid "Fill out all fields completely."
 msgstr "Vul alle velde volledig in."
 
-#: ../libpurple/account.c:1479
 msgid "Original password"
 msgstr "Oorspronklike wagword"
 
-#: ../libpurple/account.c:1487
 msgid "New password"
 msgstr "Nuwe wagwoord"
 
-#: ../libpurple/account.c:1495
 msgid "New password (again)"
 msgstr "Nuwe wagwoord (weer)"
 
-#: ../libpurple/account.c:1502
 #, c-format
 msgid "Change password for %s"
 msgstr "Verander wagwoord vir %s"
 
-#: ../libpurple/account.c:1510
 msgid "Please enter your current password and your new password."
 msgstr "Tik gerus u huidige wagwoord en u nuwe wagwoord."
 
-#: ../libpurple/account.c:1541
 #, c-format
 msgid "Change user information for %s"
 msgstr "Verander gebruikerinligting vir %s"
 
-#: ../libpurple/account.c:1544
-#: ../libpurple/protocols/yahoo/yahoo_aliases.c:587
-#: ../libpurple/protocols/yahoo/yahoo_aliases.c:598
 msgid "Set User Info"
 msgstr "Stel gebruikerinligting"
 
-#: ../libpurple/account.c:1798
 msgid "This protocol does not support setting a public alias."
 msgstr "Di? protokol het ondersteun nie die opstel van 'n publieke alias nie."
 
-#: ../libpurple/account.c:1838
 msgid "This protocol does not support fetching the public alias."
 msgstr ""
 "Di? protokol het ondersteun nie die verkryging van 'n publieke alias nie."
 
-#: ../libpurple/account.c:2122 ../libpurple/protocols/gg/gg.c:1103
-#: ../libpurple/protocols/jabber/buddy.c:778
-#: ../libpurple/protocols/jabber/jutil.c:677
-#: ../libpurple/protocols/msn/oim.c:688
-#: ../libpurple/protocols/novell/novell.c:2858
-#: ../libpurple/protocols/qq/group_info.c:126
-#: ../libpurple/protocols/qq/qq.c:325 ../pidgin/gtkft.c:165
-#: ../pidgin/plugins/disco/gtkdisco.c:468 ../pidgin/plugins/vvconfig.c:143
 msgid "Unknown"
 msgstr "Onbekend"
 
-#: ../libpurple/blist.c:584 ../libpurple/blist.c:1598
-#: ../libpurple/blist.c:1846 ../libpurple/blist.c:1848
-#: ../libpurple/protocols/jabber/roster.c:119
-#: ../libpurple/protocols/myspace/myspace.c:3498 ../pidgin/gtkblist.c:7009
-#: ../pidgin/plugins/gevolution/gevo-util.c:73
-#: ../pidgin/plugins/gevolution/gevolution.c:97
 msgid "Buddies"
 msgstr "Vriende"
 
-#: ../libpurple/blist.c:611
 msgid "buddy list"
 msgstr "vriendelys"
 
-#: ../libpurple/certificate.c:94
 msgid "The certificate is self-signed and cannot be automatically checked."
 msgstr ""
 "Die sertifikaat is self onderteken en kan nie outomaties gekontroleer word "
 "nie."
 
-#: ../libpurple/certificate.c:98
 msgid ""
 "The certificate is not trusted because no certificate that can verify it is "
 "currently trusted."
@@ -2544,20 +1673,16 @@ msgstr ""
 "Die sertifikaat word nie vertrou nie omdat geen sertifikaat wat dit kan "
 "verifieer tans vertrou word nie."
 
-#: ../libpurple/certificate.c:102
 msgid "The certificate is not valid yet."
 msgstr "Die sertifikaat is nog nie geldig nie."
 
-#: ../libpurple/certificate.c:105
 msgid "The certificate has expired and should not be considered valid."
 msgstr "Die sertifikaat het verval en moet ni? as geldig beskou word nie."
 
 #. Translators: "domain" refers to a DNS domain (e.g. talk.google.com)
-#: ../libpurple/certificate.c:110
 msgid "The certificate presented is not issued to this domain."
 msgstr "Die voorgelegde sertifikaat is nie aan di? domein uitgereik nie."
 
-#: ../libpurple/certificate.c:113
 msgid ""
 "You have no database of root certificates, so this certificate cannot be "
 "validated."
@@ -2565,29 +1690,23 @@ msgstr ""
 "U het geen databasis of wortelsertifikate nie, dus kan hierdie sertifikaat "
 "nie geldig wees nie."
 
-#: ../libpurple/certificate.c:117
 msgid "The certificate chain presented is invalid."
 msgstr "Die sertifikaatketting wat voorgel? is, is nie geldig nie."
 
-#: ../libpurple/certificate.c:120
 msgid "The certificate has been revoked."
 msgstr "Die sertifikaat is opgehef."
 
-#: ../libpurple/certificate.c:124
 msgid "An unknown certificate error occurred."
 msgstr "'n Onbekende sertifikaatfout het voorgekom."
 
-#: ../libpurple/certificate.c:695
 msgid "(DOES NOT MATCH)"
 msgstr "(PAS NIE)"
 
 #. Make messages
-#: ../libpurple/certificate.c:699
 #, c-format
 msgid "%s has presented the following certificate for just-this-once use:"
 msgstr "%s het die volgende sertifikaat vir eenkeer-gebruik voorgel?:"
 
-#: ../libpurple/certificate.c:700
 #, c-format
 msgid ""
 "Common name: %s %s\n"
@@ -2597,62 +1716,51 @@ msgstr ""
 "Vingerafdruk (SHA1): %s"
 
 #. TODO: Find what the handle ought to be
-#: ../libpurple/certificate.c:705
 msgid "Single-use Certificate Verification"
 msgstr "Verifi?ring van eenkeergebruik-sertifikate"
 
 #. Scheme name
 #. Pool name
-#: ../libpurple/certificate.c:1044
 msgid "Certificate Authorities"
 msgstr "Sertifikaatowerhede"
 
 #. Scheme name
 #. Pool name
-#: ../libpurple/certificate.c:1216
 msgid "SSL Peers Cache"
 msgstr "SSL-ewekniekas"
 
 #. Make messages
-#: ../libpurple/certificate.c:1347
 #, c-format
 msgid "Accept certificate for %s?"
 msgstr "Aanvaar sertifikaat vir %s?"
 
 #. TODO: Find what the handle ought to be
-#: ../libpurple/certificate.c:1353
 msgid "SSL Certificate Verification"
 msgstr "SSL-sertifikaatverifikasie"
 
-#: ../libpurple/certificate.c:1364
 msgid "_View Certificate..."
 msgstr "_Bekyk sertifikaat..."
 
-#: ../libpurple/certificate.c:1393 ../libpurple/certificate.c:1412
 #, c-format
 msgid "The certificate for %s could not be validated."
 msgstr "Die sertifikaat vir %s kon nie gevalideer word nie."
 
 #. TODO: Probably wrong.
-#: ../libpurple/certificate.c:1399
 msgid "SSL Certificate Error"
 msgstr "SSL-sertifikaatfout"
 
-#: ../libpurple/certificate.c:1400
 msgid "Unable to validate certificate"
 msgstr "Kan nie sertifikaat valideer nie"
 
-#: ../libpurple/certificate.c:1424
 #, c-format
 msgid ""
 "The certificate claims to be from \"%s\" instead. This could mean that you "
 "are not connecting to the service you believe you are."
 msgstr ""
-"Die sertifikaat beweer om van \"%s\" afkomstig te wees. Dit kan beteken dat u "
-"nie tans aan die diens gekoppel is wat u dink nie."
+"Die sertifikaat beweer om van \"%s\" afkomstig te wees. Dit kan beteken dat "
+"u nie tans aan die diens gekoppel is wat u dink nie."
 
 #. Make messages
-#: ../libpurple/certificate.c:2132
 #, c-format
 msgid ""
 "Common name: %s\n"
@@ -2670,108 +1778,76 @@ msgstr ""
 "Vervaldatum: %s\n"
 
 #. TODO: Find what the handle ought to be
-#: ../libpurple/certificate.c:2144
 msgid "Certificate Information"
 msgstr "Sertifikaatinligting"
 
 #. show error to user
-#: ../libpurple/connection.c:121 ../libpurple/protocols/mxit/login.c:288
 msgid "Registration Error"
 msgstr "Registrasiefout"
 
-#: ../libpurple/connection.c:199
 msgid "Unregistration Error"
 msgstr "Deregistrasiefout"
 
-#: ../libpurple/connection.c:359
 #, c-format
 msgid "+++ %s signed on"
 msgstr "+++ %s het aangemeld"
 
-#: ../libpurple/connection.c:390
 #, c-format
 msgid "+++ %s signed off"
 msgstr "+++ %s het afgemeld"
 
 #. Undocumented
 #. Unknown error
-#: ../libpurple/connection.c:566 ../libpurple/plugin.c:276
-#: ../libpurple/protocols/jabber/buddy.c:2138
-#: ../libpurple/protocols/msn/servconn.c:147
-#: ../libpurple/protocols/msn/session.c:364
-#: ../libpurple/protocols/msn/session.c:374
-#: ../libpurple/protocols/oscar/family_chatnav.c:65
-#: ../libpurple/protocols/oscar/oscar.c:167
-#: ../libpurple/protocols/oscar/oscar.c:168
-#: ../libpurple/protocols/yahoo/libymsg.c:1880
-#: ../libpurple/protocols/yahoo/libymsg.c:1889
-#: ../libpurple/protocols/yahoo/libymsg.c:2234
 msgid "Unknown error"
 msgstr "Onbekende fout"
 
-#: ../libpurple/conversation.c:197
 msgid "Unable to send message: The message is too large."
 msgstr "Kan nie boodskap stuur nie: Die boodskap is te groot."
 
-#: ../libpurple/conversation.c:200 ../libpurple/conversation.c:213
 #, c-format
 msgid "Unable to send message to %s."
 msgstr "Kan nie boodskap stuur aan %s nie."
 
-#: ../libpurple/conversation.c:201
 msgid "The message is too large."
 msgstr "Die boodskap is te groot."
 
-#: ../libpurple/conversation.c:210 ../libpurple/protocols/bonjour/jabber.c:305
-#: ../libpurple/protocols/bonjour/jabber.c:351
-#: ../libpurple/protocols/qq/qq_process.c:91
 msgid "Unable to send message."
 msgstr "Kan nie boodskap stuur nie."
 
-#: ../libpurple/conversation.c:1289
 msgid "Send Message"
 msgstr "Stuur boodskap"
 
-#: ../libpurple/conversation.c:1292
 msgid "_Send Message"
 msgstr "_Stuur boodskap"
 
-#: ../libpurple/conversation.c:1696
 #, c-format
 msgid "%s entered the room."
 msgstr "%s het die kamer binnegekom."
 
-#: ../libpurple/conversation.c:1699
 #, c-format
 msgid "%s [<I>%s</I>] entered the room."
 msgstr "%s [<I>%s</I>] het die kamer binnegekom."
 
-#: ../libpurple/conversation.c:1809
 #, c-format
 msgid "You are now known as %s"
 msgstr "U staan nou bekend as %s"
 
-#: ../libpurple/conversation.c:1829
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s staan nou bekend as %s"
 
-#: ../libpurple/conversation.c:1904
 #, c-format
 msgid "%s left the room."
 msgstr "%s het die kamer verlaat."
 
-#: ../libpurple/conversation.c:1907
 #, c-format
 msgid "%s left the room (%s)."
 msgstr "%s het die kamer verlaat (%s)."
 
-#: ../libpurple/conversation.c:2104 ../libpurple/conversation.c:2115
 msgid "Invite to chat"
 msgstr "Nooi na geselsie"
 
 #. Put our happy label in it.
-#: ../libpurple/conversation.c:2116 ../pidgin/gtkconv.c:898
 msgid ""
 "Please enter the name of the user you wish to invite, along with an optional "
 "invite message."
@@ -2779,38 +1855,30 @@ msgstr ""
 "Tik gerus die naam van die gebruiker om uit te nooi, saam met 'n opsionele "
 "uitnodigingsboodskap."
 
-#: ../libpurple/dbus-server.c:610
 #, c-format
 msgid "Failed to get connection: %s"
 msgstr "Kon nie koppeling kry nie: %s"
 
-#: ../libpurple/dbus-server.c:622
 #, c-format
 msgid "Failed to get name: %s"
 msgstr "Kry van naam het misluk: %s"
 
-#: ../libpurple/dbus-server.c:634
 #, c-format
 msgid "Failed to get serv name: %s"
 msgstr "Kry van bedienernaam het misluk: %s"
 
-#: ../libpurple/dbus-server.h:86
 msgid "Purple's D-BUS server is not running for the reason listed below"
 msgstr "Purple se D-BUS-bediener loop nie, vir die rede hier onder"
 
-#: ../libpurple/desktopitem.c:287 ../libpurple/desktopitem.c:880
 msgid "No name"
 msgstr "Naamloos"
 
-#: ../libpurple/dnsquery.c:596
 msgid "Unable to create new resolver process\n"
 msgstr "Kon nie nuwe oplosserproses skep nie\n"
 
-#: ../libpurple/dnsquery.c:601
 msgid "Unable to send request to resolver process\n"
 msgstr "Kon nie versoek aan oplosserproses stuur nie\n"
 
-#: ../libpurple/dnsquery.c:634 ../libpurple/dnsquery.c:815
 #, c-format
 msgid ""
 "Error resolving %s:\n"
@@ -2819,13 +1887,10 @@ msgstr ""
 "Kon nie %s oplos nie:\n"
 "%s"
 
-#: ../libpurple/dnsquery.c:637 ../libpurple/dnsquery.c:829
-#: ../libpurple/dnsquery.c:939 ../libpurple/dnsquery.c:950
 #, c-format
 msgid "Error resolving %s: %d"
 msgstr "Kon nie %s oplos nie: %d"
 
-#: ../libpurple/dnsquery.c:661
 #, c-format
 msgid ""
 "Error reading from resolver process:\n"
@@ -2834,30 +1899,22 @@ msgstr ""
 "Kon nie van oplosserproses lees nie:\n"
 "%s"
 
-#: ../libpurple/dnsquery.c:665
 #, c-format
 msgid "Resolver process exited without answering our request"
 msgstr "Oplosserproses het afgesluit sonder om die versoek te antwoord"
 
-#: ../libpurple/dnsquery.c:779
 #, c-format
 msgid "Error converting %s to punycode: %d"
 msgstr "Fout met omskakeling van %s na punycode: %d"
 
-#: ../libpurple/dnsquery.c:866
 #, c-format
 msgid "Thread creation failure: %s"
 msgstr "Draadskepping het misluk %s"
 
 #. Data is assumed to be the destination bn
-#: ../libpurple/dnsquery.c:867 ../libpurple/protocols/oscar/oscar.c:1984
-#: ../libpurple/protocols/oscar/oscar.c:3440
-#: ../libpurple/protocols/qq/buddy_opt.c:997
-#: ../libpurple/protocols/qq/buddy_opt.c:1250
 msgid "Unknown reason"
 msgstr "Onbekende rede"
 
-#: ../libpurple/ft.c:346
 #, c-format
 msgid ""
 "Error reading %s: \n"
@@ -2866,7 +1923,6 @@ msgstr ""
 "Kon nie %s lees nie: \n"
 "%s.\n"
 
-#: ../libpurple/ft.c:350
 #, c-format
 msgid ""
 "Error writing %s: \n"
@@ -2875,7 +1931,6 @@ msgstr ""
 "Kon nie %s skryf nie: \n"
 "%s.\n"
 
-#: ../libpurple/ft.c:354
 #, c-format
 msgid ""
 "Error accessing %s: \n"
@@ -2884,43 +1939,35 @@ msgstr ""
 "Kon nie toegang tot %s kry nie: \n"
 "%s.\n"
 
-#: ../libpurple/ft.c:392
 msgid "Directory is not writable."
 msgstr "Gids is nie skryfbaar nie."
 
-#: ../libpurple/ft.c:406
 msgid "Cannot send a file of 0 bytes."
 msgstr "Kan nie 'n l?er van 0 grepe stuur nie."
 
-#: ../libpurple/ft.c:415
 msgid "Cannot send a directory."
 msgstr "Kan nie 'n gids stuur nie."
 
-#: ../libpurple/ft.c:423
 #, c-format
 msgid "%s is not a regular file. Cowardly refusing to overwrite it.\n"
-msgstr "%s is nie 'n gewone l?er nie. Gaan dus nie probeer om te oorskryf nie.\n"
+msgstr ""
+"%s is nie 'n gewone l?er nie. Gaan dus nie probeer om te oorskryf nie.\n"
 
-#: ../libpurple/ft.c:442
 msgid "File is not readable."
 msgstr "L?er is onleesbaar."
 
-#: ../libpurple/ft.c:506
 #, c-format
 msgid "%s wants to send you %s (%s)"
 msgstr "%s wil %s aan u stuur (%s)"
 
-#: ../libpurple/ft.c:513
 #, c-format
 msgid "%s wants to send you a file"
 msgstr "%s wil aan u 'n l?er stuur"
 
-#: ../libpurple/ft.c:562
 #, c-format
 msgid "Accept file transfer request from %s?"
 msgstr "Aanvaar die versoek tot l?eroordrag vanaf %s?"
 
-#: ../libpurple/ft.c:566
 #, c-format
 msgid ""
 "A file is available for download from:\n"
@@ -2931,145 +1978,115 @@ msgstr ""
 "Afgele? gasheer: %s\n"
 "Afgele? poort: %d"
 
-#: ../libpurple/ft.c:602
 #, c-format
 msgid "%s is offering to send file %s"
 msgstr "%s bied aan om l?er %s te stuur"
 
-#: ../libpurple/ft.c:661
 #, c-format
 msgid "%s is not a valid filename.\n"
 msgstr "%s is nie 'n geldige l?ernaam nie.\n"
 
-#: ../libpurple/ft.c:689
 #, c-format
 msgid "Offering to send %s to %s"
 msgstr "Bied aan om %s aan %s te stuur"
 
-#: ../libpurple/ft.c:700
 #, c-format
 msgid "Starting transfer of %s from %s"
 msgstr "Begin nou met oordrag van %s vanaf %s"
 
-#: ../libpurple/ft.c:887
 #, c-format
 msgid "Transfer of file <A HREF=\"file://%s\">%s</A> complete"
 msgstr "Oordrag van l?er <A HREF=\"file://%s\">%s</A> voltooi"
 
-#: ../libpurple/ft.c:892
 #, c-format
 msgid "Transfer of file %s complete"
 msgstr "Oordrag van l?er %s voltooi"
 
-#: ../libpurple/ft.c:897
 msgid "File transfer complete"
 msgstr "L?eroordrag voltooi"
 
-#: ../libpurple/ft.c:1490
 #, c-format
 msgid "You cancelled the transfer of %s"
 msgstr "U het die oordrag van %s gekanselleer"
 
-#: ../libpurple/ft.c:1495
 msgid "File transfer cancelled"
 msgstr "L?eroordrag gekanselleer"
 
-#: ../libpurple/ft.c:1553
 #, c-format
 msgid "%s cancelled the transfer of %s"
 msgstr "%s het die oordrag van %s gekanselleer"
 
-#: ../libpurple/ft.c:1558
 #, c-format
 msgid "%s cancelled the file transfer"
 msgstr "%s het die l?eroordrag gekanselleer"
 
-#: ../libpurple/ft.c:1615
 #, c-format
 msgid "File transfer to %s failed."
 msgstr "L?eroordrag na %s het misluk."
 
-#: ../libpurple/ft.c:1617
 #, c-format
 msgid "File transfer from %s failed."
 msgstr "L?eroordrag vanaf %s het misluk."
 
-#: ../libpurple/gconf/purple.schemas.in.h:1
 msgid "Run the command in a terminal"
 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 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 bevel wat gebruik word om \"gg\"-URL'e te hanteer, indien geaktiveer."
+msgstr ""
+"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 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 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 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 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 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 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 "Die vatsel vir \"aim\"-URL'e"
 
-#: ../libpurple/gconf/purple.schemas.in.h:11
 msgid "The handler for \"gg\" URLs"
 msgstr "Die vatsel vir \"gg\"-URL'e"
 
-#: ../libpurple/gconf/purple.schemas.in.h:12
 msgid "The handler for \"icq\" URLs"
 msgstr "Die vatsel vir \"icq\"-URL'e"
 
-#: ../libpurple/gconf/purple.schemas.in.h:13
 msgid "The handler for \"irc\" URLs"
 msgstr "Die vatsel vir \"irc\"-URL'e"
 
-#: ../libpurple/gconf/purple.schemas.in.h:14
 msgid "The handler for \"msnim\" URLs"
 msgstr "Die vatsel vir \"msnim\"-URL'e"
 
-#: ../libpurple/gconf/purple.schemas.in.h:15
 msgid "The handler for \"sip\" URLs"
 msgstr "Die vatsel vir \"sip\"-URL'e"
 
-#: ../libpurple/gconf/purple.schemas.in.h:16
 msgid "The handler for \"xmpp\" URLs"
 msgstr "Die vatsel vir \"xmpp\"-URL'e"
 
-#: ../libpurple/gconf/purple.schemas.in.h:17
 msgid "The handler for \"ymsgr\" URLs"
 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."
@@ -3077,15 +2094,13 @@ msgstr ""
 "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 bevel gespesifiseer in die \"command\"-sleutel \"gg\"-URL'e moet "
-"hanteer."
+"Waar indien die bevel gespesifiseer in die \"command\"-sleutel \"gg\"-URL'e "
+"moet hanteer."
 
-#: ../libpurple/gconf/purple.schemas.in.h:20
 msgid ""
 "True if the command specified in the \"command\" key should handle \"icq\" "
 "URLs."
@@ -3093,7 +2108,6 @@ msgstr ""
 "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."
@@ -3101,15 +2115,13 @@ msgstr ""
 "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 bevel gespesifiseer in die \"command\"-sleutel \"msnim\"-URL'e "
-"moet hanteer."
+"Waar indien die bevel gespesifiseer in die \"command\"-sleutel \"msnim\"-"
+"URL'e moet hanteer."
 
-#: ../libpurple/gconf/purple.schemas.in.h:23
 msgid ""
 "True if the command specified in the \"command\" key should handle \"sip\" "
 "URLs."
@@ -3117,175 +2129,142 @@ msgstr ""
 "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 bevel gespesifiseer in die \"command\"-sleutel \"xmpp\"-URL'e "
-"moet hanteer."
+"Waar indien die bevel gespesifiseer in die \"command\"-sleutel \"xmpp\"-"
+"URL'e moet hanteer."
 
-#: ../libpurple/gconf/purple.schemas.in.h:25
 msgid ""
 "True if the command specified in the \"command\" key should handle \"ymsgr\" "
 "URLs."
 msgstr ""
-"Waar indien die bevel gespesifiseer in die \"command\"-sleutel \"ymsgr\"-URL'e "
-"moet hanteer."
+"Waar indien die bevel gespesifiseer in die \"command\"-sleutel \"ymsgr\"-"
+"URL'e moet hanteer."
 
-#: ../libpurple/gconf/purple.schemas.in.h:26
 msgid ""
 "True if the command used to handle this type of URL should be run in a "
 "terminal."
 msgstr ""
-"Waar indien die bevel 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"
 msgstr "Of die gespesifiseerde bevel \"aim\"-URL'e moet hanteer"
 
-#: ../libpurple/gconf/purple.schemas.in.h:28
 msgid "Whether the specified command should handle \"gg\" URLs"
 msgstr "Of die gespesifiseerde bevel \"gg\"-URL'e moet hanteer"
 
-#: ../libpurple/gconf/purple.schemas.in.h:29
 msgid "Whether the specified command should handle \"icq\" URLs"
 msgstr "Of die gespesifiseerde bevel \"icq\"-URL'e moet hanteer"
 
-#: ../libpurple/gconf/purple.schemas.in.h:30
 msgid "Whether the specified command should handle \"irc\" URLs"
 msgstr "Of die gespesifiseerde bevel \"irc\"-URL'e moet hanteer"
 
-#: ../libpurple/gconf/purple.schemas.in.h:31
 msgid "Whether the specified command should handle \"msnim\" URLs"
 msgstr "Of die gespesifiseerde bevel \"msnim\"-URL'e moet hanteer"
 
-#: ../libpurple/gconf/purple.schemas.in.h:32
 msgid "Whether the specified command should handle \"sip\" URLs"
 msgstr "Of die gespesifiseerde bevel \"sip\"-URL'e moet hanteer"
 
-#: ../libpurple/gconf/purple.schemas.in.h:33
 msgid "Whether the specified command should handle \"xmpp\" URLs"
 msgstr "Of die gespesifiseerde bevel \"xmpp\"-URL'e moet hanteer"
 
-#: ../libpurple/gconf/purple.schemas.in.h:34
 msgid "Whether the specified command should handle \"ymsgr\" URLs"
 msgstr "Of die gespesifiseerde bevel \"ymsgr\"-URL'e moet hanteer"
 
-#: ../libpurple/log.c:198
 msgid "<b><font color=\"red\">The logger has no read function</font></b>"
-msgstr "<b><font color=\"red\">Die boekstawer het geen leesfunksie nie</font></b>"
+msgstr ""
+"<b><font color=\"red\">Die boekstawer het geen leesfunksie nie</font></b>"
 
-#: ../libpurple/log.c:655
 msgid "HTML"
 msgstr "HTML"
 
-#: ../libpurple/log.c:669
 msgid "Plain text"
 msgstr "Eenvoudige teks"
 
-#: ../libpurple/log.c:683
 msgid "Old flat format"
 msgstr "Ou plat formaat"
 
-#: ../libpurple/log.c:914
 msgid "Logging of this conversation failed."
 msgstr "Boekstaaf van hierdie gesprek het misluk."
 
-#: ../libpurple/log.c:1356
 msgid "XML"
 msgstr "XML"
 
-#: ../libpurple/log.c:1443
 #, c-format
 msgid ""
 "<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
 "REPLY&gt;:</b></font> %s<br/>\n"
-msgstr "<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
+msgstr ""
+"<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
 "REPLY&gt;:</b></font> %s<br/>\n"
 
-#: ../libpurple/log.c:1445
 #, c-format
 msgid ""
 "<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
 "REPLY&gt;:</b></font> %s<br/>\n"
-msgstr "<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
+msgstr ""
+"<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
 "REPLY&gt;:</b></font> %s<br/>\n"
 
-#: ../libpurple/log.c:1504 ../libpurple/log.c:1637
 msgid "<font color=\"red\"><b>Unable to find log path!</b></font>"
 msgstr "<font color=\"red\"><b>Kon nie boekstaafpad vind nie!</b></font>"
 
-#: ../libpurple/log.c:1516 ../libpurple/log.c:1646
 #, c-format
 msgid "<font color=\"red\"><b>Could not read file: %s</b></font>"
 msgstr "<font color=\"red\"><b>Kon nie l?er lees nie: %s</b></font>"
 
-#: ../libpurple/log.c:1578
 #, c-format
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr "(%s) %s <AUTO-REPLY>: %s\n"
 
-#: ../libpurple/media/backend-fs2.c:791
 msgid ""
 "No codecs found. Install some GStreamer codecs found in GStreamer plugins "
 "packages."
 msgstr ""
 
-#: ../libpurple/media/backend-fs2.c:799
 msgid ""
 "No codecs left. Your codec preferences in fs-codecs.conf are too strict."
 msgstr ""
 
-#: ../libpurple/media/backend-fs2.c:823
 msgid "A non-recoverable Farsight2 error has occurred."
 msgstr ""
 
-#: ../libpurple/media/backend-fs2.c:1041
 msgid "Error with your microphone"
 msgstr "Fout met u mikrofoon"
 
-#: ../libpurple/media/backend-fs2.c:1044
 msgid "Error with your webcam"
 msgstr "Fout met u webkamera"
 
-#: ../libpurple/media/backend-fs2.c:1051
 msgid "Conference error"
 msgstr "Konferensiefout"
 
-#: ../libpurple/media/backend-fs2.c:1355
 #, c-format
 msgid "Error creating session: %s"
 msgstr "Fout met skep van sessie: %s"
 
-#: ../libpurple/plugin.c:355
 #, 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:370
 msgid "This plugin has not defined an ID."
 msgstr "Hierdie inprop is nie as 'n ID gedefinieer nie."
 
-#: ../libpurple/plugin.c:438
 #, c-format
 msgid "Plugin magic mismatch %d (need %d)"
 msgstr "Inpropkuns pas nie: %d (benodig %d)"
 
-#: ../libpurple/plugin.c:455
 #, 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:472
 msgid ""
 "Plugin does not implement all required functions (list_icon, login and close)"
 msgstr ""
 "Inprop implementeer nie al die vereiste funksies nie (list_icon, login en "
 "close)"
 
-#: ../libpurple/plugin.c:537
 #, c-format
 msgid ""
 "The required plugin %s was not found. Please install this plugin and try "
@@ -3294,87 +2273,59 @@ msgstr ""
 "Die vereiste inprop %s is nie gevind nie. Installeer gerus hierdie inprop en "
 "probeer weer."
 
-#: ../libpurple/plugin.c:542
 msgid "Unable to load the plugin"
 msgstr "Kan nie inprop laai nie"
 
-#: ../libpurple/plugin.c:564
 #, c-format
 msgid "The required plugin %s was unable to load."
 msgstr "Die vereiste inprop %s kon nie laai nie."
 
-#: ../libpurple/plugin.c:568
 msgid "Unable to load your plugin."
 msgstr "Kan nie u inprop laai nie."
 
-#: ../libpurple/plugin.c:658
 #, 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"
 msgstr "Outoaanvaar"
 
-#: ../libpurple/plugins/autoaccept.c:25 ../libpurple/plugins/autoaccept.c:26
 msgid "Auto-accept file transfer requests from selected users."
 msgstr "Aanvaar die versoek tot l?eroordrag outomaties van gekose gebruikers."
 
-#: ../libpurple/plugins/autoaccept.c:75
 #, c-format
 msgid "Autoaccepted file transfer of \"%s\" from \"%s\" completed."
 msgstr "Outomaties aanvaarde l?eroordrag van \"%s\" vanaf \"%s\" voltooi."
 
-#: ../libpurple/plugins/autoaccept.c:77
 msgid "Autoaccept complete"
 msgstr "Outoaanvaar voltooid"
 
-#: ../libpurple/plugins/autoaccept.c:190
 #, c-format
 msgid "When a file-transfer request arrives from %s"
 msgstr "Wanneer 'n versoek tot l?eroordrag vanaf %s aankom"
 
-#: ../libpurple/plugins/autoaccept.c:192
 msgid "Set Autoaccept Setting"
 msgstr "Verstel outoaanvaarding"
 
-#: ../libpurple/plugins/autoaccept.c:194
 msgid "_Save"
 msgstr "_Stoor"
 
-#: ../libpurple/plugins/autoaccept.c:195 ../libpurple/plugins/idle.c:170
-#: ../libpurple/plugins/idle.c:204 ../libpurple/plugins/idle.c:230
-#: ../libpurple/protocols/msn/msn.c:1586
-#: ../libpurple/protocols/oscar/oscar.c:2085
-#: ../libpurple/protocols/oscar/oscar.c:2826
-#: ../libpurple/protocols/oscar/oscar.c:2874
-#: ../libpurple/protocols/oscar/oscar.c:6485
-#: ../libpurple/protocols/oscar/oscar.c:6542
-#: ../libpurple/protocols/oscar/oscar.c:6845
-#: ../libpurple/protocols/oscar/oscar.c:6914
-#: ../libpurple/protocols/qq/buddy_memo.c:262 ../libpurple/request.h:1498
-#: ../libpurple/request.h:1508 ../libpurple/request.h:1521
 msgid "_Cancel"
 msgstr "_Kanselleer"
 
-#: ../libpurple/plugins/autoaccept.c:198
 msgid "Ask"
 msgstr "Vra"
 
-#: ../libpurple/plugins/autoaccept.c:199
 msgid "Auto Accept"
 msgstr "Outoaanvaar"
 
-#: ../libpurple/plugins/autoaccept.c:200
 msgid "Auto Reject"
 msgstr "Outoweier"
 
-#: ../libpurple/plugins/autoaccept.c:215
 msgid "Autoaccept File Transfers..."
 msgstr "Outoaanvaar l?eroordrag..."
 
 #. XXX: Is there a better way than this? There really should be.
-#: ../libpurple/plugins/autoaccept.c:245
 msgid ""
 "Path to save the files in\n"
 "(Please provide the full path)"
@@ -3382,11 +2333,9 @@ msgstr ""
 "Pad om die l?ers in te stoor\n"
 "(Verskaf gerus die volledige pad)"
 
-#: ../libpurple/plugins/autoaccept.c:250
 msgid "Automatically reject from users not in buddy list"
 msgstr "Weier outomaties vir gebruikers wat nie in die vriendelys is nie"
 
-#: ../libpurple/plugins/autoaccept.c:254
 msgid ""
 "Notify with a popup when an autoaccepted file transfer is complete\n"
 "(only when there's no conversation with the sender)"
@@ -3394,20 +2343,15 @@ msgstr ""
 "Laat weet met opspringvenster wanneer outoaanvaarde l?eroordrag voltooi het\n"
 "(net as daar geen gesprek met sender is nie)"
 
-#: ../libpurple/plugins/autoaccept.c:259
 msgid "Create a new directory for each user"
 msgstr "Kies 'n nuwe gids vir elke gebruiker"
 
-#: ../libpurple/plugins/buddynote.c:46 ../libpurple/protocols/msn/msn.c:2258
-#: ../libpurple/protocols/msn/msn.c:2288
 msgid "Notes"
 msgstr "Notas"
 
-#: ../libpurple/plugins/buddynote.c:47
 msgid "Enter your notes below..."
 msgstr "Tik u notas onder..."
 
-#: ../libpurple/plugins/buddynote.c:65
 msgid "Edit Notes..."
 msgstr "Wysig notas..."
 
@@ -3419,18 +2363,15 @@ msgstr "Wysig notas..."
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/buddynote.c:90 ../pidgin/plugins/gtkbuddynote.c:76
 msgid "Buddy Notes"
 msgstr "Vriendnotas"
 
 #. *< name
 #. *< version
-#: ../libpurple/plugins/buddynote.c:92 ../pidgin/plugins/gtkbuddynote.c:78
 msgid "Store notes on particular buddies."
 msgstr "Stoor notas oor spesifieke vriende."
 
 #. *< summary
-#: ../libpurple/plugins/buddynote.c:93 ../pidgin/plugins/gtkbuddynote.c:79
 msgid "Adds the option to store notes for buddies on your buddy list."
 msgstr ""
 "Voeg die moontlikheid by om notas oor vriende op die vriendelys te stoor."
@@ -3441,7 +2382,6 @@ msgstr ""
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/ciphertest.c:264
 msgid "Cipher Test"
 msgstr "Syfertoets"
 
@@ -3449,7 +2389,6 @@ msgstr "Syfertoets"
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/plugins/ciphertest.c:267 ../libpurple/plugins/ciphertest.c:269
 msgid "Tests the ciphers that ship with libpurple."
 msgstr "Toets die syfers wat met by libpurple ingesluit is."
 
@@ -3459,7 +2398,6 @@ msgstr "Toets die syfers wat met by libp
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/dbus-example.c:155
 msgid "DBus Example"
 msgstr "DBus-voorbeeld"
 
@@ -3467,8 +2405,6 @@ msgstr "DBus-voorbeeld"
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/plugins/dbus-example.c:158
-#: ../libpurple/plugins/dbus-example.c:160
 msgid "DBus Plugin Example"
 msgstr "DBus-inpropvoorbeeld"
 
@@ -3478,7 +2414,6 @@ msgstr "DBus-inpropvoorbeeld"
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/filectl.c:248
 msgid "File Control"
 msgstr "L?erbeheer"
 
@@ -3486,50 +2421,38 @@ msgstr "L?erbeheer"
 #. *< version
 #. *  summary
 #. *  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 bevele in 'n l?er te tik."
 
-#: ../libpurple/plugins/idle.c:158 ../libpurple/plugins/idle.c:218
 msgid "Minutes"
 msgstr "Minute"
 
 #. This is a cultural reference.  Dy'er Mak'er is a song by Led Zeppelin.
 #. If that doesn't translate well into your language, drop the 's before translating.
-#: ../libpurple/plugins/idle.c:165 ../libpurple/plugins/idle.c:199
-#: ../libpurple/plugins/idle.c:225 ../libpurple/plugins/idle.c:318
 msgid "I'dle Mak'er"
 msgstr "Ledigmaker"
 
-#: ../libpurple/plugins/idle.c:166 ../libpurple/plugins/idle.c:258
 msgid "Set Account Idle Time"
 msgstr "Stel rekening se ledige tyd"
 
-#: ../libpurple/plugins/idle.c:169 ../libpurple/plugins/idle.c:229
 msgid "_Set"
 msgstr "_Stel"
 
-#: ../libpurple/plugins/idle.c:184
 msgid "None of your accounts are idle."
 msgstr "Geen van u rekenings is ledig nie."
 
-#: ../libpurple/plugins/idle.c:200 ../libpurple/plugins/idle.c:262
 msgid "Unset Account Idle Time"
 msgstr "Deaktiveer ledige tyd in rekening"
 
-#: ../libpurple/plugins/idle.c:203
 msgid "_Unset"
 msgstr "_Deaktiveer"
 
-#: ../libpurple/plugins/idle.c:226 ../libpurple/plugins/idle.c:266
 msgid "Set Idle Time for All Accounts"
 msgstr "Stel ledige tyd vir alle rekeninge"
 
-#: ../libpurple/plugins/idle.c:271
 msgid "Unset Idle Time for All Idled Accounts"
 msgstr "Deaktiveer ledige tyd in alle rekeninge"
 
-#: ../libpurple/plugins/idle.c:320 ../libpurple/plugins/idle.c:321
 msgid "Allows you to hand-configure how long you've been idle"
 msgstr "Stel 'n mens in staat om handmatig te stel hoe lank 'n mens ledig was"
 
@@ -3539,19 +2462,16 @@ msgstr "Stel 'n mens in staat om handmat
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/ipc-test-client.c:87
 msgid "IPC Test Client"
 msgstr "IPC-toetskli?nt"
 
 #. *< name
 #. *< version
 #. *  summary
-#: ../libpurple/plugins/ipc-test-client.c:90
 msgid "Test plugin IPC support, as a client."
 msgstr "Toets inprop-IPC-steun, as 'n kli?nt."
 
 #. *  description
-#: ../libpurple/plugins/ipc-test-client.c:92
 msgid ""
 "Test plugin IPC support, as a client. This locates the server plugin and "
 "calls the commands registered."
@@ -3565,37 +2485,30 @@ msgstr ""
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/ipc-test-server.c:74
 msgid "IPC Test Server"
 msgstr "IPC-toetsbediener"
 
 #. *< name
 #. *< version
 #. *  summary
-#: ../libpurple/plugins/ipc-test-server.c:77
 msgid "Test plugin IPC support, as a server."
 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-bevelte."
 
-#: ../libpurple/plugins/joinpart.c:232
 msgid "Hide Joins/Parts"
 msgstr "Versteek inkom/uitgaan"
 
 #. Translators: Followed by an input request a number of people
-#: ../libpurple/plugins/joinpart.c:237
 msgid "For rooms with more than this many people"
 msgstr "Vir kamers met meer as di? aantal mense"
 
-#: ../libpurple/plugins/joinpart.c:242
 msgid "If user has not spoken in this many minutes"
 msgstr "As 'n gebruiker in soveel minute nie gepraat het nie"
 
-#: ../libpurple/plugins/joinpart.c:247
 msgid "Apply hiding rules to buddies"
 msgstr "Pas versteekre?ls toe op vriende"
 
@@ -3605,19 +2518,16 @@ msgstr "Pas versteekre?ls toe op vriend
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/joinpart.c:277
 msgid "Join/Part Hiding"
 msgstr "In- en uitgaanversteking"
 
 #. *< name
 #. *< version
 #. *  summary
-#: ../libpurple/plugins/joinpart.c:280
 msgid "Hides extraneous join/part messages."
 msgstr "Versteek onnodige in- en uitgaanboodskappe."
 
 #. *  description
-#: ../libpurple/plugins/joinpart.c:282
 msgid ""
 "This plugin hides join/part messages in large rooms, except for those users "
 "actively taking part in a conversation."
@@ -3629,34 +2539,25 @@ msgstr ""
 #. * 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:499
 msgid "(UTC)"
 msgstr "(UTC)"
 
-#: ../libpurple/plugins/log_reader.c:1558
 msgid "User is offline."
 msgstr "Gebruiker is vanlyn."
 
-#: ../libpurple/plugins/log_reader.c:1564
 msgid "Auto-response sent:"
 msgstr "Outo-respons gestuur:"
 
-#: ../libpurple/plugins/log_reader.c:1579
-#: ../libpurple/plugins/log_reader.c:1582
-#: ../libpurple/plugins/statenotify.c:93
 #, c-format
 msgid "%s has signed off."
 msgstr "%s het afgemeld."
 
-#: ../libpurple/plugins/log_reader.c:1603
 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:1613
 msgid "You were disconnected from the server."
 msgstr "U is van die bediener ontkoppel."
 
-#: ../libpurple/plugins/log_reader.c:1621
 msgid ""
 "You are currently disconnected. Messages will not be received unless you are "
 "logged in."
@@ -3664,85 +2565,65 @@ msgstr ""
 "U is tans ontkoppel. Boodskappe sal nie ontvang word tensy u aangemeld is "
 "nie."
 
-#: ../libpurple/plugins/log_reader.c:1636
 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:1641
 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:2723
-#: ../libpurple/plugins/log_reader.c:2879
 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:2736
-#: ../libpurple/plugins/log_reader.c:2884
 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:2748
-#: ../libpurple/plugins/log_reader.c:2888
 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:2762
-#: ../libpurple/plugins/log_reader.c:2893
 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:2774
-#: ../libpurple/plugins/log_reader.c:2897
 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:2786
-#: ../libpurple/plugins/log_reader.c:2901
 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:2798
-#: ../libpurple/plugins/log_reader.c:2905
 msgid "aMSN"
 msgstr "aMSN"
 
 #. Add general preferences.
-#: ../libpurple/plugins/log_reader.c:2861
 msgid "General Log Reading Configuration"
 msgstr "Leeskonfigurasie van algemene staafl?ers"
 
-#: ../libpurple/plugins/log_reader.c:2865
 msgid "Fast size calculations"
 msgstr "Vinnige grootteberekeninge"
 
-#: ../libpurple/plugins/log_reader.c:2869
 msgid "Use name heuristics"
 msgstr "Gebruik naamheuristiek"
 
 #. Add Log Directory preferences.
-#: ../libpurple/plugins/log_reader.c:2875
 msgid "Log Directory"
 msgstr "Staafl?ergids"
 
@@ -3752,19 +2633,16 @@ msgstr "Staafl?ergids"
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/log_reader.c:2934
 msgid "Log Reader"
 msgstr "Staafl?erleser"
 
 #. *< name
 #. *< version
 #. * summary
-#: ../libpurple/plugins/log_reader.c:2938
 msgid "Includes other IM clients' logs in the log viewer."
 msgstr "Sluit ander kitsboodskappers se staafl?ers in in die staafl?erleser."
 
 #. * description
-#: ../libpurple/plugins/log_reader.c:2942
 msgid ""
 "When viewing logs, this plugin will include logs from other IM clients. "
 "Currently, this includes Adium, MSN Messenger, aMSN, and Trillian.\n"
@@ -3779,20 +2657,15 @@ msgstr ""
 "LET WEL: Hierdie inprop is nog alfakode en kan dalk gereeld omval.  Gebruik "
 "op eie risiko!"
 
-#: ../libpurple/plugins/mono/loader/mono.c:224
 msgid "Mono Plugin Loader"
 msgstr "Laaier vir Mono-inproppe"
 
-#: ../libpurple/plugins/mono/loader/mono.c:226
-#: ../libpurple/plugins/mono/loader/mono.c:227
 msgid "Loads .NET plugins with Mono."
 msgstr "Laai .NET-inproppe met Mono."
 
-#: ../libpurple/plugins/newline.c:57
 msgid "Add new line in IMs"
 msgstr "Voeg re?lbreuk in kitsboodskappe"
 
-#: ../libpurple/plugins/newline.c:61
 msgid "Add new line in Chats"
 msgstr "Voeg re?lbreuk in geselsies"
 
@@ -3805,18 +2678,15 @@ msgstr "Voeg re?lbreuk in geselsies"
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/newline.c:104
 msgid "New Line"
 msgstr "Nuwe lyn"
 
 #. *< name
 #. *< version
-#: ../libpurple/plugins/newline.c:106
 msgid "Prepends a newline to displayed message."
 msgstr "Voeg 'n nuwe lyn vooraan die gewysde boodskap."
 
 #. *< summary
-#: ../libpurple/plugins/newline.c:107
 msgid ""
 "Prepends a newline to messages so that the rest of the message appears below "
 "the username in the conversation window."
@@ -3824,15 +2694,12 @@ msgstr ""
 "Voeg 'n re?lbreuk vooraan boodskappe sodat die res van die boodskap onder "
 "die gebruikernaam in die gesprekvenster verskyn."
 
-#: ../libpurple/plugins/offlinemsg.c:23
 msgid "Offline Message Emulation"
 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 vanlynvriend as 'n vriendwag."
 
-#: ../libpurple/plugins/offlinemsg.c:95
 msgid ""
 "The rest of the messages will be saved as pounces. You can edit/delete the "
 "pounce from the `Buddy Pounce' dialog."
@@ -3840,59 +2707,32 @@ msgstr ""
 "Die res van die boodskappe sal as vriendwagte gestoor word. Di? wagte kan "
 "gewysig/verwyder word vanuit die `Vriendwag'-dialoog."
 
-#: ../libpurple/plugins/offlinemsg.c:156
 #, c-format
 msgid ""
 "\"%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 vanlyn. 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 "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:141
-#: ../libpurple/protocols/msn/msn.c:854 ../libpurple/protocols/msn/msn.c:857
-#: ../libpurple/protocols/mxit/mxit.c:354
-#: ../libpurple/protocols/mxit/profile.c:126
-#: ../libpurple/protocols/novell/novell.c:1933
-#: ../libpurple/protocols/silc/buddy.c:318
-#: ../libpurple/protocols/silc/pk.c:114 ../libpurple/protocols/silc/wb.c:309
-#: ../libpurple/protocols/silc10/buddy.c:314
-#: ../libpurple/protocols/silc10/pk.c:119
-#: ../libpurple/protocols/silc10/wb.c:307 ../pidgin/gtkrequest.c:298
 msgid "Yes"
 msgstr "Ja"
 
-#: ../libpurple/plugins/offlinemsg.c:166
-#: ../libpurple/protocols/msn/dialog.c:142
-#: ../libpurple/protocols/msn/msn.c:854 ../libpurple/protocols/msn/msn.c:857
-#: ../libpurple/protocols/mxit/profile.c:126
-#: ../libpurple/protocols/novell/novell.c:1934
-#: ../libpurple/protocols/silc/buddy.c:319
-#: ../libpurple/protocols/silc/pk.c:115 ../libpurple/protocols/silc/wb.c:310
-#: ../libpurple/protocols/silc10/buddy.c:315
-#: ../libpurple/protocols/silc10/pk.c:120
-#: ../libpurple/protocols/silc10/wb.c:308 ../pidgin/gtkrequest.c:299
 msgid "No"
 msgstr "Nee"
 
-#: ../libpurple/plugins/offlinemsg.c:193
 msgid "Save offline messages in pounce"
 msgstr "Stoor vanlyn boodskappe in vriendwag"
 
-#: ../libpurple/plugins/offlinemsg.c:197
 msgid "Do not ask. Always save in pounce."
 msgstr "Moenie vra nie. Stoor altyd in vriendwag."
 
-#: ../libpurple/plugins/one_time_password.c:68
 msgid "One Time Password"
 msgstr "Eenmalige wagwoord"
 
@@ -3902,19 +2742,16 @@ msgstr "Eenmalige wagwoord"
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/one_time_password.c:123
 msgid "One Time Password Support"
 msgstr "Steun vir eenmalige wagwoorde"
 
 #. *< name
 #. *< version
 #. *  summary
-#: ../libpurple/plugins/one_time_password.c:126
 msgid "Enforce that passwords are used only once."
 msgstr ""
 
 #. *  description
-#: ../libpurple/plugins/one_time_password.c:128
 msgid ""
 "Allows you to enforce on a per-account basis that passwords not being saved "
 "are only used in a single successful connection.\n"
@@ -3927,26 +2764,21 @@ msgstr ""
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/perl/perl.c:671
 msgid "Perl Plugin Loader"
 msgstr "Laaier vir perl-inproppe"
 
 #. *< name
 #. *< version
 #. *< summary
-#: ../libpurple/plugins/perl/perl.c:673 ../libpurple/plugins/perl/perl.c:674
 msgid "Provides support for loading perl plugins."
 msgstr "Verskaf steun vir die laai van perl-inproppe."
 
-#: ../libpurple/plugins/psychic.c:20
 msgid "Psychic Mode"
 msgstr "Sienermodus"
 
-#: ../libpurple/plugins/psychic.c:21
 msgid "Psychic mode for incoming conversation"
 msgstr "Sienermodus vir inkomende gesprekke"
 
-#: ../libpurple/plugins/psychic.c:22
 msgid ""
 "Causes conversation windows to appear as other users begin to message you.  "
 "This works for AIM, ICQ, XMPP, Sametime, and Yahoo!"
@@ -3954,23 +2786,18 @@ msgstr ""
 "Veroorsaak dat gesprekvensters verskyn wanneer ander gebruikers 'n boodskap "
 "begin tik.  Hierdie werk vir AIM, ICQ, XMPP, Sametime en Yahoo!"
 
-#: ../libpurple/plugins/psychic.c:72
 msgid "You feel a disturbance in the force..."
 msgstr "U voel 'n magtige dreuning..."
 
-#: ../libpurple/plugins/psychic.c:92
 msgid "Only enable for users on the buddy list"
 msgstr "Aktiveer net vir gebruikers in die vriendelys"
 
-#: ../libpurple/plugins/psychic.c:97
 msgid "Disable when away"
 msgstr "Deaktiveer terwyl weg"
 
-#: ../libpurple/plugins/psychic.c:101
 msgid "Display notification message in conversations"
 msgstr "Wys kennisgewingsboodskap in gesprekke"
 
-#: ../libpurple/plugins/psychic.c:106
 msgid "Raise psychic conversations"
 msgstr "Bring sienergesprekke na vore"
 
@@ -3980,7 +2807,6 @@ msgstr "Bring sienergesprekke na vore"
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/signals-test.c:928
 msgid "Signals Test"
 msgstr "Seinetoets"
 
@@ -3988,8 +2814,6 @@ msgstr "Seinetoets"
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/plugins/signals-test.c:931
-#: ../libpurple/plugins/signals-test.c:933
 msgid "Test to see that all signals are working properly."
 msgstr "Toets om te sien of alle seine goed werk."
 
@@ -3999,7 +2823,6 @@ msgstr "Toets om te sien of alle seine g
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/simple.c:37
 msgid "Simple Plugin"
 msgstr "Eenvoudige inprop"
 
@@ -4007,13 +2830,10 @@ msgstr "Eenvoudige inprop"
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/plugins/simple.c:40 ../libpurple/plugins/simple.c:42
 msgid "Tests to see that most things are working."
 msgstr "Toets om te sien of meeste dinge werk."
 
 #. Scheme name
-#: ../libpurple/plugins/ssl/ssl-gnutls.c:1131
-#: ../libpurple/plugins/ssl/ssl-nss.c:935
 msgid "X.509 Certificates"
 msgstr "X.509-sertifikate"
 
@@ -4023,7 +2843,6 @@ msgstr "X.509-sertifikate"
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/ssl/ssl-gnutls.c:1207
 msgid "GNUTLS"
 msgstr "GNUTLS"
 
@@ -4031,8 +2850,6 @@ msgstr "GNUTLS"
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/plugins/ssl/ssl-gnutls.c:1210
-#: ../libpurple/plugins/ssl/ssl-gnutls.c:1212
 msgid "Provides SSL support through GNUTLS."
 msgstr "Verskaf SSL-steun d.m.v. GNUTLS."
 
@@ -4042,7 +2859,6 @@ msgstr "Verskaf SSL-steun d.m.v. GNUTLS.
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/ssl/ssl-nss.c:1012
 msgid "NSS"
 msgstr "NSS"
 
@@ -4050,8 +2866,6 @@ msgstr "NSS"
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/plugins/ssl/ssl-nss.c:1015
-#: ../libpurple/plugins/ssl/ssl-nss.c:1017
 msgid "Provides SSL support through Mozilla NSS."
 msgstr "Verskaf SSL-steun d.m.v. Mozilla-NSS."
 
@@ -4061,7 +2875,6 @@ msgstr "Verskaf SSL-steun d.m.v. Mozilla
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/ssl/ssl.c:94
 msgid "SSL"
 msgstr "SSL"
 
@@ -4069,48 +2882,38 @@ msgstr "SSL"
 #. *< version
 #. *  summary
 #. *  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-steun-programmateke."
 
-#: ../libpurple/plugins/statenotify.c:63
 #, c-format
 msgid "%s is no longer away."
 msgstr "%s is nie meer weg nie."
 
-#: ../libpurple/plugins/statenotify.c:65
 #, c-format
 msgid "%s has gone away."
 msgstr "%s het weggegaan."
 
-#: ../libpurple/plugins/statenotify.c:75
 #, c-format
 msgid "%s has become idle."
 msgstr "%s het ledig geword."
 
-#: ../libpurple/plugins/statenotify.c:77
 #, c-format
 msgid "%s is no longer idle."
 msgstr "%s is nie meer ledig nie."
 
-#: ../libpurple/plugins/statenotify.c:86
 #, c-format
 msgid "%s has signed on."
 msgstr "%s het aangemeld."
 
-#: ../libpurple/plugins/statenotify.c:104
 msgid "Notify When"
 msgstr "Laat weet wanneer"
 
-#: ../libpurple/plugins/statenotify.c:107
 msgid "Buddy Goes _Away"
 msgstr "Vriend _weggaan"
 
-#: ../libpurple/plugins/statenotify.c:110
 msgid "Buddy Goes _Idle"
 msgstr "Vriend _ledig word"
 
-#: ../libpurple/plugins/statenotify.c:113
 msgid "Buddy _Signs On/Off"
 msgstr "Vriend aan-/af_meld"
 
@@ -4120,7 +2923,6 @@ msgstr "Vriend aan-/af_meld"
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/statenotify.c:161
 msgid "Buddy State Notification"
 msgstr "Vriendstatuskennisgewing"
 
@@ -4128,8 +2930,6 @@ msgstr "Vriendstatuskennisgewing"
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/plugins/statenotify.c:164
-#: ../libpurple/plugins/statenotify.c:167
 msgid ""
 "Notifies in a conversation window when a buddy goes or returns from away or "
 "idle."
@@ -4137,86 +2937,48 @@ msgstr ""
 "Dui aan in 'n gespreksvenster wanneer 'n vriend weggaan of terugkom vanaf 'n "
 "weg- of ledige status."
 
-#: ../libpurple/plugins/tcl/tcl.c:423
 msgid "Tcl Plugin Loader"
 msgstr "Laaier vir Tcl-inproppe"
 
-#: ../libpurple/plugins/tcl/tcl.c:425 ../libpurple/plugins/tcl/tcl.c:426
 msgid "Provides support for loading Tcl plugins"
 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"
-msgstr "Kon nie ActiveTCL-installasie bespeur nie. Indien u TCL-inproppe wil "
+msgstr ""
+"Kon nie ActiveTCL-installasie bespeur nie. Indien u TCL-inproppe wil "
 "gebruik, installeerActiveTCL vanaf http://www.activestate.com\n"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:93
 msgid ""
 "Unable to find Apple's \"Bonjour for Windows\" toolkit, see http://d.pidgin."
 "im/BonjourWindows for more information."
 msgstr ""
-"Kan nie Apple se \"Bonjour vir Windows\"-nutspak vind nie; sien "
-"http://d.pidgin.im/wiki/BonjourWindows vir meer inligting."
+"Kan nie Apple se \"Bonjour vir Windows\"-nutspak vind nie; sien http://d."
+"pidgin.im/wiki/BonjourWindows vir meer inligting."
 
-#: ../libpurple/protocols/bonjour/bonjour.c:113
 msgid "Unable to listen for incoming IM connections"
 msgstr "Kan nie vir inkomende kitsboodskap-koppelings luister nie"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:140
 msgid ""
 "Unable to establish connection with the local mDNS server.  Is it running?"
 msgstr ""
 "Kon nie koppeling met plaaslike mDNS-bediener bewerkstellig nie.  Loop dit "
 "tans?"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:382
-#: ../libpurple/protocols/bonjour/bonjour.c:737
-#: ../libpurple/protocols/gg/gg.c:581
-#: ../libpurple/protocols/jabber/jabber.c:1281
 msgid "First name"
 msgstr "Naam"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:384
-#: ../libpurple/protocols/bonjour/bonjour.c:740
-#: ../libpurple/protocols/gg/gg.c:576
-#: ../libpurple/protocols/jabber/jabber.c:1282
 msgid "Last name"
 msgstr "Van"
 
 #. email
-#: ../libpurple/protocols/bonjour/bonjour.c:388
-#: ../libpurple/protocols/bonjour/bonjour.c:743
-#: ../libpurple/protocols/gg/gg.c:443
-#: ../libpurple/protocols/jabber/buddy.c:362
-#: ../libpurple/protocols/jabber/buddy.c:1127
-#: ../libpurple/protocols/jabber/buddy.c:1140
-#: ../libpurple/protocols/jabber/buddy.c:2006
-#: ../libpurple/protocols/jabber/jabber.c:1279
-#: ../libpurple/protocols/mxit/actions.c:350
-#: ../libpurple/protocols/mxit/profile.c:134
-#: ../libpurple/protocols/qq/buddy_info.c:121
-#: ../libpurple/protocols/qq/buddy_memo.c:79
-#: ../libpurple/protocols/silc/ops.c:1044
-#: ../libpurple/protocols/silc/silc.c:1006
-#: ../libpurple/protocols/silc/silc.c:1247
-#: ../libpurple/protocols/silc/util.c:562
-#: ../libpurple/protocols/silc10/ops.c:1075
-#: ../libpurple/protocols/silc10/silc.c:706
-#: ../libpurple/protocols/silc10/silc.c:947
-#: ../libpurple/protocols/silc10/util.c:555
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1062
 msgid "Email"
 msgstr "E-pos"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:391
-#: ../libpurple/protocols/bonjour/bonjour.c:746
 msgid "AIM Account"
 msgstr "AIM-rekening"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:394
-#: ../libpurple/protocols/bonjour/bonjour.c:749
 msgid "XMPP Account"
 msgstr "XMPP-rekening"
 
@@ -4230,48 +2992,32 @@ msgstr "XMPP-rekening"
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/bonjour/bonjour.c:551
-#: ../libpurple/protocols/bonjour/bonjour.c:553
 msgid "Bonjour Protocol Plugin"
 msgstr "Bonjour-protokolinprop"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:693
 msgid "Purple Person"
 msgstr "Pers persoon"
 
 #. Creating the options for the protocol
-#: ../libpurple/protocols/bonjour/bonjour.c:734
 msgid "Local Port"
 msgstr "Plaaslike poort"
 
-#: ../libpurple/protocols/bonjour/bonjour.h:33
 msgid "Bonjour"
 msgstr "Bonjour"
 
-#: ../libpurple/protocols/bonjour/jabber.c:398
 #, c-format
 msgid "%s has closed the conversation."
 msgstr "%s het die gesprek afgesluit."
 
-#: ../libpurple/protocols/bonjour/jabber.c:493
-#: ../libpurple/protocols/bonjour/jabber.c:558
-#: ../libpurple/protocols/bonjour/jabber.c:603
-#: ../libpurple/protocols/bonjour/jabber.c:839
-#: ../libpurple/protocols/bonjour/jabber.c:860
 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/mdns_win32.c:110
 msgid "Error communicating with local mDNSResponder."
 msgstr "Kon nie met plaaslike mDNSResponder kommunikeer nie."
 
-#: ../libpurple/protocols/gg/gg.c:77 ../libpurple/proxy.c:2289
-#: ../libpurple/proxy.c:2355
 msgid "Invalid proxy settings"
 msgstr "Ongeldige instaaninstellings"
 
-#: ../libpurple/protocols/gg/gg.c:78 ../libpurple/proxy.c:2289
-#: ../libpurple/proxy.c:2355
 msgid ""
 "Either the host name or port number specified for your given proxy type is "
 "invalid."
@@ -4279,249 +3025,153 @@ msgstr ""
 "?f die gasheernaam ?f die poortnommer wat vir u gegewe instaanbedienertipe "
 "gespesifiseer is, is ongeldig."
 
-#: ../libpurple/protocols/gg/gg.c:112 ../libpurple/protocols/gg/gg.c:134
-#: ../libpurple/protocols/gg/gg.c:173
 msgid "Token Error"
 msgstr "Tekenfout"
 
-#: ../libpurple/protocols/gg/gg.c:113 ../libpurple/protocols/gg/gg.c:135
-#: ../libpurple/protocols/gg/gg.c:174
 msgid "Unable to fetch the token.\n"
 msgstr "Kon nie die teken haal nie.\n"
 
-#: ../libpurple/protocols/gg/gg.c:251 ../libpurple/protocols/gg/gg.c:258
-#: ../libpurple/protocols/gg/gg.c:264
 msgid "Save Buddylist..."
 msgstr "Stoor vriendelys..."
 
-#: ../libpurple/protocols/gg/gg.c:252
 msgid "Your buddylist is empty, nothing was written to the file."
 msgstr "U vriendelys is leeg, en niks is na die l?er geskryf nie."
 
-#: ../libpurple/protocols/gg/gg.c:259
 msgid "Buddylist saved successfully!"
 msgstr "Vriendelys suksesvol gestoor!"
 
-#: ../libpurple/protocols/gg/gg.c:262
 #, c-format
 msgid "Couldn't write buddy list for %s to %s"
 msgstr "Kon nie vriendelys vir %s na %s skryf nie"
 
-#: ../libpurple/protocols/gg/gg.c:283 ../libpurple/protocols/gg/gg.c:284
 msgid "Couldn't load buddylist"
 msgstr "Kon nie vriendelys laai nie"
 
-#: ../libpurple/protocols/gg/gg.c:300
 msgid "Load Buddylist..."
 msgstr "Laai vriendelys..."
 
-#: ../libpurple/protocols/gg/gg.c:301
 msgid "Buddylist loaded successfully!"
 msgstr "Vriendelys suksesvol gelaai!"
 
-#: ../libpurple/protocols/gg/gg.c:312
 msgid "Save buddylist..."
 msgstr "Stoor vriendelys..."
 
-#: ../libpurple/protocols/gg/gg.c:322 ../libpurple/protocols/gg/gg.c:2426
 msgid "Load buddylist from file..."
 msgstr "Laai vriendelys van l?er..."
 
-#: ../libpurple/protocols/gg/gg.c:355
 msgid "You must fill in all registration fields"
 msgstr "Alle registrasievelde moet ingevul word"
 
-#: ../libpurple/protocols/gg/gg.c:362
 msgid "Passwords do not match"
 msgstr "Wagwoorde stem nie ooreen nie"
 
-#: ../libpurple/protocols/gg/gg.c:372
 msgid "Unable to register new account.  An unknown error occurred."
-msgstr "Kan nie nuwe rekening registreer nie.  'n Onbekende fout het voorgekom."
+msgstr ""
+"Kan nie nuwe rekening registreer nie.  'n Onbekende fout het voorgekom."
 
-#: ../libpurple/protocols/gg/gg.c:385
 msgid "New Gadu-Gadu Account Registered"
 msgstr "Nuwe Gadu-Gadu-rekening geregistreer"
 
-#: ../libpurple/protocols/gg/gg.c:386
 msgid "Registration completed successfully!"
 msgstr "Registrasie suksesvol voltooi!"
 
-#: ../libpurple/protocols/gg/gg.c:448 ../libpurple/protocols/gg/gg.c:716
-#: ../libpurple/protocols/jabber/jabber.c:1369
-#: ../libpurple/protocols/jabber/jabber.c:1373
-#: ../libpurple/protocols/jabber/jabber.c:2451
 msgid "Password"
 msgstr "Wagwoord"
 
-#: ../libpurple/protocols/gg/gg.c:453
-#: ../libpurple/protocols/jabber/jabber.c:2457
 msgid "Password (again)"
 msgstr "Wagwoord (weer)"
 
-#: ../libpurple/protocols/gg/gg.c:458
 msgid "Enter captcha text"
 msgstr "Tik captcha in"
 
-#: ../libpurple/protocols/gg/gg.c:464
 msgid "Captcha"
 msgstr "Captcha"
 
-#: ../libpurple/protocols/gg/gg.c:468 ../libpurple/protocols/gg/gg.c:469
 msgid "Register New Gadu-Gadu Account"
 msgstr "Registreer nuwe Gadu-Gadu-rekening"
 
-#: ../libpurple/protocols/gg/gg.c:470
 msgid "Please, fill in the following fields"
 msgstr "Vul gerus die volgende velde in"
 
-#: ../libpurple/protocols/gg/gg.c:591 ../libpurple/protocols/gg/gg.c:1136
-#: ../libpurple/protocols/gg/gg.c:1204
-#: ../libpurple/protocols/jabber/jabber.c:1284
-#: ../libpurple/protocols/oscar/oscar.c:4299
-#: ../libpurple/protocols/oscar/oscar.c:4307
 msgid "City"
 msgstr "Stad"
 
-#: ../libpurple/protocols/gg/gg.c:596
 msgid "Year of birth"
 msgstr "Jaar van geboorte"
 
 #. gender
-#: ../libpurple/protocols/gg/gg.c:599 ../libpurple/protocols/msn/msn.c:2187
-#: ../libpurple/protocols/mxit/actions.c:328
-#: ../libpurple/protocols/mxit/login.c:346
-#: ../libpurple/protocols/mxit/profile.c:125
-#: ../libpurple/protocols/myspace/user.c:131
-#: ../libpurple/protocols/oscar/oscar.c:4258
-#: ../libpurple/protocols/qq/buddy_info.c:119
-#: ../libpurple/protocols/qq/qq.c:319 ../libpurple/protocols/qq/qq.c:322
-#: ../libpurple/protocols/qq/qq.c:325 ../libpurple/protocols/qq/qq.c:329
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1092
 msgid "Gender"
 msgstr "Geslag"
 
-#: ../libpurple/protocols/gg/gg.c:600
 msgid "Male or female"
 msgstr "Manlik of vroulik"
 
 #. 0
-#: ../libpurple/protocols/gg/gg.c:601
-#: ../libpurple/protocols/mxit/actions.c:330
-#: ../libpurple/protocols/mxit/login.c:348
-#: ../libpurple/protocols/mxit/profile.c:125
-#: ../libpurple/protocols/oscar/oscar.c:4258
-#: ../libpurple/protocols/qq/buddy_info.c:67
-#: ../libpurple/protocols/qq/qq.c:319
 msgid "Male"
 msgstr "Manlik"
 
-#: ../libpurple/protocols/gg/gg.c:602
-#: ../libpurple/protocols/mxit/actions.c:329
-#: ../libpurple/protocols/mxit/login.c:347
-#: ../libpurple/protocols/mxit/profile.c:125
-#: ../libpurple/protocols/oscar/oscar.c:4258
-#: ../libpurple/protocols/qq/buddy_info.c:68
-#: ../libpurple/protocols/qq/qq.c:322
 msgid "Female"
 msgstr "Vroulik"
 
-#: ../libpurple/protocols/gg/gg.c:606
 msgid "Only online"
 msgstr "Net aanlyn"
 
-#: ../libpurple/protocols/gg/gg.c:610 ../libpurple/protocols/gg/gg.c:611
 msgid "Find buddies"
 msgstr "Vind vriende"
 
-#: ../libpurple/protocols/gg/gg.c:612
 msgid "Please, enter your search criteria below"
 msgstr "Tik gerus u soekkriteria hier onder"
 
-#: ../libpurple/protocols/gg/gg.c:646
 msgid "Fill in the fields."
 msgstr "Vul die velde in."
 
-#: ../libpurple/protocols/gg/gg.c:658
 msgid "Your current password is different from the one that you specified."
 msgstr "U huidige wagwoord verskil van die gespesifiseerde een."
 
-#: ../libpurple/protocols/gg/gg.c:672
 msgid "Unable to change password. Error occurred.\n"
 msgstr "Kan nie wagwoord verander nie. 'n Fout het voorgekom.\n"
 
-#: ../libpurple/protocols/gg/gg.c:681
 msgid "Change password for the Gadu-Gadu account"
 msgstr "Verander wagwoord vir die Gadu-Gadu-rekening"
 
-#: ../libpurple/protocols/gg/gg.c:682
 msgid "Password was changed successfully!"
 msgstr "Wagwoord is suksesvol verander!"
 
-#: ../libpurple/protocols/gg/gg.c:711
 msgid "Current password"
 msgstr "Huidige wagwoord"
 
-#: ../libpurple/protocols/gg/gg.c:721
 msgid "Password (retype)"
 msgstr "Wagwoord (weer)"
 
-#: ../libpurple/protocols/gg/gg.c:726
 msgid "Enter current token"
 msgstr "Tik huidige teken"
 
-#: ../libpurple/protocols/gg/gg.c:732
 msgid "Current token"
 msgstr "Huidige teken"
 
-#: ../libpurple/protocols/gg/gg.c:736
 msgid "Please, enter your current password and your new password for UIN: "
 msgstr "Tik gerus u huidige wagwoord en u nuwe wagwoord vir UIN: "
 
-#: ../libpurple/protocols/gg/gg.c:740 ../libpurple/protocols/gg/gg.c:741
 msgid "Change Gadu-Gadu Password"
 msgstr "Verander Gadu-Gadu-wagwoord"
 
-#: ../libpurple/protocols/gg/gg.c:813
 #, c-format
 msgid "Select a chat for buddy: %s"
 msgstr "Kies 'n geselsie vir vriend: %s"
 
-#: ../libpurple/protocols/gg/gg.c:816 ../libpurple/protocols/gg/gg.c:817
 msgid "Add to chat..."
 msgstr "Voeg by geselsie..."
 
 #. 0
 #. Global
-#: ../libpurple/protocols/gg/gg.c:1090
-#: ../libpurple/protocols/jabber/jutil.c:661
-#: ../libpurple/protocols/msn/state.c:34 ../libpurple/protocols/msn/state.c:35
-#: ../libpurple/protocols/msn/state.c:42 ../libpurple/protocols/msn/state.c:43
-#: ../libpurple/protocols/mxit/roster.c:54
-#: ../libpurple/protocols/novell/novell.c:2843
-#: ../libpurple/protocols/qq/qq.c:415
-#: ../libpurple/protocols/yahoo/libymsg.c:3845 ../libpurple/status.c:163
-#: ../pidgin/gtkdocklet.c:550 ../pidgin/gtkstatusbox.c:1105
-#: ../pidgin/plugins/themeedit-icon.c:63
 msgid "Available"
 msgstr "Beskikbaar"
 
 #. 2
-#: ../libpurple/protocols/gg/gg.c:1094
-#: ../libpurple/protocols/jabber/jabber.c:2302
-#: ../libpurple/protocols/jabber/jutil.c:662
-#: ../libpurple/protocols/mxit/roster.c:56
 msgid "Chatty"
 msgstr "Geselserig"
 
 #. 3
-#: ../libpurple/protocols/gg/gg.c:1097
-#: ../libpurple/protocols/jabber/jabber.c:2348
-#: ../libpurple/protocols/jabber/jutil.c:665
-#: ../libpurple/protocols/mxit/roster.c:57
-#: ../libpurple/protocols/oscar/oscar.c:792
-#: ../libpurple/protocols/oscar/oscar.c:6388
-#: ../libpurple/protocols/sametime/sametime.c:3371
 msgid "Do Not Disturb"
 msgstr "Moenie pla nie"
 
@@ -4529,164 +3179,97 @@ msgstr "Moenie pla nie"
 #. 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:1100 ../libpurple/protocols/irc/irc.c:562
-#: ../libpurple/protocols/irc/msgs.c:360
-#: ../libpurple/protocols/jabber/jutil.c:663
-#: ../libpurple/protocols/mxit/roster.c:55
-#: ../libpurple/protocols/novell/novell.c:2846
-#: ../libpurple/protocols/oscar/oscar.c:798 ../libpurple/protocols/qq/qq.c:272
-#: ../libpurple/protocols/qq/qq.c:419 ../libpurple/protocols/silc/buddy.c:1489
-#: ../libpurple/protocols/silc10/buddy.c:1496
-#: ../libpurple/protocols/yahoo/libymsg.c:4724
-#: ../libpurple/protocols/yahoo/libymsg.c:4811 ../libpurple/status.c:166
-#: ../pidgin/gtkdocklet.c:554 ../pidgin/gtkprefs.c:2679
-#: ../pidgin/gtkstatusbox.c:1106 ../pidgin/plugins/themeedit-icon.c:64
 msgid "Away"
 msgstr "Weg"
 
-#: ../libpurple/protocols/gg/gg.c:1125 ../libpurple/protocols/gg/gg.c:1195
-#: ../libpurple/protocols/oscar/oscar.c:3318
-#: ../libpurple/protocols/oscar/oscar.c:3341
-#: ../libpurple/protocols/oscar/oscar.c:4225
 msgid "UIN"
 msgstr "UIN"
 
 #. first name
-#: ../libpurple/protocols/gg/gg.c:1128 ../libpurple/protocols/gg/gg.c:1198
-#: ../libpurple/protocols/jabber/buddy.c:2000
-#: ../libpurple/protocols/jabber/buddy.c:2187
-#: ../libpurple/protocols/mxit/actions.c:342
-#: ../libpurple/protocols/mxit/profile.c:132
-#: ../libpurple/protocols/oscar/oscar.c:4236
-#: ../libpurple/protocols/silc/ops.c:993
-#: ../libpurple/protocols/silc10/ops.c:1024
-#: ../libpurple/protocols/yahoo/yahoo_aliases.c:544
 msgid "First Name"
 msgstr "Naam"
 
-#: ../libpurple/protocols/gg/gg.c:1141 ../libpurple/protocols/gg/gg.c:1207
 msgid "Birth Year"
 msgstr "Jaar van geboorte"
 
-#: ../libpurple/protocols/gg/gg.c:1189 ../libpurple/protocols/gg/gg.c:1258
-#: ../libpurple/protocols/oscar/oscar.c:4412
 msgid "Unable to display the search results."
 msgstr "Kon nie die soekresultate wys nie."
 
-#: ../libpurple/protocols/gg/gg.c:1249
 msgid "Gadu-Gadu Public Directory"
 msgstr "Gadu-Gadu- publieke gids"
 
-#: ../libpurple/protocols/gg/gg.c:1250
 msgid "Search results"
 msgstr "Soekresultate"
 
-#: ../libpurple/protocols/gg/gg.c:1289
 msgid "No matching users found"
 msgstr "Geen passende gebruikers gevind nie"
 
-#: ../libpurple/protocols/gg/gg.c:1290
 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:1553 ../libpurple/protocols/gg/gg.c:1705
-#: ../libpurple/protocols/qq/qq_network.c:507
 msgid "Unable to read from socket"
 msgstr "Kan nie van sok lees nie"
 
-#: ../libpurple/protocols/gg/gg.c:1639
 msgid "Buddy list downloaded"
 msgstr "Vriendelys afgelaai"
 
-#: ../libpurple/protocols/gg/gg.c:1640
 msgid "Your buddy list was downloaded from the server."
 msgstr "U vriendelys is van die bediener afgelaai."
 
-#: ../libpurple/protocols/gg/gg.c:1647
 msgid "Buddy list uploaded"
 msgstr "Vriendelys opgelaai"
 
-#: ../libpurple/protocols/gg/gg.c:1648
 msgid "Your buddy list was stored on the server."
 msgstr "U vriendelys is na die bediener opgelaai."
 
 #. 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/gg/gg.c:1734
-#: ../libpurple/protocols/myspace/myspace.c:1167
-#: ../libpurple/protocols/sametime/sametime.c:1569
 msgid "Connected"
 msgstr "Koppel"
 
-#: ../libpurple/protocols/gg/gg.c:1743 ../libpurple/protocols/gg/gg.c:1991
-#: ../libpurple/protocols/silc/silc.c:375
-#: ../libpurple/protocols/silc/silc.c:422
-#: ../libpurple/protocols/silc10/silc.c:164
 msgid "Connection failed"
 msgstr "Verbinding het misluk"
 
-#: ../libpurple/protocols/gg/gg.c:1886
 msgid "Add to chat"
 msgstr "Voeg by geselsie"
 
-#: ../libpurple/protocols/gg/gg.c:1915
 msgid "Chat _name:"
 msgstr "Geselsie_naam:"
 
-#: ../libpurple/protocols/gg/gg.c:1972
 #, c-format
 msgid "Unable to resolve hostname '%s': %s"
 msgstr "Kon nie gasheernaam '%s' vasstel nie: %s"
 
 #. 1. connect to server
 #. connect to the server
-#: ../libpurple/protocols/gg/gg.c:1987 ../libpurple/protocols/irc/irc.c:334
-#: ../libpurple/protocols/jabber/jabber.c:1683
-#: ../libpurple/protocols/msn/session.c:389
-#: ../libpurple/protocols/myspace/myspace.c:2219
-#: ../libpurple/protocols/novell/novell.c:2202
-#: ../libpurple/protocols/oscar/oscar.c:1664
-#: ../libpurple/protocols/sametime/sametime.c:3801
-#: ../libpurple/protocols/simple/simple.c:1957
-#: ../libpurple/protocols/yahoo/libymsg.c:3652
-#: ../libpurple/protocols/zephyr/zephyr.c:1582 ../pidgin/gtkstatusbox.c:719
 msgid "Connecting"
 msgstr "Koppel tans"
 
-#: ../libpurple/protocols/gg/gg.c:2295
 msgid "Chat error"
 msgstr "Geselsiefout"
 
-#: ../libpurple/protocols/gg/gg.c:2296
 msgid "This chat name is already in use"
 msgstr "Hierdie geselsienaam word reeds gebruik"
 
-#: ../libpurple/protocols/gg/gg.c:2379
 msgid "Not connected to the server"
 msgstr "Nie aan die bediener gekoppel nie"
 
-#: ../libpurple/protocols/gg/gg.c:2398
 msgid "Find buddies..."
 msgstr "Vind vriende..."
 
-#: ../libpurple/protocols/gg/gg.c:2404
 msgid "Change password..."
 msgstr "Verander wagwoord..."
 
-#: ../libpurple/protocols/gg/gg.c:2410
 msgid "Upload buddylist to Server"
 msgstr "Laai vriendelys op na bediener"
 
-#: ../libpurple/protocols/gg/gg.c:2414
 msgid "Download buddylist from Server"
 msgstr "Laai vriendelys af van bediener"
 
-#: ../libpurple/protocols/gg/gg.c:2418
 msgid "Delete buddylist from Server"
 msgstr "Verwyder vriendelys van bediener"
 
-#: ../libpurple/protocols/gg/gg.c:2422
 msgid "Save buddylist to file..."
 msgstr "Stoor vriendelys in l?er..."
 
@@ -4701,74 +3284,45 @@ msgstr "Stoor vriendelys in l?er..."
 #. id
 #. name
 #. version
-#: ../libpurple/protocols/gg/gg.c:2528
 msgid "Gadu-Gadu Protocol Plugin"
 msgstr "Gadu-Gadu-protokolinprop"
 
 #. summary
-#: ../libpurple/protocols/gg/gg.c:2529
 msgid "Polish popular IM"
 msgstr "Gewilde Poolse stelsel vir kitsboodskappe"
 
-#: ../libpurple/protocols/gg/gg.c:2577
 msgid "Gadu-Gadu User"
 msgstr "Gadu-Gadu-gebruiker"
 
-#: ../libpurple/protocols/gg/gg.c:2581
 msgid "GG server"
 msgstr "GG-bediener"
 
-#: ../libpurple/protocols/irc/cmds.c:43
-#: ../libpurple/protocols/silc/silc.c:1897
-#: ../libpurple/protocols/silc10/silc.c:1609
 #, c-format
 msgid "Unknown command: %s"
 msgstr "Onbekende bevel: %s"
 
-#: ../libpurple/protocols/irc/cmds.c:536
-#: ../libpurple/protocols/jabber/jabber.c:2764
-#: ../libpurple/protocols/silc/silc.c:1587
-#: ../libpurple/protocols/silc10/silc.c:1299
 #, c-format
 msgid "current topic is: %s"
 msgstr "onderwerp tans: %s"
 
-#: ../libpurple/protocols/irc/cmds.c:540
-#: ../libpurple/protocols/jabber/jabber.c:2768
-#: ../libpurple/protocols/silc/silc.c:1591
-#: ../libpurple/protocols/silc10/silc.c:1303
 msgid "No topic is set"
 msgstr "Geen onderwerp gestel nie"
 
-#: ../libpurple/protocols/irc/dcc_send.c:304
-#: ../libpurple/protocols/irc/dcc_send.c:345
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:327
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:336
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:345
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:1151
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:1856
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:1937
 msgid "File Transfer Failed"
 msgstr "L?eroordrag het misluk"
 
-#: ../libpurple/protocols/irc/dcc_send.c:305
-#: ../libpurple/protocols/irc/dcc_send.c:346
 msgid "Unable to open a listening port."
 msgstr "Kan nie 'n luisterpoort open nie."
 
-#: ../libpurple/protocols/irc/irc.c:77
 msgid "Error displaying MOTD"
 msgstr "Kon nie dagboodskap wys nie"
 
-#: ../libpurple/protocols/irc/irc.c:77
 msgid "No MOTD available"
 msgstr "Geen dagboodskap beskikbaar nie"
 
-#: ../libpurple/protocols/irc/irc.c:78
 msgid "There is no MOTD associated with this connection."
 msgstr "Daar is geen dagboodskap met hierdie koppeling geassosieer nie."
 
-#: ../libpurple/protocols/irc/irc.c:81
 #, c-format
 msgid "MOTD for %s"
 msgstr "Dagboodskap vir %s"
@@ -4780,130 +3334,40 @@ msgstr "Dagboodskap vir %s"
 #.
 #. TODO: what to do here - do we really have to disconnect?
 #. TODO: do we really want to disconnect on a failure to write?
-#: ../libpurple/protocols/irc/irc.c:125 ../libpurple/protocols/irc/irc.c:167
-#: ../libpurple/protocols/irc/irc.c:660 ../libpurple/protocols/irc/irc.c:691
-#: ../libpurple/protocols/jabber/bosh.c:936
-#: ../libpurple/protocols/jabber/bosh.c:989
-#: ../libpurple/protocols/jabber/jabber.c:380
-#: ../libpurple/protocols/jabber/jabber.c:416
-#: ../libpurple/protocols/jabber/jabber.c:637
-#: ../libpurple/protocols/jabber/jabber.c:696
-#: ../libpurple/protocols/myspace/myspace.c:2083
-#: ../libpurple/protocols/oscar/flap_connection.c:469
-#: ../libpurple/protocols/qq/qq_network.c:392
-#: ../libpurple/protocols/qq/qq_network.c:588
-#: ../libpurple/protocols/qq/qq_network.c:634
-#: ../libpurple/protocols/sametime/sametime.c:412
-#: ../libpurple/protocols/sametime/sametime.c:1770
-#: ../libpurple/protocols/simple/simple.c:433
-#: ../libpurple/protocols/yahoo/libymsg.c:3137
-#: ../libpurple/protocols/yahoo/libymsg.c:3291
-#: ../libpurple/protocols/yahoo/ycht.c:476 ../libpurple/proxy.c:893
-#: ../libpurple/proxy.c:1476 ../libpurple/proxy.c:1590
-#: ../libpurple/proxy.c:1825 ../libpurple/proxy.c:1901
 #, c-format
 msgid "Lost connection with server: %s"
 msgstr "Verbinding met bediener verloor: %s"
 
-#: ../libpurple/protocols/irc/irc.c:262
 msgid "View MOTD"
 msgstr "Bekyk dagboodskap"
 
-#: ../libpurple/protocols/irc/irc.c:274 ../libpurple/protocols/silc/chat.c:34
-#: ../libpurple/protocols/silc10/chat.c:33
 msgid "_Channel:"
 msgstr "_Kanaal:"
 
-#: ../libpurple/protocols/irc/irc.c:280
-#: ../libpurple/protocols/jabber/chat.c:62 ../pidgin/gtkaccount.c:583
 msgid "_Password:"
 msgstr "_Wagwoord:"
 
-#: ../libpurple/protocols/irc/irc.c:313
 msgid "IRC nick and server may not contain whitespace"
 msgstr "IRC-bynaam en bediener mag nie spasies bevat nie"
 
-#: ../libpurple/protocols/irc/irc.c:344
-#: ../libpurple/protocols/jabber/bosh.c:890
-#: ../libpurple/protocols/jabber/jabber.c:1023
-#: ../libpurple/protocols/novell/novell.c:2217
-#: ../libpurple/protocols/oscar/oscar.c:1616
-#: ../libpurple/protocols/yahoo/libymsg.c:2046
 msgid "SSL support unavailable"
 msgstr "SSL-steun nie beskikbaar nie"
 
-#: ../libpurple/protocols/irc/irc.c:357
-#: ../libpurple/protocols/jabber/bosh.c:896
-#: ../libpurple/protocols/jabber/jabber.c:740
-#: ../libpurple/protocols/jabber/jabber.c:846
-#: ../libpurple/protocols/msn/msn.c:1086
-#: ../libpurple/protocols/msn/servconn.c:141
-#: ../libpurple/protocols/myspace/myspace.c:2237
-#: ../libpurple/protocols/novell/novell.c:1747
-#: ../libpurple/protocols/oscar/oscar.c:1659
-#: ../libpurple/protocols/oscar/oscar.c:1910
-#: ../libpurple/protocols/oscar/oscar.c:2032
-#: ../libpurple/protocols/qq/qq_network.c:211
-#: ../libpurple/protocols/qq/qq_network.c:236
-#: ../libpurple/protocols/qq/qq_network.c:844
-#: ../libpurple/protocols/sametime/sametime.c:3805
-#: ../libpurple/protocols/silc/silc.c:451
-#: ../libpurple/protocols/simple/simple.c:482
-#: ../libpurple/protocols/simple/simple.c:1860
-#: ../libpurple/protocols/yahoo/libymsg.c:3344
-#: ../libpurple/protocols/yahoo/libymsg.c:3532
-#: ../libpurple/protocols/yahoo/libymsg.c:3630
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:1937
-#: ../libpurple/protocols/yahoo/yahoochat.c:1460
-#: ../libpurple/protocols/yahoo/yahoochat.c:1486
-#: ../libpurple/protocols/yahoo/ycht.c:549
-#: ../libpurple/protocols/yahoo/ycht.c:585
 msgid "Unable to connect"
 msgstr "Kan nie koppel nie"
 
 #. this is a regular connect, error out
-#: ../libpurple/protocols/irc/irc.c:453
-#: ../libpurple/protocols/myspace/myspace.c:2176
-#: ../libpurple/protocols/oscar/flap_connection.c:474
-#: ../libpurple/protocols/sametime/sametime.c:1795
-#: ../libpurple/protocols/simple/simple.c:452
-#: ../libpurple/protocols/simple/simple.c:1740
-#: ../libpurple/protocols/yahoo/libymsg.c:3226
-#: ../libpurple/protocols/yahoo/libymsg.c:3252
 #, c-format
 msgid "Unable to connect: %s"
 msgstr "Kan nie koppel nie: %s"
 
-#: ../libpurple/protocols/irc/irc.c:669 ../libpurple/protocols/irc/irc.c:700
-#: ../libpurple/protocols/jabber/jabber.c:635
-#: ../libpurple/protocols/jabber/jabber.c:694
-#: ../libpurple/protocols/myspace/myspace.c:2092
-#: ../libpurple/protocols/oscar/flap_connection.c:467
-#: ../libpurple/protocols/qq/qq_network.c:400
-#: ../libpurple/protocols/sametime/sametime.c:1762
-#: ../libpurple/protocols/yahoo/libymsg.c:3144
-#: ../libpurple/protocols/yahoo/libymsg.c:3298
-#: ../libpurple/protocols/yahoo/ycht.c:482 ../libpurple/proxy.c:882
-#: ../libpurple/proxy.c:1464 ../libpurple/proxy.c:1578
-#: ../libpurple/proxy.c:1814 ../libpurple/proxy.c:1889
 #, c-format
 msgid "Server closed the connection"
 msgstr "Bediener het die koppeling toegemaak"
 
-#: ../libpurple/protocols/irc/irc.c:836
-#: ../libpurple/protocols/silc/chat.c:1404
-#: ../libpurple/protocols/silc10/chat.c:1426
-#: ../libpurple/protocols/yahoo/yahoochat.c:1543
 msgid "Users"
 msgstr "Gebruikers"
 
-#: ../libpurple/protocols/irc/irc.c:839
-#: ../libpurple/protocols/sametime/sametime.c:3448
-#: ../libpurple/protocols/silc/chat.c:1407
-#: ../libpurple/protocols/silc/ops.c:1395
-#: ../libpurple/protocols/silc10/chat.c:1429
-#: ../libpurple/protocols/silc10/ops.c:1382
-#: ../libpurple/protocols/yahoo/yahoochat.c:1552
 msgid "Topic"
 msgstr "Onderwerp"
 
@@ -4915,48 +3379,27 @@ msgstr "Onderwerp"
 #. *< id
 #. *< name
 #. *< version
-#: ../libpurple/protocols/irc/irc.c:981
 msgid "IRC Protocol Plugin"
 msgstr "IRC-protokolinprop"
 
 #. *  summary
-#: ../libpurple/protocols/irc/irc.c:982
 msgid "The IRC Protocol Plugin that Sucks Less"
 msgstr "Die IRC-protokolinprop wat minder suig"
 
 #. host to connect to
-#: ../libpurple/protocols/irc/irc.c:1007 ../libpurple/protocols/irc/msgs.c:373
-#: ../libpurple/protocols/msn/msn.c:2790
-#: ../libpurple/protocols/oscar/oscar.c:7317
-#: ../libpurple/protocols/sametime/sametime.c:5805
-#: ../libpurple/protocols/silc/ops.c:1251
-#: ../libpurple/protocols/silc/ops.c:1345
-#: ../libpurple/protocols/silc10/ops.c:1244
-#: ../libpurple/protocols/silc10/ops.c:1347
-#: ../libpurple/protocols/simple/simple.c:2159
 msgid "Server"
 msgstr "Bediener"
 
 #. port to connect to
-#: ../libpurple/protocols/irc/irc.c:1010 ../libpurple/protocols/msn/msn.c:2795
-#: ../libpurple/protocols/oscar/oscar.c:7320
-#: ../libpurple/protocols/sametime/sametime.c:5810
-#: ../libpurple/protocols/silc/silc.c:2191
-#: ../libpurple/protocols/silc10/silc.c:1908
 msgid "Port"
 msgstr "Poort"
 
-#: ../libpurple/protocols/irc/irc.c:1013
 msgid "Encodings"
 msgstr "Enkoderings"
 
-#: ../libpurple/protocols/irc/irc.c:1016
 msgid "Auto-detect incoming UTF-8"
 msgstr "Outobespeur inkomende UTF-8"
 
-#: ../libpurple/protocols/irc/irc.c:1022 ../libpurple/protocols/irc/msgs.c:367
-#: ../libpurple/protocols/silc/silc.c:1245
-#: ../libpurple/protocols/silc10/silc.c:945
 msgid "Real name"
 msgstr "Regte naam"
 
@@ -4964,177 +3407,129 @@ msgstr "Regte naam"
 #. option = purple_account_option_string_new(_("Quit message"), "quitmsg", IRC_DEFAULT_QUIT);
 #. prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option);
 #.
-#: ../libpurple/protocols/irc/irc.c:1030
-#: ../libpurple/protocols/oscar/oscar.c:7323
 msgid "Use SSL"
 msgstr "Gebruik SSL"
 
-#: ../libpurple/protocols/irc/msgs.c:188
 msgid "Bad mode"
 msgstr "Slegte modus"
 
-#: ../libpurple/protocols/irc/msgs.c:211
 #, c-format
 msgid "Ban on %s by %s, set %s ago"
 msgstr "Ban op %s deur %s, %s sekondes gelede gestel"
 
-#: ../libpurple/protocols/irc/msgs.c:215
 #, c-format
 msgid "Ban on %s"
 msgstr "Ban op %s"
 
-#: ../libpurple/protocols/irc/msgs.c:230
 msgid "End of ban list"
 msgstr "Einde van banlys"
 
-#: ../libpurple/protocols/irc/msgs.c:244
 #, c-format
 msgid "You are banned from %s."
 msgstr "U is verban uit %s."
 
-#: ../libpurple/protocols/irc/msgs.c:245
 msgid "Banned"
 msgstr "Verban"
 
-#: ../libpurple/protocols/irc/msgs.c:262
 #, c-format
 msgid "Cannot ban %s: banlist is full"
 msgstr "Kan nie %s verban nie: verbanlys is vol"
 
-#: ../libpurple/protocols/irc/msgs.c:351
 msgid " <i>(ircop)</i>"
 msgstr " <i>(ircop)</i>"
 
-#: ../libpurple/protocols/irc/msgs.c:352
 msgid " <i>(identified)</i>"
 msgstr " <i>(ge?dentifiseer)</i>"
 
-#: ../libpurple/protocols/irc/msgs.c:353
-#: ../libpurple/protocols/oscar/oscar.c:4226
-#: ../libpurple/protocols/silc/ops.c:1424
-#: ../libpurple/protocols/silc10/ops.c:1414
 msgid "Nick"
 msgstr "Bynaam"
 
-#: ../libpurple/protocols/irc/msgs.c:379
-#: ../libpurple/protocols/silc/ops.c:1270
-#: ../libpurple/protocols/silc10/ops.c:1272
 msgid "Currently on"
 msgstr "Tans in"
 
-#: ../libpurple/protocols/irc/msgs.c:384
 msgid "Idle for"
 msgstr "Ledig vir"
 
-#: ../libpurple/protocols/irc/msgs.c:387
 msgid "Online since"
 msgstr "Aanlyn sedert"
 
-#: ../libpurple/protocols/irc/msgs.c:391
 msgid "<b>Defining adjective:</b>"
 msgstr "<b>Di? beskrywing:</b>"
 
-#: ../libpurple/protocols/irc/msgs.c:391
 msgid "Glorious"
 msgstr "Heerlik"
 
-#: ../libpurple/protocols/irc/msgs.c:479
 #, c-format
 msgid "%s has changed the topic to: %s"
 msgstr "%s het die onderwerp verander na: %s"
 
-#: ../libpurple/protocols/irc/msgs.c:481
 #, c-format
 msgid "%s has cleared the topic."
 msgstr "%s het die onderwerp geskrap."
 
-#: ../libpurple/protocols/irc/msgs.c:489
 #, c-format
 msgid "The topic for %s is: %s"
 msgstr "Die onderwerp vir %s is: %s"
 
-#: ../libpurple/protocols/irc/msgs.c:507
 #, c-format
 msgid "Unknown message '%s'"
 msgstr "Onbekende boodskap '%s'"
 
-#: ../libpurple/protocols/irc/msgs.c:508
 msgid "Unknown message"
 msgstr "Onbekende boodskap"
 
-#: ../libpurple/protocols/irc/msgs.c:508
 msgid "The IRC server received a message it did not understand."
 msgstr "Die IRC-bediener het 'n boodskap ontvang wat hy nie verstaan het nie."
 
-#: ../libpurple/protocols/irc/msgs.c:529
 #, c-format
 msgid "Users on %s: %s"
 msgstr "Gebruikers op %s: %s"
 
-#: ../libpurple/protocols/irc/msgs.c:636
 msgid "Time Response"
 msgstr "Tydrespons"
 
-#: ../libpurple/protocols/irc/msgs.c:637
 msgid "The IRC server's local time is:"
 msgstr "Die IRC-bediener se plaaslike tyd is:"
 
-#: ../libpurple/protocols/irc/msgs.c:648
 msgid "No such channel"
 msgstr "Nie so 'n kanaal nie"
 
 #. does this happen?
-#: ../libpurple/protocols/irc/msgs.c:659
 msgid "no such channel"
 msgstr "nie so 'n kanaal nie"
 
-#: ../libpurple/protocols/irc/msgs.c:662
 msgid "User is not logged in"
 msgstr "Gebruiker is nie aangemeld nie"
 
-#: ../libpurple/protocols/irc/msgs.c:667
 msgid "No such nick or channel"
 msgstr "Nie so 'n bynaam of kanaal nie"
 
-#: ../libpurple/protocols/irc/msgs.c:687
 msgid "Could not send"
 msgstr "Kon nie stuur nie"
 
-#: ../libpurple/protocols/irc/msgs.c:743
 #, c-format
 msgid "Joining %s requires an invitation."
 msgstr "Uitnodiging vereis om by %s aan te sluit."
 
-#: ../libpurple/protocols/irc/msgs.c:744
 msgid "Invitation only"
 msgstr "Net op uitnodiging"
 
-#: ../libpurple/protocols/irc/msgs.c:860
-#: ../libpurple/protocols/jabber/presence.c:728
 #, 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:865
-#: ../libpurple/protocols/jabber/presence.c:735
-#: ../libpurple/protocols/silc/ops.c:716
-#: ../libpurple/protocols/silc10/ops.c:720
 #, c-format
 msgid "Kicked by %s (%s)"
 msgstr "Geskop deur %s (%s)"
 
-#: ../libpurple/protocols/irc/msgs.c:888
 #, c-format
 msgid "mode (%s %s) by %s"
 msgstr "modus (%s %s) deur %s"
 
-#: ../libpurple/protocols/irc/msgs.c:978 ../libpurple/protocols/irc/msgs.c:979
-#: ../libpurple/protocols/jabber/jabber.c:2786
 msgid "Invalid nickname"
 msgstr "Ongeldige bynaam"
 
-#: ../libpurple/protocols/irc/msgs.c:980
 msgid ""
 "Your selected nickname was rejected by the server.  It probably contains "
 "invalid characters."
@@ -5142,7 +3537,6 @@ msgstr ""
 "U gekose bynaam is geweier deur die bediener.  Dit bevat waarskynlik "
 "ongeldige karakters."
 
-#: ../libpurple/protocols/irc/msgs.c:985
 msgid ""
 "Your selected account name was rejected by the server.  It probably contains "
 "invalid characters."
@@ -5153,63 +3547,47 @@ msgstr ""
 #. We only want to do the following dance if the connection
 #. has not been successfully completed.  If it has, just
 #. notify the user that their /nick command didn't go.
-#: ../libpurple/protocols/irc/msgs.c:1001
 #, c-format
 msgid "The nickname \"%s\" is already being used."
 msgstr "Die bynaam \"%s\" is reeds in gebruik."
 
-#: ../libpurple/protocols/irc/msgs.c:1003
-#: ../libpurple/protocols/irc/msgs.c:1004
 msgid "Nickname in use"
 msgstr "Bynaam in gebruik"
 
-#: ../libpurple/protocols/irc/msgs.c:1048
 msgid "Cannot change nick"
 msgstr "Kan nie bynaam verander nie"
 
-#: ../libpurple/protocols/irc/msgs.c:1048
 msgid "Could not change nick"
 msgstr "Kon nie bynaam verander nie"
 
-#: ../libpurple/protocols/irc/msgs.c:1073
 #, c-format
 msgid "You have parted the channel%s%s"
 msgstr "U het die kanaal%s%s verlaat"
 
-#: ../libpurple/protocols/irc/msgs.c:1117
 msgid "Error: invalid PONG from server"
 msgstr "Fout: ongeldige PONG vanaf bediener"
 
-#: ../libpurple/protocols/irc/msgs.c:1119
 #, c-format
 msgid "PING reply -- Lag: %lu seconds"
 msgstr "PIENG-antwoord -- vertraging: %lu sekondes"
 
-#: ../libpurple/protocols/irc/msgs.c:1210
 #, c-format
 msgid "Cannot join %s: Registration is required."
 msgstr "Kan nie by %s aansluit nie: Registrasie word vereis."
 
-#: ../libpurple/protocols/irc/msgs.c:1211
-#: ../libpurple/protocols/silc/ops.c:1095
-#: ../libpurple/protocols/silc10/ops.c:1128
 msgid "Cannot join channel"
 msgstr "Kan nie by kanaal aansluit nie"
 
-#: ../libpurple/protocols/irc/msgs.c:1245
 msgid "Nick or channel is temporarily unavailable."
 msgstr "Bynaam of kanaal is tydelik nie beskikbaar nie."
 
-#: ../libpurple/protocols/irc/msgs.c:1257
 #, c-format
 msgid "Wallops from %s"
 msgstr "Loesing van %s"
 
-#: ../libpurple/protocols/irc/parse.c:124
 msgid "action &lt;action to perform&gt;:  Perform an action."
 msgstr "action &lt;aksie om uit te voer&gt;:  Verrig 'n aksie."
 
-#: ../libpurple/protocols/irc/parse.c:125
 msgid ""
 "away [message]:  Set an away message, or use no message to return from being "
 "away."
@@ -5217,15 +3595,12 @@ msgstr ""
 "away [boodskap]:  Stel die wegboodskap, of geen boodskap om terug te keer "
 "vanaf wegstatus."
 
-#: ../libpurple/protocols/irc/parse.c:126
 msgid "ctcp <nick> <msg>: sends ctcp msg to nick."
 msgstr "ctcp <bynaam> <boodskap>: stuur ctcp boodskap aan bynaam."
 
-#: ../libpurple/protocols/irc/parse.c:127
 msgid "chanserv: Send a command to chanserv"
 msgstr "chanserv: Stuur 'n bevel aan chanserv"
 
-#: ../libpurple/protocols/irc/parse.c:128
 msgid ""
 "deop &lt;nick1&gt; [nick2] ...:  Remove channel operator status from "
 "someone. You must be a channel operator to do this."
@@ -5233,7 +3608,6 @@ msgstr ""
 "deop &lt;bynaam1&gt; [bynaam2] ...:  Verwyder iemand se kanaaloperateur-"
 "status. U moet 'n kanaaloperateur wees om dit te kan doen."
 
-#: ../libpurple/protocols/irc/parse.c:129
 msgid ""
 "devoice &lt;nick1&gt; [nick2] ...:  Remove channel voice status from "
 "someone, preventing them from speaking if the channel is moderated (+m). You "
@@ -5243,7 +3617,6 @@ msgstr ""
 "wat voorkom dat hulle kan praat as die kanaal gemodereer is (+m). U moet 'n "
 "kanaaloperateur wees om dit te kan doen."
 
-#: ../libpurple/protocols/irc/parse.c:130
 msgid ""
 "invite &lt;nick&gt; [room]:  Invite someone to join you in the specified "
 "channel, or the current channel."
@@ -5251,7 +3624,6 @@ msgstr ""
 "invite &lt;bynaam&gt; [kamer]:  Nooi iemand uit om by u in die "
 "gespesifiseerde kanaal of die huidige kanaal aan te sluit."
 
-#: ../libpurple/protocols/irc/parse.c:131
 msgid ""
 "j &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  Enter one or more "
 "channels, optionally providing a channel key for each if needed."
@@ -5259,7 +3631,6 @@ msgstr ""
 "j &lt;kamer1&gt;[,kamer2][,...] [sleutel1[,sleutel2][,...]]:  Sluit aan by "
 "een of meer kanale, en tik opsioneel 'n kanaalsleutel vir elk indien nodig."
 
-#: ../libpurple/protocols/irc/parse.c:132
 msgid ""
 "join &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  Enter one or more "
 "channels, optionally providing a channel key for each if needed."
@@ -5268,7 +3639,6 @@ msgstr ""
 "by een of meer kanale, en tik opsioneel 'n kanaalsleutel vir elk indien "
 "nodig."
 
-#: ../libpurple/protocols/irc/parse.c:133
 msgid ""
 "kick &lt;nick&gt; [message]:  Remove someone from a channel. You must be a "
 "channel operator to do this."
@@ -5276,7 +3646,6 @@ msgstr ""
 "kick &lt;bynaam&gt; [boodskap]:  Verwyder iemand uit 'n kanaal. U moet 'n "
 "kanaaloperateur wees om dit te kan doen."
 
-#: ../libpurple/protocols/irc/parse.c:134
 msgid ""
 "list:  Display a list of chat rooms on the network. <i>Warning, some servers "
 "may disconnect you upon doing this.</i>"
@@ -5284,15 +3653,12 @@ msgstr ""
 "list:  Wys 'n lys geselsiekamers op die netwerk. <i>Let wel: sekere "
 "bedieners kan u ontkoppel as u dit doen.</i>"
 
-#: ../libpurple/protocols/irc/parse.c:135
 msgid "me &lt;action to perform&gt;:  Perform an action."
 msgstr "me &lt;aksie om uit te voer&gt;:  Verrig 'n aksie."
 
-#: ../libpurple/protocols/irc/parse.c:136
 msgid "memoserv: Send a command to memoserv"
 msgstr "memoserv: Stuur 'n bevel aan memoserv"
 
-#: ../libpurple/protocols/irc/parse.c:137
 msgid ""
 "mode &lt;+|-&gt;&lt;A-Za-z&gt; &lt;nick|channel&gt;:  Set or unset a channel "
 "or user mode."
@@ -5300,7 +3666,6 @@ msgstr ""
 "mode &lt;+|-&gt;&lt;A-Za-z&gt; &lt;bynaam|kanaal&gt;:  Aktiveer of "
 "deaktiveer 'n kanaal- of gebruikermodus."
 
-#: ../libpurple/protocols/irc/parse.c:138
 msgid ""
 "msg &lt;nick&gt; &lt;message&gt;:  Send a private message to a user (as "
 "opposed to a channel)."
@@ -5308,26 +3673,19 @@ msgstr ""
 "msg &lt;bynaam&gt; &lt;boodskap&gt;:  Stuur 'n private boodskap aan 'n "
 "gebruiker (in plaas van 'n kanaal)."
 
-#: ../libpurple/protocols/irc/parse.c:139
 msgid "names [channel]:  List the users currently in a channel."
 msgstr "names [kanaal]:  Lys die gebruikers tans in 'n kanaal."
 
-#: ../libpurple/protocols/irc/parse.c:140
-#: ../libpurple/protocols/jabber/jabber.c:3493
 msgid "nick &lt;new nickname&gt;:  Change your nickname."
 msgstr "nick &lt;nuwe bynaam&gt;:  Verander u bynaam."
 
-#: ../libpurple/protocols/irc/parse.c:141
 msgid "nickserv: Send a command to nickserv"
 msgstr "nickserv: Stuur 'n bevel aan nickserv"
 
-#: ../libpurple/protocols/irc/parse.c:142
 msgid "notice &lt;target&lt;:  Send a notice to a user or channel."
 msgstr ""
-"notice &lt;teiken&gt;:  Stuur 'n kennisgewing aan 'n gebruikernaam of "
-"kanaal."
+"notice &lt;teiken&gt;:  Stuur 'n kennisgewing aan 'n gebruikernaam of kanaal."
 
-#: ../libpurple/protocols/irc/parse.c:143
 msgid ""
 "op &lt;nick1&gt; [nick2] ...:  Grant channel operator status to someone. You "
 "must be a channel operator to do this."
@@ -5335,7 +3693,6 @@ msgstr ""
 "op &lt;bynaam1&gt; [bynaam2] ...:  Ken iemand kanaaloperateur-status toe. U "
 "moet 'n kanaaloperateur wees om dit te kan doen."
 
-#: ../libpurple/protocols/irc/parse.c:144
 msgid ""
 "operwall &lt;message&gt;:  If you don't know what this is, you probably "
 "can't use it."
@@ -5343,11 +3700,9 @@ msgstr ""
 "operwall &lt;boodskap&gt;:  Indien u nie weet wat dit is nie, kan u dit "
 "waarskynlik ook nie gebruik nie."
 
-#: ../libpurple/protocols/irc/parse.c:145
 msgid "operserv: Send a command to operserv"
 msgstr "operserv: Stuur 'n bevel aan operserv"
 
-#: ../libpurple/protocols/irc/parse.c:146
 msgid ""
 "part [room] [message]:  Leave the current channel, or a specified channel, "
 "with an optional message."
@@ -5355,7 +3710,6 @@ msgstr ""
 "part [kamer] [boodskap]:  Verlaat die huidige kanaal, of 'n gespesifiseerde "
 "kanaal, met 'n opsionele boodskap."
 
-#: ../libpurple/protocols/irc/parse.c:147
 msgid ""
 "ping [nick]:  Asks how much lag a user (or the server if no user specified) "
 "has."
@@ -5363,7 +3717,6 @@ msgstr ""
 "ping [bynaam]:  Vra aan hoeveel vertraging 'n gebruiker ly (of die bediener, "
 "as geen gebruiker gespesifiseer is nie)."
 
-#: ../libpurple/protocols/irc/parse.c:148
 msgid ""
 "query &lt;nick&gt; &lt;message&gt;:  Send a private message to a user (as "
 "opposed to a channel)."
@@ -5371,15 +3724,12 @@ msgstr ""
 "query &lt;bynaam&gt; &lt;boodskap&gt;:  Stuur 'n private boodskap aan 'n "
 "gebruiker (in plaas van 'n kanaal)."
 
-#: ../libpurple/protocols/irc/parse.c:149
 msgid "quit [message]:  Disconnect from the server, with an optional message."
 msgstr "quit [boodskap]:  Ontkoppel van bediener, met 'n opsionele boodskap."
 
-#: ../libpurple/protocols/irc/parse.c:150
 msgid "quote [...]:  Send a raw command to the server."
 msgstr "quote [...]:  Stuur 'n rou bevel aan die bediener."
 
-#: ../libpurple/protocols/irc/parse.c:151
 msgid ""
 "remove &lt;nick&gt; [message]:  Remove someone from a room. You must be a "
 "channel operator to do this."
@@ -5387,24 +3737,19 @@ msgstr ""
 "remove &lt;bynaam&gt; [boodskap]:  Verwyder iemand uit 'n kamer. U moet 'n "
 "kanaaloperateur wees om dit te kan doen."
 
-#: ../libpurple/protocols/irc/parse.c:152
 msgid "time: Displays the current local time at the IRC server."
 msgstr "time: Wys die plaaslike tyd van die IRC-bediener."
 
-#: ../libpurple/protocols/irc/parse.c:153
 msgid "topic [new topic]:  View or change the channel topic."
 msgstr "topic [nuwe onderwerp]:  Bekyk of verander die kanaalonderwerp."
 
-#: ../libpurple/protocols/irc/parse.c:154
 msgid "umode &lt;+|-&gt;&lt;A-Za-z&gt;:  Set or unset a user mode."
 msgstr ""
 "umode &lt;+|-&gt;&lt;A-Za-z&gt;:  Aktiveer of deaktiveer 'n gebruikermodus."
 
-#: ../libpurple/protocols/irc/parse.c:155
 msgid "version [nick]: send CTCP VERSION request to a user"
 msgstr "version [bynaam]: stuur CTCP VERSION-versoek aan 'n gebruiker"
 
-#: ../libpurple/protocols/irc/parse.c:156
 msgid ""
 "voice &lt;nick1&gt; [nick2] ...:  Grant channel voice status to someone. You "
 "must be a channel operator to do this."
@@ -5412,7 +3757,6 @@ msgstr ""
 "voice &lt;bynaam1&gt; [bynaam2] ...:  Ken iemand kanaalstem-status toe. U "
 "moet 'n kanaaloperateur wees om dit te kan doen."
 
-#: ../libpurple/protocols/irc/parse.c:157
 msgid ""
 "wallops &lt;message&gt;:  If you don't know what this is, you probably can't "
 "use it."
@@ -5420,76 +3764,45 @@ msgstr ""
 "wallops &lt;boodskap&gt;:  Indien u nie weet wat dit is nie, kan u dit "
 "waarskynlik ook nie gebruik nie."
 
-#: ../libpurple/protocols/irc/parse.c:158
 msgid "whois [server] &lt;nick&gt;:  Get information on a user."
 msgstr "whois [bediener] &lt;bynaam&gt;:  Kry inligting oor 'n gebruiker."
 
-#: ../libpurple/protocols/irc/parse.c:159
 msgid "whowas &lt;nick&gt;: Get information on a user that has logged off."
-msgstr "whowas &lt;bynaam&gt;: Kry inligting oor 'n gebruiker wat afgemeld het."
+msgstr ""
+"whowas &lt;bynaam&gt;: Kry inligting oor 'n gebruiker wat afgemeld het."
 
-#: ../libpurple/protocols/irc/parse.c:554
 #, c-format
 msgid "Reply time from %s: %lu seconds"
 msgstr "Antwoordtyd van %s: %lu sekondes"
 
-#: ../libpurple/protocols/irc/parse.c:555
 msgid "PONG"
 msgstr "PONG"
 
-#: ../libpurple/protocols/irc/parse.c:555
 msgid "CTCP PING reply"
 msgstr "CTCP PING-antwoord"
 
-#: ../libpurple/protocols/irc/parse.c:667
-#: ../libpurple/protocols/irc/parse.c:674
 msgid "Disconnected."
 msgstr "Ontkoppel."
 
-#: ../libpurple/protocols/jabber/adhoccommands.c:160
-#: ../libpurple/protocols/jabber/auth.c:199
-#: ../libpurple/protocols/jabber/auth_scram.c:73
-#: ../libpurple/protocols/jabber/jabber.c:1120
-#: ../libpurple/protocols/jabber/jabber.c:1155
-#: ../libpurple/protocols/jabber/jabber.c:2624
 msgid "Unknown Error"
 msgstr "Onbekende fout"
 
-#: ../libpurple/protocols/jabber/adhoccommands.c:162
-#: ../libpurple/protocols/jabber/adhoccommands.c:163
 msgid "Ad-Hoc Command Failed"
 msgstr "Ad hoc-bevel het misluk"
 
-#: ../libpurple/protocols/jabber/adhoccommands.c:197
 msgid "execute"
 msgstr "uitvoer"
 
-#: ../libpurple/protocols/jabber/auth.c:82
-#: ../libpurple/protocols/jabber/auth_cyrus.c:39
-#: ../libpurple/protocols/jabber/auth_plain.c:83
 msgid "Server requires plaintext authentication over an unencrypted stream"
 msgstr "Bediener vereis skoonteksstawing oor 'n onge?nkripteerde stroom"
 
 #. This should never happen!
-#: ../libpurple/protocols/jabber/auth.c:150
-#: ../libpurple/protocols/jabber/auth.c:395
-#: ../libpurple/protocols/jabber/auth.c:424
-#: ../libpurple/protocols/jabber/auth.c:435
-#: ../libpurple/protocols/jabber/auth.c:480
-#: ../libpurple/protocols/jabber/auth_cyrus.c:484
-#: ../libpurple/protocols/jabber/auth_digest_md5.c:179
-#: ../libpurple/protocols/jabber/jabber.c:156
 msgid "Invalid response from server"
 msgstr "Ongeldige respons van die bediener"
 
-#: ../libpurple/protocols/jabber/auth.c:191
-#: ../libpurple/protocols/jabber/auth.c:323
 msgid "Server does not use any supported authentication method"
 msgstr "Bediener gebruik nie enige gesteunde stawingmetode nie"
 
-#: ../libpurple/protocols/jabber/auth.c:307
-#: ../libpurple/protocols/jabber/auth_cyrus.c:244
-#: ../libpurple/protocols/jabber/auth_plain.c:97
 #, c-format
 msgid ""
 "%s requires plaintext authentication over an unencrypted connection.  Allow "
@@ -5498,54 +3811,31 @@ msgstr ""
 "%s vereis skoonteksstawing oor 'n onge?nkripteerde koppeling.  Laat dit toe "
 "en gaan voort met stawing?"
 
-#: ../libpurple/protocols/jabber/auth.c:309
-#: ../libpurple/protocols/jabber/auth.c:310
-#: ../libpurple/protocols/jabber/auth_cyrus.c:246
-#: ../libpurple/protocols/jabber/auth_cyrus.c:247
-#: ../libpurple/protocols/jabber/auth_plain.c:99
-#: ../libpurple/protocols/jabber/auth_plain.c:100
 msgid "Plaintext Authentication"
 msgstr "Skoonteksstawing"
 
-#: ../libpurple/protocols/jabber/auth.c:346
-#: ../libpurple/protocols/jabber/jabber.c:252
 msgid "You require encryption, but it is not available on this server."
 msgstr "U vereis enkripsie, maar dis nie op hierdie bediener beskikbaar nie."
 
-#: ../libpurple/protocols/jabber/auth.c:406
-#: ../libpurple/protocols/jabber/auth_digest_md5.c:197
-#: ../libpurple/protocols/jabber/auth_digest_md5.c:222
-#: ../libpurple/protocols/jabber/auth_scram.c:464
-#: ../libpurple/protocols/jabber/auth_scram.c:484
-#: ../libpurple/protocols/jabber/auth_scram.c:535
-#: ../libpurple/protocols/jabber/auth_scram.c:544
 msgid "Invalid challenge from server"
 msgstr "Ongeldige uitdaging vanaf bediener"
 
-#: ../libpurple/protocols/jabber/auth.c:440
 msgid "Server thinks authentication is complete, but client does not"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/auth_cyrus.c:262
 msgid "SASL authentication failed"
 msgstr "SASL-stawing het misluk"
 
-#: ../libpurple/protocols/jabber/auth_cyrus.c:421
-#: ../libpurple/protocols/jabber/jabber.c:514
-#: ../libpurple/protocols/jabber/jabber.c:667
 #, c-format
 msgid "SASL error: %s"
 msgstr "SASL-fout: %s"
 
-#: ../libpurple/protocols/jabber/auth_scram.c:55
 msgid "Invalid Encoding"
 msgstr "Ongeldige enkodering"
 
-#: ../libpurple/protocols/jabber/auth_scram.c:57
 msgid "Unsupported Extension"
 msgstr "Niegesteunde uitbreiding"
 
-#: ../libpurple/protocols/jabber/auth_scram.c:59
 msgid ""
 "Unexpected response from the server.  This may indicate a possible MITM "
 "attack"
@@ -5553,103 +3843,69 @@ msgstr ""
 "Onverwagte reaksie van die bediener.  Dit dui dalk op 'n moontlike man-in-"
 "die-middel aanval."
 
-#: ../libpurple/protocols/jabber/auth_scram.c:61
 msgid ""
 "The server does support channel binding, but did not appear to advertise "
 "it.  This indicates a likely MITM attack"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/auth_scram.c:63
 msgid "Server does not support channel binding"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/auth_scram.c:65
 msgid "Unsupported channel binding method"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/auth_scram.c:67
-#: ../libpurple/protocols/novell/nmuser.c:1896
 msgid "User not found"
 msgstr "Gebruiker nie gevind nie"
 
-#: ../libpurple/protocols/jabber/auth_scram.c:69
 msgid "Invalid Username Encoding"
 msgstr "Ongeldige enkodering van gebruikernaam"
 
-#: ../libpurple/protocols/jabber/auth_scram.c:71
-#: ../libpurple/protocols/jabber/jabber.c:2689
 msgid "Resource Constraint"
 msgstr "Hulpbron-beperking"
 
-#: ../libpurple/protocols/jabber/auth_scram.c:398
 msgid "Unable to canonicalize username"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/auth_scram.c:409
 msgid "Unable to canonicalize password"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/auth_scram.c:474
 msgid "Malicious challenge from server"
 msgstr "Kwaadwillige uitdaging vanaf bediener"
 
-#: ../libpurple/protocols/jabber/auth_scram.c:526
 msgid "Unexpected response from server"
 msgstr "Onverwagse respons vanaf bediener"
 
-#: ../libpurple/protocols/jabber/bosh.c:413
 msgid "The BOSH connection manager terminated your session."
 msgstr "Die BOSH-verbindingbestuurder het u sessie be?indig."
 
-#: ../libpurple/protocols/jabber/bosh.c:495
 msgid "No session ID given"
 msgstr "Geen sessie-ID is gegee nie"
 
-#: ../libpurple/protocols/jabber/bosh.c:512
 msgid "Unsupported version of BOSH protocol"
 msgstr "Niegesteunde weergawe van die BOSH-protokol"
 
-#: ../libpurple/protocols/jabber/bosh.c:679
 msgid "Unable to establish a connection with the server"
 msgstr "Kan nie 'n verbinding met die bediener bewerkstellig nie"
 
-#: ../libpurple/protocols/jabber/bosh.c:855
 #, c-format
 msgid "Unable to establish a connection with the server: %s"
 msgstr "Kan nie 'n verbinding met die bediener bewerkstellig nie: %s"
 
-#: ../libpurple/protocols/jabber/bosh.c:885
-#: ../libpurple/protocols/jabber/jabber.c:1018
 msgid "Unable to establish SSL connection"
 msgstr "Kan nie SSL-verbinding bewerkstellig nie"
 
-#: ../libpurple/protocols/jabber/buddy.c:350
-#: ../libpurple/protocols/jabber/buddy.c:1024
-#: ../libpurple/protocols/sametime/sametime.c:4207
-#: ../libpurple/protocols/silc/ops.c:989
-#: ../libpurple/protocols/silc10/ops.c:1020
 msgid "Full Name"
 msgstr "Volle name"
 
-#: ../libpurple/protocols/jabber/buddy.c:351
-#: ../libpurple/protocols/jabber/buddy.c:1035
-#: ../libpurple/protocols/silc/ops.c:1001
-#: ../libpurple/protocols/silc10/ops.c:1032
 msgid "Family Name"
 msgstr "Van"
 
-#: ../libpurple/protocols/jabber/buddy.c:352
-#: ../libpurple/protocols/jabber/buddy.c:1037
 msgid "Given Name"
 msgstr "Doopnaam"
 
-#: ../libpurple/protocols/jabber/buddy.c:354
-#: ../libpurple/protocols/jabber/jabber.c:1288
 msgid "URL"
 msgstr "URL"
 
-#: ../libpurple/protocols/jabber/buddy.c:355
-#: ../libpurple/protocols/jabber/buddy.c:1086
 msgid "Street Address"
 msgstr "Straatadres"
 
@@ -5658,95 +3914,50 @@ msgstr "Straatadres"
 #. * clients. The next time someone reads this, remove
 #. * EXTADR.
 #.
-#: ../libpurple/protocols/jabber/buddy.c:356
-#: ../libpurple/protocols/jabber/buddy.c:1084
 msgid "Extended Address"
 msgstr "Uitgebreide adres"
 
-#: ../libpurple/protocols/jabber/buddy.c:357
-#: ../libpurple/protocols/jabber/buddy.c:1088
 msgid "Locality"
 msgstr "Ligging"
 
-#: ../libpurple/protocols/jabber/buddy.c:358
-#: ../libpurple/protocols/jabber/buddy.c:1090
 msgid "Region"
 msgstr "Streek"
 
-#: ../libpurple/protocols/jabber/buddy.c:359
-#: ../libpurple/protocols/jabber/buddy.c:1092
-#: ../libpurple/protocols/qq/buddy_memo.c:80
 msgid "Postal Code"
 msgstr "Poskode"
 
-#: ../libpurple/protocols/jabber/buddy.c:360
-#: ../libpurple/protocols/jabber/buddy.c:1095
-#: ../libpurple/protocols/silc/silc.c:1251
-#: ../libpurple/protocols/silc10/silc.c:951
 msgid "Country"
 msgstr "Land"
 
 #. lots of clients (including purple) do this, but it's
 #. * out of spec
-#: ../libpurple/protocols/jabber/buddy.c:361
-#: ../libpurple/protocols/jabber/buddy.c:1109
-#: ../libpurple/protocols/jabber/buddy.c:1115
-#: ../libpurple/protocols/qq/buddy_memo.c:77
 msgid "Telephone"
 msgstr "Foon"
 
-#: ../libpurple/protocols/jabber/buddy.c:363
-#: ../libpurple/protocols/jabber/buddy.c:1156
 msgid "Organization Name"
 msgstr "Naam van organisasie"
 
-#: ../libpurple/protocols/jabber/buddy.c:364
-#: ../libpurple/protocols/jabber/buddy.c:1158
 msgid "Organization Unit"
 msgstr "Eenheid"
 
 #. title
 #. optional information
-#: ../libpurple/protocols/jabber/buddy.c:365
-#: ../libpurple/protocols/jabber/buddy.c:1163
-#: ../libpurple/protocols/msn/msn.c:2275
-#: ../libpurple/protocols/mxit/actions.c:338
-#: ../libpurple/protocols/mxit/profile.c:131
-#: ../libpurple/protocols/novell/novell.c:1497
-#: ../libpurple/protocols/silc/ops.c:1013
-#: ../libpurple/protocols/silc10/ops.c:1044
 msgid "Job Title"
 msgstr "Postitel"
 
-#: ../libpurple/protocols/jabber/buddy.c:366
-#: ../libpurple/protocols/jabber/buddy.c:1165
 msgid "Role"
 msgstr "Rol"
 
 #. birthday
-#: ../libpurple/protocols/jabber/buddy.c:367
-#: ../libpurple/protocols/jabber/buddy.c:1053
-#: ../libpurple/protocols/msn/msn.c:2256
-#: ../libpurple/protocols/mxit/actions.c:324
-#: ../libpurple/protocols/mxit/login.c:341
-#: ../libpurple/protocols/mxit/profile.c:124
-#: ../libpurple/protocols/oscar/oscar.c:4275
 msgid "Birthday"
 msgstr "Verjaardag"
 
-#: ../libpurple/protocols/jabber/buddy.c:368
-#: ../libpurple/protocols/jabber/buddy.c:1167
-#: ../libpurple/protocols/jabber/chat.c:860 ../pidgin/gtkblist.c:3934
-#: ../pidgin/gtkplugin.c:590 ../pidgin/plugins/disco/gtkdisco.c:569
 msgid "Description"
 msgstr "Beskrywing"
 
-#: ../libpurple/protocols/jabber/buddy.c:675
-#: ../libpurple/protocols/jabber/buddy.c:676
 msgid "Edit XMPP vCard"
 msgstr "Wysig XMPP-vCard"
 
-#: ../libpurple/protocols/jabber/buddy.c:677
 msgid ""
 "All items below are optional. Enter only the information with which you feel "
 "comfortable."
@@ -5754,141 +3965,89 @@ msgstr ""
 "Alle onderstaande items is opsioneel. Tik net die inligting waarmee u "
 "gemaklik voel."
 
-#: ../libpurple/protocols/jabber/buddy.c:722
 msgid "Client"
 msgstr "Kli?nt"
 
-#: ../libpurple/protocols/jabber/buddy.c:726
 msgid "Operating System"
 msgstr "Bedryfstelsel"
 
-#: ../libpurple/protocols/jabber/buddy.c:742
 msgid "Local Time"
 msgstr "Plaaslike tyd"
 
-#: ../libpurple/protocols/jabber/buddy.c:773
-#: ../libpurple/protocols/jabber/jabber.c:2279
-#: ../libpurple/protocols/jabber/jabber.c:2303
-#: ../libpurple/protocols/jabber/jabber.c:2319
-#: ../libpurple/protocols/jabber/jabber.c:2335
-#: ../libpurple/protocols/jabber/jabber.c:2349
 msgid "Priority"
 msgstr "Prioriteit"
 
-#: ../libpurple/protocols/jabber/buddy.c:819
-#: ../libpurple/protocols/jabber/jabber.c:3236
-#: ../libpurple/protocols/jabber/libxmpp.c:262
-#: ../libpurple/protocols/jabber/si.c:1566
 msgid "Resource"
 msgstr "Hulpbron"
 
-#: ../libpurple/protocols/jabber/buddy.c:832
 msgid "Uptime"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/buddy.c:836
 msgid "Logged Off"
 msgstr "Afgemeld"
 
-#: ../libpurple/protocols/jabber/buddy.c:837
 #, c-format
 msgid "%s ago"
 msgstr "%s gelede"
 
-#: ../libpurple/protocols/jabber/buddy.c:1039
-#: ../libpurple/protocols/silc/ops.c:997
-#: ../libpurple/protocols/silc10/ops.c:1028
-#: ../libpurple/protocols/yahoo/yahoo_aliases.c:547
 msgid "Middle Name"
 msgstr "Tweede naam"
 
-#: ../libpurple/protocols/jabber/buddy.c:1072
-#: ../libpurple/protocols/jabber/jabber.c:1283
-#: ../libpurple/protocols/oscar/oscar.c:4298
-#: ../libpurple/protocols/oscar/oscar.c:4306
-#: ../libpurple/protocols/qq/buddy_info.c:116
-#: ../libpurple/protocols/qq/buddy_memo.c:78
-#: ../libpurple/protocols/silc/ops.c:1033
-#: ../libpurple/protocols/silc10/ops.c:1064
 msgid "Address"
 msgstr "Adres"
 
-#: ../libpurple/protocols/jabber/buddy.c:1077
 msgid "P.O. Box"
 msgstr "Posbus"
 
-#: ../libpurple/protocols/jabber/buddy.c:1187
 msgid "Photo"
 msgstr "Foto"
 
-#: ../libpurple/protocols/jabber/buddy.c:1187
 msgid "Logo"
 msgstr "Embleem"
 
-#: ../libpurple/protocols/jabber/buddy.c:1732
 #, c-format
 msgid ""
 "%s will no longer be able to see your status updates.  Do you want to "
 "continue?"
 msgstr "%s sal nie meer u statusveranderinge kan sien nie.  Wil u voortgaan?"
 
-#: ../libpurple/protocols/jabber/buddy.c:1734
-#: ../libpurple/protocols/jabber/buddy.c:1843
 msgid "Cancel Presence Notification"
 msgstr "Kanselleer teenwoordigheidkennisgewings"
 
-#: ../libpurple/protocols/jabber/buddy.c:1831
 msgid "Un-hide From"
 msgstr "Onversteek vanaf"
 
-#: ../libpurple/protocols/jabber/buddy.c:1835
 msgid "Temporarily Hide From"
 msgstr "Kruip tydelik weg vir"
 
-#: ../libpurple/protocols/jabber/buddy.c:1850
 msgid "(Re-)Request authorization"
 msgstr "(Her-)Versoek magtiging"
 
 #. shouldn't this just happen automatically when the buddy is
 #. removed?
-#: ../libpurple/protocols/jabber/buddy.c:1859
 msgid "Unsubscribe"
 msgstr "Teken af"
 
-#: ../libpurple/protocols/jabber/buddy.c:1866
-#: ../libpurple/protocols/msn/msn.c:1014
-#: ../libpurple/protocols/novell/novell.c:3437
 msgid "Initiate _Chat"
 msgstr "Inisieer _geselsie"
 
-#: ../libpurple/protocols/jabber/buddy.c:1883
 msgid "Log In"
 msgstr "Meld aan"
 
-#: ../libpurple/protocols/jabber/buddy.c:1887
 msgid "Log Out"
 msgstr "Meld af"
 
-#: ../libpurple/protocols/jabber/buddy.c:1998
 msgid "JID"
 msgstr "JID"
 
 #. last name
-#: ../libpurple/protocols/jabber/buddy.c:2002
-#: ../libpurple/protocols/jabber/buddy.c:2192
-#: ../libpurple/protocols/mxit/actions.c:346
-#: ../libpurple/protocols/mxit/profile.c:133
-#: ../libpurple/protocols/oscar/oscar.c:4237
-#: ../libpurple/protocols/yahoo/yahoo_aliases.c:545
 msgid "Last Name"
 msgstr "Van"
 
-#: ../libpurple/protocols/jabber/buddy.c:2034
 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:2119
 msgid ""
 "Find a contact by entering the search criteria in the given fields. Note: "
 "Each field supports wild card searches (%)"
@@ -5896,428 +4055,265 @@ msgstr ""
 "Vind 'n kontak deur die soekkriteria in die gegewe velde te tik. Let wel: "
 "Elke veld ondersteun instaankarakter-soektogte (%)"
 
-#: ../libpurple/protocols/jabber/buddy.c:2140
 msgid "Directory Query Failed"
 msgstr "Gidsnavraag het misluk"
 
-#: ../libpurple/protocols/jabber/buddy.c:2141
 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:2175
 #, c-format
 msgid "Server Instructions: %s"
 msgstr "Bedienerinstruksies: %s"
 
-#: ../libpurple/protocols/jabber/buddy.c:2182
 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:2202
-#: ../libpurple/protocols/novell/novell.c:1501
-#: ../libpurple/protocols/oscar/oscar.c:4240
-#: ../libpurple/protocols/oscar/oscar.c:4249
 msgid "Email Address"
 msgstr "E-posadres"
 
-#: ../libpurple/protocols/jabber/buddy.c:2211
-#: ../libpurple/protocols/jabber/buddy.c:2212
 msgid "Search for XMPP users"
 msgstr "Soek vir XMPP-gebruikers"
 
 #. "Search"
-#: ../libpurple/protocols/jabber/buddy.c:2213
-#: ../libpurple/protocols/qq/group.c:111
-#: ../libpurple/protocols/sametime/sametime.c:5689
-#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:472
-#: ../pidgin/plugins/gevolution/assoc-buddy.c:357
 msgid "Search"
 msgstr "Soek"
 
-#: ../libpurple/protocols/jabber/buddy.c:2228
 msgid "Invalid Directory"
 msgstr "Ongeldige gids"
 
-#: ../libpurple/protocols/jabber/buddy.c:2245
 msgid "Enter a User Directory"
 msgstr "Tik 'n gebruikergids"
 
-#: ../libpurple/protocols/jabber/buddy.c:2246
 msgid "Select a user directory to search"
 msgstr "Kies 'n gebruikergids om te deursoek"
 
-#: ../libpurple/protocols/jabber/buddy.c:2249
 msgid "Search Directory"
 msgstr "Deursoek gids"
 
-#: ../libpurple/protocols/jabber/chat.c:44
-#: ../libpurple/protocols/oscar/oscar.c:5893
-#: ../libpurple/protocols/yahoo/yahoochat.c:1092
 msgid "_Room:"
 msgstr "_Kamer:"
 
-#: ../libpurple/protocols/jabber/chat.c:50
 msgid "_Server:"
 msgstr "_Bediener:"
 
-#: ../libpurple/protocols/jabber/chat.c:56
 msgid "_Handle:"
 msgstr "_Vatsel:"
 
-#: ../libpurple/protocols/jabber/chat.c:327
 #, c-format
 msgid "%s is not a valid room name"
 msgstr "%s is nie 'n geldige kamernaam nie"
 
-#: ../libpurple/protocols/jabber/chat.c:328
 msgid "Invalid Room Name"
 msgstr "Ongeldige kamernaam"
 
-#: ../libpurple/protocols/jabber/chat.c:334
 #, c-format
 msgid "%s is not a valid server name"
 msgstr "%s is nie 'n geldige bedienernaam nie"
 
-#: ../libpurple/protocols/jabber/chat.c:335
-#: ../libpurple/protocols/jabber/chat.c:336
 msgid "Invalid Server Name"
 msgstr "Ongeldige bedienernaam"
 
-#: ../libpurple/protocols/jabber/chat.c:341
 #, c-format
 msgid "%s is not a valid room handle"
 msgstr "%s is nie 'n geldige kamernaam nie"
 
-#: ../libpurple/protocols/jabber/chat.c:342
-#: ../libpurple/protocols/jabber/chat.c:343
 msgid "Invalid Room Handle"
 msgstr "Ongeldige kamernaam"
 
-#: ../libpurple/protocols/jabber/chat.c:487
 msgid "Configuration error"
 msgstr "Opstellingfout"
 
-#: ../libpurple/protocols/jabber/chat.c:496
-#: ../libpurple/protocols/jabber/chat.c:640
 msgid "Unable to configure"
 msgstr "Kan nie opstel nie"
 
-#: ../libpurple/protocols/jabber/chat.c:511
 msgid "Room Configuration Error"
 msgstr "Kameropstellingfout"
 
-#: ../libpurple/protocols/jabber/chat.c:512
 msgid "This room is not capable of being configured"
 msgstr "Hieride kamer kan nie opgestel word nie"
 
-#: ../libpurple/protocols/jabber/chat.c:562
-#: ../libpurple/protocols/jabber/chat.c:631
 msgid "Registration error"
 msgstr "Registrasiefout"
 
-#: ../libpurple/protocols/jabber/chat.c:707
 msgid "Nick changing not supported in non-MUC chatrooms"
 msgstr "Bynaamverandering nie in nie-MUC-geselsiekamers ondersteun nie"
 
-#: ../libpurple/protocols/jabber/chat.c:762
-#: ../libpurple/protocols/jabber/chat.c:773
-#: ../libpurple/protocols/silc/ops.c:1462
-#: ../libpurple/protocols/silc10/ops.c:1451
 msgid "Error retrieving room list"
 msgstr "Kon nie kamerlys kry nie"
 
-#: ../libpurple/protocols/jabber/chat.c:821
-#: ../pidgin/plugins/disco/gtkdisco.c:177
 msgid "Invalid Server"
 msgstr "Ongeldige bediener"
 
-#: ../libpurple/protocols/jabber/chat.c:866
 msgid "Enter a Conference Server"
 msgstr "Tik 'n konferensiebediener"
 
-#: ../libpurple/protocols/jabber/chat.c:867
 msgid "Select a conference server to query"
 msgstr "Kies 'n konferensiebediener om te vra"
 
-#: ../libpurple/protocols/jabber/chat.c:870
 msgid "Find Rooms"
 msgstr "Vind kamers"
 
-#: ../libpurple/protocols/jabber/chat.c:1008
 msgid "Affiliations:"
 msgstr "Affiliasies:"
 
-#: ../libpurple/protocols/jabber/chat.c:1020
-#: ../libpurple/protocols/jabber/chat.c:1115
 msgid "No users found"
 msgstr "Geen gebruikers gevind nie"
 
-#: ../libpurple/protocols/jabber/chat.c:1103
 msgid "Roles:"
 msgstr "Rolle:"
 
-#: ../libpurple/protocols/jabber/jabber.c:229 ../libpurple/util.c:4194
 msgid "Server requires TLS/SSL, but no TLS/SSL support was found."
 msgstr "Bediener vereis TLS/SSL, maar geen TLS/SSL-steun is gevind nie."
 
-#: ../libpurple/protocols/jabber/jabber.c:234
 msgid "You require encryption, but no TLS/SSL support was found."
 msgstr "U vereis enkripsie, maar geen TLS/SSL-steun is gevind nie."
 
-#: ../libpurple/protocols/jabber/jabber.c:587
 msgid "Ping timed out"
 msgstr "Pieng het uitgetel"
 
-#: ../libpurple/protocols/jabber/jabber.c:912
-#: ../libpurple/protocols/jabber/jabber.c:945
 msgid "Invalid XMPP ID"
 msgstr "Ongeldige XMPP-ID"
 
-#: ../libpurple/protocols/jabber/jabber.c:921
 msgid "Invalid XMPP ID. Username portion must be set."
 msgstr "Ongeldige XMPP-ID. Gebruikernaam moet ingestel word."
 
-#: ../libpurple/protocols/jabber/jabber.c:930
 msgid "Invalid XMPP ID. Domain must be set."
 msgstr "Ongeldige XMPP-ID. Domein moet ingestel word."
 
-#: ../libpurple/protocols/jabber/jabber.c:1001
 msgid "Malformed BOSH URL"
 msgstr "Wanvormde BOSH-URL"
 
-#: ../libpurple/protocols/jabber/jabber.c:1104
 #, c-format
 msgid "Registration of %s@%s successful"
 msgstr "Registrasie van %s@%s suksesvol"
 
-#: ../libpurple/protocols/jabber/jabber.c:1110
 #, c-format
 msgid "Registration to %s successful"
 msgstr "Registrasie van %s suksesvol"
 
-#: ../libpurple/protocols/jabber/jabber.c:1113
-#: ../libpurple/protocols/jabber/jabber.c:1114
 msgid "Registration Successful"
 msgstr "Registrasie suksesvol"
 
-#: ../libpurple/protocols/jabber/jabber.c:1122
-#: ../libpurple/protocols/jabber/jabber.c:1123
 msgid "Registration Failed"
 msgstr "Registrasie het misluk"
 
-#: ../libpurple/protocols/jabber/jabber.c:1146
 #, c-format
 msgid "Registration from %s successfully removed"
 msgstr "Registrasie van %s suksesvol verwyder"
 
-#: ../libpurple/protocols/jabber/jabber.c:1148
-#: ../libpurple/protocols/jabber/jabber.c:1149
 msgid "Unregistration Successful"
 msgstr "Deregistrasie suksesvol"
 
-#: ../libpurple/protocols/jabber/jabber.c:1157
-#: ../libpurple/protocols/jabber/jabber.c:1158
 msgid "Unregistration Failed"
 msgstr "Deregistrasie het misluk"
 
-#: ../libpurple/protocols/jabber/jabber.c:1285
-#: ../libpurple/protocols/oscar/oscar.c:4300
-#: ../libpurple/protocols/oscar/oscar.c:4308
 msgid "State"
 msgstr "Staat"
 
-#: ../libpurple/protocols/jabber/jabber.c:1286
 msgid "Postal code"
 msgstr "Poskode"
 
-#: ../libpurple/protocols/jabber/jabber.c:1287
-#: ../libpurple/protocols/silc/ops.c:1038
-#: ../libpurple/protocols/silc/silc.c:1008
-#: ../libpurple/protocols/silc/util.c:564
-#: ../libpurple/protocols/silc10/ops.c:1069
-#: ../libpurple/protocols/silc10/silc.c:708
-#: ../libpurple/protocols/silc10/util.c:557
 msgid "Phone"
 msgstr "Foon"
 
-#: ../libpurple/protocols/jabber/jabber.c:1289 ../pidgin/gtknotify.c:1611
 msgid "Date"
 msgstr "Datum"
 
-#: ../libpurple/protocols/jabber/jabber.c:1318
-#: ../libpurple/protocols/jabber/jabber.c:1319
 msgid "Already Registered"
 msgstr "Reeds geregistreer"
 
-#: ../libpurple/protocols/jabber/jabber.c:1405
 msgid "Unregister"
 msgstr "Deregistreer"
 
-#: ../libpurple/protocols/jabber/jabber.c:1412
 msgid ""
 "Please fill out the information below to change your account registration."
 msgstr ""
 "Vul asseblief die inligting hier onder in om u rekeningregistrasie te "
 "verander."
 
-#: ../libpurple/protocols/jabber/jabber.c:1415
 msgid "Please fill out the information below to register your new account."
 msgstr "Vul die inligting onder in om die nuwe rekening te registreer."
 
-#: ../libpurple/protocols/jabber/jabber.c:1423
-#: ../libpurple/protocols/jabber/jabber.c:1424
 msgid "Register New XMPP Account"
 msgstr "Registreer 'n nuwe XMPP-rekening"
 
-#: ../libpurple/protocols/jabber/jabber.c:1425
-#: ../libpurple/protocols/jabber/jabber.c:1436
-#: ../pidgin/plugins/disco/gtkdisco.c:307
-#: ../pidgin/plugins/disco/gtkdisco.c:693
 msgid "Register"
 msgstr "Registreer"
 
-#: ../libpurple/protocols/jabber/jabber.c:1432
 #, c-format
 msgid "Change Account Registration at %s"
 msgstr "Verander rekeningregistrasie by %s"
 
-#: ../libpurple/protocols/jabber/jabber.c:1433
 #, c-format
 msgid "Register New Account at %s"
 msgstr "Registreer nuwe rekening by %s"
 
-#: ../libpurple/protocols/jabber/jabber.c:1436
 msgid "Change Registration"
 msgstr "Verander registrasie"
 
-#: ../libpurple/protocols/jabber/jabber.c:1484
-#: ../libpurple/protocols/jabber/jabber.c:1485
 msgid "Error unregistering account"
 msgstr "Kon nie rekening deregistreer nie"
 
-#: ../libpurple/protocols/jabber/jabber.c:1490
-#: ../libpurple/protocols/jabber/jabber.c:1491
 msgid "Account successfully unregistered"
 msgstr "Rekening suksesvol gederegistreer"
 
-#: ../libpurple/protocols/jabber/jabber.c:1687
 msgid "Initializing Stream"
 msgstr "Inisialiseer stroom"
 
-#: ../libpurple/protocols/jabber/jabber.c:1692
 msgid "Initializing SSL/TLS"
 msgstr "Inisialiseer tans SSL/TLS"
 
-#: ../libpurple/protocols/jabber/jabber.c:1696
-#: ../libpurple/protocols/msn/session.c:395
 msgid "Authenticating"
 msgstr "Stawing"
 
-#: ../libpurple/protocols/jabber/jabber.c:1700
 msgid "Re-initializing Stream"
 msgstr "Herinisialiseer stroom"
 
-#: ../libpurple/protocols/jabber/jabber.c:1869
-#: ../libpurple/protocols/jabber/jabber.c:1870
 msgid "Server doesn't support blocking"
 msgstr "Bediener ondersteun nie blokkering nie"
 
-#: ../libpurple/protocols/jabber/jabber.c:2089
-#: ../libpurple/protocols/jabber/jabber.c:2602
-#: ../libpurple/protocols/jabber/jabber.c:2645
-#: ../libpurple/protocols/jabber/jabber.c:2683
-#: ../libpurple/protocols/oscar/oscar.c:979
-#: ../libpurple/protocols/oscar/oscar.c:6195
 msgid "Not Authorized"
 msgstr "Nie gemagtig nie"
 
-#. (reference: "libpurple/request.h")
-#: ../libpurple/protocols/jabber/jabber.c:2221
-#: ../libpurple/protocols/jabber/jabber.c:2224
-#: ../libpurple/protocols/jabber/jabber.c:2281
-#: ../libpurple/protocols/jabber/jabber.c:2305
-#: ../libpurple/protocols/jabber/jabber.c:2321
-#: ../libpurple/protocols/jabber/jabber.c:2337
-#: ../libpurple/protocols/jabber/jabber.c:2351
-#: ../libpurple/protocols/mxit/actions.c:116
-#: ../libpurple/protocols/mxit/mxit.c:346
-#: ../libpurple/protocols/mxit/profile.c:144
-#: ../libpurple/protocols/mxit/profile.c:146
-#: ../libpurple/protocols/oscar/oscar.c:997
-#: ../libpurple/protocols/silc/buddy.c:1572
-#: ../libpurple/protocols/silc/ops.c:1214
-#: ../libpurple/protocols/silc10/buddy.c:1577
-#: ../libpurple/protocols/silc10/ops.c:1207
 msgid "Mood"
 msgstr "Stemming"
 
-#: ../libpurple/protocols/jabber/jabber.c:2234
-#: ../libpurple/protocols/msn/msn.c:773
 msgid "Now Listening"
 msgstr "Luister tans"
 
-#: ../libpurple/protocols/jabber/jabber.c:2241
-#: ../libpurple/protocols/mxit/roster.c:180
 msgid "Both"
 msgstr "Beide"
 
-#: ../libpurple/protocols/jabber/jabber.c:2243
 msgid "From (To pending)"
 msgstr "Van (aan hangende)"
 
-#: ../libpurple/protocols/jabber/jabber.c:2245
 msgid "From"
 msgstr "Van"
 
-#: ../libpurple/protocols/jabber/jabber.c:2248
 msgid "To"
 msgstr "Aan"
 
-#: ../libpurple/protocols/jabber/jabber.c:2250
 msgid "None (To pending)"
 msgstr "Geen (aan hangende)"
 
-#. 0
-#: ../libpurple/protocols/jabber/jabber.c:2252
-#: ../libpurple/protocols/mxit/actions.c:40
-#: ../libpurple/protocols/mxit/profile.c:146
-#: ../libpurple/protocols/mxit/roster.c:190 ../pidgin/gtkblist.c:3593
-#: ../pidgin/gtkblist.c:3595 ../pidgin/plugins/gevolution/eds-utils.c:73
-#: ../pidgin/plugins/gevolution/eds-utils.c:86
 msgid "None"
 msgstr "Geen"
 
 #. subscription type
-#: ../libpurple/protocols/jabber/jabber.c:2255
-#: ../libpurple/protocols/mxit/mxit.c:350
-#: ../libpurple/protocols/mxit/profile.c:153
 msgid "Subscription"
 msgstr "Inskrywing"
 
-#: ../libpurple/protocols/jabber/jabber.c:2282
-#: ../libpurple/protocols/jabber/jabber.c:2306
-#: ../libpurple/protocols/jabber/jabber.c:2322
-#: ../libpurple/protocols/jabber/jabber.c:2338
-#: ../libpurple/protocols/jabber/jabber.c:2352
 msgid "Mood Text"
 msgstr "Stemmingteks"
 
-#: ../libpurple/protocols/jabber/jabber.c:2284
-#: ../libpurple/protocols/jabber/jabber.c:2308
-#: ../libpurple/protocols/jabber/jabber.c:2324
-#: ../libpurple/protocols/jabber/jabber.c:2340
 msgid "Allow Buzz"
 msgstr "Laat zoempie toe"
 
-#: ../libpurple/protocols/jabber/jabber.c:2291
-#: ../libpurple/protocols/oscar/oscar.c:6407
 msgid "Mood Name"
 msgstr "Bui"
 
-#: ../libpurple/protocols/jabber/jabber.c:2292
-#: ../libpurple/protocols/oscar/oscar.c:6408
 msgid "Mood Comment"
 msgstr "Kommentaar by bui"
 
@@ -6327,330 +4323,239 @@ msgstr "Kommentaar by bui"
 #. saveable
 #. should be user_settable some day
 #. independent
-#: ../libpurple/protocols/jabber/jabber.c:2371
-#: ../libpurple/protocols/msn/msn.c:927
-#: ../libpurple/protocols/myspace/myspace.c:506
 msgid "Tune Artist"
 msgstr "Deuntjiekunstenaar"
 
-#: ../libpurple/protocols/jabber/jabber.c:2372
-#: ../libpurple/protocols/msn/msn.c:929
-#: ../libpurple/protocols/myspace/myspace.c:507
 msgid "Tune Title"
 msgstr "Deuntjietitel"
 
-#: ../libpurple/protocols/jabber/jabber.c:2373
-#: ../libpurple/protocols/msn/msn.c:928
 msgid "Tune Album"
 msgstr "Deuntjiealbum"
 
-#: ../libpurple/protocols/jabber/jabber.c:2374
 msgid "Tune Genre"
 msgstr "Deuntjiegenre"
 
-#: ../libpurple/protocols/jabber/jabber.c:2375
 msgid "Tune Comment"
 msgstr "Deuntjiekommentaar"
 
-#: ../libpurple/protocols/jabber/jabber.c:2376
 msgid "Tune Track"
 msgstr "Deuntjiesnit"
 
-#: ../libpurple/protocols/jabber/jabber.c:2377
 msgid "Tune Time"
 msgstr "Deuntjietyd"
 
-#: ../libpurple/protocols/jabber/jabber.c:2378
 msgid "Tune Year"
 msgstr "Deuntjiejaar"
 
-#: ../libpurple/protocols/jabber/jabber.c:2379
 msgid "Tune URL"
 msgstr "Deuntjie-URL"
 
-#: ../libpurple/protocols/jabber/jabber.c:2392
 msgid "Password Changed"
 msgstr "Wagwoord verander"
 
-#: ../libpurple/protocols/jabber/jabber.c:2393
 msgid "Your password has been changed."
 msgstr "U wagwoord is verander."
 
-#: ../libpurple/protocols/jabber/jabber.c:2399
-#: ../libpurple/protocols/jabber/jabber.c:2400
 msgid "Error changing password"
 msgstr "Kon nie wagwoord verander nie"
 
-#: ../libpurple/protocols/jabber/jabber.c:2463
-#: ../libpurple/protocols/jabber/jabber.c:2464
 msgid "Change XMPP Password"
 msgstr "Verander XMPP-wagwoord"
 
-#: ../libpurple/protocols/jabber/jabber.c:2464
 msgid "Please enter your new password"
 msgstr "Tik gerus u nuwe wagwoord"
 
-#: ../libpurple/protocols/jabber/jabber.c:2478
-#: ../libpurple/protocols/oscar/oscar.c:7065
-#: ../libpurple/protocols/silc/silc.c:1329
-#: ../libpurple/protocols/silc10/silc.c:1029
-#: ../libpurple/protocols/yahoo/libymsg.c:4183
-#: ../libpurple/protocols/yahoo/libymsg.c:4339
 msgid "Set User Info..."
 msgstr "Stel gebruikerinligting..."
 
 #. if (js->protocol_options & CHANGE_PASSWORD) {
-#: ../libpurple/protocols/jabber/jabber.c:2483
-#: ../libpurple/protocols/oscar/oscar.c:7076
-#: ../libpurple/protocols/silc/silc.c:1325
-#: ../libpurple/protocols/silc10/silc.c:1025
 msgid "Change Password..."
 msgstr "Verander wagwoord..."
 
 #. }
-#: ../libpurple/protocols/jabber/jabber.c:2488
 msgid "Search for Users..."
 msgstr "Soek vir gebruikers..."
 
-#: ../libpurple/protocols/jabber/jabber.c:2582
 msgid "Bad Request"
 msgstr "Slegte versoek"
 
-#: ../libpurple/protocols/jabber/jabber.c:2584
 msgid "Conflict"
 msgstr "Konflik"
 
-#: ../libpurple/protocols/jabber/jabber.c:2586
 msgid "Feature Not Implemented"
 msgstr "Kenmerk nie ge?mplementeer nie"
 
-#: ../libpurple/protocols/jabber/jabber.c:2588
 msgid "Forbidden"
 msgstr "Verbode"
 
-#: ../libpurple/protocols/jabber/jabber.c:2590
 msgid "Gone"
 msgstr "Weg"
 
-#: ../libpurple/protocols/jabber/jabber.c:2592
-#: ../libpurple/protocols/jabber/jabber.c:2673
 msgid "Internal Server Error"
 msgstr "Interne bedienerfout"
 
-#: ../libpurple/protocols/jabber/jabber.c:2594
 msgid "Item Not Found"
 msgstr "Item nie gevind nie"
 
-#: ../libpurple/protocols/jabber/jabber.c:2596
 msgid "Malformed XMPP ID"
 msgstr "Wanvormde XMPP-ID"
 
-#: ../libpurple/protocols/jabber/jabber.c:2598
 msgid "Not Acceptable"
 msgstr "Nie aanvaarbaar nie"
 
-#: ../libpurple/protocols/jabber/jabber.c:2600
 msgid "Not Allowed"
 msgstr "Nie toegelaat nie"
 
-#: ../libpurple/protocols/jabber/jabber.c:2604
 msgid "Payment Required"
 msgstr "Betaling vereis"
 
-#: ../libpurple/protocols/jabber/jabber.c:2606
 msgid "Recipient Unavailable"
 msgstr "Ontvanger nie beskikbaar nie"
 
-#: ../libpurple/protocols/jabber/jabber.c:2610
 msgid "Registration Required"
 msgstr "Registrasie vereis"
 
-#: ../libpurple/protocols/jabber/jabber.c:2612
 msgid "Remote Server Not Found"
 msgstr "Afgele? bediener nie gevind nie"
 
-#: ../libpurple/protocols/jabber/jabber.c:2614
 msgid "Remote Server Timeout"
 msgstr "Afgele?bediener-uittelling"
 
-#: ../libpurple/protocols/jabber/jabber.c:2616
 msgid "Server Overloaded"
 msgstr "Bediener oorlaai"
 
-#: ../libpurple/protocols/jabber/jabber.c:2618
 msgid "Service Unavailable"
 msgstr "Diens nie beskikbaar nie"
 
-#: ../libpurple/protocols/jabber/jabber.c:2620
 msgid "Subscription Required"
 msgstr "Inskrywing vereis"
 
-#: ../libpurple/protocols/jabber/jabber.c:2622
 msgid "Unexpected Request"
 msgstr "Onverwagde versoek"
 
-#: ../libpurple/protocols/jabber/jabber.c:2630
 msgid "Authorization Aborted"
 msgstr "Magtiging gestaak"
 
-#: ../libpurple/protocols/jabber/jabber.c:2632
 msgid "Incorrect encoding in authorization"
 msgstr "Verkeerde enkodering in magtiging"
 
-#: ../libpurple/protocols/jabber/jabber.c:2634
 msgid "Invalid authzid"
 msgstr "Ongeldige authzid"
 
-#: ../libpurple/protocols/jabber/jabber.c:2636
 msgid "Invalid Authorization Mechanism"
 msgstr "Ongeldige magtigingmeganisme"
 
-#: ../libpurple/protocols/jabber/jabber.c:2639
 msgid "Authorization mechanism too weak"
 msgstr "Magtigingmeganisme te swak"
 
-#: ../libpurple/protocols/jabber/jabber.c:2647
 msgid "Temporary Authentication Failure"
 msgstr "Tydlike stawingmislukking"
 
-#: ../libpurple/protocols/jabber/jabber.c:2650
 msgid "Authentication Failure"
 msgstr "Stawingmislukking"
 
-#: ../libpurple/protocols/jabber/jabber.c:2658
 msgid "Bad Format"
 msgstr "Slegte formaat"
 
-#: ../libpurple/protocols/jabber/jabber.c:2660
 msgid "Bad Namespace Prefix"
 msgstr "Slegte naamruimte-voorvoegsel"
 
-#: ../libpurple/protocols/jabber/jabber.c:2663
 msgid "Resource Conflict"
 msgstr "Hulpbron-konflik"
 
-#: ../libpurple/protocols/jabber/jabber.c:2665
 msgid "Connection Timeout"
 msgstr "Verbinding-uittelling"
 
-#: ../libpurple/protocols/jabber/jabber.c:2667
 msgid "Host Gone"
 msgstr "Gasheer weg"
 
-#: ../libpurple/protocols/jabber/jabber.c:2669
 msgid "Host Unknown"
 msgstr "Gasheer onbekend"
 
-#: ../libpurple/protocols/jabber/jabber.c:2671
 msgid "Improper Addressing"
 msgstr "Onbehoorlike adressering"
 
-#: ../libpurple/protocols/jabber/jabber.c:2675
 msgid "Invalid ID"
 msgstr "Ongeldige ID"
 
-#: ../libpurple/protocols/jabber/jabber.c:2677
 msgid "Invalid Namespace"
 msgstr "Ongeldige naamruimte"
 
-#: ../libpurple/protocols/jabber/jabber.c:2679
 msgid "Invalid XML"
 msgstr "Ongeldige XML"
 
-#: ../libpurple/protocols/jabber/jabber.c:2681
 msgid "Non-matching Hosts"
 msgstr "Niepassende gashere"
 
-#: ../libpurple/protocols/jabber/jabber.c:2685
 msgid "Policy Violation"
 msgstr "Beleidskending"
 
-#: ../libpurple/protocols/jabber/jabber.c:2687
 msgid "Remote Connection Failed"
 msgstr "Afgele? verbinding het misluk"
 
-#: ../libpurple/protocols/jabber/jabber.c:2691
 msgid "Restricted XML"
 msgstr "Ingeperkte XML"
 
-#: ../libpurple/protocols/jabber/jabber.c:2693
 msgid "See Other Host"
 msgstr "Sien ander gasheer"
 
-#: ../libpurple/protocols/jabber/jabber.c:2695
 msgid "System Shutdown"
 msgstr "Stelselafsluiting"
 
-#: ../libpurple/protocols/jabber/jabber.c:2697
 msgid "Undefined Condition"
 msgstr "Ongedefinieerde toestand"
 
-#: ../libpurple/protocols/jabber/jabber.c:2699
 msgid "Unsupported Encoding"
 msgstr "Niegesteunde enkodering"
 
-#: ../libpurple/protocols/jabber/jabber.c:2701
 msgid "Unsupported Stanza Type"
 msgstr "Niegesteunde stanzatipe"
 
-#: ../libpurple/protocols/jabber/jabber.c:2703
 msgid "Unsupported Version"
 msgstr "Niegesteunde weergawe"
 
-#: ../libpurple/protocols/jabber/jabber.c:2705
 msgid "XML Not Well Formed"
 msgstr "XML nie goed gevorm nie"
 
-#: ../libpurple/protocols/jabber/jabber.c:2707
 msgid "Stream Error"
 msgstr "Stroomfout"
 
-#: ../libpurple/protocols/jabber/jabber.c:2817
 #, c-format
 msgid "Unable to ban user %s"
 msgstr "Kan nie gebruiker %s verban nie"
 
-#: ../libpurple/protocols/jabber/jabber.c:2837
 #, c-format
 msgid "Unknown affiliation: \"%s\""
 msgstr "Onbekende affiliasie: \"%s\""
 
-#: ../libpurple/protocols/jabber/jabber.c:2847
 #, c-format
 msgid "Unable to affiliate user %s as \"%s\""
 msgstr "Kan nie gebruiker %s as \"%s\" affilieer nie"
 
-#: ../libpurple/protocols/jabber/jabber.c:2872
 #, c-format
 msgid "Unknown role: \"%s\""
 msgstr "Onbekende rol: \"%s\""
 
-#: ../libpurple/protocols/jabber/jabber.c:2882
 #, 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:2940
 #, c-format
 msgid "Unable to kick user %s"
 msgstr "Kan nie gebruiker %s skop nie"
 
-#: ../libpurple/protocols/jabber/jabber.c:2977
 #, c-format
 msgid "Unable to ping user %s"
 msgstr "Kan nie gebruiker %s pieng nie"
 
-#: ../libpurple/protocols/jabber/jabber.c:2999
 #, c-format
 msgid "Unable to buzz, because there is nothing known about %s."
 msgstr "Kan nie zoempie stuur nie omdat daar niks oor %s bekend is nie."
 
-#: ../libpurple/protocols/jabber/jabber.c:3006
 #, c-format
 msgid "Unable to buzz, because %s might be offline."
 msgstr "Kan nie zoempie stuur nie omdat %s dalk vanlyn is."
 
-#: ../libpurple/protocols/jabber/jabber.c:3030
 #, c-format
 msgid ""
 "Unable to buzz, because %s does not support it or does not wish to receive "
@@ -6661,90 +4566,67 @@ msgstr ""
 
 #. Yahoo only supports one attention command: the 'buzz'.
 #. This is index number YAHOO_BUZZ.
-#: ../libpurple/protocols/jabber/jabber.c:3077
-#: ../libpurple/protocols/yahoo/libymsg.c:5258
 msgid "Buzz"
 msgstr "Zoempie"
 
-#: ../libpurple/protocols/jabber/jabber.c:3078
-#: ../libpurple/protocols/yahoo/libymsg.c:5259
 #, c-format
 msgid "%s has buzzed you!"
 msgstr "%s het u 'n zoempie gestuur!"
 
-#: ../libpurple/protocols/jabber/jabber.c:3078
-#: ../libpurple/protocols/yahoo/libymsg.c:5259
 #, c-format
 msgid "Buzzing %s..."
 msgstr "Stuur zoempie aan %s..."
 
-#: ../libpurple/protocols/jabber/jabber.c:3208
 #, c-format
 msgid "Unable to initiate media with %s: invalid JID"
 msgstr "Kan nie media inisieer met %s nie: ongeldige JID"
 
-#: ../libpurple/protocols/jabber/jabber.c:3210
 #, c-format
 msgid "Unable to initiate media with %s: user is not online"
 msgstr "Kan nie media inisieer met %s nie: gebruiker is nie aanlyn nie"
 
-#: ../libpurple/protocols/jabber/jabber.c:3212
 #, c-format
 msgid "Unable to initiate media with %s: not subscribed to user presence"
 msgstr ""
 "Kan nie media inisieer met %s nie: nie by gebruikerteenwoordigheid ingeteken "
 "nie"
 
-#: ../libpurple/protocols/jabber/jabber.c:3215
-#: ../libpurple/protocols/jabber/jabber.c:3216
 msgid "Media Initiation Failed"
 msgstr "Mediainisialisering het misluk"
 
-#: ../libpurple/protocols/jabber/jabber.c:3286
 #, c-format
 msgid ""
 "Please select the resource of %s with which you would like to start a media "
 "session."
 msgstr "Kies gerus die hulpbron van %s waarmee u 'n mediasessie wil begin."
 
-#: ../libpurple/protocols/jabber/jabber.c:3296
-#: ../libpurple/protocols/jabber/si.c:1580
 msgid "Select a Resource"
 msgstr "Kies 'n hulpbron"
 
-#: ../libpurple/protocols/jabber/jabber.c:3297
 msgid "Initiate Media"
 msgstr "Inisieer media"
 
-#: ../libpurple/protocols/jabber/jabber.c:3468
 msgid "Account does not support PEP, can't set mood"
 msgstr "Rekening ondersteun nie PEP nie, kan nie die bui instel nie"
 
-#: ../libpurple/protocols/jabber/jabber.c:3481
 msgid "config:  Configure a chat room."
 msgstr "config:  Konfigureer 'n geselsiekamer."
 
-#: ../libpurple/protocols/jabber/jabber.c:3487
 msgid "configure:  Configure a chat room."
 msgstr "configure:  Konfigureer 'n geselsiekamer."
 
-#: ../libpurple/protocols/jabber/jabber.c:3500
 msgid "part [message]:  Leave the room."
 msgstr "part [boodskap]:  Verlaat die kamer."
 
-#: ../libpurple/protocols/jabber/jabber.c:3507
 msgid "register:  Register with a chat room."
 msgstr "register:  Registreer met 'n geselsiekamer."
 
-#: ../libpurple/protocols/jabber/jabber.c:3515
 msgid "topic [new topic]:  View or change the topic."
 msgstr "topic [nuwe onderwerp]:  Bekyk of verander die onderwerp."
 
-#: ../libpurple/protocols/jabber/jabber.c:3523
 msgid "ban &lt;user&gt; [reason]:  Ban a user from the room."
 msgstr "ban &lt;gebruiker&gt; [rede]:  Verban 'n gebruiker uit die kamer."
 
-#: ../libpurple/protocols/jabber/jabber.c:3531
 msgid ""
 "affiliate &lt;owner|admin|member|outcast|none&gt; [nick1] [nick2] ...: Get "
 "the users with an affiliation or set users' affiliation with the room."
@@ -6753,7 +4635,6 @@ msgstr ""
 "Kry die gebruikers met 'n affiliasie of stel gebruikers se affiliasie met "
 "die kamer in."
 
-#: ../libpurple/protocols/jabber/jabber.c:3539
 msgid ""
 "role &lt;moderator|participant|visitor|none&gt; [nick1] [nick2] ...: Get the "
 "users with a role or set users' role with the room."
@@ -6761,44 +4642,33 @@ msgstr ""
 "role &lt;moderator|deelnemer|besoeker|geen&gt; [bynaam1] [bynaam2] ...: Kry "
 "die gebruikers met 'n rol of stel gebruikers se rol in die kamer in."
 
-#: ../libpurple/protocols/jabber/jabber.c:3547
 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:3555
 msgid "join: &lt;room&gt; [password]:  Join a chat on this server."
 msgstr ""
 "join: &lt;kamer&gt; [wagwoord]:  Sluit by 'n geselsie aan op hierdie "
 "bediener."
 
-#: ../libpurple/protocols/jabber/jabber.c:3563
 msgid "kick &lt;user&gt; [reason]:  Kick a user from the room."
 msgstr "kick &lt;gebruiker&gt; [rede]:  Skop 'n gebruiker uit die kamer."
 
-#: ../libpurple/protocols/jabber/jabber.c:3570
 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:3578
 msgid "ping &lt;jid&gt;:\tPing a user/component/server."
 msgstr "ping &lt;jid&gt;:\tPieng 'n gebruiker/komponent/bediener."
 
-#: ../libpurple/protocols/jabber/jabber.c:3586
-#: ../libpurple/protocols/yahoo/libyahoo.c:53
-#: ../libpurple/protocols/yahoo/libyahoojp.c:50
 msgid "buzz: Buzz a user to get their attention"
 msgstr "buzz: Stuur 'n gebruiker 'n zoempie om sy aandag te trek"
 
-#: ../libpurple/protocols/jabber/jabber.c:3593
 msgid "mood: Set current user mood"
 msgstr "mood: Stel die huidige gebruikerbui"
 
-#: ../libpurple/protocols/jabber/jutil.c:664
-#: ../pidgin/plugins/themeedit-icon.c:65
 msgid "Extended Away"
 msgstr "Vir lank weg"
 
@@ -6812,647 +4682,414 @@ msgstr "Vir lank weg"
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/jabber/libxmpp.c:164
-#: ../libpurple/protocols/jabber/libxmpp.c:166
 msgid "XMPP Protocol Plugin"
 msgstr "XMPP-protokolinprop"
 
 #. Translators: 'domain' is used here in the context of Internet domains, e.g. pidgin.im
-#: ../libpurple/protocols/jabber/libxmpp.c:258 ../pidgin/gtkaccount.c:563
 msgid "Domain"
 msgstr "Domein"
 
-#: ../libpurple/protocols/jabber/libxmpp.c:266
 msgid "Require SSL/TLS"
 msgstr "Vereis SSL/TLS"
 
-#: ../libpurple/protocols/jabber/libxmpp.c:270
 msgid "Force old (port 5223) SSL"
 msgstr "Dwing ou SSL (poort 5223)"
 
-#: ../libpurple/protocols/jabber/libxmpp.c:275
 msgid "Allow plaintext auth over unencrypted streams"
 msgstr "Laat skoonteksstawing oor onge?nkripteerde strome toe"
 
-#: ../libpurple/protocols/jabber/libxmpp.c:280
-#: ../libpurple/protocols/myspace/myspace.c:3647
-#: ../libpurple/protocols/simple/simple.c:2165
 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:284
-#: ../libpurple/protocols/myspace/myspace.c:3644
-#: ../libpurple/protocols/silc/silc.c:2187
-#: ../libpurple/protocols/silc10/silc.c:1904
 msgid "Connect server"
 msgstr "Koppel bediener"
 
-#: ../libpurple/protocols/jabber/libxmpp.c:289
 msgid "File transfer proxies"
 msgstr "L?eroordraginstaanbediener"
 
-#: ../libpurple/protocols/jabber/libxmpp.c:297
 msgid "BOSH URL"
 msgstr "BOSH-URL"
 
 #. this should probably be part of global smiley theme settings later on,
 #. shared with MSN
-#: ../libpurple/protocols/jabber/libxmpp.c:304
 msgid "Show Custom Smileys"
 msgstr "Wys pasgemaakte gesiggies"
 
-#: ../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:176
 #, c-format
 msgid "Message from %s"
 msgstr "Boodskap van %s"
 
-#: ../libpurple/protocols/jabber/message.c:240
 #, c-format
 msgid "%s has set the topic to: %s"
 msgstr "%s het die onderwerp gestel na: %s"
 
-#: ../libpurple/protocols/jabber/message.c:242
 #, c-format
 msgid "The topic is: %s"
 msgstr "Die onderwerp is: %s"
 
-#: ../libpurple/protocols/jabber/message.c:290
 #, c-format
 msgid "Message delivery to %s failed: %s"
 msgstr "Boodskapaflewering na %s het misluk: %s"
 
-#: ../libpurple/protocols/jabber/message.c:293
 msgid "XMPP Message Error"
 msgstr "XMPP-boodskapfout"
 
-#: ../libpurple/protocols/jabber/message.c:563
 #, c-format
 msgid "(Code %s)"
 msgstr "(Kode %s)"
 
-#: ../libpurple/protocols/jabber/message.c:984
 msgid "A custom smiley in the message is too large to send."
 msgstr "'n Pasgemaakte gesiggie in die boodskap is te groot om te stuur."
 
-#: ../libpurple/protocols/jabber/parser.c:57
 msgid "XMPP stream header missing"
 msgstr "XMPP-stroomkop ontbreek"
 
-#: ../libpurple/protocols/jabber/parser.c:78
 msgid "XMPP Version Mismatch"
 msgstr "XMPP-weergawes pas nie"
 
-#: ../libpurple/protocols/jabber/parser.c:99
 msgid "XMPP stream missing ID"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/parser.c:290
 msgid "XML Parse error"
 msgstr "XML-ontleedfout"
 
-#: ../libpurple/protocols/jabber/presence.c:552
 #, c-format
 msgid "Error joining chat %s"
 msgstr "Kon nie by geselsie %s aansluit nie"
 
-#: ../libpurple/protocols/jabber/presence.c:555
 #, c-format
 msgid "Error in chat %s"
 msgstr "Fout in geselsie %s"
 
-#: ../libpurple/protocols/jabber/presence.c:597
-#: ../libpurple/protocols/jabber/presence.c:598
 msgid "Create New Room"
 msgstr "Skep nuwe kamer"
 
-#: ../libpurple/protocols/jabber/presence.c:599
 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:605
 msgid "_Configure Room"
 msgstr "_Stel kamer op"
 
-#: ../libpurple/protocols/jabber/presence.c:606
 msgid "_Accept Defaults"
 msgstr "_Aanvaar verstek"
 
-#: ../libpurple/protocols/jabber/presence.c:724
 msgid "No reason"
 msgstr "Geen rede nie"
 
-#: ../libpurple/protocols/jabber/presence.c:731
 #, c-format
 msgid "You have been kicked: (%s)"
 msgstr "U is geskop: (%s)"
 
-#: ../libpurple/protocols/jabber/presence.c:738
 #, c-format
 msgid "Kicked (%s)"
 msgstr "Geskop (%s)"
 
-#: ../libpurple/protocols/jabber/presence.c:941
 msgid "Unknown Error in presence"
 msgstr "Onbekende fout in teenwoordigheid"
 
-#: ../libpurple/protocols/jabber/si.c:993
 msgid "An error occurred on the in-band bytestream transfer\n"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/si.c:1008
 msgid "Transfer was closed."
 msgstr "Oordrag is gesluit."
 
-#: ../libpurple/protocols/jabber/si.c:1151
 msgid "Failed to open in-band bytestream"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/si.c:1455
-#: ../libpurple/protocols/jabber/si.c:1496
 #, c-format
 msgid "Unable to send file to %s, user does not support file transfers"
 msgstr "Kan nie l?er stuur aan %s nie: die gebruiker steun nie l?eroordrag nie"
 
-#: ../libpurple/protocols/jabber/si.c:1456
-#: ../libpurple/protocols/jabber/si.c:1457
-#: ../libpurple/protocols/jabber/si.c:1497
-#: ../libpurple/protocols/jabber/si.c:1498
-#: ../libpurple/protocols/jabber/si.c:1552
 msgid "File Send Failed"
 msgstr "L?erversending het misluk"
 
-#: ../libpurple/protocols/jabber/si.c:1545
 #, c-format
 msgid "Unable to send file to %s, invalid JID"
 msgstr "Kan nie l?er aan %s stuur nie, ongeldige JID"
 
-#: ../libpurple/protocols/jabber/si.c:1547
 #, c-format
 msgid "Unable to send file to %s, user is not online"
 msgstr "Kan nie l?er stuur aan %s nie, gebruiker nie aanlyn nie"
 
-#: ../libpurple/protocols/jabber/si.c:1549
 #, c-format
 msgid "Unable to send file to %s, not subscribed to user presence"
 msgstr ""
 "Kan nie l?er stuur aan %s nie, nie by gebruikerteenwoordigheid ingeteken nie"
 
-#: ../libpurple/protocols/jabber/si.c:1564
 #, c-format
 msgid "Please select the resource of %s to which you would like to send a file"
 msgstr "Kies gerus aan watter hulpbron van %s u 'n l?er wil stuur"
 
-#: ../libpurple/protocols/jabber/usermood.c:34
 msgid "Afraid"
 msgstr "Bang"
 
-#: ../libpurple/protocols/jabber/usermood.c:35
 msgid "Amazed"
 msgstr "Verwonderd"
 
-#: ../libpurple/protocols/jabber/usermood.c:36
 msgid "Amorous"
 msgstr "Amoreus"
 
-#. 1
-#: ../libpurple/protocols/jabber/usermood.c:37
-#: ../libpurple/protocols/mxit/actions.c:41
-#: ../libpurple/protocols/mxit/roster.c:140
-#: ../libpurple/protocols/oscar/family_locate.c:411
-#: ../libpurple/protocols/silc/buddy.c:1510
-#: ../libpurple/protocols/silc/silc.c:983
-#: ../libpurple/protocols/silc/util.c:527
-#: ../libpurple/protocols/silc10/buddy.c:1517
-#: ../libpurple/protocols/silc10/silc.c:683
-#: ../libpurple/protocols/silc10/util.c:519
 msgid "Angry"
 msgstr "Kwaad"
 
-#: ../libpurple/protocols/jabber/usermood.c:38
 msgid "Annoyed"
 msgstr "Ge?rriteerd"
 
-#: ../libpurple/protocols/jabber/usermood.c:39
-#: ../libpurple/protocols/silc/buddy.c:1526
-#: ../libpurple/protocols/silc/silc.c:999
-#: ../libpurple/protocols/silc/util.c:543
-#: ../libpurple/protocols/silc10/buddy.c:1533
-#: ../libpurple/protocols/silc10/silc.c:699
-#: ../libpurple/protocols/silc10/util.c:535
 msgid "Anxious"
 msgstr "Angstig"
 
-#: ../libpurple/protocols/jabber/usermood.c:40
 msgid "Aroused"
 msgstr "Geprikkel"
 
-#: ../libpurple/protocols/jabber/usermood.c:41
-#: ../libpurple/protocols/silc/buddy.c:1514
-#: ../libpurple/protocols/silc/silc.c:987
-#: ../libpurple/protocols/silc/util.c:531
-#: ../libpurple/protocols/silc10/buddy.c:1521
-#: ../libpurple/protocols/silc10/silc.c:687
-#: ../libpurple/protocols/silc10/util.c:523
 msgid "Ashamed"
 msgstr "Bekaamd"
 
-#: ../libpurple/protocols/jabber/usermood.c:42
-#: ../libpurple/protocols/silc/buddy.c:1522
-#: ../libpurple/protocols/silc/silc.c:995
-#: ../libpurple/protocols/silc/util.c:539
-#: ../libpurple/protocols/silc10/buddy.c:1529
-#: ../libpurple/protocols/silc10/silc.c:695
-#: ../libpurple/protocols/silc10/util.c:531
 msgid "Bored"
 msgstr "Verveeld"
 
-#: ../libpurple/protocols/jabber/usermood.c:43
 msgid "Brave"
 msgstr "Dapper"
 
-#: ../libpurple/protocols/jabber/usermood.c:44
 msgid "Calm"
 msgstr "Kalm"
 
-#: ../libpurple/protocols/jabber/usermood.c:45
 msgid "Cautious"
 msgstr "Versigtig"
 
-#: ../libpurple/protocols/jabber/usermood.c:46
 msgid "Cold"
 msgstr "Koud"
 
-#: ../libpurple/protocols/jabber/usermood.c:47
 msgid "Confident"
 msgstr "Selfversekerd"
 
-#: ../libpurple/protocols/jabber/usermood.c:48
 msgid "Confused"
 msgstr "Verward"
 
-#: ../libpurple/protocols/jabber/usermood.c:49
 msgid "Contemplative"
 msgstr "Peinsend"
 
-#: ../libpurple/protocols/jabber/usermood.c:50
 msgid "Contented"
 msgstr "Vervuld"
 
-#: ../libpurple/protocols/jabber/usermood.c:51
 msgid "Cranky"
 msgstr "Befoeterd"
 
-#: ../libpurple/protocols/jabber/usermood.c:52
 msgid "Crazy"
 msgstr "Mal"
 
-#: ../libpurple/protocols/jabber/usermood.c:53
 msgid "Creative"
 msgstr "Kreatief"
 
-#: ../libpurple/protocols/jabber/usermood.c:54
 msgid "Curious"
 msgstr "Nuuskierig"
 
-#: ../libpurple/protocols/jabber/usermood.c:55
 msgid "Dejected"
 msgstr "Ontmoedig"
 
-#: ../libpurple/protocols/jabber/usermood.c:56
 msgid "Depressed"
 msgstr "Depressief"
 
-#: ../libpurple/protocols/jabber/usermood.c:57
 msgid "Disappointed"
 msgstr "Teleurgesteld"
 
-#: ../libpurple/protocols/jabber/usermood.c:58
 msgid "Disgusted"
 msgstr "Vies"
 
-#: ../libpurple/protocols/jabber/usermood.c:59
 msgid "Dismayed"
 msgstr "Ontsteld"
 
-#: ../libpurple/protocols/jabber/usermood.c:60
 msgid "Distracted"
 msgstr "Afgetrokke"
 
-#: ../libpurple/protocols/jabber/usermood.c:61
 msgid "Embarrassed"
 msgstr "Verle?"
 
-#: ../libpurple/protocols/jabber/usermood.c:62
 msgid "Envious"
 msgstr "Jaloers"
 
-#. 2
-#: ../libpurple/protocols/jabber/usermood.c:63
-#: ../libpurple/protocols/mxit/actions.c:42
-#: ../libpurple/protocols/mxit/roster.c:142
-#: ../libpurple/protocols/silc/buddy.c:1524
-#: ../libpurple/protocols/silc/silc.c:997
-#: ../libpurple/protocols/silc/util.c:541
-#: ../libpurple/protocols/silc10/buddy.c:1531
-#: ../libpurple/protocols/silc10/silc.c:697
-#: ../libpurple/protocols/silc10/util.c:533
 msgid "Excited"
 msgstr "Opgewonde"
 
-#: ../libpurple/protocols/jabber/usermood.c:64
 msgid "Flirtatious"
 msgstr "Koketterig"
 
-#: ../libpurple/protocols/jabber/usermood.c:65
 msgid "Frustrated"
 msgstr "Gefrustreerd"
 
-#: ../libpurple/protocols/jabber/usermood.c:66
 msgid "Grateful"
 msgstr "Dankbaar"
 
-#: ../libpurple/protocols/jabber/usermood.c:67
 msgid "Grieving"
 msgstr "Bedroef"
 
-#. 3
-#: ../libpurple/protocols/jabber/usermood.c:68
-#: ../libpurple/protocols/mxit/actions.c:43
-#: ../libpurple/protocols/mxit/roster.c:144
 msgid "Grumpy"
 msgstr "Knorrig"
 
-#: ../libpurple/protocols/jabber/usermood.c:69
 msgid "Guilty"
 msgstr "Skuldig"
 
-#. 4
-#: ../libpurple/protocols/jabber/usermood.c:70
-#: ../libpurple/protocols/mxit/actions.c:44
-#: ../libpurple/protocols/mxit/roster.c:146
-#: ../libpurple/protocols/silc/buddy.c:1506
-#: ../libpurple/protocols/silc/silc.c:979
-#: ../libpurple/protocols/silc/util.c:523
-#: ../libpurple/protocols/silc10/buddy.c:1513
-#: ../libpurple/protocols/silc10/silc.c:679
-#: ../libpurple/protocols/silc10/util.c:515
 msgid "Happy"
 msgstr "Gelukkig"
 
-#: ../libpurple/protocols/jabber/usermood.c:71
 msgid "Hopeful"
 msgstr "Hoopvol"
 
-#. 8
-#: ../libpurple/protocols/jabber/usermood.c:72
-#: ../libpurple/protocols/mxit/actions.c:48
-#: ../libpurple/protocols/mxit/roster.c:154
 msgid "Hot"
 msgstr "Warm"
 
-#: ../libpurple/protocols/jabber/usermood.c:73
 msgid "Humbled"
 msgstr "Beskeie"
 
-#: ../libpurple/protocols/jabber/usermood.c:74
 msgid "Humiliated"
 msgstr "Verneder"
 
-#: ../libpurple/protocols/jabber/usermood.c:75
 msgid "Hungry"
 msgstr "Honger"
 
-#: ../libpurple/protocols/jabber/usermood.c:76
 msgid "Hurt"
 msgstr "Seer"
 
-#: ../libpurple/protocols/jabber/usermood.c:77
 msgid "Impressed"
 msgstr "Be?ndruk"
 
-#: ../libpurple/protocols/jabber/usermood.c:78
 msgid "In awe"
 msgstr "In vervoering"
 
-#: ../libpurple/protocols/jabber/usermood.c:79
-#: ../libpurple/protocols/oscar/family_locate.c:422
-#: ../libpurple/protocols/silc/silc.c:991
-#: ../libpurple/protocols/silc10/silc.c:691
 msgid "In love"
 msgstr "Verlief"
 
-#: ../libpurple/protocols/jabber/usermood.c:80
 msgid "Indignant"
 msgstr "Verontwaardig"
 
-#: ../libpurple/protocols/jabber/usermood.c:81
 msgid "Interested"
 msgstr "Ge?nteresseerd"
 
-#: ../libpurple/protocols/jabber/usermood.c:82
 msgid "Intoxicated"
 msgstr "Dronk"
 
-#. 6
-#: ../libpurple/protocols/jabber/usermood.c:83
-#: ../libpurple/protocols/mxit/actions.c:46
-#: ../libpurple/protocols/mxit/roster.c:150
-#: ../libpurple/protocols/silc/buddy.c:1516
-#: ../libpurple/protocols/silc/silc.c:989
-#: ../libpurple/protocols/silc/util.c:533
-#: ../libpurple/protocols/silc10/buddy.c:1523
-#: ../libpurple/protocols/silc10/silc.c:689
-#: ../libpurple/protocols/silc10/util.c:525
 msgid "Invincible"
 msgstr "Onoorwinlik"
 
-#: ../libpurple/protocols/jabber/usermood.c:84
-#: ../libpurple/protocols/silc/buddy.c:1512
-#: ../libpurple/protocols/silc/silc.c:985
-#: ../libpurple/protocols/silc/util.c:529
-#: ../libpurple/protocols/silc10/buddy.c:1519
-#: ../libpurple/protocols/silc10/silc.c:685
-#: ../libpurple/protocols/silc10/util.c:521
 msgid "Jealous"
 msgstr "Jaloers"
 
-#: ../libpurple/protocols/jabber/usermood.c:85
 msgid "Lonely"
 msgstr "Eensaam"
 
-#: ../libpurple/protocols/jabber/usermood.c:86
 msgid "Lost"
 msgstr "Verlore"
 
-#: ../libpurple/protocols/jabber/usermood.c:87
 #, fuzzy
 msgid "Lucky"
 msgstr "Soos 'n kind met 'n roomys in elke hand"
 
-#: ../libpurple/protocols/jabber/usermood.c:88
 msgid "Mean"
 msgstr "Gemeen"
 
-#: ../libpurple/protocols/jabber/usermood.c:89
 msgid "Moody"
 msgstr "Buierig"
 
-#: ../libpurple/protocols/jabber/usermood.c:90
 msgid "Nervous"
 msgstr "Senuweeagtig"
 
-#: ../libpurple/protocols/jabber/usermood.c:91
 msgid "Neutral"
 msgstr "Neutraal"
 
-#: ../libpurple/protocols/jabber/usermood.c:92
 msgid "Offended"
 msgstr "Geaffronteerd"
 
-#: ../libpurple/protocols/jabber/usermood.c:93
 msgid "Outraged"
 msgstr "Woedend"
 
-#: ../libpurple/protocols/jabber/usermood.c:94
 msgid "Playful"
 msgstr "Spelerig"
 
-#: ../libpurple/protocols/jabber/usermood.c:95
 msgid "Proud"
 msgstr "Trots"
 
-#: ../libpurple/protocols/jabber/usermood.c:96
 msgid "Relaxed"
 msgstr "Ontspanne"
 
-#: ../libpurple/protocols/jabber/usermood.c:97
 msgid "Relieved"
 msgstr "Verlig"
 
-#: ../libpurple/protocols/jabber/usermood.c:98
 msgid "Remorseful"
 msgstr "Berouvol"
 
-#: ../libpurple/protocols/jabber/usermood.c:99
 msgid "Restless"
 msgstr "Rusteloos"
 
-#. 7
-#: ../libpurple/protocols/jabber/usermood.c:100
-#: ../libpurple/protocols/mxit/actions.c:47
-#: ../libpurple/protocols/mxit/roster.c:152
-#: ../libpurple/protocols/silc/buddy.c:1508
-#: ../libpurple/protocols/silc/silc.c:981
-#: ../libpurple/protocols/silc/util.c:525
-#: ../libpurple/protocols/silc10/buddy.c:1515
-#: ../libpurple/protocols/silc10/silc.c:681
-#: ../libpurple/protocols/silc10/util.c:517
 msgid "Sad"
 msgstr "Hartseer"
 
-#: ../libpurple/protocols/jabber/usermood.c:101
 msgid "Sarcastic"
 msgstr "Sarkasties"
 
-#: ../libpurple/protocols/jabber/usermood.c:102
 msgid "Satisfied"
 msgstr "Tevrede"
 
-#: ../libpurple/protocols/jabber/usermood.c:103
 msgid "Serious"
 msgstr "Ernstig"
 
-#: ../libpurple/protocols/jabber/usermood.c:104
 msgid "Shocked"
 msgstr "Geskok"
 
-#: ../libpurple/protocols/jabber/usermood.c:105
 msgid "Shy"
 msgstr "Skaam"
 
-#. 9
-#: ../libpurple/protocols/jabber/usermood.c:106
-#: ../libpurple/protocols/mxit/actions.c:49
-#: ../libpurple/protocols/mxit/roster.c:156
-#: ../libpurple/protocols/oscar/family_locate.c:414
 msgid "Sick"
 msgstr "Siek"
 
-#. 10
 #. Sleepy / Tired
-#: ../libpurple/protocols/jabber/usermood.c:107
-#: ../libpurple/protocols/mxit/actions.c:50
-#: ../libpurple/protocols/mxit/roster.c:158
-#: ../libpurple/protocols/oscar/family_locate.c:424
-#: ../libpurple/protocols/silc/buddy.c:1520
-#: ../libpurple/protocols/silc/silc.c:993
-#: ../libpurple/protocols/silc/util.c:537
-#: ../libpurple/protocols/silc10/buddy.c:1527
-#: ../libpurple/protocols/silc10/silc.c:693
-#: ../libpurple/protocols/silc10/util.c:529
 msgid "Sleepy"
 msgstr "Vaak"
 
-#: ../libpurple/protocols/jabber/usermood.c:108
 msgid "Spontaneous"
 msgstr "Spontaan"
 
-#: ../libpurple/protocols/jabber/usermood.c:109
 msgid "Stressed"
 msgstr "Gespanne"
 
-#: ../libpurple/protocols/jabber/usermood.c:110
 msgid "Strong"
 msgstr "Sterk"
 
-#: ../libpurple/protocols/jabber/usermood.c:111
 msgid "Surprised"
 msgstr "Verras"
 
-#: ../libpurple/protocols/jabber/usermood.c:112
 msgid "Thankful"
 msgstr "Dankbaar"
 
-#: ../libpurple/protocols/jabber/usermood.c:113
 msgid "Thirsty"
 msgstr "Dors"
 
-#: ../libpurple/protocols/jabber/usermood.c:114
 msgid "Tired"
 msgstr "Moeg"
 
-#: ../libpurple/protocols/jabber/usermood.c:115
 msgid "Undefined"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/usermood.c:116
 msgid "Weak"
 msgstr "Swak"
 
-#: ../libpurple/protocols/jabber/usermood.c:117
 msgid "Worried"
 msgstr "Bekommerd"
 
-#: ../libpurple/protocols/jabber/usernick.c:81
 msgid "Set User Nickname"
 msgstr "Stel gebruikerbynaam op"
 
-#: ../libpurple/protocols/jabber/usernick.c:81
 msgid "Please specify a new nickname for you."
 msgstr "Spesifiseer asseblief 'n nuwe bynaam vir uself."
 
-#: ../libpurple/protocols/jabber/usernick.c:82
 msgid ""
 "This information is visible to all contacts on your contact list, so choose "
 "something appropriate."
@@ -7460,59 +5097,43 @@ msgstr ""
 "Hierdie inligting is aan alle kontakte op u kontaklys sigbaar, kies dus "
 "sorgvuldig."
 
-#: ../libpurple/protocols/jabber/usernick.c:83
-#: ../libpurple/protocols/mxit/actions.c:116
-#: ../libpurple/protocols/mxit/actions.c:358
 msgid "Set"
 msgstr "Stel"
 
-#: ../libpurple/protocols/jabber/usernick.c:103
 msgid "Set Nickname..."
 msgstr "Stel bynaam op..."
 
-#: ../libpurple/protocols/jabber/xdata.c:382
 msgid "Actions"
 msgstr "Aksies"
 
-#: ../libpurple/protocols/jabber/xdata.c:384
 msgid "Select an action"
 msgstr "Stel 'n aksie op"
 
 #. only notify the user about problems adding to the friends list
 #. * maybe we should do something else for other lists, but it probably
 #. * won't cause too many problems if we just ignore it
-#: ../libpurple/protocols/msn/contact.c:1020
-#: ../libpurple/protocols/msn/contact.c:1128
-#: ../libpurple/protocols/msn/userlist.c:538
 #, c-format
 msgid "Unable to add \"%s\"."
 msgstr "Kan nie \"%s\" byvoeg nie."
 
-#: ../libpurple/protocols/msn/contact.c:1021
-#: ../libpurple/protocols/msn/contact.c:1129
 msgid "Buddy Add error"
 msgstr "Fout met byvoeg van vriend"
 
-#: ../libpurple/protocols/msn/contact.c:1022
-#: ../libpurple/protocols/msn/contact.c:1130
 msgid "The username specified does not exist."
 msgstr "Die gespesifiseerde gebruikernaam bestaan 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:124
 #, c-format
 msgid ""
 "%s on the local list is inside the group \"%s\" but not on the server list. "
 "Do you want this buddy to be added?"
 msgstr ""
-"%s op die plaaslike lys is binne die groep \"%s\" maar nie op die bedienerlys "
-"nie. Wil u hierdie vriend byvoeg?"
+"%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:132
 #, c-format
 msgid ""
 "%s is on the local list but not on the server list. Do you want this buddy "
@@ -7521,383 +5142,246 @@ msgstr ""
 "%s op die plaaslike lys maar nie op die bedienerlys nie. Wil u hierdie "
 "vriend byvoeg?"
 
-#: ../libpurple/protocols/msn/error.c:36
-#: ../libpurple/protocols/myspace/myspace.c:2135
-#, c-format
 msgid "Unable to parse message"
 msgstr "Kon nie boodskap ontleed nie"
 
-#: ../libpurple/protocols/msn/error.c:40
-#, c-format
 msgid "Syntax Error (probably a client bug)"
 msgstr "Sintaksfout (dalk 'n kli?ntfout)"
 
-#: ../libpurple/protocols/msn/error.c:44
-#, c-format
 msgid "Invalid email address"
 msgstr "Ongeldige e-posadres"
 
-#: ../libpurple/protocols/msn/error.c:47
-#, c-format
 msgid "User does not exist"
 msgstr "Gebruiker bestaan nie"
 
-#: ../libpurple/protocols/msn/error.c:50
-#, c-format
 msgid "Fully qualified domain name missing"
 msgstr "Volledig gekwalifiseerde domeinnaam word vermis"
 
-#: ../libpurple/protocols/msn/error.c:53
-#, c-format
 msgid "Already logged in"
 msgstr "Reeds aangemeld"
 
-#: ../libpurple/protocols/msn/error.c:56
-#, c-format
 msgid "Invalid username"
 msgstr "Ongeldige gebruikernaam"
 
-#: ../libpurple/protocols/msn/error.c:59
-#, c-format
 msgid "Invalid friendly name"
 msgstr "Ongeldige vriendelike naam"
 
-#: ../libpurple/protocols/msn/error.c:62
-#, c-format
 msgid "List full"
 msgstr "Lys vol"
 
-#: ../libpurple/protocols/msn/error.c:65
-#, c-format
 msgid "Already there"
 msgstr "Reeds daar"
 
-#: ../libpurple/protocols/msn/error.c:69
-#, c-format
 msgid "Not on list"
 msgstr "Nie op lys nie"
 
-#: ../libpurple/protocols/msn/error.c:72
-#: ../libpurple/protocols/zephyr/zephyr.c:759
-#, c-format
 msgid "User is offline"
 msgstr "Gebruiker is vanlyn"
 
-#: ../libpurple/protocols/msn/error.c:75
-#, c-format
 msgid "Already in the mode"
 msgstr "Reeds in die modus"
 
-#: ../libpurple/protocols/msn/error.c:79
-#, c-format
 msgid "Already in opposite list"
 msgstr "Reeds in teenoorgestelde-lys"
 
-#: ../libpurple/protocols/msn/error.c:83
-#, c-format
 msgid "Too many groups"
 msgstr "Te veel groepe"
 
-#: ../libpurple/protocols/msn/error.c:86
-#, c-format
 msgid "Invalid group"
 msgstr "Ongeldige groep"
 
-#: ../libpurple/protocols/msn/error.c:89
-#, c-format
 msgid "User not in group"
 msgstr "Gebruiker nie in groep nie"
 
-#: ../libpurple/protocols/msn/error.c:92
-#, c-format
 msgid "Group name too long"
 msgstr "Groepnaam te lank"
 
-#: ../libpurple/protocols/msn/error.c:95
-#, c-format
 msgid "Cannot remove group zero"
 msgstr "Kan nie groep nul verwyder nie"
 
-#: ../libpurple/protocols/msn/error.c:99
-#, 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:102
-#, c-format
 msgid "Switchboard failed"
 msgstr "Skakelbord het misluk"
 
-#: ../libpurple/protocols/msn/error.c:106
-#, c-format
 msgid "Notify transfer failed"
 msgstr "Laat weet oordrag het misluk"
 
-#: ../libpurple/protocols/msn/error.c:111
-#, c-format
 msgid "Required fields missing"
 msgstr "Vereiste velde kort"
 
-#: ../libpurple/protocols/msn/error.c:115
-#, c-format
 msgid "Too many hits to a FND"
 msgstr "Te veel resultate vir 'n FND"
 
-#: ../libpurple/protocols/msn/error.c:119
-#: ../libpurple/protocols/oscar/oscar.c:136
-#: ../libpurple/protocols/oscar/oscar.c:162
-#, c-format
 msgid "Not logged in"
 msgstr "Nie aangemeld nie"
 
-#: ../libpurple/protocols/msn/error.c:123
-#, c-format
 msgid "Service temporarily unavailable"
 msgstr "Diens tydelik nie beskikbaar nie"
 
-#: ../libpurple/protocols/msn/error.c:126
-#, c-format
 msgid "Database server error"
 msgstr "Databasisbedienerfout"
 
-#: ../libpurple/protocols/msn/error.c:130
-#, c-format
 msgid "Command disabled"
 msgstr "Bevel gedeaktiveer"
 
-#: ../libpurple/protocols/msn/error.c:134
-#, c-format
 msgid "File operation error"
 msgstr "L?erbewerkingsfout"
 
-#: ../libpurple/protocols/msn/error.c:138
-#, c-format
 msgid "Memory allocation error"
 msgstr "Geheuetoekenningsfout"
 
-#: ../libpurple/protocols/msn/error.c:142
-#, c-format
 msgid "Wrong CHL value sent to server"
 msgstr "Verkeerde CHL-waarde aan bediener gestuur"
 
-#: ../libpurple/protocols/msn/error.c:147
-#, c-format
 msgid "Server busy"
 msgstr "Bediener besig"
 
-#: ../libpurple/protocols/msn/error.c:150
-#: ../libpurple/protocols/msn/error.c:164
-#: ../libpurple/protocols/msn/error.c:222
-#, c-format
 msgid "Server unavailable"
 msgstr "Bediener nie beskikbaar nie"
 
-#: ../libpurple/protocols/msn/error.c:153
-#, c-format
 msgid "Peer notification server down"
 msgstr "Ewekniekennisgewing-bediener af"
 
-#: ../libpurple/protocols/msn/error.c:157
-#, c-format
 msgid "Database connect error"
 msgstr "Databasiskoppelfout"
 
-#: ../libpurple/protocols/msn/error.c:161
-#, c-format
 msgid "Server is going down (abandon ship)"
 msgstr "Bediener dreig om te val (verlaat die skip)"
 
-#: ../libpurple/protocols/msn/error.c:168
-#, c-format
 msgid "Error creating connection"
 msgstr "Kon nie verbinding daarstel nie"
 
-#: ../libpurple/protocols/msn/error.c:172
-#, 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:176
-#, c-format
 msgid "Unable to write"
 msgstr "Kan nie skryf nie"
 
-#: ../libpurple/protocols/msn/error.c:179
-#, c-format
 msgid "Session overload"
 msgstr "Sessie oorlaai"
 
-#: ../libpurple/protocols/msn/error.c:183
-#, c-format
 msgid "User is too active"
 msgstr "Gebruiker is te aktief"
 
-#: ../libpurple/protocols/msn/error.c:186
-#, c-format
 msgid "Too many sessions"
 msgstr "Te veel sessies"
 
-#: ../libpurple/protocols/msn/error.c:189
-#, c-format
 msgid "Passport not verified"
 msgstr "Paspoort nie geverifieer nie"
 
-#: ../libpurple/protocols/msn/error.c:192
-#, c-format
 msgid "Bad friend file"
 msgstr "Slegte vriendl?er"
 
-#: ../libpurple/protocols/msn/error.c:196
-#, c-format
 msgid "Not expected"
 msgstr "Nie verwag nie"
 
-#: ../libpurple/protocols/msn/error.c:201
 msgid "Friendly name is changing too rapidly"
 msgstr "Vriendelike naam verander te vinnig"
 
-#: ../libpurple/protocols/msn/error.c:210
-#, c-format
 msgid "Server too busy"
 msgstr "Bediener te besig"
 
-#: ../libpurple/protocols/msn/error.c:214
-#: ../libpurple/protocols/silc/silc.c:340
-#: ../libpurple/protocols/silc10/ops.c:1713 ../libpurple/proxy.c:1728
-#, c-format
 msgid "Authentication failed"
 msgstr "Stawing het misluk"
 
-#: ../libpurple/protocols/msn/error.c:217
-#, c-format
 msgid "Not allowed when offline"
 msgstr "Nie toegelaat wanneer vanlyn nie"
 
-#: ../libpurple/protocols/msn/error.c:225
-#, c-format
 msgid "Not accepting new users"
 msgstr "Aanvaar nie nuwe gebruikers nie"
 
-#: ../libpurple/protocols/msn/error.c:228
-#, c-format
 msgid "Kids Passport without parental consent"
 msgstr "Kinderpaspoort sonder ouertoestemming"
 
-#: ../libpurple/protocols/msn/error.c:231
-#, c-format
 msgid "Passport account not yet verified"
 msgstr "Paspoortrekening nog nie geverifieer nie"
 
-#: ../libpurple/protocols/msn/error.c:234
 msgid "Passport account suspended"
 msgstr "Paspoortrekening opgeskort"
 
-#: ../libpurple/protocols/msn/error.c:237
-#, c-format
 msgid "Bad ticket"
 msgstr "Slegte kaartjie"
 
-#: ../libpurple/protocols/msn/error.c:243
 #, c-format
 msgid "Unknown Error Code %d"
 msgstr "Onbekende fout, kode %d"
 
-#: ../libpurple/protocols/msn/error.c:258
 #, c-format
 msgid "MSN Error: %s\n"
 msgstr "MSN-fout: %s\n"
 
-#: ../libpurple/protocols/msn/group.h:36
 msgid "Other Contacts"
 msgstr "Ander kontakte"
 
-#: ../libpurple/protocols/msn/group.h:39
 msgid "Non-IM Contacts"
 msgstr ""
 
-#: ../libpurple/protocols/msn/msg.c:982
 #, c-format
 msgid "%s sent a wink. <a href='msn-wink://%s'>Click here to play it</a>"
 msgstr ""
 "%s het 'n knipoog gestuur. <a href='msn-wink://%s'>Klik hier om dit te "
 "speel</a>"
 
-#: ../libpurple/protocols/msn/msg.c:988
 #, c-format
 msgid "%s sent a wink, but it could not be saved"
 msgstr "%s het 'n knipoog gestuur, maar dit kon nie gestoor word nie"
 
-#: ../libpurple/protocols/msn/msg.c:1008
 #, c-format
 msgid "%s sent a voice clip. <a href='audio://%s'>Click here to play it</a>"
 msgstr ""
 "%s het 'n stemopname gestuur. <a href='audio://%s'>Klik hier om dit te "
 "speel</a>"
 
-#: ../libpurple/protocols/msn/msg.c:1014
 #, c-format
 msgid "%s sent a voice clip, but it could not be saved"
 msgstr "%s het 'n stemopname gestuur, maar dit kon nie gestoor word nie"
 
-#: ../libpurple/protocols/msn/msg.c:1151
 #, c-format
 msgid "%s sent you a voice chat invite, which is not yet supported."
 msgstr ""
 "%s het 'n stemgesels-uitnodiging gestuur, wat nog nie ondersteun word nie."
 
-#: ../libpurple/protocols/msn/msn.c:165
 msgid "Nudge"
 msgstr "Stootjie"
 
-#: ../libpurple/protocols/msn/msn.c:166
 #, c-format
 msgid "%s has nudged you!"
 msgstr "%s het u 'n stootjie gegee!"
 
-#: ../libpurple/protocols/msn/msn.c:166
 #, c-format
 msgid "Nudging %s..."
 msgstr "Gee tans %s 'n stootjie..."
 
-#: ../libpurple/protocols/msn/msn.c:179
-#: ../libpurple/protocols/myspace/myspace.c:3015
 msgid "Email Address..."
 msgstr "E-posadres..."
 
-#: ../libpurple/protocols/msn/msn.c:222
 msgid "Your new MSN friendly name is too long."
 msgstr "U nuwe MSN- vriendelike naam is te lank."
 
-#: ../libpurple/protocols/msn/msn.c:354
 #, c-format
 msgid "Set friendly name for %s."
 msgstr "Stel vriendelike naam vir %s."
 
-#: ../libpurple/protocols/msn/msn.c:356
 msgid "Set your friendly name."
 msgstr "Stel u vriendelike naam in."
 
-#: ../libpurple/protocols/msn/msn.c:357
 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:376
 msgid "Set your home phone number."
 msgstr "Stel u huisfoonnommer op."
 
-#: ../libpurple/protocols/msn/msn.c:393
 msgid "Set your work phone number."
 msgstr "Stel u werkfoonnommer op."
 
-#: ../libpurple/protocols/msn/msn.c:410
 msgid "Set your mobile phone number."
 msgstr "Stel u selfoonnommer op."
 
-#: ../libpurple/protocols/msn/msn.c:425
 msgid "Allow MSN Mobile pages?"
 msgstr "Laat MSN-selfoonbladsye toe?"
 
-#: ../libpurple/protocols/msn/msn.c:426
 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?"
@@ -7905,155 +5389,100 @@ msgstr ""
 "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:432
 msgid "Allow"
 msgstr "Toelaat"
 
-#: ../libpurple/protocols/msn/msn.c:433
 msgid "Disallow"
 msgstr "Weier"
 
-#: ../libpurple/protocols/msn/msn.c:448
 #, c-format
 msgid "Blocked Text for %s"
 msgstr "Geblokte teks vir %s"
 
-#: ../libpurple/protocols/msn/msn.c:450
 msgid "No text is blocked for this account."
 msgstr "Geen teks is geblok vir hierdie rekening nie."
 
-#: ../libpurple/protocols/msn/msn.c:453
 #, c-format
 msgid ""
 "MSN servers are currently blocking the following regular expressions:<br/>%s"
 msgstr "MSN-bedieners blok tans die volgende reguliere uitdrukkings:<br/>%s"
 
-#: ../libpurple/protocols/msn/msn.c:474
 msgid "This account does not have email enabled."
 msgstr "Hierdie rekening het nie e-pos geaktiveer nie."
 
-#: ../libpurple/protocols/msn/msn.c:518
 msgid "Send a mobile message."
 msgstr "Stuur 'n selfoonboodskap."
 
-#: ../libpurple/protocols/msn/msn.c:520
 msgid "Page"
 msgstr "Bladsy"
 
-#: ../libpurple/protocols/msn/msn.c:776
 msgid "Playing a game"
 msgstr "Speel 'n speletjie"
 
-#: ../libpurple/protocols/msn/msn.c:779
-#: ../libpurple/protocols/oscar/family_locate.c:442
 msgid "Working"
 msgstr "Werk"
 
-#: ../libpurple/protocols/msn/msn.c:853
 msgid "Has you"
 msgstr "Het u"
 
-#: ../libpurple/protocols/msn/msn.c:861
-#: ../libpurple/protocols/yahoo/libymsg.c:4017
-#: ../libpurple/protocols/yahoo/yahoo_aliases.c:548
 msgid "Home Phone Number"
 msgstr "Huisfoonnommer"
 
-#: ../libpurple/protocols/msn/msn.c:865
-#: ../libpurple/protocols/yahoo/libymsg.c:4018
-#: ../libpurple/protocols/yahoo/yahoo_aliases.c:549
 msgid "Work Phone Number"
 msgstr "Werkfoonnommer"
 
-#: ../libpurple/protocols/msn/msn.c:869
-#: ../libpurple/protocols/yahoo/libymsg.c:4019
-#: ../libpurple/protocols/yahoo/yahoo_aliases.c:550
 msgid "Mobile Phone Number"
 msgstr "Selfoonnommer"
 
-#: ../libpurple/protocols/msn/msn.c:892 ../libpurple/protocols/msn/state.c:38
-#: ../libpurple/protocols/yahoo/libymsg.c:3821
-#: ../libpurple/protocols/yahoo/libymsg.c:4843
 msgid "Be Right Back"
 msgstr "Binnekort terug"
 
-#: ../libpurple/protocols/msn/msn.c:898 ../libpurple/protocols/msn/state.c:36
-#: ../libpurple/protocols/novell/novell.c:2849
-#: ../libpurple/protocols/novell/novell.c:2981
-#: ../libpurple/protocols/oscar/family_locate.c:405
-#: ../libpurple/protocols/qq/qq.c:278 ../libpurple/protocols/qq/qq.c:427
-#: ../libpurple/protocols/silc/buddy.c:1493
-#: ../libpurple/protocols/silc/silc.c:58
-#: ../libpurple/protocols/silc10/buddy.c:1500
-#: ../libpurple/protocols/silc10/silc.c:48
-#: ../libpurple/protocols/yahoo/libymsg.c:3823
-#: ../libpurple/protocols/yahoo/libymsg.c:4846
-#: ../pidgin/plugins/themeedit-icon.c:66
 msgid "Busy"
 msgstr "Besig"
 
-#: ../libpurple/protocols/msn/msn.c:903
-#: ../libpurple/protocols/yahoo/libymsg.c:3831
-#: ../libpurple/protocols/yahoo/libymsg.c:4858
 msgid "On the Phone"
 msgstr "Op die foon"
 
-#: ../libpurple/protocols/msn/msn.c:908
-#: ../libpurple/protocols/yahoo/libymsg.c:3835
-#: ../libpurple/protocols/yahoo/libymsg.c:4864
 msgid "Out to Lunch"
 msgstr "Uit vir ete"
 
-#: ../libpurple/protocols/msn/msn.c:930
 msgid "Game Title"
 msgstr "Speletjienaam"
 
-#: ../libpurple/protocols/msn/msn.c:931
 msgid "Office Title"
 msgstr "Kantoortitel"
 
-#: ../libpurple/protocols/msn/msn.c:944
 msgid "Set Friendly Name..."
 msgstr "Stel vriendelike naam..."
 
-#: ../libpurple/protocols/msn/msn.c:949
 msgid "Set Home Phone Number..."
 msgstr "Stel huisfoonnommer..."
 
-#: ../libpurple/protocols/msn/msn.c:953
 msgid "Set Work Phone Number..."
 msgstr "Stel werkfoonnommer op..."
 
-#: ../libpurple/protocols/msn/msn.c:957
 msgid "Set Mobile Phone Number..."
 msgstr "Stel selfoonnommer..."
 
-#: ../libpurple/protocols/msn/msn.c:963
 msgid "Enable/Disable Mobile Devices..."
 msgstr "Aktiveer/deaktiveer mobiele toestelle..."
 
-#: ../libpurple/protocols/msn/msn.c:968
 msgid "Allow/Disallow Mobile Pages..."
 msgstr "Laat toe/weier selfoonbladsye..."
 
-#: ../libpurple/protocols/msn/msn.c:975
 msgid "View Blocked Text..."
 msgstr "Sien geblokte teks..."
 
-#: ../libpurple/protocols/msn/msn.c:981
 msgid "Open Hotmail Inbox"
 msgstr "Open Hotmail-inkassie"
 
-#: ../libpurple/protocols/msn/msn.c:1004
 msgid "Send to Mobile"
 msgstr "Stuur na selfoon"
 
-#: ../libpurple/protocols/msn/msn.c:1052
 msgid "SSL support is needed for MSN. Please install a supported SSL library."
 msgstr ""
 "SSL-steun is nodig vir MSN. Installeer gerus 'n gesteunde SSL-programmateek."
 
-#: ../libpurple/protocols/msn/msn.c:1470 ../libpurple/protocols/msn/msn.c:1562
 #, c-format
 msgid ""
 "Unable to add the buddy %s because the username is invalid.  Usernames must "
@@ -8062,245 +5491,157 @@ msgstr ""
 "Kon nie die vriend %s byvoeg nie omdat die gebruikernaam ongeldig is.  'n "
 "Gebruikernaam moet 'n geldige e-posadres wees."
 
-#: ../libpurple/protocols/msn/msn.c:1472 ../libpurple/protocols/msn/msn.c:1564
-#: ../libpurple/protocols/oscar/oscar.c:5135
-#: ../libpurple/protocols/oscar/oscar.c:5633
-#: ../libpurple/protocols/oscar/oscar.c:5648
 msgid "Unable to Add"
 msgstr "Kan nie byvoeg nie"
 
-#: ../libpurple/protocols/msn/msn.c:1583
-#: ../libpurple/protocols/oscar/oscar.c:2823
 msgid "Authorization Request Message:"
 msgstr "Magtigingversoek:"
 
-#: ../libpurple/protocols/msn/msn.c:1584
-#: ../libpurple/protocols/oscar/oscar.c:2824
 msgid "Please authorize me!"
 msgstr "Magtig my asseblief!"
 
 #. *
 #. * A wrapper for purple_request_action() that uses @c OK and @c Cancel buttons.
 #.
-#: ../libpurple/protocols/msn/msn.c:1585
-#: ../libpurple/protocols/oscar/oscar.c:2084
-#: ../libpurple/protocols/oscar/oscar.c:2825
-#: ../libpurple/protocols/oscar/oscar.c:2873
-#: ../libpurple/protocols/oscar/oscar.c:6484
-#: ../libpurple/protocols/oscar/oscar.c:6844 ../libpurple/request.h:1498
 msgid "_OK"
 msgstr "Regs_o"
 
-#: ../libpurple/protocols/msn/msn.c:2115 ../libpurple/protocols/msn/msn.c:2457
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:810
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1201
 msgid "Error retrieving profile"
 msgstr "Kon nie profiel haal nie"
 
-#: ../libpurple/protocols/msn/msn.c:2179 ../pidgin/plugins/convcolors.c:387
 msgid "General"
 msgstr "Algemeen"
 
-#: ../libpurple/protocols/msn/msn.c:2186
-#: ../libpurple/protocols/myspace/user.c:127
-#: ../libpurple/protocols/oscar/oscar.c:4280
-#: ../libpurple/protocols/qq/buddy_info.c:118
-#: ../libpurple/protocols/qq/qq.c:314
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1082
 msgid "Age"
 msgstr "Ouderdom"
 
-#: ../libpurple/protocols/msn/msn.c:2188
-#: ../libpurple/protocols/qq/buddy_info.c:127
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1097
 msgid "Occupation"
 msgstr "Beroep"
 
-#: ../libpurple/protocols/msn/msn.c:2189
-#: ../libpurple/protocols/myspace/user.c:135
-#: ../libpurple/protocols/novell/novell.c:1491
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1077
-#: ../libpurple/protocols/zephyr/zephyr.c:807
-#: ../libpurple/protocols/zephyr/zephyr.c:1188
 msgid "Location"
 msgstr "Ligging"
 
-#: ../libpurple/protocols/msn/msn.c:2194 ../libpurple/protocols/msn/msn.c:2386
-#: ../libpurple/protocols/msn/msn.c:2392 ../libpurple/protocols/msn/msn.c:2399
 msgid "Hobbies and Interests"
 msgstr "Stokperdjies en belangstellings"
 
-#: ../libpurple/protocols/msn/msn.c:2200 ../libpurple/protocols/msn/msn.c:2320
-#: ../libpurple/protocols/msn/msn.c:2326 ../libpurple/protocols/msn/msn.c:2333
-#: ../libpurple/protocols/msn/msn.c:2341 ../libpurple/protocols/msn/msn.c:2348
 msgid "A Little About Me"
 msgstr "Iets meer oor my"
 
-#: ../libpurple/protocols/msn/msn.c:2217
 msgid "Social"
 msgstr "Sosiaal"
 
-#: ../libpurple/protocols/msn/msn.c:2219
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1087
 msgid "Marital Status"
 msgstr "Huwelikstatus"
 
-#: ../libpurple/protocols/msn/msn.c:2220
 msgid "Interests"
 msgstr "Belangstellings"
 
-#: ../libpurple/protocols/msn/msn.c:2221
 msgid "Pets"
 msgstr "Troeteldiere"
 
-#: ../libpurple/protocols/msn/msn.c:2222
 msgid "Hometown"
 msgstr "Tuisdorp"
 
-#: ../libpurple/protocols/msn/msn.c:2223
 msgid "Places Lived"
 msgstr "Plekke gewoon"
 
-#: ../libpurple/protocols/msn/msn.c:2224
 msgid "Fashion"
 msgstr "Mode"
 
-#: ../libpurple/protocols/msn/msn.c:2225
 msgid "Humor"
 msgstr "Humor"
 
-#: ../libpurple/protocols/msn/msn.c:2226
 msgid "Music"
 msgstr "Musiek"
 
-#: ../libpurple/protocols/msn/msn.c:2227 ../libpurple/protocols/msn/msn.c:2408
-#: ../libpurple/protocols/msn/msn.c:2414
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1139
 msgid "Favorite Quote"
 msgstr "Gunsteling aanhaling"
 
-#: ../libpurple/protocols/msn/msn.c:2244
 msgid "Contact Info"
 msgstr "Kontakinligting"
 
-#: ../libpurple/protocols/msn/msn.c:2245
 msgid "Personal"
 msgstr "Persoonlik"
 
-#: ../libpurple/protocols/msn/msn.c:2248
 msgid "Significant Other"
 msgstr "Ega"
 
-#: ../libpurple/protocols/msn/msn.c:2249
 msgid "Home Phone"
 msgstr "Huisfoon"
 
-#: ../libpurple/protocols/msn/msn.c:2250
 msgid "Home Phone 2"
 msgstr "Huisfoon 2"
 
-#: ../libpurple/protocols/msn/msn.c:2251
-#: ../libpurple/protocols/oscar/oscar.c:4296
 msgid "Home Address"
 msgstr "Huisadres"
 
-#: ../libpurple/protocols/msn/msn.c:2252
 msgid "Personal Mobile"
 msgstr "Persoonlike sel"
 
-#: ../libpurple/protocols/msn/msn.c:2253
 msgid "Home Fax"
 msgstr "Huisfaks"
 
-#: ../libpurple/protocols/msn/msn.c:2254
 msgid "Personal Email"
 msgstr "Persoonlike e-pos"
 
-#: ../libpurple/protocols/msn/msn.c:2255
 msgid "Personal IM"
 msgstr "Persoonlike kitsboodskappe"
 
-#: ../libpurple/protocols/msn/msn.c:2257
 msgid "Anniversary"
 msgstr "Herdenking"
 
 #. Business
-#: ../libpurple/protocols/msn/msn.c:2273
 msgid "Work"
 msgstr "Werk"
 
-#: ../libpurple/protocols/msn/msn.c:2276
-#: ../libpurple/protocols/oscar/oscar.c:4314
 msgid "Company"
 msgstr "Maatskappy"
 
-#: ../libpurple/protocols/msn/msn.c:2277
-#: ../libpurple/protocols/novell/novell.c:1493
 msgid "Department"
 msgstr "Departement"
 
-#: ../libpurple/protocols/msn/msn.c:2278
 msgid "Profession"
 msgstr "Prefessie"
 
-#: ../libpurple/protocols/msn/msn.c:2279
 msgid "Work Phone"
 msgstr "Werkfoon"
 
-#: ../libpurple/protocols/msn/msn.c:2280
 msgid "Work Phone 2"
 msgstr "Werkfoon 2"
 
-#: ../libpurple/protocols/msn/msn.c:2281
-#: ../libpurple/protocols/oscar/oscar.c:4304
 msgid "Work Address"
 msgstr "Werkadres"
 
-#: ../libpurple/protocols/msn/msn.c:2282
 msgid "Work Mobile"
 msgstr "Werksel"
 
-#: ../libpurple/protocols/msn/msn.c:2283
 msgid "Work Pager"
 msgstr "Werkroeper"
 
-#: ../libpurple/protocols/msn/msn.c:2284
 msgid "Work Fax"
 msgstr "Werkfaks"
 
-#: ../libpurple/protocols/msn/msn.c:2285
 msgid "Work Email"
 msgstr "Werks-e-pos"
 
-#: ../libpurple/protocols/msn/msn.c:2286
 msgid "Work IM"
 msgstr "Werkkitsboodskappe"
 
-#: ../libpurple/protocols/msn/msn.c:2287
 msgid "Start Date"
 msgstr "Begindatum"
 
-#: ../libpurple/protocols/msn/msn.c:2357 ../libpurple/protocols/msn/msn.c:2363
-#: ../libpurple/protocols/msn/msn.c:2370 ../libpurple/protocols/msn/msn.c:2377
 msgid "Favorite Things"
 msgstr "Gunsteling-dinge"
 
-#: ../libpurple/protocols/msn/msn.c:2422
 msgid "Last Updated"
 msgstr "Laas bygewerk"
 
-#: ../libpurple/protocols/msn/msn.c:2433
-#: ../libpurple/protocols/qq/buddy_info.c:128
-#: ../libpurple/protocols/silc/ops.c:1029
-#: ../libpurple/protocols/silc10/ops.c:1060
 msgid "Homepage"
 msgstr "Tuisblad"
 
-#: ../libpurple/protocols/msn/msn.c:2459
 msgid "The user has not created a public profile."
 msgstr "Die gebruiker het nie 'n publieke profiel geskep nie."
 
-#: ../libpurple/protocols/msn/msn.c:2460
 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 "
@@ -8310,7 +5651,6 @@ msgstr ""
 "gebruiker nie bestaan nie, of dat die gebruiker wel bestaan maar nie 'n "
 "publieke profiel geskep het nie."
 
-#: ../libpurple/protocols/msn/msn.c:2464
 msgid ""
 "Could not find any information in the user's profile. The user most likely "
 "does not exist."
@@ -8318,11 +5658,6 @@ msgstr ""
 "Kon geen inligting in die gebruiker se profiel vind nie. Heel waarskynlik "
 "bestaan die gebruiker nie."
 
-#: ../libpurple/protocols/msn/msn.c:2472
-#: ../libpurple/protocols/myspace/user.c:194
-#: ../libpurple/protocols/myspace/user.c:197
-#: ../libpurple/protocols/oscar/oscar.c:3592
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1239
 msgid "View web profile"
 msgstr "Bekyk webprofiel"
 
@@ -8335,68 +5670,48 @@ msgstr "Bekyk webprofiel"
 #. *< name
 #. *< version
 #. *< summary
-#: ../libpurple/protocols/msn/msn.c:2764 ../libpurple/protocols/msn/msn.c:2765
 msgid "Windows Live Messenger Protocol Plugin"
 msgstr "Inprop vir Windows Live-boodskapperprotokol"
 
-#: ../libpurple/protocols/msn/msn.c:2799
 msgid "Use HTTP Method"
 msgstr "Gebruik HTTP-metode"
 
-#: ../libpurple/protocols/msn/msn.c:2804
 msgid "HTTP Method Server"
 msgstr "HTTP-metodebediener"
 
-#: ../libpurple/protocols/msn/msn.c:2809
 msgid "Show custom smileys"
 msgstr "Wys pasgemaakte gesiggies"
 
-#: ../libpurple/protocols/msn/msn.c:2817
 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:352
 msgid "Windows Live ID authentication:Unable to connect"
 msgstr "Windows Live-ID-stawing: Kan nie koppel nie"
 
-#: ../libpurple/protocols/msn/nexus.c:359
 msgid "Windows Live ID authentication:Invalid response"
 msgstr "Windows Live-ID-stawing: Ongeldige antwoord"
 
-#: ../libpurple/protocols/msn/notification.c:795
 msgid "The following users are missing from your addressbook"
 msgstr "Die volgende gebruikers is nie in die adresboek nie"
 
-#: ../libpurple/protocols/msn/notification.c:803
-#: ../libpurple/protocols/msn/notification.c:850
 #, c-format
 msgid "Unknown error (%d): %s"
 msgstr "Onbekende fout (%d): %s"
 
-#: ../libpurple/protocols/msn/notification.c:807
-#: ../libpurple/protocols/msn/notification.c:831
-#: ../libpurple/protocols/sametime/sametime.c:4504
 msgid "Unable to add user"
 msgstr "Kan nie gebruiker byvoeg nie"
 
 #. Unknown error!
-#: ../libpurple/protocols/msn/notification.c:830
-#: ../libpurple/protocols/msn/notification.c:876
-#: ../libpurple/protocols/yahoo/libymsg.c:2003
 #, c-format
 msgid "Unknown error (%d)"
 msgstr "Onbekende fout (%d)"
 
-#: ../libpurple/protocols/msn/notification.c:854
-#: ../libpurple/protocols/msn/notification.c:877
 msgid "Unable to remove user"
 msgstr "Kan nie gebruiker verwyder nie"
 
-#: ../libpurple/protocols/msn/notification.c:1157
 msgid "Mobile message was not sent because it was too long."
 msgstr "Mobiele boodskap is nie gestuur nie omdat dit te lank was."
 
-#: ../libpurple/protocols/msn/notification.c:1917
 #, c-format
 msgid ""
 "The MSN server will shut down for maintenance in %d minute. You will "
@@ -8423,7 +5738,6 @@ msgstr[1] ""
 "\n"
 "Nadat die onderhoud afgehandel is, sal u suksesvol kan aanmeld."
 
-#: ../libpurple/protocols/msn/oim.c:406
 msgid ""
 "Message was not sent because the system is unavailable. This normally "
 "happens when the user is blocked or does not exist."
@@ -8431,29 +5745,22 @@ msgstr ""
 "Boodskap is nie gestuur nie want die stelsel is nie beskikbaar nie. Dit "
 "gebeur gewoonlik wanneer die gebruiker geblok is of nie bestaan nie."
 
-#: ../libpurple/protocols/msn/oim.c:411
 msgid "Message was not sent because messages are being sent too quickly."
 msgstr "Boodskap is nie gestuur nie omdat daar te vinnig gestuur word."
 
-#: ../libpurple/protocols/msn/oim.c:415
 msgid "Message was not sent because an unknown encoding error occurred."
 msgstr ""
-"Boodskap is nie gestuur nie omdat 'n onbekende enkoderingsfout voorgekom "
-"het."
+"Boodskap is nie gestuur nie omdat 'n onbekende enkoderingsfout voorgekom het."
 
-#: ../libpurple/protocols/msn/oim.c:419
 msgid "Message was not sent because an unknown error occurred."
 msgstr "Boodskap is nie gestuur nie omdat 'n onbekende fout voorgekom het."
 
-#: ../libpurple/protocols/msn/servconn.c:143
 msgid "Writing error"
 msgstr "Skryffout"
 
-#: ../libpurple/protocols/msn/servconn.c:145
 msgid "Reading error"
 msgstr "Leesfout"
 
-#: ../libpurple/protocols/msn/servconn.c:167
 #, c-format
 msgid ""
 "Connection error from %s server:\n"
@@ -8462,112 +5769,84 @@ msgstr ""
 "Verbindingfout vanaf %s bediener:\n"
 "%s"
 
-#: ../libpurple/protocols/msn/session.c:336
 msgid "Our protocol is not supported by the server"
 msgstr "Ons protokol word nie deur die bediener ondersteun nie"
 
-#: ../libpurple/protocols/msn/session.c:341
 msgid "Error parsing HTTP"
 msgstr "Kon nie HTTP ontleed nie"
 
-#: ../libpurple/protocols/msn/session.c:345
-#: ../libpurple/protocols/novell/novell.c:2032
-#: ../libpurple/protocols/oscar/flap_connection.c:463
-#: ../libpurple/protocols/yahoo/libymsg.c:163
 msgid "You have signed on from another location"
 msgstr "U het van 'n ander plek aangemeld"
 
-#: ../libpurple/protocols/msn/session.c:351
 msgid "The MSN servers are temporarily unavailable. Please wait and try again."
 msgstr ""
 "Die MSN-bedieners is tydelik nie beskikbaar nie. Wag gerus en probeer weer."
 
-#: ../libpurple/protocols/msn/session.c:357
 msgid "The MSN servers are going down temporarily"
 msgstr "Die MSN-bedieners gaan tydelik afskakel"
 
-#: ../libpurple/protocols/msn/session.c:362
 #, c-format
 msgid "Unable to authenticate: %s"
 msgstr "Kon nie magtig nie: %s"
 
-#: ../libpurple/protocols/msn/session.c:368
 msgid ""
 "Your MSN buddy list is temporarily unavailable. Please wait and try again."
 msgstr ""
 "U MSN-vriendelys is tydelik nie beskikbaar nie. Wag gerus en probeer weer."
 
-#: ../libpurple/protocols/msn/session.c:390
-#: ../libpurple/protocols/msn/session.c:392
 msgid "Handshaking"
 msgstr "Bladskud"
 
-#: ../libpurple/protocols/msn/session.c:391
 msgid "Transferring"
 msgstr "Dra tans oor"
 
-#: ../libpurple/protocols/msn/session.c:393
 msgid "Starting authentication"
 msgstr "Begin stawing"
 
-#: ../libpurple/protocols/msn/session.c:394
 msgid "Getting cookie"
 msgstr "Kry tans koekie"
 
-#: ../libpurple/protocols/msn/session.c:396
 msgid "Sending cookie"
 msgstr "Stuur tans koekie"
 
-#: ../libpurple/protocols/msn/session.c:397
 msgid "Retrieving buddy list"
 msgstr "Kry tans vriendelys"
 
-#: ../libpurple/protocols/msn/slp.c:449
 #, c-format
 msgid "%s requests to view your webcam, but this request is not yet supported."
 msgstr "%s vra om u webkamera te sien, wat nog nie ondersteun word nie."
 
-#: ../libpurple/protocols/msn/slp.c:472
 #, c-format
 msgid "%s invited you to view his/her webcam, but this is not yet supported."
 msgstr ""
 "%s het u uitgenooi om na sy/haar webkamera te kyk, maar dit word nog nie "
 "ondersteun nie."
 
-#: ../libpurple/protocols/msn/state.c:39
 msgid "Away From Computer"
 msgstr "Weg van rekenaar"
 
-#: ../libpurple/protocols/msn/state.c:40
 msgid "On The Phone"
 msgstr "Op die foon"
 
-#: ../libpurple/protocols/msn/state.c:41
 msgid "Out To Lunch"
 msgstr "Weg vir middagete"
 
-#: ../libpurple/protocols/msn/switchboard.c:433
 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:469
 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:473
 msgid "Message could not be sent because the user is offline:"
 msgstr "Boodskap kon nie gestuur word nie omdat die gebruiker vanlyn is:"
 
-#: ../libpurple/protocols/msn/switchboard.c:477
 msgid "Message could not be sent because a connection error occurred:"
 msgstr ""
 "Boodskap kon nie gestuur word nie omdat 'n verbindingfout voorgekom het:"
 
-#: ../libpurple/protocols/msn/switchboard.c:481
 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:485
 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:"
@@ -8576,82 +5855,40 @@ msgstr ""
 "kon bewerkstellig nie. Dis waarskynlik 'n bedienerprobleem; probeer weer na "
 "'n paar minute:"
 
-#: ../libpurple/protocols/msn/switchboard.c:492
 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 voorgekom "
 "het:"
 
-#: ../libpurple/protocols/msn/switchboard.c:500
 msgid "Message may have not been sent because an unknown error occurred:"
-msgstr "Boodskap is dalk nie gestuur nie omdat 'n onbekende fout voorgekom het:"
+msgstr ""
+"Boodskap is dalk nie gestuur nie omdat 'n onbekende fout voorgekom het:"
 
-#: ../libpurple/protocols/msn/userlist.c:484
 msgid "Delete Buddy from Address Book?"
 msgstr "Skrap vriend uit adresboek?"
 
-#: ../libpurple/protocols/msn/userlist.c:485
 msgid "Do you want to delete this buddy from your address book as well?"
 msgstr "Wil u hierdie vriend ook uit die adresboek skrap?"
 
-#: ../libpurple/protocols/msn/userlist.c:541
 msgid "The username specified is invalid."
 msgstr "Die gespesifiseerde gebruikernaam is ongeldig."
 
-#. 5
-#: ../libpurple/protocols/mxit/actions.c:45
-#: ../libpurple/protocols/mxit/roster.c:148
-#: ../libpurple/protocols/silc/buddy.c:1518
-#: ../libpurple/protocols/silc/util.c:535
-#: ../libpurple/protocols/silc10/buddy.c:1525
-#: ../libpurple/protocols/silc10/util.c:527
-msgid "In Love"
-msgstr "Verlief"
-
-#. show current mood
-#: ../libpurple/protocols/mxit/actions.c:102
-msgid "Current Mood"
-msgstr "Huidige gemoedstoestand"
-
-#. add all moods to list
-#: ../libpurple/protocols/mxit/actions.c:107
-msgid "New Mood"
-msgstr "Nuwe gemoedstoestand"
-
-#: ../libpurple/protocols/mxit/actions.c:116
-msgid "Change your Mood"
-msgstr "Verander u gemoedstoestand"
-
-#: ../libpurple/protocols/mxit/actions.c:116
-msgid "How do you feel right now?"
-msgstr "Hoe voel u reg nou?"
-
-#: ../libpurple/protocols/mxit/actions.c:149
-#: ../libpurple/protocols/mxit/login.c:260
 msgid "The PIN you entered is invalid."
 msgstr "Die PIN wat gegee is, is ongeldig."
 
-#: ../libpurple/protocols/mxit/actions.c:154
 msgid "The PIN you entered has an invalid length [4-10]."
 msgstr "Die PIN wat gegee is, het 'n ongeldige lengte [4-10]."
 
-#: ../libpurple/protocols/mxit/actions.c:159
-#: ../libpurple/protocols/mxit/login.c:270
 msgid "The PIN is invalid. It should only consist of digits [0-9]."
 msgstr "Die PIN is ongeldig. Dit moet slegs syfers [0-9] bevat."
 
-#: ../libpurple/protocols/mxit/actions.c:165
-#: ../libpurple/protocols/mxit/login.c:276
 msgid "The two PINs you entered do not match."
 msgstr "Die twee PIN-kodes wat gegee is stem nie ooreen nie."
 
-#: ../libpurple/protocols/mxit/actions.c:172
 msgid "The name you entered is invalid."
 msgstr "Die naam wat gegee is, is ongeldig."
 
-#: ../libpurple/protocols/mxit/actions.c:179
-#: ../libpurple/protocols/mxit/login.c:249
 msgid ""
 "The birthday you entered is invalid. The correct format is: 'YYYY-MM-DD'."
 msgstr ""
@@ -8659,270 +5896,199 @@ msgstr ""
 "DD'."
 
 #. show error to user
-#: ../libpurple/protocols/mxit/actions.c:278
 msgid "Profile Update Error"
 msgstr "Fout moet bywerking van profiel"
 
 #. no profile information yet, so we cannot update
 #. (reference: "libpurple/request.h")
-#: ../libpurple/protocols/mxit/actions.c:303
-#: ../libpurple/protocols/mxit/actions.c:358
-#: ../libpurple/protocols/oscar/oscar.c:3583
 msgid "Profile"
 msgstr "Profiel"
 
-#: ../libpurple/protocols/mxit/actions.c:303
 msgid "Your profile information is not yet retrieved. Please try again later."
 msgstr "U profielinligting is nog nie bekom nie. Probeer gerus later weer."
 
 #. pin
-#: ../libpurple/protocols/mxit/actions.c:312
-#: ../libpurple/protocols/mxit/login.c:352
 msgid "PIN"
 msgstr "PIN"
 
-#: ../libpurple/protocols/mxit/actions.c:315
-#: ../libpurple/protocols/mxit/login.c:355
 msgid "Verify PIN"
 msgstr "Verifieer PIN"
 
 #. display name
-#: ../libpurple/protocols/mxit/actions.c:320
 msgid "Display Name"
 msgstr "Vertoonnaam"
 
 #. hidden
-#: ../libpurple/protocols/mxit/actions.c:334
 msgid "Hide my number"
 msgstr "Versteek my nommer"
 
 #. mobile number
-#: ../libpurple/protocols/mxit/actions.c:354
 msgid "Mobile Number"
 msgstr "Selfoonnommer"
 
-#: ../libpurple/protocols/mxit/actions.c:358
 msgid "Update your Profile"
 msgstr "Dateer u profiel op"
 
-#: ../libpurple/protocols/mxit/actions.c:358
 msgid "Here you can update your MXit profile"
 msgstr "Hier kan u MXit-profiel bygewerk word"
 
-#: ../libpurple/protocols/mxit/actions.c:376
 msgid "View Splash"
 msgstr "Bekyk spatskerm"
 
-#: ../libpurple/protocols/mxit/actions.c:376
 msgid "There is no splash-screen currently available"
 msgstr "Daar is tans geen spatskerm beskikbaar nie"
 
-#: ../libpurple/protocols/mxit/actions.c:396
 msgid "About"
 msgstr "Aangaande"
 
-#. display / change mood
-#: ../libpurple/protocols/mxit/actions.c:413
-msgid "Change Mood..."
-msgstr "Verander gemoedstoestand..."
-
 #. display / change profile
-#: ../libpurple/protocols/mxit/actions.c:417
 msgid "Change Profile..."
 msgstr "Verander profiel..."
 
 #. display splash-screen
-#: ../libpurple/protocols/mxit/actions.c:421
 msgid "View Splash..."
 msgstr "Bekyk spatskerm..."
 
 #. display plugin version
-#: ../libpurple/protocols/mxit/actions.c:425
 msgid "About..."
 msgstr "Aangaande..."
 
 #. the file is too big
-#: ../libpurple/protocols/mxit/filexfer.c:129
 msgid "The file you are trying to send is too large!"
 msgstr "Die l?er wat u probeer stuur is te groot!"
 
-#: ../libpurple/protocols/mxit/http.c:276
 msgid ""
 "Unable to connect to the MXit HTTP server. Please check your server settings."
 msgstr ""
 "Kan nie koppel aan die MXit-HTTP-bediener nie. Kontroleer die "
 "bedieneropstelling."
 
-#: ../libpurple/protocols/mxit/login.c:106
 msgid "Logging In..."
 msgstr "Meld tans aan..."
 
-#: ../libpurple/protocols/mxit/login.c:167
-#: ../libpurple/protocols/mxit/login.c:204
 msgid ""
 "Unable to connect to the MXit server. Please check your server settings."
 msgstr ""
 "Kan nie koppel aan die MXit-bediener nie. Kontroleer die bedieneropstelling."
 
-#: ../libpurple/protocols/mxit/login.c:192
 msgid "Connecting..."
 msgstr "Koppel tans..."
 
-#: ../libpurple/protocols/mxit/login.c:241
 msgid "The nick name you entered is invalid."
 msgstr "Die bynaam wat gegee is, is ongeldig."
 
-#: ../libpurple/protocols/mxit/login.c:265
 msgid "The PIN you entered has an invalid length [7-10]."
 msgstr "Die PIN wat gegee is, het 'n ongeldige lengte [7-10]."
 
 #. mxit login name
-#: ../libpurple/protocols/mxit/login.c:332
 msgid "MXit Login Name"
 msgstr "MXit-aanmeldnaam"
 
 #. nick name
-#: ../libpurple/protocols/mxit/login.c:337
-#: ../libpurple/protocols/mxit/profile.c:123
 msgid "Nick Name"
 msgstr "Bynaam"
 
 #. show the form to the user to complete
-#: ../libpurple/protocols/mxit/login.c:360
 msgid "Register New MXit Account"
 msgstr "Registreer 'n nuwe MXit-rekening"
 
-#: ../libpurple/protocols/mxit/login.c:360
 msgid "Please fill in the following fields:"
 msgstr "Vul gerus die volgende velde in:"
 
 #. no reply from the WAP site
-#: ../libpurple/protocols/mxit/login.c:389
-#: ../libpurple/protocols/mxit/login.c:609
 msgid "Error contacting the MXit WAP site. Please try again later."
 msgstr "Fout met kontak met MXit-WAP-werf. Probeer gerus later weer."
 
 #. wapserver error
 #. server could not find the user
-#: ../libpurple/protocols/mxit/login.c:398
-#: ../libpurple/protocols/mxit/login.c:618
 msgid ""
 "MXit is currently unable to process the request. Please try again later."
 msgstr "MXit kan tans nie die versoek verwerk nie. Probeer gerus later weer."
 
-#: ../libpurple/protocols/mxit/login.c:408
 msgid "Wrong security code entered. Please try again later."
 msgstr "Verkeerde sekuriteitskode is ingetik. Probeer gerus later weer."
 
-#: ../libpurple/protocols/mxit/login.c:411
 msgid "Your session has expired. Please try again later."
 msgstr "U sessie het verval. Probeer gerus later weer."
 
-#: ../libpurple/protocols/mxit/login.c:414
 msgid "Invalid country selected. Please try again."
 msgstr "Ongeldige land is gekies. Probeer gerus weer."
 
-#: ../libpurple/protocols/mxit/login.c:417
 msgid "Username is not registered. Please register first."
 msgstr "Gebruikernaam is nie geregistreer nie. Registreer asb. eers."
 
-#: ../libpurple/protocols/mxit/login.c:420
 msgid "Username is already registered. Please choose another username."
 msgstr "Gebruikernaam is reeds geregistreer. Kies asb. 'n ander gebruikernaam."
 
-#: ../libpurple/protocols/mxit/login.c:427
 msgid "Internal error. Please try again later."
 msgstr "Interne fout. Probeer gerus later weer."
 
-#: ../libpurple/protocols/mxit/login.c:518
 msgid "You did not enter the security code"
 msgstr "U het nie die sekuriteitskode ingetik nie"
 
-#: ../libpurple/protocols/mxit/login.c:636
 msgid "Security Code"
 msgstr "Sekuriteitskode"
 
 #. ask for input
-#: ../libpurple/protocols/mxit/login.c:640
 msgid "Enter Security Code"
 msgstr "Gee die sekuriteitskode"
 
-#: ../libpurple/protocols/mxit/login.c:645
 msgid "Your Country"
 msgstr "U land"
 
-#: ../libpurple/protocols/mxit/login.c:666
 msgid "Your Language"
 msgstr "U taal"
 
 #. display the form to the user and wait for his/her input
-#: ../libpurple/protocols/mxit/login.c:683
 msgid "MXit Authorization"
 msgstr ""
 
-#: ../libpurple/protocols/mxit/login.c:683
 msgid "MXit account validation"
 msgstr "MXit-rekeningvalidering"
 
-#: ../libpurple/protocols/mxit/login.c:705
 msgid "Retrieving User Information..."
 msgstr "Verkry tans gebruikerinligting..."
 
-#: ../libpurple/protocols/mxit/mxit.c:209
 msgid "Loading menu..."
 msgstr "Laai tans kieslys..."
 
-#: ../libpurple/protocols/mxit/mxit.c:342
-#: ../libpurple/protocols/mxit/profile.c:150
 msgid "Status Message"
 msgstr "Statusboodskap"
 
-#: ../libpurple/protocols/mxit/mxit.c:354
-#: ../libpurple/protocols/mxit/profile.c:126
 msgid "Hidden Number"
 msgstr "Versteekte nommer"
 
-#: ../libpurple/protocols/mxit/mxit.c:554
 msgid "Your Mobile Number..."
 msgstr "U selfoonnommer..."
 
 #. Configuration options
 #. WAP server (reference: "libpurple/accountopt.h")
-#: ../libpurple/protocols/mxit/mxit.c:694
 msgid "WAP Server"
 msgstr "WAP-bediener"
 
-#: ../libpurple/protocols/mxit/mxit.c:697
 msgid "Connect via HTTP"
 msgstr "Koppel via HTTP"
 
-#: ../libpurple/protocols/mxit/mxit.c:700
 msgid "Enable splash-screen popup"
 msgstr "Aktiveer opsspring vir spatskerm"
 
 #. we must have lost the connection, so terminate it so that we can reconnect
-#: ../libpurple/protocols/mxit/protocol.c:398
 msgid "We have lost the connection to MXit. Please reconnect."
 msgstr "Verbinding met MXit is verloor. Herkoppel asseblief."
 
 #. packet could not be queued for transmission
-#: ../libpurple/protocols/mxit/protocol.c:498
 msgid "Message Send Error"
 msgstr "Fout met stuur van boodskap"
 
-#: ../libpurple/protocols/mxit/protocol.c:498
 msgid "Unable to process your request at this time"
 msgstr "Kan nie u versoek nou verwerk nie"
 
-#: ../libpurple/protocols/mxit/protocol.c:524
 msgid "Timeout while waiting for a response from the MXit server."
 msgstr "Uittelling terwyl gewag word vir 'n antwoord van die MXit-bediener."
 
-#: ../libpurple/protocols/mxit/protocol.c:1266
 msgid "Successfully Logged In..."
 msgstr "Suksesvol aangemeld..."
 
-#: ../libpurple/protocols/mxit/protocol.c:1353
 #, c-format
 msgid ""
 "%s sent you an encrypted message, but it is not supported on this client."
@@ -8930,210 +6096,159 @@ msgstr ""
 "%s het 'n ge?nkripteerde boodskap gestuur, maar dit word nie ondersteun deur "
 "hierdie kli?nt nie."
 
-#: ../libpurple/protocols/mxit/protocol.c:1354
-#: ../libpurple/protocols/mxit/protocol.c:1977
 msgid "Message Error"
 msgstr "Boodskapfout"
 
-#: ../libpurple/protocols/mxit/protocol.c:1791
 msgid "Cannot perform redirect using the specified protocol"
 msgstr "Kan nie herverwysing doen met die gespesifiseerde protokol nie"
 
-#: ../libpurple/protocols/mxit/protocol.c:1946
 msgid "An internal MXit server error occurred."
 msgstr "'n Interne MXit-bedienerfout het voorgekom."
 
-#: ../libpurple/protocols/mxit/protocol.c:1965
 #, c-format
 msgid "Login error: %s (%i)"
 msgstr "Aanmeldfout: %s (%i)"
 
-#: ../libpurple/protocols/mxit/protocol.c:1970
 #, c-format
 msgid "Logout error: %s (%i)"
 msgstr "Afmeldfout: %s (%i)"
 
-#: ../libpurple/protocols/mxit/protocol.c:1974
 msgid "Contact Error"
 msgstr ""
 
-#: ../libpurple/protocols/mxit/protocol.c:1980
 msgid "Message Sending Error"
 msgstr "Fout met stuur van boodskap"
 
-#: ../libpurple/protocols/mxit/protocol.c:1983
 msgid "Status Error"
 msgstr "Statusfout"
 
-#: ../libpurple/protocols/mxit/protocol.c:1986
 msgid "Mood Error"
 msgstr "Gemoedstoestandfout"
 
-#: ../libpurple/protocols/mxit/protocol.c:1997
 msgid "Invitation Error"
 msgstr "Uitnodigingsfout"
 
-#: ../libpurple/protocols/mxit/protocol.c:2000
 msgid "Contact Removal Error"
 msgstr "Fout met skrap van kontak"
 
-#: ../libpurple/protocols/mxit/protocol.c:2004
 msgid "Subscription Error"
 msgstr ""
 
-#: ../libpurple/protocols/mxit/protocol.c:2007
 msgid "Contact Update Error"
 msgstr "Fout met bywerk van kontak"
 
-#: ../libpurple/protocols/mxit/protocol.c:2010
 msgid "File Transfer Error"
 msgstr "L?eroordragfout"
 
-#: ../libpurple/protocols/mxit/protocol.c:2013
 msgid "Cannot create MultiMx room"
 msgstr "Kan nie MultiMx-kamer skep nie"
 
-#: ../libpurple/protocols/mxit/protocol.c:2016
 msgid "MultiMx Invitation Error"
 msgstr "MultiMx-uitnodigingsfout"
 
-#: ../libpurple/protocols/mxit/protocol.c:2020
 msgid "Profile Error"
 msgstr "Profielfout"
 
 #. bad packet
-#: ../libpurple/protocols/mxit/protocol.c:2233
 msgid "Invalid packet received from MXit."
 msgstr "Ongeldige pakkie ontvang vanaf MXit."
 
 #. connection error
-#: ../libpurple/protocols/mxit/protocol.c:2298
 msgid "A connection error occurred to MXit. (read stage 0x01)"
 msgstr "'n Fout het voorgekom tydens koppeling aan MXit. (leesstadium 0x01)"
 
 #. connection closed
-#: ../libpurple/protocols/mxit/protocol.c:2303
 msgid "A connection error occurred to MXit. (read stage 0x02)"
 msgstr "'n Fout het voorgekom tydens koppeling aan MXit. (leesstadium 0x02)"
 
-#: ../libpurple/protocols/mxit/protocol.c:2313
 msgid "A connection error occurred to MXit. (read stage 0x03)"
 msgstr "'n Fout het voorgekom tydens koppeling aan MXit. (leesstadium 0x03)"
 
 #. malformed packet length record (too long)
-#: ../libpurple/protocols/mxit/protocol.c:2324
 msgid "A connection error occurred to MXit. (read stage 0x04)"
 msgstr "'n Fout het voorgekom tydens koppeling aan MXit. (leesstadium 0x04)"
 
 #. connection error
-#: ../libpurple/protocols/mxit/protocol.c:2335
 msgid "A connection error occurred to MXit. (read stage 0x05)"
 msgstr "'n Fout het voorgekom tydens koppeling aan MXit. (leesstadium 0x05)"
 
 #. connection closed
-#: ../libpurple/protocols/mxit/protocol.c:2340
 msgid "A connection error occurred to MXit. (read stage 0x06)"
 msgstr "'n Fout het voorgekom tydens koppeling aan MXit. (leesstadium 0x06)"
 
-#: ../libpurple/protocols/mxit/roster.c:182
+msgid "In Love"
+msgstr "Verlief"
+
 msgid "Pending"
 msgstr "Hangend"
 
-#: ../libpurple/protocols/mxit/roster.c:184
 msgid "Invited"
 msgstr "Uitgenooi"
 
-#: ../libpurple/protocols/mxit/roster.c:186
 msgid "Rejected"
 msgstr "Geweier"
 
-#: ../libpurple/protocols/mxit/roster.c:188
 msgid "Deleted"
 msgstr "Geskrap"
 
-#: ../libpurple/protocols/mxit/splashscreen.c:206
-#: ../libpurple/protocols/mxit/splashscreen.c:210
 msgid "MXit Advertising"
 msgstr "MXit-advertensie"
 
-#: ../libpurple/protocols/mxit/splashscreen.c:207
 msgid "More Information"
 msgstr "Meer inligting"
 
-#: ../libpurple/protocols/myspace/myspace.c:136
 #, c-format
 msgid "No such user: %s"
 msgstr "Geen so 'n gebruiker nie: %s"
 
-#: ../libpurple/protocols/myspace/myspace.c:138
 msgid "User lookup"
 msgstr "Gebruikeropsoek"
 
-#: ../libpurple/protocols/myspace/myspace.c:698
 msgid "Reading challenge"
 msgstr "Leesuitdaging"
 
-#: ../libpurple/protocols/myspace/myspace.c:708
 msgid "Unexpected challenge length from server"
 msgstr "Onverwagte uitdaginglengte van bediener"
 
-#: ../libpurple/protocols/myspace/myspace.c:712
-#: ../libpurple/protocols/qq/qq_process.c:1011
 msgid "Logging in"
 msgstr "Aanmelding"
 
-#: ../libpurple/protocols/myspace/myspace.c:808
 msgid "MySpaceIM - No Username Set"
 msgstr "MySpaceIM - Geen gebruikernaam opgestel nie"
 
-#: ../libpurple/protocols/myspace/myspace.c:809
 msgid "You appear to have no MySpace username."
 msgstr "Dit lyk nie of u 'n MySpace-gebruikernaam het nie."
 
-#: ../libpurple/protocols/myspace/myspace.c:810
 msgid "Would you like to set one now? (Note: THIS CANNOT BE CHANGED!)"
 msgstr "Wil u nou een opstel? (Let wel: DIT KAN NIE VERANDER WORD NIE)"
 
-#: ../libpurple/protocols/myspace/myspace.c:845
-#: ../libpurple/protocols/qq/qq_base.c:484
-#: ../libpurple/protocols/qq/qq_base.c:533
-#: ../libpurple/protocols/qq/qq_base.c:577
-#: ../libpurple/protocols/qq/qq_network.c:670
 msgid "Lost connection with server"
 msgstr "Verbinding met bediener verloor"
 
 #. Can't write _()'d strings in array initializers. Workaround.
 #. khc: then use N_() in the array initializer and use _() when they are
 #. used
-#: ../libpurple/protocols/myspace/myspace.c:887
 msgid "New mail messages"
 msgstr "Nuwe posboodskappe"
 
-#: ../libpurple/protocols/myspace/myspace.c:888
 msgid "New blog comments"
 msgstr "Nuwe blogkommentaar"
 
-#: ../libpurple/protocols/myspace/myspace.c:889
 msgid "New profile comments"
 msgstr "Nuwe profielkommentaar"
 
-#: ../libpurple/protocols/myspace/myspace.c:890
 msgid "New friend requests!"
 msgstr "Nuwe vriendversoeke!"
 
-#: ../libpurple/protocols/myspace/myspace.c:891
 msgid "New picture comments"
 msgstr "Nuwe prentkommentare"
 
-#: ../libpurple/protocols/myspace/myspace.c:917
 msgid "MySpace"
 msgstr "MySpace"
 
-#: ../libpurple/protocols/myspace/myspace.c:1019
 msgid "IM Friends"
 msgstr "Kitsboodskap-vriende"
 
-#: ../libpurple/protocols/myspace/myspace.c:1151
 #, c-format
 msgid ""
 "%d buddy was added or updated from the server (including buddies already on "
@@ -9148,76 +6263,56 @@ msgstr[1] ""
 "%d vriende is bygevoeg of bygewerk van die bediener (waaronder vriende wat "
 "reeds op die bedienerlys is)"
 
-#: ../libpurple/protocols/myspace/myspace.c:1155
 msgid "Add contacts from server"
 msgstr "Voeg kontakte van bediener by"
 
-#: ../libpurple/protocols/myspace/myspace.c:1835
 #, c-format
 msgid "Protocol error, code %d: %s"
 msgstr "Protokolfout, kode %d: %s"
 
-#: ../libpurple/protocols/myspace/myspace.c:1857
 #, c-format
 msgid ""
 "%s Your password is %zu characters, which is longer than the maximum length "
 "of %d.  Please shorten your password at http://profileedit.myspace.com/index."
 "cfm?fuseaction=accountSettings.changePassword and try again."
 msgstr ""
-"%s U wagwoord is %zu karakters; meer as die verwagte maksimum lengte van %d. "
-" Maak u wagwoord korter by http://profileedit.myspace.com/index.cfm?fuseact"
-"ion=accountSettings.changePassword en probeer weer."
+"%s U wagwoord is %zu karakters; meer as die verwagte maksimum lengte van %"
+"d.  Maak u wagwoord korter by http://profileedit.myspace.com/index.cfm?"
+"fuseaction=accountSettings.changePassword en probeer weer."
 
-#: ../libpurple/protocols/myspace/myspace.c:1870
-#: ../libpurple/protocols/novell/nmuser.c:1921
 msgid "Incorrect username or password"
 msgstr "Verkeerde gebruikernaam of wagwoord"
 
-#: ../libpurple/protocols/myspace/myspace.c:1882
 msgid "MySpaceIM Error"
 msgstr "MySpaceIM-fout"
 
-#: ../libpurple/protocols/myspace/myspace.c:2045
 msgid "Invalid input condition"
 msgstr "Ongeldige toevoertoestand"
 
-#: ../libpurple/protocols/myspace/myspace.c:2670
-#: ../libpurple/protocols/myspace/myspace.c:2704
 msgid "Failed to add buddy"
 msgstr "Byvoeg van vriend het misluk"
 
-#: ../libpurple/protocols/myspace/myspace.c:2670
 msgid "'addbuddy' command failed."
 msgstr "'addbuddy'-bevel het misluk."
 
-#: ../libpurple/protocols/myspace/myspace.c:2704
-#: ../libpurple/protocols/myspace/myspace.c:2754
 msgid "persist command failed"
 msgstr "persist-bevel het misluk"
 
-#: ../libpurple/protocols/myspace/myspace.c:2735
-#: ../libpurple/protocols/myspace/myspace.c:2754
-#: ../libpurple/protocols/myspace/myspace.c:2767
 msgid "Failed to remove buddy"
 msgstr "Verwyder van vriend het misluk"
 
-#: ../libpurple/protocols/myspace/myspace.c:2735
 msgid "'delbuddy' command failed"
 msgstr "'delbuddy'-bevel het misluk"
 
-#: ../libpurple/protocols/myspace/myspace.c:2767
 msgid "blocklist command failed"
 msgstr "blocklist-bevel het misluk"
 
-#: ../libpurple/protocols/myspace/myspace.c:3111
 msgid "Missing Cipher"
 msgstr "Vermiste syfer"
 
-#: ../libpurple/protocols/myspace/myspace.c:3112
 msgid "The RC4 cipher could not be found"
 msgstr "Die RC4-syfer kon nie gevind word nie"
 
-#: ../libpurple/protocols/myspace/myspace.c:3113
 msgid ""
 "Upgrade to a libpurple with RC4 support (>= 2.0.1). MySpaceIM plugin will "
 "not be loaded."
@@ -9225,124 +6320,91 @@ msgstr ""
 "Opgradeer na 'n libpurple met RC4-steun (>=2.0.1). MySpaceIM-inprop sal nie "
 "gelaai word nie."
 
-#: ../libpurple/protocols/myspace/myspace.c:3140
-#: ../libpurple/protocols/myspace/myspace.c:3206
 msgid "Add friends from MySpace.com"
 msgstr "Voeg vriende van MySpace.com by"
 
-#: ../libpurple/protocols/myspace/myspace.c:3141
 msgid "Importing friends failed"
 msgstr "Invoer van vriende het misluk"
 
 #. TODO: find out how
-#: ../libpurple/protocols/myspace/myspace.c:3199
 msgid "Find people..."
 msgstr "Vind mense..."
 
-#: ../libpurple/protocols/myspace/myspace.c:3202
 msgid "Change IM name..."
 msgstr "Verander kitsboodskap-naam..."
 
-#: ../libpurple/protocols/myspace/myspace.c:3588
 msgid "myim URL handler"
 msgstr "myim-URL-vatsel"
 
-#: ../libpurple/protocols/myspace/myspace.c:3589
 msgid "No suitable MySpaceIM account could be found to open this myim URL."
 msgstr ""
 "Geen geskikte MySpaceIM-rekening kon gevind word om hierdie myim-URL te open "
 "nie."
 
-#: ../libpurple/protocols/myspace/myspace.c:3590
 msgid "Enable the proper MySpaceIM account and try again."
 msgstr "Aktiveer die korrekte MySpaceIM-rekening, en probeer weer."
 
-#: ../libpurple/protocols/myspace/myspace.c:3651
 msgid "Show display name in status text"
 msgstr "Wys vertoonnaam in statusteks"
 
-#: ../libpurple/protocols/myspace/myspace.c:3654
 msgid "Show headline in status text"
 msgstr "Wys opskrif in statusteks"
 
-#: ../libpurple/protocols/myspace/myspace.c:3659
 msgid "Send emoticons"
 msgstr "Stuur gesiggies"
 
-#: ../libpurple/protocols/myspace/myspace.c:3664
 msgid "Screen resolution (dots per inch)"
 msgstr "Skermresolusie (stippels per duim)"
 
-#: ../libpurple/protocols/myspace/myspace.c:3667
 msgid "Base font size (points)"
 msgstr "Basisfontgrootte (punte)"
 
-#: ../libpurple/protocols/myspace/user.c:120
-#: ../libpurple/protocols/zephyr/zephyr.c:794
-#: ../libpurple/protocols/zephyr/zephyr.c:1176
 msgid "User"
 msgstr "Gebruiker"
 
-#: ../libpurple/protocols/myspace/user.c:140
 msgid "Headline"
 msgstr "Opskrif"
 
-#: ../libpurple/protocols/myspace/user.c:156
 msgid "Song"
 msgstr "Liedjie"
 
-#: ../libpurple/protocols/myspace/user.c:166
 msgid "Total Friends"
 msgstr "Totale vriende"
 
-#: ../libpurple/protocols/myspace/user.c:184
-#: ../libpurple/protocols/qq/qq.c:1138
 msgid "Client Version"
 msgstr "Kli?ntweergawe"
 
-#: ../libpurple/protocols/myspace/user.c:634
-#: ../libpurple/protocols/myspace/user.c:788
 msgid ""
 "An error occurred while trying to set the username.  Please try again, or "
 "visit http://editprofile.myspace.com/index.cfm?fuseaction=profile.username "
 "to set your username."
 msgstr ""
 "'n Fout het voorgekom met die poging om die gebruikernaam te stel.  Probeer "
-"asb. weer, of besoek "
-"http://editprofile.myspace.com/index.cfm?fuseaction=profile.username om u "
-"gebruikernaam te stel."
+"asb. weer, of besoek http://editprofile.myspace.com/index.cfm?"
+"fuseaction=profile.username om u gebruikernaam te stel."
 
-#: ../libpurple/protocols/myspace/user.c:808
 msgid "MySpaceIM - Username Available"
 msgstr "MySpaceIM - Gebruikernaam beskikbaar"
 
-#: ../libpurple/protocols/myspace/user.c:809
 msgid "This username is available. Would you like to set it?"
 msgstr "Hierdie gebruikernaam is beskikbaar. Wil u dit opstel?"
 
-#: ../libpurple/protocols/myspace/user.c:810
 msgid "ONCE SET, THIS CANNOT BE CHANGED!"
 msgstr "WANNEER DIT GESTEL IS, KAN DIT NIE VERANDER WORD NIE!"
 
-#: ../libpurple/protocols/myspace/user.c:821
-#: ../libpurple/protocols/myspace/user.c:882
 msgid "MySpaceIM - Please Set a Username"
 msgstr "MySpaceIM - Stel asseblief 'n gebruikernaam in"
 
-#: ../libpurple/protocols/myspace/user.c:822
 msgid "This username is unavailable."
 msgstr "Hierdie gebruikernaam is nie beskikbaar nie."
 
-#: ../libpurple/protocols/myspace/user.c:823
 msgid "Please try another username:"
 msgstr "Probeer gerus 'n ander gebruikernaam:"
 
 #. Protocol won't log in now without a username set.. Disconnect
-#: ../libpurple/protocols/myspace/user.c:872
 msgid "No username set"
 msgstr "Geen gebruikernaam opgestel nie"
 
-#: ../libpurple/protocols/myspace/user.c:883
 msgid "Please enter a username to check its availability:"
 msgstr "Tik 'n gebruikernaam om te sien of dit beskikbaar is:"
 
@@ -9352,32 +6414,25 @@ msgstr "Tik 'n gebruikernaam om te sien 
 #. * 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:44
-#: ../libpurple/protocols/myspace/zap.c:217
 msgid "Zap"
 msgstr "Klits"
 
-#: ../libpurple/protocols/myspace/zap.c:44
 #, c-format
 msgid "%s has zapped you!"
 msgstr "%s het u geklits!"
 
-#: ../libpurple/protocols/myspace/zap.c:45
 #, c-format
 msgid "Zapping %s..."
 msgstr "Klits tans vir %s..."
 
 #. Whack means "to hit or strike someone with a sharp blow"
-#: ../libpurple/protocols/myspace/zap.c:48
 msgid "Whack"
 msgstr "Kletter"
 
-#: ../libpurple/protocols/myspace/zap.c:49
 #, c-format
 msgid "%s has whacked you!"
 msgstr "%s het u gekletter!"
 
-#: ../libpurple/protocols/myspace/zap.c:49
 #, c-format
 msgid "Whacking %s..."
 msgstr "Kletter tans vir %s..."
@@ -9385,76 +6440,61 @@ 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:54
 msgid "Torch"
 msgstr "Brander"
 
-#: ../libpurple/protocols/myspace/zap.c:55
 #, c-format
 msgid "%s has torched you!"
 msgstr "%s het u gebrander!"
 
-#: ../libpurple/protocols/myspace/zap.c:55
 #, c-format
 msgid "Torching %s..."
 msgstr "Brander tans vir %s..."
 
 #. Smooch means "to kiss someone, often enthusiastically"
-#: ../libpurple/protocols/myspace/zap.c:58
 msgid "Smooch"
 msgstr "Soenie"
 
-#: ../libpurple/protocols/myspace/zap.c:59
 #, c-format
 msgid "%s has smooched you!"
 msgstr "%s het u gesoenie!"
 
-#: ../libpurple/protocols/myspace/zap.c:59
 #, c-format
 msgid "Smooching %s..."
 msgstr "Soenie tans vir %s..."
 
 #. A hug is a display of affection; wrapping your arms around someone
-#: ../libpurple/protocols/myspace/zap.c:62
 msgid "Hug"
 msgstr "Liefie"
 
-#: ../libpurple/protocols/myspace/zap.c:62
 #, c-format
 msgid "%s has hugged you!"
 msgstr "%s het u geliefie!"
 
-#: ../libpurple/protocols/myspace/zap.c:63
 #, c-format
 msgid "Hugging %s..."
 msgstr "Liefie tans vir %s..."
 
 #. Slap means "to hit someone with an open/flat hand"
-#: ../libpurple/protocols/myspace/zap.c:66
 msgid "Slap"
 msgstr "Klapper"
 
-#: ../libpurple/protocols/myspace/zap.c:67
 #, c-format
 msgid "%s has slapped you!"
 msgstr "%s het u geklapper!"
 
-#: ../libpurple/protocols/myspace/zap.c:67
 #, c-format
 msgid "Slapping %s..."
 msgstr "Klapper tans vir %s..."
 
 #. Goose means "to pinch someone on their butt"
-#: ../libpurple/protocols/myspace/zap.c:70
 msgid "Goose"
 msgstr "Slurp"
 
-#: ../libpurple/protocols/myspace/zap.c:71
 #, c-format
 msgid "%s has goosed you!"
 msgstr "%s het u geslurp!"
 
-#: ../libpurple/protocols/myspace/zap.c:71
 #, c-format
 msgid "Goosing %s..."
 msgstr "Slurp tans vir %s..."
@@ -9462,16 +6502,13 @@ 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 "Vatvyf"
 
-#: ../libpurple/protocols/myspace/zap.c:77
 #, c-format
 msgid "%s has high-fived you!"
 msgstr "%s het u gevatvyf!"
 
-#: ../libpurple/protocols/myspace/zap.c:77
 #, c-format
 msgid "High-fiving %s..."
 msgstr "Vatvyf tans vir %s..."
@@ -9479,16 +6516,13 @@ 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:82
 msgid "Punk"
 msgstr "Zoer"
 
-#: ../libpurple/protocols/myspace/zap.c:83
 #, c-format
 msgid "%s has punk'd you!"
 msgstr "%s het u gezoer!"
 
-#: ../libpurple/protocols/myspace/zap.c:83
 #, c-format
 msgid "Punking %s..."
 msgstr "Zoer tans vir %s..."
@@ -9500,129 +6534,94 @@ msgstr "Zoer tans vir %s..."
 #. * 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:92
 msgid "Raspberry"
 msgstr "Kerrie"
 
-#: ../libpurple/protocols/myspace/zap.c:93
 #, c-format
 msgid "%s has raspberried you!"
 msgstr "%s het u gekerrie!"
 
-#: ../libpurple/protocols/myspace/zap.c:93
 #, c-format
 msgid "Raspberrying %s..."
 msgstr "Kerrie tans vir %s..."
 
-#: ../libpurple/protocols/novell/nmuser.c:1863
 msgid "Required parameters not passed in"
 msgstr "Vereiste parameters nie aangegee nie"
 
-#: ../libpurple/protocols/novell/nmuser.c:1866
 msgid "Unable to write to network"
 msgstr "Kan nie op netwerk skryf nie"
 
-#: ../libpurple/protocols/novell/nmuser.c:1869
 msgid "Unable to read from network"
 msgstr "Kan nie vanaf netwerk lees nie"
 
-#: ../libpurple/protocols/novell/nmuser.c:1872
 msgid "Error communicating with server"
 msgstr "Kon nie met bediener kommunikeer nie"
 
-#: ../libpurple/protocols/novell/nmuser.c:1876
 msgid "Conference not found"
 msgstr "Konferensie nie gevind nie"
 
-#: ../libpurple/protocols/novell/nmuser.c:1879
 msgid "Conference does not exist"
 msgstr "Konferensie bestaan nie"
 
-#: ../libpurple/protocols/novell/nmuser.c:1883
 msgid "A folder with that name already exists"
 msgstr "'n Vouer met daardie naam bestaan reeds"
 
-#: ../libpurple/protocols/novell/nmuser.c:1886
 msgid "Not supported"
 msgstr "Nie ondersteun nie"
 
-#: ../libpurple/protocols/novell/nmuser.c:1890
 msgid "Password has expired"
 msgstr "Wagwoord het verval"
 
-#: ../libpurple/protocols/novell/nmuser.c:1893
-#: ../libpurple/protocols/oscar/clientlogin.c:436
-#: ../libpurple/protocols/oscar/oscar.c:1956
-#: ../libpurple/protocols/qq/qq_base.c:415
-#: ../libpurple/protocols/qq/qq_base.c:1100
-#: ../libpurple/protocols/simple/simple.c:1127
-#: ../libpurple/protocols/yahoo/libymsg.c:1969
 msgid "Incorrect password"
 msgstr "Verkeerde wagwoord"
 
-#: ../libpurple/protocols/novell/nmuser.c:1899
 msgid "Account has been disabled"
 msgstr "Rekening gedeaktiveer"
 
-#: ../libpurple/protocols/novell/nmuser.c:1902
 msgid "The server could not access the directory"
 msgstr "Die bediener kon nie toegang tot die gids kry nie"
 
-#: ../libpurple/protocols/novell/nmuser.c:1905
 msgid "Your system administrator has disabled this operation"
 msgstr "U stelseladministrateur het hierdie bewerking gedeaktiveer"
 
-#: ../libpurple/protocols/novell/nmuser.c:1908
 msgid "The server is unavailable; try again later"
 msgstr "Die bediener is nie beskikbaar nie; probeer later weer"
 
-#: ../libpurple/protocols/novell/nmuser.c:1911
 msgid "Cannot add a contact to the same folder twice"
 msgstr "Kan nie 'n kontak twee keer by dieselfde vouer voeg nie"
 
-#: ../libpurple/protocols/novell/nmuser.c:1914
 msgid "Cannot add yourself"
 msgstr "Kan nie uself byvoeg nie"
 
-#: ../libpurple/protocols/novell/nmuser.c:1917
 msgid "Master archive is misconfigured"
 msgstr "Meesterargief is gewankonfigureer"
 
-#: ../libpurple/protocols/novell/nmuser.c:1924
 msgid "Could not recognize the host of the username you entered"
 msgstr "Kon nie die gasheer van die gebruikernaam herken wat u getik het nie"
 
-#: ../libpurple/protocols/novell/nmuser.c:1927
 msgid ""
 "Your account has been disabled because too many incorrect passwords were "
 "entered"
 msgstr "U rekening is gedeaktiveer omdat te veel verkeerde wagwoorde getik is"
 
-#: ../libpurple/protocols/novell/nmuser.c:1930
 msgid "You cannot add the same person twice to a conversation"
 msgstr "U kan nie dieselfde persoon twee keer by 'n geselsie voeg nie"
 
-#: ../libpurple/protocols/novell/nmuser.c:1934
 msgid "You have reached your limit for the number of contacts allowed"
 msgstr "U het u limiet vir die getal toegelate kontakte bereik"
 
-#: ../libpurple/protocols/novell/nmuser.c:1937
 msgid "You have entered an incorrect username"
 msgstr "U het 'n verkeerde gebruikernaam getik"
 
-#: ../libpurple/protocols/novell/nmuser.c:1940
 msgid "An error occurred while updating the directory"
 msgstr "Kon nie die gids volledig bywerk nie"
 
-#: ../libpurple/protocols/novell/nmuser.c:1943
 msgid "Incompatible protocol version"
 msgstr "Onversoenbare protokolweergawe"
 
-#: ../libpurple/protocols/novell/nmuser.c:1946
 msgid "The user has blocked you"
 msgstr "Die gebruiker het u geblokkeer"
 
-#: ../libpurple/protocols/novell/nmuser.c:1949
 msgid ""
 "This evaluation version does not allow more than ten users to log in at one "
 "time"
@@ -9630,55 +6629,44 @@ msgstr ""
 "Hierdie evalueringsweergawe laat nie meer as tien gebruikers toe om gelyk "
 "aan te meld nie"
 
-#: ../libpurple/protocols/novell/nmuser.c:1952
 msgid "The user is either offline or you are blocked"
 msgstr "Die gebruiker is ?f vanlyn ?f het u geblokkeer"
 
-#: ../libpurple/protocols/novell/nmuser.c:1955
 #, c-format
 msgid "Unknown error: 0x%X"
 msgstr "Onbekende fout: 0x%X"
 
-#: ../libpurple/protocols/novell/novell.c:124
 #, c-format
 msgid "Unable to login: %s"
 msgstr "Kan nie aanmeld nie: %s"
 
-#: ../libpurple/protocols/novell/novell.c:255
 #, c-format
 msgid "Unable to send message. Could not get details for user (%s)."
 msgstr ""
 "Kan nie boodskap stuur nie. Kon nie die details vir gebruiker kry nie (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:404
 #, 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:430
 #, c-format
 msgid "Unable to send message (%s)."
 msgstr "Kan nie boodskap stuur nie (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:501
-#: ../libpurple/protocols/novell/novell.c:993
 #, c-format
 msgid "Unable to invite user (%s)."
 msgstr "Kon nie gebruiker uitnooi nie (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:540
 #, 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:545
 #, 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:592
 #, c-format
 msgid ""
 "Unable to move user %s to folder %s in the server side list. Error while "
@@ -9687,7 +6675,6 @@ msgstr ""
 "Kan nie gebruiker %s na vouer %s in die bedienerkant-lys skuif nie. Kon nie "
 "vouer skep nie (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:640
 #, c-format
 msgid ""
 "Unable to add %s to your buddy list. Error creating folder in server side "
@@ -9696,62 +6683,46 @@ msgstr ""
 "Kan nie %s by u vriendelys voeg nie. Kon nie vouer in bedienerkantlys skep "
 "nie (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:713
 #, c-format
 msgid "Could not get details for user %s (%s)."
 msgstr "Kon nie details vir gebruiker %s kry nie (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:759
-#: ../libpurple/protocols/novell/novell.c:905
 #, 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:806
 #, 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:859
 #, 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:927
 #, 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:950
-#: ../libpurple/protocols/novell/novell.c:1660
 #, c-format
 msgid "Unable to change server side privacy settings (%s)."
 msgstr "Kon nie bedienerkant-privaatheidinstellings verander nie (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:1020
 #, c-format
 msgid "Unable to create conference (%s)."
 msgstr "Kan nie konferensie skep nie (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:1131
-#: ../libpurple/protocols/novell/novell.c:1706
 msgid "Error communicating with server. Closing connection."
 msgstr "Kon nie met bediener kommunikeer nie. Verbinding word gesluit."
 
-#: ../libpurple/protocols/novell/novell.c:1489
 msgid "Telephone Number"
 msgstr "Foonnommer"
 
-#: ../libpurple/protocols/novell/novell.c:1495
 msgid "Personal Title"
 msgstr "Persoonlike titel"
 
-#: ../libpurple/protocols/novell/novell.c:1499
 msgid "Mailstop"
 msgstr "Mailstop"
 
-#: ../libpurple/protocols/novell/novell.c:1515
-#: ../libpurple/protocols/sametime/sametime.c:4201
 msgid "User ID"
 msgstr "Gebruiker-ID"
 
@@ -9761,33 +6732,26 @@ msgstr "Gebruiker-ID"
 #. purple_notify_user_info_add_pair(user_info, tag, value);
 #. }
 #.
-#: ../libpurple/protocols/novell/novell.c:1528
 msgid "Full name"
 msgstr "Volle name"
 
-#: ../libpurple/protocols/novell/novell.c:1650
 #, c-format
 msgid "GroupWise Conference %d"
 msgstr "GroupWise-konferensie %d"
 
-#: ../libpurple/protocols/novell/novell.c:1733
 msgid "Authenticating..."
 msgstr "Staaf tans..."
 
-#: ../libpurple/protocols/novell/novell.c:1750
 msgid "Waiting for response..."
 msgstr "Wag vir respons..."
 
-#: ../libpurple/protocols/novell/novell.c:1885
 #, c-format
 msgid "%s has been invited to this conversation."
 msgstr "%s is na hierdie gesprek genooi."
 
-#: ../libpurple/protocols/novell/novell.c:1913
 msgid "Invitation to Conversation"
 msgstr "Uitnodiging na gesprek"
 
-#: ../libpurple/protocols/novell/novell.c:1914
 #, c-format
 msgid ""
 "Invitation from: %s\n"
@@ -9798,11 +6762,9 @@ msgstr ""
 "\n"
 "Gestuur: %s"
 
-#: ../libpurple/protocols/novell/novell.c:1916
 msgid "Would you like to join the conversation?"
 msgstr "Wil u by die gesprek aansluit?"
 
-#: ../libpurple/protocols/novell/novell.c:2088
 #, c-format
 msgid ""
 "%s appears to be offline and did not receive the message that you just sent."
@@ -9810,7 +6772,6 @@ msgstr ""
 "%s blyk vanlyn te wees, en nie die boodskap ontvang het wat u nou net "
 "gestuur het nie."
 
-#: ../libpurple/protocols/novell/novell.c:2188
 msgid ""
 "Unable to connect to server. Please enter the address of the server to which "
 "you wish to connect."
@@ -9818,11 +6779,9 @@ msgstr ""
 "Kan nie aan bediener koppel nie. Tik gerus die adres van die bediener "
 "waaraan u wil koppel."
 
-#: ../libpurple/protocols/novell/novell.c:2525
 msgid "This conference has been closed. No more messages can be sent."
 msgstr ""
-"Hierdie konferensie is gesluit. Geen verdere boodskappe kan gestuur word "
-"nie."
+"Hierdie konferensie is gesluit. Geen verdere boodskappe kan gestuur word nie."
 
 #. *< type
 #. *< ui_requirement
@@ -9834,30 +6793,23 @@ msgstr ""
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/novell/novell.c:3551
-#: ../libpurple/protocols/novell/novell.c:3553
 msgid "Novell GroupWise Messenger Protocol Plugin"
 msgstr "Inprop vir Novell GroupWise-boodskapperprotokol"
 
-#: ../libpurple/protocols/novell/novell.c:3578
 msgid "Server address"
 msgstr "Bedieneradres"
 
-#: ../libpurple/protocols/novell/novell.c:3582
 msgid "Server port"
 msgstr "Bedienerpoort"
 
-#: ../libpurple/protocols/oscar/clientlogin.c:76
 #, c-format
 msgid "Received unexpected response from %s: %s"
 msgstr "Onverwagte respons van %s ontvang: %s"
 
-#: ../libpurple/protocols/oscar/clientlogin.c:78
 #, c-format
 msgid "Received unexpected response from %s"
 msgstr "Onverwagse respons vanaf %s"
 
-#: ../libpurple/protocols/oscar/clientlogin.c:199
 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."
@@ -9867,13 +6819,10 @@ msgstr ""
 
 #. Note to translators: The first %s is a URL, the second is an
 #. error message.
-#: ../libpurple/protocols/oscar/clientlogin.c:286
-#: ../libpurple/protocols/oscar/clientlogin.c:522
 #, c-format
 msgid "Error requesting %s: %s"
 msgstr "Fout met aanvra van %s: %s"
 
-#: ../libpurple/protocols/oscar/clientlogin.c:440
 msgid ""
 "Server requested that you fill out a CAPTCHA in order to sign in, but this "
 "client does not currently support CAPTCHAs."
@@ -9881,140 +6830,103 @@ msgstr ""
 "Die bediener vra dat u 'n CAPTCHA invul om aan te meld, maar di? kli?nt "
 "ondersteun nie tans CAPTCHA's nie."
 
-#: ../libpurple/protocols/oscar/clientlogin.c:445
 msgid "AOL does not allow your screen name to authenticate here"
 msgstr "AOL laat nie toe dat u skermnaam hier gestaaf word nie"
 
-#: ../libpurple/protocols/oscar/clientlogin.c:525
 #, c-format
 msgid "Error requesting %s"
 msgstr "Fout met aanvra van %s"
 
-#: ../libpurple/protocols/oscar/family_chatnav.c:64
 msgid "Could not join chat room"
 msgstr "Kon nie by geselsie aansluit nie"
 
-#: ../libpurple/protocols/oscar/family_chatnav.c:65
 msgid "Invalid chat room name"
 msgstr "Ongeldige kletskamernaam"
 
-#: ../libpurple/protocols/oscar/family_locate.c:404
 msgid "Thinking"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/family_locate.c:406
 msgid "Shopping"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/family_locate.c:410
 msgid "Questioning"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/family_locate.c:412
 msgid "Eating"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/family_locate.c:413
 msgid "Watching a movie"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/family_locate.c:415 ../pidgin/gtkconv.c:6776
-#: ../pidgin/gtkstatusbox.c:717
 msgid "Typing"
 msgstr "Tik"
 
-#: ../libpurple/protocols/oscar/family_locate.c:416
 msgid "At the office"
 msgstr "By die kantoor"
 
-#: ../libpurple/protocols/oscar/family_locate.c:417
 msgid "Taking a bath"
 msgstr "In die bad"
 
-#: ../libpurple/protocols/oscar/family_locate.c:418
 msgid "Watching TV"
 msgstr "Voor die TV"
 
-#: ../libpurple/protocols/oscar/family_locate.c:419
 msgid "Having fun"
 msgstr "Besig met pret"
 
-#: ../libpurple/protocols/oscar/family_locate.c:420
 msgid "Sleeping"
 msgstr "Slaap"
 
-#: ../libpurple/protocols/oscar/family_locate.c:421
 msgid "Using a PDA"
 msgstr "Gebruik 'n PDA"
 
-#: ../libpurple/protocols/oscar/family_locate.c:425
 msgid "Meeting friends"
 msgstr "Ontmoet vriende"
 
-#: ../libpurple/protocols/oscar/family_locate.c:426
 msgid "On the phone"
 msgstr "Op die foon"
 
-#: ../libpurple/protocols/oscar/family_locate.c:427
 msgid "Surfing"
 msgstr ""
 
 #. "I am mobile." / "John is mobile."
-#: ../libpurple/protocols/oscar/family_locate.c:429
-#: ../libpurple/protocols/qq/buddy_memo.c:76 ../libpurple/status.c:168
 msgid "Mobile"
 msgstr "Mobiel"
 
-#: ../libpurple/protocols/oscar/family_locate.c:430
 msgid "Searching the web"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/family_locate.c:431
 msgid "At a party"
 msgstr "By 'n partytjie"
 
-#: ../libpurple/protocols/oscar/family_locate.c:432
 msgid "Having Coffee"
 msgstr ""
 
 #. Playing video games
-#: ../libpurple/protocols/oscar/family_locate.c:434
 msgid "Gaming"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/family_locate.c:435
 msgid "Browsing the web"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/family_locate.c:436
 msgid "Smoking"
 msgstr "Rook"
 
-#: ../libpurple/protocols/oscar/family_locate.c:437
 msgid "Writing"
 msgstr ""
 
 #. Drinking [Alcohol]
-#: ../libpurple/protocols/oscar/family_locate.c:439
 msgid "Drinking"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/family_locate.c:440 ../libpurple/status.c:169
 msgid "Listening to music"
 msgstr "Luister na musiek"
 
-#: ../libpurple/protocols/oscar/family_locate.c:441
 msgid "Studying"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/family_locate.c:443
 msgid "In the restroom"
 msgstr "In die toilet"
 
-#: ../libpurple/protocols/oscar/flap_connection.c:472
-#: ../libpurple/proxy.c:1493 ../libpurple/proxy.c:1523
-#: ../libpurple/proxy.c:1603 ../libpurple/proxy.c:1674
-#: ../libpurple/proxy.c:1775 ../libpurple/proxy.c:1914
 msgid "Received invalid data on connection with server"
 msgstr "Het ongeldige data ontvang tydens koppeling met bediener"
 
@@ -10028,12 +6940,9 @@ msgstr "Het ongeldige data ontvang tyden
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/oscar/libaim.c:120
-#: ../libpurple/protocols/oscar/libaim.c:122
 msgid "AIM Protocol Plugin"
 msgstr "AIM-protokolinprop"
 
-#: ../libpurple/protocols/oscar/libicq.c:35
 msgid "ICQ UIN..."
 msgstr "ICQ UIN..."
 
@@ -10047,206 +6956,155 @@ msgstr "ICQ UIN..."
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/oscar/libicq.c:131
-#: ../libpurple/protocols/oscar/libicq.c:133
 msgid "ICQ Protocol Plugin"
 msgstr "ICQ-protokolinprop"
 
-#: ../libpurple/protocols/oscar/libicq.c:160
-#: ../libpurple/protocols/yahoo/libyahoo.c:324
-#: ../libpurple/protocols/yahoo/libyahoojp.c:220
-#: ../libpurple/protocols/zephyr/zephyr.c:2982
 msgid "Encoding"
 msgstr "Enkodering"
 
-#: ../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: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: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:49
 msgid "Received invalid data on connection with remote user."
 msgstr "Het ongeldige data ontvang tydens koppeling met afgele? gebruiker."
 
-#: ../libpurple/protocols/oscar/odc.c:51
 msgid "Unable to establish a connection with the remote user."
 msgstr "Kan nie 'n verbinding met die afgele? gebruiker bewerkstellig nie."
 
-#: ../libpurple/protocols/oscar/odc.c:562
 msgid "Direct IM established"
 msgstr "Direkte kitsboodskap bewerkstellig"
 
-#: ../libpurple/protocols/oscar/odc.c:601
 #, 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 "
+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:666
 #, c-format
 msgid "File %s is %s, which is larger than the maximum size of %s."
 msgstr "L?er %s is %s, wat groter as die maksimum grootte %s is."
 
-#: ../libpurple/protocols/oscar/oscar.c:132
-#: ../libpurple/protocols/oscar/oscar.c:161
 msgid "Invalid error"
 msgstr "Ongeldige fout"
 
-#: ../libpurple/protocols/oscar/oscar.c:133
 msgid "Invalid SNAC"
 msgstr "Ongeldige SNAC"
 
-#: ../libpurple/protocols/oscar/oscar.c:134
 msgid "Rate to host"
 msgstr "Koers na gasheer"
 
-#: ../libpurple/protocols/oscar/oscar.c:135
 msgid "Rate to client"
 msgstr "Koers na kli?nt"
 
-#: ../libpurple/protocols/oscar/oscar.c:137
 msgid "Service unavailable"
 msgstr "Diens nie beskikbaar nie"
 
-#: ../libpurple/protocols/oscar/oscar.c:138
 msgid "Service not defined"
 msgstr "Diens nie gedefinieer nie"
 
-#: ../libpurple/protocols/oscar/oscar.c:139
 msgid "Obsolete SNAC"
 msgstr "Verouderde SNAC"
 
-#: ../libpurple/protocols/oscar/oscar.c:140
 msgid "Not supported by host"
 msgstr "Word nie deur gasheer ondersteun nie"
 
-#: ../libpurple/protocols/oscar/oscar.c:141
 msgid "Not supported by client"
 msgstr "Word nie deur kli?nt ondersteun nie"
 
-#: ../libpurple/protocols/oscar/oscar.c:142
 msgid "Refused by client"
 msgstr "Deur kli?nt geweier"
 
-#: ../libpurple/protocols/oscar/oscar.c:143
 msgid "Reply too big"
 msgstr "Antwoord te groot"
 
-#: ../libpurple/protocols/oscar/oscar.c:144
 msgid "Responses lost"
 msgstr "Response verloor"
 
-#: ../libpurple/protocols/oscar/oscar.c:145
 msgid "Request denied"
 msgstr "Versoek geweier"
 
-#: ../libpurple/protocols/oscar/oscar.c:146
 msgid "Busted SNAC payload"
 msgstr "Gebreekte SNAC-afvoer"
 
-#: ../libpurple/protocols/oscar/oscar.c:147
 msgid "Insufficient rights"
 msgstr "Onvoldoende regte"
 
-#: ../libpurple/protocols/oscar/oscar.c:148
 msgid "In local permit/deny"
 msgstr "In plaaslike toelaat/weier"
 
-#: ../libpurple/protocols/oscar/oscar.c:149
 msgid "Warning level too high (sender)"
 msgstr "Waarskuwingvlak t? hoog (sender)"
 
-#: ../libpurple/protocols/oscar/oscar.c:150
 msgid "Warning level too high (receiver)"
 msgstr "Waarskuwingvlak te hoog (ontvanger)"
 
-#: ../libpurple/protocols/oscar/oscar.c:151
 msgid "User temporarily unavailable"
 msgstr "Gebruiker tydelik nie beskikbaar nie"
 
-#: ../libpurple/protocols/oscar/oscar.c:152
 msgid "No match"
 msgstr "Geen passing nie"
 
-#: ../libpurple/protocols/oscar/oscar.c:153
 msgid "List overflow"
 msgstr "Lysoorvloed"
 
-#: ../libpurple/protocols/oscar/oscar.c:154
 msgid "Request ambiguous"
 msgstr "Versoek dubbelsinnig"
 
-#: ../libpurple/protocols/oscar/oscar.c:155
 msgid "Queue full"
 msgstr "Tou vol"
 
-#: ../libpurple/protocols/oscar/oscar.c:156
 msgid "Not while on AOL"
 msgstr "Nie terwyl op AOL nie"
 
-#: ../libpurple/protocols/oscar/oscar.c:163
 #, fuzzy
 msgid "Cannot receive IM due to parental controls"
 msgstr "Kan nie kitsboodskappe ontvang nie weens "
 
-#: ../libpurple/protocols/oscar/oscar.c:164
 #, fuzzy
 msgid "Cannot send SMS without accepting terms"
 msgstr "Kan nie SMS stuur sonder om terme te aanvaar nie"
 
-#: ../libpurple/protocols/oscar/oscar.c:165
 msgid "Cannot send SMS"
 msgstr "Kan nie SMS stuur nie"
 
 #. SMS_WITHOUT_DISCLAIMER is weird
-#: ../libpurple/protocols/oscar/oscar.c:166
 msgid "Cannot send SMS to this country"
 msgstr "Kan nie SMS stuur na hierdie land nie"
 
 #. Undocumented
-#: ../libpurple/protocols/oscar/oscar.c:169
 msgid "Cannot send SMS to unknown country"
 msgstr "Kan nie SMS stuur na onbekende land nie"
 
-#: ../libpurple/protocols/oscar/oscar.c:170
 msgid "Bot accounts cannot initiate IMs"
 msgstr "Robotrekeninge kan nie kitsboodskappe begin nie"
 
-#: ../libpurple/protocols/oscar/oscar.c:171
 msgid "Bot account cannot IM this user"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:172
 msgid "Bot account reached IM limit"
 msgstr "Robotrekening het kitsboodskaplimiet bereik"
 
-#: ../libpurple/protocols/oscar/oscar.c:173
 msgid "Bot account reached daily IM limit"
 msgstr "Robotrekening het daaglikse kitsboodskaplimiet bereik"
 
-#: ../libpurple/protocols/oscar/oscar.c:174
 msgid "Bot account reached monthly IM limit"
 msgstr "Robotrekening het maandelikse kitsboodskaplimiet bereik"
 
-#: ../libpurple/protocols/oscar/oscar.c:175
 msgid "Unable to receive offline messages"
 msgstr "Kan nie vanlynboodskappe ontvang nie"
 
-#: ../libpurple/protocols/oscar/oscar.c:176
 msgid "Offline message store full"
 msgstr "Stoor vir vanlynboodskappe is vol"
 
-#: ../libpurple/protocols/oscar/oscar.c:383
 msgid ""
 "(There was an error receiving this message.  The buddy you are speaking with "
 "is probably using a different encoding than expected.  If you know what "
@@ -10258,7 +7116,6 @@ msgstr ""
 "hy gebruik, kan u dit in die gevorderde rekeningopsies van u AIM/ICQ-"
 "rekening spesifiseer.)"
 
-#: ../libpurple/protocols/oscar/oscar.c:504
 #, c-format
 msgid ""
 "(There was an error receiving this message.  Either you and %s have "
@@ -10268,189 +7125,132 @@ msgstr ""
 "enkoderings gekies, ?f %s het 'n vrotterige kli?nt.)"
 
 #. Label
-#: ../libpurple/protocols/oscar/oscar.c:697 ../pidgin/gtkutils.c:2297
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:329
 msgid "Buddy Icon"
 msgstr "Vriendikoon"
 
-#: ../libpurple/protocols/oscar/oscar.c:700
-#: ../pidgin/plugins/themeedit-icon.c:81
 msgid "Voice"
 msgstr "Stem"
 
-#: ../libpurple/protocols/oscar/oscar.c:703
 msgid "AIM Direct IM"
 msgstr "AIM- direkte kitsboodskap"
 
-#: ../libpurple/protocols/oscar/oscar.c:709
-#: ../libpurple/protocols/oscar/oscar.c:6683
 msgid "Get File"
 msgstr "Kry l?er"
 
-#: ../libpurple/protocols/oscar/oscar.c:716
 msgid "Games"
 msgstr "Speletjies"
 
-#: ../libpurple/protocols/oscar/oscar.c:720
 msgid "ICQ Xtraz"
 msgstr "ICQ Xtraz"
 
-#: ../libpurple/protocols/oscar/oscar.c:723
 msgid "Add-Ins"
 msgstr "Invoegsels"
 
-#: ../libpurple/protocols/oscar/oscar.c:726
 msgid "Send Buddy List"
 msgstr "Stuur vriendelys"
 
-#: ../libpurple/protocols/oscar/oscar.c:729
 msgid "ICQ Direct Connect"
 msgstr "ICQ- direkte koppeling"
 
-#: ../libpurple/protocols/oscar/oscar.c:732
 msgid "AP User"
 msgstr "AP-gebruiker"
 
-#: ../libpurple/protocols/oscar/oscar.c:735
 msgid "ICQ RTF"
 msgstr "ICQ RTF"
 
-#: ../libpurple/protocols/oscar/oscar.c:738
 msgid "Nihilist"
 msgstr "Nihilis"
 
-#: ../libpurple/protocols/oscar/oscar.c:741
 msgid "ICQ Server Relay"
 msgstr "ICQ-bedienerherleiding"
 
-#: ../libpurple/protocols/oscar/oscar.c:744
 msgid "Old ICQ UTF8"
 msgstr "Ou ICQ-UTF8"
 
-#: ../libpurple/protocols/oscar/oscar.c:747
 msgid "Trillian Encryption"
 msgstr "Trillian-enkripsie"
 
-#: ../libpurple/protocols/oscar/oscar.c:750
 msgid "ICQ UTF8"
 msgstr "ICQ UTF8"
 
-#: ../libpurple/protocols/oscar/oscar.c:753
 msgid "Hiptop"
 msgstr "Hiptop"
 
-#: ../libpurple/protocols/oscar/oscar.c:756
 msgid "Security Enabled"
 msgstr "Sekuriteit geaktiveer"
 
-#: ../libpurple/protocols/oscar/oscar.c:759
 msgid "Video Chat"
 msgstr "Videogeselsies"
 
-#: ../libpurple/protocols/oscar/oscar.c:763
 msgid "iChat AV"
 msgstr "iChat AV"
 
-#: ../libpurple/protocols/oscar/oscar.c:766
 msgid "Live Video"
 msgstr "Lewende video"
 
-#: ../libpurple/protocols/oscar/oscar.c:769
 msgid "Camera"
 msgstr "Kammera"
 
-#: ../libpurple/protocols/oscar/oscar.c:772
 msgid "Screen Sharing"
 msgstr "Skermdeling"
 
-#: ../libpurple/protocols/oscar/oscar.c:790
-#: ../libpurple/protocols/oscar/oscar.c:6313
 msgid "Free For Chat"
 msgstr "Beskikbaar vir geselsies"
 
-#: ../libpurple/protocols/oscar/oscar.c:794
-#: ../libpurple/protocols/oscar/oscar.c:6395
 msgid "Not Available"
 msgstr "Nie beskikbaar nie"
 
-#: ../libpurple/protocols/oscar/oscar.c:796
-#: ../libpurple/protocols/oscar/oscar.c:6381
 msgid "Occupied"
 msgstr "Beset"
 
-#: ../libpurple/protocols/oscar/oscar.c:800
 msgid "Web Aware"
 msgstr "Web Aware"
 
-#: ../libpurple/protocols/oscar/oscar.c:802 ../libpurple/protocols/qq/qq.c:275
-#: ../libpurple/protocols/qq/qq.c:423
-#: ../libpurple/protocols/yahoo/libymsg.c:3839 ../libpurple/status.c:165
-#: ../pidgin/gtkdocklet.c:562 ../pidgin/gtkstatusbox.c:1108
 msgid "Invisible"
 msgstr "Onsigbaar"
 
-#: ../libpurple/protocols/oscar/oscar.c:804
-#: ../libpurple/protocols/oscar/oscar.c:6321
 msgid "Evil"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:806
-#: ../libpurple/protocols/oscar/oscar.c:6329
 msgid "Depression"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:808
-#: ../libpurple/protocols/oscar/oscar.c:6337
 msgid "At home"
 msgstr "Tuis"
 
-#: ../libpurple/protocols/oscar/oscar.c:810
-#: ../libpurple/protocols/oscar/oscar.c:6345
 msgid "At work"
 msgstr "By die werk"
 
-#: ../libpurple/protocols/oscar/oscar.c:812
 msgid "At lunch"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:1044
-#: ../libpurple/protocols/oscar/oscar.c:4233
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:722 ../pidgin/gtkprefs.c:1721
 msgid "IP Address"
 msgstr "IP-adres"
 
-#: ../libpurple/protocols/oscar/oscar.c:1050
 msgid "Warning Level"
 msgstr "Waarskuwingvlak"
 
-#: ../libpurple/protocols/oscar/oscar.c:1060
 msgid "Buddy Comment"
 msgstr "Vriendkommentaar"
 
-#: ../libpurple/protocols/oscar/oscar.c:1192
 #, c-format
 msgid "Unable to connect to authentication server: %s"
 msgstr "Kan nie aan stawingbediener koppel nie: %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:1200
 #, c-format
 msgid "Unable to connect to BOS server: %s"
 msgstr "Kan nie aan BOS-bediener koppel nie: %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:1259
 msgid "Username sent"
 msgstr "Gebruikernaam gestuur"
 
-#: ../libpurple/protocols/oscar/oscar.c:1264
 msgid "Connection established, cookie sent"
 msgstr "Verbinding bewerkstellig, koekie gestuur"
 
 #. TODO: Don't call this with ssi
-#: ../libpurple/protocols/oscar/oscar.c:1346
 msgid "Finalizing connection"
 msgstr "Finaliseer verbinding"
 
-#: ../libpurple/protocols/oscar/oscar.c:1574
 #, c-format
 msgid ""
 "Unable to sign on as %s because the username is invalid.  Usernames must be "
@@ -10461,51 +7261,36 @@ msgstr ""
 "Gebruikername 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:1727
-#: ../libpurple/protocols/oscar/oscar.c:1768
-#: ../libpurple/protocols/oscar/oscar.c:1869
 #, c-format
 msgid "You may be disconnected shortly.  If so, check %s for updates."
 msgstr ""
 "U kan dalk binnekort ontkoppel word.  As dit gebeur, kontroleer %s vir "
 "bywerkings."
 
-#: ../libpurple/protocols/oscar/oscar.c:1731
-#: ../libpurple/protocols/oscar/oscar.c:1772
 msgid "Unable to get a valid AIM login hash."
 msgstr "Kan nie 'n geldige AIM-aanmeldhutswaarde kry nie."
 
-#: ../libpurple/protocols/oscar/oscar.c:1873
 msgid "Unable to get a valid login hash."
 msgstr "Kan nie geldige aanmeldhutswaarde kry nie."
 
-#: ../libpurple/protocols/oscar/oscar.c:1916
-#: ../libpurple/protocols/oscar/oscar.c:2036
 msgid "Received authorization"
 msgstr "Magtiging ontvang"
 
 #. Unregistered username
 #. uid is not exist
 #. the username does not exist
-#: ../libpurple/protocols/oscar/oscar.c:1950
-#: ../libpurple/protocols/qq/qq_base.c:1109
-#: ../libpurple/protocols/yahoo/libymsg.c:1980
-#: ../libpurple/protocols/yahoo/libymsg.c:2238
 msgid "Username does not exist"
 msgstr "Gebruikernaam bestaan nie"
 
 #. Suspended account
-#: ../libpurple/protocols/oscar/oscar.c:1960
 msgid "Your account is currently suspended"
 msgstr "U rekening is tans opgeskort"
 
 #. service temporarily unavailable
-#: ../libpurple/protocols/oscar/oscar.c:1965
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr "Die AOL-kitsboodskapdiens is tydelik nie beskikbaar nie."
 
 #. username connecting too frequently
-#: ../libpurple/protocols/oscar/oscar.c:1969
 msgid ""
 "Your username has been connecting and disconnecting too frequently. Wait ten "
 "minutes and try again. If you continue to try, you will need to wait even "
@@ -10516,13 +7301,11 @@ msgstr ""
 "wag."
 
 #. client too old
-#: ../libpurple/protocols/oscar/oscar.c:1974
 #, 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 gerus op by %s"
 
 #. IP address connecting too frequently
-#: ../libpurple/protocols/oscar/oscar.c:1981
 msgid ""
 "Your IP address has been connecting and disconnecting too frequently. Wait a "
 "minute and try again. If you continue to try, you will need to wait even "
@@ -10532,43 +7315,30 @@ msgstr ""
 "probeer weer. Indien u voortgaan om te probeer sal u selfs nog langer moet "
 "wag."
 
-#: ../libpurple/protocols/oscar/oscar.c:2065
 msgid "The SecurID key entered is invalid"
 msgstr "Die SecurID-sleutel wat getik is, is ongeldig"
 
-#: ../libpurple/protocols/oscar/oscar.c:2081
 msgid "Enter SecurID"
 msgstr "Tik SecurID"
 
-#: ../libpurple/protocols/oscar/oscar.c:2082
 msgid "Enter the 6 digit number from the digital display."
 msgstr "Tik die 6-syfer-nommer vanaf die digitale skerm."
 
-#: ../libpurple/protocols/oscar/oscar.c:2120
 msgid "Password sent"
 msgstr "Wagwoord gestuur"
 
-#: ../libpurple/protocols/oscar/oscar.c:2201
 msgid "Unable to initialize connection"
 msgstr "Kan nie verbinding inisialiseer nie"
 
-#: ../libpurple/protocols/oscar/oscar.c:2794
 msgid "Please authorize me so I can add you to my buddy list."
 msgstr "Magtig my gerus sodat ek u by my vriendelys kan voeg."
 
-#: ../libpurple/protocols/oscar/oscar.c:2864
-#: ../libpurple/protocols/oscar/oscar.c:2872
-#: ../libpurple/protocols/oscar/oscar.c:2999
-#: ../libpurple/protocols/oscar/oscar.c:5860
-#: ../libpurple/protocols/yahoo/libymsg.c:1285
 msgid "No reason given."
 msgstr "Geen rede gegee nie."
 
-#: ../libpurple/protocols/oscar/oscar.c:2871
 msgid "Authorization Denied Message:"
 msgstr "Magtiging gewyer-boodskap:"
 
-#: ../libpurple/protocols/oscar/oscar.c:2999
 #, c-format
 msgid ""
 "The user %u has denied your request to add them to your buddy list for the "
@@ -10579,18 +7349,15 @@ msgstr ""
 "vir die volgende rede:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:3000
 msgid "ICQ authorization denied."
 msgstr "ICQ-magtiging geweier."
 
 #. Someone has granted you authorization
-#: ../libpurple/protocols/oscar/oscar.c:3007
 #, 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:3015
 #, c-format
 msgid ""
 "You have received a special message\n"
@@ -10603,7 +7370,6 @@ msgstr ""
 "Van: %s [%s]\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:3023
 #, c-format
 msgid ""
 "You have received an ICQ page\n"
@@ -10616,7 +7382,6 @@ msgstr ""
 "Van: %s [%s]\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:3031
 #, c-format
 msgid ""
 "You have received an ICQ email from %s [%s]\n"
@@ -10629,49 +7394,41 @@ msgstr ""
 "Boodskap is:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:3065
 #, 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:3073
 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:3078 ../pidgin/gtkroomlist.c:325
-#: ../pidgin/plugins/disco/gtkdisco.c:699
 msgid "_Add"
 msgstr "_Voeg by"
 
-#: ../libpurple/protocols/oscar/oscar.c:3079
 msgid "_Decline"
 msgstr "_Weier"
 
-#: ../libpurple/protocols/oscar/oscar.c:3215
 #, 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:3224
 #, 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:3233
 #, c-format
 msgid ""
 "You missed %hu message from %s because the rate limit has been exceeded."
 msgid_plural ""
 "You missed %hu messages from %s because the rate limit has been exceeded."
-msgstr[0] "U het %hu kitsboodskap vanaf %s gemis omdat die koerslimiet oorskry is."
+msgstr[0] ""
+"U het %hu kitsboodskap vanaf %s gemis omdat die koerslimiet oorskry is."
 msgstr[1] ""
 "U het %hu kitsboodskappe vanaf %s gemis omdat die koerslimiet oorskry is."
 
-#: ../libpurple/protocols/oscar/oscar.c:3242
 #, c-format
 msgid ""
 "You missed %hu message from %s because his/her warning level is too high."
@@ -10684,7 +7441,6 @@ msgstr[1] ""
 "U het %hu kitsboodskappe vanaf %s gemis omdat sy/haar waarskuwingsvlak te "
 "hoog is."
 
-#: ../libpurple/protocols/oscar/oscar.c:3251
 #, c-format
 msgid "You missed %hu message from %s because your warning level is too high."
 msgid_plural ""
@@ -10694,61 +7450,48 @@ msgstr[1] ""
 msgstr[1] ""
 "U het %hu kitsboodskappe vanaf %s gemis omdat u waarskuwingsvlak te hoog is."
 
-#: ../libpurple/protocols/oscar/oscar.c:3260
 #, c-format
 msgid "You missed %hu message from %s for an unknown reason."
 msgid_plural "You missed %hu messages from %s for an unknown reason."
 msgstr[0] "U het %hu kitsboodskap vanaf %s gemis vir 'n onbekende rede."
 msgstr[1] "U het %hu kitsboodskappe vanaf %s gemis vir 'n onbekende rede."
 
-#: ../libpurple/protocols/oscar/oscar.c:3442
 #, c-format
 msgid "Unable to send message: %s (%s)"
 msgstr "Kan nie boodskap stuur nie: %s (%s)"
 
-#: ../libpurple/protocols/oscar/oscar.c:3445
 #, c-format
 msgid "Unable to send message: %s"
 msgstr "Kan nie boodskap stuur nie: %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:3450
 #, c-format
 msgid "Unable to send message to %s: %s (%s)"
 msgstr "Kan nie boodskap aan %s stuur nie: %s (%s)"
 
-#: ../libpurple/protocols/oscar/oscar.c:3454
 #, c-format
 msgid "Unable to send message to %s: %s"
 msgstr "Kan nie boodskap aan %s stuur nie: %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:3523
 #, c-format
 msgid "User information not available: %s"
 msgstr "Gebruikerinligting nie beskikbaar nie: %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:3523
 msgid "Unknown reason."
 msgstr "Onbekende rede."
 
-#: ../libpurple/protocols/oscar/oscar.c:3560
 msgid "Online Since"
 msgstr "Aanlyn sedert"
 
-#: ../libpurple/protocols/oscar/oscar.c:3565
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1186
 msgid "Member Since"
 msgstr "Lid sedert"
 
-#: ../libpurple/protocols/oscar/oscar.c:3570
 msgid "Capabilities"
 msgstr "Vermo?ns"
 
-#: ../libpurple/protocols/oscar/oscar.c:3617
 msgid "Your AIM connection may be lost."
 msgstr "U AIM-koppeling is dalk ontkoppel."
 
 #. The conversion failed!
-#: ../libpurple/protocols/oscar/oscar.c:3805
 msgid ""
 "[Unable to display a message from this user because it contained invalid "
 "characters.]"
@@ -10756,74 +7499,56 @@ msgstr ""
 "[Kon nie 'n boodskap van hierdie gebruiker wys nie omdat dit ongeldige "
 "karakters bevat.]"
 
-#: ../libpurple/protocols/oscar/oscar.c:4018
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "U is uit geselsiekamer %s ontkoppel."
 
-#: ../libpurple/protocols/oscar/oscar.c:4255
-#: ../libpurple/protocols/silc/util.c:592
-#: ../libpurple/protocols/silc10/util.c:586
 msgid "Mobile Phone"
 msgstr "Selfoon"
 
-#: ../libpurple/protocols/oscar/oscar.c:4284
 msgid "Personal Web Page"
 msgstr "Persoonlike webblad"
 
 #. aim_userinfo_t
 #. strip_html_tags
-#: ../libpurple/protocols/oscar/oscar.c:4292
 msgid "Additional Information"
 msgstr "Ekstra inligting"
 
-#: ../libpurple/protocols/oscar/oscar.c:4301
-#: ../libpurple/protocols/oscar/oscar.c:4309
 msgid "Zip Code"
 msgstr "Poskode"
 
-#: ../libpurple/protocols/oscar/oscar.c:4312
 msgid "Work Information"
 msgstr "Werkinligting"
 
-#: ../libpurple/protocols/oscar/oscar.c:4315
 msgid "Division"
 msgstr "Afdeling"
 
-#: ../libpurple/protocols/oscar/oscar.c:4316
 msgid "Position"
 msgstr "Posisie"
 
-#: ../libpurple/protocols/oscar/oscar.c:4320
 msgid "Web Page"
 msgstr "Webblad"
 
-#: ../libpurple/protocols/oscar/oscar.c:4378
 msgid "Pop-Up Message"
 msgstr "Opspring-boodskap"
 
-#: ../libpurple/protocols/oscar/oscar.c:4418
 #, c-format
 msgid "The following username is associated with %s"
 msgid_plural "The following usernames 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:4449
 #, c-format
 msgid "No results found for email address %s"
 msgstr "Geen resultate gekry vir e-posadres %s nie"
 
-#: ../libpurple/protocols/oscar/oscar.c:4470
 #, c-format
 msgid "You should receive an email asking to confirm %s."
 msgstr "U behoort 'n e-pos te ontvang wat vra dat u %s bevestig."
 
-#: ../libpurple/protocols/oscar/oscar.c:4472
 msgid "Account Confirmation Requested"
 msgstr "Rekening-bevestiging vereis"
 
-#: ../libpurple/protocols/oscar/oscar.c:4505
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format username because the requested name differs "
@@ -10832,12 +7557,11 @@ msgstr ""
 "Fout 0x%04x: Kan nie die skermnaam formateer nie omdat die aangevraagde "
 "skermnaam van die oorspronklike verskil."
 
-#: ../libpurple/protocols/oscar/oscar.c:4507
 #, c-format
 msgid "Error 0x%04x: Unable to format username because it is invalid."
-msgstr "Fout 0x%04x: Kan nie die skermnaam formateer nie omdat dit ongeldig is."
+msgstr ""
+"Fout 0x%04x: Kan nie die skermnaam formateer nie omdat dit ongeldig is."
 
-#: ../libpurple/protocols/oscar/oscar.c:4509
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format username because the requested name is too "
@@ -10846,7 +7570,6 @@ msgstr ""
 "Fout 0x%04x: Kan nie die skermnaam formateer nie omdat die aangevraagde "
 "skermnaam te lank is."
 
-#: ../libpurple/protocols/oscar/oscar.c:4511
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change email address because there is already a "
@@ -10855,7 +7578,6 @@ msgstr ""
 "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:4513
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change email address because the given address has "
@@ -10864,7 +7586,6 @@ msgstr ""
 "Fout 0x%04x: Kon nie e-posadres verander nie omdat die gegewe adres te veel "
 "skermname daarmee geassosieer het."
 
-#: ../libpurple/protocols/oscar/oscar.c:4515
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change email address because the given address is "
@@ -10873,36 +7594,29 @@ msgstr ""
 "Fout 0x%04x: Kon nie e-posadres verander nie omdat die gegewe adres ongeldig "
 "is."
 
-#: ../libpurple/protocols/oscar/oscar.c:4517
 #, c-format
 msgid "Error 0x%04x: Unknown error."
 msgstr "Fout 0x%04x: Onbekende fout."
 
-#: ../libpurple/protocols/oscar/oscar.c:4519
 msgid "Error Changing Account Info"
 msgstr "Kon nie rekeninginligting verander nie"
 
-#: ../libpurple/protocols/oscar/oscar.c:4525
 #, c-format
 msgid "The email address for %s is %s"
 msgstr "Die e-posadres vir %s is %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:4527
 msgid "Account Info"
 msgstr "Rekeninginligting"
 
-#: ../libpurple/protocols/oscar/oscar.c:4716
 msgid ""
 "Your IM Image was not sent. You must be Direct Connected to send IM Images."
 msgstr ""
 "U kitsboodskapprent is nie gestuur nie. U moet direk gekoppel wees om "
 "kitsboodskapprente te stuur."
 
-#: ../libpurple/protocols/oscar/oscar.c:4972
 msgid "Unable to set AIM profile."
 msgstr "Kan nie AIM-profiel instel nie."
 
-#: ../libpurple/protocols/oscar/oscar.c:4973
 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 "
@@ -10912,7 +7626,6 @@ msgstr ""
 "aanmeldprosedure afgehandel is.  U profiel is nog gedeaktiveer; probeer dit "
 "weer aktiveer wanneer u volledig gekoppel is."
 
-#: ../libpurple/protocols/oscar/oscar.c:4987
 #, c-format
 msgid ""
 "The maximum profile length of %d byte has been exceeded.  It has been "
@@ -10925,11 +7638,9 @@ msgstr[1] ""
 msgstr[1] ""
 "Die maksimum profiellengte van %d grepe is oorskry.  Dit is vir u afgesny."
 
-#: ../libpurple/protocols/oscar/oscar.c:4992
 msgid "Profile too long."
 msgstr "Profiel te lank."
 
-#: ../libpurple/protocols/oscar/oscar.c:5021
 #, c-format
 msgid ""
 "The maximum away message length of %d byte has been exceeded.  It has been "
@@ -10944,11 +7655,9 @@ msgstr[1] ""
 "Die maksimum wegboodskap-lengte van %d grepe is oorskry.  Dit is vir u "
 "afgesny."
 
-#: ../libpurple/protocols/oscar/oscar.c:5026
 msgid "Away message too long."
 msgstr "Weg-boodskap te lank."
 
-#: ../libpurple/protocols/oscar/oscar.c:5133
 #, c-format
 msgid ""
 "Unable to add the buddy %s because the username is invalid.  Usernames must "
@@ -10959,11 +7668,9 @@ msgstr ""
 "Gebruikername 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:5269
 msgid "Unable to Retrieve Buddy List"
 msgstr "Kan nie vriendelys haal nie"
 
-#: ../libpurple/protocols/oscar/oscar.c:5270
 msgid ""
 "The AIM servers were temporarily unable to send your buddy list.  Your buddy "
 "list is not lost, and will probably become available in a few minutes."
@@ -10971,15 +7678,9 @@ msgstr ""
 "Die AIM-bedieners kan tydelik nie u vriendelys stuur nie.  U vriendelys is "
 "nie verlore nie, en sal waarskynlik na 'n paar minute weer beskikbaar word."
 
-#: ../libpurple/protocols/oscar/oscar.c:5457
-#: ../libpurple/protocols/oscar/oscar.c:5459
-#: ../libpurple/protocols/oscar/oscar.c:5714
-#: ../libpurple/protocols/oscar/oscar.c:5715
-#: ../libpurple/protocols/oscar/oscar.c:5720
 msgid "Orphans"
 msgstr "Wesies"
 
-#: ../libpurple/protocols/oscar/oscar.c:5631
 #, c-format
 msgid ""
 "Unable to add the buddy %s because you have too many buddies in your buddy "
@@ -10988,17 +7689,13 @@ msgstr ""
 "Kan nie die vriend %s byvoeg nie omdat u te veel vriende in u vriendelys "
 "het.  Verwyder gerus een en probeer weer."
 
-#: ../libpurple/protocols/oscar/oscar.c:5631
-#: ../libpurple/protocols/oscar/oscar.c:5646
 msgid "(no name)"
 msgstr "(geen naam)"
 
-#: ../libpurple/protocols/oscar/oscar.c:5645
 #, c-format
 msgid "Unable to add the buddy %s for an unknown reason."
 msgstr "Kan nie die vriend %s byvoeg nie, om 'n onbekende rede."
 
-#: ../libpurple/protocols/oscar/oscar.c:5770
 #, c-format
 msgid ""
 "The user %s has given you permission to add him or her to your buddy list.  "
@@ -11007,23 +7704,19 @@ msgstr ""
 "Die gebruiker %s het u toestemming gegee om u by hul vriendelys te voeg.  "
 "Wil u hulle byvoeg?"
 
-#: ../libpurple/protocols/oscar/oscar.c:5778
 msgid "Authorization Given"
 msgstr "Magtiging gegee"
 
 #. Granted
-#: ../libpurple/protocols/oscar/oscar.c:5856
 #, 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:5857
 msgid "Authorization Granted"
 msgstr "Magtiging toegestaan"
 
 #. Denied
-#: ../libpurple/protocols/oscar/oscar.c:5860
 #, c-format
 msgid ""
 "The user %s has denied your request to add them to your buddy list for the "
@@ -11034,43 +7727,34 @@ msgstr ""
 "vir die volgende rede:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:5861
 msgid "Authorization Denied"
 msgstr "Magtiging geweier"
 
-#: ../libpurple/protocols/oscar/oscar.c:5899
 msgid "_Exchange:"
 msgstr "_Uitruiling:"
 
-#: ../libpurple/protocols/oscar/oscar.c:6014
 msgid "Your IM Image was not sent. You cannot send IM Images in AIM chats."
 msgstr ""
 "U kitsboodskapprent is nie gestuur nie. U kan nie kitsboodskapprente in AIM-"
 "geselsies stuur nie."
 
-#: ../libpurple/protocols/oscar/oscar.c:6307
 msgid "iTunes Music Store Link"
 msgstr "iTunes Music Store-skakel"
 
-#: ../libpurple/protocols/oscar/oscar.c:6354
 msgid "Lunch"
 msgstr "Middagete"
 
-#: ../libpurple/protocols/oscar/oscar.c:6481
 #, c-format
 msgid "Buddy Comment for %s"
 msgstr "Vriendkommentaar vir %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:6482
 msgid "Buddy Comment:"
 msgstr "Vriendkommentaar:"
 
-#: ../libpurple/protocols/oscar/oscar.c:6531
 #, c-format
 msgid "You have selected to open a Direct IM connection with %s."
 msgstr "U het gekies om 'n direkte kitsboodskapkoppeling met %s te open."
 
-#: ../libpurple/protocols/oscar/oscar.c:6535
 msgid ""
 "Because this reveals your IP address, it may be considered a security risk.  "
 "Do you wish to continue?"
@@ -11078,73 +7762,55 @@ msgstr ""
 "Omdat dit u IP-adres bekend maak, kan dit 'n sekuriteitsrisiko wees.  Wil u "
 "voortgaan?"
 
-#: ../libpurple/protocols/oscar/oscar.c:6541
-#: ../libpurple/protocols/oscar/peer.c:1063
 msgid "C_onnect"
 msgstr "_Verbind"
 
-#: ../libpurple/protocols/oscar/oscar.c:6579
 msgid "You closed the connection."
 msgstr "U het die koppeling toegemaak."
 
-#: ../libpurple/protocols/oscar/oscar.c:6634
 msgid "Get AIM Info"
 msgstr "Kry AIM-inligting"
 
 #. We only do this if the user is in our buddy list
-#: ../libpurple/protocols/oscar/oscar.c:6643
 msgid "Edit Buddy Comment"
 msgstr "Wysig vriendkommentaar"
 
-#: ../libpurple/protocols/oscar/oscar.c:6651
 msgid "Get X-Status Msg"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:6668
 msgid "End Direct IM Session"
 msgstr "Be?indig direkte geselssessie"
 
-#: ../libpurple/protocols/oscar/oscar.c:6674
 msgid "Direct IM"
 msgstr "Direkte kitsboodskap"
 
-#: ../libpurple/protocols/oscar/oscar.c:6701
 msgid "Re-request Authorization"
 msgstr "Herversoek magtiging"
 
-#: ../libpurple/protocols/oscar/oscar.c:6760
 msgid "Require authorization"
 msgstr "Vereis magtiging"
 
-#: ../libpurple/protocols/oscar/oscar.c:6763
 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:6768
 msgid "ICQ Privacy Options"
 msgstr "ICQ-privaatheidopsies"
 
-#: ../libpurple/protocols/oscar/oscar.c:6788
 msgid "The new formatting is invalid."
 msgstr "Die nuwe formatering ongeldig."
 
-#: ../libpurple/protocols/oscar/oscar.c:6789
 msgid "Username formatting can change only capitalization and whitespace."
 msgstr "gebruikernaam-formatering kan net hoofletters en spasies verander."
 
-#: ../libpurple/protocols/oscar/oscar.c:6842
 msgid "Change Address To:"
 msgstr "Verander adres na:"
 
-#: ../libpurple/protocols/oscar/oscar.c:6887
 msgid "<i>you are not waiting for authorization</i>"
 msgstr "<i>u wag nie vir magtiging nie</i>"
 
-#: ../libpurple/protocols/oscar/oscar.c:6890
 msgid "You are awaiting authorization from the following buddies"
 msgstr "U wag op magtiging van die volgende vriende"
 
-#: ../libpurple/protocols/oscar/oscar.c:6891
 msgid ""
 "You can re-request authorization from these buddies by right-clicking on "
 "them and selecting \"Re-request Authorization.\""
@@ -11152,71 +7818,55 @@ msgstr ""
 "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:6908
 msgid "Find Buddy by Email"
 msgstr "Vind vriend volgens e-pos"
 
-#: ../libpurple/protocols/oscar/oscar.c:6909
 msgid "Search for a buddy by email address"
 msgstr "Soek vir 'n vriend volgens e-posadres"
 
-#: ../libpurple/protocols/oscar/oscar.c:6910
 msgid "Type the email address of the buddy you are searching for."
 msgstr "Gee die e-posadres van die vriend waarvoor u soek."
 
-#: ../libpurple/protocols/oscar/oscar.c:6913
 msgid "_Search"
 msgstr "_Soek"
 
-#: ../libpurple/protocols/oscar/oscar.c:7071
 msgid "Set User Info (web)..."
 msgstr "Stel gebruikerinligting (web)..."
 
 #. This only happens when connecting with the old-style BUCP login
-#: ../libpurple/protocols/oscar/oscar.c:7083
 msgid "Change Password (web)"
 msgstr "Verander wagwoord (web)"
 
-#: ../libpurple/protocols/oscar/oscar.c:7090
 msgid "Configure IM Forwarding (web)"
 msgstr "Konfigureer kitsboodskapaanstuur (web)"
 
 #. ICQ actions
-#: ../libpurple/protocols/oscar/oscar.c:7100
 msgid "Set Privacy Options..."
 msgstr "Stel privaatheidopsies..."
 
 #. AIM actions
-#: ../libpurple/protocols/oscar/oscar.c:7107
 msgid "Confirm Account"
 msgstr "Bevestig rekening"
 
-#: ../libpurple/protocols/oscar/oscar.c:7111
 msgid "Display Currently Registered Email Address"
 msgstr "Wys e-posadres wat tans geregistreer is"
 
-#: ../libpurple/protocols/oscar/oscar.c:7115
 msgid "Change Currently Registered Email Address..."
 msgstr "Verander e-posadres wat tans geregistreer is..."
 
-#: ../libpurple/protocols/oscar/oscar.c:7122
 msgid "Show Buddies Awaiting Authorization"
 msgstr "Wys vriende wat op magtiging wag"
 
-#: ../libpurple/protocols/oscar/oscar.c:7128
 msgid "Search for Buddy by Email Address..."
 msgstr "Soek vir vriend met e-posadres..."
 
-#: ../libpurple/protocols/oscar/oscar.c:7133
 msgid "Search for Buddy by Information"
 msgstr "Soek vir vriend met inligting"
 
-#: ../libpurple/protocols/oscar/oscar.c:7327
 #, fuzzy
 msgid "Use clientLogin"
 msgstr "Gebruiker is nie aangemeld nie"
 
-#: ../libpurple/protocols/oscar/oscar.c:7332
 msgid ""
 "Always use AIM/ICQ proxy server for\n"
 "file transfers and direct IM (slower,\n"
@@ -11226,30 +7876,24 @@ msgstr ""
 "l?eroordrag en direkte kitsboodskappe \n"
 "(stadiger, maar maak nie u IP-adres bekend nie)"
 
-#: ../libpurple/protocols/oscar/oscar.c:7337
 msgid "Allow multiple simultaneous logins"
 msgstr "Laat veelvoudige gelyktydige aanmeldings toe"
 
-#: ../libpurple/protocols/oscar/peer.c:706
 #, 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 koppel vir direkte kitsboodskap."
 
-#: ../libpurple/protocols/oscar/peer.c:800
 #, c-format
 msgid "Attempting to connect to %s:%hu."
 msgstr "Probeer tans om aan %s:%hu te koppel."
 
-#: ../libpurple/protocols/oscar/peer.c:874
 msgid "Attempting to connect via proxy server."
 msgstr "Probeer tans om via instaanbediener te koppel."
 
-#: ../libpurple/protocols/oscar/peer.c:1051
 #, c-format
 msgid "%s has just asked to directly connect to %s"
 msgstr "%s het pas gevra om direk aan %s te koppel"
 
-#: ../libpurple/protocols/oscar/peer.c:1055
 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 "
@@ -11259,498 +7903,349 @@ msgstr ""
 "kitsboodskapprente.  Omdat u IP-adres bekend gemaak sal word, kan dit 'n "
 "privaatheidrisiko wees."
 
-#: ../libpurple/protocols/qq/buddy_info.c:42
 msgid "Aquarius"
 msgstr "Waterdraer"
 
-#: ../libpurple/protocols/qq/buddy_info.c:42
 msgid "Pisces"
 msgstr "Visse"
 
-#: ../libpurple/protocols/qq/buddy_info.c:42
 msgid "Aries"
 msgstr "Ram"
 
-#: ../libpurple/protocols/qq/buddy_info.c:42
 msgid "Taurus"
 msgstr "Stier"
 
-#: ../libpurple/protocols/qq/buddy_info.c:43
 msgid "Gemini"
 msgstr "Tweeling"
 
-#: ../libpurple/protocols/qq/buddy_info.c:43
 msgid "Cancer"
 msgstr "Krap"
 
-#: ../libpurple/protocols/qq/buddy_info.c:43
 msgid "Leo"
 msgstr "Leeu"
 
-#: ../libpurple/protocols/qq/buddy_info.c:43
 msgid "Virgo"
 msgstr "Maagd"
 
-#: ../libpurple/protocols/qq/buddy_info.c:43
 msgid "Libra"
 msgstr "Weegskaal"
 
-#: ../libpurple/protocols/qq/buddy_info.c:44
 msgid "Scorpio"
 msgstr "Skerpioen"
 
-#: ../libpurple/protocols/qq/buddy_info.c:44
 msgid "Sagittarius"
 msgstr "Boogskutter"
 
-#: ../libpurple/protocols/qq/buddy_info.c:44
 msgid "Capricorn"
 msgstr "Steenbok"
 
-#: ../libpurple/protocols/qq/buddy_info.c:49
 msgid "Rat"
 msgstr "Rot"
 
-#: ../libpurple/protocols/qq/buddy_info.c:49
 msgid "Ox"
 msgstr "Os"
 
-#: ../libpurple/protocols/qq/buddy_info.c:49
 msgid "Tiger"
 msgstr "Tier"
 
-#: ../libpurple/protocols/qq/buddy_info.c:49
 msgid "Rabbit"
 msgstr "Haas"
 
-#: ../libpurple/protocols/qq/buddy_info.c:50
 msgid "Dragon"
 msgstr "Draak"
 
-#: ../libpurple/protocols/qq/buddy_info.c:50
 msgid "Snake"
 msgstr "Slang"
 
-#: ../libpurple/protocols/qq/buddy_info.c:50
 msgid "Horse"
 msgstr "Perd"
 
-#: ../libpurple/protocols/qq/buddy_info.c:50
 msgid "Goat"
 msgstr "Bok"
 
-#: ../libpurple/protocols/qq/buddy_info.c:50
 msgid "Monkey"
 msgstr "Aap"
 
-#: ../libpurple/protocols/qq/buddy_info.c:51
 msgid "Rooster"
 msgstr "Haan"
 
-#: ../libpurple/protocols/qq/buddy_info.c:51
 msgid "Dog"
 msgstr "Hond"
 
-#: ../libpurple/protocols/qq/buddy_info.c:51
 msgid "Pig"
 msgstr "Vark"
 
-#: ../libpurple/protocols/qq/buddy_info.c:56
-#: ../pidgin/plugins/disco/gtkdisco.c:492
 msgid "Other"
 msgstr "Ander"
 
-#: ../libpurple/protocols/qq/buddy_info.c:61
 msgid "Visible"
 msgstr "Sigbaar"
 
-#: ../libpurple/protocols/qq/buddy_info.c:61
 msgid "Friend Only"
 msgstr ""
 
-#: ../libpurple/protocols/qq/buddy_info.c:61
-#: ../libpurple/protocols/qq/buddy_info.c:66
 msgid "Private"
 msgstr "Privaat"
 
-#: ../libpurple/protocols/qq/buddy_info.c:111
 msgid "QQ Number"
 msgstr "QQ-nommer"
 
-#: ../libpurple/protocols/qq/buddy_info.c:113
 msgid "Country/Region"
 msgstr "Land/streek"
 
-#: ../libpurple/protocols/qq/buddy_info.c:114
 msgid "Province/State"
 msgstr "Provinsie/deelstaat"
 
-#: ../libpurple/protocols/qq/buddy_info.c:115
 msgid "Zipcode"
 msgstr "Poskode"
 
-#: ../libpurple/protocols/qq/buddy_info.c:117
 msgid "Phone Number"
 msgstr "Foonnommer"
 
-#: ../libpurple/protocols/qq/buddy_info.c:129
 #, fuzzy
 msgid "Authorize adding"
 msgstr "Magtig vriend?"
 
-#: ../libpurple/protocols/qq/buddy_info.c:133
 msgid "Cellphone Number"
 msgstr "Selfoonnommer"
 
-#: ../libpurple/protocols/qq/buddy_info.c:135
 msgid "Personal Introduction"
 msgstr "Persoonlike inleiding"
 
-#: ../libpurple/protocols/qq/buddy_info.c:136
 msgid "City/Area"
 msgstr "Stad/area"
 
-#: ../libpurple/protocols/qq/buddy_info.c:140
 msgid "Publish Mobile"
 msgstr "Publiseer selnommer"
 
-#: ../libpurple/protocols/qq/buddy_info.c:141
 msgid "Publish Contact"
 msgstr "Publiseer kontak"
 
-#: ../libpurple/protocols/qq/buddy_info.c:142
 msgid "College"
 msgstr "Kollege"
 
-#: ../libpurple/protocols/qq/buddy_info.c:143
 msgid "Horoscope"
 msgstr "Horoskoop"
 
-#: ../libpurple/protocols/qq/buddy_info.c:144
 msgid "Zodiac"
 msgstr "Zodiac"
 
-#: ../libpurple/protocols/qq/buddy_info.c:145
 msgid "Blood"
 msgstr "Bloed"
 
-#: ../libpurple/protocols/qq/buddy_info.c:195
 msgid "True"
 msgstr "Waar"
 
-#: ../libpurple/protocols/qq/buddy_info.c:195
 msgid "False"
 msgstr "False"
 
-#: ../libpurple/protocols/qq/buddy_info.c:417
-#: ../libpurple/protocols/qq/buddy_info.c:418
-#: ../libpurple/protocols/qq/qq.c:791
 msgid "Modify Contact"
 msgstr "Wysig kontak"
 
-#: ../libpurple/protocols/qq/buddy_info.c:420
-#: ../libpurple/protocols/qq/buddy_info.c:421
-#: ../libpurple/protocols/qq/qq.c:788
 msgid "Modify Address"
 msgstr "Wysig adres"
 
-#: ../libpurple/protocols/qq/buddy_info.c:423
-#: ../libpurple/protocols/qq/buddy_info.c:424
-#: ../libpurple/protocols/qq/qq.c:785
 msgid "Modify Extended Information"
 msgstr "Wysig uitgebreide inligting"
 
-#: ../libpurple/protocols/qq/buddy_info.c:428
-#: ../libpurple/protocols/qq/buddy_info.c:429
-#: ../libpurple/protocols/qq/qq.c:782
 msgid "Modify Information"
 msgstr "Wysig inligting"
 
-#: ../libpurple/protocols/qq/buddy_info.c:442
 msgid "Update"
 msgstr "Werk by"
 
-#: ../libpurple/protocols/qq/buddy_info.c:462
 msgid "Could not change buddy information."
 msgstr "Kon nie vriendinligting verander nie."
 
-#: ../libpurple/protocols/qq/buddy_memo.c:81
-#: ../libpurple/protocols/silc/ops.c:1049
-#: ../libpurple/protocols/silc10/ops.c:1080
 msgid "Note"
 msgstr "Nota"
 
 #. callback
-#: ../libpurple/protocols/qq/buddy_memo.c:256
 #, fuzzy
 msgid "Buddy Memo"
 msgstr "Wysig adres"
 
-#: ../libpurple/protocols/qq/buddy_memo.c:257
 msgid "Change his/her memo as you like"
 msgstr ""
 
-#: ../libpurple/protocols/qq/buddy_memo.c:261
 #, fuzzy
 msgid "_Modify"
 msgstr "Wysig"
 
-#: ../libpurple/protocols/qq/buddy_memo.c:329
-#: ../libpurple/protocols/qq/buddy_memo.c:336
 #, fuzzy
 msgid "Memo Modify"
 msgstr "Wysig"
 
-#: ../libpurple/protocols/qq/buddy_memo.c:329
-#: ../libpurple/protocols/qq/buddy_memo.c:336
 #, fuzzy
 msgid "Server says:"
 msgstr "Bediener besig"
 
-#: ../libpurple/protocols/qq/buddy_memo.c:330
 msgid "Your request was accepted."
 msgstr ""
 
-#: ../libpurple/protocols/qq/buddy_memo.c:337
 msgid "Your request was rejected."
 msgstr ""
 
-#: ../libpurple/protocols/qq/buddy_opt.c:327
 #, c-format
 msgid "%u requires verification"
 msgstr "%u vereis magtiging"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:328
 msgid "Add buddy question"
 msgstr "Voeg vriendvraag by"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:329
 msgid "Enter answer here"
 msgstr "Gee antwoord hier"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:332
-#: ../libpurple/protocols/qq/buddy_opt.c:676
-#: ../libpurple/protocols/qq/group_join.c:149
 msgid "Send"
 msgstr "Stuur"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:453
 msgid "Invalid answer."
 msgstr "Ongeldige antwoord."
 
-#: ../libpurple/protocols/qq/buddy_opt.c:625
-#: ../libpurple/protocols/qq/group_opt.c:124
-#: ../libpurple/protocols/yahoo/libymsg.c:1284
 msgid "Authorization denied message:"
 msgstr "Magtiging gewyer-boodskap:"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:626
 msgid "Sorry, you're not my style."
 msgstr "Jammer, u's nie my tipe nie."
 
-#: ../libpurple/protocols/qq/buddy_opt.c:671
-#, c-format
 #, fuzzy, c-format
 msgid "%u needs authorization"
 msgstr "%u kort stawing"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:672
 #, fuzzy
 msgid "Add buddy authorize"
 msgstr "Voeg vriend by u lys?"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:673
 msgid "Enter request here"
 msgstr "Gee versoek hier"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:674
-#: ../libpurple/protocols/qq/group_join.c:148
 msgid "Would you be my friend?"
 msgstr "Sal u my vriend wees?"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:711
-#: ../libpurple/protocols/qq/buddy_opt.c:736
-#: ../libpurple/protocols/qq/buddy_opt.c:740
-#: ../libpurple/protocols/qq/buddy_opt.c:756
-#: ../libpurple/protocols/qq/buddy_opt.c:781
-#: ../libpurple/protocols/qq/buddy_opt.c:1257
 msgid "QQ Buddy"
 msgstr "QQ-vriend"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:711
 msgid "Add buddy"
 msgstr "Voeg vriend by"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:711
 msgid "Invalid QQ Number"
 msgstr "Ongeldige QQ-nommer"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:736
-#: ../libpurple/protocols/qq/buddy_opt.c:740
 #, fuzzy
 msgid "Failed sending authorize"
 msgstr "Magtig my asseblief!"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:755
 #, c-format
 msgid "Failed removing buddy %u"
 msgstr "Verwyder van vriend %u het misluk"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:780
-#, c-format
 #, fuzzy, c-format
 msgid "Failed removing me from %d's buddy list"
 msgstr "%s het u van sy of haar vriendelys verwyder."
 
-#: ../libpurple/protocols/qq/buddy_opt.c:993
-#: ../libpurple/protocols/qq/buddy_opt.c:1108
-#: ../libpurple/protocols/qq/buddy_opt.c:1234
-#: ../libpurple/protocols/qq/buddy_opt.c:1245
 msgid "No reason given"
 msgstr "Geen rede gegee nie"
 
 #. only need to get value
-#: ../libpurple/protocols/qq/buddy_opt.c:1138
 #, c-format
 msgid "You have been added by %s"
 msgstr "U is deur %s bygevoeg"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:1140
 msgid "Would you like to add him?"
 msgstr "Wil u hom byvoeg?"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:1254
 #, c-format
 msgid "Rejected by %s"
 msgstr "Geweier deur %s"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:1255
 #, c-format
 msgid "Message: %s"
 msgstr "Boodskap: %s"
 
-#: ../libpurple/protocols/qq/group.c:65
 msgid "ID: "
 msgstr "ID: "
 
-#: ../libpurple/protocols/qq/group.c:98
 msgid "Group ID"
 msgstr "Groep-ID"
 
-#: ../libpurple/protocols/qq/group.c:107
 msgid "QQ Qun"
 msgstr "QQ-qun"
 
-#: ../libpurple/protocols/qq/group.c:108
 msgid "Please enter Qun number"
 msgstr "Tik gerus die Qun-nommer"
 
-#: ../libpurple/protocols/qq/group.c:109
 #, fuzzy
 msgid "You can only search for permanent Qun\n"
 msgstr "U kan net vir permanente QQ-groepe soek\n"
 
-#: ../libpurple/protocols/qq/group_im.c:402
-#: ../libpurple/protocols/qq/group_im.c:406
-#: ../libpurple/protocols/qq/im.c:1287 ../libpurple/protocols/qq/im.c:1291
 msgid "(Invalid UTF-8 string)"
 msgstr "(Ongeldige UTF-8-string)"
 
-#: ../libpurple/protocols/qq/group_info.c:114
 msgid "Not member"
 msgstr "Nie 'n lid nie"
 
-#: ../libpurple/protocols/qq/group_info.c:117
-#: ../libpurple/protocols/qq/qq.c:341
 msgid "Member"
 msgstr "Lid"
 
-#: ../libpurple/protocols/qq/group_info.c:120
 msgid "Requesting"
 msgstr "Versoek tans"
 
-#: ../libpurple/protocols/qq/group_info.c:123
 msgid "Admin"
 msgstr "Admin"
 
 #. XXX: Should this be "Topic"?
-#: ../libpurple/protocols/qq/group_info.c:142
 msgid "Room Title"
 msgstr ""
 
-#: ../libpurple/protocols/qq/group_info.c:143
 msgid "Notice"
 msgstr "Kennisgewing"
 
-#: ../libpurple/protocols/qq/group_info.c:144
 msgid "Detail"
 msgstr "Detail"
 
-#: ../libpurple/protocols/qq/group_info.c:149
 msgid "Creator"
 msgstr "Skepper"
 
-#: ../libpurple/protocols/qq/group_info.c:153
 #, fuzzy
 msgid "About me"
 msgstr "Omtrent %s"
 
-#: ../libpurple/protocols/qq/group_info.c:157
 msgid "Category"
 msgstr "Kategorie"
 
-#: ../libpurple/protocols/qq/group_join.c:95
 msgid "The Qun does not allow others to join"
 msgstr "De Qun laat nie ander toe om aan te sluit nie"
 
-#: ../libpurple/protocols/qq/group_join.c:146
 msgid "Join QQ Qun"
 msgstr "Sluit by QQ Qun aan"
 
-#: ../libpurple/protocols/qq/group_join.c:147
 msgid "Input request here"
 msgstr "Gee versoek hier"
 
-#: ../libpurple/protocols/qq/group_join.c:222
-#, c-format
 #, fuzzy, c-format
 msgid "Successfully joined Qun %s (%u)"
 msgstr "U het qun-lid suksesvol gewysig"
 
-#: ../libpurple/protocols/qq/group_join.c:226
 #, fuzzy
 msgid "Successfully joined Qun"
 msgstr "U het qun-lid suksesvol gewysig"
 
-#: ../libpurple/protocols/qq/group_join.c:270
 #, c-format
 msgid "Qun %u denied from joining"
 msgstr ""
 
-#: ../libpurple/protocols/qq/group_join.c:271
-#: ../libpurple/protocols/qq/group_join.c:279
-#: ../libpurple/protocols/qq/group_join.c:331
-#: ../libpurple/protocols/qq/group_opt.c:348
-#: ../libpurple/protocols/qq/group_opt.c:445
-#: ../libpurple/protocols/qq/group_opt.c:482
 msgid "QQ Qun Operation"
 msgstr "QQ-qun-bewerking"
 
-#: ../libpurple/protocols/qq/group_join.c:271
-#: ../libpurple/protocols/qq/group_join.c:279
 msgid "Failed:"
 msgstr "Misluk:"
 
-#: ../libpurple/protocols/qq/group_join.c:279
 msgid "Join Qun, Unknown Reply"
 msgstr ""
 
-#: ../libpurple/protocols/qq/group_join.c:332
-#: ../libpurple/protocols/qq/qq.c:895
 msgid "Quit Qun"
 msgstr ""
 
-#: ../libpurple/protocols/qq/group_join.c:333
 msgid ""
 "Note, if you are the creator, \n"
 "this operation will eventually remove this Qun."
@@ -11758,256 +8253,196 @@ msgstr ""
 "Let wel, as u die skepper is, \n"
 "sal hierdie bewerking eindelik hierdie qun verwyder."
 
-#: ../libpurple/protocols/qq/group_opt.c:125
 msgid "Sorry, you are not our style"
 msgstr "Jammer, u's nie my tipe nie"
 
-#: ../libpurple/protocols/qq/group_opt.c:207
 #, fuzzy
 msgid "Successfully changed Qun members"
 msgstr "U het qun-lid suksesvol gewysig"
 
-#: ../libpurple/protocols/qq/group_opt.c:251
 #, fuzzy
 msgid "Successfully changed Qun information"
 msgstr "U het qun-inligting suksesvol gewysig"
 
-#: ../libpurple/protocols/qq/group_opt.c:349
 msgid "You have successfully created a Qun"
 msgstr "U het 'n qun suksesvol geskep"
 
-#: ../libpurple/protocols/qq/group_opt.c:350
 #, fuzzy
 msgid "Would you like to set up detailed information now?"
 msgstr "Wil u nou die gedetaileerde inligting opstel?"
 
-#: ../libpurple/protocols/qq/group_opt.c:354
 msgid "Setup"
 msgstr "Opstel"
 
-#: ../libpurple/protocols/qq/group_opt.c:425
-#, c-format
 #, fuzzy, c-format
 msgid "%u requested to join Qun %u for %s"
 msgstr "Gebruiker %d het versoek om by groep %d aan te sluit"
 
-#: ../libpurple/protocols/qq/group_opt.c:438
-#, c-format
 #, fuzzy, c-format
 msgid "%u request to join Qun %u"
 msgstr "Gebruiker %d het versoek om by groep %d aan te sluit"
 
-#: ../libpurple/protocols/qq/group_opt.c:480
-#, c-format
 #, fuzzy, c-format
 msgid "Failed to join Qun %u, operated by admin %u"
 msgstr "Kon nie vriend by geselsie laat aansluit nie"
 
-#: ../libpurple/protocols/qq/group_opt.c:522
 #, c-format
 msgid "<b>Joining Qun %u is approved by admin %u for %s</b>"
 msgstr ""
 
-#: ../libpurple/protocols/qq/group_opt.c:557
-#, c-format
 #, fuzzy, c-format
 msgid "<b>Removed buddy %u.</b>"
 msgstr "Verwyder vriend"
 
-#: ../libpurple/protocols/qq/group_opt.c:590
-#, c-format
 #, fuzzy, c-format
 msgid "<b>New buddy %u joined.</b>"
 msgstr "Verwyder vriend"
 
-#: ../libpurple/protocols/qq/qq.c:281
 #, c-format
 msgid "Unknown-%d"
 msgstr "Onbekend-%d"
 
-#: ../libpurple/protocols/qq/qq.c:335
 msgid "Level"
 msgstr "Vlak"
 
-#: ../libpurple/protocols/qq/qq.c:344
 msgid " VIP"
 msgstr " BBP"
 
-#: ../libpurple/protocols/qq/qq.c:347
 msgid " TCP"
 msgstr " TCP"
 
-#: ../libpurple/protocols/qq/qq.c:350
 #, fuzzy
 msgid " FromMobile"
 msgstr "Mobiel"
 
-#: ../libpurple/protocols/qq/qq.c:353
 #, fuzzy
 msgid " BindMobile"
 msgstr "Mobiel"
 
-#: ../libpurple/protocols/qq/qq.c:356
 msgid " Video"
 msgstr " Video"
 
-#: ../libpurple/protocols/qq/qq.c:360
 msgid " Zone"
 msgstr " Sone"
 
-#: ../libpurple/protocols/qq/qq.c:362 ../libpurple/protocols/qq/qq.c:375
 msgid "Flag"
 msgstr "Vlag"
 
-#: ../libpurple/protocols/qq/qq.c:370
 msgid "Ver"
 msgstr ""
 
-#: ../libpurple/protocols/qq/qq.c:460 ../libpurple/protocols/qq/qq.c:954
 msgid "Invalid name"
 msgstr "Ongeldige naam"
 
-#: ../libpurple/protocols/qq/qq.c:506
 msgid "Select icon..."
 msgstr "Kies ikoon..."
 
-#: ../libpurple/protocols/qq/qq.c:576
 #, c-format
 msgid "<b>Login time</b>: %d-%d-%d, %d:%d:%d<br>\n"
 msgstr "<b>Aanmeldtyd</b>: %d-%d-%d, %d:%d:%d<br>\n"
 
-#: ../libpurple/protocols/qq/qq.c:579
 #, c-format
 msgid "<b>Total Online Buddies</b>: %d<br>\n"
 msgstr "<b>Totale aantal vriende aanlyn</b>: %d<br>\n"
 
-#: ../libpurple/protocols/qq/qq.c:581
 #, c-format
 msgid "<b>Last Refresh</b>: %d-%d-%d, %d:%d:%d<br>\n"
 msgstr "<b>Vorige verfrissing</b>: %d-%d-%d, %d:%d:%d<br>\n"
 
-#: ../libpurple/protocols/qq/qq.c:587
 #, c-format
 msgid "<b>Server</b>: %s<br>\n"
 msgstr "<b>Bediener</b>: %s<br>\n"
 
-#: ../libpurple/protocols/qq/qq.c:588
-#, c-format
 #, fuzzy, c-format
 msgid "<b>Client Tag</b>: %s<br>\n"
 msgstr "<b>Aanmeldtyd</b>: %s<br>\n"
 
-#: ../libpurple/protocols/qq/qq.c:589
 #, c-format
 msgid "<b>Connection Mode</b>: %s<br>\n"
 msgstr "<b>Verbindingmodus</b>: %s<br>\n"
 
-#: ../libpurple/protocols/qq/qq.c:590
 #, c-format
 msgid "<b>My Internet IP</b>: %s:%d<br>\n"
 msgstr "<b>My internetadres</b>: %s:%d<br>\n"
 
-#: ../libpurple/protocols/qq/qq.c:594
 #, c-format
 msgid "<b>Sent</b>: %lu<br>\n"
 msgstr "<b>Gestuur</b>: %lu<br>\n"
 
-#: ../libpurple/protocols/qq/qq.c:595
 #, c-format
 msgid "<b>Resend</b>: %lu<br>\n"
 msgstr "<b>Stuur weer</b>: %lu<br>\n"
 
-#: ../libpurple/protocols/qq/qq.c:596
 #, c-format
 msgid "<b>Lost</b>: %lu<br>\n"
 msgstr "<b>Verlore</b>: %lu<br>\n"
 
-#: ../libpurple/protocols/qq/qq.c:597
 #, c-format
 msgid "<b>Received</b>: %lu<br>\n"
 msgstr "<b>Ontvang</b>: %lu<br>\n"
 
-#: ../libpurple/protocols/qq/qq.c:598
 #, c-format
 msgid "<b>Received Duplicate</b>: %lu<br>\n"
 msgstr "<b>Duplikaat ontvang</b>: %lu<br>\n"
 
-#: ../libpurple/protocols/qq/qq.c:605
 #, c-format
 msgid "<b>Time</b>: %d-%d-%d, %d:%d:%d<br>\n"
 msgstr "<b>Tyd</b>: %d-%d-%d, %d:%d:%d<br>\n"
 
-#: ../libpurple/protocols/qq/qq.c:610
 #, c-format
 msgid "<b>IP</b>: %s<br>\n"
 msgstr "<b>IP</b>: %s<br>\n"
 
-#: ../libpurple/protocols/qq/qq.c:615
 msgid "Login Information"
 msgstr "Aanmeldinligting"
 
-#: ../libpurple/protocols/qq/qq.c:631
 msgid "<p><b>Original Author</b>:<br>\n"
 msgstr ""
 
-#: ../libpurple/protocols/qq/qq.c:635
 msgid "<p><b>Code Contributors</b>:<br>\n"
 msgstr ""
 
-#: ../libpurple/protocols/qq/qq.c:651
 #, fuzzy
 msgid "<p><b>Lovely Patch Writers</b>:<br>\n"
 msgstr "<b>Vorige verfrissing</b>: %s<br>\n"
 
-#: ../libpurple/protocols/qq/qq.c:661
 #, fuzzy
 msgid "<p><b>Acknowledgement</b>:<br>\n"
 msgstr "<b>Gestuur</b>: %lu<br>\n"
 
-#: ../libpurple/protocols/qq/qq.c:673
 #, fuzzy
 msgid "<p><b>Scrupulous Testers</b>:<br>\n"
 msgstr "<b>Vorige verfrissing</b>: %s<br>\n"
 
-#: ../libpurple/protocols/qq/qq.c:680
 msgid "and more, please let me know... thank you!))"
 msgstr ""
 
-#: ../libpurple/protocols/qq/qq.c:682
 msgid "<p><i>And, all the boys in the backroom...</i><br>\n"
 msgstr ""
 
-#: ../libpurple/protocols/qq/qq.c:683
 msgid "<i>Feel free to join us!</i> :)"
 msgstr "<i>Sluit gerus by ons aan!</i> :)"
 
-#: ../libpurple/protocols/qq/qq.c:686
 #, c-format
 msgid "About OpenQ %s"
 msgstr "Omtrent OpenQ %s"
 
-#: ../libpurple/protocols/qq/qq.c:779
 msgid "Change Icon"
 msgstr "Verander ikoon"
 
-#: ../libpurple/protocols/qq/qq.c:794
 msgid "Change Password"
 msgstr "Verander wagwoord"
 
-#: ../libpurple/protocols/qq/qq.c:797
 msgid "Account Information"
 msgstr "Rekeninginligting"
 
-#: ../libpurple/protocols/qq/qq.c:800
 msgid "Update all QQ Quns"
 msgstr ""
 
-#: ../libpurple/protocols/qq/qq.c:803
 #, fuzzy
 msgid "About OpenQ"
 msgstr "Omtrent OpenQ"
 
-#: ../libpurple/protocols/qq/qq.c:869
 #, fuzzy
 msgid "Modify Buddy Memo"
 msgstr "Wysig adres"
@@ -12022,178 +8457,131 @@ msgstr "Wysig adres"
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/qq/qq.c:1063 ../libpurple/protocols/qq/qq.c:1065
 msgid "QQ Protocol Plugin"
 msgstr "QQ-protokol-inprop"
 
-#: ../libpurple/protocols/qq/qq.c:1103
 msgid "Auto"
 msgstr "Outomaties"
 
-#: ../libpurple/protocols/qq/qq.c:1120
 msgid "Select Server"
 msgstr "Kies bediener"
 
-#: ../libpurple/protocols/qq/qq.c:1124
 msgid "QQ2005"
 msgstr "QQ2005"
 
-#: ../libpurple/protocols/qq/qq.c:1129
 msgid "QQ2007"
 msgstr "QQ2007"
 
-#: ../libpurple/protocols/qq/qq.c:1134
 msgid "QQ2008"
 msgstr "QQ2008"
 
-#: ../libpurple/protocols/qq/qq.c:1141
 msgid "Connect by TCP"
 msgstr "Koppel met TCP"
 
-#: ../libpurple/protocols/qq/qq.c:1144
 msgid "Show server notice"
 msgstr "Wys bedienerkennisgewing"
 
-#: ../libpurple/protocols/qq/qq.c:1147
 msgid "Show server news"
 msgstr "Wys bedienernuus"
 
-#: ../libpurple/protocols/qq/qq.c:1150
 msgid "Show chat room when msg comes"
 msgstr ""
 
-#: ../libpurple/protocols/qq/qq.c:1153
 msgid "Keep alive interval (seconds)"
 msgstr "Wakkerhou-interval (sekondes)"
 
-#: ../libpurple/protocols/qq/qq.c:1156
 msgid "Update interval (seconds)"
 msgstr "Opdateringsinterval (sekondes)"
 
-#: ../libpurple/protocols/qq/qq_base.c:75
-#: ../libpurple/protocols/qq/qq_base.c:163
-#: ../libpurple/protocols/qq/qq_base.c:658
 msgid "Unable to decrypt server reply"
 msgstr "Kan nie bediener se antwoord dekripteer nie"
 
-#: ../libpurple/protocols/qq/qq_base.c:314
 #, c-format
 msgid "Failed requesting token, 0x%02X"
 msgstr ""
 
-#: ../libpurple/protocols/qq/qq_base.c:323
 #, c-format
 msgid "Invalid token len, %d"
 msgstr "Ongeldige tekenlengte, %d"
 
 #. extend redirect used in QQ2006
-#: ../libpurple/protocols/qq/qq_base.c:408
 msgid "Redirect_EX is not currently supported"
 msgstr ""
 
 #. need activation
 #. need activation
 #. need activation
-#: ../libpurple/protocols/qq/qq_base.c:419
-#: ../libpurple/protocols/qq/qq_base.c:1105
 #, fuzzy
 msgid "Activation required"
 msgstr "Registrasie vereis"
 
-#: ../libpurple/protocols/qq/qq_base.c:427
-#, c-format
 #, fuzzy, c-format
 msgid "Unknown reply code when logging in (0x%02X)"
 msgstr "Ongeldige teken-antwoordkode, 0x%02X"
 
-#: ../libpurple/protocols/qq/qq_base.c:750
 #, fuzzy
 msgid "Requesting captcha"
 msgstr "Vra %s se aandag aan..."
 
-#: ../libpurple/protocols/qq/qq_base.c:795
 #, fuzzy
 msgid "Checking captcha"
 msgstr "Vra %s se aandag aan..."
 
-#: ../libpurple/protocols/qq/qq_base.c:818
 #, fuzzy
 msgid "Failed captcha verification"
 msgstr "Yahoo!-stawing het misluk"
 
-#: ../libpurple/protocols/qq/qq_base.c:868
 #, fuzzy
 msgid "Captcha Image"
 msgstr "Stoor prent"
 
-#: ../libpurple/protocols/qq/qq_base.c:872
 #, fuzzy
 msgid "Enter code"
 msgstr "Tik wagwoord"
 
-#: ../libpurple/protocols/qq/qq_base.c:877
-#: ../libpurple/protocols/qq/qq_base.c:878
 #, fuzzy
 msgid "QQ Captcha Verification"
 msgstr "SSL-sertifikaatverifikasie"
 
-#: ../libpurple/protocols/qq/qq_base.c:879
 #, fuzzy
 msgid "Enter the text from the image"
 msgstr "Tik die naam van die groep"
 
-#: ../libpurple/protocols/qq/qq_base.c:1116
-#, c-format
 #, fuzzy, c-format
 msgid "Unknown reply when checking password (0x%02X)"
 msgstr "Ongeldige teken-antwoordkode, 0x%02X"
 
-#: ../libpurple/protocols/qq/qq_base.c:1262
-#: ../libpurple/protocols/qq/qq_base.c:1451
-#, c-format
 #, fuzzy, c-format
 msgid ""
 "Unknown reply code when logging in (0x%02X):\n"
 "%s"
 msgstr "Ongeldige teken-antwoordkode, 0x%02X"
 
-#: ../libpurple/protocols/qq/qq_network.c:370
-#: ../libpurple/protocols/qq/qq_network.c:496
 msgid "Socket error"
 msgstr "Sokfout"
 
-#: ../libpurple/protocols/qq/qq_network.c:793
 #, fuzzy
 msgid "Getting server"
 msgstr "Stel gebruikerinligting..."
 
-#: ../libpurple/protocols/qq/qq_network.c:798
 #, fuzzy
 msgid "Requesting token"
 msgstr "Versoek geweier"
 
-#: ../libpurple/protocols/qq/qq_network.c:871
-#: ../libpurple/protocols/simple/simple.c:1809
-#: ../libpurple/protocols/simple/simple.c:1910 ../libpurple/proxy.c:2171
 #, fuzzy
 msgid "Unable to resolve hostname"
 msgstr "Kan nie aan bediener koppel nie."
 
-#: ../libpurple/protocols/qq/qq_network.c:951
 #, fuzzy
 msgid "Invalid server or port"
 msgstr "Ongeldige fout"
 
-#: ../libpurple/protocols/qq/qq_network.c:955
 msgid "Connecting to server"
 msgstr "Koppel tans bediener"
 
-#: ../libpurple/protocols/qq/qq_process.c:76
 msgid "QQ Error"
 msgstr "QQ-fout"
 
-#: ../libpurple/protocols/qq/qq_process.c:115
-#, c-format
 #, fuzzy, c-format
 msgid ""
 "Server News:\n"
@@ -12202,8 +8590,6 @@ msgstr "QQ-bedienernuus"
 "%s"
 msgstr "QQ-bedienernuus"
 
-#: ../libpurple/protocols/qq/qq_process.c:153
-#, c-format
 #, fuzzy, c-format
 msgid "%s:%s"
 msgstr ""
@@ -12211,127 +8597,98 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../libpurple/protocols/qq/qq_process.c:423
 #, c-format
 msgid "From %s:"
 msgstr "Van %s:"
 
-#: ../libpurple/protocols/qq/qq_process.c:424
-#, c-format
 #, fuzzy, c-format
 msgid ""
 "Server notice From %s: \n"
 "%s"
 msgstr "Bedienerinstruksies: %s"
 
-#: ../libpurple/protocols/qq/qq_process.c:544
 #, fuzzy
 msgid "Unknown SERVER CMD"
 msgstr "Onbekende rede"
 
-#: ../libpurple/protocols/qq/qq_process.c:560
 #, c-format
 msgid ""
 "Error reply of %s(0x%02X)\n"
 "Room %u, reply 0x%02X"
 msgstr ""
 
-#: ../libpurple/protocols/qq/qq_process.c:563
 #, fuzzy
 msgid "QQ Qun Command"
 msgstr "Bevel"
 
-#: ../libpurple/protocols/qq/qq_process.c:954
 #, fuzzy
 msgid "Unable to decrypt login reply"
 msgstr "Kan nie bedienerinligting kry nie"
 
-#: ../libpurple/protocols/qq/qq_process.c:1025
 #, fuzzy
 msgid "Unknown LOGIN CMD"
 msgstr "Onbekende rede"
 
-#: ../libpurple/protocols/qq/qq_process.c:1153
 #, fuzzy
 msgid "Unknown CLIENT CMD"
 msgstr "Onbekende rede"
 
-#: ../libpurple/protocols/qq/send_file.c:702
 #, c-format
 msgid "%d has declined the file %s"
 msgstr "%d het die l?er %s geweier"
 
-#: ../libpurple/protocols/qq/send_file.c:705
-#: ../libpurple/protocols/qq/send_file.c:736
 msgid "File Send"
 msgstr "L?er stuur"
 
-#: ../libpurple/protocols/qq/send_file.c:733
 #, c-format
-#, c-format
 msgid "%d cancelled the transfer of %s"
 msgstr "%d het die oordrag van %s gekanselleer"
 
-#: ../libpurple/protocols/sametime/sametime.c:1311
 #, c-format
 msgid "<b>Group Title:</b> %s<br>"
 msgstr "<b>Groeptitel:</b> %s<br>"
 
-#: ../libpurple/protocols/sametime/sametime.c:1312
 #, c-format
 msgid "<b>Notes Group ID:</b> %s<br>"
 msgstr "<b>Notasgroep-ID:</b> %s<br>"
 
-#: ../libpurple/protocols/sametime/sametime.c:1314
 #, c-format
 msgid "Info for Group %s"
 msgstr "Inligting vir groep %s"
 
-#: ../libpurple/protocols/sametime/sametime.c:1316
 msgid "Notes Address Book Information"
 msgstr "Notes-adresboekinligting"
 
-#: ../libpurple/protocols/sametime/sametime.c:1348
 msgid "Invite Group to Conference..."
 msgstr "Nooi groep na konferensie..."
 
-#: ../libpurple/protocols/sametime/sametime.c:1358
 msgid "Get Notes Address Book Info"
 msgstr "Kry Notes-adresboekinligting"
 
-#: ../libpurple/protocols/sametime/sametime.c:1529
 msgid "Sending Handshake"
 msgstr "Stuur bladskud"
 
-#: ../libpurple/protocols/sametime/sametime.c:1534
 msgid "Waiting for Handshake Acknowledgement"
 msgstr "Wag vir bladskuderkenning"
 
-#: ../libpurple/protocols/sametime/sametime.c:1539
 msgid "Handshake Acknowledged, Sending Login"
 msgstr "Bladskud erken, stuur tans aanmelding"
 
-#: ../libpurple/protocols/sametime/sametime.c:1544
 msgid "Waiting for Login Acknowledgement"
 msgstr "Wag tans vir aanmelderkenning"
 
-#: ../libpurple/protocols/sametime/sametime.c:1549
 msgid "Login Redirected"
 msgstr "Aanmeld herlei"
 
-#: ../libpurple/protocols/sametime/sametime.c:1555
 msgid "Forcing Login"
 msgstr "Dwing aanmeld af"
 
-#: ../libpurple/protocols/sametime/sametime.c:1559
 msgid "Login Acknowledged"
 msgstr "Aanmeld erken"
 
-#: ../libpurple/protocols/sametime/sametime.c:1564
 msgid "Starting Services"
 msgstr "Begin tans dienste"
 
-#: ../libpurple/protocols/sametime/sametime.c:1701
 #, c-format
 msgid ""
 "A Sametime administrator has issued the following announcement on server %s"
@@ -12339,63 +8696,47 @@ msgstr ""
 "'n Sametime-administrateur het die volgende aankondiging op bediener %s "
 "uitgevaardig"
 
-#: ../libpurple/protocols/sametime/sametime.c:1706
 msgid "Sametime Administrator Announcement"
 msgstr "Sametime-administrateur se aankondiging"
 
-#: ../libpurple/protocols/sametime/sametime.c:1838
 #, c-format
 msgid "Announcement from %s"
 msgstr "Aankondiging van %s"
 
-#: ../libpurple/protocols/sametime/sametime.c:2012
 msgid "Conference Closed"
 msgstr "Konferensie gesluit"
 
-#: ../libpurple/protocols/sametime/sametime.c:2477
 msgid "Unable to send message: "
 msgstr "Kan nie boodskap stuur nie: "
 
-#: ../libpurple/protocols/sametime/sametime.c:2483
 #, c-format
 msgid "Unable to send message to %s:"
 msgstr "Kan nie boodskap aan %s stuur nie:"
 
-#: ../libpurple/protocols/sametime/sametime.c:3033
 msgid "Place Closed"
 msgstr "Plek gesluit"
 
-#: ../libpurple/protocols/sametime/sametime.c:3303
 msgid "Microphone"
 msgstr "Mikrofoon"
 
-#: ../libpurple/protocols/sametime/sametime.c:3304
 msgid "Speakers"
 msgstr "Luidsprekers"
 
-#: ../libpurple/protocols/sametime/sametime.c:3305
 msgid "Video Camera"
 msgstr "Videokamera"
 
-#: ../libpurple/protocols/sametime/sametime.c:3309
 msgid "File Transfer"
 msgstr "L?eroordrag"
 
-#: ../libpurple/protocols/sametime/sametime.c:3343
-#: ../libpurple/protocols/sametime/sametime.c:4224
 msgid "Supports"
 msgstr "Ondersteun"
 
-#: ../libpurple/protocols/sametime/sametime.c:3348
-#: ../libpurple/protocols/sametime/sametime.c:4198
 msgid "External User"
 msgstr "Eksterne gebruiker"
 
-#: ../libpurple/protocols/sametime/sametime.c:3454
 msgid "Create conference with user"
 msgstr "Skep konferensie met gebruiker"
 
-#: ../libpurple/protocols/sametime/sametime.c:3455
 #, c-format
 msgid ""
 "Please enter a topic for the new conference, and an invitation message to be "
@@ -12404,27 +8745,21 @@ msgstr ""
 "Tik gerus 'n onderwerp vir die nuwe konferensie, en 'n uitnodigingboodskap "
 "wat aan %s gestuur moet word"
 
-#: ../libpurple/protocols/sametime/sametime.c:3459
 msgid "New Conference"
 msgstr "Nuwe konferensie"
 
-#: ../libpurple/protocols/sametime/sametime.c:3461
 msgid "Create"
 msgstr "Skep"
 
-#: ../libpurple/protocols/sametime/sametime.c:3526
 msgid "Available Conferences"
 msgstr "Beskikbare konferensies"
 
-#: ../libpurple/protocols/sametime/sametime.c:3532
 msgid "Create New Conference..."
 msgstr "Skep nuwe konferensie..."
 
-#: ../libpurple/protocols/sametime/sametime.c:3539
 msgid "Invite user to a conference"
 msgstr "Nooi gebruiker na 'n konferensie"
 
-#: ../libpurple/protocols/sametime/sametime.c:3540
 #, c-format
 msgid ""
 "Select a conference from the list below to send an invite to user %s. Select "
@@ -12435,27 +8770,21 @@ msgstr ""
 "s te stuur. Kies \"Skep nuwe konferensie\" as u 'n nuwe konferensie wil skep "
 "om hierdie gebruiker na uit te nooi."
 
-#: ../libpurple/protocols/sametime/sametime.c:3545
 msgid "Invite to Conference"
 msgstr "Nooi na konferensie"
 
-#: ../libpurple/protocols/sametime/sametime.c:3636
 msgid "Invite to Conference..."
 msgstr "Nooi na konferensie..."
 
-#: ../libpurple/protocols/sametime/sametime.c:3641
 msgid "Send TEST Announcement"
 msgstr "Stuur TEST-aankondiging"
 
-#: ../libpurple/protocols/sametime/sametime.c:3660 ../pidgin/gtkconv.c:4650
 msgid "Topic:"
 msgstr "Onderwerp:"
 
-#: ../libpurple/protocols/sametime/sametime.c:3688
 msgid "No Sametime Community Server specified"
 msgstr "Geen Sametime-gemeenskapsbediener gespesifiseer nie"
 
-#: ../libpurple/protocols/sametime/sametime.c:3713
 #, c-format
 msgid ""
 "No host or IP address has been configured for the Meanwhile account %s. "
@@ -12464,42 +8793,31 @@ msgstr ""
 "Geen gasheer of IP-adres is vir die Intussen-rekening %s gekonfigureer nie. "
 "Tik gerus een hier onder om steeds aan te meld."
 
-#: ../libpurple/protocols/sametime/sametime.c:3718
 msgid "Meanwhile Connection Setup"
 msgstr "Opstelling van Intussen-koppeling"
 
-#: ../libpurple/protocols/sametime/sametime.c:3719
 msgid "No Sametime Community Server Specified"
 msgstr "Geen Sametime-gemeenskapsbediener gespesifiseer nie"
 
-#: ../libpurple/protocols/sametime/sametime.c:3721
 msgid "Connect"
 msgstr "Koppel"
 
-#: ../libpurple/protocols/sametime/sametime.c:4214
 #, c-format
 msgid "Unknown (0x%04x)<br>"
 msgstr "Onbekend (0x%04x)<br>"
 
-#: ../libpurple/protocols/sametime/sametime.c:4216
 msgid "Last Known Client"
 msgstr "Vorige bekende kli?nt"
 
-#: ../libpurple/protocols/sametime/sametime.c:4380
-#: ../libpurple/protocols/sametime/sametime.c:5584
 msgid "User Name"
 msgstr "Gebruikernaam"
 
-#: ../libpurple/protocols/sametime/sametime.c:4383
-#: ../libpurple/protocols/sametime/sametime.c:5587
 msgid "Sametime ID"
 msgstr "Sametime-ID"
 
-#: ../libpurple/protocols/sametime/sametime.c:4407
 msgid "An ambiguous user ID was entered"
 msgstr "'n Dubbelsinnige gebruiker-ID is getik"
 
-#: ../libpurple/protocols/sametime/sametime.c:4408
 #, c-format
 msgid ""
 "The identifier '%s' may possibly refer to any of the following users. Please "
@@ -12509,15 +8827,12 @@ msgstr ""
 "Kies gerus die korrekte gebruiker uit die lys hier onder om hulle by u "
 "vriendelys te voeg."
 
-#: ../libpurple/protocols/sametime/sametime.c:4413
 msgid "Select User"
 msgstr "Kies gebruiker"
 
-#: ../libpurple/protocols/sametime/sametime.c:4497
 msgid "Unable to add user: user not found"
 msgstr "Kan nie gebruiker byvoeg nie: gebruiker nie gevind nie"
 
-#: ../libpurple/protocols/sametime/sametime.c:4499
 #, c-format
 msgid ""
 "The identifier '%s' did not match any users in your Sametime community. This "
@@ -12526,7 +8841,6 @@ msgstr ""
 "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:5088
 #, c-format
 msgid ""
 "Error reading file %s: \n"
@@ -12535,63 +8849,48 @@ msgstr ""
 "Kon nie l?er %s lees nie: \n"
 "%s\n"
 
-#: ../libpurple/protocols/sametime/sametime.c:5224
 msgid "Remotely Stored Buddy List"
 msgstr "Afgele? gestoorde vriendelys"
 
-#: ../libpurple/protocols/sametime/sametime.c:5229
 msgid "Buddy List Storage Mode"
 msgstr "Vriendelys-stoormodus"
 
-#: ../libpurple/protocols/sametime/sametime.c:5232
 msgid "Local Buddy List Only"
 msgstr "Net plaaslike vriendelys"
 
-#: ../libpurple/protocols/sametime/sametime.c:5234
 msgid "Merge List from Server"
 msgstr "Voeg lys saam van bediener"
 
-#: ../libpurple/protocols/sametime/sametime.c:5236
 msgid "Merge and Save List to Server"
 msgstr "Voeg saam en stoor lys na bediener"
 
-#: ../libpurple/protocols/sametime/sametime.c:5238
 msgid "Synchronize List with Server"
 msgstr "Sinchroniseer lys met bediener"
 
-#: ../libpurple/protocols/sametime/sametime.c:5293
 #, c-format
 msgid "Import Sametime List for Account %s"
 msgstr "Voer Sametime-lys in vir rekening %s"
 
-#: ../libpurple/protocols/sametime/sametime.c:5333
 #, c-format
 msgid "Export Sametime List for Account %s"
 msgstr "Voer Sametime-lys uit vir rekening %s"
 
-#: ../libpurple/protocols/sametime/sametime.c:5387
 msgid "Unable to add group: group exists"
 msgstr "Kan nie groep byvoeg nie: groep bestaan"
 
-#: ../libpurple/protocols/sametime/sametime.c:5388
 #, c-format
 msgid "A group named '%s' already exists in your buddy list."
 msgstr "'n Groep genaam '%s' bestaan reeds in u vriendelys."
 
-#: ../libpurple/protocols/sametime/sametime.c:5391
-#: ../libpurple/protocols/sametime/sametime.c:5521
 msgid "Unable to add group"
 msgstr "Kan nie groep byvoeg nie"
 
-#: ../libpurple/protocols/sametime/sametime.c:5450
 msgid "Possible Matches"
 msgstr "Moontlike passings"
 
-#: ../libpurple/protocols/sametime/sametime.c:5466
 msgid "Notes Address Book group results"
 msgstr "Notes-adresboekgroepresultate"
 
-#: ../libpurple/protocols/sametime/sametime.c:5467
 #, c-format
 msgid ""
 "The identifier '%s' may possibly refer to any of the following Notes Address "
@@ -12602,15 +8901,12 @@ msgstr ""
 "adresboek-groepe. Kies gerus die korrekte gebruiker uit die lys hier onder "
 "om hulle by u vriendelys te voeg."
 
-#: ../libpurple/protocols/sametime/sametime.c:5472
 msgid "Select Notes Address Book"
 msgstr "Kies Notes-adresboekinligting"
 
-#: ../libpurple/protocols/sametime/sametime.c:5515
 msgid "Unable to add group: group not found"
 msgstr "Kan nie groep byvoeg nie: groep nie gevind nie"
 
-#: ../libpurple/protocols/sametime/sametime.c:5517
 #, c-format
 msgid ""
 "The identifier '%s' did not match any Notes Address Book groups in your "
@@ -12619,11 +8915,9 @@ msgstr ""
 "Die identifiseerder '%s' pas nie by enige Notes-adresboekgroepe in u "
 "Sametime-gemeenskap nie."
 
-#: ../libpurple/protocols/sametime/sametime.c:5558
 msgid "Notes Address Book Group"
 msgstr "Notes-adresboekgroep"
 
-#: ../libpurple/protocols/sametime/sametime.c:5559
 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."
@@ -12631,12 +8925,10 @@ msgstr ""
 "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:5608
 #, c-format
 msgid "Search results for '%s'"
 msgstr "Soekresultate vir '%s'"
 
-#: ../libpurple/protocols/sametime/sametime.c:5609
 #, c-format
 msgid ""
 "The identifier '%s' may possibly refer to any of the following users. You "
@@ -12647,30 +8939,24 @@ msgstr ""
 "kan hierdie gebruikers by u vriendelys voeg of vir hulle boodskappe stuur "
 "met die aksieknoppies hier onder."
 
-#: ../libpurple/protocols/sametime/sametime.c:5616 ../pidgin/gtknotify.c:973
 msgid "Search Results"
 msgstr "Soekresultate"
 
-#: ../libpurple/protocols/sametime/sametime.c:5641
 msgid "No matches"
 msgstr "Geen passing nie"
 
-#: ../libpurple/protocols/sametime/sametime.c:5642
 #, 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 Sametime-"
 "gemeenskap nie."
 
-#: ../libpurple/protocols/sametime/sametime.c:5646
 msgid "No Matches"
 msgstr "Geen passing nie"
 
-#: ../libpurple/protocols/sametime/sametime.c:5683
 msgid "Search for a user"
 msgstr "Soek vir 'n gebruiker"
 
-#: ../libpurple/protocols/sametime/sametime.c:5684
 msgid ""
 "Enter a name or partial ID in the field below to search for matching users "
 "in your Sametime community."
@@ -12678,115 +8964,59 @@ msgstr ""
 "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:5687
 msgid "User Search"
 msgstr "Gebruikersoektog"
 
-#: ../libpurple/protocols/sametime/sametime.c:5700
 msgid "Import Sametime List..."
 msgstr "Voer Sametimelys in..."
 
-#: ../libpurple/protocols/sametime/sametime.c:5704
 msgid "Export Sametime List..."
 msgstr "Voer Sametimelys uit..."
 
-#: ../libpurple/protocols/sametime/sametime.c:5708
 msgid "Add Notes Address Book Group..."
 msgstr "Voeg Notes-adresboekgroep by..."
 
-#: ../libpurple/protocols/sametime/sametime.c:5712
 msgid "User Search..."
 msgstr "Gebruikersoektog..."
 
-#: ../libpurple/protocols/sametime/sametime.c:5818
 msgid "Force login (ignore server redirects)"
 msgstr "Dwing aanmeld (ignoreer bedienerherleiding)"
 
 #. pretend to be Sametime Connect
-#: ../libpurple/protocols/sametime/sametime.c:5828
 msgid "Hide client identity"
 msgstr "Versteek kli?ntidentiteit"
 
-#: ../libpurple/protocols/silc/buddy.c:53
-#: ../libpurple/protocols/silc/buddy.c:414
-#: ../libpurple/protocols/silc/buddy.c:542
-#: ../libpurple/protocols/silc/buddy.c:705
-#: ../libpurple/protocols/silc/ft.c:424
-#: ../libpurple/protocols/silc10/buddy.c:52
-#: ../libpurple/protocols/silc10/buddy.c:421
-#: ../libpurple/protocols/silc10/buddy.c:546
-#: ../libpurple/protocols/silc10/buddy.c:712
-#: ../libpurple/protocols/silc10/ft.c:338
 #, c-format
 msgid "User %s is not present in the network"
 msgstr "Gebruiker %s is nie op die netwerk teenwoordig nie"
 
-#: ../libpurple/protocols/silc/buddy.c:54
-#: ../libpurple/protocols/silc/buddy.c:111
-#: ../libpurple/protocols/silc/buddy.c:116
-#: ../libpurple/protocols/silc/buddy.c:120
-#: ../libpurple/protocols/silc/buddy.c:125
-#: ../libpurple/protocols/silc/buddy.c:130
-#: ../libpurple/protocols/silc/buddy.c:135
-#: ../libpurple/protocols/silc/buddy.c:255
-#: ../libpurple/protocols/silc10/buddy.c:53
-#: ../libpurple/protocols/silc10/buddy.c:115
-#: ../libpurple/protocols/silc10/buddy.c:120
-#: ../libpurple/protocols/silc10/buddy.c:124
-#: ../libpurple/protocols/silc10/buddy.c:129
-#: ../libpurple/protocols/silc10/buddy.c:134
-#: ../libpurple/protocols/silc10/buddy.c:139
-#: ../libpurple/protocols/silc10/buddy.c:257
 msgid "Key Agreement"
 msgstr "Sleutelooreenkoms"
 
-#: ../libpurple/protocols/silc/buddy.c:55
-#: ../libpurple/protocols/silc10/buddy.c:54
 msgid "Cannot perform the key agreement"
 msgstr "Kan nie sleutelooreenkoms verrig nie"
 
-#: ../libpurple/protocols/silc/buddy.c:112
-#: ../libpurple/protocols/silc10/buddy.c:116
 msgid "Error occurred during key agreement"
 msgstr "'n Fout het plaasgevind tydens sleutelooreenkoms"
 
-#: ../libpurple/protocols/silc/buddy.c:116
-#: ../libpurple/protocols/silc10/buddy.c:120
 msgid "Key Agreement failed"
 msgstr "Sleutelooreenkoms het misluk"
 
-#: ../libpurple/protocols/silc/buddy.c:121
-#: ../libpurple/protocols/silc10/buddy.c:125
 msgid "Timeout during key agreement"
 msgstr "Uittelling het plaasgevind tydens sleutelooreenkoms"
 
-#: ../libpurple/protocols/silc/buddy.c:126
-#: ../libpurple/protocols/silc10/buddy.c:130
 msgid "Key agreement was aborted"
 msgstr "Sleutelooreenkoms is gestaak"
 
-#: ../libpurple/protocols/silc/buddy.c:131
-#: ../libpurple/protocols/silc10/buddy.c:135
 msgid "Key agreement is already started"
 msgstr "Sleutelooreenkoms is reeds begin"
 
-#: ../libpurple/protocols/silc/buddy.c:136
-#: ../libpurple/protocols/silc10/buddy.c:140
 msgid "Key agreement cannot be started with yourself"
 msgstr "Sleutelooreenkoms kan nie deur uself begin word nie"
 
-#: ../libpurple/protocols/silc/buddy.c:256
-#: ../libpurple/protocols/silc/buddy.c:387
-#: ../libpurple/protocols/silc/buddy.c:501
-#: ../libpurple/protocols/silc/buddy.c:512
-#: ../libpurple/protocols/silc10/buddy.c:258
-#: ../libpurple/protocols/silc10/buddy.c:389
-#: ../libpurple/protocols/silc10/buddy.c:514
 msgid "The remote user is not present in the network any more"
 msgstr "Die afgele? gebruiker is nie meer op die netwerk teenwoordig nie"
 
-#: ../libpurple/protocols/silc/buddy.c:299
-#: ../libpurple/protocols/silc10/buddy.c:295
 #, c-format
 msgid ""
 "Key agreement request received from %s. Would you like to perform the key "
@@ -12795,8 +9025,6 @@ msgstr ""
 "Sleutelooreenkoms-versoek ontvang van %s. Wil u by die sleutelooreenkoms "
 "verrig?"
 
-#: ../libpurple/protocols/silc/buddy.c:303
-#: ../libpurple/protocols/silc10/buddy.c:299
 #, c-format
 msgid ""
 "The remote user is waiting key agreement on:\n"
@@ -12807,99 +9035,40 @@ msgstr ""
 "Afgele? gasheer: %s\n"
 "Afgele? poort: %d"
 
-#: ../libpurple/protocols/silc/buddy.c:316
-#: ../libpurple/protocols/silc10/buddy.c:312
 msgid "Key Agreement Request"
 msgstr "Sleutelooreenkoms-versoek"
 
-#: ../libpurple/protocols/silc/buddy.c:386
-#: ../libpurple/protocols/silc/buddy.c:416
-#: ../libpurple/protocols/silc/buddy.c:456
-#: ../libpurple/protocols/silc10/buddy.c:388
-#: ../libpurple/protocols/silc10/buddy.c:423
-#: ../libpurple/protocols/silc10/buddy.c:465
 msgid "IM With Password"
 msgstr "Kitsboodskap met wagwoord"
 
-#: ../libpurple/protocols/silc/buddy.c:417
-#: ../libpurple/protocols/silc10/buddy.c:424
 msgid "Cannot set IM key"
 msgstr "Kan nie kitsboodskap-sleutel stel nie"
 
-#: ../libpurple/protocols/silc/buddy.c:457
-#: ../libpurple/protocols/silc10/buddy.c:466
 msgid "Set IM Password"
 msgstr "Stel kitsboodskap-wagwoord"
 
-#: ../libpurple/protocols/silc/buddy.c:500
-#: ../libpurple/protocols/silc/buddy.c:511
-#: ../libpurple/protocols/silc/buddy.c:544
-#: ../libpurple/protocols/silc/ops.c:1505
-#: ../libpurple/protocols/silc/ops.c:1516
-#: ../libpurple/protocols/silc10/buddy.c:513
-#: ../libpurple/protocols/silc10/buddy.c:548
-#: ../libpurple/protocols/silc10/ops.c:1494
-#: ../libpurple/protocols/silc10/ops.c:1505
 msgid "Get Public Key"
 msgstr "Kry publieke sleutel"
 
-#: ../libpurple/protocols/silc/buddy.c:545
-#: ../libpurple/protocols/silc/ops.c:1506
-#: ../libpurple/protocols/silc/ops.c:1517
-#: ../libpurple/protocols/silc10/buddy.c:549
-#: ../libpurple/protocols/silc10/ops.c:1495
-#: ../libpurple/protocols/silc10/ops.c:1506
 msgid "Cannot fetch the public key"
 msgstr "Kan nie publieke sleutel haal nie"
 
-#: ../libpurple/protocols/silc/buddy.c:626
-#: ../libpurple/protocols/silc/buddy.c:1671
-#: ../libpurple/protocols/silc10/buddy.c:635
-#: ../libpurple/protocols/silc10/buddy.c:1674
 msgid "Show Public Key"
 msgstr "Wys publieke sleutel"
 
-#: ../libpurple/protocols/silc/buddy.c:627
-#: ../libpurple/protocols/silc/buddy.c:1035
-#: ../libpurple/protocols/silc/chat.c:241
-#: ../libpurple/protocols/silc10/buddy.c:636
-#: ../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"
 
-#: ../libpurple/protocols/silc/buddy.c:706
-#: ../libpurple/protocols/silc/ops.c:1055
-#: ../libpurple/protocols/silc/ops.c:1170
-#: ../libpurple/protocols/silc/ops.c:1292
-#: ../libpurple/protocols/silc/ops.c:1293
-#: ../libpurple/protocols/silc/ops.c:1311
-#: ../libpurple/protocols/silc10/buddy.c:713
-#: ../libpurple/protocols/silc10/ops.c:1087
-#: ../libpurple/protocols/silc10/ops.c:1159
-#: ../libpurple/protocols/silc10/ops.c:1294
-#: ../libpurple/protocols/silc10/ops.c:1295
-#: ../libpurple/protocols/silc10/ops.c:1313
 msgid "User Information"
 msgstr "Gebruikerinligting"
 
-#: ../libpurple/protocols/silc/buddy.c:707
-#: ../libpurple/protocols/silc/ops.c:1171
-#: ../libpurple/protocols/silc/ops.c:1312
-#: ../libpurple/protocols/silc10/buddy.c:714
-#: ../libpurple/protocols/silc10/ops.c:1160
-#: ../libpurple/protocols/silc10/ops.c:1314
 msgid "Cannot get user information"
 msgstr "Kon nie gebruikerinligting kry nie"
 
-#: ../libpurple/protocols/silc/buddy.c:728
-#: ../libpurple/protocols/silc10/buddy.c:735
 #, c-format
 msgid "The %s buddy is not trusted"
 msgstr "Die %s vriend word nie vertrou nie"
 
-#: ../libpurple/protocols/silc/buddy.c:731
-#: ../libpurple/protocols/silc10/buddy.c:738
 msgid ""
 "You cannot receive buddy notifications until you import his/her public key.  "
 "You can use the Get Public Key command to get the public key."
@@ -12909,19 +9078,13 @@ msgstr ""
 "publieke sleutel te kry."
 
 #. Open file selector to select the public key.
-#: ../libpurple/protocols/silc/buddy.c:1067
-#: ../libpurple/protocols/silc10/buddy.c:1070
 msgid "Open..."
 msgstr "Open..."
 
-#: ../libpurple/protocols/silc/buddy.c:1078
-#: ../libpurple/protocols/silc10/buddy.c:1081
 #, c-format
 msgid "The %s buddy is not present in the network"
 msgstr "Die %s vriend is nie op die netwerk teenwoordig nie"
 
-#: ../libpurple/protocols/silc/buddy.c:1081
-#: ../libpurple/protocols/silc10/buddy.c:1084
 msgid ""
 "To add the buddy you must import his/her public key. Press Import to import "
 "a public key."
@@ -12929,18 +9092,12 @@ msgstr ""
 "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:1085
-#: ../libpurple/protocols/silc10/buddy.c:1088
 msgid "_Import..."
 msgstr "Voer _in..."
 
-#: ../libpurple/protocols/silc/buddy.c:1191
-#: ../libpurple/protocols/silc10/buddy.c:1184
 msgid "Select correct user"
 msgstr "Kies die regte gebruiker"
 
-#: ../libpurple/protocols/silc/buddy.c:1193
-#: ../libpurple/protocols/silc10/buddy.c:1186
 msgid ""
 "More than one user was found with the same public key. Select the correct "
 "user from the list to add to the buddy list."
@@ -12948,8 +9105,6 @@ msgstr ""
 "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:1195
-#: ../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."
@@ -12957,216 +9112,120 @@ msgstr ""
 "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:1487
-#: ../libpurple/protocols/silc10/buddy.c:1494
 msgid "Detached"
 msgstr "Ontheg"
 
-#: ../libpurple/protocols/silc/buddy.c:1491
-#: ../libpurple/protocols/silc/silc.c:60
-#: ../libpurple/protocols/silc10/buddy.c:1498
-#: ../libpurple/protocols/silc10/silc.c:50
 msgid "Indisposed"
 msgstr "Ongesteld"
 
-#: ../libpurple/protocols/silc/buddy.c:1495
-#: ../libpurple/protocols/silc/silc.c:62
-#: ../libpurple/protocols/silc10/buddy.c:1502
-#: ../libpurple/protocols/silc10/silc.c:52
 msgid "Wake Me Up"
 msgstr "Maak my wakker"
 
-#: ../libpurple/protocols/silc/buddy.c:1497
-#: ../libpurple/protocols/silc/silc.c:54
-#: ../libpurple/protocols/silc10/buddy.c:1504
-#: ../libpurple/protocols/silc10/silc.c:44
 msgid "Hyper Active"
 msgstr "Hiperaktief"
 
-#: ../libpurple/protocols/silc/buddy.c:1499
-#: ../libpurple/protocols/silc10/buddy.c:1506
 msgid "Robot"
 msgstr "Robot"
 
-#: ../libpurple/protocols/silc/buddy.c:1560
-#: ../libpurple/protocols/silc/ops.c:1209
-#: ../libpurple/protocols/silc10/buddy.c:1565
-#: ../libpurple/protocols/silc10/ops.c:1202
 msgid "User Modes"
 msgstr "Gebruikermodusse"
 
-#: ../libpurple/protocols/silc/buddy.c:1577
-#: ../libpurple/protocols/silc/ops.c:1226
-#: ../libpurple/protocols/silc10/buddy.c:1582
-#: ../libpurple/protocols/silc10/ops.c:1219
 msgid "Preferred Contact"
 msgstr "Voorkeurkontak"
 
-#: ../libpurple/protocols/silc/buddy.c:1582
-#: ../libpurple/protocols/silc/ops.c:1231
-#: ../libpurple/protocols/silc10/buddy.c:1587
-#: ../libpurple/protocols/silc10/ops.c:1224
 msgid "Preferred Language"
 msgstr "Voorkeurtaal"
 
-#: ../libpurple/protocols/silc/buddy.c:1587
-#: ../libpurple/protocols/silc/ops.c:1236
-#: ../libpurple/protocols/silc10/buddy.c:1592
-#: ../libpurple/protocols/silc10/ops.c:1229
 msgid "Device"
 msgstr "Toestel"
 
-#: ../libpurple/protocols/silc/buddy.c:1592
-#: ../libpurple/protocols/silc/ops.c:1241
-#: ../libpurple/protocols/silc10/buddy.c:1597
-#: ../libpurple/protocols/silc10/ops.c:1234
-#: ../libpurple/protocols/silc10/silc.c:747
-#: ../libpurple/protocols/silc10/silc.c:749
 msgid "Timezone"
 msgstr "Tydsone"
 
-#: ../libpurple/protocols/silc/buddy.c:1597
-#: ../libpurple/protocols/silc/ops.c:1246
-#: ../libpurple/protocols/silc10/buddy.c:1602
-#: ../libpurple/protocols/silc10/ops.c:1239
 msgid "Geolocation"
 msgstr "Geografiese ligging"
 
-#: ../libpurple/protocols/silc/buddy.c:1654
-#: ../libpurple/protocols/silc10/buddy.c:1656
 msgid "Reset IM Key"
 msgstr "Stel kitsboodskap-sleutel terug"
 
-#: ../libpurple/protocols/silc/buddy.c:1659
-#: ../libpurple/protocols/silc10/buddy.c:1662
 msgid "IM with Key Exchange"
 msgstr "Kitsboodskap met sleutelruiling"
 
-#: ../libpurple/protocols/silc/buddy.c:1664
-#: ../libpurple/protocols/silc10/buddy.c:1667
 msgid "IM with Password"
 msgstr "Kitsboodskap met wagwoord"
 
-#: ../libpurple/protocols/silc/buddy.c:1677
-#: ../libpurple/protocols/silc10/buddy.c:1680
 msgid "Get Public Key..."
 msgstr "Kry publieke sleutel..."
 
-#: ../libpurple/protocols/silc/buddy.c:1684
-#: ../libpurple/protocols/silc/ops.c:1614
-#: ../libpurple/protocols/silc10/buddy.c:1687
-#: ../libpurple/protocols/silc10/ops.c:1624
 msgid "Kill User"
 msgstr "Moor gebruiker"
 
-#: ../libpurple/protocols/silc/buddy.c:1694
-#: ../libpurple/protocols/silc/chat.c:1003
-#: ../libpurple/protocols/silc10/buddy.c:1697
-#: ../libpurple/protocols/silc10/chat.c:977
 msgid "Draw On Whiteboard"
 msgstr "Teken op witbord"
 
-#: ../libpurple/protocols/silc/chat.c:40
-#: ../libpurple/protocols/silc10/chat.c:39
 msgid "_Passphrase:"
 msgstr "_Wagwoordfrase:"
 
-#: ../libpurple/protocols/silc/chat.c:81
-#: ../libpurple/protocols/silc10/chat.c:80
 #, c-format
 msgid "Channel %s does not exist in the network"
 msgstr "Kanaal %s bestaan nie op die netwerk nie"
 
-#: ../libpurple/protocols/silc/chat.c:82
-#: ../libpurple/protocols/silc/chat.c:177
-#: ../libpurple/protocols/silc10/chat.c:81
-#: ../libpurple/protocols/silc10/chat.c:174
 msgid "Channel Information"
 msgstr "Kanaalinligting"
 
-#: ../libpurple/protocols/silc/chat.c:83
-#: ../libpurple/protocols/silc10/chat.c:82
 msgid "Cannot get channel information"
 msgstr "Kan nie kanaaninligting kry nie"
 
-#: ../libpurple/protocols/silc/chat.c:120
-#: ../libpurple/protocols/silc10/chat.c:119
 #, c-format
 msgid "<b>Channel Name:</b> %s"
 msgstr "<b>Kanaalnaam:</b> %s"
 
-#: ../libpurple/protocols/silc/chat.c:123
-#: ../libpurple/protocols/silc10/chat.c:122
 #, c-format
 msgid "<br><b>User Count:</b> %d"
 msgstr "<br><b>Gebruikertelling:</b> %d"
 
-#: ../libpurple/protocols/silc/chat.c:130
-#: ../libpurple/protocols/silc10/chat.c:129
 #, c-format
 msgid "<br><b>Channel Founder:</b> %s"
 msgstr "<br><b>Kanaalstigter:</b> %s"
 
-#: ../libpurple/protocols/silc/chat.c:139
-#: ../libpurple/protocols/silc10/chat.c:138
 #, c-format
 msgid "<br><b>Channel Cipher:</b> %s"
 msgstr "<br><b>Kanaalsyfer:</b> %s"
 
 #. Definition of HMAC: http://en.wikipedia.org/wiki/HMAC
-#: ../libpurple/protocols/silc/chat.c:144
-#: ../libpurple/protocols/silc10/chat.c:142
 #, c-format
 msgid "<br><b>Channel HMAC:</b> %s"
 msgstr "<br><b>Kanaal-HMAC:</b> %s"
 
-#: ../libpurple/protocols/silc/chat.c:149
-#: ../libpurple/protocols/silc10/chat.c:147
 #, c-format
 msgid "<br><b>Channel Topic:</b><br>%s"
 msgstr "<br><b>Kanaalonderwerp:</b><br>%s"
 
-#: ../libpurple/protocols/silc/chat.c:154
-#: ../libpurple/protocols/silc10/chat.c:152
 #, c-format
 msgid "<br><b>Channel Modes:</b> "
 msgstr "<br><b>Kanaalmodusse:</b> "
 
-#: ../libpurple/protocols/silc/chat.c:168
-#: ../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:169
-#: ../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:240
-#: ../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:308
-#: ../libpurple/protocols/silc10/chat.c:291
 msgid "Open Public Key..."
 msgstr "Open publieke sleutel..."
 
-#: ../libpurple/protocols/silc/chat.c:427
-#: ../libpurple/protocols/silc10/chat.c:401
 msgid "Channel Passphrase"
 msgstr "Kanaalwagwoordfrase"
 
-#: ../libpurple/protocols/silc/chat.c:434
-#: ../libpurple/protocols/silc10/chat.c:408
 msgid "Channel Public Keys List"
 msgstr "Lys kanaal- publieke sleutels"
 
-#: ../libpurple/protocols/silc/chat.c:439
-#: ../libpurple/protocols/silc10/chat.c:413
 #, c-format
 msgid ""
 "Channel authentication is used to secure the channel from unauthorized "
@@ -13181,443 +9240,243 @@ msgstr ""
 "Indien kanaal- publieke sleutels gestel is, kan net gebruikers wie se "
 "publieke sleutels gelys is, aansluit."
 
-#: ../libpurple/protocols/silc/chat.c:448
-#: ../libpurple/protocols/silc/chat.c:449
-#: ../libpurple/protocols/silc/chat.c:485
-#: ../libpurple/protocols/silc/chat.c:486
-#: ../libpurple/protocols/silc/chat.c:937
-#: ../libpurple/protocols/silc10/chat.c:422
-#: ../libpurple/protocols/silc10/chat.c:423
-#: ../libpurple/protocols/silc10/chat.c:461
-#: ../libpurple/protocols/silc10/chat.c:462
-#: ../libpurple/protocols/silc10/chat.c:911
 msgid "Channel Authentication"
 msgstr "Kanaalstawing"
 
-#: ../libpurple/protocols/silc/chat.c:450
-#: ../libpurple/protocols/silc/chat.c:487
-#: ../libpurple/protocols/silc10/chat.c:424
-#: ../libpurple/protocols/silc10/chat.c:463
 msgid "Add / Remove"
 msgstr "Voeg by / verwyder"
 
-#: ../libpurple/protocols/silc/chat.c:603
-#: ../libpurple/protocols/silc10/chat.c:581
 msgid "Group Name"
 msgstr "Groepnaam"
 
-#: ../libpurple/protocols/silc/chat.c:607
-#: ../libpurple/protocols/silc/ops.c:1819
-#: ../libpurple/protocols/silc/silc.c:1256
-#: ../libpurple/protocols/silc10/chat.c:585
-#: ../libpurple/protocols/silc10/ops.c:1907
-#: ../libpurple/protocols/silc10/silc.c:956
 msgid "Passphrase"
 msgstr "Wagwoordfrase"
 
-#: ../libpurple/protocols/silc/chat.c:618
-#: ../libpurple/protocols/silc10/chat.c:596
 #, c-format
 msgid "Please enter the %s channel private group name and passphrase."
 msgstr "Tik gerus die %s kanaal- private groep se naam en wagwoordfrase."
 
-#: ../libpurple/protocols/silc/chat.c:620
-#: ../libpurple/protocols/silc10/chat.c:598
 msgid "Add Channel Private Group"
 msgstr "Voeg kanaal- private groep by"
 
-#: ../libpurple/protocols/silc/chat.c:752
-#: ../libpurple/protocols/silc10/chat.c:726
 msgid "User Limit"
 msgstr "Gebruikerlimiet"
 
-#: ../libpurple/protocols/silc/chat.c:753
-#: ../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."
+"Stel gebruikerlimiet op kanaal. Stel op nul om gebruikerlimiet terug te stel."
 
-#: ../libpurple/protocols/silc/chat.c:917
-#: ../libpurple/protocols/silc10/chat.c:891
 msgid "Invite List"
 msgstr "Uitnodigings"
 
-#: ../libpurple/protocols/silc/chat.c:922
-#: ../libpurple/protocols/silc10/chat.c:896
 msgid "Ban List"
 msgstr "Verbanlys"
 
-#: ../libpurple/protocols/silc/chat.c:930
-#: ../libpurple/protocols/silc10/chat.c:904
 msgid "Add Private Group"
 msgstr "Voeg private groep by"
 
-#: ../libpurple/protocols/silc/chat.c:943
-#: ../libpurple/protocols/silc10/chat.c:917
 msgid "Reset Permanent"
 msgstr "Stel permanent terug"
 
-#: ../libpurple/protocols/silc/chat.c:948
-#: ../libpurple/protocols/silc10/chat.c:922
 msgid "Set Permanent"
 msgstr "Stel permanent"
 
-#: ../libpurple/protocols/silc/chat.c:956
-#: ../libpurple/protocols/silc10/chat.c:930
 msgid "Set User Limit"
 msgstr "Stel gebruikerlimiet"
 
-#: ../libpurple/protocols/silc/chat.c:962
-#: ../libpurple/protocols/silc10/chat.c:936
 msgid "Reset Topic Restriction"
 msgstr "Stel onderwerpinperking terug"
 
-#: ../libpurple/protocols/silc/chat.c:967
-#: ../libpurple/protocols/silc10/chat.c:941
 msgid "Set Topic Restriction"
 msgstr "Stel onderwerpinperking"
 
-#: ../libpurple/protocols/silc/chat.c:974
-#: ../libpurple/protocols/silc10/chat.c:948
 msgid "Reset Private Channel"
 msgstr "Stel private groep terug"
 
-#: ../libpurple/protocols/silc/chat.c:979
-#: ../libpurple/protocols/silc10/chat.c:953
 msgid "Set Private Channel"
 msgstr "Stel private kanaal"
 
-#: ../libpurple/protocols/silc/chat.c:986
-#: ../libpurple/protocols/silc10/chat.c:960
 msgid "Reset Secret Channel"
 msgstr "Stel geheime kanaal terug"
 
-#: ../libpurple/protocols/silc/chat.c:991
-#: ../libpurple/protocols/silc10/chat.c:965
 msgid "Set Secret Channel"
 msgstr "Stel geheime kanaal"
 
-#: ../libpurple/protocols/silc/chat.c:1052
-#: ../libpurple/protocols/silc10/chat.c:1102
 #, c-format
 msgid ""
 "You have to join the %s channel before you are able to join the private group"
 msgstr ""
 "U het by die %s kanaal aangesluit voor u by die private groep kon aansluit"
 
-#: ../libpurple/protocols/silc/chat.c:1054
-#: ../libpurple/protocols/silc10/chat.c:1104
 msgid "Join Private Group"
 msgstr "Sluit by private groep aan"
 
-#: ../libpurple/protocols/silc/chat.c:1055
-#: ../libpurple/protocols/silc10/chat.c:1105
 msgid "Cannot join private group"
 msgstr "Kan nie by private groep aansluit nie"
 
-#: ../libpurple/protocols/silc/chat.c:1251
-#: ../libpurple/protocols/silc/silc.c:1459
-#: ../libpurple/protocols/silc10/chat.c:1299
-#: ../libpurple/protocols/silc10/silc.c:1162
 msgid "Call Command"
 msgstr "Roep bevel"
 
-#: ../libpurple/protocols/silc/chat.c:1251
-#: ../libpurple/protocols/silc/silc.c:1460
-#: ../libpurple/protocols/silc10/chat.c:1299
-#: ../libpurple/protocols/silc10/silc.c:1162
 msgid "Cannot call command"
 msgstr "Kan nie bevel roep nie"
 
-#: ../libpurple/protocols/silc/chat.c:1252
-#: ../libpurple/protocols/silc/silc.c:1461
-#: ../libpurple/protocols/silc10/chat.c:1300
-#: ../libpurple/protocols/silc10/silc.c:1163
 msgid "Unknown command"
 msgstr "Onbekende bevel"
 
-#: ../libpurple/protocols/silc/ft.c:86 ../libpurple/protocols/silc/ft.c:102
-#: ../libpurple/protocols/silc/ft.c:105 ../libpurple/protocols/silc/ft.c:109
-#: ../libpurple/protocols/silc/ft.c:113 ../libpurple/protocols/silc/ft.c:117
-#: ../libpurple/protocols/silc/ft.c:121 ../libpurple/protocols/silc/ft.c:273
-#: ../libpurple/protocols/silc/ft.c:278 ../libpurple/protocols/silc/ft.c:283
-#: ../libpurple/protocols/silc/ft.c:289 ../libpurple/protocols/silc/ft.c:426
-#: ../libpurple/protocols/silc10/ft.c:89 ../libpurple/protocols/silc10/ft.c:92
-#: ../libpurple/protocols/silc10/ft.c:96
-#: ../libpurple/protocols/silc10/ft.c:100
-#: ../libpurple/protocols/silc10/ft.c:104
-#: ../libpurple/protocols/silc10/ft.c:205
-#: ../libpurple/protocols/silc10/ft.c:210
-#: ../libpurple/protocols/silc10/ft.c:215
-#: ../libpurple/protocols/silc10/ft.c:221
-#: ../libpurple/protocols/silc10/ft.c:340
 msgid "Secure File Transfer"
 msgstr "Beveiligde l?eroordrag"
 
-#: ../libpurple/protocols/silc/ft.c:87 ../libpurple/protocols/silc/ft.c:103
-#: ../libpurple/protocols/silc/ft.c:106 ../libpurple/protocols/silc/ft.c:110
-#: ../libpurple/protocols/silc/ft.c:114 ../libpurple/protocols/silc/ft.c:118
-#: ../libpurple/protocols/silc/ft.c:122 ../libpurple/protocols/silc10/ft.c:90
-#: ../libpurple/protocols/silc10/ft.c:93 ../libpurple/protocols/silc10/ft.c:97
-#: ../libpurple/protocols/silc10/ft.c:101
-#: ../libpurple/protocols/silc10/ft.c:105
 msgid "Error during file transfer"
 msgstr "Kon nie l?er volledig oordra nie"
 
-#: ../libpurple/protocols/silc/ft.c:88
 msgid "Remote disconnected"
 msgstr "Afgele? ontkoppel"
 
-#: ../libpurple/protocols/silc/ft.c:107 ../libpurple/protocols/silc10/ft.c:94
 msgid "Permission denied"
 msgstr "Toestemming gewyer"
 
-#: ../libpurple/protocols/silc/ft.c:111 ../libpurple/protocols/silc10/ft.c:98
 msgid "Key agreement failed"
 msgstr "Sleutelooreenkoms het misluk"
 
-#: ../libpurple/protocols/silc/ft.c:115 ../libpurple/protocols/silc/silc.c:352
-#: ../libpurple/protocols/silc10/ops.c:1725
 msgid "Connection timed out"
 msgstr "Verbinding het uitgetel"
 
-#: ../libpurple/protocols/silc/ft.c:119
 msgid "Creating connection failed"
 msgstr "Skep van koppeling het misluk"
 
-#: ../libpurple/protocols/silc/ft.c:123 ../libpurple/protocols/silc10/ft.c:102
 msgid "File transfer session does not exist"
 msgstr "L?eroordragsessie bestaan nie"
 
-#: ../libpurple/protocols/silc/ft.c:274 ../libpurple/protocols/silc10/ft.c:206
 msgid "No file transfer session active"
 msgstr "Geen l?eroordragsessie aktief nie"
 
-#: ../libpurple/protocols/silc/ft.c:279 ../libpurple/protocols/silc10/ft.c:211
 msgid "File transfer already started"
 msgstr "L?eroordrag reeds begin"
 
-#: ../libpurple/protocols/silc/ft.c:284 ../libpurple/protocols/silc10/ft.c:216
 msgid "Could not perform key agreement for file transfer"
 msgstr "Kon nie sleutelooreenkoms verrig vir l?eroordrag nie"
 
-#: ../libpurple/protocols/silc/ft.c:290 ../libpurple/protocols/silc10/ft.c:222
 msgid "Could not start the file transfer"
 msgstr "Kon nie die l?eroordrag begin nie"
 
-#: ../libpurple/protocols/silc/ft.c:427 ../libpurple/protocols/silc10/ft.c:341
 msgid "Cannot send file"
 msgstr "Kan nie l?er stuur nie"
 
-#: ../libpurple/protocols/silc/ops.c:77
 msgid "Error occurred"
 msgstr "'n Fout het voorgekom"
 
-#: ../libpurple/protocols/silc/ops.c:550 ../libpurple/protocols/silc/ops.c:559
-#: ../libpurple/protocols/silc/ops.c:568
-#: ../libpurple/protocols/silc10/ops.c:554
-#: ../libpurple/protocols/silc10/ops.c:563
-#: ../libpurple/protocols/silc10/ops.c:572
 #, c-format
 msgid "%s has changed the topic of <I>%s</I> to: %s"
 msgstr "%s het die onderwerp van <I>%s</I> verander na: %s"
 
-#: ../libpurple/protocols/silc/ops.c:634
-#: ../libpurple/protocols/silc10/ops.c:638
 #, c-format
 msgid "<I>%s</I> set channel <I>%s</I> modes to: %s"
 msgstr "<I>%s</I> het kanaal <I>%s</I> se modusse gestel na: %s"
 
-#: ../libpurple/protocols/silc/ops.c:638
-#: ../libpurple/protocols/silc10/ops.c:642
 #, c-format
 msgid "<I>%s</I> removed all channel <I>%s</I> modes"
 msgstr "<I>%s</I> het al kanaal <I>%s</I> se modusse verwyder"
 
-#: ../libpurple/protocols/silc/ops.c:671
-#: ../libpurple/protocols/silc10/ops.c:675
 #, c-format
 msgid "<I>%s</I> set <I>%s's</I> modes to: %s"
 msgstr "<I>%s</I> het kanaal <I>%s</I> se modusse gestel na: %s"
 
-#: ../libpurple/protocols/silc/ops.c:679
-#: ../libpurple/protocols/silc10/ops.c:683
 #, c-format
 msgid "<I>%s</I> removed all <I>%s's</I> modes"
 msgstr "<I>%s</I> het al kanaal <I>%s</I> se modusse verwyder"
 
-#: ../libpurple/protocols/silc/ops.c:708
-#: ../libpurple/protocols/silc10/ops.c:712
 #, c-format
 msgid "You have been kicked off <I>%s</I> by <I>%s</I> (%s)"
 msgstr "U is by <I>%s</I> geskop deur <I>%s</I> (%s)"
 
-#: ../libpurple/protocols/silc/ops.c:735 ../libpurple/protocols/silc/ops.c:740
-#: ../libpurple/protocols/silc/ops.c:745
-#: ../libpurple/protocols/silc10/ops.c:742
-#: ../libpurple/protocols/silc10/ops.c:747
-#: ../libpurple/protocols/silc10/ops.c:752
 #, c-format
 msgid "You have been killed by %s (%s)"
 msgstr "U is gemoor deur %s (%s)"
 
-#: ../libpurple/protocols/silc/ops.c:766 ../libpurple/protocols/silc/ops.c:771
-#: ../libpurple/protocols/silc/ops.c:776
-#: ../libpurple/protocols/silc10/ops.c:773
-#: ../libpurple/protocols/silc10/ops.c:778
-#: ../libpurple/protocols/silc10/ops.c:783
 #, c-format
 msgid "Killed by %s (%s)"
 msgstr "Gemoor deur %s (%s)"
 
-#: ../libpurple/protocols/silc/ops.c:813
-#: ../libpurple/protocols/silc10/ops.c:829
 msgid "Server signoff"
 msgstr "Bediener teken af"
 
-#: ../libpurple/protocols/silc/ops.c:986
-#: ../libpurple/protocols/silc10/ops.c:1017
 msgid "Personal Information"
 msgstr "Persoonlike inligting"
 
-#: ../libpurple/protocols/silc/ops.c:1009
-#: ../libpurple/protocols/silc10/ops.c:1040
 msgid "Birth Day"
 msgstr "Verjaardag"
 
-#: ../libpurple/protocols/silc/ops.c:1017
-#: ../libpurple/protocols/silc10/ops.c:1048
 msgid "Job Role"
 msgstr "Taakrol"
 
-#: ../libpurple/protocols/silc/ops.c:1021
-#: ../libpurple/protocols/silc/silc.c:1249
-#: ../libpurple/protocols/silc10/ops.c:1052
-#: ../libpurple/protocols/silc10/silc.c:949
 msgid "Organization"
 msgstr "Organisasie"
 
-#: ../libpurple/protocols/silc/ops.c:1025
-#: ../libpurple/protocols/silc10/ops.c:1056
 msgid "Unit"
 msgstr "Eenheid"
 
-#: ../libpurple/protocols/silc/ops.c:1095
-#: ../libpurple/protocols/silc10/ops.c:1128
 msgid "Join Chat"
 msgstr "Sluit by geselsie aan"
 
-#: ../libpurple/protocols/silc/ops.c:1129
-#: ../libpurple/protocols/silc10/chat.c:1039
 #, c-format
 msgid "You are channel founder on <I>%s</I>"
 msgstr "U is kanaalstigter op <I>%s</I>"
 
-#: ../libpurple/protocols/silc/ops.c:1133
-#: ../libpurple/protocols/silc10/chat.c:1043
 #, c-format
 msgid "Channel founder on <I>%s</I> is <I>%s</I>"
 msgstr "Kanaalstigter op <I>%s</I> is <I>%s</I>"
 
-#: ../libpurple/protocols/silc/ops.c:1192
-#: ../libpurple/protocols/silc/ops.c:1330
-#: ../libpurple/protocols/silc10/ops.c:1183
-#: ../libpurple/protocols/silc10/ops.c:1332
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1072
 msgid "Real Name"
 msgstr "Regte naam"
 
-#: ../libpurple/protocols/silc/ops.c:1220
-#: ../libpurple/protocols/silc10/ops.c:1213 ../pidgin/gtkblist-theme.c:467
 msgid "Status Text"
 msgstr "Statusteks"
 
-#: ../libpurple/protocols/silc/ops.c:1282
-#: ../libpurple/protocols/silc/ops.c:1356
-#: ../libpurple/protocols/silc10/ops.c:1285
-#: ../libpurple/protocols/silc10/ops.c:1357
 msgid "Public Key Fingerprint"
 msgstr "Publiekesleutel-vingerafdruk"
 
-#: ../libpurple/protocols/silc/ops.c:1283
-#: ../libpurple/protocols/silc/ops.c:1357
-#: ../libpurple/protocols/silc10/ops.c:1286
-#: ../libpurple/protocols/silc10/ops.c:1358
 msgid "Public Key Babbleprint"
 msgstr "Publiekesleutel-babbelafdruk"
 
-#: ../libpurple/protocols/silc/ops.c:1296
-#: ../libpurple/protocols/silc10/ops.c:1298
 msgid "_More..."
 msgstr "_Meer..."
 
-#: ../libpurple/protocols/silc/ops.c:1375
-#: ../libpurple/protocols/silc/silc.c:1313
-#: ../libpurple/protocols/silc10/ops.c:1371
-#: ../libpurple/protocols/silc10/silc.c:1013
 msgid "Detach From Server"
 msgstr "Ontheg van bediener"
 
-#: ../libpurple/protocols/silc/ops.c:1375
-#: ../libpurple/protocols/silc10/ops.c:1371
 msgid "Cannot detach"
 msgstr "Kan nie ontheg nie"
 
-#: ../libpurple/protocols/silc/ops.c:1395
-#: ../libpurple/protocols/silc10/ops.c:1382
 msgid "Cannot set topic"
 msgstr "Kan nie onderwerp stel nie"
 
-#: ../libpurple/protocols/silc/ops.c:1424
-#: ../libpurple/protocols/silc10/ops.c:1414
 msgid "Failed to change nickname"
 msgstr "Verander van bynaam het misluk"
 
-#: ../libpurple/protocols/silc/ops.c:1473
-#: ../libpurple/protocols/silc10/ops.c:1462
 msgid "Roomlist"
 msgstr "Kamerlys"
 
-#: ../libpurple/protocols/silc/ops.c:1473
-#: ../libpurple/protocols/silc10/ops.c:1462
 msgid "Cannot get room list"
 msgstr "Kan nie kamerlys kry nie"
 
-#: ../libpurple/protocols/silc/ops.c:1474
 msgid "Network is empty"
 msgstr "Netwerk is leeg"
 
-#: ../libpurple/protocols/silc/ops.c:1518
-#: ../libpurple/protocols/silc10/ops.c:1507
 msgid "No public key was received"
 msgstr "Geen publieke sleutel is ontvang nie"
 
-#: ../libpurple/protocols/silc/ops.c:1530
-#: ../libpurple/protocols/silc/ops.c:1543
-#: ../libpurple/protocols/silc10/ops.c:1519
-#: ../libpurple/protocols/silc10/ops.c:1532
 msgid "Server Information"
 msgstr "Bedienerinligting"
 
-#: ../libpurple/protocols/silc/ops.c:1531
-#: ../libpurple/protocols/silc10/ops.c:1520
 msgid "Cannot get server information"
 msgstr "Kan nie bedienerinligting kry nie"
 
-#: ../libpurple/protocols/silc/ops.c:1554
-#: ../libpurple/protocols/silc10/ops.c:1549
-#: ../libpurple/protocols/silc10/ops.c:1558
 msgid "Server Statistics"
 msgstr "Bedienerstatistiek"
 
-#: ../libpurple/protocols/silc/ops.c:1555
-#: ../libpurple/protocols/silc10/ops.c:1550
 msgid "Cannot get server statistics"
 msgstr "Kan nie bedienerstatistiek kry nie"
 
-#: ../libpurple/protocols/silc/ops.c:1562
-#: ../libpurple/protocols/silc10/ops.c:1581
 #, c-format
 msgid ""
 "Local server start time: %s\n"
@@ -13652,66 +9511,39 @@ msgstr ""
 "Totale bedieneroperateurs: %d\n"
 "Totale roeteerderoperateurs: %d\n"
 
-#: ../libpurple/protocols/silc/ops.c:1594
-#: ../libpurple/protocols/silc10/ops.c:1604
 msgid "Network Statistics"
 msgstr "Netwerk statistiek"
 
-#: ../libpurple/protocols/silc/ops.c:1602
-#: ../libpurple/protocols/silc/ops.c:1607
-#: ../libpurple/protocols/silc10/ops.c:1612
-#: ../libpurple/protocols/silc10/ops.c:1617
 msgid "Ping"
 msgstr "Pieng"
 
-#: ../libpurple/protocols/silc/ops.c:1602
-#: ../libpurple/protocols/silc10/ops.c:1612
 msgid "Ping failed"
 msgstr "Pieng het misluk"
 
-#: ../libpurple/protocols/silc/ops.c:1607
-#: ../libpurple/protocols/silc10/ops.c:1617
 msgid "Ping reply received from server"
 msgstr "Pieng-antwoord ontvang van bediener"
 
-#: ../libpurple/protocols/silc/ops.c:1615
-#: ../libpurple/protocols/silc10/ops.c:1625
 msgid "Could not kill user"
 msgstr "Kon nie gebruiker moor nie"
 
-#: ../libpurple/protocols/silc/ops.c:1654
 msgid "WATCH"
 msgstr "DOPHOU"
 
-#: ../libpurple/protocols/silc/ops.c:1654
 msgid "Cannot watch user"
 msgstr "Kan nie gebruiker dophou nie"
 
-#: ../libpurple/protocols/silc/ops.c:1730
-#: ../libpurple/protocols/silc/ops.c:1781
-#: ../libpurple/protocols/silc/silc.c:396
-#: ../libpurple/protocols/silc10/ops.c:1817
-#: ../libpurple/protocols/silc10/ops.c:1864
-#: ../libpurple/protocols/silc10/silc.c:194
 msgid "Resuming session"
 msgstr "Hervat sessie"
 
-#: ../libpurple/protocols/silc/ops.c:1732
-#: ../libpurple/protocols/silc10/ops.c:1819
 msgid "Authenticating connection"
 msgstr "Staaf tans koppeling"
 
-#: ../libpurple/protocols/silc/ops.c:1783
-#: ../libpurple/protocols/silc10/ops.c:1866
 msgid "Verifying server public key"
 msgstr "Verifieer bediener se publieke sleutel"
 
-#: ../libpurple/protocols/silc/ops.c:1820
-#: ../libpurple/protocols/silc10/ops.c:1908
 msgid "Passphrase required"
 msgstr "Wagwoordfrase vereis"
 
-#: ../libpurple/protocols/silc/pk.c:99 ../libpurple/protocols/silc10/pk.c:104
 #, c-format
 msgid ""
 "Received %s's public key. Your local copy does not match this key. Would you "
@@ -13720,12 +9552,11 @@ msgstr ""
 "%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:104 ../libpurple/protocols/silc10/pk.c:109
 #, c-format
 msgid "Received %s's public key. Would you like to accept this public key?"
-msgstr "%s se publieke sleutel ontvang. Wil u hierdie publieke sleutel aanvaar?"
+msgstr ""
+"%s se publieke sleutel ontvang. Wil u hierdie publieke sleutel aanvaar?"
 
-#: ../libpurple/protocols/silc/pk.c:108 ../libpurple/protocols/silc10/pk.c:113
 #, c-format
 msgid ""
 "Fingerprint and babbleprint for the %s key are:\n"
@@ -13738,95 +9569,60 @@ msgstr ""
 "%s\n"
 "%s\n"
 
-#: ../libpurple/protocols/silc/pk.c:111 ../libpurple/protocols/silc/pk.c:140
-#: ../libpurple/protocols/silc10/pk.c:116
-#: ../libpurple/protocols/silc10/pk.c:142
 msgid "Verify Public Key"
 msgstr "Verifieer publieke sleutel"
 
-#: ../libpurple/protocols/silc/pk.c:116 ../libpurple/protocols/silc10/pk.c:121
 msgid "_View..."
 msgstr "_Bekyk..."
 
-#: ../libpurple/protocols/silc/pk.c:141 ../libpurple/protocols/silc10/pk.c:143
 msgid "Unsupported public key type"
 msgstr "Niegesteunde publiekesleutel-tipe"
 
-#: ../libpurple/protocols/silc/silc.c:321
-#: ../libpurple/protocols/silc10/ops.c:1755
 msgid "Disconnected by server"
 msgstr "Ontkoppel van bediener"
 
-#: ../libpurple/protocols/silc/silc.c:329
 msgid "Error connecting to SILC Server"
 msgstr "Fout tydens koppeling aan SILC-bediener"
 
-#: ../libpurple/protocols/silc/silc.c:335
-#: ../libpurple/protocols/silc10/ops.c:1707
 msgid "Key Exchange failed"
 msgstr "Sleutelruiling het misluk"
 
-#: ../libpurple/protocols/silc/silc.c:345
-#: ../libpurple/protocols/silc10/ops.c:1718
 msgid ""
 "Resuming detached session failed. Press Reconnect to create new connection."
 msgstr ""
 "Hervat van onthegte sessie het misluk. Druk 'Koppel weer' om 'n nuwe "
 "koppeling te skep."
 
-#: ../libpurple/protocols/silc/silc.c:399
-#: ../libpurple/protocols/silc10/silc.c:197
 msgid "Performing key exchange"
 msgstr "Verrig tans sleutelruiling"
 
-#: ../libpurple/protocols/silc/silc.c:494
-#: ../libpurple/protocols/silc/silc.c:510
-#: ../libpurple/protocols/silc/silc.c:539
 msgid "Unable to load SILC key pair"
 msgstr "Kan nie SILC-sleutelpaar laai nie"
 
 #. Progress
-#: ../libpurple/protocols/silc/silc.c:524
-#: ../libpurple/protocols/silc10/silc.c:330
 msgid "Connecting to SILC Server"
 msgstr "Verbind tans aan SILC-bediener"
 
-#: ../libpurple/protocols/silc/silc.c:570
-#: ../libpurple/protocols/silc10/silc.c:272
 msgid "Out of memory"
 msgstr "Onvoldoende geheue"
 
-#: ../libpurple/protocols/silc/silc.c:621
-#: ../libpurple/protocols/silc10/silc.c:318
 msgid "Unable to initialize SILC protocol"
 msgstr "Kan nie SILC-protokol inisialiseer nie"
 
-#: ../libpurple/protocols/silc/silc.c:634
-#: ../libpurple/protocols/silc10/silc.c:325
 msgid "Error loading SILC key pair"
 msgstr "Kon nie SILC-sleutelpaar volledig laai nie"
 
-#: ../libpurple/protocols/silc/silc.c:691
-#: ../libpurple/protocols/silc/silc.c:1870
-#: ../libpurple/protocols/silc10/silc.c:405
-#: ../libpurple/protocols/silc10/silc.c:1582
 #, c-format
 msgid "Download %s: %s"
 msgstr "Laai %s af: %s"
 
-#: ../libpurple/protocols/silc/silc.c:975
-#: ../libpurple/protocols/silc10/silc.c:675
 msgid "Your Current Mood"
 msgstr "U huidige stemming"
 
-#: ../libpurple/protocols/silc/silc.c:977
-#: ../libpurple/protocols/silc10/silc.c:677 ../pidgin/gtkprefs.c:2351
 #, c-format
 msgid "Normal"
 msgstr "Normaal"
 
-#: ../libpurple/protocols/silc/silc.c:1002
-#: ../libpurple/protocols/silc10/silc.c:702
 msgid ""
 "\n"
 "Your Preferred Contact Methods"
@@ -13834,63 +9630,36 @@ msgstr ""
 "\n"
 "U voorkeur-kontakmetodes"
 
-#: ../libpurple/protocols/silc/silc.c:1010
-#: ../libpurple/protocols/silc/util.c:568
-#: ../libpurple/protocols/silc10/silc.c:710
-#: ../libpurple/protocols/silc10/util.c:561
 msgid "SMS"
 msgstr "SMS"
 
-#: ../libpurple/protocols/silc/silc.c:1012
-#: ../libpurple/protocols/silc/util.c:570
-#: ../libpurple/protocols/silc10/silc.c:712
-#: ../libpurple/protocols/silc10/util.c:563
 msgid "MMS"
 msgstr "MMS"
 
-#: ../libpurple/protocols/silc/silc.c:1014
-#: ../libpurple/protocols/silc10/silc.c:714
 msgid "Video conferencing"
 msgstr "Videokonferensie"
 
-#: ../libpurple/protocols/silc/silc.c:1019
-#: ../libpurple/protocols/silc10/silc.c:719
 msgid "Your Current Status"
 msgstr "U huidige status"
 
-#: ../libpurple/protocols/silc/silc.c:1026
-#: ../libpurple/protocols/silc10/silc.c:726
 msgid "Online Services"
 msgstr "Aanlyndienste"
 
-#: ../libpurple/protocols/silc/silc.c:1029
-#: ../libpurple/protocols/silc10/silc.c:729
 msgid "Let others see what services you are using"
 msgstr "Laat ander sien watter dienste u gebruik"
 
-#: ../libpurple/protocols/silc/silc.c:1035
-#: ../libpurple/protocols/silc10/silc.c:735
 msgid "Let others see what computer you are using"
 msgstr "Laat ander sien watter rekenaar u gebruik"
 
-#: ../libpurple/protocols/silc/silc.c:1042
-#: ../libpurple/protocols/silc10/silc.c:742
 msgid "Your VCard File"
 msgstr "U VCard-l?er"
 
-#: ../libpurple/protocols/silc/silc.c:1048
 msgid "Timezone (UTC)"
 msgstr "Tydsone (UTC)"
 
-#: ../libpurple/protocols/silc/silc.c:1052
-#: ../libpurple/protocols/silc/silc.c:1053
-#: ../libpurple/protocols/silc10/silc.c:754
-#: ../libpurple/protocols/silc10/silc.c:755
 msgid "User Online Status Attributes"
 msgstr "Attribute van gebruikers se aanlynstatus"
 
-#: ../libpurple/protocols/silc/silc.c:1054
-#: ../libpurple/protocols/silc10/silc.c:756
 msgid ""
 "You can let other users see your online status information and your personal "
 "information. Please fill the information you would like other users to see "
@@ -13900,218 +9669,129 @@ msgstr ""
 "laat sien. Vul gerus die inligting in wat u wil h? ander gebruiker oor u "
 "moet kan sien."
 
-#: ../libpurple/protocols/silc/silc.c:1095
-#: ../libpurple/protocols/silc/silc.c:1101
-#: ../libpurple/protocols/silc/silc.c:1728
-#: ../libpurple/protocols/silc10/silc.c:797
-#: ../libpurple/protocols/silc10/silc.c:803
-#: ../libpurple/protocols/silc10/silc.c:1440
 msgid "Message of the Day"
 msgstr "Dagboodskap"
 
-#: ../libpurple/protocols/silc/silc.c:1095
-#: ../libpurple/protocols/silc10/silc.c:797
 msgid "No Message of the Day available"
 msgstr "Geen dagboodskap nie"
 
-#: ../libpurple/protocols/silc/silc.c:1096
-#: ../libpurple/protocols/silc/silc.c:1723
-#: ../libpurple/protocols/silc10/silc.c:798
-#: ../libpurple/protocols/silc10/silc.c:1435
 msgid "There is no Message of the Day associated with this connection"
 msgstr "Daar word geen dagboodskap met hierdie koppeling geassosieer nie"
 
-#: ../libpurple/protocols/silc/silc.c:1147
-#: ../libpurple/protocols/silc/silc.c:1193
-#: ../libpurple/protocols/silc/silc.c:1264
-#: ../libpurple/protocols/silc/silc.c:1265
-#: ../libpurple/protocols/silc10/silc.c:849
-#: ../libpurple/protocols/silc10/silc.c:893
-#: ../libpurple/protocols/silc10/silc.c:964
-#: ../libpurple/protocols/silc10/silc.c:965
 msgid "Create New SILC Key Pair"
 msgstr "Skep nuwe SILC-sleutelpaar"
 
-#: ../libpurple/protocols/silc/silc.c:1147
-#: ../libpurple/protocols/silc10/silc.c:849
 msgid "Passphrases do not match"
 msgstr "Wagwoordfrases stem nie ooreen nie"
 
-#: ../libpurple/protocols/silc/silc.c:1193
-#: ../libpurple/protocols/silc10/silc.c:893
 msgid "Key Pair Generation failed"
 msgstr "Sleutelpaar-generering het misluk"
 
-#: ../libpurple/protocols/silc/silc.c:1232
-#: ../libpurple/protocols/silc10/silc.c:932
 msgid "Key length"
 msgstr "Sleutellengte"
 
-#: ../libpurple/protocols/silc/silc.c:1234
-#: ../libpurple/protocols/silc10/silc.c:934
 msgid "Public key file"
 msgstr "Publiekesleutell?er"
 
-#: ../libpurple/protocols/silc/silc.c:1236
-#: ../libpurple/protocols/silc10/silc.c:936
 msgid "Private key file"
 msgstr "Privateesleutell?er"
 
-#: ../libpurple/protocols/silc/silc.c:1259
-#: ../libpurple/protocols/silc10/silc.c:959
 msgid "Passphrase (retype)"
 msgstr "Wagwoordfrase (hertik)"
 
-#: ../libpurple/protocols/silc/silc.c:1266
-#: ../libpurple/protocols/silc10/silc.c:966
 msgid "Generate Key Pair"
 msgstr "Genereer sleutelpaar"
 
-#: ../libpurple/protocols/silc/silc.c:1309
-#: ../libpurple/protocols/silc10/silc.c:1009
 msgid "Online Status"
 msgstr "Aanlynstatus"
 
-#: ../libpurple/protocols/silc/silc.c:1317
-#: ../libpurple/protocols/silc10/silc.c:1017
 msgid "View Message of the Day"
 msgstr "Bekyk dagboodskap"
 
-#: ../libpurple/protocols/silc/silc.c:1321
-#: ../libpurple/protocols/silc10/silc.c:1021
 msgid "Create SILC Key Pair..."
 msgstr "Skep SILC-sleutelpaar..."
 
-#: ../libpurple/protocols/silc/silc.c:1416
-#: ../libpurple/protocols/silc10/silc.c:1120
 #, 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:1599
-#: ../libpurple/protocols/silc10/silc.c:1311
 msgid "Topic too long"
 msgstr "Onderwerp te lank"
 
-#: ../libpurple/protocols/silc/silc.c:1680
-#: ../libpurple/protocols/silc10/silc.c:1392
 msgid "You must specify a nick"
 msgstr "U moet 'n bynaam spesifiseer"
 
-#: ../libpurple/protocols/silc/silc.c:1782
-#: ../libpurple/protocols/silc10/silc.c:1494
 #, c-format
 msgid "channel %s not found"
 msgstr "kanaal %s nie gevind nie"
 
-#: ../libpurple/protocols/silc/silc.c:1787
-#: ../libpurple/protocols/silc10/silc.c:1499
 #, c-format
 msgid "channel modes for %s: %s"
 msgstr "kanaalmodusse vir %s: %s"
 
-#: ../libpurple/protocols/silc/silc.c:1789
-#: ../libpurple/protocols/silc10/silc.c:1501
 #, c-format
 msgid "no channel modes are set on %s"
 msgstr "geen kanaalmodusse is gestel op %s nie"
 
-#: ../libpurple/protocols/silc/silc.c:1802
-#: ../libpurple/protocols/silc10/silc.c:1514
 #, c-format
 msgid "Failed to set cmodes for %s"
 msgstr "Stel van cmodusse vir %s het misluk"
 
-#: ../libpurple/protocols/silc/silc.c:1832
-#: ../libpurple/protocols/silc10/silc.c:1544
 #, c-format
 msgid "Unknown command: %s, (may be a client bug)"
 msgstr "Onbekende bevel: %s, (moontlik 'n kli?ntfout)"
 
-#: ../libpurple/protocols/silc/silc.c:1913
-#: ../libpurple/protocols/silc10/silc.c:1625
 msgid "part [channel]:  Leave the chat"
 msgstr "part [kanaal]:  Verlaat die geselsie"
 
-#: ../libpurple/protocols/silc/silc.c:1917
-#: ../libpurple/protocols/silc10/silc.c:1629
 msgid "leave [channel]:  Leave the chat"
 msgstr "leave [kanaal]:  Verlaat die geselsie"
 
-#: ../libpurple/protocols/silc/silc.c:1921
-#: ../libpurple/protocols/silc10/silc.c:1633
 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:1926
-#: ../libpurple/protocols/silc10/silc.c:1638
 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:1930
-#: ../libpurple/protocols/silc10/silc.c:1642
 msgid "list:  List channels on this network"
 msgstr "list:  Lys kanale op hierdie netwerk"
 
-#: ../libpurple/protocols/silc/silc.c:1934
-#: ../libpurple/protocols/silc10/silc.c:1646
 msgid "whois &lt;nick&gt;:  View nick's information"
 msgstr "whois &lt;bynaam&gt;:  Bekyk bynaam se inligting"
 
-#: ../libpurple/protocols/silc/silc.c:1938
-#: ../libpurple/protocols/silc10/silc.c:1650
-#: ../libpurple/protocols/zephyr/zephyr.c:2695
 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:1942
-#: ../libpurple/protocols/silc10/silc.c:1654
 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:1946
-#: ../libpurple/protocols/silc10/silc.c:1658
 msgid "motd:  View the server's Message Of The Day"
 msgstr "motd:  Bekyk die bediener se dagboodskap"
 
-#: ../libpurple/protocols/silc/silc.c:1950
-#: ../libpurple/protocols/silc10/silc.c:1662
 msgid "detach:  Detach this session"
 msgstr "detach:  Ontheg hierdie sessie"
 
-#: ../libpurple/protocols/silc/silc.c:1954
-#: ../libpurple/protocols/silc10/silc.c:1666
 msgid "quit [message]:  Disconnect from the server, with an optional message"
 msgstr "quit [boodskap]:  Ontkoppel van bediener, met 'n opsionele boodskap"
 
-#: ../libpurple/protocols/silc/silc.c:1958
-#: ../libpurple/protocols/silc10/silc.c:1670
 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:1964
-#: ../libpurple/protocols/silc10/silc.c:1676
 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:1968
-#: ../libpurple/protocols/silc10/silc.c:1680
 msgid "nick &lt;newnick&gt;:  Change your nickname"
 msgstr "nick &lt;nuwe bynaam&gt;:  Verander u bynaam"
 
-#: ../libpurple/protocols/silc/silc.c:1972
-#: ../libpurple/protocols/silc10/silc.c:1684
 msgid "whowas &lt;nick&gt;:  View nick's information"
 msgstr "whowas &lt;bynaam&gt;:  Bekyk bynaam se inligting"
 
-#: ../libpurple/protocols/silc/silc.c:1976
-#: ../libpurple/protocols/silc10/silc.c:1688
 msgid ""
 "cmode &lt;channel&gt; [+|-&lt;modes&gt;] [arguments]:  Change or display "
 "channel modes"
@@ -14119,8 +9799,6 @@ msgstr ""
 "cmode &lt;kanaal&gt; [+|-&lt;modusse&gt;] [argumente]:  Verander of wys "
 "kanaalmodusse"
 
-#: ../libpurple/protocols/silc/silc.c:1980
-#: ../libpurple/protocols/silc10/silc.c:1692
 msgid ""
 "cumode &lt;channel&gt; +|-&lt;modes&gt; &lt;nick&gt;:  Change nick's modes "
 "on channel"
@@ -14128,64 +9806,42 @@ msgstr ""
 "cumode &lt;kanaal&gt; +|-&lt;modusse&gt; &lt;bynaam&gt;:  Verander bynaam se "
 "modusse op kanaal"
 
-#: ../libpurple/protocols/silc/silc.c:1984
-#: ../libpurple/protocols/silc10/silc.c:1696
 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:1988
-#: ../libpurple/protocols/silc10/silc.c:1700
 msgid "oper &lt;nick&gt; [-pubkey]:  Get server operator privileges"
 msgstr "oper &lt;bynaam&gt; [-pubkey]:  Kry bedieneroperateur-voorregte"
 
-#: ../libpurple/protocols/silc/silc.c:1992
-#: ../libpurple/protocols/silc10/silc.c:1704
 msgid ""
 "invite &lt;channel&gt; [-|+]&lt;nick&gt;:  invite nick or add/remove from "
 "channel invite list"
 msgstr ""
-"invite &lt;kanaal&gt; [-|+]&lt;bynaam&gt;:  nooi bynaam uit of voeg "
-"by/verwyder van kanaaluitnooilys"
+"invite &lt;kanaal&gt; [-|+]&lt;bynaam&gt;:  nooi bynaam uit of voeg by/"
+"verwyder van kanaaluitnooilys"
 
-#: ../libpurple/protocols/silc/silc.c:1996
-#: ../libpurple/protocols/silc10/silc.c:1708
 msgid "kick &lt;channel&gt; &lt;nick&gt; [comment]:  Kick client from channel"
 msgstr ""
 "kick &lt;kanaal&gt; &lt;bynaam&gt; [kommentaar]:  Skop kli?nt van kanaal"
 
-#: ../libpurple/protocols/silc/silc.c:2000
-#: ../libpurple/protocols/silc10/silc.c:1712
 msgid "info [server]:  View server administrative details"
 msgstr "info [bediener]:  Bekyk bedieneradministrasiedetails"
 
-#: ../libpurple/protocols/silc/silc.c:2004
-#: ../libpurple/protocols/silc10/silc.c:1716
 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:2008
-#: ../libpurple/protocols/silc10/silc.c:1720
 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:2012
-#: ../libpurple/protocols/silc10/silc.c:1724
 msgid "stats:  View server and network statistics"
 msgstr "stats:  Bekyk bediener- en netwerkstatistiek"
 
-#: ../libpurple/protocols/silc/silc.c:2016
-#: ../libpurple/protocols/silc10/silc.c:1728
 msgid "ping:  Send PING to the connected server"
 msgstr "ping:  Stuur PIENG aan die gekoppelde bediener"
 
-#: ../libpurple/protocols/silc/silc.c:2021
-#: ../libpurple/protocols/silc10/silc.c:1733
 msgid "users &lt;channel&gt;:  List users in channel"
 msgstr "users &lt;kanaal&gt;:  Lys gebruikers in kanaal"
 
-#: ../libpurple/protocols/silc/silc.c:2025
-#: ../libpurple/protocols/silc10/silc.c:1737
 msgid ""
 "names [-count|-ops|-halfops|-voices|-normal] &lt;channel(s)&gt;:  List "
 "specific users in channel(s)"
@@ -14202,141 +9858,91 @@ msgstr ""
 #. *< name
 #. *< version
 #. *  summary
-#: ../libpurple/protocols/silc/silc.c:2140
-#: ../libpurple/protocols/silc10/silc.c:1866
 msgid "SILC Protocol Plugin"
 msgstr "SILC-protokolinprop"
 
 #. *  description
-#: ../libpurple/protocols/silc/silc.c:2142
-#: ../libpurple/protocols/silc10/silc.c:1868
 msgid "Secure Internet Live Conferencing (SILC) Protocol"
 msgstr "Beveiligde regstreekse internetkonferensie- (SILC) protokol"
 
-#: ../libpurple/protocols/silc/silc.c:2183
-#: ../libpurple/protocols/silc10/silc.c:1900 ../pidgin/gtkprefs.c:2737
 msgid "Network"
 msgstr "Netwerk"
 
-#: ../libpurple/protocols/silc/silc.c:2194
-#: ../libpurple/protocols/silc10/silc.c:1911
 msgid "Public Key file"
 msgstr "Publiekesleutell?er"
 
-#: ../libpurple/protocols/silc/silc.c:2198
-#: ../libpurple/protocols/silc10/silc.c:1915
 msgid "Private Key file"
 msgstr "Privatesleutel-l?er"
 
-#: ../libpurple/protocols/silc/silc.c:2208
-#: ../libpurple/protocols/silc10/silc.c:1925
 msgid "Cipher"
 msgstr "Syfer"
 
-#: ../libpurple/protocols/silc/silc.c:2218
-#: ../libpurple/protocols/silc10/silc.c:1935
 msgid "HMAC"
 msgstr "HMAC"
 
-#: ../libpurple/protocols/silc/silc.c:2221
 msgid "Use Perfect Forward Secrecy"
 msgstr "Gebruik perfekte vooruitgeheimhouding"
 
-#: ../libpurple/protocols/silc/silc.c:2225
-#: ../libpurple/protocols/silc10/silc.c:1938
 msgid "Public key authentication"
 msgstr "Publiekesleutel-stawing"
 
-#: ../libpurple/protocols/silc/silc.c:2228
-#: ../libpurple/protocols/silc10/silc.c:1941
 msgid "Block IMs without Key Exchange"
 msgstr "Blokkeer kitsboodskappe sonder sleutelruiling"
 
-#: ../libpurple/protocols/silc/silc.c:2231
-#: ../libpurple/protocols/silc10/silc.c:1944
 msgid "Block messages to whiteboard"
 msgstr "Blokkeer boodskappe aan witbord"
 
-#: ../libpurple/protocols/silc/silc.c:2234
-#: ../libpurple/protocols/silc10/silc.c:1947
 msgid "Automatically open whiteboard"
 msgstr "Open witbord outomaties"
 
-#: ../libpurple/protocols/silc/silc.c:2237
-#: ../libpurple/protocols/silc10/silc.c:1950
 msgid "Digitally sign and verify all messages"
 msgstr "Onder digitaal en verifieer alle boodskappe"
 
-#: ../libpurple/protocols/silc/util.c:208
-#: ../libpurple/protocols/silc/util.c:251
-#: ../libpurple/protocols/silc10/util.c:207
-#: ../libpurple/protocols/silc10/util.c:247
 msgid "Creating SILC key pair..."
 msgstr "Skep tans SILC-sleutelpaar..."
 
-#: ../libpurple/protocols/silc/util.c:217
-#: ../libpurple/protocols/silc/util.c:260
 msgid "Unable to create SILC key pair"
 msgstr "Kan nie SILC-sleutelpaar skep nie"
 
 #. 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:364
-#: ../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:366
-#: ../libpurple/protocols/silc10/util.c:357
 #, c-format
 msgid "User Name: \t%s\n"
 msgstr "Gebruikernaam: \t%s\n"
 
-#: ../libpurple/protocols/silc/util.c:368
-#: ../libpurple/protocols/silc10/util.c:359
 #, c-format
 msgid "Email: \t\t%s\n"
 msgstr "E-pos: \t\t%s\n"
 
-#: ../libpurple/protocols/silc/util.c:370
-#: ../libpurple/protocols/silc10/util.c:361
 #, c-format
 msgid "Host Name: \t%s\n"
 msgstr "Gasheernaam: \t%s\n"
 
-#: ../libpurple/protocols/silc/util.c:372
-#: ../libpurple/protocols/silc10/util.c:363
 #, c-format
 msgid "Organization: \t%s\n"
 msgstr "Organisasie: \t%s\n"
 
-#: ../libpurple/protocols/silc/util.c:374
-#: ../libpurple/protocols/silc10/util.c:365
 #, c-format
 msgid "Country: \t%s\n"
 msgstr "Land: \t%s\n"
 
-#: ../libpurple/protocols/silc/util.c:375
-#: ../libpurple/protocols/silc10/util.c:366
 #, c-format
 msgid "Algorithm: \t%s\n"
 msgstr "Algoritme: \t%s\n"
 
-#: ../libpurple/protocols/silc/util.c:376
-#: ../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:378
 #, c-format
 msgid "Version: \t%s\n"
 msgstr "Weergawe: \t%s\n"
 
-#: ../libpurple/protocols/silc/util.c:380
-#: ../libpurple/protocols/silc10/util.c:369
 #, c-format
 msgid ""
 "Public Key Fingerprint:\n"
@@ -14347,8 +9953,6 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: ../libpurple/protocols/silc/util.c:381
-#: ../libpurple/protocols/silc10/util.c:370
 #, c-format
 msgid ""
 "Public Key Babbleprint:\n"
@@ -14357,44 +9961,28 @@ msgstr ""
 "Publiekesleutel-babbelafdruk\n"
 "%s"
 
-#: ../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:566
-#: ../libpurple/protocols/silc10/util.c:559
 msgid "Paging"
 msgstr "Roeping"
 
-#: ../libpurple/protocols/silc/util.c:572
-#: ../libpurple/protocols/silc10/util.c:565
 msgid "Video Conferencing"
 msgstr "Videokonferensie"
 
-#: ../libpurple/protocols/silc/util.c:590
-#: ../libpurple/protocols/silc10/util.c:584
 msgid "Computer"
 msgstr "Rekenaar"
 
-#: ../libpurple/protocols/silc/util.c:594
-#: ../libpurple/protocols/silc10/util.c:588
 msgid "PDA"
 msgstr "PDA"
 
-#: ../libpurple/protocols/silc/util.c:596
-#: ../libpurple/protocols/silc10/util.c:590
 msgid "Terminal"
 msgstr "Terminaal"
 
-#: ../libpurple/protocols/silc/wb.c:289 ../libpurple/protocols/silc10/wb.c:287
 #, c-format
 msgid "%s sent message to whiteboard. Would you like to open the whiteboard?"
 msgstr "%s het boodskap na witbord gestuur. Wil u die witbord open?"
 
-#: ../libpurple/protocols/silc/wb.c:293 ../libpurple/protocols/silc10/wb.c:291
 #, c-format
 msgid ""
 "%s sent message to whiteboard on %s channel. Would you like to open the "
@@ -14402,102 +9990,78 @@ msgstr ""
 msgstr ""
 "%s het boodskap na witbord op %s kanaal gestuur. Wil u die witbord open?"
 
-#: ../libpurple/protocols/silc/wb.c:307 ../libpurple/protocols/silc10/wb.c:305
 msgid "Whiteboard"
 msgstr "Witbord"
 
-#: ../libpurple/protocols/silc10/ops.c:1559
 msgid "No server statistics available"
 msgstr "Geen bedienerstatistiek beskikbaar nie"
 
-#: ../libpurple/protocols/silc10/ops.c:1701
 msgid "Error during connecting to SILC Server"
 msgstr "Kon nie volledig aan SILC-bediener koppel nie"
 
-#: ../libpurple/protocols/silc10/ops.c:1937
 #, c-format
 msgid "Failure: Version mismatch, upgrade your client"
 msgstr "Mislukking: Weergawe pas nie, gradeer u kli?nt op"
 
-#: ../libpurple/protocols/silc10/ops.c:1940
 #, c-format
 msgid "Failure: Remote does not trust/support your public key"
 msgstr ""
 "Mislukking: Afgele? entiteit vertrou/ondersteun nie u publieke sleutel nie"
 
-#: ../libpurple/protocols/silc10/ops.c:1943
 #, 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:1946
 #, c-format
 msgid "Failure: Remote does not support proposed cipher"
 msgstr "Mislukking: Afgele? ondersteun nie voorgestelde syfer nie"
 
-#: ../libpurple/protocols/silc10/ops.c:1949
 #, c-format
 msgid "Failure: Remote does not support proposed PKCS"
 msgstr "Mislukking: Afgele? ondersteun nie voorgestelde PKCS nie"
 
-#: ../libpurple/protocols/silc10/ops.c:1952
 #, c-format
 msgid "Failure: Remote does not support proposed hash function"
 msgstr "Mislukking: Afgele? ondersteun nie voorgestelde hutsfunksie nie"
 
-#: ../libpurple/protocols/silc10/ops.c:1955
 #, c-format
 msgid "Failure: Remote does not support proposed HMAC"
 msgstr "Mislukking: Afgele? ondersteun nie voorgestelde HMAC nie"
 
-#: ../libpurple/protocols/silc10/ops.c:1957
 #, c-format
 msgid "Failure: Incorrect signature"
 msgstr "Mislukking: Verkeerde handtekening"
 
-#: ../libpurple/protocols/silc10/ops.c:1959
 #, c-format
 msgid "Failure: Invalid cookie"
 msgstr "Mislukking: Ongeldige koekie"
 
-#: ../libpurple/protocols/silc10/ops.c:1970
 #, c-format
 msgid "Failure: Authentication failed"
 msgstr "Mislukking: Stawing het misluk"
 
-#: ../libpurple/protocols/silc10/silc.c:186
 msgid "Unable to initialize SILC Client connection"
 msgstr "Kan nie SILC-kli?ntkoppeling inisialiseer nie"
 
-#: ../libpurple/protocols/silc10/silc.c:295
 msgid "John Noname"
 msgstr "Naamloos Niemand"
 
-#: ../libpurple/protocols/silc10/silc.c:339
 #, c-format
 msgid "Unable to load SILC key pair: %s"
 msgstr "Kan nie SILC-sleutelpaar laai nie: %s"
 
-#: ../libpurple/protocols/silc10/silc.c:362
 msgid "Unable to create connection"
 msgstr "Kon nie koppeling skep nie"
 
-#: ../libpurple/protocols/simple/simple.c:1142
 msgid "Unknown server response"
 msgstr "Onbekende bedienerrespons"
 
-#: ../libpurple/protocols/simple/simple.c:1780
-#: ../libpurple/protocols/simple/simple.c:1830
-#: ../libpurple/protocols/simple/simple.c:1845
-#: ../libpurple/protocols/simple/simple.c:1900
 msgid "Unable to create listen socket"
 msgstr "Kan nie luistersok skep nie"
 
-#: ../libpurple/protocols/simple/simple.c:1928
 msgid "SIP usernames may not contain whitespaces or @ symbols"
 msgstr "SIP-gebruikername mag nie spasies of @-simbole bevat nie"
 
-#: ../libpurple/protocols/simple/simple.c:1945
 msgid "SIP connect server not specified"
 msgstr "SIP-koppelbediener is nie gespesifiseer nie"
 
@@ -14509,56 +10073,41 @@ msgstr "SIP-koppelbediener is nie gespes
 #. *< id
 #. *< name
 #. *< version
-#: ../libpurple/protocols/simple/simple.c:2133
 msgid "SIP/SIMPLE Protocol Plugin"
 msgstr "SIP/SIMPLE-protokolinprop"
 
 #. *  summary
-#: ../libpurple/protocols/simple/simple.c:2134
 msgid "The SIP/SIMPLE Protocol Plugin"
 msgstr "Die SIP/SIMPLE-protokolinprop"
 
-#: ../libpurple/protocols/simple/simple.c:2162
 msgid "Publish status (note: everyone may watch you)"
 msgstr "Publiseer status (let wel: almal kan u dophou)"
 
-#: ../libpurple/protocols/simple/simple.c:2168
 msgid "Use UDP"
 msgstr "Gebruik UDP"
 
-#: ../libpurple/protocols/simple/simple.c:2170
 msgid "Use proxy"
 msgstr "Gebruik instaanbediener"
 
-#: ../libpurple/protocols/simple/simple.c:2172 ../pidgin/gtkprefs.c:2738
 msgid "Proxy"
 msgstr "Instaanbediener"
 
-#: ../libpurple/protocols/simple/simple.c:2174
 msgid "Auth User"
 msgstr "Magtig gebruiker"
 
-#: ../libpurple/protocols/simple/simple.c:2176
 msgid "Auth Domain"
 msgstr "Magtig domein"
 
-#: ../libpurple/protocols/yahoo/libyahoo.c:44
-#: ../libpurple/protocols/yahoo/libyahoojp.c:41
 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/libyahoo.c:49
-#: ../libpurple/protocols/yahoo/libyahoojp.c:46
 msgid "list: List rooms on the Yahoo network"
 msgstr "list: Lys kamers op die Yahoo-netwerk"
 
-#: ../libpurple/protocols/yahoo/libyahoo.c:57
-#: ../libpurple/protocols/yahoo/libyahoojp.c:54
 msgid "doodle: Request user to start a Doodle session"
 msgstr "doodle: Versoek gebruiker om 'n krabbelsessie te begin"
 
-#: ../libpurple/protocols/yahoo/libyahoo.c:166
 msgid "Yahoo ID..."
 msgstr "Yahoo-ID..."
 
@@ -14572,47 +10121,30 @@ msgstr "Yahoo-ID..."
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/yahoo/libyahoo.c:287
-#: ../libpurple/protocols/yahoo/libyahoo.c:289
 msgid "Yahoo! Protocol Plugin"
 msgstr "Inprop vir die Yahoo!-protokol"
 
-#: ../libpurple/protocols/yahoo/libyahoo.c:312
-#: ../libpurple/protocols/yahoo/libyahoojp.c:208
 msgid "Pager port"
 msgstr "Roeper-poort"
 
-#: ../libpurple/protocols/yahoo/libyahoo.c:315
-#: ../libpurple/protocols/yahoo/libyahoojp.c:211
 msgid "File transfer server"
 msgstr "L?eroordragbediener"
 
-#: ../libpurple/protocols/yahoo/libyahoo.c:318
-#: ../libpurple/protocols/yahoo/libyahoojp.c:214
 msgid "File transfer port"
 msgstr "L?eroordragpoort"
 
-#: ../libpurple/protocols/yahoo/libyahoo.c:321
-#: ../libpurple/protocols/yahoo/libyahoojp.c:217
 msgid "Chat room locale"
 msgstr "Geselsiekamer-lokaliteit"
 
-#: ../libpurple/protocols/yahoo/libyahoo.c:327
-#: ../libpurple/protocols/yahoo/libyahoojp.c:223
 msgid "Ignore conference and chatroom invitations"
 msgstr "Ignoreer konferensie- en geselsiekamer-uitnodigings"
 
-#: ../libpurple/protocols/yahoo/libyahoo.c:330
-#: ../libpurple/protocols/yahoo/libyahoojp.c:226
 msgid "Use account proxy for SSL connections"
 msgstr "Gebruik rekening se instaanbediener vir SSL-koppelings"
 
-#: ../libpurple/protocols/yahoo/libyahoo.c:334
-#: ../libpurple/protocols/yahoo/libyahoojp.c:230
 msgid "Chat room list URL"
 msgstr "Geselsiekamer-lys-URL"
 
-#: ../libpurple/protocols/yahoo/libyahoojp.c:62
 msgid "Yahoo JAPAN ID..."
 msgstr "Yahoo JAPAN-ID..."
 
@@ -14626,31 +10158,24 @@ msgstr "Yahoo JAPAN-ID..."
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/yahoo/libyahoojp.c:183
-#: ../libpurple/protocols/yahoo/libyahoojp.c:185
 msgid "Yahoo! JAPAN Protocol Plugin"
 msgstr "Inprop vir die Yahoo! JAPAN-protokol"
 
-#: ../libpurple/protocols/yahoo/libymsg.c:876
 #, c-format
 msgid "%s has sent you a webcam invite, which is not yet supported."
 msgstr ""
 "%s het u 'n webkamera-uitnodiging gestuur, wat nog nie ondersteun word nie."
 
-#: ../libpurple/protocols/yahoo/libymsg.c:936
 msgid "Your SMS was not delivered"
 msgstr "U SMS is nie afgelewer nie"
 
-#: ../libpurple/protocols/yahoo/libymsg.c:1077
 msgid "Your Yahoo! message did not get sent."
 msgstr "U Yahoo!-boodskap is nie gestuur nie."
 
-#: ../libpurple/protocols/yahoo/libymsg.c:1184
 #, c-format
 msgid "Yahoo! system message for %s:"
 msgstr "Yahoo!-stelselboodskap vir %s:"
 
-#: ../libpurple/protocols/yahoo/libymsg.c:1302
 #, c-format
 msgid ""
 "%s has (retroactively) denied your request to add them to your list for the "
@@ -14659,32 +10184,26 @@ msgstr ""
 "%s het (retroaktief) u versoek om hulle by u vriendelys te voeg, geweier, "
 "vir die volgende rede: %s."
 
-#: ../libpurple/protocols/yahoo/libymsg.c:1305
 #, 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/libymsg.c:1307
 msgid "Add buddy rejected"
 msgstr "Vriend byvoeg geweier"
 
 #. Some error in the received stream
-#: ../libpurple/protocols/yahoo/libymsg.c:1875
-#: ../libpurple/protocols/yahoo/libymsg.c:1961
 msgid "Received invalid data"
 msgstr "Het ongeldige data ontvang"
 
 #. security lock from too many failed login attempts
-#: ../libpurple/protocols/yahoo/libymsg.c:1974
 msgid ""
 "Account locked: Too many failed login attempts.  Logging into the Yahoo! "
 "website may fix this."
 msgstr ""
-"Rekening gesluit: te veel mislukte aanmeldpogings.  As u by die "
-"Yahoo!-webwerf aanmeld, kan dit dalk die probleem oplos."
+"Rekening gesluit: te veel mislukte aanmeldpogings.  As u by die Yahoo!-"
+"webwerf aanmeld, kan dit dalk die probleem oplos."
 
 #. indicates a lock of some description
-#: ../libpurple/protocols/yahoo/libymsg.c:1985
 msgid ""
 "Account locked: Unknown reason.  Logging into the Yahoo! website may fix "
 "this."
@@ -14693,7 +10212,6 @@ msgstr ""
 "dit dalk die probleem oplos."
 
 #. indicates a lock due to logging in too frequently
-#: ../libpurple/protocols/yahoo/libymsg.c:1991
 msgid ""
 "Account locked: You have been logging in too frequently.  Wait a few minutes "
 "before trying to connect again.  Logging into the Yahoo! website may help."
@@ -14703,11 +10221,9 @@ msgstr ""
 "Yahoo!-webwerf."
 
 #. username or password missing
-#: ../libpurple/protocols/yahoo/libymsg.c:1998
 msgid "Username or password missing"
 msgstr "Gebruikernaam of wagwoord ontbreek"
 
-#: ../libpurple/protocols/yahoo/libymsg.c:2100
 #, c-format
 msgid ""
 "The Yahoo server has requested the use of an unrecognized authentication "
@@ -14718,11 +10234,9 @@ msgstr ""
 "versoek.  U sal waarskynlik nie suksesvol by Yahoo kan inteken nie.  "
 "Kontroleer %s vir bywerkings."
 
-#: ../libpurple/protocols/yahoo/libymsg.c:2104
 msgid "Failed Yahoo! Authentication"
 msgstr "Yahoo!-stawing het misluk"
 
-#: ../libpurple/protocols/yahoo/libymsg.c:2185
 #, c-format
 msgid ""
 "You have tried to ignore %s, but the user is on your buddy list.  Clicking "
@@ -14731,15 +10245,12 @@ msgstr ""
 "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/libymsg.c:2188
 msgid "Ignore buddy?"
 msgstr "Ignoreer vriend?"
 
-#: ../libpurple/protocols/yahoo/libymsg.c:2260
 msgid "Invalid username or password"
 msgstr "Ongeldige gebruikernaam of wagwoord"
 
-#: ../libpurple/protocols/yahoo/libymsg.c:2264
 msgid ""
 "Your account has been locked due to too many failed login attempts.  Please "
 "try logging into the Yahoo! website."
@@ -14747,12 +10258,10 @@ msgstr ""
 "U rekening is vasgesluit weens te veel mislukte pogings om aan te meld.  "
 "Probeer o mby die Yahoo!-webwerf aan te meld."
 
-#: ../libpurple/protocols/yahoo/libymsg.c:2271
 #, c-format
 msgid "Unknown error 52.  Reconnecting should fix this."
 msgstr "Onbekende fout 52.  Herkoppeling behoort dit op te los."
 
-#: ../libpurple/protocols/yahoo/libymsg.c:2275
 msgid ""
 "Error 1013: The username you have entered is invalid.  The most common cause "
 "of this error is entering your email address instead of your Yahoo! ID."
@@ -14760,47 +10269,38 @@ msgstr ""
 "Fout 1013: Die gegewe gebruikernaam is ongeldig.  Die algemeenste oorsaak "
 "van di? fout is as mens die e-posadres gee in plaas van die Yahoo!-ID."
 
-#: ../libpurple/protocols/yahoo/libymsg.c:2281
 #, 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 "
 "die probleem oplos."
 
-#: ../libpurple/protocols/yahoo/libymsg.c:2370
 #, c-format
 msgid "Unable to add buddy %s to group %s to the server list on account %s."
 msgstr ""
 "Kan nie vriend %s by groep %s op die bedienerlys op rekening %s voeg nie."
 
-#: ../libpurple/protocols/yahoo/libymsg.c:2373
 msgid "Unable to add buddy to server list"
 msgstr "Kan nie vriend by bedienerlys voeg nie"
 
-#: ../libpurple/protocols/yahoo/libymsg.c:2968
 #, c-format
 msgid "[ Audible %s/%s/%s.swf ] %s"
 msgstr "[ Hoorbaar %s/%s/%s.swf ] %s"
 
-#: ../libpurple/protocols/yahoo/libymsg.c:3314
 msgid "Received unexpected HTTP response from server"
 msgstr "Onverwagte HTTP-respons van die bediener ontvang"
 
-#: ../libpurple/protocols/yahoo/libymsg.c:3370
 #, c-format
 msgid "Lost connection with %s: %s"
 msgstr "Verbinding met %s verloor: %s"
 
-#: ../libpurple/protocols/yahoo/libymsg.c:3395
 #, c-format
 msgid "Unable to establish a connection with %s: %s"
 msgstr "Kan nie 'n koppeling met die %s bewerkstellig nie: %s"
 
-#: ../libpurple/protocols/yahoo/libymsg.c:3608
 msgid "Unable to connect: The server returned an empty response."
 msgstr "Kan nie koppel nie: Die bediener het 'n le? antwoord gegee."
 
-#: ../libpurple/protocols/yahoo/libymsg.c:3635
 msgid ""
 "Unable to connect: The server's response did not contain the necessary "
 "information"
@@ -14808,153 +10308,105 @@ msgstr ""
 "Kan nie koppel nie: Die bediener se antwoord het nie die nodige inligting "
 "bevat nie"
 
-#: ../libpurple/protocols/yahoo/libymsg.c:3825
-#: ../libpurple/protocols/yahoo/libymsg.c:4849
 msgid "Not at Home"
 msgstr "Nie tuis nie"
 
-#: ../libpurple/protocols/yahoo/libymsg.c:3827
-#: ../libpurple/protocols/yahoo/libymsg.c:4852
 msgid "Not at Desk"
 msgstr "Nie by die lessenaar nie"
 
-#: ../libpurple/protocols/yahoo/libymsg.c:3829
-#: ../libpurple/protocols/yahoo/libymsg.c:4855
 msgid "Not in Office"
 msgstr "Nie op kantoor nie"
 
-#: ../libpurple/protocols/yahoo/libymsg.c:3833
-#: ../libpurple/protocols/yahoo/libymsg.c:4861
 msgid "On Vacation"
 msgstr "Op vakansie"
 
-#: ../libpurple/protocols/yahoo/libymsg.c:3837
-#: ../libpurple/protocols/yahoo/libymsg.c:4867
 msgid "Stepped Out"
 msgstr "Uit"
 
-#: ../libpurple/protocols/yahoo/libymsg.c:3937
-#: ../libpurple/protocols/yahoo/libymsg.c:3969
 msgid "Not on server list"
 msgstr "Nie op bedienerlys nie"
 
-#: ../libpurple/protocols/yahoo/libymsg.c:3986
-#: ../libpurple/protocols/yahoo/libymsg.c:4064
 msgid "Appear Online"
 msgstr "Lyk of aanlyn is"
 
-#: ../libpurple/protocols/yahoo/libymsg.c:3989
-#: ../libpurple/protocols/yahoo/libymsg.c:4085
 msgid "Appear Permanently Offline"
 msgstr "Lyk of permanent vanlyn is"
 
-#: ../libpurple/protocols/yahoo/libymsg.c:4007
 msgid "Presence"
 msgstr "Teenwoordigheid"
 
-#: ../libpurple/protocols/yahoo/libymsg.c:4070
 msgid "Appear Offline"
 msgstr "Lyk of vanlyn is"
 
-#: ../libpurple/protocols/yahoo/libymsg.c:4079
 msgid "Don't Appear Permanently Offline"
 msgstr "Moenie lyk of permanent vanlyn is nie"
 
-#: ../libpurple/protocols/yahoo/libymsg.c:4138
 msgid "Join in Chat"
 msgstr "Sluit by geselsie aan"
 
-#: ../libpurple/protocols/yahoo/libymsg.c:4144
 msgid "Initiate Conference"
 msgstr "Inisieer konferensie"
 
-#: ../libpurple/protocols/yahoo/libymsg.c:4172
 msgid "Presence Settings"
 msgstr "Teenwoordigheid-stellings"
 
-#: ../libpurple/protocols/yahoo/libymsg.c:4177
 msgid "Start Doodling"
 msgstr "Begin krabbel"
 
-#: ../libpurple/protocols/yahoo/libymsg.c:4316
 msgid "Select the ID you want to activate"
 msgstr "Kies die ID wat u wil aktiveer"
 
-#: ../libpurple/protocols/yahoo/libymsg.c:4327
 msgid "Join whom in chat?"
 msgstr "Sluit by wie in geselsie aan?"
 
-#: ../libpurple/protocols/yahoo/libymsg.c:4343
 msgid "Activate ID..."
 msgstr "Aktiveer ID..."
 
-#: ../libpurple/protocols/yahoo/libymsg.c:4347
 msgid "Join User in Chat..."
 msgstr "Sluit gebruiker by geselsie aan..."
 
-#: ../libpurple/protocols/yahoo/libymsg.c:4352
 msgid "Open Inbox"
 msgstr "Open inkassie"
 
-#: ../libpurple/protocols/yahoo/libymsg.c:4377
-#: ../libpurple/protocols/yahoo/libymsg.c:4472
 msgid "Can't send SMS. Unable to obtain mobile carrier."
 msgstr "Kan nie SMS stuur nie. Kan nie 'n selfoonnetwerk kry nie."
 
-#: ../libpurple/protocols/yahoo/libymsg.c:4407
-#: ../libpurple/protocols/yahoo/libymsg.c:4536
 msgid "Can't send SMS. Unknown mobile carrier."
 msgstr "Kan nie SMS stuur nie. Onbekende selfoonnetwerk."
 
-#: ../libpurple/protocols/yahoo/libymsg.c:4527
 msgid "Getting mobile carrier to send the SMS."
 msgstr ""
 
 #. Write a local message to this conversation showing that a request for a
 #. * Doodle session has been made
 #.
-#: ../libpurple/protocols/yahoo/yahoo_doodle.c:97
 msgid "Sent Doodle request."
 msgstr "Krabbelversoek gestuur."
 
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:167
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:247
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:1248
 msgid "Unable to connect."
 msgstr "Kan nie koppel nie."
 
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:328
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:337
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:346
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:1152
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:1857
 msgid "Unable to establish file descriptor."
 msgstr "Kon nie l?erbeskrywer bewerkstellig nie."
 
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:1757
 #, c-format
 msgid "%s is trying to send you a group of %d files.\n"
 msgstr "%s probeer om groep van %d l?ers aan u te stuur.\n"
 
-#: ../libpurple/protocols/yahoo/yahoo_packet.c:306
 msgid "Write Error"
 msgstr "Skryffout"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:799
 msgid "Yahoo! Japan Profile"
 msgstr "Yahoo! Japan-profiel"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:800
 msgid "Yahoo! Profile"
 msgstr "Yahoo!-profiel"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:840
 msgid ""
 "Sorry, profiles marked as containing adult content are not supported at this "
 "time."
 msgstr "Jammer, profiele met volwassene-inhoud word nie tans ondersteun nie."
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:842
 msgid ""
 "If you wish to view this profile, you will need to visit this link in your "
 "web browser:"
@@ -14962,49 +10414,35 @@ msgstr ""
 "Indien u hierdie profiel wil bekyk, moet u hierdie skakel in u webblaaier "
 "besoek:"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1034
 msgid "Yahoo! ID"
 msgstr "Yahoo!-ID"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1110
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1114
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1118
 msgid "Hobbies"
 msgstr "Stokperdjies"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1128
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1132
 msgid "Latest News"
 msgstr "Jongste nuus"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1153
 msgid "Home Page"
 msgstr "Tuisblad"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1168
 msgid "Cool Link 1"
 msgstr "Oulike skakel 1"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1173
 msgid "Cool Link 2"
 msgstr "Oulike skakel 2"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1177
 msgid "Cool Link 3"
 msgstr "Oulike skakel 3"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1191
 msgid "Last Update"
 msgstr "Laaste bywerking"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1204
 msgid ""
 "This profile is in a language or format that is not supported at this time."
 msgstr ""
-"Hierdie profiel is in 'n taal of formaat is wat nie tans ondersteun word "
-"nie."
+"Hierdie profiel is in 'n taal of formaat is wat nie tans ondersteun word nie."
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1221
 msgid ""
 "Could not retrieve the user's profile. This most likely is a temporary "
 "server-side problem. Please try again later."
@@ -15012,7 +10450,6 @@ msgstr ""
 "Kon nie die gebruiker se profiel haal nie. Dit is waarskynlik 'n tydelike "
 "probleem aan bedienerkant. Probeer gerus later weer."
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1224
 msgid ""
 "Could not retrieve the user's profile. This most likely means that the user "
 "does not exist; however, Yahoo! sometimes does fail to find a user's "
@@ -15023,35 +10460,28 @@ msgstr ""
 "se profiel te vind nie. As u weet dat die gebruiker wel bestaan, probeer "
 "gerus later weer."
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1230
 msgid "The user's profile is empty."
 msgstr "Die gebruiker se profiel is leeg."
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:255
 #, c-format
 msgid "%s has declined to join."
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:478
 msgid "Failed to join chat"
 msgstr "Aansluit by geselsie het misluk"
 
 #. -6
-#: ../libpurple/protocols/yahoo/yahoochat.c:481
 msgid "Unknown room"
 msgstr "Onbekende kamer"
 
 #. -15
-#: ../libpurple/protocols/yahoo/yahoochat.c:484
 msgid "Maybe the room is full"
 msgstr "Miskien is die kamer vol"
 
 #. -35
-#: ../libpurple/protocols/yahoo/yahoochat.c:487
 msgid "Not available"
 msgstr "Nie beskikbaar nie"
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:491
 msgid ""
 "Unknown error. You may need to logout and wait five minutes before being "
 "able to rejoin a chatroom"
@@ -15059,51 +10489,37 @@ msgstr ""
 "Onbekende fout. U moet dalk afmeld en vyf minute wag voor u weer die "
 "geselsiekamer kan betree"
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:574
 #, c-format
 msgid "You are now chatting in %s."
 msgstr "U gesels nou in %s."
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:763
 msgid "Failed to join buddy in chat"
 msgstr "Kon nie vriend by geselsie laat aansluit nie"
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:764
 msgid "Maybe they're not in a chat?"
 msgstr "Dalk wil hulle nie gesels nie?"
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:1460
-#: ../libpurple/protocols/yahoo/yahoochat.c:1486
 msgid "Fetching the room list failed."
 msgstr "Haal van kamerlys het misluk."
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:1546
 msgid "Voices"
 msgstr "Stemme"
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:1549
 msgid "Webcams"
 msgstr "Webkameras"
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:1560
-#: ../libpurple/protocols/yahoo/yahoochat.c:1631
 msgid "Connection problem"
 msgstr "Verbindingprobleem"
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:1560
-#: ../libpurple/protocols/yahoo/yahoochat.c:1631
 msgid "Unable to fetch room list."
 msgstr "Kon nie die kamerlys haal nie."
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:1623
 msgid "User Rooms"
 msgstr "Gebruikerkamers"
 
-#: ../libpurple/protocols/yahoo/ycht.c:457
 msgid "Connection problem with the YCHT server"
 msgstr "Verbindingprobleem met die YCHT-bediener"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:357
 msgid ""
 "(There was an error converting this message.\t Check the 'Encoding' option "
 "in the Account Editor)"
@@ -15111,110 +10527,88 @@ msgstr ""
 "(Kon nie hierdie boodskap omskakel nie.\t Kontroleer die 'Enkodering'-opsie "
 "in die Rekeningredigeerder)"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:755
 #, c-format
 msgid "Unable to send to chat %s,%s,%s"
 msgstr "Kan nie aan geselsie %s,%s,%s stuur nie"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:800
-#: ../libpurple/protocols/zephyr/zephyr.c:1183
 msgid "Hidden or not logged-in"
 msgstr "Versteek of nie aangemeld nie"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:806
-#: ../libpurple/protocols/zephyr/zephyr.c:1185
 #, c-format
 msgid "<br>At %s since %s"
 msgstr "<br>Te %s sedert %s"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:1507
-#: ../libpurple/protocols/zephyr/zephyr.c:1508
 msgid "Anyone"
 msgstr "Enigeen"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2359
 msgid "_Class:"
 msgstr "_Klas:"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2365
 msgid "_Instance:"
 msgstr "_Geval:"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2371
 msgid "_Recipient:"
 msgstr "_Ontvanger:"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2382
 #, c-format
 msgid "Attempt to subscribe to %s,%s,%s failed"
 msgstr "Poging om by %s,%s,%s in te teken, het misluk"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2700
 msgid "zlocate &lt;nick&gt;: Locate user"
 msgstr "zlocate &lt;bynaam&gt;: Vind gebruiker"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2705
 msgid "zl &lt;nick&gt;: Locate user"
 msgstr "zl &lt;bynaam&gt;: Vind gebruiker"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2710
 msgid "instance &lt;instance&gt;: Set the instance to be used on this class"
 msgstr ""
 "instance &lt;geval&gt;: Stel die geval wat gebruik moet word op hierdie klas"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2715
 msgid "inst &lt;instance&gt;: Set the instance to be used on this class"
 msgstr ""
 "inst &lt;geval&gt;: Stel die geval wat gebruik moet word op hierdie klas"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2720
 msgid "topic &lt;instance&gt;: Set the instance to be used on this class"
 msgstr ""
 "topic &lt;geval&gt;: Stel die geval wat gebruik moet word op hierdie klas"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2726
 msgid "sub &lt;class&gt; &lt;instance&gt; &lt;recipient&gt;: Join a new chat"
 msgstr ""
 "sub &lt;klas&gt; &lt;geval&gt; &lt;ontvanger&gt;: Sluit by nuwe geselsie aan"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2731
 msgid ""
 "zi &lt;instance&gt;: Send a message to &lt;message,<i>instance</i>,*&gt;"
-msgstr "zi &lt;geval&gt;: Stuur 'n boodskap aan &lt;boodskap,<i>geval</i>,*&gt;"
+msgstr ""
+"zi &lt;geval&gt;: Stuur 'n boodskap aan &lt;boodskap,<i>geval</i>,*&gt;"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2737
 msgid ""
 "zci &lt;class&gt; &lt;instance&gt;: Send a message to &lt;<i>class</i>,"
 "<i>instance</i>,*&gt;"
 msgstr ""
-"zci &lt;klas&gt; &lt;geval&gt;: Stuur 'n boodskap aan "
-"&lt;<i>klas</i>,<i>geval</i>,*&gt;"
+"zci &lt;klas&gt; &lt;geval&gt;: Stuur 'n boodskap aan &lt;<i>klas</i>,"
+"<i>geval</i>,*&gt;"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2743
 msgid ""
 "zcir &lt;class&gt; &lt;instance&gt; &lt;recipient&gt;: Send a message to &lt;"
 "<i>class</i>,<i>instance</i>,<i>recipient</i>&gt;"
 msgstr ""
-"zcir &lt;klas&gt; &lt;geval&gt; &lt;ontvanger&gt;: Stuur 'n boodskap aan "
-"&lt;<i>klas</i>,<i>geval</i>,<i>ontvanger</i>&gt;"
+"zcir &lt;klas&gt; &lt;geval&gt; &lt;ontvanger&gt;: Stuur 'n boodskap aan &lt;"
+"<i>klas</i>,<i>geval</i>,<i>ontvanger</i>&gt;"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2749
 msgid ""
 "zir &lt;instance&gt; &lt;recipient&gt;: Send a message to &lt;MESSAGE,"
 "<i>instance</i>,<i>recipient</i>&gt;"
 msgstr ""
-"zir &lt;geval&gt; &lt;ontvanger&gt;: Stuur 'n boodskap aan "
-"&lt;BOODSKAP,<i>geval</i>,<i>ontvanger</i>&gt;"
+"zir &lt;geval&gt; &lt;ontvanger&gt;: Stuur 'n boodskap aan &lt;BOODSKAP,"
+"<i>geval</i>,<i>ontvanger</i>&gt;"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2754
 msgid "zc &lt;class&gt;: Send a message to &lt;<i>class</i>,PERSONAL,*&gt;"
-msgstr "zc &lt;klas&gt;: Stuur 'n boodskap aan &lt;<i>klas</i>,PERSOONLIK,*&gt;"
+msgstr ""
+"zc &lt;klas&gt;: Stuur 'n boodskap aan &lt;<i>klas</i>,PERSOONLIK,*&gt;"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2830
 msgid "Resubscribe"
 msgstr "Teken weer in"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2833
 msgid "Retrieve subscriptions from server"
 msgstr "Haal intekenings van bediener"
 
@@ -15228,76 +10622,57 @@ msgstr "Haal intekenings van bediener"
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/zephyr/zephyr.c:2931
-#: ../libpurple/protocols/zephyr/zephyr.c:2933
 msgid "Zephyr Protocol Plugin"
 msgstr "Inprop vir die Zephyr-protokol"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2958
 msgid "Use tzc"
 msgstr "Gebruik tzc"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2961
 msgid "tzc command"
 msgstr "tzc-bevel"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2964
 msgid "Export to .anyone"
 msgstr "Voer uit aan .enigiemand"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2967
 msgid "Export to .zephyr.subs"
 msgstr "Voer uit aan .zephyr.subs"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2970
 msgid "Import from .anyone"
 msgstr "Voer in van .enigiemand"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2973
 msgid "Import from .zephyr.subs"
 msgstr "Voer in van .zephyr.subs"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2976
 msgid "Realm"
 msgstr "Ryk"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2979
 msgid "Exposure"
 msgstr "Blootstelling"
 
-#: ../libpurple/proxy.c:699 ../libpurple/proxy.c:761 ../libpurple/proxy.c:1202
-#: ../libpurple/proxy.c:1395 ../libpurple/proxy.c:2055
 #, c-format
 msgid "Unable to create socket: %s"
 msgstr "Kan nie sok skep nie: %s"
 
-#: ../libpurple/proxy.c:956
 #, c-format
 msgid "Unable to parse response from HTTP proxy: %s"
 msgstr "Kon nie respons van HTTP-instaanbediener ontleed nie: %s"
 
-#: ../libpurple/proxy.c:989 ../libpurple/proxy.c:1051
-#: ../libpurple/proxy.c:1080
 #, c-format
 msgid "HTTP proxy connection error %d"
 msgstr "HTTP-instaankoppeling-fout %d"
 
-#: ../libpurple/proxy.c:1076
 #, 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:1276
 #, c-format
 msgid "Error resolving %s"
 msgstr "Kon nie %s oplos nie"
 
-#: ../libpurple/prpl.c:454
 #, c-format
 msgid "Requesting %s's attention..."
 msgstr "Vra %s se aandag aan..."
 
-#: ../libpurple/prpl.c:500
 #, c-format
 msgid "%s has requested your attention!"
 msgstr "%s het u aandag aangevra!"
@@ -15305,11 +10680,9 @@ msgstr "%s het u aandag aangevra!"
 #. *
 #. * A wrapper for purple_request_action() that uses @c Yes and @c No buttons.
 #.
-#: ../libpurple/request.h:1488 ../pidgin/gtkblist.c:565
 msgid "_Yes"
 msgstr "_Ja"
 
-#: ../libpurple/request.h:1488 ../pidgin/gtkblist.c:565
 msgid "_No"
 msgstr "_Nee"
 
@@ -15320,27 +10693,22 @@ msgstr "_Nee"
 #. * A wrapper for purple_request_action_with_icon() that uses Accept and Cancel
 #. * buttons.
 #.
-#: ../libpurple/request.h:1508 ../libpurple/request.h:1521
 msgid "_Accept"
 msgstr "_Aanvaar"
 
 #. *
 #. * The default message to use when the user becomes auto-away.
 #.
-#: ../libpurple/savedstatuses.c:48
 msgid "I'm not here right now"
 msgstr "Ek's nie hier op die oomblik nie"
 
-#: ../libpurple/savedstatuses.c:537
 msgid "saved statuses"
 msgstr "gestoorde statusse"
 
-#: ../libpurple/server.c:265
 #, c-format
 msgid "%s is now known as %s.\n"
 msgstr "%s staan nou bekend as %s.\n"
 
-#: ../libpurple/server.c:813
 #, c-format
 msgid ""
 "%s has invited %s to the chat room %s:\n"
@@ -15349,97 +10717,75 @@ msgstr ""
 "%s het %s uitgenooi na geselsiekamer %s:\n"
 "%s"
 
-#: ../libpurple/server.c:818
 #, 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:822
 msgid "Accept chat invitation?"
 msgstr "Aanvaar geselsie-uitnodiging?"
 
 #. Shortcut
-#: ../libpurple/smiley.c:411
 msgid "Shortcut"
 msgstr "Kortpad"
 
-#: ../libpurple/smiley.c:412
 msgid "The text-shortcut for the smiley"
 msgstr "Die tekskortpad vir die gesiggie"
 
 #. Stored Image
-#: ../libpurple/smiley.c:418
 msgid "Stored Image"
 msgstr "Gestoorde prent"
 
-#: ../libpurple/smiley.c:419
 msgid "Stored Image. (that'll have to do for now)"
 msgstr "Gestoorde prent. (dit sal moet deug vir eers)"
 
-#: ../libpurple/sslconn.c:176
 msgid "SSL Connection Failed"
 msgstr "SSL-koppeling misluk"
 
-#: ../libpurple/sslconn.c:178
 msgid "SSL Handshake Failed"
 msgstr "SSL-bladskud het misluk"
 
-#: ../libpurple/sslconn.c:180
 msgid "SSL peer presented an invalid certificate"
 msgstr "SSL-eweknie het 'n ongeldige sertifikaat voorgel?"
 
-#: ../libpurple/sslconn.c:183
 msgid "Unknown SSL error"
 msgstr "Onbekende SSL-fout"
 
-#: ../libpurple/status.c:161
 msgid "Unset"
 msgstr "Deaktiveer"
 
-#: ../libpurple/status.c:164 ../pidgin/gtkdocklet.c:558
-#: ../pidgin/gtkstatusbox.c:1107
 msgid "Do not disturb"
 msgstr "Moenie steur nie"
 
-#: ../libpurple/status.c:167
 msgid "Extended away"
 msgstr "Vir lank weg"
 
-#: ../libpurple/status.c:170
 msgid "Feeling"
 msgstr "Gevoel"
 
-#: ../libpurple/status.c:619
 #, c-format
 msgid "%s (%s) changed status from %s to %s"
 msgstr "%s (%s) het van status %s na %s verander"
 
-#: ../libpurple/status.c:631
 #, c-format
 msgid "%s (%s) is now %s"
 msgstr "%s (%s) is nou %s"
 
-#: ../libpurple/status.c:638
 #, c-format
 msgid "%s (%s) is no longer %s"
 msgstr "%s (%s) is nie meer %s nie"
 
-#: ../libpurple/status.c:1265
 #, c-format
 msgid "%s became idle"
 msgstr "%s het ledig geraak"
 
-#: ../libpurple/status.c:1285
 #, c-format
 msgid "%s became unidle"
 msgstr "%s is nie meer ledig nie"
 
-#: ../libpurple/status.c:1351
 #, c-format
 msgid "+++ %s became idle"
 msgstr "+++ %s het ledig geword"
 
-#: ../libpurple/status.c:1353
 #, c-format
 msgid "+++ %s became unidle"
 msgstr "+++ %s is nie meer ledig nie"
@@ -15450,77 +10796,64 @@ msgstr "+++ %s is nie meer ledig nie"
 #. * change this to "%X %x" if they want the time to be shown first,
 #. * followed by the date.
 #.
-#: ../libpurple/util.c:635
 #, c-format
 msgid "%x %X"
 msgstr "%x %X"
 
-#: ../libpurple/util.c:3335
 msgid "Calculating..."
 msgstr "Bereken..."
 
-#: ../libpurple/util.c:3338
 msgid "Unknown."
 msgstr "Onbekend."
 
-#: ../libpurple/util.c:3364
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] "%d sekonde"
 msgstr[1] "%d sekondes"
 
-#: ../libpurple/util.c:3376
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] "%d dag"
 msgstr[1] "%d dae"
 
-#: ../libpurple/util.c:3384
 #, c-format
 msgid "%s, %d hour"
 msgid_plural "%s, %d hours"
 msgstr[0] "%s, %d uur"
 msgstr[1] "%s, %d ure"
 
-#: ../libpurple/util.c:3390
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d uur"
 msgstr[1] "%d ure"
 
-#: ../libpurple/util.c:3398
 #, c-format
 msgid "%s, %d minute"
 msgid_plural "%s, %d minutes"
 msgstr[0] "%s, %d minuut"
 msgstr[1] "%s, %d minute"
 
-#: ../libpurple/util.c:3404
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d minuut"
 msgstr[1] "%d minute"
 
-#: ../libpurple/util.c:3682
 #, c-format
 msgid "Could not open %s: Redirected too many times"
 msgstr "Kon nie %s open nie: Te veel keer herlei"
 
-#: ../libpurple/util.c:3732 ../libpurple/util.c:4210
 #, c-format
 msgid "Unable to connect to %s"
 msgstr "Kan nie koppel aan %s nie"
 
-#: ../libpurple/util.c:3870
 #, c-format
 msgid "Error reading from %s: response too long (%d bytes limit)"
 msgstr "Kon nie vanaf %s lees nie: antwoord te lank (%d grepe limiet)"
 
-#: ../libpurple/util.c:3939
 #, c-format
 msgid ""
 "Unable to allocate enough memory to hold the contents from %s.  The web "
@@ -15529,67 +10862,55 @@ msgstr ""
 "Kon nie genoeg geheue toeken om inhoud van %s te hou nie.  Die webbediener "
 "probeer dalk iets kwaadwilligs."
 
-#: ../libpurple/util.c:3974
 #, c-format
 msgid "Error reading from %s: %s"
 msgstr "Kon nie %s lees nie: %s"
 
-#: ../libpurple/util.c:4066
 #, c-format
 msgid "Error writing to %s: %s"
 msgstr "Kon nie %s skryf nie: %s"
 
-#: ../libpurple/util.c:4097 ../libpurple/util.c:4127 ../libpurple/util.c:4192
 #, c-format
 msgid "Unable to connect to %s: %s"
 msgstr "Kan nie koppel aan %s nie: %s"
 
-#: ../libpurple/util.c:5059
 #, c-format
 msgid " - %s"
 msgstr " - %s"
 
-#: ../libpurple/util.c:5065
 #, c-format
 msgid " (%s)"
 msgstr " (%s)"
 
 #. 10053
-#: ../libpurple/win32/libc_interface.c:320
 #, c-format
 msgid "Connection interrupted by other software on your computer."
 msgstr "Verbinding deur ander sagtware op u rekenaar onderbreek."
 
 #. 10054
-#: ../libpurple/win32/libc_interface.c:323
 #, c-format
 msgid "Remote host closed connection."
 msgstr "Afgele? gasheer het die koppeling gesluit."
 
 #. 10060
-#: ../libpurple/win32/libc_interface.c:326
 #, c-format
 msgid "Connection timed out."
 msgstr "Verbinding het uitgetel."
 
 #. 10061
-#: ../libpurple/win32/libc_interface.c:329
 #, c-format
 msgid "Connection refused."
 msgstr "Verbinding geweier."
 
 #. 10048
-#: ../libpurple/win32/libc_interface.c:332
 #, c-format
 msgid "Address already in use."
 msgstr "Adres word reeds gebruik."
 
-#: ../libpurple/xmlnode.c:793
 #, c-format
 msgid "Error Reading %s"
 msgstr "Kon nie %s lees nie"
 
-#: ../libpurple/xmlnode.c:794
 #, c-format
 msgid ""
 "An error was encountered reading your %s.  The file has not been loaded, and "
@@ -15598,85 +10919,66 @@ msgstr ""
 "Kon nie volledig u %s lees nie.  Die l?er is nie gelaai nie, en die ou l?er "
 "is hernoem na %s~."
 
-#: ../pidgin.desktop.in.h:1
 msgid ""
 "Chat over IM.  Supports AIM, Google Talk, Jabber/XMPP, MSN, Yahoo and more"
 msgstr ""
 "Gesels met kitsboodsappe.  Daar is ondersteuning vir AIM, Google Talk, "
 "Jabber/XMPP, MSN, Yahoo en meer"
 
-#: ../pidgin.desktop.in.h:2
 msgid "Internet Messenger"
 msgstr "Internetboodskapper"
 
-#: ../pidgin.desktop.in.h:3
 msgid "Pidgin Internet Messenger"
 msgstr "Pidgin Internetboodskapper"
 
 #. Build the login options frame.
-#: ../pidgin/gtkaccount.c:441
 msgid "Login Options"
 msgstr "Aanmeldopsies"
 
-#: ../pidgin/gtkaccount.c:466
 msgid "Pro_tocol:"
 msgstr "Pro_tokol:"
 
-#: ../pidgin/gtkaccount.c:479 ../pidgin/gtkaccount.c:1097
 msgid "_Username:"
 msgstr "_Gebruikernaam:"
 
-#: ../pidgin/gtkaccount.c:588
 msgid "Remember pass_word"
 msgstr "Onthou wag_woord"
 
 #. Build the user options frame.
-#: ../pidgin/gtkaccount.c:643
 msgid "User Options"
 msgstr "Gebruikeropsies"
 
-#: ../pidgin/gtkaccount.c:656
 msgid "_Local alias:"
 msgstr "_Plaaslike alias:"
 
-#: ../pidgin/gtkaccount.c:660
 msgid "New _mail notifications"
 msgstr "Kennis_gewings vir nuwe pos"
 
 #. Buddy icon
-#: ../pidgin/gtkaccount.c:665
 msgid "Use this buddy _icon for this account:"
 msgstr "Gebruik hierdie vriend_ikoon vir hierdie rekening:"
 
-#: ../pidgin/gtkaccount.c:797
 msgid "Ad_vanced"
 msgstr "Ge_vorderd"
 
-#: ../pidgin/gtkaccount.c:975
 msgid "Use GNOME Proxy Settings"
 msgstr "Gebruik GNOME se instaaninstellings"
 
-#: ../pidgin/gtkaccount.c:976
 msgid "Use Global Proxy Settings"
 msgstr "Gebruik globale instaaninstellings"
 
-#: ../pidgin/gtkaccount.c:982
 msgid "No Proxy"
 msgstr "Geen instaanbediener"
 
-#: ../pidgin/gtkaccount.c:988
 msgid "HTTP"
 msgstr "HTTP"
 
-#: ../pidgin/gtkaccount.c:994
 msgid "SOCKS 4"
 msgstr "SOCKS 4"
 
-#: ../pidgin/gtkaccount.c:1000
 msgid "SOCKS 5"
 msgstr "SOCKS 5"
 
-#: ../pidgin/gtkaccount.c:1006 ../pidgin/gtkprefs.c:2058
 msgid "Use Environmental Settings"
 msgstr "Gebruik omgewinginstellings"
 
@@ -15685,65 +10987,49 @@ msgstr "Gebruik omgewinginstellings"
 #. 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:1045
 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:1048
 msgid "you can see the butterflies mating"
 msgstr "kan mens skoenlappers sien paar"
 
-#: ../pidgin/gtkaccount.c:1076
 msgid "Proxy _type:"
 msgstr "Instaan_tipes:"
 
-#: ../pidgin/gtkaccount.c:1085 ../pidgin/gtkprefs.c:2074
 msgid "_Host:"
 msgstr "_Gasheer:"
 
-#: ../pidgin/gtkaccount.c:1089 ../pidgin/gtkprefs.c:1813
 msgid "_Port:"
 msgstr "_Poort:"
 
-#: ../pidgin/gtkaccount.c:1106 ../pidgin/gtkprefs.c:2126
 msgid "Pa_ssword:"
 msgstr "_Wagwoord:"
 
-#: ../pidgin/gtkaccount.c:1235
 msgid "Unable to save new account"
 msgstr "Kan nie nuwe rekening stoor nie"
 
-#: ../pidgin/gtkaccount.c:1236
 msgid "An account already exists with the specified criteria."
 msgstr "'n Rekening bestaan reeds met die gespesifiseerde kriteria."
 
-#: ../pidgin/gtkaccount.c:1504
 msgid "Add Account"
 msgstr "Voeg rekening by"
 
-#: ../pidgin/gtkaccount.c:1521
 msgid "_Basic"
 msgstr "_Eenvoudig"
 
-#: ../pidgin/gtkaccount.c:1529
 msgid "Create _this new account on the server"
 msgstr "Skep _hierdie nuwe rekening op die bediener"
 
-#: ../pidgin/gtkaccount.c:1546
 msgid "P_roxy"
 msgstr "I_nstaanbediener"
 
-#: ../pidgin/gtkaccount.c:1936 ../pidgin/gtkplugin.c:759
-#: ../pidgin/plugins/convcolors.c:343
 msgid "Enabled"
 msgstr "Geaktiveer"
 
-#: ../pidgin/gtkaccount.c:1964
 msgid "Protocol"
 msgstr "Protokol"
 
-#: ../pidgin/gtkaccount.c:2152
 #, c-format
 msgid ""
 "<span size='larger' weight='bold'>Welcome to %s!</span>\n"
@@ -15763,146 +11049,117 @@ msgstr ""
 "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"
+"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"
 
 #. Buddy List
-#: ../pidgin/gtkblist-theme.c:370 ../pidgin/gtkimhtmltoolbar.c:1225
 msgid "Background Color"
 msgstr "Agtergrondkleur"
 
-#: ../pidgin/gtkblist-theme.c:371
 msgid "The background color for the buddy list"
 msgstr "Die agtergrondkleur van die vriendelys"
 
-#: ../pidgin/gtkblist-theme.c:375
 msgid "Layout"
 msgstr "Uitleg"
 
-#: ../pidgin/gtkblist-theme.c:376
 msgid "The layout of icons, name, and status of the buddy list"
 msgstr "Die uitleg van ikone, name en status van die vriendelys"
 
 #. Group
 #. Note to translators: These two strings refer to the background color
 #. of a buddy list group when in its expanded state
-#: ../pidgin/gtkblist-theme.c:384
 msgid "Expanded Background Color"
 msgstr "Oopgevoude agtergrondkleur"
 
-#: ../pidgin/gtkblist-theme.c:385
 msgid "The background color of an expanded group"
 msgstr "Die agtergrondkleur van 'n oopgevoude groep"
 
 #. Note to translators: These two strings refer to the font and color
 #. of a buddy list group when in its expanded state
-#: ../pidgin/gtkblist-theme.c:391
 msgid "Expanded Text"
 msgstr "Oopgevoude teks"
 
-#: ../pidgin/gtkblist-theme.c:392
 msgid "The text information for when a group is expanded"
 msgstr "Die teksinligting vir wanneer 'n groep oopgevou is"
 
 #. Note to translators: These two strings refer to the background color
 #. of a buddy list group when in its collapsed state
-#: ../pidgin/gtkblist-theme.c:398
 msgid "Collapsed Background Color"
 msgstr "Toegevoude agtergrondkleur"
 
-#: ../pidgin/gtkblist-theme.c:399
 msgid "The background color of a collapsed group"
 msgstr "Die agtergrondkleur van 'n toegevoude groep"
 
 #. Note to translators: These two strings refer to the font and color
 #. of a buddy list group when in its collapsed state
-#: ../pidgin/gtkblist-theme.c:405
 msgid "Collapsed Text"
 msgstr "Toegevoude teks"
 
-#: ../pidgin/gtkblist-theme.c:406
 msgid "The text information for when a group is collapsed"
 msgstr "Die teksinligting vir wanneer 'n groep toegevou is"
 
 #. Buddy
 #. Note to translators: These two strings refer to the background color
 #. of a buddy list contact or chat room
-#: ../pidgin/gtkblist-theme.c:413
 msgid "Contact/Chat Background Color"
 msgstr "Geselsie se agtergrondkleur"
 
-#: ../pidgin/gtkblist-theme.c:414
 msgid "The background color of a contact or chat"
 msgstr "Die agtergrondkleur van 'n kontak of geselsie"
 
 #. Note to translators: These two strings refer to the font and color
 #. of a buddy list contact when in its expanded state
-#: ../pidgin/gtkblist-theme.c:420
 msgid "Contact Text"
 msgstr "Kontakteks"
 
-#: ../pidgin/gtkblist-theme.c:421
 msgid "The text information for when a contact is expanded"
 msgstr "Die teksinligting vir wanneer 'n kontak oopgevou is"
 
 #. Note to translators: These two strings refer to the font and color
 #. of a buddy list buddy when it is online
-#: ../pidgin/gtkblist-theme.c:427
 msgid "Online Text"
 msgstr "Aanlynteks"
 
-#: ../pidgin/gtkblist-theme.c:428
 msgid "The text information for when a buddy is online"
 msgstr "Die teksinligting vir wanneer 'n vriend aanlyn is"
 
 #. Note to translators: These two strings refer to the font and color
 #. of a buddy list buddy when it is away
-#: ../pidgin/gtkblist-theme.c:434
 msgid "Away Text"
 msgstr "Wegteks"
 
-#: ../pidgin/gtkblist-theme.c:435
 msgid "The text information for when a buddy is away"
 msgstr "Die teksinligting vir wanneer 'n vriend weg is"
 
 #. Note to translators: These two strings refer to the font and color
 #. of a buddy list buddy when it is offline
-#: ../pidgin/gtkblist-theme.c:441
 msgid "Offline Text"
 msgstr "Vanlynteks"
 
-#: ../pidgin/gtkblist-theme.c:442
 msgid "The text information for when a buddy is offline"
 msgstr "Die teksinligting vir wanneer 'n vriend vanlyn is"
 
 #. Note to translators: These two strings refer to the font and color
 #. of a buddy list buddy when it is idle
-#: ../pidgin/gtkblist-theme.c:448
 msgid "Idle Text"
 msgstr "Ledige teks"
 
-#: ../pidgin/gtkblist-theme.c:449
 msgid "The text information for when a buddy is idle"
 msgstr "Die teksinligting vir wanneer 'n vriend ledig is"
 
 #. Note to translators: These two strings refer to the font and color
 #. of a buddy list buddy when they have sent you a new message
-#: ../pidgin/gtkblist-theme.c:455
 msgid "Message Text"
 msgstr "Boodskapteks"
 
-#: ../pidgin/gtkblist-theme.c:456
 msgid "The text information for when a buddy has an unread message"
 msgstr "Die teksinligting vir wanneer 'n vriend 'n ongelese boodskap het"
 
 #. Note to translators: These two strings refer to the font and color
 #. of a buddy list buddy when they have sent you a new message
-#: ../pidgin/gtkblist-theme.c:462
 msgid "Message (Nick Said) Text"
 msgstr ""
 
-#: ../pidgin/gtkblist-theme.c:463
 msgid ""
 "The text information for when a chat has an unread message that mentions "
 "your nickname"
@@ -15910,11 +11167,9 @@ msgstr ""
 "Die teksinligting vir wanneer 'n geselsie 'n ongelese boodskap het wat u "
 "bynaam noem"
 
-#: ../pidgin/gtkblist-theme.c:468
 msgid "The text information for a buddy's status"
 msgstr "Die teksinligting vir 'n vriend se status"
 
-#: ../pidgin/gtkblist.c:562
 #, c-format
 msgid "You have %d contact named %s. Would you like to merge them?"
 msgid_plural ""
@@ -15922,7 +11177,6 @@ msgstr[1] "Jy het %d kontakte genaamd %s
 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:563
 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 "
@@ -15932,145 +11186,106 @@ msgstr ""
 "vriendelys h? en 'n enkele gespreksvenster gebruik. U kan hulle weer skei "
 "met 'Vou oop' op die kontak-kontekskielys"
 
-#: ../pidgin/gtkblist.c:709
 msgid "Please update the necessary fields."
 msgstr "Werk gerus die nodige velde by."
 
-#: ../pidgin/gtkblist.c:1018
 msgid "A_ccount"
 msgstr "_Rekening"
 
-#: ../pidgin/gtkblist.c:1139
 msgid ""
 "Please enter the appropriate information about the chat you would like to "
 "join.\n"
-msgstr "Tik gerus die gepaste inligting vir die geselsie waarby u wil aansluit.\n"
+msgstr ""
+"Tik gerus die gepaste inligting vir die geselsie waarby u wil aansluit.\n"
 
-#: ../pidgin/gtkblist.c:1144
 msgid "Room _List"
 msgstr "Kamer_lys"
 
-#: ../pidgin/gtkblist.c:1418 ../pidgin/gtkprivacy.c:545
-#: ../pidgin/gtkprivacy.c:559
 msgid "_Block"
 msgstr "_Blokkeer"
 
-#: ../pidgin/gtkblist.c:1418
 msgid "Un_block"
 msgstr "Ont_blokkeer"
 
-#: ../pidgin/gtkblist.c:1461
 msgid "Move to"
 msgstr "Skuif na"
 
-#: ../pidgin/gtkblist.c:1505
 msgid "Get _Info"
 msgstr "_Inligting"
 
-#: ../pidgin/gtkblist.c:1508 ../pidgin/pidginstock.c:86
 msgid "I_M"
 msgstr "_Kitsklets"
 
-#: ../pidgin/gtkblist.c:1517
 msgid "_Audio Call"
 msgstr "_Stemoproep"
 
-#: ../pidgin/gtkblist.c:1522
 msgid "Audio/_Video Call"
 msgstr "Oudio/_Video-oproep"
 
-#: ../pidgin/gtkblist.c:1526
 msgid "_Video Call"
 msgstr "_Video-oproep"
 
-#: ../pidgin/gtkblist.c:1538
 msgid "_Send File..."
 msgstr "_Stuur l?er..."
 
-#: ../pidgin/gtkblist.c:1545
 msgid "Add Buddy _Pounce..."
 msgstr "Voeg vriend_wag by..."
 
-#: ../pidgin/gtkblist.c:1550 ../pidgin/gtkblist.c:1554
-#: ../pidgin/gtkblist.c:1772 ../pidgin/gtkblist.c:1799
 msgid "View _Log"
 msgstr "Bekyk _staafl?er"
 
-#: ../pidgin/gtkblist.c:1560 ../pidgin/gtkblist.c:1744
 msgid "Hide When Offline"
 msgstr "Versteek terwyl vanlyn"
 
-#: ../pidgin/gtkblist.c:1560 ../pidgin/gtkblist.c:1744
 msgid "Show When Offline"
 msgstr "Wys terwyl aanlyn"
 
-#: ../pidgin/gtkblist.c:1574 ../pidgin/gtkblist.c:1583
-#: ../pidgin/gtkblist.c:1782 ../pidgin/gtkblist.c:1805
 msgid "_Alias..."
 msgstr "_Alias..."
 
-#: ../pidgin/gtkblist.c:1577 ../pidgin/gtkblist.c:1585
-#: ../pidgin/gtkblist.c:1784 ../pidgin/gtkblist.c:1807
 msgid "_Remove"
 msgstr "_Verwyder"
 
-#: ../pidgin/gtkblist.c:1714
 msgid "Set Custom Icon"
 msgstr "Stel eie ikoon"
 
-#: ../pidgin/gtkblist.c:1718 ../pidgin/gtkconv.c:2923
 msgid "Remove Custom Icon"
 msgstr "Verwyder eie ikoon"
 
-#: ../pidgin/gtkblist.c:1732
 msgid "Add _Buddy..."
 msgstr "Voeg _vried by..."
 
-#: ../pidgin/gtkblist.c:1735
 msgid "Add C_hat..."
 msgstr "Voeg _geselsie by..."
 
-#: ../pidgin/gtkblist.c:1738
 msgid "_Delete Group"
 msgstr "_Vee groep uit"
 
-#: ../pidgin/gtkblist.c:1740
 msgid "_Rename"
 msgstr "_Hernoem"
 
 #. join button
-#: ../pidgin/gtkblist.c:1766 ../pidgin/gtkroomlist.c:323
-#: ../pidgin/gtkroomlist.c:597 ../pidgin/pidginstock.c:84
 msgid "_Join"
 msgstr "_Sluit aan"
 
-#: ../pidgin/gtkblist.c:1768
 msgid "Auto-Join"
 msgstr "Outoaansluit"
 
-#: ../pidgin/gtkblist.c:1770
 msgid "Persistent"
 msgstr "Aanhoudend"
 
-#: ../pidgin/gtkblist.c:1780
 msgid "_Edit Settings..."
 msgstr "_Wysig instellings..."
 
-#: ../pidgin/gtkblist.c:1814 ../pidgin/gtkblist.c:1839
 msgid "_Collapse"
 msgstr "_Vou toe"
 
-#: ../pidgin/gtkblist.c:1844
 msgid "_Expand"
 msgstr "_Vou oop"
 
-#: ../pidgin/gtkblist.c:2098 ../pidgin/gtkblist.c:2110
-#: ../pidgin/gtkblist.c:6065 ../pidgin/gtkblist.c:6078
 msgid "/Tools/Mute Sounds"
 msgstr "Doof klanke"
 
-#: ../pidgin/gtkblist.c:2570 ../pidgin/gtkconv.c:5167
-#: ../pidgin/gtkpounce.c:451
 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."
@@ -16078,180 +11293,137 @@ msgstr "U is tans aangemeld met 'n reken
 #. I don't believe this can happen currently, I think
 #. * everything that calls this function checks for one of the
 #. * above node types first.
-#: ../pidgin/gtkblist.c:2947
 msgid "Unknown node type"
 msgstr "Onbekende nodustipe"
 
-#: ../pidgin/gtkblist.c:3591
 msgid "Please select your mood from the list"
 msgstr "Kies asseblief u stemming uit die lys"
 
-#: ../pidgin/gtkblist.c:3624
 msgid "Message (optional)"
 msgstr "Boodskap (opsioneel)"
 
-#: ../pidgin/gtkblist.c:3629
 msgid "Edit User Mood"
 msgstr "Redigeer gebruikerstemming"
 
 #. Buddies menu
-#: ../pidgin/gtkblist.c:3651
 msgid "/_Buddies"
 msgstr "_Vriende"
 
-#: ../pidgin/gtkblist.c:3652
 msgid "/Buddies/New Instant _Message..."
 msgstr "Nuwe _kitsboodskap..."
 
-#: ../pidgin/gtkblist.c:3653
 msgid "/Buddies/Join a _Chat..."
 msgstr "Sluit by _geselsie aan..."
 
-#: ../pidgin/gtkblist.c:3654
 msgid "/Buddies/Get User _Info..."
 msgstr "Kry gebruiker_inligting..."
 
-#: ../pidgin/gtkblist.c:3655
 msgid "/Buddies/View User _Log..."
 msgstr "Bekyk gebruiker se staaf_l?er..."
 
-#: ../pidgin/gtkblist.c:3657
 msgid "/Buddies/Sh_ow"
 msgstr "_Wys"
 
-#: ../pidgin/gtkblist.c:3658
 msgid "/Buddies/Show/_Offline Buddies"
 msgstr "A_flynvriende"
 
-#: ../pidgin/gtkblist.c:3659
 msgid "/Buddies/Show/_Empty Groups"
 msgstr "_Le? groepe"
 
-#: ../pidgin/gtkblist.c:3660
 msgid "/Buddies/Show/Buddy _Details"
 msgstr "Vriend_details"
 
-#: ../pidgin/gtkblist.c:3661
 msgid "/Buddies/Show/Idle _Times"
 msgstr "Ledige _tye"
 
-#: ../pidgin/gtkblist.c:3662
 msgid "/Buddies/Show/_Protocol Icons"
 msgstr "_Protokolikone"
 
-#: ../pidgin/gtkblist.c:3663
 msgid "/Buddies/_Sort Buddies"
 msgstr "_Rangskik vriende"
 
-#: ../pidgin/gtkblist.c:3665
 msgid "/Buddies/_Add Buddy..."
 msgstr "Voeg _vriend by..."
 
-#: ../pidgin/gtkblist.c:3666
 msgid "/Buddies/Add C_hat..."
 msgstr "Voeg gese_lsie by..."
 
-#: ../pidgin/gtkblist.c:3667
 msgid "/Buddies/Add _Group..."
 msgstr "Voeg _groep by..."
 
-#: ../pidgin/gtkblist.c:3669
 msgid "/Buddies/_Quit"
 msgstr "_Sluit af"
 
 #. Accounts menu
-#: ../pidgin/gtkblist.c:3672
 msgid "/_Accounts"
 msgstr "_Rekeninge"
 
-#: ../pidgin/gtkblist.c:3673 ../pidgin/gtkblist.c:8058
 msgid "/Accounts/Manage Accounts"
 msgstr "Bestuur rekeninge"
 
 #. Tools
-#: ../pidgin/gtkblist.c:3676
 msgid "/_Tools"
 msgstr "_Nutsgoed"
 
-#: ../pidgin/gtkblist.c:3677
 msgid "/Tools/Buddy _Pounces"
 msgstr "Vriend_wagte"
 
-#: ../pidgin/gtkblist.c:3678
 msgid "/Tools/_Certificates"
 msgstr "_Sertifikate"
 
-#: ../pidgin/gtkblist.c:3679
 msgid "/Tools/Custom Smile_ys"
 msgstr "_Eie gesiggies"
 
-#: ../pidgin/gtkblist.c:3680
 msgid "/Tools/Plu_gins"
 msgstr "_Inproppe"
 
-#: ../pidgin/gtkblist.c:3681
 msgid "/Tools/Pr_eferences"
 msgstr "_Voorkeure"
 
-#: ../pidgin/gtkblist.c:3682
 msgid "/Tools/Pr_ivacy"
 msgstr "_Privaatheid"
 
-#: ../pidgin/gtkblist.c:3683
 msgid "/Tools/Set _Mood"
 msgstr "Stel _bui"
 
-#: ../pidgin/gtkblist.c:3685
 msgid "/Tools/_File Transfers"
 msgstr "_L?eroordragte"
 
-#: ../pidgin/gtkblist.c:3686
 msgid "/Tools/R_oom List"
 msgstr "_Kamerlys"
 
-#: ../pidgin/gtkblist.c:3687
 msgid "/Tools/System _Log"
 msgstr "Stelselstaaf_l?er"
 
-#: ../pidgin/gtkblist.c:3689
 msgid "/Tools/Mute _Sounds"
 msgstr "Doof _klanke"
 
 #. Help
-#: ../pidgin/gtkblist.c:3691
 msgid "/_Help"
 msgstr "_Hulp"
 
-#: ../pidgin/gtkblist.c:3692
 msgid "/Help/Online _Help"
 msgstr "_Hulp aanlyn"
 
-#: ../pidgin/gtkblist.c:3694
 msgid "/Help/_Build Information"
 msgstr "_Bouinligting"
 
-#: ../pidgin/gtkblist.c:3695
 msgid "/Help/_Debug Window"
 msgstr "_Ontfoutvenster"
 
-#: ../pidgin/gtkblist.c:3696
 msgid "/Help/De_veloper Information"
 msgstr "_Programmeerinligting"
 
-#: ../pidgin/gtkblist.c:3697
 msgid "/Help/_Translator Information"
 msgstr "_Vertaalinligting"
 
-#: ../pidgin/gtkblist.c:3699
 msgid "/Help/_About"
 msgstr "_Aangaande"
 
-#: ../pidgin/gtkblist.c:3731
 #, c-format
 msgid "<b>Account:</b> %s"
 msgstr "<b>Rekening:</b> %s"
 
-#: ../pidgin/gtkblist.c:3750
 #, c-format
 msgid ""
 "\n"
@@ -16260,7 +11432,6 @@ msgstr ""
 "\n"
 "<b>Bewoners:</b> %d"
 
-#: ../pidgin/gtkblist.c:3756
 #, c-format
 msgid ""
 "\n"
@@ -16269,157 +11440,122 @@ msgstr ""
 "\n"
 "<b>Onderwerp</b> %s"
 
-#: ../pidgin/gtkblist.c:3756
 msgid "(no topic set)"
 msgstr "(geen onderwerp gestel nie)"
 
-#: ../pidgin/gtkblist.c:3837
 msgid "Buddy Alias"
 msgstr "Vriendalias"
 
-#: ../pidgin/gtkblist.c:3866
 msgid "Logged In"
 msgstr "Aangemeld"
 
-#: ../pidgin/gtkblist.c:3912
 msgid "Last Seen"
 msgstr "Laas gesien"
 
-#: ../pidgin/gtkblist.c:3934
 msgid "Spooky"
 msgstr "Vreemd"
 
-#: ../pidgin/gtkblist.c:3936
 msgid "Awesome"
 msgstr "Asemrowend"
 
-#: ../pidgin/gtkblist.c:3938
 msgid "Rockin'"
 msgstr "Aitsa"
 
-#: ../pidgin/gtkblist.c:3969
 msgid "Total Buddies"
 msgstr "Totale vriende"
 
-#: ../pidgin/gtkblist.c:4338
 #, c-format
 msgid "Idle %dd %dh %02dm"
 msgstr "Ledig %dd %dh %02dm"
 
-#: ../pidgin/gtkblist.c:4340
 #, c-format
 msgid "Idle %dh %02dm"
 msgstr "Ledig %dh %02dm"
 
-#: ../pidgin/gtkblist.c:4342
 #, c-format
 msgid "Idle %dm"
 msgstr "Ledig %dm"
 
-#: ../pidgin/gtkblist.c:4531
 msgid "/Buddies/New Instant Message..."
 msgstr "Nuwe kitsboodskap..."
 
-#: ../pidgin/gtkblist.c:4532 ../pidgin/gtkblist.c:4565
 msgid "/Buddies/Join a Chat..."
 msgstr "Sluit by geselsie aan..."
 
-#: ../pidgin/gtkblist.c:4533
 msgid "/Buddies/Get User Info..."
 msgstr "Kry gebruikerinligting..."
 
-#: ../pidgin/gtkblist.c:4534
 msgid "/Buddies/Add Buddy..."
 msgstr "Voeg vriend by..."
 
-#: ../pidgin/gtkblist.c:4535 ../pidgin/gtkblist.c:4568
 msgid "/Buddies/Add Chat..."
 msgstr "Voeg geselsie by..."
 
-#: ../pidgin/gtkblist.c:4536
 msgid "/Buddies/Add Group..."
 msgstr "Voeg groep by..."
 
-#: ../pidgin/gtkblist.c:4571
 msgid "/Tools/Privacy"
 msgstr "Privaatheid"
 
-#: ../pidgin/gtkblist.c:4574
 msgid "/Tools/Room List"
 msgstr "Kamerlys"
 
-#: ../pidgin/gtkblist.c:4706 ../pidgin/gtkdocklet.c:158
-#: ../pidgin/gtkdocklet.c:163
 #, 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:4876
 msgid "Manually"
 msgstr "Handmatig"
 
-#: ../pidgin/gtkblist.c:4878
 msgid "By status"
 msgstr "Volgens status"
 
-#: ../pidgin/gtkblist.c:4879
 msgid "By recent log activity"
 msgstr "Volgens onlangse staafl?eraktiwiteit"
 
-#: ../pidgin/gtkblist.c:5177
 #, c-format
 msgid "%s disconnected"
 msgstr "%s ontkoppel"
 
-#: ../pidgin/gtkblist.c:5179
 #, c-format
 msgid "%s disabled"
 msgstr "%s gedeaktiveer"
 
-#: ../pidgin/gtkblist.c:5183
 msgid "Reconnect"
 msgstr "Herkoppel"
 
-#: ../pidgin/gtkblist.c:5183 ../pidgin/gtkblist.c:5285
 msgid "Re-enable"
 msgstr "Heraktiveer"
 
-#: ../pidgin/gtkblist.c:5196
 msgid "SSL FAQs"
 msgstr "SSL-vrae"
 
-#: ../pidgin/gtkblist.c:5283
 msgid "Welcome back!"
 msgstr "Welkom terug!"
 
-#: ../pidgin/gtkblist.c:5319
 #, c-format
 msgid "%d account was disabled because you signed on from another location:"
 msgid_plural ""
 "%d accounts were disabled because you signed on from another location:"
 msgstr[0] "%d rekening is gedeaktiveer want u het van 'n ander plek aangemeld:"
-msgstr[1] "%d rekeninge is gedeaktiveer want u het van 'n ander plek aangemeld:"
+msgstr[1] ""
+"%d rekeninge is gedeaktiveer want u het van 'n ander plek aangemeld:"
 
-#: ../pidgin/gtkblist.c:5593
 msgid "<b>Username:</b>"
 msgstr "<b>Gebruikernaam:</b>"
 
-#: ../pidgin/gtkblist.c:5600
 msgid "<b>Password:</b>"
 msgstr "<b>Wagwoord:</b>"
 
-#: ../pidgin/gtkblist.c:5611
 msgid "_Login"
 msgstr "_Meld aan"
 
-#: ../pidgin/gtkblist.c:5866
 msgid "/Accounts"
 msgstr "Rekeninge"
 
 #. Translators: Please maintain the use of -> and <- to refer to menu heirarchy
-#: ../pidgin/gtkblist.c:5880
 #, c-format
 msgid ""
 "<span weight='bold' size='larger'>Welcome to %s!</span>\n"
@@ -16438,336 +11574,255 @@ msgstr ""
 #. set the Show Offline Buddies option. must be done
 #. * after the treeview or faceprint gets mad. -Robot101
 #.
-#: ../pidgin/gtkblist.c:6059
 msgid "/Buddies/Show/Offline Buddies"
 msgstr "Vanlynvriende"
 
-#: ../pidgin/gtkblist.c:6062
 msgid "/Buddies/Show/Empty Groups"
 msgstr "Le? groepe"
 
-#: ../pidgin/gtkblist.c:6068
 msgid "/Buddies/Show/Buddy Details"
 msgstr "Vrienddetails"
 
-#: ../pidgin/gtkblist.c:6071
 msgid "/Buddies/Show/Idle Times"
 msgstr "Ledige tye"
 
-#: ../pidgin/gtkblist.c:6074
 msgid "/Buddies/Show/Protocol Icons"
 msgstr "Protokolikone"
 
-#: ../pidgin/gtkblist.c:7127
 msgid "Add a buddy.\n"
 msgstr "Voeg 'n vriend by.\n"
 
-#: ../pidgin/gtkblist.c:7142
 msgid "Buddy's _username:"
 msgstr "Vriend se gebr_uikernaam:"
 
-#: ../pidgin/gtkblist.c:7159
 msgid "(Optional) A_lias:"
 msgstr "(Opsionele) a_lias:"
 
-#: ../pidgin/gtkblist.c:7170
 msgid "Add buddy to _group:"
 msgstr "Voeg vriend by _groep:"
 
-#: ../pidgin/gtkblist.c:7272
 msgid "This protocol does not support chat rooms."
 msgstr "Hierdie protokol ondersteun nie geselsiekamers nie."
 
-#: ../pidgin/gtkblist.c:7288
 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:7297
 msgid ""
 "Please enter an alias, and the appropriate information about the chat you "
 "would like to add to your buddy list.\n"
-msgstr "Tik gerus 'n alias en die geskikte inligting oor die geselsie wat u by die "
+msgstr ""
+"Tik gerus 'n alias en die geskikte inligting oor die geselsie wat u by die "
 "vriendelys wil voeg.\n"
 
-#: ../pidgin/gtkblist.c:7318
 msgid "A_lias:"
 msgstr "A_lias:"
 
-#: ../pidgin/gtkblist.c:7325
 msgid "_Group:"
 msgstr "_Groep:"
 
-#: ../pidgin/gtkblist.c:7329
 msgid "Auto_join when account connects."
 msgstr "Sluit _outomaties aan wanneer rekening koppel."
 
-#: ../pidgin/gtkblist.c:7330
 msgid "_Remain in chat after window is closed."
 msgstr "_Bly in geselsie n? venster gesluit word."
 
-#: ../pidgin/gtkblist.c:7353
 msgid "Please enter the name of the group to be added."
 msgstr "Tik gerus die naam van die groep om by te voeg."
 
-#: ../pidgin/gtkblist.c:8072
 msgid "Enable Account"
 msgstr "Aktiveer rekening"
 
-#: ../pidgin/gtkblist.c:8077
 msgid "<PurpleMain>/Accounts/Enable Account"
 msgstr "<PurpleMain>/Rekeninge/Aktiveer rekening"
 
-#: ../pidgin/gtkblist.c:8131
 msgid "<PurpleMain>/Accounts/"
 msgstr "<PurpleMain>/Rekeninge/"
 
-#: ../pidgin/gtkblist.c:8152
 msgid "_Edit Account"
 msgstr "_Wysig rekening"
 
-#: ../pidgin/gtkblist.c:8170
 msgid "Set _Mood..."
 msgstr "Stel _bui..."
 
-#: ../pidgin/gtkblist.c:8180 ../pidgin/gtkconv.c:3339
-#: ../pidgin/gtkimhtml.c:1835
 msgid "No actions available"
 msgstr "Geen aksies beskikbaar nie"
 
-#: ../pidgin/gtkblist.c:8187
 msgid "_Disable"
 msgstr "_Deaktiveer"
 
-#: ../pidgin/gtkblist.c:8205
 msgid "/Tools"
 msgstr "Nutsgoed"
 
-#: ../pidgin/gtkblist.c:8276
 msgid "/Buddies/Sort Buddies"
 msgstr "Rangskik vriende"
 
-#: ../pidgin/gtkcertmgr.c:188
 msgid "Type the host name for this certificate."
 msgstr "Tik die gasheernaam vir hierdie sertifikaat in."
 
 #. Widget creation function
-#: ../pidgin/gtkcertmgr.c:539
 msgid "SSL Servers"
 msgstr "SSL-bedieners"
 
-#: ../pidgin/gtkconv.c:509
 msgid "Unknown command."
 msgstr "Onbekende bevel."
 
-#: ../pidgin/gtkconv.c:793 ../pidgin/gtkconv.c:820
 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:814
 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:868
 msgid "Invite Buddy Into Chat Room"
 msgstr "Nooi vriend na geselsiekamer"
 
-#: ../pidgin/gtkconv.c:919
 msgid "_Buddy:"
 msgstr "_Vriend:"
 
-#: ../pidgin/gtkconv.c:932 ../pidgin/gtksavedstatuses.c:1164
-#: ../pidgin/gtksavedstatuses.c:1483
 msgid "_Message:"
 msgstr "_Boodskap:"
 
-#: ../pidgin/gtkconv.c:1003
 #, c-format
 msgid "<h1>Conversation with %s</h1>\n"
 msgstr "<h1>Gesprek met %s</h1>\n"
 
-#: ../pidgin/gtkconv.c:1041
 msgid "Save Conversation"
 msgstr "Stoor gesprek"
 
-#: ../pidgin/gtkconv.c:1658
 msgid "Un-Ignore"
 msgstr "On-ignoreer"
 
-#: ../pidgin/gtkconv.c:1661
 msgid "Ignore"
 msgstr "Ignoreer"
 
-#: ../pidgin/gtkconv.c:1681
 msgid "Get Away Message"
 msgstr "Kry Weg-boodskap"
 
-#: ../pidgin/gtkconv.c:1704
 msgid "Last Said"
 msgstr "Laaste ges?"
 
-#: ../pidgin/gtkconv.c:2741
 msgid "Unable to save icon file to disk."
 msgstr "Kan nie ikoonl?er op skyf stoor nie."
 
-#: ../pidgin/gtkconv.c:2836
 msgid "Save Icon"
 msgstr "Stoor ikoon"
 
-#: ../pidgin/gtkconv.c:2894
 msgid "Animate"
 msgstr "Animeer"
 
-#: ../pidgin/gtkconv.c:2899
 msgid "Hide Icon"
 msgstr "Versteek ikoon"
 
-#: ../pidgin/gtkconv.c:2902
 msgid "Save Icon As..."
 msgstr "Stoor ikoon as..."
 
-#: ../pidgin/gtkconv.c:2906
 msgid "Set Custom Icon..."
 msgstr "Stel eie ikoon..."
 
-#: ../pidgin/gtkconv.c:2910
 msgid "Change Size"
 msgstr "Verander grootte"
 
-#: ../pidgin/gtkconv.c:3045
 msgid "Show All"
 msgstr "Wys alles"
 
 #. Conversation menu
-#: ../pidgin/gtkconv.c:3064
 msgid "/_Conversation"
 msgstr "_Gesprek"
 
-#: ../pidgin/gtkconv.c:3066
 msgid "/Conversation/New Instant _Message..."
 msgstr "Nuwe _kitsboodskap..."
 
-#: ../pidgin/gtkconv.c:3068
 msgid "/Conversation/Join a _Chat..."
 msgstr "Sluit by _geselsie aan..."
 
-#: ../pidgin/gtkconv.c:3073
 msgid "/Conversation/_Find..."
 msgstr "_Vind..."
 
-#: ../pidgin/gtkconv.c:3075
 msgid "/Conversation/View _Log"
 msgstr "Bekyk staaf_l?er"
 
-#: ../pidgin/gtkconv.c:3076
 msgid "/Conversation/_Save As..."
 msgstr "_Stoor as..."
 
-#: ../pidgin/gtkconv.c:3078
 msgid "/Conversation/Clea_r Scrollback"
 msgstr "Maak gesprekvenster skoo_n"
 
-#: ../pidgin/gtkconv.c:3083
 msgid "/Conversation/M_edia"
 msgstr "M_edia"
 
-#: ../pidgin/gtkconv.c:3085
 msgid "/Conversation/Media/_Audio Call"
 msgstr "_Oudio-oproep"
 
-#: ../pidgin/gtkconv.c:3087
 msgid "/Conversation/Media/_Video Call"
 msgstr "_Video-oproep"
 
-#: ../pidgin/gtkconv.c:3089
 msgid "/Conversation/Media/Audio\\/Video _Call"
 msgstr "Oudio/Video-_oproep"
 
-#: ../pidgin/gtkconv.c:3093
 msgid "/Conversation/Se_nd File..."
 msgstr "S_tuur l?er..."
 
-#: ../pidgin/gtkconv.c:3094
 msgid "/Conversation/Get _Attention"
 msgstr "Trek _aandag"
 
-#: ../pidgin/gtkconv.c:3095
 msgid "/Conversation/Add Buddy _Pounce..."
 msgstr "Voeg vriend_wag by..."
 
-#: ../pidgin/gtkconv.c:3097
 msgid "/Conversation/_Get Info"
 msgstr "_Kry inligting"
 
-#: ../pidgin/gtkconv.c:3099
 msgid "/Conversation/In_vite..."
 msgstr "_Nooi uit..."
 
-#: ../pidgin/gtkconv.c:3101
 msgid "/Conversation/M_ore"
 msgstr "_Meer"
 
-#: ../pidgin/gtkconv.c:3105
 msgid "/Conversation/Al_ias..."
 msgstr "_Alias..."
 
-#: ../pidgin/gtkconv.c:3107
 msgid "/Conversation/_Block..."
 msgstr "_Blokkeer..."
 
-#: ../pidgin/gtkconv.c:3109
 msgid "/Conversation/_Unblock..."
 msgstr "_Ontblokkeer..."
 
-#: ../pidgin/gtkconv.c:3111
 msgid "/Conversation/_Add..."
 msgstr "_Voeg by..."
 
-#: ../pidgin/gtkconv.c:3113
 msgid "/Conversation/_Remove..."
 msgstr "Ve_rwyder..."
 
-#: ../pidgin/gtkconv.c:3118
 msgid "/Conversation/Insert Lin_k..."
 msgstr "Voeg s_kakel in..."
 
-#: ../pidgin/gtkconv.c:3120
 msgid "/Conversation/Insert Imag_e..."
 msgstr "Voeg pr_entjie in..."
 
-#: ../pidgin/gtkconv.c:3126
 msgid "/Conversation/_Close"
 msgstr "Slui_t"
 
 #. Options
-#: ../pidgin/gtkconv.c:3130
 msgid "/_Options"
 msgstr "_Opsies"
 
-#: ../pidgin/gtkconv.c:3131
 msgid "/Options/Enable _Logging"
 msgstr "Aktiveer _boekstawing"
 
-#: ../pidgin/gtkconv.c:3132
 msgid "/Options/Enable _Sounds"
 msgstr "Aktiveer _klanke"
 
-#: ../pidgin/gtkconv.c:3134
 msgid "/Options/Show Formatting _Toolbars"
 msgstr "Wys _formateringnutsgoed"
 
-#: ../pidgin/gtkconv.c:3135
 msgid "/Options/Show Ti_mestamps"
 msgstr "Wys _tydstempels"
 
-#: ../pidgin/gtkconv.c:3327
 msgid "/Conversation/More"
 msgstr "Meer"
 
-#: ../pidgin/gtkconv.c:3383
 msgid "/Options"
 msgstr "Opsies"
 
@@ -16776,95 +11831,72 @@ msgstr "Opsies"
 #. 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:3419 ../pidgin/gtkconv.c:3451
 msgid "/Conversation"
 msgstr "Gesprek"
 
-#: ../pidgin/gtkconv.c:3459
 msgid "/Conversation/View Log"
 msgstr "Bekyk staafl?er"
 
-#: ../pidgin/gtkconv.c:3464
 msgid "/Conversation/Media/Audio Call"
 msgstr "Oudio-oproep"
 
-#: ../pidgin/gtkconv.c:3467
 msgid "/Conversation/Media/Video Call"
 msgstr "Video-oproep"
 
-#: ../pidgin/gtkconv.c:3470
 msgid "/Conversation/Media/Audio\\/Video Call"
 msgstr "Oudio/Video-oproep"
 
-#: ../pidgin/gtkconv.c:3477
 msgid "/Conversation/Send File..."
 msgstr "Stuur l?er..."
 
-#: ../pidgin/gtkconv.c:3481
 msgid "/Conversation/Get Attention"
 msgstr "Trek aandag"
 
-#: ../pidgin/gtkconv.c:3484
 msgid "/Conversation/Add Buddy Pounce..."
 msgstr "Voeg vriendwag by..."
 
-#: ../pidgin/gtkconv.c:3490
 msgid "/Conversation/Get Info"
 msgstr "Kry inligting"
 
-#: ../pidgin/gtkconv.c:3494
 msgid "/Conversation/Invite..."
 msgstr "Nooi uit..."
 
-#: ../pidgin/gtkconv.c:3500
 msgid "/Conversation/Alias..."
 msgstr "Alias..."
 
-#: ../pidgin/gtkconv.c:3504
 msgid "/Conversation/Block..."
 msgstr "Blokkeer..."
 
-#: ../pidgin/gtkconv.c:3508
 msgid "/Conversation/Unblock..."
 msgstr "Ontblokkeer..."
 
-#: ../pidgin/gtkconv.c:3512
 msgid "/Conversation/Add..."
 msgstr "Voeg by..."
 
-#: ../pidgin/gtkconv.c:3516
 msgid "/Conversation/Remove..."
 msgstr "Verwyder..."
 
-#: ../pidgin/gtkconv.c:3522
 msgid "/Conversation/Insert Link..."
 msgstr "Voeg skakel in..."
 
-#: ../pidgin/gtkconv.c:3526
 msgid "/Conversation/Insert Image..."
 msgstr "Voeg prent in..."
 
-#: ../pidgin/gtkconv.c:3532
 msgid "/Options/Enable Logging"
 msgstr "Aktiveer boekstawing"
 
-#: ../pidgin/gtkconv.c:3535
 msgid "/Options/Enable Sounds"
 msgstr "Aktiveer klanke"
 
-#: ../pidgin/gtkconv.c:3548
 msgid "/Options/Show Formatting Toolbars"
 msgstr "Wys formateringnutsgoed"
 
-#: ../pidgin/gtkconv.c:3551
 msgid "/Options/Show Timestamps"
 msgstr "Wys tydstempels"
 
-#: ../pidgin/gtkconv.c:3629
 msgid "User is typing..."
 msgstr "Gebruiker tik..."
 
-#: ../pidgin/gtkconv.c:3703
 #, c-format
 msgid ""
 "\n"
@@ -16874,584 +11906,425 @@ msgstr ""
 "%s het opgehou tik"
 
 #. Build the Send To menu
-#: ../pidgin/gtkconv.c:3882 ../pidgin/gtkconv.c:8599
 msgid "S_end To"
 msgstr "S_tuur na"
 
-#: ../pidgin/gtkconv.c:4548 ../pidgin/plugins/sendbutton.c:61
 msgid "_Send"
 msgstr "_Stuur"
 
 #. Setup the label telling how many people are in the room.
-#: ../pidgin/gtkconv.c:4717
 msgid "0 people in room"
 msgstr "0 mense in die kamer"
 
-#: ../pidgin/gtkconv.c:4876
 msgid "Close Find bar"
 msgstr "Sluit soekbalk"
 
-#: ../pidgin/gtkconv.c:4878
 msgid "Find:"
 msgstr "Vind:"
 
-#: ../pidgin/gtkconv.c:6121 ../pidgin/gtkconv.c:6247
 #, 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:6780
 msgid "Stopped Typing"
 msgstr "Het opgehou tik"
 
-#: ../pidgin/gtkconv.c:6783
 msgid "Nick Said"
 msgstr "Bynaam genoem"
 
-#: ../pidgin/gtkconv.c:6786
 msgid "Unread Messages"
 msgstr "Ongelese boodskappe"
 
-#: ../pidgin/gtkconv.c:6792
 msgid "New Event"
 msgstr "Nuwe gebeurtenis"
 
-#: ../pidgin/gtkconv.c:8082
 msgid "clear: Clears all conversation scrollbacks."
 msgstr "clear: Maak die gesprekvenster skoon."
 
-#: ../pidgin/gtkconv.c:8282
 msgid "Confirm close"
 msgstr "Bevestig sluiting"
 
-#: ../pidgin/gtkconv.c:8314
 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:8940
 msgid "Close other tabs"
 msgstr "Sluit ander oortjies"
 
-#: ../pidgin/gtkconv.c:8946
 msgid "Close all tabs"
 msgstr "Sluit alle oortjies"
 
-#: ../pidgin/gtkconv.c:8954
 msgid "Detach this tab"
 msgstr "Ontheg hierdie oortjie"
 
-#: ../pidgin/gtkconv.c:8960
 msgid "Close this tab"
 msgstr "Sluit hierdie oortjie"
 
-#: ../pidgin/gtkconv.c:9465
 msgid "Close conversation"
 msgstr "Sluit gesprek"
 
-#: ../pidgin/gtkconv.c:10062
 msgid "Last created window"
 msgstr "Laas geskepte venster"
 
-#: ../pidgin/gtkconv.c:10064
 msgid "Separate IM and Chat windows"
 msgstr "Aparte kitsboodskap- en geselsievensters"
 
-#: ../pidgin/gtkconv.c:10066 ../pidgin/gtkprefs.c:1967
 msgid "New window"
 msgstr "Nuwe venster"
 
-#: ../pidgin/gtkconv.c:10068
 msgid "By group"
 msgstr "Volgens groep"
 
-#: ../pidgin/gtkconv.c:10070
 msgid "By account"
 msgstr "Volgens rekening"
 
-#: ../pidgin/gtkdebug.c:167 ../pidgin/gtkdebug.c:749 ../pidgin/gtkdebug.c:751
 msgid "Find"
 msgstr "Vind"
 
-#: ../pidgin/gtkdebug.c:195
 msgid "_Search for:"
 msgstr "_Soek vir:"
 
-#: ../pidgin/gtkdebug.c:234
 msgid "Save Debug Log"
 msgstr "Stoor ontfoutstaafl?er"
 
-#: ../pidgin/gtkdebug.c:582
 msgid "Invert"
 msgstr "Omkeer"
 
-#: ../pidgin/gtkdebug.c:585
 msgid "Highlight matches"
 msgstr "Merk passings"
 
-#: ../pidgin/gtkdebug.c:652
 msgid "_Icon Only"
 msgstr "Net _ikoon"
 
-#: ../pidgin/gtkdebug.c:653
 msgid "_Text Only"
 msgstr "Net _teks"
 
-#: ../pidgin/gtkdebug.c:654
 msgid "_Both Icon & Text"
 msgstr "_Beide ikoon en teks"
 
-#: ../pidgin/gtkdebug.c:802 ../pidgin/gtkdebug.c:804 ../pidgin/gtkdebug.c:806
 msgid "Filter"
 msgstr "Filter"
 
-#: ../pidgin/gtkdebug.c:826 ../pidgin/gtkdebug.c:828
 msgid "Right click for more options."
 msgstr "Klik regs vir meer opsies."
 
-#: ../pidgin/gtkdebug.c:862
 msgid "Level "
 msgstr "Vlak "
 
-#: ../pidgin/gtkdebug.c:868 ../pidgin/gtkdebug.c:870
 msgid "Select the debug filter level."
 msgstr "Kies die ontfoutfiltervlak."
 
-#: ../pidgin/gtkdebug.c:875
 msgid "All"
 msgstr "Almal"
 
-#: ../pidgin/gtkdebug.c:876
 msgid "Misc"
 msgstr "Allerlei"
 
-#: ../pidgin/gtkdebug.c:878
 msgid "Warning"
 msgstr "Waarskuwing"
 
-#: ../pidgin/gtkdebug.c:879
 msgid "Error "
 msgstr "Fout "
 
-#: ../pidgin/gtkdebug.c:880
 msgid "Fatal Error"
 msgstr "Fatale fout"
 
-#: ../pidgin/gtkdialogs.c:76
 msgid "bug master"
 msgstr "goggameester"
 
-#: ../pidgin/gtkdialogs.c:78
 msgid "artist"
 msgstr "kunstenaar"
 
 #. feel free to not translate this
-#: ../pidgin/gtkdialogs.c:80
 msgid "Ka-Hing Cheung"
 msgstr "Ka-Hing Cheung"
 
-#: ../pidgin/gtkdialogs.c:91
 msgid "voice and video"
 msgstr "stem en video"
 
-#: ../pidgin/gtkdialogs.c:93
 msgid "support"
 msgstr "steun"
 
-#: ../pidgin/gtkdialogs.c:95 ../pidgin/gtkdialogs.c:118
 msgid "webmaster"
 msgstr "webmeester"
 
-#: ../pidgin/gtkdialogs.c:104
 msgid "Senior Contributor/QA"
 msgstr "Seniorbydraer/gehaltebeheerder"
 
-#: ../pidgin/gtkdialogs.c:113
 msgid "win32 port"
 msgstr "win32-weergawe"
 
-#: ../pidgin/gtkdialogs.c:115 ../pidgin/gtkdialogs.c:116
 msgid "maintainer"
 msgstr "onderhouer"
 
-#: ../pidgin/gtkdialogs.c:117
 msgid "libfaim maintainer"
 msgstr "libfaim-onderhouer"
 
 #. If "lazy bum" translates literally into a serious insult, use something else or omit it.
-#: ../pidgin/gtkdialogs.c:120
 msgid "hacker and designated driver [lazy bum]"
 msgstr "kapper en geheelonthouer [luie lak]"
 
-#: ../pidgin/gtkdialogs.c:123
 msgid "support/QA"
 msgstr "steun/gehaltebeheer"
 
-#: ../pidgin/gtkdialogs.c:124
 msgid "XMPP"
 msgstr "XMPP"
 
-#: ../pidgin/gtkdialogs.c:125
 msgid "original author"
 msgstr "oorspronklike outeur"
 
-#: ../pidgin/gtkdialogs.c:127
 msgid "lead developer"
 msgstr "hoofprogrammeerder"
 
-#: ../pidgin/gtkdialogs.c:143 ../pidgin/gtkdialogs.c:144
 msgid "Afrikaans"
 msgstr "Afrikaans"
 
-#: ../pidgin/gtkdialogs.c:145 ../pidgin/gtkdialogs.c:250
 msgid "Arabic"
 msgstr "Arabies"
 
-#: ../pidgin/gtkdialogs.c:146
+#, fuzzy
+msgid "Assamese"
+msgstr "Bekaamd"
+
 msgid "Belarusian Latin"
 msgstr "Witrussies in Latynse skrif"
 
-#: ../pidgin/gtkdialogs.c:147 ../pidgin/gtkdialogs.c:148
-#: ../pidgin/gtkdialogs.c:251
 msgid "Bulgarian"
 msgstr "Bulgaars"
 
-#: ../pidgin/gtkdialogs.c:149 ../pidgin/gtkdialogs.c:150
-#: ../pidgin/gtkdialogs.c:151 ../pidgin/gtkdialogs.c:252
-#: ../pidgin/gtkdialogs.c:253
 msgid "Bengali"
 msgstr "Bengaals"
 
-#: ../pidgin/gtkdialogs.c:152
 msgid "Bengali-India"
 msgstr "Bengaals (Indi?)"
 
-#: ../pidgin/gtkdialogs.c:153
 msgid "Bosnian"
 msgstr "Bosnies"
 
-#: ../pidgin/gtkdialogs.c:154 ../pidgin/gtkdialogs.c:254
-#: ../pidgin/gtkdialogs.c:255
 msgid "Catalan"
 msgstr "Katalaans"
 
-#: ../pidgin/gtkdialogs.c:155 ../pidgin/gtkdialogs.c:156
 msgid "Valencian-Catalan"
 msgstr "Valensiese Katalaans"
 
-#: ../pidgin/gtkdialogs.c:157 ../pidgin/gtkdialogs.c:256
-#: ../pidgin/gtkdialogs.c:257
 msgid "Czech"
 msgstr "Tsjeggies"
 
-#: ../pidgin/gtkdialogs.c:158 ../pidgin/gtkdialogs.c:159
 msgid "Danish"
 msgstr "Deens"
 
-#: ../pidgin/gtkdialogs.c:160 ../pidgin/gtkdialogs.c:161
-#: ../pidgin/gtkdialogs.c:258
 msgid "German"
 msgstr "Duits"
 
-#: ../pidgin/gtkdialogs.c:162 ../pidgin/gtkdialogs.c:163
-#: ../pidgin/gtkdialogs.c:164
 msgid "Dzongkha"
 msgstr "Dzongkha"
 
-#: ../pidgin/gtkdialogs.c:165 ../pidgin/gtkdialogs.c:166
 msgid "Greek"
 msgstr "Grieks"
 
-#: ../pidgin/gtkdialogs.c:167
 msgid "Australian English"
 msgstr "Australiaanse Engels"
 
-#: ../pidgin/gtkdialogs.c:168
 msgid "Canadian English"
 msgstr "Kanadese Engels"
 
-#: ../pidgin/gtkdialogs.c:169
 msgid "British English"
 msgstr "Britse Engels"
 
-#: ../pidgin/gtkdialogs.c:170
 msgid "Esperanto"
 msgstr "Esperanto"
 
-#: ../pidgin/gtkdialogs.c:171 ../pidgin/gtkdialogs.c:259
-#: ../pidgin/gtkdialogs.c:260 ../pidgin/gtkdialogs.c:261
-#: ../pidgin/gtkdialogs.c:262
 msgid "Spanish"
 msgstr "Spaans"
 
-#: ../pidgin/gtkdialogs.c:172
 msgid "Estonian"
 msgstr "Estnies"
 
-#: ../pidgin/gtkdialogs.c:173 ../pidgin/gtkdialogs.c:263
-#: ../pidgin/gtkdialogs.c:264
 msgid "Basque"
 msgstr "Baskies"
 
-#: ../pidgin/gtkdialogs.c:174 ../pidgin/gtkdialogs.c:175
-#: ../pidgin/gtkdialogs.c:176
 msgid "Persian"
 msgstr "Persies"
 
-#: ../pidgin/gtkdialogs.c:177 ../pidgin/gtkdialogs.c:265
-#: ../pidgin/gtkdialogs.c:266
 msgid "Finnish"
 msgstr "Fins"
 
-#: ../pidgin/gtkdialogs.c:178 ../pidgin/gtkdialogs.c:267
-#: ../pidgin/gtkdialogs.c:268 ../pidgin/gtkdialogs.c:269
-#: ../pidgin/gtkdialogs.c:270
 msgid "French"
 msgstr "Frans"
 
-#: ../pidgin/gtkdialogs.c:179
 msgid "Irish"
 msgstr "Iers"
 
-#: ../pidgin/gtkdialogs.c:180 ../pidgin/gtkdialogs.c:181
-#: ../pidgin/gtkdialogs.c:271
 msgid "Galician"
 msgstr "Galisies"
 
-#: ../pidgin/gtkdialogs.c:182 ../pidgin/gtkdialogs.c:183
 msgid "Gujarati"
 msgstr "Gujaraties"
 
-#: ../pidgin/gtkdialogs.c:183
 msgid "Gujarati Language Team"
 msgstr "Goedjarati-taalspan"
 
-#: ../pidgin/gtkdialogs.c:184 ../pidgin/gtkdialogs.c:272
 msgid "Hebrew"
 msgstr "Hebreeus"
 
-#: ../pidgin/gtkdialogs.c:185 ../pidgin/gtkdialogs.c:273
 msgid "Hindi"
 msgstr "Hindi"
 
-#: ../pidgin/gtkdialogs.c:186 ../pidgin/gtkdialogs.c:274
 msgid "Hungarian"
 msgstr "Hongaars"
 
-#: ../pidgin/gtkdialogs.c:187
 msgid "Armenian"
 msgstr "Armeens"
 
-#: ../pidgin/gtkdialogs.c:188
 msgid "Indonesian"
 msgstr "Indonesies"
 
-#: ../pidgin/gtkdialogs.c:189 ../pidgin/gtkdialogs.c:275
 msgid "Italian"
 msgstr "Italiaans"
 
-#: ../pidgin/gtkdialogs.c:190 ../pidgin/gtkdialogs.c:276
-#: ../pidgin/gtkdialogs.c:277 ../pidgin/gtkdialogs.c:278
 msgid "Japanese"
 msgstr "Japannees"
 
-#: ../pidgin/gtkdialogs.c:191 ../pidgin/gtkdialogs.c:279
 msgid "Georgian"
 msgstr "Georgies"
 
-#: ../pidgin/gtkdialogs.c:191
 msgid "Ubuntu Georgian Translators"
 msgstr "Ubuntu- Georgiese vertalers"
 
-#: ../pidgin/gtkdialogs.c:192
 msgid "Khmer"
 msgstr "Khmer"
 
-#: ../pidgin/gtkdialogs.c:193
 msgid "Kannada"
 msgstr "Kannada"
 
-#: ../pidgin/gtkdialogs.c:193
 msgid "Kannada Translation team"
 msgstr "Kannada-vertaalspan"
 
-#: ../pidgin/gtkdialogs.c:194 ../pidgin/gtkdialogs.c:280
-#: ../pidgin/gtkdialogs.c:281
 msgid "Korean"
 msgstr "Koreaans"
 
-#: ../pidgin/gtkdialogs.c:195 ../pidgin/gtkdialogs.c:196
-#: ../pidgin/gtkdialogs.c:197
 msgid "Kurdish"
 msgstr "Koerdies"
 
-#: ../pidgin/gtkdialogs.c:198
 msgid "Lao"
 msgstr "Lao"
 
-#: ../pidgin/gtkdialogs.c:199 ../pidgin/gtkdialogs.c:200
-#: ../pidgin/gtkdialogs.c:201 ../pidgin/gtkdialogs.c:285
 msgid "Macedonian"
 msgstr "Masedonies"
 
-#: ../pidgin/gtkdialogs.c:202
+#, fuzzy
+msgid "Malayalam"
+msgstr "Maleisies"
+
 msgid "Mongolian"
 msgstr "Mongools"
 
-#: ../pidgin/gtkdialogs.c:203
 msgid "Marathi"
 msgstr "Mahratti"
 
-#: ../pidgin/gtkdialogs.c:204
 msgid "Malay"
 msgstr "Maleisies"
 
-#: ../pidgin/gtkdialogs.c:205 ../pidgin/gtkdialogs.c:286
-#: ../pidgin/gtkdialogs.c:287 ../pidgin/gtkdialogs.c:288
 msgid "Bokm?l Norwegian"
 msgstr "Bokm?l-Noorweegs"
 
-#: ../pidgin/gtkdialogs.c:206
 msgid "Nepali"
 msgstr "Nepalees"
 
-#: ../pidgin/gtkdialogs.c:207
 msgid "Dutch, Flemish"
 msgstr "Nederlands, Flaams"
 
-#: ../pidgin/gtkdialogs.c:208
 msgid "Norwegian Nynorsk"
 msgstr "Noorweegse Nynorsk"
 
-#: ../pidgin/gtkdialogs.c:209
 msgid "Occitan"
 msgstr "Oksitaans"
 
-#: ../pidgin/gtkdialogs.c:210
 msgid "Oriya"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:211
 msgid "Punjabi"
 msgstr "Pandjab"
 
-#: ../pidgin/gtkdialogs.c:212 ../pidgin/gtkdialogs.c:213
-#: ../pidgin/gtkdialogs.c:289 ../pidgin/gtkdialogs.c:290
-#: ../pidgin/gtkdialogs.c:291 ../pidgin/gtkdialogs.c:292
 msgid "Polish"
 msgstr "Pools"
 
-#: ../pidgin/gtkdialogs.c:214
 msgid "Portuguese"
 msgstr "Portugees"
 
-#: ../pidgin/gtkdialogs.c:215 ../pidgin/gtkdialogs.c:293
 msgid "Portuguese-Brazil"
 msgstr "Portugees-Brasili?"
 
-#: ../pidgin/gtkdialogs.c:216
 msgid "Pashto"
 msgstr "Pasjtoe"
 
-#: ../pidgin/gtkdialogs.c:217 ../pidgin/gtkdialogs.c:218
 msgid "Romanian"
 msgstr "Romeens"
 
-#: ../pidgin/gtkdialogs.c:219 ../pidgin/gtkdialogs.c:294
-#: ../pidgin/gtkdialogs.c:295 ../pidgin/gtkdialogs.c:296
 msgid "Russian"
 msgstr "Russies"
 
-#: ../pidgin/gtkdialogs.c:220 ../pidgin/gtkdialogs.c:221
-#: ../pidgin/gtkdialogs.c:297 ../pidgin/gtkdialogs.c:298
-#: ../pidgin/gtkdialogs.c:299
 msgid "Slovak"
 msgstr "Slowaaks"
 
-#: ../pidgin/gtkdialogs.c:222 ../pidgin/gtkdialogs.c:300
 msgid "Slovenian"
 msgstr "Sloweens"
 
-#: ../pidgin/gtkdialogs.c:223
 msgid "Albanian"
 msgstr "Albanees"
 
-#: ../pidgin/gtkdialogs.c:224 ../pidgin/gtkdialogs.c:225
-#: ../pidgin/gtkdialogs.c:301 ../pidgin/gtkdialogs.c:302
 msgid "Serbian"
 msgstr "Serwies"
 
-#: ../pidgin/gtkdialogs.c:226 ../pidgin/gtkdialogs.c:227
 msgid "Sinhala"
 msgstr "Sinhalees"
 
-#: ../pidgin/gtkdialogs.c:228 ../pidgin/gtkdialogs.c:303
-#: ../pidgin/gtkdialogs.c:304
 msgid "Swedish"
 msgstr "Sweeds"
 
-#: ../pidgin/gtkdialogs.c:229
 msgid "Swahili"
 msgstr "Swahili"
 
-#: ../pidgin/gtkdialogs.c:230 ../pidgin/gtkdialogs.c:231
 msgid "Tamil"
 msgstr "Tamil"
 
-#: ../pidgin/gtkdialogs.c:232 ../pidgin/gtkdialogs.c:305
 msgid "Telugu"
 msgstr "Teloegoe"
 
-#: ../pidgin/gtkdialogs.c:233
 msgid "Thai"
 msgstr "Thai"
 
-#: ../pidgin/gtkdialogs.c:234 ../pidgin/gtkdialogs.c:306
 msgid "Turkish"
 msgstr "Turks"
 
-#: ../pidgin/gtkdialogs.c:235
 msgid "Ukranian"
 msgstr "Oekra?ens"
 
-#: ../pidgin/gtkdialogs.c:236
 msgid "Urdu"
 msgstr "Oerdoe"
 
-#: ../pidgin/gtkdialogs.c:237
 msgid "Vietnamese"
 msgstr "Vi?tnamees"
 
-#: ../pidgin/gtkdialogs.c:237
 msgid "T.M.Thanh and the Gnome-Vi Team"
 msgstr "T.M.Thanh en die Gnome-Vi-span"
 
-#: ../pidgin/gtkdialogs.c:238 ../pidgin/gtkdialogs.c:307
-#: ../pidgin/gtkdialogs.c:308
 msgid "Simplified Chinese"
 msgstr "Vereenvoudigde Sjinees"
 
-#: ../pidgin/gtkdialogs.c:239 ../pidgin/gtkdialogs.c:240
-#: ../pidgin/gtkdialogs.c:241
 msgid "Hong Kong Chinese"
 msgstr "Hongkongse Sjinees"
 
-#: ../pidgin/gtkdialogs.c:242 ../pidgin/gtkdialogs.c:243
-#: ../pidgin/gtkdialogs.c:309
 msgid "Traditional Chinese"
 msgstr "Tradisionele Sjinees"
 
-#: ../pidgin/gtkdialogs.c:249
 msgid "Amharic"
 msgstr "Amharies"
 
-#: ../pidgin/gtkdialogs.c:282 ../pidgin/gtkdialogs.c:283
-#: ../pidgin/gtkdialogs.c:284
 msgid "Lithuanian"
 msgstr "Litous"
 
-#: ../pidgin/gtkdialogs.c:479
 #, c-format
 msgid ""
 "%s is a messaging client based on libpurple which is capable of connecting "
@@ -17463,12 +12336,11 @@ msgstr ""
 msgstr ""
 "%s is 'n geselskli?nt gebaseer op wat wat gelyktydig kan koppel aan verskeie "
 "boodskapdienste.  %s is in C geskryf m.b.v. GTK+.  %s word vrygestel en kan "
-"gewysig en versprei word onderhewig aan die voorwaardes van die GPL "
-"weergawe 2 (of later).  'n Kopie van die GPL word versprei saam met %s.  %s "
-"se kopiereg berus by sy bydraers - 'n lys met hul name word saam met %s "
+"gewysig en versprei word onderhewig aan die voorwaardes van die GPL weergawe "
+"2 (of later).  'n Kopie van die GPL word versprei saam met %s.  %s se "
+"kopiereg berus by sy bydraers - 'n lys met hul name word saam met %s "
 "versprei.  Daar is geen waarborg vir %s nie.<BR><BR>"
 
-#: ../pidgin/gtkdialogs.c:489
 #, c-format
 msgid ""
 "<FONT SIZE=\"4\"><B>Helpful Resources</B></FONT><BR>\t<A HREF=\"%s"
@@ -17476,11 +12348,10 @@ msgstr ""
 "Channel: #pidgin on irc.freenode.net<BR>\tXMPP MUC: devel at conference.pidgin."
 "im<BR><BR>"
 msgstr ""
-"<FONT SIZE=\"4\"><B>Nuttige hulpbronne</B></FONT><BR>\t<A HREF=\"%"
-"s\">Webwerf</A><BR>\t<A HREF=\"%s\">Algemene vrae</A><BR>\tIRC-kanaal: #pidgin op "
-"irc.freenode.net<BR>\tXMPP MUC: devel at conference.pidgin.im<BR><BR>"
+"<FONT SIZE=\"4\"><B>Nuttige hulpbronne</B></FONT><BR>\t<A HREF=\"%s"
+"\">Webwerf</A><BR>\t<A HREF=\"%s\">Algemene vrae</A><BR>\tIRC-kanaal: "
+"#pidgin op irc.freenode.net<BR>\tXMPP MUC: devel at conference.pidgin.im<BR><BR>"
 
-#: ../pidgin/gtkdialogs.c:496
 #, c-format
 msgid ""
 "<font size=\"4\"><b>Help from other Pidgin users</b></font> is available by "
@@ -17492,70 +12363,53 @@ msgstr ""
 "<br/>"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:506
 #, c-format
 msgid "About %s"
 msgstr "Omtrent %s"
 
-#: ../pidgin/gtkdialogs.c:528
 msgid "Build Information"
 msgstr "Bouinligting"
 
 #. End of not to be translated section
-#: ../pidgin/gtkdialogs.c:705
 #, c-format
 msgid "%s Build Information"
 msgstr "%s-bouinligting"
 
-#: ../pidgin/gtkdialogs.c:726
 msgid "Current Developers"
 msgstr "Huidige programmeerders"
 
-#: ../pidgin/gtkdialogs.c:732
 msgid "Crazy Patch Writers"
 msgstr "Malle lapverwers"
 
-#: ../pidgin/gtkdialogs.c:738
 msgid "Retired Developers"
 msgstr "Afgetrede programmeerders"
 
-#: ../pidgin/gtkdialogs.c:744
 msgid "Retired Crazy Patch Writers"
 msgstr "Afgetrede malle lapverwers"
 
-#: ../pidgin/gtkdialogs.c:747
 #, c-format
 msgid "%s Developer Information"
 msgstr "%s-programmeerinligting"
 
-#: ../pidgin/gtkdialogs.c:768
 msgid "Current Translators"
 msgstr "Huidige vertalers"
 
-#: ../pidgin/gtkdialogs.c:774
 msgid "Past Translators"
 msgstr "Vorige vertalers"
 
-#: ../pidgin/gtkdialogs.c:777
 #, c-format
 msgid "%s Translator Information"
 msgstr "%s-vertaalinligting"
 
-#: ../pidgin/gtkdialogs.c:807 ../pidgin/gtkdialogs.c:946
-#: ../pidgin/gtkdialogs.c:1027
 msgid "_Name"
 msgstr "_Naam"
 
-#: ../pidgin/gtkdialogs.c:812 ../pidgin/gtkdialogs.c:951
-#: ../pidgin/gtkdialogs.c:1032
 msgid "_Account"
 msgstr "_Rekening"
 
-#: ../pidgin/gtkdialogs.c:959
 msgid "Get User Info"
 msgstr "Kry gebruikerinligting"
 
-#: ../pidgin/gtkdialogs.c:961
 msgid ""
 "Please enter the username or alias of the person whose info you would like "
 "to view."
@@ -17563,36 +12417,28 @@ msgstr ""
 "Tik gerus die gebruikernaam of die alias van die persoon wie se inligting u "
 "wil bekyk."
 
-#: ../pidgin/gtkdialogs.c:1051
 msgid "View User Log"
 msgstr "Bekyk gebruikerstaafl?er"
 
-#: ../pidgin/gtkdialogs.c:1073
 msgid "Alias Contact"
 msgstr "Aliaskontak"
 
-#: ../pidgin/gtkdialogs.c:1074
 msgid "Enter an alias for this contact."
 msgstr "Tik 'n alias vir hierdie kontak."
 
-#: ../pidgin/gtkdialogs.c:1096
 #, c-format
 msgid "Enter an alias for %s."
 msgstr "Tik 'n alias vir %s."
 
-#: ../pidgin/gtkdialogs.c:1098
 msgid "Alias Buddy"
 msgstr "Aliasvriend"
 
-#: ../pidgin/gtkdialogs.c:1119
 msgid "Alias Chat"
 msgstr "Aliasgeselsie"
 
-#: ../pidgin/gtkdialogs.c:1120
 msgid "Enter an alias for this chat."
 msgstr "Tik 'n alias vir hierdie geselsie."
 
-#: ../pidgin/gtkdialogs.c:1159
 #, c-format
 msgid ""
 "You are about to remove the contact containing %s and %d other buddy from "
@@ -17607,15 +12453,12 @@ msgstr[1] ""
 "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:1167
 msgid "Remove Contact"
 msgstr "Verwyder kontak"
 
-#: ../pidgin/gtkdialogs.c:1170
 msgid "_Remove Contact"
 msgstr "_Verwyder kontak"
 
-#: ../pidgin/gtkdialogs.c:1201
 #, c-format
 msgid ""
 "You are about to merge the group called %s into the group called %s. Do you "
@@ -17624,15 +12467,12 @@ msgstr ""
 "U staan op die punt om die groep genaamd %s in die groep genaamd %s te "
 "smeld. Wil u voortgaan?"
 
-#: ../pidgin/gtkdialogs.c:1208
 msgid "Merge Groups"
 msgstr "Versmeld groepe"
 
-#: ../pidgin/gtkdialogs.c:1211
 msgid "_Merge Groups"
 msgstr "_Versmeld groepe"
 
-#: ../pidgin/gtkdialogs.c:1261
 #, c-format
 msgid ""
 "You are about to remove the group %s and all its members from your buddy "
@@ -17641,30 +12481,24 @@ msgstr ""
 "U staan op die punt om die groep %s en al sy lede uit die vriendelys te "
 "verwyder.  Wil u voortgaan?"
 
-#: ../pidgin/gtkdialogs.c:1264
 msgid "Remove Group"
 msgstr "Verwyder groep"
 
-#: ../pidgin/gtkdialogs.c:1267
 msgid "_Remove Group"
 msgstr "_Verwyder groep"
 
-#: ../pidgin/gtkdialogs.c:1300
 #, 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:1303
 msgid "Remove Buddy"
 msgstr "Verwyder vriend"
 
-#: ../pidgin/gtkdialogs.c:1306
 msgid "_Remove Buddy"
 msgstr "_Verwyder vriend"
 
-#: ../pidgin/gtkdialogs.c:1327
 #, c-format
 msgid ""
 "You are about to remove the chat %s from your buddy list.  Do you want to "
@@ -17672,244 +12506,187 @@ msgstr ""
 msgstr ""
 "U gaan nou die geselsie %s uit die vriendelys verwyder.  Wil u voortgaan?"
 
-#: ../pidgin/gtkdialogs.c:1330
 msgid "Remove Chat"
 msgstr "Verwyder geselsie"
 
-#: ../pidgin/gtkdialogs.c:1333
 msgid "_Remove Chat"
 msgstr "_Verwyder geselsie"
 
-#: ../pidgin/gtkdocklet.c:155
 msgid "Right-click for more unread messages...\n"
 msgstr "Klik regs vir nog ongelese boodskappe...\n"
 
-#: ../pidgin/gtkdocklet.c:538
 msgid "_Change Status"
 msgstr "_Verander status"
 
-#: ../pidgin/gtkdocklet.c:684
 msgid "Show Buddy _List"
 msgstr "Wys vriende_lys"
 
-#: ../pidgin/gtkdocklet.c:689
 msgid "_Unread Messages"
 msgstr "_Ongelese boodskappe"
 
-#: ../pidgin/gtkdocklet.c:710
 msgid "New _Message..."
 msgstr "Nuwe _boodskap..."
 
-#: ../pidgin/gtkdocklet.c:724
 msgid "_Accounts"
 msgstr "_Rekeninge"
 
-#: ../pidgin/gtkdocklet.c:725
 msgid "Plu_gins"
 msgstr "_Inproppe"
 
-#: ../pidgin/gtkdocklet.c:726
 msgid "Pr_eferences"
 msgstr "_Voorkeure"
 
-#: ../pidgin/gtkdocklet.c:730
 msgid "Mute _Sounds"
 msgstr "Doof _klanke"
 
-#: ../pidgin/gtkdocklet.c:737
 msgid "_Blink on New Message"
 msgstr "_Flikker met nuwe boodskap"
 
-#: ../pidgin/gtkdocklet.c:747
 msgid "_Quit"
 msgstr "_Sluit af"
 
-#: ../pidgin/gtkft.c:153
 msgid "Not started"
 msgstr "Nie begin nie"
 
-#: ../pidgin/gtkft.c:275
 msgid "<b>Receiving As:</b>"
 msgstr "<b>Ontvang as:</b>"
 
-#: ../pidgin/gtkft.c:277
 msgid "<b>Receiving From:</b>"
 msgstr "<b>Ontvang vanaf:</b>"
 
-#: ../pidgin/gtkft.c:281
 msgid "<b>Sending To:</b>"
 msgstr "<b>Stuur aan:</b>"
 
-#: ../pidgin/gtkft.c:283
 msgid "<b>Sending As:</b>"
 msgstr "<b>Stuur as:</b>"
 
-#: ../pidgin/gtkft.c:477 ../pidgin/gtkutils.c:3148
 msgid "There is no application configured to open this type of file."
 msgstr "Daar is geen toepassing opgestel om hierdie l?ertipe te open nie."
 
-#: ../pidgin/gtkft.c:482 ../pidgin/gtkutils.c:3153
 msgid "An error occurred while opening the file."
 msgstr "Kon nie die l?er open nie."
 
-#: ../pidgin/gtkft.c:519 ../pidgin/gtkutils.c:3188
 #, c-format
 msgid "Error launching %s: %s"
 msgstr "Kon nie %s laai nie: %s"
 
-#: ../pidgin/gtkft.c:528 ../pidgin/gtkutils.c:3196
 #, c-format
 msgid "Error running %s"
 msgstr "Kon nie %s laat loop nie"
 
-#: ../pidgin/gtkft.c:529 ../pidgin/gtkutils.c:3197
 #, c-format
 msgid "Process returned error code %d"
 msgstr "Proses het foutkode %d aangegee"
 
-#: ../pidgin/gtkft.c:666
 msgid "Filename:"
 msgstr "L?ernaam:"
 
-#: ../pidgin/gtkft.c:667
 msgid "Local File:"
 msgstr "Plaaslike l?er:"
 
-#: ../pidgin/gtkft.c:669
 msgid "Speed:"
 msgstr "Spoed:"
 
-#: ../pidgin/gtkft.c:670
 msgid "Time Elapsed:"
 msgstr "Tyd verloop:"
 
-#: ../pidgin/gtkft.c:671
 msgid "Time Remaining:"
 msgstr "Oorblywende tyd:"
 
-#: ../pidgin/gtkft.c:756
 msgid "Close this window when all transfers _finish"
 msgstr "Sluit hierdie venster wanneer alle oordragte _klaar is"
 
-#: ../pidgin/gtkft.c:766
 msgid "C_lear finished transfers"
 msgstr "_Verwyder afgehandelde oordragte van lys"
 
 #. "Download Details" arrow
-#: ../pidgin/gtkft.c:775
 msgid "File transfer _details"
 msgstr "_Details oor l?eroordrag"
 
-#: ../pidgin/gtkimhtml.c:925
 msgid "Paste as Plain _Text"
 msgstr "Plak as gewone _teks"
 
-#: ../pidgin/gtkimhtml.c:942 ../pidgin/gtkimhtmltoolbar.c:1333
 msgid "_Reset formatting"
 msgstr "_Terugstel van formatering"
 
-#: ../pidgin/gtkimhtml.c:950
 msgid "Disable _smileys in selected text"
 msgstr "Deaktiveer _gesiggies in gemerkte teks"
 
-#: ../pidgin/gtkimhtml.c:1576
 msgid "Hyperlink color"
 msgstr "Hiperskakelkleur"
 
-#: ../pidgin/gtkimhtml.c:1577
 msgid "Color to draw hyperlinks."
 msgstr "Kleur om hiperskakels mee te teken."
 
-#: ../pidgin/gtkimhtml.c:1580
 msgid "Hyperlink visited color"
 msgstr "Besoekte hiperskakelkleur"
 
-#: ../pidgin/gtkimhtml.c:1581
 msgid "Color to draw hyperlink after it has been visited (or activated)."
-msgstr "Kleur om hiperskakels mee te teken n? dit besoek is (of geaktiveer is)."
+msgstr ""
+"Kleur om hiperskakels mee te teken n? dit besoek is (of geaktiveer is)."
 
-#: ../pidgin/gtkimhtml.c:1584
 msgid "Hyperlink prelight color"
 msgstr "Hiperskakel-voorafmerkkleur"
 
-#: ../pidgin/gtkimhtml.c:1585
 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:1588 ../pidgin/plugins/pidginrc.c:57
 msgid "Sent Message Name Color"
 msgstr "Kleur van gestuurde boodskapnaam"
 
-#: ../pidgin/gtkimhtml.c:1589
 msgid "Color to draw the name of a message you sent."
 msgstr "Kleur vir die naam van 'n boodskap wat u gestuur het."
 
-#: ../pidgin/gtkimhtml.c:1592 ../pidgin/plugins/pidginrc.c:58
 msgid "Received Message Name Color"
 msgstr "Kleur van ontvangde boodskapnaam"
 
-#: ../pidgin/gtkimhtml.c:1593
 msgid "Color to draw the name of a message you received."
 msgstr "Kleur vir die naam van 'n boodskap wat u ontvang het."
 
-#: ../pidgin/gtkimhtml.c:1596
 msgid "\"Attention\" Name Color"
 msgstr "\"Aandag\"-naam se kleur"
 
-#: ../pidgin/gtkimhtml.c:1597
 msgid "Color to draw the name of a message you received containing your name."
 msgstr "Kleur vir die naam van 'n boodskap wat u ontvang het met u naam."
 
-#: ../pidgin/gtkimhtml.c:1600 ../pidgin/plugins/pidginrc.c:60
 msgid "Action Message Name Color"
 msgstr "Kleur van aksieboodskapnaam"
 
-#: ../pidgin/gtkimhtml.c:1601
 msgid "Color to draw the name of an action message."
 msgstr "Kleur vir die naam van 'n aksieboodskap."
 
-#: ../pidgin/gtkimhtml.c:1604
 #, fuzzy
 msgid "Action Message Name Color for Whispered Message"
 msgstr "Kleur van aksieboodskapnaam"
 
-#: ../pidgin/gtkimhtml.c:1605
 #, fuzzy
 msgid "Color to draw the name of a whispered action message."
 msgstr "Kleur vir die naam van 'n aksieboodskap."
 
-#: ../pidgin/gtkimhtml.c:1608
 #, fuzzy
 msgid "Whisper Message Name Color"
 msgstr "Kleur van gestuurde boodskapnaam"
 
-#: ../pidgin/gtkimhtml.c:1609
 #, fuzzy
 msgid "Color to draw the name of a whispered message."
 msgstr "Kleur vir die naam van 'n aksieboodskap."
 
-#: ../pidgin/gtkimhtml.c:1618
 msgid "Typing notification color"
 msgstr "Kleur van tikkennisgewing"
 
-#: ../pidgin/gtkimhtml.c:1619
 #, fuzzy
 msgid "The color to use for the typing notification"
 msgstr "Die kleur vir die tikkennisgewing"
 
-#: ../pidgin/gtkimhtml.c:1622
 msgid "Typing notification font"
 msgstr "Font van tikkennisgewing"
 
-#: ../pidgin/gtkimhtml.c:1623
 msgid "The font to use for the typing notification"
 msgstr "Die font vir die tikkennisgewing"
 
-#: ../pidgin/gtkimhtml.c:1626 ../pidgin/gtkimhtml.c:1627
 msgid "Enable typing notification"
 msgstr "Aktiveer tikkennisgewings"
 
-#: ../pidgin/gtkimhtml.c:3735
 msgid ""
 "<span size='larger' weight='bold'>Unrecognized file type</span>\n"
 "\n"
@@ -17919,7 +12696,6 @@ msgstr ""
 "\n"
 "Val terug na verstek van PNG."
 
-#: ../pidgin/gtkimhtml.c:3765
 #, c-format
 msgid ""
 "<span size='larger' weight='bold'>Error saving image</span>\n"
@@ -17930,39 +12706,30 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../pidgin/gtkimhtml.c:3812
 msgid "Save Image"
 msgstr "Stoor prent"
 
-#: ../pidgin/gtkimhtml.c:3858
 msgid "_Save Image..."
 msgstr "_Stoor prent..."
 
-#: ../pidgin/gtkimhtml.c:3868
 msgid "_Add Custom Smiley..."
 msgstr "_Voeg pasgemaakte gesiggie by..."
 
-#: ../pidgin/gtkimhtmltoolbar.c:174 ../pidgin/plugins/themeedit.c:127
 msgid "Select Font"
 msgstr "Kies font"
 
-#: ../pidgin/gtkimhtmltoolbar.c:254
 msgid "Select Text Color"
 msgstr "Kies tekskleur"
 
-#: ../pidgin/gtkimhtmltoolbar.c:334
 msgid "Select Background Color"
 msgstr "Kies agtergrondkleur"
 
-#: ../pidgin/gtkimhtmltoolbar.c:423
 msgid "_URL"
 msgstr "_URL"
 
-#: ../pidgin/gtkimhtmltoolbar.c:431
 msgid "_Description"
 msgstr "_Beskrywing"
 
-#: ../pidgin/gtkimhtmltoolbar.c:434
 msgid ""
 "Please enter the URL and description of the link that you want to insert. "
 "The description is optional."
@@ -17970,28 +12737,22 @@ msgstr ""
 "Tik gerus die URL en die beskrywing van die skakel wat u wil invoeg. Die "
 "beskrywing is opsioneel."
 
-#: ../pidgin/gtkimhtmltoolbar.c:438
 msgid "Please enter the URL of the link that you want to insert."
 msgstr "Tik gerus die URL van die skakel om in te sit."
 
-#: ../pidgin/gtkimhtmltoolbar.c:443 ../pidgin/gtkimhtmltoolbar.c:1230
 msgid "Insert Link"
 msgstr "Voeg skakel in"
 
-#: ../pidgin/gtkimhtmltoolbar.c:447 ../pidgin/gtkimhtmltoolbar.c:1401
 msgid "_Insert"
 msgstr "_Voeg in"
 
-#: ../pidgin/gtkimhtmltoolbar.c:512
 #, c-format
 msgid "Failed to store image: %s\n"
 msgstr "Stoor van prent het misluk: %s\n"
 
-#: ../pidgin/gtkimhtmltoolbar.c:537
 msgid "Insert Image"
 msgstr "Voeg prent in"
 
-#: ../pidgin/gtkimhtmltoolbar.c:670
 #, c-format
 msgid ""
 "This smiley is disabled because a custom smiley exists for this shortcut:\n"
@@ -18001,150 +12762,114 @@ msgstr ""
 "kortpad:\n"
 " %s"
 
-#: ../pidgin/gtkimhtmltoolbar.c:801
 msgid "Smile!"
 msgstr "Glimlag!"
 
-#: ../pidgin/gtkimhtmltoolbar.c:816
 msgid "_Manage custom smileys"
 msgstr "_Bestuur pasgemaakte gesiggies"
 
-#: ../pidgin/gtkimhtmltoolbar.c:853
 msgid "This theme has no available smileys."
 msgstr "Hierdie tema het geen gesiggies beskikbaar nie."
 
-#: ../pidgin/gtkimhtmltoolbar.c:970 ../pidgin/gtkimhtmltoolbar.c:1358
 msgid "_Font"
 msgstr "_Font"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1181
 msgid "Group Items"
 msgstr "Groepeer items"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1181
 msgid "Ungroup Items"
 msgstr "Ontgroepeer items"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1215 ../pidgin/plugins/convcolors.c:358
 msgid "Bold"
 msgstr "Vetdruk"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1216 ../pidgin/plugins/convcolors.c:367
 msgid "Italic"
 msgstr "Skuinsdruk"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1217 ../pidgin/plugins/convcolors.c:376
 msgid "Underline"
 msgstr "Onderstreep"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1218
 msgid "Strikethrough"
 msgstr "Deurhaal"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1220
 msgid "Increase Font Size"
 msgstr "Vergroot font"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1221
 msgid "Decrease Font Size"
 msgstr "Verklein font"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1223
 msgid "Font Face"
 msgstr "Fonttipe"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1224
 msgid "Foreground Color"
 msgstr "Voorgrondkleur"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1227
 msgid "Reset Formatting"
 msgstr "Stel formatering terug"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1229
 msgid "Insert IM Image"
 msgstr "Voeg kitsboodskap-prent in"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1232
 msgid "Insert Smiley"
 msgstr "Voeg gesiggie in"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1257
 msgid "Send Attention"
 msgstr "Gee aandag"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1318
 msgid "<b>_Bold</b>"
 msgstr "<b>_Vetdruk</b>"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1319
 msgid "<i>_Italic</i>"
 msgstr "<i>_Skuinsdruk</i>"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1320
 msgid "<u>_Underline</u>"
 msgstr "<u>_Onderstreep</u>"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1321
 msgid "<span strikethrough='true'>Strikethrough</span>"
 msgstr "<span strikethrough='true'>Deurhaal</span>"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1322
 msgid "<span size='larger'>_Larger</span>"
 msgstr "<span size='larger'>_Groter</span>"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1324
 msgid "_Normal"
 msgstr "_Normaal"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1326
 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:1330
 msgid "_Font face"
 msgstr "_Font"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1331
 msgid "Foreground _color"
 msgstr "Voorgrond_kleur"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1332
 msgid "Bac_kground color"
 msgstr "Agter_grondkleur"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1409
 msgid "_Image"
 msgstr "_Prent"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1415
 msgid "_Link"
 msgstr "_Skakel"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1421
 msgid "_Horizontal rule"
 msgstr "_Horisontale streep"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1443
 msgid "_Smile!"
 msgstr "_Glimlag!"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1462
 msgid "_Attention!"
 msgstr "_Aandag!"
 
-#: ../pidgin/gtklog.c:245
 msgid "Log Deletion Failed"
 msgstr "Kon nie staafl?er skrap nie"
 
-#: ../pidgin/gtklog.c:246
 msgid "Check permissions and try again."
 msgstr "Kontroleer toestemmings en probeer weer."
 
-#: ../pidgin/gtklog.c:289
 #, c-format
 msgid ""
 "Are you sure you want to permanently delete the log of the conversation with "
@@ -18153,7 +12878,6 @@ msgstr ""
 "Is u seker u wil die staafl?er van die gesprek met %s wat op %s begin is, "
 "permanent uitvee?"
 
-#: ../pidgin/gtklog.c:300
 #, c-format
 msgid ""
 "Are you sure you want to permanently delete the log of the conversation in %"
@@ -18162,7 +12886,6 @@ msgstr ""
 "Wil u seker u wil die staafl?er van die gesprek in %s wat op %s begin is, "
 "permanent uitvee?"
 
-#: ../pidgin/gtklog.c:305
 #, c-format
 msgid ""
 "Are you sure you want to permanently delete the system log which started at %"
@@ -18170,35 +12893,28 @@ msgstr ""
 msgstr ""
 "Wil u definitief die stelselstaafl?er wat %s begin het, permanent uitvee?"
 
-#: ../pidgin/gtklog.c:320
 msgid "Delete Log?"
 msgstr "Skrap staafl?er?"
 
-#: ../pidgin/gtklog.c:331
 msgid "Delete Log..."
 msgstr "Skrap staafl?er..."
 
-#: ../pidgin/gtklog.c:451
 #, c-format
 msgid "<span size='larger' weight='bold'>Conversation in %s on %s</span>"
 msgstr "<span size='larger' weight='bold'>Gesprek in %s op %s</span>"
 
-#: ../pidgin/gtklog.c:454
 #, c-format
 msgid "<span size='larger' weight='bold'>Conversation with %s on %s</span>"
 msgstr "<span size='larger' weight='bold'>Gesprek met %s op %s</span>"
 
 #. Steal the "HELP" response and use it to trigger browsing to the logs folder
-#: ../pidgin/gtklog.c:582
 msgid "_Browse logs folder"
 msgstr "_Blaai deur staafl?ervouer"
 
-#: ../pidgin/gtkmain.c:442
 #, c-format
 msgid "%s %s. Try `%s -h' for more information.\n"
 msgstr "%s %s. Probeer `%s -h' vir meer inligting.\n"
 
-#: ../pidgin/gtkmain.c:446
 #, c-format
 msgid ""
 "Usage: %s [OPTION]...\n"
@@ -18207,39 +12923,30 @@ msgstr ""
 "Gebruik: %s [OPSIE]...\n"
 "\n"
 
-#: ../pidgin/gtkmain.c:448
 msgid "DIR"
 msgstr "GIDS"
 
-#: ../pidgin/gtkmain.c:448
 msgid "use DIR for config files"
 msgstr "gebruik GIDS vir opstellingl?ers"
 
-#: ../pidgin/gtkmain.c:450
 msgid "print debugging messages to stdout"
 msgstr "druk ontfoutboodskappe na stdout"
 
-#: ../pidgin/gtkmain.c:452
 msgid "force online, regardless of network status"
 msgstr "forseer aanlyn, ongeag die netwerkstatus"
 
-#: ../pidgin/gtkmain.c:454
 msgid "display this help and exit"
 msgstr "vertoon di? hulp en sluit af"
 
-#: ../pidgin/gtkmain.c:456
 msgid "allow multiple instances"
 msgstr "laat veelvuldige instansies toe"
 
-#: ../pidgin/gtkmain.c:458
 msgid "don't automatically login"
 msgstr "moenie outomaties aanmeld nie"
 
-#: ../pidgin/gtkmain.c:460
 msgid "NAME"
 msgstr "NAAM"
 
-#: ../pidgin/gtkmain.c:461
 msgid ""
 "enable specified account(s) (optional argument NAME\n"
 "                      specifies account(s) to use, separated by commas.\n"
@@ -18250,15 +12957,12 @@ msgstr ""
 "kommas.\n"
 "                      Hiersonder word net die eerste rekening geaktiveer)."
 
-#: ../pidgin/gtkmain.c:468
 msgid "X display to use"
 msgstr "X-vertoon om te gebruik"
 
-#: ../pidgin/gtkmain.c:471
 msgid "display the current version and exit"
 msgstr "wys die huidige weergawe, en sluit af"
 
-#: ../pidgin/gtkmain.c:596
 #, c-format
 msgid ""
 "%s %s has segfaulted and attempted to dump a core file.\n"
@@ -18286,113 +12990,88 @@ msgstr ""
 "hoe om die sleepspoor te kry nie, lees gerus die instruksies by\n"
 "%swiki/GetABacktrace\n"
 
-#: ../pidgin/gtkmain.c:881
 #, c-format
 msgid "Exiting because another libpurple client is already running.\n"
 msgstr "Sluit af omdat 'n ander libpurple-kli?nt reeds loop.\n"
 
-#: ../pidgin/gtkmedia.c:271
 msgid "/_Media"
 msgstr "_Media"
 
-#: ../pidgin/gtkmedia.c:272
 msgid "/Media/_Hangup"
 msgstr "Sit _neer"
 
-#: ../pidgin/gtkmedia.c:501
 #, c-format
 msgid "%s wishes to start an audio/video session with you."
 msgstr "%s wil 'n oudio-/videosessie met u begin."
 
-#: ../pidgin/gtkmedia.c:507
 #, c-format
 msgid "%s wishes to start a video session with you."
 msgstr "%s wil 'n videosessie met u begin."
 
-#: ../pidgin/gtkmedia.c:513
 msgid "Incoming Call"
 msgstr "Inkomende oproep"
 
-#: ../pidgin/gtkmedia.c:712 ../pidgin/pidginstock.c:92
 msgid "_Pause"
 msgstr "_Pouseer"
 
-#: ../pidgin/gtknotify.c:752
 #, 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:781
 #, c-format
 msgid "<b>%d new email.</b>"
 msgid_plural "<b>%d new emails.</b>"
 msgstr[0] "<b>%d nuwe e-pos.</b>"
 msgstr[1] "<b>%d nuwe e-posse.</b>"
 
-#: ../pidgin/gtknotify.c:1214
 #, c-format
 msgid "The browser command \"%s\" is invalid."
 msgstr "Die blaaierbevel \"%s\" is ongeldig."
 
-#: ../pidgin/gtknotify.c:1216 ../pidgin/gtknotify.c:1228
-#: ../pidgin/gtknotify.c:1241 ../pidgin/gtknotify.c:1378
 msgid "Unable to open URL"
 msgstr "Kan nie die URL open nie"
 
-#: ../pidgin/gtknotify.c:1226 ../pidgin/gtknotify.c:1239
 #, c-format
 msgid "Error launching \"%s\": %s"
 msgstr "Kon nie \"%s\" laai nie: %s"
 
-#: ../pidgin/gtknotify.c:1379
 msgid ""
 "The 'Manual' browser command has been chosen, but no command has been set."
 msgstr ""
 "Die 'Handmatige' blaaier-bevel is gekies, maar geen bevel is gestel nie."
 
-#: ../pidgin/gtknotify.c:1445
 msgid "No message"
 msgstr "Geen boodskap"
 
-#: ../pidgin/gtknotify.c:1529
 msgid "Open All Messages"
 msgstr "Open alle boodskappe"
 
-#: ../pidgin/gtknotify.c:1559
 msgid "<span weight=\"bold\" size=\"larger\">You have mail!</span>"
 msgstr "<span weight=\"bold\" size=\"larger\">U het pos!</span>"
 
-#: ../pidgin/gtknotify.c:1562
 msgid "New Pounces"
 msgstr "Nuwe vriendwagte"
 
-#: ../pidgin/gtknotify.c:1575
 msgid "Dismiss"
 msgstr ""
 
-#: ../pidgin/gtknotify.c:1619
 msgid "<span weight=\"bold\" size=\"larger\">You have pounced!</span>"
 msgstr "<span weight=\"bold\" size=\"larger\">Vriendwag!</span>"
 
-#: ../pidgin/gtkplugin.c:284
 msgid "The following plugins will be unloaded."
 msgstr "Die volgende inproppe gaan ontlaai word."
 
-#: ../pidgin/gtkplugin.c:303
 msgid "Multiple plugins will be unloaded."
 msgstr "Veelvuldige inproppe gaan ontlaai word."
 
-#: ../pidgin/gtkplugin.c:307
 msgid "Unload Plugins"
 msgstr "Ontlaai inproppe"
 
-#: ../pidgin/gtkplugin.c:324
 msgid "Could not unload plugin"
 msgstr "Kon nie inprop ontlaai nie"
 
-#: ../pidgin/gtkplugin.c:325
 msgid ""
 "The plugin could not be unloaded now, but will be disabled at the next "
 "startup."
@@ -18400,7 +13079,6 @@ msgstr ""
 "Die inprop kan nie nou ontlaai word nie, maar sal volgende keer gedeaktiveer "
 "word."
 
-#: ../pidgin/gtkplugin.c:462
 #, c-format
 msgid ""
 "<span foreground=\"red\" weight=\"bold\">Error: %s\n"
@@ -18409,230 +13087,174 @@ msgstr ""
 "<span foreground=\"red\" weight=\"bold\">Fout: %s\n"
 "Kontroleer die inprop se webwerf vir 'n bywerking.</span>"
 
-#: ../pidgin/gtkplugin.c:591
 msgid "Author"
 msgstr "Outeur"
 
-#: ../pidgin/gtkplugin.c:669
 msgid "<b>Written by:</b>"
 msgstr "<b>Geskryf deur:</b>"
 
-#: ../pidgin/gtkplugin.c:689
 msgid "<b>Web site:</b>"
 msgstr "<b>Webwerf:</b>"
 
-#: ../pidgin/gtkplugin.c:698
 msgid "<b>Filename:</b>"
 msgstr "<b>L?ernaam:</b>"
 
-#: ../pidgin/gtkplugin.c:726
 msgid "Configure Pl_ugin"
 msgstr "Stel _inprop op"
 
-#: ../pidgin/gtkplugin.c:792
 msgid "<b>Plugin Details</b>"
 msgstr "<b>Inpropdetails</b>"
 
-#: ../pidgin/gtkpounce.c:158
 msgid "Select a file"
 msgstr "Kies 'n l?er"
 
-#: ../pidgin/gtkpounce.c:538
 msgid "Modify Buddy Pounce"
 msgstr "Wysig vriendwag"
 
 #. Create the "Pounce on Whom" frame.
-#: ../pidgin/gtkpounce.c:553
 msgid "Pounce on Whom"
 msgstr "Hou wie dop"
 
-#: ../pidgin/gtkpounce.c:560 ../pidgin/gtkroomlist.c:550
-#: ../pidgin/plugins/disco/gtkdisco.c:651
 msgid "_Account:"
 msgstr "R_ekening:"
 
-#: ../pidgin/gtkpounce.c:580
 msgid "_Buddy name:"
 msgstr "_Vriendnaam:"
 
-#: ../pidgin/gtkpounce.c:614
 msgid "Si_gns on"
 msgstr "aan_meld"
 
-#: ../pidgin/gtkpounce.c:616
 msgid "Signs o_ff"
 msgstr "a_fmeld"
 
-#: ../pidgin/gtkpounce.c:618
 msgid "Goes a_way"
 msgstr "_weggaan"
 
-#: ../pidgin/gtkpounce.c:620
 msgid "Ret_urns from away"
 msgstr "ter_ugkeer"
 
-#: ../pidgin/gtkpounce.c:622
 msgid "Becomes _idle"
 msgstr "led_ig raak"
 
-#: ../pidgin/gtkpounce.c:624
 msgid "Is no longer i_dle"
 msgstr "nie meer le_dig is nie"
 
-#: ../pidgin/gtkpounce.c:626
 msgid "Starts _typing"
 msgstr "begin _tik"
 
-#: ../pidgin/gtkpounce.c:628
 msgid "P_auses while typing"
 msgstr "w_ag tydens tik"
 
-#: ../pidgin/gtkpounce.c:630
 msgid "Stops t_yping"
 msgstr "Ophou ti_k"
 
-#: ../pidgin/gtkpounce.c:632
 msgid "Sends a _message"
 msgstr "'n _boodskap stuur"
 
-#: ../pidgin/gtkpounce.c:675
 msgid "Ope_n an IM window"
 msgstr "Ope_n 'n kitsboodskapvenster"
 
-#: ../pidgin/gtkpounce.c:677
 msgid "_Pop up a notification"
 msgstr "Wys 'n kennis_gewing"
 
-#: ../pidgin/gtkpounce.c:679
 msgid "Send a _message"
 msgstr "_Stuur 'n boodskap"
 
-#: ../pidgin/gtkpounce.c:681
 msgid "E_xecute a command"
 msgstr "V_oer 'n bevel uit"
 
-#: ../pidgin/gtkpounce.c:683
 msgid "P_lay a sound"
 msgstr "Spee_l 'n klank"
 
-#: ../pidgin/gtkpounce.c:689
 msgid "Brows_e..."
 msgstr "_Blaai..."
 
-#: ../pidgin/gtkpounce.c:693
 msgid "Br_owse..."
 msgstr "_Blaai..."
 
-#: ../pidgin/gtkpounce.c:694 ../pidgin/gtkprefs.c:2597
 msgid "Pre_view"
 msgstr "_Voorskou"
 
-#: ../pidgin/gtkpounce.c:834
 msgid "P_ounce only when my status is not Available"
 msgstr "_Hou net dop wanneer my status 'Nie beskikbaar' is"
 
-#: ../pidgin/gtkpounce.c:839
 msgid "_Recurring"
 msgstr "He_rhalend"
 
-#: ../pidgin/gtkpounce.c:1270
 msgid "Pounce Target"
 msgstr "Dophou-teiken"
 
-#: ../pidgin/gtkpounce.c:1447
-#, fuzzy, c-format
+#, fuzzy
 msgid "Started typing"
 msgstr "Begin tik"
 
-#: ../pidgin/gtkpounce.c:1449
-#, fuzzy, c-format
+#, fuzzy
 msgid "Paused while typing"
 msgstr "Wag tydens tik"
 
-#: ../pidgin/gtkpounce.c:1451
-#, fuzzy, c-format
+#, fuzzy
 msgid "Signed on"
 msgstr "Aanmeld"
 
-#: ../pidgin/gtkpounce.c:1453
-#, fuzzy, c-format
+#, fuzzy
 msgid "Returned from being idle"
 msgstr "%s het teruggekeer na ledigheid (%s)"
 
-#: ../pidgin/gtkpounce.c:1455
-#, fuzzy, c-format
+#, fuzzy
 msgid "Returned from being away"
 msgstr "Terugkeer"
 
-#: ../pidgin/gtkpounce.c:1457
-#, fuzzy, c-format
+#, fuzzy
 msgid "Stopped typing"
 msgstr "Het opgehou tik"
 
-#: ../pidgin/gtkpounce.c:1459
-#, fuzzy, c-format
+#, fuzzy
 msgid "Signed off"
 msgstr "Afmeld"
 
-#: ../pidgin/gtkpounce.c:1461
-#, fuzzy, c-format
+#, fuzzy
 msgid "Became idle"
 msgstr "Ledig raak"
 
-#: ../pidgin/gtkpounce.c:1463
-#, fuzzy, c-format
+#, fuzzy
 msgid "Went away"
 msgstr "Terwyl weg"
 
-#: ../pidgin/gtkpounce.c:1465
-#, fuzzy, c-format
+#, fuzzy
 msgid "Sent a message"
 msgstr "Stuur 'n boodskap"
 
-#: ../pidgin/gtkpounce.c:1466
-#, c-format
 msgid "Unknown.... Please report this!"
 msgstr "Onbekende... Rapporteer dit, asseblief!"
 
-#: ../pidgin/gtkprefs.c:358
 msgid "(Custom)"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:423 ../pidgin/gtkprefs.c:543 ../pidgin/gtkprefs.c:551
-#: ../pidgin/pixmaps/emotes/none/none.theme.in.h:1
 msgid "Penguin Pimps"
 msgstr "Pikkepikkewyne"
 
-#: ../pidgin/gtkprefs.c:424
 msgid "The default Pidgin sound theme"
 msgstr "Pidgin se verstek klanktema"
 
-#: ../pidgin/gtkprefs.c:544
 msgid "The default Pidgin buddy list theme"
 msgstr "Pidgin se verstek vriendelystema"
 
-#: ../pidgin/gtkprefs.c:552
 msgid "The default Pidgin status icon theme"
 msgstr "Pidgin se verstek statusikoontema"
 
-#: ../pidgin/gtkprefs.c:691 ../pidgin/gtkprefs.c:699
 msgid "Theme failed to unpack."
 msgstr "Uitpak van tema het misluk."
 
-#: ../pidgin/gtkprefs.c:740 ../pidgin/gtkprefs.c:781
 msgid "Theme failed to load."
 msgstr "Laai van tema het misluk."
 
-#: ../pidgin/gtkprefs.c:784
 msgid "Theme failed to copy."
 msgstr "Kopi?ring van tema het misluk."
 
-#: ../pidgin/gtkprefs.c:1056
 msgid "Theme Selections"
 msgstr "Temakeuses"
 
 #. Instructions
-#: ../pidgin/gtkprefs.c:1059
 msgid ""
 "Select a theme that you would like to use from the lists below.\n"
 "New themes can be installed by dragging and dropping them onto the theme "
@@ -18642,157 +13264,119 @@ msgstr ""
 "Nuwe temas kan ge?nstalleer word deur hulle te sleep en te los op die "
 "temalys."
 
-#: ../pidgin/gtkprefs.c:1072
 msgid "Buddy List Theme:"
 msgstr "Vriendelystema:"
 
-#: ../pidgin/gtkprefs.c:1090
 msgid "Status Icon Theme:"
 msgstr "Statusikoontema:"
 
-#: ../pidgin/gtkprefs.c:1108
 msgid "Sound Theme:"
 msgstr "Klanktema:"
 
-#: ../pidgin/gtkprefs.c:1126
 msgid "Smiley Theme:"
 msgstr "Gesiggie-tema:"
 
-#: ../pidgin/gtkprefs.c:1312
 msgid "Keyboard Shortcuts"
 msgstr "Sleutelbordkortpaaie"
 
-#: ../pidgin/gtkprefs.c:1332
 msgid "Cl_ose conversations with the Escape key"
 msgstr "Sl_uit gesprekke met die Escape-sleutel"
 
 #. System Tray
-#: ../pidgin/gtkprefs.c:1362
 msgid "System Tray Icon"
 msgstr "Stelsellaai-ikoon"
 
-#: ../pidgin/gtkprefs.c:1363
 msgid "_Show system tray icon:"
 msgstr "_Wys ikoon in stelsellaai"
 
-#: ../pidgin/gtkprefs.c:1366
 msgid "On unread messages"
 msgstr "Met ongelese boodskappe"
 
-#: ../pidgin/gtkprefs.c:1372
 msgid "Conversation Window"
 msgstr "Gesprekvenster"
 
-#: ../pidgin/gtkprefs.c:1373
 msgid "_Hide new IM conversations:"
 msgstr "_Versteek nuwe kitsboodskappe:"
 
-#: ../pidgin/gtkprefs.c:1376 ../pidgin/gtkprefs.c:2684
 msgid "When away"
 msgstr "Terwyl weg"
 
-#: ../pidgin/gtkprefs.c:1383
 msgid "Minimi_ze new conversation windows"
 msgstr "Minim_eer nuwe gesprekvensters"
 
 #. All the tab options!
-#: ../pidgin/gtkprefs.c:1387
 msgid "Tabs"
 msgstr "Oortjies"
 
-#: ../pidgin/gtkprefs.c:1389
 msgid "Show IMs and chats in _tabbed windows"
 msgstr "Wys kitsboodskappe en geselsies in _oortjies"
 
-#: ../pidgin/gtkprefs.c:1403
 msgid "Show close b_utton on tabs"
 msgstr "Wys 'n _sluitknoppie op oortjies"
 
-#: ../pidgin/gtkprefs.c:1406
 msgid "_Placement:"
 msgstr "_Plasing:"
 
-#: ../pidgin/gtkprefs.c:1408
 msgid "Top"
 msgstr "Bo"
 
-#: ../pidgin/gtkprefs.c:1409
 msgid "Bottom"
 msgstr "Onder"
 
-#: ../pidgin/gtkprefs.c:1410
 msgid "Left"
 msgstr "Links"
 
-#: ../pidgin/gtkprefs.c:1411
 msgid "Right"
 msgstr "Regs"
 
-#: ../pidgin/gtkprefs.c:1412
 msgid "Left Vertical"
 msgstr "Vertikaal links"
 
-#: ../pidgin/gtkprefs.c:1413
 msgid "Right Vertical"
 msgstr "Vertikaal regs"
 
-#: ../pidgin/gtkprefs.c:1419
 msgid "N_ew conversations:"
 msgstr "N_uwe gesprekke:"
 
-#: ../pidgin/gtkprefs.c:1476
 msgid "Show _formatting on incoming messages"
 msgstr "Wys _formatering op inkomende boodskappe"
 
-#: ../pidgin/gtkprefs.c:1478
 msgid "Close IMs immediately when the tab is closed"
 msgstr "Sluit kitsboodskappe dadelik wanneer oortjie gesluit word"
 
-#: ../pidgin/gtkprefs.c:1481
 msgid "Show _detailed information"
 msgstr "Wys _gedetailleerde inligting"
 
-#: ../pidgin/gtkprefs.c:1483
 msgid "Enable buddy ic_on animation"
 msgstr "Aktiveer _animasie van vriendikoon"
 
-#: ../pidgin/gtkprefs.c:1490
 msgid "_Notify buddies that you are typing to them"
 msgstr "_Laat weet vriende dat u vir hulle tik"
 
-#: ../pidgin/gtkprefs.c:1493
 msgid "Highlight _misspelled words"
 msgstr "Dui _spelfoute aan"
 
-#: ../pidgin/gtkprefs.c:1497
 msgid "Use smooth-scrolling"
 msgstr "Gebruik gladde rol"
 
-#: ../pidgin/gtkprefs.c:1500
 msgid "F_lash window when IMs are received"
 msgstr "_Flits boodskap wanneer 'n kitsboodskap ontvang word"
 
-#: ../pidgin/gtkprefs.c:1504
 msgid "Minimum input area height in lines:"
 msgstr "Minimum intikareahoogte in re?ls:"
 
-#: ../pidgin/gtkprefs.c:1512
 msgid "Font"
 msgstr "Font"
 
-#: ../pidgin/gtkprefs.c:1514
 msgid "Use font from _theme"
 msgstr "Gebruik font uit _tema"
 
-#: ../pidgin/gtkprefs.c:1525
 msgid "Conversation _font:"
 msgstr "Gesprek_font:"
 
-#: ../pidgin/gtkprefs.c:1535
 msgid "Default Formatting"
 msgstr "Verstekformatering"
 
-#: ../pidgin/gtkprefs.c:1553
 msgid ""
 "This is how your outgoing message text will appear when you use protocols "
 "that support formatting."
@@ -18800,157 +13384,119 @@ msgstr ""
 "Dit is hoe die uitgaande boodskapteks sal wys wanneer u protokolle gebruik "
 "wat formatering ondersteun."
 
-#: ../pidgin/gtkprefs.c:1655
 msgid "Cannot start proxy configuration program."
 msgstr "Kan nie instaanopstellingsprogram begin nie."
 
-#: ../pidgin/gtkprefs.c:1668
 msgid "Cannot start browser configuration program."
 msgstr "Kan nie blaaieropstellingsprogram begin nie."
 
-#: ../pidgin/gtkprefs.c:1703
 msgid "Disabled"
 msgstr "Gedeaktiveer"
 
-#: ../pidgin/gtkprefs.c:1705
 #, c-format
 msgid "Use _automatically detected IP address: %s"
 msgstr "Gebruik _outomaties bespeurde IP-adres: %s"
 
-#: ../pidgin/gtkprefs.c:1731
 msgid "ST_UN server:"
 msgstr "ST_UN-bediener:"
 
-#: ../pidgin/gtkprefs.c:1743
 msgid "<span style=\"italic\">Example: stunserver.org</span>"
 msgstr "<span style=\"italic\">Voorbeeld: stunserver.org</span>"
 
-#: ../pidgin/gtkprefs.c:1758
 msgid "Public _IP:"
 msgstr "Publieke _IP:"
 
-#: ../pidgin/gtkprefs.c:1770
 msgid "Ports"
 msgstr "Poorte"
 
-#: ../pidgin/gtkprefs.c:1773
 msgid "_Enable automatic router port forwarding"
 msgstr "_Aktiveer outoaanstuur vir roeteerderpoort"
 
-#: ../pidgin/gtkprefs.c:1778
 msgid "_Manually specify range of ports to listen on:"
 msgstr "_Spesifiseer self die omvang van poorte om op te luister:"
 
-#: ../pidgin/gtkprefs.c:1781
 msgid "_Start:"
 msgstr "_Begin:"
 
-#: ../pidgin/gtkprefs.c:1788
 msgid "_End:"
 msgstr "_Einde:"
 
 #. TURN server
-#: ../pidgin/gtkprefs.c:1800
 msgid "Relay Server (TURN)"
 msgstr "Aanstuurbediener (TURN)"
 
-#: ../pidgin/gtkprefs.c:1810
 msgid "_TURN server:"
 msgstr "_TURN-bediener:"
 
-#: ../pidgin/gtkprefs.c:1815
 msgid "Use_rname:"
 msgstr "Geb_ruikernaam:"
 
-#: ../pidgin/gtkprefs.c:1817
 msgid "Pass_word:"
 msgstr "Wag_woord:"
 
-#: ../pidgin/gtkprefs.c:1848
 msgid "Seamonkey"
 msgstr "Seamonkey"
 
-#: ../pidgin/gtkprefs.c:1849
 msgid "Opera"
 msgstr "Opera"
 
-#: ../pidgin/gtkprefs.c:1850
 msgid "Netscape"
 msgstr "Netscape"
 
-#: ../pidgin/gtkprefs.c:1851
 msgid "Mozilla"
 msgstr "Mozilla"
 
-#: ../pidgin/gtkprefs.c:1852
 msgid "Konqueror"
 msgstr "Konqueror"
 
-#: ../pidgin/gtkprefs.c:1853
 msgid "Desktop Default"
 msgstr "Werkskermverstek"
 
-#: ../pidgin/gtkprefs.c:1854
 msgid "GNOME Default"
 msgstr "GNOME se verstek"
 
-#: ../pidgin/gtkprefs.c:1855
 msgid "Galeon"
 msgstr "Galeon"
 
-#: ../pidgin/gtkprefs.c:1856
 msgid "Firefox"
 msgstr "Firefox"
 
-#: ../pidgin/gtkprefs.c:1857
 msgid "Firebird"
 msgstr "Firebird"
 
-#: ../pidgin/gtkprefs.c:1858
 msgid "Epiphany"
 msgstr "Epiphany"
 
-#: ../pidgin/gtkprefs.c:1867
 msgid "Manual"
 msgstr "Handmatig"
 
-#: ../pidgin/gtkprefs.c:1923
 msgid "Browser Selection"
 msgstr "Blaaierkeuse"
 
-#: ../pidgin/gtkprefs.c:1929
 msgid "Browser preferences are configured in GNOME preferences"
 msgstr "Blaaiervoorkeure word in GNOME-voorkeure opgestel"
 
-#: ../pidgin/gtkprefs.c:1939
 msgid "<b>Browser configuration program was not found.</b>"
 msgstr "<b>Blaaieropstellingsprogram is nie gevind nie.</b>"
 
-#: ../pidgin/gtkprefs.c:1942
 msgid "Configure _Browser"
 msgstr "Stel _blaaier op"
 
-#: ../pidgin/gtkprefs.c:1955
 msgid "_Browser:"
 msgstr "_Blaaier:"
 
-#: ../pidgin/gtkprefs.c:1963
 msgid "_Open link in:"
 msgstr "_Open skakel in:"
 
-#: ../pidgin/gtkprefs.c:1965
 msgid "Browser default"
 msgstr "Verstekblaaier"
 
-#: ../pidgin/gtkprefs.c:1966
 msgid "Existing window"
 msgstr "Bestaande venster"
 
-#: ../pidgin/gtkprefs.c:1968
 msgid "New tab"
 msgstr "Nuwe oortjie"
 
-#: ../pidgin/gtkprefs.c:1985
 #, c-format
 msgid ""
 "_Manual:\n"
@@ -18959,107 +13505,83 @@ msgstr ""
 "_Handmatig:\n"
 "(%s vir URL)"
 
-#: ../pidgin/gtkprefs.c:2009
 msgid "Proxy Server"
 msgstr "Instaanbediener"
 
-#: ../pidgin/gtkprefs.c:2016
 msgid "Proxy preferences are configured in GNOME preferences"
 msgstr "Instaanbedienervoorkeure word in GNOME-voorkeure opgestel"
 
-#: ../pidgin/gtkprefs.c:2030
 msgid "<b>Proxy configuration program was not found.</b>"
 msgstr "<b>Instaanopstellingsprogram is nie gevind nie.</b>"
 
-#: ../pidgin/gtkprefs.c:2033
 msgid "Configure _Proxy"
 msgstr "Stel _instaanbediener op"
 
 #. This is a global option that affects SOCKS4 usage even with
 #. * account-specific proxy settings
-#: ../pidgin/gtkprefs.c:2048
 msgid "Use remote _DNS with SOCKS4 proxies"
 msgstr "Gebruik afgele? _DNS met SOCKS4-instaanbedieners"
 
-#: ../pidgin/gtkprefs.c:2052
 msgid "Proxy t_ype:"
 msgstr "Instaan_tipes:"
 
-#: ../pidgin/gtkprefs.c:2054
 msgid "No proxy"
 msgstr "Geen instaanbediener"
 
-#: ../pidgin/gtkprefs.c:2092
 msgid "P_ort:"
 msgstr "P_oort:"
 
-#: ../pidgin/gtkprefs.c:2108
 msgid "User_name:"
 msgstr "Gebruiker_naam:"
 
-#: ../pidgin/gtkprefs.c:2169
 msgid "Log _format:"
 msgstr "Boekstaaf_formaat:"
 
-#: ../pidgin/gtkprefs.c:2174
 msgid "Log all _instant messages"
 msgstr "Boekstaaf alle k_itsboodskappe"
 
-#: ../pidgin/gtkprefs.c:2176
 msgid "Log all c_hats"
 msgstr "Boekstaaf alle g_eselsies"
 
-#: ../pidgin/gtkprefs.c:2178
 msgid "Log all _status changes to system log"
 msgstr "Boekstaaf alle _statusveranderinge na die stelselstaafl?er"
 
-#: ../pidgin/gtkprefs.c:2334
 msgid "Sound Selection"
 msgstr "Klankkeuse"
 
-#: ../pidgin/gtkprefs.c:2345
 #, c-format
 msgid "Quietest"
 msgstr "Sagste"
 
-#: ../pidgin/gtkprefs.c:2347
 #, c-format
 msgid "Quieter"
 msgstr "Sagter"
 
-#: ../pidgin/gtkprefs.c:2349
 #, c-format
 msgid "Quiet"
 msgstr "Sag"
 
-#: ../pidgin/gtkprefs.c:2353
 #, c-format
 msgid "Loud"
 msgstr "Hard"
 
-#: ../pidgin/gtkprefs.c:2355
 #, c-format
 msgid "Louder"
 msgstr "Harder"
 
-#: ../pidgin/gtkprefs.c:2357
 #, c-format
 msgid "Loudest"
 msgstr "Hardste"
 
-#: ../pidgin/gtkprefs.c:2448
 msgid "_Method:"
 msgstr "_Metode:"
 
-#: ../pidgin/gtkprefs.c:2450
 msgid "Console beep"
 msgstr "Konsolebiep"
 
-#: ../pidgin/gtkprefs.c:2457
 msgid "No sounds"
 msgstr "Geen klanke"
 
-#: ../pidgin/gtkprefs.c:2470
 #, c-format
 msgid ""
 "Sound c_ommand:\n"
@@ -19068,340 +13590,261 @@ msgstr ""
 "Klank_bevel:\n"
 "(%s vir l?ernaam)"
 
-#: ../pidgin/gtkprefs.c:2478
 msgid "M_ute sounds"
 msgstr "Doof _klanke"
 
-#: ../pidgin/gtkprefs.c:2481
 msgid "Sounds when conversation has _focus"
 msgstr "Klanke terwyl gesprek in _fokus is"
 
-#: ../pidgin/gtkprefs.c:2483
 msgid "_Enable sounds:"
 msgstr "_Aktiveer klanke:"
 
-#: ../pidgin/gtkprefs.c:2500
 msgid "V_olume:"
 msgstr "V_olume:"
 
-#: ../pidgin/gtkprefs.c:2567
 msgid "Play"
 msgstr "Speel"
 
-#: ../pidgin/gtkprefs.c:2593
 msgid "_Browse..."
 msgstr "_Blaai..."
 
-#: ../pidgin/gtkprefs.c:2601
 msgid "_Reset"
 msgstr "Te_rugstel"
 
-#: ../pidgin/gtkprefs.c:2645
 msgid "_Report idle time:"
 msgstr "_Raporteer ledige tyd:"
 
-#: ../pidgin/gtkprefs.c:2650
 msgid "Based on keyboard or mouse use"
 msgstr "Gebaseer op gebruik van sleutelbord en muis"
 
-#: ../pidgin/gtkprefs.c:2657
 msgid "_Minutes before becoming idle:"
 msgstr "_Minute voor ledig word:"
 
-#: ../pidgin/gtkprefs.c:2663
 msgid "Change to this status when _idle:"
 msgstr "Verander na _di? status wanneer ledig:"
 
-#: ../pidgin/gtkprefs.c:2681
 msgid "_Auto-reply:"
 msgstr "_Outo-antwoord:"
 
-#: ../pidgin/gtkprefs.c:2685
 msgid "When both away and idle"
 msgstr "Terwyl weg en ledig"
 
 #. Signon status stuff
-#: ../pidgin/gtkprefs.c:2691
 msgid "Status at Startup"
 msgstr "Status by begin"
 
-#: ../pidgin/gtkprefs.c:2693
 msgid "Use status from last _exit at startup"
 msgstr "By begin, gebruik status van laaste _afsluiting"
 
-#: ../pidgin/gtkprefs.c:2702
 msgid "Status to a_pply at startup:"
 msgstr "Status om te ge_bruik by begin:"
 
-#: ../pidgin/gtkprefs.c:2726
 msgid "Interface"
 msgstr "Koppelvlak"
 
-#: ../pidgin/gtkprefs.c:2732
 msgid "Browser"
 msgstr "Blaaier"
 
-#: ../pidgin/gtkprefs.c:2741
 msgid "Status / Idle"
 msgstr "Status / ledig"
 
-#: ../pidgin/gtkprefs.c:2742
 msgid "Themes"
 msgstr "Temas"
 
-#: ../pidgin/gtkprivacy.c:81
 msgid "Allow all users to contact me"
 msgstr "Laat alle gebruikers toe om my te kontak"
 
-#: ../pidgin/gtkprivacy.c:82
 msgid "Allow only the users on my buddy list"
 msgstr "Laat net die gebruikers op my vriendelys toe"
 
-#: ../pidgin/gtkprivacy.c:83
 msgid "Allow only the users below"
 msgstr "Laat net die gebruikers hier onder toe"
 
-#: ../pidgin/gtkprivacy.c:84
 msgid "Block all users"
 msgstr "Blokkeer alle gebruikers"
 
-#: ../pidgin/gtkprivacy.c:85
 msgid "Block only the users below"
 msgstr "Blokkeer net die gebruikers hier onder"
 
-#: ../pidgin/gtkprivacy.c:351
 msgid "Privacy"
 msgstr "Privaatheid"
 
-#: ../pidgin/gtkprivacy.c:361
 msgid "Changes to privacy settings take effect immediately."
 msgstr "Veranderinge aan privaatheidinstellings is onmiddelik van toepassing."
 
-#: ../pidgin/gtkprivacy.c:370
 msgid "Set privacy for:"
 msgstr "Stel privaatheid vir:"
 
 #. Remove All button
-#: ../pidgin/gtkprivacy.c:413
 msgid "Remove Al_l"
 msgstr "Verwyder a_lle"
 
-#: ../pidgin/gtkprivacy.c:499 ../pidgin/gtkprivacy.c:516
 msgid "Permit User"
 msgstr "Laat gebruiker toe"
 
-#: ../pidgin/gtkprivacy.c:500
 msgid "Type a user you permit to contact you."
 msgstr "Tik 'n gebruiker wat u toelaat om u te kontak."
 
-#: ../pidgin/gtkprivacy.c:501
 msgid "Please enter the name of the user you wish to be able to contact you."
 msgstr "Tik gerus die naam van die gebruiker wat u wil h? moet u kan kontak."
 
-#: ../pidgin/gtkprivacy.c:504 ../pidgin/gtkprivacy.c:520
 msgid "_Permit"
 msgstr "_Laat toe"
 
-#: ../pidgin/gtkprivacy.c:510
 #, c-format
 msgid "Allow %s to contact you?"
 msgstr "Laat %s toe om u te kontak?"
 
-#: ../pidgin/gtkprivacy.c:512
 #, 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:541 ../pidgin/gtkprivacy.c:555
 msgid "Block User"
 msgstr "Blokkeer gebruiker"
 
-#: ../pidgin/gtkprivacy.c:542
 msgid "Type a user to block."
 msgstr "Tik 'n gebruiker om te blokkeer."
 
-#: ../pidgin/gtkprivacy.c:543
 msgid "Please enter the name of the user you wish to block."
 msgstr "Tik gerus die naam van die gebruiker wat u wil blokkeer."
 
-#: ../pidgin/gtkprivacy.c:551
 #, c-format
 msgid "Block %s?"
 msgstr "Blokkeer %s?"
 
-#: ../pidgin/gtkprivacy.c:553
 #, c-format
 msgid "Are you sure you want to block %s?"
 msgstr "Wil u definitief %s blokkeer?"
 
-#: ../pidgin/gtkrequest.c:302
 msgid "Apply"
 msgstr "Pas toe"
 
-#: ../pidgin/gtkrequest.c:1598
 msgid "That file already exists"
 msgstr "Daardie l?er bestaan reeds"
 
-#: ../pidgin/gtkrequest.c:1599
 msgid "Would you like to overwrite it?"
 msgstr "Wil u dit oorskryf?"
 
-#: ../pidgin/gtkrequest.c:1602
 msgid "Overwrite"
 msgstr "Oorskryf"
 
-#: ../pidgin/gtkrequest.c:1603
 msgid "Choose New Name"
 msgstr "Kies nuwe naam"
 
-#: ../pidgin/gtkrequest.c:1702
 msgid "Select Folder..."
 msgstr "Kies vouer..."
 
 #. list button
-#: ../pidgin/gtkroomlist.c:580
 msgid "_Get List"
 msgstr "_Kry lys"
 
 #. add button
-#: ../pidgin/gtkroomlist.c:588
 msgid "_Add Chat"
 msgstr "_Voeg geselsie by"
 
-#: ../pidgin/gtksavedstatuses.c:309
 msgid "Are you sure you want to delete the selected saved statuses?"
 msgstr "Wil u definitief die gekose gestoorde statusse uitvee?"
 
 #. Use button
-#: ../pidgin/gtksavedstatuses.c:595 ../pidgin/gtksavedstatuses.c:1230
 msgid "_Use"
 msgstr "_Gebruik"
 
-#: ../pidgin/gtksavedstatuses.c:739
 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:952
 msgid "Different"
 msgstr "Anders"
 
-#: ../pidgin/gtksavedstatuses.c:1151
 msgid "_Title:"
 msgstr "_Titel:"
 
-#: ../pidgin/gtksavedstatuses.c:1159 ../pidgin/gtksavedstatuses.c:1449
 msgid "_Status:"
 msgstr "_Status:"
 
 #. Different status message expander
-#: ../pidgin/gtksavedstatuses.c:1177
 msgid "Use a _different status for some accounts"
 msgstr "Gebruik 'n _ander status vir sekere rekenings"
 
 #. Save & Use button
-#: ../pidgin/gtksavedstatuses.c:1237
 msgid "Sa_ve & Use"
 msgstr "S_toor en gebruik"
 
-#: ../pidgin/gtksavedstatuses.c:1433
 #, c-format
 msgid "Status for %s"
 msgstr "Status vir %s"
 
-#: ../pidgin/gtksmiley.c:236
 #, c-format
 msgid ""
 "A custom smiley for '%s' already exists.  Please use a different shortcut."
-msgstr "'n Eie gesiggie vir '%s' bestaan reeds. Gee asseblief 'n ander kortpad."
+msgstr ""
+"'n Eie gesiggie vir '%s' bestaan reeds. Gee asseblief 'n ander kortpad."
 
-#: ../pidgin/gtksmiley.c:238 ../pidgin/gtksmiley.c:351
 msgid "Custom Smiley"
 msgstr "Eie gesiggie"
 
-#: ../pidgin/gtksmiley.c:239
 msgid "Duplicate Shortcut"
 msgstr "Duplikaatkortpad"
 
-#: ../pidgin/gtksmiley.c:400
 msgid "Edit Smiley"
 msgstr "Wysig gesiggie"
 
-#: ../pidgin/gtksmiley.c:400
 msgid "Add Smiley"
 msgstr "Voeg gesiggie by"
 
-#: ../pidgin/gtksmiley.c:424
 msgid "_Image:"
 msgstr "_Prent:"
 
 #. Shortcut text
-#: ../pidgin/gtksmiley.c:455
 msgid "S_hortcut text:"
 msgstr "_Kortpadteks:"
 
-#: ../pidgin/gtksmiley.c:572
 msgid "Smiley"
 msgstr "Gesiggie"
 
-#: ../pidgin/gtksmiley.c:582
 msgid "Shortcut Text"
 msgstr "Kortpadteks"
 
-#: ../pidgin/gtksmiley.c:880
 msgid "Custom Smiley Manager"
 msgstr "Bestuurder van eie gesiggies"
 
-#: ../pidgin/gtksound.c:76
 msgid "Attention received"
 msgstr "Aandag gekry"
 
-#: ../pidgin/gtkstatusbox.c:322
 msgid "Select Buddy Icon"
 msgstr "Kies vriendikoon"
 
-#: ../pidgin/gtkstatusbox.c:455
 msgid "Click to change your buddyicon for this account."
 msgstr "Klik hier om die vriend_ikoon vir hierdie rekening te verander."
 
-#: ../pidgin/gtkstatusbox.c:456
 msgid "Click to change your buddyicon for all accounts."
 msgstr "Klik om hierdie vriend_ikoon vir alle rekeninge te gebruik."
 
-#: ../pidgin/gtkstatusbox.c:721
 msgid "Waiting for network connection"
 msgstr "Wag vir netwerkkoppeling"
 
-#: ../pidgin/gtkstatusbox.c:1115
 msgid "New status..."
 msgstr "Nuwe status..."
 
-#: ../pidgin/gtkstatusbox.c:1116
 msgid "Saved statuses..."
 msgstr "Gestoorde statusse..."
 
-#: ../pidgin/gtkstatusbox.c:1774
 msgid "Status Selector"
 msgstr "Statuskieser"
 
-#: ../pidgin/gtkutils.c:698
 msgid "Google Talk"
 msgstr "Google Talk"
 
-#: ../pidgin/gtkutils.c:1466 ../pidgin/gtkutils.c:1495
 #, c-format
 msgid "The following error has occurred loading %s: %s"
 msgstr "Die volgende fout het voorgekom toe %s gelaai is: %s"
 
-#: ../pidgin/gtkutils.c:1469 ../pidgin/gtkutils.c:1497
 msgid "Failed to load image"
 msgstr "Laai van prent het misluk"
 
-#: ../pidgin/gtkutils.c:1571
 #, c-format
 msgid "Cannot send folder %s."
 msgstr "Kan nie vouer %s stuur nie."
 
-#: ../pidgin/gtkutils.c:1572
 #, c-format
 msgid ""
 "%s cannot transfer a folder. You will need to send the files within "
@@ -19410,12 +13853,9 @@ msgstr ""
 "%s kan nie 'n vouer oordra nie. U sal die l?ers binne-in afsonderlik moet "
 "stuur."
 
-#: ../pidgin/gtkutils.c:1605 ../pidgin/gtkutils.c:1617
-#: ../pidgin/gtkutils.c:1624
 msgid "You have dragged an image"
 msgstr "U het 'n prent gesleep"
 
-#: ../pidgin/gtkutils.c:1606
 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."
@@ -19423,23 +13863,18 @@ msgstr ""
 "U kan hierdie prent as 'n l?er oordra, in hierdie boodskap invoeg, of as die "
 "vriendikoon gebruik vir hierdie gebruiker."
 
-#: ../pidgin/gtkutils.c:1612 ../pidgin/gtkutils.c:1632
 msgid "Set as buddy icon"
 msgstr "Stel as vriendikoon"
 
-#: ../pidgin/gtkutils.c:1613 ../pidgin/gtkutils.c:1633
 msgid "Send image file"
 msgstr "Stuur die prentl?er"
 
-#: ../pidgin/gtkutils.c:1614 ../pidgin/gtkutils.c:1633
 msgid "Insert in message"
 msgstr "Voeg in boodskap"
 
-#: ../pidgin/gtkutils.c:1618
 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:1625
 msgid ""
 "You can send this image as a file transfer, or use it as the buddy icon for "
 "this user."
@@ -19447,7 +13882,6 @@ msgstr ""
 "U kan hierdie prent as 'n l?eroordrag stuur, of dit as die vriendikoon "
 "gebruik vir hierdie gebruiker."
 
-#: ../pidgin/gtkutils.c:1626
 msgid ""
 "You can insert this image into this message, or use it as the buddy icon for "
 "this user"
@@ -19463,11 +13897,9 @@ msgstr ""
 #. * 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:1685
 msgid "Cannot send launcher"
 msgstr "Kan nie laaier stuur nie"
 
-#: ../pidgin/gtkutils.c:1686
 msgid ""
 "You dragged a desktop launcher. Most likely you wanted to send the target of "
 "this launcher instead of this launcher itself."
@@ -19475,7 +13907,6 @@ msgstr ""
 "U het 'n werkskermlaaier gesleep. U wou waarskynlik die teiken van die "
 "laaier stuur in plaas van die laaier s?lf."
 
-#: ../pidgin/gtkutils.c:2267
 #, c-format
 msgid ""
 "<b>File:</b> %s\n"
@@ -19486,146 +13917,111 @@ msgstr ""
 "<b>L?ergroote:</b> %s\n"
 "<b>Prentgrootte:</b> %dx%d"
 
-#: ../pidgin/gtkutils.c:2515
 #, 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 gerus 'n kleiner prent.\n"
 
-#: ../pidgin/gtkutils.c:2517
 msgid "Icon Error"
 msgstr "Ikoonfout"
 
-#: ../pidgin/gtkutils.c:2517
 msgid "Could not set icon"
 msgstr "Kon nie ikoon stel nie"
 
-#: ../pidgin/gtkutils.c:3093
 msgid "_Open Link"
 msgstr "_Open skakel"
 
-#: ../pidgin/gtkutils.c:3100
 msgid "_Copy Link Location"
 msgstr "_Kopieer skakelligging"
 
-#: ../pidgin/gtkutils.c:3122
 msgid "_Copy Email Address"
 msgstr "_Kopieer e-posadres"
 
-#: ../pidgin/gtkutils.c:3234
 msgid "_Open File"
 msgstr "_Open l?er"
 
-#: ../pidgin/gtkutils.c:3241
 msgid "Open _Containing Directory"
 msgstr "Open houer_gids"
 
-#: ../pidgin/gtkutils.c:3290 ../pidgin/gtkwhiteboard.c:770
 msgid "Save File"
 msgstr "Stoor l?er"
 
-#: ../pidgin/gtkutils.c:3310
 msgid "_Play Sound"
 msgstr "S_peel 'n klank"
 
-#: ../pidgin/gtkutils.c:3318
 msgid "_Save File"
 msgstr "_Stoor l?er"
 
-#: ../pidgin/gtkwhiteboard.c:746
 msgid "Do you really want to clear?"
 msgstr "Wil u definitief skoonmaak?"
 
-#: ../pidgin/gtkwhiteboard.c:873
 msgid "Select color"
 msgstr "Kies kleur"
 
 #. Translators may want to transliterate the name.
 #. It is not to be translated.
-#: ../pidgin/pidgin.h:51
 msgid "Pidgin"
 msgstr "Pidgin"
 
-#: ../pidgin/pidginstock.c:83
 msgid "_Alias"
 msgstr "_Alias"
 
-#: ../pidgin/pidginstock.c:85
 msgid "Close _tabs"
 msgstr "Sluit _oortjies"
 
-#: ../pidgin/pidginstock.c:87
 msgid "_Get Info"
 msgstr "_Kry info"
 
-#: ../pidgin/pidginstock.c:88
 msgid "_Invite"
 msgstr "_Nooi uit"
 
-#: ../pidgin/pidginstock.c:89
 msgid "_Modify..."
 msgstr "_Wysig..."
 
-#: ../pidgin/pidginstock.c:90
 msgid "_Add..."
 msgstr "_Voeg by..."
 
-#: ../pidgin/pidginstock.c:91
 msgid "_Open Mail"
 msgstr "_Open pos"
 
-#: ../pidgin/pidginstock.c:93
 msgid "_Edit"
 msgstr "_Wysig"
 
-#: ../pidgin/pidgintooltip.c:124
 msgid "Pidgin Tooltip"
 msgstr "Pidgin-nutswenk"
 
-#: ../pidgin/pixmaps/emotes/default/24/default.theme.in.h:2
 msgid "Pidgin smileys"
 msgstr "Pidgin-gesiggies"
 
-#: ../pidgin/pixmaps/emotes/none/none.theme.in.h:2
 msgid "Selecting this disables graphical emoticons."
 msgstr "Deur hier te kies, deaktiveer u grafiese gesiggies."
 
-#: ../pidgin/pixmaps/emotes/none/none.theme.in.h:3
 msgid "none"
 msgstr "geen"
 
-#: ../pidgin/pixmaps/emotes/small/16/small.theme.in.h:1
 msgid "Small"
 msgstr "Klein"
 
-#: ../pidgin/pixmaps/emotes/small/16/small.theme.in.h:2
 msgid "Smaller versions of the default smilies"
 msgstr "Kleiner weergawes van die verstek gesiggies"
 
-#: ../pidgin/plugins/cap/cap.c:444 ../pidgin/plugins/cap/cap.c:447
 msgid "Response Probability:"
 msgstr "Responswaarskynlikheid:"
 
-#: ../pidgin/plugins/cap/cap.c:772
 msgid "Statistics Configuration"
 msgstr "Statistiekopstelling"
 
 #. msg_difference spinner
-#: ../pidgin/plugins/cap/cap.c:775
 msgid "Maximum response timeout:"
 msgstr "Maksimum responsuittelling:"
 
-#: ../pidgin/plugins/cap/cap.c:778 ../pidgin/plugins/cap/cap.c:785
-#: ../pidgin/plugins/cap/cap.c:792 ../pidgin/plugins/timestamp.c:156
 msgid "minutes"
 msgstr "minute"
 
 #. last_seen spinner
-#: ../pidgin/plugins/cap/cap.c:782
 msgid "Maximum last-seen difference:"
 msgstr "Maksimum laasgesien-verskil:"
 
 #. threshold spinner
-#: ../pidgin/plugins/cap/cap.c:789
 msgid "Threshold:"
 msgstr "Drempel:"
 
@@ -19635,58 +14031,47 @@ msgstr "Drempel:"
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/cap/cap.c:897
 msgid "Contact Availability Prediction"
 msgstr "Kontakbeskikbaarheid-voorspelling"
 
 #. *< name
 #. *< version
-#: ../pidgin/plugins/cap/cap.c:899
 msgid "Contact Availability Prediction plugin."
 msgstr "Kontakbeskikbaarheid-voorspelling-inprop."
 
 #. *  summary
-#: ../pidgin/plugins/cap/cap.c:900
 msgid "Displays statistical information about your buddies' availability"
 msgstr "Wys statistiese inligting oor u vriende se beskikbaarheid"
 
-#: ../pidgin/plugins/contact_priority.c:61
 msgid "Buddy is idle"
 msgstr "Vriend is ledig"
 
-#: ../pidgin/plugins/contact_priority.c:62
 msgid "Buddy is away"
 msgstr "Vriend is weg"
 
-#: ../pidgin/plugins/contact_priority.c:63
 msgid "Buddy is \"extended\" away"
 msgstr "Vriend is \"lank\" weg"
 
 #. Not used yet.
-#: ../pidgin/plugins/contact_priority.c:66
 msgid "Buddy is mobile"
 msgstr "Vriend is mobiel"
 
-#: ../pidgin/plugins/contact_priority.c:68
 msgid "Buddy is offline"
 msgstr "Vriend is vanlyn"
 
-#: ../pidgin/plugins/contact_priority.c:90
 msgid "Point values to use when..."
 msgstr "Puntwaardes om te gebruik wanneer..."
 
-#: ../pidgin/plugins/contact_priority.c:118
 msgid ""
 "The buddy with the <i>largest score</i> is the buddy who will have priority "
 "in the contact.\n"
-msgstr "Die vriend met die <i>hoogste telling</i> is die vriend wat prioriteit sal "
+msgstr ""
+"Die vriend met die <i>hoogste telling</i> is die vriend wat prioriteit sal "
 "h? in die kontak.\n"
 
-#: ../pidgin/plugins/contact_priority.c:125
 msgid "Use last buddy when scores are equal"
 msgstr "Gebruik die laaste vriend as tellings gelyk is"
 
-#: ../pidgin/plugins/contact_priority.c:130
 msgid "Point values to use for account..."
 msgstr "Puntwaardes om te gebruik vir rekening..."
 
@@ -19696,14 +14081,12 @@ msgstr "Puntwaardes om te gebruik vir re
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/contact_priority.c:188
 msgid "Contact Priority"
 msgstr "Kontakprioriteit"
 
 #. *< name
 #. *< version
 #. *< summary
-#: ../pidgin/plugins/contact_priority.c:191
 msgid ""
 "Allows for controlling the values associated with different buddy states."
 msgstr ""
@@ -19711,7 +14094,6 @@ msgstr ""
 "vriendstatusse."
 
 #. *< description
-#: ../pidgin/plugins/contact_priority.c:193
 msgid ""
 "Allows for changing the point values of idle/away/offline states for buddies "
 "in contact priority computations."
@@ -19719,93 +14101,72 @@ msgstr ""
 "Maak verandering van puntwaardes van ledig/weg/vanlyn-statusse moontlik by "
 "kontakprioriteitberekenings."
 
-#: ../pidgin/plugins/convcolors.c:23
 msgid "Conversation Colors"
 msgstr "Gesprekskleure"
 
-#: ../pidgin/plugins/convcolors.c:25 ../pidgin/plugins/convcolors.c:26
 msgid "Customize colors in the conversation window"
 msgstr "Pasgemaakte kleure vir die gespreksvenster"
 
-#: ../pidgin/plugins/convcolors.c:87
 msgid "Error Messages"
 msgstr "Foutboodskappe"
 
-#: ../pidgin/plugins/convcolors.c:88
 msgid "Highlighted Messages"
 msgstr "Gemerkte boodskappe"
 
-#: ../pidgin/plugins/convcolors.c:89
 msgid "System Messages"
 msgstr "Stelselboodskappe"
 
-#: ../pidgin/plugins/convcolors.c:90
 msgid "Sent Messages"
 msgstr "Gestuurde boodskappe"
 
-#: ../pidgin/plugins/convcolors.c:91
 msgid "Received Messages"
 msgstr "Ontvangde boodskappe"
 
-#: ../pidgin/plugins/convcolors.c:232 ../pidgin/plugins/pidginrc.c:271
 #, c-format
 msgid "Select Color for %s"
 msgstr "Kies kleur vir %s"
 
-#: ../pidgin/plugins/convcolors.c:388
 msgid "Ignore incoming format"
 msgstr "Ignoreer inkomende formaat"
 
-#: ../pidgin/plugins/convcolors.c:389
 msgid "Apply in Chats"
 msgstr "Pas toe in geselsies"
 
-#: ../pidgin/plugins/convcolors.c:390
 msgid "Apply in IMs"
 msgstr "Pas toe in kitsboodskappe"
 
 #. Note to translators: The string "Enter an XMPP Server" is asking the
 #. user to type the name of an XMPP server which will then be queried
-#: ../pidgin/plugins/disco/gtkdisco.c:242
 #, fuzzy
 msgid "Server name request"
 msgstr "Bedieneradres"
 
-#: ../pidgin/plugins/disco/gtkdisco.c:242
 msgid "Enter an XMPP Server"
 msgstr "Gee 'n XMPP-bediener"
 
-#: ../pidgin/plugins/disco/gtkdisco.c:243
 msgid "Select an XMPP server to query"
 msgstr "Kies 'n XMPP-bediener om te vra"
 
-#: ../pidgin/plugins/disco/gtkdisco.c:245
 msgid "Find Services"
 msgstr "Vind dienste"
 
-#: ../pidgin/plugins/disco/gtkdisco.c:302
 msgid "Add to Buddy List"
 msgstr "Voeg by vriendelys"
 
-#: ../pidgin/plugins/disco/gtkdisco.c:472
 msgid "Gateway"
 msgstr "Deurgang"
 
-#: ../pidgin/plugins/disco/gtkdisco.c:476
 msgid "Directory"
 msgstr "Gids"
 
-#: ../pidgin/plugins/disco/gtkdisco.c:484
 #, fuzzy
 msgid "PubSub Collection"
 msgstr "Klankkeuse"
 
-#: ../pidgin/plugins/disco/gtkdisco.c:488
 #, fuzzy
 msgid "PubSub Leaf"
 msgstr "PubSub-diens"
 
-#: ../pidgin/plugins/disco/gtkdisco.c:500
 msgid ""
 "\n"
 "<b>Description:</b> "
@@ -19814,60 +14175,47 @@ msgstr ""
 "<b>Beskrywing:</b> "
 
 #. Create the window.
-#: ../pidgin/plugins/disco/gtkdisco.c:635
 msgid "Service Discovery"
 msgstr "Diensbespeuring"
 
-#: ../pidgin/plugins/disco/gtkdisco.c:683
 msgid "_Browse"
 msgstr "_Blaai"
 
-#: ../pidgin/plugins/disco/xmppdisco.c:515
 msgid "Server does not exist"
 msgstr "Bediener bestaan nie"
 
-#: ../pidgin/plugins/disco/xmppdisco.c:520
 msgid "Server does not support service discovery"
 msgstr "Bediener ondersteun nie diensbespeuring nie"
 
-#: ../pidgin/plugins/disco/xmppdisco.c:600
-#: ../pidgin/plugins/disco/xmppdisco.c:659
 msgid "XMPP Service Discovery"
 msgstr "XMPP-diensbespeuring"
 
-#: ../pidgin/plugins/disco/xmppdisco.c:661
 msgid "Allows browsing and registering services."
 msgstr "Laat die blaai en registrasie van dienste toe."
 
-#: ../pidgin/plugins/disco/xmppdisco.c:662
 #, fuzzy
 msgid ""
 "This plugin is useful for registering with legacy transports or other XMPP "
 "services."
 msgstr "Hierdie inprop is nuttig om XMPP-bedieners of -kli?nte te ontfout."
 
-#: ../pidgin/plugins/extplacement.c:80
 msgid "By conversation count"
 msgstr "Volgens gesprektelling"
 
-#: ../pidgin/plugins/extplacement.c:101
 msgid "Conversation Placement"
 msgstr "Gesprekplasing"
 
 #. Translators: "New conversations" should match the text in the preferences dialog and "By conversation count" should be the same text used above
-#: ../pidgin/plugins/extplacement.c:105
 msgid ""
 "Note: The preference for \"New conversations\" must be set to \"By "
 "conversation count\"."
 msgstr ""
-"Let wel: Die voorkeur vir \"Nuwe gesprekke\" moet na \"Volgens gesprekstelling\" "
-"gestel wees."
+"Let wel: Die voorkeur vir \"Nuwe gesprekke\" moet na \"Volgens "
+"gesprekstelling\" gestel wees."
 
-#: ../pidgin/plugins/extplacement.c:111
 msgid "Number of conversations per window"
 msgstr "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 getal"
@@ -19878,19 +14226,16 @@ msgstr ""
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/extplacement.c:146
 msgid "ExtPlacement"
 msgstr "Gesprekplasing"
 
 #. *< name
 #. *< version
-#: ../pidgin/plugins/extplacement.c:148
 msgid "Extra conversation placement options."
 msgstr "Ekstra opsies vir gesprekplasing."
 
 #. *< summary
 #. *  description
-#: ../pidgin/plugins/extplacement.c:150
 msgid ""
 "Restrict the number of conversations per windows, optionally separating IMs "
 "and Chats"
@@ -19899,22 +14244,16 @@ msgstr ""
 "geselsies"
 
 #. Configuration frame
-#: ../pidgin/plugins/gestures/gestures.c:243
 msgid "Mouse Gestures Configuration"
 msgstr "Muisgebaar-opstelling"
 
-#: ../pidgin/plugins/gestures/gestures.c:250
-#: ../pidgin/plugins/gestures/gestures.c:263
 msgid "Middle mouse button"
 msgstr "Middelmuisknoppie"
 
-#: ../pidgin/plugins/gestures/gestures.c:251
-#: ../pidgin/plugins/gestures/gestures.c:268
 msgid "Right mouse button"
 msgstr "Regtermuisknoppie"
 
 #. "Visual gesture display" checkbox
-#: ../pidgin/plugins/gestures/gestures.c:281
 msgid "_Visual gesture display"
 msgstr "_Wys gebare visueel"
 
@@ -19924,19 +14263,16 @@ msgstr "_Wys gebare visueel"
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/gestures/gestures.c:317
 msgid "Mouse Gestures"
 msgstr "Muisgebare"
 
 #. *< name
 #. *< version
 #. *  summary
-#: ../pidgin/plugins/gestures/gestures.c:320
 msgid "Provides support for mouse gestures"
 msgstr "Verskaf steun vir muisgebare"
 
 #. *  description
-#: ../pidgin/plugins/gestures/gestures.c:322
 msgid ""
 "Allows support for mouse gestures in conversation windows. Drag the middle "
 "mouse button to perform certain actions:\n"
@@ -19950,34 +14286,26 @@ msgstr ""
 " o Sleep op en dan links om na die vorige gesprek te gaan.\n"
 " o Sleep op en dan regs om na die volgende gesprek te gaan."
 
-#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:143
 msgid "Instant Messaging"
 msgstr "Kitsboodskappe"
 
 #. Add the label.
-#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:459
 msgid "Select a person from your address book below, or add a new person."
-msgstr "Kies 'n persoon van u adresboek hier onder, of voeg 'n nuwe persoon by."
+msgstr ""
+"Kies 'n persoon van u adresboek hier onder, of voeg 'n nuwe persoon by."
 
-#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:553
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:298
 msgid "Group:"
 msgstr "Groep:"
 
 #. "New Person" button
-#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:578
-#: ../pidgin/plugins/gevolution/assoc-buddy.c:468
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:245
 msgid "New Person"
 msgstr "Nuwe persoon"
 
 #. "Select Buddy" button
-#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:595
 msgid "Select Buddy"
 msgstr "Kies vriend"
 
 #. Add the label.
-#: ../pidgin/plugins/gevolution/assoc-buddy.c:344
 msgid ""
 "Select a person from your address book to add this buddy to, or create a new "
 "person."
@@ -19986,43 +14314,33 @@ msgstr ""
 "nuwe persoon."
 
 #. Add the expander
-#: ../pidgin/plugins/gevolution/assoc-buddy.c:432
 msgid "User _details"
 msgstr "Gebruiker_details"
 
 #. "Associate Buddy" button
-#: ../pidgin/plugins/gevolution/assoc-buddy.c:485
 msgid "_Associate Buddy"
 msgstr "_Assosieer vriend"
 
-#: ../pidgin/plugins/gevolution/gevolution.c:241
-#: ../pidgin/plugins/gevolution/gevolution.c:247
 msgid "Unable to send email"
 msgstr "Kan nie e-pos stuur nie"
 
-#: ../pidgin/plugins/gevolution/gevolution.c:242
 msgid "The evolution executable was not found in the PATH."
 msgstr "Die evolution-programl?er is nie in die PATH gevind nie."
 
-#: ../pidgin/plugins/gevolution/gevolution.c:248
 msgid "An email address was not found for this buddy."
 msgstr "Daar is nie 'n e-posadres vir hierdie vriend gevind nie."
 
-#: ../pidgin/plugins/gevolution/gevolution.c:274
 msgid "Add to Address Book"
 msgstr "Voeg by adresboek"
 
-#: ../pidgin/plugins/gevolution/gevolution.c:286
 msgid "Send Email"
 msgstr "Stuur e-pos"
 
 #. Configuration frame
-#: ../pidgin/plugins/gevolution/gevolution.c:419
 msgid "Evolution Integration Configuration"
 msgstr "Opstelling van Evolution-integrasie"
 
 #. Label
-#: ../pidgin/plugins/gevolution/gevolution.c:422
 msgid "Select all accounts that buddies should be auto-added to."
 msgstr "Kies al die rekeninge waarvoor vriende outomaties bygevoeg moet word."
 
@@ -20032,7 +14350,6 @@ msgstr "Kies al die rekeninge waarvoor v
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/gevolution/gevolution.c:534
 msgid "Evolution Integration"
 msgstr "Evolution-integrasie"
 
@@ -20040,37 +14357,28 @@ msgstr "Evolution-integrasie"
 #. *< version
 #. *  summary
 #. *  description
-#: ../pidgin/plugins/gevolution/gevolution.c:537
-#: ../pidgin/plugins/gevolution/gevolution.c:539
 msgid "Provides integration with Evolution."
 msgstr "Verskaf integrasie met Evolution."
 
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:259
 msgid "Please enter the person's information below."
 msgstr "Tik gerus die persoon se inligting hier onder."
 
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:263
 msgid "Please enter the buddy's username and account type below."
 msgstr "Tik gerus die vriend se gebruikernaam en rekeningtipe hier onder."
 
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:283
 msgid "Account type:"
 msgstr "Rekeningtipe:"
 
 #. Optional Information section
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:306
 msgid "Optional information:"
 msgstr "Opsionele inligting:"
 
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:341
 msgid "First name:"
 msgstr "Naam:"
 
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:353
 msgid "Last name:"
 msgstr "Van:"
 
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:373
 msgid "Email:"
 msgstr "E-pos:"
 
@@ -20080,7 +14388,6 @@ msgstr "E-pos:"
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/gtk-signals-test.c:161
 msgid "GTK Signals Test"
 msgstr "GTK-seinetoets"
 
@@ -20088,12 +14395,9 @@ msgstr "GTK-seinetoets"
 #. *< version
 #. *  summary
 #. *  description
-#: ../pidgin/plugins/gtk-signals-test.c:164
-#: ../pidgin/plugins/gtk-signals-test.c:166
 msgid "Test to see that all ui signals are working properly."
 msgstr "Toets om te sien of alle koppelvlakseine goed werk."
 
-#: ../pidgin/plugins/gtkbuddynote.c:38
 #, c-format
 msgid ""
 "\n"
@@ -20102,7 +14406,6 @@ msgstr ""
 "\n"
 "<b>Vriendnota</b>: %s"
 
-#: ../pidgin/plugins/history.c:205
 msgid "History"
 msgstr "Geskiedenis"
 
@@ -20112,7 +14415,6 @@ msgstr "Geskiedenis"
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/iconaway.c:82
 msgid "Iconify on Away"
 msgstr "Ikonifieer wanneer weg"
 
@@ -20120,82 +14422,63 @@ msgstr "Ikonifieer wanneer weg"
 #. *< version
 #. *  summary
 #. *  description
-#: ../pidgin/plugins/iconaway.c:85 ../pidgin/plugins/iconaway.c:87
 msgid "Iconifies the buddy list and your conversations when you go away."
 msgstr "Ikonifieer die vriendelys en gesprekke wanneer u weggaan."
 
-#: ../pidgin/plugins/mailchk.c:160
 msgid "Mail Checker"
 msgstr "Poswagter"
 
-#: ../pidgin/plugins/mailchk.c:162
 msgid "Checks for new local mail."
 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."
 msgstr "Voeg 'n klein posbus by die vriendelys wat wys as mens nuwe pos het."
 
-#: ../pidgin/plugins/markerline.c:23
 msgid "Markerline"
 msgstr "Merkstreep"
 
-#: ../pidgin/plugins/markerline.c:25 ../pidgin/plugins/markerline.c:26
 msgid "Draw a line to indicate new messages in a conversation."
 msgstr "Trek 'n streep om nuwe boodskappe in 'n gesprek aan te dui."
 
-#: ../pidgin/plugins/markerline.c:238
 msgid "Jump to markerline"
 msgstr "Spring na merkstreep"
 
-#: ../pidgin/plugins/markerline.c:272
 msgid "Draw Markerline in "
 msgstr "Teken merkerlyn in "
 
-#: ../pidgin/plugins/markerline.c:276 ../pidgin/plugins/notify.c:701
 msgid "_IM windows"
 msgstr "Kitsboodskap_vensters"
 
-#: ../pidgin/plugins/markerline.c:280 ../pidgin/plugins/notify.c:708
 msgid "C_hat windows"
 msgstr "Gesel_svensters"
 
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:44
 msgid ""
 "A music messaging session has been requested. Please click the MM icon to "
 "accept."
 msgstr "'n Musiekboodskapsessie is aangevra. Klik die MM-ikoon om te aanvaar."
 
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:45
 msgid "Music messaging session confirmed."
 msgstr "Musiekboodskapsessie bevestig."
 
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:430
 msgid "Music Messaging"
 msgstr "Musiekboodskappe"
 
-#: ../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 bevel:"
 
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:539
 msgid "Error Running Editor"
 msgstr "Kon nie redigeerder laat loop nie"
 
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:540
 msgid "The following error has occurred:"
 msgstr "Die volgende fout het voorgekom:"
 
 #. Configuration frame
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:639
 msgid "Music Messaging Configuration"
 msgstr "Musiekboodskappe-konfigurasie"
 
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:643
 msgid "Score Editor Path"
 msgstr "Tellingredigering-pad"
 
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:644
 msgid "_Apply"
 msgstr "_Pas toe"
 
@@ -20207,12 +14490,10 @@ msgstr "_Pas toe"
 #. *< id
 #. *< name
 #. *< version
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:685
 msgid "Music Messaging Plugin for collaborative composition."
 msgstr "Musiekboodskap-inprop vir saamwerk-komponering."
 
 #. *  summary
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:687
 msgid ""
 "The Music Messaging Plugin allows a number of users to simultaneously work "
 "on a piece of music by editing a common score in real-time."
@@ -20221,83 +14502,66 @@ msgstr ""
 "aan 'n musiekstuk te werk deur gedeelde bladmusiek intyds te redigeer."
 
 #. ---------- "Notify For" ----------
-#: ../pidgin/plugins/notify.c:697
 msgid "Notify For"
 msgstr "Kennisstel vir"
 
-#: ../pidgin/plugins/notify.c:716
 msgid "\t_Only when someone says your username"
 msgstr "\t_Net wanneer iemand u gebruikernaam noem"
 
-#: ../pidgin/plugins/notify.c:726
 msgid "_Focused windows"
 msgstr "Ge_fokuste vensters"
 
 #. ---------- "Notification Methods" ----------
-#: ../pidgin/plugins/notify.c:734
 msgid "Notification Methods"
 msgstr "Kennisgewingsmetodes"
 
-#: ../pidgin/plugins/notify.c:741
 msgid "Prepend _string into window title:"
 msgstr "Voeg _string vooraan venstertitel:"
 
 #. Count method button
-#: ../pidgin/plugins/notify.c:760
 msgid "Insert c_ount of new messages into window title"
 msgstr "Voeg _getal nuwe boodskappe in venstertitel in"
 
 #. Count xprop method button
-#: ../pidgin/plugins/notify.c:769
 msgid "Insert count of new message into _X property"
 msgstr "Voeg getal nuwe boodskappe in _X-eienskap in"
 
 #. Urgent method button
-#: ../pidgin/plugins/notify.c:777
 msgid "Set window manager \"_URGENT\" hint"
 msgstr "Stel vensterbestuurder se \"_DRINGEND\"-wenk"
 
-#: ../pidgin/plugins/notify.c:779
 msgid "_Flash window"
 msgstr "_Flits venster"
 
 #. Raise window method button
-#: ../pidgin/plugins/notify.c:788
 msgid "R_aise conversation window"
 msgstr "_Lig geselsvenster"
 
 #. Present conversation method button
-#: ../pidgin/plugins/notify.c:796
 msgid "_Present conversation window"
 msgstr "_Huidige geselsvenster"
 
 #. ---------- "Notification Removals" ----------
-#: ../pidgin/plugins/notify.c:804
 msgid "Notification Removal"
 msgstr "Verwydering van kennisgewing"
 
 #. Remove on focus button
-#: ../pidgin/plugins/notify.c:809
 msgid "Remove when conversation window _gains focus"
 msgstr "Verwyder wanneer gesprekvenster _fokus kry"
 
 #. Remove on click button
-#: ../pidgin/plugins/notify.c:816
 msgid "Remove when conversation window _receives click"
 msgstr "Verwyder wanneer gesprekvenster ge_klik word"
 
 #. Remove on type button
-#: ../pidgin/plugins/notify.c:824
 msgid "Remove when _typing in conversation window"
 msgstr "Verwyder wanneer daar in gesprekvenster ge_tik word"
 
 #. Remove on message send button
-#: ../pidgin/plugins/notify.c:832
 msgid "Remove when a _message gets sent"
 msgstr "Verwyder wanneer 'n _boodskap gestuur word"
 
 #. Remove on conversation switch button
-#: ../pidgin/plugins/notify.c:841
 msgid "Remove on switch to conversation ta_b"
 msgstr "Verwyder met aktivering van gesprek_oortjie"
 
@@ -20307,7 +14571,6 @@ msgstr "Verwyder met aktivering van gesp
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/notify.c:934
 msgid "Message Notification"
 msgstr "Boodskapkennisgewing"
 
@@ -20315,7 +14578,6 @@ msgstr "Boodskapkennisgewing"
 #. *< version
 #. *  summary
 #. *  description
-#: ../pidgin/plugins/notify.c:937 ../pidgin/plugins/notify.c:939
 msgid "Provides a variety of ways of notifying you of unread messages."
 msgstr ""
 "Verskaf 'n verskeidenheid maniere om te laat weet van ongelese boodskappe."
@@ -20326,19 +14588,16 @@ msgstr ""
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/pidgininc.c:91
 msgid "Pidgin Demonstration Plugin"
 msgstr "Pidgin-demostrasie-inprop"
 
 #. *< name
 #. *< version
 #. *  summary
-#: ../pidgin/plugins/pidgininc.c:94
 msgid "An example plugin that does stuff - see the description."
 msgstr "'n Voorbeeldinprop wat dinge doen - sien die beskrywing."
 
 #. *  description
-#: ../pidgin/plugins/pidgininc.c:96
 msgid ""
 "This is a really cool plugin that does a lot of stuff:\n"
 "- It tells you who wrote the program when you log in\n"
@@ -20350,114 +14609,87 @@ msgstr ""
 "- Dit keer alle teks agterstevoorom\n"
 "- Dit stuur 'n boodskap aan mense op u lys die oomblik wat hulle aanmeld"
 
-#: ../pidgin/plugins/pidginrc.c:55
 msgid "Hyperlink Color"
 msgstr "Hiperskakelkleur"
 
-#: ../pidgin/plugins/pidginrc.c:56
 msgid "Visited Hyperlink Color"
 msgstr "Besoekte hiperskakelkleur"
 
-#: ../pidgin/plugins/pidginrc.c:59
 msgid "Highlighted Message Name Color"
 msgstr "Kleur van gemerkte boodskapnaam"
 
-#: ../pidgin/plugins/pidginrc.c:61
 msgid "Typing Notification Color"
 msgstr "Kleur van tikkennisgewing"
 
-#: ../pidgin/plugins/pidginrc.c:72
 msgid "GtkTreeView Horizontal Separation"
 msgstr "GtkTreeView- horisontale skeiding"
 
-#: ../pidgin/plugins/pidginrc.c:89
 msgid "Conversation Entry"
 msgstr "Gesprekinskrywing"
 
-#: ../pidgin/plugins/pidginrc.c:90
 msgid "Conversation History"
 msgstr "Gesprekgeskiedenis"
 
-#: ../pidgin/plugins/pidginrc.c:91
 msgid "Request Dialog"
 msgstr "Versoek-dialoog"
 
-#: ../pidgin/plugins/pidginrc.c:92
 msgid "Notify Dialog"
 msgstr "Kennisstel-dialoog"
 
-#: ../pidgin/plugins/pidginrc.c:273 ../pidgin/plugins/themeedit.c:154
 msgid "Select Color"
 msgstr "Kies kleur"
 
-#: ../pidgin/plugins/pidginrc.c:326
 #, c-format
 msgid "Select Interface Font"
 msgstr "Kies koppelvlakfont"
 
-#: ../pidgin/plugins/pidginrc.c:329
 #, c-format
 msgid "Select Font for %s"
 msgstr "Kies font vir %s"
 
-#: ../pidgin/plugins/pidginrc.c:422
 msgid "GTK+ Interface Font"
 msgstr "GTK+-koppelvlakfont"
 
-#: ../pidgin/plugins/pidginrc.c:482
 msgid "GTK+ Text Shortcut Theme"
 msgstr "GTK+-tekskortpadtema"
 
-#: ../pidgin/plugins/pidginrc.c:514
 msgid "Disable Typing Notification Text"
 msgstr "Deaktiveer tikkennisgewingsteks"
 
-#: ../pidgin/plugins/pidginrc.c:561
 msgid "GTK+ Theme Control Settings"
 msgstr "Instellings vir GTK+-temabeheer"
 
-#: ../pidgin/plugins/pidginrc.c:569
 msgid "Colors"
 msgstr "Kleure"
 
-#: ../pidgin/plugins/pidginrc.c:572
 msgid "Fonts"
 msgstr "Fonte"
 
-#: ../pidgin/plugins/pidginrc.c:575
 msgid "Miscellaneous"
 msgstr "Allerlei"
 
-#: ../pidgin/plugins/pidginrc.c:580
 msgid "Gtkrc File Tools"
 msgstr "Gtkrc-l?ernutsgoed"
 
-#: ../pidgin/plugins/pidginrc.c:585
 #, c-format
 msgid "Write settings to %s%sgtkrc-2.0"
 msgstr "Skryf instellings na %s%sgtkrc-2.0"
 
-#: ../pidgin/plugins/pidginrc.c:593
 msgid "Re-read gtkrc files"
 msgstr "Lees gtkrc-l?ers weer"
 
-#: ../pidgin/plugins/pidginrc.c:627
 msgid "Pidgin GTK+ Theme Control"
 msgstr "Pidgin GTK+-temabeheer"
 
-#: ../pidgin/plugins/pidginrc.c:629 ../pidgin/plugins/pidginrc.c:630
 msgid "Provides access to commonly used gtkrc settings."
 msgstr "Verskaf toegang tot algemeen gebruikte gtkrc-instellings."
 
-#: ../pidgin/plugins/raw.c:175
 msgid "Raw"
 msgstr "Rou"
 
-#: ../pidgin/plugins/raw.c:177
 msgid "Lets you send raw input to text-based protocols."
 msgstr "Laat u rou toevoer na teksgebaseerde protokols stuur."
 
-#: ../pidgin/plugins/raw.c:178
 msgid ""
 "Lets you send raw input to text-based protocols (XMPP, MSN, IRC, TOC). Hit "
 "'Enter' in the entry box to send. Watch the debug window."
@@ -20465,20 +14697,16 @@ msgstr ""
 "Laat u rou toevoer na teksgebaseerde protokols (XMPP, MSN, IRC, TOC) stuur. "
 "Druk 'Enter' in die inskryfkassie om te stuur. Hou die ontfoutvenster dop."
 
-#: ../pidgin/plugins/relnot.c:111
 #, c-format
 msgid "You can upgrade to %s %s today."
 msgstr "U kan vandag opgradeer na %s %s."
 
-#: ../pidgin/plugins/relnot.c:116
 msgid "New Version Available"
 msgstr "Nuwe weergawe beskikbaar"
 
-#: ../pidgin/plugins/relnot.c:119
 msgid "Later"
 msgstr "Later"
 
-#: ../pidgin/plugins/relnot.c:120
 msgid "Download Now"
 msgstr "Laai nou af"
 
@@ -20488,19 +14716,16 @@ msgstr "Laai nou af"
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/relnot.c:199
 msgid "Release Notification"
 msgstr "Vrystellingskennisgewings"
 
 #. *< name
 #. *< version
 #. *  summary
-#: ../pidgin/plugins/relnot.c:202
 msgid "Checks periodically for new releases."
 msgstr "Kontroleer af en toe vir nuwe weergawes."
 
 #. *  description
-#: ../pidgin/plugins/relnot.c:204
 msgid ""
 "Checks periodically for new releases and notifies the user with the "
 "ChangeLog."
@@ -20516,18 +14741,15 @@ msgstr ""
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/sendbutton.c:176
 msgid "Send Button"
 msgstr "Stuur-knoppie"
 
 #. *< name
 #. *< version
-#: ../pidgin/plugins/sendbutton.c:178
 msgid "Conversation Window Send Button."
 msgstr "Knoppie om gesprekvenster te stuur."
 
 #. *< summary
-#: ../pidgin/plugins/sendbutton.c:179
 msgid ""
 "Adds a Send button to the entry area of the conversation window. Intended "
 "for use when no physical keyboard is present."
@@ -20535,83 +14757,64 @@ msgstr ""
 "Voeg 'n Stuur-knoppie by die intikarea van die gesprekvenster. Bedoel vir "
 "wanneer daar geen fisiese sleutelbord is nie."
 
-#: ../pidgin/plugins/spellchk.c:1971
 msgid "Duplicate Correction"
 msgstr "Duplikaatverbetering"
 
-#: ../pidgin/plugins/spellchk.c:1972
 msgid "The specified word already exists in the correction list."
 msgstr "Die gespesifiseerde woord bestaan reeds in die verbeteringlys."
 
-#: ../pidgin/plugins/spellchk.c:2172
 msgid "Text Replacements"
 msgstr "Teksvervangings"
 
-#: ../pidgin/plugins/spellchk.c:2195
 msgid "You type"
 msgstr "U tik"
 
-#: ../pidgin/plugins/spellchk.c:2209
 msgid "You send"
 msgstr "U stuur"
 
-#: ../pidgin/plugins/spellchk.c:2223
 msgid "Whole words only"
 msgstr "Net heelwoorde"
 
-#: ../pidgin/plugins/spellchk.c:2235
 msgid "Case sensitive"
 msgstr "Kassensitief"
 
-#: ../pidgin/plugins/spellchk.c:2261
 msgid "Add a new text replacement"
 msgstr "Voeg 'n nuwe teksvervanging by"
 
-#: ../pidgin/plugins/spellchk.c:2277
 msgid "You _type:"
 msgstr "U _tik:"
 
-#: ../pidgin/plugins/spellchk.c:2281
 msgid "You _send:"
 msgstr "U _stuur:"
 
 #. Created here so it can be passed to whole_words_button_toggled.
-#: ../pidgin/plugins/spellchk.c:2284
 msgid "_Exact case match (uncheck for automatic case handling)"
 msgstr ""
 "Identies wat _kas betref (deaktiveer vir outomatiese hantering van "
 "hoofletters)"
 
-#: ../pidgin/plugins/spellchk.c:2286
 msgid "Only replace _whole words"
 msgstr "Vervang net _heelwoorde"
 
-#: ../pidgin/plugins/spellchk.c:2311
 msgid "General Text Replacement Options"
 msgstr "Algemene opsies vir teksvervanging"
 
-#: ../pidgin/plugins/spellchk.c:2312
 msgid "Enable replacement of last word on send"
 msgstr "Aktiveer vervanging van laaste woord tydens stuur"
 
-#: ../pidgin/plugins/spellchk.c:2345
 msgid "Text replacement"
 msgstr "Teksvervanging"
 
-#: ../pidgin/plugins/spellchk.c:2347 ../pidgin/plugins/spellchk.c:2348
 msgid "Replaces text in outgoing messages according to user-defined rules."
 msgstr ""
 "Vervang teks in uitgaande boodskappe volgens gebruikergespesifiseerde re?ls."
 
-#: ../pidgin/plugins/themeedit-icon.c:68
 msgid "Just logged in"
 msgstr "Pas aangemeld"
 
-#: ../pidgin/plugins/themeedit-icon.c:69
 msgid "Just logged out"
 msgstr "Pas afgemeld"
 
-#: ../pidgin/plugins/themeedit-icon.c:70
 msgid ""
 "Icon for Contact/\n"
 "Icon for Unknown person"
@@ -20619,90 +14822,70 @@ msgstr ""
 "Ikoon vir kontak/\n"
 "Ikoon vir onbekende persoon"
 
-#: ../pidgin/plugins/themeedit-icon.c:71
 msgid "Icon for Chat"
 msgstr "Ikoon vir geselsie"
 
-#: ../pidgin/plugins/themeedit-icon.c:74
 msgid "Ignored"
 msgstr "Ge?gnoreer"
 
-#: ../pidgin/plugins/themeedit-icon.c:75
 msgid "Founder"
 msgstr "Stigter"
 
 #. A user in a chat room who has special privileges.
-#: ../pidgin/plugins/themeedit-icon.c:77
 msgid "Operator"
 msgstr "Operateur"
 
 #. A half operator is someone who has a subset of the privileges
 #. that an operator has.
-#: ../pidgin/plugins/themeedit-icon.c:80
 msgid "Half Operator"
 msgstr "Halwe operateur"
 
-#: ../pidgin/plugins/themeedit-icon.c:84
 #, fuzzy
 msgid "Authorization dialog"
 msgstr "Magtiging gegee"
 
-#: ../pidgin/plugins/themeedit-icon.c:85
 msgid "Error dialog"
 msgstr "Foutdialoog"
 
-#: ../pidgin/plugins/themeedit-icon.c:86
 msgid "Information dialog"
 msgstr "Inligtingsdialoog"
 
-#: ../pidgin/plugins/themeedit-icon.c:87
 msgid "Mail dialog"
 msgstr "Posdialoog"
 
-#: ../pidgin/plugins/themeedit-icon.c:88
 msgid "Question dialog"
 msgstr "Vraagdialoog"
 
-#: ../pidgin/plugins/themeedit-icon.c:89
 msgid "Warning dialog"
 msgstr "Waarskuwingsdieloog"
 
-#: ../pidgin/plugins/themeedit-icon.c:91
 msgid "What kind of dialog is this?"
 msgstr "Watter tipe dialoogvenster is di??"
 
-#: ../pidgin/plugins/themeedit-icon.c:99
 msgid "Status Icons"
 msgstr "Statusikone"
 
-#: ../pidgin/plugins/themeedit-icon.c:100
 msgid "Chatroom Emblems"
 msgstr "Geselsiekamer-embleme"
 
-#: ../pidgin/plugins/themeedit-icon.c:101
 msgid "Dialog Icons"
 msgstr "Dialoogikone"
 
-#: ../pidgin/plugins/themeedit-icon.c:257
 #, fuzzy
 msgid "Pidgin Icon Theme Editor"
 msgstr "Pidgin GTK+-temabeheer"
 
-#: ../pidgin/plugins/themeedit.c:242
 msgid "Contact"
 msgstr "Kontak"
 
-#: ../pidgin/plugins/themeedit.c:266
 #, fuzzy
 msgid "Pidgin Buddylist Theme Editor"
 msgstr "Pidgin-vriendelystemaredigeerder"
 
-#: ../pidgin/plugins/themeedit.c:326
 #, fuzzy
 msgid "Edit Buddylist Theme"
 msgstr "Redigeer vriendelystema"
 
-#: ../pidgin/plugins/themeedit.c:328
 msgid "Edit Icon Theme"
 msgstr "Wysig ikoontema"
 
@@ -20713,14 +14896,12 @@ msgstr "Wysig ikoontema"
 #. *< priority
 #. *< id
 #. *  description
-#: ../pidgin/plugins/themeedit.c:346 ../pidgin/plugins/themeedit.c:351
 msgid "Pidgin Theme Editor"
 msgstr "Pidgin se temaredigeerder"
 
 #. *< name
 #. *< version
 #. *  summary
-#: ../pidgin/plugins/themeedit.c:349
 msgid "Pidgin Theme Editor."
 msgstr "Pidgin se temaredigeerder."
 
@@ -20730,7 +14911,6 @@ msgstr "Pidgin se temaredigeerder."
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/ticker/ticker.c:75 ../pidgin/plugins/ticker/ticker.c:372
 msgid "Buddy Ticker"
 msgstr "Vriendelint"
 
@@ -20738,11 +14918,9 @@ msgstr "Vriendelint"
 #. *< version
 #. *  summary
 #. *  description
-#: ../pidgin/plugins/ticker/ticker.c:375 ../pidgin/plugins/ticker/ticker.c:377
 msgid "A horizontal scrolling version of the buddy list."
 msgstr "'n Weergawe van die vriendelys wat horisontaal rol."
 
-#: ../pidgin/plugins/timestamp.c:143
 msgid "Display Timestamps Every"
 msgstr "Wys tydstempels elke"
 
@@ -20752,63 +14930,47 @@ msgstr "Wys tydstempels elke"
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/timestamp.c:208
 msgid "Timestamp"
 msgstr "Tydstempel"
 
 #. *< name
 #. *< version
 #. *  summary
-#: ../pidgin/plugins/timestamp.c:211
 msgid "Display iChat-style timestamps"
 msgstr "Wys iChat-tydstempels"
 
 #. *  description
-#: ../pidgin/plugins/timestamp.c:213
 msgid "Display iChat-style timestamps every N minutes."
 msgstr "Wys iChat-tydstempels elke N minute."
 
-#: ../pidgin/plugins/timestamp_format.c:35
-#: ../pidgin/plugins/timestamp_format.c:204
 msgid "Timestamp Format Options"
 msgstr "Tydstempelformateeropsies"
 
-#: ../pidgin/plugins/timestamp_format.c:38
 #, c-format
 msgid "_Force timestamp format:"
 msgstr "_Forseer tydstempelformaat:"
 
-#: ../pidgin/plugins/timestamp_format.c:43
 msgid "Use system default"
 msgstr "Gebruik die stelselverstek"
 
-#: ../pidgin/plugins/timestamp_format.c:44
 msgid "12 hour time format"
 msgstr "12-uurformaat"
 
-#: ../pidgin/plugins/timestamp_format.c:45
 msgid "24 hour time format"
 msgstr "24-uurformaat"
 
-#: ../pidgin/plugins/timestamp_format.c:49
 msgid "Show dates in..."
 msgstr "Wys datums in..."
 
-#: ../pidgin/plugins/timestamp_format.c:54
 msgid "Co_nversations:"
 msgstr "_Gesprekke:"
 
-#: ../pidgin/plugins/timestamp_format.c:56
-#: ../pidgin/plugins/timestamp_format.c:65
 msgid "For delayed messages"
 msgstr "Vir vertraagde boodskappe"
 
-#: ../pidgin/plugins/timestamp_format.c:57
-#: ../pidgin/plugins/timestamp_format.c:66
 msgid "For delayed messages and in chats"
 msgstr "Vir vertraagde boodskappe en in geselsies"
 
-#: ../pidgin/plugins/timestamp_format.c:63
 msgid "_Message Logs:"
 msgstr "_Boodskapstaafl?ers:"
 
@@ -20818,19 +14980,16 @@ msgstr "_Boodskapstaafl?ers:"
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/timestamp_format.c:272
 msgid "Message Timestamp Formats"
 msgstr "Boodskaptydstempelformate"
 
 #. *< name
 #. *< version
 #. *  summary
-#: ../pidgin/plugins/timestamp_format.c:275
 msgid "Customizes the message timestamp formats."
 msgstr "Pasgemaakte formate vir boodskaptydstempels."
 
 #. *  description
-#: ../pidgin/plugins/timestamp_format.c:277
 msgid ""
 "This plugin allows the user to customize conversation and logging message "
 "timestamp formats."
@@ -20838,35 +14997,27 @@ msgstr ""
 "Hierdie inprop stel die gebruiker in staat om die formaat van tydstempels in "
 "gesprekke in staafl?ers aan te pas."
 
-#: ../pidgin/plugins/vvconfig.c:301
 msgid "Audio"
 msgstr "Oudio"
 
-#: ../pidgin/plugins/vvconfig.c:303
 msgid "Video"
 msgstr "Video"
 
-#: ../pidgin/plugins/vvconfig.c:314 ../pidgin/plugins/vvconfig.c:321
 msgid "Output"
 msgstr "Afvoer"
 
-#: ../pidgin/plugins/vvconfig.c:314 ../pidgin/plugins/vvconfig.c:321
 msgid "_Plugin"
 msgstr "_Inprop"
 
-#: ../pidgin/plugins/vvconfig.c:315 ../pidgin/plugins/vvconfig.c:322
 msgid "_Device"
 msgstr "_Toestel"
 
-#: ../pidgin/plugins/vvconfig.c:317 ../pidgin/plugins/vvconfig.c:324
 msgid "Input"
 msgstr "Toevoer"
 
-#: ../pidgin/plugins/vvconfig.c:317 ../pidgin/plugins/vvconfig.c:324
 msgid "P_lugin"
 msgstr "I_nprop"
 
-#: ../pidgin/plugins/vvconfig.c:318 ../pidgin/plugins/vvconfig.c:325
 msgid "D_evice"
 msgstr "T_oestel"
 
@@ -20879,59 +15030,44 @@ msgstr "T_oestel"
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/vvconfig.c:538
 msgid "Voice/Video Settings"
 msgstr "Stem-/video-opstelling"
 
 #. *< name
 #. *< version
-#: ../pidgin/plugins/vvconfig.c:540
 msgid "Configure your microphone and webcam."
 msgstr "Stel die mikrofoon en webkamera op."
 
 #. *< summary
-#: ../pidgin/plugins/vvconfig.c:541
 msgid "Configure microphone and webcam settings for voice/video calls."
 msgstr "Instellings vir mikrofoon en webkamera vir stem-/video-oproepe."
 
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:173
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:588
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:635
 msgid "Opacity:"
 msgstr "Ondeursigtigheid:"
 
 #. IM Convo trans options
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:552
 msgid "IM Conversation Windows"
 msgstr "Kitsboodskap-gesprekvensters"
 
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:553
 msgid "_IM window transparency"
 msgstr "_Kitsboodskap-gesprekvenster-deursigtigheid"
 
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:567
 msgid "_Show slider bar in IM window"
 msgstr "_Wys skuifstaaf in kitsboodskapvenster"
 
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:574
 msgid "Remove IM window transparency on focus"
 msgstr "Verwyder kitsboodskapvenster se deursigtigheid terwyl gefokus"
 
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:577
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:625
 msgid "Always on top"
 msgstr "Altyd bo-op"
 
 #. Buddy List trans options
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:609
 msgid "Buddy List Window"
 msgstr "Vriendelysvenster"
 
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:610
 msgid "_Buddy List window transparency"
 msgstr "_Vriendelysvenster se deursigtigheid"
 
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:623
 msgid "Remove Buddy List window transparency on focus"
 msgstr "Verwyder vriendelysvenster se deursigtigheid tydens fokus"
 
@@ -20941,19 +15077,16 @@ msgstr "Verwyder vriendelysvenster se de
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:683
 msgid "Transparency"
 msgstr "Deursigtigheid"
 
 #. *< name
 #. *< version
 #. *  summary
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:686
 msgid "Variable Transparency for the buddy list and conversations."
 msgstr "Veranderbare deursigtigheid vir die vriendelys en gesprekke."
 
 #. *  description
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:688
 msgid ""
 "This plugin enables variable alpha transparency on conversation windows and "
 "the buddy list.\n"
@@ -20966,47 +15099,38 @@ msgstr ""
 "* Let wel: Hierdie inprop vereis Win2000 of jonger."
 
 #. Autostart
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:280
 msgid "Startup"
 msgstr "Begin"
 
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:281
 #, c-format
 msgid "_Start %s on Windows startup"
 msgstr "_Begin %s met Windows-begin"
 
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:293
 msgid "Allow multiple instances"
 msgstr "Laat veelvuldige instansies toe"
 
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:304
 msgid "_Dockable Buddy List"
 msgstr "_Dokbare vriendelys"
 
 #. Blist On Top
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:308
 msgid "_Keep Buddy List window on top:"
 msgstr "_Hou vriendelysvenster bo:"
 
 #. XXX: Did this ever work?
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:313
 msgid "Only when docked"
 msgstr "Net indien gedok"
 
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:343
 msgid "Windows Pidgin Options"
 msgstr "Windows Pidgin-opsies"
 
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:345
 msgid "Options specific to Pidgin for Windows."
 msgstr "Opsies spesifiek aan Pidgin vir Windows."
 
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:346
 msgid ""
 "Provides options specific to Pidgin for Windows, such as buddy list docking."
-msgstr "Verskaf opsies spesifiek vir Pidgin op Windows, soos vriendelysdokking."
+msgstr ""
+"Verskaf opsies spesifiek vir Pidgin op Windows, soos vriendelysdokking."
 
-#: ../pidgin/plugins/xmppconsole.c:684
 msgid "<font color='#777777'>Logged out.</font>"
 msgstr "<font color='#777777'>Afgemeld.</font>"
 
@@ -21016,39 +15140,160 @@ msgstr "<font color='#777777'>Afgemeld.<
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/xmppconsole.c:761 ../pidgin/plugins/xmppconsole.c:841
-#: ../pidgin/plugins/xmppconsole.c:860
 msgid "XMPP Console"
 msgstr "XMPP-konsole"
 
-#: ../pidgin/plugins/xmppconsole.c:768
 msgid "Account: "
 msgstr "Rekening: "
 
-#: ../pidgin/plugins/xmppconsole.c:795
 msgid "<font color='#777777'>Not connected to XMPP</font>"
 msgstr "<font color='#777777'>Nie aan XMPP gekoppel nie</font>"
 
 #. *< name
 #. *< version
 #. *  summary
-#: ../pidgin/plugins/xmppconsole.c:863
 msgid "Send and receive raw XMPP stanzas."
 msgstr "Stuur en ontvang rou XMPP-stanzas."
 
 #. *  description
-#: ../pidgin/plugins/xmppconsole.c:865
 msgid "This plugin is useful for debugging XMPP servers or clients."
 msgstr "Hierdie inprop is nuttig om XMPP-bedieners of -kli?nte te ontfout."
 
+msgid ""
+"$(^Name) is released under the GNU General Public License (GPL). The license "
+"is provided here for information purposes only. $_CLICK"
+msgstr ""
+
+msgid "A multi-platform GUI toolkit, used by Pidgin"
+msgstr ""
+
+msgid ""
+"An instance of Pidgin is currently running.  Please exit Pidgin and try "
+"again."
+msgstr ""
+
+msgid "Core Pidgin files and dlls"
+msgstr ""
+
+msgid "Create a Start Menu entry for Pidgin"
+msgstr ""
+
+msgid "Create a shortcut to Pidgin on the Desktop"
+msgstr ""
+
+msgid "Debug Symbols (for reporting crashes)"
+msgstr ""
+
+#, fuzzy
+msgid "Desktop"
+msgstr "Werkskermverstek"
+
+msgid ""
+"Error Downloading the GTK+ Runtime ($R2).$\\rThis is required for Pidgin to "
+"function; if retrying fails, you may need to use the 'Offline Installer' "
+"from http://pidgin.im/download/windows/ ."
+msgstr ""
+
+msgid ""
+"Error Installing Debug Symbols ($R2).$\\rIf retrying fails, you may need to "
+"use the 'Offline Installer' from http://pidgin.im/download/windows/ ."
+msgstr ""
+
+#, fuzzy
+msgid "GTK+ Runtime (required if not present)"
+msgstr "GTK+-weergawe"
+
+#, fuzzy
+msgid "Localizations"
+msgstr "Ligging"
+
+#. License Page
+msgid "Next >"
+msgstr ""
+
+#. Components Page
+#, fuzzy
+msgid "Pidgin Instant Messaging Client (required)"
+msgstr "Pidgin Internetboodskapper"
+
+#. GTK+ Section Prompts
+msgid ""
+"Pidgin requires a compatible GTK+ Runtime (which doesn't appear to be "
+"already present).$\\rAre you sure you want to skip installing the GTK+ "
+"Runtime?"
+msgstr ""
+
+#, fuzzy
+msgid "Shortcuts"
+msgstr "Kortpad"
+
+msgid "Shortcuts for starting Pidgin"
+msgstr ""
+
+#. Spellcheck Section Prompts
+msgid "Spellchecking Support"
+msgstr ""
+
+#, fuzzy
+msgid "Start Menu"
+msgstr "Begin"
+
+msgid ""
+"Support for Spellchecking.  (Internet connection required for installation)"
+msgstr ""
+
+#, fuzzy
+msgid "The installer is already running."
+msgstr "Die bynaam \"%s\" is reeds in gebruik."
+
+#. Uninstall Section Prompts
+msgid ""
+"The uninstaller could not find registry entries for Pidgin.$\\rIt is likely "
+"that another user installed this application."
+msgstr ""
+
+#. URL Handler section
+#, fuzzy
+msgid "URI Handlers"
+msgstr "myim-URL-vatsel"
+
+#. Pidgin Section Prompts and Texts
+msgid ""
+"Unable to uninstall the currently installed version of Pidgin. The new "
+"version will be installed without removing the currently installed version."
+msgstr ""
+
+#. Installer Finish Page
+msgid "Visit the Pidgin Web Page"
+msgstr ""
+
+msgid "You do not have permission to uninstall this application."
+msgstr ""
+
+msgid "spellcheck_faq"
+msgstr ""
+
+#~ msgid "Current Mood"
+#~ msgstr "Huidige gemoedstoestand"
+
+#~ msgid "New Mood"
+#~ msgstr "Nuwe gemoedstoestand"
+
+#~ msgid "Change your Mood"
+#~ msgstr "Verander u gemoedstoestand"
+
+#~ msgid "How do you feel right now?"
+#~ msgstr "Hoe voel u reg nou?"
+
+#~ msgid "Change Mood..."
+#~ msgstr "Verander gemoedstoestand..."
+
 #~ msgid "Error creating conference."
 #~ msgstr "Fout met skep van konferensie."
 
-#, c-format
 #~ msgid "Unable to bind socket to port: %s"
 #~ msgstr "Kan nie sok aan poort verbind nie: %s"
 
-#, c-format
 #~ msgid "Unable to listen on socket: %s"
 #~ msgstr "Kan nie op sok luister nie: %s"
 
@@ -21064,11 +15309,9 @@ msgstr "Hierdie inprop is nuttig om XMPP
 #~ msgid "Album"
 #~ msgstr "Album"
 
-#, c-format
 #~ msgid "%s just sent you a Nudge!"
 #~ msgstr "%s het u so pas 'n stootjie gestuur!"
 
-#, c-format
 #~ msgid "Friendly name changes too rapidly"
 #~ msgstr "Vriendelike naam verander te vinnig"
 
@@ -21081,34 +15324,27 @@ msgstr "Hierdie inprop is nuttig om XMPP
 #~ msgid "MSN Protocol Plugin"
 #~ msgstr "MSN-protokolinprop"
 
-#, c-format
 #~ msgid "%s is not a valid group."
 #~ msgstr "%s is nie 'n geldige groep nie."
 
 #~ msgid "Unknown error."
 #~ msgstr "Onbekende fout."
 
-#, c-format
 #~ msgid "%s on %s (%s)"
 #~ msgstr "%s op %s (%s)"
 
-#, c-format
 #~ msgid "Unable to add user on %s (%s)"
 #~ msgstr "Kan nie gebruiker by %s byvoeg nie (%s)"
 
-#, c-format
 #~ msgid "Unable to block user on %s (%s)"
 #~ msgstr "Kan nie gebruiker op %s blokkeer nie (%s)"
 
-#, c-format
 #~ msgid "Unable to permit user on %s (%s)"
 #~ msgstr "Kan nie gebruiker op %s toelaat nie (%s)"
 
-#, 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."
 
-#, c-format
 #~ msgid "%s is not a valid passport account."
 #~ msgstr "%s is nie 'n geldige paspoortrekening nie."
 
@@ -21121,11 +15357,9 @@ msgstr "Hierdie inprop is nuttig om XMPP
 #~ msgid "Unable to delete group"
 #~ msgstr "Kan nie groep uitvee nie"
 
-#, c-format
 #~ msgid "%s has added you to his or her buddy list."
 #~ msgstr "%s het u by sy of haar vriendelys gevoeg."
 
-#, c-format
 #~ msgid "%s has removed you from his or her buddy list."
 #~ msgstr "%s het u van sy of haar vriendelys verwyder."
 
@@ -21133,8 +15367,8 @@ msgstr "Hierdie inprop is nuttig om XMPP
 #~ "The last action you attempted could not be performed because you are over "
 #~ "the rate limit. Please wait 10 seconds and try again.\n"
 #~ msgstr ""
-#~ "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.\n"
+#~ "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.\n"
 
 #~ msgid "Get Status Msg"
 #~ msgstr "Kry statusboodskap"
@@ -21154,61 +15388,57 @@ msgstr "Hierdie inprop is nuttig om XMPP
 #~ msgid "The orientation of the tray."
 #~ msgstr "Die ori?ntasie van die laai."
 
-#, c-format
 #~ msgid ""
 #~ "%s is a graphical modular messaging client based on libpurple which is "
-#~ "capable of connecting to AIM, MSN, Yahoo!, XMPP, ICQ, IRC, SILC, SIP/SIMPLE, "
-#~ "Novell GroupWise, Lotus Sametime, Bonjour, Zephyr, MySpaceIM, Gadu-Gadu, and "
-#~ "QQ all at once.  It is written using GTK+.<BR><BR>You may modify and "
-#~ "redistribute the program under the terms of the GPL (version 2 or later).  A "
-#~ "copy of the GPL is contained in the 'COPYING' file distributed with %s.  %s "
-#~ "is copyrighted by its contributors.  See the 'COPYRIGHT' file for the "
-#~ "complete list of contributors.  We provide no warranty for this program."
-#~ "<BR><BR>"
+#~ "capable of connecting to AIM, MSN, Yahoo!, XMPP, ICQ, IRC, SILC, SIP/"
+#~ "SIMPLE, Novell GroupWise, Lotus Sametime, Bonjour, Zephyr, MySpaceIM, "
+#~ "Gadu-Gadu, and QQ all at once.  It is written using GTK+.<BR><BR>You may "
+#~ "modify and redistribute the program under the terms of the GPL (version 2 "
+#~ "or later).  A copy of the GPL is contained in the 'COPYING' file "
+#~ "distributed with %s.  %s is copyrighted by its contributors.  See the "
+#~ "'COPYRIGHT' file for the complete list of contributors.  We provide no "
+#~ "warranty for this program.<BR><BR>"
 #~ msgstr ""
 #~ "%s is 'n grafiese modul?re geselskli?nt wat op libpurple gebaseer is, wat "
 #~ "aan AIM, MSN, Yahoo!, XMPP, ICQ, IRC, SILC, SIP/SIMPLE, Novell GroupWise, "
-#~ "Lotus Sametime, Bonjour, Zephyr, 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 "
-#~ "program nie.<BR><BR>"
+#~ "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 program nie.<BR><BR>"
 
-#, c-format
 #~ msgid ""
 #~ "<FONT SIZE=\"4\">FAQ:</FONT> <A HREF=\"http://developer.pidgin.im/wiki/FAQ"
 #~ "\">http://developer.pidgin.im/wiki/FAQ</A><BR/><BR/>"
 #~ msgstr ""
-#~ "<FONT SIZE=\"4\">Vrae:</FONT> <A HREF=\"http://developer.pidgin.im/wiki/FAQ"
-#~ "\">http://developer.pidgin.im/wiki/FAQ</A><BR/><BR/>"
+#~ "<FONT SIZE=\"4\">Vrae:</FONT> <A HREF=\"http://developer.pidgin.im/wiki/"
+#~ "FAQ\">http://developer.pidgin.im/wiki/FAQ</A><BR/><BR/>"
 
-#, c-format
 #~ msgid ""
 #~ "<font size=\"4\">Help from other Pidgin users:</font> <a href=\"mailto:"
 #~ "support at pidgin.im\">support at pidgin.im</a><br/>This is a <b>public</b> "
-#~ "mailing list! (<a href=\"http://pidgin.im/pipermail/support/\">archive</a>)"
-#~ "<br/>We can't help with 3rd party protocols or plugins!<br/>This list's "
-#~ "primary language is <b>English</b>.  You are welcome to post in another "
-#~ "language, but the responses may be less helpful.<br/><br/>"
+#~ "mailing list! (<a href=\"http://pidgin.im/pipermail/support/\">archive</"
+#~ "a>)<br/>We can't help with 3rd party protocols or plugins!<br/>This "
+#~ "list's primary language is <b>English</b>.  You are welcome to post in "
+#~ "another language, but the responses may be less helpful.<br/><br/>"
 #~ msgstr ""
-#~ "<font size=\"4\">Hulp van ander Pidgin-gebruikers:</font> <a href=\"mailto:"
-#~ "support at pidgin.im\">support at pidgin.im</a><br/>Hierdie is 'n <b>publieke</b> "
-#~ "poslys! (<a href=\"http://pidgin.im/pipermail/support/\">argief</a>)<br/>Ons "
-#~ "kan nie help met derdepartyprotokolle of -inproppe nie!<br/> Hierdie lys se "
-#~ "prim?re taal is <b>Engels</b>.  U kan gerus in 'n ander taal skryf, maar "
-#~ "antwoorde sal dalk minder nuttig wees.<br/><br/>"
+#~ "<font size=\"4\">Hulp van ander Pidgin-gebruikers:</font> <a href="
+#~ "\"mailto:support at pidgin.im\">support at pidgin.im</a><br/>Hierdie is 'n "
+#~ "<b>publieke</b> poslys! (<a href=\"http://pidgin.im/pipermail/support/"
+#~ "\">argief</a>)<br/>Ons kan nie help met derdepartyprotokolle of -inproppe "
+#~ "nie!<br/> Hierdie lys se prim?re taal is <b>Engels</b>.  U kan gerus in "
+#~ "'n ander taal skryf, maar antwoorde sal dalk minder nuttig wees.<br/><br/>"
 
-#, c-format
 #~ msgid ""
 #~ "<FONT SIZE=\"4\">IRC Channel:</FONT> #pidgin on irc.freenode.net<BR><BR>"
 #~ msgstr ""
 #~ "<FONT SIZE=\"4\">IRC-kanaal:</FONT> #pidgin op irc.freenode.net<BR><BR>"
 
-#, c-format
 #~ msgid "<FONT SIZE=\"4\">XMPP MUC:</FONT> devel at conference.pidgin.im<BR><BR>"
-#~ msgstr "<FONT SIZE=\"4\">XMPP MUC:</FONT> devel at conference.pidgin.im<BR><BR>"
+#~ msgstr ""
+#~ "<FONT SIZE=\"4\">XMPP MUC:</FONT> devel at conference.pidgin.im<BR><BR>"
 
 #~ msgid "Debugging Information"
 #~ msgstr "Ontfoutinligting"
@@ -21222,7 +15452,6 @@ msgstr "Hierdie inprop is nuttig om XMPP
 #~ "\n"
 #~ "Val terug na verstek van PNG."
 
-#, c-format
 #~ msgid ""
 #~ "Error saving image\n"
 #~ "\n"
@@ -21232,17 +15461,15 @@ msgstr "Hierdie inprop is nuttig om XMPP
 #~ "\n"
 #~ "%s"
 
-#, c-format
 #~ msgid "Failed to open file '%s': %s"
 #~ msgstr "Open van l?er '%s' het misluk: %s"
 
-#, c-format
 #~ msgid ""
 #~ "Failed to load image '%s': reason not known, probably a corrupt image file"
 #~ msgstr ""
-#~ "Kon nie prent '%s' laai nie: rede onbekend, waarskynlik 'n korrupte prentl?er"
+#~ "Kon nie prent '%s' laai nie: rede onbekend, waarskynlik 'n korrupte "
+#~ "prentl?er"
 
-#, c-format
 #~ msgid "_Force 24-hour time format"
 #~ msgstr "_Dwing 24-uur-tydformaat"
 
@@ -21315,9 +15542,6 @@ msgstr "Hierdie inprop is nuttig om XMPP
 #~ msgid "Change _status to:"
 #~ msgstr "Verander _status na:"
 
-#~ msgid "GTK+ Runtime Version"
-#~ msgstr "GTK+-weergawe"
-
 #~ msgid "Calling ... "
 #~ msgstr "Bel tans ... "
 
============================================================
--- po/am.po	0fee63df39e8846aa29da157ba6da0bd372a19c3
+++ po/am.po	a0aad3116be9a2e3f23ddc0ee85acb77ca029dbe
@@ -7,7 +7,7 @@ msgstr ""
 msgstr ""
 "Project-Id-Version: Pidgin 0.60 \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-03-29 00:12-0700\n"
+"POT-Creation-Date: 2010-05-17 20:54-0400\n"
 "PO-Revision-Date: 2003-04-08 09:23:11+EDT\n"
 "Last-Translator: Ge'ez Frontier Foundation <locales at geez.org>\n"
 "Language-Team: Amharic <locales at geez.org>\n"
@@ -1390,8 +1390,6 @@ msgstr "??? ?????"
 msgid "Saved Statuses"
 msgstr "??? ?????"
 
-#. title
-#. optional information
 msgid "Title"
 msgstr "?????"
 
@@ -1702,6 +1700,12 @@ msgstr ""
 msgid "Set User Info"
 msgstr ""
 
+msgid "This protocol does not support setting a public alias."
+msgstr ""
+
+msgid "This protocol does not support fetching the public alias."
+msgstr ""
+
 msgid "Unknown"
 msgstr "?????"
 
@@ -3789,12 +3793,6 @@ msgstr "???"
 msgid "execute"
 msgstr "???"
 
-msgid "Server requires TLS/SSL, but no TLS/SSL support was found."
-msgstr ""
-
-msgid "You require encryption, but no TLS/SSL support was found."
-msgstr ""
-
 msgid "Server requires plaintext authentication over an unencrypted stream"
 msgstr ""
 
@@ -3833,6 +3831,42 @@ msgstr "?IRC ????"
 msgstr "?IRC ????"
 
 #, fuzzy
+msgid "Invalid Encoding"
+msgstr "?????"
+
+msgid "Unsupported Extension"
+msgstr ""
+
+msgid ""
+"Unexpected response from the server.  This may indicate a possible MITM "
+"attack"
+msgstr ""
+
+msgid ""
+"The server does support channel binding, but did not appear to advertise "
+"it.  This indicates a likely MITM attack"
+msgstr ""
+
+#, fuzzy
+msgid "Server does not support channel binding"
+msgstr "??? ?????"
+
+msgid "Unsupported channel binding method"
+msgstr ""
+
+#, fuzzy
+msgid "User not found"
+msgstr "???? ?????"
+
+#, fuzzy
+msgid "Invalid Username Encoding"
+msgstr "????? ??"
+
+#, fuzzy
+msgid "Resource Constraint"
+msgstr "????? ?????"
+
+#, fuzzy
 msgid "Unable to canonicalize username"
 msgstr "??????"
 
@@ -3915,6 +3949,12 @@ msgstr ""
 msgid "Organization Unit"
 msgstr ""
 
+#. title
+#. optional information
+#, fuzzy
+msgid "Job Title"
+msgstr "?????"
+
 msgid "Role"
 msgstr ""
 
@@ -4160,6 +4200,12 @@ msgstr ""
 msgid "Roles:"
 msgstr ""
 
+msgid "Server requires TLS/SSL, but no TLS/SSL support was found."
+msgstr ""
+
+msgid "You require encryption, but no TLS/SSL support was found."
+msgstr ""
+
 #, fuzzy
 msgid "Ping timed out"
 msgstr "????? ?????"
@@ -4167,6 +4213,9 @@ msgstr ""
 msgid "Invalid XMPP ID"
 msgstr ""
 
+msgid "Invalid XMPP ID. Username portion must be set."
+msgstr ""
+
 msgid "Invalid XMPP ID. Domain must be set."
 msgstr ""
 
@@ -4268,7 +4317,6 @@ msgstr ""
 msgid "Not Authorized"
 msgstr ""
 
-#. (reference: "libpurple/request.h")
 msgid "Mood"
 msgstr ""
 
@@ -4292,7 +4340,6 @@ msgstr ""
 msgid "None (To pending)"
 msgstr ""
 
-#. 0
 msgid "None"
 msgstr "???"
 
@@ -4316,6 +4363,12 @@ msgstr "??? ????"
 msgid "Mood Comment"
 msgstr "??? ????"
 
+#. primitive
+#. ID
+#. name - use default
+#. saveable
+#. should be user_settable some day
+#. independent
 msgid "Tune Artist"
 msgstr ""
 
@@ -4502,10 +4555,6 @@ msgstr "????? ?????"
 msgid "Remote Connection Failed"
 msgstr "????? ?????"
 
-#, fuzzy
-msgid "Resource Constraint"
-msgstr "????? ?????"
-
 msgid "Restricted XML"
 msgstr ""
 
@@ -4857,7 +4906,6 @@ msgstr ""
 msgid "Amorous"
 msgstr ""
 
-#. 1
 msgid "Angry"
 msgstr ""
 
@@ -4952,7 +5000,6 @@ msgstr ""
 msgid "Envious"
 msgstr ""
 
-#. 2
 #, fuzzy
 msgid "Excited"
 msgstr "??"
@@ -4971,7 +5018,6 @@ msgstr "????? (_G)"
 msgid "Grieving"
 msgstr "????? (_G)"
 
-#. 3
 #, fuzzy
 msgid "Grumpy"
 msgstr "????? (_G)"
@@ -4980,7 +5026,6 @@ msgstr "???"
 msgid "Guilty"
 msgstr "???"
 
-#. 4
 #, fuzzy
 msgid "Happy"
 msgstr "???? (_Y)"
@@ -4988,7 +5033,6 @@ msgstr ""
 msgid "Hopeful"
 msgstr ""
 
-#. 8
 #, fuzzy
 msgid "Hot"
 msgstr "???? ???? (_H)"
@@ -5028,7 +5072,6 @@ msgstr "????"
 msgid "Intoxicated"
 msgstr "????"
 
-#. 6
 msgid "Invincible"
 msgstr ""
 
@@ -5091,7 +5134,6 @@ msgstr "?????? ????"
 msgid "Restless"
 msgstr "?????? ????"
 
-#. 7
 msgid "Sad"
 msgstr ""
 
@@ -5112,12 +5154,10 @@ msgstr ""
 msgid "Shy"
 msgstr ""
 
-#. 9
 #, fuzzy
 msgid "Sick"
 msgstr "???"
 
-#. 10
 #. Sleepy / Tired
 msgid "Sleepy"
 msgstr ""
@@ -5525,20 +5565,7 @@ msgstr ""
 msgid "Out to Lunch"
 msgstr ""
 
-#. primitive
-#. ID
-#. name - use default
-#. saveable
-#. should be user_settable some day
-#. independent
 #, fuzzy
-msgid "Artist"
-msgstr "?????"
-
-msgid "Album"
-msgstr ""
-
-#, fuzzy
 msgid "Game Title"
 msgstr "?????"
 
@@ -5708,10 +5735,6 @@ msgstr ""
 msgstr ""
 
 #, fuzzy
-msgid "Job Title"
-msgstr "?????"
-
-#, fuzzy
 msgid "Company"
 msgstr "????"
 
@@ -5982,28 +6005,6 @@ msgstr ""
 msgid "The username specified is invalid."
 msgstr ""
 
-#. 5
-#, fuzzy
-msgid "In Love"
-msgstr "???"
-
-#. show current mood
-#, fuzzy
-msgid "Current Mood"
-msgstr "??? ????? ??"
-
-#. add all moods to list
-#, fuzzy
-msgid "New Mood"
-msgstr "???? ?????"
-
-#, fuzzy
-msgid "Change your Mood"
-msgstr "????? ??? ???"
-
-msgid "How do you feel right now?"
-msgstr ""
-
 msgid "The PIN you entered is invalid."
 msgstr ""
 
@@ -6078,11 +6079,6 @@ msgstr ""
 "\n"
 "<b>??? ???</b>"
 
-#. display / change mood
-#, fuzzy
-msgid "Change Mood..."
-msgstr "????? ??? ???"
-
 #. display / change profile
 #, fuzzy
 msgid "Change Profile..."
@@ -6350,6 +6346,10 @@ msgstr ""
 msgstr ""
 
 #, fuzzy
+msgid "In Love"
+msgstr "???"
+
+#, fuzzy
 msgid "Pending"
 msgstr "??"
 
@@ -6759,10 +6759,6 @@ msgstr "??? ????? ??
 msgid "Incorrect password"
 msgstr "??? ????? ??"
 
-#, fuzzy
-msgid "User not found"
-msgstr "???? ?????"
-
 msgid "Account has been disabled"
 msgstr ""
 
@@ -7008,6 +7004,10 @@ msgstr ""
 msgid "AOL does not allow your screen name to authenticate here"
 msgstr ""
 
+#, fuzzy, c-format
+msgid "Error requesting %s"
+msgstr " ??????? ????? ??"
+
 #, fuzzy
 msgid "Could not join chat room"
 msgstr "????? ?????"
@@ -8375,7 +8375,12 @@ msgstr ""
 msgid "Admin"
 msgstr ""
 
+#. XXX: Should this be "Topic"?
 #, fuzzy
+msgid "Room Title"
+msgstr "?????"
+
+#, fuzzy
 msgid "Notice"
 msgstr "???"
 
@@ -10318,10 +10323,6 @@ msgstr "?Jabber ???? %s"
 msgid "Yahoo! Protocol Plugin"
 msgstr "?Jabber ???? %s"
 
-#, fuzzy
-msgid "Pager server"
-msgstr "????? ???"
-
 msgid "Pager port"
 msgstr ""
 
@@ -10346,12 +10347,6 @@ msgstr "??? ???"
 msgid "Chat room list URL"
 msgstr "??? ???"
 
-msgid "Yahoo Chat server"
-msgstr ""
-
-msgid "Yahoo Chat port"
-msgstr ""
-
 #, fuzzy
 msgid "Yahoo JAPAN ID..."
 msgstr "???..."
@@ -10413,6 +10408,12 @@ msgstr ""
 "this."
 msgstr ""
 
+#. indicates a lock due to logging in too frequently
+msgid ""
+"Account locked: You have been logging in too frequently.  Wait a few minutes "
+"before trying to connect again.  Logging into the Yahoo! website may help."
+msgstr ""
+
 #. username or password missing
 #, fuzzy
 msgid "Username or password missing"
@@ -10484,6 +10485,15 @@ msgstr "??????"
 msgstr "??????"
 
 #, fuzzy
+msgid "Unable to connect: The server returned an empty response."
+msgstr "??????"
+
+msgid ""
+"Unable to connect: The server's response did not contain the necessary "
+"information"
+msgstr ""
+
+#, fuzzy
 msgid "Not at Home"
 msgstr "???? ???"
 
@@ -10866,6 +10876,10 @@ msgstr "??"
 #. *
 #. * A wrapper for purple_request_action() that uses Accept and Cancel buttons.
 #.
+#. *
+#. * A wrapper for purple_request_action_with_icon() that uses Accept and Cancel
+#. * buttons.
+#.
 msgid "_Accept"
 msgstr ""
 
@@ -11105,13 +11119,6 @@ msgstr ""
 msgid "Pidgin Internet Messenger"
 msgstr ""
 
-#, fuzzy
-msgid "Orientation"
-msgstr "??? ????"
-
-msgid "The orientation of the tray."
-msgstr ""
-
 #. Build the login options frame.
 msgid "Login Options"
 msgstr "?????? ??? ?????"
@@ -12385,6 +12392,10 @@ msgstr "??????"
 msgid "Arabic"
 msgstr "??????"
 
+#, fuzzy
+msgid "Assamese"
+msgstr "?????"
+
 msgid "Belarusian Latin"
 msgstr ""
 
@@ -12394,6 +12405,9 @@ msgstr ""
 msgid "Bengali"
 msgstr ""
 
+msgid "Bengali-India"
+msgstr ""
+
 msgid "Bosnian"
 msgstr ""
 
@@ -12518,6 +12532,10 @@ msgstr ""
 msgid "Macedonian"
 msgstr ""
 
+#, fuzzy
+msgid "Malayalam"
+msgstr "???"
+
 msgid "Mongolian"
 msgstr ""
 
@@ -15351,10 +15369,20 @@ msgstr ""
 msgstr ""
 
 #, c-format
-msgid "_Force 24-hour time format"
+msgid "_Force timestamp format:"
 msgstr ""
 
 #, fuzzy
+msgid "Use system default"
+msgstr "???"
+
+msgid "12 hour time format"
+msgstr ""
+
+msgid "24 hour time format"
+msgstr ""
+
+#, fuzzy
 msgid "Show dates in..."
 msgstr "???? ????? ???"
 
@@ -15560,7 +15588,145 @@ msgstr ""
 msgid "This plugin is useful for debugging XMPP servers or clients."
 msgstr ""
 
+msgid ""
+"$(^Name) is released under the GNU General Public License (GPL). The license "
+"is provided here for information purposes only. $_CLICK"
+msgstr ""
+
+msgid "A multi-platform GUI toolkit, used by Pidgin"
+msgstr ""
+
+msgid ""
+"An instance of Pidgin is currently running.  Please exit Pidgin and try "
+"again."
+msgstr ""
+
+msgid "Core Pidgin files and dlls"
+msgstr ""
+
+msgid "Create a Start Menu entry for Pidgin"
+msgstr ""
+
+msgid "Create a shortcut to Pidgin on the Desktop"
+msgstr ""
+
+msgid "Debug Symbols (for reporting crashes)"
+msgstr ""
+
 #, fuzzy
+msgid "Desktop"
+msgstr "???"
+
+msgid ""
+"Error Downloading the GTK+ Runtime ($R2).$\\rThis is required for Pidgin to "
+"function; if retrying fails, you may need to use the 'Offline Installer' "
+"from http://pidgin.im/download/windows/ ."
+msgstr ""
+
+msgid ""
+"Error Installing Debug Symbols ($R2).$\\rIf retrying fails, you may need to "
+"use the 'Offline Installer' from http://pidgin.im/download/windows/ ."
+msgstr ""
+
+msgid "GTK+ Runtime (required if not present)"
+msgstr ""
+
+#, fuzzy
+msgid "Localizations"
+msgstr "????"
+
+#. License Page
+msgid "Next >"
+msgstr ""
+
+#. Components Page
+msgid "Pidgin Instant Messaging Client (required)"
+msgstr ""
+
+#. GTK+ Section Prompts
+msgid ""
+"Pidgin requires a compatible GTK+ Runtime (which doesn't appear to be "
+"already present).$\\rAre you sure you want to skip installing the GTK+ "
+"Runtime?"
+msgstr ""
+
+#, fuzzy
+msgid "Shortcuts"
+msgstr "?????"
+
+msgid "Shortcuts for starting Pidgin"
+msgstr ""
+
+#. Spellcheck Section Prompts
+msgid "Spellchecking Support"
+msgstr ""
+
+#, fuzzy
+msgid "Start Menu"
+msgstr "???"
+
+msgid ""
+"Support for Spellchecking.  (Internet connection required for installation)"
+msgstr ""
+
+msgid "The installer is already running."
+msgstr ""
+
+#. Uninstall Section Prompts
+msgid ""
+"The uninstaller could not find registry entries for Pidgin.$\\rIt is likely "
+"that another user installed this application."
+msgstr ""
+
+#. URL Handler section
+msgid "URI Handlers"
+msgstr ""
+
+#. Pidgin Section Prompts and Texts
+msgid ""
+"Unable to uninstall the currently installed version of Pidgin. The new "
+"version will be installed without removing the currently installed version."
+msgstr ""
+
+#. Installer Finish Page
+msgid "Visit the Pidgin Web Page"
+msgstr ""
+
+msgid "You do not have permission to uninstall this application."
+msgstr ""
+
+msgid "spellcheck_faq"
+msgstr ""
+
+#, fuzzy
+#~ msgid "Artist"
+#~ msgstr "?????"
+
+#, fuzzy
+#~ msgid "Current Mood"
+#~ msgstr "??? ????? ??"
+
+#, fuzzy
+#~ msgid "New Mood"
+#~ msgstr "???? ?????"
+
+#, fuzzy
+#~ msgid "Change your Mood"
+#~ msgstr "????? ??? ???"
+
+#, fuzzy
+#~ msgid "Change Mood..."
+#~ msgstr "????? ??? ???"
+
+#, fuzzy
+#~ msgid "Pager server"
+#~ msgstr "????? ???"
+
+#, fuzzy
+#~ msgid "Orientation"
+#~ msgstr "??? ????"
+
+#, fuzzy
 #~ msgid "Error creating conference."
 #~ msgstr "??????"
 
============================================================
--- po/ar.po	463733dddf07e35f296540bca8a23bc842d508d4
+++ po/ar.po	d5f5436094cada7f3ababd77c820021f3a68d711
@@ -11,7 +11,7 @@ msgstr ""
 msgstr ""
 "Project-Id-Version: ar\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-03-29 00:12-0700\n"
+"POT-Creation-Date: 2010-05-17 20:52-0400\n"
 "PO-Revision-Date: 2008-11-01 17:41+0200\n"
 "Last-Translator: Khaled Hosny <khaledhosny at eglug.org>\n"
 "Language-Team: Arabic <doc at arabeyes.org>\n"
@@ -1340,8 +1340,6 @@ msgstr "??????? ????????"
 msgid "Saved Statuses"
 msgstr "??????? ????????"
 
-#. title
-#. optional information
 msgid "Title"
 msgstr "???????"
 
@@ -1628,6 +1626,14 @@ msgstr "???? ??????? ????
 msgid "Set User Info"
 msgstr "???? ??????? ????????"
 
+#, fuzzy
+msgid "This protocol does not support setting a public alias."
+msgstr "??? ?????????? ?????? ??? ???????."
+
+#, fuzzy
+msgid "This protocol does not support fetching the public alias."
+msgstr "??? ?????????? ?????? ??? ???????."
+
 msgid "Unknown"
 msgstr "?????"
 
@@ -3791,14 +3797,6 @@ msgstr "?????"
 msgid "execute"
 msgstr "?????"
 
-#, fuzzy
-msgid "Server requires TLS/SSL, but no TLS/SSL support was found."
-msgstr "????? ??????? TLS/SSL ??????. ?? ???? ??? TLS/SSL."
-
-#, fuzzy
-msgid "You require encryption, but no TLS/SSL support was found."
-msgstr "???? ?????? ??? ?? ???? ??? TLS/SSL."
-
 msgid "Server requires plaintext authentication over an unencrypted stream"
 msgstr "????? ??????? ??????? ????? ?????? ??? ???? ??? ??????"
 
@@ -3839,6 +3837,42 @@ msgstr "??? ?? SASL"
 msgstr "??? ?? SASL"
 
 #, fuzzy
+msgid "Invalid Encoding"
+msgstr "???? ??? ??? ?????"
+
+#, fuzzy
+msgid "Unsupported Extension"
+msgstr "?????? ??? ??????"
+
+msgid ""
+"Unexpected response from the server.  This may indicate a possible MITM "
+"attack"
+msgstr ""
+
+msgid ""
+"The server does support channel binding, but did not appear to advertise "
+"it.  This indicates a likely MITM attack"
+msgstr ""
+
+#, fuzzy
+msgid "Server does not support channel binding"
+msgstr "?? ?????? ??????? ?? ????? ??????? ??????"
+
+#, fuzzy
+msgid "Unsupported channel binding method"
+msgstr "????? ??? ?????"
+
+msgid "User not found"
+msgstr "?? ????? ??? ????????"
+
+#, fuzzy
+msgid "Invalid Username Encoding"
+msgstr "??? ?????? ??? ????"
+
+msgid "Resource Constraint"
+msgstr "??????? ?? ??????"
+
+#, fuzzy
 msgid "Unable to canonicalize username"
 msgstr "????? ???????"
 
@@ -3927,6 +3961,11 @@ msgstr "?????? ?????????"
 msgid "Organization Unit"
 msgstr "?????? ?????????"
 
+#. title
+#. optional information
+msgid "Job Title"
+msgstr "??????? ???????"
+
 msgid "Role"
 msgstr "??????"
 
@@ -4152,12 +4191,24 @@ msgstr "??????"
 msgstr "??????"
 
 #, fuzzy
+msgid "Server requires TLS/SSL, but no TLS/SSL support was found."
+msgstr "????? ??????? TLS/SSL ??????. ?? ???? ??? TLS/SSL."
+
+#, fuzzy
+msgid "You require encryption, but no TLS/SSL support was found."
+msgstr "???? ?????? ??? ?? ???? ??? TLS/SSL."
+
+#, fuzzy
 msgid "Ping timed out"
 msgstr "???? ?????"
 
 msgid "Invalid XMPP ID"
 msgstr "???? XMPP ??? ?????"
 
+#, fuzzy
+msgid "Invalid XMPP ID. Username portion must be set."
+msgstr "???? XMPP ??? ?????. ??? ????? ??????."
+
 msgid "Invalid XMPP ID. Domain must be set."
 msgstr "???? XMPP ??? ?????. ??? ????? ??????."
 
@@ -4255,7 +4306,6 @@ msgstr "??? ????"
 msgid "Not Authorized"
 msgstr "??? ????"
 
-#. (reference: "libpurple/request.h")
 msgid "Mood"
 msgstr "??????"
 
@@ -4277,7 +4327,6 @@ msgstr "????? (??? ?????)"
 msgid "None (To pending)"
 msgstr "????? (??? ?????)"
 
-#. 0
 msgid "None"
 msgstr "?? ???"
 
@@ -4299,6 +4348,12 @@ msgstr "????? ??????"
 msgid "Mood Comment"
 msgstr "????? ??????"
 
+#. primitive
+#. ID
+#. name - use default
+#. saveable
+#. should be user_settable some day
+#. independent
 msgid "Tune Artist"
 msgstr "??? ?????????"
 
@@ -4469,9 +4524,6 @@ msgstr "??? ??????? ?????
 msgid "Remote Connection Failed"
 msgstr "??? ??????? ??????"
 
-msgid "Resource Constraint"
-msgstr "??????? ?? ??????"
-
 msgid "Restricted XML"
 msgstr "XML ?????"
 
@@ -4842,7 +4894,6 @@ msgstr "????"
 msgid "Amorous"
 msgstr "????"
 
-#. 1
 msgid "Angry"
 msgstr "????"
 
@@ -4940,7 +4991,6 @@ msgstr "???"
 msgid "Envious"
 msgstr "???"
 
-#. 2
 msgid "Excited"
 msgstr "??????"
 
@@ -4959,7 +5009,6 @@ msgstr "???? ?????..."
 msgid "Grieving"
 msgstr "???? ?????..."
 
-#. 3
 #, fuzzy
 msgid "Grumpy"
 msgstr "????????"
@@ -4968,14 +5017,12 @@ msgstr "???????"
 msgid "Guilty"
 msgstr "???????"
 
-#. 4
 msgid "Happy"
 msgstr "????"
 
 msgid "Hopeful"
 msgstr ""
 
-#. 8
 #, fuzzy
 msgid "Hot"
 msgstr "?_???:"
@@ -5016,7 +5063,6 @@ msgstr "????"
 msgid "Intoxicated"
 msgstr "????"
 
-#. 6
 msgid "Invincible"
 msgstr "????"
 
@@ -5080,7 +5126,6 @@ msgstr "????"
 msgid "Restless"
 msgstr "????"
 
-#. 7
 msgid "Sad"
 msgstr "????"
 
@@ -5101,12 +5146,10 @@ msgstr ""
 msgid "Shy"
 msgstr ""
 
-#. 9
 #, fuzzy
 msgid "Sick"
 msgstr "??????"
 
-#. 10
 #. Sleepy / Tired
 msgid "Sleepy"
 msgstr "?????"
@@ -5505,18 +5548,6 @@ msgstr "???? ??????"
 msgid "Out to Lunch"
 msgstr "???? ??????"
 
-#. primitive
-#. ID
-#. name - use default
-#. saveable
-#. should be user_settable some day
-#. independent
-msgid "Artist"
-msgstr "????????"
-
-msgid "Album"
-msgstr "?????"
-
 #, fuzzy
 msgid "Game Title"
 msgstr "????? ?????"
@@ -5668,9 +5699,6 @@ msgstr "?????"
 msgid "Work"
 msgstr "?????"
 
-msgid "Job Title"
-msgstr "??????? ???????"
-
 msgid "Company"
 msgstr "??????"
 
@@ -5967,29 +5995,7 @@ msgstr "??? ???????? ????
 msgid "The username specified is invalid."
 msgstr "??? ???????? ?????? ??? ????."
 
-#. 5
-msgid "In Love"
-msgstr "???? ?? ????"
-
-#. show current mood
 #, fuzzy
-msgid "Current Mood"
-msgstr "????? ??????"
-
-#. add all moods to list
-#, fuzzy
-msgid "New Mood"
-msgstr "???? ????????"
-
-#, fuzzy
-msgid "Change your Mood"
-msgstr "???? ???? ????"
-
-#, fuzzy
-msgid "How do you feel right now?"
-msgstr "??? ????? ??????"
-
-#, fuzzy
 msgid "The PIN you entered is invalid."
 msgstr "????? SecurID ?????? ??? ????."
 
@@ -6064,11 +6070,6 @@ msgstr "?? %s"
 msgid "About"
 msgstr "?? %s"
 
-#. display / change mood
-#, fuzzy
-msgid "Change Mood..."
-msgstr "???? ???? ????..."
-
 #. display / change profile
 #, fuzzy
 msgid "Change Profile..."
@@ -6342,6 +6343,9 @@ msgstr ""
 msgid "A connection error occurred to MXit. (read stage 0x06)"
 msgstr ""
 
+msgid "In Love"
+msgstr "???? ?? ????"
+
 #, fuzzy
 msgid "Pending"
 msgstr "?????"
@@ -6751,9 +6755,6 @@ msgstr "???? ???? ??? ???? msgid "Incorrect password"
 msgstr "???? ???? ??? ?????"
 
-msgid "User not found"
-msgstr "?? ????? ??? ????????"
-
 msgid "Account has been disabled"
 msgstr "?????? ??????"
 
@@ -7001,6 +7002,10 @@ msgstr ""
 msgid "AOL does not allow your screen name to authenticate here"
 msgstr ""
 
+#, fuzzy, c-format
+msgid "Error requesting %s"
+msgstr "??? ????? ??????? %s"
+
 msgid "Could not join chat room"
 msgstr "????? ???????? ????? ???????"
 
@@ -8395,7 +8400,12 @@ msgstr "Adium"
 msgid "Admin"
 msgstr "Adium"
 
+#. XXX: Should this be "Topic"?
 #, fuzzy
+msgid "Room Title"
+msgstr "????? ?????"
+
+#, fuzzy
 msgid "Notice"
 msgstr "??????"
 
@@ -10351,9 +10361,6 @@ msgstr "????? ???????? ??
 msgid "Yahoo! Protocol Plugin"
 msgstr "????? ???????? ????"
 
-msgid "Pager server"
-msgstr "????? ?????????"
-
 msgid "Pager port"
 msgstr "???? ?????????"
 
@@ -10375,12 +10382,6 @@ msgstr "???? ????? ???? ?? msgid "Chat room list URL"
 msgstr "???? ????? ???? ????????."
 
-msgid "Yahoo Chat server"
-msgstr "????? ????? ????"
-
-msgid "Yahoo Chat port"
-msgstr "???? ????? ????"
-
 #, fuzzy
 msgid "Yahoo JAPAN ID..."
 msgstr "????? ????..."
@@ -10445,6 +10446,13 @@ msgstr "??? ????? ??? %d. ?? "this."
 msgstr "??? ????? ??? %d. ?????? ?? ???? ?????! ??? ???? ?? ???? ??? ???????."
 
+#. indicates a lock due to logging in too frequently
+#, fuzzy
+msgid ""
+"Account locked: You have been logging in too frequently.  Wait a few minutes "
+"before trying to connect again.  Logging into the Yahoo! website may help."
+msgstr "??? ????? ??? %d. ?????? ?? ???? ?????! ??? ???? ?? ???? ??? ???????."
+
 #. username or password missing
 #, fuzzy
 msgid "Username or password missing"
@@ -10524,6 +10532,15 @@ msgstr ""
 "?????? ??????? ????????:\n"
 "%s"
 
+#, fuzzy
+msgid "Unable to connect: The server returned an empty response."
+msgstr "????? ??????? ????????. ?? ???? ???? ????? ??????? ???? ??? ??????? ??."
+
+msgid ""
+"Unable to connect: The server's response did not contain the necessary "
+"information"
+msgstr ""
+
 msgid "Not at Home"
 msgstr "??? ???????"
 
@@ -10909,6 +10926,10 @@ msgstr "_??"
 #. *
 #. * A wrapper for purple_request_action() that uses Accept and Cancel buttons.
 #.
+#. *
+#. * A wrapper for purple_request_action_with_icon() that uses Accept and Cancel
+#. * buttons.
+#.
 msgid "_Accept"
 msgstr "?_???"
 
@@ -11168,12 +11189,6 @@ msgstr "????? ???????? ??
 msgid "Pidgin Internet Messenger"
 msgstr "????? ???????? ???????"
 
-msgid "Orientation"
-msgstr "????????"
-
-msgid "The orientation of the tray."
-msgstr "????? ?????."
-
 #. Build the login options frame.
 msgid "Login Options"
 msgstr "?????? ??????"
@@ -12379,6 +12394,10 @@ msgstr "?????"
 msgid "Arabic"
 msgstr "?????"
 
+#, fuzzy
+msgid "Assamese"
+msgstr "????"
+
 msgid "Belarusian Latin"
 msgstr "???????? (???????)"
 
@@ -12388,6 +12407,10 @@ msgstr "???????"
 msgid "Bengali"
 msgstr "???????"
 
+#, fuzzy
+msgid "Bengali-India"
+msgstr "???????"
+
 msgid "Bosnian"
 msgstr "??????"
 
@@ -12505,6 +12528,10 @@ msgstr "???????"
 msgstr "???????"
 
 #, fuzzy
+msgid "Malayalam"
+msgstr "???"
+
+#, fuzzy
 msgid "Mongolian"
 msgstr "???????"
 
@@ -15306,10 +15333,22 @@ msgstr "?????? ????? ????
 msgid "Timestamp Format Options"
 msgstr "?????? ????? ?????? ??????"
 
-#, c-format
-msgid "_Force 24-hour time format"
+#, fuzzy, c-format
+msgid "_Force timestamp format:"
 msgstr "?_??? ??? ????? 24 ???? ?????"
 
+#, fuzzy
+msgid "Use system default"
+msgstr "????? ??? ??????"
+
+#, fuzzy
+msgid "12 hour time format"
+msgstr "?_??? ??? ????? 24 ???? ?????"
+
+#, fuzzy
+msgid "24 hour time format"
+msgstr "?_??? ??? ????? 24 ???? ?????"
+
 msgid "Show dates in..."
 msgstr "???? ???????? ??..."
 
@@ -15519,7 +15558,162 @@ msgstr "???? ??? ??????? ? msgid "This plugin is useful for debugging XMPP servers or clients."
 msgstr "???? ??? ??????? ?? ????? ?????? ? ????? XMPXMPPP."
 
+msgid ""
+"$(^Name) is released under the GNU General Public License (GPL). The license "
+"is provided here for information purposes only. $_CLICK"
+msgstr ""
+
+msgid "A multi-platform GUI toolkit, used by Pidgin"
+msgstr ""
+
+msgid ""
+"An instance of Pidgin is currently running.  Please exit Pidgin and try "
+"again."
+msgstr ""
+
+msgid "Core Pidgin files and dlls"
+msgstr ""
+
+msgid "Create a Start Menu entry for Pidgin"
+msgstr ""
+
+msgid "Create a shortcut to Pidgin on the Desktop"
+msgstr ""
+
+msgid "Debug Symbols (for reporting crashes)"
+msgstr ""
+
 #, fuzzy
+msgid "Desktop"
+msgstr "????? ??? ??????"
+
+msgid ""
+"Error Downloading the GTK+ Runtime ($R2).$\\rThis is required for Pidgin to "
+"function; if retrying fails, you may need to use the 'Offline Installer' "
+"from http://pidgin.im/download/windows/ ."
+msgstr ""
+
+msgid ""
+"Error Installing Debug Symbols ($R2).$\\rIf retrying fails, you may need to "
+"use the 'Offline Installer' from http://pidgin.im/download/windows/ ."
+msgstr ""
+
+#, fuzzy
+msgid "GTK+ Runtime (required if not present)"
+msgstr "???? ???+"
+
+#, fuzzy
+msgid "Localizations"
+msgstr "??????"
+
+#. License Page
+msgid "Next >"
+msgstr ""
+
+#. Components Page
+#, fuzzy
+msgid "Pidgin Instant Messaging Client (required)"
+msgstr "????? ???????? ???????"
+
+#. GTK+ Section Prompts
+msgid ""
+"Pidgin requires a compatible GTK+ Runtime (which doesn't appear to be "
+"already present).$\\rAre you sure you want to skip installing the GTK+ "
+"Runtime?"
+msgstr ""
+
+#, fuzzy
+msgid "Shortcuts"
+msgstr "??????"
+
+msgid "Shortcuts for starting Pidgin"
+msgstr ""
+
+#. Spellcheck Section Prompts
+msgid "Spellchecking Support"
+msgstr ""
+
+#, fuzzy
+msgid "Start Menu"
+msgstr "??? ???????"
+
+msgid ""
+"Support for Spellchecking.  (Internet connection required for installation)"
+msgstr ""
+
+#, fuzzy
+msgid "The installer is already running."
+msgstr "??? ??????? ??? ?????? ???????"
+
+#. Uninstall Section Prompts
+msgid ""
+"The uninstaller could not find registry entries for Pidgin.$\\rIt is likely "
+"that another user installed this application."
+msgstr ""
+
+#. URL Handler section
+#, fuzzy
+msgid "URI Handlers"
+msgstr "????? ?????? myim"
+
+#. Pidgin Section Prompts and Texts
+msgid ""
+"Unable to uninstall the currently installed version of Pidgin. The new "
+"version will be installed without removing the currently installed version."
+msgstr ""
+
+#. Installer Finish Page
+msgid "Visit the Pidgin Web Page"
+msgstr ""
+
+msgid "You do not have permission to uninstall this application."
+msgstr ""
+
+msgid "spellcheck_faq"
+msgstr ""
+
+#~ msgid "Artist"
+#~ msgstr "????????"
+
+#~ msgid "Album"
+#~ msgstr "?????"
+
+#, fuzzy
+#~ msgid "Current Mood"
+#~ msgstr "????? ??????"
+
+#, fuzzy
+#~ msgid "New Mood"
+#~ msgstr "???? ????????"
+
+#, fuzzy
+#~ msgid "Change your Mood"
+#~ msgstr "???? ???? ????"
+
+#, fuzzy
+#~ msgid "How do you feel right now?"
+#~ msgstr "??? ????? ??????"
+
+#, fuzzy
+#~ msgid "Change Mood..."
+#~ msgstr "???? ???? ????..."
+
+#~ msgid "Pager server"
+#~ msgstr "????? ?????????"
+
+#~ msgid "Yahoo Chat server"
+#~ msgstr "????? ????? ????"
+
+#~ msgid "Yahoo Chat port"
+#~ msgstr "???? ????? ????"
+
+#~ msgid "Orientation"
+#~ msgstr "????????"
+
+#~ msgid "The orientation of the tray."
+#~ msgstr "????? ?????."
+
+#, fuzzy
 #~ msgid "Error creating conference."
 #~ msgstr "??? ?? ????? ???????"
 
@@ -15679,9 +15873,6 @@ msgstr "???? ??? ??????? ? #~ msgid "_User:"
 #~ msgstr "_??????:"
 
-#~ msgid "GTK+ Runtime Version"
-#~ msgstr "???? ???+"
-
 #, fuzzy
 #~ msgid "Calling ... "
 #~ msgstr "???? ??????..."
============================================================
--- po/as.po	da39f387ec9cde2f3a59c0c0505924e8bcb483cc
+++ po/as.po	aee5e5d196de57f9fcfbf899a7e51e33ae8383b1
@@ -9,7 +9,7 @@ msgstr ""
 msgstr ""
 "Project-Id-Version: el 6\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-03-29 14:40+0530\n"
+"POT-Creation-Date: 2010-05-17 20:54-0400\n"
 "PO-Revision-Date: 2010-04-16 12:58+0530\n"
 "Last-Translator: Amitakhya Phukan <aphukan at fedoraproject.org>\n"
 "Language-Team: American English <fedora-trans-as at redhat.com>\n"
@@ -21,17 +21,13 @@ msgstr ""
 
 #. Translators may want to transliterate the name.
 #. It is not to be translated.
-#: ../finch/finch.c:66 ../finch/finch.c:318 ../finch/finch.c:347
-#: ../finch/finch.c:435
 msgid "Finch"
 msgstr "Finch"
 
-#: ../finch/finch.c:230
 #, c-format
 msgid "%s. Try `%s -h' for more information.\n"
 msgstr "%s ? ???? ?????? ???? `%s   help' ?????? ???\n"
 
-#: ../finch/finch.c:232
 #, c-format
 msgid ""
 "%s\n"
@@ -52,287 +48,115 @@ msgstr ""
 "   n,   nologin       don't automatically login\n"
 "   v,   version       display the current version and exit\n"
 
-#: ../finch/finch.c:345 ../pidgin/gtkmain.c:821
 #, 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 ?????? %s ? ??? %s ? ?????? ????????? ????????? ?????????? ???? ??? "
-"?????? "
-"???? ? ??????? ??? ??????? ???? ????????? ??? ????? ?????????? ??? ? ?????? "
-"????????? ???? "
+"%s ?????? %s ? ??? %s ? ?????? ????????? ????????? ?????????? ???? ??? ?????? ???? "
+"? ??????? ??? ??????? ???? ????????? ??? ????? ?????????? ??? ? ?????? ????????? ???? "
 "http://developer.pidgin.im ????????? ??? ?"
 
 #. the user did not fill in the captcha
-#: ../finch/gntaccount.c:128 ../finch/gntaccount.c:507 ../finch/gntblist.c:646
-#: ../finch/gntblist.c:813 ../finch/gntplugin.c:198 ../finch/gntplugin.c:246
-#: ../finch/gntrequest.c:390 ../finch/gntstatus.c:303 ../finch/gntstatus.c:312
-#: ../finch/plugins/gntclipboard.c:115 ../finch/plugins/gntclipboard.c:121
-#: ../finch/plugins/gntclipboard.c:128
-#: ../libpurple/protocols/jabber/buddy.c:1919
-#: ../libpurple/protocols/jabber/chat.c:761
-#: ../libpurple/protocols/jabber/chat.c:772
-#: ../libpurple/protocols/jabber/jabber.c:2111
-#: ../libpurple/protocols/mxit/login.c:518
-#: ../libpurple/protocols/mxit/protocol.c:2020
-#: ../libpurple/protocols/qq/qq_process.c:91
-#: ../libpurple/protocols/silc/ops.c:77 ../libpurple/protocols/silc/ops.c:1462
-#: ../libpurple/protocols/silc10/ops.c:1451
-#: ../pidgin/plugins/disco/xmppdisco.c:514
-#: ../pidgin/plugins/disco/xmppdisco.c:519
 msgid "Error"
 msgstr "??????"
 
-#: ../finch/gntaccount.c:128
 msgid "Account was not added"
 msgstr "????? ??? ??? ???"
 
-#: ../finch/gntaccount.c:129
 msgid "Username of an account must be non-empty."
 msgstr "?????? ???????? ????????????? ??? ????? ??? ????? ?"
 
-#: ../finch/gntaccount.c:459
 msgid "New mail notifications"
 msgstr "???? ??????? ?????????"
 
-#: ../finch/gntaccount.c:469
 msgid "Remember password"
 msgstr "????????? ??? ?????"
 
-#: ../finch/gntaccount.c:508
 msgid "There are no protocol plugins installed."
 msgstr "???? ???? ???? ????? ?? ???????? ??? ??? ?"
 
-#: ../finch/gntaccount.c:509
 msgid "(You probably forgot to 'make install'.)"
 msgstr "(??????? 'make install' ??? ??? ?)"
 
-#: ../finch/gntaccount.c:519 ../finch/gntconn.c:138
-#: ../pidgin/gtkaccount.c:1506 ../pidgin/gtkblist.c:5038
 msgid "Modify Account"
 msgstr "????? ???????? ???"
 
-#: ../finch/gntaccount.c:519
 msgid "New Account"
 msgstr "???? ?????"
 
-#: ../finch/gntaccount.c:545 ../pidgin/gtkft.c:676
 msgid "Protocol:"
 msgstr "???? ????:"
 
-#: ../finch/gntaccount.c:553
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:294
 msgid "Username:"
 msgstr "????????????? ???:"
 
-#: ../finch/gntaccount.c:566
 msgid "Password:"
 msgstr "?????????:"
 
-#: ../finch/gntaccount.c:576
 msgid "Alias:"
 msgstr "?????:"
 
 #. Register checkbox
-#: ../finch/gntaccount.c:587
 msgid "Create this account on the server"
 msgstr "????? ?? ??????? ??????? ?'?"
 
 #. Cancel button
 #. Cancel
-#: ../finch/gntaccount.c:603 ../finch/gntaccount.c:667
-#: ../finch/gntaccount.c:963 ../finch/gntblist.c:696 ../finch/gntblist.c:802
-#: ../finch/gntblist.c:850 ../finch/gntblist.c:1204 ../finch/gntblist.c:1443
-#: ../finch/gntblist.c:1577 ../finch/gntblist.c:2753 ../finch/gntblist.c:2804
-#: ../finch/gntblist.c:2878 ../finch/gntblist.c:2940 ../finch/gntcertmgr.c:91
-#: ../finch/gntplugin.c:534 ../finch/gntpounce.c:473 ../finch/gntpounce.c:681
-#: ../finch/gntprefs.c:266 ../finch/gntsound.c:1065 ../finch/gntstatus.c:147
-#: ../finch/gntstatus.c:487 ../finch/gntstatus.c:612
-#: ../finch/plugins/gnthistory.c:182 ../libpurple/account.c:1172
-#: ../libpurple/account.c:1514 ../libpurple/account.c:1549
-#: ../libpurple/conversation.c:1293 ../libpurple/conversation.c:2120
-#: ../libpurple/plugins/buddynote.c:51 ../libpurple/protocols/gg/gg.c:473
-#: ../libpurple/protocols/gg/gg.c:615 ../libpurple/protocols/gg/gg.c:744
-#: ../libpurple/protocols/gg/gg.c:821
-#: ../libpurple/protocols/jabber/buddy.c:676
-#: ../libpurple/protocols/jabber/buddy.c:2316
-#: ../libpurple/protocols/jabber/buddy.c:2352
-#: ../libpurple/protocols/jabber/chat.c:871
-#: ../libpurple/protocols/jabber/jabber.c:1327
-#: ../libpurple/protocols/jabber/jabber.c:1338
-#: ../libpurple/protocols/jabber/jabber.c:2309
-#: ../libpurple/protocols/jabber/jabber.c:3135
-#: ../libpurple/protocols/jabber/si.c:1546
-#: ../libpurple/protocols/jabber/usermood.c:226
-#: ../libpurple/protocols/jabber/usernick.c:83
-#: ../libpurple/protocols/jabber/xdata.c:404
-#: ../libpurple/protocols/msn/msn.c:361 ../libpurple/protocols/msn/msn.c:379
-#: ../libpurple/protocols/msn/msn.c:396 ../libpurple/protocols/msn/msn.c:413
-#: ../libpurple/protocols/msn/msn.c:434 ../libpurple/protocols/msnp9/msn.c:303
-#: ../libpurple/protocols/msnp9/msn.c:320
-#: ../libpurple/protocols/msnp9/msn.c:337
-#: ../libpurple/protocols/msnp9/msn.c:354
-#: ../libpurple/protocols/msnp9/msn.c:375
-#: ../libpurple/protocols/mxit/actions.c:117
-#: ../libpurple/protocols/mxit/actions.c:359
-#: ../libpurple/protocols/mxit/login.c:360
-#: ../libpurple/protocols/mxit/login.c:684
-#: ../libpurple/protocols/myspace/user.c:824
-#: ../libpurple/protocols/myspace/user.c:885
-#: ../libpurple/protocols/oscar/oscar.c:6656
-#: ../libpurple/protocols/oscar/peer.c:1064
-#: ../libpurple/protocols/qq/buddy_info.c:443
-#: ../libpurple/protocols/qq/buddy_opt.c:333
-#: ../libpurple/protocols/qq/buddy_opt.c:628
-#: ../libpurple/protocols/qq/buddy_opt.c:677
-#: ../libpurple/protocols/qq/buddy_opt.c:1145
-#: ../libpurple/protocols/qq/group.c:112
-#: ../libpurple/protocols/qq/group_join.c:151
-#: ../libpurple/protocols/qq/group_join.c:336
-#: ../libpurple/protocols/qq/group_opt.c:127
-#: ../libpurple/protocols/qq/group_opt.c:355
-#: ../libpurple/protocols/qq/qq_base.c:882
-#: ../libpurple/protocols/sametime/sametime.c:3462
-#: ../libpurple/protocols/sametime/sametime.c:3548
-#: ../libpurple/protocols/sametime/sametime.c:3722
-#: ../libpurple/protocols/sametime/sametime.c:5475
-#: ../libpurple/protocols/sametime/sametime.c:5565
-#: ../libpurple/protocols/sametime/sametime.c:5690
-#: ../libpurple/protocols/silc/buddy.c:459
-#: ../libpurple/protocols/silc/buddy.c:1084
-#: ../libpurple/protocols/silc/buddy.c:1199
-#: ../libpurple/protocols/silc/chat.c:622
-#: ../libpurple/protocols/silc/chat.c:756
-#: ../libpurple/protocols/silc/ops.c:1822
-#: ../libpurple/protocols/silc/silc.c:1059
-#: ../libpurple/protocols/silc/silc.c:1267
-#: ../libpurple/protocols/silc10/buddy.c:468
-#: ../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:1910
-#: ../libpurple/protocols/silc10/silc.c:761
-#: ../libpurple/protocols/silc10/silc.c:967
-#: ../libpurple/protocols/yahoo/libymsg.c:1284
-#: ../libpurple/protocols/yahoo/libymsg.c:4194
-#: ../libpurple/protocols/yahoo/libymsg.c:4205
-#: ../libpurple/protocols/yahoo/yahoo_aliases.c:589
-#: ../libpurple/protocols/yahoo/yahoo_aliases.c:600
-#: ../pidgin/gtkaccount.c:1873 ../pidgin/gtkaccount.c:2430
-#: ../pidgin/gtkblist.c:742 ../pidgin/gtkblist.c:7235
-#: ../pidgin/gtkcertmgr.c:195 ../pidgin/gtkdialogs.c:777
-#: ../pidgin/gtkdialogs.c:916 ../pidgin/gtkdialogs.c:1008
-#: ../pidgin/gtkdialogs.c:1028 ../pidgin/gtkdialogs.c:1052
-#: ../pidgin/gtkdialogs.c:1074 ../pidgin/gtkdialogs.c:1122
-#: ../pidgin/gtkdialogs.c:1163 ../pidgin/gtkdialogs.c:1219
-#: ../pidgin/gtkdialogs.c:1258 ../pidgin/gtkdialogs.c:1285
-#: ../pidgin/gtkimhtmltoolbar.c:447 ../pidgin/gtklog.c:327
-#: ../pidgin/gtkplugin.c:308 ../pidgin/gtkpounce.c:1139
-#: ../pidgin/gtkprivacy.c:509 ../pidgin/gtkprivacy.c:525
-#: ../pidgin/gtkprivacy.c:550 ../pidgin/gtkprivacy.c:564
-#: ../pidgin/gtkrequest.c:300 ../pidgin/gtksavedstatuses.c:348
-#: ../pidgin/gtkstatusbox.c:1629 ../pidgin/gtkutils.c:1590
-#: ../pidgin/gtkutils.c:1610 ../pidgin/plugins/disco/gtkdisco.c:246
 msgid "Cancel"
 msgstr "?????"
 
 #. Save button
 #. Save
-#: ../finch/gntaccount.c:607 ../finch/gntcertmgr.c:311 ../finch/gntdebug.c:338
-#: ../finch/gntplugin.c:534 ../finch/gntpounce.c:479 ../finch/gntprefs.c:266
-#: ../finch/gntsound.c:1062 ../finch/gntstatus.c:490 ../finch/gntstatus.c:600
-#: ../libpurple/account.c:1548 ../libpurple/plugins/buddynote.c:50
-#: ../libpurple/protocols/jabber/buddy.c:675 ../pidgin/gtkblist.c:742
-#: ../pidgin/gtkdebug.c:747 ../pidgin/gtkrequest.c:306
 msgid "Save"
 msgstr "??????? ???"
 
-#: ../finch/gntaccount.c:660 ../pidgin/gtkaccount.c:1864
-#: ../pidgin/gtksavedstatuses.c:336 ../pidgin/gtkstatusbox.c:1623
 #, c-format
 msgid "Are you sure you want to delete %s?"
 msgstr "????? ??????????? %s ???????? ?????? ???"
 
-#: ../finch/gntaccount.c:663
 msgid "Delete Account"
 msgstr "????? ???????"
 
 #. Delete button
-#: ../finch/gntaccount.c:666 ../finch/gntaccount.c:781
-#: ../finch/gntcertmgr.c:319 ../finch/gntpounce.c:680 ../finch/gntpounce.c:743
-#: ../finch/gntstatus.c:146 ../finch/gntstatus.c:212
-#: ../pidgin/gtkaccount.c:1872 ../pidgin/gtklog.c:326
-#: ../pidgin/gtkpounce.c:1138 ../pidgin/gtkrequest.c:303
-#: ../pidgin/gtksavedstatuses.c:347 ../pidgin/gtkstatusbox.c:1628
 msgid "Delete"
 msgstr "???????"
 
-#: ../finch/gntaccount.c:742 ../finch/gntblist.c:2620 ../finch/gntui.c:99
-#: ../pidgin/gtkaccount.c:2291
 msgid "Accounts"
 msgstr "?????"
 
-#: ../finch/gntaccount.c:748
 msgid "You can enable/disable accounts from the following list."
 msgstr "?????????? ??????? ????? ????? ??????/????????? ??? ??? ?"
 
 #. Add button
-#: ../finch/gntaccount.c:772 ../finch/gntaccount.c:962 ../finch/gntblist.c:695
-#: ../finch/gntblist.c:802 ../finch/gntblist.c:850 ../finch/gntblist.c:3060
-#: ../finch/gntcertmgr.c:306 ../finch/gntnotify.c:448 ../finch/gntpounce.c:727
-#: ../finch/gntroomlist.c:276 ../finch/gntstatus.c:201
-#: ../libpurple/protocols/gg/gg.c:820
-#: ../libpurple/protocols/qq/buddy_opt.c:1144
-#: ../libpurple/protocols/sametime/sametime.c:5564
-#: ../libpurple/protocols/silc/chat.c:621
-#: ../libpurple/protocols/silc10/chat.c:599 ../pidgin/gtkaccount.c:2429
-#: ../pidgin/gtkblist.c:7234 ../pidgin/gtkconv.c:1788
-#: ../pidgin/gtkrequest.c:304
 msgid "Add"
 msgstr "??? ???"
 
 #. Modify button
-#: ../finch/gntaccount.c:777 ../finch/gntpounce.c:735
 msgid "Modify"
 msgstr "???????? ???"
 
-#: ../finch/gntaccount.c:885 ../pidgin/gtkaccount.c:2376
 #, c-format
 msgid "%s%s%s%s has made %s his or her buddy%s%s"
 msgstr "%s%s%s%s ? %s ? ????? ???? ??????? ?????%s%s"
 
-#: ../finch/gntaccount.c:958 ../pidgin/gtkaccount.c:2428
 msgid "Add buddy to your list?"
 msgstr "??????? ????? ??? ??? ?'? ???? ?"
 
-#: ../finch/gntaccount.c:1018 ../pidgin/gtkaccount.c:2486
 #, c-format
 msgid "%s%s%s%s wants to add %s to his or her buddy list%s%s"
 msgstr "%s%s%s%s ? %s ? ???? ????? ???? ????? ?????? ??????%s%s"
 
-#: ../finch/gntaccount.c:1043 ../finch/gntaccount.c:1046
-#: ../finch/gntaccount.c:1073 ../pidgin/gtkaccount.c:2509
-#: ../pidgin/gtkaccount.c:2516
 msgid "Authorize buddy?"
 msgstr "????? ???????? ???? ???? ?"
 
-#: ../finch/gntaccount.c:1050 ../finch/gntaccount.c:1077
-#: ../libpurple/protocols/qq/group_info.c:160
-#: ../libpurple/protocols/qq/group_opt.c:451 ../pidgin/gtkaccount.c:2510
-#: ../pidgin/gtkaccount.c:2517
 msgid "Authorize"
 msgstr "??????? ???"
 
-#: ../finch/gntaccount.c:1051 ../finch/gntaccount.c:1078
-#: ../libpurple/protocols/qq/group_opt.c:450 ../pidgin/gtkaccount.c:2511
-#: ../pidgin/gtkaccount.c:2518
 msgid "Deny"
 msgstr "???????????? ???"
 
-#: ../finch/gntblist.c:278
 #, c-format
 msgid ""
 "Online: %d\n"
@@ -341,12 +165,10 @@ msgstr ""
 "?? ????: %d\n"
 "???: %d"
 
-#: ../finch/gntblist.c:287
 #, c-format
 msgid "Account: %s (%s)"
 msgstr "?????: %s (%s)"
 
-#: ../finch/gntblist.c:299
 #, c-format
 msgid ""
 "\n"
@@ -355,525 +177,277 @@ msgstr ""
 "\n"
 "??????? ????????: %s ? ????"
 
-#: ../finch/gntblist.c:319 ../pidgin/gtkprefs.c:430 ../pidgin/gtkprefs.c:551
-#: ../pidgin/gtkprefs.c:559
-#: ../pidgin/pixmaps/emotes/default/24/default.theme.in.h:1
-#: ../pidgin/plugins/vvconfig.c:84 ../pidgin/plugins/vvconfig.c:89
 msgid "Default"
 msgstr "?????????"
 
-#: ../finch/gntblist.c:635
 msgid "You must provide a username for the buddy."
 msgstr "?????? ???? ?????? ???????????? ??? ??? ?????? ??? ?????? ?"
 
-#: ../finch/gntblist.c:637
 msgid "You must provide a group."
 msgstr "?? ???????? ??? ?????? ?"
 
-#: ../finch/gntblist.c:639
 msgid "You must select an account."
 msgstr "??? ????? ???????? ??? ?????? ?"
 
-#: ../finch/gntblist.c:641
 msgid "The selected account is not online."
 msgstr "????????? ????? ?? ???? ??? ?"
 
-#: ../finch/gntblist.c:646
 msgid "Error adding buddy"
 msgstr "????? ??? ?????? ??????"
 
-#: ../finch/gntblist.c:677 ../libpurple/protocols/irc/irc.c:1016
-#: ../libpurple/protocols/irc/msgs.c:366
-#: ../libpurple/protocols/jabber/jabber.c:1261
-#: ../libpurple/protocols/jabber/jabber.c:1263
-#: ../libpurple/protocols/oscar/oscar.c:4321
-#: ../libpurple/protocols/silc/buddy.c:1554
-#: ../libpurple/protocols/silc/ops.c:1199
-#: ../libpurple/protocols/silc/ops.c:1202
-#: ../libpurple/protocols/silc/ops.c:1338
-#: ../libpurple/protocols/silc/ops.c:1341
-#: ../libpurple/protocols/silc/silc.c:1241
-#: ../libpurple/protocols/silc10/buddy.c:1559
-#: ../libpurple/protocols/silc10/ops.c:1191
-#: ../libpurple/protocols/silc10/ops.c:1194
-#: ../libpurple/protocols/silc10/ops.c:1340
-#: ../libpurple/protocols/silc10/ops.c:1343
-#: ../libpurple/protocols/silc10/silc.c:941 ../pidgin/gtkaccount.c:1946
-#: ../pidgin/gtksavedstatuses.c:998
 msgid "Username"
 msgstr "????????????? ???"
 
-#: ../finch/gntblist.c:680
 msgid "Alias (optional)"
 msgstr "????? (????????)"
 
-#: ../finch/gntblist.c:683
 msgid "Add in group"
 msgstr "??????? ??? ??? ???"
 
-#: ../finch/gntblist.c:687 ../finch/gntblist.c:781 ../finch/gntblist.c:1788
-#: ../finch/gntblist.c:2734 ../finch/gntblist.c:2790 ../finch/gntblist.c:2865
-#: ../finch/gntblist.c:2925 ../finch/gntnotify.c:188 ../finch/gntstatus.c:578
-#: ../libpurple/plugins/idle.c:153 ../libpurple/plugins/idle.c:190
-#: ../pidgin/gtkblist.c:3614 ../pidgin/gtknotify.c:717
-#: ../pidgin/gtkpounce.c:1305 ../pidgin/plugins/gevolution/gevolution.c:454
 msgid "Account"
 msgstr "?????"
 
-#: ../finch/gntblist.c:693 ../finch/gntblist.c:1253
-#: ../libpurple/protocols/qq/buddy_opt.c:453
-#: ../libpurple/protocols/qq/qq.c:858 ../libpurple/protocols/silc/buddy.c:730
-#: ../libpurple/protocols/silc/buddy.c:1035
-#: ../libpurple/protocols/silc/buddy.c:1080
-#: ../libpurple/protocols/silc/buddy.c:1190
-#: ../libpurple/protocols/silc10/buddy.c:737
-#: ../libpurple/protocols/silc10/buddy.c:1036
-#: ../libpurple/protocols/silc10/buddy.c:1083
-#: ../libpurple/protocols/silc10/buddy.c:1183
-#: ../libpurple/protocols/yahoo/libymsg.c:4002 ../pidgin/gtkblist.c:7005
-#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:451
 msgid "Add Buddy"
 msgstr "????? ??? ???"
 
-#: ../finch/gntblist.c:693
 msgid "Please enter buddy information."
 msgstr "??????? ??? ????? ????????? ???? ??? ??? ?"
 
-#: ../finch/gntblist.c:749 ../libpurple/blist.c:1494
 msgid "Chats"
 msgstr "??????"
 
 #. Extract their Name and put it in
-#: ../finch/gntblist.c:787 ../finch/gntblist.c:2729 ../finch/gntblist.c:2785
-#: ../finch/gntblist.c:2920 ../finch/gntroomlist.c:300
-#: ../libpurple/protocols/jabber/jabber.c:1284
-#: ../libpurple/protocols/jabber/jabber.c:1288
-#: ../libpurple/protocols/msn/msn.c:2173 ../libpurple/protocols/msn/msn.c:2238
-#: ../libpurple/protocols/msn/msn.c:2265
-#: ../libpurple/protocols/msnp9/msn.c:1724
-#: ../libpurple/protocols/msnp9/msn.c:1789
-#: ../libpurple/protocols/msnp9/msn.c:1816
-#: ../libpurple/protocols/qq/buddy_info.c:120 ../pidgin/gtkplugin.c:776
-#: ../pidgin/gtkroomlist.c:749 ../pidgin/plugins/disco/gtkdisco.c:546
-#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:132
-#: ../pidgin/plugins/gevolution/assoc-buddy.c:123
 msgid "Name"
 msgstr "???"
 
-#: ../finch/gntblist.c:790 ../finch/gntblist.c:1729
-#: ../libpurple/protocols/gg/gg.c:1787 ../libpurple/protocols/msn/msn.c:1992
-#: ../libpurple/protocols/msnp9/msn.c:1542
-#: ../libpurple/protocols/mxit/profile.c:118
-#: ../libpurple/protocols/qq/buddy_memo.c:75
-#: ../libpurple/protocols/silc/chat.c:612
-#: ../libpurple/protocols/silc10/chat.c:590
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:705
-#: ../libpurple/protocols/zephyr/zephyr.c:797
-#: ../libpurple/protocols/zephyr/zephyr.c:1180 ../pidgin/gtkdialogs.c:1027
-#: ../pidgin/gtkdialogs.c:1051 ../pidgin/gtkdialogs.c:1073
-#: ../pidgin/gtkrequest.c:307
 msgid "Alias"
 msgstr "?????"
 
-#: ../finch/gntblist.c:793 ../finch/gntblist.c:3076
-#: ../pidgin/plugins/themeedit.c:241
 msgid "Group"
 msgstr "??"
 
-#: ../finch/gntblist.c:797 ../finch/gntblist.c:1220
 msgid "Auto-join"
 msgstr "?????????????? ??? ??? ?'?"
 
-#: ../finch/gntblist.c:800 ../finch/gntblist.c:1255 ../pidgin/gtkblist.c:7175
 msgid "Add Chat"
 msgstr "?????? ??? ???"
 
-#: ../finch/gntblist.c:801
 msgid "You can edit more information from the context menu later."
 msgstr "????? ???? ??????? ????? ??? ???? ???? ??????? ?????? ?????"
 
-#: ../finch/gntblist.c:813
 msgid "Error adding group"
 msgstr "?? ??? ?????? ??????"
 
-#: ../finch/gntblist.c:814
 msgid "You must give a name for the group to add."
 msgstr "??? ???? ???? ??? ??? ???????? ??? ?????? ?"
 
-#: ../finch/gntblist.c:848 ../finch/gntblist.c:1257
-#: ../libpurple/protocols/sametime/sametime.c:5474
-#: ../libpurple/protocols/sametime/sametime.c:5562 ../pidgin/gtkblist.c:7231
 msgid "Add Group"
 msgstr "?? ??? ???"
 
-#: ../finch/gntblist.c:848
 msgid "Enter the name of the group"
 msgstr "??? ??? ????"
 
-#: ../finch/gntblist.c:1203 ../pidgin/gtkblist.c:741
 msgid "Edit Chat"
 msgstr "?????? ???????"
 
-#: ../finch/gntblist.c:1203
 msgid "Please Update the necessary fields."
 msgstr "?????? ???????? ??????? ??? ??? ???? ??? ?"
 
-#: ../finch/gntblist.c:1204 ../finch/gntstatus.c:207
 msgid "Edit"
 msgstr "???????"
 
-#: ../finch/gntblist.c:1229
 msgid "Edit Settings"
 msgstr "????????? ??????? ???"
 
-#: ../finch/gntblist.c:1265 ../pidgin/gtkutils.c:974
 msgid "Information"
 msgstr "????"
 
-#: ../finch/gntblist.c:1265 ../pidgin/gtkutils.c:974
 msgid "Retrieving..."
 msgstr "?????? ??? ????..."
 
-#: ../finch/gntblist.c:1330 ../finch/gntconv.c:621
-#: ../libpurple/protocols/qq/qq.c:889 ../libpurple/protocols/silc/chat.c:909
-#: ../libpurple/protocols/silc10/chat.c:883
 msgid "Get Info"
 msgstr "???? ??????? ???"
 
-#: ../finch/gntblist.c:1334 ../pidgin/gtkpounce.c:538
 msgid "Add Buddy Pounce"
 msgstr "Buddy Pounce ??? ???"
 
-#: ../finch/gntblist.c:1341 ../finch/gntconv.c:633
-#: ../libpurple/protocols/jabber/si.c:1546
-#: ../libpurple/protocols/oscar/oscar.c:700 ../libpurple/protocols/qq/qq.c:875
-#: ../pidgin/gtkconv.c:1727
 msgid "Send File"
 msgstr "??????? ???????"
 
-#: ../finch/gntblist.c:1348 ../libpurple/protocols/gg/gg.c:1836
-#: ../libpurple/protocols/msn/msn.c:847 ../libpurple/protocols/msnp9/msn.c:581
 msgid "Blocked"
 msgstr "??????????"
 
-#: ../finch/gntblist.c:1353
 msgid "Show when offline"
 msgstr "?? ???? ??????? ???????? ??? ?'?"
 
-#: ../finch/gntblist.c:1438
 #, c-format
 msgid "Please enter the new name for %s"
 msgstr "??????? ??? %s ? ???? ???? ??? ????"
 
-#: ../finch/gntblist.c:1440 ../finch/gntblist.c:1729
 msgid "Rename"
 msgstr "???? ??????"
 
-#: ../finch/gntblist.c:1440
 msgid "Set Alias"
 msgstr "??? ?? ??? ???????? ???"
 
-#: ../finch/gntblist.c:1441
 msgid "Enter empty string to reset the name."
 msgstr "??? ???? ???????? ???? ???? ????? ?????? ???? ?"
 
-#: ../finch/gntblist.c:1555
 msgid "Removing this contact will also remove all the buddies in the contact"
 msgstr "?? ??????? ??????? ???? ???? ?????? ????? ???"
 
-#: ../finch/gntblist.c:1563
 msgid "Removing this group will also remove all the buddies in the group"
 msgstr "?? ?? ??????? ???? ???? ?????? ????? ???"
 
-#: ../finch/gntblist.c:1568
 #, c-format
 msgid "Are you sure you want to remove %s?"
 msgstr "????? ??????????? %s ???????? ?????? ?? ?"
 
 #. XXX: anything to do with the returned ui-handle?
-#: ../finch/gntblist.c:1571
 msgid "Confirm Remove"
 msgstr "??????? ??????? ???"
 
-#: ../finch/gntblist.c:1576 ../finch/gntblist.c:1731 ../finch/gntft.c:246
-#: ../pidgin/gtkconv.c:1785 ../pidgin/gtkrequest.c:305
-#: ../pidgin/gtkstatusbox.c:326
 msgid "Remove"
 msgstr "???????"
 
 #. Buddy List
-#: ../finch/gntblist.c:1705 ../finch/gntblist.c:3117 ../finch/gntprefs.c:259
-#: ../finch/gntui.c:100 ../pidgin/gtkblist.c:5706
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:303
 msgid "Buddy List"
 msgstr "?????? ??????"
 
-#: ../finch/gntblist.c:1736
 msgid "Place tagged"
 msgstr "??????? ??????? ??? ????"
 
-#: ../finch/gntblist.c:1741
 msgid "Toggle Tag"
 msgstr "??????? ???? ???????? ???"
 
-#: ../finch/gntblist.c:1745 ../finch/gntblist.c:2934
 msgid "View Log"
 msgstr "?? ????????"
 
 #. General
-#: ../finch/gntblist.c:1781 ../libpurple/protocols/gg/gg.c:586
-#: ../libpurple/protocols/gg/gg.c:1115 ../libpurple/protocols/gg/gg.c:1184
-#: ../libpurple/protocols/gg/gg.c:2533
-#: ../libpurple/protocols/jabber/buddy.c:349
-#: ../libpurple/protocols/jabber/buddy.c:1043
-#: ../libpurple/protocols/jabber/buddy.c:2106
-#: ../libpurple/protocols/jabber/buddy.c:2299
-#: ../libpurple/protocols/jabber/jabber.c:1181
-#: ../libpurple/protocols/jabber/jabber.c:2134
-#: ../libpurple/protocols/jabber/jabber.c:2150
-#: ../libpurple/protocols/jabber/jabber.c:2166
-#: ../libpurple/protocols/jabber/jabber.c:2182
-#: ../libpurple/protocols/jabber/jabber.c:2196
-#: ../libpurple/protocols/msn/msn.c:2000 ../libpurple/protocols/msn/msn.c:2176
-#: ../libpurple/protocols/msnp9/msn.c:1550
-#: ../libpurple/protocols/msnp9/msn.c:1727
-#: ../libpurple/protocols/qq/buddy_info.c:112
-#: ../libpurple/protocols/silc/buddy.c:1550
-#: ../libpurple/protocols/silc/ops.c:1005
-#: ../libpurple/protocols/silc/ops.c:1188
-#: ../libpurple/protocols/silc/ops.c:1326
-#: ../libpurple/protocols/silc10/buddy.c:1555
-#: ../libpurple/protocols/silc10/ops.c:1036
-#: ../libpurple/protocols/silc10/ops.c:1179
-#: ../libpurple/protocols/silc10/ops.c:1328
-#: ../libpurple/protocols/yahoo/yahoo_aliases.c:546
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1067 ../pidgin/gtkblist.c:3638
 msgid "Nickname"
 msgstr "?????"
 
 #. Never know what those translations might end up like...
 #. Idle stuff
-#: ../finch/gntblist.c:1803 ../finch/gntprefs.c:262
-#: ../libpurple/protocols/bonjour/bonjour.c:364
-#: ../libpurple/protocols/jabber/buddy.c:743
-#: ../libpurple/protocols/jabber/jabber.c:2012
-#: ../libpurple/protocols/msn/msn.c:789 ../libpurple/protocols/msn/msn.c:809
-#: ../libpurple/protocols/msn/msn.c:817 ../libpurple/protocols/msn/state.c:37
-#: ../libpurple/protocols/msnp9/msn.c:560
-#: ../libpurple/protocols/msnp9/state.c:32
-#: ../libpurple/protocols/novell/novell.c:2852
-#: ../libpurple/protocols/oscar/oscar.c:3450
-#: ../libpurple/protocols/yahoo/libymsg.c:3716
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:711 ../pidgin/gtkblist.c:3666
-#: ../pidgin/gtkblist.c:4142 ../pidgin/gtkprefs.c:2655
 msgid "Idle"
 msgstr "???????? ??????"
 
-#: ../finch/gntblist.c:1817
 msgid "On Mobile"
 msgstr "?????? ???? ??? ??????"
 
-#: ../finch/gntblist.c:2124 ../pidgin/gtkdocklet.c:587
 msgid "New..."
 msgstr "????..."
 
-#: ../finch/gntblist.c:2131 ../pidgin/gtkdocklet.c:588
 msgid "Saved..."
 msgstr "????????..."
 
-#: ../finch/gntblist.c:2588 ../finch/gntplugin.c:354 ../finch/gntui.c:105
-#: ../pidgin/gtkplugin.c:725
 msgid "Plugins"
 msgstr "????? ??"
 
-#: ../finch/gntblist.c:2742 ../finch/gntblist.c:2747
 msgid "Block/Unblock"
 msgstr "???????? ???/????? ???"
 
-#: ../finch/gntblist.c:2743 ../libpurple/protocols/gg/gg.c:1876
 msgid "Block"
 msgstr "???????? ???"
 
-#: ../finch/gntblist.c:2744 ../libpurple/protocols/gg/gg.c:1872
 msgid "Unblock"
 msgstr "???????? ????? ???"
 
-#: ../finch/gntblist.c:2749
 msgid ""
 "Please enter the username or alias of the person you would like to Block/"
 "Unblock."
 msgstr ""
-"???????? ???/????? ???? ????????? ??????? ??? ????????? ????????????? ??? ?? "
-"????? ?????? ??? ?"
+"???????? ???/????? ???? ????????? ??????? ??? ????????? ????????????? ??? ?? ????? "
+"?????? ??? ?"
 
 #. Not multiline
 #. Not masked?
 #. No hints?
-#: ../finch/gntblist.c:2752 ../finch/gntblist.c:2803 ../finch/gntblist.c:2939
-#: ../finch/gntcertmgr.c:90 ../finch/gntconn.c:137 ../finch/gntnotify.c:83
-#: ../finch/plugins/gnthistory.c:181 ../libpurple/account.c:1171
-#: ../libpurple/account.c:1513 ../libpurple/protocols/gg/gg.c:472
-#: ../libpurple/protocols/gg/gg.c:614 ../libpurple/protocols/gg/gg.c:743
-#: ../libpurple/protocols/jabber/jabber.c:2308
-#: ../libpurple/protocols/jabber/xdata.c:403
-#: ../libpurple/protocols/msn/msn.c:360 ../libpurple/protocols/msn/msn.c:378
-#: ../libpurple/protocols/msn/msn.c:395 ../libpurple/protocols/msn/msn.c:412
-#: ../libpurple/protocols/msnp9/msn.c:302
-#: ../libpurple/protocols/msnp9/msn.c:319
-#: ../libpurple/protocols/msnp9/msn.c:336
-#: ../libpurple/protocols/msnp9/msn.c:353
-#: ../libpurple/protocols/mxit/login.c:360
-#: ../libpurple/protocols/myspace/user.c:823
-#: ../libpurple/protocols/myspace/user.c:884
-#: ../libpurple/protocols/oscar/oscar.c:6655
-#: ../libpurple/protocols/qq/buddy_opt.c:627
-#: ../libpurple/protocols/qq/group_opt.c:126
-#: ../libpurple/protocols/qq/qq_base.c:881
-#: ../libpurple/protocols/silc/buddy.c:458
-#: ../libpurple/protocols/silc/buddy.c:1198
-#: ../libpurple/protocols/silc/chat.c:451
-#: ../libpurple/protocols/silc/chat.c:488
-#: ../libpurple/protocols/silc/chat.c:755
-#: ../libpurple/protocols/silc/ops.c:1295
-#: ../libpurple/protocols/silc/ops.c:1821
-#: ../libpurple/protocols/silc/silc.c:1058
-#: ../libpurple/protocols/silc10/buddy.c:467
-#: ../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:1909
-#: ../libpurple/protocols/silc10/silc.c:760
-#: ../libpurple/protocols/yahoo/libymsg.c:1283
-#: ../libpurple/protocols/yahoo/libymsg.c:4193
-#: ../libpurple/protocols/yahoo/libymsg.c:4204
-#: ../libpurple/protocols/yahoo/yahoo_aliases.c:588
-#: ../libpurple/protocols/yahoo/yahoo_aliases.c:599 ../pidgin/gtkcertmgr.c:193
-#: ../pidgin/gtkdialogs.c:776 ../pidgin/gtkdialogs.c:915
-#: ../pidgin/gtkdialogs.c:1007 ../pidgin/gtkrequest.c:299
-#: ../pidgin/gtkutils.c:1589 ../pidgin/gtkutils.c:1609
 msgid "OK"
 msgstr "??? ????"
 
-#: ../finch/gntblist.c:2798 ../pidgin/gtkdialogs.c:771
 msgid "New Instant Message"
 msgstr "???? ????????? ??????"
 
-#: ../finch/gntblist.c:2800 ../pidgin/gtkdialogs.c:773
 msgid "Please enter the username or alias of the person you would like to IM."
-msgstr ""
-"IM ???? ????????? ??????? ??? ????????? ????????????? ??? ?? ????? ?????? "
-"??? ?"
+msgstr "IM ???? ????????? ??????? ??? ????????? ????????????? ??? ?? ????? ?????? ??? ?"
 
-#: ../finch/gntblist.c:2861
 msgid "Channel"
 msgstr "????? "
 
-#: ../finch/gntblist.c:2873 ../pidgin/gtkblist.c:1174
 msgid "Join a Chat"
 msgstr "??????? ??? ????"
 
-#: ../finch/gntblist.c:2875
 msgid "Please enter the name of the chat you want to join."
 msgstr "?? ?????? ??? ???? ?????? ??????? ??? ??? ??? ???? ?"
 
-#: ../finch/gntblist.c:2877 ../finch/gntnotify.c:457
 msgid "Join"
 msgstr "??? ????"
 
-#: ../finch/gntblist.c:2936 ../pidgin/gtkdialogs.c:1004
 msgid ""
 "Please enter the username or alias of the person whose log you would like to "
 "view."
 msgstr ""
-"?? ????????? ????????? ??????? ??? ????????? ????????????? ??? ?? ????? "
-"?????? ??? ?"
+"?? ????????? ????????? ??????? ??? ????????? ????????????? ??? ?? ????? ?????? ??? ?"
 
 #. Create the "Options" frame.
-#: ../finch/gntblist.c:2990 ../finch/gntpounce.c:461 ../pidgin/gtkpounce.c:826
 msgid "Options"
 msgstr "?????????"
 
-#: ../finch/gntblist.c:2996
 msgid "Send IM..."
 msgstr "????????? ?????? ???????..."
 
-#: ../finch/gntblist.c:3001
 msgid "Block/Unblock..."
 msgstr "???????? ???/????? ???..."
 
-#: ../finch/gntblist.c:3006 ../pidgin/gtkdocklet.c:714
 msgid "Join Chat..."
 msgstr "??????? ??? ????..."
 
-#: ../finch/gntblist.c:3011 ../finch/gntconv.c:645
 msgid "View Log..."
 msgstr "?? ????..."
 
-#: ../finch/gntblist.c:3016
 msgid "View All Logs"
 msgstr "???? ?? ????"
 
-#: ../finch/gntblist.c:3021
 msgid "Show"
 msgstr "????????"
 
-#: ../finch/gntblist.c:3026
 msgid "Empty groups"
 msgstr "????? ??"
 
-#: ../finch/gntblist.c:3033
 msgid "Offline buddies"
 msgstr "?? ???? ???????"
 
-#: ../finch/gntblist.c:3040
 msgid "Sort"
 msgstr "??????????? ???????"
 
-#: ../finch/gntblist.c:3045
 msgid "By Status"
 msgstr "?????? ???????"
 
-#: ../finch/gntblist.c:3050 ../pidgin/gtkblist.c:4675
 msgid "Alphabetically"
 msgstr "????????? ???????"
 
-#: ../finch/gntblist.c:3055
 msgid "By Log Size"
 msgstr "??? ??? ???????"
 
-#: ../finch/gntblist.c:3066 ../libpurple/conversation.c:2107
-#: ../pidgin/gtknotify.c:1588
 msgid "Buddy"
 msgstr "?????"
 
-#: ../finch/gntblist.c:3071 ../libpurple/protocols/oscar/oscar.c:694
-#: ../libpurple/protocols/silc/silc.c:1004
-#: ../libpurple/protocols/silc/util.c:560
-#: ../libpurple/protocols/silc10/silc.c:704
-#: ../libpurple/protocols/silc10/util.c:553
-#: ../pidgin/plugins/disco/gtkdisco.c:474
 msgid "Chat"
 msgstr "??????"
 
-#: ../finch/gntblist.c:3081 ../finch/plugins/grouping.c:365
 msgid "Grouping"
 msgstr "??????"
 
-#: ../finch/gntcertmgr.c:86 ../pidgin/gtkcertmgr.c:186
 msgid "Certificate Import"
 msgstr "?????????? ?????? ???"
 
-#: ../finch/gntcertmgr.c:87 ../pidgin/gtkcertmgr.c:187
 msgid "Specify a hostname"
 msgstr "??? ?????????? ???????? ???"
 
-#: ../finch/gntcertmgr.c:88
 msgid "Type the host name this certificate is for."
 msgstr "?? ?????????? ?? ??????????? ???? ??? ??? ???? ?"
 
-#: ../finch/gntcertmgr.c:97 ../pidgin/gtkcertmgr.c:208
 #, c-format
 msgid ""
 "File %s could not be imported.\n"
@@ -882,19 +456,15 @@ msgstr ""
 "??????? %s ?????? ??? ????? ??? ?\n"
 "??????? ??? ??????? ???????? ??? ? PEM ???????? ??? ?\n"
 
-#: ../finch/gntcertmgr.c:99 ../pidgin/gtkcertmgr.c:210
 msgid "Certificate Import Error"
 msgstr "?????????? ?????? ?????? ??????"
 
-#: ../finch/gntcertmgr.c:100 ../pidgin/gtkcertmgr.c:211
 msgid "X.509 certificate import failed"
 msgstr "X.509 ?????????? ?????? ??? ????? ???"
 
-#: ../finch/gntcertmgr.c:110 ../pidgin/gtkcertmgr.c:222
 msgid "Select a PEM certificate"
 msgstr "??? PEM ?????????? ???????? ???"
 
-#: ../finch/gntcertmgr.c:127 ../pidgin/gtkcertmgr.c:243
 #, c-format
 msgid ""
 "Export to file %s failed.\n"
@@ -903,24 +473,19 @@ msgstr ""
 "??????? %s ?? ??????? ??? ????? ??? ?\n"
 "????????? ??? ????? ?????? ??????? ???\n"
 
-#: ../finch/gntcertmgr.c:129 ../pidgin/gtkcertmgr.c:245
 msgid "Certificate Export Error"
 msgstr "?????????? ??????? ?????? ??????"
 
-#: ../finch/gntcertmgr.c:130 ../pidgin/gtkcertmgr.c:246
 msgid "X.509 certificate export failed"
 msgstr "X.509 ?????????? ??????? ??? ????? ???"
 
-#: ../finch/gntcertmgr.c:159 ../pidgin/gtkcertmgr.c:296
 msgid "PEM X.509 Certificate Export"
 msgstr "PEM X.509 ?????????? ???????"
 
-#: ../finch/gntcertmgr.c:188
 #, c-format
 msgid "Certificate for %s"
 msgstr "%s ? ???? ??????????"
 
-#: ../finch/gntcertmgr.c:195
 #, c-format
 msgid ""
 "Common name: %s\n"
@@ -933,59 +498,38 @@ msgstr ""
 "SHA1 fingerprint:\n"
 "%s"
 
-#: ../finch/gntcertmgr.c:198
 msgid "SSL Host Certificate"
 msgstr "SSL ?????? ??????????"
 
-#: ../finch/gntcertmgr.c:233 ../pidgin/gtkcertmgr.c:369
 #, c-format
 msgid "Really delete certificate for %s?"
 msgstr "????? ??????? ?? %s ? ?????????? ?????? ?"
 
-#: ../finch/gntcertmgr.c:236 ../pidgin/gtkcertmgr.c:371
 msgid "Confirm certificate delete"
 msgstr "?????????? ???????? ?????? ????"
 
-#: ../finch/gntcertmgr.c:293 ../pidgin/gtkcertmgr.c:611
 msgid "Certificate Manager"
 msgstr "?????????? ???????"
 
 #. Creating the user splits
-#: ../finch/gntcertmgr.c:298 ../libpurple/protocols/bonjour/bonjour.c:725
-#: ../libpurple/protocols/silc/silc.c:1243
-#: ../libpurple/protocols/silc10/silc.c:943 ../pidgin/gtkcertmgr.c:444
 msgid "Hostname"
 msgstr "??????????"
 
-#: ../finch/gntcertmgr.c:315 ../finch/gntnotify.c:451 ../pidgin/gtkconv.c:1764
-#: ../pidgin/gtkdebug.c:834
 msgid "Info"
 msgstr "????"
 
 #. Close button
-#: ../finch/gntcertmgr.c:324 ../finch/gntft.c:256 ../finch/gntnotify.c:196
-#: ../finch/gntplugin.c:222 ../finch/gntplugin.c:415 ../finch/gntpounce.c:752
-#: ../finch/gntroomlist.c:277 ../finch/gntstatus.c:218
-#: ../libpurple/protocols/msn/msn.c:521 ../libpurple/protocols/msnp9/msn.c:419
-#: ../libpurple/protocols/mxit/splashscreen.c:207
-#: ../libpurple/protocols/mxit/splashscreen.c:211
-#: ../libpurple/protocols/silc/util.c:386
-#: ../libpurple/protocols/silc10/util.c:377 ../pidgin/gtkaccount.c:2403
-#: ../pidgin/gtkrequest.c:302
 msgid "Close"
 msgstr "???? ???"
 
-#: ../finch/gntconn.c:126
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../finch/gntconn.c:129
 #, c-format
 msgid "%s disconnected."
 msgstr "%s ? ???? ????? ?????????"
 
-#: ../finch/gntconn.c:130
 #, c-format
 msgid ""
 "%s\n"
@@ -995,52 +539,41 @@ msgstr ""
 msgstr ""
 "%s\n"
 "\n"
-"Finch ? ??????? ?????????? ????????? ???? ?????????? ????? ??????? ?????? "
-"???? ???? ???? ?????? ???? ?"
+"Finch ? ??????? ?????????? ????????? ???? ?????????? ????? ??????? ?????? ???? "
+"???? ???? ?????? ???? ?"
 
-#: ../finch/gntconn.c:139
 msgid "Re-enable Account"
 msgstr "????? ???? ?????? ???"
 
-#: ../finch/gntconv.c:161
 msgid "No such command."
 msgstr "?? ???? ???? ???? ??? ?"
 
-#: ../finch/gntconv.c:165 ../pidgin/gtkconv.c:516
 msgid "Syntax Error:  You typed the wrong number of arguments to that command."
 msgstr "???????????? ??????:  ????????? ????? ???? ??????? ????? ?????? ???? ??? ?"
 
-#: ../finch/gntconv.c:170 ../pidgin/gtkconv.c:522
 msgid "Your command failed for an unknown reason."
 msgstr "??? ?????? ????? ?????? ????? ??? ???? ?"
 
-#: ../finch/gntconv.c:175 ../pidgin/gtkconv.c:529
 msgid "That command only works in chats, not IMs."
 msgstr "?? ????? ??? ??????? ??? ???, IM? ? ??? ?"
 
-#: ../finch/gntconv.c:178 ../pidgin/gtkconv.c:532
 msgid "That command only works in IMs, not chats."
 msgstr "?? ???????? ??? IM ? ??? ???,??????? ??? ?"
 
-#: ../finch/gntconv.c:182 ../pidgin/gtkconv.c:537
 msgid "That command doesn't work on this protocol."
 msgstr "?? ???? ????? ?? ???????? ??? ???? ?"
 
-#: ../finch/gntconv.c:190
 msgid "Message was not sent, because you are not signed on."
 msgstr "????? ?????? ????? ???? ?????? ????? ??? ????? ?"
 
-#: ../finch/gntconv.c:267
 #, c-format
 msgid "%s (%s -- %s)"
 msgstr "%s (%s    %s)"
 
-#: ../finch/gntconv.c:290
 #, c-format
 msgid "%s [%s]"
 msgstr "%s [%s]"
 
-#: ../finch/gntconv.c:295 ../finch/gntconv.c:982 ../pidgin/gtkconv.c:3789
 #, c-format
 msgid ""
 "\n"
@@ -1049,92 +582,73 @@ msgstr ""
 "\n"
 "%s ? ???? ???..."
 
-#: ../finch/gntconv.c:314
 msgid "You have left this chat."
 msgstr "????? ?? ??????? ??? ????? ???? ?"
 
-#: ../finch/gntconv.c:382 ../pidgin/gtkconv.c:7650
 msgid ""
 "The account has disconnected and you are no longer in this chat. You will be "
 "automatically rejoined in the chat when the account reconnects."
 msgstr ""
-"?????? ????? ????????? ???? ??? ????? ???????? ?? ??????? ??????? ??? ? "
-"????? ???? ??????? ?'?? ????? ????????????? ????????? ??????? ???? ??? ??? ?"
+"?????? ????? ????????? ???? ??? ????? ???????? ?? ??????? ??????? ??? ? ????? ???? "
+"??????? ?'?? ????? ????????????? ????????? ??????? ???? ??? ??? ?"
 
-#: ../finch/gntconv.c:454 ../pidgin/gtkconv.c:1450
 msgid "Logging started. Future messages in this conversation will be logged."
 msgstr "?? ??? ????? ???? ? ?? ??????? ???????? ??????????? ?? ??? ?'? ?"
 
-#: ../finch/gntconv.c:458 ../pidgin/gtkconv.c:1458
-msgid "Logging stopped. Future messages in this conversation will not be logged."
+msgid ""
+"Logging stopped. Future messages in this conversation will not be logged."
 msgstr "?? ??? ???? ???? ? ?? ??????? ???????? ??????????? ?? ??? ?'?'? ?"
 
-#: ../finch/gntconv.c:545
 msgid "Send To"
 msgstr "????? ???????"
 
-#: ../finch/gntconv.c:598
 msgid "Conversation"
 msgstr "??????"
 
-#: ../finch/gntconv.c:604
 msgid "Clear Scrollback"
 msgstr "????????? ???????"
 
-#: ../finch/gntconv.c:608 ../finch/gntprefs.c:192
 msgid "Show Timestamps"
 msgstr "???? ????? ???????? ??? ?'?"
 
-#: ../finch/gntconv.c:626
 msgid "Add Buddy Pounce..."
 msgstr "Buddy Pounce ??? ???..."
 
-#: ../finch/gntconv.c:640
 msgid "Invite..."
 msgstr "???????? ???..."
 
-#: ../finch/gntconv.c:649
 msgid "Enable Logging"
 msgstr "???? ???????? ?????? ???"
 
-#: ../finch/gntconv.c:655
 msgid "Enable Sounds"
 msgstr "???? ?????? ???"
 
-#: ../finch/gntconv.c:671
 msgid "You are not connected."
 msgstr "????? ???????? ??????? ??? ?"
 
-#: ../finch/gntconv.c:935
 msgid "<AUTO-REPLY> "
 msgstr "<AUTO REPLY> "
 
-#: ../finch/gntconv.c:1075
 #, c-format
 msgid "List of %d user:\n"
 msgid_plural "List of %d users:\n"
 msgstr[0] "%d ????????????? ??????:\n"
 msgstr[1] "%d ????????????? ??????:\n"
 
-#: ../finch/gntconv.c:1246 ../pidgin/gtkconv.c:353
 msgid "Supported debug options are: plugins version"
 msgstr "?????? ??????? ?????? ??: plugins version"
 
-#: ../finch/gntconv.c:1292 ../pidgin/gtkconv.c:415
 msgid "No such command (in this context)."
 msgstr "?? ???? ???? ???? (??????? ??????? ???????) ??????? ??? ?"
 
-#: ../finch/gntconv.c:1295 ../pidgin/gtkconv.c:418
 msgid ""
 "Use \"/help &lt;command&gt;\" for help on a specific command.\n"
 "The following commands are available in this context:\n"
 msgstr ""
-"???? ??????????? ???? ???????? ???? ??????? ???? ???? \"/help "
-"&lt;command&gt;\" "
+"???? ??????????? ???? ???????? ???? ??????? ???? ???? \"/help &lt;command&gt;\" "
 "?????? ??? ?\n"
 "?? ???????? ?????????? ???????? ???:\n"
 
-#: ../finch/gntconv.c:1340
 #, c-format
 msgid ""
 "%s is not a valid message class. See '/help msgcolor' for valid message "
@@ -1143,66 +657,51 @@ msgstr ""
 "%s ??? message ?????? ??? ? ??? message ?????? ?????? ????? ???? '/help "
 "msgcolor' ???? ?"
 
-#: ../finch/gntconv.c:1347 ../finch/gntconv.c:1354
 #, c-format
 msgid "%s is not a valid color. See '/help msgcolor' for valid colors."
 msgstr "%s ??? ?? ??? ? ??? ??? ?????? ????? ???? '/he?lp msgcolor' ???? ?"
 
-#: ../finch/gntconv.c:1411 ../pidgin/gtkconv.c:8141
 msgid ""
 "say &lt;message&gt;:  Send a message normally as if you weren't using a "
 "command."
 msgstr "say &lt;message&gt;:  ???? ?????? ?????? ??????? ??? ???? ??????? ??? ?"
 
-#: ../finch/gntconv.c:1414 ../pidgin/gtkconv.c:8144
 msgid "me &lt;action&gt;:  Send an IRC style action to a buddy or chat."
 msgstr "me &lt;action&gt;:  ???? ????? ?? ???????? IRC ? ?????????? ?????? ???? ?"
 
-#: ../finch/gntconv.c:1417 ../pidgin/gtkconv.c:8147
 msgid ""
 "debug &lt;option&gt;:  Send various debug information to the current "
 "conversation."
 msgstr ""
-"debug &lt;option&gt;:  ??????? ??????? ????? ????????? ??????? ???? ?????? "
-"?'? ?"
+"debug &lt;option&gt;:  ??????? ??????? ????? ????????? ??????? ???? ?????? ?'? ?"
 
-#: ../finch/gntconv.c:1420 ../pidgin/gtkconv.c:8150
 msgid "clear: Clears the conversation scrollback."
 msgstr "clear: ?????? ??? ???? ?????? ??????? ?? ?"
 
-#: ../finch/gntconv.c:1423 ../pidgin/gtkconv.c:8156
 msgid "help &lt;command&gt;:  Help on a specific command."
 msgstr "help &lt;command&gt;:  ??????? ????? ???? ???? ?????? ??? ?? ?"
 
-#: ../finch/gntconv.c:1426
 msgid "users:  Show the list of users in the chat."
 msgstr "users:  ??????? ??????? ????????????? ?????? ???????? ??? ?? ?"
 
-#: ../finch/gntconv.c:1431
 msgid "plugins: Show the plugins window."
 msgstr "plugins: ????? ??? ???????????? ???????? ??? ?? ?"
 
-#: ../finch/gntconv.c:1434
 msgid "buddylist: Show the buddylist."
 msgstr "buddylist: ?????? ?????? ???????? ??? ?'?"
 
-#: ../finch/gntconv.c:1437
 msgid "accounts: Show the accounts window."
 msgstr "accounts: ?????? ???????????? ???????? ??? ?'? ?"
 
-#: ../finch/gntconv.c:1440
 msgid "debugwin: Show the debug window."
 msgstr "debugwin: ????? ???????????? ???????? ??? ?'? ?"
 
-#: ../finch/gntconv.c:1443
 msgid "prefs: Show the preference window."
 msgstr "prefs: ????? ???????????? ???????? ??? ?'? ?"
 
-#: ../finch/gntconv.c:1446
 msgid "statuses: Show the savedstatuses window."
 msgstr "statuses: savedstatuses ???????????? ???????? ??? ?'? ?"
 
-#: ../finch/gntconv.c:1452
 msgid ""
 "msgcolor &lt;class&gt; &lt;foreground&gt; &lt;background&gt;: Set the color "
 "for different classes of messages in the conversation window.<br>    &lt;"
@@ -1211,18 +710,14 @@ msgstr ""
 "cyan, default<br><br>EXAMPLE:<br>    msgcolor send cyan default"
 msgstr ""
 "msgcolor &lt;class&gt; &lt;foreground&gt; &lt;background&gt;: ??????? "
-"????????????? ??????? ??????? ?????? ????????? ???? ?? ???????? ??? ?<br>    "
-"&lt;"
+"????????????? ??????? ??????? ?????? ????????? ???? ?? ???????? ??? ?<br>    &lt;"
 "class&gt;: receive, send, highlight, action, timestamp<br>    &lt;foreground/"
 "background&gt;: black, red, green, blue, white, gray, darkgray, magenta, "
 "cyan, default<br><br>EXAMPLE:<br>    msgcolor send cyan default"
 
-#: ../finch/gntdebug.c:272 ../pidgin/gtkconv.c:995 ../pidgin/gtkdebug.c:219
-#: ../pidgin/gtkft.c:533 ../pidgin/gtkutils.c:3650
 msgid "Unable to open file."
 msgstr "??????? ??????? ?????? ?"
 
-#: ../finch/gntdebug.c:312 ../finch/gntui.c:103 ../pidgin/gtkdebug.c:689
 msgid "Debug Window"
 msgstr "????? ????????????"
 
@@ -1230,19 +725,15 @@ msgstr "????? ??????#. * 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:333 ../pidgin/gtkdebug.c:752
 msgid "Clear"
 msgstr "???????? ???"
 
-#: ../finch/gntdebug.c:344
 msgid "Filter:"
 msgstr "???????:"
 
-#: ../finch/gntdebug.c:350 ../pidgin/gtkdebug.c:761
 msgid "Pause"
 msgstr "??????"
 
-#: ../finch/gntft.c:121 ../pidgin/gtkft.c:227
 #, c-format
 msgid "File Transfers - %d%% of %d file"
 msgid_plural "File Transfers - %d%% of %d files"
@@ -1250,299 +741,212 @@ msgstr[1] "??????? ???msgstr[1] "??????? ??????    %d%% ??? %d ???????????"
 
 #. Create the window.
-#: ../finch/gntft.c:128 ../finch/gntft.c:215 ../finch/gntui.c:104
-#: ../pidgin/gtkft.c:234 ../pidgin/gtkft.c:744
 msgid "File Transfers"
 msgstr "??????? ??????"
 
-#: ../finch/gntft.c:220 ../pidgin/gtkft.c:625
 msgid "Progress"
 msgstr "?????? ????"
 
-#: ../finch/gntft.c:220 ../pidgin/gtkft.c:632
 msgid "Filename"
 msgstr "???????? ???"
 
-#: ../finch/gntft.c:220 ../pidgin/gtkft.c:639
 msgid "Size"
 msgstr "????"
 
-#: ../finch/gntft.c:220
 msgid "Speed"
 msgstr "???"
 
-#: ../finch/gntft.c:220 ../pidgin/gtkft.c:646
 msgid "Remaining"
 msgstr "???????"
 
 #. XXX: Use of ggp_str_to_uin() is an ugly hack!
 #. presence
-#: ../finch/gntft.c:220 ../finch/gntstatus.c:549 ../finch/gntstatus.c:578
-#: ../libpurple/protocols/bonjour/bonjour.c:368
-#: ../libpurple/protocols/gg/gg.c:1104 ../libpurple/protocols/gg/gg.c:1793
-#: ../libpurple/protocols/gg/gg.c:1801
-#: ../libpurple/protocols/jabber/buddy.c:765
-#: ../libpurple/protocols/jabber/buddy.c:773
-#: ../libpurple/protocols/jabber/buddy.c:842
-#: ../libpurple/protocols/jabber/jabber.c:1997
-#: ../libpurple/protocols/msn/msn.c:801 ../libpurple/protocols/msn/msn.c:811
-#: ../libpurple/protocols/msn/msn.c:816 ../libpurple/protocols/msn/msn.c:819
-#: ../libpurple/protocols/msnp9/msn.c:559
-#: ../libpurple/protocols/mxit/mxit.c:330
-#: ../libpurple/protocols/mxit/profile.c:140
-#: ../libpurple/protocols/novell/novell.c:2862
-#: ../libpurple/protocols/oscar/oscar.c:964
-#: ../libpurple/protocols/oscar/oscar.c:3241
-#: ../libpurple/protocols/sametime/sametime.c:3337
-#: ../libpurple/protocols/sametime/sametime.c:4229
-#: ../libpurple/protocols/yahoo/libymsg.c:3876 ../pidgin/gtkblist.c:3710
-#: ../pidgin/gtkblist.c:3724 ../pidgin/gtkblist.c:3726
-#: ../pidgin/gtksavedstatuses.c:1017 ../pidgin/gtksavedstatuses.c:1168
 msgid "Status"
 msgstr "??????"
 
-#: ../finch/gntft.c:230
 msgid "Close this window when all transfers finish"
 msgstr "??????? ?????? ?????? ?'?? ?? ???????????? ???? ????"
 
-#: ../finch/gntft.c:237
 msgid "Clear finished transfers"
 msgstr "?????? ?????? ???? ???????"
 
-#: ../finch/gntft.c:251 ../finch/gntroomlist.c:274
 msgid "Stop"
 msgstr "???"
 
-#: ../finch/gntft.c:324 ../pidgin/gtkft.c:167 ../pidgin/gtkft.c:928
 msgid "Waiting for transfer to begin"
 msgstr "??????? ?????? ??????? ??? ????"
 
-#: ../finch/gntft.c:391 ../pidgin/gtkft.c:161 ../pidgin/gtkft.c:1009
 msgid "Canceled"
 msgstr "????? ??? ????"
 
-#: ../finch/gntft.c:393 ../pidgin/gtkft.c:1011
 msgid "Failed"
 msgstr "????"
 
-#: ../finch/gntft.c:439 ../pidgin/gtkft.c:132
 #, c-format
 msgid "%.2f KiB/s"
 msgstr "%.2f KiB/s"
 
-#: ../finch/gntft.c:450
 msgid "Sent"
 msgstr "?????? ?'?"
 
-#: ../finch/gntft.c:450
 msgid "Received"
 msgstr "???????"
 
-#: ../finch/gntft.c:451 ../pidgin/gtkft.c:158 ../pidgin/gtkft.c:1074
 msgid "Finished"
 msgstr "??????"
 
-#: ../finch/gntft.c:453
 #, c-format
 msgid "The file was saved as %s."
 msgstr "%s ???? ??????? ???????? ???? ?"
 
-#: ../finch/gntft.c:460
 msgid "Sending"
 msgstr "?????? ????"
 
-#: ../finch/gntft.c:460
 msgid "Receiving"
 msgstr "??????? ??? ????"
 
-#: ../finch/gntlog.c:193
 #, c-format
 msgid "Conversation in %s on %s"
 msgstr "%s ? %s ????????? ??????"
 
-#: ../finch/gntlog.c:196
 #, c-format
 msgid "Conversation with %s on %s"
 msgstr "%s ? ???? %s ????????? ??????"
 
-#: ../finch/gntlog.c:239 ../pidgin/gtklog.c:507
 msgid "%B %Y"
 msgstr "%B %Y"
 
-#: ../finch/gntlog.c:279 ../pidgin/gtklog.c:554
 msgid ""
 "System events will only be logged if the \"Log all status changes to system "
 "log\" preference is enabled."
 msgstr ""
-"\"?????? ???????? ????????? ???? ?? ??????, ??????? ??? ??????????? ??? "
-"?'?\" ????????? ?????? ??? ?????? ??????? ???? ?? ??? ?'? ?"
+"\"?????? ???????? ????????? ???? ?? ??????, ??????? ??? ??????????? ??? ?'?\" ????????? "
+"?????? ??? ?????? ??????? ???? ?? ??? ?'? ?"
 
-#: ../finch/gntlog.c:283 ../pidgin/gtklog.c:558
 msgid ""
 "Instant messages will only be logged if the \"Log all instant messages\" "
 "preference is enabled."
 msgstr ""
-"\"???? ????????? ?????? ?? ??? ?'?\" ????????? ?????? ??? ?????? ???? "
-"????????? ?????? "
-"?? ??? ?'? ?"
+"\"???? ????????? ?????? ?? ??? ?'?\" ????????? ?????? ??? ?????? ???? ????????? "
+"?????? ?? ??? ?'? ?"
 
-#: ../finch/gntlog.c:286 ../pidgin/gtklog.c:561
-msgid "Chats will only be logged if the \"Log all chats\" preference is enabled."
+msgid ""
+"Chats will only be logged if the \"Log all chats\" preference is enabled."
 msgstr "\"???? ?????? ?? ??? ?'?\" ????????? ?????? ?????? ?????? ?? ??? ?'? ?"
 
-#: ../finch/gntlog.c:292 ../pidgin/gtklog.c:570
 msgid "No logs were found"
 msgstr "???? ?? ???? ?????"
 
-#: ../finch/gntlog.c:339 ../pidgin/gtklog.c:650
 msgid "Total log size:"
 msgstr "??? ??? ???:"
 
 #. Search box *********
-#: ../finch/gntlog.c:347
 msgid "Scroll/Search: "
 msgstr "???????/????????? ???: "
 
-#: ../finch/gntlog.c:405 ../pidgin/gtklog.c:720
 #, c-format
 msgid "Conversations in %s"
 msgstr "%s ? ??????"
 
-#: ../finch/gntlog.c:413 ../finch/gntlog.c:490 ../pidgin/gtklog.c:728
-#: ../pidgin/gtklog.c:809
 #, c-format
 msgid "Conversations with %s"
 msgstr "%s ? ???? ??????"
 
-#: ../finch/gntlog.c:415
 msgid "All Conversations"
 msgstr "???? ??????"
 
-#: ../finch/gntlog.c:515 ../pidgin/gtklog.c:834
 msgid "System Log"
 msgstr "???????? ??"
 
-#: ../finch/gntmedia.c:159 ../pidgin/gtkmedia.c:329
 msgid "Calling..."
 msgstr "?? ??? ????..."
 
-#: ../finch/gntmedia.c:160
 msgid "Hangup"
 msgstr "?? ?????? ???"
 
 #. Number of actions
-#: ../finch/gntmedia.c:161 ../libpurple/certificate.c:1342
 msgid "Accept"
 msgstr "????? ???"
 
-#: ../finch/gntmedia.c:162 ../libpurple/certificate.c:1343
 msgid "Reject"
 msgstr "???????????? ???"
 
-#: ../finch/gntmedia.c:190 ../pidgin/gtkmedia.c:816 ../pidgin/gtkmedia.c:818
 msgid "Call in progress."
 msgstr "?? ??? ??? ?"
 
-#: ../finch/gntmedia.c:242 ../pidgin/gtkmedia.c:795
 msgid "The call has been terminated."
 msgstr "?? ???? ??? ???? ?"
 
-#: ../finch/gntmedia.c:270 ../pidgin/gtkmedia.c:504
 #, c-format
 msgid "%s wishes to start an audio session with you."
 msgstr "%s ? ?????? ???? ??? ????' ??????? ????? ?????? ?????? ?"
 
-#: ../finch/gntmedia.c:274
 #, c-format
 msgid "%s is trying to start an unsupported media session type with you."
 msgstr ""
-"%s ?????? ?????? ???? ??? ???????? ???? ??????? ??????? ?????? ?????? ??? "
-"???? ?"
+"%s ?????? ?????? ???? ??? ???????? ???? ??????? ??????? ?????? ?????? ??? ???? ?"
 
-#: ../finch/gntmedia.c:288 ../pidgin/gtkmedia.c:811
 msgid "You have rejected the call."
 msgstr "????? ?? ???????????? ????? ?"
 
-#: ../finch/gntmedia.c:481
 msgid "call: Make an audio call."
 msgstr "call: ??? ????' ?? ??? ?"
 
-#: ../finch/gntnotify.c:179
 msgid "Emails"
 msgstr "? ????"
 
-#: ../finch/gntnotify.c:185 ../finch/gntnotify.c:248
 msgid "You have mail!"
 msgstr "?????? ???? ???!"
 
-#: ../finch/gntnotify.c:188 ../pidgin/gtknotify.c:724
 msgid "Sender"
 msgstr "?????"
 
-#: ../finch/gntnotify.c:188 ../pidgin/gtknotify.c:731
 msgid "Subject"
 msgstr "????"
 
-#: ../finch/gntnotify.c:219
 #, c-format
 msgid "%s (%s) has %d new message."
 msgid_plural "%s (%s) has %d new messages."
 msgstr[0] "%s (%s) ? %d ???? ??? ????? ?"
 msgstr[1] "%s (%s) ? %d ???? ??????? ????? ?"
 
-#: ../finch/gntnotify.c:248 ../pidgin/gtknotify.c:1528
 msgid "New Mail"
 msgstr "???? ???"
 
-#: ../finch/gntnotify.c:354 ../pidgin/gtknotify.c:1168
 #, c-format
 msgid "Info for %s"
 msgstr "%s ? ????"
 
-#: ../finch/gntnotify.c:355 ../pidgin/gtknotify.c:1169
 msgid "Buddy Information"
 msgstr "???? ????????? ????"
 
-#: ../finch/gntnotify.c:445 ../libpurple/protocols/mxit/login.c:684
-#: ../libpurple/protocols/mxit/splashscreen.c:211
-#: ../libpurple/protocols/qq/group_join.c:338
 msgid "Continue"
 msgstr "??????"
 
-#: ../finch/gntnotify.c:454 ../pidgin/gtkconv.c:1714
-#: ../pidgin/gtknotify.c:1570
 msgid "IM"
 msgstr "IM"
 
-#: ../finch/gntnotify.c:460 ../libpurple/conversation.c:2119
-#: ../libpurple/protocols/sametime/sametime.c:3547
 msgid "Invite"
 msgstr "???????? ???"
 
-#: ../finch/gntnotify.c:463
 msgid "(none)"
 msgstr "(?????)"
 
 #. XXX: The following expects that finch_notify_message gets called. This
 #. * may not always happen, e.g. when another plugin sets its own
 #. * notify_message. So tread carefully.
-#: ../finch/gntnotify.c:489 ../finch/plugins/gnttinyurl.c:370
 msgid "URI"
 msgstr "URI"
 
-#: ../finch/gntplugin.c:86 ../finch/gntplugin.c:95
 msgid "ERROR"
 msgstr "??????"
 
-#: ../finch/gntplugin.c:86
 msgid "loading plugin failed"
 msgstr "????? ?? ??? ?????? ????"
 
-#: ../finch/gntplugin.c:95
 msgid "unloading plugin failed"
 msgstr "????? ?? ?? ??? ?????? ????"
 
-#: ../finch/gntplugin.c:141
 #, c-format
 msgid ""
 "Name: %s\n"
@@ -1559,41 +963,32 @@ msgstr ""
 "??? ????: %s\n"
 "???????? ???: %s\n"
 
-#: ../finch/gntplugin.c:199
 msgid "Plugin need to be loaded before you can configure it."
 msgstr "????? ?? ??????? ???? ???? ??? ??? ??? ?????? ?"
 
-#: ../finch/gntplugin.c:247
 msgid "No configuration options for this plugin."
 msgstr "?? ????? ??? ???? ???? ???????? ?????? ??????? ??? ?"
 
-#: ../finch/gntplugin.c:268
 msgid "Error loading plugin"
 msgstr "????? ?? ??? ?????? ??????"
 
-#: ../finch/gntplugin.c:269
 msgid "The selected file is not a valid plugin."
 msgstr "????????? ??????? ??? ???? ????? ?? ?"
 
-#: ../finch/gntplugin.c:270
-msgid "Please open the debug window and try again to see the exact error message."
+msgid ""
+"Please open the debug window and try again to see the exact error message."
 msgstr ""
-"??????? ??? ????? ???????????? ???? ??? ???? ??????? ?????? ????? ????????? "
-"??? ?"
+"??????? ??? ????? ???????????? ???? ??? ???? ??????? ?????? ????? ????????? ??? ?"
 
-#: ../finch/gntplugin.c:333
 msgid "Select plugin to install"
 msgstr "???????? ???? ????????? ??? ????? ?? ???????? ???"
 
-#: ../finch/gntplugin.c:359
 msgid "You can (un)load plugins from the following list."
 msgstr "?????????? ??????? ??? ????? ?? ???/?? ??? ?????? ???? ?"
 
-#: ../finch/gntplugin.c:410
 msgid "Install Plugin..."
 msgstr "????? ?? ???????? ???..."
 
-#: ../finch/gntplugin.c:420
 msgid "Configure Plugin"
 msgstr "????? ?? ??????? ???"
 
@@ -1602,389 +997,288 @@ msgstr "????? ?? ???
 #. (that should have been "effect," right?)
 #. Back to instant-apply! I win!  BU-HAHAHA!
 #. Create the window
-#: ../finch/gntplugin.c:526 ../finch/gntplugin.c:533 ../finch/gntprefs.c:265
-#: ../finch/gntui.c:108 ../pidgin/gtkprefs.c:2781
 msgid "Preferences"
 msgstr "?????"
 
-#: ../finch/gntpounce.c:195 ../pidgin/gtkpounce.c:270
 msgid "Please enter a buddy to pounce."
 msgstr "?????? ???? ????????? ??????? ??? ???? ?????? ??????? ??? ?"
 
-#: ../finch/gntpounce.c:340
 msgid "New Buddy Pounce"
 msgstr "?????? ???? ???? ??????"
 
-#: ../finch/gntpounce.c:340
 msgid "Edit Buddy Pounce"
 msgstr "?????? ???? ??????? ?????? ???????"
 
-#: ../finch/gntpounce.c:345
 msgid "Pounce Who"
 msgstr "??? ???? ?????? ??? ?'?"
 
 #. Account:
-#: ../finch/gntpounce.c:348 ../finch/gntstatus.c:458
 msgid "Account:"
 msgstr "?????:"
 
-#: ../finch/gntpounce.c:370
 msgid "Buddy name:"
 msgstr "?????? ???:"
 
 #. Create the "Pounce When Buddy..." frame.
-#: ../finch/gntpounce.c:388 ../pidgin/gtkpounce.c:606
 msgid "Pounce When Buddy..."
 msgstr "????? ?????? ??????? ??? ??? ?'?? ?????? ??? ?'?..."
 
-#: ../finch/gntpounce.c:390
 msgid "Signs on"
 msgstr "??????? ???"
 
-#: ../finch/gntpounce.c:391
 msgid "Signs off"
 msgstr "????????? ???"
 
-#: ../finch/gntpounce.c:392
 msgid "Goes away"
 msgstr "????????? ?'??"
 
-#: ../finch/gntpounce.c:393
 msgid "Returns from away"
 msgstr "???? ??????? ?'??"
 
-#: ../finch/gntpounce.c:394
 msgid "Becomes idle"
 msgstr "???????? ??????? ?'??"
 
-#: ../finch/gntpounce.c:395
 msgid "Is no longer idle"
 msgstr "???????? ??????? ??? ???????????? ?????"
 
-#: ../finch/gntpounce.c:396
 msgid "Starts typing"
 msgstr "??????? ????? ?????"
 
-#: ../finch/gntpounce.c:397
 msgid "Pauses while typing"
 msgstr "????? ???? ??? ?'??"
 
-#: ../finch/gntpounce.c:398
 msgid "Stops typing"
 msgstr "??????? ???? ?????"
 
-#: ../finch/gntpounce.c:399
 msgid "Sends a message"
 msgstr "??? ?????? ??????"
 
 #. Create the "Action" frame.
-#: ../finch/gntpounce.c:428 ../pidgin/gtkpounce.c:667
 msgid "Action"
 msgstr "???"
 
-#: ../finch/gntpounce.c:430
 msgid "Open an IM window"
 msgstr "??? IM ???????????? ????"
 
-#: ../finch/gntpounce.c:431
 msgid "Pop up a notification"
 msgstr "?? ?? ??? ????????? ???????? ??? ?'?"
 
-#: ../finch/gntpounce.c:432
 msgid "Send a message"
 msgstr "??? ?????? ?????? ????"
 
-#: ../finch/gntpounce.c:433
 msgid "Execute a command"
 msgstr "??? ???? ??????? ???"
 
-#: ../finch/gntpounce.c:434
 msgid "Play a sound"
 msgstr "???? ????? ?'?"
 
-#: ../finch/gntpounce.c:462
 msgid "Pounce only when my status is not Available"
 msgstr "????? ?????? ??????? ???????? ??? ?????? ??? ?'?"
 
-#: ../finch/gntpounce.c:464 ../pidgin/gtkpounce.c:1318
 msgid "Recurring"
 msgstr "???????????????"
 
-#: ../finch/gntpounce.c:632
 msgid "Cannot create pounce"
 msgstr "?????? ??????? ??? ?????"
 
-#: ../finch/gntpounce.c:633
 msgid "You do not have any accounts."
 msgstr "?????? ???? ????? ??????? ???"
 
-#: ../finch/gntpounce.c:634
 msgid "You must create an account first before you can create a pounce."
 msgstr "?????? ??????? ???? ???? ??? ????? ??????? ??? ?????? ?"
 
-#: ../finch/gntpounce.c:676 ../pidgin/gtkpounce.c:1134
 #, c-format
 msgid "Are you sure you want to delete the pounce on %s for %s?"
 msgstr "%s ? ???? ????????? %s ?????? ????? ??????????? ???????? ?????? ?? ?"
 
-#: ../finch/gntpounce.c:710 ../finch/gntui.c:101 ../pidgin/gtkpounce.c:1361
 msgid "Buddy Pounces"
 msgstr "?????? ???? ??????"
 
-#: ../finch/gntpounce.c:819
 #, c-format
 msgid "%s has started typing to you (%s)"
 msgstr "??????? ?????? ????? ???? %s ? ??????? ????? ????? (%s)"
 
-#: ../finch/gntpounce.c:820
 #, c-format
 msgid "%s has paused while typing to you (%s)"
 msgstr "??????? ?????? ????? ???? %s ? ??????? ???? ????? (%s)"
 
-#: ../finch/gntpounce.c:821
 #, c-format
 msgid "%s has signed on (%s)"
 msgstr "%s ? ?????? ????? (%s)"
 
-#: ../finch/gntpounce.c:822
 #, c-format
 msgid "%s has returned from being idle (%s)"
 msgstr "???????? ??????? ??? %s ? ???????????? ????? (%s)"
 
-#: ../finch/gntpounce.c:823
 #, c-format
 msgid "%s has returned from being away (%s)"
 msgstr "????????? ??????? ??? %s ? ???????????? ????? (%s)"
 
-#: ../finch/gntpounce.c:824
 #, c-format
 msgid "%s has stopped typing to you (%s)"
 msgstr "??????? ?????? ????? ??? %s ???? ???? ????? (%s)"
 
-#: ../finch/gntpounce.c:825
 #, c-format
 msgid "%s has signed off (%s)"
 msgstr "%s ? ???????? ????? (%s)"
 
-#: ../finch/gntpounce.c:826
 #, c-format
 msgid "%s has become idle (%s)"
 msgstr "%s ? ????? ???????? ??????? ????? ????? (%s)"
 
-#: ../finch/gntpounce.c:827
 #, c-format
 msgid "%s has gone away. (%s)"
 msgstr "%s ???? ?'? ? (%s)"
 
-#: ../finch/gntpounce.c:828
 #, c-format
 msgid "%s has sent you a message. (%s)"
 msgstr "%s ? ?????? ?????? ???? ? (%s)"
 
-#: ../finch/gntpounce.c:847
 msgid "Unknown pounce event. Please report this!"
 msgstr "??????? ?????? ???? ? ??????? ??? ?? ????? ????? ???!"
 
-#: ../finch/gntprefs.c:93
 msgid "Based on keyboard use"
 msgstr "????? ??? ???????? ???????"
 
-#: ../finch/gntprefs.c:95 ../pidgin/gtkprefs.c:2660
 msgid "From last sent message"
 msgstr "??????? ??????? ?????? ???????"
 
-#: ../finch/gntprefs.c:97 ../pidgin/gtkprefs.c:1377 ../pidgin/gtkprefs.c:1385
-#: ../pidgin/gtkprefs.c:2659 ../pidgin/gtkprefs.c:2695
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:310
 msgid "Never"
 msgstr "??????? ???"
 
-#: ../finch/gntprefs.c:185
 msgid "Show Idle Time"
 msgstr "???????? ??????? ??? ???????? ??? ?'?"
 
-#: ../finch/gntprefs.c:186
 msgid "Show Offline Buddies"
 msgstr "?? ???? ?????? ???????? ???"
 
-#: ../finch/gntprefs.c:193
 msgid "Notify buddies when you are typing"
 msgstr "????? ???? ????? ????? ?????? ????? ???"
 
-#: ../finch/gntprefs.c:199 ../finch/plugins/gnthistory.c:157
 msgid "Log format"
 msgstr "??? ???????"
 
-#: ../finch/gntprefs.c:200 ../finch/plugins/gnthistory.c:147
 msgid "Log IMs"
 msgstr "????????? ??????? ?? ??????? ??? ?'?"
 
-#: ../finch/gntprefs.c:201 ../finch/plugins/gnthistory.c:148
 msgid "Log chats"
 msgstr "?????? ?? ??? ?'?"
 
-#: ../finch/gntprefs.c:202
 msgid "Log status change events"
 msgstr "?????? ????????? ???????? ?? ??? ?'?"
 
-#: ../finch/gntprefs.c:208
 msgid "Report Idle time"
 msgstr "???????? ??????? ??? ????????? ???"
 
-#: ../finch/gntprefs.c:209
 msgid "Change status when idle"
 msgstr "???????? ??????? ?????? ?????? ???????? ??? ?'?"
 
-#: ../finch/gntprefs.c:210
 msgid "Minutes before changing status"
 msgstr "?????? ????????? ???? ??????? ???? ????????? ??????? ?????"
 
-#: ../finch/gntprefs.c:211
 msgid "Change status to"
 msgstr "???????? ??????? ???????? ??? ?'?"
 
-#: ../finch/gntprefs.c:260 ../pidgin/gtkprefs.c:1486 ../pidgin/gtkprefs.c:2752
 msgid "Conversations"
 msgstr "?????????"
 
-#: ../finch/gntprefs.c:261 ../finch/plugins/gnthistory.c:155
-#: ../pidgin/gtkprefs.c:2178 ../pidgin/gtkprefs.c:2753
 msgid "Logging"
 msgstr "?? ????????"
 
-#: ../finch/gntrequest.c:391
 msgid "You must fill all the required fields."
 msgstr "???? ?????? ???????? ???? ???? ???? ????? ?"
 
-#: ../finch/gntrequest.c:392
 msgid "The required fields are underlined."
 msgstr "?????? ???????????? ??? ???? ???? ???? ?"
 
-#: ../finch/gntrequest.c:653
 msgid "Not implemented yet."
 msgstr "???? ?????? ???????? ??? ?"
 
-#: ../finch/gntrequest.c:758 ../pidgin/gtkrequest.c:1627
-#: ../pidgin/gtkrequest.c:1673
 msgid "Save File..."
 msgstr "??????? ??????? ???..."
 
-#: ../finch/gntrequest.c:758 ../pidgin/gtkrequest.c:1628
-#: ../pidgin/gtkrequest.c:1674
 msgid "Open File..."
 msgstr "??????? ????..."
 
-#: ../finch/gntrequest.c:775
 msgid "Choose Location..."
 msgstr "??????? ???????? ???..."
 
-#: ../finch/gntroomlist.c:209
 msgid "Hit 'Enter' to find more rooms of this category."
 msgstr "?? ??????? ???????? ??? ????????? ???? ???? 'Enter' ???? ?"
 
-#: ../finch/gntroomlist.c:275
 msgid "Get"
 msgstr "??????? ???"
 
 #. Create the window.
-#: ../finch/gntroomlist.c:287 ../finch/gntui.c:106 ../pidgin/gtkblist.c:7181
-#: ../pidgin/gtkroomlist.c:533
 msgid "Room List"
 msgstr "???? ??????"
 
-#: ../finch/gntsound.c:97 ../pidgin/gtksound.c:64
 msgid "Buddy logs in"
 msgstr "??????? ?????? ?????"
 
-#: ../finch/gntsound.c:98 ../pidgin/gtksound.c:65
 msgid "Buddy logs out"
 msgstr "??????? ???????? ?????"
 
-#: ../finch/gntsound.c:99 ../pidgin/gtksound.c:66
 msgid "Message received"
 msgstr "?????? ??????? ????"
 
-#: ../finch/gntsound.c:100 ../pidgin/gtksound.c:67
 msgid "Message received begins conversation"
 msgstr "?????? ????? ??? ?'?? ??????? ????? ?'?"
 
-#: ../finch/gntsound.c:101 ../pidgin/gtksound.c:68
 msgid "Message sent"
 msgstr "?????? ??????? ????"
 
-#: ../finch/gntsound.c:102 ../pidgin/gtksound.c:69
 msgid "Person enters chat"
 msgstr "????????? ??????? ??? ????"
 
-#: ../finch/gntsound.c:103 ../pidgin/gtksound.c:70
 msgid "Person leaves chat"
 msgstr "????????? ??????? ??? ??????? ????"
 
-#: ../finch/gntsound.c:104 ../pidgin/gtksound.c:71
 msgid "You talk in chat"
 msgstr "????? ?????? ?????"
 
-#: ../finch/gntsound.c:105 ../pidgin/gtksound.c:72
 msgid "Others talk in chat"
 msgstr "????? ?????? ?????"
 
-#: ../finch/gntsound.c:107 ../pidgin/gtksound.c:75
 msgid "Someone says your username in chat"
 msgstr "??????? ?????? ??? ?????? ?????"
 
-#: ../finch/gntsound.c:368 ../pidgin/gtksound.c:314
 msgid "GStreamer Failure"
 msgstr "GStreamer ? ??????"
 
-#: ../finch/gntsound.c:369 ../pidgin/gtksound.c:315
 msgid "GStreamer failed to initialize."
 msgstr "GStreamer ????? ?????? ???? ?"
 
-#: ../finch/gntsound.c:723 ../finch/gntsound.c:809 ../pidgin/gtkpounce.c:178
-#: ../pidgin/gtkpounce.c:189 ../pidgin/gtkpounce.c:321
-#: ../pidgin/gtkpounce.c:691 ../pidgin/gtkpounce.c:953
-#: ../pidgin/gtkprefs.c:951 ../pidgin/gtkprefs.c:2303
-#: ../pidgin/gtkprefs.c:2401 ../pidgin/gtkprefs.c:2601
 msgid "(default)"
 msgstr "?????????"
 
-#: ../finch/gntsound.c:736
 msgid "Select Sound File ..."
 msgstr "???? ??????? ???????? ??? ..."
 
-#: ../finch/gntsound.c:911
 msgid "Sound Preferences"
 msgstr "???? ????????? ?????"
 
-#: ../finch/gntsound.c:922
 msgid "Profiles"
 msgstr "??????????"
 
-#: ../finch/gntsound.c:961 ../pidgin/gtkprefs.c:2464
 msgid "Automatic"
 msgstr "??????????"
 
-#: ../finch/gntsound.c:964
 msgid "Console Beep"
 msgstr "??????? ???"
 
-#: ../finch/gntsound.c:965 ../pidgin/gtkprefs.c:2468
 msgid "Command"
 msgstr "????"
 
-#: ../finch/gntsound.c:966
 msgid "No Sound"
 msgstr "???? ?????"
 
-#: ../finch/gntsound.c:968
 msgid "Sound Method"
 msgstr "???? ??????"
 
-#: ../finch/gntsound.c:973
 msgid "Method: "
 msgstr "??????:"
 
-#: ../finch/gntsound.c:980
 #, c-format
 msgid ""
 "Sound Command\n"
@@ -1994,87 +1288,56 @@ msgstr ""
 "(???????? ???? ???? %s)"
 
 #. Sound options
-#: ../finch/gntsound.c:988 ../pidgin/gtkprefs.c:2454
 msgid "Sound Options"
 msgstr "???? ????????? ??????"
 
-#: ../finch/gntsound.c:989
 msgid "Sounds when conversation has focus"
 msgstr "??????? ???? ??????? ????? ??????? ????"
 
-#: ../finch/gntsound.c:997 ../pidgin/gtkprefs.c:1375 ../pidgin/gtkprefs.c:1387
-#: ../pidgin/gtkprefs.c:2499 ../pidgin/plugins/timestamp_format.c:42
-#: ../pidgin/plugins/timestamp_format.c:51
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:311
 msgid "Always"
 msgstr "????"
 
-#: ../finch/gntsound.c:998 ../pidgin/gtkprefs.c:2497
 msgid "Only when available"
 msgstr "??? ??????? ??????"
 
-#: ../finch/gntsound.c:999 ../pidgin/gtkprefs.c:2498
 msgid "Only when not available"
 msgstr "??? ??????? ????????"
 
-#: ../finch/gntsound.c:1006
 msgid "Volume(0-100):"
 msgstr "???????????(? ???):"
 
 #. Sound events
-#: ../finch/gntsound.c:1025 ../pidgin/gtkprefs.c:2526
 msgid "Sound Events"
 msgstr "???? ????"
 
-#: ../finch/gntsound.c:1027 ../pidgin/gtknotify.c:1600
-#: ../pidgin/gtkprefs.c:2586
 msgid "Event"
 msgstr "????"
 
-#: ../finch/gntsound.c:1027
 msgid "File"
 msgstr "???????"
 
-#: ../finch/gntsound.c:1046
 msgid "Test"
 msgstr "???????"
 
-#: ../finch/gntsound.c:1049 ../pidgin/gtkpounce.c:695
 msgid "Reset"
 msgstr "??????????"
 
-#: ../finch/gntsound.c:1052
 msgid "Choose..."
 msgstr "????? ???..."
 
-#: ../finch/gntstatus.c:140
 #, c-format
 msgid "Are you sure you want to delete \"%s\""
 msgstr "????? ??????????? \"%s\" ? ???????? ??????"
 
-#: ../finch/gntstatus.c:143
 msgid "Delete Status"
 msgstr "?????? ???????"
 
-#: ../finch/gntstatus.c:178 ../pidgin/gtksavedstatuses.c:615
 msgid "Saved Statuses"
 msgstr "???????? ??????"
 
-#. title
-#. optional information
-#: ../finch/gntstatus.c:185 ../finch/gntstatus.c:541
-#: ../libpurple/protocols/jabber/buddy.c:361
-#: ../libpurple/protocols/jabber/buddy.c:1156
-#: ../libpurple/protocols/msn/msn.c:920
-#: ../libpurple/protocols/mxit/actions.c:338
-#: ../libpurple/protocols/mxit/profile.c:131
-#: ../libpurple/protocols/myspace/myspace.c:507
-#: ../libpurple/protocols/novell/novell.c:1497
-#: ../libpurple/protocols/qq/group_info.c:141 ../pidgin/gtksavedstatuses.c:514
 msgid "Title"
 msgstr "???????"
 
-#: ../finch/gntstatus.c:185 ../pidgin/gtksavedstatuses.c:529
 msgid "Type"
 msgstr "???"
 
@@ -2086,211 +1349,132 @@ msgstr "???"
 #. user_settable
 #. not independent
 #. Attributes - each status can have a message.
-#: ../finch/gntstatus.c:185 ../finch/gntstatus.c:566 ../finch/gntstatus.c:578
-#: ../libpurple/conversation.c:2112
-#: ../libpurple/protocols/bonjour/bonjour.c:281
-#: ../libpurple/protocols/bonjour/bonjour.c:288
-#: ../libpurple/protocols/bonjour/bonjour.c:370
-#: ../libpurple/protocols/gg/gg.c:1142 ../libpurple/protocols/gg/gg.c:1796
-#: ../libpurple/protocols/gg/gg.c:1812 ../libpurple/protocols/gg/gg.c:1822
-#: ../libpurple/protocols/gg/gg.c:1828 ../libpurple/protocols/gg/gg.c:1837
-#: ../libpurple/protocols/gg/gg.c:1842 ../libpurple/protocols/irc/irc.c:247
-#: ../libpurple/protocols/jabber/jabber.c:2131
-#: ../libpurple/protocols/jabber/jabber.c:2147
-#: ../libpurple/protocols/jabber/jabber.c:2163
-#: ../libpurple/protocols/jabber/jabber.c:2179
-#: ../libpurple/protocols/jabber/jabber.c:2193
-#: ../libpurple/protocols/jabber/jabber.c:2208
-#: ../libpurple/protocols/msn/msn.c:872 ../libpurple/protocols/msn/msn.c:878
-#: ../libpurple/protocols/msn/msn.c:884 ../libpurple/protocols/msn/msn.c:890
-#: ../libpurple/protocols/msn/msn.c:895 ../libpurple/protocols/msn/msn.c:900
-#: ../libpurple/protocols/mxit/roster.c:78
-#: ../libpurple/protocols/myspace/myspace.c:484
-#: ../libpurple/protocols/novell/novell.c:2865
-#: ../libpurple/protocols/novell/novell.c:2970
-#: ../libpurple/protocols/novell/novell.c:2976
-#: ../libpurple/protocols/novell/novell.c:2982
-#: ../libpurple/protocols/oscar/oscar.c:6256
-#: ../libpurple/protocols/oscar/oscar.c:6270
-#: ../libpurple/protocols/oscar/oscar.c:6286
-#: ../libpurple/protocols/oscar/oscar.c:6293
-#: ../libpurple/protocols/oscar/oscar.c:6300
-#: ../libpurple/protocols/sametime/sametime.c:3360
-#: ../libpurple/protocols/sametime/sametime.c:3366
-#: ../libpurple/protocols/sametime/sametime.c:3372
-#: ../libpurple/protocols/sametime/sametime.c:3451
-#: ../libpurple/protocols/silc/buddy.c:1566
-#: ../libpurple/protocols/silc10/buddy.c:1571
-#: ../libpurple/protocols/simple/simple.c:247
-#: ../libpurple/protocols/yahoo/libymsg.c:4708
-#: ../libpurple/protocols/yahoo/libymsg.c:4714
-#: ../libpurple/protocols/zephyr/zephyr.c:2342 ../pidgin/gtknotify.c:1608
-#: ../pidgin/gtksavedstatuses.c:544 ../pidgin/gtksavedstatuses.c:1032
 msgid "Message"
 msgstr "??????"
 
 #. Use
-#: ../finch/gntstatus.c:196 ../finch/gntstatus.c:595
 msgid "Use"
 msgstr "???????"
 
-#: ../finch/gntstatus.c:303
 msgid "Invalid title"
 msgstr "???? ???????"
 
-#: ../finch/gntstatus.c:304
 msgid "Please enter a non-empty title for the status."
 msgstr "?????? ??????? ???? ???? ??????? ??? ??????? ???? ?"
 
-#: ../finch/gntstatus.c:312
 msgid "Duplicate title"
 msgstr "???????? ???????"
 
-#: ../finch/gntstatus.c:313
 msgid "Please enter a different title for the status."
 msgstr "??????? ??? ?????? ?????????? ????? ??????? ???? ?"
 
-#: ../finch/gntstatus.c:454
 msgid "Substatus"
 msgstr "?? ??????"
 
-#: ../finch/gntstatus.c:466 ../pidgin/gtkft.c:679
 msgid "Status:"
 msgstr "??????:"
 
-#: ../finch/gntstatus.c:481
 msgid "Message:"
 msgstr "??????:"
 
-#: ../finch/gntstatus.c:530
 msgid "Edit Status"
 msgstr "?????? ???????"
 
-#: ../finch/gntstatus.c:572
 msgid "Use different status for following accounts"
 msgstr "?????????? ?????? ???? ????? ?????????? ?????? ?????? ??? ?'?"
 
 #. Save & Use
-#: ../finch/gntstatus.c:606
 msgid "Save & Use"
 msgstr "??????? ??? ??????? ???"
 
-#: ../finch/gntui.c:102
 msgid "Certificates"
 msgstr "??????????"
 
-#: ../finch/gntui.c:107 ../pidgin/gtkprefs.c:2757
 msgid "Sounds"
 msgstr "????"
 
-#: ../finch/gntui.c:109
 msgid "Statuses"
 msgstr "??????"
 
-#: ../finch/plugins/gntclipboard.c:115 ../finch/plugins/gntclipboard.c:121
-#: ../finch/plugins/gntclipboard.c:128
 msgid "Error loading the plugin."
 msgstr "????? ?? ??? ?????? ?????? ?"
 
-#: ../finch/plugins/gntclipboard.c:116
 msgid "Couldn't find X display"
 msgstr "X ???????? ???? ?????"
 
-#: ../finch/plugins/gntclipboard.c:122
 msgid "Couldn't find window"
 msgstr "???????????? ???? ?????"
 
-#: ../finch/plugins/gntclipboard.c:129
 msgid "This plugin cannot be loaded because it was not built with X11 support."
 msgstr "X11 ?????? ???????? ??????? ???? ??? ?? ????? ???? ??? ??? ????? ??? ?"
 
-#: ../finch/plugins/gntclipboard.c:158
 msgid "GntClipboard"
 msgstr "GntClipboard"
 
-#: ../finch/plugins/gntclipboard.c:160
 msgid "Clipboard plugin"
 msgstr "????? ????? ????? ??"
 
-#: ../finch/plugins/gntclipboard.c:161
 msgid ""
 "When the gnt clipboard contents change, the contents are made available to "
 "X, if possible."
 msgstr ""
-"gnt ????? ?????? ????????? ????????? ?'??, X ? ???? ????????? ???? ?????? "
-"???? ????????? ??? ?? ?"
+"gnt ????? ?????? ????????? ????????? ?'??, X ? ???? ????????? ???? ?????? ???? "
+"????????? ??? ?? ?"
 
-#: ../finch/plugins/gntgf.c:232
 #, c-format
 msgid "%s just signed on"
 msgstr "%s ?? ???????? ?????? ?????"
 
-#: ../finch/plugins/gntgf.c:239
 #, c-format
 msgid "%s just signed off"
 msgstr "%s ???? ???? ???????? ?????"
 
-#: ../finch/plugins/gntgf.c:247
 #, c-format
 msgid "%s sent you a message"
 msgstr "%s ? ?????? ????????? ??? ?????? ????????"
 
-#: ../finch/plugins/gntgf.c:266
 #, c-format
 msgid "%s said your nick in %s"
 msgstr "%s ? %s ? ?????? ????? ?????? ?????"
 
-#: ../finch/plugins/gntgf.c:268
 #, c-format
 msgid "%s sent a message in %s"
 msgstr "%s ? %s ? ??? ?????? ????????"
 
-#: ../finch/plugins/gntgf.c:306
 msgid "Buddy signs on/off"
 msgstr "??????? ??????/???????? ?????"
 
-#: ../finch/plugins/gntgf.c:307
 msgid "You receive an IM"
 msgstr "?????? ???? ??? ????????? ?????? ???"
 
-#: ../finch/plugins/gntgf.c:308
 msgid "Someone speaks in a chat"
 msgstr "??????? ??????? ??? ????"
 
-#: ../finch/plugins/gntgf.c:309
 msgid "Someone says your name in a chat"
 msgstr "??????? ?????? ??? ?????? ??? ?'?"
 
-#: ../finch/plugins/gntgf.c:337
 msgid "Notify with a toaster when"
 msgstr "?????????? ?????????? ??????? ?? ????? ??? ?'?"
 
-#: ../finch/plugins/gntgf.c:352
 msgid "Beep too!"
 msgstr "??? ????? ??? ?'?!"
 
-#: ../finch/plugins/gntgf.c:358
 msgid "Set URGENT for the terminal window."
 msgstr "????????? ????????????? ???? URGENT ???????? ??? ?"
 
-#: ../finch/plugins/gntgf.c:378
 msgid "GntGf"
 msgstr "GntGf"
 
-#: ../finch/plugins/gntgf.c:380 ../finch/plugins/gntgf.c:381
 msgid "Toaster plugin"
 msgstr "Toaster ????? ??"
 
-#: ../finch/plugins/gnthistory.c:118 ../pidgin/plugins/history.c:136
 #, c-format
 msgid "<b>Conversation with %s on %s:</b><br>"
 msgstr "<b>%s ? ???? %s ? ??????:</b><br>"
 
-#: ../finch/plugins/gnthistory.c:176 ../pidgin/plugins/history.c:163
 msgid "History Plugin Requires Logging"
 msgstr "???? ????? ????? ?? ???????? ???? ???? ???????? ??????? ??? ??????"
 
-#: ../finch/plugins/gnthistory.c:177 ../pidgin/plugins/history.c:164
 msgid ""
 "Logging can be enabled from Tools -> Preferences -> Logging.\n"
 "\n"
@@ -2299,26 +1483,22 @@ msgstr ""
 msgstr ""
 "???????  > ?????  > ?? ????????? ??? ???? ?????? ??? ??? ?\n"
 "\n"
-"????????? ?????? ???/?? ??????? ???? ?? ?????? ????? ????????? ???? ??????? "
-"???? ???? ???? ???????? ?????? ??? ?'? ?"
+"????????? ?????? ???/?? ??????? ???? ?? ?????? ????? ????????? ???? ??????? ???? "
+"???? ???? ???????? ?????? ??? ?'? ?"
 
-#: ../finch/plugins/gnthistory.c:221
 msgid "GntHistory"
 msgstr "GntHistory"
 
-#: ../finch/plugins/gnthistory.c:223 ../pidgin/plugins/history.c:207
 msgid "Shows recently logged conversations in new conversations."
 msgstr "???? ??????? ???? ???????? ?? ??? ?????? ???????? ??? ?'? ?"
 
-#: ../finch/plugins/gnthistory.c:224 ../pidgin/plugins/history.c:208
 msgid ""
 "When a new conversation is opened this plugin will insert the last "
 "conversation into the current conversation."
 msgstr ""
-"???? ?????? ????? ?'??, ??????? ?????? ?? ????? ?? ?????? ??????? ??????? "
-"?????? ??? ?'? ?"
+"???? ?????? ????? ?'??, ??????? ?????? ?? ????? ?? ?????? ??????? ??????? ?????? ??? "
+"?'? ?"
 
-#: ../finch/plugins/gnttinyurl.c:324
 #, c-format
 msgid ""
 "\n"
@@ -2327,262 +1507,187 @@ msgstr ""
 "\n"
 "TinyURL ??????? ??? ????..."
 
-#: ../finch/plugins/gnttinyurl.c:351
 #, c-format
 msgid "TinyURL for above: %s"
 msgstr "???? ???? TinyURL: %s"
 
-#: ../finch/plugins/gnttinyurl.c:371
 msgid "Please wait while TinyURL fetches a shorter URL ..."
 msgstr "??????? ??? TinyURL ?????? ??? ??? ???? URL ??????? ???? ??????? ???..."
 
-#: ../finch/plugins/gnttinyurl.c:438
 msgid "Only create TinyURL for URLs of this length or greater"
 msgstr "??? ??????? ??? ?? ???? ??? ???? ???? URL ? ???? TinyURL ??????? ??? ?'?"
 
-#: ../finch/plugins/gnttinyurl.c:442
 msgid "TinyURL (or other) address prefix"
 msgstr "TinyURL (?? ???? ????) ?????? ?????????"
 
-#: ../finch/plugins/gnttinyurl.c:471
 msgid "TinyURL"
 msgstr "TinyURL"
 
-#: ../finch/plugins/gnttinyurl.c:473
 msgid "TinyURL plugin"
 msgstr "TinyURL ????? ??"
 
-#: ../finch/plugins/gnttinyurl.c:474
 msgid "When receiving a message with URL(s), use TinyURL for easier copying"
 msgstr "URL ?? ?????? ??????? ???? ????, ??? ???? ?????????? TinyURL ??????? ??? ?'?"
 
-#: ../finch/plugins/grouping.c:44 ../libpurple/protocols/oscar/oscar.c:788
-#: ../libpurple/protocols/qq/qq.c:262
 msgid "Online"
 msgstr "?? ????"
 
 #. primative,						no,							id,			name
-#: ../finch/plugins/grouping.c:46 ../finch/plugins/grouping.c:143
-#: ../libpurple/protocols/gg/gg.c:1075
-#: ../libpurple/protocols/jabber/buddy.c:839
-#: ../libpurple/protocols/jabber/buddy.c:1921
-#: ../libpurple/protocols/mxit/roster.c:53
-#: ../libpurple/protocols/novell/novell.c:2855
-#: ../libpurple/protocols/oscar/oscar.c:960
-#: ../libpurple/protocols/oscar/oscar.c:6090
-#: ../libpurple/protocols/qq/qq.c:259 ../libpurple/protocols/qq/qq.c:266
-#: ../libpurple/protocols/qq/qq.c:428
-#: ../libpurple/protocols/yahoo/libymsg.c:3718 ../libpurple/status.c:161
-#: ../pidgin/gtkblist.c:3710 ../pidgin/gtkblist.c:4119
-#: ../pidgin/gtkdocklet.c:566 ../pidgin/gtkstatusbox.c:1109
-#: ../pidgin/plugins/themeedit-icon.c:67
 msgid "Offline"
 msgstr "?? ????"
 
-#: ../finch/plugins/grouping.c:115 ../pidgin/gtkblist.c:3746
 msgid "Online Buddies"
 msgstr "?? ???? ?????"
 
-#: ../finch/plugins/grouping.c:115
 msgid "Offline Buddies"
 msgstr "?? ???? ?????"
 
-#: ../finch/plugins/grouping.c:125
 msgid "Online/Offline"
 msgstr "?? ????/?? ????"
 
-#: ../finch/plugins/grouping.c:162
 msgid "Meebo"
 msgstr "Meebo"
 
-#: ../finch/plugins/grouping.c:211
 msgid "No Grouping"
 msgstr "?? ?????"
 
-#: ../finch/plugins/grouping.c:292
 msgid "Nested Subgroup"
 msgstr "??????? ?? ??"
 
-#: ../finch/plugins/grouping.c:324
 msgid "Nested Grouping (experimental)"
 msgstr "??????? ????????? (???????????)"
 
-#: ../finch/plugins/grouping.c:367 ../finch/plugins/grouping.c:368
 msgid "Provides alternate buddylist grouping options."
 msgstr "????? ???? ????? ?????? ?????????? ?????? ?????? ??? ?? ?"
 
-#: ../finch/plugins/lastlog.c:69
 msgid "Lastlog"
 msgstr "Lastlog"
 
 #. Translator Note: The "backlog" is the conversation buffer/history.
-#: ../finch/plugins/lastlog.c:100
 msgid "lastlog: Searches for a substring in the backlog."
 msgstr "lastlog: ??? ??? ??? ??????????? ?? ???? ????????? ??? ?? ?"
 
-#: ../finch/plugins/lastlog.c:122
 msgid "GntLastlog"
 msgstr "GntLastlog"
 
-#: ../finch/plugins/lastlog.c:124 ../finch/plugins/lastlog.c:125
 msgid "Lastlog plugin."
 msgstr "Lastlog ????? ?? ?"
 
-#: ../libpurple/account.c:925
 msgid "accounts"
 msgstr "?????"
 
-#: ../libpurple/account.c:1117 ../libpurple/protocols/jabber/auth.c:135
-#: ../libpurple/protocols/jabber/auth_cyrus.c:150
-#: ../libpurple/protocols/silc/silc.c:475
 msgid "Password is required to sign on."
 msgstr "?????? ???? ???? ????????? ??????? ?"
 
-#: ../libpurple/account.c:1151
 #, c-format
 msgid "Enter password for %s (%s)"
 msgstr "%s ? ????????? ???? (%s)"
 
-#: ../libpurple/account.c:1158
 msgid "Enter Password"
 msgstr "????????? ????"
 
-#: ../libpurple/account.c:1163
 msgid "Save password"
 msgstr "????????? ??????? ???"
 
-#: ../libpurple/account.c:1200 ../libpurple/connection.c:119
-#: ../libpurple/connection.c:197
 #, c-format
 msgid "Missing protocol plugin for %s"
 msgstr "%s ? ???? ???? ???? ????? ?? ?????????"
 
-#: ../libpurple/account.c:1201 ../libpurple/connection.c:122
 msgid "Connection Error"
 msgstr "????? ????????? ??????"
 
-#: ../libpurple/account.c:1434 ../libpurple/protocols/gg/gg.c:652
-#: ../libpurple/protocols/jabber/jabber.c:2261
 msgid "New passwords do not match."
 msgstr "???? ????????? ???? ?"
 
-#: ../libpurple/account.c:1447
 msgid "Fill out all fields completely."
 msgstr "???? ???????? ??? ???????????? ???? ??? ?"
 
-#: ../libpurple/account.c:1479
 msgid "Original password"
 msgstr "??? ?????????"
 
-#: ../libpurple/account.c:1487
 msgid "New password"
 msgstr "???? ?????????"
 
-#: ../libpurple/account.c:1495
 msgid "New password (again)"
 msgstr "???? ????????? (???? ????)"
 
-#: ../libpurple/account.c:1502
 #, c-format
 msgid "Change password for %s"
 msgstr "%s ? ????????? ???????? ???"
 
-#: ../libpurple/account.c:1510
 msgid "Please enter your current password and your new password."
 msgstr "??????? ??? ??????? ??? ???? ????????? ???? ???? ?"
 
-#: ../libpurple/account.c:1541
 #, c-format
 msgid "Change user information for %s"
 msgstr "%s ? ???????????? ?????? ??? ????????? ???? ???????? ???"
 
-#: ../libpurple/account.c:1544
-#: ../libpurple/protocols/yahoo/yahoo_aliases.c:587
-#: ../libpurple/protocols/yahoo/yahoo_aliases.c:598
 msgid "Set User Info"
 msgstr "????????????? ???? ???????? ???"
 
-#: ../libpurple/account.c:2028 ../libpurple/protocols/gg/gg.c:1086
-#: ../libpurple/protocols/jabber/buddy.c:773
-#: ../libpurple/protocols/jabber/buddy.c:1917
-#: ../libpurple/protocols/jabber/buddy.c:1934
-#: ../libpurple/protocols/msn/oim.c:688
-#: ../libpurple/protocols/novell/novell.c:2858
-#: ../libpurple/protocols/qq/group_info.c:126
-#: ../libpurple/protocols/qq/qq.c:322 ../pidgin/gtkft.c:164
-#: ../pidgin/plugins/disco/gtkdisco.c:462 ../pidgin/plugins/vvconfig.c:143
+#
+#, fuzzy
+msgid "This protocol does not support setting a public alias."
+msgstr "?? ???? ???? ?????? ?????? ???? ??????? ?????? ??? ?? ?? ?"
+
+#
+#, fuzzy
+msgid "This protocol does not support fetching the public alias."
+msgstr "?? ???? ???? ?????? ?????? ???? ??????? ?????? ??? ?? ?? ?"
+
 msgid "Unknown"
 msgstr "??????"
 
-#: ../libpurple/blist.c:584 ../libpurple/blist.c:1598
-#: ../libpurple/blist.c:1838 ../libpurple/blist.c:1840
-#: ../libpurple/protocols/jabber/roster.c:119
-#: ../libpurple/protocols/myspace/myspace.c:3495 ../pidgin/gtkblist.c:6888
-#: ../pidgin/plugins/gevolution/gevo-util.c:73
-#: ../pidgin/plugins/gevolution/gevolution.c:97
 msgid "Buddies"
 msgstr "?????"
 
-#: ../libpurple/blist.c:611
 msgid "buddy list"
 msgstr "?????? ??????"
 
-#: ../libpurple/certificate.c:94
 msgid "The certificate is self-signed and cannot be automatically checked."
 msgstr "?????????? ????? ?????????? ???? ??? ?????????????? ??????? ??? ????? ??? ?"
 
-#: ../libpurple/certificate.c:98
 msgid ""
 "The certificate is not trusted because no certificate that can verify it is "
 "currently trusted."
 msgstr ""
-"??????? ?????????? ????????????? ?? ?????????? ???????? ????? ??? ?? "
-"?????????? ??????? ??? ????? ??? ?"
+"??????? ?????????? ????????????? ?? ?????????? ???????? ????? ??? ?? ?????????? ??????? "
+"??? ????? ??? ?"
 
-#: ../libpurple/certificate.c:102
 msgid "The certificate is not valid yet."
 msgstr "?????????? ???????? ??? ??? ?"
 
-#: ../libpurple/certificate.c:105
 msgid "The certificate has expired and should not be considered valid."
 msgstr "??????????? ??? ????? ???? ??? ???????? ??? ??? ?"
 
 #. Translators: "domain" refers to a DNS domain (e.g. talk.google.com)
-#: ../libpurple/certificate.c:110
 msgid "The certificate presented is not issued to this domain."
 msgstr "??????? ?????????? ?? ??????? ???? ???? ??? ??? ?"
 
-#: ../libpurple/certificate.c:113
 msgid ""
 "You have no database of root certificates, so this certificate cannot be "
 "validated."
 msgstr ""
-"root ?????????? ????????? ????????? ???? ???, ?? ??????????? ????? ??????? "
-"??? ????? ??? ?"
+"root ?????????? ????????? ????????? ???? ???, ?? ??????????? ????? ??????? ??? ????? "
+"??? ?"
 
-#: ../libpurple/certificate.c:117
 msgid "The certificate chain presented is invalid."
 msgstr "???????? ??? ?????????? ???? ??? ??? ?"
 
-#: ../libpurple/certificate.c:120
 msgid "The certificate has been revoked."
 msgstr "?????????? ?????????? ??? ???? ?"
 
-#: ../libpurple/certificate.c:124
 msgid "An unknown certificate error occurred."
 msgstr "?????????? ????????? ?????? ?????? ???? ?"
 
-#: ../libpurple/certificate.c:685
 msgid "(DOES NOT MATCH)"
 msgstr "(????)"
 
 #. Make messages
-#: ../libpurple/certificate.c:689
 #, c-format
 msgid "%s has presented the following certificate for just-this-once use:"
 msgstr "???? ???????? ????????? %s ?????? ?????????? ?????????? ???????? ??? ????:"
 
-#: ../libpurple/certificate.c:690
 #, c-format
 msgid ""
 "Common name: %s %s\n"
@@ -2591,70 +1696,59 @@ msgstr ""
 "?????? ???: %s %s\n"
 "Fingerprint (SHA1): %s"
 
+#
 #. TODO: Find what the handle ought to be
-#: ../libpurple/certificate.c:695
-#
 msgid "Single-use Certificate Verification"
 msgstr "????? ???????? ????????? ??????????? ????? ???????"
 
+#
 #. Scheme name
 #. Pool name
-#: ../libpurple/certificate.c:1024
-#
 msgid "Certificate Authorities"
 msgstr "?????????? ???????"
 
+#
 #. Scheme name
 #. Pool name
-#: ../libpurple/certificate.c:1196
-#
 msgid "SSL Peers Cache"
 msgstr "SSL Peers Cache"
 
 #. Make messages
-#: ../libpurple/certificate.c:1327
 #, c-format
 msgid "Accept certificate for %s?"
 msgstr "%s ? ?????????? ????? ??? ?'????? ?"
 
+#
 #. TODO: Find what the handle ought to be
-#: ../libpurple/certificate.c:1333
-#
 msgid "SSL Certificate Verification"
 msgstr "SSL Certificate Verification"
 
-#: ../libpurple/certificate.c:1344
 #
 msgid "_View Certificate..."
 msgstr "?????????? ????????...(_V)"
 
-#: ../libpurple/certificate.c:1373 ../libpurple/certificate.c:1392
 #, c-format
 msgid "The certificate for %s could not be validated."
 msgstr "%s ? ??????????? ????? ??????? ??? ????? ?"
 
+#
 #. TODO: Probably wrong.
-#: ../libpurple/certificate.c:1379
-#
 msgid "SSL Certificate Error"
 msgstr "SSL ?????????? ????????? ??????"
 
-#: ../libpurple/certificate.c:1380
 #
 msgid "Unable to validate certificate"
 msgstr "??????????? ????? ??????? ?????? ??????"
 
-#: ../libpurple/certificate.c:1404
 #, c-format
 msgid ""
 "The certificate claims to be from \"%s\" instead. This could mean that you "
 "are not connecting to the service you believe you are."
 msgstr ""
-"??????????? ??? ???? \"%s\" ??????? ???? ? ??????, ?????? ????? ???? ???? "
-"???????? ???? ????? ??????? ????????? ????? ?"
+"??????????? ??? ???? \"%s\" ??????? ???? ? ??????, ?????? ????? ???? ???? ???????? "
+"???? ????? ??????? ????????? ????? ?"
 
 #. Make messages
-#: ../libpurple/certificate.c:2111
 #, c-format
 msgid ""
 "Common name: %s\n"
@@ -2671,166 +1765,122 @@ msgstr ""
 "???? ???? ?????: %s\n"
 "?????????? ?????: %s\n"
 
+#
 #. TODO: Find what the handle ought to be
-#: ../libpurple/certificate.c:2123
-#
 msgid "Certificate Information"
 msgstr "?????????? ????????? ????"
 
+#
 #. show error to user
-#: ../libpurple/connection.c:121 ../libpurple/protocols/mxit/login.c:288
-#
 msgid "Registration Error"
 msgstr "???????? ??????"
 
-#: ../libpurple/connection.c:199
 #
 msgid "Unregistration Error"
 msgstr "??????? ????? ???? ??????"
 
-#: ../libpurple/connection.c:359
 #, c-format
 msgid "+++ %s signed on"
 msgstr "+++ %s ??? ?????"
 
-#: ../libpurple/connection.c:389
 #, c-format
 msgid "+++ %s signed off"
 msgstr "+++ %s ???????? ?????"
 
+#
 #. Undocumented
 #. Unknown error
-#: ../libpurple/connection.c:565 ../libpurple/plugin.c:280
-#
-#: ../libpurple/protocols/jabber/buddy.c:2240
-#: ../libpurple/protocols/msn/servconn.c:147
-#: ../libpurple/protocols/msn/session.c:364
-#: ../libpurple/protocols/msn/session.c:374
-#: ../libpurple/protocols/msnp9/servconn.c:139
-#: ../libpurple/protocols/msnp9/session.c:326
-#: ../libpurple/protocols/msnp9/session.c:336
-#: ../libpurple/protocols/oscar/family_chatnav.c:65
-#: ../libpurple/protocols/oscar/oscar.c:154
-#: ../libpurple/protocols/oscar/oscar.c:155
-#: ../libpurple/protocols/yahoo/libymsg.c:1803
-#: ../libpurple/protocols/yahoo/libymsg.c:1812
-#: ../libpurple/protocols/yahoo/libymsg.c:2150
 msgid "Unknown error"
 msgstr "?????? ??????"
 
-#: ../libpurple/conversation.c:197
 #
 msgid "Unable to send message: The message is too large."
 msgstr "?????? ?????? ??????: ???????? ?? ???? ?????? ?"
 
-#: ../libpurple/conversation.c:200 ../libpurple/conversation.c:213
 #, c-format
 msgid "Unable to send message to %s."
 msgstr "%s ?? ?????? ?????? ?????? ?"
 
-#: ../libpurple/conversation.c:201
 #
 msgid "The message is too large."
 msgstr "??????? ??? ???????? ?? ?"
 
-#: ../libpurple/conversation.c:210 ../libpurple/protocols/bonjour/jabber.c:300
 #
-#: ../libpurple/protocols/bonjour/jabber.c:346
-#: ../libpurple/protocols/qq/qq_process.c:91
 msgid "Unable to send message."
 msgstr "?????? ?????? ?????? ?"
 
-#: ../libpurple/conversation.c:1289
 #
 msgid "Send Message"
 msgstr "?????? ?????? ????"
 
-#: ../libpurple/conversation.c:1292
 #
 msgid "_Send Message"
 msgstr "?????? ?????? ???? (_S)"
 
-#: ../libpurple/conversation.c:1696
 #, c-format
 msgid "%s entered the room."
 msgstr "%s ???? ?????? ????? ?"
 
-#: ../libpurple/conversation.c:1699
 #, c-format
 msgid "%s [<I>%s</I>] entered the room."
 msgstr "%s [<I>%s</I>] ???? ?????? ????? ?"
 
-#: ../libpurple/conversation.c:1809
 #, c-format
 msgid "You are now known as %s"
 msgstr "????? ??? %s ???? ??????"
 
-#: ../libpurple/conversation.c:1829
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s ???????? %s ???? ??????"
 
-#: ../libpurple/conversation.c:1904
 #, c-format
 msgid "%s left the room."
 msgstr "%s ??? ? ??? ???????? ????? ?"
 
-#: ../libpurple/conversation.c:1907
 #, c-format
 msgid "%s left the room (%s)."
 msgstr "%s ??? ? ??? ???????? ????? (%s) ?"
 
-#: ../libpurple/conversation.c:2104 ../libpurple/conversation.c:2115
 #
 msgid "Invite to chat"
 msgstr "??????? ???????? ???"
 
+#
 #. Put our happy label in it.
-#: ../libpurple/conversation.c:2116 ../pidgin/gtkconv.c:898
-#
 msgid ""
 "Please enter the name of the user you wish to invite, along with an optional "
 "invite message."
 msgstr ""
-"???????? ???? ???? ????????? ???????? ??? ??? ???????? ???? ?????? ??????? "
-"??? ???? ?"
+"???????? ???? ???? ????????? ???????? ??? ??? ???????? ???? ?????? ??????? ??? ???? ?"
 
-#: ../libpurple/dbus-server.c:610
 #, c-format
 msgid "Failed to get connection: %s"
 msgstr "????? ??????? ?????? ??????: %s"
 
-#: ../libpurple/dbus-server.c:622
 #, c-format
 msgid "Failed to get name: %s"
 msgstr "??? ??????? ?????? ??????: %s"
 
-#: ../libpurple/dbus-server.c:634
 #, c-format
 msgid "Failed to get serv name: %s"
 msgstr "serv ? ??? ??????? ?????? ??????: %s"
 
-#: ../libpurple/dbus-server.h:86
 #
 msgid "Purple's D-BUS server is not running for the reason listed below"
 msgstr "?????????? ????? Purple ? D BUS ???? ???????? ????? ??"
 
-#: ../libpurple/desktopitem.c:287 ../libpurple/desktopitem.c:880
 #
 msgid "No name"
 msgstr "????????"
 
-#: ../libpurple/dnsquery.c:596
 #
 msgid "Unable to create new resolver process\n"
 msgstr "???????????? ???? ?????? ??????? ?????? ??????\n"
 
-#: ../libpurple/dnsquery.c:601
 #
 msgid "Unable to send request to resolver process\n"
 msgstr "???????????? ???????? ???? ?????? ?????? ??????\n"
 
-#: ../libpurple/dnsquery.c:634 ../libpurple/dnsquery.c:815
 #, c-format
 msgid ""
 "Error resolving %s:\n"
@@ -2839,13 +1889,10 @@ msgstr ""
 "%s ??????? ?????? ??????:\n"
 "%s"
 
-#: ../libpurple/dnsquery.c:637 ../libpurple/dnsquery.c:829
-#: ../libpurple/dnsquery.c:939 ../libpurple/dnsquery.c:950
 #, c-format
 msgid "Error resolving %s: %d"
 msgstr "%s ??????? ?????? ??????: %d"
 
-#: ../libpurple/dnsquery.c:661
 #, c-format
 msgid ""
 "Error reading from resolver process:\n"
@@ -2854,31 +1901,23 @@ msgstr ""
 "??????????? ?????? ? ??? ??????? ???? ???? ??????:\n"
 "%s"
 
-#: ../libpurple/dnsquery.c:665
 #, c-format
 msgid "Resolver process exited without answering our request"
 msgstr "???????? ????? ?? ???? ???????????? ?????? ???????? ?????"
 
-#: ../libpurple/dnsquery.c:779
 #, c-format
 msgid "Error converting %s to punycode: %d"
 msgstr "%s ?? punycode ? ???????? ?????? ??????: %d"
 
-#: ../libpurple/dnsquery.c:866
 #, c-format
 msgid "Thread creation failure: %s"
 msgstr "????? ??????? ?????? ??????: %s"
 
-#. Data is assumed to be the destination bn
-#: ../libpurple/dnsquery.c:867 ../libpurple/protocols/oscar/oscar.c:1948
 #
-#: ../libpurple/protocols/oscar/oscar.c:3339
-#: ../libpurple/protocols/qq/buddy_opt.c:997
-#: ../libpurple/protocols/qq/buddy_opt.c:1250
+#. Data is assumed to be the destination bn
 msgid "Unknown reason"
 msgstr "?????? ????"
 
-#: ../libpurple/ft.c:290
 #, c-format
 msgid ""
 "Error reading %s: \n"
@@ -2887,7 +1926,6 @@ msgstr ""
 "%s ???? ??????: \n"
 "%s.\n"
 
-#: ../libpurple/ft.c:294
 #, c-format
 msgid ""
 "Error writing %s: \n"
@@ -2896,7 +1934,6 @@ msgstr ""
 "%s ??????? ??????: \n"
 "%s.\n"
 
-#: ../libpurple/ft.c:298
 #, c-format
 msgid ""
 "Error accessing %s: \n"
@@ -2905,47 +1942,38 @@ msgstr ""
 "%s ??????? ?????? ??????: \n"
 "%s.\n"
 
-#: ../libpurple/ft.c:336
 #
 msgid "Directory is not writable."
 msgstr "?????????? ????????? ??? ?"
 
-#: ../libpurple/ft.c:350
 #
 msgid "Cannot send a file of 0 bytes."
 msgstr "? ?????? ??????? ?????? ????? ??? ?"
 
-#: ../libpurple/ft.c:359
 #
 msgid "Cannot send a directory."
 msgstr "????????? ?????? ????? ??? ?"
 
-#: ../libpurple/ft.c:367
 #, c-format
 msgid "%s is not a regular file. Cowardly refusing to overwrite it.\n"
 msgstr "%s ?????? ??????? ??? ? ??? ???? ??? ??????? ???????? ??? ???? ?\n"
 
-#: ../libpurple/ft.c:386
 #
 msgid "File is not readable."
 msgstr "??????? ???????? ??? ?"
 
-#: ../libpurple/ft.c:448
 #, c-format
 msgid "%s wants to send you %s (%s)"
 msgstr "?????? ???? %s, %s ?????? ?????? (%s)"
 
-#: ../libpurple/ft.c:455
 #, c-format
 msgid "%s wants to send you a file"
 msgstr "?????? ???? %s ??? ??????? ?????? ??????"
 
-#: ../libpurple/ft.c:498
 #, c-format
 msgid "Accept file transfer request from %s?"
 msgstr "%s ?????? ?????? ??? ??????? ?????? ????? ??? ?'????? ?"
 
-#: ../libpurple/ft.c:502
 #, c-format
 msgid ""
 "A file is available for download from:\n"
@@ -2956,193 +1984,158 @@ msgstr ""
 "???????? ??????: %s\n"
 "???????? ?????: %d"
 
-#: ../libpurple/ft.c:537
 #, c-format
 msgid "%s is offering to send file %s"
 msgstr "%s, %s ??????? ?????? ??????"
 
-#: ../libpurple/ft.c:595
 #, c-format
 msgid "%s is not a valid filename.\n"
 msgstr "%s ??? ???????? ??? ??? ?\n"
 
-#: ../libpurple/ft.c:623
 #, c-format
 msgid "Offering to send %s to %s"
 msgstr "%s ?? %s ?? ??????? ?????? ?????? ????"
 
-#: ../libpurple/ft.c:634
 #, c-format
 msgid "Starting transfer of %s from %s"
 msgstr "%s ?? %s ? ??? ?????? ?????? ????? ??? ????"
 
-#: ../libpurple/ft.c:821
 #, c-format
 msgid "Transfer of file <A HREF=\"file://%s\">%s</A> complete"
 msgstr "<A HREF=\"file://%s\">%s</A> ???????? ?????? ???????? ????"
 
-#: ../libpurple/ft.c:826
 #, c-format
 msgid "Transfer of file %s complete"
 msgstr "%s ??????? ?????? ??? ????"
 
-#: ../libpurple/ft.c:831
 #
 msgid "File transfer complete"
 msgstr "??????? ?????? ?????? ????"
 
-#: ../libpurple/ft.c:1399
 #, c-format
 msgid "You cancelled the transfer of %s"
 msgstr "%s ?????? ????? ????? ?????"
 
-#: ../libpurple/ft.c:1404
 #
 msgid "File transfer cancelled"
 msgstr "??????? ?????? ????? ??? ????"
 
-#: ../libpurple/ft.c:1462
 #, c-format
 msgid "%s cancelled the transfer of %s"
 msgstr "%s ?????? %s ? ?????? ????? ??? ????"
 
-#: ../libpurple/ft.c:1467
 #, c-format
 msgid "%s cancelled the file transfer"
 msgstr "%s ?????? ??????? ?????? ????? ??? ????"
 
-#: ../libpurple/ft.c:1524
 #, c-format
 msgid "File transfer to %s failed."
 msgstr "%s ? ??????? ?????? ????? ??? ???? ?"
 
-#: ../libpurple/ft.c:1526
 #, c-format
 msgid "File transfer from %s failed."
 msgstr "%s ? ??? ??????? ?????? ????? ??? ???? ?"
 
-#: ../libpurple/gconf/purple.schemas.in.h:1
 #
 msgid "Run the command in a terminal"
 msgstr "??????????? ???? ???????? ?'?"
 
-#: ../libpurple/gconf/purple.schemas.in.h:2
 #
 msgid "The command used to handle \"aim\" URLs, if enabled."
 msgstr "?????? ??????, \"aim\" URL ???????????? ???? ???????????? ???? ?"
 
-#: ../libpurple/gconf/purple.schemas.in.h:3
 #
 msgid "The command used to handle \"gg\" URLs, if enabled."
 msgstr "?????? ??????, \"gg\" URL ???????????? ???? ???????????? ???? ?"
 
-#: ../libpurple/gconf/purple.schemas.in.h:4
 #
 msgid "The command used to handle \"icq\" URLs, if enabled."
 msgstr "?????? ??????, \"icq\" URL ???????????? ???? ???????????? ???? ?"
 
-#: ../libpurple/gconf/purple.schemas.in.h:5
 #
 msgid "The command used to handle \"irc\" URLs, if enabled."
 msgstr "?????? ??????, \"irc\" URL ???????????? ???? ???????????? ???? ?"
 
-#: ../libpurple/gconf/purple.schemas.in.h:6
 #
 msgid "The command used to handle \"msnim\" URLs, if enabled."
 msgstr "?????? ??????, \"msnim\" URL ???????????? ???? ???????????? ???? ?"
 
-#: ../libpurple/gconf/purple.schemas.in.h:7
 #
 msgid "The command used to handle \"sip\" URLs, if enabled."
 msgstr "?????? ??????, \"sip\" URL ???????????? ???? ???????????? ???? ?"
 
-#: ../libpurple/gconf/purple.schemas.in.h:8
 #
 msgid "The command used to handle \"xmpp\" URLs, if enabled."
 msgstr "?????? ??????, \"xmpp\" URL ???????????? ???? ???????????? ???? ?"
 
-#: ../libpurple/gconf/purple.schemas.in.h:9
 #
 msgid "The command used to handle \"ymsgr\" URLs, if enabled."
 msgstr "?????? ??????, \"ymsgr\" URL ???????????? ???? ???????????? ???? ?"
 
-#: ../libpurple/gconf/purple.schemas.in.h:10
 #
 msgid "The handler for \"aim\" URLs"
 msgstr "\"aim\" ???? URL ????? ??????????"
 
-#: ../libpurple/gconf/purple.schemas.in.h:11
 #
 msgid "The handler for \"gg\" URLs"
 msgstr "\"gg\" ???? URL ????? ??????????"
 
-#: ../libpurple/gconf/purple.schemas.in.h:12
 #
 msgid "The handler for \"icq\" URLs"
 msgstr "\"icq\" ???? URL ????? ??????????"
 
-#: ../libpurple/gconf/purple.schemas.in.h:13
 #
 msgid "The handler for \"irc\" URLs"
 msgstr "\"irc\" ???? URL ????? ??????????"
 
-#: ../libpurple/gconf/purple.schemas.in.h:14
 #
 msgid "The handler for \"msnim\" URLs"
 msgstr "\"msnim\" ???? URL ????? ??????????"
 
-#: ../libpurple/gconf/purple.schemas.in.h:15
 #
 msgid "The handler for \"sip\" URLs"
 msgstr "\"sip\" ???? URL ????? ??????????"
 
-#: ../libpurple/gconf/purple.schemas.in.h:16
 #
 msgid "The handler for \"xmpp\" URLs"
 msgstr "\"xmpp\" ???? URL ????? ??????????"
 
-#: ../libpurple/gconf/purple.schemas.in.h:17
 #
 msgid "The handler for \"ymsgr\" URLs"
 msgstr "\"ymsgr\" ???? URL ????? ??????????"
 
-#: ../libpurple/gconf/purple.schemas.in.h:18
 #
 msgid ""
 "True if the command specified in the \"command\" key should handle \"aim\" "
 "URLs."
 msgstr ""
-"\"command\" ?? ?????? ????????? ????? ????? \"aim\" URL ???????? ?'?? ??? "
-"True (????) ?'? ?"
+"\"command\" ?? ?????? ????????? ????? ????? \"aim\" URL ???????? ?'?? ??? True "
+"(????) ?'? ?"
 
-#: ../libpurple/gconf/purple.schemas.in.h:19
 #
 msgid ""
 "True if the command specified in the \"command\" key should handle \"gg\" "
 "URLs."
 msgstr ""
-"\"command\" ?? ?????? ????????? ????? ????? \"gg\" URL ???????? ?'?? ??? "
-"True (????) ?'? ?"
+"\"command\" ?? ?????? ????????? ????? ????? \"gg\" URL ???????? ?'?? ??? True "
+"(????) ?'? ?"
 
-#: ../libpurple/gconf/purple.schemas.in.h:20
 #
 msgid ""
 "True if the command specified in the \"command\" key should handle \"icq\" "
 "URLs."
 msgstr ""
-"\"command\" ?? ?????? ????????? ????? ????? \"icq\" URL ???????? ?'?? ??? "
-"True (????) ?'? ?"
+"\"command\" ?? ?????? ????????? ????? ????? \"icq\" URL ???????? ?'?? ??? True "
+"(????) ?'? ?"
 
-#: ../libpurple/gconf/purple.schemas.in.h:21
 #
 msgid ""
 "True if the command specified in the \"command\" key should handle \"irc\" "
 "URLs."
 msgstr ""
-"\"command\" ?? ?????? ????????? ????? ????? \"irc\" URL ???????? ?'?? ??? "
-"True (????) ?'? ?"
+"\"command\" ?? ?????? ????????? ????? ????? \"irc\" URL ???????? ?'?? ??? True "
+"(????) ?'? ?"
 
-#: ../libpurple/gconf/purple.schemas.in.h:22
 #
 msgid ""
 "True if the command specified in the \"command\" key should handle \"msnim\" "
@@ -3151,16 +2144,14 @@ msgstr ""
 "\"command\" ?? ?????? ????????? ????? ????? \"msnim\" URL ???????? ?'?? ??? "
 "True (????) ?'? ?"
 
-#: ../libpurple/gconf/purple.schemas.in.h:23
 #
 msgid ""
 "True if the command specified in the \"command\" key should handle \"sip\" "
 "URLs."
 msgstr ""
-"\"command\" ?? ?????? ????????? ????? ????? \"sip\" URL ???????? ?'?? ??? "
-"True (????) ?'? ?"
+"\"command\" ?? ?????? ????????? ????? ????? \"sip\" URL ???????? ?'?? ??? True "
+"(????) ?'? ?"
 
-#: ../libpurple/gconf/purple.schemas.in.h:24
 #
 msgid ""
 "True if the command specified in the \"command\" key should handle \"xmpp\" "
@@ -3169,7 +2160,6 @@ msgstr ""
 "\"command\" ?? ?????? ????????? ????? ????? \"xmpp\" URL ???????? ?'?? ??? "
 "True (????) ?'? ?"
 
-#: ../libpurple/gconf/purple.schemas.in.h:25
 #
 msgid ""
 "True if the command specified in the \"command\" key should handle \"ymsgr\" "
@@ -3178,86 +2168,70 @@ msgstr ""
 "\"command\" ?? ?????? ????????? ????? ????? \"ymsgr\" URL ???????? ?'?? ??? "
 "True (????) ?'? ?"
 
-#: ../libpurple/gconf/purple.schemas.in.h:26
 #
 msgid ""
 "True if the command used to handle this type of URL should be run in a "
 "terminal."
 msgstr ""
-"?? ???? URL ????????? ???? ??????? ???? ??????????? ????????? ???? ????? "
-"??? ?'?? ??? True (????) ?'? ?"
+"?? ???? URL ????????? ???? ??????? ???? ??????????? ????????? ???? ????? ??? "
+"?'?? ??? True (????) ?'? ?"
 
-#: ../libpurple/gconf/purple.schemas.in.h:27
 #
 msgid "Whether the specified command should handle \"aim\" URLs"
 msgstr "????????? ???? ????? \"aim\" URL ???????? ?'? ?? ??"
 
-#: ../libpurple/gconf/purple.schemas.in.h:28
 #
 msgid "Whether the specified command should handle \"gg\" URLs"
 msgstr "????????? ???? ????? \"gg\" URL ???????? ?'? ?? ??"
 
-#: ../libpurple/gconf/purple.schemas.in.h:29
 #
 msgid "Whether the specified command should handle \"icq\" URLs"
 msgstr "????????? ???? ????? \"icq\" URL ???????? ?'? ?? ??"
 
-#: ../libpurple/gconf/purple.schemas.in.h:30
 #
 msgid "Whether the specified command should handle \"irc\" URLs"
 msgstr "????????? ???? ????? \"irc\" URL ???????? ?'? ?? ??"
 
-#: ../libpurple/gconf/purple.schemas.in.h:31
 #
 msgid "Whether the specified command should handle \"msnim\" URLs"
 msgstr "????????? ???? ????? \"msnim\" URL ???????? ?'? ?? ??"
 
-#: ../libpurple/gconf/purple.schemas.in.h:32
 #
 msgid "Whether the specified command should handle \"sip\" URLs"
 msgstr "????????? ???? ????? \"sip\" URL ???????? ?'? ?? ??"
 
-#: ../libpurple/gconf/purple.schemas.in.h:33
 #
 msgid "Whether the specified command should handle \"xmpp\" URLs"
 msgstr "????????? ???? ????? \"xmpp\" URL ???????? ?'? ?? ??"
 
-#: ../libpurple/gconf/purple.schemas.in.h:34
 #
 msgid "Whether the specified command should handle \"ymsgr\" URLs"
 msgstr "????????? ???? ????? \"ymsgr\" URL ???????? ?'? ?? ??"
 
-#: ../libpurple/log.c:198
 #
 msgid "<b><font color=\"red\">The logger has no read function</font></b>"
 msgstr "<b><font color=\"red\">????? ???? ???? ?????? ??????? ???</font></b>"
 
-#: ../libpurple/log.c:655
 #
 msgid "HTML"
 msgstr "HTML"
 
-#: ../libpurple/log.c:669
 #
 msgid "Plain text"
 msgstr "?????? ??????"
 
-#: ../libpurple/log.c:683
 #
 msgid "Old flat format"
 msgstr "?????? ??????? ???????"
 
-#: ../libpurple/log.c:914
 #
 msgid "Logging of this conversation failed."
 msgstr "?? ?????? ?? ?????? ?????? ?"
 
-#: ../libpurple/log.c:1356
 #
 msgid "XML"
 msgstr "XML"
 
-#: ../libpurple/log.c:1443
 #, c-format
 msgid ""
 "<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
@@ -3266,7 +2240,6 @@ msgstr ""
 "<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO "
 "REPLY&gt;:</b></font> %s<br/>\n"
 
-#: ../libpurple/log.c:1445
 #, c-format
 msgid ""
 "<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
@@ -3275,22 +2248,18 @@ msgstr ""
 "<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO "
 "REPLY&gt;:</b></font> %s<br/>\n"
 
-#: ../libpurple/log.c:1504 ../libpurple/log.c:1637
 #
 msgid "<font color=\"red\"><b>Unable to find log path!</b></font>"
 msgstr "<font color=\"red\"><b>??? ??? ?????? ?????? ??????!</b></font>"
 
-#: ../libpurple/log.c:1516 ../libpurple/log.c:1646
 #, c-format
 msgid "<font color=\"red\"><b>Could not read file: %s</b></font>"
 msgstr "<font color=\"red\"><b>??????? ???? ??????: %s</b></font>"
 
-#: ../libpurple/log.c:1578
 #, c-format
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr "(%s) %s <AUTO REPLY>: %s\n"
 
-#: ../libpurple/media.c:2051
 #
 msgid ""
 "No codecs found. Install some GStreamer codecs found in GStreamer plugins "
@@ -3299,180 +2268,132 @@ msgstr ""
 "???? ????? ???? ????? ? GStreamer ????? ?? ????????? ??????? ???? GStreamer "
 "????? ???????? ??? ?"
 
-#: ../libpurple/media.c:2055
 #
-msgid "No codecs left. Your codec preferences in fs-codecs.conf are too strict."
+msgid ""
+"No codecs left. Your codec preferences in fs-codecs.conf are too strict."
 msgstr ""
-"???? ????? ??????? ??? ? fs codecs.conf ????????? ????? ????????? ?????????? "
-"??? "
+"???? ????? ??????? ??? ? fs codecs.conf ????????? ????? ????????? ?????????? ??? "
 "????? ????????? ???? ?"
 
-#: ../libpurple/media.c:2072
 #
 msgid "A non-recoverable Farsight2 error has occurred."
 msgstr "Farsight2 ????????? ??? ???????????? ?????? ???? ?????? ?"
 
-#: ../libpurple/media.c:2156
 #
-msgid "Conference error"
-msgstr "????????? ????????? ??????"
-
-#: ../libpurple/media.c:2170
-#
 msgid "Error with your microphone"
 msgstr "??????????? ??????"
 
-#: ../libpurple/media.c:2172
 #
 msgid "Error with your webcam"
 msgstr "??? ?????? ??????"
 
-#: ../libpurple/media.c:2640
+#
+msgid "Conference error"
+msgstr "????????? ????????? ??????"
+
 #, c-format
 msgid "Error creating session: %s"
 msgstr "??????? ??????? ?????? ??????: %s"
 
-#: ../libpurple/mediamanager.c:313 ../libpurple/mediamanager.c:329
-#
-msgid "Error creating conference."
-msgstr "????????? ???????? ?????? ?????? ?"
-
-#: ../libpurple/plugin.c:363
 #, c-format
 msgid "You are using %s, but this plugin requires %s."
 msgstr "????? %s ??????? ?????, ?????? ?? ????? ??? ???????? %s ?????? ?"
 
-#: ../libpurple/plugin.c:378
 #
 msgid "This plugin has not defined an ID."
 msgstr "?? ????? ??? ???????? ID ???????? ??? ??? ?"
 
-#: ../libpurple/plugin.c:446
 #, c-format
 msgid "Plugin magic mismatch %d (need %d)"
 msgstr "????? ?? ???????? ???? %d (%d ??????)"
 
-#: ../libpurple/plugin.c:463
 #, c-format
 msgid "ABI version mismatch %d.%d.x (need %d.%d.x)"
 msgstr "ABI ???????? ???? %d.%d.x (%d.%d.x ???????)"
 
-#: ../libpurple/plugin.c:480
 #
-msgid "Plugin does not implement all required functions (list_icon, login and close)"
+msgid ""
+"Plugin does not implement all required functions (list_icon, login and close)"
 msgstr ""
-"????? ?? ?????? ???? ?????? ?????? ?????? ??? ?? ?? (list_icon, login ??? "
-"close)"
+"????? ?? ?????? ???? ?????? ?????? ?????? ??? ?? ?? (list_icon, login ??? close)"
 
-#: ../libpurple/plugin.c:545
 #, c-format
 msgid ""
 "The required plugin %s was not found. Please install this plugin and try "
 "again."
 msgstr ""
-"????????? ????? ?? %s ???? ????? ? ??????? ??? ?? ????? ???? ???????? ??? "
-"???? "
+"????????? ????? ?? %s ???? ????? ? ??????? ??? ?? ????? ???? ???????? ??? ???? "
 "????????? ??? ?"
 
-#: ../libpurple/plugin.c:550
 #
 msgid "Unable to load the plugin"
 msgstr "????? ?? ??? ?????? ??????"
 
-#: ../libpurple/plugin.c:572
 #, c-format
 msgid "The required plugin %s was unable to load."
 msgstr "?????? ????? ?? %s ??? ?????? ?????? ?"
 
-#: ../libpurple/plugin.c:576
 #
 msgid "Unable to load your plugin."
 msgstr "???????? ????? ?? ??? ?????? ?????? ?"
 
-#: ../libpurple/plugin.c:666
 #, c-format
 msgid "%s requires %s, but it failed to unload."
 msgstr "%s ? ???????? %s ??????? ?????? ??? ?? ??? ?????? ?????? ?"
 
-#: ../libpurple/plugins/autoaccept.c:23
 #
 msgid "Autoaccept"
 msgstr "Autoaccept"
 
-#: ../libpurple/plugins/autoaccept.c:25 ../libpurple/plugins/autoaccept.c:26
 #
 msgid "Auto-accept file transfer requests from selected users."
 msgstr ""
-"??????????????, ????????? ????????????? ? ??? ??????? ??????? ?????? ?????? "
-"????? ??? "
+"??????????????, ????????? ????????????? ? ??? ??????? ??????? ?????? ?????? ????? ??? "
 "?'? ?"
 
-#: ../libpurple/plugins/autoaccept.c:81
 #, c-format
 msgid "Autoaccepted file transfer of \"%s\" from \"%s\" completed."
 msgstr ""
-"\"%s\" ??????? \"%s\" ? ??? ?????????????? ?????? ???? ?????? ??? ?????? "
-"???? ?"
+"\"%s\" ??????? \"%s\" ? ??? ?????????????? ?????? ???? ?????? ??? ?????? ???? ?"
 
-#: ../libpurple/plugins/autoaccept.c:83
 #
 msgid "Autoaccept complete"
 msgstr "?????????? ????? ??????"
 
-#: ../libpurple/plugins/autoaccept.c:196
 #, c-format
 msgid "When a file-transfer request arrives from %s"
 msgstr "%s ? ??? ??????? ??????? ?????? ??????? ?'??"
 
-#: ../libpurple/plugins/autoaccept.c:198
 #
 msgid "Set Autoaccept Setting"
 msgstr "?????????????? ????? ???? ????????? ???????? ???"
 
-#: ../libpurple/plugins/autoaccept.c:200
 #
 msgid "_Save"
 msgstr "??????? (_S)"
 
-#: ../libpurple/plugins/autoaccept.c:201 ../libpurple/plugins/idle.c:170
 #
-#: ../libpurple/plugins/idle.c:204 ../libpurple/plugins/idle.c:230
-#: ../libpurple/protocols/msn/msn.c:1577
-#: ../libpurple/protocols/oscar/oscar.c:2049
-#: ../libpurple/protocols/oscar/oscar.c:2748
-#: ../libpurple/protocols/oscar/oscar.c:2796
-#: ../libpurple/protocols/oscar/oscar.c:6384
-#: ../libpurple/protocols/oscar/oscar.c:6441
-#: ../libpurple/protocols/oscar/oscar.c:6730
-#: ../libpurple/protocols/oscar/oscar.c:6799
-#: ../libpurple/protocols/qq/buddy_memo.c:262 ../libpurple/request.h:1441
-#: ../libpurple/request.h:1451
 msgid "_Cancel"
 msgstr "????? (_C)"
 
-#: ../libpurple/plugins/autoaccept.c:204
 #
 msgid "Ask"
 msgstr "Pitaj"
 
-#: ../libpurple/plugins/autoaccept.c:205
 #
 msgid "Auto Accept"
 msgstr "?????????????? ?????"
 
-#: ../libpurple/plugins/autoaccept.c:206
 #
 msgid "Auto Reject"
 msgstr "?????????????? ????????????"
 
-#: ../libpurple/plugins/autoaccept.c:221
 #
 msgid "Autoaccept File Transfers..."
 msgstr "?????????????? ??????? ?????? ????? ??? ?'?..."
 
+#
 #. XXX: Is there a better way than this? There really should be.
-#: ../libpurple/plugins/autoaccept.c:251
-#
 msgid ""
 "Path to save the files in\n"
 "(Please provide the full path)"
@@ -3480,46 +2401,35 @@ msgstr ""
 "??????? ???????????? ???\n"
 "(??????? ??? ???????? ??? ?????? ???)"
 
-#: ../libpurple/plugins/autoaccept.c:256
 #
 msgid "Automatically reject from users not in buddy list"
-msgstr ""
-"????? ??????? ????????? ????????????? ???????? ?????????????? ???????????? "
-"??? ?'?"
+msgstr "????? ??????? ????????? ????????????? ???????? ?????????????? ???????????? ??? ?'?"
 
-#: ../libpurple/plugins/autoaccept.c:260
 #
 msgid ""
 "Notify with a popup when an autoaccepted file transfer is complete\n"
 "(only when there's no conversation with the sender)"
 msgstr ""
-"?????????????? ????? ??? ??????? ?????? ?????? ?'??, ?? ?? ?????? ????? ??? "
-"?'?\n"
+"?????????????? ????? ??? ??????? ?????? ?????? ?'??, ?? ?? ?????? ????? ??? ?'?\n"
 "(??????? ???? ???? ?????? ????? ?? ??????)"
 
-#: ../libpurple/plugins/autoaccept.c:265
 #
 msgid "Create a new directory for each user"
 msgstr "????? ????????????? ???? ??? ???? ????????? ??????? ??? ?'?"
 
-#: ../libpurple/plugins/buddynote.c:46 ../libpurple/protocols/msn/msn.c:2249
 #
-#: ../libpurple/protocols/msn/msn.c:2279
-#: ../libpurple/protocols/msnp9/msn.c:1800
-#: ../libpurple/protocols/msnp9/msn.c:1830
 msgid "Notes"
 msgstr "Notes"
 
-#: ../libpurple/plugins/buddynote.c:47
 #
 msgid "Enter your notes below..."
 msgstr "?????? ??????? ??? ????..."
 
-#: ../libpurple/plugins/buddynote.c:65
 #
 msgid "Edit Notes..."
 msgstr "??? ???????..."
 
+#
 #. *< major version
 #. *< minor version
 #. *< type
@@ -3528,407 +2438,338 @@ msgstr "??? ???????.
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/buddynote.c:90 ../pidgin/plugins/gtkbuddynote.c:74
-#
 msgid "Buddy Notes"
 msgstr "Buddy Notes"
 
+#
 #. *< name
 #. *< version
-#: ../libpurple/plugins/buddynote.c:92 ../pidgin/plugins/gtkbuddynote.c:76
-#
 msgid "Store notes on particular buddies."
 msgstr "??????????? ?????? ???? ??? ??????? ??? ?'? ?"
 
+#
 #. *< summary
-#: ../libpurple/plugins/buddynote.c:93 ../pidgin/plugins/gtkbuddynote.c:77
-#
 msgid "Adds the option to store notes for buddies on your buddy list."
 msgstr "????? ?????? ??????? ?????? ???? ??? ???????? ?????? ??? ??? ?? ?"
 
+#
 #. *< type
 #. *< ui_requirement
 #. *< flags
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/ciphertest.c:264
-#
 msgid "Cipher Test"
 msgstr "?????? ???????"
 
+#
 #. *< name
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/plugins/ciphertest.c:267 ../libpurple/plugins/ciphertest.c:269
-#
 msgid "Tests the ciphers that ship with libpurple."
 msgstr "libpurple ? ???? ?????? ?????? ??????? ??? ?? ?"
 
+#
 #. *< type
 #. *< ui_requirement
 #. *< flags
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/dbus-example.c:155
-#
 msgid "DBus Example"
 msgstr "DBus Example"
 
+#
 #. *< name
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/plugins/dbus-example.c:158
-#
-#: ../libpurple/plugins/dbus-example.c:160
 msgid "DBus Plugin Example"
 msgstr "DBus ????? ??? ??????"
 
+#
 #. *< type
 #. *< ui_requirement
 #. *< flags
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/filectl.c:248
-#
 msgid "File Control"
 msgstr "??????? ?????????"
 
+#
 #. *< name
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/plugins/filectl.c:251 ../libpurple/plugins/filectl.c:253
-#
 msgid "Allows control by entering commands in a file."
 msgstr "????????? ???? ??????????? ??? ?????????? ??????? ?????? ??? ?? ?"
 
-#: ../libpurple/plugins/idle.c:158 ../libpurple/plugins/idle.c:218
 #
 msgid "Minutes"
 msgstr "?????"
 
+#
 #. This is a cultural reference.  Dy'er Mak'er is a song by Led Zeppelin.
 #. If that doesn't translate well into your language, drop the 's before translating.
-#: ../libpurple/plugins/idle.c:165 ../libpurple/plugins/idle.c:199
-#
-#: ../libpurple/plugins/idle.c:225 ../libpurple/plugins/idle.c:318
 msgid "I'dle Mak'er"
 msgstr "I'dle Mak'er"
 
-#: ../libpurple/plugins/idle.c:166 ../libpurple/plugins/idle.c:258
 #
 msgid "Set Account Idle Time"
 msgstr "??????? ???? ???? ??????? ???????? ??????? ??????? ??? ?'?"
 
-#: ../libpurple/plugins/idle.c:169 ../libpurple/plugins/idle.c:229
 #
 msgid "_Set"
 msgstr "???????? ??? (_S)"
 
-#: ../libpurple/plugins/idle.c:184
 #
 msgid "None of your accounts are idle."
 msgstr "?????? ???? ????? ???????? ??????? ??? ?"
 
-#: ../libpurple/plugins/idle.c:200 ../libpurple/plugins/idle.c:262
 #
 msgid "Unset Account Idle Time"
 msgstr "??????? ???? ???? ??????? ???????? ?????? ? ??? ????? ??? ?'?"
 
-#: ../libpurple/plugins/idle.c:203
 #
 msgid "_Unset"
 msgstr "????????? ??? ????? ??? (_U)"
 
-#: ../libpurple/plugins/idle.c:226 ../libpurple/plugins/idle.c:266
 #
 msgid "Set Idle Time for All Accounts"
 msgstr "??????? ???? ???? ???? ??????? ???????? ??????? ??????? ??? ?'?"
 
-#: ../libpurple/plugins/idle.c:271
 #
 msgid "Unset Idle Time for All Idled Accounts"
-msgstr "??????? ???? ???? ???? ???????? ??????? ???????? ?????? ? ??? ????? ??? ?'?"
+msgstr ""
+"??????? ???? ???? ???? ???????? ??????? ???????? ?????? ? ??? ????? ??? ?'?"
 
-#: ../libpurple/plugins/idle.c:320 ../libpurple/plugins/idle.c:321
 #
 msgid "Allows you to hand-configure how long you've been idle"
 msgstr ""
-"???????? ??????? ???, ????????????? ?????? ????? ????????? ?????? ?????? "
-"??? ??"
+"???????? ??????? ???, ????????????? ?????? ????? ????????? ?????? ?????? ??? ??"
 
+#
 #. *< type
 #. *< ui_requirement
 #. *< flags
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/ipc-test-client.c:87
-#
 msgid "IPC Test Client"
 msgstr "IPC ???????? ?????????"
 
+#
 #. *< name
 #. *< version
 #. *  summary
-#: ../libpurple/plugins/ipc-test-client.c:90
-#
 msgid "Test plugin IPC support, as a client."
 msgstr "????????? ???? IPC ??????? ????? ?? ??????? ??? ?"
 
+#
 #. *  description
-#: ../libpurple/plugins/ipc-test-client.c:92
-#
 msgid ""
 "Test plugin IPC support, as a client. This locates the server plugin and "
 "calls the commands registered."
 msgstr ""
-"????????? ???? IPC ??????? ????? ?? ??????? ??? ? ???? ??? ???? ????? ?? "
-"?????? ??? "
+"????????? ???? IPC ??????? ????? ?? ??????? ??? ? ???? ??? ???? ????? ?? ?????? ??? "
 "?? ??? ???????? ???? ?? ??? ?? ?"
 
+#
 #. *< type
 #. *< ui_requirement
 #. *< flags
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/ipc-test-server.c:74
-#
 msgid "IPC Test Server"
 msgstr "IPC ? ??????????? ????"
 
+#
 #. *< name
 #. *< version
 #. *  summary
-#: ../libpurple/plugins/ipc-test-server.c:77
-#
 msgid "Test plugin IPC support, as a server."
 msgstr "???? ???? IPC ??????? ????? ?? ??????? ??? ?"
 
+#
 #. *  description
-#: ../libpurple/plugins/ipc-test-server.c:79
-#
 msgid "Test plugin IPC support, as a server. This registers the IPC commands."
 msgstr ""
-"???? ???? IPC ??????? ????? ?? ??????? ??? ? ???? ??? IPC ???? ??????? ??? "
-"?? ?"
+"???? ???? IPC ??????? ????? ?? ??????? ??? ? ???? ??? IPC ???? ??????? ??? ?? ?"
 
-#: ../libpurple/plugins/joinpart.c:232
 #
 msgid "Hide Joins/Parts"
 msgstr "??????/????????? ???? ???? ??? ?'?"
 
+#
 #. Translators: Followed by an input request a number of people
-#: ../libpurple/plugins/joinpart.c:237
-#
 msgid "For rooms with more than this many people"
 msgstr "???????? ??????? ???? ?????? ??????? ??????? ???"
 
-#: ../libpurple/plugins/joinpart.c:242
 #
 msgid "If user has not spoken in this many minutes"
 msgstr "??????? ????? ???? ???????????? ???? ??? ?? ??? ??????"
 
-#: ../libpurple/plugins/joinpart.c:247
 #
 msgid "Apply hiding rules to buddies"
 msgstr "???? ???? ???????? ?????? ???????? ?????? ??? ?'?"
 
+#
 #. *< type
 #. *< ui_requirement
 #. *< flags
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/joinpart.c:277
-#
 msgid "Join/Part Hiding"
 msgstr "Join/Part Hiding"
 
+#
 #. *< name
 #. *< version
 #. *  summary
-#: ../libpurple/plugins/joinpart.c:280
-#
 msgid "Hides extraneous join/part messages."
 msgstr "???????? ??????/????????? ?????? ???? ??? ?? ?"
 
+#
 #. *  description
-#: ../libpurple/plugins/joinpart.c:282
-#
 msgid ""
 "This plugin hides join/part messages in large rooms, except for those users "
 "actively taking part in a conversation."
 msgstr ""
-"????? ??????? ????????????? ????????????? ????, ???? ????? ????????????? "
-"??????/????????? ?????????? ?? ????? ?? ?????? ???? ??? ?? ?"
+"????? ??????? ????????????? ????????????? ????, ???? ????? ????????????? ??????/"
+"????????? ?????????? ?? ????? ?? ?????? ???? ??? ?? ?"
 
+#
 #. This is used in the place of a timezone abbreviation if the
 #. * offset is way off.  The user should never really see it, but
 #. * it's here just in case.  The parens are to make it clear it's
 #. * not a real timezone.
-#: ../libpurple/plugins/log_reader.c:499
-#
 msgid "(UTC)"
 msgstr "(UTC)"
 
-#: ../libpurple/plugins/log_reader.c:1558
 #
 msgid "User is offline."
 msgstr "???????????? ???????? ?? ???? ?"
 
-#: ../libpurple/plugins/log_reader.c:1564
 #
 msgid "Auto-response sent:"
 msgstr "?????????? ????? ??????? ????:"
 
-#: ../libpurple/plugins/log_reader.c:1579
-#: ../libpurple/plugins/log_reader.c:1582
-#: ../libpurple/plugins/statenotify.c:93
 #, c-format
 msgid "%s has signed off."
 msgstr "%s ???????? ????? ?"
 
-#: ../libpurple/plugins/log_reader.c:1603
 #
 msgid "One or more messages may have been undeliverable."
 msgstr "?? ?? ?????? ?????? ????? ??? ????? ??? ?"
 
-#: ../libpurple/plugins/log_reader.c:1613
 #
 msgid "You were disconnected from the server."
 msgstr "???? ? ??? ????? ????????? ??? ???? ?"
 
-#: ../libpurple/plugins/log_reader.c:1621
 #
 msgid ""
 "You are currently disconnected. Messages will not be received unless you are "
 "logged in."
 msgstr "???????? ????? ??????? ??? ? ?????? ???? ???? ???? ?????? ??????? ?'? ?? ?"
 
-#: ../libpurple/plugins/log_reader.c:1636
 #
 msgid "Message could not be sent because the maximum length was exceeded."
 msgstr "??????? ???????? ??? ?????????? ????? ??? ?????? ?????? ????? ??? ?"
 
-#: ../libpurple/plugins/log_reader.c:1641
 #
 msgid "Message could not be sent."
 msgstr "?????? ?????? ????? ??? ?"
 
+#
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
-#: ../libpurple/plugins/log_reader.c:2723
-#
-#: ../libpurple/plugins/log_reader.c:2879
 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:2736
-#
-#: ../libpurple/plugins/log_reader.c:2884
 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:2748
-#
-#: ../libpurple/plugins/log_reader.c:2888
 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:2762
-#
-#: ../libpurple/plugins/log_reader.c:2893
 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:2774
-#
-#: ../libpurple/plugins/log_reader.c:2897
 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:2786
-#
-#: ../libpurple/plugins/log_reader.c:2901
 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:2798
-#
-#: ../libpurple/plugins/log_reader.c:2905
 msgid "aMSN"
 msgstr "aMSN"
 
+#
 #. Add general preferences.
-#: ../libpurple/plugins/log_reader.c:2861
-#
 msgid "General Log Reading Configuration"
 msgstr "?? ????? ?????? ???????"
 
-#: ../libpurple/plugins/log_reader.c:2865
 #
 msgid "Fast size calculations"
 msgstr "????? ???? ????"
 
-#: ../libpurple/plugins/log_reader.c:2869
 #
 msgid "Use name heuristics"
 msgstr "???? ???????? ????????? ????????? ?????? ??? ?'?"
 
+#
 #. Add Log Directory preferences.
-#: ../libpurple/plugins/log_reader.c:2875
-#
 msgid "Log Directory"
 msgstr "?? ?????????"
 
+#
 #. *< type
 #. *< ui_requirement
 #. *< flags
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/log_reader.c:2934
-#
 msgid "Log Reader"
 msgstr "Log Reader"
 
+#
 #. *< name
 #. *< version
 #. * summary
-#: ../libpurple/plugins/log_reader.c:2938
-#
 msgid "Includes other IM clients' logs in the log viewer."
 msgstr "?? ???????? ????????? ???????? IM ?????????? ?? ??????????? ??? ?'? ?"
 
-#. * description
-#: ../libpurple/plugins/log_reader.c:2942
 #
+#. * description
 msgid ""
 "When viewing logs, this plugin will include logs from other IM clients. "
 "Currently, this includes Adium, MSN Messenger, aMSN, and Trillian.\n"
@@ -3936,36 +2777,28 @@ msgstr ""
 "WARNING: This plugin is still alpha code and may crash frequently.  Use it "
 "at your own risk!"
 msgstr ""
-"?? ????????? ???, ?? ????? ?? ?????? ???????? IM ????????? ? ??? ??????? ?? "
-"???????? ??? "
-"?? ? ???????? Adium, MSN Messenger, aMSN, ??? Trillian ? ?? ??????????? ??? "
-"?? ?\n"
+"?? ????????? ???, ?? ????? ?? ?????? ???????? IM ????????? ? ??? ??????? ?? ???????? ??? "
+"?? ? ???????? Adium, MSN Messenger, aMSN, ??? Trillian ? ?? ??????????? ??? ?? ?\n"
 "\n"
-"???????????: ?? ????? ?? ???????? ???? ????? ??????? ??? ??? ?????????? "
-"????????? "
-"??? ???? ? ?????????????? ???? ??????? ??????? ?? ????? ?? ??????? ?????? "
-"????!"
+"???????????: ?? ????? ?? ???????? ???? ????? ??????? ??? ??? ?????????? ????????? ??? "
+"???? ? ?????????????? ???? ??????? ??????? ?? ????? ?? ??????? ?????? ????!"
 
-#: ../libpurple/plugins/mono/loader/mono.c:224
 #
 msgid "Mono Plugin Loader"
 msgstr "Mono ????? ?? ??? ???? ????????"
 
-#: ../libpurple/plugins/mono/loader/mono.c:226
 #
-#: ../libpurple/plugins/mono/loader/mono.c:227
 msgid "Loads .NET plugins with Mono."
 msgstr ".NET ????? ?????? Mono ?????? ??? ??? ?? ?"
 
-#: ../libpurple/plugins/newline.c:57
 msgid "Add new line in IMs"
 msgstr "IM ????? ???? ?????? ??? ???"
 
-#: ../libpurple/plugins/newline.c:61
 #
 msgid "Add new line in Chats"
 msgstr "??????? ???? ?????? ??? ???"
 
+#
 #. *< magic
 #. *< major version
 #. *< minor version
@@ -3975,423 +2808,330 @@ msgstr "??????? ????#. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/newline.c:104
-#
 msgid "New Line"
 msgstr "New Line"
 
+#
 #. *< name
 #. *< version
-#: ../libpurple/plugins/newline.c:106
-#
 msgid "Prepends a newline to displayed message."
 msgstr "????????? ??????? ????????? ???? ?????? ??? ??? ?"
 
+#
 #. *< summary
-#: ../libpurple/plugins/newline.c:107
-#
 msgid ""
 "Prepends a newline to messages so that the rest of the message appears below "
 "the username in the conversation window."
 msgstr ""
-"??????? ????????? ??? ???? ?????? ??? ??? ?'? ? ???? ???, ??????? "
-"????????????? "
+"??????? ????????? ??? ???? ?????? ??? ??? ?'? ? ???? ???, ??????? ????????????? "
 "????????????? ???? ??? ???????? ????????? ?'? ?"
 
-#: ../libpurple/plugins/offlinemsg.c:23
 #
 msgid "Offline Message Emulation"
 msgstr "Offline Message Emulation"
 
-#: ../libpurple/plugins/offlinemsg.c:25 ../libpurple/plugins/offlinemsg.c:26
 #
 msgid "Save messages sent to an offline user as pounce."
 msgstr ""
-"?? ???? ??????? ???? ?????????????? ??????? ??????? ?????? ??????? "
-"????????? ?????? "
+"?? ???? ??????? ???? ?????????????? ??????? ??????? ?????? ??????? ????????? ?????? "
 "??????? ??? ?'? ?"
 
-#: ../libpurple/plugins/offlinemsg.c:95
 #
 msgid ""
 "The rest of the messages will be saved as pounces. You can edit/delete the "
 "pounce from the `Buddy Pounce' dialog."
 msgstr ""
-"??????? ?????????? ?????? ???? ??????? ??? ?'? ? `?????? ???? ??????' ?????? "
-"????? ???? "
+"??????? ?????????? ?????? ???? ??????? ??? ?'? ? `?????? ???? ??????' ?????? ????? ???? "
 "? ??? ???????? ??????????/??????? ??? ?"
 
-#: ../libpurple/plugins/offlinemsg.c:156
 #, c-format
 msgid ""
 "\"%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\" ???????? ?? ???? ??? ? ??????? ?????????? ?????? ???? ??????? ??? "
-"\"%s\" "
-"???? ?????? ????? ?????????????? ?????? ?????????? ?"
+"\"%s\" ???????? ?? ???? ??? ? ??????? ?????????? ?????? ???? ??????? ??? \"%s\" ???? "
+"?????? ????? ?????????????? ?????? ?????????? ?"
 
-#: ../libpurple/plugins/offlinemsg.c:160
 #
 msgid "Offline Message"
 msgstr "?? ???? ??????"
 
-#: ../libpurple/plugins/offlinemsg.c:161
 #
 msgid "You can edit/delete the pounce from the `Buddy Pounces' dialog"
 msgstr ""
-"`?????? ???? ??????' ?????? ????? ???? ? ??? ?????? ??????? ??????/???????? "
-"????? ?"
+"`?????? ???? ??????' ?????? ????? ???? ? ??? ?????? ??????? ??????/???????? ????? ?"
 
-#: ../libpurple/plugins/offlinemsg.c:165
 #
-#: ../libpurple/protocols/msn/dialog.c:141
-#: ../libpurple/protocols/msn/msn.c:845 ../libpurple/protocols/msn/msn.c:848
-#: ../libpurple/protocols/msnp9/dialog.c:133
-#: ../libpurple/protocols/msnp9/msn.c:566
-#: ../libpurple/protocols/msnp9/msn.c:582
-#: ../libpurple/protocols/mxit/mxit.c:346
-#: ../libpurple/protocols/mxit/profile.c:126
-#: ../libpurple/protocols/novell/novell.c:1933
-#: ../libpurple/protocols/silc/buddy.c:318
-#: ../libpurple/protocols/silc/pk.c:114 ../libpurple/protocols/silc/wb.c:309
-#: ../libpurple/protocols/silc10/buddy.c:314
-#: ../libpurple/protocols/silc10/pk.c:119
-#: ../libpurple/protocols/silc10/wb.c:307 ../pidgin/gtkrequest.c:297
 msgid "Yes"
 msgstr "??"
 
-#: ../libpurple/plugins/offlinemsg.c:166
 #
-#: ../libpurple/protocols/msn/dialog.c:142
-#: ../libpurple/protocols/msn/msn.c:845 ../libpurple/protocols/msn/msn.c:848
-#: ../libpurple/protocols/msnp9/dialog.c:134
-#: ../libpurple/protocols/msnp9/msn.c:566
-#: ../libpurple/protocols/msnp9/msn.c:582
-#: ../libpurple/protocols/mxit/profile.c:126
-#: ../libpurple/protocols/novell/novell.c:1934
-#: ../libpurple/protocols/silc/buddy.c:319
-#: ../libpurple/protocols/silc/pk.c:115 ../libpurple/protocols/silc/wb.c:310
-#: ../libpurple/protocols/silc10/buddy.c:315
-#: ../libpurple/protocols/silc10/pk.c:120
-#: ../libpurple/protocols/silc10/wb.c:308 ../pidgin/gtkrequest.c:298
 msgid "No"
 msgstr "???"
 
-#: ../libpurple/plugins/offlinemsg.c:193
 #
 msgid "Save offline messages in pounce"
 msgstr "?? ???? ?????????? ???????? ??????? ??? ???"
 
-#: ../libpurple/plugins/offlinemsg.c:197
 #
 msgid "Do not ask. Always save in pounce."
 msgstr "???????? ??? ?'? ?? ? ?????? ?????? ???? ??????? ??? ?'? ?"
 
-#: ../libpurple/plugins/one_time_password.c:68
 #
 msgid "One Time Password"
 msgstr "????? ????????? ???? ?'?"
 
+#
 #. *< type
 #. *< ui_requirement
 #. *< flags
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/one_time_password.c:123
-#
 msgid "One Time Password Support"
 msgstr "One Time Password Support"
 
+#
 #. *< name
 #. *< version
 #. *  summary
-#: ../libpurple/plugins/one_time_password.c:126
-#
 msgid "Enforce that passwords are used only once."
 msgstr "????????? ??? ????? ???????? ???? ????? ??? ?'? ?"
 
+#
 #. *  description
-#: ../libpurple/plugins/one_time_password.c:128
-#
 msgid ""
 "Allows you to enforce on a per-account basis that passwords not being saved "
 "are only used in a single successful connection.\n"
 "Note: The account password must not be saved for this to work."
 msgstr ""
-"??????? ???? ????????????? ??? ??? ??? ?????? ???? ??????? ???? ????????? "
-"????? ?????? ???? ????????? ???????? ???? ?????? ?????? ??? ?? ?\n"
+"??????? ???? ????????????? ??? ??? ??? ?????? ???? ??????? ???? ????????? ????? "
+"?????? ???? ????????? ???????? ???? ?????? ?????? ??? ?? ?\n"
 "????????: ?? ???? ???? ?????? ????????? ??????? ??? ???? ??? ?"
 
+#
 #. *< type
 #. *< ui_requirement
 #. *< flags
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/perl/perl.c:671
-#
 msgid "Perl Plugin Loader"
 msgstr "Perl ????? ?? ????? ????????"
 
+#
 #. *< name
 #. *< version
 #. *< summary
-#: ../libpurple/plugins/perl/perl.c:673 ../libpurple/plugins/perl/perl.c:674
-#
 msgid "Provides support for loading perl plugins."
 msgstr "perl ????? ?? ??? ???? ???? ?????? ?????? ??? ?? ?"
 
-#: ../libpurple/plugins/psychic.c:20
 #
 msgid "Psychic Mode"
 msgstr "Psychic Mode"
 
-#: ../libpurple/plugins/psychic.c:21
 #
 msgid "Psychic mode for incoming conversation"
 msgstr "????????? ??????? ???? ?????????? ???"
 
-#: ../libpurple/plugins/psychic.c:22
 #
 msgid ""
 "Causes conversation windows to appear as other users begin to message you.  "
 "This works for AIM, ICQ, XMPP, Sametime, and Yahoo!"
 msgstr ""
-"???? ???? ???????????? ??????? ?????? ??????? ????? ?????, ??????? "
-"?????????????? ????????? "
-"?'? ? AIM, ICQ, XMPP, Sametime, ??? Yahoo! ? ???????? ?? ????????? ??????? "
-"??? ????? "
-"?'? ?"
+"???? ???? ???????????? ??????? ?????? ??????? ????? ?????, ??????? ?????????????? "
+"????????? ?'? ? AIM, ICQ, XMPP, Sametime, ??? Yahoo! ? ???????? ?? ????????? ??????? "
+"??? ????? ?'? ?"
 
-#: ../libpurple/plugins/psychic.c:72
 #
 msgid "You feel a disturbance in the force..."
 msgstr "??????? ???? ???? ?????..."
 
-#: ../libpurple/plugins/psychic.c:92
 #
 msgid "Only enable for users on the buddy list"
 msgstr "????? ??????? ??????? ????????????? ???? ??? ?????? ??? ?'?"
 
-#: ../libpurple/plugins/psychic.c:97
 #
 msgid "Disable when away"
 msgstr "????????? ???? ????????? ??? ?'?"
 
-#: ../libpurple/plugins/psychic.c:101
 #
 msgid "Display notification message in conversations"
 msgstr "??????? ????????? ???????? ??? ?'?"
 
-#: ../libpurple/plugins/psychic.c:106
 #
 msgid "Raise psychic conversations"
 msgstr "psychic ?????? ???????? ??? ?'?"
 
+#
 #. *< type
 #. *< ui_requirement
 #. *< flags
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/signals-test.c:928
-#
 msgid "Signals Test"
 msgstr "????? ???????"
 
+#
 #. *< name
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/plugins/signals-test.c:931
-#
-#: ../libpurple/plugins/signals-test.c:933
 msgid "Test to see that all signals are working properly."
 msgstr "???? ????? ???????? ????? ?? ?? ??????? ??? ?"
 
+#
 #. *< type
 #. *< ui_requirement
 #. *< flags
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/simple.c:37
-#
 msgid "Simple Plugin"
 msgstr "?????? ????? ??"
 
+#
 #. *< name
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/plugins/simple.c:40 ../libpurple/plugins/simple.c:42
-#
 msgid "Tests to see that most things are working."
 msgstr "??????? ????????? ????? ???? ??????? ???? ????????? ??????? ?"
 
-#. Scheme name
-#: ../libpurple/plugins/ssl/ssl-gnutls.c:955
 #
-#: ../libpurple/plugins/ssl/ssl-nss.c:865
+#. Scheme name
 msgid "X.509 Certificates"
 msgstr "X.509 ??????????"
 
+#
 #. *< type
 #. *< ui_requirement
 #. *< flags
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/ssl/ssl-gnutls.c:1031
-#
 msgid "GNUTLS"
 msgstr "GNUTLS"
 
+#
 #. *< name
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/plugins/ssl/ssl-gnutls.c:1034
-#
-#: ../libpurple/plugins/ssl/ssl-gnutls.c:1036
 msgid "Provides SSL support through GNUTLS."
 msgstr "GNUTLS ? ??????? SSL ?????? ?????? ??? ?? ?"
 
+#
 #. *< type
 #. *< ui_requirement
 #. *< flags
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/ssl/ssl-nss.c:942
-#
 msgid "NSS"
 msgstr "NSS"
 
+#
 #. *< name
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/plugins/ssl/ssl-nss.c:945
-#
-#: ../libpurple/plugins/ssl/ssl-nss.c:947
 msgid "Provides SSL support through Mozilla NSS."
 msgstr "Mozilla NSS ? ??????? SSL ?????? ?????? ??? ?? ?"
 
+#
 #. *< type
 #. *< ui_requirement
 #. *< flags
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/ssl/ssl.c:94
-#
 msgid "SSL"
 msgstr "SSL"
 
+#
 #. *< name
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/plugins/ssl/ssl.c:97 ../libpurple/plugins/ssl/ssl.c:99
-#
 msgid "Provides a wrapper around SSL support libraries."
 msgstr "SSL ??????? ????????? ???? ??? ???????? ?????? ??? ?? ?"
 
-#: ../libpurple/plugins/statenotify.c:63
 #, c-format
 msgid "%s is no longer away."
 msgstr "%s ???????? ????????? ??? ?"
 
-#: ../libpurple/plugins/statenotify.c:65
 #, c-format
 msgid "%s has gone away."
 msgstr "%s ??? ??????? ?"
 
-#: ../libpurple/plugins/statenotify.c:75
 #, c-format
 msgid "%s has become idle."
 msgstr "%s ???????? ??????? ????? ????? ????? ?"
 
-#: ../libpurple/plugins/statenotify.c:77
 #, c-format
 msgid "%s is no longer idle."
 msgstr "%s ???????? ?????? ? ??? ???????????? ????? ?"
 
-#: ../libpurple/plugins/statenotify.c:86
 #, c-format
 msgid "%s has signed on."
 msgstr "%s ?????? ????? ?"
 
-#: ../libpurple/plugins/statenotify.c:104
 #
 msgid "Notify When"
 msgstr "???????? ??????????? ????????? ?????? ??? ?'?"
 
-#: ../libpurple/plugins/statenotify.c:107
 #
 msgid "Buddy Goes _Away"
 msgstr "????? ????????? ?????? (_A)"
 
-#: ../libpurple/plugins/statenotify.c:110
 #
 msgid "Buddy Goes _Idle"
 msgstr "????? ???????? ??????? ?'?? (_I)"
 
-#: ../libpurple/plugins/statenotify.c:113
 #
 msgid "Buddy _Signs On/Off"
 msgstr "????? ??????/???????? ????? (_S)"
 
+#
 #. *< type
 #. *< ui_requirement
 #. *< flags
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/statenotify.c:161
-#
 msgid "Buddy State Notification"
 msgstr "Buddy State Notification"
 
+#
 #. *< name
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/plugins/statenotify.c:164
-#
-#: ../libpurple/plugins/statenotify.c:167
 msgid ""
 "Notifies in a conversation window when a buddy goes or returns from away or "
 "idle."
 msgstr ""
-"???????? ?? ????????? ?????? ? ??? ????? ???????????? ?????, ??????? "
-"????????????? "
-"????? ??? ?'? ?"
+"???????? ?? ????????? ?????? ? ??? ????? ???????????? ?????, ??????? ????????????? ????? "
+"??? ?'? ?"
 
-#: ../libpurple/plugins/tcl/tcl.c:423
 #
 msgid "Tcl Plugin Loader"
 msgstr "Tcl ????? ?? ????? ????????"
 
-#: ../libpurple/plugins/tcl/tcl.c:425 ../libpurple/plugins/tcl/tcl.c:426
 #
 msgid "Provides support for loading Tcl plugins"
 msgstr "Tcl ????? ?? ??? ???? ???? ?????????????? ?????? ??? ??"
 
-#: ../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"
 msgstr ""
-"ActiveTCL ????????? ??????? ?????? ?????? ? TCL ????? ?? ??????? ?????? "
-"?????? ?'??, http://"
-"www.activestate.com ? ??? ActiveTCL ??????? ??? ?\n"
+"ActiveTCL ????????? ??????? ?????? ?????? ? TCL ????? ?? ??????? ?????? ?????? ?'??, "
+"http://www.activestate.com ? ??? ActiveTCL ??????? ??? ?\n"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:93
 #
 msgid ""
 "Unable to find Apple's \"Bonjour for Windows\" toolkit, see http://d.pidgin."
@@ -4400,70 +3140,37 @@ msgstr ""
 "Apple's \"Bonjour for Windows\" ??? ??? ???? ????? ? ???? ?????? ???? http://"
 "d.pidgin.im/BonjourWindows ???? ?"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:111
 #
 msgid "Unable to listen for incoming IM connections"
 msgstr "????????? IM ?????? ??????? ?????? ??????"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:138
 #
-msgid "Unable to establish connection with the local mDNS server.  Is it running?"
+msgid ""
+"Unable to establish connection with the local mDNS server.  Is it running?"
 msgstr "??????? mDNS ?????? ???? ????? ?????? ?????? ?????? ? ?????? ????????? ?"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:380
 #
-#: ../libpurple/protocols/bonjour/bonjour.c:732
-#: ../libpurple/protocols/gg/gg.c:581
-#: ../libpurple/protocols/jabber/jabber.c:1182
 msgid "First name"
 msgstr "???"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:382
 #
-#: ../libpurple/protocols/bonjour/bonjour.c:735
-#: ../libpurple/protocols/gg/gg.c:576
-#: ../libpurple/protocols/jabber/jabber.c:1183
 msgid "Last name"
 msgstr "????"
 
-#. email
-#: ../libpurple/protocols/bonjour/bonjour.c:386
 #
-#: ../libpurple/protocols/bonjour/bonjour.c:738
-#: ../libpurple/protocols/gg/gg.c:443
-#: ../libpurple/protocols/jabber/buddy.c:358
-#: ../libpurple/protocols/jabber/buddy.c:1120
-#: ../libpurple/protocols/jabber/buddy.c:1133
-#: ../libpurple/protocols/jabber/buddy.c:2108
-#: ../libpurple/protocols/jabber/jabber.c:1180
-#: ../libpurple/protocols/mxit/actions.c:350
-#: ../libpurple/protocols/mxit/profile.c:134
-#: ../libpurple/protocols/qq/buddy_info.c:121
-#: ../libpurple/protocols/qq/buddy_memo.c:79
-#: ../libpurple/protocols/silc/ops.c:1044
-#: ../libpurple/protocols/silc/silc.c:1006
-#: ../libpurple/protocols/silc/silc.c:1247
-#: ../libpurple/protocols/silc/util.c:562
-#: ../libpurple/protocols/silc10/ops.c:1075
-#: ../libpurple/protocols/silc10/silc.c:706
-#: ../libpurple/protocols/silc10/silc.c:947
-#: ../libpurple/protocols/silc10/util.c:555
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1062
+#. email
 msgid "Email"
 msgstr "? ????"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:389
 #
-#: ../libpurple/protocols/bonjour/bonjour.c:741
 msgid "AIM Account"
 msgstr "AIM ?????"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:392
 #
-#: ../libpurple/protocols/bonjour/bonjour.c:744
 msgid "XMPP Account"
 msgstr "XMPP ?????"
 
+#
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -4474,546 +3181,365 @@ msgstr "XMPP ?????"
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/bonjour/bonjour.c:546
-#
-#: ../libpurple/protocols/bonjour/bonjour.c:548
 msgid "Bonjour Protocol Plugin"
 msgstr "Bonjour ???? ?????? ????? ??"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:688
 #
 msgid "Purple Person"
 msgstr "Purple Person"
 
+#
 #. Creating the options for the protocol
-#: ../libpurple/protocols/bonjour/bonjour.c:729
-#
 msgid "Local Port"
 msgstr "??????? ?????"
 
-#: ../libpurple/protocols/bonjour/bonjour.h:33
 #
 msgid "Bonjour"
 msgstr "Bonjour"
 
-#: ../libpurple/protocols/bonjour/jabber.c:393
 #, c-format
 msgid "%s has closed the conversation."
 msgstr "%s ?????? ???? ??? ???? ?"
 
-#: ../libpurple/protocols/bonjour/jabber.c:488
 #
-#: ../libpurple/protocols/bonjour/jabber.c:553
-#: ../libpurple/protocols/bonjour/jabber.c:598
-#: ../libpurple/protocols/bonjour/jabber.c:768
-#: ../libpurple/protocols/bonjour/jabber.c:789
 msgid "Unable to send the message, the conversation couldn't be started."
 msgstr "?????? ?????? ??????, ?????? ????? ??? ????? ?"
 
-#: ../libpurple/protocols/bonjour/jabber.c:691 ../libpurple/proxy.c:694
-#: ../libpurple/proxy.c:756 ../libpurple/proxy.c:1197
-#: ../libpurple/proxy.c:1390 ../libpurple/proxy.c:2050
-#, c-format
-msgid "Unable to create socket: %s"
-msgstr "???? ??????? ?????? ??????: %s"
-
-#: ../libpurple/protocols/bonjour/jabber.c:711
-#, c-format
-msgid "Unable to bind socket to port: %s"
-msgstr "??????? ???? ???? ?????? ?????? ??????: %s"
-
-#: ../libpurple/protocols/bonjour/jabber.c:724
-#, c-format
-msgid "Unable to listen on socket: %s"
-msgstr "????? ??????? ?????? ??????: %s"
-
-#: ../libpurple/protocols/bonjour/mdns_win32.c:110
 #
 msgid "Error communicating with local mDNSResponder."
 msgstr "??????? mDNSResponder ? ???? ??????? ?????? ?????? ?"
 
-#: ../libpurple/protocols/gg/gg.c:77 ../libpurple/proxy.c:2284
 #
-#: ../libpurple/proxy.c:2350
 msgid "Invalid proxy settings"
 msgstr "???????? ????????? ??? ??"
 
-#: ../libpurple/protocols/gg/gg.c:78 ../libpurple/proxy.c:2284
 #
-#: ../libpurple/proxy.c:2350
 msgid ""
 "Either the host name or port number specified for your given proxy type is "
 "invalid."
 msgstr "??????? ???????? ???? ???? ??????? ???????? ??? ?? ??????? ?????? ??? ??? ?"
 
-#: ../libpurple/protocols/gg/gg.c:112 ../libpurple/protocols/gg/gg.c:134
 #
-#: ../libpurple/protocols/gg/gg.c:173
 msgid "Token Error"
 msgstr "?????? ??????"
 
-#: ../libpurple/protocols/gg/gg.c:113 ../libpurple/protocols/gg/gg.c:135
 #
-#: ../libpurple/protocols/gg/gg.c:174
 msgid "Unable to fetch the token.\n"
 msgstr "????? ??????? ?????? ?????? ?\n"
 
-#: ../libpurple/protocols/gg/gg.c:251 ../libpurple/protocols/gg/gg.c:258
 #
-#: ../libpurple/protocols/gg/gg.c:264
 msgid "Save Buddylist..."
 msgstr "?????? ?????? ??????? ???..."
 
-#: ../libpurple/protocols/gg/gg.c:252
 #
 msgid "Your buddylist is empty, nothing was written to the file."
 msgstr "?????? ????? ?????? ?????, ????????? ???? ???? ??? ?"
 
-#: ../libpurple/protocols/gg/gg.c:259
 #
 msgid "Buddylist saved successfully!"
 msgstr "???????? ???? ?????? ?????? ??????? ??? ????!"
 
-#: ../libpurple/protocols/gg/gg.c:262
 #, c-format
 msgid "Couldn't write buddy list for %s to %s"
 msgstr "%s ? ????? ?????? %s ? ???? ?????"
 
-#: ../libpurple/protocols/gg/gg.c:283 ../libpurple/protocols/gg/gg.c:284
 #
 msgid "Couldn't load buddylist"
 msgstr "????? ?????? ??? ??? ?????"
 
-#: ../libpurple/protocols/gg/gg.c:300
 #
 msgid "Load Buddylist..."
 msgstr "??????????? ??? ???..."
 
-#: ../libpurple/protocols/gg/gg.c:301
 #
 msgid "Buddylist loaded successfully!"
 msgstr "???????? ???? ?????? ?????? ??? ??? ????!"
 
-#: ../libpurple/protocols/gg/gg.c:312
 #
 msgid "Save buddylist..."
 msgstr "??????????? ??????? ???..."
 
-#: ../libpurple/protocols/gg/gg.c:322 ../libpurple/protocols/gg/gg.c:2386
 #
 msgid "Load buddylist from file..."
 msgstr "??????? ? ??? ??????????? ??? ???..."
 
-#: ../libpurple/protocols/gg/gg.c:355
 #
 msgid "You must fill in all registration fields"
 msgstr "???????? ???? ???? ???????? ??? ???? ??? ??????"
 
-#: ../libpurple/protocols/gg/gg.c:362
 #
 msgid "Passwords do not match"
 msgstr "????? ???? ???? ???"
 
-#: ../libpurple/protocols/gg/gg.c:372
 #
 msgid "Unable to register new account.  An unknown error occurred."
 msgstr "???? ????? ??????? ?????? ?????? ?  ??? ?????? ?????? ???? ?????? ?"
 
-#: ../libpurple/protocols/gg/gg.c:385
 #
 msgid "New Gadu-Gadu Account Registered"
 msgstr "???? Gadu Gadu ????? ???????? ????"
 
-#: ../libpurple/protocols/gg/gg.c:386
 #
 msgid "Registration completed successfully!"
 msgstr "???????? ???? ??????? ??? ????!"
 
-#: ../libpurple/protocols/gg/gg.c:448 ../libpurple/protocols/gg/gg.c:716
 #
-#: ../libpurple/protocols/jabber/jabber.c:1270
-#: ../libpurple/protocols/jabber/jabber.c:1274
-#: ../libpurple/protocols/jabber/jabber.c:2294
 msgid "Password"
 msgstr "????? ????"
 
-#: ../libpurple/protocols/gg/gg.c:453
 #
-#: ../libpurple/protocols/jabber/jabber.c:2300
 msgid "Password (again)"
 msgstr "????????? (???? ????)"
 
-#: ../libpurple/protocols/gg/gg.c:458
 #
 msgid "Enter captcha text"
 msgstr "????????? ????????? ?????? ????"
 
-#: ../libpurple/protocols/gg/gg.c:464
 #
 msgid "Captcha"
 msgstr "???????"
 
-#: ../libpurple/protocols/gg/gg.c:468 ../libpurple/protocols/gg/gg.c:469
 #
 msgid "Register New Gadu-Gadu Account"
 msgstr "???? Gadu Gadu ????? ??????? ???"
 
-#: ../libpurple/protocols/gg/gg.c:470
 #
 msgid "Please, fill in the following fields"
 msgstr "??????? ??? ?????????? ???????? ??? ???? ???"
 
-#: ../libpurple/protocols/gg/gg.c:591 ../libpurple/protocols/gg/gg.c:1119
 #
-#: ../libpurple/protocols/gg/gg.c:1187
-#: ../libpurple/protocols/jabber/jabber.c:1185
-#: ../libpurple/protocols/oscar/oscar.c:4197
-#: ../libpurple/protocols/oscar/oscar.c:4205
 msgid "City"
 msgstr "???"
 
-#: ../libpurple/protocols/gg/gg.c:596
 #
 msgid "Year of birth"
 msgstr "????? ???"
 
-#. gender
-#: ../libpurple/protocols/gg/gg.c:599 ../libpurple/protocols/msn/msn.c:2178
 #
-#: ../libpurple/protocols/msnp9/msn.c:1729
-#: ../libpurple/protocols/mxit/actions.c:328
-#: ../libpurple/protocols/mxit/login.c:346
-#: ../libpurple/protocols/mxit/profile.c:125
-#: ../libpurple/protocols/myspace/user.c:129
-#: ../libpurple/protocols/oscar/oscar.c:4156
-#: ../libpurple/protocols/qq/buddy_info.c:119
-#: ../libpurple/protocols/qq/qq.c:316 ../libpurple/protocols/qq/qq.c:319
-#: ../libpurple/protocols/qq/qq.c:322 ../libpurple/protocols/qq/qq.c:326
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1092
+#. gender
 msgid "Gender"
 msgstr "??????/?????"
 
-#: ../libpurple/protocols/gg/gg.c:600
 #
 msgid "Male or female"
 msgstr "?????? ?? ?????"
 
-#. 0
-#: ../libpurple/protocols/gg/gg.c:601
 #
-#: ../libpurple/protocols/mxit/actions.c:330
-#: ../libpurple/protocols/mxit/login.c:348
-#: ../libpurple/protocols/mxit/profile.c:125
-#: ../libpurple/protocols/oscar/oscar.c:4156
-#: ../libpurple/protocols/qq/buddy_info.c:67
-#: ../libpurple/protocols/qq/qq.c:316
+#. 0
 msgid "Male"
 msgstr "?????"
 
-#: ../libpurple/protocols/gg/gg.c:602
 #
-#: ../libpurple/protocols/mxit/actions.c:329
-#: ../libpurple/protocols/mxit/login.c:347
-#: ../libpurple/protocols/mxit/profile.c:125
-#: ../libpurple/protocols/oscar/oscar.c:4156
-#: ../libpurple/protocols/qq/buddy_info.c:68
-#: ../libpurple/protocols/qq/qq.c:319
 msgid "Female"
 msgstr "??????"
 
-#: ../libpurple/protocols/gg/gg.c:606
 #
 msgid "Only online"
 msgstr "??? ?? ????"
 
-#: ../libpurple/protocols/gg/gg.c:610 ../libpurple/protocols/gg/gg.c:611
 #
 msgid "Find buddies"
 msgstr "????? ????????? ???"
 
-#: ../libpurple/protocols/gg/gg.c:612
 #
 msgid "Please, enter your search criteria below"
 msgstr "??????? ??? ?????????? ????????? ??? ????"
 
-#: ../libpurple/protocols/gg/gg.c:646
 #
 msgid "Fill in the fields."
 msgstr "???????? ??? ???? ??? ?"
 
-#: ../libpurple/protocols/gg/gg.c:658
 #
 msgid "Your current password is different from the one that you specified."
 msgstr "?????? ??????? ????????? ??? ??????? ????????? ?? ??? ?"
 
-#: ../libpurple/protocols/gg/gg.c:672
 #
 msgid "Unable to change password. Error occurred.\n"
 msgstr "????????? ???????? ?????? ?????? ? ?????? ???? ?????? ?\n"
 
-#: ../libpurple/protocols/gg/gg.c:681
 #
 msgid "Change password for the Gadu-Gadu account"
 msgstr "Gadu Gadu ?????? ???? ????????? ???????? ???"
 
-#: ../libpurple/protocols/gg/gg.c:682
 #
 msgid "Password was changed successfully!"
 msgstr "???????? ???? ????????? ???????? ??? ????!"
 
-#: ../libpurple/protocols/gg/gg.c:711
 #
 msgid "Current password"
 msgstr "??????? ?????????"
 
-#: ../libpurple/protocols/gg/gg.c:721
 #
 msgid "Password (retype)"
 msgstr "????????? (???? ????)"
 
-#: ../libpurple/protocols/gg/gg.c:726
 #
 msgid "Enter current token"
 msgstr "??????? ????? ????"
 
-#: ../libpurple/protocols/gg/gg.c:732
 #
 msgid "Current token"
 msgstr "??????? ?????"
 
-#: ../libpurple/protocols/gg/gg.c:736
 #
 msgid "Please, enter your current password and your new password for UIN: "
 msgstr "??????? ??? UIN ? ???? ??????? ??? ???? ????????? ????: "
 
-#: ../libpurple/protocols/gg/gg.c:740 ../libpurple/protocols/gg/gg.c:741
 #
 msgid "Change Gadu-Gadu Password"
 msgstr "Gadu Gadu ????????? ???????? ???"
 
-#: ../libpurple/protocols/gg/gg.c:813
 #, c-format
 msgid "Select a chat for buddy: %s"
 msgstr "?????? ???? : %s"
 
-#: ../libpurple/protocols/gg/gg.c:816 ../libpurple/protocols/gg/gg.c:817
 #
 msgid "Add to chat..."
 msgstr "??????? ??? ???..."
 
+#
 #. 0
 #. Global
-#: ../libpurple/protocols/gg/gg.c:1079
-#
-#: ../libpurple/protocols/jabber/buddy.c:1923
-#: ../libpurple/protocols/msn/state.c:34 ../libpurple/protocols/msn/state.c:35
-#: ../libpurple/protocols/msn/state.c:42 ../libpurple/protocols/msn/state.c:43
-#: ../libpurple/protocols/msnp9/state.c:29
-#: ../libpurple/protocols/msnp9/state.c:30
-#: ../libpurple/protocols/msnp9/state.c:37
-#: ../libpurple/protocols/msnp9/state.c:38
-#: ../libpurple/protocols/mxit/roster.c:54
-#: ../libpurple/protocols/novell/novell.c:2843
-#: ../libpurple/protocols/qq/qq.c:412
-#: ../libpurple/protocols/yahoo/libymsg.c:3720 ../libpurple/status.c:162
-#: ../pidgin/gtkdocklet.c:550 ../pidgin/gtkstatusbox.c:1105
-#: ../pidgin/plugins/themeedit-icon.c:63
 msgid "Available"
 msgstr "Disponible"
 
+#
+#. 2
+msgid "Chatty"
+msgstr "?????? ?????? ??????"
+
+#
+#. 3
+msgid "Do Not Disturb"
+msgstr "?? ???????? ??? ??? ?????? ???? ??"
+
+#
 #. 1
 #. 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:1083 ../libpurple/protocols/irc/irc.c:562
-#
-#: ../libpurple/protocols/irc/msgs.c:360
-#: ../libpurple/protocols/jabber/buddy.c:1927
-#: ../libpurple/protocols/mxit/roster.c:55
-#: ../libpurple/protocols/novell/novell.c:2846
-#: ../libpurple/protocols/oscar/oscar.c:782 ../libpurple/protocols/qq/qq.c:269
-#: ../libpurple/protocols/qq/qq.c:416 ../libpurple/protocols/silc/buddy.c:1489
-#: ../libpurple/protocols/silc10/buddy.c:1496
-#: ../libpurple/protocols/yahoo/libymsg.c:4599
-#: ../libpurple/protocols/yahoo/libymsg.c:4686 ../libpurple/status.c:165
-#: ../pidgin/gtkdocklet.c:554 ../pidgin/gtkprefs.c:2691
-#: ../pidgin/gtkstatusbox.c:1106 ../pidgin/plugins/themeedit-icon.c:64
 msgid "Away"
 msgstr "?????????"
 
-#: ../libpurple/protocols/gg/gg.c:1108 ../libpurple/protocols/gg/gg.c:1178
 #
-#: ../libpurple/protocols/oscar/oscar.c:3240
-#: ../libpurple/protocols/oscar/oscar.c:4123
 msgid "UIN"
 msgstr "UIN"
 
-#. first name
-#: ../libpurple/protocols/gg/gg.c:1111 ../libpurple/protocols/gg/gg.c:1181
 #
-#: ../libpurple/protocols/jabber/buddy.c:2102
-#: ../libpurple/protocols/jabber/buddy.c:2289
-#: ../libpurple/protocols/mxit/actions.c:342
-#: ../libpurple/protocols/mxit/profile.c:132
-#: ../libpurple/protocols/oscar/oscar.c:4134
-#: ../libpurple/protocols/silc/ops.c:993
-#: ../libpurple/protocols/silc10/ops.c:1024
-#: ../libpurple/protocols/yahoo/yahoo_aliases.c:544
+#. first name
 msgid "First Name"
 msgstr "???"
 
-#: ../libpurple/protocols/gg/gg.c:1124 ../libpurple/protocols/gg/gg.c:1190
 #
 msgid "Birth Year"
 msgstr "????? ????"
 
-#: ../libpurple/protocols/gg/gg.c:1172 ../libpurple/protocols/gg/gg.c:1241
 #
-#: ../libpurple/protocols/oscar/oscar.c:4310
 msgid "Unable to display the search results."
 msgstr "?????????? ????? ???????? ?????? ?????? ?"
 
-#: ../libpurple/protocols/gg/gg.c:1232
 #
 msgid "Gadu-Gadu Public Directory"
 msgstr "Gadu Gadu ? ????????? ?????????"
 
-#: ../libpurple/protocols/gg/gg.c:1233
 #
 msgid "Search results"
 msgstr "?????????? ?????"
 
-#: ../libpurple/protocols/gg/gg.c:1272
 #
 msgid "No matching users found"
 msgstr "??????? ??? ??????? ???????????? ???? ?????"
 
-#: ../libpurple/protocols/gg/gg.c:1273
 #
 msgid "There are no users matching your search criteria."
 msgstr "?????????? ???? ??????? ??? ??????? ???? ???????????? ???? ????? ?"
 
-#: ../libpurple/protocols/gg/gg.c:1533 ../libpurple/protocols/gg/gg.c:1691
 #
-#: ../libpurple/protocols/qq/qq_network.c:507
 msgid "Unable to read from socket"
 msgstr "???? ? ??? ???? ??????"
 
-#: ../libpurple/protocols/gg/gg.c:1625
 #
 msgid "Buddy list downloaded"
 msgstr "?????? ?????? ??????? ??? ????"
 
-#: ../libpurple/protocols/gg/gg.c:1626
 #
 msgid "Your buddy list was downloaded from the server."
 msgstr "???? ? ??? ?????? ?????? ?????? ??????? ??? ???? ?"
 
-#: ../libpurple/protocols/gg/gg.c:1633
 #
 msgid "Buddy list uploaded"
 msgstr "?????? ?????? ????? ??? ????"
 
-#: ../libpurple/protocols/gg/gg.c:1634
 #
 msgid "Your buddy list was stored on the server."
 msgstr "????? ?????? ?????? ??????? ??? ???? ?"
 
+#
 #. 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/gg/gg.c:1720
-#
-#: ../libpurple/protocols/myspace/myspace.c:1167
-#: ../libpurple/protocols/sametime/sametime.c:1569
 msgid "Connected"
 msgstr "???????"
 
-#: ../libpurple/protocols/gg/gg.c:1729 ../libpurple/protocols/gg/gg.c:1964
 #
-#: ../libpurple/protocols/silc/silc.c:375
-#: ../libpurple/protocols/silc/silc.c:422
-#: ../libpurple/protocols/silc10/silc.c:164
 msgid "Connection failed"
 msgstr "????? ????"
 
-#: ../libpurple/protocols/gg/gg.c:1862
 #
 msgid "Add to chat"
 msgstr "??????? ??? ???"
 
-#: ../libpurple/protocols/gg/gg.c:1891
 #
 msgid "Chat _name:"
 msgstr "?????? ???: (_n)"
 
-#: ../libpurple/protocols/gg/gg.c:1945
 #, c-format
 msgid "Unable to resolve hostname '%s': %s"
 msgstr "'%s' ?????? ??? ??????? ?????? ??????: %s"
 
+#
 #. 1. connect to server
 #. connect to the server
-#: ../libpurple/protocols/gg/gg.c:1960 ../libpurple/protocols/irc/irc.c:334
-#
-#: ../libpurple/protocols/jabber/jabber.c:1582
-#: ../libpurple/protocols/msn/session.c:389
-#: ../libpurple/protocols/msnp9/session.c:351
-#: ../libpurple/protocols/myspace/myspace.c:2219
-#: ../libpurple/protocols/novell/novell.c:2202
-#: ../libpurple/protocols/oscar/oscar.c:1628
-#: ../libpurple/protocols/sametime/sametime.c:3801
-#: ../libpurple/protocols/simple/simple.c:1949
-#: ../libpurple/protocols/yahoo/libymsg.c:3528
-#: ../libpurple/protocols/zephyr/zephyr.c:1582 ../pidgin/gtkstatusbox.c:719
 msgid "Connecting"
 msgstr "????? ??? ????"
 
-#: ../libpurple/protocols/gg/gg.c:2259
 #
 msgid "Chat error"
 msgstr "?????? ????????? ??????"
 
-#: ../libpurple/protocols/gg/gg.c:2260
 #
 msgid "This chat name is already in use"
 msgstr "?????? ?? ??? ???????? ??????? ????"
 
-#: ../libpurple/protocols/gg/gg.c:2339
 #
 msgid "Not connected to the server"
 msgstr "?????? ???? ??????? ??"
 
-#: ../libpurple/protocols/gg/gg.c:2358
 #
 msgid "Find buddies..."
 msgstr "????? ????????? ???..."
 
-#: ../libpurple/protocols/gg/gg.c:2364
 #
 msgid "Change password..."
 msgstr "????????? ???????? ???..."
 
-#: ../libpurple/protocols/gg/gg.c:2370
 #
 msgid "Upload buddylist to Server"
 msgstr "????? ?????? ?????? ????? ???"
 
-#: ../libpurple/protocols/gg/gg.c:2374
 #
 msgid "Download buddylist from Server"
 msgstr "???? ? ??? ????? ?????? ??????? ???"
 
-#: ../libpurple/protocols/gg/gg.c:2378
 #
 msgid "Delete buddylist from Server"
 msgstr "???? ? ??? ????? ?????? ???????"
 
-#: ../libpurple/protocols/gg/gg.c:2382
 #
 msgid "Save buddylist to file..."
 msgstr "????????? ????? ?????? ??????? ???..."
 
+#
 #. magic
 #. major_version
 #. minor_version
@@ -5025,84 +3551,54 @@ msgstr "????????? ??#. id
 #. name
 #. version
-#: ../libpurple/protocols/gg/gg.c:2485
-#
 msgid "Gadu-Gadu Protocol Plugin"
 msgstr "Gadu Gadu ???? ???? ????? ??"
 
+#
 #. summary
-#: ../libpurple/protocols/gg/gg.c:2486
-#
 msgid "Polish popular IM"
 msgstr "Polish ??????? IM"
 
-#: ../libpurple/protocols/gg/gg.c:2534
 #
 msgid "Gadu-Gadu User"
 msgstr "Gadu Gadu ????????????"
 
-#: ../libpurple/protocols/gg/gg.c:2538
 #
 msgid "GG server"
 msgstr "GG ????"
 
-#: ../libpurple/protocols/irc/cmds.c:43
-#: ../libpurple/protocols/silc/silc.c:1897
-#: ../libpurple/protocols/silc10/silc.c:1609
 #, c-format
 msgid "Unknown command: %s"
 msgstr "?????? ????: %s"
 
-#: ../libpurple/protocols/irc/cmds.c:536
-#: ../libpurple/protocols/jabber/jabber.c:2607
-#: ../libpurple/protocols/silc/silc.c:1587
-#: ../libpurple/protocols/silc10/silc.c:1299
 #, c-format
 msgid "current topic is: %s"
 msgstr "??????? ??????? ??: %s"
 
-#: ../libpurple/protocols/irc/cmds.c:540
 #
-#: ../libpurple/protocols/jabber/jabber.c:2611
-#: ../libpurple/protocols/silc/silc.c:1591
-#: ../libpurple/protocols/silc10/silc.c:1303
 msgid "No topic is set"
 msgstr "???? ??????? ???????? ??? ???"
 
-#: ../libpurple/protocols/irc/dcc_send.c:304
 #
-#: ../libpurple/protocols/irc/dcc_send.c:345
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:327
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:336
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:345
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:1154
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:1859
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:1940
 msgid "File Transfer Failed"
 msgstr "??????? ?????? ????"
 
-#: ../libpurple/protocols/irc/dcc_send.c:305
 #
-#: ../libpurple/protocols/irc/dcc_send.c:346
 msgid "Unable to open a listening port."
 msgstr "???????? ????????? ????? ??????? ?????? ?"
 
-#: ../libpurple/protocols/irc/irc.c:77
 #
 msgid "Error displaying MOTD"
 msgstr "MOTD ???????? ?????? ??????"
 
-#: ../libpurple/protocols/irc/irc.c:77
 #
 msgid "No MOTD available"
 msgstr "???? MOTD ?????? ???"
 
-#: ../libpurple/protocols/irc/irc.c:78
 #
 msgid "There is no MOTD associated with this connection."
 msgstr "?? ?????? ???? ???? MOTD ????? ??? ?"
 
-#: ../libpurple/protocols/irc/irc.c:81
 #, c-format
 msgid "MOTD for %s"
 msgstr "%s ? MOTD"
@@ -5114,144 +3610,52 @@ msgstr "%s ? MOTD"
 #.
 #. TODO: what to do here - do we really have to disconnect?
 #. TODO: do we really want to disconnect on a failure to write?
-#: ../libpurple/protocols/irc/irc.c:125 ../libpurple/protocols/irc/irc.c:167
-#: ../libpurple/protocols/irc/irc.c:660 ../libpurple/protocols/irc/irc.c:691
-#: ../libpurple/protocols/jabber/bosh.c:959
-#: ../libpurple/protocols/jabber/bosh.c:1012
-#: ../libpurple/protocols/jabber/jabber.c:332
-#: ../libpurple/protocols/jabber/jabber.c:366
-#: ../libpurple/protocols/jabber/jabber.c:563
-#: ../libpurple/protocols/jabber/jabber.c:610
-#: ../libpurple/protocols/myspace/myspace.c:2083
-#: ../libpurple/protocols/oscar/flap_connection.c:463
-#: ../libpurple/protocols/qq/qq_network.c:392
-#: ../libpurple/protocols/qq/qq_network.c:588
-#: ../libpurple/protocols/qq/qq_network.c:634
-#: ../libpurple/protocols/sametime/sametime.c:412
-#: ../libpurple/protocols/sametime/sametime.c:1770
-#: ../libpurple/protocols/simple/simple.c:433
-#: ../libpurple/protocols/yahoo/libymsg.c:3051
-#: ../libpurple/protocols/yahoo/libymsg.c:3205
-#: ../libpurple/protocols/yahoo/ycht.c:476 ../libpurple/proxy.c:888
-#: ../libpurple/proxy.c:1471 ../libpurple/proxy.c:1585
-#: ../libpurple/proxy.c:1820 ../libpurple/proxy.c:1896
 #, c-format
 msgid "Lost connection with server: %s"
 msgstr "?????? ???? ????? ????????? ????: %s"
 
-#: ../libpurple/protocols/irc/irc.c:262
 #
 msgid "View MOTD"
 msgstr "MOTD ????"
 
-#: ../libpurple/protocols/irc/irc.c:274 ../libpurple/protocols/silc/chat.c:34
 #
-#: ../libpurple/protocols/silc10/chat.c:33
 msgid "_Channel:"
 msgstr "_?????:"
 
-#: ../libpurple/protocols/irc/irc.c:280
 #
-#: ../libpurple/protocols/jabber/chat.c:62 ../pidgin/gtkaccount.c:585
 msgid "_Password:"
 msgstr "?????????: (_P)"
 
-#: ../libpurple/protocols/irc/irc.c:313
 #
 msgid "IRC nick and server may not contain whitespace"
 msgstr "IRC ????? ??? ?????? ????? ?????????? ??? ??? ??"
 
-#: ../libpurple/protocols/irc/irc.c:344
 #
-#: ../libpurple/protocols/jabber/bosh.c:913
-#: ../libpurple/protocols/jabber/jabber.c:924
-#: ../libpurple/protocols/novell/novell.c:2217
-#: ../libpurple/protocols/oscar/oscar.c:1580
-#: ../libpurple/protocols/yahoo/libymsg.c:1962
 msgid "SSL support unavailable"
 msgstr "SSL ?????? ?????? ??"
 
-#: ../libpurple/protocols/irc/irc.c:357
 #
-#: ../libpurple/protocols/jabber/bosh.c:919
-#: ../libpurple/protocols/jabber/jabber.c:654
-#: ../libpurple/protocols/jabber/jabber.c:760
-#: ../libpurple/protocols/msn/msn.c:1077
-#: ../libpurple/protocols/msn/servconn.c:141
-#: ../libpurple/protocols/msnp9/msn.c:792
-#: ../libpurple/protocols/msnp9/nexus.c:146
-#: ../libpurple/protocols/msnp9/servconn.c:133
-#: ../libpurple/protocols/myspace/myspace.c:2237
-#: ../libpurple/protocols/novell/novell.c:1747
-#: ../libpurple/protocols/oscar/oscar.c:1623
-#: ../libpurple/protocols/oscar/oscar.c:1874
-#: ../libpurple/protocols/oscar/oscar.c:1996
-#: ../libpurple/protocols/qq/qq_network.c:211
-#: ../libpurple/protocols/qq/qq_network.c:236
-#: ../libpurple/protocols/qq/qq_network.c:844
-#: ../libpurple/protocols/sametime/sametime.c:3805
-#: ../libpurple/protocols/silc/silc.c:451
-#: ../libpurple/protocols/simple/simple.c:482
-#: ../libpurple/protocols/simple/simple.c:1852
-#: ../libpurple/protocols/yahoo/libymsg.c:3258
-#: ../libpurple/protocols/yahoo/libymsg.c:3446
-#: ../libpurple/protocols/yahoo/libymsg.c:3562
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:1940
-#: ../libpurple/protocols/yahoo/yahoochat.c:1460
-#: ../libpurple/protocols/yahoo/yahoochat.c:1486
-#: ../libpurple/protocols/yahoo/ycht.c:549
-#: ../libpurple/protocols/yahoo/ycht.c:585
 msgid "Unable to connect"
 msgstr "????? ?????? ??????"
 
 #. this is a regular connect, error out
-#: ../libpurple/protocols/irc/irc.c:453
-#: ../libpurple/protocols/myspace/myspace.c:2176
-#: ../libpurple/protocols/oscar/flap_connection.c:468
-#: ../libpurple/protocols/sametime/sametime.c:1795
-#: ../libpurple/protocols/simple/simple.c:452
-#: ../libpurple/protocols/simple/simple.c:1736
-#: ../libpurple/protocols/yahoo/libymsg.c:3140
-#: ../libpurple/protocols/yahoo/libymsg.c:3166
 #, c-format
 msgid "Unable to connect: %s"
 msgstr "????? ?????? ??????: %s"
 
-#: ../libpurple/protocols/irc/irc.c:669 ../libpurple/protocols/irc/irc.c:700
-#: ../libpurple/protocols/jabber/jabber.c:561
-#: ../libpurple/protocols/jabber/jabber.c:608
-#: ../libpurple/protocols/myspace/myspace.c:2092
-#: ../libpurple/protocols/oscar/flap_connection.c:461
-#: ../libpurple/protocols/qq/qq_network.c:400
-#: ../libpurple/protocols/sametime/sametime.c:1762
-#: ../libpurple/protocols/yahoo/libymsg.c:3058
-#: ../libpurple/protocols/yahoo/libymsg.c:3212
-#: ../libpurple/protocols/yahoo/ycht.c:482 ../libpurple/proxy.c:877
-#: ../libpurple/proxy.c:1459 ../libpurple/proxy.c:1573
-#: ../libpurple/proxy.c:1809 ../libpurple/proxy.c:1884
 #, c-format
 msgid "Server closed the connection"
 msgstr "?????? ???? ????? ???? ????"
 
-#: ../libpurple/protocols/irc/irc.c:836
 #
-#: ../libpurple/protocols/silc/chat.c:1404
-#: ../libpurple/protocols/silc10/chat.c:1426
-#: ../libpurple/protocols/yahoo/yahoochat.c:1543
 msgid "Users"
 msgstr "???????????? ??????"
 
-#: ../libpurple/protocols/irc/irc.c:839
 #
-#: ../libpurple/protocols/sametime/sametime.c:3448
-#: ../libpurple/protocols/silc/chat.c:1407
-#: ../libpurple/protocols/silc/ops.c:1395
-#: ../libpurple/protocols/silc10/chat.c:1429
-#: ../libpurple/protocols/silc10/ops.c:1382
-#: ../libpurple/protocols/yahoo/yahoochat.c:1552
 msgid "Topic"
 msgstr "???????"
 
+#
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -5260,402 +3664,303 @@ msgstr "???????"
 #. *< id
 #. *< name
 #. *< version
-#: ../libpurple/protocols/irc/irc.c:978
-#
 msgid "IRC Protocol Plugin"
 msgstr "IRC ???? ?????? ????? ??"
 
+#
 #. *  summary
-#: ../libpurple/protocols/irc/irc.c:979
-#
 msgid "The IRC Protocol Plugin that Sucks Less"
 msgstr "?? ?????? ?????? ?? IRC ???? ?????? ????? ??"
 
-#. host to connect to
-#: ../libpurple/protocols/irc/irc.c:1004 ../libpurple/protocols/irc/msgs.c:373
 #
-#: ../libpurple/protocols/msn/msn.c:2778
-#: ../libpurple/protocols/msnp9/msn.c:2327
-#: ../libpurple/protocols/oscar/oscar.c:7202
-#: ../libpurple/protocols/sametime/sametime.c:5805
-#: ../libpurple/protocols/silc/ops.c:1251
-#: ../libpurple/protocols/silc/ops.c:1345
-#: ../libpurple/protocols/silc10/ops.c:1244
-#: ../libpurple/protocols/silc10/ops.c:1347
-#: ../libpurple/protocols/simple/simple.c:2133
+#. host to connect to
 msgid "Server"
 msgstr "????"
 
-#. port to connect to
-#: ../libpurple/protocols/irc/irc.c:1007 ../libpurple/protocols/msn/msn.c:2783
 #
-#: ../libpurple/protocols/msnp9/msn.c:2332
-#: ../libpurple/protocols/oscar/oscar.c:7205
-#: ../libpurple/protocols/sametime/sametime.c:5810
-#: ../libpurple/protocols/silc/silc.c:2188
-#: ../libpurple/protocols/silc10/silc.c:1905
+#. port to connect to
 msgid "Port"
 msgstr "Port"
 
-#: ../libpurple/protocols/irc/irc.c:1010
 #
 msgid "Encodings"
 msgstr "???????"
 
-#: ../libpurple/protocols/irc/irc.c:1013
 #
 msgid "Auto-detect incoming UTF-8"
 msgstr "????????? UTF 8 ?????????????? ??????? ??? ?'?"
 
-#: ../libpurple/protocols/irc/irc.c:1019 ../libpurple/protocols/irc/msgs.c:367
 #
-#: ../libpurple/protocols/silc/silc.c:1245
-#: ../libpurple/protocols/silc10/silc.c:945
 msgid "Real name"
 msgstr "???? ???"
 
+#
 #.
 #. option = purple_account_option_string_new(_("Quit message"), "quitmsg", IRC_DEFAULT_QUIT);
 #. prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option);
 #.
-#: ../libpurple/protocols/irc/irc.c:1027
-#
-#: ../libpurple/protocols/oscar/oscar.c:7208
 msgid "Use SSL"
 msgstr "SSL ??????? ??? ?'?"
 
-#: ../libpurple/protocols/irc/msgs.c:188
 #
 msgid "Bad mode"
 msgstr "??? ???"
 
-#: ../libpurple/protocols/irc/msgs.c:211
 #, c-format
 msgid "Ban on %s by %s, set %s ago"
 msgstr "%s ? %s ? ??? ?????, %s ???? ?????????"
 
-#: ../libpurple/protocols/irc/msgs.c:215
 #, c-format
 msgid "Ban on %s"
 msgstr "%s ? ???? ????????"
 
-#: ../libpurple/protocols/irc/msgs.c:230
 #
 msgid "End of ban list"
 msgstr "???????? ??????? ???????"
 
-#: ../libpurple/protocols/irc/msgs.c:244
 #, c-format
 msgid "You are banned from %s."
 msgstr "%s ? ??? ??????? ???????? ??? ???? ?"
 
-#: ../libpurple/protocols/irc/msgs.c:245
 #
 msgid "Banned"
 msgstr "???????? ??? ????"
 
-#: ../libpurple/protocols/irc/msgs.c:262
 #, c-format
 msgid "Cannot ban %s: banlist is full"
 msgstr "%s ?? ???????? ?????? ??????: banlist ????????"
 
-#: ../libpurple/protocols/irc/msgs.c:351
 #
 msgid " <i>(ircop)</i>"
 msgstr " <i>(ircop)</i>"
 
-#: ../libpurple/protocols/irc/msgs.c:352
 #
 msgid " <i>(identified)</i>"
 msgstr " <i>(identified)</i>"
 
-#: ../libpurple/protocols/irc/msgs.c:353
 #
-#: ../libpurple/protocols/oscar/oscar.c:4124
-#: ../libpurple/protocols/silc/ops.c:1424
-#: ../libpurple/protocols/silc10/ops.c:1414
 msgid "Nick"
 msgstr "?????"
 
-#: ../libpurple/protocols/irc/msgs.c:379
 #
-#: ../libpurple/protocols/silc/ops.c:1270
-#: ../libpurple/protocols/silc10/ops.c:1272
 msgid "Currently on"
 msgstr "???????? ?????"
 
-#: ../libpurple/protocols/irc/msgs.c:384
 #
 msgid "Idle for"
 msgstr "??????? ???? ???? ????????"
 
-#: ../libpurple/protocols/irc/msgs.c:387
 #
 msgid "Online since"
 msgstr "??????? ??? ? ??? ?? ????"
 
-#: ../libpurple/protocols/irc/msgs.c:391
 #
 msgid "<b>Defining adjective:</b>"
 msgstr "<b>??????????? ??????:</b>"
 
-#: ../libpurple/protocols/irc/msgs.c:391
 #
 msgid "Glorious"
 msgstr "?????"
 
-#: ../libpurple/protocols/irc/msgs.c:479
 #, c-format
 msgid "%s has changed the topic to: %s"
 msgstr "%s ?????? ??????? ??????? ???????? ??? ????: %s"
 
-#: ../libpurple/protocols/irc/msgs.c:481
 #, c-format
 msgid "%s has cleared the topic."
 msgstr "%s ?????? ??????? ??????? ????"
 
-#: ../libpurple/protocols/irc/msgs.c:489
 #, c-format
 msgid "The topic for %s is: %s"
 msgstr "%s ? ???? ??: %s"
 
-#: ../libpurple/protocols/irc/msgs.c:507
 #, c-format
 msgid "Unknown message '%s'"
 msgstr "?????? ?????? '%s'"
 
-#: ../libpurple/protocols/irc/msgs.c:508
 #
 msgid "Unknown message"
 msgstr "?????? ??????"
 
-#: ../libpurple/protocols/irc/msgs.c:508
 #
 msgid "The IRC server received a message it did not understand."
 msgstr "IRC ???? ?????? ??????? ?????? ??????? ??? ?"
 
-#: ../libpurple/protocols/irc/msgs.c:529
 #, c-format
 msgid "Users on %s: %s"
 msgstr "%s ? ????????????: %s"
 
-#: ../libpurple/protocols/irc/msgs.c:636
 #
 msgid "Time Response"
 msgstr "???????????? ???"
 
-#: ../libpurple/protocols/irc/msgs.c:637
 #
 msgid "The IRC server's local time is:"
 msgstr "IRC ???? ?????? ??????? ??????? ???:"
 
-#: ../libpurple/protocols/irc/msgs.c:648
 #
 msgid "No such channel"
 msgstr "?? ???? ???? ????? ??????? ???"
 
+#
 #. does this happen?
-#: ../libpurple/protocols/irc/msgs.c:659
-#
 msgid "no such channel"
 msgstr "?? ???? ???? ????? ??????? ???"
 
-#: ../libpurple/protocols/irc/msgs.c:662
 #
 msgid "User is not logged in"
 msgstr "???????????? ?????? ??????"
 
-#: ../libpurple/protocols/irc/msgs.c:667
 #
 msgid "No such nick or channel"
 msgstr "?? ???? ???? ????? ?? ????? ??????? ???"
 
-#: ../libpurple/protocols/irc/msgs.c:687
 #
 msgid "Could not send"
 msgstr "?????? ?????"
 
-#: ../libpurple/protocols/irc/msgs.c:743
 #, c-format
 msgid "Joining %s requires an invitation."
 msgstr "%s ? ??? ????? ???? ???????? ???????"
 
-#: ../libpurple/protocols/irc/msgs.c:744
 #
 msgid "Invitation only"
 msgstr "??? ?????????????"
 
-#: ../libpurple/protocols/irc/msgs.c:860
-#: ../libpurple/protocols/jabber/presence.c:895
 #, c-format
 msgid "You have been kicked by %s: (%s)"
 msgstr "%s ?????? ??????? ?????? ??? ????: (%s)"
 
 #. Remove user from channel
-#: ../libpurple/protocols/irc/msgs.c:865
-#: ../libpurple/protocols/jabber/presence.c:902
-#: ../libpurple/protocols/silc/ops.c:716
-#: ../libpurple/protocols/silc10/ops.c:720
 #, c-format
 msgid "Kicked by %s (%s)"
 msgstr "%s ? ??? ????? (%s)"
 
-#: ../libpurple/protocols/irc/msgs.c:888
 #, c-format
 msgid "mode (%s %s) by %s"
 msgstr "(%s %s) ??? %s ? ??????"
 
-#: ../libpurple/protocols/irc/msgs.c:978 ../libpurple/protocols/irc/msgs.c:979
 #
-#: ../libpurple/protocols/jabber/jabber.c:2629
 msgid "Invalid nickname"
 msgstr "???? ?????"
 
-#: ../libpurple/protocols/irc/msgs.c:980
 #
 msgid ""
 "Your selected nickname was rejected by the server.  It probably contains "
 "invalid characters."
 msgstr ""
-"????????? ??????? ???? ?????? ???????????? ??? ???? ?  ?????? ?? ???? ????? "
-"??????? ??? ?"
+"????????? ??????? ???? ?????? ???????????? ??? ???? ?  ?????? ?? ???? ????? ??????? "
+"??? ?"
 
-#: ../libpurple/protocols/irc/msgs.c:985
 #
 msgid ""
 "Your selected account name was rejected by the server.  It probably contains "
 "invalid characters."
 msgstr ""
-"????????? ?????? ??? ???? ?????? ???????????? ??? ???? ?  ?????? ?? "
-"???? ????? ??????? ??? ?"
+"????????? ?????? ??? ???? ?????? ???????????? ??? ???? ?  ?????? ?? ???? ????? "
+"??????? ??? ?"
 
 #. We only want to do the following dance if the connection
 #. has not been successfully completed.  If it has, just
 #. notify the user that their /nick command didn't go.
-#: ../libpurple/protocols/irc/msgs.c:1001
 #, c-format
 msgid "The nickname \"%s\" is already being used."
 msgstr "\"%s\" ????? ???????? ??????? ???? ?"
 
-#: ../libpurple/protocols/irc/msgs.c:1003
 #
-#: ../libpurple/protocols/irc/msgs.c:1004
 msgid "Nickname in use"
 msgstr "??????? ?????"
 
-#: ../libpurple/protocols/irc/msgs.c:1048
 #
 msgid "Cannot change nick"
 msgstr "????? ???????? ??? ????? ??"
 
-#: ../libpurple/protocols/irc/msgs.c:1048
 #
 msgid "Could not change nick"
 msgstr "????? ???????? ?????? ??????"
 
-#: ../libpurple/protocols/irc/msgs.c:1073
 #, c-format
 msgid "You have parted the channel%s%s"
 msgstr "????? ?????%s%s ? ??? ???????? ?????"
 
-#: ../libpurple/protocols/irc/msgs.c:1117
 #
 msgid "Error: invalid PONG from server"
 msgstr "??????: ???? ? ??? ???? PONG ??????? ????"
 
-#: ../libpurple/protocols/irc/msgs.c:1119
 #, c-format
 msgid "PING reply -- Lag: %lu seconds"
 msgstr "PING ? ????????????    ??????: %lu ???????"
 
-#: ../libpurple/protocols/irc/msgs.c:1210
 #, c-format
 msgid "Cannot join %s: Registration is required."
 msgstr "%s ? ??? ??? ????? ??: ??????? ??????? ?"
 
-#: ../libpurple/protocols/irc/msgs.c:1211
 #
-#: ../libpurple/protocols/silc/ops.c:1095
-#: ../libpurple/protocols/silc10/ops.c:1128
 msgid "Cannot join channel"
 msgstr "?????? ??? ???? ??????"
 
-#: ../libpurple/protocols/irc/msgs.c:1245
 #
 msgid "Nick or channel is temporarily unavailable."
 msgstr "????? ?? ????? ?????????? ?????? ??? ?"
 
-#: ../libpurple/protocols/irc/msgs.c:1257
 #, c-format
 msgid "Wallops from %s"
 msgstr "%s ? ??? ??????? Wallops"
 
-#: ../libpurple/protocols/irc/parse.c:124
 #
 msgid "action &lt;action to perform&gt;:  Perform an action."
 msgstr "action &lt;action to perform&gt;:  ???? ??? ??????? ??? ?"
 
-#: ../libpurple/protocols/irc/parse.c:125
 #
 msgid ""
 "away [message]:  Set an away message, or use no message to return from being "
 "away."
 msgstr ""
-"away [message]:  ????????? ??????? ???? ?????? ???????? ??? ?? ????????? "
-"?????? "
-"? ??? ????????????? ???? ??????  ?????? ?????? ???"
+"away [message]:  ????????? ??????? ???? ?????? ???????? ??? ?? ????????? ?????? ? "
+"??? ????????????? ???? ??????  ?????? ?????? ???"
 
-#: ../libpurple/protocols/irc/parse.c:126
 #
 msgid "ctcp <nick> <msg>: sends ctcp msg to nick."
 msgstr ""
-"ctcp <nick> <msg>: ??????? ????????? ???????? ????????? ctcp ?????? ?????? "
-"?'? ?"
+"ctcp <nick> <msg>: ??????? ????????? ???????? ????????? ctcp ?????? ?????? ?'? ?"
 
-#: ../libpurple/protocols/irc/parse.c:127
 #
 msgid "chanserv: Send a command to chanserv"
 msgstr "chanserv: chanserv ? ??? ???? ?????? ????"
 
-#: ../libpurple/protocols/irc/parse.c:128
 #
 msgid ""
 "deop &lt;nick1&gt; [nick2] ...:  Remove channel operator status from "
 "someone. You must be a channel operator to do this."
 msgstr ""
-"deop &lt;nick1&gt; [nick2] ...:  ???? ???????? ????? ??????? ?????? ????? "
-"??? ? ?? ???? ???? ????? ??????? ???? ?????? ?"
+"deop &lt;nick1&gt; [nick2] ...:  ???? ???????? ????? ??????? ?????? ????? ??? "
+"? ?? ???? ???? ????? ??????? ???? ?????? ?"
 
-#: ../libpurple/protocols/irc/parse.c:129
 msgid ""
 "devoice &lt;nick1&gt; [nick2] ...:  Remove channel voice status from "
 "someone, preventing them from speaking if the channel is moderated (+m). You "
 "must be a channel operator to do this."
 msgstr ""
-"devoice &lt;nick1&gt; [nick2] ...:  ????????????? voice ?????? ????? ??? ?? ?"
-"???? ???, ????? ???????? (+m) ??????? ??????, ????????? ????????????? ?? "
-"?????? ??? ??????? ???????? ??? ?'? ? ?? ???????? ???? ????? ??????? "
-"???? ???????"
+"devoice &lt;nick1&gt; [nick2] ...:  ????????????? voice ?????? ????? ??? ?? "
+"????? ???, ????? ???????? (+m) ??????? ??????, ????????? ????????????? ?? ?????? "
+"??? ??????? ???????? ??? ?'? ? ?? ???????? ???? ????? ??????? ???? ???????"
 
-#: ../libpurple/protocols/irc/parse.c:130
 #
 msgid ""
 "invite &lt;nick&gt; [room]:  Invite someone to join you in the specified "
 "channel, or the current channel."
 msgstr ""
-"invite &lt;nick&gt; [room]:  ???? ??????????? ????? ?? ??????? ??????? "
-"???? ???????? ???????? ??? ?"
+"invite &lt;nick&gt; [room]:  ???? ??????????? ????? ?? ??????? ??????? ???? "
+"???????? ???????? ??? ?"
 
-#: ../libpurple/protocols/irc/parse.c:131
 #
 msgid ""
 "j &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  Enter one or more "
 "channels, optionally providing a channel key for each if needed."
 msgstr ""
-"j &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  ?? ?? ?????? ????? "
-"????, ???????? ??????? ?????? ???? ????? ?? ??????? ??? ?"
+"j &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  ?? ?? ?????? ????? ????, "
+"???????? ??????? ?????? ???? ????? ?? ??????? ??? ?"
 
-#: ../libpurple/protocols/irc/parse.c:132
 #
 msgid ""
 "join &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  Enter one or more "
@@ -5664,187 +3969,149 @@ msgstr ""
 "join &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  ?? ?? ?????? ????? "
 "????, ???????? ??????? ?????? ???? ????? ?? ??????? ??? ?"
 
-#: ../libpurple/protocols/irc/parse.c:133
 #
 msgid ""
 "kick &lt;nick&gt; [message]:  Remove someone from a channel. You must be a "
 "channel operator to do this."
 msgstr ""
-"kick &lt;nick&gt; [message]:  ????? ? ??? ???? ???????? ???????? ??? ? ?? "
-"??? "
+"kick &lt;nick&gt; [message]:  ????? ? ??? ???? ???????? ???????? ??? ? ?? ??? "
 "???? ???? ????? ??????? ???? ?????? ?"
 
-#: ../libpurple/protocols/irc/parse.c:134
 #
 msgid ""
 "list:  Display a list of chat rooms on the network. <i>Warning, some servers "
 "may disconnect you upon doing this.</i>"
 msgstr ""
-"list:  ??????????? ??????? ?????? ???? ?????? ???????? ??? ?'? ? <i>"
-"???????????, "
-"?? ??? ???????? ?'?? ???? ???? ? ??? ????? ????????? ??? ??? ???? ?</i>"
+"list:  ??????????? ??????? ?????? ???? ?????? ???????? ??? ?'? ? <i>???????????, ?? "
+"??? ???????? ?'?? ???? ???? ? ??? ????? ????????? ??? ??? ???? ?</i>"
 
-#: ../libpurple/protocols/irc/parse.c:135
 #
 msgid "me &lt;action to perform&gt;:  Perform an action."
 msgstr "me &lt;action to perform&gt;:  ??? ??????? ??? ?"
 
-#: ../libpurple/protocols/irc/parse.c:136
 #
 msgid "memoserv: Send a command to memoserv"
 msgstr "memoserv: memoserv ? ???? ?????? ????"
 
-#: ../libpurple/protocols/irc/parse.c:137
 #
 msgid ""
 "mode &lt;+|-&gt;&lt;A-Za-z&gt; &lt;nick|channel&gt;:  Set or unset a channel "
 "or user mode."
 msgstr ""
-"mode &lt;+| &gt;&lt;A Za z&gt; &lt;nick|channel&gt;:  ????? ?? "
-"????????????? ??? ???????? ?? ????? ??? ?"
+"mode &lt;+| &gt;&lt;A Za z&gt; &lt;nick|channel&gt;:  ????? ?? ????????????? "
+"??? ???????? ?? ????? ??? ?"
 
-#: ../libpurple/protocols/irc/parse.c:138
 #
 msgid ""
 "msg &lt;nick&gt; &lt;message&gt;:  Send a private message to a user (as "
 "opposed to a channel)."
 msgstr ""
-"msg &lt;nick&gt; &lt;message&gt;:  ???? ?????????????? ?????? ?????? ?????? "
-"?'? "
+"msg &lt;nick&gt; &lt;message&gt;:  ???? ?????????????? ?????? ?????? ?????? ?'? "
 "(?????? ?? ????) ?"
 
-#: ../libpurple/protocols/irc/parse.c:139
 #
 msgid "names [channel]:  List the users currently in a channel."
 msgstr "names [channel]:  ??????? ??????? ????????????? ?????? ???????? ??? ??"
 
-#: ../libpurple/protocols/irc/parse.c:140
 #
-#: ../libpurple/protocols/jabber/jabber.c:3303
 msgid "nick &lt;new nickname&gt;:  Change your nickname."
 msgstr "nick &lt;new nickname&gt;:  ????? ???????? ??? ?"
 
-#: ../libpurple/protocols/irc/parse.c:141
 #
 msgid "nickserv: Send a command to nickserv"
 msgstr "nickserv: nickserv ? ???? ???? ?????? ????"
 
-#: ../libpurple/protocols/irc/parse.c:142
 #
 msgid "notice &lt;target&lt;:  Send a notice to a user or channel."
 msgstr ""
-"notice &lt;target&lt;:  ???? ???????????? ?? ?????? ???? ????????? ??????? "
-"?"
+"notice &lt;target&lt;:  ???? ???????????? ?? ?????? ???? ????????? ??????? ?"
 
-#: ../libpurple/protocols/irc/parse.c:143
 #
 msgid ""
 "op &lt;nick1&gt; [nick2] ...:  Grant channel operator status to someone. You "
 "must be a channel operator to do this."
 msgstr ""
-"op &lt;nick1&gt; [nick2] ...:  ???? ????????? ????? ???????? ?????? "
-"?????? "
-"??? ? ?? ???? ????????? ???? ????? ??????? ???? ?????? ?"
+"op &lt;nick1&gt; [nick2] ...:  ???? ????????? ????? ???????? ?????? ?????? ??? "
+"? ?? ???? ????????? ???? ????? ??????? ???? ?????? ?"
 
-#: ../libpurple/protocols/irc/parse.c:144
 #
 msgid ""
 "operwall &lt;message&gt;:  If you don't know what this is, you probably "
 "can't use it."
 msgstr ""
-"operwall &lt;message&gt;:  ?? ??????? ??????? ???? ?? ?????? ?????? ????? "
-"??? "
+"operwall &lt;message&gt;:  ?? ??????? ??????? ???? ?? ?????? ?????? ????? ??? "
 "??????? ?????? ????????????? ?? ?"
 
-#: ../libpurple/protocols/irc/parse.c:145
 #
 msgid "operserv: Send a command to operserv"
 msgstr "operserv: operserv ? ????????? ??? ???? ?????? ????"
 
-#: ../libpurple/protocols/irc/parse.c:146
 #
 msgid ""
 "part [room] [message]:  Leave the current channel, or a specified channel, "
 "with an optional message."
 msgstr ""
-"part [room] [message]:  ???????? ??? ?????? ???????? ??? ??????? ?? ???? "
-"???? "
+"part [room] [message]:  ???????? ??? ?????? ???????? ??? ??????? ?? ???? ???? "
 "??????????? ????? ? ??? ???????? ??? ?"
 
-#: ../libpurple/protocols/irc/parse.c:147
 #
 msgid ""
 "ping [nick]:  Asks how much lag a user (or the server if no user specified) "
 "has."
 msgstr ""
-"ping [nick]:  ???? ???????????? (?? ????????????? ??? ??????? ?? ?'?? ????) "
-"? ??? ??????? ???????????? ?????? ???? ?? ?"
+"ping [nick]:  ???? ???????????? (?? ????????????? ??? ??????? ?? ?'?? ????) ? ??? "
+"??????? ???????????? ?????? ???? ?? ?"
 
-#: ../libpurple/protocols/irc/parse.c:148
 #
 msgid ""
 "query &lt;nick&gt; &lt;message&gt;:  Send a private message to a user (as "
 "opposed to a channel)."
 msgstr ""
-"query &lt;nick&gt; &lt;message&gt;:  ???? ?????????????? ?????? ?????? "
-"?????? "
+"query &lt;nick&gt; &lt;message&gt;:  ???? ?????????????? ?????? ?????? ?????? "
 "?'? (?????? ?? ????) ?"
 
-#: ../libpurple/protocols/irc/parse.c:149
 #
 msgid "quit [message]:  Disconnect from the server, with an optional message."
 msgstr ""
-"quit [message]:  ???????? ??? ?????? ???????? ??? ???? ? ??? ????? ????????? "
-"??? ?"
+"quit [message]:  ???????? ??? ?????? ???????? ??? ???? ? ??? ????? ????????? ??? ?"
 
-#: ../libpurple/protocols/irc/parse.c:150
 #
 msgid "quote [...]:  Send a raw command to the server."
 msgstr "quote [...]:  ?????? ????????? ??? raw ???? ????? ??? ?"
 
-#: ../libpurple/protocols/irc/parse.c:151
 #
 msgid ""
 "remove &lt;nick&gt; [message]:  Remove someone from a room. You must be a "
 "channel operator to do this."
 msgstr ""
-"remove &lt;nick&gt; [message]:  ???? ????????? ??? ? ??? ???????? ??? ? ?? "
-"??? "
+"remove &lt;nick&gt; [message]:  ???? ????????? ??? ? ??? ???????? ??? ? ?? ??? "
 "????????? ???? ????? ??????? ????? ?????? ?"
 
-#: ../libpurple/protocols/irc/parse.c:152
 #
 msgid "time: Displays the current local time at the IRC server."
 msgstr "time: IRC ?????? ???????? ??????? ??? ???????? ??? ?"
 
-#: ../libpurple/protocols/irc/parse.c:153
 #
 msgid "topic [new topic]:  View or change the channel topic."
 msgstr "topic [new topic]:  ?????? ??????? ???????? ?? ???????? ??? ?"
 
-#: ../libpurple/protocols/irc/parse.c:154
 #
 msgid "umode &lt;+|-&gt;&lt;A-Za-z&gt;:  Set or unset a user mode."
 msgstr ""
-"umode &lt;+| &gt;&lt;A Za z&gt;:  ???? ???????????? ??? ???????? ?? ????? "
-"??? ?"
+"umode &lt;+| &gt;&lt;A Za z&gt;:  ???? ???????????? ??? ???????? ?? ????? ??? ?"
 
-#: ../libpurple/protocols/irc/parse.c:155
 #
 msgid "version [nick]: send CTCP VERSION request to a user"
 msgstr "version [nick]: ????????????? ????????? CTCP VERSION ?????? ?????? ????"
 
-#: ../libpurple/protocols/irc/parse.c:156
 #
 msgid ""
 "voice &lt;nick1&gt; [nick2] ...:  Grant channel voice status to someone. You "
 "must be a channel operator to do this."
 msgstr ""
-"voice &lt;nick1&gt; [nick2] ...:  ???? ????????????? ???? ?????? voice "
-"?????? "
+"voice &lt;nick1&gt; [nick2] ...:  ???? ????????????? ???? ?????? voice ?????? "
 "?????? ??? ? ?? ?????? ??? ????? ??????? ?????? ??? ????? ?"
 
-#: ../libpurple/protocols/irc/parse.c:157
 #
 msgid ""
 "wallops &lt;message&gt;:  If you don't know what this is, you probably can't "
@@ -5853,1551 +4120,1149 @@ msgstr ""
 "wallops &lt;message&gt;:  ?? ??????? ??????? ???? ?? ?????? ?????? ????? ??? "
 "??????? ?????? ????????????? ?? ?"
 
-#: ../libpurple/protocols/irc/parse.c:158
 #
 msgid "whois [server] &lt;nick&gt;:  Get information on a user."
 msgstr "whois [server] &lt;nick&gt;:  ???????????? ???????? ???? ??????? ??? ?"
 
-#: ../libpurple/protocols/irc/parse.c:159
 #
 msgid "whowas &lt;nick&gt;: Get information on a user that has logged off."
-msgstr ""
-"whowas &lt;nick&gt;: ????????????? ???? ???????????? ???????? ???? ??????? "
-"??? ?"
+msgstr "whowas &lt;nick&gt;: ????????????? ???? ???????????? ???????? ???? ??????? ??? ?"
 
-#: ../libpurple/protocols/irc/parse.c:554
 #, c-format
 msgid "Reply time from %s: %lu seconds"
 msgstr "%s ? ??? ????? ????? ???: %lu ???????"
 
-#: ../libpurple/protocols/irc/parse.c:555
 #
 msgid "PONG"
 msgstr "PONG"
 
-#: ../libpurple/protocols/irc/parse.c:555
 #
 msgid "CTCP PING reply"
 msgstr "CTCP PING ? ?????"
 
-#: ../libpurple/protocols/irc/parse.c:667
 #
-#: ../libpurple/protocols/irc/parse.c:674
 msgid "Disconnected."
 msgstr "????????? ??? ???? ?"
 
-#: ../libpurple/protocols/jabber/adhoccommands.c:160
 #
-#: ../libpurple/protocols/jabber/auth.c:223
-#: ../libpurple/protocols/jabber/jabber.c:1021
-#: ../libpurple/protocols/jabber/jabber.c:1056
-#: ../libpurple/protocols/jabber/jabber.c:2467
 msgid "Unknown Error"
 msgstr "?????? ??????"
 
-#: ../libpurple/protocols/jabber/adhoccommands.c:162
 #
-#: ../libpurple/protocols/jabber/adhoccommands.c:163
 msgid "Ad-Hoc Command Failed"
 msgstr "Ad Hoc ???? ???????? ??????"
 
-#: ../libpurple/protocols/jabber/adhoccommands.c:197
 #
 msgid "execute"
 msgstr "????????"
 
-#: ../libpurple/protocols/jabber/auth.c:64 ../libpurple/util.c:4270
 #
-msgid "Server requires TLS/SSL, but no TLS/SSL support was found."
-msgstr "?????? ???????? TLS/SSL ?????? ?????? TLS/SSL ?????? ???? ????? ?"
+msgid "Server requires plaintext authentication over an unencrypted stream"
+msgstr "?????? ???????? ?????????????? ???????? ??????? ?????? ?????? ??????? ???????"
 
-#: ../libpurple/protocols/jabber/auth.c:69
 #
-msgid "You require encryption, but no TLS/SSL support was found."
-msgstr "????????? ???????, ?????? TLS/SSL ?????? ???? ????? ?"
-
-#: ../libpurple/protocols/jabber/auth.c:111
-#
-#: ../libpurple/protocols/jabber/auth_cyrus.c:39
-#: ../libpurple/protocols/jabber/auth_plain.c:80
-msgid "Server requires plaintext authentication over an unencrypted stream"
-msgstr ""
-"?????? ???????? ?????????????? ???????? ??????? ?????? ?????? ??????? "
-"???????"
-
 #. This should never happen!
-#: ../libpurple/protocols/jabber/auth.c:179
-#
-#: ../libpurple/protocols/jabber/auth.c:419
-#: ../libpurple/protocols/jabber/auth.c:448
-#: ../libpurple/protocols/jabber/auth.c:459
-#: ../libpurple/protocols/jabber/auth.c:504
-#: ../libpurple/protocols/jabber/auth_cyrus.c:506
-#: ../libpurple/protocols/jabber/auth_digest_md5.c:179
-#: ../libpurple/protocols/jabber/jabber.c:141
 msgid "Invalid response from server"
 msgstr "???? ? ??? ??????? ??????????? ??? ??"
 
-#: ../libpurple/protocols/jabber/auth.c:215
 #
-#: ../libpurple/protocols/jabber/auth.c:347
 msgid "Server does not use any supported authentication method"
 msgstr "???? ?????? ???? ??????? ??????? ?????? ??????? ??? ?? ??"
 
-#: ../libpurple/protocols/jabber/auth.c:331
-#: ../libpurple/protocols/jabber/auth_cyrus.c:244
-#: ../libpurple/protocols/jabber/auth_plain.c:94
 #, c-format
 msgid ""
 "%s requires plaintext authentication over an unencrypted connection.  Allow "
 "this and continue authentication?"
 msgstr ""
-"%s ? ???????? ????????? ????? ?????? ??????? ?????? ?????? ??????? ???????? "
-"?????? ?  "
+"%s ? ???????? ????????? ????? ?????? ??????? ?????? ?????? ??????? ???????? ?????? ?  "
 "?? ???? ?????? ?????? ??? ??????? ????????? ????? ????? ?'????? ?"
 
-#: ../libpurple/protocols/jabber/auth.c:333
 #
-#: ../libpurple/protocols/jabber/auth.c:334
-#: ../libpurple/protocols/jabber/auth_cyrus.c:246
-#: ../libpurple/protocols/jabber/auth_cyrus.c:247
-#: ../libpurple/protocols/jabber/auth_plain.c:96
-#: ../libpurple/protocols/jabber/auth_plain.c:97
 msgid "Plaintext Authentication"
 msgstr "?????? ?????? ???????"
 
-#: ../libpurple/protocols/jabber/auth.c:370
 #
-#: ../libpurple/protocols/jabber/jabber.c:206
 msgid "You require encryption, but it is not available on this server."
 msgstr "?????? ???????? ????????? ???????, ?????? ?? ?????? ???? ??? ?????? ??? ?"
 
-#: ../libpurple/protocols/jabber/auth.c:430
 #
-#: ../libpurple/protocols/jabber/auth_digest_md5.c:196
-#: ../libpurple/protocols/jabber/auth_digest_md5.c:221
-#: ../libpurple/protocols/jabber/auth_scram.c:432
-#: ../libpurple/protocols/jabber/auth_scram.c:453
-#: ../libpurple/protocols/jabber/auth_scram.c:502
-#: ../libpurple/protocols/jabber/auth_scram.c:510
 msgid "Invalid challenge from server"
 msgstr "?????? ??????? ? ??? ???? ???? ?????? ??? ????"
 
-#: ../libpurple/protocols/jabber/auth.c:464
 #
 msgid "Server thinks authentication is complete, but client does not"
 msgstr ""
-"???? ?????? ??????? ?????? ??? ?????? ???? ????, ?????? ????????? ?????? "
-"???? "
-"???"
+"???? ?????? ??????? ?????? ??? ?????? ???? ????, ?????? ????????? ?????? ???? ???"
 
-#: ../libpurple/protocols/jabber/auth_cyrus.c:333
 #
 msgid "SASL authentication failed"
 msgstr "SASL ??????? ??????"
 
-#: ../libpurple/protocols/jabber/auth_cyrus.c:443
 #, c-format
 msgid "SASL error: %s"
 msgstr "SASL ??????: %s"
 
-#: ../libpurple/protocols/jabber/auth_scram.c:366
 #
+#, fuzzy
+msgid "Invalid Encoding"
+msgstr "??????? ????????? ??? ??"
+
+#
+#, fuzzy
+msgid "Unsupported Extension"
+msgstr "???????? ???????"
+
+msgid ""
+"Unexpected response from the server.  This may indicate a possible MITM "
+"attack"
+msgstr ""
+
+msgid ""
+"The server does support channel binding, but did not appear to advertise "
+"it.  This indicates a likely MITM attack"
+msgstr ""
+
+#
+#, fuzzy
+msgid "Server does not support channel binding"
+msgstr "???? ?????? ?????? ???????? ?????? ??? ?? ??"
+
+#
+#, fuzzy
+msgid "Unsupported channel binding method"
+msgstr "???????? ???????"
+
+#
+msgid "User not found"
+msgstr "?????????????? ???? ?????"
+
+#, fuzzy
+msgid "Invalid Username Encoding"
+msgstr "????????????? ??? ??? ??"
+
+#
+msgid "Resource Constraint"
+msgstr "????????? ????"
+
+#
 msgid "Unable to canonicalize username"
 msgstr "????????????? ???? ???????? ????????????? ????????? ???????? ?????? ??????"
 
-#: ../libpurple/protocols/jabber/auth_scram.c:377
 #
 msgid "Unable to canonicalize password"
 msgstr "????????? ???????? ????????????? ????????? ???????? ?????? ??????"
 
-#: ../libpurple/protocols/jabber/auth_scram.c:443
 #
 msgid "Malicious challenge from server"
 msgstr "?????? ??????? ? ??? ??????????? ???? ?????? ??? ????"
 
-#: ../libpurple/protocols/jabber/auth_scram.c:493
 #
 msgid "Unexpected response from server"
 msgstr "???? ? ??? ??????????? ??????????? ??????? ????"
 
-#: ../libpurple/protocols/jabber/bosh.c:417
 #
 msgid "The BOSH connection manager terminated your session."
 msgstr "BOSH ????? ??????????????? ?????? ?????? ??????? ???? ??? ???? ?"
 
-#: ../libpurple/protocols/jabber/bosh.c:519
 #
 msgid "No session ID given"
 msgstr "???? ??????? ID ???? ???"
 
-#: ../libpurple/protocols/jabber/bosh.c:536
 #
 msgid "Unsupported version of BOSH protocol"
 msgstr "BOSH ???? ?????? ???????? ???????"
 
-#: ../libpurple/protocols/jabber/bosh.c:702
 #
 msgid "Unable to establish a connection with the server"
 msgstr "?????? ???? ????? ?????? ?????? ??????"
 
-#: ../libpurple/protocols/jabber/bosh.c:878
 #, c-format
 msgid "Unable to establish a connection with the server: %s"
 msgstr "?????? ???? ????? ?????? ?????? ??????: %s"
 
-#: ../libpurple/protocols/jabber/bosh.c:908
 #
-#: ../libpurple/protocols/jabber/jabber.c:919
 msgid "Unable to establish SSL connection"
 msgstr "SSL ????? ?????? ?????? ??????"
 
-#: ../libpurple/protocols/jabber/buddy.c:346
 #
-#: ../libpurple/protocols/jabber/buddy.c:1017
-#: ../libpurple/protocols/sametime/sametime.c:4207
-#: ../libpurple/protocols/silc/ops.c:989
-#: ../libpurple/protocols/silc10/ops.c:1020
 msgid "Full Name"
 msgstr "???????? ???"
 
-#: ../libpurple/protocols/jabber/buddy.c:347
 #
-#: ../libpurple/protocols/jabber/buddy.c:1028
-#: ../libpurple/protocols/silc/ops.c:1001
-#: ../libpurple/protocols/silc10/ops.c:1032
 msgid "Family Name"
 msgstr "????"
 
-#: ../libpurple/protocols/jabber/buddy.c:348
 #
-#: ../libpurple/protocols/jabber/buddy.c:1030
 msgid "Given Name"
 msgstr "??????? ???"
 
-#: ../libpurple/protocols/jabber/buddy.c:350
 #
-#: ../libpurple/protocols/jabber/jabber.c:1189
 msgid "URL"
 msgstr "URL"
 
-#: ../libpurple/protocols/jabber/buddy.c:351
 #
-#: ../libpurple/protocols/jabber/buddy.c:1079
 msgid "Street Address"
 msgstr "??????? ?????"
 
+#
 #.
 #. * EXTADD is correct, EXTADR is generated by other
 #. * clients. The next time someone reads this, remove
 #. * EXTADR.
 #.
-#: ../libpurple/protocols/jabber/buddy.c:352
-#
-#: ../libpurple/protocols/jabber/buddy.c:1077
 msgid "Extended Address"
 msgstr "?????? ?????"
 
-#: ../libpurple/protocols/jabber/buddy.c:353
 #
-#: ../libpurple/protocols/jabber/buddy.c:1081
 msgid "Locality"
 msgstr "?????"
 
-#: ../libpurple/protocols/jabber/buddy.c:354
 #
-#: ../libpurple/protocols/jabber/buddy.c:1083
 msgid "Region"
 msgstr "?????"
 
-#: ../libpurple/protocols/jabber/buddy.c:355
 #
-#: ../libpurple/protocols/jabber/buddy.c:1085
-#: ../libpurple/protocols/qq/buddy_memo.c:80
 msgid "Postal Code"
 msgstr "??????? ???"
 
-#: ../libpurple/protocols/jabber/buddy.c:356
 #
-#: ../libpurple/protocols/jabber/buddy.c:1088
-#: ../libpurple/protocols/silc/silc.c:1251
-#: ../libpurple/protocols/silc10/silc.c:951
 msgid "Country"
 msgstr "???"
 
+#
 #. lots of clients (including purple) do this, but it's
 #. * out of spec
-#: ../libpurple/protocols/jabber/buddy.c:357
-#
-#: ../libpurple/protocols/jabber/buddy.c:1102
-#: ../libpurple/protocols/jabber/buddy.c:1108
-#: ../libpurple/protocols/qq/buddy_memo.c:77
 msgid "Telephone"
 msgstr "??????"
 
-#: ../libpurple/protocols/jabber/buddy.c:359
 #
-#: ../libpurple/protocols/jabber/buddy.c:1149
 msgid "Organization Name"
 msgstr "??????????? ???"
 
-#: ../libpurple/protocols/jabber/buddy.c:360
 #
-#: ../libpurple/protocols/jabber/buddy.c:1151
 msgid "Organization Unit"
 msgstr "????????????? ?????"
 
-#: ../libpurple/protocols/jabber/buddy.c:362
 #
-#: ../libpurple/protocols/jabber/buddy.c:1158
+#. title
+#. optional information
+msgid "Job Title"
+msgstr "???? ???????"
+
+#
 msgid "Role"
 msgstr "??????"
 
-#. birthday
-#: ../libpurple/protocols/jabber/buddy.c:363
 #
-#: ../libpurple/protocols/jabber/buddy.c:1046
-#: ../libpurple/protocols/msn/msn.c:2247
-#: ../libpurple/protocols/msnp9/msn.c:1798
-#: ../libpurple/protocols/mxit/actions.c:324
-#: ../libpurple/protocols/mxit/login.c:341
-#: ../libpurple/protocols/mxit/profile.c:124
-#: ../libpurple/protocols/oscar/oscar.c:4173
+#. birthday
 msgid "Birthday"
 msgstr "??"
 
-#: ../libpurple/protocols/jabber/buddy.c:364
 #
-#: ../libpurple/protocols/jabber/buddy.c:1160
-#: ../libpurple/protocols/jabber/chat.c:860
-#: ../libpurple/protocols/jabber/usermood.c:217 ../pidgin/gtkblist.c:3722
-#: ../pidgin/gtkplugin.c:590 ../pidgin/plugins/disco/gtkdisco.c:563
 msgid "Description"
 msgstr "?????"
 
-#: ../libpurple/protocols/jabber/buddy.c:670
 #
-#: ../libpurple/protocols/jabber/buddy.c:671
 msgid "Edit XMPP vCard"
 msgstr "XMPP vCard ???????"
 
-#: ../libpurple/protocols/jabber/buddy.c:672
 #
 msgid ""
 "All items below are optional. Enter only the information with which you feel "
 "comfortable."
 msgstr "?????????? ???? ???? ???????? ? ??? ???? ??????? ??????? ???? ?????? ??? ?"
 
-#: ../libpurple/protocols/jabber/buddy.c:717
 #
 msgid "Client"
 msgstr "?????????"
 
-#: ../libpurple/protocols/jabber/buddy.c:721
 #
 msgid "Operating System"
 msgstr "???????? ???????"
 
-#: ../libpurple/protocols/jabber/buddy.c:737
 #
 msgid "Local Time"
 msgstr "??????? ???"
 
-#: ../libpurple/protocols/jabber/buddy.c:768
 #
-#: ../libpurple/protocols/jabber/jabber.c:2130
-#: ../libpurple/protocols/jabber/jabber.c:2146
-#: ../libpurple/protocols/jabber/jabber.c:2162
-#: ../libpurple/protocols/jabber/jabber.c:2178
-#: ../libpurple/protocols/jabber/jabber.c:2192
 msgid "Priority"
 msgstr "???????"
 
-#: ../libpurple/protocols/jabber/buddy.c:812
 #
-#: ../libpurple/protocols/jabber/jabber.c:3073
-#: ../libpurple/protocols/jabber/libxmpp.c:355
-#: ../libpurple/protocols/jabber/si.c:1531
 msgid "Resource"
 msgstr "???????"
 
-#: ../libpurple/protocols/jabber/buddy.c:825
 #
 msgid "Uptime"
 msgstr "??????"
 
-#: ../libpurple/protocols/jabber/buddy.c:829
 #
 msgid "Logged Off"
 msgstr "???????? ???"
 
-#: ../libpurple/protocols/jabber/buddy.c:830
 #, c-format
 msgid "%s ago"
 msgstr "%s ????"
 
-#: ../libpurple/protocols/jabber/buddy.c:1032
 #
-#: ../libpurple/protocols/silc/ops.c:997
-#: ../libpurple/protocols/silc10/ops.c:1028
-#: ../libpurple/protocols/yahoo/yahoo_aliases.c:547
 msgid "Middle Name"
 msgstr "?????? ???"
 
-#: ../libpurple/protocols/jabber/buddy.c:1065
 #
-#: ../libpurple/protocols/jabber/jabber.c:1184
-#: ../libpurple/protocols/oscar/oscar.c:4196
-#: ../libpurple/protocols/oscar/oscar.c:4204
-#: ../libpurple/protocols/qq/buddy_info.c:116
-#: ../libpurple/protocols/qq/buddy_memo.c:78
-#: ../libpurple/protocols/silc/ops.c:1033
-#: ../libpurple/protocols/silc10/ops.c:1064
 msgid "Address"
 msgstr "?????"
 
-#: ../libpurple/protocols/jabber/buddy.c:1070
 #
 msgid "P.O. Box"
 msgstr "????? ????"
 
-#: ../libpurple/protocols/jabber/buddy.c:1180
 #
 msgid "Photo"
 msgstr "???"
 
-#: ../libpurple/protocols/jabber/buddy.c:1180
 #
 msgid "Logo"
 msgstr "?'?' "
 
-#: ../libpurple/protocols/jabber/buddy.c:1725
 #, c-format
 msgid ""
 "%s will no longer be able to see your status updates.  Do you want to "
 "continue?"
 msgstr ""
-"???????? ?????? ?????????? ????????? %s ?? ?????? ?'? ?? ? ?? ???? ????? "
-"???? ?????? "
-"???"
+"???????? ?????? ?????????? ????????? %s ?? ?????? ?'? ?? ? ?? ???? ????? ???? "
+"?????? ???"
 
-#: ../libpurple/protocols/jabber/buddy.c:1727
 #
-#: ../libpurple/protocols/jabber/buddy.c:1835
 msgid "Cancel Presence Notification"
 msgstr "????????? ????????? ????? ??? ?'?"
 
-#: ../libpurple/protocols/jabber/buddy.c:1823
 #
 msgid "Un-hide From"
 msgstr "??????? ???????????? ? ??? ???? ??? ?'? ??"
 
-#: ../libpurple/protocols/jabber/buddy.c:1827
 #
 msgid "Temporarily Hide From"
 msgstr "?????????? ??????? ???????????? ? ??? ???? ??? ?'?"
 
-#: ../libpurple/protocols/jabber/buddy.c:1842
 #
 msgid "(Re-)Request authorization"
 msgstr "???????? ???? ??????"
 
+#
 #. shouldn't this just happen automatically when the buddy is
 #. removed?
-#: ../libpurple/protocols/jabber/buddy.c:1851
-#
 msgid "Unsubscribe"
 msgstr "?? ?????????? ???"
 
-#: ../libpurple/protocols/jabber/buddy.c:1858
 #
-#: ../libpurple/protocols/msn/msn.c:1005
-#: ../libpurple/protocols/msnp9/msn.c:722
-#: ../libpurple/protocols/novell/novell.c:3437
 msgid "Initiate _Chat"
 msgstr "?????? ????? ??? (_C)"
 
-#: ../libpurple/protocols/jabber/buddy.c:1875
 #
 msgid "Log In"
 msgstr "?????? ???"
 
-#: ../libpurple/protocols/jabber/buddy.c:1879
 #
 msgid "Log Out"
 msgstr "??"
 
-#. 2
-#: ../libpurple/protocols/jabber/buddy.c:1925
 #
-#: ../libpurple/protocols/jabber/jabber.c:2145
-#: ../libpurple/protocols/mxit/roster.c:56
-msgid "Chatty"
-msgstr "?????? ?????? ??????"
-
-#: ../libpurple/protocols/jabber/buddy.c:1929
-#
-#: ../pidgin/plugins/themeedit-icon.c:65
-msgid "Extended Away"
-msgstr "???????? ???? ???? ?????????"
-
-#. 3
-#: ../libpurple/protocols/jabber/buddy.c:1931
-#
-#: ../libpurple/protocols/jabber/jabber.c:2191
-#: ../libpurple/protocols/mxit/roster.c:57
-#: ../libpurple/protocols/oscar/oscar.c:776
-#: ../libpurple/protocols/oscar/oscar.c:6292
-#: ../libpurple/protocols/sametime/sametime.c:3371
-msgid "Do Not Disturb"
-msgstr "?? ???????? ??? ??? ?????? ???? ??"
-
-#: ../libpurple/protocols/jabber/buddy.c:2100
-#
 msgid "JID"
 msgstr "JID"
 
-#. last name
-#: ../libpurple/protocols/jabber/buddy.c:2104
 #
-#: ../libpurple/protocols/jabber/buddy.c:2294
-#: ../libpurple/protocols/mxit/actions.c:346
-#: ../libpurple/protocols/mxit/profile.c:133
-#: ../libpurple/protocols/oscar/oscar.c:4135
-#: ../libpurple/protocols/yahoo/yahoo_aliases.c:545
+#. last name
 msgid "Last Name"
 msgstr "????"
 
-#: ../libpurple/protocols/jabber/buddy.c:2136
 #
 msgid "The following are the results of your search"
 msgstr "?????????? ?????????? ????? ??????? ????"
 
+#
 #. current comment from Jabber User Directory users.jabber.org
-#: ../libpurple/protocols/jabber/buddy.c:2221
-#
 msgid ""
 "Find a contact by entering the search criteria in the given fields. Note: "
 "Each field supports wild card searches (%)"
 msgstr ""
-"???????? ????????? ?????????? ????????? ???? ????????? ?????? ??? ? "
-"????????: "
-"??????? ????????? ??????? ????? ?????? ?????? ??? ??? (%)"
+"???????? ????????? ?????????? ????????? ???? ????????? ?????? ??? ? ????????: ??????? "
+"????????? ??????? ????? ?????? ?????? ??? ??? (%)"
 
-#: ../libpurple/protocols/jabber/buddy.c:2242
 #
 msgid "Directory Query Failed"
 msgstr "????????? ????????? ?????? ??????"
 
-#: ../libpurple/protocols/jabber/buddy.c:2243
 #
 msgid "Could not query the directory server."
 msgstr "????????? ????? ????????? ?????? ?????? ?"
 
 #. Try to translate the message (see static message
 #. list in jabber_user_dir_comments[])
-#: ../libpurple/protocols/jabber/buddy.c:2277
 #, c-format
 msgid "Server Instructions: %s"
 msgstr "???? ????????? ???????: %s"
 
-#: ../libpurple/protocols/jabber/buddy.c:2284
 #
 msgid "Fill in one or more fields to search for any matching XMPP users."
 msgstr ""
-"????? XMPP ????????????? ???? ?????????? ???? ?? ?? ?????? ???????? ??? ???? "
-"??? ?"
+"????? XMPP ????????????? ???? ?????????? ???? ?? ?? ?????? ???????? ??? ???? ??? ?"
 
-#: ../libpurple/protocols/jabber/buddy.c:2304
 #
-#: ../libpurple/protocols/novell/novell.c:1501
-#: ../libpurple/protocols/oscar/oscar.c:4138
-#: ../libpurple/protocols/oscar/oscar.c:4147
 msgid "Email Address"
 msgstr "? ???? ?????"
 
-#: ../libpurple/protocols/jabber/buddy.c:2313
 #
-#: ../libpurple/protocols/jabber/buddy.c:2314
 msgid "Search for XMPP users"
 msgstr "XMPP ???????????? ????????? ??? ?'?"
 
-#. "Search"
-#: ../libpurple/protocols/jabber/buddy.c:2315
 #
-#: ../libpurple/protocols/qq/group.c:111
-#: ../libpurple/protocols/sametime/sametime.c:5689
-#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:476
-#: ../pidgin/plugins/gevolution/assoc-buddy.c:358
+#. "Search"
 msgid "Search"
 msgstr "??????"
 
-#: ../libpurple/protocols/jabber/buddy.c:2330
 #
 msgid "Invalid Directory"
 msgstr "???? ?????????"
 
-#: ../libpurple/protocols/jabber/buddy.c:2347
 #
 msgid "Enter a User Directory"
 msgstr "????????????? ????????? ?????? ???"
 
-#: ../libpurple/protocols/jabber/buddy.c:2348
 #
 msgid "Select a user directory to search"
 msgstr "?????????? ???? ??? ???????????? ????????? ???????? ???"
 
-#: ../libpurple/protocols/jabber/buddy.c:2351
 #
 msgid "Search Directory"
 msgstr "?????????? ???? ??????? ?????????"
 
-#: ../libpurple/protocols/jabber/chat.c:44
 #
-#: ../libpurple/protocols/oscar/oscar.c:5796
-#: ../libpurple/protocols/yahoo/yahoochat.c:1092
 msgid "_Room:"
 msgstr "???: (_R)"
 
-#: ../libpurple/protocols/jabber/chat.c:50
 #
 msgid "_Server:"
 msgstr "_Server:"
 
-#: ../libpurple/protocols/jabber/chat.c:56
 #
 msgid "_Handle:"
 msgstr "?????????: (_H)"
 
-#: ../libpurple/protocols/jabber/chat.c:327
 #, c-format
 msgid "%s is not a valid room name"
 msgstr "%s ??? ???? ??? ??"
 
-#: ../libpurple/protocols/jabber/chat.c:328
 #
 msgid "Invalid Room Name"
 msgstr "??? ???? ??? ??"
 
-#: ../libpurple/protocols/jabber/chat.c:334
 #, c-format
 msgid "%s is not a valid server name"
 msgstr "%s ??? ?????? ??? ??"
 
-#: ../libpurple/protocols/jabber/chat.c:335
 #
-#: ../libpurple/protocols/jabber/chat.c:336
 msgid "Invalid Server Name"
 msgstr "?????? ??? ??? ??"
 
-#: ../libpurple/protocols/jabber/chat.c:341
 #, c-format
 msgid "%s is not a valid room handle"
 msgstr "%s ??? ??? ????????? ??"
 
-#: ../libpurple/protocols/jabber/chat.c:342
 #
-#: ../libpurple/protocols/jabber/chat.c:343
 msgid "Invalid Room Handle"
 msgstr "??? ???? ????????? ??"
 
-#: ../libpurple/protocols/jabber/chat.c:487
 #
 msgid "Configuration error"
 msgstr "??????? ????????? ??????"
 
-#: ../libpurple/protocols/jabber/chat.c:496
 #
-#: ../libpurple/protocols/jabber/chat.c:640
 msgid "Unable to configure"
 msgstr "??????? ?????? ??????"
 
-#: ../libpurple/protocols/jabber/chat.c:511
 #
 msgid "Room Configuration Error"
 msgstr "??? ??????? ????????? ??????"
 
-#: ../libpurple/protocols/jabber/chat.c:512
 #
 msgid "This room is not capable of being configured"
 msgstr "?? ????? ??????? ??? ????? ??"
 
-#: ../libpurple/protocols/jabber/chat.c:562
 #
-#: ../libpurple/protocols/jabber/chat.c:631
 msgid "Registration error"
 msgstr "??????? ????????? ??????"
 
-#: ../libpurple/protocols/jabber/chat.c:707
 #
 msgid "Nick changing not supported in non-MUC chatrooms"
 msgstr "MUC ????? ???????? ?????? ????? ????? ???????? ??? ??????? ??"
 
-#: ../libpurple/protocols/jabber/chat.c:762
 #
-#: ../libpurple/protocols/jabber/chat.c:773
-#: ../libpurple/protocols/silc/ops.c:1462
-#: ../libpurple/protocols/silc10/ops.c:1451
 msgid "Error retrieving room list"
 msgstr "???? ?????? ??????? ?????? ??????"
 
-#: ../libpurple/protocols/jabber/chat.c:821
 #
-#: ../pidgin/plugins/disco/gtkdisco.c:177
 msgid "Invalid Server"
 msgstr "???? ??? ??"
 
-#: ../libpurple/protocols/jabber/chat.c:866
 #
 msgid "Enter a Conference Server"
 msgstr "????????? ?????? ???? ?????? ???"
 
-#: ../libpurple/protocols/jabber/chat.c:867
 #
 msgid "Select a conference server to query"
 msgstr "?????????? ????????? ??? ????????? ???? ???????? ???"
 
-#: ../libpurple/protocols/jabber/chat.c:870
 #
 msgid "Find Rooms"
 msgstr "??? ????????? ???"
 
-#: ../libpurple/protocols/jabber/chat.c:1008
 #
 msgid "Affiliations:"
 msgstr "???????????:"
 
-#: ../libpurple/protocols/jabber/chat.c:1020
 #
-#: ../libpurple/protocols/jabber/chat.c:1110
 msgid "No users found"
 msgstr "???? ???????????? ???? ?????"
 
-#: ../libpurple/protocols/jabber/chat.c:1098
 #
 msgid "Roles:"
 msgstr "??????:"
 
-#: ../libpurple/protocols/jabber/jabber.c:516
 #
+msgid "Server requires TLS/SSL, but no TLS/SSL support was found."
+msgstr "?????? ???????? TLS/SSL ?????? ?????? TLS/SSL ?????? ???? ????? ?"
+
+#
+msgid "You require encryption, but no TLS/SSL support was found."
+msgstr "????????? ???????, ?????? TLS/SSL ?????? ???? ????? ?"
+
+#
 msgid "Ping timed out"
 msgstr "Ping ? ??????? ???????? ????"
 
-#: ../libpurple/protocols/jabber/jabber.c:826
 #
-#: ../libpurple/protocols/jabber/jabber.c:848
 msgid "Invalid XMPP ID"
 msgstr "???? XMPP ID"
 
-#: ../libpurple/protocols/jabber/jabber.c:834
 #
+#, fuzzy
+msgid "Invalid XMPP ID. Username portion must be set."
+msgstr "???? XMPP ID ? ?????? ???????? ??? ?????? ?"
+
+#
 msgid "Invalid XMPP ID. Domain must be set."
 msgstr "???? XMPP ID ? ?????? ???????? ??? ?????? ?"
 
-#: ../libpurple/protocols/jabber/jabber.c:902
 #
 msgid "Malformed BOSH URL"
 msgstr "??????????? BOSH URL"
 
-#: ../libpurple/protocols/jabber/jabber.c:1005
 #, c-format
 msgid "Registration of %s@%s successful"
 msgstr "%s@%s ???????? ???? ??????? ??? ????"
 
-#: ../libpurple/protocols/jabber/jabber.c:1011
 #, c-format
 msgid "Registration to %s successful"
 msgstr "%s ? ???? ??????? ???"
 
-#: ../libpurple/protocols/jabber/jabber.c:1014
 #
-#: ../libpurple/protocols/jabber/jabber.c:1015
 msgid "Registration Successful"
 msgstr "??????? ???"
 
-#: ../libpurple/protocols/jabber/jabber.c:1023
 #
-#: ../libpurple/protocols/jabber/jabber.c:1024
 msgid "Registration Failed"
 msgstr "??????? ?????? ??????"
 
-#: ../libpurple/protocols/jabber/jabber.c:1047
 #, c-format
 msgid "Registration from %s successfully removed"
 msgstr "???????? ???? %s ??????? ????? ??? ????"
 
-#: ../libpurple/protocols/jabber/jabber.c:1049
 #
-#: ../libpurple/protocols/jabber/jabber.c:1050
 msgid "Unregistration Successful"
 msgstr "???????? ???? ??????? ????? ??? ????"
 
-#: ../libpurple/protocols/jabber/jabber.c:1058
 #
-#: ../libpurple/protocols/jabber/jabber.c:1059
 msgid "Unregistration Failed"
 msgstr "??????? ????? ?????? ??????"
 
-#: ../libpurple/protocols/jabber/jabber.c:1186
 #
-#: ../libpurple/protocols/oscar/oscar.c:4198
-#: ../libpurple/protocols/oscar/oscar.c:4206
 msgid "State"
 msgstr "?????"
 
-#: ../libpurple/protocols/jabber/jabber.c:1187
 #
 msgid "Postal code"
 msgstr "??????? ???"
 
-#: ../libpurple/protocols/jabber/jabber.c:1188
 #
-#: ../libpurple/protocols/silc/ops.c:1038
-#: ../libpurple/protocols/silc/silc.c:1008
-#: ../libpurple/protocols/silc/util.c:564
-#: ../libpurple/protocols/silc10/ops.c:1069
-#: ../libpurple/protocols/silc10/silc.c:708
-#: ../libpurple/protocols/silc10/util.c:557
 msgid "Phone"
 msgstr "??????"
 
-#: ../libpurple/protocols/jabber/jabber.c:1190 ../pidgin/gtknotify.c:1616
 #
 msgid "Date"
 msgstr "Data"
 
-#: ../libpurple/protocols/jabber/jabber.c:1219
 #
-#: ../libpurple/protocols/jabber/jabber.c:1220
 msgid "Already Registered"
 msgstr "???? ???????? ????"
 
-#: ../libpurple/protocols/jabber/jabber.c:1306
 #
 msgid "Unregister"
 msgstr "??????? ????? ???"
 
-#: ../libpurple/protocols/jabber/jabber.c:1313
 #
-msgid "Please fill out the information below to change your account registration."
+msgid ""
+"Please fill out the information below to change your account registration."
 msgstr "?????? ??????? ???????? ???? ???? ??????? ??? ?????????? ???? ???? ??? ?"
 
-#: ../libpurple/protocols/jabber/jabber.c:1316
 #
 msgid "Please fill out the information below to register your new account."
 msgstr "???? ????? ??????? ??? ???? ??????? ??? ?????????? ???? ???? ??? ?"
 
-#: ../libpurple/protocols/jabber/jabber.c:1324
 #
-#: ../libpurple/protocols/jabber/jabber.c:1325
 msgid "Register New XMPP Account"
 msgstr "???? XMPP ????? ??????? ???"
 
-#: ../libpurple/protocols/jabber/jabber.c:1326
 #
-#: ../libpurple/protocols/jabber/jabber.c:1337
-#: ../pidgin/plugins/disco/gtkdisco.c:307
-#: ../pidgin/plugins/disco/gtkdisco.c:687
 msgid "Register"
 msgstr "??????? ???"
 
-#: ../libpurple/protocols/jabber/jabber.c:1333
 #, c-format
 msgid "Change Account Registration at %s"
 msgstr "%s ? ????? ??????? ???????? ???"
 
-#: ../libpurple/protocols/jabber/jabber.c:1334
 #, c-format
 msgid "Register New Account at %s"
 msgstr "%s ? ???? ????? ??????? ???"
 
-#: ../libpurple/protocols/jabber/jabber.c:1337
 #
 msgid "Change Registration"
 msgstr "??????? ???????? ???"
 
-#: ../libpurple/protocols/jabber/jabber.c:1385
 #
-#: ../libpurple/protocols/jabber/jabber.c:1386
 msgid "Error unregistering account"
 msgstr "?????? ??????? ????? ?????? ??????"
 
-#: ../libpurple/protocols/jabber/jabber.c:1391
 #
-#: ../libpurple/protocols/jabber/jabber.c:1392
 msgid "Account successfully unregistered"
 msgstr "???????? ???? ?????? ??????? ????? ??? ????"
 
-#: ../libpurple/protocols/jabber/jabber.c:1586
 #
 msgid "Initializing Stream"
 msgstr "??????? ????? ??? ????"
 
-#: ../libpurple/protocols/jabber/jabber.c:1591
 #
 msgid "Initializing SSL/TLS"
 msgstr "SSL/TLS ????? ??? ????"
 
-#: ../libpurple/protocols/jabber/jabber.c:1595
 #
-#: ../libpurple/protocols/msn/session.c:395
-#: ../libpurple/protocols/msnp9/session.c:357
 msgid "Authenticating"
 msgstr "??????? ??? ????"
 
-#: ../libpurple/protocols/jabber/jabber.c:1599
 #
 msgid "Re-initializing Stream"
 msgstr "??????? ???? ????? ??? ????"
 
-#: ../libpurple/protocols/jabber/jabber.c:1765
 #
-#: ../libpurple/protocols/jabber/jabber.c:1766
 msgid "Server doesn't support blocking"
 msgstr "???? ?????? ?????? ???????? ?????? ??? ?? ??"
 
-#: ../libpurple/protocols/jabber/jabber.c:1953
 #
-#: ../libpurple/protocols/jabber/jabber.c:2445
-#: ../libpurple/protocols/jabber/jabber.c:2488
-#: ../libpurple/protocols/jabber/jabber.c:2526
-#: ../libpurple/protocols/oscar/oscar.c:953
-#: ../libpurple/protocols/oscar/oscar.c:6088
 msgid "Not Authorized"
 msgstr "???????? ??"
 
-#. (reference: "libpurple/request.h")
-#: ../libpurple/protocols/jabber/jabber.c:2073
 #
-#: ../libpurple/protocols/jabber/jabber.c:2076
-#: ../libpurple/protocols/jabber/jabber.c:2132
-#: ../libpurple/protocols/jabber/jabber.c:2148
-#: ../libpurple/protocols/jabber/jabber.c:2164
-#: ../libpurple/protocols/jabber/jabber.c:2180
-#: ../libpurple/protocols/jabber/jabber.c:2194
-#: ../libpurple/protocols/jabber/usermood.c:208
-#: ../libpurple/protocols/mxit/actions.c:116
-#: ../libpurple/protocols/mxit/mxit.c:338
-#: ../libpurple/protocols/mxit/profile.c:144
-#: ../libpurple/protocols/mxit/profile.c:146
-#: ../libpurple/protocols/silc/buddy.c:1572
-#: ../libpurple/protocols/silc/ops.c:1214
-#: ../libpurple/protocols/silc10/buddy.c:1577
-#: ../libpurple/protocols/silc10/ops.c:1207
 msgid "Mood"
 msgstr "?????"
 
-#: ../libpurple/protocols/jabber/jabber.c:2085
 #
-#: ../libpurple/protocols/msn/msn.c:764
 msgid "Now Listening"
 msgstr "???????? ????????"
 
-#: ../libpurple/protocols/jabber/jabber.c:2092
 #
-#: ../libpurple/protocols/mxit/roster.c:180
 msgid "Both"
 msgstr "??????"
 
-#: ../libpurple/protocols/jabber/jabber.c:2094
 #
 msgid "From (To pending)"
 msgstr "???????? ?????????"
 
-#: ../libpurple/protocols/jabber/jabber.c:2096
 msgid "From"
 msgstr "??????"
 
-#: ../libpurple/protocols/jabber/jabber.c:2099
 msgid "To"
 msgstr "???????"
 
-#: ../libpurple/protocols/jabber/jabber.c:2101
 #
 msgid "None (To pending)"
 msgstr "???????? ?????????"
 
-#. 0
-#: ../libpurple/protocols/jabber/jabber.c:2103
 #
-#: ../libpurple/protocols/mxit/actions.c:40
-#: ../libpurple/protocols/mxit/profile.c:146
-#: ../libpurple/protocols/mxit/roster.c:190
-#: ../pidgin/plugins/gevolution/eds-utils.c:73
-#: ../pidgin/plugins/gevolution/eds-utils.c:86
 msgid "None"
 msgstr "?????"
 
-#. subscription type
-#: ../libpurple/protocols/jabber/jabber.c:2106
 #
-#: ../libpurple/protocols/mxit/mxit.c:342
-#: ../libpurple/protocols/mxit/profile.c:153
+#. subscription type
 msgid "Subscription"
 msgstr "???????????"
 
-#: ../libpurple/protocols/jabber/jabber.c:2133
 #
-#: ../libpurple/protocols/jabber/jabber.c:2149
-#: ../libpurple/protocols/jabber/jabber.c:2165
-#: ../libpurple/protocols/jabber/jabber.c:2181
-#: ../libpurple/protocols/jabber/jabber.c:2195
 msgid "Mood Text"
 msgstr "????? ?????????? ????"
 
-#: ../libpurple/protocols/jabber/jabber.c:2135
 #
-#: ../libpurple/protocols/jabber/jabber.c:2151
-#: ../libpurple/protocols/jabber/jabber.c:2167
-#: ../libpurple/protocols/jabber/jabber.c:2183
 msgid "Allow Buzz"
 msgstr "Buzz ???????? ?'?"
 
-#: ../libpurple/protocols/jabber/jabber.c:2214
 #
+#, fuzzy
+msgid "Mood Name"
+msgstr "?????? ???"
+
+#
+#, fuzzy
+msgid "Mood Comment"
+msgstr "?????? ???????"
+
+#
+#. primitive
+#. ID
+#. name - use default
+#. saveable
+#. should be user_settable some day
+#. independent
 msgid "Tune Artist"
 msgstr "???? ??????"
 
-#: ../libpurple/protocols/jabber/jabber.c:2215
 #
 msgid "Tune Title"
 msgstr "???? ???"
 
-#: ../libpurple/protocols/jabber/jabber.c:2216
 #
 msgid "Tune Album"
 msgstr "???? ?????"
 
-#: ../libpurple/protocols/jabber/jabber.c:2217
 #
 msgid "Tune Genre"
 msgstr "???? ????"
 
-#: ../libpurple/protocols/jabber/jabber.c:2218
 #
 msgid "Tune Comment"
 msgstr "??? ????????? ?????"
 
-#: ../libpurple/protocols/jabber/jabber.c:2219
 #
 msgid "Tune Track"
 msgstr "???? ???????"
 
-#: ../libpurple/protocols/jabber/jabber.c:2220
 #
 msgid "Tune Time"
 msgstr "???? ???"
 
-#: ../libpurple/protocols/jabber/jabber.c:2221
 #
 msgid "Tune Year"
 msgstr "???? ???"
 
-#: ../libpurple/protocols/jabber/jabber.c:2222
 #
 msgid "Tune URL"
 msgstr "???? URL"
 
-#: ../libpurple/protocols/jabber/jabber.c:2235
 #
 msgid "Password Changed"
 msgstr "????????? ????????? ????"
 
-#: ../libpurple/protocols/jabber/jabber.c:2236
 #
 msgid "Your password has been changed."
 msgstr "?????? ????????? ????????? ?????  ?"
 
-#: ../libpurple/protocols/jabber/jabber.c:2242
 #
-#: ../libpurple/protocols/jabber/jabber.c:2243
 msgid "Error changing password"
 msgstr "????????? ???????? ?????? ??????"
 
-#: ../libpurple/protocols/jabber/jabber.c:2306
 #
-#: ../libpurple/protocols/jabber/jabber.c:2307
 msgid "Change XMPP Password"
 msgstr "XMPP ????????? ???????? ???"
 
-#: ../libpurple/protocols/jabber/jabber.c:2307
 #
 msgid "Please enter your new password"
 msgstr "??????? ??? ???? ????????? ????"
 
-#: ../libpurple/protocols/jabber/jabber.c:2321
 #
-#: ../libpurple/protocols/oscar/oscar.c:6950
-#: ../libpurple/protocols/silc/silc.c:1329
-#: ../libpurple/protocols/silc10/silc.c:1029
-#: ../libpurple/protocols/yahoo/libymsg.c:4058
-#: ../libpurple/protocols/yahoo/libymsg.c:4214
 msgid "Set User Info..."
 msgstr "???????????? ????????? ???? ???????? ???..."
 
-#. if (js->protocol_options & CHANGE_PASSWORD) {
-#: ../libpurple/protocols/jabber/jabber.c:2326
 #
-#: ../libpurple/protocols/oscar/oscar.c:6961
-#: ../libpurple/protocols/silc/silc.c:1325
-#: ../libpurple/protocols/silc10/silc.c:1025
+#. if (js->protocol_options & CHANGE_PASSWORD) {
 msgid "Change Password..."
 msgstr "????????? ???????? ???..."
 
+#
 #. }
-#: ../libpurple/protocols/jabber/jabber.c:2331
-#
 msgid "Search for Users..."
 msgstr "???????????? ????????? ???..."
 
-#: ../libpurple/protocols/jabber/jabber.c:2425
 #
 msgid "Bad Request"
 msgstr "??????????? ??????"
 
-#: ../libpurple/protocols/jabber/jabber.c:2427
 #
 msgid "Conflict"
 msgstr "????????"
 
-#: ../libpurple/protocols/jabber/jabber.c:2429
 #
 msgid "Feature Not Implemented"
 msgstr "????????? ?????????? ???"
 
-#: ../libpurple/protocols/jabber/jabber.c:2431
 #
 msgid "Forbidden"
 msgstr "???????"
 
-#: ../libpurple/protocols/jabber/jabber.c:2433
 #
 msgid "Gone"
 msgstr "??? ???????"
 
-#: ../libpurple/protocols/jabber/jabber.c:2435
 #
-#: ../libpurple/protocols/jabber/jabber.c:2516
 msgid "Internal Server Error"
 msgstr "?????? ?????????? ??????"
 
-#: ../libpurple/protocols/jabber/jabber.c:2437
 #
 msgid "Item Not Found"
 msgstr "??????? ??????? ???? ?????"
 
-#: ../libpurple/protocols/jabber/jabber.c:2439
 #
 msgid "Malformed XMPP ID"
 msgstr "??????????? XMPP ID"
 
-#: ../libpurple/protocols/jabber/jabber.c:2441
 #
 msgid "Not Acceptable"
 msgstr "?????????? ??"
 
-#: ../libpurple/protocols/jabber/jabber.c:2443
 #
 msgid "Not Allowed"
 msgstr "???????? ??"
 
-#: ../libpurple/protocols/jabber/jabber.c:2447
 #
 msgid "Payment Required"
 msgstr "????? ??? ??? ??????"
 
-#: ../libpurple/protocols/jabber/jabber.c:2449
 #
 msgid "Recipient Unavailable"
 msgstr "?????? ?????? ??"
 
-#: ../libpurple/protocols/jabber/jabber.c:2453
 #
 msgid "Registration Required"
 msgstr "??????? ??????"
 
-#: ../libpurple/protocols/jabber/jabber.c:2455
 #
 msgid "Remote Server Not Found"
 msgstr "???????? ???? ???? ?????"
 
-#: ../libpurple/protocols/jabber/jabber.c:2457
 #
 msgid "Remote Server Timeout"
 msgstr "???????? ?????? ??????? ???????? ????"
 
-#: ../libpurple/protocols/jabber/jabber.c:2459
 #
 msgid "Server Overloaded"
 msgstr "????? ???????? ???"
 
-#: ../libpurple/protocols/jabber/jabber.c:2461
 #
 msgid "Service Unavailable"
 msgstr "??????? ?????? ??"
 
-#: ../libpurple/protocols/jabber/jabber.c:2463
 #
 msgid "Subscription Required"
 msgstr "??????????? ??????"
 
-#: ../libpurple/protocols/jabber/jabber.c:2465
 #
 msgid "Unexpected Request"
 msgstr "??????????? ??????"
 
-#: ../libpurple/protocols/jabber/jabber.c:2473
 #
 msgid "Authorization Aborted"
 msgstr "??????? ???????? ??? ????"
 
-#: ../libpurple/protocols/jabber/jabber.c:2475
 #
 msgid "Incorrect encoding in authorization"
 msgstr "????????? ??? ??????? ??????? ??? ????"
 
-#: ../libpurple/protocols/jabber/jabber.c:2477
 #
 msgid "Invalid authzid"
 msgstr "???? authzid"
 
-#: ../libpurple/protocols/jabber/jabber.c:2479
 #
 msgid "Invalid Authorization Mechanism"
 msgstr "???????? ??????? ??? ??"
 
-#: ../libpurple/protocols/jabber/jabber.c:2482
 #
 msgid "Authorization mechanism too weak"
 msgstr "???????? ??????? ??????? ??????"
 
-#: ../libpurple/protocols/jabber/jabber.c:2490
 #
 msgid "Temporary Authentication Failure"
 msgstr "??????? ???????? ?????????? ????"
 
-#: ../libpurple/protocols/jabber/jabber.c:2493
 #
 msgid "Authentication Failure"
 msgstr "??????? ????"
 
-#: ../libpurple/protocols/jabber/jabber.c:2501
 #
 msgid "Bad Format"
 msgstr "??? ???????"
 
-#: ../libpurple/protocols/jabber/jabber.c:2503
 #
 msgid "Bad Namespace Prefix"
 msgstr "??? ??? ????? ?????????"
 
-#: ../libpurple/protocols/jabber/jabber.c:2506
 #
 msgid "Resource Conflict"
 msgstr "????????? ????????"
 
-#: ../libpurple/protocols/jabber/jabber.c:2508
 #
 msgid "Connection Timeout"
 msgstr "?????? ???????"
 
-#: ../libpurple/protocols/jabber/jabber.c:2510
 #
 msgid "Host Gone"
 msgstr "?????? ?????????"
 
-#: ../libpurple/protocols/jabber/jabber.c:2512
 #
 msgid "Host Unknown"
 msgstr "?????? ??????"
 
-#: ../libpurple/protocols/jabber/jabber.c:2514
 #
 msgid "Improper Addressing"
 msgstr "????? ???????? ???????? ??"
 
-#: ../libpurple/protocols/jabber/jabber.c:2518
 #
 msgid "Invalid ID"
 msgstr "???? ID"
 
-#: ../libpurple/protocols/jabber/jabber.c:2520
 #
 msgid "Invalid Namespace"
 msgstr "???? ??? ?????"
 
-#: ../libpurple/protocols/jabber/jabber.c:2522
 #
 msgid "Invalid XML"
 msgstr "???? XML"
 
-#: ../libpurple/protocols/jabber/jabber.c:2524
 #
 msgid "Non-matching Hosts"
 msgstr "??? ?????? ??????"
 
-#: ../libpurple/protocols/jabber/jabber.c:2528
 #
 msgid "Policy Violation"
 msgstr "????? ??????"
 
-#: ../libpurple/protocols/jabber/jabber.c:2530
 #
 msgid "Remote Connection Failed"
 msgstr "???????? ????? ???? ????"
 
-#: ../libpurple/protocols/jabber/jabber.c:2532
 #
-msgid "Resource Constraint"
-msgstr "????????? ????"
-
-#: ../libpurple/protocols/jabber/jabber.c:2534
-#
 msgid "Restricted XML"
 msgstr "Restricted XML"
 
-#: ../libpurple/protocols/jabber/jabber.c:2536
 #
 msgid "See Other Host"
 msgstr "???? ?????? ????"
 
-#: ../libpurple/protocols/jabber/jabber.c:2538
 #
 msgid "System Shutdown"
 msgstr "??????? ????"
 
-#: ../libpurple/protocols/jabber/jabber.c:2540
 #
 msgid "Undefined Condition"
 msgstr "?????????? ?????????"
 
-#: ../libpurple/protocols/jabber/jabber.c:2542
 #
 msgid "Unsupported Encoding"
 msgstr "???????? ???????"
 
-#: ../libpurple/protocols/jabber/jabber.c:2544
 #
 msgid "Unsupported Stanza Type"
 msgstr "???????? ???????? ???"
 
-#: ../libpurple/protocols/jabber/jabber.c:2546
 #
 msgid "Unsupported Version"
 msgstr "???????? ???????"
 
-#: ../libpurple/protocols/jabber/jabber.c:2548
 #
 msgid "XML Not Well Formed"
 msgstr "XML ???????? ??????? ???"
 
-#: ../libpurple/protocols/jabber/jabber.c:2550
 #
 msgid "Stream Error"
 msgstr "???????? ??????"
 
-#: ../libpurple/protocols/jabber/jabber.c:2660
 #, c-format
 msgid "Unable to ban user %s"
 msgstr "%s ?????????????? ???????? ?????? ??????"
 
-#: ../libpurple/protocols/jabber/jabber.c:2680
 #, c-format
 msgid "Unknown affiliation: \"%s\""
 msgstr "?????? ???????????: \"%s\""
 
-#: ../libpurple/protocols/jabber/jabber.c:2690
 #, c-format
 msgid "Unable to affiliate user %s as \"%s\""
 msgstr "%s ?????????????? \"%s\" ???? ?????????? ?????? ??????"
 
-#: ../libpurple/protocols/jabber/jabber.c:2715
 #, c-format
 msgid "Unknown role: \"%s\""
 msgstr "?????? ??????: \"%s\""
 
-#: ../libpurple/protocols/jabber/jabber.c:2725
 #, c-format
 msgid "Unable to set role \"%s\" for user: %s"
 msgstr "??????? ????????????? ???? \"%s\" ?????? ???????? ?????? ??????: %s"
 
-#: ../libpurple/protocols/jabber/jabber.c:2782
 #, c-format
 msgid "Unable to kick user %s"
 msgstr "%s ?????????????? ?????? ?????? ??????"
 
-#: ../libpurple/protocols/jabber/jabber.c:2819
 #, c-format
 msgid "Unable to ping user %s"
 msgstr "%s ?????????????? ping ?????? ??????"
 
-#: ../libpurple/protocols/jabber/jabber.c:2841
 #, c-format
 msgid "Unable to buzz, because there is nothing known about %s."
 msgstr "%s ???????? ???? ???? ?????? ?? ???? ??? buzz ?????? ?????? ?"
 
-#: ../libpurple/protocols/jabber/jabber.c:2848
 #, c-format
 msgid "Unable to buzz, because %s might be offline."
 msgstr "%s ?????? ?? ????, buzz ?????? ?????? ?"
 
-#: ../libpurple/protocols/jabber/jabber.c:2872
 #, c-format
 msgid ""
 "Unable to buzz, because %s does not support it or does not wish to receive "
 "buzzes now."
 msgstr ""
-"buzz ?????? ??????, %s ?????? buzz ??????? ??? ?? ???????? buzz ??????? "
-"?????? ?????? ??? ?"
+"buzz ?????? ??????, %s ?????? buzz ??????? ??? ?? ???????? buzz ??????? ?????? ?????? "
+"??? ?"
 
-#: ../libpurple/protocols/jabber/jabber.c:2907
-#: ../libpurple/protocols/jabber/jabber.c:2924
-#: ../libpurple/protocols/yahoo/libymsg.c:5134
-#, c-format
-msgid "Buzzing %s..."
-msgstr "%s ?? buzz ?????? ??????..."
-
+#
 #. Yahoo only supports one attention command: the 'buzz'.
 #. This is index number YAHOO_BUZZ.
-#: ../libpurple/protocols/jabber/jabber.c:2923
-#
-#: ../libpurple/protocols/yahoo/libymsg.c:5133
 msgid "Buzz"
 msgstr "Buzz"
 
-#: ../libpurple/protocols/jabber/jabber.c:2924
-#: ../libpurple/protocols/yahoo/libymsg.c:5134
 #, c-format
 msgid "%s has buzzed you!"
 msgstr "%s ??????? buzz ?????!"
 
-#: ../libpurple/protocols/jabber/jabber.c:3045
 #, c-format
+msgid "Buzzing %s..."
+msgstr "%s ?? buzz ?????? ??????..."
+
+#, c-format
 msgid "Unable to initiate media with %s: invalid JID"
 msgstr "%s ? ???? ?????? ????? ?????? ??????: ???? JID"
 
-#: ../libpurple/protocols/jabber/jabber.c:3047
 #, c-format
 msgid "Unable to initiate media with %s: user is not online"
 msgstr "%s ? ???? ?????? ????? ?????? ??????: ???????????? ?? ???? ???"
 
-#: ../libpurple/protocols/jabber/jabber.c:3049
 #, c-format
 msgid "Unable to initiate media with %s: not subscribed to user presence"
 msgstr ""
-"%s ? ???? ?????? ????? ?????? ??????: ????????????? ????????? ???? "
-"?????????? ??? ???"
+"%s ? ???? ?????? ????? ?????? ??????: ????????????? ????????? ???? ?????????? ??? ???"
 
-#: ../libpurple/protocols/jabber/jabber.c:3052
 #
-#: ../libpurple/protocols/jabber/jabber.c:3053
 msgid "Media Initiation Failed"
 msgstr "?????? ????? ?????? ??????"
 
-#: ../libpurple/protocols/jabber/jabber.c:3123
 #, c-format
 msgid ""
 "Please select the resource of %s with which you would like to start a media "
 "session."
 msgstr "?????? ??????? ?????? ???? ??????? ??? %s ? ??????? ???????? ??? ?"
 
-#: ../libpurple/protocols/jabber/jabber.c:3133
 #
-#: ../libpurple/protocols/jabber/si.c:1545
 msgid "Select a Resource"
 msgstr "??? ??????? ???????? ???"
 
-#: ../libpurple/protocols/jabber/jabber.c:3134
 #
 msgid "Initiate Media"
 msgstr "?????? ????? ???"
 
-#: ../libpurple/protocols/jabber/jabber.c:3291
 #
+#, fuzzy
+msgid "Account does not support PEP, can't set mood"
+msgstr "?? ???? ???? ?????? ?????? ???? ??????? ?????? ??? ?? ?? ?"
+
+#
 msgid "config:  Configure a chat room."
 msgstr "config:  ?????? ????????? ??? ??? ??????? ??? ?"
 
-#: ../libpurple/protocols/jabber/jabber.c:3297
 #
 msgid "configure:  Configure a chat room."
 msgstr "configure:  ?????? ????????? ??? ??? ??????? ??? ?"
 
-#: ../libpurple/protocols/jabber/jabber.c:3310
 #
 msgid "part [message]:  Leave the room."
 msgstr "part [message]:  ??? ? ??? ???????? ??? ?"
 
-#: ../libpurple/protocols/jabber/jabber.c:3317
 #
 msgid "register:  Register with a chat room."
 msgstr "register:  ?????? ???? ??????? ??? ?"
 
-#: ../libpurple/protocols/jabber/jabber.c:3325
 #
 msgid "topic [new topic]:  View or change the topic."
 msgstr "topic [new topic]:  ??????? ???? ?? ???????? ??? ?"
 
-#: ../libpurple/protocols/jabber/jabber.c:3333
 #
 msgid "ban &lt;user&gt; [reason]:  Ban a user from the room."
 msgstr "ban &lt;user&gt; [reason]:  ??? ? ??? ???? ?????????????? ???????? ??? ?"
 
-#: ../libpurple/protocols/jabber/jabber.c:3341
 #
 msgid ""
 "affiliate &lt;owner|admin|member|outcast|none&gt; [nick1] [nick2] ...: Get "
 "the users with an affiliation or set users' affiliation with the room."
 msgstr ""
 "affiliate &lt;owner|admin|member|outcast|none&gt; [nick1] [nick2] ...: "
-"????????????? ??????? ????????? ???? ??????? ??? ?? ????? ????????????? "
-"??????????? ??? ?"
+"????????????? ??????? ????????? ???? ??????? ??? ?? ????? ????????????? ??????????? ??? ?"
 
-#: ../libpurple/protocols/jabber/jabber.c:3349
 #
 msgid ""
 "role &lt;moderator|participant|visitor|none&gt; [nick1] [nick2] ...: Get the "
 "users with a role or set users' role with the room."
 msgstr ""
 "role &lt;moderator|participant|visitor|none&gt; [nick1] [nick2] ...: ??????? "
-"?????? ?? ????????????? ?????? ??????? ??? ?? ???? ???? ????????????? "
-"?????? "
-"???????? ??? ?"
+"?????? ?? ????????????? ?????? ??????? ??? ?? ???? ???? ????????????? ?????? ???????? "
+"??? ?"
 
-#: ../libpurple/protocols/jabber/jabber.c:3357
 #
 msgid "invite &lt;user&gt; [message]:  Invite a user to the room."
 msgstr "invite &lt;user&gt; [message]:  ????? ???? ?????????????? ???????? ??? ?"
 
-#: ../libpurple/protocols/jabber/jabber.c:3365
 #
 msgid "join: &lt;room&gt; [password]:  Join a chat on this server."
 msgstr "join: &lt;room&gt; [password]:  ?? ????? ??? ??????? ??? ???? ?"
 
-#: ../libpurple/protocols/jabber/jabber.c:3373
 #
 msgid "kick &lt;user&gt; [reason]:  Kick a user from the room."
 msgstr "kick &lt;user&gt; [reason]:  ??? ? ??? ???? ?????????????? ?????? ??? ?"
 
-#: ../libpurple/protocols/jabber/jabber.c:3380
 #
-msgid "msg &lt;user&gt; &lt;message&gt;:  Send a private message to another user."
+msgid ""
+"msg &lt;user&gt; &lt;message&gt;:  Send a private message to another user."
 msgstr ""
-"msg &lt;user&gt; &lt;message&gt;:  ???? ???? ?????????????? ??? ????????? "
-"?????? "
+"msg &lt;user&gt; &lt;message&gt;:  ???? ???? ?????????????? ??? ????????? ?????? "
 "??????? ?"
 
-#: ../libpurple/protocols/jabber/jabber.c:3388
 #
 msgid "ping &lt;jid&gt;:\tPing a user/component/server."
 msgstr "ping &lt;jid&gt;:\t???? ????????????/???????/?????? ping ??? ?"
 
-#: ../libpurple/protocols/jabber/jabber.c:3396
 #
-#: ../libpurple/protocols/yahoo/libyahoo.c:53
-#: ../libpurple/protocols/yahoo/libyahoojp.c:50
 msgid "buzz: Buzz a user to get their attention"
 msgstr "buzz: ????????????? ?????? ????? ???? Buzz ??? ?"
 
+#
+#, fuzzy
+msgid "mood: Set current user mood"
+msgstr "???? ???????????? ???????? ???"
+
+#
+msgid "Extended Away"
+msgstr "???????? ???? ???? ?????????"
+
+#
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -7408,274 +5273,566 @@ msgstr "buzz: ????????? #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/jabber/libxmpp.c:250
-#
-#: ../libpurple/protocols/jabber/libxmpp.c:252
 msgid "XMPP Protocol Plugin"
 msgstr "XMPP ???? ???? ????? ??"
 
+#
 #. Translators: 'domain' is used here in the context of Internet domains, e.g. pidgin.im
-#: ../libpurple/protocols/jabber/libxmpp.c:351 ../pidgin/gtkaccount.c:565
-#
 msgid "Domain"
 msgstr "??????"
 
-#: ../libpurple/protocols/jabber/libxmpp.c:359
 #
 msgid "Require SSL/TLS"
 msgstr "SSL/TLS ???????"
 
-#: ../libpurple/protocols/jabber/libxmpp.c:363
 #
 msgid "Force old (port 5223) SSL"
 msgstr "??????????????? ?????? (????? ????) SSL ??????? ??? ?'?"
 
-#: ../libpurple/protocols/jabber/libxmpp.c:368
 #
 msgid "Allow plaintext auth over unencrypted streams"
 msgstr "????????? ???? ???????? ??????? ?????? ?????? ???????? ?????? ?????? ??? ?'?"
 
-#: ../libpurple/protocols/jabber/libxmpp.c:373
 #
-#: ../libpurple/protocols/myspace/myspace.c:3644
-#: ../libpurple/protocols/simple/simple.c:2139
 msgid "Connect port"
 msgstr "?????? ?????"
 
+#
 #. 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:377
-#
-#: ../libpurple/protocols/myspace/myspace.c:3641
-#: ../libpurple/protocols/silc/silc.c:2184
-#: ../libpurple/protocols/silc10/silc.c:1901
 msgid "Connect server"
 msgstr "?????? ????"
 
-#: ../libpurple/protocols/jabber/libxmpp.c:382
 #
 msgid "File transfer proxies"
 msgstr "??????? ??????? ???????"
 
-#: ../libpurple/protocols/jabber/libxmpp.c:390
 #
 msgid "BOSH URL"
 msgstr "BOSH URL"
 
+#
 #. this should probably be part of global smiley theme settings later on,
 #. shared with MSN
-#: ../libpurple/protocols/jabber/libxmpp.c:397
-#
 msgid "Show Custom Smileys"
 msgstr "???????????? ????????? ????? ???????? ??? ?'?"
 
-#: ../libpurple/protocols/jabber/message.c:124
 #, c-format
 msgid "%s has left the conversation."
 msgstr "%s ?????? ? ??? ???????? ????? ?"
 
-#: ../libpurple/protocols/jabber/message.c:172
 #, c-format
 msgid "Message from %s"
 msgstr "%s ? ??? ??????? ??????"
 
-#: ../libpurple/protocols/jabber/message.c:236
 #, c-format
 msgid "%s has set the topic to: %s"
 msgstr "%s ?????? ??????? ??????? ???????? ??? ????: %s"
 
-#: ../libpurple/protocols/jabber/message.c:238
 #, c-format
 msgid "The topic is: %s"
 msgstr "????????? ???????: %s"
 
-#: ../libpurple/protocols/jabber/message.c:286
 #, c-format
 msgid "Message delivery to %s failed: %s"
 msgstr "%s ? ????????? ?????? ?????? ??????: %s"
 
-#: ../libpurple/protocols/jabber/message.c:289
 #
 msgid "XMPP Message Error"
 msgstr "XMPP ??????? ??????"
 
-#: ../libpurple/protocols/jabber/message.c:598
 #, c-format
 msgid "(Code %s)"
 msgstr "(??? %s)"
 
-#: ../libpurple/protocols/jabber/message.c:1019
 #
 msgid "A custom smiley in the message is too large to send."
 msgstr "??????? ??????? ??? ????????? ??? ???????? ?? ????? ??? ?????? ????? ??? ?"
 
-#: ../libpurple/protocols/jabber/parser.c:278
+msgid "XMPP stream header missing"
+msgstr ""
+
+msgid "XMPP Version Mismatch"
+msgstr ""
+
+msgid "XMPP stream missing ID"
+msgstr ""
+
 #
 msgid "XML Parse error"
 msgstr "XML ????? ?????? ??????"
 
-#: ../libpurple/protocols/jabber/presence.c:564
-#
-msgid "Unknown Error in presence"
-msgstr "???????? ????????? ?????? ??????"
-
-#: ../libpurple/protocols/jabber/presence.c:690
 #, c-format
 msgid "Error joining chat %s"
 msgstr "%s ??????? ??? ???? ??????"
 
-#: ../libpurple/protocols/jabber/presence.c:693
 #, c-format
 msgid "Error in chat %s"
 msgstr "%s ??????? ??????"
 
-#: ../libpurple/protocols/jabber/presence.c:750
 #
-#: ../libpurple/protocols/jabber/presence.c:751
 msgid "Create New Room"
 msgstr "???? ??? ??????? ???"
 
-#: ../libpurple/protocols/jabber/presence.c:752
 #
 msgid ""
 "You are creating a new room.  Would you like to configure it, or accept the "
 "default settings?"
 msgstr ""
-"????? ???? ??? ??????? ?????? ?????? ? ?? ???? ????????? ??????? ??? ?'? ?? "
-"??  ?????? "
-"????????? ??????? ??? ?'??"
+"????? ???? ??? ??????? ?????? ?????? ? ?? ???? ????????? ??????? ??? ?'? ?? ??  "
+"?????? ????????? ??????? ??? ?'??"
 
-#: ../libpurple/protocols/jabber/presence.c:758
 #
 msgid &q