changeset 9526:38648963d1fd

[gaim-migrate @ 10353] lots of translation updates, and 2 i18n updates that don't add/remove strings. see patches 990640 and 988329 committer: Tailor Script <tailor@pidgin.im>
author Luke Schierer <lschiere@pidgin.im>
date Wed, 14 Jul 2004 19:05:16 +0000
parents a3be930b7fad
children a2785c9d5cd3
files po/ChangeLog po/cs.po po/fr.po po/nl.po po/pt.po po/ru.po po/zh_CN.po po/zh_TW.po src/about.c
diffstat 9 files changed, 18329 insertions(+), 14268 deletions(-) [+]
line wrap: on
line diff
--- a/po/ChangeLog	Tue Jul 13 23:05:59 2004 +0000
+++ b/po/ChangeLog	Wed Jul 14 19:05:16 2004 +0000
@@ -3,8 +3,10 @@
 version 0.80cvs:
 	* English (British) translation updated (Luke Ross (lukeross))
 	* English (Canadian) translation updated (Adam Weinberger)
+	* French translation updated (Eric Boumaour)
 	* Japanese translation updated (Takeshi Aihana)
-	* Lithuanian translation added (Gediminas iinskas)
+	* Lithuanian translation added (Gediminas ~Li~Minskas)
+	* Russian translation updated (Dmitry Beloglazov)
 	* Spanish translation updated (Javier Fernandez-Sanguino Pena)
 
 version 0.79 (06/24/2004)
--- a/po/cs.po	Tue Jul 13 23:05:59 2004 +0000
+++ b/po/cs.po	Wed Jul 14 19:05:16 2004 +0000
@@ -8,8 +8,8 @@
 msgstr ""
 "Project-Id-Version: gaim VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-06-22 00:00-0400\n"
-"PO-Revision-Date: 2004-06-22 15:28+0200\n"
+"POT-Creation-Date: 2004-07-14 00:00-0400\n"
+"PO-Revision-Date: 2004-07-14 20:01+0200\n"
 "Last-Translator: Miloslav Trmac <mitr@volny.cz>\n"
 "Language-Team: Czech <cs@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -147,7 +147,7 @@
 msgid "Gaim - Away"
 msgstr "Gaim - Pryč"
 
-#: plugins/docklet/docklet.c:114 src/gtkaccount.c:673 src/gtkaccount.c:2095
+#: plugins/docklet/docklet.c:114 src/gtkaccount.c:727 src/gtkaccount.c:2152
 msgid "Auto-login"
 msgstr "Automatické přihlašování"
 
@@ -163,13 +163,13 @@
 msgid "New..."
 msgstr "Nový..."
 
-#: plugins/docklet/docklet.c:153 src/gtkprefs.c:1796 src/protocols/gg/gg.c:51
-#: src/protocols/irc/msgs.c:187 src/protocols/jabber/jabber.c:959
+#: plugins/docklet/docklet.c:153 src/gtkprefs.c:1809 src/protocols/gg/gg.c:51
+#: src/protocols/irc/msgs.c:187 src/protocols/jabber/jabber.c:960
 #: src/protocols/jabber/jutil.c:32 src/protocols/jabber/presence.c:63
-#: src/protocols/jabber/presence.c:119 src/protocols/novell/novell.c:2718
-#: src/protocols/novell/novell.c:2835 src/protocols/novell/novell.c:2887
-#: src/protocols/oscar/oscar.c:528 src/protocols/oscar/oscar.c:5465
-#: src/protocols/oscar/oscar.c:6463 src/protocols/oscar/oscar.c:6662
+#: src/protocols/jabber/presence.c:119 src/protocols/novell/novell.c:2724
+#: src/protocols/novell/novell.c:2841 src/protocols/novell/novell.c:2893
+#: src/protocols/oscar/oscar.c:532 src/protocols/oscar/oscar.c:5481
+#: src/protocols/oscar/oscar.c:6480 src/protocols/oscar/oscar.c:6679
 #: src/protocols/silc/buddy.c:1379 src/protocols/silc/silc.c:46
 #: src/protocols/silc/silc.c:76
 msgid "Away"
@@ -177,7 +177,7 @@
 
 #. else...
 #: plugins/docklet/docklet.c:159 src/away.c:550
-#: src/protocols/oscar/oscar.c:5383 src/protocols/oscar/oscar.c:6670
+#: src/protocols/oscar/oscar.c:5399 src/protocols/oscar/oscar.c:6687
 msgid "Back"
 msgstr "Zpět"
 
@@ -185,15 +185,15 @@
 msgid "Mute Sounds"
 msgstr "Umlčet zvuky"
 
-#: plugins/docklet/docklet.c:172 src/gtkft.c:619
+#: plugins/docklet/docklet.c:172 src/gtkft.c:612
 msgid "File Transfers"
 msgstr "Přenosy souborů"
 
-#: plugins/docklet/docklet.c:173 src/gtkaccount.c:2274
+#: plugins/docklet/docklet.c:173 src/gtkaccount.c:2333
 msgid "Accounts"
 msgstr "Účty"
 
-#: plugins/docklet/docklet.c:174 src/gtkprefs.c:2490
+#: plugins/docklet/docklet.c:174 src/gtkprefs.c:2503
 msgid "Preferences"
 msgstr "Nastavení"
 
@@ -245,18 +245,22 @@
 "přihlašovacího okna. Také dovoluje ukládat zprávy do fronty, dokud není "
 "kliknuto na ikonu, podobně jako ICQ."
 
-#: plugins/extplacement.c:68
+#: plugins/extplacement.c:75
 msgid "By conversation count"
 msgstr "Podle počtu konverzací"
 
-#: plugins/extplacement.c:89
+#: plugins/extplacement.c:96
 msgid "Conversation Placement"
 msgstr "Umísťování konverzací"
 
-#: plugins/extplacement.c:94
+#: plugins/extplacement.c:101
 msgid "Number of conversations per window"
 msgstr "Počet konverzací v okně"
 
+#: plugins/extplacement.c:107
+msgid "Separate IM and Chat windows when placing by number"
+msgstr "Oddělovat okna IM a chatů při umísťování podle čísla"
+
 #. *< api_version
 #. *< type
 #. *< ui_requirement
@@ -264,23 +268,23 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/extplacement.c:114
+#: plugins/extplacement.c:126
 msgid "ExtPlacement"
 msgstr "DalUmístění"
 
 #. *< name
 #. *< version
-#: plugins/extplacement.c:116
+#: plugins/extplacement.c:128
 msgid "Extra conversation placement options."
 msgstr "Další možnosti umísťování konverzací"
 
 #. *< summary
 #. *  description
-#: plugins/extplacement.c:118
-msgid ""
-"Either restrict the number of conversations per windows or use separate "
-"windows for IMs and Chats"
-msgstr "Buď omezit počet konverzací v okně, nebo používat oddělená okna pro IM a chaty"
+#: plugins/extplacement.c:130
+msgid ""
+"Restrict the number of conversations per windows, optionally separating IMs "
+"and Chats"
+msgstr "Omezit počet konverzací v okně, volitelně s oddělením IM a chatů"
 
 #. *< api_version
 #. *< type
@@ -441,60 +445,60 @@
 "Táhněte nahoru a pak doleva pro přepnutí na předchozí konverzaci.\n"
 "Táhněte nahoru a pak doprava pro přepnutí na následující konverzaci."
 
-#: plugins/gevolution/add_buddy_dialog.c:136
-#: plugins/gevolution/assoc-buddy.c:74
+#: plugins/gevolution/add_buddy_dialog.c:133
+#: plugins/gevolution/assoc-buddy.c:71
 msgid "Local Addressbook"
 msgstr "Místní adresář"
 
-#: plugins/gevolution/add_buddy_dialog.c:146
-#: plugins/gevolution/add_buddy_dialog.c:157
-#: plugins/gevolution/assoc-buddy.c:84 plugins/gevolution/assoc-buddy.c:95
-#: src/gtkblist.c:2984 src/gtkprefs.c:913 src/gtkprefs.c:966
-#: src/gtkprefs.c:1809 src/protocols/jabber/jabber.c:923
+#: plugins/gevolution/add_buddy_dialog.c:143
+#: plugins/gevolution/add_buddy_dialog.c:154
+#: plugins/gevolution/assoc-buddy.c:81 plugins/gevolution/assoc-buddy.c:92
+#: src/gtkblist.c:3015 src/gtkprefs.c:961 src/gtkprefs.c:1014
+#: src/gtkprefs.c:1822 src/protocols/jabber/jabber.c:924
 msgid "None"
 msgstr "Žádné"
 
-#: plugins/gevolution/add_buddy_dialog.c:190
-#: plugins/gevolution/assoc-buddy.c:178 src/gtkprefs.c:2162
-#: src/gtkroomlist.c:553 src/protocols/jabber/jabber.c:597
-#: src/protocols/msn/msn.c:1286 src/protocols/trepia/trepia.c:398
+#: plugins/gevolution/add_buddy_dialog.c:187
+#: plugins/gevolution/assoc-buddy.c:175 src/gtkprefs.c:2175
+#: src/gtkroomlist.c:553 src/protocols/jabber/jabber.c:598
+#: src/protocols/msn/msn.c:1311 src/protocols/trepia/trepia.c:398
 msgid "Name"
 msgstr "Název"
 
-#: plugins/gevolution/add_buddy_dialog.c:201
+#: plugins/gevolution/add_buddy_dialog.c:198
 msgid "Instant Messaging"
 msgstr "Instant Messaging"
 
 #. Add the label.
-#: plugins/gevolution/add_buddy_dialog.c:482
+#: plugins/gevolution/add_buddy_dialog.c:479
 msgid "Select a person from your address book below, or add a new person."
 msgstr "Vyberte osobu z vašeho adresáře níže nebo přidejte novou osobu."
 
 #. "Search"
-#: plugins/gevolution/add_buddy_dialog.c:495
-#: plugins/gevolution/assoc-buddy.c:383 src/protocols/oscar/oscar.c:6949
+#: plugins/gevolution/add_buddy_dialog.c:492
+#: plugins/gevolution/assoc-buddy.c:380 src/protocols/oscar/oscar.c:6965
 msgid "Search"
 msgstr "Hledat"
 
-#: plugins/gevolution/add_buddy_dialog.c:566
-#: plugins/gevolution/new_person_dialog.c:310 src/gtkblist.c:4013
-#: src/gtkblist.c:4341
+#: plugins/gevolution/add_buddy_dialog.c:563
+#: plugins/gevolution/new_person_dialog.c:307 src/gtkblist.c:4046
+#: src/gtkblist.c:4374
 msgid "Group:"
 msgstr "Skupina:"
 
 #. "New Person" button
-#: plugins/gevolution/add_buddy_dialog.c:592
-#: plugins/gevolution/assoc-buddy.c:486
+#: plugins/gevolution/add_buddy_dialog.c:589
+#: plugins/gevolution/assoc-buddy.c:483
 msgid "New Person"
 msgstr "Nová osoba"
 
 #. "Select Buddy" button
-#: plugins/gevolution/add_buddy_dialog.c:609
+#: plugins/gevolution/add_buddy_dialog.c:606
 msgid "Select Buddy"
 msgstr "Vybrat kamaráda"
 
 #. Add the label.
-#: plugins/gevolution/assoc-buddy.c:370
+#: plugins/gevolution/assoc-buddy.c:367
 msgid ""
 "Select a person from your address book to add this buddy to, or create a new "
 "person."
@@ -503,40 +507,40 @@
 "vytvořte novou osobu."
 
 #. Add the disclosure
-#: plugins/gevolution/assoc-buddy.c:449
+#: plugins/gevolution/assoc-buddy.c:446
 msgid "Show user details"
 msgstr "Zobrazit detaily o uživateli"
 
-#: plugins/gevolution/assoc-buddy.c:450
+#: plugins/gevolution/assoc-buddy.c:447
 msgid "Hide user details"
 msgstr "Skrýt detaily o uživateli"
 
 #. "Associate Buddy" button
-#: plugins/gevolution/assoc-buddy.c:503
+#: plugins/gevolution/assoc-buddy.c:500
 msgid "_Associate Buddy"
 msgstr "_Přiřadit kamaráda"
 
-#: plugins/gevolution/gevo-util.c:66 plugins/gevolution/gevolution.c:90
-#: src/blist.c:775 src/blist.c:963 src/blist.c:2060 src/gtkblist.c:3834
+#: plugins/gevolution/gevo-util.c:64 plugins/gevolution/gevolution.c:89
+#: src/blist.c:775 src/blist.c:963 src/blist.c:1870 src/gtkblist.c:3867
 #: src/protocols/jabber/roster.c:66
 msgid "Buddies"
 msgstr "Kamarádi"
 
-#: plugins/gevolution/gevolution.c:221
+#: plugins/gevolution/gevolution.c:220
 msgid "Add to Address Book"
 msgstr "Přidat do adresáře"
 
 #. Configuration frame
-#: plugins/gevolution/gevolution.c:352
+#: plugins/gevolution/gevolution.c:351
 msgid "Evolution Integration Configuration"
 msgstr "Nastavení integrace s Evolution"
 
 #. Label
-#: plugins/gevolution/gevolution.c:355
+#: plugins/gevolution/gevolution.c:354
 msgid "Select all accounts that buddies should be auto-added to."
 msgstr "Vyberte všechny účty, ke kterým se mají automaticky přidat kamrádi."
 
-#: plugins/gevolution/gevolution.c:385 plugins/idle.c:51 src/gtkconn.c:620
+#: plugins/gevolution/gevolution.c:384 plugins/idle.c:51 src/gtkconn.c:620
 msgid "Account"
 msgstr "Účet"
 
@@ -547,7 +551,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/gevolution/gevolution.c:466
+#: plugins/gevolution/gevolution.c:465
 msgid "Evolution Integration"
 msgstr "Integrace s Evolution"
 
@@ -555,46 +559,46 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/gevolution/gevolution.c:469 plugins/gevolution/gevolution.c:471
+#: plugins/gevolution/gevolution.c:468 plugins/gevolution/gevolution.c:470
 msgid "Provides integration with Ximian Evolution."
 msgstr "Poskytuje integraci s Ximian Evolution."
 
-#: plugins/gevolution/new_person_dialog.c:270
+#: plugins/gevolution/new_person_dialog.c:267
 msgid "Please enter the person's information below."
 msgstr "Zadejte prosím níže informace o osobě."
 
-#: plugins/gevolution/new_person_dialog.c:274
+#: plugins/gevolution/new_person_dialog.c:271
 msgid "Please enter the buddy's screen name and account type below."
 msgstr "Zadejte prosím níže jméno uživatele kamráda a typ účtu."
 
-#: plugins/gevolution/new_person_dialog.c:294
+#: plugins/gevolution/new_person_dialog.c:291
 msgid "Account type:"
 msgstr "Typ účtu:"
 
-#: plugins/gevolution/new_person_dialog.c:298
+#: plugins/gevolution/new_person_dialog.c:295
 msgid "Screenname:"
 msgstr "Jméno uživatele:"
 
 #. Optional Information section
-#: plugins/gevolution/new_person_dialog.c:318
+#: plugins/gevolution/new_person_dialog.c:315
 msgid "Optional information:"
 msgstr "Nepovinné informace:"
 
 #. Label
-#: plugins/gevolution/new_person_dialog.c:341 src/gtkaccount.c:340
-#: src/protocols/oscar/oscar.c:433
+#: plugins/gevolution/new_person_dialog.c:338 src/gtkaccount.c:378
+#: src/gtkaccount.c:408 src/protocols/oscar/oscar.c:438
 msgid "Buddy Icon"
 msgstr "Ikona kamaráda"
 
-#: plugins/gevolution/new_person_dialog.c:353
+#: plugins/gevolution/new_person_dialog.c:350
 msgid "First name:"
 msgstr "Křestní jméno:"
 
-#: plugins/gevolution/new_person_dialog.c:365
+#: plugins/gevolution/new_person_dialog.c:362
 msgid "Last name:"
 msgstr "Příjmení:"
 
-#: plugins/gevolution/new_person_dialog.c:385
+#: plugins/gevolution/new_person_dialog.c:382
 msgid "E-mail:"
 msgstr "E-mail:"
 
@@ -825,15 +829,15 @@
 msgid "Provides support for loading perl plugins."
 msgstr "Poskytuje podporu pro načítání zásuvných modulů v perlu."
 
-#: plugins/raw.c:154
+#: plugins/raw.c:146
 msgid "Raw"
 msgstr "Přímý"
 
-#: plugins/raw.c:156
+#: plugins/raw.c:148
 msgid "Lets you send raw input to text-based protocols."
 msgstr "Nechá vás odeslat přímý vstup protokolům založeným na textu."
 
-#: plugins/raw.c:157
+#: plugins/raw.c:149
 msgid ""
 "Lets you send raw input to text-based protocols (Jabber, MSN, IRC, TOC). Hit "
 "'Enter' in the entry box to send. Watch the debug window."
@@ -901,7 +905,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/signals-test.c:554
+#: plugins/signals-test.c:566
 msgid "Signals Test"
 msgstr "Test signálů"
 
@@ -909,7 +913,7 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/signals-test.c:557 plugins/signals-test.c:559
+#: plugins/signals-test.c:569 plugins/signals-test.c:571
 msgid "Test to see that all signals are working properly."
 msgstr "Test pro zjištění, jestli všechny signály fungují správně."
 
@@ -1128,30 +1132,30 @@
 msgstr "Každých N minut přidává ke konverzacím časové značky ve styly iChat."
 
 #: plugins/win32/transparency/win2ktrans.c:133
-#: plugins/win32/transparency/win2ktrans.c:389
-#: plugins/win32/transparency/win2ktrans.c:420
+#: plugins/win32/transparency/win2ktrans.c:388
+#: plugins/win32/transparency/win2ktrans.c:419
 msgid "Opacity:"
 msgstr "Krytí:"
 
 #. IM Convo trans options
-#: plugins/win32/transparency/win2ktrans.c:370
+#: plugins/win32/transparency/win2ktrans.c:369
 msgid "IM Conversation Windows"
 msgstr "Okna IM konverzace"
 
-#: plugins/win32/transparency/win2ktrans.c:371
+#: plugins/win32/transparency/win2ktrans.c:370
 msgid "_IM window transparency"
 msgstr "Průhlednost okna _IM"
 
-#: plugins/win32/transparency/win2ktrans.c:381
+#: plugins/win32/transparency/win2ktrans.c:380
 msgid "_Show slider bar in IM window"
 msgstr "_Zobrazovat posuvný pruh v okně IM"
 
 #. Buddy List trans options
-#: plugins/win32/transparency/win2ktrans.c:406 src/gtkprefs.c:907
+#: plugins/win32/transparency/win2ktrans.c:405 src/gtkprefs.c:955
 msgid "Buddy List Window"
 msgstr "Okno seznamu kamarádů"
 
-#: plugins/win32/transparency/win2ktrans.c:407
+#: plugins/win32/transparency/win2ktrans.c:406
 msgid "_Buddy List window transparency"
 msgstr "Průhlednost okna _seznamu kamarádů"
 
@@ -1162,19 +1166,19 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/win32/transparency/win2ktrans.c:463
+#: plugins/win32/transparency/win2ktrans.c:462
 msgid "Transparency"
 msgstr "Průhlednost"
 
 #. *< name
 #. *< version
 #. *  summary
-#: plugins/win32/transparency/win2ktrans.c:466
+#: plugins/win32/transparency/win2ktrans.c:465
 msgid "Variable Transparency for the buddy list and conversations."
 msgstr "Proměnlivá průhlednost pro seznam kamarádů a konverzace."
 
 #. *  description
-#: plugins/win32/transparency/win2ktrans.c:468
+#: plugins/win32/transparency/win2ktrans.c:467
 msgid ""
 "This plugin enables variable alpha transparency on conversation windows and "
 "the buddy list.\n"
@@ -1200,8 +1204,8 @@
 msgstr "_Spustit Gaim při spuštění Windows"
 
 #. Buddy List
-#: plugins/win32/winprefs/winprefs.c:362 src/gtkblist.c:3025
-#: src/gtkprefs.c:2399
+#: plugins/win32/winprefs/winprefs.c:362 src/gtkblist.c:3058
+#: src/gtkprefs.c:2412
 msgid "Buddy List"
 msgstr "Seznam kamarádů"
 
@@ -1220,8 +1224,8 @@
 msgstr "_Udržovat okno seznamu kamarádů nahoře"
 
 #. Conversations
-#: plugins/win32/winprefs/winprefs.c:382 src/gtkprefs.c:958
-#: src/gtkprefs.c:2400 src/protocols/msn/msn.c:1611
+#: plugins/win32/winprefs/winprefs.c:382 src/gtkprefs.c:1006
+#: src/gtkprefs.c:2413 src/protocols/msn/msn.c:1638
 msgid "Conversations"
 msgstr "Konverzace"
 
@@ -1251,7 +1255,10 @@
 "Gaim is a modular messaging client capable of using AIM, MSN, Yahoo!, "
 "Jabber, ICQ, IRC, SILC, Novell GroupWise, Napster, Zephyr, and Gadu-Gadu all "
 "at once.  It is written using Gtk+ and is licensed under the GPL.<BR><BR>"
-msgstr "Gaim je modulární klient Instant Messaging schopný používat AIM, MSN, Yahoo!, Jabber, ICQ, IRC, SILC, Novell GroupWise, Napster, Zephyr, a Gadu-Gadu zároveň. Je napsán s použitím Gtk+ a je licencován pod GPL.<BR><BR>"
+msgstr ""
+"Gaim je modulární klient Instant Messaging schopný používat AIM, MSN, "
+"Yahoo!, Jabber, ICQ, IRC, SILC, Novell GroupWise, Napster, Zephyr, a Gadu-"
+"Gadu zároveň. Je napsán s použitím Gtk+ a je licencován pod GPL.<BR><BR>"
 
 #: src/about.c:106
 msgid "<FONT SIZE=\"4\">IRC:</FONT> #gaim on irc.freenode.net<BR><BR>"
@@ -1289,260 +1296,264 @@
 msgid "Crazy Patch Writers"
 msgstr "Šílení autoři patchů"
 
-#: src/about.c:147
+#: src/about.c:148
 msgid "Retired Developers"
 msgstr "Vývojáři na odpočinku"
 
-#: src/about.c:148
+#: src/about.c:149
 msgid "former libfaim maintainer"
 msgstr "dřívější správce libfaim"
 
-#: src/about.c:149
+#: src/about.c:150
 msgid "former lead developer"
 msgstr "dřívější vedoucí vývojář"
 
-#: src/about.c:152
+#: src/about.c:153
 msgid "former maintainer"
 msgstr "dřívější správce"
 
-#: src/about.c:153
+#: src/about.c:154
 msgid "former Jabber developer"
 msgstr "dřívější vývojář Jabberu"
 
-#: src/about.c:154
+#: src/about.c:155
 msgid "original author"
 msgstr "původní autor"
 
-#: src/about.c:157
+#: src/about.c:158
 msgid "hacker and designated driver [lazy bum]"
 msgstr "hacker a jmenovaný řidič [líná kůže]"
 
-#: src/about.c:165
+#: src/about.c:166
 msgid "Current Translators"
 msgstr "Současní překladatelé"
 
-#: src/about.c:166 src/about.c:204
+#: src/about.c:167 src/about.c:207
 msgid "Catalan"
 msgstr "Katalánština"
 
-#: src/about.c:167 src/about.c:205
+#: src/about.c:168 src/about.c:208
 msgid "Czech"
 msgstr "Čeština"
 
-#: src/about.c:168
+#: src/about.c:169
 msgid "Danish"
 msgstr "Dánština"
 
-#: src/about.c:169
+#: src/about.c:170
 msgid "British English"
 msgstr "Britská angličtina"
 
-#: src/about.c:170
+#: src/about.c:171
 msgid "Canadian English"
 msgstr "Kanadská angličtina"
 
-#: src/about.c:171 src/about.c:206
+#: src/about.c:172 src/about.c:209
 msgid "German"
 msgstr "Němčina"
 
-#: src/about.c:172 src/about.c:207
+#: src/about.c:173 src/about.c:210
 msgid "Spanish"
 msgstr "Španělština"
 
-#: src/about.c:173 src/about.c:208
+#: src/about.c:174 src/about.c:211
 msgid "Finnish"
 msgstr "Finština"
 
-#: src/about.c:174 src/about.c:209
+#: src/about.c:175 src/about.c:212
 msgid "French"
 msgstr "Francouzština"
 
-#: src/about.c:175
+#: src/about.c:176
 msgid "Hebrew"
 msgstr "Hebrejština"
 
-#: src/about.c:176
+#: src/about.c:177
 msgid "Hindi"
 msgstr "Hindština"
 
-#: src/about.c:177
+#: src/about.c:178
 msgid "Hungarian"
 msgstr "Maďarština"
 
-#: src/about.c:178 src/about.c:210
+#: src/about.c:179 src/about.c:213
 msgid "Italian"
 msgstr "Italština"
 
-#: src/about.c:179 src/about.c:212
+#: src/about.c:180 src/about.c:214
+msgid "Japanese"
+msgstr "Japonština"
+
+#: src/about.c:181
+msgid "Lithuanian"
+msgstr "Litevština"
+
+#: src/about.c:182 src/about.c:215
 msgid "Korean"
 msgstr "Korejština"
 
-#: src/about.c:180
+#: src/about.c:183
 msgid "Dutch; Flemish"
 msgstr "Holandština; vlámština"
 
-#: src/about.c:181
+#: src/about.c:184
 msgid "Macedonian"
 msgstr "Makedonština"
 
-#: src/about.c:182
+#: src/about.c:185
 msgid "Norwegian"
 msgstr "Norština"
 
-#: src/about.c:183 src/about.c:213
+#: src/about.c:186 src/about.c:216
 msgid "Polish"
 msgstr "Polština"
 
-#: src/about.c:184
+#: src/about.c:187
 msgid "Portuguese"
 msgstr "Portugalština"
 
-#: src/about.c:185
+#: src/about.c:188
 msgid "Portuguese-Brazil"
 msgstr "Portugalština-brazilská"
 
-#: src/about.c:186
+#: src/about.c:189
 msgid "Romanian"
 msgstr "Rumunština"
 
-#: src/about.c:187 src/about.c:214 src/about.c:215
+#: src/about.c:190 src/about.c:217 src/about.c:218
 msgid "Russian"
 msgstr "Ruština"
 
-#: src/about.c:188
+#: src/about.c:191
 msgid "Serbian"
 msgstr "Srbština"
 
-#: src/about.c:189
+#: src/about.c:192
 msgid "Slovenian"
 msgstr "Slovinština"
 
-#: src/about.c:190 src/about.c:217
+#: src/about.c:193 src/about.c:220
 msgid "Swedish"
 msgstr "Švédština"
 
-#: src/about.c:191
+#: src/about.c:194
 msgid "Vietnamese"
 msgstr "Vietnamština"
 
-#: src/about.c:191
-msgid "Gnome Vi Team"
-msgstr "Tým Gnome Vi"
-
-#: src/about.c:193
-msgid "Simplified Chinese"
-msgstr "Zjednodušená čínština"
-
 #: src/about.c:194
+msgid "and the Gnome-Vi Team"
+msgstr "a tým Gnome-Vi"
+
+#: src/about.c:196
+msgid "Simplified Chinese"
+msgstr "Zjednodušená čínština"
+
+#: src/about.c:197
 msgid "Traditional Chinese"
 msgstr "Tradiční čínština"
 
-#: src/about.c:201
+#: src/about.c:204
 msgid "Past Translators"
 msgstr "Dřívější překladatelé"
 
-#: src/about.c:202
+#: src/about.c:205
 msgid "Amharic"
 msgstr "Amharština"
 
-#: src/about.c:203
+#: src/about.c:206
 msgid "Bulgarian"
 msgstr "Bulharština"
 
-#: src/about.c:211
-msgid "Japanese"
-msgstr "Japonština"
-
-#: src/about.c:216
+#: src/about.c:219
 msgid "Slovak"
 msgstr "Slovenština"
 
-#: src/about.c:218
+#: src/about.c:221
 msgid "Chinese"
 msgstr "Čínština"
 
-#: src/account.c:278 src/protocols/jabber/jabber.c:1000
+#: src/account.c:277 src/protocols/jabber/jabber.c:1001
 msgid "New passwords do not match."
 msgstr "Nová hesla nesouhlasí."
 
-#: src/account.c:287
+#: src/account.c:286
 msgid "Fill out all fields completely."
 msgstr "Úplně vyplňte všechna pole."
 
-#: src/account.c:312
+#: src/account.c:311
 msgid "Original password"
 msgstr "Původní heslo"
 
-#: src/account.c:319
+#: src/account.c:318
 msgid "New password"
 msgstr "Nové heslo"
 
-#: src/account.c:326
+#: src/account.c:325
 msgid "New password (again)"
 msgstr "Nové heslo (znovu)"
 
-#: src/account.c:332
+#: src/account.c:331
 #, c-format
 msgid "Change password for %s"
 msgstr "Změnit heslo pro %s"
 
-#: src/account.c:340
+#: src/account.c:339
 msgid "Please enter your current password and your new password."
 msgstr "Zadejte prosím své aktuální a nové heslo."
 
 #. *
 #. * A wrapper for gaim_request_action() that uses OK and Cancel buttons.
 #.
-#: src/account.c:343 src/connection.c:197 src/dialogs.c:462 src/dialogs.c:518
-#: src/dialogs.c:571 src/gtkblist.c:2343 src/gtkrequest.c:235
-#: src/protocols/jabber/jabber.c:1047 src/protocols/jabber/xdata.c:337
+#: src/account.c:342 src/connection.c:197 src/dialogs.c:462 src/dialogs.c:518
+#: src/dialogs.c:571 src/gtkblist.c:2391 src/gtkrequest.c:242
+#: src/protocols/jabber/jabber.c:1048 src/protocols/jabber/xdata.c:337
 #: src/protocols/msn/msn.c:226 src/protocols/msn/msn.c:241
 #: src/protocols/msn/msn.c:256 src/protocols/msn/msn.c:271
-#: src/protocols/oscar/oscar.c:3353 src/protocols/oscar/oscar.c:3447
-#: src/protocols/oscar/oscar.c:6731 src/protocols/oscar/oscar.c:6828
-#: src/protocols/oscar/oscar.c:6880 src/protocols/oscar/oscar.c:6966
+#: src/protocols/oscar/oscar.c:3369 src/protocols/oscar/oscar.c:3463
+#: src/protocols/oscar/oscar.c:6748 src/protocols/oscar/oscar.c:6844
+#: src/protocols/oscar/oscar.c:6896 src/protocols/oscar/oscar.c:6982
 #: src/protocols/silc/buddy.c:460 src/protocols/silc/buddy.c:1132
-#: src/protocols/silc/chat.c:406 src/protocols/silc/chat.c:444
-#: src/protocols/silc/chat.c:707 src/protocols/silc/ops.c:994
-#: src/protocols/silc/ops.c:1405 src/protocols/silc/silc.c:688
-#: src/protocols/yahoo/yahoo.c:2745 src/protocols/yahoo/yahoo.c:2754
-#: src/request.h:1242
+#: src/protocols/silc/chat.c:409 src/protocols/silc/chat.c:447
+#: src/protocols/silc/chat.c:710 src/protocols/silc/ops.c:1063
+#: src/protocols/silc/ops.c:1671 src/protocols/silc/silc.c:692
+#: src/protocols/yahoo/yahoo.c:2752 src/protocols/yahoo/yahoo.c:2761
+#: src/request.h:1243
 msgid "OK"
 msgstr "OK"
 
-#: src/account.c:344 src/account.c:382 src/away.c:334 src/connection.c:198
+#: src/account.c:343 src/account.c:381 src/away.c:334 src/connection.c:198
 #: src/dialogs.c:299 src/dialogs.c:311 src/dialogs.c:324 src/dialogs.c:345
 #: src/dialogs.c:463 src/dialogs.c:519 src/dialogs.c:572 src/dialogs.c:808
-#: src/dialogs.c:824 src/dialogs.c:842 src/gtkaccount.c:1948
-#: src/gtkaccount.c:2439 src/gtkblist.c:2344 src/gtkblist.c:4379
+#: src/dialogs.c:824 src/dialogs.c:842 src/gtkaccount.c:2002
+#: src/gtkaccount.c:2498 src/gtkblist.c:2392 src/gtkblist.c:4412
 #: src/gtkconn.c:168 src/gtkimhtmltoolbar.c:414 src/gtkprivacy.c:587
 #: src/gtkprivacy.c:600 src/gtkprivacy.c:625 src/gtkprivacy.c:636
-#: src/gtkrequest.c:236 src/protocols/icq/gaim_icq.c:277
-#: src/protocols/jabber/buddy.c:516 src/protocols/jabber/chat.c:710
-#: src/protocols/jabber/jabber.c:666 src/protocols/jabber/jabber.c:1048
+#: src/gtkrequest.c:243 src/protocols/icq/gaim_icq.c:277
+#: src/protocols/jabber/buddy.c:515 src/protocols/jabber/chat.c:710
+#: src/protocols/jabber/jabber.c:667 src/protocols/jabber/jabber.c:1049
 #: src/protocols/jabber/xdata.c:338 src/protocols/msn/msn.c:227
 #: src/protocols/msn/msn.c:242 src/protocols/msn/msn.c:257
 #: src/protocols/msn/msn.c:272 src/protocols/msn/msn.c:289
-#: src/protocols/oscar/oscar.c:1371 src/protocols/oscar/oscar.c:3313
-#: src/protocols/oscar/oscar.c:3354 src/protocols/oscar/oscar.c:3391
-#: src/protocols/oscar/oscar.c:3448 src/protocols/oscar/oscar.c:6732
-#: src/protocols/oscar/oscar.c:6829 src/protocols/oscar/oscar.c:6881
-#: src/protocols/oscar/oscar.c:6950 src/protocols/oscar/oscar.c:6967
+#: src/protocols/oscar/oscar.c:1377 src/protocols/oscar/oscar.c:3329
+#: src/protocols/oscar/oscar.c:3370 src/protocols/oscar/oscar.c:3407
+#: src/protocols/oscar/oscar.c:3464 src/protocols/oscar/oscar.c:6749
+#: src/protocols/oscar/oscar.c:6845 src/protocols/oscar/oscar.c:6897
+#: src/protocols/oscar/oscar.c:6966 src/protocols/oscar/oscar.c:6983
 #: src/protocols/silc/buddy.c:461 src/protocols/silc/buddy.c:1037
-#: src/protocols/silc/buddy.c:1133 src/protocols/silc/chat.c:579
-#: src/protocols/silc/chat.c:708 src/protocols/silc/ops.c:1406
-#: src/protocols/silc/silc.c:689 src/protocols/trepia/trepia.c:347
-#: src/protocols/yahoo/yahoo.c:2746 src/protocols/yahoo/yahoo.c:2755
-#: src/request.h:1242 src/request.h:1252
+#: src/protocols/silc/buddy.c:1133 src/protocols/silc/chat.c:582
+#: src/protocols/silc/chat.c:711 src/protocols/silc/ops.c:1672
+#: src/protocols/silc/silc.c:693 src/protocols/trepia/trepia.c:347
+#: src/protocols/yahoo/yahoo.c:2753 src/protocols/yahoo/yahoo.c:2762
+#: src/request.h:1243 src/request.h:1253
 msgid "Cancel"
 msgstr "Zrušit"
 
-#: src/account.c:373
+#: src/account.c:372
 #, c-format
 msgid "Change user information for %s"
 msgstr "Změnit informace o uživateli %s"
 
-#: src/account.c:381 src/gtkrequest.c:242 src/protocols/jabber/buddy.c:515
+#: src/account.c:380 src/gtkrequest.c:249 src/protocols/jabber/buddy.c:514
 #: src/protocols/trepia/trepia.c:346
 msgid "Save"
 msgstr "Uložit"
@@ -1565,8 +1576,8 @@
 msgstr "Odstranit zprávu o nepřítomnosti"
 
 #. Remove button
-#: src/away.c:333 src/gtkconv.c:1352 src/gtkconv.c:3570 src/gtkconv.c:3669
-#: src/gtkrequest.c:241
+#: src/away.c:333 src/gtkconv.c:1388 src/gtkconv.c:3680 src/gtkconv.c:3784
+#: src/gtkrequest.c:248
 msgid "Remove"
 msgstr "Odstranit"
 
@@ -1604,16 +1615,12 @@
 msgid "Group not removed"
 msgstr "Skupina neodstraněna"
 
-#: src/blist.c:1393 src/gtkaccount.c:167 src/gtkft.c:161 src/gtkutils.c:721
-#: src/protocols/jabber/buddy.c:571 src/protocols/novell/novell.c:2730
+#: src/blist.c:1393 src/gtkaccount.c:167 src/gtkft.c:154 src/gtkutils.c:627
+#: src/protocols/jabber/buddy.c:570 src/protocols/novell/novell.c:2736
 msgid "Unknown"
 msgstr "Neznámé"
 
-#: src/blist.c:1721
-msgid "Invalid Groupname"
-msgstr "Neplatné jméno skupiny"
-
-#: src/blist.c:2192
+#: src/blist.c:2001
 msgid ""
 "An error was encountered parsing your buddy list.  It has not been loaded, "
 "and the old file has moved to blist.xml~."
@@ -1621,7 +1628,7 @@
 "Při zpracování vašeho seznamu kamarádů došlo k chybě. Seznam nebyl načten a "
 "starý soubor byl přesunut do blist.xml~."
 
-#: src/blist.c:2195
+#: src/blist.c:2004
 msgid "Buddy List Error"
 msgstr "Chyba seznamu kamarádů"
 
@@ -1643,71 +1650,71 @@
 msgid "Enter password for %s"
 msgstr "Zadejte heslo pro %s"
 
-#: src/conversation.c:271
+#: src/conversation.c:261
 msgid "Unable to send message. The message is too large."
 msgstr "Nemohu odeslat zprávu. Zpráva je příliš velká."
 
-#: src/conversation.c:279
+#: src/conversation.c:269
 msgid "Unable to send message."
 msgstr "Nemohu odeslat zprávu."
 
-#: src/conversation.c:1960
+#: src/conversation.c:1953
 #, c-format
 msgid "%s entered the room."
 msgstr "%s vstoupil do místnosti."
 
-#: src/conversation.c:1963
+#: src/conversation.c:1956
 #, c-format
 msgid "%s [<I>%s</I>] entered the room."
 msgstr "%s [<I>%s</I>] vstoupil do místnosti."
 
-#: src/conversation.c:2054
+#: src/conversation.c:2047
 #, c-format
 msgid "You are now known as %s"
 msgstr "Jste teď znám jako %s"
 
-#: src/conversation.c:2057
+#: src/conversation.c:2050
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s je teď znám jako %s"
 
-#: src/conversation.c:2099
+#: src/conversation.c:2092
 #, c-format
 msgid "%s left the room (%s)."
 msgstr "%s opustil místnost (%s)."
 
-#: src/conversation.c:2101
+#: src/conversation.c:2094
 #, c-format
 msgid "%s left the room."
 msgstr "%s opustil místnost."
 
-#: src/conversation.c:2172
+#: src/conversation.c:2165
 #, c-format
 msgid "(+%d more)"
 msgstr "(+%d dalších)"
 
-#: src/conversation.c:2174
+#: src/conversation.c:2167
 #, c-format
 msgid " left the room (%s)."
 msgstr " opustil místnost (%s)."
 
-#: src/conversation.c:2464
+#: src/conversation.c:2457
 msgid "Last created window"
 msgstr "Poslední vytvořené okno"
 
-#: src/conversation.c:2466
+#: src/conversation.c:2459
 msgid "Separate IM and Chat windows"
 msgstr "Oddělovat okna IM a chatů"
 
-#: src/conversation.c:2468 src/gtkprefs.c:1335
+#: src/conversation.c:2461 src/gtkprefs.c:1384
 msgid "New window"
 msgstr "Nové okno"
 
-#: src/conversation.c:2470
+#: src/conversation.c:2463
 msgid "By group"
 msgstr "Podle skupiny"
 
-#: src/conversation.c:2472
+#: src/conversation.c:2465
 msgid "By account"
 msgstr "Podle účtu"
 
@@ -1860,8 +1867,8 @@
 msgid "Enter an alias for this chat."
 msgstr "Zadejte alias pro tento chat."
 
-#: src/dialogs.c:807 src/dialogs.c:823 src/dialogs.c:841 src/gtkrequest.c:243
-#: src/protocols/silc/chat.c:569
+#: src/dialogs.c:807 src/dialogs.c:823 src/dialogs.c:841 src/gtkrequest.c:250
+#: src/protocols/silc/chat.c:572
 msgid "Alias"
 msgstr "Alias"
 
@@ -1882,22 +1889,51 @@
 msgid "Alias Buddy"
 msgstr "Alias kamaráda"
 
-#: src/ft.c:144
+#: src/ft.c:125
+msgid "That file does not exist."
+msgstr "Tento soubor neexistuje."
+
+#: src/ft.c:134
+msgid "Cannot send a file of 0 bytes."
+msgstr "Nemohu odeslat soubor s 0 bajty."
+
+#: src/ft.c:194
+#, c-format
+msgid "%s wants to send you %s (%s)"
+msgstr "%s vám chce poslat %s (%s)"
+
+#: src/ft.c:229
+#, c-format
+msgid "Accept file transfer request from %s?"
+msgstr "Přijmout požadavek na přenos souboru od %s?"
+
+#: src/ft.c:233
+#, c-format
+msgid ""
+"A file is available for download from:\n"
+"Remote host: %s\n"
+"Remote port: %d"
+msgstr ""
+"Je k dispozici soubor pro stažení z:\n"
+"Vzdálený počítač: %s\n"
+"Vzdálený port: %d"
+
+#: src/ft.c:285
 #, c-format
 msgid "%s is not a valid filename.\n"
 msgstr "%s není platný název souboru.\n"
 
-#: src/ft.c:157
+#: src/ft.c:298
 #, c-format
 msgid "%s was not found.\n"
 msgstr "%s nebyl nalezen.\n"
 
-#: src/ft.c:786
+#: src/ft.c:927
 #, c-format
 msgid "File transfer to %s aborted.\n"
 msgstr "Přenos souboru k %s přerušen.\n"
 
-#: src/ft.c:788
+#: src/ft.c:929
 #, c-format
 msgid "File transfer from %s aborted.\n"
 msgstr "Přenos souboru od %s přerušen.\n"
@@ -1991,23 +2027,23 @@
 msgid "sorry, i ran out for a while. bbl"
 msgstr "promiňte, na chvíli jsem běžel ven. vrátím se později"
 
-#: src/gaimrc.c:372 src/gaimrc.c:1409
+#: src/gaimrc.c:372 src/gaimrc.c:1417
 msgid "boring default"
 msgstr "nudná implicitní"
 
-#: src/gaimrc.c:1219 src/gtkblist.c:2986
+#: src/gaimrc.c:1227 src/gtkblist.c:3017
 msgid "Alphabetical"
 msgstr "Podle abecedy"
 
-#: src/gaimrc.c:1221 src/gtkblist.c:2987
+#: src/gaimrc.c:1229 src/gtkblist.c:3018
 msgid "By status"
 msgstr "Podle stavu"
 
-#: src/gaimrc.c:1223 src/gtkblist.c:2988
+#: src/gaimrc.c:1231 src/gtkblist.c:3019
 msgid "By log size"
 msgstr "Podle velikosti záznamu"
 
-#: src/gtkaccount.c:309
+#: src/gtkaccount.c:331
 #, c-format
 msgid ""
 "<b>File:</b> %s\n"
@@ -2019,165 +2055,165 @@
 "<b>Velikost obrázku:</b> %d×%d"
 
 #. Build the login options frame.
-#: src/gtkaccount.c:560
+#: src/gtkaccount.c:614
 msgid "Login Options"
 msgstr "Možnosti přihlášení"
 
-#: src/gtkaccount.c:577
+#: src/gtkaccount.c:631
 msgid "Protocol:"
 msgstr "Protokol:"
 
-#: src/gtkaccount.c:582 src/gtkblist.c:3985
+#: src/gtkaccount.c:636 src/gtkblist.c:4018
 msgid "Screen Name:"
 msgstr "Jméno uživatele:"
 
-#: src/gtkaccount.c:655
+#: src/gtkaccount.c:709
 msgid "Password:"
 msgstr "Heslo:"
 
-#: src/gtkaccount.c:660 src/gtkblist.c:3999 src/gtkblist.c:4327
+#: src/gtkaccount.c:714 src/gtkblist.c:4032 src/gtkblist.c:4360
 msgid "Alias:"
 msgstr "Alias:"
 
-#: src/gtkaccount.c:664
+#: src/gtkaccount.c:718
 msgid "Remember password"
 msgstr "Zapamatovat si heslo"
 
 #. Build the user options frame.
-#: src/gtkaccount.c:720
+#: src/gtkaccount.c:774
 msgid "User Options"
 msgstr "Nastavení uživatele"
 
-#: src/gtkaccount.c:733
+#: src/gtkaccount.c:787
 msgid "New mail notifications"
 msgstr "Upozornění na nové zprávy"
 
-#: src/gtkaccount.c:742
+#: src/gtkaccount.c:796
 msgid "Buddy icon:"
 msgstr "Ikona kamaráda:"
 
 #. Build the protocol options frame.
-#: src/gtkaccount.c:831
+#: src/gtkaccount.c:885
 #, c-format
 msgid "%s Options"
 msgstr "Nastavení %s"
 
 #. Use Global Proxy Settings
-#: src/gtkaccount.c:967 src/gtkaccount.c:1014
+#: src/gtkaccount.c:1021 src/gtkaccount.c:1068
 msgid "Use Global Proxy Settings"
 msgstr "Použít globální nastavení proxy"
 
 #. No Proxy
-#: src/gtkaccount.c:973 src/gtkaccount.c:1021
+#: src/gtkaccount.c:1027 src/gtkaccount.c:1075
 msgid "No Proxy"
 msgstr "Žádná proxy"
 
 #. HTTP
-#: src/gtkaccount.c:979 src/gtkaccount.c:1028
+#: src/gtkaccount.c:1033 src/gtkaccount.c:1082
 msgid "HTTP"
 msgstr "HTTP"
 
 #. SOCKS 4
-#: src/gtkaccount.c:985 src/gtkaccount.c:1035
+#: src/gtkaccount.c:1039 src/gtkaccount.c:1089
 msgid "SOCKS 4"
 msgstr "SOCKS 4"
 
 #. SOCKS 5
-#: src/gtkaccount.c:991 src/gtkaccount.c:1042
+#: src/gtkaccount.c:1045 src/gtkaccount.c:1096
 msgid "SOCKS 5"
 msgstr "SOCKS 5"
 
 #. Use Environmental Settings
-#: src/gtkaccount.c:997 src/gtkaccount.c:1049 src/gtkprefs.c:1139
+#: src/gtkaccount.c:1051 src/gtkaccount.c:1103 src/gtkprefs.c:1187
 msgid "Use Environmental Settings"
 msgstr "Použít globální prostředí"
 
 # More daring translation?
-#: src/gtkaccount.c:1088
+#: src/gtkaccount.c:1142
 msgid "you can see the butterflies mating"
 msgstr "můžete vidět, jak se motýli párují"
 
-#: src/gtkaccount.c:1092
+#: src/gtkaccount.c:1146
 msgid "If you look real closely"
 msgstr "Pokud se podíváte opravdu zblízka,"
 
-#: src/gtkaccount.c:1108
+#: src/gtkaccount.c:1162
 msgid "Proxy Options"
 msgstr "Možnosti proxy"
 
-#: src/gtkaccount.c:1126 src/gtkprefs.c:1133
+#: src/gtkaccount.c:1180 src/gtkprefs.c:1181
 msgid "Proxy _type:"
 msgstr "_Typ proxy:"
 
-#: src/gtkaccount.c:1135 src/gtkprefs.c:1160
+#: src/gtkaccount.c:1189 src/gtkprefs.c:1208
 msgid "_Host:"
 msgstr "_Počítač:"
 
-#: src/gtkaccount.c:1139 src/gtkprefs.c:1178
+#: src/gtkaccount.c:1193 src/gtkprefs.c:1226
 msgid "_Port:"
 msgstr "_Port:"
 
-#: src/gtkaccount.c:1147
+#: src/gtkaccount.c:1201
 msgid "_Username:"
 msgstr "Jméno _uživatele:"
 
-#: src/gtkaccount.c:1152 src/gtkprefs.c:1215
+#: src/gtkaccount.c:1206 src/gtkprefs.c:1263
 msgid "Pa_ssword:"
 msgstr "_Heslo:"
 
-#: src/gtkaccount.c:1524
+#: src/gtkaccount.c:1578
 msgid "Add Account"
 msgstr "Přidat účet"
 
-#: src/gtkaccount.c:1526
+#: src/gtkaccount.c:1580
 msgid "Modify Account"
 msgstr "Změnit účet"
 
 #. Add the disclosure
-#: src/gtkaccount.c:1550
+#: src/gtkaccount.c:1604
 msgid "Show more options"
 msgstr "Zobrazit více nastavení"
 
-#: src/gtkaccount.c:1551
+#: src/gtkaccount.c:1605
 msgid "Show fewer options"
 msgstr "Zobrazit méně nastavení"
 
 #. Register button
-#: src/gtkaccount.c:1578 src/protocols/jabber/jabber.c:665
+#: src/gtkaccount.c:1632 src/protocols/jabber/jabber.c:666
 msgid "Register"
 msgstr "Registrovat"
 
-#: src/gtkaccount.c:1943
+#: src/gtkaccount.c:1997
 #, c-format
 msgid "Are you sure you want to delete %s?"
 msgstr "Jste si jisti, že chcete odstranit %s?"
 
-#: src/gtkaccount.c:1947 src/gtkrequest.c:239
+#: src/gtkaccount.c:2001 src/gtkrequest.c:246
 msgid "Delete"
 msgstr "Odstranit"
 
-#: src/gtkaccount.c:2061 src/protocols/oscar/oscar.c:3981
+#: src/gtkaccount.c:2115 src/protocols/oscar/oscar.c:3997
 msgid "Screen Name"
 msgstr "Jméno uživatele"
 
-#: src/gtkaccount.c:2084 src/protocols/jabber/jabber.c:957
-#: src/protocols/oscar/oscar.c:534 src/protocols/oscar/oscar.c:5463
-#: src/protocols/oscar/oscar.c:6661 src/protocols/silc/silc.c:44
-#: src/protocols/yahoo/yahoo.c:2492 src/protocols/zephyr/zephyr.c:1208
-#: src/protocols/zephyr/zephyr.c:1218
+#: src/gtkaccount.c:2139 src/protocols/jabber/jabber.c:958
+#: src/protocols/oscar/oscar.c:538 src/protocols/oscar/oscar.c:5479
+#: src/protocols/oscar/oscar.c:6678 src/protocols/silc/silc.c:44
+#: src/protocols/yahoo/yahoo.c:2515 src/protocols/zephyr/zephyr.c:1360
+#: src/protocols/zephyr/zephyr.c:1372
 msgid "Online"
 msgstr "Připojen"
 
-#: src/gtkaccount.c:2102
+#: src/gtkaccount.c:2160
 msgid "Protocol"
 msgstr "Protokol"
 
-#: src/gtkaccount.c:2414
+#: src/gtkaccount.c:2473
 #, c-format
 msgid "%s%s%s%s has made %s his or her buddy%s%s%s"
 msgstr "%s%s%s%s udělali %s svým kamarádem%s%s%s"
 
-#: src/gtkaccount.c:2428
+#: src/gtkaccount.c:2487
 msgid ""
 "\n"
 "\n"
@@ -2187,27 +2223,27 @@
 "\n"
 "Chcete je přidat do svého seznamu kamarádů?"
 
-#: src/gtkaccount.c:2432
+#: src/gtkaccount.c:2491
 msgid "Information"
 msgstr "Informace"
 
-#: src/gtkaccount.c:2436
+#: src/gtkaccount.c:2495
 msgid "Add buddy to your list?"
 msgstr "Přidat kamaráda do vašeho seznamu?"
 
 #. Add button
-#: src/gtkaccount.c:2438 src/gtkblist.c:4378 src/gtkconv.c:1354
-#: src/gtkconv.c:3563 src/gtkconv.c:3662 src/gtkrequest.c:240
-#: src/protocols/icq/gaim_icq.c:277 src/protocols/oscar/oscar.c:3610
-#: src/protocols/silc/chat.c:578
+#: src/gtkaccount.c:2497 src/gtkblist.c:4411 src/gtkconv.c:1390
+#: src/gtkconv.c:3673 src/gtkconv.c:3777 src/gtkrequest.c:247
+#: src/protocols/icq/gaim_icq.c:277 src/protocols/oscar/oscar.c:3626
+#: src/protocols/silc/chat.c:581
 msgid "Add"
 msgstr "Přidat"
 
-#: src/gtkblist.c:810
+#: src/gtkblist.c:815
 msgid "Join a Chat"
 msgstr "Připojit se k chatu"
 
-#: src/gtkblist.c:831
+#: src/gtkblist.c:836
 msgid ""
 "Please enter the appropriate information about the chat you would like to "
 "join.\n"
@@ -2215,199 +2251,203 @@
 "Zadejte prosím odpovídající informace o chatu, ke kterému se chcete "
 "připojit.\n"
 
-#: src/gtkblist.c:842 src/gtkpounce.c:445 src/gtkroomlist.c:354
+#: src/gtkblist.c:847 src/gtkpounce.c:412 src/gtkroomlist.c:354
 msgid "_Account:"
 msgstr "_Účet:"
 
 # KEEP THIS SHORT FORM, the full one doesn't fit on a button.
-#: src/gtkblist.c:1128 src/gtkblist.c:3179
+#: src/gtkblist.c:1133 src/gtkblist.c:3212
 msgid "Get _Info"
 msgstr "_Info"
 
-#: src/gtkblist.c:1131 src/gtkblist.c:3170
+#: src/gtkblist.c:1136 src/gtkblist.c:3203
 msgid "I_M"
 msgstr "I_M"
 
-#: src/gtkblist.c:1133
+#: src/gtkblist.c:1141
+msgid "_Send File"
+msgstr "_Odeslat soubor"
+
+#: src/gtkblist.c:1145
 msgid "Add Buddy _Pounce"
 msgstr "Přidat _sledování kamaráda"
 
-#: src/gtkblist.c:1135
+#: src/gtkblist.c:1147
 msgid "View _Log"
 msgstr "Zobrazit záz_nam"
 
-#: src/gtkblist.c:1143 src/gtkblist.c:1229 src/gtkblist.c:1243
+#: src/gtkblist.c:1155 src/gtkblist.c:1241 src/gtkblist.c:1255
 msgid "_Alias..."
 msgstr "_Alias..."
 
-#: src/gtkblist.c:1145 src/gtkblist.c:1231 src/gtkblist.c:1248
+#: src/gtkblist.c:1157 src/gtkblist.c:1243 src/gtkblist.c:1260
 #: src/gtkconn.c:361
 msgid "_Remove"
 msgstr "_Odstranit"
 
-#: src/gtkblist.c:1191
+#: src/gtkblist.c:1203
 msgid "Add a _Buddy"
 msgstr "_Přidat kamaráda"
 
-#: src/gtkblist.c:1193
+#: src/gtkblist.c:1205
 msgid "Add a C_hat"
 msgstr "Přidat _chat"
 
-#: src/gtkblist.c:1195
+#: src/gtkblist.c:1207
 msgid "_Delete Group"
 msgstr "_Odstranit skupinu"
 
-#: src/gtkblist.c:1197
+#: src/gtkblist.c:1209
 msgid "_Rename"
 msgstr "_Přejmenovat"
 
 #. join button
-#: src/gtkblist.c:1219 src/gtkroomlist.c:263 src/gtkroomlist.c:409
+#: src/gtkblist.c:1231 src/gtkroomlist.c:263 src/gtkroomlist.c:409
 #: src/stock.c:87
 msgid "_Join"
 msgstr "_Připojit"
 
-#: src/gtkblist.c:1221
+#: src/gtkblist.c:1233
 msgid "Auto-Join"
 msgstr "Automatické přihlašování"
 
-#: src/gtkblist.c:1245 src/gtkblist.c:1274
+#: src/gtkblist.c:1257 src/gtkblist.c:1286
 msgid "_Collapse"
 msgstr "_Sbalit"
 
-#: src/gtkblist.c:1279
+#: src/gtkblist.c:1291
 msgid "_Expand"
 msgstr "_Rozbalit"
 
-#: src/gtkblist.c:1937 src/gtkconv.c:4199 src/gtkpounce.c:347
+#: src/gtkblist.c:1949 src/gtkconv.c:4317 src/gtkpounce.c:314
 msgid ""
 "You are not currently signed on with an account that can add that buddy."
 msgstr "Nejste momentálně připojen s účtem, který může přidat tohoto kamaráda."
 
 #. Buddies menu
-#: src/gtkblist.c:2288
+#: src/gtkblist.c:2336
 msgid "/_Buddies"
 msgstr "/_Kamarádi"
 
-#: src/gtkblist.c:2289
+#: src/gtkblist.c:2337
 msgid "/Buddies/New Instant _Message..."
 msgstr "/Kamarádi/Nová _Instant Message..."
 
-#: src/gtkblist.c:2290
+#: src/gtkblist.c:2338
 msgid "/Buddies/Join a _Chat..."
 msgstr "/Kamarádi/Připojit se k _chatu..."
 
-#: src/gtkblist.c:2291
+#: src/gtkblist.c:2339
 msgid "/Buddies/Get User _Info..."
 msgstr "/Kamarádi/Získat informace o _uživateli..."
 
-#: src/gtkblist.c:2292
+#: src/gtkblist.c:2340
 msgid "/Buddies/View User _Log..."
 msgstr "/Kamarádi/Zobrazit _záznam uživatele..."
 
-#: src/gtkblist.c:2294
+#: src/gtkblist.c:2342
 msgid "/Buddies/Show _Offline Buddies"
 msgstr "/Kamarádi/Zobrazovat _odpojené kamarády"
 
-#: src/gtkblist.c:2295
+#: src/gtkblist.c:2343
 msgid "/Buddies/Show _Empty Groups"
 msgstr "/Kamarádi/Zobrazovat _prázdné skupiny"
 
-#: src/gtkblist.c:2296
+#: src/gtkblist.c:2344
 msgid "/Buddies/_Add Buddy..."
 msgstr "/Kamarádi/_Přidat kamaráda..."
 
-#: src/gtkblist.c:2297
+#: src/gtkblist.c:2345
 msgid "/Buddies/Add C_hat..."
 msgstr "/Kamarádi/Přidat _chat..."
 
-#: src/gtkblist.c:2298
+#: src/gtkblist.c:2346
 msgid "/Buddies/Add _Group..."
 msgstr "/Kamarádi/Přidat _skupinu..."
 
-#: src/gtkblist.c:2300
+#: src/gtkblist.c:2348
 msgid "/Buddies/_Signoff"
 msgstr "/Kamarádi/_Odpojit"
 
-#: src/gtkblist.c:2301
+#: src/gtkblist.c:2349
 msgid "/Buddies/_Quit"
 msgstr "/Kamarádi/_Konec"
 
 #. Tools
-#: src/gtkblist.c:2304
+#: src/gtkblist.c:2352
 msgid "/_Tools"
 msgstr "/_Nástroje"
 
-#: src/gtkblist.c:2305
+#: src/gtkblist.c:2353
 msgid "/Tools/_Away"
 msgstr "/Nástroje/_Pryč"
 
-#: src/gtkblist.c:2306
+#: src/gtkblist.c:2354
 msgid "/Tools/Buddy _Pounce"
 msgstr "/Nástroje/_Sledování kamarádů"
 
-#: src/gtkblist.c:2307
+#: src/gtkblist.c:2355
 msgid "/Tools/Account Ac_tions"
 msgstr "/Nástroje/Akce _účtu"
 
-#: src/gtkblist.c:2308
+#: src/gtkblist.c:2356
 msgid "/Tools/Pl_ugin Actions"
 msgstr "/Nástroje/Akce zásuvných _modulů"
 
-#: src/gtkblist.c:2310
+#: src/gtkblist.c:2358
 msgid "/Tools/A_ccounts"
 msgstr "/Nástroje/_Účty"
 
-#: src/gtkblist.c:2311
+#: src/gtkblist.c:2359
 msgid "/Tools/_File Transfers"
 msgstr "/Nástroje/_Přenosy souborů"
 
-#: src/gtkblist.c:2312
+#: src/gtkblist.c:2360
 msgid "/Tools/R_oom List"
 msgstr "/Nástroje/_Seznam místností"
 
-#: src/gtkblist.c:2313
+#: src/gtkblist.c:2361
 msgid "/Tools/Pr_eferences"
 msgstr "/Nástroje/_Nastavení"
 
-#: src/gtkblist.c:2314
+#: src/gtkblist.c:2362
 msgid "/Tools/Pr_ivacy"
 msgstr "/Nástroje/_Soukromí"
 
-#: src/gtkblist.c:2316
+#: src/gtkblist.c:2364
 msgid "/Tools/View System _Log"
 msgstr "/Nástroje/Zobrazit systémový záz_nam"
 
 #. Help
-#: src/gtkblist.c:2319
+#: src/gtkblist.c:2367
 msgid "/_Help"
 msgstr "/Nápo_věda"
 
-#: src/gtkblist.c:2320
+#: src/gtkblist.c:2368
 msgid "/Help/Online _Help"
 msgstr "/Nápověda/_Nápověda online"
 
-#: src/gtkblist.c:2321
+#: src/gtkblist.c:2369
 msgid "/Help/_Debug Window"
 msgstr "/Nápověda/_Ladicí okno"
 
-#: src/gtkblist.c:2322
+#: src/gtkblist.c:2370
 msgid "/Help/_About"
-msgstr "/Nápověda/_O programu"
-
-#: src/gtkblist.c:2340
+msgstr "/Nápověda/O _aplikaci"
+
+#: src/gtkblist.c:2388
 msgid "Rename Group"
 msgstr "Přejmenovat skupinu"
 
-#: src/gtkblist.c:2340
+#: src/gtkblist.c:2388
 msgid "New group name"
-msgstr "Nové jméno skupiny"
-
-#: src/gtkblist.c:2341
+msgstr "Nový název skupiny"
+
+#: src/gtkblist.c:2389
 msgid "Please enter a new name for the selected group."
-msgstr "Zadejte prosím nové jméno vybrané skupiny."
-
-#: src/gtkblist.c:2369
+msgstr "Zadejte prosím nový název vybrané skupiny."
+
+#: src/gtkblist.c:2417
 #, c-format
 msgid ""
 "\n"
@@ -2416,7 +2456,7 @@
 "\n"
 "<b>Účet:</b> %s"
 
-#: src/gtkblist.c:2433
+#: src/gtkblist.c:2481
 msgid ""
 "\n"
 "<b>Status:</b> Offline"
@@ -2424,12 +2464,12 @@
 "\n"
 "<b>Stav:</b> Odpojen"
 
-#: src/gtkblist.c:2448
+#: src/gtkblist.c:2496
 #, c-format
 msgid "%d%%"
 msgstr "%d%%"
 
-#: src/gtkblist.c:2464
+#: src/gtkblist.c:2512
 msgid ""
 "\n"
 "<b>Account:</b>"
@@ -2437,7 +2477,7 @@
 "\n"
 "<b>Účet:</b>"
 
-#: src/gtkblist.c:2465
+#: src/gtkblist.c:2513
 msgid ""
 "\n"
 "<b>Contact Alias:</b>"
@@ -2445,7 +2485,7 @@
 "\n"
 "<b>Alias kontaktu:</b>"
 
-#: src/gtkblist.c:2466
+#: src/gtkblist.c:2514
 msgid ""
 "\n"
 "<b>Alias:</b>"
@@ -2453,7 +2493,7 @@
 "\n"
 "<b>Alias:</b>"
 
-#: src/gtkblist.c:2467
+#: src/gtkblist.c:2515
 msgid ""
 "\n"
 "<b>Nickname:</b>"
@@ -2461,7 +2501,7 @@
 "\n"
 "<b>Přezdívka:</b>"
 
-#: src/gtkblist.c:2468
+#: src/gtkblist.c:2516
 msgid ""
 "\n"
 "<b>Logged In:</b>"
@@ -2469,7 +2509,7 @@
 "\n"
 "<b>Přihlášen:</b> "
 
-#: src/gtkblist.c:2469
+#: src/gtkblist.c:2517
 msgid ""
 "\n"
 "<b>Idle:</b>"
@@ -2477,7 +2517,7 @@
 "\n"
 "<b>Nečinný:</b>"
 
-#: src/gtkblist.c:2470
+#: src/gtkblist.c:2518
 msgid ""
 "\n"
 "<b>Warned:</b>"
@@ -2485,7 +2525,7 @@
 "\n"
 "<b>Varován:</b>"
 
-#: src/gtkblist.c:2472
+#: src/gtkblist.c:2520
 msgid ""
 "\n"
 "<b>Description:</b> Spooky"
@@ -2493,7 +2533,7 @@
 "\n"
 "<b>Popis:</b> Vystrašený"
 
-#: src/gtkblist.c:2473
+#: src/gtkblist.c:2521
 msgid ""
 "\n"
 "<b>Status</b>: Awesome"
@@ -2501,7 +2541,7 @@
 "\n"
 "<b>Stav</b>: Skvělý"
 
-#: src/gtkblist.c:2474
+#: src/gtkblist.c:2522
 msgid ""
 "\n"
 "<b>Status</b>: Rockin'"
@@ -2509,96 +2549,96 @@
 "\n"
 "<b>Stav:</b> Žůžo"
 
-#: src/gtkblist.c:2773
+#: src/gtkblist.c:2804
 #, c-format
 msgid "Idle (%dh%02dm) "
 msgstr "Nečinný (%dh%02dm) "
 
-#: src/gtkblist.c:2775
+#: src/gtkblist.c:2806
 #, c-format
 msgid "Idle (%dm) "
 msgstr "Nečinný (%dm) "
 
-#: src/gtkblist.c:2780
+#: src/gtkblist.c:2811
 #, c-format
 msgid "Warned (%d%%) "
 msgstr "Varován (%d%%) "
 
-#: src/gtkblist.c:2783
+#: src/gtkblist.c:2814
 msgid "Offline "
 msgstr "Odpojen "
 
 #. Make menu items sensitive/insensitive where appropriate
-#: src/gtkblist.c:2901
+#: src/gtkblist.c:2932
 msgid "/Buddies/Join a Chat..."
 msgstr "/Kamarádi/Připojit se k chatu..."
 
-#: src/gtkblist.c:2904
+#: src/gtkblist.c:2935
 msgid "/Tools/Room List"
 msgstr "/Nástroje/Seznam místností"
 
-#: src/gtkblist.c:2907
+#: src/gtkblist.c:2938
 msgid "/Tools/Privacy"
 msgstr "/Nástroje/Soukromí"
 
-#: src/gtkblist.c:3052
+#: src/gtkblist.c:3085
 msgid "/Tools/Away"
 msgstr "/Nástroje/Pryč"
 
-#: src/gtkblist.c:3055
+#: src/gtkblist.c:3088
 msgid "/Tools/Buddy Pounce"
 msgstr "/Nástroje/Sledování kamarádů"
 
-#: src/gtkblist.c:3058
+#: src/gtkblist.c:3091
 msgid "/Tools/Account Actions"
 msgstr "/Nástroje/Akce účtu"
 
-#: src/gtkblist.c:3061
+#: src/gtkblist.c:3094
 msgid "/Tools/Plugin Actions"
 msgstr "/Nástroje/Akce zásuvných modulů"
 
 #. set the Show Offline Buddies option. must be done
 #. * after the treeview or faceprint gets mad. -Robot101
 #.
-#: src/gtkblist.c:3150
+#: src/gtkblist.c:3183
 msgid "/Buddies/Show Offline Buddies"
 msgstr "/Nástroje/Zobrazovat odpojené kamarády"
 
-#: src/gtkblist.c:3152
+#: src/gtkblist.c:3185
 msgid "/Buddies/Show Empty Groups"
 msgstr "/Nástroje/Zobrazovat prázdné skupiny"
 
-#: src/gtkblist.c:3176
+#: src/gtkblist.c:3209
 msgid "Send a message to the selected buddy"
 msgstr "Odeslat zprávu vybranému kamarádovi"
 
-#: src/gtkblist.c:3185
+#: src/gtkblist.c:3218
 msgid "Get information on the selected buddy"
 msgstr "Získat informace o vybraném kamarádovi"
 
-#: src/gtkblist.c:3188
+#: src/gtkblist.c:3221
 msgid "_Chat"
 msgstr "_Chat"
 
-#: src/gtkblist.c:3193
+#: src/gtkblist.c:3226
 msgid "Join a chat room"
 msgstr "Připojit se k místnosti chatu"
 
-#: src/gtkblist.c:3196
+#: src/gtkblist.c:3229
 msgid "_Away"
 msgstr "_Pryč"
 
-#: src/gtkblist.c:3201
+#: src/gtkblist.c:3234
 msgid "Set an away message"
 msgstr "Nastavit zprávu o nepřítomnosti"
 
-#: src/gtkblist.c:3939 src/protocols/silc/buddy.c:731
+#: src/gtkblist.c:3972 src/protocols/silc/buddy.c:731
 #: src/protocols/silc/buddy.c:989 src/protocols/silc/buddy.c:1034
-#: src/protocols/silc/buddy.c:1124 src/protocols/yahoo/yahoo.c:2672
+#: src/protocols/silc/buddy.c:1124 src/protocols/yahoo/yahoo.c:2682
 msgid "Add Buddy"
 msgstr "Přidat kamaráda"
 
-#: src/gtkblist.c:3963
+#: src/gtkblist.c:3996
 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. "
@@ -2609,22 +2649,22 @@
 "zobrazen místo jména uživatele kdykoli je to možné.\n"
 
 #. Set up stuff for the account box
-#: src/gtkblist.c:4023 src/gtkblist.c:4307
+#: src/gtkblist.c:4056 src/gtkblist.c:4340
 msgid "Account:"
 msgstr "Účet:"
 
-#: src/gtkblist.c:4266
+#: src/gtkblist.c:4299
 msgid ""
 "You are not currently signed on with any protocols that have the ability to "
 "chat."
 msgstr ""
 "Nejste momentálně připojen s žádným protokolem, který má možnost chatu."
 
-#: src/gtkblist.c:4273
+#: src/gtkblist.c:4306
 msgid "Add Chat"
 msgstr "Přidat chat"
 
-#: src/gtkblist.c:4297
+#: src/gtkblist.c:4330
 msgid ""
 "Please enter an alias, and the appropriate information about the chat you "
 "would like to add to your buddy list.\n"
@@ -2632,15 +2672,15 @@
 "Zadejte prosím alias a odpovídající informace o chatu, který chcete přidat "
 "do svého seznamu kamarádů.\n"
 
-#: src/gtkblist.c:4375
+#: src/gtkblist.c:4408
 msgid "Add Group"
 msgstr "Přidat skupinu"
 
-#: src/gtkblist.c:4376
+#: src/gtkblist.c:4409
 msgid "Please enter the name of the group to be added."
-msgstr "Zadejte prosím jméno skupiny, kterou přidat."
-
-#: src/gtkblist.c:4943 src/gtkblist.c:5040
+msgstr "Zadejte prosím název skupiny, kterou přidat."
+
+#: src/gtkblist.c:4976 src/gtkblist.c:5073
 msgid "No actions available"
 msgstr "Žádné akce nejsou k dispozici"
 
@@ -2689,29 +2729,16 @@
 msgid "Time"
 msgstr "Čas"
 
-#: src/gtkconv.c:168
-#, c-format
-msgid "<h1>Conversation with %s</h1>\n"
-msgstr "<h1>Konverzace s %s</h1>\n"
-
-#: src/gtkconv.c:186 src/gtkdebug.c:212
-msgid "That file already exists"
-msgstr "Tento soubor již existuje"
-
-#: src/gtkconv.c:187 src/gtkdebug.c:213 src/gtkft.c:1123
-msgid "Would you like to overwrite it?"
-msgstr "Chcete jej přepsat?"
-
-#: src/gtkconv.c:365
+#: src/gtkconv.c:314
 #, c-format
 msgid "me is using Gaim v%s."
 msgstr "me používá Gaim v%s."
 
-#: src/gtkconv.c:374
+#: src/gtkconv.c:323
 msgid "Supported debug options are:  version"
 msgstr "Podporované ladicí přepínače jsou: version"
 
-#: src/gtkconv.c:387
+#: src/gtkconv.c:336
 msgid ""
 "Use \"/help &lt;command&gt;\" for help on a specific command.\n"
 "The following commands are available in this context:\n"
@@ -2719,46 +2746,52 @@
 "Pro nápovědu o konkréním příkazu použijte \"/help &lt;příkaz&gt;\".\n"
 "V tonto kontextu jsou k dispozici následující příkazy:\n"
 
-#: src/gtkconv.c:421
+#: src/gtkconv.c:370
 msgid "No such command (in this context)."
 msgstr "Takový příkaz (v tomto kontextu) neexistuje."
 
-#: src/gtkconv.c:468
+#: src/gtkconv.c:443
 msgid ""
 "No such command. If you didn't mean to type a command, you can turn commands "
 "off from Tools->Preferences->Interface->Conversation->Enable \"slash\" "
 "commands."
-msgstr "Takový příkaz neexistuje. Pokud jste nechtěli napsat příkaz, můžete příkazy vypnout z Nástroje->Nastavení->Rozhraní->Konverzace->Povolit příkazy s lomítkem."
-
-#: src/gtkconv.c:476
+msgstr ""
+"Takový příkaz neexistuje. Pokud jste nechtěli napsat příkaz, můžete příkazy "
+"vypnout z Nástroje->Nastavení->Rozhraní->Konverzace->Povolit příkazy s "
+"lomítkem."
+
+#: src/gtkconv.c:451
 msgid ""
 "Syntax Error:  You typed the wrong number of arguments to that command. If "
 "you didn't mean to type a command, you can turn commands off from Tools-"
 ">Preferences->Interface->Conversation->Enable \"slash\" commands."
-msgstr "Chyba syntaxe: Zadali jste špatný počet parametrů příkazu. Pokud jste nechtěli napsat příkaz, můžete příkazy vypnout z Nástroje->Nastavení->Rozhraní->Konverzace->Povolit příkazy s lomítkem."
-
-#: src/gtkconv.c:483
+msgstr ""
+"Chyba syntaxe: Zadali jste špatný počet parametrů příkazu. Pokud jste "
+"nechtěli napsat příkaz, můžete příkazy vypnout z Nástroje->Nastavení-"
+">Rozhraní->Konverzace->Povolit příkazy s lomítkem."
+
+#: src/gtkconv.c:458
 msgid "Your command failed for an unknown reason."
 msgstr "Váš příkaz selhal z neznámého důvodu."
 
-#: src/gtkconv.c:490
+#: src/gtkconv.c:465
 msgid "That command only works in Chats, not IMs."
 msgstr "Tento příkaz funguje jen v chatech, ne v IM."
 
-#: src/gtkconv.c:493
+#: src/gtkconv.c:468
 msgid "That command only works in IMs, not Chats."
 msgstr "Tento příkaz funguje jen v IM, ne v chatech."
 
-#: src/gtkconv.c:497
+#: src/gtkconv.c:472
 msgid "That command doesn't work on this protocol."
 msgstr "Tento příkaz nefunguje s tímto protokolem."
 
-#: src/gtkconv.c:713
+#: src/gtkconv.c:693
 msgid "Invite Buddy Into Chat Room"
 msgstr "Pozvat kamaráda do místnosti chatu"
 
 #. Put our happy label in it.
-#: src/gtkconv.c:741
+#: src/gtkconv.c:721
 msgid ""
 "Please enter the name of the user you wish to invite, along with an optional "
 "invite message."
@@ -2766,298 +2799,333 @@
 "Zadejte prosím jméno uživatele, kterého chcete pozvat, a nepovinně i zvací "
 "zprávu."
 
-#: src/gtkconv.c:762
+#: src/gtkconv.c:742
 msgid "_Buddy:"
 msgstr "_Kamarád:"
 
-#: src/gtkconv.c:782
+#: src/gtkconv.c:762
 msgid "_Message:"
 msgstr "Z_práva:"
 
-#: src/gtkconv.c:890 src/gtkdebug.c:127
+#: src/gtkconv.c:799 src/gtkconv.c:2489 src/gtkdebug.c:182
+msgid "Unable to open file."
+msgstr "Nemohu otevřít soubor."
+
+#: src/gtkconv.c:804
+#, c-format
+msgid "<h1>Conversation with %s</h1>\n"
+msgstr "<h1>Konverzace s %s</h1>\n"
+
+#: src/gtkconv.c:818
+msgid "Save Conversation"
+msgstr "Uložit konverzaci"
+
+#: src/gtkconv.c:895 src/gtkdebug.c:131
 msgid "Find"
 msgstr "Hledat"
 
-#: src/gtkconv.c:916 src/gtkdebug.c:155
+#: src/gtkconv.c:921 src/gtkdebug.c:159
 msgid "_Search for:"
 msgstr "_Hledat:"
 
-#: src/gtkconv.c:1312
+#: src/gtkconv.c:1338
 msgid "IM"
 msgstr "IM"
 
-#: src/gtkconv.c:1320
+#. Block button
+#: src/gtkconv.c:1347 src/gtkconv.c:3666 src/protocols/oscar/oscar.c:453
+#: src/protocols/oscar/oscar.c:6788
+msgid "Send File"
+msgstr "Odeslat soubor"
+
+#: src/gtkconv.c:1356
 msgid "Un-Ignore"
 msgstr "Přestat ignorovat"
 
-#: src/gtkconv.c:1322 src/gtkprefs.c:778
+#: src/gtkconv.c:1358 src/gtkprefs.c:826
 msgid "Ignore"
 msgstr "Ignorovat"
 
 #. Info button
-#: src/gtkconv.c:1331 src/gtkconv.c:3577
+#: src/gtkconv.c:1367 src/gtkconv.c:3687
 msgid "Info"
 msgstr "Info"
 
-#: src/gtkconv.c:1340
+#: src/gtkconv.c:1376
 msgid "Get Away Msg"
 msgstr "Získat zprávu o nepřítomnosti"
 
-#: src/gtkconv.c:2467
+#: src/gtkconv.c:2497
+msgid "Unable to save icon file to disk."
+msgstr "Nemohu uložit soubor ikony na disk."
+
+#: src/gtkconv.c:2514
+msgid "Save Icon"
+msgstr "Uložit ikonu"
+
+#: src/gtkconv.c:2544
 msgid "Animate"
 msgstr "Animovat"
 
-#: src/gtkconv.c:2472
+#: src/gtkconv.c:2549
 msgid "Hide Icon"
 msgstr "Skrýt ikonu"
 
-#: src/gtkconv.c:2478
+#: src/gtkconv.c:2555
 msgid "Save Icon As..."
 msgstr "Uložit ikonu jako..."
 
-#: src/gtkconv.c:2847
+#: src/gtkconv.c:2939
 msgid "User is typing..."
 msgstr "Uživatel píše..."
 
-#: src/gtkconv.c:2855
+#: src/gtkconv.c:2947
 msgid "User has typed something and paused"
 msgstr "Uživatel něco napsal a počkal"
 
 #. Build the Send As menu
-#: src/gtkconv.c:2958
+#: src/gtkconv.c:3050
 msgid "_Send As"
 msgstr "_Odeslat jako"
 
-#: src/gtkconv.c:3335
-msgid "Save Conversation"
-msgstr "Uložit konverzaci"
-
 #. Conversation menu
-#: src/gtkconv.c:3352
+#: src/gtkconv.c:3450
 msgid "/_Conversation"
 msgstr "/_Konverzace"
 
-#: src/gtkconv.c:3354
+#: src/gtkconv.c:3452
 msgid "/Conversation/New Instant _Message..."
 msgstr "/Konverzace/Nová _Instant Message..."
 
-#: src/gtkconv.c:3359
+#: src/gtkconv.c:3457
 msgid "/Conversation/_Find..."
 msgstr "/Konverzace/_Hledat..."
 
-#: src/gtkconv.c:3361
+#: src/gtkconv.c:3459
 msgid "/Conversation/View _Log"
 msgstr "/Konverzace/Zobrazit záz_nam"
 
-#: src/gtkconv.c:3362
+#: src/gtkconv.c:3460
 msgid "/Conversation/_Save As..."
 msgstr "/Konverzace/_Uložit jako..."
 
-#: src/gtkconv.c:3364
+#: src/gtkconv.c:3462
 msgid "/Conversation/Clear"
 msgstr "/Konverzace/Vymazat"
 
-#: src/gtkconv.c:3368
+#: src/gtkconv.c:3466
+msgid "/Conversation/Se_nd File..."
+msgstr "/Konverzace/Odeslat _soubor..."
+
+#: src/gtkconv.c:3467
 msgid "/Conversation/Add Buddy _Pounce..."
 msgstr "/Konverzace/Přidat _sledování kamaráda..."
 
-#: src/gtkconv.c:3370
+#: src/gtkconv.c:3469
 msgid "/Conversation/_Get Info"
 msgstr "/Konverzace/_Získat informace"
 
-#: src/gtkconv.c:3372
+#: src/gtkconv.c:3471
 msgid "/Conversation/_Warn..."
 msgstr "/Konverzace/_Varovat..."
 
-#: src/gtkconv.c:3374
+#: src/gtkconv.c:3473
 msgid "/Conversation/In_vite..."
 msgstr "/Konverzace/_Pozvat..."
 
-#: src/gtkconv.c:3379
+#: src/gtkconv.c:3478
 msgid "/Conversation/A_lias..."
 msgstr "/Konverzace/A_lias..."
 
-#: src/gtkconv.c:3381
+#: src/gtkconv.c:3480
 msgid "/Conversation/_Block..."
 msgstr "/Konverzace/_Blokovat..."
 
-#: src/gtkconv.c:3383
+#: src/gtkconv.c:3482
 msgid "/Conversation/_Add..."
 msgstr "/Konverzace/_Přidat..."
 
-#: src/gtkconv.c:3385
+#: src/gtkconv.c:3484
 msgid "/Conversation/_Remove..."
 msgstr "/Konverzace/_Odstranit..."
 
-#: src/gtkconv.c:3390
+#: src/gtkconv.c:3489
 msgid "/Conversation/Insert Lin_k..."
 msgstr "/Konverzace/Vložit _odkaz..."
 
-#: src/gtkconv.c:3392
+#: src/gtkconv.c:3491
 msgid "/Conversation/Insert Imag_e..."
 msgstr "/Konverzace/Vložit _obrázek..."
 
-#: src/gtkconv.c:3397
+#: src/gtkconv.c:3496
 msgid "/Conversation/_Close"
 msgstr "/Konverzace/_Zavřít"
 
 #. Options
-#: src/gtkconv.c:3401
+#: src/gtkconv.c:3500
 msgid "/_Options"
 msgstr "/_Možnosti"
 
-#: src/gtkconv.c:3402
+#: src/gtkconv.c:3501
 msgid "/Options/Enable _Logging"
 msgstr "/Možnosti/Povolit zaz_namenávání"
 
-#: src/gtkconv.c:3403
+#: src/gtkconv.c:3502
 msgid "/Options/Enable _Sounds"
 msgstr "/Možnosti/Povolit _zvuky"
 
-#: src/gtkconv.c:3404
+#: src/gtkconv.c:3503
 msgid "/Options/Show Formatting _Toolbar"
 msgstr "/Možnosti/Zobrazovat lištu nástrojů _Formátování"
 
-#: src/gtkconv.c:3405
+#: src/gtkconv.c:3504
 msgid "/Options/Show T_imestamps"
 msgstr "/Možnosti/Zobrazovat _časové značky"
 
-#: src/gtkconv.c:3447
+#: src/gtkconv.c:3546
 msgid "/Conversation/View Log"
 msgstr "/Konverzace/Zobrazit záznam"
 
-#: src/gtkconv.c:3452
+#: src/gtkconv.c:3551
+msgid "/Conversation/Send File..."
+msgstr "/Konverzace/Odeslat soubor..."
+
+#: src/gtkconv.c:3555
 msgid "/Conversation/Add Buddy Pounce..."
 msgstr "/Konverzace/Přidat sledování kamaráda..."
 
-#: src/gtkconv.c:3458
+#: src/gtkconv.c:3561
 msgid "/Conversation/Get Info"
 msgstr "/Konverzace/Získat informace"
 
-#: src/gtkconv.c:3462
+#: src/gtkconv.c:3565
 msgid "/Conversation/Warn..."
 msgstr "/Konverzace/Varovat..."
 
-#: src/gtkconv.c:3466
+#: src/gtkconv.c:3569
 msgid "/Conversation/Invite..."
 msgstr "/Konverzace/Pozvat..."
 
-#: src/gtkconv.c:3472
+#: src/gtkconv.c:3575
 msgid "/Conversation/Alias..."
 msgstr "/Konverzace/Alias..."
 
-#: src/gtkconv.c:3476
+#: src/gtkconv.c:3579
 msgid "/Conversation/Block..."
 msgstr "/Konverzace/Blokovat..."
 
-#: src/gtkconv.c:3480
+#: src/gtkconv.c:3583
 msgid "/Conversation/Add..."
 msgstr "/Konverzace/Přidat..."
 
-#: src/gtkconv.c:3484
+#: src/gtkconv.c:3587
 msgid "/Conversation/Remove..."
 msgstr "/Konverzace/Odstranit..."
 
-#: src/gtkconv.c:3490
+#: src/gtkconv.c:3593
 msgid "/Conversation/Insert Link..."
 msgstr "/Konverzace/Vložit odkaz..."
 
-#: src/gtkconv.c:3494
+#: src/gtkconv.c:3597
 msgid "/Conversation/Insert Image..."
 msgstr "/Konverzace/Vložit obrázek..."
 
-#: src/gtkconv.c:3500
+#: src/gtkconv.c:3603
 msgid "/Options/Enable Logging"
 msgstr "/Možnosti/Povolit zaznamenávání"
 
-#: src/gtkconv.c:3503
+#: src/gtkconv.c:3606
 msgid "/Options/Enable Sounds"
 msgstr "/Možnosti/Povolit zvuky"
 
-#: src/gtkconv.c:3506
+#: src/gtkconv.c:3609
 msgid "/Options/Show Formatting Toolbar"
 msgstr "/Možnosti/Zobrazovat lištu nástrojů Formátování"
 
-#: src/gtkconv.c:3509
+#: src/gtkconv.c:3612
 msgid "/Options/Show Timestamps"
 msgstr "/Možnosti/Zobrazovat časové značky"
 
 #. From right to left...
 #. Send button
-#: src/gtkconv.c:3533 src/gtkconv.c:3535 src/gtkconv.c:3641 src/gtkconv.c:3643
+#: src/gtkconv.c:3636 src/gtkconv.c:3638 src/gtkconv.c:3756 src/gtkconv.c:3758
 msgid "Send"
 msgstr "Odeslat"
 
 #. Now, um, just kind of all over the place. Huh?
 #. Warn button
-#: src/gtkconv.c:3549
+#: src/gtkconv.c:3652
 msgid "Warn"
 msgstr "Varovat"
 
-#: src/gtkconv.c:3552
+#: src/gtkconv.c:3655
 msgid "Warn the user"
 msgstr "Varovat uživatele"
 
 #. Block button
-#: src/gtkconv.c:3556 src/gtkprivacy.c:624 src/gtkprivacy.c:635
+#: src/gtkconv.c:3659 src/gtkprivacy.c:624 src/gtkprivacy.c:635
 msgid "Block"
 msgstr "Blokovat"
 
-#: src/gtkconv.c:3559
+#: src/gtkconv.c:3662
 msgid "Block the user"
 msgstr "Blokovat uživatele"
 
-#: src/gtkconv.c:3566
+#: src/gtkconv.c:3669
+msgid "Send a file to the user"
+msgstr "Odeslat soubor uživateli"
+
+#: src/gtkconv.c:3676
 msgid "Add the user to your buddy list"
 msgstr "Přidat uživatele do vašeho seznamu kamarádů"
 
-#: src/gtkconv.c:3573
+#: src/gtkconv.c:3683
 msgid "Remove the user from your buddy list"
 msgstr "Odstranit uživatele z vašeho seznamu kamarádů"
 
-#: src/gtkconv.c:3580 src/gtkconv.c:3923
+#: src/gtkconv.c:3690 src/gtkconv.c:4041
 msgid "Get the user's information"
 msgstr "Získat informace o uživateli"
 
 #. Invite
-#: src/gtkconv.c:3655
+#: src/gtkconv.c:3770
 msgid "Invite"
 msgstr "Pozvat"
 
-#: src/gtkconv.c:3658
+#: src/gtkconv.c:3773
 msgid "Invite a user"
 msgstr "Pozvat uživatele"
 
-#: src/gtkconv.c:3665
+#: src/gtkconv.c:3780
 msgid "Add the chat to your buddy list"
 msgstr "Přidat chat do vašeho seznamu kamarádů"
 
-#: src/gtkconv.c:3672
+#: src/gtkconv.c:3787
 msgid "Remove the chat from your buddy list"
 msgstr "Odstranit chat z vašeho seznamu kamarádů"
 
-#: src/gtkconv.c:3782
+#: src/gtkconv.c:3897
 msgid "Topic:"
 msgstr "Téma:"
 
 #. Setup the label telling how many people are in the room.
-#: src/gtkconv.c:3845
+#: src/gtkconv.c:3960
 msgid "0 people in room"
 msgstr "0 lidí v místnosti"
 
-#: src/gtkconv.c:3900
+#: src/gtkconv.c:4018
 msgid "IM the user"
 msgstr "IM uživatele"
 
-#: src/gtkconv.c:3912
+#: src/gtkconv.c:4030
 msgid "Ignore the user"
 msgstr "Ignorovat uživatele"
 
-#: src/gtkconv.c:4490
+#: src/gtkconv.c:4629
 msgid "Close conversation"
 msgstr "Zavřít konverzaci"
 
-#: src/gtkconv.c:5035 src/gtkconv.c:5067 src/gtkconv.c:5188 src/gtkconv.c:5255
+#: src/gtkconv.c:5171 src/gtkconv.c:5203 src/gtkconv.c:5324 src/gtkconv.c:5391
 #, c-format
 msgid "%d person in room"
 msgid_plural "%d people in room"
@@ -3065,211 +3133,170 @@
 msgstr[1] "%d osoby v místnosti"
 msgstr[2] "%d osob v místnosti"
 
-#: src/gtkconv.c:5757 src/gtkconv.c:5760
+#: src/gtkconv.c:5903 src/gtkconv.c:5906
 msgid "<main>/Conversation/Close"
 msgstr "<main>/Konverzace/Zavřít"
 
-#: src/gtkconv.c:6132
+#: src/gtkconv.c:6278
 msgid "me &lt;action&gt;:  Send an IRC style action to a buddy or chat."
 msgstr "me &lt;akce&gt;: Odeslat kamarádovi nebo do chatu akci ve stylu IRC."
 
-#: src/gtkconv.c:6135
+#: src/gtkconv.c:6281
 msgid ""
 "debug &lt;option&gt;:  Send various debug information to the current "
 "conversation."
-msgstr "debug &lt;přepínač&gt;: Odeslat aktuální konverzaci různé ladicí informace."
-
-#: src/gtkconv.c:6139
+msgstr ""
+"debug &lt;přepínač&gt;: Odeslat aktuální konverzaci různé ladicí informace."
+
+#: src/gtkconv.c:6285
 msgid "help:  List available commands."
 msgstr "help: Vypsat dostupné příkazy."
 
-#: src/gtkconv.c:6143
+#: src/gtkconv.c:6289
 msgid "help &lt;command&gt;:  Help on a specific command."
 msgstr "help &lt;příkaz&gt;: Nápověda o konkrétním příkazu."
 
-#: src/gtkdebug.c:226
+#: src/gtkdebug.c:197
 msgid "Save Debug Log"
 msgstr "Uložit ladicí záznam"
 
-#: src/gtkdebug.c:289
+#: src/gtkdebug.c:250
 msgid "Debug Window"
 msgstr "Ladicí okno"
 
-#: src/gtkdebug.c:327
+#: src/gtkdebug.c:288
 msgid "Pause"
 msgstr "Pozastavit"
 
-#: src/gtkdebug.c:333
+#: src/gtkdebug.c:294
 msgid "Timestamps"
 msgstr "Časové značky"
 
-#: src/gtkft.c:143
+#: src/gtkft.c:136
 #, c-format
 msgid "%.2f KB/s"
 msgstr "%.2f KB/s"
 
-#: src/gtkft.c:164 src/gtkft.c:974
+#: src/gtkft.c:157 src/gtkft.c:967
 msgid "Finished"
 msgstr "Dokončeno"
 
-#: src/gtkft.c:167 src/gtkft.c:925
+#: src/gtkft.c:160 src/gtkft.c:918
 msgid "Canceled"
 msgstr "Zrušeno"
 
-#: src/gtkft.c:170
+#: src/gtkft.c:163
 msgid "Waiting for transfer to begin"
 msgstr "Čekám na začátek přenosu..."
 
-#: src/gtkft.c:223
+#: src/gtkft.c:216
 msgid "<b>Receiving From:</b>"
 msgstr "<b>Přijímám od:</b>"
 
-#: src/gtkft.c:226
+#: src/gtkft.c:219
 msgid "<b>Sending To:</b>"
 msgstr "<b>Odesílám k:</b>"
 
-#: src/gtkft.c:400
+#: src/gtkft.c:393
 msgid "There is no application configured to open this type of file."
 msgstr "Pro otevírání tohoto typu souborů není nastavena žádná aplikace."
 
-#: src/gtkft.c:405
+#: src/gtkft.c:398
 msgid "An error occurred while opening the file."
 msgstr "Při otevírání souboru došlo k chybě."
 
+#: src/gtkft.c:489
+msgid "Progress"
+msgstr "Průběh"
+
 #: src/gtkft.c:496
-msgid "Progress"
-msgstr "Průběh"
-
-#: src/gtkft.c:503
 msgid "Filename"
 msgstr "Název souboru"
 
-#: src/gtkft.c:510
+#: src/gtkft.c:503
 msgid "Size"
 msgstr "Velikost"
 
-#: src/gtkft.c:517
+#: src/gtkft.c:510
 msgid "Remaining"
 msgstr "Zbývá"
 
-#: src/gtkft.c:547
+#: src/gtkft.c:540
 msgid "Filename:"
 msgstr "Název souboru:"
 
-#: src/gtkft.c:548
+#: src/gtkft.c:541
 msgid "Status:"
 msgstr "Stav:"
 
-#: src/gtkft.c:549
+#: src/gtkft.c:542
 msgid "Speed:"
 msgstr "Rychlost:"
 
-#: src/gtkft.c:550
+#: src/gtkft.c:543
 msgid "Time Elapsed:"
 msgstr "Využitý čas:"
 
-#: src/gtkft.c:551
+#: src/gtkft.c:544
 msgid "Time Remaining:"
 msgstr "Zbývající čas:"
 
-#: src/gtkft.c:648
+#: src/gtkft.c:641
 msgid "_Keep the dialog open"
 msgstr "_Nechat dialog otevřený"
 
-#: src/gtkft.c:658
+#: src/gtkft.c:651
 msgid "_Clear finished transfers"
 msgstr "_Vymazat dokončené přenosy"
 
 #. "Download Details" arrow
-#: src/gtkft.c:667
+#: src/gtkft.c:660
 msgid "Show transfer details"
 msgstr "Zobrazit detaily o přenosu"
 
-#: src/gtkft.c:668
+#: src/gtkft.c:661
 msgid "Hide transfer details"
 msgstr "Skrýt detaily o přenosu"
 
 #. Pause button
-#: src/gtkft.c:710 src/stock.c:90
+#: src/gtkft.c:703 src/stock.c:90
 msgid "_Pause"
 msgstr "_Pozastavit"
 
 #. Resume button
-#: src/gtkft.c:720
+#: src/gtkft.c:713
 msgid "_Resume"
 msgstr "_Pokračovat"
 
-#: src/gtkft.c:927
+#: src/gtkft.c:920
 msgid "Failed"
 msgstr "Selhalo"
 
-#: src/gtkft.c:1099
-msgid "That file does not exist."
-msgstr "Tento soubor neexistuje."
-
-#: src/gtkft.c:1108
-msgid "Cannot send a file of 0 bytes."
-msgstr "Nemohu odeslat soubor s 0 bajty."
-
-#: src/gtkft.c:1122
-msgid "That file already exists."
-msgstr "Tento soubor již existuje."
-
-#. Open file selector to select the public key.
-#: src/gtkft.c:1148 src/protocols/silc/buddy.c:1023
-msgid "Open..."
-msgstr "Otevřít..."
-
-#: src/gtkft.c:1150
-msgid "Save As..."
-msgstr "Uložit jako..."
-
-#: src/gtkft.c:1200
-#, c-format
-msgid "%s wants to send you %s (%s)"
-msgstr "%s vám chce poslat %s (%s)"
-
-#: src/gtkft.c:1233
-#, c-format
-msgid "Accept file transfer request from %s?"
-msgstr "Přijmout požadavek na přenos souboru od %s?"
-
-#: src/gtkft.c:1237
-#, c-format
-msgid ""
-"A file is available for download from:\n"
-"Remote host: %s\n"
-"Remote port: %d"
-msgstr ""
-"Je k dispozici soubor pro stažení z:\n"
-"Vzdálený počítač: %s\n"
-"Vzdálený port: %d"
-
-#: src/gtkimhtml.c:567
+#: src/gtkimhtml.c:602
 msgid "Pa_ste As Text"
 msgstr "Vložit _jako text"
 
-#: src/gtkimhtml.c:1012
+#: src/gtkimhtml.c:1047
 msgid "Hyperlink color"
 msgstr "Barva odkazu"
 
-#: src/gtkimhtml.c:1013
+#: src/gtkimhtml.c:1048
 msgid "Color to draw hyperlinks."
 msgstr "Barva, kterou kreslit odkazy."
 
-#: src/gtkimhtml.c:1218
+#: src/gtkimhtml.c:1253
 msgid "_Copy E-Mail Address"
 msgstr "_Kopírovat emailovou adresu"
 
-#: src/gtkimhtml.c:1230
+#: src/gtkimhtml.c:1265
 msgid "_Copy Link Location"
 msgstr "_Kopírovat adresu odkazu"
 
-#: src/gtkimhtml.c:1240
+#: src/gtkimhtml.c:1275
 msgid "_Open Link in Browser"
 msgstr "_Otevřít odkaz v prohlížeči"
 
-#: src/gtkimhtml.c:2761
+#: src/gtkimhtml.c:2797
 msgid ""
 "Unable to guess the image type based on the file extension supplied.  "
 "Defaulting to PNG."
@@ -3277,16 +3304,16 @@
 "Nemohu uhádnout typ obrázku podle dodané přípony souboru. Implicitně "
 "používám PNG."
 
-#: src/gtkimhtml.c:2769
+#: src/gtkimhtml.c:2805
 #, c-format
 msgid "Error saving image: %s"
 msgstr "Chyba při ukládání obrázku: %s"
 
-#: src/gtkimhtml.c:2778
+#: src/gtkimhtml.c:2814
 msgid "Save Image"
 msgstr "Uložit obrázek"
 
-#: src/gtkimhtml.c:2801
+#: src/gtkimhtml.c:2837
 msgid "_Save Image..."
 msgstr "_Uložit obrázek..."
 
@@ -3329,74 +3356,74 @@
 msgid "_Insert"
 msgstr "_Vložit"
 
-#: src/gtkimhtmltoolbar.c:472
+#: src/gtkimhtmltoolbar.c:481
 #, c-format
 msgid "Failed to store image: %s\n"
 msgstr "Nemohu uložit obrázek: %s\n"
 
-#: src/gtkimhtmltoolbar.c:498
+#: src/gtkimhtmltoolbar.c:507 src/gtkimhtmltoolbar.c:517
 msgid "Insert Image"
 msgstr "Vložit obrázek"
 
-#: src/gtkimhtmltoolbar.c:637
+#: src/gtkimhtmltoolbar.c:655
 msgid "This theme has no available smileys."
 msgstr "V tomto tématu nejsou k dispozici smajlíky."
 
 #. show everything
-#: src/gtkimhtmltoolbar.c:652
+#: src/gtkimhtmltoolbar.c:670
 msgid "Smile!"
 msgstr "Úsměv!"
 
-#: src/gtkimhtmltoolbar.c:870
+#: src/gtkimhtmltoolbar.c:888
 msgid "Bold"
 msgstr "Tučné"
 
-#: src/gtkimhtmltoolbar.c:881
+#: src/gtkimhtmltoolbar.c:899
 msgid "Italic"
 msgstr "Kurzíva"
 
-#: src/gtkimhtmltoolbar.c:892
+#: src/gtkimhtmltoolbar.c:910
 msgid "Underline"
 msgstr "Podtržené"
 
-#: src/gtkimhtmltoolbar.c:908
+#: src/gtkimhtmltoolbar.c:926
 msgid "Larger font size"
 msgstr "Větší velikost písma"
 
-#: src/gtkimhtmltoolbar.c:920
+#: src/gtkimhtmltoolbar.c:938
 msgid "Smaller font size"
 msgstr "Menší velikost písma"
 
-#: src/gtkimhtmltoolbar.c:937
+#: src/gtkimhtmltoolbar.c:955
 msgid "Font Face"
 msgstr "Řez písma"
 
-#: src/gtkimhtmltoolbar.c:949
+#: src/gtkimhtmltoolbar.c:967
 msgid "Foreground font color"
 msgstr "Barva pozadí písma"
 
-#: src/gtkimhtmltoolbar.c:961
+#: src/gtkimhtmltoolbar.c:979
 msgid "Background color"
 msgstr "Barva pozadí"
 
-#: src/gtkimhtmltoolbar.c:976
+#: src/gtkimhtmltoolbar.c:994
 msgid "Insert link"
 msgstr "Vložit odkaz"
 
-#: src/gtkimhtmltoolbar.c:986
+#: src/gtkimhtmltoolbar.c:1004
 msgid "Insert image"
 msgstr "Vložit obrázek"
 
-#: src/gtkimhtmltoolbar.c:997
+#: src/gtkimhtmltoolbar.c:1015
 msgid "Insert smiley"
 msgstr "Vložit smajlík"
 
-#: src/gtklog.c:282
+#: src/gtklog.c:302
 msgid "Conversations with"
 msgstr "Konverzace s"
 
 #. Window **********
-#: src/gtklog.c:372 src/gtklog.c:388
+#: src/gtklog.c:392 src/gtklog.c:408
 msgid "System Log"
 msgstr "Systémový záznam"
 
@@ -3447,7 +3474,7 @@
 msgstr "Příkaz prohlížeče \"%s\" není platný."
 
 #: src/gtknotify.c:432 src/gtknotify.c:446 src/gtknotify.c:461
-#: src/gtknotify.c:569
+#: src/gtknotify.c:579
 msgid "Unable to open URL"
 msgstr "Nemohu otevřít URL"
 
@@ -3456,173 +3483,173 @@
 msgid "Error launching \"%s\": %s"
 msgstr "Chyba při spouštění \"%s\": %s"
 
-#: src/gtknotify.c:570
+#: src/gtknotify.c:580
 msgid ""
 "The 'Manual' browser command has been chosen, but no command has been set."
 msgstr "Byl zvolen 'Ruční' příkaz prohlížeče, ale nebyl nastaven žádný příkaz."
 
-#: src/gtkpounce.c:144
+#: src/gtkpounce.c:130
 msgid "Select a file"
 msgstr "Zvolte soubor"
 
-#: src/gtkpounce.c:194
+#: src/gtkpounce.c:161
 msgid "Please enter a buddy to pounce."
 msgstr "Zadejte prosím kamaráda, kterého sledovat."
 
 #. "New Buddy Pounce"
-#: src/gtkpounce.c:420 src/gtkpounce.c:923
+#: src/gtkpounce.c:387 src/gtkpounce.c:890
 msgid "New Buddy Pounce"
 msgstr "Nové sledování kamaráda"
 
-#: src/gtkpounce.c:420
+#: src/gtkpounce.c:387
 msgid "Edit Buddy Pounce"
 msgstr "Upravit sledování kamaráda"
 
 #. Create the "Pounce Who" frame.
-#: src/gtkpounce.c:438
+#: src/gtkpounce.c:405
 msgid "Pounce Who"
 msgstr "Sledovat koho"
 
-#: src/gtkpounce.c:465
+#: src/gtkpounce.c:432
 msgid "_Buddy name:"
 msgstr "_Jméno kamaráda:"
 
 #. Create the "Pounce When" frame.
-#: src/gtkpounce.c:489
+#: src/gtkpounce.c:456
 msgid "Pounce When"
 msgstr "Sledovat kdy"
 
-#: src/gtkpounce.c:497 src/main.c:296
+#: src/gtkpounce.c:464 src/main.c:296
 msgid "_Sign on"
 msgstr "Při_hlášení"
 
-#: src/gtkpounce.c:499
+#: src/gtkpounce.c:466
 msgid "Sign _off"
 msgstr "_Odhlášení"
 
-#: src/gtkpounce.c:501
+#: src/gtkpounce.c:468
 msgid "A_way"
 msgstr "_Pryč"
 
-#: src/gtkpounce.c:503
+#: src/gtkpounce.c:470
 msgid "Re_turn from away"
 msgstr "Ná_vrat z nepřítomnosti"
 
-#: src/gtkpounce.c:505
+#: src/gtkpounce.c:472
 msgid "_Idle"
 msgstr "_Nečinný"
 
-#: src/gtkpounce.c:507
+#: src/gtkpounce.c:474
 msgid "Retur_n from idle"
 msgstr "Náv_rat z nečinnosti"
 
-#: src/gtkpounce.c:509
+#: src/gtkpounce.c:476
 msgid "Buddy starts _typing"
 msgstr "Kamarád začne _psát"
 
-#: src/gtkpounce.c:511
+#: src/gtkpounce.c:478
 msgid "Buddy stops t_yping"
 msgstr "Kamarád přestane p_sát"
 
 #. Create the "Pounce Action" frame.
-#: src/gtkpounce.c:540
+#: src/gtkpounce.c:507
 msgid "Pounce Action"
 msgstr "Akce sledování"
 
-#: src/gtkpounce.c:548
+#: src/gtkpounce.c:515
 msgid "Op_en an IM window"
 msgstr "_Otevřít okno IM"
 
-#: src/gtkpounce.c:550
+#: src/gtkpounce.c:517
 msgid "_Popup notification"
 msgstr "Zobrazit _upozornění"
 
-#: src/gtkpounce.c:552
+#: src/gtkpounce.c:519
 msgid "Send a _message"
 msgstr "Odeslat _zprávu"
 
-#: src/gtkpounce.c:554
+#: src/gtkpounce.c:521
 msgid "E_xecute a command"
 msgstr "Spustit _příkaz"
 
-#: src/gtkpounce.c:556
+#: src/gtkpounce.c:523
 msgid "P_lay a sound"
 msgstr "Pře_hrát zvuk"
 
-#: src/gtkpounce.c:560
+#: src/gtkpounce.c:527
 msgid "B_rowse..."
 msgstr "_Procházet..."
 
-#: src/gtkpounce.c:562
+#: src/gtkpounce.c:529
 msgid "Bro_wse..."
 msgstr "_Procházet..."
 
-#: src/gtkpounce.c:563
+#: src/gtkpounce.c:530
 msgid "Pre_view"
 msgstr "Ná_hled"
 
-#: src/gtkpounce.c:646
+#: src/gtkpounce.c:613
 msgid "Sav_e this pounce after activation"
 msgstr "_Uložit toto sledování po aktivaci"
 
 #. "Remove Buddy Pounce"
-#: src/gtkpounce.c:930
+#: src/gtkpounce.c:897
 msgid "Remove Buddy Pounce"
 msgstr "Odstranit sledování kamaráda"
 
-#: src/gtkpounce.c:994
+#: src/gtkpounce.c:961
 #, c-format
 msgid "%s has started typing to you (%s)"
 msgstr "%s vám začal psát (%s)"
 
-#: src/gtkpounce.c:996
+#: src/gtkpounce.c:963
 #, c-format
 msgid "%s has signed on (%s)"
 msgstr "%s se přihlásil (%s)"
 
-#: src/gtkpounce.c:998
+#: src/gtkpounce.c:965
 #, c-format
 msgid "%s has returned from being idle (%s)"
 msgstr "%s se vrátil z nečinnosti (%s)"
 
-#: src/gtkpounce.c:1000
+#: src/gtkpounce.c:967
 #, c-format
 msgid "%s has returned from being away (%s)"
 msgstr "%s se vrátil z nepřítomnosti (%s)"
 
-#: src/gtkpounce.c:1002
+#: src/gtkpounce.c:969
 #, c-format
 msgid "%s has stopped typing to you (%s)"
 msgstr "%s vám přestal psát (%s)"
 
-#: src/gtkpounce.c:1004
+#: src/gtkpounce.c:971
 #, c-format
 msgid "%s has signed off (%s)"
 msgstr "%s se odhlásil (%s)"
 
-#: src/gtkpounce.c:1006
+#: src/gtkpounce.c:973
 #, c-format
 msgid "%s has become idle (%s)"
 msgstr "%s se stal nečinným (%s)"
 
-#: src/gtkpounce.c:1008
+#: src/gtkpounce.c:975
 #, c-format
 msgid "%s has gone away. (%s)"
 msgstr "%s šel pryč. (%s)"
 
-#: src/gtkpounce.c:1009
+#: src/gtkpounce.c:976
 msgid "Unknown pounce event. Please report this!"
 msgstr "Neznámá událost sledování. Oznamte to prosím!"
 
-#: src/gtkprefs.c:401
+#: src/gtkprefs.c:446
 msgid "Interface Options"
 msgstr "Možnosti rozhraní"
 
-#: src/gtkprefs.c:403
+#: src/gtkprefs.c:448
 msgid "D_isplay remote nicknames if no alias is set"
 msgstr "Z_obrazovat vzdálené přezdívky, pokud není nastaven alias"
 
-#: src/gtkprefs.c:627
+#: src/gtkprefs.c:675
 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."
@@ -3630,52 +3657,52 @@
 "Vyberte téma smajlíků, které chcete používat, ze seznamu níže. Nová témata "
 "mohou být nainstalována jejich přetažením do seznamu témat."
 
-#: src/gtkprefs.c:667
+#: src/gtkprefs.c:715
 msgid "Icon"
 msgstr "Ikona"
 
-#: src/gtkprefs.c:674 src/gtkprefs.c:2199 src/protocols/jabber/buddy.c:265
-#: src/protocols/jabber/buddy.c:749 src/protocols/jabber/chat.c:701
+#: src/gtkprefs.c:722 src/gtkprefs.c:2212 src/protocols/jabber/buddy.c:264
+#: src/protocols/jabber/buddy.c:748 src/protocols/jabber/chat.c:701
 msgid "Description"
 msgstr "Popis"
 
-#: src/gtkprefs.c:770
+#: src/gtkprefs.c:818
 msgid "Display"
 msgstr "Zobrazení"
 
-#: src/gtkprefs.c:771
+#: src/gtkprefs.c:819
 msgid "Show _timestamp on messages"
 msgstr "Zobrazovat _časovou značku u zpráv"
 
-#: src/gtkprefs.c:774
+#: src/gtkprefs.c:822
 msgid "_Highlight misspelled words"
 msgstr "Z_výrazňovat slova s překlepy"
 
-#: src/gtkprefs.c:779
+#: src/gtkprefs.c:827
 msgid "Ignore c_olors"
 msgstr "Ignorovat _barvy"
 
-#: src/gtkprefs.c:781
+#: src/gtkprefs.c:829
 msgid "Ignore font _faces"
 msgstr "Ignorovat _řezy písma"
 
-#: src/gtkprefs.c:783
+#: src/gtkprefs.c:831
 msgid "Ignore font si_zes"
 msgstr "Ignorovat _velikosti písma"
 
-#: src/gtkprefs.c:786
+#: src/gtkprefs.c:834
 msgid "_Ignore formatting on incoming messages"
 msgstr "_Ignorovat formátování příchozích zpráv"
 
-#: src/gtkprefs.c:790
+#: src/gtkprefs.c:838
 msgid "Default Formatting"
 msgstr "Implicitní formátování"
 
-#: src/gtkprefs.c:792
+#: src/gtkprefs.c:840
 msgid "_Send default formatting with outgoing messages"
 msgstr "_Odesílat s odchozími zprávami implicitní formátování"
 
-#: src/gtkprefs.c:824
+#: src/gtkprefs.c:872
 msgid ""
 "This is how your outgoing message text will appear when you use protocols "
 "that support formatting. :)"
@@ -3683,265 +3710,269 @@
 "Takto bude vypadat text vaší odchozí zprávy, pokud používáte protokoly, "
 "které podporují formátování. :)"
 
-#: src/gtkprefs.c:827
+#: src/gtkprefs.c:875
 msgid "_Clear Formatting"
 msgstr "_Vymazat formátování"
 
-#: src/gtkprefs.c:864
+#: src/gtkprefs.c:912
 msgid "Send Message"
 msgstr "Odeslat zprávu"
 
-#: src/gtkprefs.c:865
+#: src/gtkprefs.c:913
 msgid "Enter _sends message"
 msgstr "Enter _odešle zprávu"
 
-#: src/gtkprefs.c:867
+#: src/gtkprefs.c:915
 msgid "C_ontrol-Enter sends message"
 msgstr "_Control-Enter odešle zprávu"
 
-#: src/gtkprefs.c:870
+#: src/gtkprefs.c:918
 msgid "Window Closing"
 msgstr "Zavírání okna"
 
-#: src/gtkprefs.c:871
+#: src/gtkprefs.c:919
 msgid "_Escape closes window"
 msgstr "_Escape zavře okno"
 
-#: src/gtkprefs.c:874
+#: src/gtkprefs.c:922
 msgid "Insertions"
 msgstr "Vkládání"
 
-#: src/gtkprefs.c:875
+#: src/gtkprefs.c:923
 msgid "Control-{B/I/U} changes _formatting"
 msgstr "Control-{B/I/U} mění _formátování"
 
-#: src/gtkprefs.c:877
+#: src/gtkprefs.c:925
 msgid "Control-(number) _inserts smileys"
 msgstr "Control-(číslo) vloží _smajlík"
 
-#: src/gtkprefs.c:893
+#: src/gtkprefs.c:941
 msgid "Buddy List Sorting"
 msgstr "Třídění seznamu kamarádů"
 
-#: src/gtkprefs.c:902
+#: src/gtkprefs.c:950
 msgid "_Sorting:"
 msgstr "_Třídění:"
 
-#: src/gtkprefs.c:908 src/gtkprefs.c:961
+#: src/gtkprefs.c:956 src/gtkprefs.c:1009
 msgid "Show _buttons as:"
 msgstr "Zobrazovat _tlačítka jako:"
 
-#: src/gtkprefs.c:910 src/gtkprefs.c:963
+#: src/gtkprefs.c:958 src/gtkprefs.c:1011
 msgid "Pictures"
 msgstr "Obrázky"
 
-#: src/gtkprefs.c:911 src/gtkprefs.c:964
+#: src/gtkprefs.c:959 src/gtkprefs.c:1012
 msgid "Text"
 msgstr "Text"
 
-#: src/gtkprefs.c:912 src/gtkprefs.c:965
+#: src/gtkprefs.c:960 src/gtkprefs.c:1013
 msgid "Pictures and text"
 msgstr "Obrázky a text"
 
-#: src/gtkprefs.c:915
+#: src/gtkprefs.c:963
 msgid "_Raise window on events"
 msgstr "Z_výšit okno při událostech"
 
-#: src/gtkprefs.c:918
+#: src/gtkprefs.c:966
 msgid "Buddy Display"
 msgstr "Zobrazení kamarádů"
 
-#: src/gtkprefs.c:919 src/gtkprefs.c:979
+#: src/gtkprefs.c:967 src/gtkprefs.c:1027
 msgid "Show buddy _icons"
 msgstr "Zobrazovat _ikony kamarádů"
 
-#: src/gtkprefs.c:921
+#: src/gtkprefs.c:969
 msgid "Show _warning levels"
 msgstr "Zobrazovat úrovně _varování"
 
-#: src/gtkprefs.c:923
+#: src/gtkprefs.c:971
 msgid "Show idle _times"
 msgstr "Zobrazovat _doby nečinnosti"
 
-#: src/gtkprefs.c:925
+#: src/gtkprefs.c:973
 msgid "Dim i_dle buddies"
-msgstr "Ztmavit _nečinné kamarády"
-
-#: src/gtkprefs.c:927
+msgstr "Ztmavovat _nečinné kamarády"
+
+#: src/gtkprefs.c:975
 msgid "_Automatically expand contacts"
 msgstr "_Automaticky rozbalovat kontakty"
 
-#: src/gtkprefs.c:972
+#: src/gtkprefs.c:1020
 msgid "Enable \"_slash\" commands"
 msgstr "Povolit příkazy s _lomítkem"
 
-#: src/gtkprefs.c:975
+#: src/gtkprefs.c:1023
 msgid "Show _formatting toolbar"
 msgstr "Zobrazovat lištu nástrojů _Formátování"
 
-#: src/gtkprefs.c:977
+#: src/gtkprefs.c:1025
 msgid "Show _aliases in tabs/titles"
 msgstr "Zobrazovat a_liasy v záložkách/nadpisech"
 
-#: src/gtkprefs.c:981
+#: src/gtkprefs.c:1029
 msgid "Enable buddy ic_on animation"
 msgstr "Povolit _animaci ikon kamarádů"
 
-#: src/gtkprefs.c:983
+#: src/gtkprefs.c:1031
 msgid "_Notify buddies that you are typing to them"
 msgstr "Upozorňovat kamarády, že jim _píšete"
 
-#: src/gtkprefs.c:985
+#: src/gtkprefs.c:1033
 msgid "_Raise IM window on events"
 msgstr "Z_výšit okno IM při událostech"
 
-#: src/gtkprefs.c:988
+#: src/gtkprefs.c:1036
 msgid "Raise chat _window on events"
 msgstr "Zvý_šit okno chatu při událostech"
 
-#: src/gtkprefs.c:990
+#: src/gtkprefs.c:1038
 msgid "Use _multi-colored screen names in chats"
 msgstr "Používat v chatech jména uživatele s _více barvami"
 
 #. All the tab options!
-#: src/gtkprefs.c:994
+#: src/gtkprefs.c:1042
 msgid "Tab Options"
 msgstr "Možnosti záložek"
 
-#: src/gtkprefs.c:996
+#: src/gtkprefs.c:1044
 msgid "Show IMs and chats in _tabbed windows"
 msgstr "Zobrazovat IM a chaty v oknech se zá_ložkami."
 
-#: src/gtkprefs.c:1011
+#: src/gtkprefs.c:1059
 msgid "Show _close button on tabs"
 msgstr "Zobrazovat na záložkách tlačítko z_avřít."
 
-#: src/gtkprefs.c:1014
+#: src/gtkprefs.c:1062
 msgid "Tab p_lacement:"
 msgstr "_Umístění záložek:"
 
-#: src/gtkprefs.c:1016
+#: src/gtkprefs.c:1064
 msgid "Top"
 msgstr "Nahoře"
 
-#: src/gtkprefs.c:1017
+#: src/gtkprefs.c:1065
 msgid "Bottom"
 msgstr "Dole"
 
-#: src/gtkprefs.c:1018
+#: src/gtkprefs.c:1066
 msgid "Left"
 msgstr "Vlevo"
 
-#: src/gtkprefs.c:1019
+#: src/gtkprefs.c:1067
 msgid "Right"
 msgstr "Vpravo"
 
-#: src/gtkprefs.c:1025
+#: src/gtkprefs.c:1073
 msgid "New conversation _placement:"
 msgstr "_Umísťování nových konverzací:"
 
-#: src/gtkprefs.c:1076 src/protocols/oscar/oscar.c:592
-#: src/protocols/oscar/oscar.c:4837
+#: src/gtkprefs.c:1124 src/protocols/oscar/oscar.c:596
+#: src/protocols/oscar/oscar.c:4853
 msgid "IP Address"
 msgstr "IP adresa"
 
-#: src/gtkprefs.c:1078
+#: src/gtkprefs.c:1126
 msgid "_Autodetect IP Address"
 msgstr "_Autodetekovat IP adresu"
 
-#: src/gtkprefs.c:1087
+#: src/gtkprefs.c:1135
 msgid "Public _IP:"
 msgstr "Veřejná _IP:"
 
-#: src/gtkprefs.c:1111
+#: src/gtkprefs.c:1159
 msgid "Ports"
 msgstr "Porty"
 
-#: src/gtkprefs.c:1114
+#: src/gtkprefs.c:1162
 msgid "_Manually specify range of ports to listen on"
 msgstr "_Ručně určit rozsah portů, na kterých poslouchat"
 
-#: src/gtkprefs.c:1117
+#: src/gtkprefs.c:1165
 msgid "_Start Port:"
 msgstr "_Počáteční port:"
 
-#: src/gtkprefs.c:1124
+#: src/gtkprefs.c:1172
 msgid "_End Port:"
 msgstr "_Koncový port:"
 
-#: src/gtkprefs.c:1131
+#: src/gtkprefs.c:1179
 msgid "Proxy Server"
 msgstr "Proxy server"
 
-#: src/gtkprefs.c:1135
+#: src/gtkprefs.c:1183
 msgid "No proxy"
 msgstr "Žádná proxy"
 
-#: src/gtkprefs.c:1197
+#: src/gtkprefs.c:1245
 msgid "_User:"
 msgstr "_Uživatel:"
 
-#: src/gtkprefs.c:1253
-msgid "Opera"
-msgstr "Opera"
-
-#: src/gtkprefs.c:1254
-msgid "Netscape"
-msgstr "Netscape"
-
-#: src/gtkprefs.c:1255
-msgid "Mozilla"
-msgstr "Mozilla"
-
-#: src/gtkprefs.c:1256
-msgid "Konqueror"
-msgstr "Konqueror"
-
-#: src/gtkprefs.c:1257
-msgid "Galeon"
-msgstr "Galeon"
-
-#: src/gtkprefs.c:1258
+#: src/gtkprefs.c:1301
+msgid "Epiphany"
+msgstr "Epiphany"
+
+#: src/gtkprefs.c:1302
 msgid "Firebird"
 msgstr "Firebird"
 
-#: src/gtkprefs.c:1259
+#: src/gtkprefs.c:1303
 msgid "Firefox"
 msgstr "Firefox"
 
-#: src/gtkprefs.c:1260
+#: src/gtkprefs.c:1304
+msgid "Galeon"
+msgstr "Galeon"
+
+#: src/gtkprefs.c:1305
 msgid "Gnome Default"
 msgstr "Implicitní pro Gnome"
 
-#: src/gtkprefs.c:1269
+#: src/gtkprefs.c:1306
+msgid "Konqueror"
+msgstr "Konqueror"
+
+#: src/gtkprefs.c:1307
+msgid "Mozilla"
+msgstr "Mozilla"
+
+#: src/gtkprefs.c:1308
+msgid "Netscape"
+msgstr "Netscape"
+
+#: src/gtkprefs.c:1309
+msgid "Opera"
+msgstr "Opera"
+
+#: src/gtkprefs.c:1318
 msgid "Manual"
 msgstr "Ruční"
 
-#: src/gtkprefs.c:1320
+#: src/gtkprefs.c:1369
 msgid "Browser Selection"
 msgstr "Výběr prohlížeče"
 
-#: src/gtkprefs.c:1324
+#: src/gtkprefs.c:1373
 msgid "_Browser:"
 msgstr "_Prohlížeč:"
 
-#: src/gtkprefs.c:1331
+#: src/gtkprefs.c:1380
 msgid "_Open link in:"
 msgstr "_Otevřít odkaz v:"
 
-#: src/gtkprefs.c:1333
+#: src/gtkprefs.c:1382
 msgid "Browser default"
 msgstr "Implicitní nastavení prohlížeče"
 
-#: src/gtkprefs.c:1334
+#: src/gtkprefs.c:1383
 msgid "Existing window"
 msgstr "Existující okno"
 
-#: src/gtkprefs.c:1336
+#: src/gtkprefs.c:1385
 msgid "New tab"
 msgstr "Nová záložka"
 
-#: src/gtkprefs.c:1350
+#: src/gtkprefs.c:1399
 #, c-format
 msgid ""
 "_Manual:\n"
@@ -3950,83 +3981,83 @@
 "_Ruční:\n"
 "(%s pro URL)"
 
-#: src/gtkprefs.c:1387
+#: src/gtkprefs.c:1436
 msgid "Message Logs"
 msgstr "Záznamy zpráv"
 
-#: src/gtkprefs.c:1390
+#: src/gtkprefs.c:1439
 msgid "Log _Format:"
 msgstr "_Formát záznamu:"
 
-#: src/gtkprefs.c:1393
+#: src/gtkprefs.c:1442
 msgid "_Log all instant messages"
 msgstr "Zaz_namenávat všechny instant message"
 
-#: src/gtkprefs.c:1395
+#: src/gtkprefs.c:1444
 msgid "Log all c_hats"
 msgstr "Zaznamenávat všechny _chaty"
 
-#: src/gtkprefs.c:1398
+#: src/gtkprefs.c:1447
 msgid "System Logs"
 msgstr "Záznamy systému"
 
-#: src/gtkprefs.c:1400
+#: src/gtkprefs.c:1449
 msgid "_Enable system log"
 msgstr "_Povolit záznam systému"
 
-#: src/gtkprefs.c:1403
+#: src/gtkprefs.c:1452
 msgid "Log when buddies _sign on/sign off"
 msgstr "Zaznamenávat, když se kamarádi _přihlásí/odhlásí"
 
-#: src/gtkprefs.c:1409
+#: src/gtkprefs.c:1458
 msgid "Log when buddies become _idle/un-idle"
 msgstr "Zaznamenávat, když se kamarádi stanou _nečinnými/činnými"
 
-#: src/gtkprefs.c:1415
+#: src/gtkprefs.c:1464
 msgid "Log when buddies go away/come _back"
 msgstr "Zaznamenávat, když kamarádi odejdou _pryč/vrátí se"
 
-#: src/gtkprefs.c:1421
+#: src/gtkprefs.c:1470
 msgid "Log your _own signons/idleness/awayness"
 msgstr "Zaznamenávat _vlastní přihlášení/nečinnosti/odchody pryč"
 
-#: src/gtkprefs.c:1559
+#: src/gtkprefs.c:1596
 msgid "Sound Selection"
 msgstr "Výběr zvuku"
 
-#: src/gtkprefs.c:1634
+#: src/gtkprefs.c:1647
 msgid "Sound Options"
 msgstr "Možnosti zvuku"
 
-#: src/gtkprefs.c:1635
+#: src/gtkprefs.c:1648
 msgid "Sounds when conversation has _focus"
 msgstr "Zvuky, když je okno konverzace _aktivní"
 
-#: src/gtkprefs.c:1637
+#: src/gtkprefs.c:1650
 msgid "_Sounds while away"
 msgstr "Z_vuky při nepřítomnosti"
 
-#: src/gtkprefs.c:1641
+#: src/gtkprefs.c:1654
 msgid "Sound Method"
 msgstr "Metoda zvuku"
 
-#: src/gtkprefs.c:1642
+#: src/gtkprefs.c:1655
 msgid "_Method:"
 msgstr "_Metoda:"
 
-#: src/gtkprefs.c:1644
+#: src/gtkprefs.c:1657
 msgid "Console beep"
 msgstr "Pípnutí konzoly"
 
-#: src/gtkprefs.c:1646
+#: src/gtkprefs.c:1659
 msgid "Automatic"
 msgstr "Automatická"
 
-#: src/gtkprefs.c:1653
+#: src/gtkprefs.c:1666
 msgid "Command"
 msgstr "Příkaz"
 
-#: src/gtkprefs.c:1661
+#: src/gtkprefs.c:1674
 #, c-format
 msgid ""
 "Sound c_ommand:\n"
@@ -4035,86 +4066,86 @@
 "_Příkaz zvuku:\n"
 "(%s pro název souboru)"
 
-#: src/gtkprefs.c:1688
+#: src/gtkprefs.c:1701
 msgid "Sound Events"
 msgstr "Události zvuků"
 
-#: src/gtkprefs.c:1739
+#: src/gtkprefs.c:1752
 msgid "Play"
 msgstr "Přehrát"
 
-#: src/gtkprefs.c:1746
+#: src/gtkprefs.c:1759
 msgid "Event"
 msgstr "Událost"
 
-#: src/gtkprefs.c:1765
+#: src/gtkprefs.c:1778
 msgid "Test"
 msgstr "Otestovat"
 
-#: src/gtkprefs.c:1769
+#: src/gtkprefs.c:1782
 msgid "Reset"
 msgstr "Vymazat"
 
-#: src/gtkprefs.c:1773
+#: src/gtkprefs.c:1786
 msgid "Choose..."
 msgstr "Vybrat..."
 
-#: src/gtkprefs.c:1797
+#: src/gtkprefs.c:1810
 msgid "_Queue new messages when away"
 msgstr "Zařazovat nové zprávy do _fronty při nepřítomnosti"
 
-#: src/gtkprefs.c:1800
+#: src/gtkprefs.c:1813
 msgid "Auto-response"
 msgstr "Automatická odpověď"
 
-#: src/gtkprefs.c:1801
+#: src/gtkprefs.c:1814
 msgid "_Send auto-response"
-msgstr "_Odeslat automatickou odpověď"
-
-#: src/gtkprefs.c:1803
+msgstr "_Odesílat automatickou odpověď"
+
+#: src/gtkprefs.c:1816
 msgid "_Only send auto-response when idle"
 msgstr "Odesílat automatickou odpověď _jen při nečinnosti"
 
-#: src/gtkprefs.c:1806 src/protocols/msn/msn.c:1156
-#: src/protocols/msn/state.c:32 src/protocols/novell/novell.c:2724
-#: src/protocols/oscar/oscar.c:3994 src/protocols/yahoo/yahoo.c:2488
-#: src/protocols/yahoo/yahoo_profile.c:653
+#: src/gtkprefs.c:1819 src/protocols/msn/msn.c:1179
+#: src/protocols/msn/state.c:32 src/protocols/novell/novell.c:2730
+#: src/protocols/oscar/oscar.c:4010 src/protocols/yahoo/yahoo.c:2511
+#: src/protocols/yahoo/yahoo_profile.c:664
 msgid "Idle"
 msgstr "Nečinný"
 
-#: src/gtkprefs.c:1807
+#: src/gtkprefs.c:1820
 msgid "Idle _time reporting:"
 msgstr "Hlášení _času nečinnosti:"
 
-#: src/gtkprefs.c:1810
+#: src/gtkprefs.c:1823
 msgid "Gaim usage"
 msgstr "Použití Gaim"
 
-#: src/gtkprefs.c:1813
+#: src/gtkprefs.c:1826
 msgid "X usage"
 msgstr "Použití X"
 
-#: src/gtkprefs.c:1815
+#: src/gtkprefs.c:1828
 msgid "Windows usage"
 msgstr "Použití Windows"
 
-#: src/gtkprefs.c:1823
+#: src/gtkprefs.c:1836
 msgid "Auto-away"
 msgstr "Automatická nepřítomnost"
 
-#: src/gtkprefs.c:1824
+#: src/gtkprefs.c:1837
 msgid "Set away _when idle"
 msgstr "Nastavit nepřítomnost _při nečinnosti"
 
-#: src/gtkprefs.c:1828
+#: src/gtkprefs.c:1841
 msgid "_Minutes before setting away:"
 msgstr "_Minuty před nastavením nepřítomnosti:"
 
-#: src/gtkprefs.c:1836
+#: src/gtkprefs.c:1849
 msgid "Away m_essage:"
 msgstr "Zpráva o nepřítomnosti:"
 
-#: src/gtkprefs.c:1917
+#: src/gtkprefs.c:1930
 #, c-format
 msgid ""
 "<span size=\"larger\">%s %s</span>\n"
@@ -4129,7 +4160,7 @@
 "<span weight=\"bold\">WWW stránka:</span>\t\t%s\n"
 "<span weight=\"bold\">Název souboru:</span>\t%s"
 
-#: src/gtkprefs.c:1922
+#: src/gtkprefs.c:1935
 #, c-format
 msgid ""
 "<span size=\"larger\">%s %s</span>\n"
@@ -4144,64 +4175,64 @@
 "<span weight=\"bold\">URL:</span>  %s\n"
 "<span weight=\"bold\">Název souboru:</span>  %s"
 
-#: src/gtkprefs.c:2155
+#: src/gtkprefs.c:2168
 msgid "Load"
 msgstr "Načítat"
 
-#: src/gtkprefs.c:2169
+#: src/gtkprefs.c:2182
 msgid "Summary"
 msgstr "Souhrn"
 
-#: src/gtkprefs.c:2217
+#: src/gtkprefs.c:2230
 msgid "Details"
 msgstr "Detaily"
 
-#: src/gtkprefs.c:2362
+#: src/gtkprefs.c:2375
 msgid "_Edit"
 msgstr "_Upravit"
 
-#: src/gtkprefs.c:2398
+#: src/gtkprefs.c:2411
 msgid "Interface"
 msgstr "Rozhraní"
 
-#: src/gtkprefs.c:2401
+#: src/gtkprefs.c:2414
 msgid "Message Text"
 msgstr "Text zprávy"
 
-#: src/gtkprefs.c:2402
+#: src/gtkprefs.c:2415
 msgid "Shortcuts"
 msgstr "Zkratky"
 
-#: src/gtkprefs.c:2403
+#: src/gtkprefs.c:2416
 msgid "Smiley Themes"
 msgstr "Témata smajlíků"
 
-#: src/gtkprefs.c:2404
+#: src/gtkprefs.c:2417
 msgid "Sounds"
 msgstr "Zvuky"
 
-#: src/gtkprefs.c:2405
+#: src/gtkprefs.c:2418
 msgid "Network"
 msgstr "Síť"
 
 #. We use the registered default browser in windows
-#: src/gtkprefs.c:2408
+#: src/gtkprefs.c:2421
 msgid "Browser"
 msgstr "Prohlížeč"
 
-#: src/gtkprefs.c:2410
+#: src/gtkprefs.c:2423
 msgid "Logging"
 msgstr "Zaznamenávání"
 
-#: src/gtkprefs.c:2411
+#: src/gtkprefs.c:2424
 msgid "Away / Idle"
 msgstr "Pryč / nečinný"
 
-#: src/gtkprefs.c:2412
+#: src/gtkprefs.c:2425
 msgid "Away Messages"
 msgstr "Zprávy o nepřítomnosti"
 
-#: src/gtkprefs.c:2415
+#: src/gtkprefs.c:2428
 msgid "Plugins"
 msgstr "Zásuvné moduly"
 
@@ -4225,7 +4256,7 @@
 msgid "Block only the users below"
 msgstr "Blokovat jen uživatele níže"
 
-#: src/gtkprivacy.c:385 src/protocols/jabber/jabber.c:1448
+#: src/gtkprivacy.c:385 src/protocols/jabber/jabber.c:1449
 msgid "Privacy"
 msgstr "Soukromí"
 
@@ -4290,27 +4321,43 @@
 #. *
 #. * A wrapper for gaim_request_action() that uses Yes and No buttons.
 #.
-#: src/gtkrequest.c:233 src/protocols/gg/gg.c:867
-#: src/protocols/novell/novell.c:1844 src/protocols/silc/buddy.c:307
-#: src/protocols/silc/pk.c:116 src/request.h:1233
+#: src/gtkrequest.c:240 src/protocols/gg/gg.c:949
+#: src/protocols/novell/novell.c:1845 src/protocols/silc/buddy.c:307
+#: src/protocols/silc/pk.c:116 src/request.h:1234
 msgid "Yes"
 msgstr "Ano"
 
-#: src/gtkrequest.c:234 src/protocols/gg/gg.c:867
-#: src/protocols/novell/novell.c:1845 src/protocols/silc/buddy.c:308
-#: src/protocols/silc/pk.c:117 src/request.h:1233
+#: src/gtkrequest.c:241 src/protocols/gg/gg.c:949
+#: src/protocols/novell/novell.c:1846 src/protocols/silc/buddy.c:308
+#: src/protocols/silc/pk.c:117 src/request.h:1234
 msgid "No"
 msgstr "Ne"
 
-#: src/gtkrequest.c:237
+#: src/gtkrequest.c:244
 msgid "Apply"
 msgstr "Použít"
 
-#: src/gtkrequest.c:238 src/protocols/msn/msn.c:316
-#: src/protocols/silc/util.c:311
+#: src/gtkrequest.c:245 src/protocols/msn/msn.c:314
+#: src/protocols/silc/util.c:332
 msgid "Close"
 msgstr "Zavřít"
 
+#: src/gtkrequest.c:1391
+msgid "That file already exists"
+msgstr "Tento soubor již existuje"
+
+#: src/gtkrequest.c:1392
+msgid "Would you like to overwrite it?"
+msgstr "Chcete jej přepsat?"
+
+#: src/gtkrequest.c:1430 src/gtkrequest.c:1451
+msgid "Save File..."
+msgstr "Uložit soubor..."
+
+#: src/gtkrequest.c:1431 src/gtkrequest.c:1452
+msgid "Open File..."
+msgstr "Otevřít soubor..."
+
 #: src/gtkroomlist.c:330
 msgid "Room List"
 msgstr "Seznam místností"
@@ -4381,23 +4428,15 @@
 msgstr ""
 "Nemohu přehrávat zvuk, protože nastavený příkaz zvuku nemohl být spuštěn: %s"
 
-#: src/gtkutils.c:149
-msgid "Can't save icon file to disk."
-msgstr "Nemohu uložit soubor ikony na disk."
-
-#: src/gtkutils.c:184
-msgid "Save Icon"
-msgstr "Uložit ikonu"
-
 #: src/log.c:106
 msgid "<b><font color=\"red\">The logger has no read function</font></b>"
 msgstr "<b><font color=\"red\">Zaznamenávač nemá funkci read</font></b>"
 
-#: src/log.c:486
+#: src/log.c:489
 msgid "XML"
 msgstr "XML"
 
-#: src/log.c:571
+#: src/log.c:574
 #, c-format
 msgid ""
 "<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
@@ -4406,7 +4445,7 @@
 "<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
 "ODPOVĚĎ&gt;:</b></font> %s<br/>\n"
 
-#: src/log.c:573
+#: src/log.c:576
 #, c-format
 msgid ""
 "<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
@@ -4415,25 +4454,25 @@
 "<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
 "ODPOVĚĎ&gt;:</b></font> %s<br/>\n"
 
-#: src/log.c:624 src/log.c:811
+#: src/log.c:627 src/log.c:814
 msgid "<font color=\"red\"><b>Unable to find log path!</b></font>"
 msgstr "<font color=\"red\"><b>Nemohu najít cestu záznamu!</b></font>"
 
-#: src/log.c:634 src/log.c:823
+#: src/log.c:637 src/log.c:826
 #, c-format
 msgid "<font color=\"red\"><b>Could not read file: %s</b></font>"
 msgstr "<font color=\"red\"><b>Nemohu přečíst soubor: %s</b></font>"
 
-#: src/log.c:671
+#: src/log.c:674
 msgid "HTML"
 msgstr "HTML"
 
-#: src/log.c:756
+#: src/log.c:759
 #, c-format
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr "(%s) %s <AUTO-ODPOVĚĎ>: %s\n"
 
-#: src/log.c:856
+#: src/log.c:859
 msgid "Plain text"
 msgstr "Prostý text"
 
@@ -4526,12 +4565,12 @@
 msgstr "Trošku méně nudné implicitní"
 
 #: src/protocols/gg/gg.c:49 src/protocols/jabber/jutil.c:44
-#: src/protocols/msn/msn.c:465 src/protocols/msn/state.c:29
+#: src/protocols/msn/msn.c:462 src/protocols/msn/state.c:29
 #: src/protocols/msn/state.c:30 src/protocols/msn/state.c:37
-#: src/protocols/msn/state.c:38 src/protocols/novell/novell.c:2715
-#: src/protocols/novell/novell.c:2834 src/protocols/novell/novell.c:2885
-#: src/protocols/oscar/oscar.c:611 src/protocols/yahoo/yahoo.c:2844
-#: src/protocols/yahoo/yahoo.c:2959
+#: src/protocols/msn/state.c:38 src/protocols/novell/novell.c:2721
+#: src/protocols/novell/novell.c:2840 src/protocols/novell/novell.c:2891
+#: src/protocols/oscar/oscar.c:616 src/protocols/yahoo/yahoo.c:2851
+#: src/protocols/yahoo/yahoo.c:2967
 msgid "Available"
 msgstr "Přítomen"
 
@@ -4543,12 +4582,12 @@
 msgid "Away for friends only"
 msgstr "Pryč jen pro přátele"
 
-#: src/protocols/gg/gg.c:53 src/protocols/jabber/jabber.c:963
-#: src/protocols/jabber/presence.c:126 src/protocols/oscar/oscar.c:532
-#: src/protocols/oscar/oscar.c:5378 src/protocols/oscar/oscar.c:5456
-#: src/protocols/oscar/oscar.c:5480 src/protocols/oscar/oscar.c:6667
-#: src/protocols/oscar/oscar.c:6672 src/protocols/yahoo/yahoo.c:2486
-#: src/protocols/yahoo/yahoo.c:2864 src/protocols/yahoo/yahoo.c:2969
+#: src/protocols/gg/gg.c:53 src/protocols/jabber/jabber.c:964
+#: src/protocols/jabber/presence.c:126 src/protocols/oscar/oscar.c:536
+#: src/protocols/oscar/oscar.c:5394 src/protocols/oscar/oscar.c:5472
+#: src/protocols/oscar/oscar.c:5496 src/protocols/oscar/oscar.c:6684
+#: src/protocols/oscar/oscar.c:6689 src/protocols/yahoo/yahoo.c:2509
+#: src/protocols/yahoo/yahoo.c:2871 src/protocols/yahoo/yahoo.c:2979
 msgid "Invisible"
 msgstr "Neviditelný"
 
@@ -4564,14 +4603,14 @@
 msgid "Unable to resolve hostname."
 msgstr "Nemohu nalézt jméno počítače."
 
-#: src/protocols/gg/gg.c:139 src/protocols/novell/novell.c:1664
+#: src/protocols/gg/gg.c:139 src/protocols/novell/novell.c:1665
 msgid "Unable to connect to server."
 msgstr "Nemohu se připojit k serveru."
 
 #: src/protocols/gg/gg.c:142 src/protocols/jabber/auth.c:130
 #: src/protocols/jabber/auth.c:204 src/protocols/jabber/auth.c:354
 #: src/protocols/jabber/auth.c:452 src/protocols/jabber/auth.c:464
-#: src/protocols/jabber/jabber.c:105
+#: src/protocols/jabber/jabber.c:106
 msgid "Invalid response from server."
 msgstr "Neplatná odpověď od serveru."
 
@@ -4591,175 +4630,177 @@
 msgid "Unknown Error Code."
 msgstr "Neznámý kód chyby."
 
-#: src/protocols/gg/gg.c:253
+#: src/protocols/gg/gg.c:242 src/protocols/oscar/oscar.c:3819
+#, c-format
+msgid "<B>UIN:</B> %s<BR><B>Status:</B> %s<HR>%s"
+msgstr "<B>UIN:</B> %s<BR><B>Stav:</B> %s<HR>%s"
+
+#. res[0] == username
+#: src/protocols/gg/gg.c:243 src/protocols/gg/gg.c:1011
+#: src/protocols/napster/napster.c:393 src/protocols/oscar/oscar.c:3823
+#: src/protocols/oscar/oscar.c:4039 src/protocols/silc/ops.c:1067
+#: src/protocols/silc/ops.c:1128 src/protocols/toc/toc.c:468
+#: src/protocols/zephyr/zephyr.c:635
+msgid "Buddy Information"
+msgstr "Informace o kamarádovi"
+
+#: src/protocols/gg/gg.c:293
 #, c-format
 msgid "Status: %s"
 msgstr "Stav: %s"
 
-#: src/protocols/gg/gg.c:406
+#: src/protocols/gg/gg.c:446
 msgid "Could not connect"
 msgstr "Nemohu se připojit"
 
-#: src/protocols/gg/gg.c:413
+#: src/protocols/gg/gg.c:453
 msgid "Unable to read socket"
 msgstr "Nemohu číst ze socketu"
 
 #. we didn't successfully connect. tdt->toc_fd is valid here
-#: src/protocols/gg/gg.c:600 src/protocols/icq/gaim_icq.c:344
+#: src/protocols/gg/gg.c:674 src/protocols/icq/gaim_icq.c:344
 #: src/protocols/napster/napster.c:475 src/protocols/napster/napster.c:506
-#: src/protocols/toc/toc.c:170 src/protocols/yahoo/yahoo.c:2124
-#: src/protocols/yahoo/yahoo.c:2155 src/protocols/yahoo/yahoo.c:2218
+#: src/protocols/toc/toc.c:170 src/protocols/yahoo/yahoo.c:2156
+#: src/protocols/yahoo/yahoo.c:2185 src/protocols/yahoo/yahoo.c:2248
 #: src/protocols/yahoo/yahoo_filexfer.c:68
 #: src/protocols/yahoo/yahoo_filexfer.c:109
 msgid "Unable to connect."
 msgstr "Nemohu se připojit."
 
-#: src/protocols/gg/gg.c:616
+#: src/protocols/gg/gg.c:690
 msgid "Reading data"
 msgstr "Čtu data"
 
-#: src/protocols/gg/gg.c:619
+#: src/protocols/gg/gg.c:693
 msgid "Balancer handshake"
 msgstr "Komunikace s balancerem"
 
-#: src/protocols/gg/gg.c:622
+#: src/protocols/gg/gg.c:696
 msgid "Reading server key"
 msgstr "Čtu na klíč serveru"
 
-#: src/protocols/gg/gg.c:625
+#: src/protocols/gg/gg.c:699
 msgid "Exchanging key hash"
 msgstr "Vyměňuji hash klíčů"
 
-#: src/protocols/gg/gg.c:635
+#: src/protocols/gg/gg.c:709
 msgid "Critical error in GG library\n"
 msgstr "Kritická chyba v knihovně GG\n"
 
-#: src/protocols/gg/gg.c:653 src/protocols/gg/gg.c:744
+#: src/protocols/gg/gg.c:727 src/protocols/gg/gg.c:818
 #: src/protocols/toc/toc.c:146
 #, c-format
 msgid "Connect to %s failed"
 msgstr "Spojení k %s selhalo"
 
-#: src/protocols/gg/gg.c:701
+#: src/protocols/gg/gg.c:775
 msgid "Unable to ping server"
 msgstr "Nemohu pingnout server"
 
-#: src/protocols/gg/gg.c:713
+#: src/protocols/gg/gg.c:787
 msgid "Send as message"
 msgstr "Odeslat jako zprávu"
 
-#: src/protocols/gg/gg.c:718
+#: src/protocols/gg/gg.c:792
 msgid "Looking up GG server"
 msgstr "Vyhledávám server GG"
 
-#: src/protocols/gg/gg.c:721
+#: src/protocols/gg/gg.c:795
 msgid "Invalid Gadu-Gadu UIN specified"
 msgstr "Zadáno neplatné UIN Gadu-Gadu"
 
-#: src/protocols/gg/gg.c:768
+#: src/protocols/gg/gg.c:842
 msgid "You are trying to send a message to an invalid Gadu-Gadu UIN."
 msgstr "Pokoušíte se odeslat zprávu na neplatné UIN Gadu-Gadu."
 
-#: src/protocols/gg/gg.c:835
+#: src/protocols/gg/gg.c:917
 msgid "Couldn't get search results"
 msgstr "Nemohu získat výsledky hledání"
 
-#: src/protocols/gg/gg.c:840
+#: src/protocols/gg/gg.c:922
 msgid "Gadu-Gadu Search Engine"
 msgstr "Vyhledávací stroj Gadu-Gadu"
 
-#: src/protocols/gg/gg.c:866
+#: src/protocols/gg/gg.c:948
 msgid "Active"
 msgstr "Aktivní"
 
-#: src/protocols/gg/gg.c:871 src/protocols/oscar/oscar.c:4829
+#: src/protocols/gg/gg.c:953 src/protocols/oscar/oscar.c:4845
 msgid "UIN"
 msgstr "UIN"
 
 #. First Name
-#: src/protocols/gg/gg.c:875 src/protocols/jabber/jabber.c:612
-#: src/protocols/oscar/oscar.c:4840 src/protocols/silc/ops.c:774
+#: src/protocols/gg/gg.c:957 src/protocols/jabber/jabber.c:613
+#: src/protocols/oscar/oscar.c:4856 src/protocols/silc/ops.c:790
 #: src/protocols/trepia/trepia.c:267
 msgid "First Name"
 msgstr "Křestní jméno"
 
 #. Last Name
-#: src/protocols/gg/gg.c:880 src/protocols/jabber/jabber.c:617
-#: src/protocols/oscar/oscar.c:4841 src/protocols/trepia/trepia.c:274
+#: src/protocols/gg/gg.c:962 src/protocols/jabber/jabber.c:618
+#: src/protocols/oscar/oscar.c:4857 src/protocols/trepia/trepia.c:274
 msgid "Last Name"
 msgstr "Příjmení"
 
-#: src/protocols/gg/gg.c:884 src/protocols/gg/gg.c:1623
-#: src/protocols/irc/msgs.c:183 src/protocols/oscar/oscar.c:4830
+#: src/protocols/gg/gg.c:966 src/protocols/gg/gg.c:1707
+#: src/protocols/irc/msgs.c:183 src/protocols/oscar/oscar.c:4846
+#: src/protocols/silc/ops.c:1184
 msgid "Nick"
 msgstr "Přezdívka"
 
-#: src/protocols/gg/gg.c:891 src/protocols/gg/gg.c:894
+#: src/protocols/gg/gg.c:973 src/protocols/gg/gg.c:976
 msgid "Birth Year"
 msgstr "Rok narození"
 
-#: src/protocols/gg/gg.c:900 src/protocols/gg/gg.c:902
-#: src/protocols/gg/gg.c:904
+#: src/protocols/gg/gg.c:982 src/protocols/gg/gg.c:984
+#: src/protocols/gg/gg.c:986
 msgid "Sex"
 msgstr "Pohlaví"
 
 #. City
-#: src/protocols/gg/gg.c:908 src/protocols/jabber/jabber.c:627
-#: src/protocols/oscar/oscar.c:4884 src/protocols/oscar/oscar.c:4892
+#: src/protocols/gg/gg.c:990 src/protocols/jabber/jabber.c:628
+#: src/protocols/oscar/oscar.c:4900 src/protocols/oscar/oscar.c:4908
 #: src/protocols/trepia/trepia.c:331 src/protocols/trepia/trepia.c:410
 msgid "City"
 msgstr "Město"
 
-#. res[0] == username
-#. show it to the user
-#: src/protocols/gg/gg.c:929 src/protocols/msn/msn.c:1225
-#: src/protocols/msn/msn.c:1533 src/protocols/msn/msn.c:1549
-#: src/protocols/napster/napster.c:393 src/protocols/oscar/oscar.c:3807
-#: src/protocols/oscar/oscar.c:4023 src/protocols/toc/toc.c:468
-#: src/protocols/yahoo/yahoo_profile.c:748
-#: src/protocols/yahoo/yahoo_profile.c:785
-#: src/protocols/yahoo/yahoo_profile.c:837
-#: src/protocols/yahoo/yahoo_profile.c:1132 src/protocols/zephyr/zephyr.c:610
-msgid "Buddy Information"
-msgstr "Informace o kamarádovi"
-
-#: src/protocols/gg/gg.c:951
+#: src/protocols/gg/gg.c:1033
 msgid "There is no Buddy List stored on the Gadu-Gadu server."
 msgstr "Na serveru Gadu-Gadu není uložen seznam kamarádů."
 
-#: src/protocols/gg/gg.c:959
+#: src/protocols/gg/gg.c:1041
 msgid "Couldn't Import Buddy List from Server"
 msgstr "Nemohu importovat seznam kamarádů ze serveru"
 
-#: src/protocols/gg/gg.c:1021
+#: src/protocols/gg/gg.c:1103
 msgid "Buddy List successfully transferred to Gadu-Gadu server"
 msgstr "Seznam kamarádů úspěšně přenesen na server Gadu-Gadu."
 
-#: src/protocols/gg/gg.c:1029
+#: src/protocols/gg/gg.c:1111
 msgid "Couldn't transfer Buddy List to Gadu-Gadu server"
 msgstr "Nemohu přenést seznam kamarádů na server Gadu-Gadu"
 
-#: src/protocols/gg/gg.c:1037
+#: src/protocols/gg/gg.c:1119
 msgid "Buddy List successfully deleted from Gadu-Gadu server"
 msgstr "Seznam kamarádů úspěšně odstraněn ze serveru Gadu-Gadu"
 
-#: src/protocols/gg/gg.c:1045
+#: src/protocols/gg/gg.c:1127
 msgid "Couldn't delete Buddy List from Gadu-Gadu server"
 msgstr "Nemohu odstranit seznam kamarádů ze serveru Gadu-Gadu"
 
-#: src/protocols/gg/gg.c:1054
+#: src/protocols/gg/gg.c:1136
 msgid "Password changed successfully"
 msgstr "Heslo úspěšně změněno"
 
-#: src/protocols/gg/gg.c:1061
+#: src/protocols/gg/gg.c:1143
 msgid "Password couldn't be changed"
 msgstr "Heslo nemohlo být změněno"
 
-#: src/protocols/gg/gg.c:1180
+#: src/protocols/gg/gg.c:1262
 msgid "Error communicating with Gadu-Gadu server"
 msgstr "Chyba při komunikaci se serverem Gadu-Gadu"
 
-#: src/protocols/gg/gg.c:1181
+#: src/protocols/gg/gg.c:1263
 msgid ""
 "Gaim was unable to complete your request due to a problem communicating with "
 "the Gadu-Gadu HTTP server.  Please try again later."
@@ -4767,11 +4808,11 @@
 "Gaim nemohl dokončit váš požadavek kvůli problému při komunikaci s HTTP "
 "serverem Gadu-Gadu. Zkuste to prosím později."
 
-#: src/protocols/gg/gg.c:1210
+#: src/protocols/gg/gg.c:1292
 msgid "Unable to import Gadu-Gadu buddy list"
 msgstr "Nemohu importovat seznam kamarádů Gadu-Gadu"
 
-#: src/protocols/gg/gg.c:1211
+#: src/protocols/gg/gg.c:1293
 msgid ""
 "Gaim was unable to connect to the Gadu-Gadu buddy list server.  Please try "
 "again later."
@@ -4779,25 +4820,25 @@
 "Gaim se nemohl připojit k serveru seznamu kamarádů Gadu-Gadu. Zkuste to "
 "prosím později."
 
-#: src/protocols/gg/gg.c:1284
+#: src/protocols/gg/gg.c:1366
 msgid "Couldn't export buddy list"
 msgstr "Nemohu exportovat seznam kamarádů"
 
-#: src/protocols/gg/gg.c:1285 src/protocols/gg/gg.c:1308
+#: src/protocols/gg/gg.c:1367 src/protocols/gg/gg.c:1390
 msgid ""
 "Gaim was unable to connect to the buddy list server.  Please try again later."
 msgstr ""
 "Gaim se nemohl připojit k serveru seznamu kamarádů. Zkuste to prosím později."
 
-#: src/protocols/gg/gg.c:1307
+#: src/protocols/gg/gg.c:1389
 msgid "Unable to delete Gadu-Gadu buddy list"
 msgstr "Nemohu odstranit seznam kamarádů Gadu-Gadu"
 
-#: src/protocols/gg/gg.c:1358
+#: src/protocols/gg/gg.c:1440
 msgid "Unable to access directory"
 msgstr "Nemůžu přistupovat k adresáři"
 
-#: src/protocols/gg/gg.c:1359
+#: src/protocols/gg/gg.c:1441
 msgid ""
 "Gaim was unable to search the Directory because it was unable to connect to "
 "the directory server.  Please try again later."
@@ -4805,11 +4846,11 @@
 "Gaim nemohl vyhledávat v adresáři, protože se nemohl připojit k serveru "
 "adresáře. Zkuste to prosím později."
 
-#: src/protocols/gg/gg.c:1393
+#: src/protocols/gg/gg.c:1475
 msgid "Unable to change Gadu-Gadu password"
 msgstr "Nemohu změnit heslo Gadu-Gadu"
 
-#: src/protocols/gg/gg.c:1394
+#: src/protocols/gg/gg.c:1476
 msgid ""
 "Gaim was unable to change your password due to an error connecting to the "
 "Gadu-Gadu server.  Please try again later."
@@ -4817,33 +4858,33 @@
 "Gaim nemohl změnit vaše heslo kvůli chybě při komunikaci se serverem Gadu-"
 "Gadu. Zkuste to prosím později."
 
-#: src/protocols/gg/gg.c:1410
+#: src/protocols/gg/gg.c:1492
 msgid "Directory Search"
 msgstr "Hledání v adresáři"
 
 #. if (js->protocol_options & CHANGE_PASSWORD) {
-#: src/protocols/gg/gg.c:1415 src/protocols/jabber/jabber.c:1061
+#: src/protocols/gg/gg.c:1497 src/protocols/jabber/jabber.c:1062
 #: src/protocols/toc/toc.c:1550
 msgid "Change Password"
 msgstr "Změnit heslo"
 
-#: src/protocols/gg/gg.c:1419
+#: src/protocols/gg/gg.c:1501
 msgid "Import Buddy List from Server"
 msgstr "Importovat seznam kamarádů ze serveru"
 
-#: src/protocols/gg/gg.c:1423
+#: src/protocols/gg/gg.c:1505
 msgid "Export Buddy List to Server"
 msgstr "Exportovat seznam kamarádů na serveru"
 
-#: src/protocols/gg/gg.c:1427
+#: src/protocols/gg/gg.c:1509
 msgid "Delete Buddy List from Server"
 msgstr "Odstranit seznam kamarádů ze serveru"
 
-#: src/protocols/gg/gg.c:1460
+#: src/protocols/gg/gg.c:1542
 msgid "Unable to access user profile."
 msgstr "Nemohu přistupovat k profilu uživatele."
 
-#: src/protocols/gg/gg.c:1461
+#: src/protocols/gg/gg.c:1543
 msgid ""
 "Gaim was unable to access this user's profile due to an error connecting to "
 "the directory server.  Please try again later."
@@ -4862,7 +4903,7 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/gg/gg.c:1602 src/protocols/gg/gg.c:1604
+#: src/protocols/gg/gg.c:1686 src/protocols/gg/gg.c:1688
 msgid "Gadu-Gadu Protocol Plugin"
 msgstr "Zásuvný modul protokolu Gadu-Gadu"
 
@@ -4876,14 +4917,14 @@
 msgstr "Uživatel %s (%s%s%s%s%s) chce, abyste je autorizovali."
 
 #: src/protocols/icq/gaim_icq.c:297 src/protocols/jabber/presence.c:232
-#: src/protocols/msn/userlist.c:100 src/protocols/oscar/oscar.c:3538
-#: src/protocols/oscar/oscar.c:6100
+#: src/protocols/msn/userlist.c:100 src/protocols/oscar/oscar.c:3554
+#: src/protocols/oscar/oscar.c:6117
 msgid "Authorize"
 msgstr "Autorizovat"
 
 #: src/protocols/icq/gaim_icq.c:297 src/protocols/jabber/presence.c:233
-#: src/protocols/msn/userlist.c:101 src/protocols/oscar/oscar.c:3540
-#: src/protocols/oscar/oscar.c:6101
+#: src/protocols/msn/userlist.c:101 src/protocols/oscar/oscar.c:3556
+#: src/protocols/oscar/oscar.c:6118
 msgid "Deny"
 msgstr "Zamítnout"
 
@@ -4903,17 +4944,19 @@
 msgid "Gaim User"
 msgstr "Uživatel Gaim"
 
-#: src/protocols/irc/cmds.c:43
+#: src/protocols/irc/cmds.c:43 src/protocols/silc/silc.c:1286
 #, c-format
 msgid "Unknown command: %s"
 msgstr "Neznámý příkaz: %s"
 
-#: src/protocols/irc/cmds.c:444 src/protocols/jabber/chat.c:544
+#: src/protocols/irc/cmds.c:448 src/protocols/jabber/chat.c:544
+#: src/protocols/silc/silc.c:995
 #, c-format
 msgid "current topic is: %s"
 msgstr "aktuální téma je: %s"
 
-#: src/protocols/irc/cmds.c:447 src/protocols/jabber/chat.c:546
+#: src/protocols/irc/cmds.c:451 src/protocols/jabber/chat.c:546
+#: src/protocols/silc/silc.c:998
 msgid "No topic is set"
 msgstr "Nenastaveno žádné téma"
 
@@ -4945,54 +4988,51 @@
 msgid "MOTD for %s"
 msgstr "MOTD pro %s"
 
-#: src/protocols/irc/irc.c:141
+#: src/protocols/irc/irc.c:93 src/protocols/irc/irc.c:373
+msgid "Server has disconnected"
+msgstr "Server se odpojil"
+
+#: src/protocols/irc/irc.c:147
 msgid "View MOTD"
 msgstr "Zobrazit MOTD"
 
-#. FIXME: remove this when the ui does it for us.
-#: src/protocols/irc/irc.c:168 src/protocols/jabber/buddy.c:929
-#: src/protocols/msn/msn.c:543 src/protocols/oscar/oscar.c:448
-#: src/protocols/oscar/oscar.c:6771 src/protocols/yahoo/yahoo.c:2691
-msgid "Send File"
-msgstr "Odeslat soubor"
-
-#: src/protocols/irc/irc.c:182 src/protocols/silc/chat.c:32
+#: src/protocols/irc/irc.c:169 src/protocols/silc/chat.c:32
 msgid "_Channel:"
 msgstr "_Kanál:"
 
-#: src/protocols/irc/irc.c:187 src/protocols/jabber/chat.c:59
+#: src/protocols/irc/irc.c:174 src/protocols/jabber/chat.c:59
 msgid "_Password:"
 msgstr "_Heslo:"
 
-#: src/protocols/irc/irc.c:207
+#: src/protocols/irc/irc.c:194
 msgid "IRC nicks may not contain whitespace"
 msgstr "Přezdívky IRC nemohou obsahovat mezery"
 
-#: src/protocols/irc/irc.c:226 src/protocols/toc/toc.c:198
+#: src/protocols/irc/irc.c:213 src/protocols/toc/toc.c:198
 #, c-format
 msgid "Signon: %s"
 msgstr "Přihlásit: %s"
 
-#: src/protocols/irc/irc.c:235
+#: src/protocols/irc/irc.c:222
 msgid "Couldn't create socket"
 msgstr "Nemohu vytvořit socket"
 
-#: src/protocols/irc/irc.c:250 src/protocols/jabber/jabber.c:296
-#: src/protocols/oscar/oscar.c:1523 src/protocols/oscar/oscar.c:1587
+#: src/protocols/irc/irc.c:237 src/protocols/jabber/jabber.c:297
+#: src/protocols/oscar/oscar.c:1529 src/protocols/oscar/oscar.c:1593
 msgid "Couldn't connect to host"
 msgstr "Nemohu se připojit k hostiteli"
 
-#: src/protocols/irc/irc.c:387 src/protocols/trepia/trepia.c:926
+#: src/protocols/irc/irc.c:370 src/protocols/trepia/trepia.c:926
 msgid "Read error"
 msgstr "Chyba čtení"
 
-#: src/protocols/irc/irc.c:538 src/protocols/silc/chat.c:1343
-#: src/protocols/yahoo/yahoochat.c:1341
+#: src/protocols/irc/irc.c:521 src/protocols/silc/chat.c:1363
+#: src/protocols/yahoo/yahoochat.c:1380
 msgid "Users"
 msgstr "Uživatelé"
 
-#: src/protocols/irc/irc.c:541 src/protocols/silc/chat.c:1346
-#: src/protocols/silc/ops.c:1017 src/protocols/yahoo/yahoochat.c:1350
+#: src/protocols/irc/irc.c:524 src/protocols/silc/chat.c:1366
+#: src/protocols/silc/ops.c:1146 src/protocols/yahoo/yahoochat.c:1389
 msgid "Topic"
 msgstr "Téma"
 
@@ -5005,34 +5045,35 @@
 #. *< id
 #. *< name
 #. *< version
-#: src/protocols/irc/irc.c:643
+#: src/protocols/irc/irc.c:628
 msgid "IRC Protocol Plugin"
 msgstr "Zásuvný modul protokolu IRC"
 
 #. *  summary
-#: src/protocols/irc/irc.c:644
+#: src/protocols/irc/irc.c:629
 msgid "The IRC Protocol Plugin that Sucks Less"
 msgstr "Zásuvný modul protokolu IRC, který není tak špatný"
 
-#: src/protocols/irc/irc.c:663 src/protocols/irc/msgs.c:197
-#: src/protocols/jabber/jabber.c:1556 src/protocols/napster/napster.c:642
-#: src/protocols/silc/ops.c:935
+#: src/protocols/irc/irc.c:648 src/protocols/irc/msgs.c:197
+#: src/protocols/jabber/jabber.c:1559 src/protocols/napster/napster.c:644
+#: src/protocols/silc/ops.c:1008 src/protocols/silc/ops.c:1110
 msgid "Server"
 msgstr "Server"
 
-#: src/protocols/irc/irc.c:666 src/protocols/jabber/jabber.c:1577
-#: src/protocols/msn/msn.c:1729 src/protocols/napster/napster.c:647
-#: src/protocols/silc/silc.c:1363 src/protocols/trepia/trepia.c:1295
+#: src/protocols/irc/irc.c:651 src/protocols/jabber/jabber.c:1580
+#: src/protocols/msn/msn.c:1758 src/protocols/napster/napster.c:649
+#: src/protocols/silc/silc.c:1576 src/protocols/trepia/trepia.c:1297
 msgid "Port"
 msgstr "Port"
 
-#: src/protocols/irc/irc.c:669 src/protocols/zephyr/zephyr.c:1442
+#: src/protocols/irc/irc.c:654 src/protocols/zephyr/zephyr.c:1915
 msgid "Encoding"
 msgstr "Kódování"
 
-#: src/protocols/irc/irc.c:672 src/protocols/irc/msgs.c:191
-#: src/protocols/jabber/jabber.c:587 src/protocols/silc/buddy.c:1449
-#: src/protocols/silc/ops.c:931
+#: src/protocols/irc/irc.c:657 src/protocols/irc/msgs.c:191
+#: src/protocols/jabber/jabber.c:588 src/protocols/silc/buddy.c:1445
+#: src/protocols/silc/ops.c:955 src/protocols/silc/ops.c:957
+#: src/protocols/silc/ops.c:1104 src/protocols/silc/ops.c:1106
 msgid "Username"
 msgstr "Jméno uživatele"
 
@@ -5057,12 +5098,12 @@
 msgid " <i>(identified)</i>"
 msgstr " <i>(identifikován)</i>"
 
-#: src/protocols/irc/msgs.c:192 src/protocols/silc/ops.c:929
-#: src/protocols/yahoo/yahoo_profile.c:1000
+#: src/protocols/irc/msgs.c:192 src/protocols/silc/ops.c:949
+#: src/protocols/silc/ops.c:1098 src/protocols/yahoo/yahoo_profile.c:1005
 msgid "Realname"
 msgstr "Skutečné jméno"
 
-#: src/protocols/irc/msgs.c:202
+#: src/protocols/irc/msgs.c:202 src/protocols/silc/ops.c:1021
 msgid "Currently on"
 msgstr "Momentálně na"
 
@@ -5084,111 +5125,111 @@
 msgid "Buddy Information for %s"
 msgstr "Informace o kamarádovi %s"
 
-#: src/protocols/irc/msgs.c:278
+#: src/protocols/irc/msgs.c:279
 #, c-format
 msgid "%s has changed the topic to: %s"
 msgstr "%s změnil téma na: %s"
 
-#: src/protocols/irc/msgs.c:283
+#: src/protocols/irc/msgs.c:284
 #, c-format
 msgid "The topic for %s is: %s"
 msgstr "Téma pro %s je: %s"
 
-#: src/protocols/irc/msgs.c:299
+#: src/protocols/irc/msgs.c:301
 #, c-format
 msgid "Unknown message '%s'"
 msgstr "Neznámá zpráva '%s'"
 
-#: src/protocols/irc/msgs.c:300
+#: src/protocols/irc/msgs.c:302
 msgid "Unknown message"
 msgstr "Neznámá zpráva"
 
-#: src/protocols/irc/msgs.c:300
+#: src/protocols/irc/msgs.c:302
 msgid "Gaim has sent a message the IRC server did not understand."
 msgstr "Gaim odeslal zprávu, které IRC server nerozumněl."
 
-#: src/protocols/irc/msgs.c:323
+#: src/protocols/irc/msgs.c:325
 #, c-format
 msgid "Users on %s: %s"
 msgstr "Uživatelé na %s: %s"
 
-#: src/protocols/irc/msgs.c:405
+#: src/protocols/irc/msgs.c:407
 msgid "No such channel"
 msgstr "Takový kanál neexistuje"
 
 #. does this happen?
-#: src/protocols/irc/msgs.c:416
+#: src/protocols/irc/msgs.c:418
 msgid "no such channel"
 msgstr "Takový kanál neexistuje"
 
-#: src/protocols/irc/msgs.c:419
+#: src/protocols/irc/msgs.c:421
 msgid "User is not logged in"
 msgstr "Uživatel není přihlášen"
 
-#: src/protocols/irc/msgs.c:424
+#: src/protocols/irc/msgs.c:426
 msgid "No such nick or channel"
 msgstr "Taková přezdívka nebo kanál neexistuje"
 
-#: src/protocols/irc/msgs.c:444
+#: src/protocols/irc/msgs.c:446
 msgid "Could not send"
 msgstr "Nemohu odeslat"
 
-#: src/protocols/irc/msgs.c:500
+#: src/protocols/irc/msgs.c:502
 #, c-format
 msgid "Joining %s requires an invitation."
 msgstr "Připojení se k %s vyžaduje pozvání."
 
-#: src/protocols/irc/msgs.c:501
+#: src/protocols/irc/msgs.c:503
 msgid "Invitation only"
 msgstr "Jen pro pozvané"
 
-#: src/protocols/irc/msgs.c:604
+#: src/protocols/irc/msgs.c:606
 #, c-format
 msgid "You have been kicked by %s: (%s)"
 msgstr "Byli jste vykopnuti z %s: (%s)"
 
-#: src/protocols/irc/msgs.c:609
+#: src/protocols/irc/msgs.c:611
 #, c-format
 msgid "Kicked by %s (%s)"
 msgstr "Vykopnut od %s: (%s)"
 
-#: src/protocols/irc/msgs.c:630
+#: src/protocols/irc/msgs.c:632
 #, c-format
 msgid "mode (%s %s) by %s"
 msgstr "režim (%s %s) od %s"
 
-#: src/protocols/irc/msgs.c:709
+#: src/protocols/irc/msgs.c:711
 msgid "Could not change nick"
 msgstr "Nemohu změnit přezdívku"
 
-#: src/protocols/irc/msgs.c:710
+#: src/protocols/irc/msgs.c:712
 msgid "Cannot change nick"
 msgstr "Nemohu změnit přezdívku"
 
-#: src/protocols/irc/msgs.c:731
+#: src/protocols/irc/msgs.c:733
 #, c-format
 msgid "You have parted the channel%s%s"
 msgstr "Opustili jste kanál%s%s"
 
-#: src/protocols/irc/msgs.c:771
+#: src/protocols/irc/msgs.c:773
 msgid "Error: invalid PONG from server"
 msgstr "Chyba: neplatný PONG od serveru"
 
-#: src/protocols/irc/msgs.c:773
+#: src/protocols/irc/msgs.c:775
 #, c-format
 msgid "PING reply -- Lag: %lu seconds"
 msgstr "Odpověď na PING -- zpoždění: %lu sekund"
 
-#: src/protocols/irc/msgs.c:848
+#: src/protocols/irc/msgs.c:850
 #, c-format
 msgid "Cannot join %s:"
 msgstr "Nemohu se připojit k %s:"
 
-#: src/protocols/irc/msgs.c:849 src/protocols/silc/ops.c:878
+#: src/protocols/irc/msgs.c:851 src/protocols/silc/ops.c:894
 msgid "Cannot join channel"
 msgstr "Nemohu se připojit ke kanálu"
 
-#: src/protocols/irc/msgs.c:885
+#: src/protocols/irc/msgs.c:887
 #, c-format
 msgid "Wallops from %s"
 msgstr "Wallops od %s"
@@ -5201,50 +5242,69 @@
 msgid ""
 "away [message]:  Set an away message, or use no message to return from being "
 "away."
-msgstr "away [zpráva]: Nastavit zprávu o nepřítomnosti, nebo nepoužijte žádnou zprávu pro návrat z nepřítomnosti."
+msgstr ""
+"away [zpráva]: Nastavit zprávu o nepřítomnosti, nebo nepoužijte žádnou "
+"zprávu pro návrat z nepřítomnosti."
 
 #: src/protocols/irc/parse.c:111
 msgid ""
 "deop &lt;nick1&gt; [nick2] ...:  Remove channel operator status from "
 "someone. You must be a channel operator to do this."
-msgstr "deop &lt;přezd1&gt; [přezd2] ...:  Odejmout někomu stav operátora kanálu. Abyste to mohli udělat, musíte být operátor kanálu."
+msgstr ""
+"deop &lt;přezd1&gt; [přezd2] ...:  Odejmout někomu stav operátora kanálu. "
+"Abyste to mohli udělat, musíte být operátor kanálu."
 
 #: src/protocols/irc/parse.c:112
 msgid ""
 "devoice &lt;nick1&gt; [nick2] ...:  Remove channel voice status from "
 "someone, preventing them from speaking if the channel is moderated (+m). You "
 "must be a channel operator to do this."
-msgstr "devoice &lt;přezd1&gt; [přezd2] ...: Odejmout někomu stav hlasu v kanálu, což mu brání mluvit, pokud je kanál moderován (+m). Abyste to mohli udělat, musíte být operátor kanálu."
+msgstr ""
+"devoice &lt;přezd1&gt; [přezd2] ...: Odejmout někomu stav hlasu v kanálu, "
+"což mu brání mluvit, pokud je kanál moderován (+m). Abyste to mohli udělat, "
+"musíte být operátor kanálu."
 
 #: src/protocols/irc/parse.c:113
 msgid ""
 "invite &lt;nick&gt; [room]:  Invite someone to join you in the specified "
 "channel, or the current channel."
-msgstr "invite &lt;přezd&gt; [místnost]: Pozvat někoho, aby se k vám přidal v určeném nebo aktuálním kanálu."
+msgstr ""
+"invite &lt;přezd&gt; [místnost]: Pozvat někoho, aby se k vám přidal v "
+"určeném nebo aktuálním kanálu."
 
 #: src/protocols/irc/parse.c:114
 msgid ""
 "j &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  Enter one or more "
 "channels, optionally providing a channel key for each if needed."
-msgstr "j &lt;místnost1&gt;[,místnost1][,...] [klíč1[,klíč2][,...]]: Vstoupit do jednoho nebo více kanálů, nepovinně s poskytnutím klíče kanálu, je-li to vyžadováno."
+msgstr ""
+"j &lt;místnost1&gt;[,místnost1][,...] [klíč1[,klíč2][,...]]: Vstoupit do "
+"jednoho nebo více kanálů, nepovinně s poskytnutím klíče kanálu, je-li to "
+"vyžadováno."
 
 #: src/protocols/irc/parse.c:115
 msgid ""
 "join &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  Enter one or more "
 "channels, optionally providing a channel key for each if needed."
-msgstr "join &lt;místnost1&gt;[,místnost1][,...] [klíč1[,klíč2][,...]]: Vstoupit do jednoho nebo více kanálů, nepovinně s poskytnutím klíče kanálu, je-li to vyžadováno."
+msgstr ""
+"join &lt;místnost1&gt;[,místnost1][,...] [klíč1[,klíč2][,...]]: Vstoupit do "
+"jednoho nebo více kanálů, nepovinně s poskytnutím klíče kanálu, je-li to "
+"vyžadováno."
 
 #: src/protocols/irc/parse.c:116
 msgid ""
 "kick &lt;nick&gt; [message]:  Remove someone from a channel. You must be a "
 "channel operator to do this."
-msgstr "kick &lt;přezdívka&gt; [zpráva]: Odstranit někoho z kanálu. Abyste to mohli udělat, musíte být operátor kanálu."
+msgstr ""
+"kick &lt;přezdívka&gt; [zpráva]: Odstranit někoho z kanálu. Abyste to mohli "
+"udělat, musíte být operátor kanálu."
 
 #: src/protocols/irc/parse.c:117
 msgid ""
 "list:  Display a list of chat rooms on the network. <i>Warning, some servers "
 "may disconnect you upon doing this.</i>"
-msgstr "list: Zobrazit seznam místností chatu na síti. <i>Varování, některé servery vás za to mohou odpojit.</i>"
+msgstr ""
+"list: Zobrazit seznam místností chatu na síti. <i>Varování, některé servery "
+"vás za to mohou odpojit.</i>"
 
 #: src/protocols/irc/parse.c:118
 msgid "me &lt;action to perform&gt;:  Perform an action."
@@ -5254,19 +5314,23 @@
 msgid ""
 "mode &lt;nick|channel&gt; &lt;+|-&gt;&lt;A-Za-z&gt;:  Set or unset a channel "
 "or user mode."
-msgstr "mode &lt;přezdívka|kanál&gt; &lt;+|-&gt;&lt;A-Za-z&gt;: Nastavit nebo zrušit řežim kanálu nebo uživatele."
+msgstr ""
+"mode &lt;přezdívka|kanál&gt; &lt;+|-&gt;&lt;A-Za-z&gt;: Nastavit nebo zrušit "
+"řežim kanálu nebo uživatele."
 
 #: src/protocols/irc/parse.c:120
 msgid ""
 "msg &lt;nick&gt; &lt;message&gt;:  Send a private message to a user (as "
 "opposed to a channel)."
-msgstr "msg &lt;přezdívka&gt; &lt;zpráva&gt;: Poslat soukromou zprávu uživateli (ne kanálu)."
+msgstr ""
+"msg &lt;přezdívka&gt; &lt;zpráva&gt;: Poslat soukromou zprávu uživateli (ne "
+"kanálu)."
 
 #: src/protocols/irc/parse.c:121
 msgid "names [channel]:  List the users currently in a channel."
 msgstr "names [kanál]: Vypsat uživatele momentálně v kanálu."
 
-#: src/protocols/irc/parse.c:122 src/protocols/jabber/jabber.c:1406
+#: src/protocols/irc/parse.c:122 src/protocols/jabber/jabber.c:1407
 msgid "nick &lt;new nickname&gt;:  Change your nickname."
 msgstr "nick &lt;nová přezdívka&gt;: Změnit vaši přezdívku."
 
@@ -5274,31 +5338,41 @@
 msgid ""
 "op &lt;nick1&gt; [nick2] ...:  Grant channel operator status to someone. You "
 "must be a channel operator to do this."
-msgstr "op &lt;přezd1&gt; [přezd2] ...: Udělit někomu stav operátora kanálu. Abyste to mohli udělat, musíte být operátor kanálu."
+msgstr ""
+"op &lt;přezd1&gt; [přezd2] ...: Udělit někomu stav operátora kanálu. Abyste "
+"to mohli udělat, musíte být operátor kanálu."
 
 #: src/protocols/irc/parse.c:124
 msgid ""
 "operwall &lt;message&gt;:  If you don't know what this is, you probably "
 "can't use it."
-msgstr "operwall &lt;zpráva&gt;: Pokud nevíte, co to je, pravděpodobně to nemůžete použít."
+msgstr ""
+"operwall &lt;zpráva&gt;: Pokud nevíte, co to je, pravděpodobně to nemůžete "
+"použít."
 
 #: src/protocols/irc/parse.c:125
 msgid ""
 "part [room] [message]:  Leave the current channel, or a specified channel, "
 "with an optional message."
-msgstr "part [místnost] [zpráva]: Opustit aktuální nebo určený kanál s nepovinnou zprávou."
+msgstr ""
+"part [místnost] [zpráva]: Opustit aktuální nebo určený kanál s nepovinnou "
+"zprávou."
 
 #: src/protocols/irc/parse.c:126
 msgid ""
 "ping [nick]:  Asks how much lag a user (or the server if no user specified) "
 "has."
-msgstr "ping [přezdívka]: Zjišťuje, jaké zpoždění má uživatel (nebo server, pokud není určen uživatel)."
+msgstr ""
+"ping [přezdívka]: Zjišťuje, jaké zpoždění má uživatel (nebo server, pokud "
+"není určen uživatel)."
 
 #: src/protocols/irc/parse.c:127
 msgid ""
 "query &lt;nick&gt; &lt;message&gt;:  Send a private message to a user (as "
 "opposed to a channel)."
-msgstr "query &lt;přezdívka&gt; &lt;zpráva&gt;: Odeslat soukromou zprávu uživateli (ne kanálu)."
+msgstr ""
+"query &lt;přezdívka&gt; &lt;zpráva&gt;: Odeslat soukromou zprávu uživateli "
+"(ne kanálu)."
 
 #: src/protocols/irc/parse.c:128
 msgid "quit [message]:  Disconnect from the server, with an optional message."
@@ -5312,7 +5386,9 @@
 msgid ""
 "remove &lt;nick&gt; [message]:  Remove someone from a room. You must be a "
 "channel operator to do this."
-msgstr "remove &lt;přezdívka&gt; [zpráva]: Odstranit někoho z místnosti. Abyste to mohli udělat, musíte být operátor kanálu."
+msgstr ""
+"remove &lt;přezdívka&gt; [zpráva]: Odstranit někoho z místnosti. Abyste to "
+"mohli udělat, musíte být operátor kanálu."
 
 #: src/protocols/irc/parse.c:131
 msgid "topic [new topic]:  View or change the channel topic."
@@ -5326,19 +5402,23 @@
 msgid ""
 "voice &lt;nick1&gt; [nick2] ...:  Grant channel voice status to someone. You "
 "must be a channel operator to do this."
-msgstr "voice &lt;přezd1&gt; [přezd2] ...: Udělit někomu stav hlasu v kanálu. Abyste to mohli udělat, musíte být operátor kanálu."
+msgstr ""
+"voice &lt;přezd1&gt; [přezd2] ...: Udělit někomu stav hlasu v kanálu. Abyste "
+"to mohli udělat, musíte být operátor kanálu."
 
 #: src/protocols/irc/parse.c:134
 msgid ""
 "wallops &lt;message&gt;:  If you don't know what this is, you probably can't "
 "use it."
-msgstr "wallops &lt;zpráva&gt;: Pokud nevíte, co to je, pravděpodobně to nemůžete použít."
+msgstr ""
+"wallops &lt;zpráva&gt;: Pokud nevíte, co to je, pravděpodobně to nemůžete "
+"použít."
 
 #: src/protocols/irc/parse.c:135
 msgid "whois &lt;nick&gt;:  Get information on a user."
 msgstr "whois &lt;přezdívka&gt;: Ziskat informace o uživateli."
 
-#: src/protocols/irc/parse.c:228 src/protocols/zephyr/zephyr.c:236
+#: src/protocols/irc/parse.c:228 src/protocols/zephyr/zephyr.c:256
 msgid ""
 "(There was an error converting this message.  Check the 'Encoding' option in "
 "the Account Editor)"
@@ -5359,7 +5439,7 @@
 msgid "CTCP PING reply"
 msgstr "Odpověď na CTCP PING"
 
-#: src/protocols/irc/parse.c:485 src/protocols/oscar/oscar.c:1424
+#: src/protocols/irc/parse.c:485 src/protocols/oscar/oscar.c:1430
 #: src/protocols/toc/toc.c:188 src/protocols/toc/toc.c:596
 #: src/protocols/toc/toc.c:612 src/protocols/toc/toc.c:689
 msgid "Disconnected."
@@ -5394,169 +5474,170 @@
 msgid "Invalid challenge from server"
 msgstr "Neplatná výzva od serveru"
 
-#: src/protocols/jabber/buddy.c:247 src/protocols/jabber/buddy.c:605
-#: src/protocols/silc/ops.c:770
+#: src/protocols/jabber/buddy.c:246 src/protocols/jabber/buddy.c:604
+#: src/protocols/silc/ops.c:786
 msgid "Full Name"
 msgstr "Celé jméno"
 
-#: src/protocols/jabber/buddy.c:248 src/protocols/jabber/buddy.c:618
-#: src/protocols/silc/ops.c:782
+#: src/protocols/jabber/buddy.c:247 src/protocols/jabber/buddy.c:617
+#: src/protocols/silc/ops.c:798
 msgid "Family Name"
 msgstr "Příjmení"
 
-#: src/protocols/jabber/buddy.c:249 src/protocols/jabber/buddy.c:622
+#: src/protocols/jabber/buddy.c:248 src/protocols/jabber/buddy.c:621
 msgid "Given Name"
 msgstr "Křestní jméno"
 
-#: src/protocols/jabber/buddy.c:250 src/protocols/jabber/buddy.c:636
-#: src/protocols/jabber/jabber.c:607 src/protocols/msn/msn.c:1150
-#: src/protocols/silc/buddy.c:1446 src/protocols/silc/ops.c:786
-#: src/protocols/silc/ops.c:927 src/protocols/yahoo/yahoo_profile.c:995
+#: src/protocols/jabber/buddy.c:249 src/protocols/jabber/buddy.c:635
+#: src/protocols/jabber/jabber.c:608 src/protocols/msn/msn.c:1172
+#: src/protocols/silc/buddy.c:1442 src/protocols/silc/ops.c:802
+#: src/protocols/silc/ops.c:945 src/protocols/silc/ops.c:1094
+#: src/protocols/yahoo/yahoo_profile.c:1000
 msgid "Nickname"
 msgstr "Přezdívka"
 
-#: src/protocols/jabber/buddy.c:251 src/protocols/jabber/jabber.c:647
+#: src/protocols/jabber/buddy.c:250 src/protocols/jabber/jabber.c:648
 msgid "URL"
 msgstr "URL"
 
-#: src/protocols/jabber/buddy.c:252 src/protocols/jabber/buddy.c:664
+#: src/protocols/jabber/buddy.c:251 src/protocols/jabber/buddy.c:663
 msgid "Street Address"
 msgstr "Adresa ulice"
 
-#: src/protocols/jabber/buddy.c:253 src/protocols/jabber/buddy.c:660
+#: src/protocols/jabber/buddy.c:252 src/protocols/jabber/buddy.c:659
 msgid "Extended Address"
 msgstr "Rozšířená adresa"
 
-#: src/protocols/jabber/buddy.c:254 src/protocols/jabber/buddy.c:668
+#: src/protocols/jabber/buddy.c:253 src/protocols/jabber/buddy.c:667
 msgid "Locality"
 msgstr "Lokalita"
 
-#: src/protocols/jabber/buddy.c:255 src/protocols/jabber/buddy.c:672
+#: src/protocols/jabber/buddy.c:254 src/protocols/jabber/buddy.c:671
 msgid "Region"
 msgstr "Region"
 
-#: src/protocols/jabber/buddy.c:256 src/protocols/jabber/buddy.c:676
-#: src/protocols/jabber/jabber.c:637
+#: src/protocols/jabber/buddy.c:255 src/protocols/jabber/buddy.c:675
+#: src/protocols/jabber/jabber.c:638
 msgid "Postal Code"
 msgstr "PSČ"
 
 #. Country
-#: src/protocols/jabber/buddy.c:257 src/protocols/jabber/buddy.c:681
+#: src/protocols/jabber/buddy.c:256 src/protocols/jabber/buddy.c:680
 #: src/protocols/trepia/trepia.c:339 src/protocols/trepia/trepia.c:416
 msgid "Country"
 msgstr "Země"
 
-#: src/protocols/jabber/buddy.c:258 src/protocols/jabber/buddy.c:692
-#: src/protocols/jabber/buddy.c:699
+#: src/protocols/jabber/buddy.c:257 src/protocols/jabber/buddy.c:691
+#: src/protocols/jabber/buddy.c:698
 msgid "Telephone"
 msgstr "Telefon"
 
-#: src/protocols/jabber/buddy.c:259 src/protocols/jabber/buddy.c:710
-#: src/protocols/jabber/buddy.c:718 src/protocols/silc/buddy.c:1499
-#: src/protocols/silc/silc.c:633 src/protocols/yahoo/yahoo_profile.c:990
+#: src/protocols/jabber/buddy.c:258 src/protocols/jabber/buddy.c:709
+#: src/protocols/jabber/buddy.c:717 src/protocols/silc/silc.c:637
+#: src/protocols/silc/util.c:508 src/protocols/yahoo/yahoo_profile.c:995
 msgid "Email"
 msgstr "Email"
 
-#: src/protocols/jabber/buddy.c:260 src/protocols/jabber/buddy.c:733
+#: src/protocols/jabber/buddy.c:259 src/protocols/jabber/buddy.c:732
 msgid "Organization Name"
 msgstr "Název organizace"
 
-#: src/protocols/jabber/buddy.c:261 src/protocols/jabber/buddy.c:737
+#: src/protocols/jabber/buddy.c:260 src/protocols/jabber/buddy.c:736
 msgid "Organization Unit"
 msgstr "Jednotka organizace"
 
-#: src/protocols/jabber/buddy.c:262 src/protocols/jabber/buddy.c:743
+#: src/protocols/jabber/buddy.c:261 src/protocols/jabber/buddy.c:742
 msgid "Title"
 msgstr "Titul"
 
-#: src/protocols/jabber/buddy.c:263 src/protocols/jabber/buddy.c:746
+#: src/protocols/jabber/buddy.c:262 src/protocols/jabber/buddy.c:745
 msgid "Role"
 msgstr "Role"
 
-#: src/protocols/jabber/buddy.c:264 src/protocols/jabber/buddy.c:639
-#: src/protocols/oscar/oscar.c:4865
+#: src/protocols/jabber/buddy.c:263 src/protocols/jabber/buddy.c:638
+#: src/protocols/oscar/oscar.c:4881
 msgid "Birthday"
 msgstr "Datum narození"
 
-#: src/protocols/jabber/buddy.c:510 src/protocols/jabber/buddy.c:511
+#: src/protocols/jabber/buddy.c:509 src/protocols/jabber/buddy.c:510
 msgid "Edit Jabber vCard"
 msgstr "Upravit vCard Jabberu"
 
-#: src/protocols/jabber/buddy.c:512
+#: src/protocols/jabber/buddy.c:511
 msgid ""
 "All items below are optional. Enter only the information with which you feel "
 "comfortable."
 msgstr ""
 "Všechny údaje níže jsou nepovinné. Zadejte jen ty informace, které chcete."
 
-#: src/protocols/jabber/buddy.c:554
+#: src/protocols/jabber/buddy.c:553
 msgid "Jabber ID"
 msgstr "ID Jabberu"
 
-#: src/protocols/jabber/buddy.c:564 src/protocols/jabber/buddy.c:571
-#: src/protocols/jabber/buddy.c:582 src/protocols/jabber/jabber.c:937
-#: src/protocols/msn/msn.c:453 src/protocols/novell/novell.c:2737
-#: src/protocols/novell/novell.c:2741 src/protocols/oscar/oscar.c:574
-#: src/protocols/oscar/oscar.c:580 src/protocols/oscar/oscar.c:582
-#: src/protocols/yahoo/yahoo.c:2611
+#: src/protocols/jabber/buddy.c:563 src/protocols/jabber/buddy.c:570
+#: src/protocols/jabber/buddy.c:581 src/protocols/jabber/jabber.c:938
+#: src/protocols/msn/msn.c:450 src/protocols/novell/novell.c:2743
+#: src/protocols/novell/novell.c:2747 src/protocols/oscar/oscar.c:578
+#: src/protocols/oscar/oscar.c:584 src/protocols/oscar/oscar.c:586
+#: src/protocols/yahoo/yahoo.c:2634
 msgid "Status"
 msgstr "Stav"
 
-#: src/protocols/jabber/buddy.c:580 src/protocols/jabber/jabber.c:1559
+#: src/protocols/jabber/buddy.c:579 src/protocols/jabber/jabber.c:1562
 msgid "Resource"
 msgstr "Zdroj"
 
-#: src/protocols/jabber/buddy.c:626 src/protocols/silc/ops.c:778
+#: src/protocols/jabber/buddy.c:625 src/protocols/silc/ops.c:794
 msgid "Middle Name"
 msgstr "Prostřední jméno"
 
-#: src/protocols/jabber/buddy.c:644 src/protocols/jabber/jabber.c:622
-#: src/protocols/oscar/oscar.c:4883 src/protocols/oscar/oscar.c:4891
-#: src/protocols/silc/ops.c:814
+#: src/protocols/jabber/buddy.c:643 src/protocols/jabber/jabber.c:623
+#: src/protocols/oscar/oscar.c:4899 src/protocols/oscar/oscar.c:4907
+#: src/protocols/silc/ops.c:830
 msgid "Address"
 msgstr "Adresa"
 
-#: src/protocols/jabber/buddy.c:656
+#: src/protocols/jabber/buddy.c:655
 msgid "P.O. Box"
 msgstr "P.O. Box"
 
-#: src/protocols/jabber/buddy.c:762
+#: src/protocols/jabber/buddy.c:761
 msgid "Photo"
 msgstr "Foto"
 
-#: src/protocols/jabber/buddy.c:762
+#: src/protocols/jabber/buddy.c:761
 msgid "Logo"
 msgstr "Logo"
 
-#: src/protocols/jabber/buddy.c:778
+#: src/protocols/jabber/buddy.c:777
 msgid "Jabber Profile"
 msgstr "Profil Jabberu"
 
-#: src/protocols/jabber/buddy.c:937
+#: src/protocols/jabber/buddy.c:932
 msgid "Un-hide From"
 msgstr "Zrušit skrytí Od"
 
-#: src/protocols/jabber/buddy.c:940
+#: src/protocols/jabber/buddy.c:935
 msgid "Temporarily Hide From"
 msgstr "Dočasně skrýt Od"
 
 #. && NOT ME
-#: src/protocols/jabber/buddy.c:947
+#: src/protocols/jabber/buddy.c:942
 msgid "Cancel Presence Notification"
 msgstr "Zrušit upozornění na přítomnosti"
 
-#: src/protocols/jabber/buddy.c:953
+#: src/protocols/jabber/buddy.c:948
 msgid "(Re-)Request authorization"
 msgstr "(Znovu) vyžádat autorizaci"
 
 #. if(NOT ME)
 #. shouldn't this just happen automatically when the buddy is
 #. removed?
-#: src/protocols/jabber/buddy.c:961
+#: src/protocols/jabber/buddy.c:956
 msgid "Unsubscribe"
 msgstr "Odhlásit"
 
-#: src/protocols/jabber/chat.c:42 src/protocols/yahoo/yahoochat.c:963
+#: src/protocols/jabber/chat.c:42 src/protocols/yahoo/yahoochat.c:1002
 msgid "_Room:"
 msgstr "_Místnost:"
 
@@ -5643,446 +5724,450 @@
 msgid "Find Rooms"
 msgstr "Hledat místnosti"
 
-#: src/protocols/jabber/jabber.c:75
+#: src/protocols/jabber/jabber.c:76
 msgid "Error initializing session"
 msgstr "Chyba při inicializaci sezení"
 
-#: src/protocols/jabber/jabber.c:205 src/protocols/msn/httpmethod.c:266
+#: src/protocols/jabber/jabber.c:206 src/protocols/msn/httpmethod.c:266
 #: src/protocols/trepia/trepia.c:247 src/protocols/trepia/trepia.c:698
 #: src/protocols/trepia/trepia.c:987 src/protocols/trepia/trepia.c:1031
 #: src/protocols/trepia/trepia.c:1130 src/protocols/trepia/trepia.c:1176
 msgid "Write error"
 msgstr "Chyba zápisu"
 
-#: src/protocols/jabber/jabber.c:243 src/protocols/jabber/jabber.c:263
+#: src/protocols/jabber/jabber.c:244 src/protocols/jabber/jabber.c:264
 msgid "Read Error"
 msgstr "Chyba čtení"
 
-#: src/protocols/jabber/jabber.c:323
+#: src/protocols/jabber/jabber.c:324
 msgid "Connection Failed"
 msgstr "Spojení selhalo"
 
-#: src/protocols/jabber/jabber.c:326
+#: src/protocols/jabber/jabber.c:327
 msgid "SSL Handshake Failed"
 msgstr "Vyjednávání SSL selhalo"
 
-#: src/protocols/jabber/jabber.c:369 src/protocols/jabber/jabber.c:698
+#: src/protocols/jabber/jabber.c:370 src/protocols/jabber/jabber.c:699
 msgid "Invalid Jabber ID"
 msgstr "Neplatné ID Jabberu"
 
-#: src/protocols/jabber/jabber.c:397 src/protocols/jabber/jabber.c:725
+#: src/protocols/jabber/jabber.c:398 src/protocols/jabber/jabber.c:726
 msgid "SSL support unavailable"
 msgstr "Podpora SSL není k dispozici"
 
-#: src/protocols/jabber/jabber.c:407 src/protocols/jabber/jabber.c:735
+#: src/protocols/jabber/jabber.c:408 src/protocols/jabber/jabber.c:736
 #: src/protocols/trepia/trepia.c:1070
 msgid "Unable to create socket"
 msgstr "Nemohu vytvořit socket"
 
-#: src/protocols/jabber/jabber.c:432
+#: src/protocols/jabber/jabber.c:433
 #, c-format
 msgid "Registration of %s@%s successful"
 msgstr "Registrace %s@%s úspěšná"
 
-#: src/protocols/jabber/jabber.c:434 src/protocols/jabber/jabber.c:435
+#: src/protocols/jabber/jabber.c:435 src/protocols/jabber/jabber.c:436
 msgid "Registration Successful"
 msgstr "Registrace úspěšná"
 
-#: src/protocols/jabber/jabber.c:441 src/protocols/jabber/jabber.c:1180
+#: src/protocols/jabber/jabber.c:442 src/protocols/jabber/jabber.c:1181
 msgid "Unknown Error"
 msgstr "Neznámá chyba"
 
-#: src/protocols/jabber/jabber.c:443 src/protocols/jabber/jabber.c:444
+#: src/protocols/jabber/jabber.c:444 src/protocols/jabber/jabber.c:445
 msgid "Registration Failed"
 msgstr "Registrace selhala"
 
-#: src/protocols/jabber/jabber.c:555 src/protocols/jabber/jabber.c:556
+#: src/protocols/jabber/jabber.c:556 src/protocols/jabber/jabber.c:557
 msgid "Already Registered"
 msgstr "Již zaregistrován"
 
-#: src/protocols/jabber/jabber.c:591 src/protocols/jabber/jabber.c:1035
+#: src/protocols/jabber/jabber.c:592 src/protocols/jabber/jabber.c:1036
 msgid "Password"
 msgstr "Heslo"
 
-#: src/protocols/jabber/jabber.c:602
+#: src/protocols/jabber/jabber.c:603
 msgid "E-Mail"
 msgstr "Email"
 
 #. State
-#: src/protocols/jabber/jabber.c:632 src/protocols/oscar/oscar.c:4885
-#: src/protocols/oscar/oscar.c:4893 src/protocols/trepia/trepia.c:335
+#: src/protocols/jabber/jabber.c:633 src/protocols/oscar/oscar.c:4901
+#: src/protocols/oscar/oscar.c:4909 src/protocols/trepia/trepia.c:335
 #: src/protocols/trepia/trepia.c:413
 msgid "State"
 msgstr "Stát"
 
-#: src/protocols/jabber/jabber.c:642 src/protocols/silc/buddy.c:1501
-#: src/protocols/silc/ops.c:819 src/protocols/silc/silc.c:635
+#: src/protocols/jabber/jabber.c:643 src/protocols/silc/ops.c:835
+#: src/protocols/silc/silc.c:639 src/protocols/silc/util.c:510
 msgid "Phone"
 msgstr "Telefon"
 
-#: src/protocols/jabber/jabber.c:652
+#: src/protocols/jabber/jabber.c:653
 msgid "Date"
 msgstr "Datum"
 
-#: src/protocols/jabber/jabber.c:660
+#: src/protocols/jabber/jabber.c:661
 msgid "Please fill out the information below to register your new account."
 msgstr "Pro zaregistrování vašeho nového účtu prosím vyplňte informace níže."
 
-#: src/protocols/jabber/jabber.c:663 src/protocols/jabber/jabber.c:664
+#: src/protocols/jabber/jabber.c:664 src/protocols/jabber/jabber.c:665
 msgid "Register New Jabber Account"
 msgstr "Zaregistrovat nový účet Jabber"
 
-#: src/protocols/jabber/jabber.c:743
+#: src/protocols/jabber/jabber.c:744
 msgid "Logged out"
 msgstr "Odhlášen"
 
 #. connect to the server
-#: src/protocols/jabber/jabber.c:782 src/protocols/msn/msn.c:616
-#: src/protocols/napster/napster.c:499 src/protocols/novell/novell.c:2104
-#: src/protocols/oscar/oscar.c:1591 src/protocols/trepia/trepia.c:1064
-#: src/protocols/yahoo/yahoo.c:2353 src/protocols/zephyr/zephyr.c:906
+#: src/protocols/jabber/jabber.c:783 src/protocols/msn/msn.c:608
+#: src/protocols/napster/napster.c:499 src/protocols/novell/novell.c:2105
+#: src/protocols/oscar/oscar.c:1597 src/protocols/trepia/trepia.c:1064
+#: src/protocols/yahoo/yahoo.c:2379 src/protocols/zephyr/zephyr.c:1017
 msgid "Connecting"
 msgstr "Připojuji se"
 
-#: src/protocols/jabber/jabber.c:786
+#: src/protocols/jabber/jabber.c:787
 msgid "Initializing Stream"
 msgstr "Inicializuji proud"
 
-#: src/protocols/jabber/jabber.c:792
+#: src/protocols/jabber/jabber.c:793
 msgid "Authenticating"
 msgstr "Autentizuji"
 
-#: src/protocols/jabber/jabber.c:801
+#: src/protocols/jabber/jabber.c:802
 msgid "Re-initializing Stream"
 msgstr "Reinicializuji proud"
 
-#: src/protocols/jabber/jabber.c:881 src/protocols/jabber/jabber.c:1158
-#: src/protocols/jabber/jabber.c:1199 src/protocols/jabber/jabber.c:1232
-#: src/protocols/oscar/oscar.c:580 src/protocols/oscar/oscar.c:6471
+#: src/protocols/jabber/jabber.c:882 src/protocols/jabber/jabber.c:1159
+#: src/protocols/jabber/jabber.c:1200 src/protocols/jabber/jabber.c:1233
+#: src/protocols/oscar/oscar.c:584 src/protocols/oscar/oscar.c:6488
 msgid "Not Authorized"
 msgstr "Neautorizován"
 
-#: src/protocols/jabber/jabber.c:912
+#: src/protocols/jabber/jabber.c:913
 msgid "Both"
 msgstr "Obojí"
 
-#: src/protocols/jabber/jabber.c:914
+#: src/protocols/jabber/jabber.c:915
 msgid "From (To pending)"
 msgstr "Z (do čeká)"
 
-#: src/protocols/jabber/jabber.c:916
+#: src/protocols/jabber/jabber.c:917
 msgid "From"
 msgstr "Z"
 
-#: src/protocols/jabber/jabber.c:919
+#: src/protocols/jabber/jabber.c:920
 msgid "To"
 msgstr "Do"
 
-#: src/protocols/jabber/jabber.c:921
+#: src/protocols/jabber/jabber.c:922
 msgid "None (To pending)"
 msgstr "Žádné (do čeká)"
 
-#: src/protocols/jabber/jabber.c:925
+#: src/protocols/jabber/jabber.c:926
 msgid "Subscription"
 msgstr "Přihlášení"
 
-#: src/protocols/jabber/jabber.c:945
+#: src/protocols/jabber/jabber.c:946
 msgid "Error"
 msgstr "Chyba"
 
-#: src/protocols/jabber/jabber.c:958 src/protocols/jabber/jutil.c:35
+#: src/protocols/jabber/jabber.c:959 src/protocols/jabber/jutil.c:35
 #: src/protocols/jabber/presence.c:66 src/protocols/jabber/presence.c:117
 msgid "Chatty"
 msgstr "Chatty"
 
-#: src/protocols/jabber/jabber.c:960 src/protocols/jabber/jutil.c:38
+#: src/protocols/jabber/jabber.c:961 src/protocols/jabber/jutil.c:38
 #: src/protocols/jabber/presence.c:68 src/protocols/jabber/presence.c:122
 msgid "Extended Away"
 msgstr "Pryč na dlouho"
 
-#: src/protocols/jabber/jabber.c:961 src/protocols/jabber/jutil.c:41
+#: src/protocols/jabber/jabber.c:962 src/protocols/jabber/jutil.c:41
 #: src/protocols/jabber/presence.c:70 src/protocols/jabber/presence.c:124
-#: src/protocols/oscar/oscar.c:522 src/protocols/oscar/oscar.c:5468
-#: src/protocols/oscar/oscar.c:6663
+#: src/protocols/oscar/oscar.c:526 src/protocols/oscar/oscar.c:5484
+#: src/protocols/oscar/oscar.c:6680
 msgid "Do Not Disturb"
 msgstr "Nerušit"
 
-#: src/protocols/jabber/jabber.c:978
-msgid "Password Changed"
-msgstr "Heslo změněno"
-
 #: src/protocols/jabber/jabber.c:979
+msgid "Password Changed"
+msgstr "Heslo změněno"
+
+#: src/protocols/jabber/jabber.c:980
 msgid "Your password has been changed."
 msgstr "Vaše heslo bylo změněno."
 
-#: src/protocols/jabber/jabber.c:983 src/protocols/jabber/jabber.c:984
+#: src/protocols/jabber/jabber.c:984 src/protocols/jabber/jabber.c:985
 msgid "Error changing password"
 msgstr "Chyba při změně hesla"
 
-#: src/protocols/jabber/jabber.c:1040
+#: src/protocols/jabber/jabber.c:1041
 msgid "Password (again)"
 msgstr "Heslo (znovu)"
 
-#: src/protocols/jabber/jabber.c:1045 src/protocols/jabber/jabber.c:1046
+#: src/protocols/jabber/jabber.c:1046 src/protocols/jabber/jabber.c:1047
 msgid "Change Jabber Password"
 msgstr "Změnit heslo Jabberu"
 
-#: src/protocols/jabber/jabber.c:1046
+#: src/protocols/jabber/jabber.c:1047
 msgid "Please enter your new password"
 msgstr "Zadejte prosím své nové heslo"
 
-#: src/protocols/jabber/jabber.c:1056 src/protocols/toc/toc.c:1540
+#: src/protocols/jabber/jabber.c:1057 src/protocols/toc/toc.c:1540
 msgid "Set User Info"
 msgstr "Nastavit informace o uživateli"
 
-#: src/protocols/jabber/jabber.c:1138
+#: src/protocols/jabber/jabber.c:1139
 msgid "Bad Request"
 msgstr "Špatný požadavek"
 
-#: src/protocols/jabber/jabber.c:1140
+#: src/protocols/jabber/jabber.c:1141
 msgid "Conflict"
 msgstr "Konflikt"
 
-#: src/protocols/jabber/jabber.c:1142
+#: src/protocols/jabber/jabber.c:1143
 msgid "Feature Not Implemented"
 msgstr "Funkce neimplementována"
 
-#: src/protocols/jabber/jabber.c:1144
+#: src/protocols/jabber/jabber.c:1145
 msgid "Forbidden"
 msgstr "Zakázáno"
 
-#: src/protocols/jabber/jabber.c:1146
+#: src/protocols/jabber/jabber.c:1147
 msgid "Gone"
 msgstr "Pryč"
 
-#: src/protocols/jabber/jabber.c:1148 src/protocols/jabber/jabber.c:1222
+#: src/protocols/jabber/jabber.c:1149 src/protocols/jabber/jabber.c:1223
 msgid "Internal Server Error"
 msgstr "Interní chyba serveru"
 
-#: src/protocols/jabber/jabber.c:1150
+#: src/protocols/jabber/jabber.c:1151
 msgid "Item Not Found"
 msgstr "Položka nenalezena"
 
-#: src/protocols/jabber/jabber.c:1152
+#: src/protocols/jabber/jabber.c:1153
 msgid "Malformed Jabber ID"
 msgstr "Neplatné ID Jabberu"
 
-#: src/protocols/jabber/jabber.c:1154
+#: src/protocols/jabber/jabber.c:1155
 msgid "Not Acceptable"
 msgstr "Nepřijatelné"
 
-#: src/protocols/jabber/jabber.c:1156
+#: src/protocols/jabber/jabber.c:1157
 msgid "Not Allowed"
 msgstr "Nepovoleno"
 
-#: src/protocols/jabber/jabber.c:1160
+#: src/protocols/jabber/jabber.c:1161
 msgid "Payment Required"
 msgstr "Je vyžadována platba"
 
-#: src/protocols/jabber/jabber.c:1162
+#: src/protocols/jabber/jabber.c:1163
 msgid "Recipient Unavailable"
 msgstr "Přejemce nedostupný"
 
-#: src/protocols/jabber/jabber.c:1166
+#: src/protocols/jabber/jabber.c:1167
 msgid "Registration Required"
 msgstr "Je vyžadována registrace"
 
-#: src/protocols/jabber/jabber.c:1168
+#: src/protocols/jabber/jabber.c:1169
 msgid "Remote Server Not Found"
 msgstr "Vzdálený server nenalezen"
 
-#: src/protocols/jabber/jabber.c:1170
+#: src/protocols/jabber/jabber.c:1171
 msgid "Remote Server Timeout"
 msgstr "Vzdálenému serveru vypršel čas"
 
-#: src/protocols/jabber/jabber.c:1172
+#: src/protocols/jabber/jabber.c:1173
 msgid "Server Overloaded"
 msgstr "Server přetížen"
 
-#: src/protocols/jabber/jabber.c:1174
+#: src/protocols/jabber/jabber.c:1175
 msgid "Service Unavailable"
 msgstr "Služba nedostupná"
 
-#: src/protocols/jabber/jabber.c:1176
+#: src/protocols/jabber/jabber.c:1177
 msgid "Subscription Required"
 msgstr "Vyžadováno přihlášení"
 
-#: src/protocols/jabber/jabber.c:1178
+#: src/protocols/jabber/jabber.c:1179
 msgid "Unexpected Request"
 msgstr "Neočekávaný požadavek"
 
-#: src/protocols/jabber/jabber.c:1185
+#: src/protocols/jabber/jabber.c:1186
 msgid "Authorization Aborted"
 msgstr "Autorizace přerušena"
 
-#: src/protocols/jabber/jabber.c:1187
+#: src/protocols/jabber/jabber.c:1188
 msgid "Incorrect encoding in authorization"
 msgstr "Neplatné kódování v autorizaci"
 
-#: src/protocols/jabber/jabber.c:1190
+#: src/protocols/jabber/jabber.c:1191
 msgid "Invalid authzid"
 msgstr "Neplatné autzid"
 
-#: src/protocols/jabber/jabber.c:1193
+#: src/protocols/jabber/jabber.c:1194
 msgid "Invalid Authorization Mechanism"
 msgstr "Neplatný mechanismus autorizace"
 
-#: src/protocols/jabber/jabber.c:1196
+#: src/protocols/jabber/jabber.c:1197
 msgid "Authorization mechanism too weak"
 msgstr "Mechanismus autorizace příliš slabý"
 
-#: src/protocols/jabber/jabber.c:1201
+#: src/protocols/jabber/jabber.c:1202
 msgid "Temporary Authentication Failure"
 msgstr "Dočasné selhání autentizace"
 
-#: src/protocols/jabber/jabber.c:1203
+#: src/protocols/jabber/jabber.c:1204
 msgid "Authentication Failure"
 msgstr "Selhání autentizace"
 
-#: src/protocols/jabber/jabber.c:1207
+#: src/protocols/jabber/jabber.c:1208
 msgid "Bad Format"
 msgstr "Špatný formát"
 
-#: src/protocols/jabber/jabber.c:1209
+#: src/protocols/jabber/jabber.c:1210
 msgid "Bad Namespace Prefix"
 msgstr "Špatná předpona prostoru jmen"
 
-#: src/protocols/jabber/jabber.c:1212
+#: src/protocols/jabber/jabber.c:1213
 msgid "Resource Conflict"
 msgstr "Konflikt zdrojů"
 
-#: src/protocols/jabber/jabber.c:1214 src/protocols/silc/ops.c:1225
+#: src/protocols/jabber/jabber.c:1215 src/protocols/silc/ops.c:1491
 msgid "Connection Timeout"
 msgstr "Spojení vypršel čas"
 
-#: src/protocols/jabber/jabber.c:1216
+#: src/protocols/jabber/jabber.c:1217
 msgid "Host Gone"
 msgstr "Počítač zmizel"
 
-#: src/protocols/jabber/jabber.c:1218
+#: src/protocols/jabber/jabber.c:1219
 msgid "Host Unknown"
 msgstr "Neznámý počítač"
 
-#: src/protocols/jabber/jabber.c:1220
+#: src/protocols/jabber/jabber.c:1221
 msgid "Improper Addressing"
 msgstr "Nesprávné adresování"
 
-#: src/protocols/jabber/jabber.c:1224
+#: src/protocols/jabber/jabber.c:1225
 msgid "Invalid ID"
 msgstr "Neplatné ID"
 
-#: src/protocols/jabber/jabber.c:1226
+#: src/protocols/jabber/jabber.c:1227
 msgid "Invalid Namespace"
 msgstr "Neplatný prostor jmen"
 
-#: src/protocols/jabber/jabber.c:1228
+#: src/protocols/jabber/jabber.c:1229
 msgid "Invalid XML"
 msgstr "Neplatné XML"
 
-#: src/protocols/jabber/jabber.c:1230
+#: src/protocols/jabber/jabber.c:1231
 msgid "Non-matching Hosts"
 msgstr "Neodpovídající počítače"
 
-#: src/protocols/jabber/jabber.c:1234
+#: src/protocols/jabber/jabber.c:1235
 msgid "Policy Violation"
 msgstr "Porušení pravidel"
 
-#: src/protocols/jabber/jabber.c:1236
+#: src/protocols/jabber/jabber.c:1237
 msgid "Remote Connection Failed"
 msgstr "Selhalo vzdálené připojení"
 
-#: src/protocols/jabber/jabber.c:1238
+#: src/protocols/jabber/jabber.c:1239
 msgid "Resource Constraint"
 msgstr "Omezení zdrojů"
 
-#: src/protocols/jabber/jabber.c:1240
+#: src/protocols/jabber/jabber.c:1241
 msgid "Restricted XML"
 msgstr "Omezené XML"
 
-#: src/protocols/jabber/jabber.c:1242
+#: src/protocols/jabber/jabber.c:1243
 msgid "See Other Host"
 msgstr "Zobrazit druhý počítač"
 
-#: src/protocols/jabber/jabber.c:1244
+#: src/protocols/jabber/jabber.c:1245
 msgid "System Shutdown"
 msgstr "Vypnutí systému"
 
-#: src/protocols/jabber/jabber.c:1246
+#: src/protocols/jabber/jabber.c:1247
 msgid "Undefined Condition"
 msgstr "Nedefinovaná podmínka"
 
-#: src/protocols/jabber/jabber.c:1248
+#: src/protocols/jabber/jabber.c:1249
 msgid "Unsupported Encoding"
 msgstr "Nepodporované kódování"
 
-#: src/protocols/jabber/jabber.c:1250
+#: src/protocols/jabber/jabber.c:1251
 msgid "Unsupported Stanza Type"
 msgstr "Nepodporovaný typ stanza"
 
-#: src/protocols/jabber/jabber.c:1252
+#: src/protocols/jabber/jabber.c:1253
 msgid "Unsupported Version"
 msgstr "Nepodporovaná verze"
 
-#: src/protocols/jabber/jabber.c:1254
+#: src/protocols/jabber/jabber.c:1255
 msgid "XML Not Well Formed"
 msgstr "XML není well-formed"
 
-#: src/protocols/jabber/jabber.c:1256
+#: src/protocols/jabber/jabber.c:1257
 msgid "Stream Error"
 msgstr "Chyba proudu"
 
-#: src/protocols/jabber/jabber.c:1323
+#: src/protocols/jabber/jabber.c:1324
 #, c-format
 msgid "Unable to ban user %s"
 msgstr "Nemohu zakázat uživatele %s"
 
-#: src/protocols/jabber/jabber.c:1375
+#: src/protocols/jabber/jabber.c:1376
 #, c-format
 msgid "Unable to kick user %s"
 msgstr "Nemohu vykopnout uživatele %s"
 
-#: src/protocols/jabber/jabber.c:1400
+#: src/protocols/jabber/jabber.c:1401
 msgid "config:  Configure a chat room."
 msgstr "config: Nastavit místnost chatu."
 
-#: src/protocols/jabber/jabber.c:1403
+#: src/protocols/jabber/jabber.c:1404
 msgid "configure:  Configure a chat room."
 msgstr "configure: Nastavit místnost chatu."
 
-#: src/protocols/jabber/jabber.c:1410
+#: src/protocols/jabber/jabber.c:1411
 msgid "part [room]:  Leave the room."
 msgstr "part [místnost]: Opustit místnost."
 
-#: src/protocols/jabber/jabber.c:1413
+#: src/protocols/jabber/jabber.c:1414
 msgid "register:  Register with a chat room."
 msgstr "register: Zaregistrovat se u místnísti chatu."
 
-#: src/protocols/jabber/jabber.c:1418
+#: src/protocols/jabber/jabber.c:1419
 msgid "topic [new topic]:  View or change the topic."
 msgstr "topic [nové téma]: Zobrazit nebo změnit téma."
 
-#: src/protocols/jabber/jabber.c:1422
+#: src/protocols/jabber/jabber.c:1423
 msgid "ban &lt;user&gt; [room]:  Ban a user from the room."
-msgstr "ban &lt;uživatel&gt; [místnost]: Zakázat uživateli přístup do místnosti."
-
-#: src/protocols/jabber/jabber.c:1426
+msgstr ""
+"ban &lt;uživatel&gt; [místnost]: Zakázat uživateli přístup do místnosti."
+
+#: src/protocols/jabber/jabber.c:1427
 msgid "invite &lt;user&gt; [room]:  Invite a user to the room."
 msgstr "invite &lt;uživatel&gt; [místnost]: Pozvat uživatele do místnosti."
 
-#: src/protocols/jabber/jabber.c:1430
+#: src/protocols/jabber/jabber.c:1431
 msgid "join: &lt;room&gt; [server]:  Join a chat on this server."
-msgstr "join: &lt;místnost&gt; [server]: Připojit se k diskusi na tomto serveru."
-
-#: src/protocols/jabber/jabber.c:1434
+msgstr ""
+"join: &lt;místnost&gt; [server]: Připojit se k diskusi na tomto serveru."
+
+#: src/protocols/jabber/jabber.c:1435
 msgid "kick &lt;user&gt; [room]:  Kick a user from the room."
 msgstr "kick &lt;uživatel&gt; [místnost]: Vykopnout uživatele z místnosti."
 
-#: src/protocols/jabber/jabber.c:1438
+#: src/protocols/jabber/jabber.c:1439
 msgid ""
 "msg &lt;user&gt; &lt;message&gt;:  Send a private message to another user."
-msgstr "msg &lt;uživatel&gt; &lt;zpráva&gt;: Poslat soukromou zprávu jinému uživateli."
-
-#: src/protocols/jabber/jabber.c:1452
+msgstr ""
+"msg &lt;uživatel&gt; &lt;zpráva&gt;: Poslat soukromou zprávu jinému "
+"uživateli."
+
+#: src/protocols/jabber/jabber.c:1453
 msgid "Hide Operating System"
 msgstr "Skrýt operační systém"
 
@@ -6097,24 +6182,24 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/jabber/jabber.c:1534 src/protocols/jabber/jabber.c:1536
+#: src/protocols/jabber/jabber.c:1537 src/protocols/jabber/jabber.c:1539
 msgid "Jabber Protocol Plugin"
 msgstr "Zásuvný modul protokolu Jabber"
 
-#: src/protocols/jabber/jabber.c:1562
+#: src/protocols/jabber/jabber.c:1565
 msgid "Use TLS if available"
 msgstr "Používat TLS, pokud je k dispozici"
 
-#: src/protocols/jabber/jabber.c:1567
+#: src/protocols/jabber/jabber.c:1570
 msgid "Force old SSL"
 msgstr "Vnutit staré SSL"
 
-#: src/protocols/jabber/jabber.c:1572
+#: src/protocols/jabber/jabber.c:1575
 msgid "Allow plaintext auth over unencrypted streams"
 msgstr "Povolit textovou autentizaci po nešifrovaných proudech"
 
 #. Account options
-#: src/protocols/jabber/jabber.c:1581 src/protocols/silc/silc.c:1359
+#: src/protocols/jabber/jabber.c:1584 src/protocols/silc/silc.c:1572
 msgid "Connect server"
 msgstr "Server spojení"
 
@@ -6256,7 +6341,7 @@
 msgid "Not on list"
 msgstr "Ne na seznamu"
 
-#: src/protocols/msn/error.c:70 src/protocols/zephyr/zephyr.c:570
+#: src/protocols/msn/error.c:70 src/protocols/zephyr/zephyr.c:593
 msgid "User is offline"
 msgstr "Uživatel je odpojen"
 
@@ -6282,7 +6367,7 @@
 
 #: src/protocols/msn/error.c:88
 msgid "Group name too long"
-msgstr "Jméno skupiny příliš dlouhé"
+msgstr "Název skupiny příliš dlouhý"
 
 #: src/protocols/msn/error.c:91
 msgid "Cannot remove group zero"
@@ -6290,7 +6375,7 @@
 
 #: src/protocols/msn/error.c:95
 msgid "Tried to add a contact to a group that doesn't exist"
-msgstr "Pokusil jsem se přidat kontakt do skupiny, která neexistuje"
+msgstr "Pokus přidat kontakt do skupiny, která neexistuje"
 
 #: src/protocols/msn/error.c:99
 msgid "Switchboard failed"
@@ -6401,8 +6486,8 @@
 msgid "Server too busy"
 msgstr "Server je příliš zaneprázdněn"
 
-#: src/protocols/msn/error.c:198 src/protocols/oscar/oscar.c:2010
-#: src/protocols/silc/ops.c:1214 src/protocols/toc/toc.c:630
+#: src/protocols/msn/error.c:198 src/protocols/oscar/oscar.c:2026
+#: src/protocols/silc/ops.c:1480 src/protocols/toc/toc.c:630
 msgid "Authentication failed"
 msgstr "Autentizace selhala"
 
@@ -6480,88 +6565,88 @@
 msgid "Disallow"
 msgstr "Zakázat"
 
-#: src/protocols/msn/msn.c:313
+#: src/protocols/msn/msn.c:311
 msgid "Send a mobile message."
 msgstr "Odeslat mobilní zprávu."
 
-#: src/protocols/msn/msn.c:315
+#: src/protocols/msn/msn.c:313
 msgid "Page"
 msgstr "Stránka"
 
-#: src/protocols/msn/msn.c:466 src/protocols/msn/msn.c:764
+#: src/protocols/msn/msn.c:463 src/protocols/msn/msn.c:756
 #: src/protocols/msn/state.c:34
 msgid "Away From Computer"
 msgstr "Pryč od počítače"
 
-#: src/protocols/msn/msn.c:467 src/protocols/msn/msn.c:766
-#: src/protocols/msn/state.c:33 src/protocols/yahoo/yahoo.c:2468
-#: src/protocols/yahoo/yahoo.c:2846 src/protocols/yahoo/yahoo.c:2960
+#: src/protocols/msn/msn.c:464 src/protocols/msn/msn.c:758
+#: src/protocols/msn/state.c:33 src/protocols/yahoo/yahoo.c:2491
+#: src/protocols/yahoo/yahoo.c:2853 src/protocols/yahoo/yahoo.c:2969
 msgid "Be Right Back"
 msgstr "Hned budu zpátky"
 
-#: src/protocols/msn/msn.c:468 src/protocols/msn/msn.c:768
-#: src/protocols/msn/state.c:31 src/protocols/novell/novell.c:2721
-#: src/protocols/novell/novell.c:2836 src/protocols/novell/novell.c:2890
+#: src/protocols/msn/msn.c:465 src/protocols/msn/msn.c:760
+#: src/protocols/msn/state.c:31 src/protocols/novell/novell.c:2727
+#: src/protocols/novell/novell.c:2842 src/protocols/novell/novell.c:2896
 #: src/protocols/silc/buddy.c:1383 src/protocols/silc/silc.c:47
-#: src/protocols/silc/silc.c:78 src/protocols/yahoo/yahoo.c:2470
-#: src/protocols/yahoo/yahoo.c:2848 src/protocols/yahoo/yahoo.c:2961
+#: src/protocols/silc/silc.c:78 src/protocols/yahoo/yahoo.c:2493
+#: src/protocols/yahoo/yahoo.c:2855 src/protocols/yahoo/yahoo.c:2970
 msgid "Busy"
 msgstr "Zaneprázdněn"
 
-#: src/protocols/msn/msn.c:469 src/protocols/msn/msn.c:770
-#: src/protocols/msn/state.c:35 src/protocols/yahoo/yahoo.c:2478
-#: src/protocols/yahoo/yahoo.c:2856 src/protocols/yahoo/yahoo.c:2965
+#: src/protocols/msn/msn.c:466 src/protocols/msn/msn.c:762
+#: src/protocols/msn/state.c:35 src/protocols/yahoo/yahoo.c:2501
+#: src/protocols/yahoo/yahoo.c:2863 src/protocols/yahoo/yahoo.c:2974
 msgid "On The Phone"
 msgstr "Telefonuji"
 
-#: src/protocols/msn/msn.c:470 src/protocols/msn/msn.c:772
-#: src/protocols/msn/state.c:36 src/protocols/yahoo/yahoo.c:2482
-#: src/protocols/yahoo/yahoo.c:2860 src/protocols/yahoo/yahoo.c:2967
+#: src/protocols/msn/msn.c:467 src/protocols/msn/msn.c:764
+#: src/protocols/msn/state.c:36 src/protocols/yahoo/yahoo.c:2505
+#: src/protocols/yahoo/yahoo.c:2867 src/protocols/yahoo/yahoo.c:2976
 msgid "Out To Lunch"
 msgstr "Na obědě"
 
-#: src/protocols/msn/msn.c:471 src/protocols/msn/msn.c:774
-#: src/protocols/zephyr/zephyr.c:1205 src/protocols/zephyr/zephyr.c:1220
+#: src/protocols/msn/msn.c:468 src/protocols/msn/msn.c:766
+#: src/protocols/zephyr/zephyr.c:1355 src/protocols/zephyr/zephyr.c:1374
 msgid "Hidden"
 msgstr "Skryt"
 
-#: src/protocols/msn/msn.c:482
+#: src/protocols/msn/msn.c:479
 msgid "Set Friendly Name"
 msgstr "Nastavit přátelské jméno"
 
-#: src/protocols/msn/msn.c:487
+#: src/protocols/msn/msn.c:484
 msgid "Set Home Phone Number"
 msgstr "Nastavit domácí telefonní číslo"
 
-#: src/protocols/msn/msn.c:491
+#: src/protocols/msn/msn.c:488
 msgid "Set Work Phone Number"
 msgstr "Nastavit pracovní telefonní číslo"
 
-#: src/protocols/msn/msn.c:495
+#: src/protocols/msn/msn.c:492
 msgid "Set Mobile Phone Number"
 msgstr "Nastavit mobilní telefonní číslo"
 
-#: src/protocols/msn/msn.c:501
+#: src/protocols/msn/msn.c:498
 msgid "Enable/Disable Mobile Devices"
 msgstr "Povolit/zakázat mobilní zařízení"
 
-#: src/protocols/msn/msn.c:506
+#: src/protocols/msn/msn.c:503
 msgid "Allow/Disallow Mobile Pages"
 msgstr "Povolit/zakázat mobilní stránky"
 
-#: src/protocols/msn/msn.c:529
+#: src/protocols/msn/msn.c:526
 msgid "Send to Mobile"
 msgstr "Odeslat na mobil"
 
-#: src/protocols/msn/msn.c:539
+#: src/protocols/msn/msn.c:536
 msgid "Initiate Chat"
 msgstr "Začít chat"
 
-#: src/protocols/msn/msn.c:548
+#: src/protocols/msn/msn.c:540
 msgid "Update Buddy Icon"
 msgstr "Aktualizovat ikonu kamaráda"
 
-#: src/protocols/msn/msn.c:585
+#: src/protocols/msn/msn.c:577
 msgid ""
 "SSL support is needed for MSN. Please install a supported SSL library. See "
 "http://gaim.sf.net/faq-ssl.php for more information."
@@ -6569,106 +6654,121 @@
 "Pro MSN je potřeba podpora SSL. Nainstalujte prosím podporovanou knihovnu "
 "SSL. Pro více informací viz http://gaim.sf.net/faq-ssl.php ."
 
-#: src/protocols/msn/msn.c:1137 src/protocols/msn/msn.c:1150
-#: src/protocols/msn/msn.c:1156 src/protocols/yahoo/yahoo_profile.c:640
-#: src/protocols/yahoo/yahoo_profile.c:653
+#: src/protocols/msn/msn.c:1167 src/protocols/yahoo/yahoo_profile.c:659
+#: src/protocols/zephyr/zephyr.c:626
+#, c-format
+msgid "<b>Alias:</b> %s<br>"
+msgstr "<b>Alias:</b> %s<br>"
+
+#. put a link to the actual profile URL
+#: src/protocols/msn/msn.c:1172 src/protocols/msn/msn.c:1512
+#: src/protocols/yahoo/yahoo_profile.c:1168 src/util.c:792
+#, c-format
+msgid "<b>%s:</b> "
+msgstr "<b>%s:</b> "
+
+#: src/protocols/msn/msn.c:1173
+#, c-format
+msgid "<font sml=\"msn\">%s</font><br>"
+msgstr "<font sml=\"msn\">%s</font><br>"
+
+#: src/protocols/msn/msn.c:1179 src/protocols/yahoo/yahoo_profile.c:664
 #, c-format
 msgid "<b>%s:</b> %s<br>"
 msgstr "<b>%s:</b> %s<br>"
 
-#: src/protocols/msn/msn.c:1137
-msgid "MSN ID"
-msgstr "ID MSN"
-
-#: src/protocols/msn/msn.c:1145 src/protocols/yahoo/yahoo_profile.c:648
-#: src/protocols/zephyr/zephyr.c:602
-#, c-format
-msgid "<b>Alias:</b> %s<br>"
-msgstr "<b>Alias:</b> %s<br>"
-
-#: src/protocols/msn/msn.c:1222 src/protocols/msn/msn.c:1546
-#: src/protocols/yahoo/yahoo_profile.c:746
-#: src/protocols/yahoo/yahoo_profile.c:834
+#: src/protocols/msn/msn.c:1242
+msgid "MSN Profile"
+msgstr "Profil MSN"
+
+#: src/protocols/msn/msn.c:1247 src/protocols/msn/msn.c:1499
+#: src/protocols/yahoo/yahoo_profile.c:761
 msgid "Error retrieving profile"
 msgstr "Chyba při získávání profilu"
 
 #. Age
-#: src/protocols/msn/msn.c:1293 src/protocols/oscar/oscar.c:4870
+#: src/protocols/msn/msn.c:1318 src/protocols/oscar/oscar.c:4886
 #: src/protocols/trepia/trepia.c:285 src/protocols/trepia/trepia.c:404
-#: src/protocols/yahoo/yahoo_profile.c:1010
+#: src/protocols/yahoo/yahoo_profile.c:1015
 msgid "Age"
 msgstr "Věk"
 
 #. Gender
-#: src/protocols/msn/msn.c:1300 src/protocols/oscar/oscar.c:4856
+#: src/protocols/msn/msn.c:1325 src/protocols/oscar/oscar.c:4872
 #: src/protocols/trepia/trepia.c:279 src/protocols/trepia/trepia.c:406
-#: src/protocols/yahoo/yahoo_profile.c:1020
+#: src/protocols/yahoo/yahoo_profile.c:1025
 msgid "Gender"
 msgstr "Pohlaví"
 
-#: src/protocols/msn/msn.c:1309 src/protocols/yahoo/yahoo_profile.c:1015
+#: src/protocols/msn/msn.c:1334 src/protocols/yahoo/yahoo_profile.c:1020
 msgid "Marital Status"
 msgstr "Stav"
 
-#: src/protocols/msn/msn.c:1316 src/protocols/yahoo/yahoo_profile.c:1005
+#: src/protocols/msn/msn.c:1341 src/protocols/yahoo/yahoo_profile.c:1010
 msgid "Location"
 msgstr "Umístění"
 
-#: src/protocols/msn/msn.c:1324 src/protocols/yahoo/yahoo_profile.c:1025
+#: src/protocols/msn/msn.c:1349 src/protocols/yahoo/yahoo_profile.c:1030
 msgid "Occupation"
 msgstr "Zaměstnání"
 
-#: src/protocols/msn/msn.c:1341 src/protocols/msn/msn.c:1347
-#: src/protocols/msn/msn.c:1354 src/protocols/msn/msn.c:1362
-#: src/protocols/msn/msn.c:1369
+#: src/protocols/msn/msn.c:1366 src/protocols/msn/msn.c:1372
+#: src/protocols/msn/msn.c:1379 src/protocols/msn/msn.c:1387
+#: src/protocols/msn/msn.c:1394
 msgid "A Little About Me"
 msgstr "Něco o mě"
 
-#: src/protocols/msn/msn.c:1378 src/protocols/msn/msn.c:1384
-#: src/protocols/msn/msn.c:1391 src/protocols/msn/msn.c:1398
+#: src/protocols/msn/msn.c:1403 src/protocols/msn/msn.c:1409
+#: src/protocols/msn/msn.c:1416 src/protocols/msn/msn.c:1423
 msgid "Favorite Things"
 msgstr "Oblíbené věci"
 
-#: src/protocols/msn/msn.c:1407 src/protocols/msn/msn.c:1413
-#: src/protocols/msn/msn.c:1420
+#: src/protocols/msn/msn.c:1432 src/protocols/msn/msn.c:1438
+#: src/protocols/msn/msn.c:1445
 msgid "Hobbies and Interests"
 msgstr "Koníčky a zájmy"
 
-#: src/protocols/msn/msn.c:1429 src/protocols/msn/msn.c:1435
-#: src/protocols/yahoo/yahoo_profile.c:1067
+#: src/protocols/msn/msn.c:1454 src/protocols/msn/msn.c:1460
+#: src/protocols/yahoo/yahoo_profile.c:1072
 msgid "Favorite Quote"
 msgstr "Oblíbený citát"
 
-#: src/protocols/msn/msn.c:1443 src/protocols/yahoo/yahoo_profile.c:1118
+#: src/protocols/msn/msn.c:1468 src/protocols/yahoo/yahoo_profile.c:1123
 msgid "Last Updated"
 msgstr "Naposledy aktualizováno"
 
 #. Homepage
-#: src/protocols/msn/msn.c:1454 src/protocols/silc/ops.c:810
+#: src/protocols/msn/msn.c:1479 src/protocols/silc/ops.c:826
 #: src/protocols/trepia/trepia.c:289 src/protocols/trepia/trepia.c:419
 msgid "Homepage"
 msgstr "Domovská stránka"
 
-#. put a link to the actual profile URL
-#: src/protocols/msn/msn.c:1465 src/protocols/yahoo/yahoo_profile.c:1121
-#: src/util.c:792
-#, c-format
-msgid "<b>%s:</b> "
-msgstr "<b>%s:</b> "
-
-#: src/protocols/msn/msn.c:1465 src/protocols/yahoo/yahoo_profile.c:1121
+#: src/protocols/msn/msn.c:1501
+msgid "The user has not created a public profile."
+msgstr "Uživatel nevytvořit veřejný profil."
+
+#: src/protocols/msn/msn.c:1502
+msgid ""
+"MSN reported not being able to find the user's profile. This either means "
+"that the user does not exist, or that the user exists but has not created a "
+"public profile."
+msgstr "MSN oznámila, že nemůže najít profil uživatele. To znamená, že buď uživatel neexistuje, nebo že uživatel existuje, ale nevytvořil veřejný profil."
+
+#: src/protocols/msn/msn.c:1506
+msgid ""
+"Gaim could not find any information in the user's profile. The user most "
+"likely does not exist."
+msgstr "Gaim nemohl najít v profilu uživatele žádné informace. Uživatel pravděpodobně neexistuje."
+
+#: src/protocols/msn/msn.c:1512 src/protocols/yahoo/yahoo_profile.c:1168
 msgid "Profile URL"
 msgstr "URL profilu"
 
-#: src/protocols/msn/msn.c:1547 src/protocols/yahoo/yahoo_profile.c:1140
-msgid "The user's profile is empty."
-msgstr "Profil uživatele je prázdný."
-
-#: src/protocols/msn/msn.c:1616
+#: src/protocols/msn/msn.c:1643
 msgid "Display conversation closed notices"
 msgstr "Zobrazovat upozornění na zavřené konverzace"
 
-#: src/protocols/msn/msn.c:1621
+#: src/protocols/msn/msn.c:1648
 msgid "Display timeout notices"
 msgstr "Zobrazovat upozornění na vypršení času"
 
@@ -6683,15 +6783,15 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/msn/msn.c:1703 src/protocols/msn/msn.c:1705
+#: src/protocols/msn/msn.c:1732 src/protocols/msn/msn.c:1734
 msgid "MSN Protocol Plugin"
 msgstr "Zásuvný modul protokolu MSN"
 
-#: src/protocols/msn/msn.c:1724 src/protocols/trepia/trepia.c:1290
+#: src/protocols/msn/msn.c:1753 src/protocols/trepia/trepia.c:1292
 msgid "Login server"
 msgstr "Přihlašovací server"
 
-#: src/protocols/msn/msn.c:1733
+#: src/protocols/msn/msn.c:1762
 msgid "Use HTTP Method"
 msgstr "Používat metodu HTTP"
 
@@ -6712,11 +6812,11 @@
 msgstr "Získávám seznam kamarádů"
 
 #: src/protocols/msn/notification.c:144 src/protocols/msn/notification.c:173
-#: src/protocols/oscar/oscar.c:2299
+#: src/protocols/oscar/oscar.c:2315
 msgid "Password sent"
 msgstr "Heslo odesláno"
 
-#: src/protocols/msn/notification.c:1069
+#: src/protocols/msn/notification.c:1071
 #, c-format
 msgid ""
 "The MSN server will shut down for maintenance in %d minute. You will "
@@ -6748,7 +6848,7 @@
 "\n"
 "Až bude údržba dokončena, budete se moci přihlásit."
 
-#: src/protocols/msn/notification.c:1134
+#: src/protocols/msn/notification.c:1136
 msgid "Syncing with server"
 msgstr "Synchronizuji se se serverem"
 
@@ -6779,13 +6879,13 @@
 
 #: src/protocols/msn/servconn.c:346
 msgid "Received HTTP error. Please report this."
-msgstr "Dostal jsem chybu HTTP. Nahlaste to prosím."
-
-#: src/protocols/msn/switchboard.c:201
+msgstr "Přijata chyba HTTP. Nahlaste to prosím."
+
+#: src/protocols/msn/switchboard.c:191
 msgid "The conversation has become inactive and timed out."
 msgstr "Konverzace se stala neaktivní a její čas vypršel."
 
-#: src/protocols/msn/switchboard.c:209
+#: src/protocols/msn/switchboard.c:199
 #, c-format
 msgid "%s has closed the conversation window."
 msgstr "%s zavřel okno konverzace."
@@ -6843,7 +6943,7 @@
 msgid "%s requested a PING"
 msgstr "%s požádal o PING"
 
-#: src/protocols/napster/napster.c:541 src/protocols/oscar/oscar.c:6171
+#: src/protocols/napster/napster.c:541 src/protocols/oscar/oscar.c:6188
 #: src/protocols/toc/toc.c:1266
 msgid "_Group:"
 msgstr "_Skupina:"
@@ -6859,132 +6959,132 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/napster/napster.c:622 src/protocols/napster/napster.c:624
+#: src/protocols/napster/napster.c:624 src/protocols/napster/napster.c:626
 msgid "NAPSTER Protocol Plugin"
 msgstr "Zásuvný modul protokolu NAPSTER"
 
-#: src/protocols/novell/nmuser.c:2046
+#: src/protocols/novell/nmuser.c:1868
 msgid "Required parameters not passed in"
 msgstr "Nezadány vyžadované parametry"
 
-#: src/protocols/novell/nmuser.c:2049
+#: src/protocols/novell/nmuser.c:1871
 msgid "Unable to write to network"
 msgstr "Nemohu zapisovat na síť"
 
-#: src/protocols/novell/nmuser.c:2052
+#: src/protocols/novell/nmuser.c:1874
 msgid "Unable to read from network"
 msgstr "Nemohu číst ze sítě"
 
-#: src/protocols/novell/nmuser.c:2055
+#: src/protocols/novell/nmuser.c:1877
 msgid "Error communicating with server"
 msgstr "Chyba při komunikaci se serverem"
 
-#: src/protocols/novell/nmuser.c:2059
+#: src/protocols/novell/nmuser.c:1881
 msgid "Conference not found"
 msgstr "Konference nenalezena"
 
-#: src/protocols/novell/nmuser.c:2062
+#: src/protocols/novell/nmuser.c:1884
 msgid "Conference does not exist"
 msgstr "Konference neexistuje"
 
-#: src/protocols/novell/nmuser.c:2066
+#: src/protocols/novell/nmuser.c:1888
 msgid "A folder with that name already exists"
 msgstr "Složka s tímto názvem již existuje"
 
-#: src/protocols/novell/nmuser.c:2069
+#: src/protocols/novell/nmuser.c:1891
 msgid "Not supported"
 msgstr "Nepodporováno"
 
-#: src/protocols/novell/nmuser.c:2073
+#: src/protocols/novell/nmuser.c:1895
 msgid "Password has expired"
 msgstr "Heslo vypršelo"
 
-#: src/protocols/novell/nmuser.c:2076
+#: src/protocols/novell/nmuser.c:1898
 msgid "Invalid password"
 msgstr "Neplatné heslo"
 
-#: src/protocols/novell/nmuser.c:2079
+#: src/protocols/novell/nmuser.c:1901
 msgid "User not found"
 msgstr "Uživatel nenalezen"
 
-#: src/protocols/novell/nmuser.c:2082
+#: src/protocols/novell/nmuser.c:1904
 msgid "Account has been disabled"
 msgstr "Účet byl zakázán"
 
-#: src/protocols/novell/nmuser.c:2085
+#: src/protocols/novell/nmuser.c:1907
 msgid "The server could not access the directory"
 msgstr "Server nemohl přistupovat k adresáři"
 
-#: src/protocols/novell/nmuser.c:2088
+#: src/protocols/novell/nmuser.c:1910
 msgid "Your system administrator has disabled this operation"
 msgstr "Váš správce systému tuto operaci zakázal"
 
-#: src/protocols/novell/nmuser.c:2091
+#: src/protocols/novell/nmuser.c:1913
 msgid "The server is unavailable; try again later"
 msgstr "Server není k dispozici; zkuste to později"
 
-#: src/protocols/novell/nmuser.c:2094
+#: src/protocols/novell/nmuser.c:1916
 msgid "Cannot add a contact to the same folder twice"
 msgstr "Nemohu přidat kontakt dvakrát do téže složky"
 
-#: src/protocols/novell/nmuser.c:2097
+#: src/protocols/novell/nmuser.c:1919
 msgid "Cannot add yourself"
 msgstr "Nemohu vás přidat"
 
-#: src/protocols/novell/nmuser.c:2100
+#: src/protocols/novell/nmuser.c:1922
 msgid "Master archive is misconfigured"
 msgstr "Hlavní archiv není správně nastaven"
 
-#: src/protocols/novell/nmuser.c:2104
+#: src/protocols/novell/nmuser.c:1926
 msgid "Invalid username or password"
 msgstr "Neplatné jméno uživatele nebo heslo"
 
-#: src/protocols/novell/nmuser.c:2107
+#: src/protocols/novell/nmuser.c:1929
 msgid "Could not recognize the host of the username you entered"
 msgstr "Nemohu rozpoznat počítač ve jménu uživatele, které jste zadali"
 
-#: src/protocols/novell/nmuser.c:2110
+#: src/protocols/novell/nmuser.c:1932
 msgid ""
 "Your account has been disabled because too many invalid passwords were "
 "entered"
 msgstr ""
 "Váš účet byl zakázán, protože bylo zadáno příliš mnoho neplatných hesel"
 
-#: src/protocols/novell/nmuser.c:2113
+#: src/protocols/novell/nmuser.c:1935
 msgid "You cannot add the same person twice to a conversation"
 msgstr "Nemůžete jednu osobu přidat do konverzace dvakrát"
 
-#: src/protocols/novell/nmuser.c:2117
+#: src/protocols/novell/nmuser.c:1939
 msgid "You have reached your limit for the number of contacts allowed"
 msgstr "Dosáhli jste vašeho limitu pro počet povolených kontaktů"
 
-#: src/protocols/novell/nmuser.c:2120
+#: src/protocols/novell/nmuser.c:1942
 msgid "You have entered an invalid username"
 msgstr "Zadali jste neplatné jméno uživatele"
 
-#: src/protocols/novell/nmuser.c:2123
+#: src/protocols/novell/nmuser.c:1945
 msgid "An error occurred while updating the directory"
 msgstr "Při aktualizaci adresáře došlo k chybě."
 
-#: src/protocols/novell/nmuser.c:2126
+#: src/protocols/novell/nmuser.c:1948
 msgid "Incompatible protocol version"
 msgstr "Nekompatibilní verze protokolu"
 
-#: src/protocols/novell/nmuser.c:2129
+#: src/protocols/novell/nmuser.c:1951
 msgid "The user has blocked you"
 msgstr "Uživatel vás zablokoval"
 
-#: src/protocols/novell/nmuser.c:2132
+#: src/protocols/novell/nmuser.c:1954
 msgid ""
 "This evaluation version does not allow more than ten users to log in at one "
 "time"
 msgstr "Tato demoverze nedovoluje přihlášení více než deseti uživatelů zároveň"
 
-#: src/protocols/novell/nmuser.c:2135
+#: src/protocols/novell/nmuser.c:1957
 msgid "The user is either offline or you are blocked"
 msgstr "Buď je uživatel odpojen, nebo jste blokováni"
 
-#: src/protocols/novell/nmuser.c:2138
+#: src/protocols/novell/nmuser.c:1960
 #, c-format
 msgid "Unknown error: 0x%X"
 msgstr "Neznámá chyba: 0x%X"
@@ -7068,7 +7168,7 @@
 msgid "Unable to remove %s from privacy list (%s)."
 msgstr "Nemohu přidat %s do vašeho seznamu kamarádů (%s)."
 
-#: src/protocols/novell/novell.c:920 src/protocols/novell/novell.c:1573
+#: src/protocols/novell/novell.c:920 src/protocols/novell/novell.c:1574
 #, c-format
 msgid "Unable to change server side privacy settings (%s)."
 msgstr "Nemohu změnit nastavení soukromí na straně serveru (%s)."
@@ -7078,11 +7178,11 @@
 msgid "Unable to create conference (%s)."
 msgstr "Nemohu vytvořit konferenci (%s)."
 
-#: src/protocols/novell/novell.c:1103 src/protocols/novell/novell.c:1612
+#: src/protocols/novell/novell.c:1103 src/protocols/novell/novell.c:1613
 msgid "Error communicating with server. Closing connection."
 msgstr "Chyba při komunikaci se serverem. Zavírám spojení."
 
-#: src/protocols/novell/novell.c:1425
+#: src/protocols/novell/novell.c:1426
 msgid "Userid"
 msgstr "ID uživatele"
 
@@ -7093,46 +7193,46 @@
 #. tag, value);
 #. }
 #.
-#: src/protocols/novell/novell.c:1439
+#: src/protocols/novell/novell.c:1440
 msgid "Full name"
 msgstr "Celé jméno"
 
-#: src/protocols/novell/novell.c:1459
+#: src/protocols/novell/novell.c:1460
 msgid "User Properties"
 msgstr "Vlastnosti uživatele"
 
-#: src/protocols/novell/novell.c:1563
+#: src/protocols/novell/novell.c:1564
 #, c-format
 msgid "GroupWise Conference %d"
 msgstr "Konference GroupWise %d"
 
-#: src/protocols/novell/novell.c:1588
+#: src/protocols/novell/novell.c:1589
 msgid "Unable to make SSL connection to server."
 msgstr "Nemohu vytvořit připojení SSL k serveru."
 
-#: src/protocols/novell/novell.c:1618
+#: src/protocols/novell/novell.c:1619
 #, c-format
 msgid "Error processing event or response (%s)."
 msgstr "Chyba při zpracovávání události nebo odpovědi. (%s)"
 
-#: src/protocols/novell/novell.c:1652
+#: src/protocols/novell/novell.c:1653
 msgid "Authenticating..."
 msgstr "Autentizuji..."
 
-#: src/protocols/novell/novell.c:1667
+#: src/protocols/novell/novell.c:1668
 msgid "Waiting for response..."
 msgstr "Čekám na odpověď..."
 
-#: src/protocols/novell/novell.c:1802
+#: src/protocols/novell/novell.c:1803
 #, c-format
 msgid "%s has been invited to this conversation."
 msgstr "%s byl pozván do této konverzace."
 
-#: src/protocols/novell/novell.c:1829
+#: src/protocols/novell/novell.c:1830
 msgid "Invitation to Conversation"
 msgstr "Pozvání ke konverzaci"
 
-#: src/protocols/novell/novell.c:1830
+#: src/protocols/novell/novell.c:1831
 #, c-format
 msgid ""
 "Invitation from: %s\n"
@@ -7143,16 +7243,16 @@
 "\n"
 "Odesláno: %s"
 
-#: src/protocols/novell/novell.c:1832
+#: src/protocols/novell/novell.c:1833
 msgid "Would you like to join the conversation?"
 msgstr "Chcete se připojit k této konverzaci?"
 
-#: src/protocols/novell/novell.c:1937
+#: src/protocols/novell/novell.c:1938
 msgid "You have been logged out because you logged in at another workstation."
 msgstr ""
 "Byli jste odhlášeni, protože jste se přihlásili u jiné pracovní stanice."
 
-#: src/protocols/novell/novell.c:1991
+#: src/protocols/novell/novell.c:1992
 #, c-format
 msgid ""
 "%s appears to be offline and did not receive the message that you just sent."
@@ -7162,7 +7262,7 @@
 #. *  gaim_request_fields(gc, _("Server Address"),...);
 #.
 #. ...but for now just error out with a nice message.
-#: src/protocols/novell/novell.c:2089
+#: src/protocols/novell/novell.c:2090
 msgid ""
 "Unable to connect to server. Please enter the address of the server you wish "
 "to connect to."
@@ -7170,28 +7270,28 @@
 "Nemohu se připojit k serveru. Zadejte prosím adresu serveru, ke kterému se "
 "chcete připojit."
 
-#: src/protocols/novell/novell.c:2111
+#: src/protocols/novell/novell.c:2112
 msgid "Error. SSL support is not installed."
 msgstr "Chyba. Není nainstalována podpora SSL."
 
-#: src/protocols/novell/novell.c:2420
+#: src/protocols/novell/novell.c:2421
 msgid "This conference has been closed. No more messages can be sent."
 msgstr "Tato konference byla uzavřena. Nelze tam posílat další zprávy."
 
-#: src/protocols/novell/novell.c:2727 src/protocols/oscar/oscar.c:582
-#: src/protocols/oscar/oscar.c:6473 src/protocols/yahoo/yahoo.c:2490
+#: src/protocols/novell/novell.c:2733 src/protocols/oscar/oscar.c:586
+#: src/protocols/oscar/oscar.c:6490 src/protocols/yahoo/yahoo.c:2513
 msgid "Offline"
 msgstr "Odpojen"
 
-#: src/protocols/novell/novell.c:2738
+#: src/protocols/novell/novell.c:2744
 msgid "Message"
 msgstr "Zpráva"
 
-#: src/protocols/novell/novell.c:2837 src/protocols/novell/novell.c:2893
+#: src/protocols/novell/novell.c:2843 src/protocols/novell/novell.c:2899
 msgid "Appear Offline"
 msgstr "Vypadat odpojen"
 
-#: src/protocols/novell/novell.c:3287
+#: src/protocols/novell/novell.c:3293
 msgid "Initiate _Chat"
 msgstr "Začít _chat"
 
@@ -7206,15 +7306,15 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/novell/novell.c:3381 src/protocols/novell/novell.c:3383
+#: src/protocols/novell/novell.c:3389 src/protocols/novell/novell.c:3391
 msgid "Novell GroupWise Messenger Protocol Plugin"
 msgstr "Zásuvný modul protokolu Novell GroupWise Messenger"
 
-#: src/protocols/novell/novell.c:3402
+#: src/protocols/novell/novell.c:3410
 msgid "Server address"
 msgstr "Adresa serveru"
 
-#: src/protocols/novell/novell.c:3406
+#: src/protocols/novell/novell.c:3414
 msgid "Server port"
 msgstr "Port serveru"
 
@@ -7314,157 +7414,163 @@
 msgid "Not while on AOL"
 msgstr "Ne když na AOL"
 
-#: src/protocols/oscar/oscar.c:436
+#: src/protocols/oscar/oscar.c:403
+msgid ""
+"(There was an error converting this message.  The buddy you are speaking to "
+"most likely has a buggy client.)"
+msgstr "(Při konverzi této zprávy došlo k chybě. Kamarád, se kterým mluvíte, má pravděpodobně klienta s chybami.)"
+
+#: src/protocols/oscar/oscar.c:441
 msgid "Voice"
 msgstr "Hlas"
 
-#: src/protocols/oscar/oscar.c:439
+#: src/protocols/oscar/oscar.c:444
 msgid "AIM Direct IM"
 msgstr "AIM Přímé IM"
 
-#: src/protocols/oscar/oscar.c:442 src/protocols/silc/buddy.c:1497
-#: src/protocols/silc/silc.c:631
+#: src/protocols/oscar/oscar.c:447 src/protocols/silc/silc.c:635
+#: src/protocols/silc/util.c:506
 msgid "Chat"
 msgstr "Chat"
 
-#: src/protocols/oscar/oscar.c:445 src/protocols/oscar/oscar.c:6777
+#: src/protocols/oscar/oscar.c:450 src/protocols/oscar/oscar.c:6793
 msgid "Get File"
 msgstr "Získat soubor"
 
-#: src/protocols/oscar/oscar.c:452
+#: src/protocols/oscar/oscar.c:457
 msgid "Games"
 msgstr "Hry"
 
-#: src/protocols/oscar/oscar.c:455
+#: src/protocols/oscar/oscar.c:460
 msgid "Add-Ins"
 msgstr "Přídavky"
 
-#: src/protocols/oscar/oscar.c:458
+#: src/protocols/oscar/oscar.c:463
 msgid "Send Buddy List"
 msgstr "Odeslat seznam kamarádů"
 
-#: src/protocols/oscar/oscar.c:461
+#: src/protocols/oscar/oscar.c:466
 msgid "ICQ Direct Connect"
 msgstr "Přímé spojení ICQ"
 
-#: src/protocols/oscar/oscar.c:464
+#: src/protocols/oscar/oscar.c:469
 msgid "AP User"
 msgstr "Uživatel AP"
 
-#: src/protocols/oscar/oscar.c:467
+#: src/protocols/oscar/oscar.c:472
 msgid "ICQ RTF"
 msgstr "ICQ RTF"
 
-#: src/protocols/oscar/oscar.c:470
+#: src/protocols/oscar/oscar.c:475
 msgid "Nihilist"
 msgstr "Nihilist"
 
-#: src/protocols/oscar/oscar.c:473
+#: src/protocols/oscar/oscar.c:478
 msgid "ICQ Server Relay"
 msgstr "Relay ICQ serveru"
 
-#: src/protocols/oscar/oscar.c:476
+#: src/protocols/oscar/oscar.c:481
 msgid "Old ICQ UTF8"
 msgstr "Staré ICQ UTF8"
 
-#: src/protocols/oscar/oscar.c:479
+#: src/protocols/oscar/oscar.c:484
 msgid "Trillian Encryption"
 msgstr "Šifrování Trillian"
 
-#: src/protocols/oscar/oscar.c:482
+#: src/protocols/oscar/oscar.c:487
 msgid "ICQ UTF8"
 msgstr "ICQ UTF8"
 
-#: src/protocols/oscar/oscar.c:485
+#: src/protocols/oscar/oscar.c:490
 msgid "Hiptop"
 msgstr "Hiptop"
 
-#: src/protocols/oscar/oscar.c:488
+#: src/protocols/oscar/oscar.c:493
 msgid "Security Enabled"
 msgstr "Zabezpečení povoleno"
 
-#: src/protocols/oscar/oscar.c:491
+#: src/protocols/oscar/oscar.c:496
 msgid "Video Chat"
 msgstr "Video Chat"
 
-#: src/protocols/oscar/oscar.c:495
+#: src/protocols/oscar/oscar.c:500
 msgid "iChat AV"
 msgstr "iChat AV"
 
-#: src/protocols/oscar/oscar.c:498
+#: src/protocols/oscar/oscar.c:503
 msgid "Live Video"
 msgstr "Živé video"
 
-#: src/protocols/oscar/oscar.c:501
+#: src/protocols/oscar/oscar.c:506
 msgid "Camera"
 msgstr "Kamera"
 
-#: src/protocols/oscar/oscar.c:520 src/protocols/oscar/oscar.c:5477
-#: src/protocols/oscar/oscar.c:6666
+#: src/protocols/oscar/oscar.c:524 src/protocols/oscar/oscar.c:5493
+#: src/protocols/oscar/oscar.c:6683
 msgid "Free For Chat"
 msgstr "Volný pro chat"
 
-#: src/protocols/oscar/oscar.c:524 src/protocols/oscar/oscar.c:5471
-#: src/protocols/oscar/oscar.c:6664
+#: src/protocols/oscar/oscar.c:528 src/protocols/oscar/oscar.c:5487
+#: src/protocols/oscar/oscar.c:6681
 msgid "Not Available"
 msgstr "Nejsem k dispozici"
 
-#: src/protocols/oscar/oscar.c:526 src/protocols/oscar/oscar.c:5474
-#: src/protocols/oscar/oscar.c:6665
+#: src/protocols/oscar/oscar.c:530 src/protocols/oscar/oscar.c:5490
+#: src/protocols/oscar/oscar.c:6682
 msgid "Occupied"
 msgstr "Zaměstnán"
 
-#: src/protocols/oscar/oscar.c:530
+#: src/protocols/oscar/oscar.c:534
 msgid "Web Aware"
 msgstr "Ví o WWW"
 
-#: src/protocols/oscar/oscar.c:598
+#: src/protocols/oscar/oscar.c:602
 msgid "Capabilities"
 msgstr "Schopnosti"
 
-#: src/protocols/oscar/oscar.c:604
+#: src/protocols/oscar/oscar.c:609
 msgid "Buddy Comment"
 msgstr "Poznámka o kamarádovi"
 
-#: src/protocols/oscar/oscar.c:739
+#: src/protocols/oscar/oscar.c:744
 #, c-format
 msgid "Direct IM with %s closed"
 msgstr "Přímé IM s %s zavřeno"
 
-#: src/protocols/oscar/oscar.c:741
+#: src/protocols/oscar/oscar.c:746
 #, c-format
 msgid "Direct IM with %s failed"
 msgstr "Přímé IM s %s selhalo"
 
-#: src/protocols/oscar/oscar.c:748
+#: src/protocols/oscar/oscar.c:753
 msgid "Direct Connect failed"
 msgstr "Přímé spojení selhalo"
 
-#: src/protocols/oscar/oscar.c:825 src/protocols/oscar/oscar.c:956
+#: src/protocols/oscar/oscar.c:830 src/protocols/oscar/oscar.c:961
 #, c-format
 msgid "Direct IM with %s established"
 msgstr "Přímé IM s %s navázáno"
 
-#: src/protocols/oscar/oscar.c:906
+#: src/protocols/oscar/oscar.c:911
 #, c-format
 msgid "Attempting to connect to %s at %s:%hu for Direct IM."
 msgstr "Pokouším se připojit k %s na %s:%hu pro přímé IM."
 
-#: src/protocols/oscar/oscar.c:1322
+#: src/protocols/oscar/oscar.c:1328
 #, c-format
 msgid "Asking %s to connect to us at %s:%hu for Direct IM."
 msgstr "Žádám %s, aby se k nám připojili na %s:%hu pro přímé IM."
 
-#: src/protocols/oscar/oscar.c:1327
+#: src/protocols/oscar/oscar.c:1333
 msgid "Unable to open Direct IM"
 msgstr "Nemohu otevřít Přímé IM"
 
-#: src/protocols/oscar/oscar.c:1362
+#: src/protocols/oscar/oscar.c:1368
 #, c-format
 msgid "You have selected to open a Direct IM connection with %s."
 msgstr "Rozhodli jste se otevřít Přímé IM spojení s %s."
 
-#: src/protocols/oscar/oscar.c:1366
+#: src/protocols/oscar/oscar.c:1372
 msgid ""
 "Because this reveals your IP address, it may be considered a privacy risk.  "
 "Do you wish to continue?"
@@ -7472,24 +7578,24 @@
 "Protože to odkryje vaši IP adresu, dá se to považovat za riziko pro "
 "soukromí. Chcete pokračovat?"
 
-#: src/protocols/oscar/oscar.c:1370 src/protocols/oscar/oscar.c:3312
+#: src/protocols/oscar/oscar.c:1376 src/protocols/oscar/oscar.c:3328
 msgid "Connect"
 msgstr "Připojit"
 
-#: src/protocols/oscar/oscar.c:1436 src/protocols/toc/toc.c:872
+#: src/protocols/oscar/oscar.c:1442 src/protocols/toc/toc.c:872
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "Byl jste odpojen z místnosti chatu %s."
 
-#: src/protocols/oscar/oscar.c:1452
+#: src/protocols/oscar/oscar.c:1458
 msgid "Chat is currently unavailable"
 msgstr "Chat je momentálně nedostupný"
 
-#: src/protocols/oscar/oscar.c:1533
+#: src/protocols/oscar/oscar.c:1539
 msgid "Screen name sent"
 msgstr "Jméno uživatele odesláno"
 
-#: src/protocols/oscar/oscar.c:1547
+#: src/protocols/oscar/oscar.c:1553
 #, c-format
 msgid ""
 "Unable to login: Could not sign on as %s because the screen name is "
@@ -7500,46 +7606,46 @@
 "není platné. Jména užvatele musí buď začínat písmenem a obsahovat jen "
 "číslice, písmena a mezery, nebo musí obsahovat jen číslice."
 
-#: src/protocols/oscar/oscar.c:1575
+#: src/protocols/oscar/oscar.c:1581
 msgid "Unable to login to AIM"
 msgstr "Nemohu se přihlásit do AIM"
 
-#: src/protocols/oscar/oscar.c:1676 src/protocols/oscar/oscar.c:2103
+#: src/protocols/oscar/oscar.c:1682 src/protocols/oscar/oscar.c:2119
 msgid "Could Not Connect"
 msgstr "Nemohu se připojit"
 
-#: src/protocols/oscar/oscar.c:1684
+#: src/protocols/oscar/oscar.c:1690
 msgid "Connection established, cookie sent"
 msgstr "Spojení navázáno, cookie odesláno"
 
-#: src/protocols/oscar/oscar.c:1797 src/protocols/yahoo/yahoo_filexfer.c:180
+#: src/protocols/oscar/oscar.c:1803 src/protocols/yahoo/yahoo_filexfer.c:180
 #: src/protocols/yahoo/yahoo_filexfer.c:189
 #: src/protocols/yahoo/yahoo_filexfer.c:199
 msgid "Unable to establish file descriptor."
 msgstr "Nemohu získat deskriptor souboru."
 
-#: src/protocols/oscar/oscar.c:1802
+#: src/protocols/oscar/oscar.c:1808
 msgid "Unable to create new connection."
 msgstr "Nemohu vytvořit nové spojení."
 
-#: src/protocols/oscar/oscar.c:1873
+#: src/protocols/oscar/oscar.c:1879
 msgid "Unable to establish listener socket."
 msgstr "Nemohu vytvořit naslouchající socket."
 
-#: src/protocols/oscar/oscar.c:1987 src/protocols/toc/toc.c:541
+#: src/protocols/oscar/oscar.c:2003 src/protocols/toc/toc.c:541
 msgid "Incorrect nickname or password."
 msgstr "Nesprávná přezdívka nebo heslo."
 
-#: src/protocols/oscar/oscar.c:1992
+#: src/protocols/oscar/oscar.c:2008
 msgid "Your account is currently suspended."
 msgstr "Váš účet je momentálně suspendován."
 
 #. service temporarily unavailable
-#: src/protocols/oscar/oscar.c:1996
+#: src/protocols/oscar/oscar.c:2012
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr "Služba AOL Instant Messenger je dočasně nedostupná."
 
-#: src/protocols/oscar/oscar.c:2001
+#: src/protocols/oscar/oscar.c:2017
 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."
@@ -7547,22 +7653,22 @@
 "Připojovali a odpojovali jste se příliš často. Počkejte deset minut a zkuste "
 "to znovu. Pokud to budete dále zkouše, budete muset čekat ještě déle."
 
-#: src/protocols/oscar/oscar.c:2006
+#: src/protocols/oscar/oscar.c:2022
 #, c-format
 msgid "The client version you are using is too old. Please upgrade at %s"
 msgstr ""
 "Verze klienta, kterou používáte, je příliš stará. Aktualizujte prosím na %s"
 
-#: src/protocols/oscar/oscar.c:2038
+#: src/protocols/oscar/oscar.c:2054
 msgid "Internal Error"
 msgstr "Interní chyba"
 
-#: src/protocols/oscar/oscar.c:2110
+#: src/protocols/oscar/oscar.c:2126
 msgid "Received authorization"
-msgstr "Přijal jsem autorizaci"
-
-#: src/protocols/oscar/oscar.c:2146 src/protocols/oscar/oscar.c:2176
-#: src/protocols/oscar/oscar.c:2264
+msgstr "Přijata autorizace"
+
+#: src/protocols/oscar/oscar.c:2162 src/protocols/oscar/oscar.c:2192
+#: src/protocols/oscar/oscar.c:2280
 #, c-format
 msgid ""
 "You may be disconnected shortly.  You may want to use TOC until this is "
@@ -7571,24 +7677,24 @@
 "Možná budete brzo odpojen. Možná budete chtít používat TOC, dokud toto není "
 "opraveno. Hledejte aktualizace na %s."
 
-#: src/protocols/oscar/oscar.c:2149 src/protocols/oscar/oscar.c:2179
+#: src/protocols/oscar/oscar.c:2165 src/protocols/oscar/oscar.c:2195
 msgid "Gaim was unable to get a valid AIM login hash."
 msgstr "Gaim nemohl získat platný přihlašovací hash AIM."
 
-#: src/protocols/oscar/oscar.c:2267
+#: src/protocols/oscar/oscar.c:2283
 msgid "Gaim was unable to get a valid login hash."
 msgstr "Gaim nemohl získat platný přihlašovací hash."
 
-#: src/protocols/oscar/oscar.c:3096 src/protocols/oscar/oscar.c:3118
+#: src/protocols/oscar/oscar.c:3112 src/protocols/oscar/oscar.c:3134
 msgid "(There was an error receiving this message)"
 msgstr "(Při příjmu této zprávy došlo k chybě)"
 
-#: src/protocols/oscar/oscar.c:3304
+#: src/protocols/oscar/oscar.c:3320
 #, c-format
 msgid "%s has just asked to directly connect to %s"
 msgstr "%s právě požádal o přímé spojení s %s"
 
-#: src/protocols/oscar/oscar.c:3307
+#: src/protocols/oscar/oscar.c:3323
 msgid ""
 "This requires a direct connection between the two computers and is necessary "
 "for IM Images.  Because your IP address will be revealed, this may be "
@@ -7598,20 +7704,20 @@
 "Images. Protože bude odkryta vaše IP adresa, dá se to považovat za riziko "
 "pro soukromí."
 
-#: src/protocols/oscar/oscar.c:3343
+#: src/protocols/oscar/oscar.c:3359
 msgid "Please authorize me so I can add you to my buddy list."
 msgstr ""
 "Autorizujte mě prosím, abych vás mohl přidat do svého seznamu kamarádů."
 
-#: src/protocols/oscar/oscar.c:3351
+#: src/protocols/oscar/oscar.c:3367
 msgid "Authorization Request Message:"
 msgstr "Zpráva požadavku na autorizaci"
 
-#: src/protocols/oscar/oscar.c:3352
+#: src/protocols/oscar/oscar.c:3368
 msgid "Please authorize me!"
 msgstr "Autorizujte mě prosím!"
 
-#: src/protocols/oscar/oscar.c:3382
+#: src/protocols/oscar/oscar.c:3398
 #, c-format
 msgid ""
 "The user %s requires authorization before being added to a buddy list.  Do "
@@ -7620,23 +7726,23 @@
 "Uživatel %s vyžaduje autorizaci před přidáním do seznamu kamarádů. Chcete "
 "odeslat požadavek na autorizaci?"
 
-#: src/protocols/oscar/oscar.c:3387 src/protocols/oscar/oscar.c:3389
+#: src/protocols/oscar/oscar.c:3403 src/protocols/oscar/oscar.c:3405
 msgid "Request Authorization"
 msgstr "Požadovat autorizaci"
 
-#: src/protocols/oscar/oscar.c:3437 src/protocols/oscar/oscar.c:3439
-#: src/protocols/oscar/oscar.c:3446 src/protocols/oscar/oscar.c:3528
-#: src/protocols/oscar/oscar.c:3548 src/protocols/oscar/oscar.c:3902
-#: src/protocols/oscar/oscar.c:3962 src/protocols/oscar/oscar.c:6092
-#: src/protocols/oscar/oscar.c:6138
+#: src/protocols/oscar/oscar.c:3453 src/protocols/oscar/oscar.c:3455
+#: src/protocols/oscar/oscar.c:3462 src/protocols/oscar/oscar.c:3544
+#: src/protocols/oscar/oscar.c:3564 src/protocols/oscar/oscar.c:3918
+#: src/protocols/oscar/oscar.c:3978 src/protocols/oscar/oscar.c:6109
+#: src/protocols/oscar/oscar.c:6155
 msgid "No reason given."
 msgstr "Neudán žádný důvod."
 
-#: src/protocols/oscar/oscar.c:3445
+#: src/protocols/oscar/oscar.c:3461
 msgid "Authorization Denied Message:"
 msgstr "Zpráva odmítnutí autorizace:"
 
-#: src/protocols/oscar/oscar.c:3528
+#: src/protocols/oscar/oscar.c:3544
 #, c-format
 msgid ""
 "The user %u wants to add you to their buddy list for the following reason:\n"
@@ -7646,11 +7752,11 @@
 "důvodu:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:3536 src/protocols/oscar/oscar.c:6098
+#: src/protocols/oscar/oscar.c:3552 src/protocols/oscar/oscar.c:6115
 msgid "Authorization Request"
 msgstr "Požadavek na autorizaci"
 
-#: src/protocols/oscar/oscar.c:3548
+#: src/protocols/oscar/oscar.c:3564
 #, c-format
 msgid ""
 "The user %u has denied your request to add them to your buddy list for the "
@@ -7661,18 +7767,18 @@
 "následujícího důvodu:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:3549
+#: src/protocols/oscar/oscar.c:3565
 msgid "ICQ authorization denied."
 msgstr "Autorizace ICQ odepřena."
 
 #. Someone has granted you authorization
-#: src/protocols/oscar/oscar.c:3556
+#: src/protocols/oscar/oscar.c:3572
 #, c-format
 msgid "The user %u has granted your request to add them to your buddy list."
 msgstr ""
 "Uživatel %u splnil váš požadavek na jeho přidání do vašeho seznamu kamarádů."
 
-#: src/protocols/oscar/oscar.c:3564
+#: src/protocols/oscar/oscar.c:3580
 #, c-format
 msgid ""
 "You have received a special message\n"
@@ -7685,7 +7791,7 @@
 "Od: %s [%s]\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:3572
+#: src/protocols/oscar/oscar.c:3588
 #, c-format
 msgid ""
 "You have received an ICQ page\n"
@@ -7698,7 +7804,7 @@
 "Od: %s [%s]\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:3580
+#: src/protocols/oscar/oscar.c:3596
 #, c-format
 msgid ""
 "You have received an ICQ email from %s [%s]\n"
@@ -7711,20 +7817,20 @@
 "Zpráva je:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:3601
+#: src/protocols/oscar/oscar.c:3617
 #, c-format
 msgid "ICQ user %u has sent you a buddy: %s (%s)"
 msgstr "Uživatel ICQ %u vám poslal kamaráda: %s (%s)"
 
-#: src/protocols/oscar/oscar.c:3607
+#: src/protocols/oscar/oscar.c:3623
 msgid "Do you want to add this buddy to your buddy list?"
 msgstr "Chcete přidat tohoto kamaráda do svého seznamu kamarádů?"
 
-#: src/protocols/oscar/oscar.c:3611
+#: src/protocols/oscar/oscar.c:3627
 msgid "Decline"
 msgstr "Odmítnout"
 
-#: src/protocols/oscar/oscar.c:3696
+#: src/protocols/oscar/oscar.c:3712
 #, 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."
@@ -7732,7 +7838,7 @@
 msgstr[1] "Přišli jste o %hu zprávy od %s, protože byly neplatné."
 msgstr[2] "Přišli jste o %hu zpráv od %s, protože byly neplatné."
 
-#: src/protocols/oscar/oscar.c:3705
+#: src/protocols/oscar/oscar.c:3721
 #, 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."
@@ -7740,7 +7846,7 @@
 msgstr[1] "Přišli jste o %hu zprávy od %s, protože byly příliš velké."
 msgstr[2] "Přišli jste o %hu zpráv od %s, protože byly příliš velké."
 
-#: src/protocols/oscar/oscar.c:3714
+#: src/protocols/oscar/oscar.c:3730
 #, c-format
 msgid ""
 "You missed %hu message from %s because the rate limit has been exceeded."
@@ -7753,7 +7859,7 @@
 msgstr[2] ""
 "Přišli jste o %hu zpráv od %s, protože limit rychlosti byl překročen."
 
-#: src/protocols/oscar/oscar.c:3723
+#: src/protocols/oscar/oscar.c:3739
 #, 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."
@@ -7761,7 +7867,7 @@
 msgstr[1] "Přišli jste o %hu zprávy od %s, protože byli příliš zlí."
 msgstr[2] "Přišli jste o %hu zpráv od %s, protože byli příliš zlí."
 
-#: src/protocols/oscar/oscar.c:3732
+#: src/protocols/oscar/oscar.c:3748
 #, 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."
@@ -7769,7 +7875,7 @@
 msgstr[1] "Přišli jste o %hu zprávy od %s, protože jste velmi zlí."
 msgstr[2] "Přišli jste o %hu zpráv od %s, protože jste velmi zlí."
 
-#: src/protocols/oscar/oscar.c:3741
+#: src/protocols/oscar/oscar.c:3757
 #, 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."
@@ -7777,54 +7883,49 @@
 msgstr[1] "Přišli jste o %hu zprávy od %s z neznámého důvodu."
 msgstr[2] "Přišli jste o %hu zpráv od %s z neznámého důvodu."
 
-#: src/protocols/oscar/oscar.c:3798 src/protocols/oscar/oscar.c:4022
+#: src/protocols/oscar/oscar.c:3814 src/protocols/oscar/oscar.c:4038
 #, c-format
 msgid "Info for %s"
 msgstr "Informace pro %s"
 
-#: src/protocols/oscar/oscar.c:3803
-#, c-format
-msgid "<B>UIN:</B> %s<BR><B>Status:</B> %s<HR>%s"
-msgstr "<B>UIN:</B> %s<BR><B>Stav:</B> %s<HR>%s"
-
-#: src/protocols/oscar/oscar.c:3864
+#: src/protocols/oscar/oscar.c:3880
 #, c-format
 msgid "SNAC threw error: %s\n"
 msgstr "SNAC hodil chybu: %s\n"
 
-#: src/protocols/oscar/oscar.c:3865
+#: src/protocols/oscar/oscar.c:3881
 msgid "Unknown error"
 msgstr "Neznámá chyba"
 
 #. Data is assumed to be the destination sn
-#: src/protocols/oscar/oscar.c:3900
+#: src/protocols/oscar/oscar.c:3916
 #, c-format
 msgid "Your message to %s did not get sent:"
 msgstr "Vaše zpráva pro %s nebyla odeslána:"
 
-#: src/protocols/oscar/oscar.c:3959
+#: src/protocols/oscar/oscar.c:3975
 #, c-format
 msgid "User information for %s unavailable:"
 msgstr "Informace o uživateli %s nedostupné:"
 
-#: src/protocols/oscar/oscar.c:3982
+#: src/protocols/oscar/oscar.c:3998
 msgid "Warning Level"
 msgstr "Úroveň varování"
 
-#: src/protocols/oscar/oscar.c:3985
+#: src/protocols/oscar/oscar.c:4001
 msgid "Online Since"
 msgstr "Odpojen od"
 
-#: src/protocols/oscar/oscar.c:3989 src/protocols/yahoo/yahoo_profile.c:1113
+#: src/protocols/oscar/oscar.c:4005 src/protocols/yahoo/yahoo_profile.c:1118
 msgid "Member Since"
 msgstr "Člen od"
 
-#: src/protocols/oscar/oscar.c:4073
+#: src/protocols/oscar/oscar.c:4089
 msgid "Your AIM connection may be lost."
 msgstr "Vaše spojení AIM může být přerušeno."
 
 #. The conversion failed!
-#: src/protocols/oscar/oscar.c:4259
+#: src/protocols/oscar/oscar.c:4275
 msgid ""
 "[Unable to display a message from this user because it contained invalid "
 "characters.]"
@@ -7832,11 +7933,11 @@
 "[Nemohu zobrazit zprávu od tohoto uživatele, protože obsahovala neplatné "
 "znaky.]"
 
-#: src/protocols/oscar/oscar.c:4476
+#: src/protocols/oscar/oscar.c:4492
 msgid "Rate limiting error."
 msgstr "Chyba omezení rychlosti."
 
-#: src/protocols/oscar/oscar.c:4477
+#: src/protocols/oscar/oscar.c:4493
 msgid ""
 "The last action you attempted could not be performed because you are over "
 "the rate limit. Please wait 10 seconds and try again."
@@ -7844,7 +7945,7 @@
 "Poslední akce, o kterou jste se pokusili, nemohla být provedena, protože "
 "jste překročili limit rychlosti. Počkejte prosím 10 sekund a zkuste to znovu."
 
-#: src/protocols/oscar/oscar.c:4540
+#: src/protocols/oscar/oscar.c:4556
 msgid ""
 "You have been disconnected because you have signed on with this screen name "
 "at another location."
@@ -7852,113 +7953,113 @@
 "Byli jste odpojeni protože jste se s tímto jménem uživatele přihlásili na "
 "jiném místě."
 
-#: src/protocols/oscar/oscar.c:4542
+#: src/protocols/oscar/oscar.c:4558
 msgid "You have been signed off for an unknown reason."
 msgstr "Byli jste odpojeni z neznámého důvodu."
 
-#: src/protocols/oscar/oscar.c:4573
+#: src/protocols/oscar/oscar.c:4589
 msgid "Finalizing connection"
 msgstr "Dokončuji spojení"
 
-#: src/protocols/oscar/oscar.c:4843 src/protocols/oscar/oscar.c:4850
+#: src/protocols/oscar/oscar.c:4859 src/protocols/oscar/oscar.c:4866
 msgid "Email Address"
 msgstr "Emailová adresa"
 
-#: src/protocols/oscar/oscar.c:4855 src/protocols/silc/buddy.c:1524
+#: src/protocols/oscar/oscar.c:4871 src/protocols/silc/util.c:538
 msgid "Mobile Phone"
 msgstr "Mobilní telefon"
 
-#: src/protocols/oscar/oscar.c:4856
+#: src/protocols/oscar/oscar.c:4872
 msgid "Not specified"
 msgstr "Neurčeno"
 
-#: src/protocols/oscar/oscar.c:4857 src/protocols/trepia/trepia.c:281
+#: src/protocols/oscar/oscar.c:4873 src/protocols/trepia/trepia.c:281
 #: src/protocols/trepia/trepia.c:407
 msgid "Female"
 msgstr "Žena"
 
-#: src/protocols/oscar/oscar.c:4857 src/protocols/trepia/trepia.c:280
+#: src/protocols/oscar/oscar.c:4873 src/protocols/trepia/trepia.c:280
 #: src/protocols/trepia/trepia.c:407
 msgid "Male"
 msgstr "Muž"
 
-#: src/protocols/oscar/oscar.c:4873
+#: src/protocols/oscar/oscar.c:4889
 msgid "Personal Web Page"
 msgstr "Osobní WWW stránka"
 
-#: src/protocols/oscar/oscar.c:4877
+#: src/protocols/oscar/oscar.c:4893
 msgid "Additional Information"
 msgstr "Přídavné informace"
 
-#: src/protocols/oscar/oscar.c:4882
-msgid "Home Address"
-msgstr "Domácí adresa"
-
-#: src/protocols/oscar/oscar.c:4886 src/protocols/oscar/oscar.c:4894
-msgid "Zip Code"
-msgstr "PSČ"
-
-#: src/protocols/oscar/oscar.c:4890
-msgid "Work Address"
-msgstr "Pracovní adresa"
-
 #: src/protocols/oscar/oscar.c:4898
+msgid "Home Address"
+msgstr "Domácí adresa"
+
+#: src/protocols/oscar/oscar.c:4902 src/protocols/oscar/oscar.c:4910
+msgid "Zip Code"
+msgstr "PSČ"
+
+#: src/protocols/oscar/oscar.c:4906
+msgid "Work Address"
+msgstr "Pracovní adresa"
+
+#: src/protocols/oscar/oscar.c:4914
 msgid "Work Information"
 msgstr "Pracovní informace"
 
-#: src/protocols/oscar/oscar.c:4899
+#: src/protocols/oscar/oscar.c:4915
 msgid "Company"
 msgstr "Společnost"
 
-#: src/protocols/oscar/oscar.c:4900
+#: src/protocols/oscar/oscar.c:4916
 msgid "Division"
 msgstr "Oddělení"
 
-#: src/protocols/oscar/oscar.c:4901
+#: src/protocols/oscar/oscar.c:4917
 msgid "Position"
 msgstr "Pozice"
 
-#: src/protocols/oscar/oscar.c:4903
+#: src/protocols/oscar/oscar.c:4919
 msgid "Web Page"
 msgstr "WWW stránka"
 
-#: src/protocols/oscar/oscar.c:4909
+#: src/protocols/oscar/oscar.c:4925
 #, c-format
 msgid "ICQ Info for %s"
 msgstr "Informace ICQ pro %s"
 
-#: src/protocols/oscar/oscar.c:4958
+#: src/protocols/oscar/oscar.c:4974
 msgid "Pop-Up Message"
 msgstr "Vyskakovací zpráva"
 
-#: src/protocols/oscar/oscar.c:4979
+#: src/protocols/oscar/oscar.c:4995
 #, c-format
 msgid "The following screen names are associated with %s"
 msgstr "Následující jména uživatele jsou asociována s %s"
 
-#: src/protocols/oscar/oscar.c:4983
+#: src/protocols/oscar/oscar.c:4999
 msgid "Search Results"
 msgstr "Výsledky hledání"
 
-#: src/protocols/oscar/oscar.c:5000
+#: src/protocols/oscar/oscar.c:5016
 #, c-format
 msgid "No results found for email address %s"
 msgstr "Pro e-mailovou adresu %s nebyly nalezeny žádné výsledky"
 
-#: src/protocols/oscar/oscar.c:5021
+#: src/protocols/oscar/oscar.c:5037
 #, c-format
 msgid "You should receive an email asking to confirm %s."
 msgstr "Měli byste dostat e-mail žádající o potvrzení %s."
 
-#: src/protocols/oscar/oscar.c:5023
+#: src/protocols/oscar/oscar.c:5039
 msgid "Account Confirmation Requested"
 msgstr "Požadováno potvrzení účtu"
 
-#: src/protocols/oscar/oscar.c:5051
+#: src/protocols/oscar/oscar.c:5067
 msgid "Error Changing Account Info"
 msgstr "Chyba při změně informací o účtu"
 
-#: src/protocols/oscar/oscar.c:5054
+#: src/protocols/oscar/oscar.c:5070
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
@@ -7967,7 +8068,7 @@
 "Chyba 0x%04x: Nemohu naformátovat jméno uživatele, protože požadované jméno "
 "uživatele se liší od původního."
 
-#: src/protocols/oscar/oscar.c:5057
+#: src/protocols/oscar/oscar.c:5073
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
@@ -7976,7 +8077,7 @@
 "Chyba 0x%04x: Nemohu naformátovat jméno uživatele, protože požadované jméno "
 "uživatele končí mezerou."
 
-#: src/protocols/oscar/oscar.c:5060
+#: src/protocols/oscar/oscar.c:5076
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
@@ -7985,7 +8086,7 @@
 "Chyba 0x%04x: Nemohu naformátovat jméno uživatele, protože požadované jméno "
 "uživatele je příliš dlouhé."
 
-#: src/protocols/oscar/oscar.c:5063
+#: src/protocols/oscar/oscar.c:5079
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change email address because there is already a "
@@ -7994,7 +8095,7 @@
 "Chyba 0x%04x: Nemohu změnit emailovou adresu, protože pro toto jméno "
 "uživatele již existuje požadavek."
 
-#: src/protocols/oscar/oscar.c:5066
+#: src/protocols/oscar/oscar.c:5082
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change email address because the given address has "
@@ -8003,7 +8104,7 @@
 "Chyba 0x%04x: Nemohu změnit emailovou adresu, protože zadaná adresa má "
 "asociováno příliš mnoho jmen uživatelů."
 
-#: src/protocols/oscar/oscar.c:5069
+#: src/protocols/oscar/oscar.c:5085
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change email address because the given address is "
@@ -8012,12 +8113,12 @@
 "Chyba 0x%04x: Nemohu změnit emailovou adresu, protože zadaná adresa je "
 "neplatná."
 
-#: src/protocols/oscar/oscar.c:5072
+#: src/protocols/oscar/oscar.c:5088
 #, c-format
 msgid "Error 0x%04x: Unknown error."
 msgstr "Chyba 0x%04x: Neznámá chyba."
 
-#: src/protocols/oscar/oscar.c:5082
+#: src/protocols/oscar/oscar.c:5098
 #, c-format
 msgid ""
 "Your screen name is currently formatted as follows:\n"
@@ -8026,26 +8127,26 @@
 "Vaše jméno uživatele je aktuálně formátováno následovně:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:5083 src/protocols/oscar/oscar.c:5090
+#: src/protocols/oscar/oscar.c:5099 src/protocols/oscar/oscar.c:5106
 msgid "Account Info"
 msgstr "Informace o účtu"
 
-#: src/protocols/oscar/oscar.c:5088
+#: src/protocols/oscar/oscar.c:5104
 #, c-format
 msgid "The email address for %s is %s"
 msgstr "Emailová adresa pro %s je %s"
 
-#: src/protocols/oscar/oscar.c:5153
+#: src/protocols/oscar/oscar.c:5169
 msgid ""
 "Your IM Image was not sent. You must be Direct Connected to send IM Images."
 msgstr ""
 "Váš IM Image nebyl odeslán. Pro odesílání IM Image musíte být připojen přímo."
 
-#: src/protocols/oscar/oscar.c:5326
+#: src/protocols/oscar/oscar.c:5342
 msgid "Unable to set AIM profile."
 msgstr "Nemohu nastavit profil AIM."
 
-#: src/protocols/oscar/oscar.c:5327
+#: src/protocols/oscar/oscar.c:5343
 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 "
@@ -8055,7 +8156,7 @@
 "procedury přihlášení. Váš profil zůstává nenastaven; zkuste jej nastavit "
 "znovu, až budete úplně připojeni."
 
-#: src/protocols/oscar/oscar.c:5354
+#: src/protocols/oscar/oscar.c:5370
 #, c-format
 msgid ""
 "The maximum profile length of %d byte has been exceeded.  Gaim has truncated "
@@ -8070,19 +8171,19 @@
 msgstr[2] ""
 "Maximální délka profilu %d bajtů byla překročena. Gaim jej pro vás zkrátil."
 
-#: src/protocols/oscar/oscar.c:5359
+#: src/protocols/oscar/oscar.c:5375
 msgid "Profile too long."
 msgstr "Profil příliš dlouhý"
 
-#: src/protocols/oscar/oscar.c:5375 src/protocols/oscar/oscar.c:6671
+#: src/protocols/oscar/oscar.c:5391 src/protocols/oscar/oscar.c:6688
 msgid "Visible"
 msgstr "Viditelný"
 
-#: src/protocols/oscar/oscar.c:5393
+#: src/protocols/oscar/oscar.c:5409
 msgid "Unable to set AIM away message."
 msgstr "Nemohu nastavit zprávu AIM o nepřítomnosti."
 
-#: src/protocols/oscar/oscar.c:5394
+#: src/protocols/oscar/oscar.c:5410
 msgid ""
 "You have probably requested to set your away message before the login "
 "procedure completed.  You remain in a \"present\" state; try setting it "
@@ -8092,7 +8193,7 @@
 "dokončením procedury přihlášení. Zůstáváte ve stavu \"přítomen\"; zkuste jej "
 "nastavit znovu, až budete úplně připojeni."
 
-#: src/protocols/oscar/oscar.c:5434
+#: src/protocols/oscar/oscar.c:5450
 #, c-format
 msgid ""
 "The maximum away message length of %d byte has been exceeded.  Gaim has "
@@ -8110,11 +8211,11 @@
 "Maximální délka zprávy o nepřítomnosti %d bajtů byla překročena. Gaim ji "
 "zkrátil a nastavil vaši nepřítomnost."
 
-#: src/protocols/oscar/oscar.c:5439
+#: src/protocols/oscar/oscar.c:5455
 msgid "Away message too long."
 msgstr "Zpráva o nepřítomnosti příliš dlouhá."
 
-#: src/protocols/oscar/oscar.c:5517
+#: src/protocols/oscar/oscar.c:5533
 #, c-format
 msgid ""
 "Could not add the buddy %s because the screen name is invalid.  Screen names "
@@ -8125,16 +8226,16 @@
 "užvatele musí buď začínat písmenem a obsahovat jen číslice, písmena a "
 "mezery, nebo musí obsahovat jen číslice."
 
-#: src/protocols/oscar/oscar.c:5518 src/protocols/oscar/oscar.c:5959
-#: src/protocols/oscar/oscar.c:5972
+#: src/protocols/oscar/oscar.c:5534 src/protocols/oscar/oscar.c:5976
+#: src/protocols/oscar/oscar.c:5989
 msgid "Unable To Add"
 msgstr "Nemohu přidat"
 
-#: src/protocols/oscar/oscar.c:5678
+#: src/protocols/oscar/oscar.c:5695
 msgid "Unable To Retrieve Buddy List"
 msgstr "Nemohu získat seznam kamarádů"
 
-#: src/protocols/oscar/oscar.c:5679
+#: src/protocols/oscar/oscar.c:5696
 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 "
@@ -8143,13 +8244,13 @@
 "Gaim dočasně nemohl získat váš seznam kamarádů ze serverů AIM. Váš seznam "
 "kamarádů není ztracen a pravděpodobně bude k dispozici za několik hodin."
 
-#: src/protocols/oscar/oscar.c:5855 src/protocols/oscar/oscar.c:5856
-#: src/protocols/oscar/oscar.c:5861 src/protocols/oscar/oscar.c:6016
-#: src/protocols/oscar/oscar.c:6017 src/protocols/oscar/oscar.c:6022
+#: src/protocols/oscar/oscar.c:5872 src/protocols/oscar/oscar.c:5873
+#: src/protocols/oscar/oscar.c:5878 src/protocols/oscar/oscar.c:6033
+#: src/protocols/oscar/oscar.c:6034 src/protocols/oscar/oscar.c:6039
 msgid "Orphans"
 msgstr "Sirotci"
 
-#: src/protocols/oscar/oscar.c:5958
+#: src/protocols/oscar/oscar.c:5975
 #, c-format
 msgid ""
 "Could not add the buddy %s because you have too many buddies in your buddy "
@@ -8158,11 +8259,11 @@
 "Nemohu přidat kamaráda %s, protože ve svém seznamu máte příliš mnoho "
 "kamarádů. Odstraňte prosím jednoho a zkuste to znovu."
 
-#: src/protocols/oscar/oscar.c:5958 src/protocols/oscar/oscar.c:5971
+#: src/protocols/oscar/oscar.c:5975 src/protocols/oscar/oscar.c:5988
 msgid "(no name)"
 msgstr "(žádné jméno)"
 
-#: src/protocols/oscar/oscar.c:5971
+#: src/protocols/oscar/oscar.c:5988
 #, c-format
 msgid ""
 "Could not add the buddy %s for an unknown reason.  The most common reason "
@@ -8172,7 +8273,7 @@
 "Z neznámého důvodu nemohu přidat kamaráda %s. Nejčastější důvod je, že máte "
 "ve svém seznamu kamarádů maximální počet povolených kamarádů."
 
-#: src/protocols/oscar/oscar.c:6053
+#: src/protocols/oscar/oscar.c:6070
 #, c-format
 msgid ""
 "The user %s has given you permission to add you to their buddy list.  Do you "
@@ -8181,11 +8282,11 @@
 "Uživatel %s vám povolil přidat jej do vašeho seznamu kamarádů. Chcete jej "
 "přidat?"
 
-#: src/protocols/oscar/oscar.c:6059
+#: src/protocols/oscar/oscar.c:6076
 msgid "Authorization Given"
 msgstr "Autorizace udělena"
 
-#: src/protocols/oscar/oscar.c:6092
+#: src/protocols/oscar/oscar.c:6109
 #, c-format
 msgid ""
 "The user %s wants to add you to their buddy list for the following reason:\n"
@@ -8196,18 +8297,18 @@
 "%s"
 
 #. Granted
-#: src/protocols/oscar/oscar.c:6134
+#: src/protocols/oscar/oscar.c:6151
 #, c-format
 msgid "The user %s has granted your request to add them to your buddy list."
 msgstr ""
 "Uživatel %s vyhověl vašemu požadavku přidat jej do vašeho seznamu kamarádů."
 
-#: src/protocols/oscar/oscar.c:6135
+#: src/protocols/oscar/oscar.c:6152
 msgid "Authorization Granted"
 msgstr "Autorizace udělena"
 
 #. Denied
-#: src/protocols/oscar/oscar.c:6138
+#: src/protocols/oscar/oscar.c:6155
 #, c-format
 msgid ""
 "The user %s has denied your request to add them to your buddy list for the "
@@ -8218,71 +8319,71 @@
 "následujícího důvodu:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:6139
+#: src/protocols/oscar/oscar.c:6156
 msgid "Authorization Denied"
 msgstr "Autorizace zamítnuta"
 
-#: src/protocols/oscar/oscar.c:6176 src/protocols/toc/toc.c:1271
+#: src/protocols/oscar/oscar.c:6193 src/protocols/toc/toc.c:1271
 msgid "_Exchange:"
 msgstr "_Výměna:"
 
-#: src/protocols/oscar/oscar.c:6198
+#: src/protocols/oscar/oscar.c:6215
 msgid "Invalid chat name specified."
 msgstr "Zadán neplatný název chatu."
 
-#: src/protocols/oscar/oscar.c:6288
+#: src/protocols/oscar/oscar.c:6305
 msgid "Your IM Image was not sent. You cannot send IM Images in AIM chats."
 msgstr "Váš IM Image nebyl odeslán. Nemůžete odesílat IM Image v chatech AIM."
 
-#: src/protocols/oscar/oscar.c:6445
+#: src/protocols/oscar/oscar.c:6462
 msgid "Away Message"
 msgstr "Zpráva o nepřítomnosti"
 
-#: src/protocols/oscar/oscar.c:6729
+#: src/protocols/oscar/oscar.c:6746
 msgid "Buddy Comment:"
 msgstr "Poznámka o kamarádovi:"
 
-#: src/protocols/oscar/oscar.c:6747
+#: src/protocols/oscar/oscar.c:6764
 msgid "Edit Buddy Comment"
 msgstr "Upravit poznámku o kamarádovi"
 
-#: src/protocols/oscar/oscar.c:6753
+#: src/protocols/oscar/oscar.c:6770
 msgid "Get Status Msg"
 msgstr "Získat zprávu o stavu"
 
-#: src/protocols/oscar/oscar.c:6765
+#: src/protocols/oscar/oscar.c:6782
 msgid "Direct IM"
 msgstr "Přímé IM"
 
-#: src/protocols/oscar/oscar.c:6788
+#: src/protocols/oscar/oscar.c:6804
 msgid "Re-request Authorization"
 msgstr "Znovu požádat o autorizaci"
 
-#: src/protocols/oscar/oscar.c:6818
+#: src/protocols/oscar/oscar.c:6834
 msgid "The new formatting is invalid."
 msgstr "Nové formátování je neplatné."
 
-#: src/protocols/oscar/oscar.c:6819
+#: src/protocols/oscar/oscar.c:6835
 msgid "Screen name formatting can change only capitalization and whitespace."
 msgstr "Formátování jména uživatele může změnit jen velikost písmen a mezery."
 
-#: src/protocols/oscar/oscar.c:6826
+#: src/protocols/oscar/oscar.c:6842
 msgid "New screen name formatting:"
 msgstr "Nové formátování jména uživatele:"
 
-#: src/protocols/oscar/oscar.c:6878
+#: src/protocols/oscar/oscar.c:6894
 msgid "Change Address To:"
 msgstr "Změnit adresu na:"
 
-#: src/protocols/oscar/oscar.c:6923
+#: src/protocols/oscar/oscar.c:6939
 msgid "<i>you are not waiting for authorization</i>"
 msgstr "<i>nečekáte na autorizaci</i>"
 
-#: src/protocols/oscar/oscar.c:6926
+#: src/protocols/oscar/oscar.c:6942
 msgid "You are awaiting authorization from the following buddies"
 msgstr "Čekáte na autorizaci od následujících kamarádů:"
 
-#: src/protocols/oscar/oscar.c:6927
+#: src/protocols/oscar/oscar.c:6943
 msgid ""
 "You can re-request authorization from these buddies by right-clicking on "
 "them and selecting \"Re-request Authorization.\""
@@ -8290,75 +8391,75 @@
 "Můžete znovu požádat o autorizaci od těchto kamarádů kliknutím na ně pravým "
 "tlačítkem a zvolením \"Znovu požádat o autorizaci.\""
 
-#: src/protocols/oscar/oscar.c:6944
+#: src/protocols/oscar/oscar.c:6960
 msgid "Find Buddy by E-mail"
 msgstr "Hledat kamaráda podle emailu"
 
-#: src/protocols/oscar/oscar.c:6945
+#: src/protocols/oscar/oscar.c:6961
 msgid "Search for a buddy by e-mail address"
 msgstr "Hledat kamaráda podle emailové adresy"
 
-#: src/protocols/oscar/oscar.c:6946
+#: src/protocols/oscar/oscar.c:6962
 msgid "Type the e-mail address of the buddy you are searching for."
-msgstr "Typ emailové adresy kamaráda, kterého hledáte."
-
-#: src/protocols/oscar/oscar.c:6963
+msgstr "Zadejte e-mailovou adresu kamaráda, kterého hledáte."
+
+#: src/protocols/oscar/oscar.c:6979
 msgid "Available Message:"
 msgstr "Zpráva o dostupnosti:"
 
-#: src/protocols/oscar/oscar.c:6964
+#: src/protocols/oscar/oscar.c:6980
 msgid "I'm doing work and hoping for a distraction--IM me!"
 msgstr "Pracuji a toužím po rozptýlení--pošlete mi IM!"
 
-#: src/protocols/oscar/oscar.c:7045 src/protocols/silc/silc.c:782
+#: src/protocols/oscar/oscar.c:7061 src/protocols/silc/silc.c:789
 msgid "Set User Info..."
 msgstr "Nastavit informace o uživateli..."
 
-#: src/protocols/oscar/oscar.c:7050
+#: src/protocols/oscar/oscar.c:7066
 msgid "Set User Info (URL)..."
 msgstr "Nastavit informace o uživateli (URL)..."
 
-#: src/protocols/oscar/oscar.c:7056
+#: src/protocols/oscar/oscar.c:7072
 msgid "Set Available Message..."
 msgstr "Nastavit zprávu o dostupnosti..."
 
-#: src/protocols/oscar/oscar.c:7061 src/protocols/silc/silc.c:778
+#: src/protocols/oscar/oscar.c:7077 src/protocols/silc/silc.c:785
 msgid "Change Password..."
 msgstr "Změnit heslo..."
 
-#: src/protocols/oscar/oscar.c:7066
+#: src/protocols/oscar/oscar.c:7082
 msgid "Change Password (URL)"
 msgstr "Změnit heslo (URL)"
 
-#: src/protocols/oscar/oscar.c:7070
+#: src/protocols/oscar/oscar.c:7086
 msgid "Configure IM Forwarding (URL)"
 msgstr "Nastavit předávání IM (URL)"
 
-#: src/protocols/oscar/oscar.c:7079
+#: src/protocols/oscar/oscar.c:7095
 msgid "Format Screen Name..."
 msgstr "Formátovat jméno uživatele..."
 
-#: src/protocols/oscar/oscar.c:7083
+#: src/protocols/oscar/oscar.c:7099
 msgid "Confirm Account"
 msgstr "Potvrdit účet"
 
-#: src/protocols/oscar/oscar.c:7087
+#: src/protocols/oscar/oscar.c:7103
 msgid "Display Currently Registered Address"
 msgstr "Zobrazit aktuální registrovanou adresu"
 
-#: src/protocols/oscar/oscar.c:7091
+#: src/protocols/oscar/oscar.c:7107
 msgid "Change Currently Registered Address..."
 msgstr "Změnit aktuální registrovanou adresu..."
 
-#: src/protocols/oscar/oscar.c:7098
+#: src/protocols/oscar/oscar.c:7114
 msgid "Show Buddies Awaiting Authorization"
 msgstr "Zobrazit kamarády čekající na autorizaci"
 
-#: src/protocols/oscar/oscar.c:7104
+#: src/protocols/oscar/oscar.c:7120
 msgid "Search for Buddy by Email..."
 msgstr "Hledat kamaráda podle emailu..."
 
-#: src/protocols/oscar/oscar.c:7109
+#: src/protocols/oscar/oscar.c:7125
 msgid "Search for Buddy by Information"
 msgstr "Hledat kamaráda podle informací"
 
@@ -8373,15 +8474,15 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/oscar/oscar.c:7225 src/protocols/oscar/oscar.c:7227
+#: src/protocols/oscar/oscar.c:7243 src/protocols/oscar/oscar.c:7245
 msgid "AIM/ICQ Protocol Plugin"
 msgstr "Zásuvný modul protokolu AIM/ICQ"
 
-#: src/protocols/oscar/oscar.c:7246
+#: src/protocols/oscar/oscar.c:7264
 msgid "Auth host"
 msgstr "Počítač autentizace"
 
-#: src/protocols/oscar/oscar.c:7251
+#: src/protocols/oscar/oscar.c:7269
 msgid "Auth port"
 msgstr "Port autentizace"
 
@@ -8469,32 +8570,32 @@
 msgstr "Nastavit heslo IM"
 
 #: src/protocols/silc/buddy.c:506 src/protocols/silc/buddy.c:541
-#: src/protocols/silc/ops.c:1080 src/protocols/silc/ops.c:1091
+#: src/protocols/silc/ops.c:1256 src/protocols/silc/ops.c:1267
 msgid "Get Public Key"
 msgstr "Získat veřejný klíč"
 
-#: src/protocols/silc/buddy.c:542 src/protocols/silc/ops.c:1081
-#: src/protocols/silc/ops.c:1092
+#: src/protocols/silc/buddy.c:542 src/protocols/silc/ops.c:1257
+#: src/protocols/silc/ops.c:1268
 msgid "Cannot fetch the public key"
 msgstr "Nemohu získat veřejný klíč"
 
-#: src/protocols/silc/buddy.c:629 src/protocols/silc/buddy.c:1619
+#: src/protocols/silc/buddy.c:629 src/protocols/silc/buddy.c:1544
 msgid "Show Public Key"
 msgstr "Zobrazit veřejný klíč"
 
 #: src/protocols/silc/buddy.c:630 src/protocols/silc/buddy.c:989
-#: src/protocols/silc/chat.c:219
+#: src/protocols/silc/chat.c:222
 msgid "Could not load public key"
 msgstr "Nemohu načíst veřejný klíč"
 
-#: src/protocols/silc/buddy.c:707 src/protocols/silc/ops.c:837
-#: src/protocols/silc/ops.c:908 src/protocols/silc/ops.c:991
-#: src/protocols/silc/ops.c:992 src/protocols/silc/ops.c:998
-#: src/protocols/silc/ops.c:999
+#: src/protocols/silc/buddy.c:707 src/protocols/silc/ops.c:853
+#: src/protocols/silc/ops.c:925 src/protocols/silc/ops.c:1060
+#: src/protocols/silc/ops.c:1061 src/protocols/silc/ops.c:1079
 msgid "User Information"
 msgstr "Informace o uživateli"
 
-#: src/protocols/silc/buddy.c:708 src/protocols/silc/ops.c:909
+#: src/protocols/silc/buddy.c:708 src/protocols/silc/ops.c:926
+#: src/protocols/silc/ops.c:1080
 msgid "Cannot get user information"
 msgstr "Nemohu získat informace o uživateli"
 
@@ -8511,6 +8612,11 @@
 "Nemůžete dostávat upozornění o kamarádovi, dokud neimportujete jeho/její "
 "veřejný klíč. Veřejný klíč můžete získat pomocí příkazu Získat veřejný klíč."
 
+#. Open file selector to select the public key.
+#: src/protocols/silc/buddy.c:1023
+msgid "Open..."
+msgstr "Otevřít..."
+
 #: src/protocols/silc/buddy.c:1032
 #, c-format
 msgid "The %s buddy is not present in the network"
@@ -8571,143 +8677,111 @@
 msgid "Robot"
 msgstr "Robot"
 
-#: src/protocols/silc/buddy.c:1396 src/protocols/silc/buddy.c:1464
-#: src/protocols/silc/silc.c:606
+#: src/protocols/silc/buddy.c:1396 src/protocols/silc/silc.c:610
+#: src/protocols/silc/util.c:469
 msgid "Happy"
 msgstr "Šťastný"
 
-#: src/protocols/silc/buddy.c:1398 src/protocols/silc/buddy.c:1466
-#: src/protocols/silc/silc.c:608
+#: src/protocols/silc/buddy.c:1398 src/protocols/silc/silc.c:612
+#: src/protocols/silc/util.c:471
 msgid "Sad"
 msgstr "Smutný"
 
-#: src/protocols/silc/buddy.c:1400 src/protocols/silc/buddy.c:1468
-#: src/protocols/silc/silc.c:610
+#: src/protocols/silc/buddy.c:1400 src/protocols/silc/silc.c:614
+#: src/protocols/silc/util.c:473
 msgid "Angry"
 msgstr "Rozzlobený"
 
-#: src/protocols/silc/buddy.c:1402 src/protocols/silc/buddy.c:1470
-#: src/protocols/silc/silc.c:612
+#: src/protocols/silc/buddy.c:1402 src/protocols/silc/silc.c:616
+#: src/protocols/silc/util.c:475
 msgid "Jealous"
 msgstr "Žárlivý"
 
-#: src/protocols/silc/buddy.c:1404 src/protocols/silc/buddy.c:1472
-#: src/protocols/silc/silc.c:614
+#: src/protocols/silc/buddy.c:1404 src/protocols/silc/silc.c:618
+#: src/protocols/silc/util.c:477
 msgid "Ashamed"
 msgstr "Hanbící se"
 
-#: src/protocols/silc/buddy.c:1406 src/protocols/silc/buddy.c:1474
-#: src/protocols/silc/silc.c:616
+#: src/protocols/silc/buddy.c:1406 src/protocols/silc/silc.c:620
+#: src/protocols/silc/util.c:479
 msgid "Invincible"
 msgstr "Neporazitelný"
 
-#: src/protocols/silc/buddy.c:1408 src/protocols/silc/buddy.c:1476
-#: src/protocols/silc/silc.c:618
+#: src/protocols/silc/buddy.c:1408 src/protocols/silc/silc.c:622
+#: src/protocols/silc/util.c:481
 msgid "In Love"
 msgstr "Zamilovaný"
 
-#: src/protocols/silc/buddy.c:1410 src/protocols/silc/buddy.c:1478
-#: src/protocols/silc/silc.c:620
+#: src/protocols/silc/buddy.c:1410 src/protocols/silc/silc.c:624
+#: src/protocols/silc/util.c:483
 msgid "Sleepy"
 msgstr "Ospalý"
 
-#: src/protocols/silc/buddy.c:1412 src/protocols/silc/buddy.c:1480
-#: src/protocols/silc/silc.c:622
+#: src/protocols/silc/buddy.c:1412 src/protocols/silc/silc.c:626
+#: src/protocols/silc/util.c:485
 msgid "Bored"
 msgstr "Znuděný"
 
-#: src/protocols/silc/buddy.c:1414 src/protocols/silc/buddy.c:1482
-#: src/protocols/silc/silc.c:624
+#: src/protocols/silc/buddy.c:1414 src/protocols/silc/silc.c:628
+#: src/protocols/silc/util.c:487
 msgid "Excited"
 msgstr "Vzrušený"
 
-#: src/protocols/silc/buddy.c:1416 src/protocols/silc/buddy.c:1484
-#: src/protocols/silc/silc.c:626
+#: src/protocols/silc/buddy.c:1416 src/protocols/silc/silc.c:630
+#: src/protocols/silc/util.c:489
 msgid "Anxious"
 msgstr "Nedočkavý"
 
-#: src/protocols/silc/buddy.c:1452
-msgid "Modes"
-msgstr "Režimy"
-
-#: src/protocols/silc/buddy.c:1462
+#: src/protocols/silc/buddy.c:1448 src/protocols/silc/ops.c:962
+msgid "User Modes"
+msgstr "Režimy uživatele"
+
+#: src/protocols/silc/buddy.c:1457 src/protocols/silc/ops.c:971
 msgid "Mood"
 msgstr "Nálada"
 
-#: src/protocols/silc/buddy.c:1490
+#: src/protocols/silc/buddy.c:1461 src/protocols/silc/ops.c:977
 msgid "Status Text"
 msgstr "Text stavu"
 
-#: src/protocols/silc/buddy.c:1495
+#: src/protocols/silc/buddy.c:1466 src/protocols/silc/ops.c:983
 msgid "Preferred Contact"
 msgstr "Preferovaný kontakt"
 
-#: src/protocols/silc/buddy.c:1503
-msgid "Paging"
-msgstr "Pager"
-
-#: src/protocols/silc/buddy.c:1505 src/protocols/silc/silc.c:637
-msgid "SMS"
-msgstr "SMS"
-
-#: src/protocols/silc/buddy.c:1507 src/protocols/silc/silc.c:639
-msgid "MMS"
-msgstr "MMS"
-
-#: src/protocols/silc/buddy.c:1509 src/protocols/silc/silc.c:641
-msgid "Video Conferencing"
-msgstr "Videokonference"
-
-#: src/protocols/silc/buddy.c:1515
+#: src/protocols/silc/buddy.c:1471 src/protocols/silc/ops.c:988
 msgid "Preferred Language"
 msgstr "Preferovaný jazyk"
 
-#: src/protocols/silc/buddy.c:1520
+#: src/protocols/silc/buddy.c:1476 src/protocols/silc/ops.c:993
 msgid "Device"
 msgstr "Zařízení"
 
-#: src/protocols/silc/buddy.c:1522
-msgid "Computer"
-msgstr "Počítač"
-
-#: src/protocols/silc/buddy.c:1526
-msgid "PDA"
-msgstr "PDA"
-
-#: src/protocols/silc/buddy.c:1528
-msgid "Terminal"
-msgstr "Terminál"
-
-#: src/protocols/silc/buddy.c:1539 src/protocols/silc/silc.c:674
-#: src/protocols/silc/silc.c:676
+#: src/protocols/silc/buddy.c:1481 src/protocols/silc/ops.c:998
+#: src/protocols/silc/silc.c:678 src/protocols/silc/silc.c:680
 msgid "Timezone"
 msgstr "Časová zóna"
 
-#: src/protocols/silc/buddy.c:1545
+#: src/protocols/silc/buddy.c:1486 src/protocols/silc/ops.c:1003
 msgid "Geolocation"
 msgstr "Zeměpisné umístění"
 
-#: src/protocols/silc/buddy.c:1604
+#: src/protocols/silc/buddy.c:1529
 msgid "Reset IM Key"
 msgstr "Vynulovat klíč IM"
 
-#: src/protocols/silc/buddy.c:1609
+#: src/protocols/silc/buddy.c:1534
 msgid "IM with Key Exchange"
 msgstr "IM s výměnou klíčů"
 
-#: src/protocols/silc/buddy.c:1613
+#: src/protocols/silc/buddy.c:1538
 msgid "IM with Password"
 msgstr "IM s heslem"
 
-#: src/protocols/silc/buddy.c:1624
+#: src/protocols/silc/buddy.c:1549
 msgid "Get Public Key..."
 msgstr "Získat veřejný klíč..."
 
-#: src/protocols/silc/buddy.c:1629
-msgid "Send File..."
-msgstr "Odeslat soubor..."
-
-#: src/protocols/silc/buddy.c:1634 src/protocols/silc/ops.c:1127
+#: src/protocols/silc/buddy.c:1555 src/protocols/silc/ops.c:1389
 msgid "Kill User"
 msgstr "Zabít uživatele"
 
@@ -8720,8 +8794,7 @@
 msgid "Channel %s does not exist in the network"
 msgstr "Kanál %s v síti neexistuje"
 
-#: src/protocols/silc/chat.c:67 src/protocols/silc/chat.c:154
-#: src/protocols/silc/chat.c:155
+#: src/protocols/silc/chat.c:67 src/protocols/silc/chat.c:159
 msgid "Channel Information"
 msgstr "Informace o kanálu"
 
@@ -8729,88 +8802,68 @@
 msgid "Cannot get channel information"
 msgstr "Nemohu získat informace o kanálu"
 
-#: src/protocols/silc/chat.c:104
-#, c-format
-msgid "Channel Name:\t\t%s\n"
-msgstr "Název kanálu:\t\t%s\n"
-
-#: src/protocols/silc/chat.c:106
-#, c-format
-msgid "User Count:\t\t%d\n"
-msgstr "Počet uživatelů:\t\t%d\n"
-
-#: src/protocols/silc/chat.c:112
-#, c-format
-msgid "Channel Founder:\t%s\n"
-msgstr "Zakladatel kanálu:\t%s\n"
-
-#: src/protocols/silc/chat.c:120
-#, c-format
-msgid "Channel Cipher:\t\t%s\n"
-msgstr "Šifra kanálu:\t\t%s\n"
-
-#: src/protocols/silc/chat.c:123
-#, c-format
-msgid "Channel HMAC:\t\t%s\n"
-msgstr "HMAC kanálu:\t\t%s\n"
+#: src/protocols/silc/chat.c:105
+#, c-format
+msgid "<b>Channel Name:</b> %s"
+msgstr "<b>Název kanálu:</b> %s"
+
+#: src/protocols/silc/chat.c:108
+#, c-format
+msgid "<br><b>User Count:</b> %d"
+msgstr "<br><b>Počet uživatelů:</b> %d"
+
+#: src/protocols/silc/chat.c:115
+#, c-format
+msgid "<br><b>Channel Founder:</b> %s"
+msgstr "<br><b>Zakladatel kanálu:</b> %s"
+
+#: src/protocols/silc/chat.c:124
+#, c-format
+msgid "<br><b>Channel Cipher:</b> %s"
+msgstr "<br><b>Šifra kanálu:</b> %s"
 
 #: src/protocols/silc/chat.c:127
 #, c-format
-msgid ""
-"\n"
-"Channel Topic:\n"
-"\t%s\n"
-msgstr ""
-"\n"
-"Téma kanálu:\n"
-"\t%s\n"
-
-#: src/protocols/silc/chat.c:130
-msgid ""
-"\n"
-"Channel Modes:\n"
-msgstr "\nRežimy kanálu:\n"
-
-#: src/protocols/silc/chat.c:144
-#, c-format
-msgid ""
-"\n"
-"Founder Key Fingerprint:\n"
-"%s\n"
-"\n"
-msgstr ""
-"\n"
-"Otisk klíče zakladatele:\n"
-"%s\n"
-"\n"
-
-#: src/protocols/silc/chat.c:145
-#, c-format
-msgid ""
-"Founder Key Babbleprint:\n"
-"%s"
-msgstr ""
-"Babbleprint klíče zakladatele:\n"
-"%s"
-
-#: src/protocols/silc/chat.c:218
+msgid "<br><b>Channel HMAC:</b> %s"
+msgstr "<br><b>HMAC kanálu:</b>\t%s"
+
+#: src/protocols/silc/chat.c:132
+#, c-format
+msgid "<br><b>Channel Topic:</b><br>%s"
+msgstr "<br><b>Téma kanálu:</b><br>%s"
+
+#: src/protocols/silc/chat.c:137
+msgid "<br><b>Channel Modes:</b> "
+msgstr "<br><b>Režimy kanálu:</b> "
+
+#: src/protocols/silc/chat.c:150
+#, c-format
+msgid "<br><b>Founder Key Fingerprint:</b><br>%s"
+msgstr "<br><b>Otisk klíče zakladatele:</b><br>%s"
+
+#: src/protocols/silc/chat.c:151
+#, c-format
+msgid "<br><b>Founder Key Babbleprint:</b><br>%s"
+msgstr "<br><b>Babbleprint klíče zakladatele:</b><br>%s"
+
+#: src/protocols/silc/chat.c:221
 msgid "Add Channel Public Key"
 msgstr "Přidat veřejný klíč kanálu"
 
 #. Add new public key
-#: src/protocols/silc/chat.c:273
+#: src/protocols/silc/chat.c:276
 msgid "Open Public Key..."
 msgstr "Otevřít veřejný klíč..."
 
-#: src/protocols/silc/chat.c:382
+#: src/protocols/silc/chat.c:385
 msgid "Channel Passphrase"
 msgstr "Heslo kanálu"
 
-#: src/protocols/silc/chat.c:389
+#: src/protocols/silc/chat.c:392
 msgid "Channel Public Keys List"
 msgstr "Seznam veřejných klíčů kanálu"
 
-#: src/protocols/silc/chat.c:394
+#: src/protocols/silc/chat.c:397
 msgid ""
 "Channel authentication is used to secure the channel from unauthorized "
 "access. The authentication may be based on passphrase and digital "
@@ -8824,106 +8877,106 @@
 "nastaveny veřejné klíče, mohou se připojit jen uživatelé, jejichž veřejné "
 "klíče jsou v seznamu."
 
-#: src/protocols/silc/chat.c:403 src/protocols/silc/chat.c:404
-#: src/protocols/silc/chat.c:441 src/protocols/silc/chat.c:442
-#: src/protocols/silc/chat.c:871
+#: src/protocols/silc/chat.c:406 src/protocols/silc/chat.c:407
+#: src/protocols/silc/chat.c:444 src/protocols/silc/chat.c:445
+#: src/protocols/silc/chat.c:874
 msgid "Channel Authentication"
 msgstr "Autentizace kanálu"
 
-#: src/protocols/silc/chat.c:405 src/protocols/silc/chat.c:443
+#: src/protocols/silc/chat.c:408 src/protocols/silc/chat.c:446
 msgid "Add / Remove"
 msgstr "Přidat/odstranit"
 
-#: src/protocols/silc/chat.c:560
+#: src/protocols/silc/chat.c:563
 msgid "Group Name"
 msgstr "Název skupiny"
 
-#: src/protocols/silc/chat.c:564 src/protocols/silc/ops.c:1403
+#: src/protocols/silc/chat.c:567 src/protocols/silc/ops.c:1669
 msgid "Passphrase"
 msgstr "Heslo"
 
-#: src/protocols/silc/chat.c:575
+#: src/protocols/silc/chat.c:578
 #, c-format
 msgid "Please enter the %s channel private group name and passphrase."
 msgstr "Zadejte prosím název soukromé skupiny kanálu %s a heslo."
 
-#: src/protocols/silc/chat.c:577
+#: src/protocols/silc/chat.c:580
 msgid "Add Channel Private Group"
 msgstr "Přidat soukromou skupinu kanálu"
 
-#: src/protocols/silc/chat.c:704
+#: src/protocols/silc/chat.c:707
 msgid "User Limit"
 msgstr "Limit uživatelů"
 
-#: src/protocols/silc/chat.c:705
+#: src/protocols/silc/chat.c:708
 msgid "Set user limit on channel. Set to zero to reset user limit."
 msgstr ""
 "Nastavit limit uživatelů v kanálu. Nastavením na nulu limit uživatelů "
 "zrušíte."
 
-#: src/protocols/silc/chat.c:847
+#: src/protocols/silc/chat.c:850
 msgid "Get Info"
 msgstr "Info"
 
-#: src/protocols/silc/chat.c:854
+#: src/protocols/silc/chat.c:857
 msgid "Invite List"
 msgstr "Seznam pozvaných"
 
-#: src/protocols/silc/chat.c:858
+#: src/protocols/silc/chat.c:861
 msgid "Ban List"
 msgstr "Seznam zakázaných"
 
-#: src/protocols/silc/chat.c:865
+#: src/protocols/silc/chat.c:868
 msgid "Add Private Group"
 msgstr "Přidat soukromou skupinu"
 
-#: src/protocols/silc/chat.c:876
+#: src/protocols/silc/chat.c:879
 msgid "Reset Permanent"
 msgstr "Zrušit trvalé"
 
-#: src/protocols/silc/chat.c:880
+#: src/protocols/silc/chat.c:883
 msgid "Set Permanent"
 msgstr "Nastavit trvalé"
 
-#: src/protocols/silc/chat.c:887
+#: src/protocols/silc/chat.c:890
 msgid "Set User Limit"
 msgstr "Nastavit limit uživatelů"
 
-#: src/protocols/silc/chat.c:892
+#: src/protocols/silc/chat.c:895
 msgid "Reset Topic Restriction"
 msgstr "Zrušit omezení tématu"
 
-#: src/protocols/silc/chat.c:896
+#: src/protocols/silc/chat.c:899
 msgid "Set Topic Restriction"
 msgstr "Nastavit omezení tématu"
 
-#: src/protocols/silc/chat.c:902
+#: src/protocols/silc/chat.c:905
 msgid "Reset Private Channel"
 msgstr "Zrušit Soukromý kanál"
 
-#: src/protocols/silc/chat.c:906
+#: src/protocols/silc/chat.c:909
 msgid "Set Private Channel"
 msgstr "Nastavit Soukromý kanál"
 
-#: src/protocols/silc/chat.c:912
+#: src/protocols/silc/chat.c:915
 msgid "Reset Secret Channel"
 msgstr "Zrušit Tajný kanál"
 
-#: src/protocols/silc/chat.c:916
+#: src/protocols/silc/chat.c:919
 msgid "Set Secret Channel"
 msgstr "Nastavit Tajný kanál"
 
-#: src/protocols/silc/chat.c:986
+#: src/protocols/silc/chat.c:989
 #, c-format
 msgid "You are channel founder on <I>%s</I>"
 msgstr "Jste zakladatel kanálu <I>%s</I>"
 
-#: src/protocols/silc/chat.c:990
+#: src/protocols/silc/chat.c:993
 #, c-format
 msgid "Channel founder on <I>%s</I> is <I>%s</I>"
 msgstr "Zakladatel kanálu <I>%s</I> je <I>%s</I>"
 
-#: src/protocols/silc/chat.c:1040
+#: src/protocols/silc/chat.c:1046
 #, c-format
 msgid ""
 "You have to join the %s channel before you are able to join the private group"
@@ -8931,19 +8984,19 @@
 "Než se budete moci připojit k soukromé skupině, musíte se připojit ke kanálu "
 "%s"
 
-#: src/protocols/silc/chat.c:1042
+#: src/protocols/silc/chat.c:1048
 msgid "Join Private Group"
 msgstr "Připojit se k soukromé skupině"
 
-#: src/protocols/silc/chat.c:1043
+#: src/protocols/silc/chat.c:1049
 msgid "Cannot join private group"
 msgstr "Nemohu sepřipojit k soukromé skupině"
 
-#: src/protocols/silc/chat.c:1225 src/protocols/silc/silc.c:875
+#: src/protocols/silc/chat.c:1242 src/protocols/silc/silc.c:888
 msgid "Cannot call command"
 msgstr "Nemohu zavolat příkaz"
 
-#: src/protocols/silc/chat.c:1226 src/protocols/silc/silc.c:876
+#: src/protocols/silc/chat.c:1243 src/protocols/silc/silc.c:889
 msgid "Unknown command"
 msgstr "Neznámý příkaz"
 
@@ -8993,223 +9046,278 @@
 msgid "Cannot send file"
 msgstr "Nemohu odeslat soubor"
 
-#: src/protocols/silc/ops.c:324 src/protocols/silc/ops.c:331
-#: src/protocols/silc/ops.c:338
+#: src/protocols/silc/ops.c:333 src/protocols/silc/ops.c:342
+#: src/protocols/silc/ops.c:351
 #, c-format
 msgid "%s has changed the topic of <I>%s</I> to: %s"
 msgstr "%s změnil téma <I>%s</I> na: %s"
 
-#: src/protocols/silc/ops.c:398
+#: src/protocols/silc/ops.c:413
 #, c-format
 msgid "<I>%s</I> set channel <I>%s</I> modes to: %s"
 msgstr "<I>%s</I> nastavil režimy kanálu <I>%s</I> na: %s"
 
-#: src/protocols/silc/ops.c:402
+#: src/protocols/silc/ops.c:417
 #, c-format
 msgid "<I>%s</I> removed all channel <I>%s</I> modes"
 msgstr "<I>%s</I> odstranil všechny režimy kanálu <I>%s</I>"
 
-#: src/protocols/silc/ops.c:433
+#: src/protocols/silc/ops.c:448
 #, c-format
 msgid "<I>%s</I> set <I>%s's</I> modes to: %s"
 msgstr "<I>%s</I> nastavil režimy <I>%s</I> na: %s"
 
-#: src/protocols/silc/ops.c:437
+#: src/protocols/silc/ops.c:452
 #, c-format
 msgid "<I>%s</I> removed all <I>%s's</I> modes"
 msgstr "<I>%s</I> odstranil všechny režimy <I>%s</I>"
 
-#: src/protocols/silc/ops.c:464
+#: src/protocols/silc/ops.c:479
 #, c-format
 msgid "You have been kicked off <I>%s</I> by <I>%s</I> (%s)"
 msgstr "Byli jste vykopnuti z <I>%s</I> od <I>%s</I> (%s)"
 
-#: src/protocols/silc/ops.c:494 src/protocols/silc/ops.c:499
-#: src/protocols/silc/ops.c:504
+#: src/protocols/silc/ops.c:509 src/protocols/silc/ops.c:514
+#: src/protocols/silc/ops.c:519
 #, c-format
 msgid "You have been killed by %s (%s)"
 msgstr "Byli jste zabiti v %s: (%s)"
 
-#: src/protocols/silc/ops.c:525 src/protocols/silc/ops.c:530
-#: src/protocols/silc/ops.c:535
+#: src/protocols/silc/ops.c:540 src/protocols/silc/ops.c:545
+#: src/protocols/silc/ops.c:550
 #, c-format
 msgid "Killed by %s (%s)"
 msgstr "Zabit od %s: (%s)"
 
-#: src/protocols/silc/ops.c:581
+#: src/protocols/silc/ops.c:596
 msgid "Server signoff"
 msgstr "Odhlášení od serveru"
 
-#: src/protocols/silc/ops.c:767
+#: src/protocols/silc/ops.c:783
 msgid "Personal Information"
 msgstr "Osobní informace"
 
-#: src/protocols/silc/ops.c:790
+#: src/protocols/silc/ops.c:806
 msgid "Birth Day"
 msgstr "Datum narození"
 
-#: src/protocols/silc/ops.c:794
+#: src/protocols/silc/ops.c:810
 msgid "Job Title"
 msgstr "Název zaměstnátí"
 
-#: src/protocols/silc/ops.c:798
+#: src/protocols/silc/ops.c:814
 msgid "Job Role"
 msgstr "Role v zaměstnání"
 
-#: src/protocols/silc/ops.c:802
+#: src/protocols/silc/ops.c:818
 msgid "Organization"
 msgstr "Organizace"
 
-#: src/protocols/silc/ops.c:806
+#: src/protocols/silc/ops.c:822
 msgid "Unit"
 msgstr "Jednotka"
 
-#: src/protocols/silc/ops.c:825
+#: src/protocols/silc/ops.c:841
 msgid "EMail"
 msgstr "E-mail"
 
-#: src/protocols/silc/ops.c:830
+#: src/protocols/silc/ops.c:846
 msgid "Note"
 msgstr "Poznámka"
 
-#: src/protocols/silc/ops.c:878
+#: src/protocols/silc/ops.c:894
 msgid "Join Chat"
 msgstr "Připojit se k chatu"
 
-#: src/protocols/silc/ops.c:933
-msgid "Hostname"
-msgstr "Název počítače"
-
-#: src/protocols/silc/ops.c:940
-msgid "User Mode"
-msgstr "Režim uživatele"
-
-#: src/protocols/silc/ops.c:954
-msgid "Channels"
-msgstr "Kanály"
-
-#: src/protocols/silc/ops.c:981
+#: src/protocols/silc/ops.c:1050 src/protocols/silc/ops.c:1120
 msgid "Public Key Fingerprint"
 msgstr "Otisk veřejného klíče"
 
-#: src/protocols/silc/ops.c:982
+#: src/protocols/silc/ops.c:1051 src/protocols/silc/ops.c:1121
 msgid "Public Key Babbleprint"
 msgstr "Babbleprint veřejného klíče"
 
-#: src/protocols/silc/ops.c:995
+#: src/protocols/silc/ops.c:1064
 msgid "More..."
 msgstr "Více..."
 
-#: src/protocols/silc/ops.c:1006 src/protocols/silc/silc.c:770
+#: src/protocols/silc/ops.c:1135 src/protocols/silc/silc.c:777
 msgid "Detach From Server"
 msgstr "Odpojit se od serveru"
 
-#: src/protocols/silc/ops.c:1006
+#: src/protocols/silc/ops.c:1135
 msgid "Cannot detach"
 msgstr "Nemohu odpojit"
 
-#: src/protocols/silc/ops.c:1017
+#: src/protocols/silc/ops.c:1146
 msgid "Cannot set topic"
 msgstr "Nemohu nastavit téma"
 
-#: src/protocols/silc/ops.c:1045
+#: src/protocols/silc/ops.c:1184
+msgid "Failed to change nickname"
+msgstr "Nemohu změnit přezdívku"
+
+#: src/protocols/silc/ops.c:1221
 msgid "Roomlist"
 msgstr "Seznam místností"
 
-#: src/protocols/silc/ops.c:1045
+#: src/protocols/silc/ops.c:1221
 msgid "Cannot get room list"
 msgstr "Nemohu získat seznam místností"
 
-#: src/protocols/silc/ops.c:1093
+#: src/protocols/silc/ops.c:1269
 msgid "No public key was received"
 msgstr "Nebyl přijat veřejný klíč"
 
-#: src/protocols/silc/ops.c:1106 src/protocols/silc/ops.c:1119
-#: src/protocols/silc/ops.c:1120
+#: src/protocols/silc/ops.c:1282 src/protocols/silc/ops.c:1296
 msgid "Server Information"
 msgstr "Informace o serveru"
 
-#: src/protocols/silc/ops.c:1107
+#: src/protocols/silc/ops.c:1283
 msgid "Cannot get server information"
 msgstr "Nemohu získat informace o serveru"
 
-#: src/protocols/silc/ops.c:1128
+#: src/protocols/silc/ops.c:1314 src/protocols/silc/ops.c:1323
+msgid "Server Statistics"
+msgstr "Statistika o serveru"
+
+#: src/protocols/silc/ops.c:1315
+msgid "Cannot get server statistics"
+msgstr "Nemohu získat statistiku o serveru"
+
+# FIXME: s/statisitics/statistics/
+#: src/protocols/silc/ops.c:1324
+msgid "No server statisitics available"
+msgstr "Statistika o serveru není k dispozici"
+
+#: src/protocols/silc/ops.c:1346
+#, c-format
+msgid ""
+"Local server start time: %s\n"
+"Local server uptime: %s\n"
+"Local server clients: %d\n"
+"Local server channels: %d\n"
+"Local server operators: %d\n"
+"Local router operators: %d\n"
+"Local cell clients: %d\n"
+"Local cell channels: %d\n"
+"Local cell servers: %d\n"
+"Total clients: %d\n"
+"Total channels: %d\n"
+"Total servers: %d\n"
+"Total routers: %d\n"
+"Total server operators: %d\n"
+"Total router operators: %d\n"
+msgstr ""
+"Čas spuštění místního serveru: %s\n"
+"Čas běhu místního serveru: %s\n"
+"Klienti místního serveru: %d\n"
+"Kanály místního serveru: %d\n"
+"Operátoři místního serveru: %d\n"
+"Operátoři místního směrovače: %d\n"
+"Klienti místní buňky: %d\n"
+"Kanály místní buňky: %d\n"
+"Servery místní buňky: %d\n"
+"Celkem klientů: %d\n"
+"Celkem kanálů: %d\n"
+"Celkem serversů: %d\n"
+"Celkem směrovarů: %d\n"
+"Celkem operátorů serverů: %d\n"
+"Celkem operátorů směrovačů: %d\n"
+
+#: src/protocols/silc/ops.c:1369
+msgid "Network Statistics"
+msgstr "Statistika o síti"
+
+#: src/protocols/silc/ops.c:1377 src/protocols/silc/ops.c:1382
+msgid "Ping"
+msgstr "Ping"
+
+#: src/protocols/silc/ops.c:1377
+msgid "Ping failed"
+msgstr "Ping selhal"
+
+#: src/protocols/silc/ops.c:1382
+msgid "Ping reply received from server"
+msgstr "Od serveru přijata odpověď na ping"
+
+#: src/protocols/silc/ops.c:1390
 msgid "Could not kill user"
 msgstr "Nemohu zabít uživatele"
 
-#: src/protocols/silc/ops.c:1205
+#: src/protocols/silc/ops.c:1471
 msgid "Error during connecting to SILC Server"
 msgstr "Chyba při připojování se k serveru SILC"
 
-#: src/protocols/silc/ops.c:1210
+#: src/protocols/silc/ops.c:1476
 msgid "Key Exchange failed"
 msgstr "Výměna klíčů selhala"
 
-#: src/protocols/silc/ops.c:1219
+#: src/protocols/silc/ops.c:1485
 msgid ""
 "Resuming detached session failed. Press Reconnect to create new connection."
 msgstr ""
 "Obnova odpojeného sezení selhala. Vytvořte nové spojení stisknutím Znovu se "
 "připojit"
 
-#: src/protocols/silc/ops.c:1254
+#: src/protocols/silc/ops.c:1520
 msgid "Disconnected by server"
 msgstr "Odpojen serverem"
 
-#: src/protocols/silc/ops.c:1314 src/protocols/silc/ops.c:1361
+#: src/protocols/silc/ops.c:1580 src/protocols/silc/ops.c:1627
 #: src/protocols/silc/silc.c:167
 msgid "Resuming session"
 msgstr "Obnovuji sezení"
 
-#: src/protocols/silc/ops.c:1316
+#: src/protocols/silc/ops.c:1582
 msgid "Authenticating connection"
 msgstr "Autentizuji připojení"
 
-#: src/protocols/silc/ops.c:1363
+#: src/protocols/silc/ops.c:1629
 msgid "Verifying server public key"
 msgstr "Ověřuji veřejný klíč serveru"
 
-#: src/protocols/silc/ops.c:1404
+#: src/protocols/silc/ops.c:1670
 msgid "Passphrase required"
 msgstr "Je vyžadováno heslo"
 
-#: src/protocols/silc/ops.c:1433
+#: src/protocols/silc/ops.c:1699
 msgid "Failure: Version mismatch, upgrade your client"
 msgstr "Chyba: Verze nesouhlasí, aktualizujte vašeho klienta"
 
-#: src/protocols/silc/ops.c:1436
+#: src/protocols/silc/ops.c:1702
 msgid "Failure: Remote does not trust/support your public key"
 msgstr "Chyba: Vzdálený nevěří/nepodporuje váš veřejný klíč"
 
-#: src/protocols/silc/ops.c:1439
+#: src/protocols/silc/ops.c:1705
 msgid "Failure: Remote does not support proposed KE group"
 msgstr "Chyba: Vzdálený nepodporuje navrženou skupinu KE"
 
-#: src/protocols/silc/ops.c:1442
+#: src/protocols/silc/ops.c:1708
 msgid "Failure: Remote does not support proposed cipher"
 msgstr "Chyba: Vzdálený nepodporuje navrženou šifru"
 
-#: src/protocols/silc/ops.c:1445
+#: src/protocols/silc/ops.c:1711
 msgid "Failure: Remote does not support proposed PKCS"
 msgstr "Chyba: Vzdálený nepodporuje navržený PKCS"
 
-#: src/protocols/silc/ops.c:1448
+#: src/protocols/silc/ops.c:1714
 msgid "Failure: Remote does not support proposed hash function"
 msgstr "Chyba: Vzdálený nepodporuje navrženou hašovací funkci"
 
-#: src/protocols/silc/ops.c:1451
+#: src/protocols/silc/ops.c:1717
 msgid "Failure: Remote does not support proposed HMAC"
 msgstr "Chyba: Vzdálený nepodporuje navržený HMAC"
 
-#: src/protocols/silc/ops.c:1453
+#: src/protocols/silc/ops.c:1719
 msgid "Failure: Incorrect signature"
 msgstr "Chyba: Nesprávný podpis"
 
-#: src/protocols/silc/ops.c:1455
+#: src/protocols/silc/ops.c:1721
 msgid "Failure: Invalid cookie"
 msgstr "Chyba: Neplatný cookie"
 
-#: src/protocols/silc/ops.c:1466
+#: src/protocols/silc/ops.c:1732
 msgid "Failure: Authentication failed"
 msgstr "Chyba: Autentizace selhala"
 
@@ -9218,14 +9326,12 @@
 msgid ""
 "Received %s's public key. Your local copy does not match this key. Would you "
 "still like to accept this public key?"
-msgstr ""
-"Přijal jsem veřejný klíč %s. Vaše místní kopie tomuto klíči neodpovídá. "
-"Opravdu chcete přijmout tento veřejný klíč?"
+msgstr "Přijat veřejný klíč %s. Vaše místní kopie tomuto klíči neodpovídá. Opravdu chcete přijmout tento veřejný klíč?"
 
 #: src/protocols/silc/pk.c:108
 #, c-format
 msgid "Received %s's public key. Would you like to accept this public key?"
-msgstr "Přijal jsem veřejný klíč %s. Chcete přijmout tento veřejný klíč?"
+msgstr "Přijat veřejný klíč %s. Chcete přijmout tento veřejný klíč?"
 
 #: src/protocols/silc/pk.c:112
 #, c-format
@@ -9273,15 +9379,15 @@
 msgid "Connecting to SILC Server"
 msgstr "Připojuji se k serveru SILC"
 
-#: src/protocols/silc/silc.c:602
+#: src/protocols/silc/silc.c:606
 msgid "Your Current Mood"
 msgstr "Vaše momentální nálada"
 
-#: src/protocols/silc/silc.c:604
+#: src/protocols/silc/silc.c:608
 msgid "Normal"
 msgstr "Normální"
 
-#: src/protocols/silc/silc.c:629
+#: src/protocols/silc/silc.c:633
 msgid ""
 "\n"
 "Your Preferred Contact Methods"
@@ -9289,31 +9395,43 @@
 "\n"
 "Vaše preferované metody kontaktu"
 
-#: src/protocols/silc/silc.c:646
+#: src/protocols/silc/silc.c:641 src/protocols/silc/util.c:514
+msgid "SMS"
+msgstr "SMS"
+
+#: src/protocols/silc/silc.c:643 src/protocols/silc/util.c:516
+msgid "MMS"
+msgstr "MMS"
+
+#: src/protocols/silc/silc.c:645 src/protocols/silc/util.c:518
+msgid "Video Conferencing"
+msgstr "Videokonference"
+
+#: src/protocols/silc/silc.c:650
 msgid "Your Current Status"
 msgstr "Váš momentální stav"
 
-#: src/protocols/silc/silc.c:653
+#: src/protocols/silc/silc.c:657
 msgid "Online Services"
 msgstr "Služby online"
 
-#: src/protocols/silc/silc.c:656
+#: src/protocols/silc/silc.c:660
 msgid "Let others see what services you are using"
 msgstr "Umožnit ostatním vidět, jaké služby používáte"
 
-#: src/protocols/silc/silc.c:662
+#: src/protocols/silc/silc.c:666
 msgid "Let others see what computer you are using"
 msgstr "Umožnit ostatním vidět, jaký počítač používáte"
 
-#: src/protocols/silc/silc.c:669
+#: src/protocols/silc/silc.c:673
 msgid "Your VCard File"
 msgstr "Váš soubor VCard"
 
-#: src/protocols/silc/silc.c:682 src/protocols/silc/silc.c:683
+#: src/protocols/silc/silc.c:686 src/protocols/silc/silc.c:687
 msgid "User Online Status Attributes"
 msgstr "Atributy stavu online uživatele"
 
-#: src/protocols/silc/silc.c:684
+#: src/protocols/silc/silc.c:688
 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 "
@@ -9323,113 +9441,224 @@
 "vaše osobní informace. Zadejte prosím informace, které chcete, aby o vás "
 "ostatní uživatelé viděli."
 
-#: src/protocols/silc/silc.c:723 src/protocols/silc/silc.c:728
-#: src/protocols/silc/silc.c:1096 src/protocols/silc/silc.c:1101
+#: src/protocols/silc/silc.c:728 src/protocols/silc/silc.c:734
+#: src/protocols/silc/silc.c:1135
 msgid "Message of the Day"
 msgstr "Zpráva dne"
 
-#: src/protocols/silc/silc.c:723 src/protocols/silc/silc.c:1096
+#: src/protocols/silc/silc.c:728
 msgid "No Message of the Day available"
 msgstr "Zpráva dne není k dispozici"
 
-#: src/protocols/silc/silc.c:724 src/protocols/silc/silc.c:1097
+#: src/protocols/silc/silc.c:729 src/protocols/silc/silc.c:1130
 msgid "There is no Message of the Day associated with this connection"
 msgstr "S tímto spojením není asociována zpráva dne"
 
-#: src/protocols/silc/silc.c:765
+#: src/protocols/silc/silc.c:772
 msgid "Online Status"
 msgstr "Stav připojení"
 
-#: src/protocols/silc/silc.c:774
+#: src/protocols/silc/silc.c:781
 msgid "View Message of the Day"
 msgstr "Zobrazit zprávu dne"
 
-#: src/protocols/silc/silc.c:846
+#: src/protocols/silc/silc.c:853
 #, c-format
 msgid "User <I>%s</I> is not present in the network"
 msgstr "Uživatel <I>%s</I> není v síti přítomen"
 
-#: src/protocols/silc/silc.c:1159
-msgid "part:  Leave the chat"
-msgstr "part: Opustit chat"
-
-#: src/protocols/silc/silc.c:1162
-msgid "leave:  Leave the chat"
-msgstr "leave: Opustit chat"
-
-#: src/protocols/silc/silc.c:1166
+#: src/protocols/silc/silc.c:962
+msgid "Failed to leave channel"
+msgstr "Nemohu opustit kanál"
+
+#: src/protocols/silc/silc.c:1006
+msgid "Topic too long"
+msgstr "Téma příliš dlouhé"
+
+#: src/protocols/silc/silc.c:1087
+msgid "You must specify a nick"
+msgstr "Musíte zadat přezdívku"
+
+#: src/protocols/silc/silc.c:1189
+#, c-format
+msgid "channel %s not found"
+msgstr "kanál %s nenalezen"
+
+#: src/protocols/silc/silc.c:1194
+#, c-format
+msgid "channel modes for %s: %s"
+msgstr "režimy kanálu pro %s: %s"
+
+#: src/protocols/silc/silc.c:1196
+#, c-format
+msgid "no channel modes are set on %s"
+msgstr "na %s nejsou nastaveny žádné režimy kanálu"
+
+#: src/protocols/silc/silc.c:1209
+#, c-format
+msgid "Failed to set cmodes for %s"
+msgstr "Nemohu nastavit režimy kanálu pro %s"
+
+#: src/protocols/silc/silc.c:1239
+#, c-format
+msgid "Unknown command: %s, (may be a Gaim bug)"
+msgstr "Neznámý příkaz: %s, (možná je to chyba v Gaimu)"
+
+#: src/protocols/silc/silc.c:1302
+msgid "part [channel]:  Leave the chat"
+msgstr "part [kanál]: Opustit chat"
+
+#: src/protocols/silc/silc.c:1306
+msgid "leave [channel]:  Leave the chat"
+msgstr "leave [kanál]: Opustit chat"
+
+#: src/protocols/silc/silc.c:1310
 msgid "topic [&lt;new topic&gt;]:  View or change the topic"
 msgstr "topic [&lt;nové téma&gt;]: Zobrazit nebo změnit téma"
 
-#: src/protocols/silc/silc.c:1171
+#: src/protocols/silc/silc.c:1315
 msgid "join &lt;channel&gt; [&lt;password&gt;]:  Join a chat on this network"
 msgstr "join &lt;kanál&gt; [&lt;heslo&gt;]: Připojit se k chatu na této síti"
 
-#: src/protocols/silc/silc.c:1175
+#: src/protocols/silc/silc.c:1319
 msgid "list:  List channels on this network"
 msgstr "list: Vypsat kanály v této síti"
 
-#: src/protocols/silc/silc.c:1179
+#: src/protocols/silc/silc.c:1323
 msgid "whois &lt;nick&gt;:  View nick's information"
 msgstr "whois &lt;přezdívka&gt;: Zobrazit informace o přezdívce"
 
-#: src/protocols/silc/silc.c:1183
-msgid "invite &lt;nick&gt;:  Invite nick to join this channel"
-msgstr "invite &lt;přezdívka&gt;: Pozvat přezdívku, aby se připojila k tomuto kanálu"
-
-#: src/protocols/silc/silc.c:1187
+#: src/protocols/silc/silc.c:1327 src/protocols/zephyr/zephyr.c:1673
 msgid "msg &lt;nick&gt; &lt;message&gt;:  Send a private message to a user"
-msgstr "msg &lt;přezdívka&gt; &lt;zpráva&gt;: Odeslat uživateli soukromou zprávu"
-
-#: src/protocols/silc/silc.c:1191
+msgstr ""
+"msg &lt;přezdívka&gt; &lt;zpráva&gt;: Odeslat uživateli soukromou zprávu"
+
+#: src/protocols/silc/silc.c:1331
 msgid "query &lt;nick&gt; [&lt;message&gt;]:  Send a private message to a user"
-msgstr "query &lt;přezdívka&gt; [&lt;zpráva&gt;]: Odeslat uživateli soukromou zprávu"
-
-#: src/protocols/silc/silc.c:1195
+msgstr ""
+"query &lt;přezdívka&gt; [&lt;zpráva&gt;]: Odeslat uživateli soukromou zprávu"
+
+#: src/protocols/silc/silc.c:1335
 msgid "motd:  View the server's Message Of The Day"
 msgstr "motd: Zobrazit zprávu dne tohoto serveru"
 
-#: src/protocols/silc/silc.c:1199
+#: src/protocols/silc/silc.c:1339
 msgid "detach:  Detach this session"
 msgstr "detach: Odpojit toto sezení"
 
-#: src/protocols/silc/silc.c:1203
-msgid "umode &lt;usermodes&gt;:  Set your user options"
-msgstr "umode &lt;uživatelskérežimy&gt;: Nastavit vaše možnosti uživatele"
-
-#: src/protocols/silc/silc.c:1214
+#: src/protocols/silc/silc.c:1343
+msgid "quit [message]:  Disconnect from the server, with an optional message"
+msgstr "quit [zpráva]: Odpojit se od serveru s nepovinnou zprávou"
+
+#: src/protocols/silc/silc.c:1347
+msgid "call &lt;command&gt;:  Call any silc client command"
+msgstr "call &lt;příkaz&gt;: Zavolat libovolný příkaz klienta silc"
+
+#: src/protocols/silc/silc.c:1352
+msgid "kill &lt;nick&gt; [-pubkey|&lt;reason&gt;]:  Kill nick"
+msgstr "kill &lt;přezdívka&gt; [-pubkey|&lt;důvod&gt;]: Zabít přezdívku"
+
+#: src/protocols/silc/silc.c:1356
+msgid "nick &lt;newnick&gt;:  Change your nickname"
+msgstr "nick &lt;novápřezdívka&gt;: Změnit vaši přezdívku"
+
+#: src/protocols/silc/silc.c:1360
+msgid "whowas &lt;nick&gt;:  View nick's information"
+msgstr "whowas &lt;přezdívka&gt;: Zobrazit informace o přezdívce"
+
+#: src/protocols/silc/silc.c:1364
+msgid ""
+"cmode &lt;channel&gt; [+|-&lt;modes&gt]; [arguments]:  Change or display "
+"channel modes"
+msgstr "cmode &lt;kanál&gt; [+|-&lt;režimy&gt]; [parametry]: Změnit nebo zobrazit režimy kanálu"
+
+#: src/protocols/silc/silc.c:1368
+msgid ""
+"cumode &lt;channel&gt; +|-&lt;modes&gt; &lt;nick&gt;:  Change nick's modes "
+"on channel"
+msgstr "cumode &lt;kanál&gt; +|-&lt;režimy&gt; &lt;přezdívka&gt;: Změnit režimy přezdívky v kanálu"
+
+#: src/protocols/silc/silc.c:1372
+msgid "umode &lt;usermodes&gt;:  Set your modes in the network"
+msgstr "umode &lt;uživatelskérežimy&gt;: Nastavit vaše režimy v síti"
+
+#: src/protocols/silc/silc.c:1376
+msgid "oper &lt;nick&gt; [-pubkey]:  Get server operator privileges"
+msgstr "oper &lt;přezdívka&gt; [-pubkey]: Získat privilegia operátora serveru"
+
+#: src/protocols/silc/silc.c:1380
+msgid ""
+"invite &lt;channel&gt; [-|+]&lt;nick&gt;:  invite nick or add/remove from "
+"channel invite list"
+msgstr "invite &lt;kanál&gt; [-|+]&lt;přezdíva&gt;: pozvat přezdívku nebo přidat/odstranit ze seznamu pozvaných do kanálu"
+
+#: src/protocols/silc/silc.c:1384
+msgid "kick &lt;channel&gt; &lt;nick&gt; [comment]:  Kick client from channel"
+msgstr "kick &lt;kanál&gt; &lt;přezdívk&gt; [poznámka]: Vykopnout klienta z kanálu"
+
+#: src/protocols/silc/silc.c:1388
+msgid "info [server]:  View server administrative details"
+msgstr "info [server]: Zobrazit administrativní podrobnosti o serveru"
+
+#: src/protocols/silc/silc.c:1392
+msgid "ban [&lt;channel&gt; +|-&lt;nick&gt;]:  Ban client from channel"
+msgstr "ban [&lt;kanál&gt; +|-&lt;přezdívka&gt;]:  Zakázat klientovi kanál"
+
+#: src/protocols/silc/silc.c:1396
+msgid "getkey &lt;nick|server&gt;:  Retrieve client's or server's public key"
+msgstr "getkey &lt;přezdívka|server&gt;: Získat veřejný klíč klienta nebo serveru"
+
+#: src/protocols/silc/silc.c:1400
+msgid "stats:  View server and network statistics"
+msgstr "stats: Zobrazit statistku o serveru a síti"
+
+#: src/protocols/silc/silc.c:1404
+msgid "ping:  Send PING to the connected server"
+msgstr "ping: Poslat PING připojenému serveru"
+
+#: src/protocols/silc/silc.c:1409
+msgid "users &lt;channel&gt;:  List users in channel"
+msgstr "users &lt;kanál&gt;: Vypsat uživatele v kanálu"
+
+#: src/protocols/silc/silc.c:1413
+msgid ""
+"names [-count|-ops|-halfops|-voices|-normal] &lt;channel(s)&gt;:  List "
+"specific users in channel(s)"
+msgstr "names [-count|-ops|-halfops|-voices|-normal] &lt;kanál(y)&gt;: Vypsat konkrétní uživatele v kanálech"
+
+#: src/protocols/silc/silc.c:1425
 msgid "Instant Messages"
 msgstr "Instant Message"
 
-#: src/protocols/silc/silc.c:1219
+#: src/protocols/silc/silc.c:1430
 msgid "Digitally sign all IM messages"
 msgstr "Digitálně podepisovat všechny instant message"
 
-#: src/protocols/silc/silc.c:1224
+#: src/protocols/silc/silc.c:1435
 msgid "Verify all IM message signatures"
 msgstr "Ověřovat podpisy všech zpráv IM"
 
-#: src/protocols/silc/silc.c:1227
+#: src/protocols/silc/silc.c:1438
 msgid "Channel Messages"
 msgstr "Zprávy kanálu"
 
-#: src/protocols/silc/silc.c:1232
+#: src/protocols/silc/silc.c:1443
 msgid "Digitally sign all channel messages"
 msgstr "Digitálně podepisovat všechny zprávy kanálu"
 
-#: src/protocols/silc/silc.c:1237
+#: src/protocols/silc/silc.c:1448
 msgid "Verify all channel message signatures"
 msgstr "Ověřovat podpisy všech zpráv kanálu"
 
-#: src/protocols/silc/silc.c:1240
+#: src/protocols/silc/silc.c:1451
 msgid "Default SILC Key Pair"
 msgstr "Implicitní pár klíčů SILC"
 
-#: src/protocols/silc/silc.c:1245
+#: src/protocols/silc/silc.c:1456
 msgid "SILC Public Key"
 msgstr "Veřejný klíč SILC"
 
-#: src/protocols/silc/silc.c:1250
+#: src/protocols/silc/silc.c:1461
 msgid "SILC Private Key"
 msgstr "Soukromý klíč SILC"
 
@@ -9443,91 +9672,91 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/silc/silc.c:1334
+#: src/protocols/silc/silc.c:1547
 msgid "SILC Protocol Plugin"
 msgstr "Zásuvný modul protokolu SILC"
 
 #. *  description
-#: src/protocols/silc/silc.c:1336
+#: src/protocols/silc/silc.c:1549
 msgid "Secure Internet Live Conferencing (SILC) Protocol"
 msgstr "Protokol Secure Internet Live Conferencing (SILC)"
 
-#: src/protocols/silc/silc.c:1366
+#: src/protocols/silc/silc.c:1579
 msgid "Public key authentication"
 msgstr "Autentizace veřejným klíčem"
 
-#: src/protocols/silc/silc.c:1372
+#: src/protocols/silc/silc.c:1585
 msgid "Public Key File"
 msgstr "Soubor veřejného klíče"
 
-#: src/protocols/silc/silc.c:1376
+#: src/protocols/silc/silc.c:1589
 msgid "Private Key File"
 msgstr "Soubor soukromého klíče"
 
-#: src/protocols/silc/silc.c:1381
+#: src/protocols/silc/silc.c:1594
 msgid "Reject watching by other users"
 msgstr "Odmítnout sledování jinými uživateli"
 
-#: src/protocols/silc/silc.c:1384
+#: src/protocols/silc/silc.c:1597
 msgid "Block invites"
 msgstr "Blokovat pozvání"
 
-#: src/protocols/silc/silc.c:1387
+#: src/protocols/silc/silc.c:1600
 msgid "Block IMs without Key Exchange"
 msgstr "Blokovat IM bez výměny klíčů"
 
-#: src/protocols/silc/silc.c:1390
+#: src/protocols/silc/silc.c:1603
 msgid "Reject online status attribute requests"
 msgstr "Odmítat požadavky na stav atributu stavu online"
 
-#: src/protocols/silc/util.c:200 src/protocols/silc/util.c:223
+#: src/protocols/silc/util.c:202 src/protocols/silc/util.c:227
 msgid "Creating SILC key pair..."
 msgstr "Vytvářím páč klíčů SILC..."
 
 #. Hint for translators: Please check the tabulator width here and in
 #. the next strings (short strings: 2 tabs, longer strings 1 tab,
 #. sum: 3 tabs or 24 characters)
-#: src/protocols/silc/util.c:289
+#: src/protocols/silc/util.c:310
 #, c-format
 msgid "Real Name: \t%s\n"
 msgstr "Skutečné jméno: \t%s\n"
 
-#: src/protocols/silc/util.c:291
+#: src/protocols/silc/util.c:312
 #, c-format
 msgid "User Name: \t%s\n"
 msgstr "Jméno uživatele: \t%s\n"
 
-#: src/protocols/silc/util.c:293
+#: src/protocols/silc/util.c:314
 #, c-format
 msgid "EMail: \t\t%s\n"
 msgstr "E-mail: \t\t%s\n"
 
-#: src/protocols/silc/util.c:295
+#: src/protocols/silc/util.c:316
 #, c-format
 msgid "Host Name: \t%s\n"
 msgstr "Název počítače: \t%s\n"
 
-#: src/protocols/silc/util.c:297
+#: src/protocols/silc/util.c:318
 #, c-format
 msgid "Organization: \t%s\n"
 msgstr "OOrganizace: \t%s\n"
 
-#: src/protocols/silc/util.c:299
+#: src/protocols/silc/util.c:320
 #, c-format
 msgid "Country: \t%s\n"
 msgstr "Země: \t%s\n"
 
-#: src/protocols/silc/util.c:300
-#, c-format
-msgid "Algorithm: \t\t%s\n"
-msgstr "Algoritmus: \t\t%s\n"
-
-#: src/protocols/silc/util.c:301
+#: src/protocols/silc/util.c:321
+#, c-format
+msgid "Algorithm: \t%s\n"
+msgstr "Algoritmus: \t%s\n"
+
+#: src/protocols/silc/util.c:322
 #, c-format
 msgid "Key Length: \t%d bits\n"
 msgstr "Délka klíče: \t%d bitů\n"
 
-#: src/protocols/silc/util.c:303
+#: src/protocols/silc/util.c:324
 #, c-format
 msgid ""
 "Public Key Fingerprint:\n"
@@ -9538,7 +9767,7 @@
 "%s\n"
 "\n"
 
-#: src/protocols/silc/util.c:304
+#: src/protocols/silc/util.c:325
 #, c-format
 msgid ""
 "Public Key Babbleprint:\n"
@@ -9547,10 +9776,26 @@
 "Babbleprint veřejného klíče:\n"
 "%s"
 
-#: src/protocols/silc/util.c:308 src/protocols/silc/util.c:309
+#: src/protocols/silc/util.c:329 src/protocols/silc/util.c:330
 msgid "Public Key Information"
 msgstr "Informace o veřejném klíči"
 
+#: src/protocols/silc/util.c:512
+msgid "Paging"
+msgstr "Pager"
+
+#: src/protocols/silc/util.c:536
+msgid "Computer"
+msgstr "Počítač"
+
+#: src/protocols/silc/util.c:540
+msgid "PDA"
+msgstr "PDA"
+
+#: src/protocols/silc/util.c:542
+msgid "Terminal"
+msgstr "Terminál"
+
 #: src/protocols/toc/toc.c:137
 #, c-format
 msgid "Looking up %s"
@@ -9756,15 +10001,15 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/toc/toc.c:2167 src/protocols/toc/toc.c:2169
+#: src/protocols/toc/toc.c:2169 src/protocols/toc/toc.c:2171
 msgid "TOC Protocol Plugin"
 msgstr "Zásuvný modul protokolu TOC"
 
-#: src/protocols/toc/toc.c:2188
+#: src/protocols/toc/toc.c:2190
 msgid "TOC host"
 msgstr "Počítač TOC"
 
-#: src/protocols/toc/toc.c:2192
+#: src/protocols/toc/toc.c:2194
 msgid "TOC port"
 msgstr "Port TOC"
 
@@ -9848,11 +10093,11 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/trepia/trepia.c:1269 src/protocols/trepia/trepia.c:1271
+#: src/protocols/trepia/trepia.c:1271 src/protocols/trepia/trepia.c:1273
 msgid "Trepia Protocol Plugin"
 msgstr "Zásuvný modul protokolu Trepia"
 
-#: src/protocols/yahoo/yahoo.c:328
+#: src/protocols/yahoo/yahoo.c:338
 msgid ""
 "You have been logged off as you have logged in on a different machine or "
 "device."
@@ -9860,26 +10105,26 @@
 "Byli jste odhlášeni, protože jste se přihlásili z jiného počítače nebo "
 "zařízení."
 
-#: src/protocols/yahoo/yahoo.c:798
+#: src/protocols/yahoo/yahoo.c:808
 msgid "Your Yahoo! message did not get sent."
 msgstr "Vaše zpráva Yahoo! nebyla odeslána."
 
-#: src/protocols/yahoo/yahoo.c:817
+#: src/protocols/yahoo/yahoo.c:827
 msgid "Buzz!!"
 msgstr "Crr!!"
 
-#: src/protocols/yahoo/yahoo.c:860
+#: src/protocols/yahoo/yahoo.c:870
 #, c-format
 msgid "Yahoo! system message for %s:"
 msgstr "Zpráva systému Yahoo! pro %s:"
 
-#: src/protocols/yahoo/yahoo.c:926
+#: src/protocols/yahoo/yahoo.c:936
 #, c-format
 msgid "%s has (retroactively) denied your request to add them to your list."
 msgstr ""
 "%s (zpětně) odmítl váš požadavek přidat jej do vašeho seznamu kontaktů."
 
-#: src/protocols/yahoo/yahoo.c:929
+#: src/protocols/yahoo/yahoo.c:939
 #, c-format
 msgid ""
 "%s has (retroactively) denied your request to add them to your list for the "
@@ -9888,11 +10133,11 @@
 "%s (zpětně) zamítl váš požadavek přidat jej do vašeho seznamu kontaktů z "
 "následujícího důvodu: %s."
 
-#: src/protocols/yahoo/yahoo.c:932
+#: src/protocols/yahoo/yahoo.c:942
 msgid "Add buddy rejected"
 msgstr "Přidání kamaráda zamítnuto"
 
-#: src/protocols/yahoo/yahoo.c:1688
+#: src/protocols/yahoo/yahoo.c:1702
 #, c-format
 msgid ""
 "The Yahoo server has requested the use of an unrecognized authentication "
@@ -9903,11 +10148,11 @@
 "se pravděpodobně nebude moci úspěšně přihlásit k Yahoo. Hledejte aktualizace "
 "na %s."
 
-#: src/protocols/yahoo/yahoo.c:1691
+#: src/protocols/yahoo/yahoo.c:1705
 msgid "Failed Yahoo! Authentication"
 msgstr "Selhala autentizace Yahoo!"
 
-#: src/protocols/yahoo/yahoo.c:1763
+#: src/protocols/yahoo/yahoo.c:1777
 #, c-format
 msgid ""
 "You have tried to ignore %s, but the user is on your buddy list.  Clicking "
@@ -9916,76 +10161,88 @@
 "Pokusili jste se ignorovat %s, ale tento uživatel je na vašem seznamu "
 "kamarádů.  Kliknutím na \"Ano\" kamaráda odstraníte a budete ignorovat."
 
-#: src/protocols/yahoo/yahoo.c:1766
+#: src/protocols/yahoo/yahoo.c:1780
 msgid "Ignore buddy?"
 msgstr "Ignorovat kamaráda?"
 
-#: src/protocols/yahoo/yahoo.c:1799
+#: src/protocols/yahoo/yahoo.c:1814
 msgid "Invalid username."
 msgstr "Neplatné jméno uživatele."
 
-#: src/protocols/yahoo/yahoo.c:1802
+#: src/protocols/yahoo/yahoo.c:1825
+msgid "Normal authencation failed!"
+msgstr "Normální autentizace selhala!"
+
+#: src/protocols/yahoo/yahoo.c:1826
+msgid ""
+"The normal authencation method has failed. This means either your password "
+"is incorrect, or Yahoo!'s authencation scheme has changed. Gaim will now "
+"attempt to log in using Web Messenger authencation, will which result in "
+"reduced functionality and features."
+msgstr "Normální metoda autentizace selhala. To znamená, že buď bylo vaše heslo nesprávné, nebo se změnilo schéma autentizace Yahoo!. Gaim se nyní pokusí přihlásit pomocí autentizace Web Messenger, což způsobí omezené funkce."
+
+#: src/protocols/yahoo/yahoo.c:1834
 msgid "Incorrect password."
 msgstr "Nesprávné heslo."
 
-#: src/protocols/yahoo/yahoo.c:1805
+#: src/protocols/yahoo/yahoo.c:1837
 msgid "Your account is locked, please log in to the Yahoo! website."
 msgstr "Váš účet je uzamčen, přihlaste se prosím na WWW stránkách Yahoo!."
 
-#: src/protocols/yahoo/yahoo.c:1808
+#: src/protocols/yahoo/yahoo.c:1840
 #, c-format
 msgid "Unknown error number %d. Logging into the Yahoo! website may fix this."
 msgstr "Neznámá chyba číslo %d. Přihlášení se na WWW Yahoo! to možná opraví."
 
-#: src/protocols/yahoo/yahoo.c:1862
+#: src/protocols/yahoo/yahoo.c:1894
 #, c-format
 msgid "Could not add buddy %s to group %s to the server list on account %s."
 msgstr "Nemohu přidat kamaráda %s do skupiny %s do seznamu serveru na účtu %s."
 
-#: src/protocols/yahoo/yahoo.c:1864
+#: src/protocols/yahoo/yahoo.c:1896
 msgid "Could not add buddy to server list"
 msgstr "Nemohu přidat kaamráda do seznamu na serveru"
 
-#: src/protocols/yahoo/yahoo.c:2055 src/protocols/yahoo/yahoo.c:2186
+#: src/protocols/yahoo/yahoo.c:2088 src/protocols/yahoo/yahoo.c:2216
 msgid "Unable to read"
 msgstr "Nemohu číst"
 
-#: src/protocols/yahoo/yahoo.c:2208 src/protocols/yahoo/yahoo.c:2318
-#: src/protocols/yahoo/yahoo.c:2374 src/protocols/yahoo/yahoo.c:2384
-#: src/protocols/yahoo/yahoochat.c:1358 src/protocols/yahoo/yahoochat.c:1419
+#: src/protocols/yahoo/yahoo.c:2238 src/protocols/yahoo/yahoo.c:2348
+#: src/protocols/yahoo/yahoo.c:2398 src/protocols/yahoo/yahoo.c:2408
+#: src/protocols/yahoo/yahoochat.c:1397 src/protocols/yahoo/yahoochat.c:1458
 msgid "Connection problem"
 msgstr "Problém se spojením"
 
-#: src/protocols/yahoo/yahoo.c:2472 src/protocols/yahoo/yahoo.c:2850
-#: src/protocols/yahoo/yahoo.c:2962
+#: src/protocols/yahoo/yahoo.c:2495 src/protocols/yahoo/yahoo.c:2857
+#: src/protocols/yahoo/yahoo.c:2971
 msgid "Not At Home"
 msgstr "Nejsem doma"
 
-#: src/protocols/yahoo/yahoo.c:2474 src/protocols/yahoo/yahoo.c:2852
-#: src/protocols/yahoo/yahoo.c:2963
+#: src/protocols/yahoo/yahoo.c:2497 src/protocols/yahoo/yahoo.c:2859
+#: src/protocols/yahoo/yahoo.c:2972
 msgid "Not At Desk"
 msgstr "Nejsem u stolu"
 
-#: src/protocols/yahoo/yahoo.c:2476 src/protocols/yahoo/yahoo.c:2854
-#: src/protocols/yahoo/yahoo.c:2964
+#: src/protocols/yahoo/yahoo.c:2499 src/protocols/yahoo/yahoo.c:2861
+#: src/protocols/yahoo/yahoo.c:2973
 msgid "Not In Office"
 msgstr "Nejsem v kanceláři"
 
-#: src/protocols/yahoo/yahoo.c:2480 src/protocols/yahoo/yahoo.c:2858
-#: src/protocols/yahoo/yahoo.c:2966
+#: src/protocols/yahoo/yahoo.c:2503 src/protocols/yahoo/yahoo.c:2865
+#: src/protocols/yahoo/yahoo.c:2975
 msgid "On Vacation"
 msgstr "Na dovolené"
 
-#: src/protocols/yahoo/yahoo.c:2484 src/protocols/yahoo/yahoo.c:2862
-#: src/protocols/yahoo/yahoo.c:2968
+#: src/protocols/yahoo/yahoo.c:2507 src/protocols/yahoo/yahoo.c:2869
+#: src/protocols/yahoo/yahoo.c:2977
 msgid "Stepped Out"
 msgstr "Šel jsem ven"
 
-#: src/protocols/yahoo/yahoo.c:2565 src/protocols/yahoo/yahoo.c:2591
+#: src/protocols/yahoo/yahoo.c:2588 src/protocols/yahoo/yahoo.c:2614
 msgid "Not on server list"
 msgstr "Není na seznamu serveru"
 
-#: src/protocols/yahoo/yahoo.c:2611
+#: src/protocols/yahoo/yahoo.c:2634
 #, c-format
 msgid ""
 "\n"
@@ -9994,27 +10251,27 @@
 "\n"
 "<b>%s:</b> %s"
 
-#: src/protocols/yahoo/yahoo.c:2682
+#: src/protocols/yahoo/yahoo.c:2693
 msgid "Join in Chat"
 msgstr "Připojit se k chatu"
 
-#: src/protocols/yahoo/yahoo.c:2686
+#: src/protocols/yahoo/yahoo.c:2698
 msgid "Initiate Conference"
 msgstr "Začít konferenci"
 
-#: src/protocols/yahoo/yahoo.c:2743
+#: src/protocols/yahoo/yahoo.c:2750
 msgid "Active which ID?"
 msgstr "Které ID aktivovat?"
 
-#: src/protocols/yahoo/yahoo.c:2752
+#: src/protocols/yahoo/yahoo.c:2759
 msgid "Join who in chat?"
 msgstr "Připojit koho k chatu?"
 
-#: src/protocols/yahoo/yahoo.c:2762
+#: src/protocols/yahoo/yahoo.c:2769
 msgid "Activate ID..."
 msgstr "Aktivovat ID..."
 
-#: src/protocols/yahoo/yahoo.c:2766
+#: src/protocols/yahoo/yahoo.c:2773
 msgid "Join user in chat..."
 msgstr "Připojit uživatele k chatu..."
 
@@ -10029,42 +10286,50 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/yahoo/yahoo.c:3286 src/protocols/yahoo/yahoo.c:3288
+#: src/protocols/yahoo/yahoo.c:3292 src/protocols/yahoo/yahoo.c:3294
 msgid "Yahoo Protocol Plugin"
 msgstr "Zásuvný modul protokolu Yahoo"
 
-#: src/protocols/yahoo/yahoo.c:3307
+#: src/protocols/yahoo/yahoo.c:3313
 msgid "Yahoo Japan"
 msgstr "Yahoo Japonsko"
 
-#: src/protocols/yahoo/yahoo.c:3310
-msgid "Pager host"
-msgstr "Počítač pageru"
-
-#: src/protocols/yahoo/yahoo.c:3313
-msgid "Japan Pager host"
-msgstr "Počítač pageru v Japonsku"
-
 #: src/protocols/yahoo/yahoo.c:3316
-msgid "Pager port"
-msgstr "Port pageru"
+msgid "Pager host"
+msgstr "Počítač pageru"
 
 #: src/protocols/yahoo/yahoo.c:3319
-msgid "File transfer host"
-msgstr "Počítač přenosu souborů"
+msgid "Japan Pager host"
+msgstr "Počítač pageru v Japonsku"
 
 #: src/protocols/yahoo/yahoo.c:3322
-msgid "Japan File transfer host"
-msgstr "Počítač přenosu souborů v Japonsku"
+msgid "Pager port"
+msgstr "Port pageru"
 
 #: src/protocols/yahoo/yahoo.c:3325
+msgid "File transfer host"
+msgstr "Počítač přenosu souborů"
+
+#: src/protocols/yahoo/yahoo.c:3328
+msgid "Japan File transfer host"
+msgstr "Počítač přenosu souborů v Japonsku"
+
+#: src/protocols/yahoo/yahoo.c:3331
 msgid "File transfer port"
 msgstr "Port přenosu souborů"
 
-#: src/protocols/yahoo/yahoo.c:3328
+#: src/protocols/yahoo/yahoo.c:3334
 msgid "Chat Room List Url"
 msgstr "URL seznamu místností chatu"
 
+#: src/protocols/yahoo/yahoo.c:3337
+msgid "YCHT Host"
+msgstr "Počítač YCHT"
+
+#: src/protocols/yahoo/yahoo.c:3340
+msgid "YCHT Port"
+msgstr "Port YCHT"
+
 #: src/protocols/yahoo/yahoo_filexfer.c:170
 msgid ""
 "Gaim cannot send files over Yahoo! that are bigger than One Megabyte "
@@ -10073,150 +10338,178 @@
 "Gaim nemůže po Yahoo! posílat soubory, které jsou větší než jeden megabajt "
 "(1.048.576 bajtů)."
 
-#: src/protocols/yahoo/yahoo_profile.c:640
-#: src/protocols/yahoo/yahoo_profile.c:961
-msgid "Yahoo! ID"
-msgstr "ID Yahoo!"
-
-#: src/protocols/yahoo/yahoo_profile.c:664
+#: src/protocols/yahoo/yahoo_profile.c:675
 #, c-format
 msgid "<b>IP Address:</b> %s<br>"
 msgstr "<b>IP adresa:</b> %s<br>"
 
-#: src/protocols/yahoo/yahoo_profile.c:779
+#: src/protocols/yahoo/yahoo_profile.c:749
+msgid "Yahoo! Japan Profile"
+msgstr "Profil Yahoo! Japonsko"
+
+#: src/protocols/yahoo/yahoo_profile.c:750
+msgid "Yahoo! Profile"
+msgstr "Profil Yahoo!"
+
+#: src/protocols/yahoo/yahoo_profile.c:794
 msgid ""
 "Sorry, profiles marked as containing adult content are not supported at this "
 "time."
-msgstr "Lituji, v současné době nejsou podporovány profily označené jako obsahující obsah pro dospělé."
-
-#: src/protocols/yahoo/yahoo_profile.c:781
-#: src/protocols/yahoo/yahoo_profile.c:829
+msgstr ""
+"Lituji, v současné době nejsou podporovány profily označené jako obsahující "
+"obsah pro dospělé."
+
+#: src/protocols/yahoo/yahoo_profile.c:796
 msgid ""
 "If you wish to view this profile, you will need to visit this link in your "
 "web browser"
-msgstr "Pokud si přejete zobrazit tento profil, musíte navštívit tento odkaz ve svém WWW prohlížeči"
-
-#: src/protocols/yahoo/yahoo_profile.c:827
+msgstr ""
+"Pokud si přejete zobrazit tento profil, musíte navštívit tento odkaz ve svém "
+"WWW prohlížeči"
+
+#: src/protocols/yahoo/yahoo_profile.c:969
+msgid "Yahoo! ID"
+msgstr "ID Yahoo!"
+
+#: src/protocols/yahoo/yahoo_profile.c:1043
+#: src/protocols/yahoo/yahoo_profile.c:1047
+#: src/protocols/yahoo/yahoo_profile.c:1051
+msgid "Hobbies"
+msgstr "Končíčky"
+
+#: src/protocols/yahoo/yahoo_profile.c:1061
+#: src/protocols/yahoo/yahoo_profile.c:1065
+msgid "Latest News"
+msgstr "Nejnovější zprávy"
+
+#: src/protocols/yahoo/yahoo_profile.c:1086
+msgid "Home Page"
+msgstr "Domovská stránka"
+
+#: src/protocols/yahoo/yahoo_profile.c:1101
+msgid "Cool Link 1"
+msgstr "Skvělý odkaz 1"
+
+#: src/protocols/yahoo/yahoo_profile.c:1106
+msgid "Cool Link 2"
+msgstr "Skvělý odkaz 2"
+
+#: src/protocols/yahoo/yahoo_profile.c:1110
+msgid "Cool Link 3"
+msgstr "Skvělý odkaz 3"
+
+#: src/protocols/yahoo/yahoo_profile.c:1130
+#, c-format
+msgid "User information for %s unavailable"
+msgstr "Informace o uživateli %s nedostupné"
+
+#: src/protocols/yahoo/yahoo_profile.c:1136
 msgid ""
 "Sorry, this profile seems to be in a language that is not supported at this "
 "time."
-msgstr "Lituji, tento profil je v jazyce, který v současné době není podporován."
-
-#: src/protocols/yahoo/yahoo_profile.c:1038
-#: src/protocols/yahoo/yahoo_profile.c:1042
-#: src/protocols/yahoo/yahoo_profile.c:1046
-msgid "Hobbies"
-msgstr "Končíčky"
-
-#: src/protocols/yahoo/yahoo_profile.c:1056
-#: src/protocols/yahoo/yahoo_profile.c:1060
-msgid "Latest News"
-msgstr "Nejnovější zprávy"
-
-#: src/protocols/yahoo/yahoo_profile.c:1081
-msgid "Home Page"
-msgstr "Domovská stránka"
-
-#: src/protocols/yahoo/yahoo_profile.c:1096
-msgid "Cool Link 1"
-msgstr "Skvělý odkaz 1"
-
-#: src/protocols/yahoo/yahoo_profile.c:1101
-msgid "Cool Link 2"
-msgstr "Skvělý odkaz 2"
-
-#: src/protocols/yahoo/yahoo_profile.c:1105
-msgid "Cool Link 3"
-msgstr "Skvělý odkaz 3"
-
-#: src/protocols/yahoo/yahoo_profile.c:1138
-#, c-format
-msgid "User information for %s unavailable"
-msgstr "Informace o uživateli %s nedostupné"
-
-#: src/protocols/yahoo/yahoochat.c:198
+msgstr ""
+"Lituji, tento profil je v jazyce, který v současné době není podporován."
+
+#: src/protocols/yahoo/yahoo_profile.c:1152
+msgid ""
+"Could not retrieve the user's profile. This most likely is a temporary "
+"server-side problem. Please try again later."
+msgstr "Nemohu získat profil uživatele. To je pravděpodobně dočasný problém na straně serveru. Zkuste to prosím znovu později."
+
+#: src/protocols/yahoo/yahoo_profile.c:1155
+msgid ""
+"Could not retrieve the user's profile. This most likely means that the user "
+"does not exist; however, Yahoo! sometimes does fail to find a user's "
+"profile. If you know that the user exists, please try again later."
+msgstr "Nemohu získat profil uživatele. To pravděpodobně znamená, že uživatel neexistuje; nekdy ale Yahoo! opravdu nemůže najít profil uživatele. Pokud více, že uživatel existuje, zkuste to prosím znovu později."
+
+#: src/protocols/yahoo/yahoo_profile.c:1163
+msgid "The user's profile is empty."
+msgstr "Profil uživatele je prázdný."
+
+#: src/protocols/yahoo/yahoochat.c:203
 #, c-format
 msgid "%s declined your conference invitation to room \"%s\" because \"%s\"."
 msgstr ""
 "%s odmítl vaše pozvání ke konferenci do mísnosti \"%s\", protože \"%s\"."
 
-#: src/protocols/yahoo/yahoochat.c:200
+#: src/protocols/yahoo/yahoochat.c:205
 msgid "Invitation Rejected"
 msgstr "Pozvání odmítnuto"
 
-#: src/protocols/yahoo/yahoochat.c:350
+#: src/protocols/yahoo/yahoochat.c:355
 msgid "Failed to join chat"
 msgstr "Nemohu se připojit k chatu"
 
-#: src/protocols/yahoo/yahoochat.c:350
+#: src/protocols/yahoo/yahoochat.c:355
 msgid "Maybe the room is full?"
 msgstr "Možná je místnost plná?"
 
-#: src/protocols/yahoo/yahoochat.c:424
+#: src/protocols/yahoo/yahoochat.c:429
 #, c-format
 msgid "You are now chatting in %s."
 msgstr "Nyní diskutujete v %s."
 
-#: src/protocols/yahoo/yahoochat.c:578
+#: src/protocols/yahoo/yahoochat.c:583
 msgid "Failed to join buddy in chat"
 msgstr "Nemohu připojit kamaráda k chatu"
 
-#: src/protocols/yahoo/yahoochat.c:579
+#: src/protocols/yahoo/yahoochat.c:584
 msgid "Maybe they're not in a chat?"
 msgstr "Možná nejsou v chatu?"
 
-#: src/protocols/yahoo/yahoochat.c:1299
+#: src/protocols/yahoo/yahoochat.c:1338
 msgid "Unable to connect"
 msgstr "Nemohu se připojit"
 
-#: src/protocols/yahoo/yahoochat.c:1299
+#: src/protocols/yahoo/yahoochat.c:1338
 msgid "Fetching the room list failed."
 msgstr "Získávání seznamu místností selhalo."
 
-#: src/protocols/yahoo/yahoochat.c:1344
+#: src/protocols/yahoo/yahoochat.c:1383
 msgid "Voices"
 msgstr "Hlasy"
 
-#: src/protocols/yahoo/yahoochat.c:1347
+#: src/protocols/yahoo/yahoochat.c:1386
 msgid "Webcams"
 msgstr "WWW kamery"
 
-#: src/protocols/yahoo/yahoochat.c:1358 src/protocols/yahoo/yahoochat.c:1419
+#: src/protocols/yahoo/yahoochat.c:1397 src/protocols/yahoo/yahoochat.c:1458
 msgid "Unable to fetch room list."
 msgstr "Nemohu získat seznam místností."
 
-#: src/protocols/yahoo/yahoochat.c:1412
+#: src/protocols/yahoo/yahoochat.c:1451
 msgid "User Rooms"
 msgstr "Místnosti uživatele"
 
-#: src/protocols/zephyr/zephyr.c:566
+#: src/protocols/zephyr/zephyr.c:589
 #, c-format
 msgid "Unable send to chat %s,%s,%s"
 msgstr "Nemohu do chatu poslat %s,%s,%s"
 
-#: src/protocols/zephyr/zephyr.c:600
+#: src/protocols/zephyr/zephyr.c:624
 #, c-format
 msgid "<b>User:</b> %s<br>"
 msgstr "<b>Uživatel:</b> %s<br>"
 
-#: src/protocols/zephyr/zephyr.c:604
+#: src/protocols/zephyr/zephyr.c:628
 msgid "<br>Hidden or not logged-in"
 msgstr "<br>Skrytý nebo nepřihlášen"
 
-#: src/protocols/zephyr/zephyr.c:608
+#: src/protocols/zephyr/zephyr.c:633
 #, c-format
 msgid "<br>At %s since %s"
 msgstr "<br>Na %s od %s"
 
-#: src/protocols/zephyr/zephyr.c:873 src/protocols/zephyr/zephyr.c:874
+#: src/protocols/zephyr/zephyr.c:983 src/protocols/zephyr/zephyr.c:984
 msgid "Anyone"
 msgstr "Kdokoli"
 
-#: src/protocols/zephyr/zephyr.c:900
+#: src/protocols/zephyr/zephyr.c:1011
 msgid "Already logged in with Zephyr"
 msgstr "Již přihlášen u Zephyru"
 
-#: src/protocols/zephyr/zephyr.c:900
+#: src/protocols/zephyr/zephyr.c:1011
 msgid ""
 "Because Zephyr uses your system username, you are unable to have multiple "
 "accounts on it when logged in as the same user."
@@ -10224,18 +10517,78 @@
 "Protože Zephyr používá vaše přihlašovací jméno uživatele, nemůžete na něm "
 "mít více účtů, když jste přihlášen jako ten samý uživatel."
 
-#: src/protocols/zephyr/zephyr.c:1232
+#: src/protocols/zephyr/zephyr.c:1386
 msgid "_Class:"
 msgstr "_Třída:"
 
-#: src/protocols/zephyr/zephyr.c:1238
+#: src/protocols/zephyr/zephyr.c:1392
 msgid "_Instance:"
 msgstr "_Instance:"
 
-#: src/protocols/zephyr/zephyr.c:1244
+#: src/protocols/zephyr/zephyr.c:1398
 msgid "_Recipient:"
 msgstr "_Příjemce:"
 
+#: src/protocols/zephyr/zephyr.c:1409
+#, c-format
+msgid "Attempt to subscribe to %s,%s,%s failed"
+msgstr "Pokus přihlásit se k %s,%s,%s selhal"
+
+#: src/protocols/zephyr/zephyr.c:1678
+msgid "zlocate &lt;nick&gt;: Locate user"
+msgstr "zlocate &lt;přezdívka&gt;: Najít uživatele"
+
+#: src/protocols/zephyr/zephyr.c:1683
+msgid "zl &lt;nick&gt;: Locate user"
+msgstr "zl &lt;přezdívka&gt;: Najít uživatele"
+
+#: src/protocols/zephyr/zephyr.c:1688
+msgid "instance &lt;instance&gt;: Set the instance to be used on this class"
+msgstr "instance &lt;instance&gt;: Nastavit instanci, kterou používat v této třídě"
+
+#: src/protocols/zephyr/zephyr.c:1693
+msgid "inst &lt;instance&gt;: Set the instance to be used on this class"
+msgstr "inst &lt;instance&gt;: Nastavit instanci, kterou používat v této třídě"
+
+#: src/protocols/zephyr/zephyr.c:1699
+msgid "sub &lt;class&gt; &lt;instance&gt; &lt;recipient&gt;: Join a new chat"
+msgstr "sub &lt;třída&gt; &lt;instance&gt; &lt;příjemce&gt;: Připojit se k novému chatu"
+
+#: src/protocols/zephyr/zephyr.c:1704
+msgid ""
+"zi &lt;instance&gt;: Send a message to &lt;message,<i>instance</i>,*&gt;"
+msgstr "zi &lt;instance&gt;: Odeslat zprávu na &lt;zpráva,<i>instance</i>,*&gt;"
+
+#: src/protocols/zephyr/zephyr.c:1710
+msgid ""
+"zci &lt;class&gt; &lt;instance&gt;: Send a message to &lt;<i>class</i>,"
+"<i>instance</i>,*&gt;"
+msgstr "zci &lt;třída&gt; &lt;instance&gt;: Odeslat zprávu na &lt;<i>třída</i>,<i>instance</i>,*&gt;"
+
+#: src/protocols/zephyr/zephyr.c:1716
+msgid ""
+"zcir &lt;class&gt; &lt;instance&gt; &lt;recipient&gt;: Send a message to &lt;"
+"<i>class</i>,<i>instance</i>,<i>recipient</i>&gt;"
+msgstr "zcir &lt;třída&gt; &lt;instance&gt; &lt;příjemce&gt;: Odeslat zprávu na &lt;<i>třída</i>,<i>instance</i>,<i>příjemce</i>&gt;"
+
+#: src/protocols/zephyr/zephyr.c:1722
+msgid ""
+"zir &lt;instance&gt; &lt;recipient&gt;: Send a message to &lt;MESSAGE,"
+"<i>instance</i>,<i>recipient</i>&gt;"
+msgstr "zir &lt;instance&gt; &lt;příjemce&gt;: Odeslat zprávu na &lt;MESSAGE,<i>instance</i>,<i>příjemce</i>&gt;"
+
+#: src/protocols/zephyr/zephyr.c:1727
+msgid "zc &lt;class&gt;: Send a message to &lt;<i>class</i>,PERSONAL,*&gt;"
+msgstr "zc &lt;třída&gt;: Odeslat zprávu na &lt;<i>třída</i>,PERSONAL,*&gt;"
+
+#: src/protocols/zephyr/zephyr.c:1802
+msgid "Resubscribe"
+msgstr "Znovu se přihlásit"
+
+#: src/protocols/zephyr/zephyr.c:1805
+msgid "Retrieve subscriptions from server"
+msgstr "Získat přihlášení od serveru"
+
 #. *< api_version
 #. *< type
 #. *< ui_requirement
@@ -10247,19 +10600,19 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/zephyr/zephyr.c:1412 src/protocols/zephyr/zephyr.c:1414
+#: src/protocols/zephyr/zephyr.c:1885 src/protocols/zephyr/zephyr.c:1887
 msgid "Zephyr Protocol Plugin"
 msgstr "Zásuvný modul protokolu Zephyr"
 
-#: src/protocols/zephyr/zephyr.c:1433
+#: src/protocols/zephyr/zephyr.c:1906
 msgid "Export to .anyone"
 msgstr "Exportovat do .anyone"
 
-#: src/protocols/zephyr/zephyr.c:1436
+#: src/protocols/zephyr/zephyr.c:1909
 msgid "Export to .zephyr.subs"
 msgstr "Exportovat do .zephyr.subs"
 
-#: src/protocols/zephyr/zephyr.c:1439
+#: src/protocols/zephyr/zephyr.c:1912
 msgid "Exposure"
 msgstr "Vystavení"
 
@@ -10288,14 +10641,14 @@
 "neplatné."
 
 #. * Custom away message.
-#: src/prpl.h:205
+#: src/prpl.h:165
 msgid "Custom"
 msgstr "Vlastní"
 
 #. *
 #. * A wrapper for gaim_request_action() that uses Accept and Cancel buttons.
 #.
-#: src/request.h:1252
+#: src/request.h:1253
 msgid "Accept"
 msgstr "Přijmout"
 
@@ -10320,27 +10673,27 @@
 msgid "(1 message)"
 msgstr "(1 zpráva)"
 
-#: src/server.c:1176 src/server.c:1186
+#: src/server.c:1180 src/server.c:1189
 #, c-format
 msgid "%s logged in."
 msgstr "%s přihlášen."
 
-#: src/server.c:1199
+#: src/server.c:1201
 #, c-format
 msgid "%s signed on"
 msgstr "%s se přihlásil"
 
-#: src/server.c:1215
+#: src/server.c:1216
 #, c-format
 msgid "%s came back"
 msgstr "%s se vrátil"
 
-#: src/server.c:1217
+#: src/server.c:1218
 #, c-format
 msgid "%s went away"
 msgstr "%s šel pryč"
 
-#: src/server.c:1231
+#: src/server.c:1232
 #, c-format
 msgid "%s became idle"
 msgstr "%s se stal nečinným"
@@ -10350,17 +10703,17 @@
 msgid "%s became unidle"
 msgstr "%s se stal činným"
 
-#: src/server.c:1254 src/server.c:1262
+#: src/server.c:1253 src/server.c:1260
 #, c-format
 msgid "%s logged out."
 msgstr "%s odhlášen."
 
-#: src/server.c:1276
+#: src/server.c:1273
 #, c-format
 msgid "%s signed off"
 msgstr "%s se odhlásil"
 
-#: src/server.c:1338
+#: src/server.c:1335
 #, c-format
 msgid ""
 "%s has just been warned by %s.\n"
@@ -10369,11 +10722,11 @@
 "%s byl právě varován od %s.\n"
 "Vaše nová úroveň varování je %d%%"
 
-#: src/server.c:1341
+#: src/server.c:1338
 msgid "an anonymous person"
 msgstr "anonymní osoby"
 
-#: src/server.c:1451
+#: src/server.c:1448
 #, c-format
 msgid ""
 "User '%s' invites %s to buddy chat room: '%s'\n"
@@ -10382,12 +10735,12 @@
 "Uživatel '%s' zve %s do místnosti chatu kamarádů: '%s'\n"
 "%s"
 
-#: src/server.c:1455
+#: src/server.c:1452
 #, c-format
 msgid "User '%s' invites %s to buddy chat room: '%s'\n"
 msgstr "Uživatel '%s' zve %s do místnosti chatu kamarádů: '%s'\n"
 
-#: src/server.c:1461
+#: src/server.c:1458
 msgid "Accept chat invitation?"
 msgstr "Přijmout pozvání k chatu?"
 
@@ -10422,28 +10775,35 @@
 msgid "Unknown."
 msgstr "Neznámá."
 
-#: src/util.c:2399
+#: src/util.c:2392
+msgid "second"
+msgid_plural "seconds"
+msgstr[0] "sekunda"
+msgstr[1] "sekundy"
+msgstr[2] "sekund"
+
+#: src/util.c:2406
 msgid "day"
 msgid_plural "days"
 msgstr[0] "den"
 msgstr[1] "dny"
 msgstr[2] "dnů"
 
-#: src/util.c:2407
+#: src/util.c:2414
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "hodina"
 msgstr[1] "hodiny"
 msgstr[2] "hodin"
 
-#: src/util.c:2415
+#: src/util.c:2422
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "minuta"
 msgstr[1] "minuty"
 msgstr[2] "minut"
 
-#: src/util.c:2824
+#: src/util.c:2832
 msgid "g003: Error opening connection.\n"
 msgstr "g003: Chyba při otevírání spojení.\n"
 
@@ -10459,6 +10819,24 @@
 msgid "Notification"
 msgstr "Upozornění"
 
+#~ msgid "That file already exists."
+#~ msgstr "Tento soubor již existuje."
+
+#~ msgid "Save As..."
+#~ msgstr "Uložit jako..."
+
+#~ msgid "MSN ID"
+#~ msgstr "ID MSN"
+
+#~ msgid "Modes"
+#~ msgstr "Režimy"
+
+#~ msgid "Hostname"
+#~ msgstr "Název počítače"
+
+#~ msgid "Channels"
+#~ msgstr "Kanály"
+
 #~ msgid "_Browse"
 #~ msgstr "_Procházet"
 
@@ -10495,9 +10873,6 @@
 #~ msgid "Unable to request INF\n"
 #~ msgstr "Nemohu požadovat INF\n"
 
-#~ msgid "Got invalid XFR"
-#~ msgstr "Dostal jsem neplatný XFR"
-
 #~ msgid "Unable to transfer"
 #~ msgstr "Nemohu přenášet"
 
@@ -10911,12 +11286,6 @@
 #~ msgid "%s (%s) reported that %s returned from idle @ %s"
 #~ msgstr "%s (%s) oznámil, že %s se vrátil z nečinnosti @ %s"
 
-#~ msgid "Disconnected"
-#~ msgstr "Odpojen"
-
-#~ msgid "Invalid response from server"
-#~ msgstr "Neplatná odpověď od serveru"
-
 #~ msgid "%s (Code %s)"
 #~ msgstr "%s (Kód %s)"
 
@@ -11157,9 +11526,6 @@
 #~ msgid "Unable to send USR\n"
 #~ msgstr "Nemohu odeslat USR\n"
 
-#~ msgid "Got invalid XFR\n"
-#~ msgstr "Dostal jsem neplatný XFR\n"
-
 #~ msgid "Unable to request INF"
 #~ msgstr "Nemohu požadovat INF"
 
--- a/po/fr.po	Tue Jul 13 23:05:59 2004 +0000
+++ b/po/fr.po	Wed Jul 14 19:05:16 2004 +0000
@@ -17,8 +17,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Gaim\n"
-"POT-Creation-Date: 2004-06-21 00:02-0400\n"
-"PO-Revision-Date: 2004-06-21 17:28-0700\n"
+"POT-Creation-Date: 2004-07-14 00:00-0400\n"
+"PO-Revision-Date: 2004-07-14 08:15-0700\n"
 "Last-Translator: Éric <zongo_fr@users.sourceforge.net>\n"
 "Language-Team: fr <fr@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -157,7 +157,7 @@
 msgid "Gaim - Away"
 msgstr "Gaim - Absent"
 
-#: plugins/docklet/docklet.c:114 src/gtkaccount.c:643 src/gtkaccount.c:2065
+#: plugins/docklet/docklet.c:114 src/gtkaccount.c:727 src/gtkaccount.c:2152
 msgid "Auto-login"
 msgstr "Connexion auto"
 
@@ -173,13 +173,13 @@
 msgid "New..."
 msgstr "Nouveau..."
 
-#: plugins/docklet/docklet.c:153 src/gtkprefs.c:1796 src/protocols/gg/gg.c:51
-#: src/protocols/irc/msgs.c:187 src/protocols/jabber/jabber.c:959
+#: plugins/docklet/docklet.c:153 src/gtkprefs.c:1809 src/protocols/gg/gg.c:51
+#: src/protocols/irc/msgs.c:187 src/protocols/jabber/jabber.c:960
 #: src/protocols/jabber/jutil.c:32 src/protocols/jabber/presence.c:63
-#: src/protocols/jabber/presence.c:119 src/protocols/novell/novell.c:2718
-#: src/protocols/novell/novell.c:2835 src/protocols/novell/novell.c:2887
-#: src/protocols/oscar/oscar.c:528 src/protocols/oscar/oscar.c:5465
-#: src/protocols/oscar/oscar.c:6463 src/protocols/oscar/oscar.c:6662
+#: src/protocols/jabber/presence.c:119 src/protocols/novell/novell.c:2724
+#: src/protocols/novell/novell.c:2841 src/protocols/novell/novell.c:2893
+#: src/protocols/oscar/oscar.c:532 src/protocols/oscar/oscar.c:5481
+#: src/protocols/oscar/oscar.c:6480 src/protocols/oscar/oscar.c:6679
 #: src/protocols/silc/buddy.c:1379 src/protocols/silc/silc.c:46
 #: src/protocols/silc/silc.c:76
 msgid "Away"
@@ -187,7 +187,7 @@
 
 #. else...
 #: plugins/docklet/docklet.c:159 src/away.c:550
-#: src/protocols/oscar/oscar.c:5383 src/protocols/oscar/oscar.c:6670
+#: src/protocols/oscar/oscar.c:5399 src/protocols/oscar/oscar.c:6687
 msgid "Back"
 msgstr "De retour"
 
@@ -195,15 +195,15 @@
 msgid "Mute Sounds"
 msgstr "Silencieux"
 
-#: plugins/docklet/docklet.c:172 src/gtkft.c:619
+#: plugins/docklet/docklet.c:172 src/gtkft.c:612
 msgid "File Transfers"
 msgstr "Transferts de fichier"
 
-#: plugins/docklet/docklet.c:173 src/gtkaccount.c:2244
+#: plugins/docklet/docklet.c:173 src/gtkaccount.c:2333
 msgid "Accounts"
 msgstr "Comptes"
 
-#: plugins/docklet/docklet.c:174 src/gtkprefs.c:2490
+#: plugins/docklet/docklet.c:174 src/gtkprefs.c:2503
 msgid "Preferences"
 msgstr "Préférences"
 
@@ -255,18 +255,24 @@
 "ou la fenêtre de connexions. Il permet aussi de cacher les messages en "
 "attente jusqu'au clic sur l'icône (comme ICQ)."
 
-#: plugins/extplacement.c:68
+#: plugins/extplacement.c:75
 msgid "By conversation count"
 msgstr "Par nombre de conversations"
 
-#: plugins/extplacement.c:89
+#: plugins/extplacement.c:96
 msgid "Conversation Placement"
 msgstr "Emplacement des conversations"
 
-#: plugins/extplacement.c:94
+#: plugins/extplacement.c:101
 msgid "Number of conversations per window"
 msgstr "Nombre de conversations par fenêtre"
 
+#: plugins/extplacement.c:107
+msgid "Separate IM and Chat windows when placing by number"
+msgstr ""
+"Séparer les messages et les discussions quand leur nombre par fenêtre est "
+"limité"
+
 #. *< api_version
 #. *< type
 #. *< ui_requirement
@@ -274,22 +280,22 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/extplacement.c:114
+#: plugins/extplacement.c:126
 msgid "ExtPlacement"
 msgstr "ExtEmplacement"
 
 #. *< name
 #. *< version
-#: plugins/extplacement.c:116
+#: plugins/extplacement.c:128
 msgid "Extra conversation placement options."
 msgstr "Options supplémentaires d'emplacement des conversations"
 
 #. *< summary
 #. *  description
-#: plugins/extplacement.c:118
-msgid ""
-"Either restrict the number of conversations per windows or use separate "
-"windows for IMs and Chats"
+#: plugins/extplacement.c:130
+msgid ""
+"Restrict the number of conversations per windows, optionally separating IMs "
+"and Chats"
 msgstr ""
 "Limite le nombre de conversation par fenetre ou permet d'utiliser des "
 "fenêtres différentes pour les messages et les discussions."
@@ -455,62 +461,62 @@
 "précédente.\n"
 "Glissez vers le haut puis la droite pour passer à la conversation suivante."
 
-#: plugins/gevolution/add_buddy_dialog.c:136
-#: plugins/gevolution/assoc-buddy.c:74
+#: plugins/gevolution/add_buddy_dialog.c:133
+#: plugins/gevolution/assoc-buddy.c:71
 msgid "Local Addressbook"
 msgstr "Carnet d'adresses local"
 
-#: plugins/gevolution/add_buddy_dialog.c:146
-#: plugins/gevolution/add_buddy_dialog.c:157
-#: plugins/gevolution/assoc-buddy.c:84 plugins/gevolution/assoc-buddy.c:95
-#: src/gtkblist.c:2982 src/gtkprefs.c:913 src/gtkprefs.c:966
-#: src/gtkprefs.c:1809 src/protocols/jabber/jabber.c:923
+#: plugins/gevolution/add_buddy_dialog.c:143
+#: plugins/gevolution/add_buddy_dialog.c:154
+#: plugins/gevolution/assoc-buddy.c:81 plugins/gevolution/assoc-buddy.c:92
+#: src/gtkblist.c:3015 src/gtkprefs.c:961 src/gtkprefs.c:1014
+#: src/gtkprefs.c:1822 src/protocols/jabber/jabber.c:924
 msgid "None"
 msgstr "Aucun"
 
-#: plugins/gevolution/add_buddy_dialog.c:190
-#: plugins/gevolution/assoc-buddy.c:178 src/gtkprefs.c:2162
-#: src/gtkroomlist.c:553 src/protocols/jabber/jabber.c:597
-#: src/protocols/msn/msn.c:1286 src/protocols/trepia/trepia.c:398
+#: plugins/gevolution/add_buddy_dialog.c:187
+#: plugins/gevolution/assoc-buddy.c:175 src/gtkprefs.c:2175
+#: src/gtkroomlist.c:553 src/protocols/jabber/jabber.c:598
+#: src/protocols/msn/msn.c:1311 src/protocols/trepia/trepia.c:398
 msgid "Name"
 msgstr "Nom"
 
-#: plugins/gevolution/add_buddy_dialog.c:201
+#: plugins/gevolution/add_buddy_dialog.c:198
 msgid "Instant Messaging"
 msgstr "Messagerie instantanée"
 
 #. Add the label.
-#: plugins/gevolution/add_buddy_dialog.c:482
+#: plugins/gevolution/add_buddy_dialog.c:479
 msgid "Select a person from your address book below, or add a new person."
 msgstr ""
 "Choisissez une personne dans votre carnet d'adresses ou créez une nouvelle "
 "personne."
 
 #. "Search"
-#: plugins/gevolution/add_buddy_dialog.c:495
-#: plugins/gevolution/assoc-buddy.c:383 src/protocols/oscar/oscar.c:6949
+#: plugins/gevolution/add_buddy_dialog.c:492
+#: plugins/gevolution/assoc-buddy.c:380 src/protocols/oscar/oscar.c:6965
 msgid "Search"
 msgstr "Recherche"
 
-#: plugins/gevolution/add_buddy_dialog.c:566
-#: plugins/gevolution/new_person_dialog.c:310 src/gtkblist.c:4011
-#: src/gtkblist.c:4339
+#: plugins/gevolution/add_buddy_dialog.c:563
+#: plugins/gevolution/new_person_dialog.c:307 src/gtkblist.c:4046
+#: src/gtkblist.c:4374
 msgid "Group:"
 msgstr "Groupe :"
 
 #. "New Person" button
-#: plugins/gevolution/add_buddy_dialog.c:592
-#: plugins/gevolution/assoc-buddy.c:486
+#: plugins/gevolution/add_buddy_dialog.c:589
+#: plugins/gevolution/assoc-buddy.c:483
 msgid "New Person"
 msgstr "Nouvelle personne"
 
 #. "Select Buddy" button
-#: plugins/gevolution/add_buddy_dialog.c:609
+#: plugins/gevolution/add_buddy_dialog.c:606
 msgid "Select Buddy"
 msgstr "Choisir contact"
 
 #. Add the label.
-#: plugins/gevolution/assoc-buddy.c:370
+#: plugins/gevolution/assoc-buddy.c:367
 msgid ""
 "Select a person from your address book to add this buddy to, or create a new "
 "person."
@@ -519,41 +525,41 @@
 "ou créez une nouvelle personne."
 
 #. Add the disclosure
-#: plugins/gevolution/assoc-buddy.c:449
+#: plugins/gevolution/assoc-buddy.c:446
 msgid "Show user details"
 msgstr "Afficher les détails du contact"
 
-#: plugins/gevolution/assoc-buddy.c:450
+#: plugins/gevolution/assoc-buddy.c:447
 msgid "Hide user details"
 msgstr "Cacher les détails du contact"
 
 #. "Associate Buddy" button
-#: plugins/gevolution/assoc-buddy.c:503
+#: plugins/gevolution/assoc-buddy.c:500
 msgid "_Associate Buddy"
 msgstr "_Associer un contact"
 
-#: plugins/gevolution/gevo-util.c:66 plugins/gevolution/gevolution.c:90
-#: src/blist.c:775 src/blist.c:963 src/blist.c:2060 src/gtkblist.c:3832
+#: plugins/gevolution/gevo-util.c:64 plugins/gevolution/gevolution.c:89
+#: src/blist.c:775 src/blist.c:963 src/blist.c:1870 src/gtkblist.c:3867
 #: src/protocols/jabber/roster.c:66
 msgid "Buddies"
 msgstr "Contacts"
 
-#: plugins/gevolution/gevolution.c:221
+#: plugins/gevolution/gevolution.c:220
 msgid "Add to Address Book"
 msgstr "Ajouter au carnet d'adresses"
 
 #. Configuration frame
-#: plugins/gevolution/gevolution.c:352
+#: plugins/gevolution/gevolution.c:351
 msgid "Evolution Integration Configuration"
 msgstr "Configuration de l'intégration avec Evolution"
 
 #. Label
-#: plugins/gevolution/gevolution.c:355
+#: plugins/gevolution/gevolution.c:354
 msgid "Select all accounts that buddies should be auto-added to."
 msgstr ""
 "Choisissez tous les comptes dont les contacts seront automatiquement ajoutés."
 
-#: plugins/gevolution/gevolution.c:385 plugins/idle.c:51 src/gtkconn.c:620
+#: plugins/gevolution/gevolution.c:384 plugins/idle.c:51 src/gtkconn.c:620
 msgid "Account"
 msgstr "Compte"
 
@@ -564,7 +570,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/gevolution/gevolution.c:466
+#: plugins/gevolution/gevolution.c:465
 msgid "Evolution Integration"
 msgstr "Intégration avec Evolution"
 
@@ -572,46 +578,46 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/gevolution/gevolution.c:469 plugins/gevolution/gevolution.c:471
+#: plugins/gevolution/gevolution.c:468 plugins/gevolution/gevolution.c:470
 msgid "Provides integration with Ximian Evolution."
 msgstr "Fournit une intégration avec Evolution de Ximian."
 
-#: plugins/gevolution/new_person_dialog.c:270
+#: plugins/gevolution/new_person_dialog.c:267
 msgid "Please enter the person's information below."
 msgstr "Veuillez saisir les informations de la personne"
 
-#: plugins/gevolution/new_person_dialog.c:274
+#: plugins/gevolution/new_person_dialog.c:271
 msgid "Please enter the buddy's screen name and account type below."
 msgstr "Veuillez saisir le pseudo et le type de compte du contact"
 
-#: plugins/gevolution/new_person_dialog.c:294
+#: plugins/gevolution/new_person_dialog.c:291
 msgid "Account type:"
 msgstr "Type de compte :"
 
-#: plugins/gevolution/new_person_dialog.c:298
+#: plugins/gevolution/new_person_dialog.c:295
 msgid "Screenname:"
 msgstr "Utilisateur :"
 
 #. Optional Information section
-#: plugins/gevolution/new_person_dialog.c:318
+#: plugins/gevolution/new_person_dialog.c:315
 msgid "Optional information:"
 msgstr "Informations facultatives :"
 
 #. Label
-#: plugins/gevolution/new_person_dialog.c:341 src/gtkaccount.c:340
-#: src/protocols/oscar/oscar.c:433
+#: plugins/gevolution/new_person_dialog.c:338 src/gtkaccount.c:378
+#: src/gtkaccount.c:408 src/protocols/oscar/oscar.c:438
 msgid "Buddy Icon"
 msgstr "Icône du contact"
 
-#: plugins/gevolution/new_person_dialog.c:353
+#: plugins/gevolution/new_person_dialog.c:350
 msgid "First name:"
 msgstr "Prénom :"
 
-#: plugins/gevolution/new_person_dialog.c:365
+#: plugins/gevolution/new_person_dialog.c:362
 msgid "Last name:"
 msgstr "Nom :"
 
-#: plugins/gevolution/new_person_dialog.c:385
+#: plugins/gevolution/new_person_dialog.c:382
 msgid "E-mail:"
 msgstr "Adresse électronique :"
 
@@ -843,15 +849,15 @@
 msgid "Provides support for loading perl plugins."
 msgstr "Fournit le support pour charger des plugins Perl"
 
-#: plugins/raw.c:154
+#: plugins/raw.c:146
 msgid "Raw"
 msgstr "Brut"
 
-#: plugins/raw.c:156
+#: plugins/raw.c:148
 msgid "Lets you send raw input to text-based protocols."
 msgstr "Permet d'envoyer des données brutes à un protocole en mode texte."
 
-#: plugins/raw.c:157
+#: plugins/raw.c:149
 msgid ""
 "Lets you send raw input to text-based protocols (Jabber, MSN, IRC, TOC). Hit "
 "'Enter' in the entry box to send. Watch the debug window."
@@ -921,7 +927,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/signals-test.c:554
+#: plugins/signals-test.c:566
 msgid "Signals Test"
 msgstr "Test des événements"
 
@@ -929,7 +935,7 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/signals-test.c:557 plugins/signals-test.c:559
+#: plugins/signals-test.c:569 plugins/signals-test.c:571
 msgid "Test to see that all signals are working properly."
 msgstr "Vérifie que tous les événements fonctionnent correctement."
 
@@ -1149,30 +1155,30 @@
 msgstr "Ajoute l'heure dans la conversation à intervalle régulier."
 
 #: plugins/win32/transparency/win2ktrans.c:133
-#: plugins/win32/transparency/win2ktrans.c:389
-#: plugins/win32/transparency/win2ktrans.c:420
+#: plugins/win32/transparency/win2ktrans.c:388
+#: plugins/win32/transparency/win2ktrans.c:419
 msgid "Opacity:"
 msgstr "Opacité :"
 
 #. IM Convo trans options
-#: plugins/win32/transparency/win2ktrans.c:370
+#: plugins/win32/transparency/win2ktrans.c:369
 msgid "IM Conversation Windows"
 msgstr "Fenêtres de messages"
 
-#: plugins/win32/transparency/win2ktrans.c:371
+#: plugins/win32/transparency/win2ktrans.c:370
 msgid "_IM window transparency"
 msgstr "Fenêtre de _messages transparente"
 
-#: plugins/win32/transparency/win2ktrans.c:381
+#: plugins/win32/transparency/win2ktrans.c:380
 msgid "_Show slider bar in IM window"
 msgstr "Afficher la barre de défilement dans la fenêtre"
 
 #. Buddy List trans options
-#: plugins/win32/transparency/win2ktrans.c:406 src/gtkprefs.c:907
+#: plugins/win32/transparency/win2ktrans.c:405 src/gtkprefs.c:955
 msgid "Buddy List Window"
 msgstr "Fenêtre de la liste de contacts"
 
-#: plugins/win32/transparency/win2ktrans.c:407
+#: plugins/win32/transparency/win2ktrans.c:406
 msgid "_Buddy List window transparency"
 msgstr "Fenêtre de la liste de _contacts transparente"
 
@@ -1183,19 +1189,19 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/win32/transparency/win2ktrans.c:463
+#: plugins/win32/transparency/win2ktrans.c:462
 msgid "Transparency"
 msgstr "Transparence"
 
 #. *< name
 #. *< version
 #. *  summary
-#: plugins/win32/transparency/win2ktrans.c:466
+#: plugins/win32/transparency/win2ktrans.c:465
 msgid "Variable Transparency for the buddy list and conversations."
 msgstr "Transparence variable pour la liste de contacts et les conversations."
 
 #. *  description
-#: plugins/win32/transparency/win2ktrans.c:468
+#: plugins/win32/transparency/win2ktrans.c:467
 msgid ""
 "This plugin enables variable alpha transparency on conversation windows and "
 "the buddy list.\n"
@@ -1221,8 +1227,8 @@
 msgstr "_Démarrer Gaim au lancement de Windows"
 
 #. Buddy List
-#: plugins/win32/winprefs/winprefs.c:362 src/gtkblist.c:3023
-#: src/gtkprefs.c:2399
+#: plugins/win32/winprefs/winprefs.c:362 src/gtkblist.c:3058
+#: src/gtkprefs.c:2412
 msgid "Buddy List"
 msgstr "Liste de contacts"
 
@@ -1241,8 +1247,8 @@
 msgstr "Liste de contacts toujours _visible"
 
 #. Conversations
-#: plugins/win32/winprefs/winprefs.c:382 src/gtkprefs.c:958
-#: src/gtkprefs.c:2400 src/protocols/msn/msn.c:1611
+#: plugins/win32/winprefs/winprefs.c:382 src/gtkprefs.c:1006
+#: src/gtkprefs.c:2413 src/protocols/msn/msn.c:1638
 msgid "Conversations"
 msgstr "Conversations"
 
@@ -1273,9 +1279,9 @@
 "Jabber, ICQ, IRC, SILC, Novell GroupWise, Napster, Zephyr, and Gadu-Gadu all "
 "at once.  It is written using Gtk+ and is licensed under the GPL.<BR><BR>"
 msgstr ""
-"Gaim est un client de messagerie instantanée compatible avec AIM, MSN, Yahoo!, "
-"Jabber, ICQ, IRC, SILC, Novell GroupWise, Napster, Zephyr et Gadu-Gadu. "
-"Il est écrit en Gtk+ et est distribué sous licence GPL.<BR><BR>"
+"Gaim est un client de messagerie instantanée compatible avec AIM, MSN, "
+"Yahoo!, Jabber, ICQ, IRC, SILC, Novell GroupWise, Napster, Zephyr et Gadu-"
+"Gadu. Il est écrit en Gtk+ et est distribué sous licence GPL.<BR><BR>"
 
 #: src/about.c:106
 msgid "<FONT SIZE=\"4\">IRC:</FONT> #gaim on irc.freenode.net<BR><BR>"
@@ -1314,260 +1320,264 @@
 msgid "Crazy Patch Writers"
 msgstr "Patcheurs fous"
 
-#: src/about.c:147
+#: src/about.c:148
 msgid "Retired Developers"
 msgstr "Codeurs retraités"
 
-#: src/about.c:148
+#: src/about.c:149
 msgid "former libfaim maintainer"
 msgstr "ancien mainteneur de libfaim"
 
-#: src/about.c:149
+#: src/about.c:150
 msgid "former lead developer"
 msgstr "ancien codeur principal"
 
-#: src/about.c:152
+#: src/about.c:153
 msgid "former maintainer"
 msgstr "ancien mainteneur"
 
-#: src/about.c:153
+#: src/about.c:154
 msgid "former Jabber developer"
 msgstr "ancien codeur Jabber"
 
-#: src/about.c:154
+#: src/about.c:155
 msgid "original author"
 msgstr "auteur original"
 
-#: src/about.c:157
+#: src/about.c:158
 msgid "hacker and designated driver [lazy bum]"
 msgstr "hacker et conducteur désigné"
 
-#: src/about.c:165
+#: src/about.c:166
 msgid "Current Translators"
 msgstr "Traducteurs"
 
-#: src/about.c:166 src/about.c:204
+#: src/about.c:167 src/about.c:207
 msgid "Catalan"
 msgstr "Catalan"
 
-#: src/about.c:167 src/about.c:205
+#: src/about.c:168 src/about.c:208
 msgid "Czech"
 msgstr "Tchèque"
 
-#: src/about.c:168
+#: src/about.c:169
 msgid "Danish"
 msgstr "Danois"
 
-#: src/about.c:169
+#: src/about.c:170
 msgid "British English"
 msgstr "Anglais britannique"
 
-#: src/about.c:170
+#: src/about.c:171
 msgid "Canadian English"
 msgstr "Anglais canadien"
 
-#: src/about.c:171 src/about.c:206
+#: src/about.c:172 src/about.c:209
 msgid "German"
 msgstr "Allemand"
 
-#: src/about.c:172 src/about.c:207
+#: src/about.c:173 src/about.c:210
 msgid "Spanish"
 msgstr "Espagnol"
 
-#: src/about.c:173 src/about.c:208
+#: src/about.c:174 src/about.c:211
 msgid "Finnish"
 msgstr "Finnois"
 
-#: src/about.c:174 src/about.c:209
+#: src/about.c:175 src/about.c:212
 msgid "French"
 msgstr "Français"
 
-#: src/about.c:175
+#: src/about.c:176
 msgid "Hebrew"
 msgstr "Hébreu"
 
-#: src/about.c:176
+#: src/about.c:177
 msgid "Hindi"
 msgstr "Hindi"
 
-#: src/about.c:177
+#: src/about.c:178
 msgid "Hungarian"
 msgstr "Hongrois"
 
-#: src/about.c:178 src/about.c:210
+#: src/about.c:179 src/about.c:213
 msgid "Italian"
 msgstr "Italien"
 
-#: src/about.c:179 src/about.c:212
+#: src/about.c:180 src/about.c:214
+msgid "Japanese"
+msgstr "Japonais"
+
+#: src/about.c:181
+msgid "Lithuanian"
+msgstr "Lituanien"
+
+#: src/about.c:182 src/about.c:215
 msgid "Korean"
 msgstr "Coréen"
 
-#: src/about.c:180
+#: src/about.c:183
 msgid "Dutch; Flemish"
 msgstr "Hollandais, flamand"
 
-#: src/about.c:181
+#: src/about.c:184
 msgid "Macedonian"
 msgstr "Macédonien"
 
-#: src/about.c:182
+#: src/about.c:185
 msgid "Norwegian"
 msgstr "Norvégien"
 
-#: src/about.c:183 src/about.c:213
+#: src/about.c:186 src/about.c:216
 msgid "Polish"
 msgstr "Polonais"
 
-#: src/about.c:184
+#: src/about.c:187
 msgid "Portuguese"
 msgstr "Portugais"
 
-#: src/about.c:185
+#: src/about.c:188
 msgid "Portuguese-Brazil"
 msgstr "Portugais brésilien"
 
-#: src/about.c:186
+#: src/about.c:189
 msgid "Romanian"
 msgstr "Roumain"
 
-#: src/about.c:187 src/about.c:214 src/about.c:215
+#: src/about.c:190 src/about.c:217 src/about.c:218
 msgid "Russian"
 msgstr "Russe"
 
-#: src/about.c:188
+#: src/about.c:191
 msgid "Serbian"
 msgstr "Serbe"
 
-#: src/about.c:189
+#: src/about.c:192
 msgid "Slovenian"
 msgstr "Slovène"
 
-#: src/about.c:190 src/about.c:217
+#: src/about.c:193 src/about.c:220
 msgid "Swedish"
 msgstr "Suédois"
 
-#: src/about.c:191
+#: src/about.c:194
 msgid "Vietnamese"
 msgstr "Vietnamien"
 
-#: src/about.c:191
-msgid "Gnome Vi Team"
-msgstr "Équipe Gnome vi"
-
-#: src/about.c:193
-msgid "Simplified Chinese"
-msgstr "Chinois simplifié"
-
 #: src/about.c:194
+msgid "and the Gnome-Vi Team"
+msgstr "et l'équipe Gnome-Vi"
+
+#: src/about.c:196
+msgid "Simplified Chinese"
+msgstr "Chinois simplifié"
+
+#: src/about.c:197
 msgid "Traditional Chinese"
 msgstr "Chinois traditionnel"
 
-#: src/about.c:201
+#: src/about.c:204
 msgid "Past Translators"
 msgstr "Anciens traducteurs"
 
-#: src/about.c:202
+#: src/about.c:205
 msgid "Amharic"
 msgstr "Amharique"
 
-#: src/about.c:203
+#: src/about.c:206
 msgid "Bulgarian"
 msgstr "Bulgare"
 
-#: src/about.c:211
-msgid "Japanese"
-msgstr "Japonais"
-
-#: src/about.c:216
+#: src/about.c:219
 msgid "Slovak"
 msgstr "Slovaque"
 
-#: src/about.c:218
+#: src/about.c:221
 msgid "Chinese"
 msgstr "Chinois"
 
-#: src/account.c:278 src/protocols/jabber/jabber.c:1000
+#: src/account.c:277 src/protocols/jabber/jabber.c:1001
 msgid "New passwords do not match."
 msgstr "Les nouveaux mots de passe diffèrent"
 
-#: src/account.c:287
+#: src/account.c:286
 msgid "Fill out all fields completely."
 msgstr "Remplissez tous les champs"
 
-#: src/account.c:312
+#: src/account.c:311
 msgid "Original password"
 msgstr "Mot de passe courant"
 
-#: src/account.c:319
+#: src/account.c:318
 msgid "New password"
 msgstr "Nouveau mot de passe"
 
-#: src/account.c:326
+#: src/account.c:325
 msgid "New password (again)"
 msgstr "Nouveau mot de passe (confirmation)"
 
-#: src/account.c:332
+#: src/account.c:331
 #, c-format
 msgid "Change password for %s"
 msgstr "Changer le mot de passe pour %s"
 
-#: src/account.c:340
+#: src/account.c:339
 msgid "Please enter your current password and your new password."
 msgstr "Saisissez votre mot de passe et un nouveau mot de passe"
 
 #. *
 #. * A wrapper for gaim_request_action() that uses OK and Cancel buttons.
 #.
-#: src/account.c:343 src/connection.c:197 src/dialogs.c:462 src/dialogs.c:518
-#: src/dialogs.c:571 src/gtkblist.c:2341 src/gtkrequest.c:235
-#: src/protocols/jabber/jabber.c:1047 src/protocols/jabber/xdata.c:337
+#: src/account.c:342 src/connection.c:197 src/dialogs.c:462 src/dialogs.c:518
+#: src/dialogs.c:571 src/gtkblist.c:2391 src/gtkrequest.c:242
+#: src/protocols/jabber/jabber.c:1048 src/protocols/jabber/xdata.c:337
 #: src/protocols/msn/msn.c:226 src/protocols/msn/msn.c:241
 #: src/protocols/msn/msn.c:256 src/protocols/msn/msn.c:271
-#: src/protocols/oscar/oscar.c:3353 src/protocols/oscar/oscar.c:3447
-#: src/protocols/oscar/oscar.c:6731 src/protocols/oscar/oscar.c:6828
-#: src/protocols/oscar/oscar.c:6880 src/protocols/oscar/oscar.c:6966
+#: src/protocols/oscar/oscar.c:3369 src/protocols/oscar/oscar.c:3463
+#: src/protocols/oscar/oscar.c:6748 src/protocols/oscar/oscar.c:6844
+#: src/protocols/oscar/oscar.c:6896 src/protocols/oscar/oscar.c:6982
 #: src/protocols/silc/buddy.c:460 src/protocols/silc/buddy.c:1132
-#: src/protocols/silc/chat.c:406 src/protocols/silc/chat.c:444
-#: src/protocols/silc/chat.c:707 src/protocols/silc/ops.c:994
-#: src/protocols/silc/ops.c:1405 src/protocols/silc/silc.c:688
-#: src/protocols/yahoo/yahoo.c:2745 src/protocols/yahoo/yahoo.c:2754
-#: src/request.h:1242
+#: src/protocols/silc/chat.c:409 src/protocols/silc/chat.c:447
+#: src/protocols/silc/chat.c:710 src/protocols/silc/ops.c:1063
+#: src/protocols/silc/ops.c:1671 src/protocols/silc/silc.c:692
+#: src/protocols/yahoo/yahoo.c:2752 src/protocols/yahoo/yahoo.c:2761
+#: src/request.h:1243
 msgid "OK"
 msgstr "OK"
 
-#: src/account.c:344 src/account.c:382 src/away.c:334 src/connection.c:198
+#: src/account.c:343 src/account.c:381 src/away.c:334 src/connection.c:198
 #: src/dialogs.c:299 src/dialogs.c:311 src/dialogs.c:324 src/dialogs.c:345
 #: src/dialogs.c:463 src/dialogs.c:519 src/dialogs.c:572 src/dialogs.c:808
-#: src/dialogs.c:824 src/dialogs.c:842 src/gtkaccount.c:1918
-#: src/gtkaccount.c:2409 src/gtkblist.c:2342 src/gtkblist.c:4377
+#: src/dialogs.c:824 src/dialogs.c:842 src/gtkaccount.c:2002
+#: src/gtkaccount.c:2498 src/gtkblist.c:2392 src/gtkblist.c:4412
 #: src/gtkconn.c:168 src/gtkimhtmltoolbar.c:414 src/gtkprivacy.c:587
 #: src/gtkprivacy.c:600 src/gtkprivacy.c:625 src/gtkprivacy.c:636
-#: src/gtkrequest.c:236 src/protocols/icq/gaim_icq.c:277
+#: src/gtkrequest.c:243 src/protocols/icq/gaim_icq.c:277
 #: src/protocols/jabber/buddy.c:515 src/protocols/jabber/chat.c:710
-#: src/protocols/jabber/jabber.c:666 src/protocols/jabber/jabber.c:1048
+#: src/protocols/jabber/jabber.c:667 src/protocols/jabber/jabber.c:1049
 #: src/protocols/jabber/xdata.c:338 src/protocols/msn/msn.c:227
 #: src/protocols/msn/msn.c:242 src/protocols/msn/msn.c:257
 #: src/protocols/msn/msn.c:272 src/protocols/msn/msn.c:289
-#: src/protocols/oscar/oscar.c:1371 src/protocols/oscar/oscar.c:3313
-#: src/protocols/oscar/oscar.c:3354 src/protocols/oscar/oscar.c:3391
-#: src/protocols/oscar/oscar.c:3448 src/protocols/oscar/oscar.c:6732
-#: src/protocols/oscar/oscar.c:6829 src/protocols/oscar/oscar.c:6881
-#: src/protocols/oscar/oscar.c:6950 src/protocols/oscar/oscar.c:6967
+#: src/protocols/oscar/oscar.c:1377 src/protocols/oscar/oscar.c:3329
+#: src/protocols/oscar/oscar.c:3370 src/protocols/oscar/oscar.c:3407
+#: src/protocols/oscar/oscar.c:3464 src/protocols/oscar/oscar.c:6749
+#: src/protocols/oscar/oscar.c:6845 src/protocols/oscar/oscar.c:6897
+#: src/protocols/oscar/oscar.c:6966 src/protocols/oscar/oscar.c:6983
 #: src/protocols/silc/buddy.c:461 src/protocols/silc/buddy.c:1037
-#: src/protocols/silc/buddy.c:1133 src/protocols/silc/chat.c:579
-#: src/protocols/silc/chat.c:708 src/protocols/silc/ops.c:1406
-#: src/protocols/silc/silc.c:689 src/protocols/trepia/trepia.c:347
-#: src/protocols/yahoo/yahoo.c:2746 src/protocols/yahoo/yahoo.c:2755
-#: src/request.h:1242 src/request.h:1252
+#: src/protocols/silc/buddy.c:1133 src/protocols/silc/chat.c:582
+#: src/protocols/silc/chat.c:711 src/protocols/silc/ops.c:1672
+#: src/protocols/silc/silc.c:693 src/protocols/trepia/trepia.c:347
+#: src/protocols/yahoo/yahoo.c:2753 src/protocols/yahoo/yahoo.c:2762
+#: src/request.h:1243 src/request.h:1253
 msgid "Cancel"
 msgstr "Annuler"
 
-#: src/account.c:373
+#: src/account.c:372
 #, c-format
 msgid "Change user information for %s"
 msgstr "Changer les informations pour %s"
 
-#: src/account.c:381 src/gtkrequest.c:242 src/protocols/jabber/buddy.c:514
+#: src/account.c:380 src/gtkrequest.c:249 src/protocols/jabber/buddy.c:514
 #: src/protocols/trepia/trepia.c:346
 msgid "Save"
 msgstr "Enregistrer"
@@ -1590,8 +1600,8 @@
 msgstr "Enlever le message d'absence"
 
 #. Remove button
-#: src/away.c:333 src/gtkconv.c:1352 src/gtkconv.c:3570 src/gtkconv.c:3669
-#: src/gtkrequest.c:241
+#: src/away.c:333 src/gtkconv.c:1388 src/gtkconv.c:3680 src/gtkconv.c:3784
+#: src/gtkrequest.c:248
 msgid "Remove"
 msgstr "Enlever"
 
@@ -1628,16 +1638,12 @@
 msgid "Group not removed"
 msgstr "Groupe non supprimé"
 
-#: src/blist.c:1393 src/gtkaccount.c:167 src/gtkft.c:161 src/gtkutils.c:721
-#: src/protocols/jabber/buddy.c:570 src/protocols/novell/novell.c:2730
+#: src/blist.c:1393 src/gtkaccount.c:167 src/gtkft.c:154 src/gtkutils.c:627
+#: src/protocols/jabber/buddy.c:570 src/protocols/novell/novell.c:2736
 msgid "Unknown"
 msgstr "Inconnu"
 
-#: src/blist.c:1721
-msgid "Invalid Groupname"
-msgstr "Nom de groupe non valide"
-
-#: src/blist.c:2192
+#: src/blist.c:2001
 msgid ""
 "An error was encountered parsing your buddy list.  It has not been loaded, "
 "and the old file has moved to blist.xml~."
@@ -1645,7 +1651,7 @@
 "Une erreur est survenue à la lecture de la liste de contacts. La liste n'a "
 "pas été chargée et l'ancien fichier a été renommé blist.xml~."
 
-#: src/blist.c:2195
+#: src/blist.c:2004
 msgid "Buddy List Error"
 msgstr "Erreur de liste de contacts"
 
@@ -1667,71 +1673,71 @@
 msgid "Enter password for %s"
 msgstr "Saisissez le mot de passe pour %s"
 
-#: src/conversation.c:271
+#: src/conversation.c:261
 msgid "Unable to send message. The message is too large."
 msgstr "Impossible d'envoyer le message : trop gros"
 
-#: src/conversation.c:279
+#: src/conversation.c:269
 msgid "Unable to send message."
 msgstr "Impossible d'envoyer le message"
 
-#: src/conversation.c:1960
+#: src/conversation.c:1953
 #, c-format
 msgid "%s entered the room."
 msgstr "%s est entré dans le salon"
 
-#: src/conversation.c:1963
+#: src/conversation.c:1956
 #, c-format
 msgid "%s [<I>%s</I>] entered the room."
 msgstr "%s [<I>%s</I>] est entré dans le salon"
 
-#: src/conversation.c:2054
+#: src/conversation.c:2047
 #, c-format
 msgid "You are now known as %s"
 msgstr "Vous êtes désormais connu sous le nom de %s"
 
-#: src/conversation.c:2057
+#: src/conversation.c:2050
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s est désormais connu sous le nom de %s"
 
-#: src/conversation.c:2099
+#: src/conversation.c:2092
 #, c-format
 msgid "%s left the room (%s)."
 msgstr "%s a quitté le salon (%s)"
 
-#: src/conversation.c:2101
+#: src/conversation.c:2094
 #, c-format
 msgid "%s left the room."
 msgstr "%s a quitté le salon"
 
-#: src/conversation.c:2172
+#: src/conversation.c:2165
 #, c-format
 msgid "(+%d more)"
 msgstr "(+%d supplémentaires)"
 
-#: src/conversation.c:2174
+#: src/conversation.c:2167
 #, c-format
 msgid " left the room (%s)."
 msgstr " a quitté le salon (%s)"
 
-#: src/conversation.c:2464
+#: src/conversation.c:2457
 msgid "Last created window"
 msgstr "Dernière fenêtre ouverte"
 
-#: src/conversation.c:2466
+#: src/conversation.c:2459
 msgid "Separate IM and Chat windows"
 msgstr "Séparer les messages et les discussions"
 
-#: src/conversation.c:2468 src/gtkprefs.c:1335
+#: src/conversation.c:2461 src/gtkprefs.c:1384
 msgid "New window"
 msgstr "Nouvelle fenêtre"
 
-#: src/conversation.c:2470
+#: src/conversation.c:2463
 msgid "By group"
 msgstr "Par groupe"
 
-#: src/conversation.c:2472
+#: src/conversation.c:2465
 msgid "By account"
 msgstr "Par compte"
 
@@ -1887,8 +1893,8 @@
 msgid "Enter an alias for this chat."
 msgstr "Saisissez un alias pour cette discussion"
 
-#: src/dialogs.c:807 src/dialogs.c:823 src/dialogs.c:841 src/gtkrequest.c:243
-#: src/protocols/silc/chat.c:569
+#: src/dialogs.c:807 src/dialogs.c:823 src/dialogs.c:841 src/gtkrequest.c:250
+#: src/protocols/silc/chat.c:572
 msgid "Alias"
 msgstr "Alias"
 
@@ -1909,22 +1915,51 @@
 msgid "Alias Buddy"
 msgstr "Donner un alias"
 
-#: src/ft.c:144
+#: src/ft.c:125
+msgid "That file does not exist."
+msgstr "Ce fichier n'existe pas"
+
+#: src/ft.c:134
+msgid "Cannot send a file of 0 bytes."
+msgstr "Impossible d'envoyer un fichier de taille nulle"
+
+#: src/ft.c:194
+#, c-format
+msgid "%s wants to send you %s (%s)"
+msgstr "%s veut vous envoyer %s (%s)"
+
+#: src/ft.c:229
+#, c-format
+msgid "Accept file transfer request from %s?"
+msgstr "Accepter la requête de transfert de %s ?"
+
+#: src/ft.c:233
+#, c-format
+msgid ""
+"A file is available for download from:\n"
+"Remote host: %s\n"
+"Remote port: %d"
+msgstr ""
+"Un fichier est disponible pour le téléchargement depuis :\n"
+"Hôte distant : %s\n"
+"Port distant : %d"
+
+#: src/ft.c:285
 #, c-format
 msgid "%s is not a valid filename.\n"
 msgstr "%s n'est pas un nom de fichier valide\n"
 
-#: src/ft.c:157
+#: src/ft.c:298
 #, c-format
 msgid "%s was not found.\n"
 msgstr "%s non trouvé\n"
 
-#: src/ft.c:786
+#: src/ft.c:927
 #, c-format
 msgid "File transfer to %s aborted.\n"
 msgstr "Transfert de fichier vers %s annulé\n"
 
-#: src/ft.c:788
+#: src/ft.c:929
 #, c-format
 msgid "File transfer from %s aborted.\n"
 msgstr "Transfert de fichier depuis %s annulé\n"
@@ -2019,23 +2054,23 @@
 msgid "sorry, i ran out for a while. bbl"
 msgstr "Désolé, je suis parti pour un moment. À plus."
 
-#: src/gaimrc.c:372 src/gaimrc.c:1409
+#: src/gaimrc.c:372 src/gaimrc.c:1417
 msgid "boring default"
 msgstr "standard pas original"
 
-#: src/gaimrc.c:1219 src/gtkblist.c:2984
+#: src/gaimrc.c:1227 src/gtkblist.c:3017
 msgid "Alphabetical"
 msgstr "Alphabétique"
 
-#: src/gaimrc.c:1221 src/gtkblist.c:2985
+#: src/gaimrc.c:1229 src/gtkblist.c:3018
 msgid "By status"
 msgstr "Par état"
 
-#: src/gaimrc.c:1223 src/gtkblist.c:2986
+#: src/gaimrc.c:1231 src/gtkblist.c:3019
 msgid "By log size"
 msgstr "Par la taille des archives"
 
-#: src/gtkaccount.c:309
+#: src/gtkaccount.c:331
 #, c-format
 msgid ""
 "<b>File:</b> %s\n"
@@ -2047,164 +2082,164 @@
 "<b>Taille de l'image :</b> %dx%d"
 
 #. Build the login options frame.
-#: src/gtkaccount.c:530
+#: src/gtkaccount.c:614
 msgid "Login Options"
 msgstr "Options de connexion"
 
-#: src/gtkaccount.c:547
+#: src/gtkaccount.c:631
 msgid "Protocol:"
 msgstr "Protocole :"
 
-#: src/gtkaccount.c:552 src/gtkblist.c:3983
+#: src/gtkaccount.c:636 src/gtkblist.c:4018
 msgid "Screen Name:"
 msgstr "Utilisateur :"
 
-#: src/gtkaccount.c:625
+#: src/gtkaccount.c:709
 msgid "Password:"
 msgstr "Mot de passe :"
 
-#: src/gtkaccount.c:630 src/gtkblist.c:3997 src/gtkblist.c:4325
+#: src/gtkaccount.c:714 src/gtkblist.c:4032 src/gtkblist.c:4360
 msgid "Alias:"
 msgstr "Alias :"
 
-#: src/gtkaccount.c:634
+#: src/gtkaccount.c:718
 msgid "Remember password"
 msgstr "Mémoriser le mot de passe"
 
 #. Build the user options frame.
-#: src/gtkaccount.c:690
+#: src/gtkaccount.c:774
 msgid "User Options"
 msgstr "Options de l'utilisateur"
 
-#: src/gtkaccount.c:703
+#: src/gtkaccount.c:787
 msgid "New mail notifications"
 msgstr "Avertir des nouveaux courriers"
 
-#: src/gtkaccount.c:712
+#: src/gtkaccount.c:796
 msgid "Buddy icon:"
 msgstr "Icône :"
 
 #. Build the protocol options frame.
-#: src/gtkaccount.c:801
+#: src/gtkaccount.c:885
 #, c-format
 msgid "%s Options"
 msgstr "Options de %s"
 
 #. Use Global Proxy Settings
-#: src/gtkaccount.c:937 src/gtkaccount.c:984
+#: src/gtkaccount.c:1021 src/gtkaccount.c:1068
 msgid "Use Global Proxy Settings"
 msgstr "Utiliser les paramètres globaux"
 
 #. No Proxy
-#: src/gtkaccount.c:943 src/gtkaccount.c:991
+#: src/gtkaccount.c:1027 src/gtkaccount.c:1075
 msgid "No Proxy"
 msgstr "Pas de serveur mandataire"
 
 #. HTTP
-#: src/gtkaccount.c:949 src/gtkaccount.c:998
+#: src/gtkaccount.c:1033 src/gtkaccount.c:1082
 msgid "HTTP"
 msgstr "HTTP"
 
 #. SOCKS 4
-#: src/gtkaccount.c:955 src/gtkaccount.c:1005
+#: src/gtkaccount.c:1039 src/gtkaccount.c:1089
 msgid "SOCKS 4"
 msgstr "SOCKS 4"
 
 #. SOCKS 5
-#: src/gtkaccount.c:961 src/gtkaccount.c:1012
+#: src/gtkaccount.c:1045 src/gtkaccount.c:1096
 msgid "SOCKS 5"
 msgstr "SOCKS 5"
 
 #. Use Environmental Settings
-#: src/gtkaccount.c:967 src/gtkaccount.c:1019 src/gtkprefs.c:1139
+#: src/gtkaccount.c:1051 src/gtkaccount.c:1103 src/gtkprefs.c:1187
 msgid "Use Environmental Settings"
 msgstr "Utiliser les paramètres globaux"
 
-#: src/gtkaccount.c:1058
+#: src/gtkaccount.c:1142
 msgid "you can see the butterflies mating"
 msgstr "on peut voir les papillons s'accoupler"
 
-#: src/gtkaccount.c:1062
+#: src/gtkaccount.c:1146
 msgid "If you look real closely"
 msgstr "Si on regarde de très près"
 
-#: src/gtkaccount.c:1078
+#: src/gtkaccount.c:1162
 msgid "Proxy Options"
 msgstr "Options du serveur mandataire"
 
-#: src/gtkaccount.c:1096 src/gtkprefs.c:1133
+#: src/gtkaccount.c:1180 src/gtkprefs.c:1181
 msgid "Proxy _type:"
 msgstr "_Type :"
 
-#: src/gtkaccount.c:1105 src/gtkprefs.c:1160
+#: src/gtkaccount.c:1189 src/gtkprefs.c:1208
 msgid "_Host:"
 msgstr "_Hôte :"
 
-#: src/gtkaccount.c:1109 src/gtkprefs.c:1178
+#: src/gtkaccount.c:1193 src/gtkprefs.c:1226
 msgid "_Port:"
 msgstr "_Port :"
 
-#: src/gtkaccount.c:1117
+#: src/gtkaccount.c:1201
 msgid "_Username:"
 msgstr "_Utilisateur :"
 
-#: src/gtkaccount.c:1122 src/gtkprefs.c:1215
+#: src/gtkaccount.c:1206 src/gtkprefs.c:1263
 msgid "Pa_ssword:"
 msgstr "_Mot de passe :"
 
-#: src/gtkaccount.c:1494
+#: src/gtkaccount.c:1578
 msgid "Add Account"
 msgstr "Ajouter un compte"
 
-#: src/gtkaccount.c:1496
+#: src/gtkaccount.c:1580
 msgid "Modify Account"
 msgstr "Modification du compte"
 
 #. Add the disclosure
-#: src/gtkaccount.c:1520
+#: src/gtkaccount.c:1604
 msgid "Show more options"
 msgstr "Afficher plus d'options"
 
-#: src/gtkaccount.c:1521
+#: src/gtkaccount.c:1605
 msgid "Show fewer options"
 msgstr "Afficher moins d'options"
 
 #. Register button
-#: src/gtkaccount.c:1548 src/protocols/jabber/jabber.c:665
+#: src/gtkaccount.c:1632 src/protocols/jabber/jabber.c:666
 msgid "Register"
 msgstr "S'enregistrer"
 
-#: src/gtkaccount.c:1913
+#: src/gtkaccount.c:1997
 #, c-format
 msgid "Are you sure you want to delete %s?"
 msgstr "Êtes-vous sûr de vouloir supprimer %s ?"
 
-#: src/gtkaccount.c:1917 src/gtkrequest.c:239
+#: src/gtkaccount.c:2001 src/gtkrequest.c:246
 msgid "Delete"
 msgstr "Supprimer"
 
-#: src/gtkaccount.c:2031 src/protocols/oscar/oscar.c:3981
+#: src/gtkaccount.c:2115 src/protocols/oscar/oscar.c:3997
 msgid "Screen Name"
 msgstr "Pseudo"
 
-#: src/gtkaccount.c:2054 src/protocols/jabber/jabber.c:957
-#: src/protocols/oscar/oscar.c:534 src/protocols/oscar/oscar.c:5463
-#: src/protocols/oscar/oscar.c:6661 src/protocols/silc/silc.c:44
-#: src/protocols/yahoo/yahoo.c:2492 src/protocols/zephyr/zephyr.c:1208
-#: src/protocols/zephyr/zephyr.c:1218
+#: src/gtkaccount.c:2139 src/protocols/jabber/jabber.c:958
+#: src/protocols/oscar/oscar.c:538 src/protocols/oscar/oscar.c:5479
+#: src/protocols/oscar/oscar.c:6678 src/protocols/silc/silc.c:44
+#: src/protocols/yahoo/yahoo.c:2515 src/protocols/zephyr/zephyr.c:1360
+#: src/protocols/zephyr/zephyr.c:1372
 msgid "Online"
 msgstr "En ligne"
 
-#: src/gtkaccount.c:2072
+#: src/gtkaccount.c:2160
 msgid "Protocol"
 msgstr "Protocole"
 
-#: src/gtkaccount.c:2384
+#: src/gtkaccount.c:2473
 #, c-format
 msgid "%s%s%s%s has made %s his or her buddy%s%s%s"
 msgstr "%s%s%s%s a fait de %s son contact%s%s%s"
 
-#: src/gtkaccount.c:2398
+#: src/gtkaccount.c:2487
 msgid ""
 "\n"
 "\n"
@@ -2214,27 +2249,27 @@
 "\n"
 "Voulez-vous l'ajouter à votre liste de contacts ?"
 
-#: src/gtkaccount.c:2402
+#: src/gtkaccount.c:2491
 msgid "Information"
 msgstr "Informations"
 
-#: src/gtkaccount.c:2406
+#: src/gtkaccount.c:2495
 msgid "Add buddy to your list?"
 msgstr "Ajouter cet utilisateur à la liste de contacts ?"
 
 #. Add button
-#: src/gtkaccount.c:2408 src/gtkblist.c:4376 src/gtkconv.c:1354
-#: src/gtkconv.c:3563 src/gtkconv.c:3662 src/gtkrequest.c:240
-#: src/protocols/icq/gaim_icq.c:277 src/protocols/oscar/oscar.c:3610
-#: src/protocols/silc/chat.c:578
+#: src/gtkaccount.c:2497 src/gtkblist.c:4411 src/gtkconv.c:1390
+#: src/gtkconv.c:3673 src/gtkconv.c:3777 src/gtkrequest.c:247
+#: src/protocols/icq/gaim_icq.c:277 src/protocols/oscar/oscar.c:3626
+#: src/protocols/silc/chat.c:581
 msgid "Add"
 msgstr "Ajouter"
 
-#: src/gtkblist.c:810
+#: src/gtkblist.c:815
 msgid "Join a Chat"
 msgstr "Joindre une discussion"
 
-#: src/gtkblist.c:831
+#: src/gtkblist.c:836
 msgid ""
 "Please enter the appropriate information about the chat you would like to "
 "join.\n"
@@ -2242,199 +2277,203 @@
 "Saisissez les informations appropriées à propos du salon de discussions que "
 "vous voulez joindre.\n"
 
-#: src/gtkblist.c:842 src/gtkpounce.c:445 src/gtkroomlist.c:354
+#: src/gtkblist.c:847 src/gtkpounce.c:412 src/gtkroomlist.c:354
 msgid "_Account:"
 msgstr "_Compte :"
 
-#: src/gtkblist.c:1128 src/gtkblist.c:3177
+#: src/gtkblist.c:1133 src/gtkblist.c:3212
 msgid "Get _Info"
 msgstr "_Infos"
 
-#: src/gtkblist.c:1131 src/gtkblist.c:3168
+#: src/gtkblist.c:1136 src/gtkblist.c:3203
 msgid "I_M"
 msgstr "_Message"
 
-#: src/gtkblist.c:1133
+#: src/gtkblist.c:1141
+msgid "_Send File"
+msgstr "Envoyer un _fichier"
+
+#: src/gtkblist.c:1145
 msgid "Add Buddy _Pounce"
 msgstr "Ajouter une a_lerte"
 
-#: src/gtkblist.c:1135
+#: src/gtkblist.c:1147
 msgid "View _Log"
 msgstr "_Voir les archives"
 
-#: src/gtkblist.c:1143 src/gtkblist.c:1229 src/gtkblist.c:1243
+#: src/gtkblist.c:1155 src/gtkblist.c:1241 src/gtkblist.c:1255
 msgid "_Alias..."
 msgstr "_Alias..."
 
-#: src/gtkblist.c:1145 src/gtkblist.c:1231 src/gtkblist.c:1248
+#: src/gtkblist.c:1157 src/gtkblist.c:1243 src/gtkblist.c:1260
 #: src/gtkconn.c:361
 msgid "_Remove"
 msgstr "_Supprimer"
 
-#: src/gtkblist.c:1191
+#: src/gtkblist.c:1203
 msgid "Add a _Buddy"
 msgstr "_Ajouter un contact"
 
-#: src/gtkblist.c:1193
+#: src/gtkblist.c:1205
 msgid "Add a C_hat"
 msgstr "Ajouter une d_iscussion"
 
-#: src/gtkblist.c:1195
+#: src/gtkblist.c:1207
 msgid "_Delete Group"
 msgstr "_Supprimer un groupe"
 
-#: src/gtkblist.c:1197
+#: src/gtkblist.c:1209
 msgid "_Rename"
 msgstr "_Renommer"
 
 #. join button
-#: src/gtkblist.c:1219 src/gtkroomlist.c:263 src/gtkroomlist.c:409
+#: src/gtkblist.c:1231 src/gtkroomlist.c:263 src/gtkroomlist.c:409
 #: src/stock.c:87
 msgid "_Join"
 msgstr "_Joindre"
 
-#: src/gtkblist.c:1221
+#: src/gtkblist.c:1233
 msgid "Auto-Join"
 msgstr "Connexion auto"
 
-#: src/gtkblist.c:1245 src/gtkblist.c:1274
+#: src/gtkblist.c:1257 src/gtkblist.c:1286
 msgid "_Collapse"
 msgstr "Re_plier"
 
-#: src/gtkblist.c:1279
+#: src/gtkblist.c:1291
 msgid "_Expand"
 msgstr "_Etendre"
 
-#: src/gtkblist.c:1935 src/gtkconv.c:4199 src/gtkpounce.c:347
+#: src/gtkblist.c:1949 src/gtkconv.c:4317 src/gtkpounce.c:314
 msgid ""
 "You are not currently signed on with an account that can add that buddy."
 msgstr ""
 "Vous n'êtes connecté à aucun compte permettant d'ajouter cet utilisateur."
 
 #. Buddies menu
-#: src/gtkblist.c:2286
+#: src/gtkblist.c:2336
 msgid "/_Buddies"
 msgstr "/_Contacts"
 
-#: src/gtkblist.c:2287
+#: src/gtkblist.c:2337
 msgid "/Buddies/New Instant _Message..."
 msgstr "/Contacts/Envoyer un _message..."
 
-#: src/gtkblist.c:2288
+#: src/gtkblist.c:2338
 msgid "/Buddies/Join a _Chat..."
 msgstr "/Contacts/_Joindre une discussion..."
 
-#: src/gtkblist.c:2289
+#: src/gtkblist.c:2339
 msgid "/Buddies/Get User _Info..."
 msgstr "/Contacts/Voir les _informations..."
 
-#: src/gtkblist.c:2290
+#: src/gtkblist.c:2340
 msgid "/Buddies/View User _Log..."
 msgstr "/Contacts/Voir les arc_hives..."
 
-#: src/gtkblist.c:2292
+#: src/gtkblist.c:2342
 msgid "/Buddies/Show _Offline Buddies"
 msgstr "/Contacts/Afficher les contacts _déconnectés"
 
-#: src/gtkblist.c:2293
+#: src/gtkblist.c:2343
 msgid "/Buddies/Show _Empty Groups"
 msgstr "/Contacts/Afficher les groupes _vides"
 
-#: src/gtkblist.c:2294
+#: src/gtkblist.c:2344
 msgid "/Buddies/_Add Buddy..."
 msgstr "/Contacts/_Ajouter un contact..."
 
-#: src/gtkblist.c:2295
+#: src/gtkblist.c:2345
 msgid "/Buddies/Add C_hat..."
 msgstr "/Contacts/Ajouter une _discussion..."
 
-#: src/gtkblist.c:2296
+#: src/gtkblist.c:2346
 msgid "/Buddies/Add _Group..."
 msgstr "/Contacts/Ajouter un _groupe..."
 
-#: src/gtkblist.c:2298
+#: src/gtkblist.c:2348
 msgid "/Buddies/_Signoff"
 msgstr "/Contacts/Déconne_xion"
 
-#: src/gtkblist.c:2299
+#: src/gtkblist.c:2349
 msgid "/Buddies/_Quit"
 msgstr "/Contacts/_Quitter"
 
 #. Tools
-#: src/gtkblist.c:2302
+#: src/gtkblist.c:2352
 msgid "/_Tools"
 msgstr "/_Outils"
 
-#: src/gtkblist.c:2303
+#: src/gtkblist.c:2353
 msgid "/Tools/_Away"
 msgstr "/Outils/_Absence"
 
-#: src/gtkblist.c:2304
+#: src/gtkblist.c:2354
 msgid "/Tools/Buddy _Pounce"
 msgstr "/Outils/A_lertes"
 
-#: src/gtkblist.c:2305
+#: src/gtkblist.c:2355
 msgid "/Tools/Account Ac_tions"
 msgstr "/Outils/Ac_tions des comptes"
 
-#: src/gtkblist.c:2306
+#: src/gtkblist.c:2356
 msgid "/Tools/Pl_ugin Actions"
 msgstr "/Outils/Action des pl_ugins"
 
-#: src/gtkblist.c:2308
+#: src/gtkblist.c:2358
 msgid "/Tools/A_ccounts"
 msgstr "/Outils/_Comptes"
 
-#: src/gtkblist.c:2309
+#: src/gtkblist.c:2359
 msgid "/Tools/_File Transfers"
 msgstr "/Outils/Transferts de _fichier"
 
-#: src/gtkblist.c:2310
+#: src/gtkblist.c:2360
 msgid "/Tools/R_oom List"
 msgstr "/Outils/Liste des _salons de discussion"
 
-#: src/gtkblist.c:2311
+#: src/gtkblist.c:2361
 msgid "/Tools/Pr_eferences"
 msgstr "/Outils/_Préférences"
 
-#: src/gtkblist.c:2312
+#: src/gtkblist.c:2362
 msgid "/Tools/Pr_ivacy"
 msgstr "/Outils/F_iltres"
 
-#: src/gtkblist.c:2314
+#: src/gtkblist.c:2364
 msgid "/Tools/View System _Log"
 msgstr "/Outils/Voir les archives _système"
 
 #. Help
-#: src/gtkblist.c:2317
+#: src/gtkblist.c:2367
 msgid "/_Help"
 msgstr "/_Aide"
 
-#: src/gtkblist.c:2318
+#: src/gtkblist.c:2368
 msgid "/Help/Online _Help"
 msgstr "/Aide/_Aide en ligne"
 
-#: src/gtkblist.c:2319
+#: src/gtkblist.c:2369
 msgid "/Help/_Debug Window"
 msgstr "/Aide/Fenêtre de _debug"
 
-#: src/gtkblist.c:2320
+#: src/gtkblist.c:2370
 msgid "/Help/_About"
 msgstr "/Aide/_A propos de"
 
-#: src/gtkblist.c:2338
+#: src/gtkblist.c:2388
 msgid "Rename Group"
 msgstr "Renommer un groupe"
 
-#: src/gtkblist.c:2338
+#: src/gtkblist.c:2388
 msgid "New group name"
 msgstr "Nouveau nom du groupe"
 
-#: src/gtkblist.c:2339
+#: src/gtkblist.c:2389
 msgid "Please enter a new name for the selected group."
 msgstr "Saisissez le nouveau nom pour le groupe sélectionné"
 
-#: src/gtkblist.c:2367
+#: src/gtkblist.c:2417
 #, c-format
 msgid ""
 "\n"
@@ -2443,7 +2482,7 @@
 "\n"
 "<b>Compte :</b> %s"
 
-#: src/gtkblist.c:2431
+#: src/gtkblist.c:2481
 msgid ""
 "\n"
 "<b>Status:</b> Offline"
@@ -2451,12 +2490,12 @@
 "\n"
 "<b>Status :</b> Déconnecté"
 
-#: src/gtkblist.c:2446
+#: src/gtkblist.c:2496
 #, c-format
 msgid "%d%%"
 msgstr "%d%%"
 
-#: src/gtkblist.c:2462
+#: src/gtkblist.c:2512
 msgid ""
 "\n"
 "<b>Account:</b>"
@@ -2464,7 +2503,7 @@
 "\n"
 "<b>Compte :</b>"
 
-#: src/gtkblist.c:2463
+#: src/gtkblist.c:2513
 msgid ""
 "\n"
 "<b>Contact Alias:</b>"
@@ -2472,7 +2511,7 @@
 "\n"
 "<b>Alias du contact :</b>"
 
-#: src/gtkblist.c:2464
+#: src/gtkblist.c:2514
 msgid ""
 "\n"
 "<b>Alias:</b>"
@@ -2480,7 +2519,7 @@
 "\n"
 "<b>Alias :</b>"
 
-#: src/gtkblist.c:2465
+#: src/gtkblist.c:2515
 msgid ""
 "\n"
 "<b>Nickname:</b>"
@@ -2488,7 +2527,7 @@
 "\n"
 "<b>Pseudonyme :</b>"
 
-#: src/gtkblist.c:2466
+#: src/gtkblist.c:2516
 msgid ""
 "\n"
 "<b>Logged In:</b>"
@@ -2496,7 +2535,7 @@
 "\n"
 "<b>Connexion :</b>"
 
-#: src/gtkblist.c:2467
+#: src/gtkblist.c:2517
 msgid ""
 "\n"
 "<b>Idle:</b>"
@@ -2504,7 +2543,7 @@
 "\n"
 "<b>Inactif :</b>"
 
-#: src/gtkblist.c:2468
+#: src/gtkblist.c:2518
 msgid ""
 "\n"
 "<b>Warned:</b>"
@@ -2512,7 +2551,7 @@
 "\n"
 "<b>Avertissement :</b>"
 
-#: src/gtkblist.c:2470
+#: src/gtkblist.c:2520
 msgid ""
 "\n"
 "<b>Description:</b> Spooky"
@@ -2520,7 +2559,7 @@
 "\n"
 "<b>Description :</b> Bizarre"
 
-#: src/gtkblist.c:2471
+#: src/gtkblist.c:2521
 msgid ""
 "\n"
 "<b>Status</b>: Awesome"
@@ -2528,7 +2567,7 @@
 "\n"
 "<b>Status :</b> Fabuleux"
 
-#: src/gtkblist.c:2472
+#: src/gtkblist.c:2522
 msgid ""
 "\n"
 "<b>Status</b>: Rockin'"
@@ -2536,96 +2575,96 @@
 "\n"
 "<b>Status :</b> Génial"
 
-#: src/gtkblist.c:2771
+#: src/gtkblist.c:2804
 #, c-format
 msgid "Idle (%dh%02dm) "
 msgstr "Inactif (%dh%02dm) "
 
-#: src/gtkblist.c:2773
+#: src/gtkblist.c:2806
 #, c-format
 msgid "Idle (%dm) "
 msgstr "Inactif (%dm) "
 
-#: src/gtkblist.c:2778
+#: src/gtkblist.c:2811
 #, c-format
 msgid "Warned (%d%%) "
 msgstr "Avertissements (%d%%) "
 
-#: src/gtkblist.c:2781
+#: src/gtkblist.c:2814
 msgid "Offline "
 msgstr "Déconnecté "
 
 #. Make menu items sensitive/insensitive where appropriate
-#: src/gtkblist.c:2899
+#: src/gtkblist.c:2932
 msgid "/Buddies/Join a Chat..."
 msgstr "/Contacts/Joindre une discussion..."
 
-#: src/gtkblist.c:2902
+#: src/gtkblist.c:2935
 msgid "/Tools/Room List"
 msgstr "/Outils/Liste des salons"
 
-#: src/gtkblist.c:2905
+#: src/gtkblist.c:2938
 msgid "/Tools/Privacy"
 msgstr "/Outils/Filtres"
 
-#: src/gtkblist.c:3050
+#: src/gtkblist.c:3085
 msgid "/Tools/Away"
 msgstr "/Outils/Absence"
 
-#: src/gtkblist.c:3053
+#: src/gtkblist.c:3088
 msgid "/Tools/Buddy Pounce"
 msgstr "/Outils/Alertes"
 
-#: src/gtkblist.c:3056
+#: src/gtkblist.c:3091
 msgid "/Tools/Account Actions"
 msgstr "/Outils/Actions du compte"
 
-#: src/gtkblist.c:3059
+#: src/gtkblist.c:3094
 msgid "/Tools/Plugin Actions"
 msgstr "/Outils/Actions des plugins"
 
 #. set the Show Offline Buddies option. must be done
 #. * after the treeview or faceprint gets mad. -Robot101
 #.
-#: src/gtkblist.c:3148
+#: src/gtkblist.c:3183
 msgid "/Buddies/Show Offline Buddies"
 msgstr "/Contacts/Afficher les contacts _déconnectés"
 
-#: src/gtkblist.c:3150
+#: src/gtkblist.c:3185
 msgid "/Buddies/Show Empty Groups"
 msgstr "/Contacts/Ajouter les groupes vides"
 
-#: src/gtkblist.c:3174
+#: src/gtkblist.c:3209
 msgid "Send a message to the selected buddy"
 msgstr "Envoyer un message instantané au contact sélectionné"
 
-#: src/gtkblist.c:3183
+#: src/gtkblist.c:3218
 msgid "Get information on the selected buddy"
 msgstr "Obtenir les informations sur le contact sélectionné"
 
-#: src/gtkblist.c:3186
+#: src/gtkblist.c:3221
 msgid "_Chat"
 msgstr "_Discussion"
 
-#: src/gtkblist.c:3191
+#: src/gtkblist.c:3226
 msgid "Join a chat room"
 msgstr "Joindre un groupe de discussions"
 
-#: src/gtkblist.c:3194
+#: src/gtkblist.c:3229
 msgid "_Away"
 msgstr "_Absent"
 
-#: src/gtkblist.c:3199
+#: src/gtkblist.c:3234
 msgid "Set an away message"
 msgstr "Choisir un message d'absence"
 
-#: src/gtkblist.c:3937 src/protocols/silc/buddy.c:731
+#: src/gtkblist.c:3972 src/protocols/silc/buddy.c:731
 #: src/protocols/silc/buddy.c:989 src/protocols/silc/buddy.c:1034
-#: src/protocols/silc/buddy.c:1124 src/protocols/yahoo/yahoo.c:2672
+#: src/protocols/silc/buddy.c:1124 src/protocols/yahoo/yahoo.c:2682
 msgid "Add Buddy"
 msgstr "Nouveau contact"
 
-#: src/gtkblist.c:3961
+#: src/gtkblist.c:3996
 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. "
@@ -2636,11 +2675,11 @@
 "sera affiché à la place du pseudo chaque fois que cela est possible.\n"
 
 #. Set up stuff for the account box
-#: src/gtkblist.c:4021 src/gtkblist.c:4305
+#: src/gtkblist.c:4056 src/gtkblist.c:4340
 msgid "Account:"
 msgstr "Compte :"
 
-#: src/gtkblist.c:4264
+#: src/gtkblist.c:4299
 msgid ""
 "You are not currently signed on with any protocols that have the ability to "
 "chat."
@@ -2648,11 +2687,11 @@
 "Vous n'avez pas de protocole disponible vous permettant de joindre des "
 "groupes de discussion."
 
-#: src/gtkblist.c:4271
+#: src/gtkblist.c:4306
 msgid "Add Chat"
 msgstr "Ajouter discussion"
 
-#: src/gtkblist.c:4295
+#: src/gtkblist.c:4330
 msgid ""
 "Please enter an alias, and the appropriate information about the chat you "
 "would like to add to your buddy list.\n"
@@ -2660,15 +2699,15 @@
 "Saisissez un alias et les informations nécessaires pour le groupe de "
 "discussion que vous voulez ajouter dans la liste de contacts.\n"
 
-#: src/gtkblist.c:4373
+#: src/gtkblist.c:4408
 msgid "Add Group"
 msgstr "Nouveau groupe"
 
-#: src/gtkblist.c:4374
+#: src/gtkblist.c:4409
 msgid "Please enter the name of the group to be added."
 msgstr "Saisissez le nom du groupe à ajouter"
 
-#: src/gtkblist.c:4941 src/gtkblist.c:5038
+#: src/gtkblist.c:4976 src/gtkblist.c:5073
 msgid "No actions available"
 msgstr "Aucune action disponible"
 
@@ -2717,29 +2756,16 @@
 msgid "Time"
 msgstr "Heure"
 
-#: src/gtkconv.c:168
-#, c-format
-msgid "<h1>Conversation with %s</h1>\n"
-msgstr "<h1>Conversation avec %s</h1>\n"
-
-#: src/gtkconv.c:186 src/gtkdebug.c:212
-msgid "That file already exists"
-msgstr "Ce fichier existe déjà"
-
-#: src/gtkconv.c:187 src/gtkdebug.c:213 src/gtkft.c:1123
-msgid "Would you like to overwrite it?"
-msgstr "Voulez-vous l'écraser ?"
-
-#: src/gtkconv.c:365
+#: src/gtkconv.c:314
 #, c-format
 msgid "me is using Gaim v%s."
 msgstr "me utilise Gaim v%s."
 
-#: src/gtkconv.c:374
+#: src/gtkconv.c:323
 msgid "Supported debug options are:  version"
 msgstr "Les options de debuggage supportées sont : version"
 
-#: src/gtkconv.c:387
+#: src/gtkconv.c:336
 msgid ""
 "Use \"/help &lt;command&gt;\" for help on a specific command.\n"
 "The following commands are available in this context:\n"
@@ -2748,11 +2774,11 @@
 "spécifique.\n"
 "Les commandes actuellement disponibles sont :\n"
 
-#: src/gtkconv.c:421
+#: src/gtkconv.c:370
 msgid "No such command (in this context)."
 msgstr "Cette commande n'existe pas dans ce contexte."
 
-#: src/gtkconv.c:468
+#: src/gtkconv.c:443
 msgid ""
 "No such command. If you didn't mean to type a command, you can turn commands "
 "off from Tools->Preferences->Interface->Conversation->Enable \"slash\" "
@@ -2762,7 +2788,7 @@
 "pouvez les désactiver par le menu Outils->Préférences->Interface-"
 ">Conversation->Activer les commandes « barre »"
 
-#: src/gtkconv.c:476
+#: src/gtkconv.c:451
 msgid ""
 "Syntax Error:  You typed the wrong number of arguments to that command. If "
 "you didn't mean to type a command, you can turn commands off from Tools-"
@@ -2773,30 +2799,30 @@
 "désactiver par le menu Outils->Préférences->Interface->Conversation->Activer "
 "les commandes « barre »"
 
-#: src/gtkconv.c:483
+#: src/gtkconv.c:458
 msgid "Your command failed for an unknown reason."
 msgstr "La commande a échoué pour une raison inconnue."
 
-#: src/gtkconv.c:490
+#: src/gtkconv.c:465
 msgid "That command only works in Chats, not IMs."
 msgstr ""
 "Cette commande fonctionne uniquement dans les discussions, pas les messages."
 
-#: src/gtkconv.c:493
+#: src/gtkconv.c:468
 msgid "That command only works in IMs, not Chats."
 msgstr ""
 "Cette commande fonctionne uniquement dans les messages, pas les discussions."
 
-#: src/gtkconv.c:497
+#: src/gtkconv.c:472
 msgid "That command doesn't work on this protocol."
 msgstr "Cette commande ne fonctionne pas avec ce protocole."
 
-#: src/gtkconv.c:713
+#: src/gtkconv.c:693
 msgid "Invite Buddy Into Chat Room"
 msgstr "Inviter le contact dans une discussion"
 
 #. Put our happy label in it.
-#: src/gtkconv.c:741
+#: src/gtkconv.c:721
 msgid ""
 "Please enter the name of the user you wish to invite, along with an optional "
 "invite message."
@@ -2804,314 +2830,349 @@
 "Saisissez le nom de l'utilisateur que vous voulez inviter dans la "
 "discussion, ainsi qu'un message optionnel d'invitation."
 
-#: src/gtkconv.c:762
+#: src/gtkconv.c:742
 msgid "_Buddy:"
 msgstr "_Contact :"
 
-#: src/gtkconv.c:782
+#: src/gtkconv.c:762
 msgid "_Message:"
 msgstr "_Message :"
 
-#: src/gtkconv.c:890 src/gtkdebug.c:127
+#: src/gtkconv.c:799 src/gtkconv.c:2489 src/gtkdebug.c:182
+msgid "Unable to open file."
+msgstr "Impossible d'ouvrir le fichier"
+
+#: src/gtkconv.c:804
+#, c-format
+msgid "<h1>Conversation with %s</h1>\n"
+msgstr "<h1>Conversation avec %s</h1>\n"
+
+#: src/gtkconv.c:818
+msgid "Save Conversation"
+msgstr "Sauver la conversation"
+
+#: src/gtkconv.c:895 src/gtkdebug.c:131
 msgid "Find"
 msgstr "Chercher"
 
-#: src/gtkconv.c:916 src/gtkdebug.c:155
+#: src/gtkconv.c:921 src/gtkdebug.c:159
 msgid "_Search for:"
 msgstr "_Chercher : "
 
-#: src/gtkconv.c:1312
+#: src/gtkconv.c:1338
 msgid "IM"
 msgstr "Message"
 
-#: src/gtkconv.c:1320
+#. Block button
+#: src/gtkconv.c:1347 src/gtkconv.c:3666 src/protocols/oscar/oscar.c:453
+#: src/protocols/oscar/oscar.c:6788
+msgid "Send File"
+msgstr "Envoyer un fichier"
+
+#: src/gtkconv.c:1356
 msgid "Un-Ignore"
 msgstr "Ne plus ignorer"
 
-#: src/gtkconv.c:1322 src/gtkprefs.c:778
+#: src/gtkconv.c:1358 src/gtkprefs.c:826
 msgid "Ignore"
 msgstr "Ignorer"
 
 #. Info button
-#: src/gtkconv.c:1331 src/gtkconv.c:3577
+#: src/gtkconv.c:1367 src/gtkconv.c:3687
 msgid "Info"
 msgstr "Info"
 
-#: src/gtkconv.c:1340
+#: src/gtkconv.c:1376
 msgid "Get Away Msg"
 msgstr "Obtenir le message d'absence"
 
-#: src/gtkconv.c:2467
+#: src/gtkconv.c:2497
+msgid "Unable to save icon file to disk."
+msgstr "Impossible de sauver l'icône sur le disque"
+
+#: src/gtkconv.c:2514
+msgid "Save Icon"
+msgstr "Enregistrer l'icône"
+
+#: src/gtkconv.c:2544
 msgid "Animate"
 msgstr "Animer"
 
-#: src/gtkconv.c:2472
+#: src/gtkconv.c:2549
 msgid "Hide Icon"
 msgstr "Cacher l'icône"
 
-#: src/gtkconv.c:2478
+#: src/gtkconv.c:2555
 msgid "Save Icon As..."
 msgstr "Enregistrer l'icône sous..."
 
-#: src/gtkconv.c:2847
+#: src/gtkconv.c:2939
 msgid "User is typing..."
 msgstr "L'utilisateur est en train d'écrire..."
 
-#: src/gtkconv.c:2855
+#: src/gtkconv.c:2947
 msgid "User has typed something and paused"
 msgstr "L'utilisateur a écrit quelque chose et s'est arrêté"
 
 #. Build the Send As menu
-#: src/gtkconv.c:2958
+#: src/gtkconv.c:3050
 msgid "_Send As"
 msgstr "_Envoyer en tant que"
 
-#: src/gtkconv.c:3335
-msgid "Save Conversation"
-msgstr "Sauver la conversation"
-
 #. Conversation menu
-#: src/gtkconv.c:3352
+#: src/gtkconv.c:3450
 msgid "/_Conversation"
 msgstr "/_Conversation"
 
-#: src/gtkconv.c:3354
+#: src/gtkconv.c:3452
 msgid "/Conversation/New Instant _Message..."
 msgstr "/Conversation/Envoyer un _message..."
 
-#: src/gtkconv.c:3359
+#: src/gtkconv.c:3457
 msgid "/Conversation/_Find..."
 msgstr "/Conversation/_Chercher..."
 
-#: src/gtkconv.c:3361
+#: src/gtkconv.c:3459
 msgid "/Conversation/View _Log"
 msgstr "/Conversation/Voir les _archives"
 
-#: src/gtkconv.c:3362
+#: src/gtkconv.c:3460
 msgid "/Conversation/_Save As..."
 msgstr "/Conversation/Enregistrer _sous..."
 
-#: src/gtkconv.c:3364
+#: src/gtkconv.c:3462
 msgid "/Conversation/Clear"
 msgstr "/Conversation/Effacer"
 
-#: src/gtkconv.c:3368
+#: src/gtkconv.c:3466
+msgid "/Conversation/Se_nd File..."
+msgstr "/Conversation/Envoyer un _fichier..."
+
+#: src/gtkconv.c:3467
 msgid "/Conversation/Add Buddy _Pounce..."
 msgstr "/Conversation/Ajouter une alerte..."
 
-#: src/gtkconv.c:3370
+#: src/gtkconv.c:3469
 msgid "/Conversation/_Get Info"
 msgstr "/Conversation/Voir les _informations"
 
-#: src/gtkconv.c:3372
+#: src/gtkconv.c:3471
 msgid "/Conversation/_Warn..."
 msgstr "/Conversation/Donner un avertissement..."
 
-#: src/gtkconv.c:3374
+#: src/gtkconv.c:3473
 msgid "/Conversation/In_vite..."
 msgstr "/Conversation/Inviter..."
 
-#: src/gtkconv.c:3379
+#: src/gtkconv.c:3478
 msgid "/Conversation/A_lias..."
 msgstr "/Conversation/Donner un alias..."
 
-#: src/gtkconv.c:3381
+#: src/gtkconv.c:3480
 msgid "/Conversation/_Block..."
 msgstr "/Conversation/_Bloquer..."
 
-#: src/gtkconv.c:3383
+#: src/gtkconv.c:3482
 msgid "/Conversation/_Add..."
 msgstr "/Conversation/_Ajouter..."
 
-#: src/gtkconv.c:3385
+#: src/gtkconv.c:3484
 msgid "/Conversation/_Remove..."
 msgstr "/Conversation/_Supprimer..."
 
-#: src/gtkconv.c:3390
+#: src/gtkconv.c:3489
 msgid "/Conversation/Insert Lin_k..."
 msgstr "/Conversation/Insérer un _lien..."
 
-#: src/gtkconv.c:3392
+#: src/gtkconv.c:3491
 msgid "/Conversation/Insert Imag_e..."
 msgstr "/Conversation/Insérer une _image..."
 
-#: src/gtkconv.c:3397
+#: src/gtkconv.c:3496
 msgid "/Conversation/_Close"
 msgstr "/Conversation/_Fermer"
 
 #. Options
-#: src/gtkconv.c:3401
+#: src/gtkconv.c:3500
 msgid "/_Options"
 msgstr "/_Options"
 
-#: src/gtkconv.c:3402
+#: src/gtkconv.c:3501
 msgid "/Options/Enable _Logging"
 msgstr "/Options/Activer l'_archivage"
 
-#: src/gtkconv.c:3403
+#: src/gtkconv.c:3502
 msgid "/Options/Enable _Sounds"
 msgstr "/Options/Activer les _sons"
 
-#: src/gtkconv.c:3404
+#: src/gtkconv.c:3503
 msgid "/Options/Show Formatting _Toolbar"
 msgstr "/Options/Afficher la _barre de style"
 
-#: src/gtkconv.c:3405
+#: src/gtkconv.c:3504
 msgid "/Options/Show T_imestamps"
 msgstr "/Options/Afficher l'_horodatage"
 
-#: src/gtkconv.c:3447
+#: src/gtkconv.c:3546
 msgid "/Conversation/View Log"
 msgstr "/Conversation/Voir les _archives"
 
-#: src/gtkconv.c:3452
+#: src/gtkconv.c:3551
+msgid "/Conversation/Send File..."
+msgstr "/Conversation/Envoyer un fichier..."
+
+#: src/gtkconv.c:3555
 msgid "/Conversation/Add Buddy Pounce..."
 msgstr "/Conversation/Ajouter une alerte..."
 
-#: src/gtkconv.c:3458
+#: src/gtkconv.c:3561
 msgid "/Conversation/Get Info"
 msgstr "/Conversation/Voir les informations"
 
-#: src/gtkconv.c:3462
+#: src/gtkconv.c:3565
 msgid "/Conversation/Warn..."
 msgstr "/Conversation/Donner un avertissement..."
 
-#: src/gtkconv.c:3466
+#: src/gtkconv.c:3569
 msgid "/Conversation/Invite..."
 msgstr "/Conversation/Inviter..."
 
-#: src/gtkconv.c:3472
+#: src/gtkconv.c:3575
 msgid "/Conversation/Alias..."
 msgstr "/Conversation/Donner un alias..."
 
-#: src/gtkconv.c:3476
+#: src/gtkconv.c:3579
 msgid "/Conversation/Block..."
 msgstr "/Conversation/Bloquer..."
 
-#: src/gtkconv.c:3480
+#: src/gtkconv.c:3583
 msgid "/Conversation/Add..."
 msgstr "/Conversation/Ajouter..."
 
-#: src/gtkconv.c:3484
+#: src/gtkconv.c:3587
 msgid "/Conversation/Remove..."
 msgstr "/Conversation/Supprimer..."
 
-#: src/gtkconv.c:3490
+#: src/gtkconv.c:3593
 msgid "/Conversation/Insert Link..."
 msgstr "/Conversation/Insérer un _lien..."
 
-#: src/gtkconv.c:3494
+#: src/gtkconv.c:3597
 msgid "/Conversation/Insert Image..."
 msgstr "/Conversation/Insérer une _image..."
 
-#: src/gtkconv.c:3500
+#: src/gtkconv.c:3603
 msgid "/Options/Enable Logging"
 msgstr "/Options/Activer l'_archivage"
 
-#: src/gtkconv.c:3503
+#: src/gtkconv.c:3606
 msgid "/Options/Enable Sounds"
 msgstr "/Options/Activer les _sons"
 
-#: src/gtkconv.c:3506
+#: src/gtkconv.c:3609
 msgid "/Options/Show Formatting Toolbar"
 msgstr "/Options/Afficher la barre de style"
 
-#: src/gtkconv.c:3509
+#: src/gtkconv.c:3612
 msgid "/Options/Show Timestamps"
 msgstr "/Options/Afficher l'horodatage"
 
 #. From right to left...
 #. Send button
-#: src/gtkconv.c:3533 src/gtkconv.c:3535 src/gtkconv.c:3641 src/gtkconv.c:3643
+#: src/gtkconv.c:3636 src/gtkconv.c:3638 src/gtkconv.c:3756 src/gtkconv.c:3758
 msgid "Send"
 msgstr "Envoyer"
 
 #. Now, um, just kind of all over the place. Huh?
 #. Warn button
-#: src/gtkconv.c:3549
+#: src/gtkconv.c:3652
 msgid "Warn"
 msgstr "Réprimander"
 
-#: src/gtkconv.c:3552
+#: src/gtkconv.c:3655
 msgid "Warn the user"
 msgstr "Donner un avertissement à l'interlocuteur"
 
 #. Block button
-#: src/gtkconv.c:3556 src/gtkprivacy.c:624 src/gtkprivacy.c:635
+#: src/gtkconv.c:3659 src/gtkprivacy.c:624 src/gtkprivacy.c:635
 msgid "Block"
 msgstr "Bloquer"
 
-#: src/gtkconv.c:3559
+#: src/gtkconv.c:3662
 msgid "Block the user"
 msgstr "Bloquer les messages de l'interlocuteur"
 
-#: src/gtkconv.c:3566
+#: src/gtkconv.c:3669
+msgid "Send a file to the user"
+msgstr "Envoyer un fichier à l'interlocuteur"
+
+#: src/gtkconv.c:3676
 msgid "Add the user to your buddy list"
 msgstr "Ajouter l'interlocuteur à la liste de contacts"
 
-#: src/gtkconv.c:3573
+#: src/gtkconv.c:3683
 msgid "Remove the user from your buddy list"
 msgstr "Supprimer l'interlocuteur de la liste de contacts"
 
-#: src/gtkconv.c:3580 src/gtkconv.c:3923
+#: src/gtkconv.c:3690 src/gtkconv.c:4041
 msgid "Get the user's information"
 msgstr "Voir les informations de l'interlocuteur"
 
 #. Invite
-#: src/gtkconv.c:3655
+#: src/gtkconv.c:3770
 msgid "Invite"
 msgstr "Inviter"
 
-#: src/gtkconv.c:3658
+#: src/gtkconv.c:3773
 msgid "Invite a user"
 msgstr "Inviter un utilisateur"
 
-#: src/gtkconv.c:3665
+#: src/gtkconv.c:3780
 msgid "Add the chat to your buddy list"
 msgstr "Ajouter le salon de discussion à la liste de contacts"
 
-#: src/gtkconv.c:3672
+#: src/gtkconv.c:3787
 msgid "Remove the chat from your buddy list"
 msgstr "Supprimer le salon de discussion de la liste de contacts"
 
-#: src/gtkconv.c:3782
+#: src/gtkconv.c:3897
 msgid "Topic:"
 msgstr "Sujet :"
 
 #. Setup the label telling how many people are in the room.
-#: src/gtkconv.c:3845
+#: src/gtkconv.c:3960
 msgid "0 people in room"
 msgstr "Personne dans ce salon"
 
-#: src/gtkconv.c:3900
+#: src/gtkconv.c:4018
 msgid "IM the user"
 msgstr "Envoyer un message à cet utilisateur"
 
-#: src/gtkconv.c:3912
+#: src/gtkconv.c:4030
 msgid "Ignore the user"
 msgstr "Ignorer cet utilisateur"
 
-#: src/gtkconv.c:4490
+#: src/gtkconv.c:4629
 msgid "Close conversation"
 msgstr "Fermer la conversation"
 
-#: src/gtkconv.c:5035 src/gtkconv.c:5067 src/gtkconv.c:5188 src/gtkconv.c:5255
+#: src/gtkconv.c:5171 src/gtkconv.c:5203 src/gtkconv.c:5324 src/gtkconv.c:5391
 #, c-format
 msgid "%d person in room"
 msgid_plural "%d people in room"
 msgstr[0] "%d personne dans le salon"
 msgstr[1] "%d personnes dans le salon"
 
-#: src/gtkconv.c:5757 src/gtkconv.c:5760
+#: src/gtkconv.c:5903 src/gtkconv.c:5906
 msgid "<main>/Conversation/Close"
 msgstr "<main>/Conversation/_Fermer"
 
-#: src/gtkconv.c:6132
+#: src/gtkconv.c:6278
 msgid "me &lt;action&gt;:  Send an IRC style action to a buddy or chat."
 msgstr ""
 "me &lt;action&gt; : Envoyer une action à la IRC à un contact ou discussion"
 
-#: src/gtkconv.c:6135
+#: src/gtkconv.c:6281
 msgid ""
 "debug &lt;option&gt;:  Send various debug information to the current "
 "conversation."
@@ -3119,198 +3180,156 @@
 "debug &lt;option&gt; : Met en place des options de debuggage dans la "
 "conversation courante"
 
-#: src/gtkconv.c:6139
+#: src/gtkconv.c:6285
 msgid "help:  List available commands."
 msgstr "help : Récupérer la liste des commandes disponibles"
 
-#: src/gtkconv.c:6143
+#: src/gtkconv.c:6289
 msgid "help &lt;command&gt;:  Help on a specific command."
 msgstr ""
 "help &lt;commande&gt; : Demander de l'aide sur une commande particulière"
 
-#: src/gtkdebug.c:226
+#: src/gtkdebug.c:197
 msgid "Save Debug Log"
 msgstr "Enregistrer les archives de debuggage"
 
-#: src/gtkdebug.c:289
+#: src/gtkdebug.c:250
 msgid "Debug Window"
 msgstr "Fenêtre de debug"
 
-#: src/gtkdebug.c:327
+#: src/gtkdebug.c:288
 msgid "Pause"
 msgstr "Pause"
 
-#: src/gtkdebug.c:333
+#: src/gtkdebug.c:294
 msgid "Timestamps"
 msgstr "Horodatage"
 
-#: src/gtkft.c:143
+#: src/gtkft.c:136
 #, c-format
 msgid "%.2f KB/s"
 msgstr "%.2f Ko/s"
 
-#: src/gtkft.c:164 src/gtkft.c:974
+#: src/gtkft.c:157 src/gtkft.c:967
 msgid "Finished"
 msgstr "Fini"
 
-#: src/gtkft.c:167 src/gtkft.c:925
+#: src/gtkft.c:160 src/gtkft.c:918
 msgid "Canceled"
 msgstr "Annulé"
 
-#: src/gtkft.c:170
+#: src/gtkft.c:163
 msgid "Waiting for transfer to begin"
 msgstr "En attente de début de transfert"
 
-#: src/gtkft.c:223
+#: src/gtkft.c:216
 msgid "<b>Receiving From:</b>"
 msgstr "<b>Réception depuis :</b>"
 
-#: src/gtkft.c:226
+#: src/gtkft.c:219
 msgid "<b>Sending To:</b>"
 msgstr "<b>Envoi vers :</b>"
 
-#: src/gtkft.c:400
+#: src/gtkft.c:393
 msgid "There is no application configured to open this type of file."
 msgstr "Aucune application n'est configurée pour ouvrir ce type de fichier"
 
-#: src/gtkft.c:405
+#: src/gtkft.c:398
 msgid "An error occurred while opening the file."
 msgstr "Erreur lors de l'ouverture du fichier"
 
+#: src/gtkft.c:489
+msgid "Progress"
+msgstr "État"
+
 #: src/gtkft.c:496
-msgid "Progress"
-msgstr "État"
-
-#: src/gtkft.c:503
 msgid "Filename"
 msgstr "Fichier"
 
-#: src/gtkft.c:510
+#: src/gtkft.c:503
 msgid "Size"
 msgstr "Taille"
 
-#: src/gtkft.c:517
+#: src/gtkft.c:510
 msgid "Remaining"
 msgstr "Reste"
 
-#: src/gtkft.c:547
+#: src/gtkft.c:540
 msgid "Filename:"
 msgstr "Fichier :"
 
-#: src/gtkft.c:548
+#: src/gtkft.c:541
 msgid "Status:"
 msgstr "Status :"
 
-#: src/gtkft.c:549
+#: src/gtkft.c:542
 msgid "Speed:"
 msgstr "Vitesse :"
 
-#: src/gtkft.c:550
+#: src/gtkft.c:543
 msgid "Time Elapsed:"
 msgstr "Temps écoulé :"
 
-#: src/gtkft.c:551
+#: src/gtkft.c:544
 msgid "Time Remaining:"
 msgstr "Temps restant :"
 
-#: src/gtkft.c:648
+#: src/gtkft.c:641
 msgid "_Keep the dialog open"
 msgstr "_Garder la fenêtre ouverte"
 
-#: src/gtkft.c:658
+#: src/gtkft.c:651
 msgid "_Clear finished transfers"
 msgstr "_Effacer les transferts terminés"
 
 #. "Download Details" arrow
-#: src/gtkft.c:667
+#: src/gtkft.c:660
 msgid "Show transfer details"
 msgstr "Afficher les détails du transfert"
 
-#: src/gtkft.c:668
+#: src/gtkft.c:661
 msgid "Hide transfer details"
 msgstr "Cacher les détails du transfert"
 
 #. Pause button
-#: src/gtkft.c:710 src/stock.c:90
+#: src/gtkft.c:703 src/stock.c:90
 msgid "_Pause"
 msgstr "_Pause"
 
 #. Resume button
-#: src/gtkft.c:720
+#: src/gtkft.c:713
 msgid "_Resume"
 msgstr "_Reprise"
 
-#: src/gtkft.c:927
+#: src/gtkft.c:920
 msgid "Failed"
 msgstr "Échoué"
 
-#: src/gtkft.c:1099
-msgid "That file does not exist."
-msgstr "Ce fichier n'existe pas"
-
-#: src/gtkft.c:1108
-msgid "Cannot send a file of 0 bytes."
-msgstr "Impossible d'envoyer un fichier de taille nulle"
-
-#: src/gtkft.c:1122
-msgid "That file already exists."
-msgstr "Ce fichier existe déjà"
-
-#. Open file selector to select the public key.
-#: src/gtkft.c:1148 src/protocols/silc/buddy.c:1023
-msgid "Open..."
-msgstr "Ouvrir..."
-
-#: src/gtkft.c:1150
-msgid "Save As..."
-msgstr "Enregistrer sous..."
-
-#: src/gtkft.c:1200
-#, c-format
-msgid "%s wants to send you %s (%s)"
-msgstr "%s veut vous envoyer %s (%s)"
-
-#: src/gtkft.c:1233
-#, c-format
-msgid "Accept file transfer request from %s?"
-msgstr "Accepter la requête de transfert de %s ?"
-
-#: src/gtkft.c:1237
-#, c-format
-msgid ""
-"A file is available for download from:\n"
-"Remote host: %s\n"
-"Remote port: %d"
-msgstr ""
-"Un fichier est disponible pour le téléchargement depuis :\n"
-"Hôte distant : %s\n"
-"Port distant : %d"
-
-#: src/gtkimhtml.c:567
+#: src/gtkimhtml.c:602
 msgid "Pa_ste As Text"
 msgstr "Coller comme _texte"
 
-#: src/gtkimhtml.c:1012
+#: src/gtkimhtml.c:1047
 msgid "Hyperlink color"
 msgstr "Couleur des liens hypertextes"
 
-#: src/gtkimhtml.c:1013
+#: src/gtkimhtml.c:1048
 msgid "Color to draw hyperlinks."
 msgstr "Couleur pour afficher les liens hypertextes"
 
-#: src/gtkimhtml.c:1218
+#: src/gtkimhtml.c:1253
 msgid "_Copy E-Mail Address"
 msgstr "_Copier l'adresse électronique"
 
-#: src/gtkimhtml.c:1230
+#: src/gtkimhtml.c:1265
 msgid "_Copy Link Location"
 msgstr "_Copier l'adresse du lien"
 
-#: src/gtkimhtml.c:1240
+#: src/gtkimhtml.c:1275
 msgid "_Open Link in Browser"
 msgstr "_Ouvrir le lien"
 
-#: src/gtkimhtml.c:2761
+#: src/gtkimhtml.c:2797
 msgid ""
 "Unable to guess the image type based on the file extension supplied.  "
 "Defaulting to PNG."
@@ -3318,16 +3337,16 @@
 "Impossible de déterminer le type de l'image à partir de l'extension fournie. "
 "Choix de PNG par défaut."
 
-#: src/gtkimhtml.c:2769
+#: src/gtkimhtml.c:2805
 #, c-format
 msgid "Error saving image: %s"
 msgstr "Erreur pendant l'enregistrement de l'image : %s"
 
-#: src/gtkimhtml.c:2778
+#: src/gtkimhtml.c:2814
 msgid "Save Image"
 msgstr "Enregistrer l'image"
 
-#: src/gtkimhtml.c:2801
+#: src/gtkimhtml.c:2837
 msgid "_Save Image..."
 msgstr "Enregi_strer l'image..."
 
@@ -3371,74 +3390,74 @@
 msgid "_Insert"
 msgstr "_Insérer"
 
-#: src/gtkimhtmltoolbar.c:472
+#: src/gtkimhtmltoolbar.c:481
 #, c-format
 msgid "Failed to store image: %s\n"
 msgstr "Impossible de sauver l'image : %s\n"
 
-#: src/gtkimhtmltoolbar.c:498
+#: src/gtkimhtmltoolbar.c:507 src/gtkimhtmltoolbar.c:517
 msgid "Insert Image"
 msgstr "Insérer une image"
 
-#: src/gtkimhtmltoolbar.c:637
+#: src/gtkimhtmltoolbar.c:655
 msgid "This theme has no available smileys."
 msgstr "Ce thème n'a pas de frimousses"
 
 #. show everything
-#: src/gtkimhtmltoolbar.c:652
+#: src/gtkimhtmltoolbar.c:670
 msgid "Smile!"
 msgstr "Souriez !"
 
-#: src/gtkimhtmltoolbar.c:870
+#: src/gtkimhtmltoolbar.c:888
 msgid "Bold"
 msgstr "Gras"
 
-#: src/gtkimhtmltoolbar.c:881
+#: src/gtkimhtmltoolbar.c:899
 msgid "Italic"
 msgstr "Italique"
 
-#: src/gtkimhtmltoolbar.c:892
+#: src/gtkimhtmltoolbar.c:910
 msgid "Underline"
 msgstr "Souligné"
 
-#: src/gtkimhtmltoolbar.c:908
+#: src/gtkimhtmltoolbar.c:926
 msgid "Larger font size"
 msgstr "Police plus grande"
 
-#: src/gtkimhtmltoolbar.c:920
+#: src/gtkimhtmltoolbar.c:938
 msgid "Smaller font size"
 msgstr "Police plus petite"
 
-#: src/gtkimhtmltoolbar.c:937
+#: src/gtkimhtmltoolbar.c:955
 msgid "Font Face"
 msgstr "Police"
 
-#: src/gtkimhtmltoolbar.c:949
+#: src/gtkimhtmltoolbar.c:967
 msgid "Foreground font color"
 msgstr "Couleur du texte"
 
-#: src/gtkimhtmltoolbar.c:961
+#: src/gtkimhtmltoolbar.c:979
 msgid "Background color"
 msgstr "Couleur de fond"
 
-#: src/gtkimhtmltoolbar.c:976
+#: src/gtkimhtmltoolbar.c:994
 msgid "Insert link"
 msgstr "Insérer un lien"
 
-#: src/gtkimhtmltoolbar.c:986
+#: src/gtkimhtmltoolbar.c:1004
 msgid "Insert image"
 msgstr "Insérer une image"
 
-#: src/gtkimhtmltoolbar.c:997
+#: src/gtkimhtmltoolbar.c:1015
 msgid "Insert smiley"
 msgstr "Insérer une frimousse"
 
-#: src/gtklog.c:282
+#: src/gtklog.c:302
 msgid "Conversations with"
 msgstr "Conversations avec"
 
 #. Window **********
-#: src/gtklog.c:372 src/gtklog.c:388
+#: src/gtklog.c:392 src/gtklog.c:408
 msgid "System Log"
 msgstr "Journal du systême"
 
@@ -3488,7 +3507,7 @@
 msgstr "La commande pour le navigateur « %s » est non valide"
 
 #: src/gtknotify.c:432 src/gtknotify.c:446 src/gtknotify.c:461
-#: src/gtknotify.c:569
+#: src/gtknotify.c:579
 msgid "Unable to open URL"
 msgstr "Impossible d'ouvrir l'URL"
 
@@ -3497,175 +3516,175 @@
 msgid "Error launching \"%s\": %s"
 msgstr "Erreur au lancement de « %s » : %s"
 
-#: src/gtknotify.c:570
+#: src/gtknotify.c:580
 msgid ""
 "The 'Manual' browser command has been chosen, but no command has been set."
 msgstr ""
 "Un navigateur « Manuel » a été choisi choisi mais la ligne de commande est "
 "vide."
 
-#: src/gtkpounce.c:144
+#: src/gtkpounce.c:130
 msgid "Select a file"
 msgstr "Choisissez un fichier"
 
-#: src/gtkpounce.c:194
+#: src/gtkpounce.c:161
 msgid "Please enter a buddy to pounce."
 msgstr "Choisissez un contact pour la création d'une alerte"
 
 #. "New Buddy Pounce"
-#: src/gtkpounce.c:420 src/gtkpounce.c:923
+#: src/gtkpounce.c:387 src/gtkpounce.c:890
 msgid "New Buddy Pounce"
 msgstr "Nouvelle alerte"
 
-#: src/gtkpounce.c:420
+#: src/gtkpounce.c:387
 msgid "Edit Buddy Pounce"
 msgstr "Éditer une alerte"
 
 #. Create the "Pounce Who" frame.
-#: src/gtkpounce.c:438
+#: src/gtkpounce.c:405
 msgid "Pounce Who"
 msgstr "Contact déclencheur"
 
-#: src/gtkpounce.c:465
+#: src/gtkpounce.c:432
 msgid "_Buddy name:"
 msgstr "_Contact :"
 
 #. Create the "Pounce When" frame.
-#: src/gtkpounce.c:489
+#: src/gtkpounce.c:456
 msgid "Pounce When"
 msgstr "Événements déclencheurs"
 
-#: src/gtkpounce.c:497 src/main.c:296
+#: src/gtkpounce.c:464 src/main.c:296
 msgid "_Sign on"
 msgstr "_Connexion"
 
-#: src/gtkpounce.c:499
+#: src/gtkpounce.c:466
 msgid "Sign _off"
 msgstr "Déconne_xion"
 
-#: src/gtkpounce.c:501
+#: src/gtkpounce.c:468
 msgid "A_way"
 msgstr "_Absent"
 
-#: src/gtkpounce.c:503
+#: src/gtkpounce.c:470
 msgid "Re_turn from away"
 msgstr "_Retour d'absence"
 
-#: src/gtkpounce.c:505
+#: src/gtkpounce.c:472
 msgid "_Idle"
 msgstr "_Inactif"
 
-#: src/gtkpounce.c:507
+#: src/gtkpounce.c:474
 msgid "Retur_n from idle"
 msgstr "Re_tour d'inactivité"
 
-#: src/gtkpounce.c:509
+#: src/gtkpounce.c:476
 msgid "Buddy starts _typing"
 msgstr "Le contact commence à écr_ire"
 
-#: src/gtkpounce.c:511
+#: src/gtkpounce.c:478
 msgid "Buddy stops t_yping"
 msgstr "Le contact s'arrête d'écrir_e"
 
 #. Create the "Pounce Action" frame.
-#: src/gtkpounce.c:540
+#: src/gtkpounce.c:507
 msgid "Pounce Action"
 msgstr "Action de l'alerte"
 
-#: src/gtkpounce.c:548
+#: src/gtkpounce.c:515
 msgid "Op_en an IM window"
 msgstr "Ouvrir une _fenêtre de message"
 
-#: src/gtkpounce.c:550
+#: src/gtkpounce.c:517
 msgid "_Popup notification"
 msgstr "Ouvrir une fenêtre de _notification"
 
-#: src/gtkpounce.c:552
+#: src/gtkpounce.c:519
 msgid "Send a _message"
 msgstr "Envoyer un _message"
 
-#: src/gtkpounce.c:554
+#: src/gtkpounce.c:521
 msgid "E_xecute a command"
 msgstr "Exécuter une c_ommande"
 
-#: src/gtkpounce.c:556
+#: src/gtkpounce.c:523
 msgid "P_lay a sound"
 msgstr "_Jouer un son"
 
-#: src/gtkpounce.c:560
+#: src/gtkpounce.c:527
 msgid "B_rowse..."
 msgstr "Choisir..."
 
-#: src/gtkpounce.c:562
+#: src/gtkpounce.c:529
 msgid "Bro_wse..."
 msgstr "Choisir..."
 
-#: src/gtkpounce.c:563
+#: src/gtkpounce.c:530
 msgid "Pre_view"
 msgstr "Pré_visualisation"
 
-#: src/gtkpounce.c:646
+#: src/gtkpounce.c:613
 msgid "Sav_e this pounce after activation"
 msgstr "_Sauver cette alerte après déclenchement"
 
 #. "Remove Buddy Pounce"
-#: src/gtkpounce.c:930
+#: src/gtkpounce.c:897
 msgid "Remove Buddy Pounce"
 msgstr "Enlever une alerte"
 
-#: src/gtkpounce.c:994
+#: src/gtkpounce.c:961
 #, c-format
 msgid "%s has started typing to you (%s)"
 msgstr "%s est en train de vous écrire (%s)"
 
-#: src/gtkpounce.c:996
+#: src/gtkpounce.c:963
 #, c-format
 msgid "%s has signed on (%s)"
 msgstr "%s vient de se connecter (%s)"
 
-#: src/gtkpounce.c:998
+#: src/gtkpounce.c:965
 #, c-format
 msgid "%s has returned from being idle (%s)"
 msgstr "%s n'est plus inactif (%s)"
 
-#: src/gtkpounce.c:1000
+#: src/gtkpounce.c:967
 #, c-format
 msgid "%s has returned from being away (%s)"
 msgstr "%s n'est plus absent (%s)"
 
-#: src/gtkpounce.c:1002
+#: src/gtkpounce.c:969
 #, c-format
 msgid "%s has stopped typing to you (%s)"
 msgstr "%s a arrêté de vous écrire (%s)"
 
-#: src/gtkpounce.c:1004
+#: src/gtkpounce.c:971
 #, c-format
 msgid "%s has signed off (%s)"
 msgstr "%s vient de se déconnecter (%s)"
 
-#: src/gtkpounce.c:1006
+#: src/gtkpounce.c:973
 #, c-format
 msgid "%s has become idle (%s)"
 msgstr "%s est devenu inactif (%s)"
 
-#: src/gtkpounce.c:1008
+#: src/gtkpounce.c:975
 #, c-format
 msgid "%s has gone away. (%s)"
 msgstr "%s est passé absent (%s)"
 
-#: src/gtkpounce.c:1009
+#: src/gtkpounce.c:976
 msgid "Unknown pounce event. Please report this!"
 msgstr "Événement d'alerte inconnu. Veuillez reporter cette erreur."
 
-#: src/gtkprefs.c:401
+#: src/gtkprefs.c:446
 msgid "Interface Options"
 msgstr "Interface"
 
-#: src/gtkprefs.c:403
+#: src/gtkprefs.c:448
 msgid "D_isplay remote nicknames if no alias is set"
 msgstr "Aff_icher le pseudonyme distant si aucun alias n'a été donné"
 
-#: src/gtkprefs.c:627
+#: src/gtkprefs.c:675
 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."
@@ -3674,52 +3693,52 @@
 "dessous.  De nouveau thèmes peuvent être installés en les faisant glisser "
 "dans la liste des thèmes."
 
-#: src/gtkprefs.c:667
+#: src/gtkprefs.c:715
 msgid "Icon"
 msgstr "Icône"
 
-#: src/gtkprefs.c:674 src/gtkprefs.c:2199 src/protocols/jabber/buddy.c:265
+#: src/gtkprefs.c:722 src/gtkprefs.c:2212 src/protocols/jabber/buddy.c:264
 #: src/protocols/jabber/buddy.c:748 src/protocols/jabber/chat.c:701
 msgid "Description"
 msgstr "Description"
 
-#: src/gtkprefs.c:770
+#: src/gtkprefs.c:818
 msgid "Display"
 msgstr "Affichage"
 
-#: src/gtkprefs.c:771
+#: src/gtkprefs.c:819
 msgid "Show _timestamp on messages"
 msgstr "Afficher l'_heure des messages"
 
-#: src/gtkprefs.c:774
+#: src/gtkprefs.c:822
 msgid "_Highlight misspelled words"
 msgstr "Surligner les mots mal _orthographiés"
 
-#: src/gtkprefs.c:779
+#: src/gtkprefs.c:827
 msgid "Ignore c_olors"
 msgstr "Ignorer les _couleurs"
 
-#: src/gtkprefs.c:781
+#: src/gtkprefs.c:829
 msgid "Ignore font _faces"
 msgstr "Ignorer les _polices"
 
-#: src/gtkprefs.c:783
+#: src/gtkprefs.c:831
 msgid "Ignore font si_zes"
 msgstr "Ignorer la _taille des polices"
 
-#: src/gtkprefs.c:786
+#: src/gtkprefs.c:834
 msgid "_Ignore formatting on incoming messages"
 msgstr "Ignorer le _style des messages reçus"
 
-#: src/gtkprefs.c:790
+#: src/gtkprefs.c:838
 msgid "Default Formatting"
 msgstr "Style par défaut"
 
-#: src/gtkprefs.c:792
+#: src/gtkprefs.c:840
 msgid "_Send default formatting with outgoing messages"
 msgstr "Ajouter le style par _défaut aux messages envoyés"
 
-#: src/gtkprefs.c:824
+#: src/gtkprefs.c:872
 msgid ""
 "This is how your outgoing message text will appear when you use protocols "
 "that support formatting. :)"
@@ -3727,265 +3746,269 @@
 "Le texte des messages envoyés apparaîtra comme ceci avec les protocoles "
 "supportant l'ajout du style. :)"
 
-#: src/gtkprefs.c:827
+#: src/gtkprefs.c:875
 msgid "_Clear Formatting"
 msgstr "_Effacer le style"
 
-#: src/gtkprefs.c:864
+#: src/gtkprefs.c:912
 msgid "Send Message"
 msgstr "Envoyer un message"
 
-#: src/gtkprefs.c:865
+#: src/gtkprefs.c:913
 msgid "Enter _sends message"
 msgstr "La touche _Entrée envoie les messages"
 
-#: src/gtkprefs.c:867
-msgid "C_ontrol-Enter sends message"
-msgstr "C_trl-Entrée envoie les messages"
-
-#: src/gtkprefs.c:870
-msgid "Window Closing"
-msgstr "Fermeture des fenêtres"
-
-#: src/gtkprefs.c:871
-msgid "_Escape closes window"
-msgstr "E_chap ferme la fenêtre"
-
-#: src/gtkprefs.c:874
-msgid "Insertions"
-msgstr "Insertions"
-
-#: src/gtkprefs.c:875
-msgid "Control-{B/I/U} changes _formatting"
-msgstr "Ctrl-{B/I/U/S} change le st_yle"
-
-#: src/gtkprefs.c:877
-msgid "Control-(number) _inserts smileys"
-msgstr "Ctrl-(nombre) insère un _smiley"
-
-#: src/gtkprefs.c:893
-msgid "Buddy List Sorting"
-msgstr "Tri de la liste de contacts"
-
-#: src/gtkprefs.c:902
-msgid "_Sorting:"
-msgstr "_Tri :"
-
-#: src/gtkprefs.c:908 src/gtkprefs.c:961
-msgid "Show _buttons as:"
-msgstr "Afficher les _boutons en tant que :"
-
-#: src/gtkprefs.c:910 src/gtkprefs.c:963
-msgid "Pictures"
-msgstr "Images"
-
-#: src/gtkprefs.c:911 src/gtkprefs.c:964
-msgid "Text"
-msgstr "Texte"
-
-#: src/gtkprefs.c:912 src/gtkprefs.c:965
-msgid "Pictures and text"
-msgstr "Images et texte"
-
 #: src/gtkprefs.c:915
+msgid "C_ontrol-Enter sends message"
+msgstr "C_trl-Entrée envoie les messages"
+
+#: src/gtkprefs.c:918
+msgid "Window Closing"
+msgstr "Fermeture des fenêtres"
+
+#: src/gtkprefs.c:919
+msgid "_Escape closes window"
+msgstr "E_chap ferme la fenêtre"
+
+#: src/gtkprefs.c:922
+msgid "Insertions"
+msgstr "Insertions"
+
+#: src/gtkprefs.c:923
+msgid "Control-{B/I/U} changes _formatting"
+msgstr "Ctrl-{B/I/U/S} change le st_yle"
+
+#: src/gtkprefs.c:925
+msgid "Control-(number) _inserts smileys"
+msgstr "Ctrl-(nombre) insère un _smiley"
+
+#: src/gtkprefs.c:941
+msgid "Buddy List Sorting"
+msgstr "Tri de la liste de contacts"
+
+#: src/gtkprefs.c:950
+msgid "_Sorting:"
+msgstr "_Tri :"
+
+#: src/gtkprefs.c:956 src/gtkprefs.c:1009
+msgid "Show _buttons as:"
+msgstr "Afficher les _boutons en tant que :"
+
+#: src/gtkprefs.c:958 src/gtkprefs.c:1011
+msgid "Pictures"
+msgstr "Images"
+
+#: src/gtkprefs.c:959 src/gtkprefs.c:1012
+msgid "Text"
+msgstr "Texte"
+
+#: src/gtkprefs.c:960 src/gtkprefs.c:1013
+msgid "Pictures and text"
+msgstr "Images et texte"
+
+#: src/gtkprefs.c:963
 msgid "_Raise window on events"
 msgstr "Fenêtre en avant-plan sur _réception d'un message"
 
-#: src/gtkprefs.c:918
+#: src/gtkprefs.c:966
 msgid "Buddy Display"
 msgstr "Affichage des contacts"
 
-#: src/gtkprefs.c:919 src/gtkprefs.c:979
+#: src/gtkprefs.c:967 src/gtkprefs.c:1027
 msgid "Show buddy _icons"
 msgstr "Afficher les _icônes des contacts"
 
-#: src/gtkprefs.c:921
+#: src/gtkprefs.c:969
 msgid "Show _warning levels"
 msgstr "Afficher le niveau d'a_vertissement"
 
-#: src/gtkprefs.c:923
+#: src/gtkprefs.c:971
 msgid "Show idle _times"
 msgstr "Afficher les _temps d'inactivité"
 
-#: src/gtkprefs.c:925
+#: src/gtkprefs.c:973
 msgid "Dim i_dle buddies"
 msgstr "_Griser les contacts inactifs"
 
-#: src/gtkprefs.c:927
+#: src/gtkprefs.c:975
 msgid "_Automatically expand contacts"
 msgstr "Étendre les contacts multiples _automatiquement"
 
-#: src/gtkprefs.c:972
+#: src/gtkprefs.c:1020
 msgid "Enable \"_slash\" commands"
 msgstr "Activer les commandes « _barre » (/commande)"
 
-#: src/gtkprefs.c:975
+#: src/gtkprefs.c:1023
 msgid "Show _formatting toolbar"
 msgstr "Afficher la barre de _style"
 
-#: src/gtkprefs.c:977
+#: src/gtkprefs.c:1025
 msgid "Show _aliases in tabs/titles"
 msgstr "Montrer les _alias dans les onglets et titre de fenêtres"
 
-#: src/gtkprefs.c:981
+#: src/gtkprefs.c:1029
 msgid "Enable buddy ic_on animation"
-msgstr "Activer l'_animation de l'icône des contacts"
-
-#: src/gtkprefs.c:983
+msgstr "Activer l'anima_tion de l'icône des contacts"
+
+#: src/gtkprefs.c:1031
 msgid "_Notify buddies that you are typing to them"
 msgstr "_Notifier les contacts que vous êtes en train de leur écrire"
 
-#: src/gtkprefs.c:985
+#: src/gtkprefs.c:1033
 msgid "_Raise IM window on events"
-msgstr "Fenêtre de messages en avant-plan sur _réception d'un événement"
-
-#: src/gtkprefs.c:988
+msgstr "Fenêtre de _message en avant-plan sur réception d'un événement"
+
+#: src/gtkprefs.c:1036
 msgid "Raise chat _window on events"
-msgstr "Fenêtre de discussions en avant-plan sur _réception d'un événement"
-
-#: src/gtkprefs.c:990
+msgstr "Fenêtre de _discussion en avant-plan sur réception d'un événement"
+
+#: src/gtkprefs.c:1038
 msgid "Use _multi-colored screen names in chats"
-msgstr "Utiliser des noms _multicolores dans les discussions"
+msgstr "Utiliser des noms multi_colores dans les discussions"
 
 #. All the tab options!
-#: src/gtkprefs.c:994
+#: src/gtkprefs.c:1042
 msgid "Tab Options"
 msgstr "Options des onglets"
 
-#: src/gtkprefs.c:996
+#: src/gtkprefs.c:1044
 msgid "Show IMs and chats in _tabbed windows"
-msgstr "Afficher les messages et les discussions dans des fenêtres à onglets"
-
-#: src/gtkprefs.c:1011
+msgstr "Afficher les messages et les discussions dans des fenêtres à _onglets"
+
+#: src/gtkprefs.c:1059
 msgid "Show _close button on tabs"
 msgstr "Afficher le bouton de fermeture (_X) sur les onglets"
 
-#: src/gtkprefs.c:1014
+#: src/gtkprefs.c:1062
 msgid "Tab p_lacement:"
-msgstr "Position des _onglets :"
-
-#: src/gtkprefs.c:1016
+msgstr "_Position des onglets :"
+
+#: src/gtkprefs.c:1064
 msgid "Top"
 msgstr "Haut"
 
-#: src/gtkprefs.c:1017
+#: src/gtkprefs.c:1065
 msgid "Bottom"
 msgstr "Bas"
 
-#: src/gtkprefs.c:1018
+#: src/gtkprefs.c:1066
 msgid "Left"
 msgstr "Gauche"
 
-#: src/gtkprefs.c:1019
+#: src/gtkprefs.c:1067
 msgid "Right"
 msgstr "Droite"
 
-#: src/gtkprefs.c:1025
+#: src/gtkprefs.c:1073
 msgid "New conversation _placement:"
 msgstr "_Emplacement des nouvelles conversations :"
 
-#: src/gtkprefs.c:1076 src/protocols/oscar/oscar.c:592
-#: src/protocols/oscar/oscar.c:4837
+#: src/gtkprefs.c:1124 src/protocols/oscar/oscar.c:596
+#: src/protocols/oscar/oscar.c:4853
 msgid "IP Address"
 msgstr "Adresse IP"
 
-#: src/gtkprefs.c:1078
+#: src/gtkprefs.c:1126
 msgid "_Autodetect IP Address"
 msgstr "_Détection auto de l'adresse IP"
 
-#: src/gtkprefs.c:1087
-msgid "Public _IP:"
-msgstr "Adresse _IP publique :"
-
-#: src/gtkprefs.c:1111
-msgid "Ports"
-msgstr "Ports"
-
-#: src/gtkprefs.c:1114
-msgid "_Manually specify range of ports to listen on"
-msgstr "Spécifier _manuellement la plage de ports à écouter"
-
-#: src/gtkprefs.c:1117
-msgid "_Start Port:"
-msgstr "_Premier port : "
-
-#: src/gtkprefs.c:1124
-msgid "_End Port:"
-msgstr "_Dernier port :"
-
-#: src/gtkprefs.c:1131
-msgid "Proxy Server"
-msgstr "Serveur mandataire"
-
 #: src/gtkprefs.c:1135
+msgid "Public _IP:"
+msgstr "Adresse _IP publique :"
+
+#: src/gtkprefs.c:1159
+msgid "Ports"
+msgstr "Ports"
+
+#: src/gtkprefs.c:1162
+msgid "_Manually specify range of ports to listen on"
+msgstr "Spécifier _manuellement la plage de ports à écouter"
+
+#: src/gtkprefs.c:1165
+msgid "_Start Port:"
+msgstr "_Premier port : "
+
+#: src/gtkprefs.c:1172
+msgid "_End Port:"
+msgstr "_Dernier port :"
+
+#: src/gtkprefs.c:1179
+msgid "Proxy Server"
+msgstr "Serveur mandataire"
+
+#: src/gtkprefs.c:1183
 msgid "No proxy"
 msgstr "Aucun"
 
-#: src/gtkprefs.c:1197
+#: src/gtkprefs.c:1245
 msgid "_User:"
 msgstr "_Utilisateur :"
 
-#: src/gtkprefs.c:1253
-msgid "Opera"
-msgstr "Opera"
-
-#: src/gtkprefs.c:1254
-msgid "Netscape"
-msgstr "Netscape"
-
-#: src/gtkprefs.c:1255
-msgid "Mozilla"
-msgstr "Mozilla"
-
-#: src/gtkprefs.c:1256
-msgid "Konqueror"
-msgstr "Konqueror"
-
-#: src/gtkprefs.c:1257
-msgid "Galeon"
-msgstr "Galeon"
-
-#: src/gtkprefs.c:1258
+#: src/gtkprefs.c:1301
+msgid "Epiphany"
+msgstr "Epiphany"
+
+#: src/gtkprefs.c:1302
 msgid "Firebird"
 msgstr "Firebird"
 
-#: src/gtkprefs.c:1259
+#: src/gtkprefs.c:1303
 msgid "Firefox"
 msgstr "Firefox"
 
-#: src/gtkprefs.c:1260
+#: src/gtkprefs.c:1304
+msgid "Galeon"
+msgstr "Galeon"
+
+#: src/gtkprefs.c:1305
 msgid "Gnome Default"
 msgstr "Navigateur de Gnome"
 
-#: src/gtkprefs.c:1269
+#: src/gtkprefs.c:1306
+msgid "Konqueror"
+msgstr "Konqueror"
+
+#: src/gtkprefs.c:1307
+msgid "Mozilla"
+msgstr "Mozilla"
+
+#: src/gtkprefs.c:1308
+msgid "Netscape"
+msgstr "Netscape"
+
+#: src/gtkprefs.c:1309
+msgid "Opera"
+msgstr "Opera"
+
+#: src/gtkprefs.c:1318
 msgid "Manual"
 msgstr "Manuel"
 
-#: src/gtkprefs.c:1320
+#: src/gtkprefs.c:1369
 msgid "Browser Selection"
 msgstr "Choix du navigateur"
 
-#: src/gtkprefs.c:1324
+#: src/gtkprefs.c:1373
 msgid "_Browser:"
 msgstr "_Navigateur :"
 
-#: src/gtkprefs.c:1331
+#: src/gtkprefs.c:1380
 msgid "_Open link in:"
 msgstr "_Ouvrir le lien :"
 
-#: src/gtkprefs.c:1333
+#: src/gtkprefs.c:1382
 msgid "Browser default"
 msgstr "Laisser le navigateur choisir"
 
-#: src/gtkprefs.c:1334
+#: src/gtkprefs.c:1383
 msgid "Existing window"
 msgstr "Dans une fenêtre ouverte"
 
-#: src/gtkprefs.c:1336
+#: src/gtkprefs.c:1385
 msgid "New tab"
 msgstr "Dans un nouvel onglet"
 
-#: src/gtkprefs.c:1350
+#: src/gtkprefs.c:1399
 #, c-format
 msgid ""
 "_Manual:\n"
@@ -3994,83 +4017,83 @@
 "_Manuel :\n"
 "(%s pour l'URL)"
 
-#: src/gtkprefs.c:1387
+#: src/gtkprefs.c:1436
 msgid "Message Logs"
 msgstr "Archives de messages"
 
-#: src/gtkprefs.c:1390
+#: src/gtkprefs.c:1439
 msgid "Log _Format:"
 msgstr "_Format des archive :"
 
-#: src/gtkprefs.c:1393
+#: src/gtkprefs.c:1442
 msgid "_Log all instant messages"
 msgstr "Archiver tous les _messages"
 
-#: src/gtkprefs.c:1395
+#: src/gtkprefs.c:1444
 msgid "Log all c_hats"
 msgstr "Archiver toutes les _discussions"
 
-#: src/gtkprefs.c:1398
+#: src/gtkprefs.c:1447
 msgid "System Logs"
 msgstr "Journaux du systême"
 
-#: src/gtkprefs.c:1400
+#: src/gtkprefs.c:1449
 msgid "_Enable system log"
 msgstr "Activer l'archivage du _journal systême"
 
-#: src/gtkprefs.c:1403
+#: src/gtkprefs.c:1452
 msgid "Log when buddies _sign on/sign off"
 msgstr "Archiver à la _connexion et déconnexion des contacts"
 
-#: src/gtkprefs.c:1409
+#: src/gtkprefs.c:1458
 msgid "Log when buddies become _idle/un-idle"
 msgstr "Archiver le début d'_inactivité des contacts"
 
-#: src/gtkprefs.c:1415
+#: src/gtkprefs.c:1464
 msgid "Log when buddies go away/come _back"
 msgstr "Archiver les _absences et retours des contacts"
 
-#: src/gtkprefs.c:1421
+#: src/gtkprefs.c:1470
 msgid "Log your _own signons/idleness/awayness"
 msgstr "Archiver ses _propres connexions, inactivités et absences"
 
-#: src/gtkprefs.c:1559
+#: src/gtkprefs.c:1596
 msgid "Sound Selection"
 msgstr "Charger un son"
 
-#: src/gtkprefs.c:1634
+#: src/gtkprefs.c:1647
 msgid "Sound Options"
 msgstr "Options sonores"
 
-#: src/gtkprefs.c:1635
+#: src/gtkprefs.c:1648
 msgid "Sounds when conversation has _focus"
 msgstr "Jouer les sons même quand la _fenêtre est active"
 
-#: src/gtkprefs.c:1637
+#: src/gtkprefs.c:1650
 msgid "_Sounds while away"
 msgstr "Jouer les sons même lorsque vous êtes _absent"
 
-#: src/gtkprefs.c:1641
+#: src/gtkprefs.c:1654
 msgid "Sound Method"
 msgstr "Sortie sonore"
 
-#: src/gtkprefs.c:1642
+#: src/gtkprefs.c:1655
 msgid "_Method:"
 msgstr "_Méthode :"
 
-#: src/gtkprefs.c:1644
+#: src/gtkprefs.c:1657
 msgid "Console beep"
 msgstr "Bip de console"
 
-#: src/gtkprefs.c:1646
+#: src/gtkprefs.c:1659
 msgid "Automatic"
 msgstr "Automatique"
 
-#: src/gtkprefs.c:1653
+#: src/gtkprefs.c:1666
 msgid "Command"
 msgstr "Commande"
 
-#: src/gtkprefs.c:1661
+#: src/gtkprefs.c:1674
 #, c-format
 msgid ""
 "Sound c_ommand:\n"
@@ -4079,86 +4102,86 @@
 "_Commande à utiliser :\n"
 "(%s pour le nom de fichier)"
 
-#: src/gtkprefs.c:1688
+#: src/gtkprefs.c:1701
 msgid "Sound Events"
 msgstr "Événements sonores"
 
-#: src/gtkprefs.c:1739
+#: src/gtkprefs.c:1752
 msgid "Play"
 msgstr "Jouer"
 
-#: src/gtkprefs.c:1746
+#: src/gtkprefs.c:1759
 msgid "Event"
 msgstr "Événement"
 
-#: src/gtkprefs.c:1765
+#: src/gtkprefs.c:1778
 msgid "Test"
 msgstr "Tester"
 
-#: src/gtkprefs.c:1769
+#: src/gtkprefs.c:1782
 msgid "Reset"
 msgstr "Remise à zéro"
 
-#: src/gtkprefs.c:1773
+#: src/gtkprefs.c:1786
 msgid "Choose..."
 msgstr "Choisir..."
 
-#: src/gtkprefs.c:1797
+#: src/gtkprefs.c:1810
 msgid "_Queue new messages when away"
 msgstr "Mise en _attente des messages pendant l'absence"
 
-#: src/gtkprefs.c:1800
+#: src/gtkprefs.c:1813
 msgid "Auto-response"
 msgstr "Réponse automatique"
 
-#: src/gtkprefs.c:1801
+#: src/gtkprefs.c:1814
 msgid "_Send auto-response"
 msgstr "Envoyer une réponse automatique"
 
-#: src/gtkprefs.c:1803
+#: src/gtkprefs.c:1816
 msgid "_Only send auto-response when idle"
 msgstr "Envoyer la réponse automatique _uniquement lorsque inactif"
 
-#: src/gtkprefs.c:1806 src/protocols/msn/msn.c:1156
-#: src/protocols/msn/state.c:32 src/protocols/novell/novell.c:2724
-#: src/protocols/oscar/oscar.c:3994 src/protocols/yahoo/yahoo.c:2488
-#: src/protocols/yahoo/yahoo_profile.c:653
+#: src/gtkprefs.c:1819 src/protocols/msn/msn.c:1179
+#: src/protocols/msn/state.c:32 src/protocols/novell/novell.c:2730
+#: src/protocols/oscar/oscar.c:4010 src/protocols/yahoo/yahoo.c:2511
+#: src/protocols/yahoo/yahoo_profile.c:664
 msgid "Idle"
 msgstr "Inactif"
 
-#: src/gtkprefs.c:1807
+#: src/gtkprefs.c:1820
 msgid "Idle _time reporting:"
 msgstr "_Temps d'inactivité affiché :"
 
-#: src/gtkprefs.c:1810
+#: src/gtkprefs.c:1823
 msgid "Gaim usage"
 msgstr "Utilisation de Gaim"
 
-#: src/gtkprefs.c:1813
+#: src/gtkprefs.c:1826
 msgid "X usage"
 msgstr "Utilisation de X"
 
-#: src/gtkprefs.c:1815
+#: src/gtkprefs.c:1828
 msgid "Windows usage"
 msgstr "Utilisation de Windows"
 
-#: src/gtkprefs.c:1823
+#: src/gtkprefs.c:1836
 msgid "Auto-away"
 msgstr "Absence automatique"
 
-#: src/gtkprefs.c:1824
+#: src/gtkprefs.c:1837
 msgid "Set away _when idle"
 msgstr "Se mettre absent _lorsque inactif"
 
-#: src/gtkprefs.c:1828
+#: src/gtkprefs.c:1841
 msgid "_Minutes before setting away:"
 msgstr "_Minutes avant de passer absent :"
 
-#: src/gtkprefs.c:1836
+#: src/gtkprefs.c:1849
 msgid "Away m_essage:"
 msgstr "Me_ssages d'absence :"
 
-#: src/gtkprefs.c:1917
+#: src/gtkprefs.c:1930
 #, c-format
 msgid ""
 "<span size=\"larger\">%s %s</span>\n"
@@ -4173,7 +4196,7 @@
 "<span weight=\"bold\">Page web : </span>\t%s\n"
 "<span weight=\"bold\">Fichier : </span>\t%s"
 
-#: src/gtkprefs.c:1922
+#: src/gtkprefs.c:1935
 #, c-format
 msgid ""
 "<span size=\"larger\">%s %s</span>\n"
@@ -4188,64 +4211,64 @@
 "<span weight=\"bold\">URL : </span> %s\n"
 "<span weight=\"bold\">Fichier : </span> %s"
 
-#: src/gtkprefs.c:2155
+#: src/gtkprefs.c:2168
 msgid "Load"
 msgstr "Charger"
 
-#: src/gtkprefs.c:2169
+#: src/gtkprefs.c:2182
 msgid "Summary"
 msgstr "Résumé"
 
-#: src/gtkprefs.c:2217
+#: src/gtkprefs.c:2230
 msgid "Details"
 msgstr "Détails"
 
-#: src/gtkprefs.c:2362
+#: src/gtkprefs.c:2375
 msgid "_Edit"
 msgstr "_Editer"
 
-#: src/gtkprefs.c:2398
+#: src/gtkprefs.c:2411
 msgid "Interface"
 msgstr "Interface"
 
-#: src/gtkprefs.c:2401
+#: src/gtkprefs.c:2414
 msgid "Message Text"
 msgstr "Texte du message"
 
-#: src/gtkprefs.c:2402
+#: src/gtkprefs.c:2415
 msgid "Shortcuts"
 msgstr "Raccourcis"
 
-#: src/gtkprefs.c:2403
+#: src/gtkprefs.c:2416
 msgid "Smiley Themes"
 msgstr "Thèmes des frimousses"
 
-#: src/gtkprefs.c:2404
+#: src/gtkprefs.c:2417
 msgid "Sounds"
 msgstr "Sons"
 
-#: src/gtkprefs.c:2405
+#: src/gtkprefs.c:2418
 msgid "Network"
 msgstr "Réseau"
 
 #. We use the registered default browser in windows
-#: src/gtkprefs.c:2408
+#: src/gtkprefs.c:2421
 msgid "Browser"
 msgstr "Navigateur"
 
-#: src/gtkprefs.c:2410
+#: src/gtkprefs.c:2423
 msgid "Logging"
 msgstr "Enregistrement"
 
-#: src/gtkprefs.c:2411
+#: src/gtkprefs.c:2424
 msgid "Away / Idle"
 msgstr "Absence/inactivité"
 
-#: src/gtkprefs.c:2412
+#: src/gtkprefs.c:2425
 msgid "Away Messages"
 msgstr "Messages d'absence"
 
-#: src/gtkprefs.c:2415
+#: src/gtkprefs.c:2428
 msgid "Plugins"
 msgstr "Plugins"
 
@@ -4269,7 +4292,7 @@
 msgid "Block only the users below"
 msgstr "Bloquer les utilisateurs ci-dessous"
 
-#: src/gtkprivacy.c:385 src/protocols/jabber/jabber.c:1448
+#: src/gtkprivacy.c:385 src/protocols/jabber/jabber.c:1449
 msgid "Privacy"
 msgstr "Filtres"
 
@@ -4333,27 +4356,43 @@
 #. *
 #. * A wrapper for gaim_request_action() that uses Yes and No buttons.
 #.
-#: src/gtkrequest.c:233 src/protocols/gg/gg.c:867
-#: src/protocols/novell/novell.c:1844 src/protocols/silc/buddy.c:307
-#: src/protocols/silc/pk.c:116 src/request.h:1233
+#: src/gtkrequest.c:240 src/protocols/gg/gg.c:949
+#: src/protocols/novell/novell.c:1845 src/protocols/silc/buddy.c:307
+#: src/protocols/silc/pk.c:116 src/request.h:1234
 msgid "Yes"
 msgstr "Oui"
 
-#: src/gtkrequest.c:234 src/protocols/gg/gg.c:867
-#: src/protocols/novell/novell.c:1845 src/protocols/silc/buddy.c:308
-#: src/protocols/silc/pk.c:117 src/request.h:1233
+#: src/gtkrequest.c:241 src/protocols/gg/gg.c:949
+#: src/protocols/novell/novell.c:1846 src/protocols/silc/buddy.c:308
+#: src/protocols/silc/pk.c:117 src/request.h:1234
 msgid "No"
 msgstr "Non"
 
-#: src/gtkrequest.c:237
+#: src/gtkrequest.c:244
 msgid "Apply"
 msgstr "Appliquer"
 
-#: src/gtkrequest.c:238 src/protocols/msn/msn.c:316
-#: src/protocols/silc/util.c:311
+#: src/gtkrequest.c:245 src/protocols/msn/msn.c:314
+#: src/protocols/silc/util.c:332
 msgid "Close"
 msgstr "Fermer"
 
+#: src/gtkrequest.c:1391
+msgid "That file already exists"
+msgstr "Ce fichier existe déjà"
+
+#: src/gtkrequest.c:1392
+msgid "Would you like to overwrite it?"
+msgstr "Voulez-vous l'écraser ?"
+
+#: src/gtkrequest.c:1430 src/gtkrequest.c:1451
+msgid "Save File..."
+msgstr "Sauver le fichier..."
+
+#: src/gtkrequest.c:1431 src/gtkrequest.c:1452
+msgid "Open File..."
+msgstr "Ouvrir un fichier..."
+
 #: src/gtkroomlist.c:330
 msgid "Room List"
 msgstr "Liste des salons de discussion"
@@ -4425,24 +4464,16 @@
 "Impossible de jouer les sons. La commande de méthode de sons n'a pas pu être "
 "lancée : %s"
 
-#: src/gtkutils.c:149
-msgid "Can't save icon file to disk."
-msgstr "Impossible de sauver cette icône sur le disque"
-
-#: src/gtkutils.c:184
-msgid "Save Icon"
-msgstr "Enregistrer l'icône"
-
 #: src/log.c:106
 msgid "<b><font color=\"red\">The logger has no read function</font></b>"
 msgstr ""
 "<b><font color\"=red\">L'archiveur n'a pas de fonction de lecture</font></b>"
 
-#: src/log.c:486
+#: src/log.c:489
 msgid "XML"
 msgstr "XML"
 
-#: src/log.c:571
+#: src/log.c:574
 #, c-format
 msgid ""
 "<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
@@ -4451,7 +4482,7 @@
 "<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;Réponse "
 "automatique&gt;&nbsp;:</b></font> %s<br/>\n"
 
-#: src/log.c:573
+#: src/log.c:576
 #, c-format
 msgid ""
 "<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
@@ -4460,27 +4491,27 @@
 "<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;Réponse "
 "automatique&gt;&nbsp;:</b></font> %s<br/>\n"
 
-#: src/log.c:624 src/log.c:811
+#: src/log.c:627 src/log.c:814
 msgid "<font color=\"red\"><b>Unable to find log path!</b></font>"
 msgstr ""
 "<font color=\"red\"><b>Impossible de trouver le dossier des archives</b></"
 "font>"
 
-#: src/log.c:634 src/log.c:823
+#: src/log.c:637 src/log.c:826
 #, c-format
 msgid "<font color=\"red\"><b>Could not read file: %s</b></font>"
 msgstr "<font color=\"red\"><b>Impossible de lire le fichier %s</b></font>"
 
-#: src/log.c:671
+#: src/log.c:674
 msgid "HTML"
 msgstr "HTML"
 
-#: src/log.c:756
+#: src/log.c:759
 #, c-format
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr "(%s) %s <Réponse automatique> : %s\n"
 
-#: src/log.c:856
+#: src/log.c:859
 msgid "Plain text"
 msgstr "Texte en clair"
 
@@ -4572,12 +4603,12 @@
 msgstr "Défaut peu original"
 
 #: src/protocols/gg/gg.c:49 src/protocols/jabber/jutil.c:44
-#: src/protocols/msn/msn.c:465 src/protocols/msn/state.c:29
+#: src/protocols/msn/msn.c:462 src/protocols/msn/state.c:29
 #: src/protocols/msn/state.c:30 src/protocols/msn/state.c:37
-#: src/protocols/msn/state.c:38 src/protocols/novell/novell.c:2715
-#: src/protocols/novell/novell.c:2834 src/protocols/novell/novell.c:2885
-#: src/protocols/oscar/oscar.c:611 src/protocols/yahoo/yahoo.c:2844
-#: src/protocols/yahoo/yahoo.c:2959
+#: src/protocols/msn/state.c:38 src/protocols/novell/novell.c:2721
+#: src/protocols/novell/novell.c:2840 src/protocols/novell/novell.c:2891
+#: src/protocols/oscar/oscar.c:616 src/protocols/yahoo/yahoo.c:2851
+#: src/protocols/yahoo/yahoo.c:2967
 msgid "Available"
 msgstr "Disponible"
 
@@ -4589,12 +4620,12 @@
 msgid "Away for friends only"
 msgstr "Absent pour les amis seulement"
 
-#: src/protocols/gg/gg.c:53 src/protocols/jabber/jabber.c:963
-#: src/protocols/jabber/presence.c:126 src/protocols/oscar/oscar.c:532
-#: src/protocols/oscar/oscar.c:5378 src/protocols/oscar/oscar.c:5456
-#: src/protocols/oscar/oscar.c:5480 src/protocols/oscar/oscar.c:6667
-#: src/protocols/oscar/oscar.c:6672 src/protocols/yahoo/yahoo.c:2486
-#: src/protocols/yahoo/yahoo.c:2864 src/protocols/yahoo/yahoo.c:2969
+#: src/protocols/gg/gg.c:53 src/protocols/jabber/jabber.c:964
+#: src/protocols/jabber/presence.c:126 src/protocols/oscar/oscar.c:536
+#: src/protocols/oscar/oscar.c:5394 src/protocols/oscar/oscar.c:5472
+#: src/protocols/oscar/oscar.c:5496 src/protocols/oscar/oscar.c:6684
+#: src/protocols/oscar/oscar.c:6689 src/protocols/yahoo/yahoo.c:2509
+#: src/protocols/yahoo/yahoo.c:2871 src/protocols/yahoo/yahoo.c:2979
 msgid "Invisible"
 msgstr "Invisible"
 
@@ -4610,14 +4641,14 @@
 msgid "Unable to resolve hostname."
 msgstr "Impossible de résoudre le nom de l'hôte"
 
-#: src/protocols/gg/gg.c:139 src/protocols/novell/novell.c:1664
+#: src/protocols/gg/gg.c:139 src/protocols/novell/novell.c:1665
 msgid "Unable to connect to server."
 msgstr "Impossible de se connecter au server"
 
 #: src/protocols/gg/gg.c:142 src/protocols/jabber/auth.c:130
 #: src/protocols/jabber/auth.c:204 src/protocols/jabber/auth.c:354
 #: src/protocols/jabber/auth.c:452 src/protocols/jabber/auth.c:464
-#: src/protocols/jabber/jabber.c:105
+#: src/protocols/jabber/jabber.c:106
 msgid "Invalid response from server."
 msgstr "Réponse non valide du serveur"
 
@@ -4637,175 +4668,177 @@
 msgid "Unknown Error Code."
 msgstr "Code d'erreur inconnu"
 
-#: src/protocols/gg/gg.c:253
+#: src/protocols/gg/gg.c:242 src/protocols/oscar/oscar.c:3819
+#, c-format
+msgid "<B>UIN:</B> %s<BR><B>Status:</B> %s<HR>%s"
+msgstr "<B>UIN :</B> %s<BR><B>Status :</B> %s<HR>%s"
+
+#. res[0] == username
+#: src/protocols/gg/gg.c:243 src/protocols/gg/gg.c:1011
+#: src/protocols/napster/napster.c:393 src/protocols/oscar/oscar.c:3823
+#: src/protocols/oscar/oscar.c:4039 src/protocols/silc/ops.c:1067
+#: src/protocols/silc/ops.c:1128 src/protocols/toc/toc.c:468
+#: src/protocols/zephyr/zephyr.c:635
+msgid "Buddy Information"
+msgstr "Informations sur le contact"
+
+#: src/protocols/gg/gg.c:293
 #, c-format
 msgid "Status: %s"
 msgstr "Status : %s"
 
-#: src/protocols/gg/gg.c:406
+#: src/protocols/gg/gg.c:446
 msgid "Could not connect"
 msgstr "Impossible de se connecter"
 
-#: src/protocols/gg/gg.c:413
+#: src/protocols/gg/gg.c:453
 msgid "Unable to read socket"
 msgstr "Impossible de lire le socket"
 
 #. we didn't successfully connect. tdt->toc_fd is valid here
-#: src/protocols/gg/gg.c:600 src/protocols/icq/gaim_icq.c:344
+#: src/protocols/gg/gg.c:674 src/protocols/icq/gaim_icq.c:344
 #: src/protocols/napster/napster.c:475 src/protocols/napster/napster.c:506
-#: src/protocols/toc/toc.c:170 src/protocols/yahoo/yahoo.c:2124
-#: src/protocols/yahoo/yahoo.c:2155 src/protocols/yahoo/yahoo.c:2218
+#: src/protocols/toc/toc.c:170 src/protocols/yahoo/yahoo.c:2156
+#: src/protocols/yahoo/yahoo.c:2185 src/protocols/yahoo/yahoo.c:2248
 #: src/protocols/yahoo/yahoo_filexfer.c:68
 #: src/protocols/yahoo/yahoo_filexfer.c:109
 msgid "Unable to connect."
 msgstr "Impossible de se connecter"
 
-#: src/protocols/gg/gg.c:616
+#: src/protocols/gg/gg.c:690
 msgid "Reading data"
 msgstr "Lecture de données"
 
-#: src/protocols/gg/gg.c:619
+#: src/protocols/gg/gg.c:693
 msgid "Balancer handshake"
 msgstr "Poignée de main"
 
-#: src/protocols/gg/gg.c:622
+#: src/protocols/gg/gg.c:696
 msgid "Reading server key"
 msgstr "Lecture de la clef du serveur"
 
-#: src/protocols/gg/gg.c:625
+#: src/protocols/gg/gg.c:699
 msgid "Exchanging key hash"
 msgstr "Échange de la clef de hashage"
 
-#: src/protocols/gg/gg.c:635
+#: src/protocols/gg/gg.c:709
 msgid "Critical error in GG library\n"
 msgstr "Erreur critique dans la bibliothèque GG\n"
 
-#: src/protocols/gg/gg.c:653 src/protocols/gg/gg.c:744
+#: src/protocols/gg/gg.c:727 src/protocols/gg/gg.c:818
 #: src/protocols/toc/toc.c:146
 #, c-format
 msgid "Connect to %s failed"
 msgstr "Connexion à %s échouée"
 
-#: src/protocols/gg/gg.c:701
+#: src/protocols/gg/gg.c:775
 msgid "Unable to ping server"
 msgstr "Impossible de pinger le server"
 
-#: src/protocols/gg/gg.c:713
+#: src/protocols/gg/gg.c:787
 msgid "Send as message"
 msgstr "Envoyer comme message"
 
-#: src/protocols/gg/gg.c:718
+#: src/protocols/gg/gg.c:792
 msgid "Looking up GG server"
 msgstr "Résolution du serveur GG"
 
-#: src/protocols/gg/gg.c:721
+#: src/protocols/gg/gg.c:795
 msgid "Invalid Gadu-Gadu UIN specified"
 msgstr "l'UIN Gadu-Gadu spécifié est non valide"
 
-#: src/protocols/gg/gg.c:768
+#: src/protocols/gg/gg.c:842
 msgid "You are trying to send a message to an invalid Gadu-Gadu UIN."
 msgstr "Vous essayez d'envoyer un message à un UIN Gadu-Gadu non valide"
 
-#: src/protocols/gg/gg.c:835
+#: src/protocols/gg/gg.c:917
 msgid "Couldn't get search results"
 msgstr "Impossible d'obtenir les résultats de la recherche"
 
-#: src/protocols/gg/gg.c:840
+#: src/protocols/gg/gg.c:922
 msgid "Gadu-Gadu Search Engine"
 msgstr "Moteur de recherche de Gadu-Gadu"
 
-#: src/protocols/gg/gg.c:866
+#: src/protocols/gg/gg.c:948
 msgid "Active"
 msgstr "Actif"
 
-#: src/protocols/gg/gg.c:871 src/protocols/oscar/oscar.c:4829
+#: src/protocols/gg/gg.c:953 src/protocols/oscar/oscar.c:4845
 msgid "UIN"
 msgstr "UIN"
 
 #. First Name
-#: src/protocols/gg/gg.c:875 src/protocols/jabber/jabber.c:612
-#: src/protocols/oscar/oscar.c:4840 src/protocols/silc/ops.c:774
+#: src/protocols/gg/gg.c:957 src/protocols/jabber/jabber.c:613
+#: src/protocols/oscar/oscar.c:4856 src/protocols/silc/ops.c:790
 #: src/protocols/trepia/trepia.c:267
 msgid "First Name"
 msgstr "Prénom"
 
 #. Last Name
-#: src/protocols/gg/gg.c:880 src/protocols/jabber/jabber.c:617
-#: src/protocols/oscar/oscar.c:4841 src/protocols/trepia/trepia.c:274
+#: src/protocols/gg/gg.c:962 src/protocols/jabber/jabber.c:618
+#: src/protocols/oscar/oscar.c:4857 src/protocols/trepia/trepia.c:274
 msgid "Last Name"
 msgstr "Nom"
 
-#: src/protocols/gg/gg.c:884 src/protocols/gg/gg.c:1623
-#: src/protocols/irc/msgs.c:183 src/protocols/oscar/oscar.c:4830
+#: src/protocols/gg/gg.c:966 src/protocols/gg/gg.c:1707
+#: src/protocols/irc/msgs.c:183 src/protocols/oscar/oscar.c:4846
+#: src/protocols/silc/ops.c:1184
 msgid "Nick"
 msgstr "Pseudonyme"
 
-#: src/protocols/gg/gg.c:891 src/protocols/gg/gg.c:894
+#: src/protocols/gg/gg.c:973 src/protocols/gg/gg.c:976
 msgid "Birth Year"
 msgstr "Année de naissance"
 
-#: src/protocols/gg/gg.c:900 src/protocols/gg/gg.c:902
-#: src/protocols/gg/gg.c:904
+#: src/protocols/gg/gg.c:982 src/protocols/gg/gg.c:984
+#: src/protocols/gg/gg.c:986
 msgid "Sex"
 msgstr "Sexe"
 
 #. City
-#: src/protocols/gg/gg.c:908 src/protocols/jabber/jabber.c:627
-#: src/protocols/oscar/oscar.c:4884 src/protocols/oscar/oscar.c:4892
+#: src/protocols/gg/gg.c:990 src/protocols/jabber/jabber.c:628
+#: src/protocols/oscar/oscar.c:4900 src/protocols/oscar/oscar.c:4908
 #: src/protocols/trepia/trepia.c:331 src/protocols/trepia/trepia.c:410
 msgid "City"
 msgstr "Localité"
 
-#. res[0] == username
-#. show it to the user
-#: src/protocols/gg/gg.c:929 src/protocols/msn/msn.c:1225
-#: src/protocols/msn/msn.c:1533 src/protocols/msn/msn.c:1549
-#: src/protocols/napster/napster.c:393 src/protocols/oscar/oscar.c:3807
-#: src/protocols/oscar/oscar.c:4023 src/protocols/toc/toc.c:468
-#: src/protocols/yahoo/yahoo_profile.c:748
-#: src/protocols/yahoo/yahoo_profile.c:785
-#: src/protocols/yahoo/yahoo_profile.c:837
-#: src/protocols/yahoo/yahoo_profile.c:1132 src/protocols/zephyr/zephyr.c:610
-msgid "Buddy Information"
-msgstr "Informations sur le contact"
-
-#: src/protocols/gg/gg.c:951
+#: src/protocols/gg/gg.c:1033
 msgid "There is no Buddy List stored on the Gadu-Gadu server."
 msgstr "Il n'y a pas de liste de contacts stockée sur le serveur"
 
-#: src/protocols/gg/gg.c:959
+#: src/protocols/gg/gg.c:1041
 msgid "Couldn't Import Buddy List from Server"
 msgstr "Impossible d'importer la liste de contacts du serveur"
 
-#: src/protocols/gg/gg.c:1021
+#: src/protocols/gg/gg.c:1103
 msgid "Buddy List successfully transferred to Gadu-Gadu server"
 msgstr "Liste de contacts transférée sur le serveur avec succès"
 
-#: src/protocols/gg/gg.c:1029
+#: src/protocols/gg/gg.c:1111
 msgid "Couldn't transfer Buddy List to Gadu-Gadu server"
 msgstr "Impossible de transférer la liste de contacts sur le serveur"
 
-#: src/protocols/gg/gg.c:1037
+#: src/protocols/gg/gg.c:1119
 msgid "Buddy List successfully deleted from Gadu-Gadu server"
 msgstr "Liste de contacts effacée du serveur avec succès"
 
-#: src/protocols/gg/gg.c:1045
+#: src/protocols/gg/gg.c:1127
 msgid "Couldn't delete Buddy List from Gadu-Gadu server"
 msgstr "Impossible d'effacer la liste de contacts du serveur"
 
-#: src/protocols/gg/gg.c:1054
+#: src/protocols/gg/gg.c:1136
 msgid "Password changed successfully"
 msgstr "Changement de mot de passe effectué"
 
-#: src/protocols/gg/gg.c:1061
+#: src/protocols/gg/gg.c:1143
 msgid "Password couldn't be changed"
 msgstr "Impossible de changer le mot de passe"
 
-#: src/protocols/gg/gg.c:1180
+#: src/protocols/gg/gg.c:1262
 msgid "Error communicating with Gadu-Gadu server"
 msgstr "Erreur de communication avec le serveur Gadu-Gadu"
 
-#: src/protocols/gg/gg.c:1181
+#: src/protocols/gg/gg.c:1263
 msgid ""
 "Gaim was unable to complete your request due to a problem communicating with "
 "the Gadu-Gadu HTTP server.  Please try again later."
@@ -4813,11 +4846,11 @@
 "Impossible de communiquer avec le serveur HTTP Gadu-Gadu. Veuillez réessayer "
 "plus tard."
 
-#: src/protocols/gg/gg.c:1210
+#: src/protocols/gg/gg.c:1292
 msgid "Unable to import Gadu-Gadu buddy list"
 msgstr "Impossible d'importer la liste de contacts Gadu-Gadu"
 
-#: src/protocols/gg/gg.c:1211
+#: src/protocols/gg/gg.c:1293
 msgid ""
 "Gaim was unable to connect to the Gadu-Gadu buddy list server.  Please try "
 "again later."
@@ -4825,37 +4858,37 @@
 "Impossible de se connecter au serveur de listes de contacts Gadu-Gadu. "
 "Veuillez réessayer plus tard."
 
-#: src/protocols/gg/gg.c:1284
+#: src/protocols/gg/gg.c:1366
 msgid "Couldn't export buddy list"
 msgstr "Impossible d'exporter la liste de contacts"
 
-#: src/protocols/gg/gg.c:1285 src/protocols/gg/gg.c:1308
+#: src/protocols/gg/gg.c:1367 src/protocols/gg/gg.c:1390
 msgid ""
 "Gaim was unable to connect to the buddy list server.  Please try again later."
 msgstr ""
 "Impossible de se connecter au serveur de listes de contacts Gadu-Gadu. "
 "Veuillez réessayer plus tard."
 
-#: src/protocols/gg/gg.c:1307
+#: src/protocols/gg/gg.c:1389
 msgid "Unable to delete Gadu-Gadu buddy list"
 msgstr "Impossible d'effacer la liste de contacts"
 
-#: src/protocols/gg/gg.c:1358
+#: src/protocols/gg/gg.c:1440
 msgid "Unable to access directory"
 msgstr "Impossible d'accéder à l'annuaire"
 
-#: src/protocols/gg/gg.c:1359
+#: src/protocols/gg/gg.c:1441
 msgid ""
 "Gaim was unable to search the Directory because it was unable to connect to "
 "the directory server.  Please try again later."
 msgstr ""
 "Impossible de se connecter au serveur annuaire. Veuillez réessayer plus tard."
 
-#: src/protocols/gg/gg.c:1393
+#: src/protocols/gg/gg.c:1475
 msgid "Unable to change Gadu-Gadu password"
 msgstr "Impossible de changer le mot de passe Gadu-Gadu"
 
-#: src/protocols/gg/gg.c:1394
+#: src/protocols/gg/gg.c:1476
 msgid ""
 "Gaim was unable to change your password due to an error connecting to the "
 "Gadu-Gadu server.  Please try again later."
@@ -4863,33 +4896,33 @@
 "Impossible de se connecter au serveur Gadu-Gadu. Veuillez réessayer plus "
 "tard."
 
-#: src/protocols/gg/gg.c:1410
+#: src/protocols/gg/gg.c:1492
 msgid "Directory Search"
 msgstr "Recherche dans l'annuaire"
 
 #. if (js->protocol_options & CHANGE_PASSWORD) {
-#: src/protocols/gg/gg.c:1415 src/protocols/jabber/jabber.c:1061
+#: src/protocols/gg/gg.c:1497 src/protocols/jabber/jabber.c:1062
 #: src/protocols/toc/toc.c:1550
 msgid "Change Password"
 msgstr "Changer de mot de passe"
 
-#: src/protocols/gg/gg.c:1419
+#: src/protocols/gg/gg.c:1501
 msgid "Import Buddy List from Server"
 msgstr "Importer la liste de contacts du serveur"
 
-#: src/protocols/gg/gg.c:1423
+#: src/protocols/gg/gg.c:1505
 msgid "Export Buddy List to Server"
 msgstr "Exporter la liste de contacts vers le serveur"
 
-#: src/protocols/gg/gg.c:1427
+#: src/protocols/gg/gg.c:1509
 msgid "Delete Buddy List from Server"
 msgstr "Effacer la liste de contacts du serveur"
 
-#: src/protocols/gg/gg.c:1460
+#: src/protocols/gg/gg.c:1542
 msgid "Unable to access user profile."
 msgstr "Impossible d'accéder au profil utilisateur"
 
-#: src/protocols/gg/gg.c:1461
+#: src/protocols/gg/gg.c:1543
 msgid ""
 "Gaim was unable to access this user's profile due to an error connecting to "
 "the directory server.  Please try again later."
@@ -4907,7 +4940,7 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/gg/gg.c:1602 src/protocols/gg/gg.c:1604
+#: src/protocols/gg/gg.c:1686 src/protocols/gg/gg.c:1688
 msgid "Gadu-Gadu Protocol Plugin"
 msgstr "Plugin pour le protocole Gadu-Gadu"
 
@@ -4921,14 +4954,14 @@
 msgstr "L'utilisateur %s (%s%s%s%s%s) veut que vous l'autorisiez."
 
 #: src/protocols/icq/gaim_icq.c:297 src/protocols/jabber/presence.c:232
-#: src/protocols/msn/userlist.c:100 src/protocols/oscar/oscar.c:3538
-#: src/protocols/oscar/oscar.c:6100
+#: src/protocols/msn/userlist.c:100 src/protocols/oscar/oscar.c:3554
+#: src/protocols/oscar/oscar.c:6117
 msgid "Authorize"
 msgstr "Autoriser"
 
 #: src/protocols/icq/gaim_icq.c:297 src/protocols/jabber/presence.c:233
-#: src/protocols/msn/userlist.c:101 src/protocols/oscar/oscar.c:3540
-#: src/protocols/oscar/oscar.c:6101
+#: src/protocols/msn/userlist.c:101 src/protocols/oscar/oscar.c:3556
+#: src/protocols/oscar/oscar.c:6118
 msgid "Deny"
 msgstr "Refuser"
 
@@ -4948,17 +4981,19 @@
 msgid "Gaim User"
 msgstr "Utilisateur de Gaim"
 
-#: src/protocols/irc/cmds.c:43
+#: src/protocols/irc/cmds.c:43 src/protocols/silc/silc.c:1286
 #, c-format
 msgid "Unknown command: %s"
 msgstr "Commande inconnue : %s"
 
-#: src/protocols/irc/cmds.c:444 src/protocols/jabber/chat.c:544
+#: src/protocols/irc/cmds.c:448 src/protocols/jabber/chat.c:544
+#: src/protocols/silc/silc.c:995
 #, c-format
 msgid "current topic is: %s"
 msgstr "Le sujet courant est : %s"
 
-#: src/protocols/irc/cmds.c:447 src/protocols/jabber/chat.c:546
+#: src/protocols/irc/cmds.c:451 src/protocols/jabber/chat.c:546
+#: src/protocols/silc/silc.c:998
 msgid "No topic is set"
 msgstr "Pas de sujet"
 
@@ -4990,54 +5025,51 @@
 msgid "MOTD for %s"
 msgstr "Message du jour pour %s"
 
-#: src/protocols/irc/irc.c:141
+#: src/protocols/irc/irc.c:93 src/protocols/irc/irc.c:373
+msgid "Server has disconnected"
+msgstr "Déconnexion par le serveur"
+
+#: src/protocols/irc/irc.c:147
 msgid "View MOTD"
 msgstr "Voir le message du jour"
 
-#. FIXME: remove this when the ui does it for us.
-#: src/protocols/irc/irc.c:168 src/protocols/jabber/buddy.c:928
-#: src/protocols/msn/msn.c:543 src/protocols/oscar/oscar.c:448
-#: src/protocols/oscar/oscar.c:6771 src/protocols/yahoo/yahoo.c:2691
-msgid "Send File"
-msgstr "Envoyer un fichier"
-
-#: src/protocols/irc/irc.c:182 src/protocols/silc/chat.c:32
+#: src/protocols/irc/irc.c:169 src/protocols/silc/chat.c:32
 msgid "_Channel:"
 msgstr "_Salon :"
 
-#: src/protocols/irc/irc.c:187 src/protocols/jabber/chat.c:59
+#: src/protocols/irc/irc.c:174 src/protocols/jabber/chat.c:59
 msgid "_Password:"
 msgstr "Mot de _passe :"
 
-#: src/protocols/irc/irc.c:207
+#: src/protocols/irc/irc.c:194
 msgid "IRC nicks may not contain whitespace"
 msgstr "Les surnoms IRC ne peuvent pas avoir d'espace"
 
-#: src/protocols/irc/irc.c:226 src/protocols/toc/toc.c:198
+#: src/protocols/irc/irc.c:213 src/protocols/toc/toc.c:198
 #, c-format
 msgid "Signon: %s"
 msgstr "Connexion : %s"
 
-#: src/protocols/irc/irc.c:235
+#: src/protocols/irc/irc.c:222
 msgid "Couldn't create socket"
 msgstr "Impossible de créer le socket"
 
-#: src/protocols/irc/irc.c:250 src/protocols/jabber/jabber.c:296
-#: src/protocols/oscar/oscar.c:1523 src/protocols/oscar/oscar.c:1587
+#: src/protocols/irc/irc.c:237 src/protocols/jabber/jabber.c:297
+#: src/protocols/oscar/oscar.c:1529 src/protocols/oscar/oscar.c:1593
 msgid "Couldn't connect to host"
 msgstr "Impossible de se connecter à l'hôte"
 
-#: src/protocols/irc/irc.c:387 src/protocols/trepia/trepia.c:926
+#: src/protocols/irc/irc.c:370 src/protocols/trepia/trepia.c:926
 msgid "Read error"
 msgstr "Erreur de lecture"
 
-#: src/protocols/irc/irc.c:538 src/protocols/silc/chat.c:1343
-#: src/protocols/yahoo/yahoochat.c:1341
+#: src/protocols/irc/irc.c:521 src/protocols/silc/chat.c:1363
+#: src/protocols/yahoo/yahoochat.c:1380
 msgid "Users"
 msgstr "Utilisateurs"
 
-#: src/protocols/irc/irc.c:541 src/protocols/silc/chat.c:1346
-#: src/protocols/silc/ops.c:1017 src/protocols/yahoo/yahoochat.c:1350
+#: src/protocols/irc/irc.c:524 src/protocols/silc/chat.c:1366
+#: src/protocols/silc/ops.c:1146 src/protocols/yahoo/yahoochat.c:1389
 msgid "Topic"
 msgstr "Sujet"
 
@@ -5050,34 +5082,35 @@
 #. *< id
 #. *< name
 #. *< version
-#: src/protocols/irc/irc.c:643
+#: src/protocols/irc/irc.c:628
 msgid "IRC Protocol Plugin"
 msgstr "Plugin pour le protocole IRC"
 
 #. *  summary
-#: src/protocols/irc/irc.c:644
+#: src/protocols/irc/irc.c:629
 msgid "The IRC Protocol Plugin that Sucks Less"
 msgstr "Plugin qui pue moins pour le protocole IRC"
 
-#: src/protocols/irc/irc.c:663 src/protocols/irc/msgs.c:197
-#: src/protocols/jabber/jabber.c:1556 src/protocols/napster/napster.c:642
-#: src/protocols/silc/ops.c:935
+#: src/protocols/irc/irc.c:648 src/protocols/irc/msgs.c:197
+#: src/protocols/jabber/jabber.c:1559 src/protocols/napster/napster.c:644
+#: src/protocols/silc/ops.c:1008 src/protocols/silc/ops.c:1110
 msgid "Server"
 msgstr "Serveur"
 
-#: src/protocols/irc/irc.c:666 src/protocols/jabber/jabber.c:1577
-#: src/protocols/msn/msn.c:1729 src/protocols/napster/napster.c:647
-#: src/protocols/silc/silc.c:1363 src/protocols/trepia/trepia.c:1295
+#: src/protocols/irc/irc.c:651 src/protocols/jabber/jabber.c:1580
+#: src/protocols/msn/msn.c:1758 src/protocols/napster/napster.c:649
+#: src/protocols/silc/silc.c:1576 src/protocols/trepia/trepia.c:1297
 msgid "Port"
 msgstr "Port"
 
-#: src/protocols/irc/irc.c:669 src/protocols/zephyr/zephyr.c:1442
+#: src/protocols/irc/irc.c:654 src/protocols/zephyr/zephyr.c:1915
 msgid "Encoding"
 msgstr "Codage"
 
-#: src/protocols/irc/irc.c:672 src/protocols/irc/msgs.c:191
-#: src/protocols/jabber/jabber.c:587 src/protocols/silc/buddy.c:1449
-#: src/protocols/silc/ops.c:931
+#: src/protocols/irc/irc.c:657 src/protocols/irc/msgs.c:191
+#: src/protocols/jabber/jabber.c:588 src/protocols/silc/buddy.c:1445
+#: src/protocols/silc/ops.c:955 src/protocols/silc/ops.c:957
+#: src/protocols/silc/ops.c:1104 src/protocols/silc/ops.c:1106
 msgid "Username"
 msgstr "Utilisateur"
 
@@ -5102,12 +5135,12 @@
 msgid " <i>(identified)</i>"
 msgstr " <i>(identifié)</i>"
 
-#: src/protocols/irc/msgs.c:192 src/protocols/silc/ops.c:929
-#: src/protocols/yahoo/yahoo_profile.c:1000
+#: src/protocols/irc/msgs.c:192 src/protocols/silc/ops.c:949
+#: src/protocols/silc/ops.c:1098 src/protocols/yahoo/yahoo_profile.c:1005
 msgid "Realname"
 msgstr "Nom réel"
 
-#: src/protocols/irc/msgs.c:202
+#: src/protocols/irc/msgs.c:202 src/protocols/silc/ops.c:1021
 msgid "Currently on"
 msgstr "Actuellement dans"
 
@@ -5129,111 +5162,111 @@
 msgid "Buddy Information for %s"
 msgstr "Informations sur %s"
 
-#: src/protocols/irc/msgs.c:278
+#: src/protocols/irc/msgs.c:279
 #, c-format
 msgid "%s has changed the topic to: %s"
 msgstr "%s a changé le sujet en : %s"
 
-#: src/protocols/irc/msgs.c:283
+#: src/protocols/irc/msgs.c:284
 #, c-format
 msgid "The topic for %s is: %s"
 msgstr "Le sujet de %s est : %s"
 
-#: src/protocols/irc/msgs.c:299
+#: src/protocols/irc/msgs.c:301
 #, c-format
 msgid "Unknown message '%s'"
 msgstr "Message inconnu '%s'"
 
-#: src/protocols/irc/msgs.c:300
+#: src/protocols/irc/msgs.c:302
 msgid "Unknown message"
 msgstr "Message inconnu"
 
-#: src/protocols/irc/msgs.c:300
+#: src/protocols/irc/msgs.c:302
 msgid "Gaim has sent a message the IRC server did not understand."
 msgstr "Gaim a envoyé un message que le serveur IRC ne comprend pas"
 
-#: src/protocols/irc/msgs.c:323
+#: src/protocols/irc/msgs.c:325
 #, c-format
 msgid "Users on %s: %s"
 msgstr "Utilisateurs dans %s : %s"
 
-#: src/protocols/irc/msgs.c:405
+#: src/protocols/irc/msgs.c:407
 msgid "No such channel"
 msgstr "Ce salon n'existe pas"
 
 #. does this happen?
-#: src/protocols/irc/msgs.c:416
+#: src/protocols/irc/msgs.c:418
 msgid "no such channel"
 msgstr "Ce salon n'existe pas"
 
-#: src/protocols/irc/msgs.c:419
+#: src/protocols/irc/msgs.c:421
 msgid "User is not logged in"
 msgstr "Utilisateur non connecté"
 
-#: src/protocols/irc/msgs.c:424
+#: src/protocols/irc/msgs.c:426
 msgid "No such nick or channel"
 msgstr "Ce pseudo ou salon n'existe pas"
 
-#: src/protocols/irc/msgs.c:444
+#: src/protocols/irc/msgs.c:446
 msgid "Could not send"
 msgstr "Impossible d'envoyer"
 
-#: src/protocols/irc/msgs.c:500
+#: src/protocols/irc/msgs.c:502
 #, c-format
 msgid "Joining %s requires an invitation."
 msgstr "Joindre %s nécessite une invitation"
 
-#: src/protocols/irc/msgs.c:501
+#: src/protocols/irc/msgs.c:503
 msgid "Invitation only"
 msgstr "Sur invitation seulement"
 
-#: src/protocols/irc/msgs.c:604
+#: src/protocols/irc/msgs.c:606
 #, c-format
 msgid "You have been kicked by %s: (%s)"
 msgstr "Vous avez été expulsé par %s (%s)"
 
-#: src/protocols/irc/msgs.c:609
+#: src/protocols/irc/msgs.c:611
 #, c-format
 msgid "Kicked by %s (%s)"
 msgstr "Expulsé par %s (%s)"
 
-#: src/protocols/irc/msgs.c:630
+#: src/protocols/irc/msgs.c:632
 #, c-format
 msgid "mode (%s %s) by %s"
 msgstr "mode (%s %s) par %s"
 
-#: src/protocols/irc/msgs.c:709
+#: src/protocols/irc/msgs.c:711
 msgid "Could not change nick"
 msgstr "Impossible de changer de surnom"
 
-#: src/protocols/irc/msgs.c:710
+#: src/protocols/irc/msgs.c:712
 msgid "Cannot change nick"
 msgstr "Impossible de changer de surnom"
 
-#: src/protocols/irc/msgs.c:731
+#: src/protocols/irc/msgs.c:733
 #, c-format
 msgid "You have parted the channel%s%s"
 msgstr "Vous avez quitté le salon %s%s"
 
-#: src/protocols/irc/msgs.c:771
+#: src/protocols/irc/msgs.c:773
 msgid "Error: invalid PONG from server"
 msgstr "PONG non valide du serveur"
 
-#: src/protocols/irc/msgs.c:773
+#: src/protocols/irc/msgs.c:775
 #, c-format
 msgid "PING reply -- Lag: %lu seconds"
 msgstr "Réponse au PING -- Lag : %lu secondes"
 
-#: src/protocols/irc/msgs.c:848
+#: src/protocols/irc/msgs.c:850
 #, c-format
 msgid "Cannot join %s:"
 msgstr "Impossible de joindre le salon %s :"
 
-#: src/protocols/irc/msgs.c:849 src/protocols/silc/ops.c:878
+#: src/protocols/irc/msgs.c:851 src/protocols/silc/ops.c:894
 msgid "Cannot join channel"
 msgstr "Impossible d'entrer dans le salon"
 
-#: src/protocols/irc/msgs.c:885
+#: src/protocols/irc/msgs.c:887
 #, c-format
 msgid "Wallops from %s"
 msgstr "Wallops de %s"
@@ -5255,8 +5288,8 @@
 "deop &lt;nick1&gt; [nick2] ...:  Remove channel operator status from "
 "someone. You must be a channel operator to do this."
 msgstr ""
-"deop &lt;pseudo1&gt; [pseudo2] ... : Enlever le status d'opérateur. "
-"Vous devez être un opérateur du salon pour utiliser cette commande."
+"deop &lt;pseudo1&gt; [pseudo2] ... : Enlever le status d'opérateur. Vous "
+"devez être un opérateur du salon pour utiliser cette commande."
 
 #: src/protocols/irc/parse.c:112
 msgid ""
@@ -5264,42 +5297,41 @@
 "someone, preventing them from speaking if the channel is moderated (+m). You "
 "must be a channel operator to do this."
 msgstr ""
-"devoice &lt;pseudo1&gt; [pseudo2] ... : Retirer la parole dans un salon modéré "
-"(+m). Vous devez être un opérateur du salon pour utiliser cette commande."
+"devoice &lt;pseudo1&gt; [pseudo2] ... : Retirer la parole dans un salon "
+"modéré (+m). Vous devez être un opérateur du salon pour utiliser cette "
+"commande."
 
 #: src/protocols/irc/parse.c:113
 msgid ""
 "invite &lt;nick&gt; [room]:  Invite someone to join you in the specified "
 "channel, or the current channel."
 msgstr ""
-"invite &lt;pseudo&gt; [salon] : Inviter une personne dans un salon. "
-"Vous devez être un opérateur du salon pour utiliser cette commande."
+"invite &lt;pseudo&gt; [salon] : Inviter une personne dans un salon. Vous "
+"devez être un opérateur du salon pour utiliser cette commande."
 
 #: src/protocols/irc/parse.c:114
 msgid ""
 "j &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  Enter one or more "
 "channels, optionally providing a channel key for each if needed."
 msgstr ""
-"j &lt;salon1&gt;[,salon2][,...] [clef1[,clef2][,...]] : Joindre un "
-"ou plusieurs salons, en indiquant le mot de passe de chaque salon si "
-"nécessaire."
+"j &lt;salon1&gt;[,salon2][,...] [clef1[,clef2][,...]] : Joindre un ou "
+"plusieurs salons, en indiquant le mot de passe de chaque salon si nécessaire."
 
 #: src/protocols/irc/parse.c:115
 msgid ""
 "join &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  Enter one or more "
 "channels, optionally providing a channel key for each if needed."
 msgstr ""
-"join &lt;salon1&gt;[,salon2][,...] [clef1[,clef2][,...]] : Joindre un "
-"ou plusieurs salons, en indiquant le mot de passe de chaque salon si "
-"nécessaire."
+"join &lt;salon1&gt;[,salon2][,...] [clef1[,clef2][,...]] : Joindre un ou "
+"plusieurs salons, en indiquant le mot de passe de chaque salon si nécessaire."
 
 #: src/protocols/irc/parse.c:116
 msgid ""
 "kick &lt;nick&gt; [message]:  Remove someone from a channel. You must be a "
 "channel operator to do this."
 msgstr ""
-"kick &lt;pseudo1&gt; [message] : Expulser une personne du salon. "
-"Vous devez être un opérateur du salon pour utiliser cette commande."
+"kick &lt;pseudo1&gt; [message] : Expulser une personne du salon. Vous devez "
+"être un opérateur du salon pour utiliser cette commande."
 
 #: src/protocols/irc/parse.c:117
 msgid ""
@@ -5318,8 +5350,8 @@
 "mode &lt;nick|channel&gt; &lt;+|-&gt;&lt;A-Za-z&gt;:  Set or unset a channel "
 "or user mode."
 msgstr ""
-"mode &lt;pseudo|salon&gt; &lt;+|-&gt;&lt;A-Za-z&gt; : Changer le mode d'un salon "
-"ou d'une personne."
+"mode &lt;pseudo|salon&gt; &lt;+|-&gt;&lt;A-Za-z&gt; : Changer le mode d'un "
+"salon ou d'une personne."
 
 #: src/protocols/irc/parse.c:120
 msgid ""
@@ -5332,7 +5364,7 @@
 msgid "names [channel]:  List the users currently in a channel."
 msgstr "names [salon] : Récupérer la liste des personnes dans un salon."
 
-#: src/protocols/irc/parse.c:122 src/protocols/jabber/jabber.c:1406
+#: src/protocols/irc/parse.c:122 src/protocols/jabber/jabber.c:1407
 msgid "nick &lt;new nickname&gt;:  Change your nickname."
 msgstr "nick &lt;nouveau pseudo&gt; : Changer de pseudonyme"
 
@@ -5341,8 +5373,8 @@
 "op &lt;nick1&gt; [nick2] ...:  Grant channel operator status to someone. You "
 "must be a channel operator to do this."
 msgstr ""
-"op &lt;pseudo1&gt; [pseudo2] ... : Donner le status d'opérateur. "
-"Vous devez être un opérateur du salon pour utiliser cette commande."
+"op &lt;pseudo1&gt; [pseudo2] ... : Donner le status d'opérateur. Vous devez "
+"être un opérateur du salon pour utiliser cette commande."
 
 #: src/protocols/irc/parse.c:124
 msgid ""
@@ -5357,26 +5389,30 @@
 "part [room] [message]:  Leave the current channel, or a specified channel, "
 "with an optional message."
 msgstr ""
-"part [salon] [message] : Quitter un salon avec un message de départ facultatif."
+"part [salon] [message] : Quitter un salon avec un message de départ "
+"facultatif."
 
 #: src/protocols/irc/parse.c:126
 msgid ""
 "ping [nick]:  Asks how much lag a user (or the server if no user specified) "
 "has."
 msgstr ""
-"ping [pseudo] : Demander la latence d'une personne (ou du serveur s'il n'y a pas "
-"de pseudo)."
+"ping [pseudo] : Demander la latence d'une personne (ou du serveur s'il n'y a "
+"pas de pseudo)."
 
 #: src/protocols/irc/parse.c:127
 msgid ""
 "query &lt;nick&gt; &lt;message&gt;:  Send a private message to a user (as "
 "opposed to a channel)."
 msgstr ""
-"query &lt;pseudo&gt; &lt;message&gt; : Envoyer un message privé à une personne."
+"query &lt;pseudo&gt; &lt;message&gt; : Envoyer un message privé à une "
+"personne."
 
 #: src/protocols/irc/parse.c:128
 msgid "quit [message]:  Disconnect from the server, with an optional message."
-msgstr "quit [message] : Se déconnecter du serveur avec un message de départ facultatif."
+msgstr ""
+"quit [message] : Se déconnecter du serveur avec un message de départ "
+"facultatif."
 
 #: src/protocols/irc/parse.c:129
 msgid "quote [...]:  Send a raw command to the server."
@@ -5387,8 +5423,8 @@
 "remove &lt;nick&gt; [message]:  Remove someone from a room. You must be a "
 "channel operator to do this."
 msgstr ""
-"remove &lt;pseudo1&gt; [message] : Expulser une personne du salon. "
-"Vous devez être un opérateur du salon pour utiliser cette commande."
+"remove &lt;pseudo1&gt; [message] : Expulser une personne du salon. Vous "
+"devez être un opérateur du salon pour utiliser cette commande."
 
 #: src/protocols/irc/parse.c:131
 msgid "topic [new topic]:  View or change the channel topic."
@@ -5418,7 +5454,7 @@
 msgid "whois &lt;nick&gt;:  Get information on a user."
 msgstr "whois &lt;pseudo&gt; : Récupérer des informations sur une personnes."
 
-#: src/protocols/irc/parse.c:228 src/protocols/zephyr/zephyr.c:236
+#: src/protocols/irc/parse.c:228 src/protocols/zephyr/zephyr.c:256
 msgid ""
 "(There was an error converting this message.  Check the 'Encoding' option in "
 "the Account Editor)"
@@ -5439,7 +5475,7 @@
 msgid "CTCP PING reply"
 msgstr "Réponse au CTCP PING"
 
-#: src/protocols/irc/parse.c:485 src/protocols/oscar/oscar.c:1424
+#: src/protocols/irc/parse.c:485 src/protocols/oscar/oscar.c:1430
 #: src/protocols/toc/toc.c:188 src/protocols/toc/toc.c:596
 #: src/protocols/toc/toc.c:612 src/protocols/toc/toc.c:689
 msgid "Disconnected."
@@ -5477,87 +5513,88 @@
 msgid "Invalid challenge from server"
 msgstr "Demande d'accès non valide du serveur"
 
-#: src/protocols/jabber/buddy.c:247 src/protocols/jabber/buddy.c:604
-#: src/protocols/silc/ops.c:770
+#: src/protocols/jabber/buddy.c:246 src/protocols/jabber/buddy.c:604
+#: src/protocols/silc/ops.c:786
 msgid "Full Name"
 msgstr "Nom complet"
 
-#: src/protocols/jabber/buddy.c:248 src/protocols/jabber/buddy.c:617
-#: src/protocols/silc/ops.c:782
+#: src/protocols/jabber/buddy.c:247 src/protocols/jabber/buddy.c:617
+#: src/protocols/silc/ops.c:798
 msgid "Family Name"
 msgstr "Nom de famille"
 
-#: src/protocols/jabber/buddy.c:249 src/protocols/jabber/buddy.c:621
+#: src/protocols/jabber/buddy.c:248 src/protocols/jabber/buddy.c:621
 msgid "Given Name"
 msgstr "Nom usuel"
 
-#: src/protocols/jabber/buddy.c:250 src/protocols/jabber/buddy.c:635
-#: src/protocols/jabber/jabber.c:607 src/protocols/msn/msn.c:1150
-#: src/protocols/silc/buddy.c:1446 src/protocols/silc/ops.c:786
-#: src/protocols/silc/ops.c:927 src/protocols/yahoo/yahoo_profile.c:995
+#: src/protocols/jabber/buddy.c:249 src/protocols/jabber/buddy.c:635
+#: src/protocols/jabber/jabber.c:608 src/protocols/msn/msn.c:1172
+#: src/protocols/silc/buddy.c:1442 src/protocols/silc/ops.c:802
+#: src/protocols/silc/ops.c:945 src/protocols/silc/ops.c:1094
+#: src/protocols/yahoo/yahoo_profile.c:1000
 msgid "Nickname"
 msgstr "Pseudonyme"
 
-#: src/protocols/jabber/buddy.c:251 src/protocols/jabber/jabber.c:647
+#: src/protocols/jabber/buddy.c:250 src/protocols/jabber/jabber.c:648
 msgid "URL"
 msgstr "URL"
 
-#: src/protocols/jabber/buddy.c:252 src/protocols/jabber/buddy.c:663
+#: src/protocols/jabber/buddy.c:251 src/protocols/jabber/buddy.c:663
 msgid "Street Address"
 msgstr "Adresse"
 
-#: src/protocols/jabber/buddy.c:253 src/protocols/jabber/buddy.c:659
+#: src/protocols/jabber/buddy.c:252 src/protocols/jabber/buddy.c:659
 msgid "Extended Address"
 msgstr "Adresse (suite)"
 
-#: src/protocols/jabber/buddy.c:254 src/protocols/jabber/buddy.c:667
+#: src/protocols/jabber/buddy.c:253 src/protocols/jabber/buddy.c:667
 msgid "Locality"
 msgstr "Localité"
 
-#: src/protocols/jabber/buddy.c:255 src/protocols/jabber/buddy.c:671
+#: src/protocols/jabber/buddy.c:254 src/protocols/jabber/buddy.c:671
 msgid "Region"
 msgstr "Région"
 
-#: src/protocols/jabber/buddy.c:256 src/protocols/jabber/buddy.c:675
-#: src/protocols/jabber/jabber.c:637
+#: src/protocols/jabber/buddy.c:255 src/protocols/jabber/buddy.c:675
+#: src/protocols/jabber/jabber.c:638
 msgid "Postal Code"
 msgstr "Code postal"
 
 #. Country
-#: src/protocols/jabber/buddy.c:257 src/protocols/jabber/buddy.c:680
+#: src/protocols/jabber/buddy.c:256 src/protocols/jabber/buddy.c:680
 #: src/protocols/trepia/trepia.c:339 src/protocols/trepia/trepia.c:416
 msgid "Country"
 msgstr "Pays"
 
-#: src/protocols/jabber/buddy.c:258 src/protocols/jabber/buddy.c:691
+#: src/protocols/jabber/buddy.c:257 src/protocols/jabber/buddy.c:691
 #: src/protocols/jabber/buddy.c:698
 msgid "Telephone"
 msgstr "Téléphone"
 
-#: src/protocols/jabber/buddy.c:259 src/protocols/jabber/buddy.c:709
-#: src/protocols/jabber/buddy.c:717 src/protocols/silc/buddy.c:1499
-#: src/protocols/silc/silc.c:633 src/protocols/yahoo/yahoo_profile.c:990
+#: src/protocols/jabber/buddy.c:258 src/protocols/jabber/buddy.c:709
+#: src/protocols/jabber/buddy.c:717 src/protocols/silc/silc.c:637
+#: src/protocols/silc/util.c:508 src/protocols/yahoo/yahoo_profile.c:995
 msgid "Email"
 msgstr "Courrier électronique"
 
-#: src/protocols/jabber/buddy.c:260 src/protocols/jabber/buddy.c:732
+#: src/protocols/jabber/buddy.c:259 src/protocols/jabber/buddy.c:732
 msgid "Organization Name"
 msgstr "Organisation"
 
-#: src/protocols/jabber/buddy.c:261 src/protocols/jabber/buddy.c:736
+#: src/protocols/jabber/buddy.c:260 src/protocols/jabber/buddy.c:736
 msgid "Organization Unit"
 msgstr "Service"
 
-#: src/protocols/jabber/buddy.c:262 src/protocols/jabber/buddy.c:742
+#: src/protocols/jabber/buddy.c:261 src/protocols/jabber/buddy.c:742
 msgid "Title"
 msgstr "Titre"
 
-#: src/protocols/jabber/buddy.c:263 src/protocols/jabber/buddy.c:745
+#: src/protocols/jabber/buddy.c:262 src/protocols/jabber/buddy.c:745
 msgid "Role"
 msgstr "Rôle"
 
-#: src/protocols/jabber/buddy.c:264 src/protocols/jabber/buddy.c:638
-#: src/protocols/oscar/oscar.c:4865
+#: src/protocols/jabber/buddy.c:263 src/protocols/jabber/buddy.c:638
+#: src/protocols/oscar/oscar.c:4881
 msgid "Birthday"
 msgstr "Date de naissance"
 
@@ -5578,25 +5615,25 @@
 msgstr "Identifiant Jabber"
 
 #: src/protocols/jabber/buddy.c:563 src/protocols/jabber/buddy.c:570
-#: src/protocols/jabber/buddy.c:581 src/protocols/jabber/jabber.c:937
-#: src/protocols/msn/msn.c:453 src/protocols/novell/novell.c:2737
-#: src/protocols/novell/novell.c:2741 src/protocols/oscar/oscar.c:574
-#: src/protocols/oscar/oscar.c:580 src/protocols/oscar/oscar.c:582
-#: src/protocols/yahoo/yahoo.c:2611
+#: src/protocols/jabber/buddy.c:581 src/protocols/jabber/jabber.c:938
+#: src/protocols/msn/msn.c:450 src/protocols/novell/novell.c:2743
+#: src/protocols/novell/novell.c:2747 src/protocols/oscar/oscar.c:578
+#: src/protocols/oscar/oscar.c:584 src/protocols/oscar/oscar.c:586
+#: src/protocols/yahoo/yahoo.c:2634
 msgid "Status"
 msgstr "État"
 
-#: src/protocols/jabber/buddy.c:579 src/protocols/jabber/jabber.c:1559
+#: src/protocols/jabber/buddy.c:579 src/protocols/jabber/jabber.c:1562
 msgid "Resource"
 msgstr "Ressource"
 
-#: src/protocols/jabber/buddy.c:625 src/protocols/silc/ops.c:778
+#: src/protocols/jabber/buddy.c:625 src/protocols/silc/ops.c:794
 msgid "Middle Name"
 msgstr "Deuxième prénom"
 
-#: src/protocols/jabber/buddy.c:643 src/protocols/jabber/jabber.c:622
-#: src/protocols/oscar/oscar.c:4883 src/protocols/oscar/oscar.c:4891
-#: src/protocols/silc/ops.c:814
+#: src/protocols/jabber/buddy.c:643 src/protocols/jabber/jabber.c:623
+#: src/protocols/oscar/oscar.c:4899 src/protocols/oscar/oscar.c:4907
+#: src/protocols/silc/ops.c:830
 msgid "Address"
 msgstr "Adresse"
 
@@ -5616,31 +5653,31 @@
 msgid "Jabber Profile"
 msgstr "Profil Jabber"
 
-#: src/protocols/jabber/buddy.c:936
+#: src/protocols/jabber/buddy.c:932
 msgid "Un-hide From"
 msgstr "Se montrer à"
 
-#: src/protocols/jabber/buddy.c:939
+#: src/protocols/jabber/buddy.c:935
 msgid "Temporarily Hide From"
 msgstr "Se cacher de"
 
 #. && NOT ME
-#: src/protocols/jabber/buddy.c:946
+#: src/protocols/jabber/buddy.c:942
 msgid "Cancel Presence Notification"
 msgstr "Annuler la notification de présence"
 
-#: src/protocols/jabber/buddy.c:952
+#: src/protocols/jabber/buddy.c:948
 msgid "(Re-)Request authorization"
 msgstr "(Re-)Demander autorisation"
 
 #. if(NOT ME)
 #. shouldn't this just happen automatically when the buddy is
 #. removed?
-#: src/protocols/jabber/buddy.c:960
+#: src/protocols/jabber/buddy.c:956
 msgid "Unsubscribe"
 msgstr "Désinscription"
 
-#: src/protocols/jabber/chat.c:42 src/protocols/yahoo/yahoochat.c:963
+#: src/protocols/jabber/chat.c:42 src/protocols/yahoo/yahoochat.c:1002
 msgid "_Room:"
 msgstr "_Salon :"
 
@@ -5729,451 +5766,452 @@
 msgid "Find Rooms"
 msgstr "Chercher un salon de discussion"
 
-#: src/protocols/jabber/jabber.c:75
+#: src/protocols/jabber/jabber.c:76
 msgid "Error initializing session"
 msgstr "Erreur à l'initialisation de la session"
 
-#: src/protocols/jabber/jabber.c:205 src/protocols/msn/httpmethod.c:266
+#: src/protocols/jabber/jabber.c:206 src/protocols/msn/httpmethod.c:266
 #: src/protocols/trepia/trepia.c:247 src/protocols/trepia/trepia.c:698
 #: src/protocols/trepia/trepia.c:987 src/protocols/trepia/trepia.c:1031
 #: src/protocols/trepia/trepia.c:1130 src/protocols/trepia/trepia.c:1176
 msgid "Write error"
 msgstr "Erreur d'écriture"
 
-#: src/protocols/jabber/jabber.c:243 src/protocols/jabber/jabber.c:263
+#: src/protocols/jabber/jabber.c:244 src/protocols/jabber/jabber.c:264
 msgid "Read Error"
 msgstr "Erreur de lecture"
 
-#: src/protocols/jabber/jabber.c:323
+#: src/protocols/jabber/jabber.c:324
 msgid "Connection Failed"
 msgstr "Échec de la connexion"
 
-#: src/protocols/jabber/jabber.c:326
+#: src/protocols/jabber/jabber.c:327
 msgid "SSL Handshake Failed"
 msgstr "Échec de la poignée de main SSL"
 
-#: src/protocols/jabber/jabber.c:369 src/protocols/jabber/jabber.c:698
+#: src/protocols/jabber/jabber.c:370 src/protocols/jabber/jabber.c:699
 msgid "Invalid Jabber ID"
 msgstr "Identifiant Jabber non valide"
 
-#: src/protocols/jabber/jabber.c:397 src/protocols/jabber/jabber.c:725
+#: src/protocols/jabber/jabber.c:398 src/protocols/jabber/jabber.c:726
 msgid "SSL support unavailable"
 msgstr "Support SSL non disponible"
 
-#: src/protocols/jabber/jabber.c:407 src/protocols/jabber/jabber.c:735
+#: src/protocols/jabber/jabber.c:408 src/protocols/jabber/jabber.c:736
 #: src/protocols/trepia/trepia.c:1070
 msgid "Unable to create socket"
 msgstr "Impossible de créer le socket"
 
-#: src/protocols/jabber/jabber.c:432
+#: src/protocols/jabber/jabber.c:433
 #, c-format
 msgid "Registration of %s@%s successful"
 msgstr "Enregistrement de %s@%s réussi"
 
-#: src/protocols/jabber/jabber.c:434 src/protocols/jabber/jabber.c:435
+#: src/protocols/jabber/jabber.c:435 src/protocols/jabber/jabber.c:436
 msgid "Registration Successful"
 msgstr "Enregistrement auprès du serveur réussi"
 
-#: src/protocols/jabber/jabber.c:441 src/protocols/jabber/jabber.c:1180
+#: src/protocols/jabber/jabber.c:442 src/protocols/jabber/jabber.c:1181
 msgid "Unknown Error"
 msgstr "Erreur inconnue"
 
-#: src/protocols/jabber/jabber.c:443 src/protocols/jabber/jabber.c:444
+#: src/protocols/jabber/jabber.c:444 src/protocols/jabber/jabber.c:445
 msgid "Registration Failed"
 msgstr "Erreur d'enregistrement"
 
-#: src/protocols/jabber/jabber.c:555 src/protocols/jabber/jabber.c:556
+#: src/protocols/jabber/jabber.c:556 src/protocols/jabber/jabber.c:557
 msgid "Already Registered"
 msgstr "Déjà enregistré"
 
-#: src/protocols/jabber/jabber.c:591 src/protocols/jabber/jabber.c:1035
+#: src/protocols/jabber/jabber.c:592 src/protocols/jabber/jabber.c:1036
 msgid "Password"
 msgstr "Mot de passe"
 
-#: src/protocols/jabber/jabber.c:602
+#: src/protocols/jabber/jabber.c:603
 msgid "E-Mail"
 msgstr "Courriel"
 
 #. State
-#: src/protocols/jabber/jabber.c:632 src/protocols/oscar/oscar.c:4885
-#: src/protocols/oscar/oscar.c:4893 src/protocols/trepia/trepia.c:335
+#: src/protocols/jabber/jabber.c:633 src/protocols/oscar/oscar.c:4901
+#: src/protocols/oscar/oscar.c:4909 src/protocols/trepia/trepia.c:335
 #: src/protocols/trepia/trepia.c:413
 msgid "State"
 msgstr "État"
 
-#: src/protocols/jabber/jabber.c:642 src/protocols/silc/buddy.c:1501
-#: src/protocols/silc/ops.c:819 src/protocols/silc/silc.c:635
+#: src/protocols/jabber/jabber.c:643 src/protocols/silc/ops.c:835
+#: src/protocols/silc/silc.c:639 src/protocols/silc/util.c:510
 msgid "Phone"
 msgstr "Téléphone"
 
-#: src/protocols/jabber/jabber.c:652
+#: src/protocols/jabber/jabber.c:653
 msgid "Date"
 msgstr "Date"
 
-#: src/protocols/jabber/jabber.c:660
+#: src/protocols/jabber/jabber.c:661
 msgid "Please fill out the information below to register your new account."
 msgstr ""
 "Veuillez remplir les information ci-dessous pour l'enregistrement du nouveau "
 "compte"
 
-#: src/protocols/jabber/jabber.c:663 src/protocols/jabber/jabber.c:664
+#: src/protocols/jabber/jabber.c:664 src/protocols/jabber/jabber.c:665
 msgid "Register New Jabber Account"
 msgstr "Enregistrer un nouveau compte Jabber"
 
-#: src/protocols/jabber/jabber.c:743
+#: src/protocols/jabber/jabber.c:744
 msgid "Logged out"
 msgstr "Déconnecté"
 
 #. connect to the server
-#: src/protocols/jabber/jabber.c:782 src/protocols/msn/msn.c:616
-#: src/protocols/napster/napster.c:499 src/protocols/novell/novell.c:2104
-#: src/protocols/oscar/oscar.c:1591 src/protocols/trepia/trepia.c:1064
-#: src/protocols/yahoo/yahoo.c:2353 src/protocols/zephyr/zephyr.c:906
+#: src/protocols/jabber/jabber.c:783 src/protocols/msn/msn.c:608
+#: src/protocols/napster/napster.c:499 src/protocols/novell/novell.c:2105
+#: src/protocols/oscar/oscar.c:1597 src/protocols/trepia/trepia.c:1064
+#: src/protocols/yahoo/yahoo.c:2379 src/protocols/zephyr/zephyr.c:1017
 msgid "Connecting"
 msgstr "Connexion en cours"
 
-#: src/protocols/jabber/jabber.c:786
+#: src/protocols/jabber/jabber.c:787
 msgid "Initializing Stream"
 msgstr "Initialisation du flux"
 
-#: src/protocols/jabber/jabber.c:792
+#: src/protocols/jabber/jabber.c:793
 msgid "Authenticating"
 msgstr "Authentification"
 
-#: src/protocols/jabber/jabber.c:801
+#: src/protocols/jabber/jabber.c:802
 msgid "Re-initializing Stream"
 msgstr "Réinitialisation du flux"
 
-#: src/protocols/jabber/jabber.c:881 src/protocols/jabber/jabber.c:1158
-#: src/protocols/jabber/jabber.c:1199 src/protocols/jabber/jabber.c:1232
-#: src/protocols/oscar/oscar.c:580 src/protocols/oscar/oscar.c:6471
+#: src/protocols/jabber/jabber.c:882 src/protocols/jabber/jabber.c:1159
+#: src/protocols/jabber/jabber.c:1200 src/protocols/jabber/jabber.c:1233
+#: src/protocols/oscar/oscar.c:584 src/protocols/oscar/oscar.c:6488
 msgid "Not Authorized"
 msgstr "Non autorisé"
 
-#: src/protocols/jabber/jabber.c:912
+#: src/protocols/jabber/jabber.c:913
 msgid "Both"
 msgstr "Bidirectionnelle"
 
-#: src/protocols/jabber/jabber.c:914
+#: src/protocols/jabber/jabber.c:915
 msgid "From (To pending)"
 msgstr "Source (Destination en attente)"
 
-#: src/protocols/jabber/jabber.c:916
+#: src/protocols/jabber/jabber.c:917
 msgid "From"
 msgstr "Source"
 
-#: src/protocols/jabber/jabber.c:919
+#: src/protocols/jabber/jabber.c:920
 msgid "To"
 msgstr "Destination"
 
-#: src/protocols/jabber/jabber.c:921
+#: src/protocols/jabber/jabber.c:922
 msgid "None (To pending)"
 msgstr "Aucune (Destination en attente)"
 
-#: src/protocols/jabber/jabber.c:925
+#: src/protocols/jabber/jabber.c:926
 msgid "Subscription"
 msgstr "Inscription"
 
-#: src/protocols/jabber/jabber.c:945
+#: src/protocols/jabber/jabber.c:946
 msgid "Error"
 msgstr "Erreur"
 
 # Repris du fr.po de gabber
-#: src/protocols/jabber/jabber.c:958 src/protocols/jabber/jutil.c:35
+#: src/protocols/jabber/jabber.c:959 src/protocols/jabber/jutil.c:35
 #: src/protocols/jabber/presence.c:66 src/protocols/jabber/presence.c:117
 msgid "Chatty"
 msgstr "Bavard"
 
-#: src/protocols/jabber/jabber.c:960 src/protocols/jabber/jutil.c:38
+#: src/protocols/jabber/jabber.c:961 src/protocols/jabber/jutil.c:38
 #: src/protocols/jabber/presence.c:68 src/protocols/jabber/presence.c:122
 msgid "Extended Away"
 msgstr "Longue absence"
 
-#: src/protocols/jabber/jabber.c:961 src/protocols/jabber/jutil.c:41
+#: src/protocols/jabber/jabber.c:962 src/protocols/jabber/jutil.c:41
 #: src/protocols/jabber/presence.c:70 src/protocols/jabber/presence.c:124
-#: src/protocols/oscar/oscar.c:522 src/protocols/oscar/oscar.c:5468
-#: src/protocols/oscar/oscar.c:6663
+#: src/protocols/oscar/oscar.c:526 src/protocols/oscar/oscar.c:5484
+#: src/protocols/oscar/oscar.c:6680
 msgid "Do Not Disturb"
 msgstr "Ne pas déranger"
 
-#: src/protocols/jabber/jabber.c:978
-msgid "Password Changed"
-msgstr "Mot de passe changé"
-
 #: src/protocols/jabber/jabber.c:979
+msgid "Password Changed"
+msgstr "Mot de passe changé"
+
+#: src/protocols/jabber/jabber.c:980
 msgid "Your password has been changed."
 msgstr "Le mot de passe a été modifié"
 
-#: src/protocols/jabber/jabber.c:983 src/protocols/jabber/jabber.c:984
+#: src/protocols/jabber/jabber.c:984 src/protocols/jabber/jabber.c:985
 msgid "Error changing password"
 msgstr "Erreur lors du changement du mot de passe"
 
-#: src/protocols/jabber/jabber.c:1040
+#: src/protocols/jabber/jabber.c:1041
 msgid "Password (again)"
 msgstr "Nouveau mot de passe (confirmation)"
 
-#: src/protocols/jabber/jabber.c:1045 src/protocols/jabber/jabber.c:1046
+#: src/protocols/jabber/jabber.c:1046 src/protocols/jabber/jabber.c:1047
 msgid "Change Jabber Password"
 msgstr "Changer de mot de passe Jabber"
 
-#: src/protocols/jabber/jabber.c:1046
+#: src/protocols/jabber/jabber.c:1047
 msgid "Please enter your new password"
 msgstr "Saisissez votre nouveau mot de passe"
 
-#: src/protocols/jabber/jabber.c:1056 src/protocols/toc/toc.c:1540
+#: src/protocols/jabber/jabber.c:1057 src/protocols/toc/toc.c:1540
 msgid "Set User Info"
 msgstr "Éditer les informations"
 
-#: src/protocols/jabber/jabber.c:1138
+#: src/protocols/jabber/jabber.c:1139
 msgid "Bad Request"
 msgstr "Mauvaise requête"
 
-#: src/protocols/jabber/jabber.c:1140
+#: src/protocols/jabber/jabber.c:1141
 msgid "Conflict"
 msgstr "Conflit"
 
-#: src/protocols/jabber/jabber.c:1142
+#: src/protocols/jabber/jabber.c:1143
 msgid "Feature Not Implemented"
 msgstr "Fonction non implémentée"
 
-#: src/protocols/jabber/jabber.c:1144
+#: src/protocols/jabber/jabber.c:1145
 msgid "Forbidden"
 msgstr "Interdit"
 
-#: src/protocols/jabber/jabber.c:1146
+#: src/protocols/jabber/jabber.c:1147
 msgid "Gone"
 msgstr "Parti"
 
-#: src/protocols/jabber/jabber.c:1148 src/protocols/jabber/jabber.c:1222
+#: src/protocols/jabber/jabber.c:1149 src/protocols/jabber/jabber.c:1223
 msgid "Internal Server Error"
 msgstr "Erreur interne du serveur"
 
-#: src/protocols/jabber/jabber.c:1150
+#: src/protocols/jabber/jabber.c:1151
 msgid "Item Not Found"
 msgstr "Item non trouvé"
 
-#: src/protocols/jabber/jabber.c:1152
+#: src/protocols/jabber/jabber.c:1153
 msgid "Malformed Jabber ID"
 msgstr "Identifiant Jabber malformé"
 
-#: src/protocols/jabber/jabber.c:1154
+#: src/protocols/jabber/jabber.c:1155
 msgid "Not Acceptable"
 msgstr "Non acceptable"
 
-#: src/protocols/jabber/jabber.c:1156
+#: src/protocols/jabber/jabber.c:1157
 msgid "Not Allowed"
 msgstr "Non autorisé"
 
-#: src/protocols/jabber/jabber.c:1160
+#: src/protocols/jabber/jabber.c:1161
 msgid "Payment Required"
 msgstr "Paiement nécessaire"
 
-#: src/protocols/jabber/jabber.c:1162
+#: src/protocols/jabber/jabber.c:1163
 msgid "Recipient Unavailable"
 msgstr "Destinataire non disponible"
 
-#: src/protocols/jabber/jabber.c:1166
+#: src/protocols/jabber/jabber.c:1167
 msgid "Registration Required"
 msgstr "Erreur d'enregistrement"
 
-#: src/protocols/jabber/jabber.c:1168
+#: src/protocols/jabber/jabber.c:1169
 msgid "Remote Server Not Found"
 msgstr "Serveur distant non trouvé"
 
-#: src/protocols/jabber/jabber.c:1170
+#: src/protocols/jabber/jabber.c:1171
 msgid "Remote Server Timeout"
 msgstr "Pas de réponse du serveur distant"
 
-#: src/protocols/jabber/jabber.c:1172
+#: src/protocols/jabber/jabber.c:1173
 msgid "Server Overloaded"
 msgstr "Serveur surchargé"
 
-#: src/protocols/jabber/jabber.c:1174
+#: src/protocols/jabber/jabber.c:1175
 msgid "Service Unavailable"
 msgstr "Service non disponible"
 
-#: src/protocols/jabber/jabber.c:1176
+#: src/protocols/jabber/jabber.c:1177
 msgid "Subscription Required"
 msgstr "Inscription nécessaire"
 
-#: src/protocols/jabber/jabber.c:1178
+#: src/protocols/jabber/jabber.c:1179
 msgid "Unexpected Request"
 msgstr "Requête non attendue"
 
-#: src/protocols/jabber/jabber.c:1185
+#: src/protocols/jabber/jabber.c:1186
 msgid "Authorization Aborted"
 msgstr "Autorisation annulée"
 
-#: src/protocols/jabber/jabber.c:1187
+#: src/protocols/jabber/jabber.c:1188
 msgid "Incorrect encoding in authorization"
 msgstr "Encodage incorrect de l'Autorisation"
 
-#: src/protocols/jabber/jabber.c:1190
+#: src/protocols/jabber/jabber.c:1191
 msgid "Invalid authzid"
 msgstr "Identifiant d'authentification non valide (authzid)"
 
-#: src/protocols/jabber/jabber.c:1193
+#: src/protocols/jabber/jabber.c:1194
 msgid "Invalid Authorization Mechanism"
 msgstr "Mécanisme d'autorisation non valide"
 
-#: src/protocols/jabber/jabber.c:1196
+#: src/protocols/jabber/jabber.c:1197
 msgid "Authorization mechanism too weak"
 msgstr "Mécanisme d'autorisation trop faible"
 
-#: src/protocols/jabber/jabber.c:1201
+#: src/protocols/jabber/jabber.c:1202
 msgid "Temporary Authentication Failure"
 msgstr "Échec temporaire de l'authentification"
 
-#: src/protocols/jabber/jabber.c:1203
+#: src/protocols/jabber/jabber.c:1204
 msgid "Authentication Failure"
 msgstr "Échec de l'authentification"
 
-#: src/protocols/jabber/jabber.c:1207
+#: src/protocols/jabber/jabber.c:1208
 msgid "Bad Format"
 msgstr "Mauvais format"
 
-#: src/protocols/jabber/jabber.c:1209
+#: src/protocols/jabber/jabber.c:1210
 msgid "Bad Namespace Prefix"
 msgstr "Mauvais préfixe de nom de domaine"
 
-#: src/protocols/jabber/jabber.c:1212
+#: src/protocols/jabber/jabber.c:1213
 msgid "Resource Conflict"
 msgstr "Conflit de resource"
 
-#: src/protocols/jabber/jabber.c:1214 src/protocols/silc/ops.c:1225
+#: src/protocols/jabber/jabber.c:1215 src/protocols/silc/ops.c:1491
 msgid "Connection Timeout"
 msgstr "Connexion morte"
 
-#: src/protocols/jabber/jabber.c:1216
+#: src/protocols/jabber/jabber.c:1217
 msgid "Host Gone"
 msgstr "Hôte perdu"
 
-#: src/protocols/jabber/jabber.c:1218
+#: src/protocols/jabber/jabber.c:1219
 msgid "Host Unknown"
 msgstr "Hôte inconnu"
 
-#: src/protocols/jabber/jabber.c:1220
+#: src/protocols/jabber/jabber.c:1221
 msgid "Improper Addressing"
 msgstr "Adresse non valide"
 
-#: src/protocols/jabber/jabber.c:1224
+#: src/protocols/jabber/jabber.c:1225
 msgid "Invalid ID"
 msgstr "Identifiant non valide"
 
-#: src/protocols/jabber/jabber.c:1226
+#: src/protocols/jabber/jabber.c:1227
 msgid "Invalid Namespace"
 msgstr "Nom de domaine non valide"
 
-#: src/protocols/jabber/jabber.c:1228
+#: src/protocols/jabber/jabber.c:1229
 msgid "Invalid XML"
 msgstr "XML non valide"
 
-#: src/protocols/jabber/jabber.c:1230
+#: src/protocols/jabber/jabber.c:1231
 msgid "Non-matching Hosts"
 msgstr "Hôtes non correspondants"
 
-#: src/protocols/jabber/jabber.c:1234
+#: src/protocols/jabber/jabber.c:1235
 msgid "Policy Violation"
 msgstr "Violation des règles"
 
-#: src/protocols/jabber/jabber.c:1236
+#: src/protocols/jabber/jabber.c:1237
 msgid "Remote Connection Failed"
 msgstr "Échec de la connexion à distance"
 
-#: src/protocols/jabber/jabber.c:1238
+#: src/protocols/jabber/jabber.c:1239
 msgid "Resource Constraint"
 msgstr "Limitation sur la resource"
 
-#: src/protocols/jabber/jabber.c:1240
+#: src/protocols/jabber/jabber.c:1241
 msgid "Restricted XML"
 msgstr "XML restreint"
 
-#: src/protocols/jabber/jabber.c:1242
+#: src/protocols/jabber/jabber.c:1243
 msgid "See Other Host"
 msgstr "Voir l'autre hôte"
 
-#: src/protocols/jabber/jabber.c:1244
+#: src/protocols/jabber/jabber.c:1245
 msgid "System Shutdown"
 msgstr "Arrêt du systême"
 
-#: src/protocols/jabber/jabber.c:1246
+#: src/protocols/jabber/jabber.c:1247
 msgid "Undefined Condition"
 msgstr "Condition non définie"
 
-#: src/protocols/jabber/jabber.c:1248
+#: src/protocols/jabber/jabber.c:1249
 msgid "Unsupported Encoding"
 msgstr "Codage de caractère non supporté"
 
-#: src/protocols/jabber/jabber.c:1250
+#: src/protocols/jabber/jabber.c:1251
 msgid "Unsupported Stanza Type"
 msgstr "Type de strophe non supporté"
 
-#: src/protocols/jabber/jabber.c:1252
+#: src/protocols/jabber/jabber.c:1253
 msgid "Unsupported Version"
 msgstr "Version non supportée"
 
-#: src/protocols/jabber/jabber.c:1254
+#: src/protocols/jabber/jabber.c:1255
 msgid "XML Not Well Formed"
 msgstr "XML mal formé"
 
-#: src/protocols/jabber/jabber.c:1256
+#: src/protocols/jabber/jabber.c:1257
 msgid "Stream Error"
 msgstr "Erreur dans le flux"
 
-#: src/protocols/jabber/jabber.c:1323
+#: src/protocols/jabber/jabber.c:1324
 #, c-format
 msgid "Unable to ban user %s"
 msgstr "Impossible de bannir l'utilisateur %s"
 
-#: src/protocols/jabber/jabber.c:1375
+#: src/protocols/jabber/jabber.c:1376
 #, c-format
 msgid "Unable to kick user %s"
 msgstr "Impossible d'expulser l'utilisateur %s"
 
-#: src/protocols/jabber/jabber.c:1400
+#: src/protocols/jabber/jabber.c:1401
 msgid "config:  Configure a chat room."
 msgstr "config : Configurer un salon de discussion"
 
-#: src/protocols/jabber/jabber.c:1403
+#: src/protocols/jabber/jabber.c:1404
 msgid "configure:  Configure a chat room."
 msgstr "configure : Configurer un salon de discussion"
 
-#: src/protocols/jabber/jabber.c:1410
+#: src/protocols/jabber/jabber.c:1411
 msgid "part [room]:  Leave the room."
 msgstr "part [salon] : Quitter le salon"
 
-#: src/protocols/jabber/jabber.c:1413
+#: src/protocols/jabber/jabber.c:1414
 msgid "register:  Register with a chat room."
 msgstr "register : S'enregistrer dans un salon"
 
-#: src/protocols/jabber/jabber.c:1418
+#: src/protocols/jabber/jabber.c:1419
 msgid "topic [new topic]:  View or change the topic."
 msgstr "topic [nouveau sujet] : Voir ou changer le sujet du salon"
 
-#: src/protocols/jabber/jabber.c:1422
+#: src/protocols/jabber/jabber.c:1423
 msgid "ban &lt;user&gt; [room]:  Ban a user from the room."
 msgstr "ban &lt;utilisateur&gt; [salon] : Bannir un utilisateur d'un salon"
 
-#: src/protocols/jabber/jabber.c:1426
+#: src/protocols/jabber/jabber.c:1427
 msgid "invite &lt;user&gt; [room]:  Invite a user to the room."
 msgstr ""
 "invite &lt;utilisateur&gt; [salon] : Inviter un utilisateur dans un salon"
 
-#: src/protocols/jabber/jabber.c:1430
+#: src/protocols/jabber/jabber.c:1431
 msgid "join: &lt;room&gt; [server]:  Join a chat on this server."
 msgstr "join &lt;room&gt; [serveur] : Joindre une discussion sur le serveur"
 
-#: src/protocols/jabber/jabber.c:1434
+#: src/protocols/jabber/jabber.c:1435
 msgid "kick &lt;user&gt; [room]:  Kick a user from the room."
 msgstr "kick &lt;utilisateur&gt; [salon] : Expulser un utilisateur du salon"
 
-#: src/protocols/jabber/jabber.c:1438
+#: src/protocols/jabber/jabber.c:1439
 msgid ""
 "msg &lt;user&gt; &lt;message&gt;:  Send a private message to another user."
 msgstr ""
-"msg &lt;utilisateur&gt; &lt;message&gt; : Envoyer un message privé à une personne."
-
-#: src/protocols/jabber/jabber.c:1452
+"msg &lt;utilisateur&gt; &lt;message&gt; : Envoyer un message privé à une "
+"personne."
+
+#: src/protocols/jabber/jabber.c:1453
 msgid "Hide Operating System"
 msgstr "Cacher le système d'exploitation"
 
@@ -6188,24 +6226,24 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/jabber/jabber.c:1534 src/protocols/jabber/jabber.c:1536
+#: src/protocols/jabber/jabber.c:1537 src/protocols/jabber/jabber.c:1539
 msgid "Jabber Protocol Plugin"
 msgstr "Plugin pour le protocole Jabber"
 
-#: src/protocols/jabber/jabber.c:1562
+#: src/protocols/jabber/jabber.c:1565
 msgid "Use TLS if available"
 msgstr "Utiliser TLS si possible"
 
-#: src/protocols/jabber/jabber.c:1567
+#: src/protocols/jabber/jabber.c:1570
 msgid "Force old SSL"
 msgstr "Forcer l'ancien SSL"
 
-#: src/protocols/jabber/jabber.c:1572
+#: src/protocols/jabber/jabber.c:1575
 msgid "Allow plaintext auth over unencrypted streams"
 msgstr "Autoriser l'authentication en clair pour les flux cryptés"
 
 #. Account options
-#: src/protocols/jabber/jabber.c:1581 src/protocols/silc/silc.c:1359
+#: src/protocols/jabber/jabber.c:1584 src/protocols/silc/silc.c:1572
 msgid "Connect server"
 msgstr "Connexion au serveur"
 
@@ -6348,7 +6386,7 @@
 msgid "Not on list"
 msgstr "Pas dans la liste"
 
-#: src/protocols/msn/error.c:70 src/protocols/zephyr/zephyr.c:570
+#: src/protocols/msn/error.c:70 src/protocols/zephyr/zephyr.c:593
 msgid "User is offline"
 msgstr "L'utilisateur est déconnecté"
 
@@ -6493,8 +6531,8 @@
 msgid "Server too busy"
 msgstr "Serveur occupé"
 
-#: src/protocols/msn/error.c:198 src/protocols/oscar/oscar.c:2010
-#: src/protocols/silc/ops.c:1214 src/protocols/toc/toc.c:630
+#: src/protocols/msn/error.c:198 src/protocols/oscar/oscar.c:2026
+#: src/protocols/silc/ops.c:1480 src/protocols/toc/toc.c:630
 msgid "Authentication failed"
 msgstr "Échec de l'authentification"
 
@@ -6572,88 +6610,88 @@
 msgid "Disallow"
 msgstr "Interdire"
 
-#: src/protocols/msn/msn.c:313
+#: src/protocols/msn/msn.c:311
 msgid "Send a mobile message."
 msgstr "Envoyer un message vers un portable"
 
-#: src/protocols/msn/msn.c:315
+#: src/protocols/msn/msn.c:313
 msgid "Page"
 msgstr "Bipper"
 
-#: src/protocols/msn/msn.c:466 src/protocols/msn/msn.c:764
+#: src/protocols/msn/msn.c:463 src/protocols/msn/msn.c:756
 #: src/protocols/msn/state.c:34
 msgid "Away From Computer"
 msgstr "Absent"
 
-#: src/protocols/msn/msn.c:467 src/protocols/msn/msn.c:766
-#: src/protocols/msn/state.c:33 src/protocols/yahoo/yahoo.c:2468
-#: src/protocols/yahoo/yahoo.c:2846 src/protocols/yahoo/yahoo.c:2960
+#: src/protocols/msn/msn.c:464 src/protocols/msn/msn.c:758
+#: src/protocols/msn/state.c:33 src/protocols/yahoo/yahoo.c:2491
+#: src/protocols/yahoo/yahoo.c:2853 src/protocols/yahoo/yahoo.c:2969
 msgid "Be Right Back"
 msgstr "Revient de suite"
 
-#: src/protocols/msn/msn.c:468 src/protocols/msn/msn.c:768
-#: src/protocols/msn/state.c:31 src/protocols/novell/novell.c:2721
-#: src/protocols/novell/novell.c:2836 src/protocols/novell/novell.c:2890
+#: src/protocols/msn/msn.c:465 src/protocols/msn/msn.c:760
+#: src/protocols/msn/state.c:31 src/protocols/novell/novell.c:2727
+#: src/protocols/novell/novell.c:2842 src/protocols/novell/novell.c:2896
 #: src/protocols/silc/buddy.c:1383 src/protocols/silc/silc.c:47
-#: src/protocols/silc/silc.c:78 src/protocols/yahoo/yahoo.c:2470
-#: src/protocols/yahoo/yahoo.c:2848 src/protocols/yahoo/yahoo.c:2961
+#: src/protocols/silc/silc.c:78 src/protocols/yahoo/yahoo.c:2493
+#: src/protocols/yahoo/yahoo.c:2855 src/protocols/yahoo/yahoo.c:2970
 msgid "Busy"
 msgstr "Occupé"
 
-#: src/protocols/msn/msn.c:469 src/protocols/msn/msn.c:770
-#: src/protocols/msn/state.c:35 src/protocols/yahoo/yahoo.c:2478
-#: src/protocols/yahoo/yahoo.c:2856 src/protocols/yahoo/yahoo.c:2965
+#: src/protocols/msn/msn.c:466 src/protocols/msn/msn.c:762
+#: src/protocols/msn/state.c:35 src/protocols/yahoo/yahoo.c:2501
+#: src/protocols/yahoo/yahoo.c:2863 src/protocols/yahoo/yahoo.c:2974
 msgid "On The Phone"
 msgstr "Au téléphone"
 
-#: src/protocols/msn/msn.c:470 src/protocols/msn/msn.c:772
-#: src/protocols/msn/state.c:36 src/protocols/yahoo/yahoo.c:2482
-#: src/protocols/yahoo/yahoo.c:2860 src/protocols/yahoo/yahoo.c:2967
+#: src/protocols/msn/msn.c:467 src/protocols/msn/msn.c:764
+#: src/protocols/msn/state.c:36 src/protocols/yahoo/yahoo.c:2505
+#: src/protocols/yahoo/yahoo.c:2867 src/protocols/yahoo/yahoo.c:2976
 msgid "Out To Lunch"
 msgstr "Parti manger"
 
-#: src/protocols/msn/msn.c:471 src/protocols/msn/msn.c:774
-#: src/protocols/zephyr/zephyr.c:1205 src/protocols/zephyr/zephyr.c:1220
+#: src/protocols/msn/msn.c:468 src/protocols/msn/msn.c:766
+#: src/protocols/zephyr/zephyr.c:1355 src/protocols/zephyr/zephyr.c:1374
 msgid "Hidden"
 msgstr "Caché"
 
-#: src/protocols/msn/msn.c:482
+#: src/protocols/msn/msn.c:479
 msgid "Set Friendly Name"
 msgstr "Changer l'alias"
 
-#: src/protocols/msn/msn.c:487
+#: src/protocols/msn/msn.c:484
 msgid "Set Home Phone Number"
 msgstr "Numéro de téléphone"
 
-#: src/protocols/msn/msn.c:491
+#: src/protocols/msn/msn.c:488
 msgid "Set Work Phone Number"
 msgstr "Numéro au travail"
 
-#: src/protocols/msn/msn.c:495
+#: src/protocols/msn/msn.c:492
 msgid "Set Mobile Phone Number"
 msgstr "Numéro de portable"
 
-#: src/protocols/msn/msn.c:501
+#: src/protocols/msn/msn.c:498
 msgid "Enable/Disable Mobile Devices"
 msgstr "Activation du service pour portables"
 
-#: src/protocols/msn/msn.c:506
+#: src/protocols/msn/msn.c:503
 msgid "Allow/Disallow Mobile Pages"
 msgstr "Autorisation pour les messages sur portable"
 
-#: src/protocols/msn/msn.c:529
+#: src/protocols/msn/msn.c:526
 msgid "Send to Mobile"
 msgstr "Envoyer vers un portable"
 
-#: src/protocols/msn/msn.c:539
+#: src/protocols/msn/msn.c:536
 msgid "Initiate Chat"
 msgstr "Lancer une discussion"
 
-#: src/protocols/msn/msn.c:548
+#: src/protocols/msn/msn.c:540
 msgid "Update Buddy Icon"
 msgstr "Mettre à jour l'icône du contact"
 
-#: src/protocols/msn/msn.c:585
+#: src/protocols/msn/msn.c:577
 msgid ""
 "SSL support is needed for MSN. Please install a supported SSL library. See "
 "http://gaim.sf.net/faq-ssl.php for more information."
@@ -6662,106 +6700,125 @@
 "bibliothèque SSL. Visitez http://gaim.sf.net/faq-ssl.php pour plus "
 "d'informations."
 
-#: src/protocols/msn/msn.c:1137 src/protocols/msn/msn.c:1150
-#: src/protocols/msn/msn.c:1156 src/protocols/yahoo/yahoo_profile.c:640
-#: src/protocols/yahoo/yahoo_profile.c:653
+#: src/protocols/msn/msn.c:1167 src/protocols/yahoo/yahoo_profile.c:659
+#: src/protocols/zephyr/zephyr.c:626
+#, c-format
+msgid "<b>Alias:</b> %s<br>"
+msgstr "<b>Alias :</b> %s<br>"
+
+#. put a link to the actual profile URL
+#: src/protocols/msn/msn.c:1172 src/protocols/msn/msn.c:1512
+#: src/protocols/yahoo/yahoo_profile.c:1168 src/util.c:792
+#, c-format
+msgid "<b>%s:</b> "
+msgstr "<b>%s :</b> "
+
+#: src/protocols/msn/msn.c:1173
+#, c-format
+msgid "<font sml=\"msn\">%s</font><br>"
+msgstr "<font sml=\"msn\">%s</font><br>"
+
+#: src/protocols/msn/msn.c:1179 src/protocols/yahoo/yahoo_profile.c:664
 #, c-format
 msgid "<b>%s:</b> %s<br>"
 msgstr "<b>%s :</b> %s<br>"
 
-#: src/protocols/msn/msn.c:1137
-msgid "MSN ID"
-msgstr "MSN ID"
-
-#: src/protocols/msn/msn.c:1145 src/protocols/yahoo/yahoo_profile.c:648
-#: src/protocols/zephyr/zephyr.c:602
-#, c-format
-msgid "<b>Alias:</b> %s<br>"
-msgstr "<b>Alias :</b> %s<br>"
-
-#: src/protocols/msn/msn.c:1222 src/protocols/msn/msn.c:1546
-#: src/protocols/yahoo/yahoo_profile.c:746
-#: src/protocols/yahoo/yahoo_profile.c:834
+#: src/protocols/msn/msn.c:1242
+msgid "MSN Profile"
+msgstr "Profil MSN"
+
+#: src/protocols/msn/msn.c:1247 src/protocols/msn/msn.c:1499
+#: src/protocols/yahoo/yahoo_profile.c:761
 msgid "Error retrieving profile"
 msgstr "Erreur à la récupération du profil"
 
 #. Age
-#: src/protocols/msn/msn.c:1293 src/protocols/oscar/oscar.c:4870
+#: src/protocols/msn/msn.c:1318 src/protocols/oscar/oscar.c:4886
 #: src/protocols/trepia/trepia.c:285 src/protocols/trepia/trepia.c:404
-#: src/protocols/yahoo/yahoo_profile.c:1010
+#: src/protocols/yahoo/yahoo_profile.c:1015
 msgid "Age"
 msgstr "Âge"
 
 #. Gender
-#: src/protocols/msn/msn.c:1300 src/protocols/oscar/oscar.c:4856
+#: src/protocols/msn/msn.c:1325 src/protocols/oscar/oscar.c:4872
 #: src/protocols/trepia/trepia.c:279 src/protocols/trepia/trepia.c:406
-#: src/protocols/yahoo/yahoo_profile.c:1020
+#: src/protocols/yahoo/yahoo_profile.c:1025
 msgid "Gender"
 msgstr "Genre"
 
-#: src/protocols/msn/msn.c:1309 src/protocols/yahoo/yahoo_profile.c:1015
+#: src/protocols/msn/msn.c:1334 src/protocols/yahoo/yahoo_profile.c:1020
 msgid "Marital Status"
 msgstr "Status marital"
 
-#: src/protocols/msn/msn.c:1316 src/protocols/yahoo/yahoo_profile.c:1005
+#: src/protocols/msn/msn.c:1341 src/protocols/yahoo/yahoo_profile.c:1010
 msgid "Location"
 msgstr "Localisation"
 
-#: src/protocols/msn/msn.c:1324 src/protocols/yahoo/yahoo_profile.c:1025
+#: src/protocols/msn/msn.c:1349 src/protocols/yahoo/yahoo_profile.c:1030
 msgid "Occupation"
 msgstr "Occupation"
 
-#: src/protocols/msn/msn.c:1341 src/protocols/msn/msn.c:1347
-#: src/protocols/msn/msn.c:1354 src/protocols/msn/msn.c:1362
-#: src/protocols/msn/msn.c:1369
+#: src/protocols/msn/msn.c:1366 src/protocols/msn/msn.c:1372
+#: src/protocols/msn/msn.c:1379 src/protocols/msn/msn.c:1387
+#: src/protocols/msn/msn.c:1394
 msgid "A Little About Me"
 msgstr "À propos de moi"
 
-#: src/protocols/msn/msn.c:1378 src/protocols/msn/msn.c:1384
-#: src/protocols/msn/msn.c:1391 src/protocols/msn/msn.c:1398
+#: src/protocols/msn/msn.c:1403 src/protocols/msn/msn.c:1409
+#: src/protocols/msn/msn.c:1416 src/protocols/msn/msn.c:1423
 msgid "Favorite Things"
 msgstr "Choses préférées"
 
-#: src/protocols/msn/msn.c:1407 src/protocols/msn/msn.c:1413
-#: src/protocols/msn/msn.c:1420
+#: src/protocols/msn/msn.c:1432 src/protocols/msn/msn.c:1438
+#: src/protocols/msn/msn.c:1445
 msgid "Hobbies and Interests"
 msgstr "Passe-temps et intérêts"
 
-#: src/protocols/msn/msn.c:1429 src/protocols/msn/msn.c:1435
-#: src/protocols/yahoo/yahoo_profile.c:1067
+#: src/protocols/msn/msn.c:1454 src/protocols/msn/msn.c:1460
+#: src/protocols/yahoo/yahoo_profile.c:1072
 msgid "Favorite Quote"
 msgstr "Citation préférée"
 
-#: src/protocols/msn/msn.c:1443 src/protocols/yahoo/yahoo_profile.c:1118
+#: src/protocols/msn/msn.c:1468 src/protocols/yahoo/yahoo_profile.c:1123
 msgid "Last Updated"
 msgstr "Dernière mise à jour"
 
 #. Homepage
-#: src/protocols/msn/msn.c:1454 src/protocols/silc/ops.c:810
+#: src/protocols/msn/msn.c:1479 src/protocols/silc/ops.c:826
 #: src/protocols/trepia/trepia.c:289 src/protocols/trepia/trepia.c:419
 msgid "Homepage"
 msgstr "Page web"
 
-#. put a link to the actual profile URL
-#: src/protocols/msn/msn.c:1465 src/protocols/yahoo/yahoo_profile.c:1121
-#: src/util.c:792
-#, c-format
-msgid "<b>%s:</b> "
-msgstr "<b>%s :</b> "
-
-#: src/protocols/msn/msn.c:1465 src/protocols/yahoo/yahoo_profile.c:1121
+#: src/protocols/msn/msn.c:1501
+msgid "The user has not created a public profile."
+msgstr "L'utilisateur n'a pas créé de profil public"
+
+#: src/protocols/msn/msn.c:1502
+msgid ""
+"MSN reported not being able to find the user's profile. This either means "
+"that the user does not exist, or that the user exists but has not created a "
+"public profile."
+msgstr ""
+"Impossible de récupérer le profil de l'utilisateur par MSN. Soit "
+"l'utilisateur n'existe pas, soit il n'a pas créé de profil public."
+
+#: src/protocols/msn/msn.c:1506
+msgid ""
+"Gaim could not find any information in the user's profile. The user most "
+"likely does not exist."
+msgstr ""
+"Impossible de récupérer des informations sur le profil de l'utilisateur. Il "
+"est possible que cet utilisateur n'existe pas."
+
+#: src/protocols/msn/msn.c:1512 src/protocols/yahoo/yahoo_profile.c:1168
 msgid "Profile URL"
 msgstr "Lien du profil"
 
-#: src/protocols/msn/msn.c:1547 src/protocols/yahoo/yahoo_profile.c:1140
-msgid "The user's profile is empty."
-msgstr "Le profil de l'utilisateur est vide"
-
-#: src/protocols/msn/msn.c:1616
+#: src/protocols/msn/msn.c:1643
 msgid "Display conversation closed notices"
 msgstr "Afficher les notifications de fin de conversation"
 
-#: src/protocols/msn/msn.c:1621
+#: src/protocols/msn/msn.c:1648
 msgid "Display timeout notices"
 msgstr "Afficher les notifications de dépassement de temps"
 
@@ -6776,15 +6833,15 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/msn/msn.c:1703 src/protocols/msn/msn.c:1705
+#: src/protocols/msn/msn.c:1732 src/protocols/msn/msn.c:1734
 msgid "MSN Protocol Plugin"
 msgstr "Plugin pour le protocole MSN"
 
-#: src/protocols/msn/msn.c:1724 src/protocols/trepia/trepia.c:1290
+#: src/protocols/msn/msn.c:1753 src/protocols/trepia/trepia.c:1292
 msgid "Login server"
 msgstr "Serveur de connexion"
 
-#: src/protocols/msn/msn.c:1733
+#: src/protocols/msn/msn.c:1762
 msgid "Use HTTP Method"
 msgstr "Utiliser le protocole HTTP"
 
@@ -6805,11 +6862,11 @@
 msgstr "Récupération de la liste de contacts"
 
 #: src/protocols/msn/notification.c:144 src/protocols/msn/notification.c:173
-#: src/protocols/oscar/oscar.c:2299
+#: src/protocols/oscar/oscar.c:2315
 msgid "Password sent"
 msgstr "Mot de passe envoyé"
 
-#: src/protocols/msn/notification.c:1069
+#: src/protocols/msn/notification.c:1071
 #, c-format
 msgid ""
 "The MSN server will shut down for maintenance in %d minute. You will "
@@ -6838,7 +6895,7 @@
 "\n"
 "Une fois la maintenance effectuée, vous pourrez vous reconnecter."
 
-#: src/protocols/msn/notification.c:1134
+#: src/protocols/msn/notification.c:1136
 msgid "Syncing with server"
 msgstr "Synchronisation avec le serveur"
 
@@ -6871,11 +6928,11 @@
 msgid "Received HTTP error. Please report this."
 msgstr "Réception d'une erreur HTTP. Veuillez la reporter."
 
-#: src/protocols/msn/switchboard.c:201
+#: src/protocols/msn/switchboard.c:191
 msgid "The conversation has become inactive and timed out."
 msgstr "La conversation est devenue inactive ou a été coupée"
 
-#: src/protocols/msn/switchboard.c:209
+#: src/protocols/msn/switchboard.c:199
 #, c-format
 msgid "%s has closed the conversation window."
 msgstr "%s a fermé sa fenêtre de dialogue"
@@ -6936,7 +6993,7 @@
 msgid "%s requested a PING"
 msgstr "%s a demandé un PING"
 
-#: src/protocols/napster/napster.c:541 src/protocols/oscar/oscar.c:6171
+#: src/protocols/napster/napster.c:541 src/protocols/oscar/oscar.c:6188
 #: src/protocols/toc/toc.c:1266
 msgid "_Group:"
 msgstr "_Groupe :"
@@ -6952,91 +7009,91 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/napster/napster.c:622 src/protocols/napster/napster.c:624
+#: src/protocols/napster/napster.c:624 src/protocols/napster/napster.c:626
 msgid "NAPSTER Protocol Plugin"
 msgstr "Plugin pour le protocole NAPSTER"
 
-#: src/protocols/novell/nmuser.c:2046
+#: src/protocols/novell/nmuser.c:1868
 msgid "Required parameters not passed in"
 msgstr "Les paramêtres nécessaires n'ont pas été passés"
 
-#: src/protocols/novell/nmuser.c:2049
+#: src/protocols/novell/nmuser.c:1871
 msgid "Unable to write to network"
 msgstr "Impossible d'écrire sur le réseau"
 
-#: src/protocols/novell/nmuser.c:2052
+#: src/protocols/novell/nmuser.c:1874
 msgid "Unable to read from network"
 msgstr "Impossible de lire depuis le réseau"
 
-#: src/protocols/novell/nmuser.c:2055
+#: src/protocols/novell/nmuser.c:1877
 msgid "Error communicating with server"
 msgstr "Erreur de communication avec le serveur"
 
-#: src/protocols/novell/nmuser.c:2059
+#: src/protocols/novell/nmuser.c:1881
 msgid "Conference not found"
 msgstr "Conférence non trouvée"
 
-#: src/protocols/novell/nmuser.c:2062
+#: src/protocols/novell/nmuser.c:1884
 msgid "Conference does not exist"
 msgstr "Cette conférence n'existe pas"
 
-#: src/protocols/novell/nmuser.c:2066
+#: src/protocols/novell/nmuser.c:1888
 msgid "A folder with that name already exists"
 msgstr "Un dossier avec ce nom existe déjà"
 
-#: src/protocols/novell/nmuser.c:2069
+#: src/protocols/novell/nmuser.c:1891
 msgid "Not supported"
 msgstr "Non supporté"
 
-#: src/protocols/novell/nmuser.c:2073
+#: src/protocols/novell/nmuser.c:1895
 msgid "Password has expired"
 msgstr "Le mot de passe a expiré"
 
-#: src/protocols/novell/nmuser.c:2076
+#: src/protocols/novell/nmuser.c:1898
 msgid "Invalid password"
 msgstr "Mot de passe non valide"
 
-#: src/protocols/novell/nmuser.c:2079
+#: src/protocols/novell/nmuser.c:1901
 msgid "User not found"
 msgstr "Utilisateur non trouvé"
 
-#: src/protocols/novell/nmuser.c:2082
+#: src/protocols/novell/nmuser.c:1904
 msgid "Account has been disabled"
 msgstr "Le compté a été désactivé"
 
-#: src/protocols/novell/nmuser.c:2085
+#: src/protocols/novell/nmuser.c:1907
 msgid "The server could not access the directory"
 msgstr "Le serveur ne peut pas accéder à l'annuaire"
 
-#: src/protocols/novell/nmuser.c:2088
+#: src/protocols/novell/nmuser.c:1910
 msgid "Your system administrator has disabled this operation"
 msgstr "Votre administrateur a désactivé cette commande"
 
-#: src/protocols/novell/nmuser.c:2091
+#: src/protocols/novell/nmuser.c:1913
 msgid "The server is unavailable; try again later"
 msgstr "Le serveur est non disponible. Veuillez réessayer plus tard."
 
-#: src/protocols/novell/nmuser.c:2094
+#: src/protocols/novell/nmuser.c:1916
 msgid "Cannot add a contact to the same folder twice"
 msgstr "Impossible d'ajouter un contact deux fois dans le même dossier"
 
-#: src/protocols/novell/nmuser.c:2097
+#: src/protocols/novell/nmuser.c:1919
 msgid "Cannot add yourself"
 msgstr "Impossible de s'ajouter en tant que contact"
 
-#: src/protocols/novell/nmuser.c:2100
+#: src/protocols/novell/nmuser.c:1922
 msgid "Master archive is misconfigured"
 msgstr "L'archive principale est mal configurée"
 
-#: src/protocols/novell/nmuser.c:2104
+#: src/protocols/novell/nmuser.c:1926
 msgid "Invalid username or password"
 msgstr "Nom d'utilisateur ou mot de passe non valide"
 
-#: src/protocols/novell/nmuser.c:2107
+#: src/protocols/novell/nmuser.c:1929
 msgid "Could not recognize the host of the username you entered"
 msgstr "Impossible de reconnaître le nom d'hôte ou d'utilisateur saisi"
 
-#: src/protocols/novell/nmuser.c:2110
+#: src/protocols/novell/nmuser.c:1932
 msgid ""
 "Your account has been disabled because too many invalid passwords were "
 "entered"
@@ -7044,31 +7101,31 @@
 "Votre compte a été désactivé à cause d'un trop grand nombre de mots de passe "
 "saisis incorrects."
 
-#: src/protocols/novell/nmuser.c:2113
+#: src/protocols/novell/nmuser.c:1935
 msgid "You cannot add the same person twice to a conversation"
 msgstr "Impossible d'ajouter deux fois la même personne dans une conversation"
 
-#: src/protocols/novell/nmuser.c:2117
+#: src/protocols/novell/nmuser.c:1939
 msgid "You have reached your limit for the number of contacts allowed"
 msgstr "Nombre maximum de contacts dans la liste atteint"
 
-#: src/protocols/novell/nmuser.c:2120
+#: src/protocols/novell/nmuser.c:1942
 msgid "You have entered an invalid username"
 msgstr "Nom d'utilisateur saisi non valide"
 
-#: src/protocols/novell/nmuser.c:2123
+#: src/protocols/novell/nmuser.c:1945
 msgid "An error occurred while updating the directory"
 msgstr "Erreur lors de la mise à jour de l'annuaire"
 
-#: src/protocols/novell/nmuser.c:2126
+#: src/protocols/novell/nmuser.c:1948
 msgid "Incompatible protocol version"
 msgstr "Version du protocole incompatible"
 
-#: src/protocols/novell/nmuser.c:2129
+#: src/protocols/novell/nmuser.c:1951
 msgid "The user has blocked you"
 msgstr "L'utilisateur vous a bloqué"
 
-#: src/protocols/novell/nmuser.c:2132
+#: src/protocols/novell/nmuser.c:1954
 msgid ""
 "This evaluation version does not allow more than ten users to log in at one "
 "time"
@@ -7076,11 +7133,11 @@
 "Cette version d'évaluation n'autorise pas plus de dix utilisateurs connectés "
 "à un instant."
 
-#: src/protocols/novell/nmuser.c:2135
+#: src/protocols/novell/nmuser.c:1957
 msgid "The user is either offline or you are blocked"
 msgstr "L'utilisateur est déconnecté ou vous bloque"
 
-#: src/protocols/novell/nmuser.c:2138
+#: src/protocols/novell/nmuser.c:1960
 #, c-format
 msgid "Unknown error: 0x%X"
 msgstr "Erreur inconnue :0x%X"
@@ -7168,7 +7225,7 @@
 msgid "Unable to remove %s from privacy list (%s)."
 msgstr "Impossible de supprimer %s de la liste de filtre (%s)"
 
-#: src/protocols/novell/novell.c:920 src/protocols/novell/novell.c:1573
+#: src/protocols/novell/novell.c:920 src/protocols/novell/novell.c:1574
 #, c-format
 msgid "Unable to change server side privacy settings (%s)."
 msgstr "Impossible de changer la configuration du filtre sur le serveur (%s)"
@@ -7178,11 +7235,11 @@
 msgid "Unable to create conference (%s)."
 msgstr "Impossible de créer la conférence (%s)"
 
-#: src/protocols/novell/novell.c:1103 src/protocols/novell/novell.c:1612
+#: src/protocols/novell/novell.c:1103 src/protocols/novell/novell.c:1613
 msgid "Error communicating with server. Closing connection."
 msgstr "Erreur de communication avec le serveur. Fermeture de la connexion."
 
-#: src/protocols/novell/novell.c:1425
+#: src/protocols/novell/novell.c:1426
 msgid "Userid"
 msgstr "Id utilisateur"
 
@@ -7193,46 +7250,46 @@
 #. tag, value);
 #. }
 #.
-#: src/protocols/novell/novell.c:1439
+#: src/protocols/novell/novell.c:1440
 msgid "Full name"
 msgstr "Nom complet"
 
-#: src/protocols/novell/novell.c:1459
+#: src/protocols/novell/novell.c:1460
 msgid "User Properties"
 msgstr "Propriétés de l'utilisateur"
 
-#: src/protocols/novell/novell.c:1563
+#: src/protocols/novell/novell.c:1564
 #, c-format
 msgid "GroupWise Conference %d"
 msgstr "Conférence GroupWise %d"
 
-#: src/protocols/novell/novell.c:1588
+#: src/protocols/novell/novell.c:1589
 msgid "Unable to make SSL connection to server."
 msgstr "Impossible de créer une connexion SSL vers le serveur"
 
-#: src/protocols/novell/novell.c:1618
+#: src/protocols/novell/novell.c:1619
 #, c-format
 msgid "Error processing event or response (%s)."
 msgstr "Erreur à la réception d'un événement ou réponse (%s)"
 
-#: src/protocols/novell/novell.c:1652
+#: src/protocols/novell/novell.c:1653
 msgid "Authenticating..."
 msgstr "Authentification en cours..."
 
-#: src/protocols/novell/novell.c:1667
+#: src/protocols/novell/novell.c:1668
 msgid "Waiting for response..."
 msgstr "En attente de réponse..."
 
-#: src/protocols/novell/novell.c:1802
+#: src/protocols/novell/novell.c:1803
 #, c-format
 msgid "%s has been invited to this conversation."
 msgstr "%s a reçu une invitation pour cette conversation."
 
-#: src/protocols/novell/novell.c:1829
+#: src/protocols/novell/novell.c:1830
 msgid "Invitation to Conversation"
 msgstr "Invitation à la conversation"
 
-#: src/protocols/novell/novell.c:1830
+#: src/protocols/novell/novell.c:1831
 #, c-format
 msgid ""
 "Invitation from: %s\n"
@@ -7243,17 +7300,17 @@
 "\n"
 "Envoyé : %s"
 
-#: src/protocols/novell/novell.c:1832
+#: src/protocols/novell/novell.c:1833
 msgid "Would you like to join the conversation?"
 msgstr "Voulez-vous joindre la conversation ?"
 
-#: src/protocols/novell/novell.c:1937
+#: src/protocols/novell/novell.c:1938
 msgid "You have been logged out because you logged in at another workstation."
 msgstr ""
 "Vous venez d'être déconnecté à la suite d'une connexion depuis un autre "
 "endroit."
 
-#: src/protocols/novell/novell.c:1991
+#: src/protocols/novell/novell.c:1992
 #, c-format
 msgid ""
 "%s appears to be offline and did not receive the message that you just sent."
@@ -7263,7 +7320,7 @@
 #. *  gaim_request_fields(gc, _("Server Address"),...);
 #.
 #. ...but for now just error out with a nice message.
-#: src/protocols/novell/novell.c:2089
+#: src/protocols/novell/novell.c:2090
 msgid ""
 "Unable to connect to server. Please enter the address of the server you wish "
 "to connect to."
@@ -7271,28 +7328,28 @@
 "Impossible de se connecter au serveur. Veuillez entrer l'adresse du serveur "
 "sur lequel vous voulez vous connecter."
 
-#: src/protocols/novell/novell.c:2111
+#: src/protocols/novell/novell.c:2112
 msgid "Error. SSL support is not installed."
 msgstr "Support SSL non installé"
 
-#: src/protocols/novell/novell.c:2420
+#: src/protocols/novell/novell.c:2421
 msgid "This conference has been closed. No more messages can be sent."
 msgstr "Cette conférence est fermée. Aucun message ne peut être envoyé."
 
-#: src/protocols/novell/novell.c:2727 src/protocols/oscar/oscar.c:582
-#: src/protocols/oscar/oscar.c:6473 src/protocols/yahoo/yahoo.c:2490
+#: src/protocols/novell/novell.c:2733 src/protocols/oscar/oscar.c:586
+#: src/protocols/oscar/oscar.c:6490 src/protocols/yahoo/yahoo.c:2513
 msgid "Offline"
 msgstr "Déconnecté"
 
-#: src/protocols/novell/novell.c:2738
+#: src/protocols/novell/novell.c:2744
 msgid "Message"
 msgstr "Message"
 
-#: src/protocols/novell/novell.c:2837 src/protocols/novell/novell.c:2893
+#: src/protocols/novell/novell.c:2843 src/protocols/novell/novell.c:2899
 msgid "Appear Offline"
 msgstr "Invisible"
 
-#: src/protocols/novell/novell.c:3287
+#: src/protocols/novell/novell.c:3293
 msgid "Initiate _Chat"
 msgstr "Lancer une _discussion"
 
@@ -7307,15 +7364,15 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/novell/novell.c:3381 src/protocols/novell/novell.c:3383
+#: src/protocols/novell/novell.c:3389 src/protocols/novell/novell.c:3391
 msgid "Novell GroupWise Messenger Protocol Plugin"
 msgstr "Plugin pour le protocole Novell GroupWise"
 
-#: src/protocols/novell/novell.c:3402
+#: src/protocols/novell/novell.c:3410
 msgid "Server address"
 msgstr "Hôte du serveur"
 
-#: src/protocols/novell/novell.c:3406
+#: src/protocols/novell/novell.c:3414
 msgid "Server port"
 msgstr "Port du serveur"
 
@@ -7415,157 +7472,165 @@
 msgid "Not while on AOL"
 msgstr "Impossible sur AOL"
 
-#: src/protocols/oscar/oscar.c:436
+#: src/protocols/oscar/oscar.c:403
+msgid ""
+"(There was an error converting this message.  The buddy you are speaking to "
+"most likely has a buggy client.)"
+msgstr ""
+"(Erreur de conversion du message. Votre contact a probablement un client "
+"défectueux)"
+
+#: src/protocols/oscar/oscar.c:441
 msgid "Voice"
 msgstr "Voix"
 
-#: src/protocols/oscar/oscar.c:439
+#: src/protocols/oscar/oscar.c:444
 msgid "AIM Direct IM"
 msgstr "Connexion directe AIM"
 
-#: src/protocols/oscar/oscar.c:442 src/protocols/silc/buddy.c:1497
-#: src/protocols/silc/silc.c:631
+#: src/protocols/oscar/oscar.c:447 src/protocols/silc/silc.c:635
+#: src/protocols/silc/util.c:506
 msgid "Chat"
 msgstr "Discussion"
 
-#: src/protocols/oscar/oscar.c:445 src/protocols/oscar/oscar.c:6777
+#: src/protocols/oscar/oscar.c:450 src/protocols/oscar/oscar.c:6793
 msgid "Get File"
 msgstr "Recevoir un fichier"
 
-#: src/protocols/oscar/oscar.c:452
+#: src/protocols/oscar/oscar.c:457
 msgid "Games"
 msgstr "Jeux"
 
-#: src/protocols/oscar/oscar.c:455
+#: src/protocols/oscar/oscar.c:460
 msgid "Add-Ins"
 msgstr "Modules"
 
-#: src/protocols/oscar/oscar.c:458
+#: src/protocols/oscar/oscar.c:463
 msgid "Send Buddy List"
 msgstr "Envoyer sa liste de contacts"
 
-#: src/protocols/oscar/oscar.c:461
+#: src/protocols/oscar/oscar.c:466
 msgid "ICQ Direct Connect"
 msgstr "Connexion directe ICQ"
 
-#: src/protocols/oscar/oscar.c:464
+#: src/protocols/oscar/oscar.c:469
 msgid "AP User"
 msgstr "Utilisateur AP"
 
-#: src/protocols/oscar/oscar.c:467
+#: src/protocols/oscar/oscar.c:472
 msgid "ICQ RTF"
 msgstr "RTF ICQ"
 
-#: src/protocols/oscar/oscar.c:470
+#: src/protocols/oscar/oscar.c:475
 msgid "Nihilist"
 msgstr "Nihiliste"
 
-#: src/protocols/oscar/oscar.c:473
+#: src/protocols/oscar/oscar.c:478
 msgid "ICQ Server Relay"
 msgstr "Relai de serveur ICQ"
 
-#: src/protocols/oscar/oscar.c:476
+#: src/protocols/oscar/oscar.c:481
 msgid "Old ICQ UTF8"
 msgstr "Ancien ICQ UTF8"
 
-#: src/protocols/oscar/oscar.c:479
+#: src/protocols/oscar/oscar.c:484
 msgid "Trillian Encryption"
 msgstr "Chiffrement Trillian"
 
-#: src/protocols/oscar/oscar.c:482
+#: src/protocols/oscar/oscar.c:487
 msgid "ICQ UTF8"
 msgstr "ICQ UTF8"
 
-#: src/protocols/oscar/oscar.c:485
+#: src/protocols/oscar/oscar.c:490
 msgid "Hiptop"
 msgstr "Hiptop"
 
-#: src/protocols/oscar/oscar.c:488
+#: src/protocols/oscar/oscar.c:493
 msgid "Security Enabled"
 msgstr "Sécurité activée"
 
-#: src/protocols/oscar/oscar.c:491
+#: src/protocols/oscar/oscar.c:496
 msgid "Video Chat"
 msgstr "Visioconférence"
 
-#: src/protocols/oscar/oscar.c:495
+#: src/protocols/oscar/oscar.c:500
 msgid "iChat AV"
 msgstr "Vidéo iChat"
 
-#: src/protocols/oscar/oscar.c:498
+#: src/protocols/oscar/oscar.c:503
 msgid "Live Video"
 msgstr "Live Video"
 
-#: src/protocols/oscar/oscar.c:501
+#: src/protocols/oscar/oscar.c:506
 msgid "Camera"
 msgstr "Camera"
 
-#: src/protocols/oscar/oscar.c:520 src/protocols/oscar/oscar.c:5477
-#: src/protocols/oscar/oscar.c:6666
+#: src/protocols/oscar/oscar.c:524 src/protocols/oscar/oscar.c:5493
+#: src/protocols/oscar/oscar.c:6683
 msgid "Free For Chat"
 msgstr "Libre pour discuter"
 
-#: src/protocols/oscar/oscar.c:524 src/protocols/oscar/oscar.c:5471
-#: src/protocols/oscar/oscar.c:6664
+#: src/protocols/oscar/oscar.c:528 src/protocols/oscar/oscar.c:5487
+#: src/protocols/oscar/oscar.c:6681
 msgid "Not Available"
 msgstr "Non disponible"
 
-#: src/protocols/oscar/oscar.c:526 src/protocols/oscar/oscar.c:5474
-#: src/protocols/oscar/oscar.c:6665
+#: src/protocols/oscar/oscar.c:530 src/protocols/oscar/oscar.c:5490
+#: src/protocols/oscar/oscar.c:6682
 msgid "Occupied"
 msgstr "Occupé"
 
-#: src/protocols/oscar/oscar.c:530
+#: src/protocols/oscar/oscar.c:534
 msgid "Web Aware"
 msgstr "Sur internet"
 
-#: src/protocols/oscar/oscar.c:598
+#: src/protocols/oscar/oscar.c:602
 msgid "Capabilities"
 msgstr "Possibilités"
 
-#: src/protocols/oscar/oscar.c:604
+#: src/protocols/oscar/oscar.c:609
 msgid "Buddy Comment"
 msgstr "Commentaire"
 
-#: src/protocols/oscar/oscar.c:739
+#: src/protocols/oscar/oscar.c:744
 #, c-format
 msgid "Direct IM with %s closed"
 msgstr "Connexion directe avec %s fermée"
 
-#: src/protocols/oscar/oscar.c:741
+#: src/protocols/oscar/oscar.c:746
 #, c-format
 msgid "Direct IM with %s failed"
 msgstr "Échec de la connexion directe avec %s"
 
-#: src/protocols/oscar/oscar.c:748
+#: src/protocols/oscar/oscar.c:753
 msgid "Direct Connect failed"
 msgstr "Échec de la connexion directe"
 
-#: src/protocols/oscar/oscar.c:825 src/protocols/oscar/oscar.c:956
+#: src/protocols/oscar/oscar.c:830 src/protocols/oscar/oscar.c:961
 #, c-format
 msgid "Direct IM with %s established"
 msgstr "Connexion directe avec %s établie"
 
-#: src/protocols/oscar/oscar.c:906
+#: src/protocols/oscar/oscar.c:911
 #, c-format
 msgid "Attempting to connect to %s at %s:%hu for Direct IM."
 msgstr "Tentative de connexion directe pour message vers %s à %s:%hu"
 
-#: src/protocols/oscar/oscar.c:1322
+#: src/protocols/oscar/oscar.c:1328
 #, c-format
 msgid "Asking %s to connect to us at %s:%hu for Direct IM."
 msgstr "Demande à %s de se connecter directement à %s:%hu pour le message"
 
-#: src/protocols/oscar/oscar.c:1327
+#: src/protocols/oscar/oscar.c:1333
 msgid "Unable to open Direct IM"
 msgstr "Impossible d'ouvrir une connexion directe"
 
-#: src/protocols/oscar/oscar.c:1362
+#: src/protocols/oscar/oscar.c:1368
 #, c-format
 msgid "You have selected to open a Direct IM connection with %s."
 msgstr "Connexion directe avec %s"
 
-#: src/protocols/oscar/oscar.c:1366
+#: src/protocols/oscar/oscar.c:1372
 msgid ""
 "Because this reveals your IP address, it may be considered a privacy risk.  "
 "Do you wish to continue?"
@@ -7573,24 +7638,24 @@
 "Cela révèle votre adresse IP et peut être considéré comme une faille de "
 "sécurité. Voulez-vous continuer ?"
 
-#: src/protocols/oscar/oscar.c:1370 src/protocols/oscar/oscar.c:3312
+#: src/protocols/oscar/oscar.c:1376 src/protocols/oscar/oscar.c:3328
 msgid "Connect"
 msgstr "Connecter"
 
-#: src/protocols/oscar/oscar.c:1436 src/protocols/toc/toc.c:872
+#: src/protocols/oscar/oscar.c:1442 src/protocols/toc/toc.c:872
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "Vous avez été déconnecté du salon %s"
 
-#: src/protocols/oscar/oscar.c:1452
+#: src/protocols/oscar/oscar.c:1458
 msgid "Chat is currently unavailable"
 msgstr "Les discussions sont inaccessibles pour l'instant"
 
-#: src/protocols/oscar/oscar.c:1533
+#: src/protocols/oscar/oscar.c:1539
 msgid "Screen name sent"
 msgstr "Pseudo envoyé"
 
-#: src/protocols/oscar/oscar.c:1547
+#: src/protocols/oscar/oscar.c:1553
 #, c-format
 msgid ""
 "Unable to login: Could not sign on as %s because the screen name is "
@@ -7601,46 +7666,46 @@
 "pseudos doivent soit commencer par une lettre et contenir uniquement des "
 "lettres, des chiffres et des espaces, soit contenir uniquement des chiffres."
 
-#: src/protocols/oscar/oscar.c:1575
+#: src/protocols/oscar/oscar.c:1581
 msgid "Unable to login to AIM"
 msgstr "Impossible de se connecter à AIM"
 
-#: src/protocols/oscar/oscar.c:1676 src/protocols/oscar/oscar.c:2103
+#: src/protocols/oscar/oscar.c:1682 src/protocols/oscar/oscar.c:2119
 msgid "Could Not Connect"
 msgstr "Impossible de se connecter"
 
-#: src/protocols/oscar/oscar.c:1684
+#: src/protocols/oscar/oscar.c:1690
 msgid "Connection established, cookie sent"
 msgstr "Connexion établie, cookie envoyé"
 
-#: src/protocols/oscar/oscar.c:1797 src/protocols/yahoo/yahoo_filexfer.c:180
+#: src/protocols/oscar/oscar.c:1803 src/protocols/yahoo/yahoo_filexfer.c:180
 #: src/protocols/yahoo/yahoo_filexfer.c:189
 #: src/protocols/yahoo/yahoo_filexfer.c:199
 msgid "Unable to establish file descriptor."
 msgstr "Impossible de créer un descripteur de fichier"
 
-#: src/protocols/oscar/oscar.c:1802
+#: src/protocols/oscar/oscar.c:1808
 msgid "Unable to create new connection."
 msgstr "Impossible de créer une nouvelle connexion"
 
-#: src/protocols/oscar/oscar.c:1873
+#: src/protocols/oscar/oscar.c:1879
 msgid "Unable to establish listener socket."
 msgstr "Impossible d'ouvrir le socket en attente de connexions"
 
-#: src/protocols/oscar/oscar.c:1987 src/protocols/toc/toc.c:541
+#: src/protocols/oscar/oscar.c:2003 src/protocols/toc/toc.c:541
 msgid "Incorrect nickname or password."
 msgstr "Pseudonyme ou mot de passe incorrect."
 
-#: src/protocols/oscar/oscar.c:1992
+#: src/protocols/oscar/oscar.c:2008
 msgid "Your account is currently suspended."
 msgstr "Votre compte est actuellement suspendu."
 
 #. service temporarily unavailable
-#: src/protocols/oscar/oscar.c:1996
+#: src/protocols/oscar/oscar.c:2012
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr "Le service est temporairement indisponible."
 
-#: src/protocols/oscar/oscar.c:2001
+#: src/protocols/oscar/oscar.c:2017
 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."
@@ -7649,23 +7714,23 @@
 "réessayez. Si vous persistez maintenant, il vous faudra attendre encore plus "
 "longtemps."
 
-#: src/protocols/oscar/oscar.c:2006
+#: src/protocols/oscar/oscar.c:2022
 #, c-format
 msgid "The client version you are using is too old. Please upgrade at %s"
 msgstr ""
 "La version du client que vous utilisez est trop ancienne. Veuillez la mettre "
 "à jour sur %s"
 
-#: src/protocols/oscar/oscar.c:2038
+#: src/protocols/oscar/oscar.c:2054
 msgid "Internal Error"
 msgstr "Erreur interne"
 
-#: src/protocols/oscar/oscar.c:2110
+#: src/protocols/oscar/oscar.c:2126
 msgid "Received authorization"
 msgstr "Autorisation reçue"
 
-#: src/protocols/oscar/oscar.c:2146 src/protocols/oscar/oscar.c:2176
-#: src/protocols/oscar/oscar.c:2264
+#: src/protocols/oscar/oscar.c:2162 src/protocols/oscar/oscar.c:2192
+#: src/protocols/oscar/oscar.c:2280
 #, c-format
 msgid ""
 "You may be disconnected shortly.  You may want to use TOC until this is "
@@ -7674,24 +7739,24 @@
 "Vous risquez être déconnecté sous peu. Essayer d'utiliser TOC en attendant. "
 "Regardez %s pour plus d'informations."
 
-#: src/protocols/oscar/oscar.c:2149 src/protocols/oscar/oscar.c:2179
+#: src/protocols/oscar/oscar.c:2165 src/protocols/oscar/oscar.c:2195
 msgid "Gaim was unable to get a valid AIM login hash."
 msgstr "Impossible de récupérer un code de connexion AIM."
 
-#: src/protocols/oscar/oscar.c:2267
+#: src/protocols/oscar/oscar.c:2283
 msgid "Gaim was unable to get a valid login hash."
 msgstr "Impossible de récupérer un code de connexion valide."
 
-#: src/protocols/oscar/oscar.c:3096 src/protocols/oscar/oscar.c:3118
+#: src/protocols/oscar/oscar.c:3112 src/protocols/oscar/oscar.c:3134
 msgid "(There was an error receiving this message)"
 msgstr "(Erreur pendant la réception de ce message)"
 
-#: src/protocols/oscar/oscar.c:3304
+#: src/protocols/oscar/oscar.c:3320
 #, c-format
 msgid "%s has just asked to directly connect to %s"
 msgstr "%s demande une connexion directe avec %s"
 
-#: src/protocols/oscar/oscar.c:3307
+#: src/protocols/oscar/oscar.c:3323
 msgid ""
 "This requires a direct connection between the two computers and is necessary "
 "for IM Images.  Because your IP address will be revealed, this may be "
@@ -7701,19 +7766,19 @@
 "d'images. Votre adresse IP sera révélée et ceci peut être considéré comme "
 "une faille de sécurité."
 
-#: src/protocols/oscar/oscar.c:3343
+#: src/protocols/oscar/oscar.c:3359
 msgid "Please authorize me so I can add you to my buddy list."
 msgstr "Autorise moi pour que je t'ajoute à ma liste de contacts."
 
-#: src/protocols/oscar/oscar.c:3351
+#: src/protocols/oscar/oscar.c:3367
 msgid "Authorization Request Message:"
 msgstr "Message pour la demande d'autorisation :"
 
-#: src/protocols/oscar/oscar.c:3352
+#: src/protocols/oscar/oscar.c:3368
 msgid "Please authorize me!"
 msgstr "Autorise moi, s'il te plaît !"
 
-#: src/protocols/oscar/oscar.c:3382
+#: src/protocols/oscar/oscar.c:3398
 #, c-format
 msgid ""
 "The user %s requires authorization before being added to a buddy list.  Do "
@@ -7722,23 +7787,23 @@
 "L'ajout de l'utilisateur %s à votre liste de contacts nécessite une "
 "autorisation. Voulez-vous envoyer une demande d'autorisation ?"
 
-#: src/protocols/oscar/oscar.c:3387 src/protocols/oscar/oscar.c:3389
+#: src/protocols/oscar/oscar.c:3403 src/protocols/oscar/oscar.c:3405
 msgid "Request Authorization"
 msgstr "Demande d'autorisation"
 
-#: src/protocols/oscar/oscar.c:3437 src/protocols/oscar/oscar.c:3439
-#: src/protocols/oscar/oscar.c:3446 src/protocols/oscar/oscar.c:3528
-#: src/protocols/oscar/oscar.c:3548 src/protocols/oscar/oscar.c:3902
-#: src/protocols/oscar/oscar.c:3962 src/protocols/oscar/oscar.c:6092
-#: src/protocols/oscar/oscar.c:6138
+#: src/protocols/oscar/oscar.c:3453 src/protocols/oscar/oscar.c:3455
+#: src/protocols/oscar/oscar.c:3462 src/protocols/oscar/oscar.c:3544
+#: src/protocols/oscar/oscar.c:3564 src/protocols/oscar/oscar.c:3918
+#: src/protocols/oscar/oscar.c:3978 src/protocols/oscar/oscar.c:6109
+#: src/protocols/oscar/oscar.c:6155
 msgid "No reason given."
 msgstr "Pas de raison"
 
-#: src/protocols/oscar/oscar.c:3445
+#: src/protocols/oscar/oscar.c:3461
 msgid "Authorization Denied Message:"
 msgstr "Message de refus d'autorisation :"
 
-#: src/protocols/oscar/oscar.c:3528
+#: src/protocols/oscar/oscar.c:3544
 #, c-format
 msgid ""
 "The user %u wants to add you to their buddy list for the following reason:\n"
@@ -7748,11 +7813,11 @@
 "suivante :\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:3536 src/protocols/oscar/oscar.c:6098
+#: src/protocols/oscar/oscar.c:3552 src/protocols/oscar/oscar.c:6115
 msgid "Authorization Request"
 msgstr "Demande d'autorisation"
 
-#: src/protocols/oscar/oscar.c:3548
+#: src/protocols/oscar/oscar.c:3564
 #, c-format
 msgid ""
 "The user %u has denied your request to add them to your buddy list for the "
@@ -7763,19 +7828,19 @@
 "contacts pour la raison suivante :\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:3549
+#: src/protocols/oscar/oscar.c:3565
 msgid "ICQ authorization denied."
 msgstr "Autorisation ICQ refusée"
 
 #. Someone has granted you authorization
-#: src/protocols/oscar/oscar.c:3556
+#: src/protocols/oscar/oscar.c:3572
 #, c-format
 msgid "The user %u has granted your request to add them to your buddy list."
 msgstr ""
 "L'utilisateur %u a accepté votre requête de le rajouter à votre liste de "
 "contacts."
 
-#: src/protocols/oscar/oscar.c:3564
+#: src/protocols/oscar/oscar.c:3580
 #, c-format
 msgid ""
 "You have received a special message\n"
@@ -7788,7 +7853,7 @@
 "De : %s [%s]\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:3572
+#: src/protocols/oscar/oscar.c:3588
 #, c-format
 msgid ""
 "You have received an ICQ page\n"
@@ -7801,7 +7866,7 @@
 "De : %s [%s]\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:3580
+#: src/protocols/oscar/oscar.c:3596
 #, c-format
 msgid ""
 "You have received an ICQ email from %s [%s]\n"
@@ -7814,20 +7879,20 @@
 "Le message est :\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:3601
+#: src/protocols/oscar/oscar.c:3617
 #, c-format
 msgid "ICQ user %u has sent you a buddy: %s (%s)"
 msgstr "L'utilisateur ICQ %u vous a envoyé un contact : %s (%s)"
 
-#: src/protocols/oscar/oscar.c:3607
+#: src/protocols/oscar/oscar.c:3623
 msgid "Do you want to add this buddy to your buddy list?"
 msgstr "Voulez-vous l'ajouter à votre liste de contacts ?"
 
-#: src/protocols/oscar/oscar.c:3611
+#: src/protocols/oscar/oscar.c:3627
 msgid "Decline"
 msgstr "Décliner"
 
-#: src/protocols/oscar/oscar.c:3696
+#: src/protocols/oscar/oscar.c:3712
 #, 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."
@@ -7835,7 +7900,7 @@
 msgstr[1] ""
 "Vous avez raté %hu messages de %s car les messages étaient non valides."
 
-#: src/protocols/oscar/oscar.c:3705
+#: src/protocols/oscar/oscar.c:3721
 #, 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."
@@ -7843,7 +7908,7 @@
 msgstr[1] ""
 "Vous avez raté %hu messages de %s car les messages étaient trop gros."
 
-#: src/protocols/oscar/oscar.c:3714
+#: src/protocols/oscar/oscar.c:3730
 #, c-format
 msgid ""
 "You missed %hu message from %s because the rate limit has been exceeded."
@@ -7853,75 +7918,70 @@
 msgstr[1] ""
 "Vous avez raté %hu messages de %s car le quota limite a été dépassé."
 
-#: src/protocols/oscar/oscar.c:3723
+#: src/protocols/oscar/oscar.c:3739
 #, 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] "Vous avez raté %hu message de %s car l'envoyeur est trop méchant."
 msgstr[1] "Vous avez raté %hu messages de %s car l'envoyeur est trop méchant."
 
-#: src/protocols/oscar/oscar.c:3732
+#: src/protocols/oscar/oscar.c:3748
 #, 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] "Vous avez raté %hu message de %s car vous êtes trop méchant."
 msgstr[1] "Vous avez raté %hu messages de %s car vous êtes trop méchant."
 
-#: src/protocols/oscar/oscar.c:3741
+#: src/protocols/oscar/oscar.c:3757
 #, 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] "Vous avez raté %hu message de %s pour des raisons inconnues."
 msgstr[1] "Vous avez raté %hu messages de %s pour des raisons inconnues."
 
-#: src/protocols/oscar/oscar.c:3798 src/protocols/oscar/oscar.c:4022
+#: src/protocols/oscar/oscar.c:3814 src/protocols/oscar/oscar.c:4038
 #, c-format
 msgid "Info for %s"
 msgstr "Informations pour %s"
 
-#: src/protocols/oscar/oscar.c:3803
-#, c-format
-msgid "<B>UIN:</B> %s<BR><B>Status:</B> %s<HR>%s"
-msgstr "<B>UIN :</B> %s<BR><B>Status :</B> %s<HR>%s"
-
-#: src/protocols/oscar/oscar.c:3864
+#: src/protocols/oscar/oscar.c:3880
 #, c-format
 msgid "SNAC threw error: %s\n"
 msgstr "SNAC a envoyé l'erreur : %s\n"
 
-#: src/protocols/oscar/oscar.c:3865
+#: src/protocols/oscar/oscar.c:3881
 msgid "Unknown error"
 msgstr "Erreur inconnue"
 
 #. Data is assumed to be the destination sn
-#: src/protocols/oscar/oscar.c:3900
+#: src/protocols/oscar/oscar.c:3916
 #, c-format
 msgid "Your message to %s did not get sent:"
 msgstr "Votre message pour %s n'a pas été envoyé :"
 
-#: src/protocols/oscar/oscar.c:3959
+#: src/protocols/oscar/oscar.c:3975
 #, c-format
 msgid "User information for %s unavailable:"
 msgstr "Les informations de %s ne sont pas disponibles :"
 
-#: src/protocols/oscar/oscar.c:3982
+#: src/protocols/oscar/oscar.c:3998
 msgid "Warning Level"
 msgstr "Niveau d'avertissement"
 
-#: src/protocols/oscar/oscar.c:3985
+#: src/protocols/oscar/oscar.c:4001
 msgid "Online Since"
 msgstr "En ligne depuis"
 
-#: src/protocols/oscar/oscar.c:3989 src/protocols/yahoo/yahoo_profile.c:1113
+#: src/protocols/oscar/oscar.c:4005 src/protocols/yahoo/yahoo_profile.c:1118
 msgid "Member Since"
 msgstr "Inscrit depuis"
 
-#: src/protocols/oscar/oscar.c:4073
+#: src/protocols/oscar/oscar.c:4089
 msgid "Your AIM connection may be lost."
 msgstr "Votre connexion AIM risque d'être coupée"
 
 #. The conversion failed!
-#: src/protocols/oscar/oscar.c:4259
+#: src/protocols/oscar/oscar.c:4275
 msgid ""
 "[Unable to display a message from this user because it contained invalid "
 "characters.]"
@@ -7929,11 +7989,11 @@
 "[Impossible d'afficher un message de cet utilisateur car il contient des "
 "caractères non valides.]"
 
-#: src/protocols/oscar/oscar.c:4476
+#: src/protocols/oscar/oscar.c:4492
 msgid "Rate limiting error."
 msgstr "Erreur de limite de quota"
 
-#: src/protocols/oscar/oscar.c:4477
+#: src/protocols/oscar/oscar.c:4493
 msgid ""
 "The last action you attempted could not be performed because you are over "
 "the rate limit. Please wait 10 seconds and try again."
@@ -7941,7 +8001,7 @@
 "La dernière action n'a pas pu être effectuée car vous avez depassé le quota "
 "limite. Veuillez attendre 10 secondes et réessayer."
 
-#: src/protocols/oscar/oscar.c:4540
+#: src/protocols/oscar/oscar.c:4556
 msgid ""
 "You have been disconnected because you have signed on with this screen name "
 "at another location."
@@ -7949,113 +8009,113 @@
 "Vous avez été déconnecté. Vous vous êtes connecté avec ce pseudo depuis un "
 "autre endroit."
 
-#: src/protocols/oscar/oscar.c:4542
+#: src/protocols/oscar/oscar.c:4558
 msgid "You have been signed off for an unknown reason."
 msgstr "Vous avez été déconnecté pour une raison inconnue."
 
-#: src/protocols/oscar/oscar.c:4573
+#: src/protocols/oscar/oscar.c:4589
 msgid "Finalizing connection"
 msgstr "Finalisation de la connexion"
 
-#: src/protocols/oscar/oscar.c:4843 src/protocols/oscar/oscar.c:4850
+#: src/protocols/oscar/oscar.c:4859 src/protocols/oscar/oscar.c:4866
 msgid "Email Address"
 msgstr "Adresse électronique"
 
-#: src/protocols/oscar/oscar.c:4855 src/protocols/silc/buddy.c:1524
+#: src/protocols/oscar/oscar.c:4871 src/protocols/silc/util.c:538
 msgid "Mobile Phone"
 msgstr "Numéro de portable"
 
-#: src/protocols/oscar/oscar.c:4856
+#: src/protocols/oscar/oscar.c:4872
 msgid "Not specified"
 msgstr "Non renseigné"
 
-#: src/protocols/oscar/oscar.c:4857 src/protocols/trepia/trepia.c:281
+#: src/protocols/oscar/oscar.c:4873 src/protocols/trepia/trepia.c:281
 #: src/protocols/trepia/trepia.c:407
 msgid "Female"
 msgstr "Femme"
 
-#: src/protocols/oscar/oscar.c:4857 src/protocols/trepia/trepia.c:280
+#: src/protocols/oscar/oscar.c:4873 src/protocols/trepia/trepia.c:280
 #: src/protocols/trepia/trepia.c:407
 msgid "Male"
 msgstr "Homme"
 
-#: src/protocols/oscar/oscar.c:4873
+#: src/protocols/oscar/oscar.c:4889
 msgid "Personal Web Page"
 msgstr "Page web perso"
 
-#: src/protocols/oscar/oscar.c:4877
+#: src/protocols/oscar/oscar.c:4893
 msgid "Additional Information"
 msgstr "Informations supplémentaires"
 
-#: src/protocols/oscar/oscar.c:4882
-msgid "Home Address"
-msgstr "Adresse personnelle"
-
-#: src/protocols/oscar/oscar.c:4886 src/protocols/oscar/oscar.c:4894
-msgid "Zip Code"
-msgstr "Code postal"
-
-#: src/protocols/oscar/oscar.c:4890
-msgid "Work Address"
-msgstr "Adresse professionnelle"
-
 #: src/protocols/oscar/oscar.c:4898
+msgid "Home Address"
+msgstr "Adresse personnelle"
+
+#: src/protocols/oscar/oscar.c:4902 src/protocols/oscar/oscar.c:4910
+msgid "Zip Code"
+msgstr "Code postal"
+
+#: src/protocols/oscar/oscar.c:4906
+msgid "Work Address"
+msgstr "Adresse professionnelle"
+
+#: src/protocols/oscar/oscar.c:4914
 msgid "Work Information"
 msgstr "Informations professionnelles"
 
-#: src/protocols/oscar/oscar.c:4899
+#: src/protocols/oscar/oscar.c:4915
 msgid "Company"
 msgstr "Société"
 
-#: src/protocols/oscar/oscar.c:4900
+#: src/protocols/oscar/oscar.c:4916
 msgid "Division"
 msgstr "Division"
 
-#: src/protocols/oscar/oscar.c:4901
+#: src/protocols/oscar/oscar.c:4917
 msgid "Position"
 msgstr "Poste"
 
-#: src/protocols/oscar/oscar.c:4903
+#: src/protocols/oscar/oscar.c:4919
 msgid "Web Page"
 msgstr "Page web"
 
-#: src/protocols/oscar/oscar.c:4909
+#: src/protocols/oscar/oscar.c:4925
 #, c-format
 msgid "ICQ Info for %s"
 msgstr "Informations ICQ pour %s :"
 
-#: src/protocols/oscar/oscar.c:4958
+#: src/protocols/oscar/oscar.c:4974
 msgid "Pop-Up Message"
 msgstr "Message en fenêtre"
 
-#: src/protocols/oscar/oscar.c:4979
+#: src/protocols/oscar/oscar.c:4995
 #, c-format
 msgid "The following screen names are associated with %s"
 msgstr "Les pseudos suivants sont associés a %s"
 
-#: src/protocols/oscar/oscar.c:4983
+#: src/protocols/oscar/oscar.c:4999
 msgid "Search Results"
 msgstr "Résultats de la recherche"
 
-#: src/protocols/oscar/oscar.c:5000
+#: src/protocols/oscar/oscar.c:5016
 #, c-format
 msgid "No results found for email address %s"
 msgstr "Aucun résultat pour l'adresse électronique %s"
 
-#: src/protocols/oscar/oscar.c:5021
+#: src/protocols/oscar/oscar.c:5037
 #, c-format
 msgid "You should receive an email asking to confirm %s."
 msgstr "Vous devriez recevoir un courrier électronique pour confirmer %s"
 
-#: src/protocols/oscar/oscar.c:5023
+#: src/protocols/oscar/oscar.c:5039
 msgid "Account Confirmation Requested"
 msgstr "Confirmation de compte demandée"
 
-#: src/protocols/oscar/oscar.c:5051
+#: src/protocols/oscar/oscar.c:5067
 msgid "Error Changing Account Info"
 msgstr "Erreur en changeant les informations du compte"
 
-#: src/protocols/oscar/oscar.c:5054
+#: src/protocols/oscar/oscar.c:5070
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
@@ -8064,7 +8124,7 @@
 "Erreur 0x%04x : Impossible d'afficher le pseudo parce que la version "
 "demandée diffère de l'originale."
 
-#: src/protocols/oscar/oscar.c:5057
+#: src/protocols/oscar/oscar.c:5073
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
@@ -8073,7 +8133,7 @@
 "Erreur 0x%04x : Impossible d'afficher le pseudo parce que la version "
 "demandée se finit par une espace."
 
-#: src/protocols/oscar/oscar.c:5060
+#: src/protocols/oscar/oscar.c:5076
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
@@ -8082,7 +8142,7 @@
 "Erreur 0x%04x : Impossible d'afficher le pseudo parce que la version "
 "demandée est trop longue"
 
-#: src/protocols/oscar/oscar.c:5063
+#: src/protocols/oscar/oscar.c:5079
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change email address because there is already a "
@@ -8091,7 +8151,7 @@
 "Erreur 0x%04x : Impossible de changer l'adresse électronique parce qu'il y a "
 "une requête en attente pour ce pseudo."
 
-#: src/protocols/oscar/oscar.c:5066
+#: src/protocols/oscar/oscar.c:5082
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change email address because the given address has "
@@ -8100,7 +8160,7 @@
 "Erreur 0x%04x : Impossible de changer l'adresse électronique parce qu'il y a "
 "trop de pseudos associés à cette adresse."
 
-#: src/protocols/oscar/oscar.c:5069
+#: src/protocols/oscar/oscar.c:5085
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change email address because the given address is "
@@ -8109,12 +8169,12 @@
 "Erreur 0x%04x : Impossible de changer l'adresse électronique parce qu'elle "
 "est non valide."
 
-#: src/protocols/oscar/oscar.c:5072
+#: src/protocols/oscar/oscar.c:5088
 #, c-format
 msgid "Error 0x%04x: Unknown error."
 msgstr "Erreur 0x%04x : Erreur inconnue."
 
-#: src/protocols/oscar/oscar.c:5082
+#: src/protocols/oscar/oscar.c:5098
 #, c-format
 msgid ""
 "Your screen name is currently formatted as follows:\n"
@@ -8123,27 +8183,27 @@
 "Votre pseudo est actuellement affiché comme cela :\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:5083 src/protocols/oscar/oscar.c:5090
+#: src/protocols/oscar/oscar.c:5099 src/protocols/oscar/oscar.c:5106
 msgid "Account Info"
 msgstr "Infos du compte"
 
-#: src/protocols/oscar/oscar.c:5088
+#: src/protocols/oscar/oscar.c:5104
 #, c-format
 msgid "The email address for %s is %s"
 msgstr "L'adresse électronique de %s est %s"
 
-#: src/protocols/oscar/oscar.c:5153
+#: src/protocols/oscar/oscar.c:5169
 msgid ""
 "Your IM Image was not sent. You must be Direct Connected to send IM Images."
 msgstr ""
 "Votre image instantanée n'a pas été envoyée. Vous devez utiliser une "
 "connexion directe pour envoyer des images."
 
-#: src/protocols/oscar/oscar.c:5326
+#: src/protocols/oscar/oscar.c:5342
 msgid "Unable to set AIM profile."
 msgstr "Impossible d'envoyer le profil AIM"
 
-#: src/protocols/oscar/oscar.c:5327
+#: src/protocols/oscar/oscar.c:5343
 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 "
@@ -8153,7 +8213,7 @@
 "connexion. Le profil n'a pas été changé. Réessayez une fois la connexion "
 "complète."
 
-#: src/protocols/oscar/oscar.c:5354
+#: src/protocols/oscar/oscar.c:5370
 #, c-format
 msgid ""
 "The maximum profile length of %d byte has been exceeded.  Gaim has truncated "
@@ -8168,19 +8228,19 @@
 "La taille maximale de %d caractères du profil a été dépassée. Gaim l'a "
 "tronqué lors de la mise à jour."
 
-#: src/protocols/oscar/oscar.c:5359
+#: src/protocols/oscar/oscar.c:5375
 msgid "Profile too long."
 msgstr "Profil trop long"
 
-#: src/protocols/oscar/oscar.c:5375 src/protocols/oscar/oscar.c:6671
+#: src/protocols/oscar/oscar.c:5391 src/protocols/oscar/oscar.c:6688
 msgid "Visible"
 msgstr "Visible"
 
-#: src/protocols/oscar/oscar.c:5393
+#: src/protocols/oscar/oscar.c:5409
 msgid "Unable to set AIM away message."
 msgstr "Impossible de mettre le message d'absence AIM"
 
-#: src/protocols/oscar/oscar.c:5394
+#: src/protocols/oscar/oscar.c:5410
 msgid ""
 "You have probably requested to set your away message before the login "
 "procedure completed.  You remain in a \"present\" state; try setting it "
@@ -8190,7 +8250,7 @@
 "connexion. Vous êtes toujours « En ligne. » Réessayez une fois la connexion "
 "complète."
 
-#: src/protocols/oscar/oscar.c:5434
+#: src/protocols/oscar/oscar.c:5450
 #, c-format
 msgid ""
 "The maximum away message length of %d byte has been exceeded.  Gaim has "
@@ -8205,11 +8265,11 @@
 "La taille maximale de %d caractères pour le message d'absence a été "
 "dépassée. Gaim l'a tronqué lors de la mise à jour."
 
-#: src/protocols/oscar/oscar.c:5439
+#: src/protocols/oscar/oscar.c:5455
 msgid "Away message too long."
 msgstr "Message d'absence trop long"
 
-#: src/protocols/oscar/oscar.c:5517
+#: src/protocols/oscar/oscar.c:5533
 #, c-format
 msgid ""
 "Could not add the buddy %s because the screen name is invalid.  Screen names "
@@ -8221,16 +8281,16 @@
 "uniquement des lettres, des chiffres et des espaces, soit contenir "
 "uniquement des chiffres."
 
-#: src/protocols/oscar/oscar.c:5518 src/protocols/oscar/oscar.c:5959
-#: src/protocols/oscar/oscar.c:5972
+#: src/protocols/oscar/oscar.c:5534 src/protocols/oscar/oscar.c:5976
+#: src/protocols/oscar/oscar.c:5989
 msgid "Unable To Add"
 msgstr "Impossible d'ajouter"
 
-#: src/protocols/oscar/oscar.c:5678
+#: src/protocols/oscar/oscar.c:5695
 msgid "Unable To Retrieve Buddy List"
 msgstr "Impossible de récupérer la liste de contacts"
 
-#: src/protocols/oscar/oscar.c:5679
+#: src/protocols/oscar/oscar.c:5696
 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 "
@@ -8239,13 +8299,13 @@
 "Gaim n'a pas pu récupérer la liste de contacts des serveurs AIM. La liste de "
 "contacts n'est pas perdue et sera de nouveau disponible dans quelques temps."
 
-#: src/protocols/oscar/oscar.c:5855 src/protocols/oscar/oscar.c:5856
-#: src/protocols/oscar/oscar.c:5861 src/protocols/oscar/oscar.c:6016
-#: src/protocols/oscar/oscar.c:6017 src/protocols/oscar/oscar.c:6022
+#: src/protocols/oscar/oscar.c:5872 src/protocols/oscar/oscar.c:5873
+#: src/protocols/oscar/oscar.c:5878 src/protocols/oscar/oscar.c:6033
+#: src/protocols/oscar/oscar.c:6034 src/protocols/oscar/oscar.c:6039
 msgid "Orphans"
 msgstr "Orphelins"
 
-#: src/protocols/oscar/oscar.c:5958
+#: src/protocols/oscar/oscar.c:5975
 #, c-format
 msgid ""
 "Could not add the buddy %s because you have too many buddies in your buddy "
@@ -8254,11 +8314,11 @@
 "Impossible de rajouter le contact %s parce qu'il y a trop de contacts dans "
 "la liste. Supprimez un contact et réessayez."
 
-#: src/protocols/oscar/oscar.c:5958 src/protocols/oscar/oscar.c:5971
+#: src/protocols/oscar/oscar.c:5975 src/protocols/oscar/oscar.c:5988
 msgid "(no name)"
 msgstr "(pas de nom)"
 
-#: src/protocols/oscar/oscar.c:5971
+#: src/protocols/oscar/oscar.c:5988
 #, c-format
 msgid ""
 "Could not add the buddy %s for an unknown reason.  The most common reason "
@@ -8269,7 +8329,7 @@
 "plus probable est que le nombre maximum de contact a été atteint dans votre "
 "liste de contacts."
 
-#: src/protocols/oscar/oscar.c:6053
+#: src/protocols/oscar/oscar.c:6070
 #, c-format
 msgid ""
 "The user %s has given you permission to add you to their buddy list.  Do you "
@@ -8278,11 +8338,11 @@
 "L'utilisateur %s vous a autorisé à l'ajouter à votre liste de contacts. "
 "Voulez-vous le faire ?"
 
-#: src/protocols/oscar/oscar.c:6059
+#: src/protocols/oscar/oscar.c:6076
 msgid "Authorization Given"
 msgstr "Autorisation donnée"
 
-#: src/protocols/oscar/oscar.c:6092
+#: src/protocols/oscar/oscar.c:6109
 #, c-format
 msgid ""
 "The user %s wants to add you to their buddy list for the following reason:\n"
@@ -8293,19 +8353,19 @@
 "%s"
 
 #. Granted
-#: src/protocols/oscar/oscar.c:6134
+#: src/protocols/oscar/oscar.c:6151
 #, c-format
 msgid "The user %s has granted your request to add them to your buddy list."
 msgstr ""
 "L'utilisateur %s a accepté votre demande de le rajouter à votre liste de "
 "contacts."
 
-#: src/protocols/oscar/oscar.c:6135
+#: src/protocols/oscar/oscar.c:6152
 msgid "Authorization Granted"
 msgstr "Autorisation accordée"
 
 #. Denied
-#: src/protocols/oscar/oscar.c:6138
+#: src/protocols/oscar/oscar.c:6155
 #, c-format
 msgid ""
 "The user %s has denied your request to add them to your buddy list for the "
@@ -8316,75 +8376,75 @@
 "contacts pour la raison suivante :\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:6139
+#: src/protocols/oscar/oscar.c:6156
 msgid "Authorization Denied"
 msgstr "Autorisation refusée"
 
-#: src/protocols/oscar/oscar.c:6176 src/protocols/toc/toc.c:1271
+#: src/protocols/oscar/oscar.c:6193 src/protocols/toc/toc.c:1271
 msgid "_Exchange:"
 msgstr "_Echange :"
 
-#: src/protocols/oscar/oscar.c:6198
+#: src/protocols/oscar/oscar.c:6215
 msgid "Invalid chat name specified."
 msgstr "Nom du salon de discussion non valide"
 
-#: src/protocols/oscar/oscar.c:6288
+#: src/protocols/oscar/oscar.c:6305
 msgid "Your IM Image was not sent. You cannot send IM Images in AIM chats."
 msgstr ""
 "Votre image instantanée n'a pas été envoyée. Vous ne pouvez pas envoyer "
 "d'images dans les discussions AIM."
 
-#: src/protocols/oscar/oscar.c:6445
+#: src/protocols/oscar/oscar.c:6462
 msgid "Away Message"
 msgstr "Message d'absence"
 
-#: src/protocols/oscar/oscar.c:6729
+#: src/protocols/oscar/oscar.c:6746
 msgid "Buddy Comment:"
 msgstr "Commentaire :"
 
-#: src/protocols/oscar/oscar.c:6747
+#: src/protocols/oscar/oscar.c:6764
 msgid "Edit Buddy Comment"
 msgstr "Éditer le commentaire"
 
-#: src/protocols/oscar/oscar.c:6753
+#: src/protocols/oscar/oscar.c:6770
 msgid "Get Status Msg"
 msgstr "Obtenir le status"
 
-#: src/protocols/oscar/oscar.c:6765
+#: src/protocols/oscar/oscar.c:6782
 msgid "Direct IM"
 msgstr "Connexion directe"
 
-#: src/protocols/oscar/oscar.c:6788
+#: src/protocols/oscar/oscar.c:6804
 msgid "Re-request Authorization"
 msgstr "Redemander autorisation"
 
-#: src/protocols/oscar/oscar.c:6818
+#: src/protocols/oscar/oscar.c:6834
 msgid "The new formatting is invalid."
 msgstr "Le nouvel affichage est non valide"
 
-#: src/protocols/oscar/oscar.c:6819
+#: src/protocols/oscar/oscar.c:6835
 msgid "Screen name formatting can change only capitalization and whitespace."
 msgstr ""
 "Le format d'affichage du pseudo permet uniquement de changer les majuscules "
 "et les espaces."
 
-#: src/protocols/oscar/oscar.c:6826
+#: src/protocols/oscar/oscar.c:6842
 msgid "New screen name formatting:"
 msgstr "Nouvel affichage pour le pseudo :"
 
-#: src/protocols/oscar/oscar.c:6878
+#: src/protocols/oscar/oscar.c:6894
 msgid "Change Address To:"
 msgstr "Nouvelle adresse :"
 
-#: src/protocols/oscar/oscar.c:6923
+#: src/protocols/oscar/oscar.c:6939
 msgid "<i>you are not waiting for authorization</i>"
 msgstr "<i>Vous n'attendez aucune autorisation</i>"
 
-#: src/protocols/oscar/oscar.c:6926
+#: src/protocols/oscar/oscar.c:6942
 msgid "You are awaiting authorization from the following buddies"
 msgstr "Vous attendez une autorisation des contacts suivants"
 
-#: src/protocols/oscar/oscar.c:6927
+#: src/protocols/oscar/oscar.c:6943
 msgid ""
 "You can re-request authorization from these buddies by right-clicking on "
 "them and selecting \"Re-request Authorization.\""
@@ -8392,75 +8452,75 @@
 "Vous pouvez redemander une autorisation de ces contacts en choisissant "
 "« Redemander autorisation » sur un clic-droit du contact."
 
-#: src/protocols/oscar/oscar.c:6944
+#: src/protocols/oscar/oscar.c:6960
 msgid "Find Buddy by E-mail"
 msgstr "Chercher un contact par adresse électronique"
 
-#: src/protocols/oscar/oscar.c:6945
+#: src/protocols/oscar/oscar.c:6961
 msgid "Search for a buddy by e-mail address"
 msgstr "Rechercher par adresse électronique"
 
-#: src/protocols/oscar/oscar.c:6946
+#: src/protocols/oscar/oscar.c:6962
 msgid "Type the e-mail address of the buddy you are searching for."
 msgstr "Saisissez l'adresse électronique du contact que vous cherchez"
 
-#: src/protocols/oscar/oscar.c:6963
+#: src/protocols/oscar/oscar.c:6979
 msgid "Available Message:"
 msgstr "Message de disponibilité :"
 
-#: src/protocols/oscar/oscar.c:6964
+#: src/protocols/oscar/oscar.c:6980
 msgid "I'm doing work and hoping for a distraction--IM me!"
 msgstr "Je travaille et j'espère une diversion. Dérangez-moi !"
 
-#: src/protocols/oscar/oscar.c:7045 src/protocols/silc/silc.c:782
+#: src/protocols/oscar/oscar.c:7061 src/protocols/silc/silc.c:789
 msgid "Set User Info..."
 msgstr "Éditer les informations..."
 
-#: src/protocols/oscar/oscar.c:7050
+#: src/protocols/oscar/oscar.c:7066
 msgid "Set User Info (URL)..."
 msgstr "Éditer les informations (URL)..."
 
-#: src/protocols/oscar/oscar.c:7056
+#: src/protocols/oscar/oscar.c:7072
 msgid "Set Available Message..."
 msgstr "Changer le message de disponibilité..."
 
-#: src/protocols/oscar/oscar.c:7061 src/protocols/silc/silc.c:778
+#: src/protocols/oscar/oscar.c:7077 src/protocols/silc/silc.c:785
 msgid "Change Password..."
 msgstr "Changer de mot de passe..."
 
-#: src/protocols/oscar/oscar.c:7066
+#: src/protocols/oscar/oscar.c:7082
 msgid "Change Password (URL)"
 msgstr "Changer de mot de passe (URL)"
 
-#: src/protocols/oscar/oscar.c:7070
+#: src/protocols/oscar/oscar.c:7086
 msgid "Configure IM Forwarding (URL)"
 msgstr "Configurer le transfert de message (URL)"
 
-#: src/protocols/oscar/oscar.c:7079
+#: src/protocols/oscar/oscar.c:7095
 msgid "Format Screen Name..."
 msgstr "Changer l'affichage du pseudo..."
 
-#: src/protocols/oscar/oscar.c:7083
+#: src/protocols/oscar/oscar.c:7099
 msgid "Confirm Account"
 msgstr "Confirmer le compte"
 
-#: src/protocols/oscar/oscar.c:7087
+#: src/protocols/oscar/oscar.c:7103
 msgid "Display Currently Registered Address"
 msgstr "Afficher l'adresse enregistrée"
 
-#: src/protocols/oscar/oscar.c:7091
+#: src/protocols/oscar/oscar.c:7107
 msgid "Change Currently Registered Address..."
 msgstr "Changer l'adresse enregistrée..."
 
-#: src/protocols/oscar/oscar.c:7098
+#: src/protocols/oscar/oscar.c:7114
 msgid "Show Buddies Awaiting Authorization"
 msgstr "Afficher les demandes d'autorisation"
 
-#: src/protocols/oscar/oscar.c:7104
+#: src/protocols/oscar/oscar.c:7120
 msgid "Search for Buddy by Email..."
 msgstr "Chercher par adresse électronique..."
 
-#: src/protocols/oscar/oscar.c:7109
+#: src/protocols/oscar/oscar.c:7125
 msgid "Search for Buddy by Information"
 msgstr "Chercher d'après les informations..."
 
@@ -8475,15 +8535,15 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/oscar/oscar.c:7225 src/protocols/oscar/oscar.c:7227
+#: src/protocols/oscar/oscar.c:7243 src/protocols/oscar/oscar.c:7245
 msgid "AIM/ICQ Protocol Plugin"
 msgstr "Plugin pour le protocole AIM/ICQ"
 
-#: src/protocols/oscar/oscar.c:7246
+#: src/protocols/oscar/oscar.c:7264
 msgid "Auth host"
 msgstr "Hôte d'authentification"
 
-#: src/protocols/oscar/oscar.c:7251
+#: src/protocols/oscar/oscar.c:7269
 msgid "Auth port"
 msgstr "Port d'authentification"
 
@@ -8570,32 +8630,32 @@
 msgstr "Mot de passe du message"
 
 #: src/protocols/silc/buddy.c:506 src/protocols/silc/buddy.c:541
-#: src/protocols/silc/ops.c:1080 src/protocols/silc/ops.c:1091
+#: src/protocols/silc/ops.c:1256 src/protocols/silc/ops.c:1267
 msgid "Get Public Key"
 msgstr "Récupérer la clef publique"
 
-#: src/protocols/silc/buddy.c:542 src/protocols/silc/ops.c:1081
-#: src/protocols/silc/ops.c:1092
+#: src/protocols/silc/buddy.c:542 src/protocols/silc/ops.c:1257
+#: src/protocols/silc/ops.c:1268
 msgid "Cannot fetch the public key"
 msgstr "Impossible de récupérer la clef publique"
 
-#: src/protocols/silc/buddy.c:629 src/protocols/silc/buddy.c:1619
+#: src/protocols/silc/buddy.c:629 src/protocols/silc/buddy.c:1544
 msgid "Show Public Key"
 msgstr "Afficher la clef publique"
 
 #: src/protocols/silc/buddy.c:630 src/protocols/silc/buddy.c:989
-#: src/protocols/silc/chat.c:219
+#: src/protocols/silc/chat.c:222
 msgid "Could not load public key"
 msgstr "Impossible de charger la clef publique"
 
-#: src/protocols/silc/buddy.c:707 src/protocols/silc/ops.c:837
-#: src/protocols/silc/ops.c:908 src/protocols/silc/ops.c:991
-#: src/protocols/silc/ops.c:992 src/protocols/silc/ops.c:998
-#: src/protocols/silc/ops.c:999
+#: src/protocols/silc/buddy.c:707 src/protocols/silc/ops.c:853
+#: src/protocols/silc/ops.c:925 src/protocols/silc/ops.c:1060
+#: src/protocols/silc/ops.c:1061 src/protocols/silc/ops.c:1079
 msgid "User Information"
 msgstr "Informations"
 
-#: src/protocols/silc/buddy.c:708 src/protocols/silc/ops.c:909
+#: src/protocols/silc/buddy.c:708 src/protocols/silc/ops.c:926
+#: src/protocols/silc/ops.c:1080
 msgid "Cannot get user information"
 msgstr "Impossible de récupérer les informations"
 
@@ -8612,6 +8672,11 @@
 "Impossible de recevoir des notifications d'un contact avant d'importer sa "
 "clef publique. Utilisez « Récupérer clef publique » pour l'importer."
 
+#. Open file selector to select the public key.
+#: src/protocols/silc/buddy.c:1023
+msgid "Open..."
+msgstr "Ouvrir..."
+
 #: src/protocols/silc/buddy.c:1032
 #, c-format
 msgid "The %s buddy is not present in the network"
@@ -8672,143 +8737,111 @@
 msgid "Robot"
 msgstr "Robot"
 
-#: src/protocols/silc/buddy.c:1396 src/protocols/silc/buddy.c:1464
-#: src/protocols/silc/silc.c:606
+#: src/protocols/silc/buddy.c:1396 src/protocols/silc/silc.c:610
+#: src/protocols/silc/util.c:469
 msgid "Happy"
 msgstr "Heureux"
 
-#: src/protocols/silc/buddy.c:1398 src/protocols/silc/buddy.c:1466
-#: src/protocols/silc/silc.c:608
+#: src/protocols/silc/buddy.c:1398 src/protocols/silc/silc.c:612
+#: src/protocols/silc/util.c:471
 msgid "Sad"
 msgstr "Triste"
 
-#: src/protocols/silc/buddy.c:1400 src/protocols/silc/buddy.c:1468
-#: src/protocols/silc/silc.c:610
+#: src/protocols/silc/buddy.c:1400 src/protocols/silc/silc.c:614
+#: src/protocols/silc/util.c:473
 msgid "Angry"
 msgstr "En colère"
 
-#: src/protocols/silc/buddy.c:1402 src/protocols/silc/buddy.c:1470
-#: src/protocols/silc/silc.c:612
+#: src/protocols/silc/buddy.c:1402 src/protocols/silc/silc.c:616
+#: src/protocols/silc/util.c:475
 msgid "Jealous"
 msgstr "Jaloux"
 
-#: src/protocols/silc/buddy.c:1404 src/protocols/silc/buddy.c:1472
-#: src/protocols/silc/silc.c:614
+#: src/protocols/silc/buddy.c:1404 src/protocols/silc/silc.c:618
+#: src/protocols/silc/util.c:477
 msgid "Ashamed"
 msgstr "Honteux"
 
-#: src/protocols/silc/buddy.c:1406 src/protocols/silc/buddy.c:1474
-#: src/protocols/silc/silc.c:616
+#: src/protocols/silc/buddy.c:1406 src/protocols/silc/silc.c:620
+#: src/protocols/silc/util.c:479
 msgid "Invincible"
 msgstr "Invincible"
 
-#: src/protocols/silc/buddy.c:1408 src/protocols/silc/buddy.c:1476
-#: src/protocols/silc/silc.c:618
+#: src/protocols/silc/buddy.c:1408 src/protocols/silc/silc.c:622
+#: src/protocols/silc/util.c:481
 msgid "In Love"
 msgstr "Amoureux"
 
-#: src/protocols/silc/buddy.c:1410 src/protocols/silc/buddy.c:1478
-#: src/protocols/silc/silc.c:620
+#: src/protocols/silc/buddy.c:1410 src/protocols/silc/silc.c:624
+#: src/protocols/silc/util.c:483
 msgid "Sleepy"
 msgstr "Somnolant"
 
-#: src/protocols/silc/buddy.c:1412 src/protocols/silc/buddy.c:1480
-#: src/protocols/silc/silc.c:622
+#: src/protocols/silc/buddy.c:1412 src/protocols/silc/silc.c:626
+#: src/protocols/silc/util.c:485
 msgid "Bored"
 msgstr "Ennuyé"
 
-#: src/protocols/silc/buddy.c:1414 src/protocols/silc/buddy.c:1482
-#: src/protocols/silc/silc.c:624
+#: src/protocols/silc/buddy.c:1414 src/protocols/silc/silc.c:628
+#: src/protocols/silc/util.c:487
 msgid "Excited"
 msgstr "Excité"
 
-#: src/protocols/silc/buddy.c:1416 src/protocols/silc/buddy.c:1484
-#: src/protocols/silc/silc.c:626
+#: src/protocols/silc/buddy.c:1416 src/protocols/silc/silc.c:630
+#: src/protocols/silc/util.c:489
 msgid "Anxious"
 msgstr "Anxieux"
 
-#: src/protocols/silc/buddy.c:1452
-msgid "Modes"
-msgstr "Modes"
-
-#: src/protocols/silc/buddy.c:1462
+#: src/protocols/silc/buddy.c:1448 src/protocols/silc/ops.c:962
+msgid "User Modes"
+msgstr "Mode utilisateur"
+
+#: src/protocols/silc/buddy.c:1457 src/protocols/silc/ops.c:971
 msgid "Mood"
 msgstr "Humeur"
 
-#: src/protocols/silc/buddy.c:1490
+#: src/protocols/silc/buddy.c:1461 src/protocols/silc/ops.c:977
 msgid "Status Text"
 msgstr "Texte de status"
 
-#: src/protocols/silc/buddy.c:1495
+#: src/protocols/silc/buddy.c:1466 src/protocols/silc/ops.c:983
 msgid "Preferred Contact"
 msgstr "Méthodes de contact préférées"
 
-#: src/protocols/silc/buddy.c:1503
-msgid "Paging"
-msgstr "Bipeur"
-
-#: src/protocols/silc/buddy.c:1505 src/protocols/silc/silc.c:637
-msgid "SMS"
-msgstr "SMS"
-
-#: src/protocols/silc/buddy.c:1507 src/protocols/silc/silc.c:639
-msgid "MMS"
-msgstr "MMS"
-
-#: src/protocols/silc/buddy.c:1509 src/protocols/silc/silc.c:641
-msgid "Video Conferencing"
-msgstr "Visioconférence"
-
-#: src/protocols/silc/buddy.c:1515
+#: src/protocols/silc/buddy.c:1471 src/protocols/silc/ops.c:988
 msgid "Preferred Language"
 msgstr "Langue préférée"
 
-#: src/protocols/silc/buddy.c:1520
+#: src/protocols/silc/buddy.c:1476 src/protocols/silc/ops.c:993
 msgid "Device"
 msgstr "Appareil"
 
-#: src/protocols/silc/buddy.c:1522
-msgid "Computer"
-msgstr "Ordinateur"
-
-#: src/protocols/silc/buddy.c:1526
-msgid "PDA"
-msgstr "PDA"
-
-#: src/protocols/silc/buddy.c:1528
-msgid "Terminal"
-msgstr "Terminal"
-
-#: src/protocols/silc/buddy.c:1539 src/protocols/silc/silc.c:674
-#: src/protocols/silc/silc.c:676
+#: src/protocols/silc/buddy.c:1481 src/protocols/silc/ops.c:998
+#: src/protocols/silc/silc.c:678 src/protocols/silc/silc.c:680
 msgid "Timezone"
 msgstr "Fuseau horaire"
 
-#: src/protocols/silc/buddy.c:1545
+#: src/protocols/silc/buddy.c:1486 src/protocols/silc/ops.c:1003
 msgid "Geolocation"
 msgstr "Localisation"
 
-#: src/protocols/silc/buddy.c:1604
+#: src/protocols/silc/buddy.c:1529
 msgid "Reset IM Key"
 msgstr "Remise à zéro de la clef de message"
 
-#: src/protocols/silc/buddy.c:1609
+#: src/protocols/silc/buddy.c:1534
 msgid "IM with Key Exchange"
 msgstr "Message avec échange de clef"
 
-#: src/protocols/silc/buddy.c:1613
+#: src/protocols/silc/buddy.c:1538
 msgid "IM with Password"
 msgstr "Message avec mot de passe"
 
-#: src/protocols/silc/buddy.c:1624
+#: src/protocols/silc/buddy.c:1549
 msgid "Get Public Key..."
 msgstr "Récupérer la clef publique..."
 
-#: src/protocols/silc/buddy.c:1629
-msgid "Send File..."
-msgstr "Envoyer un fichier..."
-
-#: src/protocols/silc/buddy.c:1634 src/protocols/silc/ops.c:1127
+#: src/protocols/silc/buddy.c:1555 src/protocols/silc/ops.c:1389
 msgid "Kill User"
 msgstr "Tuer l'utilisateur"
 
@@ -8821,8 +8854,7 @@
 msgid "Channel %s does not exist in the network"
 msgstr "Le salon %s n'existe pas sur le réseau"
 
-#: src/protocols/silc/chat.c:67 src/protocols/silc/chat.c:154
-#: src/protocols/silc/chat.c:155
+#: src/protocols/silc/chat.c:67 src/protocols/silc/chat.c:159
 msgid "Channel Information"
 msgstr "Informations du salon"
 
@@ -8830,90 +8862,68 @@
 msgid "Cannot get channel information"
 msgstr "Impossible de récupérer les informations du salon"
 
-#: src/protocols/silc/chat.c:104
-#, c-format
-msgid "Channel Name:\t\t%s\n"
-msgstr "Nom du salon : %s\n"
-
-#: src/protocols/silc/chat.c:106
-#, c-format
-msgid "User Count:\t\t%d\n"
-msgstr "Nombre d'utilisateurs : %d\n"
-
-#: src/protocols/silc/chat.c:112
-#, c-format
-msgid "Channel Founder:\t%s\n"
-msgstr "Fondateur du salon : %s\n"
-
-#: src/protocols/silc/chat.c:120
-#, c-format
-msgid "Channel Cipher:\t\t%s\n"
-msgstr "Phrase clef du salon : %s\n"
-
-#: src/protocols/silc/chat.c:123
-#, c-format
-msgid "Channel HMAC:\t\t%s\n"
-msgstr "Clef HMAC du salon : %s\n"
+#: src/protocols/silc/chat.c:105
+#, c-format
+msgid "<b>Channel Name:</b> %s"
+msgstr "<b>Nom du salon :</b> %s"
+
+#: src/protocols/silc/chat.c:108
+#, c-format
+msgid "<br><b>User Count:</b> %d"
+msgstr "<br><b>Nombre d'utilisateurs :</b> %d"
+
+#: src/protocols/silc/chat.c:115
+#, c-format
+msgid "<br><b>Channel Founder:</b> %s"
+msgstr "<br><b>Fondateur du salon :</b> %s"
+
+#: src/protocols/silc/chat.c:124
+#, c-format
+msgid "<br><b>Channel Cipher:</b> %s"
+msgstr "<br><b>Phrase clef du salon :</b> %s"
 
 #: src/protocols/silc/chat.c:127
 #, c-format
-msgid ""
-"\n"
-"Channel Topic:\n"
-"\t%s\n"
-msgstr ""
-"\n"
-"Sujet :\n"
-"%s\n"
-
-#: src/protocols/silc/chat.c:130
-msgid ""
-"\n"
-"Channel Modes:\n"
-msgstr ""
-"\n"
-"Mode du salon :\n"
-
-#: src/protocols/silc/chat.c:144
-#, c-format
-msgid ""
-"\n"
-"Founder Key Fingerprint:\n"
-"%s\n"
-"\n"
-msgstr ""
-"\n"
-"Empreinte de clef publique du fondateur :\n"
-"%s\n"
-"\n"
-
-#: src/protocols/silc/chat.c:145
-#, c-format
-msgid ""
-"Founder Key Babbleprint:\n"
-"%s"
-msgstr ""
-"Babillage de clef publique du fondateur :\n"
-"%s"
-
-#: src/protocols/silc/chat.c:218
+msgid "<br><b>Channel HMAC:</b> %s"
+msgstr "<br><b>Clef HMAC du salon :</b> %s"
+
+#: src/protocols/silc/chat.c:132
+#, c-format
+msgid "<br><b>Channel Topic:</b><br>%s"
+msgstr "<br><b>Sujet :</b><br>%s"
+
+#: src/protocols/silc/chat.c:137
+msgid "<br><b>Channel Modes:</b> "
+msgstr "<br><b>Mode du salon :</b> "
+
+#: src/protocols/silc/chat.c:150
+#, c-format
+msgid "<br><b>Founder Key Fingerprint:</b><br>%s"
+msgstr "<br><b>Empreinte de clef publique du fondateur :</b><br>%s"
+
+#: src/protocols/silc/chat.c:151
+#, c-format
+msgid "<br><b>Founder Key Babbleprint:</b><br>%s"
+msgstr "<br><b>Babillage de clef publique du fondateur :</b><br>%s"
+
+#: src/protocols/silc/chat.c:221
 msgid "Add Channel Public Key"
 msgstr "Ajouter une clef publique au salon"
 
 #. Add new public key
-#: src/protocols/silc/chat.c:273
+#: src/protocols/silc/chat.c:276
 msgid "Open Public Key..."
 msgstr "Ouvrir clef publique..."
 
-#: src/protocols/silc/chat.c:382
+#: src/protocols/silc/chat.c:385
 msgid "Channel Passphrase"
 msgstr "Phrase clef du salon"
 
-#: src/protocols/silc/chat.c:389
+#: src/protocols/silc/chat.c:392
 msgid "Channel Public Keys List"
 msgstr "Clefs publiques du salon"
 
-#: src/protocols/silc/chat.c:394
+#: src/protocols/silc/chat.c:397
 msgid ""
 "Channel authentication is used to secure the channel from unauthorized "
 "access. The authentication may be based on passphrase and digital "
@@ -8927,124 +8937,124 @@
 "nécessaire pour joindre le salon. Si des clefs publiques sont utilisées, "
 "seuls les utilisateurs de ces clefs peuvent joindre le salon."
 
-#: src/protocols/silc/chat.c:403 src/protocols/silc/chat.c:404
-#: src/protocols/silc/chat.c:441 src/protocols/silc/chat.c:442
-#: src/protocols/silc/chat.c:871
+#: src/protocols/silc/chat.c:406 src/protocols/silc/chat.c:407
+#: src/protocols/silc/chat.c:444 src/protocols/silc/chat.c:445
+#: src/protocols/silc/chat.c:874
 msgid "Channel Authentication"
 msgstr "Authentification du salon"
 
-#: src/protocols/silc/chat.c:405 src/protocols/silc/chat.c:443
+#: src/protocols/silc/chat.c:408 src/protocols/silc/chat.c:446
 msgid "Add / Remove"
 msgstr "Ajouter/Supprimer"
 
-#: src/protocols/silc/chat.c:560
+#: src/protocols/silc/chat.c:563
 msgid "Group Name"
 msgstr "Nom du groupe"
 
-#: src/protocols/silc/chat.c:564 src/protocols/silc/ops.c:1403
+#: src/protocols/silc/chat.c:567 src/protocols/silc/ops.c:1669
 msgid "Passphrase"
 msgstr "Phrase clef"
 
-#: src/protocols/silc/chat.c:575
+#: src/protocols/silc/chat.c:578
 #, c-format
 msgid "Please enter the %s channel private group name and passphrase."
 msgstr "Saisissez le groupe privé et la phrase clef du salon %s"
 
-#: src/protocols/silc/chat.c:577
+#: src/protocols/silc/chat.c:580
 msgid "Add Channel Private Group"
 msgstr "Ajouter un groupe privé au salon"
 
-#: src/protocols/silc/chat.c:704
+#: src/protocols/silc/chat.c:707
 msgid "User Limit"
 msgstr "Limite d'utilisateurs"
 
-#: src/protocols/silc/chat.c:705
+#: src/protocols/silc/chat.c:708
 msgid "Set user limit on channel. Set to zero to reset user limit."
 msgstr ""
 "Nombre d'utilisateurs maximum du salon. Zéro pour ne pas mettre de limite."
 
-#: src/protocols/silc/chat.c:847
+#: src/protocols/silc/chat.c:850
 msgid "Get Info"
 msgstr "Infos"
 
-#: src/protocols/silc/chat.c:854
+#: src/protocols/silc/chat.c:857
 msgid "Invite List"
 msgstr "Liste d'invitations"
 
-#: src/protocols/silc/chat.c:858
+#: src/protocols/silc/chat.c:861
 msgid "Ban List"
 msgstr "Liste des bannissements"
 
-#: src/protocols/silc/chat.c:865
+#: src/protocols/silc/chat.c:868
 msgid "Add Private Group"
 msgstr "Nouveau groupe privé"
 
-#: src/protocols/silc/chat.c:876
+#: src/protocols/silc/chat.c:879
 msgid "Reset Permanent"
 msgstr "Enlever le mode permanent"
 
-#: src/protocols/silc/chat.c:880
+#: src/protocols/silc/chat.c:883
 msgid "Set Permanent"
 msgstr "Mettre le mode permanent"
 
-#: src/protocols/silc/chat.c:887
+#: src/protocols/silc/chat.c:890
 msgid "Set User Limit"
 msgstr "Choisir la limite d'utilisateurs"
 
-#: src/protocols/silc/chat.c:892
+#: src/protocols/silc/chat.c:895
 msgid "Reset Topic Restriction"
 msgstr "Enlever le mode sujet restreint"
 
-#: src/protocols/silc/chat.c:896
+#: src/protocols/silc/chat.c:899
 msgid "Set Topic Restriction"
 msgstr "Mettre le mode sujet restreint"
 
-#: src/protocols/silc/chat.c:902
+#: src/protocols/silc/chat.c:905
 msgid "Reset Private Channel"
 msgstr "Enlevet le mode privé"
 
-#: src/protocols/silc/chat.c:906
+#: src/protocols/silc/chat.c:909
 msgid "Set Private Channel"
 msgstr "Mettre le mode privé"
 
-#: src/protocols/silc/chat.c:912
+#: src/protocols/silc/chat.c:915
 msgid "Reset Secret Channel"
 msgstr "Enlever le mode secret"
 
-#: src/protocols/silc/chat.c:916
+#: src/protocols/silc/chat.c:919
 msgid "Set Secret Channel"
 msgstr "Mettre le mode secret"
 
-#: src/protocols/silc/chat.c:986
+#: src/protocols/silc/chat.c:989
 #, c-format
 msgid "You are channel founder on <I>%s</I>"
 msgstr "Vous avez fondé le salon sur <I>%s</I>"
 
-#: src/protocols/silc/chat.c:990
+#: src/protocols/silc/chat.c:993
 #, c-format
 msgid "Channel founder on <I>%s</I> is <I>%s</I>"
 msgstr "<I>%2$s</I> a fondé le salon sur <I>%1$s</I>"
 
-#: src/protocols/silc/chat.c:1040
+#: src/protocols/silc/chat.c:1046
 #, c-format
 msgid ""
 "You have to join the %s channel before you are able to join the private group"
 msgstr ""
 "Vous devez entrer dans le salon %s avant de pouvoir intégrer le groupe privé"
 
-#: src/protocols/silc/chat.c:1042
+#: src/protocols/silc/chat.c:1048
 msgid "Join Private Group"
 msgstr "Joindre un groupe privé"
 
-#: src/protocols/silc/chat.c:1043
+#: src/protocols/silc/chat.c:1049
 msgid "Cannot join private group"
 msgstr "Impossible de joindre le groupe privé"
 
-#: src/protocols/silc/chat.c:1225 src/protocols/silc/silc.c:875
+#: src/protocols/silc/chat.c:1242 src/protocols/silc/silc.c:888
 msgid "Cannot call command"
 msgstr "Impossible de lancer la commande"
 
-#: src/protocols/silc/chat.c:1226 src/protocols/silc/silc.c:876
+#: src/protocols/silc/chat.c:1243 src/protocols/silc/silc.c:889
 msgid "Unknown command"
 msgstr "Commande inconnue"
 
@@ -9095,227 +9105,281 @@
 msgstr "Impossible d'envoyer le fichier"
 
 # c-format
-#: src/protocols/silc/ops.c:324 src/protocols/silc/ops.c:331
-#: src/protocols/silc/ops.c:338
+#: src/protocols/silc/ops.c:333 src/protocols/silc/ops.c:342
+#: src/protocols/silc/ops.c:351
 #, c-format
 msgid "%s has changed the topic of <I>%s</I> to: %s"
 msgstr "%s a changé le sujet de <I>%s</I> en : %s"
 
-#: src/protocols/silc/ops.c:398
+#: src/protocols/silc/ops.c:413
 #, c-format
 msgid "<I>%s</I> set channel <I>%s</I> modes to: %s"
 msgstr "<I>%s</I> change le mode de <I>%s</I> en : %s"
 
-#: src/protocols/silc/ops.c:402
+#: src/protocols/silc/ops.c:417
 #, c-format
 msgid "<I>%s</I> removed all channel <I>%s</I> modes"
 msgstr "<I>%s</I> a supprimé tous les modes de <I>%s</I>"
 
-#: src/protocols/silc/ops.c:433
+#: src/protocols/silc/ops.c:448
 #, c-format
 msgid "<I>%s</I> set <I>%s's</I> modes to: %s"
 msgstr "<I>%s</I> change le mode de <I>%s</I> en : %s"
 
-#: src/protocols/silc/ops.c:437
+#: src/protocols/silc/ops.c:452
 #, c-format
 msgid "<I>%s</I> removed all <I>%s's</I> modes"
 msgstr "<I>%s</I> a supprimé tous les modes de <I>%s</I>"
 
-#: src/protocols/silc/ops.c:464
+#: src/protocols/silc/ops.c:479
 #, c-format
 msgid "You have been kicked off <I>%s</I> by <I>%s</I> (%s)"
 msgstr "Vous avez été expulsé de <I>%s</I> par <I>%s</I> (%s)"
 
-#: src/protocols/silc/ops.c:494 src/protocols/silc/ops.c:499
-#: src/protocols/silc/ops.c:504
+#: src/protocols/silc/ops.c:509 src/protocols/silc/ops.c:514
+#: src/protocols/silc/ops.c:519
 #, c-format
 msgid "You have been killed by %s (%s)"
 msgstr "Vous avez été tué par %s (%s)"
 
-#: src/protocols/silc/ops.c:525 src/protocols/silc/ops.c:530
-#: src/protocols/silc/ops.c:535
+#: src/protocols/silc/ops.c:540 src/protocols/silc/ops.c:545
+#: src/protocols/silc/ops.c:550
 #, c-format
 msgid "Killed by %s (%s)"
 msgstr "Tué par %s (%s)"
 
-#: src/protocols/silc/ops.c:581
+#: src/protocols/silc/ops.c:596
 msgid "Server signoff"
 msgstr "Déconnexion du serveur"
 
-#: src/protocols/silc/ops.c:767
+#: src/protocols/silc/ops.c:783
 msgid "Personal Information"
 msgstr "Informations personnelles"
 
-#: src/protocols/silc/ops.c:790
+#: src/protocols/silc/ops.c:806
 msgid "Birth Day"
 msgstr "Date de naissance"
 
-#: src/protocols/silc/ops.c:794
+#: src/protocols/silc/ops.c:810
 msgid "Job Title"
 msgstr "Position"
 
-#: src/protocols/silc/ops.c:798
+#: src/protocols/silc/ops.c:814
 msgid "Job Role"
 msgstr "Rôle"
 
-#: src/protocols/silc/ops.c:802
+#: src/protocols/silc/ops.c:818
 msgid "Organization"
 msgstr "Organisation"
 
-#: src/protocols/silc/ops.c:806
+#: src/protocols/silc/ops.c:822
 msgid "Unit"
 msgstr "Groupe"
 
-#: src/protocols/silc/ops.c:825
+#: src/protocols/silc/ops.c:841
 msgid "EMail"
 msgstr "Courriel"
 
-#: src/protocols/silc/ops.c:830
+#: src/protocols/silc/ops.c:846
 msgid "Note"
 msgstr "Commentaire"
 
-#: src/protocols/silc/ops.c:878
+#: src/protocols/silc/ops.c:894
 msgid "Join Chat"
 msgstr "Joindre une discussion"
 
-#: src/protocols/silc/ops.c:933
-msgid "Hostname"
-msgstr "Hôte"
-
-#: src/protocols/silc/ops.c:940
-msgid "User Mode"
-msgstr "Mode utilisateur"
-
-#: src/protocols/silc/ops.c:954
-msgid "Channels"
-msgstr "Salons"
-
-#: src/protocols/silc/ops.c:981
+#: src/protocols/silc/ops.c:1050 src/protocols/silc/ops.c:1120
 msgid "Public Key Fingerprint"
 msgstr "Empreinte de clef publique"
 
-#: src/protocols/silc/ops.c:982
+#: src/protocols/silc/ops.c:1051 src/protocols/silc/ops.c:1121
 msgid "Public Key Babbleprint"
 msgstr "Babillage de clef publique"
 
-#: src/protocols/silc/ops.c:995
+#: src/protocols/silc/ops.c:1064
 msgid "More..."
 msgstr "Plus..."
 
-#: src/protocols/silc/ops.c:1006 src/protocols/silc/silc.c:770
+#: src/protocols/silc/ops.c:1135 src/protocols/silc/silc.c:777
 msgid "Detach From Server"
 msgstr "Se détacher du serveur"
 
-#: src/protocols/silc/ops.c:1006
+#: src/protocols/silc/ops.c:1135
 msgid "Cannot detach"
 msgstr "Impossible de se détacher"
 
-#: src/protocols/silc/ops.c:1017
+#: src/protocols/silc/ops.c:1146
 msgid "Cannot set topic"
 msgstr "Impossible de changer le sujet"
 
-#: src/protocols/silc/ops.c:1045
+#: src/protocols/silc/ops.c:1184
+msgid "Failed to change nickname"
+msgstr "Impossible de changer de pseudo"
+
+#: src/protocols/silc/ops.c:1221
 msgid "Roomlist"
 msgstr "Liste des salons"
 
-#: src/protocols/silc/ops.c:1045
+#: src/protocols/silc/ops.c:1221
 msgid "Cannot get room list"
 msgstr "Impossible de récupérer la liste des salons"
 
-#: src/protocols/silc/ops.c:1093
+#: src/protocols/silc/ops.c:1269
 msgid "No public key was received"
 msgstr "Aucune clef publique reçue"
 
-#: src/protocols/silc/ops.c:1106 src/protocols/silc/ops.c:1119
-#: src/protocols/silc/ops.c:1120
+#: src/protocols/silc/ops.c:1282 src/protocols/silc/ops.c:1296
 msgid "Server Information"
 msgstr "Informations du serveur"
 
-#: src/protocols/silc/ops.c:1107
+#: src/protocols/silc/ops.c:1283
 msgid "Cannot get server information"
 msgstr "Impossible de récupérer les informations du serveur"
 
-#: src/protocols/silc/ops.c:1128
+#: src/protocols/silc/ops.c:1314 src/protocols/silc/ops.c:1323
+msgid "Server Statistics"
+msgstr "Statistiques du serveur"
+
+#: src/protocols/silc/ops.c:1315
+msgid "Cannot get server statistics"
+msgstr "Impossible de récupérer les statistiques du serveur"
+
+#: src/protocols/silc/ops.c:1324
+msgid "No server statisitics available"
+msgstr "Aucune statistique disponible sur le serveur"
+
+#: src/protocols/silc/ops.c:1346
+#, c-format
+msgid ""
+"Local server start time: %s\n"
+"Local server uptime: %s\n"
+"Local server clients: %d\n"
+"Local server channels: %d\n"
+"Local server operators: %d\n"
+"Local router operators: %d\n"
+"Local cell clients: %d\n"
+"Local cell channels: %d\n"
+"Local cell servers: %d\n"
+"Total clients: %d\n"
+"Total channels: %d\n"
+"Total servers: %d\n"
+"Total routers: %d\n"
+"Total server operators: %d\n"
+"Total router operators: %d\n"
+msgstr ""
+"Démarrage du serveur local: %s\n"
+"Uptime du serveur local: %s\n"
+"Clients locaux: %d\n"
+"Salons locaux: %d\n"
+"Opérateurs locaux: %d\n"
+"Routeurs locaux: %d\n"
+"Clients cellulaires: %d\n"
+"Salons cellulaires: %d\n"
+"Serveurs cellulaires: %d\n"
+"Nombre total de clients: %d\n"
+"Nombre total de salons: %d\n"
+"Nombre total de serveurs: %d\n"
+"Nombre total de routeurs: %d\n"
+"Nombre total d'opérateurs de serveurs: %d\n"
+"Nombre total d'opérateurs de routeurs: %d\n"
+
+#: src/protocols/silc/ops.c:1369
+msgid "Network Statistics"
+msgstr "Statistiques du réseau"
+
+#: src/protocols/silc/ops.c:1377 src/protocols/silc/ops.c:1382
+msgid "Ping"
+msgstr "Ping"
+
+#: src/protocols/silc/ops.c:1377
+msgid "Ping failed"
+msgstr "Échec du ping"
+
+#: src/protocols/silc/ops.c:1382
+msgid "Ping reply received from server"
+msgstr "Réponse du ping par le serveur"
+
+#: src/protocols/silc/ops.c:1390
 msgid "Could not kill user"
 msgstr "Impossible de tuer l'utilisateur"
 
-#: src/protocols/silc/ops.c:1205
+#: src/protocols/silc/ops.c:1471
 msgid "Error during connecting to SILC Server"
 msgstr "Erreur à la connexion au serveur SILC"
 
-#: src/protocols/silc/ops.c:1210
+#: src/protocols/silc/ops.c:1476
 msgid "Key Exchange failed"
 msgstr "Échec de l'échange de clef"
 
-#: src/protocols/silc/ops.c:1219
+#: src/protocols/silc/ops.c:1485
 msgid ""
 "Resuming detached session failed. Press Reconnect to create new connection."
 msgstr ""
 "Échec de la reprise de session détachée. Choisissez « Reconnexion » pour "
 "créer une nouvelle connexion."
 
-#: src/protocols/silc/ops.c:1254
+#: src/protocols/silc/ops.c:1520
 msgid "Disconnected by server"
 msgstr "Déconnexion par le serveur"
 
-#: src/protocols/silc/ops.c:1314 src/protocols/silc/ops.c:1361
+#: src/protocols/silc/ops.c:1580 src/protocols/silc/ops.c:1627
 #: src/protocols/silc/silc.c:167
 msgid "Resuming session"
 msgstr "Reprise de la session"
 
-#: src/protocols/silc/ops.c:1316
+#: src/protocols/silc/ops.c:1582
 msgid "Authenticating connection"
 msgstr "Authentification de la connexion"
 
-#: src/protocols/silc/ops.c:1363
+#: src/protocols/silc/ops.c:1629
 msgid "Verifying server public key"
 msgstr "Vérification de la clef publique du serveur"
 
-#: src/protocols/silc/ops.c:1404
+#: src/protocols/silc/ops.c:1670
 msgid "Passphrase required"
 msgstr "Phrase clef nécessaire"
 
-#: src/protocols/silc/ops.c:1433
+#: src/protocols/silc/ops.c:1699
 msgid "Failure: Version mismatch, upgrade your client"
 msgstr "Échec : version incompatible, veuillez mettre à jour votre client"
 
-#: src/protocols/silc/ops.c:1436
+#: src/protocols/silc/ops.c:1702
 msgid "Failure: Remote does not trust/support your public key"
 msgstr ""
 "Échec : le correspondant ne reconnaît pas ou ne fait pas confiance a votre "
 "clef publique"
 
-#: src/protocols/silc/ops.c:1439
+#: src/protocols/silc/ops.c:1705
 msgid "Failure: Remote does not support proposed KE group"
 msgstr "Échec : le correspondant ne supporte pas le groupe KE proposé"
 
-#: src/protocols/silc/ops.c:1442
+#: src/protocols/silc/ops.c:1708
 msgid "Failure: Remote does not support proposed cipher"
 msgstr ""
 "Échec : le correspondant ne supporte pas la méthode de chiffrement proposée"
 
-#: src/protocols/silc/ops.c:1445
+#: src/protocols/silc/ops.c:1711
 msgid "Failure: Remote does not support proposed PKCS"
 msgstr "Échec : le correspondant ne supporte pas le PKCS proposé"
 
-#: src/protocols/silc/ops.c:1448
+#: src/protocols/silc/ops.c:1714
 msgid "Failure: Remote does not support proposed hash function"
 msgstr ""
 "Échec : le correspondant ne supporte pas la fonction de hashage proposée"
 
-#: src/protocols/silc/ops.c:1451
+#: src/protocols/silc/ops.c:1717
 msgid "Failure: Remote does not support proposed HMAC"
 msgstr "Échec : le correspondant ne supporte pas le HMAC proposé"
 
-#: src/protocols/silc/ops.c:1453
+#: src/protocols/silc/ops.c:1719
 msgid "Failure: Incorrect signature"
 msgstr "Échec : signature incorrecte"
 
-#: src/protocols/silc/ops.c:1455
+#: src/protocols/silc/ops.c:1721
 msgid "Failure: Invalid cookie"
 msgstr "Échec : cookie invalide"
 
-#: src/protocols/silc/ops.c:1466
+#: src/protocols/silc/ops.c:1732
 msgid "Failure: Authentication failed"
 msgstr "Échec de l'authentification"
 
@@ -9379,15 +9443,15 @@
 msgid "Connecting to SILC Server"
 msgstr "Connexion au serveur SILC"
 
-#: src/protocols/silc/silc.c:602
+#: src/protocols/silc/silc.c:606
 msgid "Your Current Mood"
 msgstr "Votre humeur actuelle"
 
-#: src/protocols/silc/silc.c:604
+#: src/protocols/silc/silc.c:608
 msgid "Normal"
 msgstr "Normal"
 
-#: src/protocols/silc/silc.c:629
+#: src/protocols/silc/silc.c:633
 msgid ""
 "\n"
 "Your Preferred Contact Methods"
@@ -9395,31 +9459,43 @@
 "\n"
 "Vos méthodes de contact préférées"
 
-#: src/protocols/silc/silc.c:646
+#: src/protocols/silc/silc.c:641 src/protocols/silc/util.c:514
+msgid "SMS"
+msgstr "SMS"
+
+#: src/protocols/silc/silc.c:643 src/protocols/silc/util.c:516
+msgid "MMS"
+msgstr "MMS"
+
+#: src/protocols/silc/silc.c:645 src/protocols/silc/util.c:518
+msgid "Video Conferencing"
+msgstr "Visioconférence"
+
+#: src/protocols/silc/silc.c:650
 msgid "Your Current Status"
 msgstr "Votre état actuel"
 
-#: src/protocols/silc/silc.c:653
+#: src/protocols/silc/silc.c:657
 msgid "Online Services"
 msgstr "Services en ligne"
 
-#: src/protocols/silc/silc.c:656
+#: src/protocols/silc/silc.c:660
 msgid "Let others see what services you are using"
 msgstr "Publier les services utilisés"
 
-#: src/protocols/silc/silc.c:662
+#: src/protocols/silc/silc.c:666
 msgid "Let others see what computer you are using"
 msgstr "Publier l'ordinateur utilisé"
 
-#: src/protocols/silc/silc.c:669
+#: src/protocols/silc/silc.c:673
 msgid "Your VCard File"
 msgstr "Votre carte de visite VCard"
 
-#: src/protocols/silc/silc.c:682 src/protocols/silc/silc.c:683
+#: src/protocols/silc/silc.c:686 src/protocols/silc/silc.c:687
 msgid "User Online Status Attributes"
 msgstr "Attributs d'état"
 
-#: src/protocols/silc/silc.c:684
+#: src/protocols/silc/silc.c:688
 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 "
@@ -9429,115 +9505,240 @@
 "vos informations personnelles. Veuillez saisir les informations que vous "
 "voulez publier."
 
-#: src/protocols/silc/silc.c:723 src/protocols/silc/silc.c:728
-#: src/protocols/silc/silc.c:1096 src/protocols/silc/silc.c:1101
+#: src/protocols/silc/silc.c:728 src/protocols/silc/silc.c:734
+#: src/protocols/silc/silc.c:1135
 msgid "Message of the Day"
 msgstr "Message du jour"
 
-#: src/protocols/silc/silc.c:723 src/protocols/silc/silc.c:1096
+#: src/protocols/silc/silc.c:728
 msgid "No Message of the Day available"
 msgstr "Message du jour non disponible"
 
-#: src/protocols/silc/silc.c:724 src/protocols/silc/silc.c:1097
+#: src/protocols/silc/silc.c:729 src/protocols/silc/silc.c:1130
 msgid "There is no Message of the Day associated with this connection"
 msgstr "Il n'y a pas de message du jour associé à cette connexion"
 
-#: src/protocols/silc/silc.c:765
+#: src/protocols/silc/silc.c:772
 msgid "Online Status"
 msgstr "Status"
 
-#: src/protocols/silc/silc.c:774
+#: src/protocols/silc/silc.c:781
 msgid "View Message of the Day"
 msgstr "Voir le message du jour"
 
-#: src/protocols/silc/silc.c:846
+#: src/protocols/silc/silc.c:853
 #, c-format
 msgid "User <I>%s</I> is not present in the network"
 msgstr "<I>%s</I> n'est pas présent sur le réseau"
 
-#: src/protocols/silc/silc.c:1159
-msgid "part:  Leave the chat"
-msgstr "part : Quitter le salon."
-
-#: src/protocols/silc/silc.c:1162
-msgid "leave:  Leave the chat"
-msgstr "leave : Quitter le salon."
-
-#: src/protocols/silc/silc.c:1166
+#: src/protocols/silc/silc.c:962
+msgid "Failed to leave channel"
+msgstr "Impossible de quitter le salon"
+
+#: src/protocols/silc/silc.c:1006
+msgid "Topic too long"
+msgstr "Sujet trop long"
+
+#: src/protocols/silc/silc.c:1087
+msgid "You must specify a nick"
+msgstr "Vous devez choisir un pseudo"
+
+#: src/protocols/silc/silc.c:1189
+#, c-format
+msgid "channel %s not found"
+msgstr "Salon %s non trouvée"
+
+#: src/protocols/silc/silc.c:1194
+#, c-format
+msgid "channel modes for %s: %s"
+msgstr "Le mode du salon %s est : %s"
+
+#: src/protocols/silc/silc.c:1196
+#, c-format
+msgid "no channel modes are set on %s"
+msgstr "Le salon %s n'a pas de mode spécifiqie"
+
+#: src/protocols/silc/silc.c:1209
+#, c-format
+msgid "Failed to set cmodes for %s"
+msgstr "Impossible de changer le cmode de %s"
+
+#: src/protocols/silc/silc.c:1239
+#, c-format
+msgid "Unknown command: %s, (may be a Gaim bug)"
+msgstr "Commande inconnue : %s (cela peut être un bug de Gaim)"
+
+#: src/protocols/silc/silc.c:1302
+msgid "part [channel]:  Leave the chat"
+msgstr "part [salon] : Quitter le salon."
+
+#: src/protocols/silc/silc.c:1306
+msgid "leave [channel]:  Leave the chat"
+msgstr "leave [salon] : Quitter le salon."
+
+#: src/protocols/silc/silc.c:1310
 msgid "topic [&lt;new topic&gt;]:  View or change the topic"
 msgstr "topic [nouveau sujet] : Voir ou changer le sujet du salon."
 
-#: src/protocols/silc/silc.c:1171
+#: src/protocols/silc/silc.c:1315
 msgid "join &lt;channel&gt; [&lt;password&gt;]:  Join a chat on this network"
-msgstr "join &lt;salon&gt; [mot de passe] : Joindre une discussion sur ce réseau."
-
-#: src/protocols/silc/silc.c:1175
+msgstr ""
+"join &lt;salon&gt; [mot de passe] : Joindre une discussion sur ce réseau."
+
+#: src/protocols/silc/silc.c:1319
 msgid "list:  List channels on this network"
 msgstr "list : Récupérer la liste des salons du réseau."
 
-#: src/protocols/silc/silc.c:1179
+#: src/protocols/silc/silc.c:1323
 msgid "whois &lt;nick&gt;:  View nick's information"
 msgstr "whois &lt;pseudo&gt; : Récupérer des informations sur une personne."
 
-#: src/protocols/silc/silc.c:1183
-msgid "invite &lt;nick&gt;:  Invite nick to join this channel"
-msgstr "invite &lt;pseudo&gt; : Inviter une personne dans ce salon."
-
-#: src/protocols/silc/silc.c:1187
+#: src/protocols/silc/silc.c:1327 src/protocols/zephyr/zephyr.c:1673
 msgid "msg &lt;nick&gt; &lt;message&gt;:  Send a private message to a user"
 msgstr ""
 "msg &lt;pseudo&gt; &lt;message&gt; : Envoyer un message privé à une personne."
 
-#: src/protocols/silc/silc.c:1191
+#: src/protocols/silc/silc.c:1331
 msgid "query &lt;nick&gt; [&lt;message&gt;]:  Send a private message to a user"
 msgstr ""
 "msg &lt;pseudo&gt; &lt;message&gt; : Envoyer un message privé à une personne."
 
-#: src/protocols/silc/silc.c:1195
+#: src/protocols/silc/silc.c:1335
 msgid "motd:  View the server's Message Of The Day"
 msgstr "motd : Voir le message du jour du serveur."
 
-#: src/protocols/silc/silc.c:1199
+#: src/protocols/silc/silc.c:1339
 msgid "detach:  Detach this session"
 msgstr "detach : Détacher la session en cours."
 
-#: src/protocols/silc/silc.c:1203
-msgid "umode &lt;usermodes&gt;:  Set your user options"
+#: src/protocols/silc/silc.c:1343
+msgid "quit [message]:  Disconnect from the server, with an optional message"
+msgstr ""
+"quit [message] : Se déconnecter du serveur avec un message de départ "
+"facultatif."
+
+#: src/protocols/silc/silc.c:1347
+msgid "call &lt;command&gt;:  Call any silc client command"
+msgstr "call &lt;commande&gt; : Appeler une commande du client silc."
+
+#: src/protocols/silc/silc.c:1352
+msgid "kill &lt;nick&gt; [-pubkey|&lt;reason&gt;]:  Kill nick"
+msgstr "kill &lt;pseudo&gt; [-clefpub|&lt;raison&gt;] : Tuer le pseudo."
+
+#: src/protocols/silc/silc.c:1356
+msgid "nick &lt;newnick&gt;:  Change your nickname"
+msgstr "nick &lt;nouveau pseudo&gt; : Changer de pseudonyme."
+
+#: src/protocols/silc/silc.c:1360
+msgid "whowas &lt;nick&gt;:  View nick's information"
+msgstr "whowas &lt;pseudo&gt; : Récupérer des informations sur une personne."
+
+#: src/protocols/silc/silc.c:1364
+msgid ""
+"cmode &lt;channel&gt; [+|-&lt;modes&gt]; [arguments]:  Change or display "
+"channel modes"
+msgstr ""
+"cmode &lt;salon&gt; [+|-&lt;modes&gt;] [arguments] : Changer ou afficher le "
+"mode d'un salon."
+
+#: src/protocols/silc/silc.c:1368
+msgid ""
+"cumode &lt;channel&gt; +|-&lt;modes&gt; &lt;nick&gt;:  Change nick's modes "
+"on channel"
+msgstr ""
+"cumode &lt;salon&gt; +|-&lt;modes&gt; &lt;pseudo&gt; : Changer le mode d'une "
+"personne sur un salon."
+
+#: src/protocols/silc/silc.c:1372
+msgid "umode &lt;usermodes&gt;:  Set your modes in the network"
 msgstr "umode &lt;modes utilisateur&gt; : Changer vos paramêtres utilisateur."
 
-#: src/protocols/silc/silc.c:1214
+#: src/protocols/silc/silc.c:1376
+msgid "oper &lt;nick&gt; [-pubkey]:  Get server operator privileges"
+msgstr ""
+"oper &lt;pseudo&gt; [-clefpub] : Obtenir le status d'opérateur sur le "
+"serveur."
+
+#: src/protocols/silc/silc.c:1380
+msgid ""
+"invite &lt;channel&gt; [-|+]&lt;nick&gt;:  invite nick or add/remove from "
+"channel invite list"
+msgstr ""
+"invite &lt;salon&gt; [-|+]&lt;pseudo&gt; : Inviter une personne, l'ajouter "
+"ou la supprimer de la liste d'invitations du salon."
+
+#: src/protocols/silc/silc.c:1384
+msgid "kick &lt;channel&gt; &lt;nick&gt; [comment]:  Kick client from channel"
+msgstr ""
+"kick &lt;salon&gt; &lt;pseudo&gt; [raison] : Expulser une personne du salon."
+
+#: src/protocols/silc/silc.c:1388
+msgid "info [server]:  View server administrative details"
+msgstr "info [serveur] : Voir les informations sur le serveur."
+
+#: src/protocols/silc/silc.c:1392
+msgid "ban [&lt;channel&gt; +|-&lt;nick&gt;]:  Ban client from channel"
+msgstr "ban [&lt;salon&gt; +|-&lt;pseudo&gt;] : Bannir une personne du salon."
+
+#: src/protocols/silc/silc.c:1396
+msgid "getkey &lt;nick|server&gt;:  Retrieve client's or server's public key"
+msgstr ""
+"getkey &lt;pseudo|serveur&gt; : Récupérer la clef publique d'une personne ou "
+"du serveur."
+
+#: src/protocols/silc/silc.c:1400
+msgid "stats:  View server and network statistics"
+msgstr "stats : Voir les statistiques du serveur et du réseau."
+
+#: src/protocols/silc/silc.c:1404
+msgid "ping:  Send PING to the connected server"
+msgstr "ping : Envoyer un PING au serveur."
+
+#: src/protocols/silc/silc.c:1409
+msgid "users &lt;channel&gt;:  List users in channel"
+msgstr "users &lt;salon&gt; : Récupérer la liste des personnes dans un salon."
+
+#: src/protocols/silc/silc.c:1413
+msgid ""
+"names [-count|-ops|-halfops|-voices|-normal] &lt;channel(s)&gt;:  List "
+"specific users in channel(s)"
+msgstr ""
+"names [-count|-ops|-halfops|-voices|-normal] &lt;salon(s)&gt; : Récupérer la "
+"liste de certaines personnes dans des salons."
+
+#: src/protocols/silc/silc.c:1425
 msgid "Instant Messages"
 msgstr "Messages instantanés"
 
-#: src/protocols/silc/silc.c:1219
+#: src/protocols/silc/silc.c:1430
 msgid "Digitally sign all IM messages"
 msgstr "Signer numériquement tous les messages"
 
-#: src/protocols/silc/silc.c:1224
+#: src/protocols/silc/silc.c:1435
 msgid "Verify all IM message signatures"
 msgstr "Vérifier la signature de tous les messages"
 
-#: src/protocols/silc/silc.c:1227
+#: src/protocols/silc/silc.c:1438
 msgid "Channel Messages"
 msgstr "Discussions"
 
-#: src/protocols/silc/silc.c:1232
+#: src/protocols/silc/silc.c:1443
 msgid "Digitally sign all channel messages"
 msgstr "Signer numériquement tous les messages des salons"
 
-#: src/protocols/silc/silc.c:1237
+#: src/protocols/silc/silc.c:1448
 msgid "Verify all channel message signatures"
 msgstr "Vérifier la signature de tous les messages des salons"
 
-#: src/protocols/silc/silc.c:1240
+#: src/protocols/silc/silc.c:1451
 msgid "Default SILC Key Pair"
 msgstr "Paire de clefs SILC par défaut"
 
-#: src/protocols/silc/silc.c:1245
+#: src/protocols/silc/silc.c:1456
 msgid "SILC Public Key"
 msgstr "Clef publique"
 
-#: src/protocols/silc/silc.c:1250
+#: src/protocols/silc/silc.c:1461
 msgid "SILC Private Key"
 msgstr "Clef privée"
 
@@ -9551,91 +9752,91 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/silc/silc.c:1334
+#: src/protocols/silc/silc.c:1547
 msgid "SILC Protocol Plugin"
 msgstr "Plugin pour le protocole SILC"
 
 #. *  description
-#: src/protocols/silc/silc.c:1336
+#: src/protocols/silc/silc.c:1549
 msgid "Secure Internet Live Conferencing (SILC) Protocol"
 msgstr "Protocole de conférences instantanées sécurisées"
 
-#: src/protocols/silc/silc.c:1366
+#: src/protocols/silc/silc.c:1579
 msgid "Public key authentication"
 msgstr "Authentification par clef publique"
 
-#: src/protocols/silc/silc.c:1372
+#: src/protocols/silc/silc.c:1585
 msgid "Public Key File"
 msgstr "Fichier de clef publique"
 
-#: src/protocols/silc/silc.c:1376
+#: src/protocols/silc/silc.c:1589
 msgid "Private Key File"
 msgstr "Fichier de clef privée"
 
-#: src/protocols/silc/silc.c:1381
+#: src/protocols/silc/silc.c:1594
 msgid "Reject watching by other users"
 msgstr "Empêcher l'observation par les autres utilisateurs"
 
-#: src/protocols/silc/silc.c:1384
+#: src/protocols/silc/silc.c:1597
 msgid "Block invites"
 msgstr "Bloquer les invitations"
 
-#: src/protocols/silc/silc.c:1387
+#: src/protocols/silc/silc.c:1600
 msgid "Block IMs without Key Exchange"
 msgstr "Bloquer les messages sans échange de clef"
 
-#: src/protocols/silc/silc.c:1390
+#: src/protocols/silc/silc.c:1603
 msgid "Reject online status attribute requests"
 msgstr "Empêcher les requêtes d'attributs d'état"
 
-#: src/protocols/silc/util.c:200 src/protocols/silc/util.c:223
+#: src/protocols/silc/util.c:202 src/protocols/silc/util.c:227
 msgid "Creating SILC key pair..."
 msgstr "Création de la paire de clefs SILC..."
 
 #. Hint for translators: Please check the tabulator width here and in
 #. the next strings (short strings: 2 tabs, longer strings 1 tab,
 #. sum: 3 tabs or 24 characters)
-#: src/protocols/silc/util.c:289
+#: src/protocols/silc/util.c:310
 #, c-format
 msgid "Real Name: \t%s\n"
 msgstr "Nom réel : %s\n"
 
-#: src/protocols/silc/util.c:291
+#: src/protocols/silc/util.c:312
 #, c-format
 msgid "User Name: \t%s\n"
 msgstr "Nom d'utilisateur : %s\n"
 
-#: src/protocols/silc/util.c:293
+#: src/protocols/silc/util.c:314
 #, c-format
 msgid "EMail: \t\t%s\n"
 msgstr "Adresse électronique : %s\n"
 
-#: src/protocols/silc/util.c:295
+#: src/protocols/silc/util.c:316
 #, c-format
 msgid "Host Name: \t%s\n"
 msgstr "Nom d'hôte : %s\n"
 
-#: src/protocols/silc/util.c:297
+#: src/protocols/silc/util.c:318
 #, c-format
 msgid "Organization: \t%s\n"
 msgstr "Organisation : %s\n"
 
-#: src/protocols/silc/util.c:299
+#: src/protocols/silc/util.c:320
 #, c-format
 msgid "Country: \t%s\n"
 msgstr "Pays : %s\n"
 
-#: src/protocols/silc/util.c:300
-#, c-format
-msgid "Algorithm: \t\t%s\n"
+#: src/protocols/silc/util.c:321
+#, c-format
+msgid "Algorithm: \t%s\n"
 msgstr "Algorithme : %s\n"
 
-#: src/protocols/silc/util.c:301
+#: src/protocols/silc/util.c:322
 #, c-format
 msgid "Key Length: \t%d bits\n"
 msgstr "Longueur de clef : %d bits\n"
 
-#: src/protocols/silc/util.c:303
+#: src/protocols/silc/util.c:324
 #, c-format
 msgid ""
 "Public Key Fingerprint:\n"
@@ -9646,7 +9847,7 @@
 "%s\n"
 "\n"
 
-#: src/protocols/silc/util.c:304
+#: src/protocols/silc/util.c:325
 #, c-format
 msgid ""
 "Public Key Babbleprint:\n"
@@ -9655,10 +9856,26 @@
 "Babillage de clef publique :\n"
 "%s"
 
-#: src/protocols/silc/util.c:308 src/protocols/silc/util.c:309
+#: src/protocols/silc/util.c:329 src/protocols/silc/util.c:330
 msgid "Public Key Information"
 msgstr "Informations sur la clef publique"
 
+#: src/protocols/silc/util.c:512
+msgid "Paging"
+msgstr "Bipeur"
+
+#: src/protocols/silc/util.c:536
+msgid "Computer"
+msgstr "Ordinateur"
+
+#: src/protocols/silc/util.c:540
+msgid "PDA"
+msgstr "PDA"
+
+#: src/protocols/silc/util.c:542
+msgid "Terminal"
+msgstr "Terminal"
+
 #: src/protocols/toc/toc.c:137
 #, c-format
 msgid "Looking up %s"
@@ -9869,15 +10086,15 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/toc/toc.c:2167 src/protocols/toc/toc.c:2169
+#: src/protocols/toc/toc.c:2169 src/protocols/toc/toc.c:2171
 msgid "TOC Protocol Plugin"
 msgstr "Plugin pour le protocole TOC"
 
-#: src/protocols/toc/toc.c:2188
+#: src/protocols/toc/toc.c:2190
 msgid "TOC host"
 msgstr "Hôte TOC"
 
-#: src/protocols/toc/toc.c:2192
+#: src/protocols/toc/toc.c:2194
 msgid "TOC port"
 msgstr "Port TOC"
 
@@ -9961,11 +10178,11 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/trepia/trepia.c:1269 src/protocols/trepia/trepia.c:1271
+#: src/protocols/trepia/trepia.c:1271 src/protocols/trepia/trepia.c:1273
 msgid "Trepia Protocol Plugin"
 msgstr "Plugin pour le protocole Trepia"
 
-#: src/protocols/yahoo/yahoo.c:328
+#: src/protocols/yahoo/yahoo.c:338
 msgid ""
 "You have been logged off as you have logged in on a different machine or "
 "device."
@@ -9973,27 +10190,27 @@
 "Vous venez d'être déconnecté à la suite d'une connexion depuis un autre "
 "endroit."
 
-#: src/protocols/yahoo/yahoo.c:798
+#: src/protocols/yahoo/yahoo.c:808
 msgid "Your Yahoo! message did not get sent."
 msgstr "Votre message Yahoo! n'a pas été envoyé"
 
-#: src/protocols/yahoo/yahoo.c:817
+#: src/protocols/yahoo/yahoo.c:827
 msgid "Buzz!!"
 msgstr "Dring !"
 
-#: src/protocols/yahoo/yahoo.c:860
+#: src/protocols/yahoo/yahoo.c:870
 #, c-format
 msgid "Yahoo! system message for %s:"
 msgstr "Message système Yahoo! pour %s :"
 
-#: src/protocols/yahoo/yahoo.c:926
+#: src/protocols/yahoo/yahoo.c:936
 #, c-format
 msgid "%s has (retroactively) denied your request to add them to your list."
 msgstr ""
 "L'utilisateur %s a (rétroactivement) refusé votre demande de le rajouter à "
 "votre liste de contacts."
 
-#: src/protocols/yahoo/yahoo.c:929
+#: src/protocols/yahoo/yahoo.c:939
 #, c-format
 msgid ""
 "%s has (retroactively) denied your request to add them to your list for the "
@@ -10002,11 +10219,11 @@
 "L'utilisateur %s a (rétroactivement) refusé votre demande de l'ajouter à "
 "votre liste de contacts pour la raison suivante : %s"
 
-#: src/protocols/yahoo/yahoo.c:932
+#: src/protocols/yahoo/yahoo.c:942
 msgid "Add buddy rejected"
 msgstr "Ajout du contact refusé"
 
-#: src/protocols/yahoo/yahoo.c:1688
+#: src/protocols/yahoo/yahoo.c:1702
 #, c-format
 msgid ""
 "The Yahoo server has requested the use of an unrecognized authentication "
@@ -10017,11 +10234,11 @@
 "Cette version de Gaim n'arrivera probablement pas à se connecter au service "
 "Yahoo!. Vous pouvez vérifier qu'une mise à jour est disponible sur %s."
 
-#: src/protocols/yahoo/yahoo.c:1691
+#: src/protocols/yahoo/yahoo.c:1705
 msgid "Failed Yahoo! Authentication"
 msgstr "Échec de l'authentification Yahoo!"
 
-#: src/protocols/yahoo/yahoo.c:1763
+#: src/protocols/yahoo/yahoo.c:1777
 #, c-format
 msgid ""
 "You have tried to ignore %s, but the user is on your buddy list.  Clicking "
@@ -10030,78 +10247,97 @@
 "Vous voulez ignorer %s, mais cet utilisateur est dans votre liste de "
 "contacts. En choisissant « Oui » cela supprimera le contact et l'ignorera."
 
-#: src/protocols/yahoo/yahoo.c:1766
+#: src/protocols/yahoo/yahoo.c:1780
 msgid "Ignore buddy?"
 msgstr "Ignorer ce contact ?"
 
-#: src/protocols/yahoo/yahoo.c:1799
+#: src/protocols/yahoo/yahoo.c:1814
 msgid "Invalid username."
 msgstr "Nom d'utilisateur non valide"
 
-#: src/protocols/yahoo/yahoo.c:1802
+#: src/protocols/yahoo/yahoo.c:1825
+msgid "Normal authencation failed!"
+msgstr "Échec de l'authentification standard"
+
+#: src/protocols/yahoo/yahoo.c:1826
+msgid ""
+"The normal authencation method has failed. This means either your password "
+"is incorrect, or Yahoo!'s authencation scheme has changed. Gaim will now "
+"attempt to log in using Web Messenger authencation, will which result in "
+"reduced functionality and features."
+msgstr ""
+"La méthode d'authentification normale a échoué. Cela signifie que votre mot "
+"de passe est incorrect ou que Yahoo! utilise un nouveau système "
+"authentification. Gaim va essayer de se connecter en utilisant "
+"l'authentification par le Web, au détriment de certaines fonctionalités."
+
+#: src/protocols/yahoo/yahoo.c:1834
 msgid "Incorrect password."
 msgstr "Mot de passe incorrect"
 
-#: src/protocols/yahoo/yahoo.c:1805
+#: src/protocols/yahoo/yahoo.c:1837
 msgid "Your account is locked, please log in to the Yahoo! website."
-msgstr "Votre compte est blocké. Veuillez vous connecter par le site web Yahoo!."
-
-#: src/protocols/yahoo/yahoo.c:1808
+msgstr ""
+"Votre compte est blocké. Veuillez vous connecter par le site web Yahoo!."
+
+#: src/protocols/yahoo/yahoo.c:1840
 #, c-format
 msgid "Unknown error number %d. Logging into the Yahoo! website may fix this."
-msgstr "Erreur inconnue n°%d. Se connecter sur le site web Yahoo! peut corriger le problème."
-
-#: src/protocols/yahoo/yahoo.c:1862
+msgstr ""
+"Erreur inconnue n°%d. Se connecter sur le site web Yahoo! peut corriger le "
+"problème."
+
+#: src/protocols/yahoo/yahoo.c:1894
 #, c-format
 msgid "Could not add buddy %s to group %s to the server list on account %s."
 msgstr ""
 "Impossible d'ajouter le contact %s au groupe %s sur la liste du serveur pour "
 "le compte %s"
 
-#: src/protocols/yahoo/yahoo.c:1864
+#: src/protocols/yahoo/yahoo.c:1896
 msgid "Could not add buddy to server list"
 msgstr "Impossible d'ajouter le contact sur la liste du serveur"
 
-#: src/protocols/yahoo/yahoo.c:2055 src/protocols/yahoo/yahoo.c:2186
+#: src/protocols/yahoo/yahoo.c:2088 src/protocols/yahoo/yahoo.c:2216
 msgid "Unable to read"
 msgstr "Impossible de lire"
 
-#: src/protocols/yahoo/yahoo.c:2208 src/protocols/yahoo/yahoo.c:2318
-#: src/protocols/yahoo/yahoo.c:2374 src/protocols/yahoo/yahoo.c:2384
-#: src/protocols/yahoo/yahoochat.c:1358 src/protocols/yahoo/yahoochat.c:1419
+#: src/protocols/yahoo/yahoo.c:2238 src/protocols/yahoo/yahoo.c:2348
+#: src/protocols/yahoo/yahoo.c:2398 src/protocols/yahoo/yahoo.c:2408
+#: src/protocols/yahoo/yahoochat.c:1397 src/protocols/yahoo/yahoochat.c:1458
 msgid "Connection problem"
 msgstr "Problème de connexion"
 
-#: src/protocols/yahoo/yahoo.c:2472 src/protocols/yahoo/yahoo.c:2850
-#: src/protocols/yahoo/yahoo.c:2962
+#: src/protocols/yahoo/yahoo.c:2495 src/protocols/yahoo/yahoo.c:2857
+#: src/protocols/yahoo/yahoo.c:2971
 msgid "Not At Home"
 msgstr "Pas à la maison"
 
-#: src/protocols/yahoo/yahoo.c:2474 src/protocols/yahoo/yahoo.c:2852
-#: src/protocols/yahoo/yahoo.c:2963
+#: src/protocols/yahoo/yahoo.c:2497 src/protocols/yahoo/yahoo.c:2859
+#: src/protocols/yahoo/yahoo.c:2972
 msgid "Not At Desk"
 msgstr "Pas au bureau"
 
-#: src/protocols/yahoo/yahoo.c:2476 src/protocols/yahoo/yahoo.c:2854
-#: src/protocols/yahoo/yahoo.c:2964
+#: src/protocols/yahoo/yahoo.c:2499 src/protocols/yahoo/yahoo.c:2861
+#: src/protocols/yahoo/yahoo.c:2973
 msgid "Not In Office"
 msgstr "Pas au travail"
 
-#: src/protocols/yahoo/yahoo.c:2480 src/protocols/yahoo/yahoo.c:2858
-#: src/protocols/yahoo/yahoo.c:2966
+#: src/protocols/yahoo/yahoo.c:2503 src/protocols/yahoo/yahoo.c:2865
+#: src/protocols/yahoo/yahoo.c:2975
 msgid "On Vacation"
 msgstr "En vacances"
 
-#: src/protocols/yahoo/yahoo.c:2484 src/protocols/yahoo/yahoo.c:2862
-#: src/protocols/yahoo/yahoo.c:2968
+#: src/protocols/yahoo/yahoo.c:2507 src/protocols/yahoo/yahoo.c:2869
+#: src/protocols/yahoo/yahoo.c:2977
 msgid "Stepped Out"
 msgstr "De sortie"
 
-#: src/protocols/yahoo/yahoo.c:2565 src/protocols/yahoo/yahoo.c:2591
+#: src/protocols/yahoo/yahoo.c:2588 src/protocols/yahoo/yahoo.c:2614
 msgid "Not on server list"
 msgstr "Pas dans la liste du serveur"
 
-#: src/protocols/yahoo/yahoo.c:2611
+#: src/protocols/yahoo/yahoo.c:2634
 #, c-format
 msgid ""
 "\n"
@@ -10110,27 +10346,27 @@
 "\n"
 "<b>%s :</b> %s"
 
-#: src/protocols/yahoo/yahoo.c:2682
+#: src/protocols/yahoo/yahoo.c:2693
 msgid "Join in Chat"
 msgstr "Joindre dans une discussion"
 
-#: src/protocols/yahoo/yahoo.c:2686
+#: src/protocols/yahoo/yahoo.c:2698
 msgid "Initiate Conference"
 msgstr "Lancer une conférence"
 
-#: src/protocols/yahoo/yahoo.c:2743
+#: src/protocols/yahoo/yahoo.c:2750
 msgid "Active which ID?"
 msgstr "Activer quelle identité ?"
 
-#: src/protocols/yahoo/yahoo.c:2752
+#: src/protocols/yahoo/yahoo.c:2759
 msgid "Join who in chat?"
 msgstr "Qui joindre dans une discussion ?"
 
-#: src/protocols/yahoo/yahoo.c:2762
+#: src/protocols/yahoo/yahoo.c:2769
 msgid "Activate ID..."
 msgstr "Activer ID..."
 
-#: src/protocols/yahoo/yahoo.c:2766
+#: src/protocols/yahoo/yahoo.c:2773
 msgid "Join user in chat..."
 msgstr "Joindre un utilisateur dans une discussion..."
 
@@ -10145,42 +10381,50 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/yahoo/yahoo.c:3286 src/protocols/yahoo/yahoo.c:3288
+#: src/protocols/yahoo/yahoo.c:3292 src/protocols/yahoo/yahoo.c:3294
 msgid "Yahoo Protocol Plugin"
 msgstr "Plugin pour le protocole Yahoo"
 
-#: src/protocols/yahoo/yahoo.c:3307
+#: src/protocols/yahoo/yahoo.c:3313
 msgid "Yahoo Japan"
 msgstr "Yahoo Japon"
 
-#: src/protocols/yahoo/yahoo.c:3310
-msgid "Pager host"
-msgstr "Hôte du pager"
-
-#: src/protocols/yahoo/yahoo.c:3313
-msgid "Japan Pager host"
-msgstr "Hôte japonais pour le pager"
-
 #: src/protocols/yahoo/yahoo.c:3316
-msgid "Pager port"
-msgstr "Port du pager"
+msgid "Pager host"
+msgstr "Hôte du pager"
 
 #: src/protocols/yahoo/yahoo.c:3319
-msgid "File transfer host"
-msgstr "Hôte de transfert de fichiers"
+msgid "Japan Pager host"
+msgstr "Hôte japonais pour le pager"
 
 #: src/protocols/yahoo/yahoo.c:3322
-msgid "Japan File transfer host"
-msgstr "Hôte japonais de transfert de fichiers"
+msgid "Pager port"
+msgstr "Port du pager"
 
 #: src/protocols/yahoo/yahoo.c:3325
+msgid "File transfer host"
+msgstr "Hôte de transfert de fichiers"
+
+#: src/protocols/yahoo/yahoo.c:3328
+msgid "Japan File transfer host"
+msgstr "Hôte japonais de transfert de fichiers"
+
+#: src/protocols/yahoo/yahoo.c:3331
 msgid "File transfer port"
 msgstr "Port de transfert de fichiers"
 
-#: src/protocols/yahoo/yahoo.c:3328
+#: src/protocols/yahoo/yahoo.c:3334
 msgid "Chat Room List Url"
 msgstr "URL de liste des salons de discussion"
 
+#: src/protocols/yahoo/yahoo.c:3337
+msgid "YCHT Host"
+msgstr "Hôte YCHT"
+
+#: src/protocols/yahoo/yahoo.c:3340
+msgid "YCHT Port"
+msgstr "Port YCHT"
+
 #: src/protocols/yahoo/yahoo_filexfer.c:170
 msgid ""
 "Gaim cannot send files over Yahoo! that are bigger than One Megabyte "
@@ -10189,17 +10433,20 @@
 "Gaim ne peut pas envoyer au travers de Yahoo! des fichiers de plus d'un "
 "mégaoctet (1 048 576 octets)"
 
-#: src/protocols/yahoo/yahoo_profile.c:640
-#: src/protocols/yahoo/yahoo_profile.c:961
-msgid "Yahoo! ID"
-msgstr "ID Yahoo!"
-
-#: src/protocols/yahoo/yahoo_profile.c:664
+#: src/protocols/yahoo/yahoo_profile.c:675
 #, c-format
 msgid "<b>IP Address:</b> %s<br>"
 msgstr "<b>Adresse IP :</b> %s<br>"
 
-#: src/protocols/yahoo/yahoo_profile.c:779
+#: src/protocols/yahoo/yahoo_profile.c:749
+msgid "Yahoo! Japan Profile"
+msgstr "Profil Yahoo! Japon"
+
+#: src/protocols/yahoo/yahoo_profile.c:750
+msgid "Yahoo! Profile"
+msgstr "Profil Yahoo!"
+
+#: src/protocols/yahoo/yahoo_profile.c:794
 msgid ""
 "Sorry, profiles marked as containing adult content are not supported at this "
 "time."
@@ -10207,8 +10454,7 @@
 "Désolé, les profils marqués pour adultes ne sont pas supportés pour "
 "l'instant."
 
-#: src/protocols/yahoo/yahoo_profile.c:781
-#: src/protocols/yahoo/yahoo_profile.c:829
+#: src/protocols/yahoo/yahoo_profile.c:796
 msgid ""
 "If you wish to view this profile, you will need to visit this link in your "
 "web browser"
@@ -10216,127 +10462,155 @@
 "Si vous voulez voir ce profil, vous devez ouvrir ce lien dans votre "
 "navigateur."
 
-#: src/protocols/yahoo/yahoo_profile.c:827
+#: src/protocols/yahoo/yahoo_profile.c:969
+msgid "Yahoo! ID"
+msgstr "ID Yahoo!"
+
+#: src/protocols/yahoo/yahoo_profile.c:1043
+#: src/protocols/yahoo/yahoo_profile.c:1047
+#: src/protocols/yahoo/yahoo_profile.c:1051
+msgid "Hobbies"
+msgstr "Passe-temps"
+
+#: src/protocols/yahoo/yahoo_profile.c:1061
+#: src/protocols/yahoo/yahoo_profile.c:1065
+msgid "Latest News"
+msgstr "Dernières nouvelles"
+
+#: src/protocols/yahoo/yahoo_profile.c:1086
+msgid "Home Page"
+msgstr "Page web"
+
+#: src/protocols/yahoo/yahoo_profile.c:1101
+msgid "Cool Link 1"
+msgstr "Lien sympa 1"
+
+#: src/protocols/yahoo/yahoo_profile.c:1106
+msgid "Cool Link 2"
+msgstr "Lien sympa 2"
+
+#: src/protocols/yahoo/yahoo_profile.c:1110
+msgid "Cool Link 3"
+msgstr "Lien sympa 3"
+
+#: src/protocols/yahoo/yahoo_profile.c:1130
+#, c-format
+msgid "User information for %s unavailable"
+msgstr "Les informations sur %s ne sont pas disponibles"
+
+#: src/protocols/yahoo/yahoo_profile.c:1136
 msgid ""
 "Sorry, this profile seems to be in a language that is not supported at this "
 "time."
 msgstr "Désolé, ce profil est dans une langue non supportée pour l'instant."
 
-#: src/protocols/yahoo/yahoo_profile.c:1038
-#: src/protocols/yahoo/yahoo_profile.c:1042
-#: src/protocols/yahoo/yahoo_profile.c:1046
-msgid "Hobbies"
-msgstr "Passe-temps"
-
-#: src/protocols/yahoo/yahoo_profile.c:1056
-#: src/protocols/yahoo/yahoo_profile.c:1060
-msgid "Latest News"
-msgstr "Dernières nouvelles"
-
-#: src/protocols/yahoo/yahoo_profile.c:1081
-msgid "Home Page"
-msgstr "Page web"
-
-#: src/protocols/yahoo/yahoo_profile.c:1096
-msgid "Cool Link 1"
-msgstr "Lien sympa 1"
-
-#: src/protocols/yahoo/yahoo_profile.c:1101
-msgid "Cool Link 2"
-msgstr "Lien sympa 2"
-
-#: src/protocols/yahoo/yahoo_profile.c:1105
-msgid "Cool Link 3"
-msgstr "Lien sympa 3"
-
-#: src/protocols/yahoo/yahoo_profile.c:1138
-#, c-format
-msgid "User information for %s unavailable"
-msgstr "Les informations sur %s ne sont pas disponibles"
-
-#: src/protocols/yahoo/yahoochat.c:198
+#: src/protocols/yahoo/yahoo_profile.c:1152
+msgid ""
+"Could not retrieve the user's profile. This most likely is a temporary "
+"server-side problem. Please try again later."
+msgstr ""
+"Impossible de récupérer le profil de l'utilisateur. Cela provient "
+"probablement d'un problème temporaire sur le serveur. Veuillez réessayez "
+"plus tard."
+
+#: src/protocols/yahoo/yahoo_profile.c:1155
+msgid ""
+"Could not retrieve the user's profile. This most likely means that the user "
+"does not exist; however, Yahoo! sometimes does fail to find a user's "
+"profile. If you know that the user exists, please try again later."
+msgstr ""
+"Impossible de récupérer le profil de l'utilisateur. L'utilisateur n'existe "
+"probablement pas. Cependant, Yahoo! échoue de temps en temps à trouver "
+"certains profils. Si vous savez que l'utilisateur existe, veuillez réessayez "
+"plus tard."
+
+#: src/protocols/yahoo/yahoo_profile.c:1163
+msgid "The user's profile is empty."
+msgstr "Le profil de l'utilisateur est vide"
+
+#: src/protocols/yahoo/yahoochat.c:203
 #, c-format
 msgid "%s declined your conference invitation to room \"%s\" because \"%s\"."
 msgstr ""
 "%s a décliné votre invitation à la conférence « %s » pour la raison : %s"
 
-#: src/protocols/yahoo/yahoochat.c:200
+#: src/protocols/yahoo/yahoochat.c:205
 msgid "Invitation Rejected"
 msgstr "Invitation refusée"
 
-#: src/protocols/yahoo/yahoochat.c:350
+#: src/protocols/yahoo/yahoochat.c:355
 msgid "Failed to join chat"
 msgstr "Impossible de joindre la discussion"
 
-#: src/protocols/yahoo/yahoochat.c:350
+#: src/protocols/yahoo/yahoochat.c:355
 msgid "Maybe the room is full?"
 msgstr "Le salon de discussion est peut-être plein"
 
-#: src/protocols/yahoo/yahoochat.c:424
+#: src/protocols/yahoo/yahoochat.c:429
 #, c-format
 msgid "You are now chatting in %s."
 msgstr "Vous discutez dans %s"
 
-#: src/protocols/yahoo/yahoochat.c:578
+#: src/protocols/yahoo/yahoochat.c:583
 msgid "Failed to join buddy in chat"
 msgstr "Impossible de joindre le contact dans la discussion"
 
-#: src/protocols/yahoo/yahoochat.c:579
+#: src/protocols/yahoo/yahoochat.c:584
 msgid "Maybe they're not in a chat?"
 msgstr "Le contact n'est peut-être pas dans une discussion"
 
-#: src/protocols/yahoo/yahoochat.c:1299
+#: src/protocols/yahoo/yahoochat.c:1338
 msgid "Unable to connect"
 msgstr "Impossible de se connecter"
 
-#: src/protocols/yahoo/yahoochat.c:1299
+#: src/protocols/yahoo/yahoochat.c:1338
 msgid "Fetching the room list failed."
 msgstr "Échec de récupération de la liste des salons de discussion"
 
-#: src/protocols/yahoo/yahoochat.c:1344
+#: src/protocols/yahoo/yahoochat.c:1383
 msgid "Voices"
 msgstr "Voix"
 
-#: src/protocols/yahoo/yahoochat.c:1347
+#: src/protocols/yahoo/yahoochat.c:1386
 msgid "Webcams"
 msgstr "Webcams"
 
-#: src/protocols/yahoo/yahoochat.c:1358 src/protocols/yahoo/yahoochat.c:1419
+#: src/protocols/yahoo/yahoochat.c:1397 src/protocols/yahoo/yahoochat.c:1458
 msgid "Unable to fetch room list."
 msgstr "Impossible de récupérer la liste des salons"
 
-#: src/protocols/yahoo/yahoochat.c:1412
+#: src/protocols/yahoo/yahoochat.c:1451
 msgid "User Rooms"
 msgstr "Salon de discussion utilisateur"
 
-#: src/protocols/zephyr/zephyr.c:566
+#: src/protocols/zephyr/zephyr.c:589
 #, c-format
 msgid "Unable send to chat %s,%s,%s"
 msgstr "Impossible d'écrire dans le salon %s,%s,%s"
 
-#: src/protocols/zephyr/zephyr.c:600
+#: src/protocols/zephyr/zephyr.c:624
 #, c-format
 msgid "<b>User:</b> %s<br>"
 msgstr "<b>Utilisateur :</b> %s<br>"
 
-#: src/protocols/zephyr/zephyr.c:604
+#: src/protocols/zephyr/zephyr.c:628
 msgid "<br>Hidden or not logged-in"
 msgstr "<br>Invisible ou déconnecté"
 
-#: src/protocols/zephyr/zephyr.c:608
+#: src/protocols/zephyr/zephyr.c:633
 #, c-format
 msgid "<br>At %s since %s"
 msgstr "<br>À %s depuis %s"
 
-#: src/protocols/zephyr/zephyr.c:873 src/protocols/zephyr/zephyr.c:874
+#: src/protocols/zephyr/zephyr.c:983 src/protocols/zephyr/zephyr.c:984
 msgid "Anyone"
 msgstr "Tout le monde"
 
-#: src/protocols/zephyr/zephyr.c:900
+#: src/protocols/zephyr/zephyr.c:1011
 msgid "Already logged in with Zephyr"
 msgstr "Déjà connecté à Zephyr"
 
-#: src/protocols/zephyr/zephyr.c:900
+#: src/protocols/zephyr/zephyr.c:1011
 msgid ""
 "Because Zephyr uses your system username, you are unable to have multiple "
 "accounts on it when logged in as the same user."
@@ -10344,18 +10618,90 @@
 "Zephyr utilise le nom d'utilisateur système, il est donc impossible d'avoir "
 "plusieurs comptes en étant identifié sous le même nom d'utilisateur."
 
-#: src/protocols/zephyr/zephyr.c:1232
+#: src/protocols/zephyr/zephyr.c:1386
 msgid "_Class:"
 msgstr "_Classe :"
 
-#: src/protocols/zephyr/zephyr.c:1238
+#: src/protocols/zephyr/zephyr.c:1392
 msgid "_Instance:"
 msgstr "_Instance :"
 
-#: src/protocols/zephyr/zephyr.c:1244
+#: src/protocols/zephyr/zephyr.c:1398
 msgid "_Recipient:"
 msgstr "_Destinataire :"
 
+#: src/protocols/zephyr/zephyr.c:1409
+#, c-format
+msgid "Attempt to subscribe to %s,%s,%s failed"
+msgstr "Échec de l'inscription à %s,%s,%s"
+
+#: src/protocols/zephyr/zephyr.c:1678
+msgid "zlocate &lt;nick&gt;: Locate user"
+msgstr "zlocate &lt;pseudo&gt; : Localiser d'une personnes."
+
+#: src/protocols/zephyr/zephyr.c:1683
+msgid "zl &lt;nick&gt;: Locate user"
+msgstr "zl &lt;pseudo&gt; : Localiser d'une personnes."
+
+#: src/protocols/zephyr/zephyr.c:1688
+msgid "instance &lt;instance&gt;: Set the instance to be used on this class"
+msgstr ""
+"instance &lt;instance&gt; : Choisir l'instance à utiliser pour cette classe."
+
+#: src/protocols/zephyr/zephyr.c:1693
+msgid "inst &lt;instance&gt;: Set the instance to be used on this class"
+msgstr ""
+"inst &lt;instance&gt; : Choisir l'instance à utiliser pour cette classe."
+
+#: src/protocols/zephyr/zephyr.c:1699
+msgid "sub &lt;class&gt; &lt;instance&gt; &lt;recipient&gt;: Join a new chat"
+msgstr ""
+"sub &lt;classs&gt; &lt;instance&gt; &lt;destinataire&gt; : Joindre une "
+"nouvelle discussion."
+
+#: src/protocols/zephyr/zephyr.c:1704
+msgid ""
+"zi &lt;instance&gt;: Send a message to &lt;message,<i>instance</i>,*&gt;"
+msgstr ""
+"zi &lt;instance&gt; : Envoyer un message à &lt;message,<i>instance</i>,*&gt;."
+
+#: src/protocols/zephyr/zephyr.c:1710
+msgid ""
+"zci &lt;class&gt; &lt;instance&gt;: Send a message to &lt;<i>class</i>,"
+"<i>instance</i>,*&gt;"
+msgstr ""
+"zci &lt;classe&gt; &lt;instance&gt; : Envoyer un message à &lt;<i>classe</i>,"
+"<i>instance</i>,*&gt;."
+
+#: src/protocols/zephyr/zephyr.c:1716
+msgid ""
+"zcir &lt;class&gt; &lt;instance&gt; &lt;recipient&gt;: Send a message to &lt;"
+"<i>class</i>,<i>instance</i>,<i>recipient</i>&gt;"
+msgstr ""
+"zcir &lt;classe&gt; &lt;instance&gt; &lt;destinataire&gt; : Envoyer un "
+"message à &lt;<i>classe</i>,<i>instance</i>,<i>destinataire</i>&gt;."
+
+#: src/protocols/zephyr/zephyr.c:1722
+msgid ""
+"zir &lt;instance&gt; &lt;recipient&gt;: Send a message to &lt;MESSAGE,"
+"<i>instance</i>,<i>recipient</i>&gt;"
+msgstr ""
+"zir &lt;instance&gt; &lt;destinataire&gt; : Envoyer un message à &lt;message,"
+"<i>instance</i>,<i>destinataire</i>&gt;."
+
+#: src/protocols/zephyr/zephyr.c:1727
+msgid "zc &lt;class&gt;: Send a message to &lt;<i>class</i>,PERSONAL,*&gt;"
+msgstr ""
+"zc &lt;classe&gt; : Envoyer un message à &lt;<i>classe</i>,personal,*&gt;."
+
+#: src/protocols/zephyr/zephyr.c:1802
+msgid "Resubscribe"
+msgstr "Réinscription"
+
+#: src/protocols/zephyr/zephyr.c:1805
+msgid "Retrieve subscriptions from server"
+msgstr "Récupérer les abonnements du serveur"
+
 #. *< api_version
 #. *< type
 #. *< ui_requirement
@@ -10367,19 +10713,19 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/zephyr/zephyr.c:1412 src/protocols/zephyr/zephyr.c:1414
+#: src/protocols/zephyr/zephyr.c:1885 src/protocols/zephyr/zephyr.c:1887
 msgid "Zephyr Protocol Plugin"
 msgstr "Plugin pour le protocole Zephyr"
 
-#: src/protocols/zephyr/zephyr.c:1433
+#: src/protocols/zephyr/zephyr.c:1906
 msgid "Export to .anyone"
 msgstr "Exporter vers .anyone"
 
-#: src/protocols/zephyr/zephyr.c:1436
+#: src/protocols/zephyr/zephyr.c:1909
 msgid "Export to .zephyr.subs"
 msgstr "Exporter vers .zephyr.subs"
 
-#: src/protocols/zephyr/zephyr.c:1439
+#: src/protocols/zephyr/zephyr.c:1912
 msgid "Exposure"
 msgstr "Exposition"
 
@@ -10408,14 +10754,14 @@
 msgstr "Le nom d'hôte ou le port pour le serveur mandataire est incorrect."
 
 #. * Custom away message.
-#: src/prpl.h:205
+#: src/prpl.h:165
 msgid "Custom"
 msgstr "Personnalisé"
 
 #. *
 #. * A wrapper for gaim_request_action() that uses Accept and Cancel buttons.
 #.
-#: src/request.h:1252
+#: src/request.h:1253
 msgid "Accept"
 msgstr "Accepter"
 
@@ -10439,27 +10785,27 @@
 msgid "(1 message)"
 msgstr "(1 message)"
 
-#: src/server.c:1176 src/server.c:1186
+#: src/server.c:1180 src/server.c:1189
 #, c-format
 msgid "%s logged in."
 msgstr "%s s'est connecté"
 
-#: src/server.c:1199
+#: src/server.c:1201
 #, c-format
 msgid "%s signed on"
 msgstr "%s vient de se connecter"
 
-#: src/server.c:1215
+#: src/server.c:1216
 #, c-format
 msgid "%s came back"
 msgstr "%s est de retour"
 
-#: src/server.c:1217
+#: src/server.c:1218
 #, c-format
 msgid "%s went away"
 msgstr "%s vient de passer absent"
 
-#: src/server.c:1231
+#: src/server.c:1232
 #, c-format
 msgid "%s became idle"
 msgstr "%s est devenu inactif"
@@ -10469,17 +10815,17 @@
 msgid "%s became unidle"
 msgstr "%s n'est plus inactif"
 
-#: src/server.c:1254 src/server.c:1262
+#: src/server.c:1253 src/server.c:1260
 #, c-format
 msgid "%s logged out."
 msgstr "%s vient de se déconnecter"
 
-#: src/server.c:1276
+#: src/server.c:1273
 #, c-format
 msgid "%s signed off"
 msgstr "%s a quitté"
 
-#: src/server.c:1338
+#: src/server.c:1335
 #, c-format
 msgid ""
 "%s has just been warned by %s.\n"
@@ -10488,11 +10834,11 @@
 "%s vient de se faire réprimander par %s\n"
 "Votre nouveau niveau d'avertissement est de %d%%"
 
-#: src/server.c:1341
+#: src/server.c:1338
 msgid "an anonymous person"
 msgstr "une personne anonyme"
 
-#: src/server.c:1451
+#: src/server.c:1448
 #, c-format
 msgid ""
 "User '%s' invites %s to buddy chat room: '%s'\n"
@@ -10501,12 +10847,12 @@
 "L'utilisateur %s invite %s dans le salon de discussions : %s\n"
 "%s"
 
-#: src/server.c:1455
+#: src/server.c:1452
 #, c-format
 msgid "User '%s' invites %s to buddy chat room: '%s'\n"
 msgstr "L'utilisateur %s invite %s dans le salon de discussions : %s\n"
 
-#: src/server.c:1461
+#: src/server.c:1458
 msgid "Accept chat invitation?"
 msgstr "Accepter l'invitation à la discussion ?"
 
@@ -10541,25 +10887,31 @@
 msgid "Unknown."
 msgstr "Inconnu"
 
-#: src/util.c:2399
+#: src/util.c:2392
+msgid "second"
+msgid_plural "seconds"
+msgstr[0] "seconde"
+msgstr[1] "secondes"
+
+#: src/util.c:2406
 msgid "day"
 msgid_plural "days"
 msgstr[0] "jour"
 msgstr[1] "jours"
 
-#: src/util.c:2407
+#: src/util.c:2414
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "heure"
 msgstr[1] "heures"
 
-#: src/util.c:2415
+#: src/util.c:2422
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "minute"
 msgstr[1] "minutes"
 
-#: src/util.c:2824
+#: src/util.c:2832
 msgid "g003: Error opening connection.\n"
 msgstr "g003 : Erreur à l'ouverture de la connexion\n"
 
@@ -10575,6 +10927,24 @@
 msgid "Notification"
 msgstr "Annonce"
 
+#~ msgid "Invalid Groupname"
+#~ msgstr "Nom de groupe non valide"
+
+#~ msgid "That file already exists."
+#~ msgstr "Ce fichier existe déjà"
+
+#~ msgid "Save As..."
+#~ msgstr "Enregistrer sous..."
+
+#~ msgid "Modes"
+#~ msgstr "Modes"
+
+#~ msgid "Hostname"
+#~ msgstr "Hôte"
+
+#~ msgid "Channels"
+#~ msgstr "Salons"
+
 #~ msgid "Buddy icon file:"
 #~ msgstr "Fichier de l'icône :"
 
@@ -10596,12 +10966,6 @@
 #~ msgid "Co_lorize screen names"
 #~ msgstr "_Colorier les pseudos"
 
-#~ msgid "Proxy Type"
-#~ msgstr "Type de serveur mandataire"
-
-#~ msgid "Proxy"
-#~ msgstr "Proxy"
-
 #~ msgid "Protocols"
 #~ msgstr "Protocoles"
 
@@ -10633,10 +10997,6 @@
 #~ "probablement dire « %s@hotmail.com ». La liste d'interdictions n'a pas "
 #~ "été modifiée."
 
-#~ msgid "<html><body><b>Error retrieving profile</b></body></html>"
-#~ msgstr ""
-#~ "<html><body><b>Erreur lors de la récupération du profil</b></body></html>"
-
 #~ msgid "Unable to write to MSN Nexus server."
 #~ msgstr "Impossible de parler au server MSN Nexus"
 
@@ -10659,13 +11019,6 @@
 #~ msgid "Unable to transfer to notification server"
 #~ msgstr "Impossible de parler au server de notification"
 
-#~ msgid ""
-#~ "Error reading from %s server. Lastcommand was:\n"
-#~ " %s"
-#~ msgstr ""
-#~ "Erreur à la lecture depuis le serveur %s.La dernière commande était :\n"
-#~ " %s"
-
 #~ msgid "An MSN message may not have been received."
 #~ msgstr "Un message MSN peut avoir été perdu."
 
@@ -10678,9 +11031,6 @@
 #~ msgid "Unable to send password"
 #~ msgstr "Impossible d'envoyer le mot de passe"
 
-#~ msgid "Disconnected"
-#~ msgstr "Déconnecté"
-
 #~ msgid "Could not connect for transfer!"
 #~ msgstr "Impossible de se connecter pour le transfert"
 
--- a/po/nl.po	Tue Jul 13 23:05:59 2004 +0000
+++ b/po/nl.po	Wed Jul 14 19:05:16 2004 +0000
@@ -3,20 +3,34 @@
 # Copyright (C) 2003-2004, Vincent van Adrighem <adrighem@gnome.org>
 # This file is distributed under the same license as the Gaim package.
 # Vincent van Adrighem <adrighem@gnome.org>, 2004.
+# Vincent van Adrighem <V.vanAdrighem@dirck.mine.nu>, 2004.
 #
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: nl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-04-22 22:29-0400\n"
-"PO-Revision-Date: 2004-04-19 13:54+0200\n"
+"POT-Creation-Date: 2004-07-14 01:44+0200\n"
+"PO-Revision-Date: 2004-07-14 01:51+0200\n"
 "Last-Translator: Vincent van Adrighem <adrighem@gnome.org>\n"
 "Language-Team: Dutch <vertaling@nl.linux.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"
+"Plural-Forms:  nplurals=2; plural=(n != 1);\n"
+"X-Generator: KBabel 1.3.1\n"
+
+#: plugins/autorecon.c:174
+msgid "Error Message Suppression"
+msgstr "Onderdrukking van foutmeldingen"
+
+#: plugins/autorecon.c:178
+msgid "Hide Disconnect Errors"
+msgstr "Verbindingsfouten verbergen"
+
+#: plugins/autorecon.c:182
+msgid "Hide Login Errors"
+msgstr "Aanmeldfouten verbergen"
 
 #. *< api_version
 #. *< type
@@ -25,7 +39,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/autorecon.c:110
+#: plugins/autorecon.c:204
 msgid "Auto-Reconnect"
 msgstr "Verbinding herstellen"
 
@@ -33,7 +47,7 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/autorecon.c:113 plugins/autorecon.c:115
+#: plugins/autorecon.c:207 plugins/autorecon.c:209
 msgid "When you are kicked offline, this reconnects you."
 msgstr "Wanneer je offline wordt geschopt, herstelt dit de verbinding."
 
@@ -107,10 +121,8 @@
 #. *< version
 #. *< summary
 #: plugins/contact_priority.c:194
-msgid ""
-"Allows for controlling the values associated with different buddy states."
-msgstr ""
-"Geeft de mogelijkheid om waardes toe te kennen aan de status van het contact."
+msgid "Allows for controlling the values associated with different buddy states."
+msgstr "Geeft de mogelijkheid om waardes toe te kennen aan de status van het contact."
 
 #. *< description
 #: plugins/contact_priority.c:196
@@ -136,7 +148,7 @@
 msgid "Gaim - Away"
 msgstr "Gaim - Afwezig"
 
-#: plugins/docklet/docklet.c:114 src/gtkaccount.c:497 src/gtkaccount.c:1891
+#: plugins/docklet/docklet.c:114 src/gtkaccount.c:727 src/gtkaccount.c:2152
 msgid "Auto-login"
 msgstr "Auto-aanmelden"
 
@@ -152,19 +164,21 @@
 msgid "New..."
 msgstr "Nieuw..."
 
-#: plugins/docklet/docklet.c:153 src/gtkprefs.c:1637 src/protocols/gg/gg.c:51
-#: src/protocols/irc/msgs.c:187 src/protocols/jabber/jabber.c:952
+#: plugins/docklet/docklet.c:153 src/gtkprefs.c:1809 src/protocols/gg/gg.c:51
+#: src/protocols/irc/msgs.c:187 src/protocols/jabber/jabber.c:960
 #: src/protocols/jabber/jutil.c:32 src/protocols/jabber/presence.c:63
-#: src/protocols/jabber/presence.c:119 src/protocols/novell/novell.c:2147
-#: src/protocols/novell/novell.c:2262 src/protocols/novell/novell.c:2314
-#: src/protocols/oscar/oscar.c:520 src/protocols/oscar/oscar.c:4825
-#: src/protocols/oscar/oscar.c:5808 src/protocols/oscar/oscar.c:6426
+#: src/protocols/jabber/presence.c:119 src/protocols/novell/novell.c:2724
+#: src/protocols/novell/novell.c:2841 src/protocols/novell/novell.c:2893
+#: src/protocols/oscar/oscar.c:532 src/protocols/oscar/oscar.c:5481
+#: src/protocols/oscar/oscar.c:6480 src/protocols/oscar/oscar.c:6679
+#: src/protocols/silc/buddy.c:1379 src/protocols/silc/silc.c:46
+#: src/protocols/silc/silc.c:76
 msgid "Away"
 msgstr "Afwezig"
 
 #. else...
-#: plugins/docklet/docklet.c:159 src/away.c:522
-#: src/protocols/oscar/oscar.c:4743 src/protocols/oscar/oscar.c:6434
+#: plugins/docklet/docklet.c:159 src/away.c:550
+#: src/protocols/oscar/oscar.c:5399 src/protocols/oscar/oscar.c:6687
 msgid "Back"
 msgstr "Terug"
 
@@ -172,16 +186,15 @@
 msgid "Mute Sounds"
 msgstr "Geluiden dempen"
 
-#: plugins/docklet/docklet.c:172 src/gtkft.c:605
+#: plugins/docklet/docklet.c:172 src/gtkft.c:612
 msgid "File Transfers"
 msgstr "Bestandsoverdrachten"
 
-#. And now for the buttons
-#: plugins/docklet/docklet.c:173 src/gtkaccount.c:2070 src/main.c:286
+#: plugins/docklet/docklet.c:173 src/gtkaccount.c:2333
 msgid "Accounts"
 msgstr "Accounts"
 
-#: plugins/docklet/docklet.c:174 src/gtkprefs.c:2594 src/main.c:292
+#: plugins/docklet/docklet.c:174 src/gtkprefs.c:2503
 msgid "Preferences"
 msgstr "Voorkeuren"
 
@@ -233,6 +246,49 @@
 "geven. Ook biedt het de mogelijkheid om inkomende berichten te laten wachten "
 "totdat erop geklikt wordt, net als in ICQ."
 
+#: plugins/extplacement.c:75
+msgid "By conversation count"
+msgstr "Op hoeveelheid gesprekken"
+
+#: plugins/extplacement.c:96
+msgid "Conversation Placement"
+msgstr "Plaatsing van gesprekken"
+
+#: plugins/extplacement.c:101
+msgid "Number of conversations per window"
+msgstr "Aantal gesprekken per venster"
+
+#: plugins/extplacement.c:107
+msgid "Separate IM and Chat windows when placing by number"
+msgstr "Gescheiden vensters voor gesprekken en chats bij plaatsen op nummer"
+
+#. *< api_version
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: plugins/extplacement.c:126
+msgid "ExtPlacement"
+msgstr "ExtPlaatsing"
+
+#. *< name
+#. *< version
+#: plugins/extplacement.c:128
+msgid "Extra conversation placement options."
+msgstr "Extra opties voor plaatsen van gespreksvensters."
+
+#. *< summary
+#. *  description
+#: plugins/extplacement.c:130
+msgid ""
+"Restrict the number of conversations per windows, optionally separating IMs "
+"and Chats"
+msgstr ""
+"Het aantal gesprekken per venster beperken, al of niet met splitsing van "
+"chats en gewone gesprekken."
+
 #. *< api_version
 #. *< type
 #. *< ui_requirement
@@ -392,62 +448,62 @@
 "Sleep naar boven en dan naar links om naar het vorige gesprek te gaan.\n"
 "Sleep naar boven en dan naar rechts om naar het volgende gesprek te gaan."
 
-#: plugins/gevolution/add_buddy_dialog.c:136
-#: plugins/gevolution/assoc-buddy.c:74
+#: plugins/gevolution/add_buddy_dialog.c:133
+#: plugins/gevolution/assoc-buddy.c:71
 msgid "Local Addressbook"
 msgstr "Lokaal adresboek"
 
-#: plugins/gevolution/add_buddy_dialog.c:146
-#: plugins/gevolution/add_buddy_dialog.c:157
-#: plugins/gevolution/assoc-buddy.c:84 plugins/gevolution/assoc-buddy.c:95
-#: src/gtkblist.c:2964 src/gtkprefs.c:884 src/gtkprefs.c:1665
-#: src/protocols/jabber/jabber.c:916
+#: plugins/gevolution/add_buddy_dialog.c:143
+#: plugins/gevolution/add_buddy_dialog.c:154
+#: plugins/gevolution/assoc-buddy.c:81 plugins/gevolution/assoc-buddy.c:92
+#: src/gtkblist.c:3015 src/gtkprefs.c:961 src/gtkprefs.c:1014
+#: src/gtkprefs.c:1822 src/protocols/jabber/jabber.c:924
 msgid "None"
 msgstr "Niet"
 
-#: plugins/gevolution/add_buddy_dialog.c:190
-#: plugins/gevolution/assoc-buddy.c:178 src/gtkprefs.c:2006
-#: src/gtkroomlist.c:561 src/protocols/jabber/jabber.c:591
-#: src/protocols/msn/msn.c:1395 src/protocols/trepia/trepia.c:398
+#: plugins/gevolution/add_buddy_dialog.c:187
+#: plugins/gevolution/assoc-buddy.c:175 src/gtkprefs.c:2175
+#: src/gtkroomlist.c:553 src/protocols/jabber/jabber.c:598
+#: src/protocols/msn/msn.c:1311 src/protocols/trepia/trepia.c:398
 msgid "Name"
 msgstr "Naam"
 
-#: plugins/gevolution/add_buddy_dialog.c:201
+#: plugins/gevolution/add_buddy_dialog.c:198
 msgid "Instant Messaging"
 msgstr "Expresberichten"
 
 #. Add the label.
-#: plugins/gevolution/add_buddy_dialog.c:482
+#: plugins/gevolution/add_buddy_dialog.c:479
 msgid "Select a person from your address book below, or add a new person."
 msgstr ""
 "Kies een persoon uit het hieronder weergegeven adresboek, of voeg een nieuw "
 "persoon toe."
 
 #. "Search"
-#: plugins/gevolution/add_buddy_dialog.c:495
-#: plugins/gevolution/assoc-buddy.c:383 src/protocols/oscar/oscar.c:6697
+#: plugins/gevolution/add_buddy_dialog.c:492
+#: plugins/gevolution/assoc-buddy.c:380 src/protocols/oscar/oscar.c:6965
 msgid "Search"
 msgstr "Zoeken"
 
-#: plugins/gevolution/add_buddy_dialog.c:566
-#: plugins/gevolution/new_person_dialog.c:310 src/gtkblist.c:3982
-#: src/gtkblist.c:4310
+#: plugins/gevolution/add_buddy_dialog.c:563
+#: plugins/gevolution/new_person_dialog.c:307 src/gtkblist.c:4045
+#: src/gtkblist.c:4373
 msgid "Group:"
 msgstr "Groep:"
 
 #. "New Person" button
-#: plugins/gevolution/add_buddy_dialog.c:592
-#: plugins/gevolution/assoc-buddy.c:486
+#: plugins/gevolution/add_buddy_dialog.c:589
+#: plugins/gevolution/assoc-buddy.c:483
 msgid "New Person"
 msgstr "Nieuw persoon"
 
 #. "Select Buddy" button
-#: plugins/gevolution/add_buddy_dialog.c:609
+#: plugins/gevolution/add_buddy_dialog.c:606
 msgid "Select Buddy"
 msgstr "Contact selecteren"
 
 #. Add the label.
-#: plugins/gevolution/assoc-buddy.c:370
+#: plugins/gevolution/assoc-buddy.c:367
 msgid ""
 "Select a person from your address book to add this buddy to, or create a new "
 "person."
@@ -456,42 +512,42 @@
 "een nieuw persoon aan."
 
 #. Add the disclosure
-#: plugins/gevolution/assoc-buddy.c:449
+#: plugins/gevolution/assoc-buddy.c:446
 msgid "Show user details"
 msgstr "Gebruikerdetails weergeven"
 
-#: plugins/gevolution/assoc-buddy.c:450
+#: plugins/gevolution/assoc-buddy.c:447
 msgid "Hide user details"
 msgstr "Gebruikerdetails verbergen"
 
 #. "Associate Buddy" button
-#: plugins/gevolution/assoc-buddy.c:503
+#: plugins/gevolution/assoc-buddy.c:500
 msgid "_Associate Buddy"
 msgstr "Contact _associëren"
 
-#: plugins/gevolution/gevo-util.c:66 plugins/gevolution/gevolution.c:90
-#: src/blist.c:685 src/blist.c:872 src/blist.c:2105 src/gtkblist.c:3807
-#: src/protocols/jabber/roster.c:66 src/protocols/msn/notification.c:793
+#: plugins/gevolution/gevo-util.c:64 plugins/gevolution/gevolution.c:89
+#: src/blist.c:775 src/blist.c:963 src/blist.c:1870 src/gtkblist.c:3866
+#: src/protocols/jabber/roster.c:66
 msgid "Buddies"
 msgstr "Contacten"
 
-#: plugins/gevolution/gevolution.c:214
+#: plugins/gevolution/gevolution.c:220
 msgid "Add to Address Book"
 msgstr "Toevoegen aan adresboek"
 
 #. Configuration frame
-#: plugins/gevolution/gevolution.c:347
+#: plugins/gevolution/gevolution.c:351
 msgid "Evolution Integration Configuration"
 msgstr "Evolution integratie-opties"
 
 #. Label
-#: plugins/gevolution/gevolution.c:350
+#: plugins/gevolution/gevolution.c:354
 msgid "Select all accounts that buddies should be auto-added to."
 msgstr ""
 "Selecteer de accounts waar contacten automatisch aan toegevoegd moeten "
 "worden."
 
-#: plugins/gevolution/gevolution.c:380 src/gtkconn.c:620
+#: plugins/gevolution/gevolution.c:384 plugins/idle.c:51 src/gtkconn.c:620
 msgid "Account"
 msgstr "Account"
 
@@ -502,7 +558,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/gevolution/gevolution.c:461
+#: plugins/gevolution/gevolution.c:465
 msgid "Evolution Integration"
 msgstr "Integratie met Evolution"
 
@@ -510,58 +566,58 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/gevolution/gevolution.c:464 plugins/gevolution/gevolution.c:466
+#: plugins/gevolution/gevolution.c:468 plugins/gevolution/gevolution.c:470
 msgid "Provides integration with Ximian Evolution."
 msgstr "Verzorgt de integratie met Ximian Evolution."
 
-#: plugins/gevolution/new_person_dialog.c:270
+#: plugins/gevolution/new_person_dialog.c:267
 msgid "Please enter the person's information below."
 msgstr "Vul hieronder de persoonsgegevens in."
 
-#: plugins/gevolution/new_person_dialog.c:274
+#: plugins/gevolution/new_person_dialog.c:271
 msgid "Please enter the buddy's screen name and account type below."
 msgstr "Vul hieronder de gebruikersnaam en accounttype van uw contact in."
 
-#: plugins/gevolution/new_person_dialog.c:294
+#: plugins/gevolution/new_person_dialog.c:291
 msgid "Account type:"
 msgstr "Accounttype:"
 
-#: plugins/gevolution/new_person_dialog.c:298
+#: plugins/gevolution/new_person_dialog.c:295
 msgid "Screenname:"
 msgstr "Gebruikersnaam:"
 
 #. Optional Information section
-#: plugins/gevolution/new_person_dialog.c:318
+#: plugins/gevolution/new_person_dialog.c:315
 msgid "Optional information:"
 msgstr "Optionele informatie:"
 
 #. Label
-#: plugins/gevolution/new_person_dialog.c:341 src/gtkaccount.c:320
-#: src/protocols/oscar/oscar.c:425
+#: plugins/gevolution/new_person_dialog.c:338 src/gtkaccount.c:378
+#: src/gtkaccount.c:408 src/protocols/oscar/oscar.c:438
 msgid "Buddy Icon"
 msgstr "Contactplaatje"
 
-#: plugins/gevolution/new_person_dialog.c:353
+#: plugins/gevolution/new_person_dialog.c:350
 msgid "First name:"
 msgstr "Voornaam:"
 
-#: plugins/gevolution/new_person_dialog.c:365
+#: plugins/gevolution/new_person_dialog.c:362
 msgid "Last name:"
 msgstr "Achternaam:"
 
-#: plugins/gevolution/new_person_dialog.c:385
+#: plugins/gevolution/new_person_dialog.c:382
 msgid "E-mail:"
 msgstr "E-mail:"
 
-#: plugins/history.c:70
+#: plugins/history.c:88
 msgid "History"
 msgstr "Geschiedenis"
 
-#: plugins/history.c:72
+#: plugins/history.c:90
 msgid "Shows recently logged conversations in new conversations."
 msgstr "Geeft recente gesprekken weer in een nieuw gesprek"
 
-#: plugins/history.c:73
+#: plugins/history.c:91
 msgid ""
 "When a new conversation is opened this plugin will insert the last "
 "conversation into the current conversation."
@@ -586,34 +642,29 @@
 #. *  description
 #: plugins/iconaway.c:83 plugins/iconaway.c:85
 msgid "Iconifies the buddy list and your conversations when you go away."
-msgstr ""
-"Minimaliseert het gespreksvenster en de contactenlijst bij afwezigheid."
-
-#: plugins/idle.c:70
-msgid "Idle Time"
-msgstr "Afwezigheid"
-
-#: plugins/idle.c:78
-msgid "Set"
-msgstr "Zet"
-
-#: plugins/idle.c:83
-msgid "idle for"
-msgstr "op een afwezigheid van"
-
-#: plugins/idle.c:90 plugins/timestamp.c:109
-msgid "minutes."
-msgstr "minuten."
-
-#: plugins/idle.c:96
+msgstr "Minimaliseert het gespreksvenster en de contactenlijst bij afwezigheid."
+
+#: plugins/idle.c:55
+msgid "Minutes"
+msgstr "Minuten"
+
+#: plugins/idle.c:62 plugins/idle.c:95
+msgid "I'dle Mak'er"
+msgstr "'k ben d'r nie"
+
+#: plugins/idle.c:63 plugins/idle.c:78
+msgid "Set Account Idle Time"
+msgstr "Afwezigheidstijd instellen"
+
+#: plugins/idle.c:66
 msgid "_Set"
 msgstr "_Activeren"
 
-#: plugins/idle.c:119
-msgid "I'dle Mak'er"
-msgstr "'k ben d'r nie"
-
-#: plugins/idle.c:121 plugins/idle.c:122
+#: plugins/idle.c:67 src/dialogs.c:786
+msgid "_Cancel"
+msgstr "_Annuleren"
+
+#: plugins/idle.c:97 plugins/idle.c:98
 msgid "Allows you to hand-configure how long you've been idle for"
 msgstr "Stelt u in staat om zelf de tijd van afwezigheid in te stellen"
 
@@ -684,69 +735,70 @@
 "mail heeft."
 
 #. ---------- "Notify For" ----------
-#: plugins/notify.c:572
+#: plugins/notify.c:599
 msgid "Notify For"
 msgstr "Melding geven voor"
 
-#: plugins/notify.c:576
+#: plugins/notify.c:603
 msgid "_IM windows"
 msgstr "_Berichtvensters"
 
-#: plugins/notify.c:583
+#: plugins/notify.c:610
 msgid "C_hat windows"
 msgstr "C_hatvensters"
 
-#: plugins/notify.c:590
+#: plugins/notify.c:617
 msgid "_Focused windows"
 msgstr "Vensters met invoer_aandacht"
 
 #. ---------- "Notification Methods" ----------
-#: plugins/notify.c:598
+#: plugins/notify.c:625
 msgid "Notification Methods"
 msgstr "Meldingmethode"
 
-#: plugins/notify.c:605
+#: plugins/notify.c:632
 msgid "Prepend _string into window title:"
 msgstr "_Tekst om voor venstertitel te plakken:"
 
 #. Count method button
-#: plugins/notify.c:624
+#: plugins/notify.c:651
 msgid "Insert c_ount of new messages into window title"
 msgstr "Aantal _nieuwe berichten weergeven in venstertitel"
 
 #. Urgent method button
-#: plugins/notify.c:633
+#: plugins/notify.c:659
 msgid "Set window manager \"_URGENT\" hint"
 msgstr "\"_URGENT\" (hoge prioriteit) doorgeven aan het vensterbeheer"
 
 #. ---------- "Notification Removals" ----------
-#: plugins/notify.c:640
+#: plugins/notify.c:667
 msgid "Notification Removal"
 msgstr "Meldingverwijdering"
 
 #. Remove on focus button
-#: plugins/notify.c:646
+#: plugins/notify.c:672
 msgid "Remove when conversation window _gains focus"
 msgstr "Verwijderen wanneer het gespreksvenster de _aandacht krijgt"
 
 #. Remove on click button
-#: plugins/notify.c:654
+#: plugins/notify.c:679
 msgid "Remove when conversation window _receives click"
 msgstr "Verwijderen wanneer het gespreksvenster een _muisklik ontvangt"
 
 #. Remove on type button
-#: plugins/notify.c:662
+#: plugins/notify.c:687
 msgid "Remove when _typing in conversation window"
 msgstr "Verwijderen wanneer er ge_typt wordt in het gespreksvenster."
 
 #. Remove on message send button
-#: plugins/notify.c:670
+#: plugins/notify.c:695
 msgid "Remove when a _message gets sent"
 msgstr "Verwijderen wanneer een bericht _verzonden wordt"
 
 #. Remove on conversation switch button
-#: plugins/notify.c:679
-msgid "Remove on conversation ta_b switch"
+#: plugins/notify.c:704
+#, fuzzy
+msgid "Remove on switch to conversation ta_b"
 msgstr "Verwijderen bij _tabbladwisseling"
 
 #. *< api_version
@@ -756,7 +808,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/notify.c:762
+#: plugins/notify.c:792
 msgid "Message Notification"
 msgstr "Bericht-attendering"
 
@@ -764,7 +816,7 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/notify.c:765 plugins/notify.c:767
+#: plugins/notify.c:795 plugins/notify.c:797
 msgid "Provides a variety of ways of notifying you of unread messages."
 msgstr "Geeft u een aantal manieren om u te attenderen op nieuwe berichten."
 
@@ -786,17 +838,17 @@
 msgid "Provides support for loading perl plugins."
 msgstr "Geeft de mogelijkheid om perl-plugins te laden."
 
-#: plugins/raw.c:154
+#: plugins/raw.c:146
 msgid "Raw"
 msgstr "Direct"
 
-#: plugins/raw.c:156
+#: plugins/raw.c:148
 msgid "Lets you send raw input to text-based protocols."
 msgstr ""
 "Geeft u de mogelijkheid om tekst direct door te sturen via tekst-gebaseerde "
 "protocollen."
 
-#: plugins/raw.c:157
+#: plugins/raw.c:149
 msgid ""
 "Lets you send raw input to text-based protocols (Jabber, MSN, IRC, TOC). Hit "
 "'Enter' in the entry box to send. Watch the debug window."
@@ -808,8 +860,7 @@
 #: plugins/relnot.c:62
 #, c-format
 msgid "You are using Gaim version %s.  The current version is %s.<hr>"
-msgstr ""
-"U maakt gebruik van versie %s van Gaim. De huidige versie is echter %s.<hr>"
+msgstr "U maakt gebruik van versie %s van Gaim. De huidige versie is echter %s.<hr>"
 
 #: plugins/relnot.c:68
 #, c-format
@@ -867,7 +918,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/signals-test.c:465
+#: plugins/signals-test.c:566
 msgid "Signals Test"
 msgstr "Signalentest"
 
@@ -875,7 +926,7 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/signals-test.c:468 plugins/signals-test.c:470
+#: plugins/signals-test.c:569 plugins/signals-test.c:571
 msgid "Test to see that all signals are working properly."
 msgstr "Test om te zien of alle signalen correct werken."
 
@@ -987,7 +1038,7 @@
 msgid "Provides a wrapper around SSL support libraries."
 msgstr "Zorgt voor een schil om de SSL-bibliotheken"
 
-#: plugins/statenotify.c:30 src/gtkpounce.c:820
+#: plugins/statenotify.c:30
 #, c-format
 msgid "%s has gone away."
 msgstr "%s is afwezig."
@@ -1030,11 +1081,11 @@
 "Geeft in een venster weer wanneer de status van een contact veranderd naar "
 "of van afwezig."
 
-#: plugins/tcl/tcl.c:350
+#: plugins/tcl/tcl.c:359
 msgid "Tcl Plugin Loader"
 msgstr "Tcl-plugin lader"
 
-#: plugins/tcl/tcl.c:352 plugins/tcl/tcl.c:353
+#: plugins/tcl/tcl.c:361 plugins/tcl/tcl.c:362
 msgid "Provides support for loading Tcl plugins"
 msgstr "Geeft de mogelijkheid om tcl-plugins te laden"
 
@@ -1057,15 +1108,19 @@
 msgid "A horizontal scrolling version of the buddy list."
 msgstr "Een horizontale schuivende versie van de contactenlijst."
 
-#: plugins/timestamp.c:95
+#: plugins/timestamp.c:185
 msgid "iChat Timestamp"
 msgstr "iChat Gesprekstijd"
 
-#: plugins/timestamp.c:102
+#: plugins/timestamp.c:192
 msgid "Delay"
 msgstr "Vertraging"
 
-#: plugins/timestamp.c:115
+#: plugins/timestamp.c:199
+msgid "minutes."
+msgstr "minuten."
+
+#: plugins/timestamp.c:205
 msgid "_Apply"
 msgstr "Toe_passen"
 
@@ -1076,7 +1131,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/timestamp.c:173
+#: plugins/timestamp.c:268
 msgid "Timestamp"
 msgstr "Tijd in gesprek"
 
@@ -1084,36 +1139,35 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/timestamp.c:176 plugins/timestamp.c:178
+#: plugins/timestamp.c:271 plugins/timestamp.c:273
 msgid "Adds iChat-style timestamps to conversations every N minutes."
-msgstr ""
-"Voegt op iChat-achtige manier iedere N minuten de tijd toe aan een gesprek."
+msgstr "Voegt op iChat-achtige manier iedere N minuten de tijd toe aan een gesprek."
 
 #: plugins/win32/transparency/win2ktrans.c:133
-#: plugins/win32/transparency/win2ktrans.c:348
-#: plugins/win32/transparency/win2ktrans.c:379
+#: plugins/win32/transparency/win2ktrans.c:388
+#: plugins/win32/transparency/win2ktrans.c:419
 msgid "Opacity:"
 msgstr "Doorschijnendheid:"
 
 #. IM Convo trans options
-#: plugins/win32/transparency/win2ktrans.c:329
+#: plugins/win32/transparency/win2ktrans.c:369
 msgid "IM Conversation Windows"
 msgstr "IM Gespreksvensters"
 
-#: plugins/win32/transparency/win2ktrans.c:330
+#: plugins/win32/transparency/win2ktrans.c:370
 msgid "_IM window transparency"
 msgstr "_IM-vensterdoorschijnendheid"
 
-#: plugins/win32/transparency/win2ktrans.c:340
+#: plugins/win32/transparency/win2ktrans.c:380
 msgid "_Show slider bar in IM window"
 msgstr "_Schuifbalk weergeven in IM-venster"
 
 #. Buddy List trans options
-#: plugins/win32/transparency/win2ktrans.c:365 src/gtkprefs.c:887
+#: plugins/win32/transparency/win2ktrans.c:405 src/gtkprefs.c:955
 msgid "Buddy List Window"
 msgstr "Contactenlijst"
 
-#: plugins/win32/transparency/win2ktrans.c:366
+#: plugins/win32/transparency/win2ktrans.c:406
 msgid "_Buddy List window transparency"
 msgstr "_Contactenlijst doorschijnendheid"
 
@@ -1124,24 +1178,29 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/win32/transparency/win2ktrans.c:422
+#: plugins/win32/transparency/win2ktrans.c:462
 msgid "Transparency"
 msgstr "Transparantie"
 
 #. *< name
 #. *< version
 #. *  summary
+#: plugins/win32/transparency/win2ktrans.c:465
+msgid "Variable Transparency for the buddy list and conversations."
+msgstr "Variabele doorschijnendheid voor de contactenlijst en gesprekken."
+
 #. *  description
-#: plugins/win32/transparency/win2ktrans.c:425
-#: plugins/win32/transparency/win2ktrans.c:427
-msgid ""
-"This plugin enables variable alpha transparency on conversation windows.\n"
+#: plugins/win32/transparency/win2ktrans.c:467
+msgid ""
+"This plugin enables variable alpha transparency on conversation windows and "
+"the buddy list.\n"
 "\n"
 "* Note: This plugin requires Win2000 or WinXP."
 msgstr ""
-"Deze plugin zorgt voor variabele doorschijnendheid in gespreksvensters.\n"
+"Deze plugin zorgt voor variabele doorschijnendheid in gespreksvensters en de "
+"contactenlijst.\n"
 "\n"
-"* Opmerking: Deze plugin vereist Windows 2K of Windows XP."
+"* Opmerking: Deze plugin vereist Windows2000 of Windows XP."
 
 #: plugins/win32/winprefs/winprefs.c:344
 msgid "GTK+ Runtime Version"
@@ -1157,8 +1216,8 @@
 msgstr "Gaim _starten bij het opstarten van Windows"
 
 #. Buddy List
-#: plugins/win32/winprefs/winprefs.c:362 src/gtkblist.c:3005
-#: src/gtkprefs.c:2505
+#: plugins/win32/winprefs/winprefs.c:362 src/gtkblist.c:3057
+#: src/gtkprefs.c:2412
 msgid "Buddy List"
 msgstr "Contactenlijst"
 
@@ -1177,8 +1236,8 @@
 msgstr "Contactenlijst bovenop _houden"
 
 #. Conversations
-#: plugins/win32/winprefs/winprefs.c:382 src/gtkprefs.c:925
-#: src/gtkprefs.c:2506 src/protocols/msn/msn.c:1621
+#: plugins/win32/winprefs/winprefs.c:382 src/gtkprefs.c:1006
+#: src/gtkprefs.c:2413 src/protocols/msn/msn.c:1638
 msgid "Conversations"
 msgstr "Gesprekken"
 
@@ -1194,328 +1253,360 @@
 msgid "Options specific to Windows Gaim."
 msgstr "WinGaim-specifieke opties."
 
-#: src/about.c:59
+#: src/about.c:60
 msgid "About Gaim"
 msgstr "Gaim info"
 
-#: src/about.c:74
+#: src/about.c:75
 #, c-format
 msgid "<span weight=\"bold\" size=\"larger\">Gaim v%s</span>"
 msgstr "<span weight=\"bold\" size=\"larger\">Gaim v%s</span>"
 
-#: src/about.c:94
-msgid ""
-"Gaim is a modular Instant Messaging client capable of using AIM, ICQ, "
-"Yahoo!, MSN, IRC, Jabber, Napster, Zephyr, and Gadu-Gadu all at once.  It is "
-"written using Gtk+ and is licensed under the GPL.<BR><BR>"
+#: src/about.c:95
+msgid ""
+"Gaim is a modular messaging client capable of using AIM, MSN, Yahoo!, "
+"Jabber, ICQ, IRC, SILC, Novell GroupWise, Napster, Zephyr, and Gadu-Gadu all "
+"at once.  It is written using Gtk+ and is licensed under the GPL.<BR><BR>"
 msgstr ""
 "Gaim is een modulair programma om expresberichten uit te wisselen via AIM, "
-"ICQ, Yahoo!, MSN, IRC, Jabber, Napster, Zephyr en GaduGadu en dat allemaal "
-"tegelijk! Het is geschreven m.b.v. Gtk+ en wordt verspreid onder een GPL-"
-"licentie.<BR><BR>"
-
-#: src/about.c:104
+"MSN, Yahoo!, Jabber, ICQ, IRC, SILC, Novell Groupwise, Napster, Zephyr en "
+"GaduGadu en dat allemaal tegelijk! Het is geschreven m.b.v. Gtk+ en wordt "
+"verspreid onder een GPL-licentie.<BR><BR>"
+
+#: src/about.c:106
 msgid "<FONT SIZE=\"4\">IRC:</FONT> #gaim on irc.freenode.net<BR><BR>"
 msgstr "<FONT SIZE=\"4\">IRC:</FONT> #gaim op irc.freenode.net<BR><BR>"
 
-#: src/about.c:109
+#: src/about.c:111
 msgid "Active Developers"
 msgstr "Huidige ontwikkelaars"
 
-#: src/about.c:110
+#: src/about.c:112
 msgid "maintainer"
 msgstr "beheerder"
 
-#: src/about.c:112
+#: src/about.c:114
 msgid "lead developer"
 msgstr "hoofdontwikkelaar"
 
-#: src/about.c:115
+#: src/about.c:117
 msgid "developer & webmaster"
 msgstr "ontwikkelaar & webmaster"
 
-#: src/about.c:116
+#: src/about.c:118
 msgid "win32 port"
 msgstr "win32 versie"
 
-#: src/about.c:119 src/about.c:120 src/about.c:121
+#: src/about.c:121 src/about.c:122 src/about.c:123 src/about.c:124
 msgid "developer"
 msgstr "ontwikkelaar"
 
-#: src/about.c:122
+#: src/about.c:125
 msgid "support"
 msgstr "ondersteuning"
 
-#: src/about.c:129
+#: src/about.c:132
 msgid "Crazy Patch Writers"
 msgstr "Gestoorde patch-schrijvers"
 
-#: src/about.c:144
+#: src/about.c:148
 msgid "Retired Developers"
 msgstr "Ex-ontwikkelaars"
 
-#: src/about.c:145
+#: src/about.c:149
 msgid "former libfaim maintainer"
 msgstr "ex-beheerder van libfaim"
 
-#: src/about.c:146
+#: src/about.c:150
 msgid "former lead developer"
 msgstr "ex-hoofdontwikkelaar"
 
-#: src/about.c:149
+#: src/about.c:153
 msgid "former maintainer"
 msgstr "ex-beheerder"
 
-#: src/about.c:150
+#: src/about.c:154
 msgid "former Jabber developer"
 msgstr "ex-ontwikkelaar van Jabber"
 
-#: src/about.c:151
+#: src/about.c:155
 msgid "original author"
 msgstr "originele maker"
 
-#: src/about.c:154
+#: src/about.c:158
 msgid "hacker and designated driver [lazy bum]"
 msgstr "hacker en BOB (luie donder)"
 
-#: src/about.c:162
+#: src/about.c:166
 msgid "Current Translators"
 msgstr "Huidige vertalers"
 
-#: src/about.c:163 src/about.c:197
+#: src/about.c:167 src/about.c:207
 msgid "Catalan"
 msgstr "Katalaans"
 
-#: src/about.c:164 src/about.c:198
+#: src/about.c:168 src/about.c:208
 msgid "Czech"
 msgstr "Tsjechisch"
 
-#: src/about.c:165
+#: src/about.c:169
 msgid "Danish"
 msgstr "Deens"
 
-#: src/about.c:166
+#: src/about.c:170
 msgid "British English"
 msgstr "Brits Engels"
 
-#: src/about.c:167 src/about.c:199
+#: src/about.c:171
+msgid "Canadian English"
+msgstr "Canadees Engels"
+
+#: src/about.c:172 src/about.c:209
 msgid "German"
 msgstr "Duits"
 
-#: src/about.c:168 src/about.c:200
+#: src/about.c:173 src/about.c:210
 msgid "Spanish"
 msgstr "Spaans"
 
-#: src/about.c:169 src/about.c:201
+#: src/about.c:174 src/about.c:211
 msgid "Finnish"
 msgstr "Fins"
 
-#: src/about.c:170 src/about.c:202
+#: src/about.c:175 src/about.c:212
 msgid "French"
 msgstr "Frans"
 
-#: src/about.c:171
+#: src/about.c:176
+msgid "Hebrew"
+msgstr "Hebreeuws"
+
+#: src/about.c:177
 msgid "Hindi"
 msgstr "Hindi"
 
-#: src/about.c:172
+#: src/about.c:178
 msgid "Hungarian"
 msgstr "Hongaars"
 
-#: src/about.c:173 src/about.c:204
+#: src/about.c:179 src/about.c:213
 msgid "Italian"
 msgstr "Italiaans"
 
-#: src/about.c:174 src/about.c:206
+#: src/about.c:180 src/about.c:214
+msgid "Japanese"
+msgstr "Japans"
+
+#: src/about.c:181
+msgid "Lithuanian"
+msgstr "Litouws"
+
+#: src/about.c:182 src/about.c:215
 msgid "Korean"
 msgstr "Koreaans"
 
-#: src/about.c:175
+#: src/about.c:183
 msgid "Dutch; Flemish"
 msgstr "Nederlands; Vlaams"
 
-#: src/about.c:176
+#: src/about.c:184
 msgid "Macedonian"
 msgstr "Macedonisch"
 
-#: src/about.c:177
-msgid "Norwegian"
-msgstr "Noors"
-
-#: src/about.c:178 src/about.c:207
-msgid "Polish"
-msgstr "Pools"
-
-#: src/about.c:179
-msgid "Portuguese"
-msgstr "Portugees"
-
-#: src/about.c:180
-msgid "Portuguese-Brazil"
-msgstr "Braziliaans Portugees"
-
-#: src/about.c:181
-msgid "Romanian"
-msgstr "Roemeens"
-
-#: src/about.c:182 src/about.c:208
-msgid "Russian"
-msgstr "Russisch"
-
-#: src/about.c:183
-msgid "Serbian"
-msgstr "Servisch"
-
-#: src/about.c:184 src/about.c:210
-msgid "Swedish"
-msgstr "Zweeds"
-
-#: src/about.c:185
-msgid "Vietnamese"
-msgstr "Vietnamees"
-
 #: src/about.c:185
-msgid "Gnome Vi Team"
-msgstr "Het GNOME Vi-team"
-
-#: src/about.c:186
-msgid "Simplified Chinese"
-msgstr "Eenvoudig Chinees"
+msgid "Norwegian"
+msgstr "Noors"
+
+#: src/about.c:186 src/about.c:216
+msgid "Polish"
+msgstr "Pools"
 
 #: src/about.c:187
-msgid "Traditional Chinese"
-msgstr "Traditioneel Chinees"
+msgid "Portuguese"
+msgstr "Portugees"
+
+#: src/about.c:188
+msgid "Portuguese-Brazil"
+msgstr "Braziliaans Portugees"
+
+#: src/about.c:189
+msgid "Romanian"
+msgstr "Roemeens"
+
+#: src/about.c:190 src/about.c:217 src/about.c:218
+msgid "Russian"
+msgstr "Russisch"
+
+#: src/about.c:191
+msgid "Serbian"
+msgstr "Servisch"
+
+#: src/about.c:192
+msgid "Slovenian"
+msgstr "Sloveens"
+
+#: src/about.c:193 src/about.c:220
+msgid "Swedish"
+msgstr "Zweeds"
 
 #: src/about.c:194
+msgid "Vietnamese"
+msgstr "Vietnamees"
+
+#: src/about.c:194
+msgid "and the Gnome-Vi Team"
+msgstr "en het GNOME-Vi team"
+
+#: src/about.c:196
+msgid "Simplified Chinese"
+msgstr "Eenvoudig Chinees"
+
+#: src/about.c:197
+msgid "Traditional Chinese"
+msgstr "Traditioneel Chinees"
+
+#: src/about.c:204
 msgid "Past Translators"
 msgstr "Ex-vertalers"
 
-#: src/about.c:195
-msgid "Amharic"
-msgstr "Amharic"
-
-#: src/about.c:196
-msgid "Bulgarian"
-msgstr "Bulgaars"
-
-#: src/about.c:203
-msgid "Hebrew"
-msgstr "Hebreeuws"
-
 #: src/about.c:205
-msgid "Japanese"
-msgstr "Japans"
-
-#: src/about.c:209
+msgid "Amharic"
+msgstr "Amharic"
+
+#: src/about.c:206
+msgid "Bulgarian"
+msgstr "Bulgaars"
+
+#: src/about.c:219
 msgid "Slovak"
 msgstr "Slowaaks"
 
-#: src/about.c:211
+#: src/about.c:221
 msgid "Chinese"
 msgstr "Chinees"
 
-#: src/account.c:279 src/protocols/jabber/jabber.c:993
+#: src/account.c:277 src/protocols/jabber/jabber.c:1001
 msgid "New passwords do not match."
 msgstr "Nieuwe wachtwoorden zijn niet gelijk."
 
-#: src/account.c:288
+#: src/account.c:286
 msgid "Fill out all fields completely."
 msgstr "Vul alle velden volledig in."
 
-#: src/account.c:313
+#: src/account.c:311
 msgid "Original password"
 msgstr "Oude wachtwoord"
 
-#: src/account.c:320
+#: src/account.c:318
 msgid "New password"
 msgstr "Nieuwe wachtwoord"
 
-#: src/account.c:327
+#: src/account.c:325
 msgid "New password (again)"
 msgstr "Nieuwe wachtwoord (herhalen)"
 
-#: src/account.c:333
+#: src/account.c:331
 #, c-format
 msgid "Change password for %s"
 msgstr "Wachtwoord veranderen voor %s"
 
-#: src/account.c:341
+#: src/account.c:339
 msgid "Please enter your current password and your new password."
 msgstr "Geef uw oude wachtwoord en nieuwe wachtwoord."
 
 #. *
 #. * A wrapper for gaim_request_action() that uses OK and Cancel buttons.
 #.
-#: src/account.c:344 src/connection.c:198 src/dialogs.c:471 src/dialogs.c:527
-#: src/gtkblist.c:2363 src/gtkrequest.c:235 src/protocols/jabber/jabber.c:1038
-#: src/protocols/jabber/xdata.c:337 src/protocols/msn/msn.c:195
-#: src/protocols/msn/msn.c:206 src/protocols/msn/msn.c:217
-#: src/protocols/msn/msn.c:228 src/protocols/oscar/oscar.c:2760
-#: src/protocols/oscar/oscar.c:2841 src/protocols/oscar/oscar.c:6487
-#: src/protocols/oscar/oscar.c:6583 src/protocols/oscar/oscar.c:6632
-#: src/protocols/oscar/oscar.c:6714 src/protocols/yahoo/yahoo.c:2504
-#: src/protocols/yahoo/yahoo.c:2512 src/request.h:1240
+#: src/account.c:342 src/connection.c:197 src/dialogs.c:462 src/dialogs.c:518
+#: src/dialogs.c:571 src/gtkblist.c:2391 src/gtkrequest.c:242
+#: src/protocols/jabber/jabber.c:1048 src/protocols/jabber/xdata.c:337
+#: src/protocols/msn/msn.c:226 src/protocols/msn/msn.c:241
+#: src/protocols/msn/msn.c:256 src/protocols/msn/msn.c:271
+#: src/protocols/oscar/oscar.c:3369 src/protocols/oscar/oscar.c:3463
+#: src/protocols/oscar/oscar.c:6748 src/protocols/oscar/oscar.c:6844
+#: src/protocols/oscar/oscar.c:6896 src/protocols/oscar/oscar.c:6982
+#: src/protocols/silc/buddy.c:460 src/protocols/silc/buddy.c:1132
+#: src/protocols/silc/chat.c:409 src/protocols/silc/chat.c:447
+#: src/protocols/silc/chat.c:710 src/protocols/silc/ops.c:1063
+#: src/protocols/silc/ops.c:1671 src/protocols/silc/silc.c:692
+#: src/protocols/yahoo/yahoo.c:2752 src/protocols/yahoo/yahoo.c:2761
+#: src/request.h:1243
 msgid "OK"
 msgstr "OK"
 
-#: src/account.c:345 src/account.c:383 src/connection.c:199 src/dialogs.c:305
-#: src/dialogs.c:317 src/dialogs.c:330 src/dialogs.c:351 src/dialogs.c:472
-#: src/dialogs.c:528 src/dialogs.c:851 src/dialogs.c:872 src/dialogs.c:889
-#: src/dialogs.c:908 src/gtkaccount.c:1744 src/gtkaccount.c:2235
-#: src/gtkblist.c:2364 src/gtkblist.c:4349 src/gtkconn.c:168
-#: src/gtkimhtmltoolbar.c:399 src/gtkprivacy.c:575 src/gtkprivacy.c:588
-#: src/gtkprivacy.c:613 src/gtkprivacy.c:624 src/gtkrequest.c:236
-#: src/protocols/icq/gaim_icq.c:277 src/protocols/jabber/buddy.c:514
-#: src/protocols/jabber/chat.c:693 src/protocols/jabber/jabber.c:660
-#: src/protocols/jabber/jabber.c:1039 src/protocols/jabber/xdata.c:338
-#: src/protocols/msn/msn.c:196 src/protocols/msn/msn.c:207
-#: src/protocols/msn/msn.c:218 src/protocols/msn/msn.c:229
-#: src/protocols/msn/msn.c:242 src/protocols/oscar/oscar.c:2722
-#: src/protocols/oscar/oscar.c:2761 src/protocols/oscar/oscar.c:2797
-#: src/protocols/oscar/oscar.c:2842 src/protocols/oscar/oscar.c:6305
-#: src/protocols/oscar/oscar.c:6488 src/protocols/oscar/oscar.c:6584
-#: src/protocols/oscar/oscar.c:6633 src/protocols/oscar/oscar.c:6698
-#: src/protocols/oscar/oscar.c:6715 src/protocols/trepia/trepia.c:347
-#: src/protocols/yahoo/yahoo.c:2505 src/protocols/yahoo/yahoo.c:2513
-#: src/request.h:1240 src/request.h:1250
+#: src/account.c:343 src/account.c:381 src/away.c:334 src/connection.c:198
+#: src/dialogs.c:299 src/dialogs.c:311 src/dialogs.c:324 src/dialogs.c:345
+#: src/dialogs.c:463 src/dialogs.c:519 src/dialogs.c:572 src/dialogs.c:808
+#: src/dialogs.c:824 src/dialogs.c:842 src/gtkaccount.c:2002
+#: src/gtkaccount.c:2498 src/gtkblist.c:2392 src/gtkblist.c:4411
+#: src/gtkconn.c:168 src/gtkimhtmltoolbar.c:414 src/gtkprivacy.c:587
+#: src/gtkprivacy.c:600 src/gtkprivacy.c:625 src/gtkprivacy.c:636
+#: src/gtkrequest.c:243 src/protocols/icq/gaim_icq.c:277
+#: src/protocols/jabber/buddy.c:515 src/protocols/jabber/chat.c:710
+#: src/protocols/jabber/jabber.c:667 src/protocols/jabber/jabber.c:1049
+#: src/protocols/jabber/xdata.c:338 src/protocols/msn/msn.c:227
+#: src/protocols/msn/msn.c:242 src/protocols/msn/msn.c:257
+#: src/protocols/msn/msn.c:272 src/protocols/msn/msn.c:289
+#: src/protocols/oscar/oscar.c:1377 src/protocols/oscar/oscar.c:3329
+#: src/protocols/oscar/oscar.c:3370 src/protocols/oscar/oscar.c:3407
+#: src/protocols/oscar/oscar.c:3464 src/protocols/oscar/oscar.c:6749
+#: src/protocols/oscar/oscar.c:6845 src/protocols/oscar/oscar.c:6897
+#: src/protocols/oscar/oscar.c:6966 src/protocols/oscar/oscar.c:6983
+#: src/protocols/silc/buddy.c:461 src/protocols/silc/buddy.c:1037
+#: src/protocols/silc/buddy.c:1133 src/protocols/silc/chat.c:582
+#: src/protocols/silc/chat.c:711 src/protocols/silc/ops.c:1672
+#: src/protocols/silc/silc.c:693 src/protocols/trepia/trepia.c:347
+#: src/protocols/yahoo/yahoo.c:2753 src/protocols/yahoo/yahoo.c:2762
+#: src/request.h:1243 src/request.h:1253
 msgid "Cancel"
 msgstr "Annuleren"
 
-#: src/account.c:374
+#: src/account.c:372
 #, c-format
 msgid "Change user information for %s"
 msgstr "Gebruikersinformatie aanpassen voor %s"
 
-#: src/account.c:382 src/dialogs.c:839 src/gtkrequest.c:242
-#: src/protocols/jabber/buddy.c:513 src/protocols/trepia/trepia.c:346
+#: src/account.c:380 src/gtkrequest.c:249 src/protocols/jabber/buddy.c:514
+#: src/protocols/trepia/trepia.c:346
 msgid "Save"
 msgstr "Opslaan"
 
-#: src/away.c:210
+#: src/away.c:211
 msgid "Away!"
 msgstr "Weg!"
 
-#: src/away.c:275
+#: src/away.c:276
 msgid "I'm Back!"
 msgstr "Ik ben terug!"
 
-#: src/away.c:375
-msgid "New Away Message"
-msgstr "Nieuw afwezigheidsbericht"
-
-#: src/away.c:395
+#: src/away.c:330
+#, c-format
+msgid "Are you sure you want to remove the away message \"%s\"?"
+msgstr "Wilt u het afwezigheidsbericht \"%s\" echt verwijderen?"
+
+#: src/away.c:332 src/away.c:423
 msgid "Remove Away Message"
 msgstr "Afwezigheidsbericht verwijderen"
 
-#: src/away.c:590
+#. Remove button
+#: src/away.c:333 src/gtkconv.c:1388 src/gtkconv.c:3680 src/gtkconv.c:3784
+#: src/gtkrequest.c:248
+msgid "Remove"
+msgstr "Verwijderen"
+
+#: src/away.c:403
+msgid "New Away Message"
+msgstr "Nieuw afwezigheidsbericht"
+
+#: src/away.c:618
 msgid "Set All Away"
 msgstr "Zet alles op afwezig"
 
-#: src/blist.c:590 src/gtkprefs.c:2508
+#: src/blist.c:681
 msgid "Chats"
 msgstr "Chats"
 
-#: src/blist.c:1192
+#: src/blist.c:1321
 #, c-format
 msgid ""
 "%d buddy from group %s was not removed because its account was not logged "
@@ -1530,117 +1621,118 @@
 "%d contacten uit de groep %s zijn niet verwijderd omdat deze niet aangemeld "
 "zijn. Deze gebruikers en de groep zijn niet verwijderd.\n"
 
-#: src/blist.c:1201
+#: src/blist.c:1330
 msgid "Group not removed"
 msgstr "Groep niet verwijderd"
 
-#: src/blist.c:1251 src/gtkaccount.c:164 src/gtkft.c:153 src/gtkutils.c:696
-#: src/protocols/jabber/buddy.c:569 src/protocols/novell/novell.c:2159
+#: src/blist.c:1393 src/gtkaccount.c:167 src/gtkft.c:154 src/gtkutils.c:627
+#: src/protocols/jabber/buddy.c:570 src/protocols/novell/novell.c:2736
 msgid "Unknown"
 msgstr "Onbekend"
 
-#: src/blist.c:1578
-msgid "Invalid Groupname"
-msgstr "Ongeldige groepsnaam"
-
-#: src/blist.c:2220
-msgid ""
-"An error was encountered parsing your buddy list.  It has not been loaded."
+#: src/blist.c:2001
+msgid ""
+"An error was encountered parsing your buddy list.  It has not been loaded, "
+"and the old file has moved to blist.xml~."
 msgstr ""
 "Er is een fout opgetreden bij het verwerken van uw contactenlijst. Deze is "
-"niet geladen."
-
-#: src/blist.c:2222
+"niet geladen. De oude lijst is verplaatst naar blist.xml~."
+
+#: src/blist.c:2004
 msgid "Buddy List Error"
 msgstr "Contactenlijst fout"
 
-#: src/connection.c:119 src/connection.c:170
+#: src/connection.c:118 src/connection.c:169
 #, c-format
 msgid "Missing protocol plugin for %s"
 msgstr "Protocolplugin voor %s niet gevonden"
 
-#: src/connection.c:124
+#: src/connection.c:123
 msgid "Registration Error"
 msgstr "Registratiefout"
 
-#: src/connection.c:175
+#: src/connection.c:174
 msgid "Connection Error"
 msgstr "Verbindingfout"
 
-#: src/connection.c:196
+#: src/connection.c:195
 #, c-format
 msgid "Enter password for %s"
 msgstr "Geef wachtwoord voor %s"
 
-#: src/conversation.c:296
+#: src/conversation.c:261
 msgid "Unable to send message. The message is too large."
 msgstr "Kan het bericht niet verzenden. Het bericht is te groot."
 
-#: src/conversation.c:304
+#: src/conversation.c:269
 msgid "Unable to send message."
 msgstr "Kan het bericht niet verzenden."
 
-#: src/conversation.c:1969
+#: src/conversation.c:1953
 #, c-format
 msgid "%s entered the room."
 msgstr "%s is de ruimte binnengekomen."
 
-#: src/conversation.c:1972
+#: src/conversation.c:1956
 #, c-format
 msgid "%s [<I>%s</I>] entered the room."
 msgstr "%s [<I>%s</I>] is de ruimte binnengekomen."
 
-#: src/conversation.c:2064
+#: src/conversation.c:2047
 #, c-format
 msgid "You are now known as %s"
 msgstr "U heet nu %s"
 
-#: src/conversation.c:2067
+#: src/conversation.c:2050
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s heet nu %s"
 
-#: src/conversation.c:2110
+#: src/conversation.c:2092
 #, c-format
 msgid "%s left the room (%s)."
 msgstr "%s is weggegaan (%s)."
 
-#: src/conversation.c:2112
+#: src/conversation.c:2094
 #, c-format
 msgid "%s left the room."
 msgstr "%s is weggegaan."
 
-#: src/conversation.c:2185
+#: src/conversation.c:2165
 #, c-format
 msgid "(+%d more)"
 msgstr "(+%d meer)"
 
-#: src/conversation.c:2187
+#: src/conversation.c:2167
 #, c-format
 msgid " left the room (%s)."
 msgstr " is weggegaan (%s)."
 
-#: src/conversation.c:2467
+#: src/conversation.c:2457
 msgid "Last created window"
 msgstr "Laatst aangemaakte venster"
 
-#: src/conversation.c:2469 src/gtkprefs.c:1413
+#: src/conversation.c:2459
+msgid "Separate IM and Chat windows"
+msgstr "Gewone gesprekken en chats in gescheiden vensters"
+
+#: src/conversation.c:2461 src/gtkprefs.c:1384
 msgid "New window"
 msgstr "Nieuw venster"
 
-#: src/conversation.c:2471
+#: src/conversation.c:2463
 msgid "By group"
 msgstr "Op groep"
 
-#: src/conversation.c:2473
+#: src/conversation.c:2465
 msgid "By account"
 msgstr "Op account"
 
-#: src/dialogs.c:154
+#: src/dialogs.c:149
 msgid "Warn User"
 msgstr "Gebruiker waarschuwen"
 
-#: src/dialogs.c:173
+#: src/dialogs.c:168
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">Warn %s?</span>\n"
@@ -1653,27 +1745,26 @@
 "Dit zal %s zijn/haar waarschuwingsniveau verhogen en strengere regels zullen "
 "worden toegepast.\n"
 
-#: src/dialogs.c:182
+#: src/dialogs.c:177
 msgid "Warn _anonymously?"
 msgstr "_Anoniem waarschuwen?"
 
-#: src/dialogs.c:189
+#: src/dialogs.c:184
 msgid "<b>Anonymous warnings are less severe.</b>"
 msgstr "<b>Anonieme waarschuwingen zijn minder erg.</b>"
 
-#: src/dialogs.c:301
-#, c-format
-msgid ""
-"You are about to remove %s from your buddy list.  Do you want to continue?"
+#: src/dialogs.c:295
+#, c-format
+msgid "You are about to remove %s from your buddy list.  Do you want to continue?"
 msgstr ""
 "U staat op het punt om %s van uw contactenlijst te verwijderen. Wilt u "
 "doorgaan?"
 
-#: src/dialogs.c:303 src/dialogs.c:304
+#: src/dialogs.c:297 src/dialogs.c:298
 msgid "Remove Buddy"
 msgstr "Contact verwijderen"
 
-#: src/dialogs.c:313
+#: src/dialogs.c:307
 #, c-format
 msgid ""
 "You are about to remove the chat %s from your buddy list.  Do you want to "
@@ -1682,11 +1773,11 @@
 "U staat op het punt om de chatruimte %s van uw contactenlijst te "
 "verwijderen. Wilt u doorgaan?"
 
-#: src/dialogs.c:315 src/dialogs.c:316
+#: src/dialogs.c:309 src/dialogs.c:310
 msgid "Remove Chat"
 msgstr "Chat verwijderen"
 
-#: src/dialogs.c:325
+#: src/dialogs.c:319
 #, c-format
 msgid ""
 "You are about to remove the group %s and all its members from your buddy "
@@ -1695,11 +1786,11 @@
 "U staat op het punt om de groep %s en alle contacten in die groep van uw "
 "contactenlijst te verwijderen. Wilt u doorgaan?"
 
-#: src/dialogs.c:328 src/dialogs.c:329
+#: src/dialogs.c:322 src/dialogs.c:323
 msgid "Remove Group"
 msgstr "Groep verwijderen"
 
-#: src/dialogs.c:346
+#: src/dialogs.c:340
 #, c-format
 msgid ""
 "You are about to remove the contact containing %s and %d other buddies from "
@@ -1708,127 +1799,157 @@
 "U staat op het punt om het contact die %s bevat en %d andere contacten van "
 "uw contactenlijst te verwijderen. Wilt u doorgaan?"
 
-#: src/dialogs.c:349 src/dialogs.c:350
+#: src/dialogs.c:343 src/dialogs.c:344
 msgid "Remove Contact"
 msgstr "Contact verwijderen"
 
-#: src/dialogs.c:453 src/dialogs.c:509
+#: src/dialogs.c:444 src/dialogs.c:500 src/dialogs.c:552
 msgid "_Screen name"
 msgstr "_Gebruikersnaam"
 
-#: src/dialogs.c:459 src/dialogs.c:515
+#: src/dialogs.c:450 src/dialogs.c:506 src/dialogs.c:558
 msgid "_Account"
 msgstr "_Account"
 
-#: src/dialogs.c:466
+#: src/dialogs.c:457
 msgid "New Instant Message"
 msgstr "Nieuw express-bericht"
 
-#: src/dialogs.c:468
+#: src/dialogs.c:459
 msgid "Please enter the screen name of the person you would like to IM."
 msgstr ""
 "Geef alstublieft de gebruikersnaam van de persoon aan wie u een bericht zou "
 "willen sturen."
 
-#: src/dialogs.c:522
+#: src/dialogs.c:513
 msgid "Get User Info"
 msgstr "Gebruikersinfo"
 
-#: src/dialogs.c:524
-msgid ""
-"Please enter the screen name of the person whose info you would like to view."
+#: src/dialogs.c:515
+msgid "Please enter the screen name of the person whose info you would like to view."
 msgstr ""
 "Geef alstublieft de gebruikersnaam van de persoon waarvan u de informatie "
 "wilt opvragen."
 
-#: src/dialogs.c:552 src/gtkimhtmltoolbar.c:240
-msgid "Select Text Color"
-msgstr ":Tekstkleur selecteren"
-
-#: src/dialogs.c:580 src/gtkimhtmltoolbar.c:310
-msgid "Select Background Color"
-msgstr "Achtergrondkleur selecteren"
-
-#: src/dialogs.c:619 src/gtkimhtmltoolbar.c:164
-msgid "Select Font"
-msgstr "Lettertype selecteren"
-
-#: src/dialogs.c:692
+#: src/dialogs.c:566
+msgid "Get User Log"
+msgstr "Gebruikerslogboek opvragen"
+
+#: src/dialogs.c:568
+msgid "Please enter the screen name of the person whose log you would like to view."
+msgstr ""
+"Geef alstublieft de gebruikersnaam van de persoon waarvan u het logboek wilt "
+"opvragen."
+
+#: src/dialogs.c:623
 msgid "You cannot save an away message with a blank title"
 msgstr "U kunt geen afwezigheidsbericht maken zonder titel"
 
-#: src/dialogs.c:694
-msgid ""
-"Please give the message a title, or choose \"Use\" to use without saving."
+#: src/dialogs.c:625
+msgid "Please give the message a title, or choose \"Use\" to use without saving."
 msgstr ""
 "Geef het bericht een titel, of kies \"Gebruiken\" om te gebruiken zonder op "
 "te slaan."
 
-#: src/dialogs.c:704
+#: src/dialogs.c:635
 msgid "You cannot create an empty away message"
 msgstr "U kunt geen leeg bericht maken"
 
-#: src/dialogs.c:766
+#: src/dialogs.c:697
 msgid "New away message"
 msgstr "Nieuw afwezigheidsbericht"
 
-#: src/dialogs.c:787
+#: src/dialogs.c:718
 msgid "Away title: "
 msgstr "Afwezig titel:"
 
-#: src/dialogs.c:843
-msgid "Save & Use"
-msgstr "Opslaan & gebruiken"
-
-#: src/dialogs.c:847
-msgid "Use"
-msgstr "Gebruiken"
-
-#: src/dialogs.c:868
+#: src/dialogs.c:774
+msgid "_Save"
+msgstr "_Opslaan"
+
+#: src/dialogs.c:778
+msgid "Sa_ve & Use"
+msgstr "Op_slaan & gebruiken"
+
+#: src/dialogs.c:782
+msgid "_Use"
+msgstr "_Gebruiken"
+
+#: src/dialogs.c:804
 msgid "Alias Chat"
 msgstr "Alias chat"
 
-#: src/dialogs.c:869
+#: src/dialogs.c:805
 msgid "Enter an alias for this chat."
 msgstr "Geef een alias voor deze chat."
 
-#: src/dialogs.c:871 src/dialogs.c:888 src/dialogs.c:907 src/gtkrequest.c:243
+#: src/dialogs.c:807 src/dialogs.c:823 src/dialogs.c:841 src/gtkrequest.c:250
+#: src/protocols/silc/chat.c:572
 msgid "Alias"
 msgstr "Alias"
 
-#: src/dialogs.c:885
+#: src/dialogs.c:820
 msgid "Alias Contact"
 msgstr "Alias contact"
 
-#: src/dialogs.c:886
+#: src/dialogs.c:821
 msgid "Enter an alias for this contact."
 msgstr "Geef een alias voor deze persoon."
 
-#: src/dialogs.c:903
+#: src/dialogs.c:837
 #, c-format
 msgid "Enter an alias for %s."
 msgstr "Geef een alias voor %s."
 
-#: src/dialogs.c:905
+#: src/dialogs.c:839
 msgid "Alias Buddy"
 msgstr "Alias voor contact"
 
-#: src/ft.c:144
+#: src/ft.c:125
+msgid "That file does not exist."
+msgstr "Dat bestand bestaat niet."
+
+#: src/ft.c:134
+msgid "Cannot send a file of 0 bytes."
+msgstr "Kan geen bestand sturen van 0 bytes groot."
+
+#: src/ft.c:194
+#, c-format
+msgid "%s wants to send you %s (%s)"
+msgstr "%s wil u %s toesturen (%s)"
+
+#: src/ft.c:229
+#, c-format
+msgid "Accept file transfer request from %s?"
+msgstr "Bestandsoverdracht accepteren van %s?"
+
+#: src/ft.c:233
+#, c-format
+msgid ""
+"A file is available for download from:\n"
+"Remote host: %s\n"
+"Remote port: %d"
+msgstr ""
+"Er is een bestand voor downloaden beschikbaar van:\n"
+"Computer: %s\n"
+"Poort: %d"
+
+#: src/ft.c:285
 #, c-format
 msgid "%s is not a valid filename.\n"
 msgstr "%s is geen geldige bestandsnaam.\n"
 
-#: src/ft.c:157
+#: src/ft.c:298
 #, c-format
 msgid "%s was not found.\n"
 msgstr "%s niet gevonden.\n"
 
-#: src/ft.c:786
+#: src/ft.c:927
 #, c-format
 msgid "File transfer to %s aborted.\n"
 msgstr "Bestandsoverdracht naar %s afgebroken.\n"
 
-#: src/ft.c:788
+#: src/ft.c:929
 #, c-format
 msgid "File transfer from %s aborted.\n"
 msgstr "Bestandsoverdracht van %s afgebroken.\n"
@@ -1851,7 +1972,7 @@
 "       quit                     Close running copy of Gaim\n"
 "\n"
 "    OPTIONS:\n"
-"       -h, --help [command]    Show help for command\n"
+"       -h, --help [command]     Show help for command\n"
 msgstr ""
 "Gebruik: %s opdracht [OPTIES] [URI]\n"
 "\n"
@@ -1920,23 +2041,23 @@
 msgid "sorry, i ran out for a while. bbl"
 msgstr "sorry, ik ben d'r even niet."
 
-#: src/gaimrc.c:375 src/gaimrc.c:1451
+#: src/gaimrc.c:372 src/gaimrc.c:1417
 msgid "boring default"
 msgstr "saaie standaardtekst"
 
-#: src/gaimrc.c:1260 src/gtkblist.c:2966
+#: src/gaimrc.c:1227 src/gtkblist.c:3017
 msgid "Alphabetical"
 msgstr "Alfabetisch"
 
-#: src/gaimrc.c:1262 src/gtkblist.c:2967
+#: src/gaimrc.c:1229 src/gtkblist.c:3018
 msgid "By status"
 msgstr "Op status"
 
-#: src/gaimrc.c:1264 src/gtkblist.c:2968
+#: src/gaimrc.c:1231 src/gtkblist.c:3019
 msgid "By log size"
 msgstr "Op logboekgrootte"
 
-#: src/gtkaccount.c:289
+#: src/gtkaccount.c:331
 #, c-format
 msgid ""
 "<b>File:</b> %s\n"
@@ -1948,171 +2069,164 @@
 "<b>Afbeeldingsgrootte:</b> %dx%d"
 
 #. Build the login options frame.
-#: src/gtkaccount.c:384
+#: src/gtkaccount.c:614
 msgid "Login Options"
 msgstr "Aanmeldopties"
 
-#: src/gtkaccount.c:401
+#: src/gtkaccount.c:631
 msgid "Protocol:"
 msgstr "Protocol:"
 
-#: src/gtkaccount.c:406 src/gtkblist.c:3954
+#: src/gtkaccount.c:636 src/gtkblist.c:4017
 msgid "Screen Name:"
 msgstr "Gebruikersnaam:"
 
-#: src/gtkaccount.c:479
+#: src/gtkaccount.c:709
 msgid "Password:"
 msgstr "Wachtwoord: "
 
-#: src/gtkaccount.c:484 src/gtkblist.c:3968 src/gtkblist.c:4296
+#: src/gtkaccount.c:714 src/gtkblist.c:4031 src/gtkblist.c:4359
 msgid "Alias:"
 msgstr "Alias:"
 
-#: src/gtkaccount.c:488
+#: src/gtkaccount.c:718
 msgid "Remember password"
 msgstr "Wachtwoord onthouden"
 
 #. Build the user options frame.
-#: src/gtkaccount.c:542
+#: src/gtkaccount.c:774
 msgid "User Options"
 msgstr "Gebruikersopties"
 
-#: src/gtkaccount.c:555
+#: src/gtkaccount.c:787
 msgid "New mail notifications"
 msgstr "Nieuwe e-mail meldingen"
 
-#: src/gtkaccount.c:564
-msgid "Buddy icon file:"
-msgstr "Contactplaatje bestand:"
-
-#: src/gtkaccount.c:574
-msgid "_Browse"
-msgstr "_Bladeren"
-
-#: src/gtkaccount.c:580
-msgid "_Reset"
-msgstr "_Herstellen"
+#: src/gtkaccount.c:796
+msgid "Buddy icon:"
+msgstr "Contactplaatje:"
 
 #. Build the protocol options frame.
-#: src/gtkaccount.c:642
+#: src/gtkaccount.c:885
 #, c-format
 msgid "%s Options"
 msgstr "%s Opties"
 
 #. Use Global Proxy Settings
-#: src/gtkaccount.c:778 src/gtkaccount.c:825
+#: src/gtkaccount.c:1021 src/gtkaccount.c:1068
 msgid "Use Global Proxy Settings"
 msgstr "Hoofdinstellingen gebruiken"
 
 #. No Proxy
-#: src/gtkaccount.c:784 src/gtkaccount.c:832
+#: src/gtkaccount.c:1027 src/gtkaccount.c:1075
 msgid "No Proxy"
 msgstr "Geen proxy"
 
 #. HTTP
-#: src/gtkaccount.c:790 src/gtkaccount.c:839
+#: src/gtkaccount.c:1033 src/gtkaccount.c:1082
 msgid "HTTP"
 msgstr "HTTP"
 
 #. SOCKS 4
-#: src/gtkaccount.c:796 src/gtkaccount.c:846
+#: src/gtkaccount.c:1039 src/gtkaccount.c:1089
 msgid "SOCKS 4"
 msgstr "SOCKS 4"
 
 #. SOCKS 5
-#: src/gtkaccount.c:802 src/gtkaccount.c:853
+#: src/gtkaccount.c:1045 src/gtkaccount.c:1096
 msgid "SOCKS 5"
 msgstr "SOCKS 5"
 
 #. Use Environmental Settings
-#: src/gtkaccount.c:808 src/gtkaccount.c:860 src/gtkprefs.c:1214
+#: src/gtkaccount.c:1051 src/gtkaccount.c:1103 src/gtkprefs.c:1187
 msgid "Use Environmental Settings"
 msgstr "Systeeminstellingen gebruiken"
 
-#: src/gtkaccount.c:899
+#: src/gtkaccount.c:1142
 msgid "you can see the butterflies mating"
 msgstr "kunt u de vlinders zien copuleren"
 
-#: src/gtkaccount.c:903
+#: src/gtkaccount.c:1146
 msgid "If you look real closely"
 msgstr "Als u zeer aandachtig kijkt"
 
-#: src/gtkaccount.c:919
+#: src/gtkaccount.c:1162
 msgid "Proxy Options"
 msgstr "Proxy-opties"
 
-#: src/gtkaccount.c:937 src/gtkprefs.c:1208
+#: src/gtkaccount.c:1180 src/gtkprefs.c:1181
 msgid "Proxy _type:"
 msgstr "Proxy_type:"
 
-#: src/gtkaccount.c:946 src/gtkprefs.c:1238
+#: src/gtkaccount.c:1189 src/gtkprefs.c:1208
 msgid "_Host:"
 msgstr "_Host:"
 
-#: src/gtkaccount.c:950 src/gtkprefs.c:1256
+#: src/gtkaccount.c:1193 src/gtkprefs.c:1226
 msgid "_Port:"
 msgstr "_Poort:"
 
-#: src/gtkaccount.c:958
+#: src/gtkaccount.c:1201
 msgid "_Username:"
 msgstr "_Gebruiker:"
 
-#: src/gtkaccount.c:963 src/gtkprefs.c:1293
+#: src/gtkaccount.c:1206 src/gtkprefs.c:1263
 msgid "Pa_ssword:"
 msgstr "_Wachtwoord:"
 
-#: src/gtkaccount.c:1331
+#: src/gtkaccount.c:1578
 msgid "Add Account"
 msgstr "Account toevoegen"
 
-#: src/gtkaccount.c:1333
+#: src/gtkaccount.c:1580
 msgid "Modify Account"
 msgstr "Account bewerken"
 
 #. Add the disclosure
-#: src/gtkaccount.c:1357
+#: src/gtkaccount.c:1604
 msgid "Show more options"
 msgstr "Meer opties"
 
-#: src/gtkaccount.c:1358
+#: src/gtkaccount.c:1605
 msgid "Show fewer options"
 msgstr "Minder opties"
 
 #. Register button
-#: src/gtkaccount.c:1385 src/protocols/jabber/jabber.c:659
+#: src/gtkaccount.c:1632 src/protocols/jabber/jabber.c:666
 msgid "Register"
 msgstr "Registreren"
 
-#: src/gtkaccount.c:1739
+#: src/gtkaccount.c:1997
 #, c-format
 msgid "Are you sure you want to delete %s?"
 msgstr "Wilt u %s echt verwijderen?"
 
-#: src/gtkaccount.c:1743 src/gtkrequest.c:239
+#: src/gtkaccount.c:2001 src/gtkrequest.c:246
 msgid "Delete"
 msgstr "Verwijderen"
 
-#: src/gtkaccount.c:1857 src/protocols/oscar/oscar.c:3365
+#: src/gtkaccount.c:2115 src/protocols/oscar/oscar.c:3997
 msgid "Screen Name"
 msgstr "Gebruikersnaam"
 
-#: src/gtkaccount.c:1880 src/protocols/jabber/jabber.c:950
-#: src/protocols/oscar/oscar.c:526 src/protocols/oscar/oscar.c:4823
-#: src/protocols/oscar/oscar.c:6425 src/protocols/yahoo/yahoo.c:2299
-#: src/protocols/zephyr/zephyr.c:1182 src/protocols/zephyr/zephyr.c:1192
+#: src/gtkaccount.c:2139 src/protocols/jabber/jabber.c:958
+#: src/protocols/oscar/oscar.c:538 src/protocols/oscar/oscar.c:5479
+#: src/protocols/oscar/oscar.c:6678 src/protocols/silc/silc.c:44
+#: src/protocols/yahoo/yahoo.c:2515 src/protocols/zephyr/zephyr.c:1360
+#: src/protocols/zephyr/zephyr.c:1372
 msgid "Online"
 msgstr "Online"
 
-#: src/gtkaccount.c:1898
+#: src/gtkaccount.c:2160
 msgid "Protocol"
 msgstr "Protocol"
 
-#: src/gtkaccount.c:2210
+#: src/gtkaccount.c:2473
 #, c-format
 msgid "%s%s%s%s has made %s his or her buddy%s%s%s"
 msgstr "%s%s%s%s heeft %s in zijn/haar contactenlijst gezet%s%s%s"
 
-#: src/gtkaccount.c:2224
+#: src/gtkaccount.c:2487
 msgid ""
 "\n"
 "\n"
@@ -2122,226 +2236,229 @@
 "\n"
 "Wilt u hem of haar toevoegen aan uw contactenlijst?"
 
-#: src/gtkaccount.c:2228
+#: src/gtkaccount.c:2491
 msgid "Information"
 msgstr "Informatie"
 
-#: src/gtkaccount.c:2232
+#: src/gtkaccount.c:2495
 msgid "Add buddy to your list?"
 msgstr "Gebruiker toevoegen aan uw lijst?"
 
 #. Add button
-#: src/gtkaccount.c:2234 src/gtkblist.c:4348 src/gtkconv.c:1113
-#: src/gtkconv.c:3332 src/gtkconv.c:3423 src/gtkrequest.c:240
-#: src/protocols/icq/gaim_icq.c:277 src/protocols/oscar/oscar.c:3004
+#: src/gtkaccount.c:2497 src/gtkblist.c:4410 src/gtkconv.c:1390
+#: src/gtkconv.c:3673 src/gtkconv.c:3777 src/gtkrequest.c:247
+#: src/protocols/icq/gaim_icq.c:277 src/protocols/oscar/oscar.c:3626
+#: src/protocols/silc/chat.c:581
 msgid "Add"
 msgstr "Toevoegen"
 
-#: src/gtkblist.c:801 src/gtkblist.c:4236
-msgid ""
-"You are not currently signed on with any protocols that have the ability to "
-"chat."
-msgstr ""
-"U bent op het moment niet aangemeld met een protocol die ondersteuning biedt "
-"voor chat."
-
-#: src/gtkblist.c:814
+#: src/gtkblist.c:815
 msgid "Join a Chat"
 msgstr "Chat openen"
 
-#: src/gtkblist.c:835
+#: src/gtkblist.c:836
 msgid ""
 "Please enter the appropriate information about the chat you would like to "
 "join.\n"
-msgstr ""
-"Geef alstublieft de nbenodigde informatie van de chat die u wilt openen.\n"
-
-#: src/gtkblist.c:848 src/gtkpounce.c:361 src/gtkroomlist.c:365
+msgstr "Geef alstublieft de nbenodigde informatie van de chat die u wilt openen.\n"
+
+#: src/gtkblist.c:847 src/gtkpounce.c:412 src/gtkroomlist.c:354
 msgid "_Account:"
 msgstr "_Account:"
 
-#: src/gtkblist.c:1087 src/gtkblist.c:3155
+#: src/gtkblist.c:1133 src/gtkblist.c:3211
 msgid "Get _Info"
 msgstr "_Info opzoeken"
 
-#: src/gtkblist.c:1090 src/gtkblist.c:3146
+#: src/gtkblist.c:1136 src/gtkblist.c:3202
 msgid "I_M"
 msgstr "I_M"
 
-#: src/gtkblist.c:1092
+#: src/gtkblist.c:1141
+msgid "_Send File"
+msgstr "Bestand ver_zenden"
+
+#: src/gtkblist.c:1145
 msgid "Add Buddy _Pounce"
 msgstr "_Contact-alarm toevoegen"
 
-#: src/gtkblist.c:1094
+#: src/gtkblist.c:1147
 msgid "View _Log"
 msgstr "_Logboek"
 
-#: src/gtkblist.c:1159 src/gtkblist.c:1260 src/gtkblist.c:1274
+#: src/gtkblist.c:1155 src/gtkblist.c:1241 src/gtkblist.c:1255
 msgid "_Alias..."
 msgstr "_Alias..."
 
-#: src/gtkblist.c:1161 src/gtkblist.c:1262 src/gtkblist.c:1279
+#: src/gtkblist.c:1157 src/gtkblist.c:1243 src/gtkblist.c:1260
 #: src/gtkconn.c:361
 msgid "_Remove"
 msgstr "_Verwijderen"
 
-#: src/gtkblist.c:1206
+#: src/gtkblist.c:1203
 msgid "Add a _Buddy"
 msgstr "Contact _toevoegen"
 
-#: src/gtkblist.c:1208
+#: src/gtkblist.c:1205
 msgid "Add a C_hat"
 msgstr "_Chat toevoegen"
 
-#: src/gtkblist.c:1210
+#: src/gtkblist.c:1207
 msgid "_Delete Group"
 msgstr "Groep _verwijderen"
 
-#: src/gtkblist.c:1212
+#: src/gtkblist.c:1209
 msgid "_Rename"
 msgstr "_Hernoemen"
 
 #. join button
-#: src/gtkblist.c:1238 src/gtkroomlist.c:261 src/gtkroomlist.c:417
+#: src/gtkblist.c:1231 src/gtkroomlist.c:263 src/gtkroomlist.c:409
 #: src/stock.c:87
 msgid "_Join"
 msgstr "_Deelnemen"
 
-#: src/gtkblist.c:1240
+#: src/gtkblist.c:1233
 msgid "Auto-Join"
 msgstr "Auto-deelnemen"
 
-#: src/gtkblist.c:1276 src/gtkblist.c:1302
+#: src/gtkblist.c:1257 src/gtkblist.c:1286
 msgid "_Collapse"
 msgstr "_Dichtvouwen"
 
-#: src/gtkblist.c:1307
+#: src/gtkblist.c:1291
 msgid "_Expand"
 msgstr "_Uitvouwen"
 
-#: src/gtkblist.c:1964 src/gtkconv.c:3911
-msgid ""
-"You are not currently signed on with an account that can add that buddy."
+#: src/gtkblist.c:1949 src/gtkconv.c:4317 src/gtkpounce.c:314
+msgid "You are not currently signed on with an account that can add that buddy."
 msgstr ""
 "U bent op het moment niet aangemeld met een protocol die deze persoon kan "
 "toevoegen."
 
 #. Buddies menu
-#: src/gtkblist.c:2312
+#: src/gtkblist.c:2336
 msgid "/_Buddies"
 msgstr "/_Contacten"
 
-#: src/gtkblist.c:2313
+#: src/gtkblist.c:2337
 msgid "/Buddies/New Instant _Message..."
 msgstr "/Contacten/Nieuw _bericht..."
 
-#: src/gtkblist.c:2314
+#: src/gtkblist.c:2338
 msgid "/Buddies/Join a _Chat..."
 msgstr "/Contacten/Chat _openen..."
 
-#: src/gtkblist.c:2315
+#: src/gtkblist.c:2339
 msgid "/Buddies/Get User _Info..."
 msgstr "/Contacten/_Gebruikersinfo..."
 
-#: src/gtkblist.c:2317
+#: src/gtkblist.c:2340
+msgid "/Buddies/View User _Log..."
+msgstr "/Contacten/_Logboek..."
+
+#: src/gtkblist.c:2342
 msgid "/Buddies/Show _Offline Buddies"
 msgstr "/Contacten/Offline contacten _weergeven"
 
-#: src/gtkblist.c:2318
+#: src/gtkblist.c:2343
 msgid "/Buddies/Show _Empty Groups"
 msgstr "/Contacten/_Lege groepen weergeven"
 
-#: src/gtkblist.c:2319
+#: src/gtkblist.c:2344
 msgid "/Buddies/_Add Buddy..."
 msgstr "/Contacten/Contact _toevoegen..."
 
-#: src/gtkblist.c:2320
+#: src/gtkblist.c:2345
 msgid "/Buddies/Add C_hat..."
 msgstr "/Contacten/_Chat toevoegen..."
 
-#: src/gtkblist.c:2321
+#: src/gtkblist.c:2346
 msgid "/Buddies/Add _Group..."
 msgstr "/Contacten/Groep toe_voegen..."
 
-#: src/gtkblist.c:2323
+#: src/gtkblist.c:2348
 msgid "/Buddies/_Signoff"
 msgstr "/Contacten/Af_melden"
 
-#: src/gtkblist.c:2324
+#: src/gtkblist.c:2349
 msgid "/Buddies/_Quit"
 msgstr "/Contacten/_Afsluiten"
 
 #. Tools
-#: src/gtkblist.c:2327
+#: src/gtkblist.c:2352
 msgid "/_Tools"
 msgstr "/E_xtra"
 
-#: src/gtkblist.c:2328
+#: src/gtkblist.c:2353
 msgid "/Tools/_Away"
 msgstr "/Extra/_Afwezig"
 
-#: src/gtkblist.c:2329
+#: src/gtkblist.c:2354
 msgid "/Tools/Buddy _Pounce"
 msgstr "/Extra/_Contact-alarm"
 
-#: src/gtkblist.c:2330
-msgid "/Tools/P_rotocol Actions"
-msgstr "/Extra/_Protocol-extra's"
-
-#: src/gtkblist.c:2332
+#: src/gtkblist.c:2355
+msgid "/Tools/Account Ac_tions"
+msgstr "/Extra/Account-acties"
+
+#: src/gtkblist.c:2356
+msgid "/Tools/Pl_ugin Actions"
+msgstr "/Extra/Plugin-acties"
+
+#: src/gtkblist.c:2358
 msgid "/Tools/A_ccounts"
 msgstr "/Extra/Acco_unts"
 
-#: src/gtkblist.c:2333
+#: src/gtkblist.c:2359
 msgid "/Tools/_File Transfers"
 msgstr "/Extra/_Bestandsoverdrachten"
 
-#: src/gtkblist.c:2334
+#: src/gtkblist.c:2360
 msgid "/Tools/R_oom List"
 msgstr "/Extra/Lijst van _ruimtes"
 
-#: src/gtkblist.c:2335
+#: src/gtkblist.c:2361
 msgid "/Tools/Pr_eferences"
 msgstr "/Extra/_Voorkeuren"
 
-#: src/gtkblist.c:2336
+#: src/gtkblist.c:2362
 msgid "/Tools/Pr_ivacy"
 msgstr "/Extra/Pr_ivacy"
 
-#: src/gtkblist.c:2338
+#: src/gtkblist.c:2364
 msgid "/Tools/View System _Log"
 msgstr "/Extra/_Systeemlogboek"
 
 #. Help
-#: src/gtkblist.c:2341
+#: src/gtkblist.c:2367
 msgid "/_Help"
 msgstr "/_Hulp"
 
-#: src/gtkblist.c:2342
+#: src/gtkblist.c:2368
 msgid "/Help/Online _Help"
 msgstr "/Hulp/Online _hulp"
 
-#: src/gtkblist.c:2343
+#: src/gtkblist.c:2369
 msgid "/Help/_Debug Window"
 msgstr "/Hulp/_Debugvenster"
 
-#: src/gtkblist.c:2344
+#: src/gtkblist.c:2370
 msgid "/Help/_About"
 msgstr "/Hulp/_Info"
 
-#: src/gtkblist.c:2360
+#: src/gtkblist.c:2388
 msgid "Rename Group"
 msgstr "Groep hernoemen"
 
-#: src/gtkblist.c:2360
+#: src/gtkblist.c:2388
 msgid "New group name"
 msgstr "Nieuwe groepsnaam"
 
-#: src/gtkblist.c:2361
+#: src/gtkblist.c:2389
 msgid "Please enter a new name for the selected group."
 msgstr "Geef alstublieft de nieuwe naam voor deze groep."
 
-#: src/gtkblist.c:2389
+#: src/gtkblist.c:2417
 #, c-format
 msgid ""
 "\n"
@@ -2350,16 +2467,20 @@
 "\n"
 "<b>Account:</b> %s"
 
-#: src/gtkblist.c:2453
-msgid "<b>Status:</b> Offline"
-msgstr "<b>Status:</b> Offline"
-
-#: src/gtkblist.c:2468
+#: src/gtkblist.c:2481
+msgid ""
+"\n"
+"<b>Status:</b> Offline"
+msgstr ""
+"\n"
+"<b>Status:</b> Off-line"
+
+#: src/gtkblist.c:2496
 #, c-format
 msgid "%d%%"
 msgstr "%d%%"
 
-#: src/gtkblist.c:2484
+#: src/gtkblist.c:2512
 msgid ""
 "\n"
 "<b>Account:</b>"
@@ -2367,7 +2488,7 @@
 "\n"
 "<b>Account:</b>"
 
-#: src/gtkblist.c:2485
+#: src/gtkblist.c:2513
 msgid ""
 "\n"
 "<b>Contact Alias:</b>"
@@ -2375,7 +2496,7 @@
 "\n"
 "<b>Alias van contact:</b>"
 
-#: src/gtkblist.c:2486
+#: src/gtkblist.c:2514
 msgid ""
 "\n"
 "<b>Alias:</b>"
@@ -2383,7 +2504,7 @@
 "\n"
 "<b>Alias:</b>"
 
-#: src/gtkblist.c:2487
+#: src/gtkblist.c:2515
 msgid ""
 "\n"
 "<b>Nickname:</b>"
@@ -2391,7 +2512,7 @@
 "\n"
 "<b>Gebruikersnaam:</b>"
 
-#: src/gtkblist.c:2488
+#: src/gtkblist.c:2516
 msgid ""
 "\n"
 "<b>Logged In:</b>"
@@ -2399,7 +2520,7 @@
 "\n"
 "<b>Aangemeld:</b>"
 
-#: src/gtkblist.c:2489
+#: src/gtkblist.c:2517
 msgid ""
 "\n"
 "<b>Idle:</b>"
@@ -2407,7 +2528,7 @@
 "\n"
 "<b>Afwezig:</b>"
 
-#: src/gtkblist.c:2490
+#: src/gtkblist.c:2518
 msgid ""
 "\n"
 "<b>Warned:</b>"
@@ -2415,7 +2536,7 @@
 "\n"
 "<b>Gewaarschuwd:</b>"
 
-#: src/gtkblist.c:2492
+#: src/gtkblist.c:2520
 msgid ""
 "\n"
 "<b>Description:</b> Spooky"
@@ -2423,7 +2544,7 @@
 "\n"
 "<b>Beschrijving:</b> Spookachtig"
 
-#: src/gtkblist.c:2493
+#: src/gtkblist.c:2521
 msgid ""
 "\n"
 "<b>Status</b>: Awesome"
@@ -2431,7 +2552,7 @@
 "\n"
 "<b>Status:</b>: Zwaar flex"
 
-#: src/gtkblist.c:2494
+#: src/gtkblist.c:2522
 msgid ""
 "\n"
 "<b>Status</b>: Rockin'"
@@ -2439,77 +2560,96 @@
 "\n"
 "<b>Status:</b>: Rockin'"
 
-#: src/gtkblist.c:2764
+#: src/gtkblist.c:2804
 #, c-format
 msgid "Idle (%dh%02dm) "
 msgstr "Afwezig (%dh%02dm) "
 
-#: src/gtkblist.c:2766
+#: src/gtkblist.c:2806
 #, c-format
 msgid "Idle (%dm) "
 msgstr "Afwezig (%dm) "
 
-#: src/gtkblist.c:2771
+#: src/gtkblist.c:2811
 #, c-format
 msgid "Warned (%d%%) "
 msgstr "Gewaarschuwd (%d%%) "
 
-#: src/gtkblist.c:2774
+#: src/gtkblist.c:2814
 msgid "Offline "
 msgstr "Off-line "
 
-#: src/gtkblist.c:3032
+#. Make menu items sensitive/insensitive where appropriate
+#: src/gtkblist.c:2932
+msgid "/Buddies/Join a Chat..."
+msgstr "/Contacten/Chat _openen..."
+
+#: src/gtkblist.c:2935
+msgid "/Tools/Room List"
+msgstr "/Extra/Lijst van ruimtes"
+
+#: src/gtkblist.c:2938
+msgid "/Tools/Privacy"
+msgstr "/Extra/Privacy"
+
+#: src/gtkblist.c:3084
 msgid "/Tools/Away"
 msgstr "/Extra/Afwezig"
 
-#: src/gtkblist.c:3035
+#: src/gtkblist.c:3087
 msgid "/Tools/Buddy Pounce"
 msgstr "/Extra/Contact-alarm"
 
-#: src/gtkblist.c:3038
-msgid "/Tools/Protocol Actions"
-msgstr "/Extra/Protocol-extra's"
+#: src/gtkblist.c:3090
+msgid "/Tools/Account Actions"
+msgstr "/Extra/Account acties"
+
+#: src/gtkblist.c:3093
+msgid "/Tools/Plugin Actions"
+msgstr "/Extra/Plugin-acties"
 
 #. set the Show Offline Buddies option. must be done
 #. * after the treeview or faceprint gets mad. -Robot101
 #.
-#: src/gtkblist.c:3126
+#: src/gtkblist.c:3182
 msgid "/Buddies/Show Offline Buddies"
 msgstr "/Contacten/Offline contacten _weergeven"
 
-#: src/gtkblist.c:3128
+#: src/gtkblist.c:3184
 msgid "/Buddies/Show Empty Groups"
 msgstr "/Contacten/Lege groepen weergeven"
 
-#: src/gtkblist.c:3152
+#: src/gtkblist.c:3208
 msgid "Send a message to the selected buddy"
 msgstr "Bericht sturen aan de geselecteerde persoon"
 
-#: src/gtkblist.c:3161
+#: src/gtkblist.c:3217
 msgid "Get information on the selected buddy"
 msgstr "Info over geselecteerde persoon"
 
-#: src/gtkblist.c:3164
+#: src/gtkblist.c:3220
 msgid "_Chat"
 msgstr "_Chat"
 
-#: src/gtkblist.c:3169
+#: src/gtkblist.c:3225
 msgid "Join a chat room"
 msgstr "Chatruimte binnengaan"
 
-#: src/gtkblist.c:3172
+#: src/gtkblist.c:3228
 msgid "_Away"
 msgstr "_Afwezig"
 
-#: src/gtkblist.c:3177
+#: src/gtkblist.c:3233
 msgid "Set an away message"
 msgstr "Afwezigheidsbericht instellen"
 
-#: src/gtkblist.c:3909 src/protocols/yahoo/yahoo.c:2431
+#: src/gtkblist.c:3971 src/protocols/silc/buddy.c:731
+#: src/protocols/silc/buddy.c:989 src/protocols/silc/buddy.c:1034
+#: src/protocols/silc/buddy.c:1124 src/protocols/yahoo/yahoo.c:2682
 msgid "Add Buddy"
 msgstr "Contact toevoegen"
 
-#: src/gtkblist.c:3932
+#: src/gtkblist.c:3995
 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. "
@@ -2521,15 +2661,23 @@
 "mogelijk).\n"
 
 #. Set up stuff for the account box
-#: src/gtkblist.c:3992 src/gtkblist.c:4276
+#: src/gtkblist.c:4055 src/gtkblist.c:4339
 msgid "Account:"
 msgstr "Account:"
 
-#: src/gtkblist.c:4243
+#: src/gtkblist.c:4298
+msgid ""
+"You are not currently signed on with any protocols that have the ability to "
+"chat."
+msgstr ""
+"U bent op het moment niet aangemeld met een protocol die ondersteuning biedt "
+"voor chat."
+
+#: src/gtkblist.c:4305
 msgid "Add Chat"
 msgstr "Chat toevoegen"
 
-#: src/gtkblist.c:4266
+#: src/gtkblist.c:4329
 msgid ""
 "Please enter an alias, and the appropriate information about the chat you "
 "would like to add to your buddy list.\n"
@@ -2537,15 +2685,15 @@
 "Geef alstublieft de bijnaam en andere informatie van de chat die u wilt "
 "toevoegen aan de contactlijst.\n"
 
-#: src/gtkblist.c:4345
+#: src/gtkblist.c:4407
 msgid "Add Group"
 msgstr "Groep toevoegen"
 
-#: src/gtkblist.c:4346
+#: src/gtkblist.c:4408
 msgid "Please enter the name of the group to be added."
 msgstr "Geef alstublieft de naam van de toe te voegen groep."
 
-#: src/gtkblist.c:4866
+#: src/gtkblist.c:4975 src/gtkblist.c:5072
 msgid "No actions available"
 msgstr "Geen acties beschikbaar"
 
@@ -2595,25 +2743,70 @@
 msgid "Time"
 msgstr "Tijd"
 
-#: src/gtkconv.c:172
-#, c-format
-msgid "<h1>Conversation with %s</h1>\n"
-msgstr "<h1>Gesprek met %s</h1>\n"
-
-#: src/gtkconv.c:190
-msgid "That file already exists"
-msgstr "Dat bestand bestaat al."
-
-#: src/gtkconv.c:191 src/gtkft.c:1106
-msgid "Would you like to overwrite it?"
-msgstr "Wilt u het overschrijven?"
-
-#: src/gtkconv.c:505
+#: src/gtkconv.c:314
+#, c-format
+msgid "me is using Gaim v%s."
+msgstr "Ik gebruik Gaim v%s."
+
+#: src/gtkconv.c:323
+msgid "Supported debug options are:  version"
+msgstr "Ondersteunde debug-opties zijn:  version"
+
+#: src/gtkconv.c:336
+msgid ""
+"Use \"/help &lt;command&gt;\" for help on a specific command.\n"
+"The following commands are available in this context:\n"
+msgstr ""
+"Gebruik \"/help &lt;opdracht&gt;\" voor hulp bij een bepaalde opdracht.\n"
+"De volgende opdrachten zijn hiervoor beschikbaar:\n"
+
+#: src/gtkconv.c:370
+msgid "No such command (in this context)."
+msgstr "Opdracht onbekend (in deze context)."
+
+#: src/gtkconv.c:443
+msgid ""
+"No such command. If you didn't mean to type a command, you can turn commands "
+"off from Tools->Preferences->Interface->Conversation->Enable \"slash\" "
+"commands."
+msgstr ""
+"Opdracht onbekend. Als u helemaal geen opdracht probeerde te typen, kunt u "
+"deze functie uitschakelen via: Extra->Voorkeuren->Interface->Gesprekken->"
+"\"slash\"-opdrachten (/) gebruiken."
+
+#: src/gtkconv.c:451
+msgid ""
+"Syntax Error:  You typed the wrong number of arguments to that command. If "
+"you didn't mean to type a command, you can turn commands off from Tools-"
+">Preferences->Interface->Conversation->Enable \"slash\" commands."
+msgstr ""
+"Grammaticale fout:  U heeft het verkeerde aantal argumenten meegegeven. Als "
+"u helemaal geen opdracht probeerde te typen, kunt u deze functie "
+"uitschakelen via: Extra->Voorkeuren->Interface->Gesprekken->\"slash\"-"
+"opdrachten (/) gebruiken."
+
+#: src/gtkconv.c:458
+msgid "Your command failed for an unknown reason."
+msgstr "Uw opdracht mislukte om een onbekende reden."
+
+#: src/gtkconv.c:465
+msgid "That command only works in Chats, not IMs."
+msgstr "Die opdracht werkt alleen in chats, niet in gewone gesprekken."
+
+#: src/gtkconv.c:468
+msgid "That command only works in IMs, not Chats."
+msgstr "Die opdracht werkt alleen in gewone gesprekken, niet in chats."
+
+#: src/gtkconv.c:472
+msgid "That command doesn't work on this protocol."
+msgstr "Die opdracht werkt niet met dit protocol."
+
+#: src/gtkconv.c:693
 msgid "Invite Buddy Into Chat Room"
 msgstr "Contact uitnodigen in chatruimte"
 
 #. Put our happy label in it.
-#: src/gtkconv.c:533
+#: src/gtkconv.c:721
 msgid ""
 "Please enter the name of the user you wish to invite, along with an optional "
 "invite message."
@@ -2621,464 +2814,503 @@
 "Geef alstublieft de bijnaam van de persoon die u wilt uitnodigen, eventueel "
 "met een uitnodigende tekst"
 
-#: src/gtkconv.c:554
+#: src/gtkconv.c:742
 msgid "_Buddy:"
 msgstr "_Contact:"
 
-#: src/gtkconv.c:574
+#: src/gtkconv.c:762
 msgid "_Message:"
 msgstr "Be_richt"
 
-#: src/gtkconv.c:667
+#: src/gtkconv.c:799 src/gtkconv.c:2489 src/gtkdebug.c:182
+msgid "Unable to open file."
+msgstr "Kan het bestand niet openen."
+
+#: src/gtkconv.c:804
+#, c-format
+msgid "<h1>Conversation with %s</h1>\n"
+msgstr "<h1>Gesprek met %s</h1>\n"
+
+#: src/gtkconv.c:818
+msgid "Save Conversation"
+msgstr "Gesprek opslaan"
+
+#: src/gtkconv.c:895 src/gtkdebug.c:131
 msgid "Find"
 msgstr "Zoeken"
 
-#: src/gtkconv.c:693
+#: src/gtkconv.c:921 src/gtkdebug.c:159
 msgid "_Search for:"
 msgstr "_Zoekopdracht:"
 
-#: src/gtkconv.c:1071
+#: src/gtkconv.c:1338
 msgid "IM"
 msgstr "Bericht"
 
-#: src/gtkconv.c:1079
+#. Block button
+#: src/gtkconv.c:1347 src/gtkconv.c:3666 src/protocols/oscar/oscar.c:453
+#: src/protocols/oscar/oscar.c:6788
+msgid "Send File"
+msgstr "Bestanden Verzenden"
+
+#: src/gtkconv.c:1356
 msgid "Un-Ignore"
 msgstr "Negeren Opheffen"
 
-#: src/gtkconv.c:1081 src/gtkprefs.c:817
+#: src/gtkconv.c:1358 src/gtkprefs.c:826
 msgid "Ignore"
 msgstr "Negeren"
 
 #. Info button
-#: src/gtkconv.c:1090 src/gtkconv.c:3346
+#: src/gtkconv.c:1367 src/gtkconv.c:3687
 msgid "Info"
 msgstr "Info"
 
-#: src/gtkconv.c:1099
+#: src/gtkconv.c:1376
 msgid "Get Away Msg"
 msgstr "Haal afwezigheidsbericht op"
 
-#. Remove button
-#: src/gtkconv.c:1111 src/gtkconv.c:3339 src/gtkconv.c:3430
-#: src/gtkrequest.c:241
-msgid "Remove"
-msgstr "Verwijderen"
-
-#: src/gtkconv.c:2201
+#: src/gtkconv.c:2497
+#, fuzzy
+msgid "Unable to save icon file to disk."
+msgstr "Kan contactplaatje niet opslaan op schijf"
+
+#: src/gtkconv.c:2514
+msgid "Save Icon"
+msgstr "Plaatje opslaan"
+
+#: src/gtkconv.c:2544
 msgid "Animate"
 msgstr "Animeren"
 
-#: src/gtkconv.c:2206
+#: src/gtkconv.c:2549
 msgid "Hide Icon"
 msgstr "Plaatje verbergen"
 
-#: src/gtkconv.c:2212
+#: src/gtkconv.c:2555
 msgid "Save Icon As..."
 msgstr "Plaatje opslaan als..."
 
-#: src/gtkconv.c:2579
+#: src/gtkconv.c:2939
 msgid "User is typing..."
 msgstr "Gebruiker typt..."
 
-#: src/gtkconv.c:2587
+#: src/gtkconv.c:2947
 msgid "User has typed something and paused"
 msgstr "Gebruiker is gestopt met typen"
 
 #. Build the Send As menu
-#: src/gtkconv.c:2690
+#: src/gtkconv.c:3050
 msgid "_Send As"
 msgstr "_Verzenden als"
 
-#: src/gtkconv.c:3110
-msgid "Save Conversation"
-msgstr "Gesprek opslaan"
-
 #. Conversation menu
-#: src/gtkconv.c:3127
+#: src/gtkconv.c:3450
 msgid "/_Conversation"
 msgstr "/_Gesprek"
 
-#: src/gtkconv.c:3129
+#: src/gtkconv.c:3452
 msgid "/Conversation/New Instant _Message..."
 msgstr "/Gesprek/Nieuw _bericht..."
 
-#: src/gtkconv.c:3134
+#: src/gtkconv.c:3457
 msgid "/Conversation/_Find..."
 msgstr "/Gesprek/_Zoeken..."
 
-#: src/gtkconv.c:3136
+#: src/gtkconv.c:3459
 msgid "/Conversation/View _Log"
 msgstr "/Gesprek/Logboek _weergeven"
 
-#: src/gtkconv.c:3137
+#: src/gtkconv.c:3460
 msgid "/Conversation/_Save As..."
 msgstr "/Gesprek/Opslaan _als..."
 
-#: src/gtkconv.c:3142
+#: src/gtkconv.c:3462
+msgid "/Conversation/Clear"
+msgstr "/Gesprek/_Opschonen"
+
+#: src/gtkconv.c:3466
+msgid "/Conversation/Se_nd File..."
+msgstr "/Gesprek/Bestand ver_zenden..."
+
+#: src/gtkconv.c:3467
 msgid "/Conversation/Add Buddy _Pounce..."
 msgstr "/Gesprek/_Contact-alarm toevoegen..."
 
-#: src/gtkconv.c:3144
+#: src/gtkconv.c:3469
 msgid "/Conversation/_Get Info"
 msgstr "/Gesprek/Info _opvragen"
 
-#: src/gtkconv.c:3146
+#: src/gtkconv.c:3471
 msgid "/Conversation/_Warn..."
 msgstr "/Gesprek/_Waarschuwen..."
 
-#: src/gtkconv.c:3148
+#: src/gtkconv.c:3473
 msgid "/Conversation/In_vite..."
 msgstr "/Gesprek/_Uitnodigen..."
 
-#: src/gtkconv.c:3153
+#: src/gtkconv.c:3478
 msgid "/Conversation/A_lias..."
 msgstr "/Gesprek/A_lias..."
 
-#: src/gtkconv.c:3155
+#: src/gtkconv.c:3480
 msgid "/Conversation/_Block..."
 msgstr "/Gesprek/Blo_kkeren..."
 
-#: src/gtkconv.c:3157
+#: src/gtkconv.c:3482
 msgid "/Conversation/_Add..."
 msgstr "/Gesprek/_Toevoegen..."
 
-#: src/gtkconv.c:3159
+#: src/gtkconv.c:3484
 msgid "/Conversation/_Remove..."
 msgstr "/Gesprek/Ver_wijderen..."
 
-#: src/gtkconv.c:3164
+#: src/gtkconv.c:3489
 msgid "/Conversation/Insert Lin_k..."
 msgstr "/Gesprek/_URL invoegen..."
 
-#: src/gtkconv.c:3166
+#: src/gtkconv.c:3491
 msgid "/Conversation/Insert Imag_e..."
 msgstr "/Gesprek/_Afbeelding invoegen..."
 
-#: src/gtkconv.c:3171
+#: src/gtkconv.c:3496
 msgid "/Conversation/_Close"
 msgstr "/Gesprek/_Sluiten"
 
 #. Options
-#: src/gtkconv.c:3175
+#: src/gtkconv.c:3500
 msgid "/_Options"
 msgstr "/_Opties"
 
-#: src/gtkconv.c:3176
+#: src/gtkconv.c:3501
 msgid "/Options/Enable _Logging"
 msgstr "/Opties/_Logboek bijhouden"
 
-#: src/gtkconv.c:3177
+#: src/gtkconv.c:3502
 msgid "/Options/Enable _Sounds"
 msgstr "/Opties/_Geluid gebruiken"
 
-#: src/gtkconv.c:3178
+#: src/gtkconv.c:3503
 msgid "/Options/Show Formatting _Toolbar"
 msgstr "/Opties/_Opmaakwerkbalk weergeven"
 
-#: src/gtkconv.c:3220
+#: src/gtkconv.c:3504
+msgid "/Options/Show T_imestamps"
+msgstr "/Opties/Berichttijd _weergeven"
+
+#: src/gtkconv.c:3546
 msgid "/Conversation/View Log"
 msgstr "/Gesprek/Logboek weergeven"
 
-#: src/gtkconv.c:3225
+#: src/gtkconv.c:3551
+msgid "/Conversation/Send File..."
+msgstr "/Gesprek/Bestand verzenden..."
+
+#: src/gtkconv.c:3555
 msgid "/Conversation/Add Buddy Pounce..."
 msgstr "/Gesprek/Contact-alarm toevoegen..."
 
-#: src/gtkconv.c:3231
+#: src/gtkconv.c:3561
 msgid "/Conversation/Get Info"
 msgstr "/Gesprek/Info opvragen"
 
-#: src/gtkconv.c:3235
+#: src/gtkconv.c:3565
 msgid "/Conversation/Warn..."
 msgstr "/Gesprek/Waarschuwen..."
 
-#: src/gtkconv.c:3239
+#: src/gtkconv.c:3569
 msgid "/Conversation/Invite..."
 msgstr "/Gesprek/Uitnodigen..."
 
-#: src/gtkconv.c:3245
+#: src/gtkconv.c:3575
 msgid "/Conversation/Alias..."
 msgstr "/Gesprek/Alias..."
 
-#: src/gtkconv.c:3249
+#: src/gtkconv.c:3579
 msgid "/Conversation/Block..."
 msgstr "/Gesprek/Blokkeren..."
 
-#: src/gtkconv.c:3253
+#: src/gtkconv.c:3583
 msgid "/Conversation/Add..."
 msgstr "/Gesprek/Toevoegen..."
 
-#: src/gtkconv.c:3257
+#: src/gtkconv.c:3587
 msgid "/Conversation/Remove..."
 msgstr "/Gesprek/Verwijderen..."
 
-#: src/gtkconv.c:3263
+#: src/gtkconv.c:3593
 msgid "/Conversation/Insert Link..."
 msgstr "/Gesprek/URL invoegen..."
 
-#: src/gtkconv.c:3267
+#: src/gtkconv.c:3597
 msgid "/Conversation/Insert Image..."
 msgstr "/Gesprek/Afbeelding invoegen..."
 
-#: src/gtkconv.c:3273
+#: src/gtkconv.c:3603
 msgid "/Options/Enable Logging"
 msgstr "/Opties/Logboek bijhouden"
 
-#: src/gtkconv.c:3276
+#: src/gtkconv.c:3606
 msgid "/Options/Enable Sounds"
 msgstr "/Opties/Geluid gebruiken"
 
-#: src/gtkconv.c:3279
+#: src/gtkconv.c:3609
 msgid "/Options/Show Formatting Toolbar"
 msgstr "/Opties/Opmaakwerkbalk weergeven"
 
+#: src/gtkconv.c:3612
+msgid "/Options/Show Timestamps"
+msgstr "/Opties/Berichttijd weergeven"
+
 #. From right to left...
 #. Send button
-#: src/gtkconv.c:3302 src/gtkconv.c:3304 src/gtkconv.c:3402 src/gtkconv.c:3404
+#: src/gtkconv.c:3636 src/gtkconv.c:3638 src/gtkconv.c:3756 src/gtkconv.c:3758
 msgid "Send"
 msgstr "Verzenden"
 
 #. Now, um, just kind of all over the place. Huh?
 #. Warn button
-#: src/gtkconv.c:3318
+#: src/gtkconv.c:3652
 msgid "Warn"
 msgstr "Waarschuwen"
 
-#: src/gtkconv.c:3321
+#: src/gtkconv.c:3655
 msgid "Warn the user"
 msgstr "Gebruiker waarschuwen?"
 
 #. Block button
-#: src/gtkconv.c:3325 src/gtkprivacy.c:612 src/gtkprivacy.c:623
+#: src/gtkconv.c:3659 src/gtkprivacy.c:624 src/gtkprivacy.c:635
 msgid "Block"
 msgstr "Blokkeren"
 
-#: src/gtkconv.c:3328
+#: src/gtkconv.c:3662
 msgid "Block the user"
 msgstr "Gebruiker blokkeren"
 
-#: src/gtkconv.c:3335
+#: src/gtkconv.c:3669
+msgid "Send a file to the user"
+msgstr "Een bestand aan de gebruiker verzenden"
+
+#: src/gtkconv.c:3676
 msgid "Add the user to your buddy list"
 msgstr "Gebruikers toevoegen aan de lijst"
 
-#: src/gtkconv.c:3342
+#: src/gtkconv.c:3683
 msgid "Remove the user from your buddy list"
 msgstr "Gebruiker verwijderen van de contactenlijst"
 
-#: src/gtkconv.c:3349 src/gtkconv.c:3671
+#: src/gtkconv.c:3690 src/gtkconv.c:4041
 msgid "Get the user's information"
 msgstr "Gebruikersinformatie opvragen"
 
 #. Invite
-#: src/gtkconv.c:3416
+#: src/gtkconv.c:3770
 msgid "Invite"
 msgstr "Uitnodigen"
 
-#: src/gtkconv.c:3419
+#: src/gtkconv.c:3773
 msgid "Invite a user"
 msgstr "Gebruiker uitnodigen"
 
-#: src/gtkconv.c:3426
+#: src/gtkconv.c:3780
 msgid "Add the chat to your buddy list"
 msgstr "Chat toevoegen aan de lijst"
 
-#: src/gtkconv.c:3433
+#: src/gtkconv.c:3787
 msgid "Remove the chat from your buddy list"
 msgstr "Chat verwijderen van de contactenlijst"
 
-#: src/gtkconv.c:3533
+#: src/gtkconv.c:3897
 msgid "Topic:"
 msgstr "Onderwerp:"
 
 #. Setup the label telling how many people are in the room.
-#: src/gtkconv.c:3593
+#: src/gtkconv.c:3960
 msgid "0 people in room"
 msgstr "0 personen in ruimte"
 
-#: src/gtkconv.c:3648
+#: src/gtkconv.c:4018
 msgid "IM the user"
 msgstr "Gebruiker IM sturen"
 
-#: src/gtkconv.c:3660
+#: src/gtkconv.c:4030
 msgid "Ignore the user"
 msgstr "Gebruiker negeren"
 
-#: src/gtkconv.c:4202
+#: src/gtkconv.c:4629
 msgid "Close conversation"
 msgstr "Gesprek sluiten"
 
-#: src/gtkconv.c:4747 src/gtkconv.c:4779 src/gtkconv.c:4900 src/gtkconv.c:4967
+#: src/gtkconv.c:5171 src/gtkconv.c:5203 src/gtkconv.c:5324 src/gtkconv.c:5391
 #, c-format
 msgid "%d person in room"
 msgid_plural "%d people in room"
 msgstr[0] "%d persoon in ruimte"
 msgstr[1] "%d personen in ruimte"
 
-#: src/gtkconv.c:5484 src/gtkconv.c:5487
+#: src/gtkconv.c:5903 src/gtkconv.c:5906
 msgid "<main>/Conversation/Close"
 msgstr "<main>/Gesprek/Sluiten"
 
-#: src/gtkdebug.c:135
+#: src/gtkconv.c:6278
+msgid "me &lt;action&gt;:  Send an IRC style action to a buddy or chat."
+msgstr "me &lt;actie&gt;:  Een IRC-achtige actie naar persoon / chat sturen."
+
+#: src/gtkconv.c:6281
+msgid ""
+"debug &lt;option&gt;:  Send various debug information to the current "
+"conversation."
+msgstr "debug &lt;optie&gt;:  Diverse debug-gegevens naar het huidige gesprek sturen."
+
+#: src/gtkconv.c:6285
+msgid "help:  List available commands."
+msgstr "help:  Beschikbare opdrachten opsommen."
+
+#: src/gtkconv.c:6289
+msgid "help &lt;command&gt;:  Help on a specific command."
+msgstr "help &lt;opdracht&gt;:  Hulp bij een specifieke opdracht."
+
+#: src/gtkdebug.c:197
+msgid "Save Debug Log"
+msgstr "Debug-logboek opslaan"
+
+#: src/gtkdebug.c:250
 msgid "Debug Window"
 msgstr "Debugvenster"
 
-#: src/gtkdebug.c:175
+#: src/gtkdebug.c:288
 msgid "Pause"
 msgstr "Pauzeren"
 
-#: src/gtkdebug.c:181
+#: src/gtkdebug.c:294
 msgid "Timestamps"
 msgstr "Tijd in gesprek"
 
-#: src/gtkft.c:135
+#: src/gtkft.c:136
 #, c-format
 msgid "%.2f KB/s"
 msgstr "%.2f KB/s"
 
-#: src/gtkft.c:156 src/gtkft.c:957
+#: src/gtkft.c:157 src/gtkft.c:967
 msgid "Finished"
 msgstr "Klaar"
 
-#: src/gtkft.c:209
+#: src/gtkft.c:160 src/gtkft.c:918
+msgid "Canceled"
+msgstr "Afgebroken"
+
+#: src/gtkft.c:163
+msgid "Waiting for transfer to begin"
+msgstr "Wacht op starten van overdracht"
+
+#: src/gtkft.c:216
 msgid "<b>Receiving From:</b>"
 msgstr "<b>Ontvangen van:</b>"
 
-#: src/gtkft.c:212
+#: src/gtkft.c:219
 msgid "<b>Sending To:</b>"
 msgstr "<b>Verzenden naar:</b>"
 
-#: src/gtkft.c:386
+#: src/gtkft.c:393
 msgid "There is no application configured to open this type of file."
 msgstr "Er is geen programma geconfigureerd om dit type bestand te openen."
 
-#: src/gtkft.c:391
+#: src/gtkft.c:398
 msgid "An error occurred while opening the file."
 msgstr "Er is een fout opgetreden bij het openen van het bestand."
 
-#: src/gtkft.c:482
+#: src/gtkft.c:489
 msgid "Progress"
 msgstr "Voortgang"
 
-#: src/gtkft.c:489
+#: src/gtkft.c:496
 msgid "Filename"
 msgstr "Bestandsnaam"
 
-#: src/gtkft.c:496
+#: src/gtkft.c:503
 msgid "Size"
 msgstr "Grootte"
 
-#: src/gtkft.c:503
+#: src/gtkft.c:510
 msgid "Remaining"
 msgstr "Nog te gaan"
 
-#: src/gtkft.c:533
+#: src/gtkft.c:540
 msgid "Filename:"
 msgstr "Bestandsnaam:"
 
-#: src/gtkft.c:534
+#: src/gtkft.c:541
 msgid "Status:"
 msgstr "Status:"
 
-#: src/gtkft.c:535
+#: src/gtkft.c:542
 msgid "Speed:"
 msgstr "Snelheid:"
 
-#: src/gtkft.c:536
+#: src/gtkft.c:543
 msgid "Time Elapsed:"
 msgstr "Tijd:"
 
-#: src/gtkft.c:537
+#: src/gtkft.c:544
 msgid "Time Remaining:"
 msgstr "Schatting:"
 
-#: src/gtkft.c:634
+#: src/gtkft.c:641
 msgid "_Keep the dialog open"
 msgstr "Dialoogvenster open _houden"
 
-#: src/gtkft.c:644
+#: src/gtkft.c:651
 msgid "_Clear finished transfers"
 msgstr "Verwerkte overdrachten uit lijst _verwijderen"
 
 #. "Download Details" arrow
-#: src/gtkft.c:653
+#: src/gtkft.c:660
 msgid "Show transfer details"
 msgstr "Details weergeven"
 
-#: src/gtkft.c:654
+#: src/gtkft.c:661
 msgid "Hide transfer details"
 msgstr "Details verbergen"
 
 #. Pause button
-#: src/gtkft.c:696 src/stock.c:90
+#: src/gtkft.c:703 src/stock.c:90
 msgid "_Pause"
 msgstr "_Pauzeren"
 
 #. Resume button
-#: src/gtkft.c:706
+#: src/gtkft.c:713
 msgid "_Resume"
 msgstr "_Doorgaan"
 
-#: src/gtkft.c:908
-msgid "Canceled"
-msgstr "Afgebroken"
-
-#: src/gtkft.c:910
+#: src/gtkft.c:920
 msgid "Failed"
 msgstr "Mislukt"
 
-#: src/gtkft.c:1082
-msgid "That file does not exist."
-msgstr "Dat bestand bestaat niet."
-
-#: src/gtkft.c:1091
-msgid "Cannot send a file of 0 bytes."
-msgstr "Kan geen bestand sturen van 0 bytes groot."
-
-#: src/gtkft.c:1105
-msgid "That file already exists."
-msgstr "Dat bestand bestaat al."
-
-#: src/gtkft.c:1131
-msgid "Open..."
-msgstr "Openen..."
-
-#: src/gtkft.c:1133
-msgid "Save As..."
-msgstr "Opslaan als..."
-
-#: src/gtkft.c:1183
-#, c-format
-msgid "%s wants to send you %s (%s)"
-msgstr "%s wil u %s toesturen (%s)"
-
-#: src/gtkft.c:1216
-#, c-format
-msgid "Accept file transfer request from %s?"
-msgstr "Bestandsoverdracht accepteren van %s?"
-
-#: src/gtkft.c:1220
-#, c-format
-msgid ""
-"A file is available for download from:\n"
-"Remote host: %s\n"
-"Remote port: %d"
-msgstr ""
-"Er is een bestand voor downloaden beschikbaar van:\n"
-"Computer: %s\n"
-"Poort: %d"
-
-#: src/gtkimhtml.c:1139
+#: src/gtkimhtml.c:602
+msgid "Pa_ste As Text"
+msgstr "_Plakken als tekst"
+
+#: src/gtkimhtml.c:1047
+msgid "Hyperlink color"
+msgstr "Kleur van verwijzing"
+
+#: src/gtkimhtml.c:1048
+msgid "Color to draw hyperlinks."
+msgstr "Kleur van de verwijzingen"
+
+#: src/gtkimhtml.c:1253
 msgid "_Copy E-Mail Address"
 msgstr "E-mail adres _kopiëren"
 
-#: src/gtkimhtml.c:1151
+#: src/gtkimhtml.c:1265
 msgid "_Copy Link Location"
 msgstr "Verwijzing _kopiëren"
 
-#: src/gtkimhtml.c:1161
+#: src/gtkimhtml.c:1275
 msgid "_Open Link in Browser"
 msgstr "Verwijzing _openen met webbrowser"
 
-#: src/gtkimhtml.c:2643
+#: src/gtkimhtml.c:2797
 msgid ""
 "Unable to guess the image type based on the file extension supplied.  "
 "Defaulting to PNG."
@@ -3086,32 +3318,40 @@
 "Gaim kon het type afbeelding niet bepalen aan de hand van het achtervoegsel. "
 "PNG wordt geprobeerd."
 
-#: src/gtkimhtml.c:2651
+#: src/gtkimhtml.c:2805
 #, c-format
 msgid "Error saving image: %s"
 msgstr "Fout bij opslaan afbeelding: %s"
 
-#: src/gtkimhtml.c:2660
+#: src/gtkimhtml.c:2814
 msgid "Save Image"
 msgstr "Afbeelding opslaan"
 
-#: src/gtkimhtml.c:2683
+#: src/gtkimhtml.c:2837
 msgid "_Save Image..."
 msgstr "Afbeelding _opslaan..."
 
-#: src/gtkimhtmltoolbar.c:383
+#: src/gtkimhtmltoolbar.c:163
+msgid "Select Font"
+msgstr "Lettertype selecteren"
+
+#: src/gtkimhtmltoolbar.c:238
+msgid "Select Text Color"
+msgstr ":Tekstkleur selecteren"
+
+#: src/gtkimhtmltoolbar.c:311
+msgid "Select Background Color"
+msgstr "Achtergrondkleur selecteren"
+
+#: src/gtkimhtmltoolbar.c:392
 msgid "_URL"
 msgstr "_URL"
 
-#: src/gtkimhtmltoolbar.c:387
+#: src/gtkimhtmltoolbar.c:397
 msgid "_Description"
 msgstr "_Beschrijving"
 
-#: src/gtkimhtmltoolbar.c:392
-msgid "Insert Link"
-msgstr "Verwijzing invoegen"
-
-#: src/gtkimhtmltoolbar.c:394
+#: src/gtkimhtmltoolbar.c:400
 msgid ""
 "Please enter the URL and description of the link that you want to insert. "
 "The description is optional."
@@ -3119,74 +3359,86 @@
 "Geef de URL en de beschrijving van de verwijzing die u wilt invoegen. De "
 "beschrijving is optioneel."
 
-#: src/gtkimhtmltoolbar.c:398
+#: src/gtkimhtmltoolbar.c:404
+msgid "Please enter the URL of the link that you want to insert."
+msgstr "Geef de URL van de verwijzing die u wilt invoegen."
+
+#: src/gtkimhtmltoolbar.c:409
+msgid "Insert Link"
+msgstr "Verwijzing invoegen"
+
+#: src/gtkimhtmltoolbar.c:413
 msgid "_Insert"
 msgstr "_Invoegen"
 
-#: src/gtkimhtmltoolbar.c:455
+#: src/gtkimhtmltoolbar.c:481
 #, c-format
 msgid "Failed to store image: %s\n"
 msgstr "Kan de afbeelding niet opslaan: %s\n"
 
-#: src/gtkimhtmltoolbar.c:481
+#: src/gtkimhtmltoolbar.c:507 src/gtkimhtmltoolbar.c:517
 msgid "Insert Image"
 msgstr "Afbeelding invoegen"
 
+#: src/gtkimhtmltoolbar.c:655
+msgid "This theme has no available smileys."
+msgstr "Dit thema heeft geen smileys beschikbaar."
+
 #. show everything
-#: src/gtkimhtmltoolbar.c:625
+#: src/gtkimhtmltoolbar.c:670
 msgid "Smile!"
 msgstr "Lachen!"
 
-#: src/gtkimhtmltoolbar.c:825
+#: src/gtkimhtmltoolbar.c:888
 msgid "Bold"
 msgstr "Vet"
 
-#: src/gtkimhtmltoolbar.c:836
+#: src/gtkimhtmltoolbar.c:899
 msgid "Italic"
 msgstr "Cursief"
 
-#: src/gtkimhtmltoolbar.c:847
+#: src/gtkimhtmltoolbar.c:910
 msgid "Underline"
 msgstr "Onderstrepen"
 
-#: src/gtkimhtmltoolbar.c:863
+#: src/gtkimhtmltoolbar.c:926
 msgid "Larger font size"
 msgstr "Grotere letters"
 
-#: src/gtkimhtmltoolbar.c:875
+#: src/gtkimhtmltoolbar.c:938
 msgid "Smaller font size"
 msgstr "Kleinere letters"
 
-#: src/gtkimhtmltoolbar.c:892
+#: src/gtkimhtmltoolbar.c:955
 msgid "Font Face"
 msgstr "Lettertype"
 
-#: src/gtkimhtmltoolbar.c:904
+#: src/gtkimhtmltoolbar.c:967
 msgid "Foreground font color"
 msgstr "Tekstkleur"
 
-#: src/gtkimhtmltoolbar.c:916
+#: src/gtkimhtmltoolbar.c:979
 msgid "Background color"
 msgstr "Achtergrondkleur"
 
-#: src/gtkimhtmltoolbar.c:931
+#: src/gtkimhtmltoolbar.c:994
 msgid "Insert link"
 msgstr "Verwijzing invoegen"
 
-#: src/gtkimhtmltoolbar.c:941
+#: src/gtkimhtmltoolbar.c:1004
 msgid "Insert image"
 msgstr "Afbeelding invoegen"
 
-#: src/gtkimhtmltoolbar.c:952
+#: src/gtkimhtmltoolbar.c:1015
 msgid "Insert smiley"
 msgstr "Smiley invoegen"
 
-#: src/gtklog.c:282
+#: src/gtklog.c:302
 msgid "Conversations with"
 msgstr "Gesprekken met"
 
 #. Window **********
-#: src/gtklog.c:368 src/gtklog.c:384
+#: src/gtklog.c:392 src/gtklog.c:408
 msgid "System Log"
 msgstr "Systeemlogboek"
 
@@ -3198,17 +3450,17 @@
 msgstr[0] "%s heeft %d nieuw bericht."
 msgstr[1] "%s heeft %d nieuwe berichten."
 
-#: src/gtknotify.c:229
+#: src/gtknotify.c:231
 #, c-format
 msgid "<span weight=\"bold\">From:</span> %s\n"
 msgstr "<span weight=\"bold\">Van:</span> %s\n"
 
-#: src/gtknotify.c:235
+#: src/gtknotify.c:240
 #, c-format
 msgid "<span weight=\"bold\">Subject:</span> %s\n"
 msgstr "<span weight=\"bold\">Onderwerp:</span> %s\n"
 
-#: src/gtknotify.c:239
+#: src/gtknotify.c:245
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">You have mail!</span>\n"
@@ -3219,7 +3471,7 @@
 "\n"
 "%s%s%s%s"
 
-#: src/gtknotify.c:255
+#: src/gtknotify.c:261
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">You have mail!</span>\n"
@@ -3230,185 +3482,189 @@
 "\n"
 "%s"
 
-#: src/gtknotify.c:441
+#: src/gtknotify.c:429
 #, c-format
 msgid "The browser command \"%s\" is invalid."
 msgstr "De browser-opdracht \"%s\" is ongeldig."
 
-#: src/gtknotify.c:444 src/gtknotify.c:458 src/gtknotify.c:473
-#: src/gtknotify.c:581
+#: src/gtknotify.c:432 src/gtknotify.c:446 src/gtknotify.c:461
+#: src/gtknotify.c:579
 msgid "Unable to open URL"
 msgstr "Kan URL niet openen"
 
-#: src/gtknotify.c:455 src/gtknotify.c:470
+#: src/gtknotify.c:443 src/gtknotify.c:458
 #, c-format
 msgid "Error launching \"%s\": %s"
 msgstr "Fout bij starten van \"%s\": %s"
 
-#: src/gtknotify.c:582
-msgid ""
-"The 'Manual' browser command has been chosen, but no command has been set."
+#: src/gtknotify.c:580
+msgid "The 'Manual' browser command has been chosen, but no command has been set."
 msgstr ""
 "Kan handmatige browser niet starten omdat er geen correcte opdracht is "
 "ingesteld."
 
-#: src/gtkpounce.c:143
+#: src/gtkpounce.c:130
 msgid "Select a file"
 msgstr "Kies een bestand"
 
-#: src/gtkpounce.c:192
+#: src/gtkpounce.c:161
 msgid "Please enter a buddy to pounce."
 msgstr "Vul een vriend in om een alarm voor in te stellen."
 
 #. "New Buddy Pounce"
-#: src/gtkpounce.c:336 src/gtkpounce.c:756
+#: src/gtkpounce.c:387 src/gtkpounce.c:890
 msgid "New Buddy Pounce"
 msgstr "Nieuw Contact-alarm"
 
-#: src/gtkpounce.c:336
+#: src/gtkpounce.c:387
 msgid "Edit Buddy Pounce"
 msgstr "Contact-alarm bewerken"
 
 #. Create the "Pounce Who" frame.
-#: src/gtkpounce.c:354
+#: src/gtkpounce.c:405
 msgid "Pounce Who"
 msgstr "Wie Alarmeren"
 
-#: src/gtkpounce.c:381
-msgid "_Buddy Name:"
+#: src/gtkpounce.c:432
+msgid "_Buddy name:"
 msgstr "_Contactnaam:"
 
 #. Create the "Pounce When" frame.
-#: src/gtkpounce.c:404
+#: src/gtkpounce.c:456
 msgid "Pounce When"
 msgstr "Wanneer Alarmeren"
 
-#: src/gtkpounce.c:412
+#: src/gtkpounce.c:464 src/main.c:296
 msgid "_Sign on"
 msgstr "_Aanmelden"
 
-#: src/gtkpounce.c:414
+#: src/gtkpounce.c:466
 msgid "Sign _off"
 msgstr "Af_melden"
 
-#: src/gtkpounce.c:416
+#: src/gtkpounce.c:468
 msgid "A_way"
 msgstr "_Afwezig"
 
-#: src/gtkpounce.c:418
+#: src/gtkpounce.c:470
 msgid "Re_turn from away"
 msgstr "_Terugkeren van afwezigheid"
 
-#: src/gtkpounce.c:420
+#: src/gtkpounce.c:472
 msgid "_Idle"
 msgstr "_Inactief"
 
-#: src/gtkpounce.c:422
+#: src/gtkpounce.c:474
 msgid "Retur_n from idle"
 msgstr "Terugkeren _van inactief"
 
-#: src/gtkpounce.c:424
+#: src/gtkpounce.c:476
 msgid "Buddy starts _typing"
 msgstr "Contact start met _tikken"
 
-#: src/gtkpounce.c:426
+#: src/gtkpounce.c:478
 msgid "Buddy stops t_yping"
 msgstr "Contact _stopt met tikken"
 
 #. Create the "Pounce Action" frame.
-#: src/gtkpounce.c:455
+#: src/gtkpounce.c:507
 msgid "Pounce Action"
 msgstr "Alarm Actie"
 
-#: src/gtkpounce.c:462
+#: src/gtkpounce.c:515
 msgid "Op_en an IM window"
 msgstr "Be_richtvenster openen"
 
-#: src/gtkpounce.c:463
+#: src/gtkpounce.c:517
 msgid "_Popup notification"
 msgstr "_Melding weergeven"
 
-#: src/gtkpounce.c:464
+#: src/gtkpounce.c:519
 msgid "Send a _message"
 msgstr "Een bericht ver_sturen"
 
-#: src/gtkpounce.c:465
+#: src/gtkpounce.c:521
 msgid "E_xecute a command"
 msgstr "Opdracht _uitvoeren"
 
-#: src/gtkpounce.c:466
+#: src/gtkpounce.c:523
 msgid "P_lay a sound"
 msgstr "_Geluid afspelen"
 
-#: src/gtkpounce.c:470
+#: src/gtkpounce.c:527
 msgid "B_rowse..."
 msgstr "Bl_aderen..."
 
-#: src/gtkpounce.c:472
+#: src/gtkpounce.c:529
 msgid "Bro_wse..."
 msgstr "Bl_aderen..."
 
-#: src/gtkpounce.c:473
+#: src/gtkpounce.c:530
 msgid "Pre_view"
 msgstr "_Voorbeeld"
 
-#: src/gtkpounce.c:556
+#: src/gtkpounce.c:613
 msgid "Sav_e this pounce after activation"
 msgstr "Dit alarm _opslaan na activatie"
 
 #. "Remove Buddy Pounce"
-#: src/gtkpounce.c:763
+#: src/gtkpounce.c:897
 msgid "Remove Buddy Pounce"
 msgstr "Contact-alarm verwijderen"
 
-#: src/gtkpounce.c:813
-#, c-format
-msgid "%s has started typing to you"
-msgstr "%s is begonnen met tikken"
-
-#: src/gtkpounce.c:814
-#, c-format
-msgid "%s has signed on"
-msgstr "%s heeft zich aangemeld"
-
-#: src/gtkpounce.c:815
-#, c-format
-msgid "%s has returned from being idle"
-msgstr "%s is weer actief"
-
-#: src/gtkpounce.c:816
-#, c-format
-msgid "%s has returned from being away"
-msgstr "%s is weer actief"
-
-#: src/gtkpounce.c:817
-#, c-format
-msgid "%s has stopped typing to you"
-msgstr "%s is gestopt met tikken"
-
-#: src/gtkpounce.c:818
-#, c-format
-msgid "%s has signed off"
-msgstr "%s heeft zich afgemeld"
-
-#: src/gtkpounce.c:819
-#, c-format
-msgid "%s has become idle"
-msgstr "%s is inactief"
-
-#: src/gtkpounce.c:821
+#: src/gtkpounce.c:961
+#, c-format
+msgid "%s has started typing to you (%s)"
+msgstr "%s tikt een bericht aan u (%s)"
+
+#: src/gtkpounce.c:963
+#, c-format
+msgid "%s has signed on (%s)"
+msgstr "%s heeft zich aangemeld (%s)"
+
+#: src/gtkpounce.c:965
+#, c-format
+msgid "%s has returned from being idle (%s)"
+msgstr "%s is weer actief (%s)"
+
+#: src/gtkpounce.c:967
+#, c-format
+msgid "%s has returned from being away (%s)"
+msgstr "%s is weer actief (%s)"
+
+#: src/gtkpounce.c:969
+#, c-format
+msgid "%s has stopped typing to you (%s)"
+msgstr "%s is gestopt met tikken (%s)"
+
+#: src/gtkpounce.c:971
+#, c-format
+msgid "%s has signed off (%s)"
+msgstr "%s heeft zich afgemeld (%s)"
+
+#: src/gtkpounce.c:973
+#, c-format
+msgid "%s has become idle (%s)"
+msgstr "%s is inactief (%s)"
+
+#: src/gtkpounce.c:975
+#, c-format
+msgid "%s has gone away. (%s)"
+msgstr "%s is afwezig. (%s)"
+
+#: src/gtkpounce.c:976
 msgid "Unknown pounce event. Please report this!"
 msgstr "Onbekend contact-alarm. Rapporteer dit alstublieft!"
 
-#: src/gtkprefs.c:399
+#: src/gtkprefs.c:446
 msgid "Interface Options"
 msgstr "Interface-instellingen"
 
-#: src/gtkprefs.c:401
+#: src/gtkprefs.c:448
 msgid "D_isplay remote nicknames if no alias is set"
 msgstr "Bijnaam _weergeven als geen alias is ingesteld"
 
-#: src/gtkprefs.c:595
+#: src/gtkprefs.c:675
 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."
@@ -3416,420 +3672,322 @@
 "Kies een smileythema uit de lijst. U kunt nieuwe thema's installeren door "
 "deze naar de lijst te slepen."
 
-#: src/gtkprefs.c:630
+#: src/gtkprefs.c:715
 msgid "Icon"
 msgstr "Pictogram"
 
-#: src/gtkprefs.c:637 src/gtkprefs.c:2043 src/protocols/jabber/buddy.c:265
-#: src/protocols/jabber/buddy.c:748 src/protocols/jabber/chat.c:684
+#: src/gtkprefs.c:722 src/gtkprefs.c:2212 src/protocols/jabber/buddy.c:264
+#: src/protocols/jabber/buddy.c:748 src/protocols/jabber/chat.c:701
 msgid "Description"
 msgstr "Beschrijving"
 
-#: src/gtkprefs.c:704
-msgid "Style"
-msgstr "Stijl"
-
-#: src/gtkprefs.c:705
-msgid "_Bold"
-msgstr "_Vet"
-
-#: src/gtkprefs.c:707
-msgid "_Italic"
-msgstr "_Cursief"
-
-#: src/gtkprefs.c:709
-msgid "_Underline"
-msgstr "_Onderstrepen"
-
-#. who in their right mind would use this as a default anyway?
-#. * and plus, it wouldn't work as the code currently existed,
-#. * and then i went and applied simguy's patch to remove the
-#. * non-functional code.
-#. *
-#. * remove this after string freeze ends
-#.
-#: src/gtkprefs.c:719
-msgid "_Strikethrough"
-msgstr "_Doorgehaalde Tekst"
-
-#: src/gtkprefs.c:722
-msgid "Face"
-msgstr "Lettertype"
-
-#: src/gtkprefs.c:725
-msgid "Use custo_m face"
-msgstr "Eigen lettertype gebruiken"
-
-#: src/gtkprefs.c:742
-msgid "Use custom si_ze"
-msgstr "Afmeting instellen"
-
-#: src/gtkprefs.c:754
-msgid "Color"
-msgstr "Kleur"
-
-#: src/gtkprefs.c:758
-msgid "_Text color"
-msgstr "_Tekstkleur"
-
-#: src/gtkprefs.c:777
-msgid "Bac_kground color"
-msgstr "Achtergrond_kleur"
-
-#: src/gtkprefs.c:805 src/gtkprefs.c:1037 src/gtkprefs.c:1085
+#: src/gtkprefs.c:818
 msgid "Display"
 msgstr "Weergave"
 
-#: src/gtkprefs.c:806
-msgid "Show graphical _smileys"
-msgstr "_Afbeeldingen weergeven"
-
-#: src/gtkprefs.c:808
+#: src/gtkprefs.c:819
 msgid "Show _timestamp on messages"
 msgstr "_Tijd weergeven bij berichten"
 
-#: src/gtkprefs.c:810
-msgid "Show _URLs as links"
-msgstr "_URL weergeven als verwijzing"
-
-#: src/gtkprefs.c:814
+#: src/gtkprefs.c:822
 msgid "_Highlight misspelled words"
 msgstr "Verkeerd gespelde woorden _oplichten"
 
-#: src/gtkprefs.c:818
+#: src/gtkprefs.c:827
 msgid "Ignore c_olors"
 msgstr "Kle_uren negeren"
 
-#: src/gtkprefs.c:820
+#: src/gtkprefs.c:829
 msgid "Ignore font _faces"
 msgstr "Lettertype ne_geren"
 
-#: src/gtkprefs.c:822
+#: src/gtkprefs.c:831
 msgid "Ignore font si_zes"
 msgstr "_Afmetingen negeren"
 
-#: src/gtkprefs.c:835
+#: src/gtkprefs.c:834
+msgid "_Ignore formatting on incoming messages"
+msgstr "Opmaak van inkomende berichten _negeren"
+
+#: src/gtkprefs.c:838
+msgid "Default Formatting"
+msgstr "Standaardopmaak"
+
+#: src/gtkprefs.c:840
+msgid "_Send default formatting with outgoing messages"
+msgstr "Opmaak _meesturen met uitgaande berichten"
+
+#: src/gtkprefs.c:872
+msgid ""
+"This is how your outgoing message text will appear when you use protocols "
+"that support formatting. :)"
+msgstr ""
+"Dit is hoe uitgaande berichten eruit zien via protocollen die ondersteuning "
+"voor berichtopmaak hebben. :)"
+
+#: src/gtkprefs.c:875
+msgid "_Clear Formatting"
+msgstr "Opmaak _verwijderen"
+
+#: src/gtkprefs.c:912
 msgid "Send Message"
 msgstr "Verstuur bericht"
 
-#: src/gtkprefs.c:836
+#: src/gtkprefs.c:913
 msgid "Enter _sends message"
 msgstr "Enter ver_stuurt bericht"
 
-#: src/gtkprefs.c:838
+#: src/gtkprefs.c:915
 msgid "C_ontrol-Enter sends message"
 msgstr "_CTRL-Enter verstuurt bericht"
 
-#: src/gtkprefs.c:841
+#: src/gtkprefs.c:918
 msgid "Window Closing"
 msgstr "Sluiten van venster"
 
-#: src/gtkprefs.c:842
+#: src/gtkprefs.c:919
 msgid "_Escape closes window"
 msgstr "_Escape sluit het venster"
 
-#: src/gtkprefs.c:845
+#: src/gtkprefs.c:922
 msgid "Insertions"
 msgstr "Invoegingen"
 
-#: src/gtkprefs.c:846
-msgid "Control-{B/I/U} inserts _HTML tags"
-msgstr "CTRL-{B/I/U} voegt _HTML in"
-
-#: src/gtkprefs.c:848
+#: src/gtkprefs.c:923
+msgid "Control-{B/I/U} changes _formatting"
+msgstr "CTRL-{B/I/U} verandert de _opmaak"
+
+#: src/gtkprefs.c:925
 msgid "Control-(number) _inserts smileys"
 msgstr "CTRL-(nummer) voegt _smileys in"
 
-#: src/gtkprefs.c:864
+#: src/gtkprefs.c:941
 msgid "Buddy List Sorting"
 msgstr "Sorteren van contactenlijst"
 
-#: src/gtkprefs.c:873
+#: src/gtkprefs.c:950
 msgid "_Sorting:"
 msgstr "_Sorteren:"
 
-#: src/gtkprefs.c:878
-msgid "Buddy List Toolbar"
-msgstr "Contactenlijst werkbalk"
-
-#: src/gtkprefs.c:879 src/gtkprefs.c:1010 src/gtkprefs.c:1061
+#: src/gtkprefs.c:956 src/gtkprefs.c:1009
 msgid "Show _buttons as:"
 msgstr "_Knoppen weergeven als:"
 
-#: src/gtkprefs.c:881 src/gtkprefs.c:1012 src/gtkprefs.c:1063
+#: src/gtkprefs.c:958 src/gtkprefs.c:1011
 msgid "Pictures"
 msgstr "Afbeeldingen"
 
-#: src/gtkprefs.c:882 src/gtkprefs.c:1013 src/gtkprefs.c:1064
+#: src/gtkprefs.c:959 src/gtkprefs.c:1012
 msgid "Text"
 msgstr "Tekst"
 
-#: src/gtkprefs.c:883 src/gtkprefs.c:1014 src/gtkprefs.c:1065
+#: src/gtkprefs.c:960 src/gtkprefs.c:1013
 msgid "Pictures and text"
 msgstr "Tekst en afbeeldingen"
 
-#: src/gtkprefs.c:888 src/gtkprefs.c:1025 src/gtkprefs.c:1076
+#: src/gtkprefs.c:963
 msgid "_Raise window on events"
 msgstr "Venster _optillen bij gebeurtenissen"
 
-#: src/gtkprefs.c:891
-msgid "Group Display"
-msgstr "Groepen"
-
-#: src/gtkprefs.c:892
-msgid "Show _numbers in groups"
-msgstr "_Nummers weergeven bij groepen"
-
-#: src/gtkprefs.c:895
+#: src/gtkprefs.c:966
 msgid "Buddy Display"
 msgstr "Contactenlijst"
 
-#: src/gtkprefs.c:896 src/gtkprefs.c:1032
+#: src/gtkprefs.c:967 src/gtkprefs.c:1027
 msgid "Show buddy _icons"
 msgstr "Protocolt_ype weergeven"
 
-#: src/gtkprefs.c:898
+#: src/gtkprefs.c:969
 msgid "Show _warning levels"
 msgstr "_Waarschuwingsniveau weergeven"
 
-#: src/gtkprefs.c:900
+#: src/gtkprefs.c:971
 msgid "Show idle _times"
 msgstr "Afwezigheidstijd _weergeven"
 
-#: src/gtkprefs.c:902
+#: src/gtkprefs.c:973
 msgid "Dim i_dle buddies"
 msgstr "Afwezige contacten _uitgrijzen"
 
-#: src/gtkprefs.c:904
+#: src/gtkprefs.c:975
 msgid "_Automatically expand contacts"
 msgstr "Contacten _automatisch uitvouwen"
 
-#: src/gtkprefs.c:929
-msgid "_Placement:"
-msgstr "_Plaatsing:"
-
-#: src/gtkprefs.c:936
-msgid "Send _URLs as links"
-msgstr "_URL versturen als verwijzing"
-
-#: src/gtkprefs.c:939
+#: src/gtkprefs.c:1020
+msgid "Enable \"_slash\" commands"
+msgstr "\"slash\"-opdrachten (/) gebruiken"
+
+#: src/gtkprefs.c:1023
 msgid "Show _formatting toolbar"
 msgstr "_Opmaakwerkbalk weergeven"
 
-#: src/gtkprefs.c:942
-msgid "Show a_liases in tabs/titles"
+#: src/gtkprefs.c:1025
+msgid "Show _aliases in tabs/titles"
 msgstr "_Bijnamen in tabbladen/titels weergeven"
 
-#: src/gtkprefs.c:945
+#: src/gtkprefs.c:1029
+msgid "Enable buddy ic_on animation"
+msgstr "Bewegende _contactplaatjes weergeven"
+
+#: src/gtkprefs.c:1031
+msgid "_Notify buddies that you are typing to them"
+msgstr "Laat anderen weten dat je aan het _typen bent"
+
+#: src/gtkprefs.c:1033
+msgid "_Raise IM window on events"
+msgstr "Berichtvenster _optillen bij gebeurtenissen"
+
+#: src/gtkprefs.c:1036
+msgid "Raise chat _window on events"
+msgstr "Venster _optillen bij gebeurtenissen"
+
+#: src/gtkprefs.c:1038
+msgid "Use _multi-colored screen names in chats"
+msgstr "Meerkleurige namen weergeven in chats"
+
+#. All the tab options!
+#: src/gtkprefs.c:1042
 msgid "Tab Options"
 msgstr "Tab-opties"
 
-#: src/gtkprefs.c:947
-msgid "_Tab Placement:"
-msgstr "Tabblad_plaatsing:"
-
-#: src/gtkprefs.c:949
-msgid "Top"
-msgstr "Boven"
-
-#: src/gtkprefs.c:950
-msgid "Bottom"
-msgstr "Onder"
-
-#: src/gtkprefs.c:951
-msgid "Left"
-msgstr "Links"
-
-#: src/gtkprefs.c:952
-msgid "Right"
-msgstr "Rechts"
-
-#: src/gtkprefs.c:958
+#: src/gtkprefs.c:1044
 msgid "Show IMs and chats in _tabbed windows"
 msgstr "Gesprekken en chats in venster met tabbleden plaatsen"
 
-#: src/gtkprefs.c:961
-msgid "Show IMs and chats in _same tabbed window"
-msgstr "Gesprekken en chats in _zelfde venster met tabbladen weergeven"
-
-#: src/gtkprefs.c:971
+#: src/gtkprefs.c:1059
 msgid "Show _close button on tabs"
 msgstr "_Sluitknoppen weergeven op tabbladen"
 
-#: src/gtkprefs.c:982
-msgid "Show status _icons on tabs"
-msgstr "Status_pictogrammen weergeven op tabbladen."
-
-#: src/gtkprefs.c:1009 src/gtkprefs.c:1060
-msgid "Window"
-msgstr "Venster"
-
-#: src/gtkprefs.c:1019 src/gtkprefs.c:1070
-msgid "New window _width:"
-msgstr "Nieuwe venster_breedte:"
-
-#: src/gtkprefs.c:1021 src/gtkprefs.c:1072
-msgid "New window _height:"
-msgstr "Nieuwe venster_hoogte:"
-
-#: src/gtkprefs.c:1023 src/gtkprefs.c:1074
-msgid "_Entry field height:"
-msgstr "_Tekstinvoer hoogte:"
-
-#: src/gtkprefs.c:1027
-msgid "Hide window on _send"
-msgstr "Venster verbergen na ver_zenden"
-
-#: src/gtkprefs.c:1031
-msgid "Buddy Icons"
-msgstr "Contactplaatjes"
-
-#: src/gtkprefs.c:1034
-msgid "Enable buddy icon a_nimation"
-msgstr "A_nimatie contactplaatje inschakelen"
-
-#: src/gtkprefs.c:1038
-msgid "Show _logins in window"
-msgstr "_Aanmeldingen weergeven in venster"
-
-#: src/gtkprefs.c:1041
-msgid "Typing Notification"
-msgstr "Type-melding"
-
-#: src/gtkprefs.c:1042
-msgid "Notify buddies that you are _typing to them"
-msgstr "Laat anderen weten dat je aan het _typen bent"
-
-#: src/gtkprefs.c:1079
-msgid "Tab Completion"
-msgstr "Tab auto-afmaken"
-
-#: src/gtkprefs.c:1080
-msgid "_Tab-complete nicks"
-msgstr "_Tab-bijnamen afmaken"
-
-#: src/gtkprefs.c:1082
-msgid "_Old-style tab completion"
-msgstr "_Oude stijl van afmaken gebruiken"
-
-#: src/gtkprefs.c:1086
-msgid "_Show people joining in window"
-msgstr "_Mensen die binnenkomen weergeven in venster"
-
-#: src/gtkprefs.c:1088
-msgid "_Show people leaving in window"
-msgstr "Mensen die _weggaan weergeven in venster"
-
-#: src/gtkprefs.c:1090
-msgid "Co_lorize screen names"
-msgstr "Geef bijnamen kle_uren"
-
-#: src/gtkprefs.c:1111 src/protocols/oscar/oscar.c:584
-#: src/protocols/oscar/oscar.c:4220
+#: src/gtkprefs.c:1062
+msgid "Tab p_lacement:"
+msgstr "Tabblad_plaatsing:"
+
+#: src/gtkprefs.c:1064
+msgid "Top"
+msgstr "Boven"
+
+#: src/gtkprefs.c:1065
+msgid "Bottom"
+msgstr "Onder"
+
+#: src/gtkprefs.c:1066
+msgid "Left"
+msgstr "Links"
+
+#: src/gtkprefs.c:1067
+msgid "Right"
+msgstr "Rechts"
+
+#: src/gtkprefs.c:1073
+msgid "New conversation _placement:"
+msgstr "Plaatsing van nieuwe _gesprekken:"
+
+#: src/gtkprefs.c:1124 src/protocols/oscar/oscar.c:596
+#: src/protocols/oscar/oscar.c:4853
 msgid "IP Address"
 msgstr "IP-adres"
 
-#: src/gtkprefs.c:1113
+#: src/gtkprefs.c:1126
 msgid "_Autodetect IP Address"
 msgstr "IP-adres _opzoeken"
 
-#: src/gtkprefs.c:1122
+#: src/gtkprefs.c:1135
 msgid "Public _IP:"
 msgstr "Publiek _IP-adres:"
 
-#: src/gtkprefs.c:1146
+#: src/gtkprefs.c:1159
 msgid "Ports"
 msgstr "Poorten"
 
-#: src/gtkprefs.c:1149
+#: src/gtkprefs.c:1162
 msgid "_Manually specify range of ports to listen on"
 msgstr "Poortbereik _handmatig aangeven"
 
-#: src/gtkprefs.c:1152
+#: src/gtkprefs.c:1165
 msgid "_Start Port:"
 msgstr "_Beginpoort:"
 
-#: src/gtkprefs.c:1159
+#: src/gtkprefs.c:1172
 msgid "_End Port:"
 msgstr "_Eindpoort:"
 
-#: src/gtkprefs.c:1207
-msgid "Proxy Type"
-msgstr "Proxy Type"
-
-#: src/gtkprefs.c:1210
+#: src/gtkprefs.c:1179
+msgid "Proxy Server"
+msgstr "Proxy Server"
+
+#: src/gtkprefs.c:1183
 msgid "No proxy"
 msgstr "Geen proxy"
 
-#: src/gtkprefs.c:1217
-msgid "Proxy Server"
-msgstr "Proxy Server"
-
-#: src/gtkprefs.c:1275
+#: src/gtkprefs.c:1245
 msgid "_User:"
 msgstr "_Gebruiker:"
 
-#: src/gtkprefs.c:1331
-msgid "Opera"
-msgstr "Opera"
-
-#: src/gtkprefs.c:1332
-msgid "Netscape"
-msgstr "Netscape"
-
-#: src/gtkprefs.c:1333
-msgid "Mozilla"
-msgstr "Mozilla"
-
-#: src/gtkprefs.c:1334
+#: src/gtkprefs.c:1301
+msgid "Epiphany"
+msgstr "Epiphany"
+
+#: src/gtkprefs.c:1302
+msgid "Firebird"
+msgstr "Firefox"
+
+#: src/gtkprefs.c:1303
+msgid "Firefox"
+msgstr "Firefox"
+
+#: src/gtkprefs.c:1304
+msgid "Galeon"
+msgstr "Galeon"
+
+#: src/gtkprefs.c:1305
+msgid "Gnome Default"
+msgstr "GNOME standaard"
+
+#: src/gtkprefs.c:1306
 msgid "Konqueror"
 msgstr "Konqueror"
 
-#: src/gtkprefs.c:1335
-msgid "Galeon"
-msgstr "Galeon"
-
-#: src/gtkprefs.c:1336
-msgid "Firebird"
-msgstr "Firefox"
-
-#: src/gtkprefs.c:1337
-msgid "Firefox"
-msgstr "Firefox"
-
-#: src/gtkprefs.c:1338
-msgid "Gnome Default"
-msgstr "GNOME standaard"
-
-#: src/gtkprefs.c:1347
+#: src/gtkprefs.c:1307
+msgid "Mozilla"
+msgstr "Mozilla"
+
+#: src/gtkprefs.c:1308
+msgid "Netscape"
+msgstr "Netscape"
+
+#: src/gtkprefs.c:1309
+msgid "Opera"
+msgstr "Opera"
+
+#: src/gtkprefs.c:1318
 msgid "Manual"
 msgstr "Handmatig"
 
-#: src/gtkprefs.c:1398
+#: src/gtkprefs.c:1369
 msgid "Browser Selection"
 msgstr "Browserselectie"
 
-#: src/gtkprefs.c:1402
+#: src/gtkprefs.c:1373
 msgid "_Browser:"
 msgstr "_Browser:"
 
-#: src/gtkprefs.c:1409
+#: src/gtkprefs.c:1380
 msgid "_Open link in:"
 msgstr "Verwijzing _openen met:"
 
-#: src/gtkprefs.c:1411
+#: src/gtkprefs.c:1382
 msgid "Browser default"
 msgstr "Standaardbrowser"
 
-#: src/gtkprefs.c:1412
+#: src/gtkprefs.c:1383
 msgid "Existing window"
 msgstr "Bestaand venster"
 
-#: src/gtkprefs.c:1414
+#: src/gtkprefs.c:1385
 msgid "New tab"
 msgstr "Nieuw tabblad"
 
-#: src/gtkprefs.c:1428
+#: src/gtkprefs.c:1399
 #, c-format
 msgid ""
 "_Manual:\n"
@@ -3838,83 +3996,83 @@
 "_Handmatig:\n"
 "(%s voor URL)"
 
-#: src/gtkprefs.c:1465
+#: src/gtkprefs.c:1436
 msgid "Message Logs"
 msgstr "Gesprek-logboek"
 
-#: src/gtkprefs.c:1468
+#: src/gtkprefs.c:1439
 msgid "Log _Format:"
 msgstr "Logboekop_maak:"
 
-#: src/gtkprefs.c:1471
+#: src/gtkprefs.c:1442
 msgid "_Log all instant messages"
 msgstr "Alle gesprekken _opslaan"
 
-#: src/gtkprefs.c:1473
+#: src/gtkprefs.c:1444
 msgid "Log all c_hats"
 msgstr "Alle _groepsgesprekken opslaan"
 
-#: src/gtkprefs.c:1476
+#: src/gtkprefs.c:1447
 msgid "System Logs"
 msgstr "Systeemlogboeken"
 
-#: src/gtkprefs.c:1478
+#: src/gtkprefs.c:1449
 msgid "_Enable system log"
 msgstr "Systeemlogboek bijhouden"
 
-#: src/gtkprefs.c:1481
+#: src/gtkprefs.c:1452
 msgid "Log when buddies _sign on/sign off"
 msgstr "Bijhouden wanneer contacten zich aan- of a_fmelden"
 
-#: src/gtkprefs.c:1487
+#: src/gtkprefs.c:1458
 msgid "Log when buddies become _idle/un-idle"
 msgstr "Bijhouden wanneer contacten (in)_actief zijn"
 
-#: src/gtkprefs.c:1493
+#: src/gtkprefs.c:1464
 msgid "Log when buddies go away/come _back"
 msgstr "Bijhouden wanneer contacten aan- of af_wezig zijn"
 
-#: src/gtkprefs.c:1499
+#: src/gtkprefs.c:1470
 msgid "Log your _own signons/idleness/awayness"
 msgstr "_Eigen aanmelding/activiteit/afwezigheid bijhouden"
 
-#: src/gtkprefs.c:1550
+#: src/gtkprefs.c:1596
+msgid "Sound Selection"
+msgstr "Geluid selecteren"
+
+#: src/gtkprefs.c:1647
 msgid "Sound Options"
 msgstr "Geluidsinstellingen"
 
-#: src/gtkprefs.c:1551
-msgid "Sounds when you _log in"
-msgstr "Geluid wanneer u uzelf _aanmeld"
-
-#: src/gtkprefs.c:1553
+#: src/gtkprefs.c:1648
 msgid "Sounds when conversation has _focus"
 msgstr "Geluiden wanneer gesprek de _aandacht heeft"
 
-#: src/gtkprefs.c:1555
+#: src/gtkprefs.c:1650
 msgid "_Sounds while away"
 msgstr "Geluiden wanneer u _weg bent"
 
-#: src/gtkprefs.c:1559
+#: src/gtkprefs.c:1654
 msgid "Sound Method"
 msgstr "Methode"
 
-#: src/gtkprefs.c:1560
+#: src/gtkprefs.c:1655
 msgid "_Method:"
 msgstr "_Methode:"
 
-#: src/gtkprefs.c:1562
+#: src/gtkprefs.c:1657
 msgid "Console beep"
 msgstr "Terminal-pieptoon"
 
-#: src/gtkprefs.c:1564
+#: src/gtkprefs.c:1659
 msgid "Automatic"
 msgstr "Automatisch"
 
-#: src/gtkprefs.c:1571
+#: src/gtkprefs.c:1666
 msgid "Command"
 msgstr "Opdracht"
 
-#: src/gtkprefs.c:1581
+#: src/gtkprefs.c:1674
 #, c-format
 msgid ""
 "Sound c_ommand:\n"
@@ -3923,73 +4081,86 @@
 "Geluids_opdracht:\n"
 "(%s voor bestandsnaam)"
 
-#: src/gtkprefs.c:1638
-msgid "_Sending messages removes away status"
-msgstr "_Verzenden van berichten verwijdert de afwezigheidsstatus"
-
-#: src/gtkprefs.c:1640
+#: src/gtkprefs.c:1701
+msgid "Sound Events"
+msgstr "Geluidsgebeurtenissen"
+
+#: src/gtkprefs.c:1752
+msgid "Play"
+msgstr "Afspelen"
+
+#: src/gtkprefs.c:1759
+msgid "Event"
+msgstr "Gebeurtenis"
+
+#: src/gtkprefs.c:1778
+msgid "Test"
+msgstr "Test"
+
+#: src/gtkprefs.c:1782
+msgid "Reset"
+msgstr "Wissen"
+
+#: src/gtkprefs.c:1786
+msgid "Choose..."
+msgstr "Bladeren..."
+
+#: src/gtkprefs.c:1810
 msgid "_Queue new messages when away"
 msgstr "Berichten in de _wachtrij zetten tijdens afwezigheid"
 
-#: src/gtkprefs.c:1643
+#: src/gtkprefs.c:1813
 msgid "Auto-response"
 msgstr "Auto-antwoord"
 
-#: src/gtkprefs.c:1646
-msgid "Seconds before _resending:"
-msgstr "Seconden voordat _opnieuw verzonden wordt:"
-
-#: src/gtkprefs.c:1649
+#: src/gtkprefs.c:1814
 msgid "_Send auto-response"
 msgstr "Auto-antwoord _sturen"
 
-#: src/gtkprefs.c:1651
+#: src/gtkprefs.c:1816
 msgid "_Only send auto-response when idle"
 msgstr "_Alleen auto-antwoord sturen tijdens afwezigheid"
 
-#: src/gtkprefs.c:1653
-msgid "Send auto-response in _active conversations"
-msgstr "Auto-antwoord sturen in _actieve gesprekken"
-
-#: src/gtkprefs.c:1662 src/protocols/msn/state.c:30
-#: src/protocols/novell/novell.c:2153 src/protocols/oscar/oscar.c:3378
-#: src/protocols/yahoo/yahoo.c:2295
+#: src/gtkprefs.c:1819 src/protocols/msn/msn.c:1179
+#: src/protocols/msn/state.c:32 src/protocols/novell/novell.c:2730
+#: src/protocols/oscar/oscar.c:4010 src/protocols/yahoo/yahoo.c:2511
+#: src/protocols/yahoo/yahoo_profile.c:664
 msgid "Idle"
 msgstr "Inactief"
 
-#: src/gtkprefs.c:1663
+#: src/gtkprefs.c:1820
 msgid "Idle _time reporting:"
 msgstr "Afwezigheid _berekenen:"
 
-#: src/gtkprefs.c:1666
+#: src/gtkprefs.c:1823
 msgid "Gaim usage"
 msgstr "Gebruik van gaim"
 
-#: src/gtkprefs.c:1669
+#: src/gtkprefs.c:1826
 msgid "X usage"
 msgstr "Gebruik grafische omgeving (X)"
 
-#: src/gtkprefs.c:1671
+#: src/gtkprefs.c:1828
 msgid "Windows usage"
 msgstr "Gebruik grafische omgeving (Windows)"
 
-#: src/gtkprefs.c:1679
+#: src/gtkprefs.c:1836
 msgid "Auto-away"
 msgstr "Auto-afwezig"
 
-#: src/gtkprefs.c:1680
+#: src/gtkprefs.c:1837
 msgid "Set away _when idle"
 msgstr "Status op afwezig zetten _wanneer ik niets doe"
 
-#: src/gtkprefs.c:1684
+#: src/gtkprefs.c:1841
 msgid "_Minutes before setting away:"
 msgstr "_Minuten voor afwezig:"
 
-#: src/gtkprefs.c:1692
+#: src/gtkprefs.c:1849
 msgid "Away m_essage:"
 msgstr "Afwezigheids_bericht:"
 
-#: src/gtkprefs.c:1767
+#: src/gtkprefs.c:1930
 #, c-format
 msgid ""
 "<span size=\"larger\">%s %s</span>\n"
@@ -4004,7 +4175,7 @@
 "<span weight=\"bold\">Website:</span>\t%s\n"
 "<span weight=\"bold\">Bestandsnaam:</span>\t%s"
 
-#: src/gtkprefs.c:1772
+#: src/gtkprefs.c:1935
 #, c-format
 msgid ""
 "<span size=\"larger\">%s %s</span>\n"
@@ -4019,108 +4190,64 @@
 "<span weight=\"bold\">URL:</span>  %s\n"
 "<span weight=\"bold\">Bestandsnaam:</span>  %s"
 
-#: src/gtkprefs.c:1999
+#: src/gtkprefs.c:2168
 msgid "Load"
 msgstr "Laden"
 
-#: src/gtkprefs.c:2013
+#: src/gtkprefs.c:2182
 msgid "Summary"
 msgstr "Samenvatting"
 
-#: src/gtkprefs.c:2061
+#: src/gtkprefs.c:2230
 msgid "Details"
 msgstr "Details"
 
-#: src/gtkprefs.c:2188
-msgid "Sound Selection"
-msgstr "Geluid selecteren"
-
-#: src/gtkprefs.c:2295
-msgid "Play"
-msgstr "Afspelen"
-
-#: src/gtkprefs.c:2302
-msgid "Event"
-msgstr "Gebeurtenis"
-
-#: src/gtkprefs.c:2321
-msgid "Test"
-msgstr "Test"
-
-#: src/gtkprefs.c:2325
-msgid "Reset"
-msgstr "Wissen"
-
-#: src/gtkprefs.c:2329
-msgid "Choose..."
-msgstr "Bladeren..."
-
-#: src/gtkprefs.c:2464
+#: src/gtkprefs.c:2375
 msgid "_Edit"
 msgstr "_Bewerken"
 
-#: src/gtkprefs.c:2500
+#: src/gtkprefs.c:2411
 msgid "Interface"
 msgstr "Interface"
 
-#: src/gtkprefs.c:2501
+#: src/gtkprefs.c:2414
+msgid "Message Text"
+msgstr "Berichttekst"
+
+#: src/gtkprefs.c:2415
+msgid "Shortcuts"
+msgstr "Sneltoetsen"
+
+#: src/gtkprefs.c:2416
 msgid "Smiley Themes"
 msgstr "Smiley-thema's"
 
-#: src/gtkprefs.c:2502
-msgid "Fonts"
-msgstr "Lettertypes"
-
-#: src/gtkprefs.c:2503
-msgid "Message Text"
-msgstr "Berichttekst"
-
-#: src/gtkprefs.c:2504
-msgid "Shortcuts"
-msgstr "Sneltoetsen"
-
-#: src/gtkprefs.c:2507
-msgid "IMs"
-msgstr "Berichten"
-
-#: src/gtkprefs.c:2509
+#: src/gtkprefs.c:2417
+msgid "Sounds"
+msgstr "Geluiden"
+
+#: src/gtkprefs.c:2418
 msgid "Network"
 msgstr "Netwerk"
 
-#: src/gtkprefs.c:2510
-msgid "Proxy"
-msgstr "Proxy"
-
 #. We use the registered default browser in windows
-#: src/gtkprefs.c:2513
+#: src/gtkprefs.c:2421
 msgid "Browser"
 msgstr "Browser"
 
-#: src/gtkprefs.c:2515
+#: src/gtkprefs.c:2423
 msgid "Logging"
 msgstr "Logboek"
 
-#: src/gtkprefs.c:2516
-msgid "Sounds"
-msgstr "Geluiden"
-
-#: src/gtkprefs.c:2517
-msgid "Sound Events"
-msgstr "Geluidsgebeurtenissen"
-
-#: src/gtkprefs.c:2518
+#: src/gtkprefs.c:2424
 msgid "Away / Idle"
 msgstr "Afwezig"
 
-#: src/gtkprefs.c:2519
+#: src/gtkprefs.c:2425
 msgid "Away Messages"
 msgstr "Afwezigheid"
 
-#: src/gtkprefs.c:2522
-msgid "Protocols"
-msgstr "Protocollen"
-
-#: src/gtkprefs.c:2523
+#: src/gtkprefs.c:2428
 msgid "Plugins"
 msgstr "Plugins"
 
@@ -4144,64 +4271,63 @@
 msgid "Block only the users below"
 msgstr "Alleen onderstaande gebruikers blokkeren"
 
-#: src/gtkprivacy.c:374 src/protocols/jabber/jabber.c:1272
+#: src/gtkprivacy.c:385 src/protocols/jabber/jabber.c:1449
 msgid "Privacy"
 msgstr "Privacy"
 
-#: src/gtkprivacy.c:389
+#: src/gtkprivacy.c:400
 msgid "Changes to privacy settings take effect immediately."
 msgstr "Veranderingen aan privacy-instellingen worden direct actief."
 
 #. "Set privacy for:" label
-#: src/gtkprivacy.c:401
+#: src/gtkprivacy.c:412
 msgid "Set privacy for:"
 msgstr "Privacy instellen voor:"
 
-#: src/gtkprivacy.c:569 src/gtkprivacy.c:585
+#: src/gtkprivacy.c:581 src/gtkprivacy.c:597
 msgid "Permit User"
 msgstr "Gebruiker toestaan"
 
-#: src/gtkprivacy.c:570
+#: src/gtkprivacy.c:582
 msgid "Type a user you permit to contact you."
 msgstr "Geef een gebruiker die contact met u mag leggen."
 
-#: src/gtkprivacy.c:571
+#: src/gtkprivacy.c:583
 msgid "Please enter the name of the user you wish to be able to contact you."
-msgstr ""
-"Geef alstublieft de naam van de gebruiker die contact met u mag leggen."
-
-#: src/gtkprivacy.c:574 src/gtkprivacy.c:587
+msgstr "Geef alstublieft de naam van de gebruiker die contact met u mag leggen."
+
+#: src/gtkprivacy.c:586 src/gtkprivacy.c:599
 msgid "Permit"
 msgstr "Toestaan"
 
-#: src/gtkprivacy.c:579
+#: src/gtkprivacy.c:591
 #, c-format
 msgid "Allow %s to contact you?"
 msgstr "%s toestaan contact met u te leggen?"
 
-#: src/gtkprivacy.c:581
+#: src/gtkprivacy.c:593
 #, c-format
 msgid "Are you sure you wish to allow %s to contact you?"
 msgstr "Weet u zeker dat u %s toestemming wilt geven?"
 
-#: src/gtkprivacy.c:608 src/gtkprivacy.c:621
+#: src/gtkprivacy.c:620 src/gtkprivacy.c:633
 msgid "Block User"
 msgstr "Gebruiker blokkeren"
 
-#: src/gtkprivacy.c:609
+#: src/gtkprivacy.c:621
 msgid "Type a user to block."
-msgstr "Geef een gebruiker die geblokeerd moet worden."
-
-#: src/gtkprivacy.c:610
+msgstr "Geef een gebruiker die geblokkeerd moet worden."
+
+#: src/gtkprivacy.c:622
 msgid "Please enter the name of the user you wish to block."
 msgstr "Geef alstublieft de naam van de gebruiker die u wilt blokkeren."
 
-#: src/gtkprivacy.c:617
+#: src/gtkprivacy.c:629
 #, c-format
 msgid "Block %s?"
 msgstr "%s blokkeren?"
 
-#: src/gtkprivacy.c:619
+#: src/gtkprivacy.c:631
 #, c-format
 msgid "Are you sure you want to block %s?"
 msgstr "Weet u zeker dat u %s wilt blokkeren?"
@@ -4209,38 +4335,51 @@
 #. *
 #. * A wrapper for gaim_request_action() that uses Yes and No buttons.
 #.
-#: src/gtkrequest.c:233 src/protocols/gg/gg.c:663
-#: src/protocols/novell/novell.c:1317 src/request.h:1231
+#: src/gtkrequest.c:240 src/protocols/gg/gg.c:949
+#: src/protocols/novell/novell.c:1845 src/protocols/silc/buddy.c:307
+#: src/protocols/silc/pk.c:116 src/request.h:1234
 msgid "Yes"
 msgstr "Ja"
 
-#: src/gtkrequest.c:234 src/protocols/gg/gg.c:663
-#: src/protocols/novell/novell.c:1318 src/request.h:1231
+#: src/gtkrequest.c:241 src/protocols/gg/gg.c:949
+#: src/protocols/novell/novell.c:1846 src/protocols/silc/buddy.c:308
+#: src/protocols/silc/pk.c:117 src/request.h:1234
 msgid "No"
 msgstr "Nee"
 
-#: src/gtkrequest.c:237
+#: src/gtkrequest.c:244
 msgid "Apply"
 msgstr "Toepassen"
 
-#: src/gtkrequest.c:238 src/protocols/msn/msn.c:261
+#: src/gtkrequest.c:245 src/protocols/msn/msn.c:314
+#: src/protocols/silc/util.c:332
 msgid "Close"
 msgstr "Sluiten"
 
-#: src/gtkroomlist.c:322
-msgid ""
-"You are not currently signed on with any protocols that have the ability to "
-"list rooms."
-msgstr ""
-"U bent op het moment niet aangemeld met een protocol die lijsten van ruimtes "
-"kan weergeven."
-
-#: src/gtkroomlist.c:335
+#: src/gtkrequest.c:1391
+msgid "That file already exists"
+msgstr "Dat bestand bestaat al."
+
+#: src/gtkrequest.c:1392
+msgid "Would you like to overwrite it?"
+msgstr "Wilt u het overschrijven?"
+
+#: src/gtkrequest.c:1430 src/gtkrequest.c:1451
+#, fuzzy
+msgid "Save File..."
+msgstr "Opslaan als..."
+
+#: src/gtkrequest.c:1431 src/gtkrequest.c:1452
+#, fuzzy
+msgid "Open File..."
+msgstr "Openen..."
+
+#: src/gtkroomlist.c:330
 msgid "Room List"
 msgstr "Lijst van ruimtes"
 
 #. list button
-#: src/gtkroomlist.c:410
+#: src/gtkroomlist.c:402
 msgid "_Get List"
 msgstr "_Lijst ophalen"
 
@@ -4284,12 +4423,12 @@
 msgid "Someone says your name in chat"
 msgstr "Iemand zegt uw naam in de chatruimte"
 
-#: src/gtksound.c:158
+#: src/gtksound.c:157
 #, c-format
 msgid "Unable to play sound because the chosen file (%s) does not exist."
 msgstr "Kan geluid niet afspelen omdat het bestand (%s) niet bestaat."
 
-#: src/gtksound.c:174
+#: src/gtksound.c:173
 msgid ""
 "Unable to play sound because the 'Command' sound method has been chosen, but "
 "no command has been set."
@@ -4297,7 +4436,7 @@
 "Kan geluid niet afspelen omdat de Geluidsmethode 'Opdracht' is gekozen, "
 "zonder een correcte opdracht te geven."
 
-#: src/gtksound.c:186
+#: src/gtksound.c:185
 #, c-format
 msgid ""
 "Unable to play sound because the configured sound command could not be "
@@ -4306,23 +4445,15 @@
 "Kan geluid niet afspelen omdat de ingestelde opdracht niet gestart kan "
 "worden: %s"
 
-#: src/gtkutils.c:133
-msgid "Can't save icon file to disk."
-msgstr "Kan contactplaatje niet opslaan op schijf"
-
-#: src/gtkutils.c:168
-msgid "Save Icon"
-msgstr "Plaatje opslaan"
-
 #: src/log.c:106
 msgid "<b><font color=\"red\">The logger has no read function</font></b>"
 msgstr "<b><font color=\"red\">De logger heeft geen leesfunctie</font></b>"
 
-#: src/log.c:476
+#: src/log.c:489
 msgid "XML"
 msgstr "XML"
 
-#: src/log.c:561
+#: src/log.c:574
 #, c-format
 msgid ""
 "<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
@@ -4331,7 +4462,7 @@
 "<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
 "ANTWOORD&gt;:</b></font> %s<br/>\n"
 
-#: src/log.c:563
+#: src/log.c:576
 #, c-format
 msgid ""
 "<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
@@ -4340,50 +4471,55 @@
 "<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
 "ANTWOORD&gt;:</b></font> %s<br/>\n"
 
-#: src/log.c:614 src/log.c:800
+#: src/log.c:627 src/log.c:814
 msgid "<font color=\"red\"><b>Unable to find log path!</b></font>"
 msgstr "<font color=\"red\"><b>Kan pad naar logboek niet vinden!</b></font>"
 
-#: src/log.c:624 src/log.c:812
+#: src/log.c:637 src/log.c:826
 #, c-format
 msgid "<font color=\"red\"><b>Could not read file: %s</b></font>"
 msgstr "<font color=\"red\"><b>Kan bestand niet lezen: %s</b></font>"
 
-#: src/log.c:661
+#: src/log.c:674
 msgid "HTML"
 msgstr "HTML"
 
-#: src/log.c:745
+#: src/log.c:759
 #, c-format
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr "(%s) %s <AUTO-ANTWOORD>: %s\n"
 
-#: src/log.c:845
+#: src/log.c:859
 msgid "Plain text"
 msgstr "Tekst"
 
-#: src/main.c:155
+#: src/main.c:153
 msgid "Please create an account."
 msgstr "Maak een account aan."
 
-#: src/main.c:237
+#: src/main.c:235
 msgid "Login"
 msgstr "Aanmelden"
 
-#: src/main.c:255
-msgid "<b>Screen Name:</b>"
-msgstr "<b>Gebruikersnaam:</b>"
-
-#: src/main.c:269
-msgid "<b>Password:</b>"
-msgstr "<b>Wachtwoord: </b>"
-
-#: src/main.c:298
-msgid "Sign on"
-msgstr "Aanmelden"
+#: src/main.c:253
+msgid "<b>_Account:</b>"
+msgstr "<b>_Account:</b>"
+
+#: src/main.c:267
+msgid "<b>_Password:</b>"
+msgstr "<b>_Wachtwoord: </b>"
+
+#. And now for the buttons
+#: src/main.c:284
+msgid "_Accounts"
+msgstr "_Accounts"
+
+#: src/main.c:290
+msgid "_Preferences"
+msgstr "_Voorkeuren"
 
 #. full help text
-#: src/main.c:522
+#: src/main.c:520
 #, c-format
 msgid ""
 "Gaim %s\n"
@@ -4417,12 +4553,12 @@
 "  -h, --help          deze hulptekst weergeven en afsluiten\n"
 
 #. short message
-#: src/main.c:537
+#: src/main.c:535
 #, c-format
 msgid "Gaim %s. Try `%s -h' for more information.\n"
 msgstr "Gaim %s. Probeer '%s -h' voor meer informatie.\n"
 
-#: src/plugin.c:277
+#: src/plugin.c:286
 #, c-format
 msgid ""
 "The required plugin %s was not found. Please install this plugin and try "
@@ -4431,11 +4567,11 @@
 "De vereiste plugin %s is niet gevonden. Installeer de plugin en probeer "
 "opnieuw."
 
-#: src/plugin.c:282 src/plugin.c:310
+#: src/plugin.c:291 src/plugin.c:319
 msgid "Gaim was unable to load your plugin."
 msgstr "Gaim kan de plugin niet laden."
 
-#: src/plugin.c:306
+#: src/plugin.c:315
 #, c-format
 msgid "The required plugin %s was unable to load."
 msgstr "De vereiste plugin %s kan niet geladen worden."
@@ -4445,12 +4581,12 @@
 msgstr "Iets minder saaie standaardtekst"
 
 #: src/protocols/gg/gg.c:49 src/protocols/jabber/jutil.c:44
-#: src/protocols/msn/msn.c:360 src/protocols/msn/state.c:27
-#: src/protocols/msn/state.c:28 src/protocols/msn/state.c:35
-#: src/protocols/msn/state.c:36 src/protocols/novell/novell.c:2144
-#: src/protocols/novell/novell.c:2261 src/protocols/novell/novell.c:2312
-#: src/protocols/oscar/oscar.c:603 src/protocols/yahoo/yahoo.c:2599
-#: src/protocols/yahoo/yahoo.c:2714
+#: src/protocols/msn/msn.c:462 src/protocols/msn/state.c:29
+#: src/protocols/msn/state.c:30 src/protocols/msn/state.c:37
+#: src/protocols/msn/state.c:38 src/protocols/novell/novell.c:2721
+#: src/protocols/novell/novell.c:2840 src/protocols/novell/novell.c:2891
+#: src/protocols/oscar/oscar.c:616 src/protocols/yahoo/yahoo.c:2851
+#: src/protocols/yahoo/yahoo.c:2967
 msgid "Available"
 msgstr "Beschikbaar"
 
@@ -4462,12 +4598,12 @@
 msgid "Away for friends only"
 msgstr "Alleen afwezig voor vrienden"
 
-#: src/protocols/gg/gg.c:53 src/protocols/jabber/jabber.c:956
-#: src/protocols/jabber/presence.c:126 src/protocols/oscar/oscar.c:524
-#: src/protocols/oscar/oscar.c:4738 src/protocols/oscar/oscar.c:4816
-#: src/protocols/oscar/oscar.c:4840 src/protocols/oscar/oscar.c:6431
-#: src/protocols/oscar/oscar.c:6436 src/protocols/yahoo/yahoo.c:2293
-#: src/protocols/yahoo/yahoo.c:2619 src/protocols/yahoo/yahoo.c:2724
+#: src/protocols/gg/gg.c:53 src/protocols/jabber/jabber.c:964
+#: src/protocols/jabber/presence.c:126 src/protocols/oscar/oscar.c:536
+#: src/protocols/oscar/oscar.c:5394 src/protocols/oscar/oscar.c:5472
+#: src/protocols/oscar/oscar.c:5496 src/protocols/oscar/oscar.c:6684
+#: src/protocols/oscar/oscar.c:6689 src/protocols/yahoo/yahoo.c:2509
+#: src/protocols/yahoo/yahoo.c:2871 src/protocols/yahoo/yahoo.c:2979
 msgid "Invisible"
 msgstr "Onzichtbaar"
 
@@ -4483,14 +4619,14 @@
 msgid "Unable to resolve hostname."
 msgstr "Kan computernaam niet opzoeken."
 
-#: src/protocols/gg/gg.c:139 src/protocols/novell/novell.c:1159
+#: src/protocols/gg/gg.c:139 src/protocols/novell/novell.c:1665
 msgid "Unable to connect to server."
 msgstr "Kan geen verbinding maken met de computer."
 
 #: src/protocols/gg/gg.c:142 src/protocols/jabber/auth.c:130
 #: src/protocols/jabber/auth.c:204 src/protocols/jabber/auth.c:354
 #: src/protocols/jabber/auth.c:452 src/protocols/jabber/auth.c:464
-#: src/protocols/jabber/jabber.c:104
+#: src/protocols/jabber/jabber.c:106
 msgid "Invalid response from server."
 msgstr "Ongeldig antwoord van server"
 
@@ -4510,173 +4646,177 @@
 msgid "Unknown Error Code."
 msgstr "Onbekende Foutcode."
 
-#: src/protocols/gg/gg.c:259
+#: src/protocols/gg/gg.c:242 src/protocols/oscar/oscar.c:3819
+#, c-format
+msgid "<B>UIN:</B> %s<BR><B>Status:</B> %s<HR>%s"
+msgstr "<B>UIN:</B> %s<BR><B>Status:</B> %s<HR>%s"
+
+#. res[0] == username
+#: src/protocols/gg/gg.c:243 src/protocols/gg/gg.c:1011
+#: src/protocols/napster/napster.c:393 src/protocols/oscar/oscar.c:3823
+#: src/protocols/oscar/oscar.c:4039 src/protocols/silc/ops.c:1067
+#: src/protocols/silc/ops.c:1128 src/protocols/toc/toc.c:468
+#: src/protocols/zephyr/zephyr.c:635
+msgid "Buddy Information"
+msgstr "Contactinformatie"
+
+#: src/protocols/gg/gg.c:293
 #, c-format
 msgid "Status: %s"
 msgstr "Status: %s"
 
-#: src/protocols/gg/gg.c:280
+#: src/protocols/gg/gg.c:446
 msgid "Could not connect"
 msgstr "Kon geen verbinding maken"
 
-#: src/protocols/gg/gg.c:287
+#: src/protocols/gg/gg.c:453
 msgid "Unable to read socket"
 msgstr "Kan niet lezen van socket."
 
 #. we didn't successfully connect. tdt->toc_fd is valid here
-#: src/protocols/gg/gg.c:402 src/protocols/icq/gaim_icq.c:344
-#: src/protocols/msn/dispatch.c:208 src/protocols/msn/msn.c:514
-#: src/protocols/msn/servconn.c:77 src/protocols/napster/napster.c:475
-#: src/protocols/napster/napster.c:506 src/protocols/toc/toc.c:200
-#: src/protocols/yahoo/yahoo.c:1958 src/protocols/yahoo/yahoo.c:1989
-#: src/protocols/yahoo/yahoo.c:2052 src/protocols/yahoo/yahoo_filexfer.c:68
-#: src/protocols/yahoo/yahoo_filexfer.c:139
+#: src/protocols/gg/gg.c:674 src/protocols/icq/gaim_icq.c:344
+#: src/protocols/napster/napster.c:475 src/protocols/napster/napster.c:506
+#: src/protocols/toc/toc.c:170 src/protocols/yahoo/yahoo.c:2156
+#: src/protocols/yahoo/yahoo.c:2185 src/protocols/yahoo/yahoo.c:2248
+#: src/protocols/yahoo/yahoo_filexfer.c:68
+#: src/protocols/yahoo/yahoo_filexfer.c:109
 msgid "Unable to connect."
 msgstr "Kan geen verbinding maken."
 
-#: src/protocols/gg/gg.c:418
+#: src/protocols/gg/gg.c:690
 msgid "Reading data"
 msgstr "Data wordt gelezen"
 
-#: src/protocols/gg/gg.c:421
+#: src/protocols/gg/gg.c:693
 msgid "Balancer handshake"
 msgstr "Balancer handshake"
 
-#: src/protocols/gg/gg.c:424
+#: src/protocols/gg/gg.c:696
 msgid "Reading server key"
 msgstr "Serversleutel wordt gelezen"
 
-#: src/protocols/gg/gg.c:427
+#: src/protocols/gg/gg.c:699
 msgid "Exchanging key hash"
 msgstr "Sleutelhash wordt uitgewisseld"
 
-#: src/protocols/gg/gg.c:437
+#: src/protocols/gg/gg.c:709
 msgid "Critical error in GG library\n"
 msgstr "Kritieke fout in GaduGadu bibliotheek\n"
 
-#: src/protocols/gg/gg.c:455 src/protocols/gg/gg.c:546
-#: src/protocols/toc/toc.c:176
+#: src/protocols/gg/gg.c:727 src/protocols/gg/gg.c:818
+#: src/protocols/toc/toc.c:146
 #, c-format
 msgid "Connect to %s failed"
 msgstr "Verbinding met %s verbroken"
 
-#: src/protocols/gg/gg.c:503
+#: src/protocols/gg/gg.c:775
 msgid "Unable to ping server"
 msgstr "Kan server niet pingen"
 
-#: src/protocols/gg/gg.c:515
+#: src/protocols/gg/gg.c:787
 msgid "Send as message"
 msgstr "Verstuur als bericht"
 
-#: src/protocols/gg/gg.c:520
+#: src/protocols/gg/gg.c:792
 msgid "Looking up GG server"
 msgstr "GG-server wordt opgezocht"
 
-#: src/protocols/gg/gg.c:523
+#: src/protocols/gg/gg.c:795
 msgid "Invalid Gadu-Gadu UIN specified"
 msgstr "Onjuiste Gadu-Gadu UIN opgegeven"
 
-#: src/protocols/gg/gg.c:570
+#: src/protocols/gg/gg.c:842
 msgid "You are trying to send a message to an invalid Gadu-Gadu UIN."
 msgstr "U probeert een bericht te verzenden naar een ongeldig GaduGadu UIN."
 
-#: src/protocols/gg/gg.c:632
+#: src/protocols/gg/gg.c:917
 msgid "Couldn't get search results"
 msgstr "Geen zoekresultaten gevonden"
 
-#: src/protocols/gg/gg.c:637
+#: src/protocols/gg/gg.c:922
 msgid "Gadu-Gadu Search Engine"
 msgstr "Gadu-Gadu Zoekmachine"
 
-#: src/protocols/gg/gg.c:662
+#: src/protocols/gg/gg.c:948
 msgid "Active"
 msgstr "Actief"
 
-#: src/protocols/gg/gg.c:667 src/protocols/oscar/oscar.c:4212
+#: src/protocols/gg/gg.c:953 src/protocols/oscar/oscar.c:4845
 msgid "UIN"
 msgstr "UIN"
 
 #. First Name
-#: src/protocols/gg/gg.c:671 src/protocols/jabber/jabber.c:606
-#: src/protocols/oscar/oscar.c:4223 src/protocols/trepia/trepia.c:267
+#: src/protocols/gg/gg.c:957 src/protocols/jabber/jabber.c:613
+#: src/protocols/oscar/oscar.c:4856 src/protocols/silc/ops.c:790
+#: src/protocols/trepia/trepia.c:267
 msgid "First Name"
 msgstr "Voornaam"
 
 #. Last Name
-#: src/protocols/gg/gg.c:676 src/protocols/jabber/jabber.c:611
-#: src/protocols/oscar/oscar.c:4224 src/protocols/trepia/trepia.c:274
+#: src/protocols/gg/gg.c:962 src/protocols/jabber/jabber.c:618
+#: src/protocols/oscar/oscar.c:4857 src/protocols/trepia/trepia.c:274
 msgid "Last Name"
 msgstr "Achternaam"
 
-#: src/protocols/gg/gg.c:680 src/protocols/gg/gg.c:1393
-#: src/protocols/irc/msgs.c:183 src/protocols/oscar/oscar.c:4213
+#: src/protocols/gg/gg.c:966 src/protocols/gg/gg.c:1707
+#: src/protocols/irc/msgs.c:183 src/protocols/oscar/oscar.c:4846
+#: src/protocols/silc/ops.c:1184
 msgid "Nick"
 msgstr "Bijnaam"
 
-#: src/protocols/gg/gg.c:687 src/protocols/gg/gg.c:690
+#: src/protocols/gg/gg.c:973 src/protocols/gg/gg.c:976
 msgid "Birth Year"
 msgstr "Geboortejaar"
 
-#: src/protocols/gg/gg.c:696 src/protocols/gg/gg.c:698
-#: src/protocols/gg/gg.c:700
+#: src/protocols/gg/gg.c:982 src/protocols/gg/gg.c:984
+#: src/protocols/gg/gg.c:986
 msgid "Sex"
 msgstr "Geslacht"
 
 #. City
-#: src/protocols/gg/gg.c:704 src/protocols/jabber/jabber.c:621
-#: src/protocols/oscar/oscar.c:4266 src/protocols/oscar/oscar.c:4274
+#: src/protocols/gg/gg.c:990 src/protocols/jabber/jabber.c:628
+#: src/protocols/oscar/oscar.c:4900 src/protocols/oscar/oscar.c:4908
 #: src/protocols/trepia/trepia.c:331 src/protocols/trepia/trepia.c:410
 msgid "City"
 msgstr "Stad"
 
-#. res[0] == username
-#. show it to the user
-#: src/protocols/gg/gg.c:725 src/protocols/msn/msn.c:1331
-#: src/protocols/msn/msn.c:1575 src/protocols/napster/napster.c:393
-#: src/protocols/oscar/oscar.c:3190 src/protocols/oscar/oscar.c:3406
-#: src/protocols/toc/toc.c:498 src/protocols/yahoo/yahoo.c:2898
-#: src/protocols/yahoo/yahoo.c:2920 src/protocols/yahoo/yahoo.c:2943
-#: src/protocols/yahoo/yahoo.c:3101 src/protocols/zephyr/zephyr.c:567
-msgid "Buddy Information"
-msgstr "Contactinformatie"
-
-#: src/protocols/gg/gg.c:744
+#: src/protocols/gg/gg.c:1033
 msgid "There is no Buddy List stored on the Gadu-Gadu server."
 msgstr "Er is geen contactenlijst opgeslagen op de GaduGadu-server."
 
-#: src/protocols/gg/gg.c:752
+#: src/protocols/gg/gg.c:1041
 msgid "Couldn't Import Buddy List from Server"
 msgstr "Kon de contactenlijst niet importeren van de server"
 
-#: src/protocols/gg/gg.c:815
+#: src/protocols/gg/gg.c:1103
 msgid "Buddy List successfully transferred to Gadu-Gadu server"
 msgstr "Contactenlijst is naar de GaduGadu-server gestuurd"
 
-#: src/protocols/gg/gg.c:823
+#: src/protocols/gg/gg.c:1111
 msgid "Couldn't transfer Buddy List to Gadu-Gadu server"
 msgstr "Kon de contactenlijst niet versturen naar de GaduGadu-server"
 
-#: src/protocols/gg/gg.c:831
+#: src/protocols/gg/gg.c:1119
 msgid "Buddy List successfully deleted from Gadu-Gadu server"
 msgstr "Contactenlijst is verwijderd van de GaduGadu-server"
 
-#: src/protocols/gg/gg.c:839
+#: src/protocols/gg/gg.c:1127
 msgid "Couldn't delete Buddy List from Gadu-Gadu server"
 msgstr "Kon de contactenlijst niet verwijderen van de GaduGadu-server"
 
-#: src/protocols/gg/gg.c:847
+#: src/protocols/gg/gg.c:1136
 msgid "Password changed successfully"
 msgstr "Wachtwoord veranderen gelukt"
 
-#: src/protocols/gg/gg.c:854
+#: src/protocols/gg/gg.c:1143
 msgid "Password couldn't be changed"
 msgstr "Wachtwoord kon niet veranderd worden"
 
-#: src/protocols/gg/gg.c:971
+#: src/protocols/gg/gg.c:1262
 msgid "Error communicating with Gadu-Gadu server"
 msgstr "Fout opgetreden bij communicatie met de GaduGadu-server"
 
-#: src/protocols/gg/gg.c:972
+#: src/protocols/gg/gg.c:1263
 msgid ""
 "Gaim was unable to complete your request due to a problem communicating with "
 "the Gadu-Gadu HTTP server.  Please try again later."
@@ -4684,11 +4824,11 @@
 "Gaim kon niet aan uw verzoek voldoen wegens een communicatieprobleem met de "
 "GaduGadu HTTP-server. Probeert u het later nogmaals."
 
-#: src/protocols/gg/gg.c:1000
+#: src/protocols/gg/gg.c:1292
 msgid "Unable to import Gadu-Gadu buddy list"
 msgstr "Kon de GaduGadu contactenlijst niet importeren"
 
-#: src/protocols/gg/gg.c:1001
+#: src/protocols/gg/gg.c:1293
 msgid ""
 "Gaim was unable to connect to the Gadu-Gadu buddy list server.  Please try "
 "again later."
@@ -4696,26 +4836,25 @@
 "Gaim kon geen verbinding maken met de GaduGadu contactenlijst-server. "
 "Probeert u het later nogmaals."
 
-#: src/protocols/gg/gg.c:1074
+#: src/protocols/gg/gg.c:1366
 msgid "Couldn't export buddy list"
 msgstr "Kan contactenlijst niet exporteren"
 
-#: src/protocols/gg/gg.c:1075 src/protocols/gg/gg.c:1098
-msgid ""
-"Gaim was unable to connect to the buddy list server.  Please try again later."
+#: src/protocols/gg/gg.c:1367 src/protocols/gg/gg.c:1390
+msgid "Gaim was unable to connect to the buddy list server.  Please try again later."
 msgstr ""
 "Gaim kon geen verbinding maken met de contactenlijst-server. Probeert u het "
 "later nogmaals."
 
-#: src/protocols/gg/gg.c:1097
+#: src/protocols/gg/gg.c:1389
 msgid "Unable to delete Gadu-Gadu buddy list"
 msgstr "Kan de GaduGadu contactenlijst niet verwijderen"
 
-#: src/protocols/gg/gg.c:1146
+#: src/protocols/gg/gg.c:1440
 msgid "Unable to access directory"
 msgstr "Kan adresboek niet benaderen"
 
-#: src/protocols/gg/gg.c:1147
+#: src/protocols/gg/gg.c:1441
 msgid ""
 "Gaim was unable to search the Directory because it was unable to connect to "
 "the directory server.  Please try again later."
@@ -4723,11 +4862,11 @@
 "Gaim kon niet zoeken in het adresboek omdat de adresboek-server onbereikbaar "
 "is. Probeert u het later nogmaals."
 
-#: src/protocols/gg/gg.c:1180
+#: src/protocols/gg/gg.c:1475
 msgid "Unable to change Gadu-Gadu password"
 msgstr "Kon GaduGadu-wachtwoord niet veranderen"
 
-#: src/protocols/gg/gg.c:1181
+#: src/protocols/gg/gg.c:1476
 msgid ""
 "Gaim was unable to change your password due to an error connecting to the "
 "Gadu-Gadu server.  Please try again later."
@@ -4735,32 +4874,33 @@
 "Gaim kon uw wachtwoord niet veranderen wegens een communicatieprobleem met "
 "de GaduGadu-server. Probeert u het later nogmaals."
 
-#: src/protocols/gg/gg.c:1198
+#: src/protocols/gg/gg.c:1492
 msgid "Directory Search"
 msgstr "Adresboek doorzoeken"
 
-#: src/protocols/gg/gg.c:1207 src/protocols/jabber/jabber.c:1055
-#: src/protocols/toc/toc.c:1546
+#. if (js->protocol_options & CHANGE_PASSWORD) {
+#: src/protocols/gg/gg.c:1497 src/protocols/jabber/jabber.c:1062
+#: src/protocols/toc/toc.c:1550
 msgid "Change Password"
 msgstr "Wachtwoord veranderen"
 
-#: src/protocols/gg/gg.c:1215
+#: src/protocols/gg/gg.c:1501
 msgid "Import Buddy List from Server"
 msgstr "Contactenlijst importeren van server"
 
-#: src/protocols/gg/gg.c:1221
+#: src/protocols/gg/gg.c:1505
 msgid "Export Buddy List to Server"
 msgstr "Contactenlijst exporteren naar server"
 
-#: src/protocols/gg/gg.c:1227
+#: src/protocols/gg/gg.c:1509
 msgid "Delete Buddy List from Server"
 msgstr "Contactenlijst verwijderen van server"
 
-#: src/protocols/gg/gg.c:1260
+#: src/protocols/gg/gg.c:1542
 msgid "Unable to access user profile."
 msgstr "Kan het gebruikersprofiel niet benaderen."
 
-#: src/protocols/gg/gg.c:1261
+#: src/protocols/gg/gg.c:1543
 msgid ""
 "Gaim was unable to access this user's profile due to an error connecting to "
 "the directory server.  Please try again later."
@@ -4779,7 +4919,7 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/gg/gg.c:1374 src/protocols/gg/gg.c:1376
+#: src/protocols/gg/gg.c:1686 src/protocols/gg/gg.c:1688
 msgid "Gadu-Gadu Protocol Plugin"
 msgstr "Gadu-Gadu-protocol plugin"
 
@@ -4792,17 +4932,15 @@
 msgid "The user %s (%s%s%s%s%s) wants you to authorize them."
 msgstr "De gebruiker %s (%s%s%s%s%s) wil dat u hem/haar toestemming geeft."
 
-#: src/protocols/icq/gaim_icq.c:297 src/protocols/jabber/presence.c:229
-#: src/protocols/msn/notification.c:588 src/protocols/msn/notification.c:909
-#: src/protocols/msn/notification.c:1076 src/protocols/oscar/oscar.c:2932
-#: src/protocols/oscar/oscar.c:5451
+#: src/protocols/icq/gaim_icq.c:297 src/protocols/jabber/presence.c:232
+#: src/protocols/msn/userlist.c:100 src/protocols/oscar/oscar.c:3554
+#: src/protocols/oscar/oscar.c:6117
 msgid "Authorize"
 msgstr "Toestemmen"
 
-#: src/protocols/icq/gaim_icq.c:297 src/protocols/jabber/presence.c:230
-#: src/protocols/msn/notification.c:589 src/protocols/msn/notification.c:911
-#: src/protocols/msn/notification.c:1078 src/protocols/oscar/oscar.c:2934
-#: src/protocols/oscar/oscar.c:5452
+#: src/protocols/icq/gaim_icq.c:297 src/protocols/jabber/presence.c:233
+#: src/protocols/msn/userlist.c:101 src/protocols/oscar/oscar.c:3556
+#: src/protocols/oscar/oscar.c:6118
 msgid "Deny"
 msgstr "Blokkeren"
 
@@ -4814,49 +4952,34 @@
 msgid "Connecting..."
 msgstr "Verbinding wordt gemaakt..."
 
-#: src/protocols/icq/gaim_icq.c:497
+#: src/protocols/icq/gaim_icq.c:498
 msgid "Nick:"
 msgstr "Bijnaam:"
 
-#: src/protocols/icq/gaim_icq.c:498
+#: src/protocols/icq/gaim_icq.c:499
 msgid "Gaim User"
 msgstr "Gaim gebruiker"
 
-#: src/protocols/irc/cmds.c:43
+#: src/protocols/irc/cmds.c:43 src/protocols/silc/silc.c:1286
 #, c-format
 msgid "Unknown command: %s"
 msgstr "Onbekende opdracht: %s"
 
-#: src/protocols/irc/cmds.c:137
-msgid ""
-"<B>Supported IRC Commands:</B><BR>AWAY INVITE JOIN KICK<BR>ME MODE MSG "
-"NAMES<BR>NICK OP DEOP OPERWALL<BR>PART PING QUERY QUIT<BR>QUOTE REMOVE TOPIC "
-"UMODE<BR>VOICE DEVOICE WALLOPS WHOIS<BR>"
-msgstr ""
-"<B>Ondersteunde IRC-opdrachten:</B><BR>AWAY INVITE JOIN KICK<BR>ME MODE MSG "
-"NAMES<BR>NICK OP DEOP OPERWALL<BR>PART PING QUERY QUIT<BR>QUOTE REMOVE TOPIC "
-"UMODE<BR>VOICE DEVOICE WALLOPS WHOIS<BR>"
-
-#: src/protocols/irc/cmds.c:146
-msgid ""
-"<B>Supported IRC Commands:</B><BR>AWAY JOIN ME MODE<BR>MSG NICK OPERWALL "
-"PING<BR>QUERY QUIT QUOTE UMODE<BR>WALLOPS WHOIS"
-msgstr ""
-"<B>Ondersteunde IRC-opdrachten:</B><BR>AWAY JOIN ME MODE<BR>MSG NICK "
-"OPERWALL PING<BR>QUERY QUIT QUOTE UMODE<BR>WALLOPS WHOIS"
-
-#: src/protocols/irc/cmds.c:469 src/protocols/jabber/chat.c:527
+#: src/protocols/irc/cmds.c:448 src/protocols/jabber/chat.c:544
+#: src/protocols/silc/silc.c:995
 #, c-format
 msgid "current topic is: %s"
 msgstr "huidige onderwerp is: %s"
 
-#: src/protocols/irc/cmds.c:472 src/protocols/jabber/chat.c:529
+#: src/protocols/irc/cmds.c:451 src/protocols/jabber/chat.c:546
+#: src/protocols/silc/silc.c:998
 msgid "No topic is set"
 msgstr "Geen onderwerp ingesteld"
 
-#: src/protocols/irc/dcc_send.c:272 src/protocols/yahoo/yahoo_filexfer.c:199
-#: src/protocols/yahoo/yahoo_filexfer.c:208
-#: src/protocols/yahoo/yahoo_filexfer.c:217
+#: src/protocols/irc/dcc_send.c:272 src/protocols/yahoo/yahoo_filexfer.c:169
+#: src/protocols/yahoo/yahoo_filexfer.c:179
+#: src/protocols/yahoo/yahoo_filexfer.c:188
+#: src/protocols/yahoo/yahoo_filexfer.c:198
 msgid "File Transfer Aborted"
 msgstr "Bestandsoverdracht afgebroken"
 
@@ -4864,63 +4987,68 @@
 msgid "Gaim could not open a listening port."
 msgstr "Gaim kon geen poort openen om te luisteren."
 
-#: src/protocols/irc/irc.c:73
+#: src/protocols/irc/irc.c:75
 msgid "Error displaying MOTD"
 msgstr "Fout bij weergeven van MOTD"
 
-#: src/protocols/irc/irc.c:73
+#: src/protocols/irc/irc.c:75
 msgid "No MOTD available"
 msgstr "Geen MOTD beschikbaar"
 
-#: src/protocols/irc/irc.c:74
+#: src/protocols/irc/irc.c:76
 msgid "There is no MOTD associated with this connection."
 msgstr "Er is geen MOTD geassocieerd met deze verbinding."
 
-#: src/protocols/irc/irc.c:77
+#: src/protocols/irc/irc.c:79
 #, c-format
 msgid "MOTD for %s"
 msgstr "MOTD voor %s"
 
-#: src/protocols/irc/irc.c:140
+#: src/protocols/irc/irc.c:93 src/protocols/irc/irc.c:373
+msgid "Server has disconnected"
+msgstr "Server heeft verbinding verbroken"
+
+#: src/protocols/irc/irc.c:147
 msgid "View MOTD"
 msgstr "MOTD weergeven"
 
-#: src/protocols/irc/irc.c:154 src/protocols/jabber/buddy.c:883
-#: src/protocols/oscar/oscar.c:440 src/protocols/oscar/oscar.c:6532
-#: src/protocols/yahoo/yahoo.c:2456
-msgid "Send File"
-msgstr "Bestanden Verzenden"
-
-#: src/protocols/irc/irc.c:168
+#: src/protocols/irc/irc.c:169 src/protocols/silc/chat.c:32
 msgid "_Channel:"
 msgstr "_Ruimte:"
 
-#: src/protocols/irc/irc.c:173 src/protocols/jabber/chat.c:59
+#: src/protocols/irc/irc.c:174 src/protocols/jabber/chat.c:59
 msgid "_Password:"
 msgstr "_Wachtwoord:"
 
-#: src/protocols/irc/irc.c:193
+#: src/protocols/irc/irc.c:194
 msgid "IRC nicks may not contain whitespace"
 msgstr "IRC-bijnamen mogen geen spaties bevatten"
 
-#: src/protocols/irc/irc.c:212 src/protocols/toc/toc.c:228
+#: src/protocols/irc/irc.c:213 src/protocols/toc/toc.c:198
 #, c-format
 msgid "Signon: %s"
 msgstr "Aanmelding: %s"
 
-#: src/protocols/irc/irc.c:221
+#: src/protocols/irc/irc.c:222
 msgid "Couldn't create socket"
 msgstr "Kan geen socket aanmaken"
 
+#: src/protocols/irc/irc.c:237 src/protocols/jabber/jabber.c:297
+#: src/protocols/oscar/oscar.c:1529 src/protocols/oscar/oscar.c:1593
+msgid "Couldn't connect to host"
+msgstr "Kan geen verbinding maken met host"
+
 #: src/protocols/irc/irc.c:370 src/protocols/trepia/trepia.c:926
 msgid "Read error"
 msgstr "Leesfout"
 
-#: src/protocols/irc/irc.c:504 src/protocols/yahoo/yahoochat.c:1343
+#: src/protocols/irc/irc.c:521 src/protocols/silc/chat.c:1363
+#: src/protocols/yahoo/yahoochat.c:1380
 msgid "Users"
 msgstr "Gebruikers"
 
-#: src/protocols/irc/irc.c:507 src/protocols/yahoo/yahoochat.c:1352
+#: src/protocols/irc/irc.c:524 src/protocols/silc/chat.c:1366
+#: src/protocols/silc/ops.c:1146 src/protocols/yahoo/yahoochat.c:1389
 msgid "Topic"
 msgstr "Onderwerp"
 
@@ -4933,32 +5061,35 @@
 #. *< id
 #. *< name
 #. *< version
-#: src/protocols/irc/irc.c:613
+#: src/protocols/irc/irc.c:628
 msgid "IRC Protocol Plugin"
 msgstr "IRC-protocol plugin"
 
 #. *  summary
-#: src/protocols/irc/irc.c:614
+#: src/protocols/irc/irc.c:629
 msgid "The IRC Protocol Plugin that Sucks Less"
 msgstr "De IRC-protocol plugin die minder zuigt"
 
-#: src/protocols/irc/irc.c:631 src/protocols/irc/msgs.c:197
-#: src/protocols/jabber/jabber.c:1383 src/protocols/napster/napster.c:658
+#: src/protocols/irc/irc.c:648 src/protocols/irc/msgs.c:197
+#: src/protocols/jabber/jabber.c:1559 src/protocols/napster/napster.c:644
+#: src/protocols/silc/ops.c:1008 src/protocols/silc/ops.c:1110
 msgid "Server"
 msgstr "Server"
 
-#: src/protocols/irc/irc.c:634 src/protocols/jabber/jabber.c:1404
-#: src/protocols/msn/msn.c:1742 src/protocols/napster/napster.c:663
-#: src/protocols/trepia/trepia.c:1307
+#: src/protocols/irc/irc.c:651 src/protocols/jabber/jabber.c:1580
+#: src/protocols/msn/msn.c:1758 src/protocols/napster/napster.c:649
+#: src/protocols/silc/silc.c:1576 src/protocols/trepia/trepia.c:1297
 msgid "Port"
 msgstr "Poort"
 
-#: src/protocols/irc/irc.c:637 src/protocols/zephyr/zephyr.c:1401
+#: src/protocols/irc/irc.c:654 src/protocols/zephyr/zephyr.c:1915
 msgid "Encoding"
 msgstr "Codering"
 
-#: src/protocols/irc/irc.c:640 src/protocols/irc/msgs.c:191
-#: src/protocols/jabber/jabber.c:581
+#: src/protocols/irc/irc.c:657 src/protocols/irc/msgs.c:191
+#: src/protocols/jabber/jabber.c:588 src/protocols/silc/buddy.c:1445
+#: src/protocols/silc/ops.c:955 src/protocols/silc/ops.c:957
+#: src/protocols/silc/ops.c:1104 src/protocols/silc/ops.c:1106
 msgid "Username"
 msgstr "Gebruikersnaam"
 
@@ -4983,11 +5114,12 @@
 msgid " <i>(identified)</i>"
 msgstr " <i>(geïdentificeerd)</i>"
 
-#: src/protocols/irc/msgs.c:192 src/protocols/yahoo/yahoo.c:3001
+#: src/protocols/irc/msgs.c:192 src/protocols/silc/ops.c:949
+#: src/protocols/silc/ops.c:1098 src/protocols/yahoo/yahoo_profile.c:1005
 msgid "Realname"
 msgstr "Echte naam"
 
-#: src/protocols/irc/msgs.c:202
+#: src/protocols/irc/msgs.c:202 src/protocols/silc/ops.c:1021
 msgid "Currently on"
 msgstr "Nu aanwezig"
 
@@ -5009,112 +5141,300 @@
 msgid "Buddy Information for %s"
 msgstr "Contact-info voor %s"
 
-#: src/protocols/irc/msgs.c:278
+#: src/protocols/irc/msgs.c:279
 #, c-format
 msgid "%s has changed the topic to: %s"
 msgstr "%s heeft het onderwerp veranderd naar: %s"
 
-#: src/protocols/irc/msgs.c:283
+#: src/protocols/irc/msgs.c:284
 #, c-format
 msgid "The topic for %s is: %s"
 msgstr "Het onderwerp voor %s is %s"
 
-#: src/protocols/irc/msgs.c:299
+#: src/protocols/irc/msgs.c:301
 #, c-format
 msgid "Unknown message '%s'"
 msgstr "Onbekend bericht '%s'"
 
-#: src/protocols/irc/msgs.c:300
+#: src/protocols/irc/msgs.c:302
 msgid "Unknown message"
 msgstr "Onbekend bericht"
 
-#: src/protocols/irc/msgs.c:300
+#: src/protocols/irc/msgs.c:302
 msgid "Gaim has sent a message the IRC server did not understand."
-msgstr ""
-"Gaim heeft een bericht verzonden wat niet begrepen wordt door de IRC-server."
-
-#: src/protocols/irc/msgs.c:403
+msgstr "Gaim heeft een bericht verzonden wat niet begrepen wordt door de IRC-server."
+
+#: src/protocols/irc/msgs.c:325
+#, c-format
+msgid "Users on %s: %s"
+msgstr "Gebruikers op %s: %s"
+
+#: src/protocols/irc/msgs.c:407
 msgid "No such channel"
 msgstr "Ruimte bestaat niet"
 
 #. does this happen?
-#: src/protocols/irc/msgs.c:414
+#: src/protocols/irc/msgs.c:418
 msgid "no such channel"
 msgstr "ruimte bestaat niet"
 
-#: src/protocols/irc/msgs.c:417
+#: src/protocols/irc/msgs.c:421
 msgid "User is not logged in"
 msgstr "Gebruiker is niet aangemeld"
 
-#: src/protocols/irc/msgs.c:422
+#: src/protocols/irc/msgs.c:426
 msgid "No such nick or channel"
 msgstr "Bijnaam/ruimte bestaat niet"
 
-#: src/protocols/irc/msgs.c:442
+#: src/protocols/irc/msgs.c:446
 msgid "Could not send"
 msgstr "Kan niet verzenden"
 
-#: src/protocols/irc/msgs.c:498
+#: src/protocols/irc/msgs.c:502
 #, c-format
 msgid "Joining %s requires an invitation."
 msgstr "Deelnemen aan %s vereist een uitnodiging."
 
-#: src/protocols/irc/msgs.c:499
+#: src/protocols/irc/msgs.c:503
 msgid "Invitation only"
 msgstr "Alleen op uitnodiging"
 
-#: src/protocols/irc/msgs.c:595
+#: src/protocols/irc/msgs.c:606
 #, c-format
 msgid "You have been kicked by %s: (%s)"
 msgstr "U bent uit weggeschopt door %s: (%s)"
 
-#: src/protocols/irc/msgs.c:600
+#: src/protocols/irc/msgs.c:611
 #, c-format
 msgid "Kicked by %s (%s)"
 msgstr "Weggeschopt door %s (%s)"
 
-#: src/protocols/irc/msgs.c:621
+#: src/protocols/irc/msgs.c:632
 #, c-format
 msgid "mode (%s %s) by %s"
 msgstr "modus (%s %s) door %s"
 
-#: src/protocols/irc/msgs.c:700
+#: src/protocols/irc/msgs.c:711
 msgid "Could not change nick"
 msgstr "Kan bijnaam niet veranderen"
 
-#: src/protocols/irc/msgs.c:701
+#: src/protocols/irc/msgs.c:712
 msgid "Cannot change nick"
 msgstr "Kan bijnaam niet veranderen"
 
-#: src/protocols/irc/msgs.c:722
+#: src/protocols/irc/msgs.c:733
 #, c-format
 msgid "You have parted the channel%s%s"
 msgstr "U heeft het kanaal%s%s verlaten"
 
-#: src/protocols/irc/msgs.c:762
+#: src/protocols/irc/msgs.c:773
 msgid "Error: invalid PONG from server"
 msgstr "Fout: ongeldige PONG van server"
 
-#: src/protocols/irc/msgs.c:764
+#: src/protocols/irc/msgs.c:775
 #, c-format
 msgid "PING reply -- Lag: %lu seconds"
 msgstr "PING-antwoord -- Vertraging %lu seconden"
 
-#: src/protocols/irc/msgs.c:839
+#: src/protocols/irc/msgs.c:850
 #, c-format
 msgid "Cannot join %s:"
 msgstr "Kan niet deelnemen aan %s:"
 
-#: src/protocols/irc/msgs.c:840
+#: src/protocols/irc/msgs.c:851 src/protocols/silc/ops.c:894
 msgid "Cannot join channel"
 msgstr "Kan niet deelnemen aan ruimte"
 
-#: src/protocols/irc/msgs.c:870
+#: src/protocols/irc/msgs.c:887
 #, c-format
 msgid "Wallops from %s"
 msgstr "Wallops van %s"
 
-#: src/protocols/irc/parse.c:165 src/protocols/zephyr/zephyr.c:199
+#: src/protocols/irc/parse.c:109
+msgid "action &lt;action to perform&gt;:  Perform an action."
+msgstr "action &lt;uit te voeren actie&gt;:  Een bepaalde actie uitvoeren."
+
+#: src/protocols/irc/parse.c:110
+msgid ""
+"away [message]:  Set an away message, or use no message to return from being "
+"away."
+msgstr ""
+"away [bericht]:  Een afwezigheidsbericht instellen, of afwezigheid "
+"uitschakelen door geen bericht te gebruiken."
+
+#: src/protocols/irc/parse.c:111
+msgid ""
+"deop &lt;nick1&gt; [nick2] ...:  Remove channel operator status from "
+"someone. You must be a channel operator to do this."
+msgstr ""
+"deop &lt;bijnaam1&gt; [bijnaam2] ...:  Operator-status uitschakelen van "
+"iemand. U moet wel zelf operator zijn hiervoor."
+
+#: src/protocols/irc/parse.c:112
+msgid ""
+"devoice &lt;nick1&gt; [nick2] ...:  Remove channel voice status from "
+"someone, preventing them from speaking if the channel is moderated (+m). You "
+"must be a channel operator to do this."
+msgstr ""
+"devoice &lt;bijnaam1&gt; [bijnaam2] ...:  Spreekstatus van iemand "
+"verwijderen, zodat deze niet meer kan praten in een gemodereerd kanaal (+m). "
+"U moet wel zelf operator zijn hiervoor."
+
+#: src/protocols/irc/parse.c:113
+msgid ""
+"invite &lt;nick&gt; [room]:  Invite someone to join you in the specified "
+"channel, or the current channel."
+msgstr ""
+"invite &lt;bijnaam&gt; [ruimte]:  Iemand uitnodigen in een bepaalde kanaal, "
+"of het huidige kanaal."
+
+#: src/protocols/irc/parse.c:114
+msgid ""
+"j &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  Enter one or more "
+"channels, optionally providing a channel key for each if needed."
+msgstr ""
+"j &lt;ruimte1&gt;[,ruimte2][,...] [ww1[,ww2][,...]]:  Een of meerdere "
+"ruimtes openen, met een optioneel wachtwoord indien noodzakelijk."
+
+#: src/protocols/irc/parse.c:115
+msgid ""
+"join &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  Enter one or more "
+"channels, optionally providing a channel key for each if needed."
+msgstr ""
+"j &lt;ruimte1&gt;[,ruimte2][,...] [ww1[,ww2][,...]]:  Een of meerdere "
+"ruimtes openen, met een optioneel wachtwoord indien noodzakelijk."
+
+#: src/protocols/irc/parse.c:116
+msgid ""
+"kick &lt;nick&gt; [message]:  Remove someone from a channel. You must be a "
+"channel operator to do this."
+msgstr ""
+"kick &lt;bijnaam&gt; [bericht]:  Iemand uit een ruimte schoppen. U moet wel "
+"zelf operator zijn hiervoor."
+
+#: src/protocols/irc/parse.c:117
+msgid ""
+"list:  Display a list of chat rooms on the network. <i>Warning, some servers "
+"may disconnect you upon doing this.</i>"
+msgstr ""
+"list:  Een lijst van alle beschikbare ruimtes weergeven. <i>Waarschuwing: "
+"sommige servers verbreken de verbinding als je dit doet.</i>"
+
+#: src/protocols/irc/parse.c:118
+msgid "me &lt;action to perform&gt;:  Perform an action."
+msgstr "me &lt;uit te voeren actie&gt;:  Een bepaalde actie uitvoeren."
+
+#: src/protocols/irc/parse.c:119
+msgid ""
+"mode &lt;nick|channel&gt; &lt;+|-&gt;&lt;A-Za-z&gt;:  Set or unset a channel "
+"or user mode."
+msgstr ""
+"mode &lt;bijnaam|ruimte&gt; &lt;+|-&gt;&lt;A-Za-z&gt;:  Kanaal- / "
+"gebruikersmodus aan of uitschakelen."
+
+#: src/protocols/irc/parse.c:120
+msgid ""
+"msg &lt;nick&gt; &lt;message&gt;:  Send a private message to a user (as "
+"opposed to a channel)."
+msgstr ""
+"msg &lt;bijnaam&gt; &lt;bericht&gt;:  Een privébericht sturen aan een "
+"gebruiker (in plaats van naar een ruimte)."
+
+#: src/protocols/irc/parse.c:121
+msgid "names [channel]:  List the users currently in a channel."
+msgstr "names [ruimte]:  De gebruikers in het kanaal opsommen."
+
+#: src/protocols/irc/parse.c:122 src/protocols/jabber/jabber.c:1407
+msgid "nick &lt;new nickname&gt;:  Change your nickname."
+msgstr "nick &lt;nieuwe bijnaam&gt;:  Uw eigen bijnaam veranderen."
+
+#: src/protocols/irc/parse.c:123
+msgid ""
+"op &lt;nick1&gt; [nick2] ...:  Grant channel operator status to someone. You "
+"must be a channel operator to do this."
+msgstr ""
+"op &lt;bijnaam1&gt; [bijnaam2] ...:  Iemand benoemen tot operator voor het "
+"huidige kanaal. U moet wel zelf operator zijn hiervoor."
+
+#: src/protocols/irc/parse.c:124
+msgid ""
+"operwall &lt;message&gt;:  If you don't know what this is, you probably "
+"can't use it."
+msgstr ""
+"operwall &lt;bericht&gt;:  Als je niet weet wat dit is, kun je het "
+"waarschijnlijk niet gebruiken."
+
+#: src/protocols/irc/parse.c:125
+msgid ""
+"part [room] [message]:  Leave the current channel, or a specified channel, "
+"with an optional message."
+msgstr ""
+"part [ruimte] [bericht]:  Huidige (of gegeven) kanaal verlaten met een "
+"optioneel afscheidsbericht."
+
+#: src/protocols/irc/parse.c:126
+msgid ""
+"ping [nick]:  Asks how much lag a user (or the server if no user specified) "
+"has."
+msgstr ""
+"ping [bijnaam]:  Vraagt de vertragingstijd op van een gebruiker (of de "
+"server als geen naam wordt gegeven)."
+
+#: src/protocols/irc/parse.c:127
+msgid ""
+"query &lt;nick&gt; &lt;message&gt;:  Send a private message to a user (as "
+"opposed to a channel)."
+msgstr ""
+"query &lt;bijnaam&gt; &lt;bericht&gt;:  Informatie opvragen van een "
+"gebruiker."
+
+#: src/protocols/irc/parse.c:128
+msgid "quit [message]:  Disconnect from the server, with an optional message."
+msgstr ""
+"quit [bericht]:  Verbinding met de server verbreken met een optioneel "
+"afscheidsbericht."
+
+#: src/protocols/irc/parse.c:129
+msgid "quote [...]:  Send a raw command to the server."
+msgstr "quote [...]:  Een opdracht direct naar de server sturen."
+
+#: src/protocols/irc/parse.c:130
+msgid ""
+"remove &lt;nick&gt; [message]:  Remove someone from a room. You must be a "
+"channel operator to do this."
+msgstr ""
+"remove &lt;bijnaam&gt; [bericht]:  Iemand uit een ruimte verwijderen. U moet "
+"wel zelf operator zijn hiervoor."
+
+#: src/protocols/irc/parse.c:131
+msgid "topic [new topic]:  View or change the channel topic."
+msgstr "topic [nieuw onderwerp]:  Onderwerp van het kanaal weergeven / veranderen."
+
+#: src/protocols/irc/parse.c:132
+msgid "umode &lt;+|-&gt;&lt;A-Za-z&gt;:  Set or unset a user mode."
+msgstr "umode &lt;+|-&gt;&lt;A-Za-z&gt;:  Een gebruikersmodus aan- of uitzetten."
+
+#: src/protocols/irc/parse.c:133
+msgid ""
+"voice &lt;nick1&gt; [nick2] ...:  Grant channel voice status to someone. You "
+"must be a channel operator to do this."
+msgstr ""
+"voice &lt;bijnaam1&gt; [bijnaam2] ...:  Iemand spreekstatus geven. U moet "
+"wel zelf operator zijn hiervoor."
+
+#: src/protocols/irc/parse.c:134
+msgid ""
+"wallops &lt;message&gt;:  If you don't know what this is, you probably can't "
+"use it."
+msgstr ""
+"wallops &lt;bericht&gt;:  Als u niet weet wat dit is, kunt u het "
+"waarschijnlijk niet gebruiken."
+
+#: src/protocols/irc/parse.c:135
+msgid "whois &lt;nick&gt;:  Get information on a user."
+msgstr "whois &lt;bijnaam&gt;:  Informatie over een gebruiker opvragen."
+
+#: src/protocols/irc/parse.c:228 src/protocols/zephyr/zephyr.c:256
 msgid ""
 "(There was an error converting this message.  Check the 'Encoding' option in "
 "the Account Editor)"
@@ -5122,22 +5442,22 @@
 "(Er is een fout opgetreden bij het converteren van het bericht. Controleer "
 "de optie 'Codering' in het account)"
 
-#: src/protocols/irc/parse.c:318
+#: src/protocols/irc/parse.c:382
 #, c-format
 msgid "Reply time from %s: %lu seconds"
 msgstr "Antwoord van %s na %lu seconden"
 
-#: src/protocols/irc/parse.c:319
+#: src/protocols/irc/parse.c:383
 msgid "PONG"
 msgstr "PONG"
 
-#: src/protocols/irc/parse.c:319
+#: src/protocols/irc/parse.c:383
 msgid "CTCP PING reply"
 msgstr "CTCP PING antwoord"
 
-#: src/protocols/irc/parse.c:421 src/protocols/oscar/oscar.c:777
-#: src/protocols/toc/toc.c:218 src/protocols/toc/toc.c:625
-#: src/protocols/toc/toc.c:641 src/protocols/toc/toc.c:709
+#: src/protocols/irc/parse.c:485 src/protocols/oscar/oscar.c:1430
+#: src/protocols/toc/toc.c:188 src/protocols/toc/toc.c:596
+#: src/protocols/toc/toc.c:612 src/protocols/toc/toc.c:689
 msgid "Disconnected."
 msgstr "Verbinding verbroken"
 
@@ -5172,90 +5492,96 @@
 msgid "Invalid challenge from server"
 msgstr "Ongeldige vraag van server"
 
-#: src/protocols/jabber/buddy.c:247 src/protocols/jabber/buddy.c:603
+#: src/protocols/jabber/buddy.c:246 src/protocols/jabber/buddy.c:604
+#: src/protocols/silc/ops.c:786
 msgid "Full Name"
 msgstr "Volledige naam"
 
-#: src/protocols/jabber/buddy.c:248 src/protocols/jabber/buddy.c:616
+#: src/protocols/jabber/buddy.c:247 src/protocols/jabber/buddy.c:617
+#: src/protocols/silc/ops.c:798
 msgid "Family Name"
 msgstr "Achternaam"
 
-#: src/protocols/jabber/buddy.c:249 src/protocols/jabber/buddy.c:620
+#: src/protocols/jabber/buddy.c:248 src/protocols/jabber/buddy.c:621
 msgid "Given Name"
 msgstr "Gegeven naam"
 
-#: src/protocols/jabber/buddy.c:250 src/protocols/jabber/buddy.c:635
-#: src/protocols/jabber/jabber.c:601 src/protocols/yahoo/yahoo.c:2997
+#: src/protocols/jabber/buddy.c:249 src/protocols/jabber/buddy.c:635
+#: src/protocols/jabber/jabber.c:608 src/protocols/msn/msn.c:1172
+#: src/protocols/silc/buddy.c:1442 src/protocols/silc/ops.c:802
+#: src/protocols/silc/ops.c:945 src/protocols/silc/ops.c:1094
+#: src/protocols/yahoo/yahoo_profile.c:1000
 msgid "Nickname"
 msgstr "Bijnaam"
 
-#: src/protocols/jabber/buddy.c:251 src/protocols/jabber/jabber.c:641
+#: src/protocols/jabber/buddy.c:250 src/protocols/jabber/jabber.c:648
 msgid "URL"
 msgstr "URL"
 
-#: src/protocols/jabber/buddy.c:252 src/protocols/jabber/buddy.c:663
+#: src/protocols/jabber/buddy.c:251 src/protocols/jabber/buddy.c:663
 msgid "Street Address"
 msgstr "Adres"
 
-#: src/protocols/jabber/buddy.c:253 src/protocols/jabber/buddy.c:659
+#: src/protocols/jabber/buddy.c:252 src/protocols/jabber/buddy.c:659
 msgid "Extended Address"
 msgstr "Adresbijvoeging"
 
-#: src/protocols/jabber/buddy.c:254 src/protocols/jabber/buddy.c:667
+#: src/protocols/jabber/buddy.c:253 src/protocols/jabber/buddy.c:667
 msgid "Locality"
 msgstr "Localiteit"
 
-#: src/protocols/jabber/buddy.c:255 src/protocols/jabber/buddy.c:671
+#: src/protocols/jabber/buddy.c:254 src/protocols/jabber/buddy.c:671
 msgid "Region"
 msgstr "Regio"
 
-#: src/protocols/jabber/buddy.c:256 src/protocols/jabber/buddy.c:675
-#: src/protocols/jabber/jabber.c:631
+#: src/protocols/jabber/buddy.c:255 src/protocols/jabber/buddy.c:675
+#: src/protocols/jabber/jabber.c:638
 msgid "Postal Code"
 msgstr "Postcode"
 
 #. Country
-#: src/protocols/jabber/buddy.c:257 src/protocols/jabber/buddy.c:680
+#: src/protocols/jabber/buddy.c:256 src/protocols/jabber/buddy.c:680
 #: src/protocols/trepia/trepia.c:339 src/protocols/trepia/trepia.c:416
 msgid "Country"
 msgstr "Land"
 
-#: src/protocols/jabber/buddy.c:258 src/protocols/jabber/buddy.c:691
+#: src/protocols/jabber/buddy.c:257 src/protocols/jabber/buddy.c:691
 #: src/protocols/jabber/buddy.c:698
 msgid "Telephone"
 msgstr "Telefoon"
 
-#: src/protocols/jabber/buddy.c:259 src/protocols/jabber/buddy.c:709
-#: src/protocols/jabber/buddy.c:717 src/protocols/yahoo/yahoo.c:2993
+#: src/protocols/jabber/buddy.c:258 src/protocols/jabber/buddy.c:709
+#: src/protocols/jabber/buddy.c:717 src/protocols/silc/silc.c:637
+#: src/protocols/silc/util.c:508 src/protocols/yahoo/yahoo_profile.c:995
 msgid "Email"
 msgstr "E-mail"
 
-#: src/protocols/jabber/buddy.c:260 src/protocols/jabber/buddy.c:732
+#: src/protocols/jabber/buddy.c:259 src/protocols/jabber/buddy.c:732
 msgid "Organization Name"
 msgstr "Organisatie"
 
-#: src/protocols/jabber/buddy.c:261 src/protocols/jabber/buddy.c:736
+#: src/protocols/jabber/buddy.c:260 src/protocols/jabber/buddy.c:736
 msgid "Organization Unit"
 msgstr "Afdeling"
 
-#: src/protocols/jabber/buddy.c:262 src/protocols/jabber/buddy.c:742
+#: src/protocols/jabber/buddy.c:261 src/protocols/jabber/buddy.c:742
 msgid "Title"
 msgstr "Titel"
 
-#: src/protocols/jabber/buddy.c:263 src/protocols/jabber/buddy.c:745
+#: src/protocols/jabber/buddy.c:262 src/protocols/jabber/buddy.c:745
 msgid "Role"
 msgstr "Rol"
 
-#: src/protocols/jabber/buddy.c:264 src/protocols/jabber/buddy.c:638
-#: src/protocols/oscar/oscar.c:4247
+#: src/protocols/jabber/buddy.c:263 src/protocols/jabber/buddy.c:638
+#: src/protocols/oscar/oscar.c:4881
 msgid "Birthday"
 msgstr "Geboortedatum"
 
-#: src/protocols/jabber/buddy.c:508 src/protocols/jabber/buddy.c:509
+#: src/protocols/jabber/buddy.c:509 src/protocols/jabber/buddy.c:510
 msgid "Edit Jabber vCard"
 msgstr "Jabber vCard bewerken"
 
-#: src/protocols/jabber/buddy.c:510
+#: src/protocols/jabber/buddy.c:511
 msgid ""
 "All items below are optional. Enter only the information with which you feel "
 "comfortable."
@@ -5263,28 +5589,30 @@
 "Alle items hieronder zijn optioneel. Geef alleen die informatie die u ook "
 "publiekelijk beschikbaar wilt hebben."
 
-#: src/protocols/jabber/buddy.c:552
+#: src/protocols/jabber/buddy.c:553
 msgid "Jabber ID"
 msgstr "Jabber ID"
 
-#: src/protocols/jabber/buddy.c:562 src/protocols/jabber/buddy.c:569
-#: src/protocols/jabber/buddy.c:580 src/protocols/jabber/jabber.c:930
-#: src/protocols/msn/msn.c:348 src/protocols/oscar/oscar.c:566
-#: src/protocols/oscar/oscar.c:572 src/protocols/oscar/oscar.c:574
-#: src/protocols/yahoo/yahoo.c:2407
+#: src/protocols/jabber/buddy.c:563 src/protocols/jabber/buddy.c:570
+#: src/protocols/jabber/buddy.c:581 src/protocols/jabber/jabber.c:938
+#: src/protocols/msn/msn.c:450 src/protocols/novell/novell.c:2743
+#: src/protocols/novell/novell.c:2747 src/protocols/oscar/oscar.c:578
+#: src/protocols/oscar/oscar.c:584 src/protocols/oscar/oscar.c:586
+#: src/protocols/yahoo/yahoo.c:2634
 msgid "Status"
 msgstr "Status"
 
-#: src/protocols/jabber/buddy.c:578 src/protocols/jabber/jabber.c:1386
+#: src/protocols/jabber/buddy.c:579 src/protocols/jabber/jabber.c:1562
 msgid "Resource"
 msgstr "Hulpmiddel"
 
-#: src/protocols/jabber/buddy.c:624
+#: src/protocols/jabber/buddy.c:625 src/protocols/silc/ops.c:794
 msgid "Middle Name"
 msgstr "Tweede Naam"
 
-#: src/protocols/jabber/buddy.c:643 src/protocols/jabber/jabber.c:616
-#: src/protocols/oscar/oscar.c:4265 src/protocols/oscar/oscar.c:4273
+#: src/protocols/jabber/buddy.c:643 src/protocols/jabber/jabber.c:623
+#: src/protocols/oscar/oscar.c:4899 src/protocols/oscar/oscar.c:4907
+#: src/protocols/silc/ops.c:830
 msgid "Address"
 msgstr "Adres"
 
@@ -5304,27 +5632,31 @@
 msgid "Jabber Profile"
 msgstr "Jabber profiel"
 
-#: src/protocols/jabber/buddy.c:893
+#: src/protocols/jabber/buddy.c:932
 msgid "Un-hide From"
 msgstr "Afzender weergeven"
 
-#: src/protocols/jabber/buddy.c:896
+#: src/protocols/jabber/buddy.c:935
 msgid "Temporarily Hide From"
 msgstr "Afzender tijdelijk verbergen"
 
-#: src/protocols/jabber/buddy.c:905
+#. && NOT ME
+#: src/protocols/jabber/buddy.c:942
 msgid "Cancel Presence Notification"
 msgstr "Aanwezigheidsmelding annuleren"
 
-#: src/protocols/jabber/buddy.c:913
+#: src/protocols/jabber/buddy.c:948
 msgid "(Re-)Request authorization"
 msgstr "(Opnieuw) toestemming vragen"
 
-#: src/protocols/jabber/buddy.c:919
+#. if(NOT ME)
+#. shouldn't this just happen automatically when the buddy is
+#. removed?
+#: src/protocols/jabber/buddy.c:956
 msgid "Unsubscribe"
 msgstr "Afmelden"
 
-#: src/protocols/jabber/chat.c:42 src/protocols/yahoo/yahoochat.c:965
+#: src/protocols/jabber/chat.c:42 src/protocols/yahoo/yahoochat.c:1002
 msgid "_Room:"
 msgstr "_Ruimte:"
 
@@ -5336,483 +5668,522 @@
 msgid "_Handle:"
 msgstr "Bij_naam:"
 
-#: src/protocols/jabber/chat.c:164
+#: src/protocols/jabber/chat.c:176
 #, c-format
 msgid "%s is not a valid room name"
 msgstr "%s is geen geldige naam voor een ruimte"
 
-#: src/protocols/jabber/chat.c:165
+#: src/protocols/jabber/chat.c:177
 msgid "Invalid Room Name"
 msgstr "Ongeldige naam voor ruimte"
 
-#: src/protocols/jabber/chat.c:170
+#: src/protocols/jabber/chat.c:182
 #, c-format
 msgid "%s is not a valid server name"
 msgstr "%s is geen geldige servernaam"
 
-#: src/protocols/jabber/chat.c:171 src/protocols/jabber/chat.c:172
+#: src/protocols/jabber/chat.c:183 src/protocols/jabber/chat.c:184
 msgid "Invalid Server Name"
 msgstr "Ongeldige servernaam"
 
-#: src/protocols/jabber/chat.c:176
+#: src/protocols/jabber/chat.c:188
 #, c-format
 msgid "%s is not a valid room handle"
 msgstr "%s is geen geldige aanduiding voor een ruimte"
 
-#: src/protocols/jabber/chat.c:177 src/protocols/jabber/chat.c:178
+#: src/protocols/jabber/chat.c:189 src/protocols/jabber/chat.c:190
 msgid "Invalid Room Handle"
 msgstr "Ongeldige aanduiding voor ruimte"
 
-#: src/protocols/jabber/chat.c:332
+#: src/protocols/jabber/chat.c:349
 msgid "Configuration error"
 msgstr "Configuratiefout"
 
-#: src/protocols/jabber/chat.c:341 src/protocols/jabber/chat.c:486
+#: src/protocols/jabber/chat.c:358 src/protocols/jabber/chat.c:503
 msgid "Unable to configure"
 msgstr "Kan niet configureren"
 
-#: src/protocols/jabber/chat.c:357
+#: src/protocols/jabber/chat.c:374
 msgid "Room Configuration Error"
 msgstr "Configuratiefout van ruimte"
 
-#: src/protocols/jabber/chat.c:358
+#: src/protocols/jabber/chat.c:375
 msgid "This room is not capable of being configured"
 msgstr "Deze ruimte kan niet ingesteld worden"
 
-#: src/protocols/jabber/chat.c:408 src/protocols/jabber/chat.c:477
+#: src/protocols/jabber/chat.c:425 src/protocols/jabber/chat.c:494
 msgid "Registration error"
 msgstr "Registratiefout"
 
-#: src/protocols/jabber/chat.c:556
+#: src/protocols/jabber/chat.c:573
 msgid "Nick changing not supported in non-MUC chatrooms"
 msgstr "Verandering van bijnaam niet toegestaan in non-chatruimte"
 
-#: src/protocols/jabber/chat.c:600 src/protocols/jabber/chat.c:611
+#: src/protocols/jabber/chat.c:617 src/protocols/jabber/chat.c:628
 msgid "Roomlist Error"
 msgstr "Fout in lijst avn ruimtes"
 
-#: src/protocols/jabber/chat.c:601 src/protocols/jabber/chat.c:612
+#: src/protocols/jabber/chat.c:618 src/protocols/jabber/chat.c:629
 msgid "Error retreiving roomlist"
 msgstr "Fout bij inlezen van lijst van ruimtes"
 
-#: src/protocols/jabber/chat.c:652
+#: src/protocols/jabber/chat.c:669
 msgid "Invalid Server"
 msgstr "Ongeldige server"
 
-#: src/protocols/jabber/chat.c:689
+#: src/protocols/jabber/chat.c:706
 msgid "Enter a Conference Server"
 msgstr "Verbinden met server voor groepsgesprekken"
 
-#: src/protocols/jabber/chat.c:690
+#: src/protocols/jabber/chat.c:707
 msgid "Select a conference server to query"
 msgstr "Kies een te raadplegen conferentieserver"
 
-#: src/protocols/jabber/chat.c:693
+#: src/protocols/jabber/chat.c:710
 msgid "Find Rooms"
 msgstr "Ruimtes zoeken"
 
-#: src/protocols/jabber/jabber.c:74
+#: src/protocols/jabber/jabber.c:76
 msgid "Error initializing session"
 msgstr "Fout bij initialiseren van sessie"
 
-#: src/protocols/jabber/jabber.c:204 src/protocols/msn/httpmethod.c:255
-#: src/protocols/msn/msn.c:84 src/protocols/msn/msn.c:104
-#: src/protocols/msn/msn.c:174 src/protocols/msn/msn.c:274
-#: src/protocols/msn/msn.c:571 src/protocols/msn/msn.c:743
-#: src/protocols/msn/msn.c:772 src/protocols/msn/msn.c:804
-#: src/protocols/msn/msn.c:812 src/protocols/msn/msn.c:845
-#: src/protocols/msn/msn.c:853 src/protocols/msn/msn.c:867
-#: src/protocols/msn/msn.c:876 src/protocols/msn/msn.c:891
-#: src/protocols/msn/msn.c:901 src/protocols/msn/msn.c:923
-#: src/protocols/msn/msn.c:973 src/protocols/msn/msn.c:1011
-#: src/protocols/msn/msn.c:1113 src/protocols/msn/msn.c:1146
-#: src/protocols/msn/msn.c:1167 src/protocols/msn/msn.c:1178
-#: src/protocols/msn/msn.c:1189 src/protocols/msn/msn.c:1213
-#: src/protocols/msn/msn.c:1225 src/protocols/msn/msn.c:1306
-#: src/protocols/msn/notification.c:147 src/protocols/msn/notification.c:175
-#: src/protocols/msn/notification.c:1299 src/protocols/msn/notification.c:1319
-#: src/protocols/msn/session.c:209 src/protocols/trepia/trepia.c:248
-#: src/protocols/trepia/trepia.c:698 src/protocols/trepia/trepia.c:987
-#: src/protocols/trepia/trepia.c:1031 src/protocols/trepia/trepia.c:1130
-#: src/protocols/trepia/trepia.c:1186
+#: src/protocols/jabber/jabber.c:206 src/protocols/msn/httpmethod.c:266
+#: src/protocols/trepia/trepia.c:247 src/protocols/trepia/trepia.c:698
+#: src/protocols/trepia/trepia.c:987 src/protocols/trepia/trepia.c:1031
+#: src/protocols/trepia/trepia.c:1130 src/protocols/trepia/trepia.c:1176
 msgid "Write error"
 msgstr "Schrijffout"
 
-#: src/protocols/jabber/jabber.c:242 src/protocols/jabber/jabber.c:262
+#: src/protocols/jabber/jabber.c:244 src/protocols/jabber/jabber.c:264
 msgid "Read Error"
 msgstr "Leesfout"
 
-#: src/protocols/jabber/jabber.c:317
+#: src/protocols/jabber/jabber.c:324
 msgid "Connection Failed"
 msgstr "Verbinding mislukt"
 
-#: src/protocols/jabber/jabber.c:320
+#: src/protocols/jabber/jabber.c:327
 msgid "SSL Handshake Failed"
 msgstr "Contact leggen via SSL mislukt"
 
-#: src/protocols/jabber/jabber.c:363 src/protocols/jabber/jabber.c:692
+#: src/protocols/jabber/jabber.c:370 src/protocols/jabber/jabber.c:699
 msgid "Invalid Jabber ID"
 msgstr "Ongeldige Jabber-ID"
 
-#: src/protocols/jabber/jabber.c:391 src/protocols/jabber/jabber.c:719
+#: src/protocols/jabber/jabber.c:398 src/protocols/jabber/jabber.c:726
 msgid "SSL support unavailable"
 msgstr "SSL niet beschikbaar"
 
-#: src/protocols/jabber/jabber.c:401 src/protocols/jabber/jabber.c:729
+#: src/protocols/jabber/jabber.c:408 src/protocols/jabber/jabber.c:736
 #: src/protocols/trepia/trepia.c:1070
 msgid "Unable to create socket"
 msgstr "Kan geen socket aanmaken"
 
-#: src/protocols/jabber/jabber.c:426
+#: src/protocols/jabber/jabber.c:433
 #, c-format
 msgid "Registration of %s@%s successful"
 msgstr "Registratie van %s@%s voltooid"
 
-#: src/protocols/jabber/jabber.c:428 src/protocols/jabber/jabber.c:429
+#: src/protocols/jabber/jabber.c:435 src/protocols/jabber/jabber.c:436
 msgid "Registration Successful"
 msgstr "Registratie voltooid"
 
-#: src/protocols/jabber/jabber.c:435 src/protocols/jabber/jabber.c:1175
+#: src/protocols/jabber/jabber.c:442 src/protocols/jabber/jabber.c:1181
 msgid "Unknown Error"
 msgstr "Onbekende fout"
 
-#: src/protocols/jabber/jabber.c:437 src/protocols/jabber/jabber.c:438
+#: src/protocols/jabber/jabber.c:444 src/protocols/jabber/jabber.c:445
 msgid "Registration Failed"
 msgstr "Registratie mislukt"
 
-#: src/protocols/jabber/jabber.c:549 src/protocols/jabber/jabber.c:550
+#: src/protocols/jabber/jabber.c:556 src/protocols/jabber/jabber.c:557
 msgid "Already Registered"
 msgstr "Al geregistreerd"
 
-#: src/protocols/jabber/jabber.c:585 src/protocols/jabber/jabber.c:1026
+#: src/protocols/jabber/jabber.c:592 src/protocols/jabber/jabber.c:1036
 msgid "Password"
 msgstr "Wachtwoord"
 
-#: src/protocols/jabber/jabber.c:596
+#: src/protocols/jabber/jabber.c:603
 msgid "E-Mail"
 msgstr "E-mail"
 
 #. State
-#: src/protocols/jabber/jabber.c:626 src/protocols/oscar/oscar.c:4267
-#: src/protocols/oscar/oscar.c:4275 src/protocols/trepia/trepia.c:335
+#: src/protocols/jabber/jabber.c:633 src/protocols/oscar/oscar.c:4901
+#: src/protocols/oscar/oscar.c:4909 src/protocols/trepia/trepia.c:335
 #: src/protocols/trepia/trepia.c:413
 msgid "State"
 msgstr "Staat"
 
-#: src/protocols/jabber/jabber.c:636
+#: src/protocols/jabber/jabber.c:643 src/protocols/silc/ops.c:835
+#: src/protocols/silc/silc.c:639 src/protocols/silc/util.c:510
 msgid "Phone"
 msgstr "Telefoon"
 
-#: src/protocols/jabber/jabber.c:646
+#: src/protocols/jabber/jabber.c:653
 msgid "Date"
 msgstr "Datum"
 
-#: src/protocols/jabber/jabber.c:654
+#: src/protocols/jabber/jabber.c:661
 msgid "Please fill out the information below to register your new account."
-msgstr ""
-"Vul alstublieft onderstaand formulier in om uw nieuwe account te registreren."
-
-#: src/protocols/jabber/jabber.c:657 src/protocols/jabber/jabber.c:658
+msgstr "Vul alstublieft onderstaand formulier in om uw nieuwe account te registreren."
+
+#: src/protocols/jabber/jabber.c:664 src/protocols/jabber/jabber.c:665
 msgid "Register New Jabber Account"
 msgstr "Nieuw Jabber account registreren"
 
+#: src/protocols/jabber/jabber.c:744
+msgid "Logged out"
+msgstr "Afgemeld"
+
 #. connect to the server
-#: src/protocols/jabber/jabber.c:775 src/protocols/msn/dispatch.c:212
-#: src/protocols/msn/msn.c:505 src/protocols/napster/napster.c:499
-#: src/protocols/novell/novell.c:1575 src/protocols/oscar/oscar.c:944
-#: src/protocols/trepia/trepia.c:1064 src/protocols/yahoo/yahoo.c:2177
-#: src/protocols/zephyr/zephyr.c:864
+#: src/protocols/jabber/jabber.c:783 src/protocols/msn/msn.c:608
+#: src/protocols/napster/napster.c:499 src/protocols/novell/novell.c:2105
+#: src/protocols/oscar/oscar.c:1597 src/protocols/trepia/trepia.c:1064
+#: src/protocols/yahoo/yahoo.c:2379 src/protocols/zephyr/zephyr.c:1017
 msgid "Connecting"
 msgstr "Verbinding wordt gemaakt"
 
-#: src/protocols/jabber/jabber.c:779
+#: src/protocols/jabber/jabber.c:787
 msgid "Initializing Stream"
 msgstr "Starten van datastroom"
 
-#: src/protocols/jabber/jabber.c:785
+#: src/protocols/jabber/jabber.c:793
 msgid "Authenticating"
 msgstr "Naam en wachtwoord worden gecontroleerd"
 
-#: src/protocols/jabber/jabber.c:794
+#: src/protocols/jabber/jabber.c:802
 msgid "Re-initializing Stream"
 msgstr "Herstarten van datastroom"
 
-#: src/protocols/jabber/jabber.c:874 src/protocols/jabber/jabber.c:1153
-#: src/protocols/jabber/jabber.c:1194 src/protocols/jabber/jabber.c:1227
-#: src/protocols/oscar/oscar.c:572 src/protocols/oscar/oscar.c:5816
+#: src/protocols/jabber/jabber.c:882 src/protocols/jabber/jabber.c:1159
+#: src/protocols/jabber/jabber.c:1200 src/protocols/jabber/jabber.c:1233
+#: src/protocols/oscar/oscar.c:584 src/protocols/oscar/oscar.c:6488
 msgid "Not Authorized"
 msgstr "Geen toestemming"
 
-#: src/protocols/jabber/jabber.c:905
+#: src/protocols/jabber/jabber.c:913
 msgid "Both"
 msgstr "Beide"
 
-#: src/protocols/jabber/jabber.c:907
+#: src/protocols/jabber/jabber.c:915
 msgid "From (To pending)"
 msgstr "Van"
 
-#: src/protocols/jabber/jabber.c:909
+#: src/protocols/jabber/jabber.c:917
 msgid "From"
 msgstr "Van"
 
-#: src/protocols/jabber/jabber.c:912
+#: src/protocols/jabber/jabber.c:920
 msgid "To"
 msgstr "Aan"
 
-#: src/protocols/jabber/jabber.c:914
+#: src/protocols/jabber/jabber.c:922
 msgid "None (To pending)"
 msgstr "Geen"
 
-#: src/protocols/jabber/jabber.c:918
+#: src/protocols/jabber/jabber.c:926
 msgid "Subscription"
 msgstr "Abonnement"
 
-#: src/protocols/jabber/jabber.c:938
+#: src/protocols/jabber/jabber.c:946
 msgid "Error"
 msgstr "Fout"
 
-#: src/protocols/jabber/jabber.c:951 src/protocols/jabber/jutil.c:35
+#: src/protocols/jabber/jabber.c:959 src/protocols/jabber/jutil.c:35
 #: src/protocols/jabber/presence.c:66 src/protocols/jabber/presence.c:117
 msgid "Chatty"
 msgstr "Chatgraag"
 
-#: src/protocols/jabber/jabber.c:953 src/protocols/jabber/jutil.c:38
+#: src/protocols/jabber/jabber.c:961 src/protocols/jabber/jutil.c:38
 #: src/protocols/jabber/presence.c:68 src/protocols/jabber/presence.c:122
 msgid "Extended Away"
 msgstr "Lang weg"
 
-#: src/protocols/jabber/jabber.c:954 src/protocols/jabber/jutil.c:41
+#: src/protocols/jabber/jabber.c:962 src/protocols/jabber/jutil.c:41
 #: src/protocols/jabber/presence.c:70 src/protocols/jabber/presence.c:124
-#: src/protocols/oscar/oscar.c:514 src/protocols/oscar/oscar.c:4828
-#: src/protocols/oscar/oscar.c:6427
+#: src/protocols/oscar/oscar.c:526 src/protocols/oscar/oscar.c:5484
+#: src/protocols/oscar/oscar.c:6680
 msgid "Do Not Disturb"
 msgstr "Niet storen"
 
-#: src/protocols/jabber/jabber.c:971
+#: src/protocols/jabber/jabber.c:979
 msgid "Password Changed"
 msgstr "Wachtwoord veranderd"
 
-#: src/protocols/jabber/jabber.c:972
+#: src/protocols/jabber/jabber.c:980
 msgid "Your password has been changed."
 msgstr "Wachtwoord is veranderd"
 
-#: src/protocols/jabber/jabber.c:976 src/protocols/jabber/jabber.c:977
+#: src/protocols/jabber/jabber.c:984 src/protocols/jabber/jabber.c:985
 msgid "Error changing password"
 msgstr "Fout bij veranderen van wachtwoord"
 
-#: src/protocols/jabber/jabber.c:1031
+#: src/protocols/jabber/jabber.c:1041
 msgid "Password (again)"
 msgstr "Nieuw wachtwoord (herhalen)"
 
-#: src/protocols/jabber/jabber.c:1036 src/protocols/jabber/jabber.c:1037
+#: src/protocols/jabber/jabber.c:1046 src/protocols/jabber/jabber.c:1047
 msgid "Change Jabber Password"
 msgstr "Jabber-wachtwoord veranderen"
 
-#: src/protocols/jabber/jabber.c:1037
+#: src/protocols/jabber/jabber.c:1047
 msgid "Please enter your new password"
 msgstr "Vul uw nieuwe wachtwoord in"
 
-#: src/protocols/jabber/jabber.c:1048 src/protocols/toc/toc.c:1532
+#: src/protocols/jabber/jabber.c:1057 src/protocols/toc/toc.c:1540
 msgid "Set User Info"
 msgstr "Gebruikersinfo instellen"
 
-#: src/protocols/jabber/jabber.c:1133
+#: src/protocols/jabber/jabber.c:1139
 msgid "Bad Request"
 msgstr "Slechte aanvraag"
 
-#: src/protocols/jabber/jabber.c:1135
+#: src/protocols/jabber/jabber.c:1141
 msgid "Conflict"
 msgstr "Conflict"
 
-#: src/protocols/jabber/jabber.c:1137
+#: src/protocols/jabber/jabber.c:1143
 msgid "Feature Not Implemented"
 msgstr "Feature niet geïmplementeerd"
 
-#: src/protocols/jabber/jabber.c:1139
+#: src/protocols/jabber/jabber.c:1145
 msgid "Forbidden"
 msgstr "Verboden"
 
-#: src/protocols/jabber/jabber.c:1141
+#: src/protocols/jabber/jabber.c:1147
 msgid "Gone"
 msgstr "Weg"
 
-#: src/protocols/jabber/jabber.c:1143 src/protocols/jabber/jabber.c:1217
+#: src/protocols/jabber/jabber.c:1149 src/protocols/jabber/jabber.c:1223
 msgid "Internal Server Error"
 msgstr "Interne serverfout"
 
-#: src/protocols/jabber/jabber.c:1145
+#: src/protocols/jabber/jabber.c:1151
 msgid "Item Not Found"
 msgstr "Item niet gevonden"
 
-#: src/protocols/jabber/jabber.c:1147
+#: src/protocols/jabber/jabber.c:1153
 msgid "Malformed Jabber ID"
 msgstr "Ongeldig Jabber-ID"
 
-#: src/protocols/jabber/jabber.c:1149
+#: src/protocols/jabber/jabber.c:1155
 msgid "Not Acceptable"
 msgstr "Onacceptabel"
 
-#: src/protocols/jabber/jabber.c:1151
+#: src/protocols/jabber/jabber.c:1157
 msgid "Not Allowed"
 msgstr "Niet toegestaan"
 
-#: src/protocols/jabber/jabber.c:1155
-msgid "Payment Required"
-msgstr "Betaling vereist"
-
-#: src/protocols/jabber/jabber.c:1157
-msgid "Recipient Unavailable"
-msgstr "Ontvanger niet beschikbaar"
-
 #: src/protocols/jabber/jabber.c:1161
+msgid "Payment Required"
+msgstr "Betaling vereist"
+
+#: src/protocols/jabber/jabber.c:1163
+msgid "Recipient Unavailable"
+msgstr "Ontvanger niet beschikbaar"
+
+#: src/protocols/jabber/jabber.c:1167
 msgid "Registration Required"
 msgstr "Registratie vereist"
 
-#: src/protocols/jabber/jabber.c:1163
+#: src/protocols/jabber/jabber.c:1169
 msgid "Remote Server Not Found"
 msgstr "Server niet gevonden"
 
-#: src/protocols/jabber/jabber.c:1165
+#: src/protocols/jabber/jabber.c:1171
 msgid "Remote Server Timeout"
 msgstr "Timeout op server"
 
-#: src/protocols/jabber/jabber.c:1167
+#: src/protocols/jabber/jabber.c:1173
 msgid "Server Overloaded"
 msgstr "Server te zwaar belast"
 
-#: src/protocols/jabber/jabber.c:1169
+#: src/protocols/jabber/jabber.c:1175
 msgid "Service Unavailable"
 msgstr "Service niet beschikbaar"
 
-#: src/protocols/jabber/jabber.c:1171
+#: src/protocols/jabber/jabber.c:1177
 msgid "Subscription Required"
 msgstr "Abonnement vereist"
 
-#: src/protocols/jabber/jabber.c:1173
+#: src/protocols/jabber/jabber.c:1179
 msgid "Unexpected Request"
 msgstr "Onverwachte aanvraag"
 
-#: src/protocols/jabber/jabber.c:1180
+#: src/protocols/jabber/jabber.c:1186
 msgid "Authorization Aborted"
 msgstr "Aanmelding afgebroken"
 
-#: src/protocols/jabber/jabber.c:1182
+#: src/protocols/jabber/jabber.c:1188
 msgid "Incorrect encoding in authorization"
 msgstr "Onjuiste codering bij aanmelding"
 
-#: src/protocols/jabber/jabber.c:1185
-msgid "Invalid authzid"
-msgstr "Ongeldige authzid"
-
-#: src/protocols/jabber/jabber.c:1188
-msgid "Invalid Authorization Mechanism"
-msgstr "Ongeldig mechanisme"
-
 #: src/protocols/jabber/jabber.c:1191
+msgid "Invalid authzid"
+msgstr "Ongeldige authzid"
+
+#: src/protocols/jabber/jabber.c:1194
+msgid "Invalid Authorization Mechanism"
+msgstr "Ongeldig mechanisme"
+
+#: src/protocols/jabber/jabber.c:1197
 msgid "Authorization mechanism too weak"
 msgstr "Mechanisme te onveilig"
 
-#: src/protocols/jabber/jabber.c:1196
+#: src/protocols/jabber/jabber.c:1202
 msgid "Temporary Authentication Failure"
 msgstr "Tijdelijk identificatieprobleem"
 
-#: src/protocols/jabber/jabber.c:1198
-msgid "Authentication Failure"
-msgstr "Identificatie mislukt"
-
-#: src/protocols/jabber/jabber.c:1202
-msgid "Bad Format"
-msgstr "Slecht formaat"
-
 #: src/protocols/jabber/jabber.c:1204
+msgid "Authentication Failure"
+msgstr "Identificatie mislukt"
+
+#: src/protocols/jabber/jabber.c:1208
+msgid "Bad Format"
+msgstr "Slecht formaat"
+
+#: src/protocols/jabber/jabber.c:1210
 msgid "Bad Namespace Prefix"
 msgstr "Slechte namespace"
 
-#: src/protocols/jabber/jabber.c:1207
+#: src/protocols/jabber/jabber.c:1213
 msgid "Resource Conflict"
 msgstr "Bronconflict"
 
-#: src/protocols/jabber/jabber.c:1209
+#: src/protocols/jabber/jabber.c:1215 src/protocols/silc/ops.c:1491
 msgid "Connection Timeout"
 msgstr "Verbinding verlopen"
 
-#: src/protocols/jabber/jabber.c:1211
+#: src/protocols/jabber/jabber.c:1217
 msgid "Host Gone"
 msgstr "Host verdwenen"
 
-#: src/protocols/jabber/jabber.c:1213
+#: src/protocols/jabber/jabber.c:1219
 msgid "Host Unknown"
 msgstr "Host onbekend"
 
-#: src/protocols/jabber/jabber.c:1215
+#: src/protocols/jabber/jabber.c:1221
 msgid "Improper Addressing"
 msgstr "Ongeldige adressering"
 
-#: src/protocols/jabber/jabber.c:1219
+#: src/protocols/jabber/jabber.c:1225
 msgid "Invalid ID"
 msgstr "Ongeldig ID"
 
-#: src/protocols/jabber/jabber.c:1221
+#: src/protocols/jabber/jabber.c:1227
 msgid "Invalid Namespace"
 msgstr "Ongeldige omgeving"
 
-#: src/protocols/jabber/jabber.c:1223
+#: src/protocols/jabber/jabber.c:1229
 msgid "Invalid XML"
 msgstr "Ongeldige XML"
 
-#: src/protocols/jabber/jabber.c:1225
-msgid "Non-matching Hosts"
-msgstr "Niet overeenkomende computers"
-
-#: src/protocols/jabber/jabber.c:1229
-msgid "Policy Violation"
-msgstr "Schending van beleid"
-
 #: src/protocols/jabber/jabber.c:1231
+msgid "Non-matching Hosts"
+msgstr "Niet overeenkomende computers"
+
+#: src/protocols/jabber/jabber.c:1235
+msgid "Policy Violation"
+msgstr "Schending van beleid"
+
+#: src/protocols/jabber/jabber.c:1237
 msgid "Remote Connection Failed"
 msgstr "Verbinding mislukt"
 
-#: src/protocols/jabber/jabber.c:1233
-msgid "Resource Constraint"
-msgstr "Beperkte bronnen beschikbaar"
-
-#: src/protocols/jabber/jabber.c:1235
-msgid "Restricted XML"
-msgstr "Strikte XML"
-
-#: src/protocols/jabber/jabber.c:1237
-msgid "See Other Host"
-msgstr "Zie andere host"
-
 #: src/protocols/jabber/jabber.c:1239
+msgid "Resource Constraint"
+msgstr "Beperkte bronnen beschikbaar"
+
+#: src/protocols/jabber/jabber.c:1241
+msgid "Restricted XML"
+msgstr "Strikte XML"
+
+#: src/protocols/jabber/jabber.c:1243
+msgid "See Other Host"
+msgstr "Zie andere host"
+
+#: src/protocols/jabber/jabber.c:1245
 msgid "System Shutdown"
 msgstr "Systeem wordt uitgeschakeld"
 
-#: src/protocols/jabber/jabber.c:1241
+#: src/protocols/jabber/jabber.c:1247
 msgid "Undefined Condition"
 msgstr "Ongedefnieerde voorwaarde"
 
-#: src/protocols/jabber/jabber.c:1243
+#: src/protocols/jabber/jabber.c:1249
 msgid "Unsupported Encoding"
 msgstr "Codering niet ondersteund"
 
-#: src/protocols/jabber/jabber.c:1245
+#: src/protocols/jabber/jabber.c:1251
 msgid "Unsupported Stanza Type"
 msgstr "Stanzatype niet ondersteund"
 
-#: src/protocols/jabber/jabber.c:1247
+#: src/protocols/jabber/jabber.c:1253
 msgid "Unsupported Version"
 msgstr "Versie niet ondersteund"
 
-#: src/protocols/jabber/jabber.c:1249
+#: src/protocols/jabber/jabber.c:1255
 msgid "XML Not Well Formed"
 msgstr "XML niet goed van structuur"
 
-#: src/protocols/jabber/jabber.c:1251
+#: src/protocols/jabber/jabber.c:1257
 msgid "Stream Error"
 msgstr "Stream-fout"
 
-#: src/protocols/jabber/jabber.c:1276
+#: src/protocols/jabber/jabber.c:1324
+#, c-format
+msgid "Unable to ban user %s"
+msgstr "Kan gebruiker %s niet verbannen"
+
+#: src/protocols/jabber/jabber.c:1376
+#, c-format
+msgid "Unable to kick user %s"
+msgstr "Kan gebruiker %s niet schoppen"
+
+#: src/protocols/jabber/jabber.c:1401
+msgid "config:  Configure a chat room."
+msgstr "config:  Chatruimte instellen"
+
+#: src/protocols/jabber/jabber.c:1404
+msgid "configure:  Configure a chat room."
+msgstr "configure: Chatruimte instellen."
+
+#: src/protocols/jabber/jabber.c:1411
+msgid "part [room]:  Leave the room."
+msgstr "part [ruimte]:  Ruimte verlaten."
+
+#: src/protocols/jabber/jabber.c:1414
+msgid "register:  Register with a chat room."
+msgstr "register:  Registreren bij een chatruimte."
+
+#: src/protocols/jabber/jabber.c:1419
+msgid "topic [new topic]:  View or change the topic."
+msgstr "topic [nieuw onderwerp]:  Het onderwerp weergeven of veranderen."
+
+#: src/protocols/jabber/jabber.c:1423
+msgid "ban &lt;user&gt; [room]:  Ban a user from the room."
+msgstr "ban &lt;bijnaam&gt; [ruimte]:  Een gebruiker uit een ruimte verbannen."
+
+#: src/protocols/jabber/jabber.c:1427
+msgid "invite &lt;user&gt; [room]:  Invite a user to the room."
+msgstr "invite &lt;bijnaam&gt; [ruimte]:  Een gebruiker uitnodigen in een ruimte."
+
+#: src/protocols/jabber/jabber.c:1431
+msgid "join: &lt;room&gt; [server]:  Join a chat on this server."
+msgstr "join: &lt;ruimte&gt; [server]:  Meedoen aan een chatruimte op deze server."
+
+#: src/protocols/jabber/jabber.c:1435
+msgid "kick &lt;user&gt; [room]:  Kick a user from the room."
+msgstr "kick &lt;bijnaam&gt; [ruimte]:  Een gebruiker uit een ruimte schoppen."
+
+#: src/protocols/jabber/jabber.c:1439
+msgid "msg &lt;user&gt; &lt;message&gt;:  Send a private message to another user."
+msgstr ""
+"msg &lt;bijnaam&gt; &lt;bericht&gt;:  Een privébericht sturen aan een "
+"gebruiker."
+
+#: src/protocols/jabber/jabber.c:1453
 msgid "Hide Operating System"
 msgstr "Besturingssysteem verbergen"
 
@@ -5827,23 +6198,24 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/jabber/jabber.c:1362 src/protocols/jabber/jabber.c:1364
+#: src/protocols/jabber/jabber.c:1537 src/protocols/jabber/jabber.c:1539
 msgid "Jabber Protocol Plugin"
 msgstr "Jabber-protocol plugin"
 
-#: src/protocols/jabber/jabber.c:1389
+#: src/protocols/jabber/jabber.c:1565
 msgid "Use TLS if available"
 msgstr "TLS gebruiken indien beschikbaar"
 
-#: src/protocols/jabber/jabber.c:1394
+#: src/protocols/jabber/jabber.c:1570
 msgid "Force old SSL"
 msgstr "Oude SSL forceren"
 
-#: src/protocols/jabber/jabber.c:1399
+#: src/protocols/jabber/jabber.c:1575
 msgid "Allow plaintext auth over unencrypted streams"
 msgstr "Tekstaanmelding over ongecodeerde datastroom toestaan"
 
-#: src/protocols/jabber/jabber.c:1408
+#. Account options
+#: src/protocols/jabber/jabber.c:1584 src/protocols/silc/silc.c:1572
 msgid "Connect server"
 msgstr "Verbinden met server"
 
@@ -5880,20 +6252,20 @@
 msgid "XML Parse error"
 msgstr "XML analysefout"
 
-#: src/protocols/jabber/presence.c:221
+#: src/protocols/jabber/presence.c:224
 msgid "Unknown Error in presence"
 msgstr "Onbekende fout in aanwezigheid"
 
-#: src/protocols/jabber/presence.c:224
+#: src/protocols/jabber/presence.c:227
 #, c-format
 msgid "The user %s wants to add you to their buddy list."
 msgstr "De gebruiker %s wil u toevoegen aan zijn/haar contactenlijst."
 
-#: src/protocols/jabber/presence.c:277 src/protocols/jabber/presence.c:278
+#: src/protocols/jabber/presence.c:280 src/protocols/jabber/presence.c:281
 msgid "Create New Room"
 msgstr "Nieuwe ruimte maken"
 
-#: src/protocols/jabber/presence.c:279
+#: src/protocols/jabber/presence.c:282
 msgid ""
 "You are creating a new room.  Would you like to configure it, or accept the "
 "default settings?"
@@ -5901,341 +6273,300 @@
 "U bent een nieuwe ruimte aan het maken. Wilt u deze instellen, of de "
 "standaardinstellingen gebruiken?"
 
-#: src/protocols/jabber/presence.c:281
+#: src/protocols/jabber/presence.c:284
 msgid "Configure Room"
 msgstr "Ruimte instellen"
 
-#: src/protocols/jabber/presence.c:283
+#: src/protocols/jabber/presence.c:286
 msgid "Accept Defaults"
 msgstr "Standaardinstellingen gebruiken"
 
-#: src/protocols/jabber/presence.c:303
+#: src/protocols/jabber/presence.c:308
 #, c-format
 msgid "Error in chat %s"
 msgstr "Fout in chat: %s"
 
-#: src/protocols/jabber/presence.c:306
+#: src/protocols/jabber/presence.c:311
 #, c-format
 msgid "Error joining chat %s"
 msgstr "Fout bij meedoen aan chat: %s"
 
-#: src/protocols/jabber/si.c:579
+#: src/protocols/jabber/si.c:582
 #, c-format
 msgid "Unable to send file to %s, user does not support file transfers"
 msgstr ""
 "Kan bestand niet verzenden naar %s. De gebruiker ondersteunt geen "
 "bestandsoverdracht"
 
-#: src/protocols/jabber/si.c:580 src/protocols/jabber/si.c:581
+#: src/protocols/jabber/si.c:583 src/protocols/jabber/si.c:584
 msgid "File Send Failed"
 msgstr "Bestanden verzenden mislukt"
 
-#: src/protocols/msn/dispatch.c:42 src/protocols/msn/notification.c:240
-msgid "Unable to request USR\n"
-msgstr "Kan geen USR aanvragen\n"
-
-#: src/protocols/msn/dispatch.c:59 src/protocols/msn/notification.c:257
-msgid "Unable to login using MD5"
-msgstr "Kan niet aanmelden met MD5"
-
-#: src/protocols/msn/dispatch.c:68 src/protocols/msn/notification.c:266
-msgid "Unable to send USR"
-msgstr "Kan geen USR sturen"
-
-#: src/protocols/msn/dispatch.c:73 src/protocols/msn/notification.c:271
-msgid "Requesting to send password"
-msgstr "Wachtwoord-toestemming aangevraagd"
-
-#: src/protocols/msn/dispatch.c:104
-msgid "Protocol version not supported"
-msgstr "Protocolversie niet ondersteund"
-
-#: src/protocols/msn/dispatch.c:117 src/protocols/msn/notification.c:410
-msgid "Unable to request CVR\n"
-msgstr "Kan geen CVR aanvragen\n"
-
-#: src/protocols/msn/dispatch.c:126 src/protocols/msn/notification.c:419
-msgid "Unable to request INF\n"
-msgstr "Kan geen INF aanvragen\n"
-
-#: src/protocols/msn/dispatch.c:147 src/protocols/msn/notification.c:1564
-msgid "Got invalid XFR"
-msgstr "Ongeldige XFR onvangen"
-
-#: src/protocols/msn/dispatch.c:178
-msgid "Unable to transfer"
-msgstr "Kan niet overzetten"
-
-#: src/protocols/msn/dispatch.c:192
-msgid "Unable to parse message."
-msgstr "Kan het bericht niet analyseren."
-
-#: src/protocols/msn/dispatch.c:232 src/protocols/msn/notification.c:528
-#: src/protocols/msn/notification.c:1826
-msgid "Unable to write to server"
-msgstr "Kan niet naar server schrijven"
-
-#: src/protocols/msn/dispatch.c:236 src/protocols/msn/notification.c:1833
-msgid "Syncing with server"
-msgstr "Synchronisatie met server"
-
-#: src/protocols/msn/dispatch.c:250
-msgid "Error reading from server"
-msgstr "Fout bij inlezen van informatie van server"
-
-#: src/protocols/msn/error.c:33
+#: src/protocols/msn/cmdproc.c:336
+msgid "Miscellaneous error"
+msgstr "Onebeknde fout"
+
+#: src/protocols/msn/cmdproc.c:338
+msgid "You have signed on from another location."
+msgstr "U heeft uzelf aangemeld vanaf een andere locatie."
+
+#: src/protocols/msn/cmdproc.c:340
+msgid "The MSN servers are going down temporarily."
+msgstr "De MSN-servers worden tijdelijk uitgeschakeld."
+
+#: src/protocols/msn/error.c:35
 msgid "Unable to parse message"
 msgstr "Kan het bericht niet analyseren"
 
-#: src/protocols/msn/error.c:36
+#: src/protocols/msn/error.c:38
 msgid "Syntax Error (probably a Gaim bug)"
 msgstr "Syntaxfout (waarschijnlijk een bug in Gaim)"
 
-#: src/protocols/msn/error.c:40
+#: src/protocols/msn/error.c:42
 msgid "Invalid email address"
 msgstr "Ongeldig e-mail adres"
 
-#: src/protocols/msn/error.c:43
+#: src/protocols/msn/error.c:45
 msgid "User does not exist"
 msgstr "Gebruiker bestaat niet"
 
-#: src/protocols/msn/error.c:47
+#: src/protocols/msn/error.c:49
 msgid "Fully Qualified Domain Name missing"
 msgstr "Geen geldige internetnaam (FQDN) aanwezig"
 
-#: src/protocols/msn/error.c:50
+#: src/protocols/msn/error.c:52
 msgid "Already Logged In"
 msgstr "Al aangemeld"
 
-#: src/protocols/msn/error.c:53
+#: src/protocols/msn/error.c:55
 msgid "Invalid Username"
 msgstr "Ongeldige gebruikersnaam"
 
-#: src/protocols/msn/error.c:56
+#: src/protocols/msn/error.c:58
 msgid "Invalid Friendly Name"
 msgstr "Ongeldige bijnaam"
 
-#: src/protocols/msn/error.c:59
+#: src/protocols/msn/error.c:61
 msgid "List Full"
 msgstr "Lijst is vol"
 
-#: src/protocols/msn/error.c:62
+#: src/protocols/msn/error.c:64
 msgid "Already there"
 msgstr "Staat er al"
 
-#: src/protocols/msn/error.c:65
+#: src/protocols/msn/error.c:67
 msgid "Not on list"
 msgstr "Niet in de lijst"
 
-#: src/protocols/msn/error.c:68 src/protocols/zephyr/zephyr.c:527
+#: src/protocols/msn/error.c:70 src/protocols/zephyr/zephyr.c:593
 msgid "User is offline"
 msgstr "Gebruiker is offline"
 
-#: src/protocols/msn/error.c:71
+#: src/protocols/msn/error.c:73
 msgid "Already in the mode"
 msgstr "Reeds in die modus"
 
-#: src/protocols/msn/error.c:74
+#: src/protocols/msn/error.c:76
 msgid "Already in opposite list"
 msgstr "Reeds in de tegenovergestelde lijst"
 
-#: src/protocols/msn/error.c:77
+#: src/protocols/msn/error.c:79
 msgid "Too many groups"
 msgstr "Te veel groepen"
 
-#: src/protocols/msn/error.c:80
+#: src/protocols/msn/error.c:82
 msgid "Invalid group"
 msgstr "Ongeldige groep"
 
-#: src/protocols/msn/error.c:83
+#: src/protocols/msn/error.c:85
 msgid "User not in group"
 msgstr "Gebruiker niet in groep"
 
-#: src/protocols/msn/error.c:86
+#: src/protocols/msn/error.c:88
 msgid "Group name too long"
 msgstr "Groepsnaam is te lang"
 
-#: src/protocols/msn/error.c:89
+#: src/protocols/msn/error.c:91
 msgid "Cannot remove group zero"
 msgstr "Kan groep nul niet verwijderen"
 
-#: src/protocols/msn/error.c:93
+#: src/protocols/msn/error.c:95
 msgid "Tried to add a contact to a group that doesn't exist"
 msgstr "Probeerde een contact aan een niet bestaande groep toe te voegen"
 
-#: src/protocols/msn/error.c:97
+#: src/protocols/msn/error.c:99
 msgid "Switchboard failed"
 msgstr "Schakelserver fout"
 
-#: src/protocols/msn/error.c:100
+#: src/protocols/msn/error.c:102
 msgid "Notify Transfer failed"
 msgstr "Melding overzetten mislukt"
 
-#: src/protocols/msn/error.c:104
+#: src/protocols/msn/error.c:106
 msgid "Required fields missing"
 msgstr "Niet alle verplichte velden zijn ingevuld"
 
-#: src/protocols/msn/error.c:107
+#: src/protocols/msn/error.c:109
 msgid "Too many hits to a FND"
 msgstr "Te veel resultaten bij zoekopdracht"
 
-#: src/protocols/msn/error.c:110 src/protocols/oscar/oscar.c:186
+#: src/protocols/msn/error.c:112 src/protocols/oscar/oscar.c:190
 msgid "Not logged in"
 msgstr "Niet aangemeld"
 
-#: src/protocols/msn/error.c:114
+#: src/protocols/msn/error.c:116
 msgid "Service Temporarily Unavailable"
 msgstr "Service momenteel niet toegankelijk"
 
-#: src/protocols/msn/error.c:117
+#: src/protocols/msn/error.c:119
 msgid "Database server error"
 msgstr "Database-server fout"
 
-#: src/protocols/msn/error.c:120
+#: src/protocols/msn/error.c:122
 msgid "Command disabled"
 msgstr "Opdracht uitgeschakeld"
 
-#: src/protocols/msn/error.c:123
+#: src/protocols/msn/error.c:125
 msgid "File operation error"
 msgstr "Bestandsfout"
 
-#: src/protocols/msn/error.c:126
+#: src/protocols/msn/error.c:128
 msgid "Memory allocation error"
 msgstr "Geheugenfout"
 
-#: src/protocols/msn/error.c:129
+#: src/protocols/msn/error.c:131
 msgid "Wrong CHL value sent to server"
 msgstr "Verkeerde CHL-waarde naar server gestuurd"
 
-#: src/protocols/msn/error.c:133
+#: src/protocols/msn/error.c:135
 msgid "Server busy"
 msgstr "Server bezig"
 
-#: src/protocols/msn/error.c:136 src/protocols/msn/error.c:149
-#: src/protocols/msn/error.c:204
+#: src/protocols/msn/error.c:138 src/protocols/msn/error.c:151
+#: src/protocols/msn/error.c:206
 msgid "Server unavailable"
 msgstr "Server niet beschikbaar"
 
-#: src/protocols/msn/error.c:139
+#: src/protocols/msn/error.c:141
 msgid "Peer Notification server down"
 msgstr "Meldingsserver is offline"
 
-#: src/protocols/msn/error.c:142
+#: src/protocols/msn/error.c:144
 msgid "Database connect error"
 msgstr "Database verbindingsprobleem"
 
-#: src/protocols/msn/error.c:146
+#: src/protocols/msn/error.c:148
 msgid "Server is going down (abandon ship)"
 msgstr "Server wordt uitgeschakeld (verlaat het schip!)"
 
-#: src/protocols/msn/error.c:153
+#: src/protocols/msn/error.c:155
 msgid "Error creating connection"
 msgstr "Fout bij maken verbinding"
 
-#: src/protocols/msn/error.c:157
+#: src/protocols/msn/error.c:159
 msgid "CVR parameters are either unknown or not allowed"
 msgstr "CVR-parameters zijn onbekend of niet toegestaan"
 
-#: src/protocols/msn/error.c:160 src/protocols/msn/notification.c:304
+#: src/protocols/msn/error.c:162
 msgid "Unable to write"
 msgstr "Kan niet schrijven"
 
-#: src/protocols/msn/error.c:163
+#: src/protocols/msn/error.c:165
 msgid "Session overload"
 msgstr "Sessie-overload"
 
-#: src/protocols/msn/error.c:166
+#: src/protocols/msn/error.c:168
 msgid "User is too active"
 msgstr "Gebruiker is te actief"
 
-#: src/protocols/msn/error.c:169
+#: src/protocols/msn/error.c:171
 msgid "Too many sessions"
 msgstr "Te veel sessies"
 
-#: src/protocols/msn/error.c:172
+#: src/protocols/msn/error.c:174
 msgid "Passport not verified"
 msgstr "Passport niet geverifieerd"
 
-#: src/protocols/msn/error.c:175
+#: src/protocols/msn/error.c:177
 msgid "Bad friend file"
 msgstr "Onbegrijpelijk contactenbestand"
 
-#: src/protocols/msn/error.c:178
+#: src/protocols/msn/error.c:180
 msgid "Not expected"
 msgstr "Niet verwacht"
 
-#: src/protocols/msn/error.c:183
+#: src/protocols/msn/error.c:185
 msgid "Friendly name changes too rapidly"
 msgstr "Bijnaam verandert te snel"
 
-#: src/protocols/msn/error.c:192
+#: src/protocols/msn/error.c:194
 msgid "Server too busy"
 msgstr "Server te druk bezig"
 
-#: src/protocols/msn/error.c:196 src/protocols/oscar/oscar.c:1357
-#: src/protocols/toc/toc.c:659
+#: src/protocols/msn/error.c:198 src/protocols/oscar/oscar.c:2026
+#: src/protocols/silc/ops.c:1480 src/protocols/toc/toc.c:630
 msgid "Authentication failed"
 msgstr "Identificatie mislukt"
 
-#: src/protocols/msn/error.c:199
+#: src/protocols/msn/error.c:201
 msgid "Not allowed when offline"
 msgstr "Niet toegestaan tijdens offline-status"
 
-#: src/protocols/msn/error.c:207
+#: src/protocols/msn/error.c:209
 msgid "Not accepting new users"
 msgstr "Nieuwe gebruikers worden niet geaccepteerd"
 
-#: src/protocols/msn/error.c:211
+#: src/protocols/msn/error.c:213
 msgid "Kids Passport without parental consent"
 msgstr "Kinderpaspoort zonder toezegging van ouder"
 
-#: src/protocols/msn/error.c:215
+#: src/protocols/msn/error.c:217
 msgid "Passport account not yet verified"
 msgstr "Passport-account nog niet geverifieerd"
 
-#: src/protocols/msn/error.c:218
+#: src/protocols/msn/error.c:220
 msgid "Bad ticket"
 msgstr "Slecht ticket"
 
-#: src/protocols/msn/error.c:222
+#: src/protocols/msn/error.c:224
 #, c-format
 msgid "Unknown Error Code %d"
 msgstr "Onbekende foutcode %d"
 
-#: src/protocols/msn/error.c:234
+#: src/protocols/msn/error.c:236
 #, c-format
 msgid "MSN Error: %s\n"
 msgstr "MSN Fout: %s\n"
 
-#: src/protocols/msn/msn.c:72
+#: src/protocols/msn/msn.c:114
 msgid "Your new MSN friendly name is too long."
 msgstr "Uw nieuwe MSN bijnaam is te lang."
 
-#: src/protocols/msn/msn.c:191
+#: src/protocols/msn/msn.c:222
 msgid "Set your friendly name."
 msgstr "Bijnaam instellen."
 
-#: src/protocols/msn/msn.c:192
+#: src/protocols/msn/msn.c:223
 msgid "This is the name that other MSN buddies will see you as."
 msgstr "Dit is de naam die uw contacten zullen zien."
 
-#: src/protocols/msn/msn.c:204
+#: src/protocols/msn/msn.c:239
 msgid "Set your home phone number."
 msgstr "Telefoonnummer voor thuis instellen."
 
-#: src/protocols/msn/msn.c:215
+#: src/protocols/msn/msn.c:254
 msgid "Set your work phone number."
 msgstr "Telefoonnummer voor werk instellen."
 
-#: src/protocols/msn/msn.c:226
+#: src/protocols/msn/msn.c:269
 msgid "Set your mobile phone number."
 msgstr "Mobiel telefoonnummer instellen."
 
-#: src/protocols/msn/msn.c:235
+#: src/protocols/msn/msn.c:282
 msgid "Allow MSN Mobile pages?"
 msgstr "MSN-mobile pagina's toestaan?"
 
-#: src/protocols/msn/msn.c:236
+#: src/protocols/msn/msn.c:283
 msgid ""
 "Do you want to allow or disallow people on your buddy list to send you MSN "
 "Mobile pages to your cell phone or other mobile device?"
@@ -6243,91 +6574,96 @@
 "Wilt u dat mensen op uw contactenlijst MSN-mobile pagina's kunnen sturen "
 "naar uw mobiele telefoon of ander mobiel apparaat?"
 
-#: src/protocols/msn/msn.c:240
+#: src/protocols/msn/msn.c:287
 msgid "Allow"
 msgstr "Toestaan"
 
-#: src/protocols/msn/msn.c:241
+#: src/protocols/msn/msn.c:288
 msgid "Disallow"
 msgstr "Weigeren"
 
-#: src/protocols/msn/msn.c:258
+#: src/protocols/msn/msn.c:311
 msgid "Send a mobile message."
 msgstr "Een mobiel bericht versturen."
 
-#: src/protocols/msn/msn.c:260
+#: src/protocols/msn/msn.c:313
 msgid "Page"
 msgstr "Pagina"
 
-#: src/protocols/msn/msn.c:361 src/protocols/msn/msn.c:662
-#: src/protocols/msn/state.c:32
+#: src/protocols/msn/msn.c:463 src/protocols/msn/msn.c:756
+#: src/protocols/msn/state.c:34
 msgid "Away From Computer"
 msgstr "Weg van de computer"
 
-#: src/protocols/msn/msn.c:362 src/protocols/msn/msn.c:664
-#: src/protocols/msn/state.c:31 src/protocols/yahoo/yahoo.c:2275
-#: src/protocols/yahoo/yahoo.c:2601 src/protocols/yahoo/yahoo.c:2715
+#: src/protocols/msn/msn.c:464 src/protocols/msn/msn.c:758
+#: src/protocols/msn/state.c:33 src/protocols/yahoo/yahoo.c:2491
+#: src/protocols/yahoo/yahoo.c:2853 src/protocols/yahoo/yahoo.c:2969
 msgid "Be Right Back"
 msgstr "Ben zo terug"
 
-#: src/protocols/msn/msn.c:363 src/protocols/msn/msn.c:666
-#: src/protocols/msn/state.c:29 src/protocols/novell/novell.c:2150
-#: src/protocols/novell/novell.c:2263 src/protocols/novell/novell.c:2317
-#: src/protocols/yahoo/yahoo.c:2277 src/protocols/yahoo/yahoo.c:2603
-#: src/protocols/yahoo/yahoo.c:2716
+#: src/protocols/msn/msn.c:465 src/protocols/msn/msn.c:760
+#: src/protocols/msn/state.c:31 src/protocols/novell/novell.c:2727
+#: src/protocols/novell/novell.c:2842 src/protocols/novell/novell.c:2896
+#: src/protocols/silc/buddy.c:1383 src/protocols/silc/silc.c:47
+#: src/protocols/silc/silc.c:78 src/protocols/yahoo/yahoo.c:2493
+#: src/protocols/yahoo/yahoo.c:2855 src/protocols/yahoo/yahoo.c:2970
 msgid "Busy"
 msgstr "Bezig"
 
-#: src/protocols/msn/msn.c:364 src/protocols/msn/msn.c:668
-#: src/protocols/msn/state.c:33 src/protocols/yahoo/yahoo.c:2285
-#: src/protocols/yahoo/yahoo.c:2611 src/protocols/yahoo/yahoo.c:2720
+#: src/protocols/msn/msn.c:466 src/protocols/msn/msn.c:762
+#: src/protocols/msn/state.c:35 src/protocols/yahoo/yahoo.c:2501
+#: src/protocols/yahoo/yahoo.c:2863 src/protocols/yahoo/yahoo.c:2974
 msgid "On The Phone"
 msgstr "Aan de telefoon"
 
-#: src/protocols/msn/msn.c:365 src/protocols/msn/msn.c:670
-#: src/protocols/msn/state.c:34 src/protocols/yahoo/yahoo.c:2289
-#: src/protocols/yahoo/yahoo.c:2615 src/protocols/yahoo/yahoo.c:2722
+#: src/protocols/msn/msn.c:467 src/protocols/msn/msn.c:764
+#: src/protocols/msn/state.c:36 src/protocols/yahoo/yahoo.c:2505
+#: src/protocols/yahoo/yahoo.c:2867 src/protocols/yahoo/yahoo.c:2976
 msgid "Out To Lunch"
 msgstr "Aan het lunchen"
 
-#: src/protocols/msn/msn.c:366 src/protocols/msn/msn.c:672
-#: src/protocols/zephyr/zephyr.c:1179 src/protocols/zephyr/zephyr.c:1194
+#: src/protocols/msn/msn.c:468 src/protocols/msn/msn.c:766
+#: src/protocols/zephyr/zephyr.c:1355 src/protocols/zephyr/zephyr.c:1374
 msgid "Hidden"
 msgstr "Onzichtbaar"
 
-#: src/protocols/msn/msn.c:378
+#: src/protocols/msn/msn.c:479
 msgid "Set Friendly Name"
 msgstr "Bijnaam instellen"
 
-#: src/protocols/msn/msn.c:386
+#: src/protocols/msn/msn.c:484
 msgid "Set Home Phone Number"
 msgstr "Telefoon thuis instellen"
 
-#: src/protocols/msn/msn.c:392
+#: src/protocols/msn/msn.c:488
 msgid "Set Work Phone Number"
 msgstr "Telefoon werk instellen"
 
-#: src/protocols/msn/msn.c:398
+#: src/protocols/msn/msn.c:492
 msgid "Set Mobile Phone Number"
 msgstr "Mobiel nummer instellen"
 
-#: src/protocols/msn/msn.c:407
+#: src/protocols/msn/msn.c:498
 msgid "Enable/Disable Mobile Devices"
 msgstr "Mobiele apparaten inschakelen/uitschakelen"
 
-#: src/protocols/msn/msn.c:414
+#: src/protocols/msn/msn.c:503
 msgid "Allow/Disallow Mobile Pages"
 msgstr "MSN-mobile pagina's toestaan/weigeren"
 
-#: src/protocols/msn/msn.c:440
+#: src/protocols/msn/msn.c:526
 msgid "Send to Mobile"
 msgstr "Verzenden naar mobiel"
 
-#: src/protocols/msn/msn.c:449
+#: src/protocols/msn/msn.c:536
 msgid "Initiate Chat"
 msgstr "Chat starten"
 
-#: src/protocols/msn/msn.c:473
+#: src/protocols/msn/msn.c:540
+msgid "Update Buddy Icon"
+msgstr "Contactplaatje bijwerken"
+
+#: src/protocols/msn/msn.c:577
 msgid ""
 "SSL support is needed for MSN. Please install a supported SSL library. See "
 "http://gaim.sf.net/faq-ssl.php for more information."
@@ -6335,103 +6671,122 @@
 "SSL-ondersteuning is vereist voor MSN. Installeer een SSL-bibliotheek. Kijk "
 "op http://gaim.sf.net/faq-ssl.php voor meer informatie."
 
-#: src/protocols/msn/msn.c:785
-#, c-format
-msgid ""
-"An MSN screen name must be in the form \"user@server.com\". Perhaps you "
-"meant %s@hotmail.com. No changes were made to your allow list."
-msgstr ""
-"Een MSN gebruikersnaam moet de vorm \"gebruiker@server.com\" hebben. "
-"Misschien bedoelde u %s@hotmail.com. Er is niets veranderd aan de lijst."
-
-#: src/protocols/msn/msn.c:789 src/protocols/msn/msn.c:829
-msgid "Invalid MSN screen name"
-msgstr "Ongeldige MSN gebruikersnaam"
-
-#: src/protocols/msn/msn.c:825
-#, c-format
-msgid ""
-"An MSN screen name must be in the form \"user@server.com\". Perhaps you "
-"meant %s@hotmail.com. No changes were made to your block list."
-msgstr ""
-"Een MSN gebruikersnaam moet de vorm \"gebruiker@server.com\" hebben. "
-"Misschien bedoelde u %s@hotmail.com. Er is niets veranderd aan de lijst."
-
-#: src/protocols/msn/msn.c:1332 src/protocols/yahoo/yahoo.c:2899
-msgid "<html><body><b>Error retrieving profile</b></body></html>"
-msgstr "<html><body><b>Fout bij ophalen profiel</b></body></html>"
+#: src/protocols/msn/msn.c:1167 src/protocols/yahoo/yahoo_profile.c:659
+#: src/protocols/zephyr/zephyr.c:626
+#, c-format
+msgid "<b>Alias:</b> %s<br>"
+msgstr "<b>Alias:</b> %s<br>"
+
+#. put a link to the actual profile URL
+#: src/protocols/msn/msn.c:1172 src/protocols/msn/msn.c:1512
+#: src/protocols/yahoo/yahoo_profile.c:1168 src/util.c:792
+#, c-format
+msgid "<b>%s:</b> "
+msgstr "<b>%s:</b> "
+
+#: src/protocols/msn/msn.c:1173
+#, c-format
+msgid "<font sml=\"msn\">%s</font><br>"
+msgstr ""
+
+#: src/protocols/msn/msn.c:1179 src/protocols/yahoo/yahoo_profile.c:664
+#, c-format
+msgid "<b>%s:</b> %s<br>"
+msgstr "<b>%s:</b> %s<br>"
+
+#: src/protocols/msn/msn.c:1242
+#, fuzzy
+msgid "MSN Profile"
+msgstr "Profiel instellen"
+
+#: src/protocols/msn/msn.c:1247 src/protocols/msn/msn.c:1499
+#: src/protocols/yahoo/yahoo_profile.c:761
+msgid "Error retrieving profile"
+msgstr "Fout bij ophalen van profiel"
 
 #. Age
-#: src/protocols/msn/msn.c:1402 src/protocols/oscar/oscar.c:4252
+#: src/protocols/msn/msn.c:1318 src/protocols/oscar/oscar.c:4886
 #: src/protocols/trepia/trepia.c:285 src/protocols/trepia/trepia.c:404
-#: src/protocols/yahoo/yahoo.c:3009
+#: src/protocols/yahoo/yahoo_profile.c:1015
 msgid "Age"
 msgstr "Leeftijd"
 
 #. Gender
-#: src/protocols/msn/msn.c:1409 src/protocols/oscar/oscar.c:4239
+#: src/protocols/msn/msn.c:1325 src/protocols/oscar/oscar.c:4872
 #: src/protocols/trepia/trepia.c:279 src/protocols/trepia/trepia.c:406
-#: src/protocols/yahoo/yahoo.c:3017
+#: src/protocols/yahoo/yahoo_profile.c:1025
 msgid "Gender"
 msgstr "Geslacht"
 
-#: src/protocols/msn/msn.c:1417 src/protocols/yahoo/yahoo.c:3013
+#: src/protocols/msn/msn.c:1334 src/protocols/yahoo/yahoo_profile.c:1020
 msgid "Marital Status"
 msgstr "Burgerlijke status"
 
-#: src/protocols/msn/msn.c:1424 src/protocols/yahoo/yahoo.c:3005
+#: src/protocols/msn/msn.c:1341 src/protocols/yahoo/yahoo_profile.c:1010
 msgid "Location"
 msgstr "Lokatie"
 
-#: src/protocols/msn/msn.c:1432 src/protocols/yahoo/yahoo.c:3021
+#: src/protocols/msn/msn.c:1349 src/protocols/yahoo/yahoo_profile.c:1030
 msgid "Occupation"
 msgstr "Beroep"
 
-#: src/protocols/msn/msn.c:1449 src/protocols/msn/msn.c:1455
-#: src/protocols/msn/msn.c:1462 src/protocols/msn/msn.c:1469
-#: src/protocols/msn/msn.c:1476
+#: src/protocols/msn/msn.c:1366 src/protocols/msn/msn.c:1372
+#: src/protocols/msn/msn.c:1379 src/protocols/msn/msn.c:1387
+#: src/protocols/msn/msn.c:1394
 msgid "A Little About Me"
 msgstr "Enige info over mij"
 
-#: src/protocols/msn/msn.c:1485 src/protocols/msn/msn.c:1498
-#: src/protocols/msn/msn.c:1505
+#: src/protocols/msn/msn.c:1403 src/protocols/msn/msn.c:1409
+#: src/protocols/msn/msn.c:1416 src/protocols/msn/msn.c:1423
 msgid "Favorite Things"
 msgstr "Mijn favoriete dingen"
 
-#: src/protocols/msn/msn.c:1514 src/protocols/msn/msn.c:1520
-#: src/protocols/msn/msn.c:1527
+#: src/protocols/msn/msn.c:1432 src/protocols/msn/msn.c:1438
+#: src/protocols/msn/msn.c:1445
 msgid "Hobbies and Interests"
 msgstr "Hobbies en interesses"
 
-#: src/protocols/msn/msn.c:1536 src/protocols/msn/msn.c:1542
-#: src/protocols/yahoo/yahoo.c:3056
+#: src/protocols/msn/msn.c:1454 src/protocols/msn/msn.c:1460
+#: src/protocols/yahoo/yahoo_profile.c:1072
 msgid "Favorite Quote"
 msgstr "Favoriete citaat"
 
-#: src/protocols/msn/msn.c:1550 src/protocols/yahoo/yahoo.c:3092
+#: src/protocols/msn/msn.c:1468 src/protocols/yahoo/yahoo_profile.c:1123
 msgid "Last Updated"
 msgstr "Laatst bijgewerkt"
 
 #. Homepage
-#: src/protocols/msn/msn.c:1561 src/protocols/trepia/trepia.c:289
-#: src/protocols/trepia/trepia.c:419
+#: src/protocols/msn/msn.c:1479 src/protocols/silc/ops.c:826
+#: src/protocols/trepia/trepia.c:289 src/protocols/trepia/trepia.c:419
 msgid "Homepage"
 msgstr "Homepage"
 
-#: src/protocols/msn/msn.c:1583 src/protocols/yahoo/yahoo.c:3107
-#, c-format
-msgid "User information for %s unavailable"
-msgstr "Gebruikersinformatie voor %s niet beschikbaar"
-
-#: src/protocols/msn/msn.c:1585 src/protocols/yahoo/yahoo.c:3109
-msgid "The user's profile is empty."
-msgstr "Gebruikersprofiel is leeg."
-
-#: src/protocols/msn/msn.c:1626
+#: src/protocols/msn/msn.c:1501
+msgid "The user has not created a public profile."
+msgstr ""
+
+#: src/protocols/msn/msn.c:1502
+msgid ""
+"MSN reported not being able to find the user's profile. This either means "
+"that the user does not exist, or that the user exists but has not created a "
+"public profile."
+msgstr ""
+
+#: src/protocols/msn/msn.c:1506
+msgid ""
+"Gaim could not find any information in the user's profile. The user most "
+"likely does not exist."
+msgstr ""
+
+#: src/protocols/msn/msn.c:1512 src/protocols/yahoo/yahoo_profile.c:1168
+msgid "Profile URL"
+msgstr "Profiel URL"
+
+#: src/protocols/msn/msn.c:1643
 msgid "Display conversation closed notices"
 msgstr "Berichten over sluiting van gesprek weergeven"
 
-#: src/protocols/msn/msn.c:1631
+#: src/protocols/msn/msn.c:1648
 msgid "Display timeout notices"
 msgstr "Berichten over timeouts weergeven"
 
@@ -6446,85 +6801,40 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/msn/msn.c:1717 src/protocols/msn/msn.c:1719
+#: src/protocols/msn/msn.c:1732 src/protocols/msn/msn.c:1734
 msgid "MSN Protocol Plugin"
 msgstr "MSN-protocol plugin"
 
-#: src/protocols/msn/msn.c:1737 src/protocols/trepia/trepia.c:1302
+#: src/protocols/msn/msn.c:1753 src/protocols/trepia/trepia.c:1292
 msgid "Login server"
 msgstr "Aanmeldserver"
 
-#: src/protocols/msn/msn.c:1746
+#: src/protocols/msn/msn.c:1762
 msgid "Use HTTP Method"
 msgstr "HTTP-methode gebruiken"
 
-#: src/protocols/msn/nexus.c:56
+#: src/protocols/msn/nexus.c:79
 msgid "Unable to connect to server"
 msgstr "Kan geen verbinding maken met de server"
 
-#: src/protocols/msn/nexus.c:121 src/protocols/msn/nexus.c:130
-msgid "Unable to write to MSN Nexus server."
-msgstr "Kan niet naar MSN-Nexus server schrijven."
-
-#: src/protocols/msn/nexus.c:147
-msgid "MSN Nexus server returned invalid redirect information."
-msgstr "MSN-Nexus server geeft ongeldige doorstuurinformatie terug."
-
-#: src/protocols/msn/nexus.c:204
+#: src/protocols/msn/nexus.c:215
 msgid "Unknown error when attempting to authorize with MSN login server."
 msgstr "Onbekende fout opgetreden bij aanmeldpoging op MSN-server."
 
-#: src/protocols/msn/notification.c:309 src/protocols/trepia/trepia.c:635
+#: src/protocols/msn/notification.c:84
+msgid "Requesting to send password"
+msgstr "Wachtwoord-toestemming aangevraagd"
+
+#: src/protocols/msn/notification.c:118 src/protocols/trepia/trepia.c:635
 msgid "Retrieving buddy list"
 msgstr "Opvragen van contactenlijst"
 
-#: src/protocols/msn/notification.c:334 src/protocols/msn/notification.c:366
-#: src/protocols/oscar/oscar.c:1646
+#: src/protocols/msn/notification.c:144 src/protocols/msn/notification.c:173
+#: src/protocols/oscar/oscar.c:2315
 msgid "Password sent"
 msgstr "Wachtwoord verzonden"
 
-#: src/protocols/msn/notification.c:361
-msgid "Unable to send password"
-msgstr "Kan wachtwoord niet verzenden"
-
-#: src/protocols/msn/notification.c:397
-msgid "Protocol not supported"
-msgstr "Protocol niet ondersteund"
-
-#: src/protocols/msn/notification.c:440
-msgid "You have been disconnected. You have signed on from another location."
-msgstr ""
-"De verbinding is verbroken. U heeft uzelf aangemeld vanaf een andere locatie."
-
-#: src/protocols/msn/notification.c:445
-msgid "You have been disconnected. The MSN servers are going down temporarily."
-msgstr ""
-"De verbinding is verbroken. De MSN-servers worden tijdelijk uitgeschakeld."
-
-#: src/protocols/msn/notification.c:584
-#, c-format
-msgid "The user %s (%s) wants to add %s to his or her buddy list."
-msgstr "De gebruiker %s (%s) wil %s toevoegen aan zijn/haar contactenlijst."
-
-#: src/protocols/msn/notification.c:903 src/protocols/msn/notification.c:1070
-#, c-format
-msgid "The user %s (%s) wants to add you to their buddy list."
-msgstr "De gebruiker %s (%s) wil u toevoegen aan zijn/haar contactenlijst."
-
-#: src/protocols/msn/notification.c:1362
-#, c-format
-msgid ""
-"Your MSN buddy list for %s is temporarily unavailable. Please wait and try "
-"again."
-msgstr ""
-"Uw MSN contactenlijst voor %s in tijdelijk niet beschikbaar. Probeert u het "
-"later nog eens."
-
-#: src/protocols/msn/notification.c:1607
-msgid "Unable to transfer to notification server"
-msgstr "Kan niet overzetten naar de meldingsserver"
-
-#: src/protocols/msn/notification.c:1776
+#: src/protocols/msn/notification.c:1071
 #, c-format
 msgid ""
 "The MSN server will shut down for maintenance in %d minute. You will "
@@ -6552,35 +6862,66 @@
 "\n"
 "U zult zich weer kunnen aanmelden als het onderhoud gepleegd is."
 
-#: src/protocols/msn/servconn.c:389
-msgid "IO Error."
-msgstr "IO-fout."
-
-#: src/protocols/msn/servconn.c:527
+#: src/protocols/msn/notification.c:1136
+msgid "Syncing with server"
+msgstr "Synchronisatie met server"
+
+#: src/protocols/msn/servconn.c:46
+#, c-format
+msgid "Unable to connect to %s server"
+msgstr "Kan geen verbinding maken met de %s-server"
+
+#: src/protocols/msn/servconn.c:50
+#, c-format
+msgid "Error writing to %s server"
+msgstr "Fout bij schrijven naar %s-server"
+
+#: src/protocols/msn/servconn.c:54
+#, c-format
+msgid "Error reading from %s server"
+msgstr "Fout bij inlezen van %s server"
+
+#: src/protocols/msn/servconn.c:58
+#, c-format
+msgid "Unknown error from %s server"
+msgstr "Onbekende fout van %s-server"
+
+#: src/protocols/msn/servconn.c:72
+#, c-format
+msgid "MSN error for account %s"
+msgstr "MSN-fout voor account %s"
+
+#: src/protocols/msn/servconn.c:346
 msgid "Received HTTP error. Please report this."
 msgstr "HTTP-fout ontvangen. Dit kunt u het beste rapporteren."
 
-#: src/protocols/msn/switchboard.c:150
+#: src/protocols/msn/switchboard.c:191
 msgid "The conversation has become inactive and timed out."
 msgstr "Het gesprek is niet meer actief en gemarkeerd als verlopen."
 
-#: src/protocols/msn/switchboard.c:159
+#: src/protocols/msn/switchboard.c:199
 #, c-format
 msgid "%s has closed the conversation window."
 msgstr "%s heeft het gespreksvenster gesloten."
 
-#: src/protocols/msn/switchboard.c:300
-msgid "An MSN message may not have been received."
-msgstr "Een MSN-bericht is waarschijnlijk niet aangekomen."
-
-#: src/protocols/napster/napster.c:228
+#: src/protocols/msn/userlist.c:86
+#, c-format
+msgid "The user %s (%s) wants to add %s to his or her buddy list."
+msgstr "De gebruiker %s (%s) wil %s toevoegen aan zijn/haar contactenlijst."
+
+#: src/protocols/msn/userlist.c:94
+#, c-format
+msgid "The user %s wants to add %s to his or her buddy list."
+msgstr "De gebruiker %s wil %s toevoegen aan zijn/haar contactenlijst."
+
+#: src/protocols/napster/napster.c:230
 msgid "Unable to read header from server"
 msgstr "Kan header niet lezen van server"
 
-#: src/protocols/napster/napster.c:242
-#, c-format
-msgid "Unable to read message from server.  Command is %hd, length is %hd."
-msgstr "Kan bericht niet lezen van server. Opdracht is %hd, lengte is %hd."
+#: src/protocols/napster/napster.c:244
+#, c-format
+msgid "Unable to read message from server: %s.  Command is %hd, length is %hd."
+msgstr "Kan bericht niet lezen van server: %s. Opdracht is %hd, lengte is %hd."
 
 #: src/protocols/napster/napster.c:307
 #, c-format
@@ -6607,8 +6948,7 @@
 msgid ""
 "You were disconnected from the server, because you logged on from a "
 "different location"
-msgstr ""
-"De verbinding is verbroken. U heeft uzelf aangemeld vanaf een andere locatie."
+msgstr "De verbinding is verbroken. U heeft uzelf aangemeld vanaf een andere locatie."
 
 #. MSG_CLIENT_PING
 #: src/protocols/napster/napster.c:428
@@ -6616,12 +6956,8 @@
 msgid "%s requested a PING"
 msgstr "%s vraagt om een PING"
 
-#: src/protocols/napster/napster.c:541
-msgid "Get Info"
-msgstr "Extra info"
-
-#: src/protocols/napster/napster.c:555 src/protocols/oscar/oscar.c:5522
-#: src/protocols/toc/toc.c:1259
+#: src/protocols/napster/napster.c:541 src/protocols/oscar/oscar.c:6188
+#: src/protocols/toc/toc.c:1266
 msgid "_Group:"
 msgstr "_Groep:"
 
@@ -6636,74 +6972,235 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/napster/napster.c:640 src/protocols/napster/napster.c:642
+#: src/protocols/napster/napster.c:624 src/protocols/napster/napster.c:626
 msgid "NAPSTER Protocol Plugin"
 msgstr "NAPSTER-protocol plugin"
 
-#: src/protocols/novell/novell.c:113
-#, c-format
-msgid "Login failed (0x%X)."
-msgstr ""
-
-#: src/protocols/novell/novell.c:225
-#, fuzzy, c-format
-msgid "Unable to send message. Could not get details for user (0x%X)."
-msgstr "Kan het bericht niet verzenden. Het bericht is te groot."
-
-#: src/protocols/novell/novell.c:371
-#, fuzzy, c-format
-msgid "Unable to add %s to your buddy list (0x%X)."
-msgstr "Kan \"%s\" niet toevoegen aan uw Napster hotlist"
+#: src/protocols/novell/nmuser.c:1868
+msgid "Required parameters not passed in"
+msgstr "Vereiste parameters niet bijgevoegd"
+
+#: src/protocols/novell/nmuser.c:1871
+msgid "Unable to write to network"
+msgstr "Kan niet naar netwerk schrijven"
+
+#: src/protocols/novell/nmuser.c:1874
+msgid "Unable to read from network"
+msgstr "Kan niet lezen van netwerk"
+
+#: src/protocols/novell/nmuser.c:1877
+msgid "Error communicating with server"
+msgstr "Fout opgetreden bij communicatie met de server"
+
+#: src/protocols/novell/nmuser.c:1881
+msgid "Conference not found"
+msgstr "Bijeenkomst niet gevonden"
+
+#: src/protocols/novell/nmuser.c:1884
+msgid "Conference does not exist"
+msgstr "Bijeenkomst bestaat niet"
+
+#: src/protocols/novell/nmuser.c:1888
+msgid "A folder with that name already exists"
+msgstr "Die map bestaat al"
+
+#: src/protocols/novell/nmuser.c:1891
+msgid "Not supported"
+msgstr "Niet ondersteund"
+
+#: src/protocols/novell/nmuser.c:1895
+msgid "Password has expired"
+msgstr "Wachtwoord verlopen"
+
+#: src/protocols/novell/nmuser.c:1898
+msgid "Invalid password"
+msgstr "Ongeldig wachtwoord"
+
+#: src/protocols/novell/nmuser.c:1901
+msgid "User not found"
+msgstr "Gebruiker niet gevonden"
+
+#: src/protocols/novell/nmuser.c:1904
+msgid "Account has been disabled"
+msgstr "Account is uitgeschakeld"
+
+#: src/protocols/novell/nmuser.c:1907
+msgid "The server could not access the directory"
+msgstr "De server kon het adresboek niet benaderen"
+
+#: src/protocols/novell/nmuser.c:1910
+msgid "Your system administrator has disabled this operation"
+msgstr "Uw systeembeheerder heeft deze actie uitgeschakeld"
+
+#: src/protocols/novell/nmuser.c:1913
+msgid "The server is unavailable; try again later"
+msgstr "De server is niet beschikbaar. Probeer het later nog eens"
+
+#: src/protocols/novell/nmuser.c:1916
+msgid "Cannot add a contact to the same folder twice"
+msgstr "Kan een contact niet tweemaal toevoegen aan dezelfde map"
+
+#: src/protocols/novell/nmuser.c:1919
+msgid "Cannot add yourself"
+msgstr "Kan eigen account niet toevoegen"
+
+#: src/protocols/novell/nmuser.c:1922
+msgid "Master archive is misconfigured"
+msgstr "Hoofdarchief onjuist geconfigureerd"
+
+#: src/protocols/novell/nmuser.c:1926
+msgid "Invalid username or password"
+msgstr "Ongeldige gebruikersnaam of wachtwoord"
+
+#: src/protocols/novell/nmuser.c:1929
+msgid "Could not recognize the host of the username you entered"
+msgstr "Kan de computer van de gegeven gebruiker niet vinden"
+
+#: src/protocols/novell/nmuser.c:1932
+msgid ""
+"Your account has been disabled because too many invalid passwords were "
+"entered"
+msgstr "Uw account is uitgeschakeld omdat het wachtwoord te vaak onjuist is ingevuld"
+
+#: src/protocols/novell/nmuser.c:1935
+msgid "You cannot add the same person twice to a conversation"
+msgstr "U kunt een persoon slechts eenmaal toevoegen aan een gesprek"
+
+#: src/protocols/novell/nmuser.c:1939
+msgid "You have reached your limit for the number of contacts allowed"
+msgstr "U heeft uw maximale hoeveelheid contacten bereikt"
+
+#: src/protocols/novell/nmuser.c:1942
+msgid "You have entered an invalid username"
+msgstr "U heeft een ongeldige gebruikersnaam ingevuld"
+
+#: src/protocols/novell/nmuser.c:1945
+msgid "An error occurred while updating the directory"
+msgstr "Er is een fout opgetreden bij het bijwerken van het adresboek"
+
+#: src/protocols/novell/nmuser.c:1948
+msgid "Incompatible protocol version"
+msgstr "Incompatibele protocolversie"
+
+#: src/protocols/novell/nmuser.c:1951
+msgid "The user has blocked you"
+msgstr "De gebruiker heeft u geblokkeerd"
+
+#: src/protocols/novell/nmuser.c:1954
+msgid ""
+"This evaluation version does not allow more than ten users to log in at one "
+"time"
+msgstr ""
+"Deze evaluatieversie geeft slechts de mogelijkheid voor tien gelijktijdige "
+"gebruikers"
+
+#: src/protocols/novell/nmuser.c:1957
+msgid "The user is either offline or you are blocked"
+msgstr "De gebruiker is off-line of heeft u geblokkeerd"
+
+#: src/protocols/novell/nmuser.c:1960
+#, c-format
+msgid "Unknown error: 0x%X"
+msgstr "Onbekende fout: 0x%X"
+
+#: src/protocols/novell/novell.c:116
+#, c-format
+msgid "Login failed (%s)."
+msgstr "Aanmelden mislukt (%s)."
+
+#: src/protocols/novell/novell.c:229
+#, c-format
+msgid "Unable to send message. Could not get details for user (%s)."
+msgstr ""
+"Kan het bericht niet verzenden. Kan geen details opvragen voor gebruiker (%"
+"s)."
+
+#: src/protocols/novell/novell.c:375
+#, c-format
+msgid "Unable to add %s to your buddy list (%s)."
+msgstr "Kan %s niet toevoegen aan uw contactenlijst (%s)."
 
 #. TODO: Improve this! message to who or for what conference?
-#: src/protocols/novell/novell.c:397
-#, fuzzy, c-format
-msgid "Unable to send message (0x%X)."
-msgstr "Kan het bericht niet verzenden."
-
-#: src/protocols/novell/novell.c:485
-#, c-format
-msgid "Unable to send message to %s. Could not create the conference (0x%X)."
-msgstr ""
-
-#: src/protocols/novell/novell.c:489
-#, fuzzy, c-format
-msgid "Unable to send message. Could not create the conference (0x%X)."
-msgstr "Kan het bericht niet verzenden. Het bericht is te groot."
-
-#: src/protocols/novell/novell.c:536
+#: src/protocols/novell/novell.c:401
+#, c-format
+msgid "Unable to send message (%s)."
+msgstr "Kan het bericht niet verzenden (%s)."
+
+#: src/protocols/novell/novell.c:472 src/protocols/novell/novell.c:965
+#, c-format
+msgid "Unable to invite user (%s)."
+msgstr "Kan gebruiker niet uitnodigen (%s)."
+
+#: src/protocols/novell/novell.c:511
+#, c-format
+msgid "Unable to send message to %s. Could not create the conference (%s)."
+msgstr "Kan het bericht aan %s niet verzenden. Kan de bijeenkomst niet aanmaken (%s)."
+
+#: src/protocols/novell/novell.c:516
+#, c-format
+msgid "Unable to send message. Could not create the conference (%s)."
+msgstr "Kan het bericht niet verzenden. Kan de bijeenkomst niet aanmaken (%s)."
+
+#: src/protocols/novell/novell.c:563
 #, c-format
 msgid ""
 "Unable to move user %s to folder %s in the server side list. Error while "
-"creating folder (0x%X)."
-msgstr ""
-
-#: src/protocols/novell/novell.c:584
+"creating folder (%s)."
+msgstr ""
+"Kan de gebruiker %s niet naar de map %s verplaatsen in de lijst. Fout bij "
+"aanmaken van map (%s)."
+
+#: src/protocols/novell/novell.c:611
 #, c-format
 msgid ""
 "Unable to add %s to your buddy list. Error creating folder in server side "
-"list (0x%X)."
-msgstr ""
-
-#: src/protocols/novell/novell.c:615 src/protocols/novell/novell.c:1344
+"list (%s)."
+msgstr ""
+"Kan %s niet toevoegen aan de contactenlijst. Fout bij aanmaken van map in de "
+"lijst (%s)."
+
+#: src/protocols/novell/novell.c:683
+#, c-format
+msgid "Could not get details for user %s (%s)."
+msgstr "Kan geen details opvragen voor gebruiker %s (%s)."
+
+#: src/protocols/novell/novell.c:729 src/protocols/novell/novell.c:875
+#, c-format
+msgid "Unable to add user to privacy list (%s)."
+msgstr "Kan gebruiker niet toevoegen aan uw privacy-lijst (%s)."
+
+#: src/protocols/novell/novell.c:776
+#, c-format
+msgid "Unable to add %s to deny list (%s)."
+msgstr "Kan %s niet aan uw negeer-lijst toevoegen (%s)."
+
+#: src/protocols/novell/novell.c:829
 #, fuzzy, c-format
-msgid "GroupWise Conference %d"
-msgstr "Groepsgesprek openen"
-
-#: src/protocols/novell/novell.c:659
-#, c-format
-msgid "Could not get details for user %s (0x%X)."
-msgstr ""
-
-#: src/protocols/novell/novell.c:773 src/protocols/novell/novell.c:1107
-#, fuzzy
+msgid "Unable to add %s to permit list (%s)."
+msgstr "Kan \"%s\" niet toevoegen aan uw Napster hotlist"
+
+#: src/protocols/novell/novell.c:897
+#, fuzzy, c-format
+msgid "Unable to remove %s from privacy list (%s)."
+msgstr "Kan \"%s\" niet toevoegen aan uw Napster hotlist"
+
+#: src/protocols/novell/novell.c:920 src/protocols/novell/novell.c:1574
+#, c-format
+msgid "Unable to change server side privacy settings (%s)."
+msgstr ""
+
+#: src/protocols/novell/novell.c:992
+#, c-format
+msgid "Unable to create conference (%s)."
+msgstr "Kan geen bijeenkomst aanmaken (%s)."
+
+#: src/protocols/novell/novell.c:1103 src/protocols/novell/novell.c:1613
 msgid "Error communicating with server. Closing connection."
-msgstr "Fout opgetreden bij communicatie met de GaduGadu-server"
-
-#: src/protocols/novell/novell.c:982
-#, fuzzy
+msgstr "Fout opgetreden bij communicatie met de server. Verbinding wordt verbroken."
+
+#: src/protocols/novell/novell.c:1426
 msgid "Userid"
-msgstr "Gebruikers"
+msgstr "Gebruikers-ID"
 
 #. tag = _("DN");
 #. value = nm_user_record_get_dn(user_record);
@@ -6712,109 +7209,109 @@
 #. tag, value);
 #. }
 #.
-#: src/protocols/novell/novell.c:996
-#, fuzzy
+#: src/protocols/novell/novell.c:1440
 msgid "Full name"
 msgstr "Volledige naam"
 
-#: src/protocols/novell/novell.c:1016
-#, fuzzy
+#: src/protocols/novell/novell.c:1460
 msgid "User Properties"
-msgstr "Gebruikersopties"
-
-#: src/protocols/novell/novell.c:1084
-#, fuzzy
+msgstr "Gebruikerseigenschappen"
+
+#: src/protocols/novell/novell.c:1564
+#, c-format
+msgid "GroupWise Conference %d"
+msgstr "Groupwise bijeenkomst %d"
+
+#: src/protocols/novell/novell.c:1589
 msgid "Unable to make SSL connection to server."
-msgstr "Kan geen verbinding maken met de computer."
-
-#: src/protocols/novell/novell.c:1113
-#, c-format
-msgid "Error processing event or response. (0x%X)"
-msgstr ""
-
-#: src/protocols/novell/novell.c:1147
-#, fuzzy
+msgstr "Kan geen beveiligde verbinding (SSL) maken met de server."
+
+#: src/protocols/novell/novell.c:1619
+#, c-format
+msgid "Error processing event or response (%s)."
+msgstr "Fout bij verwerken van gebeurtenis / reactie (%s)."
+
+#: src/protocols/novell/novell.c:1653
 msgid "Authenticating..."
-msgstr "Naam en wachtwoord worden gecontroleerd"
-
-#: src/protocols/novell/novell.c:1162
-#, fuzzy
+msgstr "Identificatie..."
+
+#: src/protocols/novell/novell.c:1668
 msgid "Waiting for response..."
 msgstr "Wacht op antwoord..."
 
-#: src/protocols/novell/novell.c:1302
-#, fuzzy
+#: src/protocols/novell/novell.c:1803
+#, c-format
+msgid "%s has been invited to this conversation."
+msgstr "%s is uitgenodigs voor dit gesprek."
+
+#: src/protocols/novell/novell.c:1830
 msgid "Invitation to Conversation"
-msgstr "Gesprek opslaan"
-
-#: src/protocols/novell/novell.c:1303
+msgstr "Uitnodiging voor gesprek"
+
+#: src/protocols/novell/novell.c:1831
 #, c-format
 msgid ""
 "Invitation from: %s\n"
 "\n"
 "Sent: %s"
 msgstr ""
-
-#: src/protocols/novell/novell.c:1305
-#, fuzzy
+"Uitnodiging van: %s\n"
+"\n"
+"Verzonden: %s"
+
+#: src/protocols/novell/novell.c:1833
 msgid "Would you like to join the conversation?"
-msgstr "Wilt u het overschrijven?"
-
-#: src/protocols/novell/novell.c:1408
-#, fuzzy
+msgstr "Wilt u het gesprek bijwonen?"
+
+#: src/protocols/novell/novell.c:1938
 msgid "You have been logged out because you logged in at another workstation."
 msgstr ""
 "De verbinding is verbroken omdat u zich heeft aangemeld op een andere "
 "computer."
 
-#: src/protocols/novell/novell.c:1462
-#, c-format
-msgid ""
-"%s appears to be offline and did not receive the message that you just sent."
-msgstr ""
+#: src/protocols/novell/novell.c:1992
+#, c-format
+msgid "%s appears to be offline and did not receive the message that you just sent."
+msgstr "%s lijkt niet aangemeld te zijn en heeft uw bericht niet ontvangen."
 
 #. TODO: Would be nice to prompt if not set!
 #. *  gaim_request_fields(gc, _("Server Address"),...);
 #.
 #. ...but for now just error out with a nice message.
-#: src/protocols/novell/novell.c:1560
-#, fuzzy
+#: src/protocols/novell/novell.c:2090
 msgid ""
 "Unable to connect to server. Please enter the address of the server you wish "
 "to connect to."
-msgstr "Geef alstublieft de naam van de gebruiker die u wilt blokkeren."
-
-#: src/protocols/novell/novell.c:1582
+msgstr ""
+"Kan geen verbinding makenmet server. Geef alstublieft de naam op van de "
+"server waarmee u contact wilt maken."
+
+#: src/protocols/novell/novell.c:2112
 msgid "Error. SSL support is not installed."
-msgstr ""
-
-#: src/protocols/novell/novell.c:1846
+msgstr "Fout! Geen SSL-ondersteuning geïnstalleerd."
+
+#: src/protocols/novell/novell.c:2421
 msgid "This conference has been closed. No more messages can be sent."
 msgstr ""
-
-#: src/protocols/novell/novell.c:2156 src/protocols/oscar/oscar.c:574
-#: src/protocols/oscar/oscar.c:5818 src/protocols/yahoo/yahoo.c:2297
+"Deze bijeenkomst is afgesloten. Er kunnen geen nieuwe berichten verzonden "
+"worden."
+
+#: src/protocols/novell/novell.c:2733 src/protocols/oscar/oscar.c:586
+#: src/protocols/oscar/oscar.c:6490 src/protocols/yahoo/yahoo.c:2513
 msgid "Offline"
 msgstr "Offline "
 
-#: src/protocols/novell/novell.c:2164
-#, c-format
-msgid ""
-"<b>Status:</b> %s\n"
-"<b>Message:</b> %s"
-msgstr ""
-
-#: src/protocols/novell/novell.c:2168
-#, fuzzy, c-format
-msgid "<b>Status:</b> %s"
-msgstr ""
-"\n"
-"<b>%s:</b> %s"
-
-#: src/protocols/novell/novell.c:2264 src/protocols/novell/novell.c:2320
-#, fuzzy
+#: src/protocols/novell/novell.c:2744
+msgid "Message"
+msgstr "Bericht"
+
+#: src/protocols/novell/novell.c:2843 src/protocols/novell/novell.c:2899
 msgid "Appear Offline"
-msgstr "Offline "
+msgstr "Offline weergeven"
+
+#: src/protocols/novell/novell.c:3293
+msgid "Initiate _Chat"
+msgstr "_Chat starten"
 
 #. *< api_version
 #. *< type
@@ -6827,255 +7324,300 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/novell/novell.c:2409 src/protocols/novell/novell.c:2411
+#: src/protocols/novell/novell.c:3389 src/protocols/novell/novell.c:3391
 msgid "Novell GroupWise Messenger Protocol Plugin"
-msgstr ""
-
-#: src/protocols/novell/novell.c:2428
-#, fuzzy
+msgstr "Novell GroupWise Messenger Protocol Plugin"
+
+#: src/protocols/novell/novell.c:3410
 msgid "Server address"
-msgstr "Adres"
-
-#: src/protocols/novell/novell.c:2432
-#, fuzzy
+msgstr "Server-adres"
+
+#: src/protocols/novell/novell.c:3414
 msgid "Server port"
-msgstr "Server"
-
-#: src/protocols/oscar/oscar.c:182
+msgstr "Server-poort"
+
+#: src/protocols/oscar/oscar.c:186
 msgid "Invalid error"
 msgstr "Ongeldige fout"
 
-#: src/protocols/oscar/oscar.c:183
+#: src/protocols/oscar/oscar.c:187
 msgid "Invalid SNAC"
 msgstr "Ongeldige SNAC"
 
-#: src/protocols/oscar/oscar.c:184
+#: src/protocols/oscar/oscar.c:188
 msgid "Rate to host"
 msgstr "Frequentie naar host"
 
-#: src/protocols/oscar/oscar.c:185
+#: src/protocols/oscar/oscar.c:189
 msgid "Rate to client"
 msgstr "Frequentie naar cliënt"
 
-#: src/protocols/oscar/oscar.c:187
+#: src/protocols/oscar/oscar.c:191
 msgid "Service unavailable"
 msgstr "Service niet beschikbaar"
 
-#: src/protocols/oscar/oscar.c:188
+#: src/protocols/oscar/oscar.c:192
 msgid "Service not defined"
 msgstr "Service niet gedefinieerd"
 
-#: src/protocols/oscar/oscar.c:189
+#: src/protocols/oscar/oscar.c:193
 msgid "Obsolete SNAC"
 msgstr "Verouderde SNAC"
 
-#: src/protocols/oscar/oscar.c:190
+#: src/protocols/oscar/oscar.c:194
 msgid "Not supported by host"
 msgstr "Niet ondersteund door host"
 
-#: src/protocols/oscar/oscar.c:191
+#: src/protocols/oscar/oscar.c:195
 msgid "Not supported by client"
 msgstr "Niet ondersteund door cliënt"
 
-#: src/protocols/oscar/oscar.c:192
+#: src/protocols/oscar/oscar.c:196
 msgid "Refused by client"
 msgstr "Gewegerd door cliënt"
 
-#: src/protocols/oscar/oscar.c:193
+#: src/protocols/oscar/oscar.c:197
 msgid "Reply too big"
 msgstr "Antwoord te groot"
 
-#: src/protocols/oscar/oscar.c:194
+#: src/protocols/oscar/oscar.c:198
 msgid "Responses lost"
 msgstr "Reacties verloren"
 
-#: src/protocols/oscar/oscar.c:195
+#: src/protocols/oscar/oscar.c:199
 msgid "Request denied"
 msgstr "Aanvraag geweigerd"
 
-#: src/protocols/oscar/oscar.c:196
+#: src/protocols/oscar/oscar.c:200
 msgid "Busted SNAC payload"
 msgstr "SNAC bagage kapot"
 
-#: src/protocols/oscar/oscar.c:197
+#: src/protocols/oscar/oscar.c:201
 msgid "Insufficient rights"
 msgstr "Niet genoeg rechten"
 
-#: src/protocols/oscar/oscar.c:198
+#: src/protocols/oscar/oscar.c:202
 msgid "In local permit/deny"
 msgstr "In lokale toestaan/weigeren"
 
-#: src/protocols/oscar/oscar.c:199
+#: src/protocols/oscar/oscar.c:203
 msgid "Too evil (sender)"
 msgstr "Te kwaadaardig (afzender)"
 
-#: src/protocols/oscar/oscar.c:200
+#: src/protocols/oscar/oscar.c:204
 msgid "Too evil (receiver)"
 msgstr "Te kwaadaardig (ontvanger)"
 
-#: src/protocols/oscar/oscar.c:201
+#: src/protocols/oscar/oscar.c:205
 msgid "User temporarily unavailable"
 msgstr "Gebruiker tijdelijk niet beschikbaar"
 
-#: src/protocols/oscar/oscar.c:202
+#: src/protocols/oscar/oscar.c:206
 msgid "No match"
 msgstr "Geen overeenkomstige resultaten"
 
-#: src/protocols/oscar/oscar.c:203
+#: src/protocols/oscar/oscar.c:207
 msgid "List overflow"
 msgstr "Te grote lijst"
 
-#: src/protocols/oscar/oscar.c:204
+#: src/protocols/oscar/oscar.c:208
 msgid "Request ambiguous"
 msgstr "Dubieuze aanvraag"
 
-#: src/protocols/oscar/oscar.c:205
+#: src/protocols/oscar/oscar.c:209
 msgid "Queue full"
 msgstr "Wachtrij vol"
 
-#: src/protocols/oscar/oscar.c:206
+#: src/protocols/oscar/oscar.c:210
 msgid "Not while on AOL"
 msgstr "Niet tijdens AOL"
 
-#: src/protocols/oscar/oscar.c:428
+#: src/protocols/oscar/oscar.c:403
+msgid ""
+"(There was an error converting this message.  The buddy you are speaking to "
+"most likely has a buggy client.)"
+msgstr ""
+"(Er is een fout opgetreden bij het converteren van het bericht. De andere "
+"persoon gebruikt waarschijnlijk een chatprogramma met fouten.)"
+
+#: src/protocols/oscar/oscar.c:441
 msgid "Voice"
 msgstr "Stem"
 
-#: src/protocols/oscar/oscar.c:431
+#: src/protocols/oscar/oscar.c:444
 msgid "AIM Direct IM"
 msgstr "AIM Direct bericht"
 
-#: src/protocols/oscar/oscar.c:434
+#: src/protocols/oscar/oscar.c:447 src/protocols/silc/silc.c:635
+#: src/protocols/silc/util.c:506
 msgid "Chat"
 msgstr "Chat"
 
-#: src/protocols/oscar/oscar.c:437 src/protocols/oscar/oscar.c:6540
+#: src/protocols/oscar/oscar.c:450 src/protocols/oscar/oscar.c:6793
 msgid "Get File"
 msgstr "Bestanden Ophalen"
 
-#: src/protocols/oscar/oscar.c:444
+#: src/protocols/oscar/oscar.c:457
 msgid "Games"
 msgstr "Spelletjes"
 
-#: src/protocols/oscar/oscar.c:447
+#: src/protocols/oscar/oscar.c:460
 msgid "Add-Ins"
 msgstr "Extra's"
 
-#: src/protocols/oscar/oscar.c:450
+#: src/protocols/oscar/oscar.c:463
 msgid "Send Buddy List"
 msgstr "Contactenlijst verzenden"
 
-#: src/protocols/oscar/oscar.c:453
+#: src/protocols/oscar/oscar.c:466
 msgid "ICQ Direct Connect"
 msgstr "ICQ Directe verbinding"
 
-#: src/protocols/oscar/oscar.c:456
+#: src/protocols/oscar/oscar.c:469
 msgid "AP User"
 msgstr "AP-gebruiker"
 
-#: src/protocols/oscar/oscar.c:459
+#: src/protocols/oscar/oscar.c:472
 msgid "ICQ RTF"
 msgstr "ICQ RTF"
 
-#: src/protocols/oscar/oscar.c:462
+#: src/protocols/oscar/oscar.c:475
 msgid "Nihilist"
 msgstr "Nihilist"
 
-#: src/protocols/oscar/oscar.c:465
+#: src/protocols/oscar/oscar.c:478
 msgid "ICQ Server Relay"
 msgstr "ICQ Server Relay"
 
-#: src/protocols/oscar/oscar.c:468
+#: src/protocols/oscar/oscar.c:481
 msgid "Old ICQ UTF8"
 msgstr "Oude ICQ UTF8"
 
-#: src/protocols/oscar/oscar.c:471
+#: src/protocols/oscar/oscar.c:484
 msgid "Trillian Encryption"
 msgstr "Trillian codering"
 
-#: src/protocols/oscar/oscar.c:474
+#: src/protocols/oscar/oscar.c:487
 msgid "ICQ UTF8"
 msgstr "ICQ UTF8"
 
-#: src/protocols/oscar/oscar.c:477
+#: src/protocols/oscar/oscar.c:490
 msgid "Hiptop"
 msgstr "Hiptop"
 
-#: src/protocols/oscar/oscar.c:480
+#: src/protocols/oscar/oscar.c:493
 msgid "Security Enabled"
 msgstr "Beveiliging ingeschakeld"
 
-#: src/protocols/oscar/oscar.c:483
+#: src/protocols/oscar/oscar.c:496
 msgid "Video Chat"
 msgstr "Video-chat"
 
-#: src/protocols/oscar/oscar.c:487
+#: src/protocols/oscar/oscar.c:500
 msgid "iChat AV"
 msgstr "iChat AV"
 
-#: src/protocols/oscar/oscar.c:490
+#: src/protocols/oscar/oscar.c:503
 msgid "Live Video"
 msgstr "Live Video"
 
-#: src/protocols/oscar/oscar.c:493
+#: src/protocols/oscar/oscar.c:506
 msgid "Camera"
 msgstr "Camera"
 
-#: src/protocols/oscar/oscar.c:512 src/protocols/oscar/oscar.c:4837
-#: src/protocols/oscar/oscar.c:6430
+#: src/protocols/oscar/oscar.c:524 src/protocols/oscar/oscar.c:5493
+#: src/protocols/oscar/oscar.c:6683
 msgid "Free For Chat"
 msgstr "Vrij om te chatten"
 
-#: src/protocols/oscar/oscar.c:516 src/protocols/oscar/oscar.c:4831
-#: src/protocols/oscar/oscar.c:6428
+#: src/protocols/oscar/oscar.c:528 src/protocols/oscar/oscar.c:5487
+#: src/protocols/oscar/oscar.c:6681
 msgid "Not Available"
 msgstr "Niet beschikbaar"
 
-#: src/protocols/oscar/oscar.c:518 src/protocols/oscar/oscar.c:4834
-#: src/protocols/oscar/oscar.c:6429
+#: src/protocols/oscar/oscar.c:530 src/protocols/oscar/oscar.c:5490
+#: src/protocols/oscar/oscar.c:6682
 msgid "Occupied"
 msgstr "Bezig"
 
-#: src/protocols/oscar/oscar.c:522
+#: src/protocols/oscar/oscar.c:534
 msgid "Web Aware"
 msgstr "Zichtbaar op web"
 
-#: src/protocols/oscar/oscar.c:590
+#: src/protocols/oscar/oscar.c:602
 msgid "Capabilities"
 msgstr "Mogelijkheden"
 
-#: src/protocols/oscar/oscar.c:596
+#: src/protocols/oscar/oscar.c:609
 msgid "Buddy Comment"
 msgstr "Contactopmerking"
 
-#: src/protocols/oscar/oscar.c:716
+#: src/protocols/oscar/oscar.c:744
 #, c-format
 msgid "Direct IM with %s closed"
 msgstr "Directe verbinding met %s afgesloten"
 
-#: src/protocols/oscar/oscar.c:718
+#: src/protocols/oscar/oscar.c:746
 #, c-format
 msgid "Direct IM with %s failed"
 msgstr "Directe verbinding met %s mislukt"
 
-#: src/protocols/oscar/oscar.c:789 src/protocols/toc/toc.c:885
+#: src/protocols/oscar/oscar.c:753
+msgid "Direct Connect failed"
+msgstr "Directe verbinding mislukt"
+
+#: src/protocols/oscar/oscar.c:830 src/protocols/oscar/oscar.c:961
+#, c-format
+msgid "Direct IM with %s established"
+msgstr "Direkte verbinding met %s hersteld"
+
+#: src/protocols/oscar/oscar.c:911
+#, c-format
+msgid "Attempting to connect to %s at %s:%hu for Direct IM."
+msgstr "Verbinding maken met %s om %s:%hu voor directe verbinding."
+
+#: src/protocols/oscar/oscar.c:1328
+#, c-format
+msgid "Asking %s to connect to us at %s:%hu for Direct IM."
+msgstr ""
+"Aanvraag gestuurd naar %s om contact met ons te maken op %s:%hu voor een "
+"directe verbinding."
+
+#: src/protocols/oscar/oscar.c:1333
+msgid "Unable to open Direct IM"
+msgstr "Kan geen directe verbinding openen"
+
+#: src/protocols/oscar/oscar.c:1368
+#, c-format
+msgid "You have selected to open a Direct IM connection with %s."
+msgstr "U heeft ervoor gekozen om een directe verbinding te openen met %s."
+
+#: src/protocols/oscar/oscar.c:1372
+msgid ""
+"Because this reveals your IP address, it may be considered a privacy risk.  "
+"Do you wish to continue?"
+msgstr ""
+"Omdat dit uw IP-adres zichtbaar maakt voor de andere partij, kan het worden "
+"gezien als inbreuk op uw privacy. Wilt u doorgaan?"
+
+#: src/protocols/oscar/oscar.c:1376 src/protocols/oscar/oscar.c:3328
+msgid "Connect"
+msgstr "Verbinden"
+
+#: src/protocols/oscar/oscar.c:1442 src/protocols/toc/toc.c:872
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "De verbinding met chatruimte %s is verbroken"
 
-#: src/protocols/oscar/oscar.c:805
+#: src/protocols/oscar/oscar.c:1458
 msgid "Chat is currently unavailable"
 msgstr "Chatruimte is momenteel niet bereikbaar."
 
-#: src/protocols/oscar/oscar.c:876 src/protocols/oscar/oscar.c:940
-msgid "Couldn't connect to host"
-msgstr "Kan geen verbinding maken met host"
-
-#: src/protocols/oscar/oscar.c:886
+#: src/protocols/oscar/oscar.c:1539
 msgid "Screen name sent"
 msgstr "Bijnaam verzonden"
 
-#: src/protocols/oscar/oscar.c:900
+#: src/protocols/oscar/oscar.c:1553
 #, c-format
 msgid ""
 "Unable to login: Could not sign on as %s because the screen name is "
@@ -7086,45 +7628,46 @@
 "ongeldig is. Gebruikersnamen moeten of beginnen met een letter en slechts "
 "cijfers en letters bevatten, of slechts nummers bevatten."
 
-#: src/protocols/oscar/oscar.c:928
+#: src/protocols/oscar/oscar.c:1581
 msgid "Unable to login to AIM"
 msgstr "Aanmelden bij AIM niet mogelijk"
 
-#: src/protocols/oscar/oscar.c:1032 src/protocols/oscar/oscar.c:1450
+#: src/protocols/oscar/oscar.c:1682 src/protocols/oscar/oscar.c:2119
 msgid "Could Not Connect"
 msgstr "Kan geen verbinding maken"
 
-#: src/protocols/oscar/oscar.c:1040
+#: src/protocols/oscar/oscar.c:1690
 msgid "Connection established, cookie sent"
 msgstr "Verbinding hersteld, Cookie verzonden"
 
-#: src/protocols/oscar/oscar.c:1153 src/protocols/yahoo/yahoo_filexfer.c:209
-#: src/protocols/yahoo/yahoo_filexfer.c:218
+#: src/protocols/oscar/oscar.c:1803 src/protocols/yahoo/yahoo_filexfer.c:180
+#: src/protocols/yahoo/yahoo_filexfer.c:189
+#: src/protocols/yahoo/yahoo_filexfer.c:199
 msgid "Unable to establish file descriptor."
 msgstr "Kan geen bestandsbeschrijving aanmaken."
 
-#: src/protocols/oscar/oscar.c:1158
+#: src/protocols/oscar/oscar.c:1808
 msgid "Unable to create new connection."
 msgstr "Kan geen nieuwe verbinding maken."
 
-#: src/protocols/oscar/oscar.c:1229
+#: src/protocols/oscar/oscar.c:1879
 msgid "Unable to establish listener socket."
 msgstr "Kan geen luistersocket aanmaken."
 
-#: src/protocols/oscar/oscar.c:1334 src/protocols/toc/toc.c:571
+#: src/protocols/oscar/oscar.c:2003 src/protocols/toc/toc.c:541
 msgid "Incorrect nickname or password."
 msgstr "Ongeldige gebruikersnaam of wachtwoord."
 
-#: src/protocols/oscar/oscar.c:1339
+#: src/protocols/oscar/oscar.c:2008
 msgid "Your account is currently suspended."
 msgstr "Uw Account is momenteel afgesloten"
 
 #. service temporarily unavailable
-#: src/protocols/oscar/oscar.c:1343
+#: src/protocols/oscar/oscar.c:2012
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr "De AOL service is momenteel niet bereikbaar."
 
-#: src/protocols/oscar/oscar.c:1348
+#: src/protocols/oscar/oscar.c:2017
 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."
@@ -7132,22 +7675,21 @@
 "U heeft zich te snel aan en afgemeld. Wacht 10 minuten en probeer het nog "
 "een keer. Als u verdergaat moet u nog langer wachten "
 
-#: src/protocols/oscar/oscar.c:1353
+#: src/protocols/oscar/oscar.c:2022
 #, c-format
 msgid "The client version you are using is too old. Please upgrade at %s"
-msgstr ""
-"Het programma wat u gebruikt is te oud. Haal een nieuwe versie op bij %s"
-
-#: src/protocols/oscar/oscar.c:1385
+msgstr "Het programma wat u gebruikt is te oud. Haal een nieuwe versie op bij %s"
+
+#: src/protocols/oscar/oscar.c:2054
 msgid "Internal Error"
 msgstr "Interne Fout"
 
-#: src/protocols/oscar/oscar.c:1457
+#: src/protocols/oscar/oscar.c:2126
 msgid "Received authorization"
 msgstr "Toestemming gekregen"
 
-#: src/protocols/oscar/oscar.c:1493 src/protocols/oscar/oscar.c:1523
-#: src/protocols/oscar/oscar.c:1611
+#: src/protocols/oscar/oscar.c:2162 src/protocols/oscar/oscar.c:2192
+#: src/protocols/oscar/oscar.c:2280
 #, c-format
 msgid ""
 "You may be disconnected shortly.  You may want to use TOC until this is "
@@ -7156,29 +7698,24 @@
 "U wordt waarschijnlijk binnenkort afgemeld. U kunt misschien beter TOC "
 "gebruiken tot dit probleem is opgelost. Kijk op %s voor nieuwe versies."
 
-#: src/protocols/oscar/oscar.c:1496 src/protocols/oscar/oscar.c:1526
+#: src/protocols/oscar/oscar.c:2165 src/protocols/oscar/oscar.c:2195
 msgid "Gaim was unable to get a valid AIM login hash."
 msgstr "Gaim kon geen geldige AIM aanmeld-hash krijgen."
 
-#: src/protocols/oscar/oscar.c:1614
+#: src/protocols/oscar/oscar.c:2283
 msgid "Gaim was unable to get a valid login hash."
 msgstr "Gaim kon geen geldige aanmeld-hash krijgen."
 
-#: src/protocols/oscar/oscar.c:2196 src/protocols/oscar/oscar.c:5922
-#, c-format
-msgid "Direct IM with %s established"
-msgstr "Direkte verbinding met %s hersteld"
-
-#: src/protocols/oscar/oscar.c:2530 src/protocols/oscar/oscar.c:2552
+#: src/protocols/oscar/oscar.c:3112 src/protocols/oscar/oscar.c:3134
 msgid "(There was an error receiving this message)"
 msgstr "(Er is een fout opgetreden bij het ontvangen van dit bericht)"
 
-#: src/protocols/oscar/oscar.c:2713
+#: src/protocols/oscar/oscar.c:3320
 #, c-format
 msgid "%s has just asked to directly connect to %s"
 msgstr "%s heeft net een directe verbinding met %s aangevraagd"
 
-#: src/protocols/oscar/oscar.c:2716
+#: src/protocols/oscar/oscar.c:3323
 msgid ""
 "This requires a direct connection between the two computers and is necessary "
 "for IM Images.  Because your IP address will be revealed, this may be "
@@ -7188,25 +7725,21 @@
 "IM berichten. Omdat je IP-adres bekend wordt kan dit worden opgevat als een "
 "inbreuk op de privacy."
 
-#: src/protocols/oscar/oscar.c:2721 src/protocols/oscar/oscar.c:6304
-msgid "Connect"
-msgstr "Verbinden"
-
-#: src/protocols/oscar/oscar.c:2750
+#: src/protocols/oscar/oscar.c:3359
 msgid "Please authorize me so I can add you to my buddy list."
 msgstr ""
 "Geef mij alstublieft toestemming zodat ik u kan toevoegen aan mijn "
 "contactenlijst."
 
-#: src/protocols/oscar/oscar.c:2758
+#: src/protocols/oscar/oscar.c:3367
 msgid "Authorization Request Message:"
 msgstr "Tekst van toestemmingsaanvraag"
 
-#: src/protocols/oscar/oscar.c:2759
+#: src/protocols/oscar/oscar.c:3368
 msgid "Please authorize me!"
 msgstr "Geef mij alstublieft toestemming"
 
-#: src/protocols/oscar/oscar.c:2788
+#: src/protocols/oscar/oscar.c:3398
 #, c-format
 msgid ""
 "The user %s requires authorization before being added to a buddy list.  Do "
@@ -7215,23 +7748,23 @@
 "U heeft toestemming nodig om %s toe te voegen aan uw contactenlijst. Wilt u "
 "om toestemming vragen?"
 
-#: src/protocols/oscar/oscar.c:2793 src/protocols/oscar/oscar.c:2795
+#: src/protocols/oscar/oscar.c:3403 src/protocols/oscar/oscar.c:3405
 msgid "Request Authorization"
 msgstr "Toestemming vragen"
 
-#: src/protocols/oscar/oscar.c:2831 src/protocols/oscar/oscar.c:2833
-#: src/protocols/oscar/oscar.c:2840 src/protocols/oscar/oscar.c:2922
-#: src/protocols/oscar/oscar.c:2942 src/protocols/oscar/oscar.c:3286
-#: src/protocols/oscar/oscar.c:3346 src/protocols/oscar/oscar.c:5443
-#: src/protocols/oscar/oscar.c:5489
+#: src/protocols/oscar/oscar.c:3453 src/protocols/oscar/oscar.c:3455
+#: src/protocols/oscar/oscar.c:3462 src/protocols/oscar/oscar.c:3544
+#: src/protocols/oscar/oscar.c:3564 src/protocols/oscar/oscar.c:3918
+#: src/protocols/oscar/oscar.c:3978 src/protocols/oscar/oscar.c:6109
+#: src/protocols/oscar/oscar.c:6155
 msgid "No reason given."
 msgstr "Geen reden gegeven."
 
-#: src/protocols/oscar/oscar.c:2839
+#: src/protocols/oscar/oscar.c:3461
 msgid "Authorization Denied Message:"
 msgstr "Tekst van weigeringsbericht:"
 
-#: src/protocols/oscar/oscar.c:2922
+#: src/protocols/oscar/oscar.c:3544
 #, c-format
 msgid ""
 "The user %u wants to add you to their buddy list for the following reason:\n"
@@ -7241,11 +7774,11 @@
 "reden:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:2930 src/protocols/oscar/oscar.c:5449
+#: src/protocols/oscar/oscar.c:3552 src/protocols/oscar/oscar.c:6115
 msgid "Authorization Request"
 msgstr "Identificatie-aanvraag"
 
-#: src/protocols/oscar/oscar.c:2942
+#: src/protocols/oscar/oscar.c:3564
 #, c-format
 msgid ""
 "The user %u has denied your request to add them to your buddy list for the "
@@ -7256,19 +7789,19 @@
 "geweigerd met de volgende reden:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:2943
+#: src/protocols/oscar/oscar.c:3565
 msgid "ICQ authorization denied."
 msgstr "ICQ identificatie geweigerd."
 
 #. Someone has granted you authorization
-#: src/protocols/oscar/oscar.c:2950
+#: src/protocols/oscar/oscar.c:3572
 #, c-format
 msgid "The user %u has granted your request to add them to your buddy list."
 msgstr ""
 "De gebruiker %u heeft toestemming gegeven. Hij/zij wordt toegevoegd aan uw "
 "contactenlijst."
 
-#: src/protocols/oscar/oscar.c:2958
+#: src/protocols/oscar/oscar.c:3580
 #, c-format
 msgid ""
 "You have received a special message\n"
@@ -7281,7 +7814,7 @@
 "Afzender: %s [%s]\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:2966
+#: src/protocols/oscar/oscar.c:3588
 #, c-format
 msgid ""
 "You have received an ICQ page\n"
@@ -7294,7 +7827,7 @@
 "Afzender: %s [%s]\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:2974
+#: src/protocols/oscar/oscar.c:3596
 #, c-format
 msgid ""
 "You have received an ICQ email from %s [%s]\n"
@@ -7307,125 +7840,116 @@
 "Bericht:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:2995
+#: src/protocols/oscar/oscar.c:3617
 #, c-format
 msgid "ICQ user %u has sent you a buddy: %s (%s)"
 msgstr "ICQ-gebruiker %u heeft u een contact toegestuurd: %s (%s)"
 
-#: src/protocols/oscar/oscar.c:3001
+#: src/protocols/oscar/oscar.c:3623
 msgid "Do you want to add this buddy to your buddy list?"
 msgstr "Wilt u deze persoon toevoegen aan uw contactenlijst?"
 
-#: src/protocols/oscar/oscar.c:3005
+#: src/protocols/oscar/oscar.c:3627
 msgid "Decline"
 msgstr "Weigeren"
 
-#: src/protocols/oscar/oscar.c:3090
+#: src/protocols/oscar/oscar.c:3712
 #, 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] "%hu bericht van %s is niet overgekomen omdat het ongeldig was."
-msgstr[1] ""
-"%hu berichten van %s zijn niet overgekomen omdat deze ongeldig waren."
-
-#: src/protocols/oscar/oscar.c:3099
+msgstr[1] "%hu berichten van %s zijn niet overgekomen omdat deze ongeldig waren."
+
+#: src/protocols/oscar/oscar.c:3721
 #, 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] "%hu bericht van %s is niet overgekomen omdat het te groot was."
-msgstr[1] ""
-"%hu berichten van %s zijn niet overgekomen omdat deze te groot waren."
-
-#: src/protocols/oscar/oscar.c:3108
-#, 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] ""
-"%hu bericht van %s is niet overgekomen omdat het te snel verzonden werd."
+msgstr[1] "%hu berichten van %s zijn niet overgekomen omdat deze te groot waren."
+
+#: src/protocols/oscar/oscar.c:3730
+#, 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] "%hu bericht van %s is niet overgekomen omdat het te snel verzonden werd."
 msgstr[1] ""
 "%hu berichten van %s zijn niet overgekomen omdat deze te snel verzonden "
 "werden."
 
-#: src/protocols/oscar/oscar.c:3117
+#: src/protocols/oscar/oscar.c:3739
 #, 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] ""
-"%hu bericht van %s is niet overgekomen omdat hij/zij te kwaadaardig is."
-msgstr[1] ""
-"%hu berichten van %s zijn niet overgekomen omdat hij/zij te kwaadaardig is."
-
-#: src/protocols/oscar/oscar.c:3126
+msgstr[0] "%hu bericht van %s is niet overgekomen omdat hij/zij te kwaadaardig is."
+msgstr[1] "%hu berichten van %s zijn niet overgekomen omdat hij/zij te kwaadaardig is."
+
+#: src/protocols/oscar/oscar.c:3748
 #, 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] ""
-"%hu bericht van %s is niet overgekomen omdat jij te kwaadaardig bent."
-msgstr[1] ""
-"%hu berichten van %s zijn niet overgekomen omdat jij te kwaadaardig bent."
-
-#: src/protocols/oscar/oscar.c:3135
+msgstr[0] "%hu bericht van %s is niet overgekomen omdat jij te kwaadaardig bent."
+msgstr[1] "%hu berichten van %s zijn niet overgekomen omdat jij te kwaadaardig bent."
+
+#: src/protocols/oscar/oscar.c:3757
 #, 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] "%hu bericht is niet overgekomen om een onbekende reden."
 msgstr[1] "%hu berichten zijn niet overgekomen om een onbekende reden."
 
-#: src/protocols/oscar/oscar.c:3189
-#, c-format
-msgid "<B>UIN:</B> %s<BR><B>Status:</B> %s<HR>%s"
-msgstr "<B>UIN:</B> %s<BR><B>Status:</B> %s<HR>%s"
-
-#: src/protocols/oscar/oscar.c:3248
+#: src/protocols/oscar/oscar.c:3814 src/protocols/oscar/oscar.c:4038
+#, c-format
+msgid "Info for %s"
+msgstr "Info voor %s"
+
+#: src/protocols/oscar/oscar.c:3880
 #, c-format
 msgid "SNAC threw error: %s\n"
 msgstr "SNAC threw fout: %s\n"
 
-#: src/protocols/oscar/oscar.c:3249
+#: src/protocols/oscar/oscar.c:3881
 msgid "Unknown error"
 msgstr "Onbekende fout"
 
 #. Data is assumed to be the destination sn
-#: src/protocols/oscar/oscar.c:3284
+#: src/protocols/oscar/oscar.c:3916
 #, c-format
 msgid "Your message to %s did not get sent:"
 msgstr "Uw bericht aan %s is niet verzonden:"
 
-#: src/protocols/oscar/oscar.c:3343
+#: src/protocols/oscar/oscar.c:3975
 #, c-format
 msgid "User information for %s unavailable:"
 msgstr "Gebruikersinformatie voor %s niet beschikbaar:"
 
-#: src/protocols/oscar/oscar.c:3366
+#: src/protocols/oscar/oscar.c:3998
 msgid "Warning Level"
 msgstr "Waarschuwingsniveau"
 
-#: src/protocols/oscar/oscar.c:3369
+#: src/protocols/oscar/oscar.c:4001
 msgid "Online Since"
 msgstr "On-line sinds"
 
-#: src/protocols/oscar/oscar.c:3373 src/protocols/yahoo/yahoo.c:3088
+#: src/protocols/oscar/oscar.c:4005 src/protocols/yahoo/yahoo_profile.c:1118
 msgid "Member Since"
 msgstr "Lid sinds"
 
-#: src/protocols/oscar/oscar.c:3455
+#: src/protocols/oscar/oscar.c:4089
 msgid "Your AIM connection may be lost."
 msgstr "Uw AIM-verbinding is misschien verbroken."
 
 #. The conversion failed!
-#: src/protocols/oscar/oscar.c:3641
+#: src/protocols/oscar/oscar.c:4275
 msgid ""
 "[Unable to display a message from this user because it contained invalid "
 "characters.]"
 msgstr "[kan bericht niet weergeven omdat deze ongeldige tekens bevat.]"
 
-#: src/protocols/oscar/oscar.c:3859
+#: src/protocols/oscar/oscar.c:4492
 msgid "Rate limiting error."
 msgstr "Snelheidsoverschrijding."
 
-#: src/protocols/oscar/oscar.c:3860
+#: src/protocols/oscar/oscar.c:4493
 msgid ""
 "The last action you attempted could not be performed because you are over "
 "the rate limit. Please wait 10 seconds and try again."
@@ -7433,7 +7957,7 @@
 "Uw laatste actie is niet gebeurd omdat uw snelheid te hoog ligt. Wacht "
 "alstublieft 10 seconden en probeer het dan nogmaals."
 
-#: src/protocols/oscar/oscar.c:3923
+#: src/protocols/oscar/oscar.c:4556
 msgid ""
 "You have been disconnected because you have signed on with this screen name "
 "at another location."
@@ -7441,109 +7965,113 @@
 "De verbinding is verbroken. U heeft uzelf aangemeld met dit account vanaf "
 "een andere locatie."
 
-#: src/protocols/oscar/oscar.c:3925
+#: src/protocols/oscar/oscar.c:4558
 msgid "You have been signed off for an unknown reason."
 msgstr "De verbinding is verbroken om een onbekende reden."
 
-#: src/protocols/oscar/oscar.c:3956
+#: src/protocols/oscar/oscar.c:4589
 msgid "Finalizing connection"
 msgstr "Afronden van verbinding"
 
-#: src/protocols/oscar/oscar.c:4226 src/protocols/oscar/oscar.c:4233
+#: src/protocols/oscar/oscar.c:4859 src/protocols/oscar/oscar.c:4866
 msgid "Email Address"
 msgstr "E-mail adres"
 
-#: src/protocols/oscar/oscar.c:4238
+#: src/protocols/oscar/oscar.c:4871 src/protocols/silc/util.c:538
 msgid "Mobile Phone"
 msgstr "Mobiel nummer"
 
-#: src/protocols/oscar/oscar.c:4239 src/protocols/trepia/trepia.c:281
+#: src/protocols/oscar/oscar.c:4872
+msgid "Not specified"
+msgstr "Niet gespecificeerd"
+
+#: src/protocols/oscar/oscar.c:4873 src/protocols/trepia/trepia.c:281
 #: src/protocols/trepia/trepia.c:407
 msgid "Female"
 msgstr "Vrouw"
 
-#: src/protocols/oscar/oscar.c:4239 src/protocols/trepia/trepia.c:280
+#: src/protocols/oscar/oscar.c:4873 src/protocols/trepia/trepia.c:280
 #: src/protocols/trepia/trepia.c:407
 msgid "Male"
 msgstr "Man"
 
-#: src/protocols/oscar/oscar.c:4255
+#: src/protocols/oscar/oscar.c:4889
 msgid "Personal Web Page"
 msgstr "Persoonlijke webpagina"
 
-#: src/protocols/oscar/oscar.c:4259
+#: src/protocols/oscar/oscar.c:4893
 msgid "Additional Information"
 msgstr "Extra informatie"
 
-#: src/protocols/oscar/oscar.c:4264
+#: src/protocols/oscar/oscar.c:4898
 msgid "Home Address"
 msgstr "Thuisadres"
 
-#: src/protocols/oscar/oscar.c:4268 src/protocols/oscar/oscar.c:4276
+#: src/protocols/oscar/oscar.c:4902 src/protocols/oscar/oscar.c:4910
 msgid "Zip Code"
 msgstr "Postcode"
 
-#: src/protocols/oscar/oscar.c:4272
+#: src/protocols/oscar/oscar.c:4906
 msgid "Work Address"
 msgstr "Werkadres"
 
-#: src/protocols/oscar/oscar.c:4280
+#: src/protocols/oscar/oscar.c:4914
 msgid "Work Information"
 msgstr "Werkinformatie"
 
-#: src/protocols/oscar/oscar.c:4281
+#: src/protocols/oscar/oscar.c:4915
 msgid "Company"
 msgstr "Bedrijf"
 
-#: src/protocols/oscar/oscar.c:4282
+#: src/protocols/oscar/oscar.c:4916
 msgid "Division"
 msgstr "Afdeling"
 
-#: src/protocols/oscar/oscar.c:4283
+#: src/protocols/oscar/oscar.c:4917
 msgid "Position"
 msgstr "Positie"
 
-#: src/protocols/oscar/oscar.c:4285
+#: src/protocols/oscar/oscar.c:4919
 msgid "Web Page"
 msgstr "Webpagina"
 
-#: src/protocols/oscar/oscar.c:4291
+#: src/protocols/oscar/oscar.c:4925
 #, c-format
 msgid "ICQ Info for %s"
 msgstr "ICQ info voor %s"
 
-#: src/protocols/oscar/oscar.c:4341
+#: src/protocols/oscar/oscar.c:4974
 msgid "Pop-Up Message"
 msgstr "Pop-up bericht"
 
-#: src/protocols/oscar/oscar.c:4362
+#: src/protocols/oscar/oscar.c:4995
 #, c-format
 msgid "The following screen names are associated with %s"
 msgstr "De volgende gebruikersnamen zijn geassocieerd met %s"
 
-#: src/protocols/oscar/oscar.c:4366
+#: src/protocols/oscar/oscar.c:4999
 msgid "Search Results"
 msgstr "Zoekresultaten"
 
-#: src/protocols/oscar/oscar.c:4383
+#: src/protocols/oscar/oscar.c:5016
 #, c-format
 msgid "No results found for email address %s"
 msgstr "Niets gevonden voor e-mail adres %s"
 
-#: src/protocols/oscar/oscar.c:4404
+#: src/protocols/oscar/oscar.c:5037
 #, c-format
 msgid "You should receive an email asking to confirm %s."
 msgstr "U zou een e-mail moeten ontvangen met de vraag om %s te bevestigen."
 
-#: src/protocols/oscar/oscar.c:4406
+#: src/protocols/oscar/oscar.c:5039
 msgid "Account Confirmation Requested"
 msgstr "Accountbevestiging aangevraagd"
 
-#: src/protocols/oscar/oscar.c:4434
+#: src/protocols/oscar/oscar.c:5067
 msgid "Error Changing Account Info"
 msgstr "Fout bij aanpassen van accountgegevens"
 
-#: src/protocols/oscar/oscar.c:4437
+#: src/protocols/oscar/oscar.c:5070
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
@@ -7552,7 +8080,7 @@
 "Fout 0x%04x: Kan weergave niet veranderen omdat aangevraagde gebruikersnaam "
 "is niet gelijk aan het origineel."
 
-#: src/protocols/oscar/oscar.c:4440
+#: src/protocols/oscar/oscar.c:5073
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
@@ -7561,7 +8089,7 @@
 "Fout 0x%04x: Kan weergave niet veranderen omdat aangevraagde gebruikersnaam "
 "eindigt op een spatie."
 
-#: src/protocols/oscar/oscar.c:4443
+#: src/protocols/oscar/oscar.c:5076
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
@@ -7570,7 +8098,7 @@
 "Fout 0x%04x: Kan weergave niet veranderen omdat aangevraagde gebruikersnaam "
 "te lang is."
 
-#: src/protocols/oscar/oscar.c:4446
+#: src/protocols/oscar/oscar.c:5079
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change email address because there is already a "
@@ -7579,7 +8107,7 @@
 "Fout 0x%04x: Kan e-mail adres niet veranderen omdat het adres al is "
 "aangevraagd door een ander."
 
-#: src/protocols/oscar/oscar.c:4449
+#: src/protocols/oscar/oscar.c:5082
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change email address because the given address has "
@@ -7588,20 +8116,19 @@
 "Fout 0x%04x: Kan e-mail adres niet veranderen omdat het adres reeds te veel "
 "gebruikersnamen toegewezen heeft gekregen."
 
-#: src/protocols/oscar/oscar.c:4452
+#: src/protocols/oscar/oscar.c:5085
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change email address because the given address is "
 "invalid."
-msgstr ""
-"Fout 0x%04x: Kan e-mail adres niet veranderen omdat het adres ongeldig is."
-
-#: src/protocols/oscar/oscar.c:4455
+msgstr "Fout 0x%04x: Kan e-mail adres niet veranderen omdat het adres ongeldig is."
+
+#: src/protocols/oscar/oscar.c:5088
 #, c-format
 msgid "Error 0x%04x: Unknown error."
 msgstr "Fout 0x%04x: Onbekende fout."
 
-#: src/protocols/oscar/oscar.c:4465
+#: src/protocols/oscar/oscar.c:5098
 #, c-format
 msgid ""
 "Your screen name is currently formatted as follows:\n"
@@ -7610,20 +8137,26 @@
 "Uw gebruikersnaam wordt op het moment als volgt weergegeven:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:4466 src/protocols/oscar/oscar.c:4473
+#: src/protocols/oscar/oscar.c:5099 src/protocols/oscar/oscar.c:5106
 msgid "Account Info"
 msgstr "Accountinformatie"
 
-#: src/protocols/oscar/oscar.c:4471
+#: src/protocols/oscar/oscar.c:5104
 #, c-format
 msgid "The email address for %s is %s"
 msgstr "Het e-mail adres vor %s is %s"
 
-#: src/protocols/oscar/oscar.c:4686
+#: src/protocols/oscar/oscar.c:5169
+msgid "Your IM Image was not sent. You must be Direct Connected to send IM Images."
+msgstr ""
+"Uw IM-afbeelding is niet verstuurd. u moet een directe verbinding hebben om "
+"IM-afbeeldingen te sturen."
+
+#: src/protocols/oscar/oscar.c:5342
 msgid "Unable to set AIM profile."
 msgstr "Kan AIM-profiel niet instellen."
 
-#: src/protocols/oscar/oscar.c:4687
+#: src/protocols/oscar/oscar.c:5343
 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 "
@@ -7633,7 +8166,7 @@
 "was. Uw profiel is niet ingesteld. Probeert u het nogmaals wanneer u "
 "volledig aangemeld bent."
 
-#: src/protocols/oscar/oscar.c:4714
+#: src/protocols/oscar/oscar.c:5370
 #, c-format
 msgid ""
 "The maximum profile length of %d byte has been exceeded.  Gaim has truncated "
@@ -7648,19 +8181,19 @@
 "De maximale profielgrootte van %d bytes is overschreden. Gaim heeft het "
 "afgebroken."
 
-#: src/protocols/oscar/oscar.c:4719
+#: src/protocols/oscar/oscar.c:5375
 msgid "Profile too long."
 msgstr "Profiel is te lang."
 
-#: src/protocols/oscar/oscar.c:4735 src/protocols/oscar/oscar.c:6435
+#: src/protocols/oscar/oscar.c:5391 src/protocols/oscar/oscar.c:6688
 msgid "Visible"
 msgstr "Zichtbaar"
 
-#: src/protocols/oscar/oscar.c:4753
+#: src/protocols/oscar/oscar.c:5409
 msgid "Unable to set AIM away message."
 msgstr "Kan geen AIM afwezigheidsbericht instellen."
 
-#: src/protocols/oscar/oscar.c:4754
+#: src/protocols/oscar/oscar.c:5410
 msgid ""
 "You have probably requested to set your away message before the login "
 "procedure completed.  You remain in a \"present\" state; try setting it "
@@ -7670,7 +8203,7 @@
 "aangemeld was. Uw afwezigheidsbericht is niet ingesteld. Probeert u het "
 "nogmaals wanneer u volledig aangemeld bent."
 
-#: src/protocols/oscar/oscar.c:4794
+#: src/protocols/oscar/oscar.c:5450
 #, c-format
 msgid ""
 "The maximum away message length of %d byte has been exceeded.  Gaim has "
@@ -7685,11 +8218,11 @@
 "De maximale grootte van afwezigheidsberichten van %d bytes is overschreden. "
 "Gaim heeft het afgebroken."
 
-#: src/protocols/oscar/oscar.c:4799
+#: src/protocols/oscar/oscar.c:5455
 msgid "Away message too long."
 msgstr "Afwezigheidsbericht te lang."
 
-#: src/protocols/oscar/oscar.c:4892
+#: src/protocols/oscar/oscar.c:5533
 #, c-format
 msgid ""
 "Could not add the buddy %s because the screen name is invalid.  Screen names "
@@ -7700,16 +8233,16 @@
 "Gebruikersnamen moeten of beginnen met een letter en slechts cijfers en "
 "letters bevatten, of slechts nummers bevatten."
 
-#: src/protocols/oscar/oscar.c:4893 src/protocols/oscar/oscar.c:5310
-#: src/protocols/oscar/oscar.c:5323
+#: src/protocols/oscar/oscar.c:5534 src/protocols/oscar/oscar.c:5976
+#: src/protocols/oscar/oscar.c:5989
 msgid "Unable To Add"
 msgstr "Kan niet toevoegen"
 
-#: src/protocols/oscar/oscar.c:5029
+#: src/protocols/oscar/oscar.c:5695
 msgid "Unable To Retrieve Buddy List"
 msgstr "Kan contactenlijst niet ophalen"
 
-#: src/protocols/oscar/oscar.c:5030
+#: src/protocols/oscar/oscar.c:5696
 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 "
@@ -7718,13 +8251,13 @@
 "Gaim kan tijdelijk niet bij uw contactenlijst op de AIM-servers. De lijst is "
 "niet verdwenen. U kunt deze waarschijnlijk over enkele uren weer benaderen."
 
-#: src/protocols/oscar/oscar.c:5206 src/protocols/oscar/oscar.c:5207
-#: src/protocols/oscar/oscar.c:5212 src/protocols/oscar/oscar.c:5367
-#: src/protocols/oscar/oscar.c:5368 src/protocols/oscar/oscar.c:5373
+#: src/protocols/oscar/oscar.c:5872 src/protocols/oscar/oscar.c:5873
+#: src/protocols/oscar/oscar.c:5878 src/protocols/oscar/oscar.c:6033
+#: src/protocols/oscar/oscar.c:6034 src/protocols/oscar/oscar.c:6039
 msgid "Orphans"
 msgstr "Wezen"
 
-#: src/protocols/oscar/oscar.c:5309
+#: src/protocols/oscar/oscar.c:5975
 #, c-format
 msgid ""
 "Could not add the buddy %s because you have too many buddies in your buddy "
@@ -7733,11 +8266,11 @@
 "Kon %s niet als contact toevoegen omdat u te veel contacten in uw lijst "
 "heeft. Verwijder eerst een ander en probeer opnieuw."
 
-#: src/protocols/oscar/oscar.c:5309 src/protocols/oscar/oscar.c:5322
+#: src/protocols/oscar/oscar.c:5975 src/protocols/oscar/oscar.c:5988
 msgid "(no name)"
 msgstr "(naamloos)"
 
-#: src/protocols/oscar/oscar.c:5322
+#: src/protocols/oscar/oscar.c:5988
 #, c-format
 msgid ""
 "Could not add the buddy %s for an unknown reason.  The most common reason "
@@ -7747,7 +8280,7 @@
 "Kon het contact %s niet toevoegen om onbekende redenen. De meest voorkomende "
 "reden is dat het maximum aantal contacten in uw lijst is bereikt."
 
-#: src/protocols/oscar/oscar.c:5404
+#: src/protocols/oscar/oscar.c:6070
 #, c-format
 msgid ""
 "The user %s has given you permission to add you to their buddy list.  Do you "
@@ -7756,11 +8289,11 @@
 "De gebruiker %s heeft u toestemming gegeven om u toe te voegen aan zijn/haar "
 "contactenlijst. Wilt u hem/haar toevoegen?"
 
-#: src/protocols/oscar/oscar.c:5410
+#: src/protocols/oscar/oscar.c:6076
 msgid "Authorization Given"
 msgstr "Toestemming gegeven"
 
-#: src/protocols/oscar/oscar.c:5443
+#: src/protocols/oscar/oscar.c:6109
 #, c-format
 msgid ""
 "The user %s wants to add you to their buddy list for the following reason:\n"
@@ -7771,19 +8304,19 @@
 "%s"
 
 #. Granted
-#: src/protocols/oscar/oscar.c:5485
+#: src/protocols/oscar/oscar.c:6151
 #, c-format
 msgid "The user %s has granted your request to add them to your buddy list."
 msgstr ""
 "De gebruiker %s heeft toestemming gegeven. Hij/zij wordt toegevoegd aan uw "
 "contactenlijst."
 
-#: src/protocols/oscar/oscar.c:5486
+#: src/protocols/oscar/oscar.c:6152
 msgid "Authorization Granted"
 msgstr "Toestemming gegeven"
 
 #. Denied
-#: src/protocols/oscar/oscar.c:5489
+#: src/protocols/oscar/oscar.c:6155
 #, c-format
 msgid ""
 "The user %s has denied your request to add them to your buddy list for the "
@@ -7794,85 +8327,73 @@
 "contactenlijst geweigerd met de volgende reden:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:5490
+#: src/protocols/oscar/oscar.c:6156
 msgid "Authorization Denied"
 msgstr "Toestemming geweigerd"
 
-#: src/protocols/oscar/oscar.c:5527 src/protocols/toc/toc.c:1264
+#: src/protocols/oscar/oscar.c:6193 src/protocols/toc/toc.c:1271
 msgid "_Exchange:"
 msgstr "_Uitwisselen:"
 
-#: src/protocols/oscar/oscar.c:5549
+#: src/protocols/oscar/oscar.c:6215
 msgid "Invalid chat name specified."
 msgstr "Onjuiste chat-naam opgegeven."
 
-#: src/protocols/oscar/oscar.c:5790
+#: src/protocols/oscar/oscar.c:6305
+msgid "Your IM Image was not sent. You cannot send IM Images in AIM chats."
+msgstr ""
+"Uw IM-afbeelding is niet verstuurd. U kunt geen IM-afbeeldingen versturen in "
+"een AIM-chat."
+
+#: src/protocols/oscar/oscar.c:6462
 msgid "Away Message"
 msgstr "Afwezigheidsbericht"
 
-#: src/protocols/oscar/oscar.c:6284
-msgid "Unable to open Direct IM"
-msgstr "Kan geen directe verbinding openen"
-
-#: src/protocols/oscar/oscar.c:6297
-#, c-format
-msgid "You have selected to open a Direct IM connection with %s."
-msgstr "U heeft ervoor gekozen om een directe verbinding te openen met %s."
-
-#: src/protocols/oscar/oscar.c:6300
-msgid ""
-"Because this reveals your IP address, it may be considered a privacy risk.  "
-"Do you wish to continue?"
-msgstr ""
-"Omdat dit uw IP-adres zichtbaar maakt voor de andere partij, kan het worden "
-"gezien als inbreuk op uw privacy. Wilt u doorgaan?"
-
-#: src/protocols/oscar/oscar.c:6485
+#: src/protocols/oscar/oscar.c:6746
 msgid "Buddy Comment:"
 msgstr "Contactopmerking:"
 
-#: src/protocols/oscar/oscar.c:6501
+#: src/protocols/oscar/oscar.c:6764
 msgid "Edit Buddy Comment"
 msgstr "Opmerking bewerken"
 
-#: src/protocols/oscar/oscar.c:6509
+#: src/protocols/oscar/oscar.c:6770
 msgid "Get Status Msg"
 msgstr "Statusbericht tonen"
 
-#: src/protocols/oscar/oscar.c:6524
+#: src/protocols/oscar/oscar.c:6782
 msgid "Direct IM"
 msgstr "Direct bericht"
 
-#: src/protocols/oscar/oscar.c:6553
+#: src/protocols/oscar/oscar.c:6804
 msgid "Re-request Authorization"
 msgstr "Opnieuw toestemming vragen"
 
-#: src/protocols/oscar/oscar.c:6574
+#: src/protocols/oscar/oscar.c:6834
 msgid "The new formatting is invalid."
 msgstr "De nieuwe formattering is ongeldig."
 
-#: src/protocols/oscar/oscar.c:6575
+#: src/protocols/oscar/oscar.c:6835
 msgid "Screen name formatting can change only capitalization and whitespace."
-msgstr ""
-"Formattering van de bijnaam mag alleen spaties en kapitalisering aanpassen."
-
-#: src/protocols/oscar/oscar.c:6581
+msgstr "Formattering van de bijnaam mag alleen spaties en kapitalisering aanpassen."
+
+#: src/protocols/oscar/oscar.c:6842
 msgid "New screen name formatting:"
 msgstr "Opmaak van gebruikersnaam:"
 
-#: src/protocols/oscar/oscar.c:6630
+#: src/protocols/oscar/oscar.c:6894
 msgid "Change Address To:"
 msgstr "Adres veranderen in: "
 
-#: src/protocols/oscar/oscar.c:6674
+#: src/protocols/oscar/oscar.c:6939
 msgid "<i>you are not waiting for authorization</i>"
 msgstr "<i>u wacht niet op toestemming</i>"
 
-#: src/protocols/oscar/oscar.c:6677
+#: src/protocols/oscar/oscar.c:6942
 msgid "You are awaiting authorization from the following buddies"
 msgstr "U wacht op toestemming van de volgende contacten"
 
-#: src/protocols/oscar/oscar.c:6678
+#: src/protocols/oscar/oscar.c:6943
 msgid ""
 "You can re-request authorization from these buddies by right-clicking on "
 "them and selecting \"Re-request Authorization.\""
@@ -7880,75 +8401,75 @@
 "U kunt opnieuw toestemming aanvragen door met de rechter muisknop op de "
 "contacten te klikken en de optie \"Opnieuw toestemming vragen.\" te kiezen."
 
-#: src/protocols/oscar/oscar.c:6692
+#: src/protocols/oscar/oscar.c:6960
 msgid "Find Buddy by E-mail"
 msgstr "Contact zoeken op e-mail adres"
 
-#: src/protocols/oscar/oscar.c:6693
+#: src/protocols/oscar/oscar.c:6961
 msgid "Search for a buddy by e-mail address"
 msgstr "Contact zoeken op e-mail adres"
 
-#: src/protocols/oscar/oscar.c:6694
+#: src/protocols/oscar/oscar.c:6962
 msgid "Type the e-mail address of the buddy you are searching for."
 msgstr "Geef het e-mail adres van de persoon waarnaar u zoekt."
 
-#: src/protocols/oscar/oscar.c:6711
+#: src/protocols/oscar/oscar.c:6979
 msgid "Available Message:"
 msgstr "Beschikbaar-bericht:"
 
-#: src/protocols/oscar/oscar.c:6712
+#: src/protocols/oscar/oscar.c:6980
 msgid "I'm doing work and hoping for a distraction--IM me!"
 msgstr "Ik ben aan het werk en hoop op een afleidend berichtje!"
 
-#: src/protocols/oscar/oscar.c:6788
+#: src/protocols/oscar/oscar.c:7061 src/protocols/silc/silc.c:789
 msgid "Set User Info..."
 msgstr "Gebruikersinfo instellen..."
 
-#: src/protocols/oscar/oscar.c:6795
+#: src/protocols/oscar/oscar.c:7066
 msgid "Set User Info (URL)..."
 msgstr "Gebruikersinfo instellen (URL)..."
 
-#: src/protocols/oscar/oscar.c:6803
+#: src/protocols/oscar/oscar.c:7072
 msgid "Set Available Message..."
 msgstr "Beschikbaar-bericht instellen..."
 
-#: src/protocols/oscar/oscar.c:6810
+#: src/protocols/oscar/oscar.c:7077 src/protocols/silc/silc.c:785
 msgid "Change Password..."
 msgstr "Wachtwoord veranderen..."
 
-#: src/protocols/oscar/oscar.c:6817
+#: src/protocols/oscar/oscar.c:7082
 msgid "Change Password (URL)"
 msgstr "Wachtwoord veranderen (URL)"
 
-#: src/protocols/oscar/oscar.c:6825
+#: src/protocols/oscar/oscar.c:7086
 msgid "Configure IM Forwarding (URL)"
 msgstr "IM-doorsturen configureren (URL)"
 
-#: src/protocols/oscar/oscar.c:6836
+#: src/protocols/oscar/oscar.c:7095
 msgid "Format Screen Name..."
 msgstr "Bijnaam opmaken..."
 
-#: src/protocols/oscar/oscar.c:6842
+#: src/protocols/oscar/oscar.c:7099
 msgid "Confirm Account"
 msgstr "Account bevestigen"
 
-#: src/protocols/oscar/oscar.c:6848
+#: src/protocols/oscar/oscar.c:7103
 msgid "Display Currently Registered Address"
 msgstr "Huidige geregistreerde adres weergeven"
 
-#: src/protocols/oscar/oscar.c:6854
+#: src/protocols/oscar/oscar.c:7107
 msgid "Change Currently Registered Address..."
 msgstr "Huidige geregistreerde adres veranderen..."
 
-#: src/protocols/oscar/oscar.c:6863
+#: src/protocols/oscar/oscar.c:7114
 msgid "Show Buddies Awaiting Authorization"
 msgstr "Contacten weergeven die op toestemming wachten"
 
-#: src/protocols/oscar/oscar.c:6871
+#: src/protocols/oscar/oscar.c:7120
 msgid "Search for Buddy by Email..."
 msgstr "Contact zoeken door middel van e-mail..."
 
-#: src/protocols/oscar/oscar.c:6878
+#: src/protocols/oscar/oscar.c:7125
 msgid "Search for Buddy by Information"
 msgstr "Contact zoeken via informatie"
 
@@ -7963,124 +8484,1442 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/oscar/oscar.c:7002 src/protocols/oscar/oscar.c:7004
+#: src/protocols/oscar/oscar.c:7243 src/protocols/oscar/oscar.c:7245
 msgid "AIM/ICQ Protocol Plugin"
 msgstr "AIM/ICQ-protocol plugin"
 
-#: src/protocols/oscar/oscar.c:7021
+#: src/protocols/oscar/oscar.c:7264
 msgid "Auth host"
 msgstr "Host authoriseren"
 
-#: src/protocols/oscar/oscar.c:7026
+#: src/protocols/oscar/oscar.c:7269
 msgid "Auth port"
 msgstr "Auth-poort"
 
-#: src/protocols/toc/toc.c:167
+#: src/protocols/silc/buddy.c:51 src/protocols/silc/buddy.c:414
+#: src/protocols/silc/buddy.c:539 src/protocols/silc/buddy.c:706
+#: src/protocols/silc/ft.c:340
+#, c-format
+msgid "User %s is not present in the network"
+msgstr "Gebruiker %s is niet aanwezig op het netwerk"
+
+#: src/protocols/silc/buddy.c:52 src/protocols/silc/buddy.c:109
+#: src/protocols/silc/buddy.c:114 src/protocols/silc/buddy.c:118
+#: src/protocols/silc/buddy.c:123 src/protocols/silc/buddy.c:128
+#: src/protocols/silc/buddy.c:133 src/protocols/silc/buddy.c:251
+msgid "Key Agreement"
+msgstr "Sleutels uitwisselen"
+
+#: src/protocols/silc/buddy.c:53
+msgid "Cannot perform the key agreement"
+msgstr "Kan sleutels niet uitwisselen"
+
+#: src/protocols/silc/buddy.c:110
+msgid "Error occurred during key agreement"
+msgstr "Fout opgetreden bij uitwisseling van sleutels"
+
+#: src/protocols/silc/buddy.c:114
+msgid "Key Agreement failed"
+msgstr "Uitwisseling van sleutels mislukt"
+
+#: src/protocols/silc/buddy.c:119
+msgid "Timeout during key agreement"
+msgstr "Tijd verlopen voor uitwisseling van sleutels"
+
+#: src/protocols/silc/buddy.c:124
+msgid "Key agreement was aborted"
+msgstr "Uitwisseling van sleutels afgebroken"
+
+#: src/protocols/silc/buddy.c:129
+msgid "Key agreement is already started"
+msgstr "Uitwisseling van sleutels is al gestart"
+
+#: src/protocols/silc/buddy.c:134
+msgid "Key agreement cannot be started with yourself"
+msgstr "Kan geen sleutels uitwisselen met uzelf"
+
+#: src/protocols/silc/buddy.c:252 src/protocols/silc/buddy.c:382
+#: src/protocols/silc/buddy.c:507
+msgid "The remote user is not present in the network any more"
+msgstr "De andere gebruiker is niet meer aanwezig in het netwerk"
+
+#: src/protocols/silc/buddy.c:288
+#, c-format
+msgid ""
+"Key agreement request received from %s. Would you like to perform the key "
+"agreement?"
+msgstr ""
+"Verzoek tot uitwisselen van sleutels ontvangen van %s. Wilt u sleutels met "
+"deze persoon uitwisselen?"
+
+#: src/protocols/silc/buddy.c:292
+#, c-format
+msgid ""
+"The remote user is waiting key agreement on:\n"
+"Remote host: %s\n"
+"Remote port: %d"
+msgstr ""
+"De andere gebruiker wacht op sleuteluitwisseling op:\n"
+"Computer: %s\n"
+"Poort: %d"
+
+#: src/protocols/silc/buddy.c:305
+msgid "Key Agreement Request"
+msgstr "Verzoek tot sleuteluitwisseling"
+
+#: src/protocols/silc/buddy.c:381 src/protocols/silc/buddy.c:416
+#: src/protocols/silc/buddy.c:458
+msgid "IM With Password"
+msgstr "IM met wachtwoord"
+
+#: src/protocols/silc/buddy.c:417
+msgid "Cannot set IM key"
+msgstr "Kan IM-sleutel niet instellen"
+
+#: src/protocols/silc/buddy.c:459
+msgid "Set IM Password"
+msgstr "IM-wachtwoord instellen"
+
+#: src/protocols/silc/buddy.c:506 src/protocols/silc/buddy.c:541
+#: src/protocols/silc/ops.c:1256 src/protocols/silc/ops.c:1267
+msgid "Get Public Key"
+msgstr "Publieke sleutel ophalen"
+
+#: src/protocols/silc/buddy.c:542 src/protocols/silc/ops.c:1257
+#: src/protocols/silc/ops.c:1268
+msgid "Cannot fetch the public key"
+msgstr "Kan publieke sleutel niet ophalen"
+
+#: src/protocols/silc/buddy.c:629 src/protocols/silc/buddy.c:1544
+msgid "Show Public Key"
+msgstr "Publieke sleutel weergeven"
+
+#: src/protocols/silc/buddy.c:630 src/protocols/silc/buddy.c:989
+#: src/protocols/silc/chat.c:222
+msgid "Could not load public key"
+msgstr "Kan publieke sleutel niet laden"
+
+#: src/protocols/silc/buddy.c:707 src/protocols/silc/ops.c:853
+#: src/protocols/silc/ops.c:925 src/protocols/silc/ops.c:1060
+#: src/protocols/silc/ops.c:1061 src/protocols/silc/ops.c:1079
+msgid "User Information"
+msgstr "Gebruikersinformatie"
+
+#: src/protocols/silc/buddy.c:708 src/protocols/silc/ops.c:926
+#: src/protocols/silc/ops.c:1080
+msgid "Cannot get user information"
+msgstr "Kan gebruikersinformatie niet ophalen"
+
+#: src/protocols/silc/buddy.c:729
+#, c-format
+msgid "The %s buddy is not trusted"
+msgstr "De persoon %s is niet vertrouwd"
+
+#: src/protocols/silc/buddy.c:732
+msgid ""
+"You cannot receive buddy notifications until you import his/her public key.  "
+"You can use the Get Public Key command to get the public key."
+msgstr ""
+
+#. Open file selector to select the public key.
+#: src/protocols/silc/buddy.c:1023
+msgid "Open..."
+msgstr "Openen..."
+
+#: src/protocols/silc/buddy.c:1032
+#, c-format
+msgid "The %s buddy is not present in the network"
+msgstr ""
+
+#: src/protocols/silc/buddy.c:1035
+msgid ""
+"To add the buddy you must import his/her public key. Press Import to import "
+"a public key."
+msgstr ""
+
+#: src/protocols/silc/buddy.c:1038
+msgid "Import..."
+msgstr ""
+
+#: src/protocols/silc/buddy.c:1125
+#, fuzzy
+msgid "Select correct user"
+msgstr "Kies een te raadplegen conferentieserver"
+
+#: src/protocols/silc/buddy.c:1127
+msgid ""
+"More than one user was found with the same public key. Select the correct "
+"user from the list to add to the buddy list."
+msgstr ""
+
+#: src/protocols/silc/buddy.c:1129
+msgid ""
+"More than one user was found with the same name. Select the correct user "
+"from the list to add to the buddy list."
+msgstr ""
+
+#: src/protocols/silc/buddy.c:1377
+msgid "Detached"
+msgstr "Losgekoppeld"
+
+#: src/protocols/silc/buddy.c:1381 src/protocols/silc/silc.c:48
+#: src/protocols/silc/silc.c:80
+msgid "Indisposed"
+msgstr "Gammel"
+
+#: src/protocols/silc/buddy.c:1385 src/protocols/silc/silc.c:49
+#: src/protocols/silc/silc.c:82
+msgid "Wake Me Up"
+msgstr "Maak me wakker"
+
+#: src/protocols/silc/buddy.c:1387 src/protocols/silc/silc.c:45
+#: src/protocols/silc/silc.c:74
+msgid "Hyper Active"
+msgstr "Hyperactief"
+
+#: src/protocols/silc/buddy.c:1389
+msgid "Robot"
+msgstr "Robot"
+
+#: src/protocols/silc/buddy.c:1396 src/protocols/silc/silc.c:610
+#: src/protocols/silc/util.c:469
+msgid "Happy"
+msgstr "Blij"
+
+#: src/protocols/silc/buddy.c:1398 src/protocols/silc/silc.c:612
+#: src/protocols/silc/util.c:471
+msgid "Sad"
+msgstr "Verdrietig"
+
+#: src/protocols/silc/buddy.c:1400 src/protocols/silc/silc.c:614
+#: src/protocols/silc/util.c:473
+msgid "Angry"
+msgstr "Boos"
+
+#: src/protocols/silc/buddy.c:1402 src/protocols/silc/silc.c:616
+#: src/protocols/silc/util.c:475
+msgid "Jealous"
+msgstr "Jaloers"
+
+#: src/protocols/silc/buddy.c:1404 src/protocols/silc/silc.c:618
+#: src/protocols/silc/util.c:477
+msgid "Ashamed"
+msgstr "Beschaamd"
+
+#: src/protocols/silc/buddy.c:1406 src/protocols/silc/silc.c:620
+#: src/protocols/silc/util.c:479
+msgid "Invincible"
+msgstr "Onoverwinnelijk"
+
+#: src/protocols/silc/buddy.c:1408 src/protocols/silc/silc.c:622
+#: src/protocols/silc/util.c:481
+msgid "In Love"
+msgstr "Verliefd"
+
+#: src/protocols/silc/buddy.c:1410 src/protocols/silc/silc.c:624
+#: src/protocols/silc/util.c:483
+msgid "Sleepy"
+msgstr "Slaperig"
+
+#: src/protocols/silc/buddy.c:1412 src/protocols/silc/silc.c:626
+#: src/protocols/silc/util.c:485
+msgid "Bored"
+msgstr "Verveeld"
+
+#: src/protocols/silc/buddy.c:1414 src/protocols/silc/silc.c:628
+#: src/protocols/silc/util.c:487
+msgid "Excited"
+msgstr "Opgewonden"
+
+#: src/protocols/silc/buddy.c:1416 src/protocols/silc/silc.c:630
+#: src/protocols/silc/util.c:489
+msgid "Anxious"
+msgstr "Angstig"
+
+#: src/protocols/silc/buddy.c:1448 src/protocols/silc/ops.c:962
+#, fuzzy
+msgid "User Modes"
+msgstr "Gebruikers"
+
+#: src/protocols/silc/buddy.c:1457 src/protocols/silc/ops.c:971
+msgid "Mood"
+msgstr "Stemming"
+
+#: src/protocols/silc/buddy.c:1461 src/protocols/silc/ops.c:977
+msgid "Status Text"
+msgstr "Statustekst"
+
+#: src/protocols/silc/buddy.c:1466 src/protocols/silc/ops.c:983
+#, fuzzy
+msgid "Preferred Contact"
+msgstr "Contact verwijderen"
+
+#: src/protocols/silc/buddy.c:1471 src/protocols/silc/ops.c:988
+msgid "Preferred Language"
+msgstr "Voorkeurstaal"
+
+#: src/protocols/silc/buddy.c:1476 src/protocols/silc/ops.c:993
+msgid "Device"
+msgstr "Apparaat"
+
+#: src/protocols/silc/buddy.c:1481 src/protocols/silc/ops.c:998
+#: src/protocols/silc/silc.c:678 src/protocols/silc/silc.c:680
+msgid "Timezone"
+msgstr "Tijdzone"
+
+#: src/protocols/silc/buddy.c:1486 src/protocols/silc/ops.c:1003
+msgid "Geolocation"
+msgstr "Geo-locatie"
+
+#: src/protocols/silc/buddy.c:1529
+msgid "Reset IM Key"
+msgstr ""
+
+#: src/protocols/silc/buddy.c:1534
+msgid "IM with Key Exchange"
+msgstr ""
+
+#: src/protocols/silc/buddy.c:1538
+#, fuzzy
+msgid "IM with Password"
+msgstr "Wachtwoord"
+
+#: src/protocols/silc/buddy.c:1549
+msgid "Get Public Key..."
+msgstr ""
+
+#: src/protocols/silc/buddy.c:1555 src/protocols/silc/ops.c:1389
+#, fuzzy
+msgid "Kill User"
+msgstr "Gaim gebruiker"
+
+#: src/protocols/silc/chat.c:37
+msgid "_Passphrase:"
+msgstr "_Wachtwoord:"
+
+#: src/protocols/silc/chat.c:66
+#, c-format
+msgid "Channel %s does not exist in the network"
+msgstr "Kanaal %s bestaat niet in het netwerk"
+
+#: src/protocols/silc/chat.c:67 src/protocols/silc/chat.c:159
+msgid "Channel Information"
+msgstr "Kanaal informatie"
+
+#: src/protocols/silc/chat.c:68
+msgid "Cannot get channel information"
+msgstr "Kan kanaalinformatie niet ophalen"
+
+#: src/protocols/silc/chat.c:105
+#, c-format
+msgid "<b>Channel Name:</b> %s"
+msgstr "<b>Kanaalnaam:</b> %s"
+
+#: src/protocols/silc/chat.c:108
+#, c-format
+msgid "<br><b>User Count:</b> %d"
+msgstr "<br><b>Aantal gebruikers:</b> %d"
+
+#: src/protocols/silc/chat.c:115
+#, c-format
+msgid "<br><b>Channel Founder:</b> %s"
+msgstr "<br><b>Kanaalstarter:</b> %s"
+
+#: src/protocols/silc/chat.c:124
+#, c-format
+msgid "<br><b>Channel Cipher:</b> %s"
+msgstr ""
+
+#: src/protocols/silc/chat.c:127
+#, fuzzy, c-format
+msgid "<br><b>Channel HMAC:</b> %s"
+msgstr "_Ruimte:"
+
+#: src/protocols/silc/chat.c:132
+#, c-format
+msgid "<br><b>Channel Topic:</b><br>%s"
+msgstr "<br><b>Kanaalonderwerp:</b><br>%s"
+
+#: src/protocols/silc/chat.c:137
+#, fuzzy
+msgid "<br><b>Channel Modes:</b> "
+msgstr "Afwezigheid"
+
+#: src/protocols/silc/chat.c:150
+#, fuzzy, c-format
+msgid "<br><b>Founder Key Fingerprint:</b><br>%s"
+msgstr "Profielinformatie"
+
+#: src/protocols/silc/chat.c:151
+#, fuzzy, c-format
+msgid "<br><b>Founder Key Babbleprint:</b><br>%s"
+msgstr "Profielinformatie"
+
+#: src/protocols/silc/chat.c:221
+msgid "Add Channel Public Key"
+msgstr ""
+
+#. Add new public key
+#: src/protocols/silc/chat.c:276
+msgid "Open Public Key..."
+msgstr ""
+
+#: src/protocols/silc/chat.c:385
+#, fuzzy
+msgid "Channel Passphrase"
+msgstr "Wachtwoord veranderen"
+
+#: src/protocols/silc/chat.c:392
+msgid "Channel Public Keys List"
+msgstr ""
+
+#: src/protocols/silc/chat.c:397
+msgid ""
+"Channel authentication is used to secure the channel from unauthorized "
+"access. The authentication may be based on passphrase and digital "
+"signatures. If passphrase is set, it is required to be able to join. If "
+"channel public keys are set then only users whose public keys are listed are "
+"able to join."
+msgstr ""
+
+#: src/protocols/silc/chat.c:406 src/protocols/silc/chat.c:407
+#: src/protocols/silc/chat.c:444 src/protocols/silc/chat.c:445
+#: src/protocols/silc/chat.c:874
+#, fuzzy
+msgid "Channel Authentication"
+msgstr "Tekstaanmelding"
+
+#: src/protocols/silc/chat.c:408 src/protocols/silc/chat.c:446
+msgid "Add / Remove"
+msgstr "Toevoegen / verwijderen"
+
+#: src/protocols/silc/chat.c:563
+msgid "Group Name"
+msgstr "Groepsnaam"
+
+#: src/protocols/silc/chat.c:567 src/protocols/silc/ops.c:1669
+#, fuzzy
+msgid "Passphrase"
+msgstr "Wachtwoord verzonden"
+
+#: src/protocols/silc/chat.c:578
+#, fuzzy, c-format
+msgid "Please enter the %s channel private group name and passphrase."
+msgstr "Geef alstublieft de naam van de toe te voegen groep."
+
+#: src/protocols/silc/chat.c:580
+msgid "Add Channel Private Group"
+msgstr ""
+
+#: src/protocols/silc/chat.c:707
+msgid "User Limit"
+msgstr "Maximaal aantal gebruikers"
+
+#: src/protocols/silc/chat.c:708
+msgid "Set user limit on channel. Set to zero to reset user limit."
+msgstr "Limiet stellen aan aantal gebruikers. Nul schakelt deze functie uit."
+
+#: src/protocols/silc/chat.c:850
+msgid "Get Info"
+msgstr "Extra info"
+
+#: src/protocols/silc/chat.c:857
+#, fuzzy
+msgid "Invite List"
+msgstr "Uitnodigen"
+
+#: src/protocols/silc/chat.c:861
+#, fuzzy
+msgid "Ban List"
+msgstr "Contactenlijst"
+
+#: src/protocols/silc/chat.c:868
+#, fuzzy
+msgid "Add Private Group"
+msgstr "Groep toevoegen"
+
+#: src/protocols/silc/chat.c:879
+msgid "Reset Permanent"
+msgstr ""
+
+#: src/protocols/silc/chat.c:883
+msgid "Set Permanent"
+msgstr ""
+
+#: src/protocols/silc/chat.c:890
+#, fuzzy
+msgid "Set User Limit"
+msgstr "Gebruikersinfo instellen"
+
+#: src/protocols/silc/chat.c:895
+#, fuzzy
+msgid "Reset Topic Restriction"
+msgstr "Melding bij nieuwe versie van gaim"
+
+#: src/protocols/silc/chat.c:899
+msgid "Set Topic Restriction"
+msgstr ""
+
+#: src/protocols/silc/chat.c:905
+msgid "Reset Private Channel"
+msgstr ""
+
+#: src/protocols/silc/chat.c:909
+msgid "Set Private Channel"
+msgstr ""
+
+#: src/protocols/silc/chat.c:915
+msgid "Reset Secret Channel"
+msgstr ""
+
+#: src/protocols/silc/chat.c:919
+msgid "Set Secret Channel"
+msgstr ""
+
+#: src/protocols/silc/chat.c:989
+#, fuzzy, c-format
+msgid "You are channel founder on <I>%s</I>"
+msgstr "U bent uit %s verbannen."
+
+#: src/protocols/silc/chat.c:993
+#, c-format
+msgid "Channel founder on <I>%s</I> is <I>%s</I>"
+msgstr ""
+
+#: src/protocols/silc/chat.c:1046
+#, c-format
+msgid "You have to join the %s channel before you are able to join the private group"
+msgstr ""
+
+#: src/protocols/silc/chat.c:1048
+#, fuzzy
+msgid "Join Private Group"
+msgstr "Groep hernoemen"
+
+#: src/protocols/silc/chat.c:1049
+#, fuzzy
+msgid "Cannot join private group"
+msgstr "Kan groep nul niet verwijderen"
+
+#: src/protocols/silc/chat.c:1242 src/protocols/silc/silc.c:888
+msgid "Cannot call command"
+msgstr ""
+
+#: src/protocols/silc/chat.c:1243 src/protocols/silc/silc.c:889
+#, fuzzy
+msgid "Unknown command"
+msgstr "Onbekende opdracht: %s"
+
+#: src/protocols/silc/ft.c:89 src/protocols/silc/ft.c:92
+#: src/protocols/silc/ft.c:96 src/protocols/silc/ft.c:100
+#: src/protocols/silc/ft.c:104 src/protocols/silc/ft.c:206
+#: src/protocols/silc/ft.c:211 src/protocols/silc/ft.c:216
+#: src/protocols/silc/ft.c:222 src/protocols/silc/ft.c:342
+msgid "Secure File Transfer"
+msgstr "Beveiligde bestandsoverdrachten"
+
+#: src/protocols/silc/ft.c:90 src/protocols/silc/ft.c:93
+#: src/protocols/silc/ft.c:97 src/protocols/silc/ft.c:101
+#: src/protocols/silc/ft.c:105
+msgid "Error during file transfer"
+msgstr "Fout bij bestandsoverdracht"
+
+#: src/protocols/silc/ft.c:94
+msgid "Permission denied"
+msgstr "Geen toegang"
+
+#: src/protocols/silc/ft.c:98
+msgid "Key agreement failed"
+msgstr "Uitwisseling van sleutels mislukt"
+
+#: src/protocols/silc/ft.c:102
+#, fuzzy
+msgid "File transfer sessions does not exist"
+msgstr "Gebruiker bestaat niet"
+
+#: src/protocols/silc/ft.c:207
+#, fuzzy
+msgid "No file transfer session active"
+msgstr "Bestandsoverdracht computer"
+
+#: src/protocols/silc/ft.c:212
+#, fuzzy
+msgid "File transfer already started"
+msgstr "Bestandsoverdracht van %s afgebroken.\n"
+
+#: src/protocols/silc/ft.c:217
+#, fuzzy
+msgid "Could not perform key agreement for file transfer"
+msgstr "Kan niet verbinden voor overdracht."
+
+#: src/protocols/silc/ft.c:223
+#, fuzzy
+msgid "Could not start the file transfer"
+msgstr "Kan niet verbinden voor overdracht."
+
+#: src/protocols/silc/ft.c:343
+msgid "Cannot send file"
+msgstr "Kan bestand niet verzenden"
+
+#: src/protocols/silc/ops.c:333 src/protocols/silc/ops.c:342
+#: src/protocols/silc/ops.c:351
+#, fuzzy, c-format
+msgid "%s has changed the topic of <I>%s</I> to: %s"
+msgstr "%s heeft het onderwerp veranderd naar: %s"
+
+#: src/protocols/silc/ops.c:413
+#, c-format
+msgid "<I>%s</I> set channel <I>%s</I> modes to: %s"
+msgstr ""
+
+#: src/protocols/silc/ops.c:417
+#, c-format
+msgid "<I>%s</I> removed all channel <I>%s</I> modes"
+msgstr ""
+
+#: src/protocols/silc/ops.c:448
+#, c-format
+msgid "<I>%s</I> set <I>%s's</I> modes to: %s"
+msgstr ""
+
+#: src/protocols/silc/ops.c:452
+#, c-format
+msgid "<I>%s</I> removed all <I>%s's</I> modes"
+msgstr ""
+
+#: src/protocols/silc/ops.c:479
+#, fuzzy, c-format
+msgid "You have been kicked off <I>%s</I> by <I>%s</I> (%s)"
+msgstr "U bent uit weggeschopt door %s: (%s)"
+
+#: src/protocols/silc/ops.c:509 src/protocols/silc/ops.c:514
+#: src/protocols/silc/ops.c:519
+#, fuzzy, c-format
+msgid "You have been killed by %s (%s)"
+msgstr "U bent uit weggeschopt door %s: (%s)"
+
+#: src/protocols/silc/ops.c:540 src/protocols/silc/ops.c:545
+#: src/protocols/silc/ops.c:550
+#, fuzzy, c-format
+msgid "Killed by %s (%s)"
+msgstr "Weggeschopt door %s (%s)"
+
+#: src/protocols/silc/ops.c:596
+#, fuzzy
+msgid "Server signoff"
+msgstr "Afmelden"
+
+#: src/protocols/silc/ops.c:783
+msgid "Personal Information"
+msgstr "Persoonlijke informatie"
+
+#: src/protocols/silc/ops.c:806
+msgid "Birth Day"
+msgstr "Geboortedatum"
+
+#: src/protocols/silc/ops.c:810
+msgid "Job Title"
+msgstr "Functieomschrijving"
+
+#: src/protocols/silc/ops.c:814
+#, fuzzy
+msgid "Job Role"
+msgstr "Rol"
+
+#: src/protocols/silc/ops.c:818
+msgid "Organization"
+msgstr "Organisatie"
+
+#: src/protocols/silc/ops.c:822
+msgid "Unit"
+msgstr "Afdeling"
+
+#: src/protocols/silc/ops.c:841
+msgid "EMail"
+msgstr "E-mail"
+
+#: src/protocols/silc/ops.c:846
+msgid "Note"
+msgstr "Opmerking"
+
+#: src/protocols/silc/ops.c:894
+#, fuzzy
+msgid "Join Chat"
+msgstr "Chat openen"
+
+#: src/protocols/silc/ops.c:1050 src/protocols/silc/ops.c:1120
+#, fuzzy
+msgid "Public Key Fingerprint"
+msgstr "Profielinformatie"
+
+#: src/protocols/silc/ops.c:1051 src/protocols/silc/ops.c:1121
+#, fuzzy
+msgid "Public Key Babbleprint"
+msgstr "Profielinformatie"
+
+#: src/protocols/silc/ops.c:1064
+msgid "More..."
+msgstr "Meer..."
+
+#: src/protocols/silc/ops.c:1135 src/protocols/silc/silc.c:777
+msgid "Detach From Server"
+msgstr "Loskoppelen van server"
+
+#: src/protocols/silc/ops.c:1135
+msgid "Cannot detach"
+msgstr "Kan niet loskoppelen"
+
+#: src/protocols/silc/ops.c:1146
+msgid "Cannot set topic"
+msgstr "Kan onderwerp niet veranderen"
+
+#: src/protocols/silc/ops.c:1184
+msgid "Failed to change nickname"
+msgstr "Kan bijnaam niet veranderen"
+
+#: src/protocols/silc/ops.c:1221
+msgid "Roomlist"
+msgstr "Lijst van ruimtes"
+
+#: src/protocols/silc/ops.c:1221
+msgid "Cannot get room list"
+msgstr "Kan lijst van ruimtes niet opvragen"
+
+#: src/protocols/silc/ops.c:1269
+msgid "No public key was received"
+msgstr "Geen publieke sleutel ontvangen"
+
+#: src/protocols/silc/ops.c:1282 src/protocols/silc/ops.c:1296
+msgid "Server Information"
+msgstr "Server-informatie"
+
+#: src/protocols/silc/ops.c:1283
+#, fuzzy
+msgid "Cannot get server information"
+msgstr "Gebruikersinformatie aanpassen voor %s"
+
+#: src/protocols/silc/ops.c:1314 src/protocols/silc/ops.c:1323
+msgid "Server Statistics"
+msgstr "Serverstatistieken"
+
+#: src/protocols/silc/ops.c:1315
+#, fuzzy
+msgid "Cannot get server statistics"
+msgstr "Gebruikersinformatie aanpassen voor %s"
+
+#: src/protocols/silc/ops.c:1324
+msgid "No server statisitics available"
+msgstr "Geen server-statistieken beschikbaar"
+
+#: src/protocols/silc/ops.c:1346
+#, c-format
+msgid ""
+"Local server start time: %s\n"
+"Local server uptime: %s\n"
+"Local server clients: %d\n"
+"Local server channels: %d\n"
+"Local server operators: %d\n"
+"Local router operators: %d\n"
+"Local cell clients: %d\n"
+"Local cell channels: %d\n"
+"Local cell servers: %d\n"
+"Total clients: %d\n"
+"Total channels: %d\n"
+"Total servers: %d\n"
+"Total routers: %d\n"
+"Total server operators: %d\n"
+"Total router operators: %d\n"
+msgstr ""
+
+#: src/protocols/silc/ops.c:1369
+msgid "Network Statistics"
+msgstr "Netwerkstatistieken"
+
+#: src/protocols/silc/ops.c:1377 src/protocols/silc/ops.c:1382
+msgid "Ping"
+msgstr "Ping"
+
+#: src/protocols/silc/ops.c:1377
+msgid "Ping failed"
+msgstr "Ping mislukt"
+
+#: src/protocols/silc/ops.c:1382
+msgid "Ping reply received from server"
+msgstr "Antwoord ontvangen van server"
+
+#: src/protocols/silc/ops.c:1390
+#, fuzzy
+msgid "Could not kill user"
+msgstr "Kan niet verzenden"
+
+#: src/protocols/silc/ops.c:1471
+#, fuzzy
+msgid "Error during connecting to SILC Server"
+msgstr "Fout bij schrijven naar %s-server"
+
+#: src/protocols/silc/ops.c:1476
+msgid "Key Exchange failed"
+msgstr ""
+
+#: src/protocols/silc/ops.c:1485
+msgid "Resuming detached session failed. Press Reconnect to create new connection."
+msgstr ""
+
+#: src/protocols/silc/ops.c:1520
+msgid "Disconnected by server"
+msgstr "Verbinding verbroken door server"
+
+#: src/protocols/silc/ops.c:1580 src/protocols/silc/ops.c:1627
+#: src/protocols/silc/silc.c:167
+msgid "Resuming session"
+msgstr "Herstellen van sessie"
+
+#: src/protocols/silc/ops.c:1582
+#, fuzzy
+msgid "Authenticating connection"
+msgstr "Naam en wachtwoord worden gecontroleerd"
+
+#: src/protocols/silc/ops.c:1629
+#, fuzzy
+msgid "Verifying server public key"
+msgstr "Serversleutel wordt gelezen"
+
+#: src/protocols/silc/ops.c:1670
+#, fuzzy
+msgid "Passphrase required"
+msgstr "Betaling vereist"
+
+#: src/protocols/silc/ops.c:1699
+msgid "Failure: Version mismatch, upgrade your client"
+msgstr ""
+"Mislukt: Versies komen niet overeen. Installeer een nieuwe versie van uw "
+"programma"
+
+#: src/protocols/silc/ops.c:1702
+msgid "Failure: Remote does not trust/support your public key"
+msgstr ""
+
+#: src/protocols/silc/ops.c:1705
+msgid "Failure: Remote does not support proposed KE group"
+msgstr ""
+
+#: src/protocols/silc/ops.c:1708
+msgid "Failure: Remote does not support proposed cipher"
+msgstr ""
+
+#: src/protocols/silc/ops.c:1711
+msgid "Failure: Remote does not support proposed PKCS"
+msgstr ""
+
+#: src/protocols/silc/ops.c:1714
+msgid "Failure: Remote does not support proposed hash function"
+msgstr ""
+
+#: src/protocols/silc/ops.c:1717
+msgid "Failure: Remote does not support proposed HMAC"
+msgstr ""
+
+#: src/protocols/silc/ops.c:1719
+msgid "Failure: Incorrect signature"
+msgstr ""
+
+#: src/protocols/silc/ops.c:1721
+msgid "Failure: Invalid cookie"
+msgstr ""
+
+#: src/protocols/silc/ops.c:1732
+#, fuzzy
+msgid "Failure: Authentication failed"
+msgstr "Identificatie mislukt"
+
+#: src/protocols/silc/pk.c:103
+#, c-format
+msgid ""
+"Received %s's public key. Your local copy does not match this key. Would you "
+"still like to accept this public key?"
+msgstr ""
+
+#: src/protocols/silc/pk.c:108
+#, c-format
+msgid "Received %s's public key. Would you like to accept this public key?"
+msgstr ""
+
+#: src/protocols/silc/pk.c:112
+#, c-format
+msgid ""
+"Fingerprint and babbleprint for the %s key are:\n"
+"\n"
+"%s\n"
+"%s\n"
+msgstr ""
+
+#: src/protocols/silc/pk.c:115 src/protocols/silc/pk.c:139
+msgid "Verify Public Key"
+msgstr ""
+
+#: src/protocols/silc/pk.c:118
+#, fuzzy
+msgid "View..."
+msgstr "Nieuw..."
+
+#: src/protocols/silc/pk.c:140
+#, fuzzy
+msgid "Unsupported public key type"
+msgstr "Stanzatype niet ondersteund"
+
+#: src/protocols/silc/silc.c:133
+#, fuzzy
+msgid "Connection failed"
+msgstr "Verbinding mislukt"
+
+#: src/protocols/silc/silc.c:159
+#, fuzzy
+msgid "Cannot initialize SILC Client connection"
+msgstr "Afronden van verbinding"
+
+#: src/protocols/silc/silc.c:170
+msgid "Performing key exchange"
+msgstr ""
+
+#: src/protocols/silc/silc.c:242
+msgid "Out of memory"
+msgstr ""
+
+#. Progress
+#: src/protocols/silc/silc.c:276
+#, fuzzy
+msgid "Connecting to SILC Server"
+msgstr "Verbinden met server"
+
+#: src/protocols/silc/silc.c:606
+#, fuzzy
+msgid "Your Current Mood"
+msgstr "Nu aanwezig"
+
+#: src/protocols/silc/silc.c:608
+msgid "Normal"
+msgstr ""
+
+#: src/protocols/silc/silc.c:633
+msgid ""
+"\n"
+"Your Preferred Contact Methods"
+msgstr ""
+
+#: src/protocols/silc/silc.c:641 src/protocols/silc/util.c:514
+#, fuzzy
+msgid "SMS"
+msgstr "MSN"
+
+#: src/protocols/silc/silc.c:643 src/protocols/silc/util.c:516
+#, fuzzy
+msgid "MMS"
+msgstr "MSN"
+
+#: src/protocols/silc/silc.c:645 src/protocols/silc/util.c:518
+#, fuzzy
+msgid "Video Conferencing"
+msgstr "Groepsgesprek openen"
+
+#: src/protocols/silc/silc.c:650
+msgid "Your Current Status"
+msgstr ""
+
+#: src/protocols/silc/silc.c:657
+#, fuzzy
+msgid "Online Services"
+msgstr "On-line sinds"
+
+#: src/protocols/silc/silc.c:660
+msgid "Let others see what services you are using"
+msgstr ""
+
+#: src/protocols/silc/silc.c:666
+msgid "Let others see what computer you are using"
+msgstr ""
+
+#: src/protocols/silc/silc.c:673
+msgid "Your VCard File"
+msgstr ""
+
+#: src/protocols/silc/silc.c:686 src/protocols/silc/silc.c:687
+msgid "User Online Status Attributes"
+msgstr ""
+
+#: src/protocols/silc/silc.c:688
+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 ""
+
+#: src/protocols/silc/silc.c:728 src/protocols/silc/silc.c:734
+#: src/protocols/silc/silc.c:1135
+#, fuzzy
+msgid "Message of the Day"
+msgstr "Bericht van %s"
+
+#: src/protocols/silc/silc.c:728
+#, fuzzy
+msgid "No Message of the Day available"
+msgstr "Geen MOTD beschikbaar"
+
+#: src/protocols/silc/silc.c:729 src/protocols/silc/silc.c:1130
+#, fuzzy
+msgid "There is no Message of the Day associated with this connection"
+msgstr "Er is geen MOTD geassocieerd met deze verbinding."
+
+#: src/protocols/silc/silc.c:772
+#, fuzzy
+msgid "Online Status"
+msgstr "Online sinds"
+
+#: src/protocols/silc/silc.c:781
+msgid "View Message of the Day"
+msgstr ""
+
+#: src/protocols/silc/silc.c:853
+#, c-format
+msgid "User <I>%s</I> is not present in the network"
+msgstr ""
+
+#: src/protocols/silc/silc.c:962
+#, fuzzy
+msgid "Failed to leave channel"
+msgstr "Kan niet deelnemen aan chat"
+
+#: src/protocols/silc/silc.c:1006
+#, fuzzy
+msgid "Topic too long"
+msgstr "Profiel is te lang."
+
+#: src/protocols/silc/silc.c:1087
+msgid "You must specify a nick"
+msgstr ""
+
+#: src/protocols/silc/silc.c:1189
+#, fuzzy, c-format
+msgid "channel %s not found"
+msgstr "Bijeenkomst niet gevonden"
+
+#: src/protocols/silc/silc.c:1194
+#, fuzzy, c-format
+msgid "channel modes for %s: %s"
+msgstr "Het onderwerp voor %s is %s"
+
+#: src/protocols/silc/silc.c:1196
+#, fuzzy, c-format
+msgid "no channel modes are set on %s"
+msgstr "U bent uit %s verbannen."
+
+#: src/protocols/silc/silc.c:1209
+#, fuzzy, c-format
+msgid "Failed to set cmodes for %s"
+msgstr "Kan de afbeelding niet opslaan: %s\n"
+
+#: src/protocols/silc/silc.c:1239
+#, fuzzy, c-format
+msgid "Unknown command: %s, (may be a Gaim bug)"
+msgstr "Onbekende opdracht: %s"
+
+#: src/protocols/silc/silc.c:1302
+msgid "part [channel]:  Leave the chat"
+msgstr ""
+
+#: src/protocols/silc/silc.c:1306
+msgid "leave [channel]:  Leave the chat"
+msgstr ""
+
+#: src/protocols/silc/silc.c:1310
+msgid "topic [&lt;new topic&gt;]:  View or change the topic"
+msgstr ""
+
+#: src/protocols/silc/silc.c:1315
+msgid "join &lt;channel&gt; [&lt;password&gt;]:  Join a chat on this network"
+msgstr ""
+
+#: src/protocols/silc/silc.c:1319
+msgid "list:  List channels on this network"
+msgstr ""
+
+#: src/protocols/silc/silc.c:1323
+msgid "whois &lt;nick&gt;:  View nick's information"
+msgstr ""
+
+#: src/protocols/silc/silc.c:1327 src/protocols/zephyr/zephyr.c:1673
+msgid "msg &lt;nick&gt; &lt;message&gt;:  Send a private message to a user"
+msgstr ""
+
+#: src/protocols/silc/silc.c:1331
+msgid "query &lt;nick&gt; [&lt;message&gt;]:  Send a private message to a user"
+msgstr ""
+
+#: src/protocols/silc/silc.c:1335
+msgid "motd:  View the server's Message Of The Day"
+msgstr ""
+
+#: src/protocols/silc/silc.c:1339
+msgid "detach:  Detach this session"
+msgstr ""
+
+#: src/protocols/silc/silc.c:1343
+msgid "quit [message]:  Disconnect from the server, with an optional message"
+msgstr ""
+
+#: src/protocols/silc/silc.c:1347
+msgid "call &lt;command&gt;:  Call any silc client command"
+msgstr ""
+
+#: src/protocols/silc/silc.c:1352
+msgid "kill &lt;nick&gt; [-pubkey|&lt;reason&gt;]:  Kill nick"
+msgstr ""
+
+#: src/protocols/silc/silc.c:1356
+msgid "nick &lt;newnick&gt;:  Change your nickname"
+msgstr ""
+
+#: src/protocols/silc/silc.c:1360
+msgid "whowas &lt;nick&gt;:  View nick's information"
+msgstr ""
+
+#: src/protocols/silc/silc.c:1364
+msgid ""
+"cmode &lt;channel&gt; [+|-&lt;modes&gt]; [arguments]:  Change or display "
+"channel modes"
+msgstr ""
+
+#: src/protocols/silc/silc.c:1368
+msgid ""
+"cumode &lt;channel&gt; +|-&lt;modes&gt; &lt;nick&gt;:  Change nick's modes "
+"on channel"
+msgstr ""
+
+#: src/protocols/silc/silc.c:1372
+msgid "umode &lt;usermodes&gt;:  Set your modes in the network"
+msgstr ""
+
+#: src/protocols/silc/silc.c:1376
+msgid "oper &lt;nick&gt; [-pubkey]:  Get server operator privileges"
+msgstr ""
+
+#: src/protocols/silc/silc.c:1380
+msgid ""
+"invite &lt;channel&gt; [-|+]&lt;nick&gt;:  invite nick or add/remove from "
+"channel invite list"
+msgstr ""
+
+#: src/protocols/silc/silc.c:1384
+msgid "kick &lt;channel&gt; &lt;nick&gt; [comment]:  Kick client from channel"
+msgstr ""
+
+#: src/protocols/silc/silc.c:1388
+msgid "info [server]:  View server administrative details"
+msgstr ""
+
+#: src/protocols/silc/silc.c:1392
+msgid "ban [&lt;channel&gt; +|-&lt;nick&gt;]:  Ban client from channel"
+msgstr ""
+
+#: src/protocols/silc/silc.c:1396
+msgid "getkey &lt;nick|server&gt;:  Retrieve client's or server's public key"
+msgstr ""
+
+#: src/protocols/silc/silc.c:1400
+msgid "stats:  View server and network statistics"
+msgstr ""
+
+#: src/protocols/silc/silc.c:1404
+msgid "ping:  Send PING to the connected server"
+msgstr ""
+
+#: src/protocols/silc/silc.c:1409
+msgid "users &lt;channel&gt;:  List users in channel"
+msgstr ""
+
+#: src/protocols/silc/silc.c:1413
+msgid ""
+"names [-count|-ops|-halfops|-voices|-normal] &lt;channel(s)&gt;:  List "
+"specific users in channel(s)"
+msgstr ""
+
+#: src/protocols/silc/silc.c:1425
+#, fuzzy
+msgid "Instant Messages"
+msgstr "Instant Messagers"
+
+#: src/protocols/silc/silc.c:1430
+#, fuzzy
+msgid "Digitally sign all IM messages"
+msgstr "Alle gesprekken _opslaan"
+
+#: src/protocols/silc/silc.c:1435
+msgid "Verify all IM message signatures"
+msgstr ""
+
+#: src/protocols/silc/silc.c:1438
+#, fuzzy
+msgid "Channel Messages"
+msgstr "Afwezigheid"
+
+#: src/protocols/silc/silc.c:1443
+#, fuzzy
+msgid "Digitally sign all channel messages"
+msgstr "Alle gesprekken _opslaan"
+
+#: src/protocols/silc/silc.c:1448
+msgid "Verify all channel message signatures"
+msgstr "Alle berichthandtekeningen in kanaal controleren"
+
+#: src/protocols/silc/silc.c:1451
+msgid "Default SILC Key Pair"
+msgstr "Standaard SILC Sleutelpaar"
+
+#: src/protocols/silc/silc.c:1456
+msgid "SILC Public Key"
+msgstr "SILC Publieke sleutel"
+
+#: src/protocols/silc/silc.c:1461
+msgid "SILC Private Key"
+msgstr "SILC Privésleutel"
+
+#. *< api_version
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#: src/protocols/silc/silc.c:1547
+msgid "SILC Protocol Plugin"
+msgstr "SILC-protocol plugin"
+
+#. *  description
+#: src/protocols/silc/silc.c:1549
+msgid "Secure Internet Live Conferencing (SILC) Protocol"
+msgstr ""
+
+#: src/protocols/silc/silc.c:1579
+#, fuzzy
+msgid "Public key authentication"
+msgstr "Tekstaanmelding"
+
+#: src/protocols/silc/silc.c:1585
+msgid "Public Key File"
+msgstr ""
+
+#: src/protocols/silc/silc.c:1589
+msgid "Private Key File"
+msgstr ""
+
+#: src/protocols/silc/silc.c:1594
+msgid "Reject watching by other users"
+msgstr ""
+
+#: src/protocols/silc/silc.c:1597
+#, fuzzy
+msgid "Block invites"
+msgstr "Gebruiker blokkeren"
+
+#: src/protocols/silc/silc.c:1600
+msgid "Block IMs without Key Exchange"
+msgstr ""
+
+#: src/protocols/silc/silc.c:1603
+msgid "Reject online status attribute requests"
+msgstr ""
+
+#: src/protocols/silc/util.c:202 src/protocols/silc/util.c:227
+msgid "Creating SILC key pair..."
+msgstr ""
+
+#. Hint for translators: Please check the tabulator width here and in
+#. the next strings (short strings: 2 tabs, longer strings 1 tab,
+#. sum: 3 tabs or 24 characters)
+#: src/protocols/silc/util.c:310
+#, c-format
+msgid "Real Name: \t%s\n"
+msgstr "Echte naam: \t%s\n"
+
+#: src/protocols/silc/util.c:312
+#, c-format
+msgid "User Name: \t%s\n"
+msgstr "Gebruiker: \t%s\n"
+
+#: src/protocols/silc/util.c:314
+#, c-format
+msgid "EMail: \t\t%s\n"
+msgstr "E-mail: \t\t%s\n"
+
+#: src/protocols/silc/util.c:316
+#, fuzzy, c-format
+msgid "Host Name: \t%s\n"
+msgstr "Voornaam"
+
+#: src/protocols/silc/util.c:318
+#, fuzzy, c-format
+msgid "Organization: \t%s\n"
+msgstr "Organisatie"
+
+#: src/protocols/silc/util.c:320
+#, fuzzy, c-format
+msgid "Country: \t%s\n"
+msgstr "Land"
+
+#: src/protocols/silc/util.c:321
+#, fuzzy, c-format
+msgid "Algorithm: \t%s\n"
+msgstr "Voornaam"
+
+#: src/protocols/silc/util.c:322
+#, fuzzy, c-format
+msgid "Key Length: \t%d bits\n"
+msgstr "Tekstvervanging"
+
+#: src/protocols/silc/util.c:324
+#, fuzzy, c-format
+msgid ""
+"Public Key Fingerprint:\n"
+"%s\n"
+"\n"
+msgstr "Profielinformatie"
+
+#: src/protocols/silc/util.c:325
+#, fuzzy, c-format
+msgid ""
+"Public Key Babbleprint:\n"
+"%s"
+msgstr "Profielinformatie"
+
+#: src/protocols/silc/util.c:329 src/protocols/silc/util.c:330
+#, fuzzy
+msgid "Public Key Information"
+msgstr "Profielinformatie"
+
+#: src/protocols/silc/util.c:512
+#, fuzzy
+msgid "Paging"
+msgstr "Logboek"
+
+#: src/protocols/silc/util.c:536
+#, fuzzy
+msgid "Computer"
+msgstr "Land"
+
+#: src/protocols/silc/util.c:540
+msgid "PDA"
+msgstr ""
+
+#: src/protocols/silc/util.c:542
+msgid "Terminal"
+msgstr ""
+
+#: src/protocols/toc/toc.c:137
 #, c-format
 msgid "Looking up %s"
 msgstr "%s wordt opgezocht"
 
-#: src/protocols/toc/toc.c:510
+#: src/protocols/toc/toc.c:480
 #, c-format
 msgid "Unable to write file %s."
 msgstr "Kan niet naar bestand %s schrijven."
 
-#: src/protocols/toc/toc.c:513
+#: src/protocols/toc/toc.c:483
 #, c-format
 msgid "Unable to read file %s."
 msgstr "Kan het bestand %s niet lezen."
 
-#: src/protocols/toc/toc.c:516
+#: src/protocols/toc/toc.c:486
 #, c-format
 msgid "Message too long, last %s bytes truncated."
 msgstr "Bericht te lang, laatste %s Bytes afgekort."
 
-#: src/protocols/toc/toc.c:519
+#: src/protocols/toc/toc.c:489
 #, c-format
 msgid "%s not currently logged in."
 msgstr "%s is niet aangemeld."
 
-#: src/protocols/toc/toc.c:522
+#: src/protocols/toc/toc.c:492
 #, c-format
 msgid "Warning of %s not allowed."
 msgstr "Waarschuwing van %s is niet toegestaan."
 
-#: src/protocols/toc/toc.c:525
+#: src/protocols/toc/toc.c:495
 msgid "A message has been dropped, you are exceeding the server speed limit."
-msgstr ""
-"Een bericht is verloren gegaan. U overschreidt de snelheid van de server."
-
-#: src/protocols/toc/toc.c:528
+msgstr "Een bericht is verloren gegaan. U overschreidt de snelheid van de server."
+
+#: src/protocols/toc/toc.c:498
 #, c-format
 msgid "Chat in %s is not available."
 msgstr "Chatruimte in %s is niet beschikbaar."
 
-#: src/protocols/toc/toc.c:531
+#: src/protocols/toc/toc.c:501
 #, c-format
 msgid "You are sending messages too fast to %s."
 msgstr "U verzend te snel berichten naar %s."
 
-#: src/protocols/toc/toc.c:534
+#: src/protocols/toc/toc.c:504
 #, c-format
 msgid "You missed an IM from %s because it was too big."
 msgstr "Een Bericht van %s is niet overgekomen omdat het te groot was."
 
-#: src/protocols/toc/toc.c:537
+#: src/protocols/toc/toc.c:507
 #, c-format
 msgid "You missed an IM from %s because it was sent too fast."
-msgstr ""
-"Een Bericht van %s is niet overgekomen omdat het te snel verzonden werd."
-
-#: src/protocols/toc/toc.c:540
+msgstr "Een Bericht van %s is niet overgekomen omdat het te snel verzonden werd."
+
+#: src/protocols/toc/toc.c:510
 msgid "Failure."
 msgstr "Fout."
 
-#: src/protocols/toc/toc.c:543
+#: src/protocols/toc/toc.c:513
 msgid "Too many matches."
 msgstr "Te veel matches."
 
-#: src/protocols/toc/toc.c:546
+#: src/protocols/toc/toc.c:516
 msgid "Need more qualifiers."
 msgstr "Meer gegevens nodig."
 
-#: src/protocols/toc/toc.c:549
+#: src/protocols/toc/toc.c:519
 msgid "Dir service temporarily unavailable."
 msgstr "Profielen service is momenteel niet toegankelijk."
 
-#: src/protocols/toc/toc.c:552
+#: src/protocols/toc/toc.c:522
 msgid "Email lookup restricted."
 msgstr "Email zoekfunctie beperkt."
 
-#: src/protocols/toc/toc.c:555
+#: src/protocols/toc/toc.c:525
 msgid "Keyword ignored."
 msgstr "Sleutelwoord genegeerd."
 
-#: src/protocols/toc/toc.c:558
+#: src/protocols/toc/toc.c:528
 msgid "No keywords."
 msgstr "Geen sleutelwoorden."
 
-#: src/protocols/toc/toc.c:561
+#: src/protocols/toc/toc.c:531
 msgid "User has no directory information."
 msgstr "Deze gebruiker heeft geen profiel."
 
-#: src/protocols/toc/toc.c:565
+#: src/protocols/toc/toc.c:535
 msgid "Country not supported."
 msgstr "Land wordt niet ondersteund."
 
-#: src/protocols/toc/toc.c:568
+#: src/protocols/toc/toc.c:538
 #, c-format
 msgid "Failure unknown: %s."
 msgstr "Onbekende Fout: %s."
 
-#: src/protocols/toc/toc.c:574
+#: src/protocols/toc/toc.c:544
 msgid "The service is temporarily unavailable."
 msgstr "De service is momenteel niet bereikbaar."
 
-#: src/protocols/toc/toc.c:577
+#: src/protocols/toc/toc.c:547
 msgid "Your warning level is currently too high to log in."
 msgstr "Uw waarschuwingsniveau is momenteel te hoog om in te loggen."
 
-#: src/protocols/toc/toc.c:580
+#: src/protocols/toc/toc.c:550
 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."
@@ -8088,37 +9927,37 @@
 "U hebt zich te snel aan en afgemeld. Wacht 10 Minuten en probeer het nog een "
 "keer."
 
-#: src/protocols/toc/toc.c:582
+#: src/protocols/toc/toc.c:552
 #, c-format
 msgid "An unknown signon error has occurred: %s."
 msgstr "Onbekende Aanmeldingsfout: %s."
 
-#: src/protocols/toc/toc.c:585
+#: src/protocols/toc/toc.c:555
 #, c-format
 msgid "An unknown error, %d, has occurred.  Info: %s"
 msgstr "Onbekende fout %d opgetreden. Info: %s"
 
-#: src/protocols/toc/toc.c:605
+#: src/protocols/toc/toc.c:576
 msgid "Connection Closed"
 msgstr "Verbinding verbroken"
 
-#: src/protocols/toc/toc.c:645
+#: src/protocols/toc/toc.c:616
 msgid "Waiting for reply..."
 msgstr "Wacht op antwoord..."
 
-#: src/protocols/toc/toc.c:715
+#: src/protocols/toc/toc.c:695
 msgid "TOC has come back from its pause. You may now send messages again."
 msgstr "TOC werkt weer. U kunt nu weer berichten versturen."
 
-#: src/protocols/toc/toc.c:903
+#: src/protocols/toc/toc.c:890
 msgid "Password Change Successful"
 msgstr "Wachtwoord succesvol veranderd"
 
-#: src/protocols/toc/toc.c:907
+#: src/protocols/toc/toc.c:894
 msgid "TOC has sent a PAUSE command."
 msgstr "TOC heeft een PAUSE-opdracht verstuurd."
 
-#: src/protocols/toc/toc.c:908
+#: src/protocols/toc/toc.c:895
 msgid ""
 "When this happens, TOC ignores any messages sent to it, and may kick you off "
 "if you send a message. Gaim will prevent anything from going through. This "
@@ -8129,47 +9968,46 @@
 "berichten door te geven. Dit is slechts een tijdelijke oplossing, wees "
 "geduldig."
 
-#: src/protocols/toc/toc.c:1402
+#: src/protocols/toc/toc.c:1409
 msgid "Get Dir Info"
 msgstr "Directory info ophalen"
 
-#: src/protocols/toc/toc.c:1539
+#: src/protocols/toc/toc.c:1545
 msgid "Set Dir Info"
 msgstr "Directory info instellen"
 
-#: src/protocols/toc/toc.c:1664
+#: src/protocols/toc/toc.c:1667
 #, c-format
 msgid "Could not open %s for writing!"
 msgstr "Kon %s niet openen om naar te schrijven!"
 
-#: src/protocols/toc/toc.c:1700
+#: src/protocols/toc/toc.c:1703
 msgid "File transfer failed; other side probably canceled."
-msgstr ""
-"Bestandsoverdracht mislukt; de andere kant heeft waarschijnl;ijk afgebroken."
-
-#: src/protocols/toc/toc.c:1745 src/protocols/toc/toc.c:1785
-#: src/protocols/toc/toc.c:1909 src/protocols/toc/toc.c:1997
+msgstr "Bestandsoverdracht mislukt; de andere kant heeft waarschijnl;ijk afgebroken."
+
+#: src/protocols/toc/toc.c:1748 src/protocols/toc/toc.c:1788
+#: src/protocols/toc/toc.c:1912 src/protocols/toc/toc.c:2000
 msgid "Could not connect for transfer."
 msgstr "Kan niet verbinden voor overdracht."
 
-#: src/protocols/toc/toc.c:1942
+#: src/protocols/toc/toc.c:1945
 msgid "Could not write file header.  The file will not be transferred."
 msgstr ""
 "Kon koptekst van bestand niet instellen. Het bestand zal niet verzonden "
 "worden."
 
-#: src/protocols/toc/toc.c:2042
+#: src/protocols/toc/toc.c:2045
 msgid "Gaim - Save As..."
 msgstr "Gaim - Opslaan als..."
 
-#: src/protocols/toc/toc.c:2076
+#: src/protocols/toc/toc.c:2079
 #, c-format
 msgid "%s requests %s to accept %d file: %s (%.2f %s)%s%s"
 msgid_plural "%s requests %s to accept %d files: %s (%.2f %s)%s%s"
 msgstr[0] "%s vraagt aan %s om %d bestand te accepteren: %s (%.2f %s)%s%s"
 msgstr[1] "%s vraagt aan %s om %d bestanden te accepteren: %s (%.2f %s)%s%s"
 
-#: src/protocols/toc/toc.c:2083
+#: src/protocols/toc/toc.c:2086
 #, c-format
 msgid "%s requests you to send them a file"
 msgstr "%s vraagt u om een bestand te verzenden"
@@ -8185,15 +10023,15 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/toc/toc.c:2168 src/protocols/toc/toc.c:2170
+#: src/protocols/toc/toc.c:2169 src/protocols/toc/toc.c:2171
 msgid "TOC Protocol Plugin"
 msgstr "TOC-protocol plugin"
 
-#: src/protocols/toc/toc.c:2187
+#: src/protocols/toc/toc.c:2190
 msgid "TOC host"
 msgstr "TOC host"
 
-#: src/protocols/toc/toc.c:2191
+#: src/protocols/toc/toc.c:2194
 msgid "TOC port"
 msgstr "TOC poort"
 
@@ -8250,7 +10088,7 @@
 msgid "Profile"
 msgstr "Profiel"
 
-#: src/protocols/trepia/trepia.c:439
+#: src/protocols/trepia/trepia.c:438
 msgid "Set Profile"
 msgstr "Profiel instellen"
 
@@ -8277,11 +10115,11 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/trepia/trepia.c:1283 src/protocols/trepia/trepia.c:1285
+#: src/protocols/trepia/trepia.c:1271 src/protocols/trepia/trepia.c:1273
 msgid "Trepia Protocol Plugin"
 msgstr "Trepia protocolplugin"
 
-#: src/protocols/yahoo/yahoo.c:308
+#: src/protocols/yahoo/yahoo.c:338
 msgid ""
 "You have been logged off as you have logged in on a different machine or "
 "device."
@@ -8289,27 +10127,27 @@
 "De verbinding is verbroken omdat u zich heeft aangemeld op een andere "
 "computer."
 
-#: src/protocols/yahoo/yahoo.c:747
+#: src/protocols/yahoo/yahoo.c:808
 msgid "Your Yahoo! message did not get sent."
 msgstr "Uw Yahoo! bericht is niet verzonden."
 
-#: src/protocols/yahoo/yahoo.c:765
+#: src/protocols/yahoo/yahoo.c:827
 msgid "Buzz!!"
 msgstr "Trilllll!!"
 
-#: src/protocols/yahoo/yahoo.c:800
+#: src/protocols/yahoo/yahoo.c:870
 #, c-format
 msgid "Yahoo! system message for %s:"
 msgstr "Yahoo! systeembericht voor %s:"
 
-#: src/protocols/yahoo/yahoo.c:866
+#: src/protocols/yahoo/yahoo.c:936
 #, c-format
 msgid "%s has (retroactively) denied your request to add them to your list."
 msgstr ""
 "De gebruiker %s heeft geen toestemming gegeven. Hij/zij wordt NIET "
 "toegevoegd aan uw contactenlijst."
 
-#: src/protocols/yahoo/yahoo.c:869
+#: src/protocols/yahoo/yahoo.c:939
 #, c-format
 msgid ""
 "%s has (retroactively) denied your request to add them to your list for the "
@@ -8318,11 +10156,11 @@
 "De gebruiker %s heeft uw aanvraag om hem/haar toe te voegen aan uw "
 "contactenlijst met terugwerkende kracht geweigerd met de volgende reden: %s"
 
-#: src/protocols/yahoo/yahoo.c:872
+#: src/protocols/yahoo/yahoo.c:942
 msgid "Add buddy rejected"
 msgstr "Contact toevoegen geweigerd"
 
-#: src/protocols/yahoo/yahoo.c:1599
+#: src/protocols/yahoo/yahoo.c:1702
 #, c-format
 msgid ""
 "The Yahoo server has requested the use of an unrecognized authentication "
@@ -8333,11 +10171,11 @@
 "Deze versie van Gaim kan waarschijnlijk geen gebruik maken van Yahoo.  Kijk "
 "op %s voor een nieuwe versie."
 
-#: src/protocols/yahoo/yahoo.c:1602
+#: src/protocols/yahoo/yahoo.c:1705
 msgid "Failed Yahoo! Authentication"
 msgstr "Yahoo! identificatie mislukt"
 
-#: src/protocols/yahoo/yahoo.c:1675
+#: src/protocols/yahoo/yahoo.c:1777
 #, c-format
 msgid ""
 "You have tried to ignore %s, but the user is on your buddy list.  Clicking "
@@ -8347,78 +10185,92 @@
 "Klik op \"Ja\" om de gebruiker uit uw lijst te verwijderen en deze te "
 "negeren."
 
-#: src/protocols/yahoo/yahoo.c:1678
+#: src/protocols/yahoo/yahoo.c:1780
 msgid "Ignore buddy?"
 msgstr "Contact negeren?"
 
-#: src/protocols/yahoo/yahoo.c:1711
+#: src/protocols/yahoo/yahoo.c:1814
 msgid "Invalid username."
 msgstr "Ongeldige gebruikersnaam."
 
-#: src/protocols/yahoo/yahoo.c:1714
+#: src/protocols/yahoo/yahoo.c:1825
+#, fuzzy
+msgid "Normal authencation failed!"
+msgstr "Identificatie mislukt"
+
+#: src/protocols/yahoo/yahoo.c:1826
+msgid ""
+"The normal authencation method has failed. This means either your password "
+"is incorrect, or Yahoo!'s authencation scheme has changed. Gaim will now "
+"attempt to log in using Web Messenger authencation, will which result in "
+"reduced functionality and features."
+msgstr ""
+
+#: src/protocols/yahoo/yahoo.c:1834
 msgid "Incorrect password."
 msgstr "Ongeldig wachtwoord."
 
-#: src/protocols/yahoo/yahoo.c:1717
-msgid "Your account is locked, please log in to the yahoo website."
+#: src/protocols/yahoo/yahoo.c:1837
+#, fuzzy
+msgid "Your account is locked, please log in to the Yahoo! website."
 msgstr "Uw account is afgesloten. Meld u aan via de Yahoo website."
 
-#: src/protocols/yahoo/yahoo.c:1720
-#, c-format
-msgid "Unknown error number %d."
-msgstr "Onbekende foutcode %d,"
-
-#: src/protocols/yahoo/yahoo.c:1777
+#: src/protocols/yahoo/yahoo.c:1840
+#, c-format
+msgid "Unknown error number %d. Logging into the Yahoo! website may fix this."
+msgstr ""
+
+#: src/protocols/yahoo/yahoo.c:1894
 #, c-format
 msgid "Could not add buddy %s to group %s to the server list on account %s."
 msgstr ""
 "Kan contact %s niet toevoegen aan de groep %s in de server-lijst van account "
 "%s."
 
-#: src/protocols/yahoo/yahoo.c:1779
+#: src/protocols/yahoo/yahoo.c:1896
 msgid "Could not add buddy to server list"
 msgstr "Kan contact niet toevoegen aan serverlijst"
 
-#: src/protocols/yahoo/yahoo.c:1889 src/protocols/yahoo/yahoo.c:2020
+#: src/protocols/yahoo/yahoo.c:2088 src/protocols/yahoo/yahoo.c:2216
 msgid "Unable to read"
 msgstr "Kan niet lezen"
 
-#: src/protocols/yahoo/yahoo.c:2042 src/protocols/yahoo/yahoo.c:2152
-#: src/protocols/yahoo/yahoo.c:2195 src/protocols/yahoo/yahoochat.c:1360
-#: src/protocols/yahoo/yahoochat.c:1421
+#: src/protocols/yahoo/yahoo.c:2238 src/protocols/yahoo/yahoo.c:2348
+#: src/protocols/yahoo/yahoo.c:2398 src/protocols/yahoo/yahoo.c:2408
+#: src/protocols/yahoo/yahoochat.c:1397 src/protocols/yahoo/yahoochat.c:1458
 msgid "Connection problem"
 msgstr "Verbindingprobleem"
 
-#: src/protocols/yahoo/yahoo.c:2279 src/protocols/yahoo/yahoo.c:2605
-#: src/protocols/yahoo/yahoo.c:2717
+#: src/protocols/yahoo/yahoo.c:2495 src/protocols/yahoo/yahoo.c:2857
+#: src/protocols/yahoo/yahoo.c:2971
 msgid "Not At Home"
 msgstr "Niet thuis"
 
-#: src/protocols/yahoo/yahoo.c:2281 src/protocols/yahoo/yahoo.c:2607
-#: src/protocols/yahoo/yahoo.c:2718
+#: src/protocols/yahoo/yahoo.c:2497 src/protocols/yahoo/yahoo.c:2859
+#: src/protocols/yahoo/yahoo.c:2972
 msgid "Not At Desk"
 msgstr "Niet op m'n plek"
 
-#: src/protocols/yahoo/yahoo.c:2283 src/protocols/yahoo/yahoo.c:2609
-#: src/protocols/yahoo/yahoo.c:2719
+#: src/protocols/yahoo/yahoo.c:2499 src/protocols/yahoo/yahoo.c:2861
+#: src/protocols/yahoo/yahoo.c:2973
 msgid "Not In Office"
 msgstr "Niet op kantoor"
 
-#: src/protocols/yahoo/yahoo.c:2287 src/protocols/yahoo/yahoo.c:2613
-#: src/protocols/yahoo/yahoo.c:2721
+#: src/protocols/yahoo/yahoo.c:2503 src/protocols/yahoo/yahoo.c:2865
+#: src/protocols/yahoo/yahoo.c:2975
 msgid "On Vacation"
 msgstr "Op vakantie"
 
-#: src/protocols/yahoo/yahoo.c:2291 src/protocols/yahoo/yahoo.c:2617
-#: src/protocols/yahoo/yahoo.c:2723
+#: src/protocols/yahoo/yahoo.c:2507 src/protocols/yahoo/yahoo.c:2869
+#: src/protocols/yahoo/yahoo.c:2977
 msgid "Stepped Out"
 msgstr "Even weg"
 
-#: src/protocols/yahoo/yahoo.c:2355 src/protocols/yahoo/yahoo.c:2387
+#: src/protocols/yahoo/yahoo.c:2588 src/protocols/yahoo/yahoo.c:2614
 msgid "Not on server list"
 msgstr "Niet in de serverlijst"
 
-#: src/protocols/yahoo/yahoo.c:2407
+#: src/protocols/yahoo/yahoo.c:2634
 #, c-format
 msgid ""
 "\n"
@@ -8427,82 +10279,30 @@
 "\n"
 "<b>%s:</b> %s"
 
-#: src/protocols/yahoo/yahoo.c:2443
+#: src/protocols/yahoo/yahoo.c:2693
 msgid "Join in Chat"
 msgstr "Deelnemen aan Chat"
 
-#: src/protocols/yahoo/yahoo.c:2449
+#: src/protocols/yahoo/yahoo.c:2698
 msgid "Initiate Conference"
 msgstr "Groepsgesprek openen"
 
-#: src/protocols/yahoo/yahoo.c:2502
+#: src/protocols/yahoo/yahoo.c:2750
 msgid "Active which ID?"
 msgstr "Welk ID activeren?"
 
-#: src/protocols/yahoo/yahoo.c:2510
+#: src/protocols/yahoo/yahoo.c:2759
 msgid "Join who in chat?"
 msgstr "Deelnemen aan wiens chat?"
 
-#: src/protocols/yahoo/yahoo.c:2521
+#: src/protocols/yahoo/yahoo.c:2769
 msgid "Activate ID..."
 msgstr "ID activeren..."
 
-#: src/protocols/yahoo/yahoo.c:2527
+#: src/protocols/yahoo/yahoo.c:2773
 msgid "Join user in chat..."
 msgstr "Deelnemen aan chat van gebruiker..."
 
-#: src/protocols/yahoo/yahoo.c:2916
-msgid ""
-"<b>Sorry, profiles marked as containing adult content are not supported at "
-"this time.</b><br><br>\n"
-msgstr ""
-"<b>Helaas worden profielen met voor volwassenen bedoelde inhoud op dit "
-"moment nog niet ondersteund.</b><br><br>\n"
-
-#: src/protocols/yahoo/yahoo.c:2917 src/protocols/yahoo/yahoo.c:2940
-msgid ""
-"If you wish to view this profile, you will need to visit this link in your "
-"web browser<br>"
-msgstr ""
-"Als u dit profiel wilt zien, zult u deze verwijzing moeten openen in uw web-"
-"browser<br>"
-
-#: src/protocols/yahoo/yahoo.c:2939
-msgid ""
-"<b>Sorry, non-English profiles are not supported at this time.</b><br><br>\n"
-msgstr ""
-"<b>Helaas worden niet-Engelse profielen op dit moment nog niet ondersteund.</"
-"b><br><br>\n"
-
-#: src/protocols/yahoo/yahoo.c:2987 src/protocols/yahoo/yahoo.c:2988
-msgid "Yahoo! ID"
-msgstr "Yahoo! ID"
-
-#: src/protocols/yahoo/yahoo.c:3032 src/protocols/yahoo/yahoo.c:3035
-#: src/protocols/yahoo/yahoo.c:3038
-msgid "Hobbies"
-msgstr "Hobbies"
-
-#: src/protocols/yahoo/yahoo.c:3047 src/protocols/yahoo/yahoo.c:3050
-msgid "Latest News"
-msgstr "Laatste nieuws"
-
-#: src/protocols/yahoo/yahoo.c:3064
-msgid "Home Page"
-msgstr "Homepage"
-
-#: src/protocols/yahoo/yahoo.c:3076
-msgid "Cool Link 1"
-msgstr "Toffe verwijding 1"
-
-#: src/protocols/yahoo/yahoo.c:3080
-msgid "Cool Link 2"
-msgstr "Toffe verwijzing 2"
-
-#: src/protocols/yahoo/yahoo.c:3082
-msgid "Cool Link 3"
-msgstr "Toffe verwijzing 3"
-
 #. *< api_version
 #. *< type
 #. *< ui_requirement
@@ -8514,31 +10314,55 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/yahoo/yahoo.c:3295 src/protocols/yahoo/yahoo.c:3297
+#: src/protocols/yahoo/yahoo.c:3292 src/protocols/yahoo/yahoo.c:3294
 msgid "Yahoo Protocol Plugin"
 msgstr "Yahoo-protocol plugin"
 
-#: src/protocols/yahoo/yahoo.c:3314
+#: src/protocols/yahoo/yahoo.c:3313
+#, fuzzy
+msgid "Yahoo Japan"
+msgstr "Yahoo"
+
+#: src/protocols/yahoo/yahoo.c:3316
 msgid "Pager host"
 msgstr "semafoon host"
 
-#: src/protocols/yahoo/yahoo.c:3317
+#: src/protocols/yahoo/yahoo.c:3319
+#, fuzzy
+msgid "Japan Pager host"
+msgstr "semafoon host"
+
+#: src/protocols/yahoo/yahoo.c:3322
 msgid "Pager port"
 msgstr "semafoon poort"
 
-#: src/protocols/yahoo/yahoo.c:3320
+#: src/protocols/yahoo/yahoo.c:3325
 msgid "File transfer host"
 msgstr "Bestandsoverdracht computer"
 
-#: src/protocols/yahoo/yahoo.c:3323
+#: src/protocols/yahoo/yahoo.c:3328
+#, fuzzy
+msgid "Japan File transfer host"
+msgstr "Bestandsoverdracht computer"
+
+#: src/protocols/yahoo/yahoo.c:3331
 msgid "File transfer port"
 msgstr "Bestandsoverdracht poortnummer"
 
-#: src/protocols/yahoo/yahoo.c:3326
+#: src/protocols/yahoo/yahoo.c:3334
 msgid "Chat Room List Url"
 msgstr "URL voor lijst van ruimtes"
 
-#: src/protocols/yahoo/yahoo_filexfer.c:200
+#: src/protocols/yahoo/yahoo.c:3337
+msgid "YCHT Host"
+msgstr ""
+
+#: src/protocols/yahoo/yahoo.c:3340
+#, fuzzy
+msgid "YCHT Port"
+msgstr "Poort"
+
+#: src/protocols/yahoo/yahoo_filexfer.c:170
 msgid ""
 "Gaim cannot send files over Yahoo! that are bigger than One Megabyte "
 "(1,048,576 bytes)."
@@ -8546,88 +10370,183 @@
 "Gaim kan geen bestanden overbrengen via Yahoo! die goter zijn dan één "
 "megabyte (1.048.576 bytes)."
 
-#: src/protocols/yahoo/yahoochat.c:198
+#: src/protocols/yahoo/yahoo_profile.c:675
+#, fuzzy, c-format
+msgid "<b>IP Address:</b> %s<br>"
+msgstr "<b>Alias:</b> %s<br>"
+
+#: src/protocols/yahoo/yahoo_profile.c:749
+#, fuzzy
+msgid "Yahoo! Japan Profile"
+msgstr "Yahoo"
+
+#: src/protocols/yahoo/yahoo_profile.c:750
+#, fuzzy
+msgid "Yahoo! Profile"
+msgstr "Profiel"
+
+#: src/protocols/yahoo/yahoo_profile.c:794
+#, fuzzy
+msgid ""
+"Sorry, profiles marked as containing adult content are not supported at this "
+"time."
+msgstr ""
+"<b>Helaas worden profielen met voor volwassenen bedoelde inhoud op dit "
+"moment nog niet ondersteund.</b><br><br>\n"
+
+#: src/protocols/yahoo/yahoo_profile.c:796
+#, fuzzy
+msgid ""
+"If you wish to view this profile, you will need to visit this link in your "
+"web browser"
+msgstr ""
+"Als u dit profiel wilt zien, zult u deze verwijzing moeten openen in uw web-"
+"browser<br>"
+
+#: src/protocols/yahoo/yahoo_profile.c:969
+msgid "Yahoo! ID"
+msgstr "Yahoo! ID"
+
+#: src/protocols/yahoo/yahoo_profile.c:1043
+#: src/protocols/yahoo/yahoo_profile.c:1047
+#: src/protocols/yahoo/yahoo_profile.c:1051
+msgid "Hobbies"
+msgstr "Hobbies"
+
+#: src/protocols/yahoo/yahoo_profile.c:1061
+#: src/protocols/yahoo/yahoo_profile.c:1065
+msgid "Latest News"
+msgstr "Laatste nieuws"
+
+#: src/protocols/yahoo/yahoo_profile.c:1086
+msgid "Home Page"
+msgstr "Homepage"
+
+#: src/protocols/yahoo/yahoo_profile.c:1101
+msgid "Cool Link 1"
+msgstr "Toffe verwijding 1"
+
+#: src/protocols/yahoo/yahoo_profile.c:1106
+msgid "Cool Link 2"
+msgstr "Toffe verwijzing 2"
+
+#: src/protocols/yahoo/yahoo_profile.c:1110
+msgid "Cool Link 3"
+msgstr "Toffe verwijzing 3"
+
+#: src/protocols/yahoo/yahoo_profile.c:1130
+#, c-format
+msgid "User information for %s unavailable"
+msgstr "Gebruikersinformatie voor %s niet beschikbaar"
+
+#: src/protocols/yahoo/yahoo_profile.c:1136
+#, fuzzy
+msgid ""
+"Sorry, this profile seems to be in a language that is not supported at this "
+"time."
+msgstr ""
+"<b>Helaas worden niet-Engelse profielen op dit moment nog niet ondersteund.</"
+"b><br><br>\n"
+
+#: src/protocols/yahoo/yahoo_profile.c:1152
+msgid ""
+"Could not retrieve the user's profile. This most likely is a temporary "
+"server-side problem. Please try again later."
+msgstr ""
+
+#: src/protocols/yahoo/yahoo_profile.c:1155
+msgid ""
+"Could not retrieve the user's profile. This most likely means that the user "
+"does not exist; however, Yahoo! sometimes does fail to find a user's "
+"profile. If you know that the user exists, please try again later."
+msgstr ""
+
+#: src/protocols/yahoo/yahoo_profile.c:1163
+msgid "The user's profile is empty."
+msgstr "Gebruikersprofiel is leeg."
+
+#: src/protocols/yahoo/yahoochat.c:203
 #, c-format
 msgid "%s declined your conference invitation to room \"%s\" because \"%s\"."
 msgstr "%s heeft uw uitnodiging voor ruimte \"%s\" afgeslagen omdat \"%s\"."
 
-#: src/protocols/yahoo/yahoochat.c:200
+#: src/protocols/yahoo/yahoochat.c:205
 msgid "Invitation Rejected"
 msgstr "Uitnodiging geweigerd"
 
-#: src/protocols/yahoo/yahoochat.c:350
+#: src/protocols/yahoo/yahoochat.c:355
 msgid "Failed to join chat"
 msgstr "Kan niet deelnemen aan chat"
 
-#: src/protocols/yahoo/yahoochat.c:350
+#: src/protocols/yahoo/yahoochat.c:355
 msgid "Maybe the room is full?"
 msgstr "Misschien is de ruimte vol?"
 
-#: src/protocols/yahoo/yahoochat.c:426
+#: src/protocols/yahoo/yahoochat.c:429
 #, c-format
 msgid "You are now chatting in %s."
 msgstr "U bent nu aan het chatten in  %s."
 
-#: src/protocols/yahoo/yahoochat.c:580
+#: src/protocols/yahoo/yahoochat.c:583
 msgid "Failed to join buddy in chat"
 msgstr "Kan niet deelnemen aan chat"
 
-#: src/protocols/yahoo/yahoochat.c:581
+#: src/protocols/yahoo/yahoochat.c:584
 msgid "Maybe they're not in a chat?"
 msgstr "Misschien zitten ze niet in een chat?"
 
-#: src/protocols/yahoo/yahoochat.c:1301
+#: src/protocols/yahoo/yahoochat.c:1338
 msgid "Unable to connect"
 msgstr "Kan geen verbinding maken"
 
-#: src/protocols/yahoo/yahoochat.c:1301
+#: src/protocols/yahoo/yahoochat.c:1338
 msgid "Fetching the room list failed."
 msgstr "Opvragen lijst van ruimtes mislukt."
 
-#: src/protocols/yahoo/yahoochat.c:1346
+#: src/protocols/yahoo/yahoochat.c:1383
 msgid "Voices"
 msgstr "Stemmen"
 
-#: src/protocols/yahoo/yahoochat.c:1349
+#: src/protocols/yahoo/yahoochat.c:1386
 msgid "Webcams"
 msgstr "Webcams"
 
-#: src/protocols/yahoo/yahoochat.c:1360 src/protocols/yahoo/yahoochat.c:1421
+#: src/protocols/yahoo/yahoochat.c:1397 src/protocols/yahoo/yahoochat.c:1458
 msgid "Unable to fetch room list."
 msgstr "Kan lijst van ruimtes niet opvragen."
 
-#: src/protocols/yahoo/yahoochat.c:1414
+#: src/protocols/yahoo/yahoochat.c:1451
 msgid "User Rooms"
 msgstr "Ruimtes van gebruiker"
 
-#: src/protocols/zephyr/zephyr.c:557
+#: src/protocols/zephyr/zephyr.c:589
+#, fuzzy, c-format
+msgid "Unable send to chat %s,%s,%s"
+msgstr "Kan gebruiker niet uitnodigen (%s)."
+
+#: src/protocols/zephyr/zephyr.c:624
 #, c-format
 msgid "<b>User:</b> %s<br>"
 msgstr "<b>Gebruiker:</b> %s<br>"
 
-#: src/protocols/zephyr/zephyr.c:559
-#, c-format
-msgid "<b>Alias:</b> %s<br>"
-msgstr "<b>Alias:</b> %s<br>"
-
-#: src/protocols/zephyr/zephyr.c:561
+#: src/protocols/zephyr/zephyr.c:628
 msgid "<br>Hidden or not logged-in"
 msgstr "<br>Verborgen of niet aagemeld"
 
-#: src/protocols/zephyr/zephyr.c:565
+#: src/protocols/zephyr/zephyr.c:633
 #, c-format
 msgid "<br>At %s since %s"
 msgstr "<br> Om %s sinds %s"
 
-#: src/protocols/zephyr/zephyr.c:831 src/protocols/zephyr/zephyr.c:832
+#: src/protocols/zephyr/zephyr.c:983 src/protocols/zephyr/zephyr.c:984
 msgid "Anyone"
 msgstr "Iemand"
 
-#: src/protocols/zephyr/zephyr.c:858
+#: src/protocols/zephyr/zephyr.c:1011
 msgid "Already logged in with Zephyr"
 msgstr "Reeds aangemeld met zephyr"
 
-#: src/protocols/zephyr/zephyr.c:858
+#: src/protocols/zephyr/zephyr.c:1011
 msgid ""
 "Because Zephyr uses your system username, you are unable to have multiple "
 "accounts on it when logged in as the same user."
@@ -8635,22 +10554,77 @@
 "Omdat zephyr uw gebruikersnaam van de computer gebruikt, kunt u zich hiermee "
 "met maximaal 1 account aanmelden."
 
-#: src/protocols/zephyr/zephyr.c:1164
-msgid "ZLocate"
-msgstr "ZLocate"
-
-#: src/protocols/zephyr/zephyr.c:1206
+#: src/protocols/zephyr/zephyr.c:1386
 msgid "_Class:"
 msgstr "_Klasse:"
 
-#: src/protocols/zephyr/zephyr.c:1212
+#: src/protocols/zephyr/zephyr.c:1392
 msgid "_Instance:"
 msgstr "_Instantie:"
 
-#: src/protocols/zephyr/zephyr.c:1218
+#: src/protocols/zephyr/zephyr.c:1398
 msgid "_Recipient:"
 msgstr "_Ontvanger:"
 
+#: src/protocols/zephyr/zephyr.c:1409
+#, c-format
+msgid "Attempt to subscribe to %s,%s,%s failed"
+msgstr ""
+
+#: src/protocols/zephyr/zephyr.c:1678
+msgid "zlocate &lt;nick&gt;: Locate user"
+msgstr ""
+
+#: src/protocols/zephyr/zephyr.c:1683
+msgid "zl &lt;nick&gt;: Locate user"
+msgstr ""
+
+#: src/protocols/zephyr/zephyr.c:1688
+msgid "instance &lt;instance&gt;: Set the instance to be used on this class"
+msgstr ""
+
+#: src/protocols/zephyr/zephyr.c:1693
+msgid "inst &lt;instance&gt;: Set the instance to be used on this class"
+msgstr ""
+
+#: src/protocols/zephyr/zephyr.c:1699
+msgid "sub &lt;class&gt; &lt;instance&gt; &lt;recipient&gt;: Join a new chat"
+msgstr ""
+
+#: src/protocols/zephyr/zephyr.c:1704
+msgid "zi &lt;instance&gt;: Send a message to &lt;message,<i>instance</i>,*&gt;"
+msgstr ""
+
+#: src/protocols/zephyr/zephyr.c:1710
+msgid ""
+"zci &lt;class&gt; &lt;instance&gt;: Send a message to &lt;<i>class</i>,"
+"<i>instance</i>,*&gt;"
+msgstr ""
+
+#: src/protocols/zephyr/zephyr.c:1716
+msgid ""
+"zcir &lt;class&gt; &lt;instance&gt; &lt;recipient&gt;: Send a message to &lt;"
+"<i>class</i>,<i>instance</i>,<i>recipient</i>&gt;"
+msgstr ""
+
+#: src/protocols/zephyr/zephyr.c:1722
+msgid ""
+"zir &lt;instance&gt; &lt;recipient&gt;: Send a message to &lt;MESSAGE,"
+"<i>instance</i>,<i>recipient</i>&gt;"
+msgstr ""
+
+#: src/protocols/zephyr/zephyr.c:1727
+msgid "zc &lt;class&gt;: Send a message to &lt;<i>class</i>,PERSONAL,*&gt;"
+msgstr "zc &lt;class&gt;: Een bericht sturen aan &lt;<i>class</i>,PERSOONLIJK,*&gt;"
+
+#: src/protocols/zephyr/zephyr.c:1802
+msgid "Resubscribe"
+msgstr "Opnieuw abonneren"
+
+#: src/protocols/zephyr/zephyr.c:1805
+msgid "Retrieve subscriptions from server"
+msgstr "Abonnementen ophalen van server"
+
 #. *< api_version
 #. *< type
 #. *< ui_requirement
@@ -8662,110 +10636,117 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/zephyr/zephyr.c:1373 src/protocols/zephyr/zephyr.c:1375
+#: src/protocols/zephyr/zephyr.c:1885 src/protocols/zephyr/zephyr.c:1887
 msgid "Zephyr Protocol Plugin"
 msgstr "Zephyr-protocol plugin"
 
-#: src/protocols/zephyr/zephyr.c:1392
+#: src/protocols/zephyr/zephyr.c:1906
 msgid "Export to .anyone"
 msgstr "Exporteren naar .iemand"
 
-#: src/protocols/zephyr/zephyr.c:1395
+#: src/protocols/zephyr/zephyr.c:1909
 msgid "Export to .zephyr.subs"
 msgstr "Exporteren naar .zephyr.subs"
 
-#: src/protocols/zephyr/zephyr.c:1398
+#: src/protocols/zephyr/zephyr.c:1912
 msgid "Exposure"
 msgstr "Ontmaskering"
 
+#. XXX: why in the hell are we calling gaim_connection_error() here?
 #. Forbidden
-#: src/proxy.c:955
-msgid "Access denied: proxy server forbids port 80 tunnelling."
-msgstr "Toegang geweigerd: proxy-server verbied tunnelen op poort 80."
-
-#: src/proxy.c:957
+#: src/proxy.c:845
+#, c-format
+msgid "Access denied: proxy server forbids port %d tunnelling."
+msgstr "Toegang geweigerd: proxy-server verbied tunnelen op poort %d."
+
+#: src/proxy.c:849
 #, c-format
 msgid "Proxy connection error %d"
 msgstr "Proxy verbindingsfout %d"
 
-#: src/proxy.c:1696
+#: src/proxy.c:1495
 msgid "Invalid proxy settings"
 msgstr "Ongeldige proxy-instellingen"
 
-#: src/proxy.c:1696
+#: src/proxy.c:1495
 msgid ""
 "Either the host name or port number specified for your given proxy type is "
 "invalid."
 msgstr "De computernaam of poort voor uw gegeven proxy-type is ongeldig."
 
 #. * Custom away message.
-#: src/prpl.h:195
+#: src/prpl.h:165
 msgid "Custom"
 msgstr "Aangepast"
 
 #. *
 #. * A wrapper for gaim_request_action() that uses Accept and Cancel buttons.
 #.
-#: src/request.h:1250
+#: src/request.h:1253
 msgid "Accept"
 msgstr "Accepteren"
 
-#: src/server.c:58
+#: src/server.c:63
 msgid "Please enter your password"
 msgstr "Vul uw wachtwoord in"
 
-#: src/server.c:962
+#: src/server.c:528
+#, c-format
+msgid "%s is now known as %s.\n"
+msgstr "%s heet nu %s.\n"
+
+#: src/server.c:938
 #, c-format
 msgid "(%d message)"
 msgid_plural "(%d messages)"
 msgstr[0] "(%d bericht)"
 msgstr[1] "(%d berichten)"
 
-#: src/server.c:976
+#: src/server.c:952
 msgid "(1 message)"
 msgstr "(1 bericht)"
 
-#: src/server.c:1160 src/server.c:1170
+#: src/server.c:1180 src/server.c:1189
 #, c-format
 msgid "%s logged in."
 msgstr "%s heeft zich aangemeld."
 
-#: src/server.c:1184
+#: src/server.c:1201
 #, c-format
 msgid "%s signed on"
 msgstr "%s heeft zich aangemeld"
 
-#: src/server.c:1200
+#: src/server.c:1216
 #, c-format
 msgid "%s came back"
 msgstr "%s is teruggekomen"
 
-#: src/server.c:1202
+#: src/server.c:1218
 #, c-format
 msgid "%s went away"
 msgstr "%s is afwezig"
 
-#: src/server.c:1217
+#: src/server.c:1232
 #, c-format
 msgid "%s became idle"
 msgstr "%s is inactief"
 
-#: src/server.c:1231
+#: src/server.c:1243
 #, c-format
 msgid "%s became unidle"
 msgstr "%s is actief"
 
-#: src/server.c:1244 src/server.c:1252
+#: src/server.c:1253 src/server.c:1260
 #, c-format
 msgid "%s logged out."
 msgstr "%s heeft zich afgemeld."
 
-#: src/server.c:1267
+#: src/server.c:1273
 #, c-format
 msgid "%s signed off"
 msgstr "%s heeft zich afgemeld"
 
-#: src/server.c:1317
+#: src/server.c:1335
 #, c-format
 msgid ""
 "%s has just been warned by %s.\n"
@@ -8774,11 +10755,11 @@
 "%s is zojuist gewaarschuwd door %s\n"
 "Uw nieuwe waarschuwingsniveau is %d%%"
 
-#: src/server.c:1320
+#: src/server.c:1338
 msgid "an anonymous person"
 msgstr "een anoniem persoon"
 
-#: src/server.c:1430
+#: src/server.c:1448
 #, c-format
 msgid ""
 "User '%s' invites %s to buddy chat room: '%s'\n"
@@ -8787,12 +10768,12 @@
 "De gebruiker '%s' nodigt %s uit in de chatruimte '%s'\n"
 "%s"
 
-#: src/server.c:1434
+#: src/server.c:1452
 #, c-format
 msgid "User '%s' invites %s to buddy chat room: '%s'\n"
 msgstr "De gebruiker '%s' nodigt %s uit in de chatruimte '%s'\n"
 
-#: src/server.c:1440
+#: src/server.c:1458
 msgid "Accept chat invitation?"
 msgstr "Uitnodiging voor chat accepteren?"
 
@@ -8819,62 +10800,51 @@
 msgid "_Warn"
 msgstr "_Waarschuwen"
 
-#: src/util.c:2040
+#: src/util.c:2363
 msgid "Calculating..."
 msgstr "Berekenen..."
 
-#: src/util.c:2043
+#: src/util.c:2366
 msgid "Unknown."
 msgstr "Onbekend."
 
-#: src/util.c:2074 src/util.c:2079 src/util.c:2084 src/util.c:2087
+#: src/util.c:2392
+msgid "second"
+msgid_plural "seconds"
+msgstr[0] "seconde"
+msgstr[1] "seconden"
+
+#: src/util.c:2406
 msgid "day"
 msgid_plural "days"
 msgstr[0] "dag"
 msgstr[1] "dagen"
 
-#: src/util.c:2075 src/util.c:2079 src/util.c:2093 src/util.c:2095
+#: src/util.c:2414
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "uur"
 msgstr[1] "uren"
 
-#: src/util.c:2075 src/util.c:2084 src/util.c:2093 src/util.c:2098
+#: src/util.c:2422
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "minuut"
 msgstr[1] "minuten"
 
-#: src/util.c:2430
+#: src/util.c:2832
 msgid "g003: Error opening connection.\n"
 msgstr "g003: Fout: Kan geen verbinding maken.\n"
 
-#: src/win32/win32dep.c:272
+#: src/win32/win32dep.c:273
 msgid "Moving Gaim Settings.."
 msgstr "Verplaatsen van gaim-instellingen..."
 
-#: src/win32/win32dep.c:275
+#: src/win32/win32dep.c:276
 msgid "Moving Gaim user settings to: "
 msgstr "Verplaatsen van gaim instellingenmap naar: "
 
-#: src/win32/win32dep.c:277
+#: src/win32/win32dep.c:278
 msgid "Notification"
 msgstr "Melding"
 
-#~ msgid "Username: <b>%s</b><br>\n"
-#~ msgstr "Gebruikersnaam : <b>%s</b><br>\n"
-
-#~ msgid "Warning Level: <b>%d%%</b><br>\n"
-#~ msgstr "Waarschuwingsniveau : <b>%d%%</b><br>\n"
-
-#~ msgid "Online Since: <b>%s</b><br>\n"
-#~ msgstr "Online sinds : <b>%s</b><br>\n"
-
-#~ msgid "Member Since: <b>%s</b><br>\n"
-#~ msgstr "Lid sinds : <b>%s</b><br>\n"
-
-#~ msgid "Idle: <b>%s</b>"
-#~ msgstr "Afwezig : <b>%s</b>"
-
-#~ msgid "Idle: <b>Active</b>"
-#~ msgstr "Afwezig : <b>Actief</b>"
--- a/po/pt.po	Tue Jul 13 23:05:59 2004 +0000
+++ b/po/pt.po	Wed Jul 14 19:05:16 2004 +0000
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: Gaim\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-06-21 00:02-0400\n"
+"POT-Creation-Date: 2004-07-14 00:00-0400\n"
 "PO-Revision-Date: 2004-02-03 19:35+0000\n"
 "Last-Translator: Duarte Henriques<duarte_henriques@myrealbox.com>\n"
 "Language-Team: \n"
@@ -146,13 +146,13 @@
 msgid "Gaim - Away"
 msgstr "Gaim - Ausente"
 
-#: plugins/docklet/docklet.c:114 src/gtkaccount.c:643 src/gtkaccount.c:2065
+#: plugins/docklet/docklet.c:114 src/gtkaccount.c:727 src/gtkaccount.c:2152
 msgid "Auto-login"
 msgstr "Ligação automática"
 
 #: plugins/docklet/docklet.c:117
 msgid "New Message..."
-msgstr "Nova Mensagem.."
+msgstr "Nova Mensagem..."
 
 #: plugins/docklet/docklet.c:118
 msgid "Join A Chat..."
@@ -162,13 +162,13 @@
 msgid "New..."
 msgstr "Novo..."
 
-#: plugins/docklet/docklet.c:153 src/gtkprefs.c:1796 src/protocols/gg/gg.c:51
-#: src/protocols/irc/msgs.c:187 src/protocols/jabber/jabber.c:959
+#: plugins/docklet/docklet.c:153 src/gtkprefs.c:1809 src/protocols/gg/gg.c:51
+#: src/protocols/irc/msgs.c:187 src/protocols/jabber/jabber.c:960
 #: src/protocols/jabber/jutil.c:32 src/protocols/jabber/presence.c:63
-#: src/protocols/jabber/presence.c:119 src/protocols/novell/novell.c:2718
-#: src/protocols/novell/novell.c:2835 src/protocols/novell/novell.c:2887
-#: src/protocols/oscar/oscar.c:528 src/protocols/oscar/oscar.c:5465
-#: src/protocols/oscar/oscar.c:6463 src/protocols/oscar/oscar.c:6662
+#: src/protocols/jabber/presence.c:119 src/protocols/novell/novell.c:2724
+#: src/protocols/novell/novell.c:2841 src/protocols/novell/novell.c:2893
+#: src/protocols/oscar/oscar.c:532 src/protocols/oscar/oscar.c:5481
+#: src/protocols/oscar/oscar.c:6480 src/protocols/oscar/oscar.c:6679
 #: src/protocols/silc/buddy.c:1379 src/protocols/silc/silc.c:46
 #: src/protocols/silc/silc.c:76
 msgid "Away"
@@ -176,7 +176,7 @@
 
 #. else...
 #: plugins/docklet/docklet.c:159 src/away.c:550
-#: src/protocols/oscar/oscar.c:5383 src/protocols/oscar/oscar.c:6670
+#: src/protocols/oscar/oscar.c:5399 src/protocols/oscar/oscar.c:6687
 msgid "Back"
 msgstr "De volta"
 
@@ -184,15 +184,15 @@
 msgid "Mute Sounds"
 msgstr "Não tocar sons"
 
-#: plugins/docklet/docklet.c:172 src/gtkft.c:619
+#: plugins/docklet/docklet.c:172 src/gtkft.c:612
 msgid "File Transfers"
 msgstr "Transferências de ficheiros"
 
-#: plugins/docklet/docklet.c:173 src/gtkaccount.c:2244
+#: plugins/docklet/docklet.c:173 src/gtkaccount.c:2333
 msgid "Accounts"
 msgstr "Contas"
 
-#: plugins/docklet/docklet.c:174 src/gtkprefs.c:2490
+#: plugins/docklet/docklet.c:174 src/gtkprefs.c:2503
 msgid "Preferences"
 msgstr "Preferências"
 
@@ -244,18 +244,22 @@
 "janela de login. Permite também que mensagens fiquem ocultas até que o ícone "
 "seja clicado, como no ICQ."
 
-#: plugins/extplacement.c:68
+#: plugins/extplacement.c:75
 msgid "By conversation count"
 msgstr "Por número de conversas"
 
-#: plugins/extplacement.c:89
+#: plugins/extplacement.c:96
 msgid "Conversation Placement"
 msgstr "Posicionamento das Conversações"
 
-#: plugins/extplacement.c:94
+#: plugins/extplacement.c:101
 msgid "Number of conversations per window"
 msgstr "Número de conversas por janela"
 
+#: plugins/extplacement.c:107
+msgid "Separate IM and Chat windows when placing by number"
+msgstr "Separar janelas de MI e Chat ao posicionar por número"
+
 #. *< api_version
 #. *< type
 #. *< ui_requirement
@@ -263,25 +267,25 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/extplacement.c:114
+#: plugins/extplacement.c:126
 msgid "ExtPlacement"
 msgstr "PosicionamentoExt"
 
 #. *< name
 #. *< version
-#: plugins/extplacement.c:116
+#: plugins/extplacement.c:128
 msgid "Extra conversation placement options."
 msgstr "Opções extra de posicionamento de conversas."
 
 #. *< summary
 #. *  description
-#: plugins/extplacement.c:118
-msgid ""
-"Either restrict the number of conversations per windows or use separate "
-"windows for IMs and Chats"
-msgstr ""
-"Ou restringe o número de conversações por janela ou usa janelas separadas "
-"para MIs e Chats"
+#: plugins/extplacement.c:130
+msgid ""
+"Restrict the number of conversations per windows, optionally separating IMs "
+"and Chats"
+msgstr ""
+"Restringe o número de conversações por janela opcionalmente separadando "
+"janelas de MIs e Chats"
 
 #. *< api_version
 #. *< type
@@ -445,62 +449,62 @@
 "Arraste para cima e depois para a direita para alternar para a próxima "
 "conversa."
 
-#: plugins/gevolution/add_buddy_dialog.c:136
-#: plugins/gevolution/assoc-buddy.c:74
+#: plugins/gevolution/add_buddy_dialog.c:133
+#: plugins/gevolution/assoc-buddy.c:71
 msgid "Local Addressbook"
 msgstr "Livro de Endereços Local"
 
-#: plugins/gevolution/add_buddy_dialog.c:146
-#: plugins/gevolution/add_buddy_dialog.c:157
-#: plugins/gevolution/assoc-buddy.c:84 plugins/gevolution/assoc-buddy.c:95
-#: src/gtkblist.c:2982 src/gtkprefs.c:913 src/gtkprefs.c:966
-#: src/gtkprefs.c:1809 src/protocols/jabber/jabber.c:923
+#: plugins/gevolution/add_buddy_dialog.c:143
+#: plugins/gevolution/add_buddy_dialog.c:154
+#: plugins/gevolution/assoc-buddy.c:81 plugins/gevolution/assoc-buddy.c:92
+#: src/gtkblist.c:3015 src/gtkprefs.c:961 src/gtkprefs.c:1014
+#: src/gtkprefs.c:1822 src/protocols/jabber/jabber.c:924
 msgid "None"
 msgstr "Nenhuma"
 
-#: plugins/gevolution/add_buddy_dialog.c:190
-#: plugins/gevolution/assoc-buddy.c:178 src/gtkprefs.c:2162
-#: src/gtkroomlist.c:553 src/protocols/jabber/jabber.c:597
-#: src/protocols/msn/msn.c:1286 src/protocols/trepia/trepia.c:398
+#: plugins/gevolution/add_buddy_dialog.c:187
+#: plugins/gevolution/assoc-buddy.c:175 src/gtkprefs.c:2175
+#: src/gtkroomlist.c:553 src/protocols/jabber/jabber.c:598
+#: src/protocols/msn/msn.c:1311 src/protocols/trepia/trepia.c:398
 msgid "Name"
 msgstr "Nome"
 
-#: plugins/gevolution/add_buddy_dialog.c:201
+#: plugins/gevolution/add_buddy_dialog.c:198
 msgid "Instant Messaging"
 msgstr "Mensagens Imediatas"
 
 #. Add the label.
-#: plugins/gevolution/add_buddy_dialog.c:482
+#: plugins/gevolution/add_buddy_dialog.c:479
 msgid "Select a person from your address book below, or add a new person."
 msgstr ""
 "Escolha uma pessoa da sua lista de endereços abaixo, ou adicione uma nova "
 "pessoa."
 
 #. "Search"
-#: plugins/gevolution/add_buddy_dialog.c:495
-#: plugins/gevolution/assoc-buddy.c:383 src/protocols/oscar/oscar.c:6949
+#: plugins/gevolution/add_buddy_dialog.c:492
+#: plugins/gevolution/assoc-buddy.c:380 src/protocols/oscar/oscar.c:6965
 msgid "Search"
 msgstr "Pesquisa"
 
-#: plugins/gevolution/add_buddy_dialog.c:566
-#: plugins/gevolution/new_person_dialog.c:310 src/gtkblist.c:4011
-#: src/gtkblist.c:4339
+#: plugins/gevolution/add_buddy_dialog.c:563
+#: plugins/gevolution/new_person_dialog.c:307 src/gtkblist.c:4046
+#: src/gtkblist.c:4374
 msgid "Group:"
 msgstr "Grupo:"
 
 #. "New Person" button
-#: plugins/gevolution/add_buddy_dialog.c:592
-#: plugins/gevolution/assoc-buddy.c:486
+#: plugins/gevolution/add_buddy_dialog.c:589
+#: plugins/gevolution/assoc-buddy.c:483
 msgid "New Person"
 msgstr "Nova Pessoa"
 
 #. "Select Buddy" button
-#: plugins/gevolution/add_buddy_dialog.c:609
+#: plugins/gevolution/add_buddy_dialog.c:606
 msgid "Select Buddy"
 msgstr "Escolher Contacto"
 
 #. Add the label.
-#: plugins/gevolution/assoc-buddy.c:370
+#: plugins/gevolution/assoc-buddy.c:367
 msgid ""
 "Select a person from your address book to add this buddy to, or create a new "
 "person."
@@ -509,42 +513,42 @@
 "contacto, ou crie uma nova pessoa."
 
 #. Add the disclosure
-#: plugins/gevolution/assoc-buddy.c:449
+#: plugins/gevolution/assoc-buddy.c:446
 msgid "Show user details"
 msgstr "Mostrar detalhes do utilizador"
 
-#: plugins/gevolution/assoc-buddy.c:450
+#: plugins/gevolution/assoc-buddy.c:447
 msgid "Hide user details"
 msgstr "Esconder detalhes do utilizador"
 
 #. "Associate Buddy" button
-#: plugins/gevolution/assoc-buddy.c:503
+#: plugins/gevolution/assoc-buddy.c:500
 msgid "_Associate Buddy"
 msgstr "_Associar Contacto"
 
-#: plugins/gevolution/gevo-util.c:66 plugins/gevolution/gevolution.c:90
-#: src/blist.c:775 src/blist.c:963 src/blist.c:2060 src/gtkblist.c:3832
+#: plugins/gevolution/gevo-util.c:64 plugins/gevolution/gevolution.c:89
+#: src/blist.c:775 src/blist.c:963 src/blist.c:1870 src/gtkblist.c:3867
 #: src/protocols/jabber/roster.c:66
 msgid "Buddies"
 msgstr "Contactos"
 
-#: plugins/gevolution/gevolution.c:221
+#: plugins/gevolution/gevolution.c:220
 msgid "Add to Address Book"
 msgstr "Adicionar ao Livro de Endereços"
 
 #. Configuration frame
-#: plugins/gevolution/gevolution.c:352
+#: plugins/gevolution/gevolution.c:351
 msgid "Evolution Integration Configuration"
 msgstr "Configuração da Integração com Evolution"
 
 #. Label
-#: plugins/gevolution/gevolution.c:355
+#: plugins/gevolution/gevolution.c:354
 msgid "Select all accounts that buddies should be auto-added to."
 msgstr ""
 "Escolha todas as contas para as quais os contactos devem ser auto-"
 "adicionados."
 
-#: plugins/gevolution/gevolution.c:385 plugins/idle.c:51 src/gtkconn.c:620
+#: plugins/gevolution/gevolution.c:384 plugins/idle.c:51 src/gtkconn.c:620
 msgid "Account"
 msgstr "Conta"
 
@@ -555,7 +559,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/gevolution/gevolution.c:466
+#: plugins/gevolution/gevolution.c:465
 msgid "Evolution Integration"
 msgstr "Integração com o Evolution"
 
@@ -563,47 +567,47 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/gevolution/gevolution.c:469 plugins/gevolution/gevolution.c:471
+#: plugins/gevolution/gevolution.c:468 plugins/gevolution/gevolution.c:470
 msgid "Provides integration with Ximian Evolution."
 msgstr "Fornece integração com o Ximian Evolution."
 
-#: plugins/gevolution/new_person_dialog.c:270
+#: plugins/gevolution/new_person_dialog.c:267
 msgid "Please enter the person's information below."
 msgstr "Por favor insira as informações do utilizador abaixo."
 
-#: plugins/gevolution/new_person_dialog.c:274
+#: plugins/gevolution/new_person_dialog.c:271
 msgid "Please enter the buddy's screen name and account type below."
 msgstr ""
 "Por favor digite abaixo o nome de utilizador e tipo de conta do seu contacto."
 
-#: plugins/gevolution/new_person_dialog.c:294
+#: plugins/gevolution/new_person_dialog.c:291
 msgid "Account type:"
 msgstr "Tipo de conta:"
 
-#: plugins/gevolution/new_person_dialog.c:298
+#: plugins/gevolution/new_person_dialog.c:295
 msgid "Screenname:"
 msgstr "Nome de utilizador:"
 
 #. Optional Information section
-#: plugins/gevolution/new_person_dialog.c:318
+#: plugins/gevolution/new_person_dialog.c:315
 msgid "Optional information:"
 msgstr "Informações opcionais:"
 
 #. Label
-#: plugins/gevolution/new_person_dialog.c:341 src/gtkaccount.c:340
-#: src/protocols/oscar/oscar.c:433
+#: plugins/gevolution/new_person_dialog.c:338 src/gtkaccount.c:378
+#: src/gtkaccount.c:408 src/protocols/oscar/oscar.c:438
 msgid "Buddy Icon"
 msgstr "Ícone do contacto"
 
-#: plugins/gevolution/new_person_dialog.c:353
+#: plugins/gevolution/new_person_dialog.c:350
 msgid "First name:"
 msgstr "Primeiro nome:"
 
-#: plugins/gevolution/new_person_dialog.c:365
+#: plugins/gevolution/new_person_dialog.c:362
 msgid "Last name:"
 msgstr "Último nome:"
 
-#: plugins/gevolution/new_person_dialog.c:385
+#: plugins/gevolution/new_person_dialog.c:382
 msgid "E-mail:"
 msgstr "E-mail:"
 
@@ -683,7 +687,7 @@
 #. *  summary
 #: plugins/ipc-test-client.c:87
 msgid "Test plugin IPC support, as a client."
-msgstr "testa o suporte ao plugin IPC, como um cliente"
+msgstr "testa o suporte ao plugin IPC, como um cliente."
 
 #. *  description
 #: plugins/ipc-test-client.c:89
@@ -836,15 +840,15 @@
 msgid "Provides support for loading perl plugins."
 msgstr "Fornece suporte ao carregamento de plugins Perl."
 
-#: plugins/raw.c:154
+#: plugins/raw.c:146
 msgid "Raw"
 msgstr "Entrada pura"
 
-#: plugins/raw.c:156
+#: plugins/raw.c:148
 msgid "Lets you send raw input to text-based protocols."
 msgstr "Permite enviar entrada pura para protocolos baseados em texto."
 
-#: plugins/raw.c:157
+#: plugins/raw.c:149
 msgid ""
 "Lets you send raw input to text-based protocols (Jabber, MSN, IRC, TOC). Hit "
 "'Enter' in the entry box to send. Watch the debug window."
@@ -914,7 +918,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/signals-test.c:554
+#: plugins/signals-test.c:566
 msgid "Signals Test"
 msgstr "Teste dos sinais"
 
@@ -922,7 +926,7 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/signals-test.c:557 plugins/signals-test.c:559
+#: plugins/signals-test.c:569 plugins/signals-test.c:571
 msgid "Test to see that all signals are working properly."
 msgstr "Teste para ver se todos os sinais estão a funcionar correctamente."
 
@@ -1144,30 +1148,30 @@
 "minutos."
 
 #: plugins/win32/transparency/win2ktrans.c:133
-#: plugins/win32/transparency/win2ktrans.c:389
-#: plugins/win32/transparency/win2ktrans.c:420
+#: plugins/win32/transparency/win2ktrans.c:388
+#: plugins/win32/transparency/win2ktrans.c:419
 msgid "Opacity:"
 msgstr "Opacidade:"
 
 #. IM Convo trans options
-#: plugins/win32/transparency/win2ktrans.c:370
+#: plugins/win32/transparency/win2ktrans.c:369
 msgid "IM Conversation Windows"
 msgstr "Janelas de Conversa MI"
 
-#: plugins/win32/transparency/win2ktrans.c:371
+#: plugins/win32/transparency/win2ktrans.c:370
 msgid "_IM window transparency"
 msgstr "Transparência da janela de _MI"
 
-#: plugins/win32/transparency/win2ktrans.c:381
+#: plugins/win32/transparency/win2ktrans.c:380
 msgid "_Show slider bar in IM window"
 msgstr "_Mostrar barra deslizante na janela de MI"
 
 #. Buddy List trans options
-#: plugins/win32/transparency/win2ktrans.c:406 src/gtkprefs.c:907
+#: plugins/win32/transparency/win2ktrans.c:405 src/gtkprefs.c:955
 msgid "Buddy List Window"
 msgstr "Janela da lista de contactos"
 
-#: plugins/win32/transparency/win2ktrans.c:407
+#: plugins/win32/transparency/win2ktrans.c:406
 msgid "_Buddy List window transparency"
 msgstr "Transparência da janela da _lista de contactos"
 
@@ -1178,19 +1182,19 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/win32/transparency/win2ktrans.c:463
+#: plugins/win32/transparency/win2ktrans.c:462
 msgid "Transparency"
 msgstr "Transparência"
 
 #. *< name
 #. *< version
 #. *  summary
-#: plugins/win32/transparency/win2ktrans.c:466
+#: plugins/win32/transparency/win2ktrans.c:465
 msgid "Variable Transparency for the buddy list and conversations."
 msgstr "Transparência Variável para a lista de contactos e conversações."
 
 #. *  description
-#: plugins/win32/transparency/win2ktrans.c:468
+#: plugins/win32/transparency/win2ktrans.c:467
 msgid ""
 "This plugin enables variable alpha transparency on conversation windows and "
 "the buddy list.\n"
@@ -1216,8 +1220,8 @@
 msgstr "_Iniciar o Gaim quando o Windows arranca"
 
 #. Buddy List
-#: plugins/win32/winprefs/winprefs.c:362 src/gtkblist.c:3023
-#: src/gtkprefs.c:2399
+#: plugins/win32/winprefs/winprefs.c:362 src/gtkblist.c:3058
+#: src/gtkprefs.c:2412
 msgid "Buddy List"
 msgstr "Lista de contactos"
 
@@ -1236,8 +1240,8 @@
 msgstr "_Manter a janela da lista de contactos no topo"
 
 #. Conversations
-#: plugins/win32/winprefs/winprefs.c:382 src/gtkprefs.c:958
-#: src/gtkprefs.c:2400 src/protocols/msn/msn.c:1611
+#: plugins/win32/winprefs/winprefs.c:382 src/gtkprefs.c:1006
+#: src/gtkprefs.c:2413 src/protocols/msn/msn.c:1638
 msgid "Conversations"
 msgstr "Conversações"
 
@@ -1268,9 +1272,10 @@
 "Jabber, ICQ, IRC, SILC, Novell GroupWise, Napster, Zephyr, and Gadu-Gadu all "
 "at once.  It is written using Gtk+ and is licensed under the GPL.<BR><BR>"
 msgstr ""
-"O Gaim é um cliente de Mensagem Imediata modular capaz de usar o AIM, MSN, Yahoo!, "
-"Jabber, ICQ, IRC, SILC, Novell GroupWise, Napster, Zepyhr, e Gadu-Gadu todos ao "
-"mesmo tempo. Está escrito usando o Gtk+ e é licenciado sob a GPL.<BR><BR>"
+"O Gaim é um cliente de Mensagem Imediata modular capaz de usar o AIM, MSN, "
+"Yahoo!, Jabber, ICQ, IRC, SILC, Novell GroupWise, Napster, Zepyhr, e Gadu-"
+"Gadu todos ao mesmo tempo. Está escrito usando o Gtk+ e é licenciado sob a "
+"GPL.<BR><BR>"
 
 #: src/about.c:106
 msgid "<FONT SIZE=\"4\">IRC:</FONT> #gaim on irc.freenode.net<BR><BR>"
@@ -1308,260 +1313,264 @@
 msgid "Crazy Patch Writers"
 msgstr "Escritores de Patches Malucos"
 
-#: src/about.c:147
+#: src/about.c:148
 msgid "Retired Developers"
 msgstr "Desenvolvedores Aposentados"
 
-#: src/about.c:148
+#: src/about.c:149
 msgid "former libfaim maintainer"
 msgstr "antigo encarregado da libfaim"
 
-#: src/about.c:149
+#: src/about.c:150
 msgid "former lead developer"
 msgstr "antigo desenvolvedor principal"
 
-#: src/about.c:152
+#: src/about.c:153
 msgid "former maintainer"
 msgstr "antigo encarregado"
 
-#: src/about.c:153
+#: src/about.c:154
 msgid "former Jabber developer"
 msgstr "antigo desenvolvedor do Jabber"
 
-#: src/about.c:154
+#: src/about.c:155
 msgid "original author"
 msgstr "autor original"
 
-#: src/about.c:157
+#: src/about.c:158
 msgid "hacker and designated driver [lazy bum]"
 msgstr "hacker e dirigente designado [vagabundo preguiçoso]"
 
-#: src/about.c:165
+#: src/about.c:166
 msgid "Current Translators"
 msgstr "Actuais Tradutores"
 
-#: src/about.c:166 src/about.c:204
+#: src/about.c:167 src/about.c:207
 msgid "Catalan"
 msgstr "Catalão"
 
-#: src/about.c:167 src/about.c:205
+#: src/about.c:168 src/about.c:208
 msgid "Czech"
 msgstr "Checo"
 
-#: src/about.c:168
+#: src/about.c:169
 msgid "Danish"
 msgstr "Dinamarquês"
 
-#: src/about.c:169
+#: src/about.c:170
 msgid "British English"
 msgstr "Inglês de Inglaterra"
 
-#: src/about.c:170
+#: src/about.c:171
 msgid "Canadian English"
 msgstr "Inglês do Canadá"
 
-#: src/about.c:171 src/about.c:206
+#: src/about.c:172 src/about.c:209
 msgid "German"
 msgstr "Alemão"
 
-#: src/about.c:172 src/about.c:207
+#: src/about.c:173 src/about.c:210
 msgid "Spanish"
 msgstr "Espanhol"
 
-#: src/about.c:173 src/about.c:208
+#: src/about.c:174 src/about.c:211
 msgid "Finnish"
 msgstr "Finlandês"
 
-#: src/about.c:174 src/about.c:209
+#: src/about.c:175 src/about.c:212
 msgid "French"
 msgstr "Francês"
 
-#: src/about.c:175
+#: src/about.c:176
 msgid "Hebrew"
 msgstr "Hebraico"
 
-#: src/about.c:176
+#: src/about.c:177
 msgid "Hindi"
 msgstr "Hindu"
 
-#: src/about.c:177
+#: src/about.c:178
 msgid "Hungarian"
 msgstr "Húngaro"
 
-#: src/about.c:178 src/about.c:210
+#: src/about.c:179 src/about.c:213
 msgid "Italian"
 msgstr "Italiano"
 
-#: src/about.c:179 src/about.c:212
+#: src/about.c:180 src/about.c:214
+msgid "Japanese"
+msgstr "Japonês"
+
+#: src/about.c:181
+msgid "Lithuanian"
+msgstr "Lituano"
+
+#: src/about.c:182 src/about.c:215
 msgid "Korean"
 msgstr "Coreano"
 
-#: src/about.c:180
+#: src/about.c:183
 msgid "Dutch; Flemish"
 msgstr "Holandês; Flamengo"
 
-#: src/about.c:181
+#: src/about.c:184
 msgid "Macedonian"
 msgstr "Macedónio"
 
-#: src/about.c:182
+#: src/about.c:185
 msgid "Norwegian"
 msgstr "Norueguês"
 
-#: src/about.c:183 src/about.c:213
+#: src/about.c:186 src/about.c:216
 msgid "Polish"
 msgstr "Polaco"
 
-#: src/about.c:184
+#: src/about.c:187
 msgid "Portuguese"
 msgstr "Português"
 
-#: src/about.c:185
+#: src/about.c:188
 msgid "Portuguese-Brazil"
 msgstr "Português do Brasil"
 
-#: src/about.c:186
+#: src/about.c:189
 msgid "Romanian"
 msgstr "Romeno"
 
-#: src/about.c:187 src/about.c:214 src/about.c:215
+#: src/about.c:190 src/about.c:217 src/about.c:218
 msgid "Russian"
 msgstr "Russo"
 
-#: src/about.c:188
+#: src/about.c:191
 msgid "Serbian"
 msgstr "Sérvio"
 
-#: src/about.c:189
+#: src/about.c:192
 msgid "Slovenian"
 msgstr "Esloveno"
 
-#: src/about.c:190 src/about.c:217
+#: src/about.c:193 src/about.c:220
 msgid "Swedish"
 msgstr "Sueco"
 
-#: src/about.c:191
+#: src/about.c:194
 msgid "Vietnamese"
 msgstr "Vietnamita"
 
-#: src/about.c:191
-msgid "Gnome Vi Team"
-msgstr "Equipa Vi Gnome"
-
-#: src/about.c:193
-msgid "Simplified Chinese"
-msgstr "Chinês Simplificado"
-
 #: src/about.c:194
+msgid "and the Gnome-Vi Team"
+msgstr "e a Equipa Gnome-Vi"
+
+#: src/about.c:196
+msgid "Simplified Chinese"
+msgstr "Chinês Simplificado"
+
+#: src/about.c:197
 msgid "Traditional Chinese"
 msgstr "Chinês Tradicional"
 
-#: src/about.c:201
+#: src/about.c:204
 msgid "Past Translators"
 msgstr "Antigos tradutores"
 
-#: src/about.c:202
+#: src/about.c:205
 msgid "Amharic"
 msgstr "Amhárico"
 
-#: src/about.c:203
+#: src/about.c:206
 msgid "Bulgarian"
 msgstr "Búlgaro"
 
-#: src/about.c:211
-msgid "Japanese"
-msgstr "Japonês"
-
-#: src/about.c:216
+#: src/about.c:219
 msgid "Slovak"
 msgstr "Eslovaco"
 
-#: src/about.c:218
+#: src/about.c:221
 msgid "Chinese"
 msgstr "Chinês"
 
-#: src/account.c:278 src/protocols/jabber/jabber.c:1000
+#: src/account.c:277 src/protocols/jabber/jabber.c:1001
 msgid "New passwords do not match."
 msgstr "Senhas novas não conferem."
 
-#: src/account.c:287
+#: src/account.c:286
 msgid "Fill out all fields completely."
 msgstr "Preencha todos os campos completamente."
 
-#: src/account.c:312
+#: src/account.c:311
 msgid "Original password"
 msgstr "Senha Original"
 
-#: src/account.c:319
+#: src/account.c:318
 msgid "New password"
 msgstr "Nova senha"
 
-#: src/account.c:326
+#: src/account.c:325
 msgid "New password (again)"
 msgstr "Nova senha (novamente)"
 
-#: src/account.c:332
+#: src/account.c:331
 #, c-format
 msgid "Change password for %s"
 msgstr "Mudar senha para %s"
 
-#: src/account.c:340
+#: src/account.c:339
 msgid "Please enter your current password and your new password."
 msgstr "Por favor digite a sua senha actual e a sua nova senha."
 
 #. *
 #. * A wrapper for gaim_request_action() that uses OK and Cancel buttons.
 #.
-#: src/account.c:343 src/connection.c:197 src/dialogs.c:462 src/dialogs.c:518
-#: src/dialogs.c:571 src/gtkblist.c:2341 src/gtkrequest.c:235
-#: src/protocols/jabber/jabber.c:1047 src/protocols/jabber/xdata.c:337
+#: src/account.c:342 src/connection.c:197 src/dialogs.c:462 src/dialogs.c:518
+#: src/dialogs.c:571 src/gtkblist.c:2391 src/gtkrequest.c:242
+#: src/protocols/jabber/jabber.c:1048 src/protocols/jabber/xdata.c:337
 #: src/protocols/msn/msn.c:226 src/protocols/msn/msn.c:241
 #: src/protocols/msn/msn.c:256 src/protocols/msn/msn.c:271
-#: src/protocols/oscar/oscar.c:3353 src/protocols/oscar/oscar.c:3447
-#: src/protocols/oscar/oscar.c:6731 src/protocols/oscar/oscar.c:6828
-#: src/protocols/oscar/oscar.c:6880 src/protocols/oscar/oscar.c:6966
+#: src/protocols/oscar/oscar.c:3369 src/protocols/oscar/oscar.c:3463
+#: src/protocols/oscar/oscar.c:6748 src/protocols/oscar/oscar.c:6844
+#: src/protocols/oscar/oscar.c:6896 src/protocols/oscar/oscar.c:6982
 #: src/protocols/silc/buddy.c:460 src/protocols/silc/buddy.c:1132
-#: src/protocols/silc/chat.c:406 src/protocols/silc/chat.c:444
-#: src/protocols/silc/chat.c:707 src/protocols/silc/ops.c:994
-#: src/protocols/silc/ops.c:1405 src/protocols/silc/silc.c:688
-#: src/protocols/yahoo/yahoo.c:2745 src/protocols/yahoo/yahoo.c:2754
-#: src/request.h:1242
+#: src/protocols/silc/chat.c:409 src/protocols/silc/chat.c:447
+#: src/protocols/silc/chat.c:710 src/protocols/silc/ops.c:1063
+#: src/protocols/silc/ops.c:1671 src/protocols/silc/silc.c:692
+#: src/protocols/yahoo/yahoo.c:2752 src/protocols/yahoo/yahoo.c:2761
+#: src/request.h:1243
 msgid "OK"
 msgstr "OK"
 
-#: src/account.c:344 src/account.c:382 src/away.c:334 src/connection.c:198
+#: src/account.c:343 src/account.c:381 src/away.c:334 src/connection.c:198
 #: src/dialogs.c:299 src/dialogs.c:311 src/dialogs.c:324 src/dialogs.c:345
 #: src/dialogs.c:463 src/dialogs.c:519 src/dialogs.c:572 src/dialogs.c:808
-#: src/dialogs.c:824 src/dialogs.c:842 src/gtkaccount.c:1918
-#: src/gtkaccount.c:2409 src/gtkblist.c:2342 src/gtkblist.c:4377
+#: src/dialogs.c:824 src/dialogs.c:842 src/gtkaccount.c:2002
+#: src/gtkaccount.c:2498 src/gtkblist.c:2392 src/gtkblist.c:4412
 #: src/gtkconn.c:168 src/gtkimhtmltoolbar.c:414 src/gtkprivacy.c:587
 #: src/gtkprivacy.c:600 src/gtkprivacy.c:625 src/gtkprivacy.c:636
-#: src/gtkrequest.c:236 src/protocols/icq/gaim_icq.c:277
+#: src/gtkrequest.c:243 src/protocols/icq/gaim_icq.c:277
 #: src/protocols/jabber/buddy.c:515 src/protocols/jabber/chat.c:710
-#: src/protocols/jabber/jabber.c:666 src/protocols/jabber/jabber.c:1048
+#: src/protocols/jabber/jabber.c:667 src/protocols/jabber/jabber.c:1049
 #: src/protocols/jabber/xdata.c:338 src/protocols/msn/msn.c:227
 #: src/protocols/msn/msn.c:242 src/protocols/msn/msn.c:257
 #: src/protocols/msn/msn.c:272 src/protocols/msn/msn.c:289
-#: src/protocols/oscar/oscar.c:1371 src/protocols/oscar/oscar.c:3313
-#: src/protocols/oscar/oscar.c:3354 src/protocols/oscar/oscar.c:3391
-#: src/protocols/oscar/oscar.c:3448 src/protocols/oscar/oscar.c:6732
-#: src/protocols/oscar/oscar.c:6829 src/protocols/oscar/oscar.c:6881
-#: src/protocols/oscar/oscar.c:6950 src/protocols/oscar/oscar.c:6967
+#: src/protocols/oscar/oscar.c:1377 src/protocols/oscar/oscar.c:3329
+#: src/protocols/oscar/oscar.c:3370 src/protocols/oscar/oscar.c:3407
+#: src/protocols/oscar/oscar.c:3464 src/protocols/oscar/oscar.c:6749
+#: src/protocols/oscar/oscar.c:6845 src/protocols/oscar/oscar.c:6897
+#: src/protocols/oscar/oscar.c:6966 src/protocols/oscar/oscar.c:6983
 #: src/protocols/silc/buddy.c:461 src/protocols/silc/buddy.c:1037
-#: src/protocols/silc/buddy.c:1133 src/protocols/silc/chat.c:579
-#: src/protocols/silc/chat.c:708 src/protocols/silc/ops.c:1406
-#: src/protocols/silc/silc.c:689 src/protocols/trepia/trepia.c:347
-#: src/protocols/yahoo/yahoo.c:2746 src/protocols/yahoo/yahoo.c:2755
-#: src/request.h:1242 src/request.h:1252
+#: src/protocols/silc/buddy.c:1133 src/protocols/silc/chat.c:582
+#: src/protocols/silc/chat.c:711 src/protocols/silc/ops.c:1672
+#: src/protocols/silc/silc.c:693 src/protocols/trepia/trepia.c:347
+#: src/protocols/yahoo/yahoo.c:2753 src/protocols/yahoo/yahoo.c:2762
+#: src/request.h:1243 src/request.h:1253
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: src/account.c:373
+#: src/account.c:372
 #, c-format
 msgid "Change user information for %s"
 msgstr "Mudar informações do utilizador %s"
 
-#: src/account.c:381 src/gtkrequest.c:242 src/protocols/jabber/buddy.c:514
+#: src/account.c:380 src/gtkrequest.c:249 src/protocols/jabber/buddy.c:514
 #: src/protocols/trepia/trepia.c:346
 msgid "Save"
 msgstr "Guardar"
@@ -1584,8 +1593,8 @@
 msgstr "Remover mensagem de ausência"
 
 #. Remove button
-#: src/away.c:333 src/gtkconv.c:1352 src/gtkconv.c:3570 src/gtkconv.c:3669
-#: src/gtkrequest.c:241
+#: src/away.c:333 src/gtkconv.c:1388 src/gtkconv.c:3680 src/gtkconv.c:3784
+#: src/gtkrequest.c:248
 msgid "Remove"
 msgstr "Remover"
 
@@ -1620,16 +1629,12 @@
 msgid "Group not removed"
 msgstr "Grupo não removido"
 
-#: src/blist.c:1393 src/gtkaccount.c:167 src/gtkft.c:161 src/gtkutils.c:721
-#: src/protocols/jabber/buddy.c:570 src/protocols/novell/novell.c:2730
+#: src/blist.c:1393 src/gtkaccount.c:167 src/gtkft.c:154 src/gtkutils.c:627
+#: src/protocols/jabber/buddy.c:570 src/protocols/novell/novell.c:2736
 msgid "Unknown"
 msgstr "Desconhecido"
 
-#: src/blist.c:1721
-msgid "Invalid Groupname"
-msgstr "Nome de grupo inválido"
-
-#: src/blist.c:2192
+#: src/blist.c:2001
 msgid ""
 "An error was encountered parsing your buddy list.  It has not been loaded, "
 "and the old file has moved to blist.xml~."
@@ -1637,7 +1642,7 @@
 "Foi encontrado um erro ao processar a sua lista de contactos. Não foi "
 "carregada, e o ficheiro antigo foi movido para blist.xml~."
 
-#: src/blist.c:2195
+#: src/blist.c:2004
 msgid "Buddy List Error"
 msgstr "Erro da lista de contactos"
 
@@ -1659,71 +1664,71 @@
 msgid "Enter password for %s"
 msgstr "Digite a senha para %s"
 
-#: src/conversation.c:271
+#: src/conversation.c:261
 msgid "Unable to send message. The message is too large."
 msgstr "Impossível enviar mensagem. A mensagem é muito extensa."
 
-#: src/conversation.c:279
+#: src/conversation.c:269
 msgid "Unable to send message."
 msgstr "Impossível enviar mensagem."
 
-#: src/conversation.c:1960
+#: src/conversation.c:1953
 #, c-format
 msgid "%s entered the room."
 msgstr "%s entrou na sala."
 
-#: src/conversation.c:1963
+#: src/conversation.c:1956
 #, c-format
 msgid "%s [<I>%s</I>] entered the room."
 msgstr "%s [<I>%s</I>] entrou na sala."
 
-#: src/conversation.c:2054
+#: src/conversation.c:2047
 #, c-format
 msgid "You are now known as %s"
 msgstr "Mudou o seu nome para %s"
 
-#: src/conversation.c:2057
+#: src/conversation.c:2050
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s mudou o seu nome para %s"
 
-#: src/conversation.c:2099
+#: src/conversation.c:2092
 #, c-format
 msgid "%s left the room (%s)."
 msgstr "%s saiu da sala (%s)."
 
-#: src/conversation.c:2101
+#: src/conversation.c:2094
 #, c-format
 msgid "%s left the room."
 msgstr "%s saiu da sala."
 
-#: src/conversation.c:2172
+#: src/conversation.c:2165
 #, c-format
 msgid "(+%d more)"
 msgstr "(+%d mais)"
 
-#: src/conversation.c:2174
+#: src/conversation.c:2167
 #, c-format
 msgid " left the room (%s)."
 msgstr " saiu da sala (%s)."
 
-#: src/conversation.c:2464
+#: src/conversation.c:2457
 msgid "Last created window"
 msgstr "Última janela criada"
 
-#: src/conversation.c:2466
+#: src/conversation.c:2459
 msgid "Separate IM and Chat windows"
 msgstr "Separar janelas de MI e Chat"
 
-#: src/conversation.c:2468 src/gtkprefs.c:1335
+#: src/conversation.c:2461 src/gtkprefs.c:1384
 msgid "New window"
 msgstr "Nova janela"
 
-#: src/conversation.c:2470
+#: src/conversation.c:2463
 msgid "By group"
 msgstr "Por grupo"
 
-#: src/conversation.c:2472
+#: src/conversation.c:2465
 msgid "By account"
 msgstr "Por conta"
 
@@ -1879,8 +1884,8 @@
 msgid "Enter an alias for this chat."
 msgstr "Digite um nome para este chat."
 
-#: src/dialogs.c:807 src/dialogs.c:823 src/dialogs.c:841 src/gtkrequest.c:243
-#: src/protocols/silc/chat.c:569
+#: src/dialogs.c:807 src/dialogs.c:823 src/dialogs.c:841 src/gtkrequest.c:250
+#: src/protocols/silc/chat.c:572
 msgid "Alias"
 msgstr "Nome"
 
@@ -1901,22 +1906,51 @@
 msgid "Alias Buddy"
 msgstr "Definir nome para este contacto"
 
-#: src/ft.c:144
+#: src/ft.c:125
+msgid "That file does not exist."
+msgstr "Este ficheiro não existe."
+
+#: src/ft.c:134
+msgid "Cannot send a file of 0 bytes."
+msgstr "Não é possível enviar um ficheiro de 0 bytes."
+
+#: src/ft.c:194
+#, c-format
+msgid "%s wants to send you %s (%s)"
+msgstr "%s deseja enviar-lhe %s (%s)"
+
+#: src/ft.c:229
+#, c-format
+msgid "Accept file transfer request from %s?"
+msgstr "Aceitar pedido de transferência de ficheiro de %s?"
+
+#: src/ft.c:233
+#, c-format
+msgid ""
+"A file is available for download from:\n"
+"Remote host: %s\n"
+"Remote port: %d"
+msgstr ""
+"Está disponível um ficheiro para descarregamento de:\n"
+"Anfitrião remoto: %s\n"
+"Porto remoto: %d"
+
+#: src/ft.c:285
 #, c-format
 msgid "%s is not a valid filename.\n"
 msgstr "%s não é um nome de ficheiro válido.\n"
 
-#: src/ft.c:157
+#: src/ft.c:298
 #, c-format
 msgid "%s was not found.\n"
 msgstr "%s não foi encontrado.\n"
 
-#: src/ft.c:786
+#: src/ft.c:927
 #, c-format
 msgid "File transfer to %s aborted.\n"
 msgstr "Transferência de ficheiro para %s abortada.\n"
 
-#: src/ft.c:788
+#: src/ft.c:929
 #, c-format
 msgid "File transfer from %s aborted.\n"
 msgstr "Transferência de ficheiro de %s abortada.\n"
@@ -2013,23 +2047,23 @@
 msgid "sorry, i ran out for a while. bbl"
 msgstr "lamento, saí por um bocado. Volto depois"
 
-#: src/gaimrc.c:372 src/gaimrc.c:1409
+#: src/gaimrc.c:372 src/gaimrc.c:1417
 msgid "boring default"
 msgstr "padrão chato"
 
-#: src/gaimrc.c:1219 src/gtkblist.c:2984
+#: src/gaimrc.c:1227 src/gtkblist.c:3017
 msgid "Alphabetical"
 msgstr "Alfabetica"
 
-#: src/gaimrc.c:1221 src/gtkblist.c:2985
+#: src/gaimrc.c:1229 src/gtkblist.c:3018
 msgid "By status"
 msgstr "Por estado"
 
-#: src/gaimrc.c:1223 src/gtkblist.c:2986
+#: src/gaimrc.c:1231 src/gtkblist.c:3019
 msgid "By log size"
 msgstr "Por tamanho do log"
 
-#: src/gtkaccount.c:309
+#: src/gtkaccount.c:331
 #, c-format
 msgid ""
 "<b>File:</b> %s\n"
@@ -2041,164 +2075,164 @@
 "<b>Dimensões da imagem:</b> %dx%d"
 
 #. Build the login options frame.
-#: src/gtkaccount.c:530
+#: src/gtkaccount.c:614
 msgid "Login Options"
 msgstr "Opções de ligação"
 
-#: src/gtkaccount.c:547
+#: src/gtkaccount.c:631
 msgid "Protocol:"
 msgstr "Protocolo:"
 
-#: src/gtkaccount.c:552 src/gtkblist.c:3983
+#: src/gtkaccount.c:636 src/gtkblist.c:4018
 msgid "Screen Name:"
 msgstr "Nome do utilizador:"
 
-#: src/gtkaccount.c:625
+#: src/gtkaccount.c:709
 msgid "Password:"
 msgstr "Senha:"
 
-#: src/gtkaccount.c:630 src/gtkblist.c:3997 src/gtkblist.c:4325
+#: src/gtkaccount.c:714 src/gtkblist.c:4032 src/gtkblist.c:4360
 msgid "Alias:"
 msgstr "Nome:"
 
-#: src/gtkaccount.c:634
+#: src/gtkaccount.c:718
 msgid "Remember password"
 msgstr "Lembrar senha"
 
 #. Build the user options frame.
-#: src/gtkaccount.c:690
+#: src/gtkaccount.c:774
 msgid "User Options"
 msgstr "Opções de utilizador"
 
-#: src/gtkaccount.c:703
+#: src/gtkaccount.c:787
 msgid "New mail notifications"
 msgstr "Novas notificações de email"
 
-#: src/gtkaccount.c:712
+#: src/gtkaccount.c:796
 msgid "Buddy icon:"
 msgstr "Ícone do contacto:"
 
 #. Build the protocol options frame.
-#: src/gtkaccount.c:801
+#: src/gtkaccount.c:885
 #, c-format
 msgid "%s Options"
 msgstr "Opções de %s"
 
 #. Use Global Proxy Settings
-#: src/gtkaccount.c:937 src/gtkaccount.c:984
+#: src/gtkaccount.c:1021 src/gtkaccount.c:1068
 msgid "Use Global Proxy Settings"
 msgstr "Usar configuração global de proxy"
 
 #. No Proxy
-#: src/gtkaccount.c:943 src/gtkaccount.c:991
+#: src/gtkaccount.c:1027 src/gtkaccount.c:1075
 msgid "No Proxy"
 msgstr "Nenhum proxy"
 
 #. HTTP
-#: src/gtkaccount.c:949 src/gtkaccount.c:998
+#: src/gtkaccount.c:1033 src/gtkaccount.c:1082
 msgid "HTTP"
 msgstr "HTTP"
 
 #. SOCKS 4
-#: src/gtkaccount.c:955 src/gtkaccount.c:1005
+#: src/gtkaccount.c:1039 src/gtkaccount.c:1089
 msgid "SOCKS 4"
 msgstr "SOCKS 4"
 
 #. SOCKS 5
-#: src/gtkaccount.c:961 src/gtkaccount.c:1012
+#: src/gtkaccount.c:1045 src/gtkaccount.c:1096
 msgid "SOCKS 5"
 msgstr "SOCKS 5"
 
 #. Use Environmental Settings
-#: src/gtkaccount.c:967 src/gtkaccount.c:1019 src/gtkprefs.c:1139
+#: src/gtkaccount.c:1051 src/gtkaccount.c:1103 src/gtkprefs.c:1187
 msgid "Use Environmental Settings"
 msgstr "Usar configurações do ambiente"
 
-#: src/gtkaccount.c:1058
+#: src/gtkaccount.c:1142
 msgid "you can see the butterflies mating"
 msgstr "Pode ver as borboletas a acasalar"
 
-#: src/gtkaccount.c:1062
+#: src/gtkaccount.c:1146
 msgid "If you look real closely"
 msgstr "Se olhar bem de perto"
 
-#: src/gtkaccount.c:1078
+#: src/gtkaccount.c:1162
 msgid "Proxy Options"
 msgstr "Opções de proxy"
 
-#: src/gtkaccount.c:1096 src/gtkprefs.c:1133
+#: src/gtkaccount.c:1180 src/gtkprefs.c:1181
 msgid "Proxy _type:"
 msgstr "_Tipo de proxy:"
 
-#: src/gtkaccount.c:1105 src/gtkprefs.c:1160
+#: src/gtkaccount.c:1189 src/gtkprefs.c:1208
 msgid "_Host:"
 msgstr "_Host:"
 
-#: src/gtkaccount.c:1109 src/gtkprefs.c:1178
+#: src/gtkaccount.c:1193 src/gtkprefs.c:1226
 msgid "_Port:"
 msgstr "_Porta:"
 
-#: src/gtkaccount.c:1117
+#: src/gtkaccount.c:1201
 msgid "_Username:"
 msgstr "_Nome de utilizador:"
 
-#: src/gtkaccount.c:1122 src/gtkprefs.c:1215
+#: src/gtkaccount.c:1206 src/gtkprefs.c:1263
 msgid "Pa_ssword:"
 msgstr "_Senha:"
 
-#: src/gtkaccount.c:1494
+#: src/gtkaccount.c:1578
 msgid "Add Account"
 msgstr "Adicionar conta"
 
-#: src/gtkaccount.c:1496
+#: src/gtkaccount.c:1580
 msgid "Modify Account"
 msgstr "Modificar conta"
 
 #. Add the disclosure
-#: src/gtkaccount.c:1520
+#: src/gtkaccount.c:1604
 msgid "Show more options"
 msgstr "Mostrar mais opções"
 
-#: src/gtkaccount.c:1521
+#: src/gtkaccount.c:1605
 msgid "Show fewer options"
 msgstr "Mostrar menos opções"
 
 #. Register button
-#: src/gtkaccount.c:1548 src/protocols/jabber/jabber.c:665
+#: src/gtkaccount.c:1632 src/protocols/jabber/jabber.c:666
 msgid "Register"
 msgstr "Registar"
 
-#: src/gtkaccount.c:1913
+#: src/gtkaccount.c:1997
 #, c-format
 msgid "Are you sure you want to delete %s?"
 msgstr "Tem a certeza que deseja apagar %s?"
 
-#: src/gtkaccount.c:1917 src/gtkrequest.c:239
+#: src/gtkaccount.c:2001 src/gtkrequest.c:246
 msgid "Delete"
 msgstr "Apagar"
 
-#: src/gtkaccount.c:2031 src/protocols/oscar/oscar.c:3981
+#: src/gtkaccount.c:2115 src/protocols/oscar/oscar.c:3997
 msgid "Screen Name"
 msgstr "Nome de utilizador"
 
-#: src/gtkaccount.c:2054 src/protocols/jabber/jabber.c:957
-#: src/protocols/oscar/oscar.c:534 src/protocols/oscar/oscar.c:5463
-#: src/protocols/oscar/oscar.c:6661 src/protocols/silc/silc.c:44
-#: src/protocols/yahoo/yahoo.c:2492 src/protocols/zephyr/zephyr.c:1208
-#: src/protocols/zephyr/zephyr.c:1218
+#: src/gtkaccount.c:2139 src/protocols/jabber/jabber.c:958
+#: src/protocols/oscar/oscar.c:538 src/protocols/oscar/oscar.c:5479
+#: src/protocols/oscar/oscar.c:6678 src/protocols/silc/silc.c:44
+#: src/protocols/yahoo/yahoo.c:2515 src/protocols/zephyr/zephyr.c:1360
+#: src/protocols/zephyr/zephyr.c:1372
 msgid "Online"
 msgstr "Ligado"
 
-#: src/gtkaccount.c:2072
+#: src/gtkaccount.c:2160
 msgid "Protocol"
 msgstr "Protocolo"
 
-#: src/gtkaccount.c:2384
+#: src/gtkaccount.c:2473
 #, c-format
 msgid "%s%s%s%s has made %s his or her buddy%s%s%s"
 msgstr "%s%s%s%s adicionou %s aos seus contactos%s%s%s"
 
-#: src/gtkaccount.c:2398
+#: src/gtkaccount.c:2487
 msgid ""
 "\n"
 "\n"
@@ -2208,27 +2242,27 @@
 "\n"
 "Deseja adicioná-lo(a) à sua lista de contactos?"
 
-#: src/gtkaccount.c:2402
+#: src/gtkaccount.c:2491
 msgid "Information"
 msgstr "Informações"
 
-#: src/gtkaccount.c:2406
+#: src/gtkaccount.c:2495
 msgid "Add buddy to your list?"
 msgstr "Adicionar contacto à sua lista?"
 
 #. Add button
-#: src/gtkaccount.c:2408 src/gtkblist.c:4376 src/gtkconv.c:1354
-#: src/gtkconv.c:3563 src/gtkconv.c:3662 src/gtkrequest.c:240
-#: src/protocols/icq/gaim_icq.c:277 src/protocols/oscar/oscar.c:3610
-#: src/protocols/silc/chat.c:578
+#: src/gtkaccount.c:2497 src/gtkblist.c:4411 src/gtkconv.c:1390
+#: src/gtkconv.c:3673 src/gtkconv.c:3777 src/gtkrequest.c:247
+#: src/protocols/icq/gaim_icq.c:277 src/protocols/oscar/oscar.c:3626
+#: src/protocols/silc/chat.c:581
 msgid "Add"
 msgstr "Adicionar"
 
-#: src/gtkblist.c:810
+#: src/gtkblist.c:815
 msgid "Join a Chat"
 msgstr "Entrar num Chat"
 
-#: src/gtkblist.c:831
+#: src/gtkblist.c:836
 msgid ""
 "Please enter the appropriate information about the chat you would like to "
 "join.\n"
@@ -2236,198 +2270,202 @@
 "Por favor digite alguma informação sobre o chat ao qual gostaria de se "
 "juntar.\n"
 
-#: src/gtkblist.c:842 src/gtkpounce.c:445 src/gtkroomlist.c:354
+#: src/gtkblist.c:847 src/gtkpounce.c:412 src/gtkroomlist.c:354
 msgid "_Account:"
 msgstr "_Conta:"
 
-#: src/gtkblist.c:1128 src/gtkblist.c:3177
+#: src/gtkblist.c:1133 src/gtkblist.c:3212
 msgid "Get _Info"
 msgstr "Ver _Info"
 
-#: src/gtkblist.c:1131 src/gtkblist.c:3168
+#: src/gtkblist.c:1136 src/gtkblist.c:3203
 msgid "I_M"
 msgstr "_MI"
 
-#: src/gtkblist.c:1133
+#: src/gtkblist.c:1141
+msgid "_Send File"
+msgstr "_Enviar Ficheiro"
+
+#: src/gtkblist.c:1145
 msgid "Add Buddy _Pounce"
 msgstr "_Adicionar Notificação de Contacto"
 
-#: src/gtkblist.c:1135
+#: src/gtkblist.c:1147
 msgid "View _Log"
 msgstr "Ver _Log"
 
-#: src/gtkblist.c:1143 src/gtkblist.c:1229 src/gtkblist.c:1243
+#: src/gtkblist.c:1155 src/gtkblist.c:1241 src/gtkblist.c:1255
 msgid "_Alias..."
 msgstr "_Nome Local..."
 
-#: src/gtkblist.c:1145 src/gtkblist.c:1231 src/gtkblist.c:1248
+#: src/gtkblist.c:1157 src/gtkblist.c:1243 src/gtkblist.c:1260
 #: src/gtkconn.c:361
 msgid "_Remove"
 msgstr "_Remover"
 
-#: src/gtkblist.c:1191
+#: src/gtkblist.c:1203
 msgid "Add a _Buddy"
 msgstr "Adicionar um _Contacto"
 
-#: src/gtkblist.c:1193
+#: src/gtkblist.c:1205
 msgid "Add a C_hat"
 msgstr "Adicionar um C_hat"
 
-#: src/gtkblist.c:1195
+#: src/gtkblist.c:1207
 msgid "_Delete Group"
 msgstr "_Remover grupo"
 
-#: src/gtkblist.c:1197
+#: src/gtkblist.c:1209
 msgid "_Rename"
 msgstr "_Renomear"
 
 #. join button
-#: src/gtkblist.c:1219 src/gtkroomlist.c:263 src/gtkroomlist.c:409
+#: src/gtkblist.c:1231 src/gtkroomlist.c:263 src/gtkroomlist.c:409
 #: src/stock.c:87
 msgid "_Join"
 msgstr "_Entrar"
 
-#: src/gtkblist.c:1221
+#: src/gtkblist.c:1233
 msgid "Auto-Join"
 msgstr "Auto-Entrar"
 
-#: src/gtkblist.c:1245 src/gtkblist.c:1274
+#: src/gtkblist.c:1257 src/gtkblist.c:1286
 msgid "_Collapse"
 msgstr "Co_lapsar"
 
-#: src/gtkblist.c:1279
+#: src/gtkblist.c:1291
 msgid "_Expand"
 msgstr "_Expandir"
 
-#: src/gtkblist.c:1935 src/gtkconv.c:4199 src/gtkpounce.c:347
+#: src/gtkblist.c:1949 src/gtkconv.c:4317 src/gtkpounce.c:314
 msgid ""
 "You are not currently signed on with an account that can add that buddy."
 msgstr "Não está ligado a nenhuma conta que possa adicionar esse contacto."
 
 #. Buddies menu
-#: src/gtkblist.c:2286
+#: src/gtkblist.c:2336
 msgid "/_Buddies"
 msgstr "/_Contactos"
 
-#: src/gtkblist.c:2287
+#: src/gtkblist.c:2337
 msgid "/Buddies/New Instant _Message..."
 msgstr "/Contactos/Nova _Mensagem Imediata..."
 
-#: src/gtkblist.c:2288
+#: src/gtkblist.c:2338
 msgid "/Buddies/Join a _Chat..."
 msgstr "/Contactos/Entrar num _Chat..."
 
-#: src/gtkblist.c:2289
+#: src/gtkblist.c:2339
 msgid "/Buddies/Get User _Info..."
 msgstr "/Contactos/Ver Info do _Utilizador..."
 
-#: src/gtkblist.c:2290
+#: src/gtkblist.c:2340
 msgid "/Buddies/View User _Log..."
 msgstr "/Contactos/Ver _Registo do Utilizador..."
 
-#: src/gtkblist.c:2292
+#: src/gtkblist.c:2342
 msgid "/Buddies/Show _Offline Buddies"
 msgstr "/Contactos/Mostrar C_ontactos Desligados"
 
-#: src/gtkblist.c:2293
+#: src/gtkblist.c:2343
 msgid "/Buddies/Show _Empty Groups"
 msgstr "/Contactos/Mostrar Grupos _Vazios"
 
-#: src/gtkblist.c:2294
+#: src/gtkblist.c:2344
 msgid "/Buddies/_Add Buddy..."
 msgstr "/Contactos/_Adicionar Contacto..."
 
-#: src/gtkblist.c:2295
+#: src/gtkblist.c:2345
 msgid "/Buddies/Add C_hat..."
 msgstr "/Contactos/Adicionar C_hat..."
 
-#: src/gtkblist.c:2296
+#: src/gtkblist.c:2346
 msgid "/Buddies/Add _Group..."
 msgstr "/Contactos/Adicionar _Grupo..."
 
-#: src/gtkblist.c:2298
+#: src/gtkblist.c:2348
 msgid "/Buddies/_Signoff"
 msgstr "/Contactos/_Desligar"
 
-#: src/gtkblist.c:2299
+#: src/gtkblist.c:2349
 msgid "/Buddies/_Quit"
 msgstr "/Contactos/_Sair"
 
 #. Tools
-#: src/gtkblist.c:2302
+#: src/gtkblist.c:2352
 msgid "/_Tools"
 msgstr "/_Ferramentas"
 
-#: src/gtkblist.c:2303
+#: src/gtkblist.c:2353
 msgid "/Tools/_Away"
 msgstr "/Ferrramentas/_Ausência"
 
-#: src/gtkblist.c:2304
+#: src/gtkblist.c:2354
 msgid "/Tools/Buddy _Pounce"
 msgstr "/Ferramentas/_Notificação de contacto"
 
-#: src/gtkblist.c:2305
+#: src/gtkblist.c:2355
 msgid "/Tools/Account Ac_tions"
 msgstr "/Ferramentas/Acções de Con_tas"
 
-#: src/gtkblist.c:2306
+#: src/gtkblist.c:2356
 msgid "/Tools/Pl_ugin Actions"
 msgstr "/Ferramentas/Acções de _Plugins"
 
-#: src/gtkblist.c:2308
+#: src/gtkblist.c:2358
 msgid "/Tools/A_ccounts"
 msgstr "/Ferramentas/_Contas"
 
-#: src/gtkblist.c:2309
+#: src/gtkblist.c:2359
 msgid "/Tools/_File Transfers"
 msgstr "/Ferramentas/Transferências de _Ficheiros"
 
-#: src/gtkblist.c:2310
+#: src/gtkblist.c:2360
 msgid "/Tools/R_oom List"
 msgstr "/Ferramentas/Lista de _Salas"
 
-#: src/gtkblist.c:2311
+#: src/gtkblist.c:2361
 msgid "/Tools/Pr_eferences"
 msgstr "/Ferramentas/_Preferências"
 
-#: src/gtkblist.c:2312
+#: src/gtkblist.c:2362
 msgid "/Tools/Pr_ivacy"
 msgstr "/Ferramentas/Pr_ivacidade"
 
-#: src/gtkblist.c:2314
+#: src/gtkblist.c:2364
 msgid "/Tools/View System _Log"
 msgstr "/Ferramentas/Ver _Log do Sistema"
 
 #. Help
-#: src/gtkblist.c:2317
+#: src/gtkblist.c:2367
 msgid "/_Help"
 msgstr "/_Ajuda"
 
-#: src/gtkblist.c:2318
+#: src/gtkblist.c:2368
 msgid "/Help/Online _Help"
 msgstr "/Ajuda/_Ajuda online"
 
-#: src/gtkblist.c:2319
+#: src/gtkblist.c:2369
 msgid "/Help/_Debug Window"
 msgstr "/Ajuda/Janela de _debug"
 
-#: src/gtkblist.c:2320
+#: src/gtkblist.c:2370
 msgid "/Help/_About"
 msgstr "/Ajuda/_Sobre"
 
-#: src/gtkblist.c:2338
+#: src/gtkblist.c:2388
 msgid "Rename Group"
 msgstr "Renomear grupo"
 
-#: src/gtkblist.c:2338
+#: src/gtkblist.c:2388
 msgid "New group name"
 msgstr "Novo nome do grupo"
 
-#: src/gtkblist.c:2339
+#: src/gtkblist.c:2389
 msgid "Please enter a new name for the selected group."
 msgstr "Por favor digite um novo nome para o grupo selecionado."
 
-#: src/gtkblist.c:2367
+#: src/gtkblist.c:2417
 #, c-format
 msgid ""
 "\n"
@@ -2436,7 +2474,7 @@
 "\n"
 "<b>Conta:</b> %s"
 
-#: src/gtkblist.c:2431
+#: src/gtkblist.c:2481
 msgid ""
 "\n"
 "<b>Status:</b> Offline"
@@ -2444,12 +2482,12 @@
 "\n"
 "<b>Estado:</b> Desligado"
 
-#: src/gtkblist.c:2446
+#: src/gtkblist.c:2496
 #, c-format
 msgid "%d%%"
 msgstr "%d%%"
 
-#: src/gtkblist.c:2462
+#: src/gtkblist.c:2512
 msgid ""
 "\n"
 "<b>Account:</b>"
@@ -2457,7 +2495,7 @@
 "\n"
 "<b>Conta: </b>"
 
-#: src/gtkblist.c:2463
+#: src/gtkblist.c:2513
 msgid ""
 "\n"
 "<b>Contact Alias:</b>"
@@ -2465,7 +2503,7 @@
 "\n"
 "<b>Nome Local:</b>"
 
-#: src/gtkblist.c:2464
+#: src/gtkblist.c:2514
 msgid ""
 "\n"
 "<b>Alias:</b>"
@@ -2473,7 +2511,7 @@
 "\n"
 "<b>Nome local:</b>"
 
-#: src/gtkblist.c:2465
+#: src/gtkblist.c:2515
 msgid ""
 "\n"
 "<b>Nickname:</b>"
@@ -2481,7 +2519,7 @@
 "\n"
 "<b>Nome remoto:</b>"
 
-#: src/gtkblist.c:2466
+#: src/gtkblist.c:2516
 msgid ""
 "\n"
 "<b>Logged In:</b>"
@@ -2489,7 +2527,7 @@
 "\n"
 "<b>Ligado por:</b>"
 
-#: src/gtkblist.c:2467
+#: src/gtkblist.c:2517
 msgid ""
 "\n"
 "<b>Idle:</b>"
@@ -2497,7 +2535,7 @@
 "\n"
 "<b>Inactivo por:</b>"
 
-#: src/gtkblist.c:2468
+#: src/gtkblist.c:2518
 msgid ""
 "\n"
 "<b>Warned:</b>"
@@ -2505,7 +2543,7 @@
 "\n"
 "<b>Alertado:</b>"
 
-#: src/gtkblist.c:2470
+#: src/gtkblist.c:2520
 msgid ""
 "\n"
 "<b>Description:</b> Spooky"
@@ -2513,7 +2551,7 @@
 "\n"
 "<b>Descrição:</b> Assombrado"
 
-#: src/gtkblist.c:2471
+#: src/gtkblist.c:2521
 msgid ""
 "\n"
 "<b>Status</b>: Awesome"
@@ -2521,7 +2559,7 @@
 "\n"
 "<b>Estado</b>: Incrível"
 
-#: src/gtkblist.c:2472
+#: src/gtkblist.c:2522
 msgid ""
 "\n"
 "<b>Status</b>: Rockin'"
@@ -2529,96 +2567,96 @@
 "\n"
 "<b>Estado</b>: Na Maior"
 
-#: src/gtkblist.c:2771
+#: src/gtkblist.c:2804
 #, c-format
 msgid "Idle (%dh%02dm) "
 msgstr "Inactivo (%dh%02dm) "
 
-#: src/gtkblist.c:2773
+#: src/gtkblist.c:2806
 #, c-format
 msgid "Idle (%dm) "
 msgstr "Inactivo (%dm) "
 
-#: src/gtkblist.c:2778
+#: src/gtkblist.c:2811
 #, c-format
 msgid "Warned (%d%%) "
 msgstr "Alertado (%d%%) "
 
-#: src/gtkblist.c:2781
+#: src/gtkblist.c:2814
 msgid "Offline "
 msgstr "Desligado "
 
 #. Make menu items sensitive/insensitive where appropriate
-#: src/gtkblist.c:2899
+#: src/gtkblist.c:2932
 msgid "/Buddies/Join a Chat..."
 msgstr "/Contactos/Entrar num Chat..."
 
-#: src/gtkblist.c:2902
+#: src/gtkblist.c:2935
 msgid "/Tools/Room List"
 msgstr "/Ferramentas/Lista de Salas"
 
-#: src/gtkblist.c:2905
+#: src/gtkblist.c:2938
 msgid "/Tools/Privacy"
 msgstr "/Ferramentas/Privacidade"
 
-#: src/gtkblist.c:3050
+#: src/gtkblist.c:3085
 msgid "/Tools/Away"
 msgstr "/Ferramentas/Ausência"
 
-#: src/gtkblist.c:3053
+#: src/gtkblist.c:3088
 msgid "/Tools/Buddy Pounce"
 msgstr "/Ferramentas/Notificação de Contactos"
 
-#: src/gtkblist.c:3056
+#: src/gtkblist.c:3091
 msgid "/Tools/Account Actions"
 msgstr "/Ferramentas/Acções de _Contas"
 
-#: src/gtkblist.c:3059
+#: src/gtkblist.c:3094
 msgid "/Tools/Plugin Actions"
 msgstr "/Ferramentas/Acções de Plugins"
 
 #. set the Show Offline Buddies option. must be done
 #. * after the treeview or faceprint gets mad. -Robot101
 #.
-#: src/gtkblist.c:3148
+#: src/gtkblist.c:3183
 msgid "/Buddies/Show Offline Buddies"
 msgstr "/Contactos/Mostrar Contactos Desligados"
 
-#: src/gtkblist.c:3150
+#: src/gtkblist.c:3185
 msgid "/Buddies/Show Empty Groups"
 msgstr "/Contactos/Mostrar Grupos Vazios"
 
-#: src/gtkblist.c:3174
+#: src/gtkblist.c:3209
 msgid "Send a message to the selected buddy"
 msgstr "Enviar uma mensagem para o contacto seleccionado"
 
-#: src/gtkblist.c:3183
+#: src/gtkblist.c:3218
 msgid "Get information on the selected buddy"
 msgstr "Ver informações sobre o contacto seleccionado"
 
-#: src/gtkblist.c:3186
+#: src/gtkblist.c:3221
 msgid "_Chat"
 msgstr "_Chat"
 
-#: src/gtkblist.c:3191
+#: src/gtkblist.c:3226
 msgid "Join a chat room"
 msgstr "Entrar numa sala de chat"
 
-#: src/gtkblist.c:3194
+#: src/gtkblist.c:3229
 msgid "_Away"
 msgstr "_Ausente"
 
-#: src/gtkblist.c:3199
+#: src/gtkblist.c:3234
 msgid "Set an away message"
 msgstr "Definir uma mensagem de ausência"
 
-#: src/gtkblist.c:3937 src/protocols/silc/buddy.c:731
+#: src/gtkblist.c:3972 src/protocols/silc/buddy.c:731
 #: src/protocols/silc/buddy.c:989 src/protocols/silc/buddy.c:1034
-#: src/protocols/silc/buddy.c:1124 src/protocols/yahoo/yahoo.c:2672
+#: src/protocols/silc/buddy.c:1124 src/protocols/yahoo/yahoo.c:2682
 msgid "Add Buddy"
 msgstr "Adicionar contacto"
 
-#: src/gtkblist.c:3961
+#: src/gtkblist.c:3996
 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. "
@@ -2630,11 +2668,11 @@
 "possível.\n"
 
 #. Set up stuff for the account box
-#: src/gtkblist.c:4021 src/gtkblist.c:4305
+#: src/gtkblist.c:4056 src/gtkblist.c:4340
 msgid "Account:"
 msgstr "Conta:"
 
-#: src/gtkblist.c:4264
+#: src/gtkblist.c:4299
 msgid ""
 "You are not currently signed on with any protocols that have the ability to "
 "chat."
@@ -2642,11 +2680,11 @@
 "Neste momento não está ligado a nenhum protocolo que possua o recurso de "
 "chat."
 
-#: src/gtkblist.c:4271
+#: src/gtkblist.c:4306
 msgid "Add Chat"
 msgstr "Adicionar chat"
 
-#: src/gtkblist.c:4295
+#: src/gtkblist.c:4330
 msgid ""
 "Please enter an alias, and the appropriate information about the chat you "
 "would like to add to your buddy list.\n"
@@ -2654,15 +2692,15 @@
 "Por favor digite um nome, e as informações apropriadas sobre o chat que "
 "gostaria de adicionar à sua lista de contactos.\n"
 
-#: src/gtkblist.c:4373
+#: src/gtkblist.c:4408
 msgid "Add Group"
 msgstr "Criar grupo"
 
-#: src/gtkblist.c:4374
+#: src/gtkblist.c:4409
 msgid "Please enter the name of the group to be added."
 msgstr "Por favor digite o nome do grupo a ser criado."
 
-#: src/gtkblist.c:4941 src/gtkblist.c:5038
+#: src/gtkblist.c:4976 src/gtkblist.c:5073
 msgid "No actions available"
 msgstr "Nenhuma ação disponível"
 
@@ -2711,29 +2749,16 @@
 msgid "Time"
 msgstr "Tempo"
 
-#: src/gtkconv.c:168
-#, c-format
-msgid "<h1>Conversation with %s</h1>\n"
-msgstr "<h1>Conversa com %s</h1>\n"
-
-#: src/gtkconv.c:186 src/gtkdebug.c:212
-msgid "That file already exists"
-msgstr "Esse ficheiro já existe"
-
-#: src/gtkconv.c:187 src/gtkdebug.c:213 src/gtkft.c:1123
-msgid "Would you like to overwrite it?"
-msgstr "Deseja gravar por cima?"
-
-#: src/gtkconv.c:365
+#: src/gtkconv.c:314
 #, c-format
 msgid "me is using Gaim v%s."
 msgstr "me está a usar o Gaim v%s."
 
-#: src/gtkconv.c:374
+#: src/gtkconv.c:323
 msgid "Supported debug options are:  version"
 msgstr "As opções de debug suportadas são:  version"
 
-#: src/gtkconv.c:387
+#: src/gtkconv.c:336
 msgid ""
 "Use \"/help &lt;command&gt;\" for help on a specific command.\n"
 "The following commands are available in this context:\n"
@@ -2741,51 +2766,52 @@
 "Use \"/help &lt;comando&gt;\" para ajuda sobre um comando específico.\n"
 "Estão disponíveis os seguintes comandos neste contexto:\n"
 
-#: src/gtkconv.c:421
+#: src/gtkconv.c:370
 msgid "No such command (in this context)."
 msgstr "Esse comando não existe (neste contexto)."
 
-#: src/gtkconv.c:468
+#: src/gtkconv.c:443
 msgid ""
 "No such command. If you didn't mean to type a command, you can turn commands "
 "off from Tools->Preferences->Interface->Conversation->Enable \"slash\" "
 "commands."
 msgstr ""
-"Esse comando não existe. Se não queria escrever um comando, pode desactivar os comandos "
-"em Ferramentas->Preferências->Interface->Conversa->Activar comandos \"barra\"."
-
-#: src/gtkconv.c:476
+"Esse comando não existe. Se não queria escrever um comando, pode desactivar "
+"os comandos em Ferramentas->Preferências->Interface->Conversa->Activar "
+"comandos \"barra\"."
+
+#: src/gtkconv.c:451
 msgid ""
 "Syntax Error:  You typed the wrong number of arguments to that command. If "
 "you didn't mean to type a command, you can turn commands off from Tools-"
 ">Preferences->Interface->Conversation->Enable \"slash\" commands."
 msgstr ""
-"Erro de sintaxe: Escreveu um número errado de argumentos para esse comando. Se "
-"não queria escrever um comando, pode desactivar os comandos em Ferramentas-"
-">Preferências->Interface->Conversa->Activar comandos \"barra\"."
-
-#: src/gtkconv.c:483
+"Erro de sintaxe: Escreveu um número errado de argumentos para esse comando. "
+"Se não queria escrever um comando, pode desactivar os comandos em "
+"Ferramentas->Preferências->Interface->Conversa->Activar comandos \"barra\"."
+
+#: src/gtkconv.c:458
 msgid "Your command failed for an unknown reason."
 msgstr "O seu comando falhou por um motivo desconhecido."
 
-#: src/gtkconv.c:490
+#: src/gtkconv.c:465
 msgid "That command only works in Chats, not IMs."
 msgstr "Esse comando funciona apenas em Chats, não em MIs."
 
-#: src/gtkconv.c:493
+#: src/gtkconv.c:468
 msgid "That command only works in IMs, not Chats."
 msgstr "Esse comando funciona apenas em MIs, não em Chats."
 
-#: src/gtkconv.c:497
+#: src/gtkconv.c:472
 msgid "That command doesn't work on this protocol."
 msgstr "Esse comando não funciona neste protocolo."
 
-#: src/gtkconv.c:713
+#: src/gtkconv.c:693
 msgid "Invite Buddy Into Chat Room"
 msgstr "Convidar Contacto Para Sala de Chat"
 
 #. Put our happy label in it.
-#: src/gtkconv.c:741
+#: src/gtkconv.c:721
 msgid ""
 "Please enter the name of the user you wish to invite, along with an optional "
 "invite message."
@@ -2793,511 +2819,505 @@
 "Por favor digite o nome do utilizador que gostaria de convidar, e uma "
 "mensagem de convite opcional."
 
-#: src/gtkconv.c:762
+#: src/gtkconv.c:742
 msgid "_Buddy:"
 msgstr "_Contacto:"
 
-#: src/gtkconv.c:782
+#: src/gtkconv.c:762
 msgid "_Message:"
 msgstr "_Mensagem:"
 
-#: src/gtkconv.c:890 src/gtkdebug.c:127
+#: src/gtkconv.c:799 src/gtkconv.c:2489 src/gtkdebug.c:182
+msgid "Unable to open file."
+msgstr "Impossível abrir ficheiro."
+
+#: src/gtkconv.c:804
+#, c-format
+msgid "<h1>Conversation with %s</h1>\n"
+msgstr "<h1>Conversa com %s</h1>\n"
+
+#: src/gtkconv.c:818
+msgid "Save Conversation"
+msgstr "Guardar Conversa"
+
+#: src/gtkconv.c:895 src/gtkdebug.c:131
 msgid "Find"
 msgstr "Encontrar"
 
-#: src/gtkconv.c:916 src/gtkdebug.c:155
+#: src/gtkconv.c:921 src/gtkdebug.c:159
 msgid "_Search for:"
 msgstr "_Pesquisar por:"
 
-#: src/gtkconv.c:1312
+#: src/gtkconv.c:1338
 msgid "IM"
 msgstr "MI"
 
-#: src/gtkconv.c:1320
+#. Block button
+#: src/gtkconv.c:1347 src/gtkconv.c:3666 src/protocols/oscar/oscar.c:453
+#: src/protocols/oscar/oscar.c:6788
+msgid "Send File"
+msgstr "Enviar"
+
+#: src/gtkconv.c:1356
 msgid "Un-Ignore"
 msgstr "Des-ignorar"
 
-#: src/gtkconv.c:1322 src/gtkprefs.c:778
+#: src/gtkconv.c:1358 src/gtkprefs.c:826
 msgid "Ignore"
 msgstr "Ignorar"
 
 #. Info button
-#: src/gtkconv.c:1331 src/gtkconv.c:3577
+#: src/gtkconv.c:1367 src/gtkconv.c:3687
 msgid "Info"
 msgstr "Info"
 
-#: src/gtkconv.c:1340
+#: src/gtkconv.c:1376
 msgid "Get Away Msg"
 msgstr "Ver Msg de Ausência"
 
-#: src/gtkconv.c:2467
+#: src/gtkconv.c:2497
+msgid "Unable to save icon file to disk."
+msgstr "Impossível guardar ficheiro de ícone no disco."
+
+#: src/gtkconv.c:2514
+msgid "Save Icon"
+msgstr "Guardar Ícone"
+
+#: src/gtkconv.c:2544
 msgid "Animate"
 msgstr "Animar"
 
-#: src/gtkconv.c:2472
+#: src/gtkconv.c:2549
 msgid "Hide Icon"
 msgstr "Ocultar ícone"
 
-#: src/gtkconv.c:2478
+#: src/gtkconv.c:2555
 msgid "Save Icon As..."
 msgstr "Guardar ícone como..."
 
-#: src/gtkconv.c:2847
+#: src/gtkconv.c:2939
 msgid "User is typing..."
 msgstr "O utilizador está digitando..."
 
-#: src/gtkconv.c:2855
+#: src/gtkconv.c:2947
 msgid "User has typed something and paused"
 msgstr "O utilizador digitou algo e parou"
 
 #. Build the Send As menu
-#: src/gtkconv.c:2958
+#: src/gtkconv.c:3050
 msgid "_Send As"
 msgstr "_Enviar como"
 
-#: src/gtkconv.c:3335
-msgid "Save Conversation"
-msgstr "Guardar Conversa"
-
 #. Conversation menu
-#: src/gtkconv.c:3352
+#: src/gtkconv.c:3450
 msgid "/_Conversation"
 msgstr "/_Conversa"
 
-#: src/gtkconv.c:3354
+#: src/gtkconv.c:3452
 msgid "/Conversation/New Instant _Message..."
 msgstr "/Conversa/Nova _Mensagem Imediata..."
 
-#: src/gtkconv.c:3359
+#: src/gtkconv.c:3457
 msgid "/Conversation/_Find..."
 msgstr "/Conversa/_Encontrar..."
 
-#: src/gtkconv.c:3361
+#: src/gtkconv.c:3459
 msgid "/Conversation/View _Log"
 msgstr "/Conversa/Ver _Log..."
 
-#: src/gtkconv.c:3362
+#: src/gtkconv.c:3460
 msgid "/Conversation/_Save As..."
 msgstr "/Conversa/_Guardar como..."
 
-#: src/gtkconv.c:3364
+#: src/gtkconv.c:3462
 msgid "/Conversation/Clear"
 msgstr "/Conversa/Limpar"
 
-#: src/gtkconv.c:3368
+#: src/gtkconv.c:3466
+msgid "/Conversation/Se_nd File..."
+msgstr "/Conversa/Enviar _Ficheiro..."
+
+#: src/gtkconv.c:3467
 msgid "/Conversation/Add Buddy _Pounce..."
 msgstr "/Conversa/Adicionar No_tificação de Contacto..."
 
-#: src/gtkconv.c:3370
+#: src/gtkconv.c:3469
 msgid "/Conversation/_Get Info"
 msgstr "/Conversa/_Ver Informações"
 
-#: src/gtkconv.c:3372
+#: src/gtkconv.c:3471
 msgid "/Conversation/_Warn..."
 msgstr "/Conversa/_Alertar..."
 
-#: src/gtkconv.c:3374
+#: src/gtkconv.c:3473
 msgid "/Conversation/In_vite..."
 msgstr "/Conversa/_Convidar..."
 
-#: src/gtkconv.c:3379
+#: src/gtkconv.c:3478
 msgid "/Conversation/A_lias..."
 msgstr "/Conversa/_Nome..."
 
-#: src/gtkconv.c:3381
+#: src/gtkconv.c:3480
 msgid "/Conversation/_Block..."
 msgstr "/Conversa/_Bloquear..."
 
-#: src/gtkconv.c:3383
+#: src/gtkconv.c:3482
 msgid "/Conversation/_Add..."
 msgstr "/Conversa/A_dicionar..."
 
-#: src/gtkconv.c:3385
+#: src/gtkconv.c:3484
 msgid "/Conversation/_Remove..."
 msgstr "/Conversa/_Remover..."
 
-#: src/gtkconv.c:3390
+#: src/gtkconv.c:3489
 msgid "/Conversation/Insert Lin_k..."
 msgstr "/Conversa/Inserir El_o..."
 
-#: src/gtkconv.c:3392
+#: src/gtkconv.c:3491
 msgid "/Conversation/Insert Imag_e..."
 msgstr "/Conversa/Inserir _Imagem..."
 
-#: src/gtkconv.c:3397
+#: src/gtkconv.c:3496
 msgid "/Conversation/_Close"
 msgstr "/Conversa/_Fechar"
 
 #. Options
-#: src/gtkconv.c:3401
+#: src/gtkconv.c:3500
 msgid "/_Options"
 msgstr "/_Opções"
 
-#: src/gtkconv.c:3402
+#: src/gtkconv.c:3501
 msgid "/Options/Enable _Logging"
 msgstr "/Opções/Activar _Registo"
 
-#: src/gtkconv.c:3403
+#: src/gtkconv.c:3502
 msgid "/Options/Enable _Sounds"
 msgstr "/Opções/Activar _Sons"
 
-#: src/gtkconv.c:3404
+#: src/gtkconv.c:3503
 msgid "/Options/Show Formatting _Toolbar"
 msgstr "/Opções/Mostrar Barra de _Formatação"
 
-#: src/gtkconv.c:3405
+#: src/gtkconv.c:3504
 msgid "/Options/Show T_imestamps"
 msgstr "/Opções/Mostrar Marcas de _Tempo"
 
-#: src/gtkconv.c:3447
+#: src/gtkconv.c:3546
 msgid "/Conversation/View Log"
 msgstr "/Conversa/Ver Registo"
 
-#: src/gtkconv.c:3452
+#: src/gtkconv.c:3551
+msgid "/Conversation/Send File..."
+msgstr "/Conversa/Enviar Ficheiro..."
+
+#: src/gtkconv.c:3555
 msgid "/Conversation/Add Buddy Pounce..."
 msgstr "/Conversa/Adicionar Notificação de Contacto..."
 
-#: src/gtkconv.c:3458
+#: src/gtkconv.c:3561
 msgid "/Conversation/Get Info"
 msgstr "/Conversa/Obter Info"
 
-#: src/gtkconv.c:3462
+#: src/gtkconv.c:3565
 msgid "/Conversation/Warn..."
 msgstr "/Conversa/Alertar..."
 
-#: src/gtkconv.c:3466
+#: src/gtkconv.c:3569
 msgid "/Conversation/Invite..."
 msgstr "/Conversa/Convidar..."
 
-#: src/gtkconv.c:3472
+#: src/gtkconv.c:3575
 msgid "/Conversation/Alias..."
 msgstr "/Conversa/Nome..."
 
-#: src/gtkconv.c:3476
+#: src/gtkconv.c:3579
 msgid "/Conversation/Block..."
 msgstr "/Conversa/Bloquear..."
 
-#: src/gtkconv.c:3480
+#: src/gtkconv.c:3583
 msgid "/Conversation/Add..."
 msgstr "/Conversa/Adicionar..."
 
-#: src/gtkconv.c:3484
+#: src/gtkconv.c:3587
 msgid "/Conversation/Remove..."
 msgstr "/Conversa/Remover..."
 
-#: src/gtkconv.c:3490
+#: src/gtkconv.c:3593
 msgid "/Conversation/Insert Link..."
 msgstr "/Conversa/Inserir Elo..."
 
-#: src/gtkconv.c:3494
+#: src/gtkconv.c:3597
 msgid "/Conversation/Insert Image..."
 msgstr "/Conversa/Inserir Imagem..."
 
-#: src/gtkconv.c:3500
+#: src/gtkconv.c:3603
 msgid "/Options/Enable Logging"
 msgstr "/Opções/Activar Registo"
 
-#: src/gtkconv.c:3503
+#: src/gtkconv.c:3606
 msgid "/Options/Enable Sounds"
 msgstr "/Opções/Activar Sons"
 
-#: src/gtkconv.c:3506
+#: src/gtkconv.c:3609
 msgid "/Options/Show Formatting Toolbar"
 msgstr "/Opções/Mostrar Barra de Formatação"
 
-#: src/gtkconv.c:3509
+#: src/gtkconv.c:3612
 msgid "/Options/Show Timestamps"
 msgstr "/Opções/Mostrar Marcas de Tempo"
 
 #. From right to left...
 #. Send button
-#: src/gtkconv.c:3533 src/gtkconv.c:3535 src/gtkconv.c:3641 src/gtkconv.c:3643
+#: src/gtkconv.c:3636 src/gtkconv.c:3638 src/gtkconv.c:3756 src/gtkconv.c:3758
 msgid "Send"
 msgstr "Enviar"
 
 #. Now, um, just kind of all over the place. Huh?
 #. Warn button
-#: src/gtkconv.c:3549
+#: src/gtkconv.c:3652
 msgid "Warn"
 msgstr "Alertar"
 
-#: src/gtkconv.c:3552
+#: src/gtkconv.c:3655
 msgid "Warn the user"
 msgstr "Alertar o utilizador"
 
 #. Block button
-#: src/gtkconv.c:3556 src/gtkprivacy.c:624 src/gtkprivacy.c:635
+#: src/gtkconv.c:3659 src/gtkprivacy.c:624 src/gtkprivacy.c:635
 msgid "Block"
 msgstr "Bloquear"
 
-#: src/gtkconv.c:3559
+#: src/gtkconv.c:3662
 msgid "Block the user"
 msgstr "Bloquear o utilizador"
 
-#: src/gtkconv.c:3566
+#: src/gtkconv.c:3669
+msgid "Send a file to the user"
+msgstr "Enviar um ficheiro ao utilizador"
+
+#: src/gtkconv.c:3676
 msgid "Add the user to your buddy list"
 msgstr "Adicionar o utilizador à sua lista de contactos"
 
-#: src/gtkconv.c:3573
+#: src/gtkconv.c:3683
 msgid "Remove the user from your buddy list"
 msgstr "Remover o utilizador da sua lista de contactos"
 
-#: src/gtkconv.c:3580 src/gtkconv.c:3923
+#: src/gtkconv.c:3690 src/gtkconv.c:4041
 msgid "Get the user's information"
 msgstr "Ver informações do utilizador"
 
 #. Invite
-#: src/gtkconv.c:3655
+#: src/gtkconv.c:3770
 msgid "Invite"
 msgstr "Convidar"
 
-#: src/gtkconv.c:3658
+#: src/gtkconv.c:3773
 msgid "Invite a user"
 msgstr "Convidar um utilizador"
 
-#: src/gtkconv.c:3665
+#: src/gtkconv.c:3780
 msgid "Add the chat to your buddy list"
 msgstr "Adicionar o chat à sua lista de contactos"
 
-#: src/gtkconv.c:3672
+#: src/gtkconv.c:3787
 msgid "Remove the chat from your buddy list"
 msgstr "Remover o chat da sua lista de contactos"
 
-#: src/gtkconv.c:3782
+#: src/gtkconv.c:3897
 msgid "Topic:"
 msgstr "Tópico:"
 
 #. Setup the label telling how many people are in the room.
-#: src/gtkconv.c:3845
+#: src/gtkconv.c:3960
 msgid "0 people in room"
 msgstr "0 pessoas na sala"
 
-#: src/gtkconv.c:3900
+#: src/gtkconv.c:4018
 msgid "IM the user"
 msgstr "Mandar uma MI para o utilizador"
 
-#: src/gtkconv.c:3912
+#: src/gtkconv.c:4030
 msgid "Ignore the user"
 msgstr "Ignorar o utilizador"
 
-#: src/gtkconv.c:4490
+#: src/gtkconv.c:4629
 msgid "Close conversation"
 msgstr "Fechar conversa"
 
-#: src/gtkconv.c:5035 src/gtkconv.c:5067 src/gtkconv.c:5188 src/gtkconv.c:5255
+#: src/gtkconv.c:5171 src/gtkconv.c:5203 src/gtkconv.c:5324 src/gtkconv.c:5391
 #, c-format
 msgid "%d person in room"
 msgid_plural "%d people in room"
 msgstr[0] "%d pessoa na sala"
 msgstr[1] "%d pessoas na sala"
 
-#: src/gtkconv.c:5757 src/gtkconv.c:5760
+#: src/gtkconv.c:5903 src/gtkconv.c:5906
 msgid "<main>/Conversation/Close"
 msgstr "<main>/Conversa/Fechar"
 
-#: src/gtkconv.c:6132
+#: src/gtkconv.c:6278
 msgid "me &lt;action&gt;:  Send an IRC style action to a buddy or chat."
 msgstr "me &lt;acção&gt;:  Enviar uma acção estilo IRC a um contacto ou chat."
 
-#: src/gtkconv.c:6135
+#: src/gtkconv.c:6281
 msgid ""
 "debug &lt;option&gt;:  Send various debug information to the current "
 "conversation."
 msgstr ""
-"debug &lt;opção&gt;:  Envia informação de depuração variada para a conversa actual."
-
-#: src/gtkconv.c:6139
+"debug &lt;opção&gt;:  Envia informação de depuração variada para a conversa "
+"actual."
+
+#: src/gtkconv.c:6285
 msgid "help:  List available commands."
 msgstr "help:  Lista os comandos disponíveis."
 
-#: src/gtkconv.c:6143
+#: src/gtkconv.c:6289
 msgid "help &lt;command&gt;:  Help on a specific command."
 msgstr "help &lt;comando&gt;:  Ajuda sobre um comando específico."
 
-#: src/gtkdebug.c:226
+#: src/gtkdebug.c:197
 msgid "Save Debug Log"
 msgstr "Guardar Registo de Depuração"
 
-#: src/gtkdebug.c:289
+#: src/gtkdebug.c:250
 msgid "Debug Window"
 msgstr "Janela de debug"
 
-#: src/gtkdebug.c:327
+#: src/gtkdebug.c:288
 msgid "Pause"
 msgstr "Pausar"
 
-#: src/gtkdebug.c:333
+#: src/gtkdebug.c:294
 msgid "Timestamps"
 msgstr "Marcações de tempo"
 
-#: src/gtkft.c:143
+#: src/gtkft.c:136
 #, c-format
 msgid "%.2f KB/s"
 msgstr "%.2f KB/s"
 
-#: src/gtkft.c:164 src/gtkft.c:974
+#: src/gtkft.c:157 src/gtkft.c:967
 msgid "Finished"
 msgstr "Terminado"
 
-#: src/gtkft.c:167 src/gtkft.c:925
+#: src/gtkft.c:160 src/gtkft.c:918
 msgid "Canceled"
 msgstr "Cancelado"
 
-#: src/gtkft.c:170
+#: src/gtkft.c:163
 msgid "Waiting for transfer to begin"
 msgstr "Esperando que a transferência comece"
 
-#: src/gtkft.c:223
+#: src/gtkft.c:216
 msgid "<b>Receiving From:</b>"
 msgstr "<b>Recebendo De:</b>"
 
-#: src/gtkft.c:226
+#: src/gtkft.c:219
 msgid "<b>Sending To:</b>"
 msgstr "<b>Enviando Para:</b>"
 
-#: src/gtkft.c:400
+#: src/gtkft.c:393
 msgid "There is no application configured to open this type of file."
 msgstr ""
 "Não existe nenhum programa configurado para abrir este tipo de ficheiro."
 
-#: src/gtkft.c:405
+#: src/gtkft.c:398
 msgid "An error occurred while opening the file."
 msgstr "Ocorreu um erro ao abrir o ficheiro."
 
+#: src/gtkft.c:489
+msgid "Progress"
+msgstr "Progresso"
+
 #: src/gtkft.c:496
-msgid "Progress"
-msgstr "Progresso"
-
-#: src/gtkft.c:503
 msgid "Filename"
 msgstr "Nome do ficheiro"
 
-#: src/gtkft.c:510
+#: src/gtkft.c:503
 msgid "Size"
 msgstr "Tamanho"
 
-#: src/gtkft.c:517
+#: src/gtkft.c:510
 msgid "Remaining"
 msgstr "Restante"
 
-#: src/gtkft.c:547
+#: src/gtkft.c:540
 msgid "Filename:"
 msgstr "Nome do ficheiro:"
 
-#: src/gtkft.c:548
+#: src/gtkft.c:541
 msgid "Status:"
 msgstr "Status:"
 
-#: src/gtkft.c:549
+#: src/gtkft.c:542
 msgid "Speed:"
 msgstr "Velocidade:"
 
-#: src/gtkft.c:550
+#: src/gtkft.c:543
 msgid "Time Elapsed:"
 msgstr "Tempo decorrido:"
 
-#: src/gtkft.c:551
+#: src/gtkft.c:544
 msgid "Time Remaining:"
 msgstr "Tempo restante:"
 
-#: src/gtkft.c:648
+#: src/gtkft.c:641
 msgid "_Keep the dialog open"
 msgstr "_Manter a janela aberta"
 
-#: src/gtkft.c:658
+#: src/gtkft.c:651
 msgid "_Clear finished transfers"
 msgstr "_Limpar transferências concluídas"
 
 #. "Download Details" arrow
-#: src/gtkft.c:667
+#: src/gtkft.c:660
 msgid "Show transfer details"
 msgstr "Mostrar detalhes da transferência"
 
-#: src/gtkft.c:668
+#: src/gtkft.c:661
 msgid "Hide transfer details"
 msgstr "Esconder detalhes da transferência"
 
 #. Pause button
-#: src/gtkft.c:710 src/stock.c:90
+#: src/gtkft.c:703 src/stock.c:90
 msgid "_Pause"
 msgstr "_Pausar"
 
 #. Resume button
-#: src/gtkft.c:720
+#: src/gtkft.c:713
 msgid "_Resume"
 msgstr "_Continuar"
 
-#: src/gtkft.c:927
+#: src/gtkft.c:920
 msgid "Failed"
 msgstr "Falhou"
 
-#: src/gtkft.c:1099
-msgid "That file does not exist."
-msgstr "Este ficheiro não existe."
-
-#: src/gtkft.c:1108
-msgid "Cannot send a file of 0 bytes."
-msgstr "Não é possível enviar um ficheiro de 0 bytes."
-
-#: src/gtkft.c:1122
-msgid "That file already exists."
-msgstr "Esse ficheiro já existe."
-
-#. Open file selector to select the public key.
-#: src/gtkft.c:1148 src/protocols/silc/buddy.c:1023
-msgid "Open..."
-msgstr "Abrir..."
-
-#: src/gtkft.c:1150
-msgid "Save As..."
-msgstr "Guardar Como..."
-
-#: src/gtkft.c:1200
-#, c-format
-msgid "%s wants to send you %s (%s)"
-msgstr "%s deseja enviar-lhe %s (%s)"
-
-#: src/gtkft.c:1233
-#, c-format
-msgid "Accept file transfer request from %s?"
-msgstr "Aceitar pedido de transferência de ficheiro de %s?"
-
-#: src/gtkft.c:1237
-#, c-format
-msgid ""
-"A file is available for download from:\n"
-"Remote host: %s\n"
-"Remote port: %d"
-msgstr ""
-"Está disponível um ficheiro para descarregamento de:\n"
-"Anfitrião remoto: %s\n"
-"Porto remoto: %d"
-
-#: src/gtkimhtml.c:567
+#: src/gtkimhtml.c:602
 msgid "Pa_ste As Text"
 msgstr "Co_lar Como Texto"
 
-#: src/gtkimhtml.c:1012
+#: src/gtkimhtml.c:1047
 msgid "Hyperlink color"
 msgstr "Cor do elo"
 
-#: src/gtkimhtml.c:1013
+#: src/gtkimhtml.c:1048
 msgid "Color to draw hyperlinks."
 msgstr "Cor para escrever elos."
 
-#: src/gtkimhtml.c:1218
+#: src/gtkimhtml.c:1253
 msgid "_Copy E-Mail Address"
 msgstr "_Copiar Endereço de E-Mail"
 
-#: src/gtkimhtml.c:1230
+#: src/gtkimhtml.c:1265
 msgid "_Copy Link Location"
 msgstr "_Copiar Endereço do Elo"
 
-#: src/gtkimhtml.c:1240
+#: src/gtkimhtml.c:1275
 msgid "_Open Link in Browser"
 msgstr "_Abrir Elo no Navegador"
 
-#: src/gtkimhtml.c:2761
+#: src/gtkimhtml.c:2797
 msgid ""
 "Unable to guess the image type based on the file extension supplied.  "
 "Defaulting to PNG."
@@ -3305,16 +3325,16 @@
 "Não foi possível descobrir o tipo de imagem baseando-se na extensão "
 "fornecida.  O padrão (PNG) vai ser usado."
 
-#: src/gtkimhtml.c:2769
+#: src/gtkimhtml.c:2805
 #, c-format
 msgid "Error saving image: %s"
 msgstr "Erro ao guardar imagem: %s"
 
-#: src/gtkimhtml.c:2778
+#: src/gtkimhtml.c:2814
 msgid "Save Image"
 msgstr "Guardar imagem"
 
-#: src/gtkimhtml.c:2801
+#: src/gtkimhtml.c:2837
 msgid "_Save Image..."
 msgstr "_Guardar imagem..."
 
@@ -3358,74 +3378,74 @@
 msgid "_Insert"
 msgstr "_Inserir"
 
-#: src/gtkimhtmltoolbar.c:472
+#: src/gtkimhtmltoolbar.c:481
 #, c-format
 msgid "Failed to store image: %s\n"
 msgstr "Impossível guardar imagem: %s\n"
 
-#: src/gtkimhtmltoolbar.c:498
+#: src/gtkimhtmltoolbar.c:507 src/gtkimhtmltoolbar.c:517
 msgid "Insert Image"
 msgstr "Inserir Imagem"
 
-#: src/gtkimhtmltoolbar.c:637
+#: src/gtkimhtmltoolbar.c:655
 msgid "This theme has no available smileys."
-msgstr "Este tema não tem smileys disponíveis"
+msgstr "Este tema não tem smileys disponíveis."
 
 #. show everything
-#: src/gtkimhtmltoolbar.c:652
+#: src/gtkimhtmltoolbar.c:670
 msgid "Smile!"
 msgstr "Sorria!"
 
-#: src/gtkimhtmltoolbar.c:870
+#: src/gtkimhtmltoolbar.c:888
 msgid "Bold"
 msgstr "Negrito"
 
-#: src/gtkimhtmltoolbar.c:881
+#: src/gtkimhtmltoolbar.c:899
 msgid "Italic"
 msgstr "Itálico"
 
-#: src/gtkimhtmltoolbar.c:892
+#: src/gtkimhtmltoolbar.c:910
 msgid "Underline"
 msgstr "Sublinhado"
 
-#: src/gtkimhtmltoolbar.c:908
+#: src/gtkimhtmltoolbar.c:926
 msgid "Larger font size"
 msgstr "Maior tamanho de letra"
 
-#: src/gtkimhtmltoolbar.c:920
+#: src/gtkimhtmltoolbar.c:938
 msgid "Smaller font size"
 msgstr "Menor tamanho de letra"
 
-#: src/gtkimhtmltoolbar.c:937
+#: src/gtkimhtmltoolbar.c:955
 msgid "Font Face"
 msgstr "Fonte"
 
-#: src/gtkimhtmltoolbar.c:949
+#: src/gtkimhtmltoolbar.c:967
 msgid "Foreground font color"
 msgstr "Cor da letra"
 
-#: src/gtkimhtmltoolbar.c:961
+#: src/gtkimhtmltoolbar.c:979
 msgid "Background color"
 msgstr "Cor do fundo"
 
-#: src/gtkimhtmltoolbar.c:976
+#: src/gtkimhtmltoolbar.c:994
 msgid "Insert link"
 msgstr "Inserir elo"
 
-#: src/gtkimhtmltoolbar.c:986
+#: src/gtkimhtmltoolbar.c:1004
 msgid "Insert image"
 msgstr "Inserir imagem"
 
-#: src/gtkimhtmltoolbar.c:997
+#: src/gtkimhtmltoolbar.c:1015
 msgid "Insert smiley"
 msgstr "Inserir smiley"
 
-#: src/gtklog.c:282
+#: src/gtklog.c:302
 msgid "Conversations with"
 msgstr "Conversações com"
 
 #. Window **********
-#: src/gtklog.c:372 src/gtklog.c:388
+#: src/gtklog.c:392 src/gtklog.c:408
 msgid "System Log"
 msgstr "Registo do Sistema"
 
@@ -3475,7 +3495,7 @@
 msgstr "O comando de navegador \"%s\" é inválido."
 
 #: src/gtknotify.c:432 src/gtknotify.c:446 src/gtknotify.c:461
-#: src/gtknotify.c:569
+#: src/gtknotify.c:579
 msgid "Unable to open URL"
 msgstr "Impossível abrir URL"
 
@@ -3484,175 +3504,175 @@
 msgid "Error launching \"%s\": %s"
 msgstr "Erro ao executar \"%s\": %s"
 
-#: src/gtknotify.c:570
+#: src/gtknotify.c:580
 msgid ""
 "The 'Manual' browser command has been chosen, but no command has been set."
 msgstr ""
 "Foi escolhido o comando 'Manual' do navegador, mas nenhum comando foi "
 "definido."
 
-#: src/gtkpounce.c:144
+#: src/gtkpounce.c:130
 msgid "Select a file"
 msgstr "Seleccione um ficheiro"
 
-#: src/gtkpounce.c:194
+#: src/gtkpounce.c:161
 msgid "Please enter a buddy to pounce."
 msgstr "Por favor digite o contacto que terá a notificação."
 
 #. "New Buddy Pounce"
-#: src/gtkpounce.c:420 src/gtkpounce.c:923
+#: src/gtkpounce.c:387 src/gtkpounce.c:890
 msgid "New Buddy Pounce"
 msgstr "Nova notificação de contacto"
 
-#: src/gtkpounce.c:420
+#: src/gtkpounce.c:387
 msgid "Edit Buddy Pounce"
 msgstr "Editar notificação de contacto"
 
 #. Create the "Pounce Who" frame.
-#: src/gtkpounce.c:438
+#: src/gtkpounce.c:405
 msgid "Pounce Who"
 msgstr "Quem terá a notificação"
 
-#: src/gtkpounce.c:465
+#: src/gtkpounce.c:432
 msgid "_Buddy name:"
 msgstr "_Nome do contacto:"
 
 #. Create the "Pounce When" frame.
-#: src/gtkpounce.c:489
+#: src/gtkpounce.c:456
 msgid "Pounce When"
 msgstr "Quando notificar"
 
-#: src/gtkpounce.c:497 src/main.c:296
+#: src/gtkpounce.c:464 src/main.c:296
 msgid "_Sign on"
 msgstr "_Ligar"
 
-#: src/gtkpounce.c:499
+#: src/gtkpounce.c:466
 msgid "Sign _off"
 msgstr "_Desligar"
 
-#: src/gtkpounce.c:501
+#: src/gtkpounce.c:468
 msgid "A_way"
 msgstr "_Ausente"
 
-#: src/gtkpounce.c:503
+#: src/gtkpounce.c:470
 msgid "Re_turn from away"
 msgstr "_Voltar de 'Ausente'"
 
-#: src/gtkpounce.c:505
+#: src/gtkpounce.c:472
 msgid "_Idle"
 msgstr "_Inactivo"
 
-#: src/gtkpounce.c:507
+#: src/gtkpounce.c:474
 msgid "Retur_n from idle"
 msgstr "Voltar do 'I_nactivo'"
 
-#: src/gtkpounce.c:509
+#: src/gtkpounce.c:476
 msgid "Buddy starts _typing"
 msgstr "Contacto começar a digi_tar"
 
-#: src/gtkpounce.c:511
+#: src/gtkpounce.c:478
 msgid "Buddy stops t_yping"
 msgstr "Contacto parar de d_igitar"
 
 #. Create the "Pounce Action" frame.
-#: src/gtkpounce.c:540
+#: src/gtkpounce.c:507
 msgid "Pounce Action"
 msgstr "Acção usada para notificar"
 
-#: src/gtkpounce.c:548
+#: src/gtkpounce.c:515
 msgid "Op_en an IM window"
 msgstr "_Abrir uma janela de MI"
 
-#: src/gtkpounce.c:550
+#: src/gtkpounce.c:517
 msgid "_Popup notification"
 msgstr "Mostrar notificação"
 
-#: src/gtkpounce.c:552
+#: src/gtkpounce.c:519
 msgid "Send a _message"
 msgstr "Enviar uma mensagem"
 
-#: src/gtkpounce.c:554
+#: src/gtkpounce.c:521
 msgid "E_xecute a command"
 msgstr "Executar um comando"
 
-#: src/gtkpounce.c:556
+#: src/gtkpounce.c:523
 msgid "P_lay a sound"
 msgstr "Tocar um som"
 
-#: src/gtkpounce.c:560
+#: src/gtkpounce.c:527
 msgid "B_rowse..."
-msgstr "_Procurar"
-
-#: src/gtkpounce.c:562
+msgstr "_Procurar..."
+
+#: src/gtkpounce.c:529
 msgid "Bro_wse..."
-msgstr "P_rocurar"
-
-#: src/gtkpounce.c:563
+msgstr "P_rocurar..."
+
+#: src/gtkpounce.c:530
 msgid "Pre_view"
 msgstr "Pre-_visualização"
 
-#: src/gtkpounce.c:646
+#: src/gtkpounce.c:613
 msgid "Sav_e this pounce after activation"
 msgstr "_Guardar esta notificação após activação"
 
 #. "Remove Buddy Pounce"
-#: src/gtkpounce.c:930
+#: src/gtkpounce.c:897
 msgid "Remove Buddy Pounce"
 msgstr "Remover notificação de contacto"
 
-#: src/gtkpounce.c:994
+#: src/gtkpounce.c:961
 #, c-format
 msgid "%s has started typing to you (%s)"
 msgstr "%s começou a digitar para si (%s)"
 
-#: src/gtkpounce.c:996
+#: src/gtkpounce.c:963
 #, c-format
 msgid "%s has signed on (%s)"
 msgstr "%s ligou-se (%s)"
 
-#: src/gtkpounce.c:998
+#: src/gtkpounce.c:965
 #, c-format
 msgid "%s has returned from being idle (%s)"
 msgstr "%s saiu do estado 'Inactivo' (%s)"
 
-#: src/gtkpounce.c:1000
+#: src/gtkpounce.c:967
 #, c-format
 msgid "%s has returned from being away (%s)"
 msgstr "%s saiu do estado 'Ausente' (%s)"
 
-#: src/gtkpounce.c:1002
+#: src/gtkpounce.c:969
 #, c-format
 msgid "%s has stopped typing to you (%s)"
 msgstr "%s parou de digitar para si (%s)"
 
-#: src/gtkpounce.c:1004
+#: src/gtkpounce.c:971
 #, c-format
 msgid "%s has signed off (%s)"
 msgstr "%s desligou-se (%s)"
 
-#: src/gtkpounce.c:1006
+#: src/gtkpounce.c:973
 #, c-format
 msgid "%s has become idle (%s)"
 msgstr "%s tornou-se inactivo (%s)"
 
-#: src/gtkpounce.c:1008
+#: src/gtkpounce.c:975
 #, c-format
 msgid "%s has gone away. (%s)"
 msgstr "%s está ausente. (%s)"
 
-#: src/gtkpounce.c:1009
+#: src/gtkpounce.c:976
 msgid "Unknown pounce event. Please report this!"
 msgstr "Acontecimento de notificação desconhecido. Por favor reporte isto!"
 
-#: src/gtkprefs.c:401
+#: src/gtkprefs.c:446
 msgid "Interface Options"
 msgstr "Opções da interface"
 
-#: src/gtkprefs.c:403
+#: src/gtkprefs.c:448
 msgid "D_isplay remote nicknames if no alias is set"
 msgstr "_Mostrar nomes remotos se nenhum nome local estiver definido"
 
-#: src/gtkprefs.c:627
+#: src/gtkprefs.c:675
 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."
@@ -3660,52 +3680,52 @@
 "Seleccione um tema de smiley que gostaria de usar da lista abaixo. Novos "
 "temas podem ser instalados arrastando e soltando-os na lista de temas."
 
-#: src/gtkprefs.c:667
+#: src/gtkprefs.c:715
 msgid "Icon"
 msgstr "Ícone"
 
-#: src/gtkprefs.c:674 src/gtkprefs.c:2199 src/protocols/jabber/buddy.c:265
+#: src/gtkprefs.c:722 src/gtkprefs.c:2212 src/protocols/jabber/buddy.c:264
 #: src/protocols/jabber/buddy.c:748 src/protocols/jabber/chat.c:701
 msgid "Description"
 msgstr "Descrição"
 
-#: src/gtkprefs.c:770
+#: src/gtkprefs.c:818
 msgid "Display"
 msgstr "Mostrar"
 
-#: src/gtkprefs.c:771
+#: src/gtkprefs.c:819
 msgid "Show _timestamp on messages"
 msgstr "Mostrar _marcações de tempo nas mensagens"
 
-#: src/gtkprefs.c:774
+#: src/gtkprefs.c:822
 msgid "_Highlight misspelled words"
 msgstr "_Destacar palavras mal escritas"
 
-#: src/gtkprefs.c:779
+#: src/gtkprefs.c:827
 msgid "Ignore c_olors"
 msgstr "Ignorar c_ores"
 
-#: src/gtkprefs.c:781
+#: src/gtkprefs.c:829
 msgid "Ignore font _faces"
 msgstr "Ignorar tipos de _letra"
 
-#: src/gtkprefs.c:783
+#: src/gtkprefs.c:831
 msgid "Ignore font si_zes"
 msgstr "Ignorar _tamanhos de letra"
 
-#: src/gtkprefs.c:786
+#: src/gtkprefs.c:834
 msgid "_Ignore formatting on incoming messages"
 msgstr "_Ignorar formatação nas mensagens recebidas"
 
-#: src/gtkprefs.c:790
+#: src/gtkprefs.c:838
 msgid "Default Formatting"
 msgstr "Formatação Padrão"
 
-#: src/gtkprefs.c:792
+#: src/gtkprefs.c:840
 msgid "_Send default formatting with outgoing messages"
 msgstr "_Enviar formatação por omissão nas mensagens enviadas"
 
-#: src/gtkprefs.c:824
+#: src/gtkprefs.c:872
 msgid ""
 "This is how your outgoing message text will appear when you use protocols "
 "that support formatting. :)"
@@ -3713,265 +3733,269 @@
 "Este é o modo como a sua mensagem enviada aparecerá quando estiver a usar "
 "protocolos que suportem formatação. :)"
 
-#: src/gtkprefs.c:827
+#: src/gtkprefs.c:875
 msgid "_Clear Formatting"
 msgstr "_Apagar Formatação"
 
-#: src/gtkprefs.c:864
+#: src/gtkprefs.c:912
 msgid "Send Message"
 msgstr "Enviar Mensagem"
 
-#: src/gtkprefs.c:865
+#: src/gtkprefs.c:913
 msgid "Enter _sends message"
 msgstr "Enter _envia mensagem"
 
-#: src/gtkprefs.c:867
+#: src/gtkprefs.c:915
 msgid "C_ontrol-Enter sends message"
 msgstr "C_ontrol-Enter envia mensagem"
 
-#: src/gtkprefs.c:870
+#: src/gtkprefs.c:918
 msgid "Window Closing"
 msgstr "Fechar Janelas"
 
-#: src/gtkprefs.c:871
+#: src/gtkprefs.c:919
 msgid "_Escape closes window"
 msgstr "_Escape fecha a janela"
 
-#: src/gtkprefs.c:874
+#: src/gtkprefs.c:922
 msgid "Insertions"
 msgstr "Inserções"
 
-#: src/gtkprefs.c:875
+#: src/gtkprefs.c:923
 msgid "Control-{B/I/U} changes _formatting"
 msgstr "Control-{B/I/U} muda a _formatação"
 
-#: src/gtkprefs.c:877
+#: src/gtkprefs.c:925
 msgid "Control-(number) _inserts smileys"
 msgstr "Control-(número) _insere smileys"
 
-#: src/gtkprefs.c:893
+#: src/gtkprefs.c:941
 msgid "Buddy List Sorting"
 msgstr "Classificação da Lista de Contactos"
 
-#: src/gtkprefs.c:902
+#: src/gtkprefs.c:950
 msgid "_Sorting:"
 msgstr "_Ordenação:"
 
-#: src/gtkprefs.c:908 src/gtkprefs.c:961
+#: src/gtkprefs.c:956 src/gtkprefs.c:1009
 msgid "Show _buttons as:"
 msgstr "Mostrar _botões como:"
 
-#: src/gtkprefs.c:910 src/gtkprefs.c:963
+#: src/gtkprefs.c:958 src/gtkprefs.c:1011
 msgid "Pictures"
 msgstr "Imagens"
 
-#: src/gtkprefs.c:911 src/gtkprefs.c:964
+#: src/gtkprefs.c:959 src/gtkprefs.c:1012
 msgid "Text"
 msgstr "Texto"
 
-#: src/gtkprefs.c:912 src/gtkprefs.c:965
+#: src/gtkprefs.c:960 src/gtkprefs.c:1013
 msgid "Pictures and text"
 msgstr "Imagens e texto"
 
-#: src/gtkprefs.c:915
+#: src/gtkprefs.c:963
 msgid "_Raise window on events"
 msgstr "_Levantar janela quando ocorrerem acontecimentos."
 
-#: src/gtkprefs.c:918
+#: src/gtkprefs.c:966
 msgid "Buddy Display"
 msgstr "Exibição de contactos"
 
-#: src/gtkprefs.c:919 src/gtkprefs.c:979
+#: src/gtkprefs.c:967 src/gtkprefs.c:1027
 msgid "Show buddy _icons"
 msgstr "Mostrar í_cones de contactos"
 
-#: src/gtkprefs.c:921
+#: src/gtkprefs.c:969
 msgid "Show _warning levels"
 msgstr "Mostrar _níveis de alerta"
 
-#: src/gtkprefs.c:923
+#: src/gtkprefs.c:971
 msgid "Show idle _times"
 msgstr "Mostrar _tempo de inactividade"
 
-#: src/gtkprefs.c:925
+#: src/gtkprefs.c:973
 msgid "Dim i_dle buddies"
 msgstr "Turvar contactos in_activos"
 
-#: src/gtkprefs.c:927
+#: src/gtkprefs.c:975
 msgid "_Automatically expand contacts"
 msgstr "Expandir contactos _automaticamente"
 
-#: src/gtkprefs.c:972
+#: src/gtkprefs.c:1020
 msgid "Enable \"_slash\" commands"
 msgstr "Activar comandos \"_barra\""
 
-#: src/gtkprefs.c:975
+#: src/gtkprefs.c:1023
 msgid "Show _formatting toolbar"
 msgstr "Mostrar barra de _formatação"
 
-#: src/gtkprefs.c:977
+#: src/gtkprefs.c:1025
 msgid "Show _aliases in tabs/titles"
 msgstr "Mostrar n_omes em abas/títulos"
 
-#: src/gtkprefs.c:981
+#: src/gtkprefs.c:1029
 msgid "Enable buddy ic_on animation"
 msgstr "Activar a_nimação do ícone de contacto"
 
-#: src/gtkprefs.c:983
+#: src/gtkprefs.c:1031
 msgid "_Notify buddies that you are typing to them"
 msgstr "Notificar contactos de que está _digitando para eles"
 
-#: src/gtkprefs.c:985
+#: src/gtkprefs.c:1033
 msgid "_Raise IM window on events"
 msgstr "_Levantar janela de MI quando ocorrerem acontecimentos"
 
-#: src/gtkprefs.c:988
+#: src/gtkprefs.c:1036
 msgid "Raise chat _window on events"
 msgstr "_Levantar janela de chat quando ocorrerem acontecimentos"
 
-#: src/gtkprefs.c:990
+#: src/gtkprefs.c:1038
 msgid "Use _multi-colored screen names in chats"
 msgstr "Usar nomes _multi-coloridos em chats"
 
 #. All the tab options!
-#: src/gtkprefs.c:994
+#: src/gtkprefs.c:1042
 msgid "Tab Options"
 msgstr "Opções de Abas"
 
-#: src/gtkprefs.c:996
+#: src/gtkprefs.c:1044
 msgid "Show IMs and chats in _tabbed windows"
 msgstr "Mostrar MIs e chats em janelas com _abas"
 
-#: src/gtkprefs.c:1011
+#: src/gtkprefs.c:1059
 msgid "Show _close button on tabs"
 msgstr "Mostrar o botão de _fechar nas abas."
 
-#: src/gtkprefs.c:1014
+#: src/gtkprefs.c:1062
 msgid "Tab p_lacement:"
 msgstr "_Posicionamento das abas:"
 
-#: src/gtkprefs.c:1016
+#: src/gtkprefs.c:1064
 msgid "Top"
 msgstr "Cima"
 
-#: src/gtkprefs.c:1017
+#: src/gtkprefs.c:1065
 msgid "Bottom"
 msgstr "Baixo"
 
-#: src/gtkprefs.c:1018
+#: src/gtkprefs.c:1066
 msgid "Left"
 msgstr "Esquerda"
 
-#: src/gtkprefs.c:1019
+#: src/gtkprefs.c:1067
 msgid "Right"
 msgstr "Direita"
 
-#: src/gtkprefs.c:1025
+#: src/gtkprefs.c:1073
 msgid "New conversation _placement:"
 msgstr "_Posicionamento de novas conversas:"
 
-#: src/gtkprefs.c:1076 src/protocols/oscar/oscar.c:592
-#: src/protocols/oscar/oscar.c:4837
+#: src/gtkprefs.c:1124 src/protocols/oscar/oscar.c:596
+#: src/protocols/oscar/oscar.c:4853
 msgid "IP Address"
 msgstr "Endereço IP"
 
-#: src/gtkprefs.c:1078
+#: src/gtkprefs.c:1126
 msgid "_Autodetect IP Address"
 msgstr "Detectar IP _Automáticamente"
 
-#: src/gtkprefs.c:1087
+#: src/gtkprefs.c:1135
 msgid "Public _IP:"
 msgstr "_IP Público:"
 
-#: src/gtkprefs.c:1111
+#: src/gtkprefs.c:1159
 msgid "Ports"
 msgstr "Portos"
 
-#: src/gtkprefs.c:1114
+#: src/gtkprefs.c:1162
 msgid "_Manually specify range of ports to listen on"
 msgstr "Especificar _manualmente o intervalo de portos a ouvir"
 
-#: src/gtkprefs.c:1117
+#: src/gtkprefs.c:1165
 msgid "_Start Port:"
 msgstr "Porto _Inicial:"
 
-#: src/gtkprefs.c:1124
+#: src/gtkprefs.c:1172
 msgid "_End Port:"
 msgstr "Porto _Final:"
 
-#: src/gtkprefs.c:1131
+#: src/gtkprefs.c:1179
 msgid "Proxy Server"
 msgstr "Servidor proxy"
 
-#: src/gtkprefs.c:1135
+#: src/gtkprefs.c:1183
 msgid "No proxy"
 msgstr "Nenhum proxy"
 
-#: src/gtkprefs.c:1197
+#: src/gtkprefs.c:1245
 msgid "_User:"
 msgstr "_Utilizador:"
 
-#: src/gtkprefs.c:1253
-msgid "Opera"
-msgstr "Opera"
-
-#: src/gtkprefs.c:1254
-msgid "Netscape"
-msgstr "Netscape"
-
-#: src/gtkprefs.c:1255
-msgid "Mozilla"
-msgstr "Mozilla"
-
-#: src/gtkprefs.c:1256
-msgid "Konqueror"
-msgstr "Konqueror"
-
-#: src/gtkprefs.c:1257
-msgid "Galeon"
-msgstr "Galeon"
-
-#: src/gtkprefs.c:1258
+#: src/gtkprefs.c:1301
+msgid "Epiphany"
+msgstr "Epiphany"
+
+#: src/gtkprefs.c:1302
 msgid "Firebird"
 msgstr "Firebird"
 
-#: src/gtkprefs.c:1259
+#: src/gtkprefs.c:1303
 msgid "Firefox"
 msgstr "Firefox"
 
-#: src/gtkprefs.c:1260
+#: src/gtkprefs.c:1304
+msgid "Galeon"
+msgstr "Galeon"
+
+#: src/gtkprefs.c:1305
 msgid "Gnome Default"
 msgstr "Padrão Gnome"
 
-#: src/gtkprefs.c:1269
+#: src/gtkprefs.c:1306
+msgid "Konqueror"
+msgstr "Konqueror"
+
+#: src/gtkprefs.c:1307
+msgid "Mozilla"
+msgstr "Mozilla"
+
+#: src/gtkprefs.c:1308
+msgid "Netscape"
+msgstr "Netscape"
+
+#: src/gtkprefs.c:1309
+msgid "Opera"
+msgstr "Opera"
+
+#: src/gtkprefs.c:1318
 msgid "Manual"
 msgstr "Manual"
 
-#: src/gtkprefs.c:1320
+#: src/gtkprefs.c:1369
 msgid "Browser Selection"
 msgstr "Selecção do Navegador"
 
-#: src/gtkprefs.c:1324
+#: src/gtkprefs.c:1373
 msgid "_Browser:"
 msgstr "_Navegador:"
 
-#: src/gtkprefs.c:1331
+#: src/gtkprefs.c:1380
 msgid "_Open link in:"
 msgstr "_Abrir elo em:"
 
-#: src/gtkprefs.c:1333
+#: src/gtkprefs.c:1382
 msgid "Browser default"
 msgstr "Padrão do navegador"
 
-#: src/gtkprefs.c:1334
+#: src/gtkprefs.c:1383
 msgid "Existing window"
 msgstr "Janela existente"
 
-#: src/gtkprefs.c:1336
+#: src/gtkprefs.c:1385
 msgid "New tab"
 msgstr "Nova aba"
 
-#: src/gtkprefs.c:1350
+#: src/gtkprefs.c:1399
 #, c-format
 msgid ""
 "_Manual:\n"
@@ -3980,83 +4004,83 @@
 "_Manual:\n"
 "(%s para URL)"
 
-#: src/gtkprefs.c:1387
+#: src/gtkprefs.c:1436
 msgid "Message Logs"
 msgstr "Registos de Mensagens"
 
-#: src/gtkprefs.c:1390
+#: src/gtkprefs.c:1439
 msgid "Log _Format:"
 msgstr "_Formato do Registo:"
 
-#: src/gtkprefs.c:1393
+#: src/gtkprefs.c:1442
 msgid "_Log all instant messages"
 msgstr "_Gravar todas as mensagens imediatas"
 
-#: src/gtkprefs.c:1395
+#: src/gtkprefs.c:1444
 msgid "Log all c_hats"
 msgstr "Gravar todos os _chats"
 
-#: src/gtkprefs.c:1398
+#: src/gtkprefs.c:1447
 msgid "System Logs"
 msgstr "Registos do Sistema"
 
-#: src/gtkprefs.c:1400
+#: src/gtkprefs.c:1449
 msgid "_Enable system log"
 msgstr "_Activar registo do sistema"
 
-#: src/gtkprefs.c:1403
+#: src/gtkprefs.c:1452
 msgid "Log when buddies _sign on/sign off"
 msgstr "Registar quando contactos _se ligam/desligam"
 
-#: src/gtkprefs.c:1409
+#: src/gtkprefs.c:1458
 msgid "Log when buddies become _idle/un-idle"
 msgstr "Registar quando contactos se tornam activos/_inactivos"
 
-#: src/gtkprefs.c:1415
+#: src/gtkprefs.c:1464
 msgid "Log when buddies go away/come _back"
 msgstr "Registar quando contactos ficam ausentes/_voltam"
 
-#: src/gtkprefs.c:1421
+#: src/gtkprefs.c:1470
 msgid "Log your _own signons/idleness/awayness"
 msgstr "Registar as suas _próprias ligações/inactividades/ausências"
 
-#: src/gtkprefs.c:1559
+#: src/gtkprefs.c:1596
 msgid "Sound Selection"
 msgstr "Selecção de som"
 
-#: src/gtkprefs.c:1634
+#: src/gtkprefs.c:1647
 msgid "Sound Options"
 msgstr "Opções de Som"
 
-#: src/gtkprefs.c:1635
+#: src/gtkprefs.c:1648
 msgid "Sounds when conversation has _focus"
 msgstr "Sons quando a conversa tem _foco"
 
-#: src/gtkprefs.c:1637
+#: src/gtkprefs.c:1650
 msgid "_Sounds while away"
 msgstr "_Sons enquanto ausente"
 
-#: src/gtkprefs.c:1641
+#: src/gtkprefs.c:1654
 msgid "Sound Method"
 msgstr "Método para reproduzir o som"
 
-#: src/gtkprefs.c:1642
+#: src/gtkprefs.c:1655
 msgid "_Method:"
 msgstr "_Método:"
 
-#: src/gtkprefs.c:1644
+#: src/gtkprefs.c:1657
 msgid "Console beep"
 msgstr "Bip da consola"
 
-#: src/gtkprefs.c:1646
+#: src/gtkprefs.c:1659
 msgid "Automatic"
 msgstr "Automático"
 
-#: src/gtkprefs.c:1653
+#: src/gtkprefs.c:1666
 msgid "Command"
 msgstr "Comando"
 
-#: src/gtkprefs.c:1661
+#: src/gtkprefs.c:1674
 #, c-format
 msgid ""
 "Sound c_ommand:\n"
@@ -4065,86 +4089,86 @@
 "C_omando do som:\n"
 "(%s para nome do ficheiro)"
 
-#: src/gtkprefs.c:1688
+#: src/gtkprefs.c:1701
 msgid "Sound Events"
 msgstr "Acontecimentos de som"
 
-#: src/gtkprefs.c:1739
+#: src/gtkprefs.c:1752
 msgid "Play"
 msgstr "Tocar"
 
-#: src/gtkprefs.c:1746
+#: src/gtkprefs.c:1759
 msgid "Event"
 msgstr "Acontecimento"
 
-#: src/gtkprefs.c:1765
+#: src/gtkprefs.c:1778
 msgid "Test"
 msgstr "Testar"
 
-#: src/gtkprefs.c:1769
+#: src/gtkprefs.c:1782
 msgid "Reset"
 msgstr "Redefinir"
 
-#: src/gtkprefs.c:1773
+#: src/gtkprefs.c:1786
 msgid "Choose..."
 msgstr "Escolher..."
 
-#: src/gtkprefs.c:1797
+#: src/gtkprefs.c:1810
 msgid "_Queue new messages when away"
 msgstr "_Ocultar novas mensagens quando ausente"
 
-#: src/gtkprefs.c:1800
+#: src/gtkprefs.c:1813
 msgid "Auto-response"
 msgstr "Auto-resposta"
 
-#: src/gtkprefs.c:1801
+#: src/gtkprefs.c:1814
 msgid "_Send auto-response"
 msgstr "Enviar _auto-resposta"
 
-#: src/gtkprefs.c:1803
+#: src/gtkprefs.c:1816
 msgid "_Only send auto-response when idle"
 msgstr "Enviar auto-resposta apenas quando _inactivo"
 
-#: src/gtkprefs.c:1806 src/protocols/msn/msn.c:1156
-#: src/protocols/msn/state.c:32 src/protocols/novell/novell.c:2724
-#: src/protocols/oscar/oscar.c:3994 src/protocols/yahoo/yahoo.c:2488
-#: src/protocols/yahoo/yahoo_profile.c:653
+#: src/gtkprefs.c:1819 src/protocols/msn/msn.c:1179
+#: src/protocols/msn/state.c:32 src/protocols/novell/novell.c:2730
+#: src/protocols/oscar/oscar.c:4010 src/protocols/yahoo/yahoo.c:2511
+#: src/protocols/yahoo/yahoo_profile.c:664
 msgid "Idle"
 msgstr "Inactivo"
 
-#: src/gtkprefs.c:1807
+#: src/gtkprefs.c:1820
 msgid "Idle _time reporting:"
 msgstr "Relatório de _tempo de inactividade:"
 
-#: src/gtkprefs.c:1810
+#: src/gtkprefs.c:1823
 msgid "Gaim usage"
 msgstr "Utilização do Gaim"
 
-#: src/gtkprefs.c:1813
+#: src/gtkprefs.c:1826
 msgid "X usage"
 msgstr "Utilização do X"
 
-#: src/gtkprefs.c:1815
+#: src/gtkprefs.c:1828
 msgid "Windows usage"
 msgstr "Utilização do Windows"
 
-#: src/gtkprefs.c:1823
+#: src/gtkprefs.c:1836
 msgid "Auto-away"
 msgstr "Ausência Automática"
 
-#: src/gtkprefs.c:1824
+#: src/gtkprefs.c:1837
 msgid "Set away _when idle"
 msgstr "Definir estado de 'Ausente' _quando inactivo"
 
-#: src/gtkprefs.c:1828
+#: src/gtkprefs.c:1841
 msgid "_Minutes before setting away:"
 msgstr "_Minutos antes de definir 'Ausente':"
 
-#: src/gtkprefs.c:1836
+#: src/gtkprefs.c:1849
 msgid "Away m_essage:"
 msgstr "Men_sagem de ausência:"
 
-#: src/gtkprefs.c:1917
+#: src/gtkprefs.c:1930
 #, c-format
 msgid ""
 "<span size=\"larger\">%s %s</span>\n"
@@ -4159,7 +4183,7 @@
 "<span weight=\"bold\">Página da web:</span>\t\t%s\n"
 "<span weight=\"bold\">Nome do ficheiro:</span>\t%s"
 
-#: src/gtkprefs.c:1922
+#: src/gtkprefs.c:1935
 #, c-format
 msgid ""
 "<span size=\"larger\">%s %s</span>\n"
@@ -4174,64 +4198,64 @@
 "<span weight=\"bold\">URL:</span>  %s\n"
 "<span weight=\"bold\">Nome do ficheiro:</span>  %s"
 
-#: src/gtkprefs.c:2155
+#: src/gtkprefs.c:2168
 msgid "Load"
 msgstr "Carregar"
 
-#: src/gtkprefs.c:2169
+#: src/gtkprefs.c:2182
 msgid "Summary"
 msgstr "Sumário"
 
-#: src/gtkprefs.c:2217
+#: src/gtkprefs.c:2230
 msgid "Details"
 msgstr "Detalhes"
 
-#: src/gtkprefs.c:2362
+#: src/gtkprefs.c:2375
 msgid "_Edit"
 msgstr "_Editar"
 
-#: src/gtkprefs.c:2398
+#: src/gtkprefs.c:2411
 msgid "Interface"
 msgstr "Interface"
 
-#: src/gtkprefs.c:2401
+#: src/gtkprefs.c:2414
 msgid "Message Text"
 msgstr "Texto das mensagens"
 
-#: src/gtkprefs.c:2402
+#: src/gtkprefs.c:2415
 msgid "Shortcuts"
 msgstr "Atalhos"
 
-#: src/gtkprefs.c:2403
+#: src/gtkprefs.c:2416
 msgid "Smiley Themes"
 msgstr "Temas de Smiley"
 
-#: src/gtkprefs.c:2404
+#: src/gtkprefs.c:2417
 msgid "Sounds"
 msgstr "Sons"
 
-#: src/gtkprefs.c:2405
+#: src/gtkprefs.c:2418
 msgid "Network"
 msgstr "Rede"
 
 #. We use the registered default browser in windows
-#: src/gtkprefs.c:2408
+#: src/gtkprefs.c:2421
 msgid "Browser"
 msgstr "Navegador"
 
-#: src/gtkprefs.c:2410
+#: src/gtkprefs.c:2423
 msgid "Logging"
 msgstr "Registos"
 
-#: src/gtkprefs.c:2411
+#: src/gtkprefs.c:2424
 msgid "Away / Idle"
 msgstr "Ausente / Inactivo"
 
-#: src/gtkprefs.c:2412
+#: src/gtkprefs.c:2425
 msgid "Away Messages"
 msgstr "Mensagens de ausência"
 
-#: src/gtkprefs.c:2415
+#: src/gtkprefs.c:2428
 msgid "Plugins"
 msgstr "Plugins"
 
@@ -4255,7 +4279,7 @@
 msgid "Block only the users below"
 msgstr "Bloquear apenas os utilizadores abaixo"
 
-#: src/gtkprivacy.c:385 src/protocols/jabber/jabber.c:1448
+#: src/gtkprivacy.c:385 src/protocols/jabber/jabber.c:1449
 msgid "Privacy"
 msgstr "Privacidade"
 
@@ -4321,27 +4345,43 @@
 #. *
 #. * A wrapper for gaim_request_action() that uses Yes and No buttons.
 #.
-#: src/gtkrequest.c:233 src/protocols/gg/gg.c:867
-#: src/protocols/novell/novell.c:1844 src/protocols/silc/buddy.c:307
-#: src/protocols/silc/pk.c:116 src/request.h:1233
+#: src/gtkrequest.c:240 src/protocols/gg/gg.c:949
+#: src/protocols/novell/novell.c:1845 src/protocols/silc/buddy.c:307
+#: src/protocols/silc/pk.c:116 src/request.h:1234
 msgid "Yes"
 msgstr "Sim"
 
-#: src/gtkrequest.c:234 src/protocols/gg/gg.c:867
-#: src/protocols/novell/novell.c:1845 src/protocols/silc/buddy.c:308
-#: src/protocols/silc/pk.c:117 src/request.h:1233
+#: src/gtkrequest.c:241 src/protocols/gg/gg.c:949
+#: src/protocols/novell/novell.c:1846 src/protocols/silc/buddy.c:308
+#: src/protocols/silc/pk.c:117 src/request.h:1234
 msgid "No"
 msgstr "Não"
 
-#: src/gtkrequest.c:237
+#: src/gtkrequest.c:244
 msgid "Apply"
 msgstr "Aplicar"
 
-#: src/gtkrequest.c:238 src/protocols/msn/msn.c:316
-#: src/protocols/silc/util.c:311
+#: src/gtkrequest.c:245 src/protocols/msn/msn.c:314
+#: src/protocols/silc/util.c:332
 msgid "Close"
 msgstr "Fechar"
 
+#: src/gtkrequest.c:1391
+msgid "That file already exists"
+msgstr "Esse ficheiro já existe"
+
+#: src/gtkrequest.c:1392
+msgid "Would you like to overwrite it?"
+msgstr "Deseja gravar por cima?"
+
+#: src/gtkrequest.c:1430 src/gtkrequest.c:1451
+msgid "Save File..."
+msgstr "Guardar Ficheiro..."
+
+#: src/gtkrequest.c:1431 src/gtkrequest.c:1452
+msgid "Open File..."
+msgstr "Abrir Ficheiro..."
+
 #: src/gtkroomlist.c:330
 msgid "Room List"
 msgstr "Lista de Salas"
@@ -4413,24 +4453,16 @@
 "Não foi possível tocar o som porque o comando de som configurado não pôde "
 "ser executado: %s"
 
-#: src/gtkutils.c:149
-msgid "Can't save icon file to disk."
-msgstr "Impossível guardar ficheiro de ícone no disco."
-
-#: src/gtkutils.c:184
-msgid "Save Icon"
-msgstr "Guardar Ícone"
-
 #: src/log.c:106
 msgid "<b><font color=\"red\">The logger has no read function</font></b>"
 msgstr ""
 "<b><font color=\"red\">O \"logger\" não tem função de leitura</font></b>"
 
-#: src/log.c:486
+#: src/log.c:489
 msgid "XML"
 msgstr "XML"
 
-#: src/log.c:571
+#: src/log.c:574
 #, c-format
 msgid ""
 "<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
@@ -4439,7 +4471,7 @@
 "<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;RESPOSTA-"
 "AUTOMATICA&gt;:</b></font> %s<br/>\n"
 
-#: src/log.c:573
+#: src/log.c:576
 #, c-format
 msgid ""
 "<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
@@ -4448,26 +4480,26 @@
 "<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;RESPOSTA-"
 "AUTOMATICA&gt;:</b></font> %s<br/>\n"
 
-#: src/log.c:624 src/log.c:811
+#: src/log.c:627 src/log.c:814
 msgid "<font color=\"red\"><b>Unable to find log path!</b></font>"
 msgstr ""
 "<font color=\"red\"><b>Impossível encontrar \"path\" do log!</b></font>"
 
-#: src/log.c:634 src/log.c:823
+#: src/log.c:637 src/log.c:826
 #, c-format
 msgid "<font color=\"red\"><b>Could not read file: %s</b></font>"
 msgstr "<font color=\"red\"><b>Impossível ler ficheiro: %s</b></font>"
 
-#: src/log.c:671
+#: src/log.c:674
 msgid "HTML"
 msgstr "HTML"
 
-#: src/log.c:756
+#: src/log.c:759
 #, c-format
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr "(%s) %s <RESPOSTA-AUTOMATICA>: %s\n"
 
-#: src/log.c:856
+#: src/log.c:859
 msgid "Plain text"
 msgstr "Texto corrido"
 
@@ -4561,12 +4593,12 @@
 msgstr "Padrão um pouco menos chato"
 
 #: src/protocols/gg/gg.c:49 src/protocols/jabber/jutil.c:44
-#: src/protocols/msn/msn.c:465 src/protocols/msn/state.c:29
+#: src/protocols/msn/msn.c:462 src/protocols/msn/state.c:29
 #: src/protocols/msn/state.c:30 src/protocols/msn/state.c:37
-#: src/protocols/msn/state.c:38 src/protocols/novell/novell.c:2715
-#: src/protocols/novell/novell.c:2834 src/protocols/novell/novell.c:2885
-#: src/protocols/oscar/oscar.c:611 src/protocols/yahoo/yahoo.c:2844
-#: src/protocols/yahoo/yahoo.c:2959
+#: src/protocols/msn/state.c:38 src/protocols/novell/novell.c:2721
+#: src/protocols/novell/novell.c:2840 src/protocols/novell/novell.c:2891
+#: src/protocols/oscar/oscar.c:616 src/protocols/yahoo/yahoo.c:2851
+#: src/protocols/yahoo/yahoo.c:2967
 msgid "Available"
 msgstr "Disponível"
 
@@ -4578,12 +4610,12 @@
 msgid "Away for friends only"
 msgstr "Ausente apenas para amigos"
 
-#: src/protocols/gg/gg.c:53 src/protocols/jabber/jabber.c:963
-#: src/protocols/jabber/presence.c:126 src/protocols/oscar/oscar.c:532
-#: src/protocols/oscar/oscar.c:5378 src/protocols/oscar/oscar.c:5456
-#: src/protocols/oscar/oscar.c:5480 src/protocols/oscar/oscar.c:6667
-#: src/protocols/oscar/oscar.c:6672 src/protocols/yahoo/yahoo.c:2486
-#: src/protocols/yahoo/yahoo.c:2864 src/protocols/yahoo/yahoo.c:2969
+#: src/protocols/gg/gg.c:53 src/protocols/jabber/jabber.c:964
+#: src/protocols/jabber/presence.c:126 src/protocols/oscar/oscar.c:536
+#: src/protocols/oscar/oscar.c:5394 src/protocols/oscar/oscar.c:5472
+#: src/protocols/oscar/oscar.c:5496 src/protocols/oscar/oscar.c:6684
+#: src/protocols/oscar/oscar.c:6689 src/protocols/yahoo/yahoo.c:2509
+#: src/protocols/yahoo/yahoo.c:2871 src/protocols/yahoo/yahoo.c:2979
 msgid "Invisible"
 msgstr "Invisível"
 
@@ -4599,14 +4631,14 @@
 msgid "Unable to resolve hostname."
 msgstr "Impossível resolver endereço."
 
-#: src/protocols/gg/gg.c:139 src/protocols/novell/novell.c:1664
+#: src/protocols/gg/gg.c:139 src/protocols/novell/novell.c:1665
 msgid "Unable to connect to server."
 msgstr "Impossível ligar ao servidor."
 
 #: src/protocols/gg/gg.c:142 src/protocols/jabber/auth.c:130
 #: src/protocols/jabber/auth.c:204 src/protocols/jabber/auth.c:354
 #: src/protocols/jabber/auth.c:452 src/protocols/jabber/auth.c:464
-#: src/protocols/jabber/jabber.c:105
+#: src/protocols/jabber/jabber.c:106
 msgid "Invalid response from server."
 msgstr "O servidor retornou uma resposta inválida."
 
@@ -4626,176 +4658,178 @@
 msgid "Unknown Error Code."
 msgstr "Código de erro desconhecido."
 
-#: src/protocols/gg/gg.c:253
+#: src/protocols/gg/gg.c:242 src/protocols/oscar/oscar.c:3819
+#, c-format
+msgid "<B>UIN:</B> %s<BR><B>Status:</B> %s<HR>%s"
+msgstr "<B>UIN:</B> %s<BR><B>Estado:</B> %s<HR>%s"
+
+#. res[0] == username
+#: src/protocols/gg/gg.c:243 src/protocols/gg/gg.c:1011
+#: src/protocols/napster/napster.c:393 src/protocols/oscar/oscar.c:3823
+#: src/protocols/oscar/oscar.c:4039 src/protocols/silc/ops.c:1067
+#: src/protocols/silc/ops.c:1128 src/protocols/toc/toc.c:468
+#: src/protocols/zephyr/zephyr.c:635
+msgid "Buddy Information"
+msgstr "Informações de Contacto"
+
+#: src/protocols/gg/gg.c:293
 #, c-format
 msgid "Status: %s"
 msgstr "Estado: %s"
 
-#: src/protocols/gg/gg.c:406
+#: src/protocols/gg/gg.c:446
 msgid "Could not connect"
 msgstr "Não foi possível ligar"
 
-#: src/protocols/gg/gg.c:413
+#: src/protocols/gg/gg.c:453
 msgid "Unable to read socket"
 msgstr "Impossível ler do socket"
 
 #. we didn't successfully connect. tdt->toc_fd is valid here
-#: src/protocols/gg/gg.c:600 src/protocols/icq/gaim_icq.c:344
+#: src/protocols/gg/gg.c:674 src/protocols/icq/gaim_icq.c:344
 #: src/protocols/napster/napster.c:475 src/protocols/napster/napster.c:506
-#: src/protocols/toc/toc.c:170 src/protocols/yahoo/yahoo.c:2124
-#: src/protocols/yahoo/yahoo.c:2155 src/protocols/yahoo/yahoo.c:2218
+#: src/protocols/toc/toc.c:170 src/protocols/yahoo/yahoo.c:2156
+#: src/protocols/yahoo/yahoo.c:2185 src/protocols/yahoo/yahoo.c:2248
 #: src/protocols/yahoo/yahoo_filexfer.c:68
 #: src/protocols/yahoo/yahoo_filexfer.c:109
 msgid "Unable to connect."
 msgstr "Impossível ligar."
 
-#: src/protocols/gg/gg.c:616
+#: src/protocols/gg/gg.c:690
 msgid "Reading data"
 msgstr "Lendo dados"
 
-#: src/protocols/gg/gg.c:619
+#: src/protocols/gg/gg.c:693
 msgid "Balancer handshake"
 msgstr "Negociação de balanceador"
 
-#: src/protocols/gg/gg.c:622
+#: src/protocols/gg/gg.c:696
 msgid "Reading server key"
 msgstr "Lendo a chave do servidor"
 
-#: src/protocols/gg/gg.c:625
+#: src/protocols/gg/gg.c:699
 msgid "Exchanging key hash"
 msgstr "Trocando hash das chaves"
 
-#: src/protocols/gg/gg.c:635
+#: src/protocols/gg/gg.c:709
 msgid "Critical error in GG library\n"
 msgstr "Erro crítico na biblioteca do GG\n"
 
-#: src/protocols/gg/gg.c:653 src/protocols/gg/gg.c:744
+#: src/protocols/gg/gg.c:727 src/protocols/gg/gg.c:818
 #: src/protocols/toc/toc.c:146
 #, c-format
 msgid "Connect to %s failed"
 msgstr "Ligação para %s falhou"
 
-#: src/protocols/gg/gg.c:701
+#: src/protocols/gg/gg.c:775
 msgid "Unable to ping server"
 msgstr "Impossível pingar servidor"
 
-#: src/protocols/gg/gg.c:713
+#: src/protocols/gg/gg.c:787
 msgid "Send as message"
 msgstr "Enviar como mensagem"
 
-#: src/protocols/gg/gg.c:718
+#: src/protocols/gg/gg.c:792
 msgid "Looking up GG server"
 msgstr "Procurando servidor GG"
 
-#: src/protocols/gg/gg.c:721
+#: src/protocols/gg/gg.c:795
 msgid "Invalid Gadu-Gadu UIN specified"
 msgstr "UIN Gadu-Gadu inválido especificado"
 
-#: src/protocols/gg/gg.c:768
+#: src/protocols/gg/gg.c:842
 msgid "You are trying to send a message to an invalid Gadu-Gadu UIN."
 msgstr "Está a tentar enviar uma mensagem para um UIN Gadu-Gadu inválido."
 
-#: src/protocols/gg/gg.c:835
+#: src/protocols/gg/gg.c:917
 msgid "Couldn't get search results"
 msgstr "Não foi possível receber os resultados da procura"
 
-#: src/protocols/gg/gg.c:840
+#: src/protocols/gg/gg.c:922
 msgid "Gadu-Gadu Search Engine"
 msgstr "Mecanismo de busca do Gadu-Gadu"
 
-#: src/protocols/gg/gg.c:866
+#: src/protocols/gg/gg.c:948
 msgid "Active"
 msgstr "Activo"
 
-#: src/protocols/gg/gg.c:871 src/protocols/oscar/oscar.c:4829
+#: src/protocols/gg/gg.c:953 src/protocols/oscar/oscar.c:4845
 msgid "UIN"
 msgstr "UIN"
 
 #. First Name
-#: src/protocols/gg/gg.c:875 src/protocols/jabber/jabber.c:612
-#: src/protocols/oscar/oscar.c:4840 src/protocols/silc/ops.c:774
+#: src/protocols/gg/gg.c:957 src/protocols/jabber/jabber.c:613
+#: src/protocols/oscar/oscar.c:4856 src/protocols/silc/ops.c:790
 #: src/protocols/trepia/trepia.c:267
 msgid "First Name"
 msgstr "Primeiro Nome"
 
 #. Last Name
-#: src/protocols/gg/gg.c:880 src/protocols/jabber/jabber.c:617
-#: src/protocols/oscar/oscar.c:4841 src/protocols/trepia/trepia.c:274
+#: src/protocols/gg/gg.c:962 src/protocols/jabber/jabber.c:618
+#: src/protocols/oscar/oscar.c:4857 src/protocols/trepia/trepia.c:274
 msgid "Last Name"
 msgstr "Último Nome"
 
-#: src/protocols/gg/gg.c:884 src/protocols/gg/gg.c:1623
-#: src/protocols/irc/msgs.c:183 src/protocols/oscar/oscar.c:4830
+#: src/protocols/gg/gg.c:966 src/protocols/gg/gg.c:1707
+#: src/protocols/irc/msgs.c:183 src/protocols/oscar/oscar.c:4846
+#: src/protocols/silc/ops.c:1184
 msgid "Nick"
 msgstr "Nome"
 
-#: src/protocols/gg/gg.c:891 src/protocols/gg/gg.c:894
+#: src/protocols/gg/gg.c:973 src/protocols/gg/gg.c:976
 msgid "Birth Year"
 msgstr "Ano de Nascimento"
 
-#: src/protocols/gg/gg.c:900 src/protocols/gg/gg.c:902
-#: src/protocols/gg/gg.c:904
+#: src/protocols/gg/gg.c:982 src/protocols/gg/gg.c:984
+#: src/protocols/gg/gg.c:986
 msgid "Sex"
 msgstr "Sexo"
 
 #. City
-#: src/protocols/gg/gg.c:908 src/protocols/jabber/jabber.c:627
-#: src/protocols/oscar/oscar.c:4884 src/protocols/oscar/oscar.c:4892
+#: src/protocols/gg/gg.c:990 src/protocols/jabber/jabber.c:628
+#: src/protocols/oscar/oscar.c:4900 src/protocols/oscar/oscar.c:4908
 #: src/protocols/trepia/trepia.c:331 src/protocols/trepia/trepia.c:410
 msgid "City"
 msgstr "Cidade"
 
-#. res[0] == username
-#. show it to the user
-#: src/protocols/gg/gg.c:929 src/protocols/msn/msn.c:1225
-#: src/protocols/msn/msn.c:1533 src/protocols/msn/msn.c:1549
-#: src/protocols/napster/napster.c:393 src/protocols/oscar/oscar.c:3807
-#: src/protocols/oscar/oscar.c:4023 src/protocols/toc/toc.c:468
-#: src/protocols/yahoo/yahoo_profile.c:748
-#: src/protocols/yahoo/yahoo_profile.c:785
-#: src/protocols/yahoo/yahoo_profile.c:837
-#: src/protocols/yahoo/yahoo_profile.c:1132 src/protocols/zephyr/zephyr.c:610
-msgid "Buddy Information"
-msgstr "Informações de Contacto"
-
-#: src/protocols/gg/gg.c:951
+#: src/protocols/gg/gg.c:1033
 msgid "There is no Buddy List stored on the Gadu-Gadu server."
 msgstr "Não há lista de contactos gravada neste servidor Gadu-Gadu."
 
-#: src/protocols/gg/gg.c:959
+#: src/protocols/gg/gg.c:1041
 msgid "Couldn't Import Buddy List from Server"
 msgstr "Não foi possível importar lista de contactos do servidor"
 
-#: src/protocols/gg/gg.c:1021
+#: src/protocols/gg/gg.c:1103
 msgid "Buddy List successfully transferred to Gadu-Gadu server"
 msgstr "Lista de contactos transferida para o servidor Gadu-Gadu com sucesso"
 
-#: src/protocols/gg/gg.c:1029
+#: src/protocols/gg/gg.c:1111
 msgid "Couldn't transfer Buddy List to Gadu-Gadu server"
 msgstr ""
 "Não foi possível transferir a lista de contactos para o servidor Gadu-Gadu"
 
-#: src/protocols/gg/gg.c:1037
+#: src/protocols/gg/gg.c:1119
 msgid "Buddy List successfully deleted from Gadu-Gadu server"
 msgstr "Lista de contactos removida do servidor Gadu-Gadu com sucesso"
 
-#: src/protocols/gg/gg.c:1045
+#: src/protocols/gg/gg.c:1127
 msgid "Couldn't delete Buddy List from Gadu-Gadu server"
 msgstr "Não foi possível apagar a lista de contactos do servidor Gadu-Gadu"
 
-#: src/protocols/gg/gg.c:1054
+#: src/protocols/gg/gg.c:1136
 msgid "Password changed successfully"
 msgstr "Senha alterada com sucesso"
 
-#: src/protocols/gg/gg.c:1061
+#: src/protocols/gg/gg.c:1143
 msgid "Password couldn't be changed"
 msgstr "Não foi possível alterar a senha"
 
-#: src/protocols/gg/gg.c:1180
+#: src/protocols/gg/gg.c:1262
 msgid "Error communicating with Gadu-Gadu server"
 msgstr "Erro na comunicação com o servidor Gadu-Gadu"
 
-#: src/protocols/gg/gg.c:1181
+#: src/protocols/gg/gg.c:1263
 msgid ""
 "Gaim was unable to complete your request due to a problem communicating with "
 "the Gadu-Gadu HTTP server.  Please try again later."
@@ -4803,11 +4837,11 @@
 "O Gaim não pôde completar o seu pedido devido a um problema ao comunicar com "
 "o servidor HTTP do Gadu-Gadu. Por favor tente de novo mais tarde."
 
-#: src/protocols/gg/gg.c:1210
+#: src/protocols/gg/gg.c:1292
 msgid "Unable to import Gadu-Gadu buddy list"
 msgstr "Impossível importar lista de contactos Gadu-Gadu"
 
-#: src/protocols/gg/gg.c:1211
+#: src/protocols/gg/gg.c:1293
 msgid ""
 "Gaim was unable to connect to the Gadu-Gadu buddy list server.  Please try "
 "again later."
@@ -4815,26 +4849,26 @@
 "O Gaim não pôde ligar ao servidor da lista de contactos do Gadu-Gadu. Por "
 "favor tente de novo mais tarde."
 
-#: src/protocols/gg/gg.c:1284
+#: src/protocols/gg/gg.c:1366
 msgid "Couldn't export buddy list"
 msgstr "Impossível exportar lista de contactos"
 
-#: src/protocols/gg/gg.c:1285 src/protocols/gg/gg.c:1308
+#: src/protocols/gg/gg.c:1367 src/protocols/gg/gg.c:1390
 msgid ""
 "Gaim was unable to connect to the buddy list server.  Please try again later."
 msgstr ""
 "O Gaim não pôde ligar com o servidor da lista de contactos do Gadu-Gadu. Por "
 "favor tente de novo mais tarde."
 
-#: src/protocols/gg/gg.c:1307
+#: src/protocols/gg/gg.c:1389
 msgid "Unable to delete Gadu-Gadu buddy list"
 msgstr "Impossível apagar a lista de contactos do Gadu-Gadu"
 
-#: src/protocols/gg/gg.c:1358
+#: src/protocols/gg/gg.c:1440
 msgid "Unable to access directory"
 msgstr "Impossível aceder ao directório"
 
-#: src/protocols/gg/gg.c:1359
+#: src/protocols/gg/gg.c:1441
 msgid ""
 "Gaim was unable to search the Directory because it was unable to connect to "
 "the directory server.  Please try again later."
@@ -4842,11 +4876,11 @@
 "O Gaim não pôde pesquisar o Directório porque não conseguiu ligar ao "
 "servidor de directório. Por favor tente de novo mais tarde."
 
-#: src/protocols/gg/gg.c:1393
+#: src/protocols/gg/gg.c:1475
 msgid "Unable to change Gadu-Gadu password"
 msgstr "Impossível alterar a senha do Gadu-Gadu"
 
-#: src/protocols/gg/gg.c:1394
+#: src/protocols/gg/gg.c:1476
 msgid ""
 "Gaim was unable to change your password due to an error connecting to the "
 "Gadu-Gadu server.  Please try again later."
@@ -4854,33 +4888,33 @@
 "O Gaim não pôde alterar a senha devido a um erro ao ligar ao servidor Gadu- "
 "Gadu. Por favor tente de novo mais tarde."
 
-#: src/protocols/gg/gg.c:1410
+#: src/protocols/gg/gg.c:1492
 msgid "Directory Search"
 msgstr "Pesquisa de directório"
 
 #. if (js->protocol_options & CHANGE_PASSWORD) {
-#: src/protocols/gg/gg.c:1415 src/protocols/jabber/jabber.c:1061
+#: src/protocols/gg/gg.c:1497 src/protocols/jabber/jabber.c:1062
 #: src/protocols/toc/toc.c:1550
 msgid "Change Password"
 msgstr "Alterar senha"
 
-#: src/protocols/gg/gg.c:1419
+#: src/protocols/gg/gg.c:1501
 msgid "Import Buddy List from Server"
 msgstr "Importar lista de contactos do servidor"
 
-#: src/protocols/gg/gg.c:1423
+#: src/protocols/gg/gg.c:1505
 msgid "Export Buddy List to Server"
 msgstr "Exportar lista de contactos para o servidor"
 
-#: src/protocols/gg/gg.c:1427
+#: src/protocols/gg/gg.c:1509
 msgid "Delete Buddy List from Server"
 msgstr "Apagar lista de contactos do servidor"
 
-#: src/protocols/gg/gg.c:1460
+#: src/protocols/gg/gg.c:1542
 msgid "Unable to access user profile."
 msgstr "Impossível aceder perfil do utilizador."
 
-#: src/protocols/gg/gg.c:1461
+#: src/protocols/gg/gg.c:1543
 msgid ""
 "Gaim was unable to access this user's profile due to an error connecting to "
 "the directory server.  Please try again later."
@@ -4899,7 +4933,7 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/gg/gg.c:1602 src/protocols/gg/gg.c:1604
+#: src/protocols/gg/gg.c:1686 src/protocols/gg/gg.c:1688
 msgid "Gadu-Gadu Protocol Plugin"
 msgstr "Plugin do protocolo Gadu-Gadu"
 
@@ -4913,14 +4947,14 @@
 msgstr "O utilizador %s (%s%s%s%s%s) quer que o autorize."
 
 #: src/protocols/icq/gaim_icq.c:297 src/protocols/jabber/presence.c:232
-#: src/protocols/msn/userlist.c:100 src/protocols/oscar/oscar.c:3538
-#: src/protocols/oscar/oscar.c:6100
+#: src/protocols/msn/userlist.c:100 src/protocols/oscar/oscar.c:3554
+#: src/protocols/oscar/oscar.c:6117
 msgid "Authorize"
 msgstr "Autorizar"
 
 #: src/protocols/icq/gaim_icq.c:297 src/protocols/jabber/presence.c:233
-#: src/protocols/msn/userlist.c:101 src/protocols/oscar/oscar.c:3540
-#: src/protocols/oscar/oscar.c:6101
+#: src/protocols/msn/userlist.c:101 src/protocols/oscar/oscar.c:3556
+#: src/protocols/oscar/oscar.c:6118
 msgid "Deny"
 msgstr "Negar"
 
@@ -4940,17 +4974,19 @@
 msgid "Gaim User"
 msgstr "Utilizador Gaim"
 
-#: src/protocols/irc/cmds.c:43
+#: src/protocols/irc/cmds.c:43 src/protocols/silc/silc.c:1286
 #, c-format
 msgid "Unknown command: %s"
 msgstr "Comando desconhecido: %s"
 
-#: src/protocols/irc/cmds.c:444 src/protocols/jabber/chat.c:544
+#: src/protocols/irc/cmds.c:448 src/protocols/jabber/chat.c:544
+#: src/protocols/silc/silc.c:995
 #, c-format
 msgid "current topic is: %s"
 msgstr "O tópico actual é: %s"
 
-#: src/protocols/irc/cmds.c:447 src/protocols/jabber/chat.c:546
+#: src/protocols/irc/cmds.c:451 src/protocols/jabber/chat.c:546
+#: src/protocols/silc/silc.c:998
 msgid "No topic is set"
 msgstr "Nenhum tópico foi definido"
 
@@ -4982,54 +5018,51 @@
 msgid "MOTD for %s"
 msgstr "MOTD de %s"
 
-#: src/protocols/irc/irc.c:141
+#: src/protocols/irc/irc.c:93 src/protocols/irc/irc.c:373
+msgid "Server has disconnected"
+msgstr "O servidor desligou"
+
+#: src/protocols/irc/irc.c:147
 msgid "View MOTD"
 msgstr "Ver MOTD"
 
-#. FIXME: remove this when the ui does it for us.
-#: src/protocols/irc/irc.c:168 src/protocols/jabber/buddy.c:928
-#: src/protocols/msn/msn.c:543 src/protocols/oscar/oscar.c:448
-#: src/protocols/oscar/oscar.c:6771 src/protocols/yahoo/yahoo.c:2691
-msgid "Send File"
-msgstr "Enviar"
-
-#: src/protocols/irc/irc.c:182 src/protocols/silc/chat.c:32
+#: src/protocols/irc/irc.c:169 src/protocols/silc/chat.c:32
 msgid "_Channel:"
 msgstr "_Canal:"
 
-#: src/protocols/irc/irc.c:187 src/protocols/jabber/chat.c:59
+#: src/protocols/irc/irc.c:174 src/protocols/jabber/chat.c:59
 msgid "_Password:"
 msgstr "_Senha:"
 
-#: src/protocols/irc/irc.c:207
+#: src/protocols/irc/irc.c:194
 msgid "IRC nicks may not contain whitespace"
 msgstr "Nomes de IRC não podem conter espaços em branco"
 
-#: src/protocols/irc/irc.c:226 src/protocols/toc/toc.c:198
+#: src/protocols/irc/irc.c:213 src/protocols/toc/toc.c:198
 #, c-format
 msgid "Signon: %s"
 msgstr "Ligando: %s"
 
-#: src/protocols/irc/irc.c:235
+#: src/protocols/irc/irc.c:222
 msgid "Couldn't create socket"
 msgstr "Impossível criar socket"
 
-#: src/protocols/irc/irc.c:250 src/protocols/jabber/jabber.c:296
-#: src/protocols/oscar/oscar.c:1523 src/protocols/oscar/oscar.c:1587
+#: src/protocols/irc/irc.c:237 src/protocols/jabber/jabber.c:297
+#: src/protocols/oscar/oscar.c:1529 src/protocols/oscar/oscar.c:1593
 msgid "Couldn't connect to host"
 msgstr "Não foi possível ligar ao host"
 
-#: src/protocols/irc/irc.c:387 src/protocols/trepia/trepia.c:926
+#: src/protocols/irc/irc.c:370 src/protocols/trepia/trepia.c:926
 msgid "Read error"
 msgstr "Erro de leitura"
 
-#: src/protocols/irc/irc.c:538 src/protocols/silc/chat.c:1343
-#: src/protocols/yahoo/yahoochat.c:1341
+#: src/protocols/irc/irc.c:521 src/protocols/silc/chat.c:1363
+#: src/protocols/yahoo/yahoochat.c:1380
 msgid "Users"
 msgstr "Utilizadores"
 
-#: src/protocols/irc/irc.c:541 src/protocols/silc/chat.c:1346
-#: src/protocols/silc/ops.c:1017 src/protocols/yahoo/yahoochat.c:1350
+#: src/protocols/irc/irc.c:524 src/protocols/silc/chat.c:1366
+#: src/protocols/silc/ops.c:1146 src/protocols/yahoo/yahoochat.c:1389
 msgid "Topic"
 msgstr "Tópico"
 
@@ -5042,34 +5075,35 @@
 #. *< id
 #. *< name
 #. *< version
-#: src/protocols/irc/irc.c:643
+#: src/protocols/irc/irc.c:628
 msgid "IRC Protocol Plugin"
 msgstr "Plugin do protocolo IRC"
 
 #. *  summary
-#: src/protocols/irc/irc.c:644
+#: src/protocols/irc/irc.c:629
 msgid "The IRC Protocol Plugin that Sucks Less"
 msgstr "O plugin do protocolo IRC que é menos mau"
 
-#: src/protocols/irc/irc.c:663 src/protocols/irc/msgs.c:197
-#: src/protocols/jabber/jabber.c:1556 src/protocols/napster/napster.c:642
-#: src/protocols/silc/ops.c:935
+#: src/protocols/irc/irc.c:648 src/protocols/irc/msgs.c:197
+#: src/protocols/jabber/jabber.c:1559 src/protocols/napster/napster.c:644
+#: src/protocols/silc/ops.c:1008 src/protocols/silc/ops.c:1110
 msgid "Server"
 msgstr "Servidor"
 
-#: src/protocols/irc/irc.c:666 src/protocols/jabber/jabber.c:1577
-#: src/protocols/msn/msn.c:1729 src/protocols/napster/napster.c:647
-#: src/protocols/silc/silc.c:1363 src/protocols/trepia/trepia.c:1295
+#: src/protocols/irc/irc.c:651 src/protocols/jabber/jabber.c:1580
+#: src/protocols/msn/msn.c:1758 src/protocols/napster/napster.c:649
+#: src/protocols/silc/silc.c:1576 src/protocols/trepia/trepia.c:1297
 msgid "Port"
 msgstr "Porta"
 
-#: src/protocols/irc/irc.c:669 src/protocols/zephyr/zephyr.c:1442
+#: src/protocols/irc/irc.c:654 src/protocols/zephyr/zephyr.c:1915
 msgid "Encoding"
 msgstr "Codificação"
 
-#: src/protocols/irc/irc.c:672 src/protocols/irc/msgs.c:191
-#: src/protocols/jabber/jabber.c:587 src/protocols/silc/buddy.c:1449
-#: src/protocols/silc/ops.c:931
+#: src/protocols/irc/irc.c:657 src/protocols/irc/msgs.c:191
+#: src/protocols/jabber/jabber.c:588 src/protocols/silc/buddy.c:1445
+#: src/protocols/silc/ops.c:955 src/protocols/silc/ops.c:957
+#: src/protocols/silc/ops.c:1104 src/protocols/silc/ops.c:1106
 msgid "Username"
 msgstr "Nome do utilizador"
 
@@ -5094,12 +5128,12 @@
 msgid " <i>(identified)</i>"
 msgstr " <i>(identificado)</i>"
 
-#: src/protocols/irc/msgs.c:192 src/protocols/silc/ops.c:929
-#: src/protocols/yahoo/yahoo_profile.c:1000
+#: src/protocols/irc/msgs.c:192 src/protocols/silc/ops.c:949
+#: src/protocols/silc/ops.c:1098 src/protocols/yahoo/yahoo_profile.c:1005
 msgid "Realname"
 msgstr "Nome real"
 
-#: src/protocols/irc/msgs.c:202
+#: src/protocols/irc/msgs.c:202 src/protocols/silc/ops.c:1021
 msgid "Currently on"
 msgstr "Actualmente em"
 
@@ -5121,111 +5155,111 @@
 msgid "Buddy Information for %s"
 msgstr "Informações do contacto %s:"
 
-#: src/protocols/irc/msgs.c:278
+#: src/protocols/irc/msgs.c:279
 #, c-format
 msgid "%s has changed the topic to: %s"
 msgstr "%s mudou o tópico para: %s"
 
-#: src/protocols/irc/msgs.c:283
+#: src/protocols/irc/msgs.c:284
 #, c-format
 msgid "The topic for %s is: %s"
 msgstr "O tópico do %s é: %s"
 
-#: src/protocols/irc/msgs.c:299
+#: src/protocols/irc/msgs.c:301
 #, c-format
 msgid "Unknown message '%s'"
 msgstr "Mensagem desconhecida '%s'"
 
-#: src/protocols/irc/msgs.c:300
+#: src/protocols/irc/msgs.c:302
 msgid "Unknown message"
 msgstr "Mensagem desconhecida"
 
-#: src/protocols/irc/msgs.c:300
+#: src/protocols/irc/msgs.c:302
 msgid "Gaim has sent a message the IRC server did not understand."
 msgstr "O Gaim enviou uma mensagem que não foi entendida pelo servidor de IRC."
 
-#: src/protocols/irc/msgs.c:323
+#: src/protocols/irc/msgs.c:325
 #, c-format
 msgid "Users on %s: %s"
 msgstr "Utilizadores em %s: %s"
 
-#: src/protocols/irc/msgs.c:405
+#: src/protocols/irc/msgs.c:407
 msgid "No such channel"
 msgstr "Este canal não existe"
 
 #. does this happen?
-#: src/protocols/irc/msgs.c:416
+#: src/protocols/irc/msgs.c:418
 msgid "no such channel"
 msgstr "este canal não existe"
 
-#: src/protocols/irc/msgs.c:419
+#: src/protocols/irc/msgs.c:421
 msgid "User is not logged in"
 msgstr "O utilizador está desligado"
 
-#: src/protocols/irc/msgs.c:424
+#: src/protocols/irc/msgs.c:426
 msgid "No such nick or channel"
 msgstr "Nome ou canal inexistente"
 
-#: src/protocols/irc/msgs.c:444
+#: src/protocols/irc/msgs.c:446
 msgid "Could not send"
 msgstr "Não foi possível enviar"
 
-#: src/protocols/irc/msgs.c:500
+#: src/protocols/irc/msgs.c:502
 #, c-format
 msgid "Joining %s requires an invitation."
 msgstr "É necessário um convite para entrar em %s."
 
-#: src/protocols/irc/msgs.c:501
+#: src/protocols/irc/msgs.c:503
 msgid "Invitation only"
 msgstr "Apenas convidados"
 
-#: src/protocols/irc/msgs.c:604
+#: src/protocols/irc/msgs.c:606
 #, c-format
 msgid "You have been kicked by %s: (%s)"
 msgstr "Foi expulso por %s: (%s)"
 
-#: src/protocols/irc/msgs.c:609
+#: src/protocols/irc/msgs.c:611
 #, c-format
 msgid "Kicked by %s (%s)"
 msgstr "Kickado por %s (%s)"
 
-#: src/protocols/irc/msgs.c:630
+#: src/protocols/irc/msgs.c:632
 #, c-format
 msgid "mode (%s %s) by %s"
 msgstr "Modo (%s %s) por %s"
 
-#: src/protocols/irc/msgs.c:709
+#: src/protocols/irc/msgs.c:711
 msgid "Could not change nick"
 msgstr "Não foi possível mudar o nome"
 
-#: src/protocols/irc/msgs.c:710
+#: src/protocols/irc/msgs.c:712
 msgid "Cannot change nick"
 msgstr "Impossível mudar o nome"
 
-#: src/protocols/irc/msgs.c:731
+#: src/protocols/irc/msgs.c:733
 #, c-format
 msgid "You have parted the channel%s%s"
 msgstr "Saiu do canal%s%s"
 
-#: src/protocols/irc/msgs.c:771
+#: src/protocols/irc/msgs.c:773
 msgid "Error: invalid PONG from server"
 msgstr "Erro: PONG inválido do servidor"
 
-#: src/protocols/irc/msgs.c:773
+#: src/protocols/irc/msgs.c:775
 #, c-format
 msgid "PING reply -- Lag: %lu seconds"
 msgstr "Resposta do PING -- Latência: %lu segundos"
 
-#: src/protocols/irc/msgs.c:848
+#: src/protocols/irc/msgs.c:850
 #, c-format
 msgid "Cannot join %s:"
 msgstr "Impossível entrar em %s:"
 
-#: src/protocols/irc/msgs.c:849 src/protocols/silc/ops.c:878
+#: src/protocols/irc/msgs.c:851 src/protocols/silc/ops.c:894
 msgid "Cannot join channel"
 msgstr "Impossível entrar no canal"
 
-#: src/protocols/irc/msgs.c:885
+#: src/protocols/irc/msgs.c:887
 #, c-format
 msgid "Wallops from %s"
 msgstr "Wallops de %s"
@@ -5239,8 +5273,8 @@
 "away [message]:  Set an away message, or use no message to return from being "
 "away."
 msgstr ""
-"away [mensagem]:  Define uma mensagem de ausência, ou volta de ausente se não usar "
-"mensagem."
+"away [mensagem]:  Define uma mensagem de ausência, ou volta de ausente se "
+"não usar mensagem."
 
 #: src/protocols/irc/parse.c:111
 msgid ""
@@ -5265,8 +5299,8 @@
 "invite &lt;nick&gt; [room]:  Invite someone to join you in the specified "
 "channel, or the current channel."
 msgstr ""
-"invite &lt;nome&gt; [sala]:  Convidar alguém a juntar-se no canal especificado, "
-"ou neste canal."
+"invite &lt;nome&gt; [sala]:  Convidar alguém a juntar-se no canal "
+"especificado, ou neste canal."
 
 #: src/protocols/irc/parse.c:114
 msgid ""
@@ -5274,31 +5308,33 @@
 "channels, optionally providing a channel key for each if needed."
 msgstr ""
 "j &lt;sala1&gt;[,sala2][,...] [chave1[,chave2][,...]]:  Entrar num ou mais "
-"canais, opcionalmente fornecendo uma chave de canal para cada um se necessário."
+"canais, opcionalmente fornecendo uma chave de canal para cada um se "
+"necessário."
 
 #: src/protocols/irc/parse.c:115
 msgid ""
 "join &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  Enter one or more "
 "channels, optionally providing a channel key for each if needed."
 msgstr ""
-"join &lt;sala1&gt;[,sala2][,...] [chave1[,chave2][,...]]:  Entrar num ou mais "
-"canais, opcionalmente fornecendo uma chave de canal para cada um se necessário."
+"join &lt;sala1&gt;[,sala2][,...] [chave1[,chave2][,...]]:  Entrar num ou "
+"mais canais, opcionalmente fornecendo uma chave de canal para cada um se "
+"necessário."
 
 #: src/protocols/irc/parse.c:116
 msgid ""
 "kick &lt;nick&gt; [message]:  Remove someone from a channel. You must be a "
 "channel operator to do this."
 msgstr ""
-"kick &lt;nome&gt; [mensagem]:  Remove alguém do canal. Tem de ser um operador "
-"de canal para fazer isto."
+"kick &lt;nome&gt; [mensagem]:  Remove alguém do canal. Tem de ser um "
+"operador de canal para fazer isto."
 
 #: src/protocols/irc/parse.c:117
 msgid ""
 "list:  Display a list of chat rooms on the network. <i>Warning, some servers "
 "may disconnect you upon doing this.</i>"
 msgstr ""
-"list:  Mostra uma lista de salas de conversa na rede. <i>Aviso: alguns servidores "
-"podem desligá-lo a seguir a fazer isto.</i>"
+"list:  Mostra uma lista de salas de conversa na rede. <i>Aviso: alguns "
+"servidores podem desligá-lo a seguir a fazer isto.</i>"
 
 #: src/protocols/irc/parse.c:118
 msgid "me &lt;action to perform&gt;:  Perform an action."
@@ -5309,22 +5345,22 @@
 "mode &lt;nick|channel&gt; &lt;+|-&gt;&lt;A-Za-z&gt;:  Set or unset a channel "
 "or user mode."
 msgstr ""
-"mode &lt;nome|canal&gt; &lt;+|-&gt;&lt;A-Za-z&gt;:  Define ou retira um modo de "
-"canal ou utilizador."
+"mode &lt;nome|canal&gt; &lt;+|-&gt;&lt;A-Za-z&gt;:  Define ou retira um modo "
+"de canal ou utilizador."
 
 #: src/protocols/irc/parse.c:120
 msgid ""
 "msg &lt;nick&gt; &lt;message&gt;:  Send a private message to a user (as "
 "opposed to a channel)."
 msgstr ""
-"msg &lt;nome&gt; &lt;mensagem&gt;:  Envia uma mensagem privada a um utilizador "
-"(em oposição a um canal)."
+"msg &lt;nome&gt; &lt;mensagem&gt;:  Envia uma mensagem privada a um "
+"utilizador (em oposição a um canal)."
 
 #: src/protocols/irc/parse.c:121
 msgid "names [channel]:  List the users currently in a channel."
 msgstr "names [canal]:  Lista os utilizadores que estão no canal."
 
-#: src/protocols/irc/parse.c:122 src/protocols/jabber/jabber.c:1406
+#: src/protocols/irc/parse.c:122 src/protocols/jabber/jabber.c:1407
 msgid "nick &lt;new nickname&gt;:  Change your nickname."
 msgstr "nick &lt;novo nome&gt;:  Muda o seu nome."
 
@@ -5333,16 +5369,16 @@
 "op &lt;nick1&gt; [nick2] ...:  Grant channel operator status to someone. You "
 "must be a channel operator to do this."
 msgstr ""
-"op &lt;nome1&gt; [nome2] ...:  Oferece estado de operador de canal a alguém. Tem "
-"de ser um operador de canal para fazer isto."
+"op &lt;nome1&gt; [nome2] ...:  Oferece estado de operador de canal a alguém. "
+"Tem de ser um operador de canal para fazer isto."
 
 #: src/protocols/irc/parse.c:124
 msgid ""
 "operwall &lt;message&gt;:  If you don't know what this is, you probably "
 "can't use it."
 msgstr ""
-"operwall &lt;mensagem&gt;:  Se não sabe o que isto é, provavelmente "
-"não o pode usar."
+"operwall &lt;mensagem&gt;:  Se não sabe o que isto é, provavelmente não o "
+"pode usar."
 
 #: src/protocols/irc/parse.c:125
 msgid ""
@@ -5357,16 +5393,16 @@
 "ping [nick]:  Asks how much lag a user (or the server if no user specified) "
 "has."
 msgstr ""
-"ping [nome]:  Pergunta quanto lag tem um utilizador (ou o servidor se não foi "
-"especificado nenhum utilizador)."
+"ping [nome]:  Pergunta quanto lag tem um utilizador (ou o servidor se não "
+"foi especificado nenhum utilizador)."
 
 #: src/protocols/irc/parse.c:127
 msgid ""
 "query &lt;nick&gt; &lt;message&gt;:  Send a private message to a user (as "
 "opposed to a channel)."
 msgstr ""
-"query &lt;nome&gt; &lt;mensagem&gt;:  Envia uma mensagem privada a um utilizador "
-"(em oposição a um canal)."
+"query &lt;nome&gt; &lt;mensagem&gt;:  Envia uma mensagem privada a um "
+"utilizador (em oposição a um canal)."
 
 #: src/protocols/irc/parse.c:128
 msgid "quit [message]:  Disconnect from the server, with an optional message."
@@ -5390,29 +5426,30 @@
 
 #: src/protocols/irc/parse.c:132
 msgid "umode &lt;+|-&gt;&lt;A-Za-z&gt;:  Set or unset a user mode."
-msgstr "umode &lt;+|-&gt;&lt;A-Za-z&gt;:  Define ou retira um modo de utilizador."
+msgstr ""
+"umode &lt;+|-&gt;&lt;A-Za-z&gt;:  Define ou retira um modo de utilizador."
 
 #: src/protocols/irc/parse.c:133
 msgid ""
 "voice &lt;nick1&gt; [nick2] ...:  Grant channel voice status to someone. You "
 "must be a channel operator to do this."
 msgstr ""
-"voice &lt;nome1&gt; [nome2] ...:  Oferece estado de voz no canal a alguém. Tem "
-"de ser um operador de canal para fazer isto."
+"voice &lt;nome1&gt; [nome2] ...:  Oferece estado de voz no canal a alguém. "
+"Tem de ser um operador de canal para fazer isto."
 
 #: src/protocols/irc/parse.c:134
 msgid ""
 "wallops &lt;message&gt;:  If you don't know what this is, you probably can't "
 "use it."
 msgstr ""
-"wallops &lt;mensagem&gt;:  Se não sabe o que isto é, provavelmente "
-"não o pode usar."
+"wallops &lt;mensagem&gt;:  Se não sabe o que isto é, provavelmente não o "
+"pode usar."
 
 #: src/protocols/irc/parse.c:135
 msgid "whois &lt;nick&gt;:  Get information on a user."
 msgstr "whois &lt;nome&gt;:  Obtém informação sobre um utilizador."
 
-#: src/protocols/irc/parse.c:228 src/protocols/zephyr/zephyr.c:236
+#: src/protocols/irc/parse.c:228 src/protocols/zephyr/zephyr.c:256
 msgid ""
 "(There was an error converting this message.  Check the 'Encoding' option in "
 "the Account Editor)"
@@ -5433,7 +5470,7 @@
 msgid "CTCP PING reply"
 msgstr "Resposta do CTCP PING"
 
-#: src/protocols/irc/parse.c:485 src/protocols/oscar/oscar.c:1424
+#: src/protocols/irc/parse.c:485 src/protocols/oscar/oscar.c:1430
 #: src/protocols/toc/toc.c:188 src/protocols/toc/toc.c:596
 #: src/protocols/toc/toc.c:612 src/protocols/toc/toc.c:689
 msgid "Disconnected."
@@ -5470,87 +5507,88 @@
 msgid "Invalid challenge from server"
 msgstr "Pedido de acesso do servidor inválido"
 
-#: src/protocols/jabber/buddy.c:247 src/protocols/jabber/buddy.c:604
-#: src/protocols/silc/ops.c:770
+#: src/protocols/jabber/buddy.c:246 src/protocols/jabber/buddy.c:604
+#: src/protocols/silc/ops.c:786
 msgid "Full Name"
 msgstr "Nome completo"
 
-#: src/protocols/jabber/buddy.c:248 src/protocols/jabber/buddy.c:617
-#: src/protocols/silc/ops.c:782
+#: src/protocols/jabber/buddy.c:247 src/protocols/jabber/buddy.c:617
+#: src/protocols/silc/ops.c:798
 msgid "Family Name"
 msgstr "Apelido"
 
-#: src/protocols/jabber/buddy.c:249 src/protocols/jabber/buddy.c:621
+#: src/protocols/jabber/buddy.c:248 src/protocols/jabber/buddy.c:621
 msgid "Given Name"
 msgstr "Nome"
 
-#: src/protocols/jabber/buddy.c:250 src/protocols/jabber/buddy.c:635
-#: src/protocols/jabber/jabber.c:607 src/protocols/msn/msn.c:1150
-#: src/protocols/silc/buddy.c:1446 src/protocols/silc/ops.c:786
-#: src/protocols/silc/ops.c:927 src/protocols/yahoo/yahoo_profile.c:995
+#: src/protocols/jabber/buddy.c:249 src/protocols/jabber/buddy.c:635
+#: src/protocols/jabber/jabber.c:608 src/protocols/msn/msn.c:1172
+#: src/protocols/silc/buddy.c:1442 src/protocols/silc/ops.c:802
+#: src/protocols/silc/ops.c:945 src/protocols/silc/ops.c:1094
+#: src/protocols/yahoo/yahoo_profile.c:1000
 msgid "Nickname"
 msgstr "Nome remoto"
 
-#: src/protocols/jabber/buddy.c:251 src/protocols/jabber/jabber.c:647
+#: src/protocols/jabber/buddy.c:250 src/protocols/jabber/jabber.c:648
 msgid "URL"
 msgstr "URL"
 
-#: src/protocols/jabber/buddy.c:252 src/protocols/jabber/buddy.c:663
+#: src/protocols/jabber/buddy.c:251 src/protocols/jabber/buddy.c:663
 msgid "Street Address"
 msgstr "Endereço (Rua)"
 
-#: src/protocols/jabber/buddy.c:253 src/protocols/jabber/buddy.c:659
+#: src/protocols/jabber/buddy.c:252 src/protocols/jabber/buddy.c:659
 msgid "Extended Address"
 msgstr "Endereço (Complemento)"
 
-#: src/protocols/jabber/buddy.c:254 src/protocols/jabber/buddy.c:667
+#: src/protocols/jabber/buddy.c:253 src/protocols/jabber/buddy.c:667
 msgid "Locality"
 msgstr "Localidade"
 
-#: src/protocols/jabber/buddy.c:255 src/protocols/jabber/buddy.c:671
+#: src/protocols/jabber/buddy.c:254 src/protocols/jabber/buddy.c:671
 msgid "Region"
 msgstr "Região"
 
-#: src/protocols/jabber/buddy.c:256 src/protocols/jabber/buddy.c:675
-#: src/protocols/jabber/jabber.c:637
+#: src/protocols/jabber/buddy.c:255 src/protocols/jabber/buddy.c:675
+#: src/protocols/jabber/jabber.c:638
 msgid "Postal Code"
 msgstr "Código postal (CEP)"
 
 #. Country
-#: src/protocols/jabber/buddy.c:257 src/protocols/jabber/buddy.c:680
+#: src/protocols/jabber/buddy.c:256 src/protocols/jabber/buddy.c:680
 #: src/protocols/trepia/trepia.c:339 src/protocols/trepia/trepia.c:416
 msgid "Country"
 msgstr "País"
 
-#: src/protocols/jabber/buddy.c:258 src/protocols/jabber/buddy.c:691
+#: src/protocols/jabber/buddy.c:257 src/protocols/jabber/buddy.c:691
 #: src/protocols/jabber/buddy.c:698
 msgid "Telephone"
 msgstr "Telefone"
 
-#: src/protocols/jabber/buddy.c:259 src/protocols/jabber/buddy.c:709
-#: src/protocols/jabber/buddy.c:717 src/protocols/silc/buddy.c:1499
-#: src/protocols/silc/silc.c:633 src/protocols/yahoo/yahoo_profile.c:990
+#: src/protocols/jabber/buddy.c:258 src/protocols/jabber/buddy.c:709
+#: src/protocols/jabber/buddy.c:717 src/protocols/silc/silc.c:637
+#: src/protocols/silc/util.c:508 src/protocols/yahoo/yahoo_profile.c:995
 msgid "Email"
 msgstr "Email"
 
-#: src/protocols/jabber/buddy.c:260 src/protocols/jabber/buddy.c:732
+#: src/protocols/jabber/buddy.c:259 src/protocols/jabber/buddy.c:732
 msgid "Organization Name"
 msgstr "Nome da organização"
 
-#: src/protocols/jabber/buddy.c:261 src/protocols/jabber/buddy.c:736
+#: src/protocols/jabber/buddy.c:260 src/protocols/jabber/buddy.c:736
 msgid "Organization Unit"
 msgstr "Grupo de trabalho"
 
-#: src/protocols/jabber/buddy.c:262 src/protocols/jabber/buddy.c:742
+#: src/protocols/jabber/buddy.c:261 src/protocols/jabber/buddy.c:742
 msgid "Title"
 msgstr "Título"
 
-#: src/protocols/jabber/buddy.c:263 src/protocols/jabber/buddy.c:745
+#: src/protocols/jabber/buddy.c:262 src/protocols/jabber/buddy.c:745
 msgid "Role"
 msgstr "Função"
 
-#: src/protocols/jabber/buddy.c:264 src/protocols/jabber/buddy.c:638
-#: src/protocols/oscar/oscar.c:4865
+#: src/protocols/jabber/buddy.c:263 src/protocols/jabber/buddy.c:638
+#: src/protocols/oscar/oscar.c:4881
 msgid "Birthday"
 msgstr "Data de nascimento"
 
@@ -5571,25 +5609,25 @@
 msgstr "ID Jabber"
 
 #: src/protocols/jabber/buddy.c:563 src/protocols/jabber/buddy.c:570
-#: src/protocols/jabber/buddy.c:581 src/protocols/jabber/jabber.c:937
-#: src/protocols/msn/msn.c:453 src/protocols/novell/novell.c:2737
-#: src/protocols/novell/novell.c:2741 src/protocols/oscar/oscar.c:574
-#: src/protocols/oscar/oscar.c:580 src/protocols/oscar/oscar.c:582
-#: src/protocols/yahoo/yahoo.c:2611
+#: src/protocols/jabber/buddy.c:581 src/protocols/jabber/jabber.c:938
+#: src/protocols/msn/msn.c:450 src/protocols/novell/novell.c:2743
+#: src/protocols/novell/novell.c:2747 src/protocols/oscar/oscar.c:578
+#: src/protocols/oscar/oscar.c:584 src/protocols/oscar/oscar.c:586
+#: src/protocols/yahoo/yahoo.c:2634
 msgid "Status"
 msgstr "Estado"
 
-#: src/protocols/jabber/buddy.c:579 src/protocols/jabber/jabber.c:1559
+#: src/protocols/jabber/buddy.c:579 src/protocols/jabber/jabber.c:1562
 msgid "Resource"
 msgstr "Recurso"
 
-#: src/protocols/jabber/buddy.c:625 src/protocols/silc/ops.c:778
+#: src/protocols/jabber/buddy.c:625 src/protocols/silc/ops.c:794
 msgid "Middle Name"
 msgstr "Nome do meio"
 
-#: src/protocols/jabber/buddy.c:643 src/protocols/jabber/jabber.c:622
-#: src/protocols/oscar/oscar.c:4883 src/protocols/oscar/oscar.c:4891
-#: src/protocols/silc/ops.c:814
+#: src/protocols/jabber/buddy.c:643 src/protocols/jabber/jabber.c:623
+#: src/protocols/oscar/oscar.c:4899 src/protocols/oscar/oscar.c:4907
+#: src/protocols/silc/ops.c:830
 msgid "Address"
 msgstr "Endereço"
 
@@ -5609,31 +5647,31 @@
 msgid "Jabber Profile"
 msgstr "Perfil Jabber"
 
-#: src/protocols/jabber/buddy.c:936
+#: src/protocols/jabber/buddy.c:932
 msgid "Un-hide From"
 msgstr "Não ocultar-se de"
 
-#: src/protocols/jabber/buddy.c:939
+#: src/protocols/jabber/buddy.c:935
 msgid "Temporarily Hide From"
 msgstr "Ocultar-se temporariamente de"
 
 #. && NOT ME
-#: src/protocols/jabber/buddy.c:946
+#: src/protocols/jabber/buddy.c:942
 msgid "Cancel Presence Notification"
 msgstr "Cancelar notificação de presença"
 
-#: src/protocols/jabber/buddy.c:952
+#: src/protocols/jabber/buddy.c:948
 msgid "(Re-)Request authorization"
 msgstr "(Re-)Requisitar autorização"
 
 #. if(NOT ME)
 #. shouldn't this just happen automatically when the buddy is
 #. removed?
-#: src/protocols/jabber/buddy.c:960
+#: src/protocols/jabber/buddy.c:956
 msgid "Unsubscribe"
 msgstr "Des-Subscrever"
 
-#: src/protocols/jabber/chat.c:42 src/protocols/yahoo/yahoochat.c:963
+#: src/protocols/jabber/chat.c:42 src/protocols/yahoo/yahoochat.c:1002
 msgid "_Room:"
 msgstr "_Sala:"
 
@@ -5720,448 +5758,449 @@
 msgid "Find Rooms"
 msgstr "Encontrar Salas"
 
-#: src/protocols/jabber/jabber.c:75
+#: src/protocols/jabber/jabber.c:76
 msgid "Error initializing session"
 msgstr "Erro ao iniciar sessão"
 
-#: src/protocols/jabber/jabber.c:205 src/protocols/msn/httpmethod.c:266
+#: src/protocols/jabber/jabber.c:206 src/protocols/msn/httpmethod.c:266
 #: src/protocols/trepia/trepia.c:247 src/protocols/trepia/trepia.c:698
 #: src/protocols/trepia/trepia.c:987 src/protocols/trepia/trepia.c:1031
 #: src/protocols/trepia/trepia.c:1130 src/protocols/trepia/trepia.c:1176
 msgid "Write error"
 msgstr "Erro ao enviar"
 
-#: src/protocols/jabber/jabber.c:243 src/protocols/jabber/jabber.c:263
+#: src/protocols/jabber/jabber.c:244 src/protocols/jabber/jabber.c:264
 msgid "Read Error"
 msgstr "Erro de Leitura"
 
-#: src/protocols/jabber/jabber.c:323
+#: src/protocols/jabber/jabber.c:324
 msgid "Connection Failed"
 msgstr "Ligação Falhou"
 
-#: src/protocols/jabber/jabber.c:326
+#: src/protocols/jabber/jabber.c:327
 msgid "SSL Handshake Failed"
 msgstr "Ligação SSL Falhou"
 
-#: src/protocols/jabber/jabber.c:369 src/protocols/jabber/jabber.c:698
+#: src/protocols/jabber/jabber.c:370 src/protocols/jabber/jabber.c:699
 msgid "Invalid Jabber ID"
 msgstr "Identificador Jabber Inválido"
 
-#: src/protocols/jabber/jabber.c:397 src/protocols/jabber/jabber.c:725
+#: src/protocols/jabber/jabber.c:398 src/protocols/jabber/jabber.c:726
 msgid "SSL support unavailable"
 msgstr "Suporte SSL não está disponível"
 
-#: src/protocols/jabber/jabber.c:407 src/protocols/jabber/jabber.c:735
+#: src/protocols/jabber/jabber.c:408 src/protocols/jabber/jabber.c:736
 #: src/protocols/trepia/trepia.c:1070
 msgid "Unable to create socket"
 msgstr "Impossível criar socket"
 
-#: src/protocols/jabber/jabber.c:432
+#: src/protocols/jabber/jabber.c:433
 #, c-format
 msgid "Registration of %s@%s successful"
 msgstr "Registo de %s@%s efectuado com sucesso"
 
-#: src/protocols/jabber/jabber.c:434 src/protocols/jabber/jabber.c:435
+#: src/protocols/jabber/jabber.c:435 src/protocols/jabber/jabber.c:436
 msgid "Registration Successful"
 msgstr "Registo Efectuado com Sucesso"
 
-#: src/protocols/jabber/jabber.c:441 src/protocols/jabber/jabber.c:1180
+#: src/protocols/jabber/jabber.c:442 src/protocols/jabber/jabber.c:1181
 msgid "Unknown Error"
 msgstr "Erro Desconhecido"
 
-#: src/protocols/jabber/jabber.c:443 src/protocols/jabber/jabber.c:444
+#: src/protocols/jabber/jabber.c:444 src/protocols/jabber/jabber.c:445
 msgid "Registration Failed"
 msgstr "Erro ao Registar"
 
-#: src/protocols/jabber/jabber.c:555 src/protocols/jabber/jabber.c:556
+#: src/protocols/jabber/jabber.c:556 src/protocols/jabber/jabber.c:557
 msgid "Already Registered"
 msgstr "Já está Registado"
 
-#: src/protocols/jabber/jabber.c:591 src/protocols/jabber/jabber.c:1035
+#: src/protocols/jabber/jabber.c:592 src/protocols/jabber/jabber.c:1036
 msgid "Password"
 msgstr "Senha"
 
-#: src/protocols/jabber/jabber.c:602
+#: src/protocols/jabber/jabber.c:603
 msgid "E-Mail"
 msgstr "E-Mail"
 
 #. State
-#: src/protocols/jabber/jabber.c:632 src/protocols/oscar/oscar.c:4885
-#: src/protocols/oscar/oscar.c:4893 src/protocols/trepia/trepia.c:335
+#: src/protocols/jabber/jabber.c:633 src/protocols/oscar/oscar.c:4901
+#: src/protocols/oscar/oscar.c:4909 src/protocols/trepia/trepia.c:335
 #: src/protocols/trepia/trepia.c:413
 msgid "State"
 msgstr "Estado"
 
-#: src/protocols/jabber/jabber.c:642 src/protocols/silc/buddy.c:1501
-#: src/protocols/silc/ops.c:819 src/protocols/silc/silc.c:635
+#: src/protocols/jabber/jabber.c:643 src/protocols/silc/ops.c:835
+#: src/protocols/silc/silc.c:639 src/protocols/silc/util.c:510
 msgid "Phone"
 msgstr "Telefone"
 
-#: src/protocols/jabber/jabber.c:652
+#: src/protocols/jabber/jabber.c:653
 msgid "Date"
 msgstr "Data"
 
-#: src/protocols/jabber/jabber.c:660
+#: src/protocols/jabber/jabber.c:661
 msgid "Please fill out the information below to register your new account."
 msgstr ""
 "Por favor preencha a seguinte informçaão para registar a sua nova conta."
 
-#: src/protocols/jabber/jabber.c:663 src/protocols/jabber/jabber.c:664
+#: src/protocols/jabber/jabber.c:664 src/protocols/jabber/jabber.c:665
 msgid "Register New Jabber Account"
 msgstr "Registar Nova Conta Jabber"
 
-#: src/protocols/jabber/jabber.c:743
+#: src/protocols/jabber/jabber.c:744
 msgid "Logged out"
 msgstr "Desligou-se"
 
 #. connect to the server
-#: src/protocols/jabber/jabber.c:782 src/protocols/msn/msn.c:616
-#: src/protocols/napster/napster.c:499 src/protocols/novell/novell.c:2104
-#: src/protocols/oscar/oscar.c:1591 src/protocols/trepia/trepia.c:1064
-#: src/protocols/yahoo/yahoo.c:2353 src/protocols/zephyr/zephyr.c:906
+#: src/protocols/jabber/jabber.c:783 src/protocols/msn/msn.c:608
+#: src/protocols/napster/napster.c:499 src/protocols/novell/novell.c:2105
+#: src/protocols/oscar/oscar.c:1597 src/protocols/trepia/trepia.c:1064
+#: src/protocols/yahoo/yahoo.c:2379 src/protocols/zephyr/zephyr.c:1017
 msgid "Connecting"
 msgstr "Ligando"
 
-#: src/protocols/jabber/jabber.c:786
+#: src/protocols/jabber/jabber.c:787
 msgid "Initializing Stream"
 msgstr "Iniciando Stream"
 
-#: src/protocols/jabber/jabber.c:792
+#: src/protocols/jabber/jabber.c:793
 msgid "Authenticating"
 msgstr "Autenticando"
 
-#: src/protocols/jabber/jabber.c:801
+#: src/protocols/jabber/jabber.c:802
 msgid "Re-initializing Stream"
 msgstr "Reiniciando Stream"
 
-#: src/protocols/jabber/jabber.c:881 src/protocols/jabber/jabber.c:1158
-#: src/protocols/jabber/jabber.c:1199 src/protocols/jabber/jabber.c:1232
-#: src/protocols/oscar/oscar.c:580 src/protocols/oscar/oscar.c:6471
+#: src/protocols/jabber/jabber.c:882 src/protocols/jabber/jabber.c:1159
+#: src/protocols/jabber/jabber.c:1200 src/protocols/jabber/jabber.c:1233
+#: src/protocols/oscar/oscar.c:584 src/protocols/oscar/oscar.c:6488
 msgid "Not Authorized"
 msgstr "Não autorizado"
 
-#: src/protocols/jabber/jabber.c:912
+#: src/protocols/jabber/jabber.c:913
 msgid "Both"
 msgstr "Ambos"
 
-#: src/protocols/jabber/jabber.c:914
+#: src/protocols/jabber/jabber.c:915
 msgid "From (To pending)"
 msgstr "De (Para pendente)"
 
-#: src/protocols/jabber/jabber.c:916
+#: src/protocols/jabber/jabber.c:917
 msgid "From"
 msgstr "De"
 
-#: src/protocols/jabber/jabber.c:919
+#: src/protocols/jabber/jabber.c:920
 msgid "To"
 msgstr "Para"
 
-#: src/protocols/jabber/jabber.c:921
+#: src/protocols/jabber/jabber.c:922
 msgid "None (To pending)"
 msgstr "Nada (Para pendente)"
 
-#: src/protocols/jabber/jabber.c:925
+#: src/protocols/jabber/jabber.c:926
 msgid "Subscription"
 msgstr "Subscrição"
 
-#: src/protocols/jabber/jabber.c:945
+#: src/protocols/jabber/jabber.c:946
 msgid "Error"
 msgstr "Erro"
 
-#: src/protocols/jabber/jabber.c:958 src/protocols/jabber/jutil.c:35
+#: src/protocols/jabber/jabber.c:959 src/protocols/jabber/jutil.c:35
 #: src/protocols/jabber/presence.c:66 src/protocols/jabber/presence.c:117
 msgid "Chatty"
 msgstr "Disponível para chat"
 
-#: src/protocols/jabber/jabber.c:960 src/protocols/jabber/jutil.c:38
+#: src/protocols/jabber/jabber.c:961 src/protocols/jabber/jutil.c:38
 #: src/protocols/jabber/presence.c:68 src/protocols/jabber/presence.c:122
 msgid "Extended Away"
 msgstr "Ausente (estendido)"
 
-#: src/protocols/jabber/jabber.c:961 src/protocols/jabber/jutil.c:41
+#: src/protocols/jabber/jabber.c:962 src/protocols/jabber/jutil.c:41
 #: src/protocols/jabber/presence.c:70 src/protocols/jabber/presence.c:124
-#: src/protocols/oscar/oscar.c:522 src/protocols/oscar/oscar.c:5468
-#: src/protocols/oscar/oscar.c:6663
+#: src/protocols/oscar/oscar.c:526 src/protocols/oscar/oscar.c:5484
+#: src/protocols/oscar/oscar.c:6680
 msgid "Do Not Disturb"
 msgstr "Não perturbar"
 
-#: src/protocols/jabber/jabber.c:978
-msgid "Password Changed"
-msgstr "Senha Alterada"
-
 #: src/protocols/jabber/jabber.c:979
+msgid "Password Changed"
+msgstr "Senha Alterada"
+
+#: src/protocols/jabber/jabber.c:980
 msgid "Your password has been changed."
 msgstr "A sua senha foi alterada."
 
-#: src/protocols/jabber/jabber.c:983 src/protocols/jabber/jabber.c:984
+#: src/protocols/jabber/jabber.c:984 src/protocols/jabber/jabber.c:985
 msgid "Error changing password"
 msgstr "Erro ao mudar senha"
 
-#: src/protocols/jabber/jabber.c:1040
+#: src/protocols/jabber/jabber.c:1041
 msgid "Password (again)"
 msgstr "Senha (novamente)"
 
-#: src/protocols/jabber/jabber.c:1045 src/protocols/jabber/jabber.c:1046
+#: src/protocols/jabber/jabber.c:1046 src/protocols/jabber/jabber.c:1047
 msgid "Change Jabber Password"
 msgstr "Alterar Senha do Jabber"
 
-#: src/protocols/jabber/jabber.c:1046
+#: src/protocols/jabber/jabber.c:1047
 msgid "Please enter your new password"
 msgstr "Por favor digite a sua nova senha"
 
-#: src/protocols/jabber/jabber.c:1056 src/protocols/toc/toc.c:1540
+#: src/protocols/jabber/jabber.c:1057 src/protocols/toc/toc.c:1540
 msgid "Set User Info"
 msgstr "Definir informações de utilizador"
 
-#: src/protocols/jabber/jabber.c:1138
+#: src/protocols/jabber/jabber.c:1139
 msgid "Bad Request"
 msgstr "Pedido Inválido"
 
-#: src/protocols/jabber/jabber.c:1140
+#: src/protocols/jabber/jabber.c:1141
 msgid "Conflict"
 msgstr "Conflito"
 
-#: src/protocols/jabber/jabber.c:1142
+#: src/protocols/jabber/jabber.c:1143
 msgid "Feature Not Implemented"
 msgstr "Funcionalidade Não Implementada"
 
-#: src/protocols/jabber/jabber.c:1144
+#: src/protocols/jabber/jabber.c:1145
 msgid "Forbidden"
 msgstr "Proíbido"
 
-#: src/protocols/jabber/jabber.c:1146
+#: src/protocols/jabber/jabber.c:1147
 msgid "Gone"
 msgstr "Desapareceu"
 
-#: src/protocols/jabber/jabber.c:1148 src/protocols/jabber/jabber.c:1222
+#: src/protocols/jabber/jabber.c:1149 src/protocols/jabber/jabber.c:1223
 msgid "Internal Server Error"
 msgstr "Erro Interno do Servidor"
 
-#: src/protocols/jabber/jabber.c:1150
+#: src/protocols/jabber/jabber.c:1151
 msgid "Item Not Found"
 msgstr "Ítem Não Encontrado"
 
-#: src/protocols/jabber/jabber.c:1152
+#: src/protocols/jabber/jabber.c:1153
 msgid "Malformed Jabber ID"
 msgstr "ID Jabber Inválido"
 
-#: src/protocols/jabber/jabber.c:1154
+#: src/protocols/jabber/jabber.c:1155
 msgid "Not Acceptable"
 msgstr "Inaceitável"
 
-#: src/protocols/jabber/jabber.c:1156
+#: src/protocols/jabber/jabber.c:1157
 msgid "Not Allowed"
 msgstr "Não Permitido"
 
-#: src/protocols/jabber/jabber.c:1160
+#: src/protocols/jabber/jabber.c:1161
 msgid "Payment Required"
 msgstr "Necessário Pagamento"
 
-#: src/protocols/jabber/jabber.c:1162
+#: src/protocols/jabber/jabber.c:1163
 msgid "Recipient Unavailable"
 msgstr "Receptor Indisponível"
 
-#: src/protocols/jabber/jabber.c:1166
+#: src/protocols/jabber/jabber.c:1167
 msgid "Registration Required"
 msgstr "Registar Obrigatório"
 
-#: src/protocols/jabber/jabber.c:1168
+#: src/protocols/jabber/jabber.c:1169
 msgid "Remote Server Not Found"
 msgstr "Servidor Remoto Não Foi Encontrado"
 
-#: src/protocols/jabber/jabber.c:1170
+#: src/protocols/jabber/jabber.c:1171
 msgid "Remote Server Timeout"
 msgstr "Servidor Remoto Perdido"
 
-#: src/protocols/jabber/jabber.c:1172
+#: src/protocols/jabber/jabber.c:1173
 msgid "Server Overloaded"
 msgstr "Servidor Sobrecarregado"
 
-#: src/protocols/jabber/jabber.c:1174
+#: src/protocols/jabber/jabber.c:1175
 msgid "Service Unavailable"
 msgstr "Serviço Indisponível"
 
-#: src/protocols/jabber/jabber.c:1176
+#: src/protocols/jabber/jabber.c:1177
 msgid "Subscription Required"
 msgstr "Subscrição Necessária"
 
-#: src/protocols/jabber/jabber.c:1178
+#: src/protocols/jabber/jabber.c:1179
 msgid "Unexpected Request"
 msgstr "Pedido Inesperado"
 
-#: src/protocols/jabber/jabber.c:1185
+#: src/protocols/jabber/jabber.c:1186
 msgid "Authorization Aborted"
 msgstr "Autorização Abortada"
 
-#: src/protocols/jabber/jabber.c:1187
+#: src/protocols/jabber/jabber.c:1188
 msgid "Incorrect encoding in authorization"
 msgstr "Codificação incorrecta na autorização"
 
-#: src/protocols/jabber/jabber.c:1190
+#: src/protocols/jabber/jabber.c:1191
 msgid "Invalid authzid"
 msgstr "Identificador de autenticação inválido (authzid)"
 
-#: src/protocols/jabber/jabber.c:1193
+#: src/protocols/jabber/jabber.c:1194
 msgid "Invalid Authorization Mechanism"
 msgstr "Mecanismo de Autorização Inválido"
 
-#: src/protocols/jabber/jabber.c:1196
+#: src/protocols/jabber/jabber.c:1197
 msgid "Authorization mechanism too weak"
 msgstr "Mecanismo de autorização demasiado fraco"
 
-#: src/protocols/jabber/jabber.c:1201
+#: src/protocols/jabber/jabber.c:1202
 msgid "Temporary Authentication Failure"
 msgstr "Autenticação Temporária Falhou"
 
-#: src/protocols/jabber/jabber.c:1203
+#: src/protocols/jabber/jabber.c:1204
 msgid "Authentication Failure"
 msgstr "Autenticação Falhou"
 
-#: src/protocols/jabber/jabber.c:1207
+#: src/protocols/jabber/jabber.c:1208
 msgid "Bad Format"
 msgstr "Formato Inválido"
 
-#: src/protocols/jabber/jabber.c:1209
+#: src/protocols/jabber/jabber.c:1210
 msgid "Bad Namespace Prefix"
 msgstr "Prefixo Inválido"
 
-#: src/protocols/jabber/jabber.c:1212
+#: src/protocols/jabber/jabber.c:1213
 msgid "Resource Conflict"
 msgstr "Conflito de Recursos"
 
-#: src/protocols/jabber/jabber.c:1214 src/protocols/silc/ops.c:1225
+#: src/protocols/jabber/jabber.c:1215 src/protocols/silc/ops.c:1491
 msgid "Connection Timeout"
 msgstr "Ligação Perdida"
 
-#: src/protocols/jabber/jabber.c:1216
+#: src/protocols/jabber/jabber.c:1217
 msgid "Host Gone"
 msgstr "Anfitrião Desapareceu"
 
-#: src/protocols/jabber/jabber.c:1218
+#: src/protocols/jabber/jabber.c:1219
 msgid "Host Unknown"
 msgstr "Anfitrião Desconhecido"
 
-#: src/protocols/jabber/jabber.c:1220
+#: src/protocols/jabber/jabber.c:1221
 msgid "Improper Addressing"
 msgstr "Endereço Inválido"
 
-#: src/protocols/jabber/jabber.c:1224
+#: src/protocols/jabber/jabber.c:1225
 msgid "Invalid ID"
 msgstr "Identificador Inválido"
 
-#: src/protocols/jabber/jabber.c:1226
+#: src/protocols/jabber/jabber.c:1227
 msgid "Invalid Namespace"
 msgstr "Espaço de Nomes Inválido"
 
-#: src/protocols/jabber/jabber.c:1228
+#: src/protocols/jabber/jabber.c:1229
 msgid "Invalid XML"
 msgstr "XML Inválido"
 
-#: src/protocols/jabber/jabber.c:1230
+#: src/protocols/jabber/jabber.c:1231
 msgid "Non-matching Hosts"
 msgstr "Anfitriãos Não Correspondentes"
 
-#: src/protocols/jabber/jabber.c:1234
+#: src/protocols/jabber/jabber.c:1235
 msgid "Policy Violation"
 msgstr "Violação de Normas"
 
-#: src/protocols/jabber/jabber.c:1236
+#: src/protocols/jabber/jabber.c:1237
 msgid "Remote Connection Failed"
 msgstr "Ligação Remota Falhou"
 
-#: src/protocols/jabber/jabber.c:1238
+#: src/protocols/jabber/jabber.c:1239
 msgid "Resource Constraint"
 msgstr "Restrição de Recursos"
 
-#: src/protocols/jabber/jabber.c:1240
+#: src/protocols/jabber/jabber.c:1241
 msgid "Restricted XML"
 msgstr "XML Restrito"
 
-#: src/protocols/jabber/jabber.c:1242
+#: src/protocols/jabber/jabber.c:1243
 msgid "See Other Host"
 msgstr "Ver Outro Anfitrião"
 
-#: src/protocols/jabber/jabber.c:1244
+#: src/protocols/jabber/jabber.c:1245
 msgid "System Shutdown"
 msgstr "Paragem do Sistema"
 
-#: src/protocols/jabber/jabber.c:1246
+#: src/protocols/jabber/jabber.c:1247
 msgid "Undefined Condition"
 msgstr "Condição Indefinida"
 
-#: src/protocols/jabber/jabber.c:1248
+#: src/protocols/jabber/jabber.c:1249
 msgid "Unsupported Encoding"
 msgstr "Codificação Não Suportada"
 
-#: src/protocols/jabber/jabber.c:1250
+#: src/protocols/jabber/jabber.c:1251
 msgid "Unsupported Stanza Type"
 msgstr "Tipo de Estrofe Inválido"
 
-#: src/protocols/jabber/jabber.c:1252
+#: src/protocols/jabber/jabber.c:1253
 msgid "Unsupported Version"
 msgstr "Versão Não Suportada"
 
-#: src/protocols/jabber/jabber.c:1254
+#: src/protocols/jabber/jabber.c:1255
 msgid "XML Not Well Formed"
 msgstr "XML Não Está Bem Formado"
 
-#: src/protocols/jabber/jabber.c:1256
+#: src/protocols/jabber/jabber.c:1257
 msgid "Stream Error"
 msgstr "Erro de Stream"
 
-#: src/protocols/jabber/jabber.c:1323
+#: src/protocols/jabber/jabber.c:1324
 #, c-format
 msgid "Unable to ban user %s"
 msgstr "Incapaz de banir utilizador %s"
 
-#: src/protocols/jabber/jabber.c:1375
+#: src/protocols/jabber/jabber.c:1376
 #, c-format
 msgid "Unable to kick user %s"
 msgstr "Incapaz de expulsar utilizador %s"
 
-#: src/protocols/jabber/jabber.c:1400
+#: src/protocols/jabber/jabber.c:1401
 msgid "config:  Configure a chat room."
 msgstr "config:  Configurar uma sala de chat."
 
-#: src/protocols/jabber/jabber.c:1403
+#: src/protocols/jabber/jabber.c:1404
 msgid "configure:  Configure a chat room."
 msgstr "configure:  Configurar uma sala de chat."
 
-#: src/protocols/jabber/jabber.c:1410
+#: src/protocols/jabber/jabber.c:1411
 msgid "part [room]:  Leave the room."
 msgstr "part [sala]:  Sair da sala."
 
-#: src/protocols/jabber/jabber.c:1413
+#: src/protocols/jabber/jabber.c:1414
 msgid "register:  Register with a chat room."
 msgstr "register:  Registar-se com uma sala de conversa."
 
-#: src/protocols/jabber/jabber.c:1418
+#: src/protocols/jabber/jabber.c:1419
 msgid "topic [new topic]:  View or change the topic."
 msgstr "topic [novo tópico]:  Ver ou modificar o tópico."
 
-#: src/protocols/jabber/jabber.c:1422
+#: src/protocols/jabber/jabber.c:1423
 msgid "ban &lt;user&gt; [room]:  Ban a user from the room."
 msgstr "ban &lt;utilizador&gt; [sala]:  Banir um utilizador da sala."
 
-#: src/protocols/jabber/jabber.c:1426
+#: src/protocols/jabber/jabber.c:1427
 msgid "invite &lt;user&gt; [room]:  Invite a user to the room."
 msgstr "invite &lt;utilizador&gt; [sala]:  Convida um utilizaodr para a sala."
 
-#: src/protocols/jabber/jabber.c:1430
+#: src/protocols/jabber/jabber.c:1431
 msgid "join: &lt;room&gt; [server]:  Join a chat on this server."
 msgstr "join: &lt;sala&gt; [servidor]:  Entrar num chat neste servidor."
 
-#: src/protocols/jabber/jabber.c:1434
+#: src/protocols/jabber/jabber.c:1435
 msgid "kick &lt;user&gt; [room]:  Kick a user from the room."
 msgstr "kick &lt;utilizador&gt; [sala]:  Expulsar um utilizador da sala."
 
-#: src/protocols/jabber/jabber.c:1438
+#: src/protocols/jabber/jabber.c:1439
 msgid ""
 "msg &lt;user&gt; &lt;message&gt;:  Send a private message to another user."
 msgstr ""
-"msg &lt;utilizador&gt; &lt;mensagem&gt;:  Enviar uma mensagem privada a outro utilizador."
-
-#: src/protocols/jabber/jabber.c:1452
+"msg &lt;utilizador&gt; &lt;mensagem&gt;:  Enviar uma mensagem privada a "
+"outro utilizador."
+
+#: src/protocols/jabber/jabber.c:1453
 msgid "Hide Operating System"
 msgstr "Esconder Sistema Operativo"
 
@@ -6176,24 +6215,24 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/jabber/jabber.c:1534 src/protocols/jabber/jabber.c:1536
+#: src/protocols/jabber/jabber.c:1537 src/protocols/jabber/jabber.c:1539
 msgid "Jabber Protocol Plugin"
 msgstr "Plugin do protocolo Jabber"
 
-#: src/protocols/jabber/jabber.c:1562
+#: src/protocols/jabber/jabber.c:1565
 msgid "Use TLS if available"
 msgstr "Usar TLS se disponível"
 
-#: src/protocols/jabber/jabber.c:1567
+#: src/protocols/jabber/jabber.c:1570
 msgid "Force old SSL"
 msgstr "Forçar SSL antigo"
 
-#: src/protocols/jabber/jabber.c:1572
+#: src/protocols/jabber/jabber.c:1575
 msgid "Allow plaintext auth over unencrypted streams"
 msgstr "Permitir autent. em texto simples sobre ligações não encriptadas"
 
 #. Account options
-#: src/protocols/jabber/jabber.c:1581 src/protocols/silc/silc.c:1359
+#: src/protocols/jabber/jabber.c:1584 src/protocols/silc/silc.c:1572
 msgid "Connect server"
 msgstr "Ligar ao servidor"
 
@@ -6336,7 +6375,7 @@
 msgid "Not on list"
 msgstr "Não está na lista"
 
-#: src/protocols/msn/error.c:70 src/protocols/zephyr/zephyr.c:570
+#: src/protocols/msn/error.c:70 src/protocols/zephyr/zephyr.c:593
 msgid "User is offline"
 msgstr "Utilizador está desligado"
 
@@ -6481,8 +6520,8 @@
 msgid "Server too busy"
 msgstr "Servidor muito ocupado"
 
-#: src/protocols/msn/error.c:198 src/protocols/oscar/oscar.c:2010
-#: src/protocols/silc/ops.c:1214 src/protocols/toc/toc.c:630
+#: src/protocols/msn/error.c:198 src/protocols/oscar/oscar.c:2026
+#: src/protocols/silc/ops.c:1480 src/protocols/toc/toc.c:630
 msgid "Authentication failed"
 msgstr "Autenticação falhada"
 
@@ -6560,88 +6599,88 @@
 msgid "Disallow"
 msgstr "Não permitir"
 
-#: src/protocols/msn/msn.c:313
+#: src/protocols/msn/msn.c:311
 msgid "Send a mobile message."
 msgstr "Enviar uma mensagem para dispositivo móvel."
 
-#: src/protocols/msn/msn.c:315
+#: src/protocols/msn/msn.c:313
 msgid "Page"
 msgstr "Enviar"
 
-#: src/protocols/msn/msn.c:466 src/protocols/msn/msn.c:764
+#: src/protocols/msn/msn.c:463 src/protocols/msn/msn.c:756
 #: src/protocols/msn/state.c:34
 msgid "Away From Computer"
 msgstr "Ausente"
 
-#: src/protocols/msn/msn.c:467 src/protocols/msn/msn.c:766
-#: src/protocols/msn/state.c:33 src/protocols/yahoo/yahoo.c:2468
-#: src/protocols/yahoo/yahoo.c:2846 src/protocols/yahoo/yahoo.c:2960
+#: src/protocols/msn/msn.c:464 src/protocols/msn/msn.c:758
+#: src/protocols/msn/state.c:33 src/protocols/yahoo/yahoo.c:2491
+#: src/protocols/yahoo/yahoo.c:2853 src/protocols/yahoo/yahoo.c:2969
 msgid "Be Right Back"
 msgstr "Volto já"
 
-#: src/protocols/msn/msn.c:468 src/protocols/msn/msn.c:768
-#: src/protocols/msn/state.c:31 src/protocols/novell/novell.c:2721
-#: src/protocols/novell/novell.c:2836 src/protocols/novell/novell.c:2890
+#: src/protocols/msn/msn.c:465 src/protocols/msn/msn.c:760
+#: src/protocols/msn/state.c:31 src/protocols/novell/novell.c:2727
+#: src/protocols/novell/novell.c:2842 src/protocols/novell/novell.c:2896
 #: src/protocols/silc/buddy.c:1383 src/protocols/silc/silc.c:47
-#: src/protocols/silc/silc.c:78 src/protocols/yahoo/yahoo.c:2470
-#: src/protocols/yahoo/yahoo.c:2848 src/protocols/yahoo/yahoo.c:2961
+#: src/protocols/silc/silc.c:78 src/protocols/yahoo/yahoo.c:2493
+#: src/protocols/yahoo/yahoo.c:2855 src/protocols/yahoo/yahoo.c:2970
 msgid "Busy"
 msgstr "Ocupado"
 
-#: src/protocols/msn/msn.c:469 src/protocols/msn/msn.c:770
-#: src/protocols/msn/state.c:35 src/protocols/yahoo/yahoo.c:2478
-#: src/protocols/yahoo/yahoo.c:2856 src/protocols/yahoo/yahoo.c:2965
+#: src/protocols/msn/msn.c:466 src/protocols/msn/msn.c:762
+#: src/protocols/msn/state.c:35 src/protocols/yahoo/yahoo.c:2501
+#: src/protocols/yahoo/yahoo.c:2863 src/protocols/yahoo/yahoo.c:2974
 msgid "On The Phone"
 msgstr "Ao telefone"
 
-#: src/protocols/msn/msn.c:470 src/protocols/msn/msn.c:772
-#: src/protocols/msn/state.c:36 src/protocols/yahoo/yahoo.c:2482
-#: src/protocols/yahoo/yahoo.c:2860 src/protocols/yahoo/yahoo.c:2967
+#: src/protocols/msn/msn.c:467 src/protocols/msn/msn.c:764
+#: src/protocols/msn/state.c:36 src/protocols/yahoo/yahoo.c:2505
+#: src/protocols/yahoo/yahoo.c:2867 src/protocols/yahoo/yahoo.c:2976
 msgid "Out To Lunch"
 msgstr "Em horário de almoço"
 
-#: src/protocols/msn/msn.c:471 src/protocols/msn/msn.c:774
-#: src/protocols/zephyr/zephyr.c:1205 src/protocols/zephyr/zephyr.c:1220
+#: src/protocols/msn/msn.c:468 src/protocols/msn/msn.c:766
+#: src/protocols/zephyr/zephyr.c:1355 src/protocols/zephyr/zephyr.c:1374
 msgid "Hidden"
 msgstr "Invisível"
 
-#: src/protocols/msn/msn.c:482
+#: src/protocols/msn/msn.c:479
 msgid "Set Friendly Name"
 msgstr "Definir Nome"
 
-#: src/protocols/msn/msn.c:487
+#: src/protocols/msn/msn.c:484
 msgid "Set Home Phone Number"
 msgstr "Definir número de telefone de casa"
 
-#: src/protocols/msn/msn.c:491
+#: src/protocols/msn/msn.c:488
 msgid "Set Work Phone Number"
 msgstr "Definir número de telefone do trabalho"
 
-#: src/protocols/msn/msn.c:495
+#: src/protocols/msn/msn.c:492
 msgid "Set Mobile Phone Number"
 msgstr "Definir número de telefone móvel"
 
-#: src/protocols/msn/msn.c:501
+#: src/protocols/msn/msn.c:498
 msgid "Enable/Disable Mobile Devices"
 msgstr "Activar/Desactivar dispositivos móveis"
 
-#: src/protocols/msn/msn.c:506
+#: src/protocols/msn/msn.c:503
 msgid "Allow/Disallow Mobile Pages"
 msgstr "Permitir/Não permitir pages para dispositivos móveis"
 
-#: src/protocols/msn/msn.c:529
+#: src/protocols/msn/msn.c:526
 msgid "Send to Mobile"
 msgstr "Enviar para dispositivo móvel"
 
-#: src/protocols/msn/msn.c:539
+#: src/protocols/msn/msn.c:536
 msgid "Initiate Chat"
 msgstr "Iniciar chat"
 
-#: src/protocols/msn/msn.c:548
+#: src/protocols/msn/msn.c:540
 msgid "Update Buddy Icon"
 msgstr "Actualizar Ícone do Contacto"
 
-#: src/protocols/msn/msn.c:585
+#: src/protocols/msn/msn.c:577
 msgid ""
 "SSL support is needed for MSN. Please install a supported SSL library. See "
 "http://gaim.sf.net/faq-ssl.php for more information."
@@ -6649,106 +6688,126 @@
 "É necessário suporte SSL para o MSN. Por favor instale uma biblioteca de "
 "SSL. Veja http://gaim.sf.net/faq-ssl.php para mais informações."
 
-#: src/protocols/msn/msn.c:1137 src/protocols/msn/msn.c:1150
-#: src/protocols/msn/msn.c:1156 src/protocols/yahoo/yahoo_profile.c:640
-#: src/protocols/yahoo/yahoo_profile.c:653
+#: src/protocols/msn/msn.c:1167 src/protocols/yahoo/yahoo_profile.c:659
+#: src/protocols/zephyr/zephyr.c:626
+#, c-format
+msgid "<b>Alias:</b> %s<br>"
+msgstr "<b>Nome:</b> %s<br>"
+
+#. put a link to the actual profile URL
+#: src/protocols/msn/msn.c:1172 src/protocols/msn/msn.c:1512
+#: src/protocols/yahoo/yahoo_profile.c:1168 src/util.c:792
+#, c-format
+msgid "<b>%s:</b> "
+msgstr "<b>%s:</b> "
+
+#: src/protocols/msn/msn.c:1173
+#, c-format
+msgid "<font sml=\"msn\">%s</font><br>"
+msgstr "<font sml=\"msn\">%s</font><br>"
+
+#: src/protocols/msn/msn.c:1179 src/protocols/yahoo/yahoo_profile.c:664
 #, c-format
 msgid "<b>%s:</b> %s<br>"
 msgstr "<b>%s:</b> %s<br>"
 
-#: src/protocols/msn/msn.c:1137
-msgid "MSN ID"
-msgstr "ID MSN"
-
-#: src/protocols/msn/msn.c:1145 src/protocols/yahoo/yahoo_profile.c:648
-#: src/protocols/zephyr/zephyr.c:602
-#, c-format
-msgid "<b>Alias:</b> %s<br>"
-msgstr "<b>Nome:</b> %s<br>"
-
-#: src/protocols/msn/msn.c:1222 src/protocols/msn/msn.c:1546
-#: src/protocols/yahoo/yahoo_profile.c:746
-#: src/protocols/yahoo/yahoo_profile.c:834
+#: src/protocols/msn/msn.c:1242
+msgid "MSN Profile"
+msgstr "Perfil MSN"
+
+#: src/protocols/msn/msn.c:1247 src/protocols/msn/msn.c:1499
+#: src/protocols/yahoo/yahoo_profile.c:761
 msgid "Error retrieving profile"
 msgstr "Erro ao buscar o perfil"
 
 #. Age
-#: src/protocols/msn/msn.c:1293 src/protocols/oscar/oscar.c:4870
+#: src/protocols/msn/msn.c:1318 src/protocols/oscar/oscar.c:4886
 #: src/protocols/trepia/trepia.c:285 src/protocols/trepia/trepia.c:404
-#: src/protocols/yahoo/yahoo_profile.c:1010
+#: src/protocols/yahoo/yahoo_profile.c:1015
 msgid "Age"
 msgstr "Idade"
 
 #. Gender
-#: src/protocols/msn/msn.c:1300 src/protocols/oscar/oscar.c:4856
+#: src/protocols/msn/msn.c:1325 src/protocols/oscar/oscar.c:4872
 #: src/protocols/trepia/trepia.c:279 src/protocols/trepia/trepia.c:406
-#: src/protocols/yahoo/yahoo_profile.c:1020
+#: src/protocols/yahoo/yahoo_profile.c:1025
 msgid "Gender"
 msgstr "Sexo"
 
-#: src/protocols/msn/msn.c:1309 src/protocols/yahoo/yahoo_profile.c:1015
+#: src/protocols/msn/msn.c:1334 src/protocols/yahoo/yahoo_profile.c:1020
 msgid "Marital Status"
 msgstr "Estado civil"
 
-#: src/protocols/msn/msn.c:1316 src/protocols/yahoo/yahoo_profile.c:1005
+#: src/protocols/msn/msn.c:1341 src/protocols/yahoo/yahoo_profile.c:1010
 msgid "Location"
 msgstr "Localização"
 
-#: src/protocols/msn/msn.c:1324 src/protocols/yahoo/yahoo_profile.c:1025
+#: src/protocols/msn/msn.c:1349 src/protocols/yahoo/yahoo_profile.c:1030
 msgid "Occupation"
 msgstr "Ocupação"
 
-#: src/protocols/msn/msn.c:1341 src/protocols/msn/msn.c:1347
-#: src/protocols/msn/msn.c:1354 src/protocols/msn/msn.c:1362
-#: src/protocols/msn/msn.c:1369
+#: src/protocols/msn/msn.c:1366 src/protocols/msn/msn.c:1372
+#: src/protocols/msn/msn.c:1379 src/protocols/msn/msn.c:1387
+#: src/protocols/msn/msn.c:1394
 msgid "A Little About Me"
 msgstr "Um pouco sobre mim"
 
-#: src/protocols/msn/msn.c:1378 src/protocols/msn/msn.c:1384
-#: src/protocols/msn/msn.c:1391 src/protocols/msn/msn.c:1398
+#: src/protocols/msn/msn.c:1403 src/protocols/msn/msn.c:1409
+#: src/protocols/msn/msn.c:1416 src/protocols/msn/msn.c:1423
 msgid "Favorite Things"
 msgstr "Coisas favoritas"
 
-#: src/protocols/msn/msn.c:1407 src/protocols/msn/msn.c:1413
-#: src/protocols/msn/msn.c:1420
+#: src/protocols/msn/msn.c:1432 src/protocols/msn/msn.c:1438
+#: src/protocols/msn/msn.c:1445
 msgid "Hobbies and Interests"
 msgstr "Hobbies e interesses"
 
-#: src/protocols/msn/msn.c:1429 src/protocols/msn/msn.c:1435
-#: src/protocols/yahoo/yahoo_profile.c:1067
+#: src/protocols/msn/msn.c:1454 src/protocols/msn/msn.c:1460
+#: src/protocols/yahoo/yahoo_profile.c:1072
 msgid "Favorite Quote"
 msgstr "Citação favorita"
 
-#: src/protocols/msn/msn.c:1443 src/protocols/yahoo/yahoo_profile.c:1118
+#: src/protocols/msn/msn.c:1468 src/protocols/yahoo/yahoo_profile.c:1123
 msgid "Last Updated"
 msgstr "Última actualização"
 
 #. Homepage
-#: src/protocols/msn/msn.c:1454 src/protocols/silc/ops.c:810
+#: src/protocols/msn/msn.c:1479 src/protocols/silc/ops.c:826
 #: src/protocols/trepia/trepia.c:289 src/protocols/trepia/trepia.c:419
 msgid "Homepage"
 msgstr "Página da web"
 
-#. put a link to the actual profile URL
-#: src/protocols/msn/msn.c:1465 src/protocols/yahoo/yahoo_profile.c:1121
-#: src/util.c:792
-#, c-format
-msgid "<b>%s:</b> "
-msgstr "<b>%s:</b> "
-
-#: src/protocols/msn/msn.c:1465 src/protocols/yahoo/yahoo_profile.c:1121
+#: src/protocols/msn/msn.c:1501
+msgid "The user has not created a public profile."
+msgstr "O utilizador não criou um perfil público."
+
+#: src/protocols/msn/msn.c:1502
+msgid ""
+"MSN reported not being able to find the user's profile. This either means "
+"that the user does not exist, or that the user exists but has not created a "
+"public profile."
+msgstr ""
+"O MSN não foi capaz de encontrar o perfil do utilizador. Isto significa que "
+"o utilizador não existe, ou que o utilizador existe mas não criou um perfil "
+"público."
+
+#: src/protocols/msn/msn.c:1506
+msgid ""
+"Gaim could not find any information in the user's profile. The user most "
+"likely does not exist."
+msgstr ""
+"O Gaim não encontrou informação no perfil do utilizador. O utilizador "
+"provavelmente não existe."
+
+#: src/protocols/msn/msn.c:1512 src/protocols/yahoo/yahoo_profile.c:1168
 msgid "Profile URL"
 msgstr "URL do perfil"
 
-#: src/protocols/msn/msn.c:1547 src/protocols/yahoo/yahoo_profile.c:1140
-msgid "The user's profile is empty."
-msgstr "O perfil de utilizador está vazio."
-
-#: src/protocols/msn/msn.c:1616
+#: src/protocols/msn/msn.c:1643
 msgid "Display conversation closed notices"
 msgstr "Mostrar avisos de conversa fechada"
 
-#: src/protocols/msn/msn.c:1621
+#: src/protocols/msn/msn.c:1648
 msgid "Display timeout notices"
 msgstr "Mostrar avisos de tempo expirado"
 
@@ -6763,15 +6822,15 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/msn/msn.c:1703 src/protocols/msn/msn.c:1705
+#: src/protocols/msn/msn.c:1732 src/protocols/msn/msn.c:1734
 msgid "MSN Protocol Plugin"
 msgstr "Plugin do protocolo MSN"
 
-#: src/protocols/msn/msn.c:1724 src/protocols/trepia/trepia.c:1290
+#: src/protocols/msn/msn.c:1753 src/protocols/trepia/trepia.c:1292
 msgid "Login server"
 msgstr "Servidor de login"
 
-#: src/protocols/msn/msn.c:1733
+#: src/protocols/msn/msn.c:1762
 msgid "Use HTTP Method"
 msgstr "Usar Método HTTP"
 
@@ -6792,11 +6851,11 @@
 msgstr "Requisitando lista de contactos"
 
 #: src/protocols/msn/notification.c:144 src/protocols/msn/notification.c:173
-#: src/protocols/oscar/oscar.c:2299
+#: src/protocols/oscar/oscar.c:2315
 msgid "Password sent"
 msgstr "Senha enviada"
 
-#: src/protocols/msn/notification.c:1069
+#: src/protocols/msn/notification.c:1071
 #, c-format
 msgid ""
 "The MSN server will shut down for maintenance in %d minute. You will "
@@ -6825,7 +6884,7 @@
 "\n"
 "Depois de a manutenção terminar, poderá ligar com sucesso."
 
-#: src/protocols/msn/notification.c:1134
+#: src/protocols/msn/notification.c:1136
 msgid "Syncing with server"
 msgstr "Sincronizando com o servidor"
 
@@ -6858,11 +6917,11 @@
 msgid "Received HTTP error. Please report this."
 msgstr "Erro HTTP Recebido. Por favor relate isto."
 
-#: src/protocols/msn/switchboard.c:201
+#: src/protocols/msn/switchboard.c:191
 msgid "The conversation has become inactive and timed out."
 msgstr "A conversa tornou-se inactiva e esgotou o limite de tempo."
 
-#: src/protocols/msn/switchboard.c:209
+#: src/protocols/msn/switchboard.c:199
 #, c-format
 msgid "%s has closed the conversation window."
 msgstr "%s fechou a janela de conversa."
@@ -6920,7 +6979,7 @@
 msgid "%s requested a PING"
 msgstr "%s requisitou um PING"
 
-#: src/protocols/napster/napster.c:541 src/protocols/oscar/oscar.c:6171
+#: src/protocols/napster/napster.c:541 src/protocols/oscar/oscar.c:6188
 #: src/protocols/toc/toc.c:1266
 msgid "_Group:"
 msgstr "_Grupo:"
@@ -6936,122 +6995,122 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/napster/napster.c:622 src/protocols/napster/napster.c:624
+#: src/protocols/napster/napster.c:624 src/protocols/napster/napster.c:626
 msgid "NAPSTER Protocol Plugin"
 msgstr "Plugin do Protocolo NAPSTER"
 
-#: src/protocols/novell/nmuser.c:2046
+#: src/protocols/novell/nmuser.c:1868
 msgid "Required parameters not passed in"
 msgstr "Parâmetros obrigatórios não foram passados"
 
-#: src/protocols/novell/nmuser.c:2049
+#: src/protocols/novell/nmuser.c:1871
 msgid "Unable to write to network"
 msgstr "Impossível escrever para a rede"
 
-#: src/protocols/novell/nmuser.c:2052
+#: src/protocols/novell/nmuser.c:1874
 msgid "Unable to read from network"
 msgstr "Impossível ler da rede"
 
-#: src/protocols/novell/nmuser.c:2055
+#: src/protocols/novell/nmuser.c:1877
 msgid "Error communicating with server"
 msgstr "Erro na comunicação com o servidor"
 
-#: src/protocols/novell/nmuser.c:2059
+#: src/protocols/novell/nmuser.c:1881
 msgid "Conference not found"
 msgstr "A conferência não foi encontrada"
 
-#: src/protocols/novell/nmuser.c:2062
+#: src/protocols/novell/nmuser.c:1884
 msgid "Conference does not exist"
 msgstr "A conferência não existe"
 
-#: src/protocols/novell/nmuser.c:2066
+#: src/protocols/novell/nmuser.c:1888
 msgid "A folder with that name already exists"
 msgstr "Já existe uma pasta com esse nome"
 
-#: src/protocols/novell/nmuser.c:2069
+#: src/protocols/novell/nmuser.c:1891
 msgid "Not supported"
 msgstr "Não suportado"
 
-#: src/protocols/novell/nmuser.c:2073
+#: src/protocols/novell/nmuser.c:1895
 msgid "Password has expired"
 msgstr "Senha expirou"
 
-#: src/protocols/novell/nmuser.c:2076
+#: src/protocols/novell/nmuser.c:1898
 msgid "Invalid password"
 msgstr "Senha inválida"
 
-#: src/protocols/novell/nmuser.c:2079
+#: src/protocols/novell/nmuser.c:1901
 msgid "User not found"
 msgstr "O utilizador não foi encontrado"
 
-#: src/protocols/novell/nmuser.c:2082
+#: src/protocols/novell/nmuser.c:1904
 msgid "Account has been disabled"
 msgstr "A conta foi desactivada"
 
-#: src/protocols/novell/nmuser.c:2085
+#: src/protocols/novell/nmuser.c:1907
 msgid "The server could not access the directory"
 msgstr "O servidor não pôde aceder ao directório"
 
-#: src/protocols/novell/nmuser.c:2088
+#: src/protocols/novell/nmuser.c:1910
 msgid "Your system administrator has disabled this operation"
 msgstr "O seu administrador de sistema desactivou esta operação"
 
-#: src/protocols/novell/nmuser.c:2091
+#: src/protocols/novell/nmuser.c:1913
 msgid "The server is unavailable; try again later"
 msgstr "O servidor está indisponível; tente mais tarde"
 
-#: src/protocols/novell/nmuser.c:2094
+#: src/protocols/novell/nmuser.c:1916
 msgid "Cannot add a contact to the same folder twice"
 msgstr "Não pode adicionar um contacto à mesma pasta duas vezes"
 
-#: src/protocols/novell/nmuser.c:2097
+#: src/protocols/novell/nmuser.c:1919
 msgid "Cannot add yourself"
 msgstr "Não pode adicionar-se a si próprio"
 
-#: src/protocols/novell/nmuser.c:2100
+#: src/protocols/novell/nmuser.c:1922
 msgid "Master archive is misconfigured"
 msgstr "O arquivo principal está mal configurado"
 
-#: src/protocols/novell/nmuser.c:2104
+#: src/protocols/novell/nmuser.c:1926
 msgid "Invalid username or password"
 msgstr "Nome de utilizador ou senha inválidos"
 
-#: src/protocols/novell/nmuser.c:2107
+#: src/protocols/novell/nmuser.c:1929
 msgid "Could not recognize the host of the username you entered"
 msgstr "Incapaz de reconhecer o anfitrião do nome de utilizador que inseriu"
 
-#: src/protocols/novell/nmuser.c:2110
+#: src/protocols/novell/nmuser.c:1932
 msgid ""
 "Your account has been disabled because too many invalid passwords were "
 "entered"
 msgstr ""
 "A sua conta foi desactivada porque introduziu senhas inválidas em demasia"
 
-#: src/protocols/novell/nmuser.c:2113
+#: src/protocols/novell/nmuser.c:1935
 msgid "You cannot add the same person twice to a conversation"
 msgstr "Não pode adicionar a mesma pessoa duas vezes a uma conversa"
 
-#: src/protocols/novell/nmuser.c:2117
+#: src/protocols/novell/nmuser.c:1939
 msgid "You have reached your limit for the number of contacts allowed"
 msgstr "Atingiu o seu limite de número de contactos permitidos"
 
-#: src/protocols/novell/nmuser.c:2120
+#: src/protocols/novell/nmuser.c:1942
 msgid "You have entered an invalid username"
 msgstr "Inseriu um nome de utilizador inválido"
 
-#: src/protocols/novell/nmuser.c:2123
+#: src/protocols/novell/nmuser.c:1945
 msgid "An error occurred while updating the directory"
 msgstr "Ocorreu um erro ao actualizar o directório"
 
-#: src/protocols/novell/nmuser.c:2126
+#: src/protocols/novell/nmuser.c:1948
 msgid "Incompatible protocol version"
 msgstr "Versão de protocolo incompatível"
 
-#: src/protocols/novell/nmuser.c:2129
+#: src/protocols/novell/nmuser.c:1951
 msgid "The user has blocked you"
 msgstr "O utilizador bloqueou-o"
 
-#: src/protocols/novell/nmuser.c:2132
+#: src/protocols/novell/nmuser.c:1954
 msgid ""
 "This evaluation version does not allow more than ten users to log in at one "
 "time"
@@ -7059,11 +7118,11 @@
 "Esta versão de avaliação não permite que mais de 10 utilizadores se liguem "
 "ao mesmo tempo"
 
-#: src/protocols/novell/nmuser.c:2135
+#: src/protocols/novell/nmuser.c:1957
 msgid "The user is either offline or you are blocked"
 msgstr "O utilizador está desligado ou bloqueou-o"
 
-#: src/protocols/novell/nmuser.c:2138
+#: src/protocols/novell/nmuser.c:1960
 #, c-format
 msgid "Unknown error: 0x%X"
 msgstr "Erro desconhecido: 0x%X"
@@ -7149,7 +7208,7 @@
 msgid "Unable to remove %s from privacy list (%s)."
 msgstr "Impossível remover %s da sua lista privada (%s)."
 
-#: src/protocols/novell/novell.c:920 src/protocols/novell/novell.c:1573
+#: src/protocols/novell/novell.c:920 src/protocols/novell/novell.c:1574
 #, c-format
 msgid "Unable to change server side privacy settings (%s)."
 msgstr "Impossível mudar definições de privacidade no servidor (%s)."
@@ -7159,11 +7218,11 @@
 msgid "Unable to create conference (%s)."
 msgstr "Impossível criar conferência (%s)."
 
-#: src/protocols/novell/novell.c:1103 src/protocols/novell/novell.c:1612
+#: src/protocols/novell/novell.c:1103 src/protocols/novell/novell.c:1613
 msgid "Error communicating with server. Closing connection."
 msgstr "Erro na comunicação com o servidor. Fechando a ligação."
 
-#: src/protocols/novell/novell.c:1425
+#: src/protocols/novell/novell.c:1426
 msgid "Userid"
 msgstr "Userid"
 
@@ -7174,46 +7233,46 @@
 #. tag, value);
 #. }
 #.
-#: src/protocols/novell/novell.c:1439
+#: src/protocols/novell/novell.c:1440
 msgid "Full name"
 msgstr "Nome completo"
 
-#: src/protocols/novell/novell.c:1459
+#: src/protocols/novell/novell.c:1460
 msgid "User Properties"
 msgstr "Propriedades de Utilizador"
 
-#: src/protocols/novell/novell.c:1563
+#: src/protocols/novell/novell.c:1564
 #, c-format
 msgid "GroupWise Conference %d"
 msgstr "Conferência GroupWise %d"
 
-#: src/protocols/novell/novell.c:1588
+#: src/protocols/novell/novell.c:1589
 msgid "Unable to make SSL connection to server."
 msgstr "Impossível criar ligação SSL ao servidor."
 
-#: src/protocols/novell/novell.c:1618
+#: src/protocols/novell/novell.c:1619
 #, c-format
 msgid "Error processing event or response (%s)."
-msgstr "Erro ao processar acontecimento ou resposta. (%s)"
-
-#: src/protocols/novell/novell.c:1652
+msgstr "Erro ao processar acontecimento ou resposta (%s)."
+
+#: src/protocols/novell/novell.c:1653
 msgid "Authenticating..."
 msgstr "Autenticando..."
 
-#: src/protocols/novell/novell.c:1667
+#: src/protocols/novell/novell.c:1668
 msgid "Waiting for response..."
 msgstr "Esperando resposta..."
 
-#: src/protocols/novell/novell.c:1802
+#: src/protocols/novell/novell.c:1803
 #, c-format
 msgid "%s has been invited to this conversation."
 msgstr "%s foi convidado para esta conversa."
 
-#: src/protocols/novell/novell.c:1829
+#: src/protocols/novell/novell.c:1830
 msgid "Invitation to Conversation"
 msgstr "Convite para Conversa"
 
-#: src/protocols/novell/novell.c:1830
+#: src/protocols/novell/novell.c:1831
 #, c-format
 msgid ""
 "Invitation from: %s\n"
@@ -7224,15 +7283,15 @@
 "\n"
 "Enviado: %s"
 
-#: src/protocols/novell/novell.c:1832
+#: src/protocols/novell/novell.c:1833
 msgid "Would you like to join the conversation?"
 msgstr "Gostaria de se juntar à conversa?"
 
-#: src/protocols/novell/novell.c:1937
+#: src/protocols/novell/novell.c:1938
 msgid "You have been logged out because you logged in at another workstation."
 msgstr "Foi desligado porque se ligou a partir de outra estação de trabalho."
 
-#: src/protocols/novell/novell.c:1991
+#: src/protocols/novell/novell.c:1992
 #, c-format
 msgid ""
 "%s appears to be offline and did not receive the message that you just sent."
@@ -7244,7 +7303,7 @@
 #. *  gaim_request_fields(gc, _("Server Address"),...);
 #.
 #. ...but for now just error out with a nice message.
-#: src/protocols/novell/novell.c:2089
+#: src/protocols/novell/novell.c:2090
 msgid ""
 "Unable to connect to server. Please enter the address of the server you wish "
 "to connect to."
@@ -7252,28 +7311,28 @@
 "Impossível ligar ao servidor. Por favor digite a morada do servidor a que se "
 "deseja ligar."
 
-#: src/protocols/novell/novell.c:2111
+#: src/protocols/novell/novell.c:2112
 msgid "Error. SSL support is not installed."
 msgstr "Erro. Suporte SSL não está instalado."
 
-#: src/protocols/novell/novell.c:2420
+#: src/protocols/novell/novell.c:2421
 msgid "This conference has been closed. No more messages can be sent."
 msgstr "Esta conferência foi fechada. Não podem ser enviadas mais mensagens."
 
-#: src/protocols/novell/novell.c:2727 src/protocols/oscar/oscar.c:582
-#: src/protocols/oscar/oscar.c:6473 src/protocols/yahoo/yahoo.c:2490
+#: src/protocols/novell/novell.c:2733 src/protocols/oscar/oscar.c:586
+#: src/protocols/oscar/oscar.c:6490 src/protocols/yahoo/yahoo.c:2513
 msgid "Offline"
 msgstr "Desligado"
 
-#: src/protocols/novell/novell.c:2738
+#: src/protocols/novell/novell.c:2744
 msgid "Message"
 msgstr "Mensagem"
 
-#: src/protocols/novell/novell.c:2837 src/protocols/novell/novell.c:2893
+#: src/protocols/novell/novell.c:2843 src/protocols/novell/novell.c:2899
 msgid "Appear Offline"
 msgstr "Parecer Desligado"
 
-#: src/protocols/novell/novell.c:3287
+#: src/protocols/novell/novell.c:3293
 msgid "Initiate _Chat"
 msgstr "Iniciar _Chat"
 
@@ -7288,15 +7347,15 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/novell/novell.c:3381 src/protocols/novell/novell.c:3383
+#: src/protocols/novell/novell.c:3389 src/protocols/novell/novell.c:3391
 msgid "Novell GroupWise Messenger Protocol Plugin"
 msgstr "Plugin de Protocolo Novell Groupwise Messenger"
 
-#: src/protocols/novell/novell.c:3402
+#: src/protocols/novell/novell.c:3410
 msgid "Server address"
 msgstr "Endereço do servidor"
 
-#: src/protocols/novell/novell.c:3406
+#: src/protocols/novell/novell.c:3414
 msgid "Server port"
 msgstr "Porto do servidor"
 
@@ -7396,157 +7455,165 @@
 msgid "Not while on AOL"
 msgstr "Não enquanto estiver na AOL"
 
-#: src/protocols/oscar/oscar.c:436
+#: src/protocols/oscar/oscar.c:403
+msgid ""
+"(There was an error converting this message.  The buddy you are speaking to "
+"most likely has a buggy client.)"
+msgstr ""
+"(Houve um erro ao converter esta mensagem. O contacto com quem está a falar "
+"provavelmente tem um cliente com bugs.)"
+
+#: src/protocols/oscar/oscar.c:441
 msgid "Voice"
 msgstr "Voz"
 
-#: src/protocols/oscar/oscar.c:439
+#: src/protocols/oscar/oscar.c:444
 msgid "AIM Direct IM"
 msgstr "MI Directa AIM"
 
-#: src/protocols/oscar/oscar.c:442 src/protocols/silc/buddy.c:1497
-#: src/protocols/silc/silc.c:631
+#: src/protocols/oscar/oscar.c:447 src/protocols/silc/silc.c:635
+#: src/protocols/silc/util.c:506
 msgid "Chat"
 msgstr "Chat"
 
-#: src/protocols/oscar/oscar.c:445 src/protocols/oscar/oscar.c:6777
+#: src/protocols/oscar/oscar.c:450 src/protocols/oscar/oscar.c:6793
 msgid "Get File"
 msgstr "Receber ficheiro"
 
-#: src/protocols/oscar/oscar.c:452
+#: src/protocols/oscar/oscar.c:457
 msgid "Games"
 msgstr "Jogos"
 
-#: src/protocols/oscar/oscar.c:455
+#: src/protocols/oscar/oscar.c:460
 msgid "Add-Ins"
 msgstr "Add-Ins"
 
-#: src/protocols/oscar/oscar.c:458
+#: src/protocols/oscar/oscar.c:463
 msgid "Send Buddy List"
 msgstr "Enviar lista de contactos"
 
-#: src/protocols/oscar/oscar.c:461
+#: src/protocols/oscar/oscar.c:466
 msgid "ICQ Direct Connect"
 msgstr "Ligação Directa ICQ"
 
-#: src/protocols/oscar/oscar.c:464
+#: src/protocols/oscar/oscar.c:469
 msgid "AP User"
 msgstr "Utilizador AP"
 
-#: src/protocols/oscar/oscar.c:467
+#: src/protocols/oscar/oscar.c:472
 msgid "ICQ RTF"
 msgstr "ICQ RTF"
 
-#: src/protocols/oscar/oscar.c:470
+#: src/protocols/oscar/oscar.c:475
 msgid "Nihilist"
 msgstr "Nihilista"
 
-#: src/protocols/oscar/oscar.c:473
+#: src/protocols/oscar/oscar.c:478
 msgid "ICQ Server Relay"
 msgstr "Relay do servidor ICQ"
 
-#: src/protocols/oscar/oscar.c:476
+#: src/protocols/oscar/oscar.c:481
 msgid "Old ICQ UTF8"
 msgstr "ICQ UTF8 Velho"
 
-#: src/protocols/oscar/oscar.c:479
+#: src/protocols/oscar/oscar.c:484
 msgid "Trillian Encryption"
 msgstr "Criptografia do Trillian"
 
-#: src/protocols/oscar/oscar.c:482
+#: src/protocols/oscar/oscar.c:487
 msgid "ICQ UTF8"
 msgstr "ICQ UTF8"
 
-#: src/protocols/oscar/oscar.c:485
+#: src/protocols/oscar/oscar.c:490
 msgid "Hiptop"
 msgstr "Hiptop"
 
-#: src/protocols/oscar/oscar.c:488
+#: src/protocols/oscar/oscar.c:493
 msgid "Security Enabled"
 msgstr "Segurança Activada"
 
-#: src/protocols/oscar/oscar.c:491
+#: src/protocols/oscar/oscar.c:496
 msgid "Video Chat"
 msgstr "Chat Video"
 
-#: src/protocols/oscar/oscar.c:495
+#: src/protocols/oscar/oscar.c:500
 msgid "iChat AV"
 msgstr "iChat AV"
 
-#: src/protocols/oscar/oscar.c:498
+#: src/protocols/oscar/oscar.c:503
 msgid "Live Video"
 msgstr "Vídeo ao Vivo"
 
-#: src/protocols/oscar/oscar.c:501
+#: src/protocols/oscar/oscar.c:506
 msgid "Camera"
 msgstr "Camâra"
 
-#: src/protocols/oscar/oscar.c:520 src/protocols/oscar/oscar.c:5477
-#: src/protocols/oscar/oscar.c:6666
+#: src/protocols/oscar/oscar.c:524 src/protocols/oscar/oscar.c:5493
+#: src/protocols/oscar/oscar.c:6683
 msgid "Free For Chat"
 msgstr "Livre Para Conversa"
 
-#: src/protocols/oscar/oscar.c:524 src/protocols/oscar/oscar.c:5471
-#: src/protocols/oscar/oscar.c:6664
+#: src/protocols/oscar/oscar.c:528 src/protocols/oscar/oscar.c:5487
+#: src/protocols/oscar/oscar.c:6681
 msgid "Not Available"
 msgstr "Não Disponível"
 
-#: src/protocols/oscar/oscar.c:526 src/protocols/oscar/oscar.c:5474
-#: src/protocols/oscar/oscar.c:6665
+#: src/protocols/oscar/oscar.c:530 src/protocols/oscar/oscar.c:5490
+#: src/protocols/oscar/oscar.c:6682
 msgid "Occupied"
 msgstr "Ocupado"
 
-#: src/protocols/oscar/oscar.c:530
+#: src/protocols/oscar/oscar.c:534
 msgid "Web Aware"
 msgstr "Permitir que outros vejam o seu estado pela Web"
 
-#: src/protocols/oscar/oscar.c:598
+#: src/protocols/oscar/oscar.c:602
 msgid "Capabilities"
 msgstr "Recursos"
 
-#: src/protocols/oscar/oscar.c:604
+#: src/protocols/oscar/oscar.c:609
 msgid "Buddy Comment"
 msgstr "Comentário de Contacto"
 
-#: src/protocols/oscar/oscar.c:739
+#: src/protocols/oscar/oscar.c:744
 #, c-format
 msgid "Direct IM with %s closed"
 msgstr "MI Directa com %s fechada"
 
-#: src/protocols/oscar/oscar.c:741
+#: src/protocols/oscar/oscar.c:746
 #, c-format
 msgid "Direct IM with %s failed"
 msgstr "MI Directa com %s falhou"
 
-#: src/protocols/oscar/oscar.c:748
+#: src/protocols/oscar/oscar.c:753
 msgid "Direct Connect failed"
 msgstr "Ligação Directa falhou"
 
-#: src/protocols/oscar/oscar.c:825 src/protocols/oscar/oscar.c:956
+#: src/protocols/oscar/oscar.c:830 src/protocols/oscar/oscar.c:961
 #, c-format
 msgid "Direct IM with %s established"
 msgstr "MI directa com %s estabelecida"
 
-#: src/protocols/oscar/oscar.c:906
+#: src/protocols/oscar/oscar.c:911
 #, c-format
 msgid "Attempting to connect to %s at %s:%hu for Direct IM."
 msgstr "Tentando ligar a %s em %s:%hu para MI Directa."
 
-#: src/protocols/oscar/oscar.c:1322
+#: src/protocols/oscar/oscar.c:1328
 #, c-format
 msgid "Asking %s to connect to us at %s:%hu for Direct IM."
 msgstr "Pedindo a %s para se ligar a nós em %s:%hu para MI Directa."
 
-#: src/protocols/oscar/oscar.c:1327
+#: src/protocols/oscar/oscar.c:1333
 msgid "Unable to open Direct IM"
 msgstr "Impossível abrir MI Directa"
 
-#: src/protocols/oscar/oscar.c:1362
+#: src/protocols/oscar/oscar.c:1368
 #, c-format
 msgid "You have selected to open a Direct IM connection with %s."
 msgstr "Seleccionou abrir uma MI Directa com %s."
 
-#: src/protocols/oscar/oscar.c:1366
+#: src/protocols/oscar/oscar.c:1372
 msgid ""
 "Because this reveals your IP address, it may be considered a privacy risk.  "
 "Do you wish to continue?"
@@ -7554,24 +7621,24 @@
 "Por revelar seu endereço IP, isto pode ser considerado um risco de "
 "privacidade. Deseja continuar?"
 
-#: src/protocols/oscar/oscar.c:1370 src/protocols/oscar/oscar.c:3312
+#: src/protocols/oscar/oscar.c:1376 src/protocols/oscar/oscar.c:3328
 msgid "Connect"
 msgstr "Ligar"
 
-#: src/protocols/oscar/oscar.c:1436 src/protocols/toc/toc.c:872
+#: src/protocols/oscar/oscar.c:1442 src/protocols/toc/toc.c:872
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "Foi desligado da sala %s."
 
-#: src/protocols/oscar/oscar.c:1452
+#: src/protocols/oscar/oscar.c:1458
 msgid "Chat is currently unavailable"
 msgstr "O recurso de Chat está indisponível no momento"
 
-#: src/protocols/oscar/oscar.c:1533
+#: src/protocols/oscar/oscar.c:1539
 msgid "Screen name sent"
 msgstr "Nome de utilizador enviado"
 
-#: src/protocols/oscar/oscar.c:1547
+#: src/protocols/oscar/oscar.c:1553
 #, c-format
 msgid ""
 "Unable to login: Could not sign on as %s because the screen name is "
@@ -7582,46 +7649,46 @@
 "utilizador é inválido.  Nomes de utilizador têem que começar com uma letra e "
 "conter apenas letras, números e espaços, ou conter apenas números."
 
-#: src/protocols/oscar/oscar.c:1575
+#: src/protocols/oscar/oscar.c:1581
 msgid "Unable to login to AIM"
 msgstr "Impossível ligar ao AIM"
 
-#: src/protocols/oscar/oscar.c:1676 src/protocols/oscar/oscar.c:2103
+#: src/protocols/oscar/oscar.c:1682 src/protocols/oscar/oscar.c:2119
 msgid "Could Not Connect"
 msgstr "Não foi possível ligar"
 
-#: src/protocols/oscar/oscar.c:1684
+#: src/protocols/oscar/oscar.c:1690
 msgid "Connection established, cookie sent"
 msgstr "Ligação estabelecida, cookie enviado"
 
-#: src/protocols/oscar/oscar.c:1797 src/protocols/yahoo/yahoo_filexfer.c:180
+#: src/protocols/oscar/oscar.c:1803 src/protocols/yahoo/yahoo_filexfer.c:180
 #: src/protocols/yahoo/yahoo_filexfer.c:189
 #: src/protocols/yahoo/yahoo_filexfer.c:199
 msgid "Unable to establish file descriptor."
 msgstr "Impossível estabelecer descritor de ficheiro."
 
-#: src/protocols/oscar/oscar.c:1802
+#: src/protocols/oscar/oscar.c:1808
 msgid "Unable to create new connection."
 msgstr "Impossível criar nova ligação."
 
-#: src/protocols/oscar/oscar.c:1873
+#: src/protocols/oscar/oscar.c:1879
 msgid "Unable to establish listener socket."
 msgstr "Impossível estabelecer socket de escuta."
 
-#: src/protocols/oscar/oscar.c:1987 src/protocols/toc/toc.c:541
+#: src/protocols/oscar/oscar.c:2003 src/protocols/toc/toc.c:541
 msgid "Incorrect nickname or password."
 msgstr "Utilizador ou senha incorrecto(a)."
 
-#: src/protocols/oscar/oscar.c:1992
+#: src/protocols/oscar/oscar.c:2008
 msgid "Your account is currently suspended."
 msgstr "Atualmente, sua conta está suspensa."
 
 #. service temporarily unavailable
-#: src/protocols/oscar/oscar.c:1996
+#: src/protocols/oscar/oscar.c:2012
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr "O serviço AOL Instant Messenger está temporariamente indisponível."
 
-#: src/protocols/oscar/oscar.c:2001
+#: src/protocols/oscar/oscar.c:2017
 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."
@@ -7629,22 +7696,22 @@
 "esteve a ligar e desligar com muita frequência. Espere dez minutos e tente "
 "novamente. Se continuar a tentar, vai ter que esperar ainda mais."
 
-#: src/protocols/oscar/oscar.c:2006
+#: src/protocols/oscar/oscar.c:2022
 #, c-format
 msgid "The client version you are using is too old. Please upgrade at %s"
 msgstr ""
 "A versão do cliente que está a usar é velha demais. Por favor actualize em %s"
 
-#: src/protocols/oscar/oscar.c:2038
+#: src/protocols/oscar/oscar.c:2054
 msgid "Internal Error"
 msgstr "Erro interno"
 
-#: src/protocols/oscar/oscar.c:2110
+#: src/protocols/oscar/oscar.c:2126
 msgid "Received authorization"
 msgstr "Autorização recebida"
 
-#: src/protocols/oscar/oscar.c:2146 src/protocols/oscar/oscar.c:2176
-#: src/protocols/oscar/oscar.c:2264
+#: src/protocols/oscar/oscar.c:2162 src/protocols/oscar/oscar.c:2192
+#: src/protocols/oscar/oscar.c:2280
 #, c-format
 msgid ""
 "You may be disconnected shortly.  You may want to use TOC until this is "
@@ -7653,24 +7720,24 @@
 "Pode ser desligado num curto período de tempo. Pode querer usar o TOC até "
 "que isso esteja corrigido. Verifique por actualizações em %s."
 
-#: src/protocols/oscar/oscar.c:2149 src/protocols/oscar/oscar.c:2179
+#: src/protocols/oscar/oscar.c:2165 src/protocols/oscar/oscar.c:2195
 msgid "Gaim was unable to get a valid AIM login hash."
 msgstr "O Gaim não foi capaz de obter um \"hash\" de ligação AIM válido."
 
-#: src/protocols/oscar/oscar.c:2267
+#: src/protocols/oscar/oscar.c:2283
 msgid "Gaim was unable to get a valid login hash."
 msgstr "O Gaim não foi capaz de obter um hash de ligação válido."
 
-#: src/protocols/oscar/oscar.c:3096 src/protocols/oscar/oscar.c:3118
+#: src/protocols/oscar/oscar.c:3112 src/protocols/oscar/oscar.c:3134
 msgid "(There was an error receiving this message)"
 msgstr "(Houve um erro ao receber esta mensagem)"
 
-#: src/protocols/oscar/oscar.c:3304
+#: src/protocols/oscar/oscar.c:3320
 #, c-format
 msgid "%s has just asked to directly connect to %s"
 msgstr "%s acabou de pedir para ligar directamente em %s"
 
-#: src/protocols/oscar/oscar.c:3307
+#: src/protocols/oscar/oscar.c:3323
 msgid ""
 "This requires a direct connection between the two computers and is necessary "
 "for IM Images.  Because your IP address will be revealed, this may be "
@@ -7680,21 +7747,21 @@
 "para mensagens imediatas com imagens. Por revelar seu IP, isto pode ser "
 "considerado um risco de privacidade."
 
-#: src/protocols/oscar/oscar.c:3343
+#: src/protocols/oscar/oscar.c:3359
 msgid "Please authorize me so I can add you to my buddy list."
 msgstr ""
 "Por favor autorize-me para que eu possa adicioná-lo à minha lista de "
 "contactos."
 
-#: src/protocols/oscar/oscar.c:3351
+#: src/protocols/oscar/oscar.c:3367
 msgid "Authorization Request Message:"
 msgstr "Mensagem para pedido de autorização:"
 
-#: src/protocols/oscar/oscar.c:3352
+#: src/protocols/oscar/oscar.c:3368
 msgid "Please authorize me!"
 msgstr "Por favor autorize-me!"
 
-#: src/protocols/oscar/oscar.c:3382
+#: src/protocols/oscar/oscar.c:3398
 #, c-format
 msgid ""
 "The user %s requires authorization before being added to a buddy list.  Do "
@@ -7703,23 +7770,23 @@
 "O utilizador %s requer autorização antes de ser adicionado a uma lista de "
 "contactos. Deseja enviar um pedido de autorização?"
 
-#: src/protocols/oscar/oscar.c:3387 src/protocols/oscar/oscar.c:3389
+#: src/protocols/oscar/oscar.c:3403 src/protocols/oscar/oscar.c:3405
 msgid "Request Authorization"
 msgstr "Pedir autorização"
 
-#: src/protocols/oscar/oscar.c:3437 src/protocols/oscar/oscar.c:3439
-#: src/protocols/oscar/oscar.c:3446 src/protocols/oscar/oscar.c:3528
-#: src/protocols/oscar/oscar.c:3548 src/protocols/oscar/oscar.c:3902
-#: src/protocols/oscar/oscar.c:3962 src/protocols/oscar/oscar.c:6092
-#: src/protocols/oscar/oscar.c:6138
+#: src/protocols/oscar/oscar.c:3453 src/protocols/oscar/oscar.c:3455
+#: src/protocols/oscar/oscar.c:3462 src/protocols/oscar/oscar.c:3544
+#: src/protocols/oscar/oscar.c:3564 src/protocols/oscar/oscar.c:3918
+#: src/protocols/oscar/oscar.c:3978 src/protocols/oscar/oscar.c:6109
+#: src/protocols/oscar/oscar.c:6155
 msgid "No reason given."
 msgstr "Nenhum motivo foi dado."
 
-#: src/protocols/oscar/oscar.c:3445
+#: src/protocols/oscar/oscar.c:3461
 msgid "Authorization Denied Message:"
 msgstr "Mensagem de recusa de autorização:"
 
-#: src/protocols/oscar/oscar.c:3528
+#: src/protocols/oscar/oscar.c:3544
 #, c-format
 msgid ""
 "The user %u wants to add you to their buddy list for the following reason:\n"
@@ -7729,11 +7796,11 @@
 "motivo: \n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:3536 src/protocols/oscar/oscar.c:6098
+#: src/protocols/oscar/oscar.c:3552 src/protocols/oscar/oscar.c:6115
 msgid "Authorization Request"
 msgstr "Pedido de autorização"
 
-#: src/protocols/oscar/oscar.c:3548
+#: src/protocols/oscar/oscar.c:3564
 #, c-format
 msgid ""
 "The user %u has denied your request to add them to your buddy list for the "
@@ -7744,18 +7811,18 @@
 "pelo seguinte motivo:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:3549
+#: src/protocols/oscar/oscar.c:3565
 msgid "ICQ authorization denied."
 msgstr "Autorização do ICQ negada."
 
 #. Someone has granted you authorization
-#: src/protocols/oscar/oscar.c:3556
+#: src/protocols/oscar/oscar.c:3572
 #, c-format
 msgid "The user %u has granted your request to add them to your buddy list."
 msgstr ""
 "O utilizador %u aceitou seu pedido para adicioná-lo à sua lista de contactos."
 
-#: src/protocols/oscar/oscar.c:3564
+#: src/protocols/oscar/oscar.c:3580
 #, c-format
 msgid ""
 "You have received a special message\n"
@@ -7768,7 +7835,7 @@
 "De: %s [%s]\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:3572
+#: src/protocols/oscar/oscar.c:3588
 #, c-format
 msgid ""
 "You have received an ICQ page\n"
@@ -7781,7 +7848,7 @@
 "De: %s [%s]\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:3580
+#: src/protocols/oscar/oscar.c:3596
 #, c-format
 msgid ""
 "You have received an ICQ email from %s [%s]\n"
@@ -7794,34 +7861,34 @@
 "A mensagem é: \n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:3601
+#: src/protocols/oscar/oscar.c:3617
 #, c-format
 msgid "ICQ user %u has sent you a buddy: %s (%s)"
 msgstr "O utilizador de ICQ %u mandou-lhe um contacto: %s (%s)"
 
-#: src/protocols/oscar/oscar.c:3607
+#: src/protocols/oscar/oscar.c:3623
 msgid "Do you want to add this buddy to your buddy list?"
 msgstr "Quer adicionar este contacto à sua lista de contactos?"
 
-#: src/protocols/oscar/oscar.c:3611
+#: src/protocols/oscar/oscar.c:3627
 msgid "Decline"
 msgstr "Rejeitar"
 
-#: src/protocols/oscar/oscar.c:3696
+#: src/protocols/oscar/oscar.c:3712
 #, 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] "Perdeu %hu mensagem de %s por que era inválida."
 msgstr[1] "Perdeu %hu mensagens de %s por que eram inválidas."
 
-#: src/protocols/oscar/oscar.c:3705
+#: src/protocols/oscar/oscar.c:3721
 #, 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] "Perdeu %hu mensagem de %s porque era muito extensa."
 msgstr[1] "Perdeu %hu mensagens de %s porque eram muito extensas."
 
-#: src/protocols/oscar/oscar.c:3714
+#: src/protocols/oscar/oscar.c:3730
 #, c-format
 msgid ""
 "You missed %hu message from %s because the rate limit has been exceeded."
@@ -7832,75 +7899,70 @@
 msgstr[1] ""
 "Perdeu %hu mensagens de %s porque o limite de frequência foi excedido."
 
-#: src/protocols/oscar/oscar.c:3723
+#: src/protocols/oscar/oscar.c:3739
 #, 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] "Perdeu %hu mensagem de %s porque ele(a) foi muito malvado(a)."
 msgstr[1] "Perdeu %hu mensagens de %s porque ele(a) foi muito malvado(a)."
 
-#: src/protocols/oscar/oscar.c:3732
+#: src/protocols/oscar/oscar.c:3748
 #, 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] "Perdeu %hu mensagem de %s porque é muito malvado."
 msgstr[1] "Perdeu %hu mensagens de %s porque é muito malvado."
 
-#: src/protocols/oscar/oscar.c:3741
+#: src/protocols/oscar/oscar.c:3757
 #, 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] "Perdeu %hu mensagem de %s por um motivo desconhecido."
 msgstr[1] "Perdeu %hu mensagens de %s por um motivo desconhecido."
 
-#: src/protocols/oscar/oscar.c:3798 src/protocols/oscar/oscar.c:4022
+#: src/protocols/oscar/oscar.c:3814 src/protocols/oscar/oscar.c:4038
 #, c-format
 msgid "Info for %s"
 msgstr "Info de %s"
 
-#: src/protocols/oscar/oscar.c:3803
-#, c-format
-msgid "<B>UIN:</B> %s<BR><B>Status:</B> %s<HR>%s"
-msgstr "<B>UIN:</B> %s<BR><B>Estado:</B> %s<HR>%s"
-
-#: src/protocols/oscar/oscar.c:3864
+#: src/protocols/oscar/oscar.c:3880
 #, c-format
 msgid "SNAC threw error: %s\n"
 msgstr "Erro do SNAC: %s\n"
 
-#: src/protocols/oscar/oscar.c:3865
+#: src/protocols/oscar/oscar.c:3881
 msgid "Unknown error"
 msgstr "Erro desconhecido"
 
 #. Data is assumed to be the destination sn
-#: src/protocols/oscar/oscar.c:3900
+#: src/protocols/oscar/oscar.c:3916
 #, c-format
 msgid "Your message to %s did not get sent:"
 msgstr "A sua mensagem para %s não foi enviada:"
 
-#: src/protocols/oscar/oscar.c:3959
+#: src/protocols/oscar/oscar.c:3975
 #, c-format
 msgid "User information for %s unavailable:"
 msgstr "Informação do utilizador %s indisponível:"
 
-#: src/protocols/oscar/oscar.c:3982
+#: src/protocols/oscar/oscar.c:3998
 msgid "Warning Level"
 msgstr "Nível de Alerta"
 
-#: src/protocols/oscar/oscar.c:3985
+#: src/protocols/oscar/oscar.c:4001
 msgid "Online Since"
 msgstr "Desligado Desde"
 
-#: src/protocols/oscar/oscar.c:3989 src/protocols/yahoo/yahoo_profile.c:1113
+#: src/protocols/oscar/oscar.c:4005 src/protocols/yahoo/yahoo_profile.c:1118
 msgid "Member Since"
 msgstr "Membro Desde"
 
-#: src/protocols/oscar/oscar.c:4073
+#: src/protocols/oscar/oscar.c:4089
 msgid "Your AIM connection may be lost."
 msgstr "A sua ligação AIM pode ter sido perdida."
 
 #. The conversion failed!
-#: src/protocols/oscar/oscar.c:4259
+#: src/protocols/oscar/oscar.c:4275
 msgid ""
 "[Unable to display a message from this user because it contained invalid "
 "characters.]"
@@ -7908,11 +7970,11 @@
 "[Incapaz de mostrar uma mensagem deste utilizador porque continha caracteres "
 "inválidos.]"
 
-#: src/protocols/oscar/oscar.c:4476
+#: src/protocols/oscar/oscar.c:4492
 msgid "Rate limiting error."
 msgstr "Erro na limitação da taxa."
 
-#: src/protocols/oscar/oscar.c:4477
+#: src/protocols/oscar/oscar.c:4493
 msgid ""
 "The last action you attempted could not be performed because you are over "
 "the rate limit. Please wait 10 seconds and try again."
@@ -7920,120 +7982,120 @@
 "A última ação que tentou não pôde ser executada porque excedeu a taxa "
 "limite. Por favor espere 10 segundos e tente novamente."
 
-#: src/protocols/oscar/oscar.c:4540
+#: src/protocols/oscar/oscar.c:4556
 msgid ""
 "You have been disconnected because you have signed on with this screen name "
 "at another location."
 msgstr ""
 "Foi desligado porque ligou-se de outro local com o mesmo nome de utilizador."
 
-#: src/protocols/oscar/oscar.c:4542
+#: src/protocols/oscar/oscar.c:4558
 msgid "You have been signed off for an unknown reason."
 msgstr "Foi desligado por um motivo desconhecido."
 
-#: src/protocols/oscar/oscar.c:4573
+#: src/protocols/oscar/oscar.c:4589
 msgid "Finalizing connection"
 msgstr "Terminando ligação"
 
-#: src/protocols/oscar/oscar.c:4843 src/protocols/oscar/oscar.c:4850
+#: src/protocols/oscar/oscar.c:4859 src/protocols/oscar/oscar.c:4866
 msgid "Email Address"
 msgstr "Endereço de email"
 
-#: src/protocols/oscar/oscar.c:4855 src/protocols/silc/buddy.c:1524
+#: src/protocols/oscar/oscar.c:4871 src/protocols/silc/util.c:538
 msgid "Mobile Phone"
 msgstr "Telefone móvel"
 
-#: src/protocols/oscar/oscar.c:4856
+#: src/protocols/oscar/oscar.c:4872
 msgid "Not specified"
 msgstr "Não especificado"
 
-#: src/protocols/oscar/oscar.c:4857 src/protocols/trepia/trepia.c:281
+#: src/protocols/oscar/oscar.c:4873 src/protocols/trepia/trepia.c:281
 #: src/protocols/trepia/trepia.c:407
 msgid "Female"
 msgstr "Feminino"
 
-#: src/protocols/oscar/oscar.c:4857 src/protocols/trepia/trepia.c:280
+#: src/protocols/oscar/oscar.c:4873 src/protocols/trepia/trepia.c:280
 #: src/protocols/trepia/trepia.c:407
 msgid "Male"
 msgstr "Masculino"
 
-#: src/protocols/oscar/oscar.c:4873
+#: src/protocols/oscar/oscar.c:4889
 msgid "Personal Web Page"
 msgstr "Página da web pessoal"
 
-#: src/protocols/oscar/oscar.c:4877
+#: src/protocols/oscar/oscar.c:4893
 msgid "Additional Information"
 msgstr "Informações adicionais"
 
-#: src/protocols/oscar/oscar.c:4882
-msgid "Home Address"
-msgstr "Endereço de casa"
-
-#: src/protocols/oscar/oscar.c:4886 src/protocols/oscar/oscar.c:4894
-msgid "Zip Code"
-msgstr "Código Postal (CEP)"
-
-#: src/protocols/oscar/oscar.c:4890
-msgid "Work Address"
-msgstr "Endereço do trabalho"
-
 #: src/protocols/oscar/oscar.c:4898
+msgid "Home Address"
+msgstr "Endereço de casa"
+
+#: src/protocols/oscar/oscar.c:4902 src/protocols/oscar/oscar.c:4910
+msgid "Zip Code"
+msgstr "Código Postal (CEP)"
+
+#: src/protocols/oscar/oscar.c:4906
+msgid "Work Address"
+msgstr "Endereço do trabalho"
+
+#: src/protocols/oscar/oscar.c:4914
 msgid "Work Information"
 msgstr "Informações do trabalho"
 
-#: src/protocols/oscar/oscar.c:4899
+#: src/protocols/oscar/oscar.c:4915
 msgid "Company"
 msgstr "Empresa"
 
-#: src/protocols/oscar/oscar.c:4900
+#: src/protocols/oscar/oscar.c:4916
 msgid "Division"
 msgstr "Divisão"
 
-#: src/protocols/oscar/oscar.c:4901
+#: src/protocols/oscar/oscar.c:4917
 msgid "Position"
 msgstr "Posição"
 
-#: src/protocols/oscar/oscar.c:4903
+#: src/protocols/oscar/oscar.c:4919
 msgid "Web Page"
 msgstr "Página da web"
 
-#: src/protocols/oscar/oscar.c:4909
+#: src/protocols/oscar/oscar.c:4925
 #, c-format
 msgid "ICQ Info for %s"
 msgstr "Informações ICQ de %s:"
 
-#: src/protocols/oscar/oscar.c:4958
+#: src/protocols/oscar/oscar.c:4974
 msgid "Pop-Up Message"
 msgstr "Mensagem de Pop-Up"
 
-#: src/protocols/oscar/oscar.c:4979
+#: src/protocols/oscar/oscar.c:4995
 #, c-format
 msgid "The following screen names are associated with %s"
 msgstr "Os nomes de utilizador seguintes estão associados a %s"
 
-#: src/protocols/oscar/oscar.c:4983
+#: src/protocols/oscar/oscar.c:4999
 msgid "Search Results"
 msgstr "Resultados da Procura"
 
-#: src/protocols/oscar/oscar.c:5000
+#: src/protocols/oscar/oscar.c:5016
 #, c-format
 msgid "No results found for email address %s"
 msgstr "Nenhum resultado encontrado para o endereço de email %s"
 
-#: src/protocols/oscar/oscar.c:5021
+#: src/protocols/oscar/oscar.c:5037
 #, c-format
 msgid "You should receive an email asking to confirm %s."
 msgstr "Deve receber um email pedindo para confirmar %s."
 
-#: src/protocols/oscar/oscar.c:5023
+#: src/protocols/oscar/oscar.c:5039
 msgid "Account Confirmation Requested"
 msgstr "Confirmação de conta recebida"
 
-#: src/protocols/oscar/oscar.c:5051
+#: src/protocols/oscar/oscar.c:5067
 msgid "Error Changing Account Info"
 msgstr "Erro ao mudar informações da conta"
 
-#: src/protocols/oscar/oscar.c:5054
+#: src/protocols/oscar/oscar.c:5070
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
@@ -8042,7 +8104,7 @@
 "Erro 0x%04x: Impossível formatar nome de utilizador pois o nome requisitado "
 "difere do original."
 
-#: src/protocols/oscar/oscar.c:5057
+#: src/protocols/oscar/oscar.c:5073
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
@@ -8051,7 +8113,7 @@
 "Erro 0x%04x: Impossível formatar nome de utilizador pois o nome requisitado "
 "termina com um espaço."
 
-#: src/protocols/oscar/oscar.c:5060
+#: src/protocols/oscar/oscar.c:5076
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
@@ -8060,7 +8122,7 @@
 "Erro 0x%04x: Impossível formatar nome de utilizador pois o nome requisitado "
 "é muito extenso."
 
-#: src/protocols/oscar/oscar.c:5063
+#: src/protocols/oscar/oscar.c:5079
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change email address because there is already a "
@@ -8069,7 +8131,7 @@
 "Erro 0x%04x: Impossível mudar endereço de email porque já existe um pedido "
 "pendente para esse nome de utilizador."
 
-#: src/protocols/oscar/oscar.c:5066
+#: src/protocols/oscar/oscar.c:5082
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change email address because the given address has "
@@ -8078,7 +8140,7 @@
 "Erro 0x%04x: Impossível mudar o endereço de email porque este já possui "
 "muitos nomes de utilizador associados a ele."
 
-#: src/protocols/oscar/oscar.c:5069
+#: src/protocols/oscar/oscar.c:5085
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change email address because the given address is "
@@ -8086,12 +8148,12 @@
 msgstr ""
 "Erro 0x%04x: Impossível mudar o endereço de email porque este é inválido."
 
-#: src/protocols/oscar/oscar.c:5072
+#: src/protocols/oscar/oscar.c:5088
 #, c-format
 msgid "Error 0x%04x: Unknown error."
 msgstr "Erro 0x%04x: Erro desconhecido."
 
-#: src/protocols/oscar/oscar.c:5082
+#: src/protocols/oscar/oscar.c:5098
 #, c-format
 msgid ""
 "Your screen name is currently formatted as follows:\n"
@@ -8100,27 +8162,27 @@
 "Actualmente, o seu nome de utilizador está formatado desta maneira:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:5083 src/protocols/oscar/oscar.c:5090
+#: src/protocols/oscar/oscar.c:5099 src/protocols/oscar/oscar.c:5106
 msgid "Account Info"
 msgstr "Informações da conta"
 
-#: src/protocols/oscar/oscar.c:5088
+#: src/protocols/oscar/oscar.c:5104
 #, c-format
 msgid "The email address for %s is %s"
 msgstr "O endereço de email de %s é %s"
 
-#: src/protocols/oscar/oscar.c:5153
+#: src/protocols/oscar/oscar.c:5169
 msgid ""
 "Your IM Image was not sent. You must be Direct Connected to send IM Images."
 msgstr ""
 "A sua Imagem MI não foi enviada. Tem de estar Directamente Ligado para "
 "enviar Imagens MI."
 
-#: src/protocols/oscar/oscar.c:5326
+#: src/protocols/oscar/oscar.c:5342
 msgid "Unable to set AIM profile."
 msgstr "Impossivel definir perfil AIM."
 
-#: src/protocols/oscar/oscar.c:5327
+#: src/protocols/oscar/oscar.c:5343
 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 "
@@ -8130,7 +8192,7 @@
 "procedimento de ligação ser concluído. O seu perfil continua o mesmo; tente "
 "defini-lo novamente quando estiver totalmente ligado."
 
-#: src/protocols/oscar/oscar.c:5354
+#: src/protocols/oscar/oscar.c:5370
 #, c-format
 msgid ""
 "The maximum profile length of %d byte has been exceeded.  Gaim has truncated "
@@ -8145,19 +8207,19 @@
 "O tamanho máximo de %d bytes do seu perfil foi excedido. O Gaim truncou-o "
 "por si."
 
-#: src/protocols/oscar/oscar.c:5359
+#: src/protocols/oscar/oscar.c:5375
 msgid "Profile too long."
 msgstr "Perfil muito extenso."
 
-#: src/protocols/oscar/oscar.c:5375 src/protocols/oscar/oscar.c:6671
+#: src/protocols/oscar/oscar.c:5391 src/protocols/oscar/oscar.c:6688
 msgid "Visible"
 msgstr "Visível"
 
-#: src/protocols/oscar/oscar.c:5393
+#: src/protocols/oscar/oscar.c:5409
 msgid "Unable to set AIM away message."
 msgstr "Impossível definir mensagem de ausência do AIM."
 
-#: src/protocols/oscar/oscar.c:5394
+#: src/protocols/oscar/oscar.c:5410
 msgid ""
 "You have probably requested to set your away message before the login "
 "procedure completed.  You remain in a \"present\" state; try setting it "
@@ -8167,7 +8229,7 @@
 "do procedimento de ligação ser concluído. Permanece com um estado \"presente"
 "\"; tente defini-lo novamente quando estiver totalmente ligado."
 
-#: src/protocols/oscar/oscar.c:5434
+#: src/protocols/oscar/oscar.c:5450
 #, c-format
 msgid ""
 "The maximum away message length of %d byte has been exceeded.  Gaim has "
@@ -8182,11 +8244,11 @@
 "O tamanho máximo de %d bytes da mensagem de ausência foi excedido. O Gaim "
 "truncou-a e definiu seu estado como ausente."
 
-#: src/protocols/oscar/oscar.c:5439
+#: src/protocols/oscar/oscar.c:5455
 msgid "Away message too long."
 msgstr "Mensagem de ausência muito extensa."
 
-#: src/protocols/oscar/oscar.c:5517
+#: src/protocols/oscar/oscar.c:5533
 #, c-format
 msgid ""
 "Could not add the buddy %s because the screen name is invalid.  Screen names "
@@ -8197,16 +8259,16 @@
 "Nomes de utilizador têem que começar com uma letra e conter apenas letras, "
 "números e espaços, ou conter apenas números."
 
-#: src/protocols/oscar/oscar.c:5518 src/protocols/oscar/oscar.c:5959
-#: src/protocols/oscar/oscar.c:5972
+#: src/protocols/oscar/oscar.c:5534 src/protocols/oscar/oscar.c:5976
+#: src/protocols/oscar/oscar.c:5989
 msgid "Unable To Add"
 msgstr "Impossível adicionar"
 
-#: src/protocols/oscar/oscar.c:5678
+#: src/protocols/oscar/oscar.c:5695
 msgid "Unable To Retrieve Buddy List"
 msgstr "Impossível recuperar lista de contactos"
 
-#: src/protocols/oscar/oscar.c:5679
+#: src/protocols/oscar/oscar.c:5696
 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 "
@@ -8216,13 +8278,13 @@
 "momento. Sua lista de contactos não foi perdida, e provavelmente estará "
 "disponível em algumas horas."
 
-#: src/protocols/oscar/oscar.c:5855 src/protocols/oscar/oscar.c:5856
-#: src/protocols/oscar/oscar.c:5861 src/protocols/oscar/oscar.c:6016
-#: src/protocols/oscar/oscar.c:6017 src/protocols/oscar/oscar.c:6022
+#: src/protocols/oscar/oscar.c:5872 src/protocols/oscar/oscar.c:5873
+#: src/protocols/oscar/oscar.c:5878 src/protocols/oscar/oscar.c:6033
+#: src/protocols/oscar/oscar.c:6034 src/protocols/oscar/oscar.c:6039
 msgid "Orphans"
 msgstr "Órfãos"
 
-#: src/protocols/oscar/oscar.c:5958
+#: src/protocols/oscar/oscar.c:5975
 #, c-format
 msgid ""
 "Could not add the buddy %s because you have too many buddies in your buddy "
@@ -8231,11 +8293,11 @@
 "Não foi possível adicionar o contacto %s porque tem muitos contactos na sua "
 "lista de contactos. Por favor remova um e tente novamente."
 
-#: src/protocols/oscar/oscar.c:5958 src/protocols/oscar/oscar.c:5971
+#: src/protocols/oscar/oscar.c:5975 src/protocols/oscar/oscar.c:5988
 msgid "(no name)"
 msgstr "(sem nome)"
 
-#: src/protocols/oscar/oscar.c:5971
+#: src/protocols/oscar/oscar.c:5988
 #, c-format
 msgid ""
 "Could not add the buddy %s for an unknown reason.  The most common reason "
@@ -8246,7 +8308,7 @@
 "motivo mais comum para isso é que tem o número máximo de contactos permitido "
 "na sua lista de contactos."
 
-#: src/protocols/oscar/oscar.c:6053
+#: src/protocols/oscar/oscar.c:6070
 #, c-format
 msgid ""
 "The user %s has given you permission to add you to their buddy list.  Do you "
@@ -8255,11 +8317,11 @@
 "O utilizador %s deu-lhe permissão para adicioná-lo à sua lista de contactos. "
 "Deseja adicioná-lo?"
 
-#: src/protocols/oscar/oscar.c:6059
+#: src/protocols/oscar/oscar.c:6076
 msgid "Authorization Given"
 msgstr "Autorização concedida"
 
-#: src/protocols/oscar/oscar.c:6092
+#: src/protocols/oscar/oscar.c:6109
 #, c-format
 msgid ""
 "The user %s wants to add you to their buddy list for the following reason:\n"
@@ -8270,19 +8332,19 @@
 "%s"
 
 #. Granted
-#: src/protocols/oscar/oscar.c:6134
+#: src/protocols/oscar/oscar.c:6151
 #, c-format
 msgid "The user %s has granted your request to add them to your buddy list."
 msgstr ""
 "O utilizador %s aceitou o seu pedido para adicioná-lo à sua lista de "
 "contactos."
 
-#: src/protocols/oscar/oscar.c:6135
+#: src/protocols/oscar/oscar.c:6152
 msgid "Authorization Granted"
 msgstr "Autorização concedida"
 
 #. Denied
-#: src/protocols/oscar/oscar.c:6138
+#: src/protocols/oscar/oscar.c:6155
 #, c-format
 msgid ""
 "The user %s has denied your request to add them to your buddy list for the "
@@ -8293,74 +8355,74 @@
 "pelo seguinte motivo:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:6139
+#: src/protocols/oscar/oscar.c:6156
 msgid "Authorization Denied"
 msgstr "Autorização negada"
 
-#: src/protocols/oscar/oscar.c:6176 src/protocols/toc/toc.c:1271
+#: src/protocols/oscar/oscar.c:6193 src/protocols/toc/toc.c:1271
 msgid "_Exchange:"
 msgstr "_Troca:"
 
-#: src/protocols/oscar/oscar.c:6198
+#: src/protocols/oscar/oscar.c:6215
 msgid "Invalid chat name specified."
 msgstr "O nome de chat especificado é inválido."
 
-#: src/protocols/oscar/oscar.c:6288
+#: src/protocols/oscar/oscar.c:6305
 msgid "Your IM Image was not sent. You cannot send IM Images in AIM chats."
 msgstr ""
 "A sua Imagem MI não foi enviada. Não pode enviar Imagens MI em chats AIM."
 
-#: src/protocols/oscar/oscar.c:6445
+#: src/protocols/oscar/oscar.c:6462
 msgid "Away Message"
 msgstr "Mensagem de Ausência"
 
-#: src/protocols/oscar/oscar.c:6729
+#: src/protocols/oscar/oscar.c:6746
 msgid "Buddy Comment:"
 msgstr "Comentário de Contacto:"
 
-#: src/protocols/oscar/oscar.c:6747
+#: src/protocols/oscar/oscar.c:6764
 msgid "Edit Buddy Comment"
 msgstr "Editar Comentário de Contacto"
 
-#: src/protocols/oscar/oscar.c:6753
+#: src/protocols/oscar/oscar.c:6770
 msgid "Get Status Msg"
 msgstr "Ver Msg de Estado"
 
-#: src/protocols/oscar/oscar.c:6765
+#: src/protocols/oscar/oscar.c:6782
 msgid "Direct IM"
 msgstr "MI Directa"
 
-#: src/protocols/oscar/oscar.c:6788
+#: src/protocols/oscar/oscar.c:6804
 msgid "Re-request Authorization"
 msgstr "Re-requisitar Autorização"
 
-#: src/protocols/oscar/oscar.c:6818
+#: src/protocols/oscar/oscar.c:6834
 msgid "The new formatting is invalid."
 msgstr "A nova formatação é inválida."
 
-#: src/protocols/oscar/oscar.c:6819
+#: src/protocols/oscar/oscar.c:6835
 msgid "Screen name formatting can change only capitalization and whitespace."
 msgstr ""
 "A formatação do nome de utilizador pode mudar apenas a capitalização e os "
 "espaços em branco."
 
-#: src/protocols/oscar/oscar.c:6826
+#: src/protocols/oscar/oscar.c:6842
 msgid "New screen name formatting:"
 msgstr "Nova formatação do nome do utilizador:"
 
-#: src/protocols/oscar/oscar.c:6878
+#: src/protocols/oscar/oscar.c:6894
 msgid "Change Address To:"
 msgstr "Mudar endereço para:"
 
-#: src/protocols/oscar/oscar.c:6923
+#: src/protocols/oscar/oscar.c:6939
 msgid "<i>you are not waiting for authorization</i>"
 msgstr "<i>não está à espera de autorização</i>"
 
-#: src/protocols/oscar/oscar.c:6926
+#: src/protocols/oscar/oscar.c:6942
 msgid "You are awaiting authorization from the following buddies"
 msgstr "Está à espera de autorização dos seguintes contactos"
 
-#: src/protocols/oscar/oscar.c:6927
+#: src/protocols/oscar/oscar.c:6943
 msgid ""
 "You can re-request authorization from these buddies by right-clicking on "
 "them and selecting \"Re-request Authorization.\""
@@ -8368,75 +8430,75 @@
 "Pode re-requisitar autorização destes contactos clicando com o botão direito "
 "neles e seleccionando \"Re-requisitar autorização.\""
 
-#: src/protocols/oscar/oscar.c:6944
+#: src/protocols/oscar/oscar.c:6960
 msgid "Find Buddy by E-mail"
 msgstr "Encontrar Contacto por E-mail"
 
-#: src/protocols/oscar/oscar.c:6945
+#: src/protocols/oscar/oscar.c:6961
 msgid "Search for a buddy by e-mail address"
 msgstr "Pesquisar Contactos por morada de e-mail"
 
-#: src/protocols/oscar/oscar.c:6946
+#: src/protocols/oscar/oscar.c:6962
 msgid "Type the e-mail address of the buddy you are searching for."
 msgstr "Digite a morada de e-mail do contacto que pesquisa."
 
-#: src/protocols/oscar/oscar.c:6963
+#: src/protocols/oscar/oscar.c:6979
 msgid "Available Message:"
 msgstr "Mensagem de 'Disponível':"
 
-#: src/protocols/oscar/oscar.c:6964
+#: src/protocols/oscar/oscar.c:6980
 msgid "I'm doing work and hoping for a distraction--IM me!"
 msgstr "Estou a trabalhar e esperando uma distracção--mandem-me uma MI!"
 
-#: src/protocols/oscar/oscar.c:7045 src/protocols/silc/silc.c:782
+#: src/protocols/oscar/oscar.c:7061 src/protocols/silc/silc.c:789
 msgid "Set User Info..."
 msgstr "Definir Informações de Utilizador..."
 
-#: src/protocols/oscar/oscar.c:7050
+#: src/protocols/oscar/oscar.c:7066
 msgid "Set User Info (URL)..."
 msgstr "Definir Info de Utilizador (URL)..."
 
-#: src/protocols/oscar/oscar.c:7056
+#: src/protocols/oscar/oscar.c:7072
 msgid "Set Available Message..."
 msgstr "Definir Mensagem Disponível..."
 
-#: src/protocols/oscar/oscar.c:7061 src/protocols/silc/silc.c:778
+#: src/protocols/oscar/oscar.c:7077 src/protocols/silc/silc.c:785
 msgid "Change Password..."
 msgstr "Alterar Senha..."
 
-#: src/protocols/oscar/oscar.c:7066
+#: src/protocols/oscar/oscar.c:7082
 msgid "Change Password (URL)"
 msgstr "Mudar Senha (URL)"
 
-#: src/protocols/oscar/oscar.c:7070
+#: src/protocols/oscar/oscar.c:7086
 msgid "Configure IM Forwarding (URL)"
 msgstr "Configurar Redirecção de MI (URL)"
 
-#: src/protocols/oscar/oscar.c:7079
+#: src/protocols/oscar/oscar.c:7095
 msgid "Format Screen Name..."
 msgstr "Formatar Nome de Utilizador..."
 
-#: src/protocols/oscar/oscar.c:7083
+#: src/protocols/oscar/oscar.c:7099
 msgid "Confirm Account"
 msgstr "Confirmar Conta"
 
-#: src/protocols/oscar/oscar.c:7087
+#: src/protocols/oscar/oscar.c:7103
 msgid "Display Currently Registered Address"
 msgstr "Mostrar o Endereço Registado Actualmente"
 
-#: src/protocols/oscar/oscar.c:7091
+#: src/protocols/oscar/oscar.c:7107
 msgid "Change Currently Registered Address..."
-msgstr "Mudar o Endereço Registado Actualmente"
-
-#: src/protocols/oscar/oscar.c:7098
+msgstr "Mudar o Endereço Registado Actualmente..."
+
+#: src/protocols/oscar/oscar.c:7114
 msgid "Show Buddies Awaiting Authorization"
 msgstr "Mostrar contactos esperando autorização"
 
-#: src/protocols/oscar/oscar.c:7104
+#: src/protocols/oscar/oscar.c:7120
 msgid "Search for Buddy by Email..."
-msgstr "Procurar Contacto por Email"
-
-#: src/protocols/oscar/oscar.c:7109
+msgstr "Procurar Contacto por Email..."
+
+#: src/protocols/oscar/oscar.c:7125
 msgid "Search for Buddy by Information"
 msgstr "Procurar Contacto por Informação"
 
@@ -8451,15 +8513,15 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/oscar/oscar.c:7225 src/protocols/oscar/oscar.c:7227
+#: src/protocols/oscar/oscar.c:7243 src/protocols/oscar/oscar.c:7245
 msgid "AIM/ICQ Protocol Plugin"
 msgstr "Plugin do protocolo AIM/ICQ"
 
-#: src/protocols/oscar/oscar.c:7246
+#: src/protocols/oscar/oscar.c:7264
 msgid "Auth host"
 msgstr "Host de autorização"
 
-#: src/protocols/oscar/oscar.c:7251
+#: src/protocols/oscar/oscar.c:7269
 msgid "Auth port"
 msgstr "Porto de autorização"
 
@@ -8548,32 +8610,32 @@
 msgstr "Definit Senha de IM"
 
 #: src/protocols/silc/buddy.c:506 src/protocols/silc/buddy.c:541
-#: src/protocols/silc/ops.c:1080 src/protocols/silc/ops.c:1091
+#: src/protocols/silc/ops.c:1256 src/protocols/silc/ops.c:1267
 msgid "Get Public Key"
 msgstr "Obter Chave Pública"
 
-#: src/protocols/silc/buddy.c:542 src/protocols/silc/ops.c:1081
-#: src/protocols/silc/ops.c:1092
+#: src/protocols/silc/buddy.c:542 src/protocols/silc/ops.c:1257
+#: src/protocols/silc/ops.c:1268
 msgid "Cannot fetch the public key"
 msgstr "Impossível obter a chave pública"
 
-#: src/protocols/silc/buddy.c:629 src/protocols/silc/buddy.c:1619
+#: src/protocols/silc/buddy.c:629 src/protocols/silc/buddy.c:1544
 msgid "Show Public Key"
 msgstr "Mostrar Chave Pública"
 
 #: src/protocols/silc/buddy.c:630 src/protocols/silc/buddy.c:989
-#: src/protocols/silc/chat.c:219
+#: src/protocols/silc/chat.c:222
 msgid "Could not load public key"
 msgstr "Impossível carregar chave pública"
 
-#: src/protocols/silc/buddy.c:707 src/protocols/silc/ops.c:837
-#: src/protocols/silc/ops.c:908 src/protocols/silc/ops.c:991
-#: src/protocols/silc/ops.c:992 src/protocols/silc/ops.c:998
-#: src/protocols/silc/ops.c:999
+#: src/protocols/silc/buddy.c:707 src/protocols/silc/ops.c:853
+#: src/protocols/silc/ops.c:925 src/protocols/silc/ops.c:1060
+#: src/protocols/silc/ops.c:1061 src/protocols/silc/ops.c:1079
 msgid "User Information"
 msgstr "Informação do Utilizador"
 
-#: src/protocols/silc/buddy.c:708 src/protocols/silc/ops.c:909
+#: src/protocols/silc/buddy.c:708 src/protocols/silc/ops.c:926
+#: src/protocols/silc/ops.c:1080
 msgid "Cannot get user information"
 msgstr "Incapaz de obter informação do utilizador"
 
@@ -8590,6 +8652,11 @@
 "Não pode receber notificações de um contacto antes de importar a sua chave "
 "pública.  Pode usar o comando Obter Chave Pública para obter a chave pública."
 
+#. Open file selector to select the public key.
+#: src/protocols/silc/buddy.c:1023
+msgid "Open..."
+msgstr "Abrir..."
+
 #: src/protocols/silc/buddy.c:1032
 #, c-format
 msgid "The %s buddy is not present in the network"
@@ -8650,143 +8717,111 @@
 msgid "Robot"
 msgstr "Robot"
 
-#: src/protocols/silc/buddy.c:1396 src/protocols/silc/buddy.c:1464
-#: src/protocols/silc/silc.c:606
+#: src/protocols/silc/buddy.c:1396 src/protocols/silc/silc.c:610
+#: src/protocols/silc/util.c:469
 msgid "Happy"
 msgstr "Feliz"
 
-#: src/protocols/silc/buddy.c:1398 src/protocols/silc/buddy.c:1466
-#: src/protocols/silc/silc.c:608
+#: src/protocols/silc/buddy.c:1398 src/protocols/silc/silc.c:612
+#: src/protocols/silc/util.c:471
 msgid "Sad"
 msgstr "Triste"
 
-#: src/protocols/silc/buddy.c:1400 src/protocols/silc/buddy.c:1468
-#: src/protocols/silc/silc.c:610
+#: src/protocols/silc/buddy.c:1400 src/protocols/silc/silc.c:614
+#: src/protocols/silc/util.c:473
 msgid "Angry"
 msgstr "Zangado"
 
-#: src/protocols/silc/buddy.c:1402 src/protocols/silc/buddy.c:1470
-#: src/protocols/silc/silc.c:612
+#: src/protocols/silc/buddy.c:1402 src/protocols/silc/silc.c:616
+#: src/protocols/silc/util.c:475
 msgid "Jealous"
 msgstr "Invejoso"
 
-#: src/protocols/silc/buddy.c:1404 src/protocols/silc/buddy.c:1472
-#: src/protocols/silc/silc.c:614
+#: src/protocols/silc/buddy.c:1404 src/protocols/silc/silc.c:618
+#: src/protocols/silc/util.c:477
 msgid "Ashamed"
 msgstr "Envergonhado"
 
-#: src/protocols/silc/buddy.c:1406 src/protocols/silc/buddy.c:1474
-#: src/protocols/silc/silc.c:616
+#: src/protocols/silc/buddy.c:1406 src/protocols/silc/silc.c:620
+#: src/protocols/silc/util.c:479
 msgid "Invincible"
 msgstr "Invencível"
 
-#: src/protocols/silc/buddy.c:1408 src/protocols/silc/buddy.c:1476
-#: src/protocols/silc/silc.c:618
+#: src/protocols/silc/buddy.c:1408 src/protocols/silc/silc.c:622
+#: src/protocols/silc/util.c:481
 msgid "In Love"
 msgstr "Apaixonado"
 
-#: src/protocols/silc/buddy.c:1410 src/protocols/silc/buddy.c:1478
-#: src/protocols/silc/silc.c:620
+#: src/protocols/silc/buddy.c:1410 src/protocols/silc/silc.c:624
+#: src/protocols/silc/util.c:483
 msgid "Sleepy"
 msgstr "Sonolento"
 
-#: src/protocols/silc/buddy.c:1412 src/protocols/silc/buddy.c:1480
-#: src/protocols/silc/silc.c:622
+#: src/protocols/silc/buddy.c:1412 src/protocols/silc/silc.c:626
+#: src/protocols/silc/util.c:485
 msgid "Bored"
 msgstr "Entediado"
 
-#: src/protocols/silc/buddy.c:1414 src/protocols/silc/buddy.c:1482
-#: src/protocols/silc/silc.c:624
+#: src/protocols/silc/buddy.c:1414 src/protocols/silc/silc.c:628
+#: src/protocols/silc/util.c:487
 msgid "Excited"
 msgstr "Excitado"
 
-#: src/protocols/silc/buddy.c:1416 src/protocols/silc/buddy.c:1484
-#: src/protocols/silc/silc.c:626
+#: src/protocols/silc/buddy.c:1416 src/protocols/silc/silc.c:630
+#: src/protocols/silc/util.c:489
 msgid "Anxious"
 msgstr "Ansioso"
 
-#: src/protocols/silc/buddy.c:1452
-msgid "Modes"
-msgstr "Modos"
-
-#: src/protocols/silc/buddy.c:1462
+#: src/protocols/silc/buddy.c:1448 src/protocols/silc/ops.c:962
+msgid "User Modes"
+msgstr "Modos de Utilizador"
+
+#: src/protocols/silc/buddy.c:1457 src/protocols/silc/ops.c:971
 msgid "Mood"
 msgstr "Disposição"
 
-#: src/protocols/silc/buddy.c:1490
+#: src/protocols/silc/buddy.c:1461 src/protocols/silc/ops.c:977
 msgid "Status Text"
 msgstr "Estado Texto"
 
-#: src/protocols/silc/buddy.c:1495
+#: src/protocols/silc/buddy.c:1466 src/protocols/silc/ops.c:983
 msgid "Preferred Contact"
 msgstr "Contacto Preferido"
 
-#: src/protocols/silc/buddy.c:1503
-msgid "Paging"
-msgstr "Paging"
-
-#: src/protocols/silc/buddy.c:1505 src/protocols/silc/silc.c:637
-msgid "SMS"
-msgstr "SMS"
-
-#: src/protocols/silc/buddy.c:1507 src/protocols/silc/silc.c:639
-msgid "MMS"
-msgstr "MMS"
-
-#: src/protocols/silc/buddy.c:1509 src/protocols/silc/silc.c:641
-msgid "Video Conferencing"
-msgstr "Vídeo Conferência"
-
-#: src/protocols/silc/buddy.c:1515
+#: src/protocols/silc/buddy.c:1471 src/protocols/silc/ops.c:988
 msgid "Preferred Language"
 msgstr "Língua Preferida"
 
-#: src/protocols/silc/buddy.c:1520
+#: src/protocols/silc/buddy.c:1476 src/protocols/silc/ops.c:993
 msgid "Device"
 msgstr "Dispositivo"
 
-#: src/protocols/silc/buddy.c:1522
-msgid "Computer"
-msgstr "Computador"
-
-#: src/protocols/silc/buddy.c:1526
-msgid "PDA"
-msgstr "PDA"
-
-#: src/protocols/silc/buddy.c:1528
-msgid "Terminal"
-msgstr "Terminal"
-
-#: src/protocols/silc/buddy.c:1539 src/protocols/silc/silc.c:674
-#: src/protocols/silc/silc.c:676
+#: src/protocols/silc/buddy.c:1481 src/protocols/silc/ops.c:998
+#: src/protocols/silc/silc.c:678 src/protocols/silc/silc.c:680
 msgid "Timezone"
 msgstr "Fuzo Horário"
 
-#: src/protocols/silc/buddy.c:1545
+#: src/protocols/silc/buddy.c:1486 src/protocols/silc/ops.c:1003
 msgid "Geolocation"
 msgstr "Geolocalização"
 
-#: src/protocols/silc/buddy.c:1604
+#: src/protocols/silc/buddy.c:1529
 msgid "Reset IM Key"
 msgstr "Redefinir chave de MI"
 
-#: src/protocols/silc/buddy.c:1609
+#: src/protocols/silc/buddy.c:1534
 msgid "IM with Key Exchange"
 msgstr "MI com Troca de Chave"
 
-#: src/protocols/silc/buddy.c:1613
+#: src/protocols/silc/buddy.c:1538
 msgid "IM with Password"
 msgstr "MI com Senha"
 
-#: src/protocols/silc/buddy.c:1624
+#: src/protocols/silc/buddy.c:1549
 msgid "Get Public Key..."
 msgstr "Obter Chave Pública..."
 
-#: src/protocols/silc/buddy.c:1629
-msgid "Send File..."
-msgstr "Enviar Ficheiro..."
-
-#: src/protocols/silc/buddy.c:1634 src/protocols/silc/ops.c:1127
+#: src/protocols/silc/buddy.c:1555 src/protocols/silc/ops.c:1389
 msgid "Kill User"
 msgstr "Matar Utilizador"
 
@@ -8799,8 +8834,7 @@
 msgid "Channel %s does not exist in the network"
 msgstr "O canal %s não existe na rede"
 
-#: src/protocols/silc/chat.c:67 src/protocols/silc/chat.c:154
-#: src/protocols/silc/chat.c:155
+#: src/protocols/silc/chat.c:67 src/protocols/silc/chat.c:159
 msgid "Channel Information"
 msgstr "Informação do Canal"
 
@@ -8808,90 +8842,68 @@
 msgid "Cannot get channel information"
 msgstr "Incapaz de obter informação do canal"
 
-#: src/protocols/silc/chat.c:104
-#, c-format
-msgid "Channel Name:\t\t%s\n"
-msgstr "Nome do Canal:\t\t%s\n"
-
-#: src/protocols/silc/chat.c:106
-#, c-format
-msgid "User Count:\t\t%d\n"
-msgstr "Número de Utilizadores:\t\t%d\n"
-
-#: src/protocols/silc/chat.c:112
-#, c-format
-msgid "Channel Founder:\t%s\n"
-msgstr "Fundador do Canal:\t%s\n"
-
-#: src/protocols/silc/chat.c:120
-#, c-format
-msgid "Channel Cipher:\t\t%s\n"
-msgstr "cifra do Canal:\t\t%s\n"
-
-#: src/protocols/silc/chat.c:123
-#, c-format
-msgid "Channel HMAC:\t\t%s\n"
-msgstr "HMAC do Canal:\t\t%s\n"
+#: src/protocols/silc/chat.c:105
+#, c-format
+msgid "<b>Channel Name:</b> %s"
+msgstr "<b>Nome do Canal:</b> %s"
+
+#: src/protocols/silc/chat.c:108
+#, c-format
+msgid "<br><b>User Count:</b> %d"
+msgstr "<br><b>Número de Utilizadores:</b> %d"
+
+#: src/protocols/silc/chat.c:115
+#, c-format
+msgid "<br><b>Channel Founder:</b> %s"
+msgstr "<br><b>Fundador do Canal:</b> %s"
+
+#: src/protocols/silc/chat.c:124
+#, c-format
+msgid "<br><b>Channel Cipher:</b> %s"
+msgstr "<br><b>cifra do Canal:</b> %s"
 
 #: src/protocols/silc/chat.c:127
 #, c-format
-msgid ""
-"\n"
-"Channel Topic:\n"
-"\t%s\n"
-msgstr ""
-"\n"
-"Tópico do Canal:\n"
-"\t%s\n"
-
-#: src/protocols/silc/chat.c:130
-msgid ""
-"\n"
-"Channel Modes:\n"
-msgstr ""
-"\n"
-"Modos do Canal:\n"
-
-#: src/protocols/silc/chat.c:144
-#, c-format
-msgid ""
-"\n"
-"Founder Key Fingerprint:\n"
-"%s\n"
-"\n"
-msgstr ""
-"\n"
-"Impressão Digital da Chave do Fundador:\n"
-"%s\n"
-"\n"
-
-#: src/protocols/silc/chat.c:145
-#, c-format
-msgid ""
-"Founder Key Babbleprint:\n"
-"%s"
-msgstr ""
-"Babbleprint da Chave do Fundador:\n"
-"%s"
-
-#: src/protocols/silc/chat.c:218
+msgid "<br><b>Channel HMAC:</b> %s"
+msgstr "<br><b>HMAC do Canal:</b>%s"
+
+#: src/protocols/silc/chat.c:132
+#, c-format
+msgid "<br><b>Channel Topic:</b><br>%s"
+msgstr "<br><b>Tópico do Canal:</b><br>%s"
+
+#: src/protocols/silc/chat.c:137
+msgid "<br><b>Channel Modes:</b> "
+msgstr "<br><b>Modos do Canal:</b> "
+
+#: src/protocols/silc/chat.c:150
+#, c-format
+msgid "<br><b>Founder Key Fingerprint:</b><br>%s"
+msgstr "<br><b>Impressão Digital da Chave do Fundador:</b><br>%s"
+
+#: src/protocols/silc/chat.c:151
+#, c-format
+msgid "<br><b>Founder Key Babbleprint:</b><br>%s"
+msgstr "<br><b>Babbleprint da Chave do Fundador:</b><br>%s"
+
+#: src/protocols/silc/chat.c:221
 msgid "Add Channel Public Key"
 msgstr "Adicionar Chave Pública do Canal"
 
 #. Add new public key
-#: src/protocols/silc/chat.c:273
+#: src/protocols/silc/chat.c:276
 msgid "Open Public Key..."
 msgstr "Abrir Chave Pública..."
 
-#: src/protocols/silc/chat.c:382
+#: src/protocols/silc/chat.c:385
 msgid "Channel Passphrase"
 msgstr "Senha do Canal"
 
-#: src/protocols/silc/chat.c:389
+#: src/protocols/silc/chat.c:392
 msgid "Channel Public Keys List"
 msgstr "Lista de Chaves Públicas do Canal"
 
-#: src/protocols/silc/chat.c:394
+#: src/protocols/silc/chat.c:397
 msgid ""
 "Channel authentication is used to secure the channel from unauthorized "
 "access. The authentication may be based on passphrase and digital "
@@ -8905,125 +8917,125 @@
 "definir chaves públicas do canal, então apenas os utilizadores cujas chaves "
 "públicas estejam listadas são capazes de se juntar."
 
-#: src/protocols/silc/chat.c:403 src/protocols/silc/chat.c:404
-#: src/protocols/silc/chat.c:441 src/protocols/silc/chat.c:442
-#: src/protocols/silc/chat.c:871
+#: src/protocols/silc/chat.c:406 src/protocols/silc/chat.c:407
+#: src/protocols/silc/chat.c:444 src/protocols/silc/chat.c:445
+#: src/protocols/silc/chat.c:874
 msgid "Channel Authentication"
 msgstr "Autenticação do Canal"
 
-#: src/protocols/silc/chat.c:405 src/protocols/silc/chat.c:443
+#: src/protocols/silc/chat.c:408 src/protocols/silc/chat.c:446
 msgid "Add / Remove"
 msgstr "Adicionar / Remover"
 
-#: src/protocols/silc/chat.c:560
+#: src/protocols/silc/chat.c:563
 msgid "Group Name"
 msgstr "Nome do Grupo"
 
-#: src/protocols/silc/chat.c:564 src/protocols/silc/ops.c:1403
+#: src/protocols/silc/chat.c:567 src/protocols/silc/ops.c:1669
 msgid "Passphrase"
 msgstr "Senha"
 
-#: src/protocols/silc/chat.c:575
+#: src/protocols/silc/chat.c:578
 #, c-format
 msgid "Please enter the %s channel private group name and passphrase."
 msgstr "Por favor digite o nome de grupo privado e senha do canal %s."
 
-#: src/protocols/silc/chat.c:577
+#: src/protocols/silc/chat.c:580
 msgid "Add Channel Private Group"
 msgstr "Adicionar Grupo Privado do Canal"
 
-#: src/protocols/silc/chat.c:704
+#: src/protocols/silc/chat.c:707
 msgid "User Limit"
 msgstr "Limite de Utilizadores"
 
-#: src/protocols/silc/chat.c:705
+#: src/protocols/silc/chat.c:708
 msgid "Set user limit on channel. Set to zero to reset user limit."
 msgstr ""
 "Define o limite de utilizadores no canal. Defina para zero para ser "
 "ilimitado."
 
-#: src/protocols/silc/chat.c:847
+#: src/protocols/silc/chat.c:850
 msgid "Get Info"
 msgstr "Ver info"
 
-#: src/protocols/silc/chat.c:854
+#: src/protocols/silc/chat.c:857
 msgid "Invite List"
 msgstr "Lista de Convites"
 
-#: src/protocols/silc/chat.c:858
+#: src/protocols/silc/chat.c:861
 msgid "Ban List"
 msgstr "Lista de Banidos"
 
-#: src/protocols/silc/chat.c:865
+#: src/protocols/silc/chat.c:868
 msgid "Add Private Group"
 msgstr "Adicionar Grupo Privado"
 
-#: src/protocols/silc/chat.c:876
+#: src/protocols/silc/chat.c:879
 msgid "Reset Permanent"
 msgstr "Apagar Permanente"
 
-#: src/protocols/silc/chat.c:880
+#: src/protocols/silc/chat.c:883
 msgid "Set Permanent"
 msgstr "Definir Permanente"
 
-#: src/protocols/silc/chat.c:887
+#: src/protocols/silc/chat.c:890
 msgid "Set User Limit"
 msgstr "Definir Limite de Utilizadores"
 
-#: src/protocols/silc/chat.c:892
+#: src/protocols/silc/chat.c:895
 msgid "Reset Topic Restriction"
 msgstr "Apagar Restrição de Tópico"
 
-#: src/protocols/silc/chat.c:896
+#: src/protocols/silc/chat.c:899
 msgid "Set Topic Restriction"
 msgstr "Definir Restrição de Tópico"
 
-#: src/protocols/silc/chat.c:902
+#: src/protocols/silc/chat.c:905
 msgid "Reset Private Channel"
 msgstr "Apagar Canal Privado"
 
-#: src/protocols/silc/chat.c:906
+#: src/protocols/silc/chat.c:909
 msgid "Set Private Channel"
 msgstr "Definir Canal Privado"
 
-#: src/protocols/silc/chat.c:912
+#: src/protocols/silc/chat.c:915
 msgid "Reset Secret Channel"
 msgstr "Apagar Canal Secreto"
 
-#: src/protocols/silc/chat.c:916
+#: src/protocols/silc/chat.c:919
 msgid "Set Secret Channel"
 msgstr "Definir Canal Secreto"
 
-#: src/protocols/silc/chat.c:986
+#: src/protocols/silc/chat.c:989
 #, c-format
 msgid "You are channel founder on <I>%s</I>"
 msgstr "É o fundador de canal em <I>%s</I>."
 
-#: src/protocols/silc/chat.c:990
+#: src/protocols/silc/chat.c:993
 #, c-format
 msgid "Channel founder on <I>%s</I> is <I>%s</I>"
 msgstr "O fundador de canal em <I>%s</I> é <I>%s</I>"
 
-#: src/protocols/silc/chat.c:1040
+#: src/protocols/silc/chat.c:1046
 #, c-format
 msgid ""
 "You have to join the %s channel before you are able to join the private group"
 msgstr ""
 "Tem que se juntar ao canal %s antes de se poder juntar ao grupo privado"
 
-#: src/protocols/silc/chat.c:1042
+#: src/protocols/silc/chat.c:1048
 msgid "Join Private Group"
 msgstr "Juntar-se ao Grupo Privado"
 
-#: src/protocols/silc/chat.c:1043
+#: src/protocols/silc/chat.c:1049
 msgid "Cannot join private group"
 msgstr "Impossível juntar-se ao grupo privado"
 
-#: src/protocols/silc/chat.c:1225 src/protocols/silc/silc.c:875
+#: src/protocols/silc/chat.c:1242 src/protocols/silc/silc.c:888
 msgid "Cannot call command"
 msgstr "Incapaz de chamar comando"
 
-#: src/protocols/silc/chat.c:1226 src/protocols/silc/silc.c:876
+#: src/protocols/silc/chat.c:1243 src/protocols/silc/silc.c:889
 msgid "Unknown command"
 msgstr "Comando desconhecido"
 
@@ -9074,223 +9086,277 @@
 msgid "Cannot send file"
 msgstr "Impossível enviar ficheiro"
 
-#: src/protocols/silc/ops.c:324 src/protocols/silc/ops.c:331
-#: src/protocols/silc/ops.c:338
+#: src/protocols/silc/ops.c:333 src/protocols/silc/ops.c:342
+#: src/protocols/silc/ops.c:351
 #, c-format
 msgid "%s has changed the topic of <I>%s</I> to: %s"
 msgstr "%s mudou o tópico de <I>%s</I> para: %s"
 
-#: src/protocols/silc/ops.c:398
+#: src/protocols/silc/ops.c:413
 #, c-format
 msgid "<I>%s</I> set channel <I>%s</I> modes to: %s"
 msgstr "<I>%s</I> definiu modos do canal <I>%s</I> para: %s"
 
-#: src/protocols/silc/ops.c:402
+#: src/protocols/silc/ops.c:417
 #, c-format
 msgid "<I>%s</I> removed all channel <I>%s</I> modes"
 msgstr "<I>%s</I> removeu todos os modos do canal <I>%s</I>"
 
-#: src/protocols/silc/ops.c:433
+#: src/protocols/silc/ops.c:448
 #, c-format
 msgid "<I>%s</I> set <I>%s's</I> modes to: %s"
 msgstr "<I>%s</I> definiu os modos de <I>%s</I> para: %s"
 
-#: src/protocols/silc/ops.c:437
+#: src/protocols/silc/ops.c:452
 #, c-format
 msgid "<I>%s</I> removed all <I>%s's</I> modes"
 msgstr "<I>%s</I> removeu todos os modos de <I>%s</I>"
 
-#: src/protocols/silc/ops.c:464
+#: src/protocols/silc/ops.c:479
 #, c-format
 msgid "You have been kicked off <I>%s</I> by <I>%s</I> (%s)"
 msgstr "Foi expulso de <I>%s</I> por <I>%s</I> (%s)"
 
-#: src/protocols/silc/ops.c:494 src/protocols/silc/ops.c:499
-#: src/protocols/silc/ops.c:504
+#: src/protocols/silc/ops.c:509 src/protocols/silc/ops.c:514
+#: src/protocols/silc/ops.c:519
 #, c-format
 msgid "You have been killed by %s (%s)"
 msgstr "Foi morto por %s (%s)"
 
-#: src/protocols/silc/ops.c:525 src/protocols/silc/ops.c:530
-#: src/protocols/silc/ops.c:535
+#: src/protocols/silc/ops.c:540 src/protocols/silc/ops.c:545
+#: src/protocols/silc/ops.c:550
 #, c-format
 msgid "Killed by %s (%s)"
 msgstr "Morto por %s (%s)"
 
-#: src/protocols/silc/ops.c:581
+#: src/protocols/silc/ops.c:596
 msgid "Server signoff"
 msgstr "Desligar do servidor"
 
-#: src/protocols/silc/ops.c:767
+#: src/protocols/silc/ops.c:783
 msgid "Personal Information"
 msgstr "Informação Pessoal"
 
-#: src/protocols/silc/ops.c:790
+#: src/protocols/silc/ops.c:806
 msgid "Birth Day"
 msgstr "Data de Nascimento"
 
-#: src/protocols/silc/ops.c:794
+#: src/protocols/silc/ops.c:810
 msgid "Job Title"
 msgstr "Título"
 
-#: src/protocols/silc/ops.c:798
+#: src/protocols/silc/ops.c:814
 msgid "Job Role"
 msgstr "Emprego"
 
-#: src/protocols/silc/ops.c:802
+#: src/protocols/silc/ops.c:818
 msgid "Organization"
 msgstr "Organização"
 
-#: src/protocols/silc/ops.c:806
+#: src/protocols/silc/ops.c:822
 msgid "Unit"
 msgstr "unidade"
 
-#: src/protocols/silc/ops.c:825
+#: src/protocols/silc/ops.c:841
 msgid "EMail"
 msgstr "EMail"
 
-#: src/protocols/silc/ops.c:830
+#: src/protocols/silc/ops.c:846
 msgid "Note"
 msgstr "Nota"
 
-#: src/protocols/silc/ops.c:878
+#: src/protocols/silc/ops.c:894
 msgid "Join Chat"
 msgstr "Entrar no Chat"
 
-#: src/protocols/silc/ops.c:933
-msgid "Hostname"
-msgstr "Nome de Anfitrião"
-
-#: src/protocols/silc/ops.c:940
-msgid "User Mode"
-msgstr "Modo de Utilizador"
-
-#: src/protocols/silc/ops.c:954
-msgid "Channels"
-msgstr "Canais"
-
-#: src/protocols/silc/ops.c:981
+#: src/protocols/silc/ops.c:1050 src/protocols/silc/ops.c:1120
 msgid "Public Key Fingerprint"
 msgstr "Impressão Digital da Chave Pública"
 
-#: src/protocols/silc/ops.c:982
+#: src/protocols/silc/ops.c:1051 src/protocols/silc/ops.c:1121
 msgid "Public Key Babbleprint"
 msgstr "Babbleprint da Chave Pública"
 
-#: src/protocols/silc/ops.c:995
+#: src/protocols/silc/ops.c:1064
 msgid "More..."
 msgstr "Mais..."
 
-#: src/protocols/silc/ops.c:1006 src/protocols/silc/silc.c:770
+#: src/protocols/silc/ops.c:1135 src/protocols/silc/silc.c:777
 msgid "Detach From Server"
 msgstr "Desligar Do Servidor"
 
-#: src/protocols/silc/ops.c:1006
+#: src/protocols/silc/ops.c:1135
 msgid "Cannot detach"
 msgstr "Impossível desligar"
 
-#: src/protocols/silc/ops.c:1017
+#: src/protocols/silc/ops.c:1146
 msgid "Cannot set topic"
 msgstr "Impossível definir tópico"
 
-#: src/protocols/silc/ops.c:1045
+#: src/protocols/silc/ops.c:1184
+msgid "Failed to change nickname"
+msgstr "Não foi possível mudar o nome"
+
+#: src/protocols/silc/ops.c:1221
 msgid "Roomlist"
 msgstr "Lista de Salas"
 
-#: src/protocols/silc/ops.c:1045
+#: src/protocols/silc/ops.c:1221
 msgid "Cannot get room list"
 msgstr "Incapaz de obter a lista de salas"
 
-#: src/protocols/silc/ops.c:1093
+#: src/protocols/silc/ops.c:1269
 msgid "No public key was received"
 msgstr "Não foi recebida nenhuma chave pública"
 
-#: src/protocols/silc/ops.c:1106 src/protocols/silc/ops.c:1119
-#: src/protocols/silc/ops.c:1120
+#: src/protocols/silc/ops.c:1282 src/protocols/silc/ops.c:1296
 msgid "Server Information"
 msgstr "Informação do servidor"
 
-#: src/protocols/silc/ops.c:1107
+#: src/protocols/silc/ops.c:1283
 msgid "Cannot get server information"
 msgstr "Incapaz de obter informação do servidor"
 
-#: src/protocols/silc/ops.c:1128
+#: src/protocols/silc/ops.c:1314 src/protocols/silc/ops.c:1323
+msgid "Server Statistics"
+msgstr "Estatísticas do Servidor"
+
+#: src/protocols/silc/ops.c:1315
+msgid "Cannot get server statistics"
+msgstr "Incapaz de obter estatísticas do servidor"
+
+#: src/protocols/silc/ops.c:1324
+msgid "No server statisitics available"
+msgstr "Não há estatísticas de servidor disponíveis"
+
+#: src/protocols/silc/ops.c:1346
+#, c-format
+msgid ""
+"Local server start time: %s\n"
+"Local server uptime: %s\n"
+"Local server clients: %d\n"
+"Local server channels: %d\n"
+"Local server operators: %d\n"
+"Local router operators: %d\n"
+"Local cell clients: %d\n"
+"Local cell channels: %d\n"
+"Local cell servers: %d\n"
+"Total clients: %d\n"
+"Total channels: %d\n"
+"Total servers: %d\n"
+"Total routers: %d\n"
+"Total server operators: %d\n"
+"Total router operators: %d\n"
+msgstr ""
+"Tempo de início do servidor local: %s\n"
+"Uptime do servidor local: %s\n"
+"Clientes do servidor local: %d\n"
+"Canais do servidor local: %d\n"
+"Operadores do servidor local: %d\n"
+"Operadores do router local: %d\n"
+"Clientes da célula local: %d\n"
+"Canais da célula local: %d\n"
+"Servidores da célula local: %d\n"
+"Total de clientes: %d\n"
+"Total de canais: %d\n"
+"Total de servidores: %d\n"
+"Total de routers: %d\n"
+"Total de operadores de servidores: %d\n"
+"Total de operadores de routers: %d\n"
+
+#: src/protocols/silc/ops.c:1369
+msgid "Network Statistics"
+msgstr "Estatísticas da Rede"
+
+#: src/protocols/silc/ops.c:1377 src/protocols/silc/ops.c:1382
+msgid "Ping"
+msgstr "Ping"
+
+#: src/protocols/silc/ops.c:1377
+msgid "Ping failed"
+msgstr "Ping falhou"
+
+#: src/protocols/silc/ops.c:1382
+msgid "Ping reply received from server"
+msgstr "Resposta ao ping recebida do servidor"
+
+#: src/protocols/silc/ops.c:1390
 msgid "Could not kill user"
 msgstr "Não foi possível matar o utilizador"
 
-#: src/protocols/silc/ops.c:1205
+#: src/protocols/silc/ops.c:1471
 msgid "Error during connecting to SILC Server"
 msgstr "Erro durante a ligação ao servidor SILC"
 
-#: src/protocols/silc/ops.c:1210
+#: src/protocols/silc/ops.c:1476
 msgid "Key Exchange failed"
 msgstr "Troca de Chaves falhou"
 
-#: src/protocols/silc/ops.c:1219
+#: src/protocols/silc/ops.c:1485
 msgid ""
 "Resuming detached session failed. Press Reconnect to create new connection."
 msgstr ""
 "O resumo da sessão desligada falhou. Carregue em Religar para criar uma nova "
 "ligação."
 
-#: src/protocols/silc/ops.c:1254
+#: src/protocols/silc/ops.c:1520
 msgid "Disconnected by server"
 msgstr "Desligado pelo servidor"
 
-#: src/protocols/silc/ops.c:1314 src/protocols/silc/ops.c:1361
+#: src/protocols/silc/ops.c:1580 src/protocols/silc/ops.c:1627
 #: src/protocols/silc/silc.c:167
 msgid "Resuming session"
 msgstr "Resumindo sessão"
 
-#: src/protocols/silc/ops.c:1316
+#: src/protocols/silc/ops.c:1582
 msgid "Authenticating connection"
 msgstr "Autenticando ligação"
 
-#: src/protocols/silc/ops.c:1363
+#: src/protocols/silc/ops.c:1629
 msgid "Verifying server public key"
 msgstr "Verificando a chave pública do servidor"
 
-#: src/protocols/silc/ops.c:1404
+#: src/protocols/silc/ops.c:1670
 msgid "Passphrase required"
 msgstr "Senha requerida"
 
-#: src/protocols/silc/ops.c:1433
+#: src/protocols/silc/ops.c:1699
 msgid "Failure: Version mismatch, upgrade your client"
 msgstr "Falha: Versão difere, actualize o seu cliente"
 
-#: src/protocols/silc/ops.c:1436
+#: src/protocols/silc/ops.c:1702
 msgid "Failure: Remote does not trust/support your public key"
 msgstr "Falha: Servidor remoto não confia/suporta a sua chave pública"
 
-#: src/protocols/silc/ops.c:1439
+#: src/protocols/silc/ops.c:1705
 msgid "Failure: Remote does not support proposed KE group"
 msgstr "Falha: Servidor remoto não suporta o grupo KE proposto"
 
-#: src/protocols/silc/ops.c:1442
+#: src/protocols/silc/ops.c:1708
 msgid "Failure: Remote does not support proposed cipher"
 msgstr "Falha: Servidor remoto não suporta a cifra proposta"
 
-#: src/protocols/silc/ops.c:1445
+#: src/protocols/silc/ops.c:1711
 msgid "Failure: Remote does not support proposed PKCS"
 msgstr "Falha: Servidor remoto não suporta o PKCS proposto"
 
-#: src/protocols/silc/ops.c:1448
+#: src/protocols/silc/ops.c:1714
 msgid "Failure: Remote does not support proposed hash function"
 msgstr "Falha: Servidor remoto não suporta a função de hash proposta"
 
-#: src/protocols/silc/ops.c:1451
+#: src/protocols/silc/ops.c:1717
 msgid "Failure: Remote does not support proposed HMAC"
 msgstr "Falha: Servidor remoto não suporta HMAC proposto"
 
-#: src/protocols/silc/ops.c:1453
+#: src/protocols/silc/ops.c:1719
 msgid "Failure: Incorrect signature"
 msgstr "Falha: Assinatura incorrecta"
 
-#: src/protocols/silc/ops.c:1455
+#: src/protocols/silc/ops.c:1721
 msgid "Failure: Invalid cookie"
 msgstr "Falha: Cookie inválido"
 
-#: src/protocols/silc/ops.c:1466
+#: src/protocols/silc/ops.c:1732
 msgid "Failure: Authentication failed"
 msgstr "Falha: Autenticação falhada"
 
@@ -9355,15 +9421,15 @@
 msgid "Connecting to SILC Server"
 msgstr "Ligando ao Servidor SILC"
 
-#: src/protocols/silc/silc.c:602
+#: src/protocols/silc/silc.c:606
 msgid "Your Current Mood"
 msgstr "A Sua Disposição Actual"
 
-#: src/protocols/silc/silc.c:604
+#: src/protocols/silc/silc.c:608
 msgid "Normal"
 msgstr "Normal"
 
-#: src/protocols/silc/silc.c:629
+#: src/protocols/silc/silc.c:633
 msgid ""
 "\n"
 "Your Preferred Contact Methods"
@@ -9371,31 +9437,43 @@
 "\n"
 "Os Seus Métodos De Contacto Preferidos"
 
-#: src/protocols/silc/silc.c:646
+#: src/protocols/silc/silc.c:641 src/protocols/silc/util.c:514
+msgid "SMS"
+msgstr "SMS"
+
+#: src/protocols/silc/silc.c:643 src/protocols/silc/util.c:516
+msgid "MMS"
+msgstr "MMS"
+
+#: src/protocols/silc/silc.c:645 src/protocols/silc/util.c:518
+msgid "Video Conferencing"
+msgstr "Vídeo Conferência"
+
+#: src/protocols/silc/silc.c:650
 msgid "Your Current Status"
 msgstr "O Seu Estado Actual"
 
-#: src/protocols/silc/silc.c:653
+#: src/protocols/silc/silc.c:657
 msgid "Online Services"
 msgstr "Serviços Online"
 
-#: src/protocols/silc/silc.c:656
+#: src/protocols/silc/silc.c:660
 msgid "Let others see what services you are using"
 msgstr "Deixar que outros vejam os serviços que etsá a usar"
 
-#: src/protocols/silc/silc.c:662
+#: src/protocols/silc/silc.c:666
 msgid "Let others see what computer you are using"
 msgstr "Deixar que outros vejam que computador está a usar"
 
-#: src/protocols/silc/silc.c:669
+#: src/protocols/silc/silc.c:673
 msgid "Your VCard File"
 msgstr "O Seu Ficheiro VCard"
 
-#: src/protocols/silc/silc.c:682 src/protocols/silc/silc.c:683
+#: src/protocols/silc/silc.c:686 src/protocols/silc/silc.c:687
 msgid "User Online Status Attributes"
 msgstr "Atributos do Estado Online do Utilizador"
 
-#: src/protocols/silc/silc.c:684
+#: src/protocols/silc/silc.c:688
 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 "
@@ -9405,113 +9483,237 @@
 "online e a sua informação pessoal. Por favor preencha a informação que "
 "gostaria que os outros utilizadores vejam."
 
-#: src/protocols/silc/silc.c:723 src/protocols/silc/silc.c:728
-#: src/protocols/silc/silc.c:1096 src/protocols/silc/silc.c:1101
+#: src/protocols/silc/silc.c:728 src/protocols/silc/silc.c:734
+#: src/protocols/silc/silc.c:1135
 msgid "Message of the Day"
 msgstr "Mensagem do Dia"
 
-#: src/protocols/silc/silc.c:723 src/protocols/silc/silc.c:1096
+#: src/protocols/silc/silc.c:728
 msgid "No Message of the Day available"
 msgstr "Nenhuma Mensagem do Dia disponível"
 
-#: src/protocols/silc/silc.c:724 src/protocols/silc/silc.c:1097
+#: src/protocols/silc/silc.c:729 src/protocols/silc/silc.c:1130
 msgid "There is no Message of the Day associated with this connection"
 msgstr "Não há nenhuma Mensagem do Dia associada a esta ligação"
 
-#: src/protocols/silc/silc.c:765
+#: src/protocols/silc/silc.c:772
 msgid "Online Status"
 msgstr "Estado Online"
 
-#: src/protocols/silc/silc.c:774
+#: src/protocols/silc/silc.c:781
 msgid "View Message of the Day"
 msgstr "Ver Mensagem do Dia"
 
-#: src/protocols/silc/silc.c:846
+#: src/protocols/silc/silc.c:853
 #, c-format
 msgid "User <I>%s</I> is not present in the network"
 msgstr "Utilizador <I>%s</I> não está presente na rede"
 
-#: src/protocols/silc/silc.c:1159
-msgid "part:  Leave the chat"
-msgstr "part:  Sair do chat"
-
-#: src/protocols/silc/silc.c:1162
-msgid "leave:  Leave the chat"
-msgstr "leave:  Sair do chat"
-
-#: src/protocols/silc/silc.c:1166
+#: src/protocols/silc/silc.c:962
+msgid "Failed to leave channel"
+msgstr "Falha ao sair do canal"
+
+#: src/protocols/silc/silc.c:1006
+msgid "Topic too long"
+msgstr "Tópico muito extenso"
+
+#: src/protocols/silc/silc.c:1087
+msgid "You must specify a nick"
+msgstr "Tem de especificar um nome"
+
+#: src/protocols/silc/silc.c:1189
+#, c-format
+msgid "channel %s not found"
+msgstr "o canal %s não foi encontrado"
+
+#: src/protocols/silc/silc.c:1194
+#, c-format
+msgid "channel modes for %s: %s"
+msgstr "modos de canal para %s: %s"
+
+#: src/protocols/silc/silc.c:1196
+#, c-format
+msgid "no channel modes are set on %s"
+msgstr "não está definido nenhum modo de canal em %s"
+
+#: src/protocols/silc/silc.c:1209
+#, c-format
+msgid "Failed to set cmodes for %s"
+msgstr "Falha ao obter cmodes para %s"
+
+#: src/protocols/silc/silc.c:1239
+#, c-format
+msgid "Unknown command: %s, (may be a Gaim bug)"
+msgstr "Comando desconhecido: %s, (pode ser um big do Gaim)"
+
+#: src/protocols/silc/silc.c:1302
+msgid "part [channel]:  Leave the chat"
+msgstr "part [canal]:  Sair do chat"
+
+#: src/protocols/silc/silc.c:1306
+msgid "leave [channel]:  Leave the chat"
+msgstr "leave [canal]:  Sair do chat"
+
+#: src/protocols/silc/silc.c:1310
 msgid "topic [&lt;new topic&gt;]:  View or change the topic"
 msgstr "topic [&lt;novo tópico&gt;]:  Ver ou modificar o tópico"
 
-#: src/protocols/silc/silc.c:1171
+#: src/protocols/silc/silc.c:1315
 msgid "join &lt;channel&gt; [&lt;password&gt;]:  Join a chat on this network"
 msgstr "join &lt;canal&gt; [&lt;senha&gt;]:  Entrar num chat nesta rede"
 
-#: src/protocols/silc/silc.c:1175
+#: src/protocols/silc/silc.c:1319
 msgid "list:  List channels on this network"
 msgstr "list:  Listar canais nesta rede"
 
-#: src/protocols/silc/silc.c:1179
+#: src/protocols/silc/silc.c:1323
 msgid "whois &lt;nick&gt;:  View nick's information"
 msgstr "whois &lt;nome&gt;:  Ver informação do nome"
 
-#: src/protocols/silc/silc.c:1183
-msgid "invite &lt;nick&gt;:  Invite nick to join this channel"
-msgstr "invite &lt;nome&gt;:  Convida nome a entrar neste canal"
-
-#: src/protocols/silc/silc.c:1187
+#: src/protocols/silc/silc.c:1327 src/protocols/zephyr/zephyr.c:1673
 msgid "msg &lt;nick&gt; &lt;message&gt;:  Send a private message to a user"
-msgstr "msg &lt;nome&gt; &lt;mensagem&gt;:  Enviar uma mensagem privada a um utilizador"
-
-#: src/protocols/silc/silc.c:1191
+msgstr ""
+"msg &lt;nome&gt; &lt;mensagem&gt;:  Enviar uma mensagem privada a um "
+"utilizador"
+
+#: src/protocols/silc/silc.c:1331
 msgid "query &lt;nick&gt; [&lt;message&gt;]:  Send a private message to a user"
-msgstr "query &lt;nome&gt; [&lt;mensagem&gt;]:  Enviar uma mensagem privada a um utilizador"
-
-#: src/protocols/silc/silc.c:1195
+msgstr ""
+"query &lt;nome&gt; [&lt;mensagem&gt;]:  Enviar uma mensagem privada a um "
+"utilizador"
+
+#: src/protocols/silc/silc.c:1335
 msgid "motd:  View the server's Message Of The Day"
 msgstr "motd:  Ver a Mensagem Do Dia do servidor"
 
-#: src/protocols/silc/silc.c:1199
+#: src/protocols/silc/silc.c:1339
 msgid "detach:  Detach this session"
 msgstr "detach:  Desligar esta sessão"
 
-#: src/protocols/silc/silc.c:1203
-msgid "umode &lt;usermodes&gt;:  Set your user options"
-msgstr "umode &lt;modosutilizador&gt;:  define as suas opções de utilizador"
-
-#: src/protocols/silc/silc.c:1214
+#: src/protocols/silc/silc.c:1343
+msgid "quit [message]:  Disconnect from the server, with an optional message"
+msgstr "quit [mensagem]:  Desligar do servidor, com uma mensagem opcional"
+
+#: src/protocols/silc/silc.c:1347
+msgid "call &lt;command&gt;:  Call any silc client command"
+msgstr "call &lt;comando&gt;:  chamar qualquer comando de cliente silc"
+
+#: src/protocols/silc/silc.c:1352
+msgid "kill &lt;nick&gt; [-pubkey|&lt;reason&gt;]:  Kill nick"
+msgstr "kill &lt;nome&gt; [-pubKey|&lt;razão&gt;]:  Matar o nome"
+
+#: src/protocols/silc/silc.c:1356
+msgid "nick &lt;newnick&gt;:  Change your nickname"
+msgstr "nick &lt;novo nome&gt;:  Mudar o seu nome"
+
+#: src/protocols/silc/silc.c:1360
+msgid "whowas &lt;nick&gt;:  View nick's information"
+msgstr "whowas &lt;nome&gt;:  Ver informação do nome"
+
+#: src/protocols/silc/silc.c:1364
+msgid ""
+"cmode &lt;channel&gt; [+|-&lt;modes&gt]; [arguments]:  Change or display "
+"channel modes"
+msgstr ""
+"cmode &lt;canal&gt; [+|-&lt;modos&gt]; [argumentos]:  Alterar ou mostrar "
+"modos do canal"
+
+#: src/protocols/silc/silc.c:1368
+msgid ""
+"cumode &lt;channel&gt; +|-&lt;modes&gt; &lt;nick&gt;:  Change nick's modes "
+"on channel"
+msgstr ""
+"cumode &lt;canal&gt; +|-&lt;modos&gt; &lt;nome&gt;:  Muda os modos do nome "
+"no canal"
+
+#: src/protocols/silc/silc.c:1372
+msgid "umode &lt;usermodes&gt;:  Set your modes in the network"
+msgstr "umode &lt;modos de utilizador&gt;:  Define os seus modos na rede"
+
+#: src/protocols/silc/silc.c:1376
+msgid "oper &lt;nick&gt; [-pubkey]:  Get server operator privileges"
+msgstr ""
+"oper &lt;nomr&gt; [-pubKey]:  Obter privilégios de operador de servidor"
+
+#: src/protocols/silc/silc.c:1380
+msgid ""
+"invite &lt;channel&gt; [-|+]&lt;nick&gt;:  invite nick or add/remove from "
+"channel invite list"
+msgstr ""
+"invite &lt;canal&gt; [-|+]&lt;nome&gt;:  convida nome ou acrescenta/remove "
+"da lista de convites do canal"
+
+#: src/protocols/silc/silc.c:1384
+msgid "kick &lt;channel&gt; &lt;nick&gt; [comment]:  Kick client from channel"
+msgstr ""
+"kick &lt;canal&gt; &lt;nome&gt; [comentário]:  Expulsa o cliente do canal"
+
+#: src/protocols/silc/silc.c:1388
+msgid "info [server]:  View server administrative details"
+msgstr "info [servidor]:  Ver detalhes de administração do servidor"
+
+#: src/protocols/silc/silc.c:1392
+msgid "ban [&lt;channel&gt; +|-&lt;nick&gt;]:  Ban client from channel"
+msgstr "ban [&lt;canal&gt; +|-&lt;nome&gt;]:  banir cliente do canal"
+
+#: src/protocols/silc/silc.c:1396
+msgid "getkey &lt;nick|server&gt;:  Retrieve client's or server's public key"
+msgstr ""
+"getkey &lt;nome|servidor&gt;:  Obtem a chave pública do cliente ou servidor"
+
+#: src/protocols/silc/silc.c:1400
+msgid "stats:  View server and network statistics"
+msgstr "stats:  Ver estatísticas do servidor e da rede"
+
+#: src/protocols/silc/silc.c:1404
+msgid "ping:  Send PING to the connected server"
+msgstr "ping:  Enviar PING ao servidor ligado"
+
+#: src/protocols/silc/silc.c:1409
+msgid "users &lt;channel&gt;:  List users in channel"
+msgstr "users &lt;canal&gt;:  Lista os utilizadores no canal"
+
+#: src/protocols/silc/silc.c:1413
+msgid ""
+"names [-count|-ops|-halfops|-voices|-normal] &lt;channel(s)&gt;:  List "
+"specific users in channel(s)"
+msgstr ""
+"names [-count|-ops|-halfops|-voices|-normal] &lt;canal(ais)&gt;:  Lista "
+"utilizadores específicos no(s) canal(ais)"
+
+#: src/protocols/silc/silc.c:1425
 msgid "Instant Messages"
 msgstr "Mensagens Instantâneas"
 
-#: src/protocols/silc/silc.c:1219
+#: src/protocols/silc/silc.c:1430
 msgid "Digitally sign all IM messages"
 msgstr "Assinar digitalmente todas as mensagens MI"
 
-#: src/protocols/silc/silc.c:1224
+#: src/protocols/silc/silc.c:1435
 msgid "Verify all IM message signatures"
 msgstr "Verificar as assinaturas de todas as mensagens MI"
 
-#: src/protocols/silc/silc.c:1227
+#: src/protocols/silc/silc.c:1438
 msgid "Channel Messages"
 msgstr "Mensagens do Canal"
 
-#: src/protocols/silc/silc.c:1232
+#: src/protocols/silc/silc.c:1443
 msgid "Digitally sign all channel messages"
 msgstr "Assinar digitalmente todas as mensagens de canal"
 
-#: src/protocols/silc/silc.c:1237
+#: src/protocols/silc/silc.c:1448
 msgid "Verify all channel message signatures"
 msgstr "Verificar as assinaturas de todas as mensagens de canal"
 
-#: src/protocols/silc/silc.c:1240
+#: src/protocols/silc/silc.c:1451
 msgid "Default SILC Key Pair"
 msgstr "Par de Chaves por Omissão SILC"
 
-#: src/protocols/silc/silc.c:1245
+#: src/protocols/silc/silc.c:1456
 msgid "SILC Public Key"
 msgstr "Chave Pública SILC"
 
-#: src/protocols/silc/silc.c:1250
+#: src/protocols/silc/silc.c:1461
 msgid "SILC Private Key"
 msgstr "Chave Privada SILC"
 
@@ -9525,91 +9727,91 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/silc/silc.c:1334
+#: src/protocols/silc/silc.c:1547
 msgid "SILC Protocol Plugin"
 msgstr "Plugin do Protocolo SILC"
 
 #. *  description
-#: src/protocols/silc/silc.c:1336
+#: src/protocols/silc/silc.c:1549
 msgid "Secure Internet Live Conferencing (SILC) Protocol"
 msgstr "Protocolo de Conferência ao Vivo na Internet Seguro (SILC)"
 
-#: src/protocols/silc/silc.c:1366
+#: src/protocols/silc/silc.c:1579
 msgid "Public key authentication"
 msgstr "Autenticação por chave pública"
 
-#: src/protocols/silc/silc.c:1372
+#: src/protocols/silc/silc.c:1585
 msgid "Public Key File"
 msgstr "Ficheiro de Chave Pública"
 
-#: src/protocols/silc/silc.c:1376
+#: src/protocols/silc/silc.c:1589
 msgid "Private Key File"
 msgstr "Ficheiro de Chave Privada"
 
-#: src/protocols/silc/silc.c:1381
+#: src/protocols/silc/silc.c:1594
 msgid "Reject watching by other users"
 msgstr "Rejeitar visualização por outros utilizadores"
 
-#: src/protocols/silc/silc.c:1384
+#: src/protocols/silc/silc.c:1597
 msgid "Block invites"
 msgstr "Bloquear convites"
 
-#: src/protocols/silc/silc.c:1387
+#: src/protocols/silc/silc.c:1600
 msgid "Block IMs without Key Exchange"
 msgstr "Bloquear MIs sem Troca de Chaves"
 
-#: src/protocols/silc/silc.c:1390
+#: src/protocols/silc/silc.c:1603
 msgid "Reject online status attribute requests"
 msgstr "Rejeitar pedidos de atributos de estado online"
 
-#: src/protocols/silc/util.c:200 src/protocols/silc/util.c:223
+#: src/protocols/silc/util.c:202 src/protocols/silc/util.c:227
 msgid "Creating SILC key pair..."
 msgstr "Criando o par de chaves SILC..."
 
 #. Hint for translators: Please check the tabulator width here and in
 #. the next strings (short strings: 2 tabs, longer strings 1 tab,
 #. sum: 3 tabs or 24 characters)
-#: src/protocols/silc/util.c:289
+#: src/protocols/silc/util.c:310
 #, c-format
 msgid "Real Name: \t%s\n"
 msgstr "Nome Real: \t%s\n"
 
-#: src/protocols/silc/util.c:291
+#: src/protocols/silc/util.c:312
 #, c-format
 msgid "User Name: \t%s\n"
 msgstr "Nome de Utilizador: \t%s\n"
 
-#: src/protocols/silc/util.c:293
+#: src/protocols/silc/util.c:314
 #, c-format
 msgid "EMail: \t\t%s\n"
 msgstr "EMail: \t\t%s\n"
 
-#: src/protocols/silc/util.c:295
+#: src/protocols/silc/util.c:316
 #, c-format
 msgid "Host Name: \t%s\n"
 msgstr "Nome do Anfitrião: \t%s\n"
 
-#: src/protocols/silc/util.c:297
+#: src/protocols/silc/util.c:318
 #, c-format
 msgid "Organization: \t%s\n"
 msgstr "Organização: \t%s\n"
 
-#: src/protocols/silc/util.c:299
+#: src/protocols/silc/util.c:320
 #, c-format
 msgid "Country: \t%s\n"
 msgstr "País: \t%s\n"
 
-#: src/protocols/silc/util.c:300
-#, c-format
-msgid "Algorithm: \t\t%s\n"
-msgstr "Algoritmo: \t\t%s\n"
-
-#: src/protocols/silc/util.c:301
+#: src/protocols/silc/util.c:321
+#, c-format
+msgid "Algorithm: \t%s\n"
+msgstr "Algoritmo: \t%s\n"
+
+#: src/protocols/silc/util.c:322
 #, c-format
 msgid "Key Length: \t%d bits\n"
 msgstr "Comprimento da Chave: \t%d bits\n"
 
-#: src/protocols/silc/util.c:303
+#: src/protocols/silc/util.c:324
 #, c-format
 msgid ""
 "Public Key Fingerprint:\n"
@@ -9620,7 +9822,7 @@
 "%s\n"
 "\n"
 
-#: src/protocols/silc/util.c:304
+#: src/protocols/silc/util.c:325
 #, c-format
 msgid ""
 "Public Key Babbleprint:\n"
@@ -9629,10 +9831,26 @@
 "Babbleprint da Chave Pública:\n"
 "%s"
 
-#: src/protocols/silc/util.c:308 src/protocols/silc/util.c:309
+#: src/protocols/silc/util.c:329 src/protocols/silc/util.c:330
 msgid "Public Key Information"
 msgstr "Informação de Chave Pública"
 
+#: src/protocols/silc/util.c:512
+msgid "Paging"
+msgstr "Paging"
+
+#: src/protocols/silc/util.c:536
+msgid "Computer"
+msgstr "Computador"
+
+#: src/protocols/silc/util.c:540
+msgid "PDA"
+msgstr "PDA"
+
+#: src/protocols/silc/util.c:542
+msgid "Terminal"
+msgstr "Terminal"
+
 #: src/protocols/toc/toc.c:137
 #, c-format
 msgid "Looking up %s"
@@ -9843,15 +10061,15 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/toc/toc.c:2167 src/protocols/toc/toc.c:2169
+#: src/protocols/toc/toc.c:2169 src/protocols/toc/toc.c:2171
 msgid "TOC Protocol Plugin"
 msgstr "Plugin do protocolo TOC"
 
-#: src/protocols/toc/toc.c:2188
+#: src/protocols/toc/toc.c:2190
 msgid "TOC host"
 msgstr "Host TOC"
 
-#: src/protocols/toc/toc.c:2192
+#: src/protocols/toc/toc.c:2194
 msgid "TOC port"
 msgstr "Porto TOC"
 
@@ -9935,37 +10153,37 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/trepia/trepia.c:1269 src/protocols/trepia/trepia.c:1271
+#: src/protocols/trepia/trepia.c:1271 src/protocols/trepia/trepia.c:1273
 msgid "Trepia Protocol Plugin"
 msgstr "Plugin do protocolo Trepia"
 
-#: src/protocols/yahoo/yahoo.c:328
+#: src/protocols/yahoo/yahoo.c:338
 msgid ""
 "You have been logged off as you have logged in on a different machine or "
 "device."
 msgstr ""
 "Foi desligado porque se ligou a partir de outro computador ou aparelho."
 
-#: src/protocols/yahoo/yahoo.c:798
+#: src/protocols/yahoo/yahoo.c:808
 msgid "Your Yahoo! message did not get sent."
 msgstr "A sua mensagem do Yahoo! não foi enviada."
 
-#: src/protocols/yahoo/yahoo.c:817
+#: src/protocols/yahoo/yahoo.c:827
 msgid "Buzz!!"
 msgstr "Buzz!!"
 
-#: src/protocols/yahoo/yahoo.c:860
+#: src/protocols/yahoo/yahoo.c:870
 #, c-format
 msgid "Yahoo! system message for %s:"
 msgstr "mensage de sistema Yahoo! para %s:"
 
-#: src/protocols/yahoo/yahoo.c:926
+#: src/protocols/yahoo/yahoo.c:936
 #, c-format
 msgid "%s has (retroactively) denied your request to add them to your list."
 msgstr ""
 "%s negaram (rectroactivamente) o seu pedido para adicioná-los à sua lista."
 
-#: src/protocols/yahoo/yahoo.c:929
+#: src/protocols/yahoo/yahoo.c:939
 #, c-format
 msgid ""
 "%s has (retroactively) denied your request to add them to your list for the "
@@ -9974,11 +10192,11 @@
 "%s negaram (rectroactivamente) o seu pedido para adicioná-los à sua lista de "
 "contactos pelo seguinte motivo: %s."
 
-#: src/protocols/yahoo/yahoo.c:932
+#: src/protocols/yahoo/yahoo.c:942
 msgid "Add buddy rejected"
 msgstr "Adicionar Contacto rejeitado"
 
-#: src/protocols/yahoo/yahoo.c:1688
+#: src/protocols/yahoo/yahoo.c:1702
 #, c-format
 msgid ""
 "The Yahoo server has requested the use of an unrecognized authentication "
@@ -9989,11 +10207,11 @@
 "Esta versão do Gaim provávelmente não vai conseguir registar-se no Yahoo "
 "comm sucesso. Veja %s para actualizações."
 
-#: src/protocols/yahoo/yahoo.c:1691
+#: src/protocols/yahoo/yahoo.c:1705
 msgid "Failed Yahoo! Authentication"
 msgstr "Autenticação no Yahoo! Falhou"
 
-#: src/protocols/yahoo/yahoo.c:1763
+#: src/protocols/yahoo/yahoo.c:1777
 #, c-format
 msgid ""
 "You have tried to ignore %s, but the user is on your buddy list.  Clicking "
@@ -10002,79 +10220,95 @@
 "Tentou ignorar %s, mas o utilizador está na sua lista de contactos. Clicando "
 "\"Sim\" vai remover e ignorar o contacto."
 
-#: src/protocols/yahoo/yahoo.c:1766
+#: src/protocols/yahoo/yahoo.c:1780
 msgid "Ignore buddy?"
 msgstr "Ignorar contacto?"
 
-#: src/protocols/yahoo/yahoo.c:1799
+#: src/protocols/yahoo/yahoo.c:1814
 msgid "Invalid username."
-msgstr "Nome de utilizador inválido"
-
-#: src/protocols/yahoo/yahoo.c:1802
+msgstr "Nome de utilizador inválido."
+
+#: src/protocols/yahoo/yahoo.c:1825
+msgid "Normal authencation failed!"
+msgstr "Autenticação normal falhou!"
+
+#: src/protocols/yahoo/yahoo.c:1826
+msgid ""
+"The normal authencation method has failed. This means either your password "
+"is incorrect, or Yahoo!'s authencation scheme has changed. Gaim will now "
+"attempt to log in using Web Messenger authencation, will which result in "
+"reduced functionality and features."
+msgstr ""
+"O método de autenticação normal falhou. Isto significa que a sua senha está "
+"incorrecta, ou o que esquema de autenticação da Yahoo! mudou. O Gaim vai "
+"tentar ligar-se usando a autenticação Web Messenger, o que resultará em "
+"funcionalidade reduzida."
+
+#: src/protocols/yahoo/yahoo.c:1834
 msgid "Incorrect password."
 msgstr "Senha incorrecta."
 
-#: src/protocols/yahoo/yahoo.c:1805
+#: src/protocols/yahoo/yahoo.c:1837
 msgid "Your account is locked, please log in to the Yahoo! website."
 msgstr "A sua conta está trancada, por favor ligue-se ao website da Yahoo!."
 
-#: src/protocols/yahoo/yahoo.c:1808
+#: src/protocols/yahoo/yahoo.c:1840
 #, c-format
 msgid "Unknown error number %d. Logging into the Yahoo! website may fix this."
 msgstr ""
 "Erro desconhecido número %d. Ligar-se ao website da Yahoo! pode corrigir "
 "isto."
 
-#: src/protocols/yahoo/yahoo.c:1862
+#: src/protocols/yahoo/yahoo.c:1894
 #, c-format
 msgid "Could not add buddy %s to group %s to the server list on account %s."
 msgstr ""
 "Impossível adicionar contacto %s ao grupo %s à lista do servidor da conta %s."
 
-#: src/protocols/yahoo/yahoo.c:1864
+#: src/protocols/yahoo/yahoo.c:1896
 msgid "Could not add buddy to server list"
 msgstr "Impossível adicionar contacto à lista do servidor"
 
-#: src/protocols/yahoo/yahoo.c:2055 src/protocols/yahoo/yahoo.c:2186
+#: src/protocols/yahoo/yahoo.c:2088 src/protocols/yahoo/yahoo.c:2216
 msgid "Unable to read"
 msgstr "Inpossível ler"
 
-#: src/protocols/yahoo/yahoo.c:2208 src/protocols/yahoo/yahoo.c:2318
-#: src/protocols/yahoo/yahoo.c:2374 src/protocols/yahoo/yahoo.c:2384
-#: src/protocols/yahoo/yahoochat.c:1358 src/protocols/yahoo/yahoochat.c:1419
+#: src/protocols/yahoo/yahoo.c:2238 src/protocols/yahoo/yahoo.c:2348
+#: src/protocols/yahoo/yahoo.c:2398 src/protocols/yahoo/yahoo.c:2408
+#: src/protocols/yahoo/yahoochat.c:1397 src/protocols/yahoo/yahoochat.c:1458
 msgid "Connection problem"
 msgstr "Problema na ligação"
 
-#: src/protocols/yahoo/yahoo.c:2472 src/protocols/yahoo/yahoo.c:2850
-#: src/protocols/yahoo/yahoo.c:2962
+#: src/protocols/yahoo/yahoo.c:2495 src/protocols/yahoo/yahoo.c:2857
+#: src/protocols/yahoo/yahoo.c:2971
 msgid "Not At Home"
 msgstr "Fora de casa"
 
-#: src/protocols/yahoo/yahoo.c:2474 src/protocols/yahoo/yahoo.c:2852
-#: src/protocols/yahoo/yahoo.c:2963
+#: src/protocols/yahoo/yahoo.c:2497 src/protocols/yahoo/yahoo.c:2859
+#: src/protocols/yahoo/yahoo.c:2972
 msgid "Not At Desk"
 msgstr "Não estou por perto"
 
-#: src/protocols/yahoo/yahoo.c:2476 src/protocols/yahoo/yahoo.c:2854
-#: src/protocols/yahoo/yahoo.c:2964
+#: src/protocols/yahoo/yahoo.c:2499 src/protocols/yahoo/yahoo.c:2861
+#: src/protocols/yahoo/yahoo.c:2973
 msgid "Not In Office"
 msgstr "Fora do escritório"
 
-#: src/protocols/yahoo/yahoo.c:2480 src/protocols/yahoo/yahoo.c:2858
-#: src/protocols/yahoo/yahoo.c:2966
+#: src/protocols/yahoo/yahoo.c:2503 src/protocols/yahoo/yahoo.c:2865
+#: src/protocols/yahoo/yahoo.c:2975
 msgid "On Vacation"
 msgstr "De férias"
 
-#: src/protocols/yahoo/yahoo.c:2484 src/protocols/yahoo/yahoo.c:2862
-#: src/protocols/yahoo/yahoo.c:2968
+#: src/protocols/yahoo/yahoo.c:2507 src/protocols/yahoo/yahoo.c:2869
+#: src/protocols/yahoo/yahoo.c:2977
 msgid "Stepped Out"
 msgstr "Fui embora"
 
-#: src/protocols/yahoo/yahoo.c:2565 src/protocols/yahoo/yahoo.c:2591
+#: src/protocols/yahoo/yahoo.c:2588 src/protocols/yahoo/yahoo.c:2614
 msgid "Not on server list"
 msgstr "Não está na lista do servidor"
 
-#: src/protocols/yahoo/yahoo.c:2611
+#: src/protocols/yahoo/yahoo.c:2634
 #, c-format
 msgid ""
 "\n"
@@ -10083,27 +10317,27 @@
 "\n"
 "<b>%s:</b> %s"
 
-#: src/protocols/yahoo/yahoo.c:2682
+#: src/protocols/yahoo/yahoo.c:2693
 msgid "Join in Chat"
 msgstr "Entrar no Chat"
 
-#: src/protocols/yahoo/yahoo.c:2686
+#: src/protocols/yahoo/yahoo.c:2698
 msgid "Initiate Conference"
 msgstr "Iniciar Conferência"
 
-#: src/protocols/yahoo/yahoo.c:2743
+#: src/protocols/yahoo/yahoo.c:2750
 msgid "Active which ID?"
 msgstr "Activar qual ID?"
 
-#: src/protocols/yahoo/yahoo.c:2752
+#: src/protocols/yahoo/yahoo.c:2759
 msgid "Join who in chat?"
 msgstr "Juntar a quem no chat?"
 
-#: src/protocols/yahoo/yahoo.c:2762
+#: src/protocols/yahoo/yahoo.c:2769
 msgid "Activate ID..."
 msgstr "Activar ID..."
 
-#: src/protocols/yahoo/yahoo.c:2766
+#: src/protocols/yahoo/yahoo.c:2773
 msgid "Join user in chat..."
 msgstr "Juntar a um utilizador num chat..."
 
@@ -10118,42 +10352,50 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/yahoo/yahoo.c:3286 src/protocols/yahoo/yahoo.c:3288
+#: src/protocols/yahoo/yahoo.c:3292 src/protocols/yahoo/yahoo.c:3294
 msgid "Yahoo Protocol Plugin"
 msgstr "Plugin do protocolo Yahoo"
 
-#: src/protocols/yahoo/yahoo.c:3307
+#: src/protocols/yahoo/yahoo.c:3313
 msgid "Yahoo Japan"
 msgstr "Yahoo Japão"
 
-#: src/protocols/yahoo/yahoo.c:3310
-msgid "Pager host"
-msgstr "Host do pager"
-
-#: src/protocols/yahoo/yahoo.c:3313
-msgid "Japan Pager host"
-msgstr "Host do Pager Japão"
-
 #: src/protocols/yahoo/yahoo.c:3316
-msgid "Pager port"
-msgstr "Porto do pager"
+msgid "Pager host"
+msgstr "Host do pager"
 
 #: src/protocols/yahoo/yahoo.c:3319
-msgid "File transfer host"
-msgstr "Servidor de transferências de ficheiros"
+msgid "Japan Pager host"
+msgstr "Host do Pager Japão"
 
 #: src/protocols/yahoo/yahoo.c:3322
-msgid "Japan File transfer host"
-msgstr "Servidor de transferências de ficheiros Japão"
+msgid "Pager port"
+msgstr "Porto do pager"
 
 #: src/protocols/yahoo/yahoo.c:3325
+msgid "File transfer host"
+msgstr "Servidor de transferências de ficheiros"
+
+#: src/protocols/yahoo/yahoo.c:3328
+msgid "Japan File transfer host"
+msgstr "Servidor de transferências de ficheiros Japão"
+
+#: src/protocols/yahoo/yahoo.c:3331
 msgid "File transfer port"
 msgstr "Porto de transferências de ficheiros"
 
-#: src/protocols/yahoo/yahoo.c:3328
+#: src/protocols/yahoo/yahoo.c:3334
 msgid "Chat Room List Url"
 msgstr "Url da Lista de Salas de Chat"
 
+#: src/protocols/yahoo/yahoo.c:3337
+msgid "YCHT Host"
+msgstr "Anfitrião YCHT"
+
+#: src/protocols/yahoo/yahoo.c:3340
+msgid "YCHT Port"
+msgstr "Porto YCHT"
+
 #: src/protocols/yahoo/yahoo_filexfer.c:170
 msgid ""
 "Gaim cannot send files over Yahoo! that are bigger than One Megabyte "
@@ -10162,156 +10404,183 @@
 "O Gaim não pode enviar ficheiros pelo Yahoo! que sejam maiores que Um "
 "Megabyte (1,048,576 bytes)."
 
-#: src/protocols/yahoo/yahoo_profile.c:640
-#: src/protocols/yahoo/yahoo_profile.c:961
-msgid "Yahoo! ID"
-msgstr "ID do Yahoo!"
-
-#: src/protocols/yahoo/yahoo_profile.c:664
+#: src/protocols/yahoo/yahoo_profile.c:675
 #, c-format
 msgid "<b>IP Address:</b> %s<br>"
 msgstr "<b>Morada de IP:</b> %s<br>"
 
-#: src/protocols/yahoo/yahoo_profile.c:779
+#: src/protocols/yahoo/yahoo_profile.c:749
+msgid "Yahoo! Japan Profile"
+msgstr "Perfil Yahoo! Japão"
+
+#: src/protocols/yahoo/yahoo_profile.c:750
+msgid "Yahoo! Profile"
+msgstr "Perfil Yahoo!"
+
+#: src/protocols/yahoo/yahoo_profile.c:794
 msgid ""
 "Sorry, profiles marked as containing adult content are not supported at this "
 "time."
 msgstr ""
-"Lamentamos, perfis marcados como contendo conteúdo adulto não são "
-"suportados neste momento."
-
-#: src/protocols/yahoo/yahoo_profile.c:781
-#: src/protocols/yahoo/yahoo_profile.c:829
+"Lamentamos, perfis marcados como contendo conteúdo adulto não são suportados "
+"neste momento."
+
+#: src/protocols/yahoo/yahoo_profile.c:796
 msgid ""
 "If you wish to view this profile, you will need to visit this link in your "
 "web browser"
 msgstr ""
-"Se deseja ver este perfil, terá que visitar este elo no seu navegador da "
-"web"
-
-#: src/protocols/yahoo/yahoo_profile.c:827
+"Se deseja ver este perfil, terá que visitar este elo no seu navegador da web"
+
+#: src/protocols/yahoo/yahoo_profile.c:969
+msgid "Yahoo! ID"
+msgstr "ID do Yahoo!"
+
+#: src/protocols/yahoo/yahoo_profile.c:1043
+#: src/protocols/yahoo/yahoo_profile.c:1047
+#: src/protocols/yahoo/yahoo_profile.c:1051
+msgid "Hobbies"
+msgstr "Hobbies"
+
+#: src/protocols/yahoo/yahoo_profile.c:1061
+#: src/protocols/yahoo/yahoo_profile.c:1065
+msgid "Latest News"
+msgstr "Última(s) notícia(s)"
+
+#: src/protocols/yahoo/yahoo_profile.c:1086
+msgid "Home Page"
+msgstr "Página Inicial"
+
+#: src/protocols/yahoo/yahoo_profile.c:1101
+msgid "Cool Link 1"
+msgstr "Elo Fixe 1"
+
+#: src/protocols/yahoo/yahoo_profile.c:1106
+msgid "Cool Link 2"
+msgstr "Elo Fixe 2"
+
+#: src/protocols/yahoo/yahoo_profile.c:1110
+msgid "Cool Link 3"
+msgstr "Elo Fixe 3"
+
+#: src/protocols/yahoo/yahoo_profile.c:1130
+#, c-format
+msgid "User information for %s unavailable"
+msgstr "Informação do utilizador %s indisponível"
+
+#: src/protocols/yahoo/yahoo_profile.c:1136
 msgid ""
 "Sorry, this profile seems to be in a language that is not supported at this "
 "time."
 msgstr ""
-"Lamentamos, perfis que não estão na língua inglesa não são suportados "
-"neste momento."
-
-#: src/protocols/yahoo/yahoo_profile.c:1038
-#: src/protocols/yahoo/yahoo_profile.c:1042
-#: src/protocols/yahoo/yahoo_profile.c:1046
-msgid "Hobbies"
-msgstr "Hobbies"
-
-#: src/protocols/yahoo/yahoo_profile.c:1056
-#: src/protocols/yahoo/yahoo_profile.c:1060
-msgid "Latest News"
-msgstr "Última(s) notícia(s)"
-
-#: src/protocols/yahoo/yahoo_profile.c:1081
-msgid "Home Page"
-msgstr "Página Inicial"
-
-#: src/protocols/yahoo/yahoo_profile.c:1096
-msgid "Cool Link 1"
-msgstr "Elo Fixe 1"
-
-#: src/protocols/yahoo/yahoo_profile.c:1101
-msgid "Cool Link 2"
-msgstr "Elo Fixe 2"
-
-#: src/protocols/yahoo/yahoo_profile.c:1105
-msgid "Cool Link 3"
-msgstr "Elo Fixe 3"
-
-#: src/protocols/yahoo/yahoo_profile.c:1138
-#, c-format
-msgid "User information for %s unavailable"
-msgstr "Informação do utilizador %s indisponível"
-
-#: src/protocols/yahoo/yahoochat.c:198
+"Lamentamos, perfis que não estão na língua inglesa não são suportados neste "
+"momento."
+
+#: src/protocols/yahoo/yahoo_profile.c:1152
+msgid ""
+"Could not retrieve the user's profile. This most likely is a temporary "
+"server-side problem. Please try again later."
+msgstr ""
+"Incapaz de obter o perfil do utilizador. Isto é provavelmente um problema "
+"temporário no servidor. Por favor tente mais tarde."
+
+#: src/protocols/yahoo/yahoo_profile.c:1155
+msgid ""
+"Could not retrieve the user's profile. This most likely means that the user "
+"does not exist; however, Yahoo! sometimes does fail to find a user's "
+"profile. If you know that the user exists, please try again later."
+msgstr ""
+"Incapaz de obter o perfil de utilizador. Isto provavelmente significa que o "
+"utilizador não existe. No entanto, o Yahoo! por vezes não encontra um "
+"perfil. Se sabe que o utilizador existe, por favor tente mais tarde."
+
+#: src/protocols/yahoo/yahoo_profile.c:1163
+msgid "The user's profile is empty."
+msgstr "O perfil de utilizador está vazio."
+
+#: src/protocols/yahoo/yahoochat.c:203
 #, c-format
 msgid "%s declined your conference invitation to room \"%s\" because \"%s\"."
 msgstr ""
 "%s recusou o seu convite de conferência para a sala \"%s\" porque \"%s\"."
 
-#: src/protocols/yahoo/yahoochat.c:200
+#: src/protocols/yahoo/yahoochat.c:205
 msgid "Invitation Rejected"
 msgstr "Convite Rejeitado"
 
-#: src/protocols/yahoo/yahoochat.c:350
+#: src/protocols/yahoo/yahoochat.c:355
 msgid "Failed to join chat"
 msgstr "Impossível entrar no chat"
 
-#: src/protocols/yahoo/yahoochat.c:350
+#: src/protocols/yahoo/yahoochat.c:355
 msgid "Maybe the room is full?"
 msgstr "Talvez a sala esteja cheia?"
 
-#: src/protocols/yahoo/yahoochat.c:424
+#: src/protocols/yahoo/yahoochat.c:429
 #, c-format
 msgid "You are now chatting in %s."
 msgstr "Está a conversar em %s."
 
-#: src/protocols/yahoo/yahoochat.c:578
+#: src/protocols/yahoo/yahoochat.c:583
 msgid "Failed to join buddy in chat"
 msgstr "Impossível entrar na conversa do contacto"
 
-#: src/protocols/yahoo/yahoochat.c:579
+#: src/protocols/yahoo/yahoochat.c:584
 msgid "Maybe they're not in a chat?"
 msgstr "Talvez não estejam num chat?"
 
-#: src/protocols/yahoo/yahoochat.c:1299
+#: src/protocols/yahoo/yahoochat.c:1338
 msgid "Unable to connect"
 msgstr "Incapaz de ligar"
 
-#: src/protocols/yahoo/yahoochat.c:1299
+#: src/protocols/yahoo/yahoochat.c:1338
 msgid "Fetching the room list failed."
 msgstr "Obter a lista de salas falhou."
 
-#: src/protocols/yahoo/yahoochat.c:1344
+#: src/protocols/yahoo/yahoochat.c:1383
 msgid "Voices"
 msgstr "Vozes"
 
-#: src/protocols/yahoo/yahoochat.c:1347
+#: src/protocols/yahoo/yahoochat.c:1386
 msgid "Webcams"
 msgstr "Webcams"
 
-#: src/protocols/yahoo/yahoochat.c:1358 src/protocols/yahoo/yahoochat.c:1419
+#: src/protocols/yahoo/yahoochat.c:1397 src/protocols/yahoo/yahoochat.c:1458
 msgid "Unable to fetch room list."
 msgstr "Incapaz de obter a lista de salas."
 
-#: src/protocols/yahoo/yahoochat.c:1412
+#: src/protocols/yahoo/yahoochat.c:1451
 msgid "User Rooms"
 msgstr "Salas do Utilizador"
 
-#: src/protocols/zephyr/zephyr.c:566
+#: src/protocols/zephyr/zephyr.c:589
 #, c-format
 msgid "Unable send to chat %s,%s,%s"
 msgstr "Incapaz de enviar para o chat %s,%s,%s"
 
-#: src/protocols/zephyr/zephyr.c:600
+#: src/protocols/zephyr/zephyr.c:624
 #, c-format
 msgid "<b>User:</b> %s<br>"
 msgstr "<b>Utilizador:</b> %s<br>"
 
-#: src/protocols/zephyr/zephyr.c:604
+#: src/protocols/zephyr/zephyr.c:628
 msgid "<br>Hidden or not logged-in"
 msgstr "<br>Invisível ou desligado"
 
-#: src/protocols/zephyr/zephyr.c:608
+#: src/protocols/zephyr/zephyr.c:633
 #, c-format
 msgid "<br>At %s since %s"
 msgstr "<br>Em %s desde %s"
 
-#: src/protocols/zephyr/zephyr.c:873 src/protocols/zephyr/zephyr.c:874
+#: src/protocols/zephyr/zephyr.c:983 src/protocols/zephyr/zephyr.c:984
 msgid "Anyone"
 msgstr "Qualquer um"
 
-#: src/protocols/zephyr/zephyr.c:900
+#: src/protocols/zephyr/zephyr.c:1011
 msgid "Already logged in with Zephyr"
 msgstr "Já ligado ao Zepyhr"
 
-#: src/protocols/zephyr/zephyr.c:900
+#: src/protocols/zephyr/zephyr.c:1011
 msgid ""
 "Because Zephyr uses your system username, you are unable to have multiple "
 "accounts on it when logged in as the same user."
@@ -10319,18 +10588,89 @@
 "Por o Zephyr usar o seu nome do utilizador do sistema, não pode ter "
 "múltiplas contas nele enquanto estiver logado com o mesmo utilizador."
 
-#: src/protocols/zephyr/zephyr.c:1232
+#: src/protocols/zephyr/zephyr.c:1386
 msgid "_Class:"
 msgstr "_Classe:"
 
-#: src/protocols/zephyr/zephyr.c:1238
+#: src/protocols/zephyr/zephyr.c:1392
 msgid "_Instance:"
 msgstr "_Instância:"
 
-#: src/protocols/zephyr/zephyr.c:1244
+#: src/protocols/zephyr/zephyr.c:1398
 msgid "_Recipient:"
 msgstr "_Destinatário:"
 
+#: src/protocols/zephyr/zephyr.c:1409
+#, c-format
+msgid "Attempt to subscribe to %s,%s,%s failed"
+msgstr "Tentativa de subscrever em %s,%s,%s falhou"
+
+#: src/protocols/zephyr/zephyr.c:1678
+msgid "zlocate &lt;nick&gt;: Locate user"
+msgstr "zlocate &lt;nome&gt;: Localizar utilizador"
+
+#: src/protocols/zephyr/zephyr.c:1683
+msgid "zl &lt;nick&gt;: Locate user"
+msgstr "zl &lt;nome&gt;: Localizar utilizador"
+
+#: src/protocols/zephyr/zephyr.c:1688
+msgid "instance &lt;instance&gt;: Set the instance to be used on this class"
+msgstr ""
+"instance &lt;instância&gt;:  Define a instância a ser usada nesta classe"
+
+#: src/protocols/zephyr/zephyr.c:1693
+msgid "inst &lt;instance&gt;: Set the instance to be used on this class"
+msgstr "inst &lt;instância&gt;:  Define a instância a ser usada nesta classe"
+
+#: src/protocols/zephyr/zephyr.c:1699
+msgid "sub &lt;class&gt; &lt;instance&gt; &lt;recipient&gt;: Join a new chat"
+msgstr ""
+"sub &lt;classe&gt; &lt;instância&gt; &lt;recipiente&gt;: Entrar num chat"
+
+#: src/protocols/zephyr/zephyr.c:1704
+msgid ""
+"zi &lt;instance&gt;: Send a message to &lt;message,<i>instance</i>,*&gt;"
+msgstr ""
+"zi &lt;instância&gt;: Enviar uma mensagem para &lt;mensagem,<i>instância</i>,"
+"*&gt;"
+
+#: src/protocols/zephyr/zephyr.c:1710
+msgid ""
+"zci &lt;class&gt; &lt;instance&gt;: Send a message to &lt;<i>class</i>,"
+"<i>instance</i>,*&gt;"
+msgstr ""
+"zci &lt;classe&gt; &lt;instância&gt;: Enviar uma mensagem para &lt;"
+"<i>classe</i>,<i>instância</i>,*&gt;"
+
+#: src/protocols/zephyr/zephyr.c:1716
+msgid ""
+"zcir &lt;class&gt; &lt;instance&gt; &lt;recipient&gt;: Send a message to &lt;"
+"<i>class</i>,<i>instance</i>,<i>recipient</i>&gt;"
+msgstr ""
+"zcir &lt;classe&gt; &lt;instância&gt; &lt;recipiente&gt;: Enviar uma "
+"mensagem para &lt;<i>classe</i>,<i>instância</i>,<i>recipiente</i>*&gt;"
+
+#: src/protocols/zephyr/zephyr.c:1722
+msgid ""
+"zir &lt;instance&gt; &lt;recipient&gt;: Send a message to &lt;MESSAGE,"
+"<i>instance</i>,<i>recipient</i>&gt;"
+msgstr ""
+"zir &lt;instância&gt; &lt;recipiente&gt;: Enviar uma mensagem para &lt;"
+"MENSAGEM,<i>instância</i>,<i>recipiente</i>*&gt;"
+
+#: src/protocols/zephyr/zephyr.c:1727
+msgid "zc &lt;class&gt;: Send a message to &lt;<i>class</i>,PERSONAL,*&gt;"
+msgstr ""
+"zc &lt;classe&gt;: Enviar uma mensagem para &lt;<i>classe</i>,PESSOAL,*&gt;"
+
+#: src/protocols/zephyr/zephyr.c:1802
+msgid "Resubscribe"
+msgstr "Re-Subscrever"
+
+#: src/protocols/zephyr/zephyr.c:1805
+msgid "Retrieve subscriptions from server"
+msgstr "Obter subscrições do servidor"
+
 #. *< api_version
 #. *< type
 #. *< ui_requirement
@@ -10342,19 +10682,19 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/zephyr/zephyr.c:1412 src/protocols/zephyr/zephyr.c:1414
+#: src/protocols/zephyr/zephyr.c:1885 src/protocols/zephyr/zephyr.c:1887
 msgid "Zephyr Protocol Plugin"
 msgstr "Plugin do protocolo Zephyr"
 
-#: src/protocols/zephyr/zephyr.c:1433
+#: src/protocols/zephyr/zephyr.c:1906
 msgid "Export to .anyone"
 msgstr "Exportar para .anyone"
 
-#: src/protocols/zephyr/zephyr.c:1436
+#: src/protocols/zephyr/zephyr.c:1909
 msgid "Export to .zephyr.subs"
 msgstr "Exportar para .zephyr.subs"
 
-#: src/protocols/zephyr/zephyr.c:1439
+#: src/protocols/zephyr/zephyr.c:1912
 msgid "Exposure"
 msgstr "Exposição"
 
@@ -10380,17 +10720,17 @@
 "invalid."
 msgstr ""
 "O nome do host ou o número de porto especificado para o seu tipo de proxy "
-"fornecido é inválido"
+"fornecido é inválido."
 
 #. * Custom away message.
-#: src/prpl.h:205
+#: src/prpl.h:165
 msgid "Custom"
 msgstr "Personalizado"
 
 #. *
 #. * A wrapper for gaim_request_action() that uses Accept and Cancel buttons.
 #.
-#: src/request.h:1252
+#: src/request.h:1253
 msgid "Accept"
 msgstr "Aceitar"
 
@@ -10414,27 +10754,27 @@
 msgid "(1 message)"
 msgstr "(1 mensagem)"
 
-#: src/server.c:1176 src/server.c:1186
+#: src/server.c:1180 src/server.c:1189
 #, c-format
 msgid "%s logged in."
 msgstr "%s ligou-se."
 
-#: src/server.c:1199
+#: src/server.c:1201
 #, c-format
 msgid "%s signed on"
 msgstr "%s ligou-se"
 
-#: src/server.c:1215
+#: src/server.c:1216
 #, c-format
 msgid "%s came back"
 msgstr "%s voltou"
 
-#: src/server.c:1217
+#: src/server.c:1218
 #, c-format
 msgid "%s went away"
 msgstr "%s foi-se embora"
 
-#: src/server.c:1231
+#: src/server.c:1232
 #, c-format
 msgid "%s became idle"
 msgstr "%s tornou-se inactivo"
@@ -10444,17 +10784,17 @@
 msgid "%s became unidle"
 msgstr "%s tornou-se activo"
 
-#: src/server.c:1254 src/server.c:1262
+#: src/server.c:1253 src/server.c:1260
 #, c-format
 msgid "%s logged out."
 msgstr "%s desligou-se."
 
-#: src/server.c:1276
+#: src/server.c:1273
 #, c-format
 msgid "%s signed off"
 msgstr "%s desligou-se"
 
-#: src/server.c:1338
+#: src/server.c:1335
 #, c-format
 msgid ""
 "%s has just been warned by %s.\n"
@@ -10463,11 +10803,11 @@
 "%s foi alertado por %s.\n"
 "O seu novo nível de alerta é %d%%"
 
-#: src/server.c:1341
+#: src/server.c:1338
 msgid "an anonymous person"
 msgstr "uma pessoa anónima"
 
-#: src/server.c:1451
+#: src/server.c:1448
 #, c-format
 msgid ""
 "User '%s' invites %s to buddy chat room: '%s'\n"
@@ -10476,12 +10816,12 @@
 "Utilizador '%s' convida %s para sala de chat de contacto: '%s'\n"
 "%s"
 
-#: src/server.c:1455
+#: src/server.c:1452
 #, c-format
 msgid "User '%s' invites %s to buddy chat room: '%s'\n"
 msgstr "Utilizador '%s' convida %s para sala de chat de contacto: '%s'\n"
 
-#: src/server.c:1461
+#: src/server.c:1458
 msgid "Accept chat invitation?"
 msgstr "Aceitar convite para chat?"
 
@@ -10516,25 +10856,31 @@
 msgid "Unknown."
 msgstr "Desconhecido."
 
-#: src/util.c:2399
+#: src/util.c:2392
+msgid "second"
+msgid_plural "seconds"
+msgstr[0] "segundo"
+msgstr[1] "segundos"
+
+#: src/util.c:2406
 msgid "day"
 msgid_plural "days"
 msgstr[0] "dia"
 msgstr[1] "dias"
 
-#: src/util.c:2407
+#: src/util.c:2414
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "hora"
 msgstr[1] "horas"
 
-#: src/util.c:2415
+#: src/util.c:2422
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "minuto"
 msgstr[1] "minutos"
 
-#: src/util.c:2824
+#: src/util.c:2832
 msgid "g003: Error opening connection.\n"
 msgstr "g003: Erro ao abrir ligação.\n"
 
@@ -10550,6 +10896,33 @@
 msgid "Notification"
 msgstr "Notificação"
 
+#~ msgid "Invalid file name."
+#~ msgstr "Nome de ficheiro inválido."
+
+#~ msgid "That file already exists."
+#~ msgstr "Esse ficheiro já existe."
+
+#~ msgid "Save As..."
+#~ msgstr "Guardar Como..."
+
+#~ msgid "MSN ID"
+#~ msgstr "ID MSN"
+
+#~ msgid "Modes"
+#~ msgstr "Modos"
+
+#~ msgid "User Count:\t\t%d\n"
+#~ msgstr "Número de Utilizadores:\t\t%d\n"
+
+#~ msgid "Hostname"
+#~ msgstr "Nome de Anfitrião"
+
+#~ msgid "Channels"
+#~ msgstr "Canais"
+
+#~ msgid "Invalid Groupname"
+#~ msgstr "Nome de grupo inválido"
+
 #~ msgid "Buddy icon file:"
 #~ msgstr "Ficheiro do ícone de contacto:"
 
--- a/po/ru.po	Tue Jul 13 23:05:59 2004 +0000
+++ b/po/ru.po	Wed Jul 14 19:05:16 2004 +0000
@@ -9,8 +9,8 @@
 msgstr ""
 "Project-Id-Version: ru\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-06-23 16:00+0400\n"
-"PO-Revision-Date: 2004-06-23 18:00+0400\n"
+"POT-Creation-Date: 2004-07-14 20:00+0400\n"
+"PO-Revision-Date: 2004-07-14 20:30+0400\n"
 "Last-Translator: Dmitry Beloglazov <dmaa@lipetsk.ru>\n"
 "Language-Team: Russian <ru@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -141,7 +141,7 @@
 msgid "Gaim - Away"
 msgstr "Gaim - Отошёл"
 
-#: plugins/docklet/docklet.c:114 src/gtkaccount.c:673 src/gtkaccount.c:2095
+#: plugins/docklet/docklet.c:114 src/gtkaccount.c:727 src/gtkaccount.c:2152
 msgid "Auto-login"
 msgstr "Входить автоматически"
 
@@ -157,13 +157,13 @@
 msgid "New..."
 msgstr "Новое..."
 
-#: plugins/docklet/docklet.c:153 src/gtkprefs.c:1796 src/protocols/gg/gg.c:51
-#: src/protocols/irc/msgs.c:187 src/protocols/jabber/jabber.c:959
+#: plugins/docklet/docklet.c:153 src/gtkprefs.c:1809 src/protocols/gg/gg.c:51
+#: src/protocols/irc/msgs.c:187 src/protocols/jabber/jabber.c:960
 #: src/protocols/jabber/jutil.c:32 src/protocols/jabber/presence.c:63
-#: src/protocols/jabber/presence.c:119 src/protocols/novell/novell.c:2718
-#: src/protocols/novell/novell.c:2835 src/protocols/novell/novell.c:2887
-#: src/protocols/oscar/oscar.c:528 src/protocols/oscar/oscar.c:5465
-#: src/protocols/oscar/oscar.c:6463 src/protocols/oscar/oscar.c:6662
+#: src/protocols/jabber/presence.c:119 src/protocols/novell/novell.c:2724
+#: src/protocols/novell/novell.c:2841 src/protocols/novell/novell.c:2893
+#: src/protocols/oscar/oscar.c:532 src/protocols/oscar/oscar.c:5481
+#: src/protocols/oscar/oscar.c:6480 src/protocols/oscar/oscar.c:6679
 #: src/protocols/silc/buddy.c:1379 src/protocols/silc/silc.c:46
 #: src/protocols/silc/silc.c:76
 msgid "Away"
@@ -171,7 +171,7 @@
 
 #. else...
 #: plugins/docklet/docklet.c:159 src/away.c:550
-#: src/protocols/oscar/oscar.c:5383 src/protocols/oscar/oscar.c:6670
+#: src/protocols/oscar/oscar.c:5399 src/protocols/oscar/oscar.c:6687
 msgid "Back"
 msgstr "Вернулся"
 
@@ -179,15 +179,15 @@
 msgid "Mute Sounds"
 msgstr "Отключить звуки"
 
-#: plugins/docklet/docklet.c:172 src/gtkft.c:619
+#: plugins/docklet/docklet.c:172 src/gtkft.c:612
 msgid "File Transfers"
 msgstr "Передача файлов"
 
-#: plugins/docklet/docklet.c:173 src/gtkaccount.c:2274
+#: plugins/docklet/docklet.c:173 src/gtkaccount.c:2333
 msgid "Accounts"
 msgstr "Учётные записи"
 
-#: plugins/docklet/docklet.c:174 src/gtkprefs.c:2490
+#: plugins/docklet/docklet.c:174 src/gtkprefs.c:2503
 msgid "Preferences"
 msgstr "Настройки"
 
@@ -239,18 +239,23 @@
 "контактов или окна входа. Также позволяет помещать сообщения в очередь до "
 "щелчка по значку, подобно ICQ."
 
-#: plugins/extplacement.c:68
+#: plugins/extplacement.c:75
 msgid "By conversation count"
 msgstr "По количеству диалогов"
 
-#: plugins/extplacement.c:89
+#: plugins/extplacement.c:96
 msgid "Conversation Placement"
 msgstr "Расположение бесед"
 
-#: plugins/extplacement.c:94
+#: plugins/extplacement.c:101
 msgid "Number of conversations per window"
 msgstr "Количество бесед в окне"
 
+#: plugins/extplacement.c:107
+#, fuzzy
+msgid "Separate IM and Chat windows when placing by number"
+msgstr "Отдельные окна бесед и чатов"
+
 #. *< api_version
 #. *< type
 #. *< ui_requirement
@@ -258,22 +263,23 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/extplacement.c:114
+#: plugins/extplacement.c:126
 msgid "ExtPlacement"
 msgstr "Экстра-расположение"
 
 #. *< name
 #. *< version
-#: plugins/extplacement.c:116
+#: plugins/extplacement.c:128
 msgid "Extra conversation placement options."
 msgstr "Дополнительные параметры расположения бесед."
 
 #. *< summary
 #. *  description
-#: plugins/extplacement.c:118
-msgid ""
-"Either restrict the number of conversations per windows or use separate "
-"windows for IMs and Chats"
+#: plugins/extplacement.c:130
+#, fuzzy
+msgid ""
+"Restrict the number of conversations per windows, optionally separating IMs "
+"and Chats"
 msgstr "Позволяет ограничивать количество бесед в окне"
 
 #. *< api_version
@@ -445,15 +451,15 @@
 #: plugins/gevolution/add_buddy_dialog.c:143
 #: plugins/gevolution/add_buddy_dialog.c:154
 #: plugins/gevolution/assoc-buddy.c:81 plugins/gevolution/assoc-buddy.c:92
-#: src/gtkblist.c:2984 src/gtkprefs.c:913 src/gtkprefs.c:966
-#: src/gtkprefs.c:1809 src/protocols/jabber/jabber.c:923
+#: src/gtkblist.c:3015 src/gtkprefs.c:961 src/gtkprefs.c:1014
+#: src/gtkprefs.c:1822 src/protocols/jabber/jabber.c:924
 msgid "None"
 msgstr "Нет"
 
 #: plugins/gevolution/add_buddy_dialog.c:187
-#: plugins/gevolution/assoc-buddy.c:175 src/gtkprefs.c:2162
-#: src/gtkroomlist.c:553 src/protocols/jabber/jabber.c:597
-#: src/protocols/msn/msn.c:1286 src/protocols/trepia/trepia.c:398
+#: plugins/gevolution/assoc-buddy.c:175 src/gtkprefs.c:2175
+#: src/gtkroomlist.c:553 src/protocols/jabber/jabber.c:598
+#: src/protocols/msn/msn.c:1311 src/protocols/trepia/trepia.c:398
 msgid "Name"
 msgstr "Имя"
 
@@ -464,17 +470,17 @@
 #. Add the label.
 #: plugins/gevolution/add_buddy_dialog.c:479
 msgid "Select a person from your address book below, or add a new person."
-msgstr "Ниже выберите персону из адресной книги или добавьте новую персону"
+msgstr "Ниже выберите персону из адресной книги или добавьте новую персону."
 
 #. "Search"
 #: plugins/gevolution/add_buddy_dialog.c:492
-#: plugins/gevolution/assoc-buddy.c:380 src/protocols/oscar/oscar.c:6949
+#: plugins/gevolution/assoc-buddy.c:380 src/protocols/oscar/oscar.c:6965
 msgid "Search"
 msgstr "Искать"
 
 #: plugins/gevolution/add_buddy_dialog.c:563
-#: plugins/gevolution/new_person_dialog.c:307 src/gtkblist.c:4013
-#: src/gtkblist.c:4341
+#: plugins/gevolution/new_person_dialog.c:307 src/gtkblist.c:4046
+#: src/gtkblist.c:4374
 msgid "Group:"
 msgstr "Группа:"
 
@@ -513,7 +519,7 @@
 msgstr "Соотнести пользователя"
 
 #: plugins/gevolution/gevo-util.c:64 plugins/gevolution/gevolution.c:89
-#: src/blist.c:775 src/blist.c:963 src/blist.c:2060 src/gtkblist.c:3834
+#: src/blist.c:775 src/blist.c:963 src/blist.c:1870 src/gtkblist.c:3867
 #: src/protocols/jabber/roster.c:66
 msgid "Buddies"
 msgstr "Пользователи"
@@ -580,8 +586,8 @@
 msgstr "Необязательная информация:"
 
 #. Label
-#: plugins/gevolution/new_person_dialog.c:338 src/gtkaccount.c:340
-#: src/protocols/oscar/oscar.c:433
+#: plugins/gevolution/new_person_dialog.c:338 src/gtkaccount.c:378
+#: src/gtkaccount.c:408 src/protocols/oscar/oscar.c:438
 msgid "Buddy Icon"
 msgstr "Значок пользователя"
 
@@ -825,17 +831,17 @@
 msgid "Provides support for loading perl plugins."
 msgstr "Предоставляет поддержку загрузки модулей perl."
 
-#: plugins/raw.c:154
+#: plugins/raw.c:146
 msgid "Raw"
 msgstr "Необработанный"
 
-#: plugins/raw.c:156
+#: plugins/raw.c:148
 msgid "Lets you send raw input to text-based protocols."
 msgstr ""
 "Позволяет вам отправлять необработанный ввод, используя протоколы, "
 "базирующиеся на тексте."
 
-#: plugins/raw.c:157
+#: plugins/raw.c:149
 msgid ""
 "Lets you send raw input to text-based protocols (Jabber, MSN, IRC, TOC). Hit "
 "'Enter' in the entry box to send. Watch the debug window."
@@ -905,7 +911,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/signals-test.c:554
+#: plugins/signals-test.c:566
 msgid "Signals Test"
 msgstr "Проверка сигналов"
 
@@ -913,7 +919,7 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/signals-test.c:557 plugins/signals-test.c:559
+#: plugins/signals-test.c:569 plugins/signals-test.c:571
 msgid "Test to see that all signals are working properly."
 msgstr "Проверяет, все ли сигналы работают исправно."
 
@@ -1133,30 +1139,30 @@
 msgstr "Добавляет в беседы отметки времени в стиле iChat каждые N минут."
 
 #: plugins/win32/transparency/win2ktrans.c:133
-#: plugins/win32/transparency/win2ktrans.c:389
-#: plugins/win32/transparency/win2ktrans.c:420
+#: plugins/win32/transparency/win2ktrans.c:388
+#: plugins/win32/transparency/win2ktrans.c:419
 msgid "Opacity:"
 msgstr "Непрозрачность:"
 
 #. IM Convo trans options
-#: plugins/win32/transparency/win2ktrans.c:370
+#: plugins/win32/transparency/win2ktrans.c:369
 msgid "IM Conversation Windows"
 msgstr "Окна бесед"
 
-#: plugins/win32/transparency/win2ktrans.c:371
+#: plugins/win32/transparency/win2ktrans.c:370
 msgid "_IM window transparency"
 msgstr "Прозрачность окна беседы"
 
-#: plugins/win32/transparency/win2ktrans.c:381
+#: plugins/win32/transparency/win2ktrans.c:380
 msgid "_Show slider bar in IM window"
 msgstr "Показывать полосу прокрутки в окнах бесед"
 
 #. Buddy List trans options
-#: plugins/win32/transparency/win2ktrans.c:406 src/gtkprefs.c:907
+#: plugins/win32/transparency/win2ktrans.c:405 src/gtkprefs.c:955
 msgid "Buddy List Window"
 msgstr "Окно списка контактов"
 
-#: plugins/win32/transparency/win2ktrans.c:407
+#: plugins/win32/transparency/win2ktrans.c:406
 msgid "_Buddy List window transparency"
 msgstr "Прозрачность окна списка контактов"
 
@@ -1167,19 +1173,19 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/win32/transparency/win2ktrans.c:463
+#: plugins/win32/transparency/win2ktrans.c:462
 msgid "Transparency"
 msgstr "Прозрачность"
 
 #. *< name
 #. *< version
 #. *  summary
-#: plugins/win32/transparency/win2ktrans.c:466
+#: plugins/win32/transparency/win2ktrans.c:465
 msgid "Variable Transparency for the buddy list and conversations."
 msgstr "Варьируемая прозрачность для списка контактов и бесед."
 
 #. *  description
-#: plugins/win32/transparency/win2ktrans.c:468
+#: plugins/win32/transparency/win2ktrans.c:467
 msgid ""
 "This plugin enables variable alpha transparency on conversation windows and "
 "the buddy list.\n"
@@ -1205,8 +1211,8 @@
 msgstr "Запускать Gaim при загрузке Windows"
 
 #. Buddy List
-#: plugins/win32/winprefs/winprefs.c:362 src/gtkblist.c:3025
-#: src/gtkprefs.c:2399
+#: plugins/win32/winprefs/winprefs.c:362 src/gtkblist.c:3058
+#: src/gtkprefs.c:2412
 msgid "Buddy List"
 msgstr "Список контактов"
 
@@ -1225,8 +1231,8 @@
 msgstr "Держать окно списка контактов наверху"
 
 #. Conversations
-#: plugins/win32/winprefs/winprefs.c:382 src/gtkprefs.c:958
-#: src/gtkprefs.c:2400 src/protocols/msn/msn.c:1611
+#: plugins/win32/winprefs/winprefs.c:382 src/gtkprefs.c:1006
+#: src/gtkprefs.c:2413 src/protocols/msn/msn.c:1638
 msgid "Conversations"
 msgstr "Беседы"
 
@@ -1240,7 +1246,7 @@
 
 #: plugins/win32/winprefs/winprefs.c:407 plugins/win32/winprefs/winprefs.c:408
 msgid "Options specific to Windows Gaim."
-msgstr "Специфичные для Windows параметры Gaim"
+msgstr "Специфичные для Windows параметры Gaim."
 
 #: src/about.c:60
 msgid "About Gaim"
@@ -1298,260 +1304,264 @@
 msgid "Crazy Patch Writers"
 msgstr "Одержимые авторы заплаток"
 
-#: src/about.c:147
+#: src/about.c:148
 msgid "Retired Developers"
 msgstr "Разработчики, отошедшие от дел"
 
-#: src/about.c:148
+#: src/about.c:149
 msgid "former libfaim maintainer"
 msgstr "предыдущий сопровождающий libfaim"
 
-#: src/about.c:149
+#: src/about.c:150
 msgid "former lead developer"
 msgstr "предыдущий ведущий разработчик"
 
-#: src/about.c:152
+#: src/about.c:153
 msgid "former maintainer"
 msgstr "предыдущий сопровождающий"
 
-#: src/about.c:153
+#: src/about.c:154
 msgid "former Jabber developer"
 msgstr "предыдущий разработчик Jabber"
 
-#: src/about.c:154
+#: src/about.c:155
 msgid "original author"
 msgstr "исходный автор"
 
-#: src/about.c:157
+#: src/about.c:158
 msgid "hacker and designated driver [lazy bum]"
 msgstr ""
 
-#: src/about.c:165
+#: src/about.c:166
 msgid "Current Translators"
 msgstr "Текущие переводчики"
 
-#: src/about.c:166 src/about.c:204
+#: src/about.c:167 src/about.c:207
 msgid "Catalan"
 msgstr "Каталонский"
 
-#: src/about.c:167 src/about.c:205
+#: src/about.c:168 src/about.c:208
 msgid "Czech"
 msgstr "Чешский"
 
-#: src/about.c:168
+#: src/about.c:169
 msgid "Danish"
 msgstr "Датский"
 
-#: src/about.c:169
+#: src/about.c:170
 msgid "British English"
 msgstr "Британский английский"
 
-#: src/about.c:170
+#: src/about.c:171
 msgid "Canadian English"
 msgstr "Канадский английский"
 
-#: src/about.c:171 src/about.c:206
+#: src/about.c:172 src/about.c:209
 msgid "German"
 msgstr "Немецкий"
 
-#: src/about.c:172 src/about.c:207
+#: src/about.c:173 src/about.c:210
 msgid "Spanish"
 msgstr "Испанский"
 
-#: src/about.c:173 src/about.c:208
+#: src/about.c:174 src/about.c:211
 msgid "Finnish"
 msgstr "Финский"
 
-#: src/about.c:174 src/about.c:209
+#: src/about.c:175 src/about.c:212
 msgid "French"
 msgstr "Французский"
 
-#: src/about.c:175
+#: src/about.c:176
 msgid "Hebrew"
 msgstr "Иврит"
 
-#: src/about.c:176
+#: src/about.c:177
 msgid "Hindi"
 msgstr "Хинди"
 
-#: src/about.c:177
+#: src/about.c:178
 msgid "Hungarian"
 msgstr "Венгерский"
 
-#: src/about.c:178 src/about.c:210
+#: src/about.c:179 src/about.c:213
 msgid "Italian"
 msgstr "Итальянский"
 
-#: src/about.c:179 src/about.c:212
+#: src/about.c:180 src/about.c:214
+msgid "Japanese"
+msgstr "Японский"
+
+#: src/about.c:181
+msgid "Lithuanian"
+msgstr "Литовский"
+
+#: src/about.c:182 src/about.c:215
 msgid "Korean"
 msgstr "Корейский"
 
-#: src/about.c:180
+#: src/about.c:183
 msgid "Dutch; Flemish"
 msgstr "Датский; фламандский"
 
-#: src/about.c:181
+#: src/about.c:184
 msgid "Macedonian"
 msgstr "Македонский"
 
-#: src/about.c:182
+#: src/about.c:185
 msgid "Norwegian"
 msgstr "Норвежский"
 
-#: src/about.c:183 src/about.c:213
+#: src/about.c:186 src/about.c:216
 msgid "Polish"
 msgstr "Польский"
 
-#: src/about.c:184
+#: src/about.c:187
 msgid "Portuguese"
 msgstr "Португальский"
 
-#: src/about.c:185
+#: src/about.c:188
 msgid "Portuguese-Brazil"
 msgstr "Португальский-бразильский"
 
-#: src/about.c:186
+#: src/about.c:189
 msgid "Romanian"
 msgstr "Румынский"
 
-#: src/about.c:187 src/about.c:214 src/about.c:215
+#: src/about.c:190 src/about.c:217 src/about.c:218
 msgid "Russian"
 msgstr "Русский"
 
-#: src/about.c:188
+#: src/about.c:191
 msgid "Serbian"
 msgstr "Сербский"
 
-#: src/about.c:189
+#: src/about.c:192
 msgid "Slovenian"
 msgstr "Словенский"
 
-#: src/about.c:190 src/about.c:217
+#: src/about.c:193 src/about.c:220
 msgid "Swedish"
 msgstr "Шведский"
 
-#: src/about.c:191
+#: src/about.c:194
 msgid "Vietnamese"
 msgstr "Вьетнамский"
 
-#: src/about.c:191
-msgid "Gnome Vi Team"
-msgstr "Команда Gnome Vi"
-
-#: src/about.c:193
-msgid "Simplified Chinese"
-msgstr "Упрощённый китайский"
-
 #: src/about.c:194
+msgid "and the Gnome-Vi Team"
+msgstr "и команда Gnome-Vi"
+
+#: src/about.c:196
+msgid "Simplified Chinese"
+msgstr "Упрощённый китайский"
+
+#: src/about.c:197
 msgid "Traditional Chinese"
 msgstr "Традиционный китайский"
 
-#: src/about.c:201
+#: src/about.c:204
 msgid "Past Translators"
 msgstr "Предыдущие переводчики"
 
-#: src/about.c:202
+#: src/about.c:205
 msgid "Amharic"
 msgstr "Амхарский"
 
-#: src/about.c:203
+#: src/about.c:206
 msgid "Bulgarian"
 msgstr "Болгарский"
 
-#: src/about.c:211
-msgid "Japanese"
-msgstr "Японский"
-
-#: src/about.c:216
+#: src/about.c:219
 msgid "Slovak"
 msgstr "Словацкий"
 
-#: src/about.c:218
+#: src/about.c:221
 msgid "Chinese"
 msgstr "Китайский"
 
-#: src/account.c:278 src/protocols/jabber/jabber.c:1000
+#: src/account.c:277 src/protocols/jabber/jabber.c:1001
 msgid "New passwords do not match."
 msgstr "Новые пароли не совпадают."
 
-#: src/account.c:287
+#: src/account.c:286
 msgid "Fill out all fields completely."
 msgstr "Заполните все поля."
 
-#: src/account.c:312
+#: src/account.c:311
 msgid "Original password"
 msgstr "Исходный пароль"
 
-#: src/account.c:319
+#: src/account.c:318
 msgid "New password"
 msgstr "Новый пароль"
 
-#: src/account.c:326
+#: src/account.c:325
 msgid "New password (again)"
 msgstr "Новый пароль (ещё раз)"
 
-#: src/account.c:332
+#: src/account.c:331
 #, c-format
 msgid "Change password for %s"
 msgstr "Изменить пароль для %s"
 
-#: src/account.c:340
+#: src/account.c:339
 msgid "Please enter your current password and your new password."
-msgstr "Введите ваш текущий и ваш новый пароли"
+msgstr "Введите ваш текущий и ваш новый пароли."
 
 #. *
 #. * A wrapper for gaim_request_action() that uses OK and Cancel buttons.
 #.
-#: src/account.c:343 src/connection.c:197 src/dialogs.c:462 src/dialogs.c:518
-#: src/dialogs.c:571 src/gtkblist.c:2343 src/gtkrequest.c:235
-#: src/protocols/jabber/jabber.c:1047 src/protocols/jabber/xdata.c:337
+#: src/account.c:342 src/connection.c:197 src/dialogs.c:462 src/dialogs.c:518
+#: src/dialogs.c:571 src/gtkblist.c:2391 src/gtkrequest.c:242
+#: src/protocols/jabber/jabber.c:1048 src/protocols/jabber/xdata.c:337
 #: src/protocols/msn/msn.c:226 src/protocols/msn/msn.c:241
 #: src/protocols/msn/msn.c:256 src/protocols/msn/msn.c:271
-#: src/protocols/oscar/oscar.c:3353 src/protocols/oscar/oscar.c:3447
-#: src/protocols/oscar/oscar.c:6731 src/protocols/oscar/oscar.c:6828
-#: src/protocols/oscar/oscar.c:6880 src/protocols/oscar/oscar.c:6966
+#: src/protocols/oscar/oscar.c:3369 src/protocols/oscar/oscar.c:3463
+#: src/protocols/oscar/oscar.c:6748 src/protocols/oscar/oscar.c:6844
+#: src/protocols/oscar/oscar.c:6896 src/protocols/oscar/oscar.c:6982
 #: src/protocols/silc/buddy.c:460 src/protocols/silc/buddy.c:1132
-#: src/protocols/silc/chat.c:406 src/protocols/silc/chat.c:444
-#: src/protocols/silc/chat.c:707 src/protocols/silc/ops.c:994
-#: src/protocols/silc/ops.c:1455 src/protocols/silc/silc.c:692
-#: src/protocols/yahoo/yahoo.c:2745 src/protocols/yahoo/yahoo.c:2754
-#: src/request.h:1242
+#: src/protocols/silc/chat.c:409 src/protocols/silc/chat.c:447
+#: src/protocols/silc/chat.c:710 src/protocols/silc/ops.c:1063
+#: src/protocols/silc/ops.c:1671 src/protocols/silc/silc.c:692
+#: src/protocols/yahoo/yahoo.c:2752 src/protocols/yahoo/yahoo.c:2761
+#: src/request.h:1243
 msgid "OK"
 msgstr "OK"
 
-#: src/account.c:344 src/account.c:382 src/away.c:334 src/connection.c:198
+#: src/account.c:343 src/account.c:381 src/away.c:334 src/connection.c:198
 #: src/dialogs.c:299 src/dialogs.c:311 src/dialogs.c:324 src/dialogs.c:345
 #: src/dialogs.c:463 src/dialogs.c:519 src/dialogs.c:572 src/dialogs.c:808
-#: src/dialogs.c:824 src/dialogs.c:842 src/gtkaccount.c:1948
-#: src/gtkaccount.c:2439 src/gtkblist.c:2344 src/gtkblist.c:4379
+#: src/dialogs.c:824 src/dialogs.c:842 src/gtkaccount.c:2002
+#: src/gtkaccount.c:2498 src/gtkblist.c:2392 src/gtkblist.c:4412
 #: src/gtkconn.c:168 src/gtkimhtmltoolbar.c:414 src/gtkprivacy.c:587
 #: src/gtkprivacy.c:600 src/gtkprivacy.c:625 src/gtkprivacy.c:636
-#: src/gtkrequest.c:236 src/protocols/icq/gaim_icq.c:277
-#: src/protocols/jabber/buddy.c:516 src/protocols/jabber/chat.c:710
-#: src/protocols/jabber/jabber.c:666 src/protocols/jabber/jabber.c:1048
+#: src/gtkrequest.c:243 src/protocols/icq/gaim_icq.c:277
+#: src/protocols/jabber/buddy.c:515 src/protocols/jabber/chat.c:710
+#: src/protocols/jabber/jabber.c:667 src/protocols/jabber/jabber.c:1049
 #: src/protocols/jabber/xdata.c:338 src/protocols/msn/msn.c:227
 #: src/protocols/msn/msn.c:242 src/protocols/msn/msn.c:257
 #: src/protocols/msn/msn.c:272 src/protocols/msn/msn.c:289
-#: src/protocols/oscar/oscar.c:1371 src/protocols/oscar/oscar.c:3313
-#: src/protocols/oscar/oscar.c:3354 src/protocols/oscar/oscar.c:3391
-#: src/protocols/oscar/oscar.c:3448 src/protocols/oscar/oscar.c:6732
-#: src/protocols/oscar/oscar.c:6829 src/protocols/oscar/oscar.c:6881
-#: src/protocols/oscar/oscar.c:6950 src/protocols/oscar/oscar.c:6967
+#: src/protocols/oscar/oscar.c:1377 src/protocols/oscar/oscar.c:3329
+#: src/protocols/oscar/oscar.c:3370 src/protocols/oscar/oscar.c:3407
+#: src/protocols/oscar/oscar.c:3464 src/protocols/oscar/oscar.c:6749
+#: src/protocols/oscar/oscar.c:6845 src/protocols/oscar/oscar.c:6897
+#: src/protocols/oscar/oscar.c:6966 src/protocols/oscar/oscar.c:6983
 #: src/protocols/silc/buddy.c:461 src/protocols/silc/buddy.c:1037
-#: src/protocols/silc/buddy.c:1133 src/protocols/silc/chat.c:579
-#: src/protocols/silc/chat.c:708 src/protocols/silc/ops.c:1456
+#: src/protocols/silc/buddy.c:1133 src/protocols/silc/chat.c:582
+#: src/protocols/silc/chat.c:711 src/protocols/silc/ops.c:1672
 #: src/protocols/silc/silc.c:693 src/protocols/trepia/trepia.c:347
-#: src/protocols/yahoo/yahoo.c:2746 src/protocols/yahoo/yahoo.c:2755
-#: src/request.h:1242 src/request.h:1252
+#: src/protocols/yahoo/yahoo.c:2753 src/protocols/yahoo/yahoo.c:2762
+#: src/request.h:1243 src/request.h:1253
 msgid "Cancel"
 msgstr "Отмена"
 
-#: src/account.c:373
+#: src/account.c:372
 #, c-format
 msgid "Change user information for %s"
 msgstr "Изменить информацию о пользователе %s"
 
-#: src/account.c:381 src/gtkrequest.c:242 src/protocols/jabber/buddy.c:515
+#: src/account.c:380 src/gtkrequest.c:249 src/protocols/jabber/buddy.c:514
 #: src/protocols/trepia/trepia.c:346
 msgid "Save"
 msgstr "Сохранить"
@@ -1574,8 +1584,8 @@
 msgstr "Удалить сообщение об отсутствии"
 
 #. Remove button
-#: src/away.c:333 src/gtkconv.c:1352 src/gtkconv.c:3570 src/gtkconv.c:3669
-#: src/gtkrequest.c:241
+#: src/away.c:333 src/gtkconv.c:1388 src/gtkconv.c:3680 src/gtkconv.c:3784
+#: src/gtkrequest.c:248
 msgid "Remove"
 msgstr "Удалить"
 
@@ -1612,16 +1622,12 @@
 msgid "Group not removed"
 msgstr "Группа не удалена"
 
-#: src/blist.c:1393 src/gtkaccount.c:167 src/gtkft.c:161 src/gtkutils.c:721
-#: src/protocols/jabber/buddy.c:571 src/protocols/novell/novell.c:2730
+#: src/blist.c:1393 src/gtkaccount.c:167 src/gtkft.c:154 src/gtkutils.c:627
+#: src/protocols/jabber/buddy.c:570 src/protocols/novell/novell.c:2736
 msgid "Unknown"
 msgstr "Неизвестно"
 
-#: src/blist.c:1721
-msgid "Invalid Groupname"
-msgstr "Неверное имя группы"
-
-#: src/blist.c:2192
+#: src/blist.c:2001
 msgid ""
 "An error was encountered parsing your buddy list.  It has not been loaded, "
 "and the old file has moved to blist.xml~."
@@ -1629,7 +1635,7 @@
 "Произошла ошибка при разборе списка контактов. Список не был загружен, а "
 "старый файл был переименован в blist.xml~."
 
-#: src/blist.c:2195
+#: src/blist.c:2004
 msgid "Buddy List Error"
 msgstr "Ошибка cписка контактов"
 
@@ -1651,71 +1657,71 @@
 msgid "Enter password for %s"
 msgstr "Введите пароль для %s"
 
-#: src/conversation.c:271
+#: src/conversation.c:261
 msgid "Unable to send message. The message is too large."
 msgstr "Не удаётся отправить сообщение. Сообщение слишком велико."
 
-#: src/conversation.c:279
+#: src/conversation.c:269
 msgid "Unable to send message."
 msgstr "Не удаётся отправить сообщение."
 
-#: src/conversation.c:1960
+#: src/conversation.c:1953
 #, c-format
 msgid "%s entered the room."
 msgstr "%s вошёл в комнату."
 
-#: src/conversation.c:1963
+#: src/conversation.c:1956
 #, c-format
 msgid "%s [<I>%s</I>] entered the room."
 msgstr "%s [<I>%s</I>] вошёл в комнату."
 
-#: src/conversation.c:2054
+#: src/conversation.c:2047
 #, c-format
 msgid "You are now known as %s"
 msgstr "Вы теперь известны как %s"
 
-#: src/conversation.c:2057
+#: src/conversation.c:2050
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s теперь известен как %s"
 
-#: src/conversation.c:2099
+#: src/conversation.c:2092
 #, c-format
 msgid "%s left the room (%s)."
 msgstr "%s вышел из комнаты (%s)."
 
-#: src/conversation.c:2101
+#: src/conversation.c:2094
 #, c-format
 msgid "%s left the room."
 msgstr "%s вышел из комнаты."
 
-#: src/conversation.c:2172
+#: src/conversation.c:2165
 #, c-format
 msgid "(+%d more)"
 msgstr "(+%d ещё)"
 
-#: src/conversation.c:2174
+#: src/conversation.c:2167
 #, c-format
 msgid " left the room (%s)."
 msgstr " вышел из комнаты (%s)."
 
-#: src/conversation.c:2464
+#: src/conversation.c:2457
 msgid "Last created window"
 msgstr "Последнее созданное окно"
 
-#: src/conversation.c:2466
+#: src/conversation.c:2459
 msgid "Separate IM and Chat windows"
 msgstr "Отдельные окна бесед и чатов"
 
-#: src/conversation.c:2468 src/gtkprefs.c:1335
+#: src/conversation.c:2461 src/gtkprefs.c:1384
 msgid "New window"
 msgstr "Новое окно"
 
-#: src/conversation.c:2470
+#: src/conversation.c:2463
 msgid "By group"
 msgstr "По группе"
 
-#: src/conversation.c:2472
+#: src/conversation.c:2465
 msgid "By account"
 msgstr "По учётной записи"
 
@@ -1873,8 +1879,8 @@
 msgid "Enter an alias for this chat."
 msgstr "Введите псевдоним для этого чата."
 
-#: src/dialogs.c:807 src/dialogs.c:823 src/dialogs.c:841 src/gtkrequest.c:243
-#: src/protocols/silc/chat.c:569
+#: src/dialogs.c:807 src/dialogs.c:823 src/dialogs.c:841 src/gtkrequest.c:250
+#: src/protocols/silc/chat.c:572
 msgid "Alias"
 msgstr "Псевдоним"
 
@@ -1895,22 +1901,51 @@
 msgid "Alias Buddy"
 msgstr "Псевдоним пользователя"
 
-#: src/ft.c:144
+#: src/ft.c:125
+msgid "That file does not exist."
+msgstr "Такого файла не существует."
+
+#: src/ft.c:134
+msgid "Cannot send a file of 0 bytes."
+msgstr "Нельзя отправить файл размером 0 байтов."
+
+#: src/ft.c:194
+#, c-format
+msgid "%s wants to send you %s (%s)"
+msgstr "%s хочет отправить вам %s (%s)"
+
+#: src/ft.c:229
+#, c-format
+msgid "Accept file transfer request from %s?"
+msgstr "Удовлетворить запрос передачи файла %s?"
+
+#: src/ft.c:233
+#, c-format
+msgid ""
+"A file is available for download from:\n"
+"Remote host: %s\n"
+"Remote port: %d"
+msgstr ""
+"Файл доступен для загрузки с:\n"
+"Удалённый узел: %s\n"
+"Удалённый порт: %d"
+
+#: src/ft.c:285
 #, c-format
 msgid "%s is not a valid filename.\n"
 msgstr "%s не является допустимым именем файла.\n"
 
-#: src/ft.c:157
+#: src/ft.c:298
 #, c-format
 msgid "%s was not found.\n"
 msgstr "%s не было найдено.\n"
 
-#: src/ft.c:786
+#: src/ft.c:927
 #, c-format
 msgid "File transfer to %s aborted.\n"
 msgstr "Передача файла для %s прервана.\n"
 
-#: src/ft.c:788
+#: src/ft.c:929
 #, c-format
 msgid "File transfer from %s aborted.\n"
 msgstr "Передача файла от %s прервана.\n"
@@ -1984,23 +2019,23 @@
 msgid "sorry, i ran out for a while. bbl"
 msgstr ""
 
-#: src/gaimrc.c:372 src/gaimrc.c:1409
+#: src/gaimrc.c:372 src/gaimrc.c:1417
 msgid "boring default"
 msgstr ""
 
-#: src/gaimrc.c:1219 src/gtkblist.c:2986
+#: src/gaimrc.c:1227 src/gtkblist.c:3017
 msgid "Alphabetical"
 msgstr "По алфавиту"
 
-#: src/gaimrc.c:1221 src/gtkblist.c:2987
+#: src/gaimrc.c:1229 src/gtkblist.c:3018
 msgid "By status"
 msgstr "По статусу"
 
-#: src/gaimrc.c:1223 src/gtkblist.c:2988
+#: src/gaimrc.c:1231 src/gtkblist.c:3019
 msgid "By log size"
 msgstr "По размеру журнала"
 
-#: src/gtkaccount.c:309
+#: src/gtkaccount.c:331
 #, c-format
 msgid ""
 "<b>File:</b> %s\n"
@@ -2012,164 +2047,164 @@
 "<b>Размер изображения:</b> %dx%d"
 
 #. Build the login options frame.
-#: src/gtkaccount.c:560
+#: src/gtkaccount.c:614
 msgid "Login Options"
 msgstr "Параметры входа"
 
-#: src/gtkaccount.c:577
+#: src/gtkaccount.c:631
 msgid "Protocol:"
 msgstr "Протокол:"
 
-#: src/gtkaccount.c:582 src/gtkblist.c:3985
+#: src/gtkaccount.c:636 src/gtkblist.c:4018
 msgid "Screen Name:"
 msgstr "Идентификатор пользователя:"
 
-#: src/gtkaccount.c:655
+#: src/gtkaccount.c:709
 msgid "Password:"
 msgstr "Пароль:"
 
-#: src/gtkaccount.c:660 src/gtkblist.c:3999 src/gtkblist.c:4327
+#: src/gtkaccount.c:714 src/gtkblist.c:4032 src/gtkblist.c:4360
 msgid "Alias:"
 msgstr "Псевдоним:"
 
-#: src/gtkaccount.c:664
+#: src/gtkaccount.c:718
 msgid "Remember password"
 msgstr "Запомнить пароль"
 
 #. Build the user options frame.
-#: src/gtkaccount.c:720
+#: src/gtkaccount.c:774
 msgid "User Options"
 msgstr "Параметры пользователя"
 
-#: src/gtkaccount.c:733
+#: src/gtkaccount.c:787
 msgid "New mail notifications"
 msgstr "Извещения о новой почте"
 
-#: src/gtkaccount.c:742
+#: src/gtkaccount.c:796
 msgid "Buddy icon:"
 msgstr "Значок пользователя:"
 
 #. Build the protocol options frame.
-#: src/gtkaccount.c:831
+#: src/gtkaccount.c:885
 #, c-format
 msgid "%s Options"
 msgstr "Параметры %s"
 
 #. Use Global Proxy Settings
-#: src/gtkaccount.c:967 src/gtkaccount.c:1014
+#: src/gtkaccount.c:1021 src/gtkaccount.c:1068
 msgid "Use Global Proxy Settings"
 msgstr "Использовать глобальные настройки прокси"
 
 #. No Proxy
-#: src/gtkaccount.c:973 src/gtkaccount.c:1021
+#: src/gtkaccount.c:1027 src/gtkaccount.c:1075
 msgid "No Proxy"
 msgstr "Нет прокси"
 
 #. HTTP
-#: src/gtkaccount.c:979 src/gtkaccount.c:1028
+#: src/gtkaccount.c:1033 src/gtkaccount.c:1082
 msgid "HTTP"
 msgstr "HTTP"
 
 #. SOCKS 4
-#: src/gtkaccount.c:985 src/gtkaccount.c:1035
+#: src/gtkaccount.c:1039 src/gtkaccount.c:1089
 msgid "SOCKS 4"
 msgstr "SOCKS 4"
 
 #. SOCKS 5
-#: src/gtkaccount.c:991 src/gtkaccount.c:1042
+#: src/gtkaccount.c:1045 src/gtkaccount.c:1096
 msgid "SOCKS 5"
 msgstr "SOCKS 5"
 
 #. Use Environmental Settings
-#: src/gtkaccount.c:997 src/gtkaccount.c:1049 src/gtkprefs.c:1139
+#: src/gtkaccount.c:1051 src/gtkaccount.c:1103 src/gtkprefs.c:1187
 msgid "Use Environmental Settings"
 msgstr "Использовать настройки окружения"
 
-#: src/gtkaccount.c:1088
+#: src/gtkaccount.c:1142
 msgid "you can see the butterflies mating"
 msgstr "вы можете увидеть спаривающихся бабочек"
 
-#: src/gtkaccount.c:1092
+#: src/gtkaccount.c:1146
 msgid "If you look real closely"
 msgstr "Если приглядитесь"
 
-#: src/gtkaccount.c:1108
+#: src/gtkaccount.c:1162
 msgid "Proxy Options"
 msgstr "Параметры прокси"
 
-#: src/gtkaccount.c:1126 src/gtkprefs.c:1133
+#: src/gtkaccount.c:1180 src/gtkprefs.c:1181
 msgid "Proxy _type:"
 msgstr "Тип прокси:"
 
-#: src/gtkaccount.c:1135 src/gtkprefs.c:1160
+#: src/gtkaccount.c:1189 src/gtkprefs.c:1208
 msgid "_Host:"
 msgstr "Узел:"
 
-#: src/gtkaccount.c:1139 src/gtkprefs.c:1178
+#: src/gtkaccount.c:1193 src/gtkprefs.c:1226
 msgid "_Port:"
 msgstr "Порт:"
 
-#: src/gtkaccount.c:1147
+#: src/gtkaccount.c:1201
 msgid "_Username:"
 msgstr "Имя пользователя:"
 
-#: src/gtkaccount.c:1152 src/gtkprefs.c:1215
+#: src/gtkaccount.c:1206 src/gtkprefs.c:1263
 msgid "Pa_ssword:"
 msgstr "Пароль:"
 
-#: src/gtkaccount.c:1524
+#: src/gtkaccount.c:1578
 msgid "Add Account"
 msgstr "Добавить учётную запись"
 
-#: src/gtkaccount.c:1526
+#: src/gtkaccount.c:1580
 msgid "Modify Account"
 msgstr "Изменить учётную запись"
 
 #. Add the disclosure
-#: src/gtkaccount.c:1550
+#: src/gtkaccount.c:1604
 msgid "Show more options"
 msgstr "Показать больше параметров"
 
-#: src/gtkaccount.c:1551
+#: src/gtkaccount.c:1605
 msgid "Show fewer options"
 msgstr "Показать меньше параметров"
 
 #. Register button
-#: src/gtkaccount.c:1578 src/protocols/jabber/jabber.c:665
+#: src/gtkaccount.c:1632 src/protocols/jabber/jabber.c:666
 msgid "Register"
 msgstr "Зарегистрировать"
 
-#: src/gtkaccount.c:1943
+#: src/gtkaccount.c:1997
 #, c-format
 msgid "Are you sure you want to delete %s?"
 msgstr "Вы действительно хотите удалить %s?"
 
-#: src/gtkaccount.c:1947 src/gtkrequest.c:239
+#: src/gtkaccount.c:2001 src/gtkrequest.c:246
 msgid "Delete"
 msgstr "Удалить"
 
-#: src/gtkaccount.c:2061 src/protocols/oscar/oscar.c:3981
+#: src/gtkaccount.c:2115 src/protocols/oscar/oscar.c:3997
 msgid "Screen Name"
 msgstr "Идентификатор пользователя"
 
-#: src/gtkaccount.c:2084 src/protocols/jabber/jabber.c:957
-#: src/protocols/oscar/oscar.c:534 src/protocols/oscar/oscar.c:5463
-#: src/protocols/oscar/oscar.c:6661 src/protocols/silc/silc.c:44
-#: src/protocols/yahoo/yahoo.c:2492 src/protocols/zephyr/zephyr.c:1208
-#: src/protocols/zephyr/zephyr.c:1218
+#: src/gtkaccount.c:2139 src/protocols/jabber/jabber.c:958
+#: src/protocols/oscar/oscar.c:538 src/protocols/oscar/oscar.c:5479
+#: src/protocols/oscar/oscar.c:6678 src/protocols/silc/silc.c:44
+#: src/protocols/yahoo/yahoo.c:2515 src/protocols/zephyr/zephyr.c:1360
+#: src/protocols/zephyr/zephyr.c:1372
 msgid "Online"
 msgstr "В сети"
 
-#: src/gtkaccount.c:2102
+#: src/gtkaccount.c:2160
 msgid "Protocol"
 msgstr "Протокол"
 
-#: src/gtkaccount.c:2414
+#: src/gtkaccount.c:2473
 #, c-format
 msgid "%s%s%s%s has made %s his or her buddy%s%s%s"
 msgstr ""
 
-#: src/gtkaccount.c:2428
+#: src/gtkaccount.c:2487
 msgid ""
 "\n"
 "\n"
@@ -2179,27 +2214,27 @@
 "\n"
 "Хотите добавить его в свой список контактов?"
 
-#: src/gtkaccount.c:2432
+#: src/gtkaccount.c:2491
 msgid "Information"
 msgstr "Информация"
 
-#: src/gtkaccount.c:2436
+#: src/gtkaccount.c:2495
 msgid "Add buddy to your list?"
 msgstr "Добавить пользователя в список?"
 
 #. Add button
-#: src/gtkaccount.c:2438 src/gtkblist.c:4378 src/gtkconv.c:1354
-#: src/gtkconv.c:3563 src/gtkconv.c:3662 src/gtkrequest.c:240
-#: src/protocols/icq/gaim_icq.c:277 src/protocols/oscar/oscar.c:3610
-#: src/protocols/silc/chat.c:578
+#: src/gtkaccount.c:2497 src/gtkblist.c:4411 src/gtkconv.c:1390
+#: src/gtkconv.c:3673 src/gtkconv.c:3777 src/gtkrequest.c:247
+#: src/protocols/icq/gaim_icq.c:277 src/protocols/oscar/oscar.c:3626
+#: src/protocols/silc/chat.c:581
 msgid "Add"
 msgstr "Добавить"
 
-#: src/gtkblist.c:810
+#: src/gtkblist.c:815
 msgid "Join a Chat"
 msgstr "Присоединиться к чату"
 
-#: src/gtkblist.c:831
+#: src/gtkblist.c:836
 msgid ""
 "Please enter the appropriate information about the chat you would like to "
 "join.\n"
@@ -2207,199 +2242,203 @@
 "Введите соответствующую информацию о чате, к которому вы хотели бы "
 "присоединиться.\n"
 
-#: src/gtkblist.c:842 src/gtkpounce.c:445 src/gtkroomlist.c:354
+#: src/gtkblist.c:847 src/gtkpounce.c:412 src/gtkroomlist.c:354
 msgid "_Account:"
 msgstr "Учётнaя запись:"
 
-#: src/gtkblist.c:1128 src/gtkblist.c:3179
+#: src/gtkblist.c:1133 src/gtkblist.c:3212
 msgid "Get _Info"
 msgstr "Информация"
 
-#: src/gtkblist.c:1131 src/gtkblist.c:3170
+#: src/gtkblist.c:1136 src/gtkblist.c:3203
 msgid "I_M"
 msgstr "Сообщение"
 
-#: src/gtkblist.c:1133
+#: src/gtkblist.c:1141
+msgid "_Send File"
+msgstr "Отправить файл"
+
+#: src/gtkblist.c:1145
 msgid "Add Buddy _Pounce"
 msgstr "Добавить правило"
 
-#: src/gtkblist.c:1135
+#: src/gtkblist.c:1147
 msgid "View _Log"
 msgstr "Просмотреть _журнал"
 
-#: src/gtkblist.c:1143 src/gtkblist.c:1229 src/gtkblist.c:1243
+#: src/gtkblist.c:1155 src/gtkblist.c:1241 src/gtkblist.c:1255
 msgid "_Alias..."
 msgstr "Псевдоним..."
 
-#: src/gtkblist.c:1145 src/gtkblist.c:1231 src/gtkblist.c:1248
+#: src/gtkblist.c:1157 src/gtkblist.c:1243 src/gtkblist.c:1260
 #: src/gtkconn.c:361
 msgid "_Remove"
 msgstr "Удалить"
 
-#: src/gtkblist.c:1191
+#: src/gtkblist.c:1203
 msgid "Add a _Buddy"
 msgstr "Добавить пользователя"
 
-#: src/gtkblist.c:1193
+#: src/gtkblist.c:1205
 msgid "Add a C_hat"
 msgstr "Добавить чат"
 
-#: src/gtkblist.c:1195
+#: src/gtkblist.c:1207
 msgid "_Delete Group"
 msgstr "Удалить группу"
 
-#: src/gtkblist.c:1197
+#: src/gtkblist.c:1209
 msgid "_Rename"
 msgstr "Переименовать"
 
 #. join button
-#: src/gtkblist.c:1219 src/gtkroomlist.c:263 src/gtkroomlist.c:409
+#: src/gtkblist.c:1231 src/gtkroomlist.c:263 src/gtkroomlist.c:409
 #: src/stock.c:87
 msgid "_Join"
 msgstr "Присоединиться"
 
-#: src/gtkblist.c:1221
+#: src/gtkblist.c:1233
 msgid "Auto-Join"
 msgstr "Присоединяться автоматически"
 
-#: src/gtkblist.c:1245 src/gtkblist.c:1274
+#: src/gtkblist.c:1257 src/gtkblist.c:1286
 msgid "_Collapse"
 msgstr "Свернуть"
 
-#: src/gtkblist.c:1279
+#: src/gtkblist.c:1291
 msgid "_Expand"
 msgstr "Развернуть"
 
-#: src/gtkblist.c:1937 src/gtkconv.c:4199 src/gtkpounce.c:347
+#: src/gtkblist.c:1949 src/gtkconv.c:4317 src/gtkpounce.c:314
 msgid ""
 "You are not currently signed on with an account that can add that buddy."
 msgstr ""
 "Вы не подключены по учётной записи с возможностью добавлять пользователей."
 
 #. Buddies menu
-#: src/gtkblist.c:2288
+#: src/gtkblist.c:2336
 msgid "/_Buddies"
 msgstr "/_Контакты"
 
-#: src/gtkblist.c:2289
+#: src/gtkblist.c:2337
 msgid "/Buddies/New Instant _Message..."
 msgstr "/Контакты/Новое сообщение..."
 
-#: src/gtkblist.c:2290
+#: src/gtkblist.c:2338
 msgid "/Buddies/Join a _Chat..."
 msgstr "/Контакты/Присоединиться к чату..."
 
-#: src/gtkblist.c:2291
+#: src/gtkblist.c:2339
 msgid "/Buddies/Get User _Info..."
 msgstr "/Контакты/Получить информацию о пользователе..."
 
-#: src/gtkblist.c:2292
+#: src/gtkblist.c:2340
 msgid "/Buddies/View User _Log..."
 msgstr "/Контакты/Просмотреть журнал пользователя..."
 
-#: src/gtkblist.c:2294
+#: src/gtkblist.c:2342
 msgid "/Buddies/Show _Offline Buddies"
 msgstr "/Контакты/Показывать отсутствующих пользователей"
 
-#: src/gtkblist.c:2295
+#: src/gtkblist.c:2343
 msgid "/Buddies/Show _Empty Groups"
 msgstr "/Контакты/Показывать пустые группы"
 
-#: src/gtkblist.c:2296
+#: src/gtkblist.c:2344
 msgid "/Buddies/_Add Buddy..."
 msgstr "/Контакты/Добавить пользователя..."
 
-#: src/gtkblist.c:2297
+#: src/gtkblist.c:2345
 msgid "/Buddies/Add C_hat..."
 msgstr "/Контакты/Добавить чат..."
 
-#: src/gtkblist.c:2298
+#: src/gtkblist.c:2346
 msgid "/Buddies/Add _Group..."
 msgstr "/Контакты/Добавить группу..."
 
-#: src/gtkblist.c:2300
+#: src/gtkblist.c:2348
 msgid "/Buddies/_Signoff"
 msgstr "/Контакты/Отключиться"
 
-#: src/gtkblist.c:2301
+#: src/gtkblist.c:2349
 msgid "/Buddies/_Quit"
 msgstr "/Контакты/Выйти"
 
 #. Tools
-#: src/gtkblist.c:2304
+#: src/gtkblist.c:2352
 msgid "/_Tools"
 msgstr "/_Сервис"
 
-#: src/gtkblist.c:2305
+#: src/gtkblist.c:2353
 msgid "/Tools/_Away"
 msgstr "/Сервис/Статус"
 
-#: src/gtkblist.c:2306
+#: src/gtkblist.c:2354
 msgid "/Tools/Buddy _Pounce"
 msgstr "/Сервис/Слежение за пользователями"
 
-#: src/gtkblist.c:2307
+#: src/gtkblist.c:2355
 msgid "/Tools/Account Ac_tions"
 msgstr "/Сервис/Действия с учётными записями"
 
-#: src/gtkblist.c:2308
+#: src/gtkblist.c:2356
 msgid "/Tools/Pl_ugin Actions"
 msgstr "/Сервис/Действия с модулями"
 
-#: src/gtkblist.c:2310
+#: src/gtkblist.c:2358
 msgid "/Tools/A_ccounts"
 msgstr "/Сервис/Учётные записи"
 
-#: src/gtkblist.c:2311
+#: src/gtkblist.c:2359
 msgid "/Tools/_File Transfers"
 msgstr "/Сервис/Передача файлов"
 
-#: src/gtkblist.c:2312
+#: src/gtkblist.c:2360
 msgid "/Tools/R_oom List"
 msgstr "/Сервис/Список комнат"
 
-#: src/gtkblist.c:2313
+#: src/gtkblist.c:2361
 msgid "/Tools/Pr_eferences"
 msgstr "/Сервис/_Настройки"
 
-#: src/gtkblist.c:2314
+#: src/gtkblist.c:2362
 msgid "/Tools/Pr_ivacy"
 msgstr "/Сервис/Конфиденциальность"
 
-#: src/gtkblist.c:2316
+#: src/gtkblist.c:2364
 msgid "/Tools/View System _Log"
 msgstr "/Сервис/Просмотреть системный журнал"
 
 #. Help
-#: src/gtkblist.c:2319
+#: src/gtkblist.c:2367
 msgid "/_Help"
 msgstr "/_Помощь"
 
-#: src/gtkblist.c:2320
+#: src/gtkblist.c:2368
 msgid "/Help/Online _Help"
 msgstr "/Помощь/Помощь в сети"
 
-#: src/gtkblist.c:2321
+#: src/gtkblist.c:2369
 msgid "/Help/_Debug Window"
 msgstr "/Помощь/Окно отладки"
 
-#: src/gtkblist.c:2322
+#: src/gtkblist.c:2370
 msgid "/Help/_About"
 msgstr "/Помощь/О программе"
 
-#: src/gtkblist.c:2340
+#: src/gtkblist.c:2388
 msgid "Rename Group"
 msgstr "Переименовать группу"
 
-#: src/gtkblist.c:2340
+#: src/gtkblist.c:2388
 msgid "New group name"
 msgstr "Новое имя группы"
 
-#: src/gtkblist.c:2341
+#: src/gtkblist.c:2389
 msgid "Please enter a new name for the selected group."
 msgstr "Введите новое имя для выбранной группы."
 
-#: src/gtkblist.c:2369
+#: src/gtkblist.c:2417
 #, c-format
 msgid ""
 "\n"
@@ -2408,7 +2447,7 @@
 "\n"
 "<b>Учётная запись:</b> %s"
 
-#: src/gtkblist.c:2433
+#: src/gtkblist.c:2481
 msgid ""
 "\n"
 "<b>Status:</b> Offline"
@@ -2416,12 +2455,12 @@
 "\n"
 "<b>Статус:</b> Не в сети"
 
-#: src/gtkblist.c:2448
+#: src/gtkblist.c:2496
 #, c-format
 msgid "%d%%"
 msgstr "%d%%"
 
-#: src/gtkblist.c:2464
+#: src/gtkblist.c:2512
 msgid ""
 "\n"
 "<b>Account:</b>"
@@ -2429,7 +2468,7 @@
 "\n"
 "<b>Учётная запись:</b>"
 
-#: src/gtkblist.c:2465
+#: src/gtkblist.c:2513
 msgid ""
 "\n"
 "<b>Contact Alias:</b>"
@@ -2437,7 +2476,7 @@
 "\n"
 "<b>Псевдоним контакта:</b>"
 
-#: src/gtkblist.c:2466
+#: src/gtkblist.c:2514
 msgid ""
 "\n"
 "<b>Alias:</b>"
@@ -2445,7 +2484,7 @@
 "\n"
 "<b>Псевдоним:</b>"
 
-#: src/gtkblist.c:2467
+#: src/gtkblist.c:2515
 msgid ""
 "\n"
 "<b>Nickname:</b>"
@@ -2453,7 +2492,7 @@
 "\n"
 "<b>Оригинальный псевдоним:</b>"
 
-#: src/gtkblist.c:2468
+#: src/gtkblist.c:2516
 msgid ""
 "\n"
 "<b>Logged In:</b>"
@@ -2461,7 +2500,7 @@
 "\n"
 "<b>В сети:</b>"
 
-#: src/gtkblist.c:2469
+#: src/gtkblist.c:2517
 msgid ""
 "\n"
 "<b>Idle:</b>"
@@ -2469,7 +2508,7 @@
 "\n"
 "<b>Бездействует:</b>"
 
-#: src/gtkblist.c:2470
+#: src/gtkblist.c:2518
 msgid ""
 "\n"
 "<b>Warned:</b>"
@@ -2477,114 +2516,114 @@
 "\n"
 "<b>Предупреждён:</b>"
 
-#: src/gtkblist.c:2472
+#: src/gtkblist.c:2520
 msgid ""
 "\n"
 "<b>Description:</b> Spooky"
 msgstr ""
 
-#: src/gtkblist.c:2473
+#: src/gtkblist.c:2521
 msgid ""
 "\n"
 "<b>Status</b>: Awesome"
 msgstr ""
 
-#: src/gtkblist.c:2474
+#: src/gtkblist.c:2522
 msgid ""
 "\n"
 "<b>Status</b>: Rockin'"
 msgstr ""
 
-#: src/gtkblist.c:2773
+#: src/gtkblist.c:2804
 #, c-format
 msgid "Idle (%dh%02dm) "
 msgstr "Бездействует (%dh%02dm) "
 
-#: src/gtkblist.c:2775
+#: src/gtkblist.c:2806
 #, c-format
 msgid "Idle (%dm) "
 msgstr "Бездействует (%dm) "
 
-#: src/gtkblist.c:2780
+#: src/gtkblist.c:2811
 #, c-format
 msgid "Warned (%d%%) "
 msgstr "Предупреждён (%d%%) "
 
-#: src/gtkblist.c:2783
+#: src/gtkblist.c:2814
 msgid "Offline "
 msgstr "Не в сети "
 
 #. Make menu items sensitive/insensitive where appropriate
-#: src/gtkblist.c:2901
+#: src/gtkblist.c:2932
 msgid "/Buddies/Join a Chat..."
 msgstr "/Контакты/Присоединиться к чату..."
 
-#: src/gtkblist.c:2904
+#: src/gtkblist.c:2935
 msgid "/Tools/Room List"
 msgstr "/Сервис/Список комнат"
 
-#: src/gtkblist.c:2907
+#: src/gtkblist.c:2938
 msgid "/Tools/Privacy"
 msgstr "/Сервис/Конфиденциальность"
 
-#: src/gtkblist.c:3052
+#: src/gtkblist.c:3085
 msgid "/Tools/Away"
 msgstr "/Сервис/Статус"
 
-#: src/gtkblist.c:3055
+#: src/gtkblist.c:3088
 msgid "/Tools/Buddy Pounce"
 msgstr "/Сервис/Слежение за пользователями"
 
-#: src/gtkblist.c:3058
+#: src/gtkblist.c:3091
 msgid "/Tools/Account Actions"
 msgstr "/Сервис/Действия с учётными записями"
 
-#: src/gtkblist.c:3061
+#: src/gtkblist.c:3094
 msgid "/Tools/Plugin Actions"
 msgstr "/Сервис/Действия с модулями"
 
 #. set the Show Offline Buddies option. must be done
 #. * after the treeview or faceprint gets mad. -Robot101
 #.
-#: src/gtkblist.c:3150
+#: src/gtkblist.c:3183
 msgid "/Buddies/Show Offline Buddies"
 msgstr "/Контакты/Показывать отсутствующих пользователей"
 
-#: src/gtkblist.c:3152
+#: src/gtkblist.c:3185
 msgid "/Buddies/Show Empty Groups"
 msgstr "/Контакты/Показывать пустые группы"
 
-#: src/gtkblist.c:3176
+#: src/gtkblist.c:3209
 msgid "Send a message to the selected buddy"
 msgstr "Отправить сообщение выбранному пользователю"
 
-#: src/gtkblist.c:3185
+#: src/gtkblist.c:3218
 msgid "Get information on the selected buddy"
 msgstr "Получить информацию о выбранном пользователе"
 
-#: src/gtkblist.c:3188
+#: src/gtkblist.c:3221
 msgid "_Chat"
 msgstr "Чат"
 
-#: src/gtkblist.c:3193
+#: src/gtkblist.c:3226
 msgid "Join a chat room"
 msgstr "Присоединиться к чату"
 
-#: src/gtkblist.c:3196
+#: src/gtkblist.c:3229
 msgid "_Away"
 msgstr "Статус"
 
-#: src/gtkblist.c:3201
+#: src/gtkblist.c:3234
 msgid "Set an away message"
 msgstr "Установить сообщение об отсутствии"
 
-#: src/gtkblist.c:3939 src/protocols/silc/buddy.c:731
+#: src/gtkblist.c:3972 src/protocols/silc/buddy.c:731
 #: src/protocols/silc/buddy.c:989 src/protocols/silc/buddy.c:1034
-#: src/protocols/silc/buddy.c:1124 src/protocols/yahoo/yahoo.c:2672
+#: src/protocols/silc/buddy.c:1124 src/protocols/yahoo/yahoo.c:2682
 msgid "Add Buddy"
 msgstr "Добавить пользователя"
 
-#: src/gtkblist.c:3963
+#: src/gtkblist.c:3996
 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. "
@@ -2596,21 +2635,21 @@
 "пользователя, когда это возможно.\n"
 
 #. Set up stuff for the account box
-#: src/gtkblist.c:4023 src/gtkblist.c:4307
+#: src/gtkblist.c:4056 src/gtkblist.c:4340
 msgid "Account:"
 msgstr "Учётнaя запись:"
 
-#: src/gtkblist.c:4266
+#: src/gtkblist.c:4299
 msgid ""
 "You are not currently signed on with any protocols that have the ability to "
 "chat."
 msgstr "Вы не подключены по протоколам, которые имеют поддержку чатов."
 
-#: src/gtkblist.c:4273
+#: src/gtkblist.c:4306
 msgid "Add Chat"
 msgstr "Добавить чат"
 
-#: src/gtkblist.c:4297
+#: src/gtkblist.c:4330
 msgid ""
 "Please enter an alias, and the appropriate information about the chat you "
 "would like to add to your buddy list.\n"
@@ -2618,15 +2657,15 @@
 "Введите псевдоним и соответствующую информацию о чате, который вы хотели бы "
 "добавить в список контактов.\n"
 
-#: src/gtkblist.c:4375
+#: src/gtkblist.c:4408
 msgid "Add Group"
 msgstr "Добавить группу"
 
-#: src/gtkblist.c:4376
+#: src/gtkblist.c:4409
 msgid "Please enter the name of the group to be added."
 msgstr "Введите имя добавляемой группы."
 
-#: src/gtkblist.c:4943 src/gtkblist.c:5040
+#: src/gtkblist.c:4976 src/gtkblist.c:5073
 msgid "No actions available"
 msgstr "Нет доступных действий"
 
@@ -2675,29 +2714,16 @@
 msgid "Time"
 msgstr "Время"
 
-#: src/gtkconv.c:168
-#, c-format
-msgid "<h1>Conversation with %s</h1>\n"
-msgstr "<h1>Беседа с %s</h1>\n"
-
-#: src/gtkconv.c:186 src/gtkdebug.c:212
-msgid "That file already exists"
-msgstr "Такой файл уже существует"
-
-#: src/gtkconv.c:187 src/gtkdebug.c:213 src/gtkft.c:1123
-msgid "Would you like to overwrite it?"
-msgstr "Вы хотели бы перезаписать его?"
-
-#: src/gtkconv.c:365
+#: src/gtkconv.c:314
 #, c-format
 msgid "me is using Gaim v%s."
 msgstr ""
 
-#: src/gtkconv.c:374
+#: src/gtkconv.c:323
 msgid "Supported debug options are:  version"
 msgstr "Поддерживаемые параметры отладки:  version"
 
-#: src/gtkconv.c:387
+#: src/gtkconv.c:336
 msgid ""
 "Use \"/help &lt;command&gt;\" for help on a specific command.\n"
 "The following commands are available in this context:\n"
@@ -2705,46 +2731,46 @@
 "Используйте \"/help &lt;команда&gt;\" для помощи по конкретной команде.\n"
 "Следующие команды доступны в этом контексте:\n"
 
-#: src/gtkconv.c:421
+#: src/gtkconv.c:370
 msgid "No such command (in this context)."
 msgstr "Нет такой команды (в этом контексте)."
 
-#: src/gtkconv.c:468
+#: src/gtkconv.c:443
 msgid ""
 "No such command. If you didn't mean to type a command, you can turn commands "
 "off from Tools->Preferences->Interface->Conversation->Enable \"slash\" "
 "commands."
 msgstr ""
 
-#: src/gtkconv.c:476
+#: src/gtkconv.c:451
 msgid ""
 "Syntax Error:  You typed the wrong number of arguments to that command. If "
 "you didn't mean to type a command, you can turn commands off from Tools-"
 ">Preferences->Interface->Conversation->Enable \"slash\" commands."
 msgstr ""
 
-#: src/gtkconv.c:483
+#: src/gtkconv.c:458
 msgid "Your command failed for an unknown reason."
 msgstr "Ваша команда не была выполнена по неизвестной причине."
 
-#: src/gtkconv.c:490
+#: src/gtkconv.c:465
 msgid "That command only works in Chats, not IMs."
 msgstr "Эта команда работает только в чатах, не в беседах."
 
-#: src/gtkconv.c:493
+#: src/gtkconv.c:468
 msgid "That command only works in IMs, not Chats."
 msgstr "Эта команда работает только в беседах, не в чатах."
 
-#: src/gtkconv.c:497
+#: src/gtkconv.c:472
 msgid "That command doesn't work on this protocol."
-msgstr "Эта команда не работает с этим протоколом"
-
-#: src/gtkconv.c:713
+msgstr "Эта команда не работает с этим протоколом."
+
+#: src/gtkconv.c:693
 msgid "Invite Buddy Into Chat Room"
 msgstr "Пригласить пользователя в чат"
 
 #. Put our happy label in it.
-#: src/gtkconv.c:741
+#: src/gtkconv.c:721
 msgid ""
 "Please enter the name of the user you wish to invite, along with an optional "
 "invite message."
@@ -2752,314 +2778,349 @@
 "Введите имя пользователя, которого вы хотите пригласить, вместе с "
 "необязательным текстом приглашения."
 
-#: src/gtkconv.c:762
+#: src/gtkconv.c:742
 msgid "_Buddy:"
 msgstr "Пользователь:"
 
-#: src/gtkconv.c:782
+#: src/gtkconv.c:762
 msgid "_Message:"
 msgstr "Сообщение:"
 
-#: src/gtkconv.c:890 src/gtkdebug.c:127
+#: src/gtkconv.c:799 src/gtkconv.c:2489 src/gtkdebug.c:182
+msgid "Unable to open file."
+msgstr "Не удаётся открыть файл."
+
+#: src/gtkconv.c:804
+#, c-format
+msgid "<h1>Conversation with %s</h1>\n"
+msgstr "<h1>Беседа с %s</h1>\n"
+
+#: src/gtkconv.c:818
+msgid "Save Conversation"
+msgstr "Сохранить беседу"
+
+#: src/gtkconv.c:895 src/gtkdebug.c:131
 msgid "Find"
 msgstr "Найти"
 
-#: src/gtkconv.c:916 src/gtkdebug.c:155
+#: src/gtkconv.c:921 src/gtkdebug.c:159
 msgid "_Search for:"
 msgstr "Искать:"
 
-#: src/gtkconv.c:1312
+#: src/gtkconv.c:1338
 msgid "IM"
 msgstr "Сообщение"
 
-#: src/gtkconv.c:1320
+#. Block button
+#: src/gtkconv.c:1347 src/gtkconv.c:3666 src/protocols/oscar/oscar.c:453
+#: src/protocols/oscar/oscar.c:6788
+msgid "Send File"
+msgstr "Отправить файл"
+
+#: src/gtkconv.c:1356
 msgid "Un-Ignore"
 msgstr "Не игнорировать"
 
-#: src/gtkconv.c:1322 src/gtkprefs.c:778
+#: src/gtkconv.c:1358 src/gtkprefs.c:826
 msgid "Ignore"
 msgstr "Игнорировать"
 
 #. Info button
-#: src/gtkconv.c:1331 src/gtkconv.c:3577
+#: src/gtkconv.c:1367 src/gtkconv.c:3687
 msgid "Info"
 msgstr "Информация"
 
-#: src/gtkconv.c:1340
+#: src/gtkconv.c:1376
 msgid "Get Away Msg"
 msgstr "Получить сообщение об отсутствии"
 
-#: src/gtkconv.c:2467
+#: src/gtkconv.c:2497
+msgid "Unable to save icon file to disk."
+msgstr "Не удаётся сохранить файл значка на диск."
+
+#: src/gtkconv.c:2514
+msgid "Save Icon"
+msgstr "Сохранить значок"
+
+#: src/gtkconv.c:2544
 msgid "Animate"
 msgstr "Анимировать"
 
-#: src/gtkconv.c:2472
+#: src/gtkconv.c:2549
 msgid "Hide Icon"
 msgstr "Скрыть значок"
 
-#: src/gtkconv.c:2478
+#: src/gtkconv.c:2555
 msgid "Save Icon As..."
 msgstr "Сохранить значок как..."
 
-#: src/gtkconv.c:2847
+#: src/gtkconv.c:2939
 msgid "User is typing..."
 msgstr "Пользователь пишет..."
 
-#: src/gtkconv.c:2855
+#: src/gtkconv.c:2947
 msgid "User has typed something and paused"
 msgstr "Пользователь что-то написал и остановился"
 
 #. Build the Send As menu
-#: src/gtkconv.c:2958
+#: src/gtkconv.c:3050
 msgid "_Send As"
 msgstr "Отправить как"
 
-#: src/gtkconv.c:3335
-msgid "Save Conversation"
-msgstr "Сохранить беседу"
-
 #. Conversation menu
-#: src/gtkconv.c:3352
+#: src/gtkconv.c:3450
 msgid "/_Conversation"
 msgstr "/_Беседа"
 
-#: src/gtkconv.c:3354
+#: src/gtkconv.c:3452
 msgid "/Conversation/New Instant _Message..."
 msgstr "/Беседа/Новое сообщение..."
 
-#: src/gtkconv.c:3359
+#: src/gtkconv.c:3457
 msgid "/Conversation/_Find..."
 msgstr "/Беседа/Найти..."
 
-#: src/gtkconv.c:3361
+#: src/gtkconv.c:3459
 msgid "/Conversation/View _Log"
 msgstr "/Беседа/Просмотреть журнал"
 
-#: src/gtkconv.c:3362
+#: src/gtkconv.c:3460
 msgid "/Conversation/_Save As..."
 msgstr "/Беседа/Сохранить как..."
 
-#: src/gtkconv.c:3364
+#: src/gtkconv.c:3462
 msgid "/Conversation/Clear"
 msgstr "/Беседа/Очистить"
 
-#: src/gtkconv.c:3368
+#: src/gtkconv.c:3466
+msgid "/Conversation/Se_nd File..."
+msgstr "/Беседа/Отправить файл..."
+
+#: src/gtkconv.c:3467
 msgid "/Conversation/Add Buddy _Pounce..."
 msgstr "/Беседа/Добавить правило..."
 
-#: src/gtkconv.c:3370
+#: src/gtkconv.c:3469
 msgid "/Conversation/_Get Info"
 msgstr "/Беседа/Получить информацию"
 
-#: src/gtkconv.c:3372
+#: src/gtkconv.c:3471
 msgid "/Conversation/_Warn..."
 msgstr "/Беседа/Сделать предупреждение..."
 
-#: src/gtkconv.c:3374
+#: src/gtkconv.c:3473
 msgid "/Conversation/In_vite..."
 msgstr "/Беседа/Пригласить..."
 
-#: src/gtkconv.c:3379
+#: src/gtkconv.c:3478
 msgid "/Conversation/A_lias..."
 msgstr "/Беседа/Псевдоним..."
 
-#: src/gtkconv.c:3381
+#: src/gtkconv.c:3480
 msgid "/Conversation/_Block..."
 msgstr "/Беседа/Блокировать..."
 
-#: src/gtkconv.c:3383
+#: src/gtkconv.c:3482
 msgid "/Conversation/_Add..."
 msgstr "/Беседа/Добавить..."
 
-#: src/gtkconv.c:3385
+#: src/gtkconv.c:3484
 msgid "/Conversation/_Remove..."
 msgstr "/Беседа/Удалить..."
 
-#: src/gtkconv.c:3390
+#: src/gtkconv.c:3489
 msgid "/Conversation/Insert Lin_k..."
 msgstr "/Беседа/Вставить ссылку..."
 
-#: src/gtkconv.c:3392
+#: src/gtkconv.c:3491
 msgid "/Conversation/Insert Imag_e..."
 msgstr "/Беседа/Вставить изображение..."
 
-#: src/gtkconv.c:3397
+#: src/gtkconv.c:3496
 msgid "/Conversation/_Close"
 msgstr "/Беседа/Закрыть"
 
 #. Options
-#: src/gtkconv.c:3401
+#: src/gtkconv.c:3500
 msgid "/_Options"
 msgstr "/_Параметры"
 
-#: src/gtkconv.c:3402
+#: src/gtkconv.c:3501
 msgid "/Options/Enable _Logging"
 msgstr "/Параметры/Вести журнал"
 
-#: src/gtkconv.c:3403
+#: src/gtkconv.c:3502
 msgid "/Options/Enable _Sounds"
 msgstr "/Параметры/Воспроизводить звуки"
 
-#: src/gtkconv.c:3404
+#: src/gtkconv.c:3503
 msgid "/Options/Show Formatting _Toolbar"
 msgstr "/Параметры/Показывать панель инструментов форматирования"
 
-#: src/gtkconv.c:3405
+#: src/gtkconv.c:3504
 msgid "/Options/Show T_imestamps"
 msgstr "/Параметры/Показывать время сообщений"
 
-#: src/gtkconv.c:3447
+#: src/gtkconv.c:3546
 msgid "/Conversation/View Log"
 msgstr "/Беседа/Просмотреть журнал"
 
-#: src/gtkconv.c:3452
+#: src/gtkconv.c:3551
+msgid "/Conversation/Send File..."
+msgstr "/Беседа/Отправить файл..."
+
+#: src/gtkconv.c:3555
 msgid "/Conversation/Add Buddy Pounce..."
 msgstr "/Беседа/Добавить правило..."
 
-#: src/gtkconv.c:3458
+#: src/gtkconv.c:3561
 msgid "/Conversation/Get Info"
 msgstr "/Беседа/Получить информацию"
 
-#: src/gtkconv.c:3462
+#: src/gtkconv.c:3565
 msgid "/Conversation/Warn..."
 msgstr "/Беседа/Сделать предупреждение..."
 
-#: src/gtkconv.c:3466
+#: src/gtkconv.c:3569
 msgid "/Conversation/Invite..."
 msgstr "/Беседа/Пригласить..."
 
-#: src/gtkconv.c:3472
+#: src/gtkconv.c:3575
 msgid "/Conversation/Alias..."
 msgstr "/Беседа/Псевдоним..."
 
-#: src/gtkconv.c:3476
+#: src/gtkconv.c:3579
 msgid "/Conversation/Block..."
 msgstr "/Беседа/Блокировать..."
 
-#: src/gtkconv.c:3480
+#: src/gtkconv.c:3583
 msgid "/Conversation/Add..."
 msgstr "/Беседа/Добавить..."
 
-#: src/gtkconv.c:3484
+#: src/gtkconv.c:3587
 msgid "/Conversation/Remove..."
 msgstr "/Беседа/Удалить..."
 
-#: src/gtkconv.c:3490
+#: src/gtkconv.c:3593
 msgid "/Conversation/Insert Link..."
 msgstr "/Беседа/Вставить ссылку..."
 
-#: src/gtkconv.c:3494
+#: src/gtkconv.c:3597
 msgid "/Conversation/Insert Image..."
 msgstr "/Беседа/Вставить изображение..."
 
-#: src/gtkconv.c:3500
+#: src/gtkconv.c:3603
 msgid "/Options/Enable Logging"
 msgstr "/Параметры/Вести журнал"
 
-#: src/gtkconv.c:3503
+#: src/gtkconv.c:3606
 msgid "/Options/Enable Sounds"
 msgstr "/Параметры/Воспроизводить звуки"
 
-#: src/gtkconv.c:3506
+#: src/gtkconv.c:3609
 msgid "/Options/Show Formatting Toolbar"
 msgstr "/Параметры/Показывать панель инструментов форматирования"
 
-#: src/gtkconv.c:3509
+#: src/gtkconv.c:3612
 msgid "/Options/Show Timestamps"
 msgstr "/Параметры/Показывать время сообщений"
 
 #. From right to left...
 #. Send button
-#: src/gtkconv.c:3533 src/gtkconv.c:3535 src/gtkconv.c:3641 src/gtkconv.c:3643
+#: src/gtkconv.c:3636 src/gtkconv.c:3638 src/gtkconv.c:3756 src/gtkconv.c:3758
 msgid "Send"
 msgstr "Отправить"
 
 #. Now, um, just kind of all over the place. Huh?
 #. Warn button
-#: src/gtkconv.c:3549
+#: src/gtkconv.c:3652
 msgid "Warn"
 msgstr "Сделать предупреждение"
 
-#: src/gtkconv.c:3552
+#: src/gtkconv.c:3655
 msgid "Warn the user"
 msgstr "Сделать пользователю предупреждение"
 
 #. Block button
-#: src/gtkconv.c:3556 src/gtkprivacy.c:624 src/gtkprivacy.c:635
+#: src/gtkconv.c:3659 src/gtkprivacy.c:624 src/gtkprivacy.c:635
 msgid "Block"
 msgstr "Блокировать"
 
-#: src/gtkconv.c:3559
+#: src/gtkconv.c:3662
 msgid "Block the user"
 msgstr "Блокировать пользователя"
 
-#: src/gtkconv.c:3566
+#: src/gtkconv.c:3669
+msgid "Send a file to the user"
+msgstr "Отправить пользователю файл"
+
+#: src/gtkconv.c:3676
 msgid "Add the user to your buddy list"
 msgstr "Добавить пользователя в список контактов"
 
-#: src/gtkconv.c:3573
+#: src/gtkconv.c:3683
 msgid "Remove the user from your buddy list"
 msgstr "Удалить пользователя из списка контактов"
 
-#: src/gtkconv.c:3580 src/gtkconv.c:3923
+#: src/gtkconv.c:3690 src/gtkconv.c:4041
 msgid "Get the user's information"
 msgstr "Получить информацию о пользователе"
 
 #. Invite
-#: src/gtkconv.c:3655
+#: src/gtkconv.c:3770
 msgid "Invite"
 msgstr "Пригласить"
 
-#: src/gtkconv.c:3658
+#: src/gtkconv.c:3773
 msgid "Invite a user"
 msgstr "Пригласить пользователя"
 
-#: src/gtkconv.c:3665
+#: src/gtkconv.c:3780
 msgid "Add the chat to your buddy list"
 msgstr "Добавить чат в список контактов"
 
-#: src/gtkconv.c:3672
+#: src/gtkconv.c:3787
 msgid "Remove the chat from your buddy list"
 msgstr "Удалить чат из списка контактов"
 
-#: src/gtkconv.c:3782
+#: src/gtkconv.c:3897
 msgid "Topic:"
 msgstr "Тема:"
 
 #. Setup the label telling how many people are in the room.
-#: src/gtkconv.c:3845
+#: src/gtkconv.c:3960
 msgid "0 people in room"
 msgstr "0 пользователей в комнате"
 
-#: src/gtkconv.c:3900
+#: src/gtkconv.c:4018
 msgid "IM the user"
 msgstr "Отправить пользователю сообщение"
 
-#: src/gtkconv.c:3912
+#: src/gtkconv.c:4030
 msgid "Ignore the user"
 msgstr "Игнорировать пользователя"
 
-#: src/gtkconv.c:4490
+#: src/gtkconv.c:4629
 msgid "Close conversation"
 msgstr "Закрыть беседу"
 
-#: src/gtkconv.c:5035 src/gtkconv.c:5067 src/gtkconv.c:5188 src/gtkconv.c:5255
+#: src/gtkconv.c:5171 src/gtkconv.c:5203 src/gtkconv.c:5324 src/gtkconv.c:5391
 #, c-format
 msgid "%d person in room"
 msgid_plural "%d people in room"
 msgstr[0] "%d пользователь в комнате"
 msgstr[1] "%d пользователей в комнате"
 
-#: src/gtkconv.c:5757 src/gtkconv.c:5760
+#: src/gtkconv.c:5903 src/gtkconv.c:5906
 msgid "<main>/Conversation/Close"
 msgstr "<main>/Беседа/Закрыть"
 
-#: src/gtkconv.c:6132
+#: src/gtkconv.c:6278
 msgid "me &lt;action&gt;:  Send an IRC style action to a buddy or chat."
 msgstr ""
 "me &lt;действие&gt;:  Отправить действие в стиле IRC пользователю или в чат."
 
-#: src/gtkconv.c:6135
+#: src/gtkconv.c:6281
 msgid ""
 "debug &lt;option&gt;:  Send various debug information to the current "
 "conversation."
@@ -3067,212 +3128,170 @@
 "debug &lt;параметр&gt;:  Отправить различную отладочную информацию в текущую "
 "беседу."
 
-#: src/gtkconv.c:6139
+#: src/gtkconv.c:6285
 msgid "help:  List available commands."
 msgstr "help:  Вывести список доступных команд."
 
-#: src/gtkconv.c:6143
+#: src/gtkconv.c:6289
 msgid "help &lt;command&gt;:  Help on a specific command."
 msgstr "help &lt;команда&gt;:  Получить помощь по конкретной команде."
 
-#: src/gtkdebug.c:226
+#: src/gtkdebug.c:197
 msgid "Save Debug Log"
 msgstr "Сохранить отладочную информацию в журнал"
 
-#: src/gtkdebug.c:289
+#: src/gtkdebug.c:250
 msgid "Debug Window"
 msgstr "Окно отладки"
 
-#: src/gtkdebug.c:327
+#: src/gtkdebug.c:288
 msgid "Pause"
 msgstr "Пауза"
 
-#: src/gtkdebug.c:333
+#: src/gtkdebug.c:294
 msgid "Timestamps"
 msgstr "Время"
 
-#: src/gtkft.c:143
+#: src/gtkft.c:136
 #, c-format
 msgid "%.2f KB/s"
 msgstr "%.2f KB/s"
 
-#: src/gtkft.c:164 src/gtkft.c:974
+#: src/gtkft.c:157 src/gtkft.c:967
 msgid "Finished"
 msgstr "Завершено"
 
-#: src/gtkft.c:167 src/gtkft.c:925
+#: src/gtkft.c:160 src/gtkft.c:918
 msgid "Canceled"
 msgstr "Отменено"
 
-#: src/gtkft.c:170
+#: src/gtkft.c:163
 msgid "Waiting for transfer to begin"
 msgstr "Ожидание начала передачи"
 
-#: src/gtkft.c:223
+#: src/gtkft.c:216
 msgid "<b>Receiving From:</b>"
 msgstr "<b>Приём от:</b>"
 
-#: src/gtkft.c:226
+#: src/gtkft.c:219
 msgid "<b>Sending To:</b>"
 msgstr "<b>Отправка для:</b>"
 
-#: src/gtkft.c:400
+#: src/gtkft.c:393
 msgid "There is no application configured to open this type of file."
 msgstr "Нет приложения, сопоставленного этому типу файла."
 
-#: src/gtkft.c:405
+#: src/gtkft.c:398
 msgid "An error occurred while opening the file."
 msgstr "Произошла ошибка при открытии файла."
 
+#: src/gtkft.c:489
+msgid "Progress"
+msgstr "Прогресс"
+
 #: src/gtkft.c:496
-msgid "Progress"
-msgstr "Прогресс"
-
-#: src/gtkft.c:503
 msgid "Filename"
 msgstr "Имя файла"
 
-#: src/gtkft.c:510
+#: src/gtkft.c:503
 msgid "Size"
 msgstr "Размер"
 
-#: src/gtkft.c:517
+#: src/gtkft.c:510
 msgid "Remaining"
 msgstr "Осталось"
 
-#: src/gtkft.c:547
+#: src/gtkft.c:540
 msgid "Filename:"
 msgstr "Имя файла:"
 
-#: src/gtkft.c:548
+#: src/gtkft.c:541
 msgid "Status:"
 msgstr "Статус:"
 
-#: src/gtkft.c:549
+#: src/gtkft.c:542
 msgid "Speed:"
 msgstr "Скорость:"
 
-#: src/gtkft.c:550
+#: src/gtkft.c:543
 msgid "Time Elapsed:"
 msgstr "Прошло времени:"
 
-#: src/gtkft.c:551
+#: src/gtkft.c:544
 msgid "Time Remaining:"
 msgstr "Осталось времени:"
 
-#: src/gtkft.c:648
+#: src/gtkft.c:641
 msgid "_Keep the dialog open"
 msgstr "Держать диалог открытым"
 
-#: src/gtkft.c:658
+#: src/gtkft.c:651
 msgid "_Clear finished transfers"
 msgstr "Очищать завершённые передачи файлов"
 
 #. "Download Details" arrow
-#: src/gtkft.c:667
+#: src/gtkft.c:660
 msgid "Show transfer details"
 msgstr "Показать подробности о передаче файлов"
 
-#: src/gtkft.c:668
+#: src/gtkft.c:661
 msgid "Hide transfer details"
 msgstr "Скрыть подробности о передаче файлов"
 
 #. Pause button
-#: src/gtkft.c:710 src/stock.c:90
+#: src/gtkft.c:703 src/stock.c:90
 msgid "_Pause"
 msgstr "Пауза"
 
 #. Resume button
-#: src/gtkft.c:720
+#: src/gtkft.c:713
 msgid "_Resume"
 msgstr "Возобновить"
 
-#: src/gtkft.c:927
+#: src/gtkft.c:920
 msgid "Failed"
 msgstr "Не удалось"
 
-#: src/gtkft.c:1099
-msgid "That file does not exist."
-msgstr "Такого файла не существует."
-
-#: src/gtkft.c:1108
-msgid "Cannot send a file of 0 bytes."
-msgstr "Нельзя отправить файл размером 0 байтов."
-
-#: src/gtkft.c:1122
-msgid "That file already exists."
-msgstr "Такой файл уже существует."
-
-#. Open file selector to select the public key.
-#: src/gtkft.c:1148 src/protocols/silc/buddy.c:1023
-msgid "Open..."
-msgstr "Открыть..."
-
-#: src/gtkft.c:1150
-msgid "Save As..."
-msgstr "Сохранить как..."
-
-#: src/gtkft.c:1200
-#, c-format
-msgid "%s wants to send you %s (%s)"
-msgstr "%s хочет отправить вам %s (%s)"
-
-#: src/gtkft.c:1233
-#, c-format
-msgid "Accept file transfer request from %s?"
-msgstr "Удовлетворить запрос передачи файла %s?"
-
-#: src/gtkft.c:1237
-#, c-format
-msgid ""
-"A file is available for download from:\n"
-"Remote host: %s\n"
-"Remote port: %d"
-msgstr ""
-"Файл доступен для загрузки с:\n"
-"Удалённый узел: %s\n"
-"Удалённый порт: %d"
-
-#: src/gtkimhtml.c:567
+#: src/gtkimhtml.c:602
 msgid "Pa_ste As Text"
 msgstr "Вставить как текст"
 
-#: src/gtkimhtml.c:1012
+#: src/gtkimhtml.c:1047
 msgid "Hyperlink color"
 msgstr "Цвет гиперссылки"
 
-#: src/gtkimhtml.c:1013
+#: src/gtkimhtml.c:1048
 msgid "Color to draw hyperlinks."
 msgstr "Цвет для отображения гиперссылок."
 
-#: src/gtkimhtml.c:1218
+#: src/gtkimhtml.c:1253
 msgid "_Copy E-Mail Address"
 msgstr "Скопировать адрес E-Mail"
 
-#: src/gtkimhtml.c:1230
+#: src/gtkimhtml.c:1265
 msgid "_Copy Link Location"
 msgstr "Скопировать ссылку"
 
-#: src/gtkimhtml.c:1240
+#: src/gtkimhtml.c:1275
 msgid "_Open Link in Browser"
 msgstr "Открыть ссылку в браузере"
 
-#: src/gtkimhtml.c:2761
+#: src/gtkimhtml.c:2797
 msgid ""
 "Unable to guess the image type based on the file extension supplied.  "
 "Defaulting to PNG."
 msgstr ""
 
-#: src/gtkimhtml.c:2769
+#: src/gtkimhtml.c:2805
 #, c-format
 msgid "Error saving image: %s"
 msgstr "Ошибка сохранения изображения: %s"
 
-#: src/gtkimhtml.c:2778
+#: src/gtkimhtml.c:2814
 msgid "Save Image"
 msgstr "Сохранить изображение"
 
-#: src/gtkimhtml.c:2801
+#: src/gtkimhtml.c:2837
 msgid "_Save Image..."
 msgstr "Сохранить изображение..."
 
@@ -3316,74 +3335,74 @@
 msgid "_Insert"
 msgstr "Вставить"
 
-#: src/gtkimhtmltoolbar.c:472
+#: src/gtkimhtmltoolbar.c:481
 #, c-format
 msgid "Failed to store image: %s\n"
 msgstr "Не удалось сохранить изображение: %s\n"
 
-#: src/gtkimhtmltoolbar.c:498
+#: src/gtkimhtmltoolbar.c:507 src/gtkimhtmltoolbar.c:517
 msgid "Insert Image"
 msgstr "Вставить изображение"
 
-#: src/gtkimhtmltoolbar.c:637
+#: src/gtkimhtmltoolbar.c:655
 msgid "This theme has no available smileys."
 msgstr "Эта тема не имеет доступных смайликов."
 
 #. show everything
-#: src/gtkimhtmltoolbar.c:652
+#: src/gtkimhtmltoolbar.c:670
 msgid "Smile!"
 msgstr "Смайл!"
 
-#: src/gtkimhtmltoolbar.c:870
+#: src/gtkimhtmltoolbar.c:888
 msgid "Bold"
 msgstr "Жирный"
 
-#: src/gtkimhtmltoolbar.c:881
+#: src/gtkimhtmltoolbar.c:899
 msgid "Italic"
 msgstr "Наклонный"
 
-#: src/gtkimhtmltoolbar.c:892
+#: src/gtkimhtmltoolbar.c:910
 msgid "Underline"
 msgstr "Подчёркнутый"
 
-#: src/gtkimhtmltoolbar.c:908
+#: src/gtkimhtmltoolbar.c:926
 msgid "Larger font size"
 msgstr "Больший размер шрифта"
 
-#: src/gtkimhtmltoolbar.c:920
+#: src/gtkimhtmltoolbar.c:938
 msgid "Smaller font size"
 msgstr "Меньший размер шрифта "
 
-#: src/gtkimhtmltoolbar.c:937
+#: src/gtkimhtmltoolbar.c:955
 msgid "Font Face"
 msgstr "Облик шрифта"
 
-#: src/gtkimhtmltoolbar.c:949
+#: src/gtkimhtmltoolbar.c:967
 msgid "Foreground font color"
 msgstr "Цвет шрифта"
 
-#: src/gtkimhtmltoolbar.c:961
+#: src/gtkimhtmltoolbar.c:979
 msgid "Background color"
 msgstr "Цвет фона"
 
-#: src/gtkimhtmltoolbar.c:976
+#: src/gtkimhtmltoolbar.c:994
 msgid "Insert link"
 msgstr "Вставить ссылку"
 
-#: src/gtkimhtmltoolbar.c:986
+#: src/gtkimhtmltoolbar.c:1004
 msgid "Insert image"
 msgstr "Вставить изображение"
 
-#: src/gtkimhtmltoolbar.c:997
+#: src/gtkimhtmltoolbar.c:1015
 msgid "Insert smiley"
 msgstr "Вставить смайлик"
 
-#: src/gtklog.c:282
+#: src/gtklog.c:302
 msgid "Conversations with"
 msgstr "Беседы с"
 
 #. Window **********
-#: src/gtklog.c:372 src/gtklog.c:388
+#: src/gtklog.c:392 src/gtklog.c:408
 msgid "System Log"
 msgstr "Системный журнал"
 
@@ -3433,7 +3452,7 @@
 msgstr "Команда запуска браузера \"%s\" некорректна."
 
 #: src/gtknotify.c:432 src/gtknotify.c:446 src/gtknotify.c:461
-#: src/gtknotify.c:569
+#: src/gtknotify.c:579
 msgid "Unable to open URL"
 msgstr "Не удаётся открыть URL"
 
@@ -3442,173 +3461,173 @@
 msgid "Error launching \"%s\": %s"
 msgstr "Ошибка запуска \"%s\": %s"
 
-#: src/gtknotify.c:570
+#: src/gtknotify.c:580
 msgid ""
 "The 'Manual' browser command has been chosen, but no command has been set."
 msgstr "Был выбран браузер \"Другой\", но команда не была задана."
 
-#: src/gtkpounce.c:144
+#: src/gtkpounce.c:130
 msgid "Select a file"
 msgstr "Выбрать файл"
 
-#: src/gtkpounce.c:194
+#: src/gtkpounce.c:161
 msgid "Please enter a buddy to pounce."
 msgstr "Введите пользователя для слежения."
 
 #. "New Buddy Pounce"
-#: src/gtkpounce.c:420 src/gtkpounce.c:923
+#: src/gtkpounce.c:387 src/gtkpounce.c:890
 msgid "New Buddy Pounce"
 msgstr "Новое правило"
 
-#: src/gtkpounce.c:420
+#: src/gtkpounce.c:387
 msgid "Edit Buddy Pounce"
 msgstr "Изменить правило"
 
 #. Create the "Pounce Who" frame.
-#: src/gtkpounce.c:438
+#: src/gtkpounce.c:405
 msgid "Pounce Who"
 msgstr "За кем следить"
 
-#: src/gtkpounce.c:465
+#: src/gtkpounce.c:432
 msgid "_Buddy name:"
 msgstr "Имя пользователя:"
 
 #. Create the "Pounce When" frame.
-#: src/gtkpounce.c:489
+#: src/gtkpounce.c:456
 msgid "Pounce When"
 msgstr "Когда реагировать"
 
-#: src/gtkpounce.c:497 src/main.c:296
+#: src/gtkpounce.c:464 src/main.c:296
 msgid "_Sign on"
 msgstr "Вход"
 
-#: src/gtkpounce.c:499
+#: src/gtkpounce.c:466
 msgid "Sign _off"
 msgstr "Выход"
 
-#: src/gtkpounce.c:501
+#: src/gtkpounce.c:468
 msgid "A_way"
 msgstr "Отошёл"
 
-#: src/gtkpounce.c:503
+#: src/gtkpounce.c:470
 msgid "Re_turn from away"
 msgstr "Вернулся"
 
-#: src/gtkpounce.c:505
+#: src/gtkpounce.c:472
 msgid "_Idle"
 msgstr "Бездействует"
 
-#: src/gtkpounce.c:507
+#: src/gtkpounce.c:474
 msgid "Retur_n from idle"
 msgstr "Перестал бездействовать"
 
-#: src/gtkpounce.c:509
+#: src/gtkpounce.c:476
 msgid "Buddy starts _typing"
 msgstr "Пользователь начал писать"
 
-#: src/gtkpounce.c:511
+#: src/gtkpounce.c:478
 msgid "Buddy stops t_yping"
 msgstr "Пользователь перестал писать"
 
 #. Create the "Pounce Action" frame.
-#: src/gtkpounce.c:540
+#: src/gtkpounce.c:507
 msgid "Pounce Action"
 msgstr "Что делать"
 
-#: src/gtkpounce.c:548
+#: src/gtkpounce.c:515
 msgid "Op_en an IM window"
 msgstr "Открыть окно беседы"
 
-#: src/gtkpounce.c:550
+#: src/gtkpounce.c:517
 msgid "_Popup notification"
 msgstr "Показать уведомление"
 
-#: src/gtkpounce.c:552
+#: src/gtkpounce.c:519
 msgid "Send a _message"
 msgstr "Отправить сообщение"
 
-#: src/gtkpounce.c:554
+#: src/gtkpounce.c:521
 msgid "E_xecute a command"
 msgstr "Выполнить команду"
 
-#: src/gtkpounce.c:556
+#: src/gtkpounce.c:523
 msgid "P_lay a sound"
 msgstr "Воспроизвести звук"
 
-#: src/gtkpounce.c:560
+#: src/gtkpounce.c:527
 msgid "B_rowse..."
 msgstr "Открыть..."
 
-#: src/gtkpounce.c:562
+#: src/gtkpounce.c:529
 msgid "Bro_wse..."
 msgstr "Открыть..."
 
-#: src/gtkpounce.c:563
+#: src/gtkpounce.c:530
 msgid "Pre_view"
 msgstr "Тест"
 
-#: src/gtkpounce.c:646
+#: src/gtkpounce.c:613
 msgid "Sav_e this pounce after activation"
 msgstr "Сохранить это правило после активации"
 
 #. "Remove Buddy Pounce"
-#: src/gtkpounce.c:930
+#: src/gtkpounce.c:897
 msgid "Remove Buddy Pounce"
 msgstr "Удалить правило"
 
-#: src/gtkpounce.c:994
+#: src/gtkpounce.c:961
 #, c-format
 msgid "%s has started typing to you (%s)"
 msgstr "%s начал писать вам (%s)"
 
-#: src/gtkpounce.c:996
+#: src/gtkpounce.c:963
 #, c-format
 msgid "%s has signed on (%s)"
 msgstr "%s вошёл (%s)"
 
-#: src/gtkpounce.c:998
+#: src/gtkpounce.c:965
 #, c-format
 msgid "%s has returned from being idle (%s)"
 msgstr "%s перестал бездействовать (%s)"
 
-#: src/gtkpounce.c:1000
+#: src/gtkpounce.c:967
 #, c-format
 msgid "%s has returned from being away (%s)"
 msgstr "%s вернулся (%s)"
 
-#: src/gtkpounce.c:1002
+#: src/gtkpounce.c:969
 #, c-format
 msgid "%s has stopped typing to you (%s)"
 msgstr "%s перестал писать вам (%s)"
 
-#: src/gtkpounce.c:1004
+#: src/gtkpounce.c:971
 #, c-format
 msgid "%s has signed off (%s)"
 msgstr "%s вышел (%s)"
 
-#: src/gtkpounce.c:1006
+#: src/gtkpounce.c:973
 #, c-format
 msgid "%s has become idle (%s)"
 msgstr "%s начал бездействовать (%s)"
 
-#: src/gtkpounce.c:1008
+#: src/gtkpounce.c:975
 #, c-format
 msgid "%s has gone away. (%s)"
 msgstr "%s отошёл (%s)"
 
-#: src/gtkpounce.c:1009
+#: src/gtkpounce.c:976
 msgid "Unknown pounce event. Please report this!"
 msgstr "Неизвестное событие слежения. Сообщите об этом!"
 
-#: src/gtkprefs.c:401
+#: src/gtkprefs.c:446
 msgid "Interface Options"
 msgstr "Параметры внешнего вида"
 
-#: src/gtkprefs.c:403
+#: src/gtkprefs.c:448
 msgid "D_isplay remote nicknames if no alias is set"
-msgstr "Отображать оригинальный псевдоним, если псевдоним не установлен"
-
-#: src/gtkprefs.c:627
+msgstr "Показывать оригинальный псевдоним, если псевдоним не установлен"
+
+#: src/gtkprefs.c:675
 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."
@@ -3616,52 +3635,52 @@
 "Выберите тему смайликов, которую вы хотели бы использовать. Новые темы могут "
 "быть установлены перетаскиванием их в список тем."
 
-#: src/gtkprefs.c:667
+#: src/gtkprefs.c:715
 msgid "Icon"
 msgstr "Значок"
 
-#: src/gtkprefs.c:674 src/gtkprefs.c:2199 src/protocols/jabber/buddy.c:265
-#: src/protocols/jabber/buddy.c:749 src/protocols/jabber/chat.c:701
+#: src/gtkprefs.c:722 src/gtkprefs.c:2212 src/protocols/jabber/buddy.c:264
+#: src/protocols/jabber/buddy.c:748 src/protocols/jabber/chat.c:701
 msgid "Description"
 msgstr "Описание"
 
-#: src/gtkprefs.c:770
+#: src/gtkprefs.c:818
 msgid "Display"
 msgstr "Отображение"
 
-#: src/gtkprefs.c:771
+#: src/gtkprefs.c:819
 msgid "Show _timestamp on messages"
 msgstr "Показывать время сообщений"
 
-#: src/gtkprefs.c:774
+#: src/gtkprefs.c:822
 msgid "_Highlight misspelled words"
 msgstr "Подсвечивать слова с ошибками"
 
-#: src/gtkprefs.c:779
+#: src/gtkprefs.c:827
 msgid "Ignore c_olors"
 msgstr "Игнорировать цвета"
 
-#: src/gtkprefs.c:781
+#: src/gtkprefs.c:829
 msgid "Ignore font _faces"
 msgstr "Игнорировать облик шрифта"
 
-#: src/gtkprefs.c:783
+#: src/gtkprefs.c:831
 msgid "Ignore font si_zes"
 msgstr "Игнорировать размер шрифта"
 
-#: src/gtkprefs.c:786
+#: src/gtkprefs.c:834
 msgid "_Ignore formatting on incoming messages"
 msgstr "Игнорировать форматирование входящих сообщений"
 
-#: src/gtkprefs.c:790
+#: src/gtkprefs.c:838
 msgid "Default Formatting"
 msgstr "Форматирование по умолчанию"
 
-#: src/gtkprefs.c:792
+#: src/gtkprefs.c:840
 msgid "_Send default formatting with outgoing messages"
 msgstr "Отправлять исходящие сообщения отформатированными по умолчанию"
 
-#: src/gtkprefs.c:824
+#: src/gtkprefs.c:872
 msgid ""
 "This is how your outgoing message text will appear when you use protocols "
 "that support formatting. :)"
@@ -3669,265 +3688,269 @@
 "Так будет выглядеть текст ваших сообщений с использованием протоколов, "
 "поддерживающих форматирование. :)"
 
-#: src/gtkprefs.c:827
+#: src/gtkprefs.c:875
 msgid "_Clear Formatting"
 msgstr "Очистить форматирование"
 
-#: src/gtkprefs.c:864
+#: src/gtkprefs.c:912
 msgid "Send Message"
 msgstr "Отправка сообщения"
 
-#: src/gtkprefs.c:865
+#: src/gtkprefs.c:913
 msgid "Enter _sends message"
 msgstr "Enter отправляет сообщение"
 
-#: src/gtkprefs.c:867
+#: src/gtkprefs.c:915
 msgid "C_ontrol-Enter sends message"
 msgstr "Control-Enter отправляет сообщение"
 
-#: src/gtkprefs.c:870
+#: src/gtkprefs.c:918
 msgid "Window Closing"
 msgstr "Закрытие окна"
 
-#: src/gtkprefs.c:871
+#: src/gtkprefs.c:919
 msgid "_Escape closes window"
 msgstr "Escape закрывает окно"
 
-#: src/gtkprefs.c:874
+#: src/gtkprefs.c:922
 msgid "Insertions"
 msgstr "Вставка"
 
-#: src/gtkprefs.c:875
+#: src/gtkprefs.c:923
 msgid "Control-{B/I/U} changes _formatting"
 msgstr "Control-{B/I/U} меняет форматирование"
 
-#: src/gtkprefs.c:877
+#: src/gtkprefs.c:925
 msgid "Control-(number) _inserts smileys"
 msgstr "Control-(цифра) вставляет смайлики"
 
-#: src/gtkprefs.c:893
+#: src/gtkprefs.c:941
 msgid "Buddy List Sorting"
 msgstr "Сортировка списка контактов"
 
-#: src/gtkprefs.c:902
+#: src/gtkprefs.c:950
 msgid "_Sorting:"
 msgstr "Сортировать:"
 
-#: src/gtkprefs.c:908 src/gtkprefs.c:961
+#: src/gtkprefs.c:956 src/gtkprefs.c:1009
 msgid "Show _buttons as:"
 msgstr "Показывать кнопки как:"
 
-#: src/gtkprefs.c:910 src/gtkprefs.c:963
+#: src/gtkprefs.c:958 src/gtkprefs.c:1011
 msgid "Pictures"
 msgstr "Значки"
 
-#: src/gtkprefs.c:911 src/gtkprefs.c:964
+#: src/gtkprefs.c:959 src/gtkprefs.c:1012
 msgid "Text"
 msgstr "Текст"
 
-#: src/gtkprefs.c:912 src/gtkprefs.c:965
+#: src/gtkprefs.c:960 src/gtkprefs.c:1013
 msgid "Pictures and text"
 msgstr "Значки и текст"
 
-#: src/gtkprefs.c:915
+#: src/gtkprefs.c:963
 msgid "_Raise window on events"
 msgstr "Поднимать окно при событиях"
 
-#: src/gtkprefs.c:918
+#: src/gtkprefs.c:966
 msgid "Buddy Display"
 msgstr "Отображение пользователей"
 
-#: src/gtkprefs.c:919 src/gtkprefs.c:979
+#: src/gtkprefs.c:967 src/gtkprefs.c:1027
 msgid "Show buddy _icons"
 msgstr "Показывать значки пользователей"
 
-#: src/gtkprefs.c:921
+#: src/gtkprefs.c:969
 msgid "Show _warning levels"
 msgstr "Показывать уровень предупреждения"
 
-#: src/gtkprefs.c:923
+#: src/gtkprefs.c:971
 msgid "Show idle _times"
 msgstr "Показывать время бездействия"
 
-#: src/gtkprefs.c:925
+#: src/gtkprefs.c:973
 msgid "Dim i_dle buddies"
 msgstr "Затенять бездействующих пользователей"
 
-#: src/gtkprefs.c:927
+#: src/gtkprefs.c:975
 msgid "_Automatically expand contacts"
 msgstr "Автоматически раскрывать контакты"
 
-#: src/gtkprefs.c:972
+#: src/gtkprefs.c:1020
 msgid "Enable \"_slash\" commands"
 msgstr "Разрешить \"слэш\"-команды"
 
-#: src/gtkprefs.c:975
+#: src/gtkprefs.c:1023
 msgid "Show _formatting toolbar"
 msgstr "Показывать панель инструментов форматирования"
 
-#: src/gtkprefs.c:977
+#: src/gtkprefs.c:1025
 msgid "Show _aliases in tabs/titles"
 msgstr "Показывать псевдонимы во вкладках/заголовках"
 
-#: src/gtkprefs.c:981
+#: src/gtkprefs.c:1029
 msgid "Enable buddy ic_on animation"
 msgstr "Разрешить анимацию значков пользователей"
 
-#: src/gtkprefs.c:983
+#: src/gtkprefs.c:1031
 msgid "_Notify buddies that you are typing to them"
 msgstr "Уведомлять пользователей, что вы пишете им"
 
-#: src/gtkprefs.c:985
+#: src/gtkprefs.c:1033
 msgid "_Raise IM window on events"
 msgstr "Поднимать окно беседы при событиях"
 
-#: src/gtkprefs.c:988
+#: src/gtkprefs.c:1036
 msgid "Raise chat _window on events"
 msgstr "Поднимать окно чата при событиях"
 
-#: src/gtkprefs.c:990
+#: src/gtkprefs.c:1038
 msgid "Use _multi-colored screen names in chats"
 msgstr "Расцвечивать имена в чатах"
 
 #. All the tab options!
-#: src/gtkprefs.c:994
+#: src/gtkprefs.c:1042
 msgid "Tab Options"
 msgstr "Параметры вкладок"
 
-#: src/gtkprefs.c:996
+#: src/gtkprefs.c:1044
 msgid "Show IMs and chats in _tabbed windows"
 msgstr "Показывать беседы и чаты в окнах со вкладками"
 
-#: src/gtkprefs.c:1011
+#: src/gtkprefs.c:1059
 msgid "Show _close button on tabs"
 msgstr "Показывать кнопку закрытия на вкладках"
 
-#: src/gtkprefs.c:1014
+#: src/gtkprefs.c:1062
 msgid "Tab p_lacement:"
 msgstr "Расположение вкладок:"
 
-#: src/gtkprefs.c:1016
+#: src/gtkprefs.c:1064
 msgid "Top"
 msgstr "Вверху"
 
-#: src/gtkprefs.c:1017
+#: src/gtkprefs.c:1065
 msgid "Bottom"
 msgstr "Внизу"
 
-#: src/gtkprefs.c:1018
+#: src/gtkprefs.c:1066
 msgid "Left"
 msgstr "Слева"
 
-#: src/gtkprefs.c:1019
+#: src/gtkprefs.c:1067
 msgid "Right"
 msgstr "Справа"
 
-#: src/gtkprefs.c:1025
+#: src/gtkprefs.c:1073
 msgid "New conversation _placement:"
 msgstr "Расположение новой беседы:"
 
-#: src/gtkprefs.c:1076 src/protocols/oscar/oscar.c:592
-#: src/protocols/oscar/oscar.c:4837
+#: src/gtkprefs.c:1124 src/protocols/oscar/oscar.c:596
+#: src/protocols/oscar/oscar.c:4853
 msgid "IP Address"
 msgstr "IP-адрес"
 
-#: src/gtkprefs.c:1078
+#: src/gtkprefs.c:1126
 msgid "_Autodetect IP Address"
 msgstr "Определять IP-адрес автоматически"
 
-#: src/gtkprefs.c:1087
+#: src/gtkprefs.c:1135
 msgid "Public _IP:"
 msgstr "Публичный IP:"
 
-#: src/gtkprefs.c:1111
+#: src/gtkprefs.c:1159
 msgid "Ports"
 msgstr "Порты"
 
-#: src/gtkprefs.c:1114
+#: src/gtkprefs.c:1162
 msgid "_Manually specify range of ports to listen on"
 msgstr "Указать диапазон слушаемых портов вручную"
 
-#: src/gtkprefs.c:1117
+#: src/gtkprefs.c:1165
 msgid "_Start Port:"
 msgstr "_Начальный порт:"
 
-#: src/gtkprefs.c:1124
+#: src/gtkprefs.c:1172
 msgid "_End Port:"
 msgstr "_Конечный порт:"
 
-#: src/gtkprefs.c:1131
+#: src/gtkprefs.c:1179
 msgid "Proxy Server"
 msgstr "Прокси-сервер"
 
-#: src/gtkprefs.c:1135
+#: src/gtkprefs.c:1183
 msgid "No proxy"
 msgstr "Нет прокси"
 
-#: src/gtkprefs.c:1197
+#: src/gtkprefs.c:1245
 msgid "_User:"
 msgstr "Пользователь:"
 
-#: src/gtkprefs.c:1253
-msgid "Opera"
-msgstr "Opera"
-
-#: src/gtkprefs.c:1254
-msgid "Netscape"
-msgstr "Netscape"
-
-#: src/gtkprefs.c:1255
-msgid "Mozilla"
-msgstr "Mozilla"
-
-#: src/gtkprefs.c:1256
-msgid "Konqueror"
-msgstr "Konqueror"
-
-#: src/gtkprefs.c:1257
-msgid "Galeon"
-msgstr "Galeon"
-
-#: src/gtkprefs.c:1258
+#: src/gtkprefs.c:1301
+msgid "Epiphany"
+msgstr "Epiphany"
+
+#: src/gtkprefs.c:1302
 msgid "Firebird"
 msgstr "Firebird"
 
-#: src/gtkprefs.c:1259
+#: src/gtkprefs.c:1303
 msgid "Firefox"
 msgstr "Firefox"
 
-#: src/gtkprefs.c:1260
+#: src/gtkprefs.c:1304
+msgid "Galeon"
+msgstr "Galeon"
+
+#: src/gtkprefs.c:1305
 msgid "Gnome Default"
 msgstr "Браузер Gnome по умолчанию"
 
-#: src/gtkprefs.c:1269
+#: src/gtkprefs.c:1306
+msgid "Konqueror"
+msgstr "Konqueror"
+
+#: src/gtkprefs.c:1307
+msgid "Mozilla"
+msgstr "Mozilla"
+
+#: src/gtkprefs.c:1308
+msgid "Netscape"
+msgstr "Netscape"
+
+#: src/gtkprefs.c:1309
+msgid "Opera"
+msgstr "Opera"
+
+#: src/gtkprefs.c:1318
 msgid "Manual"
 msgstr "Другой"
 
-#: src/gtkprefs.c:1320
+#: src/gtkprefs.c:1369
 msgid "Browser Selection"
 msgstr "Выбор браузера"
 
-#: src/gtkprefs.c:1324
+#: src/gtkprefs.c:1373
 msgid "_Browser:"
 msgstr "Браузер:"
 
-#: src/gtkprefs.c:1331
+#: src/gtkprefs.c:1380
 msgid "_Open link in:"
 msgstr "Открывать ссылку в:"
 
-#: src/gtkprefs.c:1333
+#: src/gtkprefs.c:1382
 msgid "Browser default"
 msgstr "По умолчанию"
 
-#: src/gtkprefs.c:1334
+#: src/gtkprefs.c:1383
 msgid "Existing window"
 msgstr "Существующее окно"
 
-#: src/gtkprefs.c:1336
+#: src/gtkprefs.c:1385
 msgid "New tab"
 msgstr "Новая вкладка"
 
-#: src/gtkprefs.c:1350
+#: src/gtkprefs.c:1399
 #, c-format
 msgid ""
 "_Manual:\n"
@@ -3936,83 +3959,83 @@
 "Вручную:\n"
 "(%s для URL)"
 
-#: src/gtkprefs.c:1387
+#: src/gtkprefs.c:1436
 msgid "Message Logs"
 msgstr "Журналы сообщений"
 
-#: src/gtkprefs.c:1390
+#: src/gtkprefs.c:1439
 msgid "Log _Format:"
 msgstr "Формат журнала:"
 
-#: src/gtkprefs.c:1393
+#: src/gtkprefs.c:1442
 msgid "_Log all instant messages"
 msgstr "Записывать все сообщения"
 
-#: src/gtkprefs.c:1395
+#: src/gtkprefs.c:1444
 msgid "Log all c_hats"
 msgstr "Записывать все чаты"
 
-#: src/gtkprefs.c:1398
+#: src/gtkprefs.c:1447
 msgid "System Logs"
 msgstr "Системные журналы"
 
-#: src/gtkprefs.c:1400
+#: src/gtkprefs.c:1449
 msgid "_Enable system log"
 msgstr "Вести системный журнал"
 
-#: src/gtkprefs.c:1403
+#: src/gtkprefs.c:1452
 msgid "Log when buddies _sign on/sign off"
 msgstr "Записывать, когда пользователи подключаются/отключаются"
 
-#: src/gtkprefs.c:1409
+#: src/gtkprefs.c:1458
 msgid "Log when buddies become _idle/un-idle"
 msgstr "Записывать, когда пользователи начинают/перестают бездействовать"
 
-#: src/gtkprefs.c:1415
+#: src/gtkprefs.c:1464
 msgid "Log when buddies go away/come _back"
 msgstr "Записывать, когда пользователи отходят/возвращаются"
 
-#: src/gtkprefs.c:1421
+#: src/gtkprefs.c:1470
 msgid "Log your _own signons/idleness/awayness"
 msgstr "Записывать собственные подключения/бездействия/отсутствия"
 
-#: src/gtkprefs.c:1559
+#: src/gtkprefs.c:1596
 msgid "Sound Selection"
 msgstr "Выбор звука"
 
-#: src/gtkprefs.c:1634
+#: src/gtkprefs.c:1647
 msgid "Sound Options"
 msgstr "Настройки звука"
 
-#: src/gtkprefs.c:1635
+#: src/gtkprefs.c:1648
 msgid "Sounds when conversation has _focus"
 msgstr "Звуки, когда окно беседы в фокусе"
 
-#: src/gtkprefs.c:1637
+#: src/gtkprefs.c:1650
 msgid "_Sounds while away"
 msgstr "Звуки во время отсутствия"
 
-#: src/gtkprefs.c:1641
+#: src/gtkprefs.c:1654
 msgid "Sound Method"
 msgstr "Метод воспроизведения звука"
 
-#: src/gtkprefs.c:1642
+#: src/gtkprefs.c:1655
 msgid "_Method:"
 msgstr "Метод:"
 
-#: src/gtkprefs.c:1644
+#: src/gtkprefs.c:1657
 msgid "Console beep"
 msgstr "Сигнал динамиком"
 
-#: src/gtkprefs.c:1646
+#: src/gtkprefs.c:1659
 msgid "Automatic"
 msgstr "Автоматически"
 
-#: src/gtkprefs.c:1653
+#: src/gtkprefs.c:1666
 msgid "Command"
 msgstr "Команда"
 
-#: src/gtkprefs.c:1661
+#: src/gtkprefs.c:1674
 #, c-format
 msgid ""
 "Sound c_ommand:\n"
@@ -4021,86 +4044,86 @@
 "Команда воспроизведения звука:\n"
 "(%s для имени файла)"
 
-#: src/gtkprefs.c:1688
+#: src/gtkprefs.c:1701
 msgid "Sound Events"
 msgstr "Звуковые события"
 
-#: src/gtkprefs.c:1739
+#: src/gtkprefs.c:1752
 msgid "Play"
 msgstr "Воспроизвести"
 
-#: src/gtkprefs.c:1746
+#: src/gtkprefs.c:1759
 msgid "Event"
 msgstr "Событие"
 
-#: src/gtkprefs.c:1765
+#: src/gtkprefs.c:1778
 msgid "Test"
 msgstr "Тест"
 
-#: src/gtkprefs.c:1769
+#: src/gtkprefs.c:1782
 msgid "Reset"
 msgstr "Сброс"
 
-#: src/gtkprefs.c:1773
+#: src/gtkprefs.c:1786
 msgid "Choose..."
 msgstr "Выбрать..."
 
-#: src/gtkprefs.c:1797
+#: src/gtkprefs.c:1810
 msgid "_Queue new messages when away"
 msgstr "Помещать новые сообщения в очередь во время отсутствия"
 
-#: src/gtkprefs.c:1800
+#: src/gtkprefs.c:1813
 msgid "Auto-response"
 msgstr "Автоответчик"
 
-#: src/gtkprefs.c:1801
+#: src/gtkprefs.c:1814
 msgid "_Send auto-response"
 msgstr "Отправлять автоматический ответ"
 
-#: src/gtkprefs.c:1803
+#: src/gtkprefs.c:1816
 msgid "_Only send auto-response when idle"
 msgstr "Отправлять автоматический ответ только во время бездействия"
 
-#: src/gtkprefs.c:1806 src/protocols/msn/msn.c:1156
-#: src/protocols/msn/state.c:32 src/protocols/novell/novell.c:2724
-#: src/protocols/oscar/oscar.c:3994 src/protocols/yahoo/yahoo.c:2488
-#: src/protocols/yahoo/yahoo_profile.c:653
+#: src/gtkprefs.c:1819 src/protocols/msn/msn.c:1179
+#: src/protocols/msn/state.c:32 src/protocols/novell/novell.c:2730
+#: src/protocols/oscar/oscar.c:4010 src/protocols/yahoo/yahoo.c:2511
+#: src/protocols/yahoo/yahoo_profile.c:664
 msgid "Idle"
 msgstr "Бездействие"
 
-#: src/gtkprefs.c:1807
+#: src/gtkprefs.c:1820
 msgid "Idle _time reporting:"
 msgstr "Сообщение времени бездействия:"
 
-#: src/gtkprefs.c:1810
+#: src/gtkprefs.c:1823
 msgid "Gaim usage"
 msgstr "Использование Gaim"
 
-#: src/gtkprefs.c:1813
+#: src/gtkprefs.c:1826
 msgid "X usage"
 msgstr "Использование X"
 
-#: src/gtkprefs.c:1815
+#: src/gtkprefs.c:1828
 msgid "Windows usage"
 msgstr "Использование окон"
 
-#: src/gtkprefs.c:1823
+#: src/gtkprefs.c:1836
 msgid "Auto-away"
 msgstr "Авто-\"Отошёл\""
 
-#: src/gtkprefs.c:1824
+#: src/gtkprefs.c:1837
 msgid "Set away _when idle"
 msgstr "Устанавливать статус \"Отошёл\" автоматически"
 
-#: src/gtkprefs.c:1828
+#: src/gtkprefs.c:1841
 msgid "_Minutes before setting away:"
 msgstr "Минут до установления статуса \"Отошёл\":"
 
-#: src/gtkprefs.c:1836
+#: src/gtkprefs.c:1849
 msgid "Away m_essage:"
 msgstr "Сообщение об отсутствии:"
 
-#: src/gtkprefs.c:1917
+#: src/gtkprefs.c:1930
 #, c-format
 msgid ""
 "<span size=\"larger\">%s %s</span>\n"
@@ -4115,7 +4138,7 @@
 "<span weight=\"bold\">Веб-сайт:</span>\t\t%s\n"
 "<span weight=\"bold\">Имя файла:</span>\t%s"
 
-#: src/gtkprefs.c:1922
+#: src/gtkprefs.c:1935
 #, c-format
 msgid ""
 "<span size=\"larger\">%s %s</span>\n"
@@ -4130,64 +4153,64 @@
 "<span weight=\"bold\">URL:</span>  %s\n"
 "<span weight=\"bold\">Имя файла:</span>  %s"
 
-#: src/gtkprefs.c:2155
+#: src/gtkprefs.c:2168
 msgid "Load"
 msgstr "Загрузить"
 
-#: src/gtkprefs.c:2169
+#: src/gtkprefs.c:2182
 msgid "Summary"
 msgstr "Краткое описание"
 
-#: src/gtkprefs.c:2217
+#: src/gtkprefs.c:2230
 msgid "Details"
 msgstr "Подробности"
 
-#: src/gtkprefs.c:2362
+#: src/gtkprefs.c:2375
 msgid "_Edit"
 msgstr "Изменить"
 
-#: src/gtkprefs.c:2398
+#: src/gtkprefs.c:2411
 msgid "Interface"
 msgstr "Внешний вид"
 
-#: src/gtkprefs.c:2401
+#: src/gtkprefs.c:2414
 msgid "Message Text"
 msgstr "Текст сообщения"
 
-#: src/gtkprefs.c:2402
+#: src/gtkprefs.c:2415
 msgid "Shortcuts"
 msgstr "Горячие клавиши"
 
-#: src/gtkprefs.c:2403
+#: src/gtkprefs.c:2416
 msgid "Smiley Themes"
 msgstr "Темы смайликов"
 
-#: src/gtkprefs.c:2404
+#: src/gtkprefs.c:2417
 msgid "Sounds"
 msgstr "Звуки"
 
-#: src/gtkprefs.c:2405
+#: src/gtkprefs.c:2418
 msgid "Network"
 msgstr "Сеть"
 
 #. We use the registered default browser in windows
-#: src/gtkprefs.c:2408
+#: src/gtkprefs.c:2421
 msgid "Browser"
 msgstr "Браузер"
 
-#: src/gtkprefs.c:2410
+#: src/gtkprefs.c:2423
 msgid "Logging"
 msgstr "Журналы"
 
-#: src/gtkprefs.c:2411
+#: src/gtkprefs.c:2424
 msgid "Away / Idle"
 msgstr "Отсутствие / Бездействие"
 
-#: src/gtkprefs.c:2412
+#: src/gtkprefs.c:2425
 msgid "Away Messages"
 msgstr "Сообщения об отсутствии"
 
-#: src/gtkprefs.c:2415
+#: src/gtkprefs.c:2428
 msgid "Plugins"
 msgstr "Модули"
 
@@ -4211,7 +4234,7 @@
 msgid "Block only the users below"
 msgstr "Блокировать только пользователей, указанных ниже"
 
-#: src/gtkprivacy.c:385 src/protocols/jabber/jabber.c:1448
+#: src/gtkprivacy.c:385 src/protocols/jabber/jabber.c:1449
 msgid "Privacy"
 msgstr "Конфиденциальность"
 
@@ -4276,27 +4299,43 @@
 #. *
 #. * A wrapper for gaim_request_action() that uses Yes and No buttons.
 #.
-#: src/gtkrequest.c:233 src/protocols/gg/gg.c:867
-#: src/protocols/novell/novell.c:1844 src/protocols/silc/buddy.c:307
-#: src/protocols/silc/pk.c:116 src/request.h:1233
+#: src/gtkrequest.c:240 src/protocols/gg/gg.c:949
+#: src/protocols/novell/novell.c:1845 src/protocols/silc/buddy.c:307
+#: src/protocols/silc/pk.c:116 src/request.h:1234
 msgid "Yes"
 msgstr "Да"
 
-#: src/gtkrequest.c:234 src/protocols/gg/gg.c:867
-#: src/protocols/novell/novell.c:1845 src/protocols/silc/buddy.c:308
-#: src/protocols/silc/pk.c:117 src/request.h:1233
+#: src/gtkrequest.c:241 src/protocols/gg/gg.c:949
+#: src/protocols/novell/novell.c:1846 src/protocols/silc/buddy.c:308
+#: src/protocols/silc/pk.c:117 src/request.h:1234
 msgid "No"
 msgstr "Нет"
 
-#: src/gtkrequest.c:237
+#: src/gtkrequest.c:244
 msgid "Apply"
 msgstr "Применить"
 
-#: src/gtkrequest.c:238 src/protocols/msn/msn.c:316
+#: src/gtkrequest.c:245 src/protocols/msn/msn.c:314
 #: src/protocols/silc/util.c:332
 msgid "Close"
 msgstr "Закрыть"
 
+#: src/gtkrequest.c:1391
+msgid "That file already exists"
+msgstr "Такой файл уже существует"
+
+#: src/gtkrequest.c:1392
+msgid "Would you like to overwrite it?"
+msgstr "Вы хотели бы перезаписать его?"
+
+#: src/gtkrequest.c:1430 src/gtkrequest.c:1451
+msgid "Save File..."
+msgstr "Сохранить файл..."
+
+#: src/gtkrequest.c:1431 src/gtkrequest.c:1452
+msgid "Open File..."
+msgstr "Открыть файл..."
+
 #: src/gtkroomlist.c:330
 msgid "Room List"
 msgstr "Список комнат"
@@ -4369,57 +4408,49 @@
 "Не удаётся воспроизвести звук, так как не удалось запустить заданную "
 "команду: %s"
 
-#: src/gtkutils.c:149
-msgid "Can't save icon file to disk."
-msgstr "Не удаётся сохранить файл значка на диск."
-
-#: src/gtkutils.c:184
-msgid "Save Icon"
-msgstr "Сохранить значок"
-
 #: src/log.c:106
 msgid "<b><font color=\"red\">The logger has no read function</font></b>"
 msgstr ""
 "<b><font color=\"red\">Служба ведения журнала не имеет функции чтения</"
 "font></b>"
 
-#: src/log.c:486
+#: src/log.c:489
 msgid "XML"
 msgstr "XML"
 
-#: src/log.c:571
+#: src/log.c:574
 #, c-format
 msgid ""
 "<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
 "REPLY&gt;:</b></font> %s<br/>\n"
 msgstr ""
 
-#: src/log.c:573
+#: src/log.c:576
 #, c-format
 msgid ""
 "<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
 "REPLY&gt;:</b></font> %s<br/>\n"
 msgstr ""
 
-#: src/log.c:624 src/log.c:811
+#: src/log.c:627 src/log.c:814
 msgid "<font color=\"red\"><b>Unable to find log path!</b></font>"
 msgstr "<font color=\"red\"><b>Не удаётся найти путь к журналу!</b></font>"
 
-#: src/log.c:634 src/log.c:823
+#: src/log.c:637 src/log.c:826
 #, c-format
 msgid "<font color=\"red\"><b>Could not read file: %s</b></font>"
 msgstr "<font color=\"red\"><b>Не удалось прочитать файл: %s</b></font>"
 
-#: src/log.c:671
+#: src/log.c:674
 msgid "HTML"
 msgstr "HTML"
 
-#: src/log.c:756
+#: src/log.c:759
 #, c-format
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr ""
 
-#: src/log.c:856
+#: src/log.c:859
 msgid "Plain text"
 msgstr "Простой текст"
 
@@ -4512,12 +4543,12 @@
 msgstr "Сообщение об отсутствии по умолчанию"
 
 #: src/protocols/gg/gg.c:49 src/protocols/jabber/jutil.c:44
-#: src/protocols/msn/msn.c:465 src/protocols/msn/state.c:29
+#: src/protocols/msn/msn.c:462 src/protocols/msn/state.c:29
 #: src/protocols/msn/state.c:30 src/protocols/msn/state.c:37
-#: src/protocols/msn/state.c:38 src/protocols/novell/novell.c:2715
-#: src/protocols/novell/novell.c:2834 src/protocols/novell/novell.c:2885
-#: src/protocols/oscar/oscar.c:611 src/protocols/yahoo/yahoo.c:2844
-#: src/protocols/yahoo/yahoo.c:2959
+#: src/protocols/msn/state.c:38 src/protocols/novell/novell.c:2721
+#: src/protocols/novell/novell.c:2840 src/protocols/novell/novell.c:2891
+#: src/protocols/oscar/oscar.c:616 src/protocols/yahoo/yahoo.c:2851
+#: src/protocols/yahoo/yahoo.c:2967
 msgid "Available"
 msgstr "Доступен"
 
@@ -4529,12 +4560,12 @@
 msgid "Away for friends only"
 msgstr "Отошёл только для друзей"
 
-#: src/protocols/gg/gg.c:53 src/protocols/jabber/jabber.c:963
-#: src/protocols/jabber/presence.c:126 src/protocols/oscar/oscar.c:532
-#: src/protocols/oscar/oscar.c:5378 src/protocols/oscar/oscar.c:5456
-#: src/protocols/oscar/oscar.c:5480 src/protocols/oscar/oscar.c:6667
-#: src/protocols/oscar/oscar.c:6672 src/protocols/yahoo/yahoo.c:2486
-#: src/protocols/yahoo/yahoo.c:2864 src/protocols/yahoo/yahoo.c:2969
+#: src/protocols/gg/gg.c:53 src/protocols/jabber/jabber.c:964
+#: src/protocols/jabber/presence.c:126 src/protocols/oscar/oscar.c:536
+#: src/protocols/oscar/oscar.c:5394 src/protocols/oscar/oscar.c:5472
+#: src/protocols/oscar/oscar.c:5496 src/protocols/oscar/oscar.c:6684
+#: src/protocols/oscar/oscar.c:6689 src/protocols/yahoo/yahoo.c:2509
+#: src/protocols/yahoo/yahoo.c:2871 src/protocols/yahoo/yahoo.c:2979
 msgid "Invisible"
 msgstr "Невидимый"
 
@@ -4550,14 +4581,14 @@
 msgid "Unable to resolve hostname."
 msgstr "Не удаётся разрешить имя узла."
 
-#: src/protocols/gg/gg.c:139 src/protocols/novell/novell.c:1664
+#: src/protocols/gg/gg.c:139 src/protocols/novell/novell.c:1665
 msgid "Unable to connect to server."
 msgstr "Не удаётся соединиться с сервером."
 
 #: src/protocols/gg/gg.c:142 src/protocols/jabber/auth.c:130
 #: src/protocols/jabber/auth.c:204 src/protocols/jabber/auth.c:354
 #: src/protocols/jabber/auth.c:452 src/protocols/jabber/auth.c:464
-#: src/protocols/jabber/jabber.c:105
+#: src/protocols/jabber/jabber.c:106
 msgid "Invalid response from server."
 msgstr "Неверный отклик от сервера."
 
@@ -4577,175 +4608,177 @@
 msgid "Unknown Error Code."
 msgstr "Неизвестный код ошибки."
 
-#: src/protocols/gg/gg.c:253
+#: src/protocols/gg/gg.c:242 src/protocols/oscar/oscar.c:3819
+#, c-format
+msgid "<B>UIN:</B> %s<BR><B>Status:</B> %s<HR>%s"
+msgstr "<B>UIN:</B> %s<BR><B>Статус:</B> %s<HR>%s"
+
+#. res[0] == username
+#: src/protocols/gg/gg.c:243 src/protocols/gg/gg.c:1011
+#: src/protocols/napster/napster.c:393 src/protocols/oscar/oscar.c:3823
+#: src/protocols/oscar/oscar.c:4039 src/protocols/silc/ops.c:1067
+#: src/protocols/silc/ops.c:1128 src/protocols/toc/toc.c:468
+#: src/protocols/zephyr/zephyr.c:635
+msgid "Buddy Information"
+msgstr "Информация о пользователе"
+
+#: src/protocols/gg/gg.c:293
 #, c-format
 msgid "Status: %s"
 msgstr "Статус: %s"
 
-#: src/protocols/gg/gg.c:406
+#: src/protocols/gg/gg.c:446
 msgid "Could not connect"
 msgstr "Не удалось установить соединение"
 
-#: src/protocols/gg/gg.c:413
+#: src/protocols/gg/gg.c:453
 msgid "Unable to read socket"
 msgstr "Не удаётся прочитать сокет"
 
 #. we didn't successfully connect. tdt->toc_fd is valid here
-#: src/protocols/gg/gg.c:600 src/protocols/icq/gaim_icq.c:344
+#: src/protocols/gg/gg.c:674 src/protocols/icq/gaim_icq.c:344
 #: src/protocols/napster/napster.c:475 src/protocols/napster/napster.c:506
-#: src/protocols/toc/toc.c:170 src/protocols/yahoo/yahoo.c:2124
-#: src/protocols/yahoo/yahoo.c:2155 src/protocols/yahoo/yahoo.c:2218
+#: src/protocols/toc/toc.c:170 src/protocols/yahoo/yahoo.c:2156
+#: src/protocols/yahoo/yahoo.c:2185 src/protocols/yahoo/yahoo.c:2248
 #: src/protocols/yahoo/yahoo_filexfer.c:68
 #: src/protocols/yahoo/yahoo_filexfer.c:109
 msgid "Unable to connect."
 msgstr "Не удаётся установить соединение."
 
-#: src/protocols/gg/gg.c:616
+#: src/protocols/gg/gg.c:690
 msgid "Reading data"
 msgstr "Чтение данных"
 
-#: src/protocols/gg/gg.c:619
+#: src/protocols/gg/gg.c:693
 msgid "Balancer handshake"
 msgstr "Стабилизирующее согласование"
 
-#: src/protocols/gg/gg.c:622
+#: src/protocols/gg/gg.c:696
 msgid "Reading server key"
 msgstr "Чтение ключа сервера"
 
-#: src/protocols/gg/gg.c:625
+#: src/protocols/gg/gg.c:699
 msgid "Exchanging key hash"
 msgstr "Обмен хэшами ключей"
 
-#: src/protocols/gg/gg.c:635
+#: src/protocols/gg/gg.c:709
 msgid "Critical error in GG library\n"
 msgstr "Критическая ошибка в библиотеке GG\n"
 
-#: src/protocols/gg/gg.c:653 src/protocols/gg/gg.c:744
+#: src/protocols/gg/gg.c:727 src/protocols/gg/gg.c:818
 #: src/protocols/toc/toc.c:146
 #, c-format
 msgid "Connect to %s failed"
 msgstr "Не удалось установить соединение с %s"
 
-#: src/protocols/gg/gg.c:701
+#: src/protocols/gg/gg.c:775
 msgid "Unable to ping server"
 msgstr "Не удаётся проверить доступность сервера"
 
-#: src/protocols/gg/gg.c:713
+#: src/protocols/gg/gg.c:787
 msgid "Send as message"
 msgstr "Отправить как сообщение"
 
-#: src/protocols/gg/gg.c:718
+#: src/protocols/gg/gg.c:792
 msgid "Looking up GG server"
 msgstr "Поиск сервера GG"
 
-#: src/protocols/gg/gg.c:721
+#: src/protocols/gg/gg.c:795
 msgid "Invalid Gadu-Gadu UIN specified"
 msgstr "Указан неверный UIN Gadu-Gadu"
 
-#: src/protocols/gg/gg.c:768
+#: src/protocols/gg/gg.c:842
 msgid "You are trying to send a message to an invalid Gadu-Gadu UIN."
 msgstr "Вы пытаетесь отправить сообщение на неверный UIN Gadu-Gadu."
 
-#: src/protocols/gg/gg.c:835
+#: src/protocols/gg/gg.c:917
 msgid "Couldn't get search results"
 msgstr "Не удалось получить результаты поиска"
 
-#: src/protocols/gg/gg.c:840
+#: src/protocols/gg/gg.c:922
 msgid "Gadu-Gadu Search Engine"
 msgstr "Поисковая система Gadu-Gadu"
 
-#: src/protocols/gg/gg.c:866
+#: src/protocols/gg/gg.c:948
 msgid "Active"
 msgstr "Активен"
 
-#: src/protocols/gg/gg.c:871 src/protocols/oscar/oscar.c:4829
+#: src/protocols/gg/gg.c:953 src/protocols/oscar/oscar.c:4845
 msgid "UIN"
 msgstr "UIN"
 
 #. First Name
-#: src/protocols/gg/gg.c:875 src/protocols/jabber/jabber.c:612
-#: src/protocols/oscar/oscar.c:4840 src/protocols/silc/ops.c:774
+#: src/protocols/gg/gg.c:957 src/protocols/jabber/jabber.c:613
+#: src/protocols/oscar/oscar.c:4856 src/protocols/silc/ops.c:790
 #: src/protocols/trepia/trepia.c:267
 msgid "First Name"
 msgstr "Имя"
 
 #. Last Name
-#: src/protocols/gg/gg.c:880 src/protocols/jabber/jabber.c:617
-#: src/protocols/oscar/oscar.c:4841 src/protocols/trepia/trepia.c:274
+#: src/protocols/gg/gg.c:962 src/protocols/jabber/jabber.c:618
+#: src/protocols/oscar/oscar.c:4857 src/protocols/trepia/trepia.c:274
 msgid "Last Name"
 msgstr "Фамилия"
 
-#: src/protocols/gg/gg.c:884 src/protocols/gg/gg.c:1623
-#: src/protocols/irc/msgs.c:183 src/protocols/oscar/oscar.c:4830
+#: src/protocols/gg/gg.c:966 src/protocols/gg/gg.c:1707
+#: src/protocols/irc/msgs.c:183 src/protocols/oscar/oscar.c:4846
+#: src/protocols/silc/ops.c:1184
 msgid "Nick"
 msgstr "Псевдоним"
 
-#: src/protocols/gg/gg.c:891 src/protocols/gg/gg.c:894
+#: src/protocols/gg/gg.c:973 src/protocols/gg/gg.c:976
 msgid "Birth Year"
 msgstr "Год рождения"
 
-#: src/protocols/gg/gg.c:900 src/protocols/gg/gg.c:902
-#: src/protocols/gg/gg.c:904
+#: src/protocols/gg/gg.c:982 src/protocols/gg/gg.c:984
+#: src/protocols/gg/gg.c:986
 msgid "Sex"
 msgstr "Пол"
 
 #. City
-#: src/protocols/gg/gg.c:908 src/protocols/jabber/jabber.c:627
-#: src/protocols/oscar/oscar.c:4884 src/protocols/oscar/oscar.c:4892
+#: src/protocols/gg/gg.c:990 src/protocols/jabber/jabber.c:628
+#: src/protocols/oscar/oscar.c:4900 src/protocols/oscar/oscar.c:4908
 #: src/protocols/trepia/trepia.c:331 src/protocols/trepia/trepia.c:410
 msgid "City"
 msgstr "Город"
 
-#. res[0] == username
-#. show it to the user
-#: src/protocols/gg/gg.c:929 src/protocols/msn/msn.c:1225
-#: src/protocols/msn/msn.c:1533 src/protocols/msn/msn.c:1549
-#: src/protocols/napster/napster.c:393 src/protocols/oscar/oscar.c:3807
-#: src/protocols/oscar/oscar.c:4023 src/protocols/toc/toc.c:468
-#: src/protocols/yahoo/yahoo_profile.c:748
-#: src/protocols/yahoo/yahoo_profile.c:785
-#: src/protocols/yahoo/yahoo_profile.c:837
-#: src/protocols/yahoo/yahoo_profile.c:1132 src/protocols/zephyr/zephyr.c:610
-msgid "Buddy Information"
-msgstr "Информация о пользователе"
-
-#: src/protocols/gg/gg.c:951
+#: src/protocols/gg/gg.c:1033
 msgid "There is no Buddy List stored on the Gadu-Gadu server."
 msgstr "Нет списка контактов, хранящегося на сервере Gadu-Gadu."
 
-#: src/protocols/gg/gg.c:959
+#: src/protocols/gg/gg.c:1041
 msgid "Couldn't Import Buddy List from Server"
 msgstr "Не удалось импортировать список контактов с сервера"
 
-#: src/protocols/gg/gg.c:1021
+#: src/protocols/gg/gg.c:1103
 msgid "Buddy List successfully transferred to Gadu-Gadu server"
 msgstr "Список контактов успешно передан на сервер Gadu-Gadu"
 
-#: src/protocols/gg/gg.c:1029
+#: src/protocols/gg/gg.c:1111
 msgid "Couldn't transfer Buddy List to Gadu-Gadu server"
 msgstr "Не удалось передать список контактов на сервер Gadu-Gadu"
 
-#: src/protocols/gg/gg.c:1037
+#: src/protocols/gg/gg.c:1119
 msgid "Buddy List successfully deleted from Gadu-Gadu server"
 msgstr "Список контактов успешно удалён с сервера Gadu-Gadu"
 
-#: src/protocols/gg/gg.c:1045
+#: src/protocols/gg/gg.c:1127
 msgid "Couldn't delete Buddy List from Gadu-Gadu server"
 msgstr "Не удалось удалить список контактов с сервера Gadu-Gadu"
 
-#: src/protocols/gg/gg.c:1054
+#: src/protocols/gg/gg.c:1136
 msgid "Password changed successfully"
 msgstr "Пароль изменён успешно"
 
-#: src/protocols/gg/gg.c:1061
+#: src/protocols/gg/gg.c:1143
 msgid "Password couldn't be changed"
 msgstr "Не удалось изменить пароль"
 
-#: src/protocols/gg/gg.c:1180
+#: src/protocols/gg/gg.c:1262
 msgid "Error communicating with Gadu-Gadu server"
 msgstr "Ошибка связи с сервером Gadu-Gadu"
 
-#: src/protocols/gg/gg.c:1181
+#: src/protocols/gg/gg.c:1263
 msgid ""
 "Gaim was unable to complete your request due to a problem communicating with "
 "the Gadu-Gadu HTTP server.  Please try again later."
@@ -4753,11 +4786,11 @@
 "Gaim не удалось выполнить ваш запрос из-за проблемы со связью с HTTP-"
 "сервером Gadu-Gadu. Повторите попытку позже."
 
-#: src/protocols/gg/gg.c:1210
+#: src/protocols/gg/gg.c:1292
 msgid "Unable to import Gadu-Gadu buddy list"
 msgstr "Не удаётся импортировать список контактов Gadu-Gadu"
 
-#: src/protocols/gg/gg.c:1211
+#: src/protocols/gg/gg.c:1293
 msgid ""
 "Gaim was unable to connect to the Gadu-Gadu buddy list server.  Please try "
 "again later."
@@ -4765,26 +4798,26 @@
 "Gaim не удалось соединиться с сервером списка контактов Gadu-Gadu. Повторите "
 "попытку позже."
 
-#: src/protocols/gg/gg.c:1284
+#: src/protocols/gg/gg.c:1366
 msgid "Couldn't export buddy list"
 msgstr "Не удалось экспортировать список контактов"
 
-#: src/protocols/gg/gg.c:1285 src/protocols/gg/gg.c:1308
+#: src/protocols/gg/gg.c:1367 src/protocols/gg/gg.c:1390
 msgid ""
 "Gaim was unable to connect to the buddy list server.  Please try again later."
 msgstr ""
 "Gaim не удалось соединиться с сервером списка контактов. Повторите попытку "
 "позже."
 
-#: src/protocols/gg/gg.c:1307
+#: src/protocols/gg/gg.c:1389
 msgid "Unable to delete Gadu-Gadu buddy list"
 msgstr "Не удаётся удалить список контактов Gadu-Gadu"
 
-#: src/protocols/gg/gg.c:1358
+#: src/protocols/gg/gg.c:1440
 msgid "Unable to access directory"
 msgstr "Не удаётся получить доступ к каталогу"
 
-#: src/protocols/gg/gg.c:1359
+#: src/protocols/gg/gg.c:1441
 msgid ""
 "Gaim was unable to search the Directory because it was unable to connect to "
 "the directory server.  Please try again later."
@@ -4792,11 +4825,11 @@
 "Gaim не удалось выполнить поиск в каталоге, так как не удалось соединиться с "
 "сервером каталога. Повторите попытку позже."
 
-#: src/protocols/gg/gg.c:1393
+#: src/protocols/gg/gg.c:1475
 msgid "Unable to change Gadu-Gadu password"
 msgstr "Не удаётся изменить пароль Gadu-Gadu"
 
-#: src/protocols/gg/gg.c:1394
+#: src/protocols/gg/gg.c:1476
 msgid ""
 "Gaim was unable to change your password due to an error connecting to the "
 "Gadu-Gadu server.  Please try again later."
@@ -4804,33 +4837,33 @@
 "Gaim не удалось изменить ваш пароль из-за ошибки соединения с сервером Gadu-"
 "Gadu. Повторите попытку позже."
 
-#: src/protocols/gg/gg.c:1410
+#: src/protocols/gg/gg.c:1492
 msgid "Directory Search"
 msgstr "Поиск в каталоге"
 
 #. if (js->protocol_options & CHANGE_PASSWORD) {
-#: src/protocols/gg/gg.c:1415 src/protocols/jabber/jabber.c:1061
+#: src/protocols/gg/gg.c:1497 src/protocols/jabber/jabber.c:1062
 #: src/protocols/toc/toc.c:1550
 msgid "Change Password"
 msgstr "Изменить пароль"
 
-#: src/protocols/gg/gg.c:1419
+#: src/protocols/gg/gg.c:1501
 msgid "Import Buddy List from Server"
 msgstr "Импортировать список контактов с сервера"
 
-#: src/protocols/gg/gg.c:1423
+#: src/protocols/gg/gg.c:1505
 msgid "Export Buddy List to Server"
 msgstr "Экспортировать список контактов на сервер"
 
-#: src/protocols/gg/gg.c:1427
+#: src/protocols/gg/gg.c:1509
 msgid "Delete Buddy List from Server"
 msgstr "Удалить список контактов с сервера"
 
-#: src/protocols/gg/gg.c:1460
+#: src/protocols/gg/gg.c:1542
 msgid "Unable to access user profile."
 msgstr "Не удаётся получить доступ к профилю пользователя."
 
-#: src/protocols/gg/gg.c:1461
+#: src/protocols/gg/gg.c:1543
 msgid ""
 "Gaim was unable to access this user's profile due to an error connecting to "
 "the directory server.  Please try again later."
@@ -4849,7 +4882,7 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/gg/gg.c:1602 src/protocols/gg/gg.c:1604
+#: src/protocols/gg/gg.c:1686 src/protocols/gg/gg.c:1688
 msgid "Gadu-Gadu Protocol Plugin"
 msgstr "Модуль протокола Gadu-Gadu"
 
@@ -4863,14 +4896,14 @@
 msgstr "Пользователь %s (%s%s%s%s%s) хочет, чтобы вы авторизовали его."
 
 #: src/protocols/icq/gaim_icq.c:297 src/protocols/jabber/presence.c:232
-#: src/protocols/msn/userlist.c:100 src/protocols/oscar/oscar.c:3538
-#: src/protocols/oscar/oscar.c:6100
+#: src/protocols/msn/userlist.c:100 src/protocols/oscar/oscar.c:3554
+#: src/protocols/oscar/oscar.c:6117
 msgid "Authorize"
 msgstr "Авторизовать"
 
 #: src/protocols/icq/gaim_icq.c:297 src/protocols/jabber/presence.c:233
-#: src/protocols/msn/userlist.c:101 src/protocols/oscar/oscar.c:3540
-#: src/protocols/oscar/oscar.c:6101
+#: src/protocols/msn/userlist.c:101 src/protocols/oscar/oscar.c:3556
+#: src/protocols/oscar/oscar.c:6118
 msgid "Deny"
 msgstr "Отказать"
 
@@ -4890,17 +4923,19 @@
 msgid "Gaim User"
 msgstr "Пользователь Gaim"
 
-#: src/protocols/irc/cmds.c:43
+#: src/protocols/irc/cmds.c:43 src/protocols/silc/silc.c:1286
 #, c-format
 msgid "Unknown command: %s"
 msgstr "Неизвестная команда: %s"
 
-#: src/protocols/irc/cmds.c:444 src/protocols/jabber/chat.c:544
+#: src/protocols/irc/cmds.c:448 src/protocols/jabber/chat.c:544
+#: src/protocols/silc/silc.c:995
 #, c-format
 msgid "current topic is: %s"
 msgstr "текущая тема: %s"
 
-#: src/protocols/irc/cmds.c:447 src/protocols/jabber/chat.c:546
+#: src/protocols/irc/cmds.c:451 src/protocols/jabber/chat.c:546
+#: src/protocols/silc/silc.c:998
 msgid "No topic is set"
 msgstr "Тема не установлена"
 
@@ -4932,54 +4967,51 @@
 msgid "MOTD for %s"
 msgstr "MOTD для %s"
 
-#: src/protocols/irc/irc.c:141
+#: src/protocols/irc/irc.c:93 src/protocols/irc/irc.c:373
+msgid "Server has disconnected"
+msgstr "Сервер разорвал соединение"
+
+#: src/protocols/irc/irc.c:147
 msgid "View MOTD"
 msgstr "Просмотреть MOTD"
 
-#. FIXME: remove this when the ui does it for us.
-#: src/protocols/irc/irc.c:168 src/protocols/jabber/buddy.c:929
-#: src/protocols/msn/msn.c:543 src/protocols/oscar/oscar.c:448
-#: src/protocols/oscar/oscar.c:6771 src/protocols/yahoo/yahoo.c:2691
-msgid "Send File"
-msgstr "Отправить файл"
-
-#: src/protocols/irc/irc.c:182 src/protocols/silc/chat.c:32
+#: src/protocols/irc/irc.c:169 src/protocols/silc/chat.c:32
 msgid "_Channel:"
 msgstr "Канал:"
 
-#: src/protocols/irc/irc.c:187 src/protocols/jabber/chat.c:59
+#: src/protocols/irc/irc.c:174 src/protocols/jabber/chat.c:59
 msgid "_Password:"
 msgstr "Пароль:"
 
-#: src/protocols/irc/irc.c:207
+#: src/protocols/irc/irc.c:194
 msgid "IRC nicks may not contain whitespace"
 msgstr "Псевдонимы IRC не могут содержать пробелы"
 
-#: src/protocols/irc/irc.c:226 src/protocols/toc/toc.c:198
+#: src/protocols/irc/irc.c:213 src/protocols/toc/toc.c:198
 #, c-format
 msgid "Signon: %s"
 msgstr "Подключение: %s"
 
-#: src/protocols/irc/irc.c:235
+#: src/protocols/irc/irc.c:222
 msgid "Couldn't create socket"
 msgstr "Не удалось создать сокет"
 
-#: src/protocols/irc/irc.c:250 src/protocols/jabber/jabber.c:296
-#: src/protocols/oscar/oscar.c:1523 src/protocols/oscar/oscar.c:1587
+#: src/protocols/irc/irc.c:237 src/protocols/jabber/jabber.c:297
+#: src/protocols/oscar/oscar.c:1529 src/protocols/oscar/oscar.c:1593
 msgid "Couldn't connect to host"
 msgstr "Не удалось соединиться с узлом"
 
-#: src/protocols/irc/irc.c:387 src/protocols/trepia/trepia.c:926
+#: src/protocols/irc/irc.c:370 src/protocols/trepia/trepia.c:926
 msgid "Read error"
 msgstr "Ошибка чтения"
 
-#: src/protocols/irc/irc.c:538 src/protocols/silc/chat.c:1356
-#: src/protocols/yahoo/yahoochat.c:1341
+#: src/protocols/irc/irc.c:521 src/protocols/silc/chat.c:1363
+#: src/protocols/yahoo/yahoochat.c:1380
 msgid "Users"
 msgstr "Пользователи"
 
-#: src/protocols/irc/irc.c:541 src/protocols/silc/chat.c:1359
-#: src/protocols/silc/ops.c:1017 src/protocols/yahoo/yahoochat.c:1350
+#: src/protocols/irc/irc.c:524 src/protocols/silc/chat.c:1366
+#: src/protocols/silc/ops.c:1146 src/protocols/yahoo/yahoochat.c:1389
 msgid "Topic"
 msgstr "Тема"
 
@@ -4992,34 +5024,35 @@
 #. *< id
 #. *< name
 #. *< version
-#: src/protocols/irc/irc.c:643
+#: src/protocols/irc/irc.c:628
 msgid "IRC Protocol Plugin"
 msgstr "Модуль протокола IRC"
 
 #. *  summary
-#: src/protocols/irc/irc.c:644
+#: src/protocols/irc/irc.c:629
 msgid "The IRC Protocol Plugin that Sucks Less"
 msgstr "Наименее плохой модуль протокола IRC"
 
-#: src/protocols/irc/irc.c:663 src/protocols/irc/msgs.c:197
-#: src/protocols/jabber/jabber.c:1556 src/protocols/napster/napster.c:642
-#: src/protocols/silc/ops.c:935
+#: src/protocols/irc/irc.c:648 src/protocols/irc/msgs.c:197
+#: src/protocols/jabber/jabber.c:1559 src/protocols/napster/napster.c:644
+#: src/protocols/silc/ops.c:1008 src/protocols/silc/ops.c:1110
 msgid "Server"
 msgstr "Сервер"
 
-#: src/protocols/irc/irc.c:666 src/protocols/jabber/jabber.c:1577
-#: src/protocols/msn/msn.c:1729 src/protocols/napster/napster.c:647
-#: src/protocols/silc/silc.c:1394 src/protocols/trepia/trepia.c:1295
+#: src/protocols/irc/irc.c:651 src/protocols/jabber/jabber.c:1580
+#: src/protocols/msn/msn.c:1758 src/protocols/napster/napster.c:649
+#: src/protocols/silc/silc.c:1576 src/protocols/trepia/trepia.c:1297
 msgid "Port"
 msgstr "Порт"
 
-#: src/protocols/irc/irc.c:669 src/protocols/zephyr/zephyr.c:1442
+#: src/protocols/irc/irc.c:654 src/protocols/zephyr/zephyr.c:1915
 msgid "Encoding"
 msgstr "Кодировка"
 
-#: src/protocols/irc/irc.c:672 src/protocols/irc/msgs.c:191
-#: src/protocols/jabber/jabber.c:587 src/protocols/silc/buddy.c:1449
-#: src/protocols/silc/ops.c:931
+#: src/protocols/irc/irc.c:657 src/protocols/irc/msgs.c:191
+#: src/protocols/jabber/jabber.c:588 src/protocols/silc/buddy.c:1445
+#: src/protocols/silc/ops.c:955 src/protocols/silc/ops.c:957
+#: src/protocols/silc/ops.c:1104 src/protocols/silc/ops.c:1106
 msgid "Username"
 msgstr "Имя пользователя"
 
@@ -5045,12 +5078,12 @@
 msgid " <i>(identified)</i>"
 msgstr " <i>(идентифицирован)</i>"
 
-#: src/protocols/irc/msgs.c:192 src/protocols/silc/ops.c:929
-#: src/protocols/yahoo/yahoo_profile.c:1000
+#: src/protocols/irc/msgs.c:192 src/protocols/silc/ops.c:949
+#: src/protocols/silc/ops.c:1098 src/protocols/yahoo/yahoo_profile.c:1005
 msgid "Realname"
 msgstr "Настоящее имя"
 
-#: src/protocols/irc/msgs.c:202
+#: src/protocols/irc/msgs.c:202 src/protocols/silc/ops.c:1021
 msgid "Currently on"
 msgstr "Сейчас на"
 
@@ -5072,111 +5105,111 @@
 msgid "Buddy Information for %s"
 msgstr "Информация о пользователе %s"
 
-#: src/protocols/irc/msgs.c:278
+#: src/protocols/irc/msgs.c:279
 #, c-format
 msgid "%s has changed the topic to: %s"
 msgstr "%s сменил тему на: %s"
 
-#: src/protocols/irc/msgs.c:283
+#: src/protocols/irc/msgs.c:284
 #, c-format
 msgid "The topic for %s is: %s"
 msgstr "Тема для %s: %s"
 
-#: src/protocols/irc/msgs.c:299
+#: src/protocols/irc/msgs.c:301
 #, c-format
 msgid "Unknown message '%s'"
 msgstr "Неизвестное сообщение '%s'"
 
-#: src/protocols/irc/msgs.c:300
+#: src/protocols/irc/msgs.c:302
 msgid "Unknown message"
 msgstr "Неизвестное сообщение"
 
-#: src/protocols/irc/msgs.c:300
+#: src/protocols/irc/msgs.c:302
 msgid "Gaim has sent a message the IRC server did not understand."
 msgstr "Gaim отправил сообщение, которое не понял сервер IRC."
 
-#: src/protocols/irc/msgs.c:323
+#: src/protocols/irc/msgs.c:325
 #, c-format
 msgid "Users on %s: %s"
 msgstr "Пользователи на %s: %s"
 
-#: src/protocols/irc/msgs.c:405
+#: src/protocols/irc/msgs.c:407
 msgid "No such channel"
 msgstr "Нет такого канала"
 
 #. does this happen?
-#: src/protocols/irc/msgs.c:416
+#: src/protocols/irc/msgs.c:418
 msgid "no such channel"
 msgstr "нет такого канала"
 
-#: src/protocols/irc/msgs.c:419
+#: src/protocols/irc/msgs.c:421
 msgid "User is not logged in"
 msgstr "Пользователь не в сети"
 
-#: src/protocols/irc/msgs.c:424
+#: src/protocols/irc/msgs.c:426
 msgid "No such nick or channel"
 msgstr "Нет такого псевдонима или канала"
 
-#: src/protocols/irc/msgs.c:444
+#: src/protocols/irc/msgs.c:446
 msgid "Could not send"
 msgstr "Не удалось отправить"
 
-#: src/protocols/irc/msgs.c:500
+#: src/protocols/irc/msgs.c:502
 #, c-format
 msgid "Joining %s requires an invitation."
 msgstr "Присоединение к %s требует приглашения."
 
-#: src/protocols/irc/msgs.c:501
+#: src/protocols/irc/msgs.c:503
 msgid "Invitation only"
 msgstr "Только по приглашению"
 
-#: src/protocols/irc/msgs.c:604
+#: src/protocols/irc/msgs.c:606
 #, c-format
 msgid "You have been kicked by %s: (%s)"
 msgstr "Вы были удалены оператором %s: (%s)"
 
-#: src/protocols/irc/msgs.c:609
+#: src/protocols/irc/msgs.c:611
 #, c-format
 msgid "Kicked by %s (%s)"
 msgstr "Удалён оператором %s (%s)"
 
-#: src/protocols/irc/msgs.c:630
+#: src/protocols/irc/msgs.c:632
 #, c-format
 msgid "mode (%s %s) by %s"
 msgstr "режим (%s %s) установлен %s"
 
-#: src/protocols/irc/msgs.c:709
+#: src/protocols/irc/msgs.c:711
 msgid "Could not change nick"
 msgstr "Не удалось изменить псевдоним"
 
-#: src/protocols/irc/msgs.c:710
+#: src/protocols/irc/msgs.c:712
 msgid "Cannot change nick"
 msgstr "Не удаётся изменить псевдоним"
 
-#: src/protocols/irc/msgs.c:731
+#: src/protocols/irc/msgs.c:733
 #, c-format
 msgid "You have parted the channel%s%s"
 msgstr "Вы отсоединились от канала %s%s"
 
-#: src/protocols/irc/msgs.c:771
+#: src/protocols/irc/msgs.c:773
 msgid "Error: invalid PONG from server"
 msgstr "Ошибка: неверный PONG с сервера"
 
-#: src/protocols/irc/msgs.c:773
+#: src/protocols/irc/msgs.c:775
 #, c-format
 msgid "PING reply -- Lag: %lu seconds"
 msgstr "Ответ PING -- задержка: %lu секунд"
 
-#: src/protocols/irc/msgs.c:848
+#: src/protocols/irc/msgs.c:850
 #, c-format
 msgid "Cannot join %s:"
 msgstr "Не удаётся присоединиться к %s:"
 
-#: src/protocols/irc/msgs.c:849 src/protocols/silc/ops.c:878
+#: src/protocols/irc/msgs.c:851 src/protocols/silc/ops.c:894
 msgid "Cannot join channel"
 msgstr "Не удаётся присоединиться к каналу"
 
-#: src/protocols/irc/msgs.c:885
+#: src/protocols/irc/msgs.c:887
 #, c-format
 msgid "Wallops from %s"
 msgstr ""
@@ -5202,14 +5235,14 @@
 "оператора канала. Вы должны быть оператором канала для этого."
 
 #: src/protocols/irc/parse.c:112
-#, fuzzy
 msgid ""
 "devoice &lt;nick1&gt; [nick2] ...:  Remove channel voice status from "
 "someone, preventing them from speaking if the channel is moderated (+m). You "
 "must be a channel operator to do this."
 msgstr ""
 "devoice &lt;псевдоним1&gt; [псевдоним2] ...:  Забрать у пользователя статус "
-"голоса на канале,*** Вы должны быть оператором канала для этого."
+"голоса на канале, лишая его возможности говорить, если канал модерируемый "
+"(+m). Вы должны быть оператором канала для этого."
 
 #: src/protocols/irc/parse.c:113
 msgid ""
@@ -5271,7 +5304,7 @@
 "names [канал]:  Вывести список пользователей, присутствующих сейчас на "
 "канале."
 
-#: src/protocols/irc/parse.c:122 src/protocols/jabber/jabber.c:1406
+#: src/protocols/irc/parse.c:122 src/protocols/jabber/jabber.c:1407
 msgid "nick &lt;new nickname&gt;:  Change your nickname."
 msgstr "nick &lt;новый псевдоним&gt;:  Изменить свой псевдоним."
 
@@ -5355,7 +5388,7 @@
 msgid "whois &lt;nick&gt;:  Get information on a user."
 msgstr "whois &lt;псевдоним&gt;:  Получить информацию о пользователе."
 
-#: src/protocols/irc/parse.c:228 src/protocols/zephyr/zephyr.c:236
+#: src/protocols/irc/parse.c:228 src/protocols/zephyr/zephyr.c:256
 msgid ""
 "(There was an error converting this message.  Check the 'Encoding' option in "
 "the Account Editor)"
@@ -5376,7 +5409,7 @@
 msgid "CTCP PING reply"
 msgstr "Ответ CTCP PING"
 
-#: src/protocols/irc/parse.c:485 src/protocols/oscar/oscar.c:1424
+#: src/protocols/irc/parse.c:485 src/protocols/oscar/oscar.c:1430
 #: src/protocols/toc/toc.c:188 src/protocols/toc/toc.c:596
 #: src/protocols/toc/toc.c:612 src/protocols/toc/toc.c:689
 msgid "Disconnected."
@@ -5411,169 +5444,170 @@
 msgid "Invalid challenge from server"
 msgstr "Неверный запрос с сервера"
 
-#: src/protocols/jabber/buddy.c:247 src/protocols/jabber/buddy.c:605
-#: src/protocols/silc/ops.c:770
+#: src/protocols/jabber/buddy.c:246 src/protocols/jabber/buddy.c:604
+#: src/protocols/silc/ops.c:786
 msgid "Full Name"
 msgstr "Полное Имя"
 
-#: src/protocols/jabber/buddy.c:248 src/protocols/jabber/buddy.c:618
-#: src/protocols/silc/ops.c:782
+#: src/protocols/jabber/buddy.c:247 src/protocols/jabber/buddy.c:617
+#: src/protocols/silc/ops.c:798
 msgid "Family Name"
 msgstr "Фамилия"
 
-#: src/protocols/jabber/buddy.c:249 src/protocols/jabber/buddy.c:622
+#: src/protocols/jabber/buddy.c:248 src/protocols/jabber/buddy.c:621
 msgid "Given Name"
 msgstr "Девичья фамилия"
 
-#: src/protocols/jabber/buddy.c:250 src/protocols/jabber/buddy.c:636
-#: src/protocols/jabber/jabber.c:607 src/protocols/msn/msn.c:1150
-#: src/protocols/silc/buddy.c:1446 src/protocols/silc/ops.c:786
-#: src/protocols/silc/ops.c:927 src/protocols/yahoo/yahoo_profile.c:995
+#: src/protocols/jabber/buddy.c:249 src/protocols/jabber/buddy.c:635
+#: src/protocols/jabber/jabber.c:608 src/protocols/msn/msn.c:1172
+#: src/protocols/silc/buddy.c:1442 src/protocols/silc/ops.c:802
+#: src/protocols/silc/ops.c:945 src/protocols/silc/ops.c:1094
+#: src/protocols/yahoo/yahoo_profile.c:1000
 msgid "Nickname"
 msgstr "Псевдоним"
 
-#: src/protocols/jabber/buddy.c:251 src/protocols/jabber/jabber.c:647
+#: src/protocols/jabber/buddy.c:250 src/protocols/jabber/jabber.c:648
 msgid "URL"
 msgstr "URL"
 
-#: src/protocols/jabber/buddy.c:252 src/protocols/jabber/buddy.c:664
+#: src/protocols/jabber/buddy.c:251 src/protocols/jabber/buddy.c:663
 msgid "Street Address"
 msgstr "Адрес"
 
-#: src/protocols/jabber/buddy.c:253 src/protocols/jabber/buddy.c:660
+#: src/protocols/jabber/buddy.c:252 src/protocols/jabber/buddy.c:659
 msgid "Extended Address"
 msgstr "Дополнительный адрес"
 
-#: src/protocols/jabber/buddy.c:254 src/protocols/jabber/buddy.c:668
+#: src/protocols/jabber/buddy.c:253 src/protocols/jabber/buddy.c:667
 msgid "Locality"
 msgstr "Расположение"
 
-#: src/protocols/jabber/buddy.c:255 src/protocols/jabber/buddy.c:672
+#: src/protocols/jabber/buddy.c:254 src/protocols/jabber/buddy.c:671
 msgid "Region"
 msgstr "Регион"
 
-#: src/protocols/jabber/buddy.c:256 src/protocols/jabber/buddy.c:676
-#: src/protocols/jabber/jabber.c:637
+#: src/protocols/jabber/buddy.c:255 src/protocols/jabber/buddy.c:675
+#: src/protocols/jabber/jabber.c:638
 msgid "Postal Code"
 msgstr "Почтовый код"
 
 #. Country
-#: src/protocols/jabber/buddy.c:257 src/protocols/jabber/buddy.c:681
+#: src/protocols/jabber/buddy.c:256 src/protocols/jabber/buddy.c:680
 #: src/protocols/trepia/trepia.c:339 src/protocols/trepia/trepia.c:416
 msgid "Country"
 msgstr "Страна"
 
-#: src/protocols/jabber/buddy.c:258 src/protocols/jabber/buddy.c:692
-#: src/protocols/jabber/buddy.c:699
+#: src/protocols/jabber/buddy.c:257 src/protocols/jabber/buddy.c:691
+#: src/protocols/jabber/buddy.c:698
 msgid "Telephone"
 msgstr "Телефон"
 
-#: src/protocols/jabber/buddy.c:259 src/protocols/jabber/buddy.c:710
-#: src/protocols/jabber/buddy.c:718 src/protocols/silc/buddy.c:1499
-#: src/protocols/silc/silc.c:637 src/protocols/yahoo/yahoo_profile.c:990
+#: src/protocols/jabber/buddy.c:258 src/protocols/jabber/buddy.c:709
+#: src/protocols/jabber/buddy.c:717 src/protocols/silc/silc.c:637
+#: src/protocols/silc/util.c:508 src/protocols/yahoo/yahoo_profile.c:995
 msgid "Email"
 msgstr "Email"
 
-#: src/protocols/jabber/buddy.c:260 src/protocols/jabber/buddy.c:733
+#: src/protocols/jabber/buddy.c:259 src/protocols/jabber/buddy.c:732
 msgid "Organization Name"
 msgstr "Название организации"
 
-#: src/protocols/jabber/buddy.c:261 src/protocols/jabber/buddy.c:737
+#: src/protocols/jabber/buddy.c:260 src/protocols/jabber/buddy.c:736
 msgid "Organization Unit"
 msgstr "Отдел"
 
-#: src/protocols/jabber/buddy.c:262 src/protocols/jabber/buddy.c:743
+#: src/protocols/jabber/buddy.c:261 src/protocols/jabber/buddy.c:742
 msgid "Title"
 msgstr "Звание"
 
-#: src/protocols/jabber/buddy.c:263 src/protocols/jabber/buddy.c:746
+#: src/protocols/jabber/buddy.c:262 src/protocols/jabber/buddy.c:745
 msgid "Role"
 msgstr "Должность"
 
-#: src/protocols/jabber/buddy.c:264 src/protocols/jabber/buddy.c:639
-#: src/protocols/oscar/oscar.c:4865
+#: src/protocols/jabber/buddy.c:263 src/protocols/jabber/buddy.c:638
+#: src/protocols/oscar/oscar.c:4881
 msgid "Birthday"
 msgstr "Дата рождения"
 
-#: src/protocols/jabber/buddy.c:510 src/protocols/jabber/buddy.c:511
+#: src/protocols/jabber/buddy.c:509 src/protocols/jabber/buddy.c:510
 msgid "Edit Jabber vCard"
 msgstr "Изменить Jabber vCard"
 
-#: src/protocols/jabber/buddy.c:512
+#: src/protocols/jabber/buddy.c:511
 msgid ""
 "All items below are optional. Enter only the information with which you feel "
 "comfortable."
 msgstr ""
 "Все нижеследующие пункты необязательны. Заполняйте по своему усмотрению."
 
-#: src/protocols/jabber/buddy.c:554
+#: src/protocols/jabber/buddy.c:553
 msgid "Jabber ID"
 msgstr "Jabber ID"
 
-#: src/protocols/jabber/buddy.c:564 src/protocols/jabber/buddy.c:571
-#: src/protocols/jabber/buddy.c:582 src/protocols/jabber/jabber.c:937
-#: src/protocols/msn/msn.c:453 src/protocols/novell/novell.c:2737
-#: src/protocols/novell/novell.c:2741 src/protocols/oscar/oscar.c:574
-#: src/protocols/oscar/oscar.c:580 src/protocols/oscar/oscar.c:582
-#: src/protocols/yahoo/yahoo.c:2611
+#: src/protocols/jabber/buddy.c:563 src/protocols/jabber/buddy.c:570
+#: src/protocols/jabber/buddy.c:581 src/protocols/jabber/jabber.c:938
+#: src/protocols/msn/msn.c:450 src/protocols/novell/novell.c:2743
+#: src/protocols/novell/novell.c:2747 src/protocols/oscar/oscar.c:578
+#: src/protocols/oscar/oscar.c:584 src/protocols/oscar/oscar.c:586
+#: src/protocols/yahoo/yahoo.c:2634
 msgid "Status"
 msgstr "Статус"
 
-#: src/protocols/jabber/buddy.c:580 src/protocols/jabber/jabber.c:1559
+#: src/protocols/jabber/buddy.c:579 src/protocols/jabber/jabber.c:1562
 msgid "Resource"
 msgstr "Ресурс"
 
-#: src/protocols/jabber/buddy.c:626 src/protocols/silc/ops.c:778
+#: src/protocols/jabber/buddy.c:625 src/protocols/silc/ops.c:794
 msgid "Middle Name"
 msgstr "Отчество"
 
-#: src/protocols/jabber/buddy.c:644 src/protocols/jabber/jabber.c:622
-#: src/protocols/oscar/oscar.c:4883 src/protocols/oscar/oscar.c:4891
-#: src/protocols/silc/ops.c:814
+#: src/protocols/jabber/buddy.c:643 src/protocols/jabber/jabber.c:623
+#: src/protocols/oscar/oscar.c:4899 src/protocols/oscar/oscar.c:4907
+#: src/protocols/silc/ops.c:830
 msgid "Address"
 msgstr "Адрес"
 
-#: src/protocols/jabber/buddy.c:656
+#: src/protocols/jabber/buddy.c:655
 msgid "P.O. Box"
 msgstr "Индекс"
 
-#: src/protocols/jabber/buddy.c:762
+#: src/protocols/jabber/buddy.c:761
 msgid "Photo"
 msgstr "Фотография"
 
-#: src/protocols/jabber/buddy.c:762
+#: src/protocols/jabber/buddy.c:761
 msgid "Logo"
 msgstr "Логотип"
 
-#: src/protocols/jabber/buddy.c:778
+#: src/protocols/jabber/buddy.c:777
 msgid "Jabber Profile"
 msgstr "Профиль Jabber"
 
-#: src/protocols/jabber/buddy.c:937
+#: src/protocols/jabber/buddy.c:932
 msgid "Un-hide From"
 msgstr "Показаться для"
 
-#: src/protocols/jabber/buddy.c:940
+#: src/protocols/jabber/buddy.c:935
 msgid "Temporarily Hide From"
 msgstr "Временно скрыться от"
 
 #. && NOT ME
-#: src/protocols/jabber/buddy.c:947
+#: src/protocols/jabber/buddy.c:942
 msgid "Cancel Presence Notification"
 msgstr "Отменить уведомление о присутствии"
 
-#: src/protocols/jabber/buddy.c:953
+#: src/protocols/jabber/buddy.c:948
 msgid "(Re-)Request authorization"
 msgstr "(Повторно) Запросить авторизацию"
 
 #. if(NOT ME)
 #. shouldn't this just happen automatically when the buddy is
 #. removed?
-#: src/protocols/jabber/buddy.c:961
+#: src/protocols/jabber/buddy.c:956
 msgid "Unsubscribe"
 msgstr "Отписаться"
 
-#: src/protocols/jabber/chat.c:42 src/protocols/yahoo/yahoochat.c:963
+#: src/protocols/jabber/chat.c:42 src/protocols/yahoo/yahoochat.c:1002
 msgid "_Room:"
 msgstr "Комната:"
 
@@ -5660,450 +5694,450 @@
 msgid "Find Rooms"
 msgstr "Искать комнаты"
 
-#: src/protocols/jabber/jabber.c:75
+#: src/protocols/jabber/jabber.c:76
 msgid "Error initializing session"
 msgstr "Ошибка инициализации сессии"
 
-#: src/protocols/jabber/jabber.c:205 src/protocols/msn/httpmethod.c:266
+#: src/protocols/jabber/jabber.c:206 src/protocols/msn/httpmethod.c:266
 #: src/protocols/trepia/trepia.c:247 src/protocols/trepia/trepia.c:698
 #: src/protocols/trepia/trepia.c:987 src/protocols/trepia/trepia.c:1031
 #: src/protocols/trepia/trepia.c:1130 src/protocols/trepia/trepia.c:1176
 msgid "Write error"
 msgstr "Ошибка записи"
 
-#: src/protocols/jabber/jabber.c:243 src/protocols/jabber/jabber.c:263
+#: src/protocols/jabber/jabber.c:244 src/protocols/jabber/jabber.c:264
 msgid "Read Error"
 msgstr "Ошибка чтения"
 
-#: src/protocols/jabber/jabber.c:323
+#: src/protocols/jabber/jabber.c:324
 msgid "Connection Failed"
 msgstr "Не удалось установить соединение"
 
-#: src/protocols/jabber/jabber.c:326
+#: src/protocols/jabber/jabber.c:327
 msgid "SSL Handshake Failed"
-msgstr "Не удалось произвести согласование SSL"
-
-#: src/protocols/jabber/jabber.c:369 src/protocols/jabber/jabber.c:698
+msgstr "Не удалось выполнить согласование SSL"
+
+#: src/protocols/jabber/jabber.c:370 src/protocols/jabber/jabber.c:699
 msgid "Invalid Jabber ID"
 msgstr "Неверный Jabber ID"
 
-#: src/protocols/jabber/jabber.c:397 src/protocols/jabber/jabber.c:725
+#: src/protocols/jabber/jabber.c:398 src/protocols/jabber/jabber.c:726
 msgid "SSL support unavailable"
 msgstr "Поддержка SSL недоступна"
 
-#: src/protocols/jabber/jabber.c:407 src/protocols/jabber/jabber.c:735
+#: src/protocols/jabber/jabber.c:408 src/protocols/jabber/jabber.c:736
 #: src/protocols/trepia/trepia.c:1070
 msgid "Unable to create socket"
 msgstr "Не удаётся создать сокет"
 
-#: src/protocols/jabber/jabber.c:432
+#: src/protocols/jabber/jabber.c:433
 #, c-format
 msgid "Registration of %s@%s successful"
 msgstr "Регистрация %s@%s завершена успешно"
 
-#: src/protocols/jabber/jabber.c:434 src/protocols/jabber/jabber.c:435
+#: src/protocols/jabber/jabber.c:435 src/protocols/jabber/jabber.c:436
 msgid "Registration Successful"
 msgstr "Регистрация завершена успешно"
 
-#: src/protocols/jabber/jabber.c:441 src/protocols/jabber/jabber.c:1180
+#: src/protocols/jabber/jabber.c:442 src/protocols/jabber/jabber.c:1181
 msgid "Unknown Error"
 msgstr "Неизвестная ошибка"
 
-#: src/protocols/jabber/jabber.c:443 src/protocols/jabber/jabber.c:444
+#: src/protocols/jabber/jabber.c:444 src/protocols/jabber/jabber.c:445
 msgid "Registration Failed"
 msgstr "Регистрация завершилась неудачно"
 
-#: src/protocols/jabber/jabber.c:555 src/protocols/jabber/jabber.c:556
+#: src/protocols/jabber/jabber.c:556 src/protocols/jabber/jabber.c:557
 msgid "Already Registered"
 msgstr "Уже зарегистрировано"
 
-#: src/protocols/jabber/jabber.c:591 src/protocols/jabber/jabber.c:1035
+#: src/protocols/jabber/jabber.c:592 src/protocols/jabber/jabber.c:1036
 msgid "Password"
 msgstr "Пароль"
 
-#: src/protocols/jabber/jabber.c:602
+#: src/protocols/jabber/jabber.c:603
 msgid "E-Mail"
 msgstr "E-mail"
 
 #. State
-#: src/protocols/jabber/jabber.c:632 src/protocols/oscar/oscar.c:4885
-#: src/protocols/oscar/oscar.c:4893 src/protocols/trepia/trepia.c:335
+#: src/protocols/jabber/jabber.c:633 src/protocols/oscar/oscar.c:4901
+#: src/protocols/oscar/oscar.c:4909 src/protocols/trepia/trepia.c:335
 #: src/protocols/trepia/trepia.c:413
 msgid "State"
 msgstr "Область"
 
-#: src/protocols/jabber/jabber.c:642 src/protocols/silc/buddy.c:1501
-#: src/protocols/silc/ops.c:819 src/protocols/silc/silc.c:639
+#: src/protocols/jabber/jabber.c:643 src/protocols/silc/ops.c:835
+#: src/protocols/silc/silc.c:639 src/protocols/silc/util.c:510
 msgid "Phone"
 msgstr "Телефон"
 
-#: src/protocols/jabber/jabber.c:652
+#: src/protocols/jabber/jabber.c:653
 msgid "Date"
 msgstr "Дата"
 
-#: src/protocols/jabber/jabber.c:660
+#: src/protocols/jabber/jabber.c:661
 msgid "Please fill out the information below to register your new account."
 msgstr "Заполните нижеследующие поля для регистрации новой учётной записи."
 
-#: src/protocols/jabber/jabber.c:663 src/protocols/jabber/jabber.c:664
+#: src/protocols/jabber/jabber.c:664 src/protocols/jabber/jabber.c:665
 msgid "Register New Jabber Account"
 msgstr "Зарегистрировать новую учётную запись Jabber"
 
-#: src/protocols/jabber/jabber.c:743
+#: src/protocols/jabber/jabber.c:744
 msgid "Logged out"
 msgstr "Не в сети"
 
 #. connect to the server
-#: src/protocols/jabber/jabber.c:782 src/protocols/msn/msn.c:616
-#: src/protocols/napster/napster.c:499 src/protocols/novell/novell.c:2104
-#: src/protocols/oscar/oscar.c:1591 src/protocols/trepia/trepia.c:1064
-#: src/protocols/yahoo/yahoo.c:2353 src/protocols/zephyr/zephyr.c:906
+#: src/protocols/jabber/jabber.c:783 src/protocols/msn/msn.c:608
+#: src/protocols/napster/napster.c:499 src/protocols/novell/novell.c:2105
+#: src/protocols/oscar/oscar.c:1597 src/protocols/trepia/trepia.c:1064
+#: src/protocols/yahoo/yahoo.c:2379 src/protocols/zephyr/zephyr.c:1017
 msgid "Connecting"
 msgstr "Соединение"
 
-#: src/protocols/jabber/jabber.c:786
+#: src/protocols/jabber/jabber.c:787
 msgid "Initializing Stream"
 msgstr "Инициализация потока"
 
-#: src/protocols/jabber/jabber.c:792
+#: src/protocols/jabber/jabber.c:793
 msgid "Authenticating"
 msgstr "Идентификация"
 
-#: src/protocols/jabber/jabber.c:801
+#: src/protocols/jabber/jabber.c:802
 msgid "Re-initializing Stream"
 msgstr "Повторная инициализация потока"
 
-#: src/protocols/jabber/jabber.c:881 src/protocols/jabber/jabber.c:1158
-#: src/protocols/jabber/jabber.c:1199 src/protocols/jabber/jabber.c:1232
-#: src/protocols/oscar/oscar.c:580 src/protocols/oscar/oscar.c:6471
+#: src/protocols/jabber/jabber.c:882 src/protocols/jabber/jabber.c:1159
+#: src/protocols/jabber/jabber.c:1200 src/protocols/jabber/jabber.c:1233
+#: src/protocols/oscar/oscar.c:584 src/protocols/oscar/oscar.c:6488
 msgid "Not Authorized"
 msgstr "Не авторизован"
 
-#: src/protocols/jabber/jabber.c:912
+#: src/protocols/jabber/jabber.c:913
 msgid "Both"
 msgstr "Оба"
 
-#: src/protocols/jabber/jabber.c:914
+#: src/protocols/jabber/jabber.c:915
 msgid "From (To pending)"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:916
+#: src/protocols/jabber/jabber.c:917
 msgid "From"
 msgstr "От"
 
-#: src/protocols/jabber/jabber.c:919
+#: src/protocols/jabber/jabber.c:920
 msgid "To"
 msgstr "Для"
 
-#: src/protocols/jabber/jabber.c:921
+#: src/protocols/jabber/jabber.c:922
 msgid "None (To pending)"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:925
+#: src/protocols/jabber/jabber.c:926
 msgid "Subscription"
 msgstr "Подпись"
 
-#: src/protocols/jabber/jabber.c:945
+#: src/protocols/jabber/jabber.c:946
 msgid "Error"
 msgstr "Ошибка"
 
-#: src/protocols/jabber/jabber.c:958 src/protocols/jabber/jutil.c:35
+#: src/protocols/jabber/jabber.c:959 src/protocols/jabber/jutil.c:35
 #: src/protocols/jabber/presence.c:66 src/protocols/jabber/presence.c:117
 msgid "Chatty"
 msgstr "Готов пообщаться"
 
-#: src/protocols/jabber/jabber.c:960 src/protocols/jabber/jutil.c:38
+#: src/protocols/jabber/jabber.c:961 src/protocols/jabber/jutil.c:38
 #: src/protocols/jabber/presence.c:68 src/protocols/jabber/presence.c:122
 msgid "Extended Away"
 msgstr "Расширенный \"Отошёл\""
 
-#: src/protocols/jabber/jabber.c:961 src/protocols/jabber/jutil.c:41
+#: src/protocols/jabber/jabber.c:962 src/protocols/jabber/jutil.c:41
 #: src/protocols/jabber/presence.c:70 src/protocols/jabber/presence.c:124
-#: src/protocols/oscar/oscar.c:522 src/protocols/oscar/oscar.c:5468
-#: src/protocols/oscar/oscar.c:6663
+#: src/protocols/oscar/oscar.c:526 src/protocols/oscar/oscar.c:5484
+#: src/protocols/oscar/oscar.c:6680
 msgid "Do Not Disturb"
 msgstr "Не беспокоить"
 
-#: src/protocols/jabber/jabber.c:978
-msgid "Password Changed"
-msgstr "Пароль изменён"
-
 #: src/protocols/jabber/jabber.c:979
+msgid "Password Changed"
+msgstr "Пароль изменён"
+
+#: src/protocols/jabber/jabber.c:980
 msgid "Your password has been changed."
 msgstr "Пароль был изменён."
 
-#: src/protocols/jabber/jabber.c:983 src/protocols/jabber/jabber.c:984
+#: src/protocols/jabber/jabber.c:984 src/protocols/jabber/jabber.c:985
 msgid "Error changing password"
 msgstr "Ошибка изменения пароля"
 
-#: src/protocols/jabber/jabber.c:1040
+#: src/protocols/jabber/jabber.c:1041
 msgid "Password (again)"
 msgstr "Пароль (ещё раз)"
 
-#: src/protocols/jabber/jabber.c:1045 src/protocols/jabber/jabber.c:1046
+#: src/protocols/jabber/jabber.c:1046 src/protocols/jabber/jabber.c:1047
 msgid "Change Jabber Password"
 msgstr "Изменить пароль Jabber"
 
-#: src/protocols/jabber/jabber.c:1046
+#: src/protocols/jabber/jabber.c:1047
 msgid "Please enter your new password"
 msgstr "Введите новый пароль"
 
-#: src/protocols/jabber/jabber.c:1056 src/protocols/toc/toc.c:1540
+#: src/protocols/jabber/jabber.c:1057 src/protocols/toc/toc.c:1540
 msgid "Set User Info"
 msgstr "Установить информацию о пользователе"
 
-#: src/protocols/jabber/jabber.c:1138
+#: src/protocols/jabber/jabber.c:1139
 msgid "Bad Request"
 msgstr "Неверный запрос"
 
-#: src/protocols/jabber/jabber.c:1140
+#: src/protocols/jabber/jabber.c:1141
 msgid "Conflict"
 msgstr "Конфликт"
 
-#: src/protocols/jabber/jabber.c:1142
+#: src/protocols/jabber/jabber.c:1143
 msgid "Feature Not Implemented"
 msgstr "Функция не реализована"
 
-#: src/protocols/jabber/jabber.c:1144
+#: src/protocols/jabber/jabber.c:1145
 msgid "Forbidden"
 msgstr "Запрещено"
 
-#: src/protocols/jabber/jabber.c:1146
+#: src/protocols/jabber/jabber.c:1147
 msgid "Gone"
 msgstr "Ушёл"
 
-#: src/protocols/jabber/jabber.c:1148 src/protocols/jabber/jabber.c:1222
+#: src/protocols/jabber/jabber.c:1149 src/protocols/jabber/jabber.c:1223
 msgid "Internal Server Error"
 msgstr "Внутреняя ошибка сервера"
 
-#: src/protocols/jabber/jabber.c:1150
+#: src/protocols/jabber/jabber.c:1151
 msgid "Item Not Found"
 msgstr "Элемент не найден"
 
-#: src/protocols/jabber/jabber.c:1152
+#: src/protocols/jabber/jabber.c:1153
 msgid "Malformed Jabber ID"
 msgstr "Неверный Jabber ID"
 
-#: src/protocols/jabber/jabber.c:1154
+#: src/protocols/jabber/jabber.c:1155
 msgid "Not Acceptable"
 msgstr "Недопустимо"
 
-#: src/protocols/jabber/jabber.c:1156
+#: src/protocols/jabber/jabber.c:1157
 msgid "Not Allowed"
 msgstr "Не разрешено"
 
-#: src/protocols/jabber/jabber.c:1160
+#: src/protocols/jabber/jabber.c:1161
 msgid "Payment Required"
 msgstr "Требуется плата"
 
-#: src/protocols/jabber/jabber.c:1162
+#: src/protocols/jabber/jabber.c:1163
 msgid "Recipient Unavailable"
 msgstr "Получатель недоступен"
 
-#: src/protocols/jabber/jabber.c:1166
+#: src/protocols/jabber/jabber.c:1167
 msgid "Registration Required"
 msgstr "Требуется регистрация"
 
-#: src/protocols/jabber/jabber.c:1168
+#: src/protocols/jabber/jabber.c:1169
 msgid "Remote Server Not Found"
 msgstr "Удалённый сервер не найден"
 
-#: src/protocols/jabber/jabber.c:1170
+#: src/protocols/jabber/jabber.c:1171
 msgid "Remote Server Timeout"
 msgstr "Истекло время ожидания удалённого сервера"
 
-#: src/protocols/jabber/jabber.c:1172
+#: src/protocols/jabber/jabber.c:1173
 msgid "Server Overloaded"
 msgstr "Сервер перегружен"
 
-#: src/protocols/jabber/jabber.c:1174
+#: src/protocols/jabber/jabber.c:1175
 msgid "Service Unavailable"
 msgstr "Служба недоступна"
 
-#: src/protocols/jabber/jabber.c:1176
+#: src/protocols/jabber/jabber.c:1177
 msgid "Subscription Required"
 msgstr "Требуется подпись"
 
-#: src/protocols/jabber/jabber.c:1178
+#: src/protocols/jabber/jabber.c:1179
 msgid "Unexpected Request"
 msgstr "Непредвиденный запрос"
 
-#: src/protocols/jabber/jabber.c:1185
+#: src/protocols/jabber/jabber.c:1186
 msgid "Authorization Aborted"
 msgstr "Авторизация прервана"
 
-#: src/protocols/jabber/jabber.c:1187
+#: src/protocols/jabber/jabber.c:1188
 msgid "Incorrect encoding in authorization"
 msgstr "Некорректная кодировка в авторизации"
 
-#: src/protocols/jabber/jabber.c:1190
+#: src/protocols/jabber/jabber.c:1191
 msgid "Invalid authzid"
 msgstr "Неверный идентификатор авторизации"
 
-#: src/protocols/jabber/jabber.c:1193
+#: src/protocols/jabber/jabber.c:1194
 msgid "Invalid Authorization Mechanism"
 msgstr "Неверный механизм авторизации"
 
-#: src/protocols/jabber/jabber.c:1196
+#: src/protocols/jabber/jabber.c:1197
 msgid "Authorization mechanism too weak"
 msgstr "Механизм авторизации слишком слаб"
 
-#: src/protocols/jabber/jabber.c:1201
+#: src/protocols/jabber/jabber.c:1202
 msgid "Temporary Authentication Failure"
 msgstr "Временная ошибка идентификации"
 
-#: src/protocols/jabber/jabber.c:1203
+#: src/protocols/jabber/jabber.c:1204
 msgid "Authentication Failure"
 msgstr "Ошибка идентификации"
 
-#: src/protocols/jabber/jabber.c:1207
+#: src/protocols/jabber/jabber.c:1208
 msgid "Bad Format"
 msgstr "Неверный формат"
 
-#: src/protocols/jabber/jabber.c:1209
+#: src/protocols/jabber/jabber.c:1210
 msgid "Bad Namespace Prefix"
 msgstr "Неверный префикс пространства имён"
 
-#: src/protocols/jabber/jabber.c:1212
+#: src/protocols/jabber/jabber.c:1213
 msgid "Resource Conflict"
 msgstr "Конфликт ресурсов"
 
-#: src/protocols/jabber/jabber.c:1214 src/protocols/silc/ops.c:1275
+#: src/protocols/jabber/jabber.c:1215 src/protocols/silc/ops.c:1491
 msgid "Connection Timeout"
 msgstr "Истекло время ожидания соединения"
 
-#: src/protocols/jabber/jabber.c:1216
+#: src/protocols/jabber/jabber.c:1217
 msgid "Host Gone"
 msgstr "Узел ушёл"
 
-#: src/protocols/jabber/jabber.c:1218
+#: src/protocols/jabber/jabber.c:1219
 msgid "Host Unknown"
 msgstr "Узел неизвестен"
 
-#: src/protocols/jabber/jabber.c:1220
+#: src/protocols/jabber/jabber.c:1221
 msgid "Improper Addressing"
 msgstr "Неправильная адресация"
 
-#: src/protocols/jabber/jabber.c:1224
+#: src/protocols/jabber/jabber.c:1225
 msgid "Invalid ID"
 msgstr "Неверный ID"
 
-#: src/protocols/jabber/jabber.c:1226
+#: src/protocols/jabber/jabber.c:1227
 msgid "Invalid Namespace"
 msgstr "Неверное пространство имён"
 
-#: src/protocols/jabber/jabber.c:1228
+#: src/protocols/jabber/jabber.c:1229
 msgid "Invalid XML"
 msgstr "Неверный XML"
 
-#: src/protocols/jabber/jabber.c:1230
+#: src/protocols/jabber/jabber.c:1231
 msgid "Non-matching Hosts"
 msgstr "Несочетаемые узлы"
 
-#: src/protocols/jabber/jabber.c:1234
+#: src/protocols/jabber/jabber.c:1235
 msgid "Policy Violation"
 msgstr "Нарушение правил"
 
-#: src/protocols/jabber/jabber.c:1236
+#: src/protocols/jabber/jabber.c:1237
 msgid "Remote Connection Failed"
 msgstr "Не удалось установить удалённое соединение"
 
-#: src/protocols/jabber/jabber.c:1238
+#: src/protocols/jabber/jabber.c:1239
 msgid "Resource Constraint"
-msgstr ""
-
-#: src/protocols/jabber/jabber.c:1240
+msgstr "Недостаток ресурсов"
+
+#: src/protocols/jabber/jabber.c:1241
 msgid "Restricted XML"
-msgstr ""
-
-#: src/protocols/jabber/jabber.c:1242
+msgstr "Ограниченный XML"
+
+#: src/protocols/jabber/jabber.c:1243
 msgid "See Other Host"
 msgstr "Обратитесь к другому узлу"
 
-#: src/protocols/jabber/jabber.c:1244
+#: src/protocols/jabber/jabber.c:1245
 msgid "System Shutdown"
 msgstr "Выключение системы"
 
-#: src/protocols/jabber/jabber.c:1246
+#: src/protocols/jabber/jabber.c:1247
 msgid "Undefined Condition"
 msgstr "Неопределённое состояние"
 
-#: src/protocols/jabber/jabber.c:1248
+#: src/protocols/jabber/jabber.c:1249
 msgid "Unsupported Encoding"
 msgstr "Неподдерживаемая кодировка"
 
-#: src/protocols/jabber/jabber.c:1250
+#: src/protocols/jabber/jabber.c:1251
 msgid "Unsupported Stanza Type"
-msgstr ""
-
-#: src/protocols/jabber/jabber.c:1252
+msgstr "Неподдерживаемый тип строфы"
+
+#: src/protocols/jabber/jabber.c:1253
 msgid "Unsupported Version"
 msgstr "Неподдерживаемая версия"
 
-#: src/protocols/jabber/jabber.c:1254
+#: src/protocols/jabber/jabber.c:1255
 msgid "XML Not Well Formed"
 msgstr "XML не сформирован должным образом"
 
-#: src/protocols/jabber/jabber.c:1256
+#: src/protocols/jabber/jabber.c:1257
 msgid "Stream Error"
 msgstr "Ошибка потока"
 
-#: src/protocols/jabber/jabber.c:1323
+#: src/protocols/jabber/jabber.c:1324
 #, c-format
 msgid "Unable to ban user %s"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:1375
+#: src/protocols/jabber/jabber.c:1376
 #, c-format
 msgid "Unable to kick user %s"
 msgstr "Не удаётся удалить пользователя %s"
 
-#: src/protocols/jabber/jabber.c:1400
+#: src/protocols/jabber/jabber.c:1401
 msgid "config:  Configure a chat room."
 msgstr "config:  Настроить комнату."
 
-#: src/protocols/jabber/jabber.c:1403
+#: src/protocols/jabber/jabber.c:1404
 msgid "configure:  Configure a chat room."
 msgstr "configure:  Настроить комнату."
 
-#: src/protocols/jabber/jabber.c:1410
+#: src/protocols/jabber/jabber.c:1411
 msgid "part [room]:  Leave the room."
 msgstr "part [комната]:  Покинуть комнату."
 
-#: src/protocols/jabber/jabber.c:1413
+#: src/protocols/jabber/jabber.c:1414
 msgid "register:  Register with a chat room."
 msgstr "register:  Зарегистрировать комнату."
 
-#: src/protocols/jabber/jabber.c:1418
+#: src/protocols/jabber/jabber.c:1419
 msgid "topic [new topic]:  View or change the topic."
 msgstr "topic [новая тема]:  Просмотреть или изменить тему."
 
-#: src/protocols/jabber/jabber.c:1422
+#: src/protocols/jabber/jabber.c:1423
 msgid "ban &lt;user&gt; [room]:  Ban a user from the room."
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:1426
+#: src/protocols/jabber/jabber.c:1427
 msgid "invite &lt;user&gt; [room]:  Invite a user to the room."
 msgstr ""
 "invite &lt;пользователь&gt; [комната]:  Пригласить пользователя в комнату."
 
-#: src/protocols/jabber/jabber.c:1430
+#: src/protocols/jabber/jabber.c:1431
 msgid "join: &lt;room&gt; [server]:  Join a chat on this server."
 msgstr ""
 "join: &lt;комната&gt; [сервер]:  Присоединиться к чату на этом сервере."
 
-#: src/protocols/jabber/jabber.c:1434
+#: src/protocols/jabber/jabber.c:1435
 msgid "kick &lt;user&gt; [room]:  Kick a user from the room."
 msgstr "kick &lt;пользователь&gt; [комната]:  Удалить пользователя из комнаты."
 
-#: src/protocols/jabber/jabber.c:1438
+#: src/protocols/jabber/jabber.c:1439
 msgid ""
 "msg &lt;user&gt; &lt;message&gt;:  Send a private message to another user."
 msgstr ""
 "msg &lt;пользователь&gt; &lt;сообщение&gt;:  Отправить пользователю личное "
 "сообщение."
 
-#: src/protocols/jabber/jabber.c:1452
+#: src/protocols/jabber/jabber.c:1453
 msgid "Hide Operating System"
 msgstr "Скрывать операционную систему"
 
@@ -6118,24 +6152,24 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/jabber/jabber.c:1534 src/protocols/jabber/jabber.c:1536
+#: src/protocols/jabber/jabber.c:1537 src/protocols/jabber/jabber.c:1539
 msgid "Jabber Protocol Plugin"
 msgstr "Модуль протокола Jabber"
 
-#: src/protocols/jabber/jabber.c:1562
+#: src/protocols/jabber/jabber.c:1565
 msgid "Use TLS if available"
 msgstr "Использовать TLS, если доступно"
 
-#: src/protocols/jabber/jabber.c:1567
+#: src/protocols/jabber/jabber.c:1570
 msgid "Force old SSL"
 msgstr "Принудительно использовать старый SSL"
 
-#: src/protocols/jabber/jabber.c:1572
+#: src/protocols/jabber/jabber.c:1575
 msgid "Allow plaintext auth over unencrypted streams"
 msgstr "Разрешить идентификацию простым текстом через нешифрованные потоки"
 
 #. Account options
-#: src/protocols/jabber/jabber.c:1581 src/protocols/silc/silc.c:1390
+#: src/protocols/jabber/jabber.c:1584 src/protocols/silc/silc.c:1572
 msgid "Connect server"
 msgstr "Соединиться с сервером"
 
@@ -6278,7 +6312,7 @@
 msgid "Not on list"
 msgstr "Отсутствует в списке"
 
-#: src/protocols/msn/error.c:70 src/protocols/zephyr/zephyr.c:570
+#: src/protocols/msn/error.c:70 src/protocols/zephyr/zephyr.c:593
 msgid "User is offline"
 msgstr "Пользователь не в сети"
 
@@ -6413,7 +6447,7 @@
 
 #: src/protocols/msn/error.c:180
 msgid "Not expected"
-msgstr ""
+msgstr "Не предусмотрено"
 
 #: src/protocols/msn/error.c:185
 msgid "Friendly name changes too rapidly"
@@ -6423,8 +6457,8 @@
 msgid "Server too busy"
 msgstr "Сервер слишком занят"
 
-#: src/protocols/msn/error.c:198 src/protocols/oscar/oscar.c:2010
-#: src/protocols/silc/ops.c:1264 src/protocols/toc/toc.c:630
+#: src/protocols/msn/error.c:198 src/protocols/oscar/oscar.c:2026
+#: src/protocols/silc/ops.c:1480 src/protocols/toc/toc.c:630
 msgid "Authentication failed"
 msgstr "Идентификация завершилась неудачно"
 
@@ -6442,7 +6476,7 @@
 
 #: src/protocols/msn/error.c:217
 msgid "Passport account not yet verified"
-msgstr "Паспортная учётная запись ещё не подтверждена"
+msgstr "Паспортная учётная запись ещё не проверена"
 
 #: src/protocols/msn/error.c:220
 msgid "Bad ticket"
@@ -6500,88 +6534,88 @@
 msgid "Disallow"
 msgstr "Запретить"
 
-#: src/protocols/msn/msn.c:313
+#: src/protocols/msn/msn.c:311
 msgid "Send a mobile message."
 msgstr "Отправить мобильное сообщение."
 
-#: src/protocols/msn/msn.c:315
+#: src/protocols/msn/msn.c:313
 msgid "Page"
 msgstr "Страница"
 
-#: src/protocols/msn/msn.c:466 src/protocols/msn/msn.c:764
+#: src/protocols/msn/msn.c:463 src/protocols/msn/msn.c:756
 #: src/protocols/msn/state.c:34
 msgid "Away From Computer"
 msgstr "Отошёл от компьютера"
 
-#: src/protocols/msn/msn.c:467 src/protocols/msn/msn.c:766
-#: src/protocols/msn/state.c:33 src/protocols/yahoo/yahoo.c:2468
-#: src/protocols/yahoo/yahoo.c:2846 src/protocols/yahoo/yahoo.c:2960
+#: src/protocols/msn/msn.c:464 src/protocols/msn/msn.c:758
+#: src/protocols/msn/state.c:33 src/protocols/yahoo/yahoo.c:2491
+#: src/protocols/yahoo/yahoo.c:2853 src/protocols/yahoo/yahoo.c:2969
 msgid "Be Right Back"
 msgstr "Скоро вернусь"
 
-#: src/protocols/msn/msn.c:468 src/protocols/msn/msn.c:768
-#: src/protocols/msn/state.c:31 src/protocols/novell/novell.c:2721
-#: src/protocols/novell/novell.c:2836 src/protocols/novell/novell.c:2890
+#: src/protocols/msn/msn.c:465 src/protocols/msn/msn.c:760
+#: src/protocols/msn/state.c:31 src/protocols/novell/novell.c:2727
+#: src/protocols/novell/novell.c:2842 src/protocols/novell/novell.c:2896
 #: src/protocols/silc/buddy.c:1383 src/protocols/silc/silc.c:47
-#: src/protocols/silc/silc.c:78 src/protocols/yahoo/yahoo.c:2470
-#: src/protocols/yahoo/yahoo.c:2848 src/protocols/yahoo/yahoo.c:2961
+#: src/protocols/silc/silc.c:78 src/protocols/yahoo/yahoo.c:2493
+#: src/protocols/yahoo/yahoo.c:2855 src/protocols/yahoo/yahoo.c:2970
 msgid "Busy"
 msgstr "Занят"
 
-#: src/protocols/msn/msn.c:469 src/protocols/msn/msn.c:770
-#: src/protocols/msn/state.c:35 src/protocols/yahoo/yahoo.c:2478
-#: src/protocols/yahoo/yahoo.c:2856 src/protocols/yahoo/yahoo.c:2965
+#: src/protocols/msn/msn.c:466 src/protocols/msn/msn.c:762
+#: src/protocols/msn/state.c:35 src/protocols/yahoo/yahoo.c:2501
+#: src/protocols/yahoo/yahoo.c:2863 src/protocols/yahoo/yahoo.c:2974
 msgid "On The Phone"
 msgstr "Разговариваю по телефону"
 
-#: src/protocols/msn/msn.c:470 src/protocols/msn/msn.c:772
-#: src/protocols/msn/state.c:36 src/protocols/yahoo/yahoo.c:2482
-#: src/protocols/yahoo/yahoo.c:2860 src/protocols/yahoo/yahoo.c:2967
+#: src/protocols/msn/msn.c:467 src/protocols/msn/msn.c:764
+#: src/protocols/msn/state.c:36 src/protocols/yahoo/yahoo.c:2505
+#: src/protocols/yahoo/yahoo.c:2867 src/protocols/yahoo/yahoo.c:2976
 msgid "Out To Lunch"
 msgstr "Пошёл перекусить"
 
-#: src/protocols/msn/msn.c:471 src/protocols/msn/msn.c:774
-#: src/protocols/zephyr/zephyr.c:1205 src/protocols/zephyr/zephyr.c:1220
+#: src/protocols/msn/msn.c:468 src/protocols/msn/msn.c:766
+#: src/protocols/zephyr/zephyr.c:1355 src/protocols/zephyr/zephyr.c:1374
 msgid "Hidden"
 msgstr "Скрыт"
 
-#: src/protocols/msn/msn.c:482
+#: src/protocols/msn/msn.c:479
 msgid "Set Friendly Name"
 msgstr "Ввести дружеское имя"
 
-#: src/protocols/msn/msn.c:487
+#: src/protocols/msn/msn.c:484
 msgid "Set Home Phone Number"
 msgstr "Ввести номер домашнего телефона"
 
-#: src/protocols/msn/msn.c:491
+#: src/protocols/msn/msn.c:488
 msgid "Set Work Phone Number"
 msgstr "Ввести номер рабочего телефона"
 
-#: src/protocols/msn/msn.c:495
+#: src/protocols/msn/msn.c:492
 msgid "Set Mobile Phone Number"
 msgstr "Ввести номер мобильного телефона"
 
-#: src/protocols/msn/msn.c:501
+#: src/protocols/msn/msn.c:498
 msgid "Enable/Disable Mobile Devices"
 msgstr "Разрешить/запретить мобильные устройства"
 
-#: src/protocols/msn/msn.c:506
+#: src/protocols/msn/msn.c:503
 msgid "Allow/Disallow Mobile Pages"
 msgstr "Разрешить/запретить мобильные страницы"
 
-#: src/protocols/msn/msn.c:529
+#: src/protocols/msn/msn.c:526
 msgid "Send to Mobile"
 msgstr ""
 
-#: src/protocols/msn/msn.c:539
+#: src/protocols/msn/msn.c:536
 msgid "Initiate Chat"
 msgstr "Начать разговор"
 
-#: src/protocols/msn/msn.c:548
+#: src/protocols/msn/msn.c:540
 msgid "Update Buddy Icon"
 msgstr "Обновить значок пользователя"
 
-#: src/protocols/msn/msn.c:585
+#: src/protocols/msn/msn.c:577
 msgid ""
 "SSL support is needed for MSN. Please install a supported SSL library. See "
 "http://gaim.sf.net/faq-ssl.php for more information."
@@ -6589,106 +6623,121 @@
 "Поддержка SSL необходима для MSN. Установите поддерживаемую библиотеку SSL. "
 "За дополнительной информацией обращайтесь на http://gaim.sf.net/faq-ssl.php."
 
-#: src/protocols/msn/msn.c:1137 src/protocols/msn/msn.c:1150
-#: src/protocols/msn/msn.c:1156 src/protocols/yahoo/yahoo_profile.c:640
-#: src/protocols/yahoo/yahoo_profile.c:653
+#: src/protocols/msn/msn.c:1167 src/protocols/yahoo/yahoo_profile.c:659
+#: src/protocols/zephyr/zephyr.c:626
+#, c-format
+msgid "<b>Alias:</b> %s<br>"
+msgstr "<b>Псевдоним:</b> %s<br>"
+
+#. put a link to the actual profile URL
+#: src/protocols/msn/msn.c:1172 src/protocols/msn/msn.c:1512
+#: src/protocols/yahoo/yahoo_profile.c:1168 src/util.c:792
+#, c-format
+msgid "<b>%s:</b> "
+msgstr "<b>%s:</b> "
+
+#: src/protocols/msn/msn.c:1173
+#, c-format
+msgid "<font sml=\"msn\">%s</font><br>"
+msgstr "<font sml=\"msn\">%s</font><br>"
+
+#: src/protocols/msn/msn.c:1179 src/protocols/yahoo/yahoo_profile.c:664
 #, c-format
 msgid "<b>%s:</b> %s<br>"
 msgstr "<b>%s:</b> %s<br>"
 
-#: src/protocols/msn/msn.c:1137
-msgid "MSN ID"
-msgstr "MSN ID"
-
-#: src/protocols/msn/msn.c:1145 src/protocols/yahoo/yahoo_profile.c:648
-#: src/protocols/zephyr/zephyr.c:602
-#, c-format
-msgid "<b>Alias:</b> %s<br>"
-msgstr "<b>Псевдоним:</b> %s<br>"
-
-#: src/protocols/msn/msn.c:1222 src/protocols/msn/msn.c:1546
-#: src/protocols/yahoo/yahoo_profile.c:746
-#: src/protocols/yahoo/yahoo_profile.c:834
+#: src/protocols/msn/msn.c:1242
+msgid "MSN Profile"
+msgstr "Профиль MSN"
+
+#: src/protocols/msn/msn.c:1247 src/protocols/msn/msn.c:1499
+#: src/protocols/yahoo/yahoo_profile.c:761
 msgid "Error retrieving profile"
 msgstr "Ошибка загрузки профиля"
 
 #. Age
-#: src/protocols/msn/msn.c:1293 src/protocols/oscar/oscar.c:4870
+#: src/protocols/msn/msn.c:1318 src/protocols/oscar/oscar.c:4886
 #: src/protocols/trepia/trepia.c:285 src/protocols/trepia/trepia.c:404
-#: src/protocols/yahoo/yahoo_profile.c:1010
+#: src/protocols/yahoo/yahoo_profile.c:1015
 msgid "Age"
 msgstr "Возраст"
 
 #. Gender
-#: src/protocols/msn/msn.c:1300 src/protocols/oscar/oscar.c:4856
+#: src/protocols/msn/msn.c:1325 src/protocols/oscar/oscar.c:4872
 #: src/protocols/trepia/trepia.c:279 src/protocols/trepia/trepia.c:406
-#: src/protocols/yahoo/yahoo_profile.c:1020
+#: src/protocols/yahoo/yahoo_profile.c:1025
 msgid "Gender"
 msgstr "Пол"
 
-#: src/protocols/msn/msn.c:1309 src/protocols/yahoo/yahoo_profile.c:1015
+#: src/protocols/msn/msn.c:1334 src/protocols/yahoo/yahoo_profile.c:1020
 msgid "Marital Status"
 msgstr "Брачный статус"
 
-#: src/protocols/msn/msn.c:1316 src/protocols/yahoo/yahoo_profile.c:1005
+#: src/protocols/msn/msn.c:1341 src/protocols/yahoo/yahoo_profile.c:1010
 msgid "Location"
 msgstr "Местоположение"
 
-#: src/protocols/msn/msn.c:1324 src/protocols/yahoo/yahoo_profile.c:1025
+#: src/protocols/msn/msn.c:1349 src/protocols/yahoo/yahoo_profile.c:1030
 msgid "Occupation"
 msgstr "Занятость"
 
-#: src/protocols/msn/msn.c:1341 src/protocols/msn/msn.c:1347
-#: src/protocols/msn/msn.c:1354 src/protocols/msn/msn.c:1362
-#: src/protocols/msn/msn.c:1369
+#: src/protocols/msn/msn.c:1366 src/protocols/msn/msn.c:1372
+#: src/protocols/msn/msn.c:1379 src/protocols/msn/msn.c:1387
+#: src/protocols/msn/msn.c:1394
 msgid "A Little About Me"
 msgstr "Немного о себе"
 
-#: src/protocols/msn/msn.c:1378 src/protocols/msn/msn.c:1384
-#: src/protocols/msn/msn.c:1391 src/protocols/msn/msn.c:1398
+#: src/protocols/msn/msn.c:1403 src/protocols/msn/msn.c:1409
+#: src/protocols/msn/msn.c:1416 src/protocols/msn/msn.c:1423
 msgid "Favorite Things"
 msgstr "Любимые вещи"
 
-#: src/protocols/msn/msn.c:1407 src/protocols/msn/msn.c:1413
-#: src/protocols/msn/msn.c:1420
+#: src/protocols/msn/msn.c:1432 src/protocols/msn/msn.c:1438
+#: src/protocols/msn/msn.c:1445
 msgid "Hobbies and Interests"
 msgstr "Хобби и интересы"
 
-#: src/protocols/msn/msn.c:1429 src/protocols/msn/msn.c:1435
-#: src/protocols/yahoo/yahoo_profile.c:1067
+#: src/protocols/msn/msn.c:1454 src/protocols/msn/msn.c:1460
+#: src/protocols/yahoo/yahoo_profile.c:1072
 msgid "Favorite Quote"
 msgstr "Любиммая цитата"
 
-#: src/protocols/msn/msn.c:1443 src/protocols/yahoo/yahoo_profile.c:1118
+#: src/protocols/msn/msn.c:1468 src/protocols/yahoo/yahoo_profile.c:1123
 msgid "Last Updated"
 msgstr "Последнее обновление"
 
 #. Homepage
-#: src/protocols/msn/msn.c:1454 src/protocols/silc/ops.c:810
+#: src/protocols/msn/msn.c:1479 src/protocols/silc/ops.c:826
 #: src/protocols/trepia/trepia.c:289 src/protocols/trepia/trepia.c:419
 msgid "Homepage"
 msgstr "Домашняя страница"
 
-#. put a link to the actual profile URL
-#: src/protocols/msn/msn.c:1465 src/protocols/yahoo/yahoo_profile.c:1121
-#: src/util.c:792
-#, c-format
-msgid "<b>%s:</b> "
-msgstr "<b>%s:</b> "
-
-#: src/protocols/msn/msn.c:1465 src/protocols/yahoo/yahoo_profile.c:1121
+#: src/protocols/msn/msn.c:1501
+msgid "The user has not created a public profile."
+msgstr ""
+
+#: src/protocols/msn/msn.c:1502
+msgid ""
+"MSN reported not being able to find the user's profile. This either means "
+"that the user does not exist, or that the user exists but has not created a "
+"public profile."
+msgstr ""
+
+#: src/protocols/msn/msn.c:1506
+msgid ""
+"Gaim could not find any information in the user's profile. The user most "
+"likely does not exist."
+msgstr ""
+
+#: src/protocols/msn/msn.c:1512 src/protocols/yahoo/yahoo_profile.c:1168
 msgid "Profile URL"
 msgstr "URL профиля"
 
-#: src/protocols/msn/msn.c:1547 src/protocols/yahoo/yahoo_profile.c:1140
-msgid "The user's profile is empty."
-msgstr "Профиль пользователя пуст."
-
-#: src/protocols/msn/msn.c:1616
+#: src/protocols/msn/msn.c:1643
 msgid "Display conversation closed notices"
 msgstr "Показывать уведомления о закрытии беседы"
 
-#: src/protocols/msn/msn.c:1621
+#: src/protocols/msn/msn.c:1648
 msgid "Display timeout notices"
 msgstr "Показывать уведомления об истечении времени ожидания"
 
@@ -6703,15 +6752,15 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/msn/msn.c:1703 src/protocols/msn/msn.c:1705
+#: src/protocols/msn/msn.c:1732 src/protocols/msn/msn.c:1734
 msgid "MSN Protocol Plugin"
 msgstr "Модуль протокола MSN"
 
-#: src/protocols/msn/msn.c:1724 src/protocols/trepia/trepia.c:1290
+#: src/protocols/msn/msn.c:1753 src/protocols/trepia/trepia.c:1292
 msgid "Login server"
 msgstr "Сервер входа в сеть:"
 
-#: src/protocols/msn/msn.c:1733
+#: src/protocols/msn/msn.c:1762
 msgid "Use HTTP Method"
 msgstr "Использовать метод HTTP"
 
@@ -6733,11 +6782,11 @@
 msgstr "Загрузка списка контактов"
 
 #: src/protocols/msn/notification.c:144 src/protocols/msn/notification.c:173
-#: src/protocols/oscar/oscar.c:2299
+#: src/protocols/oscar/oscar.c:2315
 msgid "Password sent"
 msgstr "Пароль отправлен"
 
-#: src/protocols/msn/notification.c:1069
+#: src/protocols/msn/notification.c:1071
 #, c-format
 msgid ""
 "The MSN server will shut down for maintenance in %d minute. You will "
@@ -6756,7 +6805,7 @@
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/protocols/msn/notification.c:1134
+#: src/protocols/msn/notification.c:1136
 msgid "Syncing with server"
 msgstr "Синхронизация с сервером"
 
@@ -6789,11 +6838,11 @@
 msgid "Received HTTP error. Please report this."
 msgstr "Принята ошибка HTTP. Сообщите об этом."
 
-#: src/protocols/msn/switchboard.c:201
+#: src/protocols/msn/switchboard.c:191
 msgid "The conversation has become inactive and timed out."
 msgstr "Беседа потеряла активность."
 
-#: src/protocols/msn/switchboard.c:209
+#: src/protocols/msn/switchboard.c:199
 #, c-format
 msgid "%s has closed the conversation window."
 msgstr "%s закрыл окно беседы."
@@ -6851,7 +6900,7 @@
 msgid "%s requested a PING"
 msgstr "%s запросил PING"
 
-#: src/protocols/napster/napster.c:541 src/protocols/oscar/oscar.c:6171
+#: src/protocols/napster/napster.c:541 src/protocols/oscar/oscar.c:6188
 #: src/protocols/toc/toc.c:1266
 msgid "_Group:"
 msgstr "Группа:"
@@ -6867,91 +6916,91 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/napster/napster.c:622 src/protocols/napster/napster.c:624
+#: src/protocols/napster/napster.c:624 src/protocols/napster/napster.c:626
 msgid "NAPSTER Protocol Plugin"
 msgstr "Модуль протокола NAPSTER"
 
-#: src/protocols/novell/nmuser.c:2046
+#: src/protocols/novell/nmuser.c:1868
 msgid "Required parameters not passed in"
 msgstr "Требуемые параметры не переданы"
 
-#: src/protocols/novell/nmuser.c:2049
+#: src/protocols/novell/nmuser.c:1871
 msgid "Unable to write to network"
 msgstr "Не удаётся писать в сеть"
 
-#: src/protocols/novell/nmuser.c:2052
+#: src/protocols/novell/nmuser.c:1874
 msgid "Unable to read from network"
 msgstr "Не удаётся читать из сети"
 
-#: src/protocols/novell/nmuser.c:2055
+#: src/protocols/novell/nmuser.c:1877
 msgid "Error communicating with server"
 msgstr "Ошибка связи с сервером"
 
-#: src/protocols/novell/nmuser.c:2059
+#: src/protocols/novell/nmuser.c:1881
 msgid "Conference not found"
 msgstr "Конференция не найдена"
 
-#: src/protocols/novell/nmuser.c:2062
+#: src/protocols/novell/nmuser.c:1884
 msgid "Conference does not exist"
 msgstr "Конференция не существует"
 
-#: src/protocols/novell/nmuser.c:2066
+#: src/protocols/novell/nmuser.c:1888
 msgid "A folder with that name already exists"
 msgstr "Папка с таким именем уже существует"
 
-#: src/protocols/novell/nmuser.c:2069
+#: src/protocols/novell/nmuser.c:1891
 msgid "Not supported"
 msgstr "Не поддерживается"
 
-#: src/protocols/novell/nmuser.c:2073
+#: src/protocols/novell/nmuser.c:1895
 msgid "Password has expired"
 msgstr "Срок действия пароля истёк"
 
-#: src/protocols/novell/nmuser.c:2076
+#: src/protocols/novell/nmuser.c:1898
 msgid "Invalid password"
 msgstr "Неверный пароль"
 
-#: src/protocols/novell/nmuser.c:2079
+#: src/protocols/novell/nmuser.c:1901
 msgid "User not found"
 msgstr "Пользователь не найден"
 
-#: src/protocols/novell/nmuser.c:2082
+#: src/protocols/novell/nmuser.c:1904
 msgid "Account has been disabled"
 msgstr "Учётная запись была отключена"
 
-#: src/protocols/novell/nmuser.c:2085
+#: src/protocols/novell/nmuser.c:1907
 msgid "The server could not access the directory"
 msgstr "Сервер не смог получить доступ к каталогу"
 
-#: src/protocols/novell/nmuser.c:2088
+#: src/protocols/novell/nmuser.c:1910
 msgid "Your system administrator has disabled this operation"
 msgstr "Ваш системный администратор отключил эту операцию"
 
-#: src/protocols/novell/nmuser.c:2091
+#: src/protocols/novell/nmuser.c:1913
 msgid "The server is unavailable; try again later"
 msgstr "Сервер недоступен; повторите попытку позже"
 
-#: src/protocols/novell/nmuser.c:2094
+#: src/protocols/novell/nmuser.c:1916
 msgid "Cannot add a contact to the same folder twice"
 msgstr "Нельзя добавить контакт в ту же папку дважды"
 
-#: src/protocols/novell/nmuser.c:2097
+#: src/protocols/novell/nmuser.c:1919
 msgid "Cannot add yourself"
 msgstr "Нельзя добавить себя самого"
 
-#: src/protocols/novell/nmuser.c:2100
+#: src/protocols/novell/nmuser.c:1922
 msgid "Master archive is misconfigured"
 msgstr "Главный архив ненастроен"
 
-#: src/protocols/novell/nmuser.c:2104
+#: src/protocols/novell/nmuser.c:1926
 msgid "Invalid username or password"
 msgstr "Неверное имя пользователя или пароль"
 
-#: src/protocols/novell/nmuser.c:2107
+#: src/protocols/novell/nmuser.c:1929
 msgid "Could not recognize the host of the username you entered"
 msgstr "Не удалось узнать узел введённого имени пользователя"
 
-#: src/protocols/novell/nmuser.c:2110
+#: src/protocols/novell/nmuser.c:1932
 msgid ""
 "Your account has been disabled because too many invalid passwords were "
 "entered"
@@ -6959,41 +7008,41 @@
 "Ваша учётная запись была отключена, так как было введено слишком много "
 "неверных паролей"
 
-#: src/protocols/novell/nmuser.c:2113
+#: src/protocols/novell/nmuser.c:1935
 msgid "You cannot add the same person twice to a conversation"
 msgstr "Вы не можете добавить одну и ту же персону в беседу дважды"
 
-#: src/protocols/novell/nmuser.c:2117
+#: src/protocols/novell/nmuser.c:1939
 msgid "You have reached your limit for the number of contacts allowed"
 msgstr "Вы достигли предела допустимого количества контактов"
 
-#: src/protocols/novell/nmuser.c:2120
+#: src/protocols/novell/nmuser.c:1942
 msgid "You have entered an invalid username"
 msgstr "Вы ввели неверное имя пользователя"
 
-#: src/protocols/novell/nmuser.c:2123
+#: src/protocols/novell/nmuser.c:1945
 msgid "An error occurred while updating the directory"
 msgstr "Произошла ошибка при обновлении каталога"
 
-#: src/protocols/novell/nmuser.c:2126
+#: src/protocols/novell/nmuser.c:1948
 msgid "Incompatible protocol version"
 msgstr "Несовместимая версия протокола"
 
-#: src/protocols/novell/nmuser.c:2129
+#: src/protocols/novell/nmuser.c:1951
 msgid "The user has blocked you"
 msgstr "Пользователь заблокировал вас"
 
-#: src/protocols/novell/nmuser.c:2132
+#: src/protocols/novell/nmuser.c:1954
 msgid ""
 "This evaluation version does not allow more than ten users to log in at one "
 "time"
 msgstr ""
 
-#: src/protocols/novell/nmuser.c:2135
+#: src/protocols/novell/nmuser.c:1957
 msgid "The user is either offline or you are blocked"
 msgstr "Пользователь не в сети или заблокировал вас"
 
-#: src/protocols/novell/nmuser.c:2138
+#: src/protocols/novell/nmuser.c:1960
 #, c-format
 msgid "Unknown error: 0x%X"
 msgstr "Неизвестная ошибка: 0x%X"
@@ -7080,7 +7129,7 @@
 msgid "Unable to remove %s from privacy list (%s)."
 msgstr "Не удаётся удалить %s из списка конфиденциальности (%s)."
 
-#: src/protocols/novell/novell.c:920 src/protocols/novell/novell.c:1573
+#: src/protocols/novell/novell.c:920 src/protocols/novell/novell.c:1574
 #, c-format
 msgid "Unable to change server side privacy settings (%s)."
 msgstr ""
@@ -7091,11 +7140,11 @@
 msgid "Unable to create conference (%s)."
 msgstr "Не удаётся создать конференцию (%s)."
 
-#: src/protocols/novell/novell.c:1103 src/protocols/novell/novell.c:1612
+#: src/protocols/novell/novell.c:1103 src/protocols/novell/novell.c:1613
 msgid "Error communicating with server. Closing connection."
 msgstr "Ошибка связи с сервером. Закрытие соединения."
 
-#: src/protocols/novell/novell.c:1425
+#: src/protocols/novell/novell.c:1426
 msgid "Userid"
 msgstr "Идентификатор пользователя"
 
@@ -7106,46 +7155,46 @@
 #. tag, value);
 #. }
 #.
-#: src/protocols/novell/novell.c:1439
+#: src/protocols/novell/novell.c:1440
 msgid "Full name"
 msgstr "Полное Имя"
 
-#: src/protocols/novell/novell.c:1459
+#: src/protocols/novell/novell.c:1460
 msgid "User Properties"
 msgstr "Свойства пользователя"
 
-#: src/protocols/novell/novell.c:1563
+#: src/protocols/novell/novell.c:1564
 #, c-format
 msgid "GroupWise Conference %d"
 msgstr "Конференция GroupWise %d"
 
-#: src/protocols/novell/novell.c:1588
+#: src/protocols/novell/novell.c:1589
 msgid "Unable to make SSL connection to server."
 msgstr "Не удаётся установить SSL-соединение с сервером."
 
-#: src/protocols/novell/novell.c:1618
+#: src/protocols/novell/novell.c:1619
 #, c-format
 msgid "Error processing event or response (%s)."
 msgstr "Ошибка обработки события или ответа (%s)."
 
-#: src/protocols/novell/novell.c:1652
+#: src/protocols/novell/novell.c:1653
 msgid "Authenticating..."
 msgstr "Идентификация..."
 
-#: src/protocols/novell/novell.c:1667
+#: src/protocols/novell/novell.c:1668
 msgid "Waiting for response..."
 msgstr "Ожидание ответа..."
 
-#: src/protocols/novell/novell.c:1802
+#: src/protocols/novell/novell.c:1803
 #, c-format
 msgid "%s has been invited to this conversation."
 msgstr "%s был приглашён к этой беседе."
 
-#: src/protocols/novell/novell.c:1829
+#: src/protocols/novell/novell.c:1830
 msgid "Invitation to Conversation"
 msgstr "Приглашение к беседе"
 
-#: src/protocols/novell/novell.c:1830
+#: src/protocols/novell/novell.c:1831
 #, c-format
 msgid ""
 "Invitation from: %s\n"
@@ -7156,15 +7205,15 @@
 "\n"
 "Отправлено: %s"
 
-#: src/protocols/novell/novell.c:1832
+#: src/protocols/novell/novell.c:1833
 msgid "Would you like to join the conversation?"
 msgstr "Вы хотели бы присоединиться к беседе?"
 
-#: src/protocols/novell/novell.c:1937
+#: src/protocols/novell/novell.c:1938
 msgid "You have been logged out because you logged in at another workstation."
 msgstr "Вы были отключены, так как вошли с другой машины."
 
-#: src/protocols/novell/novell.c:1991
+#: src/protocols/novell/novell.c:1992
 #, c-format
 msgid ""
 "%s appears to be offline and did not receive the message that you just sent."
@@ -7176,7 +7225,7 @@
 #. *  gaim_request_fields(gc, _("Server Address"),...);
 #.
 #. ...but for now just error out with a nice message.
-#: src/protocols/novell/novell.c:2089
+#: src/protocols/novell/novell.c:2090
 msgid ""
 "Unable to connect to server. Please enter the address of the server you wish "
 "to connect to."
@@ -7184,30 +7233,30 @@
 "Не удаётся соединиться с сервером. Введите адрес сервера, с которым вы "
 "хотите соединиться."
 
-#: src/protocols/novell/novell.c:2111
+#: src/protocols/novell/novell.c:2112
 msgid "Error. SSL support is not installed."
 msgstr "Ошибка. Поддержка SSL не установлена."
 
-#: src/protocols/novell/novell.c:2420
+#: src/protocols/novell/novell.c:2421
 msgid "This conference has been closed. No more messages can be sent."
 msgstr ""
 "Эта конференция была закрыта. Больше не может быть отправлено ни одного "
 "сообщения."
 
-#: src/protocols/novell/novell.c:2727 src/protocols/oscar/oscar.c:582
-#: src/protocols/oscar/oscar.c:6473 src/protocols/yahoo/yahoo.c:2490
+#: src/protocols/novell/novell.c:2733 src/protocols/oscar/oscar.c:586
+#: src/protocols/oscar/oscar.c:6490 src/protocols/yahoo/yahoo.c:2513
 msgid "Offline"
 msgstr "Не в сети"
 
-#: src/protocols/novell/novell.c:2738
+#: src/protocols/novell/novell.c:2744
 msgid "Message"
 msgstr "Сообщение:"
 
-#: src/protocols/novell/novell.c:2837 src/protocols/novell/novell.c:2893
+#: src/protocols/novell/novell.c:2843 src/protocols/novell/novell.c:2899
 msgid "Appear Offline"
 msgstr "Вероятно не в сети"
 
-#: src/protocols/novell/novell.c:3287
+#: src/protocols/novell/novell.c:3293
 msgid "Initiate _Chat"
 msgstr "Начать разговор"
 
@@ -7222,15 +7271,15 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/novell/novell.c:3381 src/protocols/novell/novell.c:3383
+#: src/protocols/novell/novell.c:3389 src/protocols/novell/novell.c:3391
 msgid "Novell GroupWise Messenger Protocol Plugin"
 msgstr "Модуль протокола Novell GroupWise Messenger"
 
-#: src/protocols/novell/novell.c:3402
+#: src/protocols/novell/novell.c:3410
 msgid "Server address"
 msgstr "Адрес сервера"
 
-#: src/protocols/novell/novell.c:3406
+#: src/protocols/novell/novell.c:3414
 msgid "Server port"
 msgstr "Порт сервера"
 
@@ -7330,157 +7379,166 @@
 msgid "Not while on AOL"
 msgstr "Не в AOL"
 
-#: src/protocols/oscar/oscar.c:436
+#: src/protocols/oscar/oscar.c:403
+#, fuzzy
+msgid ""
+"(There was an error converting this message.  The buddy you are speaking to "
+"most likely has a buggy client.)"
+msgstr ""
+"(Ошибка преобразования этого сообщения. Проверьте параметр \"Кодировка\" в "
+"редакторе учётных записей)"
+
+#: src/protocols/oscar/oscar.c:441
 msgid "Voice"
 msgstr "Голос"
 
-#: src/protocols/oscar/oscar.c:439
+#: src/protocols/oscar/oscar.c:444
 msgid "AIM Direct IM"
 msgstr "Прямое соединение AIM"
 
-#: src/protocols/oscar/oscar.c:442 src/protocols/silc/buddy.c:1497
-#: src/protocols/silc/silc.c:635
+#: src/protocols/oscar/oscar.c:447 src/protocols/silc/silc.c:635
+#: src/protocols/silc/util.c:506
 msgid "Chat"
 msgstr "Чат"
 
-#: src/protocols/oscar/oscar.c:445 src/protocols/oscar/oscar.c:6777
+#: src/protocols/oscar/oscar.c:450 src/protocols/oscar/oscar.c:6793
 msgid "Get File"
 msgstr "Получить файл"
 
-#: src/protocols/oscar/oscar.c:452
+#: src/protocols/oscar/oscar.c:457
 msgid "Games"
 msgstr "Игры"
 
-#: src/protocols/oscar/oscar.c:455
+#: src/protocols/oscar/oscar.c:460
 msgid "Add-Ins"
 msgstr "Дополнения"
 
-#: src/protocols/oscar/oscar.c:458
+#: src/protocols/oscar/oscar.c:463
 msgid "Send Buddy List"
 msgstr "Отправить список контактов"
 
-#: src/protocols/oscar/oscar.c:461
+#: src/protocols/oscar/oscar.c:466
 msgid "ICQ Direct Connect"
 msgstr "Прямое соединение ICQ"
 
-#: src/protocols/oscar/oscar.c:464
+#: src/protocols/oscar/oscar.c:469
 msgid "AP User"
 msgstr "Пользователь AP"
 
-#: src/protocols/oscar/oscar.c:467
+#: src/protocols/oscar/oscar.c:472
 msgid "ICQ RTF"
 msgstr "ICQ RTF"
 
-#: src/protocols/oscar/oscar.c:470
+#: src/protocols/oscar/oscar.c:475
 msgid "Nihilist"
 msgstr "Нигилист"
 
-#: src/protocols/oscar/oscar.c:473
+#: src/protocols/oscar/oscar.c:478
 msgid "ICQ Server Relay"
 msgstr "Релейный сервер ICQ"
 
-#: src/protocols/oscar/oscar.c:476
+#: src/protocols/oscar/oscar.c:481
 msgid "Old ICQ UTF8"
 msgstr "Старый ICQ UTF8"
 
-#: src/protocols/oscar/oscar.c:479
+#: src/protocols/oscar/oscar.c:484
 msgid "Trillian Encryption"
 msgstr "Кодирование Trillian"
 
-#: src/protocols/oscar/oscar.c:482
+#: src/protocols/oscar/oscar.c:487
 msgid "ICQ UTF8"
 msgstr "ICQ UTF8"
 
-#: src/protocols/oscar/oscar.c:485
+#: src/protocols/oscar/oscar.c:490
 msgid "Hiptop"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:488
+#: src/protocols/oscar/oscar.c:493
 msgid "Security Enabled"
 msgstr "Безопасность включена"
 
-#: src/protocols/oscar/oscar.c:491
+#: src/protocols/oscar/oscar.c:496
 msgid "Video Chat"
 msgstr "Видеочат"
 
-#: src/protocols/oscar/oscar.c:495
+#: src/protocols/oscar/oscar.c:500
 msgid "iChat AV"
 msgstr "iChat AV"
 
-#: src/protocols/oscar/oscar.c:498
+#: src/protocols/oscar/oscar.c:503
 msgid "Live Video"
 msgstr "Живое видео"
 
-#: src/protocols/oscar/oscar.c:501
+#: src/protocols/oscar/oscar.c:506
 msgid "Camera"
 msgstr "Камера"
 
-#: src/protocols/oscar/oscar.c:520 src/protocols/oscar/oscar.c:5477
-#: src/protocols/oscar/oscar.c:6666
+#: src/protocols/oscar/oscar.c:524 src/protocols/oscar/oscar.c:5493
+#: src/protocols/oscar/oscar.c:6683
 msgid "Free For Chat"
 msgstr "Готов пообщаться"
 
-#: src/protocols/oscar/oscar.c:524 src/protocols/oscar/oscar.c:5471
-#: src/protocols/oscar/oscar.c:6664
+#: src/protocols/oscar/oscar.c:528 src/protocols/oscar/oscar.c:5487
+#: src/protocols/oscar/oscar.c:6681
 msgid "Not Available"
 msgstr "Недоступен"
 
-#: src/protocols/oscar/oscar.c:526 src/protocols/oscar/oscar.c:5474
-#: src/protocols/oscar/oscar.c:6665
+#: src/protocols/oscar/oscar.c:530 src/protocols/oscar/oscar.c:5490
+#: src/protocols/oscar/oscar.c:6682
 msgid "Occupied"
 msgstr "Занят"
 
-#: src/protocols/oscar/oscar.c:530
+#: src/protocols/oscar/oscar.c:534
 msgid "Web Aware"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:598
+#: src/protocols/oscar/oscar.c:602
 msgid "Capabilities"
 msgstr "Возможности"
 
-#: src/protocols/oscar/oscar.c:604
+#: src/protocols/oscar/oscar.c:609
 msgid "Buddy Comment"
 msgstr "Комментарий пользователя"
 
-#: src/protocols/oscar/oscar.c:739
+#: src/protocols/oscar/oscar.c:744
 #, c-format
 msgid "Direct IM with %s closed"
 msgstr "Прямое соединение с %s закрыто"
 
-#: src/protocols/oscar/oscar.c:741
+#: src/protocols/oscar/oscar.c:746
 #, c-format
 msgid "Direct IM with %s failed"
 msgstr "Не удалось создать прямое соединение с %s"
 
-#: src/protocols/oscar/oscar.c:748
+#: src/protocols/oscar/oscar.c:753
 msgid "Direct Connect failed"
 msgstr "Не удалось создать прямое соединение"
 
-#: src/protocols/oscar/oscar.c:825 src/protocols/oscar/oscar.c:956
+#: src/protocols/oscar/oscar.c:830 src/protocols/oscar/oscar.c:961
 #, c-format
 msgid "Direct IM with %s established"
 msgstr "Прямое соединение с %s установлено"
 
-#: src/protocols/oscar/oscar.c:906
+#: src/protocols/oscar/oscar.c:911
 #, c-format
 msgid "Attempting to connect to %s at %s:%hu for Direct IM."
 msgstr "Попытка создания прямого соединения с %s в %s:%hu."
 
-#: src/protocols/oscar/oscar.c:1322
+#: src/protocols/oscar/oscar.c:1328
 #, c-format
 msgid "Asking %s to connect to us at %s:%hu for Direct IM."
 msgstr "Запрос создания прямого соединения %s с нами в %s:%hu."
 
-#: src/protocols/oscar/oscar.c:1327
+#: src/protocols/oscar/oscar.c:1333
 msgid "Unable to open Direct IM"
 msgstr "Не удаётся открыть прямое соединение"
 
-#: src/protocols/oscar/oscar.c:1362
+#: src/protocols/oscar/oscar.c:1368
 #, c-format
 msgid "You have selected to open a Direct IM connection with %s."
 msgstr "Вы выбрали открытие прямого соединения с %s."
 
-#: src/protocols/oscar/oscar.c:1366
+#: src/protocols/oscar/oscar.c:1372
 msgid ""
 "Because this reveals your IP address, it may be considered a privacy risk.  "
 "Do you wish to continue?"
@@ -7488,24 +7546,24 @@
 "Так как это обнаружит ваш IP-адрес, это можно считать угрозой "
 "конфиденциальности. Хотите продолжить?"
 
-#: src/protocols/oscar/oscar.c:1370 src/protocols/oscar/oscar.c:3312
+#: src/protocols/oscar/oscar.c:1376 src/protocols/oscar/oscar.c:3328
 msgid "Connect"
 msgstr "Соединиться"
 
-#: src/protocols/oscar/oscar.c:1436 src/protocols/toc/toc.c:872
+#: src/protocols/oscar/oscar.c:1442 src/protocols/toc/toc.c:872
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "Вы были отсоединены от чата %s."
 
-#: src/protocols/oscar/oscar.c:1452
+#: src/protocols/oscar/oscar.c:1458
 msgid "Chat is currently unavailable"
 msgstr "Чат сейчас недоступен"
 
-#: src/protocols/oscar/oscar.c:1533
+#: src/protocols/oscar/oscar.c:1539
 msgid "Screen name sent"
 msgstr "Идентификатор пользователя отправлен"
 
-#: src/protocols/oscar/oscar.c:1547
+#: src/protocols/oscar/oscar.c:1553
 #, c-format
 msgid ""
 "Unable to login: Could not sign on as %s because the screen name is "
@@ -7513,46 +7571,46 @@
 "letters, numbers and spaces, or contain only numbers."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:1575
+#: src/protocols/oscar/oscar.c:1581
 msgid "Unable to login to AIM"
 msgstr "Не удаётся войти в сеть AIM"
 
-#: src/protocols/oscar/oscar.c:1676 src/protocols/oscar/oscar.c:2103
+#: src/protocols/oscar/oscar.c:1682 src/protocols/oscar/oscar.c:2119
 msgid "Could Not Connect"
 msgstr "Не удалось установить соединение"
 
-#: src/protocols/oscar/oscar.c:1684
+#: src/protocols/oscar/oscar.c:1690
 msgid "Connection established, cookie sent"
 msgstr "Соединение установлено, данные отправлены"
 
-#: src/protocols/oscar/oscar.c:1797 src/protocols/yahoo/yahoo_filexfer.c:180
+#: src/protocols/oscar/oscar.c:1803 src/protocols/yahoo/yahoo_filexfer.c:180
 #: src/protocols/yahoo/yahoo_filexfer.c:189
 #: src/protocols/yahoo/yahoo_filexfer.c:199
 msgid "Unable to establish file descriptor."
 msgstr "Не удаётся установить дескриптор файла."
 
-#: src/protocols/oscar/oscar.c:1802
+#: src/protocols/oscar/oscar.c:1808
 msgid "Unable to create new connection."
 msgstr "Не удаётся создать новое соединение."
 
-#: src/protocols/oscar/oscar.c:1873
+#: src/protocols/oscar/oscar.c:1879
 msgid "Unable to establish listener socket."
 msgstr "Не удаётся установить сокет для прослушивания."
 
-#: src/protocols/oscar/oscar.c:1987 src/protocols/toc/toc.c:541
+#: src/protocols/oscar/oscar.c:2003 src/protocols/toc/toc.c:541
 msgid "Incorrect nickname or password."
 msgstr "Некорректный псевдоним или пароль."
 
-#: src/protocols/oscar/oscar.c:1992
+#: src/protocols/oscar/oscar.c:2008
 msgid "Your account is currently suspended."
 msgstr "Ваша учётная запись сейчас заблокирована."
 
 #. service temporarily unavailable
-#: src/protocols/oscar/oscar.c:1996
+#: src/protocols/oscar/oscar.c:2012
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr "Служба AOL Instant Messenger временно недоступна."
 
-#: src/protocols/oscar/oscar.c:2001
+#: src/protocols/oscar/oscar.c:2017
 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."
@@ -7560,21 +7618,21 @@
 "Вы соединялись и отсоединялись слишком часто. Подождите 10 минут и "
 "попытайтесь снова. Если вы продолжите попытки, вам придётся ждать ещё дольше."
 
-#: src/protocols/oscar/oscar.c:2006
+#: src/protocols/oscar/oscar.c:2022
 #, c-format
 msgid "The client version you are using is too old. Please upgrade at %s"
 msgstr "Версия клиента, которой вы пользуетесь, слишком стара. Обновите до %s"
 
-#: src/protocols/oscar/oscar.c:2038
+#: src/protocols/oscar/oscar.c:2054
 msgid "Internal Error"
 msgstr "Внутренняя ошибка"
 
-#: src/protocols/oscar/oscar.c:2110
+#: src/protocols/oscar/oscar.c:2126
 msgid "Received authorization"
 msgstr "Принята авторизация"
 
-#: src/protocols/oscar/oscar.c:2146 src/protocols/oscar/oscar.c:2176
-#: src/protocols/oscar/oscar.c:2264
+#: src/protocols/oscar/oscar.c:2162 src/protocols/oscar/oscar.c:2192
+#: src/protocols/oscar/oscar.c:2280
 #, c-format
 msgid ""
 "You may be disconnected shortly.  You may want to use TOC until this is "
@@ -7583,24 +7641,24 @@
 "Вы можете быть скоро отсоединены. Возможно, вы захотите использовать TOC, "
 "пока это не будет исправлено. Смотрите обновления на %s."
 
-#: src/protocols/oscar/oscar.c:2149 src/protocols/oscar/oscar.c:2179
+#: src/protocols/oscar/oscar.c:2165 src/protocols/oscar/oscar.c:2195
 msgid "Gaim was unable to get a valid AIM login hash."
 msgstr "Gaim не удалось получить допустимый хэш входа AIM."
 
-#: src/protocols/oscar/oscar.c:2267
+#: src/protocols/oscar/oscar.c:2283
 msgid "Gaim was unable to get a valid login hash."
 msgstr "Gaim не удалось получить допустимый хэш входа."
 
-#: src/protocols/oscar/oscar.c:3096 src/protocols/oscar/oscar.c:3118
+#: src/protocols/oscar/oscar.c:3112 src/protocols/oscar/oscar.c:3134
 msgid "(There was an error receiving this message)"
 msgstr "(При приёме этого сообщения была ошибка)"
 
-#: src/protocols/oscar/oscar.c:3304
+#: src/protocols/oscar/oscar.c:3320
 #, c-format
 msgid "%s has just asked to directly connect to %s"
 msgstr "%s запросил прямое соединение с %s"
 
-#: src/protocols/oscar/oscar.c:3307
+#: src/protocols/oscar/oscar.c:3323
 msgid ""
 "This requires a direct connection between the two computers and is necessary "
 "for IM Images.  Because your IP address will be revealed, this may be "
@@ -7610,19 +7668,19 @@
 "необходимым для изображений. Так как ваш IP-адрес будет обнаружен, это можно "
 "считать угрозой конфиденциальности."
 
-#: src/protocols/oscar/oscar.c:3343
+#: src/protocols/oscar/oscar.c:3359
 msgid "Please authorize me so I can add you to my buddy list."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:3351
+#: src/protocols/oscar/oscar.c:3367
 msgid "Authorization Request Message:"
 msgstr "Сообщение запроса авторизации:"
 
-#: src/protocols/oscar/oscar.c:3352
+#: src/protocols/oscar/oscar.c:3368
 msgid "Please authorize me!"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:3382
+#: src/protocols/oscar/oscar.c:3398
 #, c-format
 msgid ""
 "The user %s requires authorization before being added to a buddy list.  Do "
@@ -7631,23 +7689,23 @@
 "Пользователь %s требует авторизацию перед добавлением его в список "
 "контактов. Хотите отправить запрос авторизации?"
 
-#: src/protocols/oscar/oscar.c:3387 src/protocols/oscar/oscar.c:3389
+#: src/protocols/oscar/oscar.c:3403 src/protocols/oscar/oscar.c:3405
 msgid "Request Authorization"
 msgstr "Запросить авторизацию"
 
-#: src/protocols/oscar/oscar.c:3437 src/protocols/oscar/oscar.c:3439
-#: src/protocols/oscar/oscar.c:3446 src/protocols/oscar/oscar.c:3528
-#: src/protocols/oscar/oscar.c:3548 src/protocols/oscar/oscar.c:3902
-#: src/protocols/oscar/oscar.c:3962 src/protocols/oscar/oscar.c:6092
-#: src/protocols/oscar/oscar.c:6138
+#: src/protocols/oscar/oscar.c:3453 src/protocols/oscar/oscar.c:3455
+#: src/protocols/oscar/oscar.c:3462 src/protocols/oscar/oscar.c:3544
+#: src/protocols/oscar/oscar.c:3564 src/protocols/oscar/oscar.c:3918
+#: src/protocols/oscar/oscar.c:3978 src/protocols/oscar/oscar.c:6109
+#: src/protocols/oscar/oscar.c:6155
 msgid "No reason given."
 msgstr "Причина не указана."
 
-#: src/protocols/oscar/oscar.c:3445
+#: src/protocols/oscar/oscar.c:3461
 msgid "Authorization Denied Message:"
 msgstr "Сообщение отказа в авторизации:"
 
-#: src/protocols/oscar/oscar.c:3528
+#: src/protocols/oscar/oscar.c:3544
 #, c-format
 msgid ""
 "The user %u wants to add you to their buddy list for the following reason:\n"
@@ -7657,32 +7715,32 @@
 "причине:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:3536 src/protocols/oscar/oscar.c:6098
+#: src/protocols/oscar/oscar.c:3552 src/protocols/oscar/oscar.c:6115
 msgid "Authorization Request"
 msgstr "Запрос авторизации"
 
-#: src/protocols/oscar/oscar.c:3548
+#: src/protocols/oscar/oscar.c:3564
 #, c-format
 msgid ""
 "The user %u has denied your request to add them to your buddy list for the "
 "following reason:\n"
 "%s"
 msgstr ""
-"Пользователь %u отказал в вашей просьбе добавить его в ваш список контактов "
-"по следующей причине:\n"
+"Пользователь %u не разрешил добавить его в ваш список контактов по следующей "
+"причине:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:3549
+#: src/protocols/oscar/oscar.c:3565
 msgid "ICQ authorization denied."
 msgstr "В авторизации ICQ отказано."
 
 #. Someone has granted you authorization
-#: src/protocols/oscar/oscar.c:3556
+#: src/protocols/oscar/oscar.c:3572
 #, c-format
 msgid "The user %u has granted your request to add them to your buddy list."
 msgstr "Пользователь %u дал своё согласие добавить его в ваш список контактов."
 
-#: src/protocols/oscar/oscar.c:3564
+#: src/protocols/oscar/oscar.c:3580
 #, c-format
 msgid ""
 "You have received a special message\n"
@@ -7695,7 +7753,7 @@
 "От: %s [%s]\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:3572
+#: src/protocols/oscar/oscar.c:3588
 #, c-format
 msgid ""
 "You have received an ICQ page\n"
@@ -7708,7 +7766,7 @@
 "От: %s [%s]\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:3580
+#: src/protocols/oscar/oscar.c:3596
 #, c-format
 msgid ""
 "You have received an ICQ email from %s [%s]\n"
@@ -7721,27 +7779,27 @@
 "Сообщение:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:3601
+#: src/protocols/oscar/oscar.c:3617
 #, c-format
 msgid "ICQ user %u has sent you a buddy: %s (%s)"
 msgstr "Пользователь ICQ %u отправил вам контакт: %s (%s)"
 
-#: src/protocols/oscar/oscar.c:3607
+#: src/protocols/oscar/oscar.c:3623
 msgid "Do you want to add this buddy to your buddy list?"
 msgstr "Хотите добавить этого пользователя в список контактов?"
 
-#: src/protocols/oscar/oscar.c:3611
+#: src/protocols/oscar/oscar.c:3627
 msgid "Decline"
 msgstr "Отклонить"
 
-#: src/protocols/oscar/oscar.c:3696
+#: src/protocols/oscar/oscar.c:3712
 #, 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] "Вы не получили %hu сообщение от %s, так как оно было некорректно."
 msgstr[1] "Вы не получили %hu сообщений от %s, так как они были некорректны."
 
-#: src/protocols/oscar/oscar.c:3705
+#: src/protocols/oscar/oscar.c:3721
 #, 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."
@@ -7750,7 +7808,7 @@
 msgstr[1] ""
 "Вы не получили %hu сообщений от %s, так как они были слишком велики."
 
-#: src/protocols/oscar/oscar.c:3714
+#: src/protocols/oscar/oscar.c:3730
 #, c-format
 msgid ""
 "You missed %hu message from %s because the rate limit has been exceeded."
@@ -7761,7 +7819,7 @@
 msgstr[1] ""
 "Вы не получили %hu сообщений от %s, так как был превышен предел оценки."
 
-#: src/protocols/oscar/oscar.c:3723
+#: src/protocols/oscar/oscar.c:3739
 #, 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."
@@ -7770,7 +7828,7 @@
 msgstr[1] ""
 "Вы не получили %hu сообщений от %s, потому что он слишком надоедлив."
 
-#: src/protocols/oscar/oscar.c:3732
+#: src/protocols/oscar/oscar.c:3748
 #, 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."
@@ -7779,61 +7837,56 @@
 msgstr[1] ""
 "Вы не получили %hu сообщений от %s, потому что вы слишком надоедливы."
 
-#: src/protocols/oscar/oscar.c:3741
+#: src/protocols/oscar/oscar.c:3757
 #, 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] "Вы не получили %hu сообщение от %s по неизвестной причине."
 msgstr[1] "Вы не получили %hu сообщений от %s по неизвестной причине."
 
-#: src/protocols/oscar/oscar.c:3798 src/protocols/oscar/oscar.c:4022
+#: src/protocols/oscar/oscar.c:3814 src/protocols/oscar/oscar.c:4038
 #, c-format
 msgid "Info for %s"
 msgstr "Информация для %s"
 
-#: src/protocols/oscar/oscar.c:3803
-#, c-format
-msgid "<B>UIN:</B> %s<BR><B>Status:</B> %s<HR>%s"
-msgstr "<B>UIN:</B> %s<BR><B>Статус:</B> %s<HR>%s"
-
-#: src/protocols/oscar/oscar.c:3864
+#: src/protocols/oscar/oscar.c:3880
 #, c-format
 msgid "SNAC threw error: %s\n"
 msgstr "SNAC вызвал ошибку: %s\n"
 
-#: src/protocols/oscar/oscar.c:3865
+#: src/protocols/oscar/oscar.c:3881
 msgid "Unknown error"
 msgstr "Неизвестная ошибка"
 
 #. Data is assumed to be the destination sn
-#: src/protocols/oscar/oscar.c:3900
+#: src/protocols/oscar/oscar.c:3916
 #, c-format
 msgid "Your message to %s did not get sent:"
 msgstr "Ваше сообщение для %s не было отправлено:"
 
-#: src/protocols/oscar/oscar.c:3959
+#: src/protocols/oscar/oscar.c:3975
 #, c-format
 msgid "User information for %s unavailable:"
 msgstr "Информация о пользователе %s недоступна:"
 
-#: src/protocols/oscar/oscar.c:3982
+#: src/protocols/oscar/oscar.c:3998
 msgid "Warning Level"
 msgstr "Уровень предупреждения"
 
-#: src/protocols/oscar/oscar.c:3985
+#: src/protocols/oscar/oscar.c:4001
 msgid "Online Since"
 msgstr "В сети с"
 
-#: src/protocols/oscar/oscar.c:3989 src/protocols/yahoo/yahoo_profile.c:1113
+#: src/protocols/oscar/oscar.c:4005 src/protocols/yahoo/yahoo_profile.c:1118
 msgid "Member Since"
 msgstr "Член с"
 
-#: src/protocols/oscar/oscar.c:4073
+#: src/protocols/oscar/oscar.c:4089
 msgid "Your AIM connection may be lost."
 msgstr "Ваше соединение AIM может быть разорвано."
 
 #. The conversion failed!
-#: src/protocols/oscar/oscar.c:4259
+#: src/protocols/oscar/oscar.c:4275
 msgid ""
 "[Unable to display a message from this user because it contained invalid "
 "characters.]"
@@ -7841,11 +7894,11 @@
 "[Не удаётся отобразить сообщение от этого пользователя, так как оно содержит "
 "недопустимые символы.]"
 
-#: src/protocols/oscar/oscar.c:4476
+#: src/protocols/oscar/oscar.c:4492
 msgid "Rate limiting error."
 msgstr "Ошибка ограничения предела."
 
-#: src/protocols/oscar/oscar.c:4477
+#: src/protocols/oscar/oscar.c:4493
 msgid ""
 "The last action you attempted could not be performed because you are over "
 "the rate limit. Please wait 10 seconds and try again."
@@ -7853,7 +7906,7 @@
 "Не удалось выполнить последнее действие, так как вы превысили предел. "
 "Подождите 10 секунд и попытайтесь снова."
 
-#: src/protocols/oscar/oscar.c:4540
+#: src/protocols/oscar/oscar.c:4556
 msgid ""
 "You have been disconnected because you have signed on with this screen name "
 "at another location."
@@ -7861,113 +7914,113 @@
 "Вы были отсоединены, так как вошли с этим идентификатором пользователя из "
 "другого места."
 
-#: src/protocols/oscar/oscar.c:4542
+#: src/protocols/oscar/oscar.c:4558
 msgid "You have been signed off for an unknown reason."
 msgstr "Вы были отключены по неизвестной причине."
 
-#: src/protocols/oscar/oscar.c:4573
+#: src/protocols/oscar/oscar.c:4589
 msgid "Finalizing connection"
 msgstr "Завершение установления соединения"
 
-#: src/protocols/oscar/oscar.c:4843 src/protocols/oscar/oscar.c:4850
+#: src/protocols/oscar/oscar.c:4859 src/protocols/oscar/oscar.c:4866
 msgid "Email Address"
 msgstr "Адрес Email"
 
-#: src/protocols/oscar/oscar.c:4855 src/protocols/silc/buddy.c:1524
+#: src/protocols/oscar/oscar.c:4871 src/protocols/silc/util.c:538
 msgid "Mobile Phone"
 msgstr "Мобильный телефон"
 
-#: src/protocols/oscar/oscar.c:4856
+#: src/protocols/oscar/oscar.c:4872
 msgid "Not specified"
 msgstr "Не указано"
 
-#: src/protocols/oscar/oscar.c:4857 src/protocols/trepia/trepia.c:281
+#: src/protocols/oscar/oscar.c:4873 src/protocols/trepia/trepia.c:281
 #: src/protocols/trepia/trepia.c:407
 msgid "Female"
 msgstr "Женщина"
 
-#: src/protocols/oscar/oscar.c:4857 src/protocols/trepia/trepia.c:280
+#: src/protocols/oscar/oscar.c:4873 src/protocols/trepia/trepia.c:280
 #: src/protocols/trepia/trepia.c:407
 msgid "Male"
 msgstr "Мужчина"
 
-#: src/protocols/oscar/oscar.c:4873
+#: src/protocols/oscar/oscar.c:4889
 msgid "Personal Web Page"
 msgstr "Персональная Web-страница"
 
-#: src/protocols/oscar/oscar.c:4877
+#: src/protocols/oscar/oscar.c:4893
 msgid "Additional Information"
 msgstr "Дополнительная информация"
 
-#: src/protocols/oscar/oscar.c:4882
-msgid "Home Address"
-msgstr "Домашний адрес"
-
-#: src/protocols/oscar/oscar.c:4886 src/protocols/oscar/oscar.c:4894
-msgid "Zip Code"
-msgstr "Индекс"
-
-#: src/protocols/oscar/oscar.c:4890
-msgid "Work Address"
-msgstr "Рабочий адрес"
-
 #: src/protocols/oscar/oscar.c:4898
+msgid "Home Address"
+msgstr "Домашний адрес"
+
+#: src/protocols/oscar/oscar.c:4902 src/protocols/oscar/oscar.c:4910
+msgid "Zip Code"
+msgstr "Индекс"
+
+#: src/protocols/oscar/oscar.c:4906
+msgid "Work Address"
+msgstr "Рабочий адрес"
+
+#: src/protocols/oscar/oscar.c:4914
 msgid "Work Information"
 msgstr "Информация о работе"
 
-#: src/protocols/oscar/oscar.c:4899
+#: src/protocols/oscar/oscar.c:4915
 msgid "Company"
 msgstr "Компания"
 
-#: src/protocols/oscar/oscar.c:4900
+#: src/protocols/oscar/oscar.c:4916
 msgid "Division"
 msgstr "Отдел"
 
-#: src/protocols/oscar/oscar.c:4901
+#: src/protocols/oscar/oscar.c:4917
 msgid "Position"
 msgstr "Должность"
 
-#: src/protocols/oscar/oscar.c:4903
+#: src/protocols/oscar/oscar.c:4919
 msgid "Web Page"
 msgstr "Web-страница"
 
-#: src/protocols/oscar/oscar.c:4909
+#: src/protocols/oscar/oscar.c:4925
 #, c-format
 msgid "ICQ Info for %s"
 msgstr "ICQ-информация для %s"
 
-#: src/protocols/oscar/oscar.c:4958
+#: src/protocols/oscar/oscar.c:4974
 msgid "Pop-Up Message"
 msgstr "Всплывающее сообщение"
 
-#: src/protocols/oscar/oscar.c:4979
+#: src/protocols/oscar/oscar.c:4995
 #, c-format
 msgid "The following screen names are associated with %s"
 msgstr "Следующие идентификаторы пользователя соотнесены с %s"
 
-#: src/protocols/oscar/oscar.c:4983
+#: src/protocols/oscar/oscar.c:4999
 msgid "Search Results"
 msgstr "Результаты поиска"
 
-#: src/protocols/oscar/oscar.c:5000
+#: src/protocols/oscar/oscar.c:5016
 #, c-format
 msgid "No results found for email address %s"
 msgstr "Ничего не найдено для адреса email %s"
 
-#: src/protocols/oscar/oscar.c:5021
+#: src/protocols/oscar/oscar.c:5037
 #, c-format
 msgid "You should receive an email asking to confirm %s."
 msgstr "Вы должны получить email с просьбой подтверждить %s."
 
-#: src/protocols/oscar/oscar.c:5023
+#: src/protocols/oscar/oscar.c:5039
 msgid "Account Confirmation Requested"
 msgstr "Запрошено подтверждение учётной записи"
 
-#: src/protocols/oscar/oscar.c:5051
+#: src/protocols/oscar/oscar.c:5067
 msgid "Error Changing Account Info"
 msgstr "Ошибка изменения информации об учётной записи"
 
-#: src/protocols/oscar/oscar.c:5054
+#: src/protocols/oscar/oscar.c:5070
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
@@ -7976,7 +8029,7 @@
 "Ошибка 0x%04x: Не удаётся отформатировать идентификатор пользователя, так "
 "как запрошенный идентификатор пользователя отличается от оригинального."
 
-#: src/protocols/oscar/oscar.c:5057
+#: src/protocols/oscar/oscar.c:5073
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
@@ -7985,7 +8038,7 @@
 "Ошибка 0x%04x: Не удаётся отформатировать идентификатор пользователя, так "
 "как запрошенный идентификатор пользователя оканчивается пробелом."
 
-#: src/protocols/oscar/oscar.c:5060
+#: src/protocols/oscar/oscar.c:5076
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
@@ -7994,14 +8047,14 @@
 "Ошибка 0x%04x: Не удаётся отформатировать идентификатор пользователя, так "
 "как запрошенный идентификатор пользователя слишком велик."
 
-#: src/protocols/oscar/oscar.c:5063
+#: src/protocols/oscar/oscar.c:5079
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change email address because there is already a "
 "request pending for this screen name."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:5066
+#: src/protocols/oscar/oscar.c:5082
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change email address because the given address has "
@@ -8010,7 +8063,7 @@
 "Ошибка 0x%04x: Не удаётся изменить адрес email, так как с заданным адресом "
 "соотнесено слишком много идентификаторов пользователя."
 
-#: src/protocols/oscar/oscar.c:5069
+#: src/protocols/oscar/oscar.c:5085
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change email address because the given address is "
@@ -8019,12 +8072,12 @@
 "Ошибка 0x%04x: Не удаётся изменить адрес email, так как заданный адрес "
 "неверен."
 
-#: src/protocols/oscar/oscar.c:5072
+#: src/protocols/oscar/oscar.c:5088
 #, c-format
 msgid "Error 0x%04x: Unknown error."
 msgstr "Ошибка 0x%04x: Неизвестная ошибка."
 
-#: src/protocols/oscar/oscar.c:5082
+#: src/protocols/oscar/oscar.c:5098
 #, c-format
 msgid ""
 "Your screen name is currently formatted as follows:\n"
@@ -8033,34 +8086,34 @@
 "Сейчас ваш идентификатор пользователя отформатирован следующим образом:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:5083 src/protocols/oscar/oscar.c:5090
+#: src/protocols/oscar/oscar.c:5099 src/protocols/oscar/oscar.c:5106
 msgid "Account Info"
 msgstr "Информация об учётной записи"
 
-#: src/protocols/oscar/oscar.c:5088
+#: src/protocols/oscar/oscar.c:5104
 #, c-format
 msgid "The email address for %s is %s"
 msgstr "Адрес email для %s: %s"
 
-#: src/protocols/oscar/oscar.c:5153
+#: src/protocols/oscar/oscar.c:5169
 msgid ""
 "Your IM Image was not sent. You must be Direct Connected to send IM Images."
 msgstr ""
 "Ваше изображение не было отправлено. Вы должны иметь прямое соединение для "
 "отправки изображений."
 
-#: src/protocols/oscar/oscar.c:5326
+#: src/protocols/oscar/oscar.c:5342
 msgid "Unable to set AIM profile."
 msgstr "Не удаётся установить профиль AIM."
 
-#: src/protocols/oscar/oscar.c:5327
+#: src/protocols/oscar/oscar.c:5343
 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 ""
 
-#: src/protocols/oscar/oscar.c:5354
+#: src/protocols/oscar/oscar.c:5370
 #, c-format
 msgid ""
 "The maximum profile length of %d byte has been exceeded.  Gaim has truncated "
@@ -8071,26 +8124,26 @@
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/protocols/oscar/oscar.c:5359
+#: src/protocols/oscar/oscar.c:5375
 msgid "Profile too long."
 msgstr "Профиль слишком велик."
 
-#: src/protocols/oscar/oscar.c:5375 src/protocols/oscar/oscar.c:6671
+#: src/protocols/oscar/oscar.c:5391 src/protocols/oscar/oscar.c:6688
 msgid "Visible"
 msgstr "Видимый"
 
-#: src/protocols/oscar/oscar.c:5393
+#: src/protocols/oscar/oscar.c:5409
 msgid "Unable to set AIM away message."
 msgstr "Не удаётся установить сообщение об отсутствии для AIM."
 
-#: src/protocols/oscar/oscar.c:5394
+#: src/protocols/oscar/oscar.c:5410
 msgid ""
 "You have probably requested to set your away message before the login "
 "procedure completed.  You remain in a \"present\" state; try setting it "
 "again when you are fully connected."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:5434
+#: src/protocols/oscar/oscar.c:5450
 #, c-format
 msgid ""
 "The maximum away message length of %d byte has been exceeded.  Gaim has "
@@ -8101,11 +8154,11 @@
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/protocols/oscar/oscar.c:5439
+#: src/protocols/oscar/oscar.c:5455
 msgid "Away message too long."
 msgstr "Сообщение об отсутствии слишком велико."
 
-#: src/protocols/oscar/oscar.c:5517
+#: src/protocols/oscar/oscar.c:5533
 #, c-format
 msgid ""
 "Could not add the buddy %s because the screen name is invalid.  Screen names "
@@ -8113,16 +8166,16 @@
 "spaces, or contain only numbers."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:5518 src/protocols/oscar/oscar.c:5959
-#: src/protocols/oscar/oscar.c:5972
+#: src/protocols/oscar/oscar.c:5534 src/protocols/oscar/oscar.c:5976
+#: src/protocols/oscar/oscar.c:5989
 msgid "Unable To Add"
 msgstr "Не удаётся добавить"
 
-#: src/protocols/oscar/oscar.c:5678
+#: src/protocols/oscar/oscar.c:5695
 msgid "Unable To Retrieve Buddy List"
 msgstr "Не удаётся загрузить список контактов"
 
-#: src/protocols/oscar/oscar.c:5679
+#: src/protocols/oscar/oscar.c:5696
 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 "
@@ -8132,13 +8185,13 @@
 "Список контактов не потерян и, вероятно, станет доступен в течение "
 "нескольких часов."
 
-#: src/protocols/oscar/oscar.c:5855 src/protocols/oscar/oscar.c:5856
-#: src/protocols/oscar/oscar.c:5861 src/protocols/oscar/oscar.c:6016
-#: src/protocols/oscar/oscar.c:6017 src/protocols/oscar/oscar.c:6022
+#: src/protocols/oscar/oscar.c:5872 src/protocols/oscar/oscar.c:5873
+#: src/protocols/oscar/oscar.c:5878 src/protocols/oscar/oscar.c:6033
+#: src/protocols/oscar/oscar.c:6034 src/protocols/oscar/oscar.c:6039
 msgid "Orphans"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:5958
+#: src/protocols/oscar/oscar.c:5975
 #, c-format
 msgid ""
 "Could not add the buddy %s because you have too many buddies in your buddy "
@@ -8147,11 +8200,11 @@
 "Не удалось добавить пользователя %s, так как в списке контактов слишком "
 "много пользователей.Удалите одного и попытайтесь снова."
 
-#: src/protocols/oscar/oscar.c:5958 src/protocols/oscar/oscar.c:5971
+#: src/protocols/oscar/oscar.c:5975 src/protocols/oscar/oscar.c:5988
 msgid "(no name)"
 msgstr "(нет имени)"
 
-#: src/protocols/oscar/oscar.c:5971
+#: src/protocols/oscar/oscar.c:5988
 #, c-format
 msgid ""
 "Could not add the buddy %s for an unknown reason.  The most common reason "
@@ -8159,20 +8212,20 @@
 "buddy list."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:6053
+#: src/protocols/oscar/oscar.c:6070
 #, c-format
 msgid ""
 "The user %s has given you permission to add you to their buddy list.  Do you "
 "want to add them?"
 msgstr ""
-"Пользователь %s разрешил вам добавить его в ваш список контактов. Хотите "
+"Пользователь %s разрешил добавить его в ваш список контактов. Хотите "
 "добавить его?"
 
-#: src/protocols/oscar/oscar.c:6059
+#: src/protocols/oscar/oscar.c:6076
 msgid "Authorization Given"
 msgstr "Авторизация дана"
 
-#: src/protocols/oscar/oscar.c:6092
+#: src/protocols/oscar/oscar.c:6109
 #, c-format
 msgid ""
 "The user %s wants to add you to their buddy list for the following reason:\n"
@@ -8183,96 +8236,96 @@
 "%s"
 
 #. Granted
-#: src/protocols/oscar/oscar.c:6134
+#: src/protocols/oscar/oscar.c:6151
 #, c-format
 msgid "The user %s has granted your request to add them to your buddy list."
-msgstr "Пользователь %s разрешил вам добавить его в ваш список контактов."
-
-#: src/protocols/oscar/oscar.c:6135
+msgstr "Пользователь %s разрешил добавить его в ваш список контактов."
+
+#: src/protocols/oscar/oscar.c:6152
 msgid "Authorization Granted"
 msgstr "Авторизация дана"
 
 #. Denied
-#: src/protocols/oscar/oscar.c:6138
+#: src/protocols/oscar/oscar.c:6155
 #, c-format
 msgid ""
 "The user %s has denied your request to add them to your buddy list for the "
 "following reason:\n"
 "%s"
 msgstr ""
-"Пользователь %s не разрешил вам добавить его в ваш список контактов по "
-"следующей причине:\n"
+"Пользователь %s не разрешил добавить его в ваш список контактов по следующей "
+"причине:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:6139
+#: src/protocols/oscar/oscar.c:6156
 msgid "Authorization Denied"
 msgstr "В авторизации отказано"
 
-#: src/protocols/oscar/oscar.c:6176 src/protocols/toc/toc.c:1271
+#: src/protocols/oscar/oscar.c:6193 src/protocols/toc/toc.c:1271
 msgid "_Exchange:"
 msgstr "Обмен:"
 
-#: src/protocols/oscar/oscar.c:6198
+#: src/protocols/oscar/oscar.c:6215
 msgid "Invalid chat name specified."
 msgstr "Указано неверное имя чата."
 
-#: src/protocols/oscar/oscar.c:6288
+#: src/protocols/oscar/oscar.c:6305
 msgid "Your IM Image was not sent. You cannot send IM Images in AIM chats."
 msgstr ""
 "Изображение не было отправлено. Вы не можете отправлять изображения в чатах "
 "AIM."
 
-#: src/protocols/oscar/oscar.c:6445
+#: src/protocols/oscar/oscar.c:6462
 msgid "Away Message"
 msgstr "Сообщение об отсутствии"
 
-#: src/protocols/oscar/oscar.c:6729
+#: src/protocols/oscar/oscar.c:6746
 msgid "Buddy Comment:"
 msgstr "Комментарий пользователя:"
 
-#: src/protocols/oscar/oscar.c:6747
+#: src/protocols/oscar/oscar.c:6764
 msgid "Edit Buddy Comment"
 msgstr "Изменить комментарий пользователя"
 
-#: src/protocols/oscar/oscar.c:6753
+#: src/protocols/oscar/oscar.c:6770
 msgid "Get Status Msg"
 msgstr "Получить сообщение о статусе"
 
-#: src/protocols/oscar/oscar.c:6765
+#: src/protocols/oscar/oscar.c:6782
 msgid "Direct IM"
 msgstr "Прямое соединение"
 
-#: src/protocols/oscar/oscar.c:6788
+#: src/protocols/oscar/oscar.c:6804
 msgid "Re-request Authorization"
 msgstr "Повторный запрос авторизации"
 
-#: src/protocols/oscar/oscar.c:6818
+#: src/protocols/oscar/oscar.c:6834
 msgid "The new formatting is invalid."
 msgstr "Новое форматирование недопустимо."
 
-#: src/protocols/oscar/oscar.c:6819
+#: src/protocols/oscar/oscar.c:6835
 msgid "Screen name formatting can change only capitalization and whitespace."
 msgstr ""
 "Форматирование идентификатора пользователя может влиять только на регистр "
 "букв и пробелы."
 
-#: src/protocols/oscar/oscar.c:6826
+#: src/protocols/oscar/oscar.c:6842
 msgid "New screen name formatting:"
 msgstr "Новое форматирование идентификатора пользователя:"
 
-#: src/protocols/oscar/oscar.c:6878
+#: src/protocols/oscar/oscar.c:6894
 msgid "Change Address To:"
 msgstr "Изменить адрес на:"
 
-#: src/protocols/oscar/oscar.c:6923
+#: src/protocols/oscar/oscar.c:6939
 msgid "<i>you are not waiting for authorization</i>"
 msgstr "<i>вы не ожидаете авторизацию</i>"
 
-#: src/protocols/oscar/oscar.c:6926
+#: src/protocols/oscar/oscar.c:6942
 msgid "You are awaiting authorization from the following buddies"
 msgstr "Вы ожидаете авторизацию от следующих пользователей"
 
-#: src/protocols/oscar/oscar.c:6927
+#: src/protocols/oscar/oscar.c:6943
 msgid ""
 "You can re-request authorization from these buddies by right-clicking on "
 "them and selecting \"Re-request Authorization.\""
@@ -8280,75 +8333,75 @@
 "Вы можете запросить авторизацию от этих пользователей повторно, щёлкнув на "
 "них правой кнопкой мыши и выбрав \"Повторный запрос авторизации\"."
 
-#: src/protocols/oscar/oscar.c:6944
+#: src/protocols/oscar/oscar.c:6960
 msgid "Find Buddy by E-mail"
 msgstr "Найти пользователя по E-mail"
 
-#: src/protocols/oscar/oscar.c:6945
+#: src/protocols/oscar/oscar.c:6961
 msgid "Search for a buddy by e-mail address"
 msgstr "Искать пользователя по адресу e-mail"
 
-#: src/protocols/oscar/oscar.c:6946
+#: src/protocols/oscar/oscar.c:6962
 msgid "Type the e-mail address of the buddy you are searching for."
 msgstr "Введите адрес e-mail пользователя, которого вы ищете."
 
-#: src/protocols/oscar/oscar.c:6963
+#: src/protocols/oscar/oscar.c:6979
 msgid "Available Message:"
 msgstr "Статусное сообщение:"
 
-#: src/protocols/oscar/oscar.c:6964
+#: src/protocols/oscar/oscar.c:6980
 msgid "I'm doing work and hoping for a distraction--IM me!"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:7045 src/protocols/silc/silc.c:786
+#: src/protocols/oscar/oscar.c:7061 src/protocols/silc/silc.c:789
 msgid "Set User Info..."
 msgstr "Установить информацию о пользователе..."
 
-#: src/protocols/oscar/oscar.c:7050
+#: src/protocols/oscar/oscar.c:7066
 msgid "Set User Info (URL)..."
 msgstr "Установить информацию о пользователе (URL)..."
 
-#: src/protocols/oscar/oscar.c:7056
+#: src/protocols/oscar/oscar.c:7072
 msgid "Set Available Message..."
 msgstr "Установить статусное сообщение..."
 
-#: src/protocols/oscar/oscar.c:7061 src/protocols/silc/silc.c:782
+#: src/protocols/oscar/oscar.c:7077 src/protocols/silc/silc.c:785
 msgid "Change Password..."
 msgstr "Изменить пароль..."
 
-#: src/protocols/oscar/oscar.c:7066
+#: src/protocols/oscar/oscar.c:7082
 msgid "Change Password (URL)"
 msgstr "Изменить пароль (URL)"
 
-#: src/protocols/oscar/oscar.c:7070
+#: src/protocols/oscar/oscar.c:7086
 msgid "Configure IM Forwarding (URL)"
 msgstr "Настроить перенаправление сообщений (URL)"
 
-#: src/protocols/oscar/oscar.c:7079
+#: src/protocols/oscar/oscar.c:7095
 msgid "Format Screen Name..."
 msgstr "Форматировать идентификатор пользователя..."
 
-#: src/protocols/oscar/oscar.c:7083
+#: src/protocols/oscar/oscar.c:7099
 msgid "Confirm Account"
 msgstr "Подтвердить учётную запись"
 
-#: src/protocols/oscar/oscar.c:7087
+#: src/protocols/oscar/oscar.c:7103
 msgid "Display Currently Registered Address"
 msgstr "Показать текущий зарегистрированный адрес"
 
-#: src/protocols/oscar/oscar.c:7091
+#: src/protocols/oscar/oscar.c:7107
 msgid "Change Currently Registered Address..."
 msgstr "Изменить текущий зарегистрированный адрес..."
 
-#: src/protocols/oscar/oscar.c:7098
+#: src/protocols/oscar/oscar.c:7114
 msgid "Show Buddies Awaiting Authorization"
 msgstr "Показать пользователей, ожидающих авторизацию"
 
-#: src/protocols/oscar/oscar.c:7104
+#: src/protocols/oscar/oscar.c:7120
 msgid "Search for Buddy by Email..."
 msgstr "Искать пользователя по Email..."
 
-#: src/protocols/oscar/oscar.c:7109
+#: src/protocols/oscar/oscar.c:7125
 msgid "Search for Buddy by Information"
 msgstr "Искать пользователя по информации"
 
@@ -8363,15 +8416,15 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/oscar/oscar.c:7225 src/protocols/oscar/oscar.c:7227
+#: src/protocols/oscar/oscar.c:7243 src/protocols/oscar/oscar.c:7245
 msgid "AIM/ICQ Protocol Plugin"
 msgstr "Модуль протокола AIM/ICQ"
 
-#: src/protocols/oscar/oscar.c:7246
+#: src/protocols/oscar/oscar.c:7264
 msgid "Auth host"
 msgstr "Узел идентификации"
 
-#: src/protocols/oscar/oscar.c:7251
+#: src/protocols/oscar/oscar.c:7269
 msgid "Auth port"
 msgstr "Порт идентификации"
 
@@ -8460,32 +8513,32 @@
 msgstr ""
 
 #: src/protocols/silc/buddy.c:506 src/protocols/silc/buddy.c:541
-#: src/protocols/silc/ops.c:1123 src/protocols/silc/ops.c:1134
+#: src/protocols/silc/ops.c:1256 src/protocols/silc/ops.c:1267
 msgid "Get Public Key"
 msgstr "Получить публичный ключ"
 
-#: src/protocols/silc/buddy.c:542 src/protocols/silc/ops.c:1124
-#: src/protocols/silc/ops.c:1135
+#: src/protocols/silc/buddy.c:542 src/protocols/silc/ops.c:1257
+#: src/protocols/silc/ops.c:1268
 msgid "Cannot fetch the public key"
 msgstr "Не удаётся загрузить публичный ключ"
 
-#: src/protocols/silc/buddy.c:629 src/protocols/silc/buddy.c:1619
+#: src/protocols/silc/buddy.c:629 src/protocols/silc/buddy.c:1544
 msgid "Show Public Key"
 msgstr "Показать публичный ключ"
 
 #: src/protocols/silc/buddy.c:630 src/protocols/silc/buddy.c:989
-#: src/protocols/silc/chat.c:219
+#: src/protocols/silc/chat.c:222
 msgid "Could not load public key"
 msgstr "Не удалось загрузить публичный ключ"
 
-#: src/protocols/silc/buddy.c:707 src/protocols/silc/ops.c:837
-#: src/protocols/silc/ops.c:908 src/protocols/silc/ops.c:991
-#: src/protocols/silc/ops.c:992 src/protocols/silc/ops.c:998
-#: src/protocols/silc/ops.c:999
+#: src/protocols/silc/buddy.c:707 src/protocols/silc/ops.c:853
+#: src/protocols/silc/ops.c:925 src/protocols/silc/ops.c:1060
+#: src/protocols/silc/ops.c:1061 src/protocols/silc/ops.c:1079
 msgid "User Information"
 msgstr "Информация о пользователе"
 
-#: src/protocols/silc/buddy.c:708 src/protocols/silc/ops.c:909
+#: src/protocols/silc/buddy.c:708 src/protocols/silc/ops.c:926
+#: src/protocols/silc/ops.c:1080
 msgid "Cannot get user information"
 msgstr "Не удаётся получить информацию о пользователе"
 
@@ -8500,6 +8553,11 @@
 "You can use the Get Public Key command to get the public key."
 msgstr ""
 
+#. Open file selector to select the public key.
+#: src/protocols/silc/buddy.c:1023
+msgid "Open..."
+msgstr "Открыть..."
+
 #: src/protocols/silc/buddy.c:1032
 #, c-format
 msgid "The %s buddy is not present in the network"
@@ -8524,12 +8582,16 @@
 "More than one user was found with the same public key. Select the correct "
 "user from the list to add to the buddy list."
 msgstr ""
+"Было найдено несколько пользователей с одинаковыми публичными ключами. "
+"Выберите из списка одного из них для добавления в список контактов."
 
 #: src/protocols/silc/buddy.c:1129
 msgid ""
 "More than one user was found with the same name. Select the correct user "
 "from the list to add to the buddy list."
 msgstr ""
+"Было найдено несколько пользователей с одинаковыми именами. Выберите из "
+"списка одного из них для добавления в список контактов."
 
 #: src/protocols/silc/buddy.c:1377
 msgid "Detached"
@@ -8554,143 +8616,111 @@
 msgid "Robot"
 msgstr "Робот"
 
-#: src/protocols/silc/buddy.c:1396 src/protocols/silc/buddy.c:1464
-#: src/protocols/silc/silc.c:610
+#: src/protocols/silc/buddy.c:1396 src/protocols/silc/silc.c:610
+#: src/protocols/silc/util.c:469
 msgid "Happy"
 msgstr "Счастливый"
 
-#: src/protocols/silc/buddy.c:1398 src/protocols/silc/buddy.c:1466
-#: src/protocols/silc/silc.c:612
+#: src/protocols/silc/buddy.c:1398 src/protocols/silc/silc.c:612
+#: src/protocols/silc/util.c:471
 msgid "Sad"
 msgstr "Печальный"
 
-#: src/protocols/silc/buddy.c:1400 src/protocols/silc/buddy.c:1468
-#: src/protocols/silc/silc.c:614
+#: src/protocols/silc/buddy.c:1400 src/protocols/silc/silc.c:614
+#: src/protocols/silc/util.c:473
 msgid "Angry"
 msgstr "Рассерженный"
 
-#: src/protocols/silc/buddy.c:1402 src/protocols/silc/buddy.c:1470
-#: src/protocols/silc/silc.c:616
+#: src/protocols/silc/buddy.c:1402 src/protocols/silc/silc.c:616
+#: src/protocols/silc/util.c:475
 msgid "Jealous"
 msgstr "Ревнующий"
 
-#: src/protocols/silc/buddy.c:1404 src/protocols/silc/buddy.c:1472
-#: src/protocols/silc/silc.c:618
+#: src/protocols/silc/buddy.c:1404 src/protocols/silc/silc.c:618
+#: src/protocols/silc/util.c:477
 msgid "Ashamed"
 msgstr "Стыдящийся"
 
-#: src/protocols/silc/buddy.c:1406 src/protocols/silc/buddy.c:1474
-#: src/protocols/silc/silc.c:620
+#: src/protocols/silc/buddy.c:1406 src/protocols/silc/silc.c:620
+#: src/protocols/silc/util.c:479
 msgid "Invincible"
 msgstr "Непобедимый"
 
-#: src/protocols/silc/buddy.c:1408 src/protocols/silc/buddy.c:1476
-#: src/protocols/silc/silc.c:622
+#: src/protocols/silc/buddy.c:1408 src/protocols/silc/silc.c:622
+#: src/protocols/silc/util.c:481
 msgid "In Love"
 msgstr "Влюблённый"
 
-#: src/protocols/silc/buddy.c:1410 src/protocols/silc/buddy.c:1478
-#: src/protocols/silc/silc.c:624
+#: src/protocols/silc/buddy.c:1410 src/protocols/silc/silc.c:624
+#: src/protocols/silc/util.c:483
 msgid "Sleepy"
 msgstr "Сонный"
 
-#: src/protocols/silc/buddy.c:1412 src/protocols/silc/buddy.c:1480
-#: src/protocols/silc/silc.c:626
+#: src/protocols/silc/buddy.c:1412 src/protocols/silc/silc.c:626
+#: src/protocols/silc/util.c:485
 msgid "Bored"
 msgstr "Скучающий"
 
-#: src/protocols/silc/buddy.c:1414 src/protocols/silc/buddy.c:1482
-#: src/protocols/silc/silc.c:628
+#: src/protocols/silc/buddy.c:1414 src/protocols/silc/silc.c:628
+#: src/protocols/silc/util.c:487
 msgid "Excited"
 msgstr "Возбуждённый"
 
-#: src/protocols/silc/buddy.c:1416 src/protocols/silc/buddy.c:1484
-#: src/protocols/silc/silc.c:630
+#: src/protocols/silc/buddy.c:1416 src/protocols/silc/silc.c:630
+#: src/protocols/silc/util.c:489
 msgid "Anxious"
 msgstr "Озабоченный"
 
-#: src/protocols/silc/buddy.c:1452
-msgid "Modes"
-msgstr "Режимы"
-
-#: src/protocols/silc/buddy.c:1462
+#: src/protocols/silc/buddy.c:1448 src/protocols/silc/ops.c:962
+msgid "User Modes"
+msgstr "Режимы пользователя"
+
+#: src/protocols/silc/buddy.c:1457 src/protocols/silc/ops.c:971
 msgid "Mood"
 msgstr "Настроение"
 
-#: src/protocols/silc/buddy.c:1490
+#: src/protocols/silc/buddy.c:1461 src/protocols/silc/ops.c:977
 msgid "Status Text"
 msgstr "Текст статуса"
 
-#: src/protocols/silc/buddy.c:1495
+#: src/protocols/silc/buddy.c:1466 src/protocols/silc/ops.c:983
 msgid "Preferred Contact"
 msgstr "Предпочитаемый контакт"
 
-#: src/protocols/silc/buddy.c:1503
-msgid "Paging"
-msgstr ""
-
-#: src/protocols/silc/buddy.c:1505 src/protocols/silc/silc.c:641
-msgid "SMS"
-msgstr "SMS"
-
-#: src/protocols/silc/buddy.c:1507 src/protocols/silc/silc.c:643
-msgid "MMS"
-msgstr "MMS"
-
-#: src/protocols/silc/buddy.c:1509 src/protocols/silc/silc.c:645
-msgid "Video Conferencing"
-msgstr "Видеоконференция"
-
-#: src/protocols/silc/buddy.c:1515
+#: src/protocols/silc/buddy.c:1471 src/protocols/silc/ops.c:988
 msgid "Preferred Language"
 msgstr "Предпочитаемый язык"
 
-#: src/protocols/silc/buddy.c:1520
+#: src/protocols/silc/buddy.c:1476 src/protocols/silc/ops.c:993
 msgid "Device"
 msgstr "Устройство"
 
-#: src/protocols/silc/buddy.c:1522
-msgid "Computer"
-msgstr "Компьютер"
-
-#: src/protocols/silc/buddy.c:1526
-msgid "PDA"
-msgstr "PDA"
-
-#: src/protocols/silc/buddy.c:1528
-msgid "Terminal"
-msgstr "Терминал"
-
-#: src/protocols/silc/buddy.c:1539 src/protocols/silc/silc.c:678
-#: src/protocols/silc/silc.c:680
+#: src/protocols/silc/buddy.c:1481 src/protocols/silc/ops.c:998
+#: src/protocols/silc/silc.c:678 src/protocols/silc/silc.c:680
 msgid "Timezone"
 msgstr "Часовой пояс"
 
-#: src/protocols/silc/buddy.c:1545
+#: src/protocols/silc/buddy.c:1486 src/protocols/silc/ops.c:1003
 msgid "Geolocation"
 msgstr "Географическое положение"
 
-#: src/protocols/silc/buddy.c:1604
+#: src/protocols/silc/buddy.c:1529
 msgid "Reset IM Key"
 msgstr ""
 
-#: src/protocols/silc/buddy.c:1609
+#: src/protocols/silc/buddy.c:1534
 msgid "IM with Key Exchange"
 msgstr ""
 
-#: src/protocols/silc/buddy.c:1613
+#: src/protocols/silc/buddy.c:1538
 msgid "IM with Password"
 msgstr ""
 
-#: src/protocols/silc/buddy.c:1624
+#: src/protocols/silc/buddy.c:1549
 msgid "Get Public Key..."
 msgstr "Получить публичный ключ..."
 
-#: src/protocols/silc/buddy.c:1629
-msgid "Send File..."
-msgstr "Отправить файл..."
-
-#: src/protocols/silc/buddy.c:1634 src/protocols/silc/ops.c:1172
+#: src/protocols/silc/buddy.c:1555 src/protocols/silc/ops.c:1389
 msgid "Kill User"
 msgstr "Убить пользователя"
 
@@ -8703,8 +8733,7 @@
 msgid "Channel %s does not exist in the network"
 msgstr "Канал %s не существует в сети"
 
-#: src/protocols/silc/chat.c:67 src/protocols/silc/chat.c:154
-#: src/protocols/silc/chat.c:155
+#: src/protocols/silc/chat.c:67 src/protocols/silc/chat.c:159
 msgid "Channel Information"
 msgstr "Информация о канале"
 
@@ -8712,84 +8741,68 @@
 msgid "Cannot get channel information"
 msgstr "Не удаётся получить информацию о канале"
 
-#: src/protocols/silc/chat.c:104
-#, c-format
-msgid "Channel Name:\t\t%s\n"
-msgstr "Имя канала:\t\t%s\n"
-
-#: src/protocols/silc/chat.c:106
-#, c-format
-msgid "User Count:\t\t%d\n"
-msgstr "Количество пользователей:\t\t%d\n"
-
-#: src/protocols/silc/chat.c:112
-#, c-format
-msgid "Channel Founder:\t%s\n"
-msgstr "Основатель канала:\t%s\n"
-
-#: src/protocols/silc/chat.c:120
-#, c-format
-msgid "Channel Cipher:\t\t%s\n"
-msgstr "Шифр канала:\t\t%s\n"
-
-#: src/protocols/silc/chat.c:123
-#, c-format
-msgid "Channel HMAC:\t\t%s\n"
-msgstr "HMAC канала:\t\t%s\n"
+#: src/protocols/silc/chat.c:105
+#, c-format
+msgid "<b>Channel Name:</b> %s"
+msgstr "<b>Имя канала:</b> %s"
+
+#: src/protocols/silc/chat.c:108
+#, c-format
+msgid "<br><b>User Count:</b> %d"
+msgstr "<br><b>Количество пользователей:</b> %d"
+
+#: src/protocols/silc/chat.c:115
+#, c-format
+msgid "<br><b>Channel Founder:</b> %s"
+msgstr "<br><b>Основатель канала::</b> %s"
+
+#: src/protocols/silc/chat.c:124
+#, c-format
+msgid "<br><b>Channel Cipher:</b> %s"
+msgstr "<br><b>Шифр канала:</b> %s"
 
 #: src/protocols/silc/chat.c:127
 #, c-format
-msgid ""
-"\n"
-"Channel Topic:\n"
-"\t%s\n"
-msgstr ""
-"\n"
-"Тема канала:\n"
-"\t%s\n"
-
-#: src/protocols/silc/chat.c:130
-msgid ""
-"\n"
-"Channel Modes:\n"
-msgstr ""
-"\n"
-"Режимы канала:\n"
-
-#: src/protocols/silc/chat.c:144
-#, c-format
-msgid ""
-"\n"
-"Founder Key Fingerprint:\n"
-"%s\n"
-"\n"
-msgstr ""
-
-#: src/protocols/silc/chat.c:145
-#, c-format
-msgid ""
-"Founder Key Babbleprint:\n"
-"%s"
-msgstr ""
-
-#: src/protocols/silc/chat.c:218
+msgid "<br><b>Channel HMAC:</b> %s"
+msgstr "<br><b>HMAC канала:</b> %s"
+
+#: src/protocols/silc/chat.c:132
+#, c-format
+msgid "<br><b>Channel Topic:</b><br>%s"
+msgstr "<br><b>Тема канала:</b><br>%s"
+
+#: src/protocols/silc/chat.c:137
+msgid "<br><b>Channel Modes:</b> "
+msgstr "<br><b>Режимы канала:</b> "
+
+#: src/protocols/silc/chat.c:150
+#, c-format
+msgid "<br><b>Founder Key Fingerprint:</b><br>%s"
+msgstr ""
+
+#: src/protocols/silc/chat.c:151
+#, c-format
+msgid "<br><b>Founder Key Babbleprint:</b><br>%s"
+msgstr ""
+
+#: src/protocols/silc/chat.c:221
 msgid "Add Channel Public Key"
 msgstr "Добавить публичный ключ канала"
 
 #. Add new public key
-#: src/protocols/silc/chat.c:273
+#: src/protocols/silc/chat.c:276
 msgid "Open Public Key..."
 msgstr "Открыть публичный ключ..."
 
-#: src/protocols/silc/chat.c:382
+#: src/protocols/silc/chat.c:385
 msgid "Channel Passphrase"
 msgstr "Парольная фраза канала"
 
-#: src/protocols/silc/chat.c:389
+#: src/protocols/silc/chat.c:392
 msgid "Channel Public Keys List"
 msgstr "Список публичных ключей канала"
 
-#: src/protocols/silc/chat.c:394
+#: src/protocols/silc/chat.c:397
 msgid ""
 "Channel authentication is used to secure the channel from unauthorized "
 "access. The authentication may be based on passphrase and digital "
@@ -8798,125 +8811,125 @@
 "able to join."
 msgstr ""
 
-#: src/protocols/silc/chat.c:403 src/protocols/silc/chat.c:404
-#: src/protocols/silc/chat.c:441 src/protocols/silc/chat.c:442
-#: src/protocols/silc/chat.c:871
+#: src/protocols/silc/chat.c:406 src/protocols/silc/chat.c:407
+#: src/protocols/silc/chat.c:444 src/protocols/silc/chat.c:445
+#: src/protocols/silc/chat.c:874
 msgid "Channel Authentication"
 msgstr "Идентификация канала"
 
-#: src/protocols/silc/chat.c:405 src/protocols/silc/chat.c:443
+#: src/protocols/silc/chat.c:408 src/protocols/silc/chat.c:446
 msgid "Add / Remove"
 msgstr "Добавить / Удалить"
 
-#: src/protocols/silc/chat.c:560
+#: src/protocols/silc/chat.c:563
 msgid "Group Name"
 msgstr "Имя группы"
 
-#: src/protocols/silc/chat.c:564 src/protocols/silc/ops.c:1453
+#: src/protocols/silc/chat.c:567 src/protocols/silc/ops.c:1669
 msgid "Passphrase"
 msgstr "Парольная фраза"
 
-#: src/protocols/silc/chat.c:575
+#: src/protocols/silc/chat.c:578
 #, c-format
 msgid "Please enter the %s channel private group name and passphrase."
 msgstr "Введите имя личной группы и парольную фразу канала %s."
 
-#: src/protocols/silc/chat.c:577
+#: src/protocols/silc/chat.c:580
 msgid "Add Channel Private Group"
 msgstr "Добавить личную группу канала"
 
-#: src/protocols/silc/chat.c:704
+#: src/protocols/silc/chat.c:707
 msgid "User Limit"
 msgstr "Предел количества пользователей"
 
-#: src/protocols/silc/chat.c:705
+#: src/protocols/silc/chat.c:708
 msgid "Set user limit on channel. Set to zero to reset user limit."
 msgstr ""
 "Установить предел количества пользователей на канале. Установите в ноль для "
 "сброса предела количества пользователей."
 
-#: src/protocols/silc/chat.c:847
+#: src/protocols/silc/chat.c:850
 msgid "Get Info"
 msgstr "Получить информацию"
 
-#: src/protocols/silc/chat.c:854
+#: src/protocols/silc/chat.c:857
 msgid "Invite List"
 msgstr "Список приглашений"
 
-#: src/protocols/silc/chat.c:858
+#: src/protocols/silc/chat.c:861
 #, fuzzy
 msgid "Ban List"
 msgstr "Список отключенных узлов"
 
-#: src/protocols/silc/chat.c:865
+#: src/protocols/silc/chat.c:868
 msgid "Add Private Group"
 msgstr "Добавить личную группу"
 
-#: src/protocols/silc/chat.c:876
+#: src/protocols/silc/chat.c:879
 msgid "Reset Permanent"
 msgstr "Сбросить перманентно"
 
-#: src/protocols/silc/chat.c:880
+#: src/protocols/silc/chat.c:883
 msgid "Set Permanent"
 msgstr "Установить перманентно"
 
-#: src/protocols/silc/chat.c:887
+#: src/protocols/silc/chat.c:890
 msgid "Set User Limit"
 msgstr "Установить предел количества пользователей"
 
-#: src/protocols/silc/chat.c:892
+#: src/protocols/silc/chat.c:895
 msgid "Reset Topic Restriction"
 msgstr "Сбросить ограничение темы"
 
-#: src/protocols/silc/chat.c:896
+#: src/protocols/silc/chat.c:899
 msgid "Set Topic Restriction"
 msgstr "Установить ограничение темы"
 
-#: src/protocols/silc/chat.c:902
+#: src/protocols/silc/chat.c:905
 msgid "Reset Private Channel"
 msgstr "Сбросить личный канал"
 
-#: src/protocols/silc/chat.c:906
+#: src/protocols/silc/chat.c:909
 msgid "Set Private Channel"
 msgstr "Установить личный канал"
 
-#: src/protocols/silc/chat.c:912
+#: src/protocols/silc/chat.c:915
 msgid "Reset Secret Channel"
 msgstr "Сбросить секретный канал"
 
-#: src/protocols/silc/chat.c:916
+#: src/protocols/silc/chat.c:919
 msgid "Set Secret Channel"
 msgstr "Установить секретный канал"
 
-#: src/protocols/silc/chat.c:986
+#: src/protocols/silc/chat.c:989
 #, c-format
 msgid "You are channel founder on <I>%s</I>"
 msgstr "Вы являетесь основателем канала на <I>%s</I>"
 
-#: src/protocols/silc/chat.c:990
+#: src/protocols/silc/chat.c:993
 #, c-format
 msgid "Channel founder on <I>%s</I> is <I>%s</I>"
 msgstr "Основателем канала на <I>%s</I> является <I>%s</I>"
 
-#: src/protocols/silc/chat.c:1043
+#: src/protocols/silc/chat.c:1046
 #, c-format
 msgid ""
 "You have to join the %s channel before you are able to join the private group"
 msgstr "Вы сможете войти в личную группу после того, как войдёте на канал %s."
 
-#: src/protocols/silc/chat.c:1045
+#: src/protocols/silc/chat.c:1048
 msgid "Join Private Group"
 msgstr "Присоединиться к личной группе"
 
-#: src/protocols/silc/chat.c:1046
+#: src/protocols/silc/chat.c:1049
 msgid "Cannot join private group"
 msgstr "Не удаётся присоединиться к личной группе"
 
-#: src/protocols/silc/chat.c:1238 src/protocols/silc/silc.c:885
+#: src/protocols/silc/chat.c:1242 src/protocols/silc/silc.c:888
 msgid "Cannot call command"
 msgstr "Не удаётся вызвать команду"
 
-#: src/protocols/silc/chat.c:1239 src/protocols/silc/silc.c:886
+#: src/protocols/silc/chat.c:1243 src/protocols/silc/silc.c:889
 msgid "Unknown command"
 msgstr "Неизвестная команда"
 
@@ -8966,225 +8979,269 @@
 msgid "Cannot send file"
 msgstr "Не удаётся отправить файл"
 
-#: src/protocols/silc/ops.c:323 src/protocols/silc/ops.c:330
-#: src/protocols/silc/ops.c:337
+#: src/protocols/silc/ops.c:333 src/protocols/silc/ops.c:342
+#: src/protocols/silc/ops.c:351
 #, c-format
 msgid "%s has changed the topic of <I>%s</I> to: %s"
 msgstr "%s изменил тему <I>%s</I> на: %s"
 
-#: src/protocols/silc/ops.c:397
+#: src/protocols/silc/ops.c:413
 #, c-format
 msgid "<I>%s</I> set channel <I>%s</I> modes to: %s"
 msgstr "<I>%s</I> установил режим канала <I>%s</I> в: %s"
 
-#: src/protocols/silc/ops.c:401
+#: src/protocols/silc/ops.c:417
 #, c-format
 msgid "<I>%s</I> removed all channel <I>%s</I> modes"
 msgstr "<I>%s</I> снял все режимы канала <I>%s</I>"
 
-#: src/protocols/silc/ops.c:432
+#: src/protocols/silc/ops.c:448
 #, c-format
 msgid "<I>%s</I> set <I>%s's</I> modes to: %s"
 msgstr "<I>%s</I> установил режимы <I>%s</I> в: %s"
 
-#: src/protocols/silc/ops.c:436
+#: src/protocols/silc/ops.c:452
 #, c-format
 msgid "<I>%s</I> removed all <I>%s's</I> modes"
 msgstr "<I>%s</I> снял все режимы <I>%s</I>"
 
-#: src/protocols/silc/ops.c:463
+#: src/protocols/silc/ops.c:479
 #, c-format
 msgid "You have been kicked off <I>%s</I> by <I>%s</I> (%s)"
 msgstr "Вы были удалены из <I>%s</I> оператором <I>%s</I> (%s)"
 
-#: src/protocols/silc/ops.c:493 src/protocols/silc/ops.c:498
-#: src/protocols/silc/ops.c:503
+#: src/protocols/silc/ops.c:509 src/protocols/silc/ops.c:514
+#: src/protocols/silc/ops.c:519
 #, c-format
 msgid "You have been killed by %s (%s)"
 msgstr "Вы были убиты оператором %s (%s)"
 
-#: src/protocols/silc/ops.c:524 src/protocols/silc/ops.c:529
-#: src/protocols/silc/ops.c:534
+#: src/protocols/silc/ops.c:540 src/protocols/silc/ops.c:545
+#: src/protocols/silc/ops.c:550
 #, c-format
 msgid "Killed by %s (%s)"
 msgstr "Убит оператором %s (%s)"
 
-#: src/protocols/silc/ops.c:580
+#: src/protocols/silc/ops.c:596
 msgid "Server signoff"
 msgstr "Отключиться от сервера"
 
-#: src/protocols/silc/ops.c:767
+#: src/protocols/silc/ops.c:783
 msgid "Personal Information"
 msgstr "Персональная информация"
 
-#: src/protocols/silc/ops.c:790
+#: src/protocols/silc/ops.c:806
 msgid "Birth Day"
 msgstr "День рождения"
 
-#: src/protocols/silc/ops.c:794
+#: src/protocols/silc/ops.c:810
 msgid "Job Title"
 msgstr "Название работы"
 
-#: src/protocols/silc/ops.c:798
+#: src/protocols/silc/ops.c:814
 msgid "Job Role"
 msgstr "Должность"
 
-#: src/protocols/silc/ops.c:802
+#: src/protocols/silc/ops.c:818
 msgid "Organization"
 msgstr "Организация"
 
-#: src/protocols/silc/ops.c:806
+#: src/protocols/silc/ops.c:822
 msgid "Unit"
 msgstr "Отдел"
 
-#: src/protocols/silc/ops.c:825
+#: src/protocols/silc/ops.c:841
 msgid "EMail"
 msgstr "EMail"
 
-#: src/protocols/silc/ops.c:830
+#: src/protocols/silc/ops.c:846
 msgid "Note"
 msgstr "Заметки"
 
-#: src/protocols/silc/ops.c:878
+#: src/protocols/silc/ops.c:894
 msgid "Join Chat"
 msgstr "Присоединиться к чату"
 
-#: src/protocols/silc/ops.c:933
-msgid "Hostname"
-msgstr "Имя узла"
-
-#: src/protocols/silc/ops.c:940
-msgid "User Mode"
-msgstr "Режим пользователя"
-
-#: src/protocols/silc/ops.c:954
-msgid "Channels"
-msgstr "Каналы"
-
-#: src/protocols/silc/ops.c:981
+#: src/protocols/silc/ops.c:1050 src/protocols/silc/ops.c:1120
 msgid "Public Key Fingerprint"
 msgstr ""
 
-#: src/protocols/silc/ops.c:982
+#: src/protocols/silc/ops.c:1051 src/protocols/silc/ops.c:1121
 msgid "Public Key Babbleprint"
 msgstr ""
 
-#: src/protocols/silc/ops.c:995
+#: src/protocols/silc/ops.c:1064
 msgid "More..."
 msgstr "Ещё..."
 
-#: src/protocols/silc/ops.c:1006 src/protocols/silc/silc.c:774
+#: src/protocols/silc/ops.c:1135 src/protocols/silc/silc.c:777
 msgid "Detach From Server"
 msgstr "Разорвать соединение с сервером"
 
-#: src/protocols/silc/ops.c:1006
+#: src/protocols/silc/ops.c:1135
 msgid "Cannot detach"
 msgstr "Не удаётся разорвать соединение"
 
-#: src/protocols/silc/ops.c:1017
+#: src/protocols/silc/ops.c:1146
 msgid "Cannot set topic"
 msgstr "Не удаётся установить тему"
 
-#: src/protocols/silc/ops.c:1088
+#: src/protocols/silc/ops.c:1184
+msgid "Failed to change nickname"
+msgstr "Не удалось изменить псевдоним"
+
+#: src/protocols/silc/ops.c:1221
 msgid "Roomlist"
 msgstr "Список комнат"
 
-#: src/protocols/silc/ops.c:1088
+#: src/protocols/silc/ops.c:1221
 msgid "Cannot get room list"
 msgstr "Не удаётся получить список комнат"
 
-#: src/protocols/silc/ops.c:1136
+#: src/protocols/silc/ops.c:1269
 msgid "No public key was received"
 msgstr "Не было принято публичных ключей"
 
-#: src/protocols/silc/ops.c:1149 src/protocols/silc/ops.c:1163
-#: src/protocols/silc/ops.c:1164
+#: src/protocols/silc/ops.c:1282 src/protocols/silc/ops.c:1296
 msgid "Server Information"
 msgstr "Информация о сервере"
 
-#: src/protocols/silc/ops.c:1150
+#: src/protocols/silc/ops.c:1283
 msgid "Cannot get server information"
 msgstr "Не удаётся получить информацию о сервере"
 
-#: src/protocols/silc/ops.c:1173
+#: src/protocols/silc/ops.c:1314 src/protocols/silc/ops.c:1323
+#, fuzzy
+msgid "Server Statistics"
+msgstr "Адрес сервера"
+
+#: src/protocols/silc/ops.c:1315
+#, fuzzy
+msgid "Cannot get server statistics"
+msgstr "Не удаётся получить информацию о сервере"
+
+#: src/protocols/silc/ops.c:1324
+#, fuzzy
+msgid "No server statisitics available"
+msgstr "Нет доступных действий"
+
+#: src/protocols/silc/ops.c:1346
+#, c-format
+msgid ""
+"Local server start time: %s\n"
+"Local server uptime: %s\n"
+"Local server clients: %d\n"
+"Local server channels: %d\n"
+"Local server operators: %d\n"
+"Local router operators: %d\n"
+"Local cell clients: %d\n"
+"Local cell channels: %d\n"
+"Local cell servers: %d\n"
+"Total clients: %d\n"
+"Total channels: %d\n"
+"Total servers: %d\n"
+"Total routers: %d\n"
+"Total server operators: %d\n"
+"Total router operators: %d\n"
+msgstr ""
+
+#: src/protocols/silc/ops.c:1369
+msgid "Network Statistics"
+msgstr ""
+
+#: src/protocols/silc/ops.c:1377 src/protocols/silc/ops.c:1382
+msgid "Ping"
+msgstr ""
+
+#: src/protocols/silc/ops.c:1377
+#, fuzzy
+msgid "Ping failed"
+msgstr "Не удалось установить соединение"
+
+#: src/protocols/silc/ops.c:1382
+#, fuzzy
+msgid "Ping reply received from server"
+msgstr "Неверный запрос с сервера"
+
+#: src/protocols/silc/ops.c:1390
 msgid "Could not kill user"
 msgstr "Не удалось убить пользователя"
 
-#: src/protocols/silc/ops.c:1255
+#: src/protocols/silc/ops.c:1471
 msgid "Error during connecting to SILC Server"
 msgstr "Ошибка во время соединения с сервером SILC"
 
-#: src/protocols/silc/ops.c:1260
+#: src/protocols/silc/ops.c:1476
 msgid "Key Exchange failed"
 msgstr "Не удалось выполнить обмен ключами"
 
-#: src/protocols/silc/ops.c:1269
+#: src/protocols/silc/ops.c:1485
 msgid ""
 "Resuming detached session failed. Press Reconnect to create new connection."
 msgstr ""
 "Не удалось возобновить прерванную сессию. Нажмите \"Пересоединение\" для "
 "создания нового соединения."
 
-#: src/protocols/silc/ops.c:1304
+#: src/protocols/silc/ops.c:1520
 msgid "Disconnected by server"
 msgstr "Соединение разорвано сервером"
 
-#: src/protocols/silc/ops.c:1364 src/protocols/silc/ops.c:1411
+#: src/protocols/silc/ops.c:1580 src/protocols/silc/ops.c:1627
 #: src/protocols/silc/silc.c:167
 msgid "Resuming session"
 msgstr "Возобновление сессии"
 
-#: src/protocols/silc/ops.c:1366
+#: src/protocols/silc/ops.c:1582
 msgid "Authenticating connection"
 msgstr "Идентификация соединения"
 
-#: src/protocols/silc/ops.c:1413
+#: src/protocols/silc/ops.c:1629
 msgid "Verifying server public key"
 msgstr "Проверка публичного ключа сервера"
 
-#: src/protocols/silc/ops.c:1454
+#: src/protocols/silc/ops.c:1670
 msgid "Passphrase required"
 msgstr "Требуется парольная фраза"
 
-#: src/protocols/silc/ops.c:1483
+#: src/protocols/silc/ops.c:1699
 msgid "Failure: Version mismatch, upgrade your client"
-msgstr ""
-
-#: src/protocols/silc/ops.c:1486
+msgstr "Ошибка: Несоответствие версий, обновите своего клиента"
+
+#: src/protocols/silc/ops.c:1702
 msgid "Failure: Remote does not trust/support your public key"
-msgstr ""
-
-#: src/protocols/silc/ops.c:1489
+msgstr "Ошибка: Удалённая система не доверяет/поддерживает ваш публичный ключ"
+
+#: src/protocols/silc/ops.c:1705
 msgid "Failure: Remote does not support proposed KE group"
-msgstr ""
-
-#: src/protocols/silc/ops.c:1492
+msgstr "Ошибка: Удалённая система не поддерживает предложенную группу KE"
+
+#: src/protocols/silc/ops.c:1708
 msgid "Failure: Remote does not support proposed cipher"
-msgstr ""
-
-#: src/protocols/silc/ops.c:1495
+msgstr "Ошибка: Удалённая система не поддерживает предложенный шифр"
+
+#: src/protocols/silc/ops.c:1711
 msgid "Failure: Remote does not support proposed PKCS"
-msgstr ""
-
-#: src/protocols/silc/ops.c:1498
+msgstr "Ошибка: Удалённая система не поддерживает предложенный PKCS"
+
+#: src/protocols/silc/ops.c:1714
 msgid "Failure: Remote does not support proposed hash function"
-msgstr ""
-
-#: src/protocols/silc/ops.c:1501
+msgstr "Ошибка: Удалённая система не поддерживает предложенную хэш-функцию"
+
+#: src/protocols/silc/ops.c:1717
 msgid "Failure: Remote does not support proposed HMAC"
-msgstr ""
-
-#: src/protocols/silc/ops.c:1503
+msgstr "Ошибка: Удалённая система не поддерживает предложенный HMAC"
+
+#: src/protocols/silc/ops.c:1719
 msgid "Failure: Incorrect signature"
-msgstr ""
-
-#: src/protocols/silc/ops.c:1505
+msgstr "Ошибка: Некорректная подпись"
+
+#: src/protocols/silc/ops.c:1721
 msgid "Failure: Invalid cookie"
 msgstr ""
 
-#: src/protocols/silc/ops.c:1516
+#: src/protocols/silc/ops.c:1732
 msgid "Failure: Authentication failed"
-msgstr ""
+msgstr "Ошибка: Идентификация завершилась неудачно"
 
 #: src/protocols/silc/pk.c:103
 #, c-format
@@ -9192,11 +9249,13 @@
 "Received %s's public key. Your local copy does not match this key. Would you "
 "still like to accept this public key?"
 msgstr ""
+"Получен публичный ключ %s. Локальная копия не совпадает с этим ключом. Всё "
+"ещё хотите принять этот публичный ключ?"
 
 #: src/protocols/silc/pk.c:108
 #, c-format
 msgid "Received %s's public key. Would you like to accept this public key?"
-msgstr ""
+msgstr "Получен публичный ключ %s. Хотите принять этот публичный ключ?"
 
 #: src/protocols/silc/pk.c:112
 #, c-format
@@ -9256,6 +9315,18 @@
 "\n"
 "Предпочитаемые вами способы контакта"
 
+#: src/protocols/silc/silc.c:641 src/protocols/silc/util.c:514
+msgid "SMS"
+msgstr "SMS"
+
+#: src/protocols/silc/silc.c:643 src/protocols/silc/util.c:516
+msgid "MMS"
+msgstr "MMS"
+
+#: src/protocols/silc/silc.c:645 src/protocols/silc/util.c:518
+msgid "Video Conferencing"
+msgstr "Видеоконференция"
+
 #: src/protocols/silc/silc.c:650
 msgid "Your Current Status"
 msgstr "Ваш текущий статус"
@@ -9266,11 +9337,11 @@
 
 #: src/protocols/silc/silc.c:660
 msgid "Let others see what services you are using"
-msgstr "Позволить остальным видеть, какие вы используете службы"
+msgstr "Позволить другим видеть, какие службы вы используете"
 
 #: src/protocols/silc/silc.c:666
 msgid "Let others see what computer you are using"
-msgstr "Позволить остальным видеть, какой вы используете компьютер"
+msgstr "Позволить другим видеть, какой компьютер вы используете"
 
 #: src/protocols/silc/silc.c:673
 msgid "Your VCard File"
@@ -9287,113 +9358,233 @@
 "about yourself."
 msgstr ""
 
-#: src/protocols/silc/silc.c:727 src/protocols/silc/silc.c:732
-#: src/protocols/silc/silc.c:1118 src/protocols/silc/silc.c:1123
+#: src/protocols/silc/silc.c:728 src/protocols/silc/silc.c:734
+#: src/protocols/silc/silc.c:1135
 msgid "Message of the Day"
 msgstr "Сообщение дня"
 
-#: src/protocols/silc/silc.c:727 src/protocols/silc/silc.c:1118
+#: src/protocols/silc/silc.c:728
 msgid "No Message of the Day available"
 msgstr "Нет доступных сообщений дня"
 
-#: src/protocols/silc/silc.c:728 src/protocols/silc/silc.c:1119
+#: src/protocols/silc/silc.c:729 src/protocols/silc/silc.c:1130
 msgid "There is no Message of the Day associated with this connection"
 msgstr "Нет сообщения дня, соотнесённого с этим соединением"
 
-#: src/protocols/silc/silc.c:769
+#: src/protocols/silc/silc.c:772
 msgid "Online Status"
 msgstr "Сетевой статус"
 
-#: src/protocols/silc/silc.c:778
+#: src/protocols/silc/silc.c:781
 msgid "View Message of the Day"
-msgstr "Просмотр сообщения дня"
-
-#: src/protocols/silc/silc.c:850
+msgstr "Просмотреть сообщение дня"
+
+#: src/protocols/silc/silc.c:853
 #, c-format
 msgid "User <I>%s</I> is not present in the network"
 msgstr "Пользователь <I>%s</I> не присутствует в сети"
 
+#: src/protocols/silc/silc.c:962
+#, fuzzy
+msgid "Failed to leave channel"
+msgstr "Не удалось присоединиться к чату"
+
+#: src/protocols/silc/silc.c:1006
+msgid "Topic too long"
+msgstr "Тема слишком велика"
+
+#: src/protocols/silc/silc.c:1087
+msgid "You must specify a nick"
+msgstr "Вы должны указать псевдоним"
+
 #: src/protocols/silc/silc.c:1189
-msgid "part:  Leave the chat"
-msgstr ""
-
-#: src/protocols/silc/silc.c:1193
-msgid "leave:  Leave the chat"
-msgstr ""
-
-#: src/protocols/silc/silc.c:1197
+#, c-format
+msgid "channel %s not found"
+msgstr "канал %s не найден"
+
+#: src/protocols/silc/silc.c:1194
+#, c-format
+msgid "channel modes for %s: %s"
+msgstr "режимы канала для %s: %s"
+
+#: src/protocols/silc/silc.c:1196
+#, c-format
+msgid "no channel modes are set on %s"
+msgstr "нет установленных режимов канала на %s"
+
+#: src/protocols/silc/silc.c:1209
+#, c-format
+msgid "Failed to set cmodes for %s"
+msgstr "Не удалось установить режимы канала для %s"
+
+#: src/protocols/silc/silc.c:1239
+#, c-format
+msgid "Unknown command: %s, (may be a Gaim bug)"
+msgstr "Неизвестная команда: %s, (возможно, ошибка Gaim)"
+
+#: src/protocols/silc/silc.c:1302
+msgid "part [channel]:  Leave the chat"
+msgstr "part [канал]:  Покинуть чат"
+
+#: src/protocols/silc/silc.c:1306
+msgid "leave [channel]:  Leave the chat"
+msgstr "leave [канал]:  Покинуть чат"
+
+#: src/protocols/silc/silc.c:1310
 msgid "topic [&lt;new topic&gt;]:  View or change the topic"
-msgstr ""
-
-#: src/protocols/silc/silc.c:1202
+msgstr "topic [&lt;новая тема&gt;]:  Просмотреть или изменить тему"
+
+#: src/protocols/silc/silc.c:1315
 msgid "join &lt;channel&gt; [&lt;password&gt;]:  Join a chat on this network"
 msgstr ""
-
-#: src/protocols/silc/silc.c:1206
+"join &lt;канал&gt; [&lt;пароль&gt;]:  Присоединиться к чату в этой сети"
+
+#: src/protocols/silc/silc.c:1319
 msgid "list:  List channels on this network"
-msgstr ""
-
-#: src/protocols/silc/silc.c:1210
+msgstr "list:  Вывести список каналов в этой сети"
+
+#: src/protocols/silc/silc.c:1323
 msgid "whois &lt;nick&gt;:  View nick's information"
 msgstr ""
 
-#: src/protocols/silc/silc.c:1214
-msgid "invite &lt;nick&gt;:  Invite nick to join this channel"
-msgstr ""
-
-#: src/protocols/silc/silc.c:1218
+#: src/protocols/silc/silc.c:1327 src/protocols/zephyr/zephyr.c:1673
 msgid "msg &lt;nick&gt; &lt;message&gt;:  Send a private message to a user"
 msgstr ""
 
-#: src/protocols/silc/silc.c:1222
+#: src/protocols/silc/silc.c:1331
 msgid "query &lt;nick&gt; [&lt;message&gt;]:  Send a private message to a user"
 msgstr ""
 
-#: src/protocols/silc/silc.c:1226
+#: src/protocols/silc/silc.c:1335
 msgid "motd:  View the server's Message Of The Day"
-msgstr ""
-
-#: src/protocols/silc/silc.c:1230
+msgstr "motd:  Просмотреть сообщение дня сервера"
+
+#: src/protocols/silc/silc.c:1339
 msgid "detach:  Detach this session"
-msgstr ""
-
-#: src/protocols/silc/silc.c:1234
-msgid "umode &lt;usermodes&gt;:  Set your user options"
-msgstr ""
-
-#: src/protocols/silc/silc.c:1245
+msgstr "detach:  Прервать эту сессию"
+
+#: src/protocols/silc/silc.c:1343
+msgid "quit [message]:  Disconnect from the server, with an optional message"
+msgstr ""
+"quit [сообщение]:  Разорвать соединение с сервером, сообщение необязательно"
+
+#: src/protocols/silc/silc.c:1347
+msgid "call &lt;command&gt;:  Call any silc client command"
+msgstr "call &lt;команда&gt;:  Вызвать любую команду клиента silc"
+
+#: src/protocols/silc/silc.c:1352
+msgid "kill &lt;nick&gt; [-pubkey|&lt;reason&gt;]:  Kill nick"
+msgstr ""
+
+#: src/protocols/silc/silc.c:1356
+msgid "nick &lt;newnick&gt;:  Change your nickname"
+msgstr "nick &lt;новый псевдоним&gt;:  Изменить свой псевдоним"
+
+#: src/protocols/silc/silc.c:1360
+#, fuzzy
+msgid "whowas &lt;nick&gt;:  View nick's information"
+msgstr "whois &lt;псевдоним&gt;:  Получить информацию о пользователе."
+
+#: src/protocols/silc/silc.c:1364
+#, fuzzy
+msgid ""
+"cmode &lt;channel&gt; [+|-&lt;modes&gt]; [arguments]:  Change or display "
+"channel modes"
+msgstr ""
+"mode &lt;псевдоним|канал&gt; &lt;+|-&gt;&lt;A-Za-z&gt;:  Установить или "
+"снять режим пользователя или канала."
+
+#: src/protocols/silc/silc.c:1368
+#, fuzzy
+msgid ""
+"cumode &lt;channel&gt; +|-&lt;modes&gt; &lt;nick&gt;:  Change nick's modes "
+"on channel"
+msgstr ""
+"mode &lt;псевдоним|канал&gt; &lt;+|-&gt;&lt;A-Za-z&gt;:  Установить или "
+"снять режим пользователя или канала."
+
+#: src/protocols/silc/silc.c:1372
+msgid "umode &lt;usermodes&gt;:  Set your modes in the network"
+msgstr "umode &lt;режимы пользователя&gt;:  Установить свои режимы в сети"
+
+#: src/protocols/silc/silc.c:1376
+msgid "oper &lt;nick&gt; [-pubkey]:  Get server operator privileges"
+msgstr ""
+
+#: src/protocols/silc/silc.c:1380
+msgid ""
+"invite &lt;channel&gt; [-|+]&lt;nick&gt;:  invite nick or add/remove from "
+"channel invite list"
+msgstr ""
+
+#: src/protocols/silc/silc.c:1384
+msgid "kick &lt;channel&gt; &lt;nick&gt; [comment]:  Kick client from channel"
+msgstr ""
+
+#: src/protocols/silc/silc.c:1388
+msgid "info [server]:  View server administrative details"
+msgstr ""
+
+#: src/protocols/silc/silc.c:1392
+msgid "ban [&lt;channel&gt; +|-&lt;nick&gt;]:  Ban client from channel"
+msgstr ""
+
+#: src/protocols/silc/silc.c:1396
+msgid "getkey &lt;nick|server&gt;:  Retrieve client's or server's public key"
+msgstr ""
+
+#: src/protocols/silc/silc.c:1400
+msgid "stats:  View server and network statistics"
+msgstr ""
+
+#: src/protocols/silc/silc.c:1404
+msgid "ping:  Send PING to the connected server"
+msgstr ""
+
+#: src/protocols/silc/silc.c:1409
+msgid "users &lt;channel&gt;:  List users in channel"
+msgstr ""
+"users &lt;канал&gt;:  Вывести список пользователей, присутствующих на канале"
+
+#: src/protocols/silc/silc.c:1413
+msgid ""
+"names [-count|-ops|-halfops|-voices|-normal] &lt;channel(s)&gt;:  List "
+"specific users in channel(s)"
+msgstr ""
+
+#: src/protocols/silc/silc.c:1425
 msgid "Instant Messages"
 msgstr "Сообщения"
 
-#: src/protocols/silc/silc.c:1250
+#: src/protocols/silc/silc.c:1430
 msgid "Digitally sign all IM messages"
 msgstr "Делать цифровую подпись всех сообщений"
 
-#: src/protocols/silc/silc.c:1255
+#: src/protocols/silc/silc.c:1435
 msgid "Verify all IM message signatures"
 msgstr "Проверять подписи всех сообщений"
 
-#: src/protocols/silc/silc.c:1258
+#: src/protocols/silc/silc.c:1438
 msgid "Channel Messages"
 msgstr "Сообщения канала"
 
-#: src/protocols/silc/silc.c:1263
+#: src/protocols/silc/silc.c:1443
 msgid "Digitally sign all channel messages"
 msgstr "Делать цифровую подпись всех сообщений канала"
 
-#: src/protocols/silc/silc.c:1268
+#: src/protocols/silc/silc.c:1448
 msgid "Verify all channel message signatures"
 msgstr "Проверять подписи всех сообщений канала"
 
-#: src/protocols/silc/silc.c:1271
+#: src/protocols/silc/silc.c:1451
 msgid "Default SILC Key Pair"
 msgstr ""
 
-#: src/protocols/silc/silc.c:1276
+#: src/protocols/silc/silc.c:1456
 msgid "SILC Public Key"
 msgstr "Публичный ключ SILC"
 
-#: src/protocols/silc/silc.c:1281
+#: src/protocols/silc/silc.c:1461
 msgid "SILC Private Key"
 msgstr "Личный ключ SILC"
 
@@ -9407,42 +9598,42 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/silc/silc.c:1365
+#: src/protocols/silc/silc.c:1547
 msgid "SILC Protocol Plugin"
 msgstr "Модуль протокола SILC"
 
 #. *  description
-#: src/protocols/silc/silc.c:1367
+#: src/protocols/silc/silc.c:1549
 msgid "Secure Internet Live Conferencing (SILC) Protocol"
 msgstr "Протокол Secure Internet Live Conferencing (SILC)"
 
-#: src/protocols/silc/silc.c:1397
+#: src/protocols/silc/silc.c:1579
 msgid "Public key authentication"
 msgstr "Идентификация публичного ключа"
 
-#: src/protocols/silc/silc.c:1403
+#: src/protocols/silc/silc.c:1585
 msgid "Public Key File"
 msgstr "Файл публичного ключа"
 
-#: src/protocols/silc/silc.c:1407
+#: src/protocols/silc/silc.c:1589
 msgid "Private Key File"
 msgstr "Файл личного ключа"
 
-#: src/protocols/silc/silc.c:1412
+#: src/protocols/silc/silc.c:1594
 msgid "Reject watching by other users"
 msgstr "Запретить просмотр другими пользователями"
 
-#: src/protocols/silc/silc.c:1415
+#: src/protocols/silc/silc.c:1597
 msgid "Block invites"
 msgstr "Блокировать приглашения"
 
-#: src/protocols/silc/silc.c:1418
+#: src/protocols/silc/silc.c:1600
 msgid "Block IMs without Key Exchange"
 msgstr "Блокировать сообщения без обмена ключами"
 
-#: src/protocols/silc/silc.c:1421
+#: src/protocols/silc/silc.c:1603
 msgid "Reject online status attribute requests"
-msgstr "Отклонять запросы атрибутов сетевого статуса"
+msgstr "Отклонять запросы атрибута сетевого статуса"
 
 #: src/protocols/silc/util.c:202 src/protocols/silc/util.c:227
 msgid "Creating SILC key pair..."
@@ -9464,7 +9655,7 @@
 #: src/protocols/silc/util.c:314
 #, c-format
 msgid "EMail: \t\t%s\n"
-msgstr ""
+msgstr "EMail: \t\t%s\n"
 
 #: src/protocols/silc/util.c:316
 #, c-format
@@ -9483,8 +9674,8 @@
 
 #: src/protocols/silc/util.c:321
 #, c-format
-msgid "Algorithm: \t\t%s\n"
-msgstr "Алгоритм: \t\t%s\n"
+msgid "Algorithm: \t%s\n"
+msgstr "Алгоритм: \t%s\n"
 
 #: src/protocols/silc/util.c:322
 #, c-format
@@ -9510,6 +9701,22 @@
 msgid "Public Key Information"
 msgstr "Информация о публичном ключе"
 
+#: src/protocols/silc/util.c:512
+msgid "Paging"
+msgstr ""
+
+#: src/protocols/silc/util.c:536
+msgid "Computer"
+msgstr "Компьютер"
+
+#: src/protocols/silc/util.c:540
+msgid "PDA"
+msgstr "PDA"
+
+#: src/protocols/silc/util.c:542
+msgid "Terminal"
+msgstr "Терминал"
+
 #: src/protocols/toc/toc.c:137
 #, c-format
 msgid "Looking up %s"
@@ -9541,6 +9748,7 @@
 msgstr "Предупреждение %s не разрешено."
 
 #: src/protocols/toc/toc.c:495
+#, fuzzy
 msgid "A message has been dropped, you are exceeding the server speed limit."
 msgstr "Сообщение было брошено, вы превысили предел скорости сервера."
 
@@ -9557,13 +9765,13 @@
 #: src/protocols/toc/toc.c:504
 #, c-format
 msgid "You missed an IM from %s because it was too big."
-msgstr "Вы не получили сообщение от %s, так как оно было слишком большое."
+msgstr "Вы не получили сообщение от %s, так как оно было слишком велико."
 
 #: src/protocols/toc/toc.c:507
 #, c-format
 msgid "You missed an IM from %s because it was sent too fast."
 msgstr ""
-"Вы не получили сообщения от %s, так как они отправлялись слишком часто."
+"Вы не получили сообщение от %s, так как оно отправлялось слишком часто."
 
 #: src/protocols/toc/toc.c:510
 msgid "Failure."
@@ -9608,11 +9816,11 @@
 
 #: src/protocols/toc/toc.c:544
 msgid "The service is temporarily unavailable."
-msgstr "Этот сервис временно недоступен."
+msgstr "Сервис временно недоступен."
 
 #: src/protocols/toc/toc.c:547
 msgid "Your warning level is currently too high to log in."
-msgstr "Ваш уровень предупреждения слишком велик для входа."
+msgstr "Ваш уровень предупреждения сейчас слишком велик для входа."
 
 #: src/protocols/toc/toc.c:550
 msgid ""
@@ -9625,12 +9833,12 @@
 #: src/protocols/toc/toc.c:552
 #, c-format
 msgid "An unknown signon error has occurred: %s."
-msgstr "Неизвестная ошибка при соединении: %s."
+msgstr "Произошла неизвестная ошибка подключения: %s."
 
 #: src/protocols/toc/toc.c:555
 #, c-format
 msgid "An unknown error, %d, has occurred.  Info: %s"
-msgstr "Неизвестная ошибка, %d.  Информация: %s"
+msgstr "Произошла неизвестная ошибка %d. Информация: %s"
 
 #: src/protocols/toc/toc.c:576
 msgid "Connection Closed"
@@ -9638,15 +9846,16 @@
 
 #: src/protocols/toc/toc.c:616
 msgid "Waiting for reply..."
-msgstr "Ожидается ответ..."
+msgstr "Ожидание ответа..."
 
 #: src/protocols/toc/toc.c:695
+#, fuzzy
 msgid "TOC has come back from its pause. You may now send messages again."
 msgstr "TOC связь восстановлена. Вы можете отправлять сообщение "
 
 #: src/protocols/toc/toc.c:890
 msgid "Password Change Successful"
-msgstr "Пароль изменен успешно"
+msgstr "Пароль изменён успешно"
 
 #: src/protocols/toc/toc.c:894
 msgid "TOC has sent a PAUSE command."
@@ -9705,7 +9914,7 @@
 #: src/protocols/toc/toc.c:2086
 #, c-format
 msgid "%s requests you to send them a file"
-msgstr "%s запросил передачу ему файла от вас"
+msgstr "%s запросил передачу файла ему"
 
 #. *< api_version
 #. *< type
@@ -9718,15 +9927,15 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/toc/toc.c:2167 src/protocols/toc/toc.c:2169
+#: src/protocols/toc/toc.c:2169 src/protocols/toc/toc.c:2171
 msgid "TOC Protocol Plugin"
 msgstr "Модуль протокола TOC"
 
-#: src/protocols/toc/toc.c:2188
+#: src/protocols/toc/toc.c:2190
 msgid "TOC host"
 msgstr "Узел TOC"
 
-#: src/protocols/toc/toc.c:2192
+#: src/protocols/toc/toc.c:2194
 msgid "TOC port"
 msgstr "Порт TOC"
 
@@ -9810,48 +10019,47 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/trepia/trepia.c:1269 src/protocols/trepia/trepia.c:1271
+#: src/protocols/trepia/trepia.c:1271 src/protocols/trepia/trepia.c:1273
 msgid "Trepia Protocol Plugin"
 msgstr "Модуль протокола Trepia"
 
-#: src/protocols/yahoo/yahoo.c:328
+#: src/protocols/yahoo/yahoo.c:338
 msgid ""
 "You have been logged off as you have logged in on a different machine or "
 "device."
 msgstr ""
 
-#: src/protocols/yahoo/yahoo.c:798
+#: src/protocols/yahoo/yahoo.c:808
 msgid "Your Yahoo! message did not get sent."
-msgstr "Ваше сообщение Yahoo! не отправилось."
-
-#: src/protocols/yahoo/yahoo.c:817
+msgstr "Ваше сообщение Yahoo! не отправлено."
+
+#: src/protocols/yahoo/yahoo.c:827
 msgid "Buzz!!"
 msgstr ""
 
-#: src/protocols/yahoo/yahoo.c:860
+#: src/protocols/yahoo/yahoo.c:870
 #, c-format
 msgid "Yahoo! system message for %s:"
 msgstr "Системное сообщение Yahoo! для %s:"
 
-#: src/protocols/yahoo/yahoo.c:926
+#: src/protocols/yahoo/yahoo.c:936
 #, c-format
 msgid "%s has (retroactively) denied your request to add them to your list."
-msgstr "%s (опять) отклонил вашу просьбу добавить его в ваш список."
-
-#: src/protocols/yahoo/yahoo.c:929
+msgstr "%s (повторно) не разрешил добавить его в ваш список."
+
+#: src/protocols/yahoo/yahoo.c:939
 #, c-format
 msgid ""
 "%s has (retroactively) denied your request to add them to your list for the "
 "following reason: %s."
 msgstr ""
-"%s (опять) отклонил вашу просьбу добавить его в ваш список с объяснением:\n"
-"'%s'."
-
-#: src/protocols/yahoo/yahoo.c:932
+"%s (повторно) не разрешил добавить его в ваш список по следующей причине: %s."
+
+#: src/protocols/yahoo/yahoo.c:942
 msgid "Add buddy rejected"
 msgstr "В добавлении пользователя отказано"
 
-#: src/protocols/yahoo/yahoo.c:1688
+#: src/protocols/yahoo/yahoo.c:1702
 #, c-format
 msgid ""
 "The Yahoo server has requested the use of an unrecognized authentication "
@@ -9859,91 +10067,104 @@
 "on to Yahoo.  Check %s for updates."
 msgstr ""
 
-#: src/protocols/yahoo/yahoo.c:1691
+#: src/protocols/yahoo/yahoo.c:1705
 msgid "Failed Yahoo! Authentication"
 msgstr "Идентификация Yahoo! не прошла"
 
-#: src/protocols/yahoo/yahoo.c:1763
+#: src/protocols/yahoo/yahoo.c:1777
 #, c-format
 msgid ""
 "You have tried to ignore %s, but the user is on your buddy list.  Clicking "
 "\"Yes\" will remove and ignore the buddy."
 msgstr ""
 
-#: src/protocols/yahoo/yahoo.c:1766
+#: src/protocols/yahoo/yahoo.c:1780
 msgid "Ignore buddy?"
 msgstr "Игнорировать пользователя?"
 
-#: src/protocols/yahoo/yahoo.c:1799
+#: src/protocols/yahoo/yahoo.c:1814
 msgid "Invalid username."
 msgstr "Неверное имя пользователя."
 
-#: src/protocols/yahoo/yahoo.c:1802
+#: src/protocols/yahoo/yahoo.c:1825
+#, fuzzy
+msgid "Normal authencation failed!"
+msgstr "Идентификация завершилась неудачно"
+
+#: src/protocols/yahoo/yahoo.c:1826
+msgid ""
+"The normal authencation method has failed. This means either your password "
+"is incorrect, or Yahoo!'s authencation scheme has changed. Gaim will now "
+"attempt to log in using Web Messenger authencation, will which result in "
+"reduced functionality and features."
+msgstr ""
+
+#: src/protocols/yahoo/yahoo.c:1834
 msgid "Incorrect password."
 msgstr "Неверный пароль."
 
-#: src/protocols/yahoo/yahoo.c:1805
+#: src/protocols/yahoo/yahoo.c:1837
 msgid "Your account is locked, please log in to the Yahoo! website."
 msgstr "Ваша учётная запись заблокирована, войдите на веб-сайт Yahoo!."
 
-#: src/protocols/yahoo/yahoo.c:1808
+#: src/protocols/yahoo/yahoo.c:1840
 #, c-format
 msgid "Unknown error number %d. Logging into the Yahoo! website may fix this."
 msgstr ""
 "Неизвестная ошибка номер %d. Вхождение на веб-сайт Yahoo! может исправить "
 "это."
 
-#: src/protocols/yahoo/yahoo.c:1862
+#: src/protocols/yahoo/yahoo.c:1894
 #, c-format
 msgid "Could not add buddy %s to group %s to the server list on account %s."
 msgstr ""
 "Не удалось добавить пользователя %s в группу %s в списке на сервере учётной "
 "записи %s."
 
-#: src/protocols/yahoo/yahoo.c:1864
+#: src/protocols/yahoo/yahoo.c:1896
 msgid "Could not add buddy to server list"
 msgstr "Не удалось добавить пользователя в список на сервере"
 
-#: src/protocols/yahoo/yahoo.c:2055 src/protocols/yahoo/yahoo.c:2186
+#: src/protocols/yahoo/yahoo.c:2088 src/protocols/yahoo/yahoo.c:2216
 msgid "Unable to read"
 msgstr "Не удаётся прочитать"
 
-#: src/protocols/yahoo/yahoo.c:2208 src/protocols/yahoo/yahoo.c:2318
-#: src/protocols/yahoo/yahoo.c:2374 src/protocols/yahoo/yahoo.c:2384
-#: src/protocols/yahoo/yahoochat.c:1358 src/protocols/yahoo/yahoochat.c:1419
+#: src/protocols/yahoo/yahoo.c:2238 src/protocols/yahoo/yahoo.c:2348
+#: src/protocols/yahoo/yahoo.c:2398 src/protocols/yahoo/yahoo.c:2408
+#: src/protocols/yahoo/yahoochat.c:1397 src/protocols/yahoo/yahoochat.c:1458
 msgid "Connection problem"
 msgstr "Проблема с соединением"
 
-#: src/protocols/yahoo/yahoo.c:2472 src/protocols/yahoo/yahoo.c:2850
-#: src/protocols/yahoo/yahoo.c:2962
+#: src/protocols/yahoo/yahoo.c:2495 src/protocols/yahoo/yahoo.c:2857
+#: src/protocols/yahoo/yahoo.c:2971
 msgid "Not At Home"
 msgstr "Не дома"
 
-#: src/protocols/yahoo/yahoo.c:2474 src/protocols/yahoo/yahoo.c:2852
-#: src/protocols/yahoo/yahoo.c:2963
+#: src/protocols/yahoo/yahoo.c:2497 src/protocols/yahoo/yahoo.c:2859
+#: src/protocols/yahoo/yahoo.c:2972
 msgid "Not At Desk"
 msgstr "Не за столом"
 
-#: src/protocols/yahoo/yahoo.c:2476 src/protocols/yahoo/yahoo.c:2854
-#: src/protocols/yahoo/yahoo.c:2964
+#: src/protocols/yahoo/yahoo.c:2499 src/protocols/yahoo/yahoo.c:2861
+#: src/protocols/yahoo/yahoo.c:2973
 msgid "Not In Office"
 msgstr "Не в офисе"
 
-#: src/protocols/yahoo/yahoo.c:2480 src/protocols/yahoo/yahoo.c:2858
-#: src/protocols/yahoo/yahoo.c:2966
+#: src/protocols/yahoo/yahoo.c:2503 src/protocols/yahoo/yahoo.c:2865
+#: src/protocols/yahoo/yahoo.c:2975
 msgid "On Vacation"
 msgstr "В отпуске"
 
-#: src/protocols/yahoo/yahoo.c:2484 src/protocols/yahoo/yahoo.c:2862
-#: src/protocols/yahoo/yahoo.c:2968
+#: src/protocols/yahoo/yahoo.c:2507 src/protocols/yahoo/yahoo.c:2869
+#: src/protocols/yahoo/yahoo.c:2977
 msgid "Stepped Out"
 msgstr "Вышел"
 
-#: src/protocols/yahoo/yahoo.c:2565 src/protocols/yahoo/yahoo.c:2591
+#: src/protocols/yahoo/yahoo.c:2588 src/protocols/yahoo/yahoo.c:2614
 msgid "Not on server list"
 msgstr "Не в списке на сервере"
 
-#: src/protocols/yahoo/yahoo.c:2611
+#: src/protocols/yahoo/yahoo.c:2634
 #, c-format
 msgid ""
 "\n"
@@ -9952,27 +10173,27 @@
 "\n"
 "<b>%s:</b> %s"
 
-#: src/protocols/yahoo/yahoo.c:2682
+#: src/protocols/yahoo/yahoo.c:2693
 msgid "Join in Chat"
 msgstr "Присоединиться к чату"
 
-#: src/protocols/yahoo/yahoo.c:2686
+#: src/protocols/yahoo/yahoo.c:2698
 msgid "Initiate Conference"
 msgstr "Создать конференцию"
 
-#: src/protocols/yahoo/yahoo.c:2743
+#: src/protocols/yahoo/yahoo.c:2750
 msgid "Active which ID?"
 msgstr "Активировать какой ID?"
 
-#: src/protocols/yahoo/yahoo.c:2752
+#: src/protocols/yahoo/yahoo.c:2759
 msgid "Join who in chat?"
 msgstr "К кому присоединиться в чате?"
 
-#: src/protocols/yahoo/yahoo.c:2762
+#: src/protocols/yahoo/yahoo.c:2769
 msgid "Activate ID..."
 msgstr "Активировать ID..."
 
-#: src/protocols/yahoo/yahoo.c:2766
+#: src/protocols/yahoo/yahoo.c:2773
 msgid "Join user in chat..."
 msgstr "Присоединиться к пользователю в чате..."
 
@@ -9987,208 +10208,299 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/yahoo/yahoo.c:3286 src/protocols/yahoo/yahoo.c:3288
+#: src/protocols/yahoo/yahoo.c:3292 src/protocols/yahoo/yahoo.c:3294
 msgid "Yahoo Protocol Plugin"
 msgstr "Модуль протокола Yahoo"
 
-#: src/protocols/yahoo/yahoo.c:3307
+#: src/protocols/yahoo/yahoo.c:3313
 msgid "Yahoo Japan"
 msgstr "Yahoo Japan"
 
-#: src/protocols/yahoo/yahoo.c:3310
+#: src/protocols/yahoo/yahoo.c:3316
 msgid "Pager host"
 msgstr ""
 
-#: src/protocols/yahoo/yahoo.c:3313
-msgid "Japan Pager host"
-msgstr ""
-
-#: src/protocols/yahoo/yahoo.c:3316
-msgid "Pager port"
-msgstr ""
-
 #: src/protocols/yahoo/yahoo.c:3319
-msgid "File transfer host"
-msgstr "Узел передачи файлов"
+msgid "Japan Pager host"
+msgstr ""
 
 #: src/protocols/yahoo/yahoo.c:3322
-msgid "Japan File transfer host"
+msgid "Pager port"
 msgstr ""
 
 #: src/protocols/yahoo/yahoo.c:3325
+msgid "File transfer host"
+msgstr "Узел передачи файлов"
+
+#: src/protocols/yahoo/yahoo.c:3328
+msgid "Japan File transfer host"
+msgstr ""
+
+#: src/protocols/yahoo/yahoo.c:3331
 msgid "File transfer port"
 msgstr "Порт передачи файлов"
 
-#: src/protocols/yahoo/yahoo.c:3328
+#: src/protocols/yahoo/yahoo.c:3334
 msgid "Chat Room List Url"
 msgstr "Url списка чатов"
 
+#: src/protocols/yahoo/yahoo.c:3337
+msgid "YCHT Host"
+msgstr "Узел YCHT"
+
+#: src/protocols/yahoo/yahoo.c:3340
+msgid "YCHT Port"
+msgstr "Порт YCHT"
+
 #: src/protocols/yahoo/yahoo_filexfer.c:170
 msgid ""
 "Gaim cannot send files over Yahoo! that are bigger than One Megabyte "
 "(1,048,576 bytes)."
 msgstr ""
 
-#: src/protocols/yahoo/yahoo_profile.c:640
-#: src/protocols/yahoo/yahoo_profile.c:961
-msgid "Yahoo! ID"
-msgstr "Yahoo! ID"
-
-#: src/protocols/yahoo/yahoo_profile.c:664
+#: src/protocols/yahoo/yahoo_profile.c:675
 #, c-format
 msgid "<b>IP Address:</b> %s<br>"
 msgstr "<b>IP-адрес:</b> %s<br>"
 
-#: src/protocols/yahoo/yahoo_profile.c:779
+#: src/protocols/yahoo/yahoo_profile.c:749
+msgid "Yahoo! Japan Profile"
+msgstr "Профиль Yahoo! Japan"
+
+#: src/protocols/yahoo/yahoo_profile.c:750
+msgid "Yahoo! Profile"
+msgstr "Профиль Yahoo!"
+
+#: src/protocols/yahoo/yahoo_profile.c:794
 msgid ""
 "Sorry, profiles marked as containing adult content are not supported at this "
 "time."
 msgstr ""
 
-#: src/protocols/yahoo/yahoo_profile.c:781
-#: src/protocols/yahoo/yahoo_profile.c:829
+#: src/protocols/yahoo/yahoo_profile.c:796
 msgid ""
 "If you wish to view this profile, you will need to visit this link in your "
 "web browser"
 msgstr ""
 
-#: src/protocols/yahoo/yahoo_profile.c:827
-msgid ""
-"Sorry, this profile seems to be in a language that is not supported at this "
-"time."
-msgstr ""
-
-#: src/protocols/yahoo/yahoo_profile.c:1038
-#: src/protocols/yahoo/yahoo_profile.c:1042
-#: src/protocols/yahoo/yahoo_profile.c:1046
+#: src/protocols/yahoo/yahoo_profile.c:969
+msgid "Yahoo! ID"
+msgstr "Yahoo! ID"
+
+#: src/protocols/yahoo/yahoo_profile.c:1043
+#: src/protocols/yahoo/yahoo_profile.c:1047
+#: src/protocols/yahoo/yahoo_profile.c:1051
 msgid "Hobbies"
 msgstr "Хобби"
 
-#: src/protocols/yahoo/yahoo_profile.c:1056
-#: src/protocols/yahoo/yahoo_profile.c:1060
+#: src/protocols/yahoo/yahoo_profile.c:1061
+#: src/protocols/yahoo/yahoo_profile.c:1065
 msgid "Latest News"
 msgstr "Последние новости"
 
-#: src/protocols/yahoo/yahoo_profile.c:1081
+#: src/protocols/yahoo/yahoo_profile.c:1086
 msgid "Home Page"
 msgstr "Домашняя страница"
 
-#: src/protocols/yahoo/yahoo_profile.c:1096
-msgid "Cool Link 1"
-msgstr ""
-
 #: src/protocols/yahoo/yahoo_profile.c:1101
+msgid "Cool Link 1"
+msgstr ""
+
+#: src/protocols/yahoo/yahoo_profile.c:1106
 msgid "Cool Link 2"
 msgstr ""
 
-#: src/protocols/yahoo/yahoo_profile.c:1105
+#: src/protocols/yahoo/yahoo_profile.c:1110
 msgid "Cool Link 3"
 msgstr ""
 
-#: src/protocols/yahoo/yahoo_profile.c:1138
+#: src/protocols/yahoo/yahoo_profile.c:1130
 #, c-format
 msgid "User information for %s unavailable"
 msgstr "Информация о пользователе %s недоступна"
 
-#: src/protocols/yahoo/yahoochat.c:198
+#: src/protocols/yahoo/yahoo_profile.c:1136
+msgid ""
+"Sorry, this profile seems to be in a language that is not supported at this "
+"time."
+msgstr ""
+
+#: src/protocols/yahoo/yahoo_profile.c:1152
+msgid ""
+"Could not retrieve the user's profile. This most likely is a temporary "
+"server-side problem. Please try again later."
+msgstr ""
+
+#: src/protocols/yahoo/yahoo_profile.c:1155
+msgid ""
+"Could not retrieve the user's profile. This most likely means that the user "
+"does not exist; however, Yahoo! sometimes does fail to find a user's "
+"profile. If you know that the user exists, please try again later."
+msgstr ""
+
+#: src/protocols/yahoo/yahoo_profile.c:1163
+msgid "The user's profile is empty."
+msgstr "Профиль пользователя пуст."
+
+#: src/protocols/yahoo/yahoochat.c:203
 #, c-format
 msgid "%s declined your conference invitation to room \"%s\" because \"%s\"."
 msgstr ""
 
-#: src/protocols/yahoo/yahoochat.c:200
+#: src/protocols/yahoo/yahoochat.c:205
 msgid "Invitation Rejected"
 msgstr "В приглашении отказано"
 
-#: src/protocols/yahoo/yahoochat.c:350
+#: src/protocols/yahoo/yahoochat.c:355
 msgid "Failed to join chat"
 msgstr "Не удалось присоединиться к чату"
 
-#: src/protocols/yahoo/yahoochat.c:350
+#: src/protocols/yahoo/yahoochat.c:355
 msgid "Maybe the room is full?"
 msgstr "Может быть, комната полна?"
 
-#: src/protocols/yahoo/yahoochat.c:424
+#: src/protocols/yahoo/yahoochat.c:429
 #, c-format
 msgid "You are now chatting in %s."
 msgstr "Вы разговариваете в %s."
 
-#: src/protocols/yahoo/yahoochat.c:578
+#: src/protocols/yahoo/yahoochat.c:583
 msgid "Failed to join buddy in chat"
 msgstr "Не удалось присоединиться к пользователю в чате"
 
-#: src/protocols/yahoo/yahoochat.c:579
+#: src/protocols/yahoo/yahoochat.c:584
 msgid "Maybe they're not in a chat?"
 msgstr "Может быть, он не в чате?"
 
-#: src/protocols/yahoo/yahoochat.c:1299
+#: src/protocols/yahoo/yahoochat.c:1338
 msgid "Unable to connect"
 msgstr "Не удаётся установить соединение"
 
-#: src/protocols/yahoo/yahoochat.c:1299
+#: src/protocols/yahoo/yahoochat.c:1338
 msgid "Fetching the room list failed."
 msgstr "Не удалось загрузить список комнат."
 
-#: src/protocols/yahoo/yahoochat.c:1344
+#: src/protocols/yahoo/yahoochat.c:1383
 msgid "Voices"
 msgstr "Голос"
 
-#: src/protocols/yahoo/yahoochat.c:1347
+#: src/protocols/yahoo/yahoochat.c:1386
 msgid "Webcams"
 msgstr ""
 
-#: src/protocols/yahoo/yahoochat.c:1358 src/protocols/yahoo/yahoochat.c:1419
+#: src/protocols/yahoo/yahoochat.c:1397 src/protocols/yahoo/yahoochat.c:1458
 msgid "Unable to fetch room list."
 msgstr "Не удаётся загрузить список комнат."
 
-#: src/protocols/yahoo/yahoochat.c:1412
+#: src/protocols/yahoo/yahoochat.c:1451
 msgid "User Rooms"
 msgstr "Комнаты пользователя"
 
-#: src/protocols/zephyr/zephyr.c:566
+#: src/protocols/zephyr/zephyr.c:589
 #, c-format
 msgid "Unable send to chat %s,%s,%s"
 msgstr "Не удаётся отправить в чат %s,%s,%s"
 
-#: src/protocols/zephyr/zephyr.c:600
+#: src/protocols/zephyr/zephyr.c:624
 #, c-format
 msgid "<b>User:</b> %s<br>"
 msgstr "<b>Пользователь:</b> %s<br>"
 
-#: src/protocols/zephyr/zephyr.c:604
+#: src/protocols/zephyr/zephyr.c:628
 msgid "<br>Hidden or not logged-in"
 msgstr "<br>Сркрыт или не в сети"
 
-#: src/protocols/zephyr/zephyr.c:608
+#: src/protocols/zephyr/zephyr.c:633
 #, c-format
 msgid "<br>At %s since %s"
 msgstr "<br>В %s с %s"
 
-#: src/protocols/zephyr/zephyr.c:873 src/protocols/zephyr/zephyr.c:874
+#: src/protocols/zephyr/zephyr.c:983 src/protocols/zephyr/zephyr.c:984
 msgid "Anyone"
 msgstr "Любой"
 
-#: src/protocols/zephyr/zephyr.c:900
+#: src/protocols/zephyr/zephyr.c:1011
 msgid "Already logged in with Zephyr"
 msgstr "Уже в сети Zephyr"
 
-#: src/protocols/zephyr/zephyr.c:900
+#: src/protocols/zephyr/zephyr.c:1011
 msgid ""
 "Because Zephyr uses your system username, you are unable to have multiple "
 "accounts on it when logged in as the same user."
 msgstr ""
 
-#: src/protocols/zephyr/zephyr.c:1232
+#: src/protocols/zephyr/zephyr.c:1386
 msgid "_Class:"
 msgstr "Класс:"
 
-#: src/protocols/zephyr/zephyr.c:1238
+#: src/protocols/zephyr/zephyr.c:1392
 msgid "_Instance:"
 msgstr "Копия:"
 
-#: src/protocols/zephyr/zephyr.c:1244
+#: src/protocols/zephyr/zephyr.c:1398
 msgid "_Recipient:"
 msgstr "Получатель:"
 
+#: src/protocols/zephyr/zephyr.c:1409
+#, c-format
+msgid "Attempt to subscribe to %s,%s,%s failed"
+msgstr ""
+
+#: src/protocols/zephyr/zephyr.c:1678
+msgid "zlocate &lt;nick&gt;: Locate user"
+msgstr ""
+
+#: src/protocols/zephyr/zephyr.c:1683
+msgid "zl &lt;nick&gt;: Locate user"
+msgstr ""
+
+#: src/protocols/zephyr/zephyr.c:1688
+msgid "instance &lt;instance&gt;: Set the instance to be used on this class"
+msgstr ""
+
+#: src/protocols/zephyr/zephyr.c:1693
+msgid "inst &lt;instance&gt;: Set the instance to be used on this class"
+msgstr ""
+
+#: src/protocols/zephyr/zephyr.c:1699
+msgid "sub &lt;class&gt; &lt;instance&gt; &lt;recipient&gt;: Join a new chat"
+msgstr ""
+
+#: src/protocols/zephyr/zephyr.c:1704
+msgid ""
+"zi &lt;instance&gt;: Send a message to &lt;message,<i>instance</i>,*&gt;"
+msgstr ""
+
+#: src/protocols/zephyr/zephyr.c:1710
+msgid ""
+"zci &lt;class&gt; &lt;instance&gt;: Send a message to &lt;<i>class</i>,"
+"<i>instance</i>,*&gt;"
+msgstr ""
+
+#: src/protocols/zephyr/zephyr.c:1716
+msgid ""
+"zcir &lt;class&gt; &lt;instance&gt; &lt;recipient&gt;: Send a message to &lt;"
+"<i>class</i>,<i>instance</i>,<i>recipient</i>&gt;"
+msgstr ""
+
+#: src/protocols/zephyr/zephyr.c:1722
+msgid ""
+"zir &lt;instance&gt; &lt;recipient&gt;: Send a message to &lt;MESSAGE,"
+"<i>instance</i>,<i>recipient</i>&gt;"
+msgstr ""
+
+#: src/protocols/zephyr/zephyr.c:1727
+msgid "zc &lt;class&gt;: Send a message to &lt;<i>class</i>,PERSONAL,*&gt;"
+msgstr ""
+
+#: src/protocols/zephyr/zephyr.c:1802
+msgid "Resubscribe"
+msgstr "Подписаться повторно"
+
+#: src/protocols/zephyr/zephyr.c:1805
+msgid "Retrieve subscriptions from server"
+msgstr ""
+
 #. *< api_version
 #. *< type
 #. *< ui_requirement
@@ -10200,19 +10512,19 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/zephyr/zephyr.c:1412 src/protocols/zephyr/zephyr.c:1414
+#: src/protocols/zephyr/zephyr.c:1885 src/protocols/zephyr/zephyr.c:1887
 msgid "Zephyr Protocol Plugin"
 msgstr "Модуль протокола Zephyr"
 
-#: src/protocols/zephyr/zephyr.c:1433
+#: src/protocols/zephyr/zephyr.c:1906
 msgid "Export to .anyone"
 msgstr ""
 
-#: src/protocols/zephyr/zephyr.c:1436
+#: src/protocols/zephyr/zephyr.c:1909
 msgid "Export to .zephyr.subs"
 msgstr ""
 
-#: src/protocols/zephyr/zephyr.c:1439
+#: src/protocols/zephyr/zephyr.c:1912
 msgid "Exposure"
 msgstr ""
 
@@ -10239,14 +10551,14 @@
 msgstr "Имя узла или номер порта, указанные для данного типа прокси, неверны."
 
 #. * Custom away message.
-#: src/prpl.h:205
+#: src/prpl.h:165
 msgid "Custom"
 msgstr "Другое"
 
 #. *
 #. * A wrapper for gaim_request_action() that uses Accept and Cancel buttons.
 #.
-#: src/request.h:1252
+#: src/request.h:1253
 msgid "Accept"
 msgstr "Принять"
 
@@ -10270,27 +10582,27 @@
 msgid "(1 message)"
 msgstr "(1 сообщение)"
 
-#: src/server.c:1176 src/server.c:1186
+#: src/server.c:1180 src/server.c:1189
 #, c-format
 msgid "%s logged in."
 msgstr "%s в сети."
 
-#: src/server.c:1199
+#: src/server.c:1201
 #, c-format
 msgid "%s signed on"
 msgstr "%s вошёл"
 
-#: src/server.c:1215
+#: src/server.c:1216
 #, c-format
 msgid "%s came back"
 msgstr "%s вернулся"
 
-#: src/server.c:1217
+#: src/server.c:1218
 #, c-format
 msgid "%s went away"
 msgstr "%s отошёл"
 
-#: src/server.c:1231
+#: src/server.c:1232
 #, c-format
 msgid "%s became idle"
 msgstr "%s начал бездействовать"
@@ -10300,28 +10612,28 @@
 msgid "%s became unidle"
 msgstr "%s перестал бездействовать"
 
-#: src/server.c:1254 src/server.c:1262
+#: src/server.c:1253 src/server.c:1260
 #, c-format
 msgid "%s logged out."
 msgstr "%s не в сети."
 
-#: src/server.c:1276
+#: src/server.c:1273
 #, c-format
 msgid "%s signed off"
 msgstr "%s вышел"
 
-#: src/server.c:1338
+#: src/server.c:1335
 #, c-format
 msgid ""
 "%s has just been warned by %s.\n"
 "Your new warning level is %d%%"
 msgstr ""
 
-#: src/server.c:1341
+#: src/server.c:1338
 msgid "an anonymous person"
 msgstr "анонимная персона"
 
-#: src/server.c:1451
+#: src/server.c:1448
 #, c-format
 msgid ""
 "User '%s' invites %s to buddy chat room: '%s'\n"
@@ -10330,12 +10642,12 @@
 "Пользователь '%s' приглашает %s в чат: '%s'\n"
 "%s"
 
-#: src/server.c:1455
+#: src/server.c:1452
 #, c-format
 msgid "User '%s' invites %s to buddy chat room: '%s'\n"
 msgstr "Пользователь '%s' приглашет %s в чат: '%s'\n"
 
-#: src/server.c:1461
+#: src/server.c:1458
 msgid "Accept chat invitation?"
 msgstr "Принять приглашение в чат?"
 
@@ -10370,25 +10682,31 @@
 msgid "Unknown."
 msgstr "Неизвестно."
 
-#: src/util.c:2399
+#: src/util.c:2392
+msgid "second"
+msgid_plural "seconds"
+msgstr[0] "секунда"
+msgstr[1] "секунд"
+
+#: src/util.c:2406
 msgid "day"
 msgid_plural "days"
 msgstr[0] "день"
 msgstr[1] "дней"
 
-#: src/util.c:2407
+#: src/util.c:2414
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "час"
 msgstr[1] "часов"
 
-#: src/util.c:2415
+#: src/util.c:2422
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "минута"
 msgstr[1] "минут"
 
-#: src/util.c:2825
+#: src/util.c:2832
 msgid "g003: Error opening connection.\n"
 msgstr "g003: Ошибка открытия соединения.\n"
 
--- a/po/zh_CN.po	Tue Jul 13 23:05:59 2004 +0000
+++ b/po/zh_CN.po	Wed Jul 14 19:05:16 2004 +0000
@@ -7,8 +7,8 @@
 msgstr ""
 "Project-Id-Version: gaim\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-06-21 00:02-0400\n"
-"PO-Revision-Date: 2004-06-21 21:56+0800\n"
+"POT-Creation-Date: 2004-07-13 00:01-0400\n"
+"PO-Revision-Date: 2004-07-14 11:58+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
 "MIME-Version: 1.0\n"
@@ -142,7 +142,7 @@
 msgid "Gaim - Away"
 msgstr "Gaim - 离开"
 
-#: plugins/docklet/docklet.c:114 src/gtkaccount.c:643 src/gtkaccount.c:2065
+#: plugins/docklet/docklet.c:114 src/gtkaccount.c:727 src/gtkaccount.c:2152
 msgid "Auto-login"
 msgstr "自动登录"
 
@@ -158,13 +158,13 @@
 msgid "New..."
 msgstr "新建..."
 
-#: plugins/docklet/docklet.c:153 src/gtkprefs.c:1796 src/protocols/gg/gg.c:51
-#: src/protocols/irc/msgs.c:187 src/protocols/jabber/jabber.c:959
+#: plugins/docklet/docklet.c:153 src/gtkprefs.c:1809 src/protocols/gg/gg.c:51
+#: src/protocols/irc/msgs.c:187 src/protocols/jabber/jabber.c:960
 #: src/protocols/jabber/jutil.c:32 src/protocols/jabber/presence.c:63
-#: src/protocols/jabber/presence.c:119 src/protocols/novell/novell.c:2718
-#: src/protocols/novell/novell.c:2835 src/protocols/novell/novell.c:2887
-#: src/protocols/oscar/oscar.c:528 src/protocols/oscar/oscar.c:5465
-#: src/protocols/oscar/oscar.c:6463 src/protocols/oscar/oscar.c:6662
+#: src/protocols/jabber/presence.c:119 src/protocols/novell/novell.c:2724
+#: src/protocols/novell/novell.c:2841 src/protocols/novell/novell.c:2893
+#: src/protocols/oscar/oscar.c:532 src/protocols/oscar/oscar.c:5481
+#: src/protocols/oscar/oscar.c:6480 src/protocols/oscar/oscar.c:6679
 #: src/protocols/silc/buddy.c:1379 src/protocols/silc/silc.c:46
 #: src/protocols/silc/silc.c:76
 msgid "Away"
@@ -172,7 +172,7 @@
 
 #. else...
 #: plugins/docklet/docklet.c:159 src/away.c:550
-#: src/protocols/oscar/oscar.c:5383 src/protocols/oscar/oscar.c:6670
+#: src/protocols/oscar/oscar.c:5399 src/protocols/oscar/oscar.c:6687
 msgid "Back"
 msgstr "回来"
 
@@ -180,15 +180,15 @@
 msgid "Mute Sounds"
 msgstr "静音"
 
-#: plugins/docklet/docklet.c:172 src/gtkft.c:619
+#: plugins/docklet/docklet.c:172 src/gtkft.c:612
 msgid "File Transfers"
 msgstr "文件传送"
 
-#: plugins/docklet/docklet.c:173 src/gtkaccount.c:2244
+#: plugins/docklet/docklet.c:173 src/gtkaccount.c:2333
 msgid "Accounts"
 msgstr "账户"
 
-#: plugins/docklet/docklet.c:174 src/gtkprefs.c:2490
+#: plugins/docklet/docklet.c:174 src/gtkprefs.c:2503
 msgid "Preferences"
 msgstr "首选项"
 
@@ -238,18 +238,22 @@
 "并允许快速访问常用的功能,以及切换好友列表或登录窗口的显示。同时,与 ICQ 类"
 "似,还可以将消息存入队列。"
 
-#: plugins/extplacement.c:68
+#: plugins/extplacement.c:75
 msgid "By conversation count"
 msgstr "按对话计数"
 
-#: plugins/extplacement.c:89
+#: plugins/extplacement.c:96
 msgid "Conversation Placement"
 msgstr "交谈放置"
 
-#: plugins/extplacement.c:94
+#: plugins/extplacement.c:101
 msgid "Number of conversations per window"
 msgstr "每个窗口的对话数"
 
+#: plugins/extplacement.c:107
+msgid "Separate IM and Chat windows when placing by number"
+msgstr "按数字放置时分离即时消息和聊天窗口"
+
 #. *< api_version
 #. *< type
 #. *< ui_requirement
@@ -257,23 +261,23 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/extplacement.c:114
+#: plugins/extplacement.c:126
 msgid "ExtPlacement"
 msgstr "扩展放置"
 
 #. *< name
 #. *< version
-#: plugins/extplacement.c:116
+#: plugins/extplacement.c:128
 msgid "Extra conversation placement options."
 msgstr "额外的对话放置选项。"
 
 #. *< summary
 #. *  description
-#: plugins/extplacement.c:118
-msgid ""
-"Either restrict the number of conversations per windows or use separate "
-"windows for IMs and Chats"
-msgstr "限制每个窗口的对话数,或者为即时消息和聊天使用单独的窗口"
+#: plugins/extplacement.c:130
+msgid ""
+"Restrict the number of conversations per windows, optionally separating IMs "
+"and Chats"
+msgstr "限制每个窗口的对话数,可选分离即时消息和聊天窗口"
 
 #. *< api_version
 #. *< type
@@ -432,100 +436,100 @@
 "向上再向左可切换到上个对话。\n"
 "向上再向右可切换到下个对话。"
 
-#: plugins/gevolution/add_buddy_dialog.c:136
-#: plugins/gevolution/assoc-buddy.c:74
+#: plugins/gevolution/add_buddy_dialog.c:133
+#: plugins/gevolution/assoc-buddy.c:71
 msgid "Local Addressbook"
 msgstr "本地地址簿"
 
-#: plugins/gevolution/add_buddy_dialog.c:146
-#: plugins/gevolution/add_buddy_dialog.c:157
-#: plugins/gevolution/assoc-buddy.c:84 plugins/gevolution/assoc-buddy.c:95
-#: src/gtkblist.c:2982 src/gtkprefs.c:913 src/gtkprefs.c:966
-#: src/gtkprefs.c:1809 src/protocols/jabber/jabber.c:923
+#: plugins/gevolution/add_buddy_dialog.c:143
+#: plugins/gevolution/add_buddy_dialog.c:154
+#: plugins/gevolution/assoc-buddy.c:81 plugins/gevolution/assoc-buddy.c:92
+#: src/gtkblist.c:3015 src/gtkprefs.c:961 src/gtkprefs.c:1014
+#: src/gtkprefs.c:1822 src/protocols/jabber/jabber.c:924
 msgid "None"
 msgstr "无"
 
-#: plugins/gevolution/add_buddy_dialog.c:190
-#: plugins/gevolution/assoc-buddy.c:178 src/gtkprefs.c:2162
-#: src/gtkroomlist.c:553 src/protocols/jabber/jabber.c:597
-#: src/protocols/msn/msn.c:1286 src/protocols/trepia/trepia.c:398
+#: plugins/gevolution/add_buddy_dialog.c:187
+#: plugins/gevolution/assoc-buddy.c:175 src/gtkprefs.c:2175
+#: src/gtkroomlist.c:553 src/protocols/jabber/jabber.c:598
+#: src/protocols/msn/msn.c:1311 src/protocols/trepia/trepia.c:398
 msgid "Name"
 msgstr "名称"
 
-#: plugins/gevolution/add_buddy_dialog.c:201
+#: plugins/gevolution/add_buddy_dialog.c:198
 msgid "Instant Messaging"
 msgstr "即时通讯"
 
 #. Add the label.
-#: plugins/gevolution/add_buddy_dialog.c:482
+#: plugins/gevolution/add_buddy_dialog.c:479
 msgid "Select a person from your address book below, or add a new person."
 msgstr "下面是您的地址簿,请从中选择一个人,或者另外添加一个人。"
 
 #. "Search"
-#: plugins/gevolution/add_buddy_dialog.c:495
-#: plugins/gevolution/assoc-buddy.c:383 src/protocols/oscar/oscar.c:6949
+#: plugins/gevolution/add_buddy_dialog.c:492
+#: plugins/gevolution/assoc-buddy.c:380 src/protocols/oscar/oscar.c:6965
 msgid "Search"
 msgstr "搜索"
 
-#: plugins/gevolution/add_buddy_dialog.c:566
-#: plugins/gevolution/new_person_dialog.c:310 src/gtkblist.c:4011
-#: src/gtkblist.c:4339
+#: plugins/gevolution/add_buddy_dialog.c:563
+#: plugins/gevolution/new_person_dialog.c:307 src/gtkblist.c:4045
+#: src/gtkblist.c:4373
 msgid "Group:"
 msgstr "组:"
 
 #. "New Person" button
-#: plugins/gevolution/add_buddy_dialog.c:592
-#: plugins/gevolution/assoc-buddy.c:486
+#: plugins/gevolution/add_buddy_dialog.c:589
+#: plugins/gevolution/assoc-buddy.c:483
 msgid "New Person"
 msgstr "新建联系人"
 
 #. "Select Buddy" button
-#: plugins/gevolution/add_buddy_dialog.c:609
+#: plugins/gevolution/add_buddy_dialog.c:606
 msgid "Select Buddy"
 msgstr "选择好友"
 
 #. Add the label.
-#: plugins/gevolution/assoc-buddy.c:370
+#: plugins/gevolution/assoc-buddy.c:367
 msgid ""
 "Select a person from your address book to add this buddy to, or create a new "
 "person."
 msgstr "从您的地址簿中选择一个人可将其加为好友,您也可以创建一个新联系人。"
 
 #. Add the disclosure
-#: plugins/gevolution/assoc-buddy.c:449
+#: plugins/gevolution/assoc-buddy.c:446
 msgid "Show user details"
 msgstr "显示用户细节"
 
-#: plugins/gevolution/assoc-buddy.c:450
+#: plugins/gevolution/assoc-buddy.c:447
 msgid "Hide user details"
 msgstr "隐藏用户细节"
 
 #. "Associate Buddy" button
-#: plugins/gevolution/assoc-buddy.c:503
+#: plugins/gevolution/assoc-buddy.c:500
 msgid "_Associate Buddy"
 msgstr "关联好友(_A)"
 
-#: plugins/gevolution/gevo-util.c:66 plugins/gevolution/gevolution.c:90
-#: src/blist.c:775 src/blist.c:963 src/blist.c:2060 src/gtkblist.c:3832
+#: plugins/gevolution/gevo-util.c:64 plugins/gevolution/gevolution.c:89
+#: src/blist.c:775 src/blist.c:963 src/blist.c:1870 src/gtkblist.c:3866
 #: src/protocols/jabber/roster.c:66
 msgid "Buddies"
 msgstr "好友"
 
-#: plugins/gevolution/gevolution.c:221
+#: plugins/gevolution/gevolution.c:220
 msgid "Add to Address Book"
 msgstr "添加到地址簿"
 
 #. Configuration frame
-#: plugins/gevolution/gevolution.c:352
+#: plugins/gevolution/gevolution.c:351
 msgid "Evolution Integration Configuration"
 msgstr "Evolution 集成配置"
 
 #. Label
-#: plugins/gevolution/gevolution.c:355
+#: plugins/gevolution/gevolution.c:354
 msgid "Select all accounts that buddies should be auto-added to."
 msgstr "选择要将好友自动添加到哪些账户。"
 
-#: plugins/gevolution/gevolution.c:385 plugins/idle.c:51 src/gtkconn.c:620
+#: plugins/gevolution/gevolution.c:384 plugins/idle.c:51 src/gtkconn.c:620
 msgid "Account"
 msgstr "账户"
 
@@ -536,7 +540,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/gevolution/gevolution.c:466
+#: plugins/gevolution/gevolution.c:465
 msgid "Evolution Integration"
 msgstr "Evolution 集成"
 
@@ -544,46 +548,46 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/gevolution/gevolution.c:469 plugins/gevolution/gevolution.c:471
+#: plugins/gevolution/gevolution.c:468 plugins/gevolution/gevolution.c:470
 msgid "Provides integration with Ximian Evolution."
 msgstr "提供与 Ximian Evolution 的集成。"
 
-#: plugins/gevolution/new_person_dialog.c:270
+#: plugins/gevolution/new_person_dialog.c:267
 msgid "Please enter the person's information below."
 msgstr "请在下面输入联系人的信息。"
 
-#: plugins/gevolution/new_person_dialog.c:274
+#: plugins/gevolution/new_person_dialog.c:271
 msgid "Please enter the buddy's screen name and account type below."
 msgstr "请在下面输入好友的用户名和账户类型。"
 
-#: plugins/gevolution/new_person_dialog.c:294
+#: plugins/gevolution/new_person_dialog.c:291
 msgid "Account type:"
 msgstr "账户类型:"
 
-#: plugins/gevolution/new_person_dialog.c:298
+#: plugins/gevolution/new_person_dialog.c:295
 msgid "Screenname:"
 msgstr "用户名:"
 
 #. Optional Information section
-#: plugins/gevolution/new_person_dialog.c:318
+#: plugins/gevolution/new_person_dialog.c:315
 msgid "Optional information:"
 msgstr "额外信息:"
 
 #. Label
-#: plugins/gevolution/new_person_dialog.c:341 src/gtkaccount.c:340
-#: src/protocols/oscar/oscar.c:433
+#: plugins/gevolution/new_person_dialog.c:338 src/gtkaccount.c:378
+#: src/gtkaccount.c:408 src/protocols/oscar/oscar.c:438
 msgid "Buddy Icon"
 msgstr "好友图标"
 
-#: plugins/gevolution/new_person_dialog.c:353
+#: plugins/gevolution/new_person_dialog.c:350
 msgid "First name:"
 msgstr "名:"
 
-#: plugins/gevolution/new_person_dialog.c:365
+#: plugins/gevolution/new_person_dialog.c:362
 msgid "Last name:"
 msgstr "姓:"
 
-#: plugins/gevolution/new_person_dialog.c:385
+#: plugins/gevolution/new_person_dialog.c:382
 msgid "E-mail:"
 msgstr "电子邮件:"
 
@@ -807,15 +811,15 @@
 msgid "Provides support for loading perl plugins."
 msgstr "提供装入 Perl 插件的支持。"
 
-#: plugins/raw.c:154
+#: plugins/raw.c:146
 msgid "Raw"
 msgstr "Raw"
 
-#: plugins/raw.c:156
+#: plugins/raw.c:148
 msgid "Lets you send raw input to text-based protocols."
 msgstr "允许您发送原样输入基于文本的协议。"
 
-#: plugins/raw.c:157
+#: plugins/raw.c:149
 msgid ""
 "Lets you send raw input to text-based protocols (Jabber, MSN, IRC, TOC). Hit "
 "'Enter' in the entry box to send. Watch the debug window."
@@ -882,7 +886,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/signals-test.c:554
+#: plugins/signals-test.c:566
 msgid "Signals Test"
 msgstr "信号测试"
 
@@ -890,7 +894,7 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/signals-test.c:557 plugins/signals-test.c:559
+#: plugins/signals-test.c:569 plugins/signals-test.c:571
 msgid "Test to see that all signals are working properly."
 msgstr "测试看看所有的信号是否都工作正确。"
 
@@ -1106,30 +1110,30 @@
 msgstr "每 N 分钟给对话添加 iChat 风格的时间戳。"
 
 #: plugins/win32/transparency/win2ktrans.c:133
-#: plugins/win32/transparency/win2ktrans.c:389
-#: plugins/win32/transparency/win2ktrans.c:420
+#: plugins/win32/transparency/win2ktrans.c:388
+#: plugins/win32/transparency/win2ktrans.c:419
 msgid "Opacity:"
 msgstr "不透明度:"
 
 #. IM Convo trans options
-#: plugins/win32/transparency/win2ktrans.c:370
+#: plugins/win32/transparency/win2ktrans.c:369
 msgid "IM Conversation Windows"
 msgstr "即时消息对话窗口"
 
-#: plugins/win32/transparency/win2ktrans.c:371
+#: plugins/win32/transparency/win2ktrans.c:370
 msgid "_IM window transparency"
 msgstr "即时消息窗口透明度(_I)"
 
-#: plugins/win32/transparency/win2ktrans.c:381
+#: plugins/win32/transparency/win2ktrans.c:380
 msgid "_Show slider bar in IM window"
 msgstr "在即时消息窗口中显示滑块(_S)"
 
 #. Buddy List trans options
-#: plugins/win32/transparency/win2ktrans.c:406 src/gtkprefs.c:907
+#: plugins/win32/transparency/win2ktrans.c:405 src/gtkprefs.c:955
 msgid "Buddy List Window"
 msgstr "好友列表窗口"
 
-#: plugins/win32/transparency/win2ktrans.c:407
+#: plugins/win32/transparency/win2ktrans.c:406
 msgid "_Buddy List window transparency"
 msgstr "好友列表窗口的透明度(_B)"
 
@@ -1140,19 +1144,19 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/win32/transparency/win2ktrans.c:463
+#: plugins/win32/transparency/win2ktrans.c:462
 msgid "Transparency"
 msgstr "透明度"
 
 #. *< name
 #. *< version
 #. *  summary
-#: plugins/win32/transparency/win2ktrans.c:466
+#: plugins/win32/transparency/win2ktrans.c:465
 msgid "Variable Transparency for the buddy list and conversations."
 msgstr "好友列表和对话窗口的可变透明度。"
 
 #. *  description
-#: plugins/win32/transparency/win2ktrans.c:468
+#: plugins/win32/transparency/win2ktrans.c:467
 msgid ""
 "This plugin enables variable alpha transparency on conversation windows and "
 "the buddy list.\n"
@@ -1177,8 +1181,8 @@
 msgstr "Windows 启动时启动 Gaim(_S)"
 
 #. Buddy List
-#: plugins/win32/winprefs/winprefs.c:362 src/gtkblist.c:3023
-#: src/gtkprefs.c:2399
+#: plugins/win32/winprefs/winprefs.c:362 src/gtkblist.c:3057
+#: src/gtkprefs.c:2412
 msgid "Buddy List"
 msgstr "好友列表"
 
@@ -1197,8 +1201,8 @@
 msgstr "好友列表窗口常居顶端(_K)"
 
 #. Conversations
-#: plugins/win32/winprefs/winprefs.c:382 src/gtkprefs.c:958
-#: src/gtkprefs.c:2400 src/protocols/msn/msn.c:1611
+#: plugins/win32/winprefs/winprefs.c:382 src/gtkprefs.c:1006
+#: src/gtkprefs.c:2413 src/protocols/msn/msn.c:1638
 msgid "Conversations"
 msgstr "对话"
 
@@ -1269,260 +1273,264 @@
 msgid "Crazy Patch Writers"
 msgstr "疯狂补丁编写者"
 
-#: src/about.c:147
+#: src/about.c:148
 msgid "Retired Developers"
 msgstr "退休开发者"
 
-#: src/about.c:148
+#: src/about.c:149
 msgid "former libfaim maintainer"
 msgstr "先前 libfaim 维护者"
 
-#: src/about.c:149
+#: src/about.c:150
 msgid "former lead developer"
 msgstr "先前领导开发者"
 
-#: src/about.c:152
+#: src/about.c:153
 msgid "former maintainer"
 msgstr "先前维护者"
 
-#: src/about.c:153
+#: src/about.c:154
 msgid "former Jabber developer"
 msgstr "先前 Jabber 开发者"
 
-#: src/about.c:154
+#: src/about.c:155
 msgid "original author"
 msgstr "原作者"
 
-#: src/about.c:157
+#: src/about.c:158
 msgid "hacker and designated driver [lazy bum]"
 msgstr "骇客和专属驱动程序[lazy bum]"
 
-#: src/about.c:165
+#: src/about.c:166
 msgid "Current Translators"
 msgstr "当前翻译者"
 
-#: src/about.c:166 src/about.c:204
+#: src/about.c:167 src/about.c:207
 msgid "Catalan"
 msgstr "加泰罗尼亚语"
 
-#: src/about.c:167 src/about.c:205
+#: src/about.c:168 src/about.c:208
 msgid "Czech"
 msgstr "捷克语"
 
-#: src/about.c:168
+#: src/about.c:169
 msgid "Danish"
 msgstr "丹麦语"
 
-#: src/about.c:169
+#: src/about.c:170
 msgid "British English"
 msgstr "英国英语"
 
-#: src/about.c:170
+#: src/about.c:171
 msgid "Canadian English"
 msgstr "加拿大英语"
 
-#: src/about.c:171 src/about.c:206
+#: src/about.c:172 src/about.c:209
 msgid "German"
 msgstr "德语"
 
-#: src/about.c:172 src/about.c:207
+#: src/about.c:173 src/about.c:210
 msgid "Spanish"
 msgstr "西班牙语"
 
-#: src/about.c:173 src/about.c:208
+#: src/about.c:174 src/about.c:211
 msgid "Finnish"
 msgstr "芬兰语"
 
-#: src/about.c:174 src/about.c:209
+#: src/about.c:175 src/about.c:212
 msgid "French"
 msgstr "法语"
 
-#: src/about.c:175
+#: src/about.c:176
 msgid "Hebrew"
 msgstr "希伯莱语"
 
-#: src/about.c:176
+#: src/about.c:177
 msgid "Hindi"
 msgstr "印地语"
 
-#: src/about.c:177
+#: src/about.c:178
 msgid "Hungarian"
 msgstr "匈牙利语"
 
-#: src/about.c:178 src/about.c:210
+#: src/about.c:179 src/about.c:213
 msgid "Italian"
 msgstr "意大利语"
 
-#: src/about.c:179 src/about.c:212
+#: src/about.c:180 src/about.c:214
+msgid "Japanese"
+msgstr "日语"
+
+#: src/about.c:181
+msgid "Lithuanian"
+msgstr "立陶宛语"
+
+#: src/about.c:182 src/about.c:215
 msgid "Korean"
 msgstr "朝鲜语"
 
-#: src/about.c:180
+#: src/about.c:183
 msgid "Dutch; Flemish"
 msgstr "荷兰语"
 
-#: src/about.c:181
+#: src/about.c:184
 msgid "Macedonian"
 msgstr "马其顿语"
 
-#: src/about.c:182
+#: src/about.c:185
 msgid "Norwegian"
 msgstr "挪威语"
 
-#: src/about.c:183 src/about.c:213
+#: src/about.c:186 src/about.c:216
 msgid "Polish"
 msgstr "波兰语"
 
-#: src/about.c:184
+#: src/about.c:187
 msgid "Portuguese"
 msgstr "葡萄牙语"
 
-#: src/about.c:185
+#: src/about.c:188
 msgid "Portuguese-Brazil"
 msgstr "巴西葡萄牙语"
 
-#: src/about.c:186
+#: src/about.c:189
 msgid "Romanian"
 msgstr "罗马尼亚语"
 
-#: src/about.c:187 src/about.c:214 src/about.c:215
+#: src/about.c:190 src/about.c:217 src/about.c:218
 msgid "Russian"
 msgstr "俄语"
 
-#: src/about.c:188
+#: src/about.c:191
 msgid "Serbian"
 msgstr "塞尔维亚语"
 
-#: src/about.c:189
+#: src/about.c:192
 msgid "Slovenian"
 msgstr "斯洛文尼亚语"
 
-#: src/about.c:190 src/about.c:217
+#: src/about.c:193 src/about.c:220
 msgid "Swedish"
 msgstr "瑞典语"
 
-#: src/about.c:191
+#: src/about.c:194
 msgid "Vietnamese"
 msgstr "越南语"
 
-#: src/about.c:191
-msgid "Gnome Vi Team"
-msgstr "Gnome 越南语团队"
-
-#: src/about.c:193
-msgid "Simplified Chinese"
-msgstr "简体中文"
-
 #: src/about.c:194
+msgid "and the Gnome-Vi Team"
+msgstr "及 Gnome 越南语团队"
+
+#: src/about.c:196
+msgid "Simplified Chinese"
+msgstr "简体中文"
+
+#: src/about.c:197
 msgid "Traditional Chinese"
 msgstr "繁体中文"
 
-#: src/about.c:201
+#: src/about.c:204
 msgid "Past Translators"
 msgstr "先前翻译者"
 
-#: src/about.c:202
+#: src/about.c:205
 msgid "Amharic"
 msgstr "阿姆哈拉语"
 
-#: src/about.c:203
+#: src/about.c:206
 msgid "Bulgarian"
 msgstr "保加利亚语"
 
-#: src/about.c:211
-msgid "Japanese"
-msgstr "日语"
-
-#: src/about.c:216
+#: src/about.c:219
 msgid "Slovak"
 msgstr "斯洛伐克语"
 
-#: src/about.c:218
+#: src/about.c:221
 msgid "Chinese"
 msgstr "中文"
 
-#: src/account.c:278 src/protocols/jabber/jabber.c:1000
+#: src/account.c:277 src/protocols/jabber/jabber.c:1001
 msgid "New passwords do not match."
 msgstr "新密码不相同。"
 
-#: src/account.c:287
+#: src/account.c:286
 msgid "Fill out all fields completely."
 msgstr "完全填入所有字段。"
 
-#: src/account.c:312
+#: src/account.c:311
 msgid "Original password"
 msgstr "旧密码"
 
-#: src/account.c:319
+#: src/account.c:318
 msgid "New password"
 msgstr "新密码"
 
-#: src/account.c:326
+#: src/account.c:325
 msgid "New password (again)"
 msgstr "再次输入新密码"
 
-#: src/account.c:332
+#: src/account.c:331
 #, c-format
 msgid "Change password for %s"
 msgstr "更改 %s 的密码"
 
-#: src/account.c:340
+#: src/account.c:339
 msgid "Please enter your current password and your new password."
 msgstr "请输入您目前的密码和新密码。"
 
 #. *
 #. * A wrapper for gaim_request_action() that uses OK and Cancel buttons.
 #.
-#: src/account.c:343 src/connection.c:197 src/dialogs.c:462 src/dialogs.c:518
-#: src/dialogs.c:571 src/gtkblist.c:2341 src/gtkrequest.c:235
-#: src/protocols/jabber/jabber.c:1047 src/protocols/jabber/xdata.c:337
+#: src/account.c:342 src/connection.c:197 src/dialogs.c:462 src/dialogs.c:518
+#: src/dialogs.c:571 src/gtkblist.c:2391 src/gtkrequest.c:242
+#: src/protocols/jabber/jabber.c:1048 src/protocols/jabber/xdata.c:337
 #: src/protocols/msn/msn.c:226 src/protocols/msn/msn.c:241
 #: src/protocols/msn/msn.c:256 src/protocols/msn/msn.c:271
-#: src/protocols/oscar/oscar.c:3353 src/protocols/oscar/oscar.c:3447
-#: src/protocols/oscar/oscar.c:6731 src/protocols/oscar/oscar.c:6828
-#: src/protocols/oscar/oscar.c:6880 src/protocols/oscar/oscar.c:6966
+#: src/protocols/oscar/oscar.c:3369 src/protocols/oscar/oscar.c:3463
+#: src/protocols/oscar/oscar.c:6748 src/protocols/oscar/oscar.c:6844
+#: src/protocols/oscar/oscar.c:6896 src/protocols/oscar/oscar.c:6982
 #: src/protocols/silc/buddy.c:460 src/protocols/silc/buddy.c:1132
-#: src/protocols/silc/chat.c:406 src/protocols/silc/chat.c:444
-#: src/protocols/silc/chat.c:707 src/protocols/silc/ops.c:994
-#: src/protocols/silc/ops.c:1405 src/protocols/silc/silc.c:688
-#: src/protocols/yahoo/yahoo.c:2745 src/protocols/yahoo/yahoo.c:2754
-#: src/request.h:1242
+#: src/protocols/silc/chat.c:409 src/protocols/silc/chat.c:447
+#: src/protocols/silc/chat.c:710 src/protocols/silc/ops.c:1063
+#: src/protocols/silc/ops.c:1671 src/protocols/silc/silc.c:692
+#: src/protocols/yahoo/yahoo.c:2752 src/protocols/yahoo/yahoo.c:2761
+#: src/request.h:1243
 msgid "OK"
 msgstr "确定"
 
-#: src/account.c:344 src/account.c:382 src/away.c:334 src/connection.c:198
+#: src/account.c:343 src/account.c:381 src/away.c:334 src/connection.c:198
 #: src/dialogs.c:299 src/dialogs.c:311 src/dialogs.c:324 src/dialogs.c:345
 #: src/dialogs.c:463 src/dialogs.c:519 src/dialogs.c:572 src/dialogs.c:808
-#: src/dialogs.c:824 src/dialogs.c:842 src/gtkaccount.c:1918
-#: src/gtkaccount.c:2409 src/gtkblist.c:2342 src/gtkblist.c:4377
+#: src/dialogs.c:824 src/dialogs.c:842 src/gtkaccount.c:2002
+#: src/gtkaccount.c:2498 src/gtkblist.c:2392 src/gtkblist.c:4411
 #: src/gtkconn.c:168 src/gtkimhtmltoolbar.c:414 src/gtkprivacy.c:587
 #: src/gtkprivacy.c:600 src/gtkprivacy.c:625 src/gtkprivacy.c:636
-#: src/gtkrequest.c:236 src/protocols/icq/gaim_icq.c:277
+#: src/gtkrequest.c:243 src/protocols/icq/gaim_icq.c:277
 #: src/protocols/jabber/buddy.c:515 src/protocols/jabber/chat.c:710
-#: src/protocols/jabber/jabber.c:666 src/protocols/jabber/jabber.c:1048
+#: src/protocols/jabber/jabber.c:667 src/protocols/jabber/jabber.c:1049
 #: src/protocols/jabber/xdata.c:338 src/protocols/msn/msn.c:227
 #: src/protocols/msn/msn.c:242 src/protocols/msn/msn.c:257
 #: src/protocols/msn/msn.c:272 src/protocols/msn/msn.c:289
-#: src/protocols/oscar/oscar.c:1371 src/protocols/oscar/oscar.c:3313
-#: src/protocols/oscar/oscar.c:3354 src/protocols/oscar/oscar.c:3391
-#: src/protocols/oscar/oscar.c:3448 src/protocols/oscar/oscar.c:6732
-#: src/protocols/oscar/oscar.c:6829 src/protocols/oscar/oscar.c:6881
-#: src/protocols/oscar/oscar.c:6950 src/protocols/oscar/oscar.c:6967
+#: src/protocols/oscar/oscar.c:1377 src/protocols/oscar/oscar.c:3329
+#: src/protocols/oscar/oscar.c:3370 src/protocols/oscar/oscar.c:3407
+#: src/protocols/oscar/oscar.c:3464 src/protocols/oscar/oscar.c:6749
+#: src/protocols/oscar/oscar.c:6845 src/protocols/oscar/oscar.c:6897
+#: src/protocols/oscar/oscar.c:6966 src/protocols/oscar/oscar.c:6983
 #: src/protocols/silc/buddy.c:461 src/protocols/silc/buddy.c:1037
-#: src/protocols/silc/buddy.c:1133 src/protocols/silc/chat.c:579
-#: src/protocols/silc/chat.c:708 src/protocols/silc/ops.c:1406
-#: src/protocols/silc/silc.c:689 src/protocols/trepia/trepia.c:347
-#: src/protocols/yahoo/yahoo.c:2746 src/protocols/yahoo/yahoo.c:2755
-#: src/request.h:1242 src/request.h:1252
+#: src/protocols/silc/buddy.c:1133 src/protocols/silc/chat.c:582
+#: src/protocols/silc/chat.c:711 src/protocols/silc/ops.c:1672
+#: src/protocols/silc/silc.c:693 src/protocols/trepia/trepia.c:347
+#: src/protocols/yahoo/yahoo.c:2753 src/protocols/yahoo/yahoo.c:2762
+#: src/request.h:1243 src/request.h:1253
 msgid "Cancel"
 msgstr "取消"
 
-#: src/account.c:373
+#: src/account.c:372
 #, c-format
 msgid "Change user information for %s"
 msgstr "更改 %s 的用户信息"
 
-#: src/account.c:381 src/gtkrequest.c:242 src/protocols/jabber/buddy.c:514
+#: src/account.c:380 src/gtkrequest.c:249 src/protocols/jabber/buddy.c:514
 #: src/protocols/trepia/trepia.c:346
 msgid "Save"
 msgstr "保存"
@@ -1545,8 +1553,8 @@
 msgstr "删除离开消息"
 
 #. Remove button
-#: src/away.c:333 src/gtkconv.c:1352 src/gtkconv.c:3570 src/gtkconv.c:3669
-#: src/gtkrequest.c:241
+#: src/away.c:333 src/gtkconv.c:1388 src/gtkconv.c:3680 src/gtkconv.c:3784
+#: src/gtkrequest.c:248
 msgid "Remove"
 msgstr "删除"
 
@@ -1578,23 +1586,19 @@
 msgid "Group not removed"
 msgstr "组未删除"
 
-#: src/blist.c:1393 src/gtkaccount.c:167 src/gtkft.c:161 src/gtkutils.c:721
-#: src/protocols/jabber/buddy.c:570 src/protocols/novell/novell.c:2730
+#: src/blist.c:1393 src/gtkaccount.c:167 src/gtkft.c:154 src/gtkutils.c:627
+#: src/protocols/jabber/buddy.c:570 src/protocols/novell/novell.c:2736
 msgid "Unknown"
 msgstr "未知"
 
-#: src/blist.c:1721
-msgid "Invalid Groupname"
-msgstr "组名无效"
-
-#: src/blist.c:2192
+#: src/blist.c:2001
 msgid ""
 "An error was encountered parsing your buddy list.  It has not been loaded, "
 "and the old file has moved to blist.xml~."
 msgstr ""
 "分析您的好友列表时出错。好友列表未装入,旧文件被移动到 blist.xml~ 中了。"
 
-#: src/blist.c:2195
+#: src/blist.c:2004
 msgid "Buddy List Error"
 msgstr "好友列表出错"
 
@@ -1616,71 +1620,71 @@
 msgid "Enter password for %s"
 msgstr "输入 %s 的密码"
 
-#: src/conversation.c:271
+#: src/conversation.c:261
 msgid "Unable to send message. The message is too large."
 msgstr "无法发送消息。消息太大。"
 
-#: src/conversation.c:279
+#: src/conversation.c:269
 msgid "Unable to send message."
 msgstr "无法发送消息。"
 
-#: src/conversation.c:1960
+#: src/conversation.c:1953
 #, c-format
 msgid "%s entered the room."
 msgstr "%s 进入了聊天室。"
 
-#: src/conversation.c:1963
+#: src/conversation.c:1956
 #, c-format
 msgid "%s [<I>%s</I>] entered the room."
 msgstr "%s [<I>%s</I>] 进入了聊天室。"
 
-#: src/conversation.c:2054
+#: src/conversation.c:2047
 #, c-format
 msgid "You are now known as %s"
 msgstr "您现在叫做 %s"
 
-#: src/conversation.c:2057
+#: src/conversation.c:2050
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s 现在叫做 %s。"
 
-#: src/conversation.c:2099
+#: src/conversation.c:2092
 #, c-format
 msgid "%s left the room (%s)."
 msgstr "%s 离开了聊天室(%s)。"
 
-#: src/conversation.c:2101
+#: src/conversation.c:2094
 #, c-format
 msgid "%s left the room."
 msgstr "%s 离开了聊天室。"
 
-#: src/conversation.c:2172
+#: src/conversation.c:2165
 #, c-format
 msgid "(+%d more)"
 msgstr "(还有 %d 人)"
 
-#: src/conversation.c:2174
+#: src/conversation.c:2167
 #, c-format
 msgid " left the room (%s)."
 msgstr "离开了聊天室(%s)。"
 
-#: src/conversation.c:2464
+#: src/conversation.c:2457
 msgid "Last created window"
 msgstr "上次创建的窗口"
 
-#: src/conversation.c:2466
+#: src/conversation.c:2459
 msgid "Separate IM and Chat windows"
 msgstr "分离即时消息和聊天窗口"
 
-#: src/conversation.c:2468 src/gtkprefs.c:1335
+#: src/conversation.c:2461 src/gtkprefs.c:1384
 msgid "New window"
 msgstr "新建窗口"
 
-#: src/conversation.c:2470
+#: src/conversation.c:2463
 msgid "By group"
 msgstr "按组"
 
-#: src/conversation.c:2472
+#: src/conversation.c:2465
 msgid "By account"
 msgstr "按账户"
 
@@ -1828,8 +1832,8 @@
 msgid "Enter an alias for this chat."
 msgstr "请输入此聊天的别名。"
 
-#: src/dialogs.c:807 src/dialogs.c:823 src/dialogs.c:841 src/gtkrequest.c:243
-#: src/protocols/silc/chat.c:569
+#: src/dialogs.c:807 src/dialogs.c:823 src/dialogs.c:841 src/gtkrequest.c:250
+#: src/protocols/silc/chat.c:572
 msgid "Alias"
 msgstr "别名"
 
@@ -1850,22 +1854,51 @@
 msgid "Alias Buddy"
 msgstr "好友别名"
 
-#: src/ft.c:144
+#: src/ft.c:125
+msgid "That file does not exist."
+msgstr "文件不存在。"
+
+#: src/ft.c:134
+msgid "Cannot send a file of 0 bytes."
+msgstr "无法发送 0 字节的文件。"
+
+#: src/ft.c:194
+#, c-format
+msgid "%s wants to send you %s (%s)"
+msgstr "%s 想要给您发送 %s (%s)"
+
+#: src/ft.c:230
+#, c-format
+msgid "Accept file transfer request from %s?"
+msgstr "接受来自 %s 的文件传送吗?"
+
+#: src/ft.c:234
+#, c-format
+msgid ""
+"A file is available for download from:\n"
+"Remote host: %s\n"
+"Remote port: %d"
+msgstr ""
+"可从以下地址下载文件:\n"
+"远程主机: %s\n"
+"远程端口: %d"
+
+#: src/ft.c:286
 #, c-format
 msgid "%s is not a valid filename.\n"
 msgstr "%s 不是合法的文件名。\n"
 
-#: src/ft.c:157
+#: src/ft.c:299
 #, c-format
 msgid "%s was not found.\n"
 msgstr "%s 未找到。\n"
 
-#: src/ft.c:786
+#: src/ft.c:928
 #, c-format
 msgid "File transfer to %s aborted.\n"
 msgstr "您中止了给 %s 的文件传送。\n"
 
-#: src/ft.c:788
+#: src/ft.c:930
 #, c-format
 msgid "File transfer from %s aborted.\n"
 msgstr "%s 中止了给您的文件传送。\n"
@@ -1956,23 +1989,23 @@
 msgid "sorry, i ran out for a while. bbl"
 msgstr "对不起,我临时有事离开一会儿。麻烦您稍后再联络我。"
 
-#: src/gaimrc.c:372 src/gaimrc.c:1409
+#: src/gaimrc.c:372 src/gaimrc.c:1417
 msgid "boring default"
 msgstr "临时有事"
 
-#: src/gaimrc.c:1219 src/gtkblist.c:2984
+#: src/gaimrc.c:1227 src/gtkblist.c:3017
 msgid "Alphabetical"
 msgstr "按字母序"
 
-#: src/gaimrc.c:1221 src/gtkblist.c:2985
+#: src/gaimrc.c:1229 src/gtkblist.c:3018
 msgid "By status"
 msgstr "按状态"
 
-#: src/gaimrc.c:1223 src/gtkblist.c:2986
+#: src/gaimrc.c:1231 src/gtkblist.c:3019
 msgid "By log size"
 msgstr "按日志大小"
 
-#: src/gtkaccount.c:309
+#: src/gtkaccount.c:331
 #, c-format
 msgid ""
 "<b>File:</b> %s\n"
@@ -1984,164 +2017,164 @@
 "<b>图像大小:</b> %dx%d"
 
 #. Build the login options frame.
-#: src/gtkaccount.c:530
+#: src/gtkaccount.c:614
 msgid "Login Options"
 msgstr "登入选项"
 
-#: src/gtkaccount.c:547
+#: src/gtkaccount.c:631
 msgid "Protocol:"
 msgstr "协议:"
 
-#: src/gtkaccount.c:552 src/gtkblist.c:3983
+#: src/gtkaccount.c:636 src/gtkblist.c:4017
 msgid "Screen Name:"
 msgstr "用户名:"
 
-#: src/gtkaccount.c:625
+#: src/gtkaccount.c:709
 msgid "Password:"
 msgstr "密码:"
 
-#: src/gtkaccount.c:630 src/gtkblist.c:3997 src/gtkblist.c:4325
+#: src/gtkaccount.c:714 src/gtkblist.c:4031 src/gtkblist.c:4359
 msgid "Alias:"
 msgstr "别名:"
 
-#: src/gtkaccount.c:634
+#: src/gtkaccount.c:718
 msgid "Remember password"
 msgstr "记住密码"
 
 #. Build the user options frame.
-#: src/gtkaccount.c:690
+#: src/gtkaccount.c:774
 msgid "User Options"
 msgstr "用户选项"
 
-#: src/gtkaccount.c:703
+#: src/gtkaccount.c:787
 msgid "New mail notifications"
 msgstr "新邮件通知"
 
-#: src/gtkaccount.c:712
+#: src/gtkaccount.c:796
 msgid "Buddy icon:"
 msgstr "好友图标:"
 
 #. Build the protocol options frame.
-#: src/gtkaccount.c:801
+#: src/gtkaccount.c:885
 #, c-format
 msgid "%s Options"
 msgstr "%s 选项"
 
 #. Use Global Proxy Settings
-#: src/gtkaccount.c:937 src/gtkaccount.c:984
+#: src/gtkaccount.c:1021 src/gtkaccount.c:1068
 msgid "Use Global Proxy Settings"
 msgstr "使用全局代理设置"
 
 #. No Proxy
-#: src/gtkaccount.c:943 src/gtkaccount.c:991
+#: src/gtkaccount.c:1027 src/gtkaccount.c:1075
 msgid "No Proxy"
 msgstr "无代理"
 
 #. HTTP
-#: src/gtkaccount.c:949 src/gtkaccount.c:998
+#: src/gtkaccount.c:1033 src/gtkaccount.c:1082
 msgid "HTTP"
 msgstr "HTTP"
 
 #. SOCKS 4
-#: src/gtkaccount.c:955 src/gtkaccount.c:1005
+#: src/gtkaccount.c:1039 src/gtkaccount.c:1089
 msgid "SOCKS 4"
 msgstr "SOCKS 4"
 
 #. SOCKS 5
-#: src/gtkaccount.c:961 src/gtkaccount.c:1012
+#: src/gtkaccount.c:1045 src/gtkaccount.c:1096
 msgid "SOCKS 5"
 msgstr "SOCKS 5"
 
 #. Use Environmental Settings
-#: src/gtkaccount.c:967 src/gtkaccount.c:1019 src/gtkprefs.c:1139
+#: src/gtkaccount.c:1051 src/gtkaccount.c:1103 src/gtkprefs.c:1187
 msgid "Use Environmental Settings"
 msgstr "使用环境设置"
 
-#: src/gtkaccount.c:1058
+#: src/gtkaccount.c:1142
 msgid "you can see the butterflies mating"
 msgstr "明日复明日"
 
-#: src/gtkaccount.c:1062
+#: src/gtkaccount.c:1146
 msgid "If you look real closely"
 msgstr "万事成蹉跎"
 
-#: src/gtkaccount.c:1078
+#: src/gtkaccount.c:1162
 msgid "Proxy Options"
 msgstr "代理选项"
 
-#: src/gtkaccount.c:1096 src/gtkprefs.c:1133
+#: src/gtkaccount.c:1180 src/gtkprefs.c:1181
 msgid "Proxy _type:"
 msgstr "代理类型(_T):"
 
-#: src/gtkaccount.c:1105 src/gtkprefs.c:1160
+#: src/gtkaccount.c:1189 src/gtkprefs.c:1208
 msgid "_Host:"
 msgstr "主机(_H):"
 
-#: src/gtkaccount.c:1109 src/gtkprefs.c:1178
+#: src/gtkaccount.c:1193 src/gtkprefs.c:1226
 msgid "_Port:"
 msgstr "端口(_P):"
 
-#: src/gtkaccount.c:1117
+#: src/gtkaccount.c:1201
 msgid "_Username:"
 msgstr "用户名(_U):"
 
-#: src/gtkaccount.c:1122 src/gtkprefs.c:1215
+#: src/gtkaccount.c:1206 src/gtkprefs.c:1263
 msgid "Pa_ssword:"
 msgstr "密码(_S):"
 
-#: src/gtkaccount.c:1494
+#: src/gtkaccount.c:1578
 msgid "Add Account"
 msgstr "添加账户"
 
-#: src/gtkaccount.c:1496
+#: src/gtkaccount.c:1580
 msgid "Modify Account"
 msgstr "修改账户"
 
 #. Add the disclosure
-#: src/gtkaccount.c:1520
+#: src/gtkaccount.c:1604
 msgid "Show more options"
 msgstr "显示全部选项"
 
-#: src/gtkaccount.c:1521
+#: src/gtkaccount.c:1605
 msgid "Show fewer options"
 msgstr "显示主要选项"
 
 #. Register button
-#: src/gtkaccount.c:1548 src/protocols/jabber/jabber.c:665
+#: src/gtkaccount.c:1632 src/protocols/jabber/jabber.c:666
 msgid "Register"
 msgstr "注册"
 
-#: src/gtkaccount.c:1913
+#: src/gtkaccount.c:1997
 #, c-format
 msgid "Are you sure you want to delete %s?"
 msgstr "您真的想要删除 %s 吗?"
 
-#: src/gtkaccount.c:1917 src/gtkrequest.c:239
+#: src/gtkaccount.c:2001 src/gtkrequest.c:246
 msgid "Delete"
 msgstr "删除"
 
-#: src/gtkaccount.c:2031 src/protocols/oscar/oscar.c:3981
+#: src/gtkaccount.c:2115 src/protocols/oscar/oscar.c:3997
 msgid "Screen Name"
 msgstr "用户名"
 
-#: src/gtkaccount.c:2054 src/protocols/jabber/jabber.c:957
-#: src/protocols/oscar/oscar.c:534 src/protocols/oscar/oscar.c:5463
-#: src/protocols/oscar/oscar.c:6661 src/protocols/silc/silc.c:44
-#: src/protocols/yahoo/yahoo.c:2492 src/protocols/zephyr/zephyr.c:1208
-#: src/protocols/zephyr/zephyr.c:1218
+#: src/gtkaccount.c:2139 src/protocols/jabber/jabber.c:958
+#: src/protocols/oscar/oscar.c:538 src/protocols/oscar/oscar.c:5479
+#: src/protocols/oscar/oscar.c:6678 src/protocols/silc/silc.c:44
+#: src/protocols/yahoo/yahoo.c:2515 src/protocols/zephyr/zephyr.c:1360
+#: src/protocols/zephyr/zephyr.c:1372
 msgid "Online"
 msgstr "在线"
 
-#: src/gtkaccount.c:2072
+#: src/gtkaccount.c:2160
 msgid "Protocol"
 msgstr "协议"
 
-#: src/gtkaccount.c:2384
+#: src/gtkaccount.c:2473
 #, c-format
 msgid "%s%s%s%s has made %s his or her buddy%s%s%s"
 msgstr "%s%s%s%s 已经将 %s 加为好友%s%s%s"
 
-#: src/gtkaccount.c:2398
+#: src/gtkaccount.c:2487
 msgid ""
 "\n"
 "\n"
@@ -2151,224 +2184,228 @@
 "\n"
 "您是否想要将他/她添加为您的好友?"
 
-#: src/gtkaccount.c:2402
+#: src/gtkaccount.c:2491
 msgid "Information"
 msgstr "信息"
 
-#: src/gtkaccount.c:2406
+#: src/gtkaccount.c:2495
 msgid "Add buddy to your list?"
 msgstr "将用户加为好友吗?"
 
 #. Add button
-#: src/gtkaccount.c:2408 src/gtkblist.c:4376 src/gtkconv.c:1354
-#: src/gtkconv.c:3563 src/gtkconv.c:3662 src/gtkrequest.c:240
-#: src/protocols/icq/gaim_icq.c:277 src/protocols/oscar/oscar.c:3610
-#: src/protocols/silc/chat.c:578
+#: src/gtkaccount.c:2497 src/gtkblist.c:4410 src/gtkconv.c:1390
+#: src/gtkconv.c:3673 src/gtkconv.c:3777 src/gtkrequest.c:247
+#: src/protocols/icq/gaim_icq.c:277 src/protocols/oscar/oscar.c:3626
+#: src/protocols/silc/chat.c:581
 msgid "Add"
 msgstr "添加"
 
-#: src/gtkblist.c:810
+#: src/gtkblist.c:815
 msgid "Join a Chat"
 msgstr "加入聊天"
 
-#: src/gtkblist.c:831
+#: src/gtkblist.c:836
 msgid ""
 "Please enter the appropriate information about the chat you would like to "
 "join.\n"
 msgstr "请输入您想要加入的聊天的对应信息。\n"
 
-#: src/gtkblist.c:842 src/gtkpounce.c:445 src/gtkroomlist.c:354
+#: src/gtkblist.c:847 src/gtkpounce.c:412 src/gtkroomlist.c:354
 msgid "_Account:"
 msgstr "账户(_A):"
 
-#: src/gtkblist.c:1128 src/gtkblist.c:3177
+#: src/gtkblist.c:1133 src/gtkblist.c:3211
 msgid "Get _Info"
 msgstr "获取信息(_I)"
 
-#: src/gtkblist.c:1131 src/gtkblist.c:3168
+#: src/gtkblist.c:1136 src/gtkblist.c:3202
 msgid "I_M"
 msgstr "开聊(_M)"
 
-#: src/gtkblist.c:1133
+#: src/gtkblist.c:1141
+msgid "_Send File"
+msgstr "发送文件(_S)"
+
+#: src/gtkblist.c:1145
 msgid "Add Buddy _Pounce"
 msgstr "添加好友千里眼(_P)"
 
-#: src/gtkblist.c:1135
+#: src/gtkblist.c:1147
 msgid "View _Log"
 msgstr "查看日志(_L)"
 
-#: src/gtkblist.c:1143 src/gtkblist.c:1229 src/gtkblist.c:1243
+#: src/gtkblist.c:1155 src/gtkblist.c:1241 src/gtkblist.c:1255
 msgid "_Alias..."
 msgstr "别名(_A)..."
 
-#: src/gtkblist.c:1145 src/gtkblist.c:1231 src/gtkblist.c:1248
+#: src/gtkblist.c:1157 src/gtkblist.c:1243 src/gtkblist.c:1260
 #: src/gtkconn.c:361
 msgid "_Remove"
 msgstr "删除(_R)"
 
-#: src/gtkblist.c:1191
+#: src/gtkblist.c:1203
 msgid "Add a _Buddy"
 msgstr "添加好友(_B)"
 
-#: src/gtkblist.c:1193
+#: src/gtkblist.c:1205
 msgid "Add a C_hat"
 msgstr "添加聊天(_H)"
 
-#: src/gtkblist.c:1195
+#: src/gtkblist.c:1207
 msgid "_Delete Group"
 msgstr "删除组(_D)"
 
-#: src/gtkblist.c:1197
+#: src/gtkblist.c:1209
 msgid "_Rename"
 msgstr "重命名(_R)"
 
 #. join button
-#: src/gtkblist.c:1219 src/gtkroomlist.c:263 src/gtkroomlist.c:409
+#: src/gtkblist.c:1231 src/gtkroomlist.c:263 src/gtkroomlist.c:409
 #: src/stock.c:87
 msgid "_Join"
 msgstr "加入(_J)"
 
-#: src/gtkblist.c:1221
+#: src/gtkblist.c:1233
 msgid "Auto-Join"
 msgstr "自动加入"
 
-#: src/gtkblist.c:1245 src/gtkblist.c:1274
+#: src/gtkblist.c:1257 src/gtkblist.c:1286
 msgid "_Collapse"
 msgstr "折叠(_C)"
 
-#: src/gtkblist.c:1279
+#: src/gtkblist.c:1291
 msgid "_Expand"
 msgstr "展开(_E)"
 
-#: src/gtkblist.c:1935 src/gtkconv.c:4199 src/gtkpounce.c:347
+#: src/gtkblist.c:1949 src/gtkconv.c:4317 src/gtkpounce.c:314
 msgid ""
 "You are not currently signed on with an account that can add that buddy."
 msgstr "您目前登入的协议中没有一个可以添加好友的。"
 
 #. Buddies menu
-#: src/gtkblist.c:2286
+#: src/gtkblist.c:2336
 msgid "/_Buddies"
 msgstr "/好友(_B)"
 
-#: src/gtkblist.c:2287
+#: src/gtkblist.c:2337
 msgid "/Buddies/New Instant _Message..."
 msgstr "/好友(B)/新即时消息(_M)..."
 
-#: src/gtkblist.c:2288
+#: src/gtkblist.c:2338
 msgid "/Buddies/Join a _Chat..."
 msgstr "/好友(B)/加入聊天(_C)..."
 
-#: src/gtkblist.c:2289
+#: src/gtkblist.c:2339
 msgid "/Buddies/Get User _Info..."
 msgstr "/好友(B)/获取用户信息(_I)..."
 
-#: src/gtkblist.c:2290
+#: src/gtkblist.c:2340
 msgid "/Buddies/View User _Log..."
 msgstr "/好友(B)/查看用户日志(_L)..."
 
-#: src/gtkblist.c:2292
+#: src/gtkblist.c:2342
 msgid "/Buddies/Show _Offline Buddies"
 msgstr "/好友(B)/显示离线好友(_O)"
 
-#: src/gtkblist.c:2293
+#: src/gtkblist.c:2343
 msgid "/Buddies/Show _Empty Groups"
 msgstr "/好友(B)/显示空组(_E)"
 
-#: src/gtkblist.c:2294
+#: src/gtkblist.c:2344
 msgid "/Buddies/_Add Buddy..."
 msgstr "/好友(B)/添加好友(_A)..."
 
-#: src/gtkblist.c:2295
+#: src/gtkblist.c:2345
 msgid "/Buddies/Add C_hat..."
 msgstr "/好友(B)/添加聊天(_H)..."
 
-#: src/gtkblist.c:2296
+#: src/gtkblist.c:2346
 msgid "/Buddies/Add _Group..."
 msgstr "/好友(B)/添加组(_G)..."
 
-#: src/gtkblist.c:2298
+#: src/gtkblist.c:2348
 msgid "/Buddies/_Signoff"
 msgstr "/好友(B)/登出(_S)"
 
-#: src/gtkblist.c:2299
+#: src/gtkblist.c:2349
 msgid "/Buddies/_Quit"
 msgstr "/好友(B)/退出(_Q)"
 
 #. Tools
-#: src/gtkblist.c:2302
+#: src/gtkblist.c:2352
 msgid "/_Tools"
 msgstr "/工具(_T)"
 
-#: src/gtkblist.c:2303
+#: src/gtkblist.c:2353
 msgid "/Tools/_Away"
 msgstr "/工具(T)/离开(_A)"
 
-#: src/gtkblist.c:2304
+#: src/gtkblist.c:2354
 msgid "/Tools/Buddy _Pounce"
 msgstr "/工具(T)/好友千里眼(_P)"
 
-#: src/gtkblist.c:2305
+#: src/gtkblist.c:2355
 msgid "/Tools/Account Ac_tions"
 msgstr "/工具(T)/账户操作(_T)"
 
-#: src/gtkblist.c:2306
+#: src/gtkblist.c:2356
 msgid "/Tools/Pl_ugin Actions"
 msgstr "/工具(T)/插件操作(_U)"
 
-#: src/gtkblist.c:2308
+#: src/gtkblist.c:2358
 msgid "/Tools/A_ccounts"
 msgstr "/工具(T)/账户(_C)"
 
-#: src/gtkblist.c:2309
+#: src/gtkblist.c:2359
 msgid "/Tools/_File Transfers"
 msgstr "/工具(T)/文件传送(_F)"
 
-#: src/gtkblist.c:2310
+#: src/gtkblist.c:2360
 msgid "/Tools/R_oom List"
 msgstr "/工具(T)/房间列表(_O)"
 
-#: src/gtkblist.c:2311
+#: src/gtkblist.c:2361
 msgid "/Tools/Pr_eferences"
 msgstr "/工具(T)/首选项(_E)"
 
-#: src/gtkblist.c:2312
+#: src/gtkblist.c:2362
 msgid "/Tools/Pr_ivacy"
 msgstr "/工具(T)/隐私(_I)"
 
-#: src/gtkblist.c:2314
+#: src/gtkblist.c:2364
 msgid "/Tools/View System _Log"
 msgstr "/工具(T)/查看系统日志(_L)"
 
 #. Help
-#: src/gtkblist.c:2317
+#: src/gtkblist.c:2367
 msgid "/_Help"
 msgstr "/帮助(_H)"
 
-#: src/gtkblist.c:2318
+#: src/gtkblist.c:2368
 msgid "/Help/Online _Help"
 msgstr "/帮助(H)/在线帮助(_H)"
 
-#: src/gtkblist.c:2319
+#: src/gtkblist.c:2369
 msgid "/Help/_Debug Window"
 msgstr "/帮助(H)/调试窗口(_D)"
 
-#: src/gtkblist.c:2320
+#: src/gtkblist.c:2370
 msgid "/Help/_About"
 msgstr "/帮助(H)/关于(_A)"
 
-#: src/gtkblist.c:2338
+#: src/gtkblist.c:2388
 msgid "Rename Group"
 msgstr "重命名组"
 
-#: src/gtkblist.c:2338
+#: src/gtkblist.c:2388
 msgid "New group name"
 msgstr "新组名称"
 
-#: src/gtkblist.c:2339
+#: src/gtkblist.c:2389
 msgid "Please enter a new name for the selected group."
 msgstr "请输入选中组的新名字。"
 
-#: src/gtkblist.c:2367
+#: src/gtkblist.c:2417
 #, c-format
 msgid ""
 "\n"
@@ -2377,7 +2414,7 @@
 "\n"
 "<b>账户:</b>%s"
 
-#: src/gtkblist.c:2431
+#: src/gtkblist.c:2481
 msgid ""
 "\n"
 "<b>Status:</b> Offline"
@@ -2385,12 +2422,12 @@
 "\n"
 "<b>状态:</b> 离线"
 
-#: src/gtkblist.c:2446
+#: src/gtkblist.c:2496
 #, c-format
 msgid "%d%%"
 msgstr "%d%%"
 
-#: src/gtkblist.c:2462
+#: src/gtkblist.c:2512
 msgid ""
 "\n"
 "<b>Account:</b>"
@@ -2398,7 +2435,7 @@
 "\n"
 "<b>账户:</b>"
 
-#: src/gtkblist.c:2463
+#: src/gtkblist.c:2513
 msgid ""
 "\n"
 "<b>Contact Alias:</b>"
@@ -2406,7 +2443,7 @@
 "\n"
 "<b>联系人别名:</b>"
 
-#: src/gtkblist.c:2464
+#: src/gtkblist.c:2514
 msgid ""
 "\n"
 "<b>Alias:</b>"
@@ -2414,7 +2451,7 @@
 "\n"
 "<b>别名:</b>"
 
-#: src/gtkblist.c:2465
+#: src/gtkblist.c:2515
 msgid ""
 "\n"
 "<b>Nickname:</b>"
@@ -2422,7 +2459,7 @@
 "\n"
 "<b>昵称:</b>"
 
-#: src/gtkblist.c:2466
+#: src/gtkblist.c:2516
 msgid ""
 "\n"
 "<b>Logged In:</b>"
@@ -2430,7 +2467,7 @@
 "\n"
 "<b>登入:</b>"
 
-#: src/gtkblist.c:2467
+#: src/gtkblist.c:2517
 msgid ""
 "\n"
 "<b>Idle:</b>"
@@ -2438,7 +2475,7 @@
 "\n"
 "<b>瞌睡:</b>"
 
-#: src/gtkblist.c:2468
+#: src/gtkblist.c:2518
 msgid ""
 "\n"
 "<b>Warned:</b>"
@@ -2446,7 +2483,7 @@
 "\n"
 "<b>警告:</b>"
 
-#: src/gtkblist.c:2470
+#: src/gtkblist.c:2520
 msgid ""
 "\n"
 "<b>Description:</b> Spooky"
@@ -2454,7 +2491,7 @@
 "\n"
 "<b>描述:</b>健谈"
 
-#: src/gtkblist.c:2471
+#: src/gtkblist.c:2521
 msgid ""
 "\n"
 "<b>Status</b>: Awesome"
@@ -2462,7 +2499,7 @@
 "\n"
 "<b>状态</b>: 可怕"
 
-#: src/gtkblist.c:2472
+#: src/gtkblist.c:2522
 msgid ""
 "\n"
 "<b>Status</b>: Rockin'"
@@ -2470,96 +2507,96 @@
 "\n"
 "<b>状态</b>: 混乱"
 
-#: src/gtkblist.c:2771
+#: src/gtkblist.c:2804
 #, c-format
 msgid "Idle (%dh%02dm) "
 msgstr "瞌睡中 (%d小时%02d分) "
 
-#: src/gtkblist.c:2773
+#: src/gtkblist.c:2806
 #, c-format
 msgid "Idle (%dm) "
 msgstr "瞌睡中 (%d分) "
 
-#: src/gtkblist.c:2778
+#: src/gtkblist.c:2811
 #, c-format
 msgid "Warned (%d%%) "
 msgstr "警告 (%d%%) "
 
-#: src/gtkblist.c:2781
+#: src/gtkblist.c:2814
 msgid "Offline "
 msgstr "离线 "
 
 #. Make menu items sensitive/insensitive where appropriate
-#: src/gtkblist.c:2899
+#: src/gtkblist.c:2932
 msgid "/Buddies/Join a Chat..."
 msgstr "/好友(B)/加入聊天(C)..."
 
-#: src/gtkblist.c:2902
+#: src/gtkblist.c:2935
 msgid "/Tools/Room List"
 msgstr "/工具(T)/房间列表(O)"
 
-#: src/gtkblist.c:2905
+#: src/gtkblist.c:2938
 msgid "/Tools/Privacy"
 msgstr "/工具(T)/隐私(I)"
 
-#: src/gtkblist.c:3050
+#: src/gtkblist.c:3084
 msgid "/Tools/Away"
 msgstr "/工具(T)/离开(A)"
 
-#: src/gtkblist.c:3053
+#: src/gtkblist.c:3087
 msgid "/Tools/Buddy Pounce"
 msgstr "/工具(T)/好友千里眼(P)"
 
-#: src/gtkblist.c:3056
+#: src/gtkblist.c:3090
 msgid "/Tools/Account Actions"
 msgstr "/工具(T)/账户操作(T)"
 
-#: src/gtkblist.c:3059
+#: src/gtkblist.c:3093
 msgid "/Tools/Plugin Actions"
 msgstr "/工具(T)/插件操作(U)"
 
 #. set the Show Offline Buddies option. must be done
 #. * after the treeview or faceprint gets mad. -Robot101
 #.
-#: src/gtkblist.c:3148
+#: src/gtkblist.c:3182
 msgid "/Buddies/Show Offline Buddies"
 msgstr "/好友(B)/显示离线好友(O)"
 
-#: src/gtkblist.c:3150
+#: src/gtkblist.c:3184
 msgid "/Buddies/Show Empty Groups"
 msgstr "/好友(B)/显示空组(E)"
 
-#: src/gtkblist.c:3174
+#: src/gtkblist.c:3208
 msgid "Send a message to the selected buddy"
 msgstr "向选中好友发送消息"
 
-#: src/gtkblist.c:3183
+#: src/gtkblist.c:3217
 msgid "Get information on the selected buddy"
 msgstr "获取选中好友的信息"
 
-#: src/gtkblist.c:3186
+#: src/gtkblist.c:3220
 msgid "_Chat"
 msgstr "聊天(_C)"
 
-#: src/gtkblist.c:3191
+#: src/gtkblist.c:3225
 msgid "Join a chat room"
 msgstr "加入聊天室"
 
-#: src/gtkblist.c:3194
+#: src/gtkblist.c:3228
 msgid "_Away"
 msgstr "离开(_A)"
 
-#: src/gtkblist.c:3199
+#: src/gtkblist.c:3233
 msgid "Set an away message"
 msgstr "设置离开消息"
 
-#: src/gtkblist.c:3937 src/protocols/silc/buddy.c:731
+#: src/gtkblist.c:3971 src/protocols/silc/buddy.c:731
 #: src/protocols/silc/buddy.c:989 src/protocols/silc/buddy.c:1034
-#: src/protocols/silc/buddy.c:1124 src/protocols/yahoo/yahoo.c:2672
+#: src/protocols/silc/buddy.c:1124 src/protocols/yahoo/yahoo.c:2682
 msgid "Add Buddy"
 msgstr "添加好友"
 
-#: src/gtkblist.c:3961
+#: src/gtkblist.c:3995
 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. "
@@ -2569,35 +2606,35 @@
 "的话,别名将会替代用户名显示。\n"
 
 #. Set up stuff for the account box
-#: src/gtkblist.c:4021 src/gtkblist.c:4305
+#: src/gtkblist.c:4055 src/gtkblist.c:4339
 msgid "Account:"
 msgstr "账户:"
 
-#: src/gtkblist.c:4264
+#: src/gtkblist.c:4298
 msgid ""
 "You are not currently signed on with any protocols that have the ability to "
 "chat."
 msgstr "您目前登入的协议中没有一个可以聊天的。"
 
-#: src/gtkblist.c:4271
+#: src/gtkblist.c:4305
 msgid "Add Chat"
 msgstr "添加聊天"
 
-#: src/gtkblist.c:4295
+#: src/gtkblist.c:4329
 msgid ""
 "Please enter an alias, and the appropriate information about the chat you "
 "would like to add to your buddy list.\n"
 msgstr "您想要将聊天加入您的好友列表,请输入该聊天的别名和对应信息。\n"
 
-#: src/gtkblist.c:4373
+#: src/gtkblist.c:4407
 msgid "Add Group"
 msgstr "添加组"
 
-#: src/gtkblist.c:4374
+#: src/gtkblist.c:4408
 msgid "Please enter the name of the group to be added."
 msgstr "请输入要添加的组名称。"
 
-#: src/gtkblist.c:4941 src/gtkblist.c:5038
+#: src/gtkblist.c:4975 src/gtkblist.c:5072
 msgid "No actions available"
 msgstr "没有可用的操作"
 
@@ -2646,29 +2683,16 @@
 msgid "Time"
 msgstr "时间"
 
-#: src/gtkconv.c:168
-#, c-format
-msgid "<h1>Conversation with %s</h1>\n"
-msgstr "<h1>与 %s 的谈话</h1>\n"
-
-#: src/gtkconv.c:186 src/gtkdebug.c:212
-msgid "That file already exists"
-msgstr "该文件不存在"
-
-#: src/gtkconv.c:187 src/gtkdebug.c:213 src/gtkft.c:1123
-msgid "Would you like to overwrite it?"
-msgstr "您是否想要覆盖?"
-
-#: src/gtkconv.c:365
+#: src/gtkconv.c:314
 #, c-format
 msgid "me is using Gaim v%s."
 msgstr "我正在使用 Gaim v%s。"
 
-#: src/gtkconv.c:374
+#: src/gtkconv.c:323
 msgid "Supported debug options are:  version"
 msgstr "支持的调试选项有: version"
 
-#: src/gtkconv.c:387
+#: src/gtkconv.c:336
 msgid ""
 "Use \"/help &lt;command&gt;\" for help on a specific command.\n"
 "The following commands are available in this context:\n"
@@ -2676,11 +2700,11 @@
 "使用“/help &lt;命令&gt;”可获得具体命令的帮助。\n"
 "此环境下可使用下列命令:\n"
 
-#: src/gtkconv.c:421
+#: src/gtkconv.c:370
 msgid "No such command (in this context)."
 msgstr "没有这样的命令(在此环境中)。"
 
-#: src/gtkconv.c:468
+#: src/gtkconv.c:443
 msgid ""
 "No such command. If you didn't mean to type a command, you can turn commands "
 "off from Tools->Preferences->Interface->Conversation->Enable \"slash\" "
@@ -2689,7 +2713,7 @@
 "没有这样的命令。如果您本来并不想输入命令,您可以在工具->首选项->界面->转换->"
 "启用“斜线”命令中关闭命令。"
 
-#: src/gtkconv.c:476
+#: src/gtkconv.c:451
 msgid ""
 "Syntax Error:  You typed the wrong number of arguments to that command. If "
 "you didn't mean to type a command, you can turn commands off from Tools-"
@@ -2698,550 +2722,543 @@
 "语法错误: 您为命令输入的参数个数不对。如果您本来并不想输入命令,您可以在工具-"
 ">首选项->界面->转换->启用“斜线”命令中关闭命令。"
 
-#: src/gtkconv.c:483
+#: src/gtkconv.c:458
 msgid "Your command failed for an unknown reason."
 msgstr "您的命令失败,原因未知。"
 
-#: src/gtkconv.c:490
+#: src/gtkconv.c:465
 msgid "That command only works in Chats, not IMs."
 msgstr "命令只在聊天中可用,对话中无效。"
 
-#: src/gtkconv.c:493
+#: src/gtkconv.c:468
 msgid "That command only works in IMs, not Chats."
 msgstr "命令只在对话中可用,聊天中无效。"
 
-#: src/gtkconv.c:497
+#: src/gtkconv.c:472
 msgid "That command doesn't work on this protocol."
 msgstr "命令无法在此协议下工作。"
 
-#: src/gtkconv.c:713
+#: src/gtkconv.c:693
 msgid "Invite Buddy Into Chat Room"
 msgstr "邀请好友进入聊天室"
 
 #. Put our happy label in it.
-#: src/gtkconv.c:741
+#: src/gtkconv.c:721
 msgid ""
 "Please enter the name of the user you wish to invite, along with an optional "
 "invite message."
 msgstr "您想要邀请谁?请输入他/她的名字,以及可选的邀请消息。"
 
-#: src/gtkconv.c:762
+#: src/gtkconv.c:742
 msgid "_Buddy:"
 msgstr "好友(_B):"
 
-#: src/gtkconv.c:782
+#: src/gtkconv.c:762
 msgid "_Message:"
 msgstr "消息(_M):"
 
-#: src/gtkconv.c:890 src/gtkdebug.c:127
+#: src/gtkconv.c:799 src/gtkconv.c:2489 src/gtkdebug.c:182
+msgid "Unable to open file."
+msgstr "无法打开文件。"
+
+#: src/gtkconv.c:804
+#, c-format
+msgid "<h1>Conversation with %s</h1>\n"
+msgstr "<h1>与 %s 的谈话</h1>\n"
+
+#: src/gtkconv.c:818
+msgid "Save Conversation"
+msgstr "保存对话"
+
+#: src/gtkconv.c:895 src/gtkdebug.c:131
 msgid "Find"
 msgstr "查找"
 
-#: src/gtkconv.c:916 src/gtkdebug.c:155
+#: src/gtkconv.c:921 src/gtkdebug.c:159
 msgid "_Search for:"
 msgstr "搜索文字(_S):"
 
-#: src/gtkconv.c:1312
+#: src/gtkconv.c:1338
 msgid "IM"
 msgstr "开聊"
 
-#: src/gtkconv.c:1320
+#. Block button
+#: src/gtkconv.c:1347 src/gtkconv.c:3666 src/protocols/oscar/oscar.c:453
+#: src/protocols/oscar/oscar.c:6788
+msgid "Send File"
+msgstr "发送文件"
+
+#: src/gtkconv.c:1356
 msgid "Un-Ignore"
 msgstr "取消忽略"
 
-#: src/gtkconv.c:1322 src/gtkprefs.c:778
+#: src/gtkconv.c:1358 src/gtkprefs.c:826
 msgid "Ignore"
 msgstr "忽略"
 
 #. Info button
-#: src/gtkconv.c:1331 src/gtkconv.c:3577
+#: src/gtkconv.c:1367 src/gtkconv.c:3687
 msgid "Info"
 msgstr "信息"
 
-#: src/gtkconv.c:1340
+#: src/gtkconv.c:1376
 msgid "Get Away Msg"
 msgstr "获得离开消息"
 
-#: src/gtkconv.c:2467
+#: src/gtkconv.c:2497
+msgid "Unable to save icon file to disk."
+msgstr "无法将图标文件保存到磁盘。"
+
+#: src/gtkconv.c:2514
+msgid "Save Icon"
+msgstr "保存图标"
+
+#: src/gtkconv.c:2544
 msgid "Animate"
 msgstr "动画"
 
-#: src/gtkconv.c:2472
+#: src/gtkconv.c:2549
 msgid "Hide Icon"
 msgstr "隐藏图标"
 
-#: src/gtkconv.c:2478
+#: src/gtkconv.c:2555
 msgid "Save Icon As..."
 msgstr "图标另存为..."
 
-#: src/gtkconv.c:2847
+#: src/gtkconv.c:2939
 msgid "User is typing..."
 msgstr "用户正在打字..."
 
-#: src/gtkconv.c:2855
+#: src/gtkconv.c:2947
 msgid "User has typed something and paused"
 msgstr "用户打了几个字,停了一下"
 
 #. Build the Send As menu
-#: src/gtkconv.c:2958
+#: src/gtkconv.c:3050
 msgid "_Send As"
 msgstr "发送身份(_S)"
 
-#: src/gtkconv.c:3335
-msgid "Save Conversation"
-msgstr "保存对话"
-
 #. Conversation menu
-#: src/gtkconv.c:3352
+#: src/gtkconv.c:3450
 msgid "/_Conversation"
 msgstr "/对话(_C)"
 
-#: src/gtkconv.c:3354
+#: src/gtkconv.c:3452
 msgid "/Conversation/New Instant _Message..."
 msgstr "/对话(C)/新即时消息(_M)..."
 
-#: src/gtkconv.c:3359
+#: src/gtkconv.c:3457
 msgid "/Conversation/_Find..."
 msgstr "/对话(C)/查找(_F)..."
 
-#: src/gtkconv.c:3361
+#: src/gtkconv.c:3459
 msgid "/Conversation/View _Log"
 msgstr "/对话(C)/查看日志(_L)"
 
-#: src/gtkconv.c:3362
+#: src/gtkconv.c:3460
 msgid "/Conversation/_Save As..."
 msgstr "/对话(C)/另存为(_S)..."
 
-#: src/gtkconv.c:3364
+#: src/gtkconv.c:3462
 msgid "/Conversation/Clear"
 msgstr "/对话(C)/清除"
 
-#: src/gtkconv.c:3368
+#: src/gtkconv.c:3466
+msgid "/Conversation/Se_nd File..."
+msgstr "/对话(C)/发送文件(_N)..."
+
+#: src/gtkconv.c:3467
 msgid "/Conversation/Add Buddy _Pounce..."
 msgstr "/对话(C)/添加好友千里眼(_P)..."
 
-#: src/gtkconv.c:3370
+#: src/gtkconv.c:3469
 msgid "/Conversation/_Get Info"
 msgstr "/对话(C)/获取信息(_G)"
 
-#: src/gtkconv.c:3372
+#: src/gtkconv.c:3471
 msgid "/Conversation/_Warn..."
 msgstr "/对话(C)/警告(_W)..."
 
-#: src/gtkconv.c:3374
+#: src/gtkconv.c:3473
 msgid "/Conversation/In_vite..."
 msgstr "/对话(C)/邀请(_V)..."
 
-#: src/gtkconv.c:3379
+#: src/gtkconv.c:3478
 msgid "/Conversation/A_lias..."
 msgstr "/对话(C)/别名(_L)..."
 
-#: src/gtkconv.c:3381
+#: src/gtkconv.c:3480
 msgid "/Conversation/_Block..."
 msgstr "/对话(C)/屏蔽(_B)..."
 
-#: src/gtkconv.c:3383
+#: src/gtkconv.c:3482
 msgid "/Conversation/_Add..."
 msgstr "/对话(C)/添加(_A)..."
 
-#: src/gtkconv.c:3385
+#: src/gtkconv.c:3484
 msgid "/Conversation/_Remove..."
 msgstr "/对话(C)/删除(_R)..."
 
-#: src/gtkconv.c:3390
+#: src/gtkconv.c:3489
 msgid "/Conversation/Insert Lin_k..."
 msgstr "/对话(C)/插入链接(_K)..."
 
-#: src/gtkconv.c:3392
+#: src/gtkconv.c:3491
 msgid "/Conversation/Insert Imag_e..."
 msgstr "/对话(C)/插入图像(_E)..."
 
-#: src/gtkconv.c:3397
+#: src/gtkconv.c:3496
 msgid "/Conversation/_Close"
 msgstr "/对话(C)/关闭(_C)"
 
 #. Options
-#: src/gtkconv.c:3401
+#: src/gtkconv.c:3500
 msgid "/_Options"
 msgstr "/选项(_O)"
 
-#: src/gtkconv.c:3402
+#: src/gtkconv.c:3501
 msgid "/Options/Enable _Logging"
 msgstr "/选项(O)/允许记录日志(_L)"
 
-#: src/gtkconv.c:3403
+#: src/gtkconv.c:3502
 msgid "/Options/Enable _Sounds"
 msgstr "/选项(O)/允许声音(_S)"
 
-#: src/gtkconv.c:3404
+#: src/gtkconv.c:3503
 msgid "/Options/Show Formatting _Toolbar"
 msgstr "/选项(O)/显示格式工具栏(_T)"
 
-#: src/gtkconv.c:3405
+#: src/gtkconv.c:3504
 msgid "/Options/Show T_imestamps"
 msgstr "/选项/显示时间戳(_I)"
 
-#: src/gtkconv.c:3447
+#: src/gtkconv.c:3546
 msgid "/Conversation/View Log"
 msgstr "/对话(C)/查看日志(L)"
 
-#: src/gtkconv.c:3452
+#: src/gtkconv.c:3551
+msgid "/Conversation/Send File..."
+msgstr "/对话(C)/发送文件(N)..."
+
+#: src/gtkconv.c:3555
 msgid "/Conversation/Add Buddy Pounce..."
 msgstr "/对话(C)/添加好友千里眼(P)..."
 
-#: src/gtkconv.c:3458
+#: src/gtkconv.c:3561
 msgid "/Conversation/Get Info"
 msgstr "/对话(C)/获取信息(G)"
 
-#: src/gtkconv.c:3462
+#: src/gtkconv.c:3565
 msgid "/Conversation/Warn..."
 msgstr "/对话(C)/警告(W)..."
 
-#: src/gtkconv.c:3466
+#: src/gtkconv.c:3569
 msgid "/Conversation/Invite..."
 msgstr "/对话(C)/邀请(V)..."
 
-#: src/gtkconv.c:3472
+#: src/gtkconv.c:3575
 msgid "/Conversation/Alias..."
 msgstr "/对话(C)/别名(L)..."
 
-#: src/gtkconv.c:3476
+#: src/gtkconv.c:3579
 msgid "/Conversation/Block..."
 msgstr "/对话(C)/屏蔽(B)..."
 
-#: src/gtkconv.c:3480
+#: src/gtkconv.c:3583
 msgid "/Conversation/Add..."
 msgstr "/对话(C)/添加(A)..."
 
-#: src/gtkconv.c:3484
+#: src/gtkconv.c:3587
 msgid "/Conversation/Remove..."
 msgstr "/对话(C)/删除(R)..."
 
-#: src/gtkconv.c:3490
+#: src/gtkconv.c:3593
 msgid "/Conversation/Insert Link..."
 msgstr "/对话(C)/插入链接(K)..."
 
-#: src/gtkconv.c:3494
+#: src/gtkconv.c:3597
 msgid "/Conversation/Insert Image..."
 msgstr "/对话(C)/插入图像(I)..."
 
-#: src/gtkconv.c:3500
+#: src/gtkconv.c:3603
 msgid "/Options/Enable Logging"
 msgstr "/选项(O)/允许记录(L)"
 
-#: src/gtkconv.c:3503
+#: src/gtkconv.c:3606
 msgid "/Options/Enable Sounds"
 msgstr "/选项(O)/允许声音(S)"
 
-#: src/gtkconv.c:3506
+#: src/gtkconv.c:3609
 msgid "/Options/Show Formatting Toolbar"
 msgstr "/选项(O)/显示格式工具栏(T)"
 
-#: src/gtkconv.c:3509
+#: src/gtkconv.c:3612
 msgid "/Options/Show Timestamps"
 msgstr "/选项/显示时间戳(I)"
 
 #. From right to left...
 #. Send button
-#: src/gtkconv.c:3533 src/gtkconv.c:3535 src/gtkconv.c:3641 src/gtkconv.c:3643
+#: src/gtkconv.c:3636 src/gtkconv.c:3638 src/gtkconv.c:3756 src/gtkconv.c:3758
 msgid "Send"
 msgstr "发送"
 
 #. Now, um, just kind of all over the place. Huh?
 #. Warn button
-#: src/gtkconv.c:3549
+#: src/gtkconv.c:3652
 msgid "Warn"
 msgstr "警告"
 
-#: src/gtkconv.c:3552
+#: src/gtkconv.c:3655
 msgid "Warn the user"
 msgstr "警告用户"
 
 #. Block button
-#: src/gtkconv.c:3556 src/gtkprivacy.c:624 src/gtkprivacy.c:635
+#: src/gtkconv.c:3659 src/gtkprivacy.c:624 src/gtkprivacy.c:635
 msgid "Block"
 msgstr "屏蔽"
 
-#: src/gtkconv.c:3559
+#: src/gtkconv.c:3662
 msgid "Block the user"
 msgstr "屏蔽用户"
 
-#: src/gtkconv.c:3566
+#: src/gtkconv.c:3669
+msgid "Send a file to the user"
+msgstr "给用户发送文件"
+
+#: src/gtkconv.c:3676
 msgid "Add the user to your buddy list"
 msgstr "将用户加为好友"
 
-#: src/gtkconv.c:3573
+#: src/gtkconv.c:3683
 msgid "Remove the user from your buddy list"
 msgstr "从您的好友列表中删除该用户"
 
-#: src/gtkconv.c:3580 src/gtkconv.c:3923
+#: src/gtkconv.c:3690 src/gtkconv.c:4041
 msgid "Get the user's information"
 msgstr "获取用户信息"
 
 #. Invite
-#: src/gtkconv.c:3655
+#: src/gtkconv.c:3770
 msgid "Invite"
 msgstr "邀请"
 
-#: src/gtkconv.c:3658
+#: src/gtkconv.c:3773
 msgid "Invite a user"
 msgstr "邀请用户"
 
-#: src/gtkconv.c:3665
+#: src/gtkconv.c:3780
 msgid "Add the chat to your buddy list"
 msgstr "将聊天添加到您的好友列表"
 
-#: src/gtkconv.c:3672
+#: src/gtkconv.c:3787
 msgid "Remove the chat from your buddy list"
 msgstr "从您的好友列表中删除聊天"
 
-#: src/gtkconv.c:3782
+#: src/gtkconv.c:3897
 msgid "Topic:"
 msgstr "话题:"
 
 #. Setup the label telling how many people are in the room.
-#: src/gtkconv.c:3845
+#: src/gtkconv.c:3960
 msgid "0 people in room"
 msgstr "聊天室里没有人"
 
-#: src/gtkconv.c:3900
+#: src/gtkconv.c:4018
 msgid "IM the user"
 msgstr "给用户发送即时消息"
 
-#: src/gtkconv.c:3912
+#: src/gtkconv.c:4030
 msgid "Ignore the user"
 msgstr "忽略用户"
 
-#: src/gtkconv.c:4490
+#: src/gtkconv.c:4629
 msgid "Close conversation"
 msgstr "关闭对话"
 
-#: src/gtkconv.c:5035 src/gtkconv.c:5067 src/gtkconv.c:5188 src/gtkconv.c:5255
+#: src/gtkconv.c:5171 src/gtkconv.c:5203 src/gtkconv.c:5324 src/gtkconv.c:5391
 #, c-format
 msgid "%d person in room"
 msgid_plural "%d people in room"
 msgstr[0] "聊天室里有 %d 个人"
 
-#: src/gtkconv.c:5757 src/gtkconv.c:5760
+#: src/gtkconv.c:5903 src/gtkconv.c:5906
 msgid "<main>/Conversation/Close"
 msgstr "<main>/对话(C)/关闭(C)"
 
-#: src/gtkconv.c:6132
+#: src/gtkconv.c:6278
 msgid "me &lt;action&gt;:  Send an IRC style action to a buddy or chat."
 msgstr "me &lt;动作&gt;: 向好友或聊天发送 IRC 风格的动作。"
 
-#: src/gtkconv.c:6135
+#: src/gtkconv.c:6281
 msgid ""
 "debug &lt;option&gt;:  Send various debug information to the current "
 "conversation."
 msgstr "debug &lt;选项&gt;: 在当前对话中发送各种调试信息。"
 
-#: src/gtkconv.c:6139
+#: src/gtkconv.c:6285
 msgid "help:  List available commands."
 msgstr "help: 列出可用的命令。"
 
-#: src/gtkconv.c:6143
+#: src/gtkconv.c:6289
 msgid "help &lt;command&gt;:  Help on a specific command."
 msgstr "help &lt;命令&gt;: 关于具体命令的帮助。"
 
-#: src/gtkdebug.c:226
+#: src/gtkdebug.c:197
 msgid "Save Debug Log"
 msgstr "保存调试日志"
 
-#: src/gtkdebug.c:289
+#: src/gtkdebug.c:250
 msgid "Debug Window"
 msgstr "调试窗口"
 
-#: src/gtkdebug.c:327
+#: src/gtkdebug.c:288
 msgid "Pause"
 msgstr "暂停"
 
-#: src/gtkdebug.c:333
+#: src/gtkdebug.c:294
 msgid "Timestamps"
 msgstr "时间戳"
 
-#: src/gtkft.c:143
+#: src/gtkft.c:136
 #, c-format
 msgid "%.2f KB/s"
 msgstr "%.2f KB/秒"
 
-#: src/gtkft.c:164 src/gtkft.c:974
+#: src/gtkft.c:157 src/gtkft.c:967
 msgid "Finished"
 msgstr "已完成"
 
-#: src/gtkft.c:167 src/gtkft.c:925
+#: src/gtkft.c:160 src/gtkft.c:918
 msgid "Canceled"
 msgstr "已取消"
 
-#: src/gtkft.c:170
+#: src/gtkft.c:163
 msgid "Waiting for transfer to begin"
 msgstr "正在传送开始"
 
-#: src/gtkft.c:223
+#: src/gtkft.c:216
 msgid "<b>Receiving From:</b>"
 msgstr "<b>发送方:</b>"
 
-#: src/gtkft.c:226
+#: src/gtkft.c:219
 msgid "<b>Sending To:</b>"
 msgstr "<b>接收方:</b>"
 
-#: src/gtkft.c:400
+#: src/gtkft.c:393
 msgid "There is no application configured to open this type of file."
 msgstr "没有配置可打开此类型文件的应用程序。"
 
-#: src/gtkft.c:405
+#: src/gtkft.c:398
 msgid "An error occurred while opening the file."
 msgstr "打开文件时发生了错误。"
 
+#: src/gtkft.c:489
+msgid "Progress"
+msgstr "进度"
+
 #: src/gtkft.c:496
-msgid "Progress"
-msgstr "进度"
-
-#: src/gtkft.c:503
 msgid "Filename"
 msgstr "文件名"
 
-#: src/gtkft.c:510
+#: src/gtkft.c:503
 msgid "Size"
 msgstr "大小"
 
-#: src/gtkft.c:517
+#: src/gtkft.c:510
 msgid "Remaining"
 msgstr "剩余"
 
-#: src/gtkft.c:547
+#: src/gtkft.c:540
 msgid "Filename:"
 msgstr "文件名:"
 
-#: src/gtkft.c:548
+#: src/gtkft.c:541
 msgid "Status:"
 msgstr "状态:"
 
-#: src/gtkft.c:549
+#: src/gtkft.c:542
 msgid "Speed:"
 msgstr "速度:"
 
-#: src/gtkft.c:550
+#: src/gtkft.c:543
 msgid "Time Elapsed:"
 msgstr "已过时间:"
 
-#: src/gtkft.c:551
+#: src/gtkft.c:544
 msgid "Time Remaining:"
 msgstr "剩余时间:"
 
-#: src/gtkft.c:648
+#: src/gtkft.c:641
 msgid "_Keep the dialog open"
 msgstr "保持对话框打开(_K)"
 
-#: src/gtkft.c:658
+#: src/gtkft.c:651
 msgid "_Clear finished transfers"
 msgstr "清除未完成的传送(_C)"
 
 #. "Download Details" arrow
-#: src/gtkft.c:667
+#: src/gtkft.c:660
 msgid "Show transfer details"
 msgstr "显示下载细节"
 
-#: src/gtkft.c:668
+#: src/gtkft.c:661
 msgid "Hide transfer details"
 msgstr "隐藏下载细节"
 
 #. Pause button
-#: src/gtkft.c:710 src/stock.c:90
+#: src/gtkft.c:703 src/stock.c:90
 msgid "_Pause"
 msgstr "暂停(_P)"
 
 #. Resume button
-#: src/gtkft.c:720
+#: src/gtkft.c:713
 msgid "_Resume"
 msgstr "继续(_R)"
 
-#: src/gtkft.c:927
+#: src/gtkft.c:920
 msgid "Failed"
 msgstr "已失败"
 
-#: src/gtkft.c:1099
-msgid "That file does not exist."
-msgstr "文件不存在。"
-
-#: src/gtkft.c:1108
-msgid "Cannot send a file of 0 bytes."
-msgstr "无法发送 0 字节的文件。"
-
-#: src/gtkft.c:1122
-msgid "That file already exists."
-msgstr "该文件不存在。"
-
-#. Open file selector to select the public key.
-#: src/gtkft.c:1148 src/protocols/silc/buddy.c:1023
-msgid "Open..."
-msgstr "打开..."
-
-#: src/gtkft.c:1150
-msgid "Save As..."
-msgstr "另存为..."
-
-#: src/gtkft.c:1200
-#, c-format
-msgid "%s wants to send you %s (%s)"
-msgstr "%s 想要给您发送 %s (%s)"
-
-#: src/gtkft.c:1233
-#, c-format
-msgid "Accept file transfer request from %s?"
-msgstr "接受来自 %s 的文件传送吗?"
-
-#: src/gtkft.c:1237
-#, c-format
-msgid ""
-"A file is available for download from:\n"
-"Remote host: %s\n"
-"Remote port: %d"
-msgstr ""
-"可从以下地址下载文件:\n"
-"远程主机: %s\n"
-"远程端口: %d"
-
-#: src/gtkimhtml.c:567
+#: src/gtkimhtml.c:602
 msgid "Pa_ste As Text"
 msgstr "粘贴为文本(_S)"
 
-#: src/gtkimhtml.c:1012
+#: src/gtkimhtml.c:1047
 msgid "Hyperlink color"
 msgstr "超级链接颜色"
 
-#: src/gtkimhtml.c:1013
+#: src/gtkimhtml.c:1048
 msgid "Color to draw hyperlinks."
 msgstr "绘制超级链接的颜色。"
 
-#: src/gtkimhtml.c:1218
+#: src/gtkimhtml.c:1253
 msgid "_Copy E-Mail Address"
 msgstr "复制电子邮件地址(_C)"
 
-#: src/gtkimhtml.c:1230
+#: src/gtkimhtml.c:1265
 msgid "_Copy Link Location"
 msgstr "复制链接地址(_C)"
 
-#: src/gtkimhtml.c:1240
+#: src/gtkimhtml.c:1275
 msgid "_Open Link in Browser"
 msgstr "在浏览器中打开链接(_O)"
 
-#: src/gtkimhtml.c:2761
+#: src/gtkimhtml.c:2797
 msgid ""
 "Unable to guess the image type based on the file extension supplied.  "
 "Defaulting to PNG."
 msgstr "Gaim 无法根据提供的文件扩展名猜测图像类型。按默认值视为 PNG。"
 
-#: src/gtkimhtml.c:2769
+#: src/gtkimhtml.c:2805
 #, c-format
 msgid "Error saving image: %s"
 msgstr "保存图像出错: %s"
 
-#: src/gtkimhtml.c:2778
+#: src/gtkimhtml.c:2814
 msgid "Save Image"
 msgstr "保存图像"
 
-#: src/gtkimhtml.c:2801
+#: src/gtkimhtml.c:2837
 msgid "_Save Image..."
 msgstr "保存图像(_S)..."
 
@@ -3283,74 +3300,74 @@
 msgid "_Insert"
 msgstr "插入(_I)"
 
-#: src/gtkimhtmltoolbar.c:472
+#: src/gtkimhtmltoolbar.c:481
 #, c-format
 msgid "Failed to store image: %s\n"
 msgstr "存储图像失败: %s\n"
 
-#: src/gtkimhtmltoolbar.c:498
+#: src/gtkimhtmltoolbar.c:507 src/gtkimhtmltoolbar.c:517
 msgid "Insert Image"
 msgstr "插入图像"
 
-#: src/gtkimhtmltoolbar.c:637
+#: src/gtkimhtmltoolbar.c:655
 msgid "This theme has no available smileys."
 msgstr "此主题没有可用的笑脸。"
 
 #. show everything
-#: src/gtkimhtmltoolbar.c:652
+#: src/gtkimhtmltoolbar.c:670
 msgid "Smile!"
 msgstr "笑脸"
 
-#: src/gtkimhtmltoolbar.c:870
+#: src/gtkimhtmltoolbar.c:888
 msgid "Bold"
 msgstr "粗体"
 
-#: src/gtkimhtmltoolbar.c:881
+#: src/gtkimhtmltoolbar.c:899
 msgid "Italic"
 msgstr "斜体"
 
-#: src/gtkimhtmltoolbar.c:892
+#: src/gtkimhtmltoolbar.c:910
 msgid "Underline"
 msgstr "下划线"
 
-#: src/gtkimhtmltoolbar.c:908
+#: src/gtkimhtmltoolbar.c:926
 msgid "Larger font size"
 msgstr "较大字体"
 
-#: src/gtkimhtmltoolbar.c:920
+#: src/gtkimhtmltoolbar.c:938
 msgid "Smaller font size"
 msgstr "较小字体"
 
-#: src/gtkimhtmltoolbar.c:937
+#: src/gtkimhtmltoolbar.c:955
 msgid "Font Face"
 msgstr "字体"
 
-#: src/gtkimhtmltoolbar.c:949
+#: src/gtkimhtmltoolbar.c:967
 msgid "Foreground font color"
 msgstr "字体颜色"
 
-#: src/gtkimhtmltoolbar.c:961
+#: src/gtkimhtmltoolbar.c:979
 msgid "Background color"
 msgstr "背景颜色"
 
-#: src/gtkimhtmltoolbar.c:976
+#: src/gtkimhtmltoolbar.c:994
 msgid "Insert link"
 msgstr "插入链接"
 
-#: src/gtkimhtmltoolbar.c:986
+#: src/gtkimhtmltoolbar.c:1004
 msgid "Insert image"
 msgstr "插入图像"
 
-#: src/gtkimhtmltoolbar.c:997
+#: src/gtkimhtmltoolbar.c:1015
 msgid "Insert smiley"
 msgstr "插入笑脸"
 
-#: src/gtklog.c:282
+#: src/gtklog.c:302
 msgid "Conversations with"
 msgstr "交谈对象"
 
 #. Window **********
-#: src/gtklog.c:372 src/gtklog.c:388
+#: src/gtklog.c:392 src/gtklog.c:408
 msgid "System Log"
 msgstr "系统日志"
 
@@ -3399,7 +3416,7 @@
 msgstr "浏览器命令“%s”无效。"
 
 #: src/gtknotify.c:432 src/gtknotify.c:446 src/gtknotify.c:461
-#: src/gtknotify.c:569
+#: src/gtknotify.c:579
 msgid "Unable to open URL"
 msgstr "无法打开 URL"
 
@@ -3408,488 +3425,492 @@
 msgid "Error launching \"%s\": %s"
 msgstr "调用“%s”出错: %s"
 
-#: src/gtknotify.c:570
+#: src/gtknotify.c:580
 msgid ""
 "The 'Manual' browser command has been chosen, but no command has been set."
 msgstr "选择了“手动”浏览器命令,但未设置命令。"
 
-#: src/gtkpounce.c:144
+#: src/gtkpounce.c:130
 msgid "Select a file"
 msgstr "选择文件"
 
-#: src/gtkpounce.c:194
+#: src/gtkpounce.c:161
 msgid "Please enter a buddy to pounce."
 msgstr "请输入要监视的好友。"
 
 #. "New Buddy Pounce"
-#: src/gtkpounce.c:420 src/gtkpounce.c:923
+#: src/gtkpounce.c:387 src/gtkpounce.c:890
 msgid "New Buddy Pounce"
 msgstr "新建好友千里眼"
 
-#: src/gtkpounce.c:420
+#: src/gtkpounce.c:387
 msgid "Edit Buddy Pounce"
 msgstr "编辑好友千里眼"
 
 #. Create the "Pounce Who" frame.
-#: src/gtkpounce.c:438
+#: src/gtkpounce.c:405
 msgid "Pounce Who"
 msgstr "监视对象"
 
-#: src/gtkpounce.c:465
+#: src/gtkpounce.c:432
 msgid "_Buddy name:"
 msgstr "好友名称(_B):"
 
 #. Create the "Pounce When" frame.
-#: src/gtkpounce.c:489
+#: src/gtkpounce.c:456
 msgid "Pounce When"
 msgstr "监视的事件"
 
-#: src/gtkpounce.c:497 src/main.c:296
+#: src/gtkpounce.c:464 src/main.c:296
 msgid "_Sign on"
 msgstr "登入(_S)"
 
-#: src/gtkpounce.c:499
+#: src/gtkpounce.c:466
 msgid "Sign _off"
 msgstr "登出(_O)"
 
-#: src/gtkpounce.c:501
+#: src/gtkpounce.c:468
 msgid "A_way"
 msgstr "离开(_W)"
 
-#: src/gtkpounce.c:503
+#: src/gtkpounce.c:470
 msgid "Re_turn from away"
 msgstr "回来(_T)"
 
-#: src/gtkpounce.c:505
+#: src/gtkpounce.c:472
 msgid "_Idle"
 msgstr "瞌睡(_I)"
 
-#: src/gtkpounce.c:507
+#: src/gtkpounce.c:474
 msgid "Retur_n from idle"
 msgstr "睡醒了(_N)"
 
-#: src/gtkpounce.c:509
+#: src/gtkpounce.c:476
 msgid "Buddy starts _typing"
 msgstr "好友开始打字(_T)"
 
-#: src/gtkpounce.c:511
+#: src/gtkpounce.c:478
 msgid "Buddy stops t_yping"
 msgstr "好友停止打字(_Y)"
 
 #. Create the "Pounce Action" frame.
-#: src/gtkpounce.c:540
+#: src/gtkpounce.c:507
 msgid "Pounce Action"
 msgstr "采取操作"
 
-#: src/gtkpounce.c:548
+#: src/gtkpounce.c:515
 msgid "Op_en an IM window"
 msgstr "打开即时消息窗口(_E)"
 
-#: src/gtkpounce.c:550
+#: src/gtkpounce.c:517
 msgid "_Popup notification"
 msgstr "弹出通知(_P)"
 
-#: src/gtkpounce.c:552
+#: src/gtkpounce.c:519
 msgid "Send a _message"
 msgstr "发送消息(_M)"
 
-#: src/gtkpounce.c:554
+#: src/gtkpounce.c:521
 msgid "E_xecute a command"
 msgstr "执行命令(_X)"
 
-#: src/gtkpounce.c:556
+#: src/gtkpounce.c:523
 msgid "P_lay a sound"
 msgstr "播放声音(_L)"
 
-#: src/gtkpounce.c:560
+#: src/gtkpounce.c:527
 msgid "B_rowse..."
 msgstr "浏览(_R)..."
 
-#: src/gtkpounce.c:562
+#: src/gtkpounce.c:529
 msgid "Bro_wse..."
 msgstr "浏览(_W)..."
 
-#: src/gtkpounce.c:563
+#: src/gtkpounce.c:530
 msgid "Pre_view"
 msgstr "预览(_V)"
 
-#: src/gtkpounce.c:646
+#: src/gtkpounce.c:613
 msgid "Sav_e this pounce after activation"
 msgstr "激活后保存此千里眼(_E)"
 
 #. "Remove Buddy Pounce"
-#: src/gtkpounce.c:930
+#: src/gtkpounce.c:897
 msgid "Remove Buddy Pounce"
 msgstr "删除好友千里眼"
 
-#: src/gtkpounce.c:994
+#: src/gtkpounce.c:961
 #, c-format
 msgid "%s has started typing to you (%s)"
 msgstr "%s 开始向您打字(%s)"
 
-#: src/gtkpounce.c:996
+#: src/gtkpounce.c:963
 #, c-format
 msgid "%s has signed on (%s)"
 msgstr "%s 已登入(%s)"
 
-#: src/gtkpounce.c:998
+#: src/gtkpounce.c:965
 #, c-format
 msgid "%s has returned from being idle (%s)"
 msgstr "%s 睡醒了(%s)"
 
-#: src/gtkpounce.c:1000
+#: src/gtkpounce.c:967
 #, c-format
 msgid "%s has returned from being away (%s)"
 msgstr "%s 回来了(%s)"
 
-#: src/gtkpounce.c:1002
+#: src/gtkpounce.c:969
 #, c-format
 msgid "%s has stopped typing to you (%s)"
 msgstr "%s 停止了给您打字(%s)"
 
-#: src/gtkpounce.c:1004
+#: src/gtkpounce.c:971
 #, c-format
 msgid "%s has signed off (%s)"
 msgstr "%s 已登出(%s)"
 
-#: src/gtkpounce.c:1006
+#: src/gtkpounce.c:973
 #, c-format
 msgid "%s has become idle (%s)"
 msgstr "%s 打起瞌睡(%s)"
 
-#: src/gtkpounce.c:1008
+#: src/gtkpounce.c:975
 #, c-format
 msgid "%s has gone away. (%s)"
 msgstr "%s 走了。(%s)"
 
-#: src/gtkpounce.c:1009
+#: src/gtkpounce.c:976
 msgid "Unknown pounce event. Please report this!"
 msgstr "未知的千里眼。请报告此错误!"
 
-#: src/gtkprefs.c:401
+#: src/gtkprefs.c:446
 msgid "Interface Options"
 msgstr "界面选项"
 
-#: src/gtkprefs.c:403
+#: src/gtkprefs.c:448
 msgid "D_isplay remote nicknames if no alias is set"
 msgstr "如果未设置别名则显示远程昵称(_I)"
 
-#: src/gtkprefs.c:627
+#: src/gtkprefs.c:675
 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 "请从下面选择您要使用的笑脸主题。将主题拖曳到主题列表即可安装新主题。"
 
-#: src/gtkprefs.c:667
+#: src/gtkprefs.c:715
 msgid "Icon"
 msgstr "图标"
 
-#: src/gtkprefs.c:674 src/gtkprefs.c:2199 src/protocols/jabber/buddy.c:265
+#: src/gtkprefs.c:722 src/gtkprefs.c:2212 src/protocols/jabber/buddy.c:264
 #: src/protocols/jabber/buddy.c:748 src/protocols/jabber/chat.c:701
 msgid "Description"
 msgstr "描述"
 
-#: src/gtkprefs.c:770
+#: src/gtkprefs.c:818
 msgid "Display"
 msgstr "显示"
 
-#: src/gtkprefs.c:771
+#: src/gtkprefs.c:819
 msgid "Show _timestamp on messages"
 msgstr "消息显示时间戳(_T)"
 
-#: src/gtkprefs.c:774
+#: src/gtkprefs.c:822
 msgid "_Highlight misspelled words"
 msgstr "突出显示拼错的单词(_H)"
 
-#: src/gtkprefs.c:779
+#: src/gtkprefs.c:827
 msgid "Ignore c_olors"
 msgstr "忽略颜色(_O)"
 
-#: src/gtkprefs.c:781
+#: src/gtkprefs.c:829
 msgid "Ignore font _faces"
 msgstr "忽略字体(_F)"
 
-#: src/gtkprefs.c:783
+#: src/gtkprefs.c:831
 msgid "Ignore font si_zes"
 msgstr "较大字体(_Z)"
 
-#: src/gtkprefs.c:786
+#: src/gtkprefs.c:834
 msgid "_Ignore formatting on incoming messages"
 msgstr "忽略收到信息的格式(_I)"
 
-#: src/gtkprefs.c:790
+#: src/gtkprefs.c:838
 msgid "Default Formatting"
 msgstr "默认格式"
 
-#: src/gtkprefs.c:792
+#: src/gtkprefs.c:840
 msgid "_Send default formatting with outgoing messages"
 msgstr "送出信息使用默认格式(_S)"
 
-#: src/gtkprefs.c:824
+#: src/gtkprefs.c:872
 msgid ""
 "This is how your outgoing message text will appear when you use protocols "
 "that support formatting. :)"
 msgstr "当您使用的协议支持格式时,您送出的信息将会显示为这样。"
 
-#: src/gtkprefs.c:827
+#: src/gtkprefs.c:875
 msgid "_Clear Formatting"
 msgstr "清除格式(_C)"
 
-#: src/gtkprefs.c:864
+#: src/gtkprefs.c:912
 msgid "Send Message"
 msgstr "发送消息"
 
-#: src/gtkprefs.c:865
+#: src/gtkprefs.c:913
 msgid "Enter _sends message"
 msgstr "回车键发送消息(_S)"
 
-#: src/gtkprefs.c:867
+#: src/gtkprefs.c:915
 msgid "C_ontrol-Enter sends message"
 msgstr "Ctrl+回车键发送消息(_O)"
 
-#: src/gtkprefs.c:870
+#: src/gtkprefs.c:918
 msgid "Window Closing"
 msgstr "窗口关闭"
 
-#: src/gtkprefs.c:871
+#: src/gtkprefs.c:919
 msgid "_Escape closes window"
 msgstr "Esc 键关闭窗口(_E)"
 
-#: src/gtkprefs.c:874
+#: src/gtkprefs.c:922
 msgid "Insertions"
 msgstr "插入"
 
-#: src/gtkprefs.c:875
+#: src/gtkprefs.c:923
 msgid "Control-{B/I/U} changes _formatting"
 msgstr "Ctrl+{B/I/U} 更改格式(_F)"
 
-#: src/gtkprefs.c:877
+#: src/gtkprefs.c:925
 msgid "Control-(number) _inserts smileys"
 msgstr "Ctrl+数字键插入笑脸(_I)"
 
-#: src/gtkprefs.c:893
+#: src/gtkprefs.c:941
 msgid "Buddy List Sorting"
 msgstr "好友列表排序"
 
-#: src/gtkprefs.c:902
+#: src/gtkprefs.c:950
 msgid "_Sorting:"
 msgstr "排序(_S):"
 
-#: src/gtkprefs.c:908 src/gtkprefs.c:961
+#: src/gtkprefs.c:956 src/gtkprefs.c:1009
 msgid "Show _buttons as:"
 msgstr "将按钮显示为(_B):"
 
-#: src/gtkprefs.c:910 src/gtkprefs.c:963
+#: src/gtkprefs.c:958 src/gtkprefs.c:1011
 msgid "Pictures"
 msgstr "图片"
 
-#: src/gtkprefs.c:911 src/gtkprefs.c:964
+#: src/gtkprefs.c:959 src/gtkprefs.c:1012
 msgid "Text"
 msgstr "文字"
 
-#: src/gtkprefs.c:912 src/gtkprefs.c:965
+#: src/gtkprefs.c:960 src/gtkprefs.c:1013
 msgid "Pictures and text"
 msgstr "图片和文字"
 
-#: src/gtkprefs.c:915
+#: src/gtkprefs.c:963
 msgid "_Raise window on events"
 msgstr "发生事件时激活窗口(_R)"
 
-#: src/gtkprefs.c:918
+#: src/gtkprefs.c:966
 msgid "Buddy Display"
 msgstr "好友显示"
 
-#: src/gtkprefs.c:919 src/gtkprefs.c:979
+#: src/gtkprefs.c:967 src/gtkprefs.c:1027
 msgid "Show buddy _icons"
 msgstr "显示好友图标(_I)"
 
-#: src/gtkprefs.c:921
+#: src/gtkprefs.c:969
 msgid "Show _warning levels"
 msgstr "显示警告级别(_W)"
 
-#: src/gtkprefs.c:923
+#: src/gtkprefs.c:971
 msgid "Show idle _times"
 msgstr "显示瞌睡时间(_T)"
 
-#: src/gtkprefs.c:925
+#: src/gtkprefs.c:973
 msgid "Dim i_dle buddies"
 msgstr "显示睡着的好友(_D)"
 
-#: src/gtkprefs.c:927
+#: src/gtkprefs.c:975
 msgid "_Automatically expand contacts"
 msgstr "自动展开联系人(_A)"
 
-#: src/gtkprefs.c:972
+#: src/gtkprefs.c:1020
 msgid "Enable \"_slash\" commands"
 msgstr "允许斜线开头的命令(_S)"
 
-#: src/gtkprefs.c:975
+#: src/gtkprefs.c:1023
 msgid "Show _formatting toolbar"
 msgstr "显示格式工具栏(_F)"
 
-#: src/gtkprefs.c:977
+#: src/gtkprefs.c:1025
 msgid "Show _aliases in tabs/titles"
 msgstr "在标签/标题中显示别名(_A)"
 
-#: src/gtkprefs.c:981
+#: src/gtkprefs.c:1029
 msgid "Enable buddy ic_on animation"
 msgstr "启用好友图标动画(_O)"
 
-#: src/gtkprefs.c:983
+#: src/gtkprefs.c:1031
 msgid "_Notify buddies that you are typing to them"
 msgstr "提醒好友您正在打字给他们(_N)"
 
-#: src/gtkprefs.c:985
+#: src/gtkprefs.c:1033
 msgid "_Raise IM window on events"
 msgstr "发生事件时激活对话窗口(_R)"
 
-#: src/gtkprefs.c:988
+#: src/gtkprefs.c:1036
 msgid "Raise chat _window on events"
 msgstr "发生事件时激活聊天窗口(_W)"
 
-#: src/gtkprefs.c:990
+#: src/gtkprefs.c:1038
 msgid "Use _multi-colored screen names in chats"
 msgstr "在聊天中使用多种颜色来区分用户名(_M)"
 
 #. All the tab options!
-#: src/gtkprefs.c:994
+#: src/gtkprefs.c:1042
 msgid "Tab Options"
 msgstr "标签选项"
 
-#: src/gtkprefs.c:996
+#: src/gtkprefs.c:1044
 msgid "Show IMs and chats in _tabbed windows"
 msgstr "在同一标签窗口内显示即时消息和聊天(_T)"
 
-#: src/gtkprefs.c:1011
+#: src/gtkprefs.c:1059
 msgid "Show _close button on tabs"
 msgstr "在标签上显示关闭按钮(_C)"
 
-#: src/gtkprefs.c:1014
+#: src/gtkprefs.c:1062
 msgid "Tab p_lacement:"
 msgstr "标签位置(_L):"
 
-#: src/gtkprefs.c:1016
+#: src/gtkprefs.c:1064
 msgid "Top"
 msgstr "上"
 
-#: src/gtkprefs.c:1017
+#: src/gtkprefs.c:1065
 msgid "Bottom"
 msgstr "下"
 
-#: src/gtkprefs.c:1018
+#: src/gtkprefs.c:1066
 msgid "Left"
 msgstr "左"
 
-#: src/gtkprefs.c:1019
+#: src/gtkprefs.c:1067
 msgid "Right"
 msgstr "右"
 
-#: src/gtkprefs.c:1025
+#: src/gtkprefs.c:1073
 msgid "New conversation _placement:"
 msgstr "新对话放置(_P):"
 
-#: src/gtkprefs.c:1076 src/protocols/oscar/oscar.c:592
-#: src/protocols/oscar/oscar.c:4837
+#: src/gtkprefs.c:1124 src/protocols/oscar/oscar.c:596
+#: src/protocols/oscar/oscar.c:4853
 msgid "IP Address"
 msgstr "IP 地址"
 
-#: src/gtkprefs.c:1078
+#: src/gtkprefs.c:1126
 msgid "_Autodetect IP Address"
 msgstr "自动检测 IP 地址(_A)"
 
-#: src/gtkprefs.c:1087
+#: src/gtkprefs.c:1135
 msgid "Public _IP:"
 msgstr "公网 _IP:"
 
-#: src/gtkprefs.c:1111
+#: src/gtkprefs.c:1159
 msgid "Ports"
 msgstr "端口"
 
-#: src/gtkprefs.c:1114
+#: src/gtkprefs.c:1162
 msgid "_Manually specify range of ports to listen on"
 msgstr "手动指定要监听的端口范围(_M)"
 
-#: src/gtkprefs.c:1117
+#: src/gtkprefs.c:1165
 msgid "_Start Port:"
 msgstr "起始端口(_S):"
 
-#: src/gtkprefs.c:1124
+#: src/gtkprefs.c:1172
 msgid "_End Port:"
 msgstr "终止端口(_E):"
 
-#: src/gtkprefs.c:1131
+#: src/gtkprefs.c:1179
 msgid "Proxy Server"
 msgstr "代理服务器"
 
-#: src/gtkprefs.c:1135
+#: src/gtkprefs.c:1183
 msgid "No proxy"
 msgstr "无代理"
 
-#: src/gtkprefs.c:1197
+#: src/gtkprefs.c:1245
 msgid "_User:"
 msgstr "用户(_U):"
 
-#: src/gtkprefs.c:1253
-msgid "Opera"
-msgstr "Opera"
-
-#: src/gtkprefs.c:1254
-msgid "Netscape"
-msgstr "Netscape"
-
-#: src/gtkprefs.c:1255
-msgid "Mozilla"
-msgstr "Mozilla"
-
-#: src/gtkprefs.c:1256
-msgid "Konqueror"
-msgstr "Konqueror"
-
-#: src/gtkprefs.c:1257
-msgid "Galeon"
-msgstr "Galeon"
-
-#: src/gtkprefs.c:1258
+#: src/gtkprefs.c:1301
+msgid "Epiphany"
+msgstr "Epiphany"
+
+#: src/gtkprefs.c:1302
 msgid "Firebird"
 msgstr "Firebird"
 
-#: src/gtkprefs.c:1259
+#: src/gtkprefs.c:1303
 msgid "Firefox"
 msgstr "Firefox"
 
-#: src/gtkprefs.c:1260
+#: src/gtkprefs.c:1304
+msgid "Galeon"
+msgstr "Galeon"
+
+#: src/gtkprefs.c:1305
 msgid "Gnome Default"
 msgstr "GNOME 默认"
 
-#: src/gtkprefs.c:1269
+#: src/gtkprefs.c:1306
+msgid "Konqueror"
+msgstr "Konqueror"
+
+#: src/gtkprefs.c:1307
+msgid "Mozilla"
+msgstr "Mozilla"
+
+#: src/gtkprefs.c:1308
+msgid "Netscape"
+msgstr "Netscape"
+
+#: src/gtkprefs.c:1309
+msgid "Opera"
+msgstr "Opera"
+
+#: src/gtkprefs.c:1318
 msgid "Manual"
 msgstr "手动"
 
-#: src/gtkprefs.c:1320
+#: src/gtkprefs.c:1369
 msgid "Browser Selection"
 msgstr "浏览器选择"
 
-#: src/gtkprefs.c:1324
+#: src/gtkprefs.c:1373
 msgid "_Browser:"
 msgstr "浏览器(_B):"
 
-#: src/gtkprefs.c:1331
+#: src/gtkprefs.c:1380
 msgid "_Open link in:"
 msgstr "打开链接的方式(_O):"
 
-#: src/gtkprefs.c:1333
+#: src/gtkprefs.c:1382
 msgid "Browser default"
 msgstr "浏览器默认"
 
-#: src/gtkprefs.c:1334
+#: src/gtkprefs.c:1383
 msgid "Existing window"
 msgstr "现有窗口"
 
-#: src/gtkprefs.c:1336
+#: src/gtkprefs.c:1385
 msgid "New tab"
 msgstr "新建标签"
 
-#: src/gtkprefs.c:1350
+#: src/gtkprefs.c:1399
 #, c-format
 msgid ""
 "_Manual:\n"
@@ -3898,83 +3919,83 @@
 "手动(_M):\n"
 "(%s 代表 URL)"
 
-#: src/gtkprefs.c:1387
+#: src/gtkprefs.c:1436
 msgid "Message Logs"
 msgstr "消息日志"
 
-#: src/gtkprefs.c:1390
+#: src/gtkprefs.c:1439
 msgid "Log _Format:"
 msgstr "日志格式(_F):"
 
-#: src/gtkprefs.c:1393
+#: src/gtkprefs.c:1442
 msgid "_Log all instant messages"
 msgstr "记录所有即时消息(_L)"
 
-#: src/gtkprefs.c:1395
+#: src/gtkprefs.c:1444
 msgid "Log all c_hats"
 msgstr "记录所有聊天(_H)"
 
-#: src/gtkprefs.c:1398
+#: src/gtkprefs.c:1447
 msgid "System Logs"
 msgstr "系统日志"
 
-#: src/gtkprefs.c:1400
+#: src/gtkprefs.c:1449
 msgid "_Enable system log"
 msgstr "启用系统日志(_E)"
 
-#: src/gtkprefs.c:1403
+#: src/gtkprefs.c:1452
 msgid "Log when buddies _sign on/sign off"
 msgstr "记录好友的登入/登出(_S)"
 
-#: src/gtkprefs.c:1409
+#: src/gtkprefs.c:1458
 msgid "Log when buddies become _idle/un-idle"
 msgstr "记录好友的瞌睡/睡醒(_I)"
 
-#: src/gtkprefs.c:1415
+#: src/gtkprefs.c:1464
 msgid "Log when buddies go away/come _back"
 msgstr "记录好友的离开/回来(_B)"
 
-#: src/gtkprefs.c:1421
+#: src/gtkprefs.c:1470
 msgid "Log your _own signons/idleness/awayness"
 msgstr "记录您自己的登入/瞌睡/离开(_O)"
 
-#: src/gtkprefs.c:1559
+#: src/gtkprefs.c:1596
 msgid "Sound Selection"
 msgstr "声音选择"
 
-#: src/gtkprefs.c:1634
+#: src/gtkprefs.c:1647
 msgid "Sound Options"
 msgstr "声音选项"
 
-#: src/gtkprefs.c:1635
+#: src/gtkprefs.c:1648
 msgid "Sounds when conversation has _focus"
 msgstr "对话获得焦点后发声(_F)"
 
-#: src/gtkprefs.c:1637
+#: src/gtkprefs.c:1650
 msgid "_Sounds while away"
 msgstr "离开时发声(_S)"
 
-#: src/gtkprefs.c:1641
+#: src/gtkprefs.c:1654
 msgid "Sound Method"
 msgstr "声音方式"
 
-#: src/gtkprefs.c:1642
+#: src/gtkprefs.c:1655
 msgid "_Method:"
 msgstr "方式(_M):"
 
-#: src/gtkprefs.c:1644
+#: src/gtkprefs.c:1657
 msgid "Console beep"
 msgstr "控制台响铃"
 
-#: src/gtkprefs.c:1646
+#: src/gtkprefs.c:1659
 msgid "Automatic"
 msgstr "自动"
 
-#: src/gtkprefs.c:1653
+#: src/gtkprefs.c:1666
 msgid "Command"
 msgstr "命令"
 
-#: src/gtkprefs.c:1661
+#: src/gtkprefs.c:1674
 #, c-format
 msgid ""
 "Sound c_ommand:\n"
@@ -3983,86 +4004,86 @@
 "声音命令(_O):\n"
 "(%s 代表文件名)"
 
-#: src/gtkprefs.c:1688
+#: src/gtkprefs.c:1701
 msgid "Sound Events"
 msgstr "声音事件"
 
-#: src/gtkprefs.c:1739
+#: src/gtkprefs.c:1752
 msgid "Play"
 msgstr "播放"
 
-#: src/gtkprefs.c:1746
+#: src/gtkprefs.c:1759
 msgid "Event"
 msgstr "事件"
 
-#: src/gtkprefs.c:1765
+#: src/gtkprefs.c:1778
 msgid "Test"
 msgstr "测试"
 
-#: src/gtkprefs.c:1769
+#: src/gtkprefs.c:1782
 msgid "Reset"
 msgstr "重置"
 
-#: src/gtkprefs.c:1773
+#: src/gtkprefs.c:1786
 msgid "Choose..."
 msgstr "选择..."
 
-#: src/gtkprefs.c:1797
+#: src/gtkprefs.c:1810
 msgid "_Queue new messages when away"
 msgstr "离开时把新消息存入队列(_Q)"
 
-#: src/gtkprefs.c:1800
+#: src/gtkprefs.c:1813
 msgid "Auto-response"
 msgstr "自动回复"
 
-#: src/gtkprefs.c:1801
+#: src/gtkprefs.c:1814
 msgid "_Send auto-response"
 msgstr "发送自动回复(_S)"
 
-#: src/gtkprefs.c:1803
+#: src/gtkprefs.c:1816
 msgid "_Only send auto-response when idle"
 msgstr "仅在打瞌睡时发送自动回复(_O)"
 
-#: src/gtkprefs.c:1806 src/protocols/msn/msn.c:1156
-#: src/protocols/msn/state.c:32 src/protocols/novell/novell.c:2724
-#: src/protocols/oscar/oscar.c:3994 src/protocols/yahoo/yahoo.c:2488
-#: src/protocols/yahoo/yahoo_profile.c:653
+#: src/gtkprefs.c:1819 src/protocols/msn/msn.c:1179
+#: src/protocols/msn/state.c:32 src/protocols/novell/novell.c:2730
+#: src/protocols/oscar/oscar.c:4010 src/protocols/yahoo/yahoo.c:2511
+#: src/protocols/yahoo/yahoo_profile.c:664
 msgid "Idle"
 msgstr "瞌睡"
 
-#: src/gtkprefs.c:1807
+#: src/gtkprefs.c:1820
 msgid "Idle _time reporting:"
 msgstr "瞌睡时间报告(_T):"
 
-#: src/gtkprefs.c:1810
+#: src/gtkprefs.c:1823
 msgid "Gaim usage"
 msgstr "Gaim 使用"
 
-#: src/gtkprefs.c:1813
+#: src/gtkprefs.c:1826
 msgid "X usage"
 msgstr "X 使用"
 
-#: src/gtkprefs.c:1815
+#: src/gtkprefs.c:1828
 msgid "Windows usage"
 msgstr "窗口使用"
 
-#: src/gtkprefs.c:1823
+#: src/gtkprefs.c:1836
 msgid "Auto-away"
 msgstr "自动离开"
 
-#: src/gtkprefs.c:1824
+#: src/gtkprefs.c:1837
 msgid "Set away _when idle"
 msgstr "瞌睡后即设置离开(_W)"
 
-#: src/gtkprefs.c:1828
+#: src/gtkprefs.c:1841
 msgid "_Minutes before setting away:"
 msgstr "设置离开前等几分钟(_M):"
 
-#: src/gtkprefs.c:1836
+#: src/gtkprefs.c:1849
 msgid "Away m_essage:"
 msgstr "离开消息(_E):"
 
-#: src/gtkprefs.c:1917
+#: src/gtkprefs.c:1930
 #, c-format
 msgid ""
 "<span size=\"larger\">%s %s</span>\n"
@@ -4077,7 +4098,7 @@
 "<span weight=\"bold\">网站:</span>\t\t%s\n"
 "<span weight=\"bold\">文件名:</span>\t%s"
 
-#: src/gtkprefs.c:1922
+#: src/gtkprefs.c:1935
 #, c-format
 msgid ""
 "<span size=\"larger\">%s %s</span>\n"
@@ -4092,64 +4113,64 @@
 "<span weight=\"bold\">URL:</span>  %s\n"
 "<span weight=\"bold\">文件名:</span>  %s"
 
-#: src/gtkprefs.c:2155
+#: src/gtkprefs.c:2168
 msgid "Load"
 msgstr "装入"
 
-#: src/gtkprefs.c:2169
+#: src/gtkprefs.c:2182
 msgid "Summary"
 msgstr "概览"
 
-#: src/gtkprefs.c:2217
+#: src/gtkprefs.c:2230
 msgid "Details"
 msgstr "细节"
 
-#: src/gtkprefs.c:2362
+#: src/gtkprefs.c:2375
 msgid "_Edit"
 msgstr "编辑(_E)"
 
-#: src/gtkprefs.c:2398
+#: src/gtkprefs.c:2411
 msgid "Interface"
 msgstr "界面"
 
-#: src/gtkprefs.c:2401
+#: src/gtkprefs.c:2414
 msgid "Message Text"
 msgstr "消息文本"
 
-#: src/gtkprefs.c:2402
+#: src/gtkprefs.c:2415
 msgid "Shortcuts"
 msgstr "快捷键"
 
-#: src/gtkprefs.c:2403
+#: src/gtkprefs.c:2416
 msgid "Smiley Themes"
 msgstr "笑脸主题"
 
-#: src/gtkprefs.c:2404
+#: src/gtkprefs.c:2417
 msgid "Sounds"
 msgstr "声音"
 
-#: src/gtkprefs.c:2405
+#: src/gtkprefs.c:2418
 msgid "Network"
 msgstr "网络"
 
 #. We use the registered default browser in windows
-#: src/gtkprefs.c:2408
+#: src/gtkprefs.c:2421
 msgid "Browser"
 msgstr "浏览器"
 
-#: src/gtkprefs.c:2410
+#: src/gtkprefs.c:2423
 msgid "Logging"
 msgstr "日志"
 
-#: src/gtkprefs.c:2411
+#: src/gtkprefs.c:2424
 msgid "Away / Idle"
 msgstr "离开/瞌睡"
 
-#: src/gtkprefs.c:2412
+#: src/gtkprefs.c:2425
 msgid "Away Messages"
 msgstr "离开消息"
 
-#: src/gtkprefs.c:2415
+#: src/gtkprefs.c:2428
 msgid "Plugins"
 msgstr "插件"
 
@@ -4173,7 +4194,7 @@
 msgid "Block only the users below"
 msgstr "只屏蔽以下用户"
 
-#: src/gtkprivacy.c:385 src/protocols/jabber/jabber.c:1448
+#: src/gtkprivacy.c:385 src/protocols/jabber/jabber.c:1449
 msgid "Privacy"
 msgstr "隐私"
 
@@ -4237,27 +4258,43 @@
 #. *
 #. * A wrapper for gaim_request_action() that uses Yes and No buttons.
 #.
-#: src/gtkrequest.c:233 src/protocols/gg/gg.c:867
-#: src/protocols/novell/novell.c:1844 src/protocols/silc/buddy.c:307
-#: src/protocols/silc/pk.c:116 src/request.h:1233
+#: src/gtkrequest.c:240 src/protocols/gg/gg.c:949
+#: src/protocols/novell/novell.c:1845 src/protocols/silc/buddy.c:307
+#: src/protocols/silc/pk.c:116 src/request.h:1234
 msgid "Yes"
 msgstr "是"
 
-#: src/gtkrequest.c:234 src/protocols/gg/gg.c:867
-#: src/protocols/novell/novell.c:1845 src/protocols/silc/buddy.c:308
-#: src/protocols/silc/pk.c:117 src/request.h:1233
+#: src/gtkrequest.c:241 src/protocols/gg/gg.c:949
+#: src/protocols/novell/novell.c:1846 src/protocols/silc/buddy.c:308
+#: src/protocols/silc/pk.c:117 src/request.h:1234
 msgid "No"
 msgstr "否"
 
-#: src/gtkrequest.c:237
+#: src/gtkrequest.c:244
 msgid "Apply"
 msgstr "应用"
 
-#: src/gtkrequest.c:238 src/protocols/msn/msn.c:316
-#: src/protocols/silc/util.c:311
+#: src/gtkrequest.c:245 src/protocols/msn/msn.c:314
+#: src/protocols/silc/util.c:332
 msgid "Close"
 msgstr "关闭"
 
+#: src/gtkrequest.c:1391
+msgid "That file already exists"
+msgstr "该文件不存在"
+
+#: src/gtkrequest.c:1392
+msgid "Would you like to overwrite it?"
+msgstr "您是否想要覆盖?"
+
+#: src/gtkrequest.c:1430 src/gtkrequest.c:1451
+msgid "Save File..."
+msgstr "保存文件..."
+
+#: src/gtkrequest.c:1431 src/gtkrequest.c:1452
+msgid "Open File..."
+msgstr "打开文件..."
+
 #: src/gtkroomlist.c:330
 msgid "Room List"
 msgstr "房间列表"
@@ -4325,23 +4362,15 @@
 "launched: %s"
 msgstr "无法播放声音,原因是配置无法调用配置的声音命令: %s"
 
-#: src/gtkutils.c:149
-msgid "Can't save icon file to disk."
-msgstr "无法保存 0 字节的图标文件。"
-
-#: src/gtkutils.c:184
-msgid "Save Icon"
-msgstr "保存图标"
-
 #: src/log.c:106
 msgid "<b><font color=\"red\">The logger has no read function</font></b>"
 msgstr "<b><font color\"=red\">登录程序没有读取功能</font></b>"
 
-#: src/log.c:486
+#: src/log.c:489
 msgid "XML"
 msgstr "XML"
 
-#: src/log.c:571
+#: src/log.c:574
 #, c-format
 msgid ""
 "<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
@@ -4350,7 +4379,7 @@
 "<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;自动回复&gt;:"
 "</b></font> %s<br/>\n"
 
-#: src/log.c:573
+#: src/log.c:576
 #, c-format
 msgid ""
 "<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
@@ -4359,25 +4388,25 @@
 "<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;自动回复&gt;:"
 "</b></font> %s<br/>\n"
 
-#: src/log.c:624 src/log.c:811
+#: src/log.c:627 src/log.c:814
 msgid "<font color=\"red\"><b>Unable to find log path!</b></font>"
 msgstr "<font color=\"red\"><b>找不到日志路径!</b></font>"
 
-#: src/log.c:634 src/log.c:823
+#: src/log.c:637 src/log.c:826
 #, c-format
 msgid "<font color=\"red\"><b>Could not read file: %s</b></font>"
 msgstr "<font color=\"red\"><b>无法读取文件: %s</b></font>"
 
-#: src/log.c:671
+#: src/log.c:674
 msgid "HTML"
 msgstr "HTML"
 
-#: src/log.c:756
+#: src/log.c:759
 #, c-format
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr "(%s) %s <自动回复>: %s\n"
 
-#: src/log.c:856
+#: src/log.c:859
 msgid "Plain text"
 msgstr "纯文本"
 
@@ -4466,12 +4495,12 @@
 msgstr "烦死我了"
 
 #: src/protocols/gg/gg.c:49 src/protocols/jabber/jutil.c:44
-#: src/protocols/msn/msn.c:465 src/protocols/msn/state.c:29
+#: src/protocols/msn/msn.c:462 src/protocols/msn/state.c:29
 #: src/protocols/msn/state.c:30 src/protocols/msn/state.c:37
-#: src/protocols/msn/state.c:38 src/protocols/novell/novell.c:2715
-#: src/protocols/novell/novell.c:2834 src/protocols/novell/novell.c:2885
-#: src/protocols/oscar/oscar.c:611 src/protocols/yahoo/yahoo.c:2844
-#: src/protocols/yahoo/yahoo.c:2959
+#: src/protocols/msn/state.c:38 src/protocols/novell/novell.c:2721
+#: src/protocols/novell/novell.c:2840 src/protocols/novell/novell.c:2891
+#: src/protocols/oscar/oscar.c:616 src/protocols/yahoo/yahoo.c:2851
+#: src/protocols/yahoo/yahoo.c:2967
 msgid "Available"
 msgstr "可用"
 
@@ -4483,12 +4512,12 @@
 msgid "Away for friends only"
 msgstr "只对好友离开"
 
-#: src/protocols/gg/gg.c:53 src/protocols/jabber/jabber.c:963
-#: src/protocols/jabber/presence.c:126 src/protocols/oscar/oscar.c:532
-#: src/protocols/oscar/oscar.c:5378 src/protocols/oscar/oscar.c:5456
-#: src/protocols/oscar/oscar.c:5480 src/protocols/oscar/oscar.c:6667
-#: src/protocols/oscar/oscar.c:6672 src/protocols/yahoo/yahoo.c:2486
-#: src/protocols/yahoo/yahoo.c:2864 src/protocols/yahoo/yahoo.c:2969
+#: src/protocols/gg/gg.c:53 src/protocols/jabber/jabber.c:964
+#: src/protocols/jabber/presence.c:126 src/protocols/oscar/oscar.c:536
+#: src/protocols/oscar/oscar.c:5394 src/protocols/oscar/oscar.c:5472
+#: src/protocols/oscar/oscar.c:5496 src/protocols/oscar/oscar.c:6684
+#: src/protocols/oscar/oscar.c:6689 src/protocols/yahoo/yahoo.c:2509
+#: src/protocols/yahoo/yahoo.c:2871 src/protocols/yahoo/yahoo.c:2979
 msgid "Invisible"
 msgstr "隐身"
 
@@ -4504,14 +4533,14 @@
 msgid "Unable to resolve hostname."
 msgstr "无法解析主机名。"
 
-#: src/protocols/gg/gg.c:139 src/protocols/novell/novell.c:1664
+#: src/protocols/gg/gg.c:139 src/protocols/novell/novell.c:1665
 msgid "Unable to connect to server."
 msgstr "无法连接到服务器。"
 
 #: src/protocols/gg/gg.c:142 src/protocols/jabber/auth.c:130
 #: src/protocols/jabber/auth.c:204 src/protocols/jabber/auth.c:354
 #: src/protocols/jabber/auth.c:452 src/protocols/jabber/auth.c:464
-#: src/protocols/jabber/jabber.c:105
+#: src/protocols/jabber/jabber.c:106
 msgid "Invalid response from server."
 msgstr "服务器的响应无效。"
 
@@ -4531,175 +4560,177 @@
 msgid "Unknown Error Code."
 msgstr "未知的错误代码。"
 
-#: src/protocols/gg/gg.c:253
+#: src/protocols/gg/gg.c:242 src/protocols/oscar/oscar.c:3819
+#, c-format
+msgid "<B>UIN:</B> %s<BR><B>Status:</B> %s<HR>%s"
+msgstr "<B>UIN:</B> %s<BR><B>状态:</B> %s<HR>%s"
+
+#. res[0] == username
+#: src/protocols/gg/gg.c:243 src/protocols/gg/gg.c:1011
+#: src/protocols/napster/napster.c:393 src/protocols/oscar/oscar.c:3823
+#: src/protocols/oscar/oscar.c:4039 src/protocols/silc/ops.c:1067
+#: src/protocols/silc/ops.c:1128 src/protocols/toc/toc.c:468
+#: src/protocols/zephyr/zephyr.c:635
+msgid "Buddy Information"
+msgstr "好友信息"
+
+#: src/protocols/gg/gg.c:293
 #, c-format
 msgid "Status: %s"
 msgstr "状态: %s"
 
-#: src/protocols/gg/gg.c:406
+#: src/protocols/gg/gg.c:446
 msgid "Could not connect"
 msgstr "无法连接"
 
-#: src/protocols/gg/gg.c:413
+#: src/protocols/gg/gg.c:453
 msgid "Unable to read socket"
 msgstr "无法读取套接字"
 
 #. we didn't successfully connect. tdt->toc_fd is valid here
-#: src/protocols/gg/gg.c:600 src/protocols/icq/gaim_icq.c:344
+#: src/protocols/gg/gg.c:674 src/protocols/icq/gaim_icq.c:344
 #: src/protocols/napster/napster.c:475 src/protocols/napster/napster.c:506
-#: src/protocols/toc/toc.c:170 src/protocols/yahoo/yahoo.c:2124
-#: src/protocols/yahoo/yahoo.c:2155 src/protocols/yahoo/yahoo.c:2218
+#: src/protocols/toc/toc.c:170 src/protocols/yahoo/yahoo.c:2156
+#: src/protocols/yahoo/yahoo.c:2185 src/protocols/yahoo/yahoo.c:2248
 #: src/protocols/yahoo/yahoo_filexfer.c:68
 #: src/protocols/yahoo/yahoo_filexfer.c:109
 msgid "Unable to connect."
 msgstr "无法连接。"
 
-#: src/protocols/gg/gg.c:616
+#: src/protocols/gg/gg.c:690
 msgid "Reading data"
 msgstr "正在读取数据"
 
-#: src/protocols/gg/gg.c:619
+#: src/protocols/gg/gg.c:693
 msgid "Balancer handshake"
 msgstr "平衡器握手"
 
-#: src/protocols/gg/gg.c:622
+#: src/protocols/gg/gg.c:696
 msgid "Reading server key"
 msgstr "正在读取服务器密钥"
 
-#: src/protocols/gg/gg.c:625
+#: src/protocols/gg/gg.c:699
 msgid "Exchanging key hash"
 msgstr "正在交换密钥"
 
-#: src/protocols/gg/gg.c:635
+#: src/protocols/gg/gg.c:709
 msgid "Critical error in GG library\n"
 msgstr "GG 库的关键错误\n"
 
-#: src/protocols/gg/gg.c:653 src/protocols/gg/gg.c:744
+#: src/protocols/gg/gg.c:727 src/protocols/gg/gg.c:818
 #: src/protocols/toc/toc.c:146
 #, c-format
 msgid "Connect to %s failed"
 msgstr "连接到 %s 失败"
 
-#: src/protocols/gg/gg.c:701
+#: src/protocols/gg/gg.c:775
 msgid "Unable to ping server"
 msgstr "无法连通服务器"
 
-#: src/protocols/gg/gg.c:713
+#: src/protocols/gg/gg.c:787
 msgid "Send as message"
 msgstr "发送为消息"
 
-#: src/protocols/gg/gg.c:718
+#: src/protocols/gg/gg.c:792
 msgid "Looking up GG server"
 msgstr "正在查阅 GG 服务器"
 
-#: src/protocols/gg/gg.c:721
+#: src/protocols/gg/gg.c:795
 msgid "Invalid Gadu-Gadu UIN specified"
 msgstr "指定的 Gadu-Gadu UIN 无效"
 
-#: src/protocols/gg/gg.c:768
+#: src/protocols/gg/gg.c:842
 msgid "You are trying to send a message to an invalid Gadu-Gadu UIN."
 msgstr "您试图向无效的 Gadu-Gadu UIN 发送消息。"
 
-#: src/protocols/gg/gg.c:835
+#: src/protocols/gg/gg.c:917
 msgid "Couldn't get search results"
 msgstr "无法获取搜索结果"
 
-#: src/protocols/gg/gg.c:840
+#: src/protocols/gg/gg.c:922
 msgid "Gadu-Gadu Search Engine"
 msgstr "Gadu-Gadu 搜索引擎"
 
-#: src/protocols/gg/gg.c:866
+#: src/protocols/gg/gg.c:948
 msgid "Active"
 msgstr "活跃"
 
-#: src/protocols/gg/gg.c:871 src/protocols/oscar/oscar.c:4829
+#: src/protocols/gg/gg.c:953 src/protocols/oscar/oscar.c:4845
 msgid "UIN"
 msgstr "UIN"
 
 #. First Name
-#: src/protocols/gg/gg.c:875 src/protocols/jabber/jabber.c:612
-#: src/protocols/oscar/oscar.c:4840 src/protocols/silc/ops.c:774
+#: src/protocols/gg/gg.c:957 src/protocols/jabber/jabber.c:613
+#: src/protocols/oscar/oscar.c:4856 src/protocols/silc/ops.c:790
 #: src/protocols/trepia/trepia.c:267
 msgid "First Name"
 msgstr "名"
 
 #. Last Name
-#: src/protocols/gg/gg.c:880 src/protocols/jabber/jabber.c:617
-#: src/protocols/oscar/oscar.c:4841 src/protocols/trepia/trepia.c:274
+#: src/protocols/gg/gg.c:962 src/protocols/jabber/jabber.c:618
+#: src/protocols/oscar/oscar.c:4857 src/protocols/trepia/trepia.c:274
 msgid "Last Name"
 msgstr "姓"
 
-#: src/protocols/gg/gg.c:884 src/protocols/gg/gg.c:1623
-#: src/protocols/irc/msgs.c:183 src/protocols/oscar/oscar.c:4830
+#: src/protocols/gg/gg.c:966 src/protocols/gg/gg.c:1707
+#: src/protocols/irc/msgs.c:183 src/protocols/oscar/oscar.c:4846
+#: src/protocols/silc/ops.c:1184
 msgid "Nick"
 msgstr "昵称"
 
-#: src/protocols/gg/gg.c:891 src/protocols/gg/gg.c:894
+#: src/protocols/gg/gg.c:973 src/protocols/gg/gg.c:976
 msgid "Birth Year"
 msgstr "出生年份"
 
-#: src/protocols/gg/gg.c:900 src/protocols/gg/gg.c:902
-#: src/protocols/gg/gg.c:904
+#: src/protocols/gg/gg.c:982 src/protocols/gg/gg.c:984
+#: src/protocols/gg/gg.c:986
 msgid "Sex"
 msgstr "性别"
 
 #. City
-#: src/protocols/gg/gg.c:908 src/protocols/jabber/jabber.c:627
-#: src/protocols/oscar/oscar.c:4884 src/protocols/oscar/oscar.c:4892
+#: src/protocols/gg/gg.c:990 src/protocols/jabber/jabber.c:628
+#: src/protocols/oscar/oscar.c:4900 src/protocols/oscar/oscar.c:4908
 #: src/protocols/trepia/trepia.c:331 src/protocols/trepia/trepia.c:410
 msgid "City"
 msgstr "城市"
 
-#. res[0] == username
-#. show it to the user
-#: src/protocols/gg/gg.c:929 src/protocols/msn/msn.c:1225
-#: src/protocols/msn/msn.c:1533 src/protocols/msn/msn.c:1549
-#: src/protocols/napster/napster.c:393 src/protocols/oscar/oscar.c:3807
-#: src/protocols/oscar/oscar.c:4023 src/protocols/toc/toc.c:468
-#: src/protocols/yahoo/yahoo_profile.c:748
-#: src/protocols/yahoo/yahoo_profile.c:785
-#: src/protocols/yahoo/yahoo_profile.c:837
-#: src/protocols/yahoo/yahoo_profile.c:1132 src/protocols/zephyr/zephyr.c:610
-msgid "Buddy Information"
-msgstr "好友信息"
-
-#: src/protocols/gg/gg.c:951
+#: src/protocols/gg/gg.c:1033
 msgid "There is no Buddy List stored on the Gadu-Gadu server."
 msgstr "Gadu-Gadu 服务器没有存储好友列表。"
 
-#: src/protocols/gg/gg.c:959
+#: src/protocols/gg/gg.c:1041
 msgid "Couldn't Import Buddy List from Server"
 msgstr "无法从服务器导入好友列表"
 
-#: src/protocols/gg/gg.c:1021
+#: src/protocols/gg/gg.c:1103
 msgid "Buddy List successfully transferred to Gadu-Gadu server"
 msgstr "好友列表已经成功传送到 Gadu-Gadu 服务器了"
 
-#: src/protocols/gg/gg.c:1029
+#: src/protocols/gg/gg.c:1111
 msgid "Couldn't transfer Buddy List to Gadu-Gadu server"
 msgstr "无法将好友列表传送到 Gadu-Gadu 服务器"
 
-#: src/protocols/gg/gg.c:1037
+#: src/protocols/gg/gg.c:1119
 msgid "Buddy List successfully deleted from Gadu-Gadu server"
 msgstr "好友列表已经成功从 Gadu-Gadu 服务器删除"
 
-#: src/protocols/gg/gg.c:1045
+#: src/protocols/gg/gg.c:1127
 msgid "Couldn't delete Buddy List from Gadu-Gadu server"
 msgstr "无法从 Gadu-Gadu 服务器删除好友列表"
 
-#: src/protocols/gg/gg.c:1054
+#: src/protocols/gg/gg.c:1136
 msgid "Password changed successfully"
 msgstr "密码成功更改"
 
-#: src/protocols/gg/gg.c:1061
+#: src/protocols/gg/gg.c:1143
 msgid "Password couldn't be changed"
 msgstr "密码无法更改"
 
-#: src/protocols/gg/gg.c:1180
+#: src/protocols/gg/gg.c:1262
 msgid "Error communicating with Gadu-Gadu server"
 msgstr "与 Gadu-Gadu 服务器通讯出错"
 
-#: src/protocols/gg/gg.c:1181
+#: src/protocols/gg/gg.c:1263
 msgid ""
 "Gaim was unable to complete your request due to a problem communicating with "
 "the Gadu-Gadu HTTP server.  Please try again later."
@@ -4707,77 +4738,77 @@
 "Gaim 无法完成您的请求,原因是与 Gadu-Gadu HTTP 服务器通讯出现问题。请稍后再试"
 "一次。"
 
-#: src/protocols/gg/gg.c:1210
+#: src/protocols/gg/gg.c:1292
 msgid "Unable to import Gadu-Gadu buddy list"
 msgstr "无法导入 Gadu-Gadu 好友列表"
 
-#: src/protocols/gg/gg.c:1211
+#: src/protocols/gg/gg.c:1293
 msgid ""
 "Gaim was unable to connect to the Gadu-Gadu buddy list server.  Please try "
 "again later."
 msgstr "Gaim 无法连接到 Gadu-Gadu 好友列表服务器。请稍后再试一次。"
 
-#: src/protocols/gg/gg.c:1284
+#: src/protocols/gg/gg.c:1366
 msgid "Couldn't export buddy list"
 msgstr "无法导出好友列表"
 
-#: src/protocols/gg/gg.c:1285 src/protocols/gg/gg.c:1308
+#: src/protocols/gg/gg.c:1367 src/protocols/gg/gg.c:1390
 msgid ""
 "Gaim was unable to connect to the buddy list server.  Please try again later."
 msgstr "Gaim 无法连接到好友列表服务器。请稍后再试一次。"
 
-#: src/protocols/gg/gg.c:1307
+#: src/protocols/gg/gg.c:1389
 msgid "Unable to delete Gadu-Gadu buddy list"
 msgstr "无法删除 Gadu-Gadu 好友列表"
 
-#: src/protocols/gg/gg.c:1358
+#: src/protocols/gg/gg.c:1440
 msgid "Unable to access directory"
 msgstr "无法访问目录"
 
-#: src/protocols/gg/gg.c:1359
+#: src/protocols/gg/gg.c:1441
 msgid ""
 "Gaim was unable to search the Directory because it was unable to connect to "
 "the directory server.  Please try again later."
 msgstr "Gaim 无法搜索目录,原因是无法与目录服务器连接。请稍后再试一次。"
 
-#: src/protocols/gg/gg.c:1393
+#: src/protocols/gg/gg.c:1475
 msgid "Unable to change Gadu-Gadu password"
 msgstr "无法更改 Gadu-Gadu 密码"
 
-#: src/protocols/gg/gg.c:1394
+#: src/protocols/gg/gg.c:1476
 msgid ""
 "Gaim was unable to change your password due to an error connecting to the "
 "Gadu-Gadu server.  Please try again later."
 msgstr ""
 "Gaim 无法更改您的密码,原因是与 Gadu-Gadu 服务器连接出错。请稍后再试一次。"
 
-#: src/protocols/gg/gg.c:1410
+#: src/protocols/gg/gg.c:1492
 msgid "Directory Search"
 msgstr "目录搜索"
 
 #. if (js->protocol_options & CHANGE_PASSWORD) {
-#: src/protocols/gg/gg.c:1415 src/protocols/jabber/jabber.c:1061
+#: src/protocols/gg/gg.c:1497 src/protocols/jabber/jabber.c:1062
 #: src/protocols/toc/toc.c:1550
 msgid "Change Password"
 msgstr "更改密码"
 
-#: src/protocols/gg/gg.c:1419
+#: src/protocols/gg/gg.c:1501
 msgid "Import Buddy List from Server"
 msgstr "从服务器导入好友列表"
 
-#: src/protocols/gg/gg.c:1423
+#: src/protocols/gg/gg.c:1505
 msgid "Export Buddy List to Server"
 msgstr "将好友列表导出到服务器"
 
-#: src/protocols/gg/gg.c:1427
+#: src/protocols/gg/gg.c:1509
 msgid "Delete Buddy List from Server"
 msgstr "从服务器删除好友列表"
 
-#: src/protocols/gg/gg.c:1460
+#: src/protocols/gg/gg.c:1542
 msgid "Unable to access user profile."
 msgstr "无法访问用户配置文件。"
 
-#: src/protocols/gg/gg.c:1461
+#: src/protocols/gg/gg.c:1543
 msgid ""
 "Gaim was unable to access this user's profile due to an error connecting to "
 "the directory server.  Please try again later."
@@ -4795,7 +4826,7 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/gg/gg.c:1602 src/protocols/gg/gg.c:1604
+#: src/protocols/gg/gg.c:1686 src/protocols/gg/gg.c:1688
 msgid "Gadu-Gadu Protocol Plugin"
 msgstr "Gadu-Gadu 协议插件"
 
@@ -4809,14 +4840,14 @@
 msgstr "用户 %s (%s%s%s%s%s) 需要您的同意。"
 
 #: src/protocols/icq/gaim_icq.c:297 src/protocols/jabber/presence.c:232
-#: src/protocols/msn/userlist.c:100 src/protocols/oscar/oscar.c:3538
-#: src/protocols/oscar/oscar.c:6100
+#: src/protocols/msn/userlist.c:100 src/protocols/oscar/oscar.c:3554
+#: src/protocols/oscar/oscar.c:6117
 msgid "Authorize"
 msgstr "同意"
 
 #: src/protocols/icq/gaim_icq.c:297 src/protocols/jabber/presence.c:233
-#: src/protocols/msn/userlist.c:101 src/protocols/oscar/oscar.c:3540
-#: src/protocols/oscar/oscar.c:6101
+#: src/protocols/msn/userlist.c:101 src/protocols/oscar/oscar.c:3556
+#: src/protocols/oscar/oscar.c:6118
 msgid "Deny"
 msgstr "拒绝"
 
@@ -4836,17 +4867,19 @@
 msgid "Gaim User"
 msgstr "Gaim 用户"
 
-#: src/protocols/irc/cmds.c:43
+#: src/protocols/irc/cmds.c:43 src/protocols/silc/silc.c:1286
 #, c-format
 msgid "Unknown command: %s"
 msgstr "未知的错误代码: %s"
 
-#: src/protocols/irc/cmds.c:444 src/protocols/jabber/chat.c:544
+#: src/protocols/irc/cmds.c:448 src/protocols/jabber/chat.c:544
+#: src/protocols/silc/silc.c:995
 #, c-format
 msgid "current topic is: %s"
 msgstr "目前的话题为: %s"
 
-#: src/protocols/irc/cmds.c:447 src/protocols/jabber/chat.c:546
+#: src/protocols/irc/cmds.c:451 src/protocols/jabber/chat.c:546
+#: src/protocols/silc/silc.c:998
 msgid "No topic is set"
 msgstr "未设定话题"
 
@@ -4878,54 +4911,51 @@
 msgid "MOTD for %s"
 msgstr "%s 的 MOTD"
 
-#: src/protocols/irc/irc.c:141
+#: src/protocols/irc/irc.c:93 src/protocols/irc/irc.c:373
+msgid "Server has disconnected"
+msgstr "服务器已断开连接"
+
+#: src/protocols/irc/irc.c:147
 msgid "View MOTD"
 msgstr "查看 MOTD"
 
-#. FIXME: remove this when the ui does it for us.
-#: src/protocols/irc/irc.c:168 src/protocols/jabber/buddy.c:928
-#: src/protocols/msn/msn.c:543 src/protocols/oscar/oscar.c:448
-#: src/protocols/oscar/oscar.c:6771 src/protocols/yahoo/yahoo.c:2691
-msgid "Send File"
-msgstr "发送文件"
-
-#: src/protocols/irc/irc.c:182 src/protocols/silc/chat.c:32
+#: src/protocols/irc/irc.c:169 src/protocols/silc/chat.c:32
 msgid "_Channel:"
 msgstr "频道(_C):"
 
-#: src/protocols/irc/irc.c:187 src/protocols/jabber/chat.c:59
+#: src/protocols/irc/irc.c:174 src/protocols/jabber/chat.c:59
 msgid "_Password:"
 msgstr "密码(_P):"
 
-#: src/protocols/irc/irc.c:207
+#: src/protocols/irc/irc.c:194
 msgid "IRC nicks may not contain whitespace"
 msgstr "IRC 昵称不能包含空格"
 
-#: src/protocols/irc/irc.c:226 src/protocols/toc/toc.c:198
+#: src/protocols/irc/irc.c:213 src/protocols/toc/toc.c:198
 #, c-format
 msgid "Signon: %s"
 msgstr "登录名: %s"
 
-#: src/protocols/irc/irc.c:235
+#: src/protocols/irc/irc.c:222
 msgid "Couldn't create socket"
 msgstr "无法创建套接字"
 
-#: src/protocols/irc/irc.c:250 src/protocols/jabber/jabber.c:296
-#: src/protocols/oscar/oscar.c:1523 src/protocols/oscar/oscar.c:1587
+#: src/protocols/irc/irc.c:237 src/protocols/jabber/jabber.c:297
+#: src/protocols/oscar/oscar.c:1529 src/protocols/oscar/oscar.c:1593
 msgid "Couldn't connect to host"
 msgstr "无法连接到主机"
 
-#: src/protocols/irc/irc.c:387 src/protocols/trepia/trepia.c:926
+#: src/protocols/irc/irc.c:370 src/protocols/trepia/trepia.c:926
 msgid "Read error"
 msgstr "读取错误"
 
-#: src/protocols/irc/irc.c:538 src/protocols/silc/chat.c:1343
-#: src/protocols/yahoo/yahoochat.c:1341
+#: src/protocols/irc/irc.c:521 src/protocols/silc/chat.c:1363
+#: src/protocols/yahoo/yahoochat.c:1380
 msgid "Users"
 msgstr "用户"
 
-#: src/protocols/irc/irc.c:541 src/protocols/silc/chat.c:1346
-#: src/protocols/silc/ops.c:1017 src/protocols/yahoo/yahoochat.c:1350
+#: src/protocols/irc/irc.c:524 src/protocols/silc/chat.c:1366
+#: src/protocols/silc/ops.c:1146 src/protocols/yahoo/yahoochat.c:1389
 msgid "Topic"
 msgstr "话题"
 
@@ -4938,34 +4968,35 @@
 #. *< id
 #. *< name
 #. *< version
-#: src/protocols/irc/irc.c:643
+#: src/protocols/irc/irc.c:628
 msgid "IRC Protocol Plugin"
 msgstr "IRC 协议插件"
 
 #. *  summary
-#: src/protocols/irc/irc.c:644
+#: src/protocols/irc/irc.c:629
 msgid "The IRC Protocol Plugin that Sucks Less"
 msgstr "错误更少的 IRC 协议插件"
 
-#: src/protocols/irc/irc.c:663 src/protocols/irc/msgs.c:197
-#: src/protocols/jabber/jabber.c:1556 src/protocols/napster/napster.c:642
-#: src/protocols/silc/ops.c:935
+#: src/protocols/irc/irc.c:648 src/protocols/irc/msgs.c:197
+#: src/protocols/jabber/jabber.c:1559 src/protocols/napster/napster.c:644
+#: src/protocols/silc/ops.c:1008 src/protocols/silc/ops.c:1110
 msgid "Server"
 msgstr "服务器"
 
-#: src/protocols/irc/irc.c:666 src/protocols/jabber/jabber.c:1577
-#: src/protocols/msn/msn.c:1729 src/protocols/napster/napster.c:647
-#: src/protocols/silc/silc.c:1363 src/protocols/trepia/trepia.c:1295
+#: src/protocols/irc/irc.c:651 src/protocols/jabber/jabber.c:1580
+#: src/protocols/msn/msn.c:1758 src/protocols/napster/napster.c:649
+#: src/protocols/silc/silc.c:1576 src/protocols/trepia/trepia.c:1297
 msgid "Port"
 msgstr "端口"
 
-#: src/protocols/irc/irc.c:669 src/protocols/zephyr/zephyr.c:1442
+#: src/protocols/irc/irc.c:654 src/protocols/zephyr/zephyr.c:1915
 msgid "Encoding"
 msgstr "编码"
 
-#: src/protocols/irc/irc.c:672 src/protocols/irc/msgs.c:191
-#: src/protocols/jabber/jabber.c:587 src/protocols/silc/buddy.c:1449
-#: src/protocols/silc/ops.c:931
+#: src/protocols/irc/irc.c:657 src/protocols/irc/msgs.c:191
+#: src/protocols/jabber/jabber.c:588 src/protocols/silc/buddy.c:1445
+#: src/protocols/silc/ops.c:955 src/protocols/silc/ops.c:957
+#: src/protocols/silc/ops.c:1104 src/protocols/silc/ops.c:1106
 msgid "Username"
 msgstr "用户名"
 
@@ -4990,12 +5021,12 @@
 msgid " <i>(identified)</i>"
 msgstr " <i>(identified)</i>"
 
-#: src/protocols/irc/msgs.c:192 src/protocols/silc/ops.c:929
-#: src/protocols/yahoo/yahoo_profile.c:1000
+#: src/protocols/irc/msgs.c:192 src/protocols/silc/ops.c:949
+#: src/protocols/silc/ops.c:1098 src/protocols/yahoo/yahoo_profile.c:1005
 msgid "Realname"
 msgstr "真名"
 
-#: src/protocols/irc/msgs.c:202
+#: src/protocols/irc/msgs.c:202 src/protocols/silc/ops.c:1021
 msgid "Currently on"
 msgstr "目前位于"
 
@@ -5017,111 +5048,111 @@
 msgid "Buddy Information for %s"
 msgstr "%s 的好友信息"
 
-#: src/protocols/irc/msgs.c:278
+#: src/protocols/irc/msgs.c:279
 #, c-format
 msgid "%s has changed the topic to: %s"
 msgstr "%s 将话题改为: %s"
 
-#: src/protocols/irc/msgs.c:283
+#: src/protocols/irc/msgs.c:284
 #, c-format
 msgid "The topic for %s is: %s"
 msgstr "%s 的话题为: %s"
 
-#: src/protocols/irc/msgs.c:299
+#: src/protocols/irc/msgs.c:301
 #, c-format
 msgid "Unknown message '%s'"
 msgstr "未知信息“%s”"
 
-#: src/protocols/irc/msgs.c:300
+#: src/protocols/irc/msgs.c:302
 msgid "Unknown message"
 msgstr "未知信息"
 
-#: src/protocols/irc/msgs.c:300
+#: src/protocols/irc/msgs.c:302
 msgid "Gaim has sent a message the IRC server did not understand."
 msgstr "Gaim 发送了 IRC 服务器无法理解的信息。"
 
-#: src/protocols/irc/msgs.c:323
+#: src/protocols/irc/msgs.c:325
 #, c-format
 msgid "Users on %s: %s"
 msgstr "%s 上的用户数: %s"
 
-#: src/protocols/irc/msgs.c:405
+#: src/protocols/irc/msgs.c:407
 msgid "No such channel"
 msgstr "没有这样的频道"
 
 #. does this happen?
-#: src/protocols/irc/msgs.c:416
+#: src/protocols/irc/msgs.c:418
 msgid "no such channel"
 msgstr "没有这样的频道"
 
-#: src/protocols/irc/msgs.c:419
+#: src/protocols/irc/msgs.c:421
 msgid "User is not logged in"
 msgstr "用户未登入"
 
-#: src/protocols/irc/msgs.c:424
+#: src/protocols/irc/msgs.c:426
 msgid "No such nick or channel"
 msgstr "没有这样的昵称或频道"
 
-#: src/protocols/irc/msgs.c:444
+#: src/protocols/irc/msgs.c:446
 msgid "Could not send"
 msgstr "无法发送"
 
-#: src/protocols/irc/msgs.c:500
+#: src/protocols/irc/msgs.c:502
 #, c-format
 msgid "Joining %s requires an invitation."
 msgstr "加入 %s 需要邀请。"
 
-#: src/protocols/irc/msgs.c:501
+#: src/protocols/irc/msgs.c:503
 msgid "Invitation only"
 msgstr "只邀请"
 
-#: src/protocols/irc/msgs.c:604
+#: src/protocols/irc/msgs.c:606
 #, c-format
 msgid "You have been kicked by %s: (%s)"
 msgstr "您被 %s: %s 踢出了"
 
-#: src/protocols/irc/msgs.c:609
+#: src/protocols/irc/msgs.c:611
 #, c-format
 msgid "Kicked by %s (%s)"
 msgstr "被 %s (%s) 踢出"
 
-#: src/protocols/irc/msgs.c:630
+#: src/protocols/irc/msgs.c:632
 #, c-format
 msgid "mode (%s %s) by %s"
 msgstr "由 %3$s 管理(%1$s %2$s)"
 
-#: src/protocols/irc/msgs.c:709
+#: src/protocols/irc/msgs.c:711
 msgid "Could not change nick"
 msgstr "无法更改昵称"
 
-#: src/protocols/irc/msgs.c:710
+#: src/protocols/irc/msgs.c:712
 msgid "Cannot change nick"
 msgstr "无法更改昵称"
 
-#: src/protocols/irc/msgs.c:731
+#: src/protocols/irc/msgs.c:733
 #, c-format
 msgid "You have parted the channel%s%s"
 msgstr "您已经参与了频道%s%s"
 
-#: src/protocols/irc/msgs.c:771
+#: src/protocols/irc/msgs.c:773
 msgid "Error: invalid PONG from server"
 msgstr "错误: 服务器的 PONG 无效"
 
-#: src/protocols/irc/msgs.c:773
+#: src/protocols/irc/msgs.c:775
 #, c-format
 msgid "PING reply -- Lag: %lu seconds"
 msgstr "PING 响应 -- 延后: %lu 秒"
 
-#: src/protocols/irc/msgs.c:848
+#: src/protocols/irc/msgs.c:850
 #, c-format
 msgid "Cannot join %s:"
 msgstr "无法加入 %s:"
 
-#: src/protocols/irc/msgs.c:849 src/protocols/silc/ops.c:878
+#: src/protocols/irc/msgs.c:851 src/protocols/silc/ops.c:894
 msgid "Cannot join channel"
 msgstr "无法加入频道"
 
-#: src/protocols/irc/msgs.c:885
+#: src/protocols/irc/msgs.c:887
 #, c-format
 msgid "Wallops from %s"
 msgstr "来自 %s 的冲击"
@@ -5208,7 +5239,7 @@
 msgid "names [channel]:  List the users currently in a channel."
 msgstr "name [频道]: 列出频道中目前的用户。"
 
-#: src/protocols/irc/parse.c:122 src/protocols/jabber/jabber.c:1406
+#: src/protocols/irc/parse.c:122 src/protocols/jabber/jabber.c:1407
 msgid "nick &lt;new nickname&gt;:  Change your nickname."
 msgstr "nick &lt;新昵称&gt;: 更改您的昵称。"
 
@@ -5282,7 +5313,7 @@
 msgid "whois &lt;nick&gt;:  Get information on a user."
 msgstr "whois &lt;昵称&gt;: 获得用户信息。"
 
-#: src/protocols/irc/parse.c:228 src/protocols/zephyr/zephyr.c:236
+#: src/protocols/irc/parse.c:228 src/protocols/zephyr/zephyr.c:256
 msgid ""
 "(There was an error converting this message.  Check the 'Encoding' option in "
 "the Account Editor)"
@@ -5301,7 +5332,7 @@
 msgid "CTCP PING reply"
 msgstr "CTCP PING 响应"
 
-#: src/protocols/irc/parse.c:485 src/protocols/oscar/oscar.c:1424
+#: src/protocols/irc/parse.c:485 src/protocols/oscar/oscar.c:1430
 #: src/protocols/toc/toc.c:188 src/protocols/toc/toc.c:596
 #: src/protocols/toc/toc.c:612 src/protocols/toc/toc.c:689
 msgid "Disconnected."
@@ -5334,87 +5365,88 @@
 msgid "Invalid challenge from server"
 msgstr "服务器的挑战无效"
 
-#: src/protocols/jabber/buddy.c:247 src/protocols/jabber/buddy.c:604
-#: src/protocols/silc/ops.c:770
+#: src/protocols/jabber/buddy.c:246 src/protocols/jabber/buddy.c:604
+#: src/protocols/silc/ops.c:786
 msgid "Full Name"
 msgstr "全名"
 
-#: src/protocols/jabber/buddy.c:248 src/protocols/jabber/buddy.c:617
-#: src/protocols/silc/ops.c:782
+#: src/protocols/jabber/buddy.c:247 src/protocols/jabber/buddy.c:617
+#: src/protocols/silc/ops.c:798
 msgid "Family Name"
 msgstr "姓"
 
-#: src/protocols/jabber/buddy.c:249 src/protocols/jabber/buddy.c:621
+#: src/protocols/jabber/buddy.c:248 src/protocols/jabber/buddy.c:621
 msgid "Given Name"
 msgstr "名"
 
-#: src/protocols/jabber/buddy.c:250 src/protocols/jabber/buddy.c:635
-#: src/protocols/jabber/jabber.c:607 src/protocols/msn/msn.c:1150
-#: src/protocols/silc/buddy.c:1446 src/protocols/silc/ops.c:786
-#: src/protocols/silc/ops.c:927 src/protocols/yahoo/yahoo_profile.c:995
+#: src/protocols/jabber/buddy.c:249 src/protocols/jabber/buddy.c:635
+#: src/protocols/jabber/jabber.c:608 src/protocols/msn/msn.c:1172
+#: src/protocols/silc/buddy.c:1442 src/protocols/silc/ops.c:802
+#: src/protocols/silc/ops.c:945 src/protocols/silc/ops.c:1094
+#: src/protocols/yahoo/yahoo_profile.c:1000
 msgid "Nickname"
 msgstr "昵称"
 
-#: src/protocols/jabber/buddy.c:251 src/protocols/jabber/jabber.c:647
+#: src/protocols/jabber/buddy.c:250 src/protocols/jabber/jabber.c:648
 msgid "URL"
 msgstr "URL"
 
-#: src/protocols/jabber/buddy.c:252 src/protocols/jabber/buddy.c:663
+#: src/protocols/jabber/buddy.c:251 src/protocols/jabber/buddy.c:663
 msgid "Street Address"
 msgstr "街道地址"
 
-#: src/protocols/jabber/buddy.c:253 src/protocols/jabber/buddy.c:659
+#: src/protocols/jabber/buddy.c:252 src/protocols/jabber/buddy.c:659
 msgid "Extended Address"
 msgstr "额外地址"
 
-#: src/protocols/jabber/buddy.c:254 src/protocols/jabber/buddy.c:667
+#: src/protocols/jabber/buddy.c:253 src/protocols/jabber/buddy.c:667
 msgid "Locality"
 msgstr "地区"
 
-#: src/protocols/jabber/buddy.c:255 src/protocols/jabber/buddy.c:671
+#: src/protocols/jabber/buddy.c:254 src/protocols/jabber/buddy.c:671
 msgid "Region"
 msgstr "区域"
 
-#: src/protocols/jabber/buddy.c:256 src/protocols/jabber/buddy.c:675
-#: src/protocols/jabber/jabber.c:637
+#: src/protocols/jabber/buddy.c:255 src/protocols/jabber/buddy.c:675
+#: src/protocols/jabber/jabber.c:638
 msgid "Postal Code"
 msgstr "邮政编码"
 
 #. Country
-#: src/protocols/jabber/buddy.c:257 src/protocols/jabber/buddy.c:680
+#: src/protocols/jabber/buddy.c:256 src/protocols/jabber/buddy.c:680
 #: src/protocols/trepia/trepia.c:339 src/protocols/trepia/trepia.c:416
 msgid "Country"
 msgstr "国家"
 
-#: src/protocols/jabber/buddy.c:258 src/protocols/jabber/buddy.c:691
+#: src/protocols/jabber/buddy.c:257 src/protocols/jabber/buddy.c:691
 #: src/protocols/jabber/buddy.c:698
 msgid "Telephone"
 msgstr "电话号码"
 
-#: src/protocols/jabber/buddy.c:259 src/protocols/jabber/buddy.c:709
-#: src/protocols/jabber/buddy.c:717 src/protocols/silc/buddy.c:1499
-#: src/protocols/silc/silc.c:633 src/protocols/yahoo/yahoo_profile.c:990
+#: src/protocols/jabber/buddy.c:258 src/protocols/jabber/buddy.c:709
+#: src/protocols/jabber/buddy.c:717 src/protocols/silc/silc.c:637
+#: src/protocols/silc/util.c:508 src/protocols/yahoo/yahoo_profile.c:995
 msgid "Email"
 msgstr "电子邮件"
 
-#: src/protocols/jabber/buddy.c:260 src/protocols/jabber/buddy.c:732
+#: src/protocols/jabber/buddy.c:259 src/protocols/jabber/buddy.c:732
 msgid "Organization Name"
 msgstr "组织名称"
 
-#: src/protocols/jabber/buddy.c:261 src/protocols/jabber/buddy.c:736
+#: src/protocols/jabber/buddy.c:260 src/protocols/jabber/buddy.c:736
 msgid "Organization Unit"
 msgstr "组织单元"
 
-#: src/protocols/jabber/buddy.c:262 src/protocols/jabber/buddy.c:742
+#: src/protocols/jabber/buddy.c:261 src/protocols/jabber/buddy.c:742
 msgid "Title"
 msgstr "标题"
 
-#: src/protocols/jabber/buddy.c:263 src/protocols/jabber/buddy.c:745
+#: src/protocols/jabber/buddy.c:262 src/protocols/jabber/buddy.c:745
 msgid "Role"
 msgstr "职务"
 
-#: src/protocols/jabber/buddy.c:264 src/protocols/jabber/buddy.c:638
-#: src/protocols/oscar/oscar.c:4865
+#: src/protocols/jabber/buddy.c:263 src/protocols/jabber/buddy.c:638
+#: src/protocols/oscar/oscar.c:4881
 msgid "Birthday"
 msgstr "生日"
 
@@ -5433,25 +5465,25 @@
 msgstr "Jabber ID"
 
 #: src/protocols/jabber/buddy.c:563 src/protocols/jabber/buddy.c:570
-#: src/protocols/jabber/buddy.c:581 src/protocols/jabber/jabber.c:937
-#: src/protocols/msn/msn.c:453 src/protocols/novell/novell.c:2737
-#: src/protocols/novell/novell.c:2741 src/protocols/oscar/oscar.c:574
-#: src/protocols/oscar/oscar.c:580 src/protocols/oscar/oscar.c:582
-#: src/protocols/yahoo/yahoo.c:2611
+#: src/protocols/jabber/buddy.c:581 src/protocols/jabber/jabber.c:938
+#: src/protocols/msn/msn.c:450 src/protocols/novell/novell.c:2743
+#: src/protocols/novell/novell.c:2747 src/protocols/oscar/oscar.c:578
+#: src/protocols/oscar/oscar.c:584 src/protocols/oscar/oscar.c:586
+#: src/protocols/yahoo/yahoo.c:2634
 msgid "Status"
 msgstr "状态"
 
-#: src/protocols/jabber/buddy.c:579 src/protocols/jabber/jabber.c:1559
+#: src/protocols/jabber/buddy.c:579 src/protocols/jabber/jabber.c:1562
 msgid "Resource"
 msgstr "资源"
 
-#: src/protocols/jabber/buddy.c:625 src/protocols/silc/ops.c:778
+#: src/protocols/jabber/buddy.c:625 src/protocols/silc/ops.c:794
 msgid "Middle Name"
 msgstr "中名"
 
-#: src/protocols/jabber/buddy.c:643 src/protocols/jabber/jabber.c:622
-#: src/protocols/oscar/oscar.c:4883 src/protocols/oscar/oscar.c:4891
-#: src/protocols/silc/ops.c:814
+#: src/protocols/jabber/buddy.c:643 src/protocols/jabber/jabber.c:623
+#: src/protocols/oscar/oscar.c:4899 src/protocols/oscar/oscar.c:4907
+#: src/protocols/silc/ops.c:830
 msgid "Address"
 msgstr "地址"
 
@@ -5471,31 +5503,31 @@
 msgid "Jabber Profile"
 msgstr "Jabber 资料"
 
-#: src/protocols/jabber/buddy.c:936
+#: src/protocols/jabber/buddy.c:932
 msgid "Un-hide From"
 msgstr "取消隐身"
 
-#: src/protocols/jabber/buddy.c:939
+#: src/protocols/jabber/buddy.c:935
 msgid "Temporarily Hide From"
 msgstr "临时隐身"
 
 #. && NOT ME
-#: src/protocols/jabber/buddy.c:946
+#: src/protocols/jabber/buddy.c:942
 msgid "Cancel Presence Notification"
 msgstr "取消目前的通知"
 
-#: src/protocols/jabber/buddy.c:952
+#: src/protocols/jabber/buddy.c:948
 msgid "(Re-)Request authorization"
 msgstr "(重新)请求认证"
 
 #. if(NOT ME)
 #. shouldn't this just happen automatically when the buddy is
 #. removed?
-#: src/protocols/jabber/buddy.c:960
+#: src/protocols/jabber/buddy.c:956
 msgid "Unsubscribe"
 msgstr "退订"
 
-#: src/protocols/jabber/chat.c:42 src/protocols/yahoo/yahoochat.c:963
+#: src/protocols/jabber/chat.c:42 src/protocols/yahoo/yahoochat.c:1002
 msgid "_Room:"
 msgstr "房间(_R):"
 
@@ -5582,446 +5614,446 @@
 msgid "Find Rooms"
 msgstr "查找房间"
 
-#: src/protocols/jabber/jabber.c:75
+#: src/protocols/jabber/jabber.c:76
 msgid "Error initializing session"
 msgstr "初始化会话出错"
 
-#: src/protocols/jabber/jabber.c:205 src/protocols/msn/httpmethod.c:266
+#: src/protocols/jabber/jabber.c:206 src/protocols/msn/httpmethod.c:266
 #: src/protocols/trepia/trepia.c:247 src/protocols/trepia/trepia.c:698
 #: src/protocols/trepia/trepia.c:987 src/protocols/trepia/trepia.c:1031
 #: src/protocols/trepia/trepia.c:1130 src/protocols/trepia/trepia.c:1176
 msgid "Write error"
 msgstr "写错误"
 
-#: src/protocols/jabber/jabber.c:243 src/protocols/jabber/jabber.c:263
+#: src/protocols/jabber/jabber.c:244 src/protocols/jabber/jabber.c:264
 msgid "Read Error"
 msgstr "读取错误"
 
-#: src/protocols/jabber/jabber.c:323
+#: src/protocols/jabber/jabber.c:324
 msgid "Connection Failed"
 msgstr "连接失败"
 
-#: src/protocols/jabber/jabber.c:326
+#: src/protocols/jabber/jabber.c:327
 msgid "SSL Handshake Failed"
 msgstr "SSL 握手失败"
 
-#: src/protocols/jabber/jabber.c:369 src/protocols/jabber/jabber.c:698
+#: src/protocols/jabber/jabber.c:370 src/protocols/jabber/jabber.c:699
 msgid "Invalid Jabber ID"
 msgstr "无效的 Jabber ID"
 
-#: src/protocols/jabber/jabber.c:397 src/protocols/jabber/jabber.c:725
+#: src/protocols/jabber/jabber.c:398 src/protocols/jabber/jabber.c:726
 msgid "SSL support unavailable"
 msgstr "SSL 支持不可用"
 
-#: src/protocols/jabber/jabber.c:407 src/protocols/jabber/jabber.c:735
+#: src/protocols/jabber/jabber.c:408 src/protocols/jabber/jabber.c:736
 #: src/protocols/trepia/trepia.c:1070
 msgid "Unable to create socket"
 msgstr "无法创建套接字"
 
-#: src/protocols/jabber/jabber.c:432
+#: src/protocols/jabber/jabber.c:433
 #, c-format
 msgid "Registration of %s@%s successful"
 msgstr "%s@%s 注册成功"
 
-#: src/protocols/jabber/jabber.c:434 src/protocols/jabber/jabber.c:435
+#: src/protocols/jabber/jabber.c:435 src/protocols/jabber/jabber.c:436
 msgid "Registration Successful"
 msgstr "注册成功"
 
-#: src/protocols/jabber/jabber.c:441 src/protocols/jabber/jabber.c:1180
+#: src/protocols/jabber/jabber.c:442 src/protocols/jabber/jabber.c:1181
 msgid "Unknown Error"
 msgstr "未知错误"
 
-#: src/protocols/jabber/jabber.c:443 src/protocols/jabber/jabber.c:444
+#: src/protocols/jabber/jabber.c:444 src/protocols/jabber/jabber.c:445
 msgid "Registration Failed"
 msgstr "注册失败"
 
-#: src/protocols/jabber/jabber.c:555 src/protocols/jabber/jabber.c:556
+#: src/protocols/jabber/jabber.c:556 src/protocols/jabber/jabber.c:557
 msgid "Already Registered"
 msgstr "已注册"
 
-#: src/protocols/jabber/jabber.c:591 src/protocols/jabber/jabber.c:1035
+#: src/protocols/jabber/jabber.c:592 src/protocols/jabber/jabber.c:1036
 msgid "Password"
 msgstr "密码"
 
-#: src/protocols/jabber/jabber.c:602
+#: src/protocols/jabber/jabber.c:603
 msgid "E-Mail"
 msgstr "电子邮件"
 
 #. State
-#: src/protocols/jabber/jabber.c:632 src/protocols/oscar/oscar.c:4885
-#: src/protocols/oscar/oscar.c:4893 src/protocols/trepia/trepia.c:335
+#: src/protocols/jabber/jabber.c:633 src/protocols/oscar/oscar.c:4901
+#: src/protocols/oscar/oscar.c:4909 src/protocols/trepia/trepia.c:335
 #: src/protocols/trepia/trepia.c:413
 msgid "State"
 msgstr "州/省"
 
-#: src/protocols/jabber/jabber.c:642 src/protocols/silc/buddy.c:1501
-#: src/protocols/silc/ops.c:819 src/protocols/silc/silc.c:635
+#: src/protocols/jabber/jabber.c:643 src/protocols/silc/ops.c:835
+#: src/protocols/silc/silc.c:639 src/protocols/silc/util.c:510
 msgid "Phone"
 msgstr "电话"
 
-#: src/protocols/jabber/jabber.c:652
+#: src/protocols/jabber/jabber.c:653
 msgid "Date"
 msgstr "日期"
 
-#: src/protocols/jabber/jabber.c:660
+#: src/protocols/jabber/jabber.c:661
 msgid "Please fill out the information below to register your new account."
 msgstr "请在下面填入信息以注册您新的账户。"
 
-#: src/protocols/jabber/jabber.c:663 src/protocols/jabber/jabber.c:664
+#: src/protocols/jabber/jabber.c:664 src/protocols/jabber/jabber.c:665
 msgid "Register New Jabber Account"
 msgstr "注册新的 Jabber 账户"
 
-#: src/protocols/jabber/jabber.c:743
+#: src/protocols/jabber/jabber.c:744
 msgid "Logged out"
 msgstr "已登出"
 
 #. connect to the server
-#: src/protocols/jabber/jabber.c:782 src/protocols/msn/msn.c:616
-#: src/protocols/napster/napster.c:499 src/protocols/novell/novell.c:2104
-#: src/protocols/oscar/oscar.c:1591 src/protocols/trepia/trepia.c:1064
-#: src/protocols/yahoo/yahoo.c:2353 src/protocols/zephyr/zephyr.c:906
+#: src/protocols/jabber/jabber.c:783 src/protocols/msn/msn.c:608
+#: src/protocols/napster/napster.c:499 src/protocols/novell/novell.c:2105
+#: src/protocols/oscar/oscar.c:1597 src/protocols/trepia/trepia.c:1064
+#: src/protocols/yahoo/yahoo.c:2379 src/protocols/zephyr/zephyr.c:1017
 msgid "Connecting"
 msgstr "正在连接"
 
-#: src/protocols/jabber/jabber.c:786
+#: src/protocols/jabber/jabber.c:787
 msgid "Initializing Stream"
 msgstr "初始化流"
 
-#: src/protocols/jabber/jabber.c:792
+#: src/protocols/jabber/jabber.c:793
 msgid "Authenticating"
 msgstr "正在认证"
 
-#: src/protocols/jabber/jabber.c:801
+#: src/protocols/jabber/jabber.c:802
 msgid "Re-initializing Stream"
 msgstr "重新初始化流"
 
-#: src/protocols/jabber/jabber.c:881 src/protocols/jabber/jabber.c:1158
-#: src/protocols/jabber/jabber.c:1199 src/protocols/jabber/jabber.c:1232
-#: src/protocols/oscar/oscar.c:580 src/protocols/oscar/oscar.c:6471
+#: src/protocols/jabber/jabber.c:882 src/protocols/jabber/jabber.c:1159
+#: src/protocols/jabber/jabber.c:1200 src/protocols/jabber/jabber.c:1233
+#: src/protocols/oscar/oscar.c:584 src/protocols/oscar/oscar.c:6488
 msgid "Not Authorized"
 msgstr "未认证"
 
-#: src/protocols/jabber/jabber.c:912
+#: src/protocols/jabber/jabber.c:913
 msgid "Both"
 msgstr "双向"
 
-#: src/protocols/jabber/jabber.c:914
+#: src/protocols/jabber/jabber.c:915
 msgid "From (To pending)"
 msgstr "来自(待推迟)"
 
-#: src/protocols/jabber/jabber.c:916
+#: src/protocols/jabber/jabber.c:917
 msgid "From"
 msgstr "来自"
 
-#: src/protocols/jabber/jabber.c:919
+#: src/protocols/jabber/jabber.c:920
 msgid "To"
 msgstr "到"
 
-#: src/protocols/jabber/jabber.c:921
+#: src/protocols/jabber/jabber.c:922
 msgid "None (To pending)"
 msgstr "无(待推迟)"
 
-#: src/protocols/jabber/jabber.c:925
+#: src/protocols/jabber/jabber.c:926
 msgid "Subscription"
 msgstr "订阅"
 
-#: src/protocols/jabber/jabber.c:945
+#: src/protocols/jabber/jabber.c:946
 msgid "Error"
 msgstr "出错"
 
-#: src/protocols/jabber/jabber.c:958 src/protocols/jabber/jutil.c:35
+#: src/protocols/jabber/jabber.c:959 src/protocols/jabber/jutil.c:35
 #: src/protocols/jabber/presence.c:66 src/protocols/jabber/presence.c:117
 msgid "Chatty"
 msgstr "唠叨"
 
-#: src/protocols/jabber/jabber.c:960 src/protocols/jabber/jutil.c:38
+#: src/protocols/jabber/jabber.c:961 src/protocols/jabber/jutil.c:38
 #: src/protocols/jabber/presence.c:68 src/protocols/jabber/presence.c:122
 msgid "Extended Away"
 msgstr "远远离开"
 
-#: src/protocols/jabber/jabber.c:961 src/protocols/jabber/jutil.c:41
+#: src/protocols/jabber/jabber.c:962 src/protocols/jabber/jutil.c:41
 #: src/protocols/jabber/presence.c:70 src/protocols/jabber/presence.c:124
-#: src/protocols/oscar/oscar.c:522 src/protocols/oscar/oscar.c:5468
-#: src/protocols/oscar/oscar.c:6663
+#: src/protocols/oscar/oscar.c:526 src/protocols/oscar/oscar.c:5484
+#: src/protocols/oscar/oscar.c:6680
 msgid "Do Not Disturb"
 msgstr "请勿打扰"
 
-#: src/protocols/jabber/jabber.c:978
-msgid "Password Changed"
-msgstr "密码已更改"
-
 #: src/protocols/jabber/jabber.c:979
+msgid "Password Changed"
+msgstr "密码已更改"
+
+#: src/protocols/jabber/jabber.c:980
 msgid "Your password has been changed."
 msgstr "您的密码已更改。"
 
-#: src/protocols/jabber/jabber.c:983 src/protocols/jabber/jabber.c:984
+#: src/protocols/jabber/jabber.c:984 src/protocols/jabber/jabber.c:985
 msgid "Error changing password"
 msgstr "更改密码出错"
 
-#: src/protocols/jabber/jabber.c:1040
+#: src/protocols/jabber/jabber.c:1041
 msgid "Password (again)"
 msgstr "再次输入新密码"
 
-#: src/protocols/jabber/jabber.c:1045 src/protocols/jabber/jabber.c:1046
+#: src/protocols/jabber/jabber.c:1046 src/protocols/jabber/jabber.c:1047
 msgid "Change Jabber Password"
 msgstr "更改 Jabber 密码"
 
-#: src/protocols/jabber/jabber.c:1046
+#: src/protocols/jabber/jabber.c:1047
 msgid "Please enter your new password"
 msgstr "请输入您的新密码"
 
-#: src/protocols/jabber/jabber.c:1056 src/protocols/toc/toc.c:1540
+#: src/protocols/jabber/jabber.c:1057 src/protocols/toc/toc.c:1540
 msgid "Set User Info"
 msgstr "设置用户信息"
 
-#: src/protocols/jabber/jabber.c:1138
+#: src/protocols/jabber/jabber.c:1139
 msgid "Bad Request"
 msgstr "无效请求"
 
-#: src/protocols/jabber/jabber.c:1140
+#: src/protocols/jabber/jabber.c:1141
 msgid "Conflict"
 msgstr "冲突"
 
-#: src/protocols/jabber/jabber.c:1142
+#: src/protocols/jabber/jabber.c:1143
 msgid "Feature Not Implemented"
 msgstr "特性未实现"
 
-#: src/protocols/jabber/jabber.c:1144
+#: src/protocols/jabber/jabber.c:1145
 msgid "Forbidden"
 msgstr "禁止"
 
-#: src/protocols/jabber/jabber.c:1146
+#: src/protocols/jabber/jabber.c:1147
 msgid "Gone"
 msgstr "已走"
 
-#: src/protocols/jabber/jabber.c:1148 src/protocols/jabber/jabber.c:1222
+#: src/protocols/jabber/jabber.c:1149 src/protocols/jabber/jabber.c:1223
 msgid "Internal Server Error"
 msgstr "内部服务器错误"
 
-#: src/protocols/jabber/jabber.c:1150
+#: src/protocols/jabber/jabber.c:1151
 msgid "Item Not Found"
 msgstr "项目未找到"
 
-#: src/protocols/jabber/jabber.c:1152
+#: src/protocols/jabber/jabber.c:1153
 msgid "Malformed Jabber ID"
 msgstr "Jabber ID 格式错误"
 
-#: src/protocols/jabber/jabber.c:1154
+#: src/protocols/jabber/jabber.c:1155
 msgid "Not Acceptable"
 msgstr "不可接受"
 
-#: src/protocols/jabber/jabber.c:1156
+#: src/protocols/jabber/jabber.c:1157
 msgid "Not Allowed"
 msgstr "不允许"
 
-#: src/protocols/jabber/jabber.c:1160
+#: src/protocols/jabber/jabber.c:1161
 msgid "Payment Required"
 msgstr "需要付费"
 
-#: src/protocols/jabber/jabber.c:1162
+#: src/protocols/jabber/jabber.c:1163
 msgid "Recipient Unavailable"
 msgstr "收件人不可用"
 
-#: src/protocols/jabber/jabber.c:1166
+#: src/protocols/jabber/jabber.c:1167
 msgid "Registration Required"
 msgstr "需要注册"
 
-#: src/protocols/jabber/jabber.c:1168
+#: src/protocols/jabber/jabber.c:1169
 msgid "Remote Server Not Found"
 msgstr "远程服务器未找到"
 
-#: src/protocols/jabber/jabber.c:1170
+#: src/protocols/jabber/jabber.c:1171
 msgid "Remote Server Timeout"
 msgstr "远程服务器超时"
 
-#: src/protocols/jabber/jabber.c:1172
+#: src/protocols/jabber/jabber.c:1173
 msgid "Server Overloaded"
 msgstr "服务器超载"
 
-#: src/protocols/jabber/jabber.c:1174
+#: src/protocols/jabber/jabber.c:1175
 msgid "Service Unavailable"
 msgstr "服务不可用"
 
-#: src/protocols/jabber/jabber.c:1176
+#: src/protocols/jabber/jabber.c:1177
 msgid "Subscription Required"
 msgstr "需要订阅"
 
-#: src/protocols/jabber/jabber.c:1178
+#: src/protocols/jabber/jabber.c:1179
 msgid "Unexpected Request"
 msgstr "未预期的请求"
 
-#: src/protocols/jabber/jabber.c:1185
+#: src/protocols/jabber/jabber.c:1186
 msgid "Authorization Aborted"
 msgstr "认证被中断"
 
-#: src/protocols/jabber/jabber.c:1187
+#: src/protocols/jabber/jabber.c:1188
 msgid "Incorrect encoding in authorization"
 msgstr "认证的编码不正确"
 
-#: src/protocols/jabber/jabber.c:1190
+#: src/protocols/jabber/jabber.c:1191
 msgid "Invalid authzid"
 msgstr "无效的认证"
 
-#: src/protocols/jabber/jabber.c:1193
+#: src/protocols/jabber/jabber.c:1194
 msgid "Invalid Authorization Mechanism"
 msgstr "无效的认证算法"
 
-#: src/protocols/jabber/jabber.c:1196
+#: src/protocols/jabber/jabber.c:1197
 msgid "Authorization mechanism too weak"
 msgstr "认证算法太弱"
 
-#: src/protocols/jabber/jabber.c:1201
+#: src/protocols/jabber/jabber.c:1202
 msgid "Temporary Authentication Failure"
 msgstr "临时认证失败"
 
-#: src/protocols/jabber/jabber.c:1203
+#: src/protocols/jabber/jabber.c:1204
 msgid "Authentication Failure"
 msgstr "认证失败"
 
-#: src/protocols/jabber/jabber.c:1207
+#: src/protocols/jabber/jabber.c:1208
 msgid "Bad Format"
 msgstr "格式无效"
 
-#: src/protocols/jabber/jabber.c:1209
+#: src/protocols/jabber/jabber.c:1210
 msgid "Bad Namespace Prefix"
 msgstr "无效的命名空间前缀"
 
-#: src/protocols/jabber/jabber.c:1212
+#: src/protocols/jabber/jabber.c:1213
 msgid "Resource Conflict"
 msgstr "资源冲突"
 
-#: src/protocols/jabber/jabber.c:1214 src/protocols/silc/ops.c:1225
+#: src/protocols/jabber/jabber.c:1215 src/protocols/silc/ops.c:1491
 msgid "Connection Timeout"
 msgstr "连接超时"
 
-#: src/protocols/jabber/jabber.c:1216
+#: src/protocols/jabber/jabber.c:1217
 msgid "Host Gone"
 msgstr "主机宕机"
 
-#: src/protocols/jabber/jabber.c:1218
+#: src/protocols/jabber/jabber.c:1219
 msgid "Host Unknown"
 msgstr "主机未知"
 
-#: src/protocols/jabber/jabber.c:1220
+#: src/protocols/jabber/jabber.c:1221
 msgid "Improper Addressing"
 msgstr "寻址不恰当"
 
-#: src/protocols/jabber/jabber.c:1224
+#: src/protocols/jabber/jabber.c:1225
 msgid "Invalid ID"
 msgstr "无效 ID"
 
-#: src/protocols/jabber/jabber.c:1226
+#: src/protocols/jabber/jabber.c:1227
 msgid "Invalid Namespace"
 msgstr "无效的命名空间"
 
-#: src/protocols/jabber/jabber.c:1228
+#: src/protocols/jabber/jabber.c:1229
 msgid "Invalid XML"
 msgstr "无效的 XML"
 
-#: src/protocols/jabber/jabber.c:1230
+#: src/protocols/jabber/jabber.c:1231
 msgid "Non-matching Hosts"
 msgstr "不匹配的主机"
 
-#: src/protocols/jabber/jabber.c:1234
+#: src/protocols/jabber/jabber.c:1235
 msgid "Policy Violation"
 msgstr "违背策略"
 
-#: src/protocols/jabber/jabber.c:1236
+#: src/protocols/jabber/jabber.c:1237
 msgid "Remote Connection Failed"
 msgstr "远程连接失败"
 
-#: src/protocols/jabber/jabber.c:1238
+#: src/protocols/jabber/jabber.c:1239
 msgid "Resource Constraint"
 msgstr "资源约束"
 
-#: src/protocols/jabber/jabber.c:1240
+#: src/protocols/jabber/jabber.c:1241
 msgid "Restricted XML"
 msgstr "限制的 XML"
 
-#: src/protocols/jabber/jabber.c:1242
+#: src/protocols/jabber/jabber.c:1243
 msgid "See Other Host"
 msgstr "查看其它主机"
 
-#: src/protocols/jabber/jabber.c:1244
+#: src/protocols/jabber/jabber.c:1245
 msgid "System Shutdown"
 msgstr "系统关机"
 
-#: src/protocols/jabber/jabber.c:1246
+#: src/protocols/jabber/jabber.c:1247
 msgid "Undefined Condition"
 msgstr "未定义的条件"
 
-#: src/protocols/jabber/jabber.c:1248
+#: src/protocols/jabber/jabber.c:1249
 msgid "Unsupported Encoding"
 msgstr "不支持的编码"
 
-#: src/protocols/jabber/jabber.c:1250
+#: src/protocols/jabber/jabber.c:1251
 msgid "Unsupported Stanza Type"
 msgstr "不支持的节类型"
 
-#: src/protocols/jabber/jabber.c:1252
+#: src/protocols/jabber/jabber.c:1253
 msgid "Unsupported Version"
 msgstr "不支持的版本"
 
-#: src/protocols/jabber/jabber.c:1254
+#: src/protocols/jabber/jabber.c:1255
 msgid "XML Not Well Formed"
 msgstr "XML 格式有错"
 
-#: src/protocols/jabber/jabber.c:1256
+#: src/protocols/jabber/jabber.c:1257
 msgid "Stream Error"
 msgstr "流错误"
 
-#: src/protocols/jabber/jabber.c:1323
+#: src/protocols/jabber/jabber.c:1324
 #, c-format
 msgid "Unable to ban user %s"
 msgstr "无法屏蔽用户 %s"
 
-#: src/protocols/jabber/jabber.c:1375
+#: src/protocols/jabber/jabber.c:1376
 #, c-format
 msgid "Unable to kick user %s"
 msgstr "无法踢出用户 %s"
 
-#: src/protocols/jabber/jabber.c:1400
+#: src/protocols/jabber/jabber.c:1401
 msgid "config:  Configure a chat room."
 msgstr "config: 配置聊天室。"
 
-#: src/protocols/jabber/jabber.c:1403
+#: src/protocols/jabber/jabber.c:1404
 msgid "configure:  Configure a chat room."
 msgstr "configure: 配置聊天室。"
 
-#: src/protocols/jabber/jabber.c:1410
+#: src/protocols/jabber/jabber.c:1411
 msgid "part [room]:  Leave the room."
 msgstr "part [房间]: 离开聊天室。"
 
-#: src/protocols/jabber/jabber.c:1413
+#: src/protocols/jabber/jabber.c:1414
 msgid "register:  Register with a chat room."
 msgstr "register: 注册聊天室。"
 
-#: src/protocols/jabber/jabber.c:1418
+#: src/protocols/jabber/jabber.c:1419
 msgid "topic [new topic]:  View or change the topic."
 msgstr "topic [新话题]: 查看或更改话题。"
 
-#: src/protocols/jabber/jabber.c:1422
+#: src/protocols/jabber/jabber.c:1423
 msgid "ban &lt;user&gt; [room]:  Ban a user from the room."
 msgstr "ban &lt;用户&gt; [房间]: 在房间中屏蔽一个用户。"
 
-#: src/protocols/jabber/jabber.c:1426
+#: src/protocols/jabber/jabber.c:1427
 msgid "invite &lt;user&gt; [room]:  Invite a user to the room."
 msgstr "invite &lt;用户&gt; [房间]: 邀请用户加入房间。"
 
-#: src/protocols/jabber/jabber.c:1430
+#: src/protocols/jabber/jabber.c:1431
 msgid "join: &lt;room&gt; [server]:  Join a chat on this server."
 msgstr "join: &lt;房间&gt; [服务器]: 加入此服务器上的聊天聊天室。"
 
-#: src/protocols/jabber/jabber.c:1434
+#: src/protocols/jabber/jabber.c:1435
 msgid "kick &lt;user&gt; [room]:  Kick a user from the room."
 msgstr "kick &lt;用户&gt; [房间]: 从房间中踢出一个用户。"
 
-#: src/protocols/jabber/jabber.c:1438
+#: src/protocols/jabber/jabber.c:1439
 msgid ""
 "msg &lt;user&gt; &lt;message&gt;:  Send a private message to another user."
 msgstr "msg &lt;用户&gt; &lt;消息&gt;: 向另外的好友发送私人消息。"
 
-#: src/protocols/jabber/jabber.c:1452
+#: src/protocols/jabber/jabber.c:1453
 msgid "Hide Operating System"
 msgstr "隐藏操作系统"
 
@@ -6036,24 +6068,24 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/jabber/jabber.c:1534 src/protocols/jabber/jabber.c:1536
+#: src/protocols/jabber/jabber.c:1537 src/protocols/jabber/jabber.c:1539
 msgid "Jabber Protocol Plugin"
 msgstr "Jabber 协议插件"
 
-#: src/protocols/jabber/jabber.c:1562
+#: src/protocols/jabber/jabber.c:1565
 msgid "Use TLS if available"
 msgstr "若可用则使用 TLS"
 
-#: src/protocols/jabber/jabber.c:1567
+#: src/protocols/jabber/jabber.c:1570
 msgid "Force old SSL"
 msgstr "强制旧 SSL"
 
-#: src/protocols/jabber/jabber.c:1572
+#: src/protocols/jabber/jabber.c:1575
 msgid "Allow plaintext auth over unencrypted streams"
 msgstr "允许在不加密流上的纯文本验证"
 
 #. Account options
-#: src/protocols/jabber/jabber.c:1581 src/protocols/silc/silc.c:1359
+#: src/protocols/jabber/jabber.c:1584 src/protocols/silc/silc.c:1572
 msgid "Connect server"
 msgstr "连接服务器"
 
@@ -6192,7 +6224,7 @@
 msgid "Not on list"
 msgstr "未列出"
 
-#: src/protocols/msn/error.c:70 src/protocols/zephyr/zephyr.c:570
+#: src/protocols/msn/error.c:70 src/protocols/zephyr/zephyr.c:593
 msgid "User is offline"
 msgstr "用户离线"
 
@@ -6337,8 +6369,8 @@
 msgid "Server too busy"
 msgstr "服务器太忙"
 
-#: src/protocols/msn/error.c:198 src/protocols/oscar/oscar.c:2010
-#: src/protocols/silc/ops.c:1214 src/protocols/toc/toc.c:630
+#: src/protocols/msn/error.c:198 src/protocols/oscar/oscar.c:2026
+#: src/protocols/silc/ops.c:1480 src/protocols/toc/toc.c:630
 msgid "Authentication failed"
 msgstr "认证失败"
 
@@ -6416,88 +6448,88 @@
 msgid "Disallow"
 msgstr "禁止"
 
-#: src/protocols/msn/msn.c:313
+#: src/protocols/msn/msn.c:311
 msgid "Send a mobile message."
 msgstr "发送移动消息。"
 
-#: src/protocols/msn/msn.c:315
+#: src/protocols/msn/msn.c:313
 msgid "Page"
 msgstr "寻呼"
 
-#: src/protocols/msn/msn.c:466 src/protocols/msn/msn.c:764
+#: src/protocols/msn/msn.c:463 src/protocols/msn/msn.c:756
 #: src/protocols/msn/state.c:34
 msgid "Away From Computer"
 msgstr "远离电脑"
 
-#: src/protocols/msn/msn.c:467 src/protocols/msn/msn.c:766
-#: src/protocols/msn/state.c:33 src/protocols/yahoo/yahoo.c:2468
-#: src/protocols/yahoo/yahoo.c:2846 src/protocols/yahoo/yahoo.c:2960
+#: src/protocols/msn/msn.c:464 src/protocols/msn/msn.c:758
+#: src/protocols/msn/state.c:33 src/protocols/yahoo/yahoo.c:2491
+#: src/protocols/yahoo/yahoo.c:2853 src/protocols/yahoo/yahoo.c:2969
 msgid "Be Right Back"
 msgstr "马上回来"
 
-#: src/protocols/msn/msn.c:468 src/protocols/msn/msn.c:768
-#: src/protocols/msn/state.c:31 src/protocols/novell/novell.c:2721
-#: src/protocols/novell/novell.c:2836 src/protocols/novell/novell.c:2890
+#: src/protocols/msn/msn.c:465 src/protocols/msn/msn.c:760
+#: src/protocols/msn/state.c:31 src/protocols/novell/novell.c:2727
+#: src/protocols/novell/novell.c:2842 src/protocols/novell/novell.c:2896
 #: src/protocols/silc/buddy.c:1383 src/protocols/silc/silc.c:47
-#: src/protocols/silc/silc.c:78 src/protocols/yahoo/yahoo.c:2470
-#: src/protocols/yahoo/yahoo.c:2848 src/protocols/yahoo/yahoo.c:2961
+#: src/protocols/silc/silc.c:78 src/protocols/yahoo/yahoo.c:2493
+#: src/protocols/yahoo/yahoo.c:2855 src/protocols/yahoo/yahoo.c:2970
 msgid "Busy"
 msgstr "忙碌"
 
-#: src/protocols/msn/msn.c:469 src/protocols/msn/msn.c:770
-#: src/protocols/msn/state.c:35 src/protocols/yahoo/yahoo.c:2478
-#: src/protocols/yahoo/yahoo.c:2856 src/protocols/yahoo/yahoo.c:2965
+#: src/protocols/msn/msn.c:466 src/protocols/msn/msn.c:762
+#: src/protocols/msn/state.c:35 src/protocols/yahoo/yahoo.c:2501
+#: src/protocols/yahoo/yahoo.c:2863 src/protocols/yahoo/yahoo.c:2974
 msgid "On The Phone"
 msgstr "接听电话"
 
-#: src/protocols/msn/msn.c:470 src/protocols/msn/msn.c:772
-#: src/protocols/msn/state.c:36 src/protocols/yahoo/yahoo.c:2482
-#: src/protocols/yahoo/yahoo.c:2860 src/protocols/yahoo/yahoo.c:2967
+#: src/protocols/msn/msn.c:467 src/protocols/msn/msn.c:764
+#: src/protocols/msn/state.c:36 src/protocols/yahoo/yahoo.c:2505
+#: src/protocols/yahoo/yahoo.c:2867 src/protocols/yahoo/yahoo.c:2976
 msgid "Out To Lunch"
 msgstr "外出就餐"
 
-#: src/protocols/msn/msn.c:471 src/protocols/msn/msn.c:774
-#: src/protocols/zephyr/zephyr.c:1205 src/protocols/zephyr/zephyr.c:1220
+#: src/protocols/msn/msn.c:468 src/protocols/msn/msn.c:766
+#: src/protocols/zephyr/zephyr.c:1355 src/protocols/zephyr/zephyr.c:1374
 msgid "Hidden"
 msgstr "隐身"
 
-#: src/protocols/msn/msn.c:482
+#: src/protocols/msn/msn.c:479
 msgid "Set Friendly Name"
 msgstr "设置友好的名称"
 
-#: src/protocols/msn/msn.c:487
+#: src/protocols/msn/msn.c:484
 msgid "Set Home Phone Number"
 msgstr "设置家庭电话号码"
 
-#: src/protocols/msn/msn.c:491
+#: src/protocols/msn/msn.c:488
 msgid "Set Work Phone Number"
 msgstr "设置工作电话号码"
 
-#: src/protocols/msn/msn.c:495
+#: src/protocols/msn/msn.c:492
 msgid "Set Mobile Phone Number"
 msgstr "设置移动电话号码"
 
-#: src/protocols/msn/msn.c:501
+#: src/protocols/msn/msn.c:498
 msgid "Enable/Disable Mobile Devices"
 msgstr "启用/禁用移动设备"
 
-#: src/protocols/msn/msn.c:506
+#: src/protocols/msn/msn.c:503
 msgid "Allow/Disallow Mobile Pages"
 msgstr "允许/禁止移动寻呼"
 
-#: src/protocols/msn/msn.c:529
+#: src/protocols/msn/msn.c:526
 msgid "Send to Mobile"
 msgstr "发送到移动设备"
 
-#: src/protocols/msn/msn.c:539
+#: src/protocols/msn/msn.c:536
 msgid "Initiate Chat"
 msgstr "进入聊天室"
 
-#: src/protocols/msn/msn.c:548
+#: src/protocols/msn/msn.c:540
 msgid "Update Buddy Icon"
 msgstr "更新好友图标"
 
-#: src/protocols/msn/msn.c:585
+#: src/protocols/msn/msn.c:577
 msgid ""
 "SSL support is needed for MSN. Please install a supported SSL library. See "
 "http://gaim.sf.net/faq-ssl.php for more information."
@@ -6505,106 +6537,122 @@
 "MSN 需要 SSL 支持。请安装本软件支持的 SSL 库。请参看 http://gaim.sf.net/faq-"
 "ssl.php 中的更多信息。"
 
-#: src/protocols/msn/msn.c:1137 src/protocols/msn/msn.c:1150
-#: src/protocols/msn/msn.c:1156 src/protocols/yahoo/yahoo_profile.c:640
-#: src/protocols/yahoo/yahoo_profile.c:653
+#: src/protocols/msn/msn.c:1167 src/protocols/yahoo/yahoo_profile.c:659
+#: src/protocols/zephyr/zephyr.c:626
+#, c-format
+msgid "<b>Alias:</b> %s<br>"
+msgstr "<b>别名:</b> %s<br>"
+
+#. put a link to the actual profile URL
+#: src/protocols/msn/msn.c:1172 src/protocols/msn/msn.c:1512
+#: src/protocols/yahoo/yahoo_profile.c:1168 src/util.c:792
+#, c-format
+msgid "<b>%s:</b> "
+msgstr "<b>%s:</b>"
+
+#: src/protocols/msn/msn.c:1173
+#, c-format
+msgid "<font sml=\"msn\">%s</font><br>"
+msgstr "<font sml=\"msn\">%s</font><br>"
+
+#: src/protocols/msn/msn.c:1179 src/protocols/yahoo/yahoo_profile.c:664
 #, c-format
 msgid "<b>%s:</b> %s<br>"
 msgstr "<b>%s:</b> %s<br>"
 
-#: src/protocols/msn/msn.c:1137
-msgid "MSN ID"
-msgstr "MSN ID"
-
-#: src/protocols/msn/msn.c:1145 src/protocols/yahoo/yahoo_profile.c:648
-#: src/protocols/zephyr/zephyr.c:602
-#, c-format
-msgid "<b>Alias:</b> %s<br>"
-msgstr "<b>别名:</b> %s<br>"
-
-#: src/protocols/msn/msn.c:1222 src/protocols/msn/msn.c:1546
-#: src/protocols/yahoo/yahoo_profile.c:746
-#: src/protocols/yahoo/yahoo_profile.c:834
+#: src/protocols/msn/msn.c:1242
+msgid "MSN Profile"
+msgstr "MSN 个人资料"
+
+#: src/protocols/msn/msn.c:1247 src/protocols/msn/msn.c:1499
+#: src/protocols/yahoo/yahoo_profile.c:761
 msgid "Error retrieving profile"
 msgstr "获取配置文件出错"
 
 #. Age
-#: src/protocols/msn/msn.c:1293 src/protocols/oscar/oscar.c:4870
+#: src/protocols/msn/msn.c:1318 src/protocols/oscar/oscar.c:4886
 #: src/protocols/trepia/trepia.c:285 src/protocols/trepia/trepia.c:404
-#: src/protocols/yahoo/yahoo_profile.c:1010
+#: src/protocols/yahoo/yahoo_profile.c:1015
 msgid "Age"
 msgstr "年龄"
 
 #. Gender
-#: src/protocols/msn/msn.c:1300 src/protocols/oscar/oscar.c:4856
+#: src/protocols/msn/msn.c:1325 src/protocols/oscar/oscar.c:4872
 #: src/protocols/trepia/trepia.c:279 src/protocols/trepia/trepia.c:406
-#: src/protocols/yahoo/yahoo_profile.c:1020
+#: src/protocols/yahoo/yahoo_profile.c:1025
 msgid "Gender"
 msgstr "性别"
 
-#: src/protocols/msn/msn.c:1309 src/protocols/yahoo/yahoo_profile.c:1015
+#: src/protocols/msn/msn.c:1334 src/protocols/yahoo/yahoo_profile.c:1020
 msgid "Marital Status"
 msgstr "婚姻状况"
 
-#: src/protocols/msn/msn.c:1316 src/protocols/yahoo/yahoo_profile.c:1005
+#: src/protocols/msn/msn.c:1341 src/protocols/yahoo/yahoo_profile.c:1010
 msgid "Location"
 msgstr "位置"
 
-#: src/protocols/msn/msn.c:1324 src/protocols/yahoo/yahoo_profile.c:1025
+#: src/protocols/msn/msn.c:1349 src/protocols/yahoo/yahoo_profile.c:1030
 msgid "Occupation"
 msgstr "职业"
 
-#: src/protocols/msn/msn.c:1341 src/protocols/msn/msn.c:1347
-#: src/protocols/msn/msn.c:1354 src/protocols/msn/msn.c:1362
-#: src/protocols/msn/msn.c:1369
+#: src/protocols/msn/msn.c:1366 src/protocols/msn/msn.c:1372
+#: src/protocols/msn/msn.c:1379 src/protocols/msn/msn.c:1387
+#: src/protocols/msn/msn.c:1394
 msgid "A Little About Me"
 msgstr "自我介绍"
 
-#: src/protocols/msn/msn.c:1378 src/protocols/msn/msn.c:1384
-#: src/protocols/msn/msn.c:1391 src/protocols/msn/msn.c:1398
+#: src/protocols/msn/msn.c:1403 src/protocols/msn/msn.c:1409
+#: src/protocols/msn/msn.c:1416 src/protocols/msn/msn.c:1423
 msgid "Favorite Things"
 msgstr "收藏"
 
-#: src/protocols/msn/msn.c:1407 src/protocols/msn/msn.c:1413
-#: src/protocols/msn/msn.c:1420
+#: src/protocols/msn/msn.c:1432 src/protocols/msn/msn.c:1438
+#: src/protocols/msn/msn.c:1445
 msgid "Hobbies and Interests"
 msgstr "嗜好和兴趣"
 
-#: src/protocols/msn/msn.c:1429 src/protocols/msn/msn.c:1435
-#: src/protocols/yahoo/yahoo_profile.c:1067
+#: src/protocols/msn/msn.c:1454 src/protocols/msn/msn.c:1460
+#: src/protocols/yahoo/yahoo_profile.c:1072
 msgid "Favorite Quote"
 msgstr "格言"
 
-#: src/protocols/msn/msn.c:1443 src/protocols/yahoo/yahoo_profile.c:1118
+#: src/protocols/msn/msn.c:1468 src/protocols/yahoo/yahoo_profile.c:1123
 msgid "Last Updated"
 msgstr "上次更新"
 
 #. Homepage
-#: src/protocols/msn/msn.c:1454 src/protocols/silc/ops.c:810
+#: src/protocols/msn/msn.c:1479 src/protocols/silc/ops.c:826
 #: src/protocols/trepia/trepia.c:289 src/protocols/trepia/trepia.c:419
 msgid "Homepage"
 msgstr "主页"
 
-#. put a link to the actual profile URL
-#: src/protocols/msn/msn.c:1465 src/protocols/yahoo/yahoo_profile.c:1121
-#: src/util.c:792
-#, c-format
-msgid "<b>%s:</b> "
-msgstr "<b>%s:</b>"
-
-#: src/protocols/msn/msn.c:1465 src/protocols/yahoo/yahoo_profile.c:1121
+#: src/protocols/msn/msn.c:1501
+msgid "The user has not created a public profile."
+msgstr "用户尚未创建公开的个人资料。"
+
+#: src/protocols/msn/msn.c:1502
+msgid ""
+"MSN reported not being able to find the user's profile. This either means "
+"that the user does not exist, or that the user exists but has not created a "
+"public profile."
+msgstr ""
+"MSN 报告找不到用户的个人资料。这可能是因为用户不存在,或者用户没有创建公开的个人资料。"
+
+#: src/protocols/msn/msn.c:1506
+msgid ""
+"Gaim could not find any information in the user's profile. The user most "
+"likely does not exist."
+msgstr "Gaim 在用户的个人资料中找不到任何信息。用户可能不存在。"
+
+#: src/protocols/msn/msn.c:1512 src/protocols/yahoo/yahoo_profile.c:1168
 msgid "Profile URL"
 msgstr "配置文件 URL"
 
-#: src/protocols/msn/msn.c:1547 src/protocols/yahoo/yahoo_profile.c:1140
-msgid "The user's profile is empty."
-msgstr "用户的配置文件为空。"
-
-#: src/protocols/msn/msn.c:1616
+#: src/protocols/msn/msn.c:1643
 msgid "Display conversation closed notices"
 msgstr "显示对话关闭通知"
 
-#: src/protocols/msn/msn.c:1621
+#: src/protocols/msn/msn.c:1648
 msgid "Display timeout notices"
 msgstr "显示超时通知"
 
@@ -6619,15 +6667,15 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/msn/msn.c:1703 src/protocols/msn/msn.c:1705
+#: src/protocols/msn/msn.c:1732 src/protocols/msn/msn.c:1734
 msgid "MSN Protocol Plugin"
 msgstr "MSN 协议插件"
 
-#: src/protocols/msn/msn.c:1724 src/protocols/trepia/trepia.c:1290
+#: src/protocols/msn/msn.c:1753 src/protocols/trepia/trepia.c:1292
 msgid "Login server"
 msgstr "登录服务器"
 
-#: src/protocols/msn/msn.c:1733
+#: src/protocols/msn/msn.c:1762
 msgid "Use HTTP Method"
 msgstr "使用 HTTP 方式"
 
@@ -6648,11 +6696,11 @@
 msgstr "正在获取好友列表"
 
 #: src/protocols/msn/notification.c:144 src/protocols/msn/notification.c:173
-#: src/protocols/oscar/oscar.c:2299
+#: src/protocols/oscar/oscar.c:2315
 msgid "Password sent"
 msgstr "密码已送出"
 
-#: src/protocols/msn/notification.c:1069
+#: src/protocols/msn/notification.c:1071
 #, c-format
 msgid ""
 "The MSN server will shut down for maintenance in %d minute. You will "
@@ -6674,7 +6722,7 @@
 "\n"
 "维护完成后,您将能够成功登入。"
 
-#: src/protocols/msn/notification.c:1134
+#: src/protocols/msn/notification.c:1136
 msgid "Syncing with server"
 msgstr "正在与服务器同步"
 
@@ -6707,11 +6755,11 @@
 msgid "Received HTTP error. Please report this."
 msgstr "收到了 HTTP 错误。请进行报告。"
 
-#: src/protocols/msn/switchboard.c:201
+#: src/protocols/msn/switchboard.c:191
 msgid "The conversation has become inactive and timed out."
 msgstr "对话已停止并超时。"
 
-#: src/protocols/msn/switchboard.c:209
+#: src/protocols/msn/switchboard.c:199
 #, c-format
 msgid "%s has closed the conversation window."
 msgstr "%s 已经关闭了对话窗口。"
@@ -6768,7 +6816,7 @@
 msgid "%s requested a PING"
 msgstr "%s 请求 PING"
 
-#: src/protocols/napster/napster.c:541 src/protocols/oscar/oscar.c:6171
+#: src/protocols/napster/napster.c:541 src/protocols/oscar/oscar.c:6188
 #: src/protocols/toc/toc.c:1266
 msgid "_Group:"
 msgstr "组(_G):"
@@ -6784,131 +6832,131 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/napster/napster.c:622 src/protocols/napster/napster.c:624
+#: src/protocols/napster/napster.c:624 src/protocols/napster/napster.c:626
 msgid "NAPSTER Protocol Plugin"
 msgstr "NAPSTER 协议插件"
 
-#: src/protocols/novell/nmuser.c:2046
+#: src/protocols/novell/nmuser.c:1868
 msgid "Required parameters not passed in"
 msgstr "请求的参数未传入"
 
-#: src/protocols/novell/nmuser.c:2049
+#: src/protocols/novell/nmuser.c:1871
 msgid "Unable to write to network"
 msgstr "无法写入网络"
 
-#: src/protocols/novell/nmuser.c:2052
+#: src/protocols/novell/nmuser.c:1874
 msgid "Unable to read from network"
 msgstr "无法从网络读取套接字"
 
-#: src/protocols/novell/nmuser.c:2055
+#: src/protocols/novell/nmuser.c:1877
 msgid "Error communicating with server"
 msgstr "与服务器通讯出错"
 
-#: src/protocols/novell/nmuser.c:2059
+#: src/protocols/novell/nmuser.c:1881
 msgid "Conference not found"
 msgstr "会议未找到"
 
-#: src/protocols/novell/nmuser.c:2062
+#: src/protocols/novell/nmuser.c:1884
 msgid "Conference does not exist"
 msgstr "会议不存在"
 
-#: src/protocols/novell/nmuser.c:2066
+#: src/protocols/novell/nmuser.c:1888
 msgid "A folder with that name already exists"
 msgstr "已存在同名文件夹"
 
-#: src/protocols/novell/nmuser.c:2069
+#: src/protocols/novell/nmuser.c:1891
 msgid "Not supported"
 msgstr "支持"
 
-#: src/protocols/novell/nmuser.c:2073
+#: src/protocols/novell/nmuser.c:1895
 msgid "Password has expired"
 msgstr "密码已过期"
 
-#: src/protocols/novell/nmuser.c:2076
+#: src/protocols/novell/nmuser.c:1898
 msgid "Invalid password"
 msgstr "无效的密码"
 
-#: src/protocols/novell/nmuser.c:2079
+#: src/protocols/novell/nmuser.c:1901
 msgid "User not found"
 msgstr "用户未找到"
 
-#: src/protocols/novell/nmuser.c:2082
+#: src/protocols/novell/nmuser.c:1904
 msgid "Account has been disabled"
 msgstr "账户已经被禁用"
 
-#: src/protocols/novell/nmuser.c:2085
+#: src/protocols/novell/nmuser.c:1907
 msgid "The server could not access the directory"
 msgstr "服务器无法访问目录"
 
-#: src/protocols/novell/nmuser.c:2088
+#: src/protocols/novell/nmuser.c:1910
 msgid "Your system administrator has disabled this operation"
 msgstr "您的系统管理员已经禁用此操作"
 
-#: src/protocols/novell/nmuser.c:2091
+#: src/protocols/novell/nmuser.c:1913
 msgid "The server is unavailable; try again later"
 msgstr "服务器不可用;请稍候再试"
 
-#: src/protocols/novell/nmuser.c:2094
+#: src/protocols/novell/nmuser.c:1916
 msgid "Cannot add a contact to the same folder twice"
 msgstr "无法为同一个文件夹添加两次联系人"
 
-#: src/protocols/novell/nmuser.c:2097
+#: src/protocols/novell/nmuser.c:1919
 msgid "Cannot add yourself"
 msgstr "无法添加您自己"
 
-#: src/protocols/novell/nmuser.c:2100
+#: src/protocols/novell/nmuser.c:1922
 msgid "Master archive is misconfigured"
 msgstr "主存档配置错误"
 
-#: src/protocols/novell/nmuser.c:2104
+#: src/protocols/novell/nmuser.c:1926
 msgid "Invalid username or password"
 msgstr "无效的用户名或密码"
 
-#: src/protocols/novell/nmuser.c:2107
+#: src/protocols/novell/nmuser.c:1929
 msgid "Could not recognize the host of the username you entered"
 msgstr "无法识别您输入用户名的主机"
 
-#: src/protocols/novell/nmuser.c:2110
+#: src/protocols/novell/nmuser.c:1932
 msgid ""
 "Your account has been disabled because too many invalid passwords were "
 "entered"
 msgstr "您的账户已经被禁用,原因是输错密码的次数太多"
 
-#: src/protocols/novell/nmuser.c:2113
+#: src/protocols/novell/nmuser.c:1935
 msgid "You cannot add the same person twice to a conversation"
 msgstr "您无法将同一个人两次添加到对话"
 
-#: src/protocols/novell/nmuser.c:2117
+#: src/protocols/novell/nmuser.c:1939
 msgid "You have reached your limit for the number of contacts allowed"
 msgstr "您达到了所允许联系人的最大数目"
 
-#: src/protocols/novell/nmuser.c:2120
+#: src/protocols/novell/nmuser.c:1942
 msgid "You have entered an invalid username"
 msgstr "您输入了无效的用户名"
 
-#: src/protocols/novell/nmuser.c:2123
+#: src/protocols/novell/nmuser.c:1945
 msgid "An error occurred while updating the directory"
 msgstr "更新目录时发生了错误"
 
-#: src/protocols/novell/nmuser.c:2126
+#: src/protocols/novell/nmuser.c:1948
 msgid "Incompatible protocol version"
 msgstr "不兼容的协议版本"
 
-#: src/protocols/novell/nmuser.c:2129
+#: src/protocols/novell/nmuser.c:1951
 msgid "The user has blocked you"
 msgstr "用户已经屏蔽了您"
 
-#: src/protocols/novell/nmuser.c:2132
+#: src/protocols/novell/nmuser.c:1954
 msgid ""
 "This evaluation version does not allow more than ten users to log in at one "
 "time"
 msgstr "试用版本不允许超过十个用户同时在线"
 
-#: src/protocols/novell/nmuser.c:2135
+#: src/protocols/novell/nmuser.c:1957
 msgid "The user is either offline or you are blocked"
 msgstr "用户或者离线,或者已经屏蔽了您"
 
-#: src/protocols/novell/nmuser.c:2138
+#: src/protocols/novell/nmuser.c:1960
 #, c-format
 msgid "Unknown error: 0x%X"
 msgstr "未知错误: 0x%X"
@@ -6988,7 +7036,7 @@
 msgid "Unable to remove %s from privacy list (%s)."
 msgstr "无法将 %s 从隐私列表中删除(%s)。"
 
-#: src/protocols/novell/novell.c:920 src/protocols/novell/novell.c:1573
+#: src/protocols/novell/novell.c:920 src/protocols/novell/novell.c:1574
 #, c-format
 msgid "Unable to change server side privacy settings (%s)."
 msgstr "无法更改服务器端的隐私设置(%s)。"
@@ -6998,11 +7046,11 @@
 msgid "Unable to create conference (%s)."
 msgstr "无法创建会议(%s)。"
 
-#: src/protocols/novell/novell.c:1103 src/protocols/novell/novell.c:1612
+#: src/protocols/novell/novell.c:1103 src/protocols/novell/novell.c:1613
 msgid "Error communicating with server. Closing connection."
 msgstr "与服务器通讯出错。关闭连接。"
 
-#: src/protocols/novell/novell.c:1425
+#: src/protocols/novell/novell.c:1426
 msgid "Userid"
 msgstr "用户 ID"
 
@@ -7013,46 +7061,46 @@
 #. tag, value);
 #. }
 #.
-#: src/protocols/novell/novell.c:1439
+#: src/protocols/novell/novell.c:1440
 msgid "Full name"
 msgstr "全名"
 
-#: src/protocols/novell/novell.c:1459
+#: src/protocols/novell/novell.c:1460
 msgid "User Properties"
 msgstr "用户属性"
 
-#: src/protocols/novell/novell.c:1563
+#: src/protocols/novell/novell.c:1564
 #, c-format
 msgid "GroupWise Conference %d"
 msgstr "GroupWise 会议 %d"
 
-#: src/protocols/novell/novell.c:1588
+#: src/protocols/novell/novell.c:1589
 msgid "Unable to make SSL connection to server."
 msgstr "无法通过 SSL 连接到服务器。"
 
-#: src/protocols/novell/novell.c:1618
+#: src/protocols/novell/novell.c:1619
 #, c-format
 msgid "Error processing event or response (%s)."
 msgstr "处理事件或响应出错(%s)。"
 
-#: src/protocols/novell/novell.c:1652
+#: src/protocols/novell/novell.c:1653
 msgid "Authenticating..."
 msgstr "正在认证..."
 
-#: src/protocols/novell/novell.c:1667
+#: src/protocols/novell/novell.c:1668
 msgid "Waiting for response..."
 msgstr "正在等候响应..."
 
-#: src/protocols/novell/novell.c:1802
+#: src/protocols/novell/novell.c:1803
 #, c-format
 msgid "%s has been invited to this conversation."
 msgstr "已经邀请 %s 加入此对话。"
 
-#: src/protocols/novell/novell.c:1829
+#: src/protocols/novell/novell.c:1830
 msgid "Invitation to Conversation"
 msgstr "对话邀请"
 
-#: src/protocols/novell/novell.c:1830
+#: src/protocols/novell/novell.c:1831
 #, c-format
 msgid ""
 "Invitation from: %s\n"
@@ -7063,15 +7111,15 @@
 "\n"
 "发出时间: %s"
 
-#: src/protocols/novell/novell.c:1832
+#: src/protocols/novell/novell.c:1833
 msgid "Would you like to join the conversation?"
 msgstr "您是否想要加入对话?"
 
-#: src/protocols/novell/novell.c:1937
+#: src/protocols/novell/novell.c:1938
 msgid "You have been logged out because you logged in at another workstation."
 msgstr "您已被注销,因为您已从其它计算机上登录。"
 
-#: src/protocols/novell/novell.c:1991
+#: src/protocols/novell/novell.c:1992
 #, c-format
 msgid ""
 "%s appears to be offline and did not receive the message that you just sent."
@@ -7081,34 +7129,34 @@
 #. *  gaim_request_fields(gc, _("Server Address"),...);
 #.
 #. ...but for now just error out with a nice message.
-#: src/protocols/novell/novell.c:2089
+#: src/protocols/novell/novell.c:2090
 msgid ""
 "Unable to connect to server. Please enter the address of the server you wish "
 "to connect to."
 msgstr "无法连接到服务器。请输入您想要连接的服务器的地址。"
 
-#: src/protocols/novell/novell.c:2111
+#: src/protocols/novell/novell.c:2112
 msgid "Error. SSL support is not installed."
 msgstr "出错。SSL 支持未安装。"
 
-#: src/protocols/novell/novell.c:2420
+#: src/protocols/novell/novell.c:2421
 msgid "This conference has been closed. No more messages can be sent."
 msgstr "此会议已关筹。不会再送出消息。"
 
-#: src/protocols/novell/novell.c:2727 src/protocols/oscar/oscar.c:582
-#: src/protocols/oscar/oscar.c:6473 src/protocols/yahoo/yahoo.c:2490
+#: src/protocols/novell/novell.c:2733 src/protocols/oscar/oscar.c:586
+#: src/protocols/oscar/oscar.c:6490 src/protocols/yahoo/yahoo.c:2513
 msgid "Offline"
 msgstr "离线"
 
-#: src/protocols/novell/novell.c:2738
+#: src/protocols/novell/novell.c:2744
 msgid "Message"
 msgstr "消息"
 
-#: src/protocols/novell/novell.c:2837 src/protocols/novell/novell.c:2893
+#: src/protocols/novell/novell.c:2843 src/protocols/novell/novell.c:2899
 msgid "Appear Offline"
 msgstr "显示为离线"
 
-#: src/protocols/novell/novell.c:3287
+#: src/protocols/novell/novell.c:3293
 msgid "Initiate _Chat"
 msgstr "发起聊天(_C)"
 
@@ -7123,15 +7171,15 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/novell/novell.c:3381 src/protocols/novell/novell.c:3383
+#: src/protocols/novell/novell.c:3389 src/protocols/novell/novell.c:3391
 msgid "Novell GroupWise Messenger Protocol Plugin"
 msgstr "Novell GroupWise Messenger 协议插件"
 
-#: src/protocols/novell/novell.c:3402
+#: src/protocols/novell/novell.c:3410
 msgid "Server address"
 msgstr "服务器地址"
 
-#: src/protocols/novell/novell.c:3406
+#: src/protocols/novell/novell.c:3414
 msgid "Server port"
 msgstr "服务器端口"
 
@@ -7231,181 +7279,187 @@
 msgid "Not while on AOL"
 msgstr "不位于 AOL 上"
 
-#: src/protocols/oscar/oscar.c:436
+#: src/protocols/oscar/oscar.c:403
+msgid ""
+"(There was an error converting this message.  The buddy you are speaking to "
+"most likely has a buggy client.)"
+msgstr "(转换此信息出错。与您对话的好友可能正在使用存在问题的客户端。)"
+
+#: src/protocols/oscar/oscar.c:441
 msgid "Voice"
 msgstr "语音"
 
-#: src/protocols/oscar/oscar.c:439
+#: src/protocols/oscar/oscar.c:444
 msgid "AIM Direct IM"
 msgstr "AIM 二人世界"
 
-#: src/protocols/oscar/oscar.c:442 src/protocols/silc/buddy.c:1497
-#: src/protocols/silc/silc.c:631
+#: src/protocols/oscar/oscar.c:447 src/protocols/silc/silc.c:635
+#: src/protocols/silc/util.c:506
 msgid "Chat"
 msgstr "聊天"
 
-#: src/protocols/oscar/oscar.c:445 src/protocols/oscar/oscar.c:6777
+#: src/protocols/oscar/oscar.c:450 src/protocols/oscar/oscar.c:6793
 msgid "Get File"
 msgstr "获取文件"
 
-#: src/protocols/oscar/oscar.c:452
+#: src/protocols/oscar/oscar.c:457
 msgid "Games"
 msgstr "游戏"
 
-#: src/protocols/oscar/oscar.c:455
+#: src/protocols/oscar/oscar.c:460
 msgid "Add-Ins"
 msgstr "外挂"
 
-#: src/protocols/oscar/oscar.c:458
+#: src/protocols/oscar/oscar.c:463
 msgid "Send Buddy List"
 msgstr "发送好友列表"
 
-#: src/protocols/oscar/oscar.c:461
+#: src/protocols/oscar/oscar.c:466
 msgid "ICQ Direct Connect"
 msgstr "ICQ 直接连接"
 
-#: src/protocols/oscar/oscar.c:464
+#: src/protocols/oscar/oscar.c:469
 msgid "AP User"
 msgstr "AP 用户"
 
-#: src/protocols/oscar/oscar.c:467
+#: src/protocols/oscar/oscar.c:472
 msgid "ICQ RTF"
 msgstr "ICQ RTF"
 
-#: src/protocols/oscar/oscar.c:470
+#: src/protocols/oscar/oscar.c:475
 msgid "Nihilist"
 msgstr "Nihilist"
 
-#: src/protocols/oscar/oscar.c:473
+#: src/protocols/oscar/oscar.c:478
 msgid "ICQ Server Relay"
 msgstr "ICQ 服务器转发"
 
-#: src/protocols/oscar/oscar.c:476
+#: src/protocols/oscar/oscar.c:481
 msgid "Old ICQ UTF8"
 msgstr "旧的 ICQ UTF8"
 
-#: src/protocols/oscar/oscar.c:479
+#: src/protocols/oscar/oscar.c:484
 msgid "Trillian Encryption"
 msgstr "Trillian 加密"
 
-#: src/protocols/oscar/oscar.c:482
+#: src/protocols/oscar/oscar.c:487
 msgid "ICQ UTF8"
 msgstr "ICQ UTF8"
 
-#: src/protocols/oscar/oscar.c:485
+#: src/protocols/oscar/oscar.c:490
 msgid "Hiptop"
 msgstr "Hiptop"
 
-#: src/protocols/oscar/oscar.c:488
+#: src/protocols/oscar/oscar.c:493
 msgid "Security Enabled"
 msgstr "安全已启用"
 
-#: src/protocols/oscar/oscar.c:491
+#: src/protocols/oscar/oscar.c:496
 msgid "Video Chat"
 msgstr "可视聊天"
 
-#: src/protocols/oscar/oscar.c:495
+#: src/protocols/oscar/oscar.c:500
 msgid "iChat AV"
 msgstr "iChat AV"
 
-#: src/protocols/oscar/oscar.c:498
+#: src/protocols/oscar/oscar.c:503
 msgid "Live Video"
 msgstr "实时视频"
 
-#: src/protocols/oscar/oscar.c:501
+#: src/protocols/oscar/oscar.c:506
 msgid "Camera"
 msgstr "相机"
 
-#: src/protocols/oscar/oscar.c:520 src/protocols/oscar/oscar.c:5477
-#: src/protocols/oscar/oscar.c:6666
+#: src/protocols/oscar/oscar.c:524 src/protocols/oscar/oscar.c:5493
+#: src/protocols/oscar/oscar.c:6683
 msgid "Free For Chat"
 msgstr "无事闲聊"
 
-#: src/protocols/oscar/oscar.c:524 src/protocols/oscar/oscar.c:5471
-#: src/protocols/oscar/oscar.c:6664
+#: src/protocols/oscar/oscar.c:528 src/protocols/oscar/oscar.c:5487
+#: src/protocols/oscar/oscar.c:6681
 msgid "Not Available"
 msgstr "不可用"
 
-#: src/protocols/oscar/oscar.c:526 src/protocols/oscar/oscar.c:5474
-#: src/protocols/oscar/oscar.c:6665
+#: src/protocols/oscar/oscar.c:530 src/protocols/oscar/oscar.c:5490
+#: src/protocols/oscar/oscar.c:6682
 msgid "Occupied"
 msgstr "琐事缠身"
 
-#: src/protocols/oscar/oscar.c:530
+#: src/protocols/oscar/oscar.c:534
 msgid "Web Aware"
 msgstr "网上留意"
 
-#: src/protocols/oscar/oscar.c:598
+#: src/protocols/oscar/oscar.c:602
 msgid "Capabilities"
 msgstr "能力"
 
-#: src/protocols/oscar/oscar.c:604
+#: src/protocols/oscar/oscar.c:609
 msgid "Buddy Comment"
 msgstr "好友注释"
 
-#: src/protocols/oscar/oscar.c:739
+#: src/protocols/oscar/oscar.c:744
 #, c-format
 msgid "Direct IM with %s closed"
 msgstr "与 %s 的二人世界已关闭"
 
-#: src/protocols/oscar/oscar.c:741
+#: src/protocols/oscar/oscar.c:746
 #, c-format
 msgid "Direct IM with %s failed"
 msgstr "与 %s 的二人世界失败"
 
-#: src/protocols/oscar/oscar.c:748
+#: src/protocols/oscar/oscar.c:753
 msgid "Direct Connect failed"
 msgstr "二人世界连接失败"
 
-#: src/protocols/oscar/oscar.c:825 src/protocols/oscar/oscar.c:956
+#: src/protocols/oscar/oscar.c:830 src/protocols/oscar/oscar.c:961
 #, c-format
 msgid "Direct IM with %s established"
 msgstr "与 %s 的二人世界已建立"
 
-#: src/protocols/oscar/oscar.c:906
+#: src/protocols/oscar/oscar.c:911
 #, c-format
 msgid "Attempting to connect to %s at %s:%hu for Direct IM."
 msgstr "试图连接到 %2$s:%3$hu 的 %1$s 进行二人世界。"
 
-#: src/protocols/oscar/oscar.c:1322
+#: src/protocols/oscar/oscar.c:1328
 #, c-format
 msgid "Asking %s to connect to us at %s:%hu for Direct IM."
 msgstr "请求 %s 连接到 %s:%hu 的二人世界。"
 
-#: src/protocols/oscar/oscar.c:1327
+#: src/protocols/oscar/oscar.c:1333
 msgid "Unable to open Direct IM"
 msgstr "无法开始二人世界"
 
-#: src/protocols/oscar/oscar.c:1362
+#: src/protocols/oscar/oscar.c:1368
 #, c-format
 msgid "You have selected to open a Direct IM connection with %s."
 msgstr "您选择了与 %s 进行二人世界连接。"
 
-#: src/protocols/oscar/oscar.c:1366
+#: src/protocols/oscar/oscar.c:1372
 msgid ""
 "Because this reveals your IP address, it may be considered a privacy risk.  "
 "Do you wish to continue?"
 msgstr ""
 "由于这样将暴露您的 IP 地址,所以可能带来潜在的隐私风险。您是否想要继续?"
 
-#: src/protocols/oscar/oscar.c:1370 src/protocols/oscar/oscar.c:3312
+#: src/protocols/oscar/oscar.c:1376 src/protocols/oscar/oscar.c:3328
 msgid "Connect"
 msgstr "连接"
 
-#: src/protocols/oscar/oscar.c:1436 src/protocols/toc/toc.c:872
+#: src/protocols/oscar/oscar.c:1442 src/protocols/toc/toc.c:872
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "您已经断开与聊天室 %s 的连接。"
 
-#: src/protocols/oscar/oscar.c:1452
+#: src/protocols/oscar/oscar.c:1458
 msgid "Chat is currently unavailable"
 msgstr "聊天目前不可用"
 
-#: src/protocols/oscar/oscar.c:1533
+#: src/protocols/oscar/oscar.c:1539
 msgid "Screen name sent"
 msgstr "用户名已发送"
 
-#: src/protocols/oscar/oscar.c:1547
+#: src/protocols/oscar/oscar.c:1553
 #, c-format
 msgid ""
 "Unable to login: Could not sign on as %s because the screen name is "
@@ -7415,46 +7469,46 @@
 "无法登入: 无法以 %s 登入,原因是用户名无效。用户名必须以字母开头,其中只能包"
 "含字母、数字和空格,或者只包含数字。"
 
-#: src/protocols/oscar/oscar.c:1575
+#: src/protocols/oscar/oscar.c:1581
 msgid "Unable to login to AIM"
 msgstr "无法登入 AIM"
 
-#: src/protocols/oscar/oscar.c:1676 src/protocols/oscar/oscar.c:2103
+#: src/protocols/oscar/oscar.c:1682 src/protocols/oscar/oscar.c:2119
 msgid "Could Not Connect"
 msgstr "无法连接"
 
-#: src/protocols/oscar/oscar.c:1684
+#: src/protocols/oscar/oscar.c:1690
 msgid "Connection established, cookie sent"
 msgstr "连接已建立,已发送 cookie"
 
-#: src/protocols/oscar/oscar.c:1797 src/protocols/yahoo/yahoo_filexfer.c:180
+#: src/protocols/oscar/oscar.c:1803 src/protocols/yahoo/yahoo_filexfer.c:180
 #: src/protocols/yahoo/yahoo_filexfer.c:189
 #: src/protocols/yahoo/yahoo_filexfer.c:199
 msgid "Unable to establish file descriptor."
 msgstr "无法建立文件描述符。"
 
-#: src/protocols/oscar/oscar.c:1802
+#: src/protocols/oscar/oscar.c:1808
 msgid "Unable to create new connection."
 msgstr "无法创建新连接。"
 
-#: src/protocols/oscar/oscar.c:1873
+#: src/protocols/oscar/oscar.c:1879
 msgid "Unable to establish listener socket."
 msgstr "无法建立监听套接字。"
 
-#: src/protocols/oscar/oscar.c:1987 src/protocols/toc/toc.c:541
+#: src/protocols/oscar/oscar.c:2003 src/protocols/toc/toc.c:541
 msgid "Incorrect nickname or password."
 msgstr "昵称或密码不对。"
 
-#: src/protocols/oscar/oscar.c:1992
+#: src/protocols/oscar/oscar.c:2008
 msgid "Your account is currently suspended."
 msgstr "您的账户被停用。"
 
 #. service temporarily unavailable
-#: src/protocols/oscar/oscar.c:1996
+#: src/protocols/oscar/oscar.c:2012
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr "AOL 即时通讯服务暂时不可用。"
 
-#: src/protocols/oscar/oscar.c:2001
+#: src/protocols/oscar/oscar.c:2017
 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."
@@ -7462,21 +7516,21 @@
 "您连接和断开得太频繁。请等十分钟,然后再试一次。如果您继续重试,您等的时间可"
 "能会更长。"
 
-#: src/protocols/oscar/oscar.c:2006
+#: src/protocols/oscar/oscar.c:2022
 #, c-format
 msgid "The client version you are using is too old. Please upgrade at %s"
 msgstr "您使用的客户版本太老。请在 %s 升级"
 
-#: src/protocols/oscar/oscar.c:2038
+#: src/protocols/oscar/oscar.c:2054
 msgid "Internal Error"
 msgstr "内部错误"
 
-#: src/protocols/oscar/oscar.c:2110
+#: src/protocols/oscar/oscar.c:2126
 msgid "Received authorization"
 msgstr "收到的认证"
 
-#: src/protocols/oscar/oscar.c:2146 src/protocols/oscar/oscar.c:2176
-#: src/protocols/oscar/oscar.c:2264
+#: src/protocols/oscar/oscar.c:2162 src/protocols/oscar/oscar.c:2192
+#: src/protocols/oscar/oscar.c:2280
 #, c-format
 msgid ""
 "You may be disconnected shortly.  You may want to use TOC until this is "
@@ -7484,24 +7538,24 @@
 msgstr ""
 "您即将被断开。您可能想要使用 TOC 直到这一问题被修正。请检查 %s 上的更新。"
 
-#: src/protocols/oscar/oscar.c:2149 src/protocols/oscar/oscar.c:2179
+#: src/protocols/oscar/oscar.c:2165 src/protocols/oscar/oscar.c:2195
 msgid "Gaim was unable to get a valid AIM login hash."
 msgstr "Gaim 无法获取有效的 AIM 登录码。"
 
-#: src/protocols/oscar/oscar.c:2267
+#: src/protocols/oscar/oscar.c:2283
 msgid "Gaim was unable to get a valid login hash."
 msgstr "Gaim 无法获取有效的登录码。"
 
-#: src/protocols/oscar/oscar.c:3096 src/protocols/oscar/oscar.c:3118
+#: src/protocols/oscar/oscar.c:3112 src/protocols/oscar/oscar.c:3134
 msgid "(There was an error receiving this message)"
 msgstr "(接收此消息出错)"
 
-#: src/protocols/oscar/oscar.c:3304
+#: src/protocols/oscar/oscar.c:3320
 #, c-format
 msgid "%s has just asked to directly connect to %s"
 msgstr "%s 刚刚请求和 %s 二人世界"
 
-#: src/protocols/oscar/oscar.c:3307
+#: src/protocols/oscar/oscar.c:3323
 msgid ""
 "This requires a direct connection between the two computers and is necessary "
 "for IM Images.  Because your IP address will be revealed, this may be "
@@ -7510,42 +7564,42 @@
 "现在需要在两台计算机之间建立直接连接,这对于即时传送图像是必要的。但是这将暴"
 "露您的 IP 地址,所以可能造成潜在的隐私风险。"
 
-#: src/protocols/oscar/oscar.c:3343
+#: src/protocols/oscar/oscar.c:3359
 msgid "Please authorize me so I can add you to my buddy list."
 msgstr "请同意我将您加入好友。"
 
-#: src/protocols/oscar/oscar.c:3351
+#: src/protocols/oscar/oscar.c:3367
 msgid "Authorization Request Message:"
 msgstr "认证请求消息:"
 
-#: src/protocols/oscar/oscar.c:3352
+#: src/protocols/oscar/oscar.c:3368
 msgid "Please authorize me!"
 msgstr "请同意我将您加入好友!"
 
-#: src/protocols/oscar/oscar.c:3382
+#: src/protocols/oscar/oscar.c:3398
 #, c-format
 msgid ""
 "The user %s requires authorization before being added to a buddy list.  Do "
 "you want to send an authorization request?"
 msgstr "用户 %s 在被加为您的好友之前需要认证。您是否想要发送认证请求?"
 
-#: src/protocols/oscar/oscar.c:3387 src/protocols/oscar/oscar.c:3389
+#: src/protocols/oscar/oscar.c:3403 src/protocols/oscar/oscar.c:3405
 msgid "Request Authorization"
 msgstr "请求认证"
 
-#: src/protocols/oscar/oscar.c:3437 src/protocols/oscar/oscar.c:3439
-#: src/protocols/oscar/oscar.c:3446 src/protocols/oscar/oscar.c:3528
-#: src/protocols/oscar/oscar.c:3548 src/protocols/oscar/oscar.c:3902
-#: src/protocols/oscar/oscar.c:3962 src/protocols/oscar/oscar.c:6092
-#: src/protocols/oscar/oscar.c:6138
+#: src/protocols/oscar/oscar.c:3453 src/protocols/oscar/oscar.c:3455
+#: src/protocols/oscar/oscar.c:3462 src/protocols/oscar/oscar.c:3544
+#: src/protocols/oscar/oscar.c:3564 src/protocols/oscar/oscar.c:3918
+#: src/protocols/oscar/oscar.c:3978 src/protocols/oscar/oscar.c:6109
+#: src/protocols/oscar/oscar.c:6155
 msgid "No reason given."
 msgstr "没有给出理由。"
 
-#: src/protocols/oscar/oscar.c:3445
+#: src/protocols/oscar/oscar.c:3461
 msgid "Authorization Denied Message:"
 msgstr "认证拒绝消息:"
 
-#: src/protocols/oscar/oscar.c:3528
+#: src/protocols/oscar/oscar.c:3544
 #, c-format
 msgid ""
 "The user %u wants to add you to their buddy list for the following reason:\n"
@@ -7554,11 +7608,11 @@
 "用户 %u 想要将您加为他/她的好友,理由如下:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:3536 src/protocols/oscar/oscar.c:6098
+#: src/protocols/oscar/oscar.c:3552 src/protocols/oscar/oscar.c:6115
 msgid "Authorization Request"
 msgstr "认证请求"
 
-#: src/protocols/oscar/oscar.c:3548
+#: src/protocols/oscar/oscar.c:3564
 #, c-format
 msgid ""
 "The user %u has denied your request to add them to your buddy list for the "
@@ -7568,17 +7622,17 @@
 "用户 %u 拒绝了您将他/她加为好友的请求,原因如下:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:3549
+#: src/protocols/oscar/oscar.c:3565
 msgid "ICQ authorization denied."
 msgstr "ICQ 请求认证被拒绝。"
 
 #. Someone has granted you authorization
-#: src/protocols/oscar/oscar.c:3556
+#: src/protocols/oscar/oscar.c:3572
 #, c-format
 msgid "The user %u has granted your request to add them to your buddy list."
 msgstr "用户 %u 同意您将他/她加为好友。"
 
-#: src/protocols/oscar/oscar.c:3564
+#: src/protocols/oscar/oscar.c:3580
 #, c-format
 msgid ""
 "You have received a special message\n"
@@ -7591,7 +7645,7 @@
 "发出人: %s [%s]\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:3572
+#: src/protocols/oscar/oscar.c:3588
 #, c-format
 msgid ""
 "You have received an ICQ page\n"
@@ -7604,7 +7658,7 @@
 "发出人: %s [%s]\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:3580
+#: src/protocols/oscar/oscar.c:3596
 #, c-format
 msgid ""
 "You have received an ICQ email from %s [%s]\n"
@@ -7617,32 +7671,32 @@
 "内容是:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:3601
+#: src/protocols/oscar/oscar.c:3617
 #, c-format
 msgid "ICQ user %u has sent you a buddy: %s (%s)"
 msgstr "ICQ 用户 %u 给您发送了一个好友: %s (%s)"
 
-#: src/protocols/oscar/oscar.c:3607
+#: src/protocols/oscar/oscar.c:3623
 msgid "Do you want to add this buddy to your buddy list?"
 msgstr "您是否想要将此人加为好友?"
 
-#: src/protocols/oscar/oscar.c:3611
+#: src/protocols/oscar/oscar.c:3627
 msgid "Decline"
 msgstr "拒绝"
 
-#: src/protocols/oscar/oscar.c:3696
+#: src/protocols/oscar/oscar.c:3712
 #, 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] "您错过了 %2$s 的 %1$hu 条消息,原因是这些消息无效。"
 
-#: src/protocols/oscar/oscar.c:3705
+#: src/protocols/oscar/oscar.c:3721
 #, 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] "您错过了 %2$s 的 %1$hu 条消息,原因是这些消息太大。"
 
-#: src/protocols/oscar/oscar.c:3714
+#: src/protocols/oscar/oscar.c:3730
 #, c-format
 msgid ""
 "You missed %hu message from %s because the rate limit has been exceeded."
@@ -7650,82 +7704,77 @@
 "You missed %hu messages from %s because the rate limit has been exceeded."
 msgstr[0] "您错过了 %2$s 的 %1$hu 条消息,原因是达到了等级限制。"
 
-#: src/protocols/oscar/oscar.c:3723
+#: src/protocols/oscar/oscar.c:3739
 #, 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] "您错过了 %2$s 的 %1$hu 条消息,原因是他/她太可恶了。"
 
-#: src/protocols/oscar/oscar.c:3732
+#: src/protocols/oscar/oscar.c:3748
 #, 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] "您错过了 %2$s 的 %1$hu 条消息,原因是您太可恶了。"
 
-#: src/protocols/oscar/oscar.c:3741
+#: src/protocols/oscar/oscar.c:3757
 #, 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] "您错过了 %2$s 的 %1$hu 条消息,原因未知。"
 
-#: src/protocols/oscar/oscar.c:3798 src/protocols/oscar/oscar.c:4022
+#: src/protocols/oscar/oscar.c:3814 src/protocols/oscar/oscar.c:4038
 #, c-format
 msgid "Info for %s"
 msgstr "%s 的信息"
 
-#: src/protocols/oscar/oscar.c:3803
-#, c-format
-msgid "<B>UIN:</B> %s<BR><B>Status:</B> %s<HR>%s"
-msgstr "<B>UIN:</B> %s<BR><B>状态:</B> %s<HR>%s"
-
-#: src/protocols/oscar/oscar.c:3864
+#: src/protocols/oscar/oscar.c:3880
 #, c-format
 msgid "SNAC threw error: %s\n"
 msgstr "SNAC 扔出错误: %s\n"
 
-#: src/protocols/oscar/oscar.c:3865
+#: src/protocols/oscar/oscar.c:3881
 msgid "Unknown error"
 msgstr "未知错误"
 
 #. Data is assumed to be the destination sn
-#: src/protocols/oscar/oscar.c:3900
+#: src/protocols/oscar/oscar.c:3916
 #, c-format
 msgid "Your message to %s did not get sent:"
 msgstr "您给 %s 的消息未发送:"
 
-#: src/protocols/oscar/oscar.c:3959
+#: src/protocols/oscar/oscar.c:3975
 #, c-format
 msgid "User information for %s unavailable:"
 msgstr "%s 的用户信息不可用:"
 
-#: src/protocols/oscar/oscar.c:3982
+#: src/protocols/oscar/oscar.c:3998
 msgid "Warning Level"
 msgstr "警告级别"
 
-#: src/protocols/oscar/oscar.c:3985
+#: src/protocols/oscar/oscar.c:4001
 msgid "Online Since"
 msgstr "上线时间"
 
-#: src/protocols/oscar/oscar.c:3989 src/protocols/yahoo/yahoo_profile.c:1113
+#: src/protocols/oscar/oscar.c:4005 src/protocols/yahoo/yahoo_profile.c:1118
 msgid "Member Since"
 msgstr "注册时间"
 
-#: src/protocols/oscar/oscar.c:4073
+#: src/protocols/oscar/oscar.c:4089
 msgid "Your AIM connection may be lost."
 msgstr "您的 AIM 连接可能已丢失。"
 
 #. The conversion failed!
-#: src/protocols/oscar/oscar.c:4259
+#: src/protocols/oscar/oscar.c:4275
 msgid ""
 "[Unable to display a message from this user because it contained invalid "
 "characters.]"
 msgstr "[无法显示来自此用户的信息,原因是其中包含了无效的字符。"
 
-#: src/protocols/oscar/oscar.c:4476
+#: src/protocols/oscar/oscar.c:4492
 msgid "Rate limiting error."
 msgstr "速度限制错误。"
 
-#: src/protocols/oscar/oscar.c:4477
+#: src/protocols/oscar/oscar.c:4493
 msgid ""
 "The last action you attempted could not be performed because you are over "
 "the rate limit. Please wait 10 seconds and try again."
@@ -7733,166 +7782,166 @@
 "您试图的最后一次操作未执行,原因是您已经得到了速度极限。请等 10 秒,然后再试"
 "一次。"
 
-#: src/protocols/oscar/oscar.c:4540
+#: src/protocols/oscar/oscar.c:4556
 msgid ""
 "You have been disconnected because you have signed on with this screen name "
 "at another location."
 msgstr "您已经断开了连接,原因是您在其它位置用此用户名登入了。"
 
-#: src/protocols/oscar/oscar.c:4542
+#: src/protocols/oscar/oscar.c:4558
 msgid "You have been signed off for an unknown reason."
 msgstr "您已经登出了,原因未知。"
 
-#: src/protocols/oscar/oscar.c:4573
+#: src/protocols/oscar/oscar.c:4589
 msgid "Finalizing connection"
 msgstr "正在完成连接"
 
-#: src/protocols/oscar/oscar.c:4843 src/protocols/oscar/oscar.c:4850
+#: src/protocols/oscar/oscar.c:4859 src/protocols/oscar/oscar.c:4866
 msgid "Email Address"
 msgstr "电子邮件地址"
 
-#: src/protocols/oscar/oscar.c:4855 src/protocols/silc/buddy.c:1524
+#: src/protocols/oscar/oscar.c:4871 src/protocols/silc/util.c:538
 msgid "Mobile Phone"
 msgstr "移动电话"
 
-#: src/protocols/oscar/oscar.c:4856
+#: src/protocols/oscar/oscar.c:4872
 msgid "Not specified"
 msgstr "未指定"
 
-#: src/protocols/oscar/oscar.c:4857 src/protocols/trepia/trepia.c:281
+#: src/protocols/oscar/oscar.c:4873 src/protocols/trepia/trepia.c:281
 #: src/protocols/trepia/trepia.c:407
 msgid "Female"
 msgstr "女"
 
-#: src/protocols/oscar/oscar.c:4857 src/protocols/trepia/trepia.c:280
+#: src/protocols/oscar/oscar.c:4873 src/protocols/trepia/trepia.c:280
 #: src/protocols/trepia/trepia.c:407
 msgid "Male"
 msgstr "男"
 
-#: src/protocols/oscar/oscar.c:4873
+#: src/protocols/oscar/oscar.c:4889
 msgid "Personal Web Page"
 msgstr "个人主页"
 
-#: src/protocols/oscar/oscar.c:4877
+#: src/protocols/oscar/oscar.c:4893
 msgid "Additional Information"
 msgstr "额外信息"
 
-#: src/protocols/oscar/oscar.c:4882
-msgid "Home Address"
-msgstr "家庭住址"
-
-#: src/protocols/oscar/oscar.c:4886 src/protocols/oscar/oscar.c:4894
-msgid "Zip Code"
-msgstr "邮政编码"
-
-#: src/protocols/oscar/oscar.c:4890
-msgid "Work Address"
-msgstr "办公地址"
-
 #: src/protocols/oscar/oscar.c:4898
+msgid "Home Address"
+msgstr "家庭住址"
+
+#: src/protocols/oscar/oscar.c:4902 src/protocols/oscar/oscar.c:4910
+msgid "Zip Code"
+msgstr "邮政编码"
+
+#: src/protocols/oscar/oscar.c:4906
+msgid "Work Address"
+msgstr "办公地址"
+
+#: src/protocols/oscar/oscar.c:4914
 msgid "Work Information"
 msgstr "工作信息"
 
-#: src/protocols/oscar/oscar.c:4899
+#: src/protocols/oscar/oscar.c:4915
 msgid "Company"
 msgstr "公司"
 
-#: src/protocols/oscar/oscar.c:4900
+#: src/protocols/oscar/oscar.c:4916
 msgid "Division"
 msgstr "部门"
 
-#: src/protocols/oscar/oscar.c:4901
+#: src/protocols/oscar/oscar.c:4917
 msgid "Position"
 msgstr "职务"
 
-#: src/protocols/oscar/oscar.c:4903
+#: src/protocols/oscar/oscar.c:4919
 msgid "Web Page"
 msgstr "网页"
 
-#: src/protocols/oscar/oscar.c:4909
+#: src/protocols/oscar/oscar.c:4925
 #, c-format
 msgid "ICQ Info for %s"
 msgstr "%s 的 ICQ 信息"
 
-#: src/protocols/oscar/oscar.c:4958
+#: src/protocols/oscar/oscar.c:4974
 msgid "Pop-Up Message"
 msgstr "弹出消息"
 
-#: src/protocols/oscar/oscar.c:4979
+#: src/protocols/oscar/oscar.c:4995
 #, c-format
 msgid "The following screen names are associated with %s"
 msgstr "下列用户名已经和 %s 关联"
 
-#: src/protocols/oscar/oscar.c:4983
+#: src/protocols/oscar/oscar.c:4999
 msgid "Search Results"
 msgstr "搜索结果"
 
-#: src/protocols/oscar/oscar.c:5000
+#: src/protocols/oscar/oscar.c:5016
 #, c-format
 msgid "No results found for email address %s"
 msgstr "未找到与电子邮件地址 %s 匹配的结果"
 
-#: src/protocols/oscar/oscar.c:5021
+#: src/protocols/oscar/oscar.c:5037
 #, c-format
 msgid "You should receive an email asking to confirm %s."
 msgstr "您应当收到询问确认 %s 的邮件。"
 
-#: src/protocols/oscar/oscar.c:5023
+#: src/protocols/oscar/oscar.c:5039
 msgid "Account Confirmation Requested"
 msgstr "请求了账户确认"
 
-#: src/protocols/oscar/oscar.c:5051
+#: src/protocols/oscar/oscar.c:5067
 msgid "Error Changing Account Info"
 msgstr "更改账户信息出错"
 
-#: src/protocols/oscar/oscar.c:5054
+#: src/protocols/oscar/oscar.c:5070
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
 "differs from the original."
 msgstr "错误 0x%04x: 无法格式化用户名,原因是请求的用户名与原始用户名不符。"
 
-#: src/protocols/oscar/oscar.c:5057
+#: src/protocols/oscar/oscar.c:5073
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
 "ends in a space."
 msgstr "错误 0x%04x: 无法格式化用户名,原因是请求的用户名以空格结尾。"
 
-#: src/protocols/oscar/oscar.c:5060
+#: src/protocols/oscar/oscar.c:5076
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
 "is too long."
 msgstr "错误 0x%04x: 无法格式化用户名,原因是请求的用户名太长。"
 
-#: src/protocols/oscar/oscar.c:5063
+#: src/protocols/oscar/oscar.c:5079
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change email address because there is already a "
 "request pending for this screen name."
 msgstr "错误 0x%04x: 无法更改电子邮件地址,原因是此用户名已经有被推后的请求。"
 
-#: src/protocols/oscar/oscar.c:5066
+#: src/protocols/oscar/oscar.c:5082
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change email address because the given address has "
 "too many screen names associated with it."
 msgstr "错误 0x%04x: 无法更改电子邮件地址,原因是给定的地址关联的用户名太多。"
 
-#: src/protocols/oscar/oscar.c:5069
+#: src/protocols/oscar/oscar.c:5085
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change email address because the given address is "
 "invalid."
 msgstr "错误 0x%04x: 无法更改电子邮件地址,原因是给定的地址无效。"
 
-#: src/protocols/oscar/oscar.c:5072
+#: src/protocols/oscar/oscar.c:5088
 #, c-format
 msgid "Error 0x%04x: Unknown error."
 msgstr "错误 0x%04x: 未知错误。"
 
-#: src/protocols/oscar/oscar.c:5082
+#: src/protocols/oscar/oscar.c:5098
 #, c-format
 msgid ""
 "Your screen name is currently formatted as follows:\n"
@@ -7901,25 +7950,25 @@
 "您的用户名格式化后如下:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:5083 src/protocols/oscar/oscar.c:5090
+#: src/protocols/oscar/oscar.c:5099 src/protocols/oscar/oscar.c:5106
 msgid "Account Info"
 msgstr "账户信息"
 
-#: src/protocols/oscar/oscar.c:5088
+#: src/protocols/oscar/oscar.c:5104
 #, c-format
 msgid "The email address for %s is %s"
 msgstr "%s 的电子邮件地址为 %s"
 
-#: src/protocols/oscar/oscar.c:5153
+#: src/protocols/oscar/oscar.c:5169
 msgid ""
 "Your IM Image was not sent. You must be Direct Connected to send IM Images."
 msgstr "您的聊天图像未送出。要发送聊天图像,您必须连接为二人世界。"
 
-#: src/protocols/oscar/oscar.c:5326
+#: src/protocols/oscar/oscar.c:5342
 msgid "Unable to set AIM profile."
 msgstr "无法设置 AIM 配置文件。"
 
-#: src/protocols/oscar/oscar.c:5327
+#: src/protocols/oscar/oscar.c:5343
 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 "
@@ -7928,7 +7977,7 @@
 "您在登录过程完成之前请求设定配置文件。您的配置文件尚未设定;请在您完全连接后"
 "再试一次。"
 
-#: src/protocols/oscar/oscar.c:5354
+#: src/protocols/oscar/oscar.c:5370
 #, c-format
 msgid ""
 "The maximum profile length of %d byte has been exceeded.  Gaim has truncated "
@@ -7938,19 +7987,19 @@
 "truncated it for you."
 msgstr[0] "已经超过了配置文件的最大长度 %d 字节。Gaim 为您自动截断了。"
 
-#: src/protocols/oscar/oscar.c:5359
+#: src/protocols/oscar/oscar.c:5375
 msgid "Profile too long."
 msgstr "配置文件太长。"
 
-#: src/protocols/oscar/oscar.c:5375 src/protocols/oscar/oscar.c:6671
+#: src/protocols/oscar/oscar.c:5391 src/protocols/oscar/oscar.c:6688
 msgid "Visible"
 msgstr "显身"
 
-#: src/protocols/oscar/oscar.c:5393
+#: src/protocols/oscar/oscar.c:5409
 msgid "Unable to set AIM away message."
 msgstr "无法设置 AIM 离开消息。"
 
-#: src/protocols/oscar/oscar.c:5394
+#: src/protocols/oscar/oscar.c:5410
 msgid ""
 "You have probably requested to set your away message before the login "
 "procedure completed.  You remain in a \"present\" state; try setting it "
@@ -7959,7 +8008,7 @@
 "您在登录过程完成之前请求设定离开消息。您仍将处于目前的状态;请在您完全连接后"
 "再试一次。"
 
-#: src/protocols/oscar/oscar.c:5434
+#: src/protocols/oscar/oscar.c:5450
 #, c-format
 msgid ""
 "The maximum away message length of %d byte has been exceeded.  Gaim has "
@@ -7971,11 +8020,11 @@
 "已经超过了离开消息的最大长度 %d 字节。Gaim 自动为您截断了消息,并将您设为离"
 "开。"
 
-#: src/protocols/oscar/oscar.c:5439
+#: src/protocols/oscar/oscar.c:5455
 msgid "Away message too long."
 msgstr "离开消息太长。"
 
-#: src/protocols/oscar/oscar.c:5517
+#: src/protocols/oscar/oscar.c:5533
 #, c-format
 msgid ""
 "Could not add the buddy %s because the screen name is invalid.  Screen names "
@@ -7985,16 +8034,16 @@
 "无法添加好友 %s,原因是用户名无效。用户名必须以字母开头,其中只能包含字母、数"
 "字和空格,或者只包含数字。该好友将从您的好友列表中删除。"
 
-#: src/protocols/oscar/oscar.c:5518 src/protocols/oscar/oscar.c:5959
-#: src/protocols/oscar/oscar.c:5972
+#: src/protocols/oscar/oscar.c:5534 src/protocols/oscar/oscar.c:5976
+#: src/protocols/oscar/oscar.c:5989
 msgid "Unable To Add"
 msgstr "无法添加"
 
-#: src/protocols/oscar/oscar.c:5678
+#: src/protocols/oscar/oscar.c:5695
 msgid "Unable To Retrieve Buddy List"
 msgstr "无法获取好友列表"
 
-#: src/protocols/oscar/oscar.c:5679
+#: src/protocols/oscar/oscar.c:5696
 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 "
@@ -8003,13 +8052,13 @@
 "Gaim 暂时无法从 AIM 服务器获取您的好友列表。您的好友列表没有丢失,可能稍等几"
 "小时就能用了。"
 
-#: src/protocols/oscar/oscar.c:5855 src/protocols/oscar/oscar.c:5856
-#: src/protocols/oscar/oscar.c:5861 src/protocols/oscar/oscar.c:6016
-#: src/protocols/oscar/oscar.c:6017 src/protocols/oscar/oscar.c:6022
+#: src/protocols/oscar/oscar.c:5872 src/protocols/oscar/oscar.c:5873
+#: src/protocols/oscar/oscar.c:5878 src/protocols/oscar/oscar.c:6033
+#: src/protocols/oscar/oscar.c:6034 src/protocols/oscar/oscar.c:6039
 msgid "Orphans"
 msgstr "孤儿"
 
-#: src/protocols/oscar/oscar.c:5958
+#: src/protocols/oscar/oscar.c:5975
 #, c-format
 msgid ""
 "Could not add the buddy %s because you have too many buddies in your buddy "
@@ -8017,11 +8066,11 @@
 msgstr ""
 "无法将 %s 加为好友,原因是您的好友太多。请删除其中一个好友,然后再试一次。"
 
-#: src/protocols/oscar/oscar.c:5958 src/protocols/oscar/oscar.c:5971
+#: src/protocols/oscar/oscar.c:5975 src/protocols/oscar/oscar.c:5988
 msgid "(no name)"
 msgstr "(无名称)"
 
-#: src/protocols/oscar/oscar.c:5971
+#: src/protocols/oscar/oscar.c:5988
 #, c-format
 msgid ""
 "Could not add the buddy %s for an unknown reason.  The most common reason "
@@ -8031,18 +8080,18 @@
 "无法添加好友 %s,原因未知。最可能的原因是您的好友列表中好友的数目已经达到了所"
 "允许的最大值。"
 
-#: src/protocols/oscar/oscar.c:6053
+#: src/protocols/oscar/oscar.c:6070
 #, c-format
 msgid ""
 "The user %s has given you permission to add you to their buddy list.  Do you "
 "want to add them?"
 msgstr "用户 %s 允许您将他/她加为好友。您是否想要添加?"
 
-#: src/protocols/oscar/oscar.c:6059
+#: src/protocols/oscar/oscar.c:6076
 msgid "Authorization Given"
 msgstr "给出的认证"
 
-#: src/protocols/oscar/oscar.c:6092
+#: src/protocols/oscar/oscar.c:6109
 #, c-format
 msgid ""
 "The user %s wants to add you to their buddy list for the following reason:\n"
@@ -8052,17 +8101,17 @@
 "%s"
 
 #. Granted
-#: src/protocols/oscar/oscar.c:6134
+#: src/protocols/oscar/oscar.c:6151
 #, c-format
 msgid "The user %s has granted your request to add them to your buddy list."
 msgstr "用户 %s 允许您将他/她加入好友。"
 
-#: src/protocols/oscar/oscar.c:6135
+#: src/protocols/oscar/oscar.c:6152
 msgid "Authorization Granted"
 msgstr "认证被许可"
 
 #. Denied
-#: src/protocols/oscar/oscar.c:6138
+#: src/protocols/oscar/oscar.c:6155
 #, c-format
 msgid ""
 "The user %s has denied your request to add them to your buddy list for the "
@@ -8072,71 +8121,71 @@
 "用户 %s 拒绝了您将其加入好友列表的请求,原因如下:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:6139
+#: src/protocols/oscar/oscar.c:6156
 msgid "Authorization Denied"
 msgstr "认证被拒绝"
 
-#: src/protocols/oscar/oscar.c:6176 src/protocols/toc/toc.c:1271
+#: src/protocols/oscar/oscar.c:6193 src/protocols/toc/toc.c:1271
 msgid "_Exchange:"
 msgstr "交换(_E):"
 
-#: src/protocols/oscar/oscar.c:6198
+#: src/protocols/oscar/oscar.c:6215
 msgid "Invalid chat name specified."
 msgstr "指定的聊天名称无效。"
 
-#: src/protocols/oscar/oscar.c:6288
+#: src/protocols/oscar/oscar.c:6305
 msgid "Your IM Image was not sent. You cannot send IM Images in AIM chats."
 msgstr "您的聊天图像未送出。您不能再 AIM 聊天中发送聊天图像。"
 
-#: src/protocols/oscar/oscar.c:6445
+#: src/protocols/oscar/oscar.c:6462
 msgid "Away Message"
 msgstr "离开消息"
 
-#: src/protocols/oscar/oscar.c:6729
+#: src/protocols/oscar/oscar.c:6746
 msgid "Buddy Comment:"
 msgstr "好友注释:"
 
-#: src/protocols/oscar/oscar.c:6747
+#: src/protocols/oscar/oscar.c:6764
 msgid "Edit Buddy Comment"
 msgstr "编辑好友注释"
 
-#: src/protocols/oscar/oscar.c:6753
+#: src/protocols/oscar/oscar.c:6770
 msgid "Get Status Msg"
 msgstr "获取状态消息"
 
-#: src/protocols/oscar/oscar.c:6765
+#: src/protocols/oscar/oscar.c:6782
 msgid "Direct IM"
 msgstr "二人世界"
 
-#: src/protocols/oscar/oscar.c:6788
+#: src/protocols/oscar/oscar.c:6804
 msgid "Re-request Authorization"
 msgstr "重新请求认证"
 
-#: src/protocols/oscar/oscar.c:6818
+#: src/protocols/oscar/oscar.c:6834
 msgid "The new formatting is invalid."
 msgstr "新格式化无效。"
 
-#: src/protocols/oscar/oscar.c:6819
+#: src/protocols/oscar/oscar.c:6835
 msgid "Screen name formatting can change only capitalization and whitespace."
 msgstr "用户名格式化只更改大写和空格。"
 
-#: src/protocols/oscar/oscar.c:6826
+#: src/protocols/oscar/oscar.c:6842
 msgid "New screen name formatting:"
 msgstr "新的用户名格式化:"
 
-#: src/protocols/oscar/oscar.c:6878
+#: src/protocols/oscar/oscar.c:6894
 msgid "Change Address To:"
 msgstr "将地址更改为:"
 
-#: src/protocols/oscar/oscar.c:6923
+#: src/protocols/oscar/oscar.c:6939
 msgid "<i>you are not waiting for authorization</i>"
 msgstr "<i>您并不在等候认证</i>"
 
-#: src/protocols/oscar/oscar.c:6926
+#: src/protocols/oscar/oscar.c:6942
 msgid "You are awaiting authorization from the following buddies"
 msgstr "您正在等待下列好友的认证"
 
-#: src/protocols/oscar/oscar.c:6927
+#: src/protocols/oscar/oscar.c:6943
 msgid ""
 "You can re-request authorization from these buddies by right-clicking on "
 "them and selecting \"Re-request Authorization.\""
@@ -8144,75 +8193,75 @@
 "如果您想要向这些好友重新请求认证,只需用鼠标右键单击这些好友,然后单击“重新请"
 "求认证”。"
 
-#: src/protocols/oscar/oscar.c:6944
+#: src/protocols/oscar/oscar.c:6960
 msgid "Find Buddy by E-mail"
 msgstr "按电子邮件查找好友"
 
-#: src/protocols/oscar/oscar.c:6945
+#: src/protocols/oscar/oscar.c:6961
 msgid "Search for a buddy by e-mail address"
 msgstr "按电子邮件地址搜索好友"
 
-#: src/protocols/oscar/oscar.c:6946
+#: src/protocols/oscar/oscar.c:6962
 msgid "Type the e-mail address of the buddy you are searching for."
 msgstr "输入您想要搜索的好友的电子邮件地址。"
 
-#: src/protocols/oscar/oscar.c:6963
+#: src/protocols/oscar/oscar.c:6979
 msgid "Available Message:"
 msgstr "可用消息:"
 
-#: src/protocols/oscar/oscar.c:6964
+#: src/protocols/oscar/oscar.c:6980
 msgid "I'm doing work and hoping for a distraction--IM me!"
 msgstr "我正在工作,渴望被打扰 - 呼我!"
 
-#: src/protocols/oscar/oscar.c:7045 src/protocols/silc/silc.c:782
+#: src/protocols/oscar/oscar.c:7061 src/protocols/silc/silc.c:789
 msgid "Set User Info..."
 msgstr "设置用户信息..."
 
-#: src/protocols/oscar/oscar.c:7050
+#: src/protocols/oscar/oscar.c:7066
 msgid "Set User Info (URL)..."
 msgstr "设置用户信息(URL)..."
 
-#: src/protocols/oscar/oscar.c:7056
+#: src/protocols/oscar/oscar.c:7072
 msgid "Set Available Message..."
 msgstr "设置可用消息..."
 
-#: src/protocols/oscar/oscar.c:7061 src/protocols/silc/silc.c:778
+#: src/protocols/oscar/oscar.c:7077 src/protocols/silc/silc.c:785
 msgid "Change Password..."
 msgstr "更改密码..."
 
-#: src/protocols/oscar/oscar.c:7066
+#: src/protocols/oscar/oscar.c:7082
 msgid "Change Password (URL)"
 msgstr "更改密码(URL)"
 
-#: src/protocols/oscar/oscar.c:7070
+#: src/protocols/oscar/oscar.c:7086
 msgid "Configure IM Forwarding (URL)"
 msgstr "配置 IM 转发(URL)"
 
-#: src/protocols/oscar/oscar.c:7079
+#: src/protocols/oscar/oscar.c:7095
 msgid "Format Screen Name..."
 msgstr "格式化用户名..."
 
-#: src/protocols/oscar/oscar.c:7083
+#: src/protocols/oscar/oscar.c:7099
 msgid "Confirm Account"
 msgstr "确认账户"
 
-#: src/protocols/oscar/oscar.c:7087
+#: src/protocols/oscar/oscar.c:7103
 msgid "Display Currently Registered Address"
 msgstr "显示当前注册的地址"
 
-#: src/protocols/oscar/oscar.c:7091
+#: src/protocols/oscar/oscar.c:7107
 msgid "Change Currently Registered Address..."
 msgstr "更改当前注册的地址..."
 
-#: src/protocols/oscar/oscar.c:7098
+#: src/protocols/oscar/oscar.c:7114
 msgid "Show Buddies Awaiting Authorization"
 msgstr "显示正在等候认证的好友"
 
-#: src/protocols/oscar/oscar.c:7104
+#: src/protocols/oscar/oscar.c:7120
 msgid "Search for Buddy by Email..."
 msgstr "按电子邮件搜索好友..."
 
-#: src/protocols/oscar/oscar.c:7109
+#: src/protocols/oscar/oscar.c:7125
 msgid "Search for Buddy by Information"
 msgstr "按信息搜索好友"
 
@@ -8227,15 +8276,15 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/oscar/oscar.c:7225 src/protocols/oscar/oscar.c:7227
+#: src/protocols/oscar/oscar.c:7243 src/protocols/oscar/oscar.c:7245
 msgid "AIM/ICQ Protocol Plugin"
 msgstr "AIM/ICQ 协议插件"
 
-#: src/protocols/oscar/oscar.c:7246
+#: src/protocols/oscar/oscar.c:7264
 msgid "Auth host"
 msgstr "认证主机"
 
-#: src/protocols/oscar/oscar.c:7251
+#: src/protocols/oscar/oscar.c:7269
 msgid "Auth port"
 msgstr "认证端口"
 
@@ -8322,32 +8371,32 @@
 msgstr "设定聊天密码"
 
 #: src/protocols/silc/buddy.c:506 src/protocols/silc/buddy.c:541
-#: src/protocols/silc/ops.c:1080 src/protocols/silc/ops.c:1091
+#: src/protocols/silc/ops.c:1256 src/protocols/silc/ops.c:1267
 msgid "Get Public Key"
 msgstr "获取公钥"
 
-#: src/protocols/silc/buddy.c:542 src/protocols/silc/ops.c:1081
-#: src/protocols/silc/ops.c:1092
+#: src/protocols/silc/buddy.c:542 src/protocols/silc/ops.c:1257
+#: src/protocols/silc/ops.c:1268
 msgid "Cannot fetch the public key"
 msgstr "无法获取公钥"
 
-#: src/protocols/silc/buddy.c:629 src/protocols/silc/buddy.c:1619
+#: src/protocols/silc/buddy.c:629 src/protocols/silc/buddy.c:1544
 msgid "Show Public Key"
 msgstr "显示公钥"
 
 #: src/protocols/silc/buddy.c:630 src/protocols/silc/buddy.c:989
-#: src/protocols/silc/chat.c:219
+#: src/protocols/silc/chat.c:222
 msgid "Could not load public key"
 msgstr "无法装入公钥"
 
-#: src/protocols/silc/buddy.c:707 src/protocols/silc/ops.c:837
-#: src/protocols/silc/ops.c:908 src/protocols/silc/ops.c:991
-#: src/protocols/silc/ops.c:992 src/protocols/silc/ops.c:998
-#: src/protocols/silc/ops.c:999
+#: src/protocols/silc/buddy.c:707 src/protocols/silc/ops.c:853
+#: src/protocols/silc/ops.c:925 src/protocols/silc/ops.c:1060
+#: src/protocols/silc/ops.c:1061 src/protocols/silc/ops.c:1079
 msgid "User Information"
 msgstr "用户信息"
 
-#: src/protocols/silc/buddy.c:708 src/protocols/silc/ops.c:909
+#: src/protocols/silc/buddy.c:708 src/protocols/silc/ops.c:926
+#: src/protocols/silc/ops.c:1080
 msgid "Cannot get user information"
 msgstr "无法获取用户信息"
 
@@ -8364,6 +8413,11 @@
 "除非您导入好友的公钥,否则您无法收到好友通知。您可以使用获取公钥命令来获取公"
 "钥。"
 
+#. Open file selector to select the public key.
+#: src/protocols/silc/buddy.c:1023
+msgid "Open..."
+msgstr "打开..."
+
 #: src/protocols/silc/buddy.c:1032
 #, c-format
 msgid "The %s buddy is not present in the network"
@@ -8420,143 +8474,111 @@
 msgid "Robot"
 msgstr "机器人"
 
-#: src/protocols/silc/buddy.c:1396 src/protocols/silc/buddy.c:1464
-#: src/protocols/silc/silc.c:606
+#: src/protocols/silc/buddy.c:1396 src/protocols/silc/silc.c:610
+#: src/protocols/silc/util.c:469
 msgid "Happy"
 msgstr "高兴"
 
-#: src/protocols/silc/buddy.c:1398 src/protocols/silc/buddy.c:1466
-#: src/protocols/silc/silc.c:608
+#: src/protocols/silc/buddy.c:1398 src/protocols/silc/silc.c:612
+#: src/protocols/silc/util.c:471
 msgid "Sad"
 msgstr "郁闷"
 
-#: src/protocols/silc/buddy.c:1400 src/protocols/silc/buddy.c:1468
-#: src/protocols/silc/silc.c:610
+#: src/protocols/silc/buddy.c:1400 src/protocols/silc/silc.c:614
+#: src/protocols/silc/util.c:473
 msgid "Angry"
 msgstr "生气"
 
-#: src/protocols/silc/buddy.c:1402 src/protocols/silc/buddy.c:1470
-#: src/protocols/silc/silc.c:612
+#: src/protocols/silc/buddy.c:1402 src/protocols/silc/silc.c:616
+#: src/protocols/silc/util.c:475
 msgid "Jealous"
 msgstr "警惕"
 
-#: src/protocols/silc/buddy.c:1404 src/protocols/silc/buddy.c:1472
-#: src/protocols/silc/silc.c:614
+#: src/protocols/silc/buddy.c:1404 src/protocols/silc/silc.c:618
+#: src/protocols/silc/util.c:477
 msgid "Ashamed"
 msgstr "害羞"
 
-#: src/protocols/silc/buddy.c:1406 src/protocols/silc/buddy.c:1474
-#: src/protocols/silc/silc.c:616
+#: src/protocols/silc/buddy.c:1406 src/protocols/silc/silc.c:620
+#: src/protocols/silc/util.c:479
 msgid "Invincible"
 msgstr "无敌"
 
-#: src/protocols/silc/buddy.c:1408 src/protocols/silc/buddy.c:1476
-#: src/protocols/silc/silc.c:618
+#: src/protocols/silc/buddy.c:1408 src/protocols/silc/silc.c:622
+#: src/protocols/silc/util.c:481
 msgid "In Love"
 msgstr "热恋"
 
-#: src/protocols/silc/buddy.c:1410 src/protocols/silc/buddy.c:1478
-#: src/protocols/silc/silc.c:620
+#: src/protocols/silc/buddy.c:1410 src/protocols/silc/silc.c:624
+#: src/protocols/silc/util.c:483
 msgid "Sleepy"
 msgstr "打盹"
 
-#: src/protocols/silc/buddy.c:1412 src/protocols/silc/buddy.c:1480
-#: src/protocols/silc/silc.c:622
+#: src/protocols/silc/buddy.c:1412 src/protocols/silc/silc.c:626
+#: src/protocols/silc/util.c:485
 msgid "Bored"
 msgstr "枯燥"
 
-#: src/protocols/silc/buddy.c:1414 src/protocols/silc/buddy.c:1482
-#: src/protocols/silc/silc.c:624
+#: src/protocols/silc/buddy.c:1414 src/protocols/silc/silc.c:628
+#: src/protocols/silc/util.c:487
 msgid "Excited"
 msgstr "激动"
 
-#: src/protocols/silc/buddy.c:1416 src/protocols/silc/buddy.c:1484
-#: src/protocols/silc/silc.c:626
+#: src/protocols/silc/buddy.c:1416 src/protocols/silc/silc.c:630
+#: src/protocols/silc/util.c:489
 msgid "Anxious"
 msgstr "饥渴"
 
-#: src/protocols/silc/buddy.c:1452
-msgid "Modes"
-msgstr "模式"
-
-#: src/protocols/silc/buddy.c:1462
+#: src/protocols/silc/buddy.c:1448 src/protocols/silc/ops.c:962
+msgid "User Modes"
+msgstr "用户模式"
+
+#: src/protocols/silc/buddy.c:1457 src/protocols/silc/ops.c:971
 msgid "Mood"
 msgstr "心情"
 
-#: src/protocols/silc/buddy.c:1490
+#: src/protocols/silc/buddy.c:1461 src/protocols/silc/ops.c:977
 msgid "Status Text"
 msgstr "状态文本"
 
-#: src/protocols/silc/buddy.c:1495
+#: src/protocols/silc/buddy.c:1466 src/protocols/silc/ops.c:983
 msgid "Preferred Contact"
 msgstr "首选联系人"
 
-#: src/protocols/silc/buddy.c:1503
-msgid "Paging"
-msgstr "寻呼"
-
-#: src/protocols/silc/buddy.c:1505 src/protocols/silc/silc.c:637
-msgid "SMS"
-msgstr "短信"
-
-#: src/protocols/silc/buddy.c:1507 src/protocols/silc/silc.c:639
-msgid "MMS"
-msgstr "彩信"
-
-#: src/protocols/silc/buddy.c:1509 src/protocols/silc/silc.c:641
-msgid "Video Conferencing"
-msgstr "视频会议"
-
-#: src/protocols/silc/buddy.c:1515
+#: src/protocols/silc/buddy.c:1471 src/protocols/silc/ops.c:988
 msgid "Preferred Language"
 msgstr "首选语言"
 
-#: src/protocols/silc/buddy.c:1520
+#: src/protocols/silc/buddy.c:1476 src/protocols/silc/ops.c:993
 msgid "Device"
 msgstr "设备"
 
-#: src/protocols/silc/buddy.c:1522
-msgid "Computer"
-msgstr "计算机"
-
-#: src/protocols/silc/buddy.c:1526
-msgid "PDA"
-msgstr "PDA"
-
-#: src/protocols/silc/buddy.c:1528
-msgid "Terminal"
-msgstr "终端"
-
-#: src/protocols/silc/buddy.c:1539 src/protocols/silc/silc.c:674
-#: src/protocols/silc/silc.c:676
+#: src/protocols/silc/buddy.c:1481 src/protocols/silc/ops.c:998
+#: src/protocols/silc/silc.c:678 src/protocols/silc/silc.c:680
 msgid "Timezone"
 msgstr "时区"
 
-#: src/protocols/silc/buddy.c:1545
+#: src/protocols/silc/buddy.c:1486 src/protocols/silc/ops.c:1003
 msgid "Geolocation"
 msgstr "地理位置"
 
-#: src/protocols/silc/buddy.c:1604
+#: src/protocols/silc/buddy.c:1529
 msgid "Reset IM Key"
 msgstr "重置聊天密钥"
 
-#: src/protocols/silc/buddy.c:1609
+#: src/protocols/silc/buddy.c:1534
 msgid "IM with Key Exchange"
 msgstr "带密钥交换开聊"
 
-#: src/protocols/silc/buddy.c:1613
+#: src/protocols/silc/buddy.c:1538
 msgid "IM with Password"
 msgstr "带密码开聊"
 
-#: src/protocols/silc/buddy.c:1624
+#: src/protocols/silc/buddy.c:1549
 msgid "Get Public Key..."
 msgstr "获取公钥..."
 
-#: src/protocols/silc/buddy.c:1629
-msgid "Send File..."
-msgstr "发送文件..."
-
-#: src/protocols/silc/buddy.c:1634 src/protocols/silc/ops.c:1127
+#: src/protocols/silc/buddy.c:1555 src/protocols/silc/ops.c:1389
 msgid "Kill User"
 msgstr "杀死用户"
 
@@ -8569,8 +8591,7 @@
 msgid "Channel %s does not exist in the network"
 msgstr "频道 %s 不在网络中"
 
-#: src/protocols/silc/chat.c:67 src/protocols/silc/chat.c:154
-#: src/protocols/silc/chat.c:155
+#: src/protocols/silc/chat.c:67 src/protocols/silc/chat.c:159
 msgid "Channel Information"
 msgstr "频道信息"
 
@@ -8578,86 +8599,68 @@
 msgid "Cannot get channel information"
 msgstr "无法获取频道信息信息"
 
-#: src/protocols/silc/chat.c:104
-#, c-format
-msgid "Channel Name:\t\t%s\n"
-msgstr "频道名称:\t%s\n"
-
-#: src/protocols/silc/chat.c:106
-#, c-format
-msgid "User Count:\t\t%d\n"
-msgstr "用户计数:\t%d\n"
-
-#: src/protocols/silc/chat.c:112
-#, c-format
-msgid "Channel Founder:\t%s\n"
-msgstr "频道创建人:\t%s\n"
-
-#: src/protocols/silc/chat.c:120
-#, c-format
-msgid "Channel Cipher:\t\t%s\n"
-msgstr "频道密码句:\t%s\n"
-
-#: src/protocols/silc/chat.c:123
-#, c-format
-msgid "Channel HMAC:\t\t%s\n"
-msgstr "频道 HMAC:\t%s\n"
+#: src/protocols/silc/chat.c:105
+#, c-format
+msgid "<b>Channel Name:</b> %s"
+msgstr "<b>频道名称:</b> %s"
+
+#: src/protocols/silc/chat.c:108
+#, c-format
+msgid "<br><b>User Count:</b> %d"
+msgstr "<br><b>用户数:</b> %d"
+
+#: src/protocols/silc/chat.c:115
+#, c-format
+msgid "<br><b>Channel Founder:</b> %s"
+msgstr "<br><b>频道创建人:</b> %s"
+
+#: src/protocols/silc/chat.c:124
+#, c-format
+msgid "<br><b>Channel Cipher:</b> %s"
+msgstr "<br><b>频道密码句:</b> %s"
 
 #: src/protocols/silc/chat.c:127
 #, c-format
-msgid ""
-"\n"
-"Channel Topic:\n"
-"\t%s\n"
-msgstr ""
-"\n"
-"频道主题:\n"
-"\t%s\n"
-
-#: src/protocols/silc/chat.c:130
-msgid ""
-"\n"
-"Channel Modes:\n"
-msgstr "\n频道模式:\n"
-
-#: src/protocols/silc/chat.c:144
-#, c-format
-msgid ""
-"\n"
-"Founder Key Fingerprint:\n"
-"%s\n"
-"\n"
-msgstr ""
-"\n"
-"创建者密钥指纹:\n"
-"%s\n"
-"\n"
-
-#: src/protocols/silc/chat.c:145
-#, c-format
-msgid ""
-"Founder Key Babbleprint:\n"
-"%s"
-msgstr "创建者密钥漏印:\n%s"
-
-#: src/protocols/silc/chat.c:218
+msgid "<br><b>Channel HMAC:</b> %s"
+msgstr "<br><b>频道 HMAC:</b> %s"
+
+#: src/protocols/silc/chat.c:132
+#, c-format
+msgid "<br><b>Channel Topic:</b><br>%s"
+msgstr "<br><b>频道话题:</b><br>%s"
+
+#: src/protocols/silc/chat.c:137
+msgid "<br><b>Channel Modes:</b> "
+msgstr "<br><b>频道模式:</b> "
+
+#: src/protocols/silc/chat.c:150
+#, c-format
+msgid "<br><b>Founder Key Fingerprint:</b><br>%s"
+msgstr "<br><b>创建者密钥指纹:</b><br%s"
+
+#: src/protocols/silc/chat.c:151
+#, c-format
+msgid "<br><b>Founder Key Babbleprint:</b><br>%s"
+msgstr "<br><b>创建者密钥漏印:</b><br>%s"
+
+#: src/protocols/silc/chat.c:221
 msgid "Add Channel Public Key"
 msgstr "添加频道公钥"
 
 #. Add new public key
-#: src/protocols/silc/chat.c:273
+#: src/protocols/silc/chat.c:276
 msgid "Open Public Key..."
 msgstr "打开公钥..."
 
-#: src/protocols/silc/chat.c:382
+#: src/protocols/silc/chat.c:385
 msgid "Channel Passphrase"
 msgstr "频道密码句"
 
-#: src/protocols/silc/chat.c:389
+#: src/protocols/silc/chat.c:392
 msgid "Channel Public Keys List"
 msgstr "频道公钥列表"
 
-#: src/protocols/silc/chat.c:394
+#: src/protocols/silc/chat.c:397
 msgid ""
 "Channel authentication is used to secure the channel from unauthorized "
 "access. The authentication may be based on passphrase and digital "
@@ -8669,122 +8672,122 @@
 "如果设定了密码句,那么需要提供密码句才能加入。如果设定了频道公钥,那么只有那"
 "些公钥已经列出的用户才能加入。"
 
-#: src/protocols/silc/chat.c:403 src/protocols/silc/chat.c:404
-#: src/protocols/silc/chat.c:441 src/protocols/silc/chat.c:442
-#: src/protocols/silc/chat.c:871
+#: src/protocols/silc/chat.c:406 src/protocols/silc/chat.c:407
+#: src/protocols/silc/chat.c:444 src/protocols/silc/chat.c:445
+#: src/protocols/silc/chat.c:874
 msgid "Channel Authentication"
 msgstr "频道认证"
 
-#: src/protocols/silc/chat.c:405 src/protocols/silc/chat.c:443
+#: src/protocols/silc/chat.c:408 src/protocols/silc/chat.c:446
 msgid "Add / Remove"
 msgstr "添加/删除"
 
-#: src/protocols/silc/chat.c:560
+#: src/protocols/silc/chat.c:563
 msgid "Group Name"
 msgstr "组名称"
 
-#: src/protocols/silc/chat.c:564 src/protocols/silc/ops.c:1403
+#: src/protocols/silc/chat.c:567 src/protocols/silc/ops.c:1669
 msgid "Passphrase"
 msgstr "密码句"
 
-#: src/protocols/silc/chat.c:575
+#: src/protocols/silc/chat.c:578
 #, c-format
 msgid "Please enter the %s channel private group name and passphrase."
 msgstr "请输入 %s 频道私有组的名称和密码句。"
 
-#: src/protocols/silc/chat.c:577
+#: src/protocols/silc/chat.c:580
 msgid "Add Channel Private Group"
 msgstr "添加频道私有组"
 
-#: src/protocols/silc/chat.c:704
+#: src/protocols/silc/chat.c:707
 msgid "User Limit"
 msgstr "允许限制"
 
-#: src/protocols/silc/chat.c:705
+#: src/protocols/silc/chat.c:708
 msgid "Set user limit on channel. Set to zero to reset user limit."
 msgstr "设定频道的用户限制。设为 0 将重置用户限制。"
 
-#: src/protocols/silc/chat.c:847
+#: src/protocols/silc/chat.c:850
 msgid "Get Info"
 msgstr "信息"
 
-#: src/protocols/silc/chat.c:854
+#: src/protocols/silc/chat.c:857
 msgid "Invite List"
 msgstr "邀请列表"
 
-#: src/protocols/silc/chat.c:858
+#: src/protocols/silc/chat.c:861
 msgid "Ban List"
 msgstr "屏蔽列表"
 
-#: src/protocols/silc/chat.c:865
+#: src/protocols/silc/chat.c:868
 msgid "Add Private Group"
 msgstr "添加私有组"
 
-#: src/protocols/silc/chat.c:876
+#: src/protocols/silc/chat.c:879
 msgid "Reset Permanent"
 msgstr "重置永久"
 
-#: src/protocols/silc/chat.c:880
+#: src/protocols/silc/chat.c:883
 msgid "Set Permanent"
 msgstr "设置永久"
 
-#: src/protocols/silc/chat.c:887
+#: src/protocols/silc/chat.c:890
 msgid "Set User Limit"
 msgstr "设置用户限制"
 
-#: src/protocols/silc/chat.c:892
+#: src/protocols/silc/chat.c:895
 msgid "Reset Topic Restriction"
 msgstr "重置话题限制"
 
-#: src/protocols/silc/chat.c:896
+#: src/protocols/silc/chat.c:899
 msgid "Set Topic Restriction"
 msgstr "设定话题限制"
 
-#: src/protocols/silc/chat.c:902
+#: src/protocols/silc/chat.c:905
 msgid "Reset Private Channel"
 msgstr "重置私有频道"
 
-#: src/protocols/silc/chat.c:906
+#: src/protocols/silc/chat.c:909
 msgid "Set Private Channel"
 msgstr "设定私有频道"
 
-#: src/protocols/silc/chat.c:912
+#: src/protocols/silc/chat.c:915
 msgid "Reset Secret Channel"
 msgstr "重置绝密频道"
 
-#: src/protocols/silc/chat.c:916
+#: src/protocols/silc/chat.c:919
 msgid "Set Secret Channel"
 msgstr "设定绝密频道"
 
-#: src/protocols/silc/chat.c:986
+#: src/protocols/silc/chat.c:989
 #, c-format
 msgid "You are channel founder on <I>%s</I>"
 msgstr "您是 <I>%s</I> 的频道建立者"
 
-#: src/protocols/silc/chat.c:990
+#: src/protocols/silc/chat.c:993
 #, c-format
 msgid "Channel founder on <I>%s</I> is <I>%s</I>"
 msgstr "<I>%s</I> 的频道建立者是 <I>%s</I>"
 
-#: src/protocols/silc/chat.c:1040
+#: src/protocols/silc/chat.c:1046
 #, c-format
 msgid ""
 "You have to join the %s channel before you are able to join the private group"
 msgstr "在您加入私有组之前,必须先加入 %s 频道"
 
-#: src/protocols/silc/chat.c:1042
+#: src/protocols/silc/chat.c:1048
 msgid "Join Private Group"
 msgstr "加入私有组"
 
-#: src/protocols/silc/chat.c:1043
+#: src/protocols/silc/chat.c:1049
 msgid "Cannot join private group"
 msgstr "无法加入私有组"
 
-#: src/protocols/silc/chat.c:1225 src/protocols/silc/silc.c:875
+#: src/protocols/silc/chat.c:1242 src/protocols/silc/silc.c:888
 msgid "Cannot call command"
 msgstr "无法调用命令"
 
-#: src/protocols/silc/chat.c:1226 src/protocols/silc/silc.c:876
+#: src/protocols/silc/chat.c:1243 src/protocols/silc/silc.c:889
 msgid "Unknown command"
 msgstr "未知命令"
 
@@ -8834,221 +8837,275 @@
 msgid "Cannot send file"
 msgstr "无法发送文件"
 
-#: src/protocols/silc/ops.c:324 src/protocols/silc/ops.c:331
-#: src/protocols/silc/ops.c:338
+#: src/protocols/silc/ops.c:333 src/protocols/silc/ops.c:342
+#: src/protocols/silc/ops.c:351
 #, c-format
 msgid "%s has changed the topic of <I>%s</I> to: %s"
 msgstr "%s 已经将 <I>%s</I> 的话题改为: %s"
 
-#: src/protocols/silc/ops.c:398
+#: src/protocols/silc/ops.c:413
 #, c-format
 msgid "<I>%s</I> set channel <I>%s</I> modes to: %s"
 msgstr "<I>%s</I> 已经将频道 <I>%s</I> 的模式设定为: %s"
 
-#: src/protocols/silc/ops.c:402
+#: src/protocols/silc/ops.c:417
 #, c-format
 msgid "<I>%s</I> removed all channel <I>%s</I> modes"
 msgstr "<I>%s</I> 删除了频道 <I>%s</I> 的全部模式"
 
-#: src/protocols/silc/ops.c:433
+#: src/protocols/silc/ops.c:448
 #, c-format
 msgid "<I>%s</I> set <I>%s's</I> modes to: %s"
 msgstr "<I>%s</I> 将 <I>%s</I> 的模式设定为: %s"
 
-#: src/protocols/silc/ops.c:437
+#: src/protocols/silc/ops.c:452
 #, c-format
 msgid "<I>%s</I> removed all <I>%s's</I> modes"
 msgstr "<I>%s</I> 删除了 <I>%s</I> 的全部模式"
 
-#: src/protocols/silc/ops.c:464
+#: src/protocols/silc/ops.c:479
 #, c-format
 msgid "You have been kicked off <I>%s</I> by <I>%s</I> (%s)"
 msgstr "您被 <I>%2$s</I> (%3$s) 从 <I>%1$s</I> 踢出了"
 
-#: src/protocols/silc/ops.c:494 src/protocols/silc/ops.c:499
-#: src/protocols/silc/ops.c:504
+#: src/protocols/silc/ops.c:509 src/protocols/silc/ops.c:514
+#: src/protocols/silc/ops.c:519
 #, c-format
 msgid "You have been killed by %s (%s)"
 msgstr "您被 %s (%s) 杀死了"
 
-#: src/protocols/silc/ops.c:525 src/protocols/silc/ops.c:530
-#: src/protocols/silc/ops.c:535
+#: src/protocols/silc/ops.c:540 src/protocols/silc/ops.c:545
+#: src/protocols/silc/ops.c:550
 #, c-format
 msgid "Killed by %s (%s)"
 msgstr "被 %s (%s) 杀死"
 
-#: src/protocols/silc/ops.c:581
+#: src/protocols/silc/ops.c:596
 msgid "Server signoff"
 msgstr "服务器登出"
 
-#: src/protocols/silc/ops.c:767
+#: src/protocols/silc/ops.c:783
 msgid "Personal Information"
 msgstr "个人信息"
 
-#: src/protocols/silc/ops.c:790
+#: src/protocols/silc/ops.c:806
 msgid "Birth Day"
 msgstr "生日"
 
-#: src/protocols/silc/ops.c:794
+#: src/protocols/silc/ops.c:810
 msgid "Job Title"
 msgstr "职称"
 
-#: src/protocols/silc/ops.c:798
+#: src/protocols/silc/ops.c:814
 msgid "Job Role"
 msgstr "职位"
 
-#: src/protocols/silc/ops.c:802
+#: src/protocols/silc/ops.c:818
 msgid "Organization"
 msgstr "组织"
 
-#: src/protocols/silc/ops.c:806
+#: src/protocols/silc/ops.c:822
 msgid "Unit"
 msgstr "单元"
 
-#: src/protocols/silc/ops.c:825
+#: src/protocols/silc/ops.c:841
 msgid "EMail"
 msgstr "电子邮件"
 
-#: src/protocols/silc/ops.c:830
+#: src/protocols/silc/ops.c:846
 msgid "Note"
 msgstr "备注"
 
-#: src/protocols/silc/ops.c:878
+#: src/protocols/silc/ops.c:894
 msgid "Join Chat"
 msgstr "加入聊天"
 
-#: src/protocols/silc/ops.c:933
-msgid "Hostname"
-msgstr "主机名"
-
-#: src/protocols/silc/ops.c:940
-msgid "User Mode"
-msgstr "用户模式"
-
-#: src/protocols/silc/ops.c:954
-msgid "Channels"
-msgstr "频道"
-
-#: src/protocols/silc/ops.c:981
+#: src/protocols/silc/ops.c:1050 src/protocols/silc/ops.c:1120
 msgid "Public Key Fingerprint"
 msgstr "公钥指纹"
 
-#: src/protocols/silc/ops.c:982
+#: src/protocols/silc/ops.c:1051 src/protocols/silc/ops.c:1121
 msgid "Public Key Babbleprint"
 msgstr "公钥漏印"
 
-#: src/protocols/silc/ops.c:995
+#: src/protocols/silc/ops.c:1064
 msgid "More..."
 msgstr "更多..."
 
-#: src/protocols/silc/ops.c:1006 src/protocols/silc/silc.c:770
+#: src/protocols/silc/ops.c:1135 src/protocols/silc/silc.c:777
 msgid "Detach From Server"
 msgstr "与服务器脱离"
 
-#: src/protocols/silc/ops.c:1006
+#: src/protocols/silc/ops.c:1135
 msgid "Cannot detach"
 msgstr "无法脱离"
 
-#: src/protocols/silc/ops.c:1017
+#: src/protocols/silc/ops.c:1146
 msgid "Cannot set topic"
 msgstr "无法设定话题"
 
-#: src/protocols/silc/ops.c:1045
+#: src/protocols/silc/ops.c:1184
+msgid "Failed to change nickname"
+msgstr "更改昵称失败"
+
+#: src/protocols/silc/ops.c:1221
 msgid "Roomlist"
 msgstr "房间列表"
 
-#: src/protocols/silc/ops.c:1045
+#: src/protocols/silc/ops.c:1221
 msgid "Cannot get room list"
 msgstr "无法获取房间列表"
 
-#: src/protocols/silc/ops.c:1093
+#: src/protocols/silc/ops.c:1269
 msgid "No public key was received"
 msgstr "没有收到公钥"
 
-#: src/protocols/silc/ops.c:1106 src/protocols/silc/ops.c:1119
-#: src/protocols/silc/ops.c:1120
+#: src/protocols/silc/ops.c:1282 src/protocols/silc/ops.c:1296
 msgid "Server Information"
 msgstr "服务器信息"
 
-#: src/protocols/silc/ops.c:1107
+#: src/protocols/silc/ops.c:1283
 msgid "Cannot get server information"
 msgstr "无法获取服务器信息"
 
-#: src/protocols/silc/ops.c:1128
+#: src/protocols/silc/ops.c:1314 src/protocols/silc/ops.c:1323
+msgid "Server Statistics"
+msgstr "服务器统计"
+
+#: src/protocols/silc/ops.c:1315
+msgid "Cannot get server statistics"
+msgstr "无法获取服务器统计"
+
+#: src/protocols/silc/ops.c:1324
+msgid "No server statisitics available"
+msgstr "没有可用的服务器统计"
+
+#: src/protocols/silc/ops.c:1346
+#, c-format
+msgid ""
+"Local server start time: %s\n"
+"Local server uptime: %s\n"
+"Local server clients: %d\n"
+"Local server channels: %d\n"
+"Local server operators: %d\n"
+"Local router operators: %d\n"
+"Local cell clients: %d\n"
+"Local cell channels: %d\n"
+"Local cell servers: %d\n"
+"Total clients: %d\n"
+"Total channels: %d\n"
+"Total servers: %d\n"
+"Total routers: %d\n"
+"Total server operators: %d\n"
+"Total router operators: %d\n"
+msgstr ""
+"本地服务器启动时间: %s\n"
+"本地服务器运行时间: %s\n"
+"本地服务器客户数: %d\n"
+"本地服务器频道数: %d\n"
+"本地服务器管理员: %d\n"
+"本地路由器管理员: %d\n"
+"本地单元客户数: %d\n"
+"本地单元频道数: %d\n"
+"本地单元服务器数: %d\n"
+"总计客户数: %d\n"
+"总计频道数: %d\n"
+"总计服务器数: %d\n"
+"总计路由器数: %d\n"
+"总计服务器管理员数: %d\n"
+"总计路由器管理员数: %d\n"
+
+#: src/protocols/silc/ops.c:1369
+msgid "Network Statistics"
+msgstr "网络统计"
+
+#: src/protocols/silc/ops.c:1377 src/protocols/silc/ops.c:1382
+msgid "Ping"
+msgstr "Ping"
+
+#: src/protocols/silc/ops.c:1377
+msgid "Ping failed"
+msgstr "Ping 失败"
+
+#: src/protocols/silc/ops.c:1382
+msgid "Ping reply received from server"
+msgstr "服务器对 ping 的响应"
+
+#: src/protocols/silc/ops.c:1390
 msgid "Could not kill user"
 msgstr "无法杀死用户"
 
-#: src/protocols/silc/ops.c:1205
+#: src/protocols/silc/ops.c:1471
 msgid "Error during connecting to SILC Server"
 msgstr "连接到 SILC 服务器时出错"
 
-#: src/protocols/silc/ops.c:1210
+#: src/protocols/silc/ops.c:1476
 msgid "Key Exchange failed"
 msgstr "密钥交换失败"
 
-#: src/protocols/silc/ops.c:1219
+#: src/protocols/silc/ops.c:1485
 msgid ""
 "Resuming detached session failed. Press Reconnect to create new connection."
 msgstr "恢复脱离的会话失败。请按[重新连接]以创建新连接。"
 
-#: src/protocols/silc/ops.c:1254
+#: src/protocols/silc/ops.c:1520
 msgid "Disconnected by server"
 msgstr "服务器断开连接"
 
-#: src/protocols/silc/ops.c:1314 src/protocols/silc/ops.c:1361
+#: src/protocols/silc/ops.c:1580 src/protocols/silc/ops.c:1627
 #: src/protocols/silc/silc.c:167
 msgid "Resuming session"
 msgstr "恢复会话"
 
-#: src/protocols/silc/ops.c:1316
+#: src/protocols/silc/ops.c:1582
 msgid "Authenticating connection"
 msgstr "身份验证连接"
 
-#: src/protocols/silc/ops.c:1363
+#: src/protocols/silc/ops.c:1629
 msgid "Verifying server public key"
 msgstr "校验服务器公钥"
 
-#: src/protocols/silc/ops.c:1404
+#: src/protocols/silc/ops.c:1670
 msgid "Passphrase required"
 msgstr "请求密码句"
 
-#: src/protocols/silc/ops.c:1433
+#: src/protocols/silc/ops.c:1699
 msgid "Failure: Version mismatch, upgrade your client"
 msgstr "失败: 版本不匹配,请升级您的客户端"
 
-#: src/protocols/silc/ops.c:1436
+#: src/protocols/silc/ops.c:1702
 msgid "Failure: Remote does not trust/support your public key"
 msgstr "失败: 远程不信任或不支持您的公钥"
 
-#: src/protocols/silc/ops.c:1439
+#: src/protocols/silc/ops.c:1705
 msgid "Failure: Remote does not support proposed KE group"
 msgstr "失败: 远程不支持提议的 KE 组"
 
-#: src/protocols/silc/ops.c:1442
+#: src/protocols/silc/ops.c:1708
 msgid "Failure: Remote does not support proposed cipher"
 msgstr "失败: 远程不支持提议的密码算法"
 
-#: src/protocols/silc/ops.c:1445
+#: src/protocols/silc/ops.c:1711
 msgid "Failure: Remote does not support proposed PKCS"
 msgstr "失败: 远程不支持提议的 PKCS"
 
-#: src/protocols/silc/ops.c:1448
+#: src/protocols/silc/ops.c:1714
 msgid "Failure: Remote does not support proposed hash function"
 msgstr "失败: 远程不支持提议的散列函数"
 
-#: src/protocols/silc/ops.c:1451
+#: src/protocols/silc/ops.c:1717
 msgid "Failure: Remote does not support proposed HMAC"
 msgstr "失败: 远程不支持 HMAC"
 
-#: src/protocols/silc/ops.c:1453
+#: src/protocols/silc/ops.c:1719
 msgid "Failure: Incorrect signature"
 msgstr "失败: 签名不正确"
 
-#: src/protocols/silc/ops.c:1455
+#: src/protocols/silc/ops.c:1721
 msgid "Failure: Invalid cookie"
 msgstr "失败: 无效的 cookie"
 
-#: src/protocols/silc/ops.c:1466
+#: src/protocols/silc/ops.c:1732
 msgid "Failure: Authentication failed"
 msgstr "失败: 身份验证失败"
 
@@ -9110,15 +9167,15 @@
 msgid "Connecting to SILC Server"
 msgstr "连接到 SILC 服务器"
 
-#: src/protocols/silc/silc.c:602
+#: src/protocols/silc/silc.c:606
 msgid "Your Current Mood"
 msgstr "您目前的心情"
 
-#: src/protocols/silc/silc.c:604
+#: src/protocols/silc/silc.c:608
 msgid "Normal"
 msgstr "普通"
 
-#: src/protocols/silc/silc.c:629
+#: src/protocols/silc/silc.c:633
 msgid ""
 "\n"
 "Your Preferred Contact Methods"
@@ -9126,31 +9183,43 @@
 "\n"
 "您首选的联系方式"
 
-#: src/protocols/silc/silc.c:646
+#: src/protocols/silc/silc.c:641 src/protocols/silc/util.c:514
+msgid "SMS"
+msgstr "短信"
+
+#: src/protocols/silc/silc.c:643 src/protocols/silc/util.c:516
+msgid "MMS"
+msgstr "彩信"
+
+#: src/protocols/silc/silc.c:645 src/protocols/silc/util.c:518
+msgid "Video Conferencing"
+msgstr "视频会议"
+
+#: src/protocols/silc/silc.c:650
 msgid "Your Current Status"
 msgstr "您的当前状态"
 
-#: src/protocols/silc/silc.c:653
+#: src/protocols/silc/silc.c:657
 msgid "Online Services"
 msgstr "在线服务"
 
-#: src/protocols/silc/silc.c:656
+#: src/protocols/silc/silc.c:660
 msgid "Let others see what services you are using"
 msgstr "让其它人看到您正在使用何种服务"
 
-#: src/protocols/silc/silc.c:662
+#: src/protocols/silc/silc.c:666
 msgid "Let others see what computer you are using"
 msgstr "让其它人看到您正在使用哪台计算机"
 
-#: src/protocols/silc/silc.c:669
+#: src/protocols/silc/silc.c:673
 msgid "Your VCard File"
 msgstr "您的 VCard 文件"
 
-#: src/protocols/silc/silc.c:682 src/protocols/silc/silc.c:683
+#: src/protocols/silc/silc.c:686 src/protocols/silc/silc.c:687
 msgid "User Online Status Attributes"
 msgstr "用户在线状态属性"
 
-#: src/protocols/silc/silc.c:684
+#: src/protocols/silc/silc.c:688
 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 "
@@ -9159,113 +9228,226 @@
 "您可以让其它用户看到您的在线状态信息以及您的个人信息。请填入您想要其它用户看"
 "到的有关您自己的信息。"
 
-#: src/protocols/silc/silc.c:723 src/protocols/silc/silc.c:728
-#: src/protocols/silc/silc.c:1096 src/protocols/silc/silc.c:1101
+#: src/protocols/silc/silc.c:728 src/protocols/silc/silc.c:734
+#: src/protocols/silc/silc.c:1135
 msgid "Message of the Day"
 msgstr "每日消息"
 
-#: src/protocols/silc/silc.c:723 src/protocols/silc/silc.c:1096
+#: src/protocols/silc/silc.c:728
 msgid "No Message of the Day available"
 msgstr "没有可用的每日消息"
 
-#: src/protocols/silc/silc.c:724 src/protocols/silc/silc.c:1097
+#: src/protocols/silc/silc.c:729 src/protocols/silc/silc.c:1130
 msgid "There is no Message of the Day associated with this connection"
 msgstr "没有与此连接关联的每日消息"
 
-#: src/protocols/silc/silc.c:765
+#: src/protocols/silc/silc.c:772
 msgid "Online Status"
 msgstr "在线状态"
 
-#: src/protocols/silc/silc.c:774
+#: src/protocols/silc/silc.c:781
 msgid "View Message of the Day"
 msgstr "查看每日消息"
 
-#: src/protocols/silc/silc.c:846
+#: src/protocols/silc/silc.c:853
 #, c-format
 msgid "User <I>%s</I> is not present in the network"
 msgstr "用户 <I>%s</I> 未出现于网络中"
 
-#: src/protocols/silc/silc.c:1159
-msgid "part:  Leave the chat"
-msgstr "part: 离开聊天"
-
-#: src/protocols/silc/silc.c:1162
-msgid "leave:  Leave the chat"
-msgstr "leave: 离开聊天"
-
-#: src/protocols/silc/silc.c:1166
+#: src/protocols/silc/silc.c:962
+msgid "Failed to leave channel"
+msgstr "离开频道失败"
+
+#: src/protocols/silc/silc.c:1006
+msgid "Topic too long"
+msgstr "话题太长"
+
+#: src/protocols/silc/silc.c:1087
+msgid "You must specify a nick"
+msgstr "您必须指定昵称"
+
+#: src/protocols/silc/silc.c:1189
+#, c-format
+msgid "channel %s not found"
+msgstr "频道 %s 未找到"
+
+#: src/protocols/silc/silc.c:1194
+#, c-format
+msgid "channel modes for %s: %s"
+msgstr "%s 的频道模式: %s"
+
+#: src/protocols/silc/silc.c:1196
+#, c-format
+msgid "no channel modes are set on %s"
+msgstr "%s 未设置频道模式"
+
+#: src/protocols/silc/silc.c:1209
+#, c-format
+msgid "Failed to set cmodes for %s"
+msgstr "为 %s 设置频道模式失败"
+
+#: src/protocols/silc/silc.c:1239
+#, c-format
+msgid "Unknown command: %s, (may be a Gaim bug)"
+msgstr "未知命令: %s,(可能是 Gaim bug)"
+
+#: src/protocols/silc/silc.c:1302
+msgid "part [channel]:  Leave the chat"
+msgstr "part [频道]: 离开聊天"
+
+#: src/protocols/silc/silc.c:1306
+msgid "leave [channel]:  Leave the chat"
+msgstr "leave [频道]: 离开聊天"
+
+#: src/protocols/silc/silc.c:1310
 msgid "topic [&lt;new topic&gt;]:  View or change the topic"
 msgstr "topic [&lt;新话题&gt;]: 查看或更改话题"
 
-#: src/protocols/silc/silc.c:1171
+#: src/protocols/silc/silc.c:1315
 msgid "join &lt;channel&gt; [&lt;password&gt;]:  Join a chat on this network"
 msgstr "join: &lt;房间&gt; [&lt;服务器&gt;]: 加入此网络上的聊天室"
 
-#: src/protocols/silc/silc.c:1175
+#: src/protocols/silc/silc.c:1319
 msgid "list:  List channels on this network"
 msgstr "list: 列出此网络上的频道"
 
-#: src/protocols/silc/silc.c:1179
+#: src/protocols/silc/silc.c:1323
 msgid "whois &lt;nick&gt;:  View nick's information"
 msgstr "whois &lt;昵称&gt;: 查看昵称信息"
 
-#: src/protocols/silc/silc.c:1183
-msgid "invite &lt;nick&gt;:  Invite nick to join this channel"
-msgstr "invite &lt;昵称&gt;: 邀请昵称加入此频道"
-
-#: src/protocols/silc/silc.c:1187
+#: src/protocols/silc/silc.c:1327 src/protocols/zephyr/zephyr.c:1673
 msgid "msg &lt;nick&gt; &lt;message&gt;:  Send a private message to a user"
 msgstr "msg &lt;昵称&gt; &lt;消息&gt;: 向用户发送私人消息"
 
-#: src/protocols/silc/silc.c:1191
+#: src/protocols/silc/silc.c:1331
 msgid "query &lt;nick&gt; [&lt;message&gt;]:  Send a private message to a user"
 msgstr "query &lt;昵称&gt; [&lt;消息&gt;]: 向另外的好友发送私人消息"
 
-#: src/protocols/silc/silc.c:1195
+#: src/protocols/silc/silc.c:1335
 msgid "motd:  View the server's Message Of The Day"
 msgstr "motd: 查看服务器的每日消息"
 
-#: src/protocols/silc/silc.c:1199
+#: src/protocols/silc/silc.c:1339
 msgid "detach:  Detach this session"
 msgstr "detach: 脱离此会话"
 
-#: src/protocols/silc/silc.c:1203
-msgid "umode &lt;usermodes&gt;:  Set your user options"
-msgstr "umode &lt;用户模式&gt;: 设置您的用户选项"
-
-#: src/protocols/silc/silc.c:1214
+#: src/protocols/silc/silc.c:1343
+msgid "quit [message]:  Disconnect from the server, with an optional message"
+msgstr "quit [消息]: 断开与服务器的连接,并留下可选的消息"
+
+#: src/protocols/silc/silc.c:1347
+msgid "call &lt;command&gt;:  Call any silc client command"
+msgstr "call &lt;命令&gt;: 调用任何 silc 客户端命令"
+
+#: src/protocols/silc/silc.c:1352
+msgid "kill &lt;nick&gt; [-pubkey|&lt;reason&gt;]:  Kill nick"
+msgstr "kill &lt;昵称&gt; [-pubkey|&lt;原因&gt;]: 杀死昵称"
+
+#: src/protocols/silc/silc.c:1356
+msgid "nick &lt;newnick&gt;:  Change your nickname"
+msgstr "nick &lt;新昵称&gt;: 更改您的昵称"
+
+#: src/protocols/silc/silc.c:1360
+msgid "whowas &lt;nick&gt;:  View nick's information"
+msgstr "whowas &lt;昵称&gt;: 查看昵称信息"
+
+#: src/protocols/silc/silc.c:1364
+msgid ""
+"cmode &lt;channel&gt; [+|-&lt;modes&gt]; [arguments]:  Change or display "
+"channel modes"
+msgstr ""
+"cmode &lt;频道&gt; [+|-&lt;模式&gt]; [参数]: 更改或显示频道模式"
+
+#: src/protocols/silc/silc.c:1368
+msgid ""
+"cumode &lt;channel&gt; +|-&lt;modes&gt; &lt;nick&gt;:  Change nick's modes "
+"on channel"
+msgstr ""
+"cumode &lt;频道&gt; +|-&lt;模式&gt; &lt;昵称&gt;: 更改昵称在频道上的模式"
+
+#: src/protocols/silc/silc.c:1372
+msgid "umode &lt;usermodes&gt;:  Set your modes in the network"
+msgstr "umode &lt;用户模式&gt;: 设置您在网络中的模式"
+
+#: src/protocols/silc/silc.c:1376
+msgid "oper &lt;nick&gt; [-pubkey]:  Get server operator privileges"
+msgstr "oper &lt;昵称&gt; [-pubkey]: 获得服务器管理员权限"
+
+#: src/protocols/silc/silc.c:1380
+msgid ""
+"invite &lt;channel&gt; [-|+]&lt;nick&gt;:  invite nick or add/remove from "
+"channel invite list"
+msgstr ""
+"invite &lt;频道&gt; [-|+]&lt;昵称&gt;: 邀请昵称或从频道邀请列表中添加/删除"
+
+#: src/protocols/silc/silc.c:1384
+msgid "kick &lt;channel&gt; &lt;nick&gt; [comment]:  Kick client from channel"
+msgstr "kick &lt;频道&gt; &lt;昵称&gt; [注释]: 从频道踢出客户"
+
+#: src/protocols/silc/silc.c:1388
+msgid "info [server]:  View server administrative details"
+msgstr "info [服务器]: 查看服务器管理细节"
+
+#: src/protocols/silc/silc.c:1392
+msgid "ban [&lt;channel&gt; +|-&lt;nick&gt;]:  Ban client from channel"
+msgstr "ban [&lt;频道&gt; +|-&lt;昵称&gt;]: 在频道上屏蔽客户"
+
+#: src/protocols/silc/silc.c:1396
+msgid "getkey &lt;nick|server&gt;:  Retrieve client's or server's public key"
+msgstr "getkey &lt;昵称|服务器&gt;: 获取客户或服务器的公钥"
+
+#: src/protocols/silc/silc.c:1400
+msgid "stats:  View server and network statistics"
+msgstr "stat: 查看服务器和网络统计"
+
+#: src/protocols/silc/silc.c:1404
+msgid "ping:  Send PING to the connected server"
+msgstr "ping: 向连接的服务器发送 PING"
+
+#: src/protocols/silc/silc.c:1409
+msgid "users &lt;channel&gt;:  List users in channel"
+msgstr "users &lt;频道&gt;: 列出频道中目前的用户"
+
+#: src/protocols/silc/silc.c:1413
+msgid ""
+"names [-count|-ops|-halfops|-voices|-normal] &lt;channel(s)&gt;:  List "
+"specific users in channel(s)"
+msgstr ""
+"names [-count|-ops|-halfops|-voices|-normal] &lt;频道&gt;: 列出频道中的指定用户"
+
+#: src/protocols/silc/silc.c:1425
 msgid "Instant Messages"
 msgstr "即时消息"
 
-#: src/protocols/silc/silc.c:1219
+#: src/protocols/silc/silc.c:1430
 msgid "Digitally sign all IM messages"
 msgstr "对全部聊天消息进行数字签名"
 
-#: src/protocols/silc/silc.c:1224
+#: src/protocols/silc/silc.c:1435
 msgid "Verify all IM message signatures"
 msgstr "校验全部聊天消息签名"
 
-#: src/protocols/silc/silc.c:1227
+#: src/protocols/silc/silc.c:1438
 msgid "Channel Messages"
 msgstr "频道消息"
 
-#: src/protocols/silc/silc.c:1232
+#: src/protocols/silc/silc.c:1443
 msgid "Digitally sign all channel messages"
 msgstr "对全部频道消息进行数字签名"
 
-#: src/protocols/silc/silc.c:1237
+#: src/protocols/silc/silc.c:1448
 msgid "Verify all channel message signatures"
 msgstr "校验全部频道消息签名"
 
-#: src/protocols/silc/silc.c:1240
+#: src/protocols/silc/silc.c:1451
 msgid "Default SILC Key Pair"
 msgstr "默认 SILC 密钥对"
 
-#: src/protocols/silc/silc.c:1245
+#: src/protocols/silc/silc.c:1456
 msgid "SILC Public Key"
 msgstr "SILC 公钥"
 
-#: src/protocols/silc/silc.c:1250
+#: src/protocols/silc/silc.c:1461
 msgid "SILC Private Key"
 msgstr "SILC 私钥"
 
@@ -9279,109 +9461,130 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/silc/silc.c:1334
+#: src/protocols/silc/silc.c:1547
 msgid "SILC Protocol Plugin"
 msgstr "SILC 协议插件"
 
 #. *  description
-#: src/protocols/silc/silc.c:1336
+#: src/protocols/silc/silc.c:1549
 msgid "Secure Internet Live Conferencing (SILC) Protocol"
 msgstr "安全网际实时会议(SILC)协议"
 
-#: src/protocols/silc/silc.c:1366
+#: src/protocols/silc/silc.c:1579
 msgid "Public key authentication"
 msgstr "公钥认证"
 
-#: src/protocols/silc/silc.c:1372
+#: src/protocols/silc/silc.c:1585
 msgid "Public Key File"
 msgstr "公钥文件"
 
-#: src/protocols/silc/silc.c:1376
+#: src/protocols/silc/silc.c:1589
 msgid "Private Key File"
 msgstr "私钥文件"
 
-#: src/protocols/silc/silc.c:1381
+#: src/protocols/silc/silc.c:1594
 msgid "Reject watching by other users"
 msgstr "拒绝其他用户监视"
 
-#: src/protocols/silc/silc.c:1384
+#: src/protocols/silc/silc.c:1597
 msgid "Block invites"
 msgstr "屏蔽邀请"
 
-#: src/protocols/silc/silc.c:1387
+#: src/protocols/silc/silc.c:1600
 msgid "Block IMs without Key Exchange"
 msgstr "屏蔽没有密钥交换的聊天"
 
-#: src/protocols/silc/silc.c:1390
+#: src/protocols/silc/silc.c:1603
 msgid "Reject online status attribute requests"
 msgstr "拒绝在线状态属性请求"
 
-#: src/protocols/silc/util.c:200 src/protocols/silc/util.c:223
+#: src/protocols/silc/util.c:202 src/protocols/silc/util.c:227
 msgid "Creating SILC key pair..."
 msgstr "创建 SILC 密钥对..."
 
 #. Hint for translators: Please check the tabulator width here and in
 #. the next strings (short strings: 2 tabs, longer strings 1 tab,
 #. sum: 3 tabs or 24 characters)
-#: src/protocols/silc/util.c:289
+#: src/protocols/silc/util.c:310
 #, c-format
 msgid "Real Name: \t%s\n"
 msgstr "真名:\t%s\n"
 
-#: src/protocols/silc/util.c:291
+#: src/protocols/silc/util.c:312
 #, c-format
 msgid "User Name: \t%s\n"
 msgstr "用户名:\t%s\n"
 
-#: src/protocols/silc/util.c:293
+#: src/protocols/silc/util.c:314
 #, c-format
 msgid "EMail: \t\t%s\n"
 msgstr "电子邮件:\t%s\n"
 
-#: src/protocols/silc/util.c:295
+#: src/protocols/silc/util.c:316
 #, c-format
 msgid "Host Name: \t%s\n"
 msgstr "主机名:\t%s\n"
 
-#: src/protocols/silc/util.c:297
+#: src/protocols/silc/util.c:318
 #, c-format
 msgid "Organization: \t%s\n"
 msgstr "组织:\t%s\n"
 
-#: src/protocols/silc/util.c:299
+#: src/protocols/silc/util.c:320
 #, c-format
 msgid "Country: \t%s\n"
 msgstr "国家:\t%s\n"
 
-#: src/protocols/silc/util.c:300
-#, c-format
-msgid "Algorithm: \t\t%s\n"
+#: src/protocols/silc/util.c:321
+#, c-format
+msgid "Algorithm: \t%s\n"
 msgstr "算法:\t%s\n"
 
-#: src/protocols/silc/util.c:301
+#: src/protocols/silc/util.c:322
 #, c-format
 msgid "Key Length: \t%d bits\n"
 msgstr "密钥长度:\t%d 位\n"
 
-#: src/protocols/silc/util.c:303
+#: src/protocols/silc/util.c:324
 #, c-format
 msgid ""
 "Public Key Fingerprint:\n"
 "%s\n"
 "\n"
-msgstr "公钥指纹:\n%s\n\n"
-
-#: src/protocols/silc/util.c:304
+msgstr ""
+"公钥指纹:\n"
+"%s\n"
+"\n"
+
+#: src/protocols/silc/util.c:325
 #, c-format
 msgid ""
 "Public Key Babbleprint:\n"
 "%s"
-msgstr "公钥漏印:\n%s"
-
-#: src/protocols/silc/util.c:308 src/protocols/silc/util.c:309
+msgstr ""
+"公钥漏印:\n"
+"%s"
+
+#: src/protocols/silc/util.c:329 src/protocols/silc/util.c:330
 msgid "Public Key Information"
 msgstr "公钥信息"
 
+#: src/protocols/silc/util.c:512
+msgid "Paging"
+msgstr "寻呼"
+
+#: src/protocols/silc/util.c:536
+msgid "Computer"
+msgstr "计算机"
+
+#: src/protocols/silc/util.c:540
+msgid "PDA"
+msgstr "PDA"
+
+#: src/protocols/silc/util.c:542
+msgid "Terminal"
+msgstr "终端"
+
 #: src/protocols/toc/toc.c:137
 #, c-format
 msgid "Looking up %s"
@@ -9585,15 +9788,15 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/toc/toc.c:2167 src/protocols/toc/toc.c:2169
+#: src/protocols/toc/toc.c:2169 src/protocols/toc/toc.c:2171
 msgid "TOC Protocol Plugin"
 msgstr "TOC 协议插件"
 
-#: src/protocols/toc/toc.c:2188
+#: src/protocols/toc/toc.c:2190
 msgid "TOC host"
 msgstr "TOC 主机"
 
-#: src/protocols/toc/toc.c:2192
+#: src/protocols/toc/toc.c:2194
 msgid "TOC port"
 msgstr "TOC 端口"
 
@@ -9677,46 +9880,46 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/trepia/trepia.c:1269 src/protocols/trepia/trepia.c:1271
+#: src/protocols/trepia/trepia.c:1271 src/protocols/trepia/trepia.c:1273
 msgid "Trepia Protocol Plugin"
 msgstr "Trepia 协议插件"
 
-#: src/protocols/yahoo/yahoo.c:328
+#: src/protocols/yahoo/yahoo.c:338
 msgid ""
 "You have been logged off as you have logged in on a different machine or "
 "device."
 msgstr "您已被注销,因为您已从其它计算机或设备上登录。"
 
-#: src/protocols/yahoo/yahoo.c:798
+#: src/protocols/yahoo/yahoo.c:808
 msgid "Your Yahoo! message did not get sent."
 msgstr "未发送您的 Yahoo! 消息。"
 
-#: src/protocols/yahoo/yahoo.c:817
+#: src/protocols/yahoo/yahoo.c:827
 msgid "Buzz!!"
 msgstr "Buzz!!"
 
-#: src/protocols/yahoo/yahoo.c:860
+#: src/protocols/yahoo/yahoo.c:870
 #, c-format
 msgid "Yahoo! system message for %s:"
 msgstr "%s 的 Yahoo! 系统消息:"
 
-#: src/protocols/yahoo/yahoo.c:926
+#: src/protocols/yahoo/yahoo.c:936
 #, c-format
 msgid "%s has (retroactively) denied your request to add them to your list."
 msgstr "%s 拒绝您将他/她加入好友。"
 
-#: src/protocols/yahoo/yahoo.c:929
+#: src/protocols/yahoo/yahoo.c:939
 #, c-format
 msgid ""
 "%s has (retroactively) denied your request to add them to your list for the "
 "following reason: %s."
 msgstr "%s 拒绝了您将其加为好友的请求,原因如下:%s。"
 
-#: src/protocols/yahoo/yahoo.c:932
+#: src/protocols/yahoo/yahoo.c:942
 msgid "Add buddy rejected"
 msgstr "添加拒绝的好友"
 
-#: src/protocols/yahoo/yahoo.c:1688
+#: src/protocols/yahoo/yahoo.c:1702
 #, c-format
 msgid ""
 "The Yahoo server has requested the use of an unrecognized authentication "
@@ -9726,11 +9929,11 @@
 "Yahoo 服务器请求使用未识别的认证方式。此版本的 Gaim 可能无法成功登入 Yahoo。"
 "请检查 %s 上的更新。"
 
-#: src/protocols/yahoo/yahoo.c:1691
+#: src/protocols/yahoo/yahoo.c:1705
 msgid "Failed Yahoo! Authentication"
 msgstr "Yahoo! 认证失败"
 
-#: src/protocols/yahoo/yahoo.c:1763
+#: src/protocols/yahoo/yahoo.c:1777
 #, c-format
 msgid ""
 "You have tried to ignore %s, but the user is on your buddy list.  Clicking "
@@ -9738,76 +9941,90 @@
 msgstr ""
 "您试图忽略 %s,但是该用户位于您的好友列表中。单击“是”将删除并忽略好友。"
 
-#: src/protocols/yahoo/yahoo.c:1766
+#: src/protocols/yahoo/yahoo.c:1780
 msgid "Ignore buddy?"
 msgstr "忽略好友?"
 
-#: src/protocols/yahoo/yahoo.c:1799
+#: src/protocols/yahoo/yahoo.c:1814
 msgid "Invalid username."
 msgstr "用户名无效。"
 
-#: src/protocols/yahoo/yahoo.c:1802
+#: src/protocols/yahoo/yahoo.c:1825
+msgid "Normal authencation failed!"
+msgstr "普通认证失败!"
+
+#: src/protocols/yahoo/yahoo.c:1826
+msgid ""
+"The normal authencation method has failed. This means either your password "
+"is incorrect, or Yahoo!'s authencation scheme has changed. Gaim will now "
+"attempt to log in using Web Messenger authencation, will which result in "
+"reduced functionality and features."
+msgstr ""
+"普通的身份验证方法失败。这意味着您的密码可能不对,或者是 Yahoo! 的身份验证方法"
+"发生了变化。Gaim 将会尝试使用 Web 信使方式的身份验证,这会损失一部分功能和特性。"
+
+#: src/protocols/yahoo/yahoo.c:1834
 msgid "Incorrect password."
 msgstr "密码不对。"
 
-#: src/protocols/yahoo/yahoo.c:1805
+#: src/protocols/yahoo/yahoo.c:1837
 msgid "Your account is locked, please log in to the Yahoo! website."
 msgstr "您的账户已锁定,请登录到 Yahoo! 网站。"
 
-#: src/protocols/yahoo/yahoo.c:1808
+#: src/protocols/yahoo/yahoo.c:1840
 #, c-format
 msgid "Unknown error number %d. Logging into the Yahoo! website may fix this."
 msgstr "位置错误号 %d。登录到 Yahoo! 网站可能修复。"
 
-#: src/protocols/yahoo/yahoo.c:1862
+#: src/protocols/yahoo/yahoo.c:1894
 #, c-format
 msgid "Could not add buddy %s to group %s to the server list on account %s."
 msgstr "无法将好友 %s 添加到账户 %s 位于服务器列表上的组 %s。"
 
-#: src/protocols/yahoo/yahoo.c:1864
+#: src/protocols/yahoo/yahoo.c:1896
 msgid "Could not add buddy to server list"
 msgstr "无法将好友添加到服务器列表"
 
-#: src/protocols/yahoo/yahoo.c:2055 src/protocols/yahoo/yahoo.c:2186
+#: src/protocols/yahoo/yahoo.c:2088 src/protocols/yahoo/yahoo.c:2216
 msgid "Unable to read"
 msgstr "无法读取"
 
-#: src/protocols/yahoo/yahoo.c:2208 src/protocols/yahoo/yahoo.c:2318
-#: src/protocols/yahoo/yahoo.c:2374 src/protocols/yahoo/yahoo.c:2384
-#: src/protocols/yahoo/yahoochat.c:1358 src/protocols/yahoo/yahoochat.c:1419
+#: src/protocols/yahoo/yahoo.c:2238 src/protocols/yahoo/yahoo.c:2348
+#: src/protocols/yahoo/yahoo.c:2398 src/protocols/yahoo/yahoo.c:2408
+#: src/protocols/yahoo/yahoochat.c:1397 src/protocols/yahoo/yahoochat.c:1458
 msgid "Connection problem"
 msgstr "连接问题"
 
-#: src/protocols/yahoo/yahoo.c:2472 src/protocols/yahoo/yahoo.c:2850
-#: src/protocols/yahoo/yahoo.c:2962
+#: src/protocols/yahoo/yahoo.c:2495 src/protocols/yahoo/yahoo.c:2857
+#: src/protocols/yahoo/yahoo.c:2971
 msgid "Not At Home"
 msgstr "不在家"
 
-#: src/protocols/yahoo/yahoo.c:2474 src/protocols/yahoo/yahoo.c:2852
-#: src/protocols/yahoo/yahoo.c:2963
+#: src/protocols/yahoo/yahoo.c:2497 src/protocols/yahoo/yahoo.c:2859
+#: src/protocols/yahoo/yahoo.c:2972
 msgid "Not At Desk"
 msgstr "不在桌前"
 
-#: src/protocols/yahoo/yahoo.c:2476 src/protocols/yahoo/yahoo.c:2854
-#: src/protocols/yahoo/yahoo.c:2964
+#: src/protocols/yahoo/yahoo.c:2499 src/protocols/yahoo/yahoo.c:2861
+#: src/protocols/yahoo/yahoo.c:2973
 msgid "Not In Office"
 msgstr "不在办公室"
 
-#: src/protocols/yahoo/yahoo.c:2480 src/protocols/yahoo/yahoo.c:2858
-#: src/protocols/yahoo/yahoo.c:2966
+#: src/protocols/yahoo/yahoo.c:2503 src/protocols/yahoo/yahoo.c:2865
+#: src/protocols/yahoo/yahoo.c:2975
 msgid "On Vacation"
 msgstr "度假中"
 
-#: src/protocols/yahoo/yahoo.c:2484 src/protocols/yahoo/yahoo.c:2862
-#: src/protocols/yahoo/yahoo.c:2968
+#: src/protocols/yahoo/yahoo.c:2507 src/protocols/yahoo/yahoo.c:2869
+#: src/protocols/yahoo/yahoo.c:2977
 msgid "Stepped Out"
 msgstr "郊游"
 
-#: src/protocols/yahoo/yahoo.c:2565 src/protocols/yahoo/yahoo.c:2591
+#: src/protocols/yahoo/yahoo.c:2588 src/protocols/yahoo/yahoo.c:2614
 msgid "Not on server list"
 msgstr "不在服务器列表中"
 
-#: src/protocols/yahoo/yahoo.c:2611
+#: src/protocols/yahoo/yahoo.c:2634
 #, c-format
 msgid ""
 "\n"
@@ -9816,27 +10033,27 @@
 "\n"
 "<b>%s:</b> %s"
 
-#: src/protocols/yahoo/yahoo.c:2682
+#: src/protocols/yahoo/yahoo.c:2693
 msgid "Join in Chat"
 msgstr "加入聊天"
 
-#: src/protocols/yahoo/yahoo.c:2686
+#: src/protocols/yahoo/yahoo.c:2698
 msgid "Initiate Conference"
 msgstr "发起会议"
 
-#: src/protocols/yahoo/yahoo.c:2743
+#: src/protocols/yahoo/yahoo.c:2750
 msgid "Active which ID?"
 msgstr "激活哪个 ID?"
 
-#: src/protocols/yahoo/yahoo.c:2752
+#: src/protocols/yahoo/yahoo.c:2759
 msgid "Join who in chat?"
 msgstr "将谁加入聊天?"
 
-#: src/protocols/yahoo/yahoo.c:2762
+#: src/protocols/yahoo/yahoo.c:2769
 msgid "Activate ID..."
 msgstr "激活 ID..."
 
-#: src/protocols/yahoo/yahoo.c:2766
+#: src/protocols/yahoo/yahoo.c:2773
 msgid "Join user in chat..."
 msgstr "在聊天中加入用户..."
 
@@ -9851,191 +10068,225 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/yahoo/yahoo.c:3286 src/protocols/yahoo/yahoo.c:3288
+#: src/protocols/yahoo/yahoo.c:3292 src/protocols/yahoo/yahoo.c:3294
 msgid "Yahoo Protocol Plugin"
 msgstr "Yahoo 协议插件"
 
-#: src/protocols/yahoo/yahoo.c:3307
+#: src/protocols/yahoo/yahoo.c:3313
 msgid "Yahoo Japan"
 msgstr "Yahoo 日本"
 
-#: src/protocols/yahoo/yahoo.c:3310
-msgid "Pager host"
-msgstr "寻呼主机"
-
-#: src/protocols/yahoo/yahoo.c:3313
-msgid "Japan Pager host"
-msgstr "日本寻呼主机"
-
 #: src/protocols/yahoo/yahoo.c:3316
-msgid "Pager port"
-msgstr "寻呼端口"
+msgid "Pager host"
+msgstr "寻呼主机"
 
 #: src/protocols/yahoo/yahoo.c:3319
-msgid "File transfer host"
-msgstr "文件传送主机"
+msgid "Japan Pager host"
+msgstr "日本寻呼主机"
 
 #: src/protocols/yahoo/yahoo.c:3322
-msgid "Japan File transfer host"
-msgstr "日本文件传送主机"
+msgid "Pager port"
+msgstr "寻呼端口"
 
 #: src/protocols/yahoo/yahoo.c:3325
+msgid "File transfer host"
+msgstr "文件传送主机"
+
+#: src/protocols/yahoo/yahoo.c:3328
+msgid "Japan File transfer host"
+msgstr "日本文件传送主机"
+
+#: src/protocols/yahoo/yahoo.c:3331
 msgid "File transfer port"
 msgstr "文件传送端口"
 
-#: src/protocols/yahoo/yahoo.c:3328
+#: src/protocols/yahoo/yahoo.c:3334
 msgid "Chat Room List Url"
 msgstr "聊天房间列表 URL"
 
+#: src/protocols/yahoo/yahoo.c:3337
+msgid "YCHT Host"
+msgstr "YCHT 主机"
+
+#: src/protocols/yahoo/yahoo.c:3340
+msgid "YCHT Port"
+msgstr "YCHT 端口"
+
 #: src/protocols/yahoo/yahoo_filexfer.c:170
 msgid ""
 "Gaim cannot send files over Yahoo! that are bigger than One Megabyte "
 "(1,048,576 bytes)."
 msgstr "Gaim 无法通过雅虎发送超过 1 兆(1 048 576 字节)的文件。"
 
-#: src/protocols/yahoo/yahoo_profile.c:640
-#: src/protocols/yahoo/yahoo_profile.c:961
-msgid "Yahoo! ID"
-msgstr "Yahoo! ID"
-
-#: src/protocols/yahoo/yahoo_profile.c:664
+#: src/protocols/yahoo/yahoo_profile.c:675
 #, c-format
 msgid "<b>IP Address:</b> %s<br>"
 msgstr "<b>IP 地址:</b> %s<br>"
 
-#: src/protocols/yahoo/yahoo_profile.c:779
+#: src/protocols/yahoo/yahoo_profile.c:749
+msgid "Yahoo! Japan Profile"
+msgstr "Yahoo 日本资料"
+
+#: src/protocols/yahoo/yahoo_profile.c:750
+msgid "Yahoo! Profile"
+msgstr "Yahoo! 资料"
+
+#: src/protocols/yahoo/yahoo_profile.c:794
 msgid ""
 "Sorry, profiles marked as containing adult content are not supported at this "
 "time."
 msgstr "抱歉,标为含有成人内容的个人资料目前不被支持。"
 
-#: src/protocols/yahoo/yahoo_profile.c:781
-#: src/protocols/yahoo/yahoo_profile.c:829
+#: src/protocols/yahoo/yahoo_profile.c:796
 msgid ""
 "If you wish to view this profile, you will need to visit this link in your "
 "web browser"
 msgstr "如果您想要查看此资料,您需要在您的 Web 浏览器中浏览此链接"
 
-#: src/protocols/yahoo/yahoo_profile.c:827
+#: src/protocols/yahoo/yahoo_profile.c:969
+msgid "Yahoo! ID"
+msgstr "Yahoo! ID"
+
+#: src/protocols/yahoo/yahoo_profile.c:1043
+#: src/protocols/yahoo/yahoo_profile.c:1047
+#: src/protocols/yahoo/yahoo_profile.c:1051
+msgid "Hobbies"
+msgstr "嗜好"
+
+#: src/protocols/yahoo/yahoo_profile.c:1061
+#: src/protocols/yahoo/yahoo_profile.c:1065
+msgid "Latest News"
+msgstr "最新新闻"
+
+#: src/protocols/yahoo/yahoo_profile.c:1086
+msgid "Home Page"
+msgstr "主页"
+
+#: src/protocols/yahoo/yahoo_profile.c:1101
+msgid "Cool Link 1"
+msgstr "酷链接 1"
+
+#: src/protocols/yahoo/yahoo_profile.c:1106
+msgid "Cool Link 2"
+msgstr "酷链接 2"
+
+#: src/protocols/yahoo/yahoo_profile.c:1110
+msgid "Cool Link 3"
+msgstr "酷链接 3"
+
+#: src/protocols/yahoo/yahoo_profile.c:1130
+#, c-format
+msgid "User information for %s unavailable"
+msgstr "%s 的用户信息不可用"
+
+#: src/protocols/yahoo/yahoo_profile.c:1136
 msgid ""
 "Sorry, this profile seems to be in a language that is not supported at this "
 "time."
 msgstr "抱歉,此配置文件似乎是目前并不支持的语言。"
 
-#: src/protocols/yahoo/yahoo_profile.c:1038
-#: src/protocols/yahoo/yahoo_profile.c:1042
-#: src/protocols/yahoo/yahoo_profile.c:1046
-msgid "Hobbies"
-msgstr "嗜好"
-
-#: src/protocols/yahoo/yahoo_profile.c:1056
-#: src/protocols/yahoo/yahoo_profile.c:1060
-msgid "Latest News"
-msgstr "最新新闻"
-
-#: src/protocols/yahoo/yahoo_profile.c:1081
-msgid "Home Page"
-msgstr "主页"
-
-#: src/protocols/yahoo/yahoo_profile.c:1096
-msgid "Cool Link 1"
-msgstr "酷链接 1"
-
-#: src/protocols/yahoo/yahoo_profile.c:1101
-msgid "Cool Link 2"
-msgstr "酷链接 2"
-
-#: src/protocols/yahoo/yahoo_profile.c:1105
-msgid "Cool Link 3"
-msgstr "酷链接 3"
-
-#: src/protocols/yahoo/yahoo_profile.c:1138
-#, c-format
-msgid "User information for %s unavailable"
-msgstr "%s 的用户信息不可用"
-
-#: src/protocols/yahoo/yahoochat.c:198
+#: src/protocols/yahoo/yahoo_profile.c:1152
+msgid ""
+"Could not retrieve the user's profile. This most likely is a temporary "
+"server-side problem. Please try again later."
+msgstr ""
+"无法获取用户的个人资料。可能临时出现了服务器端问题。请稍后再试。"
+
+#: src/protocols/yahoo/yahoo_profile.c:1155
+msgid ""
+"Could not retrieve the user's profile. This most likely means that the user "
+"does not exist; however, Yahoo! sometimes does fail to find a user's "
+"profile. If you know that the user exists, please try again later."
+msgstr ""
+"无法获取用户的个人资料。可能是用户不存在;但是,Yahoo! 有时会无法找到用户的个人资料。"
+"如果您确定用户存在的话,请稍候再试。"
+
+#: src/protocols/yahoo/yahoo_profile.c:1163
+msgid "The user's profile is empty."
+msgstr "用户的配置文件为空。"
+
+#: src/protocols/yahoo/yahoochat.c:203
 #, c-format
 msgid "%s declined your conference invitation to room \"%s\" because \"%s\"."
 msgstr "%s 拒绝您加入房间“%s”的会议邀请,原因为“%s”。"
 
-#: src/protocols/yahoo/yahoochat.c:200
+#: src/protocols/yahoo/yahoochat.c:205
 msgid "Invitation Rejected"
 msgstr "邀请已拒绝"
 
-#: src/protocols/yahoo/yahoochat.c:350
+#: src/protocols/yahoo/yahoochat.c:355
 msgid "Failed to join chat"
 msgstr "加入聊天失败"
 
-#: src/protocols/yahoo/yahoochat.c:350
+#: src/protocols/yahoo/yahoochat.c:355
 msgid "Maybe the room is full?"
 msgstr "可能房间已满?"
 
-#: src/protocols/yahoo/yahoochat.c:424
+#: src/protocols/yahoo/yahoochat.c:429
 #, c-format
 msgid "You are now chatting in %s."
 msgstr "您现在正在 %s 中聊天。"
 
-#: src/protocols/yahoo/yahoochat.c:578
+#: src/protocols/yahoo/yahoochat.c:583
 msgid "Failed to join buddy in chat"
 msgstr "在聊天中加入好友失败"
 
-#: src/protocols/yahoo/yahoochat.c:579
+#: src/protocols/yahoo/yahoochat.c:584
 msgid "Maybe they're not in a chat?"
 msgstr "可能他们未在聊天中?"
 
-#: src/protocols/yahoo/yahoochat.c:1299
+#: src/protocols/yahoo/yahoochat.c:1338
 msgid "Unable to connect"
 msgstr "无法连接"
 
-#: src/protocols/yahoo/yahoochat.c:1299
+#: src/protocols/yahoo/yahoochat.c:1338
 msgid "Fetching the room list failed."
 msgstr "获取房间列表失败。"
 
-#: src/protocols/yahoo/yahoochat.c:1344
+#: src/protocols/yahoo/yahoochat.c:1383
 msgid "Voices"
 msgstr "语音"
 
-#: src/protocols/yahoo/yahoochat.c:1347
+#: src/protocols/yahoo/yahoochat.c:1386
 msgid "Webcams"
 msgstr "摄像头"
 
-#: src/protocols/yahoo/yahoochat.c:1358 src/protocols/yahoo/yahoochat.c:1419
+#: src/protocols/yahoo/yahoochat.c:1397 src/protocols/yahoo/yahoochat.c:1458
 msgid "Unable to fetch room list."
 msgstr "无法获取房间列表。"
 
-#: src/protocols/yahoo/yahoochat.c:1412
+#: src/protocols/yahoo/yahoochat.c:1451
 msgid "User Rooms"
 msgstr "用户房间"
 
-#: src/protocols/zephyr/zephyr.c:566
+#: src/protocols/zephyr/zephyr.c:589
 #, c-format
 msgid "Unable send to chat %s,%s,%s"
 msgstr "无法发送给聊天 %s,%s,%s"
 
-#: src/protocols/zephyr/zephyr.c:600
+#: src/protocols/zephyr/zephyr.c:624
 #, c-format
 msgid "<b>User:</b> %s<br>"
 msgstr "<b>用户:</b> %s<br>"
 
-#: src/protocols/zephyr/zephyr.c:604
+#: src/protocols/zephyr/zephyr.c:628
 msgid "<br>Hidden or not logged-in"
 msgstr "<br>隐身或未登入"
 
-#: src/protocols/zephyr/zephyr.c:608
+#: src/protocols/zephyr/zephyr.c:633
 #, c-format
 msgid "<br>At %s since %s"
 msgstr "<br>从 %s,自 %s 起"
 
-#: src/protocols/zephyr/zephyr.c:873 src/protocols/zephyr/zephyr.c:874
+#: src/protocols/zephyr/zephyr.c:983 src/protocols/zephyr/zephyr.c:984
 msgid "Anyone"
 msgstr "任何人"
 
-#: src/protocols/zephyr/zephyr.c:900
+#: src/protocols/zephyr/zephyr.c:1011
 msgid "Already logged in with Zephyr"
 msgstr "已经登入 Zephyr"
 
-#: src/protocols/zephyr/zephyr.c:900
+#: src/protocols/zephyr/zephyr.c:1011
 msgid ""
 "Because Zephyr uses your system username, you are unable to have multiple "
 "accounts on it when logged in as the same user."
@@ -10043,18 +10294,82 @@
 "由于 Zephyr 将使用您的系统用户名,如果您已用相同的用户登入,您将无法拥有多个"
 "账户。"
 
-#: src/protocols/zephyr/zephyr.c:1232
+#: src/protocols/zephyr/zephyr.c:1386
 msgid "_Class:"
 msgstr "类(_C):"
 
-#: src/protocols/zephyr/zephyr.c:1238
+#: src/protocols/zephyr/zephyr.c:1392
 msgid "_Instance:"
 msgstr "实例(_I):"
 
-#: src/protocols/zephyr/zephyr.c:1244
+#: src/protocols/zephyr/zephyr.c:1398
 msgid "_Recipient:"
 msgstr "接收者(_R):"
 
+#: src/protocols/zephyr/zephyr.c:1409
+#, c-format
+msgid "Attempt to subscribe to %s,%s,%s failed"
+msgstr "试图订阅 %s,%s,%s 失败。"
+
+#: src/protocols/zephyr/zephyr.c:1678
+msgid "zlocate &lt;nick&gt;: Locate user"
+msgstr "zlocate &lt;昵称&gt;: 定位用户"
+
+#: src/protocols/zephyr/zephyr.c:1683
+msgid "zl &lt;nick&gt;: Locate user"
+msgstr "zl &lt;昵称&gt;: 定位用户"
+
+#: src/protocols/zephyr/zephyr.c:1688
+msgid "instance &lt;instance&gt;: Set the instance to be used on this class"
+msgstr "instance &lt;实例&gt;: 设置在此类上使用的实例"
+
+#: src/protocols/zephyr/zephyr.c:1693
+msgid "inst &lt;instance&gt;: Set the instance to be used on this class"
+msgstr "inst &lt;实例&gt;: 设置在此类上使用的实例"
+
+#: src/protocols/zephyr/zephyr.c:1699
+msgid "sub &lt;class&gt; &lt;instance&gt; &lt;recipient&gt;: Join a new chat"
+msgstr "sub &lt;类&gt; &lt;实例&gt; &lt;收件人&gt;: 加入新聊天"
+
+#: src/protocols/zephyr/zephyr.c:1704
+msgid ""
+"zi &lt;instance&gt;: Send a message to &lt;message,<i>instance</i>,*&gt;"
+msgstr ""
+"zi &lt;实例&gt;: 向 &lt;消息,<i>实例</i>,*&gt; 发送消息"
+
+#: src/protocols/zephyr/zephyr.c:1710
+msgid ""
+"zci &lt;class&gt; &lt;instance&gt;: Send a message to &lt;<i>class</i>,"
+"<i>instance</i>,*&gt;"
+msgstr ""
+"zci &lt;类&gt; &lt;实例&gt;: 向 &lt;<i>类</i>,<i>实例</i>,*&gt; 发送消息"
+
+#: src/protocols/zephyr/zephyr.c:1716
+msgid ""
+"zcir &lt;class&gt; &lt;instance&gt; &lt;recipient&gt;: Send a message to &lt;"
+"<i>class</i>,<i>instance</i>,<i>recipient</i>&gt;"
+msgstr ""
+"zcir &lt;类&gt; &lt;实例&gt; &lt;收件人&gt;: 向 &lt;<i>类</i>,<i>实例</i>,<i>收件人</i>&gt; 发送消息"
+
+#: src/protocols/zephyr/zephyr.c:1722
+msgid ""
+"zir &lt;instance&gt; &lt;recipient&gt;: Send a message to &lt;MESSAGE,"
+"<i>instance</i>,<i>recipient</i>&gt;"
+msgstr ""
+"zir &lt;实例&gt; &lt;收件人&gt;: 向 &lt;消息,<i>实例</i>,<i>收件人</i>&gt; 发送消息"
+
+#: src/protocols/zephyr/zephyr.c:1727
+msgid "zc &lt;class&gt;: Send a message to &lt;<i>class</i>,PERSONAL,*&gt;"
+msgstr "zc &lt;类&gt;: 向 &lt;<i>类</i>,个人,*&gt; 发送消息"
+
+#: src/protocols/zephyr/zephyr.c:1802
+msgid "Resubscribe"
+msgstr "重订"
+
+#: src/protocols/zephyr/zephyr.c:1805
+msgid "Retrieve subscriptions from server"
+msgstr "从服务器获取订阅"
+
 #. *< api_version
 #. *< type
 #. *< ui_requirement
@@ -10066,19 +10381,19 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/zephyr/zephyr.c:1412 src/protocols/zephyr/zephyr.c:1414
+#: src/protocols/zephyr/zephyr.c:1885 src/protocols/zephyr/zephyr.c:1887
 msgid "Zephyr Protocol Plugin"
 msgstr "Zephyr 协议插件"
 
-#: src/protocols/zephyr/zephyr.c:1433
+#: src/protocols/zephyr/zephyr.c:1906
 msgid "Export to .anyone"
 msgstr "导出到 .anyone"
 
-#: src/protocols/zephyr/zephyr.c:1436
+#: src/protocols/zephyr/zephyr.c:1909
 msgid "Export to .zephyr.subs"
 msgstr "导出到 .zephyr.subs"
 
-#: src/protocols/zephyr/zephyr.c:1439
+#: src/protocols/zephyr/zephyr.c:1912
 msgid "Exposure"
 msgstr "暴露"
 
@@ -10105,14 +10420,14 @@
 msgstr "您为给定代理类型所指定的主机名或端口号无效。"
 
 #. * Custom away message.
-#: src/prpl.h:205
+#: src/prpl.h:165
 msgid "Custom"
 msgstr "自定义"
 
 #. *
 #. * A wrapper for gaim_request_action() that uses Accept and Cancel buttons.
 #.
-#: src/request.h:1252
+#: src/request.h:1253
 msgid "Accept"
 msgstr "接受"
 
@@ -10135,27 +10450,27 @@
 msgid "(1 message)"
 msgstr "(1 条消息)"
 
-#: src/server.c:1176 src/server.c:1186
+#: src/server.c:1180 src/server.c:1189
 #, c-format
 msgid "%s logged in."
 msgstr "%s 登入了。"
 
-#: src/server.c:1199
+#: src/server.c:1201
 #, c-format
 msgid "%s signed on"
 msgstr "%s 已登入"
 
-#: src/server.c:1215
+#: src/server.c:1216
 #, c-format
 msgid "%s came back"
 msgstr "%s 回来了"
 
-#: src/server.c:1217
+#: src/server.c:1218
 #, c-format
 msgid "%s went away"
 msgstr "%s 走了"
 
-#: src/server.c:1231
+#: src/server.c:1232
 #, c-format
 msgid "%s became idle"
 msgstr "%s 打起瞌睡"
@@ -10165,17 +10480,17 @@
 msgid "%s became unidle"
 msgstr "%s 睡醒了"
 
-#: src/server.c:1254 src/server.c:1262
+#: src/server.c:1253 src/server.c:1260
 #, c-format
 msgid "%s logged out."
 msgstr "%s 登出了。"
 
-#: src/server.c:1276
+#: src/server.c:1273
 #, c-format
 msgid "%s signed off"
 msgstr "%s 已登出"
 
-#: src/server.c:1338
+#: src/server.c:1335
 #, c-format
 msgid ""
 "%s has just been warned by %s.\n"
@@ -10184,11 +10499,11 @@
 "%s 刚刚被 %s 警告。\n"
 "您新的警告级别是 %d%%"
 
-#: src/server.c:1341
+#: src/server.c:1338
 msgid "an anonymous person"
 msgstr "无名氏"
 
-#: src/server.c:1451
+#: src/server.c:1448
 #, c-format
 msgid ""
 "User '%s' invites %s to buddy chat room: '%s'\n"
@@ -10197,12 +10512,12 @@
 "用户“%s”邀请 %s 加入好友聊天室: “%s”\n"
 "%s"
 
-#: src/server.c:1455
+#: src/server.c:1452
 #, c-format
 msgid "User '%s' invites %s to buddy chat room: '%s'\n"
 msgstr "用户“%s”邀请 %s 加入好友聊天室: “%s”\n"
 
-#: src/server.c:1461
+#: src/server.c:1458
 msgid "Accept chat invitation?"
 msgstr "接受聊天邀请吗?"
 
@@ -10237,22 +10552,27 @@
 msgid "Unknown."
 msgstr "未知。"
 
-#: src/util.c:2399
+#: src/util.c:2392
+msgid "second"
+msgid_plural "seconds"
+msgstr[0] "秒"
+
+#: src/util.c:2406
 msgid "day"
 msgid_plural "days"
 msgstr[0] "天"
 
-#: src/util.c:2407
+#: src/util.c:2414
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "小时"
 
-#: src/util.c:2415
+#: src/util.c:2422
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "分"
 
-#: src/util.c:2824
+#: src/util.c:2832
 msgid "g003: Error opening connection.\n"
 msgstr "g003: 打开连接出错。\n"
 
--- a/po/zh_TW.po	Tue Jul 13 23:05:59 2004 +0000
+++ b/po/zh_TW.po	Wed Jul 14 19:05:16 2004 +0000
@@ -41,8 +41,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Gaim 0.79\n"
-"POT-Creation-Date: 2004-06-24 00:01-0400\n"
+"Project-Id-Version: Gaim 0.80\n"
+"POT-Creation-Date: 2004-07-13 00:01-0400\n"
 "PO-Revision-Date: 2004-04-22 11:18+0800\n"
 "Last-Translator: Ambrose C. Li <acli@ada.dhs.org>\n"
 "Language-Team: Chinese (Traditional) <zh-l10n@linux.org.tw>\n"
@@ -199,7 +199,7 @@
 msgid "Gaim - Away"
 msgstr "Gaim - 離開"
 
-#: plugins/docklet/docklet.c:114 src/gtkaccount.c:673 src/gtkaccount.c:2095
+#: plugins/docklet/docklet.c:114 src/gtkaccount.c:727 src/gtkaccount.c:2152
 msgid "Auto-login"
 msgstr "自動登入"
 
@@ -215,13 +215,13 @@
 msgid "New..."
 msgstr "新增..."
 
-#: plugins/docklet/docklet.c:153 src/gtkprefs.c:1796 src/protocols/gg/gg.c:51
-#: src/protocols/irc/msgs.c:187 src/protocols/jabber/jabber.c:959
+#: plugins/docklet/docklet.c:153 src/gtkprefs.c:1809 src/protocols/gg/gg.c:51
+#: src/protocols/irc/msgs.c:187 src/protocols/jabber/jabber.c:960
 #: src/protocols/jabber/jutil.c:32 src/protocols/jabber/presence.c:63
 #: src/protocols/jabber/presence.c:119 src/protocols/novell/novell.c:2724
 #: src/protocols/novell/novell.c:2841 src/protocols/novell/novell.c:2893
-#: src/protocols/oscar/oscar.c:528 src/protocols/oscar/oscar.c:5465
-#: src/protocols/oscar/oscar.c:6463 src/protocols/oscar/oscar.c:6662
+#: src/protocols/oscar/oscar.c:532 src/protocols/oscar/oscar.c:5481
+#: src/protocols/oscar/oscar.c:6480 src/protocols/oscar/oscar.c:6679
 #: src/protocols/silc/buddy.c:1379 src/protocols/silc/silc.c:46
 #: src/protocols/silc/silc.c:76
 msgid "Away"
@@ -229,7 +229,7 @@
 
 #. else...
 #: plugins/docklet/docklet.c:159 src/away.c:550
-#: src/protocols/oscar/oscar.c:5383 src/protocols/oscar/oscar.c:6670
+#: src/protocols/oscar/oscar.c:5399 src/protocols/oscar/oscar.c:6687
 msgid "Back"
 msgstr "返回"
 
@@ -237,15 +237,15 @@
 msgid "Mute Sounds"
 msgstr "靜音"
 
-#: plugins/docklet/docklet.c:172 src/gtkft.c:619
+#: plugins/docklet/docklet.c:172 src/gtkft.c:612
 msgid "File Transfers"
 msgstr "檔案傳輸"
 
-#: plugins/docklet/docklet.c:173 src/gtkaccount.c:2274
+#: plugins/docklet/docklet.c:173 src/gtkaccount.c:2333
 msgid "Accounts"
 msgstr "帳號清單"
 
-#: plugins/docklet/docklet.c:174 src/gtkprefs.c:2490
+#: plugins/docklet/docklet.c:174 src/gtkprefs.c:2503
 msgid "Preferences"
 msgstr "偏好設定"
 
@@ -296,18 +296,23 @@
 "快速的操作 Gaim 的幾項常用功能(包括開啟或關閉好友清單或登入視窗);並讓您可"
 "以選擇將收到的訊息存到佇列中,直到工作匣圖示被點擊,如同使用 ICQ 一樣。"
 
-#: plugins/extplacement.c:68
+#: plugins/extplacement.c:75
 msgid "By conversation count"
 msgstr "依交談個數"
 
-#: plugins/extplacement.c:89
+#: plugins/extplacement.c:96
 msgid "Conversation Placement"
 msgstr "交談位置"
 
-#: plugins/extplacement.c:94
+#: plugins/extplacement.c:101
 msgid "Number of conversations per window"
 msgstr "視窗內之交談個數上限"
 
+#  XXX 要核實譯文!
+#: plugins/extplacement.c:107
+msgid "Separate IM and Chat windows when placing by number"
+msgstr "按交談個數放置交談時,以不同的視窗顯示即時訊息和聊天"
+
 #. *< api_version
 #. *< type
 #. *< ui_requirement
@@ -315,23 +320,24 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/extplacement.c:114
+#: plugins/extplacement.c:126
 msgid "ExtPlacement"
 msgstr "視窗位置額外選項"
 
 #. *< name
 #. *< version
-#: plugins/extplacement.c:116
+#: plugins/extplacement.c:128
 msgid "Extra conversation placement options."
 msgstr "交談視窗位置額外選項。"
 
+#  XXX 譯得很差,請改良 :-(
 #. *< summary
 #. *  description
-#: plugins/extplacement.c:118
-msgid ""
-"Either restrict the number of conversations per windows or use separate "
-"windows for IMs and Chats"
-msgstr "限制視窗可容之交談數目,或以不同的視窗顯示即時訊息和聊天"
+#: plugins/extplacement.c:130
+msgid ""
+"Restrict the number of conversations per windows, optionally separating IMs "
+"and Chats"
+msgstr "限制視窗可容之交談數目,亦可選擇以不同的視窗顯示即時訊息和聊天"
 
 #. *< api_version
 #. *< type
@@ -504,16 +510,16 @@
 #: plugins/gevolution/add_buddy_dialog.c:143
 #: plugins/gevolution/add_buddy_dialog.c:154
 #: plugins/gevolution/assoc-buddy.c:81 plugins/gevolution/assoc-buddy.c:92
-#: src/gtkblist.c:2984 src/gtkprefs.c:913 src/gtkprefs.c:966
-#: src/gtkprefs.c:1809 src/protocols/jabber/jabber.c:923
+#: src/gtkblist.c:3015 src/gtkprefs.c:961 src/gtkprefs.c:1014
+#: src/gtkprefs.c:1822 src/protocols/jabber/jabber.c:924
 msgid "None"
 msgstr "無"
 
 # NOTE 只能譯「名稱」,因為同時解作「人名」及「模組名稱」
 #: plugins/gevolution/add_buddy_dialog.c:187
-#: plugins/gevolution/assoc-buddy.c:175 src/gtkprefs.c:2162
-#: src/gtkroomlist.c:553 src/protocols/jabber/jabber.c:597
-#: src/protocols/msn/msn.c:1305 src/protocols/trepia/trepia.c:398
+#: plugins/gevolution/assoc-buddy.c:175 src/gtkprefs.c:2175
+#: src/gtkroomlist.c:553 src/protocols/jabber/jabber.c:598
+#: src/protocols/msn/msn.c:1311 src/protocols/trepia/trepia.c:398
 msgid "Name"
 msgstr "名稱"
 
@@ -531,13 +537,13 @@
 
 #. "Search"
 #: plugins/gevolution/add_buddy_dialog.c:492
-#: plugins/gevolution/assoc-buddy.c:380 src/protocols/oscar/oscar.c:6949
+#: plugins/gevolution/assoc-buddy.c:380 src/protocols/oscar/oscar.c:6965
 msgid "Search"
 msgstr "搜尋"
 
 #: plugins/gevolution/add_buddy_dialog.c:563
-#: plugins/gevolution/new_person_dialog.c:307 src/gtkblist.c:4013
-#: src/gtkblist.c:4341
+#: plugins/gevolution/new_person_dialog.c:307 src/gtkblist.c:4045
+#: src/gtkblist.c:4373
 msgid "Group:"
 msgstr "群組:"
 
@@ -581,7 +587,7 @@
 msgstr "聯結好友 (_A)"
 
 #: plugins/gevolution/gevo-util.c:64 plugins/gevolution/gevolution.c:89
-#: src/blist.c:775 src/blist.c:963 src/blist.c:2060 src/gtkblist.c:3834
+#: src/blist.c:775 src/blist.c:963 src/blist.c:1870 src/gtkblist.c:3866
 #: src/protocols/jabber/roster.c:66
 msgid "Buddies"
 msgstr "好友"
@@ -653,8 +659,8 @@
 msgstr "其他資訊:"
 
 #. Label
-#: plugins/gevolution/new_person_dialog.c:338 src/gtkaccount.c:340
-#: src/protocols/oscar/oscar.c:433
+#: plugins/gevolution/new_person_dialog.c:338 src/gtkaccount.c:378
+#: src/gtkaccount.c:408 src/protocols/oscar/oscar.c:438
 msgid "Buddy Icon"
 msgstr "好友圖示"
 
@@ -904,16 +910,16 @@
 
 # TODO Untranslated
 # TODO 微軟視窗的Adobe印表機驅動程式可以找到一個「Raw」的譯法 (但我忘了)
-#: plugins/raw.c:154
+#: plugins/raw.c:146
 msgid "Raw"
 msgstr ""
 
 # NOTE: 舊的譯文不清楚,而且唸起來怪怪的。
-#: plugins/raw.c:156
+#: plugins/raw.c:148
 msgid "Lets you send raw input to text-based protocols."
 msgstr "讓您直接輸入指令對各種文字模式的通訊協定進行操作。"
 
-#: plugins/raw.c:157
+#: plugins/raw.c:149
 msgid ""
 "Lets you send raw input to text-based protocols (Jabber, MSN, IRC, TOC). Hit "
 "'Enter' in the entry box to send. Watch the debug window."
@@ -988,7 +994,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/signals-test.c:554
+#: plugins/signals-test.c:566
 msgid "Signals Test"
 msgstr "信號測試"
 
@@ -996,7 +1002,7 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/signals-test.c:557 plugins/signals-test.c:559
+#: plugins/signals-test.c:569 plugins/signals-test.c:571
 msgid "Test to see that all signals are working properly."
 msgstr "檢查各種信號是否都能正常運作。"
 
@@ -1212,30 +1218,30 @@
 msgstr "每隔 N 分鐘加入 iChat 風格的時間戳記到交談中。"
 
 #: plugins/win32/transparency/win2ktrans.c:133
-#: plugins/win32/transparency/win2ktrans.c:389
-#: plugins/win32/transparency/win2ktrans.c:420
+#: plugins/win32/transparency/win2ktrans.c:388
+#: plugins/win32/transparency/win2ktrans.c:419
 msgid "Opacity:"
 msgstr "不透明度:"
 
 #. IM Convo trans options
-#: plugins/win32/transparency/win2ktrans.c:370
+#: plugins/win32/transparency/win2ktrans.c:369
 msgid "IM Conversation Windows"
 msgstr "即時訊息交談視窗"
 
-#: plugins/win32/transparency/win2ktrans.c:371
+#: plugins/win32/transparency/win2ktrans.c:370
 msgid "_IM window transparency"
 msgstr "即時訊息視窗透明度(_I)"
 
-#: plugins/win32/transparency/win2ktrans.c:381
+#: plugins/win32/transparency/win2ktrans.c:380
 msgid "_Show slider bar in IM window"
 msgstr "在即時訊息視窗中顯示 Slider Bar(_S)"
 
 #. Buddy List trans options
-#: plugins/win32/transparency/win2ktrans.c:406 src/gtkprefs.c:907
+#: plugins/win32/transparency/win2ktrans.c:405 src/gtkprefs.c:955
 msgid "Buddy List Window"
 msgstr "好友清單視窗"
 
-#: plugins/win32/transparency/win2ktrans.c:407
+#: plugins/win32/transparency/win2ktrans.c:406
 msgid "_Buddy List window transparency"
 msgstr "好友清單視窗透明度(_B)"
 
@@ -1246,19 +1252,19 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/win32/transparency/win2ktrans.c:463
+#: plugins/win32/transparency/win2ktrans.c:462
 msgid "Transparency"
 msgstr "透明度"
 
 #. *< name
 #. *< version
 #. *  summary
-#: plugins/win32/transparency/win2ktrans.c:466
+#: plugins/win32/transparency/win2ktrans.c:465
 msgid "Variable Transparency for the buddy list and conversations."
 msgstr "交談視窗及好友清單產生的半透明效果。"
 
 #. *  description
-#: plugins/win32/transparency/win2ktrans.c:468
+#: plugins/win32/transparency/win2ktrans.c:467
 msgid ""
 "This plugin enables variable alpha transparency on conversation windows and "
 "the buddy list.\n"
@@ -1283,8 +1289,8 @@
 msgstr "當 Windows 啟動時同時執行 Gaim(_S)"
 
 #. Buddy List
-#: plugins/win32/winprefs/winprefs.c:362 src/gtkblist.c:3025
-#: src/gtkprefs.c:2399
+#: plugins/win32/winprefs/winprefs.c:362 src/gtkblist.c:3057
+#: src/gtkprefs.c:2412
 msgid "Buddy List"
 msgstr "好友清單"
 
@@ -1303,8 +1309,8 @@
 msgstr "將好友清單視窗保持在桌面的最上層(_K)"
 
 #. Conversations
-#: plugins/win32/winprefs/winprefs.c:382 src/gtkprefs.c:958
-#: src/gtkprefs.c:2400 src/protocols/msn/msn.c:1630
+#: plugins/win32/winprefs/winprefs.c:382 src/gtkprefs.c:1006
+#: src/gtkprefs.c:2413 src/protocols/msn/msn.c:1638
 msgid "Conversations"
 msgstr "交談"
 
@@ -1382,84 +1388,84 @@
 msgid "Crazy Patch Writers"
 msgstr "狂熱的模組作者"
 
-#: src/about.c:147
+#: src/about.c:148
 msgid "Retired Developers"
 msgstr "前任開發者"
 
-#: src/about.c:148
+#: src/about.c:149
 msgid "former libfaim maintainer"
 msgstr "前 libfaim 維護者"
 
-#: src/about.c:149
+#: src/about.c:150
 msgid "former lead developer"
 msgstr "前主要開發者"
 
-#: src/about.c:152
+#: src/about.c:153
 msgid "former maintainer"
 msgstr "前維護者"
 
-#: src/about.c:153
+#: src/about.c:154
 msgid "former Jabber developer"
 msgstr "前 Jabber 開發者"
 
-#: src/about.c:154
+#: src/about.c:155
 msgid "original author"
 msgstr "原作者"
 
-#: src/about.c:157
+#: src/about.c:158
 msgid "hacker and designated driver [lazy bum]"
 msgstr "程式編寫者兼指定司機 [懶人]"
 
-#: src/about.c:165
+#: src/about.c:166
 msgid "Current Translators"
 msgstr "現任譯者"
 
 # NOTE 寫出來的是「文」,不是「語」;下同 :-)
-#: src/about.c:166 src/about.c:204
+#: src/about.c:167 src/about.c:207
 msgid "Catalan"
 msgstr "加泰隆文"
 
-#: src/about.c:167 src/about.c:205
+#: src/about.c:168 src/about.c:208
 msgid "Czech"
 msgstr "捷克文"
 
-#: src/about.c:168
+#: src/about.c:169
 msgid "Danish"
 msgstr "丹麥文"
 
-#: src/about.c:169
+#: src/about.c:170
 msgid "British English"
 msgstr "英式英文"
 
-#: src/about.c:170
+#: src/about.c:171
 msgid "Canadian English"
 msgstr "加拿大式英文"
 
-#: src/about.c:171 src/about.c:206
+#: src/about.c:172 src/about.c:209
 msgid "German"
 msgstr "德文"
 
-#: src/about.c:172 src/about.c:207
+#: src/about.c:173 src/about.c:210
 msgid "Spanish"
 msgstr "西班牙文"
 
-#: src/about.c:173 src/about.c:208
+#: src/about.c:174 src/about.c:211
 msgid "Finnish"
 msgstr "芬蘭文"
 
-#: src/about.c:174 src/about.c:209
+#: src/about.c:175 src/about.c:212
 msgid "French"
 msgstr "法文"
 
-#: src/about.c:175
+#: src/about.c:176
 msgid "Hebrew"
 msgstr "希伯來文"
 
-#: src/about.c:176
+#: src/about.c:177
 msgid "Hindi"
 msgstr "北印度文"
 
-#: src/about.c:177
+#: src/about.c:178
 msgid "Hungarian"
 msgstr "匈牙利文"
 
@@ -1467,50 +1473,58 @@
 #  NOTE 國語去聲不分陰陽,廣東話兩聲卻相差甚遠。臺灣有網站寫「意大利」,
 #  NOTE 臺灣的中國圖書分類法亦有「意大利」條,譯「意大利」應該比較好。
 #  NOTE【參見「Slovenian」】
-#: src/about.c:178 src/about.c:210
+#: src/about.c:179 src/about.c:213
 msgid "Italian"
 msgstr "意大利文"
 
-#: src/about.c:179 src/about.c:212
+#: src/about.c:180 src/about.c:214
+msgid "Japanese"
+msgstr "日文"
+
+#: src/about.c:181
+msgid "Lithuanian"
+msgstr "立陶宛文"
+
+#: src/about.c:182 src/about.c:215
 msgid "Korean"
 msgstr "韓文"
 
 # NOTE Flemish 譯法是跟了http://www.ee.tku.edu.tw/~rexchen/cdict/
 # XXX Dutch 和 Flemish 是同一種語言,是否應該只寫「荷蘭文」,刪去「法蘭德斯文」?
-#: src/about.c:180
+#: src/about.c:183
 msgid "Dutch; Flemish"
 msgstr "荷蘭文/法蘭德斯文"
 
 #  NOTE「馬其頓文」是一種東歐語文,跟希臘的馬其頓並無關係
-#: src/about.c:181
+#: src/about.c:184
 msgid "Macedonian"
 msgstr "馬其頓文"
 
-#: src/about.c:182
+#: src/about.c:185
 msgid "Norwegian"
 msgstr "挪威文"
 
-#: src/about.c:183 src/about.c:213
+#: src/about.c:186 src/about.c:216
 msgid "Polish"
 msgstr "波蘭文"
 
-#: src/about.c:184
+#: src/about.c:187
 msgid "Portuguese"
 msgstr "標準萄文"
 
-#: src/about.c:185
+#: src/about.c:188
 msgid "Portuguese-Brazil"
 msgstr "巴西萄文"
 
-#: src/about.c:186
+#: src/about.c:189
 msgid "Romanian"
 msgstr "羅馬尼亞文"
 
-#: src/about.c:187 src/about.c:214 src/about.c:215
+#: src/about.c:190 src/about.c:217 src/about.c:218
 msgid "Russian"
 msgstr "俄文"
 
-#: src/about.c:188
+#: src/about.c:191
 msgid "Serbian"
 msgstr "塞爾維亞文"
 
@@ -1518,138 +1532,134 @@
 #  NOTE 以粵語發音,跟臺譯反而發音較準;況且,這至少名義上也是zh_TW;
 #  NOTE 所以不跟港譯(其實是大陸譯法),跟臺譯。
 #  NOTE【參見「Italian」】
-#: src/about.c:189
+#: src/about.c:192
 msgid "Slovenian"
 msgstr "斯洛維尼亞文"
 
-#: src/about.c:190 src/about.c:217
+#: src/about.c:193 src/about.c:220
 msgid "Swedish"
 msgstr "瑞典文"
 
-#: src/about.c:191
+#: src/about.c:194
 msgid "Vietnamese"
 msgstr "越南文"
 
-#: src/about.c:191
-msgid "Gnome Vi Team"
-msgstr "Gnome 越南文翻譯小組"
-
-#: src/about.c:193
+#: src/about.c:194
+msgid "and the Gnome-Vi Team"
+msgstr "及 Gnome 越南文翻譯小組之其他組員"
+
+#: src/about.c:196
 msgid "Simplified Chinese"
 msgstr "簡體中文"
 
-#: src/about.c:194
+#: src/about.c:197
 msgid "Traditional Chinese"
 msgstr "正體中文"
 
-#: src/about.c:201
+#: src/about.c:204
 msgid "Past Translators"
 msgstr "前任譯者"
 
 # XXX Yahoo譯法
-#: src/about.c:202
+#: src/about.c:205
 msgid "Amharic"
 msgstr "阿姆哈拉文"
 
-#: src/about.c:203
+#: src/about.c:206
 msgid "Bulgarian"
 msgstr "保加利亞文"
 
-#: src/about.c:211
-msgid "Japanese"
-msgstr "日文"
-
-#: src/about.c:216
+#: src/about.c:219
 msgid "Slovak"
 msgstr "斯洛伐克文"
 
-#: src/about.c:218
+#: src/about.c:221
 msgid "Chinese"
 msgstr "中文"
 
-#: src/account.c:278 src/protocols/jabber/jabber.c:1000
+#: src/account.c:277 src/protocols/jabber/jabber.c:1001
 msgid "New passwords do not match."
 msgstr "新密碼並不相符。"
 
 # NOTE 譯文更動 by Ambrose
-#: src/account.c:287
+#: src/account.c:286
 msgid "Fill out all fields completely."
 msgstr "請填妥整份表格所有的欄位。"
 
-#: src/account.c:312
+#: src/account.c:311
 msgid "Original password"
 msgstr "舊密碼"
 
-#: src/account.c:319
+#: src/account.c:318
 msgid "New password"
 msgstr "新密碼"
 
-#: src/account.c:326
+#: src/account.c:325
 msgid "New password (again)"
 msgstr "新密碼(再次確認)"
 
-#: src/account.c:332
+#: src/account.c:331
 #, c-format
 msgid "Change password for %s"
 msgstr "修改 %s 的密碼"
 
-#: src/account.c:340
+#: src/account.c:339
 msgid "Please enter your current password and your new password."
 msgstr "請輸入您目前的密碼以及希望使用的新密碼。"
 
 #. *
 #. * A wrapper for gaim_request_action() that uses OK and Cancel buttons.
 #.
-#: src/account.c:343 src/connection.c:197 src/dialogs.c:462 src/dialogs.c:518
-#: src/dialogs.c:571 src/gtkblist.c:2343 src/gtkrequest.c:235
-#: src/protocols/jabber/jabber.c:1047 src/protocols/jabber/xdata.c:337
+#: src/account.c:342 src/connection.c:197 src/dialogs.c:462 src/dialogs.c:518
+#: src/dialogs.c:571 src/gtkblist.c:2391 src/gtkrequest.c:242
+#: src/protocols/jabber/jabber.c:1048 src/protocols/jabber/xdata.c:337
 #: src/protocols/msn/msn.c:226 src/protocols/msn/msn.c:241
 #: src/protocols/msn/msn.c:256 src/protocols/msn/msn.c:271
-#: src/protocols/oscar/oscar.c:3353 src/protocols/oscar/oscar.c:3447
-#: src/protocols/oscar/oscar.c:6731 src/protocols/oscar/oscar.c:6828
-#: src/protocols/oscar/oscar.c:6880 src/protocols/oscar/oscar.c:6966
+#: src/protocols/oscar/oscar.c:3369 src/protocols/oscar/oscar.c:3463
+#: src/protocols/oscar/oscar.c:6748 src/protocols/oscar/oscar.c:6844
+#: src/protocols/oscar/oscar.c:6896 src/protocols/oscar/oscar.c:6982
 #: src/protocols/silc/buddy.c:460 src/protocols/silc/buddy.c:1132
-#: src/protocols/silc/chat.c:406 src/protocols/silc/chat.c:444
-#: src/protocols/silc/chat.c:707 src/protocols/silc/ops.c:1004
-#: src/protocols/silc/ops.c:1465 src/protocols/silc/silc.c:692
-#: src/protocols/yahoo/yahoo.c:2743 src/protocols/yahoo/yahoo.c:2752
-#: src/request.h:1242
+#: src/protocols/silc/chat.c:409 src/protocols/silc/chat.c:447
+#: src/protocols/silc/chat.c:710 src/protocols/silc/ops.c:1063
+#: src/protocols/silc/ops.c:1671 src/protocols/silc/silc.c:692
+#: src/protocols/yahoo/yahoo.c:2752 src/protocols/yahoo/yahoo.c:2761
+#: src/request.h:1243
 msgid "OK"
 msgstr "確定"
 
-#: src/account.c:344 src/account.c:382 src/away.c:334 src/connection.c:198
+#: src/account.c:343 src/account.c:381 src/away.c:334 src/connection.c:198
 #: src/dialogs.c:299 src/dialogs.c:311 src/dialogs.c:324 src/dialogs.c:345
 #: src/dialogs.c:463 src/dialogs.c:519 src/dialogs.c:572 src/dialogs.c:808
-#: src/dialogs.c:824 src/dialogs.c:842 src/gtkaccount.c:1948
-#: src/gtkaccount.c:2439 src/gtkblist.c:2344 src/gtkblist.c:4379
+#: src/dialogs.c:824 src/dialogs.c:842 src/gtkaccount.c:2002
+#: src/gtkaccount.c:2498 src/gtkblist.c:2392 src/gtkblist.c:4411
 #: src/gtkconn.c:168 src/gtkimhtmltoolbar.c:414 src/gtkprivacy.c:587
 #: src/gtkprivacy.c:600 src/gtkprivacy.c:625 src/gtkprivacy.c:636
-#: src/gtkrequest.c:236 src/protocols/icq/gaim_icq.c:277
-#: src/protocols/jabber/buddy.c:516 src/protocols/jabber/chat.c:710
-#: src/protocols/jabber/jabber.c:666 src/protocols/jabber/jabber.c:1048
+#: src/gtkrequest.c:243 src/protocols/icq/gaim_icq.c:277
+#: src/protocols/jabber/buddy.c:515 src/protocols/jabber/chat.c:710
+#: src/protocols/jabber/jabber.c:667 src/protocols/jabber/jabber.c:1049
 #: src/protocols/jabber/xdata.c:338 src/protocols/msn/msn.c:227
 #: src/protocols/msn/msn.c:242 src/protocols/msn/msn.c:257
 #: src/protocols/msn/msn.c:272 src/protocols/msn/msn.c:289
-#: src/protocols/oscar/oscar.c:1371 src/protocols/oscar/oscar.c:3313
-#: src/protocols/oscar/oscar.c:3354 src/protocols/oscar/oscar.c:3391
-#: src/protocols/oscar/oscar.c:3448 src/protocols/oscar/oscar.c:6732
-#: src/protocols/oscar/oscar.c:6829 src/protocols/oscar/oscar.c:6881
-#: src/protocols/oscar/oscar.c:6950 src/protocols/oscar/oscar.c:6967
+#: src/protocols/oscar/oscar.c:1377 src/protocols/oscar/oscar.c:3329
+#: src/protocols/oscar/oscar.c:3370 src/protocols/oscar/oscar.c:3407
+#: src/protocols/oscar/oscar.c:3464 src/protocols/oscar/oscar.c:6749
+#: src/protocols/oscar/oscar.c:6845 src/protocols/oscar/oscar.c:6897
+#: src/protocols/oscar/oscar.c:6966 src/protocols/oscar/oscar.c:6983
 #: src/protocols/silc/buddy.c:461 src/protocols/silc/buddy.c:1037
-#: src/protocols/silc/buddy.c:1133 src/protocols/silc/chat.c:579
-#: src/protocols/silc/chat.c:708 src/protocols/silc/ops.c:1466
+#: src/protocols/silc/buddy.c:1133 src/protocols/silc/chat.c:582
+#: src/protocols/silc/chat.c:711 src/protocols/silc/ops.c:1672
 #: src/protocols/silc/silc.c:693 src/protocols/trepia/trepia.c:347
-#: src/protocols/yahoo/yahoo.c:2744 src/protocols/yahoo/yahoo.c:2753
-#: src/request.h:1242 src/request.h:1252
+#: src/protocols/yahoo/yahoo.c:2753 src/protocols/yahoo/yahoo.c:2762
+#: src/request.h:1243 src/request.h:1253
 msgid "Cancel"
 msgstr "取消"
 
-#: src/account.c:373
+#: src/account.c:372
 #, c-format
 msgid "Change user information for %s"
 msgstr "更改 %s 的個人資訊"
 
-#: src/account.c:381 src/gtkrequest.c:242 src/protocols/jabber/buddy.c:515
+#: src/account.c:380 src/gtkrequest.c:249 src/protocols/jabber/buddy.c:514
 #: src/protocols/trepia/trepia.c:346
 msgid "Save"
 msgstr "儲存"
@@ -1672,8 +1682,8 @@
 msgstr "移除離開訊息"
 
 #. Remove button
-#: src/away.c:333 src/gtkconv.c:1352 src/gtkconv.c:3570 src/gtkconv.c:3669
-#: src/gtkrequest.c:241
+#: src/away.c:333 src/gtkconv.c:1388 src/gtkconv.c:3680 src/gtkconv.c:3784
+#: src/gtkrequest.c:248
 msgid "Remove"
 msgstr "移除"
 
@@ -1708,23 +1718,19 @@
 msgid "Group not removed"
 msgstr "群組未被移除"
 
-#: src/blist.c:1393 src/gtkaccount.c:167 src/gtkft.c:161 src/gtkutils.c:721
-#: src/protocols/jabber/buddy.c:571 src/protocols/novell/novell.c:2736
+#: src/blist.c:1393 src/gtkaccount.c:167 src/gtkft.c:154 src/gtkutils.c:627
+#: src/protocols/jabber/buddy.c:570 src/protocols/novell/novell.c:2736
 msgid "Unknown"
 msgstr "未知"
 
-#: src/blist.c:1721
-msgid "Invalid Groupname"
-msgstr "無效的群組名稱"
-
-#: src/blist.c:2192
+#: src/blist.c:2001
 msgid ""
 "An error was encountered parsing your buddy list.  It has not been loaded, "
 "and the old file has moved to blist.xml~."
 msgstr ""
 "在解析您的好友清單時發生錯誤。好友清單沒有被讀入,舊檔已移至blist.xml~。"
 
-#: src/blist.c:2195
+#: src/blist.c:2004
 msgid "Buddy List Error"
 msgstr "好友清單錯誤"
 
@@ -1746,11 +1752,11 @@
 msgid "Enter password for %s"
 msgstr "輸入 %s 的密碼"
 
-#: src/conversation.c:271
+#: src/conversation.c:261
 msgid "Unable to send message. The message is too large."
 msgstr "無法送出訊息。這個訊息太大了。"
 
-#: src/conversation.c:279
+#: src/conversation.c:269
 msgid "Unable to send message."
 msgstr "無法送出訊息。"
 
@@ -1759,7 +1765,7 @@
 # #, c-format
 # msgid "%d %s in room"
 # msgstr "聊天室有 %d 家伙"
-#: src/conversation.c:1960
+#: src/conversation.c:1953
 #, c-format
 msgid "%s entered the room."
 msgstr "%s 進入聊天室。"
@@ -1769,58 +1775,58 @@
 # #, c-format
 # msgid "%d %s in room"
 # msgstr "聊天室有 %d 家伙"
-#: src/conversation.c:1963
+#: src/conversation.c:1956
 #, c-format
 msgid "%s [<I>%s</I>] entered the room."
 msgstr "%s [<I>%s</I>] 進入聊天室。"
 
-#: src/conversation.c:2054
+#: src/conversation.c:2047
 #, c-format
 msgid "You are now known as %s"
 msgstr "你改變暱稱為 %s"
 
-#: src/conversation.c:2057
+#: src/conversation.c:2050
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s 改變暱稱為 %s"
 
-#: src/conversation.c:2099
+#: src/conversation.c:2092
 #, c-format
 msgid "%s left the room (%s)."
 msgstr "%s 離開聊天室 (%s)。"
 
-#: src/conversation.c:2101
+#: src/conversation.c:2094
 #, c-format
 msgid "%s left the room."
 msgstr "%s 離開聊天室。"
 
-#: src/conversation.c:2172
+#: src/conversation.c:2165
 #, c-format
 msgid "(+%d more)"
 msgstr "(以及另外 %d 個)"
 
-#: src/conversation.c:2174
+#: src/conversation.c:2167
 #, c-format
 msgid " left the room (%s)."
 msgstr " 離開聊天室 (%s)。"
 
-#: src/conversation.c:2464
+#: src/conversation.c:2457
 msgid "Last created window"
 msgstr "上一個開啟的視窗"
 
-#: src/conversation.c:2466
+#: src/conversation.c:2459
 msgid "Separate IM and Chat windows"
 msgstr "以不同的視窗顯示即時訊息和聊天"
 
-#: src/conversation.c:2468 src/gtkprefs.c:1335
+#: src/conversation.c:2461 src/gtkprefs.c:1384
 msgid "New window"
 msgstr "新視窗"
 
-#: src/conversation.c:2470
+#: src/conversation.c:2463
 msgid "By group"
 msgstr "依群組"
 
-#: src/conversation.c:2472
+#: src/conversation.c:2465
 msgid "By account"
 msgstr "依帳號"
 
@@ -1972,8 +1978,8 @@
 msgid "Enter an alias for this chat."
 msgstr "請為這個聊天室輸入一個別名。"
 
-#: src/dialogs.c:807 src/dialogs.c:823 src/dialogs.c:841 src/gtkrequest.c:243
-#: src/protocols/silc/chat.c:569
+#: src/dialogs.c:807 src/dialogs.c:823 src/dialogs.c:841 src/gtkrequest.c:250
+#: src/protocols/silc/chat.c:572
 msgid "Alias"
 msgstr "別名"
 
@@ -1996,22 +2002,52 @@
 msgid "Alias Buddy"
 msgstr "為好友加上別名"
 
-#: src/ft.c:144
+#: src/ft.c:125
+msgid "That file does not exist."
+msgstr "檔案不存在。"
+
+#: src/ft.c:134
+msgid "Cannot send a file of 0 bytes."
+msgstr "無法傳送空的檔案。"
+
+#: src/ft.c:194
+#, c-format
+msgid "%s wants to send you %s (%s)"
+msgstr "%s 想要送 %s (%s) 給您"
+
+#: src/ft.c:230
+#, c-format
+msgid "Accept file transfer request from %s?"
+msgstr "接受來自於「%s」的檔案傳輸要求嗎?"
+
+#  XXX 暫譯
+#: src/ft.c:234
+#, c-format
+msgid ""
+"A file is available for download from:\n"
+"Remote host: %s\n"
+"Remote port: %d"
+msgstr ""
+"有檔案可以下載:\n"
+"遠端主機 :%s\n"
+"遠端通訊埠:%d"
+
+#: src/ft.c:286
 #, c-format
 msgid "%s is not a valid filename.\n"
 msgstr "%s 不是一個有效的檔案名稱。\n"
 
-#: src/ft.c:157
+#: src/ft.c:299
 #, c-format
 msgid "%s was not found.\n"
 msgstr "%s 找不到。\n"
 
-#: src/ft.c:786
+#: src/ft.c:928
 #, c-format
 msgid "File transfer to %s aborted.\n"
 msgstr "傳送檔案到 %s 被取消。\n"
 
-#: src/ft.c:788
+#: src/ft.c:930
 #, c-format
 msgid "File transfer from %s aborted.\n"
 msgstr "由 %s 傳送檔案被取消。\n"
@@ -2103,23 +2139,23 @@
 msgid "sorry, i ran out for a while. bbl"
 msgstr "不好意思,我離開一下下。"
 
-#: src/gaimrc.c:372 src/gaimrc.c:1409
+#: src/gaimrc.c:372 src/gaimrc.c:1417
 msgid "boring default"
 msgstr "無聊(預設)"
 
-#: src/gaimrc.c:1219 src/gtkblist.c:2986
+#: src/gaimrc.c:1227 src/gtkblist.c:3017
 msgid "Alphabetical"
 msgstr "依照字母"
 
-#: src/gaimrc.c:1221 src/gtkblist.c:2987
+#: src/gaimrc.c:1229 src/gtkblist.c:3018
 msgid "By status"
 msgstr "依照狀態"
 
-#: src/gaimrc.c:1223 src/gtkblist.c:2988
+#: src/gaimrc.c:1231 src/gtkblist.c:3019
 msgid "By log size"
 msgstr "依照日誌大小"
 
-#: src/gtkaccount.c:309
+#: src/gtkaccount.c:331
 #, c-format
 msgid ""
 "<b>File:</b> %s\n"
@@ -2131,168 +2167,168 @@
 "<b>圖像尺寸:</b> %d×%d"
 
 #. Build the login options frame.
-#: src/gtkaccount.c:560
+#: src/gtkaccount.c:614
 msgid "Login Options"
 msgstr "登入選項"
 
-#: src/gtkaccount.c:577
+#: src/gtkaccount.c:631
 msgid "Protocol:"
 msgstr "通訊協定:"
 
-#: src/gtkaccount.c:582 src/gtkblist.c:3985
+#: src/gtkaccount.c:636 src/gtkblist.c:4017
 msgid "Screen Name:"
 msgstr "帳號:"
 
-#: src/gtkaccount.c:655
+#: src/gtkaccount.c:709
 msgid "Password:"
 msgstr "密碼:"
 
-#: src/gtkaccount.c:660 src/gtkblist.c:3999 src/gtkblist.c:4327
+#: src/gtkaccount.c:714 src/gtkblist.c:4031 src/gtkblist.c:4359
 msgid "Alias:"
 msgstr "別名:"
 
-#: src/gtkaccount.c:664
+#: src/gtkaccount.c:718
 msgid "Remember password"
 msgstr "記住密碼"
 
 #. Build the user options frame.
-#: src/gtkaccount.c:720
+#: src/gtkaccount.c:774
 msgid "User Options"
 msgstr "使用者自定選項"
 
-#: src/gtkaccount.c:733
+#: src/gtkaccount.c:787
 msgid "New mail notifications"
 msgstr "新郵件通知"
 
-#: src/gtkaccount.c:742
+#: src/gtkaccount.c:796
 msgid "Buddy icon:"
 msgstr "好友圖示:"
 
 #. Build the protocol options frame.
-#: src/gtkaccount.c:831
+#: src/gtkaccount.c:885
 #, c-format
 msgid "%s Options"
 msgstr "%s 選項"
 
 #. Use Global Proxy Settings
-#: src/gtkaccount.c:967 src/gtkaccount.c:1014
+#: src/gtkaccount.c:1021 src/gtkaccount.c:1068
 msgid "Use Global Proxy Settings"
 msgstr "使用全域的代理伺服器設定"
 
 # NOTE 可以有代理伺服器但毋須用
 # NOTE 香港普遍用「毋須」,但講國語「毋須」會不通順,「不使用」較好
 #. No Proxy
-#: src/gtkaccount.c:973 src/gtkaccount.c:1021
+#: src/gtkaccount.c:1027 src/gtkaccount.c:1075
 msgid "No Proxy"
 msgstr "不使用代理伺服器"
 
 #. HTTP
-#: src/gtkaccount.c:979 src/gtkaccount.c:1028
+#: src/gtkaccount.c:1033 src/gtkaccount.c:1082
 msgid "HTTP"
 msgstr "HTTP"
 
 #. SOCKS 4
-#: src/gtkaccount.c:985 src/gtkaccount.c:1035
+#: src/gtkaccount.c:1039 src/gtkaccount.c:1089
 msgid "SOCKS 4"
 msgstr "SOCKS 4"
 
 #. SOCKS 5
-#: src/gtkaccount.c:991 src/gtkaccount.c:1042
+#: src/gtkaccount.c:1045 src/gtkaccount.c:1096
 msgid "SOCKS 5"
 msgstr "SOCKS 5"
 
 #. Use Environmental Settings
-#: src/gtkaccount.c:997 src/gtkaccount.c:1049 src/gtkprefs.c:1139
+#: src/gtkaccount.c:1051 src/gtkaccount.c:1103 src/gtkprefs.c:1187
 msgid "Use Environmental Settings"
 msgstr "使用環境變數設定"
 
-#: src/gtkaccount.c:1088
+#: src/gtkaccount.c:1142
 msgid "you can see the butterflies mating"
 msgstr "鴛鴦蝴蝶也看得見耶"
 
-#: src/gtkaccount.c:1092
+#: src/gtkaccount.c:1146
 msgid "If you look real closely"
 msgstr "如果您看得夠仔細"
 
-#: src/gtkaccount.c:1108
+#: src/gtkaccount.c:1162
 msgid "Proxy Options"
 msgstr "代理伺服器選項"
 
-#: src/gtkaccount.c:1126 src/gtkprefs.c:1133
+#: src/gtkaccount.c:1180 src/gtkprefs.c:1181
 msgid "Proxy _type:"
 msgstr "代理伺服器型態(_T):"
 
-#: src/gtkaccount.c:1135 src/gtkprefs.c:1160
+#: src/gtkaccount.c:1189 src/gtkprefs.c:1208
 msgid "_Host:"
 msgstr "主機位址(_H):"
 
-#: src/gtkaccount.c:1139 src/gtkprefs.c:1178
+#: src/gtkaccount.c:1193 src/gtkprefs.c:1226
 msgid "_Port:"
 msgstr "通訊埠(_P):"
 
-#: src/gtkaccount.c:1147
+#: src/gtkaccount.c:1201
 msgid "_Username:"
 msgstr "使用者(_U):"
 
-#: src/gtkaccount.c:1152 src/gtkprefs.c:1215
+#: src/gtkaccount.c:1206 src/gtkprefs.c:1263
 msgid "Pa_ssword:"
 msgstr "密碼(_S):"
 
-#: src/gtkaccount.c:1524
+#: src/gtkaccount.c:1578
 msgid "Add Account"
 msgstr "新增帳號"
 
-#: src/gtkaccount.c:1526
+#: src/gtkaccount.c:1580
 msgid "Modify Account"
 msgstr "修改帳號"
 
 #  NOTE 譯文更動 by Ambrose
 #. Add the disclosure
-#: src/gtkaccount.c:1550
+#: src/gtkaccount.c:1604
 msgid "Show more options"
 msgstr "顯示細節"
 
 #  NOTE 譯文更動 by Ambrose
-#: src/gtkaccount.c:1551
+#: src/gtkaccount.c:1605
 msgid "Show fewer options"
 msgstr "隱藏細節"
 
 #. Register button
-#: src/gtkaccount.c:1578 src/protocols/jabber/jabber.c:665
+#: src/gtkaccount.c:1632 src/protocols/jabber/jabber.c:666
 msgid "Register"
 msgstr "註冊"
 
-#: src/gtkaccount.c:1943
+#: src/gtkaccount.c:1997
 #, c-format
 msgid "Are you sure you want to delete %s?"
 msgstr "您確定要刪除 %s?"
 
-#: src/gtkaccount.c:1947 src/gtkrequest.c:239
+#: src/gtkaccount.c:2001 src/gtkrequest.c:246
 msgid "Delete"
 msgstr "刪除"
 
-#: src/gtkaccount.c:2061 src/protocols/oscar/oscar.c:3981
+#: src/gtkaccount.c:2115 src/protocols/oscar/oscar.c:3997
 msgid "Screen Name"
 msgstr "帳號"
 
-#: src/gtkaccount.c:2084 src/protocols/jabber/jabber.c:957
-#: src/protocols/oscar/oscar.c:534 src/protocols/oscar/oscar.c:5463
-#: src/protocols/oscar/oscar.c:6661 src/protocols/silc/silc.c:44
-#: src/protocols/yahoo/yahoo.c:2487 src/protocols/zephyr/zephyr.c:1208
-#: src/protocols/zephyr/zephyr.c:1218
+#: src/gtkaccount.c:2139 src/protocols/jabber/jabber.c:958
+#: src/protocols/oscar/oscar.c:538 src/protocols/oscar/oscar.c:5479
+#: src/protocols/oscar/oscar.c:6678 src/protocols/silc/silc.c:44
+#: src/protocols/yahoo/yahoo.c:2515 src/protocols/zephyr/zephyr.c:1360
+#: src/protocols/zephyr/zephyr.c:1372
 msgid "Online"
 msgstr "上線"
 
-#: src/gtkaccount.c:2102
+#: src/gtkaccount.c:2160
 msgid "Protocol"
 msgstr "通訊協定"
 
-#: src/gtkaccount.c:2414
+#: src/gtkaccount.c:2473
 #, c-format
 msgid "%s%s%s%s has made %s his or her buddy%s%s%s"
 msgstr "%s%s%s%s 加入了 %s 為他(她)的好友 %s%s%s"
 
-#: src/gtkaccount.c:2428
+#: src/gtkaccount.c:2487
 msgid ""
 "\n"
 "\n"
@@ -2302,228 +2338,232 @@
 "\n"
 "您想將他(她)加入到您的好友名單中嗎?"
 
-#: src/gtkaccount.c:2432
+#: src/gtkaccount.c:2491
 msgid "Information"
 msgstr "資訊"
 
-#: src/gtkaccount.c:2436
+#: src/gtkaccount.c:2495
 msgid "Add buddy to your list?"
 msgstr "將使用者加入您的好友清單?"
 
 #. Add button
-#: src/gtkaccount.c:2438 src/gtkblist.c:4378 src/gtkconv.c:1354
-#: src/gtkconv.c:3563 src/gtkconv.c:3662 src/gtkrequest.c:240
-#: src/protocols/icq/gaim_icq.c:277 src/protocols/oscar/oscar.c:3610
-#: src/protocols/silc/chat.c:578
+#: src/gtkaccount.c:2497 src/gtkblist.c:4410 src/gtkconv.c:1390
+#: src/gtkconv.c:3673 src/gtkconv.c:3777 src/gtkrequest.c:247
+#: src/protocols/icq/gaim_icq.c:277 src/protocols/oscar/oscar.c:3626
+#: src/protocols/silc/chat.c:581
 msgid "Add"
 msgstr "加入"
 
 # TODO 看起來應該為加一個新的聊天室,並把聊天室歸類到某個群組。
 # NOTE 譯文更動 by Paladin
-#: src/gtkblist.c:810
+#: src/gtkblist.c:815
 msgid "Join a Chat"
 msgstr "加入聊天室"
 
-#: src/gtkblist.c:831
+#: src/gtkblist.c:836
 msgid ""
 "Please enter the appropriate information about the chat you would like to "
 "join.\n"
 msgstr "請輸入關於您所想加入好友清單的聊天室的適當資訊。\n"
 
-#: src/gtkblist.c:842 src/gtkpounce.c:445 src/gtkroomlist.c:354
+#: src/gtkblist.c:847 src/gtkpounce.c:412 src/gtkroomlist.c:354
 msgid "_Account:"
 msgstr "帳號(_A):"
 
-#: src/gtkblist.c:1128 src/gtkblist.c:3179
+#: src/gtkblist.c:1133 src/gtkblist.c:3211
 msgid "Get _Info"
 msgstr "取得資訊(_I)"
 
-#: src/gtkblist.c:1131 src/gtkblist.c:3170
+#: src/gtkblist.c:1136 src/gtkblist.c:3202
 msgid "I_M"
 msgstr "即時訊息(_M)"
 
-#: src/gtkblist.c:1133
+#: src/gtkblist.c:1141
+msgid "_Send File"
+msgstr "傳送檔案(_S)"
+
+#: src/gtkblist.c:1145
 msgid "Add Buddy _Pounce"
 msgstr "加入好友狀態捕捉(_P)"
 
-#: src/gtkblist.c:1135
+#: src/gtkblist.c:1147
 msgid "View _Log"
 msgstr "觀看日誌(_L)"
 
-#: src/gtkblist.c:1143 src/gtkblist.c:1229 src/gtkblist.c:1243
+#: src/gtkblist.c:1155 src/gtkblist.c:1241 src/gtkblist.c:1255
 msgid "_Alias..."
 msgstr "別名(_A)..."
 
-#: src/gtkblist.c:1145 src/gtkblist.c:1231 src/gtkblist.c:1248
+#: src/gtkblist.c:1157 src/gtkblist.c:1243 src/gtkblist.c:1260
 #: src/gtkconn.c:361
 msgid "_Remove"
 msgstr "移除(_R)"
 
-#: src/gtkblist.c:1191
+#: src/gtkblist.c:1203
 msgid "Add a _Buddy"
 msgstr "新增一個好友(_B)"
 
-#: src/gtkblist.c:1193
+#: src/gtkblist.c:1205
 msgid "Add a C_hat"
 msgstr "新增一個聊天室(_H)"
 
-#: src/gtkblist.c:1195
+#: src/gtkblist.c:1207
 msgid "_Delete Group"
 msgstr "刪除群組(_D)"
 
-#: src/gtkblist.c:1197
+#: src/gtkblist.c:1209
 msgid "_Rename"
 msgstr "重命名(_R)"
 
 #. join button
-#: src/gtkblist.c:1219 src/gtkroomlist.c:263 src/gtkroomlist.c:409
+#: src/gtkblist.c:1231 src/gtkroomlist.c:263 src/gtkroomlist.c:409
 #: src/stock.c:87
 msgid "_Join"
 msgstr "加入(_J)"
 
-#: src/gtkblist.c:1221
+#: src/gtkblist.c:1233
 msgid "Auto-Join"
 msgstr "自動加入"
 
-#: src/gtkblist.c:1245 src/gtkblist.c:1274
+#: src/gtkblist.c:1257 src/gtkblist.c:1286
 msgid "_Collapse"
 msgstr "收起(_C)"
 
-#: src/gtkblist.c:1279
+#: src/gtkblist.c:1291
 msgid "_Expand"
 msgstr "展開(_E)"
 
 # XXX 暫譯
-#: src/gtkblist.c:1937 src/gtkconv.c:4199 src/gtkpounce.c:347
+#: src/gtkblist.c:1949 src/gtkconv.c:4317 src/gtkpounce.c:314
 msgid ""
 "You are not currently signed on with an account that can add that buddy."
 msgstr "您並未登入任何一個可供您新增哪個好友的通訊協定。"
 
 #. Buddies menu
-#: src/gtkblist.c:2288
+#: src/gtkblist.c:2336
 msgid "/_Buddies"
 msgstr "/好友(_B)"
 
-#: src/gtkblist.c:2289
+#: src/gtkblist.c:2337
 msgid "/Buddies/New Instant _Message..."
 msgstr "/好友/新即時訊息(_M)"
 
-#: src/gtkblist.c:2290
+#: src/gtkblist.c:2338
 msgid "/Buddies/Join a _Chat..."
 msgstr "/好友/加入聊天室(_C)"
 
-#: src/gtkblist.c:2291
+#: src/gtkblist.c:2339
 msgid "/Buddies/Get User _Info..."
 msgstr "/好友/取得使用者資訊(_I)..."
 
 #  NOTE 此處譯「讀取」似乎較「取得」好一點
-#: src/gtkblist.c:2292
+#: src/gtkblist.c:2340
 msgid "/Buddies/View User _Log..."
 msgstr "/好友/讀取使用者日誌(_L)..."
 
-#: src/gtkblist.c:2294
+#: src/gtkblist.c:2342
 msgid "/Buddies/Show _Offline Buddies"
 msgstr "/好友/顯示離線好友(_O)"
 
-#: src/gtkblist.c:2295
+#: src/gtkblist.c:2343
 msgid "/Buddies/Show _Empty Groups"
 msgstr "/好友/顯示空白的群組(_E)"
 
-#: src/gtkblist.c:2296
+#: src/gtkblist.c:2344
 msgid "/Buddies/_Add Buddy..."
 msgstr "/好友/新增好友(_A)..."
 
-#: src/gtkblist.c:2297
+#: src/gtkblist.c:2345
 msgid "/Buddies/Add C_hat..."
 msgstr "/好友/新增聊天室(_H)..."
 
-#: src/gtkblist.c:2298
+#: src/gtkblist.c:2346
 msgid "/Buddies/Add _Group..."
 msgstr "/好友/新增群組(_G)..."
 
-#: src/gtkblist.c:2300
+#: src/gtkblist.c:2348
 msgid "/Buddies/_Signoff"
 msgstr "/好友/登出(_S)"
 
-#: src/gtkblist.c:2301
+#: src/gtkblist.c:2349
 msgid "/Buddies/_Quit"
 msgstr "/好友/結束程式(_Q)"
 
 #. Tools
-#: src/gtkblist.c:2304
+#: src/gtkblist.c:2352
 msgid "/_Tools"
 msgstr "工具(_T)"
 
-#: src/gtkblist.c:2305
+#: src/gtkblist.c:2353
 msgid "/Tools/_Away"
 msgstr "/工具/離開(_A)"
 
-#: src/gtkblist.c:2306
+#: src/gtkblist.c:2354
 msgid "/Tools/Buddy _Pounce"
 msgstr "/工具/好友狀態捕捉(_P)"
 
-#: src/gtkblist.c:2307
+#: src/gtkblist.c:2355
 msgid "/Tools/Account Ac_tions"
 msgstr "/工具/帳號相關指令(_T)"
 
-#: src/gtkblist.c:2308
+#: src/gtkblist.c:2356
 msgid "/Tools/Pl_ugin Actions"
 msgstr "/工具/模組相關指令(_U)"
 
-#: src/gtkblist.c:2310
+#: src/gtkblist.c:2358
 msgid "/Tools/A_ccounts"
 msgstr "/工具/帳號清單(_C)"
 
-#: src/gtkblist.c:2311
+#: src/gtkblist.c:2359
 msgid "/Tools/_File Transfers"
 msgstr "/工具/檔案傳輸(_F)"
 
-#: src/gtkblist.c:2312
+#: src/gtkblist.c:2360
 msgid "/Tools/R_oom List"
 msgstr "/工具/聊天室清單(_O)"
 
-#: src/gtkblist.c:2313
+#: src/gtkblist.c:2361
 msgid "/Tools/Pr_eferences"
 msgstr "/工具/偏好設定(_E)"
 
-#: src/gtkblist.c:2314
+#: src/gtkblist.c:2362
 msgid "/Tools/Pr_ivacy"
 msgstr "/工具/隱私設定(_I)"
 
-#: src/gtkblist.c:2316
+#: src/gtkblist.c:2364
 msgid "/Tools/View System _Log"
 msgstr "觀看系統日誌(_L)"
 
 #. Help
-#: src/gtkblist.c:2319
+#: src/gtkblist.c:2367
 msgid "/_Help"
 msgstr "說明(_H)"
 
-#: src/gtkblist.c:2320
+#: src/gtkblist.c:2368
 msgid "/Help/Online _Help"
 msgstr "線上說明(_H)"
 
-#: src/gtkblist.c:2321
+#: src/gtkblist.c:2369
 msgid "/Help/_Debug Window"
 msgstr "/說明/除錯視窗(_D)"
 
-#: src/gtkblist.c:2322
+#: src/gtkblist.c:2370
 msgid "/Help/_About"
 msgstr "/說明/關於(_A)"
 
-#: src/gtkblist.c:2340
+#: src/gtkblist.c:2388
 msgid "Rename Group"
 msgstr "修改群組名稱"
 
-#: src/gtkblist.c:2340
+#: src/gtkblist.c:2388
 msgid "New group name"
 msgstr "新名字"
 
-#: src/gtkblist.c:2341
+#: src/gtkblist.c:2389
 msgid "Please enter a new name for the selected group."
 msgstr "請為選取的群組輸入一個新的名稱。"
 
-#: src/gtkblist.c:2369
+#: src/gtkblist.c:2417
 #, c-format
 msgid ""
 "\n"
@@ -2532,7 +2572,7 @@
 "\n"
 "<b>帳號:</b>%s"
 
-#: src/gtkblist.c:2433
+#: src/gtkblist.c:2481
 msgid ""
 "\n"
 "<b>Status:</b> Offline"
@@ -2540,12 +2580,12 @@
 "\n"
 "<b>狀態:</b>離線"
 
-#: src/gtkblist.c:2448
+#: src/gtkblist.c:2496
 #, c-format
 msgid "%d%%"
 msgstr "%d%%"
 
-#: src/gtkblist.c:2464
+#: src/gtkblist.c:2512
 msgid ""
 "\n"
 "<b>Account:</b>"
@@ -2553,7 +2593,7 @@
 "\n"
 "<b>帳號:</b>"
 
-#: src/gtkblist.c:2465
+#: src/gtkblist.c:2513
 msgid ""
 "\n"
 "<b>Contact Alias:</b>"
@@ -2561,7 +2601,7 @@
 "\n"
 "<b>別名:</b>"
 
-#: src/gtkblist.c:2466
+#: src/gtkblist.c:2514
 msgid ""
 "\n"
 "<b>Alias:</b>"
@@ -2569,7 +2609,7 @@
 "\n"
 "<b>別名:</b>"
 
-#: src/gtkblist.c:2467
+#: src/gtkblist.c:2515
 msgid ""
 "\n"
 "<b>Nickname:</b>"
@@ -2577,7 +2617,7 @@
 "\n"
 "<b>暱稱:</b>"
 
-#: src/gtkblist.c:2468
+#: src/gtkblist.c:2516
 msgid ""
 "\n"
 "<b>Logged In:</b>"
@@ -2585,7 +2625,7 @@
 "\n"
 "<b>登入時間:</b>"
 
-#: src/gtkblist.c:2469
+#: src/gtkblist.c:2517
 msgid ""
 "\n"
 "<b>Idle:</b>"
@@ -2593,7 +2633,7 @@
 "\n"
 "<b>閒置:</b>"
 
-#: src/gtkblist.c:2470
+#: src/gtkblist.c:2518
 msgid ""
 "\n"
 "<b>Warned:</b>"
@@ -2601,7 +2641,7 @@
 "\n"
 "<b>警告:<b>"
 
-#: src/gtkblist.c:2472
+#: src/gtkblist.c:2520
 msgid ""
 "\n"
 "<b>Description:</b> Spooky"
@@ -2609,7 +2649,7 @@
 "\n"
 "<b>介紹:</b>幽靈似的"
 
-#: src/gtkblist.c:2473
+#: src/gtkblist.c:2521
 msgid ""
 "\n"
 "<b>Status</b>: Awesome"
@@ -2617,7 +2657,7 @@
 "\n"
 "<b>狀態:</b>頂呱呱"
 
-#: src/gtkblist.c:2474
+#: src/gtkblist.c:2522
 msgid ""
 "\n"
 "<b>Status</b>: Rockin'"
@@ -2625,96 +2665,96 @@
 "\n"
 "<b>狀態:</b>頂呱呱"
 
-#: src/gtkblist.c:2773
+#: src/gtkblist.c:2804
 #, c-format
 msgid "Idle (%dh%02dm) "
 msgstr "閒置(%d 小時 %02d 分)"
 
-#: src/gtkblist.c:2775
+#: src/gtkblist.c:2806
 #, c-format
 msgid "Idle (%dm) "
 msgstr "閒置(%d 分)"
 
-#: src/gtkblist.c:2780
+#: src/gtkblist.c:2811
 #, c-format
 msgid "Warned (%d%%) "
 msgstr "警告 (%d%%)"
 
-#: src/gtkblist.c:2783
+#: src/gtkblist.c:2814
 msgid "Offline "
 msgstr "離線"
 
 #. Make menu items sensitive/insensitive where appropriate
-#: src/gtkblist.c:2901
+#: src/gtkblist.c:2932
 msgid "/Buddies/Join a Chat..."
 msgstr "/好友/加入聊天室(_C)..."
 
-#: src/gtkblist.c:2904
+#: src/gtkblist.c:2935
 msgid "/Tools/Room List"
 msgstr "/工具/聊天室清單"
 
-#: src/gtkblist.c:2907
+#: src/gtkblist.c:2938
 msgid "/Tools/Privacy"
 msgstr "/工具/隱私設定"
 
-#: src/gtkblist.c:3052
+#: src/gtkblist.c:3084
 msgid "/Tools/Away"
 msgstr "/工具/離開"
 
-#: src/gtkblist.c:3055
+#: src/gtkblist.c:3087
 msgid "/Tools/Buddy Pounce"
 msgstr "/工具/好友狀態捕捉"
 
-#: src/gtkblist.c:3058
+#: src/gtkblist.c:3090
 msgid "/Tools/Account Actions"
 msgstr "/工具/帳號相關指令"
 
-#: src/gtkblist.c:3061
+#: src/gtkblist.c:3093
 msgid "/Tools/Plugin Actions"
 msgstr "/工具/模組相關指令"
 
 #. set the Show Offline Buddies option. must be done
 #. * after the treeview or faceprint gets mad. -Robot101
 #.
-#: src/gtkblist.c:3150
+#: src/gtkblist.c:3182
 msgid "/Buddies/Show Offline Buddies"
 msgstr "/好友/顯示離線好友"
 
-#: src/gtkblist.c:3152
+#: src/gtkblist.c:3184
 msgid "/Buddies/Show Empty Groups"
 msgstr "/好友/顯示空的好的群組"
 
-#: src/gtkblist.c:3176
+#: src/gtkblist.c:3208
 msgid "Send a message to the selected buddy"
 msgstr "傳送訊息給被選取的好友"
 
-#: src/gtkblist.c:3185
+#: src/gtkblist.c:3217
 msgid "Get information on the selected buddy"
 msgstr "取得被選取好友的資訊"
 
-#: src/gtkblist.c:3188
+#: src/gtkblist.c:3220
 msgid "_Chat"
 msgstr "聊天(_C)"
 
-#: src/gtkblist.c:3193
+#: src/gtkblist.c:3225
 msgid "Join a chat room"
 msgstr "加入一個聊天室"
 
-#: src/gtkblist.c:3196
+#: src/gtkblist.c:3228
 msgid "_Away"
 msgstr "離開(_A)"
 
-#: src/gtkblist.c:3201
+#: src/gtkblist.c:3233
 msgid "Set an away message"
 msgstr "設定一個離開訊息"
 
-#: src/gtkblist.c:3939 src/protocols/silc/buddy.c:731
+#: src/gtkblist.c:3971 src/protocols/silc/buddy.c:731
 #: src/protocols/silc/buddy.c:989 src/protocols/silc/buddy.c:1034
-#: src/protocols/silc/buddy.c:1124 src/protocols/yahoo/yahoo.c:2668
+#: src/protocols/silc/buddy.c:1124 src/protocols/yahoo/yahoo.c:2682
 msgid "Add Buddy"
 msgstr "新增好友"
 
-#: src/gtkblist.c:3963
+#: src/gtkblist.c:3995
 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. "
@@ -2724,37 +2764,37 @@
 "在好友清單中顯示。\n"
 
 #. Set up stuff for the account box
-#: src/gtkblist.c:4023 src/gtkblist.c:4307
+#: src/gtkblist.c:4055 src/gtkblist.c:4339
 msgid "Account:"
 msgstr "帳號:"
 
-#: src/gtkblist.c:4266
+#: src/gtkblist.c:4298
 msgid ""
 "You are not currently signed on with any protocols that have the ability to "
 "chat."
 msgstr "您並未登入任何一個可供您加入聊天室的通訊協定。"
 
-#: src/gtkblist.c:4273
+#: src/gtkblist.c:4305
 msgid "Add Chat"
 msgstr "新增聊天室"
 
-#: src/gtkblist.c:4297
+#: src/gtkblist.c:4329
 msgid ""
 "Please enter an alias, and the appropriate information about the chat you "
 "would like to add to your buddy list.\n"
 msgstr "請輸入別名,或者關於您所想加入好友清單的聊天室的適當資訊。\n"
 
-#: src/gtkblist.c:4375
+#: src/gtkblist.c:4407
 msgid "Add Group"
 msgstr "加入群組"
 
-#: src/gtkblist.c:4376
+#: src/gtkblist.c:4408
 msgid "Please enter the name of the group to be added."
 msgstr "請給您新增的群組輸入名稱。"
 
 #  NOTE 這不是「不允許」而是「沒有」,尤其是在新的「模組相關指令」清單,
 #  NOTE 譯成「不允許」會非常怪
-#: src/gtkblist.c:4943 src/gtkblist.c:5040
+#: src/gtkblist.c:4975 src/gtkblist.c:5072
 msgid "No actions available"
 msgstr "沒有相關指令"
 
@@ -2804,29 +2844,16 @@
 msgid "Time"
 msgstr "時間"
 
-#: src/gtkconv.c:168
-#, c-format
-msgid "<h1>Conversation with %s</h1>\n"
-msgstr "<h1>與 %s 的交談</h1>\n"
-
-#: src/gtkconv.c:186 src/gtkdebug.c:212
-msgid "That file already exists"
-msgstr "那個檔案已經存在"
-
-#: src/gtkconv.c:187 src/gtkdebug.c:213 src/gtkft.c:1122
-msgid "Would you like to overwrite it?"
-msgstr "您要覆蓋它嗎?"
-
-#: src/gtkconv.c:365
+#: src/gtkconv.c:314
 #, c-format
 msgid "me is using Gaim v%s."
 msgstr "我在用 Gaim v%s。"
 
-#: src/gtkconv.c:374
+#: src/gtkconv.c:323
 msgid "Supported debug options are:  version"
 msgstr "支援的除錯選項為:version"
 
-#: src/gtkconv.c:387
+#: src/gtkconv.c:336
 msgid ""
 "Use \"/help &lt;command&gt;\" for help on a specific command.\n"
 "The following commands are available in this context:\n"
@@ -2834,11 +2861,11 @@
 "要獲得某一指令的說明,可輸入「/help &lt;指令&gt;。\n"
 "在這個情況下,可用的指令如下:\n"
 
-#: src/gtkconv.c:421
+#: src/gtkconv.c:370
 msgid "No such command (in this context)."
 msgstr "(在這個情況下)沒有這個指令"
 
-#: src/gtkconv.c:468
+#: src/gtkconv.c:443
 msgid ""
 "No such command. If you didn't mean to type a command, you can turn commands "
 "off from Tools->Preferences->Interface->Conversation->Enable \"slash\" "
@@ -2847,7 +2874,7 @@
 "沒有這個指令。假如你無意輸入指令,你可以透過「工具→偏好設定→介面→交談→使用"
 "『斜線』指令」選項停止指令輸入的功能。"
 
-#: src/gtkconv.c:476
+#: src/gtkconv.c:451
 msgid ""
 "Syntax Error:  You typed the wrong number of arguments to that command. If "
 "you didn't mean to type a command, you can turn commands off from Tools-"
@@ -2856,561 +2883,552 @@
 "語法錯誤:輸入的參數少於指令所需的參數數量。假如你無意輸入指令,你可以透過"
 "「工具→偏好設定→介面→交談→使用『斜線』指令」選項停止指令輸入的功能。"
 
-#: src/gtkconv.c:483
+#: src/gtkconv.c:458
 msgid "Your command failed for an unknown reason."
 msgstr "指令的執行因為不明原因失敗。"
 
-#: src/gtkconv.c:490
+#: src/gtkconv.c:465
 msgid "That command only works in Chats, not IMs."
 msgstr "這個指令只在聊天室內有效,在即時訊息中無效。"
 
-#: src/gtkconv.c:493
+#: src/gtkconv.c:468
 msgid "That command only works in IMs, not Chats."
 msgstr "這個指令只在即時訊息中有效,在聊天室內無效。"
 
-#: src/gtkconv.c:497
+#: src/gtkconv.c:472
 msgid "That command doesn't work on this protocol."
 msgstr "這個指令在這個通訊協定內無效。"
 
-#: src/gtkconv.c:713
+#: src/gtkconv.c:693
 msgid "Invite Buddy Into Chat Room"
 msgstr "邀請好友進入聊天室"
 
 #. Put our happy label in it.
-#: src/gtkconv.c:741
+#: src/gtkconv.c:721
 msgid ""
 "Please enter the name of the user you wish to invite, along with an optional "
 "invite message."
 msgstr "請輸入您想邀請的使用者名稱,以及邀請的訊息。"
 
-#: src/gtkconv.c:762
+#: src/gtkconv.c:742
 msgid "_Buddy:"
 msgstr "好友(_B):"
 
-#: src/gtkconv.c:782
+#: src/gtkconv.c:762
 msgid "_Message:"
 msgstr "訊息(_M):"
 
-#: src/gtkconv.c:890 src/gtkdebug.c:127
+#: src/gtkconv.c:799 src/gtkconv.c:2489 src/gtkdebug.c:182
+msgid "Unable to open file."
+msgstr "無法開啟檔案。"
+
+#: src/gtkconv.c:804
+#, c-format
+msgid "<h1>Conversation with %s</h1>\n"
+msgstr "<h1>與 %s 的交談</h1>\n"
+
+#: src/gtkconv.c:818
+msgid "Save Conversation"
+msgstr "儲存聊天內容"
+
+#: src/gtkconv.c:895 src/gtkdebug.c:131
 msgid "Find"
 msgstr "搜尋"
 
-#: src/gtkconv.c:916 src/gtkdebug.c:155
+#: src/gtkconv.c:921 src/gtkdebug.c:159
 msgid "_Search for:"
 msgstr "搜尋(_S):"
 
-#: src/gtkconv.c:1312
+#: src/gtkconv.c:1338
 msgid "IM"
 msgstr "即時訊息"
 
-#: src/gtkconv.c:1320
+#. Block button
+#: src/gtkconv.c:1347 src/gtkconv.c:3666 src/protocols/oscar/oscar.c:453
+#: src/protocols/oscar/oscar.c:6788
+msgid "Send File"
+msgstr "傳送檔案"
+
+#: src/gtkconv.c:1356
 msgid "Un-Ignore"
 msgstr "取消忽略使用者"
 
-#: src/gtkconv.c:1322 src/gtkprefs.c:778
+#: src/gtkconv.c:1358 src/gtkprefs.c:826
 msgid "Ignore"
 msgstr "忽略使用者"
 
 # XXX「Info」的作用似乎係取得使用者資訊,但不肯定,看了其他po檔仍是不肯定這是什麼
 # XXX javajsp (Ka-Hing CHEUNG) 見過的「Info」按紐全都是「取得使用者資訊」
 #. Info button
-#: src/gtkconv.c:1331 src/gtkconv.c:3577
+#: src/gtkconv.c:1367 src/gtkconv.c:3687
 msgid "Info"
 msgstr "取得資訊"
 
-#: src/gtkconv.c:1340
+#: src/gtkconv.c:1376
 msgid "Get Away Msg"
 msgstr "取得離線訊息"
 
-#: src/gtkconv.c:2467
+#: src/gtkconv.c:2497
+msgid "Unable to save icon file to disk."
+msgstr "無法儲存圖示檔案至磁碟上。"
+
+#: src/gtkconv.c:2514
+msgid "Save Icon"
+msgstr "儲存圖示"
+
+#: src/gtkconv.c:2544
 msgid "Animate"
 msgstr "動畫"
 
-#: src/gtkconv.c:2472
+#: src/gtkconv.c:2549
 msgid "Hide Icon"
 msgstr "隱藏圖示"
 
-#: src/gtkconv.c:2478
+#: src/gtkconv.c:2555
 msgid "Save Icon As..."
 msgstr "儲存圖示為..."
 
-#: src/gtkconv.c:2847
+#: src/gtkconv.c:2939
 msgid "User is typing..."
 msgstr "使用者正在輸入..."
 
-#: src/gtkconv.c:2855
+#: src/gtkconv.c:2947
 msgid "User has typed something and paused"
 msgstr "使用者輸入了些東西,不過目前暫停輸入"
 
 #. Build the Send As menu
-#: src/gtkconv.c:2958
+#: src/gtkconv.c:3050
 msgid "_Send As"
 msgstr "使用帳號(_S)"
 
-#: src/gtkconv.c:3335
-msgid "Save Conversation"
-msgstr "儲存聊天內容"
-
 #. Conversation menu
-#: src/gtkconv.c:3352
+#: src/gtkconv.c:3450
 msgid "/_Conversation"
 msgstr "/交談(_C)"
 
-#: src/gtkconv.c:3354
+#: src/gtkconv.c:3452
 msgid "/Conversation/New Instant _Message..."
 msgstr "/好友/新即時訊息(_M)..."
 
-#: src/gtkconv.c:3359
+#: src/gtkconv.c:3457
 msgid "/Conversation/_Find..."
 msgstr "/交談/搜尋(_F)..."
 
-#: src/gtkconv.c:3361
+#: src/gtkconv.c:3459
 msgid "/Conversation/View _Log"
 msgstr "/交談/觀看歷史記錄(_L)"
 
-#: src/gtkconv.c:3362
+#: src/gtkconv.c:3460
 msgid "/Conversation/_Save As..."
 msgstr "/交談/另存新檔(_S)..."
 
-#: src/gtkconv.c:3364
+#: src/gtkconv.c:3462
 msgid "/Conversation/Clear"
 msgstr "/交談/清空"
 
-#: src/gtkconv.c:3368
+#: src/gtkconv.c:3466
+msgid "/Conversation/Se_nd File..."
+msgstr "/交談/傳送檔案(_N)..."
+
+#: src/gtkconv.c:3467
 msgid "/Conversation/Add Buddy _Pounce..."
 msgstr "/交談/新增好友狀態捕捉(_P)..."
 
-#: src/gtkconv.c:3370
+#: src/gtkconv.c:3469
 msgid "/Conversation/_Get Info"
 msgstr "/交談/取得資訊(_G)"
 
-#: src/gtkconv.c:3372
+#: src/gtkconv.c:3471
 msgid "/Conversation/_Warn..."
 msgstr "/交談/警告(_W)..."
 
-#: src/gtkconv.c:3374
+#: src/gtkconv.c:3473
 msgid "/Conversation/In_vite..."
 msgstr "/交談/邀請(_V)..."
 
-#: src/gtkconv.c:3379
+#: src/gtkconv.c:3478
 msgid "/Conversation/A_lias..."
 msgstr "/交談/別名(_L)..."
 
-#: src/gtkconv.c:3381
+#: src/gtkconv.c:3480
 msgid "/Conversation/_Block..."
 msgstr "/交談/封鎖(_B)..."
 
-#: src/gtkconv.c:3383
+#: src/gtkconv.c:3482
 msgid "/Conversation/_Add..."
 msgstr "/交談/新增(_A)..."
 
-#: src/gtkconv.c:3385
+#: src/gtkconv.c:3484
 msgid "/Conversation/_Remove..."
 msgstr "/交談/移除(_R)..."
 
-#: src/gtkconv.c:3390
+#: src/gtkconv.c:3489
 msgid "/Conversation/Insert Lin_k..."
 msgstr "/交談/插入連結(_k)..."
 
-#: src/gtkconv.c:3392
+#: src/gtkconv.c:3491
 msgid "/Conversation/Insert Imag_e..."
 msgstr "/交談/插入影像(_E)..."
 
-#: src/gtkconv.c:3397
+#: src/gtkconv.c:3496
 msgid "/Conversation/_Close"
 msgstr "/交談/關閉(_C)"
 
 #. Options
-#: src/gtkconv.c:3401
+#: src/gtkconv.c:3500
 msgid "/_Options"
 msgstr "/選項(_O)"
 
-#: src/gtkconv.c:3402
+#: src/gtkconv.c:3501
 msgid "/Options/Enable _Logging"
 msgstr "/選項/開始記錄日誌(_L)"
 
-#: src/gtkconv.c:3403
+#: src/gtkconv.c:3502
 msgid "/Options/Enable _Sounds"
 msgstr "/選項/開啟音效(_S)"
 
-#: src/gtkconv.c:3404
+#: src/gtkconv.c:3503
 msgid "/Options/Show Formatting _Toolbar"
 msgstr "/選項/顯示格式工具列(_T)"
 
-#: src/gtkconv.c:3405
+#: src/gtkconv.c:3504
 msgid "/Options/Show T_imestamps"
 msgstr "/選項/顯示時間戳記(_I)"
 
-#: src/gtkconv.c:3447
+#: src/gtkconv.c:3546
 msgid "/Conversation/View Log"
 msgstr "/交談/觀看歷史記錄"
 
-#: src/gtkconv.c:3452
+#: src/gtkconv.c:3551
+msgid "/Conversation/Send File..."
+msgstr "/交談/傳送檔案..."
+
+#: src/gtkconv.c:3555
 msgid "/Conversation/Add Buddy Pounce..."
 msgstr "/交談/新增好友狀態捕捉..."
 
-#: src/gtkconv.c:3458
+#: src/gtkconv.c:3561
 msgid "/Conversation/Get Info"
 msgstr "/交談/取得資訊"
 
-#: src/gtkconv.c:3462
+#: src/gtkconv.c:3565
 msgid "/Conversation/Warn..."
 msgstr "/交談/警告..."
 
-#: src/gtkconv.c:3466
+#: src/gtkconv.c:3569
 msgid "/Conversation/Invite..."
 msgstr "/交談/邀請..."
 
-#: src/gtkconv.c:3472
+#: src/gtkconv.c:3575
 msgid "/Conversation/Alias..."
 msgstr "/交談/別名..."
 
-#: src/gtkconv.c:3476
+#: src/gtkconv.c:3579
 msgid "/Conversation/Block..."
 msgstr "/交談/封鎖..."
 
-#: src/gtkconv.c:3480
+#: src/gtkconv.c:3583
 msgid "/Conversation/Add..."
 msgstr "/交談/新增..."
 
-#: src/gtkconv.c:3484
+#: src/gtkconv.c:3587
 msgid "/Conversation/Remove..."
 msgstr "/交談/移除..."
 
-#: src/gtkconv.c:3490
+#: src/gtkconv.c:3593
 msgid "/Conversation/Insert Link..."
 msgstr "/交談/插入連結..."
 
-#: src/gtkconv.c:3494
+#: src/gtkconv.c:3597
 msgid "/Conversation/Insert Image..."
 msgstr "/交談/插入影像..."
 
-#: src/gtkconv.c:3500
+#: src/gtkconv.c:3603
 msgid "/Options/Enable Logging"
 msgstr "/選項/開始記錄日誌"
 
-#: src/gtkconv.c:3503
+#: src/gtkconv.c:3606
 msgid "/Options/Enable Sounds"
 msgstr "/選項/開啟音效"
 
-#: src/gtkconv.c:3506
+#: src/gtkconv.c:3609
 msgid "/Options/Show Formatting Toolbar"
 msgstr "/選項/顯示格式工具列"
 
-#: src/gtkconv.c:3509
+#: src/gtkconv.c:3612
 msgid "/Options/Show Timestamps"
 msgstr "/選項/顯示時間戳記"
 
 #. From right to left...
 #. Send button
-#: src/gtkconv.c:3533 src/gtkconv.c:3535 src/gtkconv.c:3641 src/gtkconv.c:3643
+#: src/gtkconv.c:3636 src/gtkconv.c:3638 src/gtkconv.c:3756 src/gtkconv.c:3758
 msgid "Send"
 msgstr "送出"
 
 #. Now, um, just kind of all over the place. Huh?
 #. Warn button
-#: src/gtkconv.c:3549
+#: src/gtkconv.c:3652
 msgid "Warn"
 msgstr "警告"
 
-#: src/gtkconv.c:3552
+#: src/gtkconv.c:3655
 msgid "Warn the user"
 msgstr "警告使用者"
 
 #. Block button
-#: src/gtkconv.c:3556 src/gtkprivacy.c:624 src/gtkprivacy.c:635
+#: src/gtkconv.c:3659 src/gtkprivacy.c:624 src/gtkprivacy.c:635
 msgid "Block"
 msgstr "封鎖"
 
-#: src/gtkconv.c:3559
+#: src/gtkconv.c:3662
 msgid "Block the user"
 msgstr "封鎖使用者"
 
-#: src/gtkconv.c:3566
+#: src/gtkconv.c:3669
+msgid "Send a file to the user"
+msgstr "傳送檔案至使用者"
+
+#: src/gtkconv.c:3676
 msgid "Add the user to your buddy list"
 msgstr "將使用者加入您的好友清單"
 
-#: src/gtkconv.c:3573
+#: src/gtkconv.c:3683
 msgid "Remove the user from your buddy list"
 msgstr "將使用者自您的好友清單中移除"
 
-#: src/gtkconv.c:3580 src/gtkconv.c:3923
+#: src/gtkconv.c:3690 src/gtkconv.c:4041
 msgid "Get the user's information"
 msgstr "取得使用者資訊"
 
 #. Invite
-#: src/gtkconv.c:3655
+#: src/gtkconv.c:3770
 msgid "Invite"
 msgstr "邀請"
 
-#: src/gtkconv.c:3658
+#: src/gtkconv.c:3773
 msgid "Invite a user"
 msgstr "邀請使用者"
 
-#: src/gtkconv.c:3665
+#: src/gtkconv.c:3780
 msgid "Add the chat to your buddy list"
 msgstr "將這個聊天室加入您的好友清單"
 
-#: src/gtkconv.c:3672
+#: src/gtkconv.c:3787
 msgid "Remove the chat from your buddy list"
 msgstr "將這個聊天室自您的好友清單中移除"
 
-#: src/gtkconv.c:3782
+#: src/gtkconv.c:3897
 msgid "Topic:"
 msgstr "主題:"
 
 #. Setup the label telling how many people are in the room.
-#: src/gtkconv.c:3845
+#: src/gtkconv.c:3960
 msgid "0 people in room"
 msgstr "沒有人在這個房間"
 
-#: src/gtkconv.c:3900
+#: src/gtkconv.c:4018
 msgid "IM the user"
 msgstr "送出即時訊息給使用者"
 
-#: src/gtkconv.c:3912
+#: src/gtkconv.c:4030
 msgid "Ignore the user"
 msgstr "忽略使用者"
 
-#: src/gtkconv.c:4490
+#: src/gtkconv.c:4629
 msgid "Close conversation"
 msgstr "關閉交談"
 
-#: src/gtkconv.c:5035 src/gtkconv.c:5067 src/gtkconv.c:5188 src/gtkconv.c:5255
+#: src/gtkconv.c:5171 src/gtkconv.c:5203 src/gtkconv.c:5324 src/gtkconv.c:5391
 #, c-format
 msgid "%d person in room"
 msgid_plural "%d people in room"
 msgstr[0] "%d 個人在這個房間"
 msgstr[1] "%d 個人在這個房間"
 
-#: src/gtkconv.c:5757 src/gtkconv.c:5760
+#: src/gtkconv.c:5903 src/gtkconv.c:5906
 msgid "<main>/Conversation/Close"
 msgstr "<mail>/交談/關閉"
 
-#: src/gtkconv.c:6132
+#: src/gtkconv.c:6278
 msgid "me &lt;action&gt;:  Send an IRC style action to a buddy or chat."
 msgstr "me &lt;要執行的動作&gt;:模仿IRC,執行一個動作。"
 
-#: src/gtkconv.c:6135
+#: src/gtkconv.c:6281
 msgid ""
 "debug &lt;option&gt;:  Send various debug information to the current "
 "conversation."
 msgstr "debug &lt;選項&gt;:向目前的交談送出一些除錯資訊。"
 
-#: src/gtkconv.c:6139
+#: src/gtkconv.c:6285
 msgid "help:  List available commands."
 msgstr "help:列出可用的指令。"
 
-#: src/gtkconv.c:6143
+#: src/gtkconv.c:6289
 msgid "help &lt;command&gt;:  Help on a specific command."
 msgstr "help &lt;指令&gt;:顯示某一指令的說明。"
 
 #  NOTE「除錯日誌」很怪,「除錯紀錄」較順口,而且已經有人用
-#: src/gtkdebug.c:226
+#: src/gtkdebug.c:197
 msgid "Save Debug Log"
 msgstr "儲存除錯紀錄"
 
-#: src/gtkdebug.c:289
+#: src/gtkdebug.c:250
 msgid "Debug Window"
 msgstr "除錯視窗"
 
-#: src/gtkdebug.c:327
+#: src/gtkdebug.c:288
 msgid "Pause"
 msgstr "暫停"
 
-#: src/gtkdebug.c:333
+#: src/gtkdebug.c:294
 msgid "Timestamps"
 msgstr "時間戳記"
 
-#: src/gtkft.c:143
+#: src/gtkft.c:136
 #, c-format
 msgid "%.2f KB/s"
 msgstr "%.2f kB/s"
 
-#: src/gtkft.c:164 src/gtkft.c:974
+#: src/gtkft.c:157 src/gtkft.c:967
 msgid "Finished"
 msgstr "已完成"
 
-#: src/gtkft.c:167 src/gtkft.c:925
+#: src/gtkft.c:160 src/gtkft.c:918
 msgid "Canceled"
 msgstr "已取消"
 
 #  XXX 暫譯
-#: src/gtkft.c:170
+#: src/gtkft.c:163
 msgid "Waiting for transfer to begin"
 msgstr "等待開始傳輸檔案中..."
 
-#: src/gtkft.c:223
+#: src/gtkft.c:216
 msgid "<b>Receiving From:</b>"
 msgstr "<b>接收自:</b>"
 
-#: src/gtkft.c:226
+#: src/gtkft.c:219
 msgid "<b>Sending To:</b>"
 msgstr "<b>傳送到:</b>"
 
-#: src/gtkft.c:400
+#: src/gtkft.c:393
 msgid "There is no application configured to open this type of file."
 msgstr "沒有設定任何應用程式可以開啟這類檔案。"
 
-#: src/gtkft.c:405
+#: src/gtkft.c:398
 msgid "An error occurred while opening the file."
 msgstr "開啟檔案途中發生錯誤。"
 
-#: src/gtkft.c:496
+#: src/gtkft.c:489
 msgid "Progress"
 msgstr "進度"
 
-#: src/gtkft.c:503
+#: src/gtkft.c:496
 msgid "Filename"
 msgstr "檔名"
 
-#: src/gtkft.c:510
+#: src/gtkft.c:503
 msgid "Size"
 msgstr "大小"
 
-#: src/gtkft.c:517
+#: src/gtkft.c:510
 msgid "Remaining"
 msgstr "剩餘"
 
-#: src/gtkft.c:547
+#: src/gtkft.c:540
 msgid "Filename:"
 msgstr "檔名:"
 
-#: src/gtkft.c:548
+#: src/gtkft.c:541
 msgid "Status:"
 msgstr "狀態:"
 
-#: src/gtkft.c:549
+#: src/gtkft.c:542
 msgid "Speed:"
 msgstr "速度:"
 
-#: src/gtkft.c:550
+#: src/gtkft.c:543
 msgid "Time Elapsed:"
 msgstr "經過時間:"
 
-#: src/gtkft.c:551
+#: src/gtkft.c:544
 msgid "Time Remaining:"
 msgstr "尚需時間:"
 
-#: src/gtkft.c:648
+#: src/gtkft.c:641
 msgid "_Keep the dialog open"
 msgstr "保持對話框開啟(_K)"
 
-#: src/gtkft.c:658
+#: src/gtkft.c:651
 msgid "_Clear finished transfers"
 msgstr "清除已完成的傳輸(_C)"
 
 # XXX 暫譯
 #. "Download Details" arrow
-#: src/gtkft.c:667
+#: src/gtkft.c:660
 msgid "Show transfer details"
 msgstr "顯示傳輸細節"
 
 # XXX 暫譯
-#: src/gtkft.c:668
+#: src/gtkft.c:661
 msgid "Hide transfer details"
 msgstr "隱藏傳輸細節"
 
 #. Pause button
-#: src/gtkft.c:710 src/stock.c:90
+#: src/gtkft.c:703 src/stock.c:90
 msgid "_Pause"
 msgstr "暫停(_P)"
 
 #. Resume button
-#: src/gtkft.c:720
+#: src/gtkft.c:713
 msgid "_Resume"
 msgstr "恢復(_R)"
 
-#: src/gtkft.c:927
+#: src/gtkft.c:920
 msgid "Failed"
 msgstr "失敗"
 
-#: src/gtkft.c:1098
-msgid "That file does not exist."
-msgstr "檔案不存在。"
-
-#: src/gtkft.c:1107
-msgid "Cannot send a file of 0 bytes."
-msgstr "無法傳送空的檔案。"
-
-#: src/gtkft.c:1121
-msgid "That file already exists."
-msgstr "那個檔案已經存在。"
-
-#. Open file selector to select the public key.
-#: src/gtkft.c:1147 src/protocols/silc/buddy.c:1023
-msgid "Open..."
-msgstr "開啟..."
-
-# XXX 要覆查
-#: src/gtkft.c:1149
-msgid "Save As..."
-msgstr "另存新檔..."
-
-#: src/gtkft.c:1199
-#, c-format
-msgid "%s wants to send you %s (%s)"
-msgstr "%s 想要送 %s (%s) 給您"
-
-#: src/gtkft.c:1232
-#, c-format
-msgid "Accept file transfer request from %s?"
-msgstr "接受來自於「%s」的檔案傳輸要求嗎?"
-
-#  XXX 暫譯
-#: src/gtkft.c:1236
-#, c-format
-msgid ""
-"A file is available for download from:\n"
-"Remote host: %s\n"
-"Remote port: %d"
-msgstr ""
-"有檔案可以下載:\n"
-"遠端主機 :%s\n"
-"遠端通訊埠:%d"
-
 #  NOTE Nautilus譯「貼上文本」,Abiword譯「未格式化貼上」,聽來都有些怪
-#: src/gtkimhtml.c:567
+#: src/gtkimhtml.c:602
 msgid "Pa_ste As Text"
 msgstr "貼上純文字(_S)"
 
-#: src/gtkimhtml.c:1012
+#: src/gtkimhtml.c:1047
 msgid "Hyperlink color"
 msgstr "連結顏色"
 
-#: src/gtkimhtml.c:1013
+#: src/gtkimhtml.c:1048
 msgid "Color to draw hyperlinks."
 msgstr "顯示連結時所用的顏色。"
 
-#: src/gtkimhtml.c:1218
+#: src/gtkimhtml.c:1253
 msgid "_Copy E-Mail Address"
 msgstr "複製電子郵件地址(_C)"
 
-#: src/gtkimhtml.c:1230
+#: src/gtkimhtml.c:1265
 msgid "_Copy Link Location"
 msgstr "複製連結位址(_C)"
 
-#: src/gtkimhtml.c:1240
+#: src/gtkimhtml.c:1275
 msgid "_Open Link in Browser"
 msgstr "在瀏覽器中打開連結(_O)"
 
 # NOTE "Defaulting to PNG" 是指 gaim 在無計可施的情況下盲猜影像是 PNG 格式
-#: src/gtkimhtml.c:2761
+#: src/gtkimhtml.c:2797
 msgid ""
 "Unable to guess the image type based on the file extension supplied.  "
 "Defaulting to PNG."
 msgstr "Gaim 無法依照副檔名來判別影像格式,暫且當成 PNG 檔處理。"
 
-#: src/gtkimhtml.c:2769
+#: src/gtkimhtml.c:2805
 #, c-format
 msgid "Error saving image: %s"
 msgstr "儲存影像錯誤:%s"
 
-#: src/gtkimhtml.c:2778
+#: src/gtkimhtml.c:2814
 msgid "Save Image"
 msgstr "儲存影像"
 
-#: src/gtkimhtml.c:2801
+#: src/gtkimhtml.c:2837
 msgid "_Save Image..."
 msgstr "儲存影像(_S)..."
 
@@ -3452,76 +3470,76 @@
 msgid "_Insert"
 msgstr "插入(_I)"
 
-#: src/gtkimhtmltoolbar.c:472
+#: src/gtkimhtmltoolbar.c:481
 #, c-format
 msgid "Failed to store image: %s\n"
 msgstr "無法儲存影像:%s\n"
 
-#: src/gtkimhtmltoolbar.c:498
+#: src/gtkimhtmltoolbar.c:507 src/gtkimhtmltoolbar.c:517
 msgid "Insert Image"
 msgstr "插入影像"
 
 #  XXX 譯文不通順
-#: src/gtkimhtmltoolbar.c:637
+#: src/gtkimhtmltoolbar.c:655
 msgid "This theme has no available smileys."
 msgstr "這個表情主題不含任何表情。"
 
 #. show everything
-#: src/gtkimhtmltoolbar.c:652
+#: src/gtkimhtmltoolbar.c:670
 msgid "Smile!"
 msgstr "笑一個!"
 
-#: src/gtkimhtmltoolbar.c:870
+#: src/gtkimhtmltoolbar.c:888
 msgid "Bold"
 msgstr "粗體"
 
-#: src/gtkimhtmltoolbar.c:881
+#: src/gtkimhtmltoolbar.c:899
 msgid "Italic"
 msgstr "斜體"
 
-#: src/gtkimhtmltoolbar.c:892
+#: src/gtkimhtmltoolbar.c:910
 msgid "Underline"
 msgstr "底線"
 
-#: src/gtkimhtmltoolbar.c:908
+#: src/gtkimhtmltoolbar.c:926
 msgid "Larger font size"
 msgstr "放大字體"
 
-#: src/gtkimhtmltoolbar.c:920
+#: src/gtkimhtmltoolbar.c:938
 msgid "Smaller font size"
 msgstr "縮小字體"
 
-#: src/gtkimhtmltoolbar.c:937
+#: src/gtkimhtmltoolbar.c:955
 msgid "Font Face"
 msgstr "字型"
 
-#: src/gtkimhtmltoolbar.c:949
+#: src/gtkimhtmltoolbar.c:967
 msgid "Foreground font color"
 msgstr "前景顏色"
 
-#: src/gtkimhtmltoolbar.c:961
+#: src/gtkimhtmltoolbar.c:979
 msgid "Background color"
 msgstr "背景顏色"
 
-#: src/gtkimhtmltoolbar.c:976
+#: src/gtkimhtmltoolbar.c:994
 msgid "Insert link"
 msgstr "插入連結"
 
-#: src/gtkimhtmltoolbar.c:986
+#: src/gtkimhtmltoolbar.c:1004
 msgid "Insert image"
 msgstr "插入影像"
 
-#: src/gtkimhtmltoolbar.c:997
+#: src/gtkimhtmltoolbar.c:1015
 msgid "Insert smiley"
 msgstr "插入表情"
 
 # NOTE 這個處理的手法係由芬蘭文現任譯者Arto Alakulju提供的
-#: src/gtklog.c:282
+#: src/gtklog.c:302
 msgid "Conversations with"
 msgstr "交談:"
 
 #. Window **********
-#: src/gtklog.c:372 src/gtklog.c:388
+#: src/gtklog.c:392 src/gtklog.c:408
 msgid "System Log"
 msgstr "系統日誌"
 
@@ -3571,7 +3589,7 @@
 msgstr "瀏覽器指令「%s」是無效的。"
 
 #: src/gtknotify.c:432 src/gtknotify.c:446 src/gtknotify.c:461
-#: src/gtknotify.c:569
+#: src/gtknotify.c:579
 msgid "Unable to open URL"
 msgstr "無法開啟網頁"
 
@@ -3580,173 +3598,173 @@
 msgid "Error launching \"%s\": %s"
 msgstr "執行「%s」時發生了錯誤:%s"
 
-#: src/gtknotify.c:570
+#: src/gtknotify.c:580
 msgid ""
 "The 'Manual' browser command has been chosen, but no command has been set."
 msgstr "您選用了「使用者自定瀏覽器」,卻未有設定指令。"
 
-#: src/gtkpounce.c:144
+#: src/gtkpounce.c:130
 msgid "Select a file"
 msgstr "選擇檔案"
 
-#: src/gtkpounce.c:194
+#: src/gtkpounce.c:161
 msgid "Please enter a buddy to pounce."
 msgstr "請輸入一個好友以進行捕捉。"
 
 #. "New Buddy Pounce"
-#: src/gtkpounce.c:420 src/gtkpounce.c:923
+#: src/gtkpounce.c:387 src/gtkpounce.c:890
 msgid "New Buddy Pounce"
 msgstr "新增好友狀態捕捉"
 
-#: src/gtkpounce.c:420
+#: src/gtkpounce.c:387
 msgid "Edit Buddy Pounce"
 msgstr "編輯好友狀態捕捉"
 
 #. Create the "Pounce Who" frame.
-#: src/gtkpounce.c:438
+#: src/gtkpounce.c:405
 msgid "Pounce Who"
 msgstr "要捕捉誰的狀態"
 
-#: src/gtkpounce.c:465
+#: src/gtkpounce.c:432
 msgid "_Buddy name:"
 msgstr "好友名稱(_B):"
 
 #. Create the "Pounce When" frame.
-#: src/gtkpounce.c:489
+#: src/gtkpounce.c:456
 msgid "Pounce When"
 msgstr "捕捉什麼樣的狀態"
 
-#: src/gtkpounce.c:497 src/main.c:296
+#: src/gtkpounce.c:464 src/main.c:296
 msgid "_Sign on"
 msgstr "登入(_S)"
 
-#: src/gtkpounce.c:499
+#: src/gtkpounce.c:466
 msgid "Sign _off"
 msgstr "登出(_O)"
 
-#: src/gtkpounce.c:501
+#: src/gtkpounce.c:468
 msgid "A_way"
 msgstr "離開(_W)"
 
-#: src/gtkpounce.c:503
+#: src/gtkpounce.c:470
 msgid "Re_turn from away"
 msgstr "由離開返回(_T)"
 
-#: src/gtkpounce.c:505
+#: src/gtkpounce.c:472
 msgid "_Idle"
 msgstr "閒置(_I)"
 
-#: src/gtkpounce.c:507
+#: src/gtkpounce.c:474
 msgid "Retur_n from idle"
 msgstr "由閒置返回(_N)"
 
-#: src/gtkpounce.c:509
+#: src/gtkpounce.c:476
 msgid "Buddy starts _typing"
 msgstr "好友開始輸入(_T)"
 
-#: src/gtkpounce.c:511
+#: src/gtkpounce.c:478
 msgid "Buddy stops t_yping"
 msgstr "好友停止輸入(_Y)"
 
 #. Create the "Pounce Action" frame.
-#: src/gtkpounce.c:540
+#: src/gtkpounce.c:507
 msgid "Pounce Action"
 msgstr "捕捉動作"
 
-#: src/gtkpounce.c:548
+#: src/gtkpounce.c:515
 msgid "Op_en an IM window"
 msgstr "開啟即時訊息視窗(_E)"
 
-#: src/gtkpounce.c:550
+#: src/gtkpounce.c:517
 msgid "_Popup notification"
 msgstr "彈出通知(_P)"
 
-#: src/gtkpounce.c:552
+#: src/gtkpounce.c:519
 msgid "Send a _message"
 msgstr "送出訊息(_M)"
 
-#: src/gtkpounce.c:554
+#: src/gtkpounce.c:521
 msgid "E_xecute a command"
 msgstr "執行指令(_X)"
 
-#: src/gtkpounce.c:556
+#: src/gtkpounce.c:523
 msgid "P_lay a sound"
 msgstr "播放音效(_L)"
 
-#: src/gtkpounce.c:560
+#: src/gtkpounce.c:527
 msgid "B_rowse..."
 msgstr "瀏覽(_R)..."
 
-#: src/gtkpounce.c:562
+#: src/gtkpounce.c:529
 msgid "Bro_wse..."
 msgstr "瀏覽(_W)..."
 
-#: src/gtkpounce.c:563
+#: src/gtkpounce.c:530
 msgid "Pre_view"
 msgstr "預覽(_V)"
 
-#: src/gtkpounce.c:646
+#: src/gtkpounce.c:613
 msgid "Sav_e this pounce after activation"
 msgstr "儲存設定並啟動(_E)"
 
 #. "Remove Buddy Pounce"
-#: src/gtkpounce.c:930
+#: src/gtkpounce.c:897
 msgid "Remove Buddy Pounce"
 msgstr "移除好友狀態捕捉"
 
-#: src/gtkpounce.c:994
+#: src/gtkpounce.c:961
 #, c-format
 msgid "%s has started typing to you (%s)"
 msgstr "%s 開始輸入訊息給您 (%s)"
 
-#: src/gtkpounce.c:996
+#: src/gtkpounce.c:963
 #, c-format
 msgid "%s has signed on (%s)"
 msgstr "%s 已經登入 (%s)"
 
-#: src/gtkpounce.c:998
+#: src/gtkpounce.c:965
 #, c-format
 msgid "%s has returned from being idle (%s)"
 msgstr "%s 由閒置返回 (%s)"
 
-#: src/gtkpounce.c:1000
+#: src/gtkpounce.c:967
 #, c-format
 msgid "%s has returned from being away (%s)"
 msgstr "%s 由離開返回 (%s)"
 
-#: src/gtkpounce.c:1002
+#: src/gtkpounce.c:969
 #, c-format
 msgid "%s has stopped typing to you (%s)"
 msgstr "%s 停止輸入訊息給您 (%s)"
 
-#: src/gtkpounce.c:1004
+#: src/gtkpounce.c:971
 #, c-format
 msgid "%s has signed off (%s)"
 msgstr "%s 已經登出 (%s)"
 
-#: src/gtkpounce.c:1006
+#: src/gtkpounce.c:973
 #, c-format
 msgid "%s has become idle (%s)"
 msgstr "%s 變更狀態為閒置 (%s)"
 
-#: src/gtkpounce.c:1008
+#: src/gtkpounce.c:975
 #, c-format
 msgid "%s has gone away. (%s)"
 msgstr "%s 已經離開。 (%s)"
 
-#: src/gtkpounce.c:1009
+#: src/gtkpounce.c:976
 msgid "Unknown pounce event. Please report this!"
 msgstr "未知的捕捉事件。請回報這個問題!"
 
-#: src/gtkprefs.c:401
+#: src/gtkprefs.c:446
 msgid "Interface Options"
 msgstr "介面選項"
 
-#: src/gtkprefs.c:403
+#: src/gtkprefs.c:448
 msgid "D_isplay remote nicknames if no alias is set"
 msgstr "當別名沒有設定時,以對方所設定的暱稱顯示(_I)"
 
-#: src/gtkprefs.c:627
+#: src/gtkprefs.c:675
 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."
@@ -3754,320 +3772,324 @@
 "在下面的清單中選取一個您所想喜歡的表情主題。您可以用拖曳的方式將新的表情主題"
 "安裝到清單中。"
 
-#: src/gtkprefs.c:667
+#: src/gtkprefs.c:715
 msgid "Icon"
 msgstr "圖示"
 
-#: src/gtkprefs.c:674 src/gtkprefs.c:2199 src/protocols/jabber/buddy.c:265
-#: src/protocols/jabber/buddy.c:749 src/protocols/jabber/chat.c:701
+#: src/gtkprefs.c:722 src/gtkprefs.c:2212 src/protocols/jabber/buddy.c:264
+#: src/protocols/jabber/buddy.c:748 src/protocols/jabber/chat.c:701
 msgid "Description"
 msgstr "描述"
 
-#: src/gtkprefs.c:770
+#: src/gtkprefs.c:818
 msgid "Display"
 msgstr "顯示"
 
-#: src/gtkprefs.c:771
+#: src/gtkprefs.c:819
 msgid "Show _timestamp on messages"
 msgstr "顯示訊息時間(_T)"
 
-#: src/gtkprefs.c:774
+#: src/gtkprefs.c:822
 msgid "_Highlight misspelled words"
 msgstr "標示出拼錯的字(_H)"
 
-#: src/gtkprefs.c:779
+#: src/gtkprefs.c:827
 msgid "Ignore c_olors"
 msgstr "忽略顏色(_O)"
 
-#: src/gtkprefs.c:781
+#: src/gtkprefs.c:829
 msgid "Ignore font _faces"
 msgstr "忽略字體(_F)"
 
-#: src/gtkprefs.c:783
+#: src/gtkprefs.c:831
 msgid "Ignore font si_zes"
 msgstr "忽略字體大小(_Z)"
 
-#: src/gtkprefs.c:786
+#: src/gtkprefs.c:834
 msgid "_Ignore formatting on incoming messages"
 msgstr "忽略所收訊息的格式化(_I)"
 
-#: src/gtkprefs.c:790
+#: src/gtkprefs.c:838
 msgid "Default Formatting"
 msgstr "預設格式"
 
-#: src/gtkprefs.c:792
+#: src/gtkprefs.c:840
 msgid "_Send default formatting with outgoing messages"
 msgstr "送出訊息時使用預設格式化(_S)"
 
-#: src/gtkprefs.c:824
+#: src/gtkprefs.c:872
 msgid ""
 "This is how your outgoing message text will appear when you use protocols "
 "that support formatting. :)"
 msgstr "假如您使用的協定支援格式化,送出訊息的式樣將會類似以下的樣本:"
 
 #  XXX 暫譯
-#: src/gtkprefs.c:827
+#: src/gtkprefs.c:875
 msgid "_Clear Formatting"
 msgstr "清除格式化(_C)"
 
-#: src/gtkprefs.c:864
+#: src/gtkprefs.c:912
 msgid "Send Message"
 msgstr "送出訊息"
 
-#: src/gtkprefs.c:865
+#: src/gtkprefs.c:913
 msgid "Enter _sends message"
 msgstr "按下 Enter 送出訊息(_S)"
 
-#: src/gtkprefs.c:867
+#: src/gtkprefs.c:915
 msgid "C_ontrol-Enter sends message"
 msgstr "按下 Ctrl-Enter 送出訊息(_O)"
 
-#: src/gtkprefs.c:870
+#: src/gtkprefs.c:918
 msgid "Window Closing"
 msgstr "視窗關閉"
 
-#: src/gtkprefs.c:871
+#: src/gtkprefs.c:919
 msgid "_Escape closes window"
 msgstr "按下 Escape 關閉視窗(_E)"
 
-#: src/gtkprefs.c:874
+#: src/gtkprefs.c:922
 msgid "Insertions"
 msgstr "插入選項"
 
-#: src/gtkprefs.c:875
+#: src/gtkprefs.c:923
 msgid "Control-{B/I/U} changes _formatting"
 msgstr "按下 Ctrl-{B/I/U} 更改字型樣式(_F)"
 
-#: src/gtkprefs.c:877
+#: src/gtkprefs.c:925
 msgid "Control-(number) _inserts smileys"
 msgstr "按下 Ctrl-(數字鍵) 插入表情(_I)"
 
-#: src/gtkprefs.c:893
+#: src/gtkprefs.c:941
 msgid "Buddy List Sorting"
 msgstr "好友清單排序"
 
-#: src/gtkprefs.c:902
+#: src/gtkprefs.c:950
 msgid "_Sorting:"
 msgstr "排序方式(_S):"
 
-#: src/gtkprefs.c:908 src/gtkprefs.c:961
+#: src/gtkprefs.c:956 src/gtkprefs.c:1009
 msgid "Show _buttons as:"
 msgstr "顯示按鍵為(_B):"
 
-#: src/gtkprefs.c:910 src/gtkprefs.c:963
+#: src/gtkprefs.c:958 src/gtkprefs.c:1011
 msgid "Pictures"
 msgstr "圖形"
 
-#: src/gtkprefs.c:911 src/gtkprefs.c:964
+#: src/gtkprefs.c:959 src/gtkprefs.c:1012
 msgid "Text"
 msgstr "文字"
 
-#: src/gtkprefs.c:912 src/gtkprefs.c:965
+#: src/gtkprefs.c:960 src/gtkprefs.c:1013
 msgid "Pictures and text"
 msgstr "圖形與文字"
 
-#: src/gtkprefs.c:915
+#: src/gtkprefs.c:963
 msgid "_Raise window on events"
 msgstr "當事件發生時,將視窗提到最上方(_R)"
 
-#: src/gtkprefs.c:918
+#: src/gtkprefs.c:966
 msgid "Buddy Display"
 msgstr "好友顯示"
 
-#: src/gtkprefs.c:919 src/gtkprefs.c:979
+#: src/gtkprefs.c:967 src/gtkprefs.c:1027
 msgid "Show buddy _icons"
 msgstr "顯示好友圖示(_I)"
 
-#: src/gtkprefs.c:921
+#: src/gtkprefs.c:969
 msgid "Show _warning levels"
 msgstr "顯示警告等級(_W)"
 
-#: src/gtkprefs.c:923
+#: src/gtkprefs.c:971
 msgid "Show idle _times"
 msgstr "顯示閒置時間(_T)"
 
-#: src/gtkprefs.c:925
+#: src/gtkprefs.c:973
 msgid "Dim i_dle buddies"
 msgstr "把閒置的好友設為灰色(_D)"
 
 # XXX 暫譯
-#: src/gtkprefs.c:927
+#: src/gtkprefs.c:975
 msgid "_Automatically expand contacts"
 msgstr "自動展開好友(_A)"
 
-#: src/gtkprefs.c:972
+#: src/gtkprefs.c:1020
 msgid "Enable \"_slash\" commands"
 msgstr "使用「斜線」指令(_S)"
 
-#: src/gtkprefs.c:975
+#: src/gtkprefs.c:1023
 msgid "Show _formatting toolbar"
 msgstr "顯示格式工具列(_F)"
 
-#: src/gtkprefs.c:977
+#: src/gtkprefs.c:1025
 msgid "Show _aliases in tabs/titles"
 msgstr "在標題和標籤上顯示別名(_A)"
 
-#: src/gtkprefs.c:981
+#: src/gtkprefs.c:1029
 msgid "Enable buddy ic_on animation"
 msgstr "啟動好友圖示動畫(_O)"
 
-#: src/gtkprefs.c:983
+#: src/gtkprefs.c:1031
 msgid "_Notify buddies that you are typing to them"
 msgstr "通知您的好友您正在發訊息給他們(_N)"
 
-#: src/gtkprefs.c:985
+#: src/gtkprefs.c:1033
 msgid "_Raise IM window on events"
 msgstr "當事件發生時,將視窗提到最上方(_R)"
 
-#: src/gtkprefs.c:988
+#: src/gtkprefs.c:1036
 msgid "Raise chat _window on events"
 msgstr "當事件發生時,將交談視窗提到最上方(_R)"
 
-#: src/gtkprefs.c:990
+#: src/gtkprefs.c:1038
 msgid "Use _multi-colored screen names in chats"
 msgstr "在聊天室內以不同顏色區別不同的暱稱(_M)"
 
 #. All the tab options!
-#: src/gtkprefs.c:994
+#: src/gtkprefs.c:1042
 msgid "Tab Options"
 msgstr "標籤選項"
 
-#: src/gtkprefs.c:996
+#: src/gtkprefs.c:1044
 msgid "Show IMs and chats in _tabbed windows"
 msgstr "使用標籤視窗顯示即時訊息和聊天(_T)"
 
-#: src/gtkprefs.c:1011
+#: src/gtkprefs.c:1059
 msgid "Show _close button on tabs"
 msgstr "在標籤上顯示關閉鍵(_C)"
 
-#: src/gtkprefs.c:1014
+#: src/gtkprefs.c:1062
 msgid "Tab p_lacement:"
 msgstr "標籤位置(_L):"
 
-#: src/gtkprefs.c:1016
+#: src/gtkprefs.c:1064
 msgid "Top"
 msgstr "視窗上方"
 
-#: src/gtkprefs.c:1017
+#: src/gtkprefs.c:1065
 msgid "Bottom"
 msgstr "視窗下方"
 
-#: src/gtkprefs.c:1018
+#: src/gtkprefs.c:1066
 msgid "Left"
 msgstr "視窗左側"
 
-#: src/gtkprefs.c:1019
+#: src/gtkprefs.c:1067
 msgid "Right"
 msgstr "視窗右側"
 
 # NOTE 不直接翻譯,改依功能呈現的方式翻譯譯文
-#: src/gtkprefs.c:1025
+#: src/gtkprefs.c:1073
 msgid "New conversation _placement:"
 msgstr "新交談開啟於(_P):"
 
-#: src/gtkprefs.c:1076 src/protocols/oscar/oscar.c:592
-#: src/protocols/oscar/oscar.c:4837
+#: src/gtkprefs.c:1124 src/protocols/oscar/oscar.c:596
+#: src/protocols/oscar/oscar.c:4853
 msgid "IP Address"
 msgstr "IP 位址"
 
-#: src/gtkprefs.c:1078
+#: src/gtkprefs.c:1126
 msgid "_Autodetect IP Address"
 msgstr "自動偵測 IP 位址(_A)"
 
-#: src/gtkprefs.c:1087
+#: src/gtkprefs.c:1135
 msgid "Public _IP:"
 msgstr "公共IP (_I):"
 
-#: src/gtkprefs.c:1111
+#: src/gtkprefs.c:1159
 msgid "Ports"
 msgstr "通訊埠"
 
-#: src/gtkprefs.c:1114
+#: src/gtkprefs.c:1162
 msgid "_Manually specify range of ports to listen on"
 msgstr "自定通訊埠監聽範圍(_M)"
 
-#: src/gtkprefs.c:1117
+#: src/gtkprefs.c:1165
 msgid "_Start Port:"
 msgstr "啟始通訊埠(_S):"
 
-#: src/gtkprefs.c:1124
+#: src/gtkprefs.c:1172
 msgid "_End Port:"
 msgstr "結束通訊埠(_E):"
 
-#: src/gtkprefs.c:1131
+#: src/gtkprefs.c:1179
 msgid "Proxy Server"
 msgstr "代理伺服器"
 
 # NOTE 理由同前,不用「毋須」,改為「不使用」
-#: src/gtkprefs.c:1135
+#: src/gtkprefs.c:1183
 msgid "No proxy"
 msgstr "不使用代理伺服器"
 
-#: src/gtkprefs.c:1197
+#: src/gtkprefs.c:1245
 msgid "_User:"
 msgstr "使用者(_U):"
 
-#: src/gtkprefs.c:1253
-msgid "Opera"
-msgstr "Opera"
-
-#: src/gtkprefs.c:1254
-msgid "Netscape"
-msgstr "Netscape"
-
-#: src/gtkprefs.c:1255
-msgid "Mozilla"
-msgstr "Mozilla"
-
-#: src/gtkprefs.c:1256
-msgid "Konqueror"
-msgstr "Konqueror"
-
-#: src/gtkprefs.c:1257
-msgid "Galeon"
-msgstr "Galeon"
-
-#: src/gtkprefs.c:1258
+#: src/gtkprefs.c:1301
+msgid "Epiphany"
+msgstr "Epiphany"
+
+#: src/gtkprefs.c:1302
 msgid "Firebird"
 msgstr "Firebird"
 
-#: src/gtkprefs.c:1259
+#: src/gtkprefs.c:1303
 msgid "Firefox"
 msgstr "Firefox"
 
-#: src/gtkprefs.c:1260
+#: src/gtkprefs.c:1304
+msgid "Galeon"
+msgstr "Galeon"
+
+#: src/gtkprefs.c:1305
 msgid "Gnome Default"
 msgstr "GNOME預設值"
 
-#: src/gtkprefs.c:1269
+#: src/gtkprefs.c:1306
+msgid "Konqueror"
+msgstr "Konqueror"
+
+#: src/gtkprefs.c:1307
+msgid "Mozilla"
+msgstr "Mozilla"
+
+#: src/gtkprefs.c:1308
+msgid "Netscape"
+msgstr "Netscape"
+
+#: src/gtkprefs.c:1309
+msgid "Opera"
+msgstr "Opera"
+
+#: src/gtkprefs.c:1318
 msgid "Manual"
 msgstr "使用者自定"
 
-#: src/gtkprefs.c:1320
+#: src/gtkprefs.c:1369
 msgid "Browser Selection"
 msgstr "選擇瀏覽器"
 
-#: src/gtkprefs.c:1324
+#: src/gtkprefs.c:1373
 msgid "_Browser:"
 msgstr "瀏覽器(_B):"
 
-#: src/gtkprefs.c:1331
+#: src/gtkprefs.c:1380
 msgid "_Open link in:"
 msgstr "在瀏覽器中打開連結(_O):"
 
-#: src/gtkprefs.c:1333
+#: src/gtkprefs.c:1382
 msgid "Browser default"
 msgstr "瀏覽器預設"
 
-#: src/gtkprefs.c:1334
+#: src/gtkprefs.c:1383
 msgid "Existing window"
 msgstr "既有的視窗"
 
-#: src/gtkprefs.c:1336
+#: src/gtkprefs.c:1385
 msgid "New tab"
 msgstr "新標籤"
 
-#: src/gtkprefs.c:1350
+#: src/gtkprefs.c:1399
 #, c-format
 msgid ""
 "_Manual:\n"
@@ -4076,83 +4098,83 @@
 "使用者自定(_M):\n"
 "(請以 %s 代表網址)"
 
-#: src/gtkprefs.c:1387
+#: src/gtkprefs.c:1436
 msgid "Message Logs"
 msgstr "訊息日誌"
 
-#: src/gtkprefs.c:1390
+#: src/gtkprefs.c:1439
 msgid "Log _Format:"
 msgstr "日誌格式(_F):"
 
-#: src/gtkprefs.c:1393
+#: src/gtkprefs.c:1442
 msgid "_Log all instant messages"
 msgstr "記錄所有即時訊息(_L)"
 
-#: src/gtkprefs.c:1395
+#: src/gtkprefs.c:1444
 msgid "Log all c_hats"
 msgstr "記錄所有聊天內容(_H)"
 
-#: src/gtkprefs.c:1398
+#: src/gtkprefs.c:1447
 msgid "System Logs"
 msgstr "系統日誌"
 
-#: src/gtkprefs.c:1400
+#: src/gtkprefs.c:1449
 msgid "_Enable system log"
 msgstr "使用系統日誌(_E)"
 
-#: src/gtkprefs.c:1403
+#: src/gtkprefs.c:1452
 msgid "Log when buddies _sign on/sign off"
 msgstr "記錄好友的登入/登出(_S)"
 
-#: src/gtkprefs.c:1409
+#: src/gtkprefs.c:1458
 msgid "Log when buddies become _idle/un-idle"
 msgstr "記錄好友的閒置/取消閒置(_I)"
 
-#: src/gtkprefs.c:1415
+#: src/gtkprefs.c:1464
 msgid "Log when buddies go away/come _back"
 msgstr "記錄好友離開/回來(_B)"
 
-#: src/gtkprefs.c:1421
+#: src/gtkprefs.c:1470
 msgid "Log your _own signons/idleness/awayness"
 msgstr "記錄您自已登入/閒置/離開等狀態(_O)"
 
-#: src/gtkprefs.c:1559
+#: src/gtkprefs.c:1596
 msgid "Sound Selection"
 msgstr "選取音效"
 
-#: src/gtkprefs.c:1634
+#: src/gtkprefs.c:1647
 msgid "Sound Options"
 msgstr "音效選項"
 
-#: src/gtkprefs.c:1635
+#: src/gtkprefs.c:1648
 msgid "Sounds when conversation has _focus"
 msgstr "當交談取得輸入焦點發出音效(_F)"
 
-#: src/gtkprefs.c:1637
+#: src/gtkprefs.c:1650
 msgid "_Sounds while away"
 msgstr "離開時仍發出音效(_S)"
 
-#: src/gtkprefs.c:1641
+#: src/gtkprefs.c:1654
 msgid "Sound Method"
 msgstr "音效播放方式"
 
-#: src/gtkprefs.c:1642
+#: src/gtkprefs.c:1655
 msgid "_Method:"
 msgstr "播放方式(_M):"
 
-#: src/gtkprefs.c:1644
+#: src/gtkprefs.c:1657
 msgid "Console beep"
 msgstr "嗶一聲"
 
-#: src/gtkprefs.c:1646
+#: src/gtkprefs.c:1659
 msgid "Automatic"
 msgstr "自動"
 
-#: src/gtkprefs.c:1653
+#: src/gtkprefs.c:1666
 msgid "Command"
 msgstr "指令"
 
-#: src/gtkprefs.c:1661
+#: src/gtkprefs.c:1674
 #, c-format
 msgid ""
 "Sound c_ommand:\n"
@@ -4161,87 +4183,87 @@
 "音效指令(_C):\n"
 "(請以 %s 代表檔名)"
 
-#: src/gtkprefs.c:1688
+#: src/gtkprefs.c:1701
 msgid "Sound Events"
 msgstr "事件音效"
 
-#: src/gtkprefs.c:1739
+#: src/gtkprefs.c:1752
 msgid "Play"
 msgstr "播放"
 
-#: src/gtkprefs.c:1746
+#: src/gtkprefs.c:1759
 msgid "Event"
 msgstr "事件"
 
-#: src/gtkprefs.c:1765
+#: src/gtkprefs.c:1778
 msgid "Test"
 msgstr "測試"
 
-#: src/gtkprefs.c:1769
+#: src/gtkprefs.c:1782
 msgid "Reset"
 msgstr "重置"
 
-#: src/gtkprefs.c:1773
+#: src/gtkprefs.c:1786
 msgid "Choose..."
 msgstr "選擇..."
 
-#: src/gtkprefs.c:1797
+#: src/gtkprefs.c:1810
 msgid "_Queue new messages when away"
 msgstr "在離開時,將所有的新訊息置入佇列中(_Q)"
 
-#: src/gtkprefs.c:1800
+#: src/gtkprefs.c:1813
 msgid "Auto-response"
 msgstr "自動回應"
 
-#: src/gtkprefs.c:1801
+#: src/gtkprefs.c:1814
 msgid "_Send auto-response"
 msgstr "送出自動回應(_S)"
 
-#: src/gtkprefs.c:1803
+#: src/gtkprefs.c:1816
 msgid "_Only send auto-response when idle"
 msgstr "只在閒置的時候送出自動回應(_O)"
 
-#: src/gtkprefs.c:1806 src/protocols/msn/msn.c:1175
+#: src/gtkprefs.c:1819 src/protocols/msn/msn.c:1179
 #: src/protocols/msn/state.c:32 src/protocols/novell/novell.c:2730
-#: src/protocols/oscar/oscar.c:3994 src/protocols/yahoo/yahoo.c:2483
-#: src/protocols/yahoo/yahoo_profile.c:653
+#: src/protocols/oscar/oscar.c:4010 src/protocols/yahoo/yahoo.c:2511
+#: src/protocols/yahoo/yahoo_profile.c:664
 msgid "Idle"
 msgstr "閒置"
 
-#: src/gtkprefs.c:1807
+#: src/gtkprefs.c:1820
 msgid "Idle _time reporting:"
 msgstr "閒置時間報告(_T):"
 
-#: src/gtkprefs.c:1810
+#: src/gtkprefs.c:1823
 msgid "Gaim usage"
 msgstr "Gaim 使用狀況"
 
-#: src/gtkprefs.c:1813
+#: src/gtkprefs.c:1826
 msgid "X usage"
 msgstr "X Window 使用狀況"
 
-#: src/gtkprefs.c:1815
+#: src/gtkprefs.c:1828
 msgid "Windows usage"
 msgstr "Windows 使用狀況"
 
-#: src/gtkprefs.c:1823
+#: src/gtkprefs.c:1836
 msgid "Auto-away"
 msgstr "自動離開"
 
-#: src/gtkprefs.c:1824
+#: src/gtkprefs.c:1837
 msgid "Set away _when idle"
 msgstr "閒置時自動設為離開(_W)"
 
 # NOTE 譯文更動 by Ambrose
-#: src/gtkprefs.c:1828
+#: src/gtkprefs.c:1841
 msgid "_Minutes before setting away:"
 msgstr "閒置多少分鐘設為離開(_M):"
 
-#: src/gtkprefs.c:1836
+#: src/gtkprefs.c:1849
 msgid "Away m_essage:"
 msgstr "離開訊息(_M):"
 
-#: src/gtkprefs.c:1917
+#: src/gtkprefs.c:1930
 #, c-format
 msgid ""
 "<span size=\"larger\">%s %s</span>\n"
@@ -4256,7 +4278,7 @@
 "<span weight=\"bold\">網站:</span>\t\t%s\n"
 "<span weight=\"bold\">檔名:</span>\t%s"
 
-#: src/gtkprefs.c:1922
+#: src/gtkprefs.c:1935
 #, c-format
 msgid ""
 "<span size=\"larger\">%s %s</span>\n"
@@ -4271,65 +4293,65 @@
 "<span weight=\"bold\">網站:</span>  %s\n"
 "<span weight=\"bold\">檔名:</span>  %s"
 
-#: src/gtkprefs.c:2155
+#: src/gtkprefs.c:2168
 msgid "Load"
 msgstr "載入"
 
-#: src/gtkprefs.c:2169
+#: src/gtkprefs.c:2182
 msgid "Summary"
 msgstr "簡述"
 
 #  NOTE「細節」很恰當,因為畫面上的都是瑣碎的細節,連基本資料都久奉
-#: src/gtkprefs.c:2217
+#: src/gtkprefs.c:2230
 msgid "Details"
 msgstr "細節"
 
-#: src/gtkprefs.c:2362
+#: src/gtkprefs.c:2375
 msgid "_Edit"
 msgstr "編輯(_E)"
 
-#: src/gtkprefs.c:2398
+#: src/gtkprefs.c:2411
 msgid "Interface"
 msgstr "介面"
 
-#: src/gtkprefs.c:2401
+#: src/gtkprefs.c:2414
 msgid "Message Text"
 msgstr "訊息文字"
 
-#: src/gtkprefs.c:2402
+#: src/gtkprefs.c:2415
 msgid "Shortcuts"
 msgstr "快捷鍵"
 
-#: src/gtkprefs.c:2403
+#: src/gtkprefs.c:2416
 msgid "Smiley Themes"
 msgstr "表情主題"
 
-#: src/gtkprefs.c:2404
+#: src/gtkprefs.c:2417
 msgid "Sounds"
 msgstr "音效"
 
-#: src/gtkprefs.c:2405
+#: src/gtkprefs.c:2418
 msgid "Network"
 msgstr "網路"
 
 #. We use the registered default browser in windows
-#: src/gtkprefs.c:2408
+#: src/gtkprefs.c:2421
 msgid "Browser"
 msgstr "瀏覽器"
 
-#: src/gtkprefs.c:2410
+#: src/gtkprefs.c:2423
 msgid "Logging"
 msgstr "日誌"
 
-#: src/gtkprefs.c:2411
+#: src/gtkprefs.c:2424
 msgid "Away / Idle"
 msgstr "離開 / 閒置"
 
-#: src/gtkprefs.c:2412
+#: src/gtkprefs.c:2425
 msgid "Away Messages"
 msgstr "離開訊息"
 
-#: src/gtkprefs.c:2415
+#: src/gtkprefs.c:2428
 msgid "Plugins"
 msgstr "模組清單"
 
@@ -4353,7 +4375,7 @@
 msgid "Block only the users below"
 msgstr "封鎖以下的使用者"
 
-#: src/gtkprivacy.c:385 src/protocols/jabber/jabber.c:1448
+#: src/gtkprivacy.c:385 src/protocols/jabber/jabber.c:1449
 msgid "Privacy"
 msgstr "隱私設定"
 
@@ -4417,27 +4439,43 @@
 #. *
 #. * A wrapper for gaim_request_action() that uses Yes and No buttons.
 #.
-#: src/gtkrequest.c:233 src/protocols/gg/gg.c:867
+#: src/gtkrequest.c:240 src/protocols/gg/gg.c:949
 #: src/protocols/novell/novell.c:1845 src/protocols/silc/buddy.c:307
-#: src/protocols/silc/pk.c:116 src/request.h:1233
+#: src/protocols/silc/pk.c:116 src/request.h:1234
 msgid "Yes"
 msgstr "是"
 
-#: src/gtkrequest.c:234 src/protocols/gg/gg.c:867
+#: src/gtkrequest.c:241 src/protocols/gg/gg.c:949
 #: src/protocols/novell/novell.c:1846 src/protocols/silc/buddy.c:308
-#: src/protocols/silc/pk.c:117 src/request.h:1233
+#: src/protocols/silc/pk.c:117 src/request.h:1234
 msgid "No"
 msgstr "否"
 
-#: src/gtkrequest.c:237
+#: src/gtkrequest.c:244
 msgid "Apply"
 msgstr "套用"
 
-#: src/gtkrequest.c:238 src/protocols/msn/msn.c:314
+#: src/gtkrequest.c:245 src/protocols/msn/msn.c:314
 #: src/protocols/silc/util.c:332
 msgid "Close"
 msgstr "關閉"
 
+#: src/gtkrequest.c:1391
+msgid "That file already exists"
+msgstr "那個檔案已經存在"
+
+#: src/gtkrequest.c:1392
+msgid "Would you like to overwrite it?"
+msgstr "您要覆蓋它嗎?"
+
+#: src/gtkrequest.c:1430 src/gtkrequest.c:1451
+msgid "Save File..."
+msgstr "儲存檔案..."
+
+#: src/gtkrequest.c:1431 src/gtkrequest.c:1452
+msgid "Open File..."
+msgstr "開啟檔案..."
+
 #: src/gtkroomlist.c:330
 msgid "Room List"
 msgstr "聊天室清單"
@@ -4506,23 +4544,15 @@
 "launched: %s"
 msgstr "無法播放音效,因為無法執行所設定的音效指令:%s"
 
-#: src/gtkutils.c:149
-msgid "Can't save icon file to disk."
-msgstr "無法儲存圖示檔案磁碟上。"
-
-#: src/gtkutils.c:184
-msgid "Save Icon"
-msgstr "儲存圖示"
-
 #: src/log.c:106
 msgid "<b><font color=\"red\">The logger has no read function</font></b>"
 msgstr "<b><font color=\"red\">這個日誌模組沒有定義「讀取」函數</font></b>"
 
-#: src/log.c:486
+#: src/log.c:489
 msgid "XML"
 msgstr "XML"
 
-#: src/log.c:571
+#: src/log.c:574
 #, c-format
 msgid ""
 "<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
@@ -4531,7 +4561,7 @@
 "<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;自動回應&gt;:"
 "</b></font> %s<br/>\n"
 
-#: src/log.c:573
+#: src/log.c:576
 #, c-format
 msgid ""
 "<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
@@ -4541,25 +4571,25 @@
 "</b></font> %s<br/>\n"
 
 # XXX 暫譯
-#: src/log.c:624 src/log.c:811
+#: src/log.c:627 src/log.c:814
 msgid "<font color=\"red\"><b>Unable to find log path!</b></font>"
 msgstr "<font color=\"red\"><b>找不到日誌檔案!</b></font>"
 
-#: src/log.c:634 src/log.c:823
+#: src/log.c:637 src/log.c:826
 #, c-format
 msgid "<font color=\"red\"><b>Could not read file: %s</b></font>"
 msgstr "<font color=\"red\"><b>無法讀取檔案:%s</b></font>"
 
-#: src/log.c:671
+#: src/log.c:674
 msgid "HTML"
 msgstr "HTML"
 
-#: src/log.c:756
+#: src/log.c:759
 #, c-format
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr "(%s) %s <自動回應>:%s\n"
 
-#: src/log.c:856
+#: src/log.c:859
 msgid "Plain text"
 msgstr "純文字"
 
@@ -4650,12 +4680,12 @@
 msgstr "無聊(預設)"
 
 #: src/protocols/gg/gg.c:49 src/protocols/jabber/jutil.c:44
-#: src/protocols/msn/msn.c:466 src/protocols/msn/state.c:29
+#: src/protocols/msn/msn.c:462 src/protocols/msn/state.c:29
 #: src/protocols/msn/state.c:30 src/protocols/msn/state.c:37
 #: src/protocols/msn/state.c:38 src/protocols/novell/novell.c:2721
 #: src/protocols/novell/novell.c:2840 src/protocols/novell/novell.c:2891
-#: src/protocols/oscar/oscar.c:611 src/protocols/yahoo/yahoo.c:2842
-#: src/protocols/yahoo/yahoo.c:2958
+#: src/protocols/oscar/oscar.c:616 src/protocols/yahoo/yahoo.c:2851
+#: src/protocols/yahoo/yahoo.c:2967
 msgid "Available"
 msgstr "上線"
 
@@ -4667,12 +4697,12 @@
 msgid "Away for friends only"
 msgstr "離開(只有好友可以看到我)"
 
-#: src/protocols/gg/gg.c:53 src/protocols/jabber/jabber.c:963
-#: src/protocols/jabber/presence.c:126 src/protocols/oscar/oscar.c:532
-#: src/protocols/oscar/oscar.c:5378 src/protocols/oscar/oscar.c:5456
-#: src/protocols/oscar/oscar.c:5480 src/protocols/oscar/oscar.c:6667
-#: src/protocols/oscar/oscar.c:6672 src/protocols/yahoo/yahoo.c:2481
-#: src/protocols/yahoo/yahoo.c:2862 src/protocols/yahoo/yahoo.c:2970
+#: src/protocols/gg/gg.c:53 src/protocols/jabber/jabber.c:964
+#: src/protocols/jabber/presence.c:126 src/protocols/oscar/oscar.c:536
+#: src/protocols/oscar/oscar.c:5394 src/protocols/oscar/oscar.c:5472
+#: src/protocols/oscar/oscar.c:5496 src/protocols/oscar/oscar.c:6684
+#: src/protocols/oscar/oscar.c:6689 src/protocols/yahoo/yahoo.c:2509
+#: src/protocols/yahoo/yahoo.c:2871 src/protocols/yahoo/yahoo.c:2979
 msgid "Invisible"
 msgstr "隱身"
 
@@ -4696,7 +4726,7 @@
 #: src/protocols/gg/gg.c:142 src/protocols/jabber/auth.c:130
 #: src/protocols/jabber/auth.c:204 src/protocols/jabber/auth.c:354
 #: src/protocols/jabber/auth.c:452 src/protocols/jabber/auth.c:464
-#: src/protocols/jabber/jabber.c:105
+#: src/protocols/jabber/jabber.c:106
 msgid "Invalid response from server."
 msgstr "無效的伺服器回應。"
 
@@ -4716,177 +4746,179 @@
 msgid "Unknown Error Code."
 msgstr "未知的錯誤代碼。"
 
-#: src/protocols/gg/gg.c:253
+#: src/protocols/gg/gg.c:242 src/protocols/oscar/oscar.c:3819
+#, c-format
+msgid "<B>UIN:</B> %s<BR><B>Status:</B> %s<HR>%s"
+msgstr "<B>帳號:</B> %s<BR><B>狀態:</B> %s<HR>%s"
+
+#. res[0] == username
+#: src/protocols/gg/gg.c:243 src/protocols/gg/gg.c:1011
+#: src/protocols/napster/napster.c:393 src/protocols/oscar/oscar.c:3823
+#: src/protocols/oscar/oscar.c:4039 src/protocols/silc/ops.c:1067
+#: src/protocols/silc/ops.c:1128 src/protocols/toc/toc.c:468
+#: src/protocols/zephyr/zephyr.c:635
+msgid "Buddy Information"
+msgstr "好友資訊"
+
+#: src/protocols/gg/gg.c:293
 #, c-format
 msgid "Status: %s"
 msgstr "狀態:%s"
 
-#: src/protocols/gg/gg.c:406
+#: src/protocols/gg/gg.c:446
 msgid "Could not connect"
 msgstr "無法連結"
 
-#: src/protocols/gg/gg.c:413
+#: src/protocols/gg/gg.c:453
 msgid "Unable to read socket"
 msgstr "無法讀取 Socket"
 
 #. we didn't successfully connect. tdt->toc_fd is valid here
-#: src/protocols/gg/gg.c:600 src/protocols/icq/gaim_icq.c:344
+#: src/protocols/gg/gg.c:674 src/protocols/icq/gaim_icq.c:344
 #: src/protocols/napster/napster.c:475 src/protocols/napster/napster.c:506
-#: src/protocols/toc/toc.c:170 src/protocols/yahoo/yahoo.c:2124
-#: src/protocols/yahoo/yahoo.c:2153 src/protocols/yahoo/yahoo.c:2216
+#: src/protocols/toc/toc.c:170 src/protocols/yahoo/yahoo.c:2156
+#: src/protocols/yahoo/yahoo.c:2185 src/protocols/yahoo/yahoo.c:2248
 #: src/protocols/yahoo/yahoo_filexfer.c:68
 #: src/protocols/yahoo/yahoo_filexfer.c:109
 msgid "Unable to connect."
 msgstr "無法連結。"
 
-#: src/protocols/gg/gg.c:616
+#: src/protocols/gg/gg.c:690
 msgid "Reading data"
 msgstr "讀取資料中"
 
-#: src/protocols/gg/gg.c:619
+#: src/protocols/gg/gg.c:693
 msgid "Balancer handshake"
 msgstr "和負載平衡器交談中"
 
-#: src/protocols/gg/gg.c:622
+#: src/protocols/gg/gg.c:696
 msgid "Reading server key"
 msgstr "讀取 Server Key 中"
 
-#: src/protocols/gg/gg.c:625
+#: src/protocols/gg/gg.c:699
 msgid "Exchanging key hash"
 msgstr "交換密鑰中"
 
-#: src/protocols/gg/gg.c:635
+#: src/protocols/gg/gg.c:709
 msgid "Critical error in GG library\n"
 msgstr "在 GG Library 中的重大錯誤\n"
 
-#: src/protocols/gg/gg.c:653 src/protocols/gg/gg.c:744
+#: src/protocols/gg/gg.c:727 src/protocols/gg/gg.c:818
 #: src/protocols/toc/toc.c:146
 #, c-format
 msgid "Connect to %s failed"
 msgstr "連結到 %s 失敗"
 
-#: src/protocols/gg/gg.c:701
+#: src/protocols/gg/gg.c:775
 msgid "Unable to ping server"
 msgstr "無法取得伺服器回應"
 
 # XXX
-#: src/protocols/gg/gg.c:713
+#: src/protocols/gg/gg.c:787
 msgid "Send as message"
 msgstr "以訊息送出"
 
-#: src/protocols/gg/gg.c:718
+#: src/protocols/gg/gg.c:792
 msgid "Looking up GG server"
 msgstr "搜尋 GG 伺服器"
 
-#: src/protocols/gg/gg.c:721
+#: src/protocols/gg/gg.c:795
 msgid "Invalid Gadu-Gadu UIN specified"
 msgstr "給予了無效的 Gadu-Gadu UIN"
 
-#: src/protocols/gg/gg.c:768
+#: src/protocols/gg/gg.c:842
 msgid "You are trying to send a message to an invalid Gadu-Gadu UIN."
 msgstr "您試圖對無效的 Gadu-Gadu UIN 送出一個訊息。"
 
-#: src/protocols/gg/gg.c:835
+#: src/protocols/gg/gg.c:917
 msgid "Couldn't get search results"
 msgstr "無法取得搜尋結果"
 
-#: src/protocols/gg/gg.c:840
+#: src/protocols/gg/gg.c:922
 msgid "Gadu-Gadu Search Engine"
 msgstr "Gadu-Gadu 搜尋引擎"
 
 #  XXX 這個有點怪,譯錯?
-#: src/protocols/gg/gg.c:866
+#: src/protocols/gg/gg.c:948
 msgid "Active"
 msgstr "啟動"
 
-#: src/protocols/gg/gg.c:871 src/protocols/oscar/oscar.c:4829
+#: src/protocols/gg/gg.c:953 src/protocols/oscar/oscar.c:4845
 msgid "UIN"
 msgstr "帳號"
 
 #. First Name
-#: src/protocols/gg/gg.c:875 src/protocols/jabber/jabber.c:612
-#: src/protocols/oscar/oscar.c:4840 src/protocols/silc/ops.c:784
+#: src/protocols/gg/gg.c:957 src/protocols/jabber/jabber.c:613
+#: src/protocols/oscar/oscar.c:4856 src/protocols/silc/ops.c:790
 #: src/protocols/trepia/trepia.c:267
 msgid "First Name"
 msgstr "名"
 
 #. Last Name
-#: src/protocols/gg/gg.c:880 src/protocols/jabber/jabber.c:617
-#: src/protocols/oscar/oscar.c:4841 src/protocols/trepia/trepia.c:274
+#: src/protocols/gg/gg.c:962 src/protocols/jabber/jabber.c:618
+#: src/protocols/oscar/oscar.c:4857 src/protocols/trepia/trepia.c:274
 msgid "Last Name"
 msgstr "姓"
 
-#: src/protocols/gg/gg.c:884 src/protocols/gg/gg.c:1623
-#: src/protocols/irc/msgs.c:183 src/protocols/oscar/oscar.c:4830
+#: src/protocols/gg/gg.c:966 src/protocols/gg/gg.c:1707
+#: src/protocols/irc/msgs.c:183 src/protocols/oscar/oscar.c:4846
+#: src/protocols/silc/ops.c:1184
 msgid "Nick"
 msgstr "暱稱"
 
-#: src/protocols/gg/gg.c:891 src/protocols/gg/gg.c:894
+#: src/protocols/gg/gg.c:973 src/protocols/gg/gg.c:976
 msgid "Birth Year"
 msgstr "出生年"
 
-#: src/protocols/gg/gg.c:900 src/protocols/gg/gg.c:902
-#: src/protocols/gg/gg.c:904
+#: src/protocols/gg/gg.c:982 src/protocols/gg/gg.c:984
+#: src/protocols/gg/gg.c:986
 msgid "Sex"
 msgstr "性別"
 
 #. City
-#: src/protocols/gg/gg.c:908 src/protocols/jabber/jabber.c:627
-#: src/protocols/oscar/oscar.c:4884 src/protocols/oscar/oscar.c:4892
+#: src/protocols/gg/gg.c:990 src/protocols/jabber/jabber.c:628
+#: src/protocols/oscar/oscar.c:4900 src/protocols/oscar/oscar.c:4908
 #: src/protocols/trepia/trepia.c:331 src/protocols/trepia/trepia.c:410
 msgid "City"
 msgstr "城市"
 
-#. res[0] == username
-#. show it to the user
-#: src/protocols/gg/gg.c:929 src/protocols/msn/msn.c:1244
-#: src/protocols/msn/msn.c:1552 src/protocols/msn/msn.c:1568
-#: src/protocols/napster/napster.c:393 src/protocols/oscar/oscar.c:3807
-#: src/protocols/oscar/oscar.c:4023 src/protocols/toc/toc.c:468
-#: src/protocols/yahoo/yahoo_profile.c:748
-#: src/protocols/yahoo/yahoo_profile.c:785
-#: src/protocols/yahoo/yahoo_profile.c:837
-#: src/protocols/yahoo/yahoo_profile.c:1132 src/protocols/zephyr/zephyr.c:610
-msgid "Buddy Information"
-msgstr "好友資訊"
-
-#: src/protocols/gg/gg.c:951
+#: src/protocols/gg/gg.c:1033
 msgid "There is no Buddy List stored on the Gadu-Gadu server."
 msgstr "Gadu-Gadu 伺服器上並沒有儲存任何的好友清單。"
 
-#: src/protocols/gg/gg.c:959
+#: src/protocols/gg/gg.c:1041
 msgid "Couldn't Import Buddy List from Server"
 msgstr "無法自伺服器上取得好友名單"
 
-#: src/protocols/gg/gg.c:1021
+#: src/protocols/gg/gg.c:1103
 msgid "Buddy List successfully transferred to Gadu-Gadu server"
 msgstr "成功的將好友清單傳送到 Gadu-Gadu 伺服器上"
 
-#: src/protocols/gg/gg.c:1029
+#: src/protocols/gg/gg.c:1111
 msgid "Couldn't transfer Buddy List to Gadu-Gadu server"
 msgstr "無法傳送好友清單到 Gadu-Gadu 伺服器上"
 
-#: src/protocols/gg/gg.c:1037
+#: src/protocols/gg/gg.c:1119
 msgid "Buddy List successfully deleted from Gadu-Gadu server"
 msgstr "成功的將好友清單自 Gadu-Gadu 伺服器上刪除"
 
-#: src/protocols/gg/gg.c:1045
+#: src/protocols/gg/gg.c:1127
 msgid "Couldn't delete Buddy List from Gadu-Gadu server"
 msgstr "無法刪除在 Gadu-Gadu 伺服器上的好友清單"
 
-#: src/protocols/gg/gg.c:1054
+#: src/protocols/gg/gg.c:1136
 msgid "Password changed successfully"
 msgstr "密碼修改成功"
 
-#: src/protocols/gg/gg.c:1061
+#: src/protocols/gg/gg.c:1143
 msgid "Password couldn't be changed"
 msgstr "密碼無法修改"
 
-#: src/protocols/gg/gg.c:1180
+#: src/protocols/gg/gg.c:1262
 msgid "Error communicating with Gadu-Gadu server"
 msgstr "和 Gadu-Gadu 伺服器溝通時發生錯誤"
 
-#: src/protocols/gg/gg.c:1181
+#: src/protocols/gg/gg.c:1263
 msgid ""
 "Gaim was unable to complete your request due to a problem communicating with "
 "the Gadu-Gadu HTTP server.  Please try again later."
@@ -4894,34 +4926,34 @@
 "因為和 Gadu-Gadu HTTP 伺服器溝通時發生問題,所以 Gaim 沒有辦法完成您所指定的"
 "工作。請待會兒重試。"
 
-#: src/protocols/gg/gg.c:1210
+#: src/protocols/gg/gg.c:1292
 msgid "Unable to import Gadu-Gadu buddy list"
 msgstr "無法匯入 Gadu-Gadu 的好友清單"
 
-#: src/protocols/gg/gg.c:1211
+#: src/protocols/gg/gg.c:1293
 msgid ""
 "Gaim was unable to connect to the Gadu-Gadu buddy list server.  Please try "
 "again later."
 msgstr "Gaim 無法連上 Gadu-Gadu 好友清單伺服器。請晚點再試一次。"
 
-#: src/protocols/gg/gg.c:1284
+#: src/protocols/gg/gg.c:1366
 msgid "Couldn't export buddy list"
 msgstr "無法匯出好友清單"
 
-#: src/protocols/gg/gg.c:1285 src/protocols/gg/gg.c:1308
+#: src/protocols/gg/gg.c:1367 src/protocols/gg/gg.c:1390
 msgid ""
 "Gaim was unable to connect to the buddy list server.  Please try again later."
 msgstr "Gaim 無法連上好友清單伺服器。請晚點再試一次。"
 
-#: src/protocols/gg/gg.c:1307
+#: src/protocols/gg/gg.c:1389
 msgid "Unable to delete Gadu-Gadu buddy list"
 msgstr "無法刪除 Gadu-Gadu 好友清單"
 
-#: src/protocols/gg/gg.c:1358
+#: src/protocols/gg/gg.c:1440
 msgid "Unable to access directory"
 msgstr "無法存取目錄"
 
-#: src/protocols/gg/gg.c:1359
+#: src/protocols/gg/gg.c:1441
 msgid ""
 "Gaim was unable to search the Directory because it was unable to connect to "
 "the directory server.  Please try again later."
@@ -4929,11 +4961,11 @@
 "因為 Gaim 沒有辦法連上名錄伺服器,所以無法搜尋名錄上的資料。請待會兒再試一"
 "次。"
 
-#: src/protocols/gg/gg.c:1393
+#: src/protocols/gg/gg.c:1475
 msgid "Unable to change Gadu-Gadu password"
 msgstr "無法修改 Gadu-Gadu 密碼"
 
-#: src/protocols/gg/gg.c:1394
+#: src/protocols/gg/gg.c:1476
 msgid ""
 "Gaim was unable to change your password due to an error connecting to the "
 "Gadu-Gadu server.  Please try again later."
@@ -4941,33 +4973,33 @@
 "因為 Gaim 沒有辦法連上 Gadu-Gadu 伺服器,所以無法修改您的密碼。請待會兒再試一"
 "次。"
 
-#: src/protocols/gg/gg.c:1410
+#: src/protocols/gg/gg.c:1492
 msgid "Directory Search"
 msgstr "名錄搜尋"
 
 #. if (js->protocol_options & CHANGE_PASSWORD) {
-#: src/protocols/gg/gg.c:1415 src/protocols/jabber/jabber.c:1061
+#: src/protocols/gg/gg.c:1497 src/protocols/jabber/jabber.c:1062
 #: src/protocols/toc/toc.c:1550
 msgid "Change Password"
 msgstr "修改密碼"
 
-#: src/protocols/gg/gg.c:1419
+#: src/protocols/gg/gg.c:1501
 msgid "Import Buddy List from Server"
 msgstr "自伺服器上匯入好友名單"
 
-#: src/protocols/gg/gg.c:1423
+#: src/protocols/gg/gg.c:1505
 msgid "Export Buddy List to Server"
 msgstr "匯出好友名單到伺服器上"
 
-#: src/protocols/gg/gg.c:1427
+#: src/protocols/gg/gg.c:1509
 msgid "Delete Buddy List from Server"
 msgstr "將伺服器上的好友名單刪除"
 
-#: src/protocols/gg/gg.c:1460
+#: src/protocols/gg/gg.c:1542
 msgid "Unable to access user profile."
 msgstr "無法讀取使用者簡介檔。"
 
-#: src/protocols/gg/gg.c:1461
+#: src/protocols/gg/gg.c:1543
 msgid ""
 "Gaim was unable to access this user's profile due to an error connecting to "
 "the directory server.  Please try again later."
@@ -4986,7 +5018,7 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/gg/gg.c:1602 src/protocols/gg/gg.c:1604
+#: src/protocols/gg/gg.c:1686 src/protocols/gg/gg.c:1688
 msgid "Gadu-Gadu Protocol Plugin"
 msgstr "Gadu-Gadu 協定模組"
 
@@ -5000,14 +5032,14 @@
 msgstr "使用者 %s (%s%s%s%s%s) 要求您的認證。"
 
 #: src/protocols/icq/gaim_icq.c:297 src/protocols/jabber/presence.c:232
-#: src/protocols/msn/userlist.c:100 src/protocols/oscar/oscar.c:3538
-#: src/protocols/oscar/oscar.c:6100
+#: src/protocols/msn/userlist.c:100 src/protocols/oscar/oscar.c:3554
+#: src/protocols/oscar/oscar.c:6117
 msgid "Authorize"
 msgstr "給予認證"
 
 #: src/protocols/icq/gaim_icq.c:297 src/protocols/jabber/presence.c:233
-#: src/protocols/msn/userlist.c:101 src/protocols/oscar/oscar.c:3540
-#: src/protocols/oscar/oscar.c:6101
+#: src/protocols/msn/userlist.c:101 src/protocols/oscar/oscar.c:3556
+#: src/protocols/oscar/oscar.c:6118
 msgid "Deny"
 msgstr "拒絕"
 
@@ -5027,17 +5059,19 @@
 msgid "Gaim User"
 msgstr "Gaim 使用者"
 
-#: src/protocols/irc/cmds.c:43
+#: src/protocols/irc/cmds.c:43 src/protocols/silc/silc.c:1286
 #, c-format
 msgid "Unknown command: %s"
 msgstr "未知的指令:%s"
 
-#: src/protocols/irc/cmds.c:444 src/protocols/jabber/chat.c:544
+#: src/protocols/irc/cmds.c:448 src/protocols/jabber/chat.c:544
+#: src/protocols/silc/silc.c:995
 #, c-format
 msgid "current topic is: %s"
 msgstr "現在的主題為:%s"
 
-#: src/protocols/irc/cmds.c:447 src/protocols/jabber/chat.c:546
+#: src/protocols/irc/cmds.c:451 src/protocols/jabber/chat.c:546
+#: src/protocols/silc/silc.c:998
 msgid "No topic is set"
 msgstr "沒有設定主題"
 
@@ -5069,55 +5103,52 @@
 msgid "MOTD for %s"
 msgstr "%s 的是日訊息"
 
-#: src/protocols/irc/irc.c:141
+#: src/protocols/irc/irc.c:93 src/protocols/irc/irc.c:373
+msgid "Server has disconnected"
+msgstr "伺服器已停止連線"
+
+#: src/protocols/irc/irc.c:147
 msgid "View MOTD"
 msgstr "顯示是日訊息 (MOTD)"
 
-#. FIXME: remove this when the ui does it for us.
-#: src/protocols/irc/irc.c:168 src/protocols/jabber/buddy.c:929
-#: src/protocols/msn/msn.c:544 src/protocols/oscar/oscar.c:448
-#: src/protocols/oscar/oscar.c:6771 src/protocols/yahoo/yahoo.c:2689
-msgid "Send File"
-msgstr "傳送檔案"
-
-#: src/protocols/irc/irc.c:182 src/protocols/silc/chat.c:32
+#: src/protocols/irc/irc.c:169 src/protocols/silc/chat.c:32
 msgid "_Channel:"
 msgstr "頻道(_C):"
 
-#: src/protocols/irc/irc.c:187 src/protocols/jabber/chat.c:59
+#: src/protocols/irc/irc.c:174 src/protocols/jabber/chat.c:59
 msgid "_Password:"
 msgstr "密碼(_P):"
 
-#: src/protocols/irc/irc.c:207
+#: src/protocols/irc/irc.c:194
 msgid "IRC nicks may not contain whitespace"
 msgstr "IRC 暱稱不可含有空白字元"
 
-#: src/protocols/irc/irc.c:226 src/protocols/toc/toc.c:198
+#: src/protocols/irc/irc.c:213 src/protocols/toc/toc.c:198
 #, c-format
 msgid "Signon: %s"
 msgstr "登入:%s"
 
-#: src/protocols/irc/irc.c:235
+#: src/protocols/irc/irc.c:222
 msgid "Couldn't create socket"
 msgstr "無法建立 Socket"
 
-#: src/protocols/irc/irc.c:250 src/protocols/jabber/jabber.c:296
-#: src/protocols/oscar/oscar.c:1523 src/protocols/oscar/oscar.c:1587
+#: src/protocols/irc/irc.c:237 src/protocols/jabber/jabber.c:297
+#: src/protocols/oscar/oscar.c:1529 src/protocols/oscar/oscar.c:1593
 msgid "Couldn't connect to host"
 msgstr "無法連到伺服器"
 
 # NOTE OSCAR 錯誤訊息應可參閱 http://aimdoc.sourceforge.net/OSCARdoc/,但在該站很難找東西
-#: src/protocols/irc/irc.c:387 src/protocols/trepia/trepia.c:926
+#: src/protocols/irc/irc.c:370 src/protocols/trepia/trepia.c:926
 msgid "Read error"
 msgstr "讀取錯誤"
 
-#: src/protocols/irc/irc.c:538 src/protocols/silc/chat.c:1360
-#: src/protocols/yahoo/yahoochat.c:1341
+#: src/protocols/irc/irc.c:521 src/protocols/silc/chat.c:1363
+#: src/protocols/yahoo/yahoochat.c:1380
 msgid "Users"
 msgstr "使用者"
 
-#: src/protocols/irc/irc.c:541 src/protocols/silc/chat.c:1363
-#: src/protocols/silc/ops.c:1027 src/protocols/yahoo/yahoochat.c:1350
+#: src/protocols/irc/irc.c:524 src/protocols/silc/chat.c:1366
+#: src/protocols/silc/ops.c:1146 src/protocols/yahoo/yahoochat.c:1389
 msgid "Topic"
 msgstr "主題"
 
@@ -5130,34 +5161,35 @@
 #. *< id
 #. *< name
 #. *< version
-#: src/protocols/irc/irc.c:643
+#: src/protocols/irc/irc.c:628
 msgid "IRC Protocol Plugin"
 msgstr "IRC 協定模組"
 
 #. *  summary
-#: src/protocols/irc/irc.c:644
+#: src/protocols/irc/irc.c:629
 msgid "The IRC Protocol Plugin that Sucks Less"
 msgstr "較好的 IRC 協定模組"
 
-#: src/protocols/irc/irc.c:663 src/protocols/irc/msgs.c:197
-#: src/protocols/jabber/jabber.c:1556 src/protocols/napster/napster.c:642
-#: src/protocols/silc/ops.c:945
+#: src/protocols/irc/irc.c:648 src/protocols/irc/msgs.c:197
+#: src/protocols/jabber/jabber.c:1559 src/protocols/napster/napster.c:644
+#: src/protocols/silc/ops.c:1008 src/protocols/silc/ops.c:1110
 msgid "Server"
 msgstr "伺服器"
 
-#: src/protocols/irc/irc.c:666 src/protocols/jabber/jabber.c:1577
-#: src/protocols/msn/msn.c:1748 src/protocols/napster/napster.c:647
-#: src/protocols/silc/silc.c:1484 src/protocols/trepia/trepia.c:1295
+#: src/protocols/irc/irc.c:651 src/protocols/jabber/jabber.c:1580
+#: src/protocols/msn/msn.c:1758 src/protocols/napster/napster.c:649
+#: src/protocols/silc/silc.c:1576 src/protocols/trepia/trepia.c:1297
 msgid "Port"
 msgstr "通訊埠"
 
-#: src/protocols/irc/irc.c:669 src/protocols/zephyr/zephyr.c:1442
+#: src/protocols/irc/irc.c:654 src/protocols/zephyr/zephyr.c:1915
 msgid "Encoding"
 msgstr "編碼"
 
-#: src/protocols/irc/irc.c:672 src/protocols/irc/msgs.c:191
-#: src/protocols/jabber/jabber.c:587 src/protocols/silc/buddy.c:1449
-#: src/protocols/silc/ops.c:941
+#: src/protocols/irc/irc.c:657 src/protocols/irc/msgs.c:191
+#: src/protocols/jabber/jabber.c:588 src/protocols/silc/buddy.c:1445
+#: src/protocols/silc/ops.c:955 src/protocols/silc/ops.c:957
+#: src/protocols/silc/ops.c:1104 src/protocols/silc/ops.c:1106
 msgid "Username"
 msgstr "使用者"
 
@@ -5185,12 +5217,12 @@
 msgid " <i>(identified)</i>"
 msgstr " <i>(已驗證)</i>"
 
-#: src/protocols/irc/msgs.c:192 src/protocols/silc/ops.c:939
-#: src/protocols/yahoo/yahoo_profile.c:1000
+#: src/protocols/irc/msgs.c:192 src/protocols/silc/ops.c:949
+#: src/protocols/silc/ops.c:1098 src/protocols/yahoo/yahoo_profile.c:1005
 msgid "Realname"
 msgstr "姓名"
 
-#: src/protocols/irc/msgs.c:202
+#: src/protocols/irc/msgs.c:202 src/protocols/silc/ops.c:1021
 msgid "Currently on"
 msgstr "所在頻道"
 
@@ -5214,111 +5246,111 @@
 msgstr "%s 的好友資訊"
 
 # NOTE 新版的IRC prpl起動時不顯示這個;直譯「修改」沒有問題
-#: src/protocols/irc/msgs.c:278
+#: src/protocols/irc/msgs.c:279
 #, c-format
 msgid "%s has changed the topic to: %s"
 msgstr "%s 把聊天主題修改為:%s"
 
-#: src/protocols/irc/msgs.c:283
+#: src/protocols/irc/msgs.c:284
 #, c-format
 msgid "The topic for %s is: %s"
 msgstr "%s 的主題為:%s"
 
-#: src/protocols/irc/msgs.c:299
+#: src/protocols/irc/msgs.c:301
 #, c-format
 msgid "Unknown message '%s'"
 msgstr "不明的訊息「%s」"
 
-#: src/protocols/irc/msgs.c:300
+#: src/protocols/irc/msgs.c:302
 msgid "Unknown message"
 msgstr "不明的訊息"
 
-#: src/protocols/irc/msgs.c:300
+#: src/protocols/irc/msgs.c:302
 msgid "Gaim has sent a message the IRC server did not understand."
 msgstr "Gaim 傳送了一個 IRC 伺服器不明白的訊息。"
 
-#: src/protocols/irc/msgs.c:323
+#: src/protocols/irc/msgs.c:325
 #, c-format
 msgid "Users on %s: %s"
 msgstr "在 %s 內的使用者:%s"
 
-#: src/protocols/irc/msgs.c:405
+#: src/protocols/irc/msgs.c:407
 msgid "No such channel"
 msgstr "沒有那個頻道"
 
 #. does this happen?
-#: src/protocols/irc/msgs.c:416
+#: src/protocols/irc/msgs.c:418
 msgid "no such channel"
 msgstr "沒有那個頻道"
 
-#: src/protocols/irc/msgs.c:419
+#: src/protocols/irc/msgs.c:421
 msgid "User is not logged in"
 msgstr "使用者沒有登入"
 
-#: src/protocols/irc/msgs.c:424
+#: src/protocols/irc/msgs.c:426
 msgid "No such nick or channel"
 msgstr "沒有那個暱稱或頻道"
 
-#: src/protocols/irc/msgs.c:444
+#: src/protocols/irc/msgs.c:446
 msgid "Could not send"
 msgstr "無法送出"
 
-#: src/protocols/irc/msgs.c:500
+#: src/protocols/irc/msgs.c:502
 #, c-format
 msgid "Joining %s requires an invitation."
 msgstr "只有被邀請者才可加入 %s。"
 
-#: src/protocols/irc/msgs.c:501
+#: src/protocols/irc/msgs.c:503
 msgid "Invitation only"
 msgstr "只限被邀請者"
 
-#: src/protocols/irc/msgs.c:604
+#: src/protocols/irc/msgs.c:606
 #, c-format
 msgid "You have been kicked by %s: (%s)"
 msgstr "您被 %s 踢出:(%s)"
 
-#: src/protocols/irc/msgs.c:609
+#: src/protocols/irc/msgs.c:611
 #, c-format
 msgid "Kicked by %s (%s)"
 msgstr "被 %s 踢出 (%s)"
 
-#: src/protocols/irc/msgs.c:630
+#: src/protocols/irc/msgs.c:632
 #, c-format
 msgid "mode (%s %s) by %s"
 msgstr "模式 (%s %s) 被 %s 設定"
 
-#: src/protocols/irc/msgs.c:709
+#: src/protocols/irc/msgs.c:711
 msgid "Could not change nick"
 msgstr "無法更改暱稱"
 
-#: src/protocols/irc/msgs.c:710
+#: src/protocols/irc/msgs.c:712
 msgid "Cannot change nick"
 msgstr "無法更改暱稱"
 
-#: src/protocols/irc/msgs.c:731
+#: src/protocols/irc/msgs.c:733
 #, c-format
 msgid "You have parted the channel%s%s"
 msgstr "您離開了頻道%s%s"
 
-#: src/protocols/irc/msgs.c:771
+#: src/protocols/irc/msgs.c:773
 msgid "Error: invalid PONG from server"
 msgstr "錯誤:來自伺服器的 PONG 無效"
 
-#: src/protocols/irc/msgs.c:773
+#: src/protocols/irc/msgs.c:775
 #, c-format
 msgid "PING reply -- Lag: %lu seconds"
 msgstr "PING 回答──延遲:%lu秒"
 
-#: src/protocols/irc/msgs.c:848
+#: src/protocols/irc/msgs.c:850
 #, c-format
 msgid "Cannot join %s:"
 msgstr "無法加入 %s:"
 
-#: src/protocols/irc/msgs.c:849 src/protocols/silc/ops.c:888
+#: src/protocols/irc/msgs.c:851 src/protocols/silc/ops.c:894
 msgid "Cannot join channel"
 msgstr "無法加入頻道"
 
-#: src/protocols/irc/msgs.c:885
+#: src/protocols/irc/msgs.c:887
 #, c-format
 msgid "Wallops from %s"
 msgstr "來自 %s 的 Wallops"
@@ -5414,7 +5446,7 @@
 msgid "names [channel]:  List the users currently in a channel."
 msgstr "names [頻道]:列出目前在頻道中的使用者清單。"
 
-#: src/protocols/irc/parse.c:122 src/protocols/jabber/jabber.c:1406
+#: src/protocols/irc/parse.c:122 src/protocols/jabber/jabber.c:1407
 msgid "nick &lt;new nickname&gt;:  Change your nickname."
 msgstr "nick &lt;新暱稱&gt;:改變您的暱稱。"
 
@@ -5501,7 +5533,7 @@
 msgid "whois &lt;nick&gt;:  Get information on a user."
 msgstr "whois &lt;暱稱&gt;:取得使用者資訊。"
 
-#: src/protocols/irc/parse.c:228 src/protocols/zephyr/zephyr.c:236
+#: src/protocols/irc/parse.c:228 src/protocols/zephyr/zephyr.c:256
 msgid ""
 "(There was an error converting this message.  Check the 'Encoding' option in "
 "the Account Editor)"
@@ -5520,7 +5552,7 @@
 msgid "CTCP PING reply"
 msgstr "CTCP PING 回答"
 
-#: src/protocols/irc/parse.c:485 src/protocols/oscar/oscar.c:1424
+#: src/protocols/irc/parse.c:485 src/protocols/oscar/oscar.c:1430
 #: src/protocols/toc/toc.c:188 src/protocols/toc/toc.c:596
 #: src/protocols/toc/toc.c:612 src/protocols/toc/toc.c:689
 msgid "Disconnected."
@@ -5554,110 +5586,111 @@
 msgid "Invalid challenge from server"
 msgstr "伺服器送來了無效的驗證挑戰"
 
-#: src/protocols/jabber/buddy.c:247 src/protocols/jabber/buddy.c:605
-#: src/protocols/silc/ops.c:780
+#: src/protocols/jabber/buddy.c:246 src/protocols/jabber/buddy.c:604
+#: src/protocols/silc/ops.c:786
 msgid "Full Name"
 msgstr "全名"
 
-#: src/protocols/jabber/buddy.c:248 src/protocols/jabber/buddy.c:618
-#: src/protocols/silc/ops.c:792
+#: src/protocols/jabber/buddy.c:247 src/protocols/jabber/buddy.c:617
+#: src/protocols/silc/ops.c:798
 msgid "Family Name"
 msgstr "姓"
 
-#: src/protocols/jabber/buddy.c:249 src/protocols/jabber/buddy.c:622
+#: src/protocols/jabber/buddy.c:248 src/protocols/jabber/buddy.c:621
 msgid "Given Name"
 msgstr "名"
 
-#: src/protocols/jabber/buddy.c:250 src/protocols/jabber/buddy.c:636
-#: src/protocols/jabber/jabber.c:607 src/protocols/msn/msn.c:1169
-#: src/protocols/silc/buddy.c:1446 src/protocols/silc/ops.c:796
-#: src/protocols/silc/ops.c:937 src/protocols/yahoo/yahoo_profile.c:995
+#: src/protocols/jabber/buddy.c:249 src/protocols/jabber/buddy.c:635
+#: src/protocols/jabber/jabber.c:608 src/protocols/msn/msn.c:1172
+#: src/protocols/silc/buddy.c:1442 src/protocols/silc/ops.c:802
+#: src/protocols/silc/ops.c:945 src/protocols/silc/ops.c:1094
+#: src/protocols/yahoo/yahoo_profile.c:1000
 msgid "Nickname"
 msgstr "暱稱"
 
-#: src/protocols/jabber/buddy.c:251 src/protocols/jabber/jabber.c:647
+#: src/protocols/jabber/buddy.c:250 src/protocols/jabber/jabber.c:648
 msgid "URL"
 msgstr "URL"
 
-#: src/protocols/jabber/buddy.c:252 src/protocols/jabber/buddy.c:664
+#: src/protocols/jabber/buddy.c:251 src/protocols/jabber/buddy.c:663
 msgid "Street Address"
 msgstr "街道地址"
 
-#: src/protocols/jabber/buddy.c:253 src/protocols/jabber/buddy.c:660
+#: src/protocols/jabber/buddy.c:252 src/protocols/jabber/buddy.c:659
 msgid "Extended Address"
 msgstr "地址(續)"
 
-#: src/protocols/jabber/buddy.c:254 src/protocols/jabber/buddy.c:668
+#: src/protocols/jabber/buddy.c:253 src/protocols/jabber/buddy.c:667
 msgid "Locality"
 msgstr "市/村"
 
-#: src/protocols/jabber/buddy.c:255 src/protocols/jabber/buddy.c:672
+#: src/protocols/jabber/buddy.c:254 src/protocols/jabber/buddy.c:671
 msgid "Region"
 msgstr "省/州"
 
-#: src/protocols/jabber/buddy.c:256 src/protocols/jabber/buddy.c:676
-#: src/protocols/jabber/jabber.c:637
+#: src/protocols/jabber/buddy.c:255 src/protocols/jabber/buddy.c:675
+#: src/protocols/jabber/jabber.c:638
 msgid "Postal Code"
 msgstr "郵遞區號"
 
 #. Country
-#: src/protocols/jabber/buddy.c:257 src/protocols/jabber/buddy.c:681
+#: src/protocols/jabber/buddy.c:256 src/protocols/jabber/buddy.c:680
 #: src/protocols/trepia/trepia.c:339 src/protocols/trepia/trepia.c:416
 msgid "Country"
 msgstr "國家"
 
-#: src/protocols/jabber/buddy.c:258 src/protocols/jabber/buddy.c:692
-#: src/protocols/jabber/buddy.c:699
+#: src/protocols/jabber/buddy.c:257 src/protocols/jabber/buddy.c:691
+#: src/protocols/jabber/buddy.c:698
 msgid "Telephone"
 msgstr "電話"
 
-#: src/protocols/jabber/buddy.c:259 src/protocols/jabber/buddy.c:710
-#: src/protocols/jabber/buddy.c:718 src/protocols/silc/buddy.c:1499
-#: src/protocols/silc/silc.c:637 src/protocols/yahoo/yahoo_profile.c:990
+#: src/protocols/jabber/buddy.c:258 src/protocols/jabber/buddy.c:709
+#: src/protocols/jabber/buddy.c:717 src/protocols/silc/silc.c:637
+#: src/protocols/silc/util.c:508 src/protocols/yahoo/yahoo_profile.c:995
 msgid "Email"
 msgstr "電子郵件"
 
-#: src/protocols/jabber/buddy.c:260 src/protocols/jabber/buddy.c:733
+#: src/protocols/jabber/buddy.c:259 src/protocols/jabber/buddy.c:732
 msgid "Organization Name"
 msgstr "所屬機構"
 
-#: src/protocols/jabber/buddy.c:261 src/protocols/jabber/buddy.c:737
+#: src/protocols/jabber/buddy.c:260 src/protocols/jabber/buddy.c:736
 msgid "Organization Unit"
 msgstr "所屬部門"
 
-#: src/protocols/jabber/buddy.c:262 src/protocols/jabber/buddy.c:743
+#: src/protocols/jabber/buddy.c:261 src/protocols/jabber/buddy.c:742
 msgid "Title"
 msgstr "職銜"
 
-#: src/protocols/jabber/buddy.c:263 src/protocols/jabber/buddy.c:746
+#: src/protocols/jabber/buddy.c:262 src/protocols/jabber/buddy.c:745
 msgid "Role"
 msgstr "職責"
 
-#: src/protocols/jabber/buddy.c:264 src/protocols/jabber/buddy.c:639
-#: src/protocols/oscar/oscar.c:4865
+#: src/protocols/jabber/buddy.c:263 src/protocols/jabber/buddy.c:638
+#: src/protocols/oscar/oscar.c:4881
 msgid "Birthday"
 msgstr "生日"
 
-#: src/protocols/jabber/buddy.c:510 src/protocols/jabber/buddy.c:511
+#: src/protocols/jabber/buddy.c:509 src/protocols/jabber/buddy.c:510
 msgid "Edit Jabber vCard"
 msgstr "編輯 Jabber vCard"
 
-#: src/protocols/jabber/buddy.c:512
+#: src/protocols/jabber/buddy.c:511
 msgid ""
 "All items below are optional. Enter only the information with which you feel "
 "comfortable."
 msgstr "以下所有的欄位都是選擇性的。您只要輸入您想輸入您想填入的訊息即可。"
 
-#: src/protocols/jabber/buddy.c:554
+#: src/protocols/jabber/buddy.c:553
 msgid "Jabber ID"
 msgstr "Jabber 帳號"
 
-#: src/protocols/jabber/buddy.c:564 src/protocols/jabber/buddy.c:571
-#: src/protocols/jabber/buddy.c:582 src/protocols/jabber/jabber.c:937
-#: src/protocols/msn/msn.c:454 src/protocols/novell/novell.c:2743
-#: src/protocols/novell/novell.c:2747 src/protocols/oscar/oscar.c:574
-#: src/protocols/oscar/oscar.c:580 src/protocols/oscar/oscar.c:582
-#: src/protocols/yahoo/yahoo.c:2606
+#: src/protocols/jabber/buddy.c:563 src/protocols/jabber/buddy.c:570
+#: src/protocols/jabber/buddy.c:581 src/protocols/jabber/jabber.c:938
+#: src/protocols/msn/msn.c:450 src/protocols/novell/novell.c:2743
+#: src/protocols/novell/novell.c:2747 src/protocols/oscar/oscar.c:578
+#: src/protocols/oscar/oscar.c:584 src/protocols/oscar/oscar.c:586
+#: src/protocols/yahoo/yahoo.c:2634
 msgid "Status"
 msgstr "狀態"
 
@@ -5666,53 +5699,53 @@
 # NOTE Jabber 協定的「Resource」一詞通常係指一種使用者自定的字串,
 # NOTE 用以表示在多處地方同時登入了的情形下,目前的實在位置
 # NOTE 見 http://www.jabber.org/user/userguide.html
-#: src/protocols/jabber/buddy.c:580 src/protocols/jabber/jabber.c:1559
+#: src/protocols/jabber/buddy.c:579 src/protocols/jabber/jabber.c:1562
 msgid "Resource"
 msgstr ""
 
 # NOTE: 法、德文均譯「第二個名」,芬蘭文譯「其他名」,日文音譯了事
 # NOTE: 在網上幾間台灣大學寫「英文別名」,現套用,也跟芬蘭文PO檔處理手法相同
-#: src/protocols/jabber/buddy.c:626 src/protocols/silc/ops.c:788
+#: src/protocols/jabber/buddy.c:625 src/protocols/silc/ops.c:794
 msgid "Middle Name"
 msgstr "英文別名"
 
-#: src/protocols/jabber/buddy.c:644 src/protocols/jabber/jabber.c:622
-#: src/protocols/oscar/oscar.c:4883 src/protocols/oscar/oscar.c:4891
-#: src/protocols/silc/ops.c:824
+#: src/protocols/jabber/buddy.c:643 src/protocols/jabber/jabber.c:623
+#: src/protocols/oscar/oscar.c:4899 src/protocols/oscar/oscar.c:4907
+#: src/protocols/silc/ops.c:830
 msgid "Address"
 msgstr "地址"
 
-#: src/protocols/jabber/buddy.c:656
+#: src/protocols/jabber/buddy.c:655
 msgid "P.O. Box"
 msgstr "郵政信箱"
 
-#: src/protocols/jabber/buddy.c:762
+#: src/protocols/jabber/buddy.c:761
 msgid "Photo"
 msgstr "照片"
 
 # NOTE 見 http://www.jabber.org/jeps/jep-0054.html
-#: src/protocols/jabber/buddy.c:762
+#: src/protocols/jabber/buddy.c:761
 msgid "Logo"
 msgstr "標誌"
 
-#: src/protocols/jabber/buddy.c:778
+#: src/protocols/jabber/buddy.c:777
 msgid "Jabber Profile"
 msgstr "Jabber 個人資料"
 
-#: src/protocols/jabber/buddy.c:937
+#: src/protocols/jabber/buddy.c:932
 msgid "Un-hide From"
 msgstr "現身給"
 
-#: src/protocols/jabber/buddy.c:940
+#: src/protocols/jabber/buddy.c:935
 msgid "Temporarily Hide From"
 msgstr "暫時隱身於"
 
 #. && NOT ME
-#: src/protocols/jabber/buddy.c:947
+#: src/protocols/jabber/buddy.c:942
 msgid "Cancel Presence Notification"
 msgstr "取消出現通知"
 
-#: src/protocols/jabber/buddy.c:953
+#: src/protocols/jabber/buddy.c:948
 msgid "(Re-)Request authorization"
 msgstr "要求或重新要求認證"
 
@@ -5721,11 +5754,11 @@
 #. if(NOT ME)
 #. shouldn't this just happen automatically when the buddy is
 #. removed?
-#: src/protocols/jabber/buddy.c:961
+#: src/protocols/jabber/buddy.c:956
 msgid "Unsubscribe"
 msgstr "從好友名單中移除"
 
-#: src/protocols/jabber/chat.c:42 src/protocols/yahoo/yahoochat.c:963
+#: src/protocols/jabber/chat.c:42 src/protocols/yahoo/yahoochat.c:1002
 msgid "_Room:"
 msgstr "聊天室(_R):"
 
@@ -5821,126 +5854,126 @@
 msgstr "尋找聊天室"
 
 # XXX 譯文有待改進
-#: src/protocols/jabber/jabber.c:75
+#: src/protocols/jabber/jabber.c:76
 msgid "Error initializing session"
 msgstr "對工作階段進行初始化時發生了錯誤"
 
-#: src/protocols/jabber/jabber.c:205 src/protocols/msn/httpmethod.c:266
+#: src/protocols/jabber/jabber.c:206 src/protocols/msn/httpmethod.c:266
 #: src/protocols/trepia/trepia.c:247 src/protocols/trepia/trepia.c:698
 #: src/protocols/trepia/trepia.c:987 src/protocols/trepia/trepia.c:1031
 #: src/protocols/trepia/trepia.c:1130 src/protocols/trepia/trepia.c:1176
 msgid "Write error"
 msgstr "寫入錯誤"
 
-#: src/protocols/jabber/jabber.c:243 src/protocols/jabber/jabber.c:263
+#: src/protocols/jabber/jabber.c:244 src/protocols/jabber/jabber.c:264
 msgid "Read Error"
 msgstr "讀取錯誤"
 
 # NOTE Jabber 協定 Stream Error 的一種,即 <remote-connection-failed/>
 # NOTE 見 http://www.jabber.org/pipermail/xmppwg/2003-June/001226.html
 # XXX 真正的意思是「無法連線至認證所需的遠端資源」,不是「連線失敗」(見上列文章)
-#: src/protocols/jabber/jabber.c:323
+#: src/protocols/jabber/jabber.c:324
 msgid "Connection Failed"
 msgstr "無法連線至認證所需的遠端資源"
 
-#: src/protocols/jabber/jabber.c:326
+#: src/protocols/jabber/jabber.c:327
 msgid "SSL Handshake Failed"
 msgstr "SSL 交談失敗"
 
-#: src/protocols/jabber/jabber.c:369 src/protocols/jabber/jabber.c:698
+#: src/protocols/jabber/jabber.c:370 src/protocols/jabber/jabber.c:699
 msgid "Invalid Jabber ID"
 msgstr "Jabber 帳號無效"
 
 # XXX 暫譯
-#: src/protocols/jabber/jabber.c:397 src/protocols/jabber/jabber.c:725
+#: src/protocols/jabber/jabber.c:398 src/protocols/jabber/jabber.c:726
 msgid "SSL support unavailable"
 msgstr "沒有 SSL 支援"
 
-#: src/protocols/jabber/jabber.c:407 src/protocols/jabber/jabber.c:735
+#: src/protocols/jabber/jabber.c:408 src/protocols/jabber/jabber.c:736
 #: src/protocols/trepia/trepia.c:1070
 msgid "Unable to create socket"
 msgstr "無法建立 Socket"
 
-#: src/protocols/jabber/jabber.c:432
+#: src/protocols/jabber/jabber.c:433
 #, c-format
 msgid "Registration of %s@%s successful"
 msgstr "成功註冊 %s@%s"
 
-#: src/protocols/jabber/jabber.c:434 src/protocols/jabber/jabber.c:435
+#: src/protocols/jabber/jabber.c:435 src/protocols/jabber/jabber.c:436
 msgid "Registration Successful"
 msgstr "註冊成功"
 
-#: src/protocols/jabber/jabber.c:441 src/protocols/jabber/jabber.c:1180
+#: src/protocols/jabber/jabber.c:442 src/protocols/jabber/jabber.c:1181
 msgid "Unknown Error"
 msgstr "未知錯誤"
 
-#: src/protocols/jabber/jabber.c:443 src/protocols/jabber/jabber.c:444
+#: src/protocols/jabber/jabber.c:444 src/protocols/jabber/jabber.c:445
 msgid "Registration Failed"
 msgstr "註冊失敗"
 
-#: src/protocols/jabber/jabber.c:555 src/protocols/jabber/jabber.c:556
+#: src/protocols/jabber/jabber.c:556 src/protocols/jabber/jabber.c:557
 msgid "Already Registered"
 msgstr "已經註冊"
 
-#: src/protocols/jabber/jabber.c:591 src/protocols/jabber/jabber.c:1035
+#: src/protocols/jabber/jabber.c:592 src/protocols/jabber/jabber.c:1036
 msgid "Password"
 msgstr "密碼"
 
-#: src/protocols/jabber/jabber.c:602
+#: src/protocols/jabber/jabber.c:603
 msgid "E-Mail"
 msgstr "電子郵件"
 
 #. State
-#: src/protocols/jabber/jabber.c:632 src/protocols/oscar/oscar.c:4885
-#: src/protocols/oscar/oscar.c:4893 src/protocols/trepia/trepia.c:335
+#: src/protocols/jabber/jabber.c:633 src/protocols/oscar/oscar.c:4901
+#: src/protocols/oscar/oscar.c:4909 src/protocols/trepia/trepia.c:335
 #: src/protocols/trepia/trepia.c:413
 msgid "State"
 msgstr "省/州"
 
-#: src/protocols/jabber/jabber.c:642 src/protocols/silc/buddy.c:1501
-#: src/protocols/silc/ops.c:829 src/protocols/silc/silc.c:639
+#: src/protocols/jabber/jabber.c:643 src/protocols/silc/ops.c:835
+#: src/protocols/silc/silc.c:639 src/protocols/silc/util.c:510
 msgid "Phone"
 msgstr "電話"
 
-#: src/protocols/jabber/jabber.c:652
+#: src/protocols/jabber/jabber.c:653
 msgid "Date"
 msgstr "日期"
 
-#: src/protocols/jabber/jabber.c:660
+#: src/protocols/jabber/jabber.c:661
 msgid "Please fill out the information below to register your new account."
 msgstr "為您的新帳戶註冊,請填寫下列資料:"
 
-#: src/protocols/jabber/jabber.c:663 src/protocols/jabber/jabber.c:664
+#: src/protocols/jabber/jabber.c:664 src/protocols/jabber/jabber.c:665
 msgid "Register New Jabber Account"
 msgstr "註冊新的 Jabber 帳戶"
 
-#: src/protocols/jabber/jabber.c:743
+#: src/protocols/jabber/jabber.c:744
 msgid "Logged out"
 msgstr "已登出。"
 
 #. connect to the server
-#: src/protocols/jabber/jabber.c:782 src/protocols/msn/msn.c:617
+#: src/protocols/jabber/jabber.c:783 src/protocols/msn/msn.c:608
 #: src/protocols/napster/napster.c:499 src/protocols/novell/novell.c:2105
-#: src/protocols/oscar/oscar.c:1591 src/protocols/trepia/trepia.c:1064
-#: src/protocols/yahoo/yahoo.c:2347 src/protocols/zephyr/zephyr.c:906
+#: src/protocols/oscar/oscar.c:1597 src/protocols/trepia/trepia.c:1064
+#: src/protocols/yahoo/yahoo.c:2379 src/protocols/zephyr/zephyr.c:1017
 msgid "Connecting"
 msgstr "連線中"
 
-#: src/protocols/jabber/jabber.c:786
+#: src/protocols/jabber/jabber.c:787
 msgid "Initializing Stream"
 msgstr "串流初始中"
 
-#: src/protocols/jabber/jabber.c:792
+#: src/protocols/jabber/jabber.c:793
 msgid "Authenticating"
 msgstr "認證中"
 
-#: src/protocols/jabber/jabber.c:801
+#: src/protocols/jabber/jabber.c:802
 msgid "Re-initializing Stream"
 msgstr "串流重新初始中"
 
-#: src/protocols/jabber/jabber.c:881 src/protocols/jabber/jabber.c:1158
-#: src/protocols/jabber/jabber.c:1199 src/protocols/jabber/jabber.c:1232
-#: src/protocols/oscar/oscar.c:580 src/protocols/oscar/oscar.c:6471
+#: src/protocols/jabber/jabber.c:882 src/protocols/jabber/jabber.c:1159
+#: src/protocols/jabber/jabber.c:1200 src/protocols/jabber/jabber.c:1233
+#: src/protocols/oscar/oscar.c:584 src/protocols/oscar/oscar.c:6488
 msgid "Not Authorized"
 msgstr "未認證"
 
@@ -5949,86 +5982,86 @@
 # NOTE in jabber each user has control over both who is in his/her buddy list and who has him/her in that other person's buddy list
 # NOTE ie each "subscription" represents the fact that either you send status notifications to someone, or that you recieve them, or both
 # NOTE thus "from" means you only recieve status notification, "to" means you only send status notification and "both" is thus obviously that you both send and recieve status notification
-#: src/protocols/jabber/jabber.c:912
+#: src/protocols/jabber/jabber.c:913
 msgid "Both"
 msgstr "已互相認證"
 
 #  NOTE Jabber 術語,見上
-#: src/protocols/jabber/jabber.c:914
+#: src/protocols/jabber/jabber.c:915
 msgid "From (To pending)"
 msgstr "已認證對方(但仍等待對方認證您)"
 
 #  NOTE Jabber 術語,見上
-#: src/protocols/jabber/jabber.c:916
+#: src/protocols/jabber/jabber.c:917
 msgid "From"
 msgstr "已認證對方"
 
 #  NOTE Jabber 術語,見上
-#: src/protocols/jabber/jabber.c:919
+#: src/protocols/jabber/jabber.c:920
 msgid "To"
 msgstr "已獲對方認證"
 
 #  NOTE Jabber 術語,見上
-#: src/protocols/jabber/jabber.c:921
+#: src/protocols/jabber/jabber.c:922
 msgid "None (To pending)"
 msgstr "無(但正等待對方認證您)"
 
 #  NOTE Jabber 術語,見上
-#: src/protocols/jabber/jabber.c:925
+#: src/protocols/jabber/jabber.c:926
 msgid "Subscription"
 msgstr "認證狀態"
 
-#: src/protocols/jabber/jabber.c:945
+#: src/protocols/jabber/jabber.c:946
 msgid "Error"
 msgstr "錯誤"
 
-#: src/protocols/jabber/jabber.c:958 src/protocols/jabber/jutil.c:35
+#: src/protocols/jabber/jabber.c:959 src/protocols/jabber/jutil.c:35
 #: src/protocols/jabber/presence.c:66 src/protocols/jabber/presence.c:117
 msgid "Chatty"
 msgstr "想聊天"
 
-#: src/protocols/jabber/jabber.c:960 src/protocols/jabber/jutil.c:38
+#: src/protocols/jabber/jabber.c:961 src/protocols/jabber/jutil.c:38
 #: src/protocols/jabber/presence.c:68 src/protocols/jabber/presence.c:122
 msgid "Extended Away"
 msgstr "長時間離開"
 
-#: src/protocols/jabber/jabber.c:961 src/protocols/jabber/jutil.c:41
+#: src/protocols/jabber/jabber.c:962 src/protocols/jabber/jutil.c:41
 #: src/protocols/jabber/presence.c:70 src/protocols/jabber/presence.c:124
-#: src/protocols/oscar/oscar.c:522 src/protocols/oscar/oscar.c:5468
-#: src/protocols/oscar/oscar.c:6663
+#: src/protocols/oscar/oscar.c:526 src/protocols/oscar/oscar.c:5484
+#: src/protocols/oscar/oscar.c:6680
 msgid "Do Not Disturb"
 msgstr "請勿打擾"
 
-#: src/protocols/jabber/jabber.c:978
+#: src/protocols/jabber/jabber.c:979
 msgid "Password Changed"
 msgstr "密碼修改成功"
 
-#: src/protocols/jabber/jabber.c:979
+#: src/protocols/jabber/jabber.c:980
 msgid "Your password has been changed."
 msgstr "成功修改了您的密碼。"
 
-#: src/protocols/jabber/jabber.c:983 src/protocols/jabber/jabber.c:984
+#: src/protocols/jabber/jabber.c:984 src/protocols/jabber/jabber.c:985
 msgid "Error changing password"
 msgstr "修改密碼期間出現錯誤"
 
-#: src/protocols/jabber/jabber.c:1040
+#: src/protocols/jabber/jabber.c:1041
 msgid "Password (again)"
 msgstr "舊密碼(再次確認)"
 
-#: src/protocols/jabber/jabber.c:1045 src/protocols/jabber/jabber.c:1046
+#: src/protocols/jabber/jabber.c:1046 src/protocols/jabber/jabber.c:1047
 msgid "Change Jabber Password"
 msgstr "修改 Jabber 密碼"
 
-#: src/protocols/jabber/jabber.c:1046
+#: src/protocols/jabber/jabber.c:1047
 msgid "Please enter your new password"
 msgstr "請輸入您的新密碼"
 
-#: src/protocols/jabber/jabber.c:1056 src/protocols/toc/toc.c:1540
+#: src/protocols/jabber/jabber.c:1057 src/protocols/toc/toc.c:1540
 msgid "Set User Info"
 msgstr "設定使用者資訊"
 
 # NOTE 見 http://www.jabber.org/jeps/jep-0103.html
-#: src/protocols/jabber/jabber.c:1138
+#: src/protocols/jabber/jabber.c:1139
 msgid "Bad Request"
 msgstr "傳送網址時發生了不明的錯誤"
 
@@ -6036,50 +6069,50 @@
 #  NOTE(大概係指登入用的使用者自定字串)或工作階段登入,以致無法存取
 #  NOTE 詳見 http://www.jabber.org/ietf/draft-ietf-xmpp-core-23.txt
 #  NOTE 譯文更動 by Ambrose
-#: src/protocols/jabber/jabber.c:1140
+#: src/protocols/jabber/jabber.c:1141
 msgid "Conflict"
 msgstr "名稱或位址衝突"
 
-#: src/protocols/jabber/jabber.c:1142
+#: src/protocols/jabber/jabber.c:1143
 msgid "Feature Not Implemented"
 msgstr "該功能尚未實作"
 
 #  NOTE Jabber 錯誤 <forbidden/>,意思正常(表示權限不夠)
 #  NOTE 詳見 http://www.jabber.org/ietf/draft-ietf-xmpp-core-23.txt
-#: src/protocols/jabber/jabber.c:1144
+#: src/protocols/jabber/jabber.c:1145
 msgid "Forbidden"
 msgstr "權限不夠"
 
 #  NOTE Jabber 錯誤 <gone/>,表示使用者或伺服器曾經上線,後來離了線
 #  NOTE 詳見 http://www.jabber.org/ietf/draft-ietf-xmpp-core-23.txt
-#: src/protocols/jabber/jabber.c:1146
+#: src/protocols/jabber/jabber.c:1147
 msgid "Gone"
 msgstr "已離線"
 
-#: src/protocols/jabber/jabber.c:1148 src/protocols/jabber/jabber.c:1222
+#: src/protocols/jabber/jabber.c:1149 src/protocols/jabber/jabber.c:1223
 msgid "Internal Server Error"
 msgstr "伺服器內部錯誤"
 
-#: src/protocols/jabber/jabber.c:1150
+#: src/protocols/jabber/jabber.c:1151
 msgid "Item Not Found"
 msgstr "項目未找到"
 
-#: src/protocols/jabber/jabber.c:1152
+#: src/protocols/jabber/jabber.c:1153
 msgid "Malformed Jabber ID"
 msgstr "畸型的 Jabber ID"
 
 #  NOTE Jabber 錯誤 <not-acceptable/>,表示所送出的要求未能達到伺服器或收件人所訂下的
 #  NOTE 條件(例如訊息中含有禁字),以致無法存取
 #  NOTE 詳見 http://www.jabber.org/ietf/draft-ietf-xmpp-core-23.txt
-#: src/protocols/jabber/jabber.c:1154
+#: src/protocols/jabber/jabber.c:1155
 msgid "Not Acceptable"
 msgstr "無法接受"
 
-#: src/protocols/jabber/jabber.c:1156
+#: src/protocols/jabber/jabber.c:1157
 msgid "Not Allowed"
 msgstr "不被允許"
 
-#: src/protocols/jabber/jabber.c:1160
+#: src/protocols/jabber/jabber.c:1161
 msgid "Payment Required"
 msgstr "必須付款"
 
@@ -6087,78 +6120,78 @@
 #  NOTE 詳見 http://www.jabber.org/ietf/draft-ietf-xmpp-core-23.txt
 #  NOTE「暫時無法聯絡」應該比「不存在」通順
 #  NOTE 譯文更動 by Ambrose
-#: src/protocols/jabber/jabber.c:1162
+#: src/protocols/jabber/jabber.c:1163
 msgid "Recipient Unavailable"
 msgstr "暫時無法聯絡接收者"
 
-#: src/protocols/jabber/jabber.c:1166
+#: src/protocols/jabber/jabber.c:1167
 msgid "Registration Required"
 msgstr "必須註冊"
 
-#: src/protocols/jabber/jabber.c:1168
+#: src/protocols/jabber/jabber.c:1169
 msgid "Remote Server Not Found"
 msgstr "遠端伺服器未找到"
 
-#: src/protocols/jabber/jabber.c:1170
+#: src/protocols/jabber/jabber.c:1171
 msgid "Remote Server Timeout"
 msgstr "遠端伺服器逾時"
 
-#: src/protocols/jabber/jabber.c:1172
+#: src/protocols/jabber/jabber.c:1173
 msgid "Server Overloaded"
 msgstr "伺服器超載"
 
 #  NOTE Jabber 錯誤 <service-unavailable/>,表示伺服器收到一個意義不明的指令
 #  NOTE 詳見 http://www.jabber.org/ietf/draft-ietf-xmpp-core-23.txt
 #  NOTE 譯文更動 by Ambrose
-#: src/protocols/jabber/jabber.c:1174
+#: src/protocols/jabber/jabber.c:1175
 msgid "Service Unavailable"
 msgstr "不提供該項服務"
 
 #  NOTE Jabber 錯誤 <subscription-required/>,表示使用「服務」前
 #  NOTE 必須事先取得「Subscription」(認證)
 #  NOTE 詳見 http://www.jabber.org/ietf/draft-ietf-xmpp-core-23.txt
-#: src/protocols/jabber/jabber.c:1176
+#: src/protocols/jabber/jabber.c:1177
 msgid "Subscription Required"
 msgstr "必須認證"
 
-#: src/protocols/jabber/jabber.c:1178
+#: src/protocols/jabber/jabber.c:1179
 msgid "Unexpected Request"
 msgstr "未預期的要求"
 
-#: src/protocols/jabber/jabber.c:1185
+#: src/protocols/jabber/jabber.c:1186
 msgid "Authorization Aborted"
 msgstr "認證取消"
 
-#: src/protocols/jabber/jabber.c:1187
+#: src/protocols/jabber/jabber.c:1188
 msgid "Incorrect encoding in authorization"
 msgstr "認證含錯誤的編碼"
 
-#: src/protocols/jabber/jabber.c:1190
+#: src/protocols/jabber/jabber.c:1191
 msgid "Invalid authzid"
 msgstr "無效的 authzid"
 
 # XXX 要覆查譯文
-#: src/protocols/jabber/jabber.c:1193
+#: src/protocols/jabber/jabber.c:1194
 msgid "Invalid Authorization Mechanism"
 msgstr "無效的認證機制"
 
-#: src/protocols/jabber/jabber.c:1196
+#: src/protocols/jabber/jabber.c:1197
 msgid "Authorization mechanism too weak"
 msgstr "認證機制太薄弱了"
 
-#: src/protocols/jabber/jabber.c:1201
+#: src/protocols/jabber/jabber.c:1202
 msgid "Temporary Authentication Failure"
 msgstr "認證暫時失敗"
 
-#: src/protocols/jabber/jabber.c:1203
+#: src/protocols/jabber/jabber.c:1204
 msgid "Authentication Failure"
 msgstr "認證失敗"
 
-#: src/protocols/jabber/jabber.c:1207
+#: src/protocols/jabber/jabber.c:1208
 msgid "Bad Format"
 msgstr "無效的格式"
 
-#: src/protocols/jabber/jabber.c:1209
+#: src/protocols/jabber/jabber.c:1210
 msgid "Bad Namespace Prefix"
 msgstr "無效的 Namespace Prefix"
 
@@ -6168,133 +6201,133 @@
 # NOTE 見 http://www.jabber.org/user/userguide.html
 # NOTE Jabber 協定中 Stanza Error 的一種,即 <conflict/>
 # NOTE 見 http://www.jabber.org/pipermail/xmppwg/2003-June/001226.html
-#: src/protocols/jabber/jabber.c:1212
+#: src/protocols/jabber/jabber.c:1213
 msgid "Resource Conflict"
 msgstr "已經以指定的 Resource 在其他地方登入"
 
-#: src/protocols/jabber/jabber.c:1214 src/protocols/silc/ops.c:1285
+#: src/protocols/jabber/jabber.c:1215 src/protocols/silc/ops.c:1491
 msgid "Connection Timeout"
 msgstr "連線已逾時"
 
 # NOTE Jabber 協定中 Stream Error 的一種,即 <host-gone/>
 # NOTE 見 http://www.jabber.org/pipermail/xmppwg/2003-June/001226.html
-#: src/protocols/jabber/jabber.c:1216
+#: src/protocols/jabber/jabber.c:1217
 msgid "Host Gone"
 msgstr "伺服器已不再支援所給定的伺服器名稱"
 
 # NOTE Jabber 協定中 Stream Error 的一種,即 <host-unknown/>
 # NOTE 見 http://www.jabber.org/pipermail/xmppwg/2003-June/001226.html
-#: src/protocols/jabber/jabber.c:1218
+#: src/protocols/jabber/jabber.c:1219
 msgid "Host Unknown"
 msgstr "不明的伺服器名稱"
 
-#: src/protocols/jabber/jabber.c:1220
+#: src/protocols/jabber/jabber.c:1221
 msgid "Improper Addressing"
 msgstr "錯誤的定址"
 
-#: src/protocols/jabber/jabber.c:1224
+#: src/protocols/jabber/jabber.c:1225
 msgid "Invalid ID"
 msgstr "帳號無效"
 
 # FIXME 必須覆查譯文
-#: src/protocols/jabber/jabber.c:1226
+#: src/protocols/jabber/jabber.c:1227
 msgid "Invalid Namespace"
 msgstr "命名空間無效"
 
-#: src/protocols/jabber/jabber.c:1228
+#: src/protocols/jabber/jabber.c:1229
 msgid "Invalid XML"
 msgstr "無效的 XML"
 
 # XXX 這是暫譯,譯文有待改進
 # NOTE Jabber 協定中的「nonmatching-hosts」
 # NOTE 見 http://www.jabber.org/pipermail/xmppwg/2003-June/001226.html
-#: src/protocols/jabber/jabber.c:1230
+#: src/protocols/jabber/jabber.c:1231
 msgid "Non-matching Hosts"
 msgstr "主機名稱不相乎"
 
 # XXX 這是暫譯,譯文有待改進。不過好像真的有人這樣寫,大概沒有太大的問題
 # NOTE Jabber 協定 xmpp-core 中 Stream Error 的一種,即 <policy-violation/>
 # NOTE 見 http://www.jabber.org/ietf/draft-ietf-xmpp-core-19.html
-#: src/protocols/jabber/jabber.c:1234
+#: src/protocols/jabber/jabber.c:1235
 msgid "Policy Violation"
 msgstr "違反了服務政策"
 
 # NOTE Jabber 協定 Stream Error 的一種,即 <remote-connection-failed/>
 # NOTE 見 http://www.jabber.org/pipermail/xmppwg/2003-June/001226.html
-#: src/protocols/jabber/jabber.c:1236
+#: src/protocols/jabber/jabber.c:1237
 msgid "Remote Connection Failed"
 msgstr "無法連線至認證所需的遠端資源"
 
 # NOTE Jabber 協定 Stream Error 的一種,即 <resource-constraint/>
 # NOTE 在這裏的 Resource 一詞與登入時使用者所用的 Resource 一詞意義並不相同
 # NOTE 見 http://www.jabber.org/pipermail/xmppwg/2003-June/001226.html
-#: src/protocols/jabber/jabber.c:1238
+#: src/protocols/jabber/jabber.c:1239
 msgid "Resource Constraint"
 msgstr "伺服器資源短缺"
 
 # NOTE Jabber 協定 xmpp-core 中 Stream Error 的一種,即 <restricted-xml/>
 # NOTE 見 http://www.jabber.org/ietf/draft-ietf-xmpp-core-18.html
-#: src/protocols/jabber/jabber.c:1240
+#: src/protocols/jabber/jabber.c:1241
 msgid "Restricted XML"
 msgstr "XML 中存在有 Jabber 協定不容許的 XML 元素"
 
 # NOTE Jabber 協定中 Stream Error 的一種,即 <see-other-host/>
 # NOTE 見 http://www.jabber.org/pipermail/xmppwg/2003-June/001226.html
-#: src/protocols/jabber/jabber.c:1242
+#: src/protocols/jabber/jabber.c:1243
 msgid "See Other Host"
 msgstr "伺服器在認證期間要求了重新導向至另一伺服器"
 
 # NOTE Jabber 協定中 Stream Error 的一種,即 <system-shutdown/>
 # NOTE 見 http://www.jabber.org/pipermail/xmppwg/2003-June/001226.html
-#: src/protocols/jabber/jabber.c:1244
+#: src/protocols/jabber/jabber.c:1245
 msgid "System Shutdown"
 msgstr "伺服器目前在關機中"
 
 # NOTE 見 http://www.jabber.org/jeps/jep-0103.html
-#: src/protocols/jabber/jabber.c:1246
+#: src/protocols/jabber/jabber.c:1247
 msgid "Undefined Condition"
 msgstr "傳送網址時發生了不明的錯誤"
 
 # NOTE 見 http://www.jabber.org/pipermail/xmppwg/2003-August/001431.html
-#: src/protocols/jabber/jabber.c:1248
+#: src/protocols/jabber/jabber.c:1249
 msgid "Unsupported Encoding"
 msgstr "伺服器不支援給定的字元編碼"
 
 # NOTE Jabber 協定中 Stream Error 的一種,即 <unsupported-stanza-type/>
 # NOTE 見 http://www.jabber.org/pipermail/xmppwg/2003-March/000752.html
-#: src/protocols/jabber/jabber.c:1250
+#: src/protocols/jabber/jabber.c:1251
 msgid "Unsupported Stanza Type"
 msgstr "伺服器不支援給定的段落類別 (Stanza Type)"
 
 # NOTE Jabber 協定中 Stream Error 的一種,即 <unsupported-version/>
 # NOTE 見 http://www.jabber.org/pipermail/xmppwg/2003-March/000752.html
-#: src/protocols/jabber/jabber.c:1252
+#: src/protocols/jabber/jabber.c:1253
 msgid "Unsupported Version"
 msgstr "不支援給定的 XMPP 版本"
 
-#: src/protocols/jabber/jabber.c:1254
+#: src/protocols/jabber/jabber.c:1255
 msgid "XML Not Well Formed"
 msgstr "XML 文件格式有問題"
 
-#: src/protocols/jabber/jabber.c:1256
+#: src/protocols/jabber/jabber.c:1257
 msgid "Stream Error"
 msgstr "串流錯誤"
 
-#: src/protocols/jabber/jabber.c:1323
+#: src/protocols/jabber/jabber.c:1324
 #, c-format
 msgid "Unable to ban user %s"
 msgstr "無法禁止使用者 %s"
 
-#: src/protocols/jabber/jabber.c:1375
+#: src/protocols/jabber/jabber.c:1376
 #, c-format
 msgid "Unable to kick user %s"
 msgstr "無法踢出使用者 %s"
 
-#: src/protocols/jabber/jabber.c:1400
+#: src/protocols/jabber/jabber.c:1401
 msgid "config:  Configure a chat room."
 msgstr "config:設定一個聊天室"
 
-#: src/protocols/jabber/jabber.c:1403
+#: src/protocols/jabber/jabber.c:1404
 msgid "configure:  Configure a chat room."
 msgstr "configure:設定一個聊天室"
 
@@ -6303,40 +6336,40 @@
 # #, c-format
 # msgid "%d %s in room"
 # msgstr "聊天室有 %d 家伙"
-#: src/protocols/jabber/jabber.c:1410
+#: src/protocols/jabber/jabber.c:1411
 msgid "part [room]:  Leave the room."
 msgstr "part [聊天室]:離開聊天室。"
 
-#: src/protocols/jabber/jabber.c:1413
+#: src/protocols/jabber/jabber.c:1414
 msgid "register:  Register with a chat room."
 msgstr "register:加入一個聊天室"
 
-#: src/protocols/jabber/jabber.c:1418
+#: src/protocols/jabber/jabber.c:1419
 msgid "topic [new topic]:  View or change the topic."
 msgstr "topic [新主題]:檢視或修改聊天主題"
 
-#: src/protocols/jabber/jabber.c:1422
+#: src/protocols/jabber/jabber.c:1423
 msgid "ban &lt;user&gt; [room]:  Ban a user from the room."
 msgstr "ban &lt;user&gt; [聊天室]:禁止某使用者進入聊天室"
 
-#: src/protocols/jabber/jabber.c:1426
+#: src/protocols/jabber/jabber.c:1427
 msgid "invite &lt;user&gt; [room]:  Invite a user to the room."
 msgstr "invite &lt使用者&gt; [聊天室]:邀請某使用者進入聊天室"
 
-#: src/protocols/jabber/jabber.c:1430
+#: src/protocols/jabber/jabber.c:1431
 msgid "join: &lt;room&gt; [server]:  Join a chat on this server."
 msgstr "join: &lt聊天室&gt; [伺服器]:加入位於這個伺服器的一個聊天室"
 
-#: src/protocols/jabber/jabber.c:1434
+#: src/protocols/jabber/jabber.c:1435
 msgid "kick &lt;user&gt; [room]:  Kick a user from the room."
 msgstr "kick &lt;使用者&gt; [聊天室]:將使用者從聊天室中踢出。"
 
-#: src/protocols/jabber/jabber.c:1438
+#: src/protocols/jabber/jabber.c:1439
 msgid ""
 "msg &lt;user&gt; &lt;message&gt;:  Send a private message to another user."
 msgstr "msg &lt;使用者&gt; &lt;訊息&gt;:傳送私人訊息給另一個使用者"
 
-#: src/protocols/jabber/jabber.c:1452
+#: src/protocols/jabber/jabber.c:1453
 msgid "Hide Operating System"
 msgstr "隱藏作業系統"
 
@@ -6351,26 +6384,26 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/jabber/jabber.c:1534 src/protocols/jabber/jabber.c:1536
+#: src/protocols/jabber/jabber.c:1537 src/protocols/jabber/jabber.c:1539
 msgid "Jabber Protocol Plugin"
 msgstr "Jabber 協定模組"
 
 # XXX 暫譯
-#: src/protocols/jabber/jabber.c:1562
+#: src/protocols/jabber/jabber.c:1565
 msgid "Use TLS if available"
 msgstr "TLS 可用則用"
 
-#: src/protocols/jabber/jabber.c:1567
+#: src/protocols/jabber/jabber.c:1570
 msgid "Force old SSL"
 msgstr "強迫使用舊式 SSL"
 
 #  NOTE 譯文更動 by Ambrose
-#: src/protocols/jabber/jabber.c:1572
+#: src/protocols/jabber/jabber.c:1575
 msgid "Allow plaintext auth over unencrypted streams"
 msgstr "允許使用明文,在未經加密的串流上進行認證"
 
 #. Account options
-#: src/protocols/jabber/jabber.c:1581 src/protocols/silc/silc.c:1480
+#: src/protocols/jabber/jabber.c:1584 src/protocols/silc/silc.c:1572
 msgid "Connect server"
 msgstr "連結伺服器"
 
@@ -6511,7 +6544,7 @@
 msgid "Not on list"
 msgstr "不在清單中"
 
-#: src/protocols/msn/error.c:70 src/protocols/zephyr/zephyr.c:570
+#: src/protocols/msn/error.c:70 src/protocols/zephyr/zephyr.c:593
 msgid "User is offline"
 msgstr "使用者是離線的"
 
@@ -6660,8 +6693,8 @@
 msgid "Server too busy"
 msgstr "伺服器太忙碌"
 
-#: src/protocols/msn/error.c:198 src/protocols/oscar/oscar.c:2010
-#: src/protocols/silc/ops.c:1274 src/protocols/toc/toc.c:630
+#: src/protocols/msn/error.c:198 src/protocols/oscar/oscar.c:2026
+#: src/protocols/silc/ops.c:1480 src/protocols/toc/toc.c:630
 msgid "Authentication failed"
 msgstr "認證失敗"
 
@@ -6750,81 +6783,81 @@
 msgid "Page"
 msgstr "傳呼"
 
-#: src/protocols/msn/msn.c:467 src/protocols/msn/msn.c:765
+#: src/protocols/msn/msn.c:463 src/protocols/msn/msn.c:756
 #: src/protocols/msn/state.c:34
 msgid "Away From Computer"
 msgstr "不在電腦前"
 
-#: src/protocols/msn/msn.c:468 src/protocols/msn/msn.c:767
-#: src/protocols/msn/state.c:33 src/protocols/yahoo/yahoo.c:2463
-#: src/protocols/yahoo/yahoo.c:2844 src/protocols/yahoo/yahoo.c:2960
+#: src/protocols/msn/msn.c:464 src/protocols/msn/msn.c:758
+#: src/protocols/msn/state.c:33 src/protocols/yahoo/yahoo.c:2491
+#: src/protocols/yahoo/yahoo.c:2853 src/protocols/yahoo/yahoo.c:2969
 msgid "Be Right Back"
 msgstr "馬上回來"
 
-#: src/protocols/msn/msn.c:469 src/protocols/msn/msn.c:769
+#: src/protocols/msn/msn.c:465 src/protocols/msn/msn.c:760
 #: src/protocols/msn/state.c:31 src/protocols/novell/novell.c:2727
 #: src/protocols/novell/novell.c:2842 src/protocols/novell/novell.c:2896
 #: src/protocols/silc/buddy.c:1383 src/protocols/silc/silc.c:47
-#: src/protocols/silc/silc.c:78 src/protocols/yahoo/yahoo.c:2465
-#: src/protocols/yahoo/yahoo.c:2846 src/protocols/yahoo/yahoo.c:2961
+#: src/protocols/silc/silc.c:78 src/protocols/yahoo/yahoo.c:2493
+#: src/protocols/yahoo/yahoo.c:2855 src/protocols/yahoo/yahoo.c:2970
 msgid "Busy"
 msgstr "忙碌"
 
-#: src/protocols/msn/msn.c:470 src/protocols/msn/msn.c:771
-#: src/protocols/msn/state.c:35 src/protocols/yahoo/yahoo.c:2473
-#: src/protocols/yahoo/yahoo.c:2854 src/protocols/yahoo/yahoo.c:2965
+#: src/protocols/msn/msn.c:466 src/protocols/msn/msn.c:762
+#: src/protocols/msn/state.c:35 src/protocols/yahoo/yahoo.c:2501
+#: src/protocols/yahoo/yahoo.c:2863 src/protocols/yahoo/yahoo.c:2974
 msgid "On The Phone"
 msgstr "電話中"
 
-#: src/protocols/msn/msn.c:471 src/protocols/msn/msn.c:773
-#: src/protocols/msn/state.c:36 src/protocols/yahoo/yahoo.c:2477
-#: src/protocols/yahoo/yahoo.c:2858 src/protocols/yahoo/yahoo.c:2967
+#: src/protocols/msn/msn.c:467 src/protocols/msn/msn.c:764
+#: src/protocols/msn/state.c:36 src/protocols/yahoo/yahoo.c:2505
+#: src/protocols/yahoo/yahoo.c:2867 src/protocols/yahoo/yahoo.c:2976
 msgid "Out To Lunch"
 msgstr "外出用餐"
 
-#: src/protocols/msn/msn.c:472 src/protocols/msn/msn.c:775
-#: src/protocols/zephyr/zephyr.c:1205 src/protocols/zephyr/zephyr.c:1220
+#: src/protocols/msn/msn.c:468 src/protocols/msn/msn.c:766
+#: src/protocols/zephyr/zephyr.c:1355 src/protocols/zephyr/zephyr.c:1374
 msgid "Hidden"
 msgstr "隱藏"
 
-#: src/protocols/msn/msn.c:483
+#: src/protocols/msn/msn.c:479
 msgid "Set Friendly Name"
 msgstr "設定暱稱"
 
+#: src/protocols/msn/msn.c:484
+msgid "Set Home Phone Number"
+msgstr "設定住家電話號碼"
+
 #: src/protocols/msn/msn.c:488
-msgid "Set Home Phone Number"
-msgstr "設定住家電話號碼"
-
-#: src/protocols/msn/msn.c:492
 msgid "Set Work Phone Number"
 msgstr "設定工作電話號碼"
 
-#: src/protocols/msn/msn.c:496
+#: src/protocols/msn/msn.c:492
 msgid "Set Mobile Phone Number"
 msgstr "設定行動電話號碼"
 
-#: src/protocols/msn/msn.c:502
+#: src/protocols/msn/msn.c:498
 msgid "Enable/Disable Mobile Devices"
 msgstr "開啟 / 關閉行動裝置"
 
-#: src/protocols/msn/msn.c:507
+#: src/protocols/msn/msn.c:503
 msgid "Allow/Disallow Mobile Pages"
 msgstr "允許 / 不允許 Mobile Page"
 
-#: src/protocols/msn/msn.c:530
+#: src/protocols/msn/msn.c:526
 msgid "Send to Mobile"
 msgstr "傳送至行動電話"
 
-#: src/protocols/msn/msn.c:540
+#: src/protocols/msn/msn.c:536
 msgid "Initiate Chat"
 msgstr "開啟聊天室"
 
-#: src/protocols/msn/msn.c:549
+#: src/protocols/msn/msn.c:540
 msgid "Update Buddy Icon"
 msgstr "更新好友圖示"
 
 # XXX 暫譯
-#: src/protocols/msn/msn.c:586
+#: src/protocols/msn/msn.c:577
 msgid ""
 "SSL support is needed for MSN. Please install a supported SSL library. See "
 "http://gaim.sf.net/faq-ssl.php for more information."
@@ -6832,107 +6865,127 @@
 "MSN 需要 SSL 程式庫的支援,請安裝一個受支援的 SSL 程式庫。詳情請閱 http://"
 "gaim.sf.net/faq-ssl.php。"
 
-#: src/protocols/msn/msn.c:1156 src/protocols/msn/msn.c:1169
-#: src/protocols/msn/msn.c:1175 src/protocols/yahoo/yahoo_profile.c:640
-#: src/protocols/yahoo/yahoo_profile.c:653
+#: src/protocols/msn/msn.c:1167 src/protocols/yahoo/yahoo_profile.c:659
+#: src/protocols/zephyr/zephyr.c:626
+#, c-format
+msgid "<b>Alias:</b> %s<br>"
+msgstr "<b>別名:</b>%s<br>"
+
+#. put a link to the actual profile URL
+#: src/protocols/msn/msn.c:1172 src/protocols/msn/msn.c:1512
+#: src/protocols/yahoo/yahoo_profile.c:1168 src/util.c:792
+#, c-format
+msgid "<b>%s:</b> "
+msgstr "<b>%s:</b>"
+
+#: src/protocols/msn/msn.c:1173
+#, c-format
+msgid "<font sml=\"msn\">%s</font><br>"
+msgstr ""
+
+#: src/protocols/msn/msn.c:1179 src/protocols/yahoo/yahoo_profile.c:664
 #, c-format
 msgid "<b>%s:</b> %s<br>"
 msgstr "<b>%s:</b>%s<br>"
 
-#: src/protocols/msn/msn.c:1156
-msgid "MSN ID"
-msgstr "MSN 帳號"
-
-#: src/protocols/msn/msn.c:1164 src/protocols/yahoo/yahoo_profile.c:648
-#: src/protocols/zephyr/zephyr.c:602
-#, c-format
-msgid "<b>Alias:</b> %s<br>"
-msgstr "<b>別名:</b>%s<br>"
-
-#: src/protocols/msn/msn.c:1241 src/protocols/msn/msn.c:1565
-#: src/protocols/yahoo/yahoo_profile.c:746
-#: src/protocols/yahoo/yahoo_profile.c:834
+#: src/protocols/msn/msn.c:1242
+#, fuzzy
+msgid "MSN Profile"
+msgstr "設定個人資料"
+
+#: src/protocols/msn/msn.c:1247 src/protocols/msn/msn.c:1499
+#: src/protocols/yahoo/yahoo_profile.c:761
 msgid "Error retrieving profile"
 msgstr "取得個人資訊時發生錯誤"
 
 #. Age
-#: src/protocols/msn/msn.c:1312 src/protocols/oscar/oscar.c:4870
+#: src/protocols/msn/msn.c:1318 src/protocols/oscar/oscar.c:4886
 #: src/protocols/trepia/trepia.c:285 src/protocols/trepia/trepia.c:404
-#: src/protocols/yahoo/yahoo_profile.c:1010
+#: src/protocols/yahoo/yahoo_profile.c:1015
 msgid "Age"
 msgstr "年齡"
 
 #. Gender
-#: src/protocols/msn/msn.c:1319 src/protocols/oscar/oscar.c:4856
+#: src/protocols/msn/msn.c:1325 src/protocols/oscar/oscar.c:4872
 #: src/protocols/trepia/trepia.c:279 src/protocols/trepia/trepia.c:406
-#: src/protocols/yahoo/yahoo_profile.c:1020
+#: src/protocols/yahoo/yahoo_profile.c:1025
 msgid "Gender"
 msgstr "性別"
 
-#: src/protocols/msn/msn.c:1328 src/protocols/yahoo/yahoo_profile.c:1015
+#: src/protocols/msn/msn.c:1334 src/protocols/yahoo/yahoo_profile.c:1020
 msgid "Marital Status"
 msgstr "婚姻狀況"
 
-#: src/protocols/msn/msn.c:1335 src/protocols/yahoo/yahoo_profile.c:1005
+#: src/protocols/msn/msn.c:1341 src/protocols/yahoo/yahoo_profile.c:1010
 msgid "Location"
 msgstr "所在位置"
 
-#: src/protocols/msn/msn.c:1343 src/protocols/yahoo/yahoo_profile.c:1025
+#: src/protocols/msn/msn.c:1349 src/protocols/yahoo/yahoo_profile.c:1030
 msgid "Occupation"
 msgstr "職業"
 
-#: src/protocols/msn/msn.c:1360 src/protocols/msn/msn.c:1366
-#: src/protocols/msn/msn.c:1373 src/protocols/msn/msn.c:1381
-#: src/protocols/msn/msn.c:1388
+#: src/protocols/msn/msn.c:1366 src/protocols/msn/msn.c:1372
+#: src/protocols/msn/msn.c:1379 src/protocols/msn/msn.c:1387
+#: src/protocols/msn/msn.c:1394
 msgid "A Little About Me"
 msgstr "自我簡介"
 
-#: src/protocols/msn/msn.c:1397 src/protocols/msn/msn.c:1403
-#: src/protocols/msn/msn.c:1410 src/protocols/msn/msn.c:1417
+#: src/protocols/msn/msn.c:1403 src/protocols/msn/msn.c:1409
+#: src/protocols/msn/msn.c:1416 src/protocols/msn/msn.c:1423
 msgid "Favorite Things"
 msgstr "喜愛事物"
 
-#: src/protocols/msn/msn.c:1426 src/protocols/msn/msn.c:1432
-#: src/protocols/msn/msn.c:1439
+#: src/protocols/msn/msn.c:1432 src/protocols/msn/msn.c:1438
+#: src/protocols/msn/msn.c:1445
 msgid "Hobbies and Interests"
 msgstr "嗜好/興趣"
 
 # NOTE 日文po檔及MSN本身均譯「座右銘」
-#: src/protocols/msn/msn.c:1448 src/protocols/msn/msn.c:1454
-#: src/protocols/yahoo/yahoo_profile.c:1067
+#: src/protocols/msn/msn.c:1454 src/protocols/msn/msn.c:1460
+#: src/protocols/yahoo/yahoo_profile.c:1072
 msgid "Favorite Quote"
 msgstr "座右銘"
 
-#: src/protocols/msn/msn.c:1462 src/protocols/yahoo/yahoo_profile.c:1118
+#: src/protocols/msn/msn.c:1468 src/protocols/yahoo/yahoo_profile.c:1123
 msgid "Last Updated"
 msgstr "更新日期"
 
 #. Homepage
-#: src/protocols/msn/msn.c:1473 src/protocols/silc/ops.c:820
+#: src/protocols/msn/msn.c:1479 src/protocols/silc/ops.c:826
 #: src/protocols/trepia/trepia.c:289 src/protocols/trepia/trepia.c:419
 msgid "Homepage"
 msgstr "網頁"
 
-#. put a link to the actual profile URL
-#: src/protocols/msn/msn.c:1484 src/protocols/yahoo/yahoo_profile.c:1121
-#: src/util.c:792
-#, c-format
-msgid "<b>%s:</b> "
-msgstr "<b>%s:</b>"
-
-#: src/protocols/msn/msn.c:1484 src/protocols/yahoo/yahoo_profile.c:1121
+#: src/protocols/msn/msn.c:1501
+msgid "The user has not created a public profile."
+msgstr "這個使用者未有建立公開的個人資料。"
+
+#: src/protocols/msn/msn.c:1502
+msgid ""
+"MSN reported not being able to find the user's profile. This either means "
+"that the user does not exist, or that the user exists but has not created a "
+"public profile."
+msgstr ""
+"MSN 回報說找不到這個使用者的個人資料。這表示這個使用者可能不存在;亦有可能使"
+"用者存在,但沒有建立公開的個人資料。"
+
+#: src/protocols/msn/msn.c:1506
+msgid ""
+"Gaim could not find any information in the user's profile. The user most "
+"likely does not exist."
+msgstr ""
+"Gaim 在這個使用者的個人資料網頁找不到任何可用的資料。這個使用者極有可能並不存"
+"在。"
+
+#: src/protocols/msn/msn.c:1512 src/protocols/yahoo/yahoo_profile.c:1168
 msgid "Profile URL"
 msgstr "個人資料網址"
 
-#: src/protocols/msn/msn.c:1566 src/protocols/yahoo/yahoo_profile.c:1140
-msgid "The user's profile is empty."
-msgstr "這個使用者的資訊是空白的。"
-
-#: src/protocols/msn/msn.c:1635
+#: src/protocols/msn/msn.c:1643
 msgid "Display conversation closed notices"
 msgstr "顯示「交談視窗已關閉」的通知"
 
-#: src/protocols/msn/msn.c:1640
+#: src/protocols/msn/msn.c:1648
 msgid "Display timeout notices"
 msgstr "顯示「交談已逾時」的通知"
 
@@ -6947,15 +7000,15 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/msn/msn.c:1722 src/protocols/msn/msn.c:1724
+#: src/protocols/msn/msn.c:1732 src/protocols/msn/msn.c:1734
 msgid "MSN Protocol Plugin"
 msgstr "MSN 協定模組"
 
-#: src/protocols/msn/msn.c:1743 src/protocols/trepia/trepia.c:1290
+#: src/protocols/msn/msn.c:1753 src/protocols/trepia/trepia.c:1292
 msgid "Login server"
 msgstr "登入伺服器"
 
-#: src/protocols/msn/msn.c:1752
+#: src/protocols/msn/msn.c:1762
 msgid "Use HTTP Method"
 msgstr "使用 HTTP 方式"
 
@@ -6976,7 +7029,7 @@
 msgstr "讀取好友清單中"
 
 #: src/protocols/msn/notification.c:144 src/protocols/msn/notification.c:173
-#: src/protocols/oscar/oscar.c:2299
+#: src/protocols/oscar/oscar.c:2315
 msgid "Password sent"
 msgstr "密碼送出"
 
@@ -7103,7 +7156,7 @@
 msgid "%s requested a PING"
 msgstr "%s 要求一個 PING"
 
-#: src/protocols/napster/napster.c:541 src/protocols/oscar/oscar.c:6171
+#: src/protocols/napster/napster.c:541 src/protocols/oscar/oscar.c:6188
 #: src/protocols/toc/toc.c:1266
 msgid "_Group:"
 msgstr "群組(_G):"
@@ -7119,7 +7172,7 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/napster/napster.c:622 src/protocols/napster/napster.c:624
+#: src/protocols/napster/napster.c:624 src/protocols/napster/napster.c:626
 msgid "NAPSTER Protocol Plugin"
 msgstr "NAPSTER 協定模組"
 
@@ -7445,8 +7498,8 @@
 msgid "This conference has been closed. No more messages can be sent."
 msgstr "這個會議已經關閉。無法繼續送出任何訊息。"
 
-#: src/protocols/novell/novell.c:2733 src/protocols/oscar/oscar.c:582
-#: src/protocols/oscar/oscar.c:6473 src/protocols/yahoo/yahoo.c:2485
+#: src/protocols/novell/novell.c:2733 src/protocols/oscar/oscar.c:586
+#: src/protocols/oscar/oscar.c:6490 src/protocols/yahoo/yahoo.c:2513
 msgid "Offline"
 msgstr "離線"
 
@@ -7474,15 +7527,15 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/novell/novell.c:3387 src/protocols/novell/novell.c:3389
+#: src/protocols/novell/novell.c:3389 src/protocols/novell/novell.c:3391
 msgid "Novell GroupWise Messenger Protocol Plugin"
 msgstr "Novell GroupWise Messenger 協定模組"
 
-#: src/protocols/novell/novell.c:3408
+#: src/protocols/novell/novell.c:3410
 msgid "Server address"
 msgstr "伺服器位址"
 
-#: src/protocols/novell/novell.c:3412
+#: src/protocols/novell/novell.c:3414
 msgid "Server port"
 msgstr "伺服器通訊埠"
 
@@ -7587,45 +7640,53 @@
 msgid "Not while on AOL"
 msgstr "在 AOL 時不允許"
 
-#: src/protocols/oscar/oscar.c:436
+#: src/protocols/oscar/oscar.c:403
+msgid ""
+"(There was an error converting this message.  The buddy you are speaking to "
+"most likely has a buggy client.)"
+msgstr ""
+"(為這個訊息轉換編碼時發生了錯誤。正在跟您交談的好友很可能是在使用有問題的客"
+"戶端程式。)"
+
+#: src/protocols/oscar/oscar.c:441
 msgid "Voice"
 msgstr "聲音"
 
 # NOTE 將「直接消息」改譯為「即時訊息」
-#: src/protocols/oscar/oscar.c:439
+#: src/protocols/oscar/oscar.c:444
 msgid "AIM Direct IM"
 msgstr "AIM 式即時訊息"
 
-#: src/protocols/oscar/oscar.c:442 src/protocols/silc/buddy.c:1497
-#: src/protocols/silc/silc.c:635
+#: src/protocols/oscar/oscar.c:447 src/protocols/silc/silc.c:635
+#: src/protocols/silc/util.c:506
 msgid "Chat"
 msgstr "聊天"
 
-#: src/protocols/oscar/oscar.c:445 src/protocols/oscar/oscar.c:6777
+#: src/protocols/oscar/oscar.c:450 src/protocols/oscar/oscar.c:6793
 msgid "Get File"
 msgstr "接收檔案"
 
-#: src/protocols/oscar/oscar.c:452
+#: src/protocols/oscar/oscar.c:457
 msgid "Games"
 msgstr "遊戲"
 
-#: src/protocols/oscar/oscar.c:455
+#: src/protocols/oscar/oscar.c:460
 msgid "Add-Ins"
 msgstr "模組"
 
-#: src/protocols/oscar/oscar.c:458
+#: src/protocols/oscar/oscar.c:463
 msgid "Send Buddy List"
 msgstr "送出好友清單"
 
-#: src/protocols/oscar/oscar.c:461
+#: src/protocols/oscar/oscar.c:466
 msgid "ICQ Direct Connect"
 msgstr "ICQ 式直接連線"
 
-#: src/protocols/oscar/oscar.c:464
+#: src/protocols/oscar/oscar.c:469
 msgid "AP User"
 msgstr "應用程式使用者"
 
-#: src/protocols/oscar/oscar.c:467
+#: src/protocols/oscar/oscar.c:472
 msgid "ICQ RTF"
 msgstr "ICQ RTF"
 
@@ -7636,144 +7697,144 @@
 # NOTE (18:17:29) KingAnt: Right...
 # NOTE (18:17:36) wing: what does that mean though?
 # NOTE (18:17:48) KingAnt: I have no idea--probably nothing
-#: src/protocols/oscar/oscar.c:470
+#: src/protocols/oscar/oscar.c:475
 msgid "Nihilist"
 msgstr "Nihilist"
 
-#: src/protocols/oscar/oscar.c:473
+#: src/protocols/oscar/oscar.c:478
 msgid "ICQ Server Relay"
 msgstr "ICQ 伺服器轉送"
 
-#: src/protocols/oscar/oscar.c:476
+#: src/protocols/oscar/oscar.c:481
 msgid "Old ICQ UTF8"
 msgstr "舊式 ICQ UTF8"
 
-#: src/protocols/oscar/oscar.c:479
+#: src/protocols/oscar/oscar.c:484
 msgid "Trillian Encryption"
 msgstr "Trillian 加密"
 
-#: src/protocols/oscar/oscar.c:482
+#: src/protocols/oscar/oscar.c:487
 msgid "ICQ UTF8"
 msgstr "ICQ UTF8"
 
 # NOTE 這似乎是一種掌上電腦的牌子
-#: src/protocols/oscar/oscar.c:485
+#: src/protocols/oscar/oscar.c:490
 msgid "Hiptop"
 msgstr "Hiptop"
 
-#: src/protocols/oscar/oscar.c:488
+#: src/protocols/oscar/oscar.c:493
 msgid "Security Enabled"
 msgstr "有保安功能"
 
 # XXX 暫譯
-#: src/protocols/oscar/oscar.c:491
+#: src/protocols/oscar/oscar.c:496
 msgid "Video Chat"
 msgstr "視像聊天"
 
 # XXX 暫譯
-#: src/protocols/oscar/oscar.c:495
+#: src/protocols/oscar/oscar.c:500
 msgid "iChat AV"
 msgstr "iChat 視像聊天"
 
-#: src/protocols/oscar/oscar.c:498
+#: src/protocols/oscar/oscar.c:503
 msgid "Live Video"
 msgstr "動態視訊"
 
 #  NOTE AIM_CAPS_CAMERA,即是什麼呢(^^;)
-#: src/protocols/oscar/oscar.c:501
+#: src/protocols/oscar/oscar.c:506
 msgid "Camera"
 msgstr "照相機"
 
-#: src/protocols/oscar/oscar.c:520 src/protocols/oscar/oscar.c:5477
-#: src/protocols/oscar/oscar.c:6666
+#: src/protocols/oscar/oscar.c:524 src/protocols/oscar/oscar.c:5493
+#: src/protocols/oscar/oscar.c:6683
 msgid "Free For Chat"
 msgstr "我有空聊天"
 
-#: src/protocols/oscar/oscar.c:524 src/protocols/oscar/oscar.c:5471
-#: src/protocols/oscar/oscar.c:6664
+#: src/protocols/oscar/oscar.c:528 src/protocols/oscar/oscar.c:5487
+#: src/protocols/oscar/oscar.c:6681
 msgid "Not Available"
 msgstr "長時間離開"
 
-#: src/protocols/oscar/oscar.c:526 src/protocols/oscar/oscar.c:5474
-#: src/protocols/oscar/oscar.c:6665
+#: src/protocols/oscar/oscar.c:530 src/protocols/oscar/oscar.c:5490
+#: src/protocols/oscar/oscar.c:6682
 msgid "Occupied"
 msgstr "忙碌"
 
 # NOTE 參閱 http://www.geocities.com/Athens/Delphi/6470/icq99.html
-#: src/protocols/oscar/oscar.c:530
+#: src/protocols/oscar/oscar.c:534
 msgid "Web Aware"
 msgstr "允許其他使用者在網路上查看您目前的狀態"
 
-#: src/protocols/oscar/oscar.c:598
+#: src/protocols/oscar/oscar.c:602
 msgid "Capabilities"
 msgstr "相容性"
 
-#: src/protocols/oscar/oscar.c:604
+#: src/protocols/oscar/oscar.c:609
 msgid "Buddy Comment"
 msgstr "好友說明"
 
-#: src/protocols/oscar/oscar.c:739
+#: src/protocols/oscar/oscar.c:744
 #, c-format
 msgid "Direct IM with %s closed"
 msgstr "和 %s 的即時訊息關閉"
 
-#: src/protocols/oscar/oscar.c:741
+#: src/protocols/oscar/oscar.c:746
 #, c-format
 msgid "Direct IM with %s failed"
 msgstr "和 %s 的即時訊息失敗"
 
-#: src/protocols/oscar/oscar.c:748
+#: src/protocols/oscar/oscar.c:753
 msgid "Direct Connect failed"
 msgstr "直接連線失敗"
 
-#: src/protocols/oscar/oscar.c:825 src/protocols/oscar/oscar.c:956
+#: src/protocols/oscar/oscar.c:830 src/protocols/oscar/oscar.c:961
 #, c-format
 msgid "Direct IM with %s established"
 msgstr "和 %s 的即時訊息已經被建立"
 
-#: src/protocols/oscar/oscar.c:906
+#: src/protocols/oscar/oscar.c:911
 #, c-format
 msgid "Attempting to connect to %s at %s:%hu for Direct IM."
 msgstr "正在嘗試連線至 %2$s:%3$hu,以便和 %1$s 建立即時訊息。"
 
-#: src/protocols/oscar/oscar.c:1322
+#: src/protocols/oscar/oscar.c:1328
 #, c-format
 msgid "Asking %s to connect to us at %s:%hu for Direct IM."
 msgstr "正在要求 %s 連線至此處 (%s:%hu),以便建立即時訊息。"
 
-#: src/protocols/oscar/oscar.c:1327
+#: src/protocols/oscar/oscar.c:1333
 msgid "Unable to open Direct IM"
 msgstr "無法開啟直接的即時訊息"
 
-#: src/protocols/oscar/oscar.c:1362
+#: src/protocols/oscar/oscar.c:1368
 #, c-format
 msgid "You have selected to open a Direct IM connection with %s."
 msgstr "您選擇了與 %s 開啟一個直接即時訊息。"
 
-#: src/protocols/oscar/oscar.c:1366
+#: src/protocols/oscar/oscar.c:1372
 msgid ""
 "Because this reveals your IP address, it may be considered a privacy risk.  "
 "Do you wish to continue?"
 msgstr "這樣將會曝露出您的 IP 位址,因此可能會有隱私上的風險。您想要繼續嗎?"
 
-#: src/protocols/oscar/oscar.c:1370 src/protocols/oscar/oscar.c:3312
+#: src/protocols/oscar/oscar.c:1376 src/protocols/oscar/oscar.c:3328
 msgid "Connect"
 msgstr "連線"
 
-#: src/protocols/oscar/oscar.c:1436 src/protocols/toc/toc.c:872
+#: src/protocols/oscar/oscar.c:1442 src/protocols/toc/toc.c:872
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "您已經由聊天室 %s 停止連線。"
 
-#: src/protocols/oscar/oscar.c:1452
+#: src/protocols/oscar/oscar.c:1458
 msgid "Chat is currently unavailable"
 msgstr "目前無法使用聊天室"
 
-#: src/protocols/oscar/oscar.c:1533
+#: src/protocols/oscar/oscar.c:1539
 msgid "Screen name sent"
 msgstr "送出帳號"
 
-#: src/protocols/oscar/oscar.c:1547
+#: src/protocols/oscar/oscar.c:1553
 #, c-format
 msgid ""
 "Unable to login: Could not sign on as %s because the screen name is "
@@ -7783,48 +7844,48 @@
 "無法登入:無法以 %s 身份登入,因為這個帳號是無效的。帳號必須以英文字母起始,"
 "並只含英文字母、數字及空白;或者只由數字組成。"
 
-#: src/protocols/oscar/oscar.c:1575
+#: src/protocols/oscar/oscar.c:1581
 msgid "Unable to login to AIM"
 msgstr "無法登入到 AIM"
 
-#: src/protocols/oscar/oscar.c:1676 src/protocols/oscar/oscar.c:2103
+#: src/protocols/oscar/oscar.c:1682 src/protocols/oscar/oscar.c:2119
 msgid "Could Not Connect"
 msgstr "無法連線"
 
-#: src/protocols/oscar/oscar.c:1684
+#: src/protocols/oscar/oscar.c:1690
 msgid "Connection established, cookie sent"
 msgstr "連線已建立,並已送出 Cookie"
 
-#: src/protocols/oscar/oscar.c:1797 src/protocols/yahoo/yahoo_filexfer.c:180
+#: src/protocols/oscar/oscar.c:1803 src/protocols/yahoo/yahoo_filexfer.c:180
 #: src/protocols/yahoo/yahoo_filexfer.c:189
 #: src/protocols/yahoo/yahoo_filexfer.c:199
 msgid "Unable to establish file descriptor."
 msgstr "無法建立檔案介紹。"
 
-#: src/protocols/oscar/oscar.c:1802
+#: src/protocols/oscar/oscar.c:1808
 msgid "Unable to create new connection."
 msgstr "無法開啟新連結。"
 
-#: src/protocols/oscar/oscar.c:1873
+#: src/protocols/oscar/oscar.c:1879
 msgid "Unable to establish listener socket."
 msgstr "無法建立監聽器 Socket。"
 
-#: src/protocols/oscar/oscar.c:1987 src/protocols/toc/toc.c:541
+#: src/protocols/oscar/oscar.c:2003 src/protocols/toc/toc.c:541
 msgid "Incorrect nickname or password."
 msgstr "錯誤的暱稱或密碼"
 
-#: src/protocols/oscar/oscar.c:1992
+#: src/protocols/oscar/oscar.c:2008
 msgid "Your account is currently suspended."
 msgstr "您的帳號目前停用中。"
 
 #  NOTE「暫時無法使用」應該比「暫時不存在」通順
 #  NOTE 譯文更動 by Ambrose
 #. service temporarily unavailable
-#: src/protocols/oscar/oscar.c:1996
+#: src/protocols/oscar/oscar.c:2012
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr "暫時無法使用 AOL 即時訊息服務。"
 
-#: src/protocols/oscar/oscar.c:2001
+#: src/protocols/oscar/oscar.c:2017
 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."
@@ -7832,21 +7893,21 @@
 "您的連線/斷線動作太過頻繁。請等待十分鐘後再行重試。如果您依然繼續嘗試著連"
 "線,那麼您的等待時間將會更加的延長。"
 
-#: src/protocols/oscar/oscar.c:2006
+#: src/protocols/oscar/oscar.c:2022
 #, c-format
 msgid "The client version you are using is too old. Please upgrade at %s"
 msgstr "您所使用的客戶端程式太過老舊。請到 %s 更新"
 
-#: src/protocols/oscar/oscar.c:2038
+#: src/protocols/oscar/oscar.c:2054
 msgid "Internal Error"
 msgstr "內部錯誤"
 
-#: src/protocols/oscar/oscar.c:2110
+#: src/protocols/oscar/oscar.c:2126
 msgid "Received authorization"
 msgstr "收到認證"
 
-#: src/protocols/oscar/oscar.c:2146 src/protocols/oscar/oscar.c:2176
-#: src/protocols/oscar/oscar.c:2264
+#: src/protocols/oscar/oscar.c:2162 src/protocols/oscar/oscar.c:2192
+#: src/protocols/oscar/oscar.c:2280
 #, c-format
 msgid ""
 "You may be disconnected shortly.  You may want to use TOC until this is "
@@ -7855,24 +7916,24 @@
 "您可能會短時間中斷連線。您可能會想在這個問題被修正後使用 TOC。請到 %s 看看有"
 "沒有更新。"
 
-#: src/protocols/oscar/oscar.c:2149 src/protocols/oscar/oscar.c:2179
+#: src/protocols/oscar/oscar.c:2165 src/protocols/oscar/oscar.c:2195
 msgid "Gaim was unable to get a valid AIM login hash."
 msgstr "Gaim 無法取得有效的 AIM 登入碼。"
 
-#: src/protocols/oscar/oscar.c:2267
+#: src/protocols/oscar/oscar.c:2283
 msgid "Gaim was unable to get a valid login hash."
 msgstr "Gaim 無法取得有效的登入碼。"
 
-#: src/protocols/oscar/oscar.c:3096 src/protocols/oscar/oscar.c:3118
+#: src/protocols/oscar/oscar.c:3112 src/protocols/oscar/oscar.c:3134
 msgid "(There was an error receiving this message)"
 msgstr "(收取這個訊息時發生錯誤)"
 
-#: src/protocols/oscar/oscar.c:3304
+#: src/protocols/oscar/oscar.c:3320
 #, c-format
 msgid "%s has just asked to directly connect to %s"
 msgstr "%s 剛剛要求直接連線到 %s"
 
-#: src/protocols/oscar/oscar.c:3307
+#: src/protocols/oscar/oscar.c:3323
 msgid ""
 "This requires a direct connection between the two computers and is necessary "
 "for IM Images.  Because your IP address will be revealed, this may be "
@@ -7881,42 +7942,42 @@
 "這個要求將會在兩部電腦間建立起直接連線,而這是在傳送即時訊息影像時所必須的。"
 "這樣將會曝露您的 IP 位址,因此可能會有隱私方面的風險。"
 
-#: src/protocols/oscar/oscar.c:3343
+#: src/protocols/oscar/oscar.c:3359
 msgid "Please authorize me so I can add you to my buddy list."
 msgstr "請通過我的認證要求,好讓我可以將您加入我的好友清單中。"
 
-#: src/protocols/oscar/oscar.c:3351
+#: src/protocols/oscar/oscar.c:3367
 msgid "Authorization Request Message:"
 msgstr "認證要求訊息:"
 
-#: src/protocols/oscar/oscar.c:3352
+#: src/protocols/oscar/oscar.c:3368
 msgid "Please authorize me!"
 msgstr "請通過我的認證!"
 
-#: src/protocols/oscar/oscar.c:3382
+#: src/protocols/oscar/oscar.c:3398
 #, c-format
 msgid ""
 "The user %s requires authorization before being added to a buddy list.  Do "
 "you want to send an authorization request?"
 msgstr "使用者 %s 要求在加入好友清單前先取得他的認證。您要送出您的認證要求嗎?"
 
-#: src/protocols/oscar/oscar.c:3387 src/protocols/oscar/oscar.c:3389
+#: src/protocols/oscar/oscar.c:3403 src/protocols/oscar/oscar.c:3405
 msgid "Request Authorization"
 msgstr "要求認證"
 
-#: src/protocols/oscar/oscar.c:3437 src/protocols/oscar/oscar.c:3439
-#: src/protocols/oscar/oscar.c:3446 src/protocols/oscar/oscar.c:3528
-#: src/protocols/oscar/oscar.c:3548 src/protocols/oscar/oscar.c:3902
-#: src/protocols/oscar/oscar.c:3962 src/protocols/oscar/oscar.c:6092
-#: src/protocols/oscar/oscar.c:6138
+#: src/protocols/oscar/oscar.c:3453 src/protocols/oscar/oscar.c:3455
+#: src/protocols/oscar/oscar.c:3462 src/protocols/oscar/oscar.c:3544
+#: src/protocols/oscar/oscar.c:3564 src/protocols/oscar/oscar.c:3918
+#: src/protocols/oscar/oscar.c:3978 src/protocols/oscar/oscar.c:6109
+#: src/protocols/oscar/oscar.c:6155
 msgid "No reason given."
 msgstr "沒有給予原因。"
 
-#: src/protocols/oscar/oscar.c:3445
+#: src/protocols/oscar/oscar.c:3461
 msgid "Authorization Denied Message:"
 msgstr "拒絕認證訊息:"
 
-#: src/protocols/oscar/oscar.c:3528
+#: src/protocols/oscar/oscar.c:3544
 #, c-format
 msgid ""
 "The user %u wants to add you to their buddy list for the following reason:\n"
@@ -7925,11 +7986,11 @@
 "使用者 %u 因為下列原因,想要將您加入他(她)的好友清單中:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:3536 src/protocols/oscar/oscar.c:6098
+#: src/protocols/oscar/oscar.c:3552 src/protocols/oscar/oscar.c:6115
 msgid "Authorization Request"
 msgstr "認證要求"
 
-#: src/protocols/oscar/oscar.c:3548
+#: src/protocols/oscar/oscar.c:3564
 #, c-format
 msgid ""
 "The user %u has denied your request to add them to your buddy list for the "
@@ -7939,17 +8000,17 @@
 "使用者 %u 因為下列原因,拒絕了您將其加入好友清單的要求:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:3549
+#: src/protocols/oscar/oscar.c:3565
 msgid "ICQ authorization denied."
 msgstr "ICQ 認證拒絕。"
 
 #. Someone has granted you authorization
-#: src/protocols/oscar/oscar.c:3556
+#: src/protocols/oscar/oscar.c:3572
 #, c-format
 msgid "The user %u has granted your request to add them to your buddy list."
 msgstr "使用者 %u 同意了您將其加入好友清單的要求。"
 
-#: src/protocols/oscar/oscar.c:3564
+#: src/protocols/oscar/oscar.c:3580
 #, c-format
 msgid ""
 "You have received a special message\n"
@@ -7962,7 +8023,7 @@
 "來自:%s [%s]\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:3572
+#: src/protocols/oscar/oscar.c:3588
 #, c-format
 msgid ""
 "You have received an ICQ page\n"
@@ -7975,7 +8036,7 @@
 "來自:%s [%s]\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:3580
+#: src/protocols/oscar/oscar.c:3596
 #, c-format
 msgid ""
 "You have received an ICQ email from %s [%s]\n"
@@ -7988,34 +8049,34 @@
 "訊息為:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:3601
+#: src/protocols/oscar/oscar.c:3617
 #, c-format
 msgid "ICQ user %u has sent you a buddy: %s (%s)"
 msgstr "ICQ 使用者 %u 送來一個好友資訊:%s (%s)"
 
-#: src/protocols/oscar/oscar.c:3607
+#: src/protocols/oscar/oscar.c:3623
 msgid "Do you want to add this buddy to your buddy list?"
 msgstr "您想將他(她)加入到您的好友名單中嗎?"
 
-#: src/protocols/oscar/oscar.c:3611
+#: src/protocols/oscar/oscar.c:3627
 msgid "Decline"
 msgstr "婉拒"
 
-#: src/protocols/oscar/oscar.c:3696
+#: src/protocols/oscar/oscar.c:3712
 #, 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] "您遺失了 %hu 個由 %s 送來的訊息,因為它是無效的。"
 msgstr[1] "您遺失了 %hu 個由 %s 送來的訊息,因為它們是無效的。"
 
-#: src/protocols/oscar/oscar.c:3705
+#: src/protocols/oscar/oscar.c:3721
 #, 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] "您遺失了 %hu 個由 %s 送來的訊息,因為它太大了。"
 msgstr[1] "您遺失了 %hu 個由 %s 送來的訊息,因為它們太大了。"
 
-#: src/protocols/oscar/oscar.c:3714
+#: src/protocols/oscar/oscar.c:3730
 #, c-format
 msgid ""
 "You missed %hu message from %s because the rate limit has been exceeded."
@@ -8025,88 +8086,83 @@
 msgstr[1] "您遺失了 %hu 個由 %s 送來的訊息,因為它們傳送的速度太快。"
 
 # XXX 跟芬蘭文的譯者有同感,直譯「邪惡」好像行不通,下同
-#: src/protocols/oscar/oscar.c:3723
+#: src/protocols/oscar/oscar.c:3739
 #, 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] "您遺失了 %hu 個由 %s 送來的訊息,因為他(她)太邪惡了。"
 msgstr[1] "您遺失了 %hu 個由 %s 送來的訊息,因為他(她)太邪惡了。"
 
-#: src/protocols/oscar/oscar.c:3732
+#: src/protocols/oscar/oscar.c:3748
 #, 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] "您遺失了 %hu 個由 %s 送來的訊息,因為您太邪惡了。"
 msgstr[1] "您遺失了 %hu 個由 %s 送來的訊息,因為您太邪惡了。"
 
-#: src/protocols/oscar/oscar.c:3741
+#: src/protocols/oscar/oscar.c:3757
 #, 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] "您遺失了 %hu 個由 %s 送來的訊息,原因不明。"
 msgstr[1] "您遺失了 %hu 個由 %s 送來的訊息,原因不明。"
 
-#: src/protocols/oscar/oscar.c:3798 src/protocols/oscar/oscar.c:4022
+#: src/protocols/oscar/oscar.c:3814 src/protocols/oscar/oscar.c:4038
 #, c-format
 msgid "Info for %s"
 msgstr "%s 的 ICQ 資訊"
 
-#: src/protocols/oscar/oscar.c:3803
-#, c-format
-msgid "<B>UIN:</B> %s<BR><B>Status:</B> %s<HR>%s"
-msgstr "<B>帳號:</B> %s<BR><B>狀態:</B> %s<HR>%s"
-
-#: src/protocols/oscar/oscar.c:3864
+#: src/protocols/oscar/oscar.c:3880
 #, c-format
 msgid "SNAC threw error: %s\n"
 msgstr "SNAC 丟出錯誤:%s\n"
 
-#: src/protocols/oscar/oscar.c:3865
+#: src/protocols/oscar/oscar.c:3881
 msgid "Unknown error"
 msgstr "未知錯誤"
 
 #. Data is assumed to be the destination sn
-#: src/protocols/oscar/oscar.c:3900
+#: src/protocols/oscar/oscar.c:3916
 #, c-format
 msgid "Your message to %s did not get sent:"
 msgstr "您要送給 %s 的訊息無法送出:"
 
 # NOTE 譯文更動 by Ambrose
-#: src/protocols/oscar/oscar.c:3959
+#: src/protocols/oscar/oscar.c:3975
 #, c-format
 msgid "User information for %s unavailable:"
 msgstr "無法取得使用者 %s 的個人資訊:"
 
-#: src/protocols/oscar/oscar.c:3982
+#: src/protocols/oscar/oscar.c:3998
 msgid "Warning Level"
 msgstr "警告等級"
 
-#: src/protocols/oscar/oscar.c:3985
+#: src/protocols/oscar/oscar.c:4001
 msgid "Online Since"
 msgstr "上線自"
 
 # XXX 改譯「註冊日期」會否比較通順?
-#: src/protocols/oscar/oscar.c:3989 src/protocols/yahoo/yahoo_profile.c:1113
+#: src/protocols/oscar/oscar.c:4005 src/protocols/yahoo/yahoo_profile.c:1118
 msgid "Member Since"
 msgstr "成為成員的時間"
 
-#: src/protocols/oscar/oscar.c:4073
+#: src/protocols/oscar/oscar.c:4089
 msgid "Your AIM connection may be lost."
 msgstr "您的 AIM 可能斷線了。"
 
 #  The conversion failed!
 #. The conversion failed!
-#: src/protocols/oscar/oscar.c:4259
+#: src/protocols/oscar/oscar.c:4275
 msgid ""
 "[Unable to display a message from this user because it contained invalid "
 "characters.]"
 msgstr "「無法顯示來自這個使用者的訊息,因為它包含了無效字元。」"
 
-#: src/protocols/oscar/oscar.c:4476
+#: src/protocols/oscar/oscar.c:4492
 msgid "Rate limiting error."
 msgstr "速率限制錯誤。"
 
-#: src/protocols/oscar/oscar.c:4477
+#: src/protocols/oscar/oscar.c:4493
 msgid ""
 "The last action you attempted could not be performed because you are over "
 "the rate limit. Please wait 10 seconds and try again."
@@ -8114,142 +8170,142 @@
 "您最近做的一個動作無法完成,因為您已經達到發送訊息速率的上限。請等待十秒後再"
 "試一次。"
 
-#: src/protocols/oscar/oscar.c:4540
+#: src/protocols/oscar/oscar.c:4556
 msgid ""
 "You have been disconnected because you have signed on with this screen name "
 "at another location."
 msgstr "您被中斷連線,因為您由其他的地方登入這個帳號。"
 
-#: src/protocols/oscar/oscar.c:4542
+#: src/protocols/oscar/oscar.c:4558
 msgid "You have been signed off for an unknown reason."
 msgstr "您因為不明原因而登出。"
 
-#: src/protocols/oscar/oscar.c:4573
+#: src/protocols/oscar/oscar.c:4589
 msgid "Finalizing connection"
 msgstr "完成連線"
 
-#: src/protocols/oscar/oscar.c:4843 src/protocols/oscar/oscar.c:4850
+#: src/protocols/oscar/oscar.c:4859 src/protocols/oscar/oscar.c:4866
 msgid "Email Address"
 msgstr "電子郵件"
 
-#: src/protocols/oscar/oscar.c:4855 src/protocols/silc/buddy.c:1524
+#: src/protocols/oscar/oscar.c:4871 src/protocols/silc/util.c:538
 msgid "Mobile Phone"
 msgstr "行動電話"
 
-#: src/protocols/oscar/oscar.c:4856
+#: src/protocols/oscar/oscar.c:4872
 msgid "Not specified"
 msgstr "沒有填寫"
 
-#: src/protocols/oscar/oscar.c:4857 src/protocols/trepia/trepia.c:281
+#: src/protocols/oscar/oscar.c:4873 src/protocols/trepia/trepia.c:281
 #: src/protocols/trepia/trepia.c:407
 msgid "Female"
 msgstr "女"
 
-#: src/protocols/oscar/oscar.c:4857 src/protocols/trepia/trepia.c:280
+#: src/protocols/oscar/oscar.c:4873 src/protocols/trepia/trepia.c:280
 #: src/protocols/trepia/trepia.c:407
 msgid "Male"
 msgstr "男"
 
-#: src/protocols/oscar/oscar.c:4873
+#: src/protocols/oscar/oscar.c:4889
 msgid "Personal Web Page"
 msgstr "個人網頁"
 
-#: src/protocols/oscar/oscar.c:4877
+#: src/protocols/oscar/oscar.c:4893
 msgid "Additional Information"
 msgstr "其他資訊"
 
-#: src/protocols/oscar/oscar.c:4882
-msgid "Home Address"
-msgstr "住家地址"
-
-#: src/protocols/oscar/oscar.c:4886 src/protocols/oscar/oscar.c:4894
-msgid "Zip Code"
-msgstr "郵遞區號"
-
-#: src/protocols/oscar/oscar.c:4890
-msgid "Work Address"
-msgstr "工作地址"
-
 #: src/protocols/oscar/oscar.c:4898
+msgid "Home Address"
+msgstr "住家地址"
+
+#: src/protocols/oscar/oscar.c:4902 src/protocols/oscar/oscar.c:4910
+msgid "Zip Code"
+msgstr "郵遞區號"
+
+#: src/protocols/oscar/oscar.c:4906
+msgid "Work Address"
+msgstr "工作地址"
+
+#: src/protocols/oscar/oscar.c:4914
 msgid "Work Information"
 msgstr "工作資訊"
 
-#: src/protocols/oscar/oscar.c:4899
+#: src/protocols/oscar/oscar.c:4915
 msgid "Company"
 msgstr "公司名稱"
 
-#: src/protocols/oscar/oscar.c:4900
+#: src/protocols/oscar/oscar.c:4916
 msgid "Division"
 msgstr "部門"
 
-#: src/protocols/oscar/oscar.c:4901
+#: src/protocols/oscar/oscar.c:4917
 msgid "Position"
 msgstr "職位"
 
-#: src/protocols/oscar/oscar.c:4903
+#: src/protocols/oscar/oscar.c:4919
 msgid "Web Page"
 msgstr "網頁"
 
-#: src/protocols/oscar/oscar.c:4909
+#: src/protocols/oscar/oscar.c:4925
 #, c-format
 msgid "ICQ Info for %s"
 msgstr "%s 的 ICQ 資訊"
 
 # XXX 這是什麼 (情形下出現的)? (好像是以前譯「訊息」的那個??)
-#: src/protocols/oscar/oscar.c:4958
+#: src/protocols/oscar/oscar.c:4974
 msgid "Pop-Up Message"
 msgstr "彈出訊息"
 
 # Patch by Kevin Leung
-#: src/protocols/oscar/oscar.c:4979
+#: src/protocols/oscar/oscar.c:4995
 #, c-format
 msgid "The following screen names are associated with %s"
 msgstr "下列是 %s 的帳號"
 
-#: src/protocols/oscar/oscar.c:4983
+#: src/protocols/oscar/oscar.c:4999
 msgid "Search Results"
 msgstr "搜尋結果"
 
-#: src/protocols/oscar/oscar.c:5000
+#: src/protocols/oscar/oscar.c:5016
 #, c-format
 msgid "No results found for email address %s"
 msgstr "找不到和電子郵件地址 %s 相關的結果"
 
-#: src/protocols/oscar/oscar.c:5021
+#: src/protocols/oscar/oscar.c:5037
 #, c-format
 msgid "You should receive an email asking to confirm %s."
 msgstr "您應該會收到一封要求對 %s 進行認證的電子郵件。"
 
-#: src/protocols/oscar/oscar.c:5023
+#: src/protocols/oscar/oscar.c:5039
 msgid "Account Confirmation Requested"
 msgstr "帳號確認"
 
-#: src/protocols/oscar/oscar.c:5051
+#: src/protocols/oscar/oscar.c:5067
 msgid "Error Changing Account Info"
 msgstr "更改帳號資訊錯誤"
 
-#: src/protocols/oscar/oscar.c:5054
+#: src/protocols/oscar/oscar.c:5070
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
 "differs from the original."
 msgstr "錯誤 0x%04x:無法格式化帳號,因為要求的帳號與原本的不同。"
 
-#: src/protocols/oscar/oscar.c:5057
+#: src/protocols/oscar/oscar.c:5073
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
 "ends in a space."
 msgstr "錯誤 0x%04x:無法格式化帳號,因為要求的帳號以空白結束。"
 
-#: src/protocols/oscar/oscar.c:5060
+#: src/protocols/oscar/oscar.c:5076
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
 "is too long."
 msgstr "錯誤 0x%04x:無法格式化帳號,因為要求的帳號太長。"
 
-#: src/protocols/oscar/oscar.c:5063
+#: src/protocols/oscar/oscar.c:5079
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change email address because there is already a "
@@ -8257,7 +8313,7 @@
 msgstr ""
 "錯誤 0x%04x:無法改變電子郵件地址,因為您已經送出的其他要求還未處理好。"
 
-#: src/protocols/oscar/oscar.c:5066
+#: src/protocols/oscar/oscar.c:5082
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change email address because the given address has "
@@ -8265,19 +8321,19 @@
 msgstr ""
 "錯誤 0x%04x:無法改變電子郵件地址,因為這個電子郵件地址和太多的帳號產生關連。"
 
-#: src/protocols/oscar/oscar.c:5069
+#: src/protocols/oscar/oscar.c:5085
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change email address because the given address is "
 "invalid."
 msgstr "錯誤 0x%04x:無法改變電子郵件地址,因為這個電子郵件地址是無效的。"
 
-#: src/protocols/oscar/oscar.c:5072
+#: src/protocols/oscar/oscar.c:5088
 #, c-format
 msgid "Error 0x%04x: Unknown error."
 msgstr "錯誤 0x%04x:未知錯誤。"
 
-#: src/protocols/oscar/oscar.c:5082
+#: src/protocols/oscar/oscar.c:5098
 #, c-format
 msgid ""
 "Your screen name is currently formatted as follows:\n"
@@ -8286,25 +8342,25 @@
 "您的帳號目前被格式化如下:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:5083 src/protocols/oscar/oscar.c:5090
+#: src/protocols/oscar/oscar.c:5099 src/protocols/oscar/oscar.c:5106
 msgid "Account Info"
 msgstr "帳號資訊"
 
-#: src/protocols/oscar/oscar.c:5088
+#: src/protocols/oscar/oscar.c:5104
 #, c-format
 msgid "The email address for %s is %s"
 msgstr "%s 的電子郵件地址為 %s"
 
-#: src/protocols/oscar/oscar.c:5153
+#: src/protocols/oscar/oscar.c:5169
 msgid ""
 "Your IM Image was not sent. You must be Direct Connected to send IM Images."
 msgstr "無法傳送即時訊息影像;要傳送即時訊息影像,必須與對方直接連線。"
 
-#: src/protocols/oscar/oscar.c:5326
+#: src/protocols/oscar/oscar.c:5342
 msgid "Unable to set AIM profile."
 msgstr "無法設定 AIM 個人資料。"
 
-#: src/protocols/oscar/oscar.c:5327
+#: src/protocols/oscar/oscar.c:5343
 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 "
@@ -8313,7 +8369,7 @@
 "您在未登入完成前要求修改您的個人資訊,所以這些資訊並未被修改。請在完成登入後"
 "再重新進行設定。"
 
-#: src/protocols/oscar/oscar.c:5354
+#: src/protocols/oscar/oscar.c:5370
 #, c-format
 msgid ""
 "The maximum profile length of %d byte has been exceeded.  Gaim has truncated "
@@ -8324,19 +8380,19 @@
 msgstr[0] "個人資訊的長度超出了 %d 個位元組的上限。Gaim 已替您截短內容。"
 msgstr[1] "個人資訊的長度超出了 %d 個位元組的上限。Gaim 已替您截短內容。"
 
-#: src/protocols/oscar/oscar.c:5359
+#: src/protocols/oscar/oscar.c:5375
 msgid "Profile too long."
 msgstr "個人資訊過長。"
 
-#: src/protocols/oscar/oscar.c:5375 src/protocols/oscar/oscar.c:6671
+#: src/protocols/oscar/oscar.c:5391 src/protocols/oscar/oscar.c:6688
 msgid "Visible"
 msgstr "現身"
 
-#: src/protocols/oscar/oscar.c:5393
+#: src/protocols/oscar/oscar.c:5409
 msgid "Unable to set AIM away message."
 msgstr "無法設定 AIM 離開訊息。"
 
-#: src/protocols/oscar/oscar.c:5394
+#: src/protocols/oscar/oscar.c:5410
 msgid ""
 "You have probably requested to set your away message before the login "
 "procedure completed.  You remain in a \"present\" state; try setting it "
@@ -8345,7 +8401,7 @@
 "您試著在登入程序完成前修改您的離開訊息,您的狀態將維持目前所設定的狀態。請在"
 "完全登入後再設定一次。"
 
-#: src/protocols/oscar/oscar.c:5434
+#: src/protocols/oscar/oscar.c:5450
 #, c-format
 msgid ""
 "The maximum away message length of %d byte has been exceeded.  Gaim has "
@@ -8356,11 +8412,11 @@
 msgstr[0] "離開訊息的長度超出了 %d 個位元組的上限。Gaim 已替您截短內容。"
 msgstr[1] "離開訊息的長度超出了 %d 個位元組的上限。Gaim 已替您截短內容。"
 
-#: src/protocols/oscar/oscar.c:5439
+#: src/protocols/oscar/oscar.c:5455
 msgid "Away message too long."
 msgstr "離開訊息過長。"
 
-#: src/protocols/oscar/oscar.c:5517
+#: src/protocols/oscar/oscar.c:5533
 #, c-format
 msgid ""
 "Could not add the buddy %s because the screen name is invalid.  Screen names "
@@ -8371,16 +8427,16 @@
 "文字母為開頭,同時由「英文字母」、「數字」和「空白」所組成,或者單純以「數"
 "字」組成。"
 
-#: src/protocols/oscar/oscar.c:5518 src/protocols/oscar/oscar.c:5959
-#: src/protocols/oscar/oscar.c:5972
+#: src/protocols/oscar/oscar.c:5534 src/protocols/oscar/oscar.c:5976
+#: src/protocols/oscar/oscar.c:5989
 msgid "Unable To Add"
 msgstr "無法加入"
 
-#: src/protocols/oscar/oscar.c:5678
+#: src/protocols/oscar/oscar.c:5695
 msgid "Unable To Retrieve Buddy List"
 msgstr "無法讀取好友清單"
 
-#: src/protocols/oscar/oscar.c:5679
+#: src/protocols/oscar/oscar.c:5696
 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 "
@@ -8389,13 +8445,13 @@
 "Gaim 暫時沒有辦法由 AIM 伺服器上取得您的好友清單。不過這個好友清單並沒有遺"
 "失,可能可以在幾個小時後取得。"
 
-#: src/protocols/oscar/oscar.c:5855 src/protocols/oscar/oscar.c:5856
-#: src/protocols/oscar/oscar.c:5861 src/protocols/oscar/oscar.c:6016
-#: src/protocols/oscar/oscar.c:6017 src/protocols/oscar/oscar.c:6022
+#: src/protocols/oscar/oscar.c:5872 src/protocols/oscar/oscar.c:5873
+#: src/protocols/oscar/oscar.c:5878 src/protocols/oscar/oscar.c:6033
+#: src/protocols/oscar/oscar.c:6034 src/protocols/oscar/oscar.c:6039
 msgid "Orphans"
 msgstr "孤兒們"
 
-#: src/protocols/oscar/oscar.c:5958
+#: src/protocols/oscar/oscar.c:5975
 #, c-format
 msgid ""
 "Could not add the buddy %s because you have too many buddies in your buddy "
@@ -8404,11 +8460,11 @@
 "因為您的好友法單中有太多的好友,所以沒有辦法加入好友 %s。請在移除部份好友後重"
 "試。"
 
-#: src/protocols/oscar/oscar.c:5958 src/protocols/oscar/oscar.c:5971
+#: src/protocols/oscar/oscar.c:5975 src/protocols/oscar/oscar.c:5988
 msgid "(no name)"
 msgstr "(沒有名字)"
 
-#: src/protocols/oscar/oscar.c:5971
+#: src/protocols/oscar/oscar.c:5988
 #, c-format
 msgid ""
 "Could not add the buddy %s for an unknown reason.  The most common reason "
@@ -8418,7 +8474,7 @@
 "因為不明原因而無法將好友 %s 加入。一般的原因是因為您的好友清單中的好友數目超"
 "過所系統允許的上限。"
 
-#: src/protocols/oscar/oscar.c:6053
+#: src/protocols/oscar/oscar.c:6070
 #, c-format
 msgid ""
 "The user %s has given you permission to add you to their buddy list.  Do you "
@@ -8428,11 +8484,11 @@
 "呢?"
 
 # NOTE 這是我們允許別人發出的認證要求後顯示給我們自己看的
-#: src/protocols/oscar/oscar.c:6059
+#: src/protocols/oscar/oscar.c:6076
 msgid "Authorization Given"
 msgstr "給予認證"
 
-#: src/protocols/oscar/oscar.c:6092
+#: src/protocols/oscar/oscar.c:6109
 #, c-format
 msgid ""
 "The user %s wants to add you to their buddy list for the following reason:\n"
@@ -8442,18 +8498,18 @@
 "%s"
 
 #. Granted
-#: src/protocols/oscar/oscar.c:6134
+#: src/protocols/oscar/oscar.c:6151
 #, c-format
 msgid "The user %s has granted your request to add them to your buddy list."
 msgstr "使用者 %s 允許了您將他(她)加入好友清單的要求。"
 
 # NOTE 這是我們發出的認證要求被對方允許時顯示的
-#: src/protocols/oscar/oscar.c:6135
+#: src/protocols/oscar/oscar.c:6152
 msgid "Authorization Granted"
 msgstr "認證獲允"
 
 #. Denied
-#: src/protocols/oscar/oscar.c:6138
+#: src/protocols/oscar/oscar.c:6155
 #, c-format
 msgid ""
 "The user %s has denied your request to add them to your buddy list for the "
@@ -8463,74 +8519,74 @@
 "使用者 %s 因為下列原因,拒絕了您將他(她)加入好友清單的要求:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:6139
+#: src/protocols/oscar/oscar.c:6156
 msgid "Authorization Denied"
 msgstr "認證被拒"
 
 # NOTE: 這裡的字義係由 #gaim 的 MrHappy 及 deryni 提供的
 # NOTE: KingAnt 提供的字義有些不同,暫時不予理會
-#: src/protocols/oscar/oscar.c:6176 src/protocols/toc/toc.c:1271
+#: src/protocols/oscar/oscar.c:6193 src/protocols/toc/toc.c:1271
 msgid "_Exchange:"
 msgstr "頻道號碼(_E):"
 
-#: src/protocols/oscar/oscar.c:6198
+#: src/protocols/oscar/oscar.c:6215
 msgid "Invalid chat name specified."
 msgstr "給予了無效的聊天室名稱。"
 
-#: src/protocols/oscar/oscar.c:6288
+#: src/protocols/oscar/oscar.c:6305
 msgid "Your IM Image was not sent. You cannot send IM Images in AIM chats."
 msgstr "無法傳送即時訊息影像;AIM 聊天並不支援即時訊息影像的傳送。"
 
-#: src/protocols/oscar/oscar.c:6445
+#: src/protocols/oscar/oscar.c:6462
 msgid "Away Message"
 msgstr "離開訊息"
 
-#: src/protocols/oscar/oscar.c:6729
+#: src/protocols/oscar/oscar.c:6746
 msgid "Buddy Comment:"
 msgstr "好友說明:"
 
-#: src/protocols/oscar/oscar.c:6747
+#: src/protocols/oscar/oscar.c:6764
 msgid "Edit Buddy Comment"
 msgstr "編輯好友說明"
 
-#: src/protocols/oscar/oscar.c:6753
+#: src/protocols/oscar/oscar.c:6770
 msgid "Get Status Msg"
 msgstr "取得狀態訊息"
 
 # NOTE 將「直接消息」改譯為「即時訊息」
-#: src/protocols/oscar/oscar.c:6765
+#: src/protocols/oscar/oscar.c:6782
 msgid "Direct IM"
 msgstr "即時訊息"
 
-#: src/protocols/oscar/oscar.c:6788
+#: src/protocols/oscar/oscar.c:6804
 msgid "Re-request Authorization"
 msgstr "重新要求認證"
 
-#: src/protocols/oscar/oscar.c:6818
+#: src/protocols/oscar/oscar.c:6834
 msgid "The new formatting is invalid."
 msgstr "新的格式是無效的。"
 
-#: src/protocols/oscar/oscar.c:6819
+#: src/protocols/oscar/oscar.c:6835
 msgid "Screen name formatting can change only capitalization and whitespace."
 msgstr "帳號格式化只能改變大寫以及空白。"
 
-#: src/protocols/oscar/oscar.c:6826
+#: src/protocols/oscar/oscar.c:6842
 msgid "New screen name formatting:"
 msgstr "新的帳號格式:"
 
-#: src/protocols/oscar/oscar.c:6878
+#: src/protocols/oscar/oscar.c:6894
 msgid "Change Address To:"
 msgstr "變更地址為:"
 
-#: src/protocols/oscar/oscar.c:6923
+#: src/protocols/oscar/oscar.c:6939
 msgid "<i>you are not waiting for authorization</i>"
 msgstr "<i>您並沒有在等待驗證</i>"
 
-#: src/protocols/oscar/oscar.c:6926
+#: src/protocols/oscar/oscar.c:6942
 msgid "You are awaiting authorization from the following buddies"
 msgstr "您目前正在等待下列好友的認證"
 
-#: src/protocols/oscar/oscar.c:6927
+#: src/protocols/oscar/oscar.c:6943
 msgid ""
 "You can re-request authorization from these buddies by right-clicking on "
 "them and selecting \"Re-request Authorization.\""
@@ -8538,76 +8594,76 @@
 "您可以重新要求這些好友的認證,只要在好友清單中以滑鼠右鍵點擊他們,然後選擇"
 "「要求重新認證」。"
 
-#: src/protocols/oscar/oscar.c:6944
+#: src/protocols/oscar/oscar.c:6960
 msgid "Find Buddy by E-mail"
 msgstr "以電子郵件地址來找尋好友"
 
-#: src/protocols/oscar/oscar.c:6945
+#: src/protocols/oscar/oscar.c:6961
 msgid "Search for a buddy by e-mail address"
 msgstr "使用電子郵件地址搜尋好友"
 
-#: src/protocols/oscar/oscar.c:6946
+#: src/protocols/oscar/oscar.c:6962
 msgid "Type the e-mail address of the buddy you are searching for."
 msgstr "請輸入對方的電子郵件地址。"
 
-#: src/protocols/oscar/oscar.c:6963
+#: src/protocols/oscar/oscar.c:6979
 msgid "Available Message:"
 msgstr "上線訊息:"
 
 # XXX 請覆查
-#: src/protocols/oscar/oscar.c:6964
+#: src/protocols/oscar/oscar.c:6980
 msgid "I'm doing work and hoping for a distraction--IM me!"
 msgstr "我在工作,但覺得很悶,同我聊聊天吧!"
 
-#: src/protocols/oscar/oscar.c:7045 src/protocols/silc/silc.c:786
+#: src/protocols/oscar/oscar.c:7061 src/protocols/silc/silc.c:789
 msgid "Set User Info..."
 msgstr "設定使用者資訊..."
 
-#: src/protocols/oscar/oscar.c:7050
+#: src/protocols/oscar/oscar.c:7066
 msgid "Set User Info (URL)..."
 msgstr "設定使用者資訊 (URL)..."
 
-#: src/protocols/oscar/oscar.c:7056
+#: src/protocols/oscar/oscar.c:7072
 msgid "Set Available Message..."
 msgstr "設定上線訊息..."
 
-#: src/protocols/oscar/oscar.c:7061 src/protocols/silc/silc.c:782
+#: src/protocols/oscar/oscar.c:7077 src/protocols/silc/silc.c:785
 msgid "Change Password..."
 msgstr "修改密碼..."
 
-#: src/protocols/oscar/oscar.c:7066
+#: src/protocols/oscar/oscar.c:7082
 msgid "Change Password (URL)"
 msgstr "修改密碼 (透過網頁)"
 
-#: src/protocols/oscar/oscar.c:7070
+#: src/protocols/oscar/oscar.c:7086
 msgid "Configure IM Forwarding (URL)"
 msgstr "設定即時訊息的轉送 (透過網頁)"
 
-#: src/protocols/oscar/oscar.c:7079
+#: src/protocols/oscar/oscar.c:7095
 msgid "Format Screen Name..."
 msgstr "格式化帳號..."
 
-#: src/protocols/oscar/oscar.c:7083
+#: src/protocols/oscar/oscar.c:7099
 msgid "Confirm Account"
 msgstr "確認帳號"
 
-#: src/protocols/oscar/oscar.c:7087
+#: src/protocols/oscar/oscar.c:7103
 msgid "Display Currently Registered Address"
 msgstr "顯示目前所註冊的地址"
 
-#: src/protocols/oscar/oscar.c:7091
+#: src/protocols/oscar/oscar.c:7107
 msgid "Change Currently Registered Address..."
 msgstr "修改目前所註冊的地址..."
 
-#: src/protocols/oscar/oscar.c:7098
+#: src/protocols/oscar/oscar.c:7114
 msgid "Show Buddies Awaiting Authorization"
 msgstr "顯示等待認證的好友"
 
-#: src/protocols/oscar/oscar.c:7104
+#: src/protocols/oscar/oscar.c:7120
 msgid "Search for Buddy by Email..."
 msgstr "使用電子郵件地址搜尋好友..."
 
-#: src/protocols/oscar/oscar.c:7109
+#: src/protocols/oscar/oscar.c:7125
 msgid "Search for Buddy by Information"
 msgstr "依照資訊尋找好友"
 
@@ -8622,15 +8678,15 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/oscar/oscar.c:7225 src/protocols/oscar/oscar.c:7227
+#: src/protocols/oscar/oscar.c:7243 src/protocols/oscar/oscar.c:7245
 msgid "AIM/ICQ Protocol Plugin"
 msgstr "AIM/ICQ 協定模組"
 
-#: src/protocols/oscar/oscar.c:7246
+#: src/protocols/oscar/oscar.c:7264
 msgid "Auth host"
 msgstr "認證伺服器"
 
-#: src/protocols/oscar/oscar.c:7251
+#: src/protocols/oscar/oscar.c:7269
 msgid "Auth port"
 msgstr "認證通訊埠"
 
@@ -8717,32 +8773,32 @@
 msgstr "設定即時訊息密碼"
 
 #: src/protocols/silc/buddy.c:506 src/protocols/silc/buddy.c:541
-#: src/protocols/silc/ops.c:1133 src/protocols/silc/ops.c:1144
+#: src/protocols/silc/ops.c:1256 src/protocols/silc/ops.c:1267
 msgid "Get Public Key"
 msgstr "取得公鑰"
 
-#: src/protocols/silc/buddy.c:542 src/protocols/silc/ops.c:1134
-#: src/protocols/silc/ops.c:1145
+#: src/protocols/silc/buddy.c:542 src/protocols/silc/ops.c:1257
+#: src/protocols/silc/ops.c:1268
 msgid "Cannot fetch the public key"
 msgstr "無法取得公鑰"
 
-#: src/protocols/silc/buddy.c:629 src/protocols/silc/buddy.c:1619
+#: src/protocols/silc/buddy.c:629 src/protocols/silc/buddy.c:1544
 msgid "Show Public Key"
 msgstr "顯示公鑰"
 
 #: src/protocols/silc/buddy.c:630 src/protocols/silc/buddy.c:989
-#: src/protocols/silc/chat.c:219
+#: src/protocols/silc/chat.c:222
 msgid "Could not load public key"
 msgstr "無法載入公鑰"
 
-#: src/protocols/silc/buddy.c:707 src/protocols/silc/ops.c:847
-#: src/protocols/silc/ops.c:918 src/protocols/silc/ops.c:1001
-#: src/protocols/silc/ops.c:1002 src/protocols/silc/ops.c:1008
-#: src/protocols/silc/ops.c:1009
+#: src/protocols/silc/buddy.c:707 src/protocols/silc/ops.c:853
+#: src/protocols/silc/ops.c:925 src/protocols/silc/ops.c:1060
+#: src/protocols/silc/ops.c:1061 src/protocols/silc/ops.c:1079
 msgid "User Information"
 msgstr "使用者資訊"
 
-#: src/protocols/silc/buddy.c:708 src/protocols/silc/ops.c:919
+#: src/protocols/silc/buddy.c:708 src/protocols/silc/ops.c:926
+#: src/protocols/silc/ops.c:1080
 msgid "Cannot get user information"
 msgstr "無法讀取使用者資訊"
 
@@ -8759,6 +8815,11 @@
 "直至您匯入好友的公鑰,您將無法收到該好友的好友通知。要取得公鑰,用「取得公"
 "鑰」指令即可。"
 
+#. Open file selector to select the public key.
+#: src/protocols/silc/buddy.c:1023
+msgid "Open..."
+msgstr "開啟..."
+
 #: src/protocols/silc/buddy.c:1032
 #, c-format
 msgid "The %s buddy is not present in the network"
@@ -8820,143 +8881,111 @@
 msgid "Robot"
 msgstr ""
 
-#: src/protocols/silc/buddy.c:1396 src/protocols/silc/buddy.c:1464
-#: src/protocols/silc/silc.c:610
+#: src/protocols/silc/buddy.c:1396 src/protocols/silc/silc.c:610
+#: src/protocols/silc/util.c:469
 msgid "Happy"
 msgstr "開心"
 
-#: src/protocols/silc/buddy.c:1398 src/protocols/silc/buddy.c:1466
-#: src/protocols/silc/silc.c:612
+#: src/protocols/silc/buddy.c:1398 src/protocols/silc/silc.c:612
+#: src/protocols/silc/util.c:471
 msgid "Sad"
 msgstr "憂愁"
 
-#: src/protocols/silc/buddy.c:1400 src/protocols/silc/buddy.c:1468
-#: src/protocols/silc/silc.c:614
+#: src/protocols/silc/buddy.c:1400 src/protocols/silc/silc.c:614
+#: src/protocols/silc/util.c:473
 msgid "Angry"
 msgstr "憤怒"
 
-#: src/protocols/silc/buddy.c:1402 src/protocols/silc/buddy.c:1470
-#: src/protocols/silc/silc.c:616
+#: src/protocols/silc/buddy.c:1402 src/protocols/silc/silc.c:616
+#: src/protocols/silc/util.c:475
 msgid "Jealous"
 msgstr "嫉妒"
 
-#: src/protocols/silc/buddy.c:1404 src/protocols/silc/buddy.c:1472
-#: src/protocols/silc/silc.c:618
+#: src/protocols/silc/buddy.c:1404 src/protocols/silc/silc.c:618
+#: src/protocols/silc/util.c:477
 msgid "Ashamed"
 msgstr "慚愧"
 
-#: src/protocols/silc/buddy.c:1406 src/protocols/silc/buddy.c:1474
-#: src/protocols/silc/silc.c:620
+#: src/protocols/silc/buddy.c:1406 src/protocols/silc/silc.c:620
+#: src/protocols/silc/util.c:479
 msgid "Invincible"
 msgstr "無敵"
 
-#: src/protocols/silc/buddy.c:1408 src/protocols/silc/buddy.c:1476
-#: src/protocols/silc/silc.c:622
+#: src/protocols/silc/buddy.c:1408 src/protocols/silc/silc.c:622
+#: src/protocols/silc/util.c:481
 msgid "In Love"
 msgstr "戀愛中"
 
-#: src/protocols/silc/buddy.c:1410 src/protocols/silc/buddy.c:1478
-#: src/protocols/silc/silc.c:624
+#: src/protocols/silc/buddy.c:1410 src/protocols/silc/silc.c:624
+#: src/protocols/silc/util.c:483
 msgid "Sleepy"
 msgstr "想睡"
 
-#: src/protocols/silc/buddy.c:1412 src/protocols/silc/buddy.c:1480
-#: src/protocols/silc/silc.c:626
+#: src/protocols/silc/buddy.c:1412 src/protocols/silc/silc.c:626
+#: src/protocols/silc/util.c:485
 msgid "Bored"
 msgstr "發悶"
 
-#: src/protocols/silc/buddy.c:1414 src/protocols/silc/buddy.c:1482
-#: src/protocols/silc/silc.c:628
+#: src/protocols/silc/buddy.c:1414 src/protocols/silc/silc.c:628
+#: src/protocols/silc/util.c:487
 msgid "Excited"
 msgstr "興奮"
 
-#: src/protocols/silc/buddy.c:1416 src/protocols/silc/buddy.c:1484
-#: src/protocols/silc/silc.c:630
+#: src/protocols/silc/buddy.c:1416 src/protocols/silc/silc.c:630
+#: src/protocols/silc/util.c:489
 msgid "Anxious"
 msgstr "憂慮"
 
-#: src/protocols/silc/buddy.c:1452
-msgid "Modes"
-msgstr "模式"
-
-#: src/protocols/silc/buddy.c:1462
+#: src/protocols/silc/buddy.c:1448 src/protocols/silc/ops.c:962
+msgid "User Modes"
+msgstr "使用者模式"
+
+#: src/protocols/silc/buddy.c:1457 src/protocols/silc/ops.c:971
 msgid "Mood"
 msgstr "心情"
 
-#: src/protocols/silc/buddy.c:1490
+#: src/protocols/silc/buddy.c:1461 src/protocols/silc/ops.c:977
 msgid "Status Text"
 msgstr "狀態訊息"
 
-#: src/protocols/silc/buddy.c:1495
+#: src/protocols/silc/buddy.c:1466 src/protocols/silc/ops.c:983
 msgid "Preferred Contact"
 msgstr "聯絡方法"
 
-#: src/protocols/silc/buddy.c:1503
-msgid "Paging"
-msgstr "傳呼"
-
-#: src/protocols/silc/buddy.c:1505 src/protocols/silc/silc.c:641
-msgid "SMS"
-msgstr "SMS"
-
-#: src/protocols/silc/buddy.c:1507 src/protocols/silc/silc.c:643
-msgid "MMS"
-msgstr "MMS"
-
-#: src/protocols/silc/buddy.c:1509 src/protocols/silc/silc.c:645
-msgid "Video Conferencing"
-msgstr "視像會議"
-
-#: src/protocols/silc/buddy.c:1515
+#: src/protocols/silc/buddy.c:1471 src/protocols/silc/ops.c:988
 msgid "Preferred Language"
 msgstr "選用語文"
 
-#: src/protocols/silc/buddy.c:1520
+#: src/protocols/silc/buddy.c:1476 src/protocols/silc/ops.c:993
 msgid "Device"
 msgstr "所用裝置"
 
-#: src/protocols/silc/buddy.c:1522
-msgid "Computer"
-msgstr "電腦"
-
-#: src/protocols/silc/buddy.c:1526
-msgid "PDA"
-msgstr "電子手帳"
-
-#: src/protocols/silc/buddy.c:1528
-msgid "Terminal"
-msgstr "終端機"
-
-#: src/protocols/silc/buddy.c:1539 src/protocols/silc/silc.c:678
-#: src/protocols/silc/silc.c:680
+#: src/protocols/silc/buddy.c:1481 src/protocols/silc/ops.c:998
+#: src/protocols/silc/silc.c:678 src/protocols/silc/silc.c:680
 msgid "Timezone"
 msgstr "時區"
 
-#: src/protocols/silc/buddy.c:1545
+#: src/protocols/silc/buddy.c:1486 src/protocols/silc/ops.c:1003
 msgid "Geolocation"
 msgstr "所在位置"
 
-#: src/protocols/silc/buddy.c:1604
+#: src/protocols/silc/buddy.c:1529
 msgid "Reset IM Key"
 msgstr "清除即時訊息密鑰"
 
-#: src/protocols/silc/buddy.c:1609
+#: src/protocols/silc/buddy.c:1534
 msgid "IM with Key Exchange"
 msgstr "要交換密鑰之即時訊息"
 
-#: src/protocols/silc/buddy.c:1613
+#: src/protocols/silc/buddy.c:1538
 msgid "IM with Password"
 msgstr "有密碼之即時訊息"
 
-#: src/protocols/silc/buddy.c:1624
+#: src/protocols/silc/buddy.c:1549
 msgid "Get Public Key..."
 msgstr "取得公鑰..."
 
-#: src/protocols/silc/buddy.c:1629
-msgid "Send File..."
-msgstr "傳送檔案..."
-
-#: src/protocols/silc/buddy.c:1634 src/protocols/silc/ops.c:1182
+#: src/protocols/silc/buddy.c:1555 src/protocols/silc/ops.c:1389
 msgid "Kill User"
 msgstr "從網路上移除使用者"
 
@@ -8969,8 +8998,7 @@
 msgid "Channel %s does not exist in the network"
 msgstr "頻道 %s 不在網路上"
 
-#: src/protocols/silc/chat.c:67 src/protocols/silc/chat.c:154
-#: src/protocols/silc/chat.c:155
+#: src/protocols/silc/chat.c:67 src/protocols/silc/chat.c:159
 msgid "Channel Information"
 msgstr "頻道資訊"
 
@@ -8978,90 +9006,68 @@
 msgid "Cannot get channel information"
 msgstr "無法取得頻道資訊"
 
-#: src/protocols/silc/chat.c:104
-#, c-format
-msgid "Channel Name:\t\t%s\n"
-msgstr "頻道名稱:%s\n"
-
-#: src/protocols/silc/chat.c:106
-#, c-format
-msgid "User Count:\t\t%d\n"
-msgstr "使用者數:%d\n"
-
-#: src/protocols/silc/chat.c:112
-#, c-format
-msgid "Channel Founder:\t%s\n"
-msgstr "頻道創立者:%s\n"
-
-#: src/protocols/silc/chat.c:120
-#, c-format
-msgid "Channel Cipher:\t\t%s\n"
-msgstr "頻道加密方式 (Cipher):%s\n"
-
-#: src/protocols/silc/chat.c:123
-#, c-format
-msgid "Channel HMAC:\t\t%s\n"
-msgstr "頻道身份驗證代碼 (HMAC):%s\n"
+#: src/protocols/silc/chat.c:105
+#, c-format
+msgid "<b>Channel Name:</b> %s"
+msgstr "<b>頻道名稱:</b>%s"
+
+#: src/protocols/silc/chat.c:108
+#, c-format
+msgid "<br><b>User Count:</b> %d"
+msgstr "<br><b>使用者人數:</b>%d"
+
+#: src/protocols/silc/chat.c:115
+#, c-format
+msgid "<br><b>Channel Founder:</b> %s"
+msgstr "<br><b>頻道創立者:</b>%s"
+
+#: src/protocols/silc/chat.c:124
+#, c-format
+msgid "<br><b>Channel Cipher:</b> %s"
+msgstr "<br><b>頻道加密方式 (Cipher):</b>%s"
 
 #: src/protocols/silc/chat.c:127
 #, c-format
-msgid ""
-"\n"
-"Channel Topic:\n"
-"\t%s\n"
-msgstr ""
-"\n"
-"頻道主題:\n"
-"\t%s\n"
-
-#: src/protocols/silc/chat.c:130
-msgid ""
-"\n"
-"Channel Modes:\n"
-msgstr ""
-"\n"
-"頻道模式:\n"
-
-#: src/protocols/silc/chat.c:144
-#, c-format
-msgid ""
-"\n"
-"Founder Key Fingerprint:\n"
-"%s\n"
-"\n"
-msgstr ""
-"\n"
-"創立者之公鑰指紋:\n"
-"%s\n"
-"\n"
-
-#: src/protocols/silc/chat.c:145
-#, c-format
-msgid ""
-"Founder Key Babbleprint:\n"
-"%s"
-msgstr ""
-"創立者之公鑰指紋可讀版本 (Babbleprint):\n"
-"%s"
-
-#: src/protocols/silc/chat.c:218
+msgid "<br><b>Channel HMAC:</b> %s"
+msgstr "<br><b>頻道身份驗證代碼 (HMAC):</b>%s"
+
+#: src/protocols/silc/chat.c:132
+#, c-format
+msgid "<br><b>Channel Topic:</b><br>%s"
+msgstr "<br><b>頻道主題:</b><br>%s"
+
+#: src/protocols/silc/chat.c:137
+msgid "<br><b>Channel Modes:</b> "
+msgstr "<br><b>頻道模式:</b>"
+
+#: src/protocols/silc/chat.c:150
+#, c-format
+msgid "<br><b>Founder Key Fingerprint:</b><br>%s"
+msgstr "<br><b>創立者之公鑰指紋:</b><br>%s"
+
+#: src/protocols/silc/chat.c:151
+#, c-format
+msgid "<br><b>Founder Key Babbleprint:</b><br>%s"
+msgstr "<br><b>創立者之公鑰指紋可讀版本 (Babbleprint):</b><br>%s"
+
+#: src/protocols/silc/chat.c:221
 msgid "Add Channel Public Key"
 msgstr "新增頻道公鑰"
 
 #. Add new public key
-#: src/protocols/silc/chat.c:273
+#: src/protocols/silc/chat.c:276
 msgid "Open Public Key..."
 msgstr "開啟公鑰..."
 
-#: src/protocols/silc/chat.c:382
+#: src/protocols/silc/chat.c:385
 msgid "Channel Passphrase"
 msgstr "頻道密碼"
 
-#: src/protocols/silc/chat.c:389
+#: src/protocols/silc/chat.c:392
 msgid "Channel Public Keys List"
 msgstr "頻道公鑰清單"
 
-#: src/protocols/silc/chat.c:394
+#: src/protocols/silc/chat.c:397
 msgid ""
 "Channel authentication is used to secure the channel from unauthorized "
 "access. The authentication may be based on passphrase and digital "
@@ -9074,127 +9080,127 @@
 "道就必須擁有所列公鑰內之其一。"
 
 #  XXX 暫譯
-#: src/protocols/silc/chat.c:403 src/protocols/silc/chat.c:404
-#: src/protocols/silc/chat.c:441 src/protocols/silc/chat.c:442
-#: src/protocols/silc/chat.c:871
+#: src/protocols/silc/chat.c:406 src/protocols/silc/chat.c:407
+#: src/protocols/silc/chat.c:444 src/protocols/silc/chat.c:445
+#: src/protocols/silc/chat.c:874
 msgid "Channel Authentication"
 msgstr "頻道認證"
 
-#: src/protocols/silc/chat.c:405 src/protocols/silc/chat.c:443
+#: src/protocols/silc/chat.c:408 src/protocols/silc/chat.c:446
 msgid "Add / Remove"
 msgstr "新增/移除"
 
 # XXX may be wrong
-#: src/protocols/silc/chat.c:560
+#: src/protocols/silc/chat.c:563
 msgid "Group Name"
 msgstr "聊天室名稱"
 
-#: src/protocols/silc/chat.c:564 src/protocols/silc/ops.c:1463
+#: src/protocols/silc/chat.c:567 src/protocols/silc/ops.c:1669
 msgid "Passphrase"
 msgstr "密碼"
 
-#: src/protocols/silc/chat.c:575
+#: src/protocols/silc/chat.c:578
 #, c-format
 msgid "Please enter the %s channel private group name and passphrase."
 msgstr "請您給頻道 %s 內的小圈子輸入名稱及密碼。"
 
-#: src/protocols/silc/chat.c:577
+#: src/protocols/silc/chat.c:580
 msgid "Add Channel Private Group"
 msgstr "新增頻道小圈子"
 
 # XXX may be wrong
-#: src/protocols/silc/chat.c:704
+#: src/protocols/silc/chat.c:707
 msgid "User Limit"
 msgstr "使用者數目上限"
 
-#: src/protocols/silc/chat.c:705
+#: src/protocols/silc/chat.c:708
 msgid "Set user limit on channel. Set to zero to reset user limit."
 msgstr "設定使用者數目上限;要清除使用者數目上限,輸入零即可。"
 
-#: src/protocols/silc/chat.c:847
+#: src/protocols/silc/chat.c:850
 msgid "Get Info"
 msgstr "取得資訊"
 
-#: src/protocols/silc/chat.c:854
+#: src/protocols/silc/chat.c:857
 msgid "Invite List"
 msgstr "邀請清單"
 
 #  XXX 暫譯
-#: src/protocols/silc/chat.c:858
+#: src/protocols/silc/chat.c:861
 msgid "Ban List"
 msgstr "禁止清單"
 
-#: src/protocols/silc/chat.c:865
+#: src/protocols/silc/chat.c:868
 msgid "Add Private Group"
 msgstr "新增小圈子"
 
-#: src/protocols/silc/chat.c:876
+#: src/protocols/silc/chat.c:879
 msgid "Reset Permanent"
 msgstr "清除永久性頻道模式"
 
-#: src/protocols/silc/chat.c:880
+#: src/protocols/silc/chat.c:883
 msgid "Set Permanent"
 msgstr "設定永久性頻道模式"
 
 #  XXX may be wrong
-#: src/protocols/silc/chat.c:887
+#: src/protocols/silc/chat.c:890
 msgid "Set User Limit"
 msgstr "設定使用者數目上限"
 
-#: src/protocols/silc/chat.c:892
+#: src/protocols/silc/chat.c:895
 msgid "Reset Topic Restriction"
 msgstr "清除主題限制"
 
-#: src/protocols/silc/chat.c:896
+#: src/protocols/silc/chat.c:899
 msgid "Set Topic Restriction"
 msgstr "設定主題限制"
 
-#: src/protocols/silc/chat.c:902
+#: src/protocols/silc/chat.c:905
 msgid "Reset Private Channel"
 msgstr "清除私用頻道模式"
 
-#: src/protocols/silc/chat.c:906
+#: src/protocols/silc/chat.c:909
 msgid "Set Private Channel"
 msgstr "設定私用頻道模式"
 
-#: src/protocols/silc/chat.c:912
+#: src/protocols/silc/chat.c:915
 msgid "Reset Secret Channel"
 msgstr "清除秘密頻道模式"
 
-#: src/protocols/silc/chat.c:916
+#: src/protocols/silc/chat.c:919
 msgid "Set Secret Channel"
 msgstr "設定秘密頻道模式"
 
 #  XXX 暫譯
-#: src/protocols/silc/chat.c:986
+#: src/protocols/silc/chat.c:989
 #, c-format
 msgid "You are channel founder on <I>%s</I>"
 msgstr "您是 <I>%s</I> 的頻道創立者"
 
-#: src/protocols/silc/chat.c:990
+#: src/protocols/silc/chat.c:993
 #, c-format
 msgid "Channel founder on <I>%s</I> is <I>%s</I>"
 msgstr "<I>%s</I> 的頻道創立者為 <I>%s</I>"
 
-#: src/protocols/silc/chat.c:1043
+#: src/protocols/silc/chat.c:1046
 #, c-format
 msgid ""
 "You have to join the %s channel before you are able to join the private group"
 msgstr "加入小圈子前,您必須首先加入頻道 %s"
 
-#: src/protocols/silc/chat.c:1045
+#: src/protocols/silc/chat.c:1048
 msgid "Join Private Group"
 msgstr "加入小圈子"
 
-#: src/protocols/silc/chat.c:1046
+#: src/protocols/silc/chat.c:1049
 msgid "Cannot join private group"
 msgstr "無法加入小圈子"
 
-#: src/protocols/silc/chat.c:1239 src/protocols/silc/silc.c:885
+#: src/protocols/silc/chat.c:1242 src/protocols/silc/silc.c:888
 msgid "Cannot call command"
 msgstr "無法執行指令"
 
-#: src/protocols/silc/chat.c:1240 src/protocols/silc/silc.c:886
+#: src/protocols/silc/chat.c:1243 src/protocols/silc/silc.c:889
 msgid "Unknown command"
 msgstr "未知的指令"
 
@@ -9245,224 +9251,278 @@
 msgid "Cannot send file"
 msgstr "無法傳送檔案"
 
-#: src/protocols/silc/ops.c:333 src/protocols/silc/ops.c:340
-#: src/protocols/silc/ops.c:347
+#: src/protocols/silc/ops.c:333 src/protocols/silc/ops.c:342
+#: src/protocols/silc/ops.c:351
 #, c-format
 msgid "%s has changed the topic of <I>%s</I> to: %s"
 msgstr "%s 把 <I>%s</I> 的聊天主題修改為:%s"
 
-#: src/protocols/silc/ops.c:407
+#: src/protocols/silc/ops.c:413
 #, c-format
 msgid "<I>%s</I> set channel <I>%s</I> modes to: %s"
 msgstr "<I>%s</I> 設定頻道 <I>%s</I> 的模式為:%s"
 
-#: src/protocols/silc/ops.c:411
+#: src/protocols/silc/ops.c:417
 #, c-format
 msgid "<I>%s</I> removed all channel <I>%s</I> modes"
 msgstr "<I>%s</I> 清除了頻道 <I>%s</I> 所有的模式"
 
-#: src/protocols/silc/ops.c:442
+#: src/protocols/silc/ops.c:448
 #, c-format
 msgid "<I>%s</I> set <I>%s's</I> modes to: %s"
 msgstr "<I>%s</I> 設定 <I>%s</I> 的使用者模式為:%s"
 
-#: src/protocols/silc/ops.c:446
+#: src/protocols/silc/ops.c:452
 #, c-format
 msgid "<I>%s</I> removed all <I>%s's</I> modes"
 msgstr "<I>%s</I> 清除了 <I>%s's</I> 所有的模式"
 
-#: src/protocols/silc/ops.c:473
+#: src/protocols/silc/ops.c:479
 #, c-format
 msgid "You have been kicked off <I>%s</I> by <I>%s</I> (%s)"
 msgstr "您被 <I>%2$s</I> 由 <I>%1$s</I> 踢出 (%3$s)"
 
-#: src/protocols/silc/ops.c:503 src/protocols/silc/ops.c:508
-#: src/protocols/silc/ops.c:513
+#: src/protocols/silc/ops.c:509 src/protocols/silc/ops.c:514
+#: src/protocols/silc/ops.c:519
 #, c-format
 msgid "You have been killed by %s (%s)"
 msgstr "您被 %s 從網路上移除 (%s)"
 
-#: src/protocols/silc/ops.c:534 src/protocols/silc/ops.c:539
-#: src/protocols/silc/ops.c:544
+#: src/protocols/silc/ops.c:540 src/protocols/silc/ops.c:545
+#: src/protocols/silc/ops.c:550
 #, c-format
 msgid "Killed by %s (%s)"
 msgstr "被 %s 從網路上移除 (%s)"
 
 #  XXX 要核實
-#: src/protocols/silc/ops.c:590
+#: src/protocols/silc/ops.c:596
 msgid "Server signoff"
 msgstr "從伺服器登出"
 
-#: src/protocols/silc/ops.c:777
+#: src/protocols/silc/ops.c:783
 msgid "Personal Information"
 msgstr "個人資訊"
 
-#: src/protocols/silc/ops.c:800
+#: src/protocols/silc/ops.c:806
 msgid "Birth Day"
 msgstr "生日"
 
-#: src/protocols/silc/ops.c:804
+#: src/protocols/silc/ops.c:810
 msgid "Job Title"
 msgstr "職銜"
 
-#: src/protocols/silc/ops.c:808
+#: src/protocols/silc/ops.c:814
 msgid "Job Role"
 msgstr "職責"
 
-#: src/protocols/silc/ops.c:812
+#: src/protocols/silc/ops.c:818
 msgid "Organization"
 msgstr "所屬機構"
 
-#: src/protocols/silc/ops.c:816
+#: src/protocols/silc/ops.c:822
 msgid "Unit"
 msgstr "部門"
 
-#: src/protocols/silc/ops.c:835
+#: src/protocols/silc/ops.c:841
 msgid "EMail"
 msgstr "電子郵件"
 
-#: src/protocols/silc/ops.c:840
+#: src/protocols/silc/ops.c:846
 msgid "Note"
 msgstr "備註"
 
-#: src/protocols/silc/ops.c:888
+#: src/protocols/silc/ops.c:894
 msgid "Join Chat"
 msgstr "加入聊天室"
 
-#: src/protocols/silc/ops.c:943
-msgid "Hostname"
-msgstr "主機名稱"
-
-#: src/protocols/silc/ops.c:950
-msgid "User Mode"
-msgstr "使用者模式"
-
-#: src/protocols/silc/ops.c:964
-msgid "Channels"
-msgstr "頻道"
-
-#: src/protocols/silc/ops.c:991
+#: src/protocols/silc/ops.c:1050 src/protocols/silc/ops.c:1120
 msgid "Public Key Fingerprint"
 msgstr "公鑰指紋"
 
-#: src/protocols/silc/ops.c:992
+#: src/protocols/silc/ops.c:1051 src/protocols/silc/ops.c:1121
 msgid "Public Key Babbleprint"
 msgstr "公鑰指紋可讀版本 (Babbleprint)"
 
-#: src/protocols/silc/ops.c:1005
+#: src/protocols/silc/ops.c:1064
 msgid "More..."
 msgstr "顯示細節..."
 
-#: src/protocols/silc/ops.c:1016 src/protocols/silc/silc.c:774
+#: src/protocols/silc/ops.c:1135 src/protocols/silc/silc.c:777
 msgid "Detach From Server"
 msgstr "與伺服器暫停連線"
 
-#: src/protocols/silc/ops.c:1016
+#: src/protocols/silc/ops.c:1135
 msgid "Cannot detach"
 msgstr "無法暫停連線"
 
-#: src/protocols/silc/ops.c:1027
+#: src/protocols/silc/ops.c:1146
 msgid "Cannot set topic"
 msgstr "無法設定主題"
 
-#: src/protocols/silc/ops.c:1098
+#: src/protocols/silc/ops.c:1184
+msgid "Failed to change nickname"
+msgstr "無法更改暱稱"
+
+#: src/protocols/silc/ops.c:1221
 msgid "Roomlist"
 msgstr "聊天室清單"
 
-#: src/protocols/silc/ops.c:1098
+#: src/protocols/silc/ops.c:1221
 msgid "Cannot get room list"
 msgstr "無法取得聊天室清單"
 
-#: src/protocols/silc/ops.c:1146
+#: src/protocols/silc/ops.c:1269
 msgid "No public key was received"
 msgstr "沒有收到公鑰"
 
-#: src/protocols/silc/ops.c:1159 src/protocols/silc/ops.c:1173
-#: src/protocols/silc/ops.c:1174
+#: src/protocols/silc/ops.c:1282 src/protocols/silc/ops.c:1296
 msgid "Server Information"
 msgstr "伺服器資訊"
 
-#: src/protocols/silc/ops.c:1160
+#: src/protocols/silc/ops.c:1283
 msgid "Cannot get server information"
 msgstr "無法取得伺服器資訊"
 
-#: src/protocols/silc/ops.c:1183
+#: src/protocols/silc/ops.c:1314 src/protocols/silc/ops.c:1323
+msgid "Server Statistics"
+msgstr "伺服器統計資料"
+
+#: src/protocols/silc/ops.c:1315
+msgid "Cannot get server statistics"
+msgstr "無法取得伺服器的統計資料"
+
+#: src/protocols/silc/ops.c:1324
+msgid "No server statisitics available"
+msgstr "伺服器沒有統計資料"
+
+#: src/protocols/silc/ops.c:1346
+#, c-format
+msgid ""
+"Local server start time: %s\n"
+"Local server uptime: %s\n"
+"Local server clients: %d\n"
+"Local server channels: %d\n"
+"Local server operators: %d\n"
+"Local router operators: %d\n"
+"Local cell clients: %d\n"
+"Local cell channels: %d\n"
+"Local cell servers: %d\n"
+"Total clients: %d\n"
+"Total channels: %d\n"
+"Total servers: %d\n"
+"Total routers: %d\n"
+"Total server operators: %d\n"
+"Total router operators: %d\n"
+msgstr ""
+"本地端伺服器開機時間:%s\n"
+"本地端伺服器開機至今共:%s\n"
+"本地端伺服器客戶端個數:%d\n"
+"本地端伺服器頻道個數:%d\n"
+"本地端伺服器伺服器管理者人數:%d\n"
+"本地端路由器管理者人數:%d\n"
+"本地端細胞 (Cell) 客戶端個數:%d\n"
+"本地端細胞 (Cell) 頻道個數:%d\n"
+"本地端細胞 (Cell) 伺服器個數:%d\n"
+"客戶端總數:%d\n"
+"頻道總數:%d\n"
+"伺服器總數:%d\n"
+"路由器總數:%d\n"
+"伺服器管理者總數:%d 人\n"
+"路由器管理者總數:%d 人\n"
+
+#: src/protocols/silc/ops.c:1369
+msgid "Network Statistics"
+msgstr "網路統計資料"
+
+#: src/protocols/silc/ops.c:1377 src/protocols/silc/ops.c:1382
+msgid "Ping"
+msgstr "Ping"
+
+#: src/protocols/silc/ops.c:1377
+msgid "Ping failed"
+msgstr "Ping 失敗"
+
+#: src/protocols/silc/ops.c:1382
+msgid "Ping reply received from server"
+msgstr "由伺服器收到 Ping 回應"
+
+#: src/protocols/silc/ops.c:1390
 msgid "Could not kill user"
 msgstr "無法傱網路上移除使用者"
 
-#: src/protocols/silc/ops.c:1265
+#: src/protocols/silc/ops.c:1471
 msgid "Error during connecting to SILC Server"
 msgstr "連線至 SILC 伺服器時發生錯誤"
 
-#: src/protocols/silc/ops.c:1270
+#: src/protocols/silc/ops.c:1476
 msgid "Key Exchange failed"
 msgstr "密鑰交換失敗"
 
-#: src/protocols/silc/ops.c:1279
+#: src/protocols/silc/ops.c:1485
 msgid ""
 "Resuming detached session failed. Press Reconnect to create new connection."
 msgstr "恢復連線失敗,請按「重新連線」建立新的連線。"
 
-#: src/protocols/silc/ops.c:1314
+#: src/protocols/silc/ops.c:1520
 msgid "Disconnected by server"
 msgstr "伺服器中斷了連線"
 
-#: src/protocols/silc/ops.c:1374 src/protocols/silc/ops.c:1421
+#: src/protocols/silc/ops.c:1580 src/protocols/silc/ops.c:1627
 #: src/protocols/silc/silc.c:167
 msgid "Resuming session"
 msgstr "恢復工作階段中"
 
-#: src/protocols/silc/ops.c:1376
+#: src/protocols/silc/ops.c:1582
 msgid "Authenticating connection"
 msgstr "為連線進行驗證中"
 
-#: src/protocols/silc/ops.c:1423
+#: src/protocols/silc/ops.c:1629
 msgid "Verifying server public key"
 msgstr "核實伺服器的公鑰中"
 
-#: src/protocols/silc/ops.c:1464
+#: src/protocols/silc/ops.c:1670
 msgid "Passphrase required"
 msgstr "必須輸入密碼"
 
-#: src/protocols/silc/ops.c:1493
+#: src/protocols/silc/ops.c:1699
 msgid "Failure: Version mismatch, upgrade your client"
 msgstr "失敗:版本不符,請更新您的客戶端程式"
 
-#: src/protocols/silc/ops.c:1496
+#: src/protocols/silc/ops.c:1702
 msgid "Failure: Remote does not trust/support your public key"
 msgstr "失敗:遠端不信任/不支援您的公鑰"
 
-#: src/protocols/silc/ops.c:1499
+#: src/protocols/silc/ops.c:1705
 msgid "Failure: Remote does not support proposed KE group"
 msgstr "失敗:遠端不支援建議中的密鑰交換群組 (KE group)"
 
-#: src/protocols/silc/ops.c:1502
+#: src/protocols/silc/ops.c:1708
 msgid "Failure: Remote does not support proposed cipher"
 msgstr "失敗:遠端不支援建議中的加密方式 (cipher)"
 
 #  NOTE 譯文源自 http://www.nii.org.tw/cnt/info/Report/19980906.htm
-#: src/protocols/silc/ops.c:1505
+#: src/protocols/silc/ops.c:1711
 msgid "Failure: Remote does not support proposed PKCS"
 msgstr "失敗:遠端不支援建議中的公開鑰匙證書標準 (PKCS)"
 
-#: src/protocols/silc/ops.c:1508
+#: src/protocols/silc/ops.c:1714
 msgid "Failure: Remote does not support proposed hash function"
 msgstr "失敗:遠端不支援建議中的雜湊函數 (hash function)"
 
 #  NOTE 譯文源自 http://www.cert.org.tw/document/column/show.php?key=28    
-#: src/protocols/silc/ops.c:1511
+#: src/protocols/silc/ops.c:1717
 msgid "Failure: Remote does not support proposed HMAC"
 msgstr "失敗:遠端不支援建議中的身份驗證代碼 (HMAC)"
 
-#: src/protocols/silc/ops.c:1513
+#: src/protocols/silc/ops.c:1719
 msgid "Failure: Incorrect signature"
 msgstr "失敗:錯誤的簽章"
 
-#: src/protocols/silc/ops.c:1515
+#: src/protocols/silc/ops.c:1721
 msgid "Failure: Invalid cookie"
 msgstr "失敗:無效的 Cookie"
 
-#: src/protocols/silc/ops.c:1526
+#: src/protocols/silc/ops.c:1732
 msgid "Failure: Authentication failed"
 msgstr "失敗:認證失敗"
 
@@ -9540,6 +9600,18 @@
 "\n"
 "聯絡方法"
 
+#: src/protocols/silc/silc.c:641 src/protocols/silc/util.c:514
+msgid "SMS"
+msgstr "SMS"
+
+#: src/protocols/silc/silc.c:643 src/protocols/silc/util.c:516
+msgid "MMS"
+msgstr "MMS"
+
+#: src/protocols/silc/silc.c:645 src/protocols/silc/util.c:518
+msgid "Video Conferencing"
+msgstr "視像會議"
+
 #: src/protocols/silc/silc.c:650
 msgid "Your Current Status"
 msgstr "目前狀態"
@@ -9576,109 +9648,230 @@
 "您可以給其他使用者看見您的上線狀態及個人資訊。有關您的資訊,只須輸入您希望別"
 "人看得見的各項。"
 
-#: src/protocols/silc/silc.c:727 src/protocols/silc/silc.c:732
-#: src/protocols/silc/silc.c:1101 src/protocols/silc/silc.c:1106
+#: src/protocols/silc/silc.c:728 src/protocols/silc/silc.c:734
+#: src/protocols/silc/silc.c:1135
 msgid "Message of the Day"
 msgstr "是日訊息"
 
-#: src/protocols/silc/silc.c:727 src/protocols/silc/silc.c:1101
+#: src/protocols/silc/silc.c:728
 msgid "No Message of the Day available"
 msgstr "沒有是日訊息"
 
-#: src/protocols/silc/silc.c:728 src/protocols/silc/silc.c:1102
+#: src/protocols/silc/silc.c:729 src/protocols/silc/silc.c:1130
 msgid "There is no Message of the Day associated with this connection"
 msgstr "這個連結沒有相關的是日訊息"
 
-#: src/protocols/silc/silc.c:769
+#: src/protocols/silc/silc.c:772
 msgid "Online Status"
 msgstr "上線狀態"
 
-#: src/protocols/silc/silc.c:778
+#: src/protocols/silc/silc.c:781
 msgid "View Message of the Day"
 msgstr "顯示是日訊息 (MOTD)"
 
-#: src/protocols/silc/silc.c:850
+#: src/protocols/silc/silc.c:853
 #, c-format
 msgid "User <I>%s</I> is not present in the network"
 msgstr "使用者 <I>%s</I> 不在網路上"
 
-#: src/protocols/silc/silc.c:1216
-msgid "part:  Leave the chat"
-msgstr "part:離開聊天室"
-
-#: src/protocols/silc/silc.c:1220
-msgid "leave:  Leave the chat"
-msgstr "leave: 離開聊天室"
-
-#: src/protocols/silc/silc.c:1224
+#: src/protocols/silc/silc.c:962
+msgid "Failed to leave channel"
+msgstr "無法離開聊天室"
+
+#: src/protocols/silc/silc.c:1006
+msgid "Topic too long"
+msgstr "聊天主題過長"
+
+#: src/protocols/silc/silc.c:1087
+msgid "You must specify a nick"
+msgstr "必須指定暱稱"
+
+#: src/protocols/silc/silc.c:1189
+#, c-format
+msgid "channel %s not found"
+msgstr "找不到會議 %s"
+
+#: src/protocols/silc/silc.c:1194
+#, c-format
+msgid "channel modes for %s: %s"
+msgstr "%s 的頻道模式為:%s"
+
+#: src/protocols/silc/silc.c:1196
+#, c-format
+msgid "no channel modes are set on %s"
+msgstr "%s 沒有設定頻道模式"
+
+#: src/protocols/silc/silc.c:1209
+#, c-format
+msgid "Failed to set cmodes for %s"
+msgstr "無法為 %s 設定頻道模式"
+
+#: src/protocols/silc/silc.c:1239
+#, c-format
+msgid "Unknown command: %s, (may be a Gaim bug)"
+msgstr "未知的指令:%s(可能是 Gaim 的錯誤)"
+
+#: src/protocols/silc/silc.c:1302
+msgid "part [channel]:  Leave the chat"
+msgstr "part [頻道]:離開聊天室"
+
+#: src/protocols/silc/silc.c:1306
+msgid "leave [channel]:  Leave the chat"
+msgstr "leave [頻道]:離開聊天室"
+
+#: src/protocols/silc/silc.c:1310
 msgid "topic [&lt;new topic&gt;]:  View or change the topic"
 msgstr "topic [&lt;新主題&gt;]:檢視或修改聊天主題"
 
-#: src/protocols/silc/silc.c:1229
+#: src/protocols/silc/silc.c:1315
 msgid "join &lt;channel&gt; [&lt;password&gt;]:  Join a chat on this network"
 msgstr "join &lt;頻道&gt; [&lt;密碼&gt;]:加入一個在網路上的聊天室"
 
-#: src/protocols/silc/silc.c:1233
+#: src/protocols/silc/silc.c:1319
 msgid "list:  List channels on this network"
 msgstr "list:列出目前在網絡上的聊天室清單"
 
-#: src/protocols/silc/silc.c:1237
+#: src/protocols/silc/silc.c:1323
 msgid "whois &lt;nick&gt;:  View nick's information"
 msgstr "whois &lt;暱稱&gt;:查看這個暱稱的相關資訊"
 
-#: src/protocols/silc/silc.c:1241
+#: src/protocols/silc/silc.c:1327 src/protocols/zephyr/zephyr.c:1673
 msgid "msg &lt;nick&gt; &lt;message&gt;:  Send a private message to a user"
 msgstr "msg &lt;暱稱&gt; &lt;訊息&gt;:送出一個私人訊息給指定的使用者"
 
-#: src/protocols/silc/silc.c:1245
+#: src/protocols/silc/silc.c:1331
 msgid "query &lt;nick&gt; [&lt;message&gt;]:  Send a private message to a user"
 msgstr "query &lt;暱稱&gt; [&lt;訊息&gt;]:送出一個私人訊息給指定的使用者"
 
-#: src/protocols/silc/silc.c:1249
+#: src/protocols/silc/silc.c:1335
 msgid "motd:  View the server's Message Of The Day"
 msgstr "motd:顯示伺服器的是日訊息 (MOTD)"
 
-#: src/protocols/silc/silc.c:1253
+#: src/protocols/silc/silc.c:1339
 msgid "detach:  Detach this session"
 msgstr "detach:暫停連線這個工作階段"
 
-#: src/protocols/silc/silc.c:1282
-msgid "umode &lt;usermodes&gt;:  Set your user options"
-msgstr "umode &lt;使用者選項&gt;:設定您的使用者選項"
-
-#: src/protocols/silc/silc.c:1335
+#: src/protocols/silc/silc.c:1343
+msgid "quit [message]:  Disconnect from the server, with an optional message"
+msgstr "quit [訊息]:自伺服器離線,並可選擇送出指定的訊息"
+
+#: src/protocols/silc/silc.c:1347
+msgid "call &lt;command&gt;:  Call any silc client command"
+msgstr "call &lt;指令&gt;:執行 SILC 指定的客戶端指令"
+
+#: src/protocols/silc/silc.c:1352
+msgid "kill &lt;nick&gt; [-pubkey|&lt;reason&gt;]:  Kill nick"
+msgstr "kill &lt;暱稱&gt; [-pubkey|&lt;理由&gt;]:從網路上移除暱稱"
+
+#: src/protocols/silc/silc.c:1356
+msgid "nick &lt;newnick&gt;:  Change your nickname"
+msgstr "nick &lt;新暱稱&gt;:改變您的暱稱"
+
+#: src/protocols/silc/silc.c:1360
+msgid "whowas &lt;nick&gt;:  View nick's information"
+msgstr "whois &lt;暱稱&gt;:查看暱稱的相關資訊"
+
+#: src/protocols/silc/silc.c:1364
+msgid ""
+"cmode &lt;channel&gt; [+|-&lt;modes&gt]; [arguments]:  Change or display "
+"channel modes"
+msgstr "cmode &lt;頻道&gt; [+|-&lt;模式&gt]; [參數]:設定顯示頻道模式"
+
+#: src/protocols/silc/silc.c:1368
+msgid ""
+"cumode &lt;channel&gt; +|-&lt;modes&gt; &lt;nick&gt;:  Change nick's modes "
+"on channel"
+msgstr ""
+"cumode &lt;頻道&gt; +|-&lt;模式&gt; &lt;暱稱&gt;:在指定頻道修改指定的暱稱的"
+"模式"
+
+#: src/protocols/silc/silc.c:1372
+msgid "umode &lt;usermodes&gt;:  Set your modes in the network"
+msgstr "umode &lt;使用者模式&gt;:設定您在網路上的模式"
+
+#: src/protocols/silc/silc.c:1376
+msgid "oper &lt;nick&gt; [-pubkey]:  Get server operator privileges"
+msgstr "oper &lt;暱稱&gt; [-pubkey]:取得伺服器管理者的權限"
+
+#: src/protocols/silc/silc.c:1380
+msgid ""
+"invite &lt;channel&gt; [-|+]&lt;nick&gt;:  invite nick or add/remove from "
+"channel invite list"
+msgstr ""
+"invite &lt;頻道&gt; [-|+]&lt;暱稱&gt;:邀請指定的暱稱、新增指定的暱稱到頻道的"
+"被邀者列表、或把指定的暱稱從頻道的被邀者列表中移除"
+
+#: src/protocols/silc/silc.c:1384
+msgid "kick &lt;channel&gt; &lt;nick&gt; [comment]:  Kick client from channel"
+msgstr "kick &lt;頻道&gt; &lt;暱稱&gt; [備註]:把指定的暱稱從頻道中踢出"
+
+#  XXX 暫譯
+#: src/protocols/silc/silc.c:1388
+msgid "info [server]:  View server administrative details"
+msgstr "info [伺服器]:觀看伺服器的管理細節"
+
+#  XXX 暫譯
+#: src/protocols/silc/silc.c:1392
+msgid "ban [&lt;channel&gt; +|-&lt;nick&gt;]:  Ban client from channel"
+msgstr "ban [&lt;頻道&gt; +|-&lt;暱稱&gt;]:於指定的頻道禁止指定的客戶端"
+
+#: src/protocols/silc/silc.c:1396
+msgid "getkey &lt;nick|server&gt;:  Retrieve client's or server's public key"
+msgstr "getkey &lt;暱稱|伺服器&gt;:取得客戶端或伺服器的公鑰"
+
+#: src/protocols/silc/silc.c:1400
+msgid "stats:  View server and network statistics"
+msgstr "stats:觀看伺服器及網路的統計資料"
+
+#: src/protocols/silc/silc.c:1404
+msgid "ping:  Send PING to the connected server"
+msgstr "ping:向連結的伺服器送出 PING"
+
+#: src/protocols/silc/silc.c:1409
+msgid "users &lt;channel&gt;:  List users in channel"
+msgstr "users &lt;頻道&gt;:列出頻道中的使用者"
+
+#: src/protocols/silc/silc.c:1413
+msgid ""
+"names [-count|-ops|-halfops|-voices|-normal] &lt;channel(s)&gt;:  List "
+"specific users in channel(s)"
+msgstr ""
+"names [-count|-ops|-halfops|-voices|-normal] &lt;頻道...&gt;:列出指定的一或"
+"多個頻道的使用者或某一類使用者"
+
+#: src/protocols/silc/silc.c:1425
 msgid "Instant Messages"
 msgstr "即時訊息"
 
-#: src/protocols/silc/silc.c:1340
+#: src/protocols/silc/silc.c:1430
 msgid "Digitally sign all IM messages"
 msgstr "數位簽署所有即時訊息"
 
-#: src/protocols/silc/silc.c:1345
+#: src/protocols/silc/silc.c:1435
 msgid "Verify all IM message signatures"
 msgstr "核實所有即時訊息的簽章"
 
-#: src/protocols/silc/silc.c:1348
+#: src/protocols/silc/silc.c:1438
 msgid "Channel Messages"
 msgstr "頻道訊息"
 
-#: src/protocols/silc/silc.c:1353
+#: src/protocols/silc/silc.c:1443
 msgid "Digitally sign all channel messages"
 msgstr "數位簽署所有頻道訊息"
 
-#: src/protocols/silc/silc.c:1358
+#: src/protocols/silc/silc.c:1448
 msgid "Verify all channel message signatures"
 msgstr "核實所有頻道訊息的簽章"
 
-#: src/protocols/silc/silc.c:1361
+#: src/protocols/silc/silc.c:1451
 msgid "Default SILC Key Pair"
 msgstr "預設的 SILC Key Pair"
 
-#: src/protocols/silc/silc.c:1366
+#: src/protocols/silc/silc.c:1456
 msgid "SILC Public Key"
 msgstr "SILC 公鑰"
 
-#: src/protocols/silc/silc.c:1371
+#: src/protocols/silc/silc.c:1461
 msgid "SILC Private Key"
 msgstr "SILC 私鑰"
 
@@ -9692,43 +9885,43 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/silc/silc.c:1455
+#: src/protocols/silc/silc.c:1547
 msgid "SILC Protocol Plugin"
 msgstr "SILC 協定模組"
 
 #. *  description
-#: src/protocols/silc/silc.c:1457
+#: src/protocols/silc/silc.c:1549
 msgid "Secure Internet Live Conferencing (SILC) Protocol"
 msgstr "安全性網際網路即時會議 (SILC) 協定"
 
 #  XXX
-#: src/protocols/silc/silc.c:1487
+#: src/protocols/silc/silc.c:1579
 msgid "Public key authentication"
 msgstr "使用公鑰認證"
 
-#: src/protocols/silc/silc.c:1493
+#: src/protocols/silc/silc.c:1585
 msgid "Public Key File"
 msgstr "公鑰檔案"
 
-#: src/protocols/silc/silc.c:1497
+#: src/protocols/silc/silc.c:1589
 msgid "Private Key File"
 msgstr "私鑰檔案"
 
 #  TODO 譯文有待改進,這是意譯
-#: src/protocols/silc/silc.c:1502
+#: src/protocols/silc/silc.c:1594
 msgid "Reject watching by other users"
 msgstr "拒絕伺服器端的好友狀態捕捉"
 
-#: src/protocols/silc/silc.c:1505
+#: src/protocols/silc/silc.c:1597
 msgid "Block invites"
 msgstr "拒絕邀請"
 
 #  XXX 好像聽來很怪
-#: src/protocols/silc/silc.c:1508
+#: src/protocols/silc/silc.c:1600
 msgid "Block IMs without Key Exchange"
 msgstr "拒絕沒有交換密鑰的即時訊息"
 
-#: src/protocols/silc/silc.c:1511
+#: src/protocols/silc/silc.c:1603
 msgid "Reject online status attribute requests"
 msgstr "拒絕上線狀態屬性要求"
 
@@ -9771,7 +9964,7 @@
 
 #: src/protocols/silc/util.c:321
 #, c-format
-msgid "Algorithm: \t\t%s\n"
+msgid "Algorithm: \t%s\n"
 msgstr "演算法:  \t%s\n"
 
 #: src/protocols/silc/util.c:322
@@ -9803,6 +9996,22 @@
 msgid "Public Key Information"
 msgstr "公鑰資訊"
 
+#: src/protocols/silc/util.c:512
+msgid "Paging"
+msgstr "傳呼"
+
+#: src/protocols/silc/util.c:536
+msgid "Computer"
+msgstr "電腦"
+
+#: src/protocols/silc/util.c:540
+msgid "PDA"
+msgstr "電子手帳"
+
+#: src/protocols/silc/util.c:542
+msgid "Terminal"
+msgstr "終端機"
+
 #: src/protocols/toc/toc.c:137
 #, c-format
 msgid "Looking up %s"
@@ -10011,15 +10220,15 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/toc/toc.c:2167 src/protocols/toc/toc.c:2169
+#: src/protocols/toc/toc.c:2169 src/protocols/toc/toc.c:2171
 msgid "TOC Protocol Plugin"
 msgstr "TOC 協定模組"
 
-#: src/protocols/toc/toc.c:2188
+#: src/protocols/toc/toc.c:2190
 msgid "TOC host"
 msgstr "TOC 伺服器"
 
-#: src/protocols/toc/toc.c:2192
+#: src/protocols/toc/toc.c:2194
 msgid "TOC port"
 msgstr "TOC 通訊埠"
 
@@ -10106,37 +10315,37 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/trepia/trepia.c:1269 src/protocols/trepia/trepia.c:1271
+#: src/protocols/trepia/trepia.c:1271 src/protocols/trepia/trepia.c:1273
 msgid "Trepia Protocol Plugin"
 msgstr "Trepia 協定模組"
 
 # XXX 暫譯
-#: src/protocols/yahoo/yahoo.c:329
+#: src/protocols/yahoo/yahoo.c:338
 msgid ""
 "You have been logged off as you have logged in on a different machine or "
 "device."
 msgstr "您已經被登出,因為您已在另一處登入。"
 
-#: src/protocols/yahoo/yahoo.c:799
+#: src/protocols/yahoo/yahoo.c:808
 msgid "Your Yahoo! message did not get sent."
 msgstr "您的 Yahoo! 訊息並沒有被送出。"
 
-#: src/protocols/yahoo/yahoo.c:818
+#: src/protocols/yahoo/yahoo.c:827
 msgid "Buzz!!"
 msgstr "嗶!"
 
 # XXX 暫譯
-#: src/protocols/yahoo/yahoo.c:861
+#: src/protocols/yahoo/yahoo.c:870
 #, c-format
 msgid "Yahoo! system message for %s:"
 msgstr "%s 的 Yahoo! 系統訊息:"
 
-#: src/protocols/yahoo/yahoo.c:927
+#: src/protocols/yahoo/yahoo.c:936
 #, c-format
 msgid "%s has (retroactively) denied your request to add them to your list."
 msgstr "使用者 %s 剛剛拒絕了您先前將他(她)新增至您的好友清單的要求。"
 
-#: src/protocols/yahoo/yahoo.c:930
+#: src/protocols/yahoo/yahoo.c:939
 #, c-format
 msgid ""
 "%s has (retroactively) denied your request to add them to your list for the "
@@ -10145,11 +10354,11 @@
 "使用者 %s 因為下列原因,剛剛拒絕了您先前將他(她)新增至您的好友清單的要求:%"
 "s"
 
-#: src/protocols/yahoo/yahoo.c:933
+#: src/protocols/yahoo/yahoo.c:942
 msgid "Add buddy rejected"
 msgstr "新增好友被拒"
 
-#: src/protocols/yahoo/yahoo.c:1689
+#: src/protocols/yahoo/yahoo.c:1702
 #, c-format
 msgid ""
 "The Yahoo server has requested the use of an unrecognized authentication "
@@ -10159,11 +10368,11 @@
 "Yahoo 伺服器要求了使用一種不明的認證方式,因此這個版本的 Gaim 很可能不會成功"
 "登入 Yahoo。請到 %s 檢查有沒有更新的版本。"
 
-#: src/protocols/yahoo/yahoo.c:1692
+#: src/protocols/yahoo/yahoo.c:1705
 msgid "Failed Yahoo! Authentication"
 msgstr "Yahoo! 認證失敗"
 
-#: src/protocols/yahoo/yahoo.c:1764
+#: src/protocols/yahoo/yahoo.c:1777
 #, c-format
 msgid ""
 "You have tried to ignore %s, but the user is on your buddy list.  Clicking "
@@ -10172,68 +10381,84 @@
 "您嘗試忽略在您的好友名單內的 %s。如果您打算把他(她)從您的好友清單中移除,並"
 "隨即忽略他(她),請按一下「是」。"
 
-#: src/protocols/yahoo/yahoo.c:1767
+#: src/protocols/yahoo/yahoo.c:1780
 msgid "Ignore buddy?"
 msgstr "忽略使用者?"
 
-#: src/protocols/yahoo/yahoo.c:1800
+#: src/protocols/yahoo/yahoo.c:1814
 msgid "Invalid username."
 msgstr "使用者名稱無效。"
 
-#: src/protocols/yahoo/yahoo.c:1803
+#: src/protocols/yahoo/yahoo.c:1825
+msgid "Normal authencation failed!"
+msgstr "正常認證失敗!"
+
+# XXX 暫譯
+#: src/protocols/yahoo/yahoo.c:1826
+msgid ""
+"The normal authencation method has failed. This means either your password "
+"is incorrect, or Yahoo!'s authencation scheme has changed. Gaim will now "
+"attempt to log in using Web Messenger authencation, will which result in "
+"reduced functionality and features."
+msgstr ""
+"無法以正常方法進行認證。這表示您輸入了錯誤的密碼,或者 Yahoo! 更改了認證方"
+"法。Gaim 隨即嘗試進行 Web Messenger 認證,如能成功登入,Gaim 將會不支援某一些"
+"的功能。"
+
+#: src/protocols/yahoo/yahoo.c:1834
 msgid "Incorrect password."
 msgstr "錯誤的密碼。"
 
-#: src/protocols/yahoo/yahoo.c:1806
+#: src/protocols/yahoo/yahoo.c:1837
 msgid "Your account is locked, please log in to the Yahoo! website."
 msgstr "你的帳戶目前被暫時關閉。請您登入 Yahoo! 網站。"
 
-#: src/protocols/yahoo/yahoo.c:1809
+#: src/protocols/yahoo/yahoo.c:1840
 #, c-format
 msgid "Unknown error number %d. Logging into the Yahoo! website may fix this."
 msgstr "未知的錯誤代碼 %d。已經登入到 Yahoo!,官方網站上可能已經修正這個錯誤。"
 
-#: src/protocols/yahoo/yahoo.c:1863
+#: src/protocols/yahoo/yahoo.c:1894
 #, c-format
 msgid "Could not add buddy %s to group %s to the server list on account %s."
 msgstr "無法將好友「%1$s」新增至帳號「%3$s」在伺服器上的清單內的群組「%2$s」。"
 
-#: src/protocols/yahoo/yahoo.c:1865
+#: src/protocols/yahoo/yahoo.c:1896
 msgid "Could not add buddy to server list"
 msgstr "無法將好友新增至伺服器上的清單內"
 
-#: src/protocols/yahoo/yahoo.c:2056 src/protocols/yahoo/yahoo.c:2184
+#: src/protocols/yahoo/yahoo.c:2088 src/protocols/yahoo/yahoo.c:2216
 msgid "Unable to read"
 msgstr "無法讀取"
 
-#: src/protocols/yahoo/yahoo.c:2206 src/protocols/yahoo/yahoo.c:2316
-#: src/protocols/yahoo/yahoo.c:2366 src/protocols/yahoo/yahoo.c:2377
-#: src/protocols/yahoo/yahoochat.c:1358 src/protocols/yahoo/yahoochat.c:1419
+#: src/protocols/yahoo/yahoo.c:2238 src/protocols/yahoo/yahoo.c:2348
+#: src/protocols/yahoo/yahoo.c:2398 src/protocols/yahoo/yahoo.c:2408
+#: src/protocols/yahoo/yahoochat.c:1397 src/protocols/yahoo/yahoochat.c:1458
 msgid "Connection problem"
 msgstr "連線錯誤"
 
-#: src/protocols/yahoo/yahoo.c:2467 src/protocols/yahoo/yahoo.c:2848
-#: src/protocols/yahoo/yahoo.c:2962
+#: src/protocols/yahoo/yahoo.c:2495 src/protocols/yahoo/yahoo.c:2857
+#: src/protocols/yahoo/yahoo.c:2971
 msgid "Not At Home"
 msgstr "不在家"
 
-#: src/protocols/yahoo/yahoo.c:2469 src/protocols/yahoo/yahoo.c:2850
-#: src/protocols/yahoo/yahoo.c:2963
+#: src/protocols/yahoo/yahoo.c:2497 src/protocols/yahoo/yahoo.c:2859
+#: src/protocols/yahoo/yahoo.c:2972
 msgid "Not At Desk"
 msgstr "不在座位"
 
-#: src/protocols/yahoo/yahoo.c:2471 src/protocols/yahoo/yahoo.c:2852
-#: src/protocols/yahoo/yahoo.c:2964
+#: src/protocols/yahoo/yahoo.c:2499 src/protocols/yahoo/yahoo.c:2861
+#: src/protocols/yahoo/yahoo.c:2973
 msgid "Not In Office"
 msgstr "不在辦公室"
 
-#: src/protocols/yahoo/yahoo.c:2475 src/protocols/yahoo/yahoo.c:2856
-#: src/protocols/yahoo/yahoo.c:2966
+#: src/protocols/yahoo/yahoo.c:2503 src/protocols/yahoo/yahoo.c:2865
+#: src/protocols/yahoo/yahoo.c:2975
 msgid "On Vacation"
 msgstr "渡假去了"
 
-#: src/protocols/yahoo/yahoo.c:2479 src/protocols/yahoo/yahoo.c:2860
-#: src/protocols/yahoo/yahoo.c:2968
+#: src/protocols/yahoo/yahoo.c:2507 src/protocols/yahoo/yahoo.c:2869
+#: src/protocols/yahoo/yahoo.c:2977
 msgid "Stepped Out"
 msgstr "走出去了"
 
@@ -10241,11 +10466,11 @@
 # NOTE 這也表示你不會看見這個好友登入等等。」(yeah, it mean the buddy
 # NOTE isn't on the server's buddy list/ which also means you won't
 # NOTE be able to see when they log on, etc)
-#: src/protocols/yahoo/yahoo.c:2560 src/protocols/yahoo/yahoo.c:2586
+#: src/protocols/yahoo/yahoo.c:2588 src/protocols/yahoo/yahoo.c:2614
 msgid "Not on server list"
 msgstr "不在伺服器上的清單中"
 
-#: src/protocols/yahoo/yahoo.c:2606
+#: src/protocols/yahoo/yahoo.c:2634
 #, c-format
 msgid ""
 "\n"
@@ -10256,30 +10481,30 @@
 
 # NOTE #gaim 的 Vann 及 LSchiere 解:如果選取了的好友目前處於一個聊天,便加入該個聊天
 # NOTE Yahoo 的「Chat」正式譯文為「聯誼園地」
-#: src/protocols/yahoo/yahoo.c:2679
+#: src/protocols/yahoo/yahoo.c:2693
 msgid "Join in Chat"
 msgstr "加入好友目前所在的聊天室"
 
 # NOTE「會議室」是暫時的意譯。Yahoo! 好像沒有為「Conference」提供正式中譯名。
-#: src/protocols/yahoo/yahoo.c:2684
+#: src/protocols/yahoo/yahoo.c:2698
 msgid "Initiate Conference"
 msgstr "開啟會議室"
 
-#: src/protocols/yahoo/yahoo.c:2741
+#: src/protocols/yahoo/yahoo.c:2750
 msgid "Active which ID?"
 msgstr "啟動哪一個 ID?"
 
 # NOTE #gaim 的 Vann 及 LSchiere 解:如果選取了的好友目前處於一個聊天,便加入該個聊天
 # NOTE Yahoo 的「Chat」正式譯文為「聯誼園地」
-#: src/protocols/yahoo/yahoo.c:2750
+#: src/protocols/yahoo/yahoo.c:2759
 msgid "Join who in chat?"
 msgstr "加入哪個好友目前所在的聊天室?"
 
-#: src/protocols/yahoo/yahoo.c:2760
+#: src/protocols/yahoo/yahoo.c:2769
 msgid "Activate ID..."
 msgstr "啟動 ID..."
 
-#: src/protocols/yahoo/yahoo.c:2764
+#: src/protocols/yahoo/yahoo.c:2773
 msgid "Join user in chat..."
 msgstr "加入好友目前所在的聊天室..."
 
@@ -10294,198 +10519,232 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/yahoo/yahoo.c:3288 src/protocols/yahoo/yahoo.c:3290
+#: src/protocols/yahoo/yahoo.c:3292 src/protocols/yahoo/yahoo.c:3294
 msgid "Yahoo Protocol Plugin"
 msgstr "Yahoo 協定模組"
 
-#: src/protocols/yahoo/yahoo.c:3309
+#: src/protocols/yahoo/yahoo.c:3313
 msgid "Yahoo Japan"
 msgstr "Yahoo Japan"
 
-#: src/protocols/yahoo/yahoo.c:3312
+#: src/protocols/yahoo/yahoo.c:3316
 msgid "Pager host"
 msgstr "傳呼系統伺服器"
 
-#: src/protocols/yahoo/yahoo.c:3315
+#: src/protocols/yahoo/yahoo.c:3319
 msgid "Japan Pager host"
 msgstr "傳呼系統伺服器(日本地區)"
 
-#: src/protocols/yahoo/yahoo.c:3318
+#: src/protocols/yahoo/yahoo.c:3322
 msgid "Pager port"
 msgstr "傳呼系統通訊埠"
 
-#: src/protocols/yahoo/yahoo.c:3321
+#: src/protocols/yahoo/yahoo.c:3325
 msgid "File transfer host"
 msgstr "檔案傳輸主機"
 
-#: src/protocols/yahoo/yahoo.c:3324
+#: src/protocols/yahoo/yahoo.c:3328
 msgid "Japan File transfer host"
 msgstr "檔案傳輸主機(日本地區)"
 
-#: src/protocols/yahoo/yahoo.c:3327
+#: src/protocols/yahoo/yahoo.c:3331
 msgid "File transfer port"
 msgstr "檔案傳輸通訊埠"
 
-#: src/protocols/yahoo/yahoo.c:3330
+#: src/protocols/yahoo/yahoo.c:3334
 msgid "Chat Room List Url"
 msgstr "聊天室清單所在網址"
 
+#: src/protocols/yahoo/yahoo.c:3337
+msgid "YCHT Host"
+msgstr "YCHT 主機"
+
+#: src/protocols/yahoo/yahoo.c:3340
+msgid "YCHT Port"
+msgstr "YCHT 通訊埠"
+
 #: src/protocols/yahoo/yahoo_filexfer.c:170
 msgid ""
 "Gaim cannot send files over Yahoo! that are bigger than One Megabyte "
 "(1,048,576 bytes)."
 msgstr "Gaim 無法透過 Yahoo! 傳送大於 1MB (104,8576 個位元組) 的檔案。"
 
-#: src/protocols/yahoo/yahoo_profile.c:640
-#: src/protocols/yahoo/yahoo_profile.c:961
-msgid "Yahoo! ID"
-msgstr "Yahoo! 帳號"
-
-#: src/protocols/yahoo/yahoo_profile.c:664
+#: src/protocols/yahoo/yahoo_profile.c:675
 #, c-format
 msgid "<b>IP Address:</b> %s<br>"
 msgstr "<b>IP 位址:</b>%s<br>"
 
-#: src/protocols/yahoo/yahoo_profile.c:779
+#: src/protocols/yahoo/yahoo_profile.c:749
+msgid "Yahoo! Japan Profile"
+msgstr "Yahoo! Japan 個人資料"
+
+#: src/protocols/yahoo/yahoo_profile.c:750
+msgid "Yahoo! Profile"
+msgstr "Yahoo! 個人資料"
+
+#: src/protocols/yahoo/yahoo_profile.c:794
 msgid ""
 "Sorry, profiles marked as containing adult content are not supported at this "
 "time."
 msgstr "對不起,暫時並不支援內容被列為兒童不宜的個人資訊。"
 
 # NOTE 注意:鏈結在譯文之下顯示,故譯成「以下」
-#: src/protocols/yahoo/yahoo_profile.c:781
-#: src/protocols/yahoo/yahoo_profile.c:829
+#: src/protocols/yahoo/yahoo_profile.c:796
 msgid ""
 "If you wish to view this profile, you will need to visit this link in your "
 "web browser"
 msgstr "您如果想看這則個人資訊,請用您的瀏覽器開啟以下連結"
 
-#: src/protocols/yahoo/yahoo_profile.c:827
-msgid ""
-"Sorry, this profile seems to be in a language that is not supported at this "
-"time."
-msgstr "對不起,這則個人資訊似乎是使用目前尚未被支援的語言。"
-
-#: src/protocols/yahoo/yahoo_profile.c:1038
-#: src/protocols/yahoo/yahoo_profile.c:1042
-#: src/protocols/yahoo/yahoo_profile.c:1046
+#: src/protocols/yahoo/yahoo_profile.c:969
+msgid "Yahoo! ID"
+msgstr "Yahoo! 帳號"
+
+#: src/protocols/yahoo/yahoo_profile.c:1043
+#: src/protocols/yahoo/yahoo_profile.c:1047
+#: src/protocols/yahoo/yahoo_profile.c:1051
 msgid "Hobbies"
 msgstr "嗜好"
 
-#: src/protocols/yahoo/yahoo_profile.c:1056
-#: src/protocols/yahoo/yahoo_profile.c:1060
+#: src/protocols/yahoo/yahoo_profile.c:1061
+#: src/protocols/yahoo/yahoo_profile.c:1065
 msgid "Latest News"
 msgstr "最新消息"
 
-#: src/protocols/yahoo/yahoo_profile.c:1081
+#: src/protocols/yahoo/yahoo_profile.c:1086
 msgid "Home Page"
 msgstr "網頁"
 
-#: src/protocols/yahoo/yahoo_profile.c:1096
+#: src/protocols/yahoo/yahoo_profile.c:1101
 msgid "Cool Link 1"
 msgstr "酷連結(一)"
 
-#: src/protocols/yahoo/yahoo_profile.c:1101
+#: src/protocols/yahoo/yahoo_profile.c:1106
 msgid "Cool Link 2"
 msgstr "酷連結(二)"
 
-#: src/protocols/yahoo/yahoo_profile.c:1105
+#: src/protocols/yahoo/yahoo_profile.c:1110
 msgid "Cool Link 3"
 msgstr "酷連結(三)"
 
 # NOTE 譯文更動 by Ambrose
-#: src/protocols/yahoo/yahoo_profile.c:1138
+#: src/protocols/yahoo/yahoo_profile.c:1130
 #, c-format
 msgid "User information for %s unavailable"
 msgstr "無法取得使用者 %s 的個人資訊"
 
-#: src/protocols/yahoo/yahoochat.c:198
+#: src/protocols/yahoo/yahoo_profile.c:1136
+msgid ""
+"Sorry, this profile seems to be in a language that is not supported at this "
+"time."
+msgstr "對不起,這則個人資訊似乎是使用目前尚未被支援的語言。"
+
+#: src/protocols/yahoo/yahoo_profile.c:1152
+msgid ""
+"Could not retrieve the user's profile. This most likely is a temporary "
+"server-side problem. Please try again later."
+msgstr ""
+"無法取得使用者的個人資料。這很有可能只是伺服器出現暫時性的問題,請稍後重試。"
+
+#: src/protocols/yahoo/yahoo_profile.c:1155
+msgid ""
+"Could not retrieve the user's profile. This most likely means that the user "
+"does not exist; however, Yahoo! sometimes does fail to find a user's "
+"profile. If you know that the user exists, please try again later."
+msgstr ""
+"無法取得使用者的個人資料。這很有可能表示這個使用者並不存在;然而,Yahoo! 會不"
+"時找不到使用者的個人資料。若果您知道使用者確實存在,請稍後重試。"
+
+#: src/protocols/yahoo/yahoo_profile.c:1163
+msgid "The user's profile is empty."
+msgstr "這個使用者的資訊是空白的。"
+
+#: src/protocols/yahoo/yahoochat.c:203
 #, c-format
 msgid "%s declined your conference invitation to room \"%s\" because \"%s\"."
 msgstr "%s 婉拒了你詢問他(她)到會議室「%s」的邀請,理由是「%s」。"
 
-#: src/protocols/yahoo/yahoochat.c:200
+#: src/protocols/yahoo/yahoochat.c:205
 msgid "Invitation Rejected"
 msgstr "邀請被婉拒了"
 
-#: src/protocols/yahoo/yahoochat.c:350
+#: src/protocols/yahoo/yahoochat.c:355
 msgid "Failed to join chat"
 msgstr "無法加入聊天室"
 
-#: src/protocols/yahoo/yahoochat.c:350
+#: src/protocols/yahoo/yahoochat.c:355
 msgid "Maybe the room is full?"
 msgstr "或許參與聊天室使用者已經到達上限?"
 
-#: src/protocols/yahoo/yahoochat.c:424
+#: src/protocols/yahoo/yahoochat.c:429
 #, c-format
 msgid "You are now chatting in %s."
 msgstr "您現在進入「%s」進行聊天。"
 
-#: src/protocols/yahoo/yahoochat.c:578
+#: src/protocols/yahoo/yahoochat.c:583
 msgid "Failed to join buddy in chat"
 msgstr "無法加入好友目前所在的聊天室"
 
-#: src/protocols/yahoo/yahoochat.c:579
+#: src/protocols/yahoo/yahoochat.c:584
 msgid "Maybe they're not in a chat?"
 msgstr "可能他(她)並不在聊天室內?"
 
-#: src/protocols/yahoo/yahoochat.c:1299
+#: src/protocols/yahoo/yahoochat.c:1338
 msgid "Unable to connect"
 msgstr "無法連線"
 
-#: src/protocols/yahoo/yahoochat.c:1299
+#: src/protocols/yahoo/yahoochat.c:1338
 msgid "Fetching the room list failed."
 msgstr "讀取聊天室清單發生錯誤。"
 
 # NOTE 解「可語音聊天的使用者數目」(marv)
-#: src/protocols/yahoo/yahoochat.c:1344
+#: src/protocols/yahoo/yahoochat.c:1383
 msgid "Voices"
 msgstr "可語音聊天"
 
 # NOTE 解「可視像聊天的使用者數目」(marv)
-#: src/protocols/yahoo/yahoochat.c:1347
+#: src/protocols/yahoo/yahoochat.c:1386
 msgid "Webcams"
 msgstr "可視像聊天"
 
-#: src/protocols/yahoo/yahoochat.c:1358 src/protocols/yahoo/yahoochat.c:1419
+#: src/protocols/yahoo/yahoochat.c:1397 src/protocols/yahoo/yahoochat.c:1458
 msgid "Unable to fetch room list."
 msgstr "無法取得聊天室清單。"
 
 # NOTE wing: does "User Rooms" mean rooms created by users? i guess yes?
 # NOTE marv: wing: yeah, Yahoo has Yahoo rooms and user rooms
 # NOTE marv: marv: in the room list stuff? yeah it's a user created room as opposed to an official room
-#: src/protocols/yahoo/yahoochat.c:1412
+#: src/protocols/yahoo/yahoochat.c:1451
 msgid "User Rooms"
 msgstr "使用者建立之聊天室"
 
-#: src/protocols/zephyr/zephyr.c:566
+#: src/protocols/zephyr/zephyr.c:589
 #, c-format
 msgid "Unable send to chat %s,%s,%s"
 msgstr "無法傳送至聊天室 %s,%s,%s"
 
-#: src/protocols/zephyr/zephyr.c:600
+#: src/protocols/zephyr/zephyr.c:624
 #, c-format
 msgid "<b>User:</b> %s<br>"
 msgstr "<b>使用者:</b>%s<br>"
 
-#: src/protocols/zephyr/zephyr.c:604
+#: src/protocols/zephyr/zephyr.c:628
 msgid "<br>Hidden or not logged-in"
 msgstr "<br>隱藏或未登入"
 
-#: src/protocols/zephyr/zephyr.c:608
+#: src/protocols/zephyr/zephyr.c:633
 #, c-format
 msgid "<br>At %s since %s"
 msgstr "<br>從 %2$s 起已在 %1$s"
 
-#: src/protocols/zephyr/zephyr.c:873 src/protocols/zephyr/zephyr.c:874
+#: src/protocols/zephyr/zephyr.c:983 src/protocols/zephyr/zephyr.c:984
 msgid "Anyone"
 msgstr "任何人"
 
-#: src/protocols/zephyr/zephyr.c:900
+#: src/protocols/zephyr/zephyr.c:1011
 msgid "Already logged in with Zephyr"
 msgstr "已經登入 Zephyr"
 
-#: src/protocols/zephyr/zephyr.c:900
+#: src/protocols/zephyr/zephyr.c:1011
 msgid ""
 "Because Zephyr uses your system username, you are unable to have multiple "
 "accounts on it when logged in as the same user."
@@ -10496,21 +10755,93 @@
 # NOTE 但另有說明(下列第二個鏈結)的實例似乎顯示 Class 基本上可以說是類別
 # NOTE 參閱 http://www.mit.edu/afs/sipb/project/doc/izephyr/html/node19.html 及其鏈結
 # NOTE 參閱 http://consult.stanford.edu/pub/communications/zephyr-guide
-#: src/protocols/zephyr/zephyr.c:1232
+# NOTE (15:05:28) aatharuv: wing: A class is basically a high level chat. Any message sent to a class will also have "instance", and "recipient" parameters, which control who gets it. If someone "subscribes" to only a particular instance of the class, they'll only get messages sent to the specific class and instance, whereas someone who subs to all the instances of the class, instance "*", will get any message to the class.
+# NOTE (15:11:31) aatharuv: The "recipient" field also controls who gets a message. if the recipient is "", then anyone subbed to said class and instance will get the message, otherwise it will only be received by the person with that "username". This allows IM's in zephyr to be a special case of chats
+#: src/protocols/zephyr/zephyr.c:1386
 msgid "_Class:"
 msgstr "類別/聊天室(_C):"
 
 # XXX 暫譯
 # NOTE 參閱 http://www.mit.edu/afs/sipb/project/doc/izephyr/html/node19.html 及其鏈結
 # NOTE 參閱 http://consult.stanford.edu/pub/communications/zephyr-guide
-#: src/protocols/zephyr/zephyr.c:1238
+#: src/protocols/zephyr/zephyr.c:1392
 msgid "_Instance:"
 msgstr "實體/頻道(_I):"
 
-#: src/protocols/zephyr/zephyr.c:1244
+#: src/protocols/zephyr/zephyr.c:1398
 msgid "_Recipient:"
 msgstr "接受者(_R):"
 
+#  FIXME 暫譯
+#: src/protocols/zephyr/zephyr.c:1409
+#, c-format
+msgid "Attempt to subscribe to %s,%s,%s failed"
+msgstr "加人聊天室(交談) %s,%s,%s 失敗"
+
+#: src/protocols/zephyr/zephyr.c:1678
+msgid "zlocate &lt;nick&gt;: Locate user"
+msgstr "zlocate &lt;暱稱&gt;:尋找使用者"
+
+#: src/protocols/zephyr/zephyr.c:1683
+msgid "zl &lt;nick&gt;: Locate user"
+msgstr "zl &lt;暱稱&gt;:尋找使用者"
+
+#: src/protocols/zephyr/zephyr.c:1688
+msgid "instance &lt;instance&gt;: Set the instance to be used on this class"
+msgstr "instance &lt;實體&rdquo;:設定這個「類別」(聊天室)的「實體」(頻道)"
+
+#: src/protocols/zephyr/zephyr.c:1693
+msgid "inst &lt;instance&gt;: Set the instance to be used on this class"
+msgstr "inst &lt;實體&rdquo;:設定這個「類別」(聊天室)的「實體」(頻道)"
+
+#: src/protocols/zephyr/zephyr.c:1699
+msgid "sub &lt;class&gt; &lt;instance&gt; &lt;recipient&gt;: Join a new chat"
+msgstr "sub &lt;類別&gt; &lt;實體&gt; &lt;接受者&gt;:加入聊天室"
+
+#  NOTE (14:46:12) aatharuv: wing: So all zephyrs get sent to a triplet <class,instance,recipient>   . "message" is the default class that zephyrs go to, and "personal" is the default instance.
+#: src/protocols/zephyr/zephyr.c:1704
+msgid ""
+"zi &lt;instance&gt;: Send a message to &lt;message,<i>instance</i>,*&gt;"
+msgstr "zi &lt;實體&gt;:送出訊息至&lt;訊息,<i>實體</i>,*&gt;"
+
+#: src/protocols/zephyr/zephyr.c:1710
+msgid ""
+"zci &lt;class&gt; &lt;instance&gt;: Send a message to &lt;<i>class</i>,"
+"<i>instance</i>,*&gt;"
+msgstr ""
+"zi &lt;類別&gt; &lt;實體&gt:送出訊息至&lt;<i>類別</i>,<i>實體</i>,*&gt;"
+
+#: src/protocols/zephyr/zephyr.c:1716
+msgid ""
+"zcir &lt;class&gt; &lt;instance&gt; &lt;recipient&gt;: Send a message to &lt;"
+"<i>class</i>,<i>instance</i>,<i>recipient</i>&gt;"
+msgstr ""
+"zcir &lt;類別&gt; &lt;實體&gt; &lt;接受者&gt;:送出訊息至 &lt;<i>類別</i>,<i>"
+"實體</i>,<i>接受者</i>&gt;"
+
+#: src/protocols/zephyr/zephyr.c:1722
+msgid ""
+"zir &lt;instance&gt; &lt;recipient&gt;: Send a message to &lt;MESSAGE,"
+"<i>instance</i>,<i>recipient</i>&gt;"
+msgstr ""
+"zir &lt;實體&gt; &lt;接受者&gt;:送出訊息至 &lt;MESSAGE,<i>實體</i>,<i>接受者"
+"</i>&gt;"
+
+#: src/protocols/zephyr/zephyr.c:1727
+msgid "zc &lt;class&gt;: Send a message to &lt;<i>class</i>,PERSONAL,*&gt;"
+msgstr "zc &lt;類別&gt;:送出訊息至 &lt;<i>類別</i>,PERSONAL,*&gt;"
+
+#  NOTE (14:46:42) aatharuv: wing: resubscribe is basically "rejoin chat"
+#  NOTE (14:47:50) aatharuv: wing: err, "rejoin all chats"
+#: src/protocols/zephyr/zephyr.c:1802
+msgid "Resubscribe"
+msgstr "重新加入所有聊天室"
+
+#  FIXME 要覆查譯文
+#: src/protocols/zephyr/zephyr.c:1805
+msgid "Retrieve subscriptions from server"
+msgstr "由伺服器取得目前所在聊天室的清單"
+
 #. *< api_version
 #. *< type
 #. *< ui_requirement
@@ -10522,7 +10853,7 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/zephyr/zephyr.c:1412 src/protocols/zephyr/zephyr.c:1414
+#: src/protocols/zephyr/zephyr.c:1885 src/protocols/zephyr/zephyr.c:1887
 msgid "Zephyr Protocol Plugin"
 msgstr "Zephyr 協定模組"
 
@@ -10532,18 +10863,18 @@
 # NOTE: gaim to write to .anyone upon logout. Some people use multiple
 # NOTE: clients and prefer to have separate buddylists for separate clients.
 # NOTE: Similarly, .zephyr.subs controls the chats that a person subs.
-#: src/protocols/zephyr/zephyr.c:1433
+#: src/protocols/zephyr/zephyr.c:1906
 msgid "Export to .anyone"
 msgstr "匯出至 .anyone 檔"
 
-#: src/protocols/zephyr/zephyr.c:1436
+#: src/protocols/zephyr/zephyr.c:1909
 msgid "Export to .zephyr.subs"
 msgstr "匯出至 .zephyr.subs 檔"
 
 # FIXME 暫譯;譯得很差,有待改進
 # NOTE: Zephyr 的「Exposure」指隱身至現身之間的各種狀態
 # NOTE: aatharuv: exposure in zephyr controls your visibility.
-#: src/protocols/zephyr/zephyr.c:1439
+#: src/protocols/zephyr/zephyr.c:1912
 msgid "Exposure"
 msgstr "現身程度"
 
@@ -10571,14 +10902,14 @@
 "對於您目前所設定的代理伺服器型態來說,您所給定的伺服器名稱及通訊埠是無效的"
 
 #. * Custom away message.
-#: src/prpl.h:205
+#: src/prpl.h:165
 msgid "Custom"
 msgstr "使用者自定"
 
 #. *
 #. * A wrapper for gaim_request_action() that uses Accept and Cancel buttons.
 #.
-#: src/request.h:1252
+#: src/request.h:1253
 msgid "Accept"
 msgstr "接受"
 
@@ -10602,27 +10933,27 @@
 msgid "(1 message)"
 msgstr "(一個訊息)"
 
-#: src/server.c:1176 src/server.c:1186
+#: src/server.c:1180 src/server.c:1189
 #, c-format
 msgid "%s logged in."
 msgstr "%s 登入。"
 
-#: src/server.c:1199
+#: src/server.c:1201
 #, c-format
 msgid "%s signed on"
 msgstr "%s 已經登入"
 
-#: src/server.c:1215
+#: src/server.c:1216
 #, c-format
 msgid "%s came back"
 msgstr "%s 回來了"
 
-#: src/server.c:1217
+#: src/server.c:1218
 #, c-format
 msgid "%s went away"
 msgstr "%s 已經離開"
 
-#: src/server.c:1231
+#: src/server.c:1232
 #, c-format
 msgid "%s became idle"
 msgstr "%s 變更狀態為閒置"
@@ -10632,17 +10963,17 @@
 msgid "%s became unidle"
 msgstr "%s 由閒置返回"
 
-#: src/server.c:1254 src/server.c:1262
+#: src/server.c:1253 src/server.c:1260
 #, c-format
 msgid "%s logged out."
 msgstr "%s 登出。"
 
-#: src/server.c:1276
+#: src/server.c:1273
 #, c-format
 msgid "%s signed off"
 msgstr "%s 已經登出"
 
-#: src/server.c:1338
+#: src/server.c:1335
 #, c-format
 msgid ""
 "%s has just been warned by %s.\n"
@@ -10651,11 +10982,11 @@
 "%s 剛剛被 %s 警告了。\n"
 "您的新警告等級為 %d%%"
 
-#: src/server.c:1341
+#: src/server.c:1338
 msgid "an anonymous person"
 msgstr "一個匿名者"
 
-#: src/server.c:1451
+#: src/server.c:1448
 #, c-format
 msgid ""
 "User '%s' invites %s to buddy chat room: '%s'\n"
@@ -10664,12 +10995,12 @@
 "使用者「%s」邀請 %s 到好友聊天室:「%s」\n"
 "%s"
 
-#: src/server.c:1455
+#: src/server.c:1452
 #, c-format
 msgid "User '%s' invites %s to buddy chat room: '%s'\n"
 msgstr "使用者「%s」邀請 %s 到好友聊天室:「%s」\n"
 
-#: src/server.c:1461
+#: src/server.c:1458
 msgid "Accept chat invitation?"
 msgstr "接受邀請嗎?"
 
@@ -10704,25 +11035,31 @@
 msgid "Unknown."
 msgstr "未知。"
 
-#: src/util.c:2399
+#: src/util.c:2392
+msgid "second"
+msgid_plural "seconds"
+msgstr[0] "秒"
+msgstr[1] "秒"
+
+#: src/util.c:2406
 msgid "day"
 msgid_plural "days"
 msgstr[0] "日"
 msgstr[1] "日"
 
-#: src/util.c:2407
+#: src/util.c:2414
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "小時"
 msgstr[1] "小時"
 
-#: src/util.c:2415
+#: src/util.c:2422
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "分"
 msgstr[1] "分"
 
-#: src/util.c:2825
+#: src/util.c:2832
 msgid "g003: Error opening connection.\n"
 msgstr "g003: 連線開啟錯誤。\n"
 
@@ -10738,6 +11075,34 @@
 msgid "Notification"
 msgstr "通知"
 
+#~ msgid "Invalid file name."
+#~ msgstr "檔案名稱無效。"
+
+#~ msgid "That file already exists."
+#~ msgstr "那個檔案已經存在。"
+
+# XXX 要覆查
+#~ msgid "Save As..."
+#~ msgstr "另存新檔..."
+
+#~ msgid "MSN ID"
+#~ msgstr "MSN 帳號"
+
+#~ msgid "Modes"
+#~ msgstr "模式"
+
+#~ msgid "User Count:\t\t%d\n"
+#~ msgstr "使用者數:%d\n"
+
+#~ msgid "Hostname"
+#~ msgstr "主機名稱"
+
+#~ msgid "Channels"
+#~ msgstr "頻道"
+
+#~ msgid "Invalid Groupname"
+#~ msgstr "無效的群組名稱"
+
 #~ msgid "Buddy icon file:"
 #~ msgstr "好友圖示檔案:"
 
@@ -10833,9 +11198,6 @@
 #~ msgid "Unable to write to server"
 #~ msgstr "無法寫入到伺服器"
 
-#~ msgid "Error reading from server"
-#~ msgstr "由伺服器讀取時發生錯誤"
-
 #~ msgid ""
 #~ "An MSN screen name must be in the form \"user@server.com\". Perhaps you "
 #~ "meant %s@hotmail.com. No changes were made to your allow list."
--- a/src/about.c	Tue Jul 13 23:05:59 2004 +0000
+++ b/src/about.c	Wed Jul 14 19:05:16 2004 +0000
@@ -164,11 +164,12 @@
 	/* Current Translators */
 	str = g_strconcat(
 			"<FONT SIZE=\"4\">", _("Current Translators"), ":</FONT><BR>"
+			"  <b>", _("Bulgarian"), " (bg)</b> - Alexander Shopov &lt;<a href=\"mailto: al_shopov@users.sf.net\">al_shopov@users.sf.net</a>&gt;<br>"
 			"  <b>", _("Catalan"), " (ca)</b> - Robert Millan &lt;<a href=\"mailto: zeratul2@wanadoo.es\">zeratul2@wanadoo.es</a>&gt;<br>"
 			"  <b>", _("Czech"), " (cs)</b> - Miloslav Trmac &lt;<a href=\"mailto: mitr@volny.cz\">mitr@volny.cz</a>&gt;<br>"
 			"  <b>", _("Danish"), " (da)</b> - Morten Brix Pedersen &lt;<a href=\"mailto: morten@wtf.dk\">morten@wtf.dk</a>&gt;<br>"
-			"  <b>", _("British English"), "(en_GB)</b> - Luke Ross &lt;<a href=\"mailto: lukeross@sys3175.co.uk\">lukeross@sys3175.co.uk</a>&gt;<br>"
-			"  <b>", _("Canadian English"), "(en_CA)</b> - Adam Weinberger &lt;<a href=\"mailto: adamw@gnome.org\">adamw@gnome.org</a>&gt;<br>"
+			"  <b>", _("British English"), " (en_GB)</b> - Luke Ross &lt;<a href=\"mailto: lukeross@sys3175.co.uk\">lukeross@sys3175.co.uk</a>&gt;<br>"
+			"  <b>", _("Canadian English"), " (en_CA)</b> - Adam Weinberger &lt;<a href=\"mailto: adamw@gnome.org\">adamw@gnome.org</a>&gt;<br>"
 			"  <b>", _("German"), " (de)</b> - Björn Voigt &lt;<a href=\"mailto: bjoern@cs.tu-berlin.de\">bjoern@cs.tu-berlin.de</a>&gt;<br>"
 			"  <b>", _("Spanish"), " (es)</b> - Javier Fernández-Sanguino Peña &lt;<a href=\"mailto: jfs@debian.org\">jfs@debian.org</a>&gt;<br>"
 			"  <b>", _("Finnish"), " (fi)</b> - Arto Alakulju &lt;<a href=\"mailto: arto@alakulju.net\">arto@alakulju.net</a>&gt;<br>"
@@ -177,22 +178,21 @@
 			"  <b>", _("Hindi"), " (hi)</b> - Ravishankar Shrivastava &lt;<a href=\"mailto: raviratlami@yahoo.com\">raviratlami@yahoo.com</a>&gt;<br>"
 			"  <b>", _("Hungarian"), " (hu)</b> - Zoltan Sutto &lt;<a href=\"mailto: suttozoltan@chello.hu\">suttozoltan@chello.hu</a>&gt;<br>"
 			"  <b>", _("Italian"), " (it)</b> - Claudio Satriano &lt;<a href=\"mailto: satriano@na.infn.it\">satriano@na.infn.it</a>&gt;<br>"
-			"  <b>", _("Japanese"), "(ja)</b> - Takashi Aihana &lt;<a href=\"mailto: aihana@gnome.gr.jp\">aihana@gnome.gr.jp</a>&gt;<br>"
-			"  <b>", _("Lithuanian"), "(lt)</b> - Gediminas Čičinskas &lt;<a href=\"mailto: gediminas@parok.lt\">gediminas@parok.lt</a>&gt;<br>"
+			"  <b>", _("Japanese"), " (ja)</b> - Takashi Aihana &lt;<a href=\"mailto: aihana@gnome.gr.jp\">aihana@gnome.gr.jp</a>&gt;<br>"
+			"  <b>", _("Lithuanian"), " (lt)</b> - Gediminas Čičinskas &lt;<a href=\"mailto: gediminas@parok.lt\">gediminas@parok.lt</a>&gt;<br>"
 			"  <b>", _("Korean"), " (ko)</b> - Kyung-uk Son &lt;<a href=\"mailto: vvs740@chol.com\">vvs740@chol.com</a>&gt;<br>"
 			"  <b>", _("Dutch; Flemish"), " (nl)</b> - Vincent van Adrighem &lt;<a href=\"mailto: V.vanAdrighem@dirck.mine.nu\">V.vanAdrighem@dirck.mine.nu</a>&gt;<br>"
-			"  <b>", _("Macedonian"), "(mk)</b> - Tomislav Markovski &lt;<a href=\"mailto: herrera@users.sf.net\">herrera@users.sf.net</a>&gt;<br>"
+			"  <b>", _("Macedonian"), " (mk)</b> - Tomislav Markovski &lt;<a href=\"mailto: herrera@users.sf.net\">herrera@users.sf.net</a>&gt;<br>"
 			"  <b>", _("Norwegian"), " (no)</b> - Petter Johan Olsen &lt;<a href=\"mailto:petter.olsen@cc.uit.no\">petter.olsen@cc.uit.no</a>&gt;<br>"
 			"  <b>", _("Polish"), " (pl)</b> - Krzysztof Foltman &lt;<a href=\"mailto:krzysztof@foltman.com\">krzysztof@foltman.com</a>&gt;, Emil Nowak &lt;<a href=\"mailto:emil5@go2.pl\">emil5@go2.pl</a>&gt;<br>"
 			"  <b>", _("Portuguese"), " (pt)</b> - Duarte Henriques &lt;<a href=\"mailto:duarte_henriques@myrealbox.com\">duarte_henriques@myrealbox.com</a>&gt;<br>"
 			"  <b>", _("Portuguese-Brazil"), " (pt_BR)</b> - Maurício de Lemos Rodrigues Collares Neto &lt;<a href=\"mailto: mauricioc@gmail.com\">mauricioc@gmail.com</a>&gt;<br>"
 			"  <b>", _("Romanian"), " (ro)</b> - Mişu Moldovan &lt;<a href=\"mailto: dumol@go.ro\">dumol@go.ro</a>&gt;<br>"
-			"  <b>", _("Russian"), "(ru)</b> - Dmitry Beloglazov &lt;<a href=\"mailto: dmaa@users.sf.net\">dmaa@users.sf.net</a>&gt;<br>"
+			"  <b>", _("Russian"), " (ru)</b> - Dmitry Beloglazov &lt;<a href=\"mailto: dmaa@users.sf.net\">dmaa@users.sf.net</a>&gt;<br>"
 			"  <b>", _("Serbian"), " (sr)</b> - Danilo Šegan &lt;<a href=\"mailto: dsegan@gmx.net\">dsegan@gmx.net</a>&gt;, Aleksandar Urosevic &lt;<a href=\"mailto: urke@users.sourceforge.net\">urke@users.sourceforge.net</a>&gt;<br>"
 			"  <b>", _("Slovenian"), " (sl)</b> - Matjaz Horvat &lt;<a href=\"mailto: matjaz@owca.info\">matjaz@owca.info</a>&gt;<br>"
 			"  <b>", _("Swedish"), " (sv)</b> - Tore Lundqvist &lt;<a href=\"mailto: tlt@mima.x.se\">tlt@mima.x.se</a>&gt;<br>"
-			"  <b>", _("Vietnamese"), "(vi)</b> - T.M.Thanh ", _("and the Gnome-Vi Team"), " &lt;<a href=\"mailto: gnomevi-list@lists.sf.net\">gnomevi-list@lists.sf.net</a>&gt;<br>"
-			"  <b>", "Bulgarian", "(bg)</b> - Alexander Shopov &lt;<a href=\"mailto: al_shopov@users.sf.net\">al_shopov@users.sf.net</a>&gt;<br>"
+			"  <b>", _("Vietnamese"), " (vi)</b> - T.M.Thanh ", _("and the Gnome-Vi Team"), " &lt;<a href=\"mailto: gnomevi-list@lists.sf.net\">gnomevi-list@lists.sf.net</a>&gt;<br>"
 			"  <b>", _("Simplified Chinese"), " (zh_CN)</b> - Funda Wang &lt;<a href=\"mailto: fundawang@linux.net.cn\">fundawang@linux.net.cn</a>&gt;<br>"
 			"  <b>", _("Traditional Chinese"), " (zh_TW)</b> - Ambrose C. Li &lt;<a href=\"mailto: acli@ada.dhs.org\">acli@ada.dhs.org</a>&gt;, Paladin R. Liu &lt;<a href=\"mailto: paladin@ms1.hinet.net\">paladin@ms1.hinet.net</a>&gt;<br>"
 			"<BR>", NULL);