diff po/eo.po @ 15594:b7ae1464365c

commit these updated translations here also
author Luke Schierer <lschiere@pidgin.im>
date Fri, 09 Feb 2007 13:42:33 +0000
parents 334c6a77e32d
children 8e3734ea23ba
line wrap: on
line diff
--- a/po/eo.po	Fri Feb 09 02:21:08 2007 +0000
+++ b/po/eo.po	Fri Feb 09 13:42:33 2007 +0000
@@ -9,15 +9,15 @@
 msgstr ""
 "Project-Id-Version: eo\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-11-11 11:45+0100\n"
-"PO-Revision-Date: 2006-11-12 18:59+0100\n"
+"POT-Creation-Date: 2006-10-21 14:28+0200\n"
+"PO-Revision-Date: 2006-10-22 01:57+0200\n"
 "Last-Translator: Stéphane Fillod <f8cfe@free.fr>\n"
-"Language-Team: Esperanto\n"
+"Language-Team: Esperanto <eo@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms:  nplurals=2; plural=(n != 1);\n"
-"X-Generator: KBabel 1.11.4\n"
+"X-Generator: KBabel 1.11.2\n"
 
 #: ../gaim.desktop.in.h:1
 msgid "Gaim Internet Messenger"
@@ -31,14 +31,14 @@
 msgid "Send instant messages over multiple protocols"
 msgstr "Sendu tujmesaĝojn per pluraj protokoloj"
 
-#: ../console/gntaccount.c:119 ../console/gntblist.c:266
-#: ../console/gntblist.c:384 ../console/gntblist.c:397
+#: ../console/gntaccount.c:119 ../console/gntblist.c:250
+#: ../console/gntblist.c:368 ../console/gntblist.c:381
 #: ../console/gntplugin.c:169 ../console/gntplugin.c:214
 #: ../console/gntstatus.c:291 ../console/gntstatus.c:299
 #: ../libgaim/protocols/jabber/buddy.c:1363
 #: ../libgaim/protocols/jabber/chat.c:677
 #: ../libgaim/protocols/jabber/chat.c:688
-#: ../libgaim/protocols/jabber/jabber.c:1188
+#: ../libgaim/protocols/jabber/jabber.c:1197
 #: ../libgaim/protocols/qq/group_join.c:322
 #: ../libgaim/protocols/silc/ops.c:1449
 msgid "Error"
@@ -60,7 +60,7 @@
 msgid "Remember password"
 msgstr "Memoru pasvorton"
 
-#: ../console/gntaccount.c:474 ../gtk/gtkaccount.c:1400 ../gtk/gtkblist.c:3797
+#: ../console/gntaccount.c:474 ../gtk/gtkaccount.c:1400 ../gtk/gtkblist.c:3777
 msgid "Modify Account"
 msgstr "Ŝanĝu Konton"
 
@@ -72,7 +72,7 @@
 msgid "Protocol:"
 msgstr "Protokolo:"
 
-#: ../console/gntaccount.c:508 ../gtk/gtkaccount.c:404 ../gtk/gtkblist.c:4942
+#: ../console/gntaccount.c:508 ../gtk/gtkaccount.c:404 ../gtk/gtkblist.c:4920
 #: ../gtk/plugins/gevolution/new_person_dialog.c:295
 msgid "Screen name:"
 msgstr "Ekrannomo:"
@@ -81,49 +81,49 @@
 msgid "Password:"
 msgstr "Pasvorton:"
 
-#: ../console/gntaccount.c:531 ../gtk/gtkblist.c:4963 ../gtk/gtkblist.c:5328
+#: ../console/gntaccount.c:531 ../gtk/gtkblist.c:4941 ../gtk/gtkblist.c:5306
 msgid "Alias:"
 msgstr "Alinomo:"
 
 #. Cancel
 #: ../console/gntaccount.c:554 ../console/gntaccount.c:615
-#: ../console/gntaccount.c:834 ../console/gntblist.c:307
-#: ../console/gntblist.c:374 ../console/gntblist.c:407
-#: ../console/gntblist.c:736 ../console/gntblist.c:905
-#: ../console/gntblist.c:996 ../console/gntblist.c:1949
-#: ../console/gntprefs.c:224 ../console/gntstatus.c:139
-#: ../console/gntstatus.c:471 ../console/gntstatus.c:596
-#: ../gtk/gtkaccount.c:1833 ../gtk/gtkaccount.c:2307 ../gtk/gtkblist.c:5384
-#: ../gtk/gtkdialogs.c:683 ../gtk/gtkdialogs.c:820 ../gtk/gtkdialogs.c:911
-#: ../gtk/gtkdialogs.c:930 ../gtk/gtkdialogs.c:952 ../gtk/gtkdialogs.c:972
-#: ../gtk/gtkdialogs.c:1016 ../gtk/gtkdialogs.c:1054 ../gtk/gtkdialogs.c:1108
-#: ../gtk/gtkdialogs.c:1145 ../gtk/gtkdialogs.c:1170
-#: ../gtk/gtkimhtmltoolbar.c:419 ../gtk/gtkplugin.c:296
-#: ../gtk/gtkpounce.c:1088 ../gtk/gtkprivacy.c:566 ../gtk/gtkprivacy.c:579
-#: ../gtk/gtkprivacy.c:604 ../gtk/gtkprivacy.c:615 ../gtk/gtkrequest.c:270
-#: ../gtk/gtksavedstatuses.c:296 ../libgaim/account.c:964
-#: ../libgaim/account.c:1135 ../libgaim/account.c:1169
-#: ../libgaim/conversation.c:1164 ../libgaim/protocols/gg/gg.c:498
-#: ../libgaim/protocols/gg/gg.c:656 ../libgaim/protocols/gg/gg.c:792
-#: ../libgaim/protocols/gg/gg.c:871 ../libgaim/protocols/jabber/buddy.c:588
+#: ../console/gntaccount.c:834 ../console/gntblist.c:291
+#: ../console/gntblist.c:358 ../console/gntblist.c:391
+#: ../console/gntblist.c:712 ../console/gntblist.c:893
+#: ../console/gntblist.c:984 ../console/gntprefs.c:224
+#: ../console/gntstatus.c:139 ../console/gntstatus.c:471
+#: ../console/gntstatus.c:596 ../gtk/gtkaccount.c:1833
+#: ../gtk/gtkaccount.c:2303 ../gtk/gtkblist.c:5362 ../gtk/gtkdialogs.c:668
+#: ../gtk/gtkdialogs.c:805 ../gtk/gtkdialogs.c:896 ../gtk/gtkdialogs.c:915
+#: ../gtk/gtkdialogs.c:937 ../gtk/gtkdialogs.c:957 ../gtk/gtkdialogs.c:1001
+#: ../gtk/gtkdialogs.c:1039 ../gtk/gtkdialogs.c:1093 ../gtk/gtkdialogs.c:1130
+#: ../gtk/gtkdialogs.c:1155 ../gtk/gtkimhtmltoolbar.c:419
+#: ../gtk/gtkplugin.c:296 ../gtk/gtkpounce.c:1088 ../gtk/gtkprivacy.c:566
+#: ../gtk/gtkprivacy.c:579 ../gtk/gtkprivacy.c:604 ../gtk/gtkprivacy.c:615
+#: ../gtk/gtkrequest.c:270 ../gtk/gtksavedstatuses.c:296
+#: ../libgaim/account.c:964 ../libgaim/account.c:1135
+#: ../libgaim/account.c:1169 ../libgaim/conversation.c:1164
+#: ../libgaim/protocols/gg/gg.c:498 ../libgaim/protocols/gg/gg.c:656
+#: ../libgaim/protocols/gg/gg.c:792 ../libgaim/protocols/gg/gg.c:871
+#: ../libgaim/protocols/jabber/buddy.c:588
 #: ../libgaim/protocols/jabber/buddy.c:1725
 #: ../libgaim/protocols/jabber/buddy.c:1759
 #: ../libgaim/protocols/jabber/chat.c:780
-#: ../libgaim/protocols/jabber/jabber.c:850
-#: ../libgaim/protocols/jabber/jabber.c:1343
+#: ../libgaim/protocols/jabber/jabber.c:854
+#: ../libgaim/protocols/jabber/jabber.c:1352
 #: ../libgaim/protocols/jabber/xdata.c:338 ../libgaim/protocols/msn/msn.c:251
 #: ../libgaim/protocols/msn/msn.c:266 ../libgaim/protocols/msn/msn.c:281
 #: ../libgaim/protocols/msn/msn.c:296 ../libgaim/protocols/msn/msn.c:313
-#: ../libgaim/protocols/oscar/oscar.c:1389
-#: ../libgaim/protocols/oscar/oscar.c:2153
-#: ../libgaim/protocols/oscar/oscar.c:2192
-#: ../libgaim/protocols/oscar/oscar.c:2240
-#: ../libgaim/protocols/oscar/oscar.c:5734
-#: ../libgaim/protocols/oscar/oscar.c:5786
-#: ../libgaim/protocols/oscar/oscar.c:5938
-#: ../libgaim/protocols/oscar/oscar.c:5963
-#: ../libgaim/protocols/oscar/oscar.c:6019
-#: ../libgaim/protocols/oscar/oscar.c:6088
+#: ../libgaim/protocols/oscar/oscar.c:1387
+#: ../libgaim/protocols/oscar/oscar.c:2151
+#: ../libgaim/protocols/oscar/oscar.c:2190
+#: ../libgaim/protocols/oscar/oscar.c:2238
+#: ../libgaim/protocols/oscar/oscar.c:5732
+#: ../libgaim/protocols/oscar/oscar.c:5784
+#: ../libgaim/protocols/oscar/oscar.c:5936
+#: ../libgaim/protocols/oscar/oscar.c:5961
+#: ../libgaim/protocols/oscar/oscar.c:6017
+#: ../libgaim/protocols/oscar/oscar.c:6086
 #: ../libgaim/protocols/oscar/peer.c:991
 #: ../libgaim/protocols/qq/buddy_info.c:480
 #: ../libgaim/protocols/qq/buddy_opt.c:210
@@ -135,17 +135,17 @@
 #: ../libgaim/protocols/qq/sendqueue.c:201
 #: ../libgaim/protocols/qq/sys_msg.c:102 ../libgaim/protocols/qq/sys_msg.c:157
 #: ../libgaim/protocols/qq/sys_msg.c:245
-#: ../libgaim/protocols/sametime/sametime.c:3399
-#: ../libgaim/protocols/sametime/sametime.c:3484
-#: ../libgaim/protocols/sametime/sametime.c:3654
-#: ../libgaim/protocols/sametime/sametime.c:5402
-#: ../libgaim/protocols/sametime/sametime.c:5491
-#: ../libgaim/protocols/sametime/sametime.c:5615
+#: ../libgaim/protocols/sametime/sametime.c:3364
+#: ../libgaim/protocols/sametime/sametime.c:3449
+#: ../libgaim/protocols/sametime/sametime.c:3619
+#: ../libgaim/protocols/sametime/sametime.c:5320
+#: ../libgaim/protocols/sametime/sametime.c:5409
+#: ../libgaim/protocols/sametime/sametime.c:5533
 #: ../libgaim/protocols/silc/buddy.c:467
 #: ../libgaim/protocols/silc/buddy.c:1078
 #: ../libgaim/protocols/silc/buddy.c:1183 ../libgaim/protocols/silc/chat.c:597
 #: ../libgaim/protocols/silc/chat.c:726 ../libgaim/protocols/silc/ops.c:1910
-#: ../libgaim/protocols/silc/silc.c:750 ../libgaim/protocols/silc/silc.c:955
+#: ../libgaim/protocols/silc/silc.c:754 ../libgaim/protocols/silc/silc.c:959
 #: ../libgaim/protocols/yahoo/yahoo.c:3214
 #: ../libgaim/protocols/yahoo/yahoo.c:3223 ../libgaim/request.h:1344
 #: ../libgaim/request.h:1354
@@ -178,8 +178,8 @@
 msgid "Delete"
 msgstr "Forigu"
 
-#: ../console/gntaccount.c:644 ../console/gntblist.c:1870
-#: ../console/gntui.c:70 ../gtk/gtkaccount.c:2139 ../gtk/gtkdocklet.c:530
+#: ../console/gntaccount.c:644 ../console/gntblist.c:1780
+#: ../console/gntui.c:70 ../gtk/gtkaccount.c:2135 ../gtk/gtkdocklet.c:493
 msgid "Accounts"
 msgstr "Kontoj"
 
@@ -188,14 +188,14 @@
 msgstr "Vi povas ŝalti/malŝalti kontojn de la jena listo."
 
 #: ../console/gntaccount.c:673 ../console/gntaccount.c:833
-#: ../console/gntblist.c:307 ../console/gntblist.c:374
-#: ../console/gntblist.c:407 ../console/gntnotify.c:306
-#: ../console/gntstatus.c:191 ../gtk/gtkaccount.c:2306 ../gtk/gtkblist.c:5383
-#: ../gtk/gtkconv.c:1634 ../gtk/gtkrequest.c:274
-#: ../libgaim/protocols/gg/gg.c:870 ../libgaim/protocols/oscar/oscar.c:2431
+#: ../console/gntblist.c:291 ../console/gntblist.c:358
+#: ../console/gntblist.c:391 ../console/gntnotify.c:306
+#: ../console/gntstatus.c:191 ../gtk/gtkaccount.c:2302 ../gtk/gtkblist.c:5361
+#: ../gtk/gtkconv.c:1632 ../gtk/gtkrequest.c:274
+#: ../libgaim/protocols/gg/gg.c:870 ../libgaim/protocols/oscar/oscar.c:2429
 #: ../libgaim/protocols/qq/sys_msg.c:102 ../libgaim/protocols/qq/sys_msg.c:157
 #: ../libgaim/protocols/qq/sys_msg.c:245
-#: ../libgaim/protocols/sametime/sametime.c:5490
+#: ../libgaim/protocols/sametime/sametime.c:5408
 #: ../libgaim/protocols/silc/chat.c:596
 msgid "Add"
 msgstr "Aldonu"
@@ -204,55 +204,55 @@
 msgid "Modify"
 msgstr "Ŝanĝu"
 
-#: ../console/gntaccount.c:758 ../gtk/gtkaccount.c:2255
+#: ../console/gntaccount.c:758 ../gtk/gtkaccount.c:2251
 #, c-format
 msgid "%s%s%s%s has made %s his or her buddy%s%s"
 msgstr "%s%s%s%s faris %s-n sia kunul%s%s"
 
-#: ../console/gntaccount.c:831 ../gtk/gtkaccount.c:2304
+#: ../console/gntaccount.c:831 ../gtk/gtkaccount.c:2300
 msgid "Add buddy to your list?"
 msgstr "Aldonu kunulon al via listo?"
 
-#: ../console/gntblist.c:258
+#: ../console/gntblist.c:242
 msgid "You must provide a screename for the buddy."
 msgstr "Vi devas enigi ekrannomon por la kunul."
 
-#: ../console/gntblist.c:260
+#: ../console/gntblist.c:244
 msgid "You must provide a group."
 msgstr "Vi devas enigi grupon."
 
-#: ../console/gntblist.c:262
+#: ../console/gntblist.c:246
 msgid "You must select an account."
 msgstr "Vi devas elekti konton."
 
-#: ../console/gntblist.c:266
+#: ../console/gntblist.c:250
 msgid "Error adding buddy"
 msgstr "Eraro aldonante kunul"
 
-#: ../console/gntblist.c:291 ../gtk/gtkaccount.c:1896
-#: ../gtk/gtksavedstatuses.c:893 ../libgaim/protocols/oscar/oscar.c:2805
+#: ../console/gntblist.c:275 ../gtk/gtkaccount.c:1896
+#: ../gtk/gtksavedstatuses.c:893 ../libgaim/protocols/oscar/oscar.c:2803
 msgid "Screen Name"
 msgstr "Ekranonomo"
 
-#: ../console/gntblist.c:294 ../console/gntblist.c:366 ../gtk/gtkdialogs.c:929
-#: ../gtk/gtkdialogs.c:951 ../gtk/gtkdialogs.c:971 ../gtk/gtkrequest.c:277
+#: ../console/gntblist.c:278 ../console/gntblist.c:350 ../gtk/gtkdialogs.c:914
+#: ../gtk/gtkdialogs.c:936 ../gtk/gtkdialogs.c:956 ../gtk/gtkrequest.c:277
 #: ../libgaim/protocols/silc/chat.c:587
 msgid "Alias"
 msgstr "Alinomo"
 
-#: ../console/gntblist.c:297 ../console/gntblist.c:369
+#: ../console/gntblist.c:281 ../console/gntblist.c:353
 msgid "Group"
 msgstr "Grupo"
 
-#: ../console/gntblist.c:300 ../console/gntblist.c:357
+#: ../console/gntblist.c:284 ../console/gntblist.c:341
 #: ../console/gntnotify.c:155 ../console/gntstatus.c:562
 #: ../gtk/gtknotify.c:402 ../gtk/gtkpounce.c:1255
-#: ../gtk/plugins/gevolution/gevolution.c:451 ../libgaim/plugins/idle.c:153
+#: ../gtk/plugins/gevolution/gevolution.c:450 ../libgaim/plugins/idle.c:153
 #: ../libgaim/plugins/idle.c:189
 msgid "Account"
 msgstr "Konto"
 
-#: ../console/gntblist.c:306 ../console/gntblist.c:783 ../gtk/gtkblist.c:4896
+#: ../console/gntblist.c:290 ../console/gntblist.c:752 ../gtk/gtkblist.c:4874
 #: ../gtk/plugins/gevolution/add_buddy_dialog.c:447
 #: ../libgaim/protocols/silc/buddy.c:736
 #: ../libgaim/protocols/silc/buddy.c:1030
@@ -262,11 +262,11 @@
 msgid "Add Buddy"
 msgstr "Aldonu Kunulon"
 
-#: ../console/gntblist.c:306
+#: ../console/gntblist.c:290
 msgid "Please enter buddy information."
 msgstr "B.v. enigi kunul informon."
 
-#: ../console/gntblist.c:329 ../libgaim/blist.c:1195
+#: ../console/gntblist.c:313 ../libgaim/blist.c:1195
 msgid "Chats"
 msgstr "Babilejoj"
 
@@ -274,140 +274,140 @@
 #. Contact Info
 #. Personal
 #. Business
-#: ../console/gntblist.c:363 ../gtk/gtkplugin.c:589 ../gtk/gtkroomlist.c:600
+#: ../console/gntblist.c:347 ../gtk/gtkplugin.c:589 ../gtk/gtkroomlist.c:600
 #: ../gtk/plugins/gevolution/add_buddy_dialog.c:132
 #: ../gtk/plugins/gevolution/assoc-buddy.c:123
-#: ../libgaim/protocols/jabber/jabber.c:781
+#: ../libgaim/protocols/jabber/jabber.c:785
 #: ../libgaim/protocols/msn/msn.c:1533 ../libgaim/protocols/msn/msn.c:1586
 #: ../libgaim/protocols/msn/msn.c:1608 ../libgaim/protocols/qq/buddy_info.c:42
 msgid "Name"
 msgstr "Nomo"
 
-#: ../console/gntblist.c:372 ../console/gntblist.c:785 ../gtk/gtkblist.c:5274
+#: ../console/gntblist.c:356 ../console/gntblist.c:754 ../gtk/gtkblist.c:5252
 msgid "Add Chat"
 msgstr "Aldonu Babilejon"
 
-#: ../console/gntblist.c:373
+#: ../console/gntblist.c:357
 msgid "You can edit more information from the context menu later."
 msgstr "Vi povas redakti plian informon per la ĉirkaŭteksto menuo poste."
 
-#: ../console/gntblist.c:384 ../console/gntblist.c:397
+#: ../console/gntblist.c:368 ../console/gntblist.c:381
 msgid "Error adding group"
 msgstr "Eraro aldonante grupo"
 
-#: ../console/gntblist.c:385
+#: ../console/gntblist.c:369
 msgid "You must give a name for the group to add."
 msgstr "Vi devas enigi nomon de la grupo aldonenda."
 
-#: ../console/gntblist.c:398
+#: ../console/gntblist.c:382
 msgid "A group with the name already exists."
 msgstr "Grupo samnomita jam ekzistas."
 
-#: ../console/gntblist.c:405 ../console/gntblist.c:787 ../gtk/gtkblist.c:5380
-#: ../libgaim/protocols/sametime/sametime.c:5401
-#: ../libgaim/protocols/sametime/sametime.c:5488
+#: ../console/gntblist.c:389 ../console/gntblist.c:756 ../gtk/gtkblist.c:5358
+#: ../libgaim/protocols/sametime/sametime.c:5319
+#: ../libgaim/protocols/sametime/sametime.c:5406
 msgid "Add Group"
 msgstr "Aldonu Grupon"
 
-#: ../console/gntblist.c:405
+#: ../console/gntblist.c:389
 msgid "Enter the name of the group"
 msgstr "B.v. enigi la nomon de la grupo"
 
-#: ../console/gntblist.c:735
+#: ../console/gntblist.c:711
 msgid "Edit Chat"
 msgstr "Redaktu Babilejon"
 
-#: ../console/gntblist.c:735
+#: ../console/gntblist.c:711
 msgid "Please Update the necessary fields."
 msgstr "B.v. Aktualigi la necesajn kampojn."
 
-#: ../console/gntblist.c:736 ../console/gntstatus.c:196
+#: ../console/gntblist.c:712 ../console/gntstatus.c:196
 msgid "Edit"
 msgstr "Redaktu"
 
-#: ../console/gntblist.c:750
+#: ../console/gntblist.c:718
 msgid "Auto-join"
 msgstr "Aŭtomate-aliĝu"
 
-#: ../console/gntblist.c:759
+#: ../console/gntblist.c:726
 msgid "Edit Settings"
 msgstr "Agordu"
 
-#: ../console/gntblist.c:805 ../libgaim/protocols/silc/chat.c:878
+#: ../console/gntblist.c:774 ../libgaim/protocols/silc/chat.c:878
 msgid "Get Info"
 msgstr "Ricevu Informon"
 
-#: ../console/gntblist.c:810
+#: ../console/gntblist.c:779
 msgid "Add Buddy Pounce"
 msgstr "Aldonu Kunul Atentigon"
 
-#: ../console/gntblist.c:817 ../gtk/gtkconv.c:1582
+#: ../console/gntblist.c:786 ../gtk/gtkconv.c:1580
 #: ../libgaim/protocols/oscar/oscar.c:615
 msgid "Send File"
 msgstr "Sendu Dosieron"
 
-#: ../console/gntblist.c:821
+#: ../console/gntblist.c:790
 msgid "View Log"
 msgstr "Montru Protokolon"
 
-#: ../console/gntblist.c:901
+#: ../console/gntblist.c:889
 #, c-format
 msgid "Please enter the new name for %s"
 msgstr "B.v. enigi la novan nomon por %s"
 
-#: ../console/gntblist.c:903 ../console/gntblist.c:904
-#: ../console/gntblist.c:1073
+#: ../console/gntblist.c:891 ../console/gntblist.c:892
+#: ../console/gntblist.c:1061
 msgid "Rename"
 msgstr "Alinomu"
 
-#: ../console/gntblist.c:903
+#: ../console/gntblist.c:891
 msgid "Enter empty string to reset the name."
 msgstr "Enigu malplenan ĉenon por forviŝi la nomon."
 
-#: ../console/gntblist.c:976
+#: ../console/gntblist.c:964
 msgid "Removing this contact will also remove all the buddies in the contact"
 msgstr "Forigi tiun kontakton ankaŭ forigos ĉiujn kunulojn en la kontakto"
 
-#: ../console/gntblist.c:984
+#: ../console/gntblist.c:972
 msgid "Removing this group will also remove all the buddies in the group"
 msgstr "Forigi tiun grupon ankaŭ forigos ĉiujn kunulojn en la grupo"
 
-#: ../console/gntblist.c:989
+#: ../console/gntblist.c:977
 #, c-format
 msgid "Are you sure you want to remove %s?"
 msgstr "Ĉu vi certas vi volas forigi %s?"
 
 #. XXX: anything to do with the returned ui-handle?
-#: ../console/gntblist.c:992
+#: ../console/gntblist.c:980
 msgid "Confirm Remove"
 msgstr "Konfirmu Forigon"
 
-#: ../console/gntblist.c:995 ../console/gntblist.c:1075 ../gtk/gtkblist.c:1039
-#: ../gtk/gtkconv.c:1631 ../gtk/gtkrequest.c:275
+#: ../console/gntblist.c:983 ../console/gntblist.c:1063 ../gtk/gtkblist.c:1039
+#: ../gtk/gtkconv.c:1629 ../gtk/gtkrequest.c:275
 msgid "Remove"
 msgstr "Forigu"
 
 #. Buddy List
-#: ../console/gntblist.c:1050 ../console/gntblist.c:2016
-#: ../console/gntprefs.c:219 ../console/gntui.c:71 ../gtk/gtkblist.c:3914
+#: ../console/gntblist.c:1038 ../console/gntblist.c:1888
+#: ../console/gntprefs.c:219 ../console/gntui.c:71 ../gtk/gtkblist.c:3894
 #: ../gtk/plugins/win32/winprefs/winprefs.c:327
 msgid "Buddy List"
 msgstr "Kunul Listo"
 
-#: ../console/gntblist.c:1079
+#: ../console/gntblist.c:1067
 msgid "Place tagged"
 msgstr "Loko etikedita"
 
-#: ../console/gntblist.c:1082
+#: ../console/gntblist.c:1070
 msgid "Tag"
 msgstr "Etikedo"
 
-#: ../console/gntblist.c:1109 ../console/gntblist.c:1228
+#: ../console/gntblist.c:1105 ../console/gntblist.c:1209
 #, c-format
 msgid "Account: %s (%s)"
 msgstr "Konto: %s (%s)"
 
-#: ../console/gntblist.c:1134
+#: ../console/gntblist.c:1130
 #, c-format
 msgid ""
 "\n"
@@ -416,12 +416,12 @@
 "\n"
 "Senfara: %s"
 
-#: ../console/gntblist.c:1191 ../console/gntblist.c:1207
+#: ../console/gntblist.c:1188
 #, c-format
 msgid "Nickname: %s\n"
 msgstr "Karesnomo: %s\n"
 
-#: ../console/gntblist.c:1219
+#: ../console/gntblist.c:1200
 #, c-format
 msgid ""
 "Online: %d\n"
@@ -430,7 +430,7 @@
 "Konektita: %d\n"
 "Entute: %d"
 
-#: ../console/gntblist.c:1240
+#: ../console/gntblist.c:1221
 #, c-format
 msgid ""
 "\n"
@@ -439,88 +439,34 @@
 "\n"
 "Laste vidita: antaŭ %s"
 
-#: ../console/gntblist.c:1485 ../gtk/gtkdocklet.c:478
+#: ../console/gntblist.c:1451 ../gtk/gtkdocklet.c:441
 #: ../gtk/gtkstatusbox.c:984
 msgid "New..."
 msgstr "Nova..."
 
-#: ../console/gntblist.c:1492 ../gtk/gtkdocklet.c:479
+#: ../console/gntblist.c:1458 ../gtk/gtkdocklet.c:442
 #: ../gtk/gtkstatusbox.c:985
 msgid "Saved..."
 msgstr "Konservita..."
 
-#: ../console/gntblist.c:1838 ../console/gntplugin.c:231 ../console/gntui.c:73
-#: ../gtk/gtkdocklet.c:531 ../gtk/gtkplugin.c:538
-msgid "Plugins"
-msgstr "Kromaĵoj"
-
-#: ../console/gntblist.c:1930 ../gtk/gtkdialogs.c:664 ../gtk/gtkdialogs.c:801
-#: ../gtk/gtkdialogs.c:881
-msgid "_Name"
-msgstr "_Nomo"
-
-#: ../console/gntblist.c:1935 ../gtk/gtkdialogs.c:669 ../gtk/gtkdialogs.c:806
-#: ../gtk/gtkdialogs.c:886
-msgid "_Account"
-msgstr "_Konto"
-
-#: ../console/gntblist.c:1943 ../gtk/gtkdialogs.c:677
-msgid "New Instant Message"
-msgstr "Nova Tuj Mesaĝo"
-
-#: ../console/gntblist.c:1945 ../gtk/gtkdialogs.c:679
-msgid "Please enter the screen name or alias of the person you would like to IM."
-msgstr "B.v. enigi la ekrannomon aŭ alinomon de persono kiun vi dezrias TM-i."
-
-#. *
-#. * A wrapper for gaim_request_action() that uses @c OK and @c Cancel buttons.
-#.
-#: ../console/gntblist.c:1948 ../console/gntnotify.c:79 ../gtk/gtkblist.c:3796
-#: ../gtk/gtkdialogs.c:682 ../gtk/gtkdialogs.c:819 ../gtk/gtkdialogs.c:910
-#: ../gtk/gtkrequest.c:269 ../libgaim/account.c:963 ../libgaim/account.c:1134
-#: ../libgaim/protocols/gg/gg.c:497 ../libgaim/protocols/gg/gg.c:655
-#: ../libgaim/protocols/gg/gg.c:791 ../libgaim/protocols/jabber/jabber.c:1342
-#: ../libgaim/protocols/jabber/xdata.c:337 ../libgaim/protocols/msn/msn.c:250
-#: ../libgaim/protocols/msn/msn.c:265 ../libgaim/protocols/msn/msn.c:280
-#: ../libgaim/protocols/msn/msn.c:295 ../libgaim/protocols/oscar/oscar.c:1388
-#: ../libgaim/protocols/oscar/oscar.c:2152
-#: ../libgaim/protocols/oscar/oscar.c:2239
-#: ../libgaim/protocols/oscar/oscar.c:5733
-#: ../libgaim/protocols/oscar/oscar.c:5937
-#: ../libgaim/protocols/oscar/oscar.c:5962
-#: ../libgaim/protocols/oscar/oscar.c:6018
-#: ../libgaim/protocols/silc/buddy.c:466
-#: ../libgaim/protocols/silc/buddy.c:1182 ../libgaim/protocols/silc/chat.c:424
-#: ../libgaim/protocols/silc/chat.c:462 ../libgaim/protocols/silc/chat.c:725
-#: ../libgaim/protocols/silc/ops.c:1297 ../libgaim/protocols/silc/ops.c:1909
-#: ../libgaim/protocols/silc/silc.c:749
-#: ../libgaim/protocols/yahoo/yahoo.c:3213
-#: ../libgaim/protocols/yahoo/yahoo.c:3222 ../libgaim/request.h:1344
-msgid "OK"
-msgstr "Daŭrigu"
-
 #. Create the "Options" frame.
-#: ../console/gntblist.c:1967 ../gtk/gtkpounce.c:766
+#: ../console/gntblist.c:1850 ../gtk/gtkpounce.c:766
 msgid "Options"
 msgstr "Opcioj"
 
-#: ../console/gntblist.c:1973
-msgid "Send IM..."
-msgstr "Sendu TM-n..."
-
-#: ../console/gntblist.c:1977
+#: ../console/gntblist.c:1856
 msgid "Toggle offline buddies"
 msgstr "Inversigi senkonektajn kunulojn"
 
-#: ../console/gntblist.c:1981
+#: ../console/gntblist.c:1860
 msgid "Sort by status"
 msgstr "Ordigi laŭ stato"
 
-#: ../console/gntblist.c:1985
+#: ../console/gntblist.c:1864
 msgid "Sort alphabetically"
 msgstr "Ordigi alfabete"
 
-#: ../console/gntblist.c:1989
+#: ../console/gntblist.c:1868
 msgid "Sort by log size"
 msgstr "Oridgi laŭ protokolo grandeco"
 
@@ -540,124 +486,122 @@
 "%s was disconnected due to the following error:\n"
 "%s"
 msgstr ""
-"%s estis diskonektigita pro la jena eraro:\n"
-"%s"
-
-#: ../console/gntconn.c:43 ../gtk/gtkblist.c:3794 ../libgaim/account.c:991
-#: ../libgaim/connection.c:107
+
+#: ../console/gntconn.c:43 ../gtk/gtkblist.c:3774 ../libgaim/account.c:991
+#: ../libgaim/connection.c:106
 msgid "Connection Error"
 msgstr "Konekteraro"
 
-#: ../console/gntconv.c:71
+#: ../console/gntconv.c:71 ../gtk/gtkconv.c:484
 msgid "No such command."
-msgstr "Nenia komando."
-
-#: ../console/gntconv.c:75 ../gtk/gtkconv.c:493
+msgstr ""
+
+#: ../console/gntconv.c:75 ../gtk/gtkconv.c:491
 msgid "Syntax Error:  You typed the wrong number of arguments to that command."
 msgstr ""
 
-#: ../console/gntconv.c:80 ../gtk/gtkconv.c:498
+#: ../console/gntconv.c:80 ../gtk/gtkconv.c:496
 msgid "Your command failed for an unknown reason."
-msgstr "Via komanda malsukcesis pro nekonata kialo."
-
-#: ../console/gntconv.c:85 ../gtk/gtkconv.c:504
+msgstr ""
+
+#: ../console/gntconv.c:85 ../gtk/gtkconv.c:502
 msgid "That command only works in chats, not IMs."
-msgstr "Tiu komando nur funkcias en babilejoj, ne TM-oj."
-
-#: ../console/gntconv.c:88 ../gtk/gtkconv.c:507
+msgstr ""
+
+#: ../console/gntconv.c:88 ../gtk/gtkconv.c:505
 msgid "That command only works in IMs, not chats."
-msgstr "Tiu komando nur funkcias en TM-oj, ne babilejoj."
-
-#: ../console/gntconv.c:92 ../gtk/gtkconv.c:511
+msgstr ""
+
+#: ../console/gntconv.c:92 ../gtk/gtkconv.c:509
 msgid "That command doesn't work on this protocol."
-msgstr "Tiu komando ne funkcias je tiu protokolo."
+msgstr ""
 
 #: ../console/gntconv.c:99
 msgid "Commands are not supported yet. Message was NOT sent."
-msgstr "Komandoj estas ne akceptitaj nune. Mesaĝo NE estis sendita."
-
-#: ../console/gntconv.c:198
+msgstr ""
+
+#: ../console/gntconv.c:193
 #, c-format
 msgid "%s (%s -- %s)"
 msgstr "%s (%s -- %s)"
 
-#: ../console/gntconv.c:219
+#: ../console/gntconv.c:214
 #, c-format
 msgid "%s [%s]"
 msgstr "%s [%s]"
 
-#: ../console/gntconv.c:349
+#: ../console/gntconv.c:344
 msgid "<AUTO-REPLY> "
 msgstr "<AŬTO-RESPONDO> "
 
 #. Print the list of users in the room
-#: ../console/gntconv.c:443
+#: ../console/gntconv.c:438
 msgid "List of users:\n"
 msgstr "Uzantoj Listo:\n"
 
-#: ../console/gntconv.c:567 ../gtk/gtkconv.c:386
+#: ../console/gntconv.c:562 ../gtk/gtkconv.c:378
 msgid "Supported debug options are:  version"
 msgstr "Subtenitaj sencimigopcioj estas:  versio"
 
-#: ../console/gntconv.c:602 ../gtk/gtkconv.c:422
+#: ../console/gntconv.c:597 ../gtk/gtkconv.c:414
 msgid "No such command (in this context)."
-msgstr "Nenia komand (en tiu kunteksto)."
-
-#: ../console/gntconv.c:605 ../gtk/gtkconv.c:425
+msgstr ""
+
+#: ../console/gntconv.c:600 ../gtk/gtkconv.c:417
 msgid ""
 "Use \"/help &lt;command&gt;\" for help on a specific command.\n"
 "The following commands are available in this context:\n"
 msgstr ""
 
-#: ../console/gntconv.c:644 ../gtk/gtkconv.c:6737
+#: ../console/gntconv.c:639 ../gtk/gtkconv.c:6645
 msgid ""
 "say &lt;message&gt;:  Send a message normally as if you weren't using a "
 "command."
 msgstr ""
 
-#: ../console/gntconv.c:647 ../gtk/gtkconv.c:6740
+#: ../console/gntconv.c:642 ../gtk/gtkconv.c:6648
 msgid "me &lt;action&gt;:  Send an IRC style action to a buddy or chat."
 msgstr ""
 
-#: ../console/gntconv.c:650 ../gtk/gtkconv.c:6743
+#: ../console/gntconv.c:645 ../gtk/gtkconv.c:6651
 msgid ""
 "debug &lt;option&gt;:  Send various debug information to the current "
 "conversation."
 msgstr ""
 
-#: ../console/gntconv.c:653 ../gtk/gtkconv.c:6746
+#: ../console/gntconv.c:648 ../gtk/gtkconv.c:6654
 msgid "clear: Clears the conversation scrollback."
 msgstr ""
 
-#: ../console/gntconv.c:656 ../gtk/gtkconv.c:6749
+#: ../console/gntconv.c:651 ../gtk/gtkconv.c:6657
 msgid "help &lt;command&gt;:  Help on a specific command."
 msgstr ""
 
-#: ../console/gntconv.c:661
+#: ../console/gntconv.c:656
 msgid "plugins: Show the plugins window."
 msgstr ""
 
-#: ../console/gntconv.c:664
+#: ../console/gntconv.c:659
 msgid "buddylist: Show the buddylist."
 msgstr ""
 
-#: ../console/gntconv.c:667
+#: ../console/gntconv.c:662
 msgid "accounts: Show the accounts window."
 msgstr ""
 
-#: ../console/gntconv.c:670
+#: ../console/gntconv.c:665
 msgid "debugwin: Show the debug window."
 msgstr ""
 
-#: ../console/gntconv.c:673
+#: ../console/gntconv.c:668
 msgid "prefs: Show the preference window."
 msgstr ""
 
-#: ../console/gntconv.c:676
+#: ../console/gntconv.c:671
 msgid "statuses: Show the savedstatuses window."
 msgstr ""
 
-#: ../console/gntdebug.c:214 ../console/gntui.c:72 ../gtk/gtkdebug.c:708
+#: ../console/gntdebug.c:203 ../console/gntui.c:72 ../gtk/gtkdebug.c:708
 msgid "Debug Window"
 msgstr "Sencimigo Fenestro"
 
@@ -665,15 +609,15 @@
 #. * it's necessary to make the width of the debug window resizable ... like I said,
 #. * it doesn't make sense. The bug is likely in the packing in gntbox.c.
 #.
-#: ../console/gntdebug.c:235 ../gtk/gtkdebug.c:767
+#: ../console/gntdebug.c:220 ../gtk/gtkdebug.c:767
 msgid "Clear"
 msgstr "Forviŝu"
 
-#: ../console/gntdebug.c:240 ../gtk/gtkdebug.c:776
+#: ../console/gntdebug.c:225 ../gtk/gtkdebug.c:776
 msgid "Pause"
 msgstr "Paŭzu"
 
-#: ../console/gntdebug.c:245 ../gtk/gtkdebug.c:783 ../gtk/gtkdebug.c:784
+#: ../console/gntdebug.c:230 ../gtk/gtkdebug.c:783 ../gtk/gtkdebug.c:784
 msgid "Timestamps"
 msgstr "Tempomarkojn"
 
@@ -703,6 +647,33 @@
 "  -n, --nologin       ne aŭtomate ensalutu\n"
 "  -v, --version       vidigu la aktualan version kaj finu\n"
 
+#. *
+#. * A wrapper for gaim_request_action() that uses @c OK and @c Cancel buttons.
+#.
+#: ../console/gntnotify.c:79 ../gtk/gtkblist.c:3776 ../gtk/gtkdialogs.c:667
+#: ../gtk/gtkdialogs.c:804 ../gtk/gtkdialogs.c:895 ../gtk/gtkrequest.c:269
+#: ../libgaim/account.c:963 ../libgaim/account.c:1134
+#: ../libgaim/protocols/gg/gg.c:497 ../libgaim/protocols/gg/gg.c:655
+#: ../libgaim/protocols/gg/gg.c:791 ../libgaim/protocols/jabber/jabber.c:1351
+#: ../libgaim/protocols/jabber/xdata.c:337 ../libgaim/protocols/msn/msn.c:250
+#: ../libgaim/protocols/msn/msn.c:265 ../libgaim/protocols/msn/msn.c:280
+#: ../libgaim/protocols/msn/msn.c:295 ../libgaim/protocols/oscar/oscar.c:1386
+#: ../libgaim/protocols/oscar/oscar.c:2150
+#: ../libgaim/protocols/oscar/oscar.c:2237
+#: ../libgaim/protocols/oscar/oscar.c:5731
+#: ../libgaim/protocols/oscar/oscar.c:5935
+#: ../libgaim/protocols/oscar/oscar.c:5960
+#: ../libgaim/protocols/oscar/oscar.c:6016
+#: ../libgaim/protocols/silc/buddy.c:466
+#: ../libgaim/protocols/silc/buddy.c:1182 ../libgaim/protocols/silc/chat.c:424
+#: ../libgaim/protocols/silc/chat.c:462 ../libgaim/protocols/silc/chat.c:725
+#: ../libgaim/protocols/silc/ops.c:1297 ../libgaim/protocols/silc/ops.c:1909
+#: ../libgaim/protocols/silc/silc.c:753
+#: ../libgaim/protocols/yahoo/yahoo.c:3213
+#: ../libgaim/protocols/yahoo/yahoo.c:3222 ../libgaim/request.h:1344
+msgid "OK"
+msgstr "Daŭrigu"
+
 #: ../console/gntnotify.c:146
 msgid "Emails"
 msgstr "Retadresoj"
@@ -712,7 +683,7 @@
 msgstr "Vi ricevis retmesaĝon!"
 
 #: ../console/gntnotify.c:155 ../gtk/gtknotify.c:414
-#: ../libgaim/protocols/jabber/jabber.c:1138
+#: ../libgaim/protocols/jabber/jabber.c:1147
 msgid "From"
 msgstr "De"
 
@@ -739,7 +710,7 @@
 msgstr "Nova Retmesaĝo"
 
 #: ../console/gntnotify.c:229 ../gtk/gtknotify.c:849
-#: ../libgaim/protocols/oscar/oscar.c:2612
+#: ../libgaim/protocols/oscar/oscar.c:2610
 #, c-format
 msgid "Info for %s"
 msgstr "Informo pri %s"
@@ -753,11 +724,11 @@
 msgid "Continue"
 msgstr "Daŭrigu"
 
-#: ../console/gntnotify.c:309 ../gtk/gtkconv.c:1610 ../gtk/gtkdebug.c:862
+#: ../console/gntnotify.c:309 ../gtk/gtkconv.c:1608 ../gtk/gtkdebug.c:862
 msgid "Info"
 msgstr "Informo"
 
-#: ../console/gntnotify.c:312 ../gtk/gtkconv.c:1571
+#: ../console/gntnotify.c:312 ../gtk/gtkconv.c:1569
 msgid "IM"
 msgstr "TM"
 
@@ -765,7 +736,7 @@
 msgid "Join"
 msgstr "Aliĝu"
 
-#: ../console/gntnotify.c:318 ../libgaim/protocols/sametime/sametime.c:3483
+#: ../console/gntnotify.c:318 ../libgaim/protocols/sametime/sametime.c:3448
 msgid "Invite"
 msgstr "Invitu"
 
@@ -792,7 +763,7 @@
 
 #: ../console/gntplugin.c:170
 msgid "Plugin need to be loaded before you can configure it."
-msgstr "Necesas ŝarĝi kromaĵon por agordi ĝin."
+msgstr ""
 
 #: ../console/gntplugin.c:208
 msgid "..."
@@ -806,9 +777,14 @@
 msgid "No configuration options for this plugin."
 msgstr "Neniuj agordaj opcioj por tiu kromaĵo."
 
+#: ../console/gntplugin.c:231 ../console/gntui.c:73 ../gtk/gtkdocklet.c:494
+#: ../gtk/gtkplugin.c:538
+msgid "Plugins"
+msgstr "Kromaĵoj"
+
 #: ../console/gntplugin.c:236
 msgid "You can (un)load plugins from the following list."
-msgstr "Vi povas (mal)ŝarĝi kromaĵojn de la jena listo."
+msgstr ""
 
 #: ../console/gntplugin.c:279
 msgid "Configure Plugin"
@@ -847,17 +823,17 @@
 msgstr "Protokolu stato ŝanĝeventojn"
 
 #. Conversations
-#: ../console/gntprefs.c:220 ../gtk/gtkprefs.c:898 ../gtk/gtkprefs.c:1909
+#: ../console/gntprefs.c:220 ../gtk/gtkprefs.c:822 ../gtk/gtkprefs.c:1884
 #: ../gtk/plugins/win32/winprefs/winprefs.c:341
 msgid "Conversations"
 msgstr "Konversacioj"
 
-#: ../console/gntprefs.c:221 ../gtk/gtkprefs.c:1349 ../gtk/gtkprefs.c:1920
+#: ../console/gntprefs.c:221 ../gtk/gtkprefs.c:1314 ../gtk/gtkprefs.c:1895
 msgid "Logging"
 msgstr "Protokolado"
 
-#: ../console/gntprefs.c:223 ../console/gntui.c:74 ../gtk/gtkdocklet.c:532
-#: ../gtk/gtkprefs.c:1945
+#: ../console/gntprefs.c:223 ../console/gntui.c:74 ../gtk/gtkdocklet.c:495
+#: ../gtk/gtkprefs.c:1920
 msgid "Preferences"
 msgstr "Agordo"
 
@@ -893,31 +869,31 @@
 #: ../console/gntstatus.c:562 ../gtk/gtksavedstatuses.c:459
 #: ../gtk/gtksavedstatuses.c:923 ../libgaim/protocols/bonjour/bonjour.c:256
 #: ../libgaim/protocols/bonjour/bonjour.c:263
-#: ../libgaim/protocols/gg/gg.c:1598 ../libgaim/protocols/gg/gg.c:1608
-#: ../libgaim/protocols/gg/gg.c:1614 ../libgaim/protocols/gg/gg.c:1623
-#: ../libgaim/protocols/gg/gg.c:1628 ../libgaim/protocols/irc/irc.c:244
-#: ../libgaim/protocols/jabber/jabber.c:1205
-#: ../libgaim/protocols/jabber/jabber.c:1215
-#: ../libgaim/protocols/jabber/jabber.c:1225
-#: ../libgaim/protocols/jabber/jabber.c:1235
-#: ../libgaim/protocols/jabber/jabber.c:1245
-#: ../libgaim/protocols/jabber/jabber.c:1257
+#: ../libgaim/protocols/gg/gg.c:1592 ../libgaim/protocols/gg/gg.c:1602
+#: ../libgaim/protocols/gg/gg.c:1608 ../libgaim/protocols/gg/gg.c:1617
+#: ../libgaim/protocols/gg/gg.c:1622 ../libgaim/protocols/irc/irc.c:244
+#: ../libgaim/protocols/jabber/jabber.c:1214
+#: ../libgaim/protocols/jabber/jabber.c:1224
+#: ../libgaim/protocols/jabber/jabber.c:1234
+#: ../libgaim/protocols/jabber/jabber.c:1244
+#: ../libgaim/protocols/jabber/jabber.c:1254
+#: ../libgaim/protocols/jabber/jabber.c:1266
 #: ../libgaim/protocols/novell/novell.c:2876
 #: ../libgaim/protocols/novell/novell.c:2982
 #: ../libgaim/protocols/novell/novell.c:2988
 #: ../libgaim/protocols/novell/novell.c:2994
-#: ../libgaim/protocols/oscar/oscar.c:5397
-#: ../libgaim/protocols/oscar/oscar.c:5412
-#: ../libgaim/protocols/oscar/oscar.c:5417
-#: ../libgaim/protocols/oscar/oscar.c:5625
-#: ../libgaim/protocols/oscar/oscar.c:5637
-#: ../libgaim/protocols/oscar/oscar.c:5650
-#: ../libgaim/protocols/oscar/oscar.c:5657
-#: ../libgaim/protocols/oscar/oscar.c:5664
-#: ../libgaim/protocols/sametime/sametime.c:3297
-#: ../libgaim/protocols/sametime/sametime.c:3303
-#: ../libgaim/protocols/sametime/sametime.c:3309
-#: ../libgaim/protocols/sametime/sametime.c:3388
+#: ../libgaim/protocols/oscar/oscar.c:5395
+#: ../libgaim/protocols/oscar/oscar.c:5410
+#: ../libgaim/protocols/oscar/oscar.c:5415
+#: ../libgaim/protocols/oscar/oscar.c:5623
+#: ../libgaim/protocols/oscar/oscar.c:5635
+#: ../libgaim/protocols/oscar/oscar.c:5648
+#: ../libgaim/protocols/oscar/oscar.c:5655
+#: ../libgaim/protocols/oscar/oscar.c:5662
+#: ../libgaim/protocols/sametime/sametime.c:3262
+#: ../libgaim/protocols/sametime/sametime.c:3268
+#: ../libgaim/protocols/sametime/sametime.c:3274
+#: ../libgaim/protocols/sametime/sametime.c:3353
 #: ../libgaim/protocols/silc/buddy.c:1544
 #: ../libgaim/protocols/simple/simple.c:246
 #: ../libgaim/protocols/yahoo/yahoo.c:3456
@@ -952,7 +928,7 @@
 msgstr "Substato"
 
 #. Set up stuff for the account box
-#: ../console/gntstatus.c:442 ../gtk/gtkblist.c:4990 ../gtk/gtkblist.c:5308
+#: ../console/gntstatus.c:442 ../gtk/gtkblist.c:4968 ../gtk/gtkblist.c:5286
 msgid "Account:"
 msgstr "Konto:"
 
@@ -970,11 +946,11 @@
 
 #: ../console/gntstatus.c:533 ../console/gntstatus.c:562
 #: ../gtk/gtksavedstatuses.c:912 ../gtk/gtksavedstatuses.c:1059
-#: ../libgaim/protocols/gg/gg.c:1024 ../libgaim/protocols/gg/gg.c:1581
-#: ../libgaim/protocols/gg/gg.c:1585 ../libgaim/protocols/jabber/buddy.c:623
+#: ../libgaim/protocols/gg/gg.c:1024 ../libgaim/protocols/gg/gg.c:1575
+#: ../libgaim/protocols/gg/gg.c:1579 ../libgaim/protocols/jabber/buddy.c:623
 #: ../libgaim/protocols/jabber/buddy.c:630
 #: ../libgaim/protocols/jabber/buddy.c:658
-#: ../libgaim/protocols/jabber/jabber.c:1176
+#: ../libgaim/protocols/jabber/jabber.c:1185
 #: ../libgaim/protocols/msn/msn.c:546
 #: ../libgaim/protocols/novell/novell.c:2875
 #: ../libgaim/protocols/novell/novell.c:2879
@@ -1056,19 +1032,19 @@
 msgstr "GntGf"
 
 #: ../console/plugins/gntgf.c:357 ../console/plugins/gntgf.c:358
-msgid "Toaster plugin for Gaim-Text."
-msgstr "Panrostilo kromaĵo por Gaim-Tekst."
-
-#: ../console/plugins/gnthistory.c:116 ../gtk/plugins/history.c:120
+msgid "Toaster plugin for GntGaim."
+msgstr "Panrostilo kromaĵo por GnGaim"
+
+#: ../console/plugins/gnthistory.c:119 ../gtk/plugins/history.c:120
 #, c-format
 msgid "<b>Conversation with %s on %s:</b><br>"
 msgstr "<b>Konversacion kun %s ĉe %s:</b><br>"
 
-#: ../console/plugins/gnthistory.c:138 ../gtk/plugins/history.c:147
+#: ../console/plugins/gnthistory.c:140 ../gtk/plugins/history.c:147
 msgid "History Plugin Requires Logging"
 msgstr "Historio Kormaĵo postulas Protokoladon"
 
-#: ../console/plugins/gnthistory.c:139 ../gtk/plugins/history.c:148
+#: ../console/plugins/gnthistory.c:141 ../gtk/plugins/history.c:148
 msgid ""
 "Logging can be enabled from Tools -> Preferences -> Logging.\n"
 "\n"
@@ -1076,15 +1052,15 @@
 "the same conversation type(s)."
 msgstr ""
 
-#: ../console/plugins/gnthistory.c:179
+#: ../console/plugins/gnthistory.c:181
 msgid "GntHistory"
 msgstr "GntHistorio"
 
-#: ../console/plugins/gnthistory.c:181 ../gtk/plugins/history.c:190
+#: ../console/plugins/gnthistory.c:183 ../gtk/plugins/history.c:190
 msgid "Shows recently logged conversations in new conversations."
 msgstr "Montru lastatempe protokolatajn konversaciojn en novajn konversaciojn."
 
-#: ../console/plugins/gnthistory.c:182 ../gtk/plugins/history.c:191
+#: ../console/plugins/gnthistory.c:184 ../gtk/plugins/history.c:191
 msgid ""
 "When a new conversation is opened this plugin will insert the last "
 "conversation into the current conversation."
@@ -1106,7 +1082,7 @@
 
 #: ../console/plugins/lastlog.c:123 ../console/plugins/lastlog.c:124
 msgid "Lastlog plugin for gaim-text."
-msgstr "Lastaprotokolo kromaĵo por gaim-tekst."
+msgstr ""
 
 #: ../gtk/eggtrayicon.c:129
 msgid "Orientation"
@@ -1200,7 +1176,7 @@
 msgid "SOCKS 5"
 msgstr "SOCKS 5"
 
-#: ../gtk/gtkaccount.c:897 ../gtk/gtkprefs.c:1095
+#: ../gtk/gtkaccount.c:897 ../gtk/gtkprefs.c:1061
 msgid "Use Environmental Settings"
 msgstr "Uzu Mediajn Agordojn"
 
@@ -1222,15 +1198,15 @@
 msgid "Proxy Options"
 msgstr "Prokurilo Opcioj"
 
-#: ../gtk/gtkaccount.c:974 ../gtk/gtkprefs.c:1089
+#: ../gtk/gtkaccount.c:974 ../gtk/gtkprefs.c:1055
 msgid "Proxy _type:"
 msgstr "Prokurilo _tipo:"
 
-#: ../gtk/gtkaccount.c:983 ../gtk/gtkprefs.c:1110
+#: ../gtk/gtkaccount.c:983 ../gtk/gtkprefs.c:1076
 msgid "_Host:"
 msgstr "_Retnodo:"
 
-#: ../gtk/gtkaccount.c:987 ../gtk/gtkprefs.c:1128
+#: ../gtk/gtkaccount.c:987 ../gtk/gtkprefs.c:1094
 msgid "_Port:"
 msgstr "_Pordo:"
 
@@ -1238,7 +1214,7 @@
 msgid "_Username:"
 msgstr "_Salutnomo:"
 
-#: ../gtk/gtkaccount.c:1001 ../gtk/gtkprefs.c:1165
+#: ../gtk/gtkaccount.c:1001 ../gtk/gtkprefs.c:1131
 msgid "Pa_ssword:"
 msgstr "Pa_svorto:"
 
@@ -1255,7 +1231,7 @@
 msgstr "_Kroma"
 
 #. Register button
-#: ../gtk/gtkaccount.c:1448 ../libgaim/protocols/jabber/jabber.c:849
+#: ../gtk/gtkaccount.c:1448 ../libgaim/protocols/jabber/jabber.c:853
 msgid "Register"
 msgstr "Registru"
 
@@ -1338,136 +1314,136 @@
 msgid "_Expand"
 msgstr "_Etendu"
 
-#: ../gtk/gtkblist.c:1434 ../gtk/gtkblist.c:1446 ../gtk/gtkblist.c:4115
-#: ../gtk/gtkblist.c:4125
+#: ../gtk/gtkblist.c:1434 ../gtk/gtkblist.c:1446 ../gtk/gtkblist.c:4095
+#: ../gtk/gtkblist.c:4105
 msgid "/Tools/Mute Sounds"
 msgstr "/Iloj/Mutu Sonojn"
 
-#: ../gtk/gtkblist.c:1906 ../gtk/gtkconv.c:4350 ../gtk/gtkpounce.c:422
+#: ../gtk/gtkblist.c:1906 ../gtk/gtkconv.c:4277 ../gtk/gtkpounce.c:422
 msgid "You are not currently signed on with an account that can add that buddy."
 msgstr "Vi ne ensalutis nun per konto kiu povas aldoni tiun kunul."
 
 #. Buddies menu
-#: ../gtk/gtkblist.c:2500
+#: ../gtk/gtkblist.c:2480
 msgid "/_Buddies"
 msgstr "/K_unuloj"
 
-#: ../gtk/gtkblist.c:2501
+#: ../gtk/gtkblist.c:2481
 msgid "/Buddies/New Instant _Message..."
 msgstr "/Kunuloj/Nova Tuj _Mesaĝo..."
 
-#: ../gtk/gtkblist.c:2502
+#: ../gtk/gtkblist.c:2482
 msgid "/Buddies/Join a _Chat..."
 msgstr "/Kunuloj/Aliĝu Babile_jon..."
 
-#: ../gtk/gtkblist.c:2503
+#: ../gtk/gtkblist.c:2483
 msgid "/Buddies/Get User _Info..."
 msgstr "/Kunuloj/Ricevu Uzanto-_Informon..."
 
-#: ../gtk/gtkblist.c:2504
+#: ../gtk/gtkblist.c:2484
 msgid "/Buddies/View User _Log..."
 msgstr "/Kunuloj/Montru Uzanto-_Protokolon..."
 
-#: ../gtk/gtkblist.c:2506
+#: ../gtk/gtkblist.c:2486
 msgid "/Buddies/Show _Offline Buddies"
-msgstr "/Kunuloj/Montru Senk_onektajn Kunulojn"
-
-#: ../gtk/gtkblist.c:2507
+msgstr "/Kunuloj/Montru Nek_onektitajn Kunulojn"
+
+#: ../gtk/gtkblist.c:2487
 msgid "/Buddies/Show _Empty Groups"
 msgstr "/Kunuloj/Montru Malpl_enajn Grupojn"
 
-#: ../gtk/gtkblist.c:2508
+#: ../gtk/gtkblist.c:2488
 msgid "/Buddies/Show Buddy _Details"
 msgstr "/Kunuloj/Montru Kunul-_Detalojn"
 
-#: ../gtk/gtkblist.c:2509
+#: ../gtk/gtkblist.c:2489
 msgid "/Buddies/Show Idle _Times"
 msgstr "/Kunuloj/Montru Senfarajn _Tempojn"
 
-#: ../gtk/gtkblist.c:2510
+#: ../gtk/gtkblist.c:2490
 msgid "/Buddies/_Sort Buddies"
 msgstr "/Kunuloj/_Oridgu Kunulojn"
 
-#: ../gtk/gtkblist.c:2512
+#: ../gtk/gtkblist.c:2492
 msgid "/Buddies/_Add Buddy..."
 msgstr "/Kunuloj/_Aldonu Kunulon..."
 
-#: ../gtk/gtkblist.c:2513
+#: ../gtk/gtkblist.c:2493
 msgid "/Buddies/Add C_hat..."
 msgstr "/Kunuloj/Aldonu Babile_jon..."
 
-#: ../gtk/gtkblist.c:2514
+#: ../gtk/gtkblist.c:2494
 msgid "/Buddies/Add _Group..."
 msgstr "/Kunuloj/Aldonu _Grupon..."
 
-#: ../gtk/gtkblist.c:2516
+#: ../gtk/gtkblist.c:2496
 msgid "/Buddies/_Quit"
 msgstr "/Kunuloj/_Finu"
 
 #. Accounts menu
-#: ../gtk/gtkblist.c:2519
+#: ../gtk/gtkblist.c:2499
 msgid "/_Accounts"
 msgstr "/_Kontoj"
 
-#: ../gtk/gtkblist.c:2520 ../gtk/gtkblist.c:5967
+#: ../gtk/gtkblist.c:2500 ../gtk/gtkblist.c:5945
 msgid "/Accounts/Add\\/Edit"
 msgstr "/Kontoj/Aldonu\\/Redaktu"
 
 #. Tools
-#: ../gtk/gtkblist.c:2523
+#: ../gtk/gtkblist.c:2503
 msgid "/_Tools"
 msgstr "/_Iloj"
 
-#: ../gtk/gtkblist.c:2524
+#: ../gtk/gtkblist.c:2504
 msgid "/Tools/Buddy _Pounces"
 msgstr "/Iloj/Kunul _Atentigoj"
 
-#: ../gtk/gtkblist.c:2525
+#: ../gtk/gtkblist.c:2505
 msgid "/Tools/Plu_gins"
 msgstr "/Iloj/Kromaĵoj"
 
-#: ../gtk/gtkblist.c:2526
+#: ../gtk/gtkblist.c:2506
 msgid "/Tools/Pr_eferences"
 msgstr "/Iloj/Agordoj"
 
-#: ../gtk/gtkblist.c:2527
+#: ../gtk/gtkblist.c:2507
 msgid "/Tools/Pr_ivacy"
 msgstr "/Iloj/Pr_ivateco"
 
-#: ../gtk/gtkblist.c:2529
+#: ../gtk/gtkblist.c:2509
 msgid "/Tools/_File Transfers"
 msgstr "/Iloj/_Dosiero-alŝutoj"
 
-#: ../gtk/gtkblist.c:2530
+#: ../gtk/gtkblist.c:2510
 msgid "/Tools/R_oom List"
 msgstr "/Iloj/Ĉambro-Listo"
 
-#: ../gtk/gtkblist.c:2531
+#: ../gtk/gtkblist.c:2511
 msgid "/Tools/System _Log"
 msgstr "/Iloj/Sistemo-_Protokolo"
 
-#: ../gtk/gtkblist.c:2533
+#: ../gtk/gtkblist.c:2513
 msgid "/Tools/Mute _Sounds"
 msgstr "/Iloj/Mutu _Sonojn"
 
 #. Help
-#: ../gtk/gtkblist.c:2536
+#: ../gtk/gtkblist.c:2516
 msgid "/_Help"
 msgstr "/_Helpo"
 
-#: ../gtk/gtkblist.c:2537
+#: ../gtk/gtkblist.c:2517
 msgid "/Help/Online _Help"
 msgstr "/Helpo/Reta _Helpo"
 
-#: ../gtk/gtkblist.c:2538
+#: ../gtk/gtkblist.c:2518
 msgid "/Help/_Debug Window"
 msgstr "/Helpo/_Sencimig-fenestro"
 
-#: ../gtk/gtkblist.c:2539
+#: ../gtk/gtkblist.c:2519
 msgid "/Help/_About"
 msgstr "/Helpo/_Pri"
 
-#: ../gtk/gtkblist.c:2571 ../gtk/gtkblist.c:2640
+#: ../gtk/gtkblist.c:2551 ../gtk/gtkblist.c:2620
 #, c-format
 msgid ""
 "\n"
@@ -1476,7 +1452,7 @@
 "\n"
 "<b>Konto:</b> %s"
 
-#: ../gtk/gtkblist.c:2652
+#: ../gtk/gtkblist.c:2632
 #, c-format
 msgid ""
 "\n"
@@ -1485,7 +1461,7 @@
 "\n"
 "<b>Kunul Alinomo:</b> %s"
 
-#: ../gtk/gtkblist.c:2664
+#: ../gtk/gtkblist.c:2644
 #, c-format
 msgid ""
 "\n"
@@ -1494,7 +1470,7 @@
 "\n"
 "<b>Karesnamo:</b> %s"
 
-#: ../gtk/gtkblist.c:2673
+#: ../gtk/gtkblist.c:2653
 #, c-format
 msgid ""
 "\n"
@@ -1503,7 +1479,7 @@
 "\n"
 "<b>Ensalutita En:</b> %s"
 
-#: ../gtk/gtkblist.c:2684
+#: ../gtk/gtkblist.c:2664
 #, c-format
 msgid ""
 "\n"
@@ -1512,7 +1488,7 @@
 "\n"
 "<b>Senfara:</b> %s"
 
-#: ../gtk/gtkblist.c:2719
+#: ../gtk/gtkblist.c:2699
 #, c-format
 msgid ""
 "\n"
@@ -1521,15 +1497,15 @@
 "\n"
 "<b>Laste vidita:</b> antaŭ %s"
 
-#: ../gtk/gtkblist.c:2728
+#: ../gtk/gtkblist.c:2708
 msgid ""
 "\n"
 "<b>Status:</b> Offline"
 msgstr ""
 "\n"
-"<b>Stato:</b> Senkonekta"
-
-#: ../gtk/gtkblist.c:2739
+"<b>Stato:</b> Nekonektita"
+
+#: ../gtk/gtkblist.c:2719
 msgid ""
 "\n"
 "<b>Description:</b> Spooky"
@@ -1537,158 +1513,158 @@
 "\n"
 "<b>Priskribo:</b> Timiga"
 
-#: ../gtk/gtkblist.c:2741
+#: ../gtk/gtkblist.c:2721
 msgid ""
 "\n"
 "<b>Status:</b> Awesome"
 msgstr ""
 
-#: ../gtk/gtkblist.c:2743
+#: ../gtk/gtkblist.c:2723
 msgid ""
 "\n"
 "<b>Status:</b> Rockin'"
 msgstr ""
 
-#: ../gtk/gtkblist.c:3210 ../gtk/gtkdocklet.c:458 ../gtk/gtkstatusbox.c:974
+#: ../gtk/gtkblist.c:3190 ../gtk/gtkdocklet.c:421 ../gtk/gtkstatusbox.c:974
 #: ../libgaim/protocols/gg/gg.c:993 ../libgaim/protocols/jabber/buddy.c:1365
 #: ../libgaim/protocols/novell/novell.c:2865
 #: ../libgaim/protocols/oscar/oscar.c:769
-#: ../libgaim/protocols/oscar/oscar.c:5447
+#: ../libgaim/protocols/oscar/oscar.c:5445
 #: ../libgaim/protocols/yahoo/yahoo.c:2883 ../libgaim/status.c:154
 msgid "Offline"
 msgstr "Senkonekta"
 
-#: ../gtk/gtkblist.c:3226
+#: ../gtk/gtkblist.c:3206
 #, c-format
 msgid "Idle %dh %02dm"
 msgstr "Senfara %dh %02dm"
 
-#: ../gtk/gtkblist.c:3228
+#: ../gtk/gtkblist.c:3208
 #, c-format
 msgid "Idle %dm"
 msgstr "Senfara %dm"
 
 #. Idle stuff
-#: ../gtk/gtkblist.c:3231 ../gtk/gtkprefs.c:1801
+#: ../gtk/gtkblist.c:3211 ../gtk/gtkprefs.c:1765
 #: ../libgaim/protocols/bonjour/bonjour.c:333
 #: ../libgaim/protocols/jabber/buddy.c:635
 #: ../libgaim/protocols/jabber/buddy.c:668 ../libgaim/protocols/msn/msn.c:548
 #: ../libgaim/protocols/msn/state.c:32
 #: ../libgaim/protocols/novell/novell.c:2862
-#: ../libgaim/protocols/oscar/oscar.c:2826
+#: ../libgaim/protocols/oscar/oscar.c:2824
 #: ../libgaim/protocols/yahoo/yahoo.c:2881
 #: ../libgaim/protocols/yahoo/yahoo_profile.c:691
 msgid "Idle"
 msgstr "Senfara"
 
-#: ../gtk/gtkblist.c:3359
+#: ../gtk/gtkblist.c:3339
 msgid "/Buddies/New Instant Message..."
 msgstr "/Kunuloj/Nova Tuj Mesaĝo..."
 
-#: ../gtk/gtkblist.c:3360 ../gtk/gtkblist.c:3393
+#: ../gtk/gtkblist.c:3340 ../gtk/gtkblist.c:3373
 msgid "/Buddies/Join a Chat..."
 msgstr "/Kunuloj/Aliĝu Babilejon..."
 
-#: ../gtk/gtkblist.c:3361
+#: ../gtk/gtkblist.c:3341
 msgid "/Buddies/Get User Info..."
 msgstr "/Kunuloj/Ricevu Uzanto-Informon..."
 
-#: ../gtk/gtkblist.c:3362
+#: ../gtk/gtkblist.c:3342
 msgid "/Buddies/Add Buddy..."
 msgstr "/Kunuloj/Aldonu Kunulon..."
 
-#: ../gtk/gtkblist.c:3363 ../gtk/gtkblist.c:3396
+#: ../gtk/gtkblist.c:3343 ../gtk/gtkblist.c:3376
 msgid "/Buddies/Add Chat..."
 msgstr "/Kunuloj/Aldonu Babilejon..."
 
-#: ../gtk/gtkblist.c:3364
+#: ../gtk/gtkblist.c:3344
 msgid "/Buddies/Add Group..."
 msgstr "/Kunuloj/Aldonu Grupon..."
 
-#: ../gtk/gtkblist.c:3399
+#: ../gtk/gtkblist.c:3379
 msgid "/Tools/Buddy Pounces"
 msgstr "/Iloj/Kunul Atentigoj"
 
-#: ../gtk/gtkblist.c:3402
+#: ../gtk/gtkblist.c:3382
 msgid "/Tools/Privacy"
 msgstr "/Iloj/Privateco"
 
-#: ../gtk/gtkblist.c:3405
+#: ../gtk/gtkblist.c:3385
 msgid "/Tools/Room List"
 msgstr "/Iloj/Ĉambro Listo"
 
-#: ../gtk/gtkblist.c:3501 ../gtk/gtkdocklet.c:149
+#: ../gtk/gtkblist.c:3481 ../gtk/gtkdocklet.c:136
 #, c-format
 msgid "%d unread message from %s\n"
 msgid_plural "%d unread messages from %s\n"
 msgstr[0] "%d nelegita mesaĝo el %s\n"
 msgstr[1] "%d nelegitaj mesaĝoj el %s\n"
 
-#: ../gtk/gtkblist.c:3577
+#: ../gtk/gtkblist.c:3557
 msgid "Manually"
 msgstr "Mane"
 
-#: ../gtk/gtkblist.c:3579
+#: ../gtk/gtkblist.c:3559
 msgid "Alphabetically"
 msgstr "Alfabete"
 
-#: ../gtk/gtkblist.c:3580
+#: ../gtk/gtkblist.c:3560
 msgid "By status"
 msgstr "Laŭ stato"
 
-#: ../gtk/gtkblist.c:3581
+#: ../gtk/gtkblist.c:3561
 msgid "By log size"
 msgstr "Laŭ protokolo grandeco"
 
-#: ../gtk/gtkblist.c:3789 ../gtk/gtkconn.c:178
+#: ../gtk/gtkblist.c:3769 ../gtk/gtkconn.c:178
 #, c-format
 msgid "%s disconnected"
 msgstr "%s malkontaktita"
 
-#: ../gtk/gtkblist.c:3798 ../libgaim/protocols/sametime/sametime.c:3653
+#: ../gtk/gtkblist.c:3778 ../libgaim/protocols/sametime/sametime.c:3618
 msgid "Connect"
 msgstr "Kontaktu"
 
-#: ../gtk/gtkblist.c:3798
+#: ../gtk/gtkblist.c:3778
 msgid "Re-enable Account"
 msgstr "Reŝaltu Konton"
 
-#: ../gtk/gtkblist.c:3819
+#: ../gtk/gtkblist.c:3799
 #, c-format
 msgid "<span color=\"red\">%s disconnected: %s</span>"
 msgstr "<span color=\"red\">%s malkontaktita: %s</span>"
 
-#: ../gtk/gtkblist.c:3948
+#: ../gtk/gtkblist.c:3928
 msgid "/Accounts"
 msgstr "/Kontoj"
 
 #. set the Show Offline Buddies option. must be done
 #. * after the treeview or faceprint gets mad. -Robot101
 #.
-#: ../gtk/gtkblist.c:4109
+#: ../gtk/gtkblist.c:4089
 msgid "/Buddies/Show Offline Buddies"
 msgstr "/Kunuloj/Montru Senkonektajn Kunulojn"
 
-#: ../gtk/gtkblist.c:4112
+#: ../gtk/gtkblist.c:4092
 msgid "/Buddies/Show Empty Groups"
 msgstr "/Kunuloj/Montru Malplenajn Grupojn"
 
-#: ../gtk/gtkblist.c:4118
+#: ../gtk/gtkblist.c:4098
 msgid "/Buddies/Show Buddy Details"
 msgstr "/Kunulojn/Montru Kunul-Detalojn"
 
-#: ../gtk/gtkblist.c:4121
+#: ../gtk/gtkblist.c:4101
 msgid "/Buddies/Show Idle Times"
 msgstr "/Kunuloj/Montru Senfarajn Tempojn"
 
-#: ../gtk/gtkblist.c:4786 ../gtk/plugins/gevolution/gevolution.c:97
+#: ../gtk/gtkblist.c:4764 ../gtk/plugins/gevolution/gevolution.c:96
 #: ../gtk/plugins/gevolution/gevo-util.c:64 ../libgaim/blist.c:521
 #: ../libgaim/blist.c:1294 ../libgaim/blist.c:1523
 #: ../libgaim/protocols/jabber/roster.c:67
 msgid "Buddies"
 msgstr "Kunuloj"
 
-#: ../gtk/gtkblist.c:4920
+#: ../gtk/gtkblist.c:4898
 msgid ""
 "Please enter the screen name of the person you would like to add to your "
 "buddy list. You may optionally enter an alias, or nickname,  for the buddy. "
@@ -1698,23 +1674,23 @@
 "kunullisto. Vi povas laŭ deziro enigi alinomon, aŭ karesnomon, pri la kunul. "
 "La alinomo estos vidigita anstataŭ la erkrana nomo laŭ kaze.\n"
 
-#: ../gtk/gtkblist.c:4980 ../gtk/gtkblist.c:5343
+#: ../gtk/gtkblist.c:4958 ../gtk/gtkblist.c:5321
 #: ../gtk/plugins/gevolution/add_buddy_dialog.c:554
 #: ../gtk/plugins/gevolution/new_person_dialog.c:307
 msgid "Group:"
 msgstr "Grupo:"
 
-#: ../gtk/gtkblist.c:5241
+#: ../gtk/gtkblist.c:5219
 msgid "This protocol does not support chat rooms."
 msgstr ""
 
-#: ../gtk/gtkblist.c:5257
+#: ../gtk/gtkblist.c:5235
 msgid ""
 "You are not currently signed on with any protocols that have the ability to "
 "chat."
 msgstr ""
 
-#: ../gtk/gtkblist.c:5298
+#: ../gtk/gtkblist.c:5276
 msgid ""
 "Please enter an alias, and the appropriate information about the chat you "
 "would like to add to your buddy list.\n"
@@ -1722,57 +1698,56 @@
 "B.v. enigi alinomon, kaj la konvenan informon pri la babilejo kiun vi volas "
 "aldoni en via kunullisto.\n"
 
-#: ../gtk/gtkblist.c:5381
+#: ../gtk/gtkblist.c:5359
 msgid "Please enter the name of the group to be added."
 msgstr "B.v. enigi la nomon de la grupo aldonenda."
 
-#: ../gtk/gtkblist.c:6007
+#: ../gtk/gtkblist.c:5985
 msgid "_Edit Account"
 msgstr "_Redaktu Konton"
 
-#: ../gtk/gtkblist.c:6040 ../gtk/gtkblist.c:6046 ../gtk/gtkconv.c:2839
+#: ../gtk/gtkblist.c:6018 ../gtk/gtkblist.c:6024 ../gtk/gtkconv.c:2781
 msgid "No actions available"
 msgstr "Neniu ago disponebla"
 
-#: ../gtk/gtkblist.c:6054
+#: ../gtk/gtkblist.c:6032
 msgid "_Disable"
 msgstr "_Malŝaltu"
 
-#: ../gtk/gtkblist.c:6066
+#: ../gtk/gtkblist.c:6044
 msgid "Enable Account"
 msgstr "Ŝaltu Konton"
 
-#: ../gtk/gtkblist.c:6119
+#: ../gtk/gtkblist.c:6097
 msgid "/Tools"
 msgstr "/Iloj"
 
-#: ../gtk/gtkblist.c:6205
+#: ../gtk/gtkblist.c:6183
 msgid "/Buddies/Sort Buddies"
 msgstr "/Kunuloj/Ordigu Kunulojn"
 
 #: ../gtk/gtkconn.c:179
 #, c-format
 msgid ""
-"%s\n"
-"\n"
+"%s was disconnected due to an error: %s\n"
 "Gaim will not attempt to reconnect the account until you correct the error "
 "and re-enable the account."
 msgstr ""
 
-#: ../gtk/gtkconv.c:746 ../gtk/gtkconv.c:772
+#: ../gtk/gtkconv.c:744 ../gtk/gtkconv.c:770
 msgid "That buddy is not on the same protocol as this chat."
 msgstr ""
 
-#: ../gtk/gtkconv.c:766
+#: ../gtk/gtkconv.c:764
 msgid "You are not currently signed on with an account that can invite that buddy."
 msgstr ""
 
-#: ../gtk/gtkconv.c:819
+#: ../gtk/gtkconv.c:817
 msgid "Invite Buddy Into Chat Room"
 msgstr "Invitu Kunul En Babilejo"
 
 #. Put our happy label in it.
-#: ../gtk/gtkconv.c:849
+#: ../gtk/gtkconv.c:847
 msgid ""
 "Please enter the name of the user you wish to invite, along with an optional "
 "invite message."
@@ -1780,362 +1755,349 @@
 "B.v. enigi la nomon de uzanto kiun vi deziras inviti, kun fakultativan "
 "invitmesaĝon."
 
-#: ../gtk/gtkconv.c:870
+#: ../gtk/gtkconv.c:868
 msgid "_Buddy:"
 msgstr "K_unul:"
 
-#: ../gtk/gtkconv.c:890 ../gtk/gtksavedstatuses.c:1111
+#: ../gtk/gtkconv.c:888 ../gtk/gtksavedstatuses.c:1111
 #: ../gtk/gtksavedstatuses.c:1447
 msgid "_Message:"
 msgstr "_Mesaĝo:"
 
-#: ../gtk/gtkconv.c:947 ../gtk/gtkconv.c:2400 ../gtk/gtkdebug.c:218
+#: ../gtk/gtkconv.c:945 ../gtk/gtkconv.c:2398 ../gtk/gtkdebug.c:218
 #: ../gtk/gtkft.c:542
 msgid "Unable to open file."
 msgstr "Dosiero malfermeblas."
 
-#: ../gtk/gtkconv.c:953
+#: ../gtk/gtkconv.c:951
 #, c-format
 msgid "<h1>Conversation with %s</h1>\n"
 msgstr "<h1>Konversacio kun %s</h1>\n"
 
-#: ../gtk/gtkconv.c:977
+#: ../gtk/gtkconv.c:975
 msgid "Save Conversation"
 msgstr "Konservu Konversacion"
 
-#: ../gtk/gtkconv.c:1124 ../gtk/gtkdebug.c:166 ../gtk/gtkdebug.c:756
+#: ../gtk/gtkconv.c:1122 ../gtk/gtkdebug.c:166 ../gtk/gtkdebug.c:756
 msgid "Find"
 msgstr "Trovu"
 
-#: ../gtk/gtkconv.c:1150 ../gtk/gtkdebug.c:194
+#: ../gtk/gtkconv.c:1148 ../gtk/gtkdebug.c:194
 msgid "_Search for:"
-msgstr "_Serĉu:"
-
-#: ../gtk/gtkconv.c:1321
+msgstr "_Trovu:"
+
+#: ../gtk/gtkconv.c:1319
 msgid "Logging started. Future messages in this conversation will be logged."
 msgstr ""
 
-#: ../gtk/gtkconv.c:1329
+#: ../gtk/gtkconv.c:1327
 msgid "Logging stopped. Future messages in this conversation will not be logged."
 msgstr ""
 
-#: ../gtk/gtkconv.c:1597
+#: ../gtk/gtkconv.c:1595
 msgid "Un-Ignore"
 msgstr "Malignoru"
 
-#: ../gtk/gtkconv.c:1600
+#: ../gtk/gtkconv.c:1598
 msgid "Ignore"
 msgstr "Ignoru"
 
-#: ../gtk/gtkconv.c:1620
+#: ../gtk/gtkconv.c:1618
 msgid "Get Away Message"
 msgstr "Montru Formesaĝon"
 
-#: ../gtk/gtkconv.c:1643
+#: ../gtk/gtkconv.c:1641
 msgid "Last said"
 msgstr "Laste diris"
 
-#: ../gtk/gtkconv.c:2408
+#: ../gtk/gtkconv.c:2406
 msgid "Unable to save icon file to disk."
-msgstr "Ne eblas konservi piktogramodosieron al disko."
+msgstr ""
+
+#: ../gtk/gtkconv.c:2430
+msgid "Save Icon"
+msgstr "Konservu Piktogramon"
 
 #: ../gtk/gtkconv.c:2479
-msgid "Save Icon"
-msgstr "Konservu Piktogramon"
-
-#: ../gtk/gtkconv.c:2528
 msgid "Animate"
 msgstr "Animaciigi"
 
-#: ../gtk/gtkconv.c:2533
+#: ../gtk/gtkconv.c:2484
 msgid "Hide Icon"
 msgstr "Kaŝu Piktogramon"
 
-#: ../gtk/gtkconv.c:2536
+#: ../gtk/gtkconv.c:2490
 msgid "Save Icon As..."
 msgstr "Konservu Piktogramon Kiel..."
 
-#: ../gtk/gtkconv.c:2540
-msgid "Set Custom Icon..."
-msgstr "Difinu Propran Piktogramon..."
-
-#: ../gtk/gtkconv.c:2547
-msgid "Remove Custom Icon"
-msgstr "Forigu Propran Piktogramon"
-
 #. Conversation menu
-#: ../gtk/gtkconv.c:2688
+#: ../gtk/gtkconv.c:2630
 msgid "/_Conversation"
 msgstr "/_Konversacio"
 
-#: ../gtk/gtkconv.c:2690
+#: ../gtk/gtkconv.c:2632
 msgid "/Conversation/New Instant _Message..."
 msgstr "/Konversacio/Nova Tuj _Mesaĝo..."
 
-#: ../gtk/gtkconv.c:2695
+#: ../gtk/gtkconv.c:2637
 msgid "/Conversation/_Find..."
 msgstr "/Konversacio/_Trovu..."
 
-#: ../gtk/gtkconv.c:2697
+#: ../gtk/gtkconv.c:2639
 msgid "/Conversation/View _Log"
 msgstr "/Konversacio/Montru _Protokolon"
 
-#: ../gtk/gtkconv.c:2698
+#: ../gtk/gtkconv.c:2640
 msgid "/Conversation/_Save As..."
 msgstr "/Konversacio/_Konservu Kiel..."
 
-#: ../gtk/gtkconv.c:2700
+#: ../gtk/gtkconv.c:2642
 msgid "/Conversation/Clea_r Scrollback"
 msgstr "/Konversacio/Fo_rviŝu Dialogon"
 
-#: ../gtk/gtkconv.c:2704
+#: ../gtk/gtkconv.c:2646
 msgid "/Conversation/Se_nd File..."
 msgstr "/Konversacio/Se_ndu Dosieron..."
 
-#: ../gtk/gtkconv.c:2705
+#: ../gtk/gtkconv.c:2647
 msgid "/Conversation/Add Buddy _Pounce..."
 msgstr "/Konversacio/Aldonu Kunul-_Atentigon..."
 
-#: ../gtk/gtkconv.c:2707
+#: ../gtk/gtkconv.c:2649
 msgid "/Conversation/_Get Info"
 msgstr "/Konversatio/_Ricevu Informon"
 
-#: ../gtk/gtkconv.c:2709
+#: ../gtk/gtkconv.c:2651
 msgid "/Conversation/In_vite..."
 msgstr "/Konversacio/In_vitu..."
 
-#: ../gtk/gtkconv.c:2711
+#: ../gtk/gtkconv.c:2653
 msgid "/Conversation/M_ore"
 msgstr "/Konversacio/_Pli"
 
-#: ../gtk/gtkconv.c:2715
+#: ../gtk/gtkconv.c:2657
 msgid "/Conversation/Al_ias..."
 msgstr "/Konversacio/Al_inomo..."
 
-#: ../gtk/gtkconv.c:2717
+#: ../gtk/gtkconv.c:2659
 msgid "/Conversation/_Block..."
 msgstr "/KConversacio/_Bloku..."
 
-#: ../gtk/gtkconv.c:2719
+#: ../gtk/gtkconv.c:2661
 msgid "/Conversation/_Add..."
 msgstr "/Konversacio/_Aldonu..."
 
-#: ../gtk/gtkconv.c:2721
+#: ../gtk/gtkconv.c:2663
 msgid "/Conversation/_Remove..."
 msgstr "/Konversacio/_Forigu..."
 
-#: ../gtk/gtkconv.c:2726
+#: ../gtk/gtkconv.c:2668
 msgid "/Conversation/Insert Lin_k..."
 msgstr "/Konversacio/Enmetu Ligi_lon..."
 
-#: ../gtk/gtkconv.c:2728
+#: ../gtk/gtkconv.c:2670
 msgid "/Conversation/Insert Imag_e..."
 msgstr "/Konversacio/Enm_etu Bildon..."
 
-#: ../gtk/gtkconv.c:2733
+#: ../gtk/gtkconv.c:2675
 msgid "/Conversation/_Close"
 msgstr "/Konversacio/_Fermu"
 
 #. Options
-#: ../gtk/gtkconv.c:2737
+#: ../gtk/gtkconv.c:2679
 msgid "/_Options"
 msgstr "/_Opcioj"
 
-#: ../gtk/gtkconv.c:2738
+#: ../gtk/gtkconv.c:2680
 msgid "/Options/Enable _Logging"
 msgstr "/Opcioj/Ŝaltu _Protokoladon"
 
-#: ../gtk/gtkconv.c:2739
+#: ../gtk/gtkconv.c:2681
 msgid "/Options/Enable _Sounds"
 msgstr "/Opcioj/Ŝaltu _Sonojn"
 
-#: ../gtk/gtkconv.c:2740
+#: ../gtk/gtkconv.c:2682
 msgid "/Options/Show Buddy _Icon"
 msgstr "/Opcioj/Montru Kunul-P_iktogramon"
 
-#: ../gtk/gtkconv.c:2742
+#: ../gtk/gtkconv.c:2684
 msgid "/Options/Show Formatting _Toolbars"
 msgstr "/Opcioj/Montru Formato-_Illistelojn"
 
-#: ../gtk/gtkconv.c:2743
+#: ../gtk/gtkconv.c:2685
 msgid "/Options/Show Ti_mestamps"
 msgstr "/Opcioj/Montru Te_mpomarkojn"
 
-#: ../gtk/gtkconv.c:2818
+#: ../gtk/gtkconv.c:2760
 msgid "/Conversation/More"
-msgstr "/Konversacio/Pli"
-
-#. The menubar has been deactivated. Make sure the 'More' submenu is regenerated next time
-#. * the 'Conversation' menu pops up.
-#. Make sure the 'Conversation -> More' menuitems are regenerated whenever
-#. * the 'Conversation' menu pops up because the entries can change after the
-#. * conversation is created.
-#: ../gtk/gtkconv.c:2863 ../gtk/gtkconv.c:2895
+msgstr "/Konversacio/_Pli"
+
+#: ../gtk/gtkconv.c:2798 ../gtk/gtkconv.c:2825
 msgid "/Conversation"
-msgstr "/Konversacio"
-
-#: ../gtk/gtkconv.c:2903
+msgstr "/_Konversacio"
+
+#: ../gtk/gtkconv.c:2835
 msgid "/Conversation/View Log"
 msgstr "/Konversacio/Montru Protokoladon"
 
-#: ../gtk/gtkconv.c:2909
+#: ../gtk/gtkconv.c:2841
 msgid "/Conversation/Send File..."
 msgstr "/Konversacio/Sendu Dosieron..."
 
-#: ../gtk/gtkconv.c:2913
+#: ../gtk/gtkconv.c:2845
 msgid "/Conversation/Add Buddy Pounce..."
 msgstr "/Konversacio/Aldonu Kunul-Atentijon..."
 
-#: ../gtk/gtkconv.c:2919
+#: ../gtk/gtkconv.c:2851
 msgid "/Conversation/Get Info"
 msgstr "/Konversacio/Ricevu Informon"
 
-#: ../gtk/gtkconv.c:2923
+#: ../gtk/gtkconv.c:2855
 msgid "/Conversation/Invite..."
 msgstr "/Konversacio/Invitu..."
 
-#: ../gtk/gtkconv.c:2929
+#: ../gtk/gtkconv.c:2861
 msgid "/Conversation/Alias..."
 msgstr "/Konversacio/Alinomo..."
 
-#: ../gtk/gtkconv.c:2933
+#: ../gtk/gtkconv.c:2865
 msgid "/Conversation/Block..."
 msgstr "/Konversacio/Bloku..."
 
-#: ../gtk/gtkconv.c:2937
+#: ../gtk/gtkconv.c:2869
 msgid "/Conversation/Add..."
 msgstr "/Konversacion/Aldonu..."
 
-#: ../gtk/gtkconv.c:2941
+#: ../gtk/gtkconv.c:2873
 msgid "/Conversation/Remove..."
 msgstr "/Konversacio/Forigu..."
 
-#: ../gtk/gtkconv.c:2947
+#: ../gtk/gtkconv.c:2879
 msgid "/Conversation/Insert Link..."
 msgstr "/Konversacio/Enmetu Ligilon..."
 
-#: ../gtk/gtkconv.c:2951
+#: ../gtk/gtkconv.c:2883
 msgid "/Conversation/Insert Image..."
 msgstr "/Konversacio/Enmetu Bildon..."
 
-#: ../gtk/gtkconv.c:2957
+#: ../gtk/gtkconv.c:2889
 msgid "/Options/Enable Logging"
 msgstr "/Opcioj/Ŝaltu Protokoladon"
 
-#: ../gtk/gtkconv.c:2960
+#: ../gtk/gtkconv.c:2892
 msgid "/Options/Enable Sounds"
 msgstr "/Opcioj/Ŝaltu Sonojn"
 
-#: ../gtk/gtkconv.c:2973
+#: ../gtk/gtkconv.c:2905
 msgid "/Options/Show Formatting Toolbars"
 msgstr "/Opcioj/Montru Formato-Illistelojn"
 
-#: ../gtk/gtkconv.c:2976
+#: ../gtk/gtkconv.c:2908
 msgid "/Options/Show Timestamps"
 msgstr "/Opcioj/Montru Tempomarkojn"
 
-#: ../gtk/gtkconv.c:2979
+#: ../gtk/gtkconv.c:2911
 msgid "/Options/Show Buddy Icon"
 msgstr "/Opcioj/Montru Kunul-Piktogramon"
 
-#: ../gtk/gtkconv.c:3055
+#: ../gtk/gtkconv.c:2987
 msgid "User is typing..."
 msgstr "Uzanto tajpas..."
 
-#: ../gtk/gtkconv.c:3058
+#: ../gtk/gtkconv.c:2990
 msgid "User has typed something and stopped"
 msgstr "Uzanto tajpis ion kaj haltis"
 
 #. Build the Send To menu
-#: ../gtk/gtkconv.c:3241
+#: ../gtk/gtkconv.c:3173
 msgid "_Send To"
 msgstr "_Sendu Al"
 
-#: ../gtk/gtkconv.c:3948
+#: ../gtk/gtkconv.c:3875
 msgid "_Send"
 msgstr "_Sendu"
 
-#: ../gtk/gtkconv.c:4002 ../libgaim/protocols/sametime/sametime.c:3595
+#: ../gtk/gtkconv.c:3929 ../libgaim/protocols/sametime/sametime.c:3560
 msgid "Topic:"
 msgstr "Temo:"
 
 #. Setup the label telling how many people are in the room.
-#: ../gtk/gtkconv.c:4054
+#: ../gtk/gtkconv.c:3981
 msgid "0 people in room"
 msgstr "0 homo en ĉambro"
 
-#: ../gtk/gtkconv.c:5101 ../gtk/gtkconv.c:5222
+#: ../gtk/gtkconv.c:5028 ../gtk/gtkconv.c:5149
 #, c-format
 msgid "%d person in room"
 msgid_plural "%d people in room"
 msgstr[0] "%d homo en ĉambro"
 msgstr[1] "%d homoj en ĉambro"
 
-#: ../gtk/gtkconv.c:5775 ../gtk/gtkstatusbox.c:541
+#: ../gtk/gtkconv.c:5702 ../gtk/gtkstatusbox.c:541
 msgid "Typing"
 msgstr "Tajpante"
 
-#: ../gtk/gtkconv.c:5781
+#: ../gtk/gtkconv.c:5708
 msgid "Stopped Typing"
 msgstr "Ekmaltajpas"
 
-#: ../gtk/gtkconv.c:5786
+#: ../gtk/gtkconv.c:5713
 msgid "Nick Said"
 msgstr "Karesnomo Diris"
 
-#: ../gtk/gtkconv.c:5791 ../gtk/gtkdocklet.c:500
+#: ../gtk/gtkconv.c:5718 ../gtk/gtkdocklet.c:463
 msgid "Unread Messages"
 msgstr "Nelegitaj mesaĝoj"
 
-#: ../gtk/gtkconv.c:5796
+#: ../gtk/gtkconv.c:5723
 msgid "New Event"
 msgstr "Nova Evento"
 
-#: ../gtk/gtkconv.c:6910
+#: ../gtk/gtkconv.c:6818
 msgid "Confirm close"
 msgstr "Konfirmu fermon"
 
-#: ../gtk/gtkconv.c:6942
+#: ../gtk/gtkconv.c:6850
 msgid "You have unread messages. Are you sure you want to close the window?"
 msgstr "Vi havas nelegitajn mesaĝojn. Ĉu vi certas vi volas fermi la fenestron?"
 
-#: ../gtk/gtkconv.c:7477
+#: ../gtk/gtkconv.c:7385
 msgid "Close other tabs"
 msgstr "Fermu aliajn langetojn"
 
-#: ../gtk/gtkconv.c:7483
+#: ../gtk/gtkconv.c:7391
 msgid "Close all tabs"
 msgstr "Fermu ĉiujn langetojn"
 
-#: ../gtk/gtkconv.c:7491
+#: ../gtk/gtkconv.c:7399
 msgid "Detach this tab"
 msgstr "Deigu tiun langeton"
 
-#: ../gtk/gtkconv.c:7497
+#: ../gtk/gtkconv.c:7405
 msgid "Close this tab"
 msgstr "Fermu tiun langeton"
 
-#: ../gtk/gtkconv.c:7765
+#: ../gtk/gtkconv.c:7672
 msgid "Close conversation"
 msgstr "Fermu konversacion"
 
-#: ../gtk/gtkconv.c:8229
+#: ../gtk/gtkconv.c:8136
 msgid "Last created window"
 msgstr "Lasta kreita fenestro"
 
-#: ../gtk/gtkconv.c:8231
+#: ../gtk/gtkconv.c:8138
 msgid "Separate IM and Chat windows"
 msgstr "Disigu TM-aj kaj Babilejajn fenestrojn"
 
-#: ../gtk/gtkconv.c:8233 ../gtk/gtkprefs.c:1297
+#: ../gtk/gtkconv.c:8140 ../gtk/gtkprefs.c:1263
 msgid "New window"
 msgstr "Nova fenestro"
 
-#: ../gtk/gtkconv.c:8235
+#: ../gtk/gtkconv.c:8142
 msgid "By group"
 msgstr "Laŭ grupo"
 
-#: ../gtk/gtkconv.c:8237
+#: ../gtk/gtkconv.c:8144
 msgid "By account"
 msgstr "Laŭ konto"
 
@@ -2199,15 +2161,15 @@
 msgid "Fatal Error"
 msgstr "Fatala Eraro"
 
-#: ../gtk/gtkdialogs.c:66 ../gtk/gtkdialogs.c:110
+#: ../gtk/gtkdialogs.c:66 ../gtk/gtkdialogs.c:109
 msgid "lead developer"
 msgstr "ĉefa programisto"
 
 #: ../gtk/gtkdialogs.c:67 ../gtk/gtkdialogs.c:68 ../gtk/gtkdialogs.c:69
 #: ../gtk/gtkdialogs.c:70 ../gtk/gtkdialogs.c:71 ../gtk/gtkdialogs.c:73
 #: ../gtk/gtkdialogs.c:74 ../gtk/gtkdialogs.c:75 ../gtk/gtkdialogs.c:76
-#: ../gtk/gtkdialogs.c:77 ../gtk/gtkdialogs.c:78 ../gtk/gtkdialogs.c:81
-#: ../gtk/gtkdialogs.c:82 ../gtk/gtkdialogs.c:83
+#: ../gtk/gtkdialogs.c:77 ../gtk/gtkdialogs.c:78 ../gtk/gtkdialogs.c:80
+#: ../gtk/gtkdialogs.c:81 ../gtk/gtkdialogs.c:82
 msgid "developer"
 msgstr "programisto"
 
@@ -2219,311 +2181,319 @@
 msgid "support"
 msgstr "subteno"
 
-#: ../gtk/gtkdialogs.c:80
-msgid "support/QA"
-msgstr "subteno/Kvalitkontrolo"
-
-#: ../gtk/gtkdialogs.c:102
+#: ../gtk/gtkdialogs.c:101
 msgid "win32 port"
 msgstr "win32 portebliĝo"
 
-#: ../gtk/gtkdialogs.c:103 ../gtk/gtkdialogs.c:104
+#: ../gtk/gtkdialogs.c:102 ../gtk/gtkdialogs.c:103
 msgid "maintainer"
 msgstr "vartulo"
 
-#: ../gtk/gtkdialogs.c:105
+#: ../gtk/gtkdialogs.c:104
 msgid "libfaim maintainer"
 msgstr "libfaim vartulo"
 
 #. If "lazy bum" translates literally into a serious insult, use something else or omit it.
-#: ../gtk/gtkdialogs.c:107
+#: ../gtk/gtkdialogs.c:106
 msgid "hacker and designated driver [lazy bum]"
 msgstr "artifikulo kaj speciala pelilo"
 
-#: ../gtk/gtkdialogs.c:108
+#: ../gtk/gtkdialogs.c:107
 msgid "Jabber developer"
 msgstr "Jabber programisto"
 
-#: ../gtk/gtkdialogs.c:109
+#: ../gtk/gtkdialogs.c:108
 msgid "original author"
 msgstr "originala aŭtoro"
 
-#: ../gtk/gtkdialogs.c:116
+#: ../gtk/gtkdialogs.c:115
 msgid "Arabic"
 msgstr "Araba"
 
-#: ../gtk/gtkdialogs.c:117 ../gtk/gtkdialogs.c:118 ../gtk/gtkdialogs.c:187
+#: ../gtk/gtkdialogs.c:116 ../gtk/gtkdialogs.c:117 ../gtk/gtkdialogs.c:184
 msgid "Bulgarian"
 msgstr "Bulgara"
 
-#: ../gtk/gtkdialogs.c:119 ../gtk/gtkdialogs.c:120
+#: ../gtk/gtkdialogs.c:118 ../gtk/gtkdialogs.c:119
 msgid "Bengali"
 msgstr "Bengala"
 
-#: ../gtk/gtkdialogs.c:121
+#: ../gtk/gtkdialogs.c:120
 msgid "Bosnian"
 msgstr "Bosna"
 
-#: ../gtk/gtkdialogs.c:122 ../gtk/gtkdialogs.c:188 ../gtk/gtkdialogs.c:189
+#: ../gtk/gtkdialogs.c:121 ../gtk/gtkdialogs.c:185 ../gtk/gtkdialogs.c:186
 msgid "Catalan"
 msgstr "Kataluna"
 
-#: ../gtk/gtkdialogs.c:123 ../gtk/gtkdialogs.c:124
+#: ../gtk/gtkdialogs.c:122 ../gtk/gtkdialogs.c:123
 msgid "Valencian-Catalan"
 msgstr "Valenciana"
 
-#: ../gtk/gtkdialogs.c:125 ../gtk/gtkdialogs.c:190
+#: ../gtk/gtkdialogs.c:124 ../gtk/gtkdialogs.c:187
 msgid "Czech"
 msgstr "Ĉeĥa"
 
-#: ../gtk/gtkdialogs.c:126
+#: ../gtk/gtkdialogs.c:125
 msgid "Danish"
 msgstr "Dana"
 
-#: ../gtk/gtkdialogs.c:127 ../gtk/gtkdialogs.c:128 ../gtk/gtkdialogs.c:191
+#: ../gtk/gtkdialogs.c:126 ../gtk/gtkdialogs.c:127 ../gtk/gtkdialogs.c:188
 msgid "German"
 msgstr "Germana"
 
-#: ../gtk/gtkdialogs.c:129 ../gtk/gtkdialogs.c:130
+#: ../gtk/gtkdialogs.c:128 ../gtk/gtkdialogs.c:129
 msgid "Greek"
 msgstr "Greka"
 
-#: ../gtk/gtkdialogs.c:131
+#: ../gtk/gtkdialogs.c:130
 msgid "Australian English"
 msgstr "Aŭstrala Angla"
 
+#: ../gtk/gtkdialogs.c:131
+msgid "Canadian English"
+msgstr "Kanada Angla"
+
 #: ../gtk/gtkdialogs.c:132
-msgid "Canadian English"
-msgstr "Kanada Angla"
+msgid "British English"
+msgstr "Brita Angla"
 
 #: ../gtk/gtkdialogs.c:133
-msgid "British English"
-msgstr "Brita Angla"
-
-#: ../gtk/gtkdialogs.c:134
 msgid "Esperanto"
 msgstr "Esperanto"
 
-#: ../gtk/gtkdialogs.c:135 ../gtk/gtkdialogs.c:192 ../gtk/gtkdialogs.c:193
-#: ../gtk/gtkdialogs.c:194 ../gtk/gtkdialogs.c:195
+#: ../gtk/gtkdialogs.c:134 ../gtk/gtkdialogs.c:189 ../gtk/gtkdialogs.c:190
+#: ../gtk/gtkdialogs.c:191 ../gtk/gtkdialogs.c:192
 msgid "Spanish"
 msgstr "Hispana"
 
-#: ../gtk/gtkdialogs.c:136 ../gtk/gtkdialogs.c:137
+#: ../gtk/gtkdialogs.c:135 ../gtk/gtkdialogs.c:136
 msgid "Euskera(Basque)"
 msgstr "Eŭska"
 
-#: ../gtk/gtkdialogs.c:138 ../gtk/gtkdialogs.c:139 ../gtk/gtkdialogs.c:140
+#: ../gtk/gtkdialogs.c:137 ../gtk/gtkdialogs.c:138
 msgid "Persian"
 msgstr "Persa"
 
-#: ../gtk/gtkdialogs.c:141 ../gtk/gtkdialogs.c:196 ../gtk/gtkdialogs.c:197
+#: ../gtk/gtkdialogs.c:139 ../gtk/gtkdialogs.c:193 ../gtk/gtkdialogs.c:194
 msgid "Finnish"
 msgstr "Finna"
 
-#: ../gtk/gtkdialogs.c:142 ../gtk/gtkdialogs.c:198 ../gtk/gtkdialogs.c:199
-#: ../gtk/gtkdialogs.c:200 ../gtk/gtkdialogs.c:201
+#: ../gtk/gtkdialogs.c:140 ../gtk/gtkdialogs.c:195 ../gtk/gtkdialogs.c:196
+#: ../gtk/gtkdialogs.c:197 ../gtk/gtkdialogs.c:198
 msgid "French"
 msgstr "Franca"
 
-#: ../gtk/gtkdialogs.c:143
+#: ../gtk/gtkdialogs.c:141
 msgid "Galician"
 msgstr "Galega"
 
-#: ../gtk/gtkdialogs.c:144 ../gtk/gtkdialogs.c:145
+#: ../gtk/gtkdialogs.c:142 ../gtk/gtkdialogs.c:143
 msgid "Gujarati"
 msgstr "Guĝarata"
 
-#: ../gtk/gtkdialogs.c:146 ../gtk/gtkdialogs.c:202
+#: ../gtk/gtkdialogs.c:144 ../gtk/gtkdialogs.c:199
 msgid "Hebrew"
 msgstr "Hebrea"
 
-#: ../gtk/gtkdialogs.c:147
+#: ../gtk/gtkdialogs.c:145
 msgid "Hindi"
 msgstr "Hindia"
 
-#: ../gtk/gtkdialogs.c:148
+#: ../gtk/gtkdialogs.c:146
 msgid "Hungarian"
 msgstr "Hungara"
 
-#: ../gtk/gtkdialogs.c:149 ../gtk/gtkdialogs.c:203
+#: ../gtk/gtkdialogs.c:147 ../gtk/gtkdialogs.c:200
 msgid "Italian"
 msgstr "Itala"
 
-#: ../gtk/gtkdialogs.c:150 ../gtk/gtkdialogs.c:204 ../gtk/gtkdialogs.c:205
-#: ../gtk/gtkdialogs.c:206
+#: ../gtk/gtkdialogs.c:148 ../gtk/gtkdialogs.c:201 ../gtk/gtkdialogs.c:202
+#: ../gtk/gtkdialogs.c:203
 msgid "Japanese"
 msgstr "Japana"
 
-#: ../gtk/gtkdialogs.c:151 ../gtk/gtkdialogs.c:207
+#: ../gtk/gtkdialogs.c:149 ../gtk/gtkdialogs.c:204
 msgid "Georgian"
 msgstr "Kartvela"
 
-#: ../gtk/gtkdialogs.c:152 ../gtk/gtkdialogs.c:208
+#: ../gtk/gtkdialogs.c:150 ../gtk/gtkdialogs.c:205
 msgid "Korean"
 msgstr "Korea"
 
-#: ../gtk/gtkdialogs.c:153 ../gtk/gtkdialogs.c:154 ../gtk/gtkdialogs.c:155
+#: ../gtk/gtkdialogs.c:151 ../gtk/gtkdialogs.c:152 ../gtk/gtkdialogs.c:153
 msgid "Kurdish"
 msgstr "Kurda"
 
-#: ../gtk/gtkdialogs.c:156 ../gtk/gtkdialogs.c:209 ../gtk/gtkdialogs.c:210
+#: ../gtk/gtkdialogs.c:154 ../gtk/gtkdialogs.c:206 ../gtk/gtkdialogs.c:207
 msgid "Lithuanian"
 msgstr "Litova"
 
-#: ../gtk/gtkdialogs.c:157
+#: ../gtk/gtkdialogs.c:155
 msgid "Macedonian"
 msgstr "Makedona"
 
-#: ../gtk/gtkdialogs.c:158
+#: ../gtk/gtkdialogs.c:156
 msgid "Nepali"
 msgstr "Nepala"
 
-#: ../gtk/gtkdialogs.c:159
+#: ../gtk/gtkdialogs.c:157
 msgid "Dutch, Flemish"
 msgstr "Nederlanda, Flandra"
 
-#: ../gtk/gtkdialogs.c:160
+#: ../gtk/gtkdialogs.c:158
 msgid "Norwegian"
 msgstr "Norvega"
 
-#: ../gtk/gtkdialogs.c:161 ../gtk/gtkdialogs.c:162 ../gtk/gtkdialogs.c:211
+#: ../gtk/gtkdialogs.c:159 ../gtk/gtkdialogs.c:160 ../gtk/gtkdialogs.c:208
 msgid "Polish"
 msgstr "Pola"
 
-#: ../gtk/gtkdialogs.c:163
+#: ../gtk/gtkdialogs.c:161
 msgid "Portuguese"
 msgstr "Portugala"
 
-#: ../gtk/gtkdialogs.c:164
+#: ../gtk/gtkdialogs.c:162
 msgid "Portuguese-Brazil"
 msgstr "Brazil-Portugala"
 
-#: ../gtk/gtkdialogs.c:165
+#: ../gtk/gtkdialogs.c:163
 msgid "Romanian"
 msgstr "Rumana"
 
-#: ../gtk/gtkdialogs.c:166 ../gtk/gtkdialogs.c:212 ../gtk/gtkdialogs.c:213
+#: ../gtk/gtkdialogs.c:164 ../gtk/gtkdialogs.c:209 ../gtk/gtkdialogs.c:210
 msgid "Russian"
 msgstr "Rusa"
 
-#: ../gtk/gtkdialogs.c:167 ../gtk/gtkdialogs.c:168
+#: ../gtk/gtkdialogs.c:165 ../gtk/gtkdialogs.c:166
 msgid "Serbian"
 msgstr "Serba"
 
-#: ../gtk/gtkdialogs.c:169 ../gtk/gtkdialogs.c:214
+#: ../gtk/gtkdialogs.c:167 ../gtk/gtkdialogs.c:211
 msgid "Slovak"
 msgstr "Slovaka"
 
-#: ../gtk/gtkdialogs.c:170 ../gtk/gtkdialogs.c:215
+#: ../gtk/gtkdialogs.c:168
 msgid "Slovenian"
 msgstr "Slovena"
 
+#: ../gtk/gtkdialogs.c:169 ../gtk/gtkdialogs.c:212
+msgid "Swedish"
+msgstr "Sveda"
+
+#: ../gtk/gtkdialogs.c:170
+msgid "Tamil"
+msgstr "Tamila"
+
 #: ../gtk/gtkdialogs.c:171
-msgid "Albanian"
-msgstr "Albana"
-
-#: ../gtk/gtkdialogs.c:172 ../gtk/gtkdialogs.c:216
-msgid "Swedish"
-msgstr "Sveda"
+msgid "Telugu"
+msgstr "Telugua"
+
+#: ../gtk/gtkdialogs.c:172
+msgid "Thai"
+msgstr "Taja"
 
 #: ../gtk/gtkdialogs.c:173
-msgid "Tamil"
-msgstr "Tamila"
+msgid "Turkish"
+msgstr "Turka"
 
 #: ../gtk/gtkdialogs.c:174
-msgid "Telugu"
-msgstr "Telugua"
-
-#: ../gtk/gtkdialogs.c:175
-msgid "Thai"
-msgstr "Taja"
-
-#: ../gtk/gtkdialogs.c:176
-msgid "Turkish"
-msgstr "Turka"
-
-#: ../gtk/gtkdialogs.c:177
 msgid "Vietnamese"
 msgstr "Vjetnama"
 
-#: ../gtk/gtkdialogs.c:177
+#: ../gtk/gtkdialogs.c:174
 msgid "T.M.Thanh and the Gnome-Vi Team"
 msgstr "T.M.Thanh kaj la Gnome-Vi Teamo"
 
-#: ../gtk/gtkdialogs.c:178 ../gtk/gtkdialogs.c:217
+#: ../gtk/gtkdialogs.c:175 ../gtk/gtkdialogs.c:213
 msgid "Simplified Chinese"
 msgstr "Simpligita Ĉina"
 
-#: ../gtk/gtkdialogs.c:179 ../gtk/gtkdialogs.c:180 ../gtk/gtkdialogs.c:218
+#: ../gtk/gtkdialogs.c:176 ../gtk/gtkdialogs.c:177 ../gtk/gtkdialogs.c:214
 msgid "Traditional Chinese"
 msgstr "Tradicia Ĉina"
 
-#: ../gtk/gtkdialogs.c:186
+#: ../gtk/gtkdialogs.c:183
 msgid "Amharic"
 msgstr "Amhara"
 
-#: ../gtk/gtkdialogs.c:299
+#: ../gtk/gtkdialogs.c:295
 msgid "About Gaim"
 msgstr "Pri Gaim"
 
-#: ../gtk/gtkdialogs.c:333
+#: ../gtk/gtkdialogs.c:329
 msgid ""
 "Gaim is a modular messaging client capable of using AIM, MSN, Yahoo!, "
-"Jabber, ICQ, IRC, SILC, SIP/SIMPLENovell GroupWise, Lotus Sametime, Bonjour, "
-"Zephyr, Gadu-Gadu, and QQ all at once.  It is written using GTK+.<BR><BR>You "
-"may modify and redistribute the program under the terms of the GPL (version "
-"2 or later).  A copy of the GPL is contained in the 'COPYING' file "
-"distributed with Gaim.  Gaim is copyrighted by its contributors.  See the "
-"'COPYRIGHT' file for the complete list of contributors.  We provide no "
-"warranty for this program.<BR><BR>"
+"Jabber, ICQ, IRC, SILC, Novell GroupWise, Lotus Sametime, Zephyr, Gadu-Gadu, "
+"and QQ all at once.  It is written using GTK+.<BR><BR>You may modify and "
+"redistribute the program under the terms of the GPL (version 2 or later).  A "
+"copy of the GPL is contained in the 'COPYING' file distributed with Gaim.  "
+"Gaim 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 ""
 "Gaim estas modula mesaĝokliento, kapablas uzi AIM, MSN, Yahoo!, Jabber, ICQ, "
-"IRC, SILC, SIP/SIMPLENovell GroupWise, Lotus Sametime, Bonjour, Zephyr, Gadu-Gadu kaj QQ ĉiujn "
-"samtempe.  Ĝi estas programita per GTK+.<BR><BR>Vi rajtas modifi kaj "
-"pludistribui la programon je la kondiĉoj de la GPL (versio 2 aŭ posta).  "
-"Ekzempleron de la GPL-o enhavas la dosiero 'COPYING' disdonita kun Gaim.  "
-"Gaim estas aŭtorrajtigita de kontribuantoj.  Vidu la dosieron 'COPYRIGHT' "
-"pri kompleta listo de kontribuantoj.  Ni provizas nenian garantion pri tiu "
-"programaro.<BR><BR>"
-
-#: ../gtk/gtkdialogs.c:348
+"IRC, SILC, Novell GroupWise, Lotus Sametime, Zephyr, Gadu-Gadu kaj QQ "
+"ĉiujn samtempe.  Ĝi estas programita per GTK+.<BR><BR>Vi rajtas modifi kaj "
+"pludistribui la programon je la kondiĉoj de la GPL (versio 2 aŭ posta)."
+"  Ekzempleron de la GPL-o enhavas la dosiero "
+"'COPYING' disdonita kun Gaim.  Gaim estas aŭtorrajtigita de kontribuantoj.  "
+"Vidu la dosieron 'COPYRIGHT' pri kompleta listo de kontribuantoj.  Ni "
+"provizas nenian garantion pri tiu programaro.<BR><BR>"
+
+#: ../gtk/gtkdialogs.c:343
 msgid "<FONT SIZE=\"4\">IRC:</FONT> #wingaim on irc.freenode.net<BR><BR>"
 msgstr "<FONT SIZE=\"4\">IRC:</FONT> #wingaim ĉe irc.freenode.net<BR><BR>"
 
-#: ../gtk/gtkdialogs.c:351
+#: ../gtk/gtkdialogs.c:346
 msgid "<FONT SIZE=\"4\">IRC:</FONT> #gaim on irc.freenode.net<BR><BR>"
 msgstr "<FONT SIZE=\"4\">IRC:</FONT> #gaim ĉe irc.freenode.net<BR><BR>"
 
-#: ../gtk/gtkdialogs.c:357
+#: ../gtk/gtkdialogs.c:352
 msgid "Current Developers"
 msgstr "Aktualaj Programistoj"
 
-#: ../gtk/gtkdialogs.c:372
+#: ../gtk/gtkdialogs.c:367
 msgid "Crazy Patch Writers"
 msgstr "Frenezaj Flikistoj"
 
-#: ../gtk/gtkdialogs.c:387
+#: ../gtk/gtkdialogs.c:382
 msgid "Retired Developers"
 msgstr "Emeritaj Programistoj"
 
-#: ../gtk/gtkdialogs.c:402
+#: ../gtk/gtkdialogs.c:397
 msgid "Current Translators"
 msgstr "Aktualaj Tradukantoj"
 
-#: ../gtk/gtkdialogs.c:422
+#: ../gtk/gtkdialogs.c:417
 msgid "Past Translators"
 msgstr "Pastintaj Tradukantoj"
 
-#: ../gtk/gtkdialogs.c:440
+#: ../gtk/gtkdialogs.c:435
 msgid "Debugging Information"
 msgstr "Sencimiga Informo"
 
-#: ../gtk/gtkdialogs.c:814
+#: ../gtk/gtkdialogs.c:649 ../gtk/gtkdialogs.c:786 ../gtk/gtkdialogs.c:866
+msgid "_Name"
+msgstr "_Nomo"
+
+#: ../gtk/gtkdialogs.c:654 ../gtk/gtkdialogs.c:791 ../gtk/gtkdialogs.c:871
+msgid "_Account"
+msgstr "_Konto"
+
+#: ../gtk/gtkdialogs.c:662
+msgid "New Instant Message"
+msgstr "Nova Tuj Mesaĝo"
+
+#: ../gtk/gtkdialogs.c:664
+msgid "Please enter the screen name or alias of the person you would like to IM."
+msgstr "B.v. enigi la ekrannomon aŭ alinomon de persono kiun vi dezrias TM-i."
+
+#: ../gtk/gtkdialogs.c:799
 msgid "Get User Info"
 msgstr "Ricevu Uzanto-Informon"
 
-#: ../gtk/gtkdialogs.c:816
+#: ../gtk/gtkdialogs.c:801
 msgid ""
 "Please enter the screen name or alias of the person whose info you would "
 "like to view."
@@ -2531,11 +2501,11 @@
 "B.v. enigi la ekrannomon aŭ alinomon de persono kiesn informon vi dezrias "
 "rigardi."
 
-#: ../gtk/gtkdialogs.c:905
+#: ../gtk/gtkdialogs.c:890
 msgid "View User Log"
 msgstr "Rigardu Uzanto-Protokolon"
 
-#: ../gtk/gtkdialogs.c:907
+#: ../gtk/gtkdialogs.c:892
 msgid ""
 "Please enter the screen name or alias of the person whose log you would like "
 "to view."
@@ -2543,32 +2513,32 @@
 "B.v. enigi la ekrannomon aŭ alinomon de persono kiesn protokolon vi dezrias "
 "rigardi."
 
-#: ../gtk/gtkdialogs.c:926
+#: ../gtk/gtkdialogs.c:911
 msgid "Alias Contact"
 msgstr "Alinomo Kontakto"
 
-#: ../gtk/gtkdialogs.c:927
+#: ../gtk/gtkdialogs.c:912
 msgid "Enter an alias for this contact."
 msgstr "Enigu alinomon por tiu kontakto."
 
-#: ../gtk/gtkdialogs.c:947
+#: ../gtk/gtkdialogs.c:932
 #, c-format
 msgid "Enter an alias for %s."
 msgstr "Enigu alinomon por %s."
 
-#: ../gtk/gtkdialogs.c:949
+#: ../gtk/gtkdialogs.c:934
 msgid "Alias Buddy"
 msgstr "Alinomu Kunulon"
 
-#: ../gtk/gtkdialogs.c:968
+#: ../gtk/gtkdialogs.c:953
 msgid "Alias Chat"
 msgstr "Alinomu Babilejon"
 
-#: ../gtk/gtkdialogs.c:969
+#: ../gtk/gtkdialogs.c:954
 msgid "Enter an alias for this chat."
 msgstr "Enigu alinomon por tiu babilejon."
 
-#: ../gtk/gtkdialogs.c:1006
+#: ../gtk/gtkdialogs.c:991
 #, c-format
 msgid ""
 "You are about to remove the contact containing %s and %d other buddy from "
@@ -2583,32 +2553,32 @@
 "Vi estas foriganta la kontaktojn enhavantajn %s kaj %d aliaj kunuloj de via "
 "kunullisto. Ĉu vi volas daŭrigi?"
 
-#: ../gtk/gtkdialogs.c:1014
+#: ../gtk/gtkdialogs.c:999
 msgid "Remove Contact"
 msgstr "Forigu Kontakton"
 
-#: ../gtk/gtkdialogs.c:1015
+#: ../gtk/gtkdialogs.c:1000
 msgid "_Remove Contact"
 msgstr "_Forigu Kontakton"
 
-#: ../gtk/gtkdialogs.c:1045
+#: ../gtk/gtkdialogs.c:1030
 #, c-format
 msgid ""
 "You are about to merge the group called %s into the group called %s. Do you "
 "want to continue?"
 msgstr ""
-"Vi estas kunfandanta la grupon nomita %s en la grupo nomita %s. Ĉu vi volas "
-"daŭrigi?"
-
-#: ../gtk/gtkdialogs.c:1052
+"Vi estas kunfandanta la grupon nomita %s en la grupo nomita %s. "
+"Ĉu vi volas daŭrigi?"
+
+#: ../gtk/gtkdialogs.c:1037
 msgid "Merge Groups"
 msgstr "Kunfandu Grupojn"
 
-#: ../gtk/gtkdialogs.c:1053
+#: ../gtk/gtkdialogs.c:1038
 msgid "_Merge Groups"
 msgstr "_Kunfandu Grupojn"
 
-#: ../gtk/gtkdialogs.c:1103
+#: ../gtk/gtkdialogs.c:1088
 #, c-format
 msgid ""
 "You are about to remove the group %s and all its members from your buddy "
@@ -2617,51 +2587,51 @@
 "Vi estas foriganta la grupon %s kaj tutajn membrojn de via kunullisto. Ĉu vi "
 "volas daŭrigi?"
 
-#: ../gtk/gtkdialogs.c:1106
+#: ../gtk/gtkdialogs.c:1091
 msgid "Remove Group"
 msgstr "Forigu Grupon"
 
-#: ../gtk/gtkdialogs.c:1107
+#: ../gtk/gtkdialogs.c:1092
 msgid "_Remove Group"
 msgstr "_Forigu Grupon"
 
-#: ../gtk/gtkdialogs.c:1140
+#: ../gtk/gtkdialogs.c:1125
 #, c-format
 msgid "You are about to remove %s from your buddy list.  Do you want to continue?"
 msgstr "Vi estas foriganta %s de via kunullisto.  Ĉu vi volas daŭrigi?"
 
-#: ../gtk/gtkdialogs.c:1143
+#: ../gtk/gtkdialogs.c:1128
 msgid "Remove Buddy"
 msgstr "Forigu Kunulon"
 
-#: ../gtk/gtkdialogs.c:1144
+#: ../gtk/gtkdialogs.c:1129
 msgid "_Remove Buddy"
 msgstr "_Forigu Kunulon"
 
-#: ../gtk/gtkdialogs.c:1165
+#: ../gtk/gtkdialogs.c:1150
 #, c-format
 msgid ""
 "You are about to remove the chat %s from your buddy list.  Do you want to "
 "continue?"
 msgstr "Vi estas foriganta %s de via kunullisto.  Ĉu vi volas daŭrigi?"
 
-#: ../gtk/gtkdialogs.c:1168
+#: ../gtk/gtkdialogs.c:1153
 msgid "Remove Chat"
 msgstr "Forigu Babilejon"
 
-#: ../gtk/gtkdialogs.c:1169
+#: ../gtk/gtkdialogs.c:1154
 msgid "_Remove Chat"
 msgstr "_Forigu Babilejon"
 
-#: ../gtk/gtkdocklet.c:146
+#: ../gtk/gtkdocklet.c:133
 msgid "Right-click for more unread messages...\n"
 msgstr "Dektre-klaku por pliaj nelegitaj mesaĝoj...\n"
 
-#: ../gtk/gtkdocklet.c:443
+#: ../gtk/gtkdocklet.c:406
 msgid "Change Status"
 msgstr "Ŝanĝu staton"
 
-#: ../gtk/gtkdocklet.c:446 ../gtk/gtkstatusbox.c:971
+#: ../gtk/gtkdocklet.c:409 ../gtk/gtkstatusbox.c:971
 #: ../libgaim/protocols/gg/gg.c:996 ../libgaim/protocols/jabber/buddy.c:1367
 #: ../libgaim/protocols/msn/state.c:29 ../libgaim/protocols/msn/state.c:30
 #: ../libgaim/protocols/msn/state.c:37 ../libgaim/protocols/msn/state.c:38
@@ -2673,46 +2643,42 @@
 #. Away stuff
 #. get_yahoo_status_from_gaim_status() returns YAHOO_STATUS_CUSTOM for
 #. * the generic away state (YAHOO_STATUS_TYPE_AWAY) with no message
-#: ../gtk/gtkdocklet.c:450 ../gtk/gtkprefs.c:1815 ../gtk/gtkstatusbox.c:972
-#: ../libgaim/protocols/gg/gg.c:999 ../libgaim/protocols/irc/irc.c:524
+#: ../gtk/gtkdocklet.c:413 ../gtk/gtkprefs.c:1779 ../gtk/gtkstatusbox.c:972
+#: ../libgaim/protocols/gg/gg.c:999 ../libgaim/protocols/irc/irc.c:530
 #: ../libgaim/protocols/irc/msgs.c:223
 #: ../libgaim/protocols/jabber/buddy.c:1371
 #: ../libgaim/protocols/novell/novell.c:2856
 #: ../libgaim/protocols/oscar/oscar.c:694
-#: ../libgaim/protocols/oscar/oscar.c:4408
-#: ../libgaim/protocols/oscar/oscar.c:5475
+#: ../libgaim/protocols/oscar/oscar.c:4406
+#: ../libgaim/protocols/oscar/oscar.c:5473
 #: ../libgaim/protocols/silc/buddy.c:1469
 #: ../libgaim/protocols/yahoo/yahoo.c:3359
 #: ../libgaim/protocols/yahoo/yahoo.c:3432 ../libgaim/status.c:158
 msgid "Away"
 msgstr "Fora"
 
-#: ../gtk/gtkdocklet.c:454 ../gtk/gtkstatusbox.c:973
+#: ../gtk/gtkdocklet.c:417 ../gtk/gtkstatusbox.c:973
 #: ../libgaim/protocols/oscar/oscar.c:698
 #: ../libgaim/protocols/yahoo/yahoo.c:2879 ../libgaim/status.c:157
 msgid "Invisible"
 msgstr "Nevidebla"
 
-#: ../gtk/gtkdocklet.c:495
+#: ../gtk/gtkdocklet.c:458
 msgid "Show Buddy List"
 msgstr "Montru kunulliston"
 
-#: ../gtk/gtkdocklet.c:521
+#: ../gtk/gtkdocklet.c:484
 msgid "New Message..."
 msgstr "Nova mesaĝo..."
 
-#: ../gtk/gtkdocklet.c:536
+#: ../gtk/gtkdocklet.c:499
 msgid "Mute Sounds"
 msgstr "Malsonorigu"
 
-#: ../gtk/gtkdocklet.c:543
-msgid "Blink on new message"
-msgstr "Flagri je nova mesaĝo"
-
 #. TODO: need a submenu to change status, this needs to "link"
 #. * to the status in the buddy list gtkstatusbox
 #.
-#: ../gtk/gtkdocklet.c:554
+#: ../gtk/gtkdocklet.c:512
 msgid "Quit"
 msgstr "Finu"
 
@@ -2855,70 +2821,61 @@
 msgid "Paste as Plain _Text"
 msgstr "Enmetu keil Plena _Teksto"
 
-#: ../gtk/gtkimhtml.c:831
+#: ../gtk/gtkimhtml.c:826
 msgid "_Reset formatting"
 msgstr "_Restarigu formatumon"
 
-#: ../gtk/gtkimhtml.c:1323
+#: ../gtk/gtkimhtml.c:1318
 msgid "Hyperlink color"
 msgstr "Ligila koloro"
 
-#: ../gtk/gtkimhtml.c:1324
+#: ../gtk/gtkimhtml.c:1319
 msgid "Color to draw hyperlinks."
-msgstr "Koloro ligila."
-
-#: ../gtk/gtkimhtml.c:1327
+msgstr ""
+
+#: ../gtk/gtkimhtml.c:1322
 msgid "Hyperlink prelight color"
 msgstr ""
 
-#: ../gtk/gtkimhtml.c:1328
+#: ../gtk/gtkimhtml.c:1323
 msgid "Color to draw hyperlinks when mouse is over them."
 msgstr ""
 
-#: ../gtk/gtkimhtml.c:1549
+#: ../gtk/gtkimhtml.c:1544
 msgid "_Copy E-Mail Address"
 msgstr "_Kopiu Retadreson"
 
-#: ../gtk/gtkimhtml.c:1561
+#: ../gtk/gtkimhtml.c:1556
 msgid "_Open Link in Browser"
 msgstr "_Malfermu Ligilon en Retumilo"
 
-#: ../gtk/gtkimhtml.c:1571
+#: ../gtk/gtkimhtml.c:1566
 msgid "_Copy Link Location"
 msgstr "_Kopiu Ligilo-Lokon"
 
-#: ../gtk/gtkimhtml.c:3303
+#: ../gtk/gtkimhtml.c:3298
 msgid ""
 "<span size='larger' weight='bold'>Unrecognized file type</span>\n"
 "\n"
 "Defaulting to PNG."
 msgstr ""
-"<span size='larger' weight='bold'>Nerekonata dosiertipo</span>\n"
-"\n"
-"Apriorigas kiel PNG."
-
-#: ../gtk/gtkimhtml.c:3306
+
+#: ../gtk/gtkimhtml.c:3301
 msgid ""
 "Unrecognized file type\n"
 "\n"
 "Defaulting to PNG."
 msgstr ""
-"Nerekonata dosiertipo\n"
-"\n"
-"Apriorigas kiel PNG."
-
-#: ../gtk/gtkimhtml.c:3319
+
+#: ../gtk/gtkimhtml.c:3314
 #, c-format
 msgid ""
 "<span size='larger' weight='bold'>Error saving image</span>\n"
 "\n"
 "%s"
 msgstr ""
-"<span size='larger' weight='bold'>Eraro konservante bildon</span>\n"
-"\n"
-"%s"
-
-#: ../gtk/gtkimhtml.c:3322
+
+#: ../gtk/gtkimhtml.c:3317
 #, c-format
 msgid ""
 "Error saving image\n"
@@ -2929,11 +2886,11 @@
 "\n"
 "%s"
 
-#: ../gtk/gtkimhtml.c:3402 ../gtk/gtkimhtml.c:3414
+#: ../gtk/gtkimhtml.c:3397 ../gtk/gtkimhtml.c:3409
 msgid "Save Image"
 msgstr "Konservu Bildon"
 
-#: ../gtk/gtkimhtml.c:3442
+#: ../gtk/gtkimhtml.c:3437
 msgid "_Save Image..."
 msgstr "_Konservi Bildon..."
 
@@ -3043,57 +3000,57 @@
 msgid "Insert smiley"
 msgstr "Enmetu ridmienon"
 
-#: ../gtk/gtklog.c:219
+#: ../gtk/gtklog.c:238
 #, c-format
 msgid "<span size='larger' weight='bold'>Conversation in %s on %s</span>"
 msgstr "<span size='larger' weight='bold'>Konversacio en %s ĉe %s</span>"
 
-#: ../gtk/gtklog.c:224
+#: ../gtk/gtklog.c:243
 #, c-format
 msgid "<span size='larger' weight='bold'>Conversation with %s on %s</span>"
 msgstr "<span size='larger' weight='bold'>Konversacio kun %s ĉe %s</span>"
 
-#: ../gtk/gtklog.c:273
+#: ../gtk/gtklog.c:292
 msgid "%B %Y"
 msgstr "%B %Y"
 
-#: ../gtk/gtklog.c:320
+#: ../gtk/gtklog.c:339
 msgid ""
 "System events will only be logged if the \"Log all status changes to system "
 "log\" preference is enabled."
 msgstr ""
-"Sistemeventoj nur estos protokolita se la \"Protokolu ĉiujn ŝanĝojn al "
-"sistem protokolo\" agordo estas ŝaltita."
-
-#: ../gtk/gtklog.c:324
+"Sistemeventoj nur estos protokolita se la \"Protokolu ĉiujn ŝanĝojn al sistem "
+"protokolo\" agordo estas ŝaltita."
+
+#: ../gtk/gtklog.c:343
 msgid ""
 "Instant messages will only be logged if the \"Log all instant messages\" "
 "preference is enabled."
 msgstr ""
 
-#: ../gtk/gtklog.c:327
+#: ../gtk/gtklog.c:346
 msgid "Chats will only be logged if the \"Log all chats\" preference is enabled."
 msgstr ""
 
-#: ../gtk/gtklog.c:331
+#: ../gtk/gtklog.c:350
 msgid "No logs were found"
 msgstr "Neniu protokolo trovita"
 
-#: ../gtk/gtklog.c:410
+#: ../gtk/gtklog.c:429
 msgid "Total log size:"
 msgstr "Tuta protokolo grandeco:"
 
-#: ../gtk/gtklog.c:476
+#: ../gtk/gtklog.c:495
 #, c-format
 msgid "Conversations in %s"
 msgstr "Konversacioj en %s"
 
-#: ../gtk/gtklog.c:484 ../gtk/gtklog.c:535
+#: ../gtk/gtklog.c:503 ../gtk/gtklog.c:554
 #, c-format
 msgid "Conversations with %s"
 msgstr "Konversacioj kun %s"
 
-#: ../gtk/gtklog.c:560
+#: ../gtk/gtklog.c:579
 msgid "System Log"
 msgstr "Sistemo Protokolo"
 
@@ -3176,7 +3133,7 @@
 "\n"
 "%s"
 
-#: ../gtk/gtknotify.c:692 ../libgaim/protocols/sametime/sametime.c:5541
+#: ../gtk/gtknotify.c:692 ../libgaim/protocols/sametime/sametime.c:5459
 msgid "Search Results"
 msgstr "Serĉ-Rezultojn"
 
@@ -3197,19 +3154,19 @@
 
 #: ../gtk/gtknotify.c:1046
 msgid "The 'Manual' browser command has been chosen, but no command has been set."
-msgstr "La 'Mana' foliumilo komando estis elektita, sed nenia komando estis difinita."
+msgstr ""
 
 #: ../gtk/gtkplugin.c:274
 msgid "The following plugins will be unloaded."
-msgstr "La jenajn kromaĵoj estos malŝarĝitaj."
+msgstr ""
 
 #: ../gtk/gtkplugin.c:293
 msgid "Multiple plugins will be unloaded."
-msgstr "Pluraj kromaĵoj estos elŝarĝitaj."
+msgstr ""
 
 #: ../gtk/gtkplugin.c:295
 msgid "Unload Plugins"
-msgstr "Elŝarĝi Kormaĵojn"
+msgstr ""
 
 #: ../gtk/gtkplugin.c:407
 #, c-format
@@ -3229,9 +3186,6 @@
 "<span foreground=\"#ff0000\" weight=\"bold\">Error: %s\n"
 "Check the plugin website for an update.</span>"
 msgstr ""
-"%s\n"
-"<span foreground=\"#ff0000\" weight=\"bold\">Eraro: %s\n"
-"Kontrolu kromaĵan retsituon por ĝisdatigo .</span>"
 
 #: ../gtk/gtkplugin.c:543
 msgid "Configure Pl_ugin"
@@ -3391,17 +3345,17 @@
 #: ../gtk/gtkpounce.c:1448
 #, c-format
 msgid "%s has returned from being idle (%s)"
-msgstr "%s revenis el senfarado (%s)"
+msgstr ""
 
 #: ../gtk/gtkpounce.c:1450
 #, c-format
 msgid "%s has returned from being away (%s)"
-msgstr "%s revenis el forado (%s)"
+msgstr ""
 
 #: ../gtk/gtkpounce.c:1452
 #, c-format
 msgid "%s has stopped typing to you (%s)"
-msgstr "%s ekmaltajpis vin (%s)"
+msgstr ""
 
 #: ../gtk/gtkpounce.c:1454
 #, c-format
@@ -3427,141 +3381,76 @@
 msgid "Unknown pounce event. Please report this!"
 msgstr ""
 
-#: ../gtk/gtkprefs.c:509
+#: ../gtk/gtkprefs.c:512
 msgid "Smiley theme failed to unpack."
 msgstr ""
 
-#: ../gtk/gtkprefs.c:638
+#: ../gtk/gtkprefs.c:641
 msgid ""
 "Select a smiley theme that you would like to use from the list below. New "
 "themes can be installed by dragging and dropping them onto the theme list."
 msgstr ""
-"Elektu ridmienotemon kiun vi deziras uzi el la listo sube. Novaj temoj estas "
-"instaleblaj per treni kal faligi ilin sur la temo listo."
-
-#: ../gtk/gtkprefs.c:673
+"Elektu ridmienotemon kiun vi deziras uzi el la listo sube. Novaj temoj "
+"estas instaleblaj per treni kal faligi ilin sur la temo listo."
+
+#: ../gtk/gtkprefs.c:676
 msgid "Icon"
 msgstr "Piktogramo"
 
-#: ../gtk/gtkprefs.c:680 ../libgaim/protocols/jabber/buddy.c:286
+#: ../gtk/gtkprefs.c:683 ../libgaim/protocols/jabber/buddy.c:286
 #: ../libgaim/protocols/jabber/buddy.c:923
 #: ../libgaim/protocols/jabber/chat.c:769
 msgid "Description"
 msgstr "Priskibo"
 
-#: ../gtk/gtkprefs.c:816
-msgid "System Tray Icon"
-msgstr "Sistemlistela Piktogramo"
-
-#: ../gtk/gtkprefs.c:817
-msgid "_Show system tray icon:"
-msgstr "_Montru sistemlistelan piktogramon:"
-
-#: ../gtk/gtkprefs.c:819 ../gtk/gtkprefs.c:831 ../gtk/gtkprefs.c:1640
-#: ../gtk/plugins/timestamp_format.c:39 ../gtk/plugins/timestamp_format.c:48
+#: ../gtk/gtkprefs.c:824
+msgid "_Hide new IM conversations"
+msgstr "_Kaŝu novan TM konversaciojn"
+
+#: ../gtk/gtkprefs.c:826 ../gtk/gtkprefs.c:1769 ../gtk/gtkprefs.c:1783
+#: ../gtk/plugins/win32/winprefs/winprefs.c:334
+msgid "Never"
+msgstr "Neniam"
+
+#: ../gtk/gtkprefs.c:827 ../gtk/gtkprefs.c:1784
+msgid "When away"
+msgstr "Kiam fora"
+
+#: ../gtk/gtkprefs.c:828 ../gtk/plugins/timestamp_format.c:39
+#: ../gtk/plugins/timestamp_format.c:48
 #: ../gtk/plugins/win32/winprefs/winprefs.c:335
 msgid "Always"
 msgstr "Ĉiam"
 
-#: ../gtk/gtkprefs.c:820 ../gtk/gtkprefs.c:829 ../gtk/gtkprefs.c:1805
-#: ../gtk/gtkprefs.c:1819 ../gtk/plugins/win32/winprefs/winprefs.c:334
-msgid "Never"
-msgstr "Neniam"
-
-#: ../gtk/gtkprefs.c:821
-msgid "On unread messages"
-msgstr "Je nelegitaj mesaĝoj"
-
-#: ../gtk/gtkprefs.c:826
-msgid "Conversation Window Hiding"
-msgstr "Konversacio Fenestroj Kaŝeco"
-
-#: ../gtk/gtkprefs.c:827
-msgid "_Hide new IM conversations:"
-msgstr "_Kaŝu novajn TM-ajn konversaciojn:"
-
-#: ../gtk/gtkprefs.c:830 ../gtk/gtkprefs.c:1820
-msgid "When away"
-msgstr "Kiam fora"
-
-#. All the tab options!
-#: ../gtk/gtkprefs.c:838
-msgid "Tabs"
-msgstr "Langetoj"
-
-#: ../gtk/gtkprefs.c:840
-msgid "Show IMs and chats in _tabbed windows"
-msgstr "Montru TM-ojn kaj babilojn en lange_taj fenestroj"
-
-#: ../gtk/gtkprefs.c:854
-msgid "Show close b_utton on tabs"
-msgstr "Montru fermi b_utonon en langetoj"
-
-#: ../gtk/gtkprefs.c:857
-msgid "_Placement:"
-msgstr "_Pozicio:"
-
-#: ../gtk/gtkprefs.c:859
-msgid "Top"
-msgstr "Supre"
-
-#: ../gtk/gtkprefs.c:860
-msgid "Bottom"
-msgstr "Malsupre"
-
-#: ../gtk/gtkprefs.c:861
-msgid "Left"
-msgstr "Maldekstre"
-
-#: ../gtk/gtkprefs.c:862
-msgid "Right"
-msgstr "Dekstre"
-
-#: ../gtk/gtkprefs.c:864
-msgid "Left Vertical"
-msgstr "Maldekstra Vertikale"
-
-#: ../gtk/gtkprefs.c:865
-msgid "Right Vertical"
-msgstr "Dekstra Vertikale"
-
-#: ../gtk/gtkprefs.c:872
-msgid "N_ew conversations:"
-msgstr "Novaj konv_ersacioj:"
-
-#: ../gtk/gtkprefs.c:900
+#: ../gtk/gtkprefs.c:831
+msgid "Send unknown \"_slash\" commands as messages"
+msgstr "Sendu nekonatajn \"_oblikvo\" komandojn kiel mesaĝoj"
+
+#: ../gtk/gtkprefs.c:833
 msgid "Show _formatting on incoming messages"
 msgstr "Montru _formatecon en enirantaj mesaĝoj"
 
-#: ../gtk/gtkprefs.c:903
+#: ../gtk/gtkprefs.c:836
 msgid "Show buddy _icons"
 msgstr "Montru kunul _piktogramojn"
 
-#: ../gtk/gtkprefs.c:905
+#: ../gtk/gtkprefs.c:838
 msgid "Enable buddy ic_on animation"
 msgstr "Ŝaltu kunul pikt_ogramoanimacion"
 
-#: ../gtk/gtkprefs.c:912
+#: ../gtk/gtkprefs.c:845
 msgid "_Notify buddies that you are typing to them"
 msgstr "_Avizu kunulojn vi estas tajpante al ili"
 
-#: ../gtk/gtkprefs.c:915
+#: ../gtk/gtkprefs.c:848
 msgid "Highlight _misspelled words"
 msgstr "Emfazu misliterumitajn vortojn"
 
-#: ../gtk/gtkprefs.c:919
+#: ../gtk/gtkprefs.c:852
 msgid "Use smooth-scrolling"
 msgstr "Uzu dolĉan rulumon"
 
-#: ../gtk/gtkprefs.c:922
-msgid "F_lash window when IMs are received"
-msgstr "Fu_lmu ekranon kiam TM-oj riceviĝas"
-
-#: ../gtk/gtkprefs.c:925
-msgid "Default Formatting"
-msgstr "Apriora Formatumon"
-
-#: ../gtk/gtkprefs.c:941
+#: ../gtk/gtkprefs.c:868
 msgid ""
 "This is how your outgoing message text will appear when you use protocols "
 "that support formatting. :)"
@@ -3569,124 +3458,169 @@
 "Tiel aspektos vian elirantan mesaĝo tekston kiam vi uzas protokolojn kiuj "
 "subtenas formateblecon. :)"
 
-#: ../gtk/gtkprefs.c:1010 ../libgaim/protocols/oscar/oscar.c:779
-#: ../libgaim/protocols/oscar/oscar.c:3629
+#. All the tab options!
+#: ../gtk/gtkprefs.c:890
+msgid "Tab Options"
+msgstr "Langeto Opcioj"
+
+#: ../gtk/gtkprefs.c:892
+msgid "Show IMs and chats in _tabbed windows"
+msgstr "Montru TM-ojn kaj babilojn en lange_taj fenestroj"
+
+#: ../gtk/gtkprefs.c:906
+msgid "Show close b_utton on tabs"
+msgstr "Montru fermi b_utonon en langetoj"
+
+#: ../gtk/gtkprefs.c:912
+msgid "_Placement:"
+msgstr "_Pozicio:"
+
+#: ../gtk/gtkprefs.c:914
+msgid "Top"
+msgstr "Supre"
+
+#: ../gtk/gtkprefs.c:915
+msgid "Bottom"
+msgstr "Malsupre"
+
+#: ../gtk/gtkprefs.c:916
+msgid "Left"
+msgstr "Maldekstre"
+
+#: ../gtk/gtkprefs.c:917
+msgid "Right"
+msgstr "Dekstre"
+
+#: ../gtk/gtkprefs.c:919
+msgid "Left Vertical"
+msgstr "Maldekstra Vertikale"
+
+#: ../gtk/gtkprefs.c:920
+msgid "Right Vertical"
+msgstr "Dekstra Vertikale"
+
+#: ../gtk/gtkprefs.c:925
+msgid "N_ew conversations:"
+msgstr "Novaj konv_ersacioj:"
+
+#: ../gtk/gtkprefs.c:976 ../libgaim/protocols/oscar/oscar.c:779
+#: ../libgaim/protocols/oscar/oscar.c:3627
 msgid "IP Address"
 msgstr "IP adreso"
 
-#: ../gtk/gtkprefs.c:1012
+#: ../gtk/gtkprefs.c:978
 msgid "ST_UN server:"
 msgstr "ST_UN servilo:"
 
-#: ../gtk/gtkprefs.c:1024
+#: ../gtk/gtkprefs.c:990
 msgid "<span style=\"italic\">Example: stunserver.org</span>"
 msgstr "<span style=\"italic\">Ekzemplo: stunserver.org</span>"
 
-#: ../gtk/gtkprefs.c:1028
+#: ../gtk/gtkprefs.c:994
 msgid "_Autodetect IP address"
 msgstr "_Aŭtodetekti IP adreson"
 
-#: ../gtk/gtkprefs.c:1037
+#: ../gtk/gtkprefs.c:1003
 msgid "Public _IP:"
 msgstr "Publika _IP:"
 
-#: ../gtk/gtkprefs.c:1066
+#: ../gtk/gtkprefs.c:1032
 msgid "Ports"
 msgstr "Pordoj"
 
-#: ../gtk/gtkprefs.c:1069
+#: ../gtk/gtkprefs.c:1035
 msgid "_Manually specify range of ports to listen on"
 msgstr "_Mane difinu intervalon de pordoj aŭskultendaj"
 
-#: ../gtk/gtkprefs.c:1072
+#: ../gtk/gtkprefs.c:1038
 msgid "_Start port:"
 msgstr "_Komenca pordo:"
 
-#: ../gtk/gtkprefs.c:1079
+#: ../gtk/gtkprefs.c:1045
 msgid "_End port:"
 msgstr "_Fina pordo:"
 
-#: ../gtk/gtkprefs.c:1087
+#: ../gtk/gtkprefs.c:1053
 msgid "Proxy Server"
 msgstr "Prokura Servilo"
 
-#: ../gtk/gtkprefs.c:1091
+#: ../gtk/gtkprefs.c:1057
 msgid "No proxy"
 msgstr "Sen prokurilo"
 
-#: ../gtk/gtkprefs.c:1147
+#: ../gtk/gtkprefs.c:1113
 msgid "_User:"
 msgstr "_Uzanto:"
 
-#: ../gtk/gtkprefs.c:1210
+#: ../gtk/gtkprefs.c:1176
 msgid "Seamonkey"
-msgstr "Seamonkey"
-
-#: ../gtk/gtkprefs.c:1211
+msgstr ""
+
+#: ../gtk/gtkprefs.c:1177
 msgid "Opera"
 msgstr "Opero"
 
-#: ../gtk/gtkprefs.c:1212
+#: ../gtk/gtkprefs.c:1178
 msgid "Netscape"
-msgstr "Netscape"
-
-#: ../gtk/gtkprefs.c:1213
+msgstr ""
+
+#: ../gtk/gtkprefs.c:1179
 msgid "Mozilla"
 msgstr "Mozilo"
 
-#: ../gtk/gtkprefs.c:1214
+#: ../gtk/gtkprefs.c:1180
 msgid "Konqueror"
 msgstr "Konkerilo"
 
-#: ../gtk/gtkprefs.c:1215
+#: ../gtk/gtkprefs.c:1181
 msgid "GNOME Default"
 msgstr "GNOME Aprioro"
 
-#: ../gtk/gtkprefs.c:1216
+#: ../gtk/gtkprefs.c:1182
 msgid "Galeon"
-msgstr "Galeon"
-
-#: ../gtk/gtkprefs.c:1217
+msgstr ""
+
+#: ../gtk/gtkprefs.c:1183
 msgid "Firefox"
 msgstr "Fajrovulpo"
 
-#: ../gtk/gtkprefs.c:1218
+#: ../gtk/gtkprefs.c:1184
 msgid "Firebird"
 msgstr "Fajrobirdo"
 
-#: ../gtk/gtkprefs.c:1219
+#: ../gtk/gtkprefs.c:1185
 msgid "Epiphany"
-msgstr "Epiphany"
-
-#: ../gtk/gtkprefs.c:1228
+msgstr ""
+
+#: ../gtk/gtkprefs.c:1194
 msgid "Manual"
 msgstr "Mane"
 
-#: ../gtk/gtkprefs.c:1281
+#: ../gtk/gtkprefs.c:1247
 msgid "Browser Selection"
 msgstr "Retumilo Elekto"
 
-#: ../gtk/gtkprefs.c:1285
+#: ../gtk/gtkprefs.c:1251
 msgid "_Browser:"
 msgstr "_Retumilo:"
 
-#: ../gtk/gtkprefs.c:1293
+#: ../gtk/gtkprefs.c:1259
 msgid "_Open link in:"
 msgstr "_Malfermu ligilon per:"
 
-#: ../gtk/gtkprefs.c:1295
+#: ../gtk/gtkprefs.c:1261
 msgid "Browser default"
 msgstr "Retumilo aprioro"
 
-#: ../gtk/gtkprefs.c:1296
+#: ../gtk/gtkprefs.c:1262
 msgid "Existing window"
 msgstr "Aktuala fenestro"
 
-#: ../gtk/gtkprefs.c:1298
+#: ../gtk/gtkprefs.c:1264
 msgid "New tab"
 msgstr "Nova langeto"
 
-#: ../gtk/gtkprefs.c:1312
+#: ../gtk/gtkprefs.c:1278
 #, c-format
 msgid ""
 "_Manual:\n"
@@ -3695,79 +3629,79 @@
 "_Mane:\n"
 "(%s por URL)"
 
-#: ../gtk/gtkprefs.c:1352
+#: ../gtk/gtkprefs.c:1317
 msgid "Log _format:"
 msgstr "Protokolo _formato:"
 
-#: ../gtk/gtkprefs.c:1357
+#: ../gtk/gtkprefs.c:1322
 msgid "Log all _instant messages"
 msgstr "Protokolu ĉiujn _tujmesaĝojn"
 
-#: ../gtk/gtkprefs.c:1359
+#: ../gtk/gtkprefs.c:1324
 msgid "Log all c_hats"
 msgstr "Protokolu ĉiujn _babilojn"
 
-#: ../gtk/gtkprefs.c:1361
+#: ../gtk/gtkprefs.c:1326
 msgid "Log all _status changes to system log"
 msgstr "Protokolu ĉiujn _statoŝanĝojn al sistemprotokolo"
 
-#: ../gtk/gtkprefs.c:1507
+#: ../gtk/gtkprefs.c:1474
 msgid "Sound Selection"
 msgstr "Sono Elekto"
 
-#: ../gtk/gtkprefs.c:1515
+#: ../gtk/gtkprefs.c:1482
 msgid "Quietest"
 msgstr "Pli Malaŭta"
 
-#: ../gtk/gtkprefs.c:1517
+#: ../gtk/gtkprefs.c:1484
 msgid "Quieter"
 msgstr "Pli Malaŭte"
 
-#: ../gtk/gtkprefs.c:1519
+#: ../gtk/gtkprefs.c:1486
 msgid "Quiet"
 msgstr "Malaŭte"
 
-#: ../gtk/gtkprefs.c:1521 ../libgaim/protocols/silc/silc.c:666
+#: ../gtk/gtkprefs.c:1488 ../libgaim/protocols/silc/silc.c:670
 msgid "Normal"
 msgstr "Normala"
 
-#: ../gtk/gtkprefs.c:1523
+#: ../gtk/gtkprefs.c:1490
 msgid "Loud"
 msgstr "Laŭte"
 
-#: ../gtk/gtkprefs.c:1525
+#: ../gtk/gtkprefs.c:1492
 msgid "Louder"
 msgstr "Pli Laŭte"
 
-#: ../gtk/gtkprefs.c:1527
+#: ../gtk/gtkprefs.c:1494
 msgid "Loudest"
 msgstr "Pli Laŭta"
 
-#: ../gtk/gtkprefs.c:1590
+#: ../gtk/gtkprefs.c:1557
 msgid "Sound Method"
 msgstr "Sono Metodo"
 
-#: ../gtk/gtkprefs.c:1591
+#: ../gtk/gtkprefs.c:1558
 msgid "_Method:"
 msgstr "_Metodo:"
 
-#: ../gtk/gtkprefs.c:1593
+#: ../gtk/gtkprefs.c:1560
 msgid "Console beep"
 msgstr "Konzolo pepo"
 
-#: ../gtk/gtkprefs.c:1595
+#: ../gtk/gtkprefs.c:1562
 msgid "Automatic"
 msgstr "Aŭtomate"
 
-#: ../gtk/gtkprefs.c:1598
+#: ../gtk/gtkprefs.c:1567
 msgid "Command"
 msgstr "Komando"
 
-#: ../gtk/gtkprefs.c:1599
+#: ../gtk/gtkprefs.c:1568
 msgid "No sounds"
 msgstr "Sen Sono"
 
-#: ../gtk/gtkprefs.c:1607
+#: ../gtk/gtkprefs.c:1576
 #, c-format
 msgid ""
 "Sound c_ommand:\n"
@@ -3776,127 +3710,115 @@
 "Sono k_omando:\n"
 "(%s por dosiernomo)"
 
-#: ../gtk/gtkprefs.c:1633
+#: ../gtk/gtkprefs.c:1602
 msgid "Sound Options"
 msgstr "Son-opcioj"
 
-#: ../gtk/gtkprefs.c:1634
+#: ../gtk/gtkprefs.c:1603
 msgid "Sounds when conversation has _focus"
 msgstr "Sonu kiam konversacio _fokusas"
 
-#: ../gtk/gtkprefs.c:1636
-msgid "Enable sounds:"
-msgstr "Ŝaltu Sonojn:"
-
-#: ../gtk/gtkprefs.c:1638
-msgid "Only when available"
-msgstr "Nur kiam disponebla"
-
-#: ../gtk/gtkprefs.c:1639
-msgid "Only when not available"
-msgstr "Nur kiam nedisponebla"
-
-#: ../gtk/gtkprefs.c:1647
+#: ../gtk/gtkprefs.c:1605
+msgid "_Sounds while away"
+msgstr "_Sonu kiam fora"
+
+#: ../gtk/gtkprefs.c:1612
 msgid "Volume:"
 msgstr "Laŭteco:"
 
-#: ../gtk/gtkprefs.c:1675
+#: ../gtk/gtkprefs.c:1640
 msgid "Sound Events"
 msgstr "Soneventoj"
 
-#: ../gtk/gtkprefs.c:1726
+#: ../gtk/gtkprefs.c:1691
 msgid "Play"
 msgstr "Ludu"
 
-#: ../gtk/gtkprefs.c:1733
+#: ../gtk/gtkprefs.c:1698
 msgid "Event"
 msgstr "Evento"
 
-#: ../gtk/gtkprefs.c:1752
+#: ../gtk/gtkprefs.c:1717
 msgid "Test"
 msgstr "Provo"
 
-#: ../gtk/gtkprefs.c:1756
+#: ../gtk/gtkprefs.c:1721
 msgid "Reset"
 msgstr "Restarigu"
 
-#: ../gtk/gtkprefs.c:1760
+#: ../gtk/gtkprefs.c:1725
 msgid "Choose..."
 msgstr "Elektu..."
 
-#: ../gtk/gtkprefs.c:1803
+#: ../gtk/gtkprefs.c:1767
 msgid "_Report idle time:"
 msgstr "_Raportu senfaran tempon:"
 
-#: ../gtk/gtkprefs.c:1806
+#: ../gtk/gtkprefs.c:1770
 msgid "From last sent message"
 msgstr "Ekde lasta sendita mesaĝo"
 
-#: ../gtk/gtkprefs.c:1808
+#: ../gtk/gtkprefs.c:1772
 msgid "Based on keyboard or mouse use"
 msgstr "Laŭ klavaro aŭ muso uzo"
 
-#: ../gtk/gtkprefs.c:1817
+#: ../gtk/gtkprefs.c:1781
 msgid "_Auto-reply:"
 msgstr "_Aŭto-respondo:"
 
-#: ../gtk/gtkprefs.c:1821
+#: ../gtk/gtkprefs.c:1785
 msgid "When both away and idle"
 msgstr "Kiam ambaŭ fora kaj senfara"
 
 #. Auto-away stuff
-#: ../gtk/gtkprefs.c:1827
+#: ../gtk/gtkprefs.c:1791
 msgid "Auto-away"
 msgstr "Aŭto-fora"
 
-#: ../gtk/gtkprefs.c:1829
+#: ../gtk/gtkprefs.c:1793
 msgid "Change status when _idle"
 msgstr "Ŝanĝu staton kiam _senfara"
 
-#: ../gtk/gtkprefs.c:1833
+#: ../gtk/gtkprefs.c:1797
 msgid "_Minutes before changing status:"
 msgstr "_Minutoj antaŭe ŝanĝenda staton:"
 
-#: ../gtk/gtkprefs.c:1841
+#: ../gtk/gtkprefs.c:1805
 msgid "Change _status to:"
 msgstr "Ŝangû _staton al:"
 
 #. Signon status stuff
-#: ../gtk/gtkprefs.c:1862
+#: ../gtk/gtkprefs.c:1826
 msgid "Status at Startup"
 msgstr "Stato je ensaluto"
 
-#: ../gtk/gtkprefs.c:1864
+#: ../gtk/gtkprefs.c:1828
 msgid "Use status from last _exit at startup"
 msgstr "Uzu stato de lasta malsaluto je sensaluto"
 
-#: ../gtk/gtkprefs.c:1870
+#: ../gtk/gtkprefs.c:1834
 msgid "Status to a_pply at startup:"
 msgstr "Stato aplikenda je ensaluto:"
 
-#: ../gtk/gtkprefs.c:1908
-msgid "Interface"
-msgstr "Interfaco"
-
-#: ../gtk/gtkprefs.c:1910
+#: ../gtk/gtkprefs.c:1885
 msgid "Smiley Themes"
 msgstr "Ridmieno-temo"
 
-#: ../gtk/gtkprefs.c:1911
+#: ../gtk/gtkprefs.c:1886
 msgid "Sounds"
 msgstr "Sonoj"
 
-#: ../gtk/gtkprefs.c:1912 ../libgaim/protocols/silc/silc.c:1847
+#: ../gtk/gtkprefs.c:1887 ../libgaim/protocols/silc/silc.c:1851
 msgid "Network"
 msgstr "Reto"
 
-#: ../gtk/gtkprefs.c:1917
+#: ../gtk/gtkprefs.c:1892
 msgid "Browser"
 msgstr "Retumilo"
 
-#: ../gtk/gtkprefs.c:1921
-msgid "Status / Idle"
-msgstr "Stato / Senfara"
+#: ../gtk/gtkprefs.c:1896
+msgid "Away / Idle"
+msgstr "Fora / Senfara"
 
 #: ../gtk/gtkprivacy.c:79
 msgid "Allow all users to contact me"
@@ -4134,16 +4056,16 @@
 
 #: ../gtk/gtksound.c:311
 msgid "GStreamer failed to initialize."
-msgstr "GStreamer malsukcesis ekon."
+msgstr ""
 
 #. connect to the server
 #: ../gtk/gtkstatusbox.c:543 ../libgaim/protocols/irc/irc.c:329
-#: ../libgaim/protocols/jabber/jabber.c:1000
+#: ../libgaim/protocols/jabber/jabber.c:1009
 #: ../libgaim/protocols/msn/session.c:344
 #: ../libgaim/protocols/novell/novell.c:2185
 #: ../libgaim/protocols/oscar/oscar.c:1224 ../libgaim/protocols/qq/qq.c:134
-#: ../libgaim/protocols/sametime/sametime.c:3731
-#: ../libgaim/protocols/simple/simple.c:1669
+#: ../libgaim/protocols/sametime/sametime.c:3681
+#: ../libgaim/protocols/simple/simple.c:1673
 #: ../libgaim/protocols/yahoo/yahoo.c:2715
 #: ../libgaim/protocols/zephyr/zephyr.c:1617
 msgid "Connecting"
@@ -4153,59 +4075,59 @@
 msgid "Waiting for network connection"
 msgstr "Atendante retkonekto"
 
-#: ../gtk/gtkutils.c:1310 ../gtk/gtkutils.c:1333
+#: ../gtk/gtkutils.c:1310 ../gtk/gtkutils.c:1335
 #, c-format
 msgid "The following error has occurred loading %s: %s"
 msgstr "La jena eraro okazis ŝargante %s: %s"
 
-#: ../gtk/gtkutils.c:1313 ../gtk/gtkutils.c:1335
+#: ../gtk/gtkutils.c:1312 ../gtk/gtkutils.c:1337
 msgid "Failed to load image"
 msgstr "Malsukcesis ŝargi bildon"
 
-#: ../gtk/gtkutils.c:1410
+#: ../gtk/gtkutils.c:1412
 #, c-format
 msgid "Cannot send folder %s."
-msgstr "Ne povas sendi dosierujon %s."
-
-#: ../gtk/gtkutils.c:1412
+msgstr ""
+
+#: ../gtk/gtkutils.c:1414
 msgid ""
 "Gaim cannot transfer a folder. You will need to send the files within "
 "individually"
 msgstr ""
 
-#: ../gtk/gtkutils.c:1440 ../gtk/gtkutils.c:1449 ../gtk/gtkutils.c:1454
+#: ../gtk/gtkutils.c:1442 ../gtk/gtkutils.c:1451 ../gtk/gtkutils.c:1456
 msgid "You have dragged an image"
 msgstr "Vi trenis bildon"
 
-#: ../gtk/gtkutils.c:1441
+#: ../gtk/gtkutils.c:1443
 msgid ""
 "You can send this image as a file transfer, embed it into this message, or "
 "use it as the buddy icon for this user."
 msgstr ""
 
-#: ../gtk/gtkutils.c:1445 ../gtk/gtkutils.c:1460
+#: ../gtk/gtkutils.c:1447 ../gtk/gtkutils.c:1462
 msgid "Set as buddy icon"
 msgstr "Difinu kiel kunul piktogramo"
 
-#: ../gtk/gtkutils.c:1446 ../gtk/gtkutils.c:1461
+#: ../gtk/gtkutils.c:1448 ../gtk/gtkutils.c:1463
 msgid "Send image file"
 msgstr "Sendu bilddosieron"
 
-#: ../gtk/gtkutils.c:1447 ../gtk/gtkutils.c:1461
+#: ../gtk/gtkutils.c:1449 ../gtk/gtkutils.c:1463
 msgid "Insert in message"
 msgstr "Enmetu en mesaĝon"
 
-#: ../gtk/gtkutils.c:1450
+#: ../gtk/gtkutils.c:1452
 msgid "Would you like to set it as the buddy icon for this user?"
 msgstr "Ĉu vi deziras meti ĝin kiel la kunul piktogramo por tiu uzanto?"
 
-#: ../gtk/gtkutils.c:1455
+#: ../gtk/gtkutils.c:1457
 msgid ""
 "You can send this image as a file transfer or embed it into this message, or "
 "use it as the buddy icon for this user."
 msgstr ""
 
-#: ../gtk/gtkutils.c:1457
+#: ../gtk/gtkutils.c:1459
 msgid ""
 "You can insert this image into this message, or use it as the buddy icon for "
 "this user"
@@ -4216,17 +4138,17 @@
 #. * send.  The only logical one is "Application," but do we really want to send a binary and nothing else?
 #. * Probably not.  I'll just give an error and return.
 #. The original patch sent the icon used by the launcher.  That's probably wrong
-#: ../gtk/gtkutils.c:1511
+#: ../gtk/gtkutils.c:1513
 msgid "Cannot send launcher"
 msgstr ""
 
-#: ../gtk/gtkutils.c:1511
+#: ../gtk/gtkutils.c:1513
 msgid ""
 "You dragged a desktop launcher. Most likely you wanted to send whatever this "
 "launcher points to instead of this launcher itself."
 msgstr ""
 
-#: ../gtk/gtkutils.c:2340
+#: ../gtk/gtkutils.c:2342
 #, c-format
 msgid ""
 "<b>File:</b> %s\n"
@@ -4238,18 +4160,18 @@
 "<b>Bildo grandeco:</b> %dx%d"
 
 #. Label
-#: ../gtk/gtkutils.c:2384 ../gtk/gtkutils.c:2406
+#: ../gtk/gtkutils.c:2386 ../gtk/gtkutils.c:2408
 #: ../gtk/plugins/gevolution/new_person_dialog.c:338
 #: ../libgaim/protocols/oscar/oscar.c:600
 msgid "Buddy Icon"
 msgstr "Kunul Piktogramo"
 
-#: ../gtk/gtkutils.c:2733
+#: ../gtk/gtkutils.c:2735
 #, c-format
 msgid "Failed to open file '%s': %s"
 msgstr "Malsukcesis malfermi dosieron '%s': %s"
 
-#: ../gtk/gtkutils.c:2782
+#: ../gtk/gtkutils.c:2784
 #, c-format
 msgid "Failed to load image '%s': reason not known, probably a corrupt image file"
 msgstr ""
@@ -4262,35 +4184,35 @@
 msgid "Select color"
 msgstr "Elektu koloron"
 
-#: ../gtk/plugins/cap/cap.c:446
+#: ../gtk/plugins/cap/cap.c:428
 msgid "Display Statistics"
 msgstr "Montru Statistikojn"
 
-#: ../gtk/plugins/cap/cap.c:458 ../gtk/plugins/cap/cap.c:461
+#: ../gtk/plugins/cap/cap.c:440 ../gtk/plugins/cap/cap.c:443
 msgid "Response Probability:"
 msgstr "Respondo Verŝajneco:"
 
-#: ../gtk/plugins/cap/cap.c:807
+#: ../gtk/plugins/cap/cap.c:789
 msgid "Statistics Configuration"
 msgstr "Statistikoj Agordo"
 
 #. msg_difference spinner
-#: ../gtk/plugins/cap/cap.c:810
+#: ../gtk/plugins/cap/cap.c:792
 msgid "Maximum response timeout:"
 msgstr ""
 
-#: ../gtk/plugins/cap/cap.c:813 ../gtk/plugins/cap/cap.c:820
-#: ../gtk/plugins/cap/cap.c:827
+#: ../gtk/plugins/cap/cap.c:795 ../gtk/plugins/cap/cap.c:802
+#: ../gtk/plugins/cap/cap.c:809
 msgid "minutes"
 msgstr "minutoj"
 
 #. last_seen spinner
-#: ../gtk/plugins/cap/cap.c:817
+#: ../gtk/plugins/cap/cap.c:799
 msgid "Maximum last-seen difference:"
 msgstr ""
 
 #. threshold spinner
-#: ../gtk/plugins/cap/cap.c:824
+#: ../gtk/plugins/cap/cap.c:806
 msgid "Threshold:"
 msgstr "Sojlo:"
 
@@ -4302,12 +4224,12 @@
 #. *< id
 #. *< name
 #. *< version
-#: ../gtk/plugins/cap/cap.c:933
+#: ../gtk/plugins/cap/cap.c:915
 msgid "Contact Availability Prediction plugin."
 msgstr ""
 
 #. *  summary
-#: ../gtk/plugins/cap/cap.c:934
+#: ../gtk/plugins/cap/cap.c:916
 msgid ""
 "The contact availability plugin (cap) is used to display statistical "
 "information about buddies in a users contact list."
@@ -4336,7 +4258,7 @@
 
 #: ../gtk/plugins/contact_priority.c:90
 msgid "Point values to use when..."
-msgstr "Poentoj uzendaj kiam..."
+msgstr "Poentvaloroj uzantendaj kiam..."
 
 #: ../gtk/plugins/contact_priority.c:118
 msgid ""
@@ -4346,7 +4268,7 @@
 
 #: ../gtk/plugins/contact_priority.c:125
 msgid "Use last buddy when scores are equal"
-msgstr "Uzu lastan kunulon kiam poentoj egalas"
+msgstr ""
 
 #: ../gtk/plugins/contact_priority.c:130
 msgid "Point values to use for account..."
@@ -4360,14 +4282,14 @@
 #. *< id
 #: ../gtk/plugins/contact_priority.c:182
 msgid "Contact Priority"
-msgstr "Kontakta Prioritato"
+msgstr "Kontaktoprioritato"
 
 #. *< name
 #. *< version
 #. *< summary
 #: ../gtk/plugins/contact_priority.c:185
 msgid "Allows for controlling the values associated with different buddy states."
-msgstr "Permesas kontroli la poentojn rilatajn al diversaj kunulstatoj."
+msgstr ""
 
 #. *< description
 #: ../gtk/plugins/contact_priority.c:187
@@ -4375,8 +4297,6 @@
 "Allows for changing the point values of idle/away/offline states for buddies "
 "in contact priority computations."
 msgstr ""
-"Permesas ŝanĝi la poentojn de neaktiva/fora/senkonekta statoj de kunuloj "
-"por komputi kontaktan prioritaton."
 
 #: ../gtk/plugins/extplacement.c:80
 msgid "By conversation count"
@@ -4433,7 +4353,7 @@
 #. *  summary
 #: ../gtk/plugins/gaiminc.c:94
 msgid "An example plugin that does stuff - see the description."
-msgstr "Ekzempla kormaĵo kiu umas - vidu priskribon."
+msgstr ""
 
 #. *  description
 #: ../gtk/plugins/gaiminc.c:96
@@ -4443,10 +4363,6 @@
 "- It reverses all incoming text\n"
 "- It sends a message to people on your list immediately when they sign on"
 msgstr ""
-"Estas mojosa kromaĵo kiu multe umas:\n"
-"- Ĝi diras kiu skribis la programon kiam vi ensalutas\n"
-"- Ĝi inversigas ĉiajn enirantan tekston\n"
-"- Ĝi sendas mesaĝon al homoj en via listo tuj kiam ili ensalutas"
 
 #: ../gtk/plugins/gaimrc.c:41
 msgid "Cursor Color"
@@ -4614,11 +4530,11 @@
 #: ../gtk/plugins/gevolution/add_buddy_dialog.c:473
 #: ../gtk/plugins/gevolution/assoc-buddy.c:358
 #: ../libgaim/protocols/jabber/buddy.c:1724
-#: ../libgaim/protocols/oscar/oscar.c:6087 ../libgaim/protocols/qq/group.c:121
+#: ../libgaim/protocols/oscar/oscar.c:6085 ../libgaim/protocols/qq/group.c:121
 #: ../libgaim/protocols/qq/group_im.c:137
 #: ../libgaim/protocols/qq/sys_msg.c:160 ../libgaim/protocols/qq/sys_msg.c:230
 #: ../libgaim/protocols/qq/sys_msg.c:248
-#: ../libgaim/protocols/sametime/sametime.c:5614
+#: ../libgaim/protocols/sametime/sametime.c:5532
 msgid "Search"
 msgstr "Serĉu"
 
@@ -4655,38 +4571,38 @@
 
 #: ../gtk/plugins/gevolution/eds-utils.c:73
 #: ../gtk/plugins/gevolution/eds-utils.c:86
-#: ../libgaim/protocols/jabber/jabber.c:1145
+#: ../libgaim/protocols/jabber/jabber.c:1154
 msgid "None"
 msgstr "Nenio"
 
+#: ../gtk/plugins/gevolution/gevolution.c:262
+#: ../gtk/plugins/gevolution/gevolution.c:268
+msgid "Unable to send e-mail"
+msgstr "Neblas sendi retmesaĝon"
+
 #: ../gtk/plugins/gevolution/gevolution.c:263
+msgid "The evolution executable was not found in the PATH."
+msgstr ""
+
 #: ../gtk/plugins/gevolution/gevolution.c:269
-msgid "Unable to send e-mail"
-msgstr "Ne eblas sendi retmesaĝon"
-
-#: ../gtk/plugins/gevolution/gevolution.c:264
-msgid "The evolution executable was not found in the PATH."
-msgstr ""
-
-#: ../gtk/plugins/gevolution/gevolution.c:270
 msgid "The specified buddy was not found in the Evolution Contacts."
 msgstr "La elektita kunul ne troveblas en la Evoluo-Kontaktoj."
 
-#: ../gtk/plugins/gevolution/gevolution.c:287
+#: ../gtk/plugins/gevolution/gevolution.c:286
 msgid "Add to Address Book"
 msgstr "Aldonu al adresaro"
 
-#: ../gtk/plugins/gevolution/gevolution.c:291
+#: ../gtk/plugins/gevolution/gevolution.c:290
 msgid "Send E-Mail"
 msgstr "Sendu retmesaĝon"
 
 #. Configuration frame
-#: ../gtk/plugins/gevolution/gevolution.c:418
+#: ../gtk/plugins/gevolution/gevolution.c:417
 msgid "Evolution Integration Configuration"
 msgstr ""
 
 #. Label
-#: ../gtk/plugins/gevolution/gevolution.c:421
+#: ../gtk/plugins/gevolution/gevolution.c:420
 msgid "Select all accounts that buddies should be auto-added to."
 msgstr "Elektu ĉiujn kontojn kiuj kunuloj endas aŭto-aldonita al."
 
@@ -4696,7 +4612,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../gtk/plugins/gevolution/gevolution.c:528
+#: ../gtk/plugins/gevolution/gevolution.c:527
 msgid "Evolution Integration"
 msgstr ""
 
@@ -4704,8 +4620,8 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../gtk/plugins/gevolution/gevolution.c:531
-#: ../gtk/plugins/gevolution/gevolution.c:533
+#: ../gtk/plugins/gevolution/gevolution.c:530
+#: ../gtk/plugins/gevolution/gevolution.c:532
 msgid "Provides integration with Evolution."
 msgstr ""
 
@@ -4802,7 +4718,7 @@
 
 #: ../gtk/plugins/musicmessaging/musicmessaging.c:416
 msgid "Music Messaging"
-msgstr "Muziko Mesaĝilo"
+msgstr ""
 
 #: ../gtk/plugins/musicmessaging/musicmessaging.c:417
 msgid "There was a conflict in running the command:"
@@ -4819,11 +4735,11 @@
 #. Configuration frame
 #: ../gtk/plugins/musicmessaging/musicmessaging.c:625
 msgid "Music Messaging Configuration"
-msgstr "Muzika Mesaĝilo Agordo"
+msgstr ""
 
 #: ../gtk/plugins/musicmessaging/musicmessaging.c:629
 msgid "Score Editor Path"
-msgstr "Orkestruma Redaktilo Vojo"
+msgstr ""
 
 #: ../gtk/plugins/musicmessaging/musicmessaging.c:630
 msgid "_Apply"
@@ -4839,7 +4755,7 @@
 #. *< version
 #: ../gtk/plugins/musicmessaging/musicmessaging.c:665
 msgid "Music Messaging Plugin for collaborative composition."
-msgstr "Muzika Mesaĝilo Kromaĵo por kunlaboranta verkado."
+msgstr ""
 
 #. *  summary
 #: ../gtk/plugins/musicmessaging/musicmessaging.c:667
@@ -4847,8 +4763,6 @@
 "The Music Messaging Plugin allows a number of users to simultaneously work "
 "on a piece of music by editting a common score in real-time."
 msgstr ""
-"La Muzika Mesaĝilo Kromaĵo ebligas plurajn uzantojn samtempe labori muzikan "
-"pecon redaktante komunan orkestrumon realtempe."
 
 #. ---------- "Notify For" ----------
 #: ../gtk/plugins/notify.c:687
@@ -4893,7 +4807,7 @@
 #. Urgent method button
 #: ../gtk/plugins/notify.c:767
 msgid "Set window manager \"_URGENT\" hint"
-msgstr "Dinifu fenestrtraktilan \"_URĜANTA\" indikon"
+msgstr ""
 
 #. Raise window method button
 #: ../gtk/plugins/notify.c:776
@@ -4908,27 +4822,27 @@
 #. Remove on focus button
 #: ../gtk/plugins/notify.c:789
 msgid "Remove when conversation window _gains focus"
-msgstr "Forigu kiam konversacio fenestro ricevas _fokuson"
+msgstr ""
 
 #. Remove on click button
 #: ../gtk/plugins/notify.c:796
 msgid "Remove when conversation window _receives click"
-msgstr "Forigu kiam konversacio fenestro _ricevas alklakon"
+msgstr ""
 
 #. Remove on type button
 #: ../gtk/plugins/notify.c:804
 msgid "Remove when _typing in conversation window"
-msgstr "Forigu kiam _tajpante en konversacio fenestro"
+msgstr ""
 
 #. Remove on message send button
 #: ../gtk/plugins/notify.c:812
 msgid "Remove when a _message gets sent"
-msgstr "Forigu kiam _mesaĝo sendiĝas"
+msgstr ""
 
 #. Remove on conversation switch button
 #: ../gtk/plugins/notify.c:821
 msgid "Remove on switch to conversation ta_b"
-msgstr "Forigu je ŝaĝo al konversacio l_angeto"
+msgstr ""
 
 #. *< type
 #. *< ui_requirement
@@ -4946,7 +4860,7 @@
 #. *  description
 #: ../gtk/plugins/notify.c:913 ../gtk/plugins/notify.c:915
 msgid "Provides a variety of ways of notifying you of unread messages."
-msgstr "Provizas diversajn rimedojn por atentigi vin pro nelegitaj mesaĝoj."
+msgstr ""
 
 #: ../gtk/plugins/raw.c:175
 msgid "Raw"
@@ -5013,70 +4927,70 @@
 "ChangeLog."
 msgstr "Kontrolu ofte por noaj eldonoj kaj avizu la uzanton kun la ŝanĝprotokolo."
 
-#: ../gtk/plugins/spellchk.c:1963
+#: ../gtk/plugins/spellchk.c:1934
 msgid "Duplicate Correction"
 msgstr "Duobligo Korekto"
 
-#: ../gtk/plugins/spellchk.c:1964
+#: ../gtk/plugins/spellchk.c:1935
 msgid "The specified word already exists in the correction list."
 msgstr "La elektita vorto jam ekzistas en la korektolisto."
 
-#: ../gtk/plugins/spellchk.c:2172
+#: ../gtk/plugins/spellchk.c:2143
 msgid "Text Replacements"
 msgstr "Teksto anstataŭigoj"
 
-#: ../gtk/plugins/spellchk.c:2195
+#: ../gtk/plugins/spellchk.c:2166
 msgid "You type"
 msgstr "Vi tajpas"
 
-#: ../gtk/plugins/spellchk.c:2209
+#: ../gtk/plugins/spellchk.c:2180
 msgid "You send"
 msgstr "Vi sendas"
 
-#: ../gtk/plugins/spellchk.c:2223
+#: ../gtk/plugins/spellchk.c:2194
 msgid "Whole words only"
 msgstr "Nur plenaj vortoj"
 
-#: ../gtk/plugins/spellchk.c:2235
+#: ../gtk/plugins/spellchk.c:2206
 msgid "Case sensitive"
 msgstr "Usklecodistinge"
 
-#: ../gtk/plugins/spellchk.c:2261
+#: ../gtk/plugins/spellchk.c:2232
 msgid "Add a new text replacement"
 msgstr "Aldonu novan teksto-anstataŭigon"
 
-#: ../gtk/plugins/spellchk.c:2277
+#: ../gtk/plugins/spellchk.c:2248
 msgid "You _type:"
 msgstr "Vi _tajpas:"
 
-#: ../gtk/plugins/spellchk.c:2294
+#: ../gtk/plugins/spellchk.c:2265
 msgid "You _send:"
 msgstr "Vi _sendas:"
 
 #. Created here so it can be passed to whole_words_button_toggled.
-#: ../gtk/plugins/spellchk.c:2306
+#: ../gtk/plugins/spellchk.c:2277
 msgid "_Exact case match (uncheck for automatic case handling)"
-msgstr "_Ekzakta uskleca kongruo (malŝaltita por aŭtomata usklecotrakto)"
-
-#: ../gtk/plugins/spellchk.c:2308
+msgstr ""
+
+#: ../gtk/plugins/spellchk.c:2279
 msgid "Only replace _whole words"
 msgstr "Nur anstataŭigu _planajn vortojn"
 
-#: ../gtk/plugins/spellchk.c:2333
+#: ../gtk/plugins/spellchk.c:2304
 msgid "General Text Replacement Options"
 msgstr "Ĝenerala Teksto Anstataŭigo Opcioj"
 
-#: ../gtk/plugins/spellchk.c:2334
+#: ../gtk/plugins/spellchk.c:2305
 msgid "Enable replacement of last word on send"
 msgstr "Ŝaltu anstataŭigon de lasta vorto je sendo"
 
-#: ../gtk/plugins/spellchk.c:2359
+#: ../gtk/plugins/spellchk.c:2330
 msgid "Text replacement"
 msgstr "Teksto anstataŭigo"
 
-#: ../gtk/plugins/spellchk.c:2361 ../gtk/plugins/spellchk.c:2362
+#: ../gtk/plugins/spellchk.c:2332 ../gtk/plugins/spellchk.c:2333
 msgid "Replaces text in outgoing messages according to user-defined rules."
-msgstr "Anstataŭigu tekston en elirantaj mesaĝoj laŭ uzantodfinitaj reguloj."
+msgstr ""
 
 #. *< type
 #. *< ui_requirement
@@ -5124,7 +5038,7 @@
 #. *  description
 #: ../gtk/plugins/timestamp.c:259 ../gtk/plugins/timestamp.c:261
 msgid "Adds iChat-style timestamps to conversations every N minutes."
-msgstr "Aldonas iChat-stilajn tempomarkojn al konversacioj je ĉiuj N minutoj."
+msgstr ""
 
 #: ../gtk/plugins/timestamp_format.c:22
 msgid "Timestamp Format Options"
@@ -5132,7 +5046,7 @@
 
 #: ../gtk/plugins/timestamp_format.c:27
 msgid "_Force (traditional Gaim) 24-hour time format"
-msgstr "_Devigi (tradicia Gaim) 24-horan tempoformaton"
+msgstr ""
 
 #: ../gtk/plugins/timestamp_format.c:30
 msgid "Show dates in..."
@@ -5176,14 +5090,13 @@
 msgid ""
 "This plugin allows the user to customize conversation and logging message "
 "timestamp formats."
-msgstr "Tiu kromaĵo ebligas la uzanto agordi konversaciajn kaj protokolajn "
-"mesaĝajn tempmarkajn formatojn."
+msgstr ""
 
 #: ../gtk/plugins/win32/transparency/win2ktrans.c:183
 #: ../gtk/plugins/win32/transparency/win2ktrans.c:569
 #: ../gtk/plugins/win32/transparency/win2ktrans.c:616
 msgid "Opacity:"
-msgstr "Maltravidebleco:"
+msgstr ""
 
 #. IM Convo trans options
 #: ../gtk/plugins/win32/transparency/win2ktrans.c:533
@@ -5192,7 +5105,7 @@
 
 #: ../gtk/plugins/win32/transparency/win2ktrans.c:534
 msgid "_IM window transparency"
-msgstr "_TM fenestra travidebleco"
+msgstr ""
 
 #: ../gtk/plugins/win32/transparency/win2ktrans.c:548
 msgid "_Show slider bar in IM window"
@@ -5205,7 +5118,7 @@
 #: ../gtk/plugins/win32/transparency/win2ktrans.c:558
 #: ../gtk/plugins/win32/transparency/win2ktrans.c:606
 msgid "Always on top"
-msgstr "Ĉiam super"
+msgstr ""
 
 #. Buddy List trans options
 #: ../gtk/plugins/win32/transparency/win2ktrans.c:590
@@ -5228,14 +5141,14 @@
 #. *< id
 #: ../gtk/plugins/win32/transparency/win2ktrans.c:658
 msgid "Transparency"
-msgstr "Travidebleco"
+msgstr ""
 
 #. *< name
 #. *< version
 #. *  summary
 #: ../gtk/plugins/win32/transparency/win2ktrans.c:661
 msgid "Variable Transparency for the buddy list and conversations."
-msgstr "Variebla Travidebleco por la kunullisto kaj konversacioj."
+msgstr ""
 
 #. *  description
 #: ../gtk/plugins/win32/transparency/win2ktrans.c:663
@@ -5248,12 +5161,12 @@
 
 #: ../gtk/plugins/win32/winprefs/winprefs.c:306
 msgid "GTK+ Runtime Version"
-msgstr "GTK+ Rultempa Versio"
+msgstr ""
 
 #. Autostart
 #: ../gtk/plugins/win32/winprefs/winprefs.c:314
 msgid "Startup"
-msgstr "Eko"
+msgstr ""
 
 #: ../gtk/plugins/win32/winprefs/winprefs.c:315
 msgid "_Start Gaim on Windows startup"
@@ -5279,7 +5192,7 @@
 
 #: ../gtk/plugins/win32/winprefs/winprefs.c:366
 msgid "WinGaim Options"
-msgstr "WinGaim Opcioj"
+msgstr ""
 
 #: ../gtk/plugins/win32/winprefs/winprefs.c:368
 msgid "Options specific to Windows Gaim."
@@ -5310,13 +5223,13 @@
 msgid "Save password"
 msgstr "Konservu pasvorton"
 
-#: ../libgaim/account.c:989 ../libgaim/connection.c:104
+#: ../libgaim/account.c:989 ../libgaim/connection.c:103
 #, c-format
 msgid "Missing protocol plugin for %s"
 msgstr "Mankanta protokolo-kromaĵo por %s"
 
 #: ../libgaim/account.c:1071 ../libgaim/protocols/gg/gg.c:696
-#: ../libgaim/protocols/jabber/jabber.c:1295
+#: ../libgaim/protocols/jabber/jabber.c:1304
 msgid "New passwords do not match."
 msgstr "Novaj pasvortoj malsamas."
 
@@ -5374,19 +5287,19 @@
 msgid "Group not removed"
 msgstr "Grupo ne forigita"
 
-#: ../libgaim/connection.c:106
+#: ../libgaim/connection.c:105
 msgid "Registration Error"
-msgstr "Registra Eraro"
-
-#: ../libgaim/connection.c:292
+msgstr ""
+
+#: ../libgaim/connection.c:293
 #, c-format
 msgid "+++ %s signed on"
 msgstr "+++ %s ensalutis"
 
-#: ../libgaim/connection.c:325
+#: ../libgaim/connection.c:326
 #, c-format
 msgid "+++ %s signed off"
-msgstr "+++ %s malsalutis"
+msgstr ""
 
 #: ../libgaim/conversation.c:165
 msgid "Unable to send message: The message is too large."
@@ -5416,48 +5329,48 @@
 #: ../libgaim/conversation.c:1566
 #, c-format
 msgid "%s entered the room."
-msgstr "%s enigis la ĉambron."
+msgstr ""
 
 #: ../libgaim/conversation.c:1569
 #, c-format
 msgid "%s [<I>%s</I>] entered the room."
-msgstr "%s [<I>%s</I>] enigis la ĉambron."
+msgstr ""
 
 #: ../libgaim/conversation.c:1674
 #, c-format
 msgid "You are now known as %s"
-msgstr "Vi nun estas konata kiel %s"
+msgstr ""
 
 #: ../libgaim/conversation.c:1694
 #, c-format
 msgid "%s is now known as %s"
-msgstr "%s nun estas konata kiel %s"
+msgstr ""
 
 #: ../libgaim/conversation.c:1767
 #, c-format
 msgid "%s left the room."
-msgstr "%s forlasis la ĉambron."
+msgstr ""
 
 #: ../libgaim/conversation.c:1770
 #, c-format
 msgid "%s left the room (%s)."
-msgstr "%s forlasis la ĉambron (%s)."
+msgstr ""
 
 #: ../libgaim/desktopitem.c:286 ../libgaim/desktopitem.c:877
 msgid "No name"
 msgstr "Neniu nomo"
 
-#: ../libgaim/dbus-server.c:578
+#: ../libgaim/dbus-server.c:577
 #, c-format
 msgid "Failed to get connection: %s"
 msgstr "Malsukcesis konekti: %s"
 
-#: ../libgaim/dbus-server.c:590
+#: ../libgaim/dbus-server.c:585
 #, c-format
 msgid "Failed to get name: %s"
 msgstr "Malsukcesis ricevi nomon: %s"
 
-#: ../libgaim/dbus-server.c:603
+#: ../libgaim/dbus-server.c:598
 #, c-format
 msgid "Failed to get serv name: %s"
 msgstr "Malsukcesis ricevi servilnomon: %s"
@@ -5503,21 +5416,21 @@
 msgid "Unknown reason"
 msgstr "Nekonata kialo"
 
-#: ../libgaim/ft.c:191 ../libgaim/protocols/msn/msn.c:410
+#: ../libgaim/ft.c:189 ../libgaim/protocols/msn/msn.c:410
 #, c-format
 msgid ""
 "Error reading %s: \n"
 "%s.\n"
 msgstr ""
 
-#: ../libgaim/ft.c:195
+#: ../libgaim/ft.c:193
 #, c-format
 msgid ""
 "Error writing %s: \n"
 "%s.\n"
 msgstr ""
 
-#: ../libgaim/ft.c:199
+#: ../libgaim/ft.c:197
 #, c-format
 msgid ""
 "Error accessing %s: \n"
@@ -5525,38 +5438,34 @@
 msgstr ""
 
 #: ../libgaim/ft.c:230
-msgid "Directory is not writable."
-msgstr ""
-
-#: ../libgaim/ft.c:245
 msgid "Cannot send a file of 0 bytes."
 msgstr ""
 
-#: ../libgaim/ft.c:255
+#: ../libgaim/ft.c:240
 msgid "Cannot send a directory."
 msgstr ""
 
-#: ../libgaim/ft.c:264
+#: ../libgaim/ft.c:249
 #, c-format
 msgid "%s is not a regular file. Cowardly refusing to overwrite it.\n"
 msgstr ""
 
-#: ../libgaim/ft.c:322
+#: ../libgaim/ft.c:307
 #, c-format
 msgid "%s wants to send you %s (%s)"
 msgstr ""
 
-#: ../libgaim/ft.c:329
+#: ../libgaim/ft.c:314
 #, c-format
 msgid "%s wants to send you a file"
 msgstr ""
 
-#: ../libgaim/ft.c:370
+#: ../libgaim/ft.c:355
 #, c-format
 msgid "Accept file transfer request from %s?"
 msgstr "Akcepti dosier-alŝuton demandon de %s?"
 
-#: ../libgaim/ft.c:374
+#: ../libgaim/ft.c:359
 #, c-format
 msgid ""
 "A file is available for download from:\n"
@@ -5564,235 +5473,217 @@
 "Remote port: %d"
 msgstr ""
 
-#: ../libgaim/ft.c:407
+#: ../libgaim/ft.c:392
 #, c-format
 msgid "%s is offering to send file %s"
 msgstr ""
 
-#: ../libgaim/ft.c:459
+#: ../libgaim/ft.c:444
 #, c-format
 msgid "%s is not a valid filename.\n"
 msgstr ""
 
-#: ../libgaim/ft.c:480
+#: ../libgaim/ft.c:465
 #, c-format
 msgid "Offering to send %s to %s"
 msgstr ""
 
-#: ../libgaim/ft.c:492
+#: ../libgaim/ft.c:477
 #, c-format
 msgid "Starting transfer of %s from %s"
 msgstr ""
 
-#: ../libgaim/ft.c:646
+#: ../libgaim/ft.c:631
 #, c-format
 msgid "Transfer of file %s complete"
 msgstr ""
 
-#: ../libgaim/ft.c:649
+#: ../libgaim/ft.c:634
 msgid "File transfer complete"
 msgstr "Dosiero alŝuto kompleta"
 
-#: ../libgaim/ft.c:1038
+#: ../libgaim/ft.c:1023
 #, c-format
 msgid "You canceled the transfer of %s"
 msgstr "Vi rezignis la alŝuton de %s"
 
-#: ../libgaim/ft.c:1043
+#: ../libgaim/ft.c:1028
 msgid "File transfer cancelled"
 msgstr "Dosiero alŝuto rezignita"
 
-#: ../libgaim/ft.c:1101
+#: ../libgaim/ft.c:1086
 #, c-format
 msgid "%s canceled the transfer of %s"
 msgstr "%s rezignis la alŝuton de %s"
 
-#: ../libgaim/ft.c:1106
+#: ../libgaim/ft.c:1091
 #, c-format
 msgid "%s canceled the file transfer"
 msgstr "%s rezignis la dosiero-alŝuton"
 
-#: ../libgaim/ft.c:1163
+#: ../libgaim/ft.c:1148
 #, c-format
 msgid "File transfer to %s failed."
 msgstr "Dosiero alŝuto al %s malsukcesis."
 
-#: ../libgaim/ft.c:1165
+#: ../libgaim/ft.c:1150
 #, c-format
 msgid "File transfer from %s failed."
 msgstr "Dosiero elŝuto de %s malsukcesis."
 
 #: ../libgaim/gconf/gaim.schemas.in.h:1
 msgid "Run the command in a terminal"
-msgstr "Eku komandon en terminalo"
+msgstr ""
 
 #: ../libgaim/gconf/gaim.schemas.in.h:2
 msgid "The command used to handle \"aim\" URLs, if enabled."
-msgstr "La uzata komando por trakti \"aim\" URL-ojn, se enŝaltita."
+msgstr ""
 
 #: ../libgaim/gconf/gaim.schemas.in.h:3
 msgid "The command used to handle \"gg\" URLs, if enabled."
-msgstr "La uzata komando por trakti \"gg\" URL-ojn, se enŝaltita."
+msgstr ""
 
 #: ../libgaim/gconf/gaim.schemas.in.h:4
 msgid "The command used to handle \"icq\" URLs, if enabled."
-msgstr "La uzata komando por trakti \"icq\" URL-ojn, se enŝaltita."
+msgstr ""
 
 #: ../libgaim/gconf/gaim.schemas.in.h:5
 msgid "The command used to handle \"irc\" URLs, if enabled."
-msgstr "La uzata komando por trakti \"irc\" URL-ojn, se enŝaltita."
+msgstr ""
 
 #: ../libgaim/gconf/gaim.schemas.in.h:6
 msgid "The command used to handle \"msnim\" URLs, if enabled."
-msgstr "La uzata komando por trakti \"msnim\" URL-ojn, se enŝaltita."
+msgstr ""
 
 #: ../libgaim/gconf/gaim.schemas.in.h:7
 msgid "The command used to handle \"sip\" URLs, if enabled."
-msgstr "La uzata komando por trakti \"sip\" URL-ojn, se enŝaltita."
+msgstr ""
 
 #: ../libgaim/gconf/gaim.schemas.in.h:8
 msgid "The command used to handle \"xmpp\" URLs, if enabled."
-msgstr "La uzata komando por trakti \"xmpp\" URL-ojn, se enŝaltita."
+msgstr ""
 
 #: ../libgaim/gconf/gaim.schemas.in.h:9
 msgid "The command used to handle \"ymsgr\" URLs, if enabled."
-msgstr "La uzata komando por trakti \"ymsgr\" URL-ojn, se enŝaltita."
+msgstr ""
 
 #: ../libgaim/gconf/gaim.schemas.in.h:10
 msgid "The handler for \"aim\" URLs"
-msgstr "La traktilo por \"aim\" URL-oj"
+msgstr ""
 
 #: ../libgaim/gconf/gaim.schemas.in.h:11
 msgid "The handler for \"gg\" URLs"
-msgstr "La traktilo por \"gg\" URL-oj"
+msgstr ""
 
 #: ../libgaim/gconf/gaim.schemas.in.h:12
 msgid "The handler for \"icq\" URLs"
-msgstr "La traktilo por \"icq\" URL-oj"
+msgstr ""
 
 #: ../libgaim/gconf/gaim.schemas.in.h:13
 msgid "The handler for \"irc\" URLs"
-msgstr "La traktilo por \"irc\" URL-oj"
+msgstr ""
 
 #: ../libgaim/gconf/gaim.schemas.in.h:14
 msgid "The handler for \"msnim\" URLs"
-msgstr "La traktilo por \"msnim\" URL-oj"
+msgstr ""
 
 #: ../libgaim/gconf/gaim.schemas.in.h:15
 msgid "The handler for \"sip\" URLs"
-msgstr "La traktilo por \"sip\" URL-oj"
+msgstr ""
 
 #: ../libgaim/gconf/gaim.schemas.in.h:16
 msgid "The handler for \"xmpp\" URLs"
-msgstr "La traktilo por \"xmpp\" URL-oj"
+msgstr ""
 
 #: ../libgaim/gconf/gaim.schemas.in.h:17
 msgid "The handler for \"ymsgr\" URLs"
-msgstr "La traktilo por \"ymsgr\" URL-oj"
+msgstr ""
 
 #: ../libgaim/gconf/gaim.schemas.in.h:18
 msgid ""
 "True if the command specified in the \"command\" key should handle \"aim\" "
 "URLs."
 msgstr ""
-"Vera se la komando donita en la \"komando\" ŝlosilo devu trakti \"aim\" "
-"URL-ojn."
 
 #: ../libgaim/gconf/gaim.schemas.in.h:19
 msgid ""
 "True if the command specified in the \"command\" key should handle \"gg\" "
 "URLs."
 msgstr ""
-"Vera se la komando donita en la \"komando\" ŝlosilo devu trakti \"gg\" "
-"URL-ojn."
 
 #: ../libgaim/gconf/gaim.schemas.in.h:20
 msgid ""
 "True if the command specified in the \"command\" key should handle \"icq\" "
 "URLs."
 msgstr ""
-"Vera se la komando donita en la \"komando\" ŝlosilo devu trakti \"icq\" "
-"URL-ojn."
 
 #: ../libgaim/gconf/gaim.schemas.in.h:21
 msgid ""
 "True if the command specified in the \"command\" key should handle \"irc\" "
 "URLs."
 msgstr ""
-"Vera se la komando donita en la \"komando\" ŝlosilo devu trakti \"irc\" "
-"URL-ojn."
 
 #: ../libgaim/gconf/gaim.schemas.in.h:22
 msgid ""
 "True if the command specified in the \"command\" key should handle \"msnim\" "
 "URLs."
 msgstr ""
-"Vera se la komando donita en la \"komando\" ŝlosilo devu trakti \"msnim\" "
-"URL-ojn."
 
 #: ../libgaim/gconf/gaim.schemas.in.h:23
 msgid ""
 "True if the command specified in the \"command\" key should handle \"sip\" "
 "URLs."
 msgstr ""
-"Vera se la komando donita en la \"komando\" ŝlosilo devu trakti \"sip\" "
-"URL-ojn."
 
 #: ../libgaim/gconf/gaim.schemas.in.h:24
 msgid ""
 "True if the command specified in the \"command\" key should handle \"xmpp\" "
 "URLs."
 msgstr ""
-"Vera se la komando donita en la \"komando\" ŝlosilo devu trakti \"xmpp\" "
-"URL-ojn."
 
 #: ../libgaim/gconf/gaim.schemas.in.h:25
 msgid ""
 "True if the command specified in the \"command\" key should handle \"ymsgr\" "
 "URLs."
 msgstr ""
-"Vera se la komando donita en la \"komando\" ŝlosilo devu trakti \"ymsgr\" "
-"URL-ojn."
 
 #: ../libgaim/gconf/gaim.schemas.in.h:26
 msgid ""
 "True if the command used to handle this type of URL should be run in a "
 "terminal."
 msgstr ""
-"Vera se la komando uzata por trakti tiun tipon de URL-o devu esti lanĉita en "
-"terminalo."
 
 #: ../libgaim/gconf/gaim.schemas.in.h:27
 msgid "Whether the specified command should handle \"aim\" URLs"
-msgstr "Ĉu la donita komando devu trakti \"aim\" URL-ojn"
+msgstr ""
 
 #: ../libgaim/gconf/gaim.schemas.in.h:28
 msgid "Whether the specified command should handle \"gg\" URLs"
-msgstr "Ĉu la donita komando devu trakti \"gg\" URL-ojn"
+msgstr ""
 
 #: ../libgaim/gconf/gaim.schemas.in.h:29
 msgid "Whether the specified command should handle \"icq\" URLs"
-msgstr "Ĉu la donita komando devu trakti \"icq\" URL-ojn"
+msgstr ""
 
 #: ../libgaim/gconf/gaim.schemas.in.h:30
 msgid "Whether the specified command should handle \"irc\" URLs"
-msgstr "Ĉu la donita komando devu trakti \"irc\" URL-ojn"
+msgstr ""
 
 #: ../libgaim/gconf/gaim.schemas.in.h:31
 msgid "Whether the specified command should handle \"msnim\" URLs"
-msgstr "Ĉu la donita komando devu trakti \"msnim\" URL-ojn"
+msgstr ""
 
 #: ../libgaim/gconf/gaim.schemas.in.h:32
 msgid "Whether the specified command should handle \"sip\" URLs"
-msgstr "Ĉu la donita komando devu trakti \"sip\" URL-ojn"
+msgstr ""
 
 #: ../libgaim/gconf/gaim.schemas.in.h:33
 msgid "Whether the specified command should handle \"xmpp\" URLs"
-msgstr "Ĉu la donita komando devu trakti \"xmpp\" URL-ojn"
+msgstr ""
 
 #: ../libgaim/gconf/gaim.schemas.in.h:34
 msgid "Whether the specified command should handle \"ymsgr\" URLs"
-msgstr "Ĉu la donita komando devu trakti \"ymsgr\" URL-ojn"
+msgstr ""
 
 #: ../libgaim/log.c:181
 msgid "<b><font color=\"red\">The logger has no read function</font></b>"
@@ -5853,15 +5744,10 @@
 #: ../libgaim/plugin.c:282 ../libgaim/protocols/jabber/buddy.c:1649
 #: ../libgaim/protocols/msn/servconn.c:139
 #: ../libgaim/protocols/msn/session.c:321
-#: ../libgaim/protocols/oscar/oscar.c:2679
+#: ../libgaim/protocols/oscar/oscar.c:2677
 msgid "Unknown error"
 msgstr "Nekonata eraro"
 
-#: ../libgaim/plugin.c:365
-#, c-format
-msgid "You are using %s, but this plugin requires %s."
-msgstr ""
-
 #: ../libgaim/plugin.c:434
 #, c-format
 msgid "Plugin magic mismatch %d (need %d)"
@@ -5983,7 +5869,7 @@
 
 #: ../libgaim/plugins/idle.c:268
 msgid "Unset Idle Time for All Idled Accounts"
-msgstr "Malfaru Senfaran Tempon por Ĉiuj Senfarantaj Kontoj"
+msgstr ""
 
 #: ../libgaim/plugins/idle.c:317 ../libgaim/plugins/idle.c:318
 msgid "Allows you to hand-configure how long you've been idle"
@@ -6035,92 +5921,92 @@
 msgid "Test plugin IPC support, as a server. This registers the IPC commands."
 msgstr ""
 
-#: ../libgaim/plugins/log_reader.c:1416
+#: ../libgaim/plugins/log_reader.c:1412
 msgid "User is offline."
-msgstr "Uzanto senkonektas."
-
-#: ../libgaim/plugins/log_reader.c:1422
+msgstr "Uzanto malkonektas."
+
+#: ../libgaim/plugins/log_reader.c:1418
 msgid "Auto-response sent:"
-msgstr "Aŭto-respondo sendita:"
-
-#: ../libgaim/plugins/log_reader.c:1432 ../libgaim/plugins/log_reader.c:1435
+msgstr ""
+
+#: ../libgaim/plugins/log_reader.c:1428 ../libgaim/plugins/log_reader.c:1431
 #: ../libgaim/plugins/statenotify.c:80
 #, c-format
 msgid "%s has signed off."
 msgstr "%s malsalutis."
 
-#: ../libgaim/plugins/log_reader.c:1449
+#: ../libgaim/plugins/log_reader.c:1445
 msgid "One or more messages may have been undeliverable."
 msgstr ""
 
-#: ../libgaim/plugins/log_reader.c:1459
+#: ../libgaim/plugins/log_reader.c:1455
 msgid "You were disconnected from the server."
-msgstr "Vi estis diskonektita de la servilo."
-
-#: ../libgaim/plugins/log_reader.c:1467
+msgstr ""
+
+#: ../libgaim/plugins/log_reader.c:1463
 msgid ""
 "You are currently disconnected. Messages will not be received unless you are "
 "logged in."
 msgstr ""
 
-#: ../libgaim/plugins/log_reader.c:1482
+#: ../libgaim/plugins/log_reader.c:1478
 msgid "Message could not be sent because the maximum length was exceeded."
 msgstr ""
 
-#: ../libgaim/plugins/log_reader.c:1487
+#: ../libgaim/plugins/log_reader.c:1483
 msgid "Message could not be sent."
 msgstr "Mesaĝo malsendiĝeblas."
 
 #. 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.
-#: ../libgaim/plugins/log_reader.c:1840 ../libgaim/plugins/log_reader.c:1949
+#: ../libgaim/plugins/log_reader.c:1831 ../libgaim/plugins/log_reader.c:1940
 msgid "Adium"
-msgstr "Adium"
+msgstr ""
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
-#: ../libgaim/plugins/log_reader.c:1853 ../libgaim/plugins/log_reader.c:1954
+#: ../libgaim/plugins/log_reader.c:1844 ../libgaim/plugins/log_reader.c:1945
 msgid "Fire"
 msgstr "Fajro"
 
 #. 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.
-#: ../libgaim/plugins/log_reader.c:1865 ../libgaim/plugins/log_reader.c:1958
+#: ../libgaim/plugins/log_reader.c:1856 ../libgaim/plugins/log_reader.c:1949
 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.
-#: ../libgaim/plugins/log_reader.c:1878 ../libgaim/plugins/log_reader.c:1963
+#: ../libgaim/plugins/log_reader.c:1869 ../libgaim/plugins/log_reader.c:1954
 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.
-#: ../libgaim/plugins/log_reader.c:1890 ../libgaim/plugins/log_reader.c:1967
+#: ../libgaim/plugins/log_reader.c:1881 ../libgaim/plugins/log_reader.c:1958
 msgid "Trillian"
-msgstr "Trillian"
+msgstr ""
 
 #. Add general preferences.
-#: ../libgaim/plugins/log_reader.c:1931
+#: ../libgaim/plugins/log_reader.c:1922
 msgid "General Log Reading Configuration"
-msgstr "Ĝenerala Protokolo Legado Agordo"
-
-#: ../libgaim/plugins/log_reader.c:1935
+msgstr ""
+
+#: ../libgaim/plugins/log_reader.c:1926
 msgid "Fast size calculations"
-msgstr "Rapidaj grandeco kalkuloj"
-
-#: ../libgaim/plugins/log_reader.c:1939
+msgstr ""
+
+#: ../libgaim/plugins/log_reader.c:1930
 msgid "Use name heuristics"
 msgstr ""
 
 #. Add Log Directory preferences.
-#: ../libgaim/plugins/log_reader.c:1945
+#: ../libgaim/plugins/log_reader.c:1936
 msgid "Log Directory"
 msgstr "Protokolo Dosierujo"
 
@@ -6130,19 +6016,19 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libgaim/plugins/log_reader.c:1990
+#: ../libgaim/plugins/log_reader.c:1981
 msgid "Log Reader"
 msgstr "Protokolo Legilo"
 
 #. *< name
 #. *< version
 #. * summary
-#: ../libgaim/plugins/log_reader.c:1994
+#: ../libgaim/plugins/log_reader.c:1985
 msgid "Includes other IM clients' logs in the log viewer."
 msgstr ""
 
 #. * description
-#: ../libgaim/plugins/log_reader.c:1998
+#: ../libgaim/plugins/log_reader.c:1989
 msgid ""
 "When viewing logs, this plugin will include logs from other IM clients. "
 "Currently, this includes Adium, MSN Messenger, and Trillian.\n"
@@ -6153,12 +6039,12 @@
 
 #: ../libgaim/plugins/mono/loader/mono.c:213
 msgid "Mono Plugin Loader"
-msgstr "Mono Kromaĵo Ŝaĝilo"
+msgstr ""
 
 #: ../libgaim/plugins/mono/loader/mono.c:215
 #: ../libgaim/plugins/mono/loader/mono.c:216
 msgid "Loads .NET plugins with Mono."
-msgstr "Ŝarĝas .NET-ajn kromaĵojn pere de Mono."
+msgstr ""
 
 #. *< type
 #. *< ui_requirement
@@ -6168,14 +6054,14 @@
 #. *< id
 #: ../libgaim/plugins/perl/perl.c:588
 msgid "Perl Plugin Loader"
-msgstr "Perl Kromaĵo Ŝaĝilo"
+msgstr ""
 
 #. *< name
 #. *< version
 #. *< summary
 #: ../libgaim/plugins/perl/perl.c:590 ../libgaim/plugins/perl/perl.c:591
 msgid "Provides support for loading perl plugins."
-msgstr "Provizas subteno por ŝarĝi perl-ajn kormaĵojn."
+msgstr ""
 
 #: ../libgaim/plugins/psychic.c:19
 msgid "Psychic Mode"
@@ -6183,34 +6069,36 @@
 
 #: ../libgaim/plugins/psychic.c:20
 msgid "Psychic mode for incoming conversation"
-msgstr "Psiŝika modo je enen konversacion"
+msgstr ""
 
 #: ../libgaim/plugins/psychic.c:21
 msgid ""
 "Causes conversation windows to appear as other users begin to message you.  "
 "This works for AIM, ICQ, Jabber, Sametime, and Yahoo!"
-msgstr "Igas aperon de konversacia fenestro kiam alia uzanto komencas mesaĝi vin.  Tio funkcias por AIM, ICQ, Jabber, Sametime, kaj Yahoo!"
-
-#: ../libgaim/plugins/psychic.c:66
+msgstr ""
+
+#. This is a quote from Star Wars.  You should
+#. probably not translate it literally.  If
+#. you can't find a fitting cultural reference
+#. in your language, consider translating
+#. something like this instead:
+#. "You feel a new message coming."
+#: ../libgaim/plugins/psychic.c:63
 msgid "You feel a disturbance in the force..."
 msgstr ""
 
-#: ../libgaim/plugins/psychic.c:85
+#: ../libgaim/plugins/psychic.c:82
 msgid "Only enable for users on the buddy list"
 msgstr "Nur ŝaltu por uzantoj en la kunullisto"
 
-#: ../libgaim/plugins/psychic.c:90
+#: ../libgaim/plugins/psychic.c:87
 msgid "Disable when away"
 msgstr "Malŝaltu kiam fora"
 
-#: ../libgaim/plugins/psychic.c:94
+#: ../libgaim/plugins/psychic.c:91
 msgid "Display notification message in conversations"
 msgstr "Montru avizmesaĝon en konversacioj"
 
-#: ../libgaim/plugins/psychic.c:99
-msgid "Raise psychic conversations"
-msgstr "Startigu psiŝikajn konversaciojn"
-
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -6263,7 +6151,7 @@
 #. *  description
 #: ../libgaim/plugins/ssl/ssl.c:97 ../libgaim/plugins/ssl/ssl.c:99
 msgid "Provides a wrapper around SSL support libraries."
-msgstr "Provizas ŝelon ĉirkaŭ SSL subtenantaj bibliotekoj."
+msgstr ""
 
 #. *< type
 #. *< ui_requirement
@@ -6282,7 +6170,7 @@
 #: ../libgaim/plugins/ssl/ssl-gnutls.c:243
 #: ../libgaim/plugins/ssl/ssl-gnutls.c:245
 msgid "Provides SSL support through GNUTLS."
-msgstr "Provizas SSL-an subtenon per GNUTLS."
+msgstr ""
 
 #. *< type
 #. *< ui_requirement
@@ -6300,7 +6188,7 @@
 #. *  description
 #: ../libgaim/plugins/ssl/ssl-nss.c:412 ../libgaim/plugins/ssl/ssl-nss.c:414
 msgid "Provides SSL support through Mozilla NSS."
-msgstr "Provizas SSL-an subtenon per Mozilla NSS."
+msgstr ""
 
 #: ../libgaim/plugins/statenotify.c:50
 #, c-format
@@ -6367,16 +6255,10 @@
 
 #: ../libgaim/plugins/tcl/tcl.c:413
 msgid "Tcl Plugin Loader"
-msgstr "Tcl Kromaĵo Ŝarĝilo"
+msgstr ""
 
 #: ../libgaim/plugins/tcl/tcl.c:415 ../libgaim/plugins/tcl/tcl.c:416
 msgid "Provides support for loading Tcl plugins"
-msgstr "Provizas subteno por ŝarĝi Tcl-an kromaĵojn"
-
-#: ../libgaim/plugins/tcl/tcl.c:481
-msgid ""
-"Unable to detect ActiveTCL installation. If you wish to use TCL plugins, "
-"install ActiveTCL from http://www.activestate.com\n"
 msgstr ""
 
 #. Send a message about the connection error
@@ -6389,7 +6271,7 @@
 msgstr ""
 
 #: ../libgaim/protocols/bonjour/bonjour.c:337
-#: ../libgaim/protocols/sametime/sametime.c:3274
+#: ../libgaim/protocols/sametime/sametime.c:3239
 #, c-format
 msgid ""
 "\n"
@@ -6425,30 +6307,30 @@
 #: ../libgaim/protocols/bonjour/bonjour.c:473
 #: ../libgaim/protocols/bonjour/bonjour.c:481
 #: ../libgaim/protocols/bonjour/bonjour.c:539
-#: ../libgaim/protocols/silc/silc.c:300
+#: ../libgaim/protocols/silc/silc.c:301
 msgid "Gaim User"
 msgstr "Gaim Uzanto"
 
 #. Creating the user splits
 #: ../libgaim/protocols/bonjour/bonjour.c:577
-#: ../libgaim/protocols/silc/silc.c:931
+#: ../libgaim/protocols/silc/silc.c:935
 msgid "Hostname"
 msgstr "Komputilnomo"
 
 #. Creating the options for the protocol
 #: ../libgaim/protocols/bonjour/bonjour.c:581 ../libgaim/protocols/gg/gg.c:622
-#: ../libgaim/protocols/jabber/jabber.c:796
+#: ../libgaim/protocols/jabber/jabber.c:800
 msgid "First name"
 msgstr "Antaŭ nomo"
 
 #: ../libgaim/protocols/bonjour/bonjour.c:584 ../libgaim/protocols/gg/gg.c:617
-#: ../libgaim/protocols/jabber/jabber.c:801
+#: ../libgaim/protocols/jabber/jabber.c:805
 msgid "Last name"
 msgstr "Familia nomo"
 
 #: ../libgaim/protocols/bonjour/bonjour.c:587 ../libgaim/protocols/gg/gg.c:468
-#: ../libgaim/protocols/jabber/jabber.c:786
-#: ../libgaim/protocols/silc/silc.c:695 ../libgaim/protocols/silc/silc.c:935
+#: ../libgaim/protocols/jabber/jabber.c:790
+#: ../libgaim/protocols/silc/silc.c:699 ../libgaim/protocols/silc/silc.c:939
 msgid "E-mail"
 msgstr "Retadreso"
 
@@ -6489,11 +6371,11 @@
 msgid "Unable to send the message, the conversation couldn't be started."
 msgstr ""
 
-#: ../libgaim/protocols/gg/gg.c:76 ../libgaim/proxy.c:1777
+#: ../libgaim/protocols/gg/gg.c:76 ../libgaim/proxy.c:1776
 msgid "Invalid proxy settings"
 msgstr ""
 
-#: ../libgaim/protocols/gg/gg.c:77 ../libgaim/proxy.c:1777
+#: ../libgaim/protocols/gg/gg.c:77 ../libgaim/proxy.c:1776
 msgid ""
 "Either the host name or port number specified for your given proxy type is "
 "invalid."
@@ -6555,15 +6437,15 @@
 
 #: ../libgaim/protocols/gg/gg.c:407
 msgid "New Gadu-Gadu Account Registered"
-msgstr "Nova Gadu-Gadu-a Konto Registrita"
+msgstr ""
 
 #: ../libgaim/protocols/gg/gg.c:408
 msgid "Registration completed successfully!"
 msgstr "Registro pleniĝis sukcese!"
 
 #: ../libgaim/protocols/gg/gg.c:473 ../libgaim/protocols/gg/gg.c:764
-#: ../libgaim/protocols/jabber/jabber.c:775
-#: ../libgaim/protocols/jabber/jabber.c:1330
+#: ../libgaim/protocols/jabber/jabber.c:779
+#: ../libgaim/protocols/jabber/jabber.c:1339
 msgid "Password"
 msgstr "Pasvorto"
 
@@ -6581,7 +6463,7 @@
 
 #: ../libgaim/protocols/gg/gg.c:493 ../libgaim/protocols/gg/gg.c:494
 msgid "Register New Gadu-Gadu Account"
-msgstr "Registru Novan Gadu-Gadu-an Konton"
+msgstr ""
 
 #: ../libgaim/protocols/gg/gg.c:495
 msgid "Please, fill in the following fields"
@@ -6589,12 +6471,12 @@
 
 #. General
 #: ../libgaim/protocols/gg/gg.c:627 ../libgaim/protocols/gg/gg.c:1038
-#: ../libgaim/protocols/gg/gg.c:1104 ../libgaim/protocols/gg/gg.c:2188
+#: ../libgaim/protocols/gg/gg.c:1104 ../libgaim/protocols/gg/gg.c:2182
 #: ../libgaim/protocols/jabber/buddy.c:271
 #: ../libgaim/protocols/jabber/buddy.c:800
 #: ../libgaim/protocols/jabber/buddy.c:1526
 #: ../libgaim/protocols/jabber/buddy.c:1708
-#: ../libgaim/protocols/jabber/jabber.c:791
+#: ../libgaim/protocols/jabber/jabber.c:795
 #: ../libgaim/protocols/msn/msn.c:1370 ../libgaim/protocols/msn/msn.c:1536
 #: ../libgaim/protocols/qq/buddy_info.c:41
 #: ../libgaim/protocols/silc/buddy.c:1528 ../libgaim/protocols/silc/ops.c:1036
@@ -6604,9 +6486,9 @@
 msgstr "Karesnomo"
 
 #: ../libgaim/protocols/gg/gg.c:632 ../libgaim/protocols/gg/gg.c:1043
-#: ../libgaim/protocols/gg/gg.c:1107 ../libgaim/protocols/jabber/jabber.c:811
-#: ../libgaim/protocols/oscar/oscar.c:3685
-#: ../libgaim/protocols/oscar/oscar.c:3693
+#: ../libgaim/protocols/gg/gg.c:1107 ../libgaim/protocols/jabber/jabber.c:815
+#: ../libgaim/protocols/oscar/oscar.c:3683
+#: ../libgaim/protocols/oscar/oscar.c:3691
 #: ../libgaim/protocols/qq/buddy_info.c:47
 msgid "City"
 msgstr "Urbo"
@@ -6616,7 +6498,7 @@
 msgstr "Naskiĝjaro"
 
 #: ../libgaim/protocols/gg/gg.c:640 ../libgaim/protocols/msn/msn.c:1538
-#: ../libgaim/protocols/oscar/oscar.c:3649
+#: ../libgaim/protocols/oscar/oscar.c:3647
 #: ../libgaim/protocols/qq/buddy_info.c:44
 #: ../libgaim/protocols/yahoo/yahoo_profile.c:1080
 msgid "Gender"
@@ -6626,12 +6508,12 @@
 msgid "Male or female"
 msgstr "Malina aŭ ina"
 
-#: ../libgaim/protocols/gg/gg.c:642 ../libgaim/protocols/oscar/oscar.c:3649
+#: ../libgaim/protocols/gg/gg.c:642 ../libgaim/protocols/oscar/oscar.c:3647
 #: ../libgaim/protocols/qq/buddy_info.c:81
 msgid "Male"
 msgstr "Malina"
 
-#: ../libgaim/protocols/gg/gg.c:643 ../libgaim/protocols/oscar/oscar.c:3649
+#: ../libgaim/protocols/gg/gg.c:643 ../libgaim/protocols/oscar/oscar.c:3647
 #: ../libgaim/protocols/qq/buddy_info.c:82
 msgid "Female"
 msgstr "Ina"
@@ -6690,14 +6572,14 @@
 msgstr "Aldonu al babilejo..."
 
 #: ../libgaim/protocols/gg/gg.c:1029 ../libgaim/protocols/gg/gg.c:1098
-#: ../libgaim/protocols/oscar/oscar.c:3621
+#: ../libgaim/protocols/oscar/oscar.c:3619
 msgid "UIN"
 msgstr "UIN"
 
 #: ../libgaim/protocols/gg/gg.c:1033 ../libgaim/protocols/gg/gg.c:1101
 #: ../libgaim/protocols/jabber/buddy.c:1522
 #: ../libgaim/protocols/jabber/buddy.c:1698
-#: ../libgaim/protocols/oscar/oscar.c:3632
+#: ../libgaim/protocols/oscar/oscar.c:3630
 #: ../libgaim/protocols/silc/ops.c:1024
 msgid "First Name"
 msgstr "Persona Nomo"
@@ -6707,13 +6589,13 @@
 msgstr "Naskiĝjaro"
 
 #: ../libgaim/protocols/gg/gg.c:1092 ../libgaim/protocols/gg/gg.c:1161
-#: ../libgaim/protocols/oscar/oscar.c:3796
+#: ../libgaim/protocols/oscar/oscar.c:3794
 msgid "Unable to display the search results."
 msgstr "Ne eblas vidigi la serĉo-rezultojn."
 
 #: ../libgaim/protocols/gg/gg.c:1152
 msgid "Gadu-Gadu Public Directory"
-msgstr "Gadu-Gadu Publika Katalogo"
+msgstr ""
 
 #: ../libgaim/protocols/gg/gg.c:1153
 msgid "Search results"
@@ -6747,69 +6629,69 @@
 msgid "Your buddy list was stored on the server."
 msgstr ""
 
-#: ../libgaim/protocols/gg/gg.c:1486 ../libgaim/protocols/gg/gg.c:1716
+#: ../libgaim/protocols/gg/gg.c:1486 ../libgaim/protocols/gg/gg.c:1710
 msgid "Connection failed."
 msgstr "Konekto malsukcesis."
 
-#: ../libgaim/protocols/gg/gg.c:1622 ../libgaim/protocols/msn/msn.c:562
+#: ../libgaim/protocols/gg/gg.c:1616 ../libgaim/protocols/msn/msn.c:562
 msgid "Blocked"
 msgstr "Blokita"
 
-#: ../libgaim/protocols/gg/gg.c:1645
+#: ../libgaim/protocols/gg/gg.c:1639
 msgid "Add to chat"
 msgstr "Aldonu al babilejo"
 
-#: ../libgaim/protocols/gg/gg.c:1654
+#: ../libgaim/protocols/gg/gg.c:1648
 msgid "Unblock"
 msgstr "Malbloku"
 
-#: ../libgaim/protocols/gg/gg.c:1658
+#: ../libgaim/protocols/gg/gg.c:1652
 msgid "Block"
 msgstr "Bloku"
 
-#: ../libgaim/protocols/gg/gg.c:1675
+#: ../libgaim/protocols/gg/gg.c:1669
 msgid "Chat _name:"
 msgstr "Babilejo _nomo:"
 
-#: ../libgaim/protocols/gg/gg.c:1908
+#: ../libgaim/protocols/gg/gg.c:1902
 msgid "Chat error"
 msgstr "Babileraro"
 
-#: ../libgaim/protocols/gg/gg.c:1909
+#: ../libgaim/protocols/gg/gg.c:1903
 msgid "This chat name is already in use"
-msgstr "Tiu babil nomo jam estas uzata"
-
-#: ../libgaim/protocols/gg/gg.c:1992
+msgstr ""
+
+#: ../libgaim/protocols/gg/gg.c:1986
 msgid "Not connected to the server."
-msgstr "Ne konektita al servilo."
+msgstr ""
+
+#: ../libgaim/protocols/gg/gg.c:2009
+msgid "Find buddies..."
+msgstr ""
 
 #: ../libgaim/protocols/gg/gg.c:2015
-msgid "Find buddies..."
-msgstr "Trovu kunulojn..."
+msgid "Change password..."
+msgstr ""
 
 #: ../libgaim/protocols/gg/gg.c:2021
-msgid "Change password..."
-msgstr "Ŝanĝu pasvorton..."
-
-#: ../libgaim/protocols/gg/gg.c:2027
 msgid "Upload buddylist to Server"
-msgstr "Alŝutu kunulliston al Servilo"
-
-#: ../libgaim/protocols/gg/gg.c:2031
+msgstr ""
+
+#: ../libgaim/protocols/gg/gg.c:2025
 msgid "Download buddylist from Server"
-msgstr "Elŝutu kunulliston el Servilo"
-
-#: ../libgaim/protocols/gg/gg.c:2035
+msgstr ""
+
+#: ../libgaim/protocols/gg/gg.c:2029
 msgid "Delete buddylist from Server"
-msgstr "Forigu kunulliston de Servilo"
-
-#: ../libgaim/protocols/gg/gg.c:2039
+msgstr ""
+
+#: ../libgaim/protocols/gg/gg.c:2033
 msgid "Save buddylist to file..."
-msgstr "Konservu kunulliston en dosiero..."
-
-#: ../libgaim/protocols/gg/gg.c:2043
+msgstr ""
+
+#: ../libgaim/protocols/gg/gg.c:2037
 msgid "Load buddylist from file..."
-msgstr "Ŝarĝu kunulliston el dosiero..."
+msgstr ""
 
 #. magic
 #. major_version
@@ -6822,32 +6704,32 @@
 #. id
 #. name
 #. version
-#: ../libgaim/protocols/gg/gg.c:2140
+#: ../libgaim/protocols/gg/gg.c:2134
 msgid "Gadu-Gadu Protocol Plugin"
 msgstr "Gadu-Gadu Protokol-Kromaĵo"
 
 #. summary
-#: ../libgaim/protocols/gg/gg.c:2141
+#: ../libgaim/protocols/gg/gg.c:2135
 msgid "Polish popular IM"
 msgstr "Pola fama TM"
 
-#: ../libgaim/protocols/gg/gg.c:2189
+#: ../libgaim/protocols/gg/gg.c:2183
 msgid "Gadu-Gadu User"
 msgstr "Gadu-Gadu Uzanto"
 
-#: ../libgaim/protocols/irc/cmds.c:43 ../libgaim/protocols/silc/silc.c:1581
+#: ../libgaim/protocols/irc/cmds.c:43 ../libgaim/protocols/silc/silc.c:1585
 #, c-format
 msgid "Unknown command: %s"
 msgstr "Nekonata komando: %s"
 
 #: ../libgaim/protocols/irc/cmds.c:505 ../libgaim/protocols/jabber/chat.c:591
-#: ../libgaim/protocols/silc/silc.c:1289
+#: ../libgaim/protocols/silc/silc.c:1293
 #, c-format
 msgid "current topic is: %s"
 msgstr "aktuala temo estas: %s"
 
 #: ../libgaim/protocols/irc/cmds.c:509 ../libgaim/protocols/jabber/chat.c:595
-#: ../libgaim/protocols/silc/silc.c:1293
+#: ../libgaim/protocols/silc/silc.c:1297
 msgid "No topic is set"
 msgstr "Neniu temo estas"
 
@@ -6882,9 +6764,9 @@
 msgstr "MOTD por %s"
 
 #: ../libgaim/protocols/irc/irc.c:128 ../libgaim/protocols/irc/irc.c:166
-#: ../libgaim/protocols/irc/irc.c:608 ../libgaim/protocols/irc/irc.c:633
+#: ../libgaim/protocols/irc/irc.c:614 ../libgaim/protocols/irc/irc.c:639
 msgid "Server has disconnected"
-msgstr "Servilo diskonektis"
+msgstr "Servilo malkonektis"
 
 #: ../libgaim/protocols/irc/irc.c:259
 msgid "View MOTD"
@@ -6902,40 +6784,40 @@
 msgid "IRC nicks may not contain whitespace"
 msgstr "IRC karesnomoj ne enhaveblas blankan spacon"
 
-#: ../libgaim/protocols/irc/irc.c:337 ../libgaim/protocols/jabber/jabber.c:571
-#: ../libgaim/protocols/jabber/jabber.c:916
+#: ../libgaim/protocols/irc/irc.c:337 ../libgaim/protocols/jabber/jabber.c:575
+#: ../libgaim/protocols/jabber/jabber.c:920
 msgid "SSL support unavailable"
 msgstr "SSL subteno ne disponeblas"
 
-#: ../libgaim/protocols/irc/irc.c:348 ../libgaim/protocols/simple/simple.c:464
-#: ../libgaim/protocols/simple/simple.c:1584
+#: ../libgaim/protocols/irc/irc.c:349 ../libgaim/protocols/simple/simple.c:466
+#: ../libgaim/protocols/simple/simple.c:1588
 msgid "Couldn't create socket"
 msgstr ""
 
-#: ../libgaim/protocols/irc/irc.c:412 ../libgaim/protocols/jabber/jabber.c:449
+#: ../libgaim/protocols/irc/irc.c:415 ../libgaim/protocols/jabber/jabber.c:451
 #: ../libgaim/protocols/oscar/oscar.c:1220
 msgid "Couldn't connect to host"
 msgstr "Ne povis konekti al servilo"
 
-#: ../libgaim/protocols/irc/irc.c:434 ../libgaim/protocols/jabber/jabber.c:473
+#: ../libgaim/protocols/irc/irc.c:437 ../libgaim/protocols/jabber/jabber.c:475
 msgid "Connection Failed"
 msgstr "Konekto Malsukcesis"
 
-#: ../libgaim/protocols/irc/irc.c:437 ../libgaim/protocols/jabber/jabber.c:476
+#: ../libgaim/protocols/irc/irc.c:440 ../libgaim/protocols/jabber/jabber.c:478
 msgid "SSL Handshake Failed"
 msgstr "SSL kvitanca reĝimo malsukcesis"
 
-#: ../libgaim/protocols/irc/irc.c:605 ../libgaim/protocols/irc/irc.c:630
+#: ../libgaim/protocols/irc/irc.c:611 ../libgaim/protocols/irc/irc.c:636
 msgid "Read error"
 msgstr "Legeraro"
 
-#: ../libgaim/protocols/irc/irc.c:769 ../libgaim/protocols/silc/chat.c:1421
+#: ../libgaim/protocols/irc/irc.c:775 ../libgaim/protocols/silc/chat.c:1421
 #: ../libgaim/protocols/yahoo/yahoochat.c:1438
 msgid "Users"
 msgstr "Uzantoj"
 
-#: ../libgaim/protocols/irc/irc.c:772
-#: ../libgaim/protocols/sametime/sametime.c:3385
+#: ../libgaim/protocols/irc/irc.c:778
+#: ../libgaim/protocols/sametime/sametime.c:3350
 #: ../libgaim/protocols/silc/chat.c:1424 ../libgaim/protocols/silc/ops.c:1380
 #: ../libgaim/protocols/yahoo/yahoochat.c:1447
 msgid "Topic"
@@ -6949,49 +6831,48 @@
 #. *< id
 #. *< name
 #. *< version
-#: ../libgaim/protocols/irc/irc.c:902
+#: ../libgaim/protocols/irc/irc.c:908
 msgid "IRC Protocol Plugin"
 msgstr "IRC Protokol-Kromaĵo"
 
 #. *  summary
-#: ../libgaim/protocols/irc/irc.c:903
+#: ../libgaim/protocols/irc/irc.c:909
 msgid "The IRC Protocol Plugin that Sucks Less"
 msgstr "La IRC Protokolo Kromaĵo kiu Malpli Fekas"
 
 #. host to connect to
-#: ../libgaim/protocols/irc/irc.c:922 ../libgaim/protocols/irc/msgs.c:235
-#: ../libgaim/protocols/jabber/jabber.c:1961
-#: ../libgaim/protocols/msn/msn.c:2054 ../libgaim/protocols/oscar/oscar.c:6533
-#: ../libgaim/protocols/qq/qq.c:1031
-#: ../libgaim/protocols/sametime/sametime.c:5720
+#: ../libgaim/protocols/irc/irc.c:928 ../libgaim/protocols/irc/msgs.c:235
+#: ../libgaim/protocols/jabber/jabber.c:1970
+#: ../libgaim/protocols/msn/msn.c:2054 ../libgaim/protocols/oscar/oscar.c:6531
+#: ../libgaim/protocols/sametime/sametime.c:5638
 #: ../libgaim/protocols/silc/ops.c:1242 ../libgaim/protocols/silc/ops.c:1344
-#: ../libgaim/protocols/simple/simple.c:1835
+#: ../libgaim/protocols/simple/simple.c:1839
 #: ../libgaim/protocols/toc/toc.c:2347
 msgid "Server"
 msgstr "Servilo"
 
 #. port to connect to
-#: ../libgaim/protocols/irc/irc.c:925 ../libgaim/protocols/msn/msn.c:2059
-#: ../libgaim/protocols/oscar/oscar.c:6536 ../libgaim/protocols/qq/qq.c:1034
-#: ../libgaim/protocols/sametime/sametime.c:5725
-#: ../libgaim/protocols/silc/silc.c:1855 ../libgaim/protocols/toc/toc.c:2351
+#: ../libgaim/protocols/irc/irc.c:931 ../libgaim/protocols/msn/msn.c:2059
+#: ../libgaim/protocols/oscar/oscar.c:6534
+#: ../libgaim/protocols/sametime/sametime.c:5643
+#: ../libgaim/protocols/silc/silc.c:1859 ../libgaim/protocols/toc/toc.c:2351
 msgid "Port"
 msgstr "Pordo"
 
-#: ../libgaim/protocols/irc/irc.c:928
+#: ../libgaim/protocols/irc/irc.c:934
 msgid "Encodings"
 msgstr "Kodoprezentoj"
 
-#: ../libgaim/protocols/irc/irc.c:931 ../libgaim/protocols/irc/msgs.c:229
-#: ../libgaim/protocols/jabber/jabber.c:771
+#: ../libgaim/protocols/irc/irc.c:937 ../libgaim/protocols/irc/msgs.c:229
+#: ../libgaim/protocols/jabber/jabber.c:775
 #: ../libgaim/protocols/silc/buddy.c:1531 ../libgaim/protocols/silc/ops.c:1189
 #: ../libgaim/protocols/silc/ops.c:1191 ../libgaim/protocols/silc/ops.c:1338
-#: ../libgaim/protocols/silc/ops.c:1340 ../libgaim/protocols/silc/silc.c:929
+#: ../libgaim/protocols/silc/ops.c:1340 ../libgaim/protocols/silc/silc.c:933
 msgid "Username"
 msgstr "Uzantonomo"
 
-#: ../libgaim/protocols/irc/irc.c:934 ../libgaim/protocols/irc/msgs.c:230
-#: ../libgaim/protocols/silc/silc.c:933
+#: ../libgaim/protocols/irc/irc.c:940 ../libgaim/protocols/irc/msgs.c:230
+#: ../libgaim/protocols/silc/silc.c:937
 msgid "Real name"
 msgstr "Vera nomo"
 
@@ -6999,7 +6880,7 @@
 #. option = gaim_account_option_string_new(_("Quit message"), "quitmsg", IRC_DEFAULT_QUIT);
 #. prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option);
 #.
-#: ../libgaim/protocols/irc/irc.c:942
+#: ../libgaim/protocols/irc/irc.c:948
 msgid "Use SSL"
 msgstr "Uzu SSL-n"
 
@@ -7027,7 +6908,7 @@
 msgid "<b>%s:</b> %s"
 msgstr "<b>%s:</b> %s"
 
-#: ../libgaim/protocols/irc/msgs.c:215 ../libgaim/protocols/oscar/oscar.c:3622
+#: ../libgaim/protocols/irc/msgs.c:215 ../libgaim/protocols/oscar/oscar.c:3620
 #: ../libgaim/protocols/silc/ops.c:1412
 msgid "Nick"
 msgstr "Karesnomo"
@@ -7295,7 +7176,7 @@
 msgstr ""
 
 #: ../libgaim/protocols/irc/parse.c:131
-#: ../libgaim/protocols/jabber/jabber.c:1766
+#: ../libgaim/protocols/jabber/jabber.c:1775
 msgid "nick &lt;new nickname&gt;:  Change your nickname."
 msgstr ""
 
@@ -7386,7 +7267,7 @@
 #: ../libgaim/protocols/irc/parse.c:442
 #, c-format
 msgid "Reply time from %s: %lu seconds"
-msgstr "Responda tempo el %s: %lu sekundoj"
+msgstr ""
 
 #: ../libgaim/protocols/irc/parse.c:443
 msgid "PONG"
@@ -7396,7 +7277,7 @@
 msgid "CTCP PING reply"
 msgstr "CTCP PING respondo"
 
-#: ../libgaim/protocols/irc/parse.c:554 ../libgaim/protocols/irc/parse.c:558
+#: ../libgaim/protocols/irc/parse.c:548 ../libgaim/protocols/irc/parse.c:552
 #: ../libgaim/protocols/toc/toc.c:191 ../libgaim/protocols/toc/toc.c:694
 #: ../libgaim/protocols/toc/toc.c:710 ../libgaim/protocols/toc/toc.c:786
 msgid "Disconnected."
@@ -7454,7 +7335,7 @@
 
 #: ../libgaim/protocols/jabber/auth.c:722
 msgid "SASL error"
-msgstr "SASL eraro"
+msgstr ""
 
 #: ../libgaim/protocols/jabber/buddy.c:268
 #: ../libgaim/protocols/jabber/buddy.c:769
@@ -7474,7 +7355,7 @@
 msgstr "Donita Nomo"
 
 #: ../libgaim/protocols/jabber/buddy.c:272
-#: ../libgaim/protocols/jabber/jabber.c:831
+#: ../libgaim/protocols/jabber/jabber.c:835
 msgid "URL"
 msgstr "URL"
 
@@ -7505,7 +7386,7 @@
 
 #: ../libgaim/protocols/jabber/buddy.c:278
 #: ../libgaim/protocols/jabber/buddy.c:855
-#: ../libgaim/protocols/silc/silc.c:939
+#: ../libgaim/protocols/silc/silc.c:943
 msgid "Country"
 msgstr "Lando"
 
@@ -7541,7 +7422,7 @@
 
 #: ../libgaim/protocols/jabber/buddy.c:285
 #: ../libgaim/protocols/jabber/buddy.c:803 ../libgaim/protocols/msn/msn.c:1595
-#: ../libgaim/protocols/oscar/oscar.c:3665
+#: ../libgaim/protocols/oscar/oscar.c:3663
 msgid "Birthday"
 msgstr "Naskiĝdato"
 
@@ -7558,7 +7439,7 @@
 
 #: ../libgaim/protocols/jabber/buddy.c:640
 msgid "Client:"
-msgstr "Kiento:"
+msgstr ""
 
 #: ../libgaim/protocols/jabber/buddy.c:644
 #: ../libgaim/protocols/jabber/buddy.c:677
@@ -7566,16 +7447,16 @@
 msgstr ""
 
 #: ../libgaim/protocols/jabber/buddy.c:654
-#: ../libgaim/protocols/jabber/jabber.c:1964
+#: ../libgaim/protocols/jabber/jabber.c:1973
 msgid "Resource"
 msgstr "Rimedo"
 
 #: ../libgaim/protocols/jabber/buddy.c:656
-#: ../libgaim/protocols/jabber/jabber.c:1204
-#: ../libgaim/protocols/jabber/jabber.c:1214
-#: ../libgaim/protocols/jabber/jabber.c:1224
-#: ../libgaim/protocols/jabber/jabber.c:1234
-#: ../libgaim/protocols/jabber/jabber.c:1244
+#: ../libgaim/protocols/jabber/jabber.c:1213
+#: ../libgaim/protocols/jabber/jabber.c:1223
+#: ../libgaim/protocols/jabber/jabber.c:1233
+#: ../libgaim/protocols/jabber/jabber.c:1243
+#: ../libgaim/protocols/jabber/jabber.c:1253
 msgid "Priority"
 msgstr "Prioriteco"
 
@@ -7589,9 +7470,9 @@
 msgstr "Meza Nomo"
 
 #: ../libgaim/protocols/jabber/buddy.c:823
-#: ../libgaim/protocols/jabber/jabber.c:806
-#: ../libgaim/protocols/oscar/oscar.c:3684
-#: ../libgaim/protocols/oscar/oscar.c:3692
+#: ../libgaim/protocols/jabber/jabber.c:810
+#: ../libgaim/protocols/oscar/oscar.c:3682
+#: ../libgaim/protocols/oscar/oscar.c:3690
 #: ../libgaim/protocols/qq/buddy_info.c:54
 #: ../libgaim/protocols/silc/ops.c:1064
 msgid "Address"
@@ -7634,7 +7515,7 @@
 msgstr "Eliĝu"
 
 #: ../libgaim/protocols/jabber/buddy.c:1369
-#: ../libgaim/protocols/jabber/jabber.c:1213
+#: ../libgaim/protocols/jabber/jabber.c:1222
 msgid "Chatty"
 msgstr "Babilema"
 
@@ -7643,10 +7524,10 @@
 msgstr "Longfora"
 
 #: ../libgaim/protocols/jabber/buddy.c:1375
-#: ../libgaim/protocols/jabber/jabber.c:1243
+#: ../libgaim/protocols/jabber/jabber.c:1252
 #: ../libgaim/protocols/oscar/oscar.c:688
-#: ../libgaim/protocols/oscar/oscar.c:5656
-#: ../libgaim/protocols/sametime/sametime.c:3308
+#: ../libgaim/protocols/oscar/oscar.c:5654
+#: ../libgaim/protocols/sametime/sametime.c:3273
 msgid "Do Not Disturb"
 msgstr "Ne Ĝenu"
 
@@ -7656,7 +7537,7 @@
 
 #: ../libgaim/protocols/jabber/buddy.c:1524
 #: ../libgaim/protocols/jabber/buddy.c:1703
-#: ../libgaim/protocols/oscar/oscar.c:3633
+#: ../libgaim/protocols/oscar/oscar.c:3631
 msgid "Last Name"
 msgstr "Familia Nomo"
 
@@ -7692,15 +7573,15 @@
 
 #: ../libgaim/protocols/jabber/buddy.c:1713
 #: ../libgaim/protocols/novell/novell.c:1488
-#: ../libgaim/protocols/oscar/oscar.c:3635
-#: ../libgaim/protocols/oscar/oscar.c:3642
+#: ../libgaim/protocols/oscar/oscar.c:3633
+#: ../libgaim/protocols/oscar/oscar.c:3640
 msgid "E-Mail Address"
 msgstr "Retadreso"
 
 #: ../libgaim/protocols/jabber/buddy.c:1722
 #: ../libgaim/protocols/jabber/buddy.c:1723
 msgid "Search for Jabber users"
-msgstr "Serĉu Jabber-ajn uzantojn"
+msgstr ""
 
 #: ../libgaim/protocols/jabber/buddy.c:1737
 msgid "Invalid Directory"
@@ -7719,10 +7600,10 @@
 msgstr "Serŝu Adreslibron"
 
 #: ../libgaim/protocols/jabber/chat.c:41
-#: ../libgaim/protocols/oscar/oscar.c:5139
+#: ../libgaim/protocols/oscar/oscar.c:5137
 #: ../libgaim/protocols/yahoo/yahoochat.c:999
 msgid "_Room:"
-msgstr "_Ĉambro:"
+msgstr "_Ĉambro"
 
 #: ../libgaim/protocols/jabber/chat.c:47
 msgid "_Server:"
@@ -7730,7 +7611,7 @@
 
 #: ../libgaim/protocols/jabber/chat.c:53
 msgid "_Handle:"
-msgstr "_Tenilo:"
+msgstr "_Tenilo"
 
 #: ../libgaim/protocols/jabber/chat.c:223
 #, c-format
@@ -7754,12 +7635,12 @@
 #: ../libgaim/protocols/jabber/chat.c:235
 #, c-format
 msgid "%s is not a valid room handle"
-msgstr "%s ne estas valida ĉambro tenilo"
+msgstr ""
 
 #: ../libgaim/protocols/jabber/chat.c:236
 #: ../libgaim/protocols/jabber/chat.c:237
 msgid "Invalid Room Handle"
-msgstr "Malvalida Ĉambro Tenilo"
+msgstr ""
 
 #: ../libgaim/protocols/jabber/chat.c:396
 msgid "Configuration error"
@@ -7823,433 +7704,433 @@
 msgid "Read Error"
 msgstr "Legeraro"
 
-#: ../libgaim/protocols/jabber/jabber.c:493
-#: ../libgaim/protocols/jabber/jabber.c:924
+#: ../libgaim/protocols/jabber/jabber.c:497
+#: ../libgaim/protocols/jabber/jabber.c:930
 msgid "Unable to create socket"
 msgstr ""
 
-#: ../libgaim/protocols/jabber/jabber.c:541
-#: ../libgaim/protocols/jabber/jabber.c:884
+#: ../libgaim/protocols/jabber/jabber.c:545
+#: ../libgaim/protocols/jabber/jabber.c:888
 msgid "Invalid Jabber ID"
 msgstr "Malvalida Jabber ID"
 
-#: ../libgaim/protocols/jabber/jabber.c:612
+#: ../libgaim/protocols/jabber/jabber.c:616
 #, c-format
 msgid "Registration of %s@%s successful"
 msgstr "Registrado de %s@%s sukcesa"
 
-#: ../libgaim/protocols/jabber/jabber.c:614
-#: ../libgaim/protocols/jabber/jabber.c:615
+#: ../libgaim/protocols/jabber/jabber.c:618
+#: ../libgaim/protocols/jabber/jabber.c:619
 msgid "Registration Successful"
 msgstr "Registrado Sukcesa"
 
-#: ../libgaim/protocols/jabber/jabber.c:621
-#: ../libgaim/protocols/jabber/jabber.c:1479
+#: ../libgaim/protocols/jabber/jabber.c:625
+#: ../libgaim/protocols/jabber/jabber.c:1488
 msgid "Unknown Error"
 msgstr "Nekonata Eraro"
 
-#: ../libgaim/protocols/jabber/jabber.c:623
-#: ../libgaim/protocols/jabber/jabber.c:624
+#: ../libgaim/protocols/jabber/jabber.c:627
+#: ../libgaim/protocols/jabber/jabber.c:628
 msgid "Registration Failed"
 msgstr "Registrado Malsukcesis"
 
-#: ../libgaim/protocols/jabber/jabber.c:739
-#: ../libgaim/protocols/jabber/jabber.c:740
+#: ../libgaim/protocols/jabber/jabber.c:743
+#: ../libgaim/protocols/jabber/jabber.c:744
 msgid "Already Registered"
 msgstr "Jam Registrita"
 
-#: ../libgaim/protocols/jabber/jabber.c:816
-#: ../libgaim/protocols/oscar/oscar.c:3686
-#: ../libgaim/protocols/oscar/oscar.c:3694
+#: ../libgaim/protocols/jabber/jabber.c:820
+#: ../libgaim/protocols/oscar/oscar.c:3684
+#: ../libgaim/protocols/oscar/oscar.c:3692
 msgid "State"
-msgstr "Ŝato"
-
-#: ../libgaim/protocols/jabber/jabber.c:821
+msgstr "tŜato"
+
+#: ../libgaim/protocols/jabber/jabber.c:825
 msgid "Postal code"
 msgstr "Poŝtkodo"
 
-#: ../libgaim/protocols/jabber/jabber.c:826
-#: ../libgaim/protocols/silc/ops.c:1069 ../libgaim/protocols/silc/silc.c:697
+#: ../libgaim/protocols/jabber/jabber.c:830
+#: ../libgaim/protocols/silc/ops.c:1069 ../libgaim/protocols/silc/silc.c:701
 #: ../libgaim/protocols/silc/util.c:555
 msgid "Phone"
 msgstr "Telefono"
 
-#: ../libgaim/protocols/jabber/jabber.c:836
+#: ../libgaim/protocols/jabber/jabber.c:840
 msgid "Date"
 msgstr "Dato"
 
-#: ../libgaim/protocols/jabber/jabber.c:844
+#: ../libgaim/protocols/jabber/jabber.c:848
 msgid "Please fill out the information below to register your new account."
 msgstr "B.v. plenigi la informon sube por registradi vian novan konton."
 
-#: ../libgaim/protocols/jabber/jabber.c:847
-#: ../libgaim/protocols/jabber/jabber.c:848
+#: ../libgaim/protocols/jabber/jabber.c:851
+#: ../libgaim/protocols/jabber/jabber.c:852
 msgid "Register New Jabber Account"
 msgstr "Registradu Novan Jabber-n Konton"
 
-#: ../libgaim/protocols/jabber/jabber.c:1004
+#: ../libgaim/protocols/jabber/jabber.c:1013
 msgid "Initializing Stream"
 msgstr ""
 
-#: ../libgaim/protocols/jabber/jabber.c:1009
+#: ../libgaim/protocols/jabber/jabber.c:1018
 #: ../libgaim/protocols/msn/session.c:350
 msgid "Authenticating"
 msgstr "Aŭtentokontrolante"
 
-#: ../libgaim/protocols/jabber/jabber.c:1018
+#: ../libgaim/protocols/jabber/jabber.c:1027
 msgid "Re-initializing Stream"
 msgstr ""
 
-#: ../libgaim/protocols/jabber/jabber.c:1092
-#: ../libgaim/protocols/jabber/jabber.c:1457
-#: ../libgaim/protocols/jabber/jabber.c:1498
-#: ../libgaim/protocols/jabber/jabber.c:1532
+#: ../libgaim/protocols/jabber/jabber.c:1101
+#: ../libgaim/protocols/jabber/jabber.c:1466
+#: ../libgaim/protocols/jabber/jabber.c:1507
+#: ../libgaim/protocols/jabber/jabber.c:1541
 #: ../libgaim/protocols/oscar/oscar.c:766
-#: ../libgaim/protocols/oscar/oscar.c:5445
+#: ../libgaim/protocols/oscar/oscar.c:5443
 msgid "Not Authorized"
 msgstr "Malpermesita"
 
-#: ../libgaim/protocols/jabber/jabber.c:1134
+#: ../libgaim/protocols/jabber/jabber.c:1143
 msgid "Both"
 msgstr "Ambaŭ"
 
-#: ../libgaim/protocols/jabber/jabber.c:1136
+#: ../libgaim/protocols/jabber/jabber.c:1145
 msgid "From (To pending)"
 msgstr "De (Al atendante)"
 
-#: ../libgaim/protocols/jabber/jabber.c:1141
+#: ../libgaim/protocols/jabber/jabber.c:1150
 msgid "To"
 msgstr "Al"
 
-#: ../libgaim/protocols/jabber/jabber.c:1143
+#: ../libgaim/protocols/jabber/jabber.c:1152
 msgid "None (To pending)"
 msgstr "Nenio (Al atendante)"
 
-#: ../libgaim/protocols/jabber/jabber.c:1147
+#: ../libgaim/protocols/jabber/jabber.c:1156
 msgid "Subscription"
 msgstr "Abono"
 
-#: ../libgaim/protocols/jabber/jabber.c:1273
+#: ../libgaim/protocols/jabber/jabber.c:1282
 msgid "Password Changed"
 msgstr "Pasvorto Ŝanĝita"
 
-#: ../libgaim/protocols/jabber/jabber.c:1274
+#: ../libgaim/protocols/jabber/jabber.c:1283
 msgid "Your password has been changed."
 msgstr "Via pasvorto estas ŝanĝita."
 
-#: ../libgaim/protocols/jabber/jabber.c:1278
-#: ../libgaim/protocols/jabber/jabber.c:1279
+#: ../libgaim/protocols/jabber/jabber.c:1287
+#: ../libgaim/protocols/jabber/jabber.c:1288
 msgid "Error changing password"
 msgstr "Erara ŝanĝante pasvorton"
 
-#: ../libgaim/protocols/jabber/jabber.c:1335
+#: ../libgaim/protocols/jabber/jabber.c:1344
 msgid "Password (again)"
 msgstr "Pasvorton (denove)"
 
-#: ../libgaim/protocols/jabber/jabber.c:1340
-#: ../libgaim/protocols/jabber/jabber.c:1341
+#: ../libgaim/protocols/jabber/jabber.c:1349
+#: ../libgaim/protocols/jabber/jabber.c:1350
 msgid "Change Jabber Password"
 msgstr "Ŝanĝu Jabber-n Pasvorton"
 
-#: ../libgaim/protocols/jabber/jabber.c:1341
+#: ../libgaim/protocols/jabber/jabber.c:1350
 msgid "Please enter your new password"
 msgstr "B.v. tajpi vian novan pasvorton"
 
-#: ../libgaim/protocols/jabber/jabber.c:1351
-#: ../libgaim/protocols/oscar/oscar.c:6247
-#: ../libgaim/protocols/silc/silc.c:1019
+#: ../libgaim/protocols/jabber/jabber.c:1360
+#: ../libgaim/protocols/oscar/oscar.c:6245
+#: ../libgaim/protocols/silc/silc.c:1023
 msgid "Set User Info..."
 msgstr "Difinu Uzanto-Informon..."
 
 #. if (js->protocol_options & CHANGE_PASSWORD) {
-#: ../libgaim/protocols/jabber/jabber.c:1356
-#: ../libgaim/protocols/oscar/oscar.c:6258
-#: ../libgaim/protocols/silc/silc.c:1015
+#: ../libgaim/protocols/jabber/jabber.c:1365
+#: ../libgaim/protocols/oscar/oscar.c:6256
+#: ../libgaim/protocols/silc/silc.c:1019
 msgid "Change Password..."
 msgstr "Ŝanĝu Pasvorton..."
 
 #. }
-#: ../libgaim/protocols/jabber/jabber.c:1361
+#: ../libgaim/protocols/jabber/jabber.c:1370
 msgid "Search for Users..."
 msgstr "Serĉu Uzantojn..."
 
-#: ../libgaim/protocols/jabber/jabber.c:1437
+#: ../libgaim/protocols/jabber/jabber.c:1446
 msgid "Bad Request"
 msgstr "Malbona Demando"
 
-#: ../libgaim/protocols/jabber/jabber.c:1439
+#: ../libgaim/protocols/jabber/jabber.c:1448
 msgid "Conflict"
 msgstr "Konflikto"
 
-#: ../libgaim/protocols/jabber/jabber.c:1441
+#: ../libgaim/protocols/jabber/jabber.c:1450
 msgid "Feature Not Implemented"
 msgstr "Eblo Malrealigita"
 
-#: ../libgaim/protocols/jabber/jabber.c:1443
+#: ../libgaim/protocols/jabber/jabber.c:1452
 msgid "Forbidden"
 msgstr "Malpermesita"
 
-#: ../libgaim/protocols/jabber/jabber.c:1445
+#: ../libgaim/protocols/jabber/jabber.c:1454
 msgid "Gone"
 msgstr "Foririnta"
 
-#: ../libgaim/protocols/jabber/jabber.c:1447
-#: ../libgaim/protocols/jabber/jabber.c:1522
+#: ../libgaim/protocols/jabber/jabber.c:1456
+#: ../libgaim/protocols/jabber/jabber.c:1531
 msgid "Internal Server Error"
 msgstr "Interna Servilo Eraro"
 
-#: ../libgaim/protocols/jabber/jabber.c:1449
+#: ../libgaim/protocols/jabber/jabber.c:1458
 msgid "Item Not Found"
 msgstr "Ero Ne Trovita"
 
-#: ../libgaim/protocols/jabber/jabber.c:1451
+#: ../libgaim/protocols/jabber/jabber.c:1460
 msgid "Malformed Jabber ID"
 msgstr "Misformita Jabber ID"
 
-#: ../libgaim/protocols/jabber/jabber.c:1453
+#: ../libgaim/protocols/jabber/jabber.c:1462
 msgid "Not Acceptable"
 msgstr "Ne Aceptinda"
 
-#: ../libgaim/protocols/jabber/jabber.c:1455
+#: ../libgaim/protocols/jabber/jabber.c:1464
 msgid "Not Allowed"
 msgstr "Ne Permesita"
 
-#: ../libgaim/protocols/jabber/jabber.c:1459
+#: ../libgaim/protocols/jabber/jabber.c:1468
 msgid "Payment Required"
 msgstr "Pago Postulita"
 
-#: ../libgaim/protocols/jabber/jabber.c:1461
+#: ../libgaim/protocols/jabber/jabber.c:1470
 msgid "Recipient Unavailable"
 msgstr "Ricevanto maldisponebla"
 
-#: ../libgaim/protocols/jabber/jabber.c:1465
+#: ../libgaim/protocols/jabber/jabber.c:1474
 msgid "Registration Required"
 msgstr "Registrado Postulita"
 
-#: ../libgaim/protocols/jabber/jabber.c:1467
+#: ../libgaim/protocols/jabber/jabber.c:1476
 msgid "Remote Server Not Found"
 msgstr "Dista Servia Ne Trovita"
 
-#: ../libgaim/protocols/jabber/jabber.c:1469
+#: ../libgaim/protocols/jabber/jabber.c:1478
 msgid "Remote Server Timeout"
 msgstr "Dista Servilo Ne Respondis"
 
-#: ../libgaim/protocols/jabber/jabber.c:1471
+#: ../libgaim/protocols/jabber/jabber.c:1480
 msgid "Server Overloaded"
 msgstr ""
 
-#: ../libgaim/protocols/jabber/jabber.c:1473
+#: ../libgaim/protocols/jabber/jabber.c:1482
 msgid "Service Unavailable"
 msgstr ""
 
-#: ../libgaim/protocols/jabber/jabber.c:1475
-msgid "Subscription Required"
-msgstr ""
-
-#: ../libgaim/protocols/jabber/jabber.c:1477
-msgid "Unexpected Request"
-msgstr ""
-
 #: ../libgaim/protocols/jabber/jabber.c:1484
-msgid "Authorization Aborted"
+msgid "Subscription Required"
 msgstr ""
 
 #: ../libgaim/protocols/jabber/jabber.c:1486
-msgid "Incorrect encoding in authorization"
-msgstr ""
-
-#: ../libgaim/protocols/jabber/jabber.c:1489
-msgid "Invalid authzid"
-msgstr ""
-
-#: ../libgaim/protocols/jabber/jabber.c:1492
-msgid "Invalid Authorization Mechanism"
+msgid "Unexpected Request"
+msgstr ""
+
+#: ../libgaim/protocols/jabber/jabber.c:1493
+msgid "Authorization Aborted"
 msgstr ""
 
 #: ../libgaim/protocols/jabber/jabber.c:1495
+msgid "Incorrect encoding in authorization"
+msgstr ""
+
+#: ../libgaim/protocols/jabber/jabber.c:1498
+msgid "Invalid authzid"
+msgstr ""
+
+#: ../libgaim/protocols/jabber/jabber.c:1501
+msgid "Invalid Authorization Mechanism"
+msgstr ""
+
+#: ../libgaim/protocols/jabber/jabber.c:1504
 msgid "Authorization mechanism too weak"
 msgstr ""
 
-#: ../libgaim/protocols/jabber/jabber.c:1500
-msgid "Temporary Authentication Failure"
-msgstr ""
-
-#: ../libgaim/protocols/jabber/jabber.c:1503
-msgid "Authentication Failure"
-msgstr ""
-
-#: ../libgaim/protocols/jabber/jabber.c:1507
-msgid "Bad Format"
-msgstr ""
-
 #: ../libgaim/protocols/jabber/jabber.c:1509
-msgid "Bad Namespace Prefix"
+msgid "Temporary Authentication Failure"
 msgstr ""
 
 #: ../libgaim/protocols/jabber/jabber.c:1512
-msgid "Resource Conflict"
-msgstr ""
-
-#: ../libgaim/protocols/jabber/jabber.c:1514
-#: ../libgaim/protocols/silc/ops.c:1727
-msgid "Connection Timeout"
+msgid "Authentication Failure"
 msgstr ""
 
 #: ../libgaim/protocols/jabber/jabber.c:1516
-msgid "Host Gone"
+msgid "Bad Format"
 msgstr ""
 
 #: ../libgaim/protocols/jabber/jabber.c:1518
+msgid "Bad Namespace Prefix"
+msgstr ""
+
+#: ../libgaim/protocols/jabber/jabber.c:1521
+msgid "Resource Conflict"
+msgstr ""
+
+#: ../libgaim/protocols/jabber/jabber.c:1523
+#: ../libgaim/protocols/silc/ops.c:1727
+msgid "Connection Timeout"
+msgstr ""
+
+#: ../libgaim/protocols/jabber/jabber.c:1525
+msgid "Host Gone"
+msgstr ""
+
+#: ../libgaim/protocols/jabber/jabber.c:1527
 msgid "Host Unknown"
 msgstr ""
 
-#: ../libgaim/protocols/jabber/jabber.c:1520
+#: ../libgaim/protocols/jabber/jabber.c:1529
 msgid "Improper Addressing"
 msgstr ""
 
-#: ../libgaim/protocols/jabber/jabber.c:1524
+#: ../libgaim/protocols/jabber/jabber.c:1533
 msgid "Invalid ID"
 msgstr ""
 
-#: ../libgaim/protocols/jabber/jabber.c:1526
+#: ../libgaim/protocols/jabber/jabber.c:1535
 msgid "Invalid Namespace"
 msgstr ""
 
-#: ../libgaim/protocols/jabber/jabber.c:1528
+#: ../libgaim/protocols/jabber/jabber.c:1537
 msgid "Invalid XML"
 msgstr ""
 
-#: ../libgaim/protocols/jabber/jabber.c:1530
+#: ../libgaim/protocols/jabber/jabber.c:1539
 msgid "Non-matching Hosts"
 msgstr ""
 
-#: ../libgaim/protocols/jabber/jabber.c:1534
+#: ../libgaim/protocols/jabber/jabber.c:1543
 msgid "Policy Violation"
 msgstr ""
 
-#: ../libgaim/protocols/jabber/jabber.c:1536
+#: ../libgaim/protocols/jabber/jabber.c:1545
 msgid "Remote Connection Failed"
 msgstr ""
 
-#: ../libgaim/protocols/jabber/jabber.c:1538
+#: ../libgaim/protocols/jabber/jabber.c:1547
 msgid "Resource Constraint"
 msgstr ""
 
-#: ../libgaim/protocols/jabber/jabber.c:1540
+#: ../libgaim/protocols/jabber/jabber.c:1549
 msgid "Restricted XML"
 msgstr ""
 
-#: ../libgaim/protocols/jabber/jabber.c:1542
+#: ../libgaim/protocols/jabber/jabber.c:1551
 msgid "See Other Host"
 msgstr ""
 
-#: ../libgaim/protocols/jabber/jabber.c:1544
+#: ../libgaim/protocols/jabber/jabber.c:1553
 msgid "System Shutdown"
 msgstr ""
 
-#: ../libgaim/protocols/jabber/jabber.c:1546
+#: ../libgaim/protocols/jabber/jabber.c:1555
 msgid "Undefined Condition"
 msgstr ""
 
-#: ../libgaim/protocols/jabber/jabber.c:1548
+#: ../libgaim/protocols/jabber/jabber.c:1557
 msgid "Unsupported Encoding"
 msgstr ""
 
-#: ../libgaim/protocols/jabber/jabber.c:1550
+#: ../libgaim/protocols/jabber/jabber.c:1559
 msgid "Unsupported Stanza Type"
 msgstr ""
 
-#: ../libgaim/protocols/jabber/jabber.c:1552
+#: ../libgaim/protocols/jabber/jabber.c:1561
 msgid "Unsupported Version"
 msgstr ""
 
-#: ../libgaim/protocols/jabber/jabber.c:1554
+#: ../libgaim/protocols/jabber/jabber.c:1563
 msgid "XML Not Well Formed"
 msgstr ""
 
-#: ../libgaim/protocols/jabber/jabber.c:1556
+#: ../libgaim/protocols/jabber/jabber.c:1565
 msgid "Stream Error"
 msgstr ""
 
-#: ../libgaim/protocols/jabber/jabber.c:1623
+#: ../libgaim/protocols/jabber/jabber.c:1632
 #, c-format
 msgid "Unable to ban user %s"
 msgstr ""
 
-#: ../libgaim/protocols/jabber/jabber.c:1643
+#: ../libgaim/protocols/jabber/jabber.c:1652
 #, c-format
 msgid "Unknown affiliation: \"%s\""
 msgstr ""
 
-#: ../libgaim/protocols/jabber/jabber.c:1648
+#: ../libgaim/protocols/jabber/jabber.c:1657
 #, c-format
 msgid "Unable to affiliate user %s as \"%s\""
 msgstr ""
 
-#: ../libgaim/protocols/jabber/jabber.c:1667
+#: ../libgaim/protocols/jabber/jabber.c:1676
 #, c-format
 msgid "Unknown role: \"%s\""
 msgstr ""
 
-#: ../libgaim/protocols/jabber/jabber.c:1674
+#: ../libgaim/protocols/jabber/jabber.c:1683
 #, c-format
 msgid "Unable to set role \"%s\" for user: %s"
 msgstr ""
 
-#: ../libgaim/protocols/jabber/jabber.c:1727
+#: ../libgaim/protocols/jabber/jabber.c:1736
 #, c-format
 msgid "Unable to kick user %s"
 msgstr ""
 
-#: ../libgaim/protocols/jabber/jabber.c:1758
+#: ../libgaim/protocols/jabber/jabber.c:1767
 msgid "config:  Configure a chat room."
 msgstr ""
 
-#: ../libgaim/protocols/jabber/jabber.c:1762
-msgid "configure:  Configure a chat room."
-msgstr ""
-
 #: ../libgaim/protocols/jabber/jabber.c:1771
+msgid "configure:  Configure a chat room."
+msgstr ""
+
+#: ../libgaim/protocols/jabber/jabber.c:1780
 msgid "part [room]:  Leave the room."
 msgstr ""
 
-#: ../libgaim/protocols/jabber/jabber.c:1776
+#: ../libgaim/protocols/jabber/jabber.c:1785
 msgid "register:  Register with a chat room."
 msgstr ""
 
-#: ../libgaim/protocols/jabber/jabber.c:1782
+#: ../libgaim/protocols/jabber/jabber.c:1791
 msgid "topic [new topic]:  View or change the topic."
 msgstr ""
 
-#: ../libgaim/protocols/jabber/jabber.c:1788
+#: ../libgaim/protocols/jabber/jabber.c:1797
 msgid "ban &lt;user&gt; [room]:  Ban a user from the room."
 msgstr ""
 
-#: ../libgaim/protocols/jabber/jabber.c:1794
+#: ../libgaim/protocols/jabber/jabber.c:1803
 msgid ""
 "affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Set a user's "
 "affiliation with the room."
 msgstr ""
 
-#: ../libgaim/protocols/jabber/jabber.c:1800
+#: ../libgaim/protocols/jabber/jabber.c:1809
 msgid ""
 "role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: Set a user's "
 "role in the room."
 msgstr ""
 
-#: ../libgaim/protocols/jabber/jabber.c:1806
+#: ../libgaim/protocols/jabber/jabber.c:1815
 msgid "invite &lt;user&gt; [message]:  Invite a user to the room."
 msgstr ""
 
-#: ../libgaim/protocols/jabber/jabber.c:1812
+#: ../libgaim/protocols/jabber/jabber.c:1821
 msgid "join: &lt;room&gt; [server]:  Join a chat on this server."
 msgstr ""
 
-#: ../libgaim/protocols/jabber/jabber.c:1818
+#: ../libgaim/protocols/jabber/jabber.c:1827
 msgid "kick &lt;user&gt; [room]:  Kick a user from the room."
 msgstr ""
 
-#: ../libgaim/protocols/jabber/jabber.c:1823
+#: ../libgaim/protocols/jabber/jabber.c:1832
 msgid "msg &lt;user&gt; &lt;message&gt;:  Send a private message to another user."
 msgstr ""
 
@@ -8263,27 +8144,27 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libgaim/protocols/jabber/jabber.c:1939
-#: ../libgaim/protocols/jabber/jabber.c:1941
+#: ../libgaim/protocols/jabber/jabber.c:1948
+#: ../libgaim/protocols/jabber/jabber.c:1950
 msgid "Jabber Protocol Plugin"
 msgstr "Jabber Protokol-Kromaĵo"
 
-#: ../libgaim/protocols/jabber/jabber.c:1967
+#: ../libgaim/protocols/jabber/jabber.c:1976
 msgid "Force old (port 5223) SSL"
 msgstr "Devigi malnovan (pordo 5223) SSL-n"
 
-#: ../libgaim/protocols/jabber/jabber.c:1972
+#: ../libgaim/protocols/jabber/jabber.c:1981
 msgid "Allow plaintext auth over unencrypted streams"
 msgstr "Permesi plattekstan permeson tra malĉifritaj datumstrioj"
 
-#: ../libgaim/protocols/jabber/jabber.c:1977
-#: ../libgaim/protocols/simple/simple.c:1841
+#: ../libgaim/protocols/jabber/jabber.c:1986
+#: ../libgaim/protocols/simple/simple.c:1845
 msgid "Connect port"
 msgstr "Konekto pordo"
 
 #. Account options
-#: ../libgaim/protocols/jabber/jabber.c:1981
-#: ../libgaim/protocols/silc/silc.c:1851
+#: ../libgaim/protocols/jabber/jabber.c:1990
+#: ../libgaim/protocols/silc/silc.c:1855
 msgid "Connect server"
 msgstr "Konekto servilo"
 
@@ -8305,16 +8186,16 @@
 #: ../libgaim/protocols/jabber/message.c:233
 #, c-format
 msgid "Message delivery to %s failed: %s"
-msgstr "Mesaĝo transdono al %s malsukcesis: %s"
+msgstr ""
 
 #: ../libgaim/protocols/jabber/message.c:236
 msgid "Jabber Message Error"
-msgstr "Jabber mesaĝo eraro"
+msgstr ""
 
 #: ../libgaim/protocols/jabber/message.c:316
 #, c-format
 msgid " (Code %s)"
-msgstr " (Kodo %s)"
+msgstr ""
 
 #: ../libgaim/protocols/jabber/parser.c:179
 msgid "XML Parse error"
@@ -8328,17 +8209,17 @@
 #: ../libgaim/protocols/msn/userlist.c:98
 #, c-format
 msgid "The user %s wants to add %s to his or her buddy list."
-msgstr "La uzanto %s deziras aldoni %s-n en sia kunullisto."
+msgstr ""
 
 #: ../libgaim/protocols/jabber/presence.c:318
-#: ../libgaim/protocols/oscar/oscar.c:2359
-#: ../libgaim/protocols/oscar/oscar.c:5070
+#: ../libgaim/protocols/oscar/oscar.c:2357
+#: ../libgaim/protocols/oscar/oscar.c:5068
 msgid "_Authorize"
 msgstr "_Permesu"
 
 #: ../libgaim/protocols/jabber/presence.c:319
-#: ../libgaim/protocols/oscar/oscar.c:2361
-#: ../libgaim/protocols/oscar/oscar.c:5071
+#: ../libgaim/protocols/oscar/oscar.c:2359
+#: ../libgaim/protocols/oscar/oscar.c:5069
 msgid "_Deny"
 msgstr "_Rifuzu"
 
@@ -8373,12 +8254,12 @@
 msgid "Error joining chat %s"
 msgstr "Eraro aliĝante babilejon %s"
 
-#: ../libgaim/protocols/jabber/si.c:765
+#: ../libgaim/protocols/jabber/si.c:764
 #, c-format
 msgid "Unable to send file to %s, user does not support file transfers"
 msgstr "Ne eblis sendu dosieron al %s, uzanto ne subtenas dosiero-transmeton"
 
-#: ../libgaim/protocols/jabber/si.c:766 ../libgaim/protocols/jabber/si.c:767
+#: ../libgaim/protocols/jabber/si.c:765 ../libgaim/protocols/jabber/si.c:766
 msgid "File Send Failed"
 msgstr "Dosiersendo malsukcesis"
 
@@ -8411,11 +8292,11 @@
 
 #: ../libgaim/protocols/msn/error.c:42
 msgid "Invalid e-mail address"
-msgstr "Malvalida retadreso"
+msgstr ""
 
 #: ../libgaim/protocols/msn/error.c:45
 msgid "User does not exist"
-msgstr "Uzanto ne ekzistas"
+msgstr ""
 
 #: ../libgaim/protocols/msn/error.c:49
 msgid "Fully Qualified Domain Name missing"
@@ -8448,7 +8329,7 @@
 #: ../libgaim/protocols/msn/error.c:70
 #: ../libgaim/protocols/zephyr/zephyr.c:757
 msgid "User is offline"
-msgstr "Uzanto senkonektas"
+msgstr "Uzanto malkonektas"
 
 #: ../libgaim/protocols/msn/error.c:73
 msgid "Already in the mode"
@@ -8541,7 +8422,7 @@
 
 #: ../libgaim/protocols/msn/error.c:144
 msgid "Database connect error"
-msgstr "Datumbaso konekto eraro"
+msgstr ""
 
 #: ../libgaim/protocols/msn/error.c:148
 msgid "Server is going down (abandon ship)"
@@ -8549,58 +8430,58 @@
 
 #: ../libgaim/protocols/msn/error.c:155
 msgid "Error creating connection"
-msgstr "Eraro kreante konekto"
+msgstr ""
 
 #: ../libgaim/protocols/msn/error.c:159
 msgid "CVR parameters are either unknown or not allowed"
-msgstr "CVR parametroj estas nekonataj aŭ ne permesitaj"
+msgstr ""
 
 #: ../libgaim/protocols/msn/error.c:162
 msgid "Unable to write"
-msgstr "Ne eblas skribi"
+msgstr ""
 
 #: ../libgaim/protocols/msn/error.c:165
 msgid "Session overload"
-msgstr "Sesio troigita"
+msgstr ""
 
 #: ../libgaim/protocols/msn/error.c:168
 msgid "User is too active"
-msgstr "Uzanto tro aktivas"
+msgstr ""
 
 #: ../libgaim/protocols/msn/error.c:171
 msgid "Too many sessions"
-msgstr "Tro da sesioj"
+msgstr ""
 
 #: ../libgaim/protocols/msn/error.c:174
 msgid "Passport not verified"
-msgstr "Pasporto ne kontrolita"
+msgstr ""
 
 #: ../libgaim/protocols/msn/error.c:177
 msgid "Bad friend file"
-msgstr "Malbona amikodosiero"
+msgstr ""
 
 #: ../libgaim/protocols/msn/error.c:180
 msgid "Not expected"
-msgstr "Ne atendita"
+msgstr ""
 
 #: ../libgaim/protocols/msn/error.c:185
 msgid "Friendly name changes too rapidly"
-msgstr "Amikonomo ŝangâs tro rapide"
+msgstr ""
 
 #: ../libgaim/protocols/msn/error.c:194
 msgid "Server too busy"
-msgstr "Servilo tro okupita"
+msgstr ""
 
 #: ../libgaim/protocols/msn/error.c:198
-#: ../libgaim/protocols/oscar/oscar.c:1312
+#: ../libgaim/protocols/oscar/oscar.c:1310
 #: ../libgaim/protocols/silc/ops.c:1716 ../libgaim/protocols/toc/toc.c:728
-#: ../libgaim/proxy.c:1340
+#: ../libgaim/proxy.c:1344
 msgid "Authentication failed"
 msgstr "Aŭtentokontrolo malsukcesis"
 
 #: ../libgaim/protocols/msn/error.c:201
 msgid "Not allowed when offline"
-msgstr "Malpermesita kiam senkonekta"
+msgstr "Malpermesita kiam nekonektita"
 
 #: ../libgaim/protocols/msn/error.c:209
 msgid "Not accepting new users"
@@ -8608,15 +8489,15 @@
 
 #: ../libgaim/protocols/msn/error.c:213
 msgid "Kids Passport without parental consent"
-msgstr "Infana Pasporto sen patra konsento"
+msgstr ""
 
 #: ../libgaim/protocols/msn/error.c:217
 msgid "Passport account not yet verified"
-msgstr "Pasporta konto ne jam kontrolita"
+msgstr ""
 
 #: ../libgaim/protocols/msn/error.c:220
 msgid "Bad ticket"
-msgstr "Malbona bileto"
+msgstr ""
 
 #: ../libgaim/protocols/msn/error.c:224
 #, c-format
@@ -8654,7 +8535,7 @@
 
 #: ../libgaim/protocols/msn/msn.c:293
 msgid "Set your mobile phone number."
-msgstr "Difiniu vian poŝtelefona nombron."
+msgstr ""
 
 #: ../libgaim/protocols/msn/msn.c:306
 msgid "Allow MSN Mobile pages?"
@@ -8676,7 +8557,7 @@
 
 #: ../libgaim/protocols/msn/msn.c:328
 msgid "This Hotmail account may not be active."
-msgstr "Tiu Hotmail konto eble ne estas aktiva."
+msgstr ""
 
 #: ../libgaim/protocols/msn/msn.c:354
 msgid "Send a mobile message."
@@ -8688,7 +8569,7 @@
 
 #: ../libgaim/protocols/msn/msn.c:546 ../libgaim/protocols/msn/msn.c:553
 #: ../libgaim/protocols/msn/msn.c:562
-#: ../libgaim/protocols/sametime/sametime.c:3270
+#: ../libgaim/protocols/sametime/sametime.c:3235
 #: ../libgaim/protocols/yahoo/yahoo.c:3032
 #: ../libgaim/protocols/yahoo/yahoo.c:3038
 #, c-format
@@ -8734,31 +8615,31 @@
 
 #: ../libgaim/protocols/msn/msn.c:624
 msgid "Set Home Phone Number..."
-msgstr "Difinu Hejm-Telefonnumeron..."
+msgstr "Difinu Hejm-Telefonnombron..."
 
 #: ../libgaim/protocols/msn/msn.c:628
 msgid "Set Work Phone Number..."
-msgstr "Difinu Labor-Telefonnumeron..."
+msgstr "Difinu Labor-Telefonnombron..."
 
 #: ../libgaim/protocols/msn/msn.c:632
 msgid "Set Mobile Phone Number..."
-msgstr "Difiniu Poŝtelefonan Numeron..."
+msgstr ""
 
 #: ../libgaim/protocols/msn/msn.c:638
 msgid "Enable/Disable Mobile Devices..."
-msgstr "Ebligu/Malebligu Poŝtelefonajn Ekipaĵojn..."
+msgstr ""
 
 #: ../libgaim/protocols/msn/msn.c:643
 msgid "Allow/Disallow Mobile Pages..."
-msgstr "Ebligu/Malebligu Poŝtelefonajn Paĝojn..."
+msgstr ""
 
 #: ../libgaim/protocols/msn/msn.c:653
 msgid "Open Hotmail Inbox"
-msgstr "Malfermu Hotmail-an Alkeston"
+msgstr ""
 
 #: ../libgaim/protocols/msn/msn.c:677
 msgid "Send to Mobile"
-msgstr "Sendu al Poŝtelefono"
+msgstr ""
 
 #: ../libgaim/protocols/msn/msn.c:687
 #: ../libgaim/protocols/novell/novell.c:3449
@@ -8773,7 +8654,7 @@
 
 #: ../libgaim/protocols/msn/msn.c:752
 msgid "Failed to connect to server."
-msgstr "Malsukcesis konekti servilon."
+msgstr ""
 
 #: ../libgaim/protocols/msn/msn.c:1363
 #: ../libgaim/protocols/yahoo/yahoo_profile.c:685
@@ -8799,7 +8680,7 @@
 msgid "Error retrieving profile"
 msgstr "Eraro ricevante profilon"
 
-#: ../libgaim/protocols/msn/msn.c:1537 ../libgaim/protocols/oscar/oscar.c:3671
+#: ../libgaim/protocols/msn/msn.c:1537 ../libgaim/protocols/oscar/oscar.c:3669
 #: ../libgaim/protocols/qq/buddy_info.c:43
 #: ../libgaim/protocols/yahoo/yahoo_profile.c:1070
 msgid "Age"
@@ -8875,7 +8756,7 @@
 #: ../libgaim/protocols/msn/msn.c:1578
 #, c-format
 msgid "%s<b>Social</b><br>%s"
-msgstr "%s<b>Sociala</b><br>%s"
+msgstr ""
 
 #: ../libgaim/protocols/msn/msn.c:1587
 msgid "Significant Other"
@@ -8889,17 +8770,17 @@
 msgid "Home Phone 2"
 msgstr "Hejmo Telfono 2"
 
-#: ../libgaim/protocols/msn/msn.c:1590 ../libgaim/protocols/oscar/oscar.c:3683
+#: ../libgaim/protocols/msn/msn.c:1590 ../libgaim/protocols/oscar/oscar.c:3681
 msgid "Home Address"
 msgstr "Hejmo Adreso"
 
 #: ../libgaim/protocols/msn/msn.c:1591
 msgid "Personal Mobile"
-msgstr "Persona Poŝtelefono"
+msgstr ""
 
 #: ../libgaim/protocols/msn/msn.c:1592
 msgid "Home Fax"
-msgstr "Hejmfakso"
+msgstr ""
 
 #: ../libgaim/protocols/msn/msn.c:1593
 msgid "Personal E-Mail"
@@ -8926,7 +8807,7 @@
 msgid "Job Title"
 msgstr "Laboro Titolo"
 
-#: ../libgaim/protocols/msn/msn.c:1610 ../libgaim/protocols/oscar/oscar.c:3700
+#: ../libgaim/protocols/msn/msn.c:1610 ../libgaim/protocols/oscar/oscar.c:3698
 msgid "Company"
 msgstr "Kompanio"
 
@@ -8947,21 +8828,21 @@
 msgid "Work Phone 2"
 msgstr "Labor Telefono 2"
 
-#: ../libgaim/protocols/msn/msn.c:1615 ../libgaim/protocols/oscar/oscar.c:3691
+#: ../libgaim/protocols/msn/msn.c:1615 ../libgaim/protocols/oscar/oscar.c:3689
 msgid "Work Address"
 msgstr "Laboro Adreso"
 
 #: ../libgaim/protocols/msn/msn.c:1616
 msgid "Work Mobile"
-msgstr "Laborpoŝtelefono"
+msgstr ""
 
 #: ../libgaim/protocols/msn/msn.c:1617
 msgid "Work Pager"
-msgstr "Laborpaĝilo"
+msgstr ""
 
 #: ../libgaim/protocols/msn/msn.c:1618
 msgid "Work Fax"
-msgstr "Laborfakso"
+msgstr ""
 
 #: ../libgaim/protocols/msn/msn.c:1619
 msgid "Work E-Mail"
@@ -9097,22 +8978,22 @@
 #: ../libgaim/protocols/msn/notification.c:502
 #, c-format
 msgid "Unable to block user on %s (%s)"
-msgstr "Ne eblas bloki uzanton ĉe %s (%s)"
+msgstr ""
 
 #: ../libgaim/protocols/msn/notification.c:506
 #, c-format
 msgid "Unable to permit user on %s (%s)"
-msgstr "Ne eblas permezi uzanton ĉe %s (%s)"
+msgstr ""
 
 #: ../libgaim/protocols/msn/notification.c:514
 #, c-format
 msgid "%s could not be added because your buddy list is full."
-msgstr "%s ne aldoneblas ĉar via kunullisto plenumas."
+msgstr ""
 
 #: ../libgaim/protocols/msn/notification.c:523
 #, c-format
 msgid "%s is not a valid passport account."
-msgstr "%s ne etas valida pasporto konto."
+msgstr ""
 
 #: ../libgaim/protocols/msn/notification.c:528
 msgid "Service Temporarily Unavailable."
@@ -9120,11 +9001,11 @@
 
 #: ../libgaim/protocols/msn/notification.c:823
 msgid "Unable to rename group"
-msgstr "Ne eblas alinomigi grupon"
+msgstr ""
 
 #: ../libgaim/protocols/msn/notification.c:878
 msgid "Unable to delete group"
-msgstr "Ne eblas forigi grupo"
+msgstr ""
 
 #: ../libgaim/protocols/msn/notification.c:1314
 #, c-format
@@ -9169,7 +9050,7 @@
 msgstr ""
 
 #: ../libgaim/protocols/msn/session.c:307
-#: ../libgaim/protocols/oscar/oscar.c:3411
+#: ../libgaim/protocols/oscar/oscar.c:3409
 #: ../libgaim/protocols/yahoo/yahoo.c:191
 msgid "You have signed on from another location."
 msgstr "Vi ensalutis el alia loko."
@@ -9264,7 +9145,7 @@
 #: ../libgaim/protocols/msn/userlist.c:90
 #, c-format
 msgid "The user %s (%s) wants to add %s to his or her buddy list."
-msgstr "La uzanto %s (%s) deziras aldoni %s-n en sia kunul listo."
+msgstr ""
 
 #: ../libgaim/protocols/msn/userlist.c:105
 #: ../libgaim/protocols/yahoo/yahoo.c:1002
@@ -9279,17 +9160,17 @@
 #: ../libgaim/protocols/msn/userlist.c:280
 #, c-format
 msgid "%s has added you to his or her buddy list."
-msgstr "%s aldonis vin en sia kunul listo."
+msgstr ""
 
 #: ../libgaim/protocols/msn/userlist.c:349
 #, c-format
 msgid "%s has removed you from his or her buddy list."
-msgstr "%s forigis vin el sia kunul listo."
+msgstr ""
 
 #: ../libgaim/protocols/msn/userlist.c:671
 #, c-format
 msgid "Unable to add \"%s\"."
-msgstr "Malsukcesis aldoni \"%s\"."
+msgstr ""
 
 #: ../libgaim/protocols/msn/userlist.c:673
 msgid "The screen name specified is invalid."
@@ -9301,11 +9182,11 @@
 
 #: ../libgaim/protocols/novell/nmuser.c:1882
 msgid "Unable to write to network"
-msgstr "Malsukcesis skribi reten"
+msgstr ""
 
 #: ../libgaim/protocols/novell/nmuser.c:1885
 msgid "Unable to read from network"
-msgstr "Malsukcesis ligi el reto"
+msgstr ""
 
 #: ../libgaim/protocols/novell/nmuser.c:1888
 msgid "Error communicating with server"
@@ -9559,7 +9440,7 @@
 
 #: ../libgaim/protocols/novell/novell.c:1740
 msgid "Waiting for response..."
-msgstr "Atendante respondon..."
+msgstr ""
 
 #: ../libgaim/protocols/novell/novell.c:1875
 #, c-format
@@ -9611,7 +9492,7 @@
 
 #: ../libgaim/protocols/novell/novell.c:2507
 msgid "This conference has been closed. No more messages can be sent."
-msgstr "Tiu konferenco fermiĝis. Ne pliaj mesaĝoj sendiĝeblas."
+msgstr ""
 
 #. *< type
 #. *< ui_requirement
@@ -9630,26 +9511,26 @@
 
 #: ../libgaim/protocols/novell/novell.c:3573
 msgid "Server address"
-msgstr "Servilo adreso"
+msgstr ""
 
 #: ../libgaim/protocols/novell/novell.c:3577
 msgid "Server port"
-msgstr "Servilo pordo"
+msgstr ""
 
 #: ../libgaim/protocols/oscar/flap_connection.c:237
 #: ../libgaim/protocols/yahoo/yahoo.c:2268
 #: ../libgaim/protocols/yahoo/yahoo.c:2426
-#: ../libgaim/protocols/yahoo/ycht.c:481 ../libgaim/proxy.c:566
-#: ../libgaim/proxy.c:1074 ../libgaim/proxy.c:1185 ../libgaim/proxy.c:1285
-#: ../libgaim/proxy.c:1413
+#: ../libgaim/protocols/yahoo/ycht.c:481 ../libgaim/proxy.c:570
+#: ../libgaim/proxy.c:1078 ../libgaim/proxy.c:1189 ../libgaim/proxy.c:1289
+#: ../libgaim/proxy.c:1417
 msgid "Server closed the connection."
 msgstr "Servilo fermis la konekton."
 
 #: ../libgaim/protocols/oscar/flap_connection.c:239
 #: ../libgaim/protocols/yahoo/yahoo.c:2262
-#: ../libgaim/protocols/yahoo/yahoo.c:2420 ../libgaim/proxy.c:578
-#: ../libgaim/proxy.c:1086 ../libgaim/proxy.c:1197 ../libgaim/proxy.c:1297
-#: ../libgaim/proxy.c:1425
+#: ../libgaim/protocols/yahoo/yahoo.c:2420 ../libgaim/proxy.c:582
+#: ../libgaim/proxy.c:1090 ../libgaim/proxy.c:1201 ../libgaim/proxy.c:1301
+#: ../libgaim/proxy.c:1429
 #, c-format
 msgid ""
 "Lost connection with server:\n"
@@ -9658,9 +9539,9 @@
 "Perdis konekton kun servilo:\n"
 "%s"
 
-#: ../libgaim/protocols/oscar/flap_connection.c:242 ../libgaim/proxy.c:1103
-#: ../libgaim/proxy.c:1210 ../libgaim/proxy.c:1309 ../libgaim/proxy.c:1381
-#: ../libgaim/proxy.c:1438
+#: ../libgaim/protocols/oscar/flap_connection.c:242 ../libgaim/proxy.c:1107
+#: ../libgaim/proxy.c:1214 ../libgaim/proxy.c:1313 ../libgaim/proxy.c:1385
+#: ../libgaim/proxy.c:1442
 msgid "Received invalid data on connection with server."
 msgstr ""
 
@@ -9819,13 +9700,13 @@
 msgid "AIM Direct IM"
 msgstr "AIM Rekta TM"
 
-#: ../libgaim/protocols/oscar/oscar.c:609 ../libgaim/protocols/silc/silc.c:693
+#: ../libgaim/protocols/oscar/oscar.c:609 ../libgaim/protocols/silc/silc.c:697
 #: ../libgaim/protocols/silc/util.c:551
 msgid "Chat"
 msgstr "Babilado"
 
 #: ../libgaim/protocols/oscar/oscar.c:612
-#: ../libgaim/protocols/oscar/oscar.c:5854
+#: ../libgaim/protocols/oscar/oscar.c:5852
 msgid "Get File"
 msgstr "Ricevu Dosieron"
 
@@ -9898,17 +9779,17 @@
 msgstr "Kamerao"
 
 #: ../libgaim/protocols/oscar/oscar.c:686
-#: ../libgaim/protocols/oscar/oscar.c:5631
+#: ../libgaim/protocols/oscar/oscar.c:5629
 msgid "Free For Chat"
 msgstr ""
 
 #: ../libgaim/protocols/oscar/oscar.c:690
-#: ../libgaim/protocols/oscar/oscar.c:5663
+#: ../libgaim/protocols/oscar/oscar.c:5661
 msgid "Not Available"
 msgstr "Ne Disponebla"
 
 #: ../libgaim/protocols/oscar/oscar.c:692
-#: ../libgaim/protocols/oscar/oscar.c:5649
+#: ../libgaim/protocols/oscar/oscar.c:5647
 msgid "Occupied"
 msgstr "Okupata"
 
@@ -9921,13 +9802,13 @@
 msgstr "Enrete"
 
 #: ../libgaim/protocols/oscar/oscar.c:786
-#: ../libgaim/protocols/oscar/oscar.c:2806
+#: ../libgaim/protocols/oscar/oscar.c:2804
 msgid "Warning Level"
 msgstr ""
 
 #: ../libgaim/protocols/oscar/oscar.c:795
 msgid "Buddy Comment"
-msgstr "Kunul Komento"
+msgstr ""
 
 #: ../libgaim/protocols/oscar/oscar.c:931
 #, c-format
@@ -9972,136 +9853,134 @@
 msgid "Invalid screen name."
 msgstr "Malvalida ekranonomo."
 
-#: ../libgaim/protocols/oscar/oscar.c:1289
-#: ../libgaim/protocols/qq/login_logout.c:479
-#: ../libgaim/protocols/simple/simple.c:1035
+#: ../libgaim/protocols/oscar/oscar.c:1287
 #: ../libgaim/protocols/yahoo/yahoo.c:1928
 msgid "Incorrect password."
 msgstr "Misa pasvorto."
 
-#: ../libgaim/protocols/oscar/oscar.c:1294
+#: ../libgaim/protocols/oscar/oscar.c:1292
 msgid "Your account is currently suspended."
 msgstr ""
 
 #. service temporarily unavailable
-#: ../libgaim/protocols/oscar/oscar.c:1298
+#: ../libgaim/protocols/oscar/oscar.c:1296
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr "La AOL Tuj Mesaĝilo servo estas provizore nedisponebla."
 
-#: ../libgaim/protocols/oscar/oscar.c:1303
+#: ../libgaim/protocols/oscar/oscar.c:1301
 msgid ""
 "You have been connecting and disconnecting too frequently. Wait ten minutes "
 "and try again. If you continue to try, you will need to wait even longer."
 msgstr ""
 
-#: ../libgaim/protocols/oscar/oscar.c:1308
+#: ../libgaim/protocols/oscar/oscar.c:1306
 #, c-format
 msgid "The client version you are using is too old. Please upgrade at %s"
 msgstr ""
 
-#: ../libgaim/protocols/oscar/oscar.c:1343
+#: ../libgaim/protocols/oscar/oscar.c:1341
 msgid "Could Not Connect"
 msgstr "Ne Povas Konekti"
 
-#: ../libgaim/protocols/oscar/oscar.c:1348
+#: ../libgaim/protocols/oscar/oscar.c:1346
 msgid "Received authorization"
 msgstr ""
 
-#: ../libgaim/protocols/oscar/oscar.c:1371
+#: ../libgaim/protocols/oscar/oscar.c:1369
 msgid "The SecurID key entered is invalid."
 msgstr ""
 
-#: ../libgaim/protocols/oscar/oscar.c:1385
+#: ../libgaim/protocols/oscar/oscar.c:1383
 msgid "Enter SecurID"
 msgstr ""
 
-#: ../libgaim/protocols/oscar/oscar.c:1386
+#: ../libgaim/protocols/oscar/oscar.c:1384
 msgid "Enter the 6 digit number from the digital display."
 msgstr ""
 
-#: ../libgaim/protocols/oscar/oscar.c:1426
-#: ../libgaim/protocols/oscar/oscar.c:1469
+#: ../libgaim/protocols/oscar/oscar.c:1424
+#: ../libgaim/protocols/oscar/oscar.c:1467
 #, c-format
 msgid ""
 "You may be disconnected shortly.  You may want to use TOC until this is "
 "fixed.  Check %s for updates."
 msgstr ""
 
-#: ../libgaim/protocols/oscar/oscar.c:1429
-#: ../libgaim/protocols/oscar/oscar.c:1472
+#: ../libgaim/protocols/oscar/oscar.c:1427
+#: ../libgaim/protocols/oscar/oscar.c:1470
 msgid "Gaim was unable to get a valid AIM login hash."
 msgstr ""
 
-#: ../libgaim/protocols/oscar/oscar.c:1558
+#: ../libgaim/protocols/oscar/oscar.c:1556
 #, c-format
 msgid "You may be disconnected shortly.  Check %s for updates."
 msgstr ""
 
-#: ../libgaim/protocols/oscar/oscar.c:1561
+#: ../libgaim/protocols/oscar/oscar.c:1559
 msgid "Gaim was unable to get a valid login hash."
 msgstr ""
 
-#: ../libgaim/protocols/oscar/oscar.c:1587
+#: ../libgaim/protocols/oscar/oscar.c:1585
 msgid "Password sent"
 msgstr "Pasvorto sendita"
 
-#: ../libgaim/protocols/oscar/oscar.c:1643
-msgid "Unable to initialize connection"
-msgstr "Ne povas eki konekton"
-
-#: ../libgaim/protocols/oscar/oscar.c:2141
+#: ../libgaim/protocols/oscar/oscar.c:1641
+msgid "gaim_proxy_connect() failed"
+msgstr "gaim_proxy_connect() malsukcesis"
+
+#: ../libgaim/protocols/oscar/oscar.c:2139
 msgid "Please authorize me so I can add you to my buddy list."
 msgstr "B.v. permesi min do mi povas aldoni vin al mia kunullisto."
 
-#: ../libgaim/protocols/oscar/oscar.c:2150
+#: ../libgaim/protocols/oscar/oscar.c:2148
 msgid "Authorization Request Message:"
 msgstr "Permeso Demando Mesaĝo:"
 
-#: ../libgaim/protocols/oscar/oscar.c:2151
+#: ../libgaim/protocols/oscar/oscar.c:2149
 msgid "Please authorize me!"
 msgstr "B.v. permesu min!"
 
-#: ../libgaim/protocols/oscar/oscar.c:2183
+#: ../libgaim/protocols/oscar/oscar.c:2181
 #, c-format
 msgid ""
 "The user %s requires authorization before being added to a buddy list.  Do "
 "you want to send an authorization request?"
 msgstr ""
 
-#: ../libgaim/protocols/oscar/oscar.c:2188
+#: ../libgaim/protocols/oscar/oscar.c:2186
 msgid "Request Authorization"
 msgstr "Demandu Permeson"
 
-#: ../libgaim/protocols/oscar/oscar.c:2190
+#: ../libgaim/protocols/oscar/oscar.c:2188
 msgid "_Request Authorization"
 msgstr "_Demandu Permeson"
 
-#: ../libgaim/protocols/oscar/oscar.c:2231
-#: ../libgaim/protocols/oscar/oscar.c:2238
-#: ../libgaim/protocols/oscar/oscar.c:2345
-#: ../libgaim/protocols/oscar/oscar.c:2369
-#: ../libgaim/protocols/oscar/oscar.c:5056
-#: ../libgaim/protocols/oscar/oscar.c:5108
+#: ../libgaim/protocols/oscar/oscar.c:2229
+#: ../libgaim/protocols/oscar/oscar.c:2236
+#: ../libgaim/protocols/oscar/oscar.c:2343
+#: ../libgaim/protocols/oscar/oscar.c:2367
+#: ../libgaim/protocols/oscar/oscar.c:5054
+#: ../libgaim/protocols/oscar/oscar.c:5106
 msgid "No reason given."
 msgstr "Nenia kialo donita."
 
-#: ../libgaim/protocols/oscar/oscar.c:2237
+#: ../libgaim/protocols/oscar/oscar.c:2235
 msgid "Authorization Denied Message:"
 msgstr "Permeso Rifuzo Mesaĝo"
 
-#: ../libgaim/protocols/oscar/oscar.c:2347
+#: ../libgaim/protocols/oscar/oscar.c:2345
 #, c-format
 msgid ""
 "The user %u wants to add %s to their buddy list for the following reason:\n"
 "%s"
 msgstr ""
 
-#: ../libgaim/protocols/oscar/oscar.c:2357
-#: ../libgaim/protocols/oscar/oscar.c:5068
+#: ../libgaim/protocols/oscar/oscar.c:2355
+#: ../libgaim/protocols/oscar/oscar.c:5066
 msgid "Authorization Request"
 msgstr "Permeso Demando"
 
-#: ../libgaim/protocols/oscar/oscar.c:2369
+#: ../libgaim/protocols/oscar/oscar.c:2367
 #, c-format
 msgid ""
 "The user %u has denied your request to add them to your buddy list for the "
@@ -10109,17 +9988,17 @@
 "%s"
 msgstr ""
 
-#: ../libgaim/protocols/oscar/oscar.c:2370
+#: ../libgaim/protocols/oscar/oscar.c:2368
 msgid "ICQ authorization denied."
 msgstr "ICQ permeso rifuzita."
 
 #. Someone has granted you authorization
-#: ../libgaim/protocols/oscar/oscar.c:2377
+#: ../libgaim/protocols/oscar/oscar.c:2375
 #, c-format
 msgid "The user %u has granted your request to add them to your buddy list."
 msgstr ""
 
-#: ../libgaim/protocols/oscar/oscar.c:2385
+#: ../libgaim/protocols/oscar/oscar.c:2383
 #, c-format
 msgid ""
 "You have received a special message\n"
@@ -10128,7 +10007,7 @@
 "%s"
 msgstr ""
 
-#: ../libgaim/protocols/oscar/oscar.c:2393
+#: ../libgaim/protocols/oscar/oscar.c:2391
 #, c-format
 msgid ""
 "You have received an ICQ page\n"
@@ -10137,7 +10016,7 @@
 "%s"
 msgstr ""
 
-#: ../libgaim/protocols/oscar/oscar.c:2401
+#: ../libgaim/protocols/oscar/oscar.c:2399
 #, c-format
 msgid ""
 "You have received an ICQ e-mail from %s [%s]\n"
@@ -10146,295 +10025,293 @@
 "%s"
 msgstr ""
 
-#: ../libgaim/protocols/oscar/oscar.c:2422
+#: ../libgaim/protocols/oscar/oscar.c:2420
 #, c-format
 msgid "ICQ user %u has sent you a buddy: %s (%s)"
 msgstr ""
 
-#: ../libgaim/protocols/oscar/oscar.c:2428
+#: ../libgaim/protocols/oscar/oscar.c:2426
 msgid "Do you want to add this buddy to your buddy list?"
 msgstr "Ĉu vi volas aldoni tiun kunul en via kunullisto?"
 
-#: ../libgaim/protocols/oscar/oscar.c:2432
+#: ../libgaim/protocols/oscar/oscar.c:2430
 msgid "_Decline"
 msgstr "_Rifuzi"
 
-#: ../libgaim/protocols/oscar/oscar.c:2516
+#: ../libgaim/protocols/oscar/oscar.c:2514
 #, c-format
 msgid "You missed %hu message from %s because it was invalid."
 msgid_plural "You missed %hu messages from %s because they were invalid."
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../libgaim/protocols/oscar/oscar.c:2525
+#: ../libgaim/protocols/oscar/oscar.c:2523
 #, 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] ""
 msgstr[1] ""
 
-#: ../libgaim/protocols/oscar/oscar.c:2534
+#: ../libgaim/protocols/oscar/oscar.c:2532
 #, 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] ""
 msgstr[1] ""
 
-#: ../libgaim/protocols/oscar/oscar.c:2543
+#: ../libgaim/protocols/oscar/oscar.c:2541
 #, c-format
 msgid "You missed %hu message from %s because he/she was too evil."
 msgid_plural "You missed %hu messages from %s because he/she was too evil."
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../libgaim/protocols/oscar/oscar.c:2552
+#: ../libgaim/protocols/oscar/oscar.c:2550
 #, c-format
 msgid "You missed %hu message from %s because you are too evil."
 msgid_plural "You missed %hu messages from %s because you are too evil."
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../libgaim/protocols/oscar/oscar.c:2561
+#: ../libgaim/protocols/oscar/oscar.c:2559
 #, c-format
 msgid "You missed %hu message from %s for an unknown reason."
 msgid_plural "You missed %hu messages from %s for an unknown reason."
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../libgaim/protocols/oscar/oscar.c:2617
+#: ../libgaim/protocols/oscar/oscar.c:2615
 #, c-format
 msgid "<B>UIN:</B> %s<BR><B>Status:</B> %s<HR>%s"
 msgstr "<B>UIN:</B> %s<BR><B>Stato:</B> %s<HR>%s"
 
-#: ../libgaim/protocols/oscar/oscar.c:2678
+#: ../libgaim/protocols/oscar/oscar.c:2676
 #, c-format
 msgid "SNAC threw error: %s\n"
 msgstr ""
 
 #. Data is assumed to be the destination sn
-#: ../libgaim/protocols/oscar/oscar.c:2714
+#: ../libgaim/protocols/oscar/oscar.c:2712
 #, c-format
 msgid "Unable to send message: %s"
-msgstr "Ne eblas sendi mesaĝon: %s"
-
-#: ../libgaim/protocols/oscar/oscar.c:2714
-#: ../libgaim/protocols/oscar/oscar.c:2719
-#: ../libgaim/protocols/oscar/oscar.c:2781
-#: ../libgaim/protocols/oscar/oscar.c:2785
+msgstr ""
+
+#: ../libgaim/protocols/oscar/oscar.c:2712
+#: ../libgaim/protocols/oscar/oscar.c:2717
+#: ../libgaim/protocols/oscar/oscar.c:2779
+#: ../libgaim/protocols/oscar/oscar.c:2783
 msgid "Unknown reason."
 msgstr "Nekonata kialo."
 
-#: ../libgaim/protocols/oscar/oscar.c:2717
-#: ../libgaim/protocols/sametime/sametime.c:2398
+#: ../libgaim/protocols/oscar/oscar.c:2715
+#: ../libgaim/protocols/sametime/sametime.c:2363
 #, c-format
 msgid "Unable to send message to %s:"
-msgstr "Ne eblas sendi mesaĝon al %s:"
-
-#: ../libgaim/protocols/oscar/oscar.c:2781
+msgstr ""
+
+#: ../libgaim/protocols/oscar/oscar.c:2779
 #, c-format
 msgid "User information not available: %s"
-msgstr "Uzantoinformo ne disponebla: %s"
-
-#: ../libgaim/protocols/oscar/oscar.c:2784
+msgstr ""
+
+#: ../libgaim/protocols/oscar/oscar.c:2782
 #, c-format
 msgid "User information for %s unavailable:"
-msgstr "Uzantoinformo des %s ne disponeblas:"
-
-#: ../libgaim/protocols/oscar/oscar.c:2810
+msgstr ""
+
+#: ../libgaim/protocols/oscar/oscar.c:2808
 msgid "Online Since"
 msgstr "Enrete Ek De"
 
-#: ../libgaim/protocols/oscar/oscar.c:2815
+#: ../libgaim/protocols/oscar/oscar.c:2813
 #: ../libgaim/protocols/yahoo/yahoo_profile.c:1174
 msgid "Member Since"
 msgstr "Membro Ek De"
 
-#: ../libgaim/protocols/oscar/oscar.c:2820
+#: ../libgaim/protocols/oscar/oscar.c:2818
 msgid "Capabilities"
 msgstr "Kapablecoj"
 
-#: ../libgaim/protocols/oscar/oscar.c:2838
+#: ../libgaim/protocols/oscar/oscar.c:2836
 msgid "Available Message"
 msgstr "Disponeblaj Mesaĝoj"
 
-#: ../libgaim/protocols/oscar/oscar.c:2938
+#: ../libgaim/protocols/oscar/oscar.c:2936
 msgid "Your AIM connection may be lost."
 msgstr "Via AIM konekto perdeblas."
 
 #. The conversion failed!
-#: ../libgaim/protocols/oscar/oscar.c:3119
+#: ../libgaim/protocols/oscar/oscar.c:3117
 msgid ""
 "[Unable to display a message from this user because it contained invalid "
 "characters.]"
 msgstr ""
 
-#: ../libgaim/protocols/oscar/oscar.c:3340
+#: ../libgaim/protocols/oscar/oscar.c:3338
 msgid "Rate limiting error."
 msgstr ""
 
-#: ../libgaim/protocols/oscar/oscar.c:3341
+#: ../libgaim/protocols/oscar/oscar.c:3339
 msgid ""
 "The last action you attempted could not be performed because you are over "
 "the rate limit. Please wait 10 seconds and try again."
 msgstr ""
 
-#: ../libgaim/protocols/oscar/oscar.c:3413
+#: ../libgaim/protocols/oscar/oscar.c:3411
 msgid "You have been signed off for an unknown reason."
-msgstr "Vi estas malsalutigita pro nekonata kialo."
-
-#: ../libgaim/protocols/oscar/oscar.c:3426 ../libgaim/protocols/toc/toc.c:977
+msgstr ""
+
+#: ../libgaim/protocols/oscar/oscar.c:3424 ../libgaim/protocols/toc/toc.c:977
 #, c-format
 msgid "You have been disconnected from chat room %s."
-msgstr "Vi estas diskonektita de babilejo %s."
-
-#: ../libgaim/protocols/oscar/oscar.c:3647
+msgstr ""
+
+#: ../libgaim/protocols/oscar/oscar.c:3645
 #: ../libgaim/protocols/silc/util.c:583
 msgid "Mobile Phone"
-msgstr "Poŝtelefono"
-
-#: ../libgaim/protocols/oscar/oscar.c:3674
+msgstr ""
+
+#: ../libgaim/protocols/oscar/oscar.c:3672
 msgid "Personal Web Page"
-msgstr "Persona ttt-ejo"
-
-#: ../libgaim/protocols/oscar/oscar.c:3678
+msgstr ""
+
+#: ../libgaim/protocols/oscar/oscar.c:3676
 #: ../libgaim/protocols/qq/buddy_info.c:38
 msgid "Additional Information"
-msgstr "Kroma Informo"
-
-#: ../libgaim/protocols/oscar/oscar.c:3687
-#: ../libgaim/protocols/oscar/oscar.c:3695
+msgstr ""
+
+#: ../libgaim/protocols/oscar/oscar.c:3685
+#: ../libgaim/protocols/oscar/oscar.c:3693
 msgid "Zip Code"
-msgstr "Poŝtkodo"
+msgstr ""
+
+#: ../libgaim/protocols/oscar/oscar.c:3697
+msgid "Work Information"
+msgstr ""
 
 #: ../libgaim/protocols/oscar/oscar.c:3699
-msgid "Work Information"
-msgstr "Laborinformo"
-
-#: ../libgaim/protocols/oscar/oscar.c:3701
 msgid "Division"
-msgstr "Dividaĵo"
+msgstr ""
+
+#: ../libgaim/protocols/oscar/oscar.c:3700
+msgid "Position"
+msgstr ""
 
 #: ../libgaim/protocols/oscar/oscar.c:3702
-msgid "Position"
-msgstr "Pozicio"
-
-#: ../libgaim/protocols/oscar/oscar.c:3704
 msgid "Web Page"
-msgstr "TTT-ejo"
-
-#: ../libgaim/protocols/oscar/oscar.c:3762
+msgstr ""
+
+#: ../libgaim/protocols/oscar/oscar.c:3760
 msgid "Pop-Up Message"
-msgstr "Ŝpruca Mesaĝo"
-
-#: ../libgaim/protocols/oscar/oscar.c:3802
+msgstr ""
+
+#: ../libgaim/protocols/oscar/oscar.c:3800
 #, c-format
 msgid "The following screen name is associated with %s"
 msgid_plural "The following screen names are associated with %s"
-msgstr[0] "La jena ekrannomo estas kunligita kun %s"
-msgstr[1] "La jenaj ekrannomoj estas kunligitaj kun %s"
-
-#: ../libgaim/protocols/oscar/oscar.c:3807
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../libgaim/protocols/oscar/oscar.c:3805
 msgid "Screen name"
 msgstr "Ekrannomo"
 
-#: ../libgaim/protocols/oscar/oscar.c:3833
+#: ../libgaim/protocols/oscar/oscar.c:3831
 #, c-format
 msgid "No results found for e-mail address %s"
 msgstr ""
 
+#: ../libgaim/protocols/oscar/oscar.c:3852
+#, c-format
+msgid "You should receive an e-mail asking to confirm %s."
+msgstr ""
+
 #: ../libgaim/protocols/oscar/oscar.c:3854
-#, c-format
-msgid "You should receive an e-mail asking to confirm %s."
-msgstr ""
-
-#: ../libgaim/protocols/oscar/oscar.c:3856
 msgid "Account Confirmation Requested"
-msgstr "Kontokonfirmo demandita"
-
-#: ../libgaim/protocols/oscar/oscar.c:3887
+msgstr ""
+
+#: ../libgaim/protocols/oscar/oscar.c:3885
 msgid "Error Changing Account Info"
-msgstr "Eraro ŝanĝante kontoinformon"
-
-#: ../libgaim/protocols/oscar/oscar.c:3890
+msgstr ""
+
+#: ../libgaim/protocols/oscar/oscar.c:3888
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
 "differs from the original."
 msgstr ""
 
-#: ../libgaim/protocols/oscar/oscar.c:3893
+#: ../libgaim/protocols/oscar/oscar.c:3891
 #, c-format
 msgid "Error 0x%04x: Unable to format screen name because it is invalid."
 msgstr ""
 
-#: ../libgaim/protocols/oscar/oscar.c:3896
+#: ../libgaim/protocols/oscar/oscar.c:3894
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
 "is too long."
 msgstr ""
 
-#: ../libgaim/protocols/oscar/oscar.c:3899
+#: ../libgaim/protocols/oscar/oscar.c:3897
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change e-mail address because there is already a "
 "request pending for this screen name."
 msgstr ""
 
-#: ../libgaim/protocols/oscar/oscar.c:3902
+#: ../libgaim/protocols/oscar/oscar.c:3900
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change e-mail address because the given address has "
 "too many screen names associated with it."
 msgstr ""
 
-#: ../libgaim/protocols/oscar/oscar.c:3905
+#: ../libgaim/protocols/oscar/oscar.c:3903
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change e-mail address because the given address is "
 "invalid."
 msgstr ""
 
-#: ../libgaim/protocols/oscar/oscar.c:3908
+#: ../libgaim/protocols/oscar/oscar.c:3906
 #, c-format
 msgid "Error 0x%04x: Unknown error."
-msgstr "Eraro 0x%04x: Nekonata eraro."
-
-#: ../libgaim/protocols/oscar/oscar.c:3918
+msgstr ""
+
+#: ../libgaim/protocols/oscar/oscar.c:3916
 #, c-format
 msgid ""
 "Your screen name is currently formatted as follows:\n"
 "%s"
 msgstr ""
-"Via ekrannomo estas nun formatumita tiel:\n"
-"%s"
-
-#: ../libgaim/protocols/oscar/oscar.c:3919
-#: ../libgaim/protocols/oscar/oscar.c:3926
+
+#: ../libgaim/protocols/oscar/oscar.c:3917
+#: ../libgaim/protocols/oscar/oscar.c:3924
 msgid "Account Info"
 msgstr "Konto Informo"
 
-#: ../libgaim/protocols/oscar/oscar.c:3924
+#: ../libgaim/protocols/oscar/oscar.c:3922
 #, c-format
 msgid "The e-mail address for %s is %s"
 msgstr "La retadreso de %s estas %s"
 
-#: ../libgaim/protocols/oscar/oscar.c:4099
+#: ../libgaim/protocols/oscar/oscar.c:4097
 msgid "Your IM Image was not sent. You must be Direct Connected to send IM Images."
 msgstr ""
 
-#: ../libgaim/protocols/oscar/oscar.c:4351
+#: ../libgaim/protocols/oscar/oscar.c:4349
 msgid "Unable to set AIM profile."
-msgstr "Ne eblas difini AIM-an profilon."
-
-#: ../libgaim/protocols/oscar/oscar.c:4352
+msgstr ""
+
+#: ../libgaim/protocols/oscar/oscar.c:4350
 msgid ""
 "You have probably requested to set your profile before the login procedure "
 "completed.  Your profile remains unset; try setting it again when you are "
 "fully connected."
 msgstr ""
 
-#: ../libgaim/protocols/oscar/oscar.c:4366
+#: ../libgaim/protocols/oscar/oscar.c:4364
 #, c-format
 msgid ""
 "The maximum profile length of %d byte has been exceeded.  Gaim has truncated "
@@ -10445,11 +10322,11 @@
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../libgaim/protocols/oscar/oscar.c:4371
+#: ../libgaim/protocols/oscar/oscar.c:4369
 msgid "Profile too long."
-msgstr "Profilo tro longa."
-
-#: ../libgaim/protocols/oscar/oscar.c:4415
+msgstr ""
+
+#: ../libgaim/protocols/oscar/oscar.c:4413
 #, c-format
 msgid ""
 "The maximum away message length of %d byte has been exceeded.  Gaim has "
@@ -10460,11 +10337,11 @@
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../libgaim/protocols/oscar/oscar.c:4420
+#: ../libgaim/protocols/oscar/oscar.c:4418
 msgid "Away message too long."
-msgstr "Formesaĝo tro longa."
-
-#: ../libgaim/protocols/oscar/oscar.c:4489
+msgstr ""
+
+#: ../libgaim/protocols/oscar/oscar.c:4487
 #, c-format
 msgid ""
 "Could not add the buddy %s because the screen name is invalid.  Screen names "
@@ -10472,45 +10349,45 @@
 "spaces, or contain only numbers."
 msgstr ""
 
-#: ../libgaim/protocols/oscar/oscar.c:4491
-#: ../libgaim/protocols/oscar/oscar.c:4904
-#: ../libgaim/protocols/oscar/oscar.c:4918
+#: ../libgaim/protocols/oscar/oscar.c:4489
+#: ../libgaim/protocols/oscar/oscar.c:4902
+#: ../libgaim/protocols/oscar/oscar.c:4916
 msgid "Unable To Add"
-msgstr "Ne eblas Aldoni"
-
-#: ../libgaim/protocols/oscar/oscar.c:4595
+msgstr ""
+
+#: ../libgaim/protocols/oscar/oscar.c:4593
 msgid "Unable To Retrieve Buddy List"
-msgstr "Ne eblas Ricevi Kunulliston"
-
-#: ../libgaim/protocols/oscar/oscar.c:4596
+msgstr ""
+
+#: ../libgaim/protocols/oscar/oscar.c:4594
 msgid ""
 "Gaim was temporarily unable to retrieve your buddy list from the AIM "
 "servers.  Your buddy list is not lost, and will probably become available in "
 "a few hours."
 msgstr ""
 
-#: ../libgaim/protocols/oscar/oscar.c:4799
-#: ../libgaim/protocols/oscar/oscar.c:4800
-#: ../libgaim/protocols/oscar/oscar.c:4805
-#: ../libgaim/protocols/oscar/oscar.c:4972
-#: ../libgaim/protocols/oscar/oscar.c:4973
-#: ../libgaim/protocols/oscar/oscar.c:4978
+#: ../libgaim/protocols/oscar/oscar.c:4797
+#: ../libgaim/protocols/oscar/oscar.c:4798
+#: ../libgaim/protocols/oscar/oscar.c:4803
+#: ../libgaim/protocols/oscar/oscar.c:4970
+#: ../libgaim/protocols/oscar/oscar.c:4971
+#: ../libgaim/protocols/oscar/oscar.c:4976
 msgid "Orphans"
 msgstr "Senpatroj"
 
-#: ../libgaim/protocols/oscar/oscar.c:4902
+#: ../libgaim/protocols/oscar/oscar.c:4900
 #, c-format
 msgid ""
 "Could not add the buddy %s because you have too many buddies in your buddy "
 "list.  Please remove one and try again."
 msgstr ""
 
-#: ../libgaim/protocols/oscar/oscar.c:4902
-#: ../libgaim/protocols/oscar/oscar.c:4916
+#: ../libgaim/protocols/oscar/oscar.c:4900
+#: ../libgaim/protocols/oscar/oscar.c:4914
 msgid "(no name)"
 msgstr "(sen nomo)"
 
-#: ../libgaim/protocols/oscar/oscar.c:4916
+#: ../libgaim/protocols/oscar/oscar.c:4914
 #, c-format
 msgid ""
 "Could not add the buddy %s for an unknown reason.  The most common reason "
@@ -10518,222 +10395,215 @@
 "buddy list."
 msgstr ""
 
-#: ../libgaim/protocols/oscar/oscar.c:5009
+#: ../libgaim/protocols/oscar/oscar.c:5007
 #, c-format
 msgid ""
 "The user %s has given you permission to add you to their buddy list.  Do you "
 "want to add them?"
 msgstr ""
 
-#: ../libgaim/protocols/oscar/oscar.c:5015
+#: ../libgaim/protocols/oscar/oscar.c:5013
 msgid "Authorization Given"
 msgstr "Permeso Donita"
 
-#: ../libgaim/protocols/oscar/oscar.c:5059
+#: ../libgaim/protocols/oscar/oscar.c:5057
 #, c-format
 msgid ""
 "The user %s wants to add %s to their buddy list for the following reason:\n"
 "%s"
 msgstr ""
-"La uzanto %s deziras aldoni %s-n al sia listo pro la jena kialo:\n"
-"%s"
 
 #. Granted
-#: ../libgaim/protocols/oscar/oscar.c:5104
+#: ../libgaim/protocols/oscar/oscar.c:5102
 #, c-format
 msgid "The user %s has granted your request to add them to your buddy list."
-msgstr "La uzanto %s koncedis vian demandon aldoni sin al via kunullisto."
-
-#: ../libgaim/protocols/oscar/oscar.c:5105
+msgstr ""
+
+#: ../libgaim/protocols/oscar/oscar.c:5103
 msgid "Authorization Granted"
-msgstr "Aŭtentigo Koncedita"
+msgstr ""
 
 #. Denied
-#: ../libgaim/protocols/oscar/oscar.c:5108
+#: ../libgaim/protocols/oscar/oscar.c:5106
 #, c-format
 msgid ""
 "The user %s has denied your request to add them to your buddy list for the "
 "following reason:\n"
 "%s"
 msgstr ""
-"La uzanto %s ne koncedis vian demandon aldoni sin al via kunullisto pro la "
-"jena kialo:\n"
-"%s"
-
-#: ../libgaim/protocols/oscar/oscar.c:5109
+
+#: ../libgaim/protocols/oscar/oscar.c:5107
 msgid "Authorization Denied"
 msgstr "Permeso Rifuzita"
 
-#: ../libgaim/protocols/oscar/oscar.c:5145 ../libgaim/protocols/toc/toc.c:1378
+#: ../libgaim/protocols/oscar/oscar.c:5143 ../libgaim/protocols/toc/toc.c:1378
 msgid "_Exchange:"
 msgstr "_Interŝanĝo"
 
-#: ../libgaim/protocols/oscar/oscar.c:5185
+#: ../libgaim/protocols/oscar/oscar.c:5183
 msgid "Invalid chat name specified."
 msgstr "Malvalida babilejonomo enigita."
 
-#: ../libgaim/protocols/oscar/oscar.c:5255
+#: ../libgaim/protocols/oscar/oscar.c:5253
 msgid "Your IM Image was not sent. You cannot send IM Images in AIM chats."
-msgstr "Via TM-a Bildo ne estis sendita. Vi ne povas sendi TM-ajn Bildojn en AIM babilejoj."
-
-#: ../libgaim/protocols/oscar/oscar.c:5417
+msgstr ""
+
+#: ../libgaim/protocols/oscar/oscar.c:5415
 msgid "<i>(retrieving)</i>"
 msgstr "<i>(ricevante)</i>"
 
-#: ../libgaim/protocols/oscar/oscar.c:5730
+#: ../libgaim/protocols/oscar/oscar.c:5728
 #, c-format
 msgid "Buddy Comment for %s"
 msgstr "Kunul Komento por %s"
 
-#: ../libgaim/protocols/oscar/oscar.c:5731
+#: ../libgaim/protocols/oscar/oscar.c:5729
 msgid "Buddy Comment:"
 msgstr "Kunul Komento:"
 
-#: ../libgaim/protocols/oscar/oscar.c:5777
+#: ../libgaim/protocols/oscar/oscar.c:5775
 #, c-format
 msgid "You have selected to open a Direct IM connection with %s."
 msgstr "Vi elektis malfermi Rektan TM konekton kun %s."
 
-#: ../libgaim/protocols/oscar/oscar.c:5781
+#: ../libgaim/protocols/oscar/oscar.c:5779
 msgid ""
 "Because this reveals your IP address, it may be considered a security risk.  "
 "Do you wish to continue?"
 msgstr ""
 
-#: ../libgaim/protocols/oscar/oscar.c:5785
+#: ../libgaim/protocols/oscar/oscar.c:5783
 #: ../libgaim/protocols/oscar/peer.c:990
 msgid "_Connect"
 msgstr "_Konektu"
 
-#: ../libgaim/protocols/oscar/oscar.c:5819
+#: ../libgaim/protocols/oscar/oscar.c:5817
 msgid "Get AIM Info"
 msgstr "Ricevu AIM Informon"
 
-#: ../libgaim/protocols/oscar/oscar.c:5825
+#: ../libgaim/protocols/oscar/oscar.c:5823
 msgid "Edit Buddy Comment"
 msgstr "Redaktu Kunul Komenton"
 
-#: ../libgaim/protocols/oscar/oscar.c:5833
+#: ../libgaim/protocols/oscar/oscar.c:5831
 msgid "Get Status Msg"
 msgstr "Ricevi Statan Mesaĝon"
 
-#: ../libgaim/protocols/oscar/oscar.c:5846
+#: ../libgaim/protocols/oscar/oscar.c:5844
 msgid "Direct IM"
 msgstr "Rekta TM"
 
-#: ../libgaim/protocols/oscar/oscar.c:5868
+#: ../libgaim/protocols/oscar/oscar.c:5866
 msgid "Re-request Authorization"
-msgstr "Re-petu aŭtentigon"
-
-#: ../libgaim/protocols/oscar/oscar.c:5927
+msgstr ""
+
+#: ../libgaim/protocols/oscar/oscar.c:5925
 msgid "Require authorization"
-msgstr "Petu aŭtentigon"
-
-#: ../libgaim/protocols/oscar/oscar.c:5930
+msgstr ""
+
+#: ../libgaim/protocols/oscar/oscar.c:5928
 msgid "Web aware (enabling this will cause you to receive SPAM!)"
 msgstr ""
 
-#: ../libgaim/protocols/oscar/oscar.c:5935
+#: ../libgaim/protocols/oscar/oscar.c:5933
 msgid "ICQ Privacy Options"
-msgstr "ICQ Privatecaj Opcioj"
-
-#: ../libgaim/protocols/oscar/oscar.c:5952
+msgstr ""
+
+#: ../libgaim/protocols/oscar/oscar.c:5950
 msgid "The new formatting is invalid."
-msgstr "La nova formatumo malvalidas."
-
-#: ../libgaim/protocols/oscar/oscar.c:5953
+msgstr ""
+
+#: ../libgaim/protocols/oscar/oscar.c:5951
 msgid "Screen name formatting can change only capitalization and whitespace."
 msgstr ""
 
-#: ../libgaim/protocols/oscar/oscar.c:5960
+#: ../libgaim/protocols/oscar/oscar.c:5958
 msgid "New screen name formatting:"
-msgstr "Nova ekrana nomo formatumo:"
-
-#: ../libgaim/protocols/oscar/oscar.c:6016
+msgstr ""
+
+#: ../libgaim/protocols/oscar/oscar.c:6014
 msgid "Change Address To:"
 msgstr "Ŝanĝu adreson al:"
 
-#: ../libgaim/protocols/oscar/oscar.c:6061
+#: ../libgaim/protocols/oscar/oscar.c:6059
 msgid "<i>you are not waiting for authorization</i>"
-msgstr "<i>vi ne atendas aŭtentigon</i>"
-
-#: ../libgaim/protocols/oscar/oscar.c:6064
+msgstr ""
+
+#: ../libgaim/protocols/oscar/oscar.c:6062
 msgid "You are awaiting authorization from the following buddies"
-msgstr "Vi atendas aŭtentigon de la jenaj kunuloj"
-
-#: ../libgaim/protocols/oscar/oscar.c:6065
+msgstr ""
+
+#: ../libgaim/protocols/oscar/oscar.c:6063
 msgid ""
 "You can re-request authorization from these buddies by right-clicking on "
 "them and selecting \"Re-request Authorization.\""
 msgstr ""
-"Vi povas re-peti aŭtentigon el tiuj kunuloj per dekstre-klaki ilin "
-"kaj elekti \"Re-petu aŭtentigon.\""
-
-#: ../libgaim/protocols/oscar/oscar.c:6082
+
+#: ../libgaim/protocols/oscar/oscar.c:6080
 msgid "Find Buddy by E-Mail"
 msgstr "Trovu kunulon laŭ Retadreso"
 
-#: ../libgaim/protocols/oscar/oscar.c:6083
+#: ../libgaim/protocols/oscar/oscar.c:6081
 msgid "Search for a buddy by e-mail address"
 msgstr "Serĉu kunulon laŭ retadreso"
 
-#: ../libgaim/protocols/oscar/oscar.c:6084
+#: ../libgaim/protocols/oscar/oscar.c:6082
 msgid "Type the e-mail address of the buddy you are searching for."
 msgstr "Tajpu retadreson de la kunul kiun vi serĉas."
 
-#: ../libgaim/protocols/oscar/oscar.c:6253
+#: ../libgaim/protocols/oscar/oscar.c:6251
 msgid "Set User Info (URL)..."
 msgstr "Difinu Uzanto-Informon (URL)..."
 
-#: ../libgaim/protocols/oscar/oscar.c:6264
+#: ../libgaim/protocols/oscar/oscar.c:6262
 msgid "Change Password (URL)"
 msgstr "Ŝanĝu Pasvorton (URL)"
 
-#: ../libgaim/protocols/oscar/oscar.c:6268
+#: ../libgaim/protocols/oscar/oscar.c:6266
 msgid "Configure IM Forwarding (URL)"
 msgstr "Agordu TM Plusendado (URL)"
 
 #. ICQ actions
-#: ../libgaim/protocols/oscar/oscar.c:6278
+#: ../libgaim/protocols/oscar/oscar.c:6276
 msgid "Set Privacy Options..."
 msgstr "Difinu Privatecajn Opciojn..."
 
 #. AIM actions
-#: ../libgaim/protocols/oscar/oscar.c:6285
+#: ../libgaim/protocols/oscar/oscar.c:6283
 msgid "Format Screen Name..."
 msgstr "Formatu Ekrano-Nomon..."
 
-#: ../libgaim/protocols/oscar/oscar.c:6289
+#: ../libgaim/protocols/oscar/oscar.c:6287
 msgid "Confirm Account"
 msgstr "Konfirmu Konton"
 
-#: ../libgaim/protocols/oscar/oscar.c:6293
+#: ../libgaim/protocols/oscar/oscar.c:6291
 msgid "Display Currently Registered E-Mail Address"
 msgstr "Vidigu Aktualajn Aliĝintajn Retadresojn"
 
-#: ../libgaim/protocols/oscar/oscar.c:6297
+#: ../libgaim/protocols/oscar/oscar.c:6295
 msgid "Change Currently Registered E-Mail Address..."
 msgstr "Ŝanĝu Aktualajn Aliĝintajn Retadresojn.."
 
-#: ../libgaim/protocols/oscar/oscar.c:6304
+#: ../libgaim/protocols/oscar/oscar.c:6302
 msgid "Show Buddies Awaiting Authorization"
 msgstr "Montru Kunulojn Atendante Permeso"
 
-#: ../libgaim/protocols/oscar/oscar.c:6310
+#: ../libgaim/protocols/oscar/oscar.c:6308
 msgid "Search for Buddy by E-Mail Address..."
 msgstr "Serĉu Kunulon laŭ Retadreso..."
 
-#: ../libgaim/protocols/oscar/oscar.c:6315
+#: ../libgaim/protocols/oscar/oscar.c:6313
 msgid "Search for Buddy by Information"
 msgstr "Serĉu Kunulon laŭ Informo..."
 
-#: ../libgaim/protocols/oscar/oscar.c:6383
+#: ../libgaim/protocols/oscar/oscar.c:6381
 msgid "Use recent buddies group"
 msgstr "Uzu ĵusan kunulgrupon"
 
-#: ../libgaim/protocols/oscar/oscar.c:6386
+#: ../libgaim/protocols/oscar/oscar.c:6384
 msgid "Show how long you have been idle"
-msgstr "Montru kiom longa vi estis senfara"
+msgstr ""
 
 #. *< type
 #. *< ui_requirement
@@ -10745,18 +10615,18 @@
 #. *< version
 #. *  summary
 #. *  description
+#: ../libgaim/protocols/oscar/oscar.c:6510
 #: ../libgaim/protocols/oscar/oscar.c:6512
-#: ../libgaim/protocols/oscar/oscar.c:6514
 msgid "AIM/ICQ Protocol Plugin"
 msgstr "AIM/ICQ Protokol-Kromaĵo"
 
-#: ../libgaim/protocols/oscar/oscar.c:6539
+#: ../libgaim/protocols/oscar/oscar.c:6537
 #: ../libgaim/protocols/yahoo/yahoo.c:3950
 #: ../libgaim/protocols/zephyr/zephyr.c:2980
 msgid "Encoding"
 msgstr "Kodoprezento"
 
-#: ../libgaim/protocols/oscar/oscar.c:6543
+#: ../libgaim/protocols/oscar/oscar.c:6541
 msgid ""
 "Always use AIM/ICQ proxy server for file transfers\n"
 "(slower, but does not reveal your IP address)"
@@ -10767,21 +10637,21 @@
 #: ../libgaim/protocols/oscar/peer.c:623
 #, c-format
 msgid "Asking %s to connect to us at %s:%hu for Direct IM."
-msgstr "Demandas %s konekti nin al %s:%hu por Rekta TM."
+msgstr ""
 
 #: ../libgaim/protocols/oscar/peer.c:703 ../libgaim/protocols/oscar/peer.c:738
 #, c-format
 msgid "Attempting to connect to %s:%hu."
-msgstr "Provas konekti al %s:%hu"
+msgstr ""
 
 #: ../libgaim/protocols/oscar/peer.c:803
 msgid "Attempting to connect via proxy server."
-msgstr "Provas konekti pere de prokurservilo."
+msgstr ""
 
 #: ../libgaim/protocols/oscar/peer.c:980
 #, c-format
 msgid "%s has just asked to directly connect to %s"
-msgstr "%s ĵus petis rektan konekton al %s"
+msgstr ""
 
 #: ../libgaim/protocols/oscar/peer.c:984
 msgid ""
@@ -10808,19 +10678,19 @@
 
 #: ../libgaim/protocols/qq/buddy_info.c:46
 msgid "Province/State"
-msgstr "Provinco/Ŝtato"
+msgstr ""
 
 #: ../libgaim/protocols/qq/buddy_info.c:48
 msgid "Horoscope Symbol"
-msgstr "Horoskopa Simbolo"
+msgstr ""
 
 #: ../libgaim/protocols/qq/buddy_info.c:50
 msgid "Zodiac Sign"
-msgstr "Zodiaka Signo"
+msgstr ""
 
 #: ../libgaim/protocols/qq/buddy_info.c:51
 msgid "Blood Type"
-msgstr "Sanga Tipo"
+msgstr ""
 
 #: ../libgaim/protocols/qq/buddy_info.c:52
 msgid "College"
@@ -10832,63 +10702,63 @@
 
 #: ../libgaim/protocols/qq/buddy_info.c:55
 msgid "Zipcode"
-msgstr "Poŝtkodo"
+msgstr ""
 
 #: ../libgaim/protocols/qq/buddy_info.c:56
 msgid "Cellphone Number"
-msgstr "Poŝtelefona Numero"
+msgstr ""
 
 #: ../libgaim/protocols/qq/buddy_info.c:57
 msgid "Phone Number"
-msgstr "Telefonnumero"
+msgstr ""
 
 #: ../libgaim/protocols/qq/buddy_info.c:62
 msgid "Aquarius"
-msgstr "Verŝisto"
+msgstr ""
 
 #: ../libgaim/protocols/qq/buddy_info.c:62
 msgid "Pisces"
-msgstr "Fiŝoj"
+msgstr ""
 
 #: ../libgaim/protocols/qq/buddy_info.c:62
 msgid "Aries"
-msgstr "Ŝafo"
+msgstr ""
 
 #: ../libgaim/protocols/qq/buddy_info.c:62
 msgid "Taurus"
-msgstr "Bovo"
+msgstr ""
 
 #: ../libgaim/protocols/qq/buddy_info.c:63
 msgid "Gemini"
-msgstr "Ĝemeloj "
+msgstr ""
 
 #: ../libgaim/protocols/qq/buddy_info.c:63
 msgid "Cancer"
-msgstr "Kankro"
+msgstr ""
 
 #: ../libgaim/protocols/qq/buddy_info.c:63
 msgid "Leo"
-msgstr "Leono"
+msgstr ""
 
 #: ../libgaim/protocols/qq/buddy_info.c:63
 msgid "Virgo"
-msgstr "Virgulino"
+msgstr ""
 
 #: ../libgaim/protocols/qq/buddy_info.c:63
 msgid "Libra"
-msgstr "Pesilo "
+msgstr ""
 
 #: ../libgaim/protocols/qq/buddy_info.c:64
 msgid "Scorpio"
-msgstr "Skorpio "
+msgstr ""
 
 #: ../libgaim/protocols/qq/buddy_info.c:64
 msgid "Sagittarius"
-msgstr "Pafisto"
+msgstr ""
 
 #: ../libgaim/protocols/qq/buddy_info.c:64
 msgid "Capricorn"
-msgstr "Kaprikorno"
+msgstr ""
 
 #: ../libgaim/protocols/qq/buddy_info.c:69
 msgid "Rat"
@@ -10908,7 +10778,7 @@
 
 #: ../libgaim/protocols/qq/buddy_info.c:70
 msgid "Dragon"
-msgstr "Drako"
+msgstr ""
 
 #: ../libgaim/protocols/qq/buddy_info.c:70
 msgid "Snake"
@@ -10920,15 +10790,15 @@
 
 #: ../libgaim/protocols/qq/buddy_info.c:70
 msgid "Goat"
-msgstr "Kapro"
+msgstr ""
 
 #: ../libgaim/protocols/qq/buddy_info.c:70
 msgid "Monkey"
-msgstr "Simio"
+msgstr ""
 
 #: ../libgaim/protocols/qq/buddy_info.c:71
 msgid "Rooster"
-msgstr "Virkoko"
+msgstr ""
 
 #: ../libgaim/protocols/qq/buddy_info.c:71
 msgid "Dog"
@@ -10964,7 +10834,7 @@
 #: ../libgaim/protocols/qq/buddy_opt.c:206
 #: ../libgaim/protocols/qq/group_opt.c:134
 msgid "Input your reason:"
-msgstr "Enigu vian kialon:"
+msgstr ""
 
 #: ../libgaim/protocols/qq/buddy_opt.c:208
 msgid "Reject request"
@@ -10988,7 +10858,7 @@
 
 #: ../libgaim/protocols/qq/buddy_opt.c:301
 msgid "You have successfully removed a buddy"
-msgstr "Vi sukcese forigis kunulon"
+msgstr ""
 
 #: ../libgaim/protocols/qq/buddy_opt.c:329
 msgid "You have successfully removed yourself from a buddy"
@@ -11019,7 +10889,7 @@
 #: ../libgaim/protocols/qq/buddy_opt.c:404
 #, c-format
 msgid "You have added %d in buddy list"
-msgstr "Vi aldonis %d-n en kunullisto"
+msgstr ""
 
 #: ../libgaim/protocols/qq/buddy_opt.c:501
 msgid "QQid Error"
@@ -11031,7 +10901,7 @@
 
 #: ../libgaim/protocols/qq/group.c:63
 msgid "ID: "
-msgstr "ID: "
+msgstr ""
 
 #: ../libgaim/protocols/qq/group.c:96
 msgid "Group ID"
@@ -11051,11 +10921,11 @@
 
 #: ../libgaim/protocols/qq/group.c:117
 msgid "QQ Qun"
-msgstr "QQ Qun"
+msgstr ""
 
 #: ../libgaim/protocols/qq/group.c:118
 msgid "Please input external group ID"
-msgstr "B.v. enigi eksteran groupon ID-n"
+msgstr ""
 
 #: ../libgaim/protocols/qq/group.c:119
 msgid "You can only search for permanent QQ groups\n"
@@ -11064,7 +10934,7 @@
 #: ../libgaim/protocols/qq/group_im.c:120
 #, c-format
 msgid "User %d applied to join group %d"
-msgstr "Uzanto %d aliĝpetis grupon %d"
+msgstr ""
 
 #: ../libgaim/protocols/qq/group_im.c:121
 #: ../libgaim/protocols/qq/group_im.c:170
@@ -11084,13 +10954,13 @@
 #: ../libgaim/protocols/qq/group_opt.c:298
 #: ../libgaim/protocols/qq/group_opt.c:384
 msgid "QQ Qun Operation"
-msgstr "QQ Qun Operacio"
+msgstr ""
 
 #: ../libgaim/protocols/qq/group_im.c:131
 #: ../libgaim/protocols/qq/group_opt.c:125
 #: ../libgaim/protocols/qq/sys_msg.c:85 ../libgaim/protocols/qq/sys_msg.c:228
 msgid "Approve"
-msgstr "Aprobi"
+msgstr ""
 
 #: ../libgaim/protocols/qq/group_im.c:169
 #, c-format
@@ -11118,15 +10988,15 @@
 
 #: ../libgaim/protocols/qq/group_internal.c:39
 msgid "I am not member"
-msgstr "Mi ne estas membro"
+msgstr ""
 
 #: ../libgaim/protocols/qq/group_internal.c:42
 msgid "I am a member"
-msgstr "Mi estas membro"
+msgstr ""
 
 #: ../libgaim/protocols/qq/group_internal.c:45
 msgid "I am applying to join"
-msgstr "Mi aliĝpetas"
+msgstr ""
 
 #: ../libgaim/protocols/qq/group_internal.c:48
 msgid "I am the admin"
@@ -11142,7 +11012,7 @@
 
 #: ../libgaim/protocols/qq/group_join.c:227
 msgid "You have successfully exited the group"
-msgstr "Vi sukcese forlasis la grupon"
+msgstr ""
 
 #: ../libgaim/protocols/qq/group_join.c:251
 msgid "QQ Group Auth"
@@ -11168,16 +11038,16 @@
 
 #: ../libgaim/protocols/qq/group_join.c:359
 msgid "Go ahead"
-msgstr "Daŭrigu"
+msgstr ""
 
 #: ../libgaim/protocols/qq/group_network.c:88
 #, c-format
 msgid "Code [0x%02X]: %s"
-msgstr "Kodo [0x%02X]: %s"
+msgstr ""
 
 #: ../libgaim/protocols/qq/group_network.c:89
 msgid "Group Operation Error"
-msgstr "Grupoperacio Eraro"
+msgstr ""
 
 #: ../libgaim/protocols/qq/group_opt.c:122
 #: ../libgaim/protocols/qq/sys_msg.c:82
@@ -11224,6 +11094,10 @@
 msgid "Request login token error!"
 msgstr ""
 
+#: ../libgaim/protocols/qq/login_logout.c:479
+msgid "Wrong password!"
+msgstr "Malĵusta pasvorto!"
+
 #: ../libgaim/protocols/qq/login_logout.c:482
 msgid "Unable to login, check debug log"
 msgstr ""
@@ -11309,10 +11183,6 @@
 msgid "<b>My Public IP</b>: %s<br>\n"
 msgstr ""
 
-#: ../libgaim/protocols/qq/qq.c:522
-msgid "<i>Information below may not be accurate</i><br>\n"
-msgstr ""
-
 #: ../libgaim/protocols/qq/qq.c:524
 #, c-format
 msgid "<b>Login Time</b>: %s<br>\n"
@@ -11382,6 +11252,14 @@
 msgid "Login Hidden"
 msgstr ""
 
+#: ../libgaim/protocols/qq/qq.c:1031
+msgid "QQ Server"
+msgstr "QQ Servilo"
+
+#: ../libgaim/protocols/qq/qq.c:1034
+msgid "QQ Port"
+msgstr "QQ Pordo"
+
 #: ../libgaim/protocols/qq/qq_proxy.c:493
 msgid "Socket send error"
 msgstr ""
@@ -11486,175 +11364,175 @@
 msgid "Would you like to add him?"
 msgstr "Ĉu vi deziras aldoni ŝlin?"
 
-#: ../libgaim/protocols/sametime/sametime.c:417
+#: ../libgaim/protocols/sametime/sametime.c:415
 msgid "Connection closed (writing)"
 msgstr "Koneto fermita (skribante)"
 
-#: ../libgaim/protocols/sametime/sametime.c:1290
+#: ../libgaim/protocols/sametime/sametime.c:1261
 #, c-format
 msgid "<b>Group Title:</b> %s<br>"
 msgstr "<b>Grupo Titolo:</b> %s<br>"
 
-#: ../libgaim/protocols/sametime/sametime.c:1291
+#: ../libgaim/protocols/sametime/sametime.c:1262
 #, c-format
 msgid "<b>Notes Group ID:</b> %s<br>"
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:1293
+#: ../libgaim/protocols/sametime/sametime.c:1264
 #, c-format
 msgid "Info for Group %s"
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:1295
+#: ../libgaim/protocols/sametime/sametime.c:1266
 msgid "Notes Address Book Information"
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:1327
+#: ../libgaim/protocols/sametime/sametime.c:1298
 msgid "Invite Group to Conference..."
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:1337
+#: ../libgaim/protocols/sametime/sametime.c:1308
 msgid "Get Notes Address Book Info"
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:1498
+#: ../libgaim/protocols/sametime/sametime.c:1461
 msgid "Sending Handshake"
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:1503
+#: ../libgaim/protocols/sametime/sametime.c:1466
 msgid "Waiting for Handshake Acknowledgement"
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:1508
+#: ../libgaim/protocols/sametime/sametime.c:1471
 msgid "Handshake Acknowledged, Sending Login"
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:1513
+#: ../libgaim/protocols/sametime/sametime.c:1476
 msgid "Waiting for Login Acknowledgement"
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:1518
+#: ../libgaim/protocols/sametime/sametime.c:1481
 msgid "Login Redirected"
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:1524
+#: ../libgaim/protocols/sametime/sametime.c:1487
 msgid "Forcing Login"
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:1528
+#: ../libgaim/protocols/sametime/sametime.c:1491
 msgid "Login Acknowledged"
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:1533
+#: ../libgaim/protocols/sametime/sametime.c:1496
 msgid "Starting Services"
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:1538
+#: ../libgaim/protocols/sametime/sametime.c:1501
 msgid "Connected"
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:1636
+#: ../libgaim/protocols/sametime/sametime.c:1599
 #, c-format
 msgid "A Sametime administrator has issued the following announcement on server %s"
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:1641
+#: ../libgaim/protocols/sametime/sametime.c:1604
 msgid "Sametime Administrator Announcement"
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:1693
+#: ../libgaim/protocols/sametime/sametime.c:1656
 msgid "Connection reset"
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:1700
+#: ../libgaim/protocols/sametime/sametime.c:1663
 #, c-format
 msgid "Error reading from socket: %s"
 msgstr ""
 
 #. this is a regular connect, error out
-#: ../libgaim/protocols/sametime/sametime.c:1723
-#: ../libgaim/protocols/sametime/sametime.c:3734
+#: ../libgaim/protocols/sametime/sametime.c:1688
+#: ../libgaim/protocols/sametime/sametime.c:3685
 msgid "Unable to connect to host"
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:1761
+#: ../libgaim/protocols/sametime/sametime.c:1726
 #, c-format
 msgid "Announcement from %s"
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:1935
+#: ../libgaim/protocols/sametime/sametime.c:1900
 msgid "Conference Closed"
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:2392
+#: ../libgaim/protocols/sametime/sametime.c:2357
 msgid "Unable to send message: "
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:2949
+#: ../libgaim/protocols/sametime/sametime.c:2914
 msgid "Place Closed"
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:3240
+#: ../libgaim/protocols/sametime/sametime.c:3205
 msgid "Microphone"
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:3241
+#: ../libgaim/protocols/sametime/sametime.c:3206
 msgid "Speakers"
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:3242
+#: ../libgaim/protocols/sametime/sametime.c:3207
 msgid "Video Camera"
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:3246
+#: ../libgaim/protocols/sametime/sametime.c:3211
 msgid "File Transfer"
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:3280
+#: ../libgaim/protocols/sametime/sametime.c:3245
 #, c-format
 msgid ""
 "\n"
 "<b>Supports:</b> %s"
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:3285
+#: ../libgaim/protocols/sametime/sametime.c:3250
 msgid ""
 "\n"
 "<b>External User</b>"
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:3391
+#: ../libgaim/protocols/sametime/sametime.c:3356
 msgid "Create conference with user"
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:3392
+#: ../libgaim/protocols/sametime/sametime.c:3357
 #, c-format
 msgid ""
 "Please enter a topic for the new conference, and an invitation message to be "
 "sent to %s"
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:3396
+#: ../libgaim/protocols/sametime/sametime.c:3361
 msgid "New Conference"
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:3398
+#: ../libgaim/protocols/sametime/sametime.c:3363
 msgid "Create"
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:3462
+#: ../libgaim/protocols/sametime/sametime.c:3427
 msgid "Available Conferences"
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:3468
+#: ../libgaim/protocols/sametime/sametime.c:3433
 msgid "Create New Conference..."
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:3475
+#: ../libgaim/protocols/sametime/sametime.c:3440
 msgid "Invite user to a conference"
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:3476
+#: ../libgaim/protocols/sametime/sametime.c:3441
 #, c-format
 msgid ""
 "Select a conference from the list below to send an invite to user %s. Select "
@@ -11662,174 +11540,174 @@
 "this user to."
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:3481
+#: ../libgaim/protocols/sametime/sametime.c:3446
 msgid "Invite to Conference"
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:3571
+#: ../libgaim/protocols/sametime/sametime.c:3536
 msgid "Invite to Conference..."
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:3576
+#: ../libgaim/protocols/sametime/sametime.c:3541
 msgid "Send TEST Announcement"
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:3623
+#: ../libgaim/protocols/sametime/sametime.c:3588
 msgid "No Sametime Community Server specified"
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:3645
+#: ../libgaim/protocols/sametime/sametime.c:3610
 #, c-format
 msgid ""
 "No host or IP address has been configured for the Meanwhile account %s. "
 "Please enter one below to continue logging in."
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:3650
+#: ../libgaim/protocols/sametime/sametime.c:3615
 msgid "Meanwhile Connection Setup"
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:3651
+#: ../libgaim/protocols/sametime/sametime.c:3616
 msgid "No Sametime Community Server Specified"
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:4129
+#: ../libgaim/protocols/sametime/sametime.c:4084
 msgid "<b>External User</b><br>"
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:4132
+#: ../libgaim/protocols/sametime/sametime.c:4087
 #, c-format
 msgid "<b>User ID:</b> %s<br>"
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:4138
+#: ../libgaim/protocols/sametime/sametime.c:4093
 #, c-format
 msgid "<b>Full Name:</b> %s<br>"
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:4144
+#: ../libgaim/protocols/sametime/sametime.c:4099
 msgid "<b>Last Known Client:</b> "
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:4152
+#: ../libgaim/protocols/sametime/sametime.c:4107
 #, c-format
 msgid "Unknown (0x%04x)<br>"
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:4159
+#: ../libgaim/protocols/sametime/sametime.c:4114
 #, c-format
 msgid "<b>Supports:</b> %s<br>"
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:4165
+#: ../libgaim/protocols/sametime/sametime.c:4120
 #, c-format
 msgid "<b>Status:</b> %s"
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:4317
-#: ../libgaim/protocols/sametime/sametime.c:5509
+#: ../libgaim/protocols/sametime/sametime.c:4263
+#: ../libgaim/protocols/sametime/sametime.c:5427
 msgid "User Name"
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:4320
-#: ../libgaim/protocols/sametime/sametime.c:5512
+#: ../libgaim/protocols/sametime/sametime.c:4266
+#: ../libgaim/protocols/sametime/sametime.c:5430
 msgid "Sametime ID"
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:4344
+#: ../libgaim/protocols/sametime/sametime.c:4290
 msgid "An ambiguous user ID was entered"
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:4345
+#: ../libgaim/protocols/sametime/sametime.c:4291
 #, c-format
 msgid ""
 "The identifier '%s' may possibly refer to any of the following users. Please "
 "select the correct user from the list below to add them to your buddy list."
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:4350
+#: ../libgaim/protocols/sametime/sametime.c:4296
 msgid "Select User"
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:4434
+#: ../libgaim/protocols/sametime/sametime.c:4366
 msgid "Unable to add user: user not found"
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:4436
+#: ../libgaim/protocols/sametime/sametime.c:4368
 #, c-format
 msgid ""
 "The identifier '%s' did not match any users in your Sametime community. This "
 "entry has been removed from your buddy list."
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:4441
+#: ../libgaim/protocols/sametime/sametime.c:4373
 msgid "Unable to add user"
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:5027
+#: ../libgaim/protocols/sametime/sametime.c:4945
 #, c-format
 msgid ""
 "Error reading file %s: \n"
 "%s\n"
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:5159
+#: ../libgaim/protocols/sametime/sametime.c:5077
 msgid "Remotely Stored Buddy List"
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:5164
+#: ../libgaim/protocols/sametime/sametime.c:5082
 msgid "Buddy List Storage Mode"
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:5167
+#: ../libgaim/protocols/sametime/sametime.c:5085
 msgid "Local Buddy List Only"
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:5169
+#: ../libgaim/protocols/sametime/sametime.c:5087
 msgid "Merge List from Server"
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:5171
+#: ../libgaim/protocols/sametime/sametime.c:5089
 msgid "Merge and Save List to Server"
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:5173
+#: ../libgaim/protocols/sametime/sametime.c:5091
 msgid "Synchronize List with Server"
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:5222
+#: ../libgaim/protocols/sametime/sametime.c:5140
 #, c-format
 msgid "Import Sametime List for Account %s"
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:5261
+#: ../libgaim/protocols/sametime/sametime.c:5179
 #, c-format
 msgid "Export Sametime List for Account %s"
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:5314
+#: ../libgaim/protocols/sametime/sametime.c:5232
 msgid "Unable to add group: group exists"
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:5315
+#: ../libgaim/protocols/sametime/sametime.c:5233
 #, c-format
 msgid "A group named '%s' already exists in your buddy list."
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:5318
-#: ../libgaim/protocols/sametime/sametime.c:5447
+#: ../libgaim/protocols/sametime/sametime.c:5236
+#: ../libgaim/protocols/sametime/sametime.c:5365
 msgid "Unable to add group"
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:5377
+#: ../libgaim/protocols/sametime/sametime.c:5295
 msgid "Possible Matches"
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:5393
+#: ../libgaim/protocols/sametime/sametime.c:5311
 msgid "Notes Address Book group results"
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:5394
+#: ../libgaim/protocols/sametime/sametime.c:5312
 #, c-format
 msgid ""
 "The identifier '%s' may possibly refer to any of the following Notes Address "
@@ -11837,37 +11715,37 @@
 "to your buddy list."
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:5399
+#: ../libgaim/protocols/sametime/sametime.c:5317
 msgid "Select Notes Address Book"
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:5441
+#: ../libgaim/protocols/sametime/sametime.c:5359
 msgid "Unable to add group: group not found"
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:5443
+#: ../libgaim/protocols/sametime/sametime.c:5361
 #, c-format
 msgid ""
 "The identifier '%s' did not match any Notes Address Book groups in your "
 "Sametime community."
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:5484
+#: ../libgaim/protocols/sametime/sametime.c:5402
 msgid "Notes Address Book Group"
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:5485
+#: ../libgaim/protocols/sametime/sametime.c:5403
 msgid ""
 "Enter the name of a Notes Address Book group in the field below to add the "
 "group and its members to your buddy list."
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:5533
+#: ../libgaim/protocols/sametime/sametime.c:5451
 #, c-format
 msgid "Search results for '%s'"
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:5534
+#: ../libgaim/protocols/sametime/sametime.c:5452
 #, c-format
 msgid ""
 "The identifier '%s' may possibly refer to any of the following users. You "
@@ -11875,55 +11753,55 @@
 "buttons below."
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:5566
+#: ../libgaim/protocols/sametime/sametime.c:5484
 msgid "No matches"
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:5567
+#: ../libgaim/protocols/sametime/sametime.c:5485
 #, c-format
 msgid "The identifier '%s' did not match any users in your Sametime community."
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:5571
+#: ../libgaim/protocols/sametime/sametime.c:5489
 msgid "No Matches"
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:5608
+#: ../libgaim/protocols/sametime/sametime.c:5526
 msgid "Search for a user"
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:5609
+#: ../libgaim/protocols/sametime/sametime.c:5527
 msgid ""
 "Enter a name or partial ID in the field below to search for matching users "
 "in your Sametime community."
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:5612
+#: ../libgaim/protocols/sametime/sametime.c:5530
 msgid "User Search"
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:5624
+#: ../libgaim/protocols/sametime/sametime.c:5542
 msgid "Import Sametime List..."
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:5628
+#: ../libgaim/protocols/sametime/sametime.c:5546
 msgid "Export Sametime List..."
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:5632
+#: ../libgaim/protocols/sametime/sametime.c:5550
 msgid "Add Notes Address Book Group..."
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:5636
+#: ../libgaim/protocols/sametime/sametime.c:5554
 msgid "User Search..."
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:5733
+#: ../libgaim/protocols/sametime/sametime.c:5651
 msgid "Force login (ignore server redirects)"
 msgstr ""
 
 #. pretend to be Sametime Connect
-#: ../libgaim/protocols/sametime/sametime.c:5743
+#: ../libgaim/protocols/sametime/sametime.c:5661
 msgid "Hide client identity"
 msgstr ""
 
@@ -12104,32 +11982,32 @@
 msgid "Robot"
 msgstr ""
 
-#: ../libgaim/protocols/silc/buddy.c:1486 ../libgaim/protocols/silc/silc.c:668
+#: ../libgaim/protocols/silc/buddy.c:1486 ../libgaim/protocols/silc/silc.c:672
 #: ../libgaim/protocols/silc/util.c:514
 msgid "Happy"
 msgstr ""
 
-#: ../libgaim/protocols/silc/buddy.c:1488 ../libgaim/protocols/silc/silc.c:670
+#: ../libgaim/protocols/silc/buddy.c:1488 ../libgaim/protocols/silc/silc.c:674
 #: ../libgaim/protocols/silc/util.c:516
 msgid "Sad"
 msgstr ""
 
-#: ../libgaim/protocols/silc/buddy.c:1490 ../libgaim/protocols/silc/silc.c:672
+#: ../libgaim/protocols/silc/buddy.c:1490 ../libgaim/protocols/silc/silc.c:676
 #: ../libgaim/protocols/silc/util.c:518
 msgid "Angry"
 msgstr ""
 
-#: ../libgaim/protocols/silc/buddy.c:1492 ../libgaim/protocols/silc/silc.c:674
+#: ../libgaim/protocols/silc/buddy.c:1492 ../libgaim/protocols/silc/silc.c:678
 #: ../libgaim/protocols/silc/util.c:520
 msgid "Jealous"
 msgstr ""
 
-#: ../libgaim/protocols/silc/buddy.c:1494 ../libgaim/protocols/silc/silc.c:676
+#: ../libgaim/protocols/silc/buddy.c:1494 ../libgaim/protocols/silc/silc.c:680
 #: ../libgaim/protocols/silc/util.c:522
 msgid "Ashamed"
 msgstr ""
 
-#: ../libgaim/protocols/silc/buddy.c:1496 ../libgaim/protocols/silc/silc.c:678
+#: ../libgaim/protocols/silc/buddy.c:1496 ../libgaim/protocols/silc/silc.c:682
 #: ../libgaim/protocols/silc/util.c:524
 msgid "Invincible"
 msgstr ""
@@ -12138,22 +12016,22 @@
 msgid "In Love"
 msgstr ""
 
-#: ../libgaim/protocols/silc/buddy.c:1500 ../libgaim/protocols/silc/silc.c:682
+#: ../libgaim/protocols/silc/buddy.c:1500 ../libgaim/protocols/silc/silc.c:686
 #: ../libgaim/protocols/silc/util.c:528
 msgid "Sleepy"
 msgstr ""
 
-#: ../libgaim/protocols/silc/buddy.c:1502 ../libgaim/protocols/silc/silc.c:684
+#: ../libgaim/protocols/silc/buddy.c:1502 ../libgaim/protocols/silc/silc.c:688
 #: ../libgaim/protocols/silc/util.c:530
 msgid "Bored"
 msgstr ""
 
-#: ../libgaim/protocols/silc/buddy.c:1504 ../libgaim/protocols/silc/silc.c:686
+#: ../libgaim/protocols/silc/buddy.c:1504 ../libgaim/protocols/silc/silc.c:690
 #: ../libgaim/protocols/silc/util.c:532
 msgid "Excited"
 msgstr ""
 
-#: ../libgaim/protocols/silc/buddy.c:1506 ../libgaim/protocols/silc/silc.c:688
+#: ../libgaim/protocols/silc/buddy.c:1506 ../libgaim/protocols/silc/silc.c:692
 #: ../libgaim/protocols/silc/util.c:534
 msgid "Anxious"
 msgstr ""
@@ -12179,7 +12057,7 @@
 msgstr ""
 
 #: ../libgaim/protocols/silc/buddy.c:1570 ../libgaim/protocols/silc/ops.c:1232
-#: ../libgaim/protocols/silc/silc.c:736 ../libgaim/protocols/silc/silc.c:738
+#: ../libgaim/protocols/silc/silc.c:740 ../libgaim/protocols/silc/silc.c:742
 msgid "Timezone"
 msgstr "Temporegiono"
 
@@ -12314,7 +12192,7 @@
 msgstr ""
 
 #: ../libgaim/protocols/silc/chat.c:582 ../libgaim/protocols/silc/ops.c:1907
-#: ../libgaim/protocols/silc/silc.c:944
+#: ../libgaim/protocols/silc/silc.c:948
 msgid "Passphrase"
 msgstr ""
 
@@ -12406,15 +12284,15 @@
 msgid "Cannot join private group"
 msgstr ""
 
-#: ../libgaim/protocols/silc/chat.c:1294 ../libgaim/protocols/silc/silc.c:1152
+#: ../libgaim/protocols/silc/chat.c:1294 ../libgaim/protocols/silc/silc.c:1156
 msgid "Call Command"
 msgstr ""
 
-#: ../libgaim/protocols/silc/chat.c:1294 ../libgaim/protocols/silc/silc.c:1152
+#: ../libgaim/protocols/silc/chat.c:1294 ../libgaim/protocols/silc/silc.c:1156
 msgid "Cannot call command"
 msgstr ""
 
-#: ../libgaim/protocols/silc/chat.c:1295 ../libgaim/protocols/silc/silc.c:1153
+#: ../libgaim/protocols/silc/chat.c:1295 ../libgaim/protocols/silc/silc.c:1157
 msgid "Unknown command"
 msgstr ""
 
@@ -12523,7 +12401,7 @@
 msgid "Job Role"
 msgstr ""
 
-#: ../libgaim/protocols/silc/ops.c:1052 ../libgaim/protocols/silc/silc.c:937
+#: ../libgaim/protocols/silc/ops.c:1052 ../libgaim/protocols/silc/silc.c:941
 msgid "Organization"
 msgstr ""
 
@@ -12560,7 +12438,7 @@
 msgid "_More..."
 msgstr ""
 
-#: ../libgaim/protocols/silc/ops.c:1369 ../libgaim/protocols/silc/silc.c:1003
+#: ../libgaim/protocols/silc/ops.c:1369 ../libgaim/protocols/silc/silc.c:1007
 msgid "Detach From Server"
 msgstr ""
 
@@ -12665,7 +12543,7 @@
 msgstr ""
 
 #: ../libgaim/protocols/silc/ops.c:1818 ../libgaim/protocols/silc/ops.c:1865
-#: ../libgaim/protocols/silc/silc.c:188
+#: ../libgaim/protocols/silc/silc.c:189
 msgid "Resuming session"
 msgstr ""
 
@@ -12754,313 +12632,313 @@
 msgid "Unsupported public key type"
 msgstr ""
 
-#: ../libgaim/protocols/silc/silc.c:159
+#: ../libgaim/protocols/silc/silc.c:160
 msgid "Connection failed"
 msgstr "Konekto malsukcesis"
 
-#: ../libgaim/protocols/silc/silc.c:180
+#: ../libgaim/protocols/silc/silc.c:181
 msgid "Cannot initialize SILC Client connection"
 msgstr ""
 
-#: ../libgaim/protocols/silc/silc.c:191
+#: ../libgaim/protocols/silc/silc.c:192
 msgid "Performing key exchange"
 msgstr ""
 
-#: ../libgaim/protocols/silc/silc.c:277
+#: ../libgaim/protocols/silc/silc.c:278
 msgid "Out of memory"
 msgstr ""
 
-#: ../libgaim/protocols/silc/silc.c:323
+#: ../libgaim/protocols/silc/silc.c:324
 msgid "Cannot initialize SILC protocol"
 msgstr ""
 
-#: ../libgaim/protocols/silc/silc.c:330
+#: ../libgaim/protocols/silc/silc.c:331
 msgid "Cannot find/access ~/.silc directory"
 msgstr ""
 
 #. Progress
-#: ../libgaim/protocols/silc/silc.c:335
+#: ../libgaim/protocols/silc/silc.c:336
 msgid "Connecting to SILC Server"
 msgstr ""
 
-#: ../libgaim/protocols/silc/silc.c:344
+#: ../libgaim/protocols/silc/silc.c:345
 #, c-format
 msgid "Could not load SILC key pair: %s"
 msgstr ""
 
-#: ../libgaim/protocols/silc/silc.c:365
+#: ../libgaim/protocols/silc/silc.c:367
 msgid "Unable to create connection"
 msgstr ""
 
-#: ../libgaim/protocols/silc/silc.c:664
+#: ../libgaim/protocols/silc/silc.c:668
 msgid "Your Current Mood"
 msgstr ""
 
-#: ../libgaim/protocols/silc/silc.c:680
+#: ../libgaim/protocols/silc/silc.c:684
 msgid "In love"
 msgstr ""
 
-#: ../libgaim/protocols/silc/silc.c:691
+#: ../libgaim/protocols/silc/silc.c:695
 msgid ""
 "\n"
 "Your Preferred Contact Methods"
 msgstr ""
 
-#: ../libgaim/protocols/silc/silc.c:699 ../libgaim/protocols/silc/util.c:559
+#: ../libgaim/protocols/silc/silc.c:703 ../libgaim/protocols/silc/util.c:559
 msgid "SMS"
 msgstr ""
 
-#: ../libgaim/protocols/silc/silc.c:701 ../libgaim/protocols/silc/util.c:561
+#: ../libgaim/protocols/silc/silc.c:705 ../libgaim/protocols/silc/util.c:561
 msgid "MMS"
 msgstr ""
 
-#: ../libgaim/protocols/silc/silc.c:703
+#: ../libgaim/protocols/silc/silc.c:707
 msgid "Video conferencing"
 msgstr ""
 
-#: ../libgaim/protocols/silc/silc.c:708
+#: ../libgaim/protocols/silc/silc.c:712
 msgid "Your Current Status"
 msgstr ""
 
-#: ../libgaim/protocols/silc/silc.c:715
+#: ../libgaim/protocols/silc/silc.c:719
 msgid "Online Services"
 msgstr ""
 
-#: ../libgaim/protocols/silc/silc.c:718
+#: ../libgaim/protocols/silc/silc.c:722
 msgid "Let others see what services you are using"
 msgstr ""
 
-#: ../libgaim/protocols/silc/silc.c:724
+#: ../libgaim/protocols/silc/silc.c:728
 msgid "Let others see what computer you are using"
 msgstr ""
 
-#: ../libgaim/protocols/silc/silc.c:731
+#: ../libgaim/protocols/silc/silc.c:735
 msgid "Your VCard File"
 msgstr ""
 
-#: ../libgaim/protocols/silc/silc.c:743 ../libgaim/protocols/silc/silc.c:744
+#: ../libgaim/protocols/silc/silc.c:747 ../libgaim/protocols/silc/silc.c:748
 msgid "User Online Status Attributes"
 msgstr ""
 
-#: ../libgaim/protocols/silc/silc.c:745
+#: ../libgaim/protocols/silc/silc.c:749
 msgid ""
 "You can let other users see your online status information and your personal "
 "information. Please fill the information you would like other users to see "
 "about yourself."
 msgstr ""
 
-#: ../libgaim/protocols/silc/silc.c:785 ../libgaim/protocols/silc/silc.c:791
-#: ../libgaim/protocols/silc/silc.c:1430
+#: ../libgaim/protocols/silc/silc.c:789 ../libgaim/protocols/silc/silc.c:795
+#: ../libgaim/protocols/silc/silc.c:1434
 msgid "Message of the Day"
 msgstr ""
 
-#: ../libgaim/protocols/silc/silc.c:785
+#: ../libgaim/protocols/silc/silc.c:789
 msgid "No Message of the Day available"
 msgstr ""
 
-#: ../libgaim/protocols/silc/silc.c:786 ../libgaim/protocols/silc/silc.c:1425
+#: ../libgaim/protocols/silc/silc.c:790 ../libgaim/protocols/silc/silc.c:1429
 msgid "There is no Message of the Day associated with this connection"
 msgstr ""
 
-#: ../libgaim/protocols/silc/silc.c:837 ../libgaim/protocols/silc/silc.c:881
-#: ../libgaim/protocols/silc/silc.c:952 ../libgaim/protocols/silc/silc.c:953
+#: ../libgaim/protocols/silc/silc.c:841 ../libgaim/protocols/silc/silc.c:885
+#: ../libgaim/protocols/silc/silc.c:956 ../libgaim/protocols/silc/silc.c:957
 msgid "Create New SILC Key Pair"
 msgstr ""
 
-#: ../libgaim/protocols/silc/silc.c:837
+#: ../libgaim/protocols/silc/silc.c:841
 msgid "Passphrases do not match"
 msgstr ""
 
-#: ../libgaim/protocols/silc/silc.c:881
+#: ../libgaim/protocols/silc/silc.c:885
 msgid "Key Pair Generation failed"
 msgstr ""
 
-#: ../libgaim/protocols/silc/silc.c:920
-msgid "Key length"
-msgstr ""
-
-#: ../libgaim/protocols/silc/silc.c:922
-msgid "Public key file"
-msgstr ""
-
 #: ../libgaim/protocols/silc/silc.c:924
+msgid "Key length"
+msgstr ""
+
+#: ../libgaim/protocols/silc/silc.c:926
+msgid "Public key file"
+msgstr ""
+
+#: ../libgaim/protocols/silc/silc.c:928
 msgid "Private key file"
 msgstr ""
 
-#: ../libgaim/protocols/silc/silc.c:947
+#: ../libgaim/protocols/silc/silc.c:951
 msgid "Passphrase (retype)"
 msgstr ""
 
-#: ../libgaim/protocols/silc/silc.c:954
+#: ../libgaim/protocols/silc/silc.c:958
 msgid "Generate Key Pair"
 msgstr ""
 
-#: ../libgaim/protocols/silc/silc.c:998
+#: ../libgaim/protocols/silc/silc.c:1002
 msgid "Online Status"
 msgstr ""
 
-#: ../libgaim/protocols/silc/silc.c:1007
-msgid "View Message of the Day"
-msgstr ""
-
 #: ../libgaim/protocols/silc/silc.c:1011
+msgid "View Message of the Day"
+msgstr ""
+
+#: ../libgaim/protocols/silc/silc.c:1015
 msgid "Create SILC Key Pair..."
 msgstr ""
 
-#: ../libgaim/protocols/silc/silc.c:1110
+#: ../libgaim/protocols/silc/silc.c:1114
 #, c-format
 msgid "User <I>%s</I> is not present in the network"
 msgstr ""
 
-#: ../libgaim/protocols/silc/silc.c:1301
+#: ../libgaim/protocols/silc/silc.c:1305
 msgid "Topic too long"
 msgstr ""
 
-#: ../libgaim/protocols/silc/silc.c:1382
+#: ../libgaim/protocols/silc/silc.c:1386
 msgid "You must specify a nick"
 msgstr ""
 
-#: ../libgaim/protocols/silc/silc.c:1484
+#: ../libgaim/protocols/silc/silc.c:1488
 #, c-format
 msgid "channel %s not found"
 msgstr ""
 
-#: ../libgaim/protocols/silc/silc.c:1489
+#: ../libgaim/protocols/silc/silc.c:1493
 #, c-format
 msgid "channel modes for %s: %s"
 msgstr ""
 
-#: ../libgaim/protocols/silc/silc.c:1491
+#: ../libgaim/protocols/silc/silc.c:1495
 #, c-format
 msgid "no channel modes are set on %s"
 msgstr ""
 
-#: ../libgaim/protocols/silc/silc.c:1504
+#: ../libgaim/protocols/silc/silc.c:1508
 #, c-format
 msgid "Failed to set cmodes for %s"
 msgstr ""
 
-#: ../libgaim/protocols/silc/silc.c:1534
+#: ../libgaim/protocols/silc/silc.c:1538
 #, c-format
 msgid "Unknown command: %s, (may be a Gaim bug)"
 msgstr ""
 
-#: ../libgaim/protocols/silc/silc.c:1597
-msgid "part [channel]:  Leave the chat"
-msgstr ""
-
 #: ../libgaim/protocols/silc/silc.c:1601
-msgid "leave [channel]:  Leave the chat"
+msgid "part [channel]:  Leave the chat"
 msgstr ""
 
 #: ../libgaim/protocols/silc/silc.c:1605
+msgid "leave [channel]:  Leave the chat"
+msgstr ""
+
+#: ../libgaim/protocols/silc/silc.c:1609
 msgid "topic [&lt;new topic&gt;]:  View or change the topic"
 msgstr ""
 
-#: ../libgaim/protocols/silc/silc.c:1610
-msgid "join &lt;channel&gt; [&lt;password&gt;]:  Join a chat on this network"
-msgstr ""
-
 #: ../libgaim/protocols/silc/silc.c:1614
-msgid "list:  List channels on this network"
+msgid "join &lt;channel&gt; [&lt;password&gt;]:  Join a chat on this network"
 msgstr ""
 
 #: ../libgaim/protocols/silc/silc.c:1618
-msgid "whois &lt;nick&gt;:  View nick's information"
+msgid "list:  List channels on this network"
 msgstr ""
 
 #: ../libgaim/protocols/silc/silc.c:1622
-#: ../libgaim/protocols/zephyr/zephyr.c:2681
-msgid "msg &lt;nick&gt; &lt;message&gt;:  Send a private message to a user"
+msgid "whois &lt;nick&gt;:  View nick's information"
 msgstr ""
 
 #: ../libgaim/protocols/silc/silc.c:1626
-msgid "query &lt;nick&gt; [&lt;message&gt;]:  Send a private message to a user"
+#: ../libgaim/protocols/zephyr/zephyr.c:2681
+msgid "msg &lt;nick&gt; &lt;message&gt;:  Send a private message to a user"
 msgstr ""
 
 #: ../libgaim/protocols/silc/silc.c:1630
-msgid "motd:  View the server's Message Of The Day"
+msgid "query &lt;nick&gt; [&lt;message&gt;]:  Send a private message to a user"
 msgstr ""
 
 #: ../libgaim/protocols/silc/silc.c:1634
-msgid "detach:  Detach this session"
+msgid "motd:  View the server's Message Of The Day"
 msgstr ""
 
 #: ../libgaim/protocols/silc/silc.c:1638
-msgid "quit [message]:  Disconnect from the server, with an optional message"
+msgid "detach:  Detach this session"
 msgstr ""
 
 #: ../libgaim/protocols/silc/silc.c:1642
+msgid "quit [message]:  Disconnect from the server, with an optional message"
+msgstr ""
+
+#: ../libgaim/protocols/silc/silc.c:1646
 msgid "call &lt;command&gt;:  Call any silc client command"
 msgstr ""
 
-#: ../libgaim/protocols/silc/silc.c:1648
-msgid "kill &lt;nick&gt; [-pubkey|&lt;reason&gt;]:  Kill nick"
-msgstr ""
-
 #: ../libgaim/protocols/silc/silc.c:1652
-msgid "nick &lt;newnick&gt;:  Change your nickname"
+msgid "kill &lt;nick&gt; [-pubkey|&lt;reason&gt;]:  Kill nick"
 msgstr ""
 
 #: ../libgaim/protocols/silc/silc.c:1656
-msgid "whowas &lt;nick&gt;:  View nick's information"
+msgid "nick &lt;newnick&gt;:  Change your nickname"
 msgstr ""
 
 #: ../libgaim/protocols/silc/silc.c:1660
+msgid "whowas &lt;nick&gt;:  View nick's information"
+msgstr ""
+
+#: ../libgaim/protocols/silc/silc.c:1664
 msgid ""
 "cmode &lt;channel&gt; [+|-&lt;modes&gt;] [arguments]:  Change or display "
 "channel modes"
 msgstr ""
 
-#: ../libgaim/protocols/silc/silc.c:1664
-msgid ""
-"cumode &lt;channel&gt; +|-&lt;modes&gt; &lt;nick&gt;:  Change nick's modes "
-"on channel"
-msgstr ""
-
 #: ../libgaim/protocols/silc/silc.c:1668
-msgid "umode &lt;usermodes&gt;:  Set your modes in the network"
+msgid ""
+"cumode &lt;channel&gt; +|-&lt;modes&gt; &lt;nick&gt;:  Change nick's modes "
+"on channel"
 msgstr ""
 
 #: ../libgaim/protocols/silc/silc.c:1672
-msgid "oper &lt;nick&gt; [-pubkey]:  Get server operator privileges"
+msgid "umode &lt;usermodes&gt;:  Set your modes in the network"
 msgstr ""
 
 #: ../libgaim/protocols/silc/silc.c:1676
-msgid ""
-"invite &lt;channel&gt; [-|+]&lt;nick&gt;:  invite nick or add/remove from "
-"channel invite list"
+msgid "oper &lt;nick&gt; [-pubkey]:  Get server operator privileges"
 msgstr ""
 
 #: ../libgaim/protocols/silc/silc.c:1680
-msgid "kick &lt;channel&gt; &lt;nick&gt; [comment]:  Kick client from channel"
+msgid ""
+"invite &lt;channel&gt; [-|+]&lt;nick&gt;:  invite nick or add/remove from "
+"channel invite list"
 msgstr ""
 
 #: ../libgaim/protocols/silc/silc.c:1684
-msgid "info [server]:  View server administrative details"
+msgid "kick &lt;channel&gt; &lt;nick&gt; [comment]:  Kick client from channel"
 msgstr ""
 
 #: ../libgaim/protocols/silc/silc.c:1688
-msgid "ban [&lt;channel&gt; +|-&lt;nick&gt;]:  Ban client from channel"
+msgid "info [server]:  View server administrative details"
 msgstr ""
 
 #: ../libgaim/protocols/silc/silc.c:1692
-msgid "getkey &lt;nick|server&gt;:  Retrieve client's or server's public key"
+msgid "ban [&lt;channel&gt; +|-&lt;nick&gt;]:  Ban client from channel"
 msgstr ""
 
 #: ../libgaim/protocols/silc/silc.c:1696
-msgid "stats:  View server and network statistics"
+msgid "getkey &lt;nick|server&gt;:  Retrieve client's or server's public key"
 msgstr ""
 
 #: ../libgaim/protocols/silc/silc.c:1700
+msgid "stats:  View server and network statistics"
+msgstr ""
+
+#: ../libgaim/protocols/silc/silc.c:1704
 msgid "ping:  Send PING to the connected server"
 msgstr ""
 
-#: ../libgaim/protocols/silc/silc.c:1705
-msgid "users &lt;channel&gt;:  List users in channel"
-msgstr ""
-
 #: ../libgaim/protocols/silc/silc.c:1709
+msgid "users &lt;channel&gt;:  List users in channel"
+msgstr ""
+
+#: ../libgaim/protocols/silc/silc.c:1713
 msgid ""
 "names [-count|-ops|-halfops|-voices|-normal] &lt;channel(s)&gt;:  List "
 "specific users in channel(s)"
@@ -13075,60 +12953,60 @@
 #. *< name
 #. *< version
 #. *  summary
-#: ../libgaim/protocols/silc/silc.c:1819
+#: ../libgaim/protocols/silc/silc.c:1823
 msgid "SILC Protocol Plugin"
 msgstr "SILC Protokol-Kromaĵo"
 
 #. *  description
-#: ../libgaim/protocols/silc/silc.c:1821
+#: ../libgaim/protocols/silc/silc.c:1825
 msgid "Secure Internet Live Conferencing (SILC) Protocol"
 msgstr ""
 
-#: ../libgaim/protocols/silc/silc.c:1858
-msgid "Public Key file"
-msgstr ""
-
 #: ../libgaim/protocols/silc/silc.c:1862
+msgid "Public Key file"
+msgstr ""
+
+#: ../libgaim/protocols/silc/silc.c:1866
 msgid "Private Key file"
 msgstr ""
 
-#: ../libgaim/protocols/silc/silc.c:1872
+#: ../libgaim/protocols/silc/silc.c:1876
 msgid "Cipher"
 msgstr ""
 
-#: ../libgaim/protocols/silc/silc.c:1882
+#: ../libgaim/protocols/silc/silc.c:1886
 msgid "HMAC"
 msgstr ""
 
-#: ../libgaim/protocols/silc/silc.c:1885
+#: ../libgaim/protocols/silc/silc.c:1889
 msgid "Public key authentication"
 msgstr ""
 
-#: ../libgaim/protocols/silc/silc.c:1888
+#: ../libgaim/protocols/silc/silc.c:1892
 msgid "Reject watching by other users"
 msgstr ""
 
-#: ../libgaim/protocols/silc/silc.c:1891
+#: ../libgaim/protocols/silc/silc.c:1895
 msgid "Block invites"
 msgstr ""
 
-#: ../libgaim/protocols/silc/silc.c:1894
+#: ../libgaim/protocols/silc/silc.c:1898
 msgid "Block IMs without Key Exchange"
 msgstr ""
 
-#: ../libgaim/protocols/silc/silc.c:1897
+#: ../libgaim/protocols/silc/silc.c:1901
 msgid "Reject online status attribute requests"
 msgstr ""
 
-#: ../libgaim/protocols/silc/silc.c:1900
+#: ../libgaim/protocols/silc/silc.c:1904
 msgid "Block messages to whiteboard"
 msgstr ""
 
-#: ../libgaim/protocols/silc/silc.c:1903
+#: ../libgaim/protocols/silc/silc.c:1907
 msgid "Automatically open whiteboard"
 msgstr ""
 
-#: ../libgaim/protocols/silc/silc.c:1906
+#: ../libgaim/protocols/silc/silc.c:1910
 msgid "Digitally sign and verify all messages"
 msgstr ""
 
@@ -13196,7 +13074,7 @@
 
 #: ../libgaim/protocols/silc/util.c:374 ../libgaim/protocols/silc/util.c:375
 msgid "Public Key Information"
-msgstr "Publika Ŝloŝilo Informo"
+msgstr ""
 
 #: ../libgaim/protocols/silc/util.c:557
 msgid "Paging"
@@ -13208,15 +13086,15 @@
 
 #: ../libgaim/protocols/silc/util.c:581
 msgid "Computer"
-msgstr "Komputilo"
+msgstr ""
 
 #: ../libgaim/protocols/silc/util.c:585
 msgid "PDA"
-msgstr "Poŝkomputilo"
+msgstr ""
 
 #: ../libgaim/protocols/silc/util.c:587
 msgid "Terminal"
-msgstr "Terminalo"
+msgstr ""
 
 #: ../libgaim/protocols/silc/wb.c:284
 #, c-format
@@ -13240,26 +13118,30 @@
 msgstr ""
 
 #: ../libgaim/protocols/simple/simple.c:438
-#: ../libgaim/protocols/simple/simple.c:1482
+#: ../libgaim/protocols/simple/simple.c:1484
 msgid "Could not connect"
 msgstr ""
 
-#: ../libgaim/protocols/simple/simple.c:1516
-#: ../libgaim/protocols/simple/simple.c:1558
-#: ../libgaim/protocols/simple/simple.c:1571
-#: ../libgaim/protocols/simple/simple.c:1622
+#: ../libgaim/protocols/simple/simple.c:1037
+msgid "Wrong Password"
+msgstr ""
+
+#: ../libgaim/protocols/simple/simple.c:1518
+#: ../libgaim/protocols/simple/simple.c:1560
+#: ../libgaim/protocols/simple/simple.c:1574
+#: ../libgaim/protocols/simple/simple.c:1626
 msgid "Could not create listen socket"
 msgstr ""
 
-#: ../libgaim/protocols/simple/simple.c:1539
+#: ../libgaim/protocols/simple/simple.c:1541
 msgid "Couldn't resolve host"
 msgstr ""
 
-#: ../libgaim/protocols/simple/simple.c:1630
+#: ../libgaim/protocols/simple/simple.c:1634
 msgid "Could not resolve hostname"
 msgstr ""
 
-#: ../libgaim/protocols/simple/simple.c:1647
+#: ../libgaim/protocols/simple/simple.c:1651
 msgid "SIP usernames may not contain whitespaces or @ symbols"
 msgstr ""
 
@@ -13271,36 +13153,36 @@
 #. *< id
 #. *< name
 #. *< version
-#: ../libgaim/protocols/simple/simple.c:1815
+#: ../libgaim/protocols/simple/simple.c:1819
 msgid "SIP/SIMPLE Protocol Plugin"
 msgstr "SIP/SIMPLE Protokol-Kromaĵo"
 
 #. *  summary
-#: ../libgaim/protocols/simple/simple.c:1816
+#: ../libgaim/protocols/simple/simple.c:1820
 msgid "The SIP/SIMPLE Protocol Plugin"
 msgstr "La SIP/SIMPLE Protokol-Kromaĵo"
 
-#: ../libgaim/protocols/simple/simple.c:1838
+#: ../libgaim/protocols/simple/simple.c:1842
 msgid "Publish status (note: everyone may watch you)"
 msgstr ""
 
-#: ../libgaim/protocols/simple/simple.c:1844
+#: ../libgaim/protocols/simple/simple.c:1848
 msgid "Use UDP"
 msgstr "Uzu UDP-n"
 
-#: ../libgaim/protocols/simple/simple.c:1846
+#: ../libgaim/protocols/simple/simple.c:1850
 msgid "Use proxy"
 msgstr "Uzu Prokurilon"
 
-#: ../libgaim/protocols/simple/simple.c:1848
+#: ../libgaim/protocols/simple/simple.c:1852
 msgid "Proxy"
 msgstr "Prokurilo"
 
-#: ../libgaim/protocols/simple/simple.c:1850
+#: ../libgaim/protocols/simple/simple.c:1854
 msgid "Auth User"
 msgstr ""
 
-#: ../libgaim/protocols/simple/simple.c:1852
+#: ../libgaim/protocols/simple/simple.c:1856
 msgid "Auth Domain"
 msgstr ""
 
@@ -13370,7 +13252,7 @@
 
 #: ../libgaim/protocols/toc/toc.c:518
 msgid "Failure."
-msgstr "Malsukceso."
+msgstr ""
 
 #: ../libgaim/protocols/toc/toc.c:521
 msgid "Too many matches."
@@ -13402,7 +13284,7 @@
 
 #: ../libgaim/protocols/toc/toc.c:543
 msgid "Country not supported."
-msgstr "Lando ne subtenita."
+msgstr ""
 
 #: ../libgaim/protocols/toc/toc.c:546
 #, c-format
@@ -13430,36 +13312,36 @@
 #: ../libgaim/protocols/toc/toc.c:560
 #, c-format
 msgid "An unknown signon error has occurred: %s."
-msgstr "Nekonata ensaluteraro okazis: %s."
+msgstr ""
 
 #: ../libgaim/protocols/toc/toc.c:563
 #, c-format
 msgid "An unknown error, %d, has occurred.  Info: %s"
-msgstr "Nekonata eraro, %d, okazis.  Informo: %s"
+msgstr ""
 
 #: ../libgaim/protocols/toc/toc.c:590
 msgid "Invalid Groupname"
-msgstr "Malvalida Gruponomo"
+msgstr ""
 
 #: ../libgaim/protocols/toc/toc.c:674
 msgid "Connection Closed"
-msgstr "Konekto Fermita"
+msgstr ""
 
 #: ../libgaim/protocols/toc/toc.c:714
 msgid "Waiting for reply..."
-msgstr "Atendante respondon..."
+msgstr ""
 
 #: ../libgaim/protocols/toc/toc.c:792
 msgid "TOC has come back from its pause. You may now send messages again."
-msgstr "TOC revenis el sia paŭzo. Vi nun povas sendi mesaĝojn denove."
+msgstr ""
 
 #: ../libgaim/protocols/toc/toc.c:995
 msgid "Password Change Successful"
-msgstr "Pasvorto Ŝanĝita Sukcese"
+msgstr ""
 
 #: ../libgaim/protocols/toc/toc.c:999
 msgid "TOC has sent a PAUSE command."
-msgstr "TOC sendis PAŬZO komandon."
+msgstr ""
 
 #: ../libgaim/protocols/toc/toc.c:1000
 msgid ""
@@ -13474,11 +13356,11 @@
 
 #: ../libgaim/protocols/toc/toc.c:1555
 msgid "Get Dir Info"
-msgstr "Ricevu Ujan Informon"
+msgstr ""
 
 #: ../libgaim/protocols/toc/toc.c:1695
 msgid "Set Dir Info"
-msgstr "Difini Ujan Informon"
+msgstr ""
 
 #: ../libgaim/protocols/toc/toc.c:1817
 #, c-format
@@ -13500,7 +13382,7 @@
 
 #: ../libgaim/protocols/toc/toc.c:2195
 msgid "Gaim - Save As..."
-msgstr "Gaim - Konservu Kiel..."
+msgstr ""
 
 #: ../libgaim/protocols/toc/toc.c:2229
 #, c-format
@@ -13684,7 +13566,7 @@
 #: ../libgaim/protocols/yahoo/yahoo.c:3020
 #: ../libgaim/protocols/yahoo/yahoo.c:3097
 msgid "Appear Permanently Offline"
-msgstr "Aperas Ĉiama Senkonekta"
+msgstr "Aperas Ĉiama Malkonektita"
 
 #: ../libgaim/protocols/yahoo/yahoo.c:3039
 msgid "Presence"
@@ -13692,11 +13574,11 @@
 
 #: ../libgaim/protocols/yahoo/yahoo.c:3082
 msgid "Appear Offline"
-msgstr "Aperas Senkonekta"
+msgstr "Aperas Malkonektita"
 
 #: ../libgaim/protocols/yahoo/yahoo.c:3091
 msgid "Don't Appear Permanently Offline"
-msgstr "Ne Aperas Ĉiama Senkonekta"
+msgstr "Ne Aperas Ĉiama Malkonektita"
 
 #: ../libgaim/protocols/yahoo/yahoo.c:3139
 msgid "Join in Chat"
@@ -13767,15 +13649,15 @@
 
 #: ../libgaim/protocols/yahoo/yahoo.c:3926
 msgid "Pager server"
-msgstr "Paĝila servilo"
+msgstr ""
 
 #: ../libgaim/protocols/yahoo/yahoo.c:3929
 msgid "Japan Pager server"
-msgstr "Japana Paĝila servilo"
+msgstr ""
 
 #: ../libgaim/protocols/yahoo/yahoo.c:3932
 msgid "Pager port"
-msgstr "Paĝila pordo"
+msgstr ""
 
 #: ../libgaim/protocols/yahoo/yahoo.c:3935
 msgid "File transfer server"
@@ -13850,11 +13732,11 @@
 
 #: ../libgaim/protocols/yahoo/yahoochat.c:627
 msgid "Failed to join buddy in chat"
-msgstr "Malsukcesis kuniĝi kunulon en babilejo"
+msgstr ""
 
 #: ../libgaim/protocols/yahoo/yahoochat.c:628
 msgid "Maybe they're not in a chat?"
-msgstr "Eble ili ne estas en babilejo?"
+msgstr ""
 
 #: ../libgaim/protocols/yahoo/yahoochat.c:1357
 #: ../libgaim/protocols/yahoo/yahoochat.c:1383
@@ -13881,7 +13763,7 @@
 #. Write a local message to this conversation showing that a request for a
 #. * Doodle session has been made
 #.
-#: ../libgaim/protocols/yahoo/yahoo_doodle.c:98
+#: ../libgaim/protocols/yahoo/yahoo_doodle.c:96
 msgid "Sent Doodle request."
 msgstr ""
 
@@ -14017,7 +13899,7 @@
 #: ../libgaim/protocols/zephyr/zephyr.c:790
 #: ../libgaim/protocols/zephyr/zephyr.c:1208
 msgid "<br>Hidden or not logged-in"
-msgstr "<br>Kaŝita aŭ ne ensalutita."
+msgstr ""
 
 #: ../libgaim/protocols/zephyr/zephyr.c:795
 #: ../libgaim/protocols/zephyr/zephyr.c:1210
@@ -14036,7 +13918,7 @@
 
 #: ../libgaim/protocols/zephyr/zephyr.c:2356
 msgid "_Instance:"
-msgstr "_Apero:"
+msgstr ""
 
 #: ../libgaim/protocols/zephyr/zephyr.c:2362
 msgid "_Recipient:"
@@ -14099,7 +13981,7 @@
 
 #: ../libgaim/protocols/zephyr/zephyr.c:2846
 msgid "Resubscribe"
-msgstr "Realiĝu"
+msgstr ""
 
 #: ../libgaim/protocols/zephyr/zephyr.c:2849
 msgid "Retrieve subscriptions from server"
@@ -14150,38 +14032,38 @@
 
 #: ../libgaim/protocols/zephyr/zephyr.c:2977
 msgid "Exposure"
-msgstr "Montreco"
-
-#: ../libgaim/proxy.c:442 ../libgaim/proxy.c:864 ../libgaim/proxy.c:1021
-#: ../libgaim/proxy.c:1579
+msgstr ""
+
+#: ../libgaim/proxy.c:446 ../libgaim/proxy.c:868 ../libgaim/proxy.c:1025
+#: ../libgaim/proxy.c:1583
 #, c-format
 msgid ""
 "Unable to create socket:\n"
 "%s"
 msgstr ""
 
-#: ../libgaim/proxy.c:644
+#: ../libgaim/proxy.c:648
 #, c-format
 msgid "Unable to parse response from HTTP proxy: %s\n"
 msgstr ""
 
-#: ../libgaim/proxy.c:672 ../libgaim/proxy.c:718 ../libgaim/proxy.c:756
-#: ../libgaim/proxy.c:768
+#: ../libgaim/proxy.c:676 ../libgaim/proxy.c:722 ../libgaim/proxy.c:760
+#: ../libgaim/proxy.c:772
 #, c-format
 msgid "HTTP proxy connection error %d"
 msgstr "HTTP prokura konekteraro %d"
 
-#: ../libgaim/proxy.c:764
+#: ../libgaim/proxy.c:768
 #, c-format
 msgid "Access denied: HTTP proxy server forbids port %d tunneling."
 msgstr "Aliro nepermesita: HTTP prokura servilo malpermesas pordon %d tunelumadon."
 
-#: ../libgaim/proxy.c:984
+#: ../libgaim/proxy.c:988
 #, c-format
 msgid "Error resolving %s"
 msgstr ""
 
-#: ../libgaim/proxy.c:1676
+#: ../libgaim/proxy.c:1677
 msgid "Could not resolve host name"
 msgstr ""
 
@@ -14228,7 +14110,7 @@
 
 #: ../libgaim/status.c:153
 msgid "Unset"
-msgstr "Nedifinita"
+msgstr ""
 
 #: ../libgaim/status.c:156
 msgid "Unavailable"
@@ -14236,7 +14118,7 @@
 
 #: ../libgaim/status.c:160
 msgid "Mobile"
-msgstr "Movante"
+msgstr ""
 
 #: ../libgaim/status.c:611
 #, c-format